⛙ Merge w/Marlin

Author: classicrocker883

Marlin/Configuration.h

@@ -3497,6 +3497,7 @@
    * NOTOSANS  - Default font with anti-aliasing. Supports Latin Extended and non-Latin characters.
    * UNIFONT   - Lightweight font, no anti-aliasing. Supports Latin Extended and non-Latin characters.
    * HELVETICA - Lightweight font, no anti-aliasing. Supports Basic Latin (0x0020-0x007F) and Latin-1 Supplement (0x0080-0x00FF) characters only.
+   * :['NOTOSANS', 'UNIFONT', 'HELVETICA']
    */
   #define TFT_FONT  NOTOSANS
 
@@ -3506,6 +3507,7 @@
    * BLUE_MARLIN  - Default theme with 'midnight blue' background
    * BLACK_MARLIN - Theme with 'black' background
    * ANET_BLACK   - Theme used for Anet ET4/5
+   * :['BLUE_MARLIN', 'BLACK_MARLIN', 'ANET_BLACK']
    */
   #define TFT_THEME BLACK_MARLIN
 

Marlin/Configuration_adv.h

@@ -1156,6 +1156,7 @@
 #if ENABLED(FT_MOTION)
   //#define FTM_IS_DEFAULT_MOTION               // Use FT Motion as the factory default?
   //#define FT_MOTION_MENU                      // Provide a MarlinUI menu to set M493 and M494 parameters
+  //#define FTM_HOME_AND_PROBE                  // Use FT Motion for homing / probing. Disable if FT Motion breaks these functions.
 
   #define FTM_DEFAULT_DYNFREQ_MODE dynFreqMode_DISABLED // Default mode of dynamic frequency calculation. (DISABLED, Z_BASED, MASS_BASED)
 
@@ -1197,6 +1198,15 @@
                                                 //     smoothing acceleration peaks, which may also smooth curved surfaces.
   #endif
 
+  #define FTM_TRAJECTORY_TYPE   TRAPEZOIDAL // Block acceleration profile (TRAPEZOIDAL, POLY5, POLY6)
+                                            // TRAPEZOIDAL: Continuous Velocity. Max acceleration is respected.
+                                            // POLY5:       Like POLY6 with 1.5x but cpu cheaper.
+                                            // POLY6:       Continuous Acceleration (aka S_CURVE).
+                                            // POLY trajectories not only reduce resonances without rounding corners, but also
+                                            // reduce extruder strain due to linear advance.
+
+  #define FTM_POLY6_ACCELERATION_OVERSHOOT 1.875f // Max acceleration overshoot factor for POLY6 (1.25 to 1.875)
+
   /**
    * Advanced configuration
    */

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 "2025-10-01"
+//#define STRING_DISTRIBUTION_DATE "2025-10-04"
 
 #define STRING_DISTRIBUTION_DATE __DATE__
 #define STRING_DISTRIBUTION_TIME __TIME__

Marlin/src/core/boards.h

@@ -28,6 +28,7 @@
 
 #include "macros.h"
 
+#define BOARD_ERROR -2
 #define BOARD_UNKNOWN -1
 
 //

Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp

@@ -52,7 +52,7 @@
   #include "../hilbert_curve.h"
 #endif
 
-#if FT_MOTION_DISABLE_FOR_PROBING
+#if ENABLED(FT_MOTION)
   #include "../../../module/ft_motion.h"
 #endif
 
