From 3b7b49c62b88813e2685d7ffca52e511b4ac720c Mon Sep 17 00:00:00 2001
From: suchmememanyskill <38142618+suchmememanyskill@users.noreply.github.com>
Date: Thu, 7 Mar 2024 23:25:12 +0100
Subject: [PATCH 1/9] Split configuration; start printer panel

---
 CYD-Klipper/src/conf/global_config.cpp        |  80 +++++++--
 CYD-Klipper/src/conf/global_config.h          |  82 +++++----
 CYD-Klipper/src/core/data_setup.cpp           | 108 +++++++++++-
 CYD-Klipper/src/core/data_setup.h             |   8 +
 .../src/core/device/ESP32-2432S028R.cpp       |   6 +-
 .../src/core/device/ESP32-3248S035C.cpp       |   6 +-
 .../src/core/device/ESP32-smartdisplay.cpp    |   4 +-
 CYD-Klipper/src/core/http_client.cpp          |   7 +-
 CYD-Klipper/src/core/lv_setup.cpp             |  37 +++--
 CYD-Klipper/src/main.cpp                      |   2 +-
 CYD-Klipper/src/ui/ip_setup.cpp               |  30 ++--
 CYD-Klipper/src/ui/main_ui.cpp                |   2 +-
 CYD-Klipper/src/ui/nav_buttons.cpp            |  13 ++
 CYD-Klipper/src/ui/ota_setup.cpp              |   2 +-
 CYD-Klipper/src/ui/panels/panel.h             |   1 +
 CYD-Klipper/src/ui/panels/printer_panel.cpp   | 155 ++++++++++++++++++
 CYD-Klipper/src/ui/panels/settings_panel.cpp  |  96 +++++++----
 CYD-Klipper/src/ui/panels/temp_panel.cpp      |  26 +--
 CYD-Klipper/src/ui/wifi_setup.cpp             |  16 +-
 19 files changed, 533 insertions(+), 148 deletions(-)
 create mode 100644 CYD-Klipper/src/ui/panels/printer_panel.cpp

diff --git a/CYD-Klipper/src/conf/global_config.cpp b/CYD-Klipper/src/conf/global_config.cpp
index 7e86626..e717eee 100644
--- a/CYD-Klipper/src/conf/global_config.cpp
+++ b/CYD-Klipper/src/conf/global_config.cpp
@@ -14,14 +14,16 @@ COLOR_DEF color_defs[] = {
     {LV_PALETTE_PURPLE, 0, LV_PALETTE_GREY},
 };
 
