Basic bambu implementation

suchmememanyskill · Oct 29, 2024 · 4207d82 · 4207d82
1 parent b1138d9
commit 4207d82
Show file tree

Hide file tree

Showing 19 changed files with 1,010 additions and 233 deletions.
diff --git a/CYD-Klipper/platformio.ini b/CYD-Klipper/platformio.ini
@@ -18,6 +18,7 @@ lib_deps =
 	bblanchon/ArduinoJson@^7.0.0
 	plageoj/UrlEncode@^1.0.1
 	erriez/ErriezCRC32 @ ^1.0.1
+	knolleary/PubSubClient@^2.8
 monitor_filters = esp32_exception_decoder
 build_flags = 
 	-DLV_CONF_PATH="../../../../src/conf/lv_conf.h"
@@ -33,6 +34,7 @@ lib_deps =
 	https://github.com/PaulStoffregen/XPT2046_Touchscreen.git
 	bblanchon/ArduinoJson@^7.0.0
 	plageoj/UrlEncode@^1.0.1
+	knolleary/PubSubClient@^2.8
 
 [env:esp32-3248S035C]
 board = esp32-3248S035C
@@ -43,6 +45,7 @@ lib_deps =
 	https://github.com/OperatorB/gt911-arduino-fixed-reset.git
 	bblanchon/ArduinoJson@^7.0.0
 	plageoj/UrlEncode@^1.0.1
+	knolleary/PubSubClient@^2.8
 
 [env:esp32-3248S035C-V]
 board = esp32-3248S035C-vertical
@@ -53,6 +56,7 @@ lib_deps =
 	https://github.com/OperatorB/gt911-arduino-fixed-reset.git
 	bblanchon/ArduinoJson@^7.0.0
 	plageoj/UrlEncode@^1.0.1
+	knolleary/PubSubClient@^2.8
 
 [env:esp32-2432S024C-SD]
 board = esp32-2432S024C-smartdisplay
@@ -79,5 +83,4 @@ board = esp32-4827S043C-smartdisplay
 board = esp32-4827S043C-smartdisplay
 
 [env:esp32-8048S043C-SD]
-board = esp32-8048S043C-smartdisplay
-
+board = esp32-8048S043C-smartdisplay
diff --git a/CYD-Klipper/src/conf/global_config.cpp b/CYD-Klipper/src/conf/global_config.cpp
@@ -81,6 +81,7 @@ void global_config_add_new_printer()
     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->klipper_host[0] = 0;

diff --git a/CYD-Klipper/src/conf/global_config.h b/CYD-Klipper/src/conf/global_config.h
@@ -21,10 +21,12 @@ enum {
 };
 
 enum PrinterType {
-    PrinterTypeKlipper = 0,
-    PrinterTypeKlipperSerial = 1,
-    PrinterTypeBambu = 2,
-    PrinterTypeOctoprint = 3,
+    PrinterTypeNone = 0,
+    PrinterTypeKlipper = 1,
+    PrinterTypeKlipperSerial = 2,
+    PrinterTypeBambuLocal = 3,
+    PrinterTypeBambuCloud = 3,
+    PrinterTypeOctoprint = 4,
 };
 
 typedef struct {
@@ -49,7 +51,7 @@ typedef struct {
     char printer_name[25];
     char klipper_host[65];
     char klipper_auth[33];
-    unsigned short klipper_port;
+    unsigned int klipper_port;
 
     unsigned char color_scheme;