some updates

This commit is contained in:
sharandac
2020-08-19 14:47:16 +02:00
parent ce5c5d6dd5
commit 6260eb471c
8 changed files with 13 additions and 7 deletions

View File

@@ -32,6 +32,6 @@
/* /*
* firmeware version string * firmeware version string
*/ */
#define __FIRMWARE__ "2020081902" #define __FIRMWARE__ "2020081903"
#endif // _CONFIG_H #endif // _CONFIG_H

View File

@@ -24,7 +24,7 @@
#include "gui/mainbar/mainbar.h" #include "gui/mainbar/mainbar.h"
#include "app_tile.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_cont = NULL;
static lv_obj_t *app_label = NULL; static lv_obj_t *app_label = NULL;

View File

@@ -41,13 +41,10 @@
typedef struct { typedef struct {
lv_obj_t *app; lv_obj_t *app;
lv_obj_t *label; 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 x;
lv_coord_t y; lv_coord_t y;
bool active; bool active;
} lv_app_entry_t; } lv_app_icon_t;
/* /*
* @brief setup the app tile * @brief setup the app tile

View File

@@ -132,6 +132,9 @@ void bluetooth_message_msg_pharse( char* msg ) {
else if ( !strcmp( doc["src"], "K-9 Mail" ) ) { else if ( !strcmp( doc["src"], "K-9 Mail" ) ) {
lv_img_set_src( bluetooth_message_img, &k9mail_32px ); 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" ) ) { else if ( !strcmp( doc["src"], "E-Mail" ) ) {
lv_img_set_src( bluetooth_message_img, &email_32px ); lv_img_set_src( bluetooth_message_img, &email_32px );
} }

View File

@@ -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_align( update_status_label, update_btn, LV_ALIGN_OUT_BOTTOM_MID, 0, 15 );
lv_obj_set_hidden( update_info_img, true ); 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() ); lv_obj_invalidate( lv_scr_act() );
} }
if ( ( xEventGroupGetBits( update_event_handle) & UPDATE_REQUEST ) && ( update_get_url() != NULL ) ) { if ( ( xEventGroupGetBits( update_event_handle) & UPDATE_REQUEST ) && ( update_get_url() != NULL ) ) {

View File

@@ -205,6 +205,7 @@ class BleCtlCallbacks : public BLECharacteristicCallbacks
} }
}; };
/* /*
* *
*/ */

Binary file not shown.

View File

@@ -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"}