enable

"lift"
add test
2025-05-03 21:06:22 -05:00 · 2025-05-03 20:44:06 -05:00 · 2025-05-03 15:52:30 -05:00 · 2025-05-03 15:47:24 -05:00 · 2025-05-03 15:25:03 -05:00 · 2025-05-03 15:24:12 -05:00
1653 changed files with 69024 additions and 95394 deletions
@@ -0,0 +1,21 @@
+# Build artifacts
+buildroot/
+*.o
+*.a
+*.so
+*.dylib
+*.dll
+*.exe
+
+# Web assets
+*.min.js
+*.min.css
+
+# Generated files
+__pycache__/
+*.pyc
+.DS_Store
+
+# IDE files
+.vscode/
+.idea/
@@ -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.gg/n5NJ59y
+    url: https://discord.com/servers/marlin-firmware-461605380783472640
    about: Join the Discord server for support and discussion.
  - name: 🔗 Marlin Discussion Forum
    url: https://reprap.org/forum/list.php?415
@@ -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.gg/n5NJ59y to join up as a General User.
+* Use the link https://discord.com/servers/marlin-firmware-461605380783472640 to join up as a General User.
 * Even though our Discord is pretty active, it may take a while for community members to respond &mdash; 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.
@@ -14,7 +14,7 @@ jobs:
  autolabel:
    name: Auto Label
    if: github.repository == 'MarlinFirmware/Marlin'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
    steps:
    - name: Auto Label for [BUG]
      uses: actions/github-script@v7
@@ -14,7 +14,7 @@ jobs:
    name: Bump Distribution Date
    if: github.repository == 'MarlinFirmware/Marlin'

-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04

    steps:

@@ -18,7 +18,7 @@ jobs:
    name: PR Bad Target
    if: github.repository == 'MarlinFirmware/Marlin'

-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04

    steps:
    - uses: superbrothers/close-pull-request@v3
@@ -14,6 +14,8 @@ on:
    - config/**
    - data/**
    - docs/**
+    - test/**
+    - Marlin/tests/**
    - '**/*.md'
  push:
    branches:
@@ -23,6 +25,8 @@ on:
    - config/**
    - data/**
    - docs/**
+    - test/**
+    - Marlin/tests/**
    - '**/*.md'

 jobs:
@@ -30,14 +34,19 @@ jobs:
    name: Build Test
    if: github.repository == 'MarlinFirmware/Marlin'

-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04

    strategy:
+      fail-fast: true
      matrix:
        test-platform:

+        # RP2040
+        - SKR_Pico
+
        # Native
        - linux_native
+        - simulator_linux_release

        # AVR
        - mega2560
@@ -100,11 +109,11 @@ jobs:

        # STM32F4
        - ARMED
-        - BIGTREE_BTT002
-        - BIGTREE_GTR_V1_0
-        - BIGTREE_SKR_PRO
+        - BTT_BTT002
+        - BTT_GTR_V1_0
+        - BTT_SKR_PRO
        - FLYF407ZG
-        - FYSETC_S6
+        - STM32F446VE_fysetc
        - LERDGEK
        - LERDGEX
        - mks_robin_pro2
@@ -142,6 +151,12 @@ jobs:
        # HC32
        - HC32F460C_aquila_101

+        # GD32F3
+        - GD32F303RE_creality_mfl
+
+        # GD32F1
+        - GD32F103RC_aquila_mfl
+
        # LPC176x - Lengthy tests
        - LPC1768
        - LPC1769
@@ -155,15 +170,20 @@ jobs:
      uses: actions/cache@v4
      with:
        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+        key: ${{ runner.os }}-pip-build-v1
        restore-keys: |
-          ${{ runner.os }}-pip-
+          ${{ runner.os }}-pip-build-

    - name: Cache PlatformIO
      uses: actions/cache@v4
      with:
-        path: ~/.platformio
-        key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
+        path: |
+          ~/.platformio
+          .pio/build
+          .pio/libdeps
+        key: ${{ runner.os }}-pio-build-v1
+        restore-keys: |
+          ${{ runner.os }}-pio-build-

    - name: Select Python 3.9
      uses: actions/setup-python@v5
@@ -177,6 +197,14 @@ jobs:
        pio upgrade --dev
        pio pkg update --global

+    - name: Install Simulator dependencies
+      run: |
+        sudo apt-get update
+        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 }}
@@ -36,7 +36,7 @@ jobs:
    # pulls them into additional branches.
    if: github.repository == 'MarlinFirmware/Marlin'

-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04

    steps:
    - name: Check out the PR
@@ -46,15 +46,20 @@ jobs:
      uses: actions/cache@v4
      with:
        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+        key: ${{ runner.os }}-pip-unit-v1
        restore-keys: |
-          ${{ runner.os }}-pip-
+          ${{ runner.os }}-pip-unit-

    - name: Cache PlatformIO
      uses: actions/cache@v4
      with:
-        path: ~/.platformio
-        key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
+        path: |
+          ~/.platformio
+          .pio/build
+          .pio/libdeps
+        key: ${{ runner.os }}-pio-tests-v1
+        restore-keys: |
+          ${{ runner.os }}-pio-tests-

    - name: Select Python 3.9
      uses: actions/setup-python@v5
@@ -0,0 +1,48 @@
+#
+# 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-22.04
+
+    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-boards-v1
+        restore-keys: |
+          ${{ runner.os }}-pip-boards-
+
+    - 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
@@ -0,0 +1,51 @@
+#
+# ci-validate-pins.yml
+# Validate that all of the pins files are unchanged by pinsformat.py
+#
+
+name: CI - Validate Pins Files
+
+on:
+  pull_request:
+    branches:
+    - bugfix-2.1.x
+    # Cannot be enabled on 2.1.x until it contains the unit test framework
+    #- 2.1.x
+    paths:
+    - 'Marlin/src/pins/*/**'
+  push:
+    branches:
+    - bugfix-2.1.x
+    # Cannot be enabled on 2.1.x until it contains the unit test framework
+    #- 2.1.x
+    paths:
+    - 'Marlin/src/pins/*/**'
+
+jobs:
+  validate_pins_files:
+    name: Validate Pins Files
+    if: github.repository == 'MarlinFirmware/Marlin'
+
+    runs-on: ubuntu-22.04
+
+    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-pins-v1
+        restore-keys: |
+          ${{ runner.os }}-pip-pins-
+
+    - name: Select Python 3.9
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.9'
+        architecture: 'x64'
+
+    - name: Validate all pins files
+      run: |
+        make validate-pins -j
@@ -13,7 +13,7 @@ on:

 jobs:
  remove_label:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04

    strategy:
      matrix:
@@ -14,7 +14,7 @@ jobs:
    name: Close Stale Issues
    if: github.repository == 'MarlinFirmware/Marlin'

-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04

    steps:
    - uses: actions/stale@v9
@@ -14,7 +14,7 @@ jobs:
    name: Lock Closed Issues
    if: github.repository == 'MarlinFirmware/Marlin'

-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04

    steps:
    - uses: dessant/lock-threads@v5
@@ -14,7 +14,7 @@ jobs:
    name: Unlock Reopened
    if: github.repository == 'MarlinFirmware/Marlin'

-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04

    steps:
    - uses: OSDKDev/unlock-issues@v1.1
@@ -125,6 +125,7 @@ vc-fileutils.settings
 # Visual Studio Code
 .vscode/*
 !.vscode/extensions.json
+*.code-workspace

 # Simulation files
 imgui.ini
@@ -168,3 +169,6 @@ __pycache__
 tags
 *.logs
 *.bak
+.aider*
+!.aiderignore
+.env
@@ -0,0 +1,16 @@
+/**
+ * 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
+    }
+  }
+}
@@ -2,22 +2,24 @@ SCRIPTS_DIR := buildroot/share/scripts
 CONTAINER_RT_BIN := docker
 CONTAINER_RT_OPTS := --rm -v $(PWD):/code -v platformio-cache:/root/.platformio
 CONTAINER_IMAGE := marlin-dev
+UNIT_TEST_CONFIG ?= default

 help:
 	@echo "Tasks for local development:"
-	@echo "make marlin                    : Build marlin for the configured board"
-	@echo "make format-pins               : Reformat all pins files"
+	@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"
 	@echo "make tests-all-local           : Run all tests locally"
 	@echo "make tests-all-local-docker    : Run all tests locally, using docker"
-#	@echo "make unit-test-single-ci      : Run a single code test from inside the CI"
-#	@echo "make unit-test-single-local   : Run a single code test locally"
-#	@echo "make unit-test-single-local-docker : Run a single code test locally, using docker-compose"
-	@echo "make unit-test-all-local      : Run all code tests locally"
-	@echo "make unit-test-all-local-docker : Run all code tests locally, using docker-compose"
-	@echo "make setup-local-docker        : Setup local docker-compose"
+	@echo "make unit-test-single-local    : Run unit tests for a single config locally"
+	@echo "make unit-test-single-local-docker : Run unit tests for a single config locally, using docker"
+	@echo "make unit-test-all-local       : Run all code tests locally"
+	@echo "make unit-test-all-local-docker : Run all code tests locally, using docker"
+	@echo "make setup-local-docker        : Setup local docker using buildx"
 	@echo ""
 	@echo "Options for testing:"
 	@echo "  TEST_TARGET          Set when running tests-single-*, to select the"
@@ -27,6 +29,9 @@ help:
 	@echo "                       run on GitHub CI"
 	@echo "  ONLY_TEST            Limit tests to only those that contain this, or"
 	@echo "                       the index of the test (1-based)"
+	@echo "  UNIT_TEST_CONFIG     Set the name of the config from the test folder, without"
+	@echo "                       the leading number. Default is 'default'". Used with the
+	@echo "                       unit-test-single-* tasks"
 	@echo "  VERBOSE_PLATFORMIO   If you want the full PIO output, set any value"
 	@echo "  GIT_RESET_HARD       Used by CI: reset all local changes. WARNING:"
 	@echo "                       THIS WILL UNDO ANY CHANGES YOU'VE MADE!"
@@ -51,27 +56,29 @@ tests-single-local-docker:
 	$(CONTAINER_RT_BIN) run $(CONTAINER_RT_OPTS) $(CONTAINER_IMAGE) make tests-single-local TEST_TARGET=$(TEST_TARGET) VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) GIT_RESET_HARD=$(GIT_RESET_HARD) ONLY_TEST="$(ONLY_TEST)"

 tests-all-local:
+	@python -c "import yaml" 2>/dev/null || (echo 'pyyaml module is not installed. Install it with "python -m pip install pyyaml"' && exit 1)
 	export PATH="./buildroot/bin/:./buildroot/tests/:${PATH}" \
 	  && export VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) \
-	  && for TEST_TARGET in $$($(SCRIPTS_DIR)/get_test_targets.py) ; do echo "Running tests for $$TEST_TARGET" ; run_tests . $$TEST_TARGET ; done
+	  && for TEST_TARGET in $$(python $(SCRIPTS_DIR)/get_test_targets.py) ; do \
+	    if [ "$$TEST_TARGET" = "linux_native" ] && [ "$$(uname)" = "Darwin" ]; then \
+	      echo "Skipping tests for $$TEST_TARGET on macOS" ; \
+	      continue ; \
+	    fi ; \
+	    echo "Running tests for $$TEST_TARGET" ; \
+	    run_tests . $$TEST_TARGET || exit 1 ; \
+	    sleep 5; \
+	  done

 tests-all-local-docker:
 	@if ! $(CONTAINER_RT_BIN) images -q $(CONTAINER_IMAGE) > /dev/null ; then $(MAKE) setup-local-docker ; fi
 	$(CONTAINER_RT_BIN) run $(CONTAINER_RT_OPTS) $(CONTAINER_IMAGE) make tests-all-local VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) GIT_RESET_HARD=$(GIT_RESET_HARD)

-#unit-test-single-ci:
-#	export GIT_RESET_HARD=true
-#	$(MAKE) unit-test-single-local TEST_TARGET=$(TEST_TARGET)
+unit-test-single-local:
+	platformio run -t marlin_$(UNIT_TEST_CONFIG) -e linux_native_test

-# TODO: How can we limit tests with ONLY_TEST with platformio?
-#unit-test-single-local:
-#	@if ! test -n "$(TEST_TARGET)" ; then echo "***ERROR*** Set TEST_TARGET=<your-module> or use make unit-test-all-local" ; return 1; fi
-#	platformio run -t marlin_$(TEST_TARGET)
-
-#unit-test-single-local-docker:
-#	@if ! test -n "$(TEST_TARGET)" ; then echo "***ERROR*** Set TEST_TARGET=<your-module> or use make unit-test-all-local-docker" ; return 1; fi
-#	@if ! $(CONTAINER_RT_BIN) images -q $(CONTAINER_IMAGE) > /dev/null ; then $(MAKE) setup-local-docker ; fi
-#	$(CONTAINER_RT_BIN) run $(CONTAINER_RT_OPTS)  $(CONTAINER_IMAGE) make unit-test-single-local TEST_TARGET=$(TEST_TARGET) ONLY_TEST="$(ONLY_TEST)"
+unit-test-single-local-docker:
+	@if ! $(CONTAINER_RT_BIN) images -q $(CONTAINER_IMAGE) > /dev/null ; then $(MAKE) setup-local-docker ; fi
+	$(CONTAINER_RT_BIN) run $(CONTAINER_RT_OPTS)  $(CONTAINER_IMAGE) make unit-test-single-local UNIT_TEST_CONFIG=$(UNIT_TEST_CONFIG)

 unit-test-all-local:
 	platformio run -t test-marlin -e linux_native_test
@@ -85,7 +92,22 @@ setup-local-docker:

 PINS := $(shell find Marlin/src/pins -mindepth 2 -name '*.h')

+.PHONY: $(PINS) format-pins validate-pins
+
 $(PINS): %:
-	@echo "Formatting $@" && node $(SCRIPTS_DIR)/pinsformat.js $@
+	@echo "Formatting $@"
+	@python $(SCRIPTS_DIR)/pinsformat.py $< $@

 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)
@@ -127,9 +127,9 @@ NEOPIXEL           ?= 0
 # on GCC versions:
 #   https://www.avrfreaks.net/comment/1789106#comment-1789106

-CC_MAJ:=$(shell $(CC) -dM -E - < /dev/null | grep __GNUC__ | cut -f3 -d\ )
-CC_MIN:=$(shell $(CC) -dM -E - < /dev/null | grep __GNUC_MINOR__ | cut -f3 -d\ )
-CC_PATCHLEVEL:=$(shell $(CC) -dM -E - < /dev/null | grep __GNUC_PATCHLEVEL__ | cut -f3 -d\ )
+CC_MAJ:=$(shell $(CC) -dM -E - < /dev/null | grep __GNUC__ | cut -f3 -d' ' )
+CC_MIN:=$(shell $(CC) -dM -E - < /dev/null | grep __GNUC_MINOR__ | cut -f3 -d' ' )
+CC_PATCHLEVEL:=$(shell $(CC) -dM -E - < /dev/null | grep __GNUC_PATCHLEVEL__ | cut -f3 -d' ' )
 CC_VER:=$(shell echo $$(( $(CC_MAJ) * 10000 + $(CC_MIN) * 100 + $(CC_PATCHLEVEL) )))
 ifeq ($(shell test $(CC_VER) -lt 40901 && echo 1),1)
  $(warning This GCC version $(CC_VER) is likely broken. Enabling relocation workaround.)
@@ -187,6 +187,17 @@ 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
 #
@@ -221,108 +232,113 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1112)
 else ifeq ($(HARDWARE_MOTHERBOARD),1113)
 # BigTreeTech or BIQU KFB2.0
 else ifeq ($(HARDWARE_MOTHERBOARD),1114)
-# zrib V2.0 (Chinese RAMPS replica)
+# Zonestar zrib V2.0 (Chinese RAMPS replica)
 else ifeq ($(HARDWARE_MOTHERBOARD),1115)
-# zrib V5.2 (Chinese RAMPS replica)
+# Zonestar zrib V5.2 (Chinese RAMPS replica)
 else ifeq ($(HARDWARE_MOTHERBOARD),1116)
-# Felix 2.0+ Electronics Board (RAMPS like)
+# Zonestar zrib V5.3 (Chinese RAMPS replica)
 else ifeq ($(HARDWARE_MOTHERBOARD),1117)
-# Invent-A-Part RigidBoard
+# Felix 2.0+ Electronics Board (RAMPS like)
 else ifeq ($(HARDWARE_MOTHERBOARD),1118)
-# Invent-A-Part RigidBoard V2
+# Invent-A-Part RigidBoard
 else ifeq ($(HARDWARE_MOTHERBOARD),1119)
-# Sainsmart 2-in-1 board
+# Invent-A-Part RigidBoard V2
 else ifeq ($(HARDWARE_MOTHERBOARD),1120)
-# Ultimaker
+# Sainsmart 2-in-1 board
 else ifeq ($(HARDWARE_MOTHERBOARD),1121)
-# Ultimaker (Older electronics. Pre 1.5.4. This is rare)
+# Ultimaker
 else ifeq ($(HARDWARE_MOTHERBOARD),1122)
+# Ultimaker (Older electronics. Pre 1.5.4. This is rare)
+else ifeq ($(HARDWARE_MOTHERBOARD),1123)
  MCU              ?= atmega1280
  PROG_MCU         ?= m1280
 # Azteeg X3
-else ifeq ($(HARDWARE_MOTHERBOARD),1123)
-# Azteeg X3 Pro
 else ifeq ($(HARDWARE_MOTHERBOARD),1124)
-# Ultimainboard 2.x (Uses TEMP_SENSOR 20)
+# Azteeg X3 Pro
 else ifeq ($(HARDWARE_MOTHERBOARD),1125)
-# Rumba
+# Ultimainboard 2.x (Uses TEMP_SENSOR 20)
 else ifeq ($(HARDWARE_MOTHERBOARD),1126)
-# Raise3D N series Rumba derivative
+# Rumba
 else ifeq ($(HARDWARE_MOTHERBOARD),1127)
-# Rapide Lite 200 (v1, low-cost RUMBA clone with drv)
+# Raise3D N series Rumba derivative
 else ifeq ($(HARDWARE_MOTHERBOARD),1128)
-# Formbot T-Rex 2 Plus
+# Rapide Lite 200 (v1, low-cost RUMBA clone with drv)
 else ifeq ($(HARDWARE_MOTHERBOARD),1129)
-# Formbot T-Rex 3
+# Formbot T-Rex 2 Plus
 else ifeq ($(HARDWARE_MOTHERBOARD),1130)
-# Formbot Raptor
+# Formbot T-Rex 3
 else ifeq ($(HARDWARE_MOTHERBOARD),1131)
-# Formbot Raptor 2
+# Formbot Raptor
 else ifeq ($(HARDWARE_MOTHERBOARD),1132)
-# bq ZUM Mega 3D
+# Formbot Raptor 2
 else ifeq ($(HARDWARE_MOTHERBOARD),1133)
-# MakeBoard Mini v2.1.2 by MicroMake
+# bq ZUM Mega 3D
 else ifeq ($(HARDWARE_MOTHERBOARD),1134)
-# TriGorilla Anycubic version 1.3-based on RAMPS EFB
+# MakeBoard Mini v2.1.2 by MicroMake
 else ifeq ($(HARDWARE_MOTHERBOARD),1135)
-#   ... Ver 1.4
+# TriGorilla Anycubic version 1.3-based on RAMPS EFB
 else ifeq ($(HARDWARE_MOTHERBOARD),1136)
-#   ... Rev 1.1 (new servo pin order)
+#   ... Ver 1.4
 else ifeq ($(HARDWARE_MOTHERBOARD),1137)
-# Creality: Ender-4, CR-8
+#   ... Rev 1.1 (new servo pin order)
 else ifeq ($(HARDWARE_MOTHERBOARD),1138)
-# Creality: CR10S, CR20, CR-X
+# Creality: Ender-4, CR-8
 else ifeq ($(HARDWARE_MOTHERBOARD),1139)
-# Dagoma F5
+# Creality: CR10S, CR20, CR-X
 else ifeq ($(HARDWARE_MOTHERBOARD),1140)
-# FYSETC F6 1.3
+# Dagoma F5
 else ifeq ($(HARDWARE_MOTHERBOARD),1141)
-# FYSETC F6 1.4
+# Dagoma D6 (as found in the Dagoma DiscoUltimate V2 TMC)
 else ifeq ($(HARDWARE_MOTHERBOARD),1142)
-# Wanhao Duplicator i3 Plus
+# FYSETC F6 1.3
 else ifeq ($(HARDWARE_MOTHERBOARD),1143)
-# VORON Design
+# FYSETC F6 1.4
 else ifeq ($(HARDWARE_MOTHERBOARD),1144)
-# Tronxy TRONXY-V3-1.0
+# Wanhao Duplicator i3 Plus
 else ifeq ($(HARDWARE_MOTHERBOARD),1145)
-# Z-Bolt X Series
+# VORON Design
 else ifeq ($(HARDWARE_MOTHERBOARD),1146)
-# TT OSCAR
+# Tronxy TRONXY-V3-1.0
 else ifeq ($(HARDWARE_MOTHERBOARD),1147)
-# Overlord/Overlord Pro
+# Z-Bolt X Series
 else ifeq ($(HARDWARE_MOTHERBOARD),1148)
-# ADIMLab Gantry v1
+# TT OSCAR
 else ifeq ($(HARDWARE_MOTHERBOARD),1149)
-# ADIMLab Gantry v2
-else ifeq ($(HARDWARE_MOTHERBOARD),1150)
 # BIQU Tango V1
-else ifeq ($(HARDWARE_MOTHERBOARD),1151)
+else ifeq ($(HARDWARE_MOTHERBOARD),1150)
 # MKS GEN L V2
-else ifeq ($(HARDWARE_MOTHERBOARD),1152)
+else ifeq ($(HARDWARE_MOTHERBOARD),1151)
 # MKS GEN L V2.1
-else ifeq ($(HARDWARE_MOTHERBOARD),1153)
+else ifeq ($(HARDWARE_MOTHERBOARD),1152)
 # Copymaster 3D
-else ifeq ($(HARDWARE_MOTHERBOARD),1154)
+else ifeq ($(HARDWARE_MOTHERBOARD),1153)
 # Ortur 4
-else ifeq ($(HARDWARE_MOTHERBOARD),1155)
+else ifeq ($(HARDWARE_MOTHERBOARD),1154)
 # Tenlog D3 Hero IDEX printer
+else ifeq ($(HARDWARE_MOTHERBOARD),1155)
+# Tenlog D3, D5, D6 IDEX Printer
 else ifeq ($(HARDWARE_MOTHERBOARD),1156)
-# Tenlog D3,5,6 Pro IDEX printers
-else ifeq ($(HARDWARE_MOTHERBOARD),1157)
 # Ramps S 1.2 by Sakul.cz (Power outputs: Hotend0, Hotend1, Fan, Bed)
-else ifeq ($(HARDWARE_MOTHERBOARD),1158)
+else ifeq ($(HARDWARE_MOTHERBOARD),1157)
 # Ramps S 1.2 by Sakul.cz (Power outputs: Hotend0, Hotend1, Hotend2, Bed)
-else ifeq ($(HARDWARE_MOTHERBOARD),1159)
+else ifeq ($(HARDWARE_MOTHERBOARD),1158)
 # Ramps S 1.2 by Sakul.cz (Power outputs: Hotend, Fan0, Fan1, Bed)
-else ifeq ($(HARDWARE_MOTHERBOARD),1160)
+else ifeq ($(HARDWARE_MOTHERBOARD),1159)
 # Longer LK1 PRO / Alfawise U20 Pro (PRO version)
-else ifeq ($(HARDWARE_MOTHERBOARD),1161)
+else ifeq ($(HARDWARE_MOTHERBOARD),1160)
 # Longer LKx PRO / Alfawise Uxx Pro (PRO version)
-else ifeq ($(HARDWARE_MOTHERBOARD),1162)
-# Zonestar zrib V5.3 (Chinese RAMPS replica)
-else ifeq ($(HARDWARE_MOTHERBOARD),1163)
+else ifeq ($(HARDWARE_MOTHERBOARD),1161)
 # Pxmalion Core I3
+else ifeq ($(HARDWARE_MOTHERBOARD),1162)
+# Panowin Cutlass (as found in the Panowin F1)
+else ifeq ($(HARDWARE_MOTHERBOARD),1163)
+# Kodama Bardo V1.x (as found in the Kodama Trinus)
 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
@@ -340,7 +356,7 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1203)
 else ifeq ($(HARDWARE_MOTHERBOARD),1204)
 # abee Scoovo X9H
 else ifeq ($(HARDWARE_MOTHERBOARD),1205)
-# Rambo ThinkerV2
+# ThinkerV2
 else ifeq ($(HARDWARE_MOTHERBOARD),1206)

 #
@@ -383,30 +399,40 @@ 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 A10(M/T/D)
-else ifeq ($(HARDWARE_MOTHERBOARD),1318)
 # 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 A20(M/T/D)
+# Geeetech GT2560 Rev B for A10(M/T/D)
 else ifeq ($(HARDWARE_MOTHERBOARD),1320)
-# Einstart retrofit
-else ifeq ($(HARDWARE_MOTHERBOARD),1321)
-# Wanhao 0ne+ i3 Mini
-else ifeq ($(HARDWARE_MOTHERBOARD),1322)
-# Leapfrog Xeed 2015
-else ifeq ($(HARDWARE_MOTHERBOARD),1323)
-# PICA Shield (original version)
-else ifeq ($(HARDWARE_MOTHERBOARD),1324)
-# PICA Shield (rev C or later)
-else ifeq ($(HARDWARE_MOTHERBOARD),1325)
-# Intamsys 4.0 (Funmat HT)
-else ifeq ($(HARDWARE_MOTHERBOARD),1326)
-# Malyan M180 Mainboard Version 2 (no display function, direct G-code only)
-else ifeq ($(HARDWARE_MOTHERBOARD),1327)
 # Geeetech GT2560 Rev B for A20(M/T/D)
+else ifeq ($(HARDWARE_MOTHERBOARD),1321)
+# Einstart retrofit
+else ifeq ($(HARDWARE_MOTHERBOARD),1322)
+# 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)
+# Leapfrog Xeed 2015
+else ifeq ($(HARDWARE_MOTHERBOARD),1327)
+# PICA Shield (original version)
 else ifeq ($(HARDWARE_MOTHERBOARD),1328)
-# Mega controller & Protoneer CNC Shield V3.00
+# PICA Shield (rev C or later)
 else ifeq ($(HARDWARE_MOTHERBOARD),1329)
+# Intamsys 4.0 (Funmat HT)
+else ifeq ($(HARDWARE_MOTHERBOARD),1330)
+# Malyan M180 Mainboard Version 2 (no display function, direct G-code only)
+else ifeq ($(HARDWARE_MOTHERBOARD),1331)
+# 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)

 #
 # ATmega1281, ATmega2561
@@ -440,7 +466,7 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1502)
  HARDWARE_VARIANT ?= Sanguino
  MCU              ?= atmega644p
  PROG_MCU         ?= m644p
-# Melzi V2.0
+# Melzi V2
 else ifeq ($(HARDWARE_MOTHERBOARD),1503)
  HARDWARE_VARIANT ?= Sanguino
  MCU              ?= atmega1284p
@@ -450,36 +476,41 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1504)
  HARDWARE_VARIANT ?= Sanguino
  MCU              ?= atmega1284p
  PROG_MCU         ?= m1284p
-# Melzi Creality3D board (for CR-10 etc)
+# Melzi Creality3D (for CR-10 etc)
 else ifeq ($(HARDWARE_MOTHERBOARD),1505)
  HARDWARE_VARIANT ?= Sanguino
  MCU              ?= atmega1284p
  PROG_MCU         ?= m1284p
-# Melzi Malyan M150 board
+# Melzi Creality3D (for Ender-2)
 else ifeq ($(HARDWARE_MOTHERBOARD),1506)
  HARDWARE_VARIANT ?= Sanguino
  MCU              ?= atmega1284p
  PROG_MCU         ?= m1284p
-# Tronxy X5S
+# Melzi Malyan M150
 else ifeq ($(HARDWARE_MOTHERBOARD),1507)
  HARDWARE_VARIANT ?= Sanguino
  MCU              ?= atmega1284p
  PROG_MCU         ?= m1284p
-# STB V1.1
+# Tronxy X5S
 else ifeq ($(HARDWARE_MOTHERBOARD),1508)
  HARDWARE_VARIANT ?= Sanguino
  MCU              ?= atmega1284p
  PROG_MCU         ?= m1284p
-# Azteeg X1
+# STB V1.1
 else ifeq ($(HARDWARE_MOTHERBOARD),1509)
  HARDWARE_VARIANT ?= Sanguino
  MCU              ?= atmega1284p
  PROG_MCU         ?= m1284p
-# Anet 1.0 (Melzi clone)
+# 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)
+  HARDWARE_VARIANT ?= Sanguino
+  MCU              ?= atmega1284p
+  PROG_MCU         ?= m1284p
 # ZoneStar ZMIB V2
 else ifeq ($(HARDWARE_MOTHERBOARD),1511)
  HARDWARE_VARIANT ?= Sanguino
@@ -837,8 +868,8 @@ else ifeq ($(HARDWARE_VARIANT), archim)
 endif

 # Add all the source directories as include directories too
-CINCS = ${addprefix -I ,${VPATH}}
-CXXINCS = ${addprefix -I ,${VPATH}}
+CINCS = ${addprefix -I, ${VPATH}}
+CXXINCS = ${addprefix -I, ${VPATH}}

 # Silence warnings for library code (won't work for .h files, unfortunately)
 LIBWARN = -w -Wno-packed-bitfield-compat
@@ -995,7 +1026,7 @@ extcoff: $(TARGET).elf
 	$(NM) -n $< > $@

 # Link: create ELF output file from library.
-
+LDFLAGS+= -Wl,-V
 $(BUILD_DIR)/$(TARGET).elf: $(OBJ) Configuration.h
 	$(Pecho) "  CXX   $@"
 	$P $(CXX) $(LD_PREFIX) $(ALL_CXXFLAGS) -o $@ -L. $(OBJ) $(LDFLAGS) $(LD_SUFFIX)
@@ -16,7 +16,7 @@
 * 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 <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 *
 */
 #pragma once
