prusa3d · gjpc · Jun 5, 2024 · Jun 10, 2024 · Jun 11, 2024 · Jun 11, 2024
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -16,7 +16,7 @@ jobs:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         # Don't ever mark PRs as stale.
         days-before-pr-stale: -1
-        stale-issue-message: 'This issue has been flagged as stale because it has been open for 60 days with no activity. The issue will be closed in 7 days unless someone removes the "stale" label or adds a comment.'
+        stale-issue-message: 'Thank you for your contribution to our project. This issue has not received any updates for 60 days and may be considered "stale." If this issue is still important to you, please add an update within the next 7 days to keep it open. Administrators can manually reopen the issue if necessary.'
         close-issue-message: 'This issue has been closed due to lack of recent activity. Please consider opening a new one if needed.'
         # Don't act on things assigned to a milestone or assigned to someone.
         exempt-all-milestones: true

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -5,8 +5,8 @@ repos:
   rev: v0.6.13
   hooks:
     - id: cmake-format
-- repo: https://github.com/pre-commit/mirrors-yapf
-  rev: 'v0.27.0'
+- repo: https://github.com/google/yapf
+  rev: 'v0.40.2'
   hooks:
     - id: yapf  # python formatter
 - repo: local

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -248,7 +248,7 @@
             "request": "launch",
         },
         {
-            "name": "GDB (QEMU)",
+            "name": "GDB - Buddy (QEMU)",
             "type": "gdb",
             "request": "attach",
             "executable": "${workspaceRoot}/build-vscode-buddy/firmware",
@@ -258,6 +258,28 @@
             "gdbpath": "${workspaceRoot}/.dependencies/gcc-arm-none-eabi-13.2.1/bin/arm-none-eabi-gdb",
             "autorun": []
         },
+        {
+            "name": "GDB - Dwarf (QEMU)",
+            "type": "gdb",
+            "request": "attach",
+            "executable": "${workspaceRoot}/build-vscode-dwarf/firmware",
+            "target": ":1234",
+            "remote": true,
+            "cwd": "${workspaceRoot}",
+            "gdbpath": "${workspaceRoot}/.dependencies/gcc-arm-none-eabi-13.2.1/bin/arm-none-eabi-gdb",
+            "autorun": []
+        },
+        {
+            "name": "GDB - ModularBed (QEMU)",
+            "type": "gdb",
+            "request": "attach",
+            "executable": "${workspaceRoot}/build-vscode-modularbed/firmware",
+            "target": ":1234",
+            "remote": true,
+            "cwd": "${workspaceRoot}",
+            "gdbpath": "${workspaceRoot}/.dependencies/gcc-arm-none-eabi-13.2.1/bin/arm-none-eabi-gdb",
+            "autorun": []
+        },
         {
             "name": "Unit-tests debug",
             "type": "gdb",

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -712,4 +712,7 @@ set_property(
            FW_VERSION_PATCH=${PROJECT_VERSION_PATCH}
            FW_VERSION_SUFFIX=${PROJECT_VERSION_SUFFIX}
            FW_VERSION_SUFFIX_SHORT=${PROJECT_VERSION_SUFFIX_SHORT}
+           FW_COMMIT_HASH=${FW_COMMIT_HASH}
+           FW_COMMIT_DIRTY=$<BOOL:${FW_COMMIT_DIRTY}>
+           FW_BOOTLOADER=$<BOOL:${FW_BOOTLOADER}>
   )
diff --git a/cmake/ProjectVersion.cmake b/cmake/ProjectVersion.cmake
@@ -62,4 +62,25 @@ function(resolve_version_variables)
       "${PROJECT_VERSION}${PROJECT_VERSION_SUFFIX}"
       PARENT_SCOPE
       )
