[pull] bugfix-2.1.x from MarlinFirmware:bugfix-2.1.x

Marlin/Configuration_adv.h

@@ -1270,11 +1270,11 @@
  * XY Frequency limit
  * Reduce resonance by limiting the frequency of small zigzag infill moves.
  * See https://hydraraptor.blogspot.com/2010/12/frequency-limit.html
- * Use M201 F<freq> G<min%> to change limits at runtime.
+ * Use M201 F<freq> S<min%> to change limits at runtime.
  */
 //#define XY_FREQUENCY_LIMIT      10 // (Hz) Maximum frequency of small zigzag infill moves. Set with M201 F<hertz>.
 #ifdef XY_FREQUENCY_LIMIT
-  #define XY_FREQUENCY_MIN_PERCENT 5 // (%) Minimum FR percentage to apply. Set with M201 G<min%>.
+  #define XY_FREQUENCY_MIN_PERCENT 5 // (%) Minimum FR percentage to apply. Set with M201 S<min%>.
 #endif
 
 //

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-03-10"
+//#define STRING_DISTRIBUTION_DATE "2024-03-17"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.

Marlin/src/gcode/bedlevel/G35.cpp

@@ -95,9 +95,11 @@ void GcodeSuite::G35() {
   for (uint8_t i = 0; i < G35_PROBE_COUNT; ++i) {
     const float z_probed_height = probe.probe_at_point(tramming_points[i], PROBE_PT_RAISE);
     if (isnan(z_probed_height)) {
-      SERIAL_ECHO(
-        F("G35 failed at point "), i + 1, F(" ("), FPSTR(pgm_read_ptr(&tramming_point_name[i])), C(')'),
-        FPSTR(SP_X_STR), tramming_points[i].x, FPSTR(SP_Y_STR), tramming_points[i].y
+      SERIAL_ECHOLN(
+        F("G35 failed at point "), i + 1,
+        F(" ("), FPSTR(pgm_read_ptr(&tramming_point_name[i])), C(')'),
+        FPSTR(SP_X_STR), tramming_points[i].x,
+        FPSTR(SP_Y_STR), tramming_points[i].y
       );
       err_break = true;
       break;

Marlin/src/inc/Version.h

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

Marlin/src/lcd/menu/menu_info.cpp

@@ -116,6 +116,7 @@ void menu_info_thermistors() {
   #if TEMP_SENSOR_1 != 0
     #define THERMISTOR_ID TEMP_SENSOR_1
     #include "../thermistornames.h"
+    #undef THERMISTOR_ID
     THERM_ITEMS(STR_E1, HEATER_1, WATCH_HOTENDS);
   #endif
 
@@ -162,9 +163,9 @@ void menu_info_thermistors() {
   #endif
 
   #if HAS_HEATED_BED
-    #undef THERMISTOR_ID
     #define THERMISTOR_ID TEMP_SENSOR_BED
     #include "../thermistornames.h"
+    #undef THERMISTOR_ID
     THERM_ITEMS("BED", BED, WATCH_BED);
   #endif
 

Marlin/src/lcd/thermistornames.h

@@ -104,6 +104,10 @@
   #define THERMISTOR_NAME "100k Dagoma NTC"
 #elif THERMISTOR_ID == 18
   #define THERMISTOR_NAME "ATC Semitec 204GT-2"
+#elif THERMISTOR_ID == 22
+  #define THERMISTOR_NAME "GTM32 Pro vB (hotend)"
+#elif THERMISTOR_ID == 23
+  #define THERMISTOR_NAME "GTM32 Pro vB (bed)"
 #elif THERMISTOR_ID == 60
   #define THERMISTOR_NAME "Makers Tool"
 #elif THERMISTOR_ID == 70
@@ -156,6 +160,8 @@
   #define THERMISTOR_NAME "Dyze / TL 4.7M"
 #elif THERMISTOR_ID == 67
   #define THERMISTOR_NAME "SliceEng 450°C"
+#elif THERMISTOR_ID == 68
+  #define THERMISTOR_NAME "PT-100 + Dyze amp"
 
 // Dummies for dev testing
 #elif THERMISTOR_ID == 998

Marlin/src/module/motion.cpp

@@ -2183,18 +2183,28 @@ void prepare_line_to_destination() {
       do_homing_move(axis, -bump, TERN(HOMING_Z_WITH_PROBE, (axis == Z_AXIS ? z_probe_fast_mm_s : 0), 0), false);
 
       #if ENABLED(DETECT_BROKEN_ENDSTOP)
+
         // Check for a broken endstop
         EndstopEnum es;
         switch (axis) {
           #define _ESCASE(A) case A##_AXIS: es = A##_ENDSTOP; break;
           MAIN_AXIS_MAP(_ESCASE)
           default: break;
         }
+
+        #if ENABLED(DUAL_X_CARRIAGE)
+          if (axis == X_AXIS && axis_home_dir > 0) {
+            es = X_MAX;
+            if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("DUAL_X_CARRIAGE: Homing to X_MAX");
+          }
+        #endif
+
         if (TEST(endstops.state(), es)) {
           SERIAL_ECHO_MSG("Bad ", C(AXIS_CHAR(axis)), " Endstop?");
           kill(GET_TEXT_F(MSG_KILL_HOMING_FAILED));
         }
-      #endif
+
+      #endif // DETECT_BROKEN_ENDSTOP
 
       #if ALL(HOMING_Z_WITH_PROBE, BLTOUCH)
         if (axis == Z_AXIS && !bltouch.high_speed_mode && bltouch.deploy())

Marlin/src/pins/esp32/pins_MKS_TINYBEE.h

@@ -35,29 +35,30 @@
 #endif
 
 #define BOARD_INFO_NAME      "MKS TinyBee"
-#define BOARD_WEBSITE_URL    "https://github.com/makerbase-mks"
+#define BOARD_WEBSITE_URL    "github.com/makerbase-mks/MKS-TinyBee"
 #define DEFAULT_MACHINE_NAME BOARD_INFO_NAME
 
 // MAX_EXPANDER_BITS is defined for MKS TinyBee in HAL/ESP32/inc/Conditionals_adv.h
 
 //
 // Servos
 //
-#define SERVO0_PIN                             2
+#define SERVO0_PIN                             2  // 3D TOUCH
 
 //
 // Limit Switches
 //
-#define X_STOP_PIN                            33
-#define Y_STOP_PIN                            32
-#define Z_STOP_PIN                            22
-//#define FIL_RUNOUT_PIN                      35
-
+#define X_STOP_PIN                            33  // X
+#define Y_STOP_PIN                            32  // Y
+#define Z_STOP_PIN                            22  // Z
+#ifndef FIL_RUNOUT_PIN
+  #define FIL_RUNOUT_PIN                      35  // MT_DET
+#endif
 //
 // Probe enable
 //
 #if ENABLED(PROBE_ENABLE_DISABLE) && !defined(PROBE_ENABLE_PIN)
-  #define PROBE_ENABLE_PIN            SERVO0_PIN
+  #define PROBE_ENABLE_PIN            SERVO0_PIN  // 3D TOUCH
 #endif
 
 //
@@ -75,49 +76,44 @@
 //
 // Steppers
 //
-#define X_STEP_PIN                           129
+#define X_STEP_PIN                           129  // X
 #define X_DIR_PIN                            130
 #define X_ENABLE_PIN                         128
 
-#define Y_STEP_PIN                           132
+#define Y_STEP_PIN                           132  // Y
 #define Y_DIR_PIN                            133
 #define Y_ENABLE_PIN                         131
 
-#define Z_STEP_PIN                           135
+#define Z_STEP_PIN                           135  // Z1
 #define Z_DIR_PIN                            136
 #define Z_ENABLE_PIN                         134
 
-#define E0_STEP_PIN                          138
+#define E0_STEP_PIN                          138  // E0
 #define E0_DIR_PIN                           139
 #define E0_ENABLE_PIN                        137
 
-#define E1_STEP_PIN                          141
+#define E1_STEP_PIN                          141  // E1
 #define E1_DIR_PIN                           142
 #define E1_ENABLE_PIN                        140
 
-#define Z2_STEP_PIN                          141
-#define Z2_DIR_PIN                           142
-#define Z2_ENABLE_PIN                        140
-
 //
 // Temperature Sensors
 //
-#define TEMP_0_PIN                            36  // Analog Input
-#define TEMP_1_PIN                            34  // Analog Input, you need set R6=0Ω and R7=NC
-#define TEMP_BED_PIN                          39  // Analog Input
+#define TEMP_0_PIN                            36  // TH1 / Analog Input
+#define TEMP_1_PIN                            34  // TH2 / Analog Input, you need set R6=0Ω and R7=NC
+#define TEMP_BED_PIN                          39  // TB  / Analog Input
 
 //
 // Heaters / Fans
 //
-#define HEATER_0_PIN                         145
-#define HEATER_1_PIN                         146
-#define FAN0_PIN                             147
-#define FAN1_PIN                             148
-#define HEATER_BED_PIN                       144
+#define HEATER_0_PIN                         145  // HE0
+#define HEATER_1_PIN                         146  // HE1
+#define FAN0_PIN                             147  // FAN1
+#define FAN1_PIN                             148  // FAN2
+#define HEATER_BED_PIN                       144  // H-BED
 
-//#define CONTROLLER_FAN_PIN                 148
-//#define E0_AUTO_FAN_PIN                    148  // need to update Configuration_adv.h @section extruder
-//#define E1_AUTO_FAN_PIN                    149  // need to update Configuration_adv.h @section extruder
+//#define CONTROLLER_FAN_PIN                 148  // FAN2
+//#define E0_AUTO_FAN_PIN                    148  // FAN2
 
 //
 // ADC Reference Voltage

Marlin/src/pins/stm32f4/pins_TRONXY_CXY_446_V10.h

@@ -219,7 +219,7 @@
       #define TOUCH_ORIENTATION  TOUCH_LANDSCAPE
     #endif
   #endif
-   
+
   #if ENABLED(MKS_ROBIN_TFT43)
     #ifndef TOUCH_CALIBRATION_X
       #define TOUCH_CALIBRATION_X          17184
@@ -237,7 +237,7 @@
       #define TOUCH_ORIENTATION  TOUCH_LANDSCAPE
     #endif
   #endif
-#else 
+#else
   #error "TRONXY CXY 446 V10 only supports TFT with FSMC interface."
 #endif
 

README.md

@@ -142,7 +142,6 @@ Regular users can open and close their own issues, but only the administrators c
 
  🇳🇱  **Erik van der Zalm**
        [@ErikZalm](https://github.com/ErikZalm)
-       [<kbd>  Donate 💸  </kbd>](https://flattr.com/submit/auto?user_id=ErikZalm&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software)
 
 </td></tr>
 </table>

buildroot/share/PlatformIO/scripts/signature.py

@@ -18,13 +18,13 @@ def enabled_defines(filepath):
     Each entry is a dictionary with a 'name' and a 'section' key. We end up with:
         { MOTHERBOARD: { name: "MOTHERBOARD", section: "hardware" }, ... }
 
-    The 'name' key might get dropped as redundant, but it's useful for debugging.
+    TODO: Drop the 'name' key as redundant. For now it's useful for debugging.
 
-    Because the option names are the keys, only the last occurrence is retained.
-    Use the Schema class for a more complete list of options, soon with full parsing.
+    This list is only used to filter config-defined options from those defined elsewhere.
 
-    This list is used to filter what is actually a config-defined option versus
-    defines from elsewhere.
+    Because the option names are the keys, only the last occurrence is retained.
+    This means the actual used value might not be reflected by this function.
+    The Schema class does more complete parsing for a more accurate list of options.
 
     While the Schema class parses the configurations on its own, this script will
     get the preprocessor output and get the intersection of the enabled options from
@@ -44,13 +44,10 @@ def enabled_defines(filepath):
     # This will avoid false positives from #defines in comments
     f = re.sub(r'/\*.*?\*/', '', '\n'.join(f), flags=re.DOTALL).split("\n")
 
-    a = []
     for line in f:
         sline = line.strip()
         m = re.match(spatt, sline) # @section ...
-        if m:
-            section = m.group(1).strip()
-            continue
+        if m: section = m.group(1).strip() ; continue
         if sline[:7] == "#define":
             # Extract the key here (we don't care about the value)
             kv = sline[8:].strip().split()
@@ -79,6 +76,7 @@ def compute_build_signature(env):
     Compute the build signature by extracting all configuration settings and
     building a unique reversible signature that can be included in the binary.
     The signature can be reversed to get a 1:1 equivalent configuration file.
+    Used by common-dependencies.py after filtering build files by feature.
     '''
     if 'BUILD_SIGNATURE' in env: return
     env.Append(BUILD_SIGNATURE=1)

buildroot/share/scripts/rle_compress_bitmap.py

@@ -10,6 +10,8 @@
 import re
 
 def addCompressedData(input_file, output_file):
+    input_lines = input_file.readlines()
+    input_file.close()
     ofile = open(output_file, 'wt')
 
     datatype = "uint8_t"
@@ -18,8 +20,7 @@ def addCompressedData(input_file, output_file):
     arrname = ''
 
     c_data_section = False ; c_skip_data = False ; c_footer = False
-    while True:
-        line = input_file.readline()
+    for line in input_lines:
         if not line: break
 
         if not c_footer:
@@ -56,8 +57,6 @@ def addCompressedData(input_file, output_file):
                 arrname = line.split('[')[0].split(' ')[-1]
                 print("Found data array", arrname)
 
-    input_file.close()
-
     #print("\nRaw Bitmap Data", raw_data)
 
     #
@@ -190,11 +189,11 @@ def rle_emit(ofile, arrname, rledata, rawsize, isext):
     print('Usage: rle_compress_bitmap.py INPUT_FILE OUTPUT_FILE')
     exit(1)
 
-output_cpp = sys.argv[2]
+output_h = sys.argv[2]
 inname = sys.argv[1].replace('//', '/')
 try:
-    input_cpp = open(inname)
+    input_h = open(inname)
     print("Processing", inname, "...")
-    addCompressedData(input_cpp, output_cpp)
+    addCompressedData(input_h, output_h)
 except OSError:
     print("Can't find input file", inname)

ini/stm32f4.ini

@@ -820,7 +820,7 @@ board                = marlin_STM32F446ZET_tronxy
 board_build.ldscript = buildroot/share/PlatformIO/variants/MARLIN_F446Zx_TRONXY/ldscript.ld
 board_build.offset   = 0x10000
 board_build.rename   = fmw_tronxy.bin
-build_flags          = ${stm32_variant.build_flags} 
+build_flags          = ${stm32_variant.build_flags}
                        -DSTM32F4xx -DUSE_USB_HS
                        -DUSE_USB_HS_IN_FS
 build_unflags        = ${stm32_variant.build_unflags} -fno-rtti