@@ -28,177 +28,32 @@
 /**
 * Marlin release version identifier
 */
-#define SHORT_BUILD_VERSION "DW7.4.9"
+//#define SHORT_BUILD_VERSION "bugfix-2.1.x"

 /**
 * Verbose version identifier which should contain a reference to the location
 * from where the binary was downloaded or the source code was compiled.
 */
-
-#if(ENABLED(MachineMini))
-  #define VerChar1 "M"
-#elif(ENABLED(MachineEnder2))
-  #define VerChar1 "E2"
-#elif(ENABLED(MachineEnder2Pro))
-  #define VerChar1 "E2P"
-#elif(ENABLED(MachineEnder3))
-  #define VerChar1 "E3"
-#elif ENABLED(MachineEnder3V2)
-  #define VerChar1 "E3V2"
-#elif ENABLED(MachineEnder3S1)
-  #define VerChar1 "E3S1"
-#elif ENABLED(MachineEnder3Max)
-  #define VerChar1 "E3M"
-#elif(ENABLED(MachineEnder4))
-  #define VerChar1 "E4"
-#elif(ENABLED(MachineEnder5))
-  #define VerChar1 "E5"
-#elif(ENABLED(MachineEnder6))
-  #define VerChar1 "E6"
-#elif(ENABLED(MachineEnder7))
-  #define VerChar1 "E7"
-#elif(ENABLED(MachineSermoonD1))
-  #define VerChar1 "D1"
-#elif(ENABLED(MachineEnder5Plus))
-  #define VerChar1 "E5P"
-#elif(ENABLED(MachineCR20))
-  #define VerChar1 "2"
-#elif(ENABLED(MachineCR10Orig))
-  #define VerChar1 "O"
-#elif(ENABLED(MachineCR10Std))
-  #define VerChar1 "S"
-#elif(ENABLED(MachineCRX))
-  #define VerChar1 "X"
-#elif(ENABLED(MachineCR6))
-  #define VerChar1 "CR6"
-#elif(ENABLED(MachineCR5))
-  #define VerChar1 "CR5"
-#elif(ENABLED(MachineCR6Max))
-  #define VerChar1 "CR6M"
-#elif(ENABLED(MachineS4))
-  #define VerChar1 "4"
-#elif(ENABLED(MachineS5) || ENABLED(MachineCR10Max))
-  #define VerChar1 "5"
-#elif ENABLED(MachineCR2020)
-  #define VerChar1 "20"
-#elif(ENABLED(MachineCR30))
-  #define VerChar1 "CR30"
-#endif
-
-#if(ENABLED(HotendStock))
-#define VerChar2 "S"
-#elif(ENABLED(HotendE3D))
-#define VerChar2 "E"
-#elif ENABLED(HotendMosquito)
-#define VerChar2 "M"
-#endif
-
-#if(ENABLED(HotendAllMetal))
-#define VerChar3 "M"
-#else
-#define VerChar3 "S"
-#endif
-
-
-#if(ENABLED(BedAC))
-#define VerChar4 "A"
-#elif(ENABLED(BedDC))
-#define VerChar4 "D"
-#else
-#define VerChar4 "N"
-#endif
-
-#if(ENABLED(ABL_EZABL))
-#define VerChar5 "A"
-#elif(ENABLED(ABL_BLTOUCH))
-#define VerChar5 "B"
-#else
-#define VerChar5 "N"
-#endif
-
-#if(ENABLED(ABL_UBL))
-#define VerChar6 "U"
-#elif(ENABLED(ABL_BI))
-#define VerChar6 "B"
-#else
-#define VerChar6 "N"
-#endif
-
-#define DETAILED_BUILD_VERSION SHORT_BUILD_VERSION " TM3D " VerChar1 VerChar2 VerChar3 VerChar4 VerChar5 VerChar6
+//#define DETAILED_BUILD_VERSION SHORT_BUILD_VERSION

 /**
 * The STRING_DISTRIBUTION_DATE represents when the binary file was built,
 * here we define this default string as the date where the latest release
 * version was tagged.
 */
-#define STRING_DISTRIBUTION_DATE "2024-04-08"
+//#define STRING_DISTRIBUTION_DATE "2025-05-02"
+
+/**
+ * The protocol for communication to the host. Protocol indicates communication
+ * standards such as the use of ASCII, "echo:" and "error:" line prefixes, etc.
+ * (Other behaviors are given by the firmware version and capabilities report.)
+ */
+//#define PROTOCOL_VERSION "1.0"

 /**
 * Defines a generic printer name to be output to the LCD after booting Marlin.
 */
-#if(ENABLED(MachineMini))
-  #define CUSTOM_MACHINE_NAME "Mini SuPeR"
-#elif(ENABLED(MachineCR10Smart))
-  #define CUSTOM_MACHINE_NAME "TM3D CR10Smart"
-#elif(ENABLED(MachineCR10SmartPro))
-  #define CUSTOM_MACHINE_NAME "TM3D CR10SmartPro"
-#elif(ENABLED(MachineEnder2))
-  #define CUSTOM_MACHINE_NAME "TM3D Ender2"
-#elif(ENABLED(MachineEnder2Pro))
-  #define CUSTOM_MACHINE_NAME "TM3D Ender2 Pro"
-#elif(ENABLED(MachineEnder3))
-  #define CUSTOM_MACHINE_NAME "TM3D Ender3"
-#elif(ENABLED(MachineEnder3Max))
-  #define CUSTOM_MACHINE_NAME "TM3D E3Max"
-#elif(ENABLED(MachineEnder6))
-  #define CUSTOM_MACHINE_NAME "TM3D Ender6"
-#elif(ENABLED(MachineEnder7))
-  #define CUSTOM_MACHINE_NAME "TM3D Ender7"
-#elif(ENABLED(MachineEnder3V2))
-  #define CUSTOM_MACHINE_NAME "TM3D Ender3V2"
-#elif(ENABLED(MachineEnder3S1))
-  #define CUSTOM_MACHINE_NAME "TM3D Ender3S1"
-#elif(ENABLED(MachineEnder4))
-  #define CUSTOM_MACHINE_NAME "TM3D Ender4"
-#elif(ENABLED(MachineEnder5))
-  #define CUSTOM_MACHINE_NAME "TM3D Ender5"
-#elif(ENABLED(MachineEnder5Plus))
-  #define CUSTOM_MACHINE_NAME "TM3D E5 Plus"
-#elif(ENABLED(MachineCR20))
-  #define CUSTOM_MACHINE_NAME "SuPeR CR-20"
-#elif(ENABLED(MachineCR10Orig))
-  #define CUSTOM_MACHINE_NAME "SuPeR CR-10"
-#elif(ENABLED(MachineCRX))
-  #define CUSTOM_MACHINE_NAME "TM3D CR-X"
-#elif ENABLED(MachineCR10SProV2)
-  #define CUSTOM_MACHINE_NAME "TM3D 10SProV2"
-#elif(ENABLED(MachineCR10SPro))
-  #define CUSTOM_MACHINE_NAME "TM3D 10S Pro"
-#elif(ENABLED(MachineCR10Max))
-  #define CUSTOM_MACHINE_NAME "TM3D Max"
-#elif(ENABLED(MachineCR10SV3))
-  #define CUSTOM_MACHINE_NAME "TM3D CR10V3"
-#elif(ENABLED(MachineCR10SV2))
-  #define CUSTOM_MACHINE_NAME "TM3D CR10V2"
-#elif(ENABLED(MachineCR10Std))
-  #define CUSTOM_MACHINE_NAME "300 SuPeR"
-#elif(ENABLED(MachineS4))
-  #define CUSTOM_MACHINE_NAME "400 SuPeR"
-#elif(ENABLED(MachineS5))
-  #define CUSTOM_MACHINE_NAME "500 SuPeR"
-#elif ENABLED(MachineCR2020)
-  #define CUSTOM_MACHINE_NAME "TM3D 2020"
-#elif ENABLED(MachineSermoonD1)
-  #define CUSTOM_MACHINE_NAME "SermoonD1"
-#elif ENABLED(MachineCR5)
-  #define CUSTOM_MACHINE_NAME "CR5 Pro"
-#elif ENABLED(MachineCR6)
-  #define CUSTOM_MACHINE_NAME "CR6"
-#elif ENABLED(MachineCR6Max)
-  #define CUSTOM_MACHINE_NAME "CR6 Max"
-#elif ENABLED(MachineCR30)
-  #define CUSTOM_MACHINE_NAME "CR30 Printmill"
-#endif
+//#define MACHINE_NAME "3D Printer"

 /**
 * The SOURCE_CODE_URL is the location where users will find the Marlin Source
@@ -206,7 +61,7 @@
 * has a distinct Github fork— the Source Code URL should just be the main
 * Marlin repository.
 */
-#define SOURCE_CODE_URL "https://github.com/InsanityAutomation/Marlin/tree/CrealityDwin_2.0"
+//#define SOURCE_CODE_URL "github.com/MarlinFirmware/Marlin"

 /**
 * Default generic printer UUID.
@@ -217,12 +72,12 @@
 * The WEBSITE_URL is the location where users can get more information such as
 * documentation about a specific Marlin release.
 */
-#define WEBSITE_URL "tinymachines3d.com"
+//#define WEBSITE_URL "marlinfw.org"

 /**
- * Set the vendor info the serial USB interface, if changable
- * Currently only supported by DUE platform
+ * Set the vendor info the serial USB interface, if changeable.
+ * Currently only supported by DUE platform.
 */
-//#define  USB_DEVICE_VENDOR_ID           0x0000
-//#define  USB_DEVICE_PRODUCT_ID          0x0000
-//#define  USB_DEVICE_MANUFACTURE_NAME    WEBSITE_URL
+//#define USB_DEVICE_VENDOR_ID           0x0000
+//#define USB_DEVICE_PRODUCT_ID          0x0000
+//#define USB_DEVICE_MANUFACTURE_NAME    WEBSITE_URL
@@ -1,93 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (C) 2016 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 <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * Custom Bitmap for splashscreen
- *
- * You may use one of the following tools to generate the C++ bitmap array from
- * a black and white image:
- *
- *  - http://www.marlinfw.org/tools/u8glib/converter.html
- *  - http://www.digole.com/tools/PicturetoC_Hex_converter.php
- */
-
-#define CUSTOM_BOOTSCREEN_TIMEOUT   2500
-#define CUSTOM_BOOTSCREEN_BMPWIDTH  128
-#define CUSTOM_BOOTSCREEN_INVERTED
-
-const unsigned char custom_start_bmp[] PROGMEM = {
-  B11111101,B01010101,B01010101,B01010101,B01010101,B01010101,B01011111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
-  B11111110,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
-  B11111101,B00000000,B00000000,B00000111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
-  B11111110,B00000111,B11000000,B00000101,B01010101,B01010101,B01010101,B01010101,B01010101,B01011111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
-  B11111100,B00001010,B00100000,B00000110,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
-  B11111110,B00010100,B00010000,B00000101,B00000000,B00000000,B00000111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
-  B11111100,B00101000,B00001000,B00000110,B00000111,B11000000,B00000101,B01010101,B01010101,B01010101,B01010101,B01010101,B01011111,B11111111,B11111111,B11111111,
-  B11111110,B01010100,B00000100,B00000100,B00001010,B00100000,B00000110,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,B11111111,B11111111,B11111111,
-  B11111100,B01100000,B00000100,B00000110,B00010100,B00010000,B00000101,B00000000,B00000000,B00000111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
-  B11111110,B01010000,B00000100,B00000100,B00101000,B00001000,B00000110,B00000111,B11000000,B00000101,B01010101,B01010101,B01010101,B01010101,B01010101,B01011111,
-  B11111100,B01100000,B00000100,B00000110,B01010100,B00000100,B00000100,B00001010,B00100000,B00000110,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,
-  B11111110,B01010100,B00000100,B00011100,B01100000,B00000100,B00000110,B00010100,B00010000,B00000101,B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,
-  B11111100,B00101000,B00001000,B00101110,B01010000,B00000100,B00000100,B00101000,B00001000,B00000110,B00000111,B11000000,B00000000,B00000001,B11110000,B00111111,
-  B11111110,B00010100,B00010000,B01010100,B01100000,B00000100,B00000110,B01010100,B00000100,B00000100,B00001010,B00100000,B00000000,B00000010,B00001000,B00011111,
-  B11111100,B00001010,B00100000,B01100110,B01010100,B00000100,B00011100,B01100000,B00000100,B00000110,B00010100,B00010000,B00000000,B00000101,B00000100,B00111111,
-  B11111110,B00000111,B11000000,B01010100,B00101000,B00001000,B00101110,B01010000,B00000100,B00000100,B00101000,B00001000,B00000000,B00001010,B00000010,B00011111,
-  B11111100,B00000000,B00000000,B00101110,B00010100,B00010000,B01010100,B01100000,B00000100,B00000110,B01010100,B00000100,B00000000,B00010101,B00000001,B00111111,
-  B11111110,B00000000,B00000000,B00011100,B00001010,B00100000,B01100110,B01010100,B00000100,B00011100,B01100000,B00000100,B00000000,B00011000,B00000001,B00011111,
-  B11111100,B00000000,B00000000,B00000110,B00000111,B11000000,B01010100,B00101000,B00001000,B00101110,B01010000,B00000100,B00000000,B00010100,B00000001,B00111111,
-  B11111110,B00000000,B00000000,B00000100,B00000000,B00000000,B00101110,B00010100,B00010000,B01010100,B01100000,B00000100,B00000000,B00011000,B00000001,B00011111,
-  B11111100,B11111111,B11111111,B11111110,B00000000,B00000000,B00011100,B00001010,B00100000,B01100110,B01010100,B00000100,B00011100,B00010101,B00000001,B00111111,
-  B11111110,B11010101,B01010101,B01010100,B00000000,B00000000,B00000110,B00000111,B11000000,B01010100,B00101000,B00001000,B00101010,B00001010,B00000010,B00011111,
-  B11111100,B10000100,B00010000,B01000110,B00000000,B00000000,B00000100,B00000000,B00000000,B00101110,B00010100,B00010000,B01010001,B00000101,B00000100,B00111111,
-  B11111110,B11000100,B00010000,B01000100,B11111111,B11111111,B11111110,B00000000,B00000000,B00011100,B00001010,B00100000,B01100001,B00000010,B10001000,B00011111,
-  B11111100,B10000100,B00010000,B01000110,B11010101,B01010101,B01010100,B00000000,B00000000,B00000110,B00000111,B11000000,B01010001,B00000001,B11110000,B00111111,
-  B11111110,B10000100,B00010000,B01000100,B10000100,B00010000,B01000110,B00000000,B00000000,B00000100,B00000000,B00000000,B00101010,B00000000,B00000000,B00011111,
-  B11111100,B11000100,B00010000,B01000110,B11000100,B00010000,B01000100,B11111111,B11111111,B11111110,B00000000,B00000000,B00011100,B00000000,B00000000,B00111111,
-  B11111110,B10000100,B00010000,B01000100,B10000100,B00010000,B01000110,B11010101,B01010101,B01010100,B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,
-  B11111100,B11010101,B01010101,B01010110,B10000100,B00010000,B01000100,B10000100,B00010000,B01000110,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,
-  B11111100,B11111111,B11111111,B11111100,B11000100,B00010000,B01000110,B11000100,B00010000,B01000100,B11111111,B11111111,B11111111,B11111111,B11111111,B10011111,
-  B11111110,B00000000,B00000000,B00000110,B10000100,B00010000,B01000100,B10000100,B00010000,B01000110,B11010101,B01010101,B01010101,B01010101,B01010101,B10111111,
-  B11111101,B01010101,B01010101,B01010100,B11010101,B01010101,B01010110,B10000100,B00010000,B01000100,B10000100,B00010000,B01000001,B00000100,B00010000,B10011111,
-  B11111111,B11111111,B11111111,B11111100,B11111111,B11111111,B11111100,B11000100,B00010000,B01000110,B11000100,B00010000,B01000001,B00000100,B00010001,B10111111,
-  B11111111,B11111111,B11111111,B11111110,B00000000,B00000000,B00000110,B10000100,B00010000,B01000100,B10000100,B00010000,B01000001,B00000100,B00010000,B10011111,
-  B11111111,B11111111,B11111111,B11111101,B01010101,B01010101,B01010100,B11010101,B01010101,B01010110,B10000100,B00010000,B01000001,B00000100,B00010000,B10011111,
-  B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111100,B11111111,B11111111,B11111100,B11000100,B00010000,B01000001,B00000100,B00010001,B10111111,
-  B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111110,B00000000,B00000000,B00000110,B10000100,B00010000,B01000001,B00000100,B00010000,B10011111,
-  B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111101,B01010101,B01010101,B01010100,B11010101,B01010101,B01010101,B01010101,B01010101,B10111111,
-  B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111100,B11111111,B11111111,B11111111,B11111111,B11111111,B10011111,
-  B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111110,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,
-  B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111101,B01010101,B01010101,B01010101,B01010101,B01010101,B01011111,
-  B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
-  B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
-  B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
-  B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
-  B11100000,B00101110,B11111011,B01111101,B11111011,B11111011,B11001111,B11000001,B11011111,B10111011,B00111110,B11000000,B11100001,B11111110,B00111100,B00011111,
-  B11111101,B11101110,B01111011,B00111001,B11111001,B11110011,B11001111,B10011110,B11011111,B10111011,B00111110,B11011111,B11011110,B11111100,B11011101,B11100111,
-  B11111101,B11101110,B00111011,B10111011,B11111001,B11101011,B11010111,B10111111,B01011111,B10111011,B01011110,B11011111,B11011110,B11111101,B11101101,B11110111,
-  B11111101,B11101110,B10111011,B11010011,B11111010,B11101011,B10110111,B00111111,B11011111,B10111011,B01001110,B11011111,B11011111,B11111111,B11001101,B11110011,
-  B11111101,B11101110,B11011011,B11000111,B11111010,B11101011,B10111011,B01111111,B11000000,B00111011,B01101110,B11000000,B11100011,B11111111,B00011101,B11110011,
-  B11111101,B11101110,B11001011,B11101111,B11111010,B11011011,B10111011,B01111111,B11011111,B10111011,B01100110,B11011111,B11111000,B11111111,B11001101,B11110011,
-  B11111101,B11101110,B11101011,B11101111,B11111011,B01011011,B00000011,B00111111,B01011111,B10111011,B01110110,B11011111,B11111110,B01111111,B11101101,B11110011,
-  B11111101,B11101110,B11110011,B11101111,B11111011,B01011011,B01111001,B10111110,B11011111,B10111011,B01111010,B11011111,B11011110,B01111101,B11101101,B11110111,
-  B11111101,B11101110,B11110011,B11101111,B11111011,B10111010,B11111101,B10011110,B11011111,B10111011,B01111100,B11011111,B11011110,B11111101,B11001101,B11100111,
-  B11111101,B11101110,B11111011,B11101111,B11111011,B10111010,B11111101,B11000001,B11011111,B10111011,B01111110,B11000000,B11100000,B11111110,B00011100,B00011111
-};
@@ -1,74 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (C) 2016 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 <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * Custom Status Screen bitmap
- *
- * Place this file in the root with your configuration files
- * and enable CUSTOM_STATUS_SCREEN_IMAGE in Configuration.h.
- *
- * Use the Marlin Bitmap Converter to make your own:
- * http://marlinfw.org/tools/u8glib/converter.html
- */
-
-//
-// Status Screen Logo bitmap
-//
-#define STATUS_LOGO_Y            3
-#define STATUS_LOGO_WIDTH       24
-
-const unsigned char status_logo_bmp[] PROGMEM = {
-  B11111111,B11111111,B11111111,
-  B10000000,B00000000,B00000001,
-  B10001110,B00000000,B11100001,
-  B10011111,B00000001,B11110001,
-  B10010011,B10000001,B00111001,
-  B10011111,B10000001,B11111001,
-  B10011111,B10000001,B11111001,
-  B10011111,B10111001,B11111001,
-  B10001111,B00101000,B11110001,
-  B10000000,B00111000,B00000001,
-  B10000000,B00000000,B00000001,
-  B10011111,B11111111,B11111001,
-  B10010001,B01110100,B10011001,
-  B10011011,B00000110,B10101001,
-  B10011011,B01010100,B10101001,
-  B10011011,B01010110,B10101001,
-  B10011011,B01010100,B10011001,
-  B10011111,B11111111,B11111001,
-  B11111111,B11111111,B11111111
-};
-
-//
-// Use default bitmaps
-//
-#define STATUS_HOTEND_ANIM
-#define STATUS_BED_ANIM
-#if HOTENDS < 2
-  #define STATUS_LOGO_X          8
-  #define STATUS_HEATERS_X      40
-  #define STATUS_BED_X          72
-#else
-  #define STATUS_LOGO_X          0
-  #define STATUS_HEATERS_X      32
-  #define STATUS_BED_X          80
-#endif
@@ -62,6 +62,11 @@ motherboard                              = BOARD_RAMPS_14_EFB
 serial_port                              = 0
 baudrate                                 = 250000

+string_config_h_author                   = "(default from config.ini)"
+
+capabilities_report                      = on
+extended_capabilities_report             = on
+
 use_watchdog                             = on
 thermal_protection_hotends               = on
 thermal_protection_hysteresis            = 4
@@ -77,9 +82,7 @@ temp_sensor_0                            = 1
 temp_hysteresis                          = 3
 heater_0_mintemp                         = 5
 heater_0_maxtemp                         = 275
-preheat_1_temp_hotend                    = 180

-bang_max                                 = 255
 pidtemp                                  = on
 pid_k1                                   = 0.95
 pid_max                                  = 255
@@ -89,6 +92,14 @@ default_kp                               = 22.20
 default_ki                               = 1.08
 default_kd                               = 114.00

+temp_sensor_bed                          = 1
+bed_mintemp                              = 5
+bed_maxtemp                              = 150
+
+thermal_protection_bed                   = on
+thermal_protection_bed_hysteresis        = 2
+thermal_protection_bed_period            = 20
+
 x_driver_type                            = A4988
 y_driver_type                            = A4988
 z_driver_type                            = A4988
@@ -121,10 +132,10 @@ default_max_acceleration                 = { 3000, 3000, 100, 10000 }
 homing_feedrate_mm_m                     = { (50*60), (50*60), (4*60) }
 homing_bump_divisor                      = { 2, 2, 4 }

-x_enable_on                              = 0
-y_enable_on                              = 0
-z_enable_on                              = 0
-e_enable_on                              = 0
+x_enable_on                              = LOW
+y_enable_on                              = LOW
+z_enable_on                              = LOW
+e_enable_on                              = LOW

 invert_x_dir                             = false
 invert_y_dir                             = true
@@ -136,11 +147,6 @@ step_state_x                             = HIGH
 step_state_y                             = HIGH
 step_state_z                             = HIGH