+
+  # FW_COMMIT_DIRTY
+  git_local_changes(IS_DIRTY)
+  if(${IS_DIRTY} STREQUAL "DIRTY")
+    set(FW_COMMIT_DIRTY
+        TRUE
+        PARENT_SCOPE
+        )
+  else()
+    set(FW_COMMIT_DIRTY
+        FALSE
+        PARENT_SCOPE
+        )
+  endif()
+
+  # FW_COMMIT_HASH
+  get_git_head_revision(COMMIT_REFSPEC COMMIT_HASH)
+  set(FW_COMMIT_HASH
+      ${COMMIT_HASH}
+      PARENT_SCOPE
+      )
 endfunction()
diff --git a/doc/ESP/README.md b/doc/ESP/README.md
@@ -28,6 +28,7 @@ ssid= enter here the SSID of your wireless network
 psk= enter here the valid password
 ```
 
+- Leading and trailing spaces are stripped from the INI field values; a singly (`'`) or doubly (`"`) quoted string can be used to retain such spaces, if necessary.
 - Store the `prusa_printer_settings.ini` file in the root folder of the USB flash drive and plug in to the printer
 - Run the **Setting-> Load Settings from** command from the printer
 - Make sure the **Settings -> Lan setting**s is set to WiFi

diff --git a/include/common/nozzle_type.hpp b/include/common/nozzle_type.hpp
diff --git a/include/marlin/Configuration_MINI.h b/include/marlin/Configuration_MINI.h
@@ -720,14 +720,6 @@
 #define DEFAULT_RETRACT_ACCELERATION 1250 // E acceleration for retracts
 #define DEFAULT_TRAVEL_ACCELERATION 1250 // X, Y, Z acceleration for travel (non printing) moves
 
-/// HW limits of Acceleration
-#define HWLIMIT_NORMAL_ACCELERATION 4000
-#define HWLIMIT_STEALTH_ACCELERATION 2500
-#define HWLIMIT_NORMAL_RETRACT_ACCELERATION 1250
-#define HWLIMIT_STEALTH_RETRACT_ACCELERATION 1250
-#define HWLIMIT_NORMAL_TRAVEL_ACCELERATION 4000
-#define HWLIMIT_STEALTH_TRAVEL_ACCELERATION 2500
-
 //
 // Use Junction Deviation instead of traditional Jerk Limiting
 //

diff --git a/include/marlin/Configuration_MK3.5.h b/include/marlin/Configuration_MK3.5.h
@@ -768,7 +768,7 @@
 
 /// HW limits of max acceleration
 #define HWLIMIT_NORMAL_MAX_ACCELERATION \
-    { 4000, 4000, 200, 2500 }
+    { 7000, 7000, 750, 6000 }
 #define HWLIMIT_STEALTH_MAX_ACCELERATION \
     { 2500, 2500, 200, 2500 }
 
@@ -784,14 +784,6 @@
 #define DEFAULT_RETRACT_ACCELERATION 1250 // E acceleration for retracts
 #define DEFAULT_TRAVEL_ACCELERATION 1250 // X, Y, Z acceleration for travel (non printing) moves
 
-/// HW limits of Acceleration
-#define HWLIMIT_NORMAL_ACCELERATION 4000
-#define HWLIMIT_STEALTH_ACCELERATION 2500
-#define HWLIMIT_NORMAL_RETRACT_ACCELERATION 1250
-#define HWLIMIT_STEALTH_RETRACT_ACCELERATION 1200
-#define HWLIMIT_NORMAL_TRAVEL_ACCELERATION 4000
-#define HWLIMIT_STEALTH_TRAVEL_ACCELERATION 2500
-
 //
 // Use Junction Deviation instead of traditional Jerk Limiting
 //
@@ -817,8 +809,8 @@
 #define DEFAULT_EJERK 5 // May be used by Linear Advance
 
 /// HW limits of Jerk
