tsndr/M5PaperOS
1
0
Fork 0
Code Issues Pull Requests Activity

Improvements and bugfixes

Browse Source
This commit is contained in:
Toby
2021-03-21 03:28:03 +01:00
parent 3b6b28bf1c
commit 95c5093239
5 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/frame/frame_home.cpp
View File

@@ -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(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_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(EPDGUI_Switch::EVENT_NONE, 0, _key_air_1_plus);
_sw_air_1->AddArgs(0, 1, _key_air_1_minus); _sw_air_1->AddArgs(EPDGUI_Switch::EVENT_NONE, 1, _key_air_1_minus);
_sw_air_1->AddArgs(0, 2, _sw_air_1); _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->Bind(0, key_home_air_state0_cb);
_sw_air_1->AddArgs(1, 0, _key_air_1_plus); _sw_air_1->AddArgs(EPDGUI_Switch::EVENT_PRESSED, 0, _key_air_1_plus);
_sw_air_1->AddArgs(1, 1, _key_air_1_minus); _sw_air_1->AddArgs(EPDGUI_Switch::EVENT_PRESSED, 1, _key_air_1_minus);
_sw_air_1->AddArgs(1, 2, _sw_air_1); _sw_air_1->AddArgs(EPDGUI_Switch::EVENT_PRESSED, 2, _sw_air_1);
_sw_air_1->Bind(1, key_home_air_state1_cb); _sw_air_1->Bind(1, key_home_air_state1_cb);
_sw_air_2->AddArgs(0, 0, _key_air_2_plus); _sw_air_2->AddArgs(EPDGUI_Switch::EVENT_NONE, 0, _key_air_2_plus);
_sw_air_2->AddArgs(0, 1, _key_air_2_minus); _sw_air_2->AddArgs(EPDGUI_Switch::EVENT_NONE, 1, _key_air_2_minus);
_sw_air_2->AddArgs(0, 2, _sw_air_2); _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->Bind(0, key_home_air_state0_cb);
_sw_air_2->AddArgs(1, 0, _key_air_2_plus); _sw_air_2->AddArgs(EPDGUI_Switch::EVENT_PRESSED, 0, _key_air_2_plus);
_sw_air_2->AddArgs(1, 1, _key_air_2_minus); _sw_air_2->AddArgs(EPDGUI_Switch::EVENT_PRESSED, 1, _key_air_2_minus);
_sw_air_2->AddArgs(1, 2, _sw_air_2); _sw_air_2->AddArgs(EPDGUI_Switch::EVENT_PRESSED, 2, _sw_air_2);
_sw_air_2->Bind(1, key_home_air_state1_cb); _sw_air_2->Bind(1, key_home_air_state1_cb);
exitbtn("Home"); exitbtn("Home");

4
src/frame/frame_settings.cpp
View File

@@ -27,7 +27,7 @@ void key_restart_cb(epdgui_args_vector_t &args) {
esp_restart(); 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"); Frame_Base *frame = EPDGUI_GetFrame("Frame_Settings_Wifi");
if (frame == NULL) { if (frame == NULL) {
frame = new Frame_Settings_Wifi(); 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_exit->Bind(EPDGUI_Button::EVENT_RELEASED, &Frame_Base::exit_cb);
_key_wifi->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, (void*)(&_is_run)); _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->AddArgs(EPDGUI_Button::EVENT_RELEASED, 0, (void*)(&_is_run));
_key_wallpaper->Bind(EPDGUI_Button::EVENT_RELEASED, &key_wallpaper_cb); _key_wallpaper->Bind(EPDGUI_Button::EVENT_RELEASED, &key_wallpaper_cb);

2
src/frame/frame_settings_wallpaper.cpp
View File

@@ -16,7 +16,7 @@ Frame_Settings_Wallpaper::Frame_Settings_Wallpaper(void) {
_sw_wallpapers[i]->SetLabel(1, GetWallpaperName(i)); _sw_wallpapers[i]->SetLabel(1, GetWallpaperName(i));
_sw_wallpapers[i]->Canvas(1)->ReverseColor(); _sw_wallpapers[i]->Canvas(1)->ReverseColor();
_sw_wallpapers[i]->SetID(i); _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[i]->Bind(1, &sw_wallpapers_cb);
} }
_sw_wallpapers[GetWallpaperID()]->setState(1); _sw_wallpapers[GetWallpaperID()]->setState(1);

4
src/frame/frame_settings_wifi.cpp
View File

@@ -7,7 +7,7 @@
bool _update_flag = false; bool _update_flag = false;
EPDGUI_Button *_connect_key = NULL; 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$_") { if (((EPDGUI_Button*)(args[0]))->GetCustomString() == "_$refresh$_") {
_update_flag = true; _update_flag = true;
} else { } else {
@@ -33,7 +33,7 @@ Frame_Settings_Wifi::Frame_Settings_Wifi(void) {
_key_wifi[i]->CanvasNormal()->setTextColor(15); _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, 0, _key_wifi[i]);
_key_wifi[i]->AddArgs(EPDGUI_Button::EVENT_RELEASED, 1, (void*)(&_is_run)); _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"); exitbtn("Settings");

2
src/global_setting.cpp
View File

@@ -54,7 +54,7 @@ uint16_t global_reader_textsize = 32;
uint8_t global_time_synced = false; uint8_t global_time_synced = false;
uint8_t global_ttf_file_loaded = false; uint8_t global_ttf_file_loaded = false;
uint8_t global_init_status = 0xFF; uint8_t global_init_status = 0xFF;
int8_t global_timezone = 8; int8_t global_timezone = 0;
int8_t GetTimeZone(void) { int8_t GetTimeZone(void) {