Seperate backend from frontend, abstract printer implementation

.github/workflows/compile.yaml

@@ -17,19 +17,19 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
 
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cache/pip
-            ~/.platformio/.cache
-          key: ${{ runner.os }}-pio-cyd-klipper
+      #- uses: actions/cache@v3
+      #  with:
+      #    path: |
+      #      ~/.cache/pip
+      #      ~/.platformio/.cache
+      #    key: ${{ runner.os }}-pio-cyd-klipper
 
       - uses: actions/setup-python@v4
         with:

.gitignore

@@ -8,3 +8,4 @@ out/
 lib
 lib64
 
+__pycache__/

CYD-Klipper/.vscode/settings.json

@@ -13,7 +13,42 @@
         "cstddef": "cpp",
         "functional": "cpp",
         "*.tcc": "cpp",
-        "cmath": "cpp"
+        "cmath": "cpp",
+        "system_error": "cpp",
+        "random": "cpp",
+        "optional": "cpp",
+        "limits": "cpp",
+        "memory": "cpp",
+        "new": "cpp",
+        "type_traits": "cpp",
+        "atomic": "cpp",
+        "cctype": "cpp",
+        "clocale": "cpp",
+        "cstdarg": "cpp",
+        "cstdint": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "cstring": "cpp",
+        "ctime": "cpp",
+        "cwchar": "cpp",
+        "cwctype": "cpp",
+        "exception": "cpp",
+        "iterator": "cpp",
+        "map": "cpp",
+        "memory_resource": "cpp",
+        "numeric": "cpp",
+        "tuple": "cpp",
+        "utility": "cpp",
+        "fstream": "cpp",
+        "iomanip": "cpp",
+        "iosfwd": "cpp",
+        "istream": "cpp",
+        "ostream": "cpp",
+        "sstream": "cpp",
+        "stdexcept": "cpp",
+        "streambuf": "cpp",
+        "cinttypes": "cpp",
+        "typeinfo": "cpp"
     },
     "cmake.configureOnOpen": false
 }

CYD-Klipper/platformio.ini

@@ -9,15 +9,17 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [env]
-platform = https://github.com/platformio/platform-espressif32#v6.4.0
+platform = espressif32@6.4.0
 board = esp32dev
 framework = arduino
 monitor_speed = 115200
+debug_build_flags = -Os
 lib_deps = 
 	https://github.com/suchmememanyskill/esp32-smartdisplay#9c1d737
 	bblanchon/ArduinoJson@^7.0.0
 	plageoj/UrlEncode@^1.0.1
-	erriez/ErriezCRC32 @ ^1.0.1
+	knolleary/PubSubClient@^2.8
+	WiFiClientSecure
 monitor_filters = esp32_exception_decoder
 build_flags = 
 	-DLV_CONF_PATH="../../../../src/conf/lv_conf.h"
@@ -33,7 +35,8 @@ lib_deps =
 	https://github.com/PaulStoffregen/XPT2046_Touchscreen.git
 	bblanchon/ArduinoJson@^7.0.0
 	plageoj/UrlEncode@^1.0.1
-	erriez/ErriezCRC32 @ ^1.0.1
+	knolleary/PubSubClient@^2.8
+	WiFiClientSecure
 
 [env:esp32-3248S035C]
 board = esp32-3248S035C
@@ -44,7 +47,8 @@ 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
+	knolleary/PubSubClient@^2.8
+	WiFiClientSecure
 
 [env:esp32-3248S035C-V]
 board = esp32-3248S035C-vertical
@@ -55,7 +59,8 @@ 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
+	knolleary/PubSubClient@^2.8
+	WiFiClientSecure
 
 [env:esp32-2432S024C-SD]
 board = esp32-2432S024C-smartdisplay
@@ -95,4 +100,5 @@ lib_deps =
 	https://github.com/Bodmer/TFT_eSPI.git
 	bblanchon/ArduinoJson@^7.0.0
 	plageoj/UrlEncode@^1.0.1
-	erriez/ErriezCRC32 @ ^1.0.1
+	knolleary/PubSubClient@^2.8
+	WiFiClientSecure

CYD-Klipper/src/conf/global_config.cpp

@@ -2,10 +2,10 @@
 #include "global_config.h"
 #include "lvgl.h"
 
