diff --git a/README.md b/README.md index 6020957..a0b15a2 100644 --- a/README.md +++ b/README.md @@ -28,3 +28,4 @@ wget x.x.x.x/shot ; wget x.x.x.x/screen.565 ![screenshot](https://github.com/sharandac/My-TTGO-Watch/blob/master/images/screen8.png) ![screenshot](https://github.com/sharandac/My-TTGO-Watch/blob/master/images/screen9.png) ![screenshot](https://github.com/sharandac/My-TTGO-Watch/blob/master/images/screen10.png) +![screenshot](https://github.com/sharandac/My-TTGO-Watch/blob/master/images/screen11.png) diff --git a/images/screen3.png b/images/screen3.png index 049dfc1..61b88bb 100644 Binary files a/images/screen3.png and b/images/screen3.png differ diff --git a/images/screen4.png b/images/screen4.png index e272784..825d908 100644 Binary files a/images/screen4.png and b/images/screen4.png differ diff --git a/src/config.h b/src/config.h index e6974fe..b3c6623 100644 --- a/src/config.h +++ b/src/config.h @@ -8,6 +8,6 @@ /* * firmeware version string */ - #define __FIRMWARE__ "2020072201" + #define __FIRMWARE__ "2020072202" #endif // _CONFIG_H diff --git a/src/gui/keyboard.cpp b/src/gui/keyboard.cpp index 7c758af..79aebd0 100644 --- a/src/gui/keyboard.cpp +++ b/src/gui/keyboard.cpp @@ -10,7 +10,9 @@ void keyboard_setup( void ) { return; kb = lv_keyboard_create( lv_scr_act() , NULL); - lv_obj_set_size(kb, LV_HOR_RES, LV_VER_RES / 2); + lv_obj_set_size(kb, LV_HOR_RES, LV_VER_RES / 2 ); +// lv_obj_set_size(kb, LV_HOR_RES, LV_VER_RES / 3); +// lv_obj_align( kb, lv_scr_act(), LV_ALIGN_IN_BOTTOM_MID, 0, 0 ); lv_keyboard_set_cursor_manage(kb, true); lv_obj_set_event_cb( kb, kb_event_cb ); lv_obj_set_hidden( kb, true ); diff --git a/src/gui/widget/weather/weather.cpp b/src/gui/widget/weather/weather.cpp index 45585bf..7e512fb 100644 --- a/src/gui/widget/weather/weather.cpp +++ b/src/gui/widget/weather/weather.cpp @@ -24,8 +24,10 @@ void weather_widget_setup( void ) { mainbar_set_tile_setup_cb( weather_widget_tile_num, weather_widget_tile_setup ); mainbar_set_tile_setup_cb( weather_widget_setup_tile_num, weather_widget_setup_tile_setup ); + // get an widget container from main_tile widget_cont = main_tile_register_widget(); + // create widget weather condition icon and temperature label widget_weather_condition_img = lv_imgbtn_create( widget_cont, NULL ); lv_imgbtn_set_src( widget_weather_condition_img, LV_BTN_STATE_RELEASED, &weather_48px); lv_imgbtn_set_src( widget_weather_condition_img, LV_BTN_STATE_PRESSED, &weather_48px); @@ -86,6 +88,8 @@ void weather_widget_setup_tile_setup( lv_obj_t *tile, lv_style_t *style, lv_coor lv_obj_add_style( exit_label, LV_OBJ_PART_MAIN, style ); lv_label_set_text( exit_label, "exit weather setup"); lv_obj_align( exit_label, exit_btn, LV_ALIGN_OUT_RIGHT_MID, 5, 0 ); + + } static void exit_weather_widget_setup_event_cb( lv_obj_t * obj, lv_event_t event ) { diff --git a/ttgo-t-watch2020_v1.ino.bin b/ttgo-t-watch2020_v1.ino.bin index 7996be5..aef23ed 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.txt b/ttgo-t-watch2020_v1.version.txt index 2a07f80..6067626 100644 --- a/ttgo-t-watch2020_v1.version.txt +++ b/ttgo-t-watch2020_v1.version.txt @@ -1 +1 @@ -2020072201 +2020072202