*sync with upstream

Author: moonglow

Marlin/.github/workflows/check-pr.yml

@@ -6,7 +6,8 @@
 name: PR Bad Target
 
 on:
-  pull_request:
+  pull_request_target:
+    types: [opened]
     branches:
     - 1.0.x
     - 1.1.x

Marlin/Marlin/Configuration.h

@@ -1407,12 +1407,24 @@
 //#define INVERT_K_DIR false
 
 // @section extruder
-
 // For direct drive extruder v9 set to true, for geared extruder set to false.
 #if ANY(FF_DREAMER_MACHINE, FF_INVENTOR_MACHINE)
+#if ENABLED(FF_EXTRUDER_SWAP)
+#if ENABLED(FF_DREAMER_OLD_MB)
+#define INVERT_E0_DIR true
+#else
 #define INVERT_E0_DIR false
+#endif
 #define INVERT_E1_DIR false
 #else
+#define INVERT_E0_DIR false
+#if ENABLED(FF_DREAMER_OLD_MB)
+#define INVERT_E1_DIR true
+#else
+#define INVERT_E1_DIR false
+#endif
+#endif
+#else
 #define INVERT_E0_DIR true
 #define INVERT_E1_DIR true
 #endif
@@ -1487,7 +1499,7 @@
 
 #define Z_MIN_POS 0
 #if ENABLED(FF_INVENTOR_MACHINE)
-#define Z_MAX_POS 155
+#define Z_MAX_POS 160
 #else
 #define Z_MAX_POS 140
 #endif

Marlin/Marlin/Configuration_adv.h

@@ -2324,6 +2324,7 @@
    */
   //#define EVENT_GCODE_TOOLCHANGE_T0 "G28 A\nG1 A0" // Extra G-code to run while executing tool-change command T0
   //#define EVENT_GCODE_TOOLCHANGE_T1 "G1 A10"       // Extra G-code to run while executing tool-change command T1
