🚀 1.add octoprint api 2.combine prusa firmware

fiberpunk1 · Sep 29, 2022 · ab034ba · ab034ba
1 parent 5ec6bfc
commit ab034ba
Show file tree

Hide file tree

Showing 5 changed files with 256 additions and 123 deletions.
diff --git a/WifiNode/nodeconfig.cpp b/WifiNode/nodeconfig.cpp
@@ -1,6 +1,7 @@
 #include "nodeconfig.h"
 
 AsyncWebServer server(88);
+AsyncWebServer octo_server(80);
 AsyncEventSource events("/events");
 
 HTTPClient http_client;
@@ -42,7 +43,12 @@ bool paused_for_user = false;
 bool paused_for_filament = false;
 
 //printer sd type: 0==spi  1==sdio
-uint8_t printer_sd_type = 0;
+#if MB(MARLIN_VER)
+  uint8_t printer_sd_type = 0;
+#elif MB(PRUSA_VER)
+  uint8_t printer_sd_type = 1;
+#endif
+
 
 //last power status 0==idle  1==printing
 uint8_t last_power_status = 0;

diff --git a/WifiNode/nodeconfig.h b/WifiNode/nodeconfig.h
@@ -21,7 +21,18 @@
 #include "crc8.h"
 #include "FiberPunk_SSD1306.h"
 
-#define VERSION "2022-9-21-2006-Beta"
+#define MARLIN_VER  0x01
+#define PRUSA_VER   0x02
+#define FMTYPE MARLIN_VER
+// #define FMTYPE PRUSA_VER
+#define MB(V) (V==FMTYPE)
+
+#if MB(MARLIN_VER)
+  #define VERSION "2022-9-29-2007"
+#elif MB(PRUSA_VER)
+  #define VERSION "2022-9-29-2007-PRUSA-MK3S"
+#endif
+
 #define DBG_OUTPUT_PORT Serial
 #define PRINTER_PORT Serial
 #define RED_LED 26
@@ -51,6 +62,7 @@ enum ERROR_CODE
 };
 
 extern AsyncWebServer server;
+extern AsyncWebServer octo_server;
 extern AsyncEventSource events;
 // extern HTTPClient http_client;
 extern AsyncClient socket_client;
@@ -105,7 +117,7 @@ extern void sendHttpMsg(String);
 extern void writeLog(String);
 extern void saveCurrentPrintStatus(String status_str);
 extern String getValue(String data, char separator, int index);
-extern void Write_String(int a,int b,String str);
+extern void writeString(int a,int b,String str);
 extern uint8_t lastPowerOffPrinting();
 class NodeConfig
 {

diff --git a/WifiNode/printerprocess.cpp b/WifiNode/printerprocess.cpp
@@ -29,11 +29,11 @@ void setWifiConfigByPort(String config_str)
   }
   else if(cmd_name=="SAVE")
   {
-    Write_String(1,30,cf_ssid);
+    writeString(1,30,cf_ssid);
     delay(100);
-    Write_String(5,60,cf_password);
+    writeString(5,60,cf_password);
     delay(100);
-    Write_String(9,90,cf_node_name);
+    writeString(9,90,cf_node_name);
     delay(100);
     Serial.print("SAVE");
   }
@@ -111,7 +111,10 @@ void readPrinterBack()
       }
       else if(inData.indexOf("$f")!=-1)
       {
-        current_usb_status = 0;
+        if(g_status!=PRINTING)
+        {
+          current_usb_status = 0;
+        }
       }
 
       if(inData.indexOf("@Stop")!=-1)
@@ -158,15 +161,6 @@ void readPrinterBack()
           cancleOrFinishPrint();
 
         }
-
-        // if(inData.indexOf("no file")!=-1)
-        // {
-        //     cancleOrFinishPrint();
-        //     print_start_flag = 1;
-        // }
-
-        //Current file: (no file)
-
 
       }
       inData="";