@@ -318,9 +318,8 @@ void unified_bed_leveling::G29() {
   const uint8_t p_val = parser.byteval('P');
   const bool may_move = p_val == 1 || p_val == 2 || p_val == 4 || parser.seen_test('J');
 
-  #if FT_MOTION_DISABLE_FOR_PROBING
-    FTMotionDisableInScope FT_Disabler; // Disable Fixed-Time Motion for probing
-  #endif
+  // Potentially disable Fixed-Time Motion for probing
+  TERN_(FT_MOTION, FTMotionDisableInScope FT_Disabler);
 
   // Check for commands that require the printer to be homed
   if (may_move) {

Marlin/src/feature/mmu/mmu2-serial-protocol.md

@@ -7,9 +7,9 @@ When initialized, MMU sends
 We follow with
 
 - MMU <= 'S1\n'
-- MMU => 'ok*Firmware version*\n'
+- MMU => 'ok<_Firmware version_>\n'
 - MMU <= 'S2\n'
-- MMU => 'ok*Build number*\n'
+- MMU => 'ok<_Build number_>\n'
 
 #if (12V_mode)
 
@@ -19,25 +19,25 @@ We follow with
 #endif
 
 - MMU <= 'P0\n'
-- MMU => '_FINDA status_\n'
+- MMU => '<_FINDA status_>\n'
 
 Now we are sure MMU is available and ready. If there was a timeout or other communication problem somewhere, printer will be killed.
 
-- _Firmware version_ is an integer value, but we don't care about it
-- _Build number_ is an integer value and has to be >=126, or =>132 if 12V mode is enabled
-- _FINDA status_ is 1 if the filament is loaded to the extruder, 0 otherwise
+- <_Firmware version_> is an integer value, but we don't care about it.
+- <_Build number_> is an integer value and has to be >=126, or =>132 if 12V mode is enabled.
+- <_FINDA status_> is 1 if the filament is loaded to the extruder, 0 otherwise.
 
-_Build number_ is checked against the required value, if it does not match, printer is halted.
+<_Build number_> is checked against the required value, if it does not match, printer is halted.
 
 # Toolchange
 
-- MMU <= 'T*Filament index*\n'
+- MMU <= 'T<_Filament index_>\n'
 
 MMU sends
 
 - MMU => 'ok\n'
 
-as soon as the filament is fed down to the extruder. We follow with
+as soon as the filament is fed down to the extruder. We follow with:
 
 - MMU <= 'C0\n'
 
@@ -52,27 +52,27 @@ be one or more extruder moves to feed the filament into the hotend.
 # FINDA status
 
 - MMU <= 'P0\n'
-- MMU => '_FINDA status_\n'
+- MMU => '<_FINDA status_>\n'
 
 _FINDA status_ is 1 if the is filament loaded to the extruder, 0 otherwise. This could be used as filament runout sensor if probed regularly.
 
 # Load filament
 
-- MMU <= 'L*Filament index*\n'
+- MMU <= 'L<_Filament index_>\n'
 
-MMU will feed filament down to the extruder, when done
+MMU will feed filament down to the extruder, when done:
 
 - MMU => 'ok\n'
 
 # Unload filament
 
 - MMU <= 'U0\n'
 
-MMU will retract current filament from the extruder, when done
+MMU will retract current filament from the extruder, when done:
 
 - MMU => 'ok\n'
 
 # Eject filament
 
-- MMU <= 'E*Filament index*\n'
+- MMU <= 'E<_Filament index_>\n'
 - MMU => 'ok\n'

Marlin/src/gcode/bedlevel/abl/G29.cpp

@@ -60,7 +60,7 @@
 #define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
 #include "../../../core/debug_out.h"
 
-#if DISABLED(PROBE_MANUALLY) && FT_MOTION_DISABLE_FOR_PROBING
+#if DISABLED(PROBE_MANUALLY) && ENABLED(FT_MOTION)
   #include "../../../module/ft_motion.h"
 #endif
 
@@ -276,8 +276,9 @@ G29_TYPE GcodeSuite::G29() {
   // Set and report "probing" state to host
   TERN_(FULL_REPORT_TO_HOST_FEATURE, set_and_report_grblstate(M_PROBE, false));
 
-  #if DISABLED(PROBE_MANUALLY) && FT_MOTION_DISABLE_FOR_PROBING
-    FTMotionDisableInScope FT_Disabler; // Disable Fixed-Time Motion for probing
+  #if DISABLED(PROBE_MANUALLY) && ENABLED(FT_MOTION)
+    // Potentially disable Fixed-Time Motion for probing
+    FTMotionDisableInScope FT_Disabler;
   #endif
 
   /**

Marlin/src/gcode/bedlevel/mbl/G29.cpp

@@ -45,7 +45,7 @@
 #define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
 #include "../../../core/debug_out.h"
 
-#if FT_MOTION_DISABLE_FOR_PROBING
+#if ENABLED(FT_MOTION)
   #include "../../module/ft_motion.h"
 #endif
 
@@ -67,9 +67,8 @@ inline void echo_not_entered(const char c) { SERIAL_CHAR(c); SERIAL_ECHOLNPGM("
  */
 void GcodeSuite::G29() {
 
-  #if FT_MOTION_DISABLE_FOR_PROBING
-    FTMotionDisableInScope FT_Disabler; // Disable Fixed-Time Motion for probing
-  #endif
+  // Potentially disable Fixed-Time Motion for probing
+  TERN_(FT_MOTION, FTMotionDisableInScope FT_Disabler);
 
   DEBUG_SECTION(log_G29, "G29", true);
 

Marlin/src/gcode/calibrate/G28.cpp

@@ -52,7 +52,7 @@
   #include "../../feature/bltouch.h"
 #endif
 
-#if FT_MOTION_DISABLE_FOR_PROBING
+#if ENABLED(FT_MOTION)
   #include "../../module/ft_motion.h"
 #endif
 
@@ -130,9 +130,8 @@
 
   inline void home_z_safely() {
 
-    #if FT_MOTION_DISABLE_FOR_PROBING
-      FTMotionDisableInScope FT_Disabler; // Disable Fixed-Time Motion for homing
-    #endif
+    // Potentially disable Fixed-Time Motion for homing
+    TERN_(FT_MOTION, FTMotionDisableInScope FT_Disabler);
 
     DEBUG_SECTION(log_G28, "home_z_safely", DEBUGGING(LEVELING));
 
@@ -290,9 +289,8 @@ void GcodeSuite::G28() {
       motion_state_t saved_motion_state = begin_slow_homing();
     #endif
 
-    #if FT_MOTION_DISABLE_FOR_PROBING
-      FTMotionDisableInScope FT_Disabler; // Disable Fixed-Time Motion for homing
-    #endif
+    // Potentially disable Fixed-Time Motion for homing
+    TERN_(FT_MOTION, FTMotionDisableInScope FT_Disabler);
 
     // Always home with tool 0 active
     #if HAS_MULTI_HOTEND