diff --git a/src/config.h b/src/config.h index 298f0d4..9f09945 100644 --- a/src/config.h +++ b/src/config.h @@ -32,6 +32,6 @@ /* * firmeware version string */ - #define __FIRMWARE__ "2020081902" + #define __FIRMWARE__ "2020081903" #endif // _CONFIG_H diff --git a/src/gui/mainbar/app_tile/app_tile.cpp b/src/gui/mainbar/app_tile/app_tile.cpp index 65e876f..5072b4b 100644 --- a/src/gui/mainbar/app_tile/app_tile.cpp +++ b/src/gui/mainbar/app_tile/app_tile.cpp @@ -24,7 +24,7 @@ #include "gui/mainbar/mainbar.h" #include "app_tile.h" -lv_app_entry_t app_entry[ MAX_APPS_ICON ]; +lv_app_icon_t app_entry[ MAX_APPS_ICON ]; static lv_obj_t *app_cont = NULL; static lv_obj_t *app_label = NULL; diff --git a/src/gui/mainbar/app_tile/app_tile.h b/src/gui/mainbar/app_tile/app_tile.h index 6a1c89d..ce2c9a3 100644 --- a/src/gui/mainbar/app_tile/app_tile.h +++ b/src/gui/mainbar/app_tile/app_tile.h @@ -41,13 +41,10 @@ typedef struct { lv_obj_t *app; lv_obj_t *label; - lv_obj_t *icon_cont; - lv_obj_t *icon; - lv_obj_t *icon_indicator; lv_coord_t x; lv_coord_t y; bool active; - } lv_app_entry_t; + } lv_app_icon_t; /* * @brief setup the app tile diff --git a/src/gui/mainbar/setup_tile/bluetooth_settings/bluetooth_message.cpp b/src/gui/mainbar/setup_tile/bluetooth_settings/bluetooth_message.cpp index 197100d..0403e2c 100644 --- a/src/gui/mainbar/setup_tile/bluetooth_settings/bluetooth_message.cpp +++ b/src/gui/mainbar/setup_tile/bluetooth_settings/bluetooth_message.cpp @@ -132,6 +132,9 @@ void bluetooth_message_msg_pharse( char* msg ) { else if ( !strcmp( doc["src"], "K-9 Mail" ) ) { lv_img_set_src( bluetooth_message_img, &k9mail_32px ); } + else if ( !strcmp( doc["src"], "Gmail" ) ) { + lv_img_set_src( bluetooth_message_img, &email_32px ); + } else if ( !strcmp( doc["src"], "E-Mail" ) ) { lv_img_set_src( bluetooth_message_img, &email_32px ); } diff --git a/src/gui/mainbar/setup_tile/update/update.cpp b/src/gui/mainbar/setup_tile/update/update.cpp index 77b70b1..ae3c784 100644 --- a/src/gui/mainbar/setup_tile/update/update.cpp +++ b/src/gui/mainbar/setup_tile/update/update.cpp @@ -222,6 +222,11 @@ void update_Task( void * pvParameters ) { lv_obj_align( update_status_label, update_btn, LV_ALIGN_OUT_BOTTOM_MID, 0, 15 ); lv_obj_set_hidden( update_info_img, true ); } + else { + lv_label_set_text( update_status_label, "get update info failed" ); + lv_obj_align( update_status_label, update_btn, LV_ALIGN_OUT_BOTTOM_MID, 0, 15 ); + lv_obj_set_hidden( update_info_img, true ); + } lv_obj_invalidate( lv_scr_act() ); } if ( ( xEventGroupGetBits( update_event_handle) & UPDATE_REQUEST ) && ( update_get_url() != NULL ) ) { diff --git a/src/hardware/blectl.cpp b/src/hardware/blectl.cpp index 6369a93..d92a507 100644 --- a/src/hardware/blectl.cpp +++ b/src/hardware/blectl.cpp @@ -205,6 +205,7 @@ class BleCtlCallbacks : public BLECharacteristicCallbacks } }; + /* * */ diff --git a/ttgo-t-watch2020_v1.ino.bin b/ttgo-t-watch2020_v1.ino.bin index 9eff327..dc0abdd 100644 Binary files a/ttgo-t-watch2020_v1.ino.bin and b/ttgo-t-watch2020_v1.ino.bin differ diff --git a/ttgo-t-watch2020_v1.version.json b/ttgo-t-watch2020_v1.version.json index f3f6d5b..6611af7 100644 --- a/ttgo-t-watch2020_v1.version.json +++ b/ttgo-t-watch2020_v1.version.json @@ -1 +1 @@ -{"version":"2020081902","host":"http://www.neo-guerillaz.de","file":"ttgo-t-watch2020_v1.ino.bin"} +{"version":"2020081903","host":"http://www.neo-guerillaz.de","file":"ttgo-t-watch2020_v1.ino.bin"}