tweak style

Marlin/Configuration_adv.h

@@ -4342,7 +4342,7 @@
  * Extras for an ESP32-based motherboard with WIFISUPPORT
  * These options don't apply to add-on WiFi modules based on ESP32 WiFi101.
  */
-#if ANY(WIFISUPPORT, ESP3D_WIFISUPPORT)
+#if ENABLED(WIFISUPPORT)
   //#define WEBSUPPORT          // Start a webserver (which may include auto-discovery) using SPIFFS
   //#define OTASUPPORT          // Support over-the-air firmware updates
   //#define WIFI_CUSTOM_COMMAND // Accept feature config commands (e.g., WiFi ESP3D) from the host

Marlin/Version.h

@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2024-04-10"
+//#define STRING_DISTRIBUTION_DATE "2024-04-08"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.

Marlin/src/MarlinCore.cpp

@@ -266,7 +266,7 @@ PGMSTR(M112_KILL_STR, "M112 Shutdown");
 MarlinState marlin_state = MF_INITIALIZING;
 
 // For M109 and M190, this flag may be cleared (by M108) to exit the wait loop
-bool wait_for_heatup = true;
+bool wait_for_heatup = false;
 
 // For M0/M1, this flag may be cleared (by M108) to exit the wait-for-user loop
 #if HAS_RESUME_CONTINUE

Marlin/src/inc/SanityCheck.h

@@ -3935,11 +3935,11 @@ static_assert(_PLUS_TEST(3), "DEFAULT_MAX_ACCELERATION values must be positive."
   #if !(defined(WIFI_SSID) && defined(WIFI_PWD))
     #error "ESP32 motherboard with WIFISUPPORT requires WIFI_SSID and WIFI_PWD."
   #endif
-#elif ENABLED(WIFI_CUSTOM_COMMAND) && NONE(ESP3D_WIFISUPPORT, WIFISUPPORT)
+#elif ENABLED(WIFI_CUSTOM_COMMAND)
   #error "WIFI_CUSTOM_COMMAND requires an ESP32 motherboard and WIFISUPPORT."
-#elif ENABLED(OTASUPPORT) && NONE(ESP3D_WIFISUPPORT, WIFISUPPORT)
+#elif ENABLED(OTASUPPORT)
   #error "OTASUPPORT requires an ESP32 motherboard and WIFISUPPORT."
-#elif (defined(WIFI_SSID) || defined(WIFI_PWD)) && NONE(ESP3D_WIFISUPPORT, WIFISUPPORT)
+#elif defined(WIFI_SSID) || defined(WIFI_PWD)
   #error "WIFI_SSID and WIFI_PWD only apply to ESP32 motherboard with WIFISUPPORT."
 #endif
 

Marlin/src/inc/Version.h

@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2024-04-10"
+  #define STRING_DISTRIBUTION_DATE "2024-04-08"
 #endif
 
 /**

Marlin/src/lcd/dogm/u8g/u8g_dev_tft_upscale_from_128x64.cpp

@@ -84,7 +84,7 @@ TFT_IO tftio;
 #define X_HI (UPSCALE(TFT_PIXEL_OFFSET_X, WIDTH) - 1)
 #define Y_HI (UPSCALE(TFT_PIXEL_OFFSET_Y, HEIGHT) - 1)
 
-// RGB565 color picker: https://rgbcolorpicker.com/565
+// RGB565 color picker: https://embeddednotepad.com/page/rgb565-color-picker
 // Hex code to color name: https://www.color-name.com/
 
 #define COLOR_BLACK       0x0000  // #000000

Marlin/src/lcd/tft/tft_color.h

@@ -30,7 +30,7 @@
 #define COLOR(color)          RGB(((color >> 16) & 0xFF), ((color >> 8) & 0xFF), (color & 0xFF))
 #define HALF(color)           RGB(RED(color) >> 1, GREEN(color) >> 1, BLUE(color) >> 1)
 
-// RGB565 color picker: https://rgbcolorpicker.com/565
+// RGB565 color picker: https://embeddednotepad.com/page/rgb565-color-picker
 // Hex code to color name: https://www.color-name.com/
 
 #define COLOR_BLACK           0x0000  // #000000

Marlin/src/module/temperature.cpp

@@ -4419,6 +4419,7 @@ void Temperature::isr() {
   #if ENABLED(AUTO_REPORT_TEMPERATURES)
     AutoReporter<Temperature::AutoReportTemp> Temperature::auto_reporter;
     void Temperature::AutoReportTemp::report() {
+      if (wait_for_heatup) return;
       print_heater_states(active_extruder OPTARG(HAS_TEMP_REDUNDANT, ENABLED(AUTO_REPORT_REDUNDANT)));
       SERIAL_EOL();
     }

Marlin/src/pins/ramps/pins_RAMPS.h

@@ -320,29 +320,17 @@
 #endif
 
 //
-// TMC SPI
+// TMC software SPI
 //
 #if HAS_TMC_SPI
-  #if ENABLED(TMC_USE_SW_SPI)
-    #ifndef TMC_SPI_MOSI
-      #define TMC_SPI_MOSI                 AUX2_09
-    #endif
-    #ifndef TMC_SPI_MISO
-      #define TMC_SPI_MISO                 AUX2_07
-    #endif
-    #ifndef TMC_SPI_SCK
-      #define TMC_SPI_SCK                  AUX2_05
-    #endif
-  #else
-    #ifndef TMC_SPI_MOSI
-      #define TMC_SPI_MOSI                 AUX3_04
-    #endif
-    #ifndef TMC_SPI_MISO
-      #define TMC_SPI_MISO                 AUX3_03
-    #endif
-    #ifndef TMC_SPI_SCK
-      #define TMC_SPI_SCK                  AUX3_05
-    #endif
+  #ifndef TMC_SPI_MOSI
+    #define TMC_SPI_MOSI                 AUX2_09
+  #endif
+  #ifndef TMC_SPI_MISO
+    #define TMC_SPI_MISO                 AUX2_07
+  #endif
+  #ifndef TMC_SPI_SCK
+    #define TMC_SPI_SCK                  AUX2_05
   #endif
 #endif
 

ini/native.ini

@@ -44,7 +44,7 @@ debug_build_flags = -fstack-protector-strong -g -g3 -ggdb
 lib_compat_mode   = off
 build_src_filter  = ${common.default_src_filter} +<src/HAL/NATIVE_SIM>
 lib_deps          = ${common.lib_deps}
-  MarlinSimUI=https://github.com/p3p/MarlinSimUI/archive/66a2b82c8f.zip
+  MarlinSimUI=https://github.com/p3p/MarlinSimUI/archive/8791f3ff43.zip
   Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/c6b319f447.zip
   LiquidCrystal=https://github.com/p3p/LiquidCrystal/archive/322fb5fc23.zip
 extra_scripts = ${common.extra_scripts}