-#define HWLIMIT_NORMAL_JERK { 8, 8, 2, 5 }
-#define HWLIMIT_STEALTH_JERK { 8, 8, 2, 5 }
+#define HWLIMIT_NORMAL_JERK { 10, 10, 2, 10 }
+#define HWLIMIT_STEALTH_JERK { 8, 8, 2, 10 }
 
 /**
  * S-Curve Acceleration

diff --git a/include/marlin/Configuration_MK3.5_adv.h b/include/marlin/Configuration_MK3.5_adv.h
@@ -1097,15 +1097,15 @@
 // min + 1 * (max - min) / 20 - offset = low_bound;
 // min + 19 * (max - min) / 20 - offset = high_bound;.
 // Highbounds:
-// Leftmost position for X is 225
-// Reartmost postition for Y is 204
+// Rightmost position for X is 220 (to ensure P.I.N.D.A. stays on the sheet)
+// Rearmost postition for Y is 204
 // Lowbounds:
-// Rightmost position for X is 0
+// Leftmost position for X is 0
 // Frontmost position for Y is -4 (defined elsewhere: Y_MIN_POS)
 
 #define MESH_MIN_X (10.5f)
 #define MESH_MIN_Y (-10.5f)
-#define MESH_MAX_X (X_BED_SIZE + MESH_MIN_X)
+#define MESH_MAX_X (X_BED_SIZE + MESH_MIN_X - 5)
 #define MESH_MAX_Y (Y_BED_SIZE - MESH_MIN_Y)
 #endif
 

diff --git a/include/marlin/Configuration_MK4.h b/include/marlin/Configuration_MK4.h
@@ -208,6 +208,7 @@
  *  some gcodes (like G80) can have a different meaning.
  */
 #define GCODE_COMPATIBILITY_MK3
+#define FAN_COMPATIBILITY_MK4_MK3
 
 // A dual extruder that uses a single stepper motor
 //#define SWITCHING_EXTRUDER
@@ -774,7 +775,7 @@
 
 /// HW limits of max acceleration
 #define HWLIMIT_NORMAL_MAX_ACCELERATION \
-    { 7000, 7000, 200, 2500 }
+    { 7000, 7000, 750, 6000 }
 #define HWLIMIT_STEALTH_MAX_ACCELERATION \
     { 2500, 2500, 200, 2500 }
 
@@ -791,14 +792,6 @@
 #define DEFAULT_RETRACT_ACCELERATION 800 // E acceleration for retracts
 #define DEFAULT_TRAVEL_ACCELERATION 1250 // X, Y, Z acceleration for travel (non printing) moves
 
-/// HW limits of Acceleration
-#define HWLIMIT_NORMAL_ACCELERATION 4000
-#define HWLIMIT_STEALTH_ACCELERATION 2500
-#define HWLIMIT_NORMAL_RETRACT_ACCELERATION 1200
-#define HWLIMIT_STEALTH_RETRACT_ACCELERATION 1200
-#define HWLIMIT_NORMAL_TRAVEL_ACCELERATION 4000
-#define HWLIMIT_STEALTH_TRAVEL_ACCELERATION 2500
-
 //
 // Use Junction Deviation instead of traditional Jerk Limiting
 //
@@ -1449,7 +1442,8 @@
 
 #define HOMING_FEEDRATE_XY (62 * 60)
 
-#define HOMING_FEEDRATE_Z (8 * 60)
+// beware - experimentally tuned on a high volume of MK4 and MK4S to prevent resonances in Z while homing
+#define HOMING_FEEDRATE_Z 1150
 #define HOMING_FEEDRATE_INVERTED_Z (buddy::hw::Configuration::Instance().has_trinamic_oscillators() ? (60 * 60) : (30 * 60))
 
 // Validate that endstops are triggered on homing moves

diff --git a/include/marlin/Configuration_XL.h b/include/marlin/Configuration_XL.h
@@ -782,7 +782,7 @@
 
 /// HW limits of feed rate
 #define HWLIMIT_NORMAL_MAX_FEEDRATE \
-    { 400, 400, 40, 100 }
+    { 400, 400, 20, 100 }
 #define HWLIMIT_STEALTH_MAX_FEEDRATE \
     { 140, 140, 12, 100 }
 
@@ -803,7 +803,7 @@
 
 /// HW limits of max acceleration
 #define HWLIMIT_NORMAL_MAX_ACCELERATION \