-disable_x                                = off
-disable_y                                = off
-disable_z                                = off
-disable_e                                = off
-
 proportional_font_ratio                  = 1.0
 default_nominal_filament_dia             = 1.75

@@ -153,18 +159,13 @@ default_retract_acceleration             = 3000
 default_minimumfeedrate                  = 0.0
 default_mintravelfeedrate                = 0.0

-minimum_planner_speed                    = 0.05
 min_steps_per_segment                    = 6
 default_minsegmenttime                   = 20000

 [config:basic]
 bed_overshoot                            = 10
 busy_while_heating                       = on
-default_ejerk                            = 5.0
 default_keepalive_interval               = 2
-default_leveling_fade_height             = 0.0
-disable_other_extruders                  = on
-display_charset_hd44780                  = JAPANESE
 eeprom_boot_silent                       = on
 eeprom_chitchat                          = on
 endstoppullups                           = on
@@ -173,10 +174,8 @@ extrude_mintemp                          = 170
 host_keepalive_feature                   = on
 hotend_overshoot                         = 15
 jd_handle_small_segments                 = on
-lcd_info_screen_style                    = 0
-lcd_language                             = en
 max_bed_power                            = 255
-mesh_inset                               = 0
+
 min_software_endstops                    = on
 max_software_endstops                    = on
 min_software_endstop_x                   = on
@@ -185,50 +184,48 @@ min_software_endstop_z                   = on
 max_software_endstop_x                   = on
 max_software_endstop_y                   = on
 max_software_endstop_z                   = on
-preheat_1_fan_speed                      = 0
+
 preheat_1_label                          = "PLA"
+preheat_1_temp_hotend                    = 180
 preheat_1_temp_bed                       = 70
+preheat_1_fan_speed                      = 0
+
+preheat_2_label                          = "ABS"
+preheat_2_temp_hotend                    = 240
+preheat_2_temp_bed                       = 110
+preheat_2_fan_speed                      = 0
+
 prevent_cold_extrusion                   = on
 prevent_lengthy_extrude                  = on
 printjob_timer_autostart                 = on
-probing_margin                           = 10
-show_bootscreen                          = on
-soft_pwm_scale                           = 0
-string_config_h_author                   = "(none, default config)"
+
 temp_bed_hysteresis                      = 3
 temp_bed_residency_time                  = 10
 temp_bed_window                          = 1
 temp_residency_time                      = 10
 temp_window                              = 1
 validate_homing_endstops                 = on
-xy_probe_feedrate                        = (133*60)
-z_clearance_between_probes               = 5
-z_clearance_deploy_probe                 = 10
-z_clearance_multi_probe                  = 5
+
+editable_steps_per_unit                  = on

 [config:advanced]
 arc_support                              = on
 auto_report_temperatures                 = on
+
 autotemp                                 = on
+autotemp_min                             = 210
+autotemp_max                             = 250
+autotemp_factor                          = 0.1f
 autotemp_oldweight                       = 0.98
-bed_check_interval                       = 5000
+
 default_stepper_timeout_sec              = 120
-default_volumetric_extruder_limit        = 0.00
 disable_idle_x                           = on
 disable_idle_y                           = on
 disable_idle_z                           = on
 disable_idle_e                           = on
 e0_auto_fan_pin                          = -1
-encoder_100x_steps_per_sec               = 80
-encoder_10x_steps_per_sec                = 30
-encoder_rate_multiplier                  = on
-extended_capabilities_report             = on
-extruder_auto_fan_speed                  = 255
-extruder_auto_fan_temperature            = 50
-fanmux0_pin                              = -1
-fanmux1_pin                              = -1
-fanmux2_pin                              = -1
 faster_gcode_parser                      = on
+debug_flags_gcode                        = on
 homing_bump_mm                           = { 5, 5, 2 }
 max_arc_segment_mm                       = 1.0
 min_arc_segment_mm                       = 0.1
@@ -237,11 +234,11 @@ n_arc_correction                         = 25
 serial_overrun_protection                = on
 slowdown                                 = on
 slowdown_divisor                         = 2
-temp_sensor_bed                          = 0
-thermal_protection_bed_hysteresis        = 2
-thermocouple_max_errors                  = 15
 tx_buffer_size                           = 0
+
+bed_check_interval                       = 5000
 watch_bed_temp_increase                  = 2
 watch_bed_temp_period                    = 60
+
 watch_temp_increase                      = 2
-watch_temp_period                        = 20
+watch_temp_period                        = 40
@@ -129,11 +129,11 @@ typedef Servo hal_servo_t;
  #endif
 #endif

-#ifdef MMU2_SERIAL_PORT
-  #if !WITHIN(MMU2_SERIAL_PORT, 0, 3)
-    #error "MMU2_SERIAL_PORT must be from 0 to 3"
+#ifdef MMU_SERIAL_PORT
+  #if !WITHIN(MMU_SERIAL_PORT, 0, 3)
+    #error "MMU_SERIAL_PORT must be from 0 to 3"
  #endif
-  #define MMU2_SERIAL mmuSerial
+  #define MMU_SERIAL mmuSerial
 #endif

 #ifdef LCD_SERIAL_PORT
@@ -141,8 +141,8 @@ typedef Servo hal_servo_t;
    #error "LCD_SERIAL_PORT must be from 0 to 3."
  #endif
  #define LCD_SERIAL lcdSerial
-  #if HAS_DGUS_LCD || ENABLED(DGUS_LCD_UI_CREALITY_TOUCH) || ENABLED(EXTENSIBLE_UI)
-    #define SERIAL_GET_TX_BUFFER_FREE() LCD_SERIAL.get_tx_buffer_free()
+  #if ANY(HAS_DGUS_LCD, EXTENSIBLE_UI)
+    #define LCD_SERIAL_TX_BUFFER_FREE() LCD_SERIAL.get_tx_buffer_free()
  #endif
 #endif

@@ -159,7 +159,7 @@ typedef Servo hal_servo_t;
 #define GET_PIN_MAP_INDEX(pin) pin
 #define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)

-#define HAL_SENSITIVE_PINS 0, 1,
+#define HAL_SENSITIVE_PINS 0, 1

 #ifdef __AVR_AT90USB1286__
  #define JTAG_DISABLE() do{ MCUCR = 0x80; MCUCR = 0x80; }while(0)
@@ -204,7 +204,7 @@ public:
  static void isr_on()  { sei(); }
  static void isr_off() { cli(); }

-  static void delay_ms(const int ms) { _delay_ms(ms); }
+  static void delay_ms(const int ms) { delay(ms); }

  // Tasks, called from idle()
  static void idletask() {}
@@ -601,20 +601,20 @@ MSerialT1 customizedSerial1(MSerialT1::HasEmergencyParser);

 #endif // SERIAL_PORT_3

-#ifdef MMU2_SERIAL_PORT
+#ifdef MMU_SERIAL_PORT