-void WriteGlobalConfig() {
+void write_global_config()
+{
     Preferences preferences;
     preferences.begin("global_config", false);
     preferences.putBytes("global_config", &global_config, sizeof(global_config));
     preferences.end();
 }
 
-void VerifyVersion(){
+void verify_version()
+{
     Preferences preferences;
     if (!preferences.begin("global_config", false))
         return;
@@ -37,17 +39,73 @@ void VerifyVersion(){
     preferences.end();
 }
 
-void LoadGlobalConfig() {
+PRINTER_CONFIG* get_current_printer_config()
+{
+    return &global_config.printer_config[global_config.printer_index];
+}
+
+int get_printer_config_count()
+{
+    int count = 0;
+    for (int i = 0; i < PRINTER_CONFIG_COUNT; i++) {
+        if (global_config.printer_config[i].ip_configured)
+            count++;
+    }
+    return count;
+}
+
+int get_printer_config_free_index()
+{
+    for (int i = 0; i < PRINTER_CONFIG_COUNT; i++) {
+        if (!global_config.printer_config[i].ip_configured)
+            return i;
+    }
+    return -1;
+}
+
+void set_printer_config_index(int index)
+{
+    if (index < 0 || index >= PRINTER_CONFIG_COUNT)
+        return;
+
+    PRINTER_CONFIG* old_config = &global_config.printer_config[global_config.printer_index];
+    PRINTER_CONFIG* new_config = &global_config.printer_config[index];
+
+    global_config.printer_index = index;
+
+    if (!new_config->ip_configured){
+        new_config->raw = old_config->raw;
+        new_config->ip_configured = false;
+        new_config->auth_configured = false;
+
+        new_config->printer_name[0] = 0;
+        new_config->klipper_host[0] = 0;
+        new_config->klipper_auth[0] = 0;
+        new_config->klipper_port = 0;
+
+        new_config->color_scheme = old_config->color_scheme;
+
+        for (int i = 0; i < 3; i++){
+            new_config->hotend_presets[i] = old_config->hotend_presets[i];
+            new_config->bed_presets[i] = old_config->bed_presets[i];
+        }
+
+        ESP.restart();
+    }    
+}
+
+void load_global_config() 
+{
     global_config.version = CONFIG_VERSION;
     global_config.brightness = 255;
-    global_config.screenTimeout = 5;
-    global_config.hotend_presets[0] = 0;
-    global_config.hotend_presets[1] = 200;
-    global_config.hotend_presets[2] = 240;
-    global_config.bed_presets[0] = 0;
-    global_config.bed_presets[1] = 60;
-    global_config.bed_presets[2] = 70;
-    VerifyVersion();
+    global_config.screen_timeout = 5;
+    global_config.printer_config[0].hotend_presets[0] = 0;
+    global_config.printer_config[0].hotend_presets[1] = 200;
+    global_config.printer_config[0].hotend_presets[2] = 240;
+    global_config.printer_config[0].bed_presets[0] = 0;
+    global_config.printer_config[0].bed_presets[1] = 60;
+    global_config.printer_config[0].bed_presets[2] = 70;
+    verify_version();
     Preferences preferences;
     preferences.begin("global_config", true);
     preferences.getBytes("global_config", &global_config, sizeof(global_config));
diff --git a/CYD-Klipper/src/conf/global_config.h b/CYD-Klipper/src/conf/global_config.h
index 4ed198e..5a67a01 100644
--- a/CYD-Klipper/src/conf/global_config.h
+++ b/CYD-Klipper/src/conf/global_config.h
@@ -3,7 +3,8 @@
 
 #include "lvgl.h"
 
-#define CONFIG_VERSION 4
+#define CONFIG_VERSION 5
+#define PRINTER_CONFIG_COUNT 8
 
 enum {
     REMAINING_TIME_CALC_PERCENTAGE = 0,
@@ -11,47 +12,62 @@ enum {
     REMAINING_TIME_CALC_SLICER = 2,
 };
 
+typedef struct _PRINTER_CONFIG {
+    union {
+        unsigned int raw;
+        struct {
+            // Internal
+            bool ip_configured : 1;
+            bool auth_configured : 1;
+
+            // External
+            bool light_mode : 1;
+            bool invert_colors : 1;
+            unsigned char remaining_time_calc_mode : 2;
+        };
+    };
+
+    char printer_name[17];
+    char klipper_host[65];
+    char klipper_auth[33];
+    unsigned short klipper_port;
+    
+    unsigned char color_scheme;
+
+    unsigned short hotend_presets[3];
+    unsigned short bed_presets[3];
+} PRINTER_CONFIG;
+
 typedef struct _GLOBAL_CONFIG {
     unsigned char version;
     union {
         unsigned int raw;
         struct {
             // Internal
-            bool screenCalibrated : 1;
-            bool wifiConfigured : 1;
-            bool ipConfigured : 1;
+            bool screen_calibrated : 1;
+            bool wifi_configured : 1;
 
             // External
-            bool lightMode : 1;
-            bool invertColors : 1;
-            bool rotateScreen : 1;
-            bool onDuringPrint : 1;
-            bool autoOtaUpdate : 1;
-            unsigned char remaining_time_calc_mode : 2;
-
-            // Internal
-            bool auth_configured : 1;
+            bool rotate_screen : 1;
+            bool auto_ota_update : 1;
+            bool multi_printer_mode : 1;
+            bool on_during_print : 1;
         };
     };
-    float screenCalXOffset;
-    float screenCalXMult;
-    float screenCalYOffset;
-    float screenCalYMult;
 
-    char wifiSSID[32];
-    char wifiPassword[64];
+    PRINTER_CONFIG printer_config[PRINTER_CONFIG_COUNT];
 
-    char klipperHost[64];
-    unsigned short klipperPort;
+    float screen_cal_x_offset;
+    float screen_cal_x_mult;
+    float screen_cal_y_offset;
+    float screen_cal_y_mult;
+
+    char wifi_SSID[32];
+    char wifi_password[64];
     
-    unsigned char color_scheme;
     unsigned char brightness;
-    unsigned char screenTimeout;
-
-    unsigned short hotend_presets[3];
-    unsigned short bed_presets[3];
-
-    char klipper_auth[33];
+    unsigned char screen_timeout;
+    unsigned char printer_index;
 } GLOBAL_CONFIG;
     
 typedef struct _COLOR_DEF {
@@ -63,8 +79,12 @@ typedef struct _COLOR_DEF {
 extern GLOBAL_CONFIG global_config;
 extern COLOR_DEF color_defs[];
 
-void WriteGlobalConfig();
-void VerifyVersion();
-void LoadGlobalConfig();
+void write_global_config();
+void verify_version();
+void load_global_config();
+
+PRINTER_CONFIG* get_current_printer_config();
+int get_printer_config_count();
+void set_printer_config_index(int index);
 
 #endif // !_GLOBAL_CONFIG_INIT
\ No newline at end of file
diff --git a/CYD-Klipper/src/core/data_setup.cpp b/CYD-Klipper/src/core/data_setup.cpp
index d104ad3..c09743e 100644
--- a/CYD-Klipper/src/core/data_setup.cpp
+++ b/CYD-Klipper/src/core/data_setup.cpp
@@ -14,6 +14,7 @@ const char *printer_state_messages[] = {
     "Printing"};
 
 Printer printer = {0};
+PrinterMinimal *printer_minimal;
 int klipper_request_consecutive_fail_count = 0;
 char filename_buff[512] = {0};
 SemaphoreHandle_t freezeRenderThreadSemaphore, freezeRequestThreadSemaphore;
@@ -49,8 +50,7 @@ void send_gcode(bool wait, const char *gcode)
     SETUP_HTTP_CLIENT_FULL("/printer/gcode/script?script=" + urlEncode(gcode), false, wait ? 5000 : 750);
     try
     {
-        int result = client.GET();
-        Serial.printf("Send gcode result: %d\n", result);
+        client.GET();
     }
     catch (...)
     {
@@ -111,6 +111,7 @@ int last_slicer_time_query = -15000;
 void fetch_printer_data()
 {
     freeze_request_thread();
+    PRINTER_CONFIG *config = get_current_printer_config();
     SETUP_HTTP_CLIENT("/printer/objects/query?extruder&heater_bed&toolhead&gcode_move&virtual_sdcard&print_stats&webhooks&fan")
 
     int httpCode = client.GET();
@@ -247,15 +248,15 @@ void fetch_printer_data()
                     remaining_time_s_slicer = printer.slicer_estimated_print_time_s - printer.elapsed_time_s;
                 }
 
-                if (remaining_time_s_slicer <= 0 || global_config.remaining_time_calc_mode == REMAINING_TIME_CALC_PERCENTAGE)
+                if (remaining_time_s_slicer <= 0 || config->remaining_time_calc_mode == REMAINING_TIME_CALC_PERCENTAGE)
                 {
                     printer.remaining_time_s = remaining_time_s_percentage;
                 }
-                else if (global_config.remaining_time_calc_mode == REMAINING_TIME_CALC_INTERPOLATED)
+                else if (config->remaining_time_calc_mode == REMAINING_TIME_CALC_INTERPOLATED)
                 {
                     printer.remaining_time_s = remaining_time_s_percentage * printer.print_progress + remaining_time_s_slicer * (1 - printer.print_progress);
                 }
-                else if (global_config.remaining_time_calc_mode == REMAINING_TIME_CALC_SLICER)
+                else if (config->remaining_time_calc_mode == REMAINING_TIME_CALC_SLICER)
                 {
                     printer.remaining_time_s = remaining_time_s_slicer;
                 }
@@ -297,6 +298,94 @@ void fetch_printer_data()
     }
 }
 
+void fetch_printer_data_minimal()
+{
+    PrinterMinimal data[PRINTER_CONFIG_COUNT] = {0};
+
+    for (int i = 0; i < PRINTER_CONFIG_COUNT; i++){
+        PRINTER_CONFIG *config = &global_config.printer_config[i];
+
+        if (!config->ip_configured)
+        {
+            data[i].online = false;
+            continue;
+        }
+
+        delay(10);
+        HTTPClient client;
+        configure_http_client(client, "http://" + String(config->klipper_host) + ":" + String(config->klipper_port) + "/printer/objects/query?webhooks&print_stats&virtual_sdcard", true, 1000);
+        freeze_request_thread();
+
+        int httpCode = client.GET();
+        delay(10);
+        if (httpCode == 200)
+        {
+            data[i].online = true;
+            JsonDocument doc;
+            deserializeJson(doc, client.getStream());
+            auto status = doc["result"]["status"];
+
+            unfreeze_request_thread();
+
+            if (status.containsKey("webhooks"))
+            {
+                const char *state = status["webhooks"]["state"];
+
+                if (strcmp(state, "ready") == 0 && data[i].state == PRINTER_STATE_ERROR)
+                {
+                    data[i].state = PRINTER_STATE_IDLE;
+                }
+                else if (strcmp(state, "shutdown") == 0 && data[i].state != PRINTER_STATE_ERROR)
+                {
+                    data[i].state = PRINTER_STATE_ERROR;
+                }
+            }
+
+            if (printer_minimal->state != PRINTER_STATE_ERROR)
+            {
+                if (status.containsKey("virtual_sdcard"))
+                {
+                    data[i].print_progress = status["virtual_sdcard"]["progress"];
+                }
+
+                if (status.containsKey("print_stats"))
+                {
+                    const char *state = status["print_stats"]["state"];
+
+                    if (state == nullptr)
+                    {
+                        data[i].state = PRINTER_STATE_ERROR;
+                    }
+                    else if (strcmp(state, "printing") == 0)
+                    {
+                        data[i].state = PRINTER_STATE_PRINTING;
+                    }
+                    else if (strcmp(state, "paused") == 0)
+                    {
+                        data[i].state = PRINTER_STATE_PAUSED;
+                    }
+                    else if (strcmp(state, "complete") == 0 || strcmp(state, "cancelled") == 0 || strcmp(state, "standby") == 0)
+                    {
+                        data[i].state = PRINTER_STATE_IDLE;
+                    }
+                }
+            }
+
+            Serial.printf("Record: %d %f %d\n", data[i].online, data[i].print_progress, data[i].state);
+        }
+        else 
+        {
+            printer_minimal->online = false;
+            unfreeze_request_thread();
+        }
+    }
+
+    freeze_render_thread();
+    memcpy(printer_minimal, data, sizeof(PrinterMinimal) * PRINTER_CONFIG_COUNT);
+    lv_msg_send(DATA_PRINTER_MINIMAL, NULL);
+    unfreeze_render_thread();
+}
+
 void data_loop()
 {
     // Causes other threads that are trying to lock the thread to actually lock it
@@ -307,9 +396,16 @@ void data_loop()
 
 void data_loop_background(void * param){
     esp_task_wdt_init(10, true);
+    int loop_iter = 20;
     while (true){
         delay(data_update_interval);
         fetch_printer_data();
+        if (global_config.multi_printer_mode) {
+            if (loop_iter++ > 20){
+                fetch_printer_data_minimal();
+                loop_iter = 0;
+            }
+        }
     }
 }
 
@@ -317,9 +413,11 @@ TaskHandle_t background_loop;
 
 void data_setup()
 {
+    printer_minimal = (PrinterMinimal *)calloc(sizeof(PrinterMinimal), PRINTER_CONFIG_COUNT);
     semaphore_init();
     printer.print_filename = filename_buff;
     fetch_printer_data();
+
     macros_query_setup();
     freeze_render_thread();
     xTaskCreatePinnedToCore(data_loop_background, "data_loop_background", 5000, NULL, 0, &background_loop, 0);
diff --git a/CYD-Klipper/src/core/data_setup.h b/CYD-Klipper/src/core/data_setup.h
index d1a4224..f7071cb 100644
--- a/CYD-Klipper/src/core/data_setup.h
+++ b/CYD-Klipper/src/core/data_setup.h
@@ -37,12 +37,20 @@ typedef struct _Printer {
     int slicer_estimated_print_time_s;
 } Printer;
 
+typedef struct _PrinterMinimal {
+    bool online;
+    unsigned char state;
+    float print_progress; // 0 -> 1
+} PrinterMinimal;
+
 extern Printer printer;
+extern PrinterMinimal *printer_minimal;
 extern int klipper_request_consecutive_fail_count;
 
 #define DATA_PRINTER_STATE 1
 #define DATA_PRINTER_DATA 2
 #define DATA_PRINTER_TEMP_PRESET 3
+#define DATA_PRINTER_MINIMAL 4
 
 void data_loop();
 void data_setup();
diff --git a/CYD-Klipper/src/core/device/ESP32-2432S028R.cpp b/CYD-Klipper/src/core/device/ESP32-2432S028R.cpp
index e8a3f70..e38edec 100644
--- a/CYD-Klipper/src/core/device/ESP32-2432S028R.cpp
+++ b/CYD-Klipper/src/core/device/ESP32-2432S028R.cpp
@@ -67,14 +67,14 @@ void screen_lv_touchRead(lv_indev_drv_t *indev_driver, lv_indev_data_t *data)
 }
 
 void set_invert_display(){
-    tft.invertDisplay(global_config.invertColors);
+    tft.invertDisplay(get_current_printer_config()->invert_colors);
 }
 
 void screen_setup()
 {
     touchscreen_spi.begin(XPT2046_CLK, XPT2046_MISO, XPT2046_MOSI, XPT2046_CS);
     touchscreen.begin(touchscreen_spi);
-    touchscreen.setRotation(global_config.rotateScreen ? 3 : 1);
+    touchscreen.setRotation(global_config.rotate_screen ? 3 : 1);
 
     lv_init();
 
@@ -83,7 +83,7 @@ void screen_setup()
     ledcSetup(0, 5000, 12);
     ledcAttachPin(21, 0);
 
-    tft.setRotation(global_config.rotateScreen ? 3 : 1);
+    tft.setRotation(global_config.rotate_screen ? 3 : 1);
     tft.fillScreen(TFT_BLACK);
     set_invert_display();
     touchscreen_spi.begin(XPT2046_CLK, XPT2046_MISO, XPT2046_MOSI, XPT2046_CS);
diff --git a/CYD-Klipper/src/core/device/ESP32-3248S035C.cpp b/CYD-Klipper/src/core/device/ESP32-3248S035C.cpp
index fd39f00..22ea6d5 100644
--- a/CYD-Klipper/src/core/device/ESP32-3248S035C.cpp
+++ b/CYD-Klipper/src/core/device/ESP32-3248S035C.cpp
@@ -65,7 +65,7 @@ void screen_lv_touchRead(lv_indev_drv_t *indev_driver, lv_indev_data_t *data)
         {
             uint16_t magicX; // fix GT911 driver - orientation and handle rotation
             uint16_t magicY;
-            if (!global_config.rotateScreen)
+            if (!global_config.rotate_screen)
             {
                 magicY = tp.points[i].x;
                 magicX = TOUCH_HEIGHT - tp.points[i].y;
@@ -84,7 +84,7 @@ void screen_lv_touchRead(lv_indev_drv_t *indev_driver, lv_indev_data_t *data)
 
 void set_invert_display()
 {
-    tft.invertDisplay(global_config.invertColors);
+    tft.invertDisplay(get_current_printer_config()->invert_colors);
 }
 
 void set_LED_color(uint8_t rgbVal[3])
@@ -114,7 +114,7 @@ void screen_setup()
     tft.init();
     ledcSetup(0, 5000, 12);
     ledcAttachPin(TFT_BL, 0);
-    tft.setRotation(global_config.rotateScreen ? 3 : 1);
+    tft.setRotation(global_config.rotate_screen ? 3 : 1);
     tft.fillScreen(TFT_BLACK);
     set_invert_display();
     LED_init();
diff --git a/CYD-Klipper/src/core/device/ESP32-smartdisplay.cpp b/CYD-Klipper/src/core/device/ESP32-smartdisplay.cpp
index 3ca7b3a..4f723cf 100644
--- a/CYD-Klipper/src/core/device/ESP32-smartdisplay.cpp
+++ b/CYD-Klipper/src/core/device/ESP32-smartdisplay.cpp
@@ -21,7 +21,7 @@ void set_invert_display()
 
 void lv_screen_intercept(_lv_disp_drv_t *disp_drv, const lv_area_t *area, lv_color_t *color_p)
 {
-    if (global_config.invertColors) {
+    if (get_current_printer_config()->invert_colors) {
         uint32_t w = (area->x2 - area->x1 + 1);
         uint32_t h = (area->y2 - area->y1 + 1);
 
@@ -61,7 +61,7 @@ void screen_setup()
     }
 #endif // CYD_SCREEN_DISABLE_INVERT_COLORS
 
-    lv_disp_set_rotation(lv_disp_get_default(), (global_config.rotateScreen) ? ROTATION_INVERTED : ROTATION_NORMAL);
+    lv_disp_set_rotation(lv_disp_get_default(), (global_config.rotate_screen) ? ROTATION_INVERTED : ROTATION_NORMAL);
 }
 
 #endif // CYD_SCREEN_DRIVER_ESP32_SMARTDISPLAY
\ No newline at end of file
diff --git a/CYD-Klipper/src/core/http_client.cpp b/CYD-Klipper/src/core/http_client.cpp
index fb135bf..42edba3 100644
--- a/CYD-Klipper/src/core/http_client.cpp
+++ b/CYD-Klipper/src/core/http_client.cpp
@@ -3,12 +3,11 @@
 
 String get_full_url(String url_part)
 {
-    return "http://" + String(global_config.klipperHost) + ":" + String(global_config.klipperPort) + url_part;
+    return "http://" + String(get_current_printer_config()->klipper_host) + ":" + String(get_current_printer_config()->klipper_port) + url_part;
 }
 
 void configure_http_client(HTTPClient &client, String url, bool stream, int timeout)
 {
-    Serial.println(url);
     if (stream){
         client.useHTTP10(true);
     }
@@ -20,7 +19,7 @@ void configure_http_client(HTTPClient &client, String url, bool stream, int time
 
     client.begin(url);
 
-    if (global_config.auth_configured) {
-        client.addHeader("X-Api-Key", global_config.klipper_auth);
+    if (get_current_printer_config()->auth_configured) {
+        client.addHeader("X-Api-Key", get_current_printer_config()->klipper_auth);
     }
 }
\ No newline at end of file
diff --git a/CYD-Klipper/src/core/lv_setup.cpp b/CYD-Klipper/src/core/lv_setup.cpp
index 880af74..6f446ca 100644
--- a/CYD-Klipper/src/core/lv_setup.cpp
+++ b/CYD-Klipper/src/core/lv_setup.cpp
@@ -54,14 +54,14 @@ void lv_touch_intercept(lv_indev_drv_t *indev_driver, lv_indev_data_t *data)
 
         screen_timer_wake();
 #ifndef CYD_SCREEN_DISABLE_TOUCH_CALIBRATION
-        data->point.x = round((data->point.x * global_config.screenCalXMult) + global_config.screenCalXOffset);
-        data->point.y = round((data->point.y * global_config.screenCalYMult) + global_config.screenCalYOffset);
+        data->point.x = round((data->point.x * global_config.screen_cal_x_mult) + global_config.screen_cal_x_offset);
+        data->point.y = round((data->point.y * global_config.screen_cal_y_mult) + global_config.screen_cal_y_offset);
 #endif // CYD_SCREEN_DISABLE_TOUCH_CALIBRATION
     }
 }
 
 void lv_do_calibration(){
-    if (global_config.screenCalibrated){
+    if (global_config.screen_calibrated){
         return;
     }
 
@@ -149,22 +149,22 @@ void lv_do_calibration(){
     int16_t yDist = CYD_SCREEN_HEIGHT_PX - 20;
 #endif
 
-    global_config.screenCalXMult = (float)xDist / (float)(x2 - x1);
-    global_config.screenCalXOffset = 10.0 - ((float)x1 * global_config.screenCalXMult);
+    global_config.screen_cal_x_mult = (float)xDist / (float)(x2 - x1);
+    global_config.screen_cal_x_offset = 10.0 - ((float)x1 * global_config.screen_cal_x_mult);
 
-    global_config.screenCalYMult = (float)yDist / (float)(y2 - y1);
-    global_config.screenCalYOffset = 10.0 - ((float)y1 * global_config.screenCalYMult);
+    global_config.screen_cal_y_mult = (float)yDist / (float)(y2 - y1);
+    global_config.screen_cal_y_offset = 10.0 - ((float)y1 * global_config.screen_cal_y_mult);
 
-    if (global_config.screenCalXMult == std::numeric_limits<float>::infinity() || global_config.screenCalYMult == std::numeric_limits<float>::infinity()){
+    if (global_config.screen_cal_x_mult == std::numeric_limits<float>::infinity() || global_config.screen_cal_y_mult == std::numeric_limits<float>::infinity()){
         Serial.println("Calibration failed, please try again");
         ESP.restart();
     }
 
-    global_config.screenCalibrated = true;
-    WriteGlobalConfig();
+    global_config.screen_calibrated = true;
+    write_global_config();
 
     lv_obj_clean(lv_scr_act());
-    Serial.printf("Calibration done: X*%.2f + %.2f, Y*%.2f + %.2f\n", global_config.screenCalXMult, global_config.screenCalXOffset, global_config.screenCalYMult, global_config.screenCalYOffset);
+    Serial.printf("Calibration done: X*%.2f + %.2f, Y*%.2f + %.2f\n", global_config.screen_cal_x_mult, global_config.screen_cal_x_offset, global_config.screen_cal_y_mult, global_config.screen_cal_y_offset);
 }
 
 void set_screen_brightness()
@@ -207,7 +207,7 @@ void screen_timer_sleep(lv_timer_t *timer)
 
 void screen_timer_setup()
 {
-    screen_sleep_timer = lv_timer_create(screen_timer_sleep, global_config.screenTimeout * 1000 * 60, NULL);
+    screen_sleep_timer = lv_timer_create(screen_timer_sleep, global_config.screen_timeout * 1000 * 60, NULL);
     lv_timer_pause(screen_sleep_timer);
 }
 
@@ -228,26 +228,27 @@ void screen_timer_period(unsigned int period)
 
 void set_screen_timer_period()
 {
-    screen_timer_period(global_config.screenTimeout * 1000 * 60);
+    screen_timer_period(global_config.screen_timeout * 1000 * 60);
 }
 
 void set_color_scheme()
 {
+    PRINTER_CONFIG *config = get_current_printer_config();
     lv_disp_t *dispp = lv_disp_get_default();
     lv_color_t main_color = {0};
-    COLOR_DEF color_def = color_defs[global_config.color_scheme];
+    COLOR_DEF color_def = color_defs[config->color_scheme];
 
-    if (color_defs[global_config.color_scheme].primary_color_light > 0){
+    if (color_defs[config->color_scheme].primary_color_light > 0){
         main_color = lv_palette_lighten(color_def.primary_color, color_def.primary_color_light);
     }
-    else if (color_defs[global_config.color_scheme].primary_color_light < 0) {
+    else if (color_defs[config->color_scheme].primary_color_light < 0) {
         main_color = lv_palette_darken(color_def.primary_color, color_def.primary_color_light * -1);
     }
     else {
-        main_color = lv_palette_main(color_defs[global_config.color_scheme].primary_color);
+        main_color = lv_palette_main(color_defs[config->color_scheme].primary_color);
     }
 
-    lv_theme_t *theme = lv_theme_default_init(dispp, main_color, lv_palette_main(color_def.secondary_color), !global_config.lightMode, &CYD_SCREEN_FONT);
+    lv_theme_t *theme = lv_theme_default_init(dispp, main_color, lv_palette_main(color_def.secondary_color), !config->light_mode, &CYD_SCREEN_FONT);
     lv_disp_set_theme(dispp, theme);
 }
 
diff --git a/CYD-Klipper/src/main.cpp b/CYD-Klipper/src/main.cpp
index e728bbe..776962f 100644
--- a/CYD-Klipper/src/main.cpp
+++ b/CYD-Klipper/src/main.cpp
@@ -13,7 +13,7 @@
 void setup() {
     Serial.begin(115200);
     Serial.println("Hello World");
-    LoadGlobalConfig();
+    load_global_config();
     screen_setup();
     lv_setup();
     Serial.println("Screen init done");
diff --git a/CYD-Klipper/src/ui/ip_setup.cpp b/CYD-Klipper/src/ui/ip_setup.cpp
index fbea738..d741fd4 100644
--- a/CYD-Klipper/src/ui/ip_setup.cpp
+++ b/CYD-Klipper/src/ui/ip_setup.cpp
@@ -69,21 +69,21 @@ static void ta_event_cb(lv_event_t * e) {
     }
     else if (code == LV_EVENT_READY) 
     {
-        strcpy(global_config.klipperHost, lv_textarea_get_text(hostEntry));
-        global_config.klipperPort = atoi(lv_textarea_get_text(portEntry));
+        strcpy(get_current_printer_config()->klipper_host, lv_textarea_get_text(hostEntry));
+        get_current_printer_config()->klipper_port = atoi(lv_textarea_get_text(portEntry));
 
         connection_status_t status = verify_ip();
         if (status == CONNECT_OK)
         {
-            global_config.ipConfigured = true;
-            WriteGlobalConfig();
+            get_current_printer_config()->ip_configured = true;
+            write_global_config();
             connect_ok = true;
         }
         else if (status == CONNECT_AUTH_REQUIRED)
         {
             label = NULL;
-            global_config.ipConfigured = true;
-            WriteGlobalConfig();
+            get_current_printer_config()->ip_configured = true;
+            write_global_config();
         }
         else
         {
@@ -109,7 +109,7 @@ static void reset_btn_event_handler(lv_event_t * e){
     lv_event_code_t code = lv_event_get_code(e);
 
     if(code == LV_EVENT_CLICKED) {
-        global_config.ipConfigured = false;
+        get_current_printer_config()->ip_configured = false;
         ip_init_inner();
     }
 }
@@ -176,9 +176,9 @@ static void keyboard_event_auth_entry(lv_event_t * e) {
         int len = strlen(txt);
         if (len > 0)
         {
-            global_config.auth_configured = true;
-            strcpy(global_config.klipper_auth, txt);
-            WriteGlobalConfig();
+            get_current_printer_config()->auth_configured = true;
+            strcpy(get_current_printer_config()->klipper_auth, txt);
+            write_global_config();
             auth_entry_done = true;
         }
     }
@@ -190,7 +190,7 @@ static void keyboard_event_auth_entry(lv_event_t * e) {
 
 void handle_auth_entry(){
     auth_entry_done = false;
-    global_config.klipper_auth[32] = 0;
+    get_current_printer_config()->klipper_auth[32] = 0;
     lv_obj_clean(lv_scr_act());
 
     lv_obj_t * root = lv_create_empty_panel(lv_scr_act());
@@ -212,8 +212,8 @@ void handle_auth_entry(){
     lv_textarea_set_max_length(passEntry, 32);
     lv_textarea_set_one_line(passEntry, true);
 
-    if (global_config.auth_configured)
-        lv_textarea_set_text(passEntry, global_config.klipper_auth);
+    if (get_current_printer_config()->auth_configured)
+        lv_textarea_set_text(passEntry, get_current_printer_config()->klipper_auth);
     else
         lv_textarea_set_text(passEntry, "");
 
@@ -235,7 +235,7 @@ void handle_auth_entry(){
 }
 
 void ip_init_inner(){
-    if (global_config.ipConfigured) {
+    if (get_current_printer_config()->ip_configured) {
         redraw_connect_screen();
         return;
     }
@@ -298,7 +298,7 @@ void ip_init(){
         lv_timer_handler();
         lv_task_handler();
 
-        if (!connect_ok && global_config.ipConfigured && (millis() - last_data_update_ip) > data_update_interval_ip){
+        if (!connect_ok && get_current_printer_config()->ip_configured && (millis() - last_data_update_ip) > data_update_interval_ip){
             connection_status_t status = verify_ip();
 
             connect_ok = status == CONNECT_OK;
diff --git a/CYD-Klipper/src/ui/main_ui.cpp b/CYD-Klipper/src/ui/main_ui.cpp
index a3194ee..8191d5c 100644
--- a/CYD-Klipper/src/ui/main_ui.cpp
+++ b/CYD-Klipper/src/ui/main_ui.cpp
@@ -93,7 +93,7 @@ void error_ui(){
 }
 
 void check_if_screen_needs_to_be_disabled(){
-    if (global_config.onDuringPrint && printer.state == PRINTER_STATE_PRINTING){
+    if (global_config.on_during_print && printer.state == PRINTER_STATE_PRINTING){
         screen_timer_wake();
         screen_timer_stop();
     }
diff --git a/CYD-Klipper/src/ui/nav_buttons.cpp b/CYD-Klipper/src/ui/nav_buttons.cpp
index 3a489ae..cf6a29f 100644
--- a/CYD-Klipper/src/ui/nav_buttons.cpp
+++ b/CYD-Klipper/src/ui/nav_buttons.cpp
@@ -4,6 +4,7 @@
 #include "nav_buttons.h"
 #include "ui_utils.h"
 #include <stdio.h>
+#include "../conf/global_config.h"
 
 static lv_style_t nav_button_style;
 
@@ -76,6 +77,10 @@ static void btn_click_macros(lv_event_t * e){
     nav_buttons_setup(4);
 }
 
+static void btn_click_printer(lv_event_t * e){
+    nav_buttons_setup(6);
+}
+
 void create_button(const char* icon, const char* name, lv_event_cb_t button_click, lv_event_cb_t label_update, lv_obj_t * root){
     lv_obj_t* btn = lv_btn_create(root);
     lv_obj_set_flex_grow(btn, 1);
@@ -131,6 +136,11 @@ void nav_buttons_setup(unsigned char active_panel){
     // Macros
     create_button(LV_SYMBOL_GPS, "Macro", btn_click_macros, NULL, root_panel);
 
+    if (global_config.multi_printer_mode)
+    {
+        create_button(LV_SYMBOL_HOME, "Printer", btn_click_printer, NULL, root_panel);
+    }
+
     lv_obj_t * panel = lv_create_empty_panel(lv_scr_act());
     lv_obj_set_size(panel, CYD_SCREEN_PANEL_WIDTH_PX, CYD_SCREEN_PANEL_HEIGHT_PX);
     lv_obj_align(panel, LV_ALIGN_TOP_RIGHT, 0, 0);
@@ -154,6 +164,9 @@ void nav_buttons_setup(unsigned char active_panel){
         case 5:
             stats_panel_init(panel);
             break;
+        case 6:
+            printer_panel_init(panel);
+            break;
     }
 
     lv_msg_send(DATA_PRINTER_DATA, &printer);
diff --git a/CYD-Klipper/src/ui/ota_setup.cpp b/CYD-Klipper/src/ui/ota_setup.cpp
index 9d69d5b..40f9398 100644
--- a/CYD-Klipper/src/ui/ota_setup.cpp
+++ b/CYD-Klipper/src/ui/ota_setup.cpp
@@ -85,7 +85,7 @@ void ota_init()
     Serial.printf("OTA Update Result: %d\n", result);
     update_available = result == ESP32OTAPull::UPDATE_AVAILABLE;
 
-    if (global_config.autoOtaUpdate && update_available)
+    if (global_config.auto_ota_update && update_available)
     {
         ota_do_update(true);
     }
diff --git a/CYD-Klipper/src/ui/panels/panel.h b/CYD-Klipper/src/ui/panels/panel.h
index d69910a..a18095c 100644
--- a/CYD-Klipper/src/ui/panels/panel.h
+++ b/CYD-Klipper/src/ui/panels/panel.h
@@ -10,4 +10,5 @@ void move_panel_init(lv_obj_t* panel);
 void progress_panel_init(lv_obj_t* panel);
 void macros_panel_init(lv_obj_t* panel);
 void stats_panel_init(lv_obj_t* panel);
+void printer_panel_init(lv_obj_t* panel);
 void macros_panel_add_power_devices_to_panel(lv_obj_t * panel, POWERQUERY query);
\ No newline at end of file
diff --git a/CYD-Klipper/src/ui/panels/printer_panel.cpp b/CYD-Klipper/src/ui/panels/printer_panel.cpp
new file mode 100644
index 0000000..c4ef1f8
--- /dev/null
+++ b/CYD-Klipper/src/ui/panels/printer_panel.cpp
@@ -0,0 +1,155 @@
+#include "panel.h"
+#include "../../conf/global_config.h"
+#include "../../core/data_setup.h"
+#include "../ui_utils.h"
+
+const char * printer_status[] = {
+    "Error",
+    "Idle",
+    "Printing",
+    "Paused"
+};
+
+const static lv_point_t line_points[] = { {0, 0}, {(short int)((CYD_SCREEN_PANEL_WIDTH_PX - CYD_SCREEN_GAP_PX * 2) * 0.85f), 0} };
+
+static void update_printer_status_text(lv_event_t * e) 
+{
+    lv_obj_t * label = lv_event_get_target(e);
+    PRINTER_CONFIG * config = (PRINTER_CONFIG*)lv_event_get_user_data(e);
+    int index = config - global_config.printer_config;
+    PrinterMinimal * printer = &printer_minimal[index];
+
+    if (!printer->online){
+        lv_label_set_text(label, "Offline");
+        return;
+    }
+
+    lv_label_set_text(label, printer_status[printer->state]);
+}
+
+static void update_printer_percentage_bar(lv_event_t * e)
+{
+    lv_obj_t * percentage = lv_event_get_target(e);
+    PRINTER_CONFIG * config = (PRINTER_CONFIG*)lv_event_get_user_data(e);
+    int index = config - global_config.printer_config;
+    PrinterMinimal * printer = &printer_minimal[index];
+
+    if (printer->online && (printer->state == PRINTER_STATE_PRINTING || printer->state == PRINTER_STATE_PAUSED)){
+        lv_bar_set_value(percentage, printer->print_progress * 100, LV_ANIM_OFF);
+    }
+    else {
+        lv_bar_set_value(percentage, 0, LV_ANIM_OFF);
+    }
+}
+
+static void update_printer_percentage_text(lv_event_t * e)
+{
+    lv_obj_t * label = lv_event_get_target(e);
+    PRINTER_CONFIG * config = (PRINTER_CONFIG*)lv_event_get_user_data(e);
+    int index = config - global_config.printer_config;
+    PrinterMinimal * printer = &printer_minimal[index];
+
+    if (printer->online && (printer->state == PRINTER_STATE_PRINTING || printer->state == PRINTER_STATE_PAUSED)){
+        lv_label_set_text_fmt(label, "%.2f%%", printer->print_progress * 100);
+    }
+    else {
+        lv_label_set_text(label, "-");
+    }
+}
+
+static void btn_printer_delete(lv_event_t * e)
+{
+
+}
+
+static void btn_printer_rename(lv_event_t * e)
+{
+
+}
+
+static void btn_printer_activate(lv_event_t * e)
+{
+
+}
+
+void create_printer_ui(PRINTER_CONFIG * config, lv_obj_t * root)
+{
+    int index = config - global_config.printer_config;
+    auto width = CYD_SCREEN_PANEL_WIDTH_PX - CYD_SCREEN_GAP_PX * 2;
+
+    lv_obj_t * data_row_name = lv_create_empty_panel(root);
+    lv_layout_flex_row(data_row_name, LV_FLEX_ALIGN_SPACE_BETWEEN);
+    lv_obj_set_size(data_row_name, width, LV_SIZE_CONTENT);
+
+    lv_obj_t * label = lv_label_create(data_row_name);
+    lv_label_set_text(label, config->printer_name[0] == 0 ? config->klipper_host : config->printer_name);
+    
+    label = lv_label_create(data_row_name);
+    lv_obj_add_event_cb(label, update_printer_status_text, LV_EVENT_MSG_RECEIVED, config);
+    lv_msg_subsribe_obj(DATA_PRINTER_MINIMAL, label, config);
+
+    lv_obj_t * progress_row = lv_create_empty_panel(root);
+    lv_layout_flex_row(progress_row);
+    lv_obj_set_size(progress_row, width, LV_SIZE_CONTENT);
+    
+    lv_obj_t * progress_bar = lv_bar_create(progress_row);
+    lv_obj_set_flex_grow(progress_bar, 1);
+    lv_obj_add_event_cb(progress_bar, update_printer_percentage_bar, LV_EVENT_MSG_RECEIVED, config);
+    lv_msg_subsribe_obj(DATA_PRINTER_MINIMAL, progress_bar, config);
+
+    label = lv_label_create(progress_row);
+    lv_obj_set_style_text_font(label, &CYD_SCREEN_FONT_SMALL, 0);
+    lv_obj_add_event_cb(label, update_printer_percentage_text, LV_EVENT_MSG_RECEIVED, config);
+    lv_msg_subsribe_obj(DATA_PRINTER_MINIMAL, label, config);
+
+    lv_obj_t * button_row = lv_create_empty_panel(root);
+    lv_layout_flex_row(button_row);
+    lv_obj_set_size(button_row, width, CYD_SCREEN_MIN_BUTTON_HEIGHT_PX);
+
+    lv_obj_t * btn = lv_btn_create(button_row);
+    lv_obj_set_flex_grow(btn, 1);
+    lv_obj_add_event_cb(btn, btn_printer_delete, LV_EVENT_CLICKED, config);
+
+    label = lv_label_create(btn);
+    lv_label_set_text(label, LV_SYMBOL_TRASH);
+    lv_obj_center(label);
+
+    btn = lv_btn_create(button_row);
+    lv_obj_set_flex_grow(btn, 2);
+    lv_obj_add_event_cb(btn, btn_printer_rename, LV_EVENT_CLICKED, config);
+
+    label = lv_label_create(btn);
+    lv_label_set_text(label, "Rename");
+    lv_obj_center(label);
+
+    btn = lv_btn_create(button_row);
+    lv_obj_set_flex_grow(btn, 2);
+    lv_obj_add_event_cb(btn, btn_printer_activate, LV_EVENT_CLICKED, config);
+
+    label = lv_label_create(btn);
+    lv_label_set_text(label, "Activate");
+    lv_obj_center(label);
+
+    lv_obj_t * line = lv_line_create(root);
+    lv_line_set_points(line, line_points, 2);
+    lv_obj_set_style_line_width(line, 1, 0);
+    lv_obj_set_style_line_color(line, lv_color_hex(0xAAAAAA), 0);
+}
+
+void printer_panel_init(lv_obj_t* panel) 
+{
+    lv_obj_t * inner_panel = lv_create_empty_panel(panel);
+    lv_obj_align(inner_panel, LV_ALIGN_TOP_LEFT, CYD_SCREEN_GAP_PX, CYD_SCREEN_GAP_PX);
+    lv_obj_set_size(inner_panel, CYD_SCREEN_PANEL_WIDTH_PX - CYD_SCREEN_GAP_PX * 2, CYD_SCREEN_PANEL_HEIGHT_PX - CYD_SCREEN_GAP_PX * 2);
+    lv_layout_flex_column(inner_panel);
+    lv_obj_set_scrollbar_mode(inner_panel, LV_SCROLLBAR_MODE_OFF);
+
+    for (int i = 0; i < PRINTER_CONFIG_COUNT; i++){
+        PRINTER_CONFIG * config = &global_config.printer_config[i];
+        if (config->ip_configured) {
+            create_printer_ui(&global_config.printer_config[i], inner_panel);
+        }
+    }
+
+    lv_msg_send(DATA_PRINTER_MINIMAL, NULL);
+}
\ No newline at end of file
diff --git a/CYD-Klipper/src/ui/panels/settings_panel.cpp b/CYD-Klipper/src/ui/panels/settings_panel.cpp
index 165679a..94411b2 100644
--- a/CYD-Klipper/src/ui/panels/settings_panel.cpp
+++ b/CYD-Klipper/src/ui/panels/settings_panel.cpp
@@ -7,6 +7,7 @@
 #include <Esp.h>
 #include "../../core/lv_setup.h"
 #include "../ota_setup.h"
+#include "../nav_buttons.h"
 
 #ifndef REPO_VERSION
     #define REPO_VERSION "Unknown"
@@ -15,39 +16,44 @@
 static void invert_color_switch(lv_event_t * e){
     auto state = lv_obj_get_state(lv_event_get_target(e));
     bool checked = (state & LV_STATE_CHECKED == LV_STATE_CHECKED);
-    global_config.invertColors = checked;
-    WriteGlobalConfig();
+    get_current_printer_config()->invert_colors = checked;
+    write_global_config();
     set_invert_display();
 }
 
 static void reset_calibration_click(lv_event_t * e){
-    global_config.screenCalibrated = false;
-    WriteGlobalConfig();
+    global_config.screen_calibrated = false;
+    write_global_config();
     ESP.restart();
 }
 
 static void reset_wifi_click(lv_event_t * e){
-    global_config.wifiConfigured = false;
-    global_config.ipConfigured = false;
-    global_config.auth_configured = false;
-    WriteGlobalConfig();
+    global_config.wifi_configured = false;
+    write_global_config();
+    ESP.restart();
+}
+
+static void reset_ip_click(lv_event_t * e){
+    get_current_printer_config()->ip_configured = false;
+    get_current_printer_config()->auth_configured = false;
+    write_global_config();
     ESP.restart();
 }
 
 static void light_mode_switch(lv_event_t * e){
     auto state = lv_obj_get_state(lv_event_get_target(e));
     bool checked = (state & LV_STATE_CHECKED == LV_STATE_CHECKED);
-    global_config.lightMode = checked;
-    WriteGlobalConfig();
+    get_current_printer_config()->light_mode = checked;
+    write_global_config();
     set_color_scheme();
 }
 
 static void theme_dropdown(lv_event_t * e){
     lv_obj_t * dropdown = lv_event_get_target(e);
     auto selected = lv_dropdown_get_selected(dropdown);
-    global_config.color_scheme = selected;
+    get_current_printer_config()->color_scheme = selected;
     set_color_scheme();
-    WriteGlobalConfig();
+    write_global_config();
 }
 
 const char* brightness_options = "100%\n75%\n50%\n25%";
@@ -58,7 +64,7 @@ static void brightness_dropdown(lv_event_t * e){
     auto selected = lv_dropdown_get_selected(dropdown);
     global_config.brightness = brightness_options_values[selected];
     set_screen_brightness();
-    WriteGlobalConfig();
+    write_global_config();
 }
 
 const char* wake_timeout_options = "1m\n2m\n5m\n10m\n15m\n30m\n1h\n2h\n4h";
@@ -67,26 +73,26 @@ const char  wake_timeout_options_values[] = { 1, 2, 5, 10, 15, 30, 60, 120, 240
 static void wake_timeout_dropdown(lv_event_t * e){
     lv_obj_t * dropdown = lv_event_get_target(e);
     auto selected = lv_dropdown_get_selected(dropdown);
-    global_config.screenTimeout = wake_timeout_options_values[selected];
+    global_config.screen_timeout = wake_timeout_options_values[selected];
     set_screen_timer_period();
-    WriteGlobalConfig();
+    write_global_config();
 }
 
 static void rotate_screen_switch(lv_event_t* e){
     auto state = lv_obj_get_state(lv_event_get_target(e));
     bool checked = (state & LV_STATE_CHECKED == LV_STATE_CHECKED);
-    global_config.rotateScreen = checked;
-    global_config.screenCalibrated = false;
-    WriteGlobalConfig();
+    global_config.rotate_screen = checked;
+    global_config.screen_calibrated = false;
+    write_global_config();
     ESP.restart();
 }
 
 static void on_during_print_switch(lv_event_t* e){
     auto state = lv_obj_get_state(lv_event_get_target(e));
     bool checked = (state & LV_STATE_CHECKED == LV_STATE_CHECKED);
-    global_config.onDuringPrint = checked;
+    global_config.on_during_print = checked;
     check_if_screen_needs_to_be_disabled();
-    WriteGlobalConfig();
+    write_global_config();
 }
 
 static void btn_ota_do_update(lv_event_t * e){
@@ -96,16 +102,24 @@ static void btn_ota_do_update(lv_event_t * e){
 static void auto_ota_update_switch(lv_event_t* e){
     auto state = lv_obj_get_state(lv_event_get_target(e));
     bool checked = (state & LV_STATE_CHECKED == LV_STATE_CHECKED);
-    global_config.autoOtaUpdate = checked;
-    WriteGlobalConfig();
+    global_config.auto_ota_update = checked;
+    write_global_config();
+}
+
+static void multi_printer_switch(lv_event_t* e){
+    auto state = lv_obj_get_state(lv_event_get_target(e));
+    bool checked = (state & LV_STATE_CHECKED == LV_STATE_CHECKED);
+    global_config.multi_printer_mode = checked;
+    write_global_config();
+    nav_buttons_setup(3);
 }
 
 const char* estimated_time_options = "Percentage\nInterpolated\nSlicer";
 
 static void estimated_time_dropdown(lv_event_t * e){
     lv_obj_t * dropdown = lv_event_get_target(e);
-    global_config.remaining_time_calc_mode = lv_dropdown_get_selected(dropdown);
-    WriteGlobalConfig();
+    get_current_printer_config()->remaining_time_calc_mode = lv_dropdown_get_selected(dropdown);
+    write_global_config();
 }
 
 const static lv_point_t line_points[] = { {0, 0}, {(short int)((CYD_SCREEN_PANEL_WIDTH_PX - CYD_SCREEN_GAP_PX * 2) * 0.85f), 0} };
@@ -152,6 +166,15 @@ void settings_panel_init(lv_obj_t* panel){
 
     create_settings_widget("Configure WiFi", btn, panel);
 
+    btn = lv_btn_create(panel);
+    lv_obj_add_event_cb(btn, reset_ip_click, LV_EVENT_CLICKED, NULL);
+
+    label = lv_label_create(btn);
+    lv_label_set_text(label, "Restart");
+    lv_obj_center(label);
+
+    create_settings_widget("Configure IP", btn, panel);
+
 #ifndef CYD_SCREEN_DISABLE_TOUCH_CALIBRATION
     btn = lv_btn_create(panel);
     lv_obj_add_event_cb(btn, reset_calibration_click, LV_EVENT_CLICKED, NULL);
@@ -168,7 +191,7 @@ void settings_panel_init(lv_obj_t* panel){
     lv_obj_set_width(toggle, TOGGLE_WIDTH);
     lv_obj_add_event_cb(toggle, invert_color_switch, LV_EVENT_VALUE_CHANGED, NULL);
 
-    if (global_config.invertColors)
+    if (get_current_printer_config()->invert_colors)
         lv_obj_add_state(toggle, LV_STATE_CHECKED);
 
     create_settings_widget("Invert Colors", toggle, panel);
@@ -178,14 +201,14 @@ void settings_panel_init(lv_obj_t* panel){
     lv_obj_set_width(toggle, TOGGLE_WIDTH);
     lv_obj_add_event_cb(toggle, light_mode_switch, LV_EVENT_VALUE_CHANGED, NULL);
 
-    if (global_config.lightMode)
+    if (get_current_printer_config()->light_mode)
         lv_obj_add_state(toggle, LV_STATE_CHECKED);
 
     create_settings_widget("Light Mode", toggle, panel);
 
     dropdown = lv_dropdown_create(panel);
     lv_dropdown_set_options(dropdown, "Blue\nGreen\nGrey\nYellow\nOrange\nRed\nPurple");
-    lv_dropdown_set_selected(dropdown, global_config.color_scheme);
+    lv_dropdown_set_selected(dropdown, get_current_printer_config()->color_scheme);
     lv_obj_set_width(dropdown, DROPDOWN_WIDTH);
     lv_obj_add_event_cb(dropdown, theme_dropdown, LV_EVENT_VALUE_CHANGED, NULL);
 
@@ -212,7 +235,7 @@ void settings_panel_init(lv_obj_t* panel){
     lv_obj_add_event_cb(dropdown, wake_timeout_dropdown, LV_EVENT_VALUE_CHANGED, NULL);
 
     for (int i = 0; i < SIZEOF(wake_timeout_options_values); i++){
-        if (wake_timeout_options_values[i] == global_config.screenTimeout){
+        if (wake_timeout_options_values[i] == global_config.screen_timeout){
             lv_dropdown_set_selected(dropdown, i);
             break;
         }
@@ -226,14 +249,14 @@ void settings_panel_init(lv_obj_t* panel){
     lv_obj_set_width(dropdown, DROPDOWN_WIDTH);
     lv_obj_add_event_cb(dropdown, estimated_time_dropdown, LV_EVENT_VALUE_CHANGED, NULL);
 
-    lv_dropdown_set_selected(dropdown, global_config.remaining_time_calc_mode);
+    lv_dropdown_set_selected(dropdown, get_current_printer_config()->remaining_time_calc_mode);
     create_settings_widget("Estimated Time", dropdown, panel);
 
     toggle = lv_switch_create(panel);
     lv_obj_set_width(toggle, TOGGLE_WIDTH);
     lv_obj_add_event_cb(toggle, rotate_screen_switch, LV_EVENT_VALUE_CHANGED, NULL);
 
-    if (global_config.rotateScreen)
+    if (global_config.rotate_screen)
         lv_obj_add_state(toggle, LV_STATE_CHECKED);
     
     create_settings_widget("Rotate Screen", toggle, panel);
@@ -243,17 +266,26 @@ void settings_panel_init(lv_obj_t* panel){
     lv_obj_set_width(toggle, TOGGLE_WIDTH);
     lv_obj_add_event_cb(toggle, on_during_print_switch, LV_EVENT_VALUE_CHANGED, NULL);
 
-    if (global_config.onDuringPrint)
+    if (global_config.on_during_print)
         lv_obj_add_state(toggle, LV_STATE_CHECKED);
 
     create_settings_widget("Screen On During Print", toggle, panel);
 #endif
 
+    toggle = lv_switch_create(panel);
+    lv_obj_set_width(toggle, TOGGLE_WIDTH);
+    lv_obj_add_event_cb(toggle, multi_printer_switch, LV_EVENT_VALUE_CHANGED, NULL);
+
+    if (global_config.multi_printer_mode)
+        lv_obj_add_state(toggle, LV_STATE_CHECKED);
+    
+    create_settings_widget("Multi Printer Mode", toggle, panel);
+
     toggle = lv_switch_create(panel);
     lv_obj_set_width(toggle, TOGGLE_WIDTH);
     lv_obj_add_event_cb(toggle, auto_ota_update_switch, LV_EVENT_VALUE_CHANGED, NULL);
 
-    if (global_config.autoOtaUpdate)
+    if (global_config.auto_ota_update)
         lv_obj_add_state(toggle, LV_STATE_CHECKED);
 
     create_settings_widget("Auto Update", toggle, panel);
diff --git a/CYD-Klipper/src/ui/panels/temp_panel.cpp b/CYD-Klipper/src/ui/panels/temp_panel.cpp
index 7a866f1..2716677 100644
--- a/CYD-Klipper/src/ui/panels/temp_panel.cpp
+++ b/CYD-Klipper/src/ui/panels/temp_panel.cpp
@@ -36,17 +36,17 @@ static void update_printer_data_bed_temp(lv_event_t * e){
 static short get_temp_preset(int target){
     switch (target){
         case TARGET_HOTEND_CONFIG_1:
-            return global_config.hotend_presets[0];
+            return get_current_printer_config()->hotend_presets[0];
         case TARGET_HOTEND_CONFIG_2:
-            return global_config.hotend_presets[1];
+            return get_current_printer_config()->hotend_presets[1];
         case TARGET_HOTEND_CONFIG_3:
-            return global_config.hotend_presets[2];
+            return get_current_printer_config()->hotend_presets[2];
         case TARGET_BED_CONFIG_1:
-            return global_config.bed_presets[0];
+            return get_current_printer_config()->bed_presets[0];
         case TARGET_BED_CONFIG_2:
-            return global_config.bed_presets[1];
+            return get_current_printer_config()->bed_presets[1];
         case TARGET_BED_CONFIG_3:
-            return global_config.bed_presets[2];
+            return get_current_printer_config()->bed_presets[2];
         default:
             return -1;
     }
@@ -62,7 +62,7 @@ static void update_temp_preset_label(lv_event_t * e){
 }
 
 void UpdateConfig(){
-    WriteGlobalConfig();
+    write_global_config();
     lv_msg_send(DATA_PRINTER_TEMP_PRESET, &printer);
 }
 
@@ -91,27 +91,27 @@ static void keyboard_callback(lv_event_t * e){
                 send_gcode(true, gcode);
                 break;
             case TARGET_HOTEND_CONFIG_1:
-                global_config.hotend_presets[0] = temp;
+                get_current_printer_config()->hotend_presets[0] = temp;
                 UpdateConfig();
                 break;
             case TARGET_HOTEND_CONFIG_2:
-                global_config.hotend_presets[1] = temp;
+                get_current_printer_config()->hotend_presets[1] = temp;
                 UpdateConfig();
                 break;
             case TARGET_HOTEND_CONFIG_3:
-                global_config.hotend_presets[2] = temp;
+                get_current_printer_config()->hotend_presets[2] = temp;
                 UpdateConfig();
                 break;
             case TARGET_BED_CONFIG_1:
-                global_config.bed_presets[0] = temp;
+                get_current_printer_config()->bed_presets[0] = temp;
                 UpdateConfig();
                 break;
             case TARGET_BED_CONFIG_2:
-                global_config.bed_presets[1] = temp;
+                get_current_printer_config()->bed_presets[1] = temp;
                 UpdateConfig();
                 break;
             case TARGET_BED_CONFIG_3:
-                global_config.bed_presets[2] = temp;
+                get_current_printer_config()->bed_presets[2] = temp;
                 UpdateConfig();
                 break;
         }
diff --git a/CYD-Klipper/src/ui/wifi_setup.cpp b/CYD-Klipper/src/ui/wifi_setup.cpp
index 6bb3556..fb2e366 100644
--- a/CYD-Klipper/src/ui/wifi_setup.cpp
+++ b/CYD-Klipper/src/ui/wifi_setup.cpp
@@ -10,7 +10,7 @@ static void reset_btn_event_handler(lv_event_t * e) {
     lv_event_code_t code = lv_event_get_code(e);
 
     if(code == LV_EVENT_CLICKED) {
-        global_config.wifiConfigured = false;
+        global_config.wifi_configured = false;
         wifi_init_inner();
     }
 }
@@ -33,9 +33,9 @@ static void ta_event_cb(lv_event_t * e) {
         int len = strlen(txt);
         if (len > 0)
         {
-            global_config.wifiConfigured = true;
-            strcpy(global_config.wifiPassword, txt);
-            WriteGlobalConfig();
+            global_config.wifi_configured = true;
+            strcpy(global_config.wifi_password, txt);
+            write_global_config();
             wifi_init_inner();
         }
     }
@@ -79,7 +79,7 @@ static void wifi_btn_event_handler(lv_event_t * e){
     if(code == LV_EVENT_CLICKED) {
         delay(100);
         char* ssid = (char*)e->user_data;
-        strcpy(global_config.wifiSSID, ssid);
+        strcpy(global_config.wifi_SSID, ssid);
         Serial.println(ssid);
         wifi_pass_entry(ssid);
     }
@@ -89,8 +89,8 @@ void wifi_init_inner(){
     WiFi.disconnect();
     lv_obj_clean(lv_scr_act());
 
-    if (global_config.wifiConfigured){
-        WiFi.begin(global_config.wifiSSID, global_config.wifiPassword);
+    if (global_config.wifi_configured){
+        WiFi.begin(global_config.wifi_SSID, global_config.wifi_password);
         
         lv_obj_t * label = lv_label_create(lv_scr_act());
         lv_label_set_text(label, "Connecting to WiFi");
@@ -180,7 +180,7 @@ void wifi_init(){
     WiFi.mode(WIFI_STA);
     wifi_init_inner();
 
-    while (!global_config.wifiConfigured || WiFi.status() != WL_CONNECTED){
+    while (!global_config.wifi_configured || WiFi.status() != WL_CONNECTED){
         if (millis() - print_timer > print_freq){
             print_timer = millis();
             Serial.printf("WiFi Status: %s\n", errs[WiFi.status()]);

From e9b58e0a6f75a58318a0cea13781efaa7643bf46 Mon Sep 17 00:00:00 2001
From: suchmememanyskill <38142618+suchmememanyskill@users.noreply.github.com>
Date: Sat, 9 Mar 2024 01:55:31 +0100
Subject: [PATCH 2/9] Implement printer panel fully

---
 .../boards/esp32-3248S035C-smartdisplay.json  |  14 +-
 CYD-Klipper/src/conf/global_config.cpp        |   3 +
 CYD-Klipper/src/conf/global_config.h          |   1 +
 CYD-Klipper/src/core/data_setup.cpp           |   2 +-
 CYD-Klipper/src/ui/panels/printer_panel.cpp   | 146 +++++++++++++++++-
 5 files changed, 152 insertions(+), 14 deletions(-)

diff --git a/CYD-Klipper/boards/esp32-3248S035C-smartdisplay.json b/CYD-Klipper/boards/esp32-3248S035C-smartdisplay.json
index 25e1f76..b873d3e 100644
--- a/CYD-Klipper/boards/esp32-3248S035C-smartdisplay.json
+++ b/CYD-Klipper/boards/esp32-3248S035C-smartdisplay.json
@@ -9,6 +9,8 @@
         "'-D ESP32_3248S035C'",
         "'-D LCD_WIDTH=320'",
         "'-D LCD_HEIGHT=480'",
+        "'-D LVGL_BUFFER_PIXELS=(LCD_WIDTH*LCD_HEIGHT/4)'",
+        "'-D LVGL_BUFFER_MALLOC_FLAGS=(MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT)'",
         "'-D BCKL=27'",
         "'-D LCD_ST7796_SPI'",
         "'-D ST7796_SPI_HOST=SPI2_HOST'",
@@ -18,10 +20,13 @@
         "'-D ST7796_SPI_BUS_SCLK_IO_NUM=14'",
         "'-D ST7796_SPI_BUS_QUADWP_IO_NUM=GPIO_NUM_NC'",
         "'-D ST7796_SPI_BUS_QUADHD_IO_NUM=GPIO_NUM_NC'",
+        "'-D ST7796_SPI_BUS_MAX_TRANSFER_SZ=0'",
+        "'-D ST7796_SPI_BUS_FLAGS=0'",
+        "'-D ST7796_SPI_BUS_INTR_FLAGS=0'",
         "'-D ST7796_SPI_CONFIG_CS_GPIO_NUM=15'",
         "'-D ST7796_SPI_CONFIG_DC_GPIO_NUM=2'",
         "'-D ST7796_SPI_CONFIG_SPI_MODE=SPI_MODE0'",
-        "'-D ST7796_SPI_CONFIG_PCLK_HZ=80000000'",
+        "'-D ST7796_SPI_CONFIG_PCLK_HZ=24000000'",
         "'-D ST7796_SPI_CONFIG_TRANS_QUEUE_DEPTH=10'",
         "'-D ST7796_SPI_CONFIG_LCD_CMD_BITS=8'",
         "'-D ST7796_SPI_CONFIG_LCD_PARAM_BITS=8'",
@@ -77,14 +82,13 @@
         "'-D SPEAK=26'",
 
         "-DCYD_SCREEN_GAP_PX=10",
-        "-DCYD_SCREEN_MIN_BUTTON_HEIGHT_PX=40",
-        "-DCYD_SCREEN_MIN_BUTTON_WIDTH_PX=40",
+        "-DCYD_SCREEN_MIN_BUTTON_HEIGHT_PX=45",
+        "-DCYD_SCREEN_MIN_BUTTON_WIDTH_PX=45",
         "-DCYD_SCREEN_FONT=lv_font_montserrat_16",
         "-DCYD_SCREEN_FONT_SMALL=lv_font_montserrat_12",
         "-DCYD_SCREEN_SIDEBAR_SIZE_PX=50",
         "-DCYD_SCREEN_DRIVER_ESP32_SMARTDISPLAY=1",
-        "-DCYD_SCREEN_DISABLE_TOUCH_CALIBRATION=1",
-        "-DCYD_SCREEN_DISABLE_INVERT_COLORS=1"
+        "-DCYD_SCREEN_DISABLE_TOUCH_CALIBRATION=1"
       ],
       "f_cpu": "240000000L",
       "f_flash": "40000000L",
diff --git a/CYD-Klipper/src/conf/global_config.cpp b/CYD-Klipper/src/conf/global_config.cpp
index e717eee..cff6515 100644
--- a/CYD-Klipper/src/conf/global_config.cpp
+++ b/CYD-Klipper/src/conf/global_config.cpp
@@ -90,8 +90,11 @@ void set_printer_config_index(int index)
             new_config->bed_presets[i] = old_config->bed_presets[i];
         }
 
+        write_global_config();
         ESP.restart();
     }    
+
+    write_global_config();
 }
 
 void load_global_config() 
diff --git a/CYD-Klipper/src/conf/global_config.h b/CYD-Klipper/src/conf/global_config.h
index 5a67a01..9b18e28 100644
--- a/CYD-Klipper/src/conf/global_config.h
+++ b/CYD-Klipper/src/conf/global_config.h
@@ -86,5 +86,6 @@ void load_global_config();
 PRINTER_CONFIG* get_current_printer_config();
 int get_printer_config_count();
 void set_printer_config_index(int index);
+int get_printer_config_free_index();
 
 #endif // !_GLOBAL_CONFIG_INIT
\ No newline at end of file
diff --git a/CYD-Klipper/src/core/data_setup.cpp b/CYD-Klipper/src/core/data_setup.cpp
index c09743e..e64a732 100644
--- a/CYD-Klipper/src/core/data_setup.cpp
+++ b/CYD-Klipper/src/core/data_setup.cpp
@@ -341,7 +341,7 @@ void fetch_printer_data_minimal()
                 }
             }
 
-            if (printer_minimal->state != PRINTER_STATE_ERROR)
+            if (data[i].state != PRINTER_STATE_ERROR)
             {
                 if (status.containsKey("virtual_sdcard"))
                 {
diff --git a/CYD-Klipper/src/ui/panels/printer_panel.cpp b/CYD-Klipper/src/ui/panels/printer_panel.cpp
index c4ef1f8..6e09307 100644
--- a/CYD-Klipper/src/ui/panels/printer_panel.cpp
+++ b/CYD-Klipper/src/ui/panels/printer_panel.cpp
@@ -2,6 +2,9 @@
 #include "../../conf/global_config.h"
 #include "../../core/data_setup.h"
 #include "../ui_utils.h"
+#include "../../core/lv_setup.h"
+#include <stdio.h>
+#include "../nav_buttons.h"
 
 const char * printer_status[] = {
     "Error",
@@ -12,6 +15,16 @@ const char * printer_status[] = {
 
 const static lv_point_t line_points[] = { {0, 0}, {(short int)((CYD_SCREEN_PANEL_WIDTH_PX - CYD_SCREEN_GAP_PX * 2) * 0.85f), 0} };
 
+static void update_printer_name_text(lv_event_t * e)
+{
+    lv_obj_t * label = lv_event_get_target(e);
+    PRINTER_CONFIG * config = (PRINTER_CONFIG*)lv_event_get_user_data(e);
+    int index = config - global_config.printer_config;
+    PrinterMinimal * printer = &printer_minimal[index];
+
+    lv_label_set_text(label, config->printer_name[0] == 0 ? config->klipper_host : config->printer_name);
+}
+
 static void update_printer_status_text(lv_event_t * e) 
 {
     lv_obj_t * label = lv_event_get_target(e);
@@ -49,27 +62,124 @@ static void update_printer_percentage_text(lv_event_t * e)
     int index = config - global_config.printer_config;
     PrinterMinimal * printer = &printer_minimal[index];
 
-    if (printer->online && (printer->state == PRINTER_STATE_PRINTING || printer->state == PRINTER_STATE_PAUSED)){
-        lv_label_set_text_fmt(label, "%.2f%%", printer->print_progress * 100);
+    if (printer->online && (printer->state == PRINTER_STATE_PRINTING || printer->state == PRINTER_STATE_PAUSED))
+    {
+        char percentage_buffer[12];
+        sprintf(percentage_buffer, "%.2f%%", printer->print_progress * 100);
+        lv_label_set_text(label, percentage_buffer);
     }
-    else {
-        lv_label_set_text(label, "-");
+    else 
+    {
+        lv_label_set_text(label, "-%");
+    }
+}
+
+static void btn_disable_if_controlled(lv_event_t * e)
+{
+    lv_obj_t * btn = lv_event_get_target(e);
+    PRINTER_CONFIG * config = (PRINTER_CONFIG*)lv_event_get_user_data(e);
+
+    if (config == get_current_printer_config())
+    {
+        lv_obj_add_state(btn, LV_STATE_DISABLED);
+    }
+    else 
+    {
+        lv_obj_clear_state(btn, LV_STATE_DISABLED);
+    }
+}
+
+static void btn_disable_if_controlled_or_offline(lv_event_t * e)
+{
+    lv_obj_t * btn = lv_event_get_target(e);
+    PRINTER_CONFIG * config = (PRINTER_CONFIG*)lv_event_get_user_data(e);
+    int index = config - global_config.printer_config;
+    PrinterMinimal * printer = &printer_minimal[index];
+
+    if (config == get_current_printer_config() || !printer->online)
+    {
+        lv_obj_add_state(btn, LV_STATE_DISABLED);
+    }
+    else 
+    {
+        lv_obj_clear_state(btn, LV_STATE_DISABLED);
+    }
+}
+
+PRINTER_CONFIG * keyboard_config = NULL;
+
+static void keyboard_callback(lv_event_t * e){
+    lv_event_code_t code = lv_event_get_code(e);
+    lv_obj_t * ta = lv_event_get_target(e);
+    lv_obj_t * kb = (lv_obj_t *)lv_event_get_user_data(e);
+    
+    if (code == LV_EVENT_READY) {
+        const char * text = lv_textarea_get_text(ta);
+        strcpy(keyboard_config->printer_name, text);
+        write_global_config();
+        lv_msg_send(DATA_PRINTER_MINIMAL, NULL);
+    }
+
+    if(code == LV_EVENT_DEFOCUSED || code == LV_EVENT_CANCEL || code == LV_EVENT_READY) {
+        lv_keyboard_set_textarea(kb, NULL);
+        lv_obj_del(lv_obj_get_parent(kb));
     }
 }
 
 static void btn_printer_delete(lv_event_t * e)
 {
+    lv_obj_t * btn = lv_event_get_target(e);
+    PRINTER_CONFIG * config = (PRINTER_CONFIG*)lv_event_get_user_data(e);
 
+    if (config == get_current_printer_config())
+    {
+        return;
+    }
+
+    config->ip_configured = false;
+    write_global_config();
+
+    nav_buttons_setup(6);
 }
 
+// TODO: Extract this from temp/print panel and combine
 static void btn_printer_rename(lv_event_t * e)
 {
+    keyboard_config = (PRINTER_CONFIG*)lv_event_get_user_data(e);
 
+    lv_obj_t * parent = lv_create_empty_panel(lv_scr_act());
+    lv_obj_set_style_bg_opa(parent, LV_OPA_50, 0); 
+    lv_obj_set_size(parent, CYD_SCREEN_WIDTH_PX, CYD_SCREEN_HEIGHT_PX);
+    lv_layout_flex_column(parent, LV_FLEX_ALIGN_SPACE_BETWEEN);
+
+    lv_obj_t * empty_panel = lv_create_empty_panel(parent);
+    lv_obj_set_flex_grow(empty_panel, 1);
+
+    lv_obj_t * ta = lv_textarea_create(parent);
+    lv_obj_t * keyboard = lv_keyboard_create(parent);
+
+    lv_obj_set_width(ta, CYD_SCREEN_WIDTH_PX * 0.75);
+    lv_textarea_set_max_length(ta, 16);
+    lv_textarea_set_one_line(ta, true);
+    lv_textarea_set_text(ta, keyboard_config->printer_name);
+    lv_obj_add_event_cb(ta, keyboard_callback, LV_EVENT_ALL, keyboard);
+    lv_keyboard_set_textarea(keyboard, ta);
 }
 
 static void btn_printer_activate(lv_event_t * e)
 {
+    lv_obj_t * label = lv_event_get_target(e);
+    PRINTER_CONFIG * config = (PRINTER_CONFIG*)lv_event_get_user_data(e);
+    int index = config - global_config.printer_config;
 
+    set_printer_config_index(index);
+    set_color_scheme();
+    lv_msg_send(DATA_PRINTER_MINIMAL, NULL);
+}
+
+static void btn_printer_add(lv_event_t * e)
+{
+    set_printer_config_index(get_printer_config_free_index());
 }
 
 void create_printer_ui(PRINTER_CONFIG * config, lv_obj_t * root)
@@ -82,7 +192,8 @@ void create_printer_ui(PRINTER_CONFIG * config, lv_obj_t * root)
     lv_obj_set_size(data_row_name, width, LV_SIZE_CONTENT);
 
     lv_obj_t * label = lv_label_create(data_row_name);
-    lv_label_set_text(label, config->printer_name[0] == 0 ? config->klipper_host : config->printer_name);
+    lv_obj_add_event_cb(label, update_printer_name_text, LV_EVENT_MSG_RECEIVED, config);
+    lv_msg_subsribe_obj(DATA_PRINTER_MINIMAL, label, config);
     
     label = lv_label_create(data_row_name);
     lv_obj_add_event_cb(label, update_printer_status_text, LV_EVENT_MSG_RECEIVED, config);
@@ -109,6 +220,8 @@ void create_printer_ui(PRINTER_CONFIG * config, lv_obj_t * root)
     lv_obj_t * btn = lv_btn_create(button_row);
     lv_obj_set_flex_grow(btn, 1);
     lv_obj_add_event_cb(btn, btn_printer_delete, LV_EVENT_CLICKED, config);
+    lv_obj_add_event_cb(btn, btn_disable_if_controlled, LV_EVENT_MSG_RECEIVED, config);
+    lv_msg_subsribe_obj(DATA_PRINTER_MINIMAL, btn, config);
 
     label = lv_label_create(btn);
     lv_label_set_text(label, LV_SYMBOL_TRASH);
@@ -125,9 +238,11 @@ void create_printer_ui(PRINTER_CONFIG * config, lv_obj_t * root)
     btn = lv_btn_create(button_row);
     lv_obj_set_flex_grow(btn, 2);
     lv_obj_add_event_cb(btn, btn_printer_activate, LV_EVENT_CLICKED, config);
+    lv_obj_add_event_cb(btn, btn_disable_if_controlled_or_offline, LV_EVENT_MSG_RECEIVED, config);
+    lv_msg_subsribe_obj(DATA_PRINTER_MINIMAL, btn, config);
 
     label = lv_label_create(btn);
-    lv_label_set_text(label, "Activate");
+    lv_label_set_text(label, "Control");
     lv_obj_center(label);
 
     lv_obj_t * line = lv_line_create(root);
@@ -139,11 +254,13 @@ void create_printer_ui(PRINTER_CONFIG * config, lv_obj_t * root)
 void printer_panel_init(lv_obj_t* panel) 
 {
     lv_obj_t * inner_panel = lv_create_empty_panel(panel);
-    lv_obj_align(inner_panel, LV_ALIGN_TOP_LEFT, CYD_SCREEN_GAP_PX, CYD_SCREEN_GAP_PX);
-    lv_obj_set_size(inner_panel, CYD_SCREEN_PANEL_WIDTH_PX - CYD_SCREEN_GAP_PX * 2, CYD_SCREEN_PANEL_HEIGHT_PX - CYD_SCREEN_GAP_PX * 2);
+    lv_obj_align(inner_panel, LV_ALIGN_TOP_LEFT, CYD_SCREEN_GAP_PX, 0);
+    lv_obj_set_size(inner_panel, CYD_SCREEN_PANEL_WIDTH_PX - CYD_SCREEN_GAP_PX * 2, CYD_SCREEN_PANEL_HEIGHT_PX);
     lv_layout_flex_column(inner_panel);
     lv_obj_set_scrollbar_mode(inner_panel, LV_SCROLLBAR_MODE_OFF);
 
+    lv_obj_set_size(lv_create_empty_panel(inner_panel), 0, 0);
+
     for (int i = 0; i < PRINTER_CONFIG_COUNT; i++){
         PRINTER_CONFIG * config = &global_config.printer_config[i];
         if (config->ip_configured) {
@@ -151,5 +268,18 @@ void printer_panel_init(lv_obj_t* panel)
         }
     }
 
+    // Add Printer Button
+    if (get_printer_config_free_index() != -1){
+        lv_obj_t * btn = lv_btn_create(inner_panel);
+        lv_obj_set_size(btn, CYD_SCREEN_PANEL_WIDTH_PX - CYD_SCREEN_GAP_PX * 2, CYD_SCREEN_MIN_BUTTON_HEIGHT_PX);
+        lv_obj_add_event_cb(btn, btn_printer_add, LV_EVENT_CLICKED, NULL);
+
+        lv_obj_t * label = lv_label_create(btn);
+        lv_label_set_text(label, "Add Printer");
+        lv_obj_center(label);
+    }
+
+    lv_obj_set_size(lv_create_empty_panel(inner_panel), 0, 0);
+
     lv_msg_send(DATA_PRINTER_MINIMAL, NULL);
 }
\ No newline at end of file

From 67b5ce1948c0cd76bd32af779cd0587acb0c0774 Mon Sep 17 00:00:00 2001
From: suchmememanyskill <38142618+suchmememanyskill@users.noreply.github.com>
Date: Sat, 9 Mar 2024 01:56:35 +0100
Subject: [PATCH 3/9] Set max printer name limit to 24 chars

---
 CYD-Klipper/src/conf/global_config.h        | 2 +-
 CYD-Klipper/src/ui/panels/printer_panel.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CYD-Klipper/src/conf/global_config.h b/CYD-Klipper/src/conf/global_config.h
index 9b18e28..c7e2c1b 100644
--- a/CYD-Klipper/src/conf/global_config.h
+++ b/CYD-Klipper/src/conf/global_config.h
@@ -27,7 +27,7 @@ typedef struct _PRINTER_CONFIG {
         };
     };
 
-    char printer_name[17];
+    char printer_name[25];
     char klipper_host[65];
     char klipper_auth[33];
     unsigned short klipper_port;
diff --git a/CYD-Klipper/src/ui/panels/printer_panel.cpp b/CYD-Klipper/src/ui/panels/printer_panel.cpp
index 6e09307..fada49e 100644
--- a/CYD-Klipper/src/ui/panels/printer_panel.cpp
+++ b/CYD-Klipper/src/ui/panels/printer_panel.cpp
@@ -159,7 +159,7 @@ static void btn_printer_rename(lv_event_t * e)
     lv_obj_t * keyboard = lv_keyboard_create(parent);
 
     lv_obj_set_width(ta, CYD_SCREEN_WIDTH_PX * 0.75);
-    lv_textarea_set_max_length(ta, 16);
+    lv_textarea_set_max_length(ta, 24);
     lv_textarea_set_one_line(ta, true);
     lv_textarea_set_text(ta, keyboard_config->printer_name);
     lv_obj_add_event_cb(ta, keyboard_callback, LV_EVENT_ALL, keyboard);

From f98c2eff78f1b1e53ff5d7432f29de13026f4bf6 Mon Sep 17 00:00:00 2001
From: suchmememanyskill <38142618+suchmememanyskill@users.noreply.github.com>
Date: Sat, 9 Mar 2024 19:22:24 +0100
Subject: [PATCH 4/9] Small refactor

---
 CYD-Klipper/src/core/macros_query.cpp        |   9 +-
 CYD-Klipper/src/core/macros_query.h          |   1 +
 CYD-Klipper/src/ui/panels/macros_panel.cpp   |  44 +----
 CYD-Klipper/src/ui/panels/printer_panel.cpp  |  38 +----
 CYD-Klipper/src/ui/panels/settings_panel.cpp | 165 +++----------------
 CYD-Klipper/src/ui/panels/temp_panel.cpp     | 114 +++++--------
 CYD-Klipper/src/ui/ui_utils.cpp              | 107 ++++++++++++
 CYD-Klipper/src/ui/ui_utils.h                |   7 +-
 8 files changed, 196 insertions(+), 289 deletions(-)

diff --git a/CYD-Klipper/src/core/macros_query.cpp b/CYD-Klipper/src/core/macros_query.cpp
index fcbf900..f194c1e 100644
--- a/CYD-Klipper/src/core/macros_query.cpp
+++ b/CYD-Klipper/src/core/macros_query.cpp
@@ -13,7 +13,7 @@ static char* power_devices[16] = {0};
 static bool power_device_states[16] = {0};
 static int power_devices_count = 0;
 
-static void _macros_query_internal(){
+void _macros_query_internal(){
     SETUP_HTTP_CLIENT("/printer/gcode/help")
 
     int httpCode = client.GET();
@@ -52,13 +52,16 @@ void _power_devices_query_internal(){
     SETUP_HTTP_CLIENT("/machine/device_power/devices")
 
     int httpCode = client.GET();
+
+    if (httpCode == 200 || httpCode == 404 || httpCode == 500){
+        power_devices_clear();
+    }
+
     if (httpCode == 200){
         JsonDocument doc;
         deserializeJson(doc, client.getStream());
         auto result = doc["result"]["devices"].as<JsonArray>();
 
-        power_devices_clear();
-
         for (auto i : result){
             const char * device_name = i["device"];
             const char * device_state = i["status"];
diff --git a/CYD-Klipper/src/core/macros_query.h b/CYD-Klipper/src/core/macros_query.h
index 1000dd3..40788b4 100644
--- a/CYD-Klipper/src/core/macros_query.h
+++ b/CYD-Klipper/src/core/macros_query.h
@@ -16,4 +16,5 @@ POWERQUERY power_devices_query();
 void macros_query_setup();
 bool set_power_state(const char* device_name, bool state);
 void _power_devices_query_internal();
+void _macros_query_internal();
 void power_devices_clear();
\ No newline at end of file
diff --git a/CYD-Klipper/src/ui/panels/macros_panel.cpp b/CYD-Klipper/src/ui/panels/macros_panel.cpp
index 0481f6c..0928252 100644
--- a/CYD-Klipper/src/ui/panels/macros_panel.cpp
+++ b/CYD-Klipper/src/ui/panels/macros_panel.cpp
@@ -23,28 +23,7 @@ static void btn_goto_settings(lv_event_t * e){
 void macros_panel_add_macros_to_panel(lv_obj_t * root_panel, MACROSQUERY query){
     for (int i = 0; i < query.count; i++){
         const char* macro = query.macros[i];
-        
-        lv_obj_t * panel = lv_create_empty_panel(root_panel);
-        lv_layout_flex_row(panel, LV_FLEX_ALIGN_END);
-        lv_obj_set_size(panel, CYD_SCREEN_PANEL_WIDTH_PX - CYD_SCREEN_GAP_PX * 3, CYD_SCREEN_MIN_BUTTON_HEIGHT_PX);
-
-        lv_obj_t * label = lv_label_create(panel);
-        lv_label_set_text(label, macro);
-        lv_label_set_long_mode(label, LV_LABEL_LONG_SCROLL_CIRCULAR);
-        lv_obj_set_flex_grow(label, 1);
-
-        lv_obj_t * btn = lv_btn_create(panel);
-        lv_obj_add_event_cb(btn, btn_press, LV_EVENT_CLICKED, (void*)macro);
-        lv_obj_set_height(btn, CYD_SCREEN_MIN_BUTTON_HEIGHT_PX);
-
-        label = lv_label_create(btn);
-        lv_label_set_text(label, "Run");
-        lv_obj_center(label);
-
-        lv_obj_t * line = lv_line_create(root_panel);
-        lv_line_set_points(line, line_points, 2);
-        lv_obj_set_style_line_width(line, 1, 0);
-        lv_obj_set_style_line_color(line, lv_color_hex(0xAAAAAA), 0);
+        lv_create_custom_menu_button(macro, root_panel, btn_press, "Run", (void*)macro);
     }
 }
 
@@ -61,26 +40,7 @@ void macros_panel_add_power_devices_to_panel(lv_obj_t * root_panel, POWERQUERY q
     for (int i = 0; i < query.count; i++){
         const char* power_device_name = query.power_devices[i];
         const bool power_device_state = query.power_states[i];
-        
-        lv_obj_t * panel = lv_create_empty_panel(root_panel);
-        lv_layout_flex_row(panel, LV_FLEX_ALIGN_END);
-        lv_obj_set_size(panel, CYD_SCREEN_PANEL_WIDTH_PX - CYD_SCREEN_GAP_PX * 3, CYD_SCREEN_MIN_BUTTON_HEIGHT_PX);
-
-        lv_obj_t * label = lv_label_create(panel);
-        lv_label_set_text(label, power_device_name);
-        lv_label_set_long_mode(label, LV_LABEL_LONG_SCROLL_CIRCULAR);
-        lv_obj_set_flex_grow(label, 1);
-
-        lv_obj_t * toggle = lv_switch_create(panel);
-        lv_obj_add_event_cb(toggle, power_device_toggle, LV_EVENT_VALUE_CHANGED, (void*)power_device_name);
-        lv_obj_set_size(toggle, CYD_SCREEN_MIN_BUTTON_WIDTH_PX * 2, CYD_SCREEN_MIN_BUTTON_HEIGHT_PX);
-        if (power_device_state)
-            lv_obj_add_state(toggle, LV_STATE_CHECKED);
-
-        lv_obj_t * line = lv_line_create(root_panel);
-        lv_line_set_points(line, line_points, 2);
-        lv_obj_set_style_line_width(line, 1, 0);
-        lv_obj_set_style_line_color(line, lv_color_hex(0xAAAAAA), 0);
+        lv_create_custom_menu_switch(power_device_name, root_panel, power_device_toggle, power_device_state, (void*)power_device_name);
     }
 }
 
diff --git a/CYD-Klipper/src/ui/panels/printer_panel.cpp b/CYD-Klipper/src/ui/panels/printer_panel.cpp
index fada49e..ca7c63c 100644
--- a/CYD-Klipper/src/ui/panels/printer_panel.cpp
+++ b/CYD-Klipper/src/ui/panels/printer_panel.cpp
@@ -5,6 +5,7 @@
 #include "../../core/lv_setup.h"
 #include <stdio.h>
 #include "../nav_buttons.h"
+#include "../../core/macros_query.h"
 
 const char * printer_status[] = {
     "Error",
@@ -109,21 +110,13 @@ static void btn_disable_if_controlled_or_offline(lv_event_t * e)
 PRINTER_CONFIG * keyboard_config = NULL;
 
 static void keyboard_callback(lv_event_t * e){
-    lv_event_code_t code = lv_event_get_code(e);
     lv_obj_t * ta = lv_event_get_target(e);
     lv_obj_t * kb = (lv_obj_t *)lv_event_get_user_data(e);
     
-    if (code == LV_EVENT_READY) {
-        const char * text = lv_textarea_get_text(ta);
-        strcpy(keyboard_config->printer_name, text);
-        write_global_config();
-        lv_msg_send(DATA_PRINTER_MINIMAL, NULL);
-    }
-
-    if(code == LV_EVENT_DEFOCUSED || code == LV_EVENT_CANCEL || code == LV_EVENT_READY) {
-        lv_keyboard_set_textarea(kb, NULL);
-        lv_obj_del(lv_obj_get_parent(kb));
-    }
+    const char * text = lv_textarea_get_text(ta);
+    strcpy(keyboard_config->printer_name, text);
+    write_global_config();
+    lv_msg_send(DATA_PRINTER_MINIMAL, NULL);
 }
 
 static void btn_printer_delete(lv_event_t * e)
@@ -146,24 +139,7 @@ static void btn_printer_delete(lv_event_t * e)
 static void btn_printer_rename(lv_event_t * e)
 {
     keyboard_config = (PRINTER_CONFIG*)lv_event_get_user_data(e);
-
-    lv_obj_t * parent = lv_create_empty_panel(lv_scr_act());
-    lv_obj_set_style_bg_opa(parent, LV_OPA_50, 0); 
-    lv_obj_set_size(parent, CYD_SCREEN_WIDTH_PX, CYD_SCREEN_HEIGHT_PX);
-    lv_layout_flex_column(parent, LV_FLEX_ALIGN_SPACE_BETWEEN);
-
-    lv_obj_t * empty_panel = lv_create_empty_panel(parent);
-    lv_obj_set_flex_grow(empty_panel, 1);
-
-    lv_obj_t * ta = lv_textarea_create(parent);
-    lv_obj_t * keyboard = lv_keyboard_create(parent);
-
-    lv_obj_set_width(ta, CYD_SCREEN_WIDTH_PX * 0.75);
-    lv_textarea_set_max_length(ta, 24);
-    lv_textarea_set_one_line(ta, true);
-    lv_textarea_set_text(ta, keyboard_config->printer_name);
-    lv_obj_add_event_cb(ta, keyboard_callback, LV_EVENT_ALL, keyboard);
-    lv_keyboard_set_textarea(keyboard, ta);
+    lv_create_keyboard_text_entry(keyboard_callback, LV_KEYBOARD_MODE_TEXT_LOWER, CYD_SCREEN_WIDTH_PX * 0.75, 24, keyboard_config->printer_name, false);
 }
 
 static void btn_printer_activate(lv_event_t * e)
@@ -174,6 +150,8 @@ static void btn_printer_activate(lv_event_t * e)
 
     set_printer_config_index(index);
     set_color_scheme();
+    _macros_query_internal();
+    _power_devices_query_internal();
     lv_msg_send(DATA_PRINTER_MINIMAL, NULL);
 }
 
diff --git a/CYD-Klipper/src/ui/panels/settings_panel.cpp b/CYD-Klipper/src/ui/panels/settings_panel.cpp
index 94411b2..8db8ce3 100644
--- a/CYD-Klipper/src/ui/panels/settings_panel.cpp
+++ b/CYD-Klipper/src/ui/panels/settings_panel.cpp
@@ -57,7 +57,7 @@ static void theme_dropdown(lv_event_t * e){
 }
 
 const char* brightness_options = "100%\n75%\n50%\n25%";
-const char  brightness_options_values[] = { 255, 192, 128, 64 };
+const unsigned char  brightness_options_values[] = { 255, 192, 128, 64 };
 
 static void brightness_dropdown(lv_event_t * e){
     lv_obj_t * dropdown = lv_event_get_target(e);
@@ -122,193 +122,76 @@ static void estimated_time_dropdown(lv_event_t * e){
     write_global_config();
 }
 
-const static lv_point_t line_points[] = { {0, 0}, {(short int)((CYD_SCREEN_PANEL_WIDTH_PX - CYD_SCREEN_GAP_PX * 2) * 0.85f), 0} };
-
-void create_settings_widget(const char* label_text, lv_obj_t* object, lv_obj_t* root_panel, bool set_height = true){
-    lv_obj_t * panel = lv_create_empty_panel(root_panel);
-    lv_obj_set_size(panel, CYD_SCREEN_PANEL_WIDTH_PX - CYD_SCREEN_GAP_PX * 3, CYD_SCREEN_MIN_BUTTON_HEIGHT_PX);
-
-    lv_obj_t * label = lv_label_create(panel);
-    lv_label_set_text(label, label_text);
-    lv_obj_align(label, LV_ALIGN_LEFT_MID, 0, 0);
-
-    lv_obj_set_parent(object, panel);
-    lv_obj_align(object, LV_ALIGN_RIGHT_MID, 0, 0);
-
-    if (set_height)
-        lv_obj_set_height(object, CYD_SCREEN_MIN_BUTTON_HEIGHT_PX);
-
-    lv_obj_t * line = lv_line_create(root_panel);
-    lv_line_set_points(line, line_points, 2);
-    lv_obj_set_style_line_width(line, 1, 0);
-    lv_obj_set_style_line_color(line, lv_color_hex(0xAAAAAA), 0);
-}
-
-#define DROPDOWN_WIDTH CYD_SCREEN_MIN_BUTTON_WIDTH_PX * 3.75
-#define TOGGLE_WIDTH CYD_SCREEN_MIN_BUTTON_WIDTH_PX * 2
-
 void settings_panel_init(lv_obj_t* panel){
-    lv_obj_t * toggle = NULL;
-    lv_obj_t * btn = NULL;
-    lv_obj_t * label = NULL;
-    lv_obj_t * dropdown = NULL;
-
     lv_obj_set_style_pad_all(panel, CYD_SCREEN_GAP_PX, 0);
     lv_layout_flex_column(panel);
     lv_obj_set_scrollbar_mode(panel, LV_SCROLLBAR_MODE_OFF);
 
-    btn = lv_btn_create(panel);
-    lv_obj_add_event_cb(btn, reset_wifi_click, LV_EVENT_CLICKED, NULL);
-
-    label = lv_label_create(btn);
-    lv_label_set_text(label, "Restart");
-    lv_obj_center(label);
-
-    create_settings_widget("Configure WiFi", btn, panel);
-
-    btn = lv_btn_create(panel);
-    lv_obj_add_event_cb(btn, reset_ip_click, LV_EVENT_CLICKED, NULL);
-
-    label = lv_label_create(btn);
-    lv_label_set_text(label, "Restart");
-    lv_obj_center(label);
-
-    create_settings_widget("Configure IP", btn, panel);
+    lv_create_custom_menu_button("Configure WiFi", panel, reset_wifi_click, "Restart");
+    lv_create_custom_menu_button("Configure IP", panel, reset_ip_click, "Restart");
 
 #ifndef CYD_SCREEN_DISABLE_TOUCH_CALIBRATION
-    btn = lv_btn_create(panel);
-    lv_obj_add_event_cb(btn, reset_calibration_click, LV_EVENT_CLICKED, NULL);
-
-    label = lv_label_create(btn);
-    lv_label_set_text(label, "Restart");
-    lv_obj_center(label);
-
-    create_settings_widget("Calibrate Touch", btn, panel);
+    lv_create_custom_menu_button("Calibrate Touch", panel, reset_calibration_click, "Restart");
 #endif // CYD_SCREEN_DISABLE_TOUCH_CALIBRATION
 
 #ifndef CYD_SCREEN_DISABLE_INVERT_COLORS
-    toggle = lv_switch_create(panel);
-    lv_obj_set_width(toggle, TOGGLE_WIDTH);
-    lv_obj_add_event_cb(toggle, invert_color_switch, LV_EVENT_VALUE_CHANGED, NULL);
-
-    if (get_current_printer_config()->invert_colors)
-        lv_obj_add_state(toggle, LV_STATE_CHECKED);
-
-    create_settings_widget("Invert Colors", toggle, panel);
+    lv_create_custom_menu_switch("Invert Colors", panel, invert_color_switch, get_current_printer_config()->invert_colors);
 #endif // CYD_SCREEN_DISABLE_INVERT_COLORS
 
-    toggle = lv_switch_create(panel);
-    lv_obj_set_width(toggle, TOGGLE_WIDTH);
-    lv_obj_add_event_cb(toggle, light_mode_switch, LV_EVENT_VALUE_CHANGED, NULL);
-
-    if (get_current_printer_config()->light_mode)
-        lv_obj_add_state(toggle, LV_STATE_CHECKED);
-
-    create_settings_widget("Light Mode", toggle, panel);
-
-    dropdown = lv_dropdown_create(panel);
-    lv_dropdown_set_options(dropdown, "Blue\nGreen\nGrey\nYellow\nOrange\nRed\nPurple");
-    lv_dropdown_set_selected(dropdown, get_current_printer_config()->color_scheme);
-    lv_obj_set_width(dropdown, DROPDOWN_WIDTH);
-    lv_obj_add_event_cb(dropdown, theme_dropdown, LV_EVENT_VALUE_CHANGED, NULL);
-
-    create_settings_widget("Theme", dropdown, panel);
-
-    dropdown = lv_dropdown_create(panel);
-    lv_dropdown_set_options(dropdown, brightness_options);
-    lv_obj_set_width(dropdown, DROPDOWN_WIDTH);
-    lv_obj_add_event_cb(dropdown, brightness_dropdown, LV_EVENT_VALUE_CHANGED, NULL);
+    lv_create_custom_menu_switch("Light Mode", panel, light_mode_switch, get_current_printer_config()->light_mode);
+    lv_create_custom_menu_dropdown("Theme", panel, theme_dropdown, "Blue\nGreen\nGrey\nYellow\nOrange\nRed\nPurple", get_current_printer_config()->color_scheme);
 
+    int brightness_settings_index = 0;
     for (int i = 0; i < SIZEOF(brightness_options_values); i++){
         if (brightness_options_values[i] == global_config.brightness){
-            lv_dropdown_set_selected(dropdown, i);
+            brightness_settings_index = i;
             break;
         }
     }
 
-    create_settings_widget("Brightness", dropdown, panel);
+    lv_create_custom_menu_dropdown("Brightness", panel, brightness_dropdown, brightness_options, brightness_settings_index);
+
 
 #ifndef CYD_SCREEN_DISABLE_TIMEOUT
-    dropdown = lv_dropdown_create(panel);
-    lv_dropdown_set_options(dropdown, wake_timeout_options);
-    lv_obj_set_width(dropdown, DROPDOWN_WIDTH);
-    lv_obj_add_event_cb(dropdown, wake_timeout_dropdown, LV_EVENT_VALUE_CHANGED, NULL);
-
+    int wake_timeout_settings_index = 0;
     for (int i = 0; i < SIZEOF(wake_timeout_options_values); i++){
         if (wake_timeout_options_values[i] == global_config.screen_timeout){
-            lv_dropdown_set_selected(dropdown, i);
+            wake_timeout_settings_index = i;
             break;
         }
     }
 
-    create_settings_widget("Wake Timeout", dropdown, panel);
+    lv_create_custom_menu_dropdown("Wake Timeout", panel, wake_timeout_dropdown, wake_timeout_options, wake_timeout_settings_index);
 #endif
 
-    dropdown = lv_dropdown_create(panel);
-    lv_dropdown_set_options(dropdown, estimated_time_options);
-    lv_obj_set_width(dropdown, DROPDOWN_WIDTH);
-    lv_obj_add_event_cb(dropdown, estimated_time_dropdown, LV_EVENT_VALUE_CHANGED, NULL);
-
-    lv_dropdown_set_selected(dropdown, get_current_printer_config()->remaining_time_calc_mode);
-    create_settings_widget("Estimated Time", dropdown, panel);
-
-    toggle = lv_switch_create(panel);
-    lv_obj_set_width(toggle, TOGGLE_WIDTH);
-    lv_obj_add_event_cb(toggle, rotate_screen_switch, LV_EVENT_VALUE_CHANGED, NULL);
-
-    if (global_config.rotate_screen)
-        lv_obj_add_state(toggle, LV_STATE_CHECKED);
-    
-    create_settings_widget("Rotate Screen", toggle, panel);
+    lv_create_custom_menu_dropdown("Estimated Time", panel, estimated_time_dropdown, estimated_time_options, get_current_printer_config()->remaining_time_calc_mode);
+    lv_create_custom_menu_switch("Rotate Screen", panel, rotate_screen_switch, global_config.rotate_screen);
 
 #ifndef CYD_SCREEN_DISABLE_TIMEOUT
-    toggle = lv_switch_create(panel);
-    lv_obj_set_width(toggle, TOGGLE_WIDTH);
-    lv_obj_add_event_cb(toggle, on_during_print_switch, LV_EVENT_VALUE_CHANGED, NULL);
-
-    if (global_config.on_during_print)
-        lv_obj_add_state(toggle, LV_STATE_CHECKED);
-
-    create_settings_widget("Screen On During Print", toggle, panel);
+    lv_create_custom_menu_switch("Screen On During Print", panel, on_during_print_switch, global_config.on_during_print);
 #endif
 
-    toggle = lv_switch_create(panel);
-    lv_obj_set_width(toggle, TOGGLE_WIDTH);
-    lv_obj_add_event_cb(toggle, multi_printer_switch, LV_EVENT_VALUE_CHANGED, NULL);
+    lv_create_custom_menu_switch("Multi Printer Mode", panel, multi_printer_switch, global_config.multi_printer_mode);
+    lv_create_custom_menu_switch("Auto Update", panel, auto_ota_update_switch, global_config.auto_ota_update);
 
-    if (global_config.multi_printer_mode)
-        lv_obj_add_state(toggle, LV_STATE_CHECKED);
-    
-    create_settings_widget("Multi Printer Mode", toggle, panel);
 
-    toggle = lv_switch_create(panel);
-    lv_obj_set_width(toggle, TOGGLE_WIDTH);
-    lv_obj_add_event_cb(toggle, auto_ota_update_switch, LV_EVENT_VALUE_CHANGED, NULL);
-
-    if (global_config.auto_ota_update)
-        lv_obj_add_state(toggle, LV_STATE_CHECKED);
-
-    create_settings_widget("Auto Update", toggle, panel);
-
-    label = lv_label_create(panel);
+    lv_obj_t *label = lv_label_create(panel);
     lv_label_set_text(label, REPO_VERSION "  ");
-
-    create_settings_widget("Version", label, panel, false);
+    lv_create_custom_menu_entry("Version", label, panel, false);
 
     if (ota_has_update()){
-        btn = lv_btn_create(panel);
+        lv_obj_t *btn = lv_btn_create(panel);
         lv_obj_add_event_cb(btn, btn_ota_do_update, LV_EVENT_CLICKED, NULL);
 
         label = lv_label_create(btn);
         lv_label_set_text_fmt(label, "Update to %s", ota_new_version_name().c_str());
         lv_obj_center(label);
 
-        create_settings_widget("Device", btn, panel);
+        lv_create_custom_menu_entry("Device", btn, panel);
     }
     else {
         label = lv_label_create(panel);
         lv_label_set_text(label, ARDUINO_BOARD "  ");
-
-        create_settings_widget("Device", label, panel, false);
+        lv_create_custom_menu_entry("Device", label, panel, false);
     }
 }
\ No newline at end of file
diff --git a/CYD-Klipper/src/ui/panels/temp_panel.cpp b/CYD-Klipper/src/ui/panels/temp_panel.cpp
index 2716677..d9e7890 100644
--- a/CYD-Klipper/src/ui/panels/temp_panel.cpp
+++ b/CYD-Klipper/src/ui/panels/temp_panel.cpp
@@ -67,92 +67,62 @@ void UpdateConfig(){
 }
 
 static void keyboard_callback(lv_event_t * e){
-    lv_event_code_t code = lv_event_get_code(e);
     lv_obj_t * ta = lv_event_get_target(e);
     lv_obj_t * kb = (lv_obj_t *)lv_event_get_user_data(e);
 
-    if (code == LV_EVENT_READY) {
-        const char * text = lv_textarea_get_text(ta);
+    const char * text = lv_textarea_get_text(ta);
 
-        int temp = atoi(text);
-        if (temp < 0 || temp > 500){
-            return;
-        }
+    int temp = atoi(text);
+    if (temp < 0 || temp > 500){
+        return;
+    }
 
-        char gcode[64];
+    char gcode[64];
         
-        switch (keyboard_target){
-            case TARGET_HOTEND:
-                sprintf(gcode, "M104 S%d", temp);
-                send_gcode(true, gcode);
-                break;
-            case TARGET_BED:
-                sprintf(gcode, "M140 S%d", temp);
-                send_gcode(true, gcode);
-                break;
-            case TARGET_HOTEND_CONFIG_1:
-                get_current_printer_config()->hotend_presets[0] = temp;
-                UpdateConfig();
-                break;
-            case TARGET_HOTEND_CONFIG_2:
-                get_current_printer_config()->hotend_presets[1] = temp;
-                UpdateConfig();
-                break;
-            case TARGET_HOTEND_CONFIG_3:
-                get_current_printer_config()->hotend_presets[2] = temp;
-                UpdateConfig();
-                break;
-            case TARGET_BED_CONFIG_1:
-                get_current_printer_config()->bed_presets[0] = temp;
-                UpdateConfig();
-                break;
-            case TARGET_BED_CONFIG_2:
-                get_current_printer_config()->bed_presets[1] = temp;
-                UpdateConfig();
-                break;
-            case TARGET_BED_CONFIG_3:
-                get_current_printer_config()->bed_presets[2] = temp;
-                UpdateConfig();
-                break;
-        }
+    switch (keyboard_target){
+        case TARGET_HOTEND:
+            sprintf(gcode, "M104 S%d", temp);
+            send_gcode(true, gcode);
+            break;
+        case TARGET_BED:
+            sprintf(gcode, "M140 S%d", temp);
+            send_gcode(true, gcode);
+            break;
+        case TARGET_HOTEND_CONFIG_1:
+            get_current_printer_config()->hotend_presets[0] = temp;
+            UpdateConfig();
+            break;
+        case TARGET_HOTEND_CONFIG_2:
+            get_current_printer_config()->hotend_presets[1] = temp;
+            UpdateConfig();
+            break;
+        case TARGET_HOTEND_CONFIG_3:
+            get_current_printer_config()->hotend_presets[2] = temp;
+            UpdateConfig();
+            break;
+        case TARGET_BED_CONFIG_1:
+            get_current_printer_config()->bed_presets[0] = temp;
+            UpdateConfig();
+            break;
+        case TARGET_BED_CONFIG_2:
+            get_current_printer_config()->bed_presets[1] = temp;
+            UpdateConfig();
+            break;
+        case TARGET_BED_CONFIG_3:
+            get_current_printer_config()->bed_presets[2] = temp;
+            UpdateConfig();
+            break;
     }
-
-    if(code == LV_EVENT_DEFOCUSED || code == LV_EVENT_CANCEL || code == LV_EVENT_READY) {
-        lv_keyboard_set_textarea(kb, NULL);
-        lv_obj_del(lv_obj_get_parent(kb));
-    }
-}
-
-static void show_keyboard(lv_event_t * e){
-    lv_obj_t * parent = lv_create_empty_panel(root_panel);
-    lv_obj_set_style_bg_opa(parent, LV_OPA_50, 0); 
-    lv_obj_set_size(parent, CYD_SCREEN_PANEL_WIDTH_PX, CYD_SCREEN_PANEL_HEIGHT_PX);
-    lv_layout_flex_column(parent, LV_FLEX_ALIGN_SPACE_BETWEEN);
-
-    lv_obj_t * empty_panel = lv_create_empty_panel(parent);
-    lv_obj_set_flex_grow(empty_panel, 1);
-
-    lv_obj_t * ta = lv_textarea_create(parent);
-    lv_obj_t * keyboard = lv_keyboard_create(parent);
-
-    lv_obj_set_width(ta, CYD_SCREEN_PANEL_WIDTH_PX / 2);
-    lv_textarea_set_max_length(ta, 3);
-    lv_textarea_set_one_line(ta, true);
-    lv_textarea_set_text(ta, "");
-    lv_obj_add_event_cb(ta, keyboard_callback, LV_EVENT_ALL, keyboard);
-
-    lv_keyboard_set_mode(keyboard, LV_KEYBOARD_MODE_NUMBER);
-    lv_keyboard_set_textarea(keyboard, ta);
 }
 
 static void show_keyboard_with_hotend(lv_event_t * e){
     keyboard_target = TARGET_HOTEND;
-    show_keyboard(e);
+    lv_create_keyboard_text_entry(keyboard_callback);
 }
 
 static void show_keyboard_with_bed(lv_event_t * e){
     keyboard_target = TARGET_BED;
-    show_keyboard(e);
+    lv_create_keyboard_text_entry(keyboard_callback);
 }
 
 static void cooldown_temp(lv_event_t * e){
@@ -179,7 +149,7 @@ static void set_temp_via_preset(lv_event_t * e){
 
     if (edit_mode) {
         keyboard_target = (temp_target)target;
-        show_keyboard(e);
+        lv_create_keyboard_text_entry(keyboard_callback);
         return;
     }
 
diff --git a/CYD-Klipper/src/ui/ui_utils.cpp b/CYD-Klipper/src/ui/ui_utils.cpp
index d42a210..98606b4 100644
--- a/CYD-Klipper/src/ui/ui_utils.cpp
+++ b/CYD-Klipper/src/ui/ui_utils.cpp
@@ -85,4 +85,111 @@ void lv_create_fullscreen_button_matrix_popup(lv_obj_t * root, lv_event_cb_t tit
             lv_obj_center(label);
         }
     }
+}
+
+void lv_keyboard_text_entry_close(lv_event_t * e){
+    lv_event_code_t code = lv_event_get_code(e);
+    lv_obj_t * ta = lv_event_get_target(e);
+    lv_obj_t * kb = (lv_obj_t *)lv_event_get_user_data(e);
+
+    if(code == LV_EVENT_DEFOCUSED || code == LV_EVENT_CANCEL || code == LV_EVENT_READY) 
+    {
+        lv_keyboard_set_textarea(kb, NULL);
+        lv_obj_del(lv_obj_get_parent(kb));
+    }
+}
+
+void lv_create_keyboard_text_entry(lv_event_cb_t keyboard_callback, lv_keyboard_mode_t keyboard_mode, lv_coord_t width, uint8_t max_length, const char* fill_text, bool contain_in_panel)
+{
+    lv_obj_t * parent = lv_create_empty_panel(lv_scr_act());
+    lv_obj_set_style_bg_opa(parent, LV_OPA_50, 0); 
+    lv_obj_align(parent, LV_ALIGN_TOP_RIGHT, 0, 0);
+    lv_layout_flex_column(parent, LV_FLEX_ALIGN_SPACE_BETWEEN);
+
+    if (contain_in_panel)
+    {
+        lv_obj_set_size(parent, CYD_SCREEN_PANEL_WIDTH_PX, CYD_SCREEN_PANEL_HEIGHT_PX);
+    }
+    else
+    {
+        lv_obj_set_size(parent, CYD_SCREEN_WIDTH_PX, CYD_SCREEN_HEIGHT_PX);
+    }
+
+    lv_obj_t * empty_panel = lv_create_empty_panel(parent);
+    lv_obj_set_flex_grow(empty_panel, 1);
+
+    lv_obj_t * ta = lv_textarea_create(parent);
+    lv_obj_t * keyboard = lv_keyboard_create(parent);
+
+    lv_obj_set_width(ta, width);
+    lv_textarea_set_max_length(ta, max_length);
+    lv_textarea_set_one_line(ta, true);
+    lv_textarea_set_text(ta, fill_text);
+    lv_obj_add_event_cb(ta, keyboard_callback, LV_EVENT_READY, keyboard);
+    lv_obj_add_event_cb(ta, lv_keyboard_text_entry_close, LV_EVENT_ALL, keyboard);
+
+    lv_keyboard_set_mode(keyboard, keyboard_mode);
+    lv_keyboard_set_textarea(keyboard, ta);
+}
+
+const static lv_point_t line_points[] = { {0, 0}, {(short int)((CYD_SCREEN_PANEL_WIDTH_PX - CYD_SCREEN_GAP_PX * 2) * 0.85f), 0} };
+
+void lv_create_custom_menu_entry(const char* label_text, lv_obj_t* object, lv_obj_t* root_panel, bool set_height)
+{
+    lv_obj_t * panel = lv_create_empty_panel(root_panel);
+    lv_layout_flex_row(panel, LV_FLEX_ALIGN_END);
+    lv_obj_set_size(panel, CYD_SCREEN_PANEL_WIDTH_PX - CYD_SCREEN_GAP_PX * 3, CYD_SCREEN_MIN_BUTTON_HEIGHT_PX);
+
+    lv_obj_t * label = lv_label_create(panel);
+    lv_label_set_text(label, label_text);
+    lv_label_set_long_mode(label, LV_LABEL_LONG_SCROLL_CIRCULAR);
+    lv_obj_set_flex_grow(label, 1);
+
+    lv_obj_set_parent(object, panel);
+
+    if (set_height)
+        lv_obj_set_height(object, CYD_SCREEN_MIN_BUTTON_HEIGHT_PX);
+
+    lv_obj_t * line = lv_line_create(root_panel);
+    lv_line_set_points(line, line_points, 2);
+    lv_obj_set_style_line_width(line, 1, 0);
+    lv_obj_set_style_line_color(line, lv_color_hex(0xAAAAAA), 0);
+}
+
+#define DROPDOWN_WIDTH CYD_SCREEN_MIN_BUTTON_WIDTH_PX * 3.75
+#define TOGGLE_WIDTH CYD_SCREEN_MIN_BUTTON_WIDTH_PX * 2
+
+void lv_create_custom_menu_button(const char *label_text, lv_obj_t* root_panel, lv_event_cb_t on_click, const char *btn_text, void * user_data)
+{
+    lv_obj_t * btn = lv_btn_create(lv_scr_act());
+    lv_obj_add_event_cb(btn, on_click, LV_EVENT_CLICKED, user_data);
+
+    lv_obj_t * label = lv_label_create(btn);
+    lv_label_set_text(label, btn_text);
+    lv_obj_center(label);
+
+    lv_create_custom_menu_entry(label_text, btn, root_panel, true);
+}
+
+void lv_create_custom_menu_switch(const char *label_text, lv_obj_t* root_panel, lv_event_cb_t on_toggle, bool state, void * user_data)
+{
+    lv_obj_t * toggle = lv_switch_create(lv_scr_act());
+    lv_obj_add_event_cb(toggle, on_toggle, LV_EVENT_VALUE_CHANGED, user_data);
+    lv_obj_set_width(toggle, TOGGLE_WIDTH);
+
+    if (state)
+        lv_obj_add_state(toggle, LV_STATE_CHECKED);
+
+    lv_create_custom_menu_entry(label_text, toggle, root_panel, true);
+}
+
+void lv_create_custom_menu_dropdown(const char *label_text, lv_obj_t *root_panel, lv_event_cb_t on_change, const char *options, int index, void * user_data)
+{
+    lv_obj_t * dropdown = lv_dropdown_create(lv_scr_act());
+    lv_dropdown_set_options(dropdown, options);
+    lv_dropdown_set_selected(dropdown, index);
+    lv_obj_set_width(dropdown, DROPDOWN_WIDTH);
+    lv_obj_add_event_cb(dropdown, on_change, LV_EVENT_VALUE_CHANGED, user_data);
+
+    lv_create_custom_menu_entry(label_text, dropdown, root_panel, true);
 }
\ No newline at end of file
diff --git a/CYD-Klipper/src/ui/ui_utils.h b/CYD-Klipper/src/ui/ui_utils.h
index d58ecc2..7bfcba1 100644
--- a/CYD-Klipper/src/ui/ui_utils.h
+++ b/CYD-Klipper/src/ui/ui_utils.h
@@ -37,4 +37,9 @@ lv_obj_t* lv_create_empty_panel(lv_obj_t* root);
 void lv_layout_flex_column(lv_obj_t* obj, lv_flex_align_t allign = LV_FLEX_ALIGN_START, lv_coord_t pad_column = CYD_SCREEN_GAP_PX, lv_coord_t pad_row = CYD_SCREEN_GAP_PX);
 void lv_layout_flex_row(lv_obj_t* obj, lv_flex_align_t allign = LV_FLEX_ALIGN_START, lv_coord_t pad_column = CYD_SCREEN_GAP_PX, lv_coord_t pad_row = CYD_SCREEN_GAP_PX);
 void lv_create_fullscreen_button_matrix_popup(lv_obj_t * root, lv_event_cb_t title, lv_button_column_t* columns, int column_count);
-void destroy_event_user_data(lv_event_t * e);
\ No newline at end of file
+void destroy_event_user_data(lv_event_t * e);
+void lv_create_keyboard_text_entry(lv_event_cb_t keyboard_callback, lv_keyboard_mode_t keyboard_mode = LV_KEYBOARD_MODE_NUMBER, lv_coord_t width = CYD_SCREEN_PANEL_WIDTH_PX / 2, uint8_t max_length = 3, const char* fill_text = "", bool contain_in_panel= true);
+void lv_create_custom_menu_entry(const char* label_text, lv_obj_t* object, lv_obj_t* root_panel, bool set_height = true);
+void lv_create_custom_menu_button(const char *label_text, lv_obj_t* root_panel, lv_event_cb_t on_click, const char *btn_text, void * user_data = NULL);
+void lv_create_custom_menu_switch(const char *label_text, lv_obj_t* root_panel, lv_event_cb_t on_toggle, bool state, void * user_data = NULL);
+void lv_create_custom_menu_dropdown(const char *label_text, lv_obj_t *root_panel, lv_event_cb_t on_change, const char *options, int index, void * user_data = NULL);
\ No newline at end of file

From 870d109c9284e3fc9ef64c2890d9a5f3ceb1425c Mon Sep 17 00:00:00 2001
From: suchmememanyskill <38142618+suchmememanyskill@users.noreply.github.com>
Date: Sat, 9 Mar 2024 20:47:45 +0100
Subject: [PATCH 5/9] Implement printer switching in ip connect/error screen

---
 CYD-Klipper/src/core/data_setup.cpp          |  4 +-
 CYD-Klipper/src/core/http_client.cpp         |  6 +-
 CYD-Klipper/src/core/http_client.h           |  2 +
 CYD-Klipper/src/ui/ip_setup.cpp              |  3 +
 CYD-Klipper/src/ui/main_ui.cpp               |  3 +
 CYD-Klipper/src/ui/panels/settings_panel.cpp | 12 +--
 CYD-Klipper/src/ui/switch_printer.cpp        | 88 ++++++++++++++++++++
 CYD-Klipper/src/ui/switch_printer.h          |  4 +
 CYD-Klipper/src/ui/ui_utils.cpp              |  7 ++
 CYD-Klipper/src/ui/ui_utils.h                |  3 +-
 10 files changed, 118 insertions(+), 14 deletions(-)
 create mode 100644 CYD-Klipper/src/ui/switch_printer.cpp
 create mode 100644 CYD-Klipper/src/ui/switch_printer.h

diff --git a/CYD-Klipper/src/core/data_setup.cpp b/CYD-Klipper/src/core/data_setup.cpp
index e64a732..89e2f5a 100644
--- a/CYD-Klipper/src/core/data_setup.cpp
+++ b/CYD-Klipper/src/core/data_setup.cpp
@@ -313,7 +313,7 @@ void fetch_printer_data_minimal()
 
         delay(10);
         HTTPClient client;
-        configure_http_client(client, "http://" + String(config->klipper_host) + ":" + String(config->klipper_port) + "/printer/objects/query?webhooks&print_stats&virtual_sdcard", true, 1000);
+        configure_http_client(client, get_full_url("/printer/objects/query?webhooks&print_stats&virtual_sdcard", config), true, 1000);
         freeze_request_thread();
 
         int httpCode = client.GET();
@@ -370,8 +370,6 @@ void fetch_printer_data_minimal()
                     }
                 }
             }
-
-            Serial.printf("Record: %d %f %d\n", data[i].online, data[i].print_progress, data[i].state);
         }
         else 
         {
diff --git a/CYD-Klipper/src/core/http_client.cpp b/CYD-Klipper/src/core/http_client.cpp
index 42edba3..4aeeb09 100644
--- a/CYD-Klipper/src/core/http_client.cpp
+++ b/CYD-Klipper/src/core/http_client.cpp
@@ -1,5 +1,9 @@
 #include "http_client.h"
-#include "../conf/global_config.h"
+
+String get_full_url(String url_part, PRINTER_CONFIG * config)
+{
+    return "http://" + String(config->klipper_host) + ":" + String(config->klipper_port) + url_part;
+}
 
 String get_full_url(String url_part)
 {
diff --git a/CYD-Klipper/src/core/http_client.h b/CYD-Klipper/src/core/http_client.h
index d5c6d61..a3115ac 100644
--- a/CYD-Klipper/src/core/http_client.h
+++ b/CYD-Klipper/src/core/http_client.h
@@ -1,8 +1,10 @@
 #pragma once
 
 #include <HTTPClient.h>
+#include "../conf/global_config.h"
 
 String get_full_url(String url_part);
+String get_full_url(String url_part, PRINTER_CONFIG * config);
 
 void configure_http_client(HTTPClient &client, String url, bool stream = true, int timeout = 1000);
 
diff --git a/CYD-Klipper/src/ui/ip_setup.cpp b/CYD-Klipper/src/ui/ip_setup.cpp
index d741fd4..ac1644b 100644
--- a/CYD-Klipper/src/ui/ip_setup.cpp
+++ b/CYD-Klipper/src/ui/ip_setup.cpp
@@ -7,6 +7,7 @@
 #include "../core/macros_query.h"
 #include "panels/panel.h"
 #include "../core/http_client.h"
+#include "switch_printer.h"
 
 bool connect_ok = false;
 lv_obj_t * hostEntry;
@@ -161,6 +162,8 @@ void redraw_connect_screen(){
         lv_label_set_text(btn_label, "Power Devices");
         lv_obj_center(btn_label);
     }
+
+    draw_switch_printer_button();    
 }
 
 static bool auth_entry_done = false;
diff --git a/CYD-Klipper/src/ui/main_ui.cpp b/CYD-Klipper/src/ui/main_ui.cpp
index 8191d5c..d02219d 100644
--- a/CYD-Klipper/src/ui/main_ui.cpp
+++ b/CYD-Klipper/src/ui/main_ui.cpp
@@ -8,6 +8,7 @@
 #include "panels/panel.h"
 #include "../core/macros_query.h"
 #include "../core/lv_setup.h"
+#include "switch_printer.h"
 
 char extruder_temp_buff[20];
 char bed_temp_buff[20];
@@ -90,6 +91,8 @@ void error_ui(){
         lv_label_set_text(label, "Devices");
         lv_obj_center(label);
     }
+
+    draw_switch_printer_button();
 }
 
 void check_if_screen_needs_to_be_disabled(){
diff --git a/CYD-Klipper/src/ui/panels/settings_panel.cpp b/CYD-Klipper/src/ui/panels/settings_panel.cpp
index 8db8ce3..1072fc8 100644
--- a/CYD-Klipper/src/ui/panels/settings_panel.cpp
+++ b/CYD-Klipper/src/ui/panels/settings_panel.cpp
@@ -173,25 +173,19 @@ void settings_panel_init(lv_obj_t* panel){
 
     lv_create_custom_menu_switch("Multi Printer Mode", panel, multi_printer_switch, global_config.multi_printer_mode);
     lv_create_custom_menu_switch("Auto Update", panel, auto_ota_update_switch, global_config.auto_ota_update);
-
-
-    lv_obj_t *label = lv_label_create(panel);
-    lv_label_set_text(label, REPO_VERSION "  ");
-    lv_create_custom_menu_entry("Version", label, panel, false);
+    lv_create_custom_menu_label("Version", panel, REPO_VERSION "  ");
 
     if (ota_has_update()){
         lv_obj_t *btn = lv_btn_create(panel);
         lv_obj_add_event_cb(btn, btn_ota_do_update, LV_EVENT_CLICKED, NULL);
 
-        label = lv_label_create(btn);
+        lv_obj_t *label = lv_label_create(btn);
         lv_label_set_text_fmt(label, "Update to %s", ota_new_version_name().c_str());
         lv_obj_center(label);
 
         lv_create_custom_menu_entry("Device", btn, panel);
     }
     else {
-        label = lv_label_create(panel);
-        lv_label_set_text(label, ARDUINO_BOARD "  ");
-        lv_create_custom_menu_entry("Device", label, panel, false);
+        lv_create_custom_menu_label("Device", panel, ARDUINO_BOARD "  ");
     }
 }
\ No newline at end of file
diff --git a/CYD-Klipper/src/ui/switch_printer.cpp b/CYD-Klipper/src/ui/switch_printer.cpp
new file mode 100644
index 0000000..34c5684
--- /dev/null
+++ b/CYD-Klipper/src/ui/switch_printer.cpp
@@ -0,0 +1,88 @@
+#include "switch_printer.h"
+#include "lvgl.h"
+#include "../conf/global_config.h"
+#include "ui_utils.h"
+#include "../core/http_client.h"
+#include "../core/lv_setup.h"
+#include "../core/macros_query.h"
+
+static void btn_switch_printer(lv_event_t *e){
+    lv_obj_t *btn = lv_event_get_target(e);
+    PRINTER_CONFIG * config = (PRINTER_CONFIG*)lv_event_get_user_data(e);
+    int index = config - global_config.printer_config;
+
+    set_printer_config_index(index);
+    set_color_scheme();
+    _macros_query_internal();
+    _power_devices_query_internal();
+
+    lv_obj_del(lv_obj_get_parent(lv_obj_get_parent(btn)));
+}
+
+void switch_printer_init() {
+    lv_obj_t * parent = lv_create_empty_panel(lv_scr_act());
+    lv_obj_set_style_bg_opa(parent, LV_OPA_100, 0); 
+    lv_obj_align(parent, LV_ALIGN_TOP_RIGHT, 0, 0);
+    lv_obj_set_size(parent, CYD_SCREEN_WIDTH_PX, CYD_SCREEN_HEIGHT_PX);
+    lv_layout_flex_column(parent);
+
+    lv_obj_set_size(lv_create_empty_panel(parent), 0, 0);
+
+    auto width = CYD_SCREEN_WIDTH_PX - CYD_SCREEN_GAP_PX * 2;
+
+    lv_obj_t * btn = lv_btn_create(parent);
+    lv_obj_set_size(btn, width, CYD_SCREEN_MIN_BUTTON_HEIGHT_PX);
+    lv_obj_add_event_cb(btn, destroy_event_user_data, LV_EVENT_CLICKED, parent);
+
+    lv_obj_t * label = lv_label_create(btn);
+    lv_label_set_text(label, LV_SYMBOL_CLOSE " Close");
+    lv_obj_center(label);
+
+    for (int i = 0; i < PRINTER_CONFIG_COUNT; i++){
+        PRINTER_CONFIG * config = &global_config.printer_config[i];
+        const char* printer_name = (config->printer_name[0] == 0) ? config->klipper_host : config->printer_name;
+
+        if (config == get_current_printer_config())
+        {
+            lv_create_custom_menu_label(printer_name, parent, "Active");
+            continue;
+        }
+
+        if (config->ip_configured) {
+            HTTPClient client;
+            configure_http_client(client, get_full_url("/printer/objects/query?webhooks&print_stats&virtual_sdcard", config), true, 1000);
+            
+
+            int httpCode = client.GET();
+            if (httpCode == 200)
+            {
+                lv_create_custom_menu_button(printer_name, parent, btn_switch_printer, "Switch", config);
+            }
+            else 
+            {
+                lv_create_custom_menu_label(printer_name, parent, "Offline");
+            }
+        }
+    }
+}
+
+static void show_switch_printer_screen(lv_event_t * e){
+    switch_printer_init();
+}
+
+void draw_switch_printer_button() 
+{
+    if (!global_config.multi_printer_mode)
+    {
+        return;
+    }
+
+    lv_obj_t * btn = lv_btn_create(lv_scr_act());
+    lv_obj_set_size(btn, CYD_SCREEN_MIN_BUTTON_WIDTH_PX, CYD_SCREEN_MIN_BUTTON_HEIGHT_PX);
+    lv_obj_align(btn, LV_ALIGN_TOP_RIGHT, -CYD_SCREEN_GAP_PX, CYD_SCREEN_GAP_PX);
+    lv_obj_add_event_cb(btn, show_switch_printer_screen, LV_EVENT_CLICKED, NULL);
+
+    lv_obj_t * label = lv_label_create(btn);
+    lv_label_set_text(label, LV_SYMBOL_HOME);
+    lv_obj_center(label);
+}
\ No newline at end of file
diff --git a/CYD-Klipper/src/ui/switch_printer.h b/CYD-Klipper/src/ui/switch_printer.h
new file mode 100644
index 0000000..eb2d8a0
--- /dev/null
+++ b/CYD-Klipper/src/ui/switch_printer.h
@@ -0,0 +1,4 @@
+#pragma once
+
+void switch_printer_init();
+void draw_switch_printer_button();
\ No newline at end of file
diff --git a/CYD-Klipper/src/ui/ui_utils.cpp b/CYD-Klipper/src/ui/ui_utils.cpp
index 98606b4..c43592b 100644
--- a/CYD-Klipper/src/ui/ui_utils.cpp
+++ b/CYD-Klipper/src/ui/ui_utils.cpp
@@ -192,4 +192,11 @@ void lv_create_custom_menu_dropdown(const char *label_text, lv_obj_t *root_panel
     lv_obj_add_event_cb(dropdown, on_change, LV_EVENT_VALUE_CHANGED, user_data);
 
     lv_create_custom_menu_entry(label_text, dropdown, root_panel, true);
+}
+
+void lv_create_custom_menu_label(const char *label_text, lv_obj_t* root_panel, const char *text)
+{
+    lv_obj_t * label = lv_label_create(lv_scr_act());
+    lv_label_set_text(label, text);
+    lv_create_custom_menu_entry(label_text, label, root_panel, false);
 }
\ No newline at end of file
diff --git a/CYD-Klipper/src/ui/ui_utils.h b/CYD-Klipper/src/ui/ui_utils.h
index 7bfcba1..295a2cf 100644
--- a/CYD-Klipper/src/ui/ui_utils.h
+++ b/CYD-Klipper/src/ui/ui_utils.h
@@ -42,4 +42,5 @@ void lv_create_keyboard_text_entry(lv_event_cb_t keyboard_callback, lv_keyboard_
 void lv_create_custom_menu_entry(const char* label_text, lv_obj_t* object, lv_obj_t* root_panel, bool set_height = true);
 void lv_create_custom_menu_button(const char *label_text, lv_obj_t* root_panel, lv_event_cb_t on_click, const char *btn_text, void * user_data = NULL);
 void lv_create_custom_menu_switch(const char *label_text, lv_obj_t* root_panel, lv_event_cb_t on_toggle, bool state, void * user_data = NULL);
-void lv_create_custom_menu_dropdown(const char *label_text, lv_obj_t *root_panel, lv_event_cb_t on_change, const char *options, int index, void * user_data = NULL);
\ No newline at end of file
+void lv_create_custom_menu_dropdown(const char *label_text, lv_obj_t *root_panel, lv_event_cb_t on_change, const char *options, int index, void * user_data = NULL);
+void lv_create_custom_menu_label(const char *label_text, lv_obj_t* root_panel, const char *text);
\ No newline at end of file

From 397c835129d74180ff649e68059986e569f9c39e Mon Sep 17 00:00:00 2001
From: suchmememanyskill <38142618+suchmememanyskill@users.noreply.github.com>
Date: Sat, 9 Mar 2024 21:08:45 +0100
Subject: [PATCH 6/9] Add build instructions

---
 Build.md       |  37 +++++++++++++++++++++++++++++++++++++
 readme/cmd.jpg | Bin 0 -> 18041 bytes
 2 files changed, 37 insertions(+)
 create mode 100644 Build.md
 create mode 100644 readme/cmd.jpg

diff --git a/Build.md b/Build.md
new file mode 100644
index 0000000..4d2b2ba
--- /dev/null
+++ b/Build.md
@@ -0,0 +1,37 @@
+# Building
+
+## Running a developer build
+
+On every change made in this repository, [Github Actions](https://github.com/suchmememanyskill/CYD-Klipper/actions) automatically builds the firmware images for various screens. You can run one of these images as follows:
+
+#### Getting a firmware image
+0. Make sure you are logged into github
+1. Go to a [Github Actions](https://github.com/suchmememanyskill/CYD-Klipper/actions) build summary, then download the `firmware` Artifact.
+2. Open the firmware.zip archive you just downloaded, open the corresponding folder for your screen, then extract `merged_firmware.bin`
+
+This merged_firmware.bin file is a ready to flash image. Note that flashing this image does wipe your current configuration.
+
+#### Flashing merged_firmware.bin
+1. Download and extract [esptool](https://github.com/espressif/esptool/releases) to a new folder
+    - For windows, download `esptool-v4.7.0-win64.zip`
+2. Open a terminal window and navigate to this new folder containing esptool
+    - In windows, you can type cmd and press enter in the address bar in explorer to jump to the folder in cmd ![cmd](readme/cmd.jpg)
+3. Move `merged-firmware.bin` into this new folder
+4. Connect the display to your computer
+5. Execute the command `esptool write_flash 0x0 merged-firmware.bin`
+    - Don't forget to hold down the boot button on the display
+
+## Building via PlatformIO
+
+0. Install [Visual Studio Code](https://code.visualstudio.com/) and install the PlatformIO IDE plugin.
+1. Download the source code of CYD-Klipper
+    - This can be done via the `git clone https://github.com/suchmememanyskill/CYD-Klipper` command or via the green `<> Code` button on Github
+2. Open the CYD-Klipper folder inside the CYD-Klipper folder in Visual Studio Code
+3. Click on the Alien/Bug tab (PlatformIO) on the left
+4. Expand the folder/tab for your specific screen
+    - Entries with the suffix '-SD' are using the smartdisplay driver. Entries without this suffix are using a custom driver
+    - Usually, a custom driver is preferred over the smartdisplay driver
+5. Connect the display to your computer
+6. Click 'Upload and Monitor'
+    - This will start compiling the code, and after upload it to the display
+    - Don't forget to hold the boot button while flashing. The screen will flash when the firmware is attempted to be flashed
\ No newline at end of file
diff --git a/readme/cmd.jpg b/readme/cmd.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..469deeda046a13011d7599fd12b3a7f58787f731
GIT binary patch
literal 18041
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

literal 0
HcmV?d00001


From 61f15ff6f3b4d67f538b90fb8708307062757f9e Mon Sep 17 00:00:00 2001
From: suchmememanyskill <38142618+suchmememanyskill@users.noreply.github.com>
Date: Sat, 9 Mar 2024 21:43:46 +0100
Subject: [PATCH 7/9] Fix bugs

---
 CYD-Klipper/src/ui/panels/printer_panel.cpp  |  6 ++--
 CYD-Klipper/src/ui/panels/settings_panel.cpp | 37 +++++++++++++-------
 CYD-Klipper/src/ui/switch_printer.cpp        | 15 +++++---
 CYD-Klipper/src/ui/switch_printer.h          |  1 +
 4 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/CYD-Klipper/src/ui/panels/printer_panel.cpp b/CYD-Klipper/src/ui/panels/printer_panel.cpp
index ca7c63c..900c15a 100644
--- a/CYD-Klipper/src/ui/panels/printer_panel.cpp
+++ b/CYD-Klipper/src/ui/panels/printer_panel.cpp
@@ -6,6 +6,7 @@
 #include <stdio.h>
 #include "../nav_buttons.h"
 #include "../../core/macros_query.h"
+#include "../switch_printer.h"
 
 const char * printer_status[] = {
     "Error",
@@ -148,10 +149,7 @@ static void btn_printer_activate(lv_event_t * e)
     PRINTER_CONFIG * config = (PRINTER_CONFIG*)lv_event_get_user_data(e);
     int index = config - global_config.printer_config;
 
-    set_printer_config_index(index);
-    set_color_scheme();
-    _macros_query_internal();
-    _power_devices_query_internal();
+    switch_printer(index);
     lv_msg_send(DATA_PRINTER_MINIMAL, NULL);
 }
 
diff --git a/CYD-Klipper/src/ui/panels/settings_panel.cpp b/CYD-Klipper/src/ui/panels/settings_panel.cpp
index 1072fc8..12fdad9 100644
--- a/CYD-Klipper/src/ui/panels/settings_panel.cpp
+++ b/CYD-Klipper/src/ui/panels/settings_panel.cpp
@@ -127,19 +127,31 @@ void settings_panel_init(lv_obj_t* panel){
     lv_layout_flex_column(panel);
     lv_obj_set_scrollbar_mode(panel, LV_SCROLLBAR_MODE_OFF);
 
-    lv_create_custom_menu_button("Configure WiFi", panel, reset_wifi_click, "Restart");
-    lv_create_custom_menu_button("Configure IP", panel, reset_ip_click, "Restart");
+    if (global_config.multi_printer_mode)
+    {
+        lv_obj_t * label = lv_label_create(panel);
+        lv_label_set_text(label, "Printer Specific Settings");
+    }
 
-#ifndef CYD_SCREEN_DISABLE_TOUCH_CALIBRATION
-    lv_create_custom_menu_button("Calibrate Touch", panel, reset_calibration_click, "Restart");
-#endif // CYD_SCREEN_DISABLE_TOUCH_CALIBRATION
+    lv_create_custom_menu_dropdown("Estimated Time", panel, estimated_time_dropdown, estimated_time_options, get_current_printer_config()->remaining_time_calc_mode);
+    lv_create_custom_menu_dropdown("Theme", panel, theme_dropdown, "Blue\nGreen\nGrey\nYellow\nOrange\nRed\nPurple", get_current_printer_config()->color_scheme);
 
 #ifndef CYD_SCREEN_DISABLE_INVERT_COLORS
     lv_create_custom_menu_switch("Invert Colors", panel, invert_color_switch, get_current_printer_config()->invert_colors);
 #endif // CYD_SCREEN_DISABLE_INVERT_COLORS
 
     lv_create_custom_menu_switch("Light Mode", panel, light_mode_switch, get_current_printer_config()->light_mode);
-    lv_create_custom_menu_dropdown("Theme", panel, theme_dropdown, "Blue\nGreen\nGrey\nYellow\nOrange\nRed\nPurple", get_current_printer_config()->color_scheme);
+    lv_create_custom_menu_button("Configure IP", panel, reset_ip_click, "Restart");
+
+    if (global_config.multi_printer_mode)
+    {
+        lv_obj_t * label = lv_label_create(panel);
+        lv_label_set_text(label, "\nGlobal Settings");
+    }
+
+#ifndef CYD_SCREEN_DISABLE_TIMEOUT
+    lv_create_custom_menu_switch("Screen On During Print", panel, on_during_print_switch, global_config.on_during_print);
+#endif
 
     int brightness_settings_index = 0;
     for (int i = 0; i < SIZEOF(brightness_options_values); i++){
@@ -151,7 +163,6 @@ void settings_panel_init(lv_obj_t* panel){
 
     lv_create_custom_menu_dropdown("Brightness", panel, brightness_dropdown, brightness_options, brightness_settings_index);
 
-
 #ifndef CYD_SCREEN_DISABLE_TIMEOUT
     int wake_timeout_settings_index = 0;
     for (int i = 0; i < SIZEOF(wake_timeout_options_values); i++){
@@ -164,13 +175,7 @@ void settings_panel_init(lv_obj_t* panel){
     lv_create_custom_menu_dropdown("Wake Timeout", panel, wake_timeout_dropdown, wake_timeout_options, wake_timeout_settings_index);
 #endif
 
-    lv_create_custom_menu_dropdown("Estimated Time", panel, estimated_time_dropdown, estimated_time_options, get_current_printer_config()->remaining_time_calc_mode);
     lv_create_custom_menu_switch("Rotate Screen", panel, rotate_screen_switch, global_config.rotate_screen);
-
-#ifndef CYD_SCREEN_DISABLE_TIMEOUT
-    lv_create_custom_menu_switch("Screen On During Print", panel, on_during_print_switch, global_config.on_during_print);
-#endif
-
     lv_create_custom_menu_switch("Multi Printer Mode", panel, multi_printer_switch, global_config.multi_printer_mode);
     lv_create_custom_menu_switch("Auto Update", panel, auto_ota_update_switch, global_config.auto_ota_update);
     lv_create_custom_menu_label("Version", panel, REPO_VERSION "  ");
@@ -188,4 +193,10 @@ void settings_panel_init(lv_obj_t* panel){
     else {
         lv_create_custom_menu_label("Device", panel, ARDUINO_BOARD "  ");
     }
+
+    #ifndef CYD_SCREEN_DISABLE_TOUCH_CALIBRATION
+        lv_create_custom_menu_button("Calibrate Touch", panel, reset_calibration_click, "Restart");
+    #endif // CYD_SCREEN_DISABLE_TOUCH_CALIBRATION
+
+    lv_create_custom_menu_button("Configure WiFi", panel, reset_wifi_click, "Restart");
 }
\ No newline at end of file
diff --git a/CYD-Klipper/src/ui/switch_printer.cpp b/CYD-Klipper/src/ui/switch_printer.cpp
index 34c5684..f344334 100644
--- a/CYD-Klipper/src/ui/switch_printer.cpp
+++ b/CYD-Klipper/src/ui/switch_printer.cpp
@@ -5,16 +5,23 @@
 #include "../core/http_client.h"
 #include "../core/lv_setup.h"
 #include "../core/macros_query.h"
+#include "../core/screen_driver.h"
+
+void switch_printer(int index)
+{
+    set_printer_config_index(index);
+    set_color_scheme();
+    set_invert_display();
+    _macros_query_internal();
+    _power_devices_query_internal();
+}
 
 static void btn_switch_printer(lv_event_t *e){
     lv_obj_t *btn = lv_event_get_target(e);
     PRINTER_CONFIG * config = (PRINTER_CONFIG*)lv_event_get_user_data(e);
     int index = config - global_config.printer_config;
 
-    set_printer_config_index(index);
-    set_color_scheme();
-    _macros_query_internal();
-    _power_devices_query_internal();
+    switch_printer(index);
 
     lv_obj_del(lv_obj_get_parent(lv_obj_get_parent(btn)));
 }
diff --git a/CYD-Klipper/src/ui/switch_printer.h b/CYD-Klipper/src/ui/switch_printer.h
index eb2d8a0..775303c 100644
--- a/CYD-Klipper/src/ui/switch_printer.h
+++ b/CYD-Klipper/src/ui/switch_printer.h
@@ -1,4 +1,5 @@
 #pragma once
 
+void switch_printer(int index);
 void switch_printer_init();
 void draw_switch_printer_button();
\ No newline at end of file

From fb1e264df7fbd43feabd3ebb1e464a7c3cf8235a Mon Sep 17 00:00:00 2001
From: suchmememanyskill <38142618+suchmememanyskill@users.noreply.github.com>
Date: Sun, 10 Mar 2024 01:08:47 +0100
Subject: [PATCH 8/9] Display M117 message on screen

---
 CYD-Klipper/platformio.ini          |  3 ++
 CYD-Klipper/src/core/data_setup.cpp | 12 ++++---
 CYD-Klipper/src/ui/ui_utils.cpp     | 51 +++++++++++++++++++++++++++++
 CYD-Klipper/src/ui/ui_utils.h       |  3 +-
 4 files changed, 64 insertions(+), 5 deletions(-)

diff --git a/CYD-Klipper/platformio.ini b/CYD-Klipper/platformio.ini
index b6dfe46..1472295 100644
--- a/CYD-Klipper/platformio.ini
+++ b/CYD-Klipper/platformio.ini
@@ -17,6 +17,7 @@ lib_deps =
 	https://github.com/suchmememanyskill/esp32-smartdisplay
 	bblanchon/ArduinoJson@^7.0.0
 	plageoj/UrlEncode@^1.0.1
+	erriez/ErriezCRC32 @ ^1.0.1
 monitor_filters = esp32_exception_decoder
 build_flags = 
 	-DLV_CONF_PATH="../../../../src/conf/lv_conf.h"
@@ -32,6 +33,7 @@ lib_deps =
 	https://github.com/PaulStoffregen/XPT2046_Touchscreen.git
 	bblanchon/ArduinoJson@^7.0.0
 	plageoj/UrlEncode@^1.0.1
+	erriez/ErriezCRC32 @ ^1.0.1
 
 [env:esp32-3248S035C]
 board = esp32-3248S035C
@@ -42,6 +44,7 @@ lib_deps =
 	https://github.com/OperatorB/gt911-arduino-fixed-reset.git
 	bblanchon/ArduinoJson@^7.0.0
 	plageoj/UrlEncode@^1.0.1
+	erriez/ErriezCRC32 @ ^1.0.1
 
 [env:esp32-2432S028Rv1-SD]
 board = esp32-2432S028RV1-smartdisplay
diff --git a/CYD-Klipper/src/core/data_setup.cpp b/CYD-Klipper/src/core/data_setup.cpp
index 89e2f5a..69ec09b 100644
--- a/CYD-Klipper/src/core/data_setup.cpp
+++ b/CYD-Klipper/src/core/data_setup.cpp
@@ -7,6 +7,7 @@
 #include "macros_query.h"
 #include <UrlEncode.h>
 #include "http_client.h"
+#include "../ui/ui_utils.h"
 
 const char *printer_state_messages[] = {
     "Error",
@@ -112,7 +113,7 @@ void fetch_printer_data()
 {
     freeze_request_thread();
     PRINTER_CONFIG *config = get_current_printer_config();
-    SETUP_HTTP_CLIENT("/printer/objects/query?extruder&heater_bed&toolhead&gcode_move&virtual_sdcard&print_stats&webhooks&fan")
+    SETUP_HTTP_CLIENT("/printer/objects/query?extruder&heater_bed&toolhead&gcode_move&virtual_sdcard&print_stats&webhooks&fan&display_status")
 
     int httpCode = client.GET();
     delay(10);
@@ -235,8 +236,11 @@ void fetch_printer_data()
                 }
             }
 
-            // TODO: make a call to /server/files/metadata to get more accurate time estimates
-            // https://moonraker.readthedocs.io/en/latest/web_api/#server-administration
+            if (status.containsKey("display_status"))
+            {
+                const char* message = status["display_status"]["message"];
+                lv_create_popup_message(message, 10000);
+            }
 
             if (printer.state == PRINTER_STATE_PRINTING && printer.print_progress > 0)
             {
@@ -418,5 +422,5 @@ void data_setup()
 
     macros_query_setup();
     freeze_render_thread();
-    xTaskCreatePinnedToCore(data_loop_background, "data_loop_background", 5000, NULL, 0, &background_loop, 0);
+    xTaskCreatePinnedToCore(data_loop_background, "data_loop_background", 5000, NULL, 2, &background_loop, 0);
 }
diff --git a/CYD-Klipper/src/ui/ui_utils.cpp b/CYD-Klipper/src/ui/ui_utils.cpp
index c43592b..a6d0e21 100644
--- a/CYD-Klipper/src/ui/ui_utils.cpp
+++ b/CYD-Klipper/src/ui/ui_utils.cpp
@@ -2,6 +2,7 @@
 #include "ui_utils.h"
 #include "../core/data_setup.h"
 #include "../core/lv_setup.h"
+#include <ErriezCRC32.h>
 
 lv_obj_t* lv_create_empty_panel(lv_obj_t* root) {
     lv_obj_t* panel = lv_obj_create(root); 
@@ -199,4 +200,54 @@ void lv_create_custom_menu_label(const char *label_text, lv_obj_t* root_panel, c
     lv_obj_t * label = lv_label_create(lv_scr_act());
     lv_label_set_text(label, text);
     lv_create_custom_menu_entry(label_text, label, root_panel, false);
+}
+
+uint32_t message_hash = 0;
+lv_timer_t* timer = NULL;
+
+void on_timer_destroy(lv_event_t * e)
+{
+    lv_timer_del(timer);
+    timer = NULL;
+    Serial.println("Timer destroy");
+}
+
+void timer_callback(lv_timer_t *timer)
+{
+    lv_obj_t * panel = (lv_obj_t *)timer->user_data;
+    lv_obj_del(panel);
+    Serial.println("Timer callback");
+}
+
+void lv_create_popup_message(const char* message, uint16_t timeout_ms)
+{
+    Serial.println("Hello");
+    if (message == nullptr || timer != NULL) 
+    {
+        return;
+    }
+
+    uint32_t new_hash = crc32String(message);
+
+    if (new_hash == message_hash) 
+    {
+        return;
+    }
+
+    message_hash = new_hash;
+
+    lv_obj_t* panel = lv_obj_create(lv_scr_act()); 
+    lv_obj_set_style_pad_all(panel, CYD_SCREEN_GAP_PX, CYD_SCREEN_GAP_PX);
+    lv_obj_set_size(panel, CYD_SCREEN_PANEL_WIDTH_PX - CYD_SCREEN_GAP_PX * 2, LV_SIZE_CONTENT);
+    lv_layout_flex_column(panel, LV_FLEX_ALIGN_CENTER);
+    lv_obj_align(panel, LV_ALIGN_TOP_RIGHT, -CYD_SCREEN_GAP_PX, CYD_SCREEN_GAP_PX);
+    lv_obj_add_event_cb(panel, on_timer_destroy, LV_EVENT_DELETE, NULL);
+    lv_obj_set_style_border_color(panel, lv_color_hex(0xFF0000), 0);
+
+    lv_obj_t* label = lv_label_create(panel);
+    lv_label_set_text_fmt(label, "%s", message);
+    lv_obj_set_size(label, CYD_SCREEN_PANEL_WIDTH_PX - CYD_SCREEN_GAP_PX * 6, LV_SIZE_CONTENT);
+    lv_label_set_long_mode(label, LV_LABEL_LONG_WRAP);
+
+    timer = lv_timer_create(timer_callback, timeout_ms,  panel);
 }
\ No newline at end of file
diff --git a/CYD-Klipper/src/ui/ui_utils.h b/CYD-Klipper/src/ui/ui_utils.h
index 295a2cf..8c4239c 100644
--- a/CYD-Klipper/src/ui/ui_utils.h
+++ b/CYD-Klipper/src/ui/ui_utils.h
@@ -43,4 +43,5 @@ void lv_create_custom_menu_entry(const char* label_text, lv_obj_t* object, lv_ob
 void lv_create_custom_menu_button(const char *label_text, lv_obj_t* root_panel, lv_event_cb_t on_click, const char *btn_text, void * user_data = NULL);
 void lv_create_custom_menu_switch(const char *label_text, lv_obj_t* root_panel, lv_event_cb_t on_toggle, bool state, void * user_data = NULL);
 void lv_create_custom_menu_dropdown(const char *label_text, lv_obj_t *root_panel, lv_event_cb_t on_change, const char *options, int index, void * user_data = NULL);
-void lv_create_custom_menu_label(const char *label_text, lv_obj_t* root_panel, const char *text);
\ No newline at end of file
+void lv_create_custom_menu_label(const char *label_text, lv_obj_t* root_panel, const char *text);
+void lv_create_popup_message(const char* message, uint16_t timeout_ms);
\ No newline at end of file

From 8d6d22c38af439cdad522c7b7355b5efdc85bec1 Mon Sep 17 00:00:00 2001
From: suchmememanyskill <38142618+suchmememanyskill@users.noreply.github.com>
Date: Mon, 11 Mar 2024 21:55:33 +0100
Subject: [PATCH 9/9] Change status to 'In Control' when in control

---
 CYD-Klipper/src/ui/panels/printer_panel.cpp | 9 ++++++++-
 CYD-Klipper/src/ui/ui_utils.cpp             | 3 ---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CYD-Klipper/src/ui/panels/printer_panel.cpp b/CYD-Klipper/src/ui/panels/printer_panel.cpp
index 900c15a..68148f5 100644
--- a/CYD-Klipper/src/ui/panels/printer_panel.cpp
+++ b/CYD-Klipper/src/ui/panels/printer_panel.cpp
@@ -34,7 +34,14 @@ static void update_printer_status_text(lv_event_t * e)
     int index = config - global_config.printer_config;
     PrinterMinimal * printer = &printer_minimal[index];
 
-    if (!printer->online){
+    if (config == get_current_printer_config())
+    {
+        lv_label_set_text(label, "In Control");
+        return;
+    }
+
+    if (!printer->online)
+    {
         lv_label_set_text(label, "Offline");
         return;
     }
diff --git a/CYD-Klipper/src/ui/ui_utils.cpp b/CYD-Klipper/src/ui/ui_utils.cpp
index a6d0e21..b1e6b4a 100644
--- a/CYD-Klipper/src/ui/ui_utils.cpp
+++ b/CYD-Klipper/src/ui/ui_utils.cpp
@@ -209,19 +209,16 @@ void on_timer_destroy(lv_event_t * e)
 {
     lv_timer_del(timer);
     timer = NULL;
-    Serial.println("Timer destroy");
 }
 
 void timer_callback(lv_timer_t *timer)
 {
     lv_obj_t * panel = (lv_obj_t *)timer->user_data;
     lv_obj_del(panel);
-    Serial.println("Timer callback");
 }
 
 void lv_create_popup_message(const char* message, uint16_t timeout_ms)
 {
-    Serial.println("Hello");
     if (message == nullptr || timer != NULL) 
     {
         return;