Update runout.h

.github/ISSUE_TEMPLATE/config.yml

@@ -7,7 +7,7 @@ contact_links:
     url: https://www.facebook.com/groups/1049718498464482
     about: Please ask and answer questions here.
   - name: 🕹 Marlin on Discord
-    url: https://discord.com/servers/marlin-firmware-461605380783472640
+    url: https://discord.gg/n5NJ59y
     about: Join the Discord server for support and discussion.
   - name: 🔗 Marlin Discussion Forum
     url: https://reprap.org/forum/list.php?415

.github/contributing.md

@@ -43,7 +43,7 @@ We have a Message Board and a Facebook group where our knowledgable user communi
 
 If chat is more your speed, you can join the MarlinFirmware Discord server:
 
-* Use the link https://discord.com/servers/marlin-firmware-461605380783472640 to join up as a General User.
+* Use the link https://discord.gg/n5NJ59y to join up as a General User.
 * Even though our Discord is pretty active, it may take a while for community members to respond — please be patient!
 * Use the `#general` channel for general questions or discussion about Marlin.
 * Other channels exist for certain topics or are limited to Patrons. Check the channel list.

.github/workflows/ci-build-tests.yml

@@ -43,7 +43,6 @@ jobs:
 
         # Native
         - linux_native
-        - simulator_linux_release
 
         # AVR
         - mega2560
@@ -106,9 +105,9 @@ jobs:
 
         # STM32F4
         - ARMED
-        - BTT_BTT002
-        - BTT_GTR_V1_0
-        - BTT_SKR_PRO
+        - BIGTREE_BTT002
+        - BIGTREE_GTR_V1_0
+        - BIGTREE_SKR_PRO
         - FLYF407ZG
         - FYSETC_S6
         - LERDGEK
@@ -183,13 +182,6 @@ jobs:
         pio upgrade --dev
         pio pkg update --global
 
-    - name: Install Simulator dependencies
-      run: |
-        sudo apt-get install build-essential
-        sudo apt-get install libsdl2-dev
-        sudo apt-get install libsdl2-net-dev
-        sudo apt-get install libglm-dev
-
     - name: Run ${{ matrix.test-platform }} Tests
       run: |
         make tests-single-ci TEST_TARGET=${{ matrix.test-platform }}

.github/workflows/ci-validate-boards.yml

@@ -1,48 +0,0 @@
-#
-# ci-validate-boards.yml
-# Validate boards.h to make sure it's all set up correctly
-#
-
-name: CI - Validate boards.h
-
-# We can do the on: section as two items, one for pull requests and one for pushes...
-on:
-  pull_request:
-    branches:
-    - bugfix-2.1.x
-    paths:
-    - 'Marlin/src/core/boards.h'
-  push:
-    branches:
-    - bugfix-2.1.x
-    paths:
-    - 'Marlin/src/core/boards.h'
-
-jobs:
-  validate_pins_files:
-    name: Validate boards.h
-    if: github.repository == 'MarlinFirmware/Marlin'
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Check out the PR
-      uses: actions/checkout@v4
-
-    - name: Cache pip
-      uses: actions/cache@v4
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Select Python 3.9
-      uses: actions/setup-python@v5
-      with:
-        python-version: '3.9'
-        architecture: 'x64'
-
-    - name: Validate core/boards.h
-      run: |
-        make validate-boards -j

.gitignore

@@ -125,7 +125,6 @@ vc-fileutils.settings
 # Visual Studio Code
 .vscode/*
 !.vscode/extensions.json
-*.code-workspace
 
 # Simulation files
 imgui.ini

.zed/settings.json

@@ -1,16 +0,0 @@
-/**
- * Marlin-specific settings for Zed
- *
- * For a full list of overridable settings, and general information on folder-specific settings,
- * see the documentation: https://zed.dev/docs/configuring-zed#settings-files
- */
-{
-  "languages": {
-    "C": {
-      "enable_language_server": false
-    },
-    "C++": {
-      "enable_language_server": false
-    }
-  }
-}

Makefile

@@ -6,10 +6,9 @@ UNIT_TEST_CONFIG ?= default
 
 help:
 	@echo "Tasks for local development:"
-	@echo "make marlin                    : Build Marlin for the configured board"
+	@echo "make marlin                    : Build marlin for the configured board"
 	@echo "make format-pins -j            : Reformat all pins files (-j for parallel execution)"
 	@echo "make validate-pins -j          : Validate all pins files, fails if any require reformatting"
-	@echo "make validate-boards -j        : Validate boards.h and pins.h for standards compliance"
 	@echo "make tests-single-ci           : Run a single test from inside the CI"
 	@echo "make tests-single-local        : Run a single test locally"
 	@echo "make tests-single-local-docker : Run a single test locally, using docker"
@@ -103,11 +102,3 @@ format-pins: $(PINS)
 validate-pins: format-pins
 	@echo "Validating pins files"
 	@git diff --exit-code || (git status && echo "\nError: Pins files are not formatted correctly. Run \"make format-pins\" to fix.\n" && exit 1)
-
-BOARDS_FILE := Marlin/src/core/boards.h
-
-.PHONY: validate-boards
-
-validate-boards:
-	@echo "Validating boards.h file"
-	@python $(SCRIPTS_DIR)/validate_boards.py $(BOARDS_FILE) || (echo "\nError: boards.h file is not valid. Please check and correct it.\n" && exit 1)

Marlin/Configuration.h

@@ -50,7 +50,7 @@
  *
  * Calibration Guides:  https://reprap.org/wiki/Calibration
  *                      https://reprap.org/wiki/Triffid_Hunter%27s_Calibration_Guide
- *                      https://web.archive.org/web/20220907014303/sites.google.com/site/repraplogphase/calibration-of-your-reprap
+ *                      https://web.archive.org/web/20220907014303/https://sites.google.com/site/repraplogphase/calibration-of-your-reprap
  *                      https://youtu.be/wAL9d7FgInk
  *                      https://teachingtechyt.github.io/calibration.html
  *
@@ -61,7 +61,7 @@
 // @section info
 
 // Author info of this build printed to the host during boot and M115
-#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Original author or contributor.
+#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes.
 //#define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes)
 
 // @section machine
@@ -77,7 +77,7 @@
  * Serial port -1 is the USB emulated serial port, if available.
  * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader.
  *
- * :[-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
  */
 #define SERIAL_PORT 0
 
@@ -99,22 +99,22 @@
 /**
  * Select a secondary serial port on the board to use for communication with the host.
  * Currently Ethernet (-2) is only supported on Teensy 4.1 boards.
- * :[-2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+ * :[-2, -1, 0, 1, 2, 3, 4, 5, 6, 7]
  */
 //#define SERIAL_PORT_2 -1
 //#define BAUDRATE_2 250000   // :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000] Enable to override BAUDRATE
 
 /**
  * Select a third serial port on the board to use for communication with the host.
- * Currently supported for AVR, DUE, SAMD51, LPC1768/9, STM32/STM32F1/HC32, and Teensy 4.x
- * :[-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+ * Currently only supported for AVR, DUE, LPC1768/9 and STM32/STM32F1
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
  */
 //#define SERIAL_PORT_3 1
 //#define BAUDRATE_3 250000   // :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000] Enable to override BAUDRATE
 
 /**
  * Select a serial port to communicate with RS485 protocol
- * :[-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+ * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
  */
 //#define RS485_SERIAL_PORT 1
 #ifdef RS485_SERIAL_PORT
@@ -385,15 +385,14 @@
  *   PRUSA_MMU1           : Průša MMU1 (The "multiplexer" version)
  *   PRUSA_MMU2           : Průša MMU2
  *   PRUSA_MMU2S          : Průša MMU2S (Requires MK3S extruder with motion sensor, EXTRUDERS = 5)
- *   PRUSA_MMU3           : Průša MMU3  (Requires MK3S extruder with motion sensor and MMU firmware version 3.x.x, EXTRUDERS = 5)
  *   EXTENDABLE_EMU_MMU2  : MMU with configurable number of filaments (ERCF, SMuFF or similar with Průša MMU2 compatible firmware)
  *   EXTENDABLE_EMU_MMU2S : MMUS with configurable number of filaments (ERCF, SMuFF or similar with Průša MMU2 compatible firmware)
  *
  * Requires NOZZLE_PARK_FEATURE to park print head in case MMU unit fails.
  * See additional options in Configuration_adv.h.
- * :["PRUSA_MMU1", "PRUSA_MMU2", "PRUSA_MMU2S", "PRUSA_MMU3", "EXTENDABLE_EMU_MMU2", "EXTENDABLE_EMU_MMU2S"]
+ * :["PRUSA_MMU1", "PRUSA_MMU2", "PRUSA_MMU2S", "EXTENDABLE_EMU_MMU2", "EXTENDABLE_EMU_MMU2S"]
  */
-//#define MMU_MODEL PRUSA_MMU3
+//#define MMU_MODEL PRUSA_MMU2
 
 // @section psu control
 
@@ -714,13 +713,10 @@
  * Use a physical model of the hotend to control temperature. When configured correctly this gives
  * better responsiveness and stability than PID and removes the need for PID_EXTRUSION_SCALING
  * and PID_FAN_SCALING. Enable MPC_AUTOTUNE and use M306 T to autotune the model.
- * @section mpc temp
+ * @section mpctemp
  */
 #if ENABLED(MPCTEMP)
   #define MPC_AUTOTUNE                                // Include a method to do MPC auto-tuning (~6.3K bytes of flash)
-  #if ENABLED(MPC_AUTOTUNE)
-    //#define MPC_AUTOTUNE_DEBUG                      // Enable MPC debug logging (~870 bytes of flash)
-  #endif
   //#define MPC_EDIT_MENU                             // Add MPC editing to the "Advanced Settings" menu. (~1.3K bytes of flash)
   //#define MPC_AUTOTUNE_MENU                         // Add MPC auto-tuning to the "Advanced Settings" menu. (~350 bytes of flash)
 
@@ -802,40 +798,6 @@
   //#define BED_LIMIT_SWITCHING   // Keep the bed temperature within BED_HYSTERESIS of the target
 #endif
 
-/**
- * Peltier Bed - Heating and Cooling
- *
- * A Peltier device transfers heat from one side to the other in proportion to the amount of
- * current flowing through the device and the direction of current flow. So the same device
- * can both heat and cool.
- *
- * When "cooling" in addition to rejecting the heat transferred from the hot side to the cold
- * side, the dissipated power (voltage * current) must also be rejected. Be sure to set up a
- * fan that can be powered in sync with the Peltier unit.
- *
- * This feature is only set up to run in bang-bang mode because Peltiers don't handle PWM
- * well without filter circuitry.
- *
- * Since existing 3D printers are made to handle relatively high current for the heated bed,
- * we can use the heated bed power pins to control the Peltier power using the same G-codes
- * as the heated bed (M140, M190, etc.).
- *
- * A second GPIO pin is required to control current direction.
- * Two configurations are possible: Relay and H-Bridge
- *
- * (At this time only relay is supported. H-bridge requires 4 MOS switches configured in H-Bridge.)
- *
- * Power is handled by the bang-bang control loop: 0 or 255.
- * Cooling applications are more common than heating, so the pin states are commonly:
- *   LOW  = Heating = Relay Energized
- *   HIGH = Cooling = Relay in "Normal" state
- */
-//#define PELTIER_BED
-#if ENABLED(PELTIER_BED)
-  #define PELTIER_DIR_PIN           -1  // Relay control pin for Peltier
-  #define PELTIER_DIR_HEAT_STATE   LOW  // The relay pin state that causes the Peltier to heat
-#endif
-
 // Add 'M190 R T' for more gradual M190 R bed cooling.
 //#define BED_ANNEALING_GCODE
 
@@ -876,16 +838,14 @@
   // Lasko "MyHeat Personal Heater" (200w) modified with a Fotek SSR-10DA to control only the heating element
   // and placed inside the small Creality printer enclosure tent.
   //
-  #define DEFAULT_chamberKp  37.04
-  #define DEFAULT_chamberKi   1.40
+  #define DEFAULT_chamberKp 37.04
+  #define DEFAULT_chamberKi 1.40
   #define DEFAULT_chamberKd 655.17
   // M309 P37.04 I1.04 D655.17
 
   // FIND YOUR OWN: "M303 E-2 C8 S50" to run autotune on the chamber at 50 degreesC for 8 cycles.
 #endif // PIDTEMPCHAMBER
 
-// @section pid temp
-
 #if ANY(PIDTEMP, PIDTEMPBED, PIDTEMPCHAMBER)
   //#define PID_OPENLOOP          // Puts PID in open loop. M104/M140 sets the output power from 0 to PID_MAX
   //#define SLOW_PWM_HEATERS      // PWM with very low frequency (roughly 0.125Hz=8s) and minimum state time of approximately 1s useful for heaters driven by a relay
@@ -1504,8 +1464,7 @@
  * A lightweight, solenoid-driven probe.
  * For information about this sensor https://github.com/bigtreetech/MicroProbe
  *
- * Also requires PROBE_ENABLE_DISABLE
- * With FT_MOTION requires ENDSTOP_INTERRUPTS_FEATURE
+ * Also requires: PROBE_ENABLE_DISABLE
  */
 //#define BIQU_MICROPROBE_V1  // Triggers HIGH
 //#define BIQU_MICROPROBE_V2  // Triggers LOW
@@ -1644,8 +1603,7 @@
 // with NOZZLE_AS_PROBE this can be negative for a wider probing area.
 #define PROBING_MARGIN 10
 
-// X and Y axis travel speed (mm/min) between probes.
-// Leave undefined to use the average of the current XY homing feedrate.
+// X and Y axis travel speed (mm/min) between probes
 #define XY_PROBE_FEEDRATE (133*60)
 
 // Feedrate (mm/min) for the first approach when double-probing (MULTIPLE_PROBING == 2)
@@ -1676,7 +1634,6 @@
   #define PROBE_TARE_DELAY 200    // (ms) Delay after tare before
   #define PROBE_TARE_STATE HIGH   // State to write pin for tare
   //#define PROBE_TARE_PIN PA5    // Override default pin
-  //#define PROBE_TARE_MENU       // Display a menu item to tare the probe
   #if ENABLED(PROBE_ACTIVATION_SWITCH)
     //#define PROBE_TARE_ONLY_WHILE_INACTIVE  // Fail to tare/probe if PROBE_ACTIVATION_SWITCH is active
   #endif
@@ -1714,8 +1671,8 @@
  * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
  * Only integer values >= 1 are valid here.
  *
- * Example: 'M851 Z-5' with a CLEARANCE of 4  =>  9mm from bed to nozzle.
- *     But: 'M851 Z+1' with a CLEARANCE of 2  =>  2mm from bed to nozzle.
+ * Example: `M851 Z-5` with a CLEARANCE of 4  =>  9mm from bed to nozzle.
+ *     But: `M851 Z+1` with a CLEARANCE of 2  =>  2mm from bed to nozzle.
  */
 #define Z_CLEARANCE_DEPLOY_PROBE   10 // (mm) Z Clearance for Deploy/Stow
 #define Z_CLEARANCE_BETWEEN_PROBES  5 // (mm) Z Clearance between probe points
@@ -1766,8 +1723,6 @@
   #define PROBING_BED_TEMP     50
 #endif
 
-// @section stepper drivers
-
 // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1
 // :{ 0:'Low', 1:'High' }
 #define X_ENABLE_ON 0
@@ -1941,8 +1896,6 @@
 #endif
 
 /**
- * @section filament runout sensors
- *
  * Filament Runout Sensors
  * Mechanical or opto endstops are used to check for the presence of filament.
  *
@@ -1955,12 +1908,11 @@
  * RAMPS-based boards use SERVO3_PIN for the first runout sensor.
  * For other boards you may need to define FIL_RUNOUT_PIN, FIL_RUNOUT2_PIN, etc.
  */
-//#define FILAMENT_RUNOUT_SENSOR
+#define FILAMENT_RUNOUT_SENSOR
 #if ENABLED(FILAMENT_RUNOUT_SENSOR)
-  #define FIL_RUNOUT_ENABLED_DEFAULT true // Enable the sensor on startup. Override with M412 followed by M500.
-  #define NUM_RUNOUT_SENSORS   1          // Number of sensors, up to one per extruder. Define a FIL_RUNOUT#_PIN for each.
+  #define FIL_RUNOUT_ENABLED { true } // Default enabled state for sensors E0[, E1[, E2[, E3...]]]. Override with M591EnnSn followed by M500.
+  #define FIL_RUNOUT_MODE    { 7 }    // Default mode for sensors E0[, E1[, E2[, E3...]]]. 0:NONE  1:Switch NO  2:Switch NC  7:Motion Sensor Override with M591EnPnn
 
-  #define FIL_RUNOUT_STATE     LOW        // Pin state indicating that filament is NOT present.
   #define FIL_RUNOUT_PULLUP               // Use internal pullup for filament runout pins.
   //#define FIL_RUNOUT_PULLDOWN           // Use internal pulldown for filament runout pins.
   //#define WATCH_ALL_RUNOUT_SENSORS      // Execute runout script on any triggering sensor, not only for the active extruder.
@@ -2004,58 +1956,11 @@
   // NOTE: After 'M412 H1' the host handles filament runout and this script does not apply.
   #define FILAMENT_RUNOUT_SCRIPT "M600"
 
-  // After a runout is detected, continue printing this length of filament
-  // before executing the runout script. Useful for a sensor at the end of
-  // a feed tube. Requires 4 bytes SRAM per sensor, plus 4 bytes overhead.
-  //#define FILAMENT_RUNOUT_DISTANCE_MM 25
-
-  #ifdef FILAMENT_RUNOUT_DISTANCE_MM
-    // Enable this option to use an encoder disc that toggles the runout pin
-    // as the filament moves. (Be sure to set FILAMENT_RUNOUT_DISTANCE_MM
-    // large enough to avoid false positives.)
-    //#define FILAMENT_MOTION_SENSOR
-
-    #if ENABLED(FILAMENT_MOTION_SENSOR)
-      //#define FILAMENT_SWITCH_AND_MOTION
-      #if ENABLED(FILAMENT_SWITCH_AND_MOTION)
-        #define NUM_MOTION_SENSORS   1          // Number of sensors, up to one per extruder. Define a FIL_MOTION#_PIN for each.
-        //#define FIL_MOTION1_PIN    -1
-
-        // Override individually if the motion sensors vary
-        //#define FIL_MOTION1_STATE LOW
-        //#define FIL_MOTION1_PULLUP
-        //#define FIL_MOTION1_PULLDOWN
-
-        //#define FIL_MOTION2_STATE LOW
-        //#define FIL_MOTION2_PULLUP
-        //#define FIL_MOTION2_PULLDOWN
-
-        //#define FIL_MOTION3_STATE LOW
-        //#define FIL_MOTION3_PULLUP
-        //#define FIL_MOTION3_PULLDOWN
-
-        //#define FIL_MOTION4_STATE LOW
-        //#define FIL_MOTION4_PULLUP
-        //#define FIL_MOTION4_PULLDOWN
-
-        //#define FIL_MOTION5_STATE LOW
-        //#define FIL_MOTION5_PULLUP
-        //#define FIL_MOTION5_PULLDOWN
-
-        //#define FIL_MOTION6_STATE LOW
-        //#define FIL_MOTION6_PULLUP
-        //#define FIL_MOTION6_PULLDOWN
-
-        //#define FIL_MOTION7_STATE LOW
-        //#define FIL_MOTION7_PULLUP
-        //#define FIL_MOTION7_PULLDOWN
-
-        //#define FIL_MOTION8_STATE LOW
-        //#define FIL_MOTION8_PULLUP
-        //#define FIL_MOTION8_PULLDOWN
-      #endif
-    #endif
-  #endif
+  // In Mode 1 or 2, continue printing this length of filament after a run out occurs before executing the
+  // runout script. Useful for a sensor at the end of a feed tube or debounce on a flakey sensor.
+  // In Mode 7, extrusion distance to expect a change of state.
+  // Override with M591EnLnn
+  #define FILAMENT_RUNOUT_DISTANCE_MM 5
 #endif
 
 //===========================================================================
@@ -2339,9 +2244,6 @@
 // Homing speeds (linear=mm/min, rotational=°/min)
 #define HOMING_FEEDRATE_MM_M { (50*60), (50*60), (4*60) }
 
-// Edit homing feedrates with M210 and MarlinUI menu items
-//#define EDITABLE_HOMING_FEEDRATE
-
 // Validate that endstops are triggered on homing moves
 #define VALIDATE_HOMING_ENDSTOPS
 
@@ -2468,9 +2370,9 @@
 #define PREHEAT_2_TEMP_CHAMBER 35
 #define PREHEAT_2_FAN_SPEED     0 // Value from 0 to 255
 
+// @section motion
+
 /**
- * @section nozzle park
- *
  * Nozzle Park
  *
  * Park the nozzle at the given XYZ position on idle or G27.
@@ -2481,7 +2383,7 @@
  *    P1  Raise the nozzle always to Z-park height.
  *    P2  Raise the nozzle by Z-park amount, limited to Z_MAX_POS.
  */
-//#define NOZZLE_PARK_FEATURE
+#define NOZZLE_PARK_FEATURE
 
 #if ENABLED(NOZZLE_PARK_FEATURE)
   // Specify a park position as { X, Y, Z_raise }
@@ -2493,8 +2395,6 @@
 #endif
 
 /**
- * @section nozzle clean
- *
  * Clean Nozzle Feature
  *
  * Adds the G12 command to perform a nozzle cleaning process.
@@ -2655,24 +2555,9 @@
   //#include "Configuration_Secure.h"       // External file with PASSWORD_DEFAULT_VALUE
 #endif
 
-// @section media
-
-/**
- * SD CARD
- *
- * SD Card support is disabled by default. If your controller has an SD slot,
- * you must uncomment the following option or it won't work.
- */
-//#define SDSUPPORT
-
-/**
- * SD CARD: ENABLE CRC
- *
- * Use CRC checks and retries on the SD communication.
- */
-#if ENABLED(SDSUPPORT)
-  //#define SD_CHECK_AND_RETRY
-#endif
+//=============================================================================
+//============================= LCD and SD support ============================
+//=============================================================================
 
 // @section interface
 
@@ -2719,6 +2604,21 @@
  */
 #define LCD_INFO_SCREEN_STYLE 0
 
+/**
+ * SD CARD
+ *
+ * SD Card support is disabled by default. If your controller has an SD slot,
+ * you must uncomment the following option or it won't work.
+ */
+//#define SDSUPPORT
+
+/**
+ * SD CARD: ENABLE CRC
+ *
+ * Use CRC checks and retries on the SD communication.
+ */
+//#define SD_CHECK_AND_RETRY
+
 /**
  * LCD Menu Items
  *
@@ -2847,7 +2747,7 @@
 
 //
 // Original RADDS LCD Display+Encoder+SDCardReader
-// https://web.archive.org/web/20200719145306/doku.radds.org/dokumentation/lcd-display/
+// https://web.archive.org/web/20200719145306/http://doku.radds.org/dokumentation/lcd-display/
 //
 //#define RADDS_DISPLAY
 
@@ -2913,7 +2813,7 @@
 
 //
 // Elefu RA Board Control Panel
-// https://web.archive.org/web/20140823033947/www.elefu.com/index.php?route=product/product&product_id=53
+// https://web.archive.org/web/20140823033947/http://www.elefu.com/index.php?route=product/product&product_id=53
 //
 //#define RA_CONTROL_PANEL
 
@@ -3045,7 +2945,7 @@
 
 //
 // Cartesio UI
-// https://web.archive.org/web/20180605050442/mauk.cc/webshop/cartesio-shop/electronics/user-interface
+// https://web.archive.org/web/20180605050442/http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
 //
 //#define CARTESIO_UI
 
@@ -3282,11 +3182,6 @@
 //
 //#define ANYCUBIC_LCD_VYPER
 
-//
-// Sovol SV-06 Resistive Touch Screen
-//
-//#define SOVOL_SV06_RTS
-
 //
 // 320x240 Nextion 2.8" serial TFT Resistive Touch Screen NX3224T028
 //

Marlin/Configuration_adv.h

@@ -47,9 +47,8 @@
  *  2 = config.ini - File format for PlatformIO preprocessing.
  *  3 = schema.json - The entire configuration schema. (13 = pattern groups)
  *  4 = schema.yml - The entire configuration schema.
- *  5 = Config.h - Minimal configuration by popular demand.
  */
-//#define CONFIG_EXPORT 105 // :[1:'JSON', 2:'config.ini', 3:'schema.json', 4:'schema.yml', 5:'Config.h']
+//#define CONFIG_EXPORT 2 // :[1:'JSON', 2:'config.ini', 3:'schema.json', 4:'schema.yml']
 
 //===========================================================================
 //============================= Thermal Settings ============================
@@ -203,7 +202,7 @@
 //
 #if DISABLED(PIDTEMPBED)
   #define BED_CHECK_INTERVAL 5000   // (ms) Interval between checks in bang-bang control
-  #if ANY(BED_LIMIT_SWITCHING, PELTIER_BED)
+  #if ENABLED(BED_LIMIT_SWITCHING)
     #define BED_HYSTERESIS 2        // (°C) Only set the relevant heater state when ABS(T-target) > BED_HYSTERESIS
   #endif
 #endif
@@ -304,9 +303,9 @@
  * If you get false positives for "Thermal Runaway", increase
  * THERMAL_PROTECTION_HYSTERESIS and/or THERMAL_PROTECTION_PERIOD
  */
-#if ALL(HAS_HOTEND, THERMAL_PROTECTION_HOTENDS)
-  #define THERMAL_PROTECTION_PERIOD        40 // (seconds)
-  #define THERMAL_PROTECTION_HYSTERESIS     4 // (°C)
+#if ENABLED(THERMAL_PROTECTION_HOTENDS)
+  #define THERMAL_PROTECTION_PERIOD 40        // (seconds)
+  #define THERMAL_PROTECTION_HYSTERESIS 4     // (°C)
 
   //#define ADAPTIVE_FAN_SLOWING              // Slow down the part-cooling fan if the temperature drops
   #if ENABLED(ADAPTIVE_FAN_SLOWING)
@@ -335,7 +334,7 @@
 /**
  * Thermal Protection parameters for the bed are just as above for hotends.
  */
-#if TEMP_SENSOR_BED && ENABLED(THERMAL_PROTECTION_BED)
+#if ENABLED(THERMAL_PROTECTION_BED)
   #define THERMAL_PROTECTION_BED_PERIOD        20 // (seconds)
   #define THERMAL_PROTECTION_BED_HYSTERESIS     2 // (°C)
 
@@ -349,7 +348,7 @@
 /**
  * Thermal Protection parameters for the heated chamber.
  */
-#if TEMP_SENSOR_CHAMBER && ENABLED(THERMAL_PROTECTION_CHAMBER)
+#if ENABLED(THERMAL_PROTECTION_CHAMBER)
   #define THERMAL_PROTECTION_CHAMBER_PERIOD    20 // (seconds)
   #define THERMAL_PROTECTION_CHAMBER_HYSTERESIS 2 // (°C)
 
@@ -363,7 +362,7 @@
 /**
  * Thermal Protection parameters for the laser cooler.
  */
-#if TEMP_SENSOR_COOLER && ENABLED(THERMAL_PROTECTION_COOLER)
+#if ENABLED(THERMAL_PROTECTION_COOLER)
   #define THERMAL_PROTECTION_COOLER_PERIOD     10 // (seconds)
   #define THERMAL_PROTECTION_COOLER_HYSTERESIS  3 // (°C)
 
@@ -591,8 +590,6 @@
   // Use TEMP_SENSOR_SOC as a trigger for enabling the controller fan
   //#define CONTROLLER_FAN_MIN_SOC_TEMP 40  // (°C) Turn on the fan if the SoC reaches this temperature
 
-  #define CONTROLLER_FAN_BED_HEATING        // Turn on the fan when heating the bed
-
   //#define CONTROLLER_FAN_EDITABLE         // Enable M710 configurable settings
   #if ENABLED(CONTROLLER_FAN_EDITABLE)
     #define CONTROLLER_FAN_MENU             // Enable the Controller Fan submenu
@@ -1084,11 +1081,9 @@
   #define HOME_AFTER_G34
 #endif
 
-/**
- * Assisted Tramming
- *
- * Add the G35 command to measure bed corners and help adjust screws. Requires a bed probe.
- */
+//
+// Add the G35 command to read bed corners to help adjust screws. Requires a bed probe.
+//
 //#define ASSISTED_TRAMMING
 #if ENABLED(ASSISTED_TRAMMING)
 
@@ -1109,35 +1104,29 @@
   //#define ASSISTED_TRAMMING_WAIT_POSITION { X_CENTER, Y_CENTER, 30 } // Move the nozzle out of the way for adjustment
 
   /**
-   * Screw Thread. Use one of the following defines:
-   *
-   *   M3_CW = M3 Clockwise, M3_CCW = M3 Counter-Clockwise
-   *   M4_CW = M4 Clockwise, M4_CCW = M4 Counter-Clockwise
-   *   M5_CW = M5 Clockwise, M5_CCW = M5 Counter-Clockwise
-   *
-   * :{'M3_CW':'M3 Clockwise','M3_CCW':'M3 Counter-Clockwise','M4_CW':'M4 Clockwise','M4_CCW':'M4 Counter-Clockwise','M5_CW':'M5 Clockwise','M5_CCW':'M5 Counter-Clockwise'}
+   * Screw thread:
+   *   M3: 30 = Clockwise, 31 = Counter-Clockwise
+   *   M4: 40 = Clockwise, 41 = Counter-Clockwise
+   *   M5: 50 = Clockwise, 51 = Counter-Clockwise
    */
-  #define TRAMMING_SCREW_THREAD M3_CW
+  #define TRAMMING_SCREW_THREAD 30
 
 #endif
 
 // @section motion control
 
 /**
- * Fixed-time-based Motion Control -- BETA FEATURE
+ * Fixed-time-based Motion Control -- EXPERIMENTAL
  * Enable/disable and set parameters with G-code M493.
- * See ft_types.h for named values used by FTM options.
  */
 //#define FT_MOTION
 #if ENABLED(FT_MOTION)
-  //#define FTM_IS_DEFAULT_MOTION                 // Use FT Motion as the factory default?
-  #define FTM_DEFAULT_DYNFREQ_MODE dynFreqMode_DISABLED // Default mode of dynamic frequency calculation. (DISABLED, Z_BASED, MASS_BASED)
-  #define FTM_DEFAULT_SHAPER_X      ftMotionShaper_NONE // Default shaper mode on X axis (NONE, ZV, ZVD, ZVDD, ZVDDD, EI, 2HEI, 3HEI, MZV)
-  #define FTM_DEFAULT_SHAPER_Y      ftMotionShaper_NONE // Default shaper mode on Y axis
-  #define FTM_SHAPING_DEFAULT_FREQ_X   37.0f      // (Hz) Default peak frequency used by input shapers
-  #define FTM_SHAPING_DEFAULT_FREQ_Y   37.0f      // (Hz) Default peak frequency used by input shapers
+  #define FTM_DEFAULT_MODE        ftMotionMode_DISABLED // Default mode of fixed time control. (Enums in ft_types.h)
+  #define FTM_DEFAULT_DYNFREQ_MODE dynFreqMode_DISABLED // Default mode of dynamic frequency calculation. (Enums in ft_types.h)
+  #define FTM_SHAPING_DEFAULT_X_FREQ   37.0f      // (Hz) Default peak frequency used by input shapers
+  #define FTM_SHAPING_DEFAULT_Y_FREQ   37.0f      // (Hz) Default peak frequency used by input shapers
   #define FTM_LINEAR_ADV_DEFAULT_ENA   false      // Default linear advance enable (true) or disable (false)
-  #define FTM_LINEAR_ADV_DEFAULT_K      0.0f      // Default linear advance gain. (Acceleration-based scaling factor.)
+  #define FTM_LINEAR_ADV_DEFAULT_K      0.0f      // Default linear advance gain
   #define FTM_SHAPING_ZETA_X            0.1f      // Zeta used by input shapers for X axis
   #define FTM_SHAPING_ZETA_Y            0.1f      // Zeta used by input shapers for Y axis
 
@@ -1160,13 +1149,18 @@
   #define FTM_FS                     1000         // (Hz) Frequency for trajectory generation. (Reciprocal of FTM_TS)
   #define FTM_TS                        0.001f    // (s) Time step for trajectory generation. (Reciprocal of FTM_FS)
 
+  // These values may be configured to adjust the duration of loop().
+  #define FTM_STEPS_PER_LOOP           60         // Number of stepper commands to generate each loop()
+  #define FTM_POINTS_PER_LOOP         100         // Number of trajectory points to generate each loop()
+
   #if DISABLED(COREXY)
     #define FTM_STEPPER_FS          20000         // (Hz) Frequency for stepper I/O update
 
     // Use this to adjust the time required to consume the command buffer.
     // Try increasing this value if stepper motion is choppy.
     #define FTM_STEPPERCMD_BUFF_SIZE 3000         // Size of the stepper command buffers
-
+                                                  // (FTM_STEPS_PER_LOOP * FTM_POINTS_PER_LOOP) is a good start
+                                                  // If you run out of memory, fall back to 3000 and increase progressively
   #else
     // CoreXY motion needs a larger buffer size. These values are based on our testing.
     #define FTM_STEPPER_FS          30000
@@ -1188,7 +1182,7 @@
 #endif
 
 /**
- * Input Shaping
+ * Input Shaping -- EXPERIMENTAL
  *
  * Zero Vibration (ZV) Input Shaping for X and/or Y movements.
  *
@@ -1497,17 +1491,8 @@
   #define FEEDRATE_CHANGE_BEEP_FREQUENCY 440
 #endif
 
-/**
- * Probe Offset Wizard
- * Add a Probe Z Offset calibration option to the LCD menu.
- * Use this helper to get a perfect 'M851 Z' probe offset.
- * When launched this powerful wizard:
- *  - Measures the bed height at the configured position with the probe.
- *  - Moves the nozzle to the same position for a "paper" measurement.
- *  - The difference is used to set the probe Z offset.
- */
 #if HAS_BED_PROBE && ANY(HAS_MARLINUI_MENU, HAS_TFT_LVGL_UI)
-  //#define PROBE_OFFSET_WIZARD
+  //#define PROBE_OFFSET_WIZARD       // Add a Probe Z Offset calibration option to the LCD menu
   #if ENABLED(PROBE_OFFSET_WIZARD)
     /**
      * Enable to init the Probe Z-Offset when starting the Wizard.
@@ -1524,10 +1509,6 @@
 #if HAS_MARLINUI_MENU
 
   #if HAS_BED_PROBE
-
-    // Show Deploy / Stow Probe options in the Motion menu.
-    #define PROBE_DEPLOY_STOW_MENU
-
     // Add calibration in the Probe Offsets menu to compensate for X-axis twist.
     //#define X_AXIS_TWIST_COMPENSATION
     #if ENABLED(X_AXIS_TWIST_COMPENSATION)
@@ -1542,6 +1523,8 @@
       #define XATC_Z_OFFSETS { 0, 0, 0 }    // Z offsets for X axis sample points
     #endif
 
+    // Show Deploy / Stow Probe options in the Motion menu.
+    #define PROBE_DEPLOY_STOW_MENU
   #endif
 
   // Include a page of printer information in the LCD Main Menu
@@ -1572,9 +1555,6 @@
   // BACK menu items keep the highlight at the top
   //#define TURBO_BACK_MENU_ITEM
 
-  // BACK menu items show "Back" instead of the previous menu name
-  //#define GENERIC_BACK_MENU_ITEM
-
   // Insert a menu for preheating at the top level to allow for quick access
   //#define PREHEAT_SHORTCUT_MENU_ITEM
 
@@ -2578,7 +2558,7 @@
 
 /**
  * Minimum stepper driver pulse width (in ns)
- * If undefined, these defaults (from Conditionals-4-adv.h) apply:
+ * If undefined, these defaults (from Conditionals_adv.h) apply:
  *     100 : Minimum for TMC2xxx stepper drivers
  *     500 : Minimum for LV8729
  *    1000 : Minimum for A4988 and A5984 stepper drivers
@@ -2592,7 +2572,7 @@
 
 /**
  * Maximum stepping rate (in Hz) the stepper driver allows
- * If undefined, these defaults (from Conditionals-4-adv.h) apply:
+ * If undefined, these defaults (from Conditionals_adv.h) apply:
  *  5000000 : Maximum for TMC2xxx stepper drivers
  *  1000000 : Maximum for LV8729 stepper driver
  *   500000 : Maximum for A4988 stepper driver
@@ -2675,7 +2655,7 @@
  * Currently handles M108, M112, M410, M876
  * NOTE: Not yet implemented for all platforms.
  */
-//#define EMERGENCY_PARSER
+#define EMERGENCY_PARSER
 
 /**
  * Realtime Reporting (requires EMERGENCY_PARSER)
@@ -2726,7 +2706,7 @@
 
 /**
  * Set the number of proportional font spaces required to fill up a typical character space.
- * This can help to better align the output of commands like 'G29 O' Mesh Output.
+ * This can help to better align the output of commands like `G29 O` Mesh Output.
  *
  * For clients that use a fixed-width font (like OctoPrint), leave this set to 1.0.
  * Otherwise, adjust according to your client and font.
@@ -2908,7 +2888,7 @@
  *
  * Enable PARK_HEAD_ON_PAUSE to add the G-code M125 Pause and Park.
  */
-//#define ADVANCED_PAUSE_FEATURE
+#define ADVANCED_PAUSE_FEATURE
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
   #define PAUSE_PARK_RETRACT_FEEDRATE         60  // (mm/s) Initial retract feedrate.
   #define PAUSE_PARK_RETRACT_LENGTH            2  // (mm) Initial retract.
@@ -2991,7 +2971,7 @@
 
   #if AXIS_IS_TMC_CONFIG(X)
     #define X_CURRENT       800        // (mA) RMS current. Multiply by 1.414 for peak current.
-    #define X_CURRENT_HOME  X_CURRENT  // (mA) RMS current for homing. (Typically lower than *_CURRENT.)
+    #define X_CURRENT_HOME  X_CURRENT  // (mA) RMS current for sensorless homing
     #define X_MICROSTEPS     16        // 0..256
     #define X_RSENSE          0.11
     #define X_CHAIN_POS      -1        // -1..0: Not chained. 1: MCU MOSI connected. 2: Next in chain, ...
@@ -3201,13 +3181,6 @@
     //#define E7_HOLD_MULTIPLIER 0.5
   #endif
 
-  /**
-   * Use the homing current for all probing. (e.g., Current may be reduced to the
-   * point where a collision makes the motor skip instead of damaging the bed,
-   * though this is unlikely to save delicate probes from being damaged.
-   */
-  //#define PROBING_USE_CURRENT_HOME
-
   // @section tmc/spi
 
   /**
@@ -3472,7 +3445,7 @@
   /**
    * Step on both rising and falling edge signals (as with a square wave).
    */
-  #define EDGE_STEPPING
+  //#define EDGE_STEPPING
 
   /**
    * Enable M122 debugging command for TMC stepper drivers.
@@ -3554,7 +3527,7 @@
   //#define PHOTOGRAPH_PIN 23
 
   // Canon Hack Development Kit
-  // https://web.archive.org/web/20200920094805/captain-slow.dk/2014/03/09/3d-printing-timelapses/
+  // https://web.archive.org/web/20200920094805/https://captain-slow.dk/2014/03/09/3d-printing-timelapses/
   //#define CHDK_PIN        4
 
   // Optional second move with delay to trigger the camera shutter
@@ -4407,81 +4380,58 @@
   //#define E_MUX0_PIN 40  // Always Required
   //#define E_MUX1_PIN 42  // Needed for 3 to 8 inputs
   //#define E_MUX2_PIN 44  // Needed for 5 to 8 inputs
+#elif HAS_PRUSA_MMU2
+  // Serial port used for communication with MMU2.
+  #define MMU2_SERIAL_PORT 2
 
-#elif HAS_PRUSA_MMU2 || HAS_PRUSA_MMU3
-  // Common settings for MMU2/MMU2S/MMU3
-  // Serial port used for communication with MMU2/MMU2S/MMU3.
-  #define MMU_SERIAL_PORT 2
-  #define MMU_BAUD 115200
+  // Use hardware reset for MMU if a pin is defined for it
+  //#define MMU2_RST_PIN 23
 
-  //#define MMU_RST_PIN 23    // Define this pin to use Hardware Reset for MMU2/MMU2S/MMU3
+  // Enable if the MMU2 has 12V stepper motors (MMU2 Firmware 1.0.2 and up)
+  //#define MMU2_MODE_12V
 
-  //#define MMU_MENUS         // Add an LCD menu for MMU2/MMU2S/MMU3
+  // G-code to execute when MMU2 F.I.N.D.A. probe detects filament runout
+  #define MMU2_FILAMENT_RUNOUT_SCRIPT "M600"
 
-  //#define MMU_DEBUG         // Write debug info to serial output
+  // Add an LCD menu for MMU2
+  //#define MMU2_MENUS
 
-  // Options pertaining to MMU2 and MMU2S
-  #if HAS_PRUSA_MMU2
-    // Enable if the MMU2 has 12V stepper motors (MMU2 Firmware 1.0.2 and up)
-    //#define MMU2_MODE_12V
+  // Settings for filament load / unload from the LCD menu.
+  // This is for Průša MK3-style extruders. Customize for your hardware.
+  #define MMU2_FILAMENTCHANGE_EJECT_FEED 80.0
+  #define MMU2_LOAD_TO_NOZZLE_SEQUENCE \
+    {  7.2, 1145 }, \
+    { 14.4,  871 }, \
+    { 36.0, 1393 }, \
+    { 14.4,  871 }, \
+    { 50.0,  198 }
 
-    // Settings for filament load / unload from the LCD menu.
-    // This is for Průša MK3-style extruders. Customize for your hardware.
-    #define MMU2_FILAMENTCHANGE_EJECT_FEED 80.0
-
-    // G-code to execute when MMU2 F.I.N.D.A. probe detects filament runout
-    #define MMU2_FILAMENT_RUNOUT_SCRIPT "M600"
-
-    // MMU2 sequences use mm/min. Not compatible with MMU3, which use mm/sec.
-    #define MMU2_LOAD_TO_NOZZLE_SEQUENCE \
-      {  4.4,  871 }, \
-      { 10.0, 1393 }, \
-      {  4.4,  871 }, \
-      { 10.0,  198 }
-
-    #define MMU2_RAMMING_SEQUENCE \
-      {   1.0, 1000 }, \
-      {   1.0, 1500 }, \
-      {   2.0, 2000 }, \
-      {   1.5, 3000 }, \
-      {   2.5, 4000 }, \
-      { -15.0, 5000 }, \
-      { -14.0, 1200 }, \
-      {  -6.0,  600 }, \
-      {  10.0,  700 }, \
-      { -10.0,  400 }, \
-      { -50.0, 2000 }
-
-  #endif // HAS_PRUSA_MMU2
+  #define MMU2_RAMMING_SEQUENCE \
+    {   1.0, 1000 }, \
+    {   1.0, 1500 }, \
+    {   2.0, 2000 }, \
+    {   1.5, 3000 }, \
+    {   2.5, 4000 }, \
+    { -15.0, 5000 }, \
+    { -14.0, 1200 }, \
+    {  -6.0,  600 }, \
+    {  10.0,  700 }, \
+    { -10.0,  400 }, \
+    { -50.0, 2000 }
 
   /**
-   * Options pertaining to MMU2S devices
-   * Requires the MK3S extruder with a sensor at the extruder idler, like the MMU2S.
+   * Using a sensor like the MMU2S
+   * This mode requires a MK3S extruder with a sensor at the extruder idler, like the MMU2S.
    * See https://help.prusa3d.com/guide/3b-mk3s-mk2-5s-extruder-upgrade_41560#42048, step 11
    */
   #if HAS_PRUSA_MMU2S
     #define MMU2_C0_RETRY   5             // Number of retries (total time = timeout*retries)
 
-    /**
-     * This is called after the filament runout sensor is triggered to check if
-     * the filament has been loaded properly by moving the filament back and
-     * forth to see if the filament runout sensor is going to get triggered
-     * again, which should not occur if the filament is properly loaded.
-     *
-     * Thus, the MMU2_CAN_LOAD_SEQUENCE should contain some forward and
-     * backward moves. The forward moves should be greater than the backward
-     * moves.
-     *
-     * This is useless if your filament runout sensor is way behind the gears.
-     * In that case use {0, MMU2_CAN_LOAD_FEEDRATE}
-     *
-     * Adjust MMU2_CAN_LOAD_SEQUENCE according to your setup.
-     */
     #define MMU2_CAN_LOAD_FEEDRATE 800    // (mm/min)
     #define MMU2_CAN_LOAD_SEQUENCE \
-      {   5.0, MMU2_CAN_LOAD_FEEDRATE }, \
-      {  15.0, MMU2_CAN_LOAD_FEEDRATE }, \
-      { -10.0, MMU2_CAN_LOAD_FEEDRATE }
+      {  0.1, MMU2_CAN_LOAD_FEEDRATE }, \
+      {  60.0, MMU2_CAN_LOAD_FEEDRATE }, \
+      { -52.0, MMU2_CAN_LOAD_FEEDRATE }
 
     #define MMU2_CAN_LOAD_RETRACT   6.0   // (mm) Keep under the distance between Load Sequence values
     #define MMU2_CAN_LOAD_DEVIATION 0.8   // (mm) Acceptable deviation
@@ -4492,90 +4442,10 @@
 
     // Continue unloading if sensor detects filament after the initial unload move
     //#define MMU_IR_UNLOAD_MOVE
-
-  #elif HAS_PRUSA_MMU3
-
-    // MMU3 settings
-
-    #define MMU3_HAS_CUTTER     // Enable cutter related functionality
-
-    #define MMU3_MAX_RETRIES 3  // Number of retries (total time = timeout*retries)
-
-    // As discussed with our PrusaSlicer profile specialist
-    // - ToolChange shall not try to push filament into the very tip of the nozzle
-    // to have some space for additional G-code to tune the extruded filament length
-    // in the profile
-    // Beware - this value is used to initialize the MMU logic layer - it will be sent to the MMU upon line up (written into its 8bit register 0x0b)
-    // However - in the G-code we can get a request to set the extra load distance at runtime to something else (M708 A0xb Xsomething).
-    // The printer intercepts such a call and sets its extra load distance to match the new value as well.
-    #define MMU3_FILAMENT_SENSOR_E_POSITION  0   // (mm)
-    #define _MMU3_LOAD_DISTANCE_PAST_GEARS   5   // (mm)
-    #define MMU3_TOOL_CHANGE_LOAD_LENGTH (MMU3_FILAMENT_SENSOR_E_POSITION + _MMU3_LOAD_DISTANCE_PAST_GEARS) // (mm)
-
-    #define MMU3_LOAD_TO_NOZZLE_FEED_RATE        20.0 // (mm/s)
-
-    #define MMU3_VERIFY_LOAD_TO_NOZZLE_FEED_RATE 50.0 // (mm/s)
-    #define _MMU3_VERIFY_LOAD_TO_NOZZLE_TWEAK    -5.0 // (mm) Amount to adjust the length for verifying load-to-nozzle
-
-    // The first thing the MMU does is initialize its axis.
-    // Meanwhile the E-motor will unload 20mm of filament in about 1 second.
-    #define MMU3_RETRY_UNLOAD_TO_FINDA_LENGTH    80.0 // (mm)
-    #define MMU3_RETRY_UNLOAD_TO_FINDA_FEED_RATE 80.0 // (mm/s)
-
-    // After loading a new filament, the printer will extrude this length of filament
-    // then retract to the original position. This is used to check if the filament sensor
-    // reading flickers or filament is jammed.
-    #define _MMU_EXTRUDER_PTFE_LENGTH            42.3 // (mm)
-    #define _MMU_EXTRUDER_HEATBREAK_LENGTH       17.7 // (mm)
-    #define MMU3_CHECK_FILAMENT_PRESENCE_EXTRUSION_LENGTH (MMU3_FILAMENT_SENSOR_E_POSITION + _MMU_EXTRUDER_PTFE_LENGTH + _MMU_EXTRUDER_HEATBREAK_LENGTH + _MMU3_VERIFY_LOAD_TO_NOZZLE_TWEAK) // (mm)
+  #else
 
     /**
-     * SpoolJoin Consumes All Filament -- EXPERIMENTAL
-     *
-     * SpoolJoin normally triggers when FINDA sensor untriggers while printing.
-     * This is the default behaviour and it doesn't consume all the filament
-     * before triggering a filament change. This leaves some filament in the
-     * current slot and before switching to the next slot it is unloaded.
-     *
-     * Enabling this option will trigger the filament change when both FINDA
-     * and Filament Runout Sensor triggers during the print and it allows the
-     * filament in the current slot to be completely consumed before doing the
-     * filament change. But this can cause problems as a little bit of filament
-     * will be left between the extruder gears (thinking that the filament
-     * sensor is triggered through the gears) and the end of the PTFE tube and
-     * can cause filament load issues.
-     */
-    //#define MMU3_SPOOL_JOIN_CONSUMES_ALL_FILAMENT
-
-    // MMU3 sequences use mm/sec. Not compatible with MMU2 which use mm/min.
-    #define MMU3_LOAD_TO_NOZZLE_SEQUENCE \
-      { _MMU_EXTRUDER_PTFE_LENGTH,      MMM_TO_MMS(810) }, /* (13.5 mm/s) Fast load ahead of heatbreak */ \
-      { _MMU_EXTRUDER_HEATBREAK_LENGTH, MMM_TO_MMS(198) }  /* ( 3.3 mm/s) Slow load after heatbreak */
-
-    #define MMU3_RAMMING_SEQUENCE \
-      { 0.2816,  MMM_TO_MMS(1339.0) }, \
-      { 0.3051,  MMM_TO_MMS(1451.0) }, \
-      { 0.3453,  MMM_TO_MMS(1642.0) }, \
-      { 0.3990,  MMM_TO_MMS(1897.0) }, \
-      { 0.4761,  MMM_TO_MMS(2264.0) }, \
-      { 0.5767,  MMM_TO_MMS(2742.0) }, \
-      { 0.5691,  MMM_TO_MMS(3220.0) }, \
-      { 0.1081,  MMM_TO_MMS(3220.0) }, \
-      { 0.7644,  MMM_TO_MMS(3635.0) }, \
-      { 0.8248,  MMM_TO_MMS(3921.0) }, \
-      { 0.8483,  MMM_TO_MMS(4033.0) }, \
-      { -15.0,   MMM_TO_MMS(6000.0) }, \
-      { -24.5,   MMM_TO_MMS(1200.0) }, \
-      {  -7.0,   MMM_TO_MMS( 600.0) }, \
-      {  -3.5,   MMM_TO_MMS( 360.0) }, \
-      {  20.0,   MMM_TO_MMS( 454.0) }, \
-      { -20.0,   MMM_TO_MMS( 303.0) }, \
-      { -35.0,   MMM_TO_MMS(2000.0) }
-
-  #else // MMU2 (not MMU2S)
-
-    /**
-     * MMU2 Extruder Sensor
+     * MMU1 Extruder Sensor
      *
      * Support for a Průša (or other) IR Sensor to detect filament near the extruder
      * and make loading more reliable. Suitable for an extruder equipped with a filament
@@ -4585,14 +4455,16 @@
      * move up to the gears. If no filament is detected, the MMU2 can make some more attempts.
      * If all attempts fail, a filament runout will be triggered.
      */
-    //#define MMU2_EXTRUDER_SENSOR
-    #if ENABLED(MMU2_EXTRUDER_SENSOR)
-      #define MMU2_LOADING_ATTEMPTS_NR 5  // Number of times to try loading filament before failure
+    //#define MMU_EXTRUDER_SENSOR
+    #if ENABLED(MMU_EXTRUDER_SENSOR)
+      #define MMU_LOADING_ATTEMPTS_NR 5 // max. number of attempts to load filament if first load fail
     #endif
 
   #endif
 
-#endif // HAS_PRUSA_MMU2 || HAS_PRUSA_MMU3
+  //#define MMU2_DEBUG  // Write debug info to serial output
+
+#endif // HAS_PRUSA_MMU2
 
 /**
  * Advanced Print Counter settings

Marlin/Makefile

@@ -187,17 +187,6 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1033)
 # RAMPS Plus 3DYMY (Power outputs: Spindle, Controller Fan)
 else ifeq ($(HARDWARE_MOTHERBOARD),1034)
 
-# RAMPS 1.6+ (Power outputs: Hotend, Fan, Bed)
-else ifeq ($(HARDWARE_MOTHERBOARD),1035)
-# RAMPS 1.6+ (Power outputs: Hotend0, Hotend1, Bed)
-else ifeq ($(HARDWARE_MOTHERBOARD),1036)
-# RAMPS 1.6+ (Power outputs: Hotend, Fan0, Fan1)
-else ifeq ($(HARDWARE_MOTHERBOARD),1037)
-# RAMPS 1.6+ (Power outputs: Hotend0, Hotend1, Fan)
-else ifeq ($(HARDWARE_MOTHERBOARD),1038)
-# RAMPS 1.6+ (Power outputs: Spindle, Controller Fan)
-else ifeq ($(HARDWARE_MOTHERBOARD),1039)
-
 #
 # RAMPS Derivatives - ATmega1280, ATmega2560
 #
@@ -232,113 +221,108 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1112)
 else ifeq ($(HARDWARE_MOTHERBOARD),1113)
 # BigTreeTech or BIQU KFB2.0
 else ifeq ($(HARDWARE_MOTHERBOARD),1114)
-# Zonestar zrib V2.0 (Chinese RAMPS replica)
+# zrib V2.0 (Chinese RAMPS replica)
 else ifeq ($(HARDWARE_MOTHERBOARD),1115)
-# Zonestar zrib V5.2 (Chinese RAMPS replica)
+# zrib V5.2 (Chinese RAMPS replica)
 else ifeq ($(HARDWARE_MOTHERBOARD),1116)
-# Zonestar zrib V5.3 (Chinese RAMPS replica)
-else ifeq ($(HARDWARE_MOTHERBOARD),1117)
 # Felix 2.0+ Electronics Board (RAMPS like)
-else ifeq ($(HARDWARE_MOTHERBOARD),1118)
+else ifeq ($(HARDWARE_MOTHERBOARD),1117)
 # Invent-A-Part RigidBoard
-else ifeq ($(HARDWARE_MOTHERBOARD),1119)
+else ifeq ($(HARDWARE_MOTHERBOARD),1118)
 # Invent-A-Part RigidBoard V2
-else ifeq ($(HARDWARE_MOTHERBOARD),1120)
+else ifeq ($(HARDWARE_MOTHERBOARD),1119)
 # Sainsmart 2-in-1 board
-else ifeq ($(HARDWARE_MOTHERBOARD),1121)
+else ifeq ($(HARDWARE_MOTHERBOARD),1120)
 # Ultimaker
-else ifeq ($(HARDWARE_MOTHERBOARD),1122)
+else ifeq ($(HARDWARE_MOTHERBOARD),1121)
 # Ultimaker (Older electronics. Pre 1.5.4. This is rare)
-else ifeq ($(HARDWARE_MOTHERBOARD),1123)
+else ifeq ($(HARDWARE_MOTHERBOARD),1122)
   MCU              ?= atmega1280
   PROG_MCU         ?= m1280
 # Azteeg X3
-else ifeq ($(HARDWARE_MOTHERBOARD),1124)
+else ifeq ($(HARDWARE_MOTHERBOARD),1123)
 # Azteeg X3 Pro
-else ifeq ($(HARDWARE_MOTHERBOARD),1125)
+else ifeq ($(HARDWARE_MOTHERBOARD),1124)
 # Ultimainboard 2.x (Uses TEMP_SENSOR 20)
-else ifeq ($(HARDWARE_MOTHERBOARD),1126)
+else ifeq ($(HARDWARE_MOTHERBOARD),1125)
 # Rumba
-else ifeq ($(HARDWARE_MOTHERBOARD),1127)
+else ifeq ($(HARDWARE_MOTHERBOARD),1126)
 # Raise3D N series Rumba derivative
-else ifeq ($(HARDWARE_MOTHERBOARD),1128)
+else ifeq ($(HARDWARE_MOTHERBOARD),1127)
 # Rapide Lite 200 (v1, low-cost RUMBA clone with drv)
-else ifeq ($(HARDWARE_MOTHERBOARD),1129)
+else ifeq ($(HARDWARE_MOTHERBOARD),1128)
 # Formbot T-Rex 2 Plus
-else ifeq ($(HARDWARE_MOTHERBOARD),1130)
+else ifeq ($(HARDWARE_MOTHERBOARD),1129)
 # Formbot T-Rex 3
-else ifeq ($(HARDWARE_MOTHERBOARD),1131)
+else ifeq ($(HARDWARE_MOTHERBOARD),1130)
 # Formbot Raptor
-else ifeq ($(HARDWARE_MOTHERBOARD),1132)
+else ifeq ($(HARDWARE_MOTHERBOARD),1131)
 # Formbot Raptor 2
-else ifeq ($(HARDWARE_MOTHERBOARD),1133)
+else ifeq ($(HARDWARE_MOTHERBOARD),1132)
 # bq ZUM Mega 3D
-else ifeq ($(HARDWARE_MOTHERBOARD),1134)
+else ifeq ($(HARDWARE_MOTHERBOARD),1133)
 # MakeBoard Mini v2.1.2 by MicroMake
-else ifeq ($(HARDWARE_MOTHERBOARD),1135)
+else ifeq ($(HARDWARE_MOTHERBOARD),1134)
 # TriGorilla Anycubic version 1.3-based on RAMPS EFB
-else ifeq ($(HARDWARE_MOTHERBOARD),1136)
+else ifeq ($(HARDWARE_MOTHERBOARD),1135)
 #   ... Ver 1.4
-else ifeq ($(HARDWARE_MOTHERBOARD),1137)
+else ifeq ($(HARDWARE_MOTHERBOARD),1136)
 #   ... Rev 1.1 (new servo pin order)
-else ifeq ($(HARDWARE_MOTHERBOARD),1138)
+else ifeq ($(HARDWARE_MOTHERBOARD),1137)
 # Creality: Ender-4, CR-8
-else ifeq ($(HARDWARE_MOTHERBOARD),1139)
+else ifeq ($(HARDWARE_MOTHERBOARD),1138)
 # Creality: CR10S, CR20, CR-X
-else ifeq ($(HARDWARE_MOTHERBOARD),1140)
+else ifeq ($(HARDWARE_MOTHERBOARD),1139)
 # Dagoma F5
-else ifeq ($(HARDWARE_MOTHERBOARD),1141)
-# Dagoma D6 (as found in the Dagoma DiscoUltimate V2 TMC)
-else ifeq ($(HARDWARE_MOTHERBOARD),1142)
+else ifeq ($(HARDWARE_MOTHERBOARD),1140)
 # FYSETC F6 1.3
-else ifeq ($(HARDWARE_MOTHERBOARD),1143)
+else ifeq ($(HARDWARE_MOTHERBOARD),1141)
 # FYSETC F6 1.4
-else ifeq ($(HARDWARE_MOTHERBOARD),1144)
+else ifeq ($(HARDWARE_MOTHERBOARD),1142)
 # Wanhao Duplicator i3 Plus
-else ifeq ($(HARDWARE_MOTHERBOARD),1145)
+else ifeq ($(HARDWARE_MOTHERBOARD),1143)
 # VORON Design
-else ifeq ($(HARDWARE_MOTHERBOARD),1146)
+else ifeq ($(HARDWARE_MOTHERBOARD),1144)
 # Tronxy TRONXY-V3-1.0
-else ifeq ($(HARDWARE_MOTHERBOARD),1147)
+else ifeq ($(HARDWARE_MOTHERBOARD),1145)
 # Z-Bolt X Series
-else ifeq ($(HARDWARE_MOTHERBOARD),1148)
+else ifeq ($(HARDWARE_MOTHERBOARD),1146)
 # TT OSCAR
+else ifeq ($(HARDWARE_MOTHERBOARD),1147)
+# Overlord/Overlord Pro
+else ifeq ($(HARDWARE_MOTHERBOARD),1148)
+# ADIMLab Gantry v1
 else ifeq ($(HARDWARE_MOTHERBOARD),1149)
-# BIQU Tango V1
+# ADIMLab Gantry v2
 else ifeq ($(HARDWARE_MOTHERBOARD),1150)
-# MKS GEN L V2
+# BIQU Tango V1
 else ifeq ($(HARDWARE_MOTHERBOARD),1151)
-# MKS GEN L V2.1
+# MKS GEN L V2
 else ifeq ($(HARDWARE_MOTHERBOARD),1152)
-# Copymaster 3D
+# MKS GEN L V2.1
 else ifeq ($(HARDWARE_MOTHERBOARD),1153)
-# Ortur 4
+# Copymaster 3D
 else ifeq ($(HARDWARE_MOTHERBOARD),1154)
-# Tenlog D3 Hero IDEX printer
+# Ortur 4
 else ifeq ($(HARDWARE_MOTHERBOARD),1155)
-# Tenlog D3, D5, D6 IDEX Printer
+# Tenlog D3 Hero IDEX printer
 else ifeq ($(HARDWARE_MOTHERBOARD),1156)
-# Ramps S 1.2 by Sakul.cz (Power outputs: Hotend0, Hotend1, Fan, Bed)
+# Tenlog D3,5,6 Pro IDEX printers
 else ifeq ($(HARDWARE_MOTHERBOARD),1157)
-# Ramps S 1.2 by Sakul.cz (Power outputs: Hotend0, Hotend1, Hotend2, Bed)
+# Ramps S 1.2 by Sakul.cz (Power outputs: Hotend0, Hotend1, Fan, Bed)
 else ifeq ($(HARDWARE_MOTHERBOARD),1158)
-# Ramps S 1.2 by Sakul.cz (Power outputs: Hotend, Fan0, Fan1, Bed)
+# Ramps S 1.2 by Sakul.cz (Power outputs: Hotend0, Hotend1, Hotend2, Bed)
 else ifeq ($(HARDWARE_MOTHERBOARD),1159)
-# Longer LK1 PRO / Alfawise U20 Pro (PRO version)
+# Ramps S 1.2 by Sakul.cz (Power outputs: Hotend, Fan0, Fan1, Bed)
 else ifeq ($(HARDWARE_MOTHERBOARD),1160)
-# Longer LKx PRO / Alfawise Uxx Pro (PRO version)
+# Longer LK1 PRO / Alfawise U20 Pro (PRO version)
 else ifeq ($(HARDWARE_MOTHERBOARD),1161)
-# Pxmalion Core I3
+# Longer LKx PRO / Alfawise Uxx Pro (PRO version)
 else ifeq ($(HARDWARE_MOTHERBOARD),1162)
-# Panowin Cutlass (as found in the Panowin F1)
+# Zonestar zrib V5.3 (Chinese RAMPS replica)
 else ifeq ($(HARDWARE_MOTHERBOARD),1163)
-# Kodama Bardo V1.x (as found in the Kodama Trinus)
+# Pxmalion Core I3
 else ifeq ($(HARDWARE_MOTHERBOARD),1164)
-# XTLW MFF V1.0
-else ifeq ($(HARDWARE_MOTHERBOARD),1165)
-# XTLW MFF V2.0
-else ifeq ($(HARDWARE_MOTHERBOARD),1166)
-
 
 #
 # RAMBo and derivatives
@@ -356,7 +340,7 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1203)
 else ifeq ($(HARDWARE_MOTHERBOARD),1204)
 # abee Scoovo X9H
 else ifeq ($(HARDWARE_MOTHERBOARD),1205)
-# ThinkerV2
+# Rambo ThinkerV2
 else ifeq ($(HARDWARE_MOTHERBOARD),1206)
 
 #
@@ -399,40 +383,30 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1315)
 else ifeq ($(HARDWARE_MOTHERBOARD),1316)
 # Geeetech GT2560 Rev B for A10(M/T/D)
 else ifeq ($(HARDWARE_MOTHERBOARD),1317)
-# Geeetech GT2560 Rev B for Mecreator2
-else ifeq ($(HARDWARE_MOTHERBOARD),1318)
-# Geeetech GT2560 Rev B for A20(M/T/D)
-else ifeq ($(HARDWARE_MOTHERBOARD),1319)
 # Geeetech GT2560 Rev B for A10(M/T/D)
-else ifeq ($(HARDWARE_MOTHERBOARD),1320)
+else ifeq ($(HARDWARE_MOTHERBOARD),1318)
+# Geeetech GT2560 Rev B for Mecreator2
+else ifeq ($(HARDWARE_MOTHERBOARD),1319)
 # Geeetech GT2560 Rev B for A20(M/T/D)
-else ifeq ($(HARDWARE_MOTHERBOARD),1321)
+else ifeq ($(HARDWARE_MOTHERBOARD),1320)
 # Einstart retrofit
-else ifeq ($(HARDWARE_MOTHERBOARD),1322)
+else ifeq ($(HARDWARE_MOTHERBOARD),1321)
 # Wanhao 0ne+ i3 Mini
-else ifeq ($(HARDWARE_MOTHERBOARD),1323)
-# Overlord/Overlord Pro
-else ifeq ($(HARDWARE_MOTHERBOARD),1324)
-# ADIMLab Gantry v1
-else ifeq ($(HARDWARE_MOTHERBOARD),1325)
-# ADIMLab Gantry v2
-else ifeq ($(HARDWARE_MOTHERBOARD),1326)
+else ifeq ($(HARDWARE_MOTHERBOARD),1322)
 # Leapfrog Xeed 2015
-else ifeq ($(HARDWARE_MOTHERBOARD),1327)
+else ifeq ($(HARDWARE_MOTHERBOARD),1323)
 # PICA Shield (original version)
-else ifeq ($(HARDWARE_MOTHERBOARD),1328)
+else ifeq ($(HARDWARE_MOTHERBOARD),1324)
 # PICA Shield (rev C or later)
-else ifeq ($(HARDWARE_MOTHERBOARD),1329)
+else ifeq ($(HARDWARE_MOTHERBOARD),1325)
 # Intamsys 4.0 (Funmat HT)
-else ifeq ($(HARDWARE_MOTHERBOARD),1330)
+else ifeq ($(HARDWARE_MOTHERBOARD),1326)
 # Malyan M180 Mainboard Version 2 (no display function, direct G-code only)
-else ifeq ($(HARDWARE_MOTHERBOARD),1331)
+else ifeq ($(HARDWARE_MOTHERBOARD),1327)
+# Geeetech GT2560 Rev B for A20(M/T/D)
+else ifeq ($(HARDWARE_MOTHERBOARD),1328)
 # Mega controller & Protoneer CNC Shield V3.00
-else ifeq ($(HARDWARE_MOTHERBOARD),1332)
-# WEEDO 62A board (TINA2, Monoprice Cadet, etc.)
-else ifeq ($(HARDWARE_MOTHERBOARD),1333)
-# Geeetech GT2560 V4.1B for A10(M/T/D)
-else ifeq ($(HARDWARE_MOTHERBOARD),1334)
+else ifeq ($(HARDWARE_MOTHERBOARD),1329)
 
 #
 # ATmega1281, ATmega2561
@@ -466,7 +440,7 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1502)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega644p
   PROG_MCU         ?= m644p
-# Melzi V2
+# Melzi V2.0
 else ifeq ($(HARDWARE_MOTHERBOARD),1503)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega1284p
@@ -476,38 +450,33 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1504)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega1284p
   PROG_MCU         ?= m1284p
-# Melzi Creality3D (for CR-10 etc)
+# Melzi Creality3D board (for CR-10 etc)
 else ifeq ($(HARDWARE_MOTHERBOARD),1505)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega1284p
   PROG_MCU         ?= m1284p
-# Melzi Creality3D (for Ender-2)
+# Melzi Malyan M150 board
 else ifeq ($(HARDWARE_MOTHERBOARD),1506)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega1284p
   PROG_MCU         ?= m1284p
-# Melzi Malyan M150
+# Tronxy X5S
 else ifeq ($(HARDWARE_MOTHERBOARD),1507)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega1284p
   PROG_MCU         ?= m1284p
-# Tronxy X5S
+# STB V1.1
 else ifeq ($(HARDWARE_MOTHERBOARD),1508)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega1284p
   PROG_MCU         ?= m1284p
-# STB V1.1
+# Azteeg X1
 else ifeq ($(HARDWARE_MOTHERBOARD),1509)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega1284p
   PROG_MCU         ?= m1284p
-# Azteeg X1
-else ifeq ($(HARDWARE_MOTHERBOARD),1510)
-  HARDWARE_VARIANT ?= Sanguino
-  MCU              ?= atmega1284p
-  PROG_MCU         ?= m1284p
 # Anet 1.0 (Melzi clone)
-else ifeq ($(HARDWARE_MOTHERBOARD),1511)
+else ifeq ($(HARDWARE_MOTHERBOARD),1510)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega1284p
   PROG_MCU         ?= m1284p

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

Marlin/src/HAL/AVR/HAL.h

@@ -129,11 +129,11 @@ typedef Servo hal_servo_t;
   #endif
 #endif
 
-#ifdef MMU_SERIAL_PORT
-  #if !WITHIN(MMU_SERIAL_PORT, 0, 3)
-    #error "MMU_SERIAL_PORT must be from 0 to 3"
+#ifdef MMU2_SERIAL_PORT
+  #if !WITHIN(MMU2_SERIAL_PORT, 0, 3)
+    #error "MMU2_SERIAL_PORT must be from 0 to 3"
   #endif
-  #define MMU_SERIAL mmuSerial
+  #define MMU2_SERIAL mmuSerial
 #endif
 
 #ifdef LCD_SERIAL_PORT

Marlin/src/HAL/AVR/MarlinSerial.cpp

@@ -601,20 +601,20 @@ MSerialT1 customizedSerial1(MSerialT1::HasEmergencyParser);
 
 #endif // SERIAL_PORT_3
 
-#ifdef MMU_SERIAL_PORT
+#ifdef MMU2_SERIAL_PORT
 
-  ISR(SERIAL_REGNAME(USART, MMU_SERIAL_PORT, _RX_vect)) {
-    MarlinSerial<MMU2SerialCfg<MMU_SERIAL_PORT>>::store_rxd_char();
+  ISR(SERIAL_REGNAME(USART, MMU2_SERIAL_PORT, _RX_vect)) {
+    MarlinSerial<MMU2SerialCfg<MMU2_SERIAL_PORT>>::store_rxd_char();
   }
 
-  ISR(SERIAL_REGNAME(USART, MMU_SERIAL_PORT, _UDRE_vect)) {
-    MarlinSerial<MMU2SerialCfg<MMU_SERIAL_PORT>>::_tx_udr_empty_irq();
+  ISR(SERIAL_REGNAME(USART, MMU2_SERIAL_PORT, _UDRE_vect)) {
+    MarlinSerial<MMU2SerialCfg<MMU2_SERIAL_PORT>>::_tx_udr_empty_irq();
   }
 
-  template class MarlinSerial< MMU2SerialCfg<MMU_SERIAL_PORT> >;
+  template class MarlinSerial< MMU2SerialCfg<MMU2_SERIAL_PORT> >;
   MSerialMMU2 mmuSerial(MSerialMMU2::HasEmergencyParser);
 
-#endif // MMU_SERIAL_PORT
+#endif // MMU2_SERIAL_PORT
 
 #ifdef LCD_SERIAL_PORT
 

Marlin/src/HAL/AVR/MarlinSerial.h

@@ -246,7 +246,7 @@
 
 #endif // !USBCON
 
-#ifdef MMU_SERIAL_PORT
+#ifdef MMU2_SERIAL_PORT
   template <uint8_t serial>
   struct MMU2SerialCfg {
     static constexpr int PORT               = serial;
@@ -260,7 +260,7 @@
     static constexpr bool RX_OVERRUNS       = false;
   };
 
-  typedef Serial1Class< MarlinSerial< MMU2SerialCfg<MMU_SERIAL_PORT> > > MSerialMMU2;
+  typedef Serial1Class< MarlinSerial< MMU2SerialCfg<MMU2_SERIAL_PORT> > > MSerialMMU2;
   extern MSerialMMU2 mmuSerial;
 #endif
 

Marlin/src/HAL/AVR/fastio/fastio_AT90USB.h

@@ -26,7 +26,7 @@
  *
  *   Logical Pin: 28 29 30 31 32 33 34 35 20 21 22 23 24 25 26 27 10 11 12 13 14 15 16 17 00 01 02 03 04 05 06 07 08 09(46*47)36 37 18 19 38 39 40 41 42 43 44 45
  *   Port:        A0 A1 A2 A3 A4 A5 A6 A7 B0 B1 B2 B3 B4 B5 B6 B7 C0 C1 C2 C3 C4 C5 C6 C7 D0 D1 D2 D3 D4 D5 D6 D7 E0 E1 E2 E3 E4 E5 E6 E7 F0 F1 F2 F3 F4 F5 F6 F7
- *            Logical pins 46-47 aren't supported by Teensyduino, but are supported below as E2 and E3
+ *            The logical pins 46 and 47 are not supported by Teensyduino, but are supported below as E2 and E3
  */
 
 #include "../fastio.h"

Marlin/src/HAL/AVR/pinsDebug.h

@@ -42,7 +42,7 @@
   #define digitalPinToTimer_DEBUG(p) digitalPinToTimer(p)
   #define digitalPinToBitMask_DEBUG(p) digitalPinToBitMask(p)
   #define digitalPinToPort_DEBUG(p) digitalPinToPort(p)
-  #define getValidPinMode(pin) (*portModeRegister(pin) & digitalPinToBitMask_DEBUG(pin))
+  #define GET_PINMODE(pin) (*portModeRegister(pin) & digitalPinToBitMask_DEBUG(pin))
 
 #elif AVR_ATmega2560_FAMILY_PLUS_70   // So we can access/display all the pins on boards using more than 70
 
@@ -50,32 +50,32 @@
   #define digitalPinToTimer_DEBUG(p) digitalPinToTimer_plus_70(p)
   #define digitalPinToBitMask_DEBUG(p) digitalPinToBitMask_plus_70(p)
   #define digitalPinToPort_DEBUG(p) digitalPinToPort_plus_70(p)
-  bool getValidPinMode(pin_t pin) {return *portModeRegister(digitalPinToPort_DEBUG(pin)) & digitalPinToBitMask_DEBUG(pin); }
+  bool GET_PINMODE(int8_t pin) {return *portModeRegister(digitalPinToPort_DEBUG(pin)) & digitalPinToBitMask_DEBUG(pin); }
 
 #else
 
   #define digitalPinToTimer_DEBUG(p) digitalPinToTimer(p)
   #define digitalPinToBitMask_DEBUG(p) digitalPinToBitMask(p)
   #define digitalPinToPort_DEBUG(p) digitalPinToPort(p)
-  bool getValidPinMode(pin_t pin) {return *portModeRegister(digitalPinToPort_DEBUG(pin)) & digitalPinToBitMask_DEBUG(pin); }
-  #define getPinByIndex(p) pgm_read_byte(&pin_array[p].pin)
+  bool GET_PINMODE(int8_t pin) {return *portModeRegister(digitalPinToPort_DEBUG(pin)) & digitalPinToBitMask_DEBUG(pin); }
+  #define GET_ARRAY_PIN(p) pgm_read_byte(&pin_array[p].pin)
 
 #endif
 
-#define isValidPin(pin) (pin >= 0 && pin < NUM_DIGITAL_PINS ? 1 : 0)
+#define VALID_PIN(pin) (pin >= 0 && pin < NUM_DIGITAL_PINS ? 1 : 0)
 #if AVR_ATmega1284_FAMILY
-  #define isAnalogPin(P) WITHIN(P, analogInputToDigitalPin(7), analogInputToDigitalPin(0))
-  #define digitalPinToAnalogIndex(P) int(isAnalogPin(P) ? (P) - analogInputToDigitalPin(7) : -1)
+  #define IS_ANALOG(P) WITHIN(P, analogInputToDigitalPin(7), analogInputToDigitalPin(0))
+  #define DIGITAL_PIN_TO_ANALOG_PIN(P) int(IS_ANALOG(P) ? (P) - analogInputToDigitalPin(7) : -1)
 #else
   #define _ANALOG1(P) WITHIN(P, analogInputToDigitalPin(0), analogInputToDigitalPin(7))
   #define _ANALOG2(P) WITHIN(P, analogInputToDigitalPin(8), analogInputToDigitalPin(15))
-  #define isAnalogPin(P) (_ANALOG1(P) || _ANALOG2(P))
-  #define digitalPinToAnalogIndex(P) int(_ANALOG1(P) ? (P) - analogInputToDigitalPin(0) : _ANALOG2(P) ? (P) - analogInputToDigitalPin(8) + 8 : -1)
+  #define IS_ANALOG(P) (_ANALOG1(P) || _ANALOG2(P))
+  #define DIGITAL_PIN_TO_ANALOG_PIN(P) int(_ANALOG1(P) ? (P) - analogInputToDigitalPin(0) : _ANALOG2(P) ? (P) - analogInputToDigitalPin(8) + 8 : -1)
 #endif
-#define getPinByIndex(p) pgm_read_byte(&pin_array[p].pin)
+#define GET_ARRAY_PIN(p) pgm_read_byte(&pin_array[p].pin)
 #define MULTI_NAME_PAD 26 // space needed to be pretty if not first name assigned to a pin
 
-void printPinNameByIndex(uint8_t x) {
+void PRINT_ARRAY_NAME(uint8_t x) {
   PGM_P const name_mem_pointer = (PGM_P)pgm_read_ptr(&pin_array[x].name);
   for (uint8_t y = 0; y < MAX_NAME_LENGTH; ++y) {
     char temp_char = pgm_read_byte(name_mem_pointer + y);
@@ -88,7 +88,7 @@ void printPinNameByIndex(uint8_t x) {
   }
 }
 
-#define getPinIsDigitalByIndex(x)   pgm_read_byte(&pin_array[x].is_digital)
+#define GET_ARRAY_IS_DIGITAL(x)   pgm_read_byte(&pin_array[x].is_digital)
 
 #if defined(__AVR_ATmega1284P__)  // 1284 IDE extensions set this to the number of
   #undef NUM_DIGITAL_PINS         // digital only pins while all other CPUs have it
@@ -276,7 +276,7 @@ void timer_prefix(uint8_t T, char L, uint8_t N) {  // T - timer    L - pwm  N -
   if (TEST(*TMSK, TOIE)) err_prob_interrupt();
 }
 
-void printPinPWM(uint8_t pin) {
+void pwm_details(uint8_t pin) {
   switch (digitalPinToTimer_DEBUG(pin)) {
 
     #if ABTEST(0)
@@ -347,7 +347,7 @@ void printPinPWM(uint8_t pin) {
   #else
     UNUSED(print_is_also_tied);
   #endif
-} // printPinPWM
+} // pwm_details
 
 #ifndef digitalRead_mod                   // Use Teensyduino's version of digitalRead - it doesn't disable the PWMs
   int digitalRead_mod(const pin_t pin) {  // same as digitalRead except the PWM stop section has been removed
@@ -356,7 +356,7 @@ void printPinPWM(uint8_t pin) {
   }
 #endif
 
-void printPinPort(const pin_t pin) {   // print port number
+void print_port(const pin_t pin) {   // print port number
   #ifdef digitalPinToPort_DEBUG
     uint8_t x;
     SERIAL_ECHOPGM("  Port: ");
@@ -386,7 +386,7 @@ void printPinPort(const pin_t pin) {   // print port number
   #endif
 }
 
-#define printPinNumber(p) do{ sprintf_P(buffer, PSTR("%3d "), p); SERIAL_ECHO(buffer); }while(0)
-#define printPinAnalog(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), digitalPinToAnalogIndex(pin)); SERIAL_ECHO(buffer); }while(0)
+#define PRINT_PIN(p) do{ sprintf_P(buffer, PSTR("%3d "), p); SERIAL_ECHO(buffer); }while(0)
+#define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); SERIAL_ECHO(buffer); }while(0)
 
 #undef ABTEST

Marlin/src/HAL/DUE/HAL.h

@@ -81,11 +81,11 @@ extern DefaultSerial4 MSerial3;
   #endif
 #endif
 
-#ifdef MMU_SERIAL_PORT
-  #if WITHIN(MMU_SERIAL_PORT, 0, 3)
-    #define MMU_SERIAL MSERIAL(MMU_SERIAL_PORT)
+#ifdef MMU2_SERIAL_PORT
+  #if WITHIN(MMU2_SERIAL_PORT, 0, 3)
+    #define MMU2_SERIAL MSERIAL(MMU2_SERIAL_PORT)
   #else
-    #error "MMU_SERIAL_PORT must be from 0 to 3."
+    #error "MMU2_SERIAL_PORT must be from 0 to 3."
   #endif
 #endif
 
@@ -127,7 +127,7 @@ typedef Servo hal_servo_t;
 #define HAL_ADC_RESOLUTION  10
 
 #ifndef analogInputToDigitalPin
-  #define analogInputToDigitalPin(p) pin_t((p < 12U) ? (p) + 54U : -1)
+  #define analogInputToDigitalPin(p) ((p < 12U) ? (p) + 54U : -1)
 #endif
 
 //

Marlin/src/HAL/DUE/Servo.cpp

@@ -50,7 +50,7 @@
 static Flags<_Nbr_16timers> DisablePending; // ISR should disable the timer at the next timer reset
 
 // ------------------------
-// Interrupt handler for the TC0 channel 1.
+/// Interrupt handler for the TC0 channel 1.
 // ------------------------
 void Servo_Handler(const timer16_Sequence_t, Tc*, const uint8_t);
 

Marlin/src/HAL/DUE/pinsDebug.h

@@ -64,19 +64,19 @@
 #define NUMBER_PINS_TOTAL PINS_COUNT
 
 #define digitalRead_mod(p) extDigitalRead(p)  // AVR digitalRead disabled PWM before it read the pin
-#define printPinNameByIndex(x) do{ sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); SERIAL_ECHO(buffer); }while(0)
-#define printPinNumber(p) do{ sprintf_P(buffer, PSTR("%02d"), p); SERIAL_ECHO(buffer); }while(0)
-#define printPinAnalog(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), digitalPinToAnalogIndex(pin)); SERIAL_ECHO(buffer); }while(0)
-#define getPinByIndex(p) pin_array[p].pin
-#define getPinIsDigitalByIndex(p) pin_array[p].is_digital
-#define isValidPin(pin) (pin >= 0 && pin < int8_t(NUMBER_PINS_TOTAL))
-#define digitalPinToAnalogIndex(p) int(p - analogInputToDigitalPin(0))
-#define isAnalogPin(P) WITHIN(P, pin_t(analogInputToDigitalPin(0)), pin_t(analogInputToDigitalPin(NUM_ANALOG_INPUTS - 1)))
+#define PRINT_ARRAY_NAME(x) do{ sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); SERIAL_ECHO(buffer); }while(0)
+#define PRINT_PIN(p) do{ sprintf_P(buffer, PSTR("%02d"), p); SERIAL_ECHO(buffer); }while(0)
+#define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); SERIAL_ECHO(buffer); }while(0)
+#define GET_ARRAY_PIN(p) pin_array[p].pin
+#define GET_ARRAY_IS_DIGITAL(p) pin_array[p].is_digital
+#define VALID_PIN(pin) (pin >= 0 && pin < int8_t(NUMBER_PINS_TOTAL))
+#define DIGITAL_PIN_TO_ANALOG_PIN(p) int(p - analogInputToDigitalPin(0))
+#define IS_ANALOG(P) WITHIN(P, char(analogInputToDigitalPin(0)), char(analogInputToDigitalPin(NUM_ANALOG_INPUTS - 1)))
 #define pwm_status(pin) (((g_pinStatus[pin] & 0xF) == PIN_STATUS_PWM) && \
                         ((g_APinDescription[pin].ulPinAttribute & PIN_ATTR_PWM) == PIN_ATTR_PWM))
 #define MULTI_NAME_PAD 14 // space needed to be pretty if not first name assigned to a pin
 
-bool getValidPinMode(int8_t pin) {  // 1: output, 0: input
+bool GET_PINMODE(int8_t pin) {  // 1: output, 0: input
   volatile Pio* port = g_APinDescription[pin].pPort;
   uint32_t mask = g_APinDescription[pin].ulPin;
   uint8_t pin_status = g_pinStatus[pin] & 0xF;
@@ -85,14 +85,14 @@ bool getValidPinMode(int8_t pin) {  // 1: output, 0: input
           || pwm_status(pin));
 }
 
-void printPinPWM(int32_t pin) {
+void pwm_details(int32_t pin) {
   if (pwm_status(pin)) {
     uint32_t chan = g_APinDescription[pin].ulPWMChannel;
     SERIAL_ECHOPGM("PWM = ", PWM_INTERFACE->PWM_CH_NUM[chan].PWM_CDTY);
   }
 }
 
-void printPinPort(const pin_t) {}
+void print_port(const pin_t) {}
 
 /**
  * DUE Board pin   |  PORT  | Label

Marlin/src/HAL/DUE/usb/sd_mmc_spi_mem.cpp

@@ -19,7 +19,7 @@ void sd_mmc_spi_mem_init() {
 }
 
 inline bool media_ready() {
-  return IS_SD_MOUNTED() && IS_SD_INSERTED() && !IS_SD_FILE_OPEN() && !IS_SD_PRINTING();
+  return IS_SD_INSERTED() && !IS_SD_PRINTING() && !IS_SD_FILE_OPEN() && card.isMounted();
 }
 
 bool sd_mmc_spi_unload(bool) { return true; }
@@ -32,14 +32,14 @@ Ctrl_status sd_mmc_spi_test_unit_ready() {
   #ifdef DISABLE_DUE_SD_MMC
     return CTRL_NO_PRESENT;
   #endif
-  if (sd_mmc_spi_removal()) return CTRL_NO_PRESENT;
+  if (!media_ready()) return CTRL_NO_PRESENT;
   return CTRL_GOOD;
 }
 
 // NOTE: This function is defined as returning the address of the last block
 // in the card, which is cardSize() - 1
 Ctrl_status sd_mmc_spi_read_capacity(uint32_t *nb_sector) {
-  if (sd_mmc_spi_removal()) return CTRL_NO_PRESENT;
+  if (!media_ready()) return CTRL_NO_PRESENT;
   *nb_sector = card.diskIODriver()->cardSize() - 1;
   return CTRL_GOOD;
 }
@@ -61,7 +61,7 @@ Ctrl_status sd_mmc_spi_usb_read_10(uint32_t addr, uint16_t nb_sector) {
   #ifdef DISABLE_DUE_SD_MMC
     return CTRL_NO_PRESENT;
   #endif
-  if (sd_mmc_spi_removal()) return CTRL_NO_PRESENT;
+  if (!media_ready()) return CTRL_NO_PRESENT;
 
   #ifdef DEBUG_MMC
   {
@@ -100,7 +100,7 @@ Ctrl_status sd_mmc_spi_usb_write_10(uint32_t addr, uint16_t nb_sector) {
   #ifdef DISABLE_DUE_SD_MMC
     return CTRL_NO_PRESENT;
   #endif
-  if (sd_mmc_spi_removal()) return CTRL_NO_PRESENT;
+  if (!media_ready()) return CTRL_NO_PRESENT;
 
   #ifdef DEBUG_MMC
   {

Marlin/src/HAL/ESP32/HAL.cpp

@@ -209,17 +209,16 @@ int MarlinHAL::freeMemory() { return ESP.getFreeHeap(); }
 // ADC
 // ------------------------
 
-// https://docs.espressif.com/projects/esp-idf/en/release-v4.4/esp32/api-reference/peripherals/adc.html
+#define ADC1_CHANNEL(pin) ADC1_GPIO ## pin ## _CHANNEL
+
 adc1_channel_t get_channel(int pin) {
   switch (pin) {
-    case 39: return ADC1_CHANNEL_3;
-    case 36: return ADC1_CHANNEL_0;
-    case 35: return ADC1_CHANNEL_7;
-    case 34: return ADC1_CHANNEL_6;
-    case 33: return ADC1_CHANNEL_5;
-    case 32: return ADC1_CHANNEL_4;
-    case 37: return ADC1_CHANNEL_1;
-    case 38: return ADC1_CHANNEL_2;
+    case 39: return ADC1_CHANNEL(39);
+    case 36: return ADC1_CHANNEL(36);
+    case 35: return ADC1_CHANNEL(35);
+    case 34: return ADC1_CHANNEL(34);
+    case 33: return ADC1_CHANNEL(33);
+    case 32: return ADC1_CHANNEL(32);
   }
   return ADC1_CHANNEL_MAX;
 }

Marlin/src/HAL/ESP32/i2s.cpp

@@ -152,7 +152,7 @@ void stepperTask(void *parameter) {
     xQueueReceive(dma.queue, &dma.current, portMAX_DELAY);
     dma.rw_pos = 0;
 
-    const bool using_ftMotion = TERN0(FT_MOTION, ftMotion.cfg.active);
+    const bool using_ftMotion = TERN0(FT_MOTION, ftMotion.cfg.mode);
 
     while (dma.rw_pos < DMA_SAMPLE_COUNT) {
 

Marlin/src/HAL/ESP32/timers.cpp

@@ -90,7 +90,7 @@ void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
   config.counter_en  = TIMER_PAUSE;
   config.alarm_en    = TIMER_ALARM_EN;
   config.intr_type   = TIMER_INTR_LEVEL;
-  config.auto_reload = TIMER_AUTORELOAD_EN;
+  config.auto_reload = true;
 
   // Select and initialize the timer
   timer_init(timer.group, timer.idx, &config);

Marlin/src/HAL/ESP32/timers.h

@@ -53,11 +53,12 @@ typedef uint64_t hal_timer_t;
 #if ENABLED(I2S_STEPPER_STREAM)
   #define STEPPER_TIMER_PRESCALE     1
   #define STEPPER_TIMER_RATE         250000                           // 250khz, 4µs pulses of i2s word clock
+  #define STEPPER_TIMER_TICKS_PER_US ((STEPPER_TIMER_RATE) / 1000000) // stepper timer ticks per µs // wrong would be 0.25
 #else
   #define STEPPER_TIMER_PRESCALE     40
   #define STEPPER_TIMER_RATE         ((HAL_TIMER_RATE) / (STEPPER_TIMER_PRESCALE)) // frequency of stepper timer, 2MHz
+  #define STEPPER_TIMER_TICKS_PER_US ((STEPPER_TIMER_RATE) / 1000000)              // stepper timer ticks per µs
 #endif
-#define STEPPER_TIMER_TICKS_PER_US   ((STEPPER_TIMER_RATE) / 1000000) // stepper timer ticks per µs
 
 #define STEP_TIMER_MIN_INTERVAL   8 // minimum time in µs between stepper interrupts
 

Marlin/src/HAL/HC32/HAL.h

@@ -114,19 +114,22 @@
 // Misc. Functions
 //
 #ifndef analogInputToDigitalPin
-  #define analogInputToDigitalPin(p) pin_t(p)
+#define analogInputToDigitalPin(p) (p)
 #endif
 
-#define CRITICAL_SECTION_START()        \
-  const bool irqon = !__get_PRIMASK();  \
-  __disable_irq();                      \
-  __DSB();
-#define CRITICAL_SECTION_END()          \
-  __DSB();                              \
-  if (irqon) __enable_irq();
+#define CRITICAL_SECTION_START        \
+  uint32_t primask = __get_PRIMASK(); \
+  (void)__iCliRetVal()
 
-#define cli() __disable_irq()
-#define sei() __enable_irq()
+#define CRITICAL_SECTION_END \
+  if (!primask)              \
+  (void)__iSeiRetVal()
+
+// Disable interrupts
+#define cli() noInterrupts()
+
+// Enable interrupts
+#define sei() interrupts()
 
 // bss_end alias
 #define __bss_end __bss_end__

Marlin/src/HAL/HC32/inc/SanityCheck.h

@@ -94,10 +94,8 @@
     #error "SERIAL_DMA requires USART_RX_DMA_SUPPORT to be enabled in the arduino core."
   #endif
 
-  // Before arduino core version 1.2.0, USART_RX_DMA_SUPPORT did not implement 
-  // core_hook_usart_rx_irq, which is required for the emergency parser.
-  // With 1.2.0, this was fixed (see https://github.com/shadow578/framework-arduino-hc32f46x/pull/25).
-  #if ENABLED(EMERGENCY_PARSER) && ARDUINO_CORE_VERSION_INT < GET_VERSION_INT(1, 2, 0)
+  // USART_RX_DMA_SUPPORT does not implement core_hook_usart_rx_irq, which is required for the emergency parser
+  #if ENABLED(EMERGENCY_PARSER)
     #error "EMERGENCY_PARSER is not supported with SERIAL_DMA. Please disable either SERIAL_DMA or EMERGENCY_PARSER."
   #endif
 

Marlin/src/HAL/HC32/pinsDebug.h

@@ -31,24 +31,24 @@
 
 #define NUM_DIGITAL_PINS BOARD_NR_GPIO_PINS
 #define NUMBER_PINS_TOTAL BOARD_NR_GPIO_PINS
-#define isValidPin(pin) IS_GPIO_PIN(pin)
+#define VALID_PIN(pin) IS_GPIO_PIN(pin)
 
 // Note: pin_array is defined in `Marlin/src/pins/pinsDebug.h`, and since this file is included
 // after it, it is available in this file as well.
-#define getPinByIndex(p) pin_t(pin_array[p].pin)
+#define GET_ARRAY_PIN(p) pin_t(pin_array[p].pin)
 #define digitalRead_mod(p) extDigitalRead(p)
-#define printPinNumber(p)                              \
+#define PRINT_PIN(p)                              \
   do {                                            \
     sprintf_P(buffer, PSTR("%3hd "), int16_t(p)); \
     SERIAL_ECHO(buffer);                          \
   } while (0)
-#define printPinAnalog(p)                                               \
+#define PRINT_PIN_ANALOG(p)                                               \
   do {                                                                    \
-    sprintf_P(buffer, PSTR(" (A%2d)  "), digitalPinToAnalogIndex(pin)); \
+    sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); \
     SERIAL_ECHO(buffer);                                                  \
   } while (0)
-#define PRINT_PORT(p) printPinPort(p)
-#define printPinNameByIndex(x)                                                          \
+#define PRINT_PORT(p) print_port(p)
+#define PRINT_ARRAY_NAME(x)                                                          \
   do {                                                                               \
     sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); \
     SERIAL_ECHO(buffer);                                                             \
@@ -71,14 +71,14 @@
   #define M43_NEVER_TOUCH(Q) (IS_HOST_USART_PIN(Q) || IS_OSC_PIN(Q))
 #endif
 
-static int8_t digitalPinToAnalogIndex(pin_t pin) {
-  if (!isValidPin(pin)) return -1;
+static pin_t DIGITAL_PIN_TO_ANALOG_PIN(pin_t pin) {
+  if (!VALID_PIN(pin)) return -1;
   const int8_t adc_channel = int8_t(PIN_MAP[pin].adc_info.channel);
   return pin_t(adc_channel);
 }
 
-static bool isAnalogPin(pin_t pin) {
-  if (!isValidPin(pin)) return false;
+static bool IS_ANALOG(pin_t pin) {
+  if (!VALID_PIN(pin)) return false;
 
   if (PIN_MAP[pin].adc_info.channel != ADC_PIN_INVALID)
     return _GET_MODE(pin) == INPUT_ANALOG && !M43_NEVER_TOUCH(pin);
@@ -86,13 +86,13 @@ static bool isAnalogPin(pin_t pin) {
   return false;
 }
 
-static bool getValidPinMode(const pin_t pin) {
-  return isValidPin(pin) && !IS_INPUT(pin);
+static bool GET_PINMODE(const pin_t pin) {
+  return VALID_PIN(pin) && !IS_INPUT(pin);
 }
 
-static bool getPinIsDigitalByIndex(const int16_t array_pin) {
-  const pin_t pin = getPinByIndex(array_pin);
-  return (!isAnalogPin(pin));
+static bool GET_ARRAY_IS_DIGITAL(const int16_t array_pin) {
+  const pin_t pin = GET_ARRAY_PIN(array_pin);
+  return (!IS_ANALOG(pin));
 }
 
 /**
@@ -117,7 +117,7 @@ bool pwm_status(const pin_t pin) {
   return timera_is_unit_initialized(unit) && timera_is_channel_active(unit, channel) && getPinMode(pin) == OUTPUT_PWM;
 }
 
-void printPinPWM(const pin_t pin) {
+void pwm_details(const pin_t pin) {
   // Get timer assignment for pin
   timera_config_t *unit;
   en_timera_channel_t channel;
@@ -161,7 +161,7 @@ void printPinPWM(const pin_t pin) {
   }
 }
 
-void printPinPort(pin_t pin) {
+void print_port(pin_t pin) {
   const char port = 'A' + char(pin >> 4); // Pin div 16
   const int16_t gbit = PIN_MAP[pin].bit_pos;
   char buffer[8];

Marlin/src/HAL/HC32/sysclock.cpp

@@ -97,7 +97,7 @@ void core_hook_sysclock_init() {
   #endif
 
   // sysclk is now configured according to F_CPU (i.e., 200MHz PLL output)
-  const uint32_t sysclock = F_CPU;
+  constexpr uint32_t sysclock = F_CPU;
 
   // Setup clock divisors for sysclk = 200 MHz
   // Note: PCLK1 is used for step+temp timers, and need to be kept at 50 MHz (until there is a better solution)

Marlin/src/HAL/LINUX/HAL.cpp

@@ -52,7 +52,7 @@ uint8_t MarlinHAL::active_ch = 0;
 
 uint16_t MarlinHAL::adc_value() {
   const pin_t pin = analogInputToDigitalPin(active_ch);
-  if (!isValidPin(pin)) return 0;
+  if (!VALID_PIN(pin)) return 0;
   return uint16_t((Gpio::get(pin) >> 2) & 0x3FF); // return 10bit value as Marlin expects
 }
 

Marlin/src/HAL/LINUX/arduino.cpp

@@ -49,28 +49,28 @@ extern "C" void delay(const int msec) {
 // IO functions
 // As defined by Arduino INPUT(0x0), OUTPUT(0x1), INPUT_PULLUP(0x2)
 void pinMode(const pin_t pin, const uint8_t mode) {
-  if (!isValidPin(pin)) return;
+  if (!VALID_PIN(pin)) return;
   Gpio::setMode(pin, mode);
 }
 
 void digitalWrite(pin_t pin, uint8_t pin_status) {
-  if (!isValidPin(pin)) return;
+  if (!VALID_PIN(pin)) return;
   Gpio::set(pin, pin_status);
 }
 
 bool digitalRead(pin_t pin) {
-  if (!isValidPin(pin)) return false;
+  if (!VALID_PIN(pin)) return false;
   return Gpio::get(pin);
 }
 
 void analogWrite(pin_t pin, int pwm_value) {  // 1 - 254: pwm_value, 0: LOW, 255: HIGH
-  if (!isValidPin(pin)) return;
+  if (!VALID_PIN(pin)) return;
   Gpio::set(pin, pwm_value);
 }
 
 uint16_t analogRead(pin_t adc_pin) {
-  if (!isValidPin(digitalPinToAnalogIndex(adc_pin))) return 0;
-  return Gpio::get(digitalPinToAnalogIndex(adc_pin));
+  if (!VALID_PIN(DIGITAL_PIN_TO_ANALOG_PIN(adc_pin))) return 0;
+  return Gpio::get(DIGITAL_PIN_TO_ANALOG_PIN(adc_pin));
 }
 
 char *dtostrf(double __val, signed char __width, unsigned char __prec, char *__s) {

Marlin/src/HAL/LINUX/include/pinmapping.h

@@ -42,7 +42,7 @@ constexpr pin_t analogInputToDigitalPin(const int8_t p) {
 }
 
 // Get the analog index for a digital pin
-constexpr int8_t digitalPinToAnalogIndex(const pin_t p) {
+constexpr int8_t DIGITAL_PIN_TO_ANALOG_PIN(const pin_t p) {
   return (WITHIN(p, analog_offset, NUM_DIGITAL_PINS) ? p - analog_offset : P_NC);
 }
 
@@ -50,7 +50,7 @@ constexpr int8_t digitalPinToAnalogIndex(const pin_t p) {
 constexpr int16_t GET_PIN_MAP_INDEX(const pin_t pin) { return pin; }
 
 // Test whether the pin is valid
-constexpr bool isValidPin(const pin_t p) { return WITHIN(p, 0, NUM_DIGITAL_PINS); }
+constexpr bool VALID_PIN(const pin_t p) { return WITHIN(p, 0, NUM_DIGITAL_PINS); }
 
 // Test whether the pin is PWM
 constexpr bool PWM_PIN(const pin_t p) { return false; }

Marlin/src/HAL/LINUX/pinsDebug.h

@@ -29,20 +29,20 @@
  */
 
 #define NUMBER_PINS_TOTAL   NUM_DIGITAL_PINS
-#define isAnalogPin(P)        (digitalPinToAnalogIndex(P) >= 0 ? 1 : 0)
+#define IS_ANALOG(P)        (DIGITAL_PIN_TO_ANALOG_PIN(P) >= 0 ? 1 : 0)
 #define digitalRead_mod(p)  digitalRead(p)
-#define getPinByIndex(p)    pin_array[p].pin
-#define printPinNameByIndex(x) do{ sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); SERIAL_ECHO(buffer); }while(0)
-#define printPinNumber(p)        do{ sprintf_P(buffer, PSTR("%3d "), p); SERIAL_ECHO(buffer); }while(0)
-#define printPinAnalog(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), digitalPinToAnalogIndex(pin)); SERIAL_ECHO(buffer); }while(0)
+#define GET_ARRAY_PIN(p)    pin_array[p].pin
+#define PRINT_ARRAY_NAME(x) do{ sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); SERIAL_ECHO(buffer); }while(0)
+#define PRINT_PIN(p)        do{ sprintf_P(buffer, PSTR("%3d "), p); SERIAL_ECHO(buffer); }while(0)
+#define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); SERIAL_ECHO(buffer); }while(0)
 #define MULTI_NAME_PAD      16 // space needed to be pretty if not first name assigned to a pin
 
 // active ADC function/mode/code values for PINSEL registers
 constexpr int8_t ADC_pin_mode(pin_t pin) { return -1; }
 
-int8_t get_pin_mode(const pin_t pin) { return isValidPin(pin) ? 0 : -1; }
+int8_t get_pin_mode(const pin_t pin) { return VALID_PIN(pin) ? 0 : -1; }
 
-bool getValidPinMode(const pin_t pin) {
+bool GET_PINMODE(const pin_t pin) {
   const int8_t pin_mode = get_pin_mode(pin);
   if (pin_mode == -1 || pin_mode == ADC_pin_mode(pin)) // Invalid pin or active analog pin
     return false;
@@ -50,11 +50,11 @@ bool getValidPinMode(const pin_t pin) {
   return (Gpio::getMode(pin) != 0); // Input/output state
 }
 
-bool getPinIsDigitalByIndex(const pin_t pin) {
-  return (!isAnalogPin(pin) || get_pin_mode(pin) != ADC_pin_mode(pin));
+bool GET_ARRAY_IS_DIGITAL(const pin_t pin) {
+  return (!IS_ANALOG(pin) || get_pin_mode(pin) != ADC_pin_mode(pin));
 }
 
-void printPinPWM(const pin_t pin) {}
+void pwm_details(const pin_t pin) {}
 bool pwm_status(const pin_t) { return false; }
 
-void printPinPort(const pin_t) {}
+void print_port(const pin_t) {}

Marlin/src/HAL/LPC1768/HAL.h

@@ -82,13 +82,13 @@ extern DefaultSerial1 USBSerial;
   #endif
 #endif
 
-#ifdef MMU_SERIAL_PORT
-  #if MMU_SERIAL_PORT == -1
-    #define MMU_SERIAL USBSerial
-  #elif WITHIN(MMU_SERIAL_PORT, 0, 3)
-    #define MMU_SERIAL MSERIAL(MMU_SERIAL_PORT)
+#ifdef MMU2_SERIAL_PORT
+  #if MMU2_SERIAL_PORT == -1
+    #define MMU2_SERIAL USBSerial
+  #elif WITHIN(MMU2_SERIAL_PORT, 0, 3)
+    #define MMU2_SERIAL MSERIAL(MMU2_SERIAL_PORT)
   #else
-    #error "MMU_SERIAL_PORT must be from 0 to 3. You can also use -1 if the board supports Native USB."
+    #error "MMU2_SERIAL_PORT must be from 0 to 3. You can also use -1 if the board supports Native USB."
   #endif
 #endif
 
@@ -137,12 +137,12 @@ extern DefaultSerial1 USBSerial;
 //
 
 // Test whether the pin is valid
-constexpr bool isValidPin(const pin_t pin) {
+constexpr bool VALID_PIN(const pin_t pin) {
   return LPC176x::pin_is_valid(pin);
 }
 
 // Get the analog index for a digital pin
-constexpr int8_t digitalPinToAnalogIndex(const pin_t pin) {
+constexpr int8_t DIGITAL_PIN_TO_ANALOG_PIN(const pin_t pin) {
   return (LPC176x::pin_is_valid(pin) && LPC176x::pin_has_adc(pin)) ? pin : -1;
 }
 

Marlin/src/HAL/LPC1768/pinsDebug.h

@@ -29,12 +29,12 @@
  */
 
 #define NUMBER_PINS_TOTAL NUM_DIGITAL_PINS
-#define isAnalogPin(P) (digitalPinToAnalogIndex(P) >= 0 ? 1 : 0)
+#define IS_ANALOG(P) (DIGITAL_PIN_TO_ANALOG_PIN(P) >= 0 ? 1 : 0)
 #define digitalRead_mod(p) extDigitalRead(p)
-#define getPinByIndex(p) pin_array[p].pin
-#define printPinNameByIndex(x) do{ sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); SERIAL_ECHO(buffer); }while(0)
-#define printPinNumber(p) do{ sprintf_P(buffer, PSTR("P%d_%02d"), LPC176x::pin_port(p), LPC176x::pin_bit(p)); SERIAL_ECHO(buffer); }while(0)
-#define printPinAnalog(p) do{ sprintf_P(buffer, PSTR("_A%d     "), LPC176x::pin_get_adc_channel(pin)); SERIAL_ECHO(buffer); }while(0)
+#define GET_ARRAY_PIN(p) pin_array[p].pin
+#define PRINT_ARRAY_NAME(x) do{ sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); SERIAL_ECHO(buffer); }while(0)
+#define PRINT_PIN(p) do{ sprintf_P(buffer, PSTR("P%d_%02d"), LPC176x::pin_port(p), LPC176x::pin_bit(p)); SERIAL_ECHO(buffer); }while(0)
+#define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR("_A%d     "), LPC176x::pin_get_adc_channel(pin)); SERIAL_ECHO(buffer); }while(0)
 #define MULTI_NAME_PAD 17 // space needed to be pretty if not first name assigned to a pin
 
 // pins that will cause hang/reset/disconnect in M43 Toggle and Watch utilities
@@ -42,15 +42,15 @@
   #define M43_NEVER_TOUCH(Q) ((Q) == P0_29 || (Q) == P0_30 || (Q) == P2_09)  // USB pins
 #endif
 
-bool getValidPinMode(const pin_t pin) {
+bool GET_PINMODE(const pin_t pin) {
   if (!LPC176x::pin_is_valid(pin) || LPC176x::pin_adc_enabled(pin)) // Invalid pin or active analog pin
     return false;
 
   return LPC176x::gpio_direction(pin);
 }
 
-#define getPinIsDigitalByIndex(x) ((bool) pin_array[x].is_digital)
+#define GET_ARRAY_IS_DIGITAL(x) ((bool) pin_array[x].is_digital)
 
-void printPinPort(const pin_t) {}
-void printPinPWM(const pin_t) {}
+void print_port(const pin_t) {}
+void pwm_details(const pin_t) {}
 bool pwm_status(const pin_t) { return false; }

Marlin/src/HAL/NATIVE_SIM/HAL.h

@@ -87,11 +87,11 @@ extern MSerialT serial_stream_3;
   #endif
 #endif
 
-#ifdef MMU_SERIAL_PORT
-  #if WITHIN(MMU_SERIAL_PORT, 0, 3)
-    #define MMU_SERIAL MSERIAL(MMU_SERIAL_PORT)
+#ifdef MMU2_SERIAL_PORT
+  #if WITHIN(MMU2_SERIAL_PORT, 0, 3)
+    #define MMU2_SERIAL MSERIAL(MMU2_SERIAL_PORT)
   #else
-    #error "MMU_SERIAL_PORT must be from 0 to 3. Please update your configuration."
+    #error "MMU2_SERIAL_PORT must be from 0 to 3. Please update your configuration."
   #endif
 #endif
 

Marlin/src/HAL/NATIVE_SIM/pinsDebug.cpp

@@ -27,9 +27,9 @@
 
 int8_t ADC_pin_mode(pin_t pin) { return -1; }
 
-int8_t get_pin_mode(const pin_t pin) { return isValidPin(pin) ? 0 : -1; }
+int8_t get_pin_mode(const pin_t pin) { return VALID_PIN(pin) ? 0 : -1; }
 
-bool getValidPinMode(const pin_t pin) {
+bool GET_PINMODE(const pin_t pin) {
   const int8_t pin_mode = get_pin_mode(pin);
   if (pin_mode == -1 || pin_mode == ADC_pin_mode(pin)) // Invalid pin or active analog pin
     return false;
@@ -37,12 +37,12 @@ bool getValidPinMode(const pin_t pin) {
   return (Gpio::getMode(pin) != 0); // Input/output state
 }
 
-bool getPinIsDigitalByIndex(const pin_t pin) {
-  return !isAnalogPin(pin) || get_pin_mode(pin) != ADC_pin_mode(pin);
+bool GET_ARRAY_IS_DIGITAL(const pin_t pin) {
+  return !IS_ANALOG(pin) || get_pin_mode(pin) != ADC_pin_mode(pin);
 }
 
-void printPinPort(const pin_t) {}
-void printPinPWM(const pin_t) {}
+void print_port(const pin_t) {}
+void pwm_details(const pin_t) {}
 bool pwm_status(const pin_t) { return false; }
 
 #endif

Marlin/src/HAL/NATIVE_SIM/pinsDebug.h

@@ -30,19 +30,19 @@
  */
 
 #define NUMBER_PINS_TOTAL NUM_DIGITAL_PINS
-#define isAnalogPin(P) (digitalPinToAnalogIndex(P) >= 0 ? 1 : 0)
+#define IS_ANALOG(P) (DIGITAL_PIN_TO_ANALOG_PIN(P) >= 0 ? 1 : 0)
 #define digitalRead_mod(p)  digitalRead(p)
-#define getPinByIndex(p) pin_array[p].pin
-#define printPinNameByIndex(x) do{ sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); SERIAL_ECHO(buffer); }while(0)
-#define printPinNumber(p) do{ sprintf_P(buffer, PSTR("%3d "), p); SERIAL_ECHO(buffer); }while(0)
-#define printPinAnalog(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), digitalPinToAnalogIndex(pin)); SERIAL_ECHO(buffer); }while(0)
+#define GET_ARRAY_PIN(p) pin_array[p].pin
+#define PRINT_ARRAY_NAME(x) do{ sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); SERIAL_ECHO(buffer); }while(0)
+#define PRINT_PIN(p) do{ sprintf_P(buffer, PSTR("%3d "), p); SERIAL_ECHO(buffer); }while(0)
+#define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); SERIAL_ECHO(buffer); }while(0)
 #define MULTI_NAME_PAD 16 // space needed to be pretty if not first name assigned to a pin
 
 // Active ADC function/mode/code values for PINSEL registers
 int8_t ADC_pin_mode(pin_t pin);
 int8_t get_pin_mode(const pin_t pin);
-bool getValidPinMode(const pin_t pin);
-bool getPinIsDigitalByIndex(const pin_t pin);
-void printPinPort(const pin_t);
-void printPinPWM(const pin_t);
+bool GET_PINMODE(const pin_t pin);
+bool GET_ARRAY_IS_DIGITAL(const pin_t pin);
+void print_port(const pin_t);
+void pwm_details(const pin_t);
 bool pwm_status(const pin_t);

Marlin/src/HAL/SAMD21/HAL.h

@@ -69,13 +69,13 @@ extern DefaultSerial3 MSerial1;
   #endif
 #endif
 
-#ifdef MMU_SERIAL_PORT
-  #if WITHIN(MMU_SERIAL_PORT, 0, 1)
-    #define MMU_SERIAL MSERIAL(SERIAL_PORT)
-  #elif MMU_SERIAL_PORT == -1
-    #define MMU_SERIAL MSerialUSB
+#ifdef MMU2_SERIAL_PORT
+  #if WITHIN(MMU2_SERIAL_PORT, 0, 1)
+    #define MMU2_SERIAL MSERIAL(SERIAL_PORT)
+  #elif MMU2_SERIAL_PORT == -1
+    #define MMU2_SERIAL MSerialUSB
   #else
-    #error "MMU_SERIAL_PORT must be -1 (Native USB only)."
+    #error "MMU2_SERIAL_PORT must be -1 (Native USB only)."
   #endif
 #endif
 

Marlin/src/HAL/SAMD21/fastio.h

@@ -152,7 +152,7 @@
                                  : ((P) == 14) ? ADC_INPUTCTRL_MUXPOS_PIN14 \
                                  : ADC_INPUTCTRL_MUXPOS_PIN15)
 
-#define digitalPinToAnalogIndex(P) (WITHIN(P, 67, 74) ? (P) - 67 : WITHIN(P, 54, 61) ? 8 + (P) - 54 : WITHIN(P, 12, 13) ? 16 + (P) - 12 : P == 9 ? 18 : -1)
+#define digitalPinToAnalogInput(P) (WITHIN(P, 67, 74) ? (P) - 67 : WITHIN(P, 54, 61) ? 8 + (P) - 54 : WITHIN(P, 12, 13) ? 16 + (P) - 12 : P == 9 ? 18 : -1)
 
 /**
  * pins

Marlin/src/HAL/SAMD21/pinsDebug.h

@@ -30,13 +30,14 @@
 
 #define digitalRead_mod(p) extDigitalRead(p)
 #define PRINT_PORT(p) do{ SERIAL_ECHOPGM("  Port: "); sprintf_P(buffer, PSTR("%c%02ld"), 'A' + g_APinDescription[p].ulPort, g_APinDescription[p].ulPin); SERIAL_ECHO(buffer); }while (0)
-#define printPinNameByIndex(x) do{ sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); SERIAL_ECHO(buffer); }while(0)
-#define printPinNumber(p) do{ sprintf_P(buffer, PSTR("%3d "), p); SERIAL_ECHO(buffer); }while(0)
-#define printPinAnalog(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), digitalPinToAnalogIndex(pin)); SERIAL_ECHO(buffer); }while(0)
-#define getPinByIndex(p) pin_array[p].pin
-#define getPinIsDigitalByIndex(p) pin_array[p].is_digital
-#define isValidPin(pin) (pin >= 0 && pin < (int8_t)NUMBER_PINS_TOTAL)
-#define isAnalogPin(P) (digitalPinToAnalogIndex(P)!=-1)
+#define PRINT_ARRAY_NAME(x) do{ sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); SERIAL_ECHO(buffer); }while(0)
+#define PRINT_PIN(p) do{ sprintf_P(buffer, PSTR("%3d "), p); SERIAL_ECHO(buffer); }while(0)
+#define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); SERIAL_ECHO(buffer); }while(0)
+#define GET_ARRAY_PIN(p) pin_array[p].pin
+#define GET_ARRAY_IS_DIGITAL(p) pin_array[p].is_digital
+#define VALID_PIN(pin) (pin >= 0 && pin < (int8_t)NUMBER_PINS_TOTAL)
+#define DIGITAL_PIN_TO_ANALOG_PIN(p) digitalPinToAnalogInput(p)
+#define IS_ANALOG(P) (DIGITAL_PIN_TO_ANALOG_PIN(P)!=-1)
 #define pwm_status(pin) digitalPinHasPWM(pin)
 #define MULTI_NAME_PAD 27 // space needed to be pretty if not first name assigned to a pin
 
@@ -44,13 +45,13 @@
 // uses pin index
 #define M43_NEVER_TOUCH(Q) ((Q) >= 75)
 
-bool getValidPinMode(int8_t pin) {  // 1: output, 0: input
+bool GET_PINMODE(int8_t pin) {  // 1: output, 0: input
   const EPortType samdport = g_APinDescription[pin].ulPort;
   const uint32_t samdpin = g_APinDescription[pin].ulPin;
   return PORT->Group[samdport].DIR.reg & MASK(samdpin) || (PORT->Group[samdport].PINCFG[samdpin].reg & (PORT_PINCFG_INEN | PORT_PINCFG_PULLEN)) == PORT_PINCFG_PULLEN;
 }
 
-void printPinPWM(int32_t pin) {
+void pwm_details(int32_t pin) {
   if (pwm_status(pin)) {
     //uint32_t chan = g_APinDescription[pin].ulPWMChannel TODO when fast pwm is operative;
     //SERIAL_ECHOPGM("PWM = ", duty);

Marlin/src/HAL/SAMD51/HAL.h

@@ -69,23 +69,13 @@
     #endif
   #endif
 
-  #ifdef SERIAL_PORT_3
-    #if SERIAL_PORT_3 == -1
-      #define MYSERIAL3 MSerial0
-    #elif WITHIN(SERIAL_PORT_3, 0, 3)
-      #define MYSERIAL3 MSERIAL(SERIAL_PORT_3)
+  #ifdef MMU2_SERIAL_PORT
+    #if MMU2_SERIAL_PORT == -1
+      #define MMU2_SERIAL MSerial0
+    #elif WITHIN(MMU2_SERIAL_PORT, 0, 3)
+      #define MMU2_SERIAL MSERIAL(MMU2_SERIAL_PORT)
     #else
-      #error "SERIAL_PORT_3 must be from 0 to 3. You can also use -1 if the board supports Native USB."
-    #endif
-  #endif
-
-  #ifdef MMU_SERIAL_PORT
-    #if MMU_SERIAL_PORT == -1
-      #define MMU_SERIAL MSerial0
-    #elif WITHIN(MMU_SERIAL_PORT, 0, 3)
-      #define MMU_SERIAL MSERIAL(MMU_SERIAL_PORT)
-    #else
-      #error "MMU_SERIAL_PORT must be from 0 to 3. You can also use -1 if the board supports Native USB."
+      #error "MMU2_SERIAL_PORT must be from 0 to 3. You can also use -1 if the board supports Native USB."
     #endif
   #endif
 

Marlin/src/HAL/SAMD51/fastio.h

@@ -174,7 +174,7 @@
                                    : (P == 17) ? PIN_TO_SAMD_PIN(13)  \
                                    : PIN_TO_SAMD_PIN(9))
 
-  #define digitalPinToAnalogIndex(P) (WITHIN(P, 67, 74) ? (P) - 67 : WITHIN(P, 54, 61) ? 8 + (P) - 54 : WITHIN(P, 12, 13) ? 16 + (P) - 12 : P == 9 ? 18 : -1)
+  #define digitalPinToAnalogInput(P) (WITHIN(P, 67, 74) ? (P) - 67 : WITHIN(P, 54, 61) ? 8 + (P) - 54 : WITHIN(P, 12, 13) ? 16 + (P) - 12 : P == 9 ? 18 : -1)
 
   /**
    * pins

Marlin/src/HAL/SAMD51/pinsDebug.h

@@ -29,13 +29,14 @@
 
 #define digitalRead_mod(p) extDigitalRead(p)
 #define PRINT_PORT(p) do{ SERIAL_ECHOPGM("  Port: "); sprintf_P(buffer, PSTR("%c%02ld"), 'A' + g_APinDescription[p].ulPort, g_APinDescription[p].ulPin); SERIAL_ECHO(buffer); }while (0)
-#define printPinNameByIndex(x) do{ sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); SERIAL_ECHO(buffer); }while(0)
-#define printPinNumber(p) do{ sprintf_P(buffer, PSTR("%3d "), p); SERIAL_ECHO(buffer); }while(0)
-#define printPinAnalog(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), digitalPinToAnalogIndex(pin)); SERIAL_ECHO(buffer); }while(0)
-#define getPinByIndex(p) pin_array[p].pin
-#define getPinIsDigitalByIndex(p) pin_array[p].is_digital
-#define isValidPin(pin) (pin >= 0 && pin < int8_t(NUMBER_PINS_TOTAL))
-#define isAnalogPin(P) (digitalPinToAnalogIndex(P)!=-1)
+#define PRINT_ARRAY_NAME(x) do{ sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); SERIAL_ECHO(buffer); }while(0)
+#define PRINT_PIN(p) do{ sprintf_P(buffer, PSTR("%3d "), p); SERIAL_ECHO(buffer); }while(0)
+#define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); SERIAL_ECHO(buffer); }while(0)
+#define GET_ARRAY_PIN(p) pin_array[p].pin
+#define GET_ARRAY_IS_DIGITAL(p) pin_array[p].is_digital
+#define VALID_PIN(pin) (pin >= 0 && pin < int8_t(NUMBER_PINS_TOTAL))
+#define DIGITAL_PIN_TO_ANALOG_PIN(p) digitalPinToAnalogInput(p)
+#define IS_ANALOG(P) (DIGITAL_PIN_TO_ANALOG_PIN(P)!=-1)
 #define pwm_status(pin) digitalPinHasPWM(pin)
 #define MULTI_NAME_PAD 27 // space needed to be pretty if not first name assigned to a pin
 
@@ -43,13 +44,13 @@
 // uses pin index
 #define M43_NEVER_TOUCH(Q) ((Q) >= 75)
 
-bool getValidPinMode(int8_t pin) {  // 1: output, 0: input
+bool GET_PINMODE(int8_t pin) {  // 1: output, 0: input
   const EPortType samdport = g_APinDescription[pin].ulPort;
   const uint32_t samdpin = g_APinDescription[pin].ulPin;
   return PORT->Group[samdport].DIR.reg & MASK(samdpin) || (PORT->Group[samdport].PINCFG[samdpin].reg & (PORT_PINCFG_INEN | PORT_PINCFG_PULLEN)) == PORT_PINCFG_PULLEN;
 }
 
-void printPinPWM(int32_t pin) {
+void pwm_details(int32_t pin) {
   if (pwm_status(pin)) {
     //uint32_t chan = g_APinDescription[pin].ulPWMChannel TODO when fast pwm is operative;
     //SERIAL_ECHOPGM("PWM = ", duty);

Marlin/src/HAL/STM32/HAL.h

@@ -90,15 +90,15 @@
   #endif
 #endif
 
-#ifdef MMU_SERIAL_PORT
-  #if WITHIN(MMU_SERIAL_PORT, 1, 9)
-    #define MMU_SERIAL MSERIAL(MMU_SERIAL_PORT)
+#ifdef MMU2_SERIAL_PORT
+  #if WITHIN(MMU2_SERIAL_PORT, 1, 9)
+    #define MMU2_SERIAL MSERIAL(MMU2_SERIAL_PORT)
   #elif !defined(USBCON)
-    #error "MMU_SERIAL_PORT must be from 1 to 9."
-  #elif MMU_SERIAL_PORT == -1
-    #define MMU_SERIAL MSerialUSB
+    #error "MMU2_SERIAL_PORT must be from 1 to 9."
+  #elif MMU2_SERIAL_PORT == -1
+    #define MMU2_SERIAL MSerialUSB
   #else
-    #error "MMU_SERIAL_PORT must be from 1 to 9, or -1 for Native USB."
+    #error "MMU2_SERIAL_PORT must be from 1 to 9, or -1 for Native USB."
   #endif
 #endif
 
@@ -129,7 +129,7 @@
  * TODO: review this to return 1 for pins that are not analog input
  */
 #ifndef analogInputToDigitalPin
-  #define analogInputToDigitalPin(p) pin_t(p)
+  #define analogInputToDigitalPin(p) (p)
 #endif
 
 //

Marlin/src/HAL/STM32/MarlinSerial.cpp

@@ -37,9 +37,6 @@
 #ifndef USART5
   #define USART5 UART5
 #endif
-#ifndef USART6
-  #define USART6 UART6
-#endif
 #ifndef USART7
   #define USART7 UART7
 #endif

Marlin/src/HAL/STM32/pinsDebug.h

@@ -115,16 +115,16 @@ const XrefInfo pin_xref[] PROGMEM = {
   #define NUM_ANALOG_LAST ((NUM_ANALOG_FIRST) + (NUM_ANALOG_INPUTS) - 1)
 #endif
 #define NUMBER_PINS_TOTAL ((NUM_DIGITAL_PINS) + TERN0(HAS_HIGH_ANALOG_PINS, NUM_ANALOG_INPUTS))
-#define isValidPin(P) (WITHIN(P, 0, (NUM_DIGITAL_PINS) - 1) || TERN0(HAS_HIGH_ANALOG_PINS, WITHIN(P, NUM_ANALOG_FIRST, NUM_ANALOG_LAST)))
+#define VALID_PIN(P) (WITHIN(P, 0, (NUM_DIGITAL_PINS) - 1) || TERN0(HAS_HIGH_ANALOG_PINS, WITHIN(P, NUM_ANALOG_FIRST, NUM_ANALOG_LAST)))
 #define digitalRead_mod(Ard_num) extDigitalRead(Ard_num)  // must use Arduino pin numbers when doing reads
-#define printPinNumber(Q)
-#define printPinAnalog(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), digitalPinToAnalogIndex(pin)); SERIAL_ECHO(buffer); }while(0)
-#define digitalPinToAnalogIndex(ANUM) -1  // will report analog pin number in the print port routine
+#define PRINT_PIN(Q)
+#define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); SERIAL_ECHO(buffer); }while(0)
+#define DIGITAL_PIN_TO_ANALOG_PIN(ANUM) -1  // will report analog pin number in the print port routine
 
 // x is a variable used to search pin_array
-#define getPinIsDigitalByIndex(x) ((bool) pin_array[x].is_digital)
-#define getPinByIndex(x) ((pin_t) pin_array[x].pin)
-#define printPinNameByIndex(x) do{ sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); SERIAL_ECHO(buffer); }while(0)
+#define GET_ARRAY_IS_DIGITAL(x) ((bool) pin_array[x].is_digital)
+#define GET_ARRAY_PIN(x) ((pin_t) pin_array[x].pin)
+#define PRINT_ARRAY_NAME(x) do{ sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); SERIAL_ECHO(buffer); }while(0)
 #define MULTI_NAME_PAD 33 // space needed to be pretty if not first name assigned to a pin
 
 //
@@ -164,7 +164,7 @@ uint8_t get_pin_mode(const pin_t Ard_num) {
   }
 }
 
-bool getValidPinMode(const pin_t Ard_num) {
+bool GET_PINMODE(const pin_t Ard_num) {
   const uint8_t pin_mode = get_pin_mode(Ard_num);
   return pin_mode == MODE_PIN_OUTPUT || pin_mode == MODE_PIN_ALT;  // assume all alt definitions are PWM
 }
@@ -173,11 +173,11 @@ int8_t digital_pin_to_analog_pin(const pin_t Ard_num) {
   if (WITHIN(Ard_num, NUM_ANALOG_FIRST, NUM_ANALOG_LAST))
     return Ard_num - NUM_ANALOG_FIRST;
 
-  const int8_t ind = digitalPinToAnalogIndex(Ard_num);
+  const uint32_t ind = digitalPinToAnalogInput(Ard_num);
   return (ind < NUM_ANALOG_INPUTS) ? ind : -1;
 }
 
-bool isAnalogPin(const pin_t Ard_num) {
+bool IS_ANALOG(const pin_t Ard_num) {
   return get_pin_mode(Ard_num) == MODE_PIN_ANALOG;
 }
 
@@ -186,7 +186,7 @@ bool is_digital(const pin_t Ard_num) {
   return pin_mode == MODE_PIN_INPUT || pin_mode == MODE_PIN_OUTPUT;
 }
 
-void printPinPort(const pin_t Ard_num) {
+void print_port(const pin_t Ard_num) {
   char buffer[16];
   pin_t Index;
   for (Index = 0; Index < NUMBER_PINS_TOTAL; Index++)
@@ -226,7 +226,7 @@ bool pwm_status(const pin_t Ard_num) {
   return get_pin_mode(Ard_num) == MODE_PIN_ALT;
 }
 
-void printPinPWM(const pin_t Ard_num) {
+void pwm_details(const pin_t Ard_num) {
   #ifndef STM32F1xx
     if (pwm_status(Ard_num)) {
       uint32_t alt_all = 0;
@@ -285,4 +285,4 @@ void printPinPWM(const pin_t Ard_num) {
   #else
     // TODO: F1 doesn't support changing pins function, so we need to check the function of the PIN and if it's enabled
   #endif
-} // printPinPWM
+} // pwm_details

Marlin/src/HAL/STM32/sdio.cpp

@@ -238,7 +238,7 @@ void HAL_SD_MspInit(SD_HandleTypeDef *hsd) {
     hdma_sdio.Init.MemInc = DMA_MINC_ENABLE;
     hdma_sdio.Init.PeriphDataAlignment = DMA_PDATAALIGN_WORD;
     hdma_sdio.Init.MemDataAlignment = DMA_MDATAALIGN_WORD;
-    hdma_sdio.Init.Priority = DMA_PRIORITY_MEDIUM;
+    hdma_sdio.Init.Priority = DMA_PRIORITY_LOW;
     __HAL_LINKDMA(&hsd, hdmarx, hdma_sdio);
     __HAL_LINKDMA(&hsd, hdmatx, hdma_sdio);
 

Marlin/src/HAL/STM32/tft/tft_fsmc.cpp

@@ -182,7 +182,6 @@ void TFT_FSMC::transmitDMA(uint32_t memoryIncrease, uint16_t *data, uint16_t cou
   DMAtx.Init.PeriphInc = memoryIncrease;
   HAL_DMA_Init(&DMAtx);
   HAL_DMA_Start(&DMAtx, (uint32_t)data, (uint32_t)&(LCD->RAM), count);
-  TERN_(TFT_SHARED_IO, while (isBusy()));
 }
 
 void TFT_FSMC::transmit(uint32_t memoryIncrease, uint16_t *data, uint16_t count) {

Marlin/src/HAL/STM32/tft/tft_spi.cpp

@@ -337,7 +337,7 @@ void TFT_SPI::transmitDMA(uint32_t memoryIncrease, uint16_t *data, uint16_t coun
     SET_BIT(SPIx.Instance->CR2, SPI_CR2_TXDMAEN);   // Enable Tx DMA Request
   #endif
 
-  TERN_(TFT_SHARED_IO, while (isBusy()));
+  TERN_(TFT_SHARED_IO, while (isBusy()) { /* nada */ });
 }
 
 void TFT_SPI::transmit(uint32_t memoryIncrease, uint16_t *data, uint16_t count) {

Marlin/src/HAL/STM32F1/HAL.h

@@ -118,14 +118,14 @@
   #endif
 #endif
 
-#ifdef MMU_SERIAL_PORT
-  #if MMU_SERIAL_PORT == -1
-    #define MMU_SERIAL UsbSerial
-  #elif WITHIN(MMU_SERIAL_PORT, 1, NUM_UARTS)
-    #define MMU_SERIAL MSERIAL(MMU_SERIAL_PORT)
+#ifdef MMU2_SERIAL_PORT
+  #if MMU2_SERIAL_PORT == -1
+    #define MMU2_SERIAL UsbSerial
+  #elif WITHIN(MMU2_SERIAL_PORT, 1, NUM_UARTS)
+    #define MMU2_SERIAL MSERIAL(MMU2_SERIAL_PORT)
   #else
-    #define MMU_SERIAL MSERIAL(1) // dummy port
-    static_assert(false, "MMU_SERIAL_PORT must be from 1 to " STRINGIFY(NUM_UARTS) ". You can also use -1 if the board supports Native USB.")
+    #define MMU2_SERIAL MSERIAL(1) // dummy port
+    static_assert(false, "MMU2_SERIAL_PORT must be from 1 to " STRINGIFY(NUM_UARTS) ". You can also use -1 if the board supports Native USB.")
   #endif
 #endif
 
@@ -158,7 +158,7 @@
  * TODO: review this to return 1 for pins that are not analog input
  */
 #ifndef analogInputToDigitalPin
-  #define analogInputToDigitalPin(p) pin_t(p)
+  #define analogInputToDigitalPin(p) (p)
 #endif
 
 #ifndef digitalPinHasPWM

Marlin/src/HAL/STM32F1/pinsDebug.h

@@ -39,12 +39,12 @@ extern const stm32_pin_info PIN_MAP[BOARD_NR_GPIO_PINS];
 
 #define NUM_DIGITAL_PINS BOARD_NR_GPIO_PINS
 #define NUMBER_PINS_TOTAL BOARD_NR_GPIO_PINS
-#define isValidPin(pin) (pin >= 0 && pin < BOARD_NR_GPIO_PINS)
-#define getPinByIndex(p) pin_t(pin_array[p].pin)
+#define VALID_PIN(pin) (pin >= 0 && pin < BOARD_NR_GPIO_PINS)
+#define GET_ARRAY_PIN(p) pin_t(pin_array[p].pin)
 #define digitalRead_mod(p) extDigitalRead(p)
-#define printPinNumber(p) do{ sprintf_P(buffer, PSTR("%3hd "), int16_t(p)); SERIAL_ECHO(buffer); }while(0)
-#define printPinAnalog(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), digitalPinToAnalogIndex(pin)); SERIAL_ECHO(buffer); }while(0)
-#define printPinNameByIndex(x) do{ sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); SERIAL_ECHO(buffer); }while(0)
+#define PRINT_PIN(p) do{ sprintf_P(buffer, PSTR("%3hd "), int16_t(p)); SERIAL_ECHO(buffer); }while(0)
+#define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); SERIAL_ECHO(buffer); }while(0)
+#define PRINT_ARRAY_NAME(x) do{ sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); SERIAL_ECHO(buffer); }while(0)
 #define MULTI_NAME_PAD 21 // space needed to be pretty if not first name assigned to a pin
 
 // pins that will cause hang/reset/disconnect in M43 Toggle and Watch utilities
@@ -52,10 +52,10 @@ extern const stm32_pin_info PIN_MAP[BOARD_NR_GPIO_PINS];
   #define M43_NEVER_TOUCH(Q) (Q >= 9 && Q <= 12) // SERIAL/USB pins PA9(TX) PA10(RX)
 #endif
 
-int8_t get_pin_mode(const pin_t pin) { return isValidPin(pin) ? _GET_MODE(pin) : -1; }
+int8_t get_pin_mode(const pin_t pin) { return VALID_PIN(pin) ? _GET_MODE(pin) : -1; }
 
-int8_t digitalPinToAnalogIndex(const pin_t pin) {
-  if (!isValidPin(pin)) return -1;
+pin_t DIGITAL_PIN_TO_ANALOG_PIN(const pin_t pin) {
+  if (!VALID_PIN(pin)) return -1;
   pin_t adc_channel = pin_t(PIN_MAP[pin].adc_channel);
   #ifdef NUM_ANALOG_INPUTS
     if (adc_channel >= NUM_ANALOG_INPUTS) adc_channel = (pin_t)ADCx;
@@ -63,8 +63,8 @@ int8_t digitalPinToAnalogIndex(const pin_t pin) {
   return adc_channel;
 }
 
-bool isAnalogPin(const pin_t pin) {
-  if (!isValidPin(pin)) return false;
+bool IS_ANALOG(const pin_t pin) {
+  if (!VALID_PIN(pin)) return false;
   if (PIN_MAP[pin].adc_channel != ADCx) {
     #ifdef NUM_ANALOG_INPUTS
       if (PIN_MAP[pin].adc_channel >= NUM_ANALOG_INPUTS) return false;
@@ -74,13 +74,13 @@ bool isAnalogPin(const pin_t pin) {
   return false;
 }
 
-bool getValidPinMode(const pin_t pin) {
-  return isValidPin(pin) && !IS_INPUT(pin);
+bool GET_PINMODE(const pin_t pin) {
+  return VALID_PIN(pin) && !IS_INPUT(pin);
 }
 
-bool getPinIsDigitalByIndex(const int16_t array_pin) {
-  const pin_t pin = getPinByIndex(array_pin);
-  return (!isAnalogPin(pin)
+bool GET_ARRAY_IS_DIGITAL(const int16_t array_pin) {
+  const pin_t pin = GET_ARRAY_PIN(array_pin);
+  return (!IS_ANALOG(pin)
     #ifdef NUM_ANALOG_INPUTS
       || PIN_MAP[pin].adc_channel >= NUM_ANALOG_INPUTS
     #endif
@@ -89,7 +89,7 @@ bool getPinIsDigitalByIndex(const int16_t array_pin) {
 
 #include "../../inc/MarlinConfig.h" // Allow pins/pins.h to set density
 
-void printPinPWM(const pin_t pin) {
+void pwm_details(const pin_t pin) {
   if (PWM_PIN(pin)) {
     timer_dev * const tdev = PIN_MAP[pin].timer_device;
     const uint8_t channel = PIN_MAP[pin].timer_channel;
@@ -111,7 +111,7 @@ void printPinPWM(const pin_t pin) {
 
 bool pwm_status(const pin_t pin) { return PWM_PIN(pin); }
 
-void printPinPort(const pin_t pin) {
+void print_port(const pin_t pin) {
   const char port = 'A' + char(pin >> 4); // pin div 16
   const int16_t gbit = PIN_MAP[pin].gpio_bit;
   char buffer[8];

Marlin/src/HAL/TEENSY31_32/HAL.h

@@ -98,7 +98,7 @@ uint32_t __get_PRIMASK(void); // CMSIS
 // ------------------------
 
 #ifndef analogInputToDigitalPin
-  #define analogInputToDigitalPin(p) pin_t((p < 12U) ? (p) + 54U : -1)
+  #define analogInputToDigitalPin(p) ((p < 12U) ? (p) + 54U : -1)
 #endif
 
 #define HAL_ADC_VREF_MV   3300

Marlin/src/HAL/TEENSY31_32/timers.h

@@ -41,7 +41,7 @@ typedef uint32_t hal_timer_t;
 #define FTM0_TIMER_PRESCALE_BITS 0b011
 #define FTM1_TIMER_PRESCALE_BITS 0b010
 
-#define FTM0_TIMER_RATE (F_BUS / (FTM0_TIMER_PRESCALE)) // 60MHz / 8 = 7.5MHz
+#define FTM0_TIMER_RATE (F_BUS / (FTM0_TIMER_PRESCALE)) // 60MHz / 8 = 7500kHz
 #define FTM1_TIMER_RATE (F_BUS / (FTM1_TIMER_PRESCALE)) // 60MHz / 4 = 15MHz
 
 #define HAL_TIMER_RATE         (FTM0_TIMER_RATE)

Marlin/src/HAL/TEENSY35_36/HAL.h

@@ -103,7 +103,7 @@ typedef int8_t pin_t;
 // ------------------------
 
 #ifndef analogInputToDigitalPin
-  #define analogInputToDigitalPin(p) pin_t((p < 12U) ? (p) + 54U : -1)
+  #define analogInputToDigitalPin(p) ((p < 12U) ? (p) + 54U : -1)
 #endif
 
 #define HAL_ADC_VREF_MV   3300

Marlin/src/HAL/TEENSY35_36/pinsDebug.h

@@ -53,9 +53,9 @@
   #define TPM1_CH1_PIN 17
 #endif
 
-#define isAnalogPin(P) ((P) >= analogInputToDigitalPin(0) && (P) <= analogInputToDigitalPin(9)) || ((P) >= analogInputToDigitalPin(12) && (P) <= analogInputToDigitalPin(20))
+#define IS_ANALOG(P) ((P) >= analogInputToDigitalPin(0) && (P) <= analogInputToDigitalPin(9)) || ((P) >= analogInputToDigitalPin(12) && (P) <= analogInputToDigitalPin(20))
 
-void printAnalogPin(char buffer[], int8_t pin) {
+void print_analog_pin(char buffer[], int8_t pin) {
   if (pin <= 23)      sprintf_P(buffer, PSTR("(A%2d)  "), int(pin - 14));
   else if (pin <= 39) sprintf_P(buffer, PSTR("(A%2d)  "), int(pin - 19));
 }
@@ -108,4 +108,4 @@ bool pwm_status(int8_t pin) {
   SERIAL_ECHOPGM("  ");
 }
 
-void printPinPWM(uint8_t pin) { /* TODO */ }
+void pwm_details(uint8_t pin) { /* TODO */ }

Marlin/src/HAL/TEENSY40_41/HAL.h

@@ -133,7 +133,7 @@ typedef int8_t pin_t;
 // ------------------------
 
 #ifndef analogInputToDigitalPin
-  #define analogInputToDigitalPin(p) pin_t((p < 12U) ? (p) + 54U : -1)
+  #define analogInputToDigitalPin(p) ((p < 12U) ? (p) + 54U : -1)
 #endif
 
 #define HAL_ADC_VREF_MV   3300

Marlin/src/HAL/TEENSY40_41/pinsDebug.h

@@ -30,18 +30,17 @@
 #define NUMBER_PINS_TOTAL NUM_DIGITAL_PINS
 
 #define digitalRead_mod(p) extDigitalRead(p)  // AVR digitalRead disabled PWM before it read the pin
-#define printPinNameByIndex(x) do{ sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); SERIAL_ECHO(buffer); }while(0)
-#define printPinNumber(p) do{ sprintf_P(buffer, PSTR("%02d"), p); SERIAL_ECHO(buffer); }while(0)
-#define printPinAnalog(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), digitalPinToAnalogIndex(pin)); SERIAL_ECHO(buffer); }while(0)
-#define getPinByIndex(p) pin_array[p].pin
-#define getPinIsDigitalByIndex(p) pin_array[p].is_digital
-#define isValidPin(pin) (pin >= 0 && pin < int8_t(NUMBER_PINS_TOTAL))
-#define digitalPinToAnalogIndex(p) int(p - analogInputToDigitalPin(0))
-#define getValidPinMode(PIN) (isValidPin(pin) && IS_OUTPUT(pin))
+#define PRINT_ARRAY_NAME(x) do{ sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); SERIAL_ECHO(buffer); }while(0)
+#define PRINT_PIN(p) do{ sprintf_P(buffer, PSTR("%02d"), p); SERIAL_ECHO(buffer); }while(0)
+#define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); SERIAL_ECHO(buffer); }while(0)
+#define GET_ARRAY_PIN(p) pin_array[p].pin
+#define GET_ARRAY_IS_DIGITAL(p) pin_array[p].is_digital
+#define VALID_PIN(pin) (pin >= 0 && pin < int8_t(NUMBER_PINS_TOTAL))
+#define DIGITAL_PIN_TO_ANALOG_PIN(p) int(p - analogInputToDigitalPin(0))
+#define IS_ANALOG(P) ((P) >= analogInputToDigitalPin(0) && (P) <= analogInputToDigitalPin(13)) || ((P) >= analogInputToDigitalPin(14) && (P) <= analogInputToDigitalPin(17))
+#define GET_PINMODE(PIN) (VALID_PIN(pin) && IS_OUTPUT(pin))
 #define MULTI_NAME_PAD 16 // space needed to be pretty if not first name assigned to a pin
 
-#define isAnalogPin(P) (pin_t(P) >= analogInputToDigitalPin(0) && pin_t(P) <= analogInputToDigitalPin(13)) || (pin_t(P) >= analogInputToDigitalPin(14) && pin_t(P) <= analogInputToDigitalPin(17))
-
 struct pwm_pin_info_struct {
   uint8_t type;    // 0=no pwm, 1=flexpwm, 2=quad
   uint8_t module;  // 0-3, 0-3
@@ -119,7 +118,7 @@ const struct pwm_pin_info_struct pwm_pin_info[] = {
   #endif
 };
 
-void printAnalogPin(char buffer[], const pin_t pin) {
+void print_analog_pin(char buffer[], const pin_t pin) {
   if (pin <= 23)      sprintf_P(buffer, PSTR("(A%2d)  "), int(pin - 14));
   else if (pin <= 41) sprintf_P(buffer, PSTR("(A%2d)  "), int(pin - 24));
 }
@@ -150,6 +149,6 @@ bool pwm_status(const pin_t pin) {
   return (*(portConfigRegister(pin)) == info->muxval);
 }
 
-void printPinPWM(const pin_t) { /* TODO */ }
+void pwm_details(const pin_t) { /* TODO */ }
 
-void printPinPort(const pin_t) {}
+void print_port(const pin_t) {}

Marlin/src/HAL/shared/eeprom_if_spi.cpp

@@ -81,4 +81,4 @@ void eeprom_write_byte(uint8_t *pos, uint8_t value) {
 }
 
 #endif // USE_SHARED_EEPROM
-#endif // SPI_EEPROM
+#endif // I2C_EEPROM

Marlin/src/MarlinCore.cpp

@@ -79,8 +79,6 @@
     #include "lcd/e3v2/creality/dwin.h"
   #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
     #include "lcd/e3v2/jyersui/dwin.h"
-  #elif ENABLED(SOVOL_SV06_RTS)
-    #include "lcd/sovol_rts/sovol_rts.h"
   #endif
 #endif
 
@@ -231,16 +229,14 @@
   #include "feature/controllerfan.h"
 #endif
 
-#if HAS_PRUSA_MMU3
-  #include "feature/mmu3/mmu3.h"
-  #include "feature/mmu3/mmu3_reporting.h"
-  #include "feature/mmu3/SpoolJoin.h"
-#elif HAS_PRUSA_MMU2
-  #include "feature/mmu/mmu2.h"
-#elif HAS_PRUSA_MMU1
+#if HAS_PRUSA_MMU1
   #include "feature/mmu/mmu.h"
 #endif
 
+#if HAS_PRUSA_MMU2
+  #include "feature/mmu/mmu2.h"
+#endif
+
 #if ENABLED(PASSWORD_FEATURE)
   #include "feature/password/password.h"
 #endif
@@ -278,7 +274,7 @@ 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
-  bool wait_for_user; // = false
+  bool wait_for_user; // = false;
 
   void wait_for_user_response(millis_t ms/*=0*/, const bool no_sleep/*=false*/) {
     UNUSED(no_sleep);
@@ -315,21 +311,20 @@ bool wait_for_heatup = false;
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wnarrowing"
-#pragma GCC diagnostic ignored "-Wsign-compare"
 
 bool pin_is_protected(const pin_t pin) {
   #define pgm_read_pin(P) (sizeof(pin_t) == 2 ? (pin_t)pgm_read_word(P) : (pin_t)pgm_read_byte(P))
   for (uint8_t i = 0; i < COUNT(sensitive_dio); ++i)
     if (pin == pgm_read_pin(&sensitive_dio[i])) return true;
   for (uint8_t i = 0; i < COUNT(sensitive_aio); ++i)
-    if (pin == analogInputToDigitalPin(pgm_read_pin(&sensitive_aio[i]))) return true;
+    if (pin == analogInputToDigitalPin(pgm_read_pin(&sensitive_dio[i]))) return true;
   return false;
 }
 
 #pragma GCC diagnostic pop
 
 bool printer_busy() {
-  return planner.has_blocks_queued() || printingIsActive();
+  return planner.movesplanned() || printingIsActive();
 }
 
 /**
@@ -355,7 +350,6 @@ void startOrResumeJob() {
     TERN_(CANCEL_OBJECTS, cancelable.reset());
     TERN_(LCD_SHOW_E_TOTAL, e_move_accumulator = 0);
     TERN_(SET_REMAINING_TIME, ui.reset_remaining_time());
-    TERN_(HAS_PRUSA_MMU3, MMU3::operation_statistics.reset_per_print_stats());
   }
   print_job_timer.start();
 }
@@ -790,7 +784,7 @@ void idle(const bool no_stepper_sleep/*=false*/) {
 
   // Handle filament runout sensors
   #if HAS_FILAMENT_SENSOR
-    if (TERN1(HAS_PRUSA_MMU2, !mmu2.enabled()) && TERN1(HAS_PRUSA_MMU3, !mmu3.enabled()))
+    if (TERN1(HAS_PRUSA_MMU2, !mmu2.enabled()))
       runout.run();
   #endif
 
@@ -827,11 +821,7 @@ void idle(const bool no_stepper_sleep/*=false*/) {
   TERN_(HAS_BEEPER, buzzer.tick());
 
   // Handle UI input / draw events
-  #if ENABLED(SOVOL_SV06_RTS)
-    RTS_Update();
-  #else
-    ui.update();
-  #endif
+  ui.update();
 
   // Run i2c Position Encoders
   #if ENABLED(I2C_POSITION_ENCODERS)
@@ -859,11 +849,7 @@ void idle(const bool no_stepper_sleep/*=false*/) {
   #endif
 
   // Update the Průša MMU2
-  #if HAS_PRUSA_MMU3
-    mmu3.mmu_loop();
-  #elif HAS_PRUSA_MMU2
-    mmu2.mmu_loop();
-  #endif
+  TERN_(HAS_PRUSA_MMU2, mmu2.mmu_loop());
 
   // Handle Joystick jogging
   TERN_(POLL_JOG, joystick.inject_jog_moves());
@@ -1168,12 +1154,6 @@ void setup() {
   millis_t serial_connect_timeout = millis() + 1000UL;
   while (!MYSERIAL1.connected() && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
 
-  #if ENABLED(SOVOL_SV06_RTS)
-    LCD_SERIAL.begin(BAUDRATE);
-    serial_connect_timeout = millis() + 1000UL;
-    while (!LCD_SERIAL.connected() && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
-  #endif
-
   #if HAS_MULTI_SERIAL && !HAS_ETHERNET
     #ifndef BAUDRATE_2
       #define BAUDRATE_2 BAUDRATE
@@ -1331,11 +1311,8 @@ void setup() {
 
   // UI must be initialized before EEPROM
   // (because EEPROM code calls the UI).
-  #if ENABLED(SOVOL_SV06_RTS)
-    SETUP_RUN(RTS_Update());
-  #else
-    SETUP_RUN(ui.init());
-  #endif
+
+  SETUP_RUN(ui.init());
 
   #if PIN_EXISTS(SAFE_POWER)
     #if HAS_DRIVER_SAFE_POWER_PROTECT
@@ -1608,11 +1585,7 @@ void setup() {
     SETUP_RUN(stepper_driver_backward_report());
   #endif
 
-  #if HAS_PRUSA_MMU3
-    if (mmu3.mmu_hw_enabled) SETUP_RUN(mmu3.start());
-    SETUP_RUN(mmu3.status());
-    SETUP_RUN(spooljoin.initStatus());
-  #elif HAS_PRUSA_MMU2
+  #if HAS_PRUSA_MMU2
     SETUP_RUN(mmu2.init());
   #endif
 
@@ -1624,8 +1597,6 @@ void setup() {
 
   #if ENABLED(DWIN_CREALITY_LCD)
     SETUP_RUN(dwinInitScreen());
-  #elif ENABLED(SOVOL_SV06_RTS)
-    SETUP_RUN(rts.init());
   #endif
 
   #if HAS_SERVICE_INTERVALS && DISABLED(DWIN_CREALITY_LCD)

Marlin/src/core/boards.h

@@ -79,58 +79,59 @@
 #define BOARD_MKS_GEN_13              1112  // MKS GEN v1.3 or 1.4
 #define BOARD_MKS_GEN_L               1113  // MKS GEN L
 #define BOARD_KFB_2                   1114  // BigTreeTech or BIQU KFB2.0
-#define BOARD_ZRIB_V20                1115  // Zonestar zrib V2.0 (Chinese RAMPS replica)
-#define BOARD_ZRIB_V52                1116  // Zonestar zrib V5.2 (Chinese RAMPS replica)
-#define BOARD_ZRIB_V53                1117  // Zonestar zrib V5.3 (Chinese RAMPS replica)
-#define BOARD_FELIX2                  1118  // Felix 2.0+ Electronics Board (RAMPS like)
-#define BOARD_RIGIDBOARD              1119  // Invent-A-Part RigidBoard
-#define BOARD_RIGIDBOARD_V2           1120  // Invent-A-Part RigidBoard V2
-#define BOARD_SAINSMART_2IN1          1121  // Sainsmart 2-in-1 board
-#define BOARD_ULTIMAKER               1122  // Ultimaker
-#define BOARD_ULTIMAKER_OLD           1123  // Ultimaker (Older electronics. Pre 1.5.4. This is rare)
-#define BOARD_AZTEEG_X3               1124  // Azteeg X3
-#define BOARD_AZTEEG_X3_PRO           1125  // Azteeg X3 Pro
-#define BOARD_ULTIMAIN_2              1126  // Ultimainboard 2.x (Uses TEMP_SENSOR 20)
-#define BOARD_RUMBA                   1127  // Rumba
-#define BOARD_RUMBA_RAISE3D           1128  // Raise3D N series Rumba derivative
-#define BOARD_RL200                   1129  // Rapide Lite 200 (v1, low-cost RUMBA clone with drv)
-#define BOARD_FORMBOT_TREX2PLUS       1130  // Formbot T-Rex 2 Plus
-#define BOARD_FORMBOT_TREX3           1131  // Formbot T-Rex 3
-#define BOARD_FORMBOT_RAPTOR          1132  // Formbot Raptor
-#define BOARD_FORMBOT_RAPTOR2         1133  // Formbot Raptor 2
-#define BOARD_BQ_ZUM_MEGA_3D          1134  // bq ZUM Mega 3D
-#define BOARD_MAKEBOARD_MINI          1135  // MakeBoard Mini v2.1.2 by MicroMake
-#define BOARD_TRIGORILLA_13           1136  // TriGorilla Anycubic version 1.3-based on RAMPS EFB
-#define BOARD_TRIGORILLA_14           1137  //   ... Ver 1.4
-#define BOARD_TRIGORILLA_14_11        1138  //   ... Rev 1.1 (new servo pin order)
-#define BOARD_RAMPS_ENDER_4           1139  // Creality: Ender-4, CR-8
-#define BOARD_RAMPS_CREALITY          1140  // Creality: CR10S, CR20, CR-X
-#define BOARD_DAGOMA_F5               1141  // Dagoma F5
-#define BOARD_DAGOMA_D6               1142  // Dagoma D6 (as found in the Dagoma DiscoUltimate V2 TMC)
-#define BOARD_FYSETC_F6_13            1143  // FYSETC F6 1.3
-#define BOARD_FYSETC_F6_14            1144  // FYSETC F6 1.4
-#define BOARD_DUPLICATOR_I3_PLUS      1145  // Wanhao Duplicator i3 Plus
-#define BOARD_VORON                   1146  // VORON Design
-#define BOARD_TRONXY_V3_1_0           1147  // Tronxy TRONXY-V3-1.0
-#define BOARD_Z_BOLT_X_SERIES         1148  // Z-Bolt X Series
-#define BOARD_TT_OSCAR                1149  // TT OSCAR
-#define BOARD_TANGO                   1150  // BIQU Tango V1
-#define BOARD_MKS_GEN_L_V2            1151  // MKS GEN L V2
-#define BOARD_MKS_GEN_L_V21           1152  // MKS GEN L V2.1
-#define BOARD_COPYMASTER_3D           1153  // Copymaster 3D
-#define BOARD_ORTUR_4                 1154  // Ortur 4
-#define BOARD_TENLOG_D3_HERO          1155  // Tenlog D3 Hero IDEX printer
-#define BOARD_TENLOG_MB1_V23          1156  // Tenlog D3, D5, D6 IDEX Printer
-#define BOARD_RAMPS_S_12_EEFB         1157  // Ramps S 1.2 by Sakul.cz (Power outputs: Hotend0, Hotend1, Fan, Bed)
-#define BOARD_RAMPS_S_12_EEEB         1158  // Ramps S 1.2 by Sakul.cz (Power outputs: Hotend0, Hotend1, Hotend2, Bed)
-#define BOARD_RAMPS_S_12_EFFB         1159  // Ramps S 1.2 by Sakul.cz (Power outputs: Hotend, Fan0, Fan1, Bed)
-#define BOARD_LONGER3D_LK1_PRO        1160  // Longer LK1 PRO / Alfawise U20 Pro (PRO version)
-#define BOARD_LONGER3D_LKx_PRO        1161  // Longer LKx PRO / Alfawise Uxx Pro (PRO version)
-#define BOARD_PXMALION_CORE_I3        1162  // Pxmalion Core I3
-#define BOARD_PANOWIN_CUTLASS         1163  // Panowin Cutlass (as found in the Panowin F1)
-#define BOARD_KODAMA_BARDO            1164  // Kodama Bardo V1.x (as found in the Kodama Trinus)
-#define BOARD_XTLW_MFF_V1             1165  // XTLW MFF V1.0
-#define BOARD_XTLW_MFF_V2             1166  // XTLW MFF V2.0
+#define BOARD_ZRIB_V20                1115  // zrib V2.0 (Chinese RAMPS replica)
+#define BOARD_ZRIB_V52                1116  // zrib V5.2 (Chinese RAMPS replica)
+#define BOARD_FELIX2                  1117  // Felix 2.0+ Electronics Board (RAMPS like)
+#define BOARD_RIGIDBOARD              1118  // Invent-A-Part RigidBoard
+#define BOARD_RIGIDBOARD_V2           1119  // Invent-A-Part RigidBoard V2
+#define BOARD_SAINSMART_2IN1          1120  // Sainsmart 2-in-1 board
+#define BOARD_ULTIMAKER               1121  // Ultimaker
+#define BOARD_ULTIMAKER_OLD           1122  // Ultimaker (Older electronics. Pre 1.5.4. This is rare)
+#define BOARD_AZTEEG_X3               1123  // Azteeg X3
+#define BOARD_AZTEEG_X3_PRO           1124  // Azteeg X3 Pro
+#define BOARD_ULTIMAIN_2              1125  // Ultimainboard 2.x (Uses TEMP_SENSOR 20)
+#define BOARD_RUMBA                   1126  // Rumba
+#define BOARD_RUMBA_RAISE3D           1127  // Raise3D N series Rumba derivative
+#define BOARD_RL200                   1128  // Rapide Lite 200 (v1, low-cost RUMBA clone with drv)
+#define BOARD_FORMBOT_TREX2PLUS       1129  // Formbot T-Rex 2 Plus
+#define BOARD_FORMBOT_TREX3           1130  // Formbot T-Rex 3
+#define BOARD_FORMBOT_RAPTOR          1131  // Formbot Raptor
+#define BOARD_FORMBOT_RAPTOR2         1132  // Formbot Raptor 2
+#define BOARD_BQ_ZUM_MEGA_3D          1133  // bq ZUM Mega 3D
+#define BOARD_MAKEBOARD_MINI          1134  // MakeBoard Mini v2.1.2 by MicroMake
+#define BOARD_TRIGORILLA_13           1135  // TriGorilla Anycubic version 1.3-based on RAMPS EFB
+#define BOARD_TRIGORILLA_14           1136  //   ... Ver 1.4
+#define BOARD_TRIGORILLA_14_11        1137  //   ... Rev 1.1 (new servo pin order)
+#define BOARD_RAMPS_ENDER_4           1138  // Creality: Ender-4, CR-8
+#define BOARD_RAMPS_CREALITY          1139  // Creality: CR10S, CR20, CR-X
+#define BOARD_DAGOMA_F5               1140  // Dagoma F5
+#define BOARD_FYSETC_F6_13            1141  // FYSETC F6 1.3
+#define BOARD_FYSETC_F6_14            1142  // FYSETC F6 1.4
+#define BOARD_DUPLICATOR_I3_PLUS      1143  // Wanhao Duplicator i3 Plus
+#define BOARD_VORON                   1144  // VORON Design
+#define BOARD_TRONXY_V3_1_0           1145  // Tronxy TRONXY-V3-1.0
+#define BOARD_Z_BOLT_X_SERIES         1146  // Z-Bolt X Series
+#define BOARD_TT_OSCAR                1147  // TT OSCAR
+#define BOARD_OVERLORD                1148  // Overlord/Overlord Pro
+#define BOARD_HJC2560C_REV1           1149  // ADIMLab Gantry v1
+#define BOARD_HJC2560C_REV2           1150  // ADIMLab Gantry v2
+#define BOARD_TANGO                   1151  // BIQU Tango V1
+#define BOARD_MKS_GEN_L_V2            1152  // MKS GEN L V2
+#define BOARD_MKS_GEN_L_V21           1153  // MKS GEN L V2.1
+#define BOARD_COPYMASTER_3D           1154  // Copymaster 3D
+#define BOARD_ORTUR_4                 1155  // Ortur 4
+#define BOARD_TENLOG_D3_HERO          1156  // Tenlog D3 Hero IDEX printer
+#define BOARD_TENLOG_MB1_V23          1157  // Tenlog D3, D5, D6 IDEX Printer
+#define BOARD_RAMPS_S_12_EEFB         1158  // Ramps S 1.2 by Sakul.cz (Power outputs: Hotend0, Hotend1, Fan, Bed)
+#define BOARD_RAMPS_S_12_EEEB         1159  // Ramps S 1.2 by Sakul.cz (Power outputs: Hotend0, Hotend1, Hotend2, Bed)
+#define BOARD_RAMPS_S_12_EFFB         1160  // Ramps S 1.2 by Sakul.cz (Power outputs: Hotend, Fan0, Fan1, Bed)
+#define BOARD_LONGER3D_LK1_PRO        1161  // Longer LK1 PRO / Alfawise U20 Pro (PRO version)
+#define BOARD_LONGER3D_LKx_PRO        1162  // Longer LKx PRO / Alfawise Uxx Pro (PRO version)
+#define BOARD_ZRIB_V53                1163  // Zonestar zrib V5.3 (Chinese RAMPS replica)
+#define BOARD_PXMALION_CORE_I3        1164  // Pxmalion Core I3
+#define BOARD_PANOWIN_CUTLASS         1165  // Panowin Cutlass (as found in the Panowin F1)
+#define BOARD_KODAMA_BARDO            1166  // Kodama Bardo V1.x (as found in the Kodama Trinus)
+#define BOARD_DAGOMA_D6               1167  // Dagoma D6 (as found in the Dagoma DiscoUltimate V2 TMC)
 
 //
 // RAMBo and derivatives
@@ -166,23 +167,20 @@
 #define BOARD_GT2560_REV_A_PLUS       1315  // Geeetech GT2560 Rev A+ (with auto level probe)
 #define BOARD_GT2560_REV_B            1316  // Geeetech GT2560 Rev B
 #define BOARD_GT2560_V3               1317  // Geeetech GT2560 Rev B for A10(M/T/D)
-#define BOARD_GT2560_V3_MC2           1318  // Geeetech GT2560 Rev B for Mecreator2
-#define BOARD_GT2560_V3_A20           1319  // Geeetech GT2560 Rev B for A20(M/T/D)
-#define BOARD_GT2560_V4               1320  // Geeetech GT2560 Rev B for A10(M/T/D)
-#define BOARD_GT2560_V4_A20           1321  // Geeetech GT2560 Rev B for A20(M/T/D)
-#define BOARD_EINSTART_S              1322  // Einstart retrofit
-#define BOARD_WANHAO_ONEPLUS          1323  // Wanhao 0ne+ i3 Mini
-#define BOARD_OVERLORD                1324  // Overlord/Overlord Pro
-#define BOARD_HJC2560C_REV1           1325  // ADIMLab Gantry v1
-#define BOARD_HJC2560C_REV2           1326  // ADIMLab Gantry v2
-#define BOARD_LEAPFROG_XEED2015       1327  // Leapfrog Xeed 2015
-#define BOARD_PICA_REVB               1328  // PICA Shield (original version)
-#define BOARD_PICA                    1329  // PICA Shield (rev C or later)
-#define BOARD_INTAMSYS40              1330  // Intamsys 4.0 (Funmat HT)
-#define BOARD_MALYAN_M180             1331  // Malyan M180 Mainboard Version 2 (no display function, direct G-code only)
-#define BOARD_PROTONEER_CNC_SHIELD_V3 1332  // Mega controller & Protoneer CNC Shield V3.00
-#define BOARD_WEEDO_62A               1333  // WEEDO 62A board (TINA2, Monoprice Cadet, etc.)
-#define BOARD_GT2560_V41B             1334  // Geeetech GT2560 V4.1B for A10(M/T/D)
+#define BOARD_GT2560_V4               1318  // Geeetech GT2560 Rev B for A10(M/T/D)
+#define BOARD_GT2560_V3_MC2           1319  // Geeetech GT2560 Rev B for Mecreator2
+#define BOARD_GT2560_V3_A20           1320  // Geeetech GT2560 Rev B for A20(M/T/D)
+#define BOARD_EINSTART_S              1321  // Einstart retrofit
+#define BOARD_WANHAO_ONEPLUS          1322  // Wanhao 0ne+ i3 Mini
+#define BOARD_LEAPFROG_XEED2015       1323  // Leapfrog Xeed 2015
+#define BOARD_PICA_REVB               1324  // PICA Shield (original version)
+#define BOARD_PICA                    1325  // PICA Shield (rev C or later)
+#define BOARD_INTAMSYS40              1326  // Intamsys 4.0 (Funmat HT)
+#define BOARD_MALYAN_M180             1327  // Malyan M180 Mainboard Version 2 (no display function, direct G-code only)
+#define BOARD_GT2560_V4_A20           1328  // Geeetech GT2560 Rev B for A20(M/T/D)
+#define BOARD_PROTONEER_CNC_SHIELD_V3 1329  // Mega controller & Protoneer CNC Shield V3.00
+#define BOARD_WEEDO_62A               1330  // WEEDO 62A board (TINA2, Monoprice Cadet, etc.)
+#define BOARD_GT2560_V41B             1331  // Geeetech GT2560 V4.1B for A10(M/T/D)
 
 //
 // ATmega1281, ATmega2561
@@ -275,7 +273,6 @@
 #define BOARD_MKS_SGEN_L_V2           2509  // MKS SGEN_L V2
 #define BOARD_BTT_SKR_E3_TURBO        2510  // BigTreeTech SKR E3 Turbo
 #define BOARD_FLY_CDY                 2511  // FLYmaker FLY CDY
-#define BOARD_XTLW_CLIMBER_8TH_LPC    2512  // XTLW_CLIMBER_8TH_LPC
 
 //
 // SAM3X8E ARM Cortex-M3
@@ -328,7 +325,6 @@
 #define BOARD_BTT_MANTA_M5P_V1_0      4004  // BigTreeTech Manta M5P V1.0 (STM32G0B1RE)
 #define BOARD_BTT_MANTA_M8P_V1_0      4005  // BigTreeTech Manta M8P V1.0 (STM32G0B1VE)
 #define BOARD_BTT_MANTA_M8P_V1_1      4006  // BigTreeTech Manta M8P V1.1 (STM32G0B1VE)
-#define BOARD_BTT_SKRAT_V1_0          4007  // BigTreeTech SKRat V1.0 (STM32G0B1VE)
 
 //
 // STM32 ARM Cortex-M3
@@ -340,62 +336,62 @@
 #define BOARD_MALYAN_M200             5003  // STM32C8 Libmaple-based STM32F1 controller
 #define BOARD_STM3R_MINI              5004  // STM32F103RE Libmaple-based STM32F1 controller
 #define BOARD_GTM32_PRO_VB            5005  // STM32F103VE controller
-#define BOARD_GTM32_PRO_VD            5006  // STM32F103VE controller
-#define BOARD_GTM32_MINI              5007  // STM32F103VE controller
-#define BOARD_GTM32_MINI_A30          5008  // STM32F103VE controller
-#define BOARD_GTM32_REV_B             5009  // STM32F103VE controller
-#define BOARD_MORPHEUS                5010  // STM32F103C8 / STM32F103CB  Libmaple-based STM32F1 controller
-#define BOARD_CHITU3D                 5011  // Chitu3D (STM32F103RE)
-#define BOARD_MKS_ROBIN               5012  // MKS Robin (STM32F103ZE)
-#define BOARD_MKS_ROBIN_MINI          5013  // MKS Robin Mini (STM32F103VE)
-#define BOARD_MKS_ROBIN_NANO          5014  // MKS Robin Nano (STM32F103VE)
-#define BOARD_MKS_ROBIN_NANO_V2       5015  // MKS Robin Nano V2 (STM32F103VE)
-#define BOARD_MKS_ROBIN_LITE          5016  // MKS Robin Lite/Lite2 (STM32F103RC)
-#define BOARD_MKS_ROBIN_LITE3         5017  // MKS Robin Lite3 (STM32F103RC)
-#define BOARD_MKS_ROBIN_PRO           5018  // MKS Robin Pro (STM32F103ZE)
-#define BOARD_MKS_ROBIN_E3            5019  // MKS Robin E3 (STM32F103RC)
-#define BOARD_MKS_ROBIN_E3_V1_1       5020  // MKS Robin E3 V1.1 (STM32F103RC)
-#define BOARD_MKS_ROBIN_E3D           5021  // MKS Robin E3D (STM32F103RC)
-#define BOARD_MKS_ROBIN_E3D_V1_1      5022  // MKS Robin E3D V1.1 (STM32F103RC)
-#define BOARD_MKS_ROBIN_E3P           5023  // MKS Robin E3P (STM32F103VE)
-#define BOARD_BTT_SKR_MINI_V1_1       5024  // BigTreeTech SKR Mini v1.1 (STM32F103RC)
-#define BOARD_BTT_SKR_MINI_E3_V1_0    5025  // BigTreeTech SKR Mini E3 (STM32F103RC)
-#define BOARD_BTT_SKR_MINI_E3_V1_2    5026  // BigTreeTech SKR Mini E3 V1.2 (STM32F103RC)
-#define BOARD_BTT_SKR_MINI_E3_V2_0    5027  // BigTreeTech SKR Mini E3 V2.0 (STM32F103RC / STM32F103RE)
-#define BOARD_BTT_SKR_MINI_MZ_V1_0    5028  // BigTreeTech SKR Mini MZ V1.0 (STM32F103RC)
-#define BOARD_BTT_SKR_E3_DIP          5029  // BigTreeTech SKR E3 DIP V1.0 (STM32F103RC / STM32F103RE)
-#define BOARD_BTT_SKR_CR6             5030  // BigTreeTech SKR CR6 v1.0 (STM32F103RE)
-#define BOARD_JGAURORA_A5S_A1         5031  // JGAurora A5S A1 (STM32F103ZE)
-#define BOARD_FYSETC_AIO_II           5032  // FYSETC AIO_II (STM32F103RC)
-#define BOARD_FYSETC_CHEETAH          5033  // FYSETC Cheetah (STM32F103RC)
-#define BOARD_FYSETC_CHEETAH_V12      5034  // FYSETC Cheetah V1.2 (STM32F103RC)
-#define BOARD_LONGER3D_LK             5035  // Longer3D LK1/2 - Alfawise U20/U20+/U30 (STM32F103VE)
-#define BOARD_CCROBOT_MEEB_3DP        5036  // ccrobot-online.com MEEB_3DP (STM32F103RC)
-#define BOARD_CHITU3D_V5              5037  // Chitu3D TronXY X5SA V5 Board (STM32F103ZE)
-#define BOARD_CHITU3D_V6              5038  // Chitu3D TronXY X5SA V6 Board (STM32F103ZE)
-#define BOARD_CHITU3D_V9              5039  // Chitu3D TronXY X5SA V9 Board (STM32F103ZE)
-#define BOARD_CREALITY_V4             5040  // Creality v4.x (STM32F103RC / STM32F103RE)
-#define BOARD_CREALITY_V422           5041  // Creality v4.2.2 (STM32F103RC / STM32F103RE)
-#define BOARD_CREALITY_V423           5042  // Creality v4.2.3 (STM32F103RC / STM32F103RE)
-#define BOARD_CREALITY_V425           5043  // Creality v4.2.5 (STM32F103RC / STM32F103RE)
-#define BOARD_CREALITY_V427           5044  // Creality v4.2.7 (STM32F103RC / STM32F103RE)
-#define BOARD_CREALITY_V4210          5045  // Creality v4.2.10 (STM32F103RC / STM32F103RE) as found in the CR-30
-#define BOARD_CREALITY_V431           5046  // Creality v4.3.1 (STM32F103RC / STM32F103RE)
-#define BOARD_CREALITY_V431_A         5047  // Creality v4.3.1a (STM32F103RC / STM32F103RE)
-#define BOARD_CREALITY_V431_B         5048  // Creality v4.3.1b (STM32F103RC / STM32F103RE)
-#define BOARD_CREALITY_V431_C         5049  // Creality v4.3.1c (STM32F103RC / STM32F103RE)
-#define BOARD_CREALITY_V431_D         5050  // Creality v4.3.1d (STM32F103RC / STM32F103RE)
-#define BOARD_CREALITY_V452           5051  // Creality v4.5.2 (STM32F103RC / STM32F103RE)
-#define BOARD_CREALITY_V453           5052  // Creality v4.5.3 (STM32F103RC / STM32F103RE)
-#define BOARD_CREALITY_V521           5053  // Creality v5.2.1 (STM32F103VE) as found in the SV04
-#define BOARD_CREALITY_V24S1          5054  // Creality v2.4.S1 (STM32F103RC / STM32F103RE) CR-FDM-v2.4.S1_v101 as found in the Ender-7
-#define BOARD_CREALITY_V24S1_301      5055  // Creality v2.4.S1_301 (STM32F103RC / STM32F103RE) CR-FDM-v24S1_301 as found in the Ender-3 S1
-#define BOARD_CREALITY_V25S1          5056  // Creality v2.5.S1 (STM32F103RE) CR-FDM-v2.5.S1_100 as found in the CR-10 Smart Pro
-#define BOARD_TRIGORILLA_PRO          5057  // Trigorilla Pro (STM32F103ZE)
-#define BOARD_FLY_MINI                5058  // FLYmaker FLY MINI (STM32F103RC)
-#define BOARD_FLSUN_HISPEED           5059  // FLSUN HiSpeedV1 (STM32F103VE)
-#define BOARD_BEAST                   5060  // STM32F103RE Libmaple-based controller
-#define BOARD_MINGDA_MPX_ARM_MINI     5061  // STM32F103ZE Mingda MD-16
+#define BOARD_GTM32_MINI              5006  // STM32F103VE controller
+#define BOARD_GTM32_MINI_A30          5007  // STM32F103VE controller
+#define BOARD_GTM32_REV_B             5008  // STM32F103VE controller
+#define BOARD_MORPHEUS                5009  // STM32F103C8 / STM32F103CB  Libmaple-based STM32F1 controller
+#define BOARD_CHITU3D                 5010  // Chitu3D (STM32F103RE)
+#define BOARD_MKS_ROBIN               5011  // MKS Robin (STM32F103ZE)
+#define BOARD_MKS_ROBIN_MINI          5012  // MKS Robin Mini (STM32F103VE)
+#define BOARD_MKS_ROBIN_NANO          5013  // MKS Robin Nano (STM32F103VE)
+#define BOARD_MKS_ROBIN_NANO_V2       5014  // MKS Robin Nano V2 (STM32F103VE)
+#define BOARD_MKS_ROBIN_LITE          5015  // MKS Robin Lite/Lite2 (STM32F103RC)
+#define BOARD_MKS_ROBIN_LITE3         5016  // MKS Robin Lite3 (STM32F103RC)
+#define BOARD_MKS_ROBIN_PRO           5017  // MKS Robin Pro (STM32F103ZE)
+#define BOARD_MKS_ROBIN_E3            5018  // MKS Robin E3 (STM32F103RC)
+#define BOARD_MKS_ROBIN_E3_V1_1       5019  // MKS Robin E3 V1.1 (STM32F103RC)
+#define BOARD_MKS_ROBIN_E3D           5020  // MKS Robin E3D (STM32F103RC)
+#define BOARD_MKS_ROBIN_E3D_V1_1      5021  // MKS Robin E3D V1.1 (STM32F103RC)
+#define BOARD_MKS_ROBIN_E3P           5022  // MKS Robin E3P (STM32F103VE)
+#define BOARD_BTT_SKR_MINI_V1_1       5023  // BigTreeTech SKR Mini v1.1 (STM32F103RC)
+#define BOARD_BTT_SKR_MINI_E3_V1_0    5024  // BigTreeTech SKR Mini E3 (STM32F103RC)
+#define BOARD_BTT_SKR_MINI_E3_V1_2    5025  // BigTreeTech SKR Mini E3 V1.2 (STM32F103RC)
+#define BOARD_BTT_SKR_MINI_E3_V2_0    5026  // BigTreeTech SKR Mini E3 V2.0 (STM32F103RC / STM32F103RE)
+#define BOARD_BTT_SKR_MINI_MZ_V1_0    5027  // BigTreeTech SKR Mini MZ V1.0 (STM32F103RC)
+#define BOARD_BTT_SKR_E3_DIP          5028  // BigTreeTech SKR E3 DIP V1.0 (STM32F103RC / STM32F103RE)
+#define BOARD_BTT_SKR_CR6             5029  // BigTreeTech SKR CR6 v1.0 (STM32F103RE)
+#define BOARD_JGAURORA_A5S_A1         5030  // JGAurora A5S A1 (STM32F103ZE)
+#define BOARD_FYSETC_AIO_II           5031  // FYSETC AIO_II (STM32F103RC)
+#define BOARD_FYSETC_CHEETAH          5032  // FYSETC Cheetah (STM32F103RC)
+#define BOARD_FYSETC_CHEETAH_V12      5033  // FYSETC Cheetah V1.2 (STM32F103RC)
+#define BOARD_LONGER3D_LK             5034  // Longer3D LK1/2 - Alfawise U20/U20+/U30 (STM32F103VE)
+#define BOARD_CCROBOT_MEEB_3DP        5035  // ccrobot-online.com MEEB_3DP (STM32F103RC)
+#define BOARD_CHITU3D_V5              5036  // Chitu3D TronXY X5SA V5 Board (STM32F103ZE)
+#define BOARD_CHITU3D_V6              5037  // Chitu3D TronXY X5SA V6 Board (STM32F103ZE)
+#define BOARD_CHITU3D_V9              5038  // Chitu3D TronXY X5SA V9 Board (STM32F103ZE)
+#define BOARD_CREALITY_V4             5039  // Creality v4.x (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V422           5040  // Creality v4.2.2 (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V423           5041  // Creality v4.2.3 (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V425           5042  // Creality v4.2.5 (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V427           5043  // Creality v4.2.7 (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V4210          5044  // Creality v4.2.10 (STM32F103RC / STM32F103RE) as found in the CR-30
+#define BOARD_CREALITY_V431           5045  // Creality v4.3.1 (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V431_A         5046  // Creality v4.3.1a (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V431_B         5047  // Creality v4.3.1b (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V431_C         5048  // Creality v4.3.1c (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V431_D         5049  // Creality v4.3.1d (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V452           5050  // Creality v4.5.2 (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V453           5051  // Creality v4.5.3 (STM32F103RC / STM32F103RE)
+#define BOARD_CREALITY_V521           5052  // Creality v5.2.1 (STM32F103VE) as found in the SV04
+#define BOARD_CREALITY_V24S1          5053  // Creality v2.4.S1 (STM32F103RC / STM32F103RE) CR-FDM-v2.4.S1_v101 as found in the Ender-7
+#define BOARD_CREALITY_V24S1_301      5054  // Creality v2.4.S1_301 (STM32F103RC / STM32F103RE) CR-FDM-v24S1_301 as found in the Ender-3 S1
+#define BOARD_CREALITY_V25S1          5055  // Creality v2.5.S1 (STM32F103RE) CR-FDM-v2.5.S1_100 as found in the CR-10 Smart Pro
+#define BOARD_TRIGORILLA_PRO          5056  // Trigorilla Pro (STM32F103ZE)
+#define BOARD_FLY_MINI                5057  // FLYmaker FLY MINI (STM32F103RC)
+#define BOARD_FLSUN_HISPEED           5058  // FLSUN HiSpeedV1 (STM32F103VE)
+#define BOARD_BEAST                   5059  // STM32F103RE Libmaple-based controller
+#define BOARD_MINGDA_MPX_ARM_MINI     5060  // STM32F103ZE Mingda MD-16
+#define BOARD_GTM32_PRO_VD            5061  // STM32F103VE controller
 #define BOARD_ZONESTAR_ZM3E2          5062  // Zonestar ZM3E2    (STM32F103RC)
 #define BOARD_ZONESTAR_ZM3E4          5063  // Zonestar ZM3E4 V1 (STM32F103VC)
 #define BOARD_ZONESTAR_ZM3E4V2        5064  // Zonestar ZM3E4 V2 (STM32F103VC)
@@ -424,8 +420,8 @@
 #define BOARD_RUMBA32_V1_1            5202  // RUMBA32 STM32F446VE based controller from Aus3D
 #define BOARD_RUMBA32_MKS             5203  // RUMBA32 STM32F446VE based controller from Makerbase
 #define BOARD_RUMBA32_BTT             5204  // RUMBA32 STM32F446VE based controller from BIGTREETECH
-#define BOARD_BLACK_STM32F407VE       5205  // Black STM32F407VE development board
-#define BOARD_BLACK_STM32F407ZE       5206  // Black STM32F407ZE development board
+#define BOARD_BLACK_STM32F407VE       5205  // BLACK_STM32F407VE
+#define BOARD_BLACK_STM32F407ZE       5206  // BLACK_STM32F407ZE
 #define BOARD_BTT_SKR_MINI_E3_V3_0_1  5207  // BigTreeTech SKR Mini E3 V3.0.1 (STM32F401RC)
 #define BOARD_BTT_SKR_PRO_V1_1        5208  // BigTreeTech SKR Pro v1.1 (STM32F407ZG)
 #define BOARD_BTT_SKR_PRO_V1_2        5209  // BigTreeTech SKR Pro v1.2 (STM32F407ZG)
@@ -443,35 +439,34 @@
 #define BOARD_FYSETC_S6               5221  // FYSETC S6 (STM32F446VE)
 #define BOARD_FYSETC_S6_V2_0          5222  // FYSETC S6 v2.0 (STM32F446VE)
 #define BOARD_FYSETC_SPIDER           5223  // FYSETC Spider (STM32F446VE)
-#define BOARD_FYSETC_SPIDER_V2_2      5224  // FYSETC Spider V2.2 (STM32F446VE)
-#define BOARD_FLYF407ZG               5225  // FLYmaker FLYF407ZG (STM32F407ZG)
-#define BOARD_MKS_ROBIN2              5226  // MKS Robin2 V1.0 (STM32F407ZE)
-#define BOARD_MKS_ROBIN_PRO_V2        5227  // MKS Robin Pro V2 (STM32F407VE)
-#define BOARD_MKS_ROBIN_NANO_V3       5228  // MKS Robin Nano V3 (STM32F407VG)
-#define BOARD_MKS_ROBIN_NANO_V3_1     5229  // MKS Robin Nano V3.1 (STM32F407VE)
-#define BOARD_MKS_MONSTER8_V1         5230  // MKS Monster8 V1 (STM32F407VE)
-#define BOARD_MKS_MONSTER8_V2         5231  // MKS Monster8 V2 (STM32F407VE)
-#define BOARD_ANET_ET4                5232  // ANET ET4 V1.x (STM32F407VG)
-#define BOARD_ANET_ET4P               5233  // ANET ET4P V1.x (STM32F407VG)
-#define BOARD_FYSETC_CHEETAH_V20      5234  // FYSETC Cheetah V2.0 (STM32F401RC)
-#define BOARD_FYSETC_CHEETAH_V30      5235  // FYSETC Cheetah V3.0 (STM32F446RC)
-#define BOARD_TH3D_EZBOARD_V2         5236  // TH3D EZBoard v2.0 (STM32F405RG)
-#define BOARD_OPULO_LUMEN_REV3        5237  // Opulo Lumen PnP Controller REV3 (STM32F407VE / STM32F407VG)
-#define BOARD_MKS_ROBIN_NANO_V1_3_F4  5238  // MKS Robin Nano V1.3 and MKS Robin Nano-S V1.3 (STM32F407VE)
-#define BOARD_MKS_EAGLE               5239  // MKS Eagle (STM32F407VE)
-#define BOARD_ARTILLERY_RUBY          5240  // Artillery Ruby (STM32F401RC)
-#define BOARD_CREALITY_V24S1_301F4    5241  // Creality v2.4.S1_301F4 (STM32F401RC) as found in the Ender-3 S1 F4
-#define BOARD_CREALITY_CR4NTXXC10     5242  // Creality E3 Free-runs Silent Motherboard (STM32F401RET6)
-#define BOARD_OPULO_LUMEN_REV4        5243  // Opulo Lumen PnP Controller REV4 (STM32F407VE / STM32F407VG)
-#define BOARD_FYSETC_SPIDER_KING407   5244  // FYSETC Spider King407 (STM32F407ZG)
-#define BOARD_MKS_SKIPR_V1            5245  // MKS SKIPR v1.0 all-in-one board (STM32F407VE)
-#define BOARD_TRONXY_CXY_446_V10      5246  // TRONXY CXY-446-V10-220413/CXY-V6-191121 (STM32F446ZE)
-#define BOARD_CREALITY_F401RE         5247  // Creality CR4NS200141C13 (STM32F401RE) as found in the Ender-5 S1
-#define BOARD_BLACKPILL_CUSTOM        5248  // Custom board based on STM32F401CDU6.
-#define BOARD_I3DBEEZ9_V1             5249  // I3DBEEZ9 V1 (STM32F407ZG)
-#define BOARD_MELLOW_FLY_E3_V2        5250  // Mellow Fly E3 V2 (STM32F407VG)
+#define BOARD_FLYF407ZG               5224  // FLYmaker FLYF407ZG (STM32F407ZG)
+#define BOARD_MKS_ROBIN2              5225  // MKS Robin2 V1.0 (STM32F407ZE)
+#define BOARD_MKS_ROBIN_PRO_V2        5226  // MKS Robin Pro V2 (STM32F407VE)
+#define BOARD_MKS_ROBIN_NANO_V3       5227  // MKS Robin Nano V3 (STM32F407VG)
+#define BOARD_MKS_ROBIN_NANO_V3_1     5228  // MKS Robin Nano V3.1 (STM32F407VE)
+#define BOARD_MKS_MONSTER8_V1         5229  // MKS Monster8 V1 (STM32F407VE)
+#define BOARD_MKS_MONSTER8_V2         5230  // MKS Monster8 V2 (STM32F407VE)
+#define BOARD_ANET_ET4                5231  // ANET ET4 V1.x (STM32F407VG)
+#define BOARD_ANET_ET4P               5232  // ANET ET4P V1.x (STM32F407VG)
+#define BOARD_FYSETC_CHEETAH_V20      5233  // FYSETC Cheetah V2.0 (STM32F401RC)
+#define BOARD_TH3D_EZBOARD_V2         5234  // TH3D EZBoard v2.0 (STM32F405RG)
+#define BOARD_OPULO_LUMEN_REV3        5235  // Opulo Lumen PnP Controller REV3 (STM32F407VE / STM32F407VG)
+#define BOARD_MKS_ROBIN_NANO_V1_3_F4  5236  // MKS Robin Nano V1.3 and MKS Robin Nano-S V1.3 (STM32F407VE)
+#define BOARD_MKS_EAGLE               5237  // MKS Eagle (STM32F407VE)
+#define BOARD_ARTILLERY_RUBY          5238  // Artillery Ruby (STM32F401RC)
+#define BOARD_FYSETC_SPIDER_V2_2      5239  // FYSETC Spider V2.2 (STM32F446VE)
+#define BOARD_CREALITY_V24S1_301F4    5240  // Creality v2.4.S1_301F4 (STM32F401RC) as found in the Ender-3 S1 F4
+#define BOARD_CREALITY_CR4NTXXC10     5241  // Creality E3 Free-runs Silent Motherboard (STM32F401RET6)
+#define BOARD_OPULO_LUMEN_REV4        5242  // Opulo Lumen PnP Controller REV4 (STM32F407VE / STM32F407VG)
+#define BOARD_FYSETC_SPIDER_KING407   5243  // FYSETC Spider King407 (STM32F407ZG)
+#define BOARD_MKS_SKIPR_V1            5244  // MKS SKIPR v1.0 all-in-one board (STM32F407VE)
+#define BOARD_TRONXY_CXY_446_V10      5245  // TRONXY CXY-446-V10-220413/CXY-V6-191121 (STM32F446ZE)
+#define BOARD_CREALITY_F401RE         5246  // Creality CR4NS200141C13 (STM32F401RE) as found in the Ender-5 S1
+#define BOARD_BLACKPILL_CUSTOM        5247  // Custom board based on STM32F401CDU6.
+#define BOARD_I3DBEEZ9_V1             5248  // I3DBEEZ9 V1 (STM32F407ZG)
+#define BOARD_MELLOW_FLY_E3_V2        5249  // Mellow Fly E3 V2 (STM32F407VG)
+#define BOARD_FYSETC_CHEETAH_V30      5250  // FYSETC Cheetah V3.0 (STM32F446RC)
 #define BOARD_BLACKBEEZMINI_V1        5251  // BlackBeezMini V1 (STM32F401CCU6)
-#define BOARD_XTLW_CLIMBER_8TH        5252  // XTLW Climber-8th (STM32F407VGT6)
 
 //
 // Other ARM Cortex-M4
@@ -483,18 +478,18 @@
 //
 
 #define BOARD_REMRAM_V1               6000  // RemRam v1
-#define BOARD_NUCLEO_F767ZI           6001  // ST NUCLEO-F767ZI Dev Board
-#define BOARD_BTT_SKR_SE_BX_V2        6002  // BigTreeTech SKR SE BX V2.0 (STM32H743II)
-#define BOARD_BTT_SKR_SE_BX_V3        6003  // BigTreeTech SKR SE BX V3.0 (STM32H743II)
-#define BOARD_BTT_SKR_V3_0            6004  // BigTreeTech SKR V3.0 (STM32H743VI / STM32H723VG)
-#define BOARD_BTT_SKR_V3_0_EZ         6005  // BigTreeTech SKR V3.0 EZ (STM32H743VI / STM32H723VG)
-#define BOARD_BTT_OCTOPUS_MAX_EZ_V1_0 6006  // BigTreeTech Octopus Max EZ V1.0 (STM32H723ZE)
-#define BOARD_BTT_OCTOPUS_PRO_V1_0_1  6007  // BigTreeTech Octopus Pro v1.0.1 (STM32H723ZE)
-#define BOARD_BTT_OCTOPUS_PRO_V1_1    6008  // BigTreeTech Octopus Pro v1.1 (STM32H723ZE)
-#define BOARD_BTT_MANTA_M8P_V2_0      6009  // BigTreeTech Manta M8P V2.0 (STM32H723ZE)
-#define BOARD_BTT_KRAKEN_V1_0         6010  // BigTreeTech Kraken v1.0 (STM32H723ZG)
-#define BOARD_TEENSY41                6011  // Teensy 4.1
-#define BOARD_T41U5XBB                6012  // T41U5XBB Teensy 4.1 breakout board
+#define BOARD_TEENSY41                6001  // Teensy 4.1
+#define BOARD_T41U5XBB                6002  // T41U5XBB Teensy 4.1 breakout board
+#define BOARD_NUCLEO_F767ZI           6003  // ST NUCLEO-F767ZI Dev Board
+#define BOARD_BTT_SKR_SE_BX_V2        6004  // BigTreeTech SKR SE BX V2.0 (STM32H743II)
+#define BOARD_BTT_SKR_SE_BX_V3        6005  // BigTreeTech SKR SE BX V3.0 (STM32H743II)
+#define BOARD_BTT_SKR_V3_0            6006  // BigTreeTech SKR V3.0 (STM32H743VI / STM32H723VG)
+#define BOARD_BTT_SKR_V3_0_EZ         6007  // BigTreeTech SKR V3.0 EZ (STM32H743VI / STM32H723VG)
+#define BOARD_BTT_OCTOPUS_MAX_EZ_V1_0 6008  // BigTreeTech Octopus Max EZ V1.0 (STM32H723ZE)
+#define BOARD_BTT_OCTOPUS_PRO_V1_0_1  6009  // BigTreeTech Octopus Pro v1.0.1 (STM32H723ZE)
+#define BOARD_BTT_OCTOPUS_PRO_V1_1    6010  // BigTreeTech Octopus Pro v1.1 (STM32H723ZE)
+#define BOARD_BTT_MANTA_M8P_V2_0      6011  // BigTreeTech Manta M8P V2.0 (STM32H723ZE)
+#define BOARD_BTT_KRAKEN_V1_0         6012  // BigTreeTech Kraken v1.0 (STM32H723ZG)
 
 //
 // Espressif ESP32 WiFi
@@ -544,7 +539,7 @@
 // Simulations
 //
 
-#define BOARD_SIMULATED               9999  // Simulated 3D Printer with LCD / TFT for development
+#define BOARD_SIMULATED               9999
 
 #define _MB_1(B)  (defined(BOARD_##B) && MOTHERBOARD==BOARD_##B)
 #define MB(V...)  DO(MB,||,V)

Marlin/src/core/language.h

@@ -162,8 +162,8 @@
 #define STR_SOFT_MIN                        "  Min: "
 #define STR_SOFT_MAX                        "  Max: "
 
-#define STR_SAVED_POSITION                  "Saved position #"
-#define STR_RESTORING_POSITION              "Restoring position #"
+#define STR_SAVED_POS                       "Position saved"
+#define STR_RESTORING_POS                   "Restoring position"
 #define STR_INVALID_POS_SLOT                "Invalid slot. Total: "
 #define STR_DONE                            "Done."
 
@@ -191,7 +191,6 @@
 #define STR_ERR_HOTEND_TOO_COLD             "Hotend too cold"
 #define STR_ERR_EEPROM_WRITE                "Error writing to EEPROM!"
 #define STR_ERR_EEPROM_CORRUPT              "EEPROM Corrupt"
-#define STR_EEPROM_INITIALIZED              "EEPROM Initialized"
 
 #define STR_FILAMENT_CHANGE_HEAT_LCD        "Press button to heat nozzle"
 #define STR_FILAMENT_CHANGE_INSERT_LCD      "Insert filament and press button"
@@ -291,7 +290,6 @@
 #define STR_MAX_ACCELERATION                "Max Acceleration (units/s2)"
 #define STR_MAX_FEEDRATES                   "Max feedrates (units/s)"
 #define STR_ACCELERATION_P_R_T              "Acceleration (units/s2) (P<print-accel> R<retract-accel> T<travel-accel>)"
-#define STR_HOMING_FEEDRATE                 "Homing Feedrate"
 #define STR_TOOL_CHANGING                   "Tool-changing"
 #define STR_HOTEND_OFFSETS                  "Hotend offsets"
 #define STR_SERVO_ANGLES                    "Servo Angles"
@@ -325,37 +323,6 @@
 #define STR_USER_THERMISTORS                "User thermistors"
 #define STR_DELAYED_POWEROFF                "Delayed poweroff"
 
-//
-// General axis names
-//
-#if HAS_X_AXIS
-  #define AXIS1_NAME 'X'
-#endif
-#if HAS_Y_AXIS
-  #define AXIS2_NAME 'Y'
-#endif
-#if HAS_Z_AXIS
-  #define AXIS3_NAME 'Z'
-#endif
-#define STR_X "X"
-#define STR_Y "Y"
-#define STR_Z "Z"
-#define STR_E "E"
-#if IS_KINEMATIC
-  #define STR_A "A"
-  #define STR_B "B"
-  #define STR_C "C"
-#else
-  #define STR_A STR_X
-  #define STR_B STR_Y
-  #define STR_C STR_Z
-#endif
-#define STR_X2 STR_A "2"
-#define STR_Y2 STR_B "2"
-#define STR_Z2 STR_C "2"
-#define STR_Z3 STR_C "3"
-#define STR_Z4 STR_C "4"
-
 //
 // Endstop Names used by Endstops::report_states
 //
@@ -387,8 +354,29 @@
 #define STR_Z_PROBE                         "z_probe"
 #define STR_PROBE_EN                        "probe_en"
 #define STR_FILAMENT                        "filament"
+
 #define STR_CALIBRATION                     "calibration"
 
+// General axis names
+#define STR_X "X"
+#define STR_Y "Y"
+#define STR_Z "Z"
+#define STR_E "E"
+#if IS_KINEMATIC
+  #define STR_A "A"
+  #define STR_B "B"
+  #define STR_C "C"
+#else
+  #define STR_A "X"
+  #define STR_B "Y"
+  #define STR_C "Z"
+#endif
+#define STR_X2 "X2"
+#define STR_Y2 "Y2"
+#define STR_Z2 "Z2"
+#define STR_Z3 "Z3"
+#define STR_Z4 "Z4"
+
 // Extra Axis and Endstop Names
 #if HAS_I_AXIS
   #if AXIS4_NAME == 'A'

Marlin/src/core/macros.h

@@ -64,7 +64,7 @@
 
 // Macros for bit masks
 #undef _BV
-#define _BV(b) (1 << (b))
+#define _BV(n) (1<<(n))
 #define TEST(n,b) (!!((n)&_BV(b)))
 #define SET_BIT_TO(N,B,TF) do{ if (TF) SBI(N,B); else CBI(N,B); }while(0)
 #ifndef SBI

Marlin/src/core/multi_language.h

@@ -91,7 +91,6 @@ typedef const char Language_Str[];
 #define LANG_CHARSIZE GET_TEXT(CHARSIZE)
 #define USE_WIDE_GLYPH (LANG_CHARSIZE > 2)
 
-// The final "\0" is added invisibly by the compiler
 #define MSG_1_LINE(A)     A "\0"   "\0"
 #define MSG_2_LINE(A,B)   A "\0" B "\0"
 #define MSG_3_LINE(A,B,C) A "\0" B "\0" C

Marlin/src/core/serial.cpp

@@ -75,8 +75,8 @@ template <> void SERIAL_ECHO(const p_float_t pf) { SERIAL_IMPL.print(pf.value, p
 template <> void SERIAL_ECHO(const w_float_t wf) { char f1[20]; SERIAL_IMPL.print(dtostrf(wf.value, wf.width, wf.prec, f1)); }
 
 // Specializations for F-string
-template <> void SERIAL_ECHO(FSTR_P const fstr)   { SERIAL_ECHO_P(FTOP(fstr)); }
-template <> void SERIAL_ECHOLN(FSTR_P const fstr) { SERIAL_ECHOLN_P(FTOP(fstr)); }
+template <> void SERIAL_ECHO(const FSTR_P fstr)   { SERIAL_ECHO_P(FTOP(fstr)); }
+template <> void SERIAL_ECHOLN(const FSTR_P fstr) { SERIAL_ECHOLN_P(FTOP(fstr)); }
 
 void SERIAL_CHAR(char a) { SERIAL_IMPL.write(a); }
 void SERIAL_EOL() { SERIAL_CHAR('\n'); }

Marlin/src/core/serial.h

@@ -171,8 +171,8 @@ template<> void SERIAL_ECHO(const p_float_t pf);
 template<> void SERIAL_ECHO(const w_float_t wf);
 
 // Specializations for F-string
-template<> void SERIAL_ECHO(FSTR_P const fstr);
-template<> void SERIAL_ECHOLN(FSTR_P const fstr);
+template<> void SERIAL_ECHO(const FSTR_P fstr);
+template<> void SERIAL_ECHOLN(const FSTR_P fstr);
 
 // Print any number of items with arbitrary types (except loose PROGMEM strings)
 template <typename T, typename ... Args>
@@ -247,7 +247,7 @@ inline void print_xyz(const xyz_pos_t &xyz, FSTR_P const prefix=nullptr, FSTR_P
 
 void print_xyze(LOGICAL_AXIS_ARGS_(const_float_t) FSTR_P const prefix=nullptr, FSTR_P const suffix=nullptr);
 inline void print_xyze(const xyze_pos_t &xyze, FSTR_P const prefix=nullptr, FSTR_P const suffix=nullptr) {
-  print_xyze(LOGICAL_AXIS_ELEM_LC_(xyze) prefix, suffix);
+  print_xyze(LOGICAL_AXIS_ELEM_(xyze) prefix, suffix);
 }
 
 #define SERIAL_POS(SUFFIX,VAR) do { print_xyz(VAR, F("  " STRINGIFY(VAR) "="), F(" : " SUFFIX "\n")); }while(0)

Marlin/src/core/types.h

@@ -42,28 +42,22 @@ template <class L, class R> struct IF<true, L, R> { typedef L type; };
 #define NUM_AXIS_LIST_1(V)    LIST_N_1(NUM_AXES, V)
 #define NUM_AXIS_ARRAY(V...)  { NUM_AXIS_LIST(V) }
 #define NUM_AXIS_ARRAY_1(V)   { NUM_AXIS_LIST_1(V) }
-#define NUM_AXIS_ARGS(T)      NUM_AXIS_LIST(T X, T Y, T Z, T I, T J, T K, T U, T V, T W)
-#define NUM_AXIS_ARGS_LC(T)   NUM_AXIS_LIST(T x, T y, T z, T i, T j, T k, T u, T v, T w)
-#define NUM_AXIS_ELEM(O)      NUM_AXIS_LIST(O.X, O.Y, O.Z, O.I, O.J, O.K, O.U, O.V, O.W)
-#define NUM_AXIS_ELEM_LC(O)   NUM_AXIS_LIST(O.x, O.y, O.z, O.i, O.j, O.k, O.u, O.v, O.w)
-#define NUM_AXIS_DECL(T,V)    NUM_AXIS_LIST(T X=V, T Y=V, T Z=V, T I=V, T J=V, T K=V, T U=V, T V=V, T W=V)
-#define NUM_AXIS_DECL_LC(T,V) NUM_AXIS_LIST(T x=V, T y=V, T z=V, T i=V, T j=V, T k=V, T u=V, T v=V, T w=V)
+#define NUM_AXIS_ARGS(T)      NUM_AXIS_LIST(T x, T y, T z, T i, T j, T k, T u, T v, T w)
+#define NUM_AXIS_ELEM(O)      NUM_AXIS_LIST(O.x, O.y, O.z, O.i, O.j, O.k, O.u, O.v, O.w)
+#define NUM_AXIS_DECL(T,V)    NUM_AXIS_LIST(T x=V, T y=V, T z=V, T i=V, T j=V, T k=V, T u=V, T v=V, T w=V)
 #define MAIN_AXIS_NAMES       NUM_AXIS_LIST(X, Y, Z, I, J, K, U, V, W)
 #define MAIN_AXIS_NAMES_LC    NUM_AXIS_LIST(x, y, z, i, j, k, u, v, w)
 #define STR_AXES_MAIN         NUM_AXIS_GANG("X", "Y", "Z", STR_I, STR_J, STR_K, STR_U, STR_V, STR_W)
 
-#define LOGICAL_AXIS_GANG(N,V...)  NUM_AXIS_GANG(V) GANG_ITEM_E(N)
-#define LOGICAL_AXIS_CODE(N,V...)  NUM_AXIS_CODE(V) CODE_ITEM_E(N)
-#define LOGICAL_AXIS_LIST(N,V...)  NUM_AXIS_LIST(V) LIST_ITEM_E(N)
+#define LOGICAL_AXIS_GANG(E,V...)  NUM_AXIS_GANG(V) GANG_ITEM_E(E)
+#define LOGICAL_AXIS_CODE(E,V...)  NUM_AXIS_CODE(V) CODE_ITEM_E(E)
+#define LOGICAL_AXIS_LIST(E,V...)  NUM_AXIS_LIST(V) LIST_ITEM_E(E)
 #define LOGICAL_AXIS_LIST_1(V)     NUM_AXIS_LIST_1(V) LIST_ITEM_E(V)
-#define LOGICAL_AXIS_ARRAY(N,V...) { LOGICAL_AXIS_LIST(N,V) }
+#define LOGICAL_AXIS_ARRAY(E,V...) { LOGICAL_AXIS_LIST(E,V) }
 #define LOGICAL_AXIS_ARRAY_1(V)    { LOGICAL_AXIS_LIST_1(V) }
-#define LOGICAL_AXIS_ARGS(T)       LOGICAL_AXIS_LIST(T E, T X, T Y, T Z, T I, T J, T K, T U, T V, T W)
-#define LOGICAL_AXIS_ARGS_LC(T)    LOGICAL_AXIS_LIST(T e, T x, T y, T z, T i, T j, T k, T u, T v, T w)
-#define LOGICAL_AXIS_ELEM(O)       LOGICAL_AXIS_LIST(O.E, O.X, O.Y, O.Z, O.I, O.J, O.K, O.U, O.V, O.W)
-#define LOGICAL_AXIS_ELEM_LC(O)    LOGICAL_AXIS_LIST(O.e, O.x, O.y, O.z, O.i, O.j, O.k, O.u, O.v, O.w)
-#define LOGICAL_AXIS_DECL(T,V)     LOGICAL_AXIS_LIST(T E=V, T X=V, T Y=V, T Z=V, T I=V, T J=V, T K=V, T U=V, T V=V, T W=V)
-#define LOGICAL_AXIS_DECL_LC(T,V)  LOGICAL_AXIS_LIST(T e=V, T x=V, T y=V, T z=V, T i=V, T j=V, T k=V, T u=V, T v=V, T w=V)
+#define LOGICAL_AXIS_ARGS(T)       LOGICAL_AXIS_LIST(T e, T x, T y, T z, T i, T j, T k, T u, T v, T w)
+#define LOGICAL_AXIS_ELEM(O)       LOGICAL_AXIS_LIST(O.e, O.x, O.y, O.z, O.i, O.j, O.k, O.u, O.v, O.w)
+#define LOGICAL_AXIS_DECL(T,V)     LOGICAL_AXIS_LIST(T e=V, T x=V, T y=V, T z=V, T i=V, T j=V, T k=V, T u=V, T v=V, T w=V)
 #define LOGICAL_AXIS_NAMES         LOGICAL_AXIS_LIST(E, X, Y, Z, I, J, K, U, V, W)
 #define LOGICAL_AXIS_NAMES_LC      LOGICAL_AXIS_LIST(e, x, y, z, i, j, k, u, v, w)
 #define LOGICAL_AXIS_MAP(F)        MAP(F, LOGICAL_AXIS_NAMES)
@@ -74,8 +68,8 @@ template <class L, class R> struct IF<true, L, R> { typedef L type; };
   #define NUM_AXES_SEP ,
   #define MAIN_AXIS_MAP(F)    MAP(F, MAIN_AXIS_NAMES)
   #define MAIN_AXIS_MAP_LC(F) MAP(F, MAIN_AXIS_NAMES_LC)
-  #define OPTARGS_NUM(T)      , NUM_AXIS_ARGS_LC(T)
-  #define OPTARGS_LOGICAL(T)  , LOGICAL_AXIS_ARGS_LC(T)
+  #define OPTARGS_NUM(T)      , NUM_AXIS_ARGS(T)
+  #define OPTARGS_LOGICAL(T)  , LOGICAL_AXIS_ARGS(T)
 #else
   #define NUM_AXES_SEP
   #define MAIN_AXIS_MAP(F)
@@ -87,8 +81,8 @@ template <class L, class R> struct IF<true, L, R> { typedef L type; };
 #define NUM_AXIS_GANG_(V...)    NUM_AXIS_GANG(V) NUM_AXES_SEP
 #define NUM_AXIS_LIST_(V...)    NUM_AXIS_LIST(V) NUM_AXES_SEP
 #define NUM_AXIS_LIST_1_(V...)  NUM_AXIS_LIST_1(V) NUM_AXES_SEP
-#define NUM_AXIS_ARGS_(T)       NUM_AXIS_ARGS_LC(T) NUM_AXES_SEP
-#define NUM_AXIS_ELEM_(T)       NUM_AXIS_ELEM_LC(T) NUM_AXES_SEP
+#define NUM_AXIS_ARGS_(T)       NUM_AXIS_ARGS(T) NUM_AXES_SEP
+#define NUM_AXIS_ELEM_(T)       NUM_AXIS_ELEM(T) NUM_AXES_SEP
 #define MAIN_AXIS_NAMES_        MAIN_AXIS_NAMES NUM_AXES_SEP
 #define MAIN_AXIS_NAMES_LC_     MAIN_AXIS_NAMES_LC NUM_AXES_SEP
 
@@ -101,26 +95,15 @@ template <class L, class R> struct IF<true, L, R> { typedef L type; };
 #define LOGICAL_AXIS_GANG_(V...)    LOGICAL_AXIS_GANG(V) LOGICAL_AXES_SEP
 #define LOGICAL_AXIS_LIST_(V...)    LOGICAL_AXIS_LIST(V) LOGICAL_AXES_SEP
 #define LOGICAL_AXIS_LIST_1_(V...)  LOGICAL_AXIS_LIST_1(V) LOGICAL_AXES_SEP
-#define LOGICAL_AXIS_ARGS_(T)       LOGICAL_AXIS_ARGS_LC(T) LOGICAL_AXES_SEP
+#define LOGICAL_AXIS_ARGS_(T)       LOGICAL_AXIS_ARGS(T) LOGICAL_AXES_SEP
 #define LOGICAL_AXIS_ELEM_(T)       LOGICAL_AXIS_ELEM(T) LOGICAL_AXES_SEP
-#define LOGICAL_AXIS_ELEM_LC_(T)    LOGICAL_AXIS_ELEM_LC(T) LOGICAL_AXES_SEP
 #define LOGICAL_AXIS_NAMES_         LOGICAL_AXIS_NAMES LOGICAL_AXES_SEP
 #define LOGICAL_AXIS_NAMES_LC_      LOGICAL_AXIS_NAMES_LC LOGICAL_AXES_SEP
 
 #define SECONDARY_AXIS_GANG(V...) GANG_N(SECONDARY_AXES, V)
 #define SECONDARY_AXIS_CODE(V...) CODE_N(SECONDARY_AXES, V)
 #define SECONDARY_AXIS_LIST(V...) LIST_N(SECONDARY_AXES, V)
-#if SECONDARY_AXES
-  #define SECONDARY_AXIS_NAMES      SECONDARY_AXIS_LIST(I, J, K, U, V, W)
-  #define SECONDARY_AXIS_NAMES_LC   SECONDARY_AXIS_LIST(i, j, k, u, v, w)
-  #define SECONDARY_AXIS_ARGS(T)    SECONDARY_AXIS_LIST(T I, T J, T K, T U, T V, T W)
-  #define SECONDARY_AXIS_ARGS_LC(T) SECONDARY_AXIS_LIST(T i, T j, T k, T u, T v, T w)
-  #define SECONDARY_AXIS_MAP(F)     MAP(F, SECONDARY_AXIS_NAMES)
-  #define SECONDARY_AXIS_MAP_LC(F)  MAP(F, SECONDARY_AXIS_NAMES_LC)
-#else
-  #define SECONDARY_AXIS_MAP(F)
-  #define SECONDARY_AXIS_MAP_LC(F)
-#endif
+#define SECONDARY_AXIS_ARGS(T)    SECONDARY_AXIS_LIST(T i, T j, T k, T u, T v, T w)
 
 // Just the XY or XYZ elements
 #if HAS_Z_AXIS
@@ -176,90 +159,36 @@ template <class L, class R> struct IF<true, L, R> { typedef L type; };
 #define FI FORCE_INLINE
 
 // Define types based on largest bit width stored value required
-#define bits_t(W)   typename IF<((W)>   32), uint64_t, typename IF<((W)> 16), uint32_t, typename IF<((W)>8), uint16_t, uint8_t>::type>::type>::type
+#define bits_t(W)   typename IF<((W)>   16), uint32_t, typename IF<((W)>  8), uint16_t, uint8_t>::type>::type
 #define uvalue_t(V) typename IF<((V)>65535), uint32_t, typename IF<((V)>255), uint16_t, uint8_t>::type>::type
 #define value_t(V)  typename IF<((V)>32767),  int32_t, typename IF<((V)>127),  int16_t,  int8_t>::type>::type
 
-// Define a template for a bit field of N bits, using the smallest type that can hold N bits
-template<size_t N, bool UseArray = (N > 64)>
-struct Flags;
-
-// Flag bits for <= 64 states
+// General Flags for some number of states
 template<size_t N>
-struct Flags<N, false> {
+struct Flags {
   typedef bits_t(N) flagbits_t;
-  flagbits_t b;
-
-  class BitProxy {
-  public:
-    BitProxy(flagbits_t& data, int bit) : data_(data), bit_(bit) {}
-
-    BitProxy& operator=(const bool value) {
-      if (value)
-        data_ |=  (flagbits_t(1) << bit_);
-      else
-        data_ &= ~(flagbits_t(1) << bit_);
-      return *this;
-    }
-
-    operator bool() const { return bool(data_ & (flagbits_t(1) << bit_)); }
-
-  private:
-    flagbits_t& data_;
-    uint8_t bit_;
+  typedef struct { bool b0:1, b1:1, b2:1, b3:1, b4:1, b5:1, b6:1, b7:1; } N8;
+  typedef struct { bool b0:1, b1:1, b2:1, b3:1, b4:1, b5:1, b6:1, b7:1, b8:1, b9:1, b10:1, b11:1, b12:1, b13:1, b14:1, b15:1; } N16;
+  typedef struct { bool b0:1,  b1:1,  b2:1,  b3:1,  b4:1,  b5:1,  b6:1,  b7:1,  b8:1,  b9:1, b10:1, b11:1, b12:1, b13:1, b14:1, b15:1,
+                       b16:1, b17:1, b18:1, b19:1, b20:1, b21:1, b22:1, b23:1, b24:1, b25:1, b26:1, b27:1, b28:1, b29:1, b30:1, b31:1; } N32;
+  union {
+    flagbits_t b;
+    typename IF<(N>16), N32, typename IF<(N>8), N16, N8>::type>::type flag;
   };
-
   FI void reset()                            { b = 0; }
   FI void set(const int n, const bool onoff) { onoff ? set(n) : clear(n); }
-  FI void set(const int n)                   { b |=  (flagbits_t(1) << n); }
-  FI void clear(const int n)                 { b &= ~(flagbits_t(1) << n); }
-  FI bool test(const int n) const            { return bool(b & (flagbits_t(1) << n)); }
-  FI BitProxy operator[](const int n)        { return BitProxy(b, n); }
+  FI void set(const int n)                   { b |=  (flagbits_t)_BV(n); }
+  FI void clear(const int n)                 { b &= ~(flagbits_t)_BV(n); }
+  FI bool test(const int n) const            { return TEST(b, n); }
+  FI bool operator[](const int n)            { return test(n); }
   FI bool operator[](const int n) const      { return test(n); }
   FI int size() const                        { return sizeof(b); }
-  FI operator bool() const                   { return b != 0; }
-};
-
-// Flag bits for more than 64 states
-template<size_t N>
-struct Flags<N, true> {
-  uint8_t bitmask[(N+7)>>3];
-  // Proxy class for handling bit assignment
-  class BitProxy {
-  public:
-    BitProxy(uint8_t data[], int n) : data_(data[n >> 3]), bit_(n & 7) {}
-
-    // Assignment operator
-    BitProxy& operator=(const bool value) {
-      if (value)
-        data_ |=  _BV(bit_);
-      else
-        data_ &= ~_BV(bit_);
-      return *this;
-    }
-
-    // Conversion operator to bool
-    operator bool() const { return TEST(data_, bit_); }
-
-  private:
-    uint8_t& data_;
-    uint8_t bit_;
-  };
-
-  FI void reset()                            { for (uint8_t b = 0; b < sizeof(bitmask); ++b) bitmask[b] = 0; }
-  FI void set(const int n, const bool onoff) { onoff ? set(n) : clear(n); }
-  FI void set(const int n)                   { bitmask[n >> 3] |=  _BV(n & 7); }
-  FI void clear(const int n)                 { bitmask[n >> 3] &= ~_BV(n & 7); }
-  FI bool test(const int n) const            { return TEST(bitmask[n >> 3], n & 7); }
-  FI BitProxy operator[](const int n)        { return BitProxy(bitmask, n); }
-  FI bool operator[](const int n) const      { return test(n); }
-  FI int size() const                        { return sizeof(bitmask); }
-  FI operator bool() const                   { for (uint8_t b : bitmask) if (b) return true; return false; }
+  FI operator bool() const                   { return b; }
 };
 
 // Specialization for a single bool flag
 template<>
-struct Flags<1, false> {
+struct Flags<1> {
   bool b;
   FI void reset()                            { b = false; }
   FI void set(const int n, const bool onoff) { onoff ? set(n) : clear(n); }
@@ -289,7 +218,7 @@ typedef struct {
   FI bool operator[](const int n)            { return flags[n]; }
   FI bool operator[](const int n) const      { return flags[n]; }
   FI int size() const                        { return sizeof(flags); }
-  FI operator bool() const                   { return (bool)flags; }
+  FI operator bool() const                   { return flags; }
 } AxisFlags;
 
 //
@@ -314,7 +243,7 @@ enum AxisEnum : uint8_t {
   #endif
 
   // Distinct axes, including all E and Core
-  NUM_AXIS_HEADS,
+  NUM_AXIS_ENUMS,
 
   // Most of the time we refer only to the single E_AXIS
   #if HAS_EXTRUDERS
@@ -499,9 +428,7 @@ template<typename T>
 struct XYval {
   union {
     struct { T x, y; };
-    struct { T X, Y; };
     struct { T a, b; };
-    struct { T A, B; };
     T pos[2];
   };
 
@@ -627,9 +554,7 @@ struct XYZval {
   union {
     #if NUM_AXES
       struct { NUM_AXIS_CODE(T x, T y, T z, T i, T j, T k, T u, T v, T w); };
-      struct { NUM_AXIS_CODE(T X, T Y, T Z, T I, T J, T K, T U, T V, T W); };
       struct { NUM_AXIS_CODE(T a, T b, T c, T _i, T _j, T _k, T _u, T _v, T _w); };
-      struct { NUM_AXIS_CODE(T A, T B, T C, T II, T JJ, T KK, T UU, T VV, T WW); };
     #endif
     T pos[NUM_AXES];
   };
@@ -643,14 +568,14 @@ struct XYZval {
   FI void set(const T (&arr)[NUM_AXES])          { NUM_AXIS_CODE(x = arr[0], y = arr[1], z = arr[2], i = arr[3], j = arr[4], k = arr[5], u = arr[6], v = arr[7], w = arr[8]); }
   #if LOGICAL_AXES > NUM_AXES
     FI void set(const T (&arr)[LOGICAL_AXES])    { NUM_AXIS_CODE(x = arr[0], y = arr[1], z = arr[2], i = arr[3], j = arr[4], k = arr[5], u = arr[6], v = arr[7], w = arr[8]); }
-    FI void set(LOGICAL_AXIS_ARGS_LC(const T))   { NUM_AXIS_CODE(a = x,  b = y,  c = z, _i = i, _j = j, _k = k, _u = u, _v = v, _w = w); }
+    FI void set(LOGICAL_AXIS_ARGS(const T))      { NUM_AXIS_CODE(a = x,  b = y,  c = z, _i = i, _j = j, _k = k, _u = u, _v = v, _w = w); }
     #if DISTINCT_AXES > LOGICAL_AXES
       FI void set(const T (&arr)[DISTINCT_AXES]) { NUM_AXIS_CODE(x = arr[0], y = arr[1], z = arr[2], i = arr[3], j = arr[4], k = arr[5], u = arr[6], v = arr[7], w = arr[8]); }
     #endif
   #endif
 
   // Setter for all individual args
-  FI void set(NUM_AXIS_ARGS_LC(const T)) { NUM_AXIS_CODE(a = x, b = y, c = z, _i = i, _j = j, _k = k, _u = u, _v = v, _w = w); }
+  FI void set(NUM_AXIS_ARGS(const T)) { NUM_AXIS_CODE(a = x, b = y, c = z, _i = i, _j = j, _k = k, _u = u, _v = v, _w = w); }
 
   // Setters with fewer elements leave the rest untouched
   #if HAS_Y_AXIS
@@ -716,7 +641,7 @@ struct XYZval {
   // Assignment operator overrides do the expected thing
   FI XYZval<T>& operator= (const T v)            { set(ARRAY_N_1(NUM_AXES, v)); return *this; }
   FI XYZval<T>& operator= (const XYval<T>   &rs) { set(rs.x, rs.y); return *this; }
-  FI XYZval<T>& operator= (const XYZEval<T> &rs) { set(NUM_AXIS_ELEM_LC(rs)); return *this; }
+  FI XYZval<T>& operator= (const XYZEval<T> &rs) { set(NUM_AXIS_ELEM(rs)); return *this; }
 
   // Override other operators to get intuitive behaviors
   FI constexpr XYZval<T> operator+ (const XYval<T>   &rs) const { return NUM_AXIS_ARRAY(x + rs.x, y + rs.y, z, i, j, k, u, v, w ); }
@@ -775,10 +700,8 @@ struct XYZval {
 template<typename T>
 struct XYZEval {
   union {
-    struct { T LOGICAL_AXIS_ARGS_LC(); };
     struct { T LOGICAL_AXIS_ARGS(); };
     struct { T LOGICAL_AXIS_LIST(_e, a, b, c, _i, _j, _k, _u, _v, _w); };
-    struct { T LOGICAL_AXIS_LIST(EE, A, B, C, II, JJ, KK, UU, VV, WW); };
     T pos[LOGICAL_AXES];
   };
   // Reset all to 0
@@ -787,20 +710,20 @@ struct XYZEval {
   // Setters taking struct types and arrays
   FI void set(const XYval<T> pxy)                           { XY_CODE(x = pxy.x, y = pxy.y); }
   FI void set(const XYval<T> pxy, const T pz)               { XYZ_CODE(x = pxy.x, y = pxy.y, z = pz); }
-  FI void set(const XYZval<T> pxyz)                         { set(NUM_AXIS_ELEM_LC(pxyz)); }
+  FI void set(const XYZval<T> pxyz)                         { set(NUM_AXIS_ELEM(pxyz)); }
   FI void set(const T (&arr)[NUM_AXES])                     { NUM_AXIS_CODE(x = arr[0], y = arr[1], z = arr[2], i = arr[3], j = arr[4], k = arr[5], u = arr[6], v = arr[7], w = arr[8]); }
   #if LOGICAL_AXES > NUM_AXES
     FI void set(const T (&arr)[LOGICAL_AXES])               { LOGICAL_AXIS_CODE(e = arr[LOGICAL_AXES-1], x = arr[0], y = arr[1], z = arr[2], i = arr[3], j = arr[4], k = arr[5], u = arr[6], v = arr[7], w = arr[8]); }
     FI void set(const XYval<T> pxy, const T pz, const T pe) { set(pxy, pz); e = pe; }
     FI void set(const XYZval<T> pxyz, const T pe)           { set(pxyz); e = pe; }
-    FI void set(LOGICAL_AXIS_ARGS_LC(const T))              { LOGICAL_AXIS_CODE(_e = e, a = x, b = y, c = z, _i = i, _j = j, _k = k, _u = u, _v = v, _w = w); }
+    FI void set(LOGICAL_AXIS_ARGS(const T))                 { LOGICAL_AXIS_CODE(_e = e, a = x, b = y, c = z, _i = i, _j = j, _k = k, _u = u, _v = v, _w = w); }
     #if DISTINCT_AXES > LOGICAL_AXES
       FI void set(const T (&arr)[DISTINCT_AXES])            { LOGICAL_AXIS_CODE(e = arr[LOGICAL_AXES-1], x = arr[0], y = arr[1], z = arr[2], i = arr[3], j = arr[4], k = arr[5], u = arr[6], v = arr[7], w = arr[8]); }
     #endif
   #endif
 
   // Setter for all individual args
-  FI void set(NUM_AXIS_ARGS_LC(const T)) { NUM_AXIS_CODE(a = x, b = y, c = z, _i = i, _j = j, _k = k, _u = u, _v = v, _w = w); }
+  FI void set(NUM_AXIS_ARGS(const T)) { NUM_AXIS_CODE(a = x, b = y, c = z, _i = i, _j = j, _k = k, _u = u, _v = v, _w = w); }
 
   // Setters with fewer elements leave the rest untouched
   #if HAS_Y_AXIS
@@ -865,7 +788,7 @@ struct XYZEval {
   // Assignment operator overrides do the expected thing
   FI XYZEval<T>& operator= (const T v)           { set(LOGICAL_AXIS_LIST_1(v)); return *this; }
   FI XYZEval<T>& operator= (const XYval<T>  &rs) { set(rs.x, rs.y); return *this; }
-  FI XYZEval<T>& operator= (const XYZval<T> &rs) { set(NUM_AXIS_ELEM_LC(rs)); return *this; }
+  FI XYZEval<T>& operator= (const XYZval<T> &rs) { set(NUM_AXIS_ELEM(rs)); return *this; }
 
   // Override other operators to get intuitive behaviors
   FI constexpr XYZEval<T> operator+ (const XYval<T>  &rs)  const { return LOGICAL_AXIS_ARRAY(e, x + rs.x, y + rs.y, z, i, j, k, u, v, w); }
@@ -925,9 +848,7 @@ struct XYZarray {
   union {
     el data[LOGICAL_AXES];
     struct { NUM_AXIS_CODE(T x, T y, T z, T i, T j, T k, T u, T v, T w); };
-    struct { NUM_AXIS_CODE(T X, T Y, T Z, T I, T J, T K, T U, T V, T W); };
     struct { NUM_AXIS_CODE(T a, T b, T c, T _i, T _j, T _k, T _u, T _v, T _w); };
-    struct { NUM_AXIS_CODE(T A, T B, T C, T II, T JJ, T KK, T UU, T VV, T WW); };
   };
   FI void reset() { ZERO(data); }
 
@@ -973,8 +894,6 @@ struct XYZEarray {
   union {
     el data[LOGICAL_AXES];
     struct { el LOGICAL_AXIS_ARGS(); };
-    struct { el LOGICAL_AXIS_ARGS_LC(); };
-    struct { el LOGICAL_AXIS_LIST(EE, A, B, C, II, JJ, KK, UU, VV, WW); };
     struct { el LOGICAL_AXIS_LIST(_e, a, b, c, _i, _j, _k, _u, _v, _w); };
   };
   FI void reset() { ZERO(data); }
@@ -986,7 +905,7 @@ struct XYZEarray {
   // Setter for all individual args
   FI void set(const int n OPTARGS_NUM(const T)) { NUM_AXIS_CODE(a[n] = x, b[n] = y, c[n] = z, _i[n] = i, _j[n] = j, _k[n] = k, _u[n] = u, _v[n] = v, _w[n] = w); }
   #if LOGICAL_AXES > NUM_AXES
-    FI void set(const int n, LOGICAL_AXIS_ARGS_LC(const T)) { LOGICAL_AXIS_CODE(_e[n] = e, a[n] = x, b[n] = y, c[n] = z, _i[n] = i, _j[n] = j, _k[n] = k, _u[n] = u, _v[n] = v, _w[n] = w); }
+    FI void set(const int n, LOGICAL_AXIS_ARGS(const T)) { LOGICAL_AXIS_CODE(_e[n] = e, a[n] = x, b[n] = y, c[n] = z, _i[n] = i, _j[n] = j, _k[n] = k, _u[n] = u, _v[n] = v, _w[n] = w); }
   #endif
 
   // Setters with fewer elements leave the rest untouched
@@ -1022,7 +941,7 @@ class AxisBits;
 
 class AxisBits {
 public:
-  typedef bits_t(NUM_AXIS_HEADS) el;
+  typedef bits_t(NUM_AXIS_ENUMS) el;
   union {
     el bits;
     // Axes x, y, z ... e0, e1, e2 ... hx, hy, hz
@@ -1075,25 +994,6 @@ public:
     };
   };
 
-  class BitProxy {
-  public:
-    BitProxy(el& data, int bit) : data_(data), bit_(bit) {}
-
-    BitProxy& operator=(const bool value) {
-      if (value)
-        data_ |=  (el(1) << bit_);
-      else
-        data_ &= ~(el(1) << bit_);
-      return *this;
-    }
-
-    operator bool() const { return bool(data_ & (el(1) << bit_)); }
-
-  private:
-    el& data_;
-    uint8_t bit_;
-  };
-
   AxisBits() { reset(); }
 
   // Constructor, setter, and operator= for bit mask
@@ -1102,7 +1002,7 @@ public:
   FI AxisBits& operator=(const el p) { set(p); return *this; }
 
   FI void reset() { set(0); }
-  FI void fill() { set(_BV(NUM_AXIS_HEADS) - 1); }
+  FI void fill() { set(_BV(NUM_AXIS_ENUMS) - 1); }
 
   #define MSET(pE,pX,pY,pZ,pI,pJ,pK,pU,pV,pW) LOGICAL_AXIS_CODE(e=pE, x=pX, y=pY, z=pZ, i=pI, j=pJ, k=pK, u=pU, v=pV, w=pW)
 
@@ -1194,9 +1094,7 @@ public:
   FI void bset(const AxisEnum n, const bool b) { if (b) bset(n); else bclr(n); }
 
   // Accessor via an AxisEnum (or any integer) [index]
-  FI BitProxy operator[](const int n)        { return BitProxy(bits, n); }
-  FI BitProxy operator[](const AxisEnum n)   { return BitProxy(bits, n); }
-  FI bool operator[](const int n)      const { return TEST(bits, n); }
+  FI bool operator[](const int n) const { return TEST(bits, n); }
   FI bool operator[](const AxisEnum n) const { return TEST(bits, n); }
 
   FI AxisBits& operator|=(const el &p) { bits |= el(p); return *this; }

Marlin/src/feature/babystep.cpp

@@ -60,7 +60,7 @@ void Babystep::add_mm(const AxisEnum axis, const_float_t mm) {
 
 #if ENABLED(BD_SENSOR)
   void Babystep::set_mm(const AxisEnum axis, const_float_t mm) {
-    //if (DISABLED(BABYSTEP_WITHOUT_HOMING) && axis_should_home(axis)) return;
+    //if (DISABLED(BABYSTEP_WITHOUT_HOMING) && axes_should_home(_BV(axis))) return;
     const int16_t distance = mm * planner.settings.axis_steps_per_mm[axis];
     accum = distance; // Count up babysteps for the UI
     steps[BS_AXIS_IND(axis)] = distance;
@@ -70,12 +70,8 @@ void Babystep::add_mm(const AxisEnum axis, const_float_t mm) {
   }
 #endif
 
-bool Babystep::can_babystep(const AxisEnum axis) {
-  return (ENABLED(BABYSTEP_WITHOUT_HOMING) || !axis_should_home(axis));
-}
-
 void Babystep::add_steps(const AxisEnum axis, const int16_t distance) {
-  if (!can_babystep(axis)) return;
+  if (DISABLED(BABYSTEP_WITHOUT_HOMING) && axes_should_home(_BV(axis))) return;
 
   accum += distance; // Count up babysteps for the UI
   steps[BS_AXIS_IND(axis)] += distance;

Marlin/src/feature/babystep.h

@@ -59,7 +59,6 @@ public:
     }
   #endif
 
-  static bool can_babystep(const AxisEnum axis);
   static void add_steps(const AxisEnum axis, const int16_t distance);
   static void add_mm(const AxisEnum axis, const_float_t mm);
 

Marlin/src/feature/binary_stream.h

@@ -146,9 +146,9 @@ public:
     transfer_timeout = millis() + TIMEOUT;
     switch (static_cast<FileTransfer>(packet_type)) {
       case FileTransfer::QUERY:
-        SERIAL_ECHO(F("PFT:version:"), VERSION_MAJOR, C('.'), VERSION_MINOR, C('.'), VERSION_PATCH);
+        SERIAL_ECHOPGM("PFT:version:", VERSION_MAJOR, ".", VERSION_MINOR, ".", VERSION_PATCH);
         #if ENABLED(BINARY_STREAM_COMPRESSION)
-          SERIAL_ECHOLN(F(":compression:heatshrink,"), HEATSHRINK_STATIC_WINDOW_BITS, C(','), HEATSHRINK_STATIC_LOOKAHEAD_BITS);
+          SERIAL_ECHOLNPGM(":compression:heatshrink,", HEATSHRINK_STATIC_WINDOW_BITS, ",", HEATSHRINK_STATIC_LOOKAHEAD_BITS);
         #else
           SERIAL_ECHOLNPGM(":compression:none");
         #endif
@@ -322,7 +322,7 @@ public:
             if (packet.header.checksum == packet.header_checksum) {
               // The SYNC control packet is a special case in that it doesn't require the stream sync to be correct
               if (static_cast<Protocol>(packet.header.protocol()) == Protocol::CONTROL && static_cast<ProtocolControl>(packet.header.type()) == ProtocolControl::SYNC) {
-                  SERIAL_ECHOLN(F("ss"), sync, C(','), buffer_size, C(','), VERSION_MAJOR, C('.'), VERSION_MINOR, C('.'), VERSION_PATCH);
+                  SERIAL_ECHOLNPGM("ss", sync, ",", buffer_size, ",", VERSION_MAJOR, ".", VERSION_MINOR, ".", VERSION_PATCH);
                   stream_state = StreamState::PACKET_RESET;
                   break;
               }

Marlin/src/feature/bltouch.cpp

@@ -72,9 +72,13 @@ void BLTouch::init(const bool set_voltage/*=false*/) {
   #else
 
     #ifdef DEBUG_OUT
-      if (DEBUGGING(LEVELING))
-        DEBUG_ECHOLN( F("BLTouch Mode: "), bltouch.od_5v_mode ? F("5V") : F("OD"),
-                      F(" (Default " TERN(BLTOUCH_SET_5V_MODE, "5V", "OD") ")"));
+      if (DEBUGGING(LEVELING)) {
+        PGMSTR(mode0, "OD");
+        PGMSTR(mode1, "5V");
+        DEBUG_ECHOPGM("BLTouch Mode: ");
+        DEBUG_ECHOPGM_P(bltouch.od_5v_mode ? mode1 : mode0);
+        DEBUG_ECHOLNPGM(" (Default " TERN(BLTOUCH_SET_5V_MODE, "5V", "OD") ")");
+      }
     #endif
 
     const bool should_set = od_5v_mode != ENABLED(BLTOUCH_SET_5V_MODE);

Marlin/src/feature/controllerfan.cpp

@@ -70,9 +70,7 @@ void ControllerFan::update() {
      */
     const ena_mask_t axis_mask = TERN(CONTROLLER_FAN_USE_Z_ONLY, _BV(Z_AXIS), (ena_mask_t)~TERN0(CONTROLLER_FAN_IGNORE_Z, _BV(Z_AXIS)));
     if ( (stepper.axis_enabled.bits & axis_mask)
-      #if ALL(HAS_HEATED_BED, CONTROLLER_FAN_BED_HEATING)
-        || thermalManager.temp_bed.soft_pwm_amount > 0
-      #endif
+      || TERN0(HAS_HEATED_BED, thermalManager.temp_bed.soft_pwm_amount > 0)
       #ifdef CONTROLLER_FAN_MIN_BOARD_TEMP
         || thermalManager.wholeDegBoard() >= CONTROLLER_FAN_MIN_BOARD_TEMP
       #endif

Marlin/src/feature/e_parser.cpp

@@ -61,13 +61,9 @@ extern bool wait_for_user, wait_for_heatup;
 #endif
 
 void EmergencyParser::update(EmergencyParser::State &state, const uint8_t c) {
-  auto uppercase = [](char c) {
-    return TERN0(GCODE_CASE_INSENSITIVE, WITHIN(c, 'a', 'z')) ? c + 'A' - 'a' : c;
-  };
-
   switch (state) {
     case EP_RESET:
-      switch (uppercase(c)) {
+      switch (c) {
         case ' ': case '\n': case '\r': break;
         case 'N': state = EP_N; break;
         case 'M': state = EP_M; break;
@@ -85,7 +81,7 @@ void EmergencyParser::update(EmergencyParser::State &state, const uint8_t c) {
       break;
 
     case EP_N:
-      switch (uppercase(c)) {
+      switch (c) {
         case '0' ... '9':
         case '-': case ' ':     break;
         case 'M': state = EP_M; break;
@@ -156,8 +152,20 @@ void EmergencyParser::update(EmergencyParser::State &state, const uint8_t c) {
     #endif
 
     #if ENABLED(EP_BABYSTEPPING)
-      case EP_M2:  state = (c == '9') ? EP_M29  : EP_IGNORE; break;
-      case EP_M29: state = (c == '3') ? EP_M293 : (c == '4') ? EP_M294 : EP_IGNORE; break;
+      case EP_M2:
+        switch (c) {
+          case '9': state = EP_M29;    break;
+          default: state  = EP_IGNORE;
+        }
+        break;
+
+      case EP_M29:
+        switch (c) {
+          case '3': state = EP_M293;   break;
+          case '4': state = EP_M294;   break;
+          default: state  = EP_IGNORE;
+        }
+        break;
     #endif
 
     #if ENABLED(HOST_PROMPT_SUPPORT)
@@ -166,7 +174,7 @@ void EmergencyParser::update(EmergencyParser::State &state, const uint8_t c) {
       case EP_M87: state = (c == '6') ? EP_M876 : EP_IGNORE; break;
 
       case EP_M876:
-        switch (uppercase(c)) {
+        switch (c) {
           case ' ': break;
           case 'S': state = EP_M876S; break;
           default: state = EP_IGNORE; break;

Marlin/src/feature/easythreed_ui.cpp

@@ -189,7 +189,7 @@ void EasythreedUI::printButton() {
             blink_interval_ms = LED_BLINK_2;                        // Blink the indicator LED at 1 second intervals
             print_key_flag = PF_PAUSE;                              // The "Print" button now pauses the print
             card.mount();                                           // Force SD card to mount - now!
-            if (!card.isMounted()) {                                // Failed to mount?
+            if (!card.isMounted) {                                  // Failed to mount?
               blink_interval_ms = LED_OFF;                          // Turn off LED
               print_key_flag = PF_START;
               return;                                               // Bail out

Marlin/src/feature/filwidth.cpp

@@ -28,7 +28,7 @@
 
 FilamentWidthSensor filwidth;
 
-bool FilamentWidthSensor::enabled; // = false                           // (M405-M406) Filament Width Sensor ON/OFF.
+bool FilamentWidthSensor::enabled; // = false;                          // (M405-M406) Filament Width Sensor ON/OFF.
 uint32_t FilamentWidthSensor::accum; // = 0                             // ADC accumulator
 uint16_t FilamentWidthSensor::raw; // = 0                               // Measured filament diameter - one extruder only
 float FilamentWidthSensor::nominal_mm = DEFAULT_NOMINAL_FILAMENT_DIA,   // (M104) Nominal filament width

Marlin/src/feature/host_actions.cpp

@@ -197,7 +197,7 @@ void HostUI::action(FSTR_P const fstr, const bool eol) {
             #endif
             #if HAS_FILAMENT_SENSOR
               if (runout.filament_ran_out) {                      // Disable a triggered sensor
-                runout.enabled = false;
+                runout.enabled[active_extruder] = false;
                 runout.reset();
               }
             #endif

Marlin/src/feature/hotend_idle.cpp

@@ -40,7 +40,7 @@
 HotendIdleProtection hotend_idle;
 
 millis_t HotendIdleProtection::next_protect_ms = 0;
-hotend_idle_settings_t HotendIdleProtection::cfg; // Initialized by settings.load
+hotend_idle_settings_t HotendIdleProtection::cfg; // Initialized by settings.load()
 
 void HotendIdleProtection::check_hotends(const millis_t &ms) {
   const bool busy = (TERN0(HAS_RESUME_CONTINUE, wait_for_user) || planner.has_blocks_queued());

Marlin/src/feature/joystick.cpp

@@ -123,7 +123,7 @@ Joystick joystick;
 
   void Joystick::inject_jog_moves() {
     // Recursion barrier
-    static bool injecting_now; // = false
+    static bool injecting_now; // = false;
     if (injecting_now) return;
 
     #if ENABLED(NO_MOTION_BEFORE_HOMING)

Marlin/src/feature/leds/leds.cpp

@@ -83,7 +83,7 @@ void LEDLights::setup() {
             if (i == 1 && PWM_PIN(RGB_LED_G_PIN)) hal.set_pwm_duty(pin_t(RGB_LED_G_PIN), led_pwm); else WRITE(RGB_LED_G_PIN, b < 100 ? HIGH : LOW);
             if (i == 2 && PWM_PIN(RGB_LED_B_PIN)) hal.set_pwm_duty(pin_t(RGB_LED_B_PIN), led_pwm); else WRITE(RGB_LED_B_PIN, b < 100 ? HIGH : LOW);
             #if ENABLED(RGBW_LED)
-              if (i == 3) {
+              if (i == 3){
                 if (PWM_PIN(RGB_LED_W_PIN)) hal.set_pwm_duty(pin_t(RGB_LED_W_PIN), led_pwm);
                 else WRITE(RGB_LED_W_PIN, b < 100 ? HIGH : LOW);
                 delay(RGB_STARTUP_TEST_INNER_MS);//More slowing for ending

Marlin/src/feature/leds/pca9632.cpp

@@ -148,7 +148,7 @@ void PCA9632_set_led_color(const LEDColor &color) {
 
 #if ENABLED(PCA9632_BUZZER)
 
-  void PCA9632_buzz(const long, const uint16_t/*=0*/) {
+  void PCA9632_buzz(const long, const uint16_t=0) {
     uint8_t data[] = PCA9632_BUZZER_DATA;
     Wire.beginTransmission(I2C_ADDRESS(PCA9632_ADDRESS));
     Wire.write(data, sizeof(data));

Marlin/src/feature/max7219.cpp

@@ -744,6 +744,7 @@ void Max7219::idle_tasks() {
   #endif
 
   #ifdef MAX7219_DEBUG_PLANNER_QUEUE
+    static int16_t last_depth = 0;
     const int16_t current_depth = BLOCK_MOD(head - tail + (BLOCK_BUFFER_SIZE)) & 0xF;
     if (current_depth != last_depth) {
       quantity16(MAX7219_DEBUG_PLANNER_QUEUE, last_depth, current_depth, &row_change_mask);

Marlin/src/feature/mmu/mmu2.cpp

@@ -24,10 +24,6 @@
 
 #if HAS_PRUSA_MMU2
 
-/**
- * mmu2.cpp - Support for Průša MMU2 and MMU2S
- */
-
 #include "mmu2.h"
 #include "../../lcd/menu/menu_mmu2.h"
 
@@ -50,7 +46,7 @@ MMU2 mmu2;
   #include "../../lcd/extui/ui_api.h"
 #endif
 
-#define DEBUG_OUT ENABLED(MMU_DEBUG)
+#define DEBUG_OUT ENABLED(MMU2_DEBUG)
 #include "../../core/debug_out.h"
 
 #define MMU_TODELAY 100
@@ -61,7 +57,7 @@ MMU2 mmu2;
 #define MMU2_SEND(S) tx_str(F(S "\n"))
 #define MMU2_RECV(S) rx_str(F(S "\n"))
 
-#if ENABLED(MMU2_EXTRUDER_SENSOR)
+#if ENABLED(MMU_EXTRUDER_SENSOR)
   uint8_t mmu_idl_sens = 0;
   static bool mmu_loading_flag = false;
 #endif
@@ -110,12 +106,12 @@ void MMU2::init() {
 
   set_runout_valid(false);
 
-  #if PIN_EXISTS(MMU_RST)
-    WRITE(MMU_RST_PIN, HIGH);
-    SET_OUTPUT(MMU_RST_PIN);
+  #if PIN_EXISTS(MMU2_RST)
+    WRITE(MMU2_RST_PIN, HIGH);
+    SET_OUTPUT(MMU2_RST_PIN);
   #endif
 
-  MMU_SERIAL.begin(MMU_BAUD);
+  MMU2_SERIAL.begin(MMU_BAUD);
   extruder = MMU2_NO_TOOL;
 
   safe_delay(10);
@@ -127,10 +123,10 @@ void MMU2::init() {
 void MMU2::reset() {
   DEBUG_ECHOLNPGM("MMU <= reset");
 
-  #if PIN_EXISTS(MMU_RST)
-    WRITE(MMU_RST_PIN, LOW);
+  #if PIN_EXISTS(MMU2_RST)
+    WRITE(MMU2_RST_PIN, LOW);
     safe_delay(20);
-    WRITE(MMU_RST_PIN, HIGH);
+    WRITE(MMU2_RST_PIN, HIGH);
   #else
     MMU2_SEND("X0");  // Send soft reset
   #endif
@@ -138,8 +134,8 @@ void MMU2::reset() {
 
 int8_t MMU2::get_current_tool() { return extruder == MMU2_NO_TOOL ? -1 : extruder; }
 
-#if ANY(HAS_PRUSA_MMU2S, MMU2_EXTRUDER_SENSOR)
-  #define FILAMENT_PRESENT() (READ(FIL_RUNOUT1_PIN) != FIL_RUNOUT1_STATE)
+#if ANY(HAS_PRUSA_MMU2S, MMU_EXTRUDER_SENSOR)
+  #define FILAMENT_PRESENT() (READ(FIL_RUNOUT1_PIN) != runout.out_state())
 #else
   #define FILAMENT_PRESENT() true
 #endif
@@ -230,7 +226,7 @@ void MMU2::mmu_loop() {
           const int filament = cmd - MMU_CMD_T0;
           DEBUG_ECHOLNPGM("MMU <= T", filament);
           tx_printf(F("T%d\n"), filament);
-          TERN_(MMU2_EXTRUDER_SENSOR, mmu_idl_sens = 1); // enable idler sensor, if any
+          TERN_(MMU_EXTRUDER_SENSOR, mmu_idl_sens = 1); // enable idler sensor, if any
           state = 3; // wait for response
         }
         else if (WITHIN(cmd, MMU_CMD_L0, MMU_CMD_L0 + EXTRUDERS - 1)) {
@@ -303,7 +299,7 @@ void MMU2::mmu_loop() {
       break;
 
     case 3:   // response to mmu commands
-      #if ENABLED(MMU2_EXTRUDER_SENSOR)
+      #if ENABLED(MMU_EXTRUDER_SENSOR)
         if (mmu_idl_sens) {
           if (FILAMENT_PRESENT() && mmu_loading_flag) {
             DEBUG_ECHOLNPGM("MMU <= 'A'");
@@ -365,8 +361,8 @@ bool MMU2::rx_str(FSTR_P fstr) {
 
   uint8_t i = strlen(rx_buffer);
 
-  while (MMU_SERIAL.available()) {
-    rx_buffer[i++] = MMU_SERIAL.read();
+  while (MMU2_SERIAL.available()) {
+    rx_buffer[i++] = MMU2_SERIAL.read();
 
     if (i == sizeof(rx_buffer) - 1) {
       DEBUG_ECHOLNPGM("rx buffer overrun");
@@ -397,7 +393,7 @@ bool MMU2::rx_str(FSTR_P fstr) {
 void MMU2::tx_str(FSTR_P fstr) {
   clear_rx_buffer();
   PGM_P pstr = FTOP(fstr);
-  while (const char c = pgm_read_byte(pstr)) { MMU_SERIAL.write(c); pstr++; }
+  while (const char c = pgm_read_byte(pstr)) { MMU2_SERIAL.write(c); pstr++; }
   prev_request = millis();
 }
 
@@ -407,7 +403,7 @@ void MMU2::tx_str(FSTR_P fstr) {
 void MMU2::tx_printf(FSTR_P format, int argument = -1) {
   clear_rx_buffer();
   const uint8_t len = sprintf_P(tx_buffer, FTOP(format), argument);
-  for (uint8_t i = 0; i < len; ++i) MMU_SERIAL.write(tx_buffer[i]);
+  for (uint8_t i = 0; i < len; ++i) MMU2_SERIAL.write(tx_buffer[i]);
   prev_request = millis();
 }
 
@@ -417,7 +413,7 @@ void MMU2::tx_printf(FSTR_P format, int argument = -1) {
 void MMU2::tx_printf(FSTR_P format, int argument1, int argument2) {
   clear_rx_buffer();
   const uint8_t len = sprintf_P(tx_buffer, FTOP(format), argument1, argument2);
-  for (uint8_t i = 0; i < len; ++i) MMU_SERIAL.write(tx_buffer[i]);
+  for (uint8_t i = 0; i < len; ++i) MMU2_SERIAL.write(tx_buffer[i]);
   prev_request = millis();
 }
 
@@ -425,7 +421,7 @@ void MMU2::tx_printf(FSTR_P format, int argument1, int argument2) {
  * Empty the rx buffer
  */
 void MMU2::clear_rx_buffer() {
-  while (MMU_SERIAL.available()) MMU_SERIAL.read();
+  while (MMU2_SERIAL.available()) MMU2_SERIAL.read();
   rx_buffer[0] = '\0';
 }
 
@@ -530,7 +526,7 @@ inline void beep_bad_cmd() { BUZZ(400, 40); }
 
       switch (*special) {
         case '?': {
-          #if ENABLED(MMU_MENUS)
+          #if ENABLED(MMU2_MENUS)
             const uint8_t index = mmu2_choose_filament();
             while (!thermalManager.wait_for_hotend(active_extruder, false)) safe_delay(100);
             load_to_nozzle(index);
@@ -540,7 +536,7 @@ inline void beep_bad_cmd() { BUZZ(400, 40); }
         } break;
 
         case 'x': {
-          #if ENABLED(MMU_MENUS)
+          #if ENABLED(MMU2_MENUS)
             planner.synchronize();
             const uint8_t index = mmu2_choose_filament();
             stepper.disable_extruder();
@@ -567,7 +563,7 @@ inline void beep_bad_cmd() { BUZZ(400, 40); }
       set_runout_valid(true);
   }
 
-#elif ENABLED(MMU2_EXTRUDER_SENSOR)
+#elif ENABLED(MMU_EXTRUDER_SENSOR)
 
   /**
    * Handle tool change
@@ -618,7 +614,7 @@ inline void beep_bad_cmd() { BUZZ(400, 40); }
     switch (*special) {
       case '?': {
         DEBUG_ECHOLNPGM("case ?\n");
-        #if ENABLED(MMU_MENUS)
+        #if ENABLED(MMU2_MENUS)
           uint8_t index = mmu2_choose_filament();
           while (!thermalManager.wait_for_hotend(active_extruder, false)) safe_delay(100);
           load_to_nozzle(index);
@@ -629,7 +625,7 @@ inline void beep_bad_cmd() { BUZZ(400, 40); }
 
       case 'x': {
         DEBUG_ECHOLNPGM("case x\n");
-        #if ENABLED(MMU_MENUS)
+        #if ENABLED(MMU2_MENUS)
           planner.synchronize();
           uint8_t index = mmu2_choose_filament();
           stepper.disable_extruder();
@@ -660,7 +656,7 @@ inline void beep_bad_cmd() { BUZZ(400, 40); }
   void MMU2::mmu_continue_loading() {
     // Try to load the filament a limited number of times
     bool fil_present = 0;
-    for (uint8_t i = 0; i < MMU2_LOADING_ATTEMPTS_NR; i++) {
+    for (uint8_t i = 0; i < MMU_LOADING_ATTEMPTS_NR; i++) {
       DEBUG_ECHOLNPGM("Load attempt #", i + 1);
 
       // Done as soon as filament is present
@@ -692,7 +688,7 @@ inline void beep_bad_cmd() { BUZZ(400, 40); }
     mmu_idl_sens = 0;
   }
 
-#else // !HAS_PRUSA_MMU2S && !MMU2_EXTRUDER_SENSOR
+#else // !HAS_PRUSA_MMU2S && !MMU_EXTRUDER_SENSOR
 
   /**
    * Handle tool change
@@ -733,7 +729,7 @@ inline void beep_bad_cmd() { BUZZ(400, 40); }
     switch (*special) {
       case '?': {
         DEBUG_ECHOLNPGM("case ?\n");
-        #if ENABLED(MMU_MENUS)
+        #if ENABLED(MMU2_MENUS)
           uint8_t index = mmu2_choose_filament();
           while (!thermalManager.wait_for_hotend(active_extruder, false)) safe_delay(100);
           load_to_nozzle(index);
@@ -744,7 +740,7 @@ inline void beep_bad_cmd() { BUZZ(400, 40); }
 
       case 'x': {
         DEBUG_ECHOLNPGM("case x\n");
-        #if ENABLED(MMU_MENUS)
+        #if ENABLED(MMU2_MENUS)
           planner.synchronize();
           uint8_t index = mmu2_choose_filament();
           stepper.disable_extruder();
@@ -895,8 +891,8 @@ void MMU2::filament_runout() {
   }
 
   bool MMU2::can_load() {
-    static constexpr E_Step can_load_sequence[] PROGMEM = { MMU2_CAN_LOAD_SEQUENCE },
-                  can_load_increment_sequence[] PROGMEM = { MMU2_CAN_LOAD_INCREMENT_SEQUENCE };
+    static const E_Step can_load_sequence[] PROGMEM = { MMU2_CAN_LOAD_SEQUENCE },
+                        can_load_increment_sequence[] PROGMEM = { MMU2_CAN_LOAD_INCREMENT_SEQUENCE };
 
     execute_extruder_sequence(can_load_sequence, COUNT(can_load_sequence));
 
@@ -1045,8 +1041,7 @@ void MMU2::load_to_nozzle_sequence() {
   execute_extruder_sequence(sequence, COUNT(sequence));
 }
 
-void MMU2::execute_extruder_sequence(const E_Step * const sequence, const uint8_t steps) {
-
+void MMU2::execute_extruder_sequence(const E_Step * sequence, int steps) {
   planner.synchronize();
 
   const E_Step *step = sequence;

Marlin/src/feature/mmu/mmu2.h

@@ -21,10 +21,6 @@
  */
 #pragma once
 
-/**
- * mmu2.h - Support for Průša MMU2 and MMU2S
- */
-
 #include "../../inc/MarlinConfig.h"
 
 #if HAS_FILAMENT_SENSOR
@@ -74,7 +70,7 @@ private:
   static bool get_response();
   static void manage_response(const bool move_axes, const bool turn_off_nozzle);
 
-  static void execute_extruder_sequence(const E_Step * const sequence, const uint8_t steps);
+  static void execute_extruder_sequence(const E_Step * sequence, int steps);
   static void ramming_sequence();
   static void load_to_nozzle_sequence();
 
@@ -89,7 +85,7 @@ private:
     FORCE_INLINE static bool load_to_gears() { return true; }
   #endif
 
-  #if ENABLED(MMU2_EXTRUDER_SENSOR)
+  #if ENABLED(MMU_EXTRUDER_SENSOR)
     #define MMU_LOAD_FEEDRATE 19.02f // (mm/s)
     static void mmu_continue_loading();
   #endif

Marlin/src/feature/mmu3/SpoolJoin.cpp

@@ -1,73 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2024 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * SpoolJoin.cpp
- */
-
-#include "../../inc/MarlinConfigPre.h"
-
-#if HAS_PRUSA_MMU3
-
-#include "SpoolJoin.h"
-#include "../../module/settings.h"
-#include "../../core/language.h"
-
-SpoolJoin spooljoin;
-
-bool SpoolJoin::enabled;            // Initialized by settings.load
-int SpoolJoin::epprom_addr;         // Initialized by settings.load
-uint8_t SpoolJoin::currentMMUSlot;
-
-SpoolJoin::SpoolJoin() { setSlot(0); }
-
-void SpoolJoin::initStatus() {
-  // Useful information to see during bootup
-  SERIAL_ECHOLN(F("SpoolJoin is "), enabled ? F("On") : F("Off"));
-}
-
-void SpoolJoin::toggle() {
-  // Toggle enabled value.
-  enabled = !enabled;
-
-  // Following Prusa's implementation let's save the value to the EEPROM
-  // TODO: Move to settings.cpp
-  #if ENABLED(EEPROM_SETTINGS)
-    persistentStore.access_start();
-    persistentStore.write_data(epprom_addr, enabled);
-    persistentStore.access_finish();
-    settings.save();
-  #endif
-}
-
-bool SpoolJoin::isEnabled() { return enabled; }
-
-void SpoolJoin::setSlot(const uint8_t slot) { currentMMUSlot = slot; }
-
-uint8_t SpoolJoin::nextSlot() {
-  SERIAL_ECHOPGM("SpoolJoin: ", currentMMUSlot);
-  if (++currentMMUSlot >= 4) currentMMUSlot = 0;
-  SERIAL_ECHOLNPGM(" -> ", currentMMUSlot);
-  return currentMMUSlot;
-}
-
-#endif // HAS_PRUSA_MMU3

Marlin/src/feature/mmu3/SpoolJoin.h

@@ -1,72 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2024 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-/**
- * SpoolJoin.h
- */
-
-#include "../../MarlinCore.h"
-
-#include <stdint.h>
-
-// See documentation here: https://help.prusa3d.com/article/spooljoin-mmu2s_134252
-
-class SpoolJoin {
-public:
-  SpoolJoin();
-
-  enum class EEPROM : uint8_t {
-    Unknown,      //!< SpoolJoin is unknown while printer is booting up
-    Enabled,      //!< SpoolJoin is enabled in EEPROM
-    Disabled,     //!< SpoolJoin is disabled in EEPROM
-    Empty = 0xFF  //!< EEPROM has not been set before and all bits are 1 (0xFF) - either a new printer or user erased the memory
-  };
-
-  // @brief Contrary to Prusa's implementation we store the enabled status in a variable
-  static int epprom_addr;
-  static bool enabled;
-
-  // @brief Called when EEPROM is ready to be read
-  static void initStatus();
-
-  // @brief Toggle SpoolJoin
-  static void toggle();
-
-  // @brief Check if SpoolJoin is enabled
-  // @return true if enabled, false if disabled
-  static bool isEnabled();
-
-  // @brief Update the saved MMU slot number so SpoolJoin can determine the next slot to use
-  // @param slot number of the slot to set
-  static void setSlot(const uint8_t slot);
-
-  // @brief Fetch the next slot number (0 to 4).
-  // When filament slot 4 is depleted, the next slot should be 0.
-  // @return the next slot (0 to 4)
-  static uint8_t nextSlot();
-
-private:
-  static uint8_t currentMMUSlot;   //!< Currently used slot (0 to 4)
-};
-
-extern SpoolJoin spooljoin;

Marlin/src/feature/mmu3/mmu3-serial-protocol.md

@@ -1,159 +0,0 @@
-# MMU3 Messages
-
-Starting with the version 2.0.19 of the MMU firmware, requests and responses have a trailing section that contains the CRC8 of the original message. The general structure is as follows:
-
-```
-Requests (what Marlin requests):
-MMU3:>{RequestMsgCode}{Value}*{CRC8}\n
-
-Responses (what MMU responds with):
-MMU3:<{RequestMsgCode}{Value} {ResponseMsgParamCode}{paramValue}*{CRC8}\n
-```
-
-An example of that would be:
-
-```
-MMU3:>S0*c6\n
-MMU3:<S0 A3*22\n
-
-MMU3:>S1*ad\n
-MMU3:<S1 A0*34\n
-
-MMU3:>S2*10\n
-MMU3:<S2 A2*65\n
-```
-
-This set of responses combines to indicate firmware version 3.0.2.
-
-## Startup sequence
-
-When initialized the MMU waits for requests. Marlin repeatedly sends `S0` commands until it gets an answer:
-```
-MMU3:>S0*c6\n
-MMU3:>S0*c6\n
-MMU3:>S0*c6\n
-...
-```
-
-Once communication is established the MMU responds with:
-```
-MMU3:<S0 A3*22\n
-```
-
-Then Marlin continues to get the rest of the MMU firmware version.
-```
-MMU3:>S1*ad\n
-MMU3:<S1 A0*34\n
-MMU3:>S2*10\n
-MMU3:<S2 A2*65\n
-```
-
-Setting the stepper mode to SpreadCycle (M0) or StealthChop (M1):
-```
-MMU3:>M1*{CRC8};
-MMU3:<---nothing---
-```
-
-```
-MMU3:>P0
-MMU3:<P0 A{FINDA status}*{CRC8}\n
-```
-
-At this point we can be sure the MMU is available and ready. If there was a timeout or other communication problem somewhere, the printer will not be killed, but for safety the MMU feature will be disabled.
-
-- *Firmware version* is an integer value, and we care about it. As there is no other way of knowing which protocol to use.
-- *FINDA status* is 1 if the filament is loaded to the extruder, 0 otherwise.
-
-The *Firmware version* is checked against the required value. If it doesn't match the printer will not be halted, but for safety the MMU feature will be disabled.
-
-## Toolchange
-
-```
-MMU3:>T{Filament index}*{CRC8}\n
-MMU3:<Q0*ea\n
-```
-
-The MMU sends:
-```
-MMU3:<T{filament index}*P{ProgressCode}{CRC8}\n
-```
-
-Which in normal operation would be as follows, let's say that we requested MMU to load `T0``:
-```
-MMU3:>T0*{CRC8}\n
-
-MMU3:>Q0*{CRC8}\n
-MMU3:<T0*P5{CRC8}\n  # P5 => FeedingToFinda
-
-MMU3:>Q0*{CRC8}\n
-MMU3:<T0*P7{CRC8}\n  # P7 => FeedingToNozzle
-```
-
-As soon as the filament is fed down to the extruder we follow with:
-
-```
-MMU3:>C0*{CRC8}\n
-```
-
-The MMU will feed a few more millimeters of filament for the extruder gears to grab. When done, the MMU sends:
-```
-MMU3:>Q0*{CRC8}\n
-MMU3:<T0*P9{CRC8}\n  # P9 => FinishingMoves
-```
-
-After the `T0*P9` response we immediately continue with the next G-code which should be one or more extruder moves to feed the filament into the hotend.
-
-
-## FINDA status
-```
-MMU3:>P0*{CRC8}\n
-```
-
-If the filament is loaded to the extruder, FINDA status is 1 and the MMU responds with:
-```
-MMU3:<P0 A1*{CRC8}\n
-```
-
-…otherwise it replies:
-```
-MMU3:<P0 A0*7b\n
-```
-
-This could be used as a filament runout sensor if polled regularly.
-
-## Load filament
-
-To load a filament to the MMU itself, we run:
-```
-MMU3:>L{Filament index}*{CRC8}\n
-MMU3:<L{Filament index} A1*{CRC8}\n
-```
-
-…and immediately after that we query the status:
-```
-MMU3:>Q0*{CRC8}\n
-```
-
-The MMU will respond with status messages:
-```
-MMU3:<L0*P5{CRC8}\n
-```
-
-The MMU will load the filament and when done:
-```
-MMU3:>Q0*{CRC8}\n
-MMU3:<L0*P9{CRC8}\n
-```
-
-## Unload filament
-
-- `MMU <= 'U0\n'`
-
-The MMU will retract current filament from the extruder, and when done:
-
-- `MMU => 'ok\n'`
-
-## Eject filament
-
-- `MMU <= 'E*Filament index*\n'`
-- `MMU => 'ok\n'`

Marlin/src/feature/mmu3/mmu3.h

@@ -1,419 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2024 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-/**
- * mmu2.h
- */
-
-#include "mmu3_state.h"
-#include "mmu3_marlin.h"
-
-#include "mmu3_protocol_logic.h"
-
-#include "../../MarlinCore.h"
-
-  #ifdef __AVR__
-    typedef float feedRate_t;
-  #else
-    //#include <atomic>
-  #endif
-
-  struct E_Step {
-    float extrude;  //!< extrude distance in mm
-    float feedRate; //!< feed rate in mm/s
-  };
-
-  static constexpr E_Step ramming_sequence[] PROGMEM = { MMU3_RAMMING_SEQUENCE };
-  static constexpr E_Step load_to_nozzle_sequence[] PROGMEM = { MMU3_LOAD_TO_NOZZLE_SEQUENCE };
-
-  namespace MMU3 {
-
-  // general MMU setup for MK3
-  enum : uint8_t {
-    FILAMENT_UNKNOWN = 0xFFU
-  };
-
-  struct Version {
-    uint8_t major, minor, build;
-  };
-
-  // Top-level interface between Logic and Marlin.
-  // Intentionally named MMU3 to be (almost) a drop-in replacement for the previous implementation.
-  // Most of the public methods share the original naming convention as well.
-  class MMU3 {
-  public:
-    MMU3();
-
-    // Powers ON the MMU, then initializes the UART and protocol logic
-    void start();
-
-    // Stops the protocol logic, closes the UART, powers OFF the MMU
-    void stop();
-
-    // Serial output of MMU state
-    void status();
-
-    xState state() const { return _state; }
-
-    bool enabled() const { mmu_hw_enabled = state() == xState::Active; return mmu_hw_enabled; }
-
-    // Different levels of resetting the MMU
-    enum ResetForm : uint8_t {
-      Software = 0,   //!< sends a X0 command into the MMU, the MMU will watchdog-reset itself
-      ResetPin = 1,   //!< trigger the reset pin of the MMU
-      CutThePower = 2, //!< power off and power on (that includes +5V and +24V power lines)
-      EraseEEPROM = 42, //!< erase MMU EEPROM and then perform a software reset
-    };
-
-    // Saved print state on error.
-    enum SavedState : uint8_t {
-      None = 0,       // No state saved.
-      ParkExtruder = 1, // The extruder was parked.
-      Cooldown = 2,   // The extruder was allowed to cool.
-      CooldownPending = 4,
-    };
-
-    // Source of operation error
-    enum ErrorSource : uint8_t {
-      ErrorSourcePrinter = 0,
-      ErrorSourceMMU = 1,
-      ErrorSourceNone = 0xFF,
-    };
-
-    // Tune value in MMU registers as a way to recover from errors
-    // e.g. Idler Stallguard threshold
-    void tune();
-
-    // Perform a reset of the MMU
-    // @param level physical form of the reset
-    void reset(ResetForm level);
-
-    // Power off the MMU (cut the power)
-    void powerOff();
-
-    // Power on the MMU
-    void powerOn();
-
-    // Read from a MMU register (See gcode M707)
-    // @param address Address of register in hexidecimal
-    // @return true upon success
-    bool readRegister(uint8_t address);
-
-    // Write from a MMU register (See gcode M708)
-    // @param address Address of register in hexidecimal
-    // @param data Data to write to register
-    // @return true upon success
-    bool writeRegister(uint8_t address, uint16_t data);
-
-    // The main loop of MMU processing.
-    // Doesn't loop (block) inside, performs just one step of logic state machines.
-    // Also, internally it prevents recursive entries.
-    void mmu_loop();
-
-    // The main MMU command - select a different slot
-    // @param slot of the slot to be selected
-    // @return false if the operation cannot be performed (Stopped)
-    bool tool_change(uint8_t slot);
-
-    // Handling of special Tx, Tc, T? commands
-    bool tool_change(char code, uint8_t slot);
-
-    // Unload of filament in collaboration with the MMU.
-    // That includes rotating the printer's extruder in order to release filament.
-    // @return false if the operation cannot be performed (Stopped or cold extruder)
-    bool unload();
-
-    // Load (insert) filament just into the MMU (not into printer's nozzle)
-    // @return false if the operation cannot be performed (Stopped)
-    bool load_to_feeder(uint8_t slot);
-
-    // Load (push) filament from the MMU into the printer's nozzle
-    // @return false if the operation cannot be performed (Stopped or cold extruder)
-    bool load_to_nozzle(uint8_t slot);
-
-    // Move MMU's selector aside and push the selected filament forward.
-    // Usable for improving filament's tip or pulling the remaining piece of filament out completely.
-    bool eject_filament(uint8_t slot, bool enableFullScreenMsg=true);
-
-    // Issue a Cut command into the MMU
-    // Requires unloaded filament from the printer (obviously)
-    // @return false if the operation cannot be performed (Stopped)
-    bool cut_filament(uint8_t slot, bool enableFullScreenMsg=true);
-
-    // Issue a planned request for statistics data from MMU
-    void get_statistics();
-
-    // Issue a Try-Load command
-    // It behaves very similarly like a ToolChange, but it doesn't load the filament
-    // all the way down to the nozzle. The sole purpose of this operation
-    // is to check, that the filament will be ready for printing.
-    // @param slot index of slot to be tested
-    // @return true
-    bool loading_test(uint8_t slot);
-
-    // @return the active filament slot index (0-4) or 0xff in case of no active tool
-    uint8_t get_current_tool() const;
-
-    // @return The filament slot index (0 to 4) that will be loaded next, 0xff in case of no active tool change
-    uint8_t get_tool_change_tool() const;
-
-    bool set_filament_type(uint8_t slot, uint8_t type);
-
-    // Issue a "button" click into the MMU - to be used from Error screens of the MMU
-    // to select one of the 3 possible options to resolve the issue
-    void button(uint8_t index);
-
-    // Issue an explicit "homing" command into the MMU
-    void home(uint8_t mode);
-
-    // @return current state of FINDA (true=filament present, false=filament not present)
-    bool findaDetectsFilament() const { return logic.findaPressed(); }
-
-    uint16_t totalFailStatistics() const { return logic.FailStatistics(); }
-
-    // @return Current error code
-    ErrorCode mmuCurrentErrorCode() const { return logic.Error(); }
-
-    // @return Command in progress
-    uint8_t getCommandInProgress() const { return logic.CommandInProgress(); }
-
-    // @return Last error source
-    ErrorSource mmuLastErrorSource() const { return lastErrorSource; }
-
-    // @return Last error code
-    ErrorCode getLastErrorCode() const { return lastErrorCode; }
-
-    // @return the version of the connected MMU FW.
-    // In the future we'll return the trully detected FW version
-    Version getMMUFWVersion() const {
-      if (state() == xState::Active) {
-        return { logic.mmuFwVersionMajor(), logic.mmuFwVersionMinor(), logic.mmuFwVersionRevision() };
-      }
-      else {
-        return { 0, 0, 0 };
-      }
-    }
-
-    // Method to read-only mmu_print_saved
-    bool MMU_PRINT_SAVED() const { return mmu_print_saved != SavedState::None; }
-
-    // Automagically "press" a Retry button if we have any retry attempts left
-    // @param ec ErrorCode enum value
-    // @return true if auto-retry is ongoing, false when retry is unavailable or retry attempts are all used up
-    bool retryIfPossible(const ErrorCode ec);
-
-    // @return count for toolchange in current print
-    uint16_t toolChangeCounter() const { return toolchange_counter; }
-
-    // Set toolchange counter to zero
-    void resetToolChangeCounter() { toolchange_counter = 0; }
-
-    uint16_t tmcFailures() const { return _tmcFailures; }
-    void incrementTMCFailures() { ++_tmcFailures; }
-    void resetTMCFailures() { _tmcFailures = 0; }
-
-    // Retrieve cached value parsed from readRegister()
-    // or using M707
-    uint16_t getLastReadRegisterValue() const {
-      return lastReadRegisterValue;
-    }
-    void invokeErrorScreen(const ErrorCode ec) {
-      if (logic.CommandInProgress()) return;        // MMU must not be busy
-      if (lastErrorCode == ec) return;              // The error code is not a duplicate
-      if (mmuCurrentErrorCode() == ErrorCode::OK) { // The protocol must not be in error state
-        reportError(ec, ErrorSource::ErrorSourcePrinter);
-      }
-    }
-
-    void clearPrinterError() {
-      logic.clearPrinterError();
-      lastErrorCode = ErrorCode::OK;
-      lastErrorSource = ErrorSource::ErrorSourceNone;
-    }
-
-    // @brief Queue a button operation which the printer can act upon
-    // @param btn Button operation
-    void setPrinterButtonOperation(Buttons btn) {
-      printerButtonOperation = btn;
-    }
-
-    // @brief Get the printer button operation
-    // @return currently set printer button operation, it can be NoButton if nothing is queued
-    Buttons getPrinterButtonOperation() {
-      return printerButtonOperation;
-    }
-
-    void clearPrinterButtonOperation() {
-      printerButtonOperation = Buttons::NoButton;
-    }
-
-    static uint8_t cutter_mode;   // mode 0:disabled | 1:enabled | 2:always (EXPERIMENTAL)
-    static int cutter_mode_addr;  // EEPROM addr for cutter enabled setting
-    static uint8_t stealth_mode;  // stealth mode
-    static int stealth_mode_addr; // EEPROM addr for stealth_mode setting
-    static bool mmu_hw_enabled;   // MMU hardware can be Enabled/Disabled
-                                  // with the M709 S0 or M709 S1 commands
-                                  // and the last state is stored in the
-                                  // EEPROM
-
-    static int mmu_hw_enabled_addr; // EEPROM addr for mmu_hw_enabled
-
-    bool e_active();
-
-    #ifndef UNITTEST
-      private:
-    #endif
-
-    // Perform software self-reset of the MMU (sends an X0 command)
-    void resetX0();
-
-    // Perform software self-reset of the MMU + erase its EEPROM (sends X2a command)
-    void resetX42();
-
-    // Trigger reset pin of the MMU
-    void triggerResetPin();
-
-    // Perform power cycle of the MMU (cold boot)
-    // Please note this is a blocking operation (sleeps for some time inside while doing the power cycle)
-    void powerCycle();
-
-    // Stop the communication, but keep the MMU powered on (for scenarios with incorrect FW version)
-    void stopKeepPowered();
-
-    // Along with the mmu_loop method, this loops until a response from the MMU is received and acts upon.
-    // In case of an error, it parks the print head and turns off nozzle heating
-    // @return false if the command could not have been completed (MMU interrupted)
-    [[nodiscard]] bool manage_response(const bool move_axes, const bool turn_off_nozzle);
-
-    // The inner private implementation of mmu_loop()
-    // which is NOT (!!!) recursion-guarded. Use caution - but we do need it during waiting for hotend resume to keep comms alive!
-    // @param reportErrors true if Errors should raise MMU Error screen, false otherwise
-    void mmu_loop_inner(bool reportErrors);
-
-    // Performs one step of the protocol logic state machine
-    // and reports progress and errors if needed to attached ExtUIs.
-    // Updates the global state of MMU (Active/Connecting/Stopped) at runtime, see @ref State
-    // @param reportErrors true if Errors should raise MMU Error screen, false otherwise
-    StepStatus logicStep(bool reportErrors);
-
-    void filament_ramming();
-    void execute_extruder_sequence(const E_Step *sequence, uint8_t steps);
-    void execute_load_to_nozzle_sequence();
-
-    // Reports an error into attached ExtUIs
-    // @param ec error code, see ErrorCode
-    // @param res reporter error source, is either Printer (0) or MMU (1)
-    void reportError(ErrorCode ec, ErrorSource res);
-
-    // Reports progress of operations into attached ExtUIs
-    // @param pc progress code, see ProgressCode
-    void reportProgress(ProgressCode pc);
-
-    // Responds to a change of MMU's progress
-    // - plans additional steps, e.g. starts the E-motor after fsensor trigger
-    // The function is quite complex, because it needs to handle asynchronnous
-    // progress and error reports coming from the MMU without an explicit command
-    // - typically after MMU's start or after some HW issue on the MMU.
-    // It must ensure, that calls to @ref reportProgress and/or @ref reportError are
-    // only executed after @ref BeginReport has been called first.
-    void onMMUProgressMsg(ProgressCode pc);
-    // Progress code changed - act accordingly
-    void onMMUProgressMsgChanged(ProgressCode pc);
-    // Repeated calls when progress code remains the same
-    void onMMUProgressMsgSame(ProgressCode pc);
-
-    // @brief Save hotend temperature and set flag to cooldown hotend after 60 minutes
-    // @param turn_off_nozzle if true, the hotend temperature will be set to 0degC after 60 minutes
-    void saveHotendTemp(bool turn_off_nozzle);
-
-    // Save print and park the print head
-    void saveAndPark(bool move_axes);
-
-    // Resume hotend temperature, if it was cooled. Safe to call if we aren't saved.
-    void resumeHotendTemp();
-
-    // Resume position, if the extruder was parked. Safe to all if state was not saved.
-    void resumeUnpark();
-
-    // Check for any button/user input coming from the printer's UI
-    void checkUserInput();
-
-    // @brief Check whether to trigger a FINDA runout. If triggered this function will call M600 AUTO
-    // if SpoolJoin is enabled, otherwise M600 is called without AUTO which will prompt the user
-    // for the next filament slot to use
-    void checkFINDARunout();
-
-    // Entry check of all external commands.
-    // It can wait until the MMU becomes ready.
-    // Optionally, it can also emit/display an error screen and the user can decide what to do next.
-    // @return false if the MMU is not ready to perform the command (for whatever reason)
-    bool waitForMMUReady();
-
-    // After MMU completes a tool-change command
-    // the printer will push the filament by a constant distance. If the Fsensor untriggers
-    // at any moment the test fails. Else the test passes, and the E-motor retracts the
-    // filament back to its original position.
-    // @return false if test fails, true otherwise
-    bool verifyFilamentEnteredPTFE();
-
-    // Common processing of pushing filament into the extruder - shared by tool_change, load_to_nozzle and probably others
-    void toolChangeCommon(uint8_t slot);
-    bool toolChangeCommonOnce(uint8_t slot);
-
-    void helpUnloadToFinda();
-    void unloadInner();
-    void cutFilamentInner(uint8_t slot);
-
-    void setCurrentTool(uint8_t ex);
-
-    ProtocolLogic logic;        //!< implementation of the protocol logic layer
-    uint8_t extruder;           //!< currently active slot in the MMU ... somewhat... not sure where to get it from yet
-    uint8_t tool_change_extruder; //!< only used for UI purposes
-
-    xyz_pos_t resume_position;
-    int16_t resume_hotend_temp;
-
-    ProgressCode lastProgressCode = ProgressCode::OK;
-    ErrorCode lastErrorCode = ErrorCode::MMU_NOT_RESPONDING;
-    ErrorSource lastErrorSource = ErrorSource::ErrorSourceNone;
-    Buttons lastButton = Buttons::NoButton;
-    uint16_t lastReadRegisterValue = 0;
-    Buttons printerButtonOperation = Buttons::NoButton;
-
-    StepStatus logicStepLastStatus;
-
-    enum xState _state;
-
-    uint8_t mmu_print_saved;
-    bool loadFilamentStarted;
-    bool unloadFilamentStarted;
-
-    uint16_t toolchange_counter;
-    uint16_t _tmcFailures;
-  };
-
-  } // MMU3
-
-// following Marlin's way of doing stuff - one and only instance of MMU implementation in the code base
-// + avoiding buggy singletons on the AVR platform
-extern MMU3::MMU3 mmu3;

Marlin/src/feature/mmu3/mmu3_crc.cpp

@@ -1,53 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2024 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * mmu2_crc.cpp
- */
-
-#include "../../inc/MarlinConfigPre.h"
-
-#if HAS_PRUSA_MMU3
-
-#include "mmu3_crc.h"
-
-#ifdef __AVR__
-  #include <util/crc16.h>
-#endif
-
-namespace modules {
-
-namespace crc {
-
-uint8_t CRC8::CCITT_update(uint8_t crc, uint8_t b) {
-  #ifdef __AVR__
-    return _crc8_ccitt_update(crc, b);
-  #else
-    return CCITT_updateCX(crc, b);
-  #endif
-}
-
-} // namespace crc
-
-} // namespace modules
-
-#endif // HAS_PRUSA_MMU3

Marlin/src/feature/mmu3/mmu3_crc.h

@@ -1,73 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2024 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-/**
- * mmu2_crc.h
- */
-
-#include <stdint.h>
-
-namespace modules {
-
-// prevent silly indenting of the whole file
-
-// Contains all the necessary functions for computation of CRC
-namespace crc {
-
-class CRC8 {
-public:
-  // Compute/update CRC8 CCIIT from 8bits.
-  // Details: https://www.nongnu.org/avr-libc/user-manual/group__util__crc.html
-  static uint8_t CCITT_update(uint8_t crc, uint8_t b);
-
-  static constexpr uint8_t CCITT_updateCX(uint8_t crc, uint8_t b) {
-    uint8_t data = crc ^ b;
-    for (uint8_t i = 0; i < 8; i++) {
-      if ((data & 0x80U) != 0) {
-        data <<= 1U;
-        data ^= 0x07U;
-      }
-      else {
-        data <<= 1U;
-      }
-    }
-    return data;
-  }
-
-  // Compute/update CRC8 CCIIT from 16bits (convenience wrapper)
-  static constexpr uint8_t CCITT_updateW(uint8_t crc, uint16_t w) {
-    union U {
-      uint8_t b[2];
-      uint16_t w;
-      explicit constexpr inline U(uint16_t w)
-      : w(w) {}
-    }
-    u(w);
-    return CCITT_updateCX(CCITT_updateCX(crc, u.b[0]), u.b[1]);
-  }
-};
-
-} // namespace crc
-
-
-} // namespace modules

Marlin/src/feature/mmu3/mmu3_error_converter.cpp

@@ -1,376 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2024 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * mmu2_error_converter.cpp
- */
-
-#include "../../inc/MarlinConfigPre.h"
-
-#if HAS_PRUSA_MMU3
-
-#include "../../core/language.h"
-#include "mmu3_error_converter.h"
-#include "mmu_hw/error_codes.h"
-#include "mmu_hw/errors_list.h"
-
-namespace MMU3 {
-
-  static ButtonOperations buttonSelectedOperation = ButtonOperations::NoOperation;
-
-  // we don't have a constexpr find_if in C++17/STL yet
-  template <class InputIt, class UnaryPredicate>
-  constexpr InputIt find_if_cx(InputIt first, InputIt last, UnaryPredicate p) {
-    for (; first != last; ++first) {
-      if (p(*first)) return first;
-    }
-    return last;
-  }
-
-  // Making a constexpr FindError should instruct the compiler to optimize the
-  // PrusaErrorCodeIndex in such a way that no searching will ever be done at
-  // runtime. A call to FindError then compiles to a single instruction even on
-  // the AVR.
-  // static constexpr uint8_t FindErrorIndex(uint16_t pec) {
-  static uint8_t FindErrorIndex(uint16_t pec) {
-    constexpr uint16_t errorCodesSize = sizeof(errorCodes) / sizeof(errorCodes[0]);
-    constexpr const auto *errorCodesEnd = errorCodes + errorCodesSize;
-    const auto *i = find_if_cx(errorCodes, errorCodesEnd, [pec](uint16_t ed) {
-      return ed == pec;
-    });
-    return (i != errorCodesEnd) ? (i - errorCodes) : (errorCodesSize - 1);
-  }
-
-  // check that the searching algoritm works
-  // static_assert( FindErrorIndex(ERR_MECHANICAL_FINDA_DIDNT_TRIGGER) == 0);
-  // static_assert( FindErrorIndex(ERR_MECHANICAL_FINDA_FILAMENT_STUCK) == 1);
-  // static_assert( FindErrorIndex(ERR_MECHANICAL_FSENSOR_DIDNT_TRIGGER) == 2);
-  // static_assert( FindErrorIndex(ERR_MECHANICAL_FSENSOR_FILAMENT_STUCK) == 3);
-
-  constexpr ErrorCode operator&(ErrorCode a, ErrorCode b) {
-    return (ErrorCode)((uint16_t)a & (uint16_t)b);
-  }
-
-  constexpr bool ContainsBit(ErrorCode ec, ErrorCode mask) {
-    return (uint16_t)ec & (uint16_t)mask;
-  }
-
-  uint8_t PrusaErrorCodeIndex(const ErrorCode ec) {
-    switch (ec) {
-      case ErrorCode::FINDA_DIDNT_SWITCH_ON:
-        return FindErrorIndex(ERR_MECHANICAL_FINDA_DIDNT_TRIGGER);
-      case ErrorCode::FINDA_DIDNT_SWITCH_OFF:
-        return FindErrorIndex(ERR_MECHANICAL_FINDA_FILAMENT_STUCK);
-      case ErrorCode::FSENSOR_DIDNT_SWITCH_ON:
-        return FindErrorIndex(ERR_MECHANICAL_FSENSOR_DIDNT_TRIGGER);
-      case ErrorCode::FSENSOR_DIDNT_SWITCH_OFF:
-        return FindErrorIndex(ERR_MECHANICAL_FSENSOR_FILAMENT_STUCK);
-      case ErrorCode::FSENSOR_TOO_EARLY:
-        return FindErrorIndex(ERR_MECHANICAL_FSENSOR_TOO_EARLY);
-      case ErrorCode::FINDA_FLICKERS:
-        return FindErrorIndex(ERR_MECHANICAL_INSPECT_FINDA);
-      case ErrorCode::LOAD_TO_EXTRUDER_FAILED:
-        return FindErrorIndex(ERR_MECHANICAL_LOAD_TO_EXTRUDER_FAILED);
-      case ErrorCode::FILAMENT_EJECTED:
-        return FindErrorIndex(ERR_SYSTEM_FILAMENT_EJECTED);
-      case ErrorCode::FILAMENT_CHANGE:
-        return FindErrorIndex(ERR_SYSTEM_FILAMENT_CHANGE);
-
-      case ErrorCode::STALLED_PULLEY:
-      case ErrorCode::MOVE_PULLEY_FAILED:
-        return FindErrorIndex(ERR_MECHANICAL_PULLEY_CANNOT_MOVE);
-
-      case ErrorCode::HOMING_SELECTOR_FAILED:
-        return FindErrorIndex(ERR_MECHANICAL_SELECTOR_CANNOT_HOME);
-      case ErrorCode::MOVE_SELECTOR_FAILED:
-        return FindErrorIndex(ERR_MECHANICAL_SELECTOR_CANNOT_MOVE);
-
-      case ErrorCode::HOMING_IDLER_FAILED:
-        return FindErrorIndex(ERR_MECHANICAL_IDLER_CANNOT_HOME);
-      case ErrorCode::MOVE_IDLER_FAILED:
-        return FindErrorIndex(ERR_MECHANICAL_IDLER_CANNOT_MOVE);
-
-      case ErrorCode::MMU_NOT_RESPONDING:
-        return FindErrorIndex(ERR_CONNECT_MMU_NOT_RESPONDING);
-      case ErrorCode::PROTOCOL_ERROR:
-        return FindErrorIndex(ERR_CONNECT_COMMUNICATION_ERROR);
-      case ErrorCode::FILAMENT_ALREADY_LOADED:
-        return FindErrorIndex(ERR_SYSTEM_FILAMENT_ALREADY_LOADED);
-      case ErrorCode::INVALID_TOOL:
-        return FindErrorIndex(ERR_SYSTEM_INVALID_TOOL);
-      case ErrorCode::QUEUE_FULL:
-        return FindErrorIndex(ERR_SYSTEM_QUEUE_FULL);
-      case ErrorCode::VERSION_MISMATCH:
-        return FindErrorIndex(ERR_SYSTEM_FW_UPDATE_NEEDED);
-      case ErrorCode::INTERNAL:
-        return FindErrorIndex(ERR_SYSTEM_FW_RUNTIME_ERROR);
-      case ErrorCode::FINDA_VS_EEPROM_DISREPANCY:
-        return FindErrorIndex(ERR_SYSTEM_UNLOAD_MANUALLY);
-      case ErrorCode::MCU_UNDERVOLTAGE_VCC:
-        return FindErrorIndex(ERR_ELECTRICAL_MMU_MCU_ERROR);
-      default: break;
-    }
-
-    // Electrical issues which can be detected somehow.
-    // Need to be placed before TMC-related errors in order to process couples of error bits between single ones
-    // and to keep the code size down.
-    if (ContainsBit(ec, ErrorCode::TMC_PULLEY_BIT)) {
-      if ((ec & ErrorCode::MMU_SOLDERING_NEEDS_ATTENTION) == ErrorCode::MMU_SOLDERING_NEEDS_ATTENTION)
-        return FindErrorIndex(ERR_ELECTRICAL_MMU_PULLEY_SELFTEST_FAILED);
-    }
-    else if (ContainsBit(ec, ErrorCode::TMC_SELECTOR_BIT)) {
-      if ((ec & ErrorCode::MMU_SOLDERING_NEEDS_ATTENTION) == ErrorCode::MMU_SOLDERING_NEEDS_ATTENTION)
-        return FindErrorIndex(ERR_ELECTRICAL_MMU_SELECTOR_SELFTEST_FAILED);
-    }
-    else if (ContainsBit(ec, ErrorCode::TMC_IDLER_BIT)) {
-      if ((ec & ErrorCode::MMU_SOLDERING_NEEDS_ATTENTION) == ErrorCode::MMU_SOLDERING_NEEDS_ATTENTION)
-        return FindErrorIndex(ERR_ELECTRICAL_MMU_IDLER_SELFTEST_FAILED);
-    }
-
-    // TMC-related errors - multiple of these can occur at once
-    // - in such a case we report the first which gets found/converted into Prusa-Error-Codes (usually the fact, that one TMC has an issue is serious enough)
-    // By carefully ordering the checks here we can prioritize the errors being reported to the user.
-    if (ContainsBit(ec, ErrorCode::TMC_PULLEY_BIT)) {
-      if (ContainsBit(ec, ErrorCode::TMC_IOIN_MISMATCH))
-        return FindErrorIndex(ERR_ELECTRICAL_TMC_PULLEY_DRIVER_ERROR);
-      if (ContainsBit(ec, ErrorCode::TMC_RESET))
-        return FindErrorIndex(ERR_ELECTRICAL_TMC_PULLEY_DRIVER_RESET);
-      if (ContainsBit(ec, ErrorCode::TMC_UNDERVOLTAGE_ON_CHARGE_PUMP))
-        return FindErrorIndex(ERR_ELECTRICAL_TMC_PULLEY_UNDERVOLTAGE_ERROR);
-      if (ContainsBit(ec, ErrorCode::TMC_SHORT_TO_GROUND))
-        return FindErrorIndex(ERR_ELECTRICAL_TMC_PULLEY_DRIVER_SHORTED);
-      if (ContainsBit(ec, ErrorCode::TMC_OVER_TEMPERATURE_WARN))
-        return FindErrorIndex(ERR_TEMPERATURE_WARNING_TMC_PULLEY_TOO_HOT);
-      if (ContainsBit(ec, ErrorCode::TMC_OVER_TEMPERATURE_ERROR))
-        return FindErrorIndex(ERR_TEMPERATURE_TMC_PULLEY_OVERHEAT_ERROR);
-    }
-    else if (ContainsBit(ec, ErrorCode::TMC_SELECTOR_BIT)) {
-      if (ContainsBit(ec, ErrorCode::TMC_IOIN_MISMATCH))
-        return FindErrorIndex(ERR_ELECTRICAL_TMC_SELECTOR_DRIVER_ERROR);
-      if (ContainsBit(ec, ErrorCode::TMC_RESET))
-        return FindErrorIndex(ERR_ELECTRICAL_TMC_SELECTOR_DRIVER_RESET);
-      if (ContainsBit(ec, ErrorCode::TMC_UNDERVOLTAGE_ON_CHARGE_PUMP))
-        return FindErrorIndex(ERR_ELECTRICAL_TMC_SELECTOR_UNDERVOLTAGE_ERROR);
-      if (ContainsBit(ec, ErrorCode::TMC_SHORT_TO_GROUND))
-        return FindErrorIndex(ERR_ELECTRICAL_TMC_SELECTOR_DRIVER_SHORTED);
-      if (ContainsBit(ec, ErrorCode::TMC_OVER_TEMPERATURE_WARN))
-        return FindErrorIndex(ERR_TEMPERATURE_WARNING_TMC_SELECTOR_TOO_HOT);
-      if (ContainsBit(ec, ErrorCode::TMC_OVER_TEMPERATURE_ERROR))
-        return FindErrorIndex(ERR_TEMPERATURE_TMC_SELECTOR_OVERHEAT_ERROR);
-    }
-    else if (ContainsBit(ec, ErrorCode::TMC_IDLER_BIT)) {
-      if (ContainsBit(ec, ErrorCode::TMC_IOIN_MISMATCH))
-        return FindErrorIndex(ERR_ELECTRICAL_TMC_IDLER_DRIVER_ERROR);
-      if (ContainsBit(ec, ErrorCode::TMC_RESET))
-        return FindErrorIndex(ERR_ELECTRICAL_TMC_IDLER_DRIVER_RESET);
-      if (ContainsBit(ec, ErrorCode::TMC_UNDERVOLTAGE_ON_CHARGE_PUMP))
-        return FindErrorIndex(ERR_ELECTRICAL_TMC_IDLER_UNDERVOLTAGE_ERROR);
-      if (ContainsBit(ec, ErrorCode::TMC_SHORT_TO_GROUND))
-        return FindErrorIndex(ERR_ELECTRICAL_TMC_IDLER_DRIVER_SHORTED);
-      if (ContainsBit(ec, ErrorCode::TMC_OVER_TEMPERATURE_WARN))
-        return FindErrorIndex(ERR_TEMPERATURE_WARNING_TMC_IDLER_TOO_HOT);
-      if (ContainsBit(ec, ErrorCode::TMC_OVER_TEMPERATURE_ERROR))
-        return FindErrorIndex(ERR_TEMPERATURE_TMC_IDLER_OVERHEAT_ERROR);
-    }
-
-    // if nothing got caught, return a generic runtime error
-    return FindErrorIndex(ERR_OTHER_UNKNOWN_ERROR);
-  }
-
-  uint16_t PrusaErrorCode(const uint8_t i) { return (uint16_t)pgm_read_word(&errorCodes[i]); }
-
-  FSTR_P const PrusaErrorTitle(const uint8_t i) { return (FSTR_P const)pgm_read_ptr(&errorTitles[i]); }
-  FSTR_P const PrusaErrorDesc(const uint8_t i) { return (FSTR_P const)pgm_read_ptr(&errorDescs[i]); }
-
-  uint8_t PrusaErrorButtons(const uint8_t i) { return pgm_read_byte(errorButtons + i); }
-
-  FSTR_P const PrusaErrorButtonTitle(const uint8_t bi) {
-    // -1 represents the hidden NoOperation button which is not drawn in any way
-    return (FSTR_P const)pgm_read_ptr(&btnOperation[bi - 1]);
-  }
-
-  Buttons ButtonPressed(const ErrorCode ec) {
-    if (buttonSelectedOperation == ButtonOperations::NoOperation || buttonSelectedOperation == ButtonOperations::MoreInfo)
-      return Buttons::NoButton; // no button
-
-    const auto result = ButtonAvailable(ec);
-    buttonSelectedOperation = ButtonOperations::NoOperation; // Reset operation
-
-    return result;
-  }
-
-  Buttons ButtonAvailable(const ErrorCode ec) {
-    uint8_t ei = PrusaErrorCodeIndex(ec);
-
-    // The list of responses which occur in mmu error dialogs
-    // Return button index or perform some action on the MK3 by itself (like Reset MMU)
-    // Based on Prusa-Error-Codes errors_list.h
-    // So far hardcoded, but should be generated in the future
-    switch (PrusaErrorCode(ei)) {
-      case ERR_MECHANICAL_FINDA_DIDNT_TRIGGER:
-      case ERR_MECHANICAL_FINDA_FILAMENT_STUCK:
-      case ERR_MECHANICAL_FSENSOR_DIDNT_TRIGGER:
-      case ERR_MECHANICAL_FSENSOR_FILAMENT_STUCK:
-      case ERR_MECHANICAL_FSENSOR_TOO_EARLY:
-      case ERR_MECHANICAL_INSPECT_FINDA:
-      case ERR_MECHANICAL_SELECTOR_CANNOT_MOVE:
-      case ERR_MECHANICAL_IDLER_CANNOT_MOVE:
-      case ERR_MECHANICAL_PULLEY_CANNOT_MOVE:
-      case ERR_SYSTEM_UNLOAD_MANUALLY:
-        switch (buttonSelectedOperation) {
-          // may be allow move selector right and left in the future
-          case ButtonOperations::Retry: // "Repeat action"
-            return Buttons::Middle;
-          default:
-            break;
-        }
-        break;
-      case ERR_MECHANICAL_SELECTOR_CANNOT_HOME:
-      case ERR_MECHANICAL_IDLER_CANNOT_HOME:
-        switch (buttonSelectedOperation) {
-          // may be allow move selector right and left in the future
-          case ButtonOperations::Tune: // Tune Stallguard threshold
-            return Buttons::TuneMMU;
-          case ButtonOperations::Retry: // "Repeat action"
-            return Buttons::Middle;
-          default:
-            break;
-        }
-        break;
-      case ERR_MECHANICAL_LOAD_TO_EXTRUDER_FAILED:
-      case ERR_SYSTEM_FILAMENT_EJECTED:
-        switch (buttonSelectedOperation) {
-          case ButtonOperations::Continue: // User solved the serious mechanical problem by hand - there is no other way around
-            return Buttons::Middle;
-          default:
-            break;
-        }
-        break;
-      case ERR_SYSTEM_FILAMENT_CHANGE:
-        switch (buttonSelectedOperation) {
-          case ButtonOperations::Load:
-            return Buttons::Load;
-          case ButtonOperations::Eject:
-            return Buttons::Eject;
-          default:
-            break;
-        }
-        break;
-      case ERR_TEMPERATURE_WARNING_TMC_PULLEY_TOO_HOT:
-      case ERR_TEMPERATURE_WARNING_TMC_SELECTOR_TOO_HOT:
-      case ERR_TEMPERATURE_WARNING_TMC_IDLER_TOO_HOT:
-        switch (buttonSelectedOperation) {
-          case ButtonOperations::Continue: // "Continue"
-            return Buttons::Left;
-          case ButtonOperations::ResetMMU: // "Reset MMU"
-            return Buttons::ResetMMU;
-          default:
-            break;
-        }
-        break;
-
-      case ERR_TEMPERATURE_TMC_PULLEY_OVERHEAT_ERROR:
-      case ERR_TEMPERATURE_TMC_SELECTOR_OVERHEAT_ERROR:
-      case ERR_TEMPERATURE_TMC_IDLER_OVERHEAT_ERROR:
-
-      case ERR_ELECTRICAL_TMC_PULLEY_DRIVER_ERROR:
-      case ERR_ELECTRICAL_TMC_SELECTOR_DRIVER_ERROR:
-      case ERR_ELECTRICAL_TMC_IDLER_DRIVER_ERROR:
-
-      case ERR_ELECTRICAL_TMC_PULLEY_DRIVER_RESET:
-      case ERR_ELECTRICAL_TMC_SELECTOR_DRIVER_RESET:
-      case ERR_ELECTRICAL_TMC_IDLER_DRIVER_RESET:
-
-      case ERR_ELECTRICAL_TMC_PULLEY_UNDERVOLTAGE_ERROR:
-      case ERR_ELECTRICAL_TMC_SELECTOR_UNDERVOLTAGE_ERROR:
-      case ERR_ELECTRICAL_TMC_IDLER_UNDERVOLTAGE_ERROR:
-
-      case ERR_ELECTRICAL_TMC_PULLEY_DRIVER_SHORTED:
-      case ERR_ELECTRICAL_TMC_SELECTOR_DRIVER_SHORTED:
-      case ERR_ELECTRICAL_TMC_IDLER_DRIVER_SHORTED:
-
-      case ERR_ELECTRICAL_MMU_PULLEY_SELFTEST_FAILED:
-      case ERR_ELECTRICAL_MMU_SELECTOR_SELFTEST_FAILED:
-      case ERR_ELECTRICAL_MMU_IDLER_SELFTEST_FAILED:
-
-      case ERR_SYSTEM_QUEUE_FULL:
-      case ERR_SYSTEM_FW_RUNTIME_ERROR:
-      case ERR_ELECTRICAL_MMU_MCU_ERROR:
-        switch (buttonSelectedOperation) {
-          case ButtonOperations::ResetMMU: // "Reset MMU"
-            return Buttons::ResetMMU;
-          default:
-            break;
-        }
-        break;
-      case ERR_CONNECT_MMU_NOT_RESPONDING:
-      case ERR_CONNECT_COMMUNICATION_ERROR:
-      case ERR_SYSTEM_FW_UPDATE_NEEDED:
-        switch (buttonSelectedOperation) {
-          case ButtonOperations::DisableMMU: // "Disable"
-            return Buttons::DisableMMU;
-          case ButtonOperations::ResetMMU: // "ResetMMU"
-            return Buttons::ResetMMU;
-          default:
-            break;
-        }
-        break;
-      case ERR_SYSTEM_FILAMENT_ALREADY_LOADED:
-        switch (buttonSelectedOperation) {
-          case ButtonOperations::Unload: // "Unload"
-            return Buttons::Left;
-          case ButtonOperations::Continue: // "Proceed/Continue"
-            return Buttons::Right;
-          default:
-            break;
-        }
-        break;
-
-      case ERR_SYSTEM_INVALID_TOOL:
-        switch (buttonSelectedOperation) {
-          case ButtonOperations::StopPrint: // "Stop print"
-            return Buttons::StopPrint;
-          case ButtonOperations::ResetMMU: // "Reset MMU"
-            return Buttons::ResetMMU;
-          default:
-            break;
-        }
-        break;
-
-      default:
-        break;
-    }
-
-    return Buttons::NoButton;
-  }
-
-  void SetButtonResponse(ButtonOperations rsp) {
-    buttonSelectedOperation = rsp;
-  }
-
-  ButtonOperations GetButtonResponse() {
-    return buttonSelectedOperation;
-  }
-
-} // MMU3
-
-#endif // HAS_PRUSA_MMU3

Marlin/src/feature/mmu3/mmu3_error_converter.h

@@ -1,73 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2024 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-/**
- * mmu2_error_converter.h
- */
-
-#include <stdint.h>
-#include <stddef.h>
-#include "mmu_hw/buttons.h"
-#include "mmu_hw/error_codes.h"
-
-  namespace MMU3 {
-
-  // Translates MMU3::ErrorCode into an index of Prusa-Error-Codes
-  // Basically this is the way to obtain an index into all other functions in this API
-  uint8_t PrusaErrorCodeIndex(const ErrorCode ec);
-
-  // @return pointer to a PROGMEM string representing the Title of the Prusa-Error-Codes error
-  // @param i index of the error - obtained by calling ErrorCodeIndex
-  FSTR_P const PrusaErrorTitle(const uint8_t i);
-
-  // @return pointer to a PROGMEM string representing the multi-page Description of the Prusa-Error-Codes error
-  // @param i index of the error - obtained by calling ErrorCodeIndex
-  FSTR_P const PrusaErrorDesc(const uint8_t i);
-
-  // @return the actual numerical value of the Prusa-Error-Codes error
-  // @param i index of the error - obtained by calling ErrorCodeIndex
-  uint16_t PrusaErrorCode(const uint8_t i);
-
-  // @return Btns pair of buttons for a particular Prusa-Error-Codes error
-  // @param i index of the error - obtained by calling ErrorCodeIndex
-  uint8_t PrusaErrorButtons(const uint8_t i);
-
-  // @return pointer to a PROGMEM string representing the Title of a button
-  // @param i index of the error - obtained by calling PrusaErrorButtons + extracting low or high nibble from the Btns pair
-  FSTR_P const PrusaErrorButtonTitle(const uint8_t bi);
-
-  // Sets the selected button for later pick-up by the MMU state machine.
-  // Used to save the GUI selection/decoupling
-  void SetButtonResponse(const ButtonOperations rsp);
-  ButtonOperations GetButtonResponse();
-
-  // @return button index/code based on currently processed error/screen
-  // Clears the "pressed" button upon exit
-  Buttons ButtonPressed(const ErrorCode ec);
-
-  // @return button index/code based on currently processed error/screen
-  // Used as a subfunction of ButtonPressed.
-  // Does not clear the "pressed" button upon exit
-  Buttons ButtonAvailable(const ErrorCode ec);
-
-  } // MMU3

Marlin/src/feature/mmu3/mmu3_fsensor.cpp

@@ -1,65 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2024 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * mmu2_fsensor.cpp
- */
-
-#include "../../inc/MarlinConfigPre.h"
-
-#if HAS_PRUSA_MMU3
-
-#include "../../feature/runout.h"
-#include "mmu3_fsensor.h"
-
-namespace MMU3 {
-
-  #if HAS_FILAMENT_SENSOR
-
-    FSensorBlockRunout::FSensorBlockRunout() {
-      runout.enabled = false; // Suppress filament runouts while loading filament.
-      //fsensor.setAutoLoadEnabled(false); //suppress filament autoloads while loading filament.
-    }
-
-    FSensorBlockRunout::~FSensorBlockRunout() {
-      //fsensor.settings_init(); // restore filament runout state.
-      runout.reset();
-      runout.enabled = true;
-      //SERIAL_ECHOLNPGM("FSUnBlockRunout");
-    }
-
-  #else
-
-    FSensorBlockRunout::FSensorBlockRunout() { }
-    FSensorBlockRunout::~FSensorBlockRunout() { }
-
-  #endif
-
-
-  FilamentState WhereIsFilament() {
-    //return fsensor.getFilamentPresent() ? FilamentState::AT_FSENSOR : FilamentState::NOT_PRESENT;
-    return FILAMENT_PRESENT() ? FilamentState::AT_FSENSOR : FilamentState::NOT_PRESENT;
-  }
-
-} // MMU3
-
-#endif // HAS_PRUSA_MMU3

Marlin/src/feature/mmu3/mmu3_fsensor.h

@@ -1,55 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2024 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-/**
- * mmu2_fsensor.h
- */
-
-#include "../../core/macros.h"
-#include <stdint.h>
-
-#define FILAMENT_PRESENT() (READ(FIL_RUNOUT1_PIN) != FIL_RUNOUT1_STATE)
-
-namespace MMU3 {
-
-  // Can be used to block printer's filament sensor handling - to avoid errorneous injecting of M600
-  // while doing a toolchange with the MMU
-  // In case of "no filament sensor" these methods default to an empty implementation
-  class FSensorBlockRunout {
-    public:
-    FSensorBlockRunout();
-    ~FSensorBlockRunout();
-  };
-
-  // Possible states of filament from the perspective of presence in various parts of the printer
-  // Beware, the numeric codes are important and sent into the MMU
-  enum class FilamentState : uint_fast8_t {
-    NOT_PRESENT = 0,  //!< Filament sensor doesn't see the filament
-    AT_FSENSOR  = 1,  //!< Filament detected by the filament sensor, but the nozzle has not detected the filament yet
-    IN_NOZZLE   = 2,  //!< Filament detected by the filament sensor and also loaded in the nozzle
-    UNAVAILABLE = 3   //!< Sensor not available (likely not connected due broken cable)
-  };
-
-  FilamentState WhereIsFilament();
-
-} // MMU3

Marlin/src/feature/mmu3/mmu3_log.cpp

@@ -1,47 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2024 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * mmu2_log.cpp
- */
-
-#include "../../inc/MarlinConfigPre.h"
-
-#if HAS_PRUSA_MMU3
-
-#include "mmu3_log.h"
-
-namespace MMU3 {
-
-  void LogEchoEvent_P(PGM_P const pstr) {
-    SERIAL_ECHO_START(); // @@TODO Decide MMU errors on serial line
-    SERIAL_MMU2();
-    SERIAL_ECHOLN_P(pstr);
-  }
-
-  void LogErrorEvent_P(PGM_P const pstr) {
-    LogEchoEvent_P(pstr);
-  }
-
-} // MMU3
-
-#endif // HAS_PRUSA_MMU3

Marlin/src/feature/mmu3/mmu3_log.h

@@ -1,82 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2024 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-/**
- * mmu2_log.h
- */
-
-#include "../../inc/MarlinConfig.h"
-
-namespace MMU3 {
-
-  // Report the msg into the general logging subsystem (through Marlin's SERIAL_ECHO stuff)
-  // @param msg pointer to a string in PROGMEM
-  // On the AVR platform this variant reads the input string from PROGMEM.
-  // On the ARM platform it calls LogErrorEvent directly (silently expecting the compiler to optimize it away)
-  void LogErrorEvent_P(PGM_P const pstr);
-  inline void LogErrorEvent(FSTR_P const fstr) { LogErrorEvent_P(FTOP(fstr)); }
-
-  // Report the msg into the general logging subsystem (through Marlin's SERIAL_ECHO stuff)
-  // @param msg pointer to a string in PROGMEM
-  // On the AVR platform this variant reads the input string from PROGMEM.
-  // On the ARM platform it calls LogErrorEvent directly (silently expecting the compiler to optimize it away)
-  void LogEchoEvent_P(PGM_P const pstr);
-  inline void LogEchoEvent(FSTR_P const fstr) { LogEchoEvent_P(FTOP(fstr)); }
-
-} // MMU3
-
-#ifndef UNITTEST
-
-  #define SERIAL_MMU2() { SERIAL_ECHO(F("MMU3:")); }
-
-  #define MMU2_ECHO_MSGLN(S) do { \
-      SERIAL_ECHO_START();        \
-      SERIAL_MMU2();              \
-      SERIAL_ECHOLN(S);           \
-    }while(0)
-  #define MMU2_ERROR_MSGLN(S) MMU2_ECHO_MSGLN(S) //! @todo Decide MMU errors  on serial line
-  #define MMU2_ECHO_MSGRPGM(S) do { \
-      SERIAL_ECHO_START();          \
-      SERIAL_MMU2();                \
-      SERIAL_ECHO_P(S);             \
-    }while(0)
-  #define MMU2_ERROR_MSGRPGM(S) MMU2_ECHO_MSGRPGM(S) //! @todo Decide MMU errors  on serial line
-  #define MMU2_ECHO_MSG(S) do { \
-      SERIAL_ECHO_START();      \
-      SERIAL_MMU2();            \
-      SERIAL_ECHO(S);           \
-    }while(0)
-  #define MMU2_ERROR_MSG(S) MMU2_ECHO_MSG(S) //! @todo Decide MMU errors  on serial line
-
-#else // UNITTEST
-
-  #include "stubs/stub_interfaces.h"
-  #define MMU2_ECHO_MSGLN(S)    marlinLogSim.AppendLine(S)
-  #define MMU2_ERROR_MSGLN(S)   marlinLogSim.AppendLine(S)
-  #define MMU2_ECHO_MSGRPGM(S)  /* marlinLogSim.AppendLine(S) */
-  #define MMU2_ERROR_MSGRPGM(S) /* marlinLogSim.AppendLine(S) */
-  #define SERIAL_ECHOLNPGM(S)   /* marlinLogSim.AppendLine(S) */
-  #define SERIAL_ECHOPGM(S)     /* */
-  #define SERIAL_ECHOLN(S)      /* marlinLogSim.AppendLine(S) */
-
-#endif // UNITTEST

Marlin/src/feature/mmu3/mmu3_marlin.h

@@ -1,74 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2024 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-/**
- * mmu2_marlin.h
- */
-
-#include "../../inc/MarlinConfig.h"
-
-namespace MMU3 {
-
-  // This interface separates Marlin1/Marlin2 from the MMU top logic layer.
-  // - Unify implementation among MK3 and Buddy FW
-  // - Enable unit testing of MMU top layer
-
-  void extruder_move(const_float_t distance, const_float_t feedRate_mm_s, const bool sync=true);
-  void extruder_schedule_turning(const_float_t feedRate_mm_s);
-
-  float move_raise_z(const_float_t delta);
-
-  void planner_abort_queued_moves();
-  void planner_synchronize();
-  bool planner_any_moves();
-  float stepper_get_machine_position_E_mm();
-  float planner_get_current_position_E();
-  void planner_set_current_position_E(float e);
-  xyz_pos_t planner_current_position();
-
-  void motion_do_blocking_move_to_xy(float rx, float ry, float feedRate_mm_s);
-  void motion_do_blocking_move_to_z(float z, float feedRate_mm_s);
-
-  void nozzle_park();
-
-  bool marlin_printingIsActive();
-  void marlin_manage_heater();
-  void marlin_manage_inactivity(bool b);
-  void marlin_idle(bool b);
-  void marlin_refresh_print_state_in_ram();
-  void marlin_clear_print_state_in_ram();
-  void marlin_stop_and_save_print_to_ram();
-
-  int16_t thermal_degTargetHotend();
-  int16_t thermal_degHotend();
-  void thermal_setExtrudeMintemp(int16_t t);
-  void thermal_setTargetHotend(int16_t t);
-
-  void safe_delay_keep_alive(uint16_t t);
-
-  void Enable_E0();
-  void Disable_E0();
-
-  bool xy_are_trusted();
-
-} // MMU3

Marlin/src/feature/mmu3/mmu3_marlin1.cpp

@@ -1,190 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2024 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * mmu2_marlin1.cpp
- * MK3 / Marlin1 implementation of support routines for the MMU3
- */
-
-#include "../../inc/MarlinConfigPre.h"
-
-#if HAS_PRUSA_MMU3
-
-#include "../../MarlinCore.h"
-#include "../../module/stepper.h"
-#include "../../module/planner.h"
-#include "../../module/temperature.h"
-
-#include "../../feature/pause.h"
-#include "../../libs/nozzle.h"
-#include "mmu3_marlin.h"
-
-namespace MMU3 {
-
-  static void planner_line_to_current_position(float feedRate_mm_s) {
-    line_to_current_position(feedRate_mm_s);
-  }
-
-  static void planner_line_to_current_position_sync(float feedRate_mm_s) {
-    planner_line_to_current_position(feedRate_mm_s);
-    planner_synchronize();
-  }
-
-  void extruder_move(const_float_t delta, const_float_t feedRate_mm_s, const bool sync/*=true*/) {
-    current_position.e += delta / planner.e_factor[active_extruder];
-    planner_line_to_current_position(feedRate_mm_s);
-    if (sync) planner.synchronize();
-  }
-
-  float move_raise_z(const_float_t delta) {
-    //return raise_z(delta);
-    xyze_pos_t current_position_before = current_position;
-    do_z_clearance_by(delta);
-    return (current_position - current_position_before).z;
-  }
-
-  void planner_abort_queued_moves() {
-    //planner_abort_hard();
-    quickstop_stepper();
-
-    // Unblock the planner. This should be safe in the
-    // toolchange context. Currently we are mainly aborting
-    // excess E-moves after detecting filament during toolchange.
-    // If a MMU error is reported, the planner must be unblocked
-    // as well so the extruder can be parked safely.
-    //planner_aborted = false;
-    // eoyilmaz: we don't need this part, the print is not aborted
-  }
-
-  void planner_synchronize() {
-    planner.synchronize();
-  }
-
-  bool planner_any_moves() {
-    return planner.has_blocks_queued();
-  }
-
-  float planner_get_machine_position_E_mm() {
-    return current_position.e;
-  }
-
-  float stepper_get_machine_position_E_mm() {
-    return planner.get_axis_position_mm(E_AXIS);
-  }
-
-  float planner_get_current_position_E() {
-    return current_position.e;
-  }
-
-  void planner_set_current_position_E(float e) {
-    current_position.e = e;
-  }
-
-  xyz_pos_t planner_current_position() {
-    return xyz_pos_t(current_position);
-  }
-
-  void motion_do_blocking_move_to_xy(float rx, float ry, float feedRate_mm_s) {
-    current_position[X_AXIS] = rx;
-    current_position[Y_AXIS] = ry;
-    planner_line_to_current_position_sync(feedRate_mm_s);
-  }
-
-  void motion_do_blocking_move_to_z(float z, float feedRate_mm_s) {
-    current_position[Z_AXIS] = z;
-    planner_line_to_current_position_sync(feedRate_mm_s);
-  }
-
-  void nozzle_park() {
-    #if ANY(NOZZLE_CLEAN_FEATURE, NOZZLE_PARK_FEATURE)
-      #if ALL(ADVANCED_PAUSE_FEATURE)
-        xyz_pos_t park_point = NOZZLE_PARK_POINT;
-        nozzle.park(0, park_point);
-      #endif
-    #endif
-  }
-
-  bool marlin_printingIsActive() { return printingIsActive(); }
-
-  void marlin_manage_heater() { thermalManager.task(); }
-
-  void marlin_manage_inactivity(const bool b) { idle(b); }
-
-  void marlin_idle(bool b) {
-    thermalManager.task();
-    idle(b);
-  }
-
-  void marlin_refresh_print_state_in_ram() {
-    // refresh_print_state_in_ram();
-    // TODO: I don't see a comparable implementation in Marlin.
-  }
-
-  void marlin_clear_print_state_in_ram() {
-    // clear_print_state_in_ram();
-    // TODO: I don't see a comparable implementation in Marlin.
-  }
-
-  void marlin_stop_and_save_print_to_ram() {
-    // stop_and_save_print_to_ram(0,0);
-    #if ENABLED(ADVANCED_PAUSE_FEATURE)
-      constexpr xyz_pos_t park_point = NOZZLE_PARK_POINT;
-      pause_print(0, park_point);
-    #endif
-  }
-
-  int16_t thermal_degTargetHotend() {
-    return thermalManager.degTargetHotend(0);
-  }
-
-  int16_t thermal_degHotend() {
-    return thermalManager.degHotend(0);
-  }
-
-  void thermal_setExtrudeMintemp(int16_t t) {
-    thermalManager.extrude_min_temp = t;
-  }
-
-  void thermal_setTargetHotend(int16_t t) {
-    thermalManager.setTargetHotend(t, 0);
-  }
-
-  void safe_delay_keep_alive(uint16_t t) {
-    idle(true);
-    safe_delay(t);
-  }
-
-  void Enable_E0() {
-    stepper.enable_extruder(TERN_(HAS_EXTRUDERS, 0));
-  }
-
-  void Disable_E0() {
-    stepper.disable_extruder(TERN_(HAS_EXTRUDERS, 0));
-  }
-
-  bool xy_are_trusted() {
-    return axis_is_trusted(X_AXIS) && axis_is_trusted(Y_AXIS);
-  }
-
-} // MMU3
-
-#endif // HAS_PRUSA_MMU3

Marlin/src/feature/mmu3/mmu3_marlin_macros.h

@@ -1,49 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2024 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-/**
- * mmu2_marlin_macros.h
- */
-
-// This file will not be the same on Marlin1 and Marlin2.
-// Its purpose is to unify different macros in either of Marlin incarnations.
-
-#ifdef __AVR__
-  #include "../../MarlinCore.h"
-  // brings _O and _T macros into MMU
-  #include "../../core/language.h"
-  #include "../../gcode/gcode.h"
-  // we don't have these in Marlin 2.x so just define them here again
-  #define _O(x)                             x
-  #define _T(x)                             x
-  #define MARLIN_KEEPALIVE_STATE_IN_PROCESS KEEPALIVE_STATE(IN_PROCESS)
-#elif defined(UNITTEST)
-  #define _O(x)                             x
-  #define _T(x)                             x
-  #define MARLIN_KEEPALIVE_STATE_IN_PROCESS /*KEEPALIVE_STATE(IN_PROCESS) TODO*/
-#else
-  #include "../../gcode/gcode.h"
-  #define _O(x)                             x
-  #define _T(x)                             x
-  #define MARLIN_KEEPALIVE_STATE_IN_PROCESS KEEPALIVE_STATE(IN_PROCESS)
-#endif

Marlin/src/feature/mmu3/mmu3_power.cpp

@@ -1,65 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2024 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * mmu2_power.cpp
- */
-
-#include "../../inc/MarlinConfigPre.h"
-
-#if HAS_PRUSA_MMU3
-
-#include "mmu3.h"
-#include "mmu3_power.h"
-
-#include "../../MarlinCore.h"
-
-#include "../../core/macros.h"
-#include "../../core/boards.h"
-#include "../../pins/pins.h"
-
-namespace MMU3 {
-
-// On MK3 we cannot do actual power cycle on HW. Instead trigger a hardware reset.
-void power_on() {
-  #if PIN_EXISTS(MMU_RST)
-    OUT_WRITE(MMU_RST_PIN, HIGH);
-  #endif
-  power_reset();
-}
-
-void power_off() {}
-
-void power_reset() {
-  #if PIN_EXISTS(MMU_RST) // HW - pulse reset pin
-    WRITE(MMU_RST_PIN, LOW);
-    safe_delay(100);
-    WRITE(MMU_RST_PIN, HIGH);
-  #else
-    mmu3.reset(MMU3::Software); // TODO: Needs redesign. This power implementation shouldn't know anything about the MMU itself
-  #endif
-  // otherwise HW reset is not available
-}
-
-} // MMU3
-
-#endif // HAS_PRUSA_MMU3

Marlin/src/feature/mmu3/mmu3_power.h

@@ -1,36 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2024 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-/**
- * mmu2_power.h
- */
-
-namespace MMU3 {
-
-void power_on();
-
-void power_off();
-
-void power_reset();
-
-} // MMU3