From 95c5093239d3b28e5e5092b6223af03ae5507a4c Mon Sep 17 00:00:00 2001 From: Tobias Schneider Date: Sun, 21 Mar 2021 03:28:03 +0100 Subject: [PATCH] Improvements and bugfixes --- src/frame/frame_home.cpp | 24 ++++++++++++------------ src/frame/frame_settings.cpp | 4 ++-- src/frame/frame_settings_wallpaper.cpp | 2 +- src/frame/frame_settings_wifi.cpp | 4 ++-- src/global_setting.cpp | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/frame/frame_home.cpp b/src/frame/frame_home.cpp index a3b5862..c6b6d4b 100644 --- a/src/frame/frame_home.cpp +++ b/src/frame/frame_home.cpp @@ -136,22 +136,22 @@ Frame_Home::Frame_Home(void) { _sw_air_2->Canvas(0)->pushImage(68, 12, 92, 92, ImageResource_home_icon_conditioner_off_92x92); _sw_air_2->Canvas(1)->pushImage(68, 12, 92, 92, ImageResource_home_icon_conditioner_on_92x92); - _sw_air_1->AddArgs(0, 0, _key_air_1_plus); - _sw_air_1->AddArgs(0, 1, _key_air_1_minus); - _sw_air_1->AddArgs(0, 2, _sw_air_1); + _sw_air_1->AddArgs(EPDGUI_Switch::EVENT_NONE, 0, _key_air_1_plus); + _sw_air_1->AddArgs(EPDGUI_Switch::EVENT_NONE, 1, _key_air_1_minus); + _sw_air_1->AddArgs(EPDGUI_Switch::EVENT_NONE, 2, _sw_air_1); _sw_air_1->Bind(0, key_home_air_state0_cb); - _sw_air_1->AddArgs(1, 0, _key_air_1_plus); - _sw_air_1->AddArgs(1, 1, _key_air_1_minus); - _sw_air_1->AddArgs(1, 2, _sw_air_1); + _sw_air_1->AddArgs(EPDGUI_Switch::EVENT_PRESSED, 0, _key_air_1_plus); + _sw_air_1->AddArgs(EPDGUI_Switch::EVENT_PRESSED, 1, _key_air_1_minus); + _sw_air_1->AddArgs(EPDGUI_Switch::EVENT_PRESSED, 2, _sw_air_1); _sw_air_1->Bind(1, key_home_air_state1_cb); - _sw_air_2->AddArgs(0, 0, _key_air_2_plus); - _sw_air_2->AddArgs(0, 1, _key_air_2_minus); - _sw_air_2->AddArgs(0, 2, _sw_air_2); + _sw_air_2->AddArgs(EPDGUI_Switch::EVENT_NONE, 0, _key_air_2_plus); + _sw_air_2->AddArgs(EPDGUI_Switch::EVENT_NONE, 1, _key_air_2_minus); + _sw_air_2->AddArgs(EPDGUI_Switch::EVENT_NONE, 2, _sw_air_2); _sw_air_2->Bind(0, key_home_air_state0_cb); - _sw_air_2->AddArgs(1, 0, _key_air_2_plus); - _sw_air_2->AddArgs(1, 1, _key_air_2_minus); - _sw_air_2->AddArgs(1, 2, _sw_air_2); + _sw_air_2->AddArgs(EPDGUI_Switch::EVENT_PRESSED, 0, _key_air_2_plus); + _sw_air_2->AddArgs(EPDGUI_Switch::EVENT_PRESSED, 1, _key_air_2_minus); + _sw_air_2->AddArgs(EPDGUI_Switch::EVENT_PRESSED, 2, _sw_air_2); _sw_air_2->Bind(1, key_home_air_state1_cb); exitbtn("Home"); diff --git a/src/frame/frame_settings.cpp b/src/frame/frame_settings.cpp index 5337b59..90ae4c1 100644 --- a/src/frame/frame_settings.cpp +++ b/src/frame/frame_settings.cpp @@ -27,7 +27,7 @@ void key_restart_cb(epdgui_args_vector_t &args) { esp_restart(); } -void key_wifi2_cb(epdgui_args_vector_t &args) { +void key_wifi_cb(epdgui_args_vector_t &args) { Frame_Base *frame = EPDGUI_GetFrame("Frame_Settings_Wifi"); if (frame == NULL) { frame = new Frame_Settings_Wifi(); @@ -174,7 +174,7 @@ Frame_Settings::Frame_Settings(void) { _key_exit->Bind(EPDGUI_Button::EVENT_RELEASED, &Frame_Base::exit_cb); _key_wifi->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, (void*)(&_is_run)); - _key_wifi->Bind(EPDGUI_Button::EVENT_RELEASED, &key_wifi2_cb); + _key_wifi->Bind(EPDGUI_Button::EVENT_RELEASED, &key_wifi_cb); _key_wallpaper->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, (void*)(&_is_run)); _key_wallpaper->Bind(EPDGUI_Button::EVENT_RELEASED, &key_wallpaper_cb); diff --git a/src/frame/frame_settings_wallpaper.cpp b/src/frame/frame_settings_wallpaper.cpp index a454d57..899c450 100644 --- a/src/frame/frame_settings_wallpaper.cpp +++ b/src/frame/frame_settings_wallpaper.cpp @@ -16,7 +16,7 @@ Frame_Settings_Wallpaper::Frame_Settings_Wallpaper(void) { _sw_wallpapers[i]->SetLabel(1, GetWallpaperName(i)); _sw_wallpapers[i]->Canvas(1)->ReverseColor(); _sw_wallpapers[i]->SetID(i); - _sw_wallpapers[i]->AddArgs(1, 0, (void*)(_sw_wallpapers[i]->GetID_P())); + _sw_wallpapers[i]->AddArgs(EPDGUI_Switch::EVENT_PRESSED, 0, (void*)(_sw_wallpapers[i]->GetID_P())); _sw_wallpapers[i]->Bind(1, &sw_wallpapers_cb); } _sw_wallpapers[GetWallpaperID()]->setState(1); diff --git a/src/frame/frame_settings_wifi.cpp b/src/frame/frame_settings_wifi.cpp index 5963fff..a7756ce 100644 --- a/src/frame/frame_settings_wifi.cpp +++ b/src/frame/frame_settings_wifi.cpp @@ -7,7 +7,7 @@ bool _update_flag = false; EPDGUI_Button *_connect_key = NULL; -void key_wifi_cb(epdgui_args_vector_t &args) { +void key_wifi_network_cb(epdgui_args_vector_t &args) { if (((EPDGUI_Button*)(args[0]))->GetCustomString() == "_$refresh$_") { _update_flag = true; } else { @@ -33,7 +33,7 @@ Frame_Settings_Wifi::Frame_Settings_Wifi(void) { _key_wifi[i]->CanvasNormal()->setTextColor(15); _key_wifi[i]->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, _key_wifi[i]); _key_wifi[i]->AddArgs(EPDGUI_Button::EVENT_RELEASED, 1, (void*)(&_is_run)); - _key_wifi[i]->Bind(EPDGUI_Button::EVENT_RELEASED, key_wifi_cb); + _key_wifi[i]->Bind(EPDGUI_Button::EVENT_RELEASED, key_wifi_network_cb); } exitbtn("Settings"); diff --git a/src/global_setting.cpp b/src/global_setting.cpp index e16afdf..e13b354 100644 --- a/src/global_setting.cpp +++ b/src/global_setting.cpp @@ -54,7 +54,7 @@ uint16_t global_reader_textsize = 32; uint8_t global_time_synced = false; uint8_t global_ttf_file_loaded = false; uint8_t global_init_status = 0xFF; -int8_t global_timezone = 8; +int8_t global_timezone = 0; int8_t GetTimeZone(void) {