From 3c6ba09d07d914444a01f092e01ecac3896816e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20BOU=C3=89?= Date: Thu, 25 Jul 2024 18:24:58 +0200 Subject: [PATCH 1/8] Update ui_ScreenPassord.c --- .../ui/src/screens/ui_ScreenPassord.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/SquareLine/v8/WiFiClock/libraries/ui/src/screens/ui_ScreenPassord.c b/examples/SquareLine/v8/WiFiClock/libraries/ui/src/screens/ui_ScreenPassord.c index c5ede21b..b919cf08 100644 --- a/examples/SquareLine/v8/WiFiClock/libraries/ui/src/screens/ui_ScreenPassord.c +++ b/examples/SquareLine/v8/WiFiClock/libraries/ui/src/screens/ui_ScreenPassord.c @@ -5,14 +5,14 @@ #include "../ui.h" -void ui_ScreenPassord_screen_init(void) +void ui_ScreenPassword_screen_init(void) { -ui_ScreenPassord = lv_obj_create(NULL); -lv_obj_clear_flag( ui_ScreenPassord, LV_OBJ_FLAG_SCROLLABLE ); /// Flags -lv_obj_set_style_bg_color(ui_ScreenPassord, lv_color_hex(0x112D4E), LV_PART_MAIN | LV_STATE_DEFAULT ); -lv_obj_set_style_bg_opa(ui_ScreenPassord, 255, LV_PART_MAIN| LV_STATE_DEFAULT); +ui_ScreenPassword = lv_obj_create(NULL); +lv_obj_clear_flag( ui_ScreenPassword, LV_OBJ_FLAG_SCROLLABLE ); /// Flags +lv_obj_set_style_bg_color(ui_ScreenPassword, lv_color_hex(0x112D4E), LV_PART_MAIN | LV_STATE_DEFAULT ); +lv_obj_set_style_bg_opa(ui_ScreenPassword, 255, LV_PART_MAIN| LV_STATE_DEFAULT); -ui_TextPassword = lv_textarea_create(ui_ScreenPassord); +ui_TextPassword = lv_textarea_create(ui_ScreenPassword); lv_obj_set_width( ui_TextPassword, 283); lv_obj_set_height( ui_TextPassword, 42); lv_obj_set_x( ui_TextPassword, -1 ); @@ -22,7 +22,7 @@ lv_textarea_set_placeholder_text(ui_TextPassword,"Please enter Wifi password"); lv_obj_set_style_bg_color(ui_TextPassword, lv_color_hex(0xDBE2EF), LV_PART_MAIN | LV_STATE_DEFAULT ); lv_obj_set_style_bg_opa(ui_TextPassword, 255, LV_PART_MAIN| LV_STATE_DEFAULT); -ui_KeyboardPassword = lv_keyboard_create(ui_ScreenPassord); +ui_KeyboardPassword = lv_keyboard_create(ui_ScreenPassword); lv_obj_set_width( ui_KeyboardPassword, 300); lv_obj_set_height( ui_KeyboardPassword, 120); lv_obj_set_x( ui_KeyboardPassword, 0 ); @@ -31,7 +31,7 @@ lv_obj_set_align( ui_KeyboardPassword, LV_ALIGN_CENTER ); lv_obj_set_style_bg_color(ui_KeyboardPassword, lv_color_hex(0xDBE2EF), LV_PART_MAIN | LV_STATE_DEFAULT ); lv_obj_set_style_bg_opa(ui_KeyboardPassword, 255, LV_PART_MAIN| LV_STATE_DEFAULT); -ui_ButtonRetWifi = lv_btn_create(ui_ScreenPassord); +ui_ButtonRetWifi = lv_btn_create(ui_ScreenPassword); lv_obj_set_width( ui_ButtonRetWifi, 30); lv_obj_set_height( ui_ButtonRetWifi, 26); lv_obj_set_x( ui_ButtonRetWifi, -138 ); @@ -55,7 +55,7 @@ lv_img_set_zoom(ui_ImageRetWifi,30); lv_obj_set_style_img_recolor(ui_ImageRetWifi, lv_color_hex(0xDBE2EF), LV_PART_MAIN| LV_STATE_DEFAULT); lv_obj_set_style_img_recolor_opa(ui_ImageRetWifi, 255, LV_PART_MAIN| LV_STATE_DEFAULT); -ui_SpinnerLoadPassword = lv_spinner_create(ui_ScreenPassord,1000,90); +ui_SpinnerLoadPassword = lv_spinner_create(ui_ScreenPassword,1000,90); lv_obj_set_width( ui_SpinnerLoadPassword, 80); lv_obj_set_height( ui_SpinnerLoadPassword, 80); lv_obj_set_align( ui_SpinnerLoadPassword, LV_ALIGN_CENTER ); From 0366c5b0ba3b4c750194344616d100ec45fdbfc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20BOU=C3=89?= Date: Thu, 25 Jul 2024 18:25:47 +0200 Subject: [PATCH 2/8] Update ui.h --- examples/SquareLine/v8/WiFiClock/libraries/ui/src/ui.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/SquareLine/v8/WiFiClock/libraries/ui/src/ui.h b/examples/SquareLine/v8/WiFiClock/libraries/ui/src/ui.h index 1f066766..34c483ca 100644 --- a/examples/SquareLine/v8/WiFiClock/libraries/ui/src/ui.h +++ b/examples/SquareLine/v8/WiFiClock/libraries/ui/src/ui.h @@ -66,9 +66,9 @@ extern lv_obj_t *ui_ButtonRetSet; extern lv_obj_t *ui_ImageRetSet; extern lv_obj_t *ui_LabelWifiList; extern lv_obj_t *ui_SpinnerLoadWifi; -// SCREEN: ui_ScreenPassord -void ui_ScreenPassord_screen_init(void); -extern lv_obj_t *ui_ScreenPassord; +// SCREEN: ui_ScreenPassword +void ui_ScreenPassword_screen_init(void); +extern lv_obj_t *ui_ScreenPassword; extern lv_obj_t *ui_TextPassword; void ui_event_KeyboardPassword( lv_event_t * e); extern lv_obj_t *ui_KeyboardPassword; From cbd5ea9cd26cbe891841b8973941fbbf87e8d9d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20BOU=C3=89?= Date: Thu, 25 Jul 2024 18:26:24 +0200 Subject: [PATCH 3/8] Update filelist.txt --- examples/SquareLine/v8/WiFiClock/libraries/ui/src/filelist.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/SquareLine/v8/WiFiClock/libraries/ui/src/filelist.txt b/examples/SquareLine/v8/WiFiClock/libraries/ui/src/filelist.txt index 7878ae0d..2596d994 100644 --- a/examples/SquareLine/v8/WiFiClock/libraries/ui/src/filelist.txt +++ b/examples/SquareLine/v8/WiFiClock/libraries/ui/src/filelist.txt @@ -1,7 +1,7 @@ screens/ui_ScreenClock.c screens/ui_ScreenSet.c screens/ui_ScreenWifiList.c -screens/ui_ScreenPassord.c +screens/ui_ScreenPassword.c screens/ui_ScreenAla.c ui.c components/ui_comp_hook.c From 0fc8fd9240432ab3836c1b3710c7c6b20ad77e3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20BOU=C3=89?= Date: Thu, 25 Jul 2024 18:26:51 +0200 Subject: [PATCH 4/8] Update CMakeLists.txt --- .../SquareLine/v8/WiFiClock/libraries/ui/src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/SquareLine/v8/WiFiClock/libraries/ui/src/CMakeLists.txt b/examples/SquareLine/v8/WiFiClock/libraries/ui/src/CMakeLists.txt index 5a747293..163af3a1 100644 --- a/examples/SquareLine/v8/WiFiClock/libraries/ui/src/CMakeLists.txt +++ b/examples/SquareLine/v8/WiFiClock/libraries/ui/src/CMakeLists.txt @@ -1,7 +1,7 @@ SET(SOURCES screens/ui_ScreenClock.c screens/ui_ScreenSet.c screens/ui_ScreenWifiList.c - screens/ui_ScreenPassord.c + screens/ui_ScreenPassword.c screens/ui_ScreenAla.c ui.c components/ui_comp_hook.c From 9cf50b5ed8dd81b2f00afecfbb4cd17a30e25802 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20BOU=C3=89?= Date: Thu, 25 Jul 2024 18:27:07 +0200 Subject: [PATCH 5/8] Update ui.c --- examples/SquareLine/v8/WiFiClock/libraries/ui/src/ui.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/SquareLine/v8/WiFiClock/libraries/ui/src/ui.c b/examples/SquareLine/v8/WiFiClock/libraries/ui/src/ui.c index 148b8231..3823fb2e 100644 --- a/examples/SquareLine/v8/WiFiClock/libraries/ui/src/ui.c +++ b/examples/SquareLine/v8/WiFiClock/libraries/ui/src/ui.c @@ -58,9 +58,9 @@ lv_obj_t *ui_LabelWifiList; lv_obj_t *ui_SpinnerLoadWifi; -// SCREEN: ui_ScreenPassord -void ui_ScreenPassord_screen_init(void); -lv_obj_t *ui_ScreenPassord; +// SCREEN: ui_ScreenPassword +void ui_ScreenPassword_screen_init(void); +lv_obj_t *ui_ScreenPassword; lv_obj_t *ui_TextPassword; void ui_event_KeyboardPassword( lv_event_t * e); lv_obj_t *ui_KeyboardPassword; @@ -181,7 +181,7 @@ lv_disp_set_theme(dispp, theme); ui_ScreenClock_screen_init(); ui_ScreenSet_screen_init(); ui_ScreenWifiList_screen_init(); -ui_ScreenPassord_screen_init(); +ui_ScreenPassword_screen_init(); ui_ScreenAla_screen_init(); ui____initial_actions0 = lv_obj_create(NULL); lv_disp_load_scr( ui_ScreenClock); From 5313e1a32019930ed7e2381a6e52b1a096b9e1ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20BOU=C3=89?= Date: Thu, 25 Jul 2024 18:27:26 +0200 Subject: [PATCH 6/8] Update WiFiClock.ino --- examples/SquareLine/v8/WiFiClock/WiFiClock.ino | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/SquareLine/v8/WiFiClock/WiFiClock.ino b/examples/SquareLine/v8/WiFiClock/WiFiClock.ino index 8f7bf1aa..5c92a7f5 100644 --- a/examples/SquareLine/v8/WiFiClock/WiFiClock.ino +++ b/examples/SquareLine/v8/WiFiClock/WiFiClock.ino @@ -512,7 +512,7 @@ void handleWifiListItemClick(lv_event_t * e) if (selected_wifi_name != NULL) { Serial.printf("%s\n", selected_wifi_name); } - _ui_screen_change(&ui_ScreenPassord, LV_SCR_LOAD_ANIM_NONE, 0, 0, &ui_ScreenPassord_screen_init); + _ui_screen_change(&ui_ScreenPassword, LV_SCR_LOAD_ANIM_NONE, 0, 0, &ui_ScreenPassword_screen_init); lvgl_port_unlock(); } } From d320145214e36f776a5235d5ec83643bd536e102 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20BOU=C3=89?= Date: Thu, 25 Jul 2024 18:27:50 +0200 Subject: [PATCH 7/8] Update ESP_PanelVersions.h --- src/ESP_PanelVersions.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ESP_PanelVersions.h b/src/ESP_PanelVersions.h index ac7043f8..6d15df0f 100644 --- a/src/ESP_PanelVersions.h +++ b/src/ESP_PanelVersions.h @@ -11,7 +11,7 @@ /* Library Version */ #define ESP_PANEL_VERSION_MAJOR 0 #define ESP_PANEL_VERSION_MINOR 1 -#define ESP_PANEL_VERSION_PATCH 5 +#define ESP_PANEL_VERSION_PATCH 6 /* File `ESP_Panel_Conf.h` */ #define ESP_PANEL_CONF_VERSION_MAJOR 0 From 31fa1a846442113a4ad1160a43d560f68bbbf303 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20BOU=C3=89?= Date: Thu, 25 Jul 2024 18:28:07 +0200 Subject: [PATCH 8/8] Update library.properties --- library.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library.properties b/library.properties index e29ffed2..2f8a775e 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=ESP32_Display_Panel -version=0.1.5 +version=0.1.6 author=espressif maintainer=espressif sentence=ESP32_Display_Panel is an Arduino library designed for ESP SoCs to drive display panels and facilitate rapid GUI development.