+  //#define EVENT_GCODE_TOOLCHANGE_ALWAYS_RUN        // Always execute above G-code sequences. Use with caution!
 
   /**
    * Tool Sensors detect when tools have been picked up or dropped.

Marlin/Marlin/src/HAL/AVR/HAL_SPI.cpp

@@ -34,7 +34,9 @@
 #include "../../inc/MarlinConfig.h"
 
 void spiBegin() {
-  OUT_WRITE(SD_SS_PIN, HIGH);
+  #if PIN_EXISTS(SD_SS)
+    OUT_WRITE(SD_SS_PIN, HIGH);
+  #endif
   SET_OUTPUT(SD_SCK_PIN);
   SET_INPUT(SD_MISO_PIN);
   SET_OUTPUT(SD_MOSI_PIN);

Marlin/Marlin/src/HAL/ESP32/HAL.cpp

@@ -28,6 +28,10 @@
 #include <esp_adc_cal.h>
 #include <HardwareSerial.h>
 
+#if ENABLED(USE_ESP32_TASK_WDT)
+  #include <esp_task_wdt.h>
+#endif
+
 #if ENABLED(WIFISUPPORT)
   #include <ESPAsyncWebServer.h>
   #include "wifi.h"
@@ -90,8 +94,24 @@ volatile int numPWMUsed = 0,
 
 #endif
 
-void HAL_init_board() {
+#if ENABLED(USE_ESP32_EXIO)
+  HardwareSerial YSerial2(2);
+
+  void Write_EXIO(uint8_t IO, uint8_t v) {
+    if (ISRS_ENABLED()) {
+      DISABLE_ISRS();
+      YSerial2.write(0x80 | (((char)v) << 5) | (IO - 100));
+      ENABLE_ISRS();
+    }
+    else
+      YSerial2.write(0x80 | (((char)v) << 5) | (IO - 100));
+  }
+#endif
 
+void HAL_init_board() {
+  #if ENABLED(USE_ESP32_TASK_WDT)
+    esp_task_wdt_init(10, true);
+  #endif
   #if ENABLED(ESP3D_WIFISUPPORT)
     esp3dlib.init();
   #elif ENABLED(WIFISUPPORT)
@@ -127,7 +147,11 @@ void HAL_init_board() {
   // Initialize the i2s peripheral only if the I2S stepper stream is enabled.
   // The following initialization is performed after Serial1 and Serial2 are defined as
   // their native pins might conflict with the i2s stream even when they are remapped.
-  TERN_(I2S_STEPPER_STREAM, i2s_init());
+  #if ENABLED(USE_ESP32_EXIO)
+    YSerial2.begin(460800 * 3, SERIAL_8N1, 16, 17);
+  #elif ENABLED(I2S_STEPPER_STREAM)
+    i2s_init();
+  #endif
 }
 
 void HAL_idletask() {

Marlin/Marlin/src/HAL/ESP32/HAL.h

@@ -142,6 +142,10 @@ void HAL_idletask();
 inline void HAL_init() {}
 void HAL_init_board();
 
+#if ENABLED(USE_ESP32_EXIO)
+  void Write_EXIO(uint8_t IO, uint8_t v);
+#endif
+
 //
 // Delay in cycles (used by DELAY_NS / DELAY_US)
 //

Marlin/Marlin/src/HAL/ESP32/HAL_SPI.cpp

@@ -53,11 +53,9 @@ static SPISettings spiConfig;
 // ------------------------
 
 void spiBegin() {
-  #if !PIN_EXISTS(SD_SS)
-    #error "SD_SS_PIN not defined!"
+  #if ENABLED(SDSUPPORT) && PIN_EXISTS(SD_SS)
+    OUT_WRITE(SD_SS_PIN, HIGH);
   #endif
-
-  OUT_WRITE(SD_SS_PIN, HIGH);
 }
 
 void spiInit(uint8_t spiRate) {

Marlin/Marlin/src/HAL/ESP32/esp32.csv

@@ -0,0 +1,6 @@
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     0x9000,   0x5000,
+otadata,  data, ota,     0xe000,   0x2000,
+app0,     app,  ota_0,   0x10000,  0x180000,
+app1,     app,  ota_1,   0x190000, 0x180000,
+spiffs,   data, spiffs,  0x310000, 0xF0000,

Marlin/Marlin/src/HAL/ESP32/fastio.h

@@ -40,13 +40,19 @@
 // Set pin as input with pullup mode
 #define _PULLUP(IO, v)          pinMode(IO, v ? INPUT_PULLUP : INPUT)
 
-// Read a pin wrapper
-#define READ(IO)                (IS_I2S_EXPANDER_PIN(IO) ? i2s_state(I2S_EXPANDER_PIN_INDEX(IO)) : digitalRead(IO))
-
-// Write to a pin wrapper
-#define WRITE(IO, v)            (IS_I2S_EXPANDER_PIN(IO) ? i2s_write(I2S_EXPANDER_PIN_INDEX(IO), v) : digitalWrite(IO, v))
-
-// Set pin as input wrapper
+#if ENABLED(USE_ESP32_EXIO)
+  // Read a pin wrapper
+  #define READ(IO)                digitalRead(IO)
+  // Write to a pin wrapper
+  #define WRITE(IO, v)            (IO >= 100 ? Write_EXIO(IO, v) : digitalWrite(IO, v))
+#else
+  // Read a pin wrapper
+  #define READ(IO)                (IS_I2S_EXPANDER_PIN(IO) ? i2s_state(I2S_EXPANDER_PIN_INDEX(IO)) : digitalRead(IO))
+  // Write to a pin wrapper
+  #define WRITE(IO, v)            (IS_I2S_EXPANDER_PIN(IO) ? i2s_write(I2S_EXPANDER_PIN_INDEX(IO), v) : digitalWrite(IO, v))
+#endif
+
+// Set pin as input wrapper (0x80 | (v << 5) | (IO - 100))
 #define SET_INPUT(IO)           _SET_INPUT(IO)
 
 // Set pin as input with pullup wrapper

Marlin/Marlin/src/HAL/ESP32/i2s.cpp

@@ -23,6 +23,8 @@
 
 #include "../../inc/MarlinConfigPre.h"
 
+#if DISABLED(USE_ESP32_EXIO)
+
 #include "i2s.h"
 
 #include "../shared/Marduino.h"
@@ -340,4 +342,5 @@ void i2s_push_sample() {
   dma.current[dma.rw_pos++] = i2s_port_data;
 }
 
+#endif // !USE_ESP32_EXIO
 #endif // ARDUINO_ARCH_ESP32