projects_leo/ttgo_smartwatch_prox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix wifi scan/activate problems

Browse Source
This commit is contained in:
sharandac
2020-08-01 20:44:50 +02:00
parent a5aafb885e
commit 69b9a54408
4 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/config.h
View File

@@ -31,6 +31,6 @@
/* /*
* firmeware version string * firmeware version string
*/ */
#define __FIRMWARE__ "2020073109" #define __FIRMWARE__ "2020080101"
#endif // _CONFIG_H #endif // _CONFIG_H

45
src/hardware/wifictl.cpp
View File

@@ -123,6 +123,12 @@ void wifictl_setup( void ) {
statusbar_hide_icon( STATUSBAR_WIFI ); statusbar_hide_icon( STATUSBAR_WIFI );
statusbar_wifi_set_state( false, "" ); statusbar_wifi_set_state( false, "" );
}, WiFiEvent_t::SYSTEM_EVENT_STA_STOP ); }, WiFiEvent_t::SYSTEM_EVENT_STA_STOP );
xTaskCreate( wifictl_Task, /* Function to implement the task */
"wifictl Task", /* Name of the task */
5000, /* Stack size in words */
NULL, /* Task input parameter */
1, /* Priority of the task */
&_wifictl_Task ); /* Task handle. */
} }
/* /*
@@ -237,12 +243,7 @@ void wifictl_on( void ) {
} }
else { else {
powermgm_set_event( POWERMGM_WIFI_ON_REQUEST ); powermgm_set_event( POWERMGM_WIFI_ON_REQUEST );
xTaskCreate( wifictl_Task, /* Function to implement the task */ vTaskResume( _wifictl_Task );
"wifictl Task", /* Name of the task */
2000, /* Stack size in words */
NULL, /* Task input parameter */
1, /* Priority of the task */
&_wifictl_Task ); /* Task handle. */
} }
} }
@@ -258,12 +259,7 @@ void wifictl_off( void ) {
} }
else { else {
powermgm_set_event( POWERMGM_WIFI_OFF_REQUEST ); powermgm_set_event( POWERMGM_WIFI_OFF_REQUEST );
xTaskCreate( wifictl_Task, /* Function to implement the task */ vTaskResume( _wifictl_Task );
"wifictl Task", /* Name of the task */
2000, /* Stack size in words */
NULL, /* Task input parameter */
1, /* Priority of the task */
&_wifictl_Task ); /* Task handle. */
} }
} }
@@ -274,16 +270,19 @@ void wifictl_Task( void * pvParameters ) {
if ( wifi_init == false ) if ( wifi_init == false )
return; return;
if ( powermgm_get_event( POWERMGM_WIFI_ON_REQUEST ) ) { while ( true ) {
statusbar_wifi_set_state( true, "activate" ); vTaskDelay( 100 );
WiFi.mode( WIFI_STA ); if ( powermgm_get_event( POWERMGM_WIFI_ON_REQUEST ) ) {
powermgm_clear_event( POWERMGM_WIFI_OFF_REQUEST | POWERMGM_WIFI_ACTIVE | POWERMGM_WIFI_CONNECTED | POWERMGM_WIFI_SCAN | POWERMGM_WIFI_ON_REQUEST ); statusbar_wifi_set_state( true, "activate" );
WiFi.mode( WIFI_STA );
powermgm_clear_event( POWERMGM_WIFI_OFF_REQUEST | POWERMGM_WIFI_ACTIVE | POWERMGM_WIFI_CONNECTED | POWERMGM_WIFI_SCAN | POWERMGM_WIFI_ON_REQUEST );
}
else if ( powermgm_get_event( POWERMGM_WIFI_OFF_REQUEST ) ) {
statusbar_wifi_set_state( false, "" );
WiFi.mode( WIFI_OFF );
esp_wifi_stop();
powermgm_clear_event( POWERMGM_WIFI_OFF_REQUEST | POWERMGM_WIFI_ACTIVE | POWERMGM_WIFI_CONNECTED | POWERMGM_WIFI_SCAN | POWERMGM_WIFI_ON_REQUEST );
}
vTaskSuspend( _wifictl_Task );
} }
else if ( powermgm_get_event( POWERMGM_WIFI_OFF_REQUEST ) ) {
statusbar_wifi_set_state( false, "" );
WiFi.mode( WIFI_OFF );
esp_wifi_stop();
powermgm_clear_event( POWERMGM_WIFI_OFF_REQUEST | POWERMGM_WIFI_ACTIVE | POWERMGM_WIFI_CONNECTED | POWERMGM_WIFI_SCAN | POWERMGM_WIFI_ON_REQUEST );
}
vTaskDelete( NULL );
} }

BIN
ttgo-t-watch2020_v1.ino.bin
View File

Binary file not shown.

2
ttgo-t-watch2020_v1.version.json
View File

@@ -1 +1 @@
{"version":"2020073109","host":"http://www.neo-guerillaz.de","file":"ttgo-t-watch2020_v1.ino.bin"} {"version":"2020080101","host":"http://www.neo-guerillaz.de","file":"ttgo-t-watch2020_v1.ino.bin"}