Update common screens

luc-github · May 7, 2024 · c7c449d · c7c449d
1 parent 8737fb0
commit c7c449d
Show file tree

Hide file tree

Showing 17 changed files with 695 additions and 139 deletions.
diff --git a/main/display/3dprinter/marlin/esp3d_tft_ui.cpp b/main/display/3dprinter/marlin/esp3d_tft_ui.cpp
@@ -26,5 +26,5 @@
 
 void create_application(void) {
   ESP3DStyle::init();
-  splashScreen::enter();
+  splashScreen::create();
 }
diff --git a/main/display/3dprinter/marlin/screens/main_screen.cpp b/main/display/3dprinter/marlin/screens/main_screen.cpp
@@ -472,7 +472,7 @@ void main_screen_delay_timer_cb(lv_timer_t *timer) {
   }
   switch (next_screen) {
     case ESP3DScreenType::none:
-      emptyScreen::empty_screen();
+      emptyScreen::create();
       break;
     case ESP3DScreenType::temperatures:
       temperaturesScreen::temperatures_screen(main_screen_temperature_target);
@@ -488,7 +488,7 @@ void main_screen_delay_timer_cb(lv_timer_t *timer) {
       break;
 #if ESP3D_SD_CARD_FEATURE
     case ESP3DScreenType::files:
-      filesScreen::files_screen();
+      filesScreen::create();
       break;
 #endif  // ESP3D_SD_CARD_FEATURE
     case ESP3DScreenType::menu:

diff --git a/main/display/3dprinter/repetier/screens/main_screen.cpp b/main/display/3dprinter/repetier/screens/main_screen.cpp
@@ -470,7 +470,7 @@ void main_screen_delay_timer_cb(lv_timer_t *timer) {
   }
   switch (next_screen) {
     case ESP3DScreenType::none:
-      emptyScreen::empty_screen();
+      emptyScreen::create();
       break;
     case ESP3DScreenType::temperatures:
       temperaturesScreen::temperatures_screen(main_screen_temperature_target);
@@ -486,7 +486,7 @@ void main_screen_delay_timer_cb(lv_timer_t *timer) {
       break;
 #if ESP3D_SD_CARD_FEATURE
     case ESP3DScreenType::files:
-      filesScreen::files_screen();
+      filesScreen::create();
       break;
 #endif  // ESP3D_SD_CARD_FEATURE
     case ESP3DScreenType::menu:

diff --git a/main/display/3dprinter/smoothieware/screens/main_screen.cpp b/main/display/3dprinter/smoothieware/screens/main_screen.cpp
@@ -470,7 +470,7 @@ void main_screen_delay_timer_cb(lv_timer_t *timer) {
   }
   switch (next_screen) {
     case ESP3DScreenType::none:
-      emptyScreen::empty_screen();
+      emptyScreen::create();
       break;
     case ESP3DScreenType::temperatures:
       temperaturesScreen::temperatures_screen(main_screen_temperature_target);
@@ -486,7 +486,7 @@ void main_screen_delay_timer_cb(lv_timer_t *timer) {
       break;
 #if ESP3D_SD_CARD_FEATURE
     case ESP3DScreenType::files:
-      filesScreen::files_screen();
+      filesScreen::create();
       break;
 #endif  // ESP3D_SD_CARD_FEATURE
     case ESP3DScreenType::menu:

diff --git a/main/display/cnc/grbl/screens/main_screen.cpp b/main/display/cnc/grbl/screens/main_screen.cpp
@@ -268,14 +268,14 @@ void main_screen_delay_timer_cb(lv_timer_t *timer) {
   }
   switch (next_screen) {
     case ESP3DScreenType::none:
-      emptyScreen::empty_screen();
+      emptyScreen::create();
       break;
     // case ESP3DScreenType::positions:
     //   positionsScreen::positions_screen();
     //   break;
 #if ESP3D_SD_CARD_FEATURE
     case ESP3DScreenType::files:
-      filesScreen::files_screen();
+      filesScreen::create();
       break;
 #endif  // ESP3D_SD_CARD_FEATURE
     case ESP3DScreenType::menu:

diff --git a/main/display/components/wifi_status_component.cpp b/main/display/components/wifi_status_component.cpp
@@ -203,11 +203,11 @@ bool network_mode_cb(ESP3DValuesIndex index, const char *value,
       wifi_display_signal();
       wifi_display_mode();
       if (esp3dTftui.get_current_screen() == ESP3DScreenType::access_point) {
-        apScreen::update_button_ok();
+        apScreen::callback();
       }
       if (esp3dTftui.get_current_screen() == ESP3DScreenType::station) {
-        staScreen::update_button_ok();
-        staScreen::update_sta_button_scan();
+        staScreen::callback();
+        staScreen::callback_scan();
       }
       if (esp3dTftui.get_current_screen() == ESP3DScreenType::wifi) {
         wifiScreen::callback();