Merge branch 'bugfix-2.1.x' into mike-anet-evo

* bugfix-2.1.x: (39 commits) [cron] Bump distribution date (2024-02-11) extend uart checks [cron] Bump distribution date (2024-02-10) 👷 Improve BIGTREE_GTR_V1_0 tests 🚸 Optional encoder multipliers [cron] Bump distribution date (2024-02-09) 🧑‍💻 HC32 endstop interrupts for X2/Y2/Z4 🔥 Clean up SCARA/TPARA ✨ MARLIN_SMALL_BUILD option (MarlinFirmware#26775) 🚸 Adjust encoder multiplier [cron] Bump distribution date (2024-02-08) 🧑‍💻 "static_warning" 🎨 Delete old FTDI Eve bootscreen 🩹 Fix FTDI Eve Touch UI M84 [cron] Bump distribution date (2024-02-07) 🔧 Restore probe XY edit defaults, remove arbitrary Z limit (MarlinFirmware#26774) [cron] Bump distribution date (2024-02-06) 🚸 Keep Filament Change near the top (MarlinFirmware#26172) [cron] Bump distribution date (2024-02-05) 🔧 Fix extraneous DIAG warnings (MarlinFirmware#26694) ...
mikezs · Feb 13, 2024 · 5d3177f · 5d3177f
2 parents 8dd89ea + 9e879a5
commit 5d3177f
Show file tree

Hide file tree

Showing 111 changed files with 1,007 additions and 803 deletions.
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
@@ -1009,9 +1009,6 @@
     // Radius around the center where the arm cannot reach
     #define MIDDLE_DEAD_ZONE_R   0  // (mm)
 
-    #define THETA_HOMING_OFFSET  0  // Calculated from Calibration Guide and M360 / M114. See https://www.morgan3dp.com/morgan-calibration-guide/
-    #define PSI_HOMING_OFFSET    0  // Calculated from Calibration Guide and M364 / M114. See https://www.morgan3dp.com/morgan-calibration-guide/
-
   #elif ENABLED(MP_SCARA)
 
     #define SCARA_OFFSET_THETA1  12 // degrees
@@ -1030,23 +1027,19 @@
   #define DEFAULT_SEGMENTS_PER_SECOND 200
 
   // Length of inner and outer support arms. Measure arm lengths precisely.
-  #define TPARA_LINKAGE_1 120       // (mm)
-  #define TPARA_LINKAGE_2 120       // (mm)
+  #define TPARA_LINKAGE_1 120     // (mm)
+  #define TPARA_LINKAGE_2 120     // (mm)
 
-  // SCARA tower offset (position of Tower relative to bed zero position)
-  // This needs to be reasonably accurate as it defines the printbed position in the SCARA space.
-  #define TPARA_OFFSET_X    0       // (mm)
-  #define TPARA_OFFSET_Y    0       // (mm)
-  #define TPARA_OFFSET_Z    0       // (mm)
+  // TPARA tower offset (position of Tower relative to bed zero position)
+  // This needs to be reasonably accurate as it defines the printbed position in the TPARA space.
+  #define TPARA_OFFSET_X    0     // (mm)
+  #define TPARA_OFFSET_Y    0     // (mm)
+  #define TPARA_OFFSET_Z    0     // (mm)
 
   #define FEEDRATE_SCALING        // Convert XY feedrate from mm/s to degrees/s on the fly
 
   // Radius around the center where the arm cannot reach
   #define MIDDLE_DEAD_ZONE_R   0  // (mm)
-
-  // Calculated from Calibration Guide and M360 / M114. See https://www.morgan3dp.com/morgan-calibration-guide/
-  #define THETA_HOMING_OFFSET  0
-  #define PSI_HOMING_OFFSET    0
 #endif
 
 // @section polar
@@ -3417,7 +3410,6 @@
   #define BUTTON_DELAY_MENU     250 // (ms) Button repeat delay for menus
 
   //#define DISABLE_ENCODER         // Disable the click encoder, if any
-  //#define TOUCH_IDLE_SLEEP_MINS 5 // (minutes) Display Sleep after a period of inactivity. Set with M255 S.
 
   #define TOUCH_SCREEN_CALIBRATION
 

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
@@ -1970,17 +1970,6 @@
   // Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese.
   #define USE_SMALL_INFOFONT
 
-  /**
-   * Graphical Display Sleep
-   *
-   * The U8G library provides sleep / wake functions for SH1106, SSD1306,
-   * SSD1309, and some other DOGM displays.
-   * Enable this option to save energy and prevent OLED pixel burn-in.
-   * Adds the menu item Configuration > LCD Timeout (m) to set a wait period
-   * from 0 (disabled) to 99 minutes.
-   */
-  //#define DISPLAY_SLEEP_MINUTES 2  // (minutes) Timeout before turning off the screen. Set with M255 S.
-
   /**
    * ST7920-based LCDs can emulate a 16 x 4 character display using
    * the ST7920 character-generator for very fast screen updates.
@@ -2229,13 +2218,20 @@
   //#define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
 #endif
 
-//
-// LCD Backlight Timeout
-// Requires a display with a controllable backlight
-//
+/**
+ * Display Sleep
+ * Enable this option to save energy and prevent OLED pixel burn-in.
+ */
+//#define DISPLAY_SLEEP_MINUTES 2       // (minutes) Timeout before turning off the screen
+
+/**
+ * LCD Backlight Timeout
+ * Requires a display with a controllable backlight
+ */
 //#define LCD_BACKLIGHT_TIMEOUT_MINS 1  // (minutes) Timeout before turning off the backlight
+
 #if defined(DISPLAY_SLEEP_MINUTES) || defined(LCD_BACKLIGHT_TIMEOUT_MINS)
-  #define EDITABLE_DISPLAY_TIMEOUT      // Edit timeout with M255 S<minutes> and a menu item
+  #define EDITABLE_DISPLAY_TIMEOUT      // Edit sleep / backlight timeout with M255 S<minutes> and a menu item
 #endif
 
 //
@@ -4531,3 +4527,6 @@
 
 // Report uncleaned reset reason from register r2 instead of MCUSR. Supported by Optiboot on AVR.
 //#define OPTIBOOT_RESET_REASON
+
+// Shrink the build for smaller boards by sacrificing some serial feedback
+//#define MARLIN_SMALL_BUILD
diff --git a/Marlin/Version.h b/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-01-30"
+//#define STRING_DISTRIBUTION_DATE "2024-02-11"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.

diff --git a/Marlin/src/HAL/HC32/endstop_interrupts.cpp b/Marlin/src/HAL/HC32/endstop_interrupts.cpp
@@ -40,9 +40,15 @@ void endstopIRQHandler() {
   CHECK(X_MAX);
   CHECK(X_MIN);
 
+  CHECK(X2_MAX);
+  CHECK(X2_MIN);
+
   CHECK(Y_MAX);
   CHECK(Y_MIN);
 
+  CHECK(Y2_MAX);
+  CHECK(Y2_MIN);
+
   CHECK(Z_MAX);
   CHECK(Z_MIN);
 
@@ -52,6 +58,9 @@ void endstopIRQHandler() {
   CHECK(Z3_MAX);
   CHECK(Z3_MIN);
 
+  CHECK(Z4_MAX);
+  CHECK(Z4_MIN);
+
   CHECK(Z_MIN_PROBE);
 
   // Update endstops
@@ -69,9 +78,15 @@ void setup_endstop_interrupts() {
   SETUP(X_MAX);
   SETUP(X_MIN);
 
+  SETUP(X2_MAX);
+  SETUP(X2_MIN);
+
   SETUP(Y_MAX);
   SETUP(Y_MIN);
 
+  SETUP(Y2_MAX);
+  SETUP(Y2_MIN);
+
   SETUP(Z_MAX);
   SETUP(Z_MIN);
 
@@ -81,14 +96,17 @@ void setup_endstop_interrupts() {
   SETUP(Z3_MAX);
   SETUP(Z3_MIN);
 
+  SETUP(Z4_MAX);
+  SETUP(Z4_MIN);
+
   SETUP(Z_MIN_PROBE);
 
   #undef SETUP
 }
 
 // Ensure 1 - 10 IRQs are registered
 // Disable some endstops if you encounter this error
-#define ENDSTOPS_INTERRUPTS_COUNT COUNT_ENABLED(USE_X_MAX, USE_X_MIN, USE_Y_MAX, USE_Y_MIN, USE_Z_MAX, USE_Z_MIN, USE_Z2_MAX, USE_Z2_MIN, USE_Z3_MAX, USE_Z3_MIN, USE_Z_MIN_PROBE)
+#define ENDSTOPS_INTERRUPTS_COUNT COUNT_ENABLED(USE_X_MAX, USE_X_MIN, USE_X2_MAX, USE_X2_MIN, USE_Y_MAX, USE_Y_MIN, USE_Y2_MAX, USE_Y2_MIN, USE_Z_MAX, USE_Z_MIN, USE_Z2_MAX, USE_Z2_MIN, USE_Z3_MAX, USE_Z3_MIN, USE_Z4_MAX, USE_Z4_MIN, USE_Z_MIN_PROBE)
 #if ENDSTOPS_INTERRUPTS_COUNT > 10
   #error "Too many endstop interrupts! HC32F460 only supports 10 endstop interrupts."
 #elif ENDSTOPS_INTERRUPTS_COUNT == 0

diff --git a/Marlin/src/HAL/STM32/HardwareSerial.cpp b/Marlin/src/HAL/STM32/HardwareSerial.cpp
@@ -126,7 +126,7 @@
   void serialEvent2() __attribute__((weak));
 #endif
 #ifdef USING_HW_SERIAL3
-  HAL_HardwareSerial Serial3(USART3);
+  HAL_HardwareSerial HSerial3(USART3);
   void serialEvent3() __attribute__((weak));
 #endif
 #ifdef USING_HW_SERIAL4
@@ -147,11 +147,11 @@
 #endif
 #ifdef USING_HW_SERIAL6
   #ifdef USART6
-    HAL_HardwareSerial HSerial5(USART6);
+    HAL_HardwareSerial HSerial6(USART6);
   #else
-    HAL_HardwareSerial HSerial5(UART6);
+    HAL_HardwareSerial HSerial6(UART6);
   #endif
-  void serialEvent5() __attribute__((weak));
+  void serialEvent6() __attribute__((weak));
 #endif
 
 // Constructors ////////////////////////////////////////////////////////////////

diff --git a/Marlin/src/HAL/STM32/inc/SanityCheck.h b/Marlin/src/HAL/STM32/inc/SanityCheck.h
@@ -58,8 +58,9 @@
  * Check for common serial pin conflicts
  */
 #define _CHECK_SERIAL_PIN(N) (( \
-    BTN_EN1 == N || DOGLCD_CS == N || HEATER_BED_PIN == N || FAN0_PIN == N || \
-    SDIO_D2_PIN == N || SDIO_D3_PIN == N || SDIO_CK_PIN == N || SDIO_CMD_PIN == N \
+    BTN_EN1 == N || BTN_EN2 == N ||DOGLCD_CS == N || HEATER_BED_PIN == N || FAN0_PIN == N || \
+    SDIO_D2_PIN == N || SDIO_D3_PIN == N || SDIO_CK_PIN == N || SDIO_CMD_PIN == N || \
+    Y_STEP_PIN == N || Y_ENABLE_PIN == N || E0_ENABLE_PIN == N || POWER_LOSS_PIN == N \
   ))
 #define CHECK_SERIAL_PIN(T,N) defined(UART##N##_##T##_PIN) && _CHECK_SERIAL_PIN(UART##N##_##T##_PIN)
 #if SERIAL_IN_USE(1)