-  ISR(SERIAL_REGNAME(USART, MMU2_SERIAL_PORT, _RX_vect)) {
-    MarlinSerial<MMU2SerialCfg<MMU2_SERIAL_PORT>>::store_rxd_char();
+  ISR(SERIAL_REGNAME(USART, MMU_SERIAL_PORT, _RX_vect)) {
+    MarlinSerial<MMU2SerialCfg<MMU_SERIAL_PORT>>::store_rxd_char();
  }

-  ISR(SERIAL_REGNAME(USART, MMU2_SERIAL_PORT, _UDRE_vect)) {
-    MarlinSerial<MMU2SerialCfg<MMU2_SERIAL_PORT>>::_tx_udr_empty_irq();
+  ISR(SERIAL_REGNAME(USART, MMU_SERIAL_PORT, _UDRE_vect)) {
+    MarlinSerial<MMU2SerialCfg<MMU_SERIAL_PORT>>::_tx_udr_empty_irq();
  }

-  template class MarlinSerial< MMU2SerialCfg<MMU2_SERIAL_PORT> >;
+  template class MarlinSerial< MMU2SerialCfg<MMU_SERIAL_PORT> >;
  MSerialMMU2 mmuSerial(MSerialMMU2::HasEmergencyParser);

-#endif // MMU2_SERIAL_PORT
+#endif // MMU_SERIAL_PORT

 #ifdef LCD_SERIAL_PORT

@@ -629,7 +629,7 @@ MSerialT1 customizedSerial1(MSerialT1::HasEmergencyParser);
  template class MarlinSerial< LCDSerialCfg<LCD_SERIAL_PORT> >;
  MSerialLCD lcdSerial(MSerialLCD::HasEmergencyParser);

-  #if HAS_DGUS_LCD || ENABLED(DGUS_LCD_UI_CREALITY_TOUCH) || ENABLED(EXTENSIBLE_UI)
+  #if ANY(HAS_DGUS_LCD, EXTENSIBLE_UI)
    template<typename Cfg>
    typename MarlinSerial<Cfg>::ring_buffer_pos_t MarlinSerial<Cfg>::get_tx_buffer_free() {
      const ring_buffer_pos_t t = tx_buffer.tail,  // next byte to send.
@@ -205,7 +205,7 @@
    static ring_buffer_pos_t available();
    static void write(const uint8_t c);
    static void flushTX();
-    #if HAS_DGUS_LCD || ENABLED(DGUS_LCD_UI_CREALITY_TOUCH) || ENABLED(EXTENSIBLE_UI)
+    #if ANY(HAS_DGUS_LCD, EXTENSIBLE_UI)
      static ring_buffer_pos_t get_tx_buffer_free();
    #endif

@@ -246,7 +246,7 @@

 #endif // !USBCON

-#ifdef MMU2_SERIAL_PORT
+#ifdef MMU_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<MMU2_SERIAL_PORT> > > MSerialMMU2;
+  typedef Serial1Class< MarlinSerial< MMU2SerialCfg<MMU_SERIAL_PORT> > > MSerialMMU2;
  extern MSerialMMU2 mmuSerial;
 #endif

@@ -276,7 +276,7 @@
    static constexpr bool DROPPED_RX        = false;
    static constexpr bool RX_FRAMING_ERRORS = false;
    static constexpr bool MAX_RX_QUEUED     = false;
-    static constexpr bool RX_OVERRUNS       = (ANY(HAS_DGUS_LCD, SERIAL_STATS_RX_BUFFER_OVERRUNS) || ENABLED(DWINOS_4));
+    static constexpr bool RX_OVERRUNS       = ALL(HAS_DGUS_LCD, SERIAL_STATS_RX_BUFFER_OVERRUNS);
  };

  typedef Serial1Class< MarlinSerial< LCDSerialCfg<LCD_SERIAL_PORT> > > MSerialLCD;
@@ -345,6 +345,14 @@ void setup_endstop_interrupts() {
      pciSetup(Z_MIN_PROBE_PIN);
    #endif
  #endif
+  #if USE_CALIBRATION
+    #if (digitalPinToInterrupt(CALIBRATION_PIN) != NOT_AN_INTERRUPT)
+      _ATTACH(CALIBRATION_PIN);
+    #else
+      static_assert(digitalPinHasPCICR(CALIBRATION_PIN), "CALIBRATION_PIN is not interrupt-capable. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
+      pciSetup(CALIBRATION_PIN);
+    #endif
+  #endif

  // If we arrive here without raising an assertion, each pin has either an EXT-interrupt or a PCI.
 }
@@ -150,7 +150,7 @@ void MarlinHAL::set_pwm_frequency(const pin_t pin, const uint16_t f_desired) {
      else {
        if (p == 32 || p == 128) continue;                    // Skip TIMER2 specific prescalers when not TIMER2
        const uint16_t rft = (F_CPU) / (p * f_desired);
-        DEBUG_ECHOLNPGM("(Not Timer 2) F_CPU=" STRINGIFY(F_CPU), " prescaler=", p, " f_desired=", f_desired);
+        DEBUG_ECHOLNPGM("(Not Timer 2) F_CPU=", STRINGIFY(F_CPU), " prescaler=", p, " f_desired=", f_desired);
        res_fast_temp = rft - 1;
        res_pc_temp = rft / 2;
      }
@@ -28,9 +28,6 @@
 *   Port          : E0 E1 E4 E5 G5 E3 H3 H4 H5 H6 B4 B5 B6 B7 J1 J0 H1 H0 D3 D2 D1 D0 A0 A1 A2 A3 A4 A5 A6 A7 C7 C6 C5 C4 C3 C2 C1 C0 D7 G2 G1 G0 L7 L6 L5 L4 L3 L2 L1 L0 B3 B2 B1 B0 F0 F1 F2 F3 F4 F5 F6 F7 K0 K1 K2 K3 K4 K5 K6 K7 | E2 E6 E7 xx xx H2 H7 G3 G4 xx xx xx xx xx D4 D5 D6 xx xx J2 J3 J4 J5 J6 J7 xx xx xx xx xx
 *   Logical Pin   : 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 | 78 79 80 xx xx 84 85 71 70 xx xx xx xx xx 81 82 83 xx xx 72 73 75 76 77 74 xx xx xx xx xx
 *   Analog Input  :                                                                                                                                                                    0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15
- *
- * Arduino Pin Layout video: https://youtu.be/rIqeVCX09FA
- * AVR alternate pin function overview video: https://youtu.be/1yd8wuI5Plg
 */

 #include "../fastio.h"
@@ -26,9 +26,6 @@
 *
 *   Logical Pin: 38 39 40 41 42 43 44 45 16 10 11 12 06 07 08 09 30 31 32 33 34 35 36 37 17 18 19 20 21 22 23 24 00 01 13 05 02 03 14 15 46 47 48 49 50 51 52 53 25 26 27 28 29 04
 *   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 G0 G1 G2 G3 G4 G5
- *
- * Arduino Pin Layout video: https://youtu.be/rIqeVCX09FA
- * AVR alternate pin function overview video: https://youtu.be/1yd8wuI5Plg
 */

 #include "../fastio.h"
@@ -26,9 +26,6 @@
 *
 *   Logical Pin: 08 09 10 11 12 13 14 15 16 17 18 19 20 21 00 01 02 03 04 05 06 07
 *   Port:        B0 B1 B2 B3 B4 B5 C0 C1 C2 C3 C4 C5 C6 C7 D0 D1 D2 D3 D4 D5 D6 D7
- *
- * Arduino Pin Layout video: https://youtu.be/rIqeVCX09FA
- * AVR alternate pin function overview video: https://youtu.be/1yd8wuI5Plg
 */

 #include "../fastio.h"
@@ -26,9 +26,6 @@
 *
 *   Logical Pin: 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31
 *   Port:        B0 B1 B2 B3 B4 B5 B6 B7 D0 D1 D2 D3 D4 D5 D6 D7 C0 C1 C2 C3 C4 C5 C6 C7 A7 A6 A5 A4 A3 A2 A1 A0
- *
- * Arduino Pin Layout video: https://youtu.be/rIqeVCX09FA
- * AVR alternate pin function overview video: https://youtu.be/1yd8wuI5Plg
 */

 /**                        ATMega644
@@ -26,10 +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
- *            The logical pins 46 and 47 are not supported by Teensyduino, but are supported below as E2 and E3
- *
- * Arduino Pin Layout video: https://youtu.be/rIqeVCX09FA
- * AVR alternate pin function overview video: https://youtu.be/1yd8wuI5Plg
+ *            Logical pins 46-47 aren't supported by Teensyduino, but are supported below as E2 and E3
 */

 #include "../fastio.h"
@@ -366,8 +363,11 @@
 #define AIO7_PWM    0
 #define AIO7_DDR    DDRF

-//-- Begin not supported by Teensyduino
-//-- don't use Arduino functions on these pins pinMode/digitalWrite/etc
+//-- 46-47 are not supported by Teensyduino
+//-- Don't use Arduino functions (pinMode, digitalWrite, etc.) on these pins
+#define PIN_E2   46
+#define PIN_E3   47
+
 #define DIO46_PIN   PINE2
 #define DIO46_RPORT PINE
 #define DIO46_WPORT PORTE
@@ -380,10 +380,7 @@
 #define DIO47_PWM   0
 #define DIO47_DDR   DDRE

-#define TEENSY_E2   46
-#define TEENSY_E3   47
-
-//-- end not supported by Teensyduino
+//--

 #undef PA0
 #define PA0_PIN     PINA0
@@ -22,7 +22,23 @@
 #pragma once

 /**
- * PWM print routines for Atmel 8 bit AVR CPUs
+ * Pins Debugging for Atmel 8 bit AVR CPUs
+ *
+ *   - NUMBER_PINS_TOTAL
+ *   - MULTI_NAME_PAD
+ *   - getPinByIndex(index)
+ *   - printPinNameByIndex(index)
+ *   - getPinIsDigitalByIndex(index)
+ *   - digitalPinToAnalogIndex(pin)
+ *   - getValidPinMode(pin)
+ *   - isValidPin(pin)
+ *   - isAnalogPin(pin)
+ *   - digitalRead_mod(pin)
+ *   - pwm_status(pin)
+ *   - printPinPWM(pin)
+ *   - printPinPort(pin)
+ *   - printPinNumber(pin)
+ *   - printPinAnalog(pin)
 */

 #include "../../inc/MarlinConfig.h"
@@ -39,44 +55,44 @@
  #include "pinsDebug_Teensyduino.h"
  // Can't use the "digitalPinToPort" function from the Teensyduino type IDEs
  // portModeRegister takes a different argument
-  #define digitalPinToTimer_DEBUG(p) digitalPinToTimer(p)
-  #define digitalPinToBitMask_DEBUG(p) digitalPinToBitMask(p)
-  #define digitalPinToPort_DEBUG(p) digitalPinToPort(p)
-  #define GET_PINMODE(pin) (*portModeRegister(pin) & digitalPinToBitMask_DEBUG(pin))
+  #define digitalPinToTimer_DEBUG(P) digitalPinToTimer(P)
+  #define digitalPinToBitMask_DEBUG(P) digitalPinToBitMask(P)
+  #define digitalPinToPort_DEBUG(P) digitalPinToPort(P)
+  #define getValidPinMode(P) (*portModeRegister(P) & digitalPinToBitMask_DEBUG(P))

 #elif AVR_ATmega2560_FAMILY_PLUS_70   // So we can access/display all the pins on boards using more than 70

  #include "pinsDebug_plus_70.h"
-  #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 GET_PINMODE(int8_t pin) {return *portModeRegister(digitalPinToPort_DEBUG(pin)) & digitalPinToBitMask_DEBUG(pin); }
+  #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); }

 #else

-  #define digitalPinToTimer_DEBUG(p) digitalPinToTimer(p)
-  #define digitalPinToBitMask_DEBUG(p) digitalPinToBitMask(p)
-  #define digitalPinToPort_DEBUG(p) digitalPinToPort(p)
-  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)
+  #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(x) pgm_read_byte(&pin_array[x].pin)

 #endif

-#define VALID_PIN(pin) (pin >= 0 && pin < NUM_DIGITAL_PINS ? 1 : 0)
+#define isValidPin(P) (P >= 0 && P < NUMBER_PINS_TOTAL)
 #if AVR_ATmega1284_FAMILY
-  #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)
+  #define isAnalogPin(P) WITHIN(P, analogInputToDigitalPin(7), analogInputToDigitalPin(0))
+  #define digitalPinToAnalogIndex(P) int(isAnalogPin(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 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)
+  #define isAnalogPin(P) (_ANALOG1(P) || _ANALOG2(P))
+  #define digitalPinToAnalogIndex(P) int(_ANALOG1(P) ? (P) - analogInputToDigitalPin(0) : _ANALOG2(P) ? (P) - analogInputToDigitalPin(8) + 8 : -1)
 #endif
-#define GET_ARRAY_PIN(p) pgm_read_byte(&pin_array[p].pin)
+#define getPinByIndex(x) pgm_read_byte(&pin_array[x].pin)
 #define MULTI_NAME_PAD 26 // space needed to be pretty if not first name assigned to a pin

-void PRINT_ARRAY_NAME(uint8_t x) {
-  PGM_P const name_mem_pointer = (PGM_P)pgm_read_ptr(&pin_array[x].name);
+void printPinNameByIndex(const uint8_t index) {
+  PGM_P const name_mem_pointer = (PGM_P)pgm_read_ptr(&pin_array[index].name);
  for (uint8_t y = 0; y < MAX_NAME_LENGTH; ++y) {
    char temp_char = pgm_read_byte(name_mem_pointer + y);
    if (temp_char != 0)
@@ -88,7 +104,7 @@ void PRINT_ARRAY_NAME(uint8_t x) {
  }
 }

-#define GET_ARRAY_IS_DIGITAL(x)   pgm_read_byte(&pin_array[x].is_digital)
+#define getPinIsDigitalByIndex(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
@@ -109,7 +125,7 @@ void PRINT_ARRAY_NAME(uint8_t x) {
 * Print a pin's PWM status.
 * Return true if it's currently a PWM pin.
 */
-bool pwm_status(uint8_t pin) {
+bool pwm_status(const uint8_t pin) {
  char buffer[20];   // for the sprintf statements

  switch (digitalPinToTimer_DEBUG(pin)) {
@@ -276,7 +292,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 pwm_details(uint8_t pin) {
+void printPinPWM(const uint8_t pin) {
  switch (digitalPinToTimer_DEBUG(pin)) {

    #if ABTEST(0)
@@ -347,7 +363,7 @@ void pwm_details(uint8_t pin) {
  #else
    UNUSED(print_is_also_tied);
  #endif
-} // pwm_details
+} // printPinPWM

 #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,21 +372,21 @@ void pwm_details(uint8_t pin) {
  }
 #endif

-void print_port(const pin_t pin) {   // print port number
+void printPinPort(const pin_t pin) {   // print port number
  #ifdef digitalPinToPort_DEBUG
    uint8_t x;
    SERIAL_ECHOPGM("  Port: ");
    #if AVR_AT90USB1286_FAMILY
-      x = (pin == 46 || pin == 47) ? 'E' : digitalPinToPort_DEBUG(pin) + 64;
+      x = (pin == PIN_E2 || pin == PIN_E3) ? 'E' : 'A' + digitalPinToPort_DEBUG(pin) - 1;
    #else
-      x = digitalPinToPort_DEBUG(pin) + 64;
+      x = 'A' + digitalPinToPort_DEBUG(pin) - 1;
    #endif
    SERIAL_CHAR(x);

    #if AVR_AT90USB1286_FAMILY
-      if (pin == 46)
+      if (pin == PIN_E2)
        x = '2';
-      else if (pin == 47)
+      else if (pin == PIN_E3)
        x = '3';
      else {
        uint8_t temp = digitalPinToBitMask_DEBUG(pin);
@@ -386,7 +402,7 @@ void print_port(const pin_t pin) {   // print port number
  #endif
 }

-#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 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(P)); SERIAL_ECHO(buffer); }while(0)

 #undef ABTEST
@@ -102,7 +102,7 @@ const uint8_t PROGMEM digital_pin_to_port_PGM[] = {

 // digitalPinToBitMask(pin) is OK

-#define digitalRead_mod(p)  extDigitalRead(p)   // Teensyduino's version of digitalRead doesn't
+#define digitalRead_mod(P)  extDigitalRead(P)   // Teensyduino's version of digitalRead doesn't
                                                // disable the PWMs so we can use it as is

 // portModeRegister(pin) is OK
@@ -48,92 +48,92 @@
 const uint8_t PROGMEM digital_pin_to_port_PGM_plus_70[] = {
  // PORTLIST
  // ------------------------
-  PE  , // PE 0 ** 0 ** USART0_RX
-  PE  , // PE 1 ** 1 ** USART0_TX
-  PE  , // PE 4 ** 2 ** PWM2
-  PE  , // PE 5 ** 3 ** PWM3
-  PG  , // PG 5 ** 4 ** PWM4
-  PE  , // PE 3 ** 5 ** PWM5
-  PH  , // PH 3 ** 6 ** PWM6
-  PH  , // PH 4 ** 7 ** PWM7
-  PH  , // PH 5 ** 8 ** PWM8
-  PH  , // PH 6 ** 9 ** PWM9
-  PB  , // PB 4 ** 10 ** PWM10
-  PB  , // PB 5 ** 11 ** PWM11
-  PB  , // PB 6 ** 12 ** PWM12
-  PB  , // PB 7 ** 13 ** PWM13
-  PJ  , // PJ 1 ** 14 ** USART3_TX
-  PJ  , // PJ 0 ** 15 ** USART3_RX
-  PH  , // PH 1 ** 16 ** USART2_TX
-  PH  , // PH 0 ** 17 ** USART2_RX
-  PD  , // PD 3 ** 18 ** USART1_TX
-  PD  , // PD 2 ** 19 ** USART1_RX
-  PD  , // PD 1 ** 20 ** I2C_SDA
-  PD  , // PD 0 ** 21 ** I2C_SCL
-  PA  , // PA 0 ** 22 ** D22
-  PA  , // PA 1 ** 23 ** D23
-  PA  , // PA 2 ** 24 ** D24
-  PA  , // PA 3 ** 25 ** D25
-  PA  , // PA 4 ** 26 ** D26
-  PA  , // PA 5 ** 27 ** D27
-  PA  , // PA 6 ** 28 ** D28
-  PA  , // PA 7 ** 29 ** D29
-  PC  , // PC 7 ** 30 ** D30
-  PC  , // PC 6 ** 31 ** D31
-  PC  , // PC 5 ** 32 ** D32
-  PC  , // PC 4 ** 33 ** D33
-  PC  , // PC 3 ** 34 ** D34
-  PC  , // PC 2 ** 35 ** D35
-  PC  , // PC 1 ** 36 ** D36
-  PC  , // PC 0 ** 37 ** D37
-  PD  , // PD 7 ** 38 ** D38
-  PG  , // PG 2 ** 39 ** D39
-  PG  , // PG 1 ** 40 ** D40
-  PG  , // PG 0 ** 41 ** D41
-  PL  , // PL 7 ** 42 ** D42
-  PL  , // PL 6 ** 43 ** D43
-  PL  , // PL 5 ** 44 ** D44
-  PL  , // PL 4 ** 45 ** D45
-  PL  , // PL 3 ** 46 ** D46
-  PL  , // PL 2 ** 47 ** D47
-  PL  , // PL 1 ** 48 ** D48
-  PL  , // PL 0 ** 49 ** D49
-  PB  , // PB 3 ** 50 ** SPI_MISO
-  PB  , // PB 2 ** 51 ** SPI_MOSI
-  PB  , // PB 1 ** 52 ** SPI_SCK
-  PB  , // PB 0 ** 53 ** SPI_SS
-  PF  , // PF 0 ** 54 ** A0
-  PF  , // PF 1 ** 55 ** A1
-  PF  , // PF 2 ** 56 ** A2
-  PF  , // PF 3 ** 57 ** A3
-  PF  , // PF 4 ** 58 ** A4
-  PF  , // PF 5 ** 59 ** A5
-  PF  , // PF 6 ** 60 ** A6
-  PF  , // PF 7 ** 61 ** A7
-  PK  , // PK 0 ** 62 ** A8
-  PK  , // PK 1 ** 63 ** A9
-  PK  , // PK 2 ** 64 ** A10
-  PK  , // PK 3 ** 65 ** A11
-  PK  , // PK 4 ** 66 ** A12
-  PK  , // PK 5 ** 67 ** A13
-  PK  , // PK 6 ** 68 ** A14
-  PK  , // PK 7 ** 69 ** A15
-  PG  , // PG 4 ** 70 **
-  PG  , // PG 3 ** 71 **
-  PJ  , // PJ 2 ** 72 **
-  PJ  , // PJ 3 ** 73 **
-  PJ  , // PJ 7 ** 74 **
-  PJ  , // PJ 4 ** 75 **
-  PJ  , // PJ 5 ** 76 **
-  PJ  , // PJ 6 ** 77 **
-  PE  , // PE 2 ** 78 **
-  PE  , // PE 6 ** 79 **
-  PE  , // PE 7 ** 80 **
-  PD  , // PD 4 ** 81 **
-  PD  , // PD 5 ** 82 **
-  PD  , // PD 6 ** 83 **
-  PH  , // PH 2 ** 84 **
-  PH  , // PH 7 ** 85 **
+  PE, // PE 0 ** 0 ** USART0_RX
+  PE, // PE 1 ** 1 ** USART0_TX
+  PE, // PE 4 ** 2 ** PWM2
+  PE, // PE 5 ** 3 ** PWM3
+  PG, // PG 5 ** 4 ** PWM4
+  PE, // PE 3 ** 5 ** PWM5
+  PH, // PH 3 ** 6 ** PWM6
+  PH, // PH 4 ** 7 ** PWM7
+  PH, // PH 5 ** 8 ** PWM8
+  PH, // PH 6 ** 9 ** PWM9
+  PB, // PB 4 ** 10 ** PWM10
+  PB, // PB 5 ** 11 ** PWM11
+  PB, // PB 6 ** 12 ** PWM12
+  PB, // PB 7 ** 13 ** PWM13
+  PJ, // PJ 1 ** 14 ** USART3_TX
+  PJ, // PJ 0 ** 15 ** USART3_RX
+  PH, // PH 1 ** 16 ** USART2_TX
+  PH, // PH 0 ** 17 ** USART2_RX
+  PD, // PD 3 ** 18 ** USART1_TX
+  PD, // PD 2 ** 19 ** USART1_RX
+  PD, // PD 1 ** 20 ** I2C_SDA
+  PD, // PD 0 ** 21 ** I2C_SCL
+  PA, // PA 0 ** 22 ** D22
+  PA, // PA 1 ** 23 ** D23
+  PA, // PA 2 ** 24 ** D24
+  PA, // PA 3 ** 25 ** D25
+  PA, // PA 4 ** 26 ** D26
+  PA, // PA 5 ** 27 ** D27
+  PA, // PA 6 ** 28 ** D28
+  PA, // PA 7 ** 29 ** D29
+  PC, // PC 7 ** 30 ** D30
+  PC, // PC 6 ** 31 ** D31
+  PC, // PC 5 ** 32 ** D32
+  PC, // PC 4 ** 33 ** D33
+  PC, // PC 3 ** 34 ** D34
+  PC, // PC 2 ** 35 ** D35
+  PC, // PC 1 ** 36 ** D36
+  PC, // PC 0 ** 37 ** D37
+  PD, // PD 7 ** 38 ** D38
+  PG, // PG 2 ** 39 ** D39
+  PG, // PG 1 ** 40 ** D40
+  PG, // PG 0 ** 41 ** D41
+  PL, // PL 7 ** 42 ** D42
+  PL, // PL 6 ** 43 ** D43
+  PL, // PL 5 ** 44 ** D44
+  PL, // PL 4 ** 45 ** D45
+  PL, // PL 3 ** 46 ** D46
+  PL, // PL 2 ** 47 ** D47
+  PL, // PL 1 ** 48 ** D48
+  PL, // PL 0 ** 49 ** D49
+  PB, // PB 3 ** 50 ** SPI_MISO
+  PB, // PB 2 ** 51 ** SPI_MOSI
+  PB, // PB 1 ** 52 ** SPI_SCK
+  PB, // PB 0 ** 53 ** SPI_SS
+  PF, // PF 0 ** 54 ** A0
+  PF, // PF 1 ** 55 ** A1
+  PF, // PF 2 ** 56 ** A2
+  PF, // PF 3 ** 57 ** A3
+  PF, // PF 4 ** 58 ** A4
+  PF, // PF 5 ** 59 ** A5
+  PF, // PF 6 ** 60 ** A6
+  PF, // PF 7 ** 61 ** A7
+  PK, // PK 0 ** 62 ** A8
+  PK, // PK 1 ** 63 ** A9
+  PK, // PK 2 ** 64 ** A10
+  PK, // PK 3 ** 65 ** A11
+  PK, // PK 4 ** 66 ** A12
+  PK, // PK 5 ** 67 ** A13
+  PK, // PK 6 ** 68 ** A14
+  PK, // PK 7 ** 69 ** A15
+  PG, // PG 4 ** 70 **
+  PG, // PG 3 ** 71 **
+  PJ, // PJ 2 ** 72 **
+  PJ, // PJ 3 ** 73 **
+  PJ, // PJ 7 ** 74 **
+  PJ, // PJ 4 ** 75 **
+  PJ, // PJ 5 ** 76 **
+  PJ, // PJ 6 ** 77 **
+  PE, // PE 2 ** 78 **
+  PE, // PE 6 ** 79 **
+  PE, // PE 7 ** 80 **
+  PD, // PD 4 ** 81 **
+  PD, // PD 5 ** 82 **
+  PD, // PD 6 ** 83 **
+  PH, // PH 2 ** 84 **
+  PH, // PH 7 ** 85 **
 };

 #define digitalPinToPort_plus_70(P) ( pgm_read_byte( digital_pin_to_port_PGM_plus_70 + (P) ) )
@@ -141,92 +141,92 @@ const uint8_t PROGMEM digital_pin_to_port_PGM_plus_70[] = {
 const uint8_t PROGMEM digital_pin_to_bit_mask_PGM_plus_70[] = {
  // PIN IN PORT
  // ------------------------
-  _BV( 0 )  , // PE 0 ** 0 ** USART0_RX
-  _BV( 1 )  , // PE 1 ** 1 ** USART0_TX
-  _BV( 4 )  , // PE 4 ** 2 ** PWM2
-  _BV( 5 )  , // PE 5 ** 3 ** PWM3
-  _BV( 5 )  , // PG 5 ** 4 ** PWM4
-  _BV( 3 )  , // PE 3 ** 5 ** PWM5
-  _BV( 3 )  , // PH 3 ** 6 ** PWM6
-  _BV( 4 )  , // PH 4 ** 7 ** PWM7
-  _BV( 5 )  , // PH 5 ** 8 ** PWM8
-  _BV( 6 )  , // PH 6 ** 9 ** PWM9
-  _BV( 4 )  , // PB 4 ** 10 ** PWM10
-  _BV( 5 )  , // PB 5 ** 11 ** PWM11
-  _BV( 6 )  , // PB 6 ** 12 ** PWM12
-  _BV( 7 )  , // PB 7 ** 13 ** PWM13
-  _BV( 1 )  , // PJ 1 ** 14 ** USART3_TX
-  _BV( 0 )  , // PJ 0 ** 15 ** USART3_RX
-  _BV( 1 )  , // PH 1 ** 16 ** USART2_TX
-  _BV( 0 )  , // PH 0 ** 17 ** USART2_RX
-  _BV( 3 )  , // PD 3 ** 18 ** USART1_TX
-  _BV( 2 )  , // PD 2 ** 19 ** USART1_RX
-  _BV( 1 )  , // PD 1 ** 20 ** I2C_SDA
-  _BV( 0 )  , // PD 0 ** 21 ** I2C_SCL
-  _BV( 0 )  , // PA 0 ** 22 ** D22
-  _BV( 1 )  , // PA 1 ** 23 ** D23
-  _BV( 2 )  , // PA 2 ** 24 ** D24
-  _BV( 3 )  , // PA 3 ** 25 ** D25
-  _BV( 4 )  , // PA 4 ** 26 ** D26
-  _BV( 5 )  , // PA 5 ** 27 ** D27
-  _BV( 6 )  , // PA 6 ** 28 ** D28
-  _BV( 7 )  , // PA 7 ** 29 ** D29
-  _BV( 7 )  , // PC 7 ** 30 ** D30
-  _BV( 6 )  , // PC 6 ** 31 ** D31
-  _BV( 5 )  , // PC 5 ** 32 ** D32
-  _BV( 4 )  , // PC 4 ** 33 ** D33
-  _BV( 3 )  , // PC 3 ** 34 ** D34
-  _BV( 2 )  , // PC 2 ** 35 ** D35
-  _BV( 1 )  , // PC 1 ** 36 ** D36
-  _BV( 0 )  , // PC 0 ** 37 ** D37
-  _BV( 7 )  , // PD 7 ** 38 ** D38
-  _BV( 2 )  , // PG 2 ** 39 ** D39
-  _BV( 1 )  , // PG 1 ** 40 ** D40
-  _BV( 0 )  , // PG 0 ** 41 ** D41
-  _BV( 7 )  , // PL 7 ** 42 ** D42
-  _BV( 6 )  , // PL 6 ** 43 ** D43
-  _BV( 5 )  , // PL 5 ** 44 ** D44
-  _BV( 4 )  , // PL 4 ** 45 ** D45
-  _BV( 3 )  , // PL 3 ** 46 ** D46
-  _BV( 2 )  , // PL 2 ** 47 ** D47
-  _BV( 1 )  , // PL 1 ** 48 ** D48
-  _BV( 0 )  , // PL 0 ** 49 ** D49
-  _BV( 3 )  , // PB 3 ** 50 ** SPI_MISO
-  _BV( 2 )  , // PB 2 ** 51 ** SPI_MOSI
-  _BV( 1 )  , // PB 1 ** 52 ** SPI_SCK
-  _BV( 0 )  , // PB 0 ** 53 ** SPI_SS
-  _BV( 0 )  , // PF 0 ** 54 ** A0
-  _BV( 1 )  , // PF 1 ** 55 ** A1
-  _BV( 2 )  , // PF 2 ** 56 ** A2
-  _BV( 3 )  , // PF 3 ** 57 ** A3
-  _BV( 4 )  , // PF 4 ** 58 ** A4
-  _BV( 5 )  , // PF 5 ** 59 ** A5
-  _BV( 6 )  , // PF 6 ** 60 ** A6
-  _BV( 7 )  , // PF 7 ** 61 ** A7
-  _BV( 0 )  , // PK 0 ** 62 ** A8
-  _BV( 1 )  , // PK 1 ** 63 ** A9
-  _BV( 2 )  , // PK 2 ** 64 ** A10
-  _BV( 3 )  , // PK 3 ** 65 ** A11
-  _BV( 4 )  , // PK 4 ** 66 ** A12
-  _BV( 5 )  , // PK 5 ** 67 ** A13
-  _BV( 6 )  , // PK 6 ** 68 ** A14
-  _BV( 7 )  , // PK 7 ** 69 ** A15
-  _BV( 4 )  , // PG 4 ** 70 **
-  _BV( 3 )  , // PG 3 ** 71 **
-  _BV( 2 )  , // PJ 2 ** 72 **
-  _BV( 3 )  , // PJ 3 ** 73 **
-  _BV( 7 )  , // PJ 7 ** 74 **
-  _BV( 4 )  , // PJ 4 ** 75 **
-  _BV( 5 )  , // PJ 5 ** 76 **
-  _BV( 6 )  , // PJ 6 ** 77 **
-  _BV( 2 )  , // PE 2 ** 78 **
-  _BV( 6 )  , // PE 6 ** 79 **
-  _BV( 7 )  , // PE 7 ** 80 **
-  _BV( 4 )  , // PD 4 ** 81 **
-  _BV( 5 )  , // PD 5 ** 82 **
-  _BV( 6 )  , // PD 6 ** 83 **
-  _BV( 2 )  , // PH 2 ** 84 **
-  _BV( 7 )  , // PH 7 ** 85 **
+  _BV( 0 ), // PE 0 ** 0 ** USART0_RX
+  _BV( 1 ), // PE 1 ** 1 ** USART0_TX
+  _BV( 4 ), // PE 4 ** 2 ** PWM2
+  _BV( 5 ), // PE 5 ** 3 ** PWM3
+  _BV( 5 ), // PG 5 ** 4 ** PWM4
+  _BV( 3 ), // PE 3 ** 5 ** PWM5
+  _BV( 3 ), // PH 3 ** 6 ** PWM6
+  _BV( 4 ), // PH 4 ** 7 ** PWM7
+  _BV( 5 ), // PH 5 ** 8 ** PWM8
+  _BV( 6 ), // PH 6 ** 9 ** PWM9
+  _BV( 4 ), // PB 4 ** 10 ** PWM10
+  _BV( 5 ), // PB 5 ** 11 ** PWM11
+  _BV( 6 ), // PB 6 ** 12 ** PWM12
+  _BV( 7 ), // PB 7 ** 13 ** PWM13
+  _BV( 1 ), // PJ 1 ** 14 ** USART3_TX
+  _BV( 0 ), // PJ 0 ** 15 ** USART3_RX
+  _BV( 1 ), // PH 1 ** 16 ** USART2_TX
+  _BV( 0 ), // PH 0 ** 17 ** USART2_RX
+  _BV( 3 ), // PD 3 ** 18 ** USART1_TX
+  _BV( 2 ), // PD 2 ** 19 ** USART1_RX
+  _BV( 1 ), // PD 1 ** 20 ** I2C_SDA
+  _BV( 0 ), // PD 0 ** 21 ** I2C_SCL
+  _BV( 0 ), // PA 0 ** 22 ** D22
+  _BV( 1 ), // PA 1 ** 23 ** D23
+  _BV( 2 ), // PA 2 ** 24 ** D24
+  _BV( 3 ), // PA 3 ** 25 ** D25
+  _BV( 4 ), // PA 4 ** 26 ** D26
+  _BV( 5 ), // PA 5 ** 27 ** D27
+  _BV( 6 ), // PA 6 ** 28 ** D28
+  _BV( 7 ), // PA 7 ** 29 ** D29
+  _BV( 7 ), // PC 7 ** 30 ** D30
+  _BV( 6 ), // PC 6 ** 31 ** D31
+  _BV( 5 ), // PC 5 ** 32 ** D32
+  _BV( 4 ), // PC 4 ** 33 ** D33
+  _BV( 3 ), // PC 3 ** 34 ** D34
+  _BV( 2 ), // PC 2 ** 35 ** D35
+  _BV( 1 ), // PC 1 ** 36 ** D36
+  _BV( 0 ), // PC 0 ** 37 ** D37
+  _BV( 7 ), // PD 7 ** 38 ** D38
+  _BV( 2 ), // PG 2 ** 39 ** D39
+  _BV( 1 ), // PG 1 ** 40 ** D40
+  _BV( 0 ), // PG 0 ** 41 ** D41
+  _BV( 7 ), // PL 7 ** 42 ** D42
+  _BV( 6 ), // PL 6 ** 43 ** D43
+  _BV( 5 ), // PL 5 ** 44 ** D44
+  _BV( 4 ), // PL 4 ** 45 ** D45
+  _BV( 3 ), // PL 3 ** 46 ** D46
+  _BV( 2 ), // PL 2 ** 47 ** D47
+  _BV( 1 ), // PL 1 ** 48 ** D48
+  _BV( 0 ), // PL 0 ** 49 ** D49
+  _BV( 3 ), // PB 3 ** 50 ** SPI_MISO
+  _BV( 2 ), // PB 2 ** 51 ** SPI_MOSI
+  _BV( 1 ), // PB 1 ** 52 ** SPI_SCK
+  _BV( 0 ), // PB 0 ** 53 ** SPI_SS
+  _BV( 0 ), // PF 0 ** 54 ** A0
+  _BV( 1 ), // PF 1 ** 55 ** A1
+  _BV( 2 ), // PF 2 ** 56 ** A2
+  _BV( 3 ), // PF 3 ** 57 ** A3
+  _BV( 4 ), // PF 4 ** 58 ** A4
+  _BV( 5 ), // PF 5 ** 59 ** A5
+  _BV( 6 ), // PF 6 ** 60 ** A6
+  _BV( 7 ), // PF 7 ** 61 ** A7
+  _BV( 0 ), // PK 0 ** 62 ** A8
+  _BV( 1 ), // PK 1 ** 63 ** A9
+  _BV( 2 ), // PK 2 ** 64 ** A10
+  _BV( 3 ), // PK 3 ** 65 ** A11
+  _BV( 4 ), // PK 4 ** 66 ** A12
+  _BV( 5 ), // PK 5 ** 67 ** A13
+  _BV( 6 ), // PK 6 ** 68 ** A14
+  _BV( 7 ), // PK 7 ** 69 ** A15
+  _BV( 4 ), // PG 4 ** 70 **
+  _BV( 3 ), // PG 3 ** 71 **
+  _BV( 2 ), // PJ 2 ** 72 **
+  _BV( 3 ), // PJ 3 ** 73 **
+  _BV( 7 ), // PJ 7 ** 74 **
+  _BV( 4 ), // PJ 4 ** 75 **
+  _BV( 5 ), // PJ 5 ** 76 **
+  _BV( 6 ), // PJ 6 ** 77 **
+  _BV( 2 ), // PE 2 ** 78 **
+  _BV( 6 ), // PE 6 ** 79 **
+  _BV( 7 ), // PE 7 ** 80 **
+  _BV( 4 ), // PD 4 ** 81 **
+  _BV( 5 ), // PD 5 ** 82 **
+  _BV( 6 ), // PD 6 ** 83 **
+  _BV( 2 ), // PH 2 ** 84 **
+  _BV( 7 ), // PH 7 ** 85 **
 };

 #define digitalPinToBitMask_plus_70(P) ( pgm_read_byte( digital_pin_to_bit_mask_PGM_plus_70 + (P) ) )
@@ -234,86 +234,86 @@ const uint8_t PROGMEM digital_pin_to_bit_mask_PGM_plus_70[] = {
 const uint8_t PROGMEM digital_pin_to_timer_PGM_plus_70[] = {
  // TIMERS
  // ------------------------
-  NOT_ON_TIMER  , // PE 0 ** 0 ** USART0_RX
-  NOT_ON_TIMER  , // PE 1 ** 1 ** USART0_TX
-  TIMER3B , // PE 4 ** 2 ** PWM2
-  TIMER3C , // PE 5 ** 3 ** PWM3
-  TIMER0B , // PG 5 ** 4 ** PWM4
-  TIMER3A , // PE 3 ** 5 ** PWM5
-  TIMER4A , // PH 3 ** 6 ** PWM6
-  TIMER4B , // PH 4 ** 7 ** PWM7
-  TIMER4C , // PH 5 ** 8 ** PWM8
-  TIMER2B , // PH 6 ** 9 ** PWM9
-  TIMER2A , // PB 4 ** 10 ** PWM10
-  TIMER1A , // PB 5 ** 11 ** PWM11
-  TIMER1B , // PB 6 ** 12 ** PWM12
-  TIMER0A , // PB 7 ** 13 ** PWM13
-  NOT_ON_TIMER  , // PJ 1 ** 14 ** USART3_TX
-  NOT_ON_TIMER  , // PJ 0 ** 15 ** USART3_RX
-  NOT_ON_TIMER  , // PH 1 ** 16 ** USART2_TX
-  NOT_ON_TIMER  , // PH 0 ** 17 ** USART2_RX
-  NOT_ON_TIMER  , // PD 3 ** 18 ** USART1_TX
-  NOT_ON_TIMER  , // PD 2 ** 19 ** USART1_RX
-  NOT_ON_TIMER  , // PD 1 ** 20 ** I2C_SDA
-  NOT_ON_TIMER  , // PD 0 ** 21 ** I2C_SCL
-  NOT_ON_TIMER  , // PA 0 ** 22 ** D22
-  NOT_ON_TIMER  , // PA 1 ** 23 ** D23
-  NOT_ON_TIMER  , // PA 2 ** 24 ** D24
-  NOT_ON_TIMER  , // PA 3 ** 25 ** D25
-  NOT_ON_TIMER  , // PA 4 ** 26 ** D26
-  NOT_ON_TIMER  , // PA 5 ** 27 ** D27
-  NOT_ON_TIMER  , // PA 6 ** 28 ** D28
-  NOT_ON_TIMER  , // PA 7 ** 29 ** D29
-  NOT_ON_TIMER  , // PC 7 ** 30 ** D30
-  NOT_ON_TIMER  , // PC 6 ** 31 ** D31
-  NOT_ON_TIMER  , // PC 5 ** 32 ** D32
-  NOT_ON_TIMER  , // PC 4 ** 33 ** D33
-  NOT_ON_TIMER  , // PC 3 ** 34 ** D34
-  NOT_ON_TIMER  , // PC 2 ** 35 ** D35
-  NOT_ON_TIMER  , // PC 1 ** 36 ** D36
-  NOT_ON_TIMER  , // PC 0 ** 37 ** D37
-  NOT_ON_TIMER  , // PD 7 ** 38 ** D38
-  NOT_ON_TIMER  , // PG 2 ** 39 ** D39
-  NOT_ON_TIMER  , // PG 1 ** 40 ** D40
-  NOT_ON_TIMER  , // PG 0 ** 41 ** D41
-  NOT_ON_TIMER  , // PL 7 ** 42 ** D42
-  NOT_ON_TIMER  , // PL 6 ** 43 ** D43
-  TIMER5C , // PL 5 ** 44 ** D44
-  TIMER5B , // PL 4 ** 45 ** D45
-  TIMER5A , // PL 3 ** 46 ** D46
-  NOT_ON_TIMER  , // PL 2 ** 47 ** D47
-  NOT_ON_TIMER  , // PL 1 ** 48 ** D48
-  NOT_ON_TIMER  , // PL 0 ** 49 ** D49
-  NOT_ON_TIMER  , // PB 3 ** 50 ** SPI_MISO
-  NOT_ON_TIMER  , // PB 2 ** 51 ** SPI_MOSI
-  NOT_ON_TIMER  , // PB 1 ** 52 ** SPI_SCK
-  NOT_ON_TIMER  , // PB 0 ** 53 ** SPI_SS
-  NOT_ON_TIMER  , // PF 0 ** 54 ** A0
-  NOT_ON_TIMER  , // PF 1 ** 55 ** A1
-  NOT_ON_TIMER  , // PF 2 ** 56 ** A2
-  NOT_ON_TIMER  , // PF 3 ** 57 ** A3
-  NOT_ON_TIMER  , // PF 4 ** 58 ** A4
-  NOT_ON_TIMER  , // PF 5 ** 59 ** A5
-  NOT_ON_TIMER  , // PF 6 ** 60 ** A6
-  NOT_ON_TIMER  , // PF 7 ** 61 ** A7
-  NOT_ON_TIMER  , // PK 0 ** 62 ** A8
-  NOT_ON_TIMER  , // PK 1 ** 63 ** A9
-  NOT_ON_TIMER  , // PK 2 ** 64 ** A10
-  NOT_ON_TIMER  , // PK 3 ** 65 ** A11
-  NOT_ON_TIMER  , // PK 4 ** 66 ** A12
-  NOT_ON_TIMER  , // PK 5 ** 67 ** A13
-  NOT_ON_TIMER  , // PK 6 ** 68 ** A14
-  NOT_ON_TIMER  , // PK 7 ** 69 ** A15
-  NOT_ON_TIMER  , // PG 4 ** 70 **
-  NOT_ON_TIMER  , // PG 3 ** 71 **
-  NOT_ON_TIMER  , // PJ 2 ** 72 **
-  NOT_ON_TIMER  , // PJ 3 ** 73 **
-  NOT_ON_TIMER  , // PJ 7 ** 74 **
-  NOT_ON_TIMER  , // PJ 4 ** 75 **
-  NOT_ON_TIMER  , // PJ 5 ** 76 **
-  NOT_ON_TIMER  , // PJ 6 ** 77 **
-  NOT_ON_TIMER  , // PE 2 ** 78 **
-  NOT_ON_TIMER  , // PE 6 ** 79 **
+  NOT_ON_TIMER, // PE 0 ** 0 ** USART0_RX
+  NOT_ON_TIMER, // PE 1 ** 1 ** USART0_TX
+  TIMER3B, // PE 4 ** 2 ** PWM2
+  TIMER3C, // PE 5 ** 3 ** PWM3
+  TIMER0B, // PG 5 ** 4 ** PWM4
+  TIMER3A, // PE 3 ** 5 ** PWM5
+  TIMER4A, // PH 3 ** 6 ** PWM6
+  TIMER4B, // PH 4 ** 7 ** PWM7
+  TIMER4C, // PH 5 ** 8 ** PWM8
+  TIMER2B, // PH 6 ** 9 ** PWM9
+  TIMER2A, // PB 4 ** 10 ** PWM10
+  TIMER1A, // PB 5 ** 11 ** PWM11
+  TIMER1B, // PB 6 ** 12 ** PWM12
+  TIMER0A, // PB 7 ** 13 ** PWM13
+  NOT_ON_TIMER, // PJ 1 ** 14 ** USART3_TX
+  NOT_ON_TIMER, // PJ 0 ** 15 ** USART3_RX
+  NOT_ON_TIMER, // PH 1 ** 16 ** USART2_TX
+  NOT_ON_TIMER, // PH 0 ** 17 ** USART2_RX
+  NOT_ON_TIMER, // PD 3 ** 18 ** USART1_TX
+  NOT_ON_TIMER, // PD 2 ** 19 ** USART1_RX
+  NOT_ON_TIMER, // PD 1 ** 20 ** I2C_SDA
+  NOT_ON_TIMER, // PD 0 ** 21 ** I2C_SCL
+  NOT_ON_TIMER, // PA 0 ** 22 ** D22
+  NOT_ON_TIMER, // PA 1 ** 23 ** D23
+  NOT_ON_TIMER, // PA 2 ** 24 ** D24
+  NOT_ON_TIMER, // PA 3 ** 25 ** D25
+  NOT_ON_TIMER, // PA 4 ** 26 ** D26
+  NOT_ON_TIMER, // PA 5 ** 27 ** D27
+  NOT_ON_TIMER, // PA 6 ** 28 ** D28
+  NOT_ON_TIMER, // PA 7 ** 29 ** D29
+  NOT_ON_TIMER, // PC 7 ** 30 ** D30
+  NOT_ON_TIMER, // PC 6 ** 31 ** D31
+  NOT_ON_TIMER, // PC 5 ** 32 ** D32
+  NOT_ON_TIMER, // PC 4 ** 33 ** D33
+  NOT_ON_TIMER, // PC 3 ** 34 ** D34
+  NOT_ON_TIMER, // PC 2 ** 35 ** D35
+  NOT_ON_TIMER, // PC 1 ** 36 ** D36
+  NOT_ON_TIMER, // PC 0 ** 37 ** D37
+  NOT_ON_TIMER, // PD 7 ** 38 ** D38
+  NOT_ON_TIMER, // PG 2 ** 39 ** D39
+  NOT_ON_TIMER, // PG 1 ** 40 ** D40
+  NOT_ON_TIMER, // PG 0 ** 41 ** D41
+  NOT_ON_TIMER, // PL 7 ** 42 ** D42
+  NOT_ON_TIMER, // PL 6 ** 43 ** D43
+  TIMER5C, // PL 5 ** 44 ** D44
+  TIMER5B, // PL 4 ** 45 ** D45
+  TIMER5A, // PL 3 ** 46 ** D46
+  NOT_ON_TIMER, // PL 2 ** 47 ** D47
+  NOT_ON_TIMER, // PL 1 ** 48 ** D48
+  NOT_ON_TIMER, // PL 0 ** 49 ** D49
+  NOT_ON_TIMER, // PB 3 ** 50 ** SPI_MISO
+  NOT_ON_TIMER, // PB 2 ** 51 ** SPI_MOSI
+  NOT_ON_TIMER, // PB 1 ** 52 ** SPI_SCK
+  NOT_ON_TIMER, // PB 0 ** 53 ** SPI_SS
+  NOT_ON_TIMER, // PF 0 ** 54 ** A0
+  NOT_ON_TIMER, // PF 1 ** 55 ** A1
+  NOT_ON_TIMER, // PF 2 ** 56 ** A2
+  NOT_ON_TIMER, // PF 3 ** 57 ** A3
+  NOT_ON_TIMER, // PF 4 ** 58 ** A4
+  NOT_ON_TIMER, // PF 5 ** 59 ** A5
+  NOT_ON_TIMER, // PF 6 ** 60 ** A6
+  NOT_ON_TIMER, // PF 7 ** 61 ** A7
+  NOT_ON_TIMER, // PK 0 ** 62 ** A8
+  NOT_ON_TIMER, // PK 1 ** 63 ** A9
+  NOT_ON_TIMER, // PK 2 ** 64 ** A10
+  NOT_ON_TIMER, // PK 3 ** 65 ** A11
+  NOT_ON_TIMER, // PK 4 ** 66 ** A12
+  NOT_ON_TIMER, // PK 5 ** 67 ** A13
+  NOT_ON_TIMER, // PK 6 ** 68 ** A14
+  NOT_ON_TIMER, // PK 7 ** 69 ** A15
+  NOT_ON_TIMER, // PG 4 ** 70 **
+  NOT_ON_TIMER, // PG 3 ** 71 **
+  NOT_ON_TIMER, // PJ 2 ** 72 **
+  NOT_ON_TIMER, // PJ 3 ** 73 **
+  NOT_ON_TIMER, // PJ 7 ** 74 **
+  NOT_ON_TIMER, // PJ 4 ** 75 **
+  NOT_ON_TIMER, // PJ 5 ** 76 **
+  NOT_ON_TIMER, // PJ 6 ** 77 **
+  NOT_ON_TIMER, // PE 2 ** 78 **
+  NOT_ON_TIMER, // PE 6 ** 79 **
 };

 #define digitalPinToTimer_plus_70(P) ( pgm_read_byte( digital_pin_to_timer_PGM_plus_70 + (P) ) )
@@ -23,43 +23,41 @@

 /**
 * Define SPI Pins: SCK, MISO, MOSI, SS
+ * Platform pins have parentheses, e.g., "(53)", so we cannot use them.
 */
 #if defined(__AVR_ATmega168__) || defined(__AVR_ATmega328__) || defined(__AVR_ATmega328P__)
-  #define AVR_SCK_PIN  13
-  #define AVR_MISO_PIN 12
-  #define AVR_MOSI_PIN 11
-  #define AVR_SS_PIN   10
+  #define _PIN_SPI_SCK  13
+  #define _PIN_SPI_MISO 12
+  #define _PIN_SPI_MOSI 11
+  #define _PIN_SPI_SS   10
 #elif defined(__AVR_ATmega644__) || defined(__AVR_ATmega644P__) || defined(__AVR_ATmega644PA__) || defined(__AVR_ATmega1284P__)
-  #define AVR_SCK_PIN  7
-  #define AVR_MISO_PIN 6
-  #define AVR_MOSI_PIN 5
-  #define AVR_SS_PIN   4
+  #define _PIN_SPI_SCK  7
+  #define _PIN_SPI_MISO 6
+  #define _PIN_SPI_MOSI 5
+  #define _PIN_SPI_SS   4
 #elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
-  #define AVR_SCK_PIN  52
-  #define AVR_MISO_PIN 50
-  #define AVR_MOSI_PIN 51
-  #define AVR_SS_PIN   53
+  #define _PIN_SPI_SCK  52
+  #define _PIN_SPI_MISO 50
+  #define _PIN_SPI_MOSI 51
+  #define _PIN_SPI_SS   53
 #elif defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__)
-  #define AVR_SCK_PIN  21
-  #define AVR_MISO_PIN 23
-  #define AVR_MOSI_PIN 22
-  #define AVR_SS_PIN   20
+  #define _PIN_SPI_SCK  21
+  #define _PIN_SPI_MISO 23
+  #define _PIN_SPI_MOSI 22
+  #define _PIN_SPI_SS   20
 #elif defined(__AVR_ATmega1281__) || defined(__AVR_ATmega2561__)
-  #define AVR_SCK_PIN  10
-  #define AVR_MISO_PIN 12
-  #define AVR_MOSI_PIN 11
-  #define AVR_SS_PIN   16
+  #define _PIN_SPI_SCK  10
+  #define _PIN_SPI_MISO 12
+  #define _PIN_SPI_MOSI 11
+  #define _PIN_SPI_SS   16
 #endif

 #ifndef SD_SCK_PIN
-  #define SD_SCK_PIN  AVR_SCK_PIN
+  #define SD_SCK_PIN  _PIN_SPI_SCK
 #endif
 #ifndef SD_MISO_PIN
-  #define SD_MISO_PIN AVR_MISO_PIN
+  #define SD_MISO_PIN _PIN_SPI_MISO
 #endif
 #ifndef SD_MOSI_PIN
-  #define SD_MOSI_PIN AVR_MOSI_PIN
-#endif
-#ifndef SD_SS_PIN
-  #define SD_SS_PIN   AVR_SS_PIN
+  #define SD_MOSI_PIN _PIN_SPI_MOSI
 #endif
@@ -55,12 +55,12 @@

 #if defined(ARDUINO) && !defined(ARDUINO_ARCH_STM32) && !defined(ARDUINO_ARCH_SAM)

-#include "../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"

 #if HAS_MARLINUI_U8GLIB

-#include "../shared/Marduino.h"
-#include "../shared/Delay.h"
+#include "../../shared/Marduino.h"
+#include "../../shared/Delay.h"

 #include <U8glib-HAL.h>

@@ -120,7 +120,7 @@ void u8g_spiSend_sw_AVR_mode_3(uint8_t val) {
  U8G_ATOMIC_END();
 }

-#if ENABLED(FYSETC_MINI_12864)
+#if U8G_SPI_USE_MODE_3
  #define SPISEND_SW_AVR u8g_spiSend_sw_AVR_mode_3
 #else
  #define SPISEND_SW_AVR u8g_spiSend_sw_AVR_mode_0
@@ -143,9 +143,9 @@ uint8_t u8g_com_HAL_AVR_sw_sp_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void
      break;

    case U8G_COM_MSG_CHIP_SELECT:
-      #if ENABLED(FYSETC_MINI_12864)           // LCD SPI is running mode 3 while SD card is running mode 0
-        if (arg_val) {                         //   SCK idle state needs to be set to the proper idle state before
-                                               //   the next chip select goes active
+      #if U8G_SPI_USE_MODE_3                                  // LCD SPI is running mode 3 while SD card is running mode 0
+        if (arg_val) {                                        // SCK idle state needs to be set to the proper idle state before
+                                                              //  the next chip select goes active
          u8g_com_arduino_digital_write(u8g, U8G_PI_SCK, 1);  // Set SCK to mode 3 idle state before CS goes active
          u8g_com_arduino_digital_write(u8g, U8G_PI_CS, LOW);
        }
@@ -48,7 +48,7 @@ uint16_t MarlinHAL::adc_result;

 void MarlinHAL::init() {
  #if HAS_MEDIA
-    OUT_WRITE(SDSS, HIGH);  // Try to set SDSS inactive before any other SPI users start up
+    OUT_WRITE(SD_SS_PIN, HIGH);  // Try to set SDSS inactive before any other SPI users start up
  #endif
  usb_task_init();          // Initialize the USB stack
  TERN_(POSTMORTEM_DEBUGGING, install_min_serial()); // Install the min serial handler
@@ -102,6 +102,10 @@ void watchdogSetup() {

  #if ENABLED(USE_WATCHDOG)

+    #ifndef WATCHDOG_PIO_RESET
+      #define WATCHDOG_PIO_RESET
+    #endif
+
    // 4 seconds timeout
    uint32_t timeout = TERN(WATCHDOG_DURATION_8S, 8000, 4000);

@@ -115,15 +119,16 @@ void watchdogSetup() {
      timeout = 0xFFF;

    // We want to enable the watchdog with the specified timeout
-    uint32_t value =
-      WDT_MR_WDV(timeout) |               // With the specified timeout
-      WDT_MR_WDD(timeout) |               // and no invalid write window
-    #if !(SAMV70 || SAMV71 || SAME70 || SAMS70)
-      WDT_MR_WDRPROC   |                  // WDT fault resets processor only - We want
-                                          // to keep PIO controller state
-    #endif
-      WDT_MR_WDDBGHLT  |                  // WDT stops in debug state.
-      WDT_MR_WDIDLEHLT;                   // WDT stops in idle state.
+    uint32_t value = (0
+      | WDT_MR_WDV(timeout)               // With the specified timeout
+      | WDT_MR_WDD(timeout)               // and no invalid write window
+      #if NONE(WATCHDOG_PIO_RESET, SAMV70, SAMV71, SAME70, SAMS70)
+        | WDT_MR_WDRPROC                  // WDT fault resets processor only with this flag.
+                                          // Omit to also reset the PIO controller.
+      #endif
+      | WDT_MR_WDDBGHLT                   // WDT stops in debug state.
+      | WDT_MR_WDIDLEHLT                  // WDT stops in idle state.
+    );

    #if ENABLED(WATCHDOG_RESET_MANUAL)
      // We enable the watchdog timer, but only for the interrupt.
@@ -35,67 +35,9 @@

 #include <stdint.h>

-#include "../../core/serial_hook.h"
-
-// ------------------------
-// Serial ports
-// ------------------------
-
-typedef ForwardSerial1Class< decltype(Serial) > DefaultSerial1;
-typedef ForwardSerial1Class< decltype(Serial1) > DefaultSerial2;
-typedef ForwardSerial1Class< decltype(Serial2) > DefaultSerial3;
-typedef ForwardSerial1Class< decltype(Serial3) > DefaultSerial4;
-extern DefaultSerial1 MSerial0;
-extern DefaultSerial2 MSerial1;
-extern DefaultSerial3 MSerial2;
-extern DefaultSerial4 MSerial3;
-
-#define _MSERIAL(X) MSerial##X
-#define MSERIAL(X) _MSERIAL(X)
-
-#if SERIAL_PORT == -1 || ENABLED(EMERGENCY_PARSER)
-  #define MYSERIAL1 customizedSerial1
-#elif WITHIN(SERIAL_PORT, 0, 3)
-  #define MYSERIAL1 MSERIAL(SERIAL_PORT)
-#else
-  #error "The required SERIAL_PORT must be from 0 to 3, or -1 for USB Serial."
-#endif
-
-#ifdef SERIAL_PORT_2
-  #if SERIAL_PORT_2 == -1 || ENABLED(EMERGENCY_PARSER)
-    #define MYSERIAL2 customizedSerial2
-  #elif WITHIN(SERIAL_PORT_2, 0, 3)
-    #define MYSERIAL2 MSERIAL(SERIAL_PORT_2)
-  #else
-    #error "SERIAL_PORT_2 must be from 0 to 3, or -1 for USB Serial."
-  #endif
-#endif
-
-#ifdef SERIAL_PORT_3
-  #if SERIAL_PORT_3 == -1 || ENABLED(EMERGENCY_PARSER)
-    #define MYSERIAL3 customizedSerial3
-  #elif WITHIN(SERIAL_PORT_3, 0, 3)
-    #define MYSERIAL3 MSERIAL(SERIAL_PORT_3)
-  #else
-    #error "SERIAL_PORT_3 must be from 0 to 3, or -1 for USB Serial."
-  #endif
-#endif
-
-#ifdef MMU2_SERIAL_PORT
-  #if WITHIN(MMU2_SERIAL_PORT, 0, 3)
-    #define MMU2_SERIAL MSERIAL(MMU2_SERIAL_PORT)
-  #else
-    #error "MMU2_SERIAL_PORT must be from 0 to 3."
-  #endif
-#endif
-
-#ifdef LCD_SERIAL_PORT
-  #if WITHIN(LCD_SERIAL_PORT, 0, 3)
-    #define LCD_SERIAL MSERIAL(LCD_SERIAL_PORT)
-  #else
-    #error "LCD_SERIAL_PORT must be from 0 to 3."
-  #endif
-#endif
+//
+// Serial Ports
+//

 #include "MarlinSerial.h"
 #include "MarlinSerialUSB.h"
@@ -127,7 +69,7 @@ typedef Servo hal_servo_t;
 #define HAL_ADC_RESOLUTION  10

 #ifndef analogInputToDigitalPin
-  #define analogInputToDigitalPin(p) ((p < 12U) ? (p) + 54U : -1)
+  #define analogInputToDigitalPin(p) pin_t((p < 12U) ? (p) + 54U : -1)
 #endif

 //
@@ -208,8 +208,8 @@
      A("str %[sck_mask],[%[sck_port],#0x4]")      /* CODR */
      A("bfi %[bin],%[work],#0,#1")                /* Store read bit as the bit 0 */

-      : [bin]"+r"(bin),
-        [work]"+r"(work)
+      : [bin]"+r"( bin ),
+        [work]"+r"( work )
      : [bitband_miso_port]"r"( BITBAND_MISO_PORT ),
        [sck_mask]"r"( SCK_MASK ),
        [sck_port]"r"( SCK_PORT_PLUS30 )
@@ -350,7 +350,7 @@
  static void spiRxBlock0(uint8_t *ptr, uint32_t todo) {
    uint32_t bin = 0;
    uint32_t work = 0;
-    uint32_t BITBAND_MISO_PORT = BITBAND_ADDRESS( ((uint32_t)PORT(SD_MISO_PIN))+0x3C, PIN_SHIFT(SD_MISO_PIN));  /* PDSR of port in bitband area */
+    uint32_t BITBAND_MISO_PORT = BITBAND_ADDRESS(((uint32_t)PORT(SD_MISO_PIN))+0x3C, PIN_SHIFT(SD_MISO_PIN)); /* PDSR of port in bitband area */
    uint32_t SCK_PORT_PLUS30 = ((uint32_t) PORT(SD_SCK_PIN)) + 0x30;    /* SODR of port */
    uint32_t SCK_MASK = PIN_MASK(SD_SCK_PIN);

@@ -412,10 +412,10 @@
      A("strb.w %[bin], [%[ptr]], #1")             /* Store read value into buffer, increment buffer pointer */
      A("bne.n loop%=")                            /* Repeat until done */

-      : [ptr]"+r"(ptr),
-        [todo]"+r"(todo),
-        [bin]"+r"(bin),
-        [work]"+r"(work)
+      : [ptr]"+r"( ptr ),
+        [todo]"+r"( todo ),
+        [bin]"+r"( bin ),
+        [work]"+r"( work )
      : [bitband_miso_port]"r"( BITBAND_MISO_PORT ),
        [sck_mask]"r"( SCK_MASK ),
        [sck_port]"r"( SCK_PORT_PLUS30 )
@@ -600,9 +600,8 @@
      OUT_WRITE(SPI_EEPROM1_CS_PIN, HIGH);
      OUT_WRITE(SPI_EEPROM2_CS_PIN, HIGH);
      OUT_WRITE(SPI_FLASH_CS_PIN, HIGH);
-      WRITE(SD_SS_PIN, HIGH);
-
-      OUT_WRITE(SDSS, LOW);
+      OUT_WRITE(SD_SS_PIN, HIGH);
+      WRITE(SD_SS_PIN, LOW);

      PIO_Configure(
        g_APinDescription[SPI_PIN].pPort,
@@ -767,7 +766,7 @@

      // Disable PIO on A26 and A27
      REG_PIOA_PDR = 0x0C000000;
-      OUT_WRITE(SDSS, HIGH);
+      OUT_WRITE(SD_SS_PIN, HIGH);

      // Reset SPI0 (from sam lib)
      SPI0->SPI_CR = SPI_CR_SPIDIS;
@@ -33,6 +33,21 @@
 #include "../../core/types.h"
 #include "../../core/serial_hook.h"

+typedef ForwardSerial1Class< decltype(Serial) > DefaultSerial1;
+typedef ForwardSerial1Class< decltype(Serial1) > DefaultSerial2;
+typedef ForwardSerial1Class< decltype(Serial2) > DefaultSerial3;
+typedef ForwardSerial1Class< decltype(Serial3) > DefaultSerial4;
+extern DefaultSerial1 MSerial0;
+extern DefaultSerial2 MSerial1;
+extern DefaultSerial3 MSerial2;
+extern DefaultSerial4 MSerial3;
+
+#define SERIAL_INDEX_MIN 0
+#define SERIAL_INDEX_MAX 3
+#define EP_SERIAL_PORT(N) customizedSerial##N
+#define USB_SERIAL_PORT(N) customizedSerial##N
+#include "../shared/serial_ports.h"
+
 // Define constants and variables for buffering incoming serial data.  We're
 // using a ring buffer (I think), in which rx_buffer_head is the index of the
 // location to which to write the next incoming character and rx_buffer_tail
@@ -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);

@@ -21,7 +21,7 @@
 */
 #ifdef ARDUINO_ARCH_SAM

-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"

 #if ENABLED(FLASH_EEPROM_EMULATION)

@@ -132,7 +132,7 @@ static uint8_t buffer[256] = {0},   // The RAM buffer to accumulate writes
               curGroup = 0xFF;     // Current FLASH group

 #define DEBUG_OUT ENABLED(EE_EMU_DEBUG)
-#include "../../core/debug_out.h"
+#include "../../../core/debug_out.h"

 static void ee_Dump(const int page, const void *data) {

@@ -291,7 +291,7 @@ static bool ee_PageWrite(uint16_t page, const void *data) {
      uint32_t *p1 = (uint32_t*)addrflash;
      uint32_t *p2 = (uint32_t*)data;
      int count = 0;
-      for (i =0; i<PageSize >> 2; i++) {
+      for (i = 0; i < PageSize >> 2; i++) {
        if (p1[i] != p2[i]) {
          uint32_t delta = p1[i] ^ p2[i];
          while (delta) {
@@ -953,7 +953,7 @@ static void ee_Init() {

 /* PersistentStore -----------------------------------------------------------*/

-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_api.h"

 #ifndef MARLIN_EEPROM_SIZE
  #define MARLIN_EEPROM_SIZE 0x1000 // 4KB
@@ -21,7 +21,7 @@
 */
 #ifdef ARDUINO_ARCH_SAM

-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"

 #if USE_WIRED_EEPROM

@@ -30,8 +30,8 @@
 * with simple implementations supplied by Marlin.
 */

-#include "../shared/eeprom_if.h"
-#include "../shared/eeprom_api.h"
+#include "../../shared/eeprom_if.h"
+#include "../../shared/eeprom_api.h"

 #ifndef MARLIN_EEPROM_SIZE
  #error "MARLIN_EEPROM_SIZE is required for I2C / SPI EEPROM."
@@ -64,6 +64,7 @@ void setup_endstop_interrupts() {
  TERN_(USE_Z4_MAX,      _ATTACH(Z4_MAX_PIN));
  TERN_(USE_Z4_MIN,      _ATTACH(Z4_MIN_PIN));
  TERN_(USE_Z_MIN_PROBE, _ATTACH(Z_MIN_PROBE_PIN));
+  TERN_(USE_CALIBRATION, _ATTACH(CALIBRATION_PIN));
  TERN_(USE_I_MAX,       _ATTACH(I_MAX_PIN));
  TERN_(USE_I_MIN,       _ATTACH(I_MIN_PIN));
  TERN_(USE_J_MAX,       _ATTACH(J_MAX_PIN));
@@ -40,11 +40,12 @@
 * Some jitter in the Vref signal is OK so the interrupt priority is left at its default value.
 */

-#include "../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfigPre.h"

 #if MB(PRINTRBOARD_G2)

 #include "G2_PWM.h"
+#include "../../../module/stepper.h"

 #if PIN_EXISTS(MOTOR_CURRENT_PWM_X)
  #define G2_PWM_X 1
@@ -56,16 +57,12 @@
 #else
  #define G2_PWM_Y 0
 #endif
-#if PIN_EXISTS(MOTOR_CURRENT_PWM_Z)
+#if HAS_MOTOR_CURRENT_PWM_Z
  #define G2_PWM_Z 1
 #else
  #define G2_PWM_Z 0
 #endif
-#if PIN_EXISTS(MOTOR_CURRENT_PWM_E)
-  #define G2_PWM_E 1
-#else
-  #define G2_PWM_E 0
-#endif
+#define G2_PWM_E HAS_MOTOR_CURRENT_PWM_E
 #define G2_MASK_X(V) (G2_PWM_X * (V))
 #define G2_MASK_Y(V) (G2_PWM_Y * (V))
 #define G2_MASK_Z(V) (G2_PWM_Z * (V))
@@ -80,17 +77,22 @@ PWM_map ISR_table[NUM_PWMS] = PWM_MAP_INIT;

 void Stepper::digipot_init() {

-  #if PIN_EXISTS(MOTOR_CURRENT_PWM_X)
-    OUT_WRITE(MOTOR_CURRENT_PWM_X_PIN, 0);  // init pins
+  #if G2_PWM_X
+    OUT_WRITE(MOTOR_CURRENT_PWM_X_PIN, LOW);  // init pins
  #endif
-  #if PIN_EXISTS(MOTOR_CURRENT_PWM_Y)
-    OUT_WRITE(MOTOR_CURRENT_PWM_Y_PIN, 0);
+  #if G2_PWM_Y
+    OUT_WRITE(MOTOR_CURRENT_PWM_Y_PIN, LOW);
  #endif
  #if G2_PWM_Z
-    OUT_WRITE(MOTOR_CURRENT_PWM_Z_PIN, 0);
+    OUT_WRITE(MOTOR_CURRENT_PWM_Z_PIN, LOW);
  #endif
  #if G2_PWM_E
-    OUT_WRITE(MOTOR_CURRENT_PWM_E_PIN, 0);
+    #if PIN_EXISTS(MOTOR_CURRENT_PWM_E)
+      OUT_WRITE(MOTOR_CURRENT_PWM_E_PIN, LOW);
+    #endif
+    #if PIN_EXISTS(MOTOR_CURRENT_PWM_E0)
+      OUT_WRITE(MOTOR_CURRENT_PWM_E0_PIN, LOW);
+    #endif
  #endif

  #define WPKEY          (0x50574D << 8) // “PWM” in ASCII
@@ -26,10 +26,7 @@
 * PR #7500. It is hardwired for the PRINTRBOARD_G2 Motor Current needs.
 */

-#include "../../../inc/MarlinConfigPre.h"
-#include "../../../module/stepper.h"
-//C:\Users\bobku\Documents\GitHub\Marlin-Bob-2\Marlin\src\module\stepper.h
-//C:\Users\bobku\Documents\GitHub\Marlin-Bob-2\Marlin\src\HAL\HAL_DUE\G2_PWM.h
+#include <stdint.h>

 #define PWM_PERIOD_US  100  // base repetition rate in micro seconds

@@ -68,16 +68,15 @@
 * Usually the hardware SPI pins are only available to the LCD. This makes the DUE hard SPI used at the same time
 * as the TMC2130 soft SPI the most common setup.
 */
-#define _IS_HW_SPI(P) (defined(TMC_SPI_##P) && (TMC_SPI_##P == SD_MOSI_PIN || TMC_SPI_##P == SD_MISO_PIN || TMC_SPI_##P == SD_SCK_PIN))
-
 #if HAS_MEDIA && HAS_DRIVER(TMC2130)
-  #if ENABLED(TMC_USE_SW_SPI)
-    #if DISABLED(SOFTWARE_SPI) && (_IS_HW_SPI(MOSI) || _IS_HW_SPI(MISO) || _IS_HW_SPI(SCK))
-      #error "DUE hardware SPI is required but is incompatible with TMC2130 software SPI. Either disable TMC_USE_SW_SPI or use separate pins for the two SPIs."
-    #endif
-  #elif ENABLED(SOFTWARE_SPI)
+  #define _IS_HW_SPI(P) (defined(TMC_SPI_##P) && (TMC_SPI_##P == SD_MOSI_PIN || TMC_SPI_##P == SD_MISO_PIN || TMC_SPI_##P == SD_SCK_PIN))
+  #if DISABLED(SOFTWARE_SPI) && ENABLED(TMC_USE_SW_SPI) && (_IS_HW_SPI(MOSI) || _IS_HW_SPI(MISO) || _IS_HW_SPI(SCK))
+    #error "DUE hardware SPI is required but is incompatible with TMC2130 software SPI. Either disable TMC_USE_SW_SPI or use separate pins for the two SPIs."
+  #endif
+  #if ENABLED(SOFTWARE_SPI) && DISABLED(TMC_USE_SW_SPI)
    #error "DUE software SPI is required but is incompatible with TMC2130 hardware SPI. Enable TMC_USE_SW_SPI to fix."
  #endif
+  #undef _IS_HW_SPI
 #endif

 #if ENABLED(FAST_PWM_FAN) || SPINDLE_LASER_FREQUENCY
@@ -19,13 +19,26 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 *
 */
+#pragma once

 /**
- * Support routines for Due
- */
-
-/**
- * Translation of routines & variables used by pinsDebug.h
+ * Pins Debugging for DUE
+ *
+ *   - NUMBER_PINS_TOTAL
+ *   - MULTI_NAME_PAD
+ *   - getPinByIndex(index)
+ *   - printPinNameByIndex(index)
+ *   - getPinIsDigitalByIndex(index)
+ *   - digitalPinToAnalogIndex(pin)
+ *   - getValidPinMode(pin)
+ *   - isValidPin(pin)
+ *   - isAnalogPin(pin)
+ *   - digitalRead_mod(pin)
+ *   - pwm_status(pin)
+ *   - printPinPWM(pin)
+ *   - printPinPort(pin)
+ *   - printPinNumber(pin)
+ *   - printPinAnalog(pin)
 */

 #include "../shared/Marduino.h"
@@ -63,20 +76,20 @@

 #define NUMBER_PINS_TOTAL PINS_COUNT

-#define digitalRead_mod(p) extDigitalRead(p)  // AVR digitalRead disabled PWM before it read the 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) 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 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(P)); SERIAL_ECHO(buffer); }while(0)
+#define getPinByIndex(x) pin_array[x].pin
+#define getPinIsDigitalByIndex(x) pin_array[x].is_digital
+#define isValidPin(P) (P >= 0 && P < pin_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 pwm_status(P) (((g_pinStatus[P] & 0xF) == PIN_STATUS_PWM) && \
+                        ((g_APinDescription[P].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 GET_PINMODE(int8_t pin) {  // 1: output, 0: input
+bool getValidPinMode(const pin_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 +98,14 @@ bool GET_PINMODE(int8_t pin) {  // 1: output, 0: input
          || pwm_status(pin));
 }

-void pwm_details(int32_t pin) {
+void printPinPWM(const 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 print_port(const pin_t) {}
+void printPinPort(const pin_t) {}

 /**
 * DUE Board pin   |  PORT  | Label
@@ -24,41 +24,38 @@
 /**
 * Define SPI Pins: SCK, MISO, MOSI, SS
 *
- * Available chip select pins for HW SPI are 4 10 52 77
+ * Available chip select pins for HW SPI are 4 10 52 77 87
 */
-#if SDSS == 4 || SDSS == 10 || SDSS == 52 || SDSS == 77 || SDSS == 87
-  #if SDSS == 4
-    #define SPI_PIN         87
-    #define SPI_CHAN         1
-  #elif SDSS == 10
-    #define SPI_PIN         77
-    #define SPI_CHAN         0
-  #elif SDSS == 52
-    #define SPI_PIN         86
-    #define SPI_CHAN         2
-  #elif SDSS == 77
-    #define SPI_PIN         77
-    #define SPI_CHAN         0
-  #else
-    #define SPI_PIN         87
-    #define SPI_CHAN         1
-  #endif
-  #define SD_SCK_PIN        76
-  #define SD_MISO_PIN       74
-  #define SD_MOSI_PIN       75
-#else
-  // defaults
-  #define SOFTWARE_SPI
-  #ifndef SD_SCK_PIN
-    #define SD_SCK_PIN      52
-  #endif
-  #ifndef SD_MISO_PIN
-    #define SD_MISO_PIN     50
-  #endif
-  #ifndef SD_MOSI_PIN
-    #define SD_MOSI_PIN     51
-  #endif
+#if SD_SS_PIN == 4 || SD_SS_PIN == 10 || SD_SS_PIN == 52 || SD_SS_PIN == 77 || SD_SS_PIN == 87
+  #define SD_SCK_PIN      76
+  #define SD_MISO_PIN     74
+  #define SD_MOSI_PIN     75
 #endif

-/* A.28, A.29, B.21, C.26, C.29 */
-#define SD_SS_PIN         SDSS
+#if SD_SS_PIN == 4
+  #define SPI_PIN         87
+  #define SPI_CHAN         1
+#elif SD_SS_PIN == 10
+  #define SPI_PIN         77
+  #define SPI_CHAN         0
+#elif SD_SS_PIN == 52
+  #define SPI_PIN         86
+  #define SPI_CHAN         2
+#elif SD_SS_PIN == 77
+  #define SPI_PIN         77
+  #define SPI_CHAN         0
+#elif SD_SS_PIN == 87
+  #define SPI_PIN         87
+  #define SPI_CHAN         1
+#else
+  #define SOFTWARE_SPI
+  #ifndef SD_SCK_PIN
+    #define SD_SCK_PIN    52
+  #endif
+  #ifndef SD_MISO_PIN
+    #define SD_MISO_PIN   50
+  #endif
+  #ifndef SD_MOSI_PIN
+    #define SD_MOSI_PIN   51
+  #endif
+#endif
@@ -66,7 +66,7 @@

 #include <U8glib-HAL.h>

-#if ENABLED(FYSETC_MINI_12864)
+#if U8G_SPI_USE_MODE_3
  #define SPISEND_SW_DUE u8g_spiSend_sw_DUE_mode_3
 #else
  #define SPISEND_SW_DUE u8g_spiSend_sw_DUE_mode_0
@@ -96,15 +96,15 @@ uint8_t u8g_com_HAL_DUE_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void
      break;

    case U8G_COM_MSG_CHIP_SELECT:
-      #if ENABLED(FYSETC_MINI_12864)           // LCD SPI is running mode 3 while SD card is running mode 0
-        if (arg_val) {                        //   SCK idle state needs to be set to the proper idle state before
-                                               //   the next chip select goes active
-          u8g_SetPILevel_DUE(u8g, U8G_PI_SCK, 1);  //set SCK to mode 3 idle state before CS goes active
+      #if U8G_SPI_USE_MODE_3                        // LCD SPI is running mode 3 while SD card is running mode 0
+        if (arg_val) {                              // SCK idle state needs to be set to the proper idle state before
+                                                    //  the next chip select goes active
+          u8g_SetPILevel_DUE(u8g, U8G_PI_SCK, 1);   // Set SCK to mode 3 idle state before CS goes active
          u8g_SetPILevel_DUE(u8g, U8G_PI_CS, LOW);
        }
        else {
          u8g_SetPILevel_DUE(u8g, U8G_PI_CS, HIGH);
-          u8g_SetPILevel_DUE(u8g, U8G_PI_SCK, 0); //set SCK to mode 0 idle state after CS goes inactive
+          u8g_SetPILevel_DUE(u8g, U8G_PI_SCK, 0);   // Set SCK to mode 0 idle state after CS goes inactive
        }
      #else
        u8g_SetPILevel_DUE(u8g, U8G_PI_CS, !arg_val);
@@ -11,7 +11,7 @@ if pioutil.is_pio_build():

    if current_OS == 'Windows':

-        Import("env")
+        env = pioutil.env

        # Use bossac.exe on Windows
        env.Replace(
@@ -63,8 +63,8 @@
 #include "compiler.h"
 #include "preprocessor.h"
 #ifdef FREERTOS_USED
-#include "FreeRTOS.h"
-#include "semphr.h"
+#include <FreeRTOS.h>
+#include <semphr.h>
 #endif
 #include "ctrl_access.h"

@@ -18,30 +18,29 @@ extern "C" {
 void sd_mmc_spi_mem_init() {
 }

-Ctrl_status sd_mmc_spi_test_unit_ready() {
-  #ifdef DISABLE_DUE_SD_MMC
-    return CTRL_NO_PRESENT;
-  #endif
-  if (!IS_SD_INSERTED() || IS_SD_PRINTING() || IS_SD_FILE_OPEN() || !card.isMounted())
-    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 (!IS_SD_INSERTED() || IS_SD_PRINTING() || IS_SD_FILE_OPEN() || !card.isMounted())
-    return CTRL_NO_PRESENT;
-  *nb_sector = card.diskIODriver()->cardSize() - 1;
-  return CTRL_GOOD;
+inline bool media_ready() {
+  return card.isMounted() && card.isInserted() && !card.isFileOpen() && !card.isStillPrinting();
 }

 bool sd_mmc_spi_unload(bool) { return true; }

 bool sd_mmc_spi_wr_protect() { return false; }

-bool sd_mmc_spi_removal() {
-  return (!IS_SD_INSERTED() || IS_SD_PRINTING() || IS_SD_FILE_OPEN() || !card.isMounted());
+bool sd_mmc_spi_removal() { return !media_ready(); }
+
+Ctrl_status sd_mmc_spi_test_unit_ready() {
+  #if ENABLED(DISABLE_DUE_SD_MMC)
+    return CTRL_NO_PRESENT;
+  #endif
+  return sd_mmc_spi_removal() ? CTRL_NO_PRESENT : 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;
+  *nb_sector = card.diskIODriver()->cardSize() - 1;
+  return CTRL_GOOD;
 }

 #if ACCESS_USB == true
@@ -58,11 +57,11 @@ uint8_t sector_buf[SD_MMC_BLOCK_SIZE];
 // #define DEBUG_MMC

 Ctrl_status sd_mmc_spi_usb_read_10(uint32_t addr, uint16_t nb_sector) {
-  #ifdef DISABLE_DUE_SD_MMC
+  #if ENABLED(DISABLE_DUE_SD_MMC)
    return CTRL_NO_PRESENT;
  #endif
-  if (!IS_SD_INSERTED() || IS_SD_PRINTING() || IS_SD_FILE_OPEN() || !card.isMounted())
-    return CTRL_NO_PRESENT;
+
+  if (sd_mmc_spi_removal()) return CTRL_NO_PRESENT;

  #ifdef DEBUG_MMC
  {
@@ -98,11 +97,11 @@ Ctrl_status sd_mmc_spi_usb_read_10(uint32_t addr, uint16_t nb_sector) {
 }

 Ctrl_status sd_mmc_spi_usb_write_10(uint32_t addr, uint16_t nb_sector) {
-  #ifdef DISABLE_DUE_SD_MMC
+  #if ENABLED(DISABLE_DUE_SD_MMC)
    return CTRL_NO_PRESENT;
  #endif
-  if (!IS_SD_INSERTED() || IS_SD_PRINTING() || IS_SD_FILE_OPEN() || !card.isMounted())
-    return CTRL_NO_PRESENT;
+
+  if (sd_mmc_spi_removal()) return CTRL_NO_PRESENT;

  #ifdef DEBUG_MMC
  {
@@ -74,7 +74,7 @@
 //!
 //! @brief This function initializes the hw/sw resources required to drive the SD_MMC_SPI.
 //!/
-extern void           sd_mmc_spi_mem_init(void);
+void sd_mmc_spi_mem_init();

 //!
 //! @brief This function tests the state of the SD_MMC memory and sends it to the Host.
@@ -87,7 +87,7 @@ extern void           sd_mmc_spi_mem_init(void);
 //!   Media not present    ->    CTRL_NO_PRESENT
 //!   Media has changed    ->    CTRL_BUSY
 //!/
-extern Ctrl_status    sd_mmc_spi_test_unit_ready(void);
+Ctrl_status sd_mmc_spi_test_unit_ready();

 //!
 //! @brief This function gives the address of the last valid sector.
@@ -98,7 +98,7 @@ extern Ctrl_status    sd_mmc_spi_test_unit_ready(void);
 //!   Media ready          ->  CTRL_GOOD
 //!   Media not present    ->  CTRL_NO_PRESENT
 //!/
-extern Ctrl_status    sd_mmc_spi_read_capacity(uint32_t *nb_sector);
+Ctrl_status sd_mmc_spi_read_capacity(uint32_t *nb_sector);

 /*! \brief Unload/Load the SD/MMC card selected
 *
@@ -109,7 +109,7 @@ extern Ctrl_status    sd_mmc_spi_read_capacity(uint32_t *nb_sector);
 *
 * \return \c true if unload/load done success.
 */
-extern bool sd_mmc_spi_unload(bool unload);
+bool sd_mmc_spi_unload(bool unload);

 //!
 //! @brief This function returns the write protected status of the memory.
@@ -120,14 +120,14 @@ extern bool sd_mmc_spi_unload(bool unload);
 //!
 //! @return false  -> the memory is not write-protected (always)
 //!/
-extern bool           sd_mmc_spi_wr_protect(void);
+bool sd_mmc_spi_wr_protect();

 //!
 //! @brief This function tells if the memory has been removed or not.
 //!
 //! @return false  -> The memory isn't removed
 //!
-extern bool           sd_mmc_spi_removal(void);
+bool sd_mmc_spi_removal();

 //---- ACCESS DATA FUNCTIONS ----

@@ -147,7 +147,7 @@ extern bool           sd_mmc_spi_removal(void);
 //!   It is ready    ->    CTRL_GOOD
 //!   A error occur  ->    CTRL_FAIL
 //!
-extern Ctrl_status    sd_mmc_spi_usb_read_10(uint32_t addr, uint16_t nb_sector);
+Ctrl_status sd_mmc_spi_usb_read_10(uint32_t addr, uint16_t nb_sector);

 //! This function initializes the SD/MMC memory for a write operation
 //!
@@ -161,7 +161,7 @@ extern Ctrl_status    sd_mmc_spi_usb_read_10(uint32_t addr, uint16_t nb_sector);
 //!   It is ready    ->    CTRL_GOOD
 //!   An error occurs  ->    CTRL_FAIL
 //!
-extern Ctrl_status    sd_mmc_spi_usb_write_10(uint32_t addr, uint16_t nb_sector);
+Ctrl_status sd_mmc_spi_usb_write_10(uint32_t addr, uint16_t nb_sector);

 #endif // #if ACCESS_USB == true

@@ -34,13 +34,13 @@

 #if ENABLED(WIFISUPPORT)
  #include <ESPAsyncWebServer.h>
-  #include "wifi.h"
+  #include "wifi/wifi.h"
  #if ENABLED(OTASUPPORT)
-    #include "ota.h"
+    #include "wifi/ota.h"
  #endif
  #if ENABLED(WEBSUPPORT)
-    #include "spiffs.h"
-    #include "web.h"
+    #include "wifi/spiffs.h"
+    #include "wifi/web.h"
  #endif
 #endif

@@ -175,8 +175,6 @@ uint8_t MarlinHAL::get_reset_source() { return rtc_get_reset_reason(1); }

 void MarlinHAL::reboot() { ESP.restart(); }

-void _delay_ms(const int ms) { delay(ms); }
-
 // return free memory between end of heap (or end bss) and whatever is current
 int MarlinHAL::freeMemory() { return ESP.getFreeHeap(); }

@@ -209,16 +207,17 @@ int MarlinHAL::freeMemory() { return ESP.getFreeHeap(); }
 // ADC
 // ------------------------

-#define ADC1_CHANNEL(pin) ADC1_GPIO ## pin ## _CHANNEL
-
+// https://docs.espressif.com/projects/esp-idf/en/release-v4.4/esp32/api-reference/peripherals/adc.html
 adc1_channel_t get_channel(int pin) {
  switch (pin) {
-    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);
+    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;
  }
  return ADC1_CHANNEL_MAX;
 }
@@ -37,11 +37,11 @@
 #include "i2s.h"

 #if ENABLED(WIFISUPPORT)
-  #include "WebSocketSerial.h"
+  #include "wifi/WebSocketSerial.h"
 #endif

 #if ENABLED(ESP3D_WIFISUPPORT)
-  #include "esp3dlib.h"
+  #include <esp3dlib.h>
 #endif

 #include "FlushableHardwareSerial.h"
@@ -165,8 +165,6 @@ int freeMemory();

 #pragma GCC diagnostic pop

-void _delay_ms(const int ms);
-
 // ------------------------
 // MarlinHAL Class
 // ------------------------
@@ -194,7 +192,7 @@ public:
  static void isr_on()  { if (spinlock.owner != portMUX_FREE_VAL) portEXIT_CRITICAL(&spinlock); }
  static void isr_off() { portENTER_CRITICAL(&spinlock); }

-  static void delay_ms(const int ms) { _delay_ms(ms); }
+  static void delay_ms(const int ms) { delay(ms); }

  // Tasks, called from idle()
  static void idletask();
@@ -59,6 +59,7 @@ void setup_endstop_interrupts() {
  TERN_(USE_Z4_MAX,      _ATTACH(Z4_MAX_PIN));
  TERN_(USE_Z4_MIN,      _ATTACH(Z4_MIN_PIN));
  TERN_(USE_Z_MIN_PROBE, _ATTACH(Z_MIN_PROBE_PIN));
+  TERN_(USE_CALIBRATION, _ATTACH(CALIBRATION_PIN));
  TERN_(USE_I_MAX,       _ATTACH(I_MAX_PIN));
  TERN_(USE_I_MIN,       _ATTACH(I_MIN_PIN));
  TERN_(USE_J_MAX,       _ATTACH(J_MAX_PIN));
@@ -37,6 +37,10 @@
 // Set pin as output
 #define _SET_OUTPUT(IO)         pinMode(IO, OUTPUT)

+// TODO: Store set modes in an array and use those to get the mode
+#define _IS_OUTPUT(IO)           true
+#define _IS_INPUT(IO)            true
+
 // Set pin as input with pullup mode
 #define _PULLUP(IO, v)          pinMode(IO, v ? INPUT_PULLUP : INPUT)

@@ -70,6 +74,9 @@
 // Set pin as output and init
 #define OUT_WRITE(IO,V)         do{ _SET_OUTPUT(IO); WRITE(IO,V); }while(0)

+#define IS_OUTPUT(IO)            _IS_OUTPUT(IO)
+#define IS_INPUT(IO)             _IS_INPUT(IO)
+
 // digitalRead/Write wrappers
 #define extDigitalRead(IO)      digitalRead(IO)
 #define extDigitalWrite(IO,V)   digitalWrite(IO,V)
@@ -145,14 +145,14 @@ static void IRAM_ATTR i2s_intr_handler_default(void *arg) {
 void stepperTask(void *parameter) {
  uint32_t nextMainISR = 0;
  #if ENABLED(LIN_ADVANCE)
-    uint32_t nextAdvanceISR = Stepper::LA_ADV_NEVER;
+    uint32_t nextAdvanceISR = stepper.LA_ADV_NEVER;
  #endif

  for (;;) {
    xQueueReceive(dma.queue, &dma.current, portMAX_DELAY);
    dma.rw_pos = 0;

-    const bool using_ftMotion = TERN0(FT_MOTION, ftMotion.cfg.mode);
+    const bool using_ftMotion = TERN0(FT_MOTION, ftMotion.cfg.active);

    while (dma.rw_pos < DMA_SAMPLE_COUNT) {

@@ -167,13 +167,13 @@ void stepperTask(void *parameter) {

      if (!using_ftMotion) {
        if (!nextMainISR) {
-          Stepper::pulse_phase_isr();
-          nextMainISR = Stepper::block_phase_isr();
+          stepper.pulse_phase_isr();
+          nextMainISR = stepper.block_phase_isr();
        }
        #if ENABLED(LIN_ADVANCE)
          else if (!nextAdvanceISR) {
-            Stepper::advance_isr();
-            nextAdvanceISR = Stepper::la_interval;
+            stepper.advance_isr();
+            nextAdvanceISR = stepper.la_interval;
          }
        #endif
        else
@@ -182,10 +182,10 @@ void stepperTask(void *parameter) {
        nextMainISR--;

        #if ENABLED(LIN_ADVANCE)
-          if (nextAdvanceISR == Stepper::LA_ADV_NEVER)
-            nextAdvanceISR = Stepper::la_interval;
+          if (nextAdvanceISR == stepper.LA_ADV_NEVER)
+            nextAdvanceISR = stepper.la_interval;

-          if (nextAdvanceISR && nextAdvanceISR != Stepper::LA_ADV_NEVER)
+          if (nextAdvanceISR && nextAdvanceISR != stepper.LA_ADV_NEVER)
            nextAdvanceISR--;
        #endif
      }
@@ -0,0 +1,71 @@
+/**
+ * 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
+
+#error "PINS_DEBUGGING is not yet supported for ESP32!"
+
+/**
+ * Pins Debugging for ESP32
+ *
+ *   - NUMBER_PINS_TOTAL
+ *   - MULTI_NAME_PAD
+ *   - getPinByIndex(index)
+ *   - printPinNameByIndex(index)
+ *   - getPinIsDigitalByIndex(index)
+ *   - digitalPinToAnalogIndex(pin)
+ *   - getValidPinMode(pin)
+ *   - isValidPin(pin)
+ *   - isAnalogPin(pin)
+ *   - digitalRead_mod(pin)
+ *   - pwm_status(pin)
+ *   - printPinPWM(pin)
+ *   - printPinPort(pin)
+ *   - printPinNumber(pin)
+ *   - printPinAnalog(pin)
+ */
+
+#define NUMBER_PINS_TOTAL NUM_DIGITAL_PINS
+#define MULTI_NAME_PAD 16 // space needed to be pretty if not first name assigned to a pin
+
+#define digitalRead_mod(P) extDigitalRead(P)
+#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(P)); SERIAL_ECHO(buffer); }while(0)
+#define getPinByIndex(x) pin_array[x].pin
+#define getPinIsDigitalByIndex(x) pin_array[x].is_digital
+#define isValidPin(P) (P >= 0 && P < pin_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)))
+bool pwm_status(const pin_t) { return false; }
+
+void printPinPort(const pin_t) {}
+
+static bool getValidPinMode(const pin_t pin) {
+  return isValidPin(pin) && !IS_INPUT(pin);
+}
+
+void printPinPWM(const int32_t pin) {
+  if (pwm_status(pin)) {
+    //uint32_t chan = g_APinDescription[pin].ulPWMChannel TODO when fast pwm is operative;
+    //SERIAL_ECHOPGM("PWM = ", duty);
+  }
+}
@@ -21,7 +21,16 @@
 */
 #pragma once

-#define SD_SS_PIN   SDSS
-#define SD_SCK_PIN  18
-#define SD_MISO_PIN 19
-#define SD_MOSI_PIN 23
+#define PIN_SPI_SCK  18
+#define PIN_SPI_MISO 19
+#define PIN_SPI_MOSI 23
+
+#ifndef SD_SCK_PIN
+  #define SD_SCK_PIN  PIN_SPI_SCK
+#endif
+#ifndef SD_MISO_PIN
+  #define SD_MISO_PIN PIN_SPI_MISO
+#endif
+#ifndef SD_MOSI_PIN
+  #define SD_MOSI_PIN PIN_SPI_MOSI
+#endif
@@ -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 = true;
+  config.auto_reload = TIMER_AUTORELOAD_EN;

  // Select and initialize the timer
  timer_init(timer.group, timer.idx, &config);
@@ -53,12 +53,11 @@ 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

@@ -35,7 +35,7 @@
 #if HAS_MEDIA
  #include "../../sd/cardreader.h"
  #if ENABLED(ESP3D_WIFISUPPORT)
-    #include "sd_ESP32.h"
+    #include <sd_ESP32.h>
  #endif
 #endif

@@ -21,7 +21,7 @@
 */
 #ifdef ARDUINO_ARCH_ESP32

-#include "../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"

 #if ENABLED(WIFISUPPORT)

@@ -21,8 +21,8 @@
 */
 #pragma once

-#include "../../inc/MarlinConfig.h"
-#include "../../core/serial_hook.h"
+#include "../../../inc/MarlinConfig.h"
+#include "../../../core/serial_hook.h"

 #include <Stream.h>

@@ -22,11 +22,15 @@

 #ifdef ARDUINO_ARCH_ESP32

-#include "../../inc/MarlinConfigPre.h"
+#include <WiFi.h>
+
+#undef ENABLED
+#undef DISABLED
+
+#include "../../../inc/MarlinConfigPre.h"

 #if ALL(WIFISUPPORT, OTASUPPORT)

-#include <WiFi.h>
 #include <ESPmDNS.h>
 #include <WiFiUdp.h>
 #include <ArduinoOTA.h>
@@ -21,11 +21,11 @@
 */
 #ifdef ARDUINO_ARCH_ESP32

-#include "../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"

 #if ALL(WIFISUPPORT, WEBSUPPORT)

-#include "../../core/serial.h"
+#include "../../../core/serial.h"

 #include <FS.h>
 #include <SPIFFS.h>
@@ -21,11 +21,11 @@
 */
 #ifdef ARDUINO_ARCH_ESP32

-#include "../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"

 #if ALL(WIFISUPPORT, WEBSUPPORT)

-#include "../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"

 #undef DISABLED  // esp32-hal-gpio.h
 #include <SPIFFS.h>
@@ -21,11 +21,12 @@
 */
 #ifdef ARDUINO_ARCH_ESP32

-#include "../../core/serial.h"
-#include "../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"

 #if ENABLED(WIFISUPPORT)

+#include "../../../core/serial.h"
+
 #include <WiFi.h>
 #include <ESPmDNS.h>
 #include <ESPAsyncWebServer.h>
@@ -0,0 +1,120 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2025 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/>.
+ *
+ */
+
+#include "../platforms.h"
+
+#ifdef ARDUINO_ARCH_MFL
+
+#include "../../inc/MarlinConfig.h"
+#include "../shared/Delay.h"
+
+uint16_t MarlinHAL::adc_result;
+
+#if ENABLED(POSTMORTEM_DEBUGGING)
+  extern void install_min_serial();
+#endif
+
+#if ENABLED(MARLIN_DEV_MODE)
+  // Dump the clock frequencies of the system, AHB, APB1, APB2, and F_CPU.
+  static inline void HAL_clock_frequencies_dump() {
+    auto& rcuInstance = rcu::RCU::get_instance();
+    uint32_t freq = rcuInstance.get_clock_frequency(rcu::Clock_Frequency::CK_SYS);
+    SERIAL_ECHOPGM("\nSYSTEM_CLOCK=", freq);
+    freq = rcuInstance.get_clock_frequency(rcu::Clock_Frequency::CK_AHB);
+    SERIAL_ECHOPGM("\nABH_CLOCK=", freq);
+    freq = rcuInstance.get_clock_frequency(rcu::Clock_Frequency::CK_APB1);
+    SERIAL_ECHOPGM("\nAPB1_CLOCK=", freq);
+    freq = rcuInstance.get_clock_frequency(rcu::Clock_Frequency::CK_APB2);
+    SERIAL_ECHOPGM("\nAPB2_CLOCK=", freq,
+    "\nF_CPU=", F_CPU);
+    // Done
+    SERIAL_ECHOPGM("\n--\n");
+  }
+#endif  // MARLIN_DEV_MODE
+
+// Initializes the Marlin HAL
+void MarlinHAL::init() {
+  constexpr unsigned int cpuFreq = F_CPU;
+  UNUSED(cpuFreq);
+
+#if PIN_EXISTS(LED)
+  OUT_WRITE(LED_PIN, LOW);
+#endif
+
+  SetTimerInterruptPriorities();
+
+  // Print clock frequencies to host serial
+  TERN_(MARLIN_DEV_MODE, HAL_clock_frequencies_dump());
+
+  // Register min serial
+  TERN_(POSTMORTEM_DEBUGGING, install_min_serial());
+}
+
+// Returns the reset source based on the flags set in the RCU module
+uint8_t MarlinHAL::get_reset_source() {
+  return
+    (RCU_I.get_flag(rcu::Status_Flags::FLAG_FWDGTRST)) ? RST_WATCHDOG :
+    (RCU_I.get_flag(rcu::Status_Flags::FLAG_SWRST)) ? RST_SOFTWARE :
+    (RCU_I.get_flag(rcu::Status_Flags::FLAG_EPRST)) ? RST_EXTERNAL :
+    (RCU_I.get_flag(rcu::Status_Flags::FLAG_PORRST)) ? RST_POWER_ON :
+    (RCU_I.get_flag(rcu::Status_Flags::FLAG_LPRST)) ? RST_BROWN_OUT :
+    0;
+}
+
+// Returns the amount of free memory available in bytes
+int MarlinHAL::freeMemory() {
+  volatile char top;
+  return &top - reinterpret_cast<char*>(_sbrk(0));
+}
+
+// Watchdog Timer
+#if ENABLED(USE_WATCHDOG)
+  #define WDT_TIMEOUT_US  TERN(WATCHDOG_DURATION_8S, 8000000, 4000000)  // 4 or 8 second timeout
+
+  #include <FWatchdogTimer.h>
+
+  FWatchdogTimer& watchdogTimer = FWatchdogTimer::get_instance();
+
+  // Initializes the watchdog timer
+  void MarlinHAL::watchdog_init() {
+    IF_DISABLED(DISABLE_WATCHDOG_INIT, watchdogTimer.begin(WDT_TIMEOUT_US));
+  }
+
+  // Refreshes the watchdog timer to prevent system reset
+  void MarlinHAL::watchdog_refresh() {
+    watchdogTimer.reload();
+    #if DISABLED(PINS_DEBUGGING) && PIN_EXISTS(LED)
+      TOGGLE(LED_PIN);  // Heartbeat indicator
+    #endif
+  }
+#endif
+
+extern "C" {
+  extern unsigned int _ebss;  // End of bss section
+}
+
+// Resets the system to initiate a firmware flash.
+WEAK void flashFirmware(const int16_t) {
+  hal.reboot();
+}
+
+#endif // ARDUINO_ARCH_MFL
@@ -0,0 +1,160 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2025 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
+
+#define CPU_32_BIT
+
+#include "../../core/macros.h"
+#include "../shared/Marduino.h"
+#include "../shared/math_32bit.h"
+#include "../shared/HAL_SPI.h"
+
+#include "temp_soc.h"
+#include "fastio.h"
+#include "Servo.h"
+
+#include "../../inc/MarlinConfigPre.h"
+
+#include <stdint.h>
+#include <GPIO.hpp>
+#include <AFIO.hpp>
+
+// Default graphical display delays
+#define CPU_ST7920_DELAY_1 300
+#define CPU_ST7920_DELAY_2  40
+#define CPU_ST7920_DELAY_3 340
+
+// Serial Ports
+#include "MarlinSerial.h"
+
+// Interrupts
+#define CRITICAL_SECTION_START()  const bool irqon = !__get_PRIMASK(); __disable_irq()
+#define CRITICAL_SECTION_END()    if (irqon) __enable_irq()
+
+#define cli() __disable_irq()
+#define sei() __enable_irq()
+
+// Alias of __bss_end__
+#define __bss_end __bss_end__
+
+// Types
+typedef double isr_float_t; // FPU ops are used for single-precision, so use double for ISRs.
+typedef uint8_t pin_t;      // Parity with mfl platform
+
+// Servo
+class libServo;
+typedef libServo hal_servo_t;
+#define PAUSE_SERVO_OUTPUT()  libServo::pause_all_servos()
+#define RESUME_SERVO_OUTPUT() libServo::resume_all_servos()
+
+// Debugging
+#define JTAG_DISABLE()    AFIO_I.set_remap(gpio::Pin_Remap_Select::SWJ_DP_ONLY_REMAP)
+#define JTAGSWD_DISABLE() AFIO_I.set_remap(gpio::Pin_Remap_Select::SWJ_ALL_DISABLED_REMAP)
+#define JTAGSWD_RESET()   AFIO_I.set_remap(gpio::Pin_Remap_Select::FULL_SWJ_REMAP)
+
+// ADC
+#ifdef ADC_RESOLUTION
+  #define HAL_ADC_RESOLUTION  ADC_RESOLUTION
+#else
+  #define HAL_ADC_RESOLUTION  12
+#endif
+
+#define HAL_ADC_VREF_MV   3300
+
+// Disable Marlin's software oversampling.
+// The MFL framework uses 16x hardware oversampling by default
+#ifdef GD32F303RE
+  #define HAL_ADC_FILTERED
+#endif
+
+#define GET_PIN_MAP_PIN(index)        index
+#define GET_PIN_MAP_INDEX(pin)        pin
+#define PARSED_PIN_INDEX(code, dval)  parser.intval(code, dval)
+
+#ifndef PLATFORM_M997_SUPPORT
+  #define PLATFORM_M997_SUPPORT
+#endif
+
+void flashFirmware(const int16_t);
+
+#define HAL_CAN_SET_PWM_FREQ    // This HAL supports PWM Frequency adjustment
+
+extern "C" char* _sbrk(int incr);
+extern "C" char* dtostrf(double val, signed char width, unsigned char prec, char* sout);
+
+// MarlinHAL Class
+class MarlinHAL {
+public:
+  // Before setup()
+  MarlinHAL() {}
+
+  // Watchdog
+  static void watchdog_init()    IF_DISABLED(USE_WATCHDOG, {});
+  static void watchdog_refresh() IF_DISABLED(USE_WATCHDOG, {});
+
+  static void init();                             // called early in setup()
+  static void init_board() {}                     // called less early in setup()
+  static void reboot() { NVIC_SystemReset(); }    // restart the firmware from 0x0
+
+  // Interrupts
+  static bool isr_state() { return !__get_PRIMASK(); }
+  static void isr_on() { sei(); }
+  static void isr_off() { cli(); }
+  static void delay_ms(const int ms) { delay(ms); }
+
+  // Tasks called from idle()
+  static void idletask() {}
+
+  // Reset
+  static uint8_t get_reset_source();
+  static void clear_reset_source() { RCU_I.clear_all_reset_flags(); }
+
+  // Free SRAM
+  static int freeMemory();
+
+  // ADC methods
+  static uint16_t adc_result;
+
+  // Called by Temperature::init once at startup
+  static void adc_init() { analogReadResolution(HAL_ADC_RESOLUTION); }
+
+  // Called by Temperature::init for each sensor at startup
+  static void adc_enable(const pin_t pin) { pinMode(pin, INPUT); }
+
+  // Called from Temperature::isr to start ADC sampling on the given pin
+  static void adc_start(const pin_t pin) { adc_result = static_cast<uint16_t>(analogRead(pin)); }
+
+  // Check if ADC is ready for reading
+  static bool adc_ready() { return true; }
+
+  // Current value of the ADC register
+  static uint16_t adc_value() { return adc_result; }
+
+  // Set the PWM duty cycle for the pin to the given value.
+  // Optionally invert the duty cycle [default = false]
+  // Optionally change the maximum size of the provided value to enable finer PWM duty control [default = 255]
+  static void set_pwm_duty(const pin_t pin, const uint16_t value, const uint16_t scale = 255U, const bool invert = false);
+
+  // Set the frequency of the timer for the given pin.
+  // All Timer PWM pins run at the same frequency.
+  static void set_pwm_frequency(const pin_t pin, const uint16_t f_desired);
+};
@@ -0,0 +1,26 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2025 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
+
+#include <SPI.h>
+
+using MarlinSPI = SPIClass;
@@ -0,0 +1,97 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2025 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/>.
+ *
+ */
+
+#include "../platforms.h"
+
+#ifdef ARDUINO_ARCH_MFL
+
+#include "../../inc/MarlinConfig.h"
+#include "MarlinSerial.h"
+
+#if ENABLED(EMERGENCY_PARSER)
+  #include "../../feature/e_parser.h"
+#endif
+
+using namespace arduino;
+
+MarlinSerial& MarlinSerial::get_instance(usart::USART_Base Base, pin_size_t rxPin, pin_size_t txPin) {
+  UsartSerial& serial = UsartSerial::get_instance(Base, rxPin, txPin);
+  return *reinterpret_cast<MarlinSerial*>(&serial);
+}
+
+#if USING_HW_SERIAL0
+  MSerialT MSerial0(true, MarlinSerial::get_instance(usart::USART_Base::USART0_BASE, NO_PIN, NO_PIN));
+#endif
+#if USING_HW_SERIAL1
+  MSerialT MSerial1(true, MarlinSerial::get_instance(usart::USART_Base::USART1_BASE, NO_PIN, NO_PIN));
+#endif
+#if USING_HW_SERIAL2
+  MSerialT MSerial2(true, MarlinSerial::get_instance(usart::USART_Base::USART2_BASE, NO_PIN, NO_PIN));
+#endif
+#if USING_HW_SERIAL3
+  MSerialT MSerial3(true, MarlinSerial::get_instance(usart::USART_Base::UART3_BASE, NO_PIN, NO_PIN));
+#endif
+#if USING_HW_SERIAL4
+  MSerialT MSerial4(true, MarlinSerial::get_instance(usart::USART_Base::UART4_BASE, NO_PIN, NO_PIN));
+#endif
+
+#if ENABLED(EMERGENCY_PARSER)
+  // This callback needs to access the specific MarlinSerial instance
+  // We'll use a static pointer to track the current instance
+  static MarlinSerial* current_serial_instance = nullptr;
+
+  static void emergency_callback() {
+    if (!current_serial_instance) return;
+    const uint8_t last_data = current_serial_instance->get_last_data();
+    emergency_parser.update(current_serial_instance->emergency_state, last_data);
+  }
+
+  void MarlinSerial::register_emergency_callback(void (*callback)()) {
+    usart_.register_interrupt_callback(usart::Interrupt_Type::INTR_RBNEIE, callback);
+  }
+#endif
+
+void MarlinSerial::begin(unsigned long baudrate, uint16_t config) {
+  UsartSerial::begin(baudrate, config, ENABLED(SERIAL_DMA));
+  #if ENABLED(EMERGENCY_PARSER) && DISABLED(SERIAL_DMA)
+    current_serial_instance = this;
+    register_emergency_callback(emergency_callback);
+  #endif
+}
+
+void MarlinSerial::updateRxDmaBuffer() {
+  #if ENABLED(EMERGENCY_PARSER)
+    // Get the number of bytes available in the receive buffer
+    const size_t available_bytes = usart_.available_for_read(true);
+
+    // Process only the available data
+    for (size_t i = 0; i < available_bytes; ++i) {
+      uint8_t data;
+      if (usart_.read_rx_buffer(data))
+        emergency_parser.update(emergency_state, data);
+    }
+  #endif
+  // Call the base class implementation to handle any additional updates
+  UsartSerial::updateRxDmaBuffer();
+}
+
+#endif // ARDUINO_ARCH_MFL
@@ -0,0 +1,75 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2025 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
+
+#include "../../inc/MarlinConfigPre.h"
+
+#if ENABLED(EMERGENCY_PARSER)
+  #include "../../feature/e_parser.h"
+#endif
+
+#include <UsartSerial.hpp>
+
+#include "../../core/serial_hook.h"
+
+#define SERIAL_INDEX_MIN 0
+#define SERIAL_INDEX_MAX 4
+
+#include "../shared/serial_ports.h"
+
+#if defined(LCD_SERIAL_PORT) && ANY(HAS_DGUS_LCD, EXTENSIBLE_UI)
+  #define LCD_SERIAL_TX_BUFFER_FREE() LCD_SERIAL.availableForWrite()
+#endif
+
+using namespace arduino;
+
+struct MarlinSerial : public UsartSerial {
+  static MarlinSerial& get_instance(usart::USART_Base Base, pin_size_t rxPin = NO_PIN, pin_size_t txPin = NO_PIN);
+
+  void begin(unsigned long baudrate, uint16_t config);
+  inline void begin(unsigned long baudrate) { begin(baudrate, SERIAL_8N1); }
+  void updateRxDmaBuffer();
+
+  #if DISABLED(SERIAL_DMA)
+    FORCE_INLINE static uint8_t buffer_overruns() { return 0; }
+  #endif
+
+  #if ENABLED(EMERGENCY_PARSER)
+    EmergencyParser::State emergency_state;
+
+    // Accessor method to get the last received byte
+    uint8_t get_last_data() { return usart_.get_last_data(); }
+
+    // Register the emergency callback
+    void register_emergency_callback(void (*callback)());
+  #endif
+
+protected:
+  using UsartSerial::UsartSerial;
+};
+
+typedef Serial1Class<MarlinSerial> MSerialT;
+extern MSerialT MSerial0;
+extern MSerialT MSerial1;
+extern MSerialT MSerial2;
+extern MSerialT MSerial3;
+extern MSerialT MSerial4;
@@ -0,0 +1,163 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2025 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/>.
+ *
+ */
+#include "../platforms.h"
+
+#ifdef ARDUINO_ARCH_MFL
+
+#include "../../inc/MarlinConfigPre.h"
+
+#if ENABLED(POSTMORTEM_DEBUGGING)
+#include "../shared/MinSerial.h"
+
+// Base addresses for USART peripherals
+static constexpr uintptr_t USART_base[] = {
+  0x40013800, // USART0
+  0x40004400, // USART1
+  0x40004800, // USART2
+  0x40004C00, // UART3
+  0x40005000  // UART4
+};
+
+// Register offsets
+static constexpr uint32_t STAT0_OFFSET = 0x00U;
+static constexpr uint32_t DATA_OFFSET = 0x04U;
+static constexpr uint32_t BAUD_OFFSET = 0x08U;
+static constexpr uint32_t CTL0_OFFSET = 0x0CU;
+static constexpr uint32_t CTL1_OFFSET = 0x14U;
+
+// Bit positions
+static constexpr uint32_t TBE_BIT = 7;
+static constexpr uint32_t TEN_BIT = 3;
+static constexpr uint32_t UEN_BIT = 13;
+
+// NVIC interrupt numbers for USART
+static constexpr int nvicUART[] = { 37, 38, 39, 52, 53 };
+
+// RCU PCLK values for USART
+static constexpr rcu::RCU_PCLK clockRegs[] = {
+  rcu::RCU_PCLK::PCLK_USART0,
+  rcu::RCU_PCLK::PCLK_USART1,
+  rcu::RCU_PCLK::PCLK_USART2,
+  rcu::RCU_PCLK::PCLK_UART3,
+  rcu::RCU_PCLK::PCLK_UART4
+};
+
+// Memory barrier instructions
+#define isb() __asm__ __volatile__ ("isb" : : : "memory")
+#define dsb() __asm__ __volatile__ ("dsb" : : : "memory")
+#define sw_barrier() __asm__ volatile("" : : : "memory")
+
+// Direct register access macros
+#define USART_REG(offset) (*(volatile uint32_t*)(USART_base[SERIAL_PORT] + (offset)))
+#define USART_STAT0 USART_REG(STAT0_OFFSET)
+#define USART_DATA  USART_REG(DATA_OFFSET)
+#define USART_BAUD  USART_REG(BAUD_OFFSET)
+#define USART_CTL0  USART_REG(CTL0_OFFSET)
+#define USART_CTL1  USART_REG(CTL1_OFFSET)
+
+// Bit manipulation macros
+#define READ_BIT(reg, bit) (((reg) >> (bit)) & 1U)
+#define SET_BIT(reg, bit) ((reg) |= (1U << (bit)))
+#define CLEAR_BIT(reg, bit) ((reg) &= ~(1U << (bit)))
+
+// Initializes the MinSerial interface.
+// This function sets up the USART interface for serial communication.
+// If the selected serial port is not a hardware port, it disables the severe error reporting feature.
+static void MinSerialBegin() {
+  #if !WITHIN(SERIAL_PORT, 0, 4)
+    #warning "Using POSTMORTEM_DEBUGGING requires a physical U(S)ART hardware in case of severe error."
+    #warning "Disabling the severe error reporting feature currently because the used serial port is not a HW port."
+  #else
+    int nvicIndex = nvicUART[SERIAL_PORT];
+
+    // NVIC base address for interrupt disable
+    struct NVICMin {
+      volatile uint32_t ISER[32];
+      volatile uint32_t ICER[32];
+    };
+    NVICMin *nvicBase = (NVICMin*)0xE000E100;
+
+    SBI32(nvicBase->ICER[nvicIndex >> 5], nvicIndex & 0x1F);
+
+    // We require memory barriers to properly disable interrupts
+    // (https://dzone.com/articles/nvic-disabling-interrupts-on-arm-cortex-m-and-the)
+    dsb();
+    isb();
+
+    // Get the RCU PCLK for this USART
+    rcu::RCU_PCLK pclk = clockRegs[SERIAL_PORT];
+
+    // Disable then enable usart peripheral clocks
+    rcu::RCU_DEVICE.set_pclk_enable(pclk, false);
+    rcu::RCU_DEVICE.set_pclk_enable(pclk, true);
+
+    // Save current baudrate
+    uint32_t baudrate = USART_BAUD;
+
+    // Reset USART control registers
+    USART_CTL0 = 0;
+    USART_CTL1 = 0; // 1 stop bit
+
+    // Restore baudrate
+    USART_BAUD = baudrate;
+
+    // Enable transmitter and USART (8 bits, no parity, 1 stop bit)
+    SET_BIT(USART_CTL0, TEN_BIT);
+    SET_BIT(USART_CTL0, UEN_BIT);
+  #endif
+}
+
+// Writes a single character to the serial port.
+static void MinSerialWrite(char c) {
+  #if WITHIN(SERIAL_PORT, 0, 4)
+    // Wait until transmit buffer is empty
+    while (!READ_BIT(USART_STAT0, TBE_BIT)) {
+      hal.watchdog_refresh();
+      sw_barrier();
+    }
+    // Write character to data register
+    USART_DATA = c;
+  #endif
+}
+
+// Installs the minimum serial interface.
+// Sets the HAL_min_serial_init and HAL_min_serial_out function pointers to MinSerialBegin and MinSerialWrite respectively.
+void install_min_serial() {
+  HAL_min_serial_init = &MinSerialBegin;
+  HAL_min_serial_out = &MinSerialWrite;
+}
+
+extern "C" {
+  // A low-level assembly-based jump handler.
+  // Unconditionally branches to the CommonHandler_ASM function.
+  __attribute__((naked, aligned(4))) void JumpHandler_ASM() {
+    __asm__ __volatile__ ("b CommonHandler_ASM\n");
+  }
+  void __attribute__((naked, alias("JumpHandler_ASM"), nothrow)) HardFault_Handler();
+  void __attribute__((naked, alias("JumpHandler_ASM"), nothrow)) BusFault_Handler();
+  void __attribute__((naked, alias("JumpHandler_ASM"), nothrow)) UsageFault_Handler();
+  void __attribute__((naked, alias("JumpHandler_ASM"), nothrow)) MemManage_Handler();
+  void __attribute__((naked, alias("JumpHandler_ASM"), nothrow)) NMI_Handler();
+}
+
+#endif // POSTMORTEM_DEBUGGING
+#endif // ARDUINO_ARCH_MFL
@@ -0,0 +1,8 @@
+# Generic GD32 HAL based on the MFL Arduino Core
+
+This HAL is eventually intended to act as the generic HAL for all GD32 chips using the MFL library.
+
+Currently it supports:
+ * GD32F303RET6
+
+Targeting the official [MFL Arduino Core](https://github.com/bnmguy/ArduinoCore_MFL).
@@ -0,0 +1,125 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2025 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/>.
+ *
+ */
+#include "../platforms.h"
+
+#ifdef ARDUINO_ARCH_MFL
+
+#include "../../inc/MarlinConfig.h"
+
+#if HAS_SERVOS
+
+#include "Servo.h"
+
+static uint_fast8_t servoCount = 0;
+static libServo* servos[NUM_SERVOS] = {0};
+constexpr millis_t servoDelay[] = SERVO_DELAY;
+static_assert(COUNT(servoDelay) == NUM_SERVOS, "SERVO_DELAY must be an array NUM_SERVOS long.");
+
+// Initialize to the default timer priority. This will be overridden by a call from timers.cpp.
+// This allows all timer interrupt priorities to be managed from a single location in the HAL.
+static uint32_t servo_interrupt_priority = NVIC_EncodePriority(NVIC_GetPriorityGrouping(), 12, 0);
+
+// This must be called after the MFL Servo class has initialized the timer.
+// To be safe this is currently called after every call to attach().
+static void fixServoTimerInterruptPriority() {
+  auto& servoTimerIdx = GeneralTimer::get_instance(static_cast<timer::TIMER_Base>(TIMER_SERVO));
+  NVIC_SetPriority(servoTimerIdx.getTimerUpIRQ(), servo_interrupt_priority);
+}
+
+// Default constructor for libServo class.
+// Initializes the servo delay, pause state, and pause value.
+// Registers the servo instance in the servos array.
+libServo::libServo() :
+  delay(servoDelay[servoCount]),
+  was_attached_before_pause(false),
+  value_before_pause(0)
+{
+  servos[servoCount++] = this;
+}
+
+// Attaches a servo to a specified pin.
+int8_t libServo::attach(const int pin) {
+  if (servoCount >= MAX_SERVOS) return -1;
+  if (pin > 0) servoPin = pin;
+  auto result = mflServo.attach(servoPin);
+  fixServoTimerInterruptPriority();
+  return result;
+}
+
+// Attaches a servo to a specified pin with minimum and maximum pulse widths.
+int8_t libServo::attach(const int pin, const int min, const int max) {
+  if (servoCount >= MAX_SERVOS) return -1;
+  if (pin > 0) servoPin = pin;
+  auto result = mflServo.attach(servoPin, min, max);
+  fixServoTimerInterruptPriority();
+  return result;
+}
+
+// Moves the servo to a specified position.
+void libServo::move(const int value) {
+  if (attach(0) >= 0) {
+    mflServo.write(value);
+    safe_delay(delay);
+    TERN_(DEACTIVATE_SERVOS_AFTER_MOVE, detach());
+  }
+}
+
+// Pause the servo by detaching it and storing its current state.
+void libServo::pause() {
+  was_attached_before_pause = mflServo.attached();
+  if (was_attached_before_pause) {
+    value_before_pause = mflServo.read();
+    mflServo.detach();
+  }
+}
+
+// Resume a previously paused servo.
+// If the servo was attached before the pause, this function re-attaches
+// the servo and moves it to the position it was in before the pause.
+void libServo::resume() {
+  if (was_attached_before_pause) {
+    attach();
+    move(value_before_pause);
+  }
+}
+
+// Pause all servos by stopping their timers.
+void libServo::pause_all_servos() {
+  for (auto& servo : servos)
+    if (servo) servo->pause();
+}
+
+// Resume all paused servos by starting their timers.
+void libServo::resume_all_servos() {
+  for (auto& servo : servos)
+    if (servo) servo->resume();
+}
+
+// Set the interrupt priority for the servo.
+// @param preemptPriority The preempt priority level.
+// @param subPriority The sub priority level.
+void libServo::setInterruptPriority(uint32_t preemptPriority, uint32_t subPriority) {
+  servo_interrupt_priority = NVIC_EncodePriority(NVIC_GetPriorityGrouping(), preemptPriority, subPriority);
+}
+
+#endif // HAS_SERVOS
+#endif // ARDUINO_ARCH_MFL
@@ -0,0 +1,56 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2025 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
+
+#include <Servo.h>
+
+#include "../../core/millis_t.h"
+
+// Inherit and expand on the official library
+class libServo {
+public:
+  libServo();
+
+  int8_t attach(const int pin = 0); // pin == 0 uses value from previous call
+  int8_t attach(const int pin, const int min, const int max);
+  void detach() { mflServo.detach(); }
+
+  int read() { return mflServo.read(); }
+  void move(const int value);
+
+  void pause();
+  void resume();
+
+  static void pause_all_servos();
+  static void resume_all_servos();
+
+  static void setInterruptPriority(uint32_t preemptPriority, uint32_t subPriority);
+
+private:
+  Servo mflServo;
+
+  int servoPin = 0;
+  millis_t delay = 0;
+
+  bool was_attached_before_pause;
+  int value_before_pause;
+};
@@ -0,0 +1,129 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2025 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm / Ryan Power
+ *
+ * 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/>.
+ *
+ */
+
+#ifdef ARDUINO_ARCH_MFL
+
+#include "../../../inc/MarlinConfig.h"
+
+#if ALL(HAS_MARLINUI_U8GLIB, FORCE_SOFT_SPI)
+
+#include <U8glib-HAL.h>
+#include "../../shared/HAL_SPI.h"
+
+#define nop asm volatile ("\tnop\n")
+
+static inline uint8_t swSpiTransfer_mode_0(uint8_t b) {
+  for (uint8_t i = 0; i < 8; ++i) {
+    const uint8_t state = (b & 0x80) ? HIGH : LOW;
+    WRITE(DOGLCD_SCK, HIGH);
+    WRITE(DOGLCD_MOSI, state);
+    b <<= 1;
+    WRITE(DOGLCD_SCK, LOW);
+  }
+  return b;
+}
+
+static inline uint8_t swSpiTransfer_mode_3(uint8_t b) {
+  for (uint8_t i = 0; i < 8; ++i) {
+    const uint8_t state = (b & 0x80) ? HIGH : LOW;
+    WRITE(DOGLCD_SCK, LOW);
+    WRITE(DOGLCD_MOSI, state);
+    b <<= 1;
+    WRITE(DOGLCD_SCK, HIGH);
+  }
+  return b;
+}
+
+static void u8g_sw_spi_shift_out(uint8_t val) {
+  #if U8G_SPI_USE_MODE_3
+    swSpiTransfer_mode_3(val);
+  #else
+    swSpiTransfer_mode_0(val);
+  #endif
+}
+
+static void swSpiInit() {
+  #if PIN_EXISTS(LCD_RESET)
+    SET_OUTPUT(LCD_RESET_PIN);
+  #endif
+  SET_OUTPUT(DOGLCD_A0);
+  OUT_WRITE(DOGLCD_SCK, LOW);
+  OUT_WRITE(DOGLCD_MOSI, LOW);
+  OUT_WRITE(DOGLCD_CS, HIGH);
+}
+
+uint8_t u8g_com_HAL_MFL_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr) {
+  switch (msg) {
+    case U8G_COM_MSG_INIT:
+      swSpiInit();
+      break;
+    case U8G_COM_MSG_STOP:
+      break;
+    case U8G_COM_MSG_RESET:
+      #if PIN_EXISTS(LCD_RESET)
+        WRITE(LCD_RESET_PIN, arg_val);
+      #endif
+      break;
+    case U8G_COM_MSG_CHIP_SELECT:
+      #if U8G_SPI_USE_MODE_3        // This LCD SPI is running mode 3 while SD card is running mode 0
+        if (arg_val) {              // SCK idle state needs to be set to the proper idle state before
+                                    // the next chip select goes active
+          WRITE(DOGLCD_SCK, HIGH);  // Set SCK to mode 3 idle state before CS goes active
+          WRITE(DOGLCD_CS, LOW);
+          nop;                      // Hold SCK high for a few ns
+          nop;
+         }
+        else {
+          WRITE(DOGLCD_CS, HIGH);
+          WRITE(DOGLCD_SCK, LOW);   // Set SCK to mode 0 idle state after CS goes inactive
+        }
+      #else
+        WRITE(DOGLCD_CS, !arg_val);
+      #endif
+      break;
+    case U8G_COM_MSG_WRITE_BYTE:
+      u8g_sw_spi_shift_out(arg_val);
+      break;
+    case U8G_COM_MSG_WRITE_SEQ: {
+      uint8_t* ptr = (uint8_t*)arg_ptr;
+      while (arg_val > 0) {
+        u8g_sw_spi_shift_out(*ptr++);
+        arg_val--;
+      }
+    } break;
+    case U8G_COM_MSG_WRITE_SEQ_P: {
+      uint8_t* ptr = (uint8_t*)arg_ptr;
+      while (arg_val > 0) {
+        u8g_sw_spi_shift_out(u8g_pgm_read(ptr));
+        ptr++;
+        arg_val--;
+      }
+    } break;
+    case U8G_COM_MSG_ADDRESS:       // Define cmd (arg_val = 0) or data mode (arg_val = 1)
+      WRITE(DOGLCD_A0, arg_val);
+      break;
+  }
+  return 1;
+}
+
+#endif // HAS_MARLINUI_U8GLIB && FORCE_SOFT_SPI
+#endif // ARDUINO_ARCH_MFL
@@ -0,0 +1,93 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2025 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/>.
+ *
+ */
+
+/**
+ * PersistentStore for Arduino-style EEPROM interface
+ * with simple implementations supplied by Marlin.
+ */
+
+#include "../../platforms.h"
+
+#ifdef ARDUINO_ARCH_MFL
+
+#include "../../../inc/MarlinConfig.h"
+
+#if ENABLED(IIC_BL24CXX_EEPROM)
+
+#include "../../shared/eeprom_if.h"
+#include "../../shared/eeprom_api.h"
+
+#ifndef MARLIN_EEPROM_SIZE
+  #error "MARLIN_EEPROM_SIZE is required for IIC_BL24CXX_EEPROM."
+#endif
+
+size_t PersistentStore::capacity() {
+  return MARLIN_EEPROM_SIZE - eeprom_exclude_size;
+}
+
+bool PersistentStore::access_start() {
+  eeprom_init();
+  return true;
+}
+
+bool PersistentStore::access_finish() {
+  return true;
+}
+
+bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, uint16_t *crc) {
+  uint16_t written = 0;
+  while (size--) {
+    uint8_t v = *value;
+    uint8_t * const p = (uint8_t * const)REAL_EEPROM_ADDR(pos);
+    // EPROM has only ~100,000 write cycles,
+    // so only write bytes that have changed!
+    if (v != eeprom_read_byte(p)) {
+      eeprom_write_byte(p, v);
+      if (++written & 0x7F) delay(4); else safe_delay(4);
+      if (eeprom_read_byte(p) != v) {
+        SERIAL_ECHO_MSG(STR_ERR_EEPROM_WRITE);
+        return true;
+      }
+    }
+
+    crc16(crc, &v, 1);
+    pos++;
+    value++;
+  }
+
+  return false;
+}
+
+bool PersistentStore::read_data(int &pos, uint8_t *value, size_t size, uint16_t *crc, const bool writing/*=true*/) {
+  do {
+    const uint8_t c = eeprom_read_byte((uint8_t*)REAL_EEPROM_ADDR(pos));
+    if (writing) *value = c;
+    crc16(crc, &c, 1);
+    pos++;
+    value++;
+  } while (--size);
+
+  return false;
+}
+
+#endif // IIC_BL24CXX_EEPROM
+#endif // ARDUINO_ARCH_MFL
@@ -0,0 +1,54 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2025 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/>.
+ *
+ */
+
+/**
+ * Platform-independent Arduino functions for I2C EEPROM.
+ * Enable USE_SHARED_EEPROM if not supplied by the framework.
+ */
+
+#include "../../platforms.h"
+
+#ifdef ARDUINO_ARCH_MFL
+
+#include "../../../inc/MarlinConfig.h"
+
+#if ENABLED(IIC_BL24CXX_EEPROM)
+
+#include "../../../libs/BL24CXX.h"
+#include "../../shared/eeprom_if.h"
+
+void eeprom_init() {
+  BL24CXX::init();
+}
+
+void eeprom_write_byte(uint8_t *pos, uint8_t value) {
+  const unsigned eeprom_address = (unsigned)pos;
+  return BL24CXX::writeOneByte(eeprom_address, value);
+}
+
+uint8_t eeprom_read_byte(uint8_t *pos) {
+  const unsigned eeprom_address = (unsigned)pos;
+  return BL24CXX::readOneByte(eeprom_address);
+}
+
+#endif // IIC_BL24CXX_EEPROM
+#endif // ARDUINO_ARCH_MFL
@@ -0,0 +1,96 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2025 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/>.
+ *
+ */
+#include "../../platforms.h"
+
+#ifdef ARDUINO_ARCH_MFL
+
+#include "../../../inc/MarlinConfig.h"
+
+#if USE_WIRED_EEPROM
+
+/**
+ * PersistentStore for Arduino-style EEPROM interface
+ * with simple implementations supplied by Marlin.
+ */
+
+#include "../../shared/eeprom_if.h"
+#include "../../shared/eeprom_api.h"
+
+#ifndef MARLIN_EEPROM_SIZE
+  #define MARLIN_EEPROM_SIZE size_t(E2END + 1)
+#endif
+
+size_t PersistentStore::capacity() {
+  return MARLIN_EEPROM_SIZE - eeprom_exclude_size;
+}
+
+bool PersistentStore::access_start() {
+  eeprom_init();
+  return true;
+}
+
+bool PersistentStore::access_finish() {
+  return true;
+}
+
+bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, uint16_t *crc) {
+  uint16_t written = 0;
+  while (size--) {
+    uint8_t v = *value;
+    uint8_t * const p = (uint8_t * const)REAL_EEPROM_ADDR(pos);
+    // EEPROM has only ~100,000 write cycles,
+    // so only write bytes that have changed!
+    if (v != eeprom_read_byte(p)) {
+      eeprom_write_byte(p, v);
+      // Avoid triggering watchdog during long EEPROM writes
+      if (++written & 0x7F)
+        delay(2);
+      else
+        safe_delay(2);
+      if (eeprom_read_byte(p) != v) {
+        SERIAL_ECHO_MSG(STR_ERR_EEPROM_WRITE);
+        return true;
+      }
+    }
+    crc16(crc, &v, 1);
+    pos++;
+    value++;
+  }
+
+  return false;
+}
+
+bool PersistentStore::read_data(int &pos, uint8_t *value, size_t size, uint16_t *crc, const bool writing/*=true*/) {
+  do {
+    const uint8_t c = eeprom_read_byte((uint8_t*)REAL_EEPROM_ADDR(pos));
+    if (writing)
+      *value = c;
+    crc16(crc, &c, 1);
+    pos++;
+    value++;
+  } while (--size);
+
+  return false;
+}
+
+#endif // USE_WIRED_EEPROM
+#endif // ARDUINO_ARCH_MFL
@@ -0,0 +1,61 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2025 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
+
+#include "../../module/endstops.h"
+
+// One ISR for all EXT-Interrupts
+void endstop_ISR() { endstops.update(); }
+
+void setup_endstop_interrupts() {
+  #define _ATTACH(P) attachInterrupt(P, endstop_ISR, CHANGE)
+  TERN_(USE_X_MAX,       _ATTACH(X_MAX_PIN));
+  TERN_(USE_X_MIN,       _ATTACH(X_MIN_PIN));
+  TERN_(USE_Y_MAX,       _ATTACH(Y_MAX_PIN));
+  TERN_(USE_Y_MIN,       _ATTACH(Y_MIN_PIN));
+  TERN_(USE_Z_MAX,       _ATTACH(Z_MAX_PIN));
+  TERN_(USE_Z_MIN,       _ATTACH(Z_MIN_PIN));
+  TERN_(USE_X2_MAX,      _ATTACH(X2_MAX_PIN));
+  TERN_(USE_X2_MIN,      _ATTACH(X2_MIN_PIN));
+  TERN_(USE_Y2_MAX,      _ATTACH(Y2_MAX_PIN));
+  TERN_(USE_Y2_MIN,      _ATTACH(Y2_MIN_PIN));
+  TERN_(USE_Z2_MAX,      _ATTACH(Z2_MAX_PIN));
+  TERN_(USE_Z2_MIN,      _ATTACH(Z2_MIN_PIN));
+  TERN_(USE_Z3_MAX,      _ATTACH(Z3_MAX_PIN));
+  TERN_(USE_Z3_MIN,      _ATTACH(Z3_MIN_PIN));
+  TERN_(USE_Z4_MAX,      _ATTACH(Z4_MAX_PIN));
+  TERN_(USE_Z4_MIN,      _ATTACH(Z4_MIN_PIN));
+  TERN_(USE_Z_MIN_PROBE, _ATTACH(Z_MIN_PROBE_PIN));
+  TERN_(USE_CALIBRATION, _ATTACH(CALIBRATION_PIN));
+  TERN_(USE_I_MAX,       _ATTACH(I_MAX_PIN));
+  TERN_(USE_I_MIN,       _ATTACH(I_MIN_PIN));
+  TERN_(USE_J_MAX,       _ATTACH(J_MAX_PIN));
+  TERN_(USE_J_MIN,       _ATTACH(J_MIN_PIN));
+  TERN_(USE_K_MAX,       _ATTACH(K_MAX_PIN));
+  TERN_(USE_K_MIN,       _ATTACH(K_MIN_PIN));
+  TERN_(USE_U_MAX,       _ATTACH(U_MAX_PIN));
+  TERN_(USE_U_MIN,       _ATTACH(U_MIN_PIN));
+  TERN_(USE_V_MAX,       _ATTACH(V_MAX_PIN));
+  TERN_(USE_V_MIN,       _ATTACH(V_MIN_PIN));
+  TERN_(USE_W_MAX,       _ATTACH(W_MAX_PIN));
+  TERN_(USE_W_MIN,       _ATTACH(W_MIN_PIN));
+}
@@ -0,0 +1,97 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2025 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/>.
+ *
+ */
+
+#include "../platforms.h"
+
+#ifdef ARDUINO_ARCH_MFL
+
+#include "../../inc/MarlinConfig.h"
+
+#include <PinOpsMap.hpp>
+#include <PinOps.hpp>
+#include "timers.h"
+
+static uint16_t timer_frequency[TIMER_COUNT];
+
+void MarlinHAL::set_pwm_duty(const pin_t pin, const uint16_t value, const uint16_t scale, const bool invert) {
+  // Calculate duty cycle based on inversion flag
+  const uint16_t duty = invert ? scale - value : value;
+
+  // Check if the pin supports PWM
+  if (PWM_PIN(pin)) {
+    // Get the timer peripheral base associated with the pin
+    const auto timer_base = getPinOpsPeripheralBase<TIMERPinOps, timer::TIMER_Base>(TIMER_PinOps, static_cast<pin_size_t>(pin));
+
+    // Initialize the timer instance
+    auto& TimerInstance = GeneralTimer::get_instance(timer_base);
+
+    // Get channel and previous channel mode
+    const auto channel = getPackedPinChannel(getPackedPinOps(TIMER_PinOps, static_cast<pin_size_t>(pin)));
+    const InputOutputMode previous = TimerInstance.getChannelMode(channel);
+
+    if (timer_frequency[static_cast<size_t>(timer_base)] == 0) {
+      set_pwm_frequency(pin, PWM_FREQUENCY);
+    }
+
+    // Set the PWM duty cycle
+    TimerInstance.setCaptureCompare(channel, duty, CCFormat::B8);
+
+    // Configure pin as PWM output
+    pinOpsPinout(TIMER_PinOps, static_cast<pin_size_t>(pin));
+
+    // Set channel mode if not already set and start timer
+    if (previous != InputOutputMode::PWM0) {
+      TimerInstance.setChannelMode(channel, InputOutputMode::PWM0, static_cast<pin_size_t>(pin));
+      TimerInstance.start();
+    }
+  } else {
+    pinMode(pin, OUTPUT);
+    digitalWrite(pin, duty < scale / 2 ? LOW : HIGH);
+  }
+}
+
+void MarlinHAL::set_pwm_frequency(const pin_t pin, const uint16_t f_desired) {
+  // Check if the pin supports PWM
+  if (!PWM_PIN(pin)) return;
+
+  // Get the timer peripheral base associated with the pin
+  const auto timer_base = getPinOpsPeripheralBase<TIMERPinOps, timer::TIMER_Base>(TIMER_PinOps, static_cast<pin_size_t>(pin));
+
+  // Guard against modifying protected timers
+  #ifdef STEP_TIMER
+    if (timer_base == static_cast<timer::TIMER_Base>(STEP_TIMER)) return;
+  #endif
+  #ifdef TEMP_TIMER
+    if (timer_base == static_cast<timer::TIMER_Base>(TEMP_TIMER)) return;
+  #endif
+  #if defined(PULSE_TIMER) && MF_TIMER_PULSE != MF_TIMER_STEP
+    if (timer_base == static_cast<timer::TIMER_Base>(PULSE_TIMER)) return;
+  #endif
+
+  // Initialize the timer instance
+  auto& TimerInstance = GeneralTimer::get_instance(timer_base);
+
+  TimerInstance.setRolloverValue(f_desired, TimerFormat::HERTZ);
+  timer_frequency[timer_base_to_index(timer_base)] = f_desired;
+}
+
+#endif // ARDUINO_ARCH_MFL
@@ -0,0 +1,85 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2025 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
+
+// Fast I/O interfaces for GD32F303RE
+
+#include <GPIO.hpp>
+#include <PinOps.hpp>
+#include <PinOpsMap.hpp>
+
+template<typename T>
+static inline void fast_write_pin_wrapper(pin_size_t IO, T V) {
+  auto port = getPortFromPin(IO);
+  auto pin = getPinInPort(IO);
+  if (static_cast<bool>(V)) gpio::fast_set_pin(port, pin);
+  else                      gpio::fast_clear_pin(port, pin);
+}
+
+static inline bool fast_read_pin_wrapper(pin_size_t IO) {
+  return gpio::fast_read_pin(getPortFromPin(IO), getPinInPort(IO));
+}
+
+static inline void fast_toggle_pin_wrapper(pin_size_t IO) {
+  gpio::fast_toggle_pin(getPortFromPin(IO), getPinInPort(IO));
+}
+
+// ------------------------
+// Defines
+// ------------------------
+
+#ifndef PWM
+  #define PWM OUTPUT
+#endif
+
+#define _WRITE(IO, V)           fast_write_pin_wrapper(IO, V)
+#define _READ(IO)               fast_read_pin_wrapper(IO)
+#define _TOGGLE(IO)             fast_toggle_pin_wrapper(IO)
+
+#define _GET_MODE(IO)
+#define _SET_MODE(IO, M)        pinMode((IO), (M))
+#define _SET_OUTPUT(IO)         pinMode((IO), OUTPUT)
+#define _SET_OUTPUT_OD(IO)      pinMode((IO), OUTPUT_OPEN_DRAIN)
+
+#define WRITE(IO, V)            _WRITE((IO), (V))
+#define READ(IO)                _READ(IO)
+#define TOGGLE(IO)              _TOGGLE(IO)
+
+#define OUT_WRITE(IO, V)        do { _SET_OUTPUT(IO); WRITE((IO), (V)); } while (0)
+#define OUT_WRITE_OD(IO, V)     do { _SET_OUTPUT_OD(IO); WRITE((IO), (V)); } while (0)
+
+#define SET_INPUT(IO)           _SET_MODE((IO), INPUT)
+#define SET_INPUT_PULLUP(IO)    _SET_MODE((IO), INPUT_PULLUP)
+#define SET_INPUT_PULLDOWN(IO)  _SET_MODE((IO), INPUT_PULLDOWN)
+#define SET_OUTPUT(IO)          OUT_WRITE((IO), LOW)
+#define SET_OUTPUT_OD(IO)       OUT_WRITE_OD((IO), LOW)
+#define SET_PWM(IO)             _SET_MODE((IO), PWM)
+
+#define IS_INPUT(IO)
+#define IS_OUTPUT(IO)
+
+#define PWM_PIN(P)              isPinInPinOps(TIMER_PinOps, P)
+#define NO_COMPILE_TIME_PWM
+
+// Wrappers for digitalRead and digitalWrite
+#define extDigitalRead(IO)      digitalRead(IO)
+#define extDigitalWrite(IO, V)  digitalWrite((IO), (V))
@@ -0,0 +1,26 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2025 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
+
+#if ALL(HAS_MARLINUI_U8GLIB, FORCE_SOFT_SPI)
+  #define U8G_SW_SPI_MFL 1
+#endif
@@ -0,0 +1,26 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2025 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
+
+#if ALL(HAS_MEDIA, USBD_USE_CDC_MSC)
+  #define HAS_SD_HOST_DRIVE 1
+#endif
@@ -0,0 +1,29 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2025 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
+
+// If no real or emulated EEPROM selected, fall back to SD emulation
+#if USE_FALLBACK_EEPROM
+  #define SDCARD_EEPROM_EMULATION
+#elif ANY(I2C_EEPROM, SPI_EEPROM)
+  #define USE_SHARED_EEPROM 1
+#endif
@@ -0,0 +1,22 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2025 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
@@ -0,0 +1,97 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2025 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
+
+// Test MFL GD32 specific configuration values for errors at compile-time.
+#if ENABLED(SDCARD_EEPROM_EMULATION) && !HAS_MEDIA
+  #undef SDCARD_EEPROM_EMULATION  // avoid additional error noise
+  #if USE_FALLBACK_EEPROM
+    #warning "EEPROM type not specified. Fallback is SDCARD_EEPROM_EMULATION."
+  #endif
+  #error "SDCARD_EEPROM_EMULATION requires SDSUPPORT. Enable SDSUPPORT or choose another EEPROM emulation."
+#endif
+
+#if ENABLED(FLASH_EEPROM_LEVELING)
+  #error "FLASH_EEPROM_LEVELING is not supported on GD32."
+#endif
+
+#if ENABLED(SERIAL_STATS_MAX_RX_QUEUED)
+  #error "SERIAL_STATS_MAX_RX_QUEUED is not supported on GD32."
+#elif ENABLED(SERIAL_STATS_DROPPED_RX)
+  #error "SERIAL_STATS_DROPPED_RX is not supported on GD32."
+#endif
+
+#if TEMP_SENSOR_SOC && defined(ATEMP) && TEMP_SOC_PIN != ATEMP
+  #error "TEMP_SENSOR_SOC requires 'TEMP_SOC_PIN ATEMP' on GD32"
+#endif
+
+// Check for common serial pin conflicts
+#define _CHECK_SERIAL_PIN(N) (( \
+    BTN_EN1 == N || BTN_EN2 == N || DOGLCD_CS == N || HEATER_BED_PIN == N || FAN0_PIN == N || \
+    SDIO_D2_PIN == N || SDIO_D3_PIN == N || SDIO_CK_PIN == N || SDIO_CMD_PIN == N || \
+    Y_STEP_PIN == N || Y_ENABLE_PIN == N || E0_ENABLE_PIN == N || POWER_LOSS_PIN == N \
+  ))
+
+#define CHECK_SERIAL_PIN(T, N) defined(UART##N##_##T##_PIN) && _CHECK_SERIAL_PIN(UART##N##_##T##_PIN)
+
+#if SERIAL_IN_USE(0)
+  #if CHECK_SERIAL_PIN(TX, 0)
+    #error "Serial Port 0 TX IO pins conflict with another pin on the board."
+  #endif
+  #if CHECK_SERIAL_PIN(RX, 0)
+    #error "Serial Port 0 RX IO pins conflict with another pin on the board."
+  #endif
+#endif
+#if SERIAL_IN_USE(1)
+  #if CHECK_SERIAL_PIN(TX, 1)
+    #error "Serial Port 1 TX IO pins conflict with another pin on the board."
+  #endif
+  #if CHECK_SERIAL_PIN(RX, 1)
+    #error "Serial Port 1 RX IO pins conflict with another pin on the board."
+  #endif
+#endif
+#if SERIAL_IN_USE(2)
+  #if CHECK_SERIAL_PIN(TX, 2)
+    #error "Serial Port 2 TX IO pins conflict with another pin on the board."
+  #endif
+  #if CHECK_SERIAL_PIN(RX, 2)
+    #error "Serial Port 2 RX IO pins conflict with another pin on the board."
+  #endif
+#endif
+#if SERIAL_IN_USE(3)
+  #if CHECK_SERIAL_PIN(TX, 3)
+    #error "Serial Port 3 TX IO pins conflict with another pin on the board."
+  #endif
+  #if CHECK_SERIAL_PIN(RX, 3)
+    #error "Serial Port 3 RX IO pins conflict with another pin on the board."
+  #endif
+#endif
+#if SERIAL_IN_USE(4)
+  #if CHECK_SERIAL_PIN(TX, 4)
+    #error "Serial Port 4 TX IO pins conflict with another pin on the board."
+  #endif
+  #if CHECK_SERIAL_PIN(RX, 4)
+    #error "Serial Port 4 RX IO pins conflict with another pin on the board."
+  #endif
+#endif
+#undef CHECK_SERIAL_PIN
+#undef _CHECK_SERIAL_PIN
@@ -0,0 +1,102 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2025 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
+
+/**
+ * Pins Debugging for GD32
+ *
+ *   - NUMBER_PINS_TOTAL
+ *   - MULTI_NAME_PAD
+ *   - getPinByIndex(index)
+ *   - printPinNameByIndex(index)
+ *   - getPinIsDigitalByIndex(index)
+ *   - digitalPinToAnalogIndex(pin)
+ *   - getValidPinMode(pin)
+ *   - isValidPin(pin)
+ *   - isAnalogPin(pin)
+ *   - digitalRead_mod(pin)
+ *   - pwm_status(pin)
+ *   - printPinPWM(pin)
+ *   - printPinPort(pin)
+ *   - printPinNumber(pin)
+ *   - printPinAnalog(pin)
+ */
+
+#include "../../inc/MarlinConfig.h"
+#include <Arduino.h>
+#include <PinOps.hpp>
+#include <Analog.h>
+
+#ifndef TOTAL_PIN_COUNT
+  #error "Expected TOTAL_PIN_COUNT not found."
+#endif
+
+#define NUM_DIGITAL_PINS  TOTAL_PIN_COUNT
+#define NUMBER_PINS_TOTAL TOTAL_PIN_COUNT
+
+#define getPinByIndex(x) pin_t(pin_array[x].pin)
+#define isValidPin(P) WITHIN(P, 0, (NUM_DIGITAL_PINS - 1))
+#define digitalRead_mod(P) extDigitalRead(P)
+#define printPinNumber(P) do { sprintf_P(buffer, PSTR("%3hd "), pin_t(P)); SERIAL_ECHO(buffer); } while (0)
+#define printPinAnalog(P) do { sprintf_P(buffer, PSTR(" (A%2d)  "), pin_t(getAdcChannelFromPin(P))); 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 MULTI_NAME_PAD 21 // Space needed to be pretty if not first name assigned to a pin
+
+#ifndef M43_NEVER_TOUCH
+  #define M43_NEVER_TOUCH(x) WITHIN(x, 9, 10) // SERIAL pins: PA9(TX) PA10(RX)
+#endif
+
+bool isAnalogPin(const pin_t pin) {
+  if (!isValidPin(pin)) return false;
+
+  if (getAdcChannel(pin) != adc::ADC_Channel::INVALID) {
+    auto& instance = gpio::GPIO::get_instance(getPortFromPin(pin)).value();
+    return instance.get_pin_mode(getPinInPort(pin)) == gpio::Pin_Mode::ANALOG && !M43_NEVER_TOUCH(pin);
+  }
+
+  return false;
+}
+
+bool getValidPinMode(const pin_t pin) {
+  if (!isValidPin(pin)) return false;
+
+  auto& instance = gpio::GPIO::get_instance(getPortFromPin(pin)).value();
+  gpio::Pin_Mode mode = instance.get_pin_mode(getPinInPort(pin));
+
+  return mode != gpio::Pin_Mode::ANALOG && mode != gpio::Pin_Mode::INPUT_FLOATING &&
+         mode != gpio::Pin_Mode::INPUT_PULLUP && mode != gpio::Pin_Mode::INPUT_PULLDOWN;
+}
+
+bool getPinIsDigitalByIndex(const int16_t index) {
+  const pin_t pin = getPinByIndex(index);
+  return (!isAnalogPin(pin));
+}
+
+int8_t digitalPinToAnalogIndex(const pin_t pin) {
+  if (!isValidPin(pin) || !isAnalogPin(pin)) return -1;
+  return pin; // Analog and digital pin indexes are shared
+}
+
+bool pwm_status(const pin_t pin) { return false; }
+void printPinPWM(const pin_t pin) { /* TODO */ }
+void printPinPort(const pin_t pin) { /* TODO */ }
--- a/Show More
+++ b/Show More