ESP3d integration for ESP32 (#16515)

Marlin/src/HAL/HAL_ESP32/HAL.cpp

@@ -30,10 +30,6 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
-#if ENABLED(WEBSUPPORT)
-  #include "spiffs.h"
-#endif
-
 #if ENABLED(WIFISUPPORT)
   #include <ESPAsyncWebServer.h>
   #include "wifi.h"
@@ -41,6 +37,7 @@
     #include "ota.h"
   #endif
   #if ENABLED(WEBSUPPORT)
+    #include "spiffs.h"
     #include "web.h"
   #endif
 #endif
@@ -78,21 +75,32 @@ volatile int numPWMUsed = 0,
 // Public functions
 // ------------------------
 
-void HAL_init() {
-  i2s_init();
-}
+#if ENABLED(WIFI_CUSTOM_COMMAND)
+
+  bool wifi_custom_command(char * const command_ptr) {
+    #if ENABLED(ESP3D_WIFISUPPORT)
+      return esp3dlib.parse(command_ptr);
+    #else
+      UNUSED(command_ptr);
+      return false;
+    #endif
+  }
+
+#endif
+
+void HAL_init() { i2s_init(); }
 
 void HAL_init_board() {
-  #if ENABLED(WEBSUPPORT)
-    spiffs_init();
-  #endif
 
-  #if ENABLED(WIFISUPPORT)
+  #if ENABLED(ESP3D_WIFISUPPORT)
+    esp3dlib.init();
+  #elif ENABLED(WIFISUPPORT)
     wifi_init();
     #if ENABLED(OTASUPPORT)
       OTA_init();
     #endif
     #if ENABLED(WEBSUPPORT)
+      spiffs_init();
       web_init();
     #endif
     server.begin();
@@ -100,7 +108,7 @@ void HAL_init_board() {
 }
 
 void HAL_idletask() {
-  #if ENABLED(OTASUPPORT)
+  #if BOTH(WIFISUPPORT, OTASUPPORT)
     OTA_handle();
   #endif
 }

Marlin/src/HAL/HAL_ESP32/HAL.h

@@ -36,7 +36,14 @@
 
 #include "timers.h"
 
-#include "WebSocketSerial.h"
+#if ENABLED(WIFISUPPORT)
+  #include "WebSocketSerial.h"
+#endif
+
+#if ENABLED(ESP3D_WIFISUPPORT)
+  #include "esp3dlib.h"
+#endif
+
 #include "FlushableHardwareSerial.h"
 
 // ------------------------
@@ -47,8 +54,12 @@ extern portMUX_TYPE spinlock;
 
 #define MYSERIAL0 flushableSerial
 
-#if ENABLED(WIFISUPPORT)
-  #define MYSERIAL1 webSocketSerial
+#if EITHER(WIFISUPPORT, ESP3D_WIFISUPPORT)
+  #if ENABLED(ESP3D_WIFISUPPORT)
+    #define MYSERIAL1 Serial2Socket
+  #else
+    #define MYSERIAL1 webSocketSerial
+  #endif
   #define NUM_SERIAL 2
 #else
   #define NUM_SERIAL 1
@@ -60,7 +71,6 @@ extern portMUX_TYPE spinlock;
 #define ENABLE_ISRS()  if (spinlock.owner != portMUX_FREE_VAL) portEXIT_CRITICAL(&spinlock)
 #define DISABLE_ISRS() portENTER_CRITICAL(&spinlock)
 
-
 // Fix bug in pgm_read_ptr
 #undef pgm_read_ptr
 #define pgm_read_ptr(addr) (*(addr))

Marlin/src/HAL/HAL_ESP32/inc/SanityCheck.h

@@ -32,3 +32,7 @@
 #if TMC_HAS_SW_SERIAL
   #error "TMC220x Software Serial is not supported on this platform."
 #endif
+
+#if BOTH(WIFISUPPORT, ESP3D_WIFISUPPORT)
+  #error "Only enable one WiFi option, either WIFISUPPORT or ESP3D_WIFISUPPORT."
+#endif

Marlin/src/HAL/HAL_ESP32/ota.cpp

@@ -21,7 +21,7 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
-#if ENABLED(OTASUPPORT)
+#if BOTH(WIFISUPPORT, OTASUPPORT)
 
 #include <WiFi.h>
 #include <ESPmDNS.h>
@@ -67,6 +67,5 @@ void OTA_handle() {
   ArduinoOTA.handle();
 }
 
-#endif // OTASUPPORT
-
+#endif // WIFISUPPORT && OTASUPPORT
 #endif // ARDUINO_ARCH_ESP32

Marlin/src/HAL/HAL_ESP32/spiffs.cpp

@@ -24,7 +24,7 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
-#if ENABLED(WEBSUPPORT)
+#if BOTH(WIFISUPPORT, WEBSUPPORT)
 
 #include "../../core/serial.h"
 
@@ -40,5 +40,5 @@ void spiffs_init() {
     SERIAL_ERROR_MSG("SPIFFS mount failed");
 }
 
-#endif // WEBSUPPORT
+#endif // WIFISUPPORT && WEBSUPPORT
 #endif // ARDUINO_ARCH_ESP32

Marlin/src/HAL/HAL_ESP32/web.cpp

@@ -22,13 +22,12 @@
 
 #ifdef ARDUINO_ARCH_ESP32
 
-#include <SPIFFS.h>
-#undef DISABLED  // esp32-hal-gpio.h
-
 #include "../../inc/MarlinConfigPre.h"
 
-#if ENABLED(WEBSUPPORT)
+#if BOTH(WIFISUPPORT, WEBSUPPORT)
 
+#undef DISABLED  // esp32-hal-gpio.h
+#include <SPIFFS.h>
 #include "wifi.h"
 
 AsyncEventSource events("/events"); // event source (Server-Sent events)
@@ -43,5 +42,5 @@ void web_init() {
   server.onNotFound(onNotFound);
 }
 
-#endif // WEBSUPPORT
+#endif // WIFISUPPORT && WEBSUPPORT
 #endif // ARDUINO_ARCH_ESP32