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

improved task synchronization

Browse Source
This commit is contained in:
sharandac
2020-07-27 09:15:04 +02:00
parent 8ca3f25292
commit 72739a569e
13 changed files with 107 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/mainbar/setup_tile/update/update.cpp
View File

@@ -118,8 +118,13 @@ static void exit_update_setup_event_cb( lv_obj_t * obj, lv_event_t event ) {
static void update_event_handler(lv_obj_t * obj, lv_event_t event) {
if(event == LV_EVENT_CLICKED) {
xEventGroupSetBits( update_event_handle, UPDATE_REQUEST );
vTaskResume( _update_Task );
if ( xEventGroupGetBits( update_event_handle) & UPDATE_REQUEST ) {
return;
}
else {
xEventGroupSetBits( update_event_handle, UPDATE_REQUEST );
vTaskResume( _update_Task );
}
}
}
@@ -133,7 +138,6 @@ void update_Task( void * pvParameters ) {
display_set_timeout( DISPLAY_MAX_TIMEOUT );
WiFiClient client;
client.setTimeout( 10 );
lv_label_set_text( update_status_label, "start update ..." );
lv_obj_align( update_status_label, update_btn, LV_ALIGN_OUT_BOTTOM_MID, 0, 15 );
@@ -164,6 +168,7 @@ void update_Task( void * pvParameters ) {
}
xEventGroupClearBits( update_event_handle, UPDATE_REQUEST );
}
lv_disp_trig_activity(NULL);
vTaskSuspend( _update_Task );
}
}

1
src/gui/mainbar/setup_tile/wlan_settings/wlan_settings.cpp
View File

@@ -224,7 +224,6 @@ static void wifi_onoff_event_handler(lv_obj_t * obj, lv_event_t event) {
void wifi_settings_enter_pass_event_cb( lv_obj_t * obj, lv_event_t event ) {
if(event == LV_EVENT_CLICKED) {
// strcpy( ssid, lv_list_get_btn_text(obj) );
lv_label_set_text( wlan_password_name_label, lv_list_get_btn_text(obj) );
lv_textarea_set_text( wlan_password_pass_textfield, "");
mainbar_jump_to_tilenumber( WLAN_PASSWORD_TILE, LV_ANIM_ON );