-GLOBAL_CONFIG global_config = {0};
-TEMPORARY_CONFIG temporary_config = {0};
+GlobalConfig global_config = {0};
+TemporaryConfig temporary_config = {0};
 
-COLOR_DEF color_defs[] = {
+ColorDefinition color_defs[] = {
     {LV_PALETTE_BLUE, 0, LV_PALETTE_RED},
     {LV_PALETTE_GREEN, 0, LV_PALETTE_PURPLE},
     {LV_PALETTE_LIME, -2, LV_PALETTE_PURPLE},
@@ -30,7 +30,7 @@ void verify_version()
     if (!preferences.begin("global_config", false))
         return;
 
-    GLOBAL_CONFIG config = {0};
+    GlobalConfig config = {0};
     preferences.getBytes("global_config", &config, sizeof(config));
     LOG_F(("Config version: %d\n", config.version))
     if (config.version != CONFIG_VERSION) {
@@ -41,16 +41,16 @@ void verify_version()
     preferences.end();
 }
 
-PRINTER_CONFIG* get_current_printer_config()
+PrinterConfiguration* get_current_printer_config()
 {
     return &global_config.printer_config[global_config.printer_index];
 }
 
-int get_printer_config_count()
+int global_config_get_printer_config_count()
 {
     int count = 0;
     for (int i = 0; i < PRINTER_CONFIG_COUNT; i++) {
-        if (global_config.printer_config[i].ip_configured)
+        if (global_config.printer_config[i].setup_complete)
             count++;
     }
     return count;
@@ -59,19 +59,82 @@ int get_printer_config_count()
 int get_printer_config_free_index()
 {
     for (int i = 0; i < PRINTER_CONFIG_COUNT; i++) {
-        if (!global_config.printer_config[i].ip_configured)
+        if (!global_config.printer_config[i].setup_complete)
             return i;
     }
     return -1;
 }
 
+void global_config_add_new_printer()
+{
+    int free_index = get_printer_config_free_index();
+    if (free_index <= -1)
+    {
+        LOG_LN("No available slot for new printer");
+        return;
+    }
+
+    PrinterConfiguration* old_config = &global_config.printer_config[global_config.printer_index];
+    PrinterConfiguration* new_config = &global_config.printer_config[free_index];
+
+    new_config->raw = old_config->raw;
+    new_config->setup_complete = false;
+    new_config->ip_configured = false;
+    new_config->auth_configured = false;
+    new_config->printer_type = PrinterType::PrinterTypeNone;
+
+    new_config->printer_name[0] = 0;
+    new_config->printer_host[0] = 0;
+    new_config->printer_auth[0] = 0;
+    new_config->klipper_port = 0;
+
+    new_config->color_scheme = old_config->color_scheme;
+
+    // TODO: Replace with memcpy
+    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];
+    }
+
+    for (int i = 0; i < 3; i++){
+        new_config->printer_move_x_steps[i] = old_config->printer_move_x_steps[i];
+        new_config->printer_move_y_steps[i] = old_config->printer_move_y_steps[i];
+        new_config->printer_move_z_steps[i] = old_config->printer_move_z_steps[i];
+    }
+
+    global_config_set_printer(free_index);
+    ESP.restart();
+}
+
+void global_config_set_printer(int idx)
+{
+    if (idx < 0 || idx >= PRINTER_CONFIG_COUNT || global_config.printer_index == idx)
+        return;
+
+    global_config.printer_index = idx;
+    write_global_config();
+}
+
+void global_config_delete_printer(int idx)
+{
+    if (global_config.printer_index == idx)
+    {
+        return;
+    } 
+
+    PrinterConfiguration* config = &global_config.printer_config[idx];
+    config->setup_complete = false;
+    write_global_config();
+    ESP.restart();
+}
+
 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];
+    PrinterConfiguration* old_config = &global_config.printer_config[global_config.printer_index];
+    PrinterConfiguration* new_config = &global_config.printer_config[index];
 
     global_config.printer_index = index;
 
@@ -81,8 +144,8 @@ void set_printer_config_index(int index)
         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->printer_host[0] = 0;
+        new_config->printer_auth[0] = 0;
         new_config->klipper_port = 0;
 
         new_config->color_scheme = old_config->color_scheme;