-    { 7000, 7000, 200, 2500 }
+    { 7000, 7000, 200, 6000 }
 #define HWLIMIT_STEALTH_MAX_ACCELERATION \
     { 2500, 2500, 200, 2500 }
 
@@ -819,14 +819,6 @@
 #define DEFAULT_RETRACT_ACCELERATION 1200 // E acceleration for retracts
 #define DEFAULT_TRAVEL_ACCELERATION 5000 // X, Y, Z acceleration for travel (non printing) moves
 
-/// HW limits of Acceleration
-#define HWLIMIT_NORMAL_ACCELERATION 7000
-#define HWLIMIT_STEALTH_ACCELERATION 2500
-#define HWLIMIT_NORMAL_RETRACT_ACCELERATION 1200
-#define HWLIMIT_STEALTH_RETRACT_ACCELERATION 1200
-#define HWLIMIT_NORMAL_TRAVEL_ACCELERATION 7000
-#define HWLIMIT_STEALTH_TRAVEL_ACCELERATION 2500
-
 //
 // Use Junction Deviation instead of traditional Jerk Limiting
 //
@@ -853,8 +845,8 @@
 #define DEFAULT_EJERK 5 // May be used by Linear Advance
 
 /// HW limits of Jerk
-#define HWLIMIT_NORMAL_JERK { 8, 8, 2, 10 }
-#define HWLIMIT_STEALTH_JERK {8, 8, 2, 10 }
+#define HWLIMIT_NORMAL_JERK {10, 10, 2, 10}
+#define HWLIMIT_STEALTH_JERK {8, 8, 2, 10}
 
 /**
  * S-Curve Acceleration

diff --git a/include/marlin/Configuration_XL_DEV_KIT.h b/include/marlin/Configuration_XL_DEV_KIT.h
@@ -819,14 +819,6 @@
 #define DEFAULT_RETRACT_ACCELERATION 1200 // E acceleration for retracts
 #define DEFAULT_TRAVEL_ACCELERATION 5000 // X, Y, Z acceleration for travel (non printing) moves
 
-/// HW limits of Acceleration
-#define HWLIMIT_NORMAL_ACCELERATION 7000
-#define HWLIMIT_STEALTH_ACCELERATION 2500
-#define HWLIMIT_NORMAL_RETRACT_ACCELERATION 1200
-#define HWLIMIT_STEALTH_RETRACT_ACCELERATION 1200
-#define HWLIMIT_NORMAL_TRAVEL_ACCELERATION 7000
-#define HWLIMIT_STEALTH_TRAVEL_ACCELERATION 2500
-
 //
 // Use Junction Deviation instead of traditional Jerk Limiting
 //

diff --git a/include/marlin/Configuration_XL_Dwarf.h b/include/marlin/Configuration_XL_Dwarf.h
@@ -758,14 +758,6 @@
 #define DEFAULT_RETRACT_ACCELERATION 1250 // E acceleration for retracts
 #define DEFAULT_TRAVEL_ACCELERATION 250 // X, Y, Z acceleration for travel (non printing) moves
 
-/// HW limits of Acceleration
-#define HWLIMIT_NORMAL_ACCELERATION 7000
-#define HWLIMIT_STEALTH_ACCELERATION 2500
-#define HWLIMIT_NORMAL_RETRACT_ACCELERATION 1200
-#define HWLIMIT_STEALTH_RETRACT_ACCELERATION 1200
-#define HWLIMIT_NORMAL_TRAVEL_ACCELERATION 7000
-#define HWLIMIT_STEALTH_TRAVEL_ACCELERATION 2500
-
 //
 // Use Junction Deviation instead of traditional Jerk Limiting
 //

diff --git a/include/marlin/Configuration_iX.h b/include/marlin/Configuration_iX.h
@@ -758,7 +758,7 @@
 
 /// HW limits of feed rate
 #define HWLIMIT_NORMAL_MAX_FEEDRATE \
-    { 400, 400, 40, 100 }
+    { 400, 400, 20, 100 }
 #define HWLIMIT_STEALTH_MAX_FEEDRATE \
     { 140, 140, 12, 100 }
 
@@ -772,7 +772,7 @@
 
 /// HW limits of max acceleration
 #define HWLIMIT_NORMAL_MAX_ACCELERATION \
-    { 7000, 7000, 200, 2500 }
+    { 7000, 7000, 200, 6000 }
 #define HWLIMIT_STEALTH_MAX_ACCELERATION \
     { 2500, 2500, 200, 2500 }
 
@@ -785,14 +785,6 @@
 #define DEFAULT_MAX_ACCELERATION \
     { 1500, 1500, 1000, 5000 }
 
-/// HW limits of Acceleration
-#define HWLIMIT_NORMAL_ACCELERATION 7000
-#define HWLIMIT_STEALTH_ACCELERATION 2500
-#define HWLIMIT_NORMAL_RETRACT_ACCELERATION 1200
-#define HWLIMIT_STEALTH_RETRACT_ACCELERATION 1200
-#define HWLIMIT_NORMAL_TRAVEL_ACCELERATION 7000
-#define HWLIMIT_STEALTH_TRAVEL_ACCELERATION 2500
-
 /**
  * Default Acceleration (change/s) change = mm/s
  * Override with M204
@@ -830,8 +822,8 @@
 #define DEFAULT_EJERK 5 // May be used by Linear Advance
 
 /// HW limits of Jerk
-#define HWLIMIT_NORMAL_JERK { 8, 8, 2, 10 }
-#define HWLIMIT_STEALTH_JERK {8, 8, 2, 10 }
+#define HWLIMIT_NORMAL_JERK {10, 10, 2, 10}
+#define HWLIMIT_STEALTH_JERK {8, 8, 2, 10}
 
 /**
  * S-Curve Acceleration

diff --git a/lib/Marlin/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp b/lib/Marlin/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@@ -2020,7 +2020,7 @@
       uint32_t bitmap[GRID_MAX_POINTS_X] = { 0 };
       struct linear_fit_data lsf_results;
 
-      SERIAL_ECHOPGM("Extrapolating mesh...");
+      SERIAL_ECHOLNPGM("Extrapolating mesh...");
 
       const float weight_scaled = weight_factor * _MAX(MESH_X_DIST, MESH_Y_DIST);
 

diff --git a/lib/Marlin/Marlin/src/gcode/calibrate/G80.cpp b/lib/Marlin/Marlin/src/gcode/calibrate/G80.cpp
@@ -74,7 +74,7 @@ void GcodeSuite::G80() {
     // If running in MK3 compatibility mode, we need to move z axis down to print bed.
     // When running G80 in MK3 we moved the nozzle to the printbed after MBL.
     // We don't do that now and the newer slicer adds G1 instruction to move the nozzle down.
-    if (gcode.compatibility_mode == CompatibilityMode::MK3) {
+    if (gcode.gcode_compatibility_mode == GcodeCompatibilityMode::MK3) {
         run_gcode("G1 Z0.15"); // 0.15 is value of Z_MIN_POS https://github.com/prusa3d/Prusa-Firmware/blob/MK3/Firmware/variants/MK3S.h#L67
     }
 }

diff --git a/lib/Marlin/Marlin/src/gcode/config/M221.cpp b/lib/Marlin/Marlin/src/gcode/config/M221.cpp
@@ -44,7 +44,7 @@ void GcodeSuite::M221() {
   if (parser.seenval('S')) {
     int flow_percentage = parser.value_int();
     #if ENABLED(GCODE_COMPATIBILITY_MK3)
-      if (gcode.compatibility_mode == GcodeSuite::CompatibilityMode::MK3) {
+      if (gcode.gcode_compatibility_mode == GcodeSuite::GcodeCompatibilityMode::MK3) {
         flow_percentage = (float)flow_percentage / 0.95;
       }
     #endif