Update Configuration_adv.h

Co-Authored-By: sjasonsmith <20053467+sjasonsmith@users.noreply.github.com>

.aiderignore

@@ -1,21 +0,0 @@
-# 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/

.devcontainer/devcontainer.json

@@ -38,14 +38,14 @@
     "platformio.platformio-ide",
     "marlinfirmware.auto-build",
     "editorconfig.editorconfig"
-  ]
+  ],
 
   // Use 'forwardPorts' to make a list of ports inside the container available locally.
-  // , "forwardPorts": []
+  // "forwardPorts": [],
 
   // Use 'postCreateCommand' to run commands after the container is created.
-  // , "postCreateCommand": "pip3 install --user -r requirements.txt"
+  // "postCreateCommand": "pip3 install --user -r requirements.txt",
 
   // Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
-  // , "remoteUser": "vscode"
+  // "remoteUser": "vscode"
 }

.github/ISSUE_TEMPLATE/config.yml

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

.github/contributing.md

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

.github/lock.yml

@@ -0,0 +1,40 @@
+#
+# Configuration for Lock Threads - https://github.com/dessant/lock-threads-app
+#
+
+# Number of days of inactivity before a closed issue or pull request is locked
+daysUntilLock: 60
+
+# Skip issues and pull requests created before a given timestamp. Timestamp must
+# follow ISO 8601 (`YYYY-MM-DD`). Set to `false` to disable
+skipCreatedBefore: false
+
+# Issues and pull requests with these labels will be ignored. Set to `[]` to disable
+exemptLabels: [ 'no-locking' ]
+
+# Label to add before locking, such as `outdated`. Set to `false` to disable
+lockLabel: false
+
+# Comment to post before locking. Set to `false` to disable
+lockComment: >
+  This thread has been automatically locked since there has not been
+  any recent activity after it was closed. Please open a new issue for
+  related bugs.
+
+# Assign `resolved` as the reason for locking. Set to `false` to disable
+setLockReason: true
+
+# Limit to only `issues` or `pulls`
+# only: issues
+
+# Optionally, specify configuration settings just for `issues` or `pulls`
+# issues:
+#   exemptLabels:
+#     - help-wanted
+#   lockLabel: outdated
+
+# pulls:
+#   daysUntilLock: 30
+
+# Repository to extend settings from
+# _extends: repo

.github/workflows/auto-label.yml

@@ -14,7 +14,7 @@ jobs:
   autolabel:
     name: Auto Label
     if: github.repository == 'MarlinFirmware/Marlin'
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
     - name: Auto Label for [BUG]
       uses: actions/github-script@v7

.github/workflows/bump-date.yml

@@ -14,12 +14,12 @@ jobs:
     name: Bump Distribution Date
     if: github.repository == 'MarlinFirmware/Marlin'
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
 
     steps:
 
     - name: Check out bugfix-2.0.x
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
       with:
         ref: bugfix-2.0.x
 
@@ -39,7 +39,7 @@ jobs:
         exit 0
 
     - name: Check out bugfix-2.1.x
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
       with:
         ref: bugfix-2.1.x
 

.github/workflows/check-pr.yml

@@ -18,7 +18,7 @@ jobs:
     name: PR Bad Target
     if: github.repository == 'MarlinFirmware/Marlin'
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
 
     steps:
     - uses: superbrothers/close-pull-request@v3

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

@@ -1,78 +0,0 @@
-#
-# ci-unit-tests.yml
-# Build and execute unit tests to catch functional issues in code
-#
-
-name: CI - Unit Tests
-
-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-ignore:
-    - config/**
-    - data/**
-    - docs/**
-    - '**/*.md'
-  push:
-    branches:
-    - bugfix-2.1.x
-    # Cannot be enabled on 2.1.x until it contains the unit test framework
-    #- 2.1.x
-    paths-ignore:
-    - config/**
-    - data/**
-    - docs/**
-    - '**/*.md'
-
-jobs:
-  # This runs all unit tests as a single job. While it should be possible to break this up into
-  # multiple jobs, they currently run quickly and finish long before the compilation tests.
-  run_unit_tests:
-    name: Unit Test
-    # These tests will only be able to run on the bugfix-2.1.x branch, until the next release
-    # pulls them into additional branches.
-    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-unit-v1
-        restore-keys: |
-          ${{ runner.os }}-pip-unit-
-
-    - name: Cache PlatformIO
-      uses: actions/cache@v4
-      with:
-        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
-      with:
-        python-version: '3.9'
-        architecture: 'x64'
-
-    - name: Install PlatformIO
-      run: |
-        pip install -U platformio
-        pio upgrade --dev
-        pio pkg update --global
-
-    - name: Run All Unit Tests
-      run: |
-        make unit-test-all-local

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

@@ -1,48 +0,0 @@
-#
-# ci-validate-boards.yml
-# Validate boards.h to make sure it's all set up correctly
-#
-
-name: CI - Validate boards.h
-
-# We can do the on: section as two items, one for pull requests and one for pushes...
-on:
-  pull_request:
-    branches:
-      - bugfix-2.1.x
-    paths:
-      - "Marlin/src/core/boards.h"
-  push:
-    branches:
-      - bugfix-2.1.x
-    paths:
-      - "Marlin/src/core/boards.h"
-
-jobs:
-  validate_pins_files:
-    name: Validate boards.h
-    if: github.repository == 'MarlinFirmware/Marlin'
-
-    runs-on: ubuntu-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-validation-v1
-          restore-keys: |
-            ${{ runner.os }}-pip-validation-
-
-      - 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

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

@@ -1,40 +0,0 @@
-#
-# ci-validate-lines.yml
-# Validate that all text files are unchanged by linesformat.py
-#
-
-name: CI - Validate Source Files
-
-on:
-  pull_request:
-    branches:
-      - bugfix-2.1.x
-      - 2.1.x
-  push:
-    branches:
-      - bugfix-2.1.x
-      - 2.1.x
-
-jobs:
-  validate_source_files:
-    name: Validate Source Files
-    if: github.repository == 'MarlinFirmware/Marlin'
-
-    runs-on: ubuntu-22.04
-
-    steps:
-      - name: Check out the PR
-        uses: actions/checkout@v4
-
-      - name: Cache node_modules
-        uses: actions/cache@v4
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-npm-lines-v1
-          restore-keys: |
-            ${{ runner.os }}-npm-lines-
-
-      - name: Validate text file formatting
-        run: |
-          npm install --save-dev prettier
-          make validate-lines -j

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

@@ -1,51 +0,0 @@
-#
-# 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-validation-v1
-          restore-keys: |
-            ${{ runner.os }}-pip-validation-
-
-      - 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

.github/workflows/clean-closed.yml

@@ -13,7 +13,7 @@ on:
 
 jobs:
   remove_label:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
 
     strategy:
       matrix:
@@ -32,7 +32,7 @@ jobs:
           - "Needs: Work"
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Remove Labels
         uses: actions-ecosystem/action-remove-labels@v1
         with:

.github/workflows/close-stale.yml

@@ -14,10 +14,10 @@ jobs:
     name: Close Stale Issues
     if: github.repository == 'MarlinFirmware/Marlin'
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/stale@v9
+    - uses: actions/stale@v8
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-issue-message: |

.github/workflows/lock-closed.yml

@@ -14,18 +14,18 @@ jobs:
     name: Lock Closed Issues
     if: github.repository == 'MarlinFirmware/Marlin'
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
 
     steps:
-    - uses: dessant/lock-threads@v5
+    - uses: dessant/lock-threads@v2
       with:
         github-token: ${{ github.token }}
         process-only: 'issues'
-        issue-inactive-days: '60'
+        issue-lock-inactive-days: '60'
-        exclude-issue-created-before: ''
+        issue-exclude-created-before: ''
-        exclude-any-issue-labels: 'no-locking'
+        issue-exclude-labels: 'no-locking'
-        add-issue-labels: ''
+        issue-lock-labels: ''
-        issue-comment: >
+        issue-lock-comment: >
           This issue has been automatically locked since there
           has not been any recent activity after it was closed.
           Please open a new issue for related bugs.

.github/workflows/test-builds.yml

@@ -1,9 +1,9 @@
 #
-# ci-build-tests.yml
+# test-builds.yml
 # Do test builds to catch compile errors
 #
 
-name: CI - Build Tests
+name: CI
 
 on:
   pull_request:
@@ -14,43 +14,30 @@ on:
     - config/**
     - data/**
     - docs/**
-    - test/**
-    - Marlin/tests/**
     - '**/*.md'
   push:
     branches:
     - bugfix-2.1.x
     - 2.1.x
-    - release-*
     paths-ignore:
     - config/**
     - data/**
     - docs/**
-    - test/**
-    - Marlin/tests/**
     - '**/*.md'
 
 jobs:
   test_builds:
-    name: Build Test
+    name: Run All Tests
     if: github.repository == 'MarlinFirmware/Marlin'
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
-
-    env:
-      CONFIG_BRANCH: ${{ github.base_ref || github.ref_name }}
 
     strategy:
-      fail-fast: true
       matrix:
         test-platform:
 
-        # RP2040
-        - SKR_Pico
-
         # Native
         - linux_native
-        - simulator_linux_release
 
         # AVR
         - mega2560
@@ -58,7 +45,7 @@ jobs:
         - at90usb1286_dfu
 
         # AVR Extended
-        - mega2560ext
+        - FYSETC_F6
         - melzi_optiboot
         - rambo
         - sanguino1284p
@@ -113,11 +100,11 @@ jobs:
 
         # STM32F4
         - ARMED
-        - BTT_BTT002
+        - BIGTREE_BTT002
-        - BTT_GTR_V1_0
+        - BIGTREE_GTR_V1_0
-        - BTT_SKR_PRO
+        - BIGTREE_SKR_PRO
         - FLYF407ZG
-        - STM32F446VE_fysetc
+        - FYSETC_S6
         - LERDGEK
         - LERDGEX
         - mks_robin_pro2
@@ -155,12 +142,6 @@ jobs:
         # HC32
         - HC32F460C_aquila_101
 
-        # GD32F3
-        - GD32F303RE_creality_mfl
-
-        # GD32F1
-        - GD32F103RC_aquila_mfl
-
         # LPC176x - Lengthy tests
         - LPC1768
         - LPC1769
@@ -171,26 +152,21 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Cache pip
-      uses: actions/cache@v4
+      uses: actions/cache@v3
       with:
         path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-build-v1
+        key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
         restore-keys: |
-          ${{ runner.os }}-pip-build-
+          ${{ runner.os }}-pip-
 
     - name: Cache PlatformIO
-      uses: actions/cache@v4
+      uses: actions/cache@v3
       with:
-        path: |
+        path: ~/.platformio
-          ~/.platformio
+        key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
-          .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
+      uses: actions/setup-python@v4
       with:
         python-version: '3.9'
         architecture: 'x64'
@@ -201,14 +177,6 @@ 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 }}

.github/workflows/unlock-reopened.yml

@@ -14,7 +14,7 @@ jobs:
     name: Unlock Reopened
     if: github.repository == 'MarlinFirmware/Marlin'
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
 
     steps:
     - uses: OSDKDev/unlock-issues@v1.1

.gitignore

@@ -31,11 +31,6 @@ out-language/
 *.gen
 *.sublime-workspace
 
-# npm
-node_modules/
-package.json
-package-lock.json
-
 # OS
 applet/
 .DS_Store
@@ -130,7 +125,6 @@ vc-fileutils.settings
 # Visual Studio Code
 .vscode/*
 !.vscode/extensions.json
-*.code-workspace
 
 # Simulation files
 imgui.ini
@@ -174,6 +168,3 @@ __pycache__
 tags
 *.logs
 *.bak
-.aider*
-!.aiderignore
-.env

.prettierignore

@@ -1,10 +0,0 @@
-# Prettier Ignore file
-*.min.js
-web-ui/
-buildroot/share/PlatformIO/boards
-buildroot/share/PlatformIO/variants
-*.sublime-project
-*.sublime-syntax
-.github
-.vscode
-launch.json

.zed/settings.json

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

Makefile

@@ -2,50 +2,16 @@ 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
-
-# Find a Python 3 interpreter
-ifeq ($(OS),Windows_NT)
-	# Windows: use `where` – fall back through the three common names
-	PYTHON := $(shell which python 2>nul || which python3 2>nul || which py 2>nul)
-	# Windows: Use cmd tools to find pins files
-	PINS_RAW := $(shell cmd //c "dir /s /b Marlin\src\pins\*.h 2>nul | findstr /r ".*Marlin\\\\src\\\\pins\\\\.*\\\\pins_.*\.h"")
-	PINS := $(subst \,/,$(PINS_RAW))
-else
-	# POSIX: use `command -v` – prefer python3 over python
-	PYTHON := $(shell command -v python3 2>/dev/null || command -v python 2>/dev/null)
-	# Unix/Linux: Use find command
-	PINS := $(shell find Marlin/src/pins -mindepth 2 -name 'pins_*.h')
-endif
-
-# Check that the found interpreter is Python 3
-# Error if there's no Python 3 available
-ifneq ($(strip $(PYTHON)),)
-	PYTHON_VERSION := $(shell $(PYTHON) -c "import sys; print(sys.version_info[0])" 2>/dev/null)
-	ifneq ($(PYTHON_VERSION),3)
-		$(error $(PYTHON) is not Python 3 – install a Python‑3.x interpreter or adjust your PATH)
-	endif
-else
-	$(error No Python executable found – install Python 3.x and make sure it is in your PATH)
-endif
 
 help:
 	@echo "Tasks for local development:"
-	@echo "make marlin                    : Build Marlin for the configured board"
+	@echo "* format-pins:                 Reformat all pins files"
-	@echo "make format-pins -j            : Reformat all pins files (-j for parallel execution)"
+	@echo "* tests-single-ci:             Run a single test from inside the CI"
-	@echo "make validate-lines -j         : Validate line endings, fails on trailing whitespace, etc."
+	@echo "* tests-single-local:          Run a single test locally"
-	@echo "make validate-pins -j          : Validate all pins files, fails if any require reformatting"
+	@echo "* tests-single-local-docker:   Run a single test locally, using docker"
-	@echo "make validate-boards -j        : Validate boards.h and pins.h for standards compliance"
+	@echo "* tests-all-local:             Run all tests locally"
-	@echo "make tests-single-ci           : Run a single test from inside the CI"
+	@echo "* tests-all-local-docker:      Run all tests locally, using docker"
-	@echo "make tests-single-local        : Run a single test locally"
+	@echo "* setup-local-docker:          Build the local docker image"
-	@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-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"
 	@echo ""
 	@echo "Options for testing:"
 	@echo "  TEST_TARGET          Set when running tests-single-*, to select the"
@@ -55,117 +21,49 @@ 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!"
-
+.PHONY: help
-marlin:
-	./buildroot/bin/mftest -a
-.PHONY: marlin
-
-clean:
-	rm -rf .pio/build*
 
 tests-single-ci:
 	export GIT_RESET_HARD=true
 	$(MAKE) tests-single-local TEST_TARGET=$(TEST_TARGET) PLATFORMIO_BUILD_FLAGS=-DGITHUB_ACTION
+.PHONY: tests-single-ci
 
 tests-single-local:
 	@if ! test -n "$(TEST_TARGET)" ; then echo "***ERROR*** Set TEST_TARGET=<your-module> or use make tests-all-local" ; return 1; fi
 	export PATH="./buildroot/bin/:./buildroot/tests/:${PATH}" \
 	  && export VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) \
 	  && run_tests . $(TEST_TARGET) "$(ONLY_TEST)"
+.PHONY: tests-single-local
 
 tests-single-local-docker:
 	@if ! test -n "$(TEST_TARGET)" ; then echo "***ERROR*** Set TEST_TARGET=<your-module> or use make tests-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 tests-single-local TEST_TARGET=$(TEST_TARGET) VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) GIT_RESET_HARD=$(GIT_RESET_HARD) ONLY_TEST="$(ONLY_TEST)"
+	$(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)"
+.PHONY: tests-single-local-docker
 
 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 $$($(PYTHON) $(SCRIPTS_DIR)/get_test_targets.py) ; do \
+	  && for TEST_TARGET in $$($(SCRIPTS_DIR)/get_test_targets.py) ; do echo "Running tests for $$TEST_TARGET" ; run_tests . $$TEST_TARGET ; done
-	    if [ "$$TEST_TARGET" = "linux_native" ] && [ "$$(uname)" = "Darwin" ]; then \
+.PHONY: tests-all-local
-	      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)
+	$(CONTAINER_RT_BIN) run $(CONTAINER_RT_OPTS) $(CONTAINER_IMAGE) $(MAKE) tests-all-local VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) GIT_RESET_HARD=$(GIT_RESET_HARD)
-
+.PHONY: tests-all-local-docker
-unit-test-single-local:
-	platformio run -t marlin_$(UNIT_TEST_CONFIG) -e linux_native_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
-
-unit-test-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 unit-test-all-local
-
-USERNAME := $(shell whoami)
-USER_ID  := $(shell id -u)
-GROUP_ID := $(shell id -g)
-
-.PHONY: setup-local-docker setup-local-docker-old
 
 setup-local-docker:
-	@echo "Building marlin-dev Docker image..."
+	$(CONTAINER_RT_BIN) build -t $(CONTAINER_IMAGE) -f docker/Dockerfile .
-	$(CONTAINER_RT_BIN) build -t $(CONTAINER_IMAGE) \
+.PHONY: setup-local-docker
-	  --build-arg USERNAME=$(USERNAME) \
-	  --build-arg USER_ID=$(USER_ID) \
-	  --build-arg GROUP_ID=$(GROUP_ID) \
-	  -f docker/Dockerfile .
-	@echo
-	@echo "To run all tests in Docker:"
-	@echo "  make tests-all-local-docker"
-	@echo "To run a single test in Docker:"
-	@echo "  make tests-single-local-docker TEST_TARGET=mega2560"
 
-setup-local-docker-old:
+PINS := $(shell find Marlin/src/pins -mindepth 2 -name '*.h')
-	$(CONTAINER_RT_BIN) buildx build -t $(CONTAINER_IMAGE) -f docker/Dockerfile .
 
-.PHONY: $(PINS) format-pins validate-pins
+.PHONY: $(PINS)
 
 $(PINS): %:
-	@echo "Formatting pins $@"
+	@echo "Formatting $@" && node buildroot/share/scripts/pinsformat.js $@
-	@$(PYTHON) $(SCRIPTS_DIR)/pinsformat.py $< $@
 
 format-pins: $(PINS)
-	@echo "Processed $(words $(PINS)) pins files"
-
-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)
-
-.PHONY: format-lines validate-lines
-
-format-lines:
-	@echo "Formatting all sources"
-	@$(PYTHON) $(SCRIPTS_DIR)/linesformat.py buildroot
-	@$(PYTHON) $(SCRIPTS_DIR)/linesformat.py Marlin
-
-validate-lines:
-	@echo "Validating text formatting"
-	@npx prettier --check . --editorconfig --object-wrap preserve
-
-BOARDS_FILE := Marlin/src/core/boards.h
-
-.PHONY: validate-boards
-
-validate-boards:
-	@echo "Validating boards.h file"
-	@$(PYTHON) $(SCRIPTS_DIR)/validate_boards.py $(BOARDS_FILE) || (echo "\nError: boards.h file is not valid. Please check and correct it.\n" && exit 1)

Marlin/Makefile

@@ -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_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_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_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,17 +187,6 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1033)
 # RAMPS Plus 3DYMY (Power outputs: Spindle, Controller Fan)
 else ifeq ($(HARDWARE_MOTHERBOARD),1034)
 
-# RAMPS 1.6+ (Power outputs: Hotend, Fan, Bed)
-else ifeq ($(HARDWARE_MOTHERBOARD),1040)
-# RAMPS 1.6+ (Power outputs: Hotend0, Hotend1, Bed)
-else ifeq ($(HARDWARE_MOTHERBOARD),1041)
-# RAMPS 1.6+ (Power outputs: Hotend, Fan0, Fan1)
-else ifeq ($(HARDWARE_MOTHERBOARD),1042)
-# RAMPS 1.6+ (Power outputs: Hotend0, Hotend1, Fan)
-else ifeq ($(HARDWARE_MOTHERBOARD),1043)
-# RAMPS 1.6+ (Power outputs: Spindle, Controller Fan)
-else ifeq ($(HARDWARE_MOTHERBOARD),1044)
-
 #
 # RAMPS Derivatives - ATmega1280, ATmega2560
 #
@@ -232,79 +221,79 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1112)
 else ifeq ($(HARDWARE_MOTHERBOARD),1113)
 # BigTreeTech or BIQU KFB2.0
 else ifeq ($(HARDWARE_MOTHERBOARD),1114)
-# Zonestar zrib V2.0 (Chinese RAMPS replica)
+# zrib V2.0 (Chinese RAMPS replica)
 else ifeq ($(HARDWARE_MOTHERBOARD),1115)
-# Zonestar zrib V5.2 (Chinese RAMPS replica)
+# zrib V5.2 (Chinese RAMPS replica)
 else ifeq ($(HARDWARE_MOTHERBOARD),1116)
-# Zonestar zrib V5.3 (Chinese RAMPS replica)
-else ifeq ($(HARDWARE_MOTHERBOARD),1117)
 # Felix 2.0+ Electronics Board (RAMPS like)
-else ifeq ($(HARDWARE_MOTHERBOARD),1118)
+else ifeq ($(HARDWARE_MOTHERBOARD),1117)
 # Invent-A-Part RigidBoard
-else ifeq ($(HARDWARE_MOTHERBOARD),1119)
+else ifeq ($(HARDWARE_MOTHERBOARD),1118)
 # Invent-A-Part RigidBoard V2
-else ifeq ($(HARDWARE_MOTHERBOARD),1120)
+else ifeq ($(HARDWARE_MOTHERBOARD),1119)
 # Sainsmart 2-in-1 board
-else ifeq ($(HARDWARE_MOTHERBOARD),1121)
+else ifeq ($(HARDWARE_MOTHERBOARD),1120)
 # Ultimaker
-else ifeq ($(HARDWARE_MOTHERBOARD),1122)
+else ifeq ($(HARDWARE_MOTHERBOARD),1121)
 # Ultimaker (Older electronics. Pre 1.5.4. This is rare)
-else ifeq ($(HARDWARE_MOTHERBOARD),1123)
+else ifeq ($(HARDWARE_MOTHERBOARD),1122)
   MCU              ?= atmega1280
   PROG_MCU         ?= m1280
 # Azteeg X3
-else ifeq ($(HARDWARE_MOTHERBOARD),1124)
+else ifeq ($(HARDWARE_MOTHERBOARD),1123)
 # Azteeg X3 Pro
-else ifeq ($(HARDWARE_MOTHERBOARD),1125)
+else ifeq ($(HARDWARE_MOTHERBOARD),1124)
 # Ultimainboard 2.x (Uses TEMP_SENSOR 20)
-else ifeq ($(HARDWARE_MOTHERBOARD),1126)
+else ifeq ($(HARDWARE_MOTHERBOARD),1125)
 # Rumba
-else ifeq ($(HARDWARE_MOTHERBOARD),1127)
+else ifeq ($(HARDWARE_MOTHERBOARD),1126)
 # Raise3D N series Rumba derivative
-else ifeq ($(HARDWARE_MOTHERBOARD),1128)
+else ifeq ($(HARDWARE_MOTHERBOARD),1127)
 # Rapide Lite 200 (v1, low-cost RUMBA clone with drv)
-else ifeq ($(HARDWARE_MOTHERBOARD),1129)
+else ifeq ($(HARDWARE_MOTHERBOARD),1128)
 # Formbot T-Rex 2 Plus
-else ifeq ($(HARDWARE_MOTHERBOARD),1130)
+else ifeq ($(HARDWARE_MOTHERBOARD),1129)
 # Formbot T-Rex 3
-else ifeq ($(HARDWARE_MOTHERBOARD),1131)
+else ifeq ($(HARDWARE_MOTHERBOARD),1130)
 # Formbot Raptor
-else ifeq ($(HARDWARE_MOTHERBOARD),1132)
+else ifeq ($(HARDWARE_MOTHERBOARD),1131)
 # Formbot Raptor 2
-else ifeq ($(HARDWARE_MOTHERBOARD),1133)
+else ifeq ($(HARDWARE_MOTHERBOARD),1132)
 # bq ZUM Mega 3D
-else ifeq ($(HARDWARE_MOTHERBOARD),1134)
+else ifeq ($(HARDWARE_MOTHERBOARD),1133)
 # MakeBoard Mini v2.1.2 by MicroMake
-else ifeq ($(HARDWARE_MOTHERBOARD),1135)
+else ifeq ($(HARDWARE_MOTHERBOARD),1134)
 # TriGorilla Anycubic version 1.3-based on RAMPS EFB
-else ifeq ($(HARDWARE_MOTHERBOARD),1136)
+else ifeq ($(HARDWARE_MOTHERBOARD),1135)
 #   ... Ver 1.4
-else ifeq ($(HARDWARE_MOTHERBOARD),1137)
+else ifeq ($(HARDWARE_MOTHERBOARD),1136)
 #   ... Rev 1.1 (new servo pin order)
-else ifeq ($(HARDWARE_MOTHERBOARD),1138)
+else ifeq ($(HARDWARE_MOTHERBOARD),1137)
 # Creality: Ender-4, CR-8
-else ifeq ($(HARDWARE_MOTHERBOARD),1139)
+else ifeq ($(HARDWARE_MOTHERBOARD),1138)
 # Creality: CR10S, CR20, CR-X
-else ifeq ($(HARDWARE_MOTHERBOARD),1140)
+else ifeq ($(HARDWARE_MOTHERBOARD),1139)
-# Creality CR-10 V2, CR-10 V3
-else ifeq ($(HARDWARE_MOTHERBOARD),1141)
 # Dagoma F5
-else ifeq ($(HARDWARE_MOTHERBOARD),1142)
+else ifeq ($(HARDWARE_MOTHERBOARD),1140)
-# Dagoma D6 (as found in the Dagoma DiscoUltimate V2 TMC)
-else ifeq ($(HARDWARE_MOTHERBOARD),1143)
 # FYSETC F6 1.3
-else ifeq ($(HARDWARE_MOTHERBOARD),1144)
+else ifeq ($(HARDWARE_MOTHERBOARD),1141)
 # FYSETC F6 1.4
-else ifeq ($(HARDWARE_MOTHERBOARD),1145)
+else ifeq ($(HARDWARE_MOTHERBOARD),1142)
 # Wanhao Duplicator i3 Plus
-else ifeq ($(HARDWARE_MOTHERBOARD),1146)
+else ifeq ($(HARDWARE_MOTHERBOARD),1143)
 # VORON Design
-else ifeq ($(HARDWARE_MOTHERBOARD),1147)
+else ifeq ($(HARDWARE_MOTHERBOARD),1144)
 # Tronxy TRONXY-V3-1.0
-else ifeq ($(HARDWARE_MOTHERBOARD),1148)
+else ifeq ($(HARDWARE_MOTHERBOARD),1145)
 # Z-Bolt X Series
-else ifeq ($(HARDWARE_MOTHERBOARD),1149)
+else ifeq ($(HARDWARE_MOTHERBOARD),1146)
 # TT OSCAR
+else ifeq ($(HARDWARE_MOTHERBOARD),1147)
+# Overlord/Overlord Pro
+else ifeq ($(HARDWARE_MOTHERBOARD),1148)
+# ADIMLab Gantry v1
+else ifeq ($(HARDWARE_MOTHERBOARD),1149)
+# ADIMLab Gantry v2
 else ifeq ($(HARDWARE_MOTHERBOARD),1150)
 # BIQU Tango V1
 else ifeq ($(HARDWARE_MOTHERBOARD),1151)
@@ -318,7 +307,7 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1154)
 else ifeq ($(HARDWARE_MOTHERBOARD),1155)
 # Tenlog D3 Hero IDEX printer
 else ifeq ($(HARDWARE_MOTHERBOARD),1156)
-# Tenlog D3, D5, D6 IDEX Printer
+# 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)
@@ -330,18 +319,10 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1160)
 else ifeq ($(HARDWARE_MOTHERBOARD),1161)
 # Longer LKx PRO / Alfawise Uxx Pro (PRO version)
 else ifeq ($(HARDWARE_MOTHERBOARD),1162)
-# Pxmalion Core I3
+# Zonestar zrib V5.3 (Chinese RAMPS replica)
 else ifeq ($(HARDWARE_MOTHERBOARD),1163)
-# Panowin Cutlass (as found in the Panowin F1)
+# Pxmalion Core I3
 else ifeq ($(HARDWARE_MOTHERBOARD),1164)
-# Kodama Bardo V1.x (as found in the Kodama Trinus)
-else ifeq ($(HARDWARE_MOTHERBOARD),1165)
-# XTLW MFF V1.0
-else ifeq ($(HARDWARE_MOTHERBOARD),1166)
-# XTLW MFF V2.0
-else ifeq ($(HARDWARE_MOTHERBOARD),1167)
-# E3D Rumba BigBox
-else ifeq ($(HARDWARE_MOTHERBOARD),1168)
 
 #
 # RAMBo and derivatives
@@ -359,7 +340,7 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1203)
 else ifeq ($(HARDWARE_MOTHERBOARD),1204)
 # abee Scoovo X9H
 else ifeq ($(HARDWARE_MOTHERBOARD),1205)
-# ThinkerV2
+# Rambo ThinkerV2
 else ifeq ($(HARDWARE_MOTHERBOARD),1206)
 
 #
@@ -402,42 +383,30 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1315)
 else ifeq ($(HARDWARE_MOTHERBOARD),1316)
 # Geeetech GT2560 Rev B for A10(M/T/D)
 else ifeq ($(HARDWARE_MOTHERBOARD),1317)
-# Geeetech GT2560 Rev B for Mecreator2
-else ifeq ($(HARDWARE_MOTHERBOARD),1318)
-# Geeetech GT2560 Rev B for A20(M/T/D)
-else ifeq ($(HARDWARE_MOTHERBOARD),1319)
 # Geeetech GT2560 Rev B for A10(M/T/D)
-else ifeq ($(HARDWARE_MOTHERBOARD),1320)
+else ifeq ($(HARDWARE_MOTHERBOARD),1318)
+# Geeetech GT2560 Rev B for Mecreator2
+else ifeq ($(HARDWARE_MOTHERBOARD),1319)
 # Geeetech GT2560 Rev B for A20(M/T/D)
-else ifeq ($(HARDWARE_MOTHERBOARD),1321)
+else ifeq ($(HARDWARE_MOTHERBOARD),1320)
-# Geeetech GT2560 V4.1B for A10(M/T/D)
-else ifeq ($(HARDWARE_MOTHERBOARD),1322)
 # Einstart retrofit
-else ifeq ($(HARDWARE_MOTHERBOARD),1323)
+else ifeq ($(HARDWARE_MOTHERBOARD),1321)
 # Wanhao 0ne+ i3 Mini
-else ifeq ($(HARDWARE_MOTHERBOARD),1324)
+else ifeq ($(HARDWARE_MOTHERBOARD),1322)
-# Wanhao D9 MK2
-else ifeq ($(HARDWARE_MOTHERBOARD),1325)
-# Overlord/Overlord Pro
-else ifeq ($(HARDWARE_MOTHERBOARD),1326)
-# ADIMLab Gantry v1
-else ifeq ($(HARDWARE_MOTHERBOARD),1327)
-# ADIMLab Gantry v2
-else ifeq ($(HARDWARE_MOTHERBOARD),1328)
 # Leapfrog Xeed 2015
-else ifeq ($(HARDWARE_MOTHERBOARD),1329)
+else ifeq ($(HARDWARE_MOTHERBOARD),1323)
 # PICA Shield (original version)
-else ifeq ($(HARDWARE_MOTHERBOARD),1330)
+else ifeq ($(HARDWARE_MOTHERBOARD),1324)
 # PICA Shield (rev C or later)
-else ifeq ($(HARDWARE_MOTHERBOARD),1331)
+else ifeq ($(HARDWARE_MOTHERBOARD),1325)
 # Intamsys 4.0 (Funmat HT)
-else ifeq ($(HARDWARE_MOTHERBOARD),1332)
+else ifeq ($(HARDWARE_MOTHERBOARD),1326)
-# Malyan M180 Mainboard Version 2
+# Malyan M180 Mainboard Version 2 (no display function, direct G-code only)
-else ifeq ($(HARDWARE_MOTHERBOARD),1333)
+else ifeq ($(HARDWARE_MOTHERBOARD),1327)
+# Geeetech GT2560 Rev B for A20(M/T/D)
+else ifeq ($(HARDWARE_MOTHERBOARD),1328)
 # Mega controller & Protoneer CNC Shield V3.00
-else ifeq ($(HARDWARE_MOTHERBOARD),1334)
+else ifeq ($(HARDWARE_MOTHERBOARD),1329)
-# WEEDO 62A board (TINA2, Monoprice Cadet, etc.)
-else ifeq ($(HARDWARE_MOTHERBOARD),1335)
 
 #
 # ATmega1281, ATmega2561
@@ -471,7 +440,7 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1502)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega644p
   PROG_MCU         ?= m644p
-# Melzi V2
+# Melzi V2.0
 else ifeq ($(HARDWARE_MOTHERBOARD),1503)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega1284p
@@ -481,43 +450,38 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1504)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega1284p
   PROG_MCU         ?= m1284p
-# Melzi Creality3D (for CR-10 etc)
+# Melzi Creality3D board (for CR-10 etc)
 else ifeq ($(HARDWARE_MOTHERBOARD),1505)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega1284p
   PROG_MCU         ?= m1284p
-# Melzi Creality3D (for Ender-2)
+# Melzi Malyan M150 board
 else ifeq ($(HARDWARE_MOTHERBOARD),1506)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega1284p
   PROG_MCU         ?= m1284p
-# Melzi Malyan M150
+# Tronxy X5S
 else ifeq ($(HARDWARE_MOTHERBOARD),1507)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega1284p
   PROG_MCU         ?= m1284p
-# Tronxy X5S
+# STB V1.1
 else ifeq ($(HARDWARE_MOTHERBOARD),1508)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega1284p
   PROG_MCU         ?= m1284p
-# STB V1.1
+# Azteeg X1
 else ifeq ($(HARDWARE_MOTHERBOARD),1509)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega1284p
   PROG_MCU         ?= m1284p
-# Azteeg X1
+# Anet 1.0 (Melzi clone)
 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),1512)
+else ifeq ($(HARDWARE_MOTHERBOARD),1511)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega1284p
   PROG_MCU         ?= m1284p
@@ -631,10 +595,6 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1707)
   MCU              ?= at90usb1286
   PROG_MCU         ?= usb1286
 
-#
-# SAM3X8E ARM Cortex-M3
-#
-
 # UltiMachine Archim1 (with DRV8825 drivers)
 else ifeq ($(HARDWARE_MOTHERBOARD),3023)
   HARDWARE_VARIANT ?= archim
@@ -807,10 +767,10 @@ endif
 
 ifeq ($(TMC), 1)
   LIB_CXXSRC += TMCStepper.cpp COOLCONF.cpp DRV_STATUS.cpp IHOLD_IRUN.cpp \
-    CHOPCONF.cpp GCONF.cpp PWMCONF.cpp DRV_CONF.cpp DRVCONF.cpp DRVCTRL.cpp DRVSTATUS.cpp \
+    CHOPCONF.cpp GCONF.cpp PWMCONF.cpp DRV_CONF.cpp DRVCONF.cpp DRVCTRL.cpp \
-    GLOBAL_SCALER.cpp SLAVECONF.cpp IOIN.cpp ENCMODE.cpp RAMP_STAT.cpp SGCSCONF.cpp \
+    DRVSTATUS.cpp ENCMODE.cpp RAMP_STAT.cpp SGCSCONF.cpp SHORT_CONF.cpp \
-    SHORT_CONF.cpp SMARTEN.cpp SW_MODE.cpp SW_SPI.cpp TMC2130Stepper.cpp TMC2208Stepper.cpp \
+    SMARTEN.cpp SW_MODE.cpp SW_SPI.cpp TMC2130Stepper.cpp TMC2208Stepper.cpp \
-    TMC2209Stepper.cpp TMC2240Stepper.cpp TMC2660Stepper.cpp TMC5130Stepper.cpp TMC5160Stepper.cpp
+    TMC2209Stepper.cpp TMC2660Stepper.cpp TMC5130Stepper.cpp TMC5160Stepper.cpp
 endif
 
 ifeq ($(RELOC_WORKAROUND), 1)
@@ -877,8 +837,8 @@ else ifeq ($(HARDWARE_VARIANT), archim)
 endif
 
 # Add all the source directories as include directories too
-CINCS = ${addprefix -I, ${VPATH}}
+CINCS = ${addprefix -I ,${VPATH}}
-CXXINCS = ${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
@@ -1035,7 +995,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)

Marlin/Marlin.ino

@@ -2,7 +2,7 @@
 
   Marlin Firmware
 
-  (c) 2011-2024 MarlinFirmware
+  (c) 2011-2023 MarlinFirmware
   Portions of Marlin are (c) by their respective authors.
   All code complies with GPLv2 and/or GPLv3
 

Marlin/Version.h

@@ -41,14 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2025-12-02"
+//#define STRING_DISTRIBUTION_DATE "2024-01-09"
-
-/**
- * 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.
@@ -75,8 +68,8 @@
 //#define WEBSITE_URL "marlinfw.org"
 
 /**
- * Set the vendor info the serial USB interface, if changeable.
+ * Set the vendor info the serial USB interface, if changable
- * Currently only supported by DUE platform.
+ * Currently only supported by DUE platform
  */
 //#define USB_DEVICE_VENDOR_ID           0x0000
 //#define USB_DEVICE_PRODUCT_ID          0x0000

Marlin/_Bootscreen.h

@@ -0,0 +1,103 @@
+/**
+ * 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
+ */
+#include <avr/pgmspace.h>
+
+#define CUSTOM_BOOTSCREEN_TIMEOUT   2500
+#define CUSTOM_BOOTSCREEN_BMPWIDTH  60
+#define CUSTOM_BOOTSCREEN_BMPHEIGHT 64
+
+const unsigned char custom_start_bmp[574] PROGMEM = {
+0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+0x0, 0x0, 0x0, 0xc, 0x0, 0x0, 0x0, 0x0,
+0x0, 0x0, 0x0, 0xc, 0x0, 0x0, 0x0, 0x0,
+0x0, 0x0, 0x0, 0x12, 0x0, 0x0, 0x0, 0x0,
+0x0, 0x0, 0x0, 0x23, 0x0, 0x0, 0x0, 0x0,
+0x0, 0x0, 0x0, 0x21, 0x0, 0x0, 0x0, 0x0,
+0x0, 0x0, 0x0, 0x4c, 0x80, 0x0, 0x0, 0x0,
+0x0, 0x0, 0x0, 0x5e, 0x80, 0x0, 0x0, 0x0,
+0x0, 0x0, 0x0, 0x92, 0x40, 0x0, 0x0, 0x0,
+0x0, 0x0, 0x0, 0xa1, 0x40, 0x0, 0x0, 0x0,
+0x0, 0x0, 0x1, 0x21, 0x20, 0x0, 0x0, 0x0,
+0x0, 0x0, 0x2, 0x7f, 0x90, 0x0, 0x0, 0x0,
+0x0, 0x0, 0x2, 0x0, 0x10, 0x0, 0x0, 0x0,
+0x0, 0x0, 0x7, 0xff, 0xf8, 0x0, 0x0, 0x0,
+0x0, 0x0, 0x4, 0x0, 0x8, 0x0, 0x0, 0x0,
+0x0, 0x0, 0x8, 0x0, 0x4, 0x0, 0x0, 0x0,
+0x0, 0x0, 0x8, 0x0, 0x6, 0x0, 0x0, 0x0,
+0x0, 0x0, 0x10, 0x0, 0x2, 0x0, 0x0, 0x0,
+0x0, 0x0, 0x30, 0x1e, 0x1, 0x0, 0x0, 0x0,
+0x0, 0x0, 0x20, 0x7f, 0x81, 0x0, 0x0, 0x0,
+0x0, 0x0, 0x41, 0xff, 0xe0, 0x80, 0x0, 0x0,
+0x0, 0x0, 0x43, 0xfc, 0xf0, 0x80, 0x0, 0x0,
+0x0, 0x0, 0x87, 0x3b, 0x78, 0x40, 0x0, 0x0,
+0x0, 0x1, 0x8e, 0xdb, 0xfc, 0x60, 0x0, 0x0,
+0x0, 0x1, 0xf, 0xeb, 0xcc, 0x20, 0x0, 0x0,
+0x0, 0x2, 0x1f, 0xed, 0xb6, 0x10, 0x0, 0x0,
+0x0, 0x2, 0x1f, 0xde, 0xb6, 0x10, 0x0, 0x0,
+0x0, 0x4, 0x39, 0xcd, 0x7f, 0x8, 0x0, 0x0,
+0x0, 0x4, 0x36, 0xe0, 0xff, 0x8, 0x0, 0x0,
+0x0, 0x8, 0x7e, 0xc0, 0xbb, 0x84, 0x0, 0x0,
+0x0, 0x18, 0x7f, 0x0, 0x5d, 0x86, 0x0, 0x0,
+0x0, 0x10, 0x7f, 0xc0, 0xed, 0x82, 0x0, 0x0,
+0x0, 0x20, 0x3c, 0xc0, 0x73, 0x1, 0x0, 0x0,
+0x0, 0x20, 0x3b, 0x33, 0x7f, 0x1, 0x0, 0x0,
+0x0, 0x70, 0x1b, 0xe7, 0x7e, 0x3, 0x80, 0x0,
+0x0, 0xc8, 0x1d, 0xee, 0xde, 0x4, 0xc0, 0x0,
+0x0, 0x88, 0xf, 0xde, 0xdc, 0x4, 0x40, 0x0,
+0x1, 0x24, 0xf, 0xdf, 0x3c, 0x9, 0x20, 0x0,
+0x1, 0x26, 0x7, 0xdb, 0xf8, 0x19, 0x20, 0x0,
+0x2, 0x72, 0x3, 0xe7, 0xf0, 0x13, 0x90, 0x0,
+0x2, 0x51, 0x1, 0xff, 0xe0, 0x22, 0x90, 0x0,
+0x4, 0x89, 0x0, 0x7f, 0x80, 0x24, 0x48, 0x0,
+0x9, 0x4, 0x80, 0x1e, 0x0, 0x48, 0x24, 0x0,
+0xb, 0xfe, 0x40, 0x0, 0x0, 0xdf, 0xf4, 0x0,
+0x10, 0x0, 0x40, 0x0, 0x0, 0x80, 0x2, 0x0,
+0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x0,
+0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+0x10, 0x22, 0x10, 0x3c, 0x3c, 0xe, 0x1f, 0x0,
+0x10, 0x22, 0x10, 0x4, 0x22, 0x11, 0x4, 0x0,
+0x10, 0x22, 0x10, 0x8, 0x22, 0x11, 0x4, 0x0,
+0x10, 0x22, 0x10, 0x8, 0x3c, 0x11, 0x4, 0x0,
+0x10, 0x22, 0x10, 0x10, 0x22, 0x11, 0x4, 0x0,
+0x10, 0x22, 0x10, 0x20, 0x22, 0x11, 0x4, 0x0,
+0x1e, 0x1c, 0x1e, 0x3c, 0x3c, 0xe, 0x4, 0x0,
+0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
+};

Marlin/config.ini

@@ -62,11 +62,6 @@ 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
@@ -82,25 +77,18 @@ 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
-pid_functional_range                     = 20
+pid_functional_range                     = 10
 
 default_kp                               = 22.20
 default_ki                               = 1.08
 default_kd                               = 114.00
 
-temp_sensor_bed                          = 1
-bed_check_interval                       = 5000
-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
@@ -133,10 +121,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                              = LOW
+x_enable_on                              = 0
-y_enable_on                              = LOW
+y_enable_on                              = 0
-z_enable_on                              = LOW
+z_enable_on                              = 0
-e_enable_on                              = LOW
+e_enable_on                              = 0
 
 invert_x_dir                             = false
 invert_y_dir                             = true
@@ -148,6 +136,11 @@ 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
 
@@ -160,33 +153,30 @@ 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]
-hotend_overshoot                         = 15
 bed_overshoot                            = 10
-max_bed_power                            = 255
-
 busy_while_heating                       = on
-host_keepalive_feature                   = on
+default_ejerk                            = 5.0
 default_keepalive_interval               = 2
-printjob_timer_autostart                 = on
+default_leveling_fade_height             = 0.0
-
+disable_other_extruders                  = on
-jd_handle_small_segments                 = on
+display_charset_hd44780                  = JAPANESE
-validate_homing_endstops                 = on
-editable_steps_per_unit                  = on
-
 eeprom_boot_silent                       = on
 eeprom_chitchat                          = on
-
 endstoppullups                           = on
-
-prevent_cold_extrusion                   = on
-extrude_mintemp                          = 170
-prevent_lengthy_extrude                  = on
 extrude_maxlength                        = 200
-
+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
@@ -195,60 +185,63 @@ min_software_endstop_z                   = on
 max_software_endstop_x                   = on
 max_software_endstop_y                   = on
 max_software_endstop_z                   = on
-
-preheat_1_label                          = "PLA"
-preheat_1_temp_hotend                    = 180
-preheat_1_temp_bed                       = 70
 preheat_1_fan_speed                      = 0
-
+preheat_1_label                          = "PLA"
-preheat_2_label                          = "ABS"
+preheat_1_temp_bed                       = 70
-preheat_2_temp_hotend                    = 240
+prevent_cold_extrusion                   = on
-preheat_2_temp_bed                       = 110
+prevent_lengthy_extrude                  = on
-preheat_2_fan_speed                      = 0
+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
 
 [config:advanced]
 arc_support                              = on
-min_arc_segment_mm                       = 0.1
-max_arc_segment_mm                       = 1.0
-min_circle_segments                      = 72
-n_arc_correction                         = 25
-
 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
+min_circle_segments                      = 72
+n_arc_correction                         = 25
+serial_overrun_protection                = on
 slowdown                                 = on
 slowdown_divisor                         = 2
-multistepping_limit                      = 16
+temp_sensor_bed                          = 0
-
+thermal_protection_bed_hysteresis        = 2
-serial_overrun_protection                = on
+thermocouple_max_errors                  = 15
 tx_buffer_size                           = 0
-
-watch_temp_increase                      = 2
-watch_temp_period                        = 40
-
 watch_bed_temp_increase                  = 2
 watch_bed_temp_period                    = 60
+watch_temp_increase                      = 2
+watch_temp_period                        = 20

Marlin/src/HAL/AVR/HAL.cpp

@@ -81,12 +81,6 @@ void MarlinHAL::init() {
   #if HAS_SERVO_3
     OUT_WRITE(SERVO3_PIN, LOW);
   #endif
-  #if HAS_SERVO_4
-    OUT_WRITE(SERVO4_PIN, LOW);
-  #endif
-  #if HAS_SERVO_5
-    OUT_WRITE(SERVO5_PIN, LOW);
-  #endif
 
   init_pwm_timers();   // Init user timers to default frequency - 1000HZ
 
@@ -119,6 +113,7 @@ void MarlinHAL::reboot() {
 #if ENABLED(USE_WATCHDOG)
 
   #include <avr/wdt.h>
+  #include "../../MarlinCore.h"
 
   // Initialize watchdog with 8s timeout, if possible. Otherwise, make it 4s.
   void MarlinHAL::watchdog_init() {
@@ -153,7 +148,7 @@ void MarlinHAL::reboot() {
     ISR(WDT_vect) {
       sei();  // With the interrupt driven serial we need to allow interrupts.
       SERIAL_ERROR_MSG(STR_WATCHDOG_FIRED);
-      marlin.minkill();  // interrupt-safe final kill and infinite loop
+      minkill();  // interrupt-safe final kill and infinite loop
     }
   #endif
 

Marlin/src/HAL/AVR/HAL.h

@@ -129,11 +129,11 @@ typedef Servo hal_servo_t;
   #endif
 #endif
 
-#ifdef MMU_SERIAL_PORT
+#ifdef MMU2_SERIAL_PORT
-  #if !WITHIN(MMU_SERIAL_PORT, 0, 3)
+  #if !WITHIN(MMU2_SERIAL_PORT, 0, 3)
-    #error "MMU_SERIAL_PORT must be from 0 to 3"
+    #error "MMU2_SERIAL_PORT must be from 0 to 3"
   #endif
-  #define MMU_SERIAL mmuSerial
+  #define MMU2_SERIAL mmuSerial
 #endif
 
 #ifdef LCD_SERIAL_PORT
@@ -141,7 +141,7 @@ typedef Servo hal_servo_t;
     #error "LCD_SERIAL_PORT must be from 0 to 3."
   #endif
   #define LCD_SERIAL lcdSerial
-  #if ANY(HAS_DGUS_LCD, EXTENSIBLE_UI)
+  #if HAS_DGUS_LCD
     #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,9 +204,9 @@ public:
   static void isr_on()  { sei(); }
   static void isr_off() { cli(); }
 
-  static void delay_ms(const int ms) { delay(ms); }
+  static void delay_ms(const int ms) { _delay_ms(ms); }
 
-  // Tasks, called from marlin.idle()
+  // Tasks, called from idle()
   static void idletask() {}
 
   // Reset

Marlin/src/HAL/AVR/HAL_SPI.cpp

@@ -119,6 +119,7 @@ void spiBegin() {
     while (!TEST(SPSR, SPIF)) { /* Intentionally left empty */ }
   }
 
+
   /** begin spi transaction */
   void spiBeginTransaction(uint32_t spiClock, uint8_t bitOrder, uint8_t dataMode) {
     // Based on Arduino SPI library
@@ -174,6 +175,7 @@ void spiBegin() {
     SPSR = clockDiv | 0x01;
   }
 
+
 #else // SOFTWARE_SPI || FORCE_SOFT_SPI
 
   // ------------------------

Marlin/src/HAL/AVR/MarlinSerial.cpp

@@ -41,6 +41,7 @@
 #if !defined(USBCON) && (defined(UBRRH) || defined(UBRR0H) || defined(UBRR1H) || defined(UBRR2H) || defined(UBRR3H))
 
 #include "MarlinSerial.h"
+#include "../../MarlinCore.h"
 
 #if ENABLED(DIRECT_STEPPING)
   #include "../../feature/direct_stepping.h"
@@ -600,20 +601,20 @@ MSerialT1 customizedSerial1(MSerialT1::HasEmergencyParser);
 
 #endif // SERIAL_PORT_3
 
-#ifdef MMU_SERIAL_PORT
+#ifdef MMU2_SERIAL_PORT
 
-  ISR(SERIAL_REGNAME(USART, MMU_SERIAL_PORT, _RX_vect)) {
+  ISR(SERIAL_REGNAME(USART, MMU2_SERIAL_PORT, _RX_vect)) {
-    MarlinSerial<MMU2SerialCfg<MMU_SERIAL_PORT>>::store_rxd_char();
+    MarlinSerial<MMU2SerialCfg<MMU2_SERIAL_PORT>>::store_rxd_char();
   }
 
-  ISR(SERIAL_REGNAME(USART, MMU_SERIAL_PORT, _UDRE_vect)) {
+  ISR(SERIAL_REGNAME(USART, MMU2_SERIAL_PORT, _UDRE_vect)) {
-    MarlinSerial<MMU2SerialCfg<MMU_SERIAL_PORT>>::_tx_udr_empty_irq();
+    MarlinSerial<MMU2SerialCfg<MMU2_SERIAL_PORT>>::_tx_udr_empty_irq();
   }
 
-  template class MarlinSerial< MMU2SerialCfg<MMU_SERIAL_PORT> >;
+  template class MarlinSerial< MMU2SerialCfg<MMU2_SERIAL_PORT> >;
   MSerialMMU2 mmuSerial(MSerialMMU2::HasEmergencyParser);
 
-#endif // MMU_SERIAL_PORT
+#endif // MMU2_SERIAL_PORT
 
 #ifdef LCD_SERIAL_PORT
 
@@ -628,7 +629,7 @@ MSerialT1 customizedSerial1(MSerialT1::HasEmergencyParser);
   template class MarlinSerial< LCDSerialCfg<LCD_SERIAL_PORT> >;
   MSerialLCD lcdSerial(MSerialLCD::HasEmergencyParser);
 
-  #if ANY(HAS_DGUS_LCD, EXTENSIBLE_UI)
+  #if HAS_DGUS_LCD
     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.

Marlin/src/HAL/AVR/MarlinSerial.h

@@ -205,7 +205,7 @@
     static ring_buffer_pos_t available();
     static void write(const uint8_t c);
     static void flushTX();
-    #if ANY(HAS_DGUS_LCD, EXTENSIBLE_UI)
+    #if HAS_DGUS_LCD
       static ring_buffer_pos_t get_tx_buffer_free();
     #endif
 
@@ -246,7 +246,7 @@
 
 #endif // !USBCON
 
-#ifdef MMU_SERIAL_PORT
+#ifdef MMU2_SERIAL_PORT
   template <uint8_t serial>
   struct MMU2SerialCfg {
     static constexpr int PORT               = serial;
@@ -260,7 +260,7 @@
     static constexpr bool RX_OVERRUNS       = false;
   };
 
-  typedef Serial1Class< MarlinSerial< MMU2SerialCfg<MMU_SERIAL_PORT> > > MSerialMMU2;
+  typedef Serial1Class< MarlinSerial< MMU2SerialCfg<MMU2_SERIAL_PORT> > > MSerialMMU2;
   extern MSerialMMU2 mmuSerial;
 #endif
 

Marlin/src/HAL/AVR/Servo.cpp

@@ -63,6 +63,7 @@
 
 static volatile int8_t Channel[_Nbr_16timers];              // counter for the servo being pulsed for each timer (or -1 if refresh interval)
 
+
 /************ static functions common to all instances ***********************/
 
 static inline void handle_interrupts(const timer16_Sequence_t timer, volatile uint16_t* TCNTn, volatile uint16_t* OCRnA) {

Marlin/src/HAL/AVR/eeprom.cpp

@@ -35,14 +35,14 @@
 #ifndef MARLIN_EEPROM_SIZE
   #define MARLIN_EEPROM_SIZE size_t(E2END + 1)
 #endif
-size_t PersistentStore::capacity()    { return MARLIN_EEPROM_SIZE - eeprom_exclude_size; }
+size_t PersistentStore::capacity()    { return MARLIN_EEPROM_SIZE; }
 bool PersistentStore::access_start()  { 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 * const p = (uint8_t * const)REAL_EEPROM_ADDR(pos);
+    uint8_t * const p = (uint8_t * const)pos;
     uint8_t v = *value;
     if (v != eeprom_read_byte(p)) { // EEPROM has only ~100,000 write cycles, so only write bytes that have changed!
       eeprom_write_byte(p, v);
@@ -61,7 +61,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
 
 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));
+    uint8_t c = eeprom_read_byte((uint8_t*)pos);
     if (writing) *value = c;
     crc16(crc, &c, 1);
     pos++;

Marlin/src/HAL/AVR/endstop_interrupts.h

@@ -91,6 +91,7 @@ void endstop_ISR() { endstops.update(); }
 
 #endif
 
+
 // Install Pin change interrupt for a pin. Can be called multiple times.
 void pciSetup(const int8_t pin) {
   if (digitalPinHasPCICR(pin)) {
@@ -345,14 +346,6 @@ 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.
 }

Marlin/src/HAL/AVR/fast_pwm.cpp

@@ -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;
       }

Marlin/src/HAL/AVR/fastio.cpp

@@ -241,7 +241,7 @@ uint8_t extDigitalRead(const int8_t pin) {
  *
  * DC values -1.0 to 1.0. Negative duty cycle inverts the pulse.
  */
-uint16_t set_pwm_frequency_hz(const float hz, const float dca, const float dcb, const float dcc) {
+uint16_t set_pwm_frequency_hz(const_float_t hz, const float dca, const float dcb, const float dcc) {
   float count = 0;
   if (hz > 0 && (dca || dcb || dcc)) {
     count = float(F_CPU) / hz;            // 1x prescaler, TOP for 16MHz base freq.
@@ -254,7 +254,7 @@ uint16_t set_pwm_frequency_hz(const float hz, const float dca, const float dcb,
     else                           { prescaler = 1;    SET_CS(5,    PRESCALER_1); }
 
     count /= float(prescaler);
-    const float pwm_top = roundf(count);   // Get the rounded count
+    const float pwm_top = round(count);   // Get the rounded count
 
     ICR5 = (uint16_t)pwm_top - 1;         // Subtract 1 for TOP
     OCR5A = pwm_top * ABS(dca);           // Update and scale DCs
@@ -280,7 +280,7 @@ uint16_t set_pwm_frequency_hz(const float hz, const float dca, const float dcb,
     SET_CS(5, PRESCALER_64);              // 16MHz / 64 = 250kHz
     OCR5A = OCR5B = OCR5C = 0;
   }
-  return roundf(count);
+  return round(count);
 }
 #endif
 

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

@@ -28,6 +28,9 @@
  *   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"

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

@@ -26,6 +26,9 @@
  *
  *   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"

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

@@ -26,6 +26,9 @@
  *
  *   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"

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

@@ -26,6 +26,9 @@
  *
  *   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

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

@@ -26,7 +26,10 @@
  *
  *   Logical Pin: 28 29 30 31 32 33 34 35 20 21 22 23 24 25 26 27 10 11 12 13 14 15 16 17 00 01 02 03 04 05 06 07 08 09(46*47)36 37 18 19 38 39 40 41 42 43 44 45
  *   Port:        A0 A1 A2 A3 A4 A5 A6 A7 B0 B1 B2 B3 B4 B5 B6 B7 C0 C1 C2 C3 C4 C5 C6 C7 D0 D1 D2 D3 D4 D5 D6 D7 E0 E1 E2 E3 E4 E5 E6 E7 F0 F1 F2 F3 F4 F5 F6 F7
- *            Logical pins 46-47 aren't supported by Teensyduino, but are supported below as E2 and E3
+ *            The logical pins 46 and 47 are not supported by Teensyduino, but are supported below as E2 and E3
+ *
+ * Arduino Pin Layout video: https://youtu.be/rIqeVCX09FA
+ * AVR alternate pin function overview video: https://youtu.be/1yd8wuI5Plg
  */
 
 #include "../fastio.h"
@@ -363,11 +366,8 @@
 #define AIO7_PWM    0
 #define AIO7_DDR    DDRF
 
-//-- 46-47 are not supported by Teensyduino
+//-- Begin not supported by Teensyduino
-//-- Don't use Arduino functions (pinMode, digitalWrite, etc.) on these pins
+//-- don't use Arduino functions on these pins pinMode/digitalWrite/etc
-#define PIN_E2   46
-#define PIN_E3   47
-
 #define DIO46_PIN   PINE2
 #define DIO46_RPORT PINE
 #define DIO46_WPORT PORTE
@@ -380,7 +380,10 @@
 #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
@@ -676,6 +679,7 @@
 #define PF7_PWM     0
 #define PF7_DDR     DDRF
 
+
 /**
  * Some of the pin mapping functions of the Teensduino extension to the Arduino IDE
  * do not function the same as the other Arduino extensions.

Marlin/src/HAL/AVR/inc/Conditionals_type.h

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

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

@@ -95,7 +95,7 @@
 /**
  * The Trinamic library includes SoftwareSerial.h, leading to a compile error.
  */
-#if ALL(HAS_TMC_SW_SERIAL, ENDSTOP_INTERRUPTS_FEATURE)
+#if ALL(HAS_TRINAMIC_CONFIG, ENDSTOP_INTERRUPTS_FEATURE)
   #error "TMCStepper includes SoftwareSerial.h which is incompatible with ENDSTOP_INTERRUPTS_FEATURE. Disable ENDSTOP_INTERRUPTS_FEATURE to continue."
 #endif
 

Marlin/src/HAL/AVR/pinsDebug.h

@@ -22,23 +22,7 @@
 #pragma once
 
 /**
- * Pins Debugging for Atmel 8 bit AVR CPUs
+ * PWM print routines 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"
@@ -55,44 +39,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 digitalPinToTimer_DEBUG(p) digitalPinToTimer(p)
-  #define digitalPinToBitMask_DEBUG(P) digitalPinToBitMask(P)
+  #define digitalPinToBitMask_DEBUG(p) digitalPinToBitMask(p)
-  #define digitalPinToPort_DEBUG(P) digitalPinToPort(P)
+  #define digitalPinToPort_DEBUG(p) digitalPinToPort(p)
-  #define getValidPinMode(P) (*portModeRegister(P) & digitalPinToBitMask_DEBUG(P))
+  #define GET_PINMODE(pin) (*portModeRegister(pin) & digitalPinToBitMask_DEBUG(pin))
 
 #elif AVR_ATmega2560_FAMILY_PLUS_70   // So we can access/display all the pins on boards using more than 70
 
   #include "pinsDebug_plus_70.h"
-  #define digitalPinToTimer_DEBUG(P) digitalPinToTimer_plus_70(P)
+  #define digitalPinToTimer_DEBUG(p) digitalPinToTimer_plus_70(p)
-  #define digitalPinToBitMask_DEBUG(P) digitalPinToBitMask_plus_70(P)
+  #define digitalPinToBitMask_DEBUG(p) digitalPinToBitMask_plus_70(p)
-  #define digitalPinToPort_DEBUG(P) digitalPinToPort_plus_70(P)
+  #define digitalPinToPort_DEBUG(p) digitalPinToPort_plus_70(p)
-  bool getValidPinMode(pin_t pin) {return *portModeRegister(digitalPinToPort_DEBUG(pin)) & digitalPinToBitMask_DEBUG(pin); }
+  bool GET_PINMODE(int8_t pin) {return *portModeRegister(digitalPinToPort_DEBUG(pin)) & digitalPinToBitMask_DEBUG(pin); }
 
 #else
 
-  #define digitalPinToTimer_DEBUG(P) digitalPinToTimer(P)
+  #define digitalPinToTimer_DEBUG(p) digitalPinToTimer(p)
-  #define digitalPinToBitMask_DEBUG(P) digitalPinToBitMask(P)
+  #define digitalPinToBitMask_DEBUG(p) digitalPinToBitMask(p)
-  #define digitalPinToPort_DEBUG(P) digitalPinToPort(P)
+  #define digitalPinToPort_DEBUG(p) digitalPinToPort(p)
-  bool getValidPinMode(pin_t pin) {return *portModeRegister(digitalPinToPort_DEBUG(pin)) & digitalPinToBitMask_DEBUG(pin); }
+  bool GET_PINMODE(int8_t pin) {return *portModeRegister(digitalPinToPort_DEBUG(pin)) & digitalPinToBitMask_DEBUG(pin); }
-  #define getPinByIndex(x) pgm_read_byte(&pin_array[x].pin)
+  #define GET_ARRAY_PIN(p) pgm_read_byte(&pin_array[p].pin)
 
 #endif
 
-#define isValidPin(P) (P >= 0 && P < NUMBER_PINS_TOTAL)
+#define VALID_PIN(pin) (pin >= 0 && pin < NUM_DIGITAL_PINS ? 1 : 0)
 #if AVR_ATmega1284_FAMILY
-  #define isAnalogPin(P) WITHIN(P, analogInputToDigitalPin(7), analogInputToDigitalPin(0))
+  #define IS_ANALOG(P) WITHIN(P, analogInputToDigitalPin(7), analogInputToDigitalPin(0))
-  #define digitalPinToAnalogIndex(P) int(isAnalogPin(P) ? (P) - analogInputToDigitalPin(7) : -1)
+  #define DIGITAL_PIN_TO_ANALOG_PIN(P) int(IS_ANALOG(P) ? (P) - analogInputToDigitalPin(7) : -1)
 #else
   #define _ANALOG1(P) WITHIN(P, analogInputToDigitalPin(0), analogInputToDigitalPin(7))
   #define _ANALOG2(P) WITHIN(P, analogInputToDigitalPin(8), analogInputToDigitalPin(15))
-  #define isAnalogPin(P) (_ANALOG1(P) || _ANALOG2(P))
+  #define IS_ANALOG(P) (_ANALOG1(P) || _ANALOG2(P))
-  #define digitalPinToAnalogIndex(P) int(_ANALOG1(P) ? (P) - analogInputToDigitalPin(0) : _ANALOG2(P) ? (P) - analogInputToDigitalPin(8) + 8 : -1)
+  #define DIGITAL_PIN_TO_ANALOG_PIN(P) int(_ANALOG1(P) ? (P) - analogInputToDigitalPin(0) : _ANALOG2(P) ? (P) - analogInputToDigitalPin(8) + 8 : -1)
 #endif
-#define getPinByIndex(x) pgm_read_byte(&pin_array[x].pin)
+#define GET_ARRAY_PIN(p) pgm_read_byte(&pin_array[p].pin)
 #define MULTI_NAME_PAD 26 // space needed to be pretty if not first name assigned to a pin
 
-void printPinNameByIndex(const uint8_t index) {
+void PRINT_ARRAY_NAME(uint8_t x) {
-  PGM_P const name_mem_pointer = (PGM_P)pgm_read_ptr(&pin_array[index].name);
+  PGM_P const name_mem_pointer = (PGM_P)pgm_read_ptr(&pin_array[x].name);
   for (uint8_t y = 0; y < MAX_NAME_LENGTH; ++y) {
     char temp_char = pgm_read_byte(name_mem_pointer + y);
     if (temp_char != 0)
@@ -104,7 +88,7 @@ void printPinNameByIndex(const uint8_t index) {
   }
 }
 
-#define getPinIsDigitalByIndex(x)   pgm_read_byte(&pin_array[x].is_digital)
+#define GET_ARRAY_IS_DIGITAL(x)   pgm_read_byte(&pin_array[x].is_digital)
 
 #if defined(__AVR_ATmega1284P__)  // 1284 IDE extensions set this to the number of
   #undef NUM_DIGITAL_PINS         // digital only pins while all other CPUs have it
@@ -125,7 +109,7 @@ void printPinNameByIndex(const uint8_t index) {
  * Print a pin's PWM status.
  * Return true if it's currently a PWM pin.
  */
-bool pwm_status(const uint8_t pin) {
+bool pwm_status(uint8_t pin) {
   char buffer[20];   // for the sprintf statements
 
   switch (digitalPinToTimer_DEBUG(pin)) {
@@ -179,6 +163,7 @@ bool pwm_status(const uint8_t pin) {
   SERIAL_ECHO_SP(2);
 } // pwm_status
 
+
 const volatile uint8_t* const PWM_other[][3] PROGMEM = {
     { &TCCR0A, &TCCR0B, &TIMSK0 },
     { &TCCR1A, &TCCR1B, &TIMSK1 },
@@ -196,6 +181,7 @@ const volatile uint8_t* const PWM_other[][3] PROGMEM = {
   #endif
 };
 
+
 const volatile uint8_t* const PWM_OCR[][3] PROGMEM = {
 
   #ifdef TIMER0A
@@ -231,6 +217,7 @@ const volatile uint8_t* const PWM_OCR[][3] PROGMEM = {
   #endif
 };
 
+
 #define TCCR_A(T)   pgm_read_word(&PWM_other[T][0])
 #define TCCR_B(T)   pgm_read_word(&PWM_other[T][1])
 #define TIMSK(T)    pgm_read_word(&PWM_other[T][2])
@@ -292,7 +279,7 @@ void timer_prefix(uint8_t T, char L, uint8_t N) {  // T - timer    L - pwm  N -
   if (TEST(*TMSK, TOIE)) err_prob_interrupt();
 }
 
-void printPinPWM(const uint8_t pin) {
+void pwm_details(uint8_t pin) {
   switch (digitalPinToTimer_DEBUG(pin)) {
 
     #if ABTEST(0)
@@ -363,7 +350,7 @@ void printPinPWM(const uint8_t pin) {
   #else
     UNUSED(print_is_also_tied);
   #endif
-} // printPinPWM
+} // pwm_details
 
 #ifndef digitalRead_mod                   // Use Teensyduino's version of digitalRead - it doesn't disable the PWMs
   int digitalRead_mod(const pin_t pin) {  // same as digitalRead except the PWM stop section has been removed
@@ -372,21 +359,21 @@ void printPinPWM(const uint8_t pin) {
   }
 #endif
 
-void printPinPort(const pin_t pin) {   // print port number
+void print_port(const pin_t pin) {   // print port number
   #ifdef digitalPinToPort_DEBUG
     uint8_t x;
     SERIAL_ECHOPGM("  Port: ");
     #if AVR_AT90USB1286_FAMILY
-      x = (pin == PIN_E2 || pin == PIN_E3) ? 'E' : 'A' + digitalPinToPort_DEBUG(pin) - 1;
+      x = (pin == 46 || pin == 47) ? 'E' : digitalPinToPort_DEBUG(pin) + 64;
     #else
-      x = 'A' + digitalPinToPort_DEBUG(pin) - 1;
+      x = digitalPinToPort_DEBUG(pin) + 64;
     #endif
     SERIAL_CHAR(x);
 
     #if AVR_AT90USB1286_FAMILY
-      if (pin == PIN_E2)
+      if (pin == 46)
         x = '2';
-      else if (pin == PIN_E3)
+      else if (pin == 47)
         x = '3';
       else {
         uint8_t temp = digitalPinToBitMask_DEBUG(pin);
@@ -402,7 +389,7 @@ void printPinPort(const pin_t pin) {   // print port number
   #endif
 }
 
-#define printPinNumber(P) do{ sprintf_P(buffer, PSTR("%3d "), P); SERIAL_ECHO(buffer); }while(0)
+#define PRINT_PIN(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)
+#define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); SERIAL_ECHO(buffer); }while(0)
 
 #undef ABTEST

Marlin/src/HAL/AVR/pinsDebug_Teensyduino.h

@@ -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

Marlin/src/HAL/AVR/pinsDebug_plus_70.h

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

Marlin/src/HAL/AVR/registers.h

@@ -93,15 +93,15 @@ namespace AVRHelpers {
     typedef T type;
   };
   template <typename T>
-  struct voltype <T, 1U> {
+  struct voltype <T, 1u> {
     typedef uint8_t type;
   };
   template <typename T>
-  struct voltype <T, 2U> {
+  struct voltype <T, 2u> {
     typedef uint16_t type;
   };
   template <typename T>
-  struct voltype <T, 4U> {
+  struct voltype <T, 4u> {
     typedef uint32_t type;
   };
 
@@ -2007,7 +2007,7 @@ inline void _ATmega_resetperipherals() {
 
   #if defined(__AVR_TRM01__) || defined(__AVR_TRM02__) || defined(__AVR_TRM03__) || defined(__AVR_TRM05__)
     _EEAR._EEAR = 0;
-    dwrite(_EEDR, (uint8_t)0U);
+    dwrite(_EEDR, (uint8_t)0u);
   #endif
 
   #if defined(__AVR_TRM01__) || defined(__AVR_TRM02__) || defined(__AVR_TRM03__) || defined(__AVR_TRM04__) || defined(__AVR_TRM05__)

Marlin/src/HAL/AVR/spi_pins.h

@@ -23,41 +23,43 @@
 
 /**
  * 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 _PIN_SPI_SCK  13
+  #define AVR_SCK_PIN  13
-  #define _PIN_SPI_MISO 12
+  #define AVR_MISO_PIN 12
-  #define _PIN_SPI_MOSI 11
+  #define AVR_MOSI_PIN 11
-  #define _PIN_SPI_SS   10
+  #define AVR_SS_PIN   10
 #elif defined(__AVR_ATmega644__) || defined(__AVR_ATmega644P__) || defined(__AVR_ATmega644PA__) || defined(__AVR_ATmega1284P__)
-  #define _PIN_SPI_SCK  7
+  #define AVR_SCK_PIN  7
-  #define _PIN_SPI_MISO 6
+  #define AVR_MISO_PIN 6
-  #define _PIN_SPI_MOSI 5
+  #define AVR_MOSI_PIN 5
-  #define _PIN_SPI_SS   4
+  #define AVR_SS_PIN   4
 #elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
-  #define _PIN_SPI_SCK  52
+  #define AVR_SCK_PIN  52
-  #define _PIN_SPI_MISO 50
+  #define AVR_MISO_PIN 50
-  #define _PIN_SPI_MOSI 51
+  #define AVR_MOSI_PIN 51
-  #define _PIN_SPI_SS   53
+  #define AVR_SS_PIN   53
 #elif defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__)
-  #define _PIN_SPI_SCK  21
+  #define AVR_SCK_PIN  21
-  #define _PIN_SPI_MISO 23
+  #define AVR_MISO_PIN 23
-  #define _PIN_SPI_MOSI 22
+  #define AVR_MOSI_PIN 22
-  #define _PIN_SPI_SS   20
+  #define AVR_SS_PIN   20
 #elif defined(__AVR_ATmega1281__) || defined(__AVR_ATmega2561__)
-  #define _PIN_SPI_SCK  10
+  #define AVR_SCK_PIN  10
-  #define _PIN_SPI_MISO 12
+  #define AVR_MISO_PIN 12
-  #define _PIN_SPI_MOSI 11
+  #define AVR_MOSI_PIN 11
-  #define _PIN_SPI_SS   16
+  #define AVR_SS_PIN   16
 #endif
 
 #ifndef SD_SCK_PIN
-  #define SD_SCK_PIN  _PIN_SPI_SCK
+  #define SD_SCK_PIN  AVR_SCK_PIN
 #endif
 #ifndef SD_MISO_PIN
-  #define SD_MISO_PIN _PIN_SPI_MISO
+  #define SD_MISO_PIN AVR_MISO_PIN
 #endif
 #ifndef SD_MOSI_PIN
-  #define SD_MOSI_PIN _PIN_SPI_MOSI
+  #define SD_MOSI_PIN AVR_MOSI_PIN
+#endif
+#ifndef SD_SS_PIN
+  #define SD_SS_PIN   AVR_SS_PIN
 #endif

Marlin/src/HAL/AVR/timers.h

@@ -28,7 +28,7 @@
 // ------------------------
 
 typedef uint16_t hal_timer_t;
-#define HAL_TIMER_TYPE_MAX 0xFFFFU
+#define HAL_TIMER_TYPE_MAX 0xFFFF
 
 // ------------------------
 // Defines
@@ -46,15 +46,15 @@ typedef uint16_t hal_timer_t;
   #define MF_TIMER_TEMP         0
 #endif
 
-#define TEMP_TIMER_FREQUENCY        (((F_CPU) + 0x2000) / 0x4000)
+#define TEMP_TIMER_FREQUENCY    (((F_CPU) + 0x2000) / 0x4000)
 
-#define STEPPER_TIMER_RATE          HAL_TIMER_RATE
+#define STEPPER_TIMER_RATE      HAL_TIMER_RATE
-#define STEPPER_TIMER_PRESCALE      8
+#define STEPPER_TIMER_PRESCALE  8
-#define STEPPER_TIMER_TICKS_PER_US  ((STEPPER_TIMER_RATE) / 1000000UL)
+#define STEPPER_TIMER_TICKS_PER_US ((STEPPER_TIMER_RATE) / 1000000)
 
-#define PULSE_TIMER_RATE            STEPPER_TIMER_RATE                              // (Hz) Frequency of Pulse Timer
+#define PULSE_TIMER_RATE         STEPPER_TIMER_RATE
-#define PULSE_TIMER_TICKS_PER_US    STEPPER_TIMER_TICKS_PER_US
+#define PULSE_TIMER_PRESCALE     STEPPER_TIMER_PRESCALE
-#define PULSE_TIMER_PRESCALE        STEPPER_TIMER_PRESCALE
+#define PULSE_TIMER_TICKS_PER_US STEPPER_TIMER_TICKS_PER_US
 
 #define ENABLE_STEPPER_DRIVER_INTERRUPT()  SBI(TIMSK1, OCIE1A)
 #define DISABLE_STEPPER_DRIVER_INTERRUPT() CBI(TIMSK1, OCIE1A)
@@ -111,8 +111,8 @@ FORCE_INLINE void HAL_timer_start(const uint8_t timer_num, const uint32_t) {
  * (otherwise, characters will be lost due to UART overflow).
  * Then: Stepper, Endstops, Temperature, and -finally- all others.
  */
-inline void HAL_timer_isr_prologue(const uint8_t) {}
+#define HAL_timer_isr_prologue(T) NOOP
-inline void HAL_timer_isr_epilogue(const uint8_t) {}
+#define HAL_timer_isr_epilogue(T) NOOP
 
 #ifndef HAL_STEP_TIMER_ISR
 

Marlin/src/HAL/AVR/u8g_com_HAL_AVR_sw_spi.cpp

@@ -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/Marduino.h"
-#include "../../shared/Delay.h"
+#include "../shared/Delay.h"
 
 #include <U8glib-HAL.h>
 
@@ -120,7 +120,8 @@ void u8g_spiSend_sw_AVR_mode_3(uint8_t val) {
   U8G_ATOMIC_END();
 }
 
-#if U8G_SPI_USE_MODE_3
+
+#if ENABLED(FYSETC_MINI_12864)
   #define SPISEND_SW_AVR u8g_spiSend_sw_AVR_mode_3
 #else
   #define SPISEND_SW_AVR u8g_spiSend_sw_AVR_mode_0
@@ -143,9 +144,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 U8G_SPI_USE_MODE_3                                  // LCD SPI is running mode 3 while SD card is running mode 0
+      #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
+        if (arg_val) {                         //   SCK idle state needs to be set to the proper idle state before
-                                                              //  the next chip select goes active
+                                               //   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);
         }

Marlin/src/HAL/DUE/HAL.cpp

@@ -27,6 +27,7 @@
 #ifdef ARDUINO_ARCH_SAM
 
 #include "../../inc/MarlinConfig.h"
+#include "../../MarlinCore.h"
 
 #include <Wire.h>
 #include "usb/usb_task.h"
@@ -47,7 +48,7 @@ uint16_t MarlinHAL::adc_result;
 
 void MarlinHAL::init() {
   #if HAS_MEDIA
-    OUT_WRITE(SD_SS_PIN, HIGH);  // Try to set SDSS inactive before any other SPI users start up
+    OUT_WRITE(SDSS, 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
@@ -101,10 +102,6 @@ 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);
 
@@ -118,16 +115,15 @@ void watchdogSetup() {
       timeout = 0xFFF;
 
     // We want to enable the watchdog with the specified timeout
-    uint32_t value = (0
+    uint32_t value =
-      | WDT_MR_WDV(timeout)               // With the specified timeout
+      WDT_MR_WDV(timeout) |               // With the specified timeout
-      | WDT_MR_WDD(timeout)               // and no invalid write window
+      WDT_MR_WDD(timeout) |               // and no invalid write window
-      #if NONE(WATCHDOG_PIO_RESET, SAMV70, SAMV71, SAME70, SAMS70)
+    #if !(SAMV70 || SAMV71 || SAME70 || SAMS70)
-        | WDT_MR_WDRPROC                  // WDT fault resets processor only with this flag.
+      WDT_MR_WDRPROC   |                  // WDT fault resets processor only - We want
-                                          // Omit to also reset the PIO controller.
+                                          // to keep PIO controller state
-      #endif
+    #endif
-      | WDT_MR_WDDBGHLT                   // WDT stops in debug state.
+      WDT_MR_WDDBGHLT  |                  // WDT stops in debug state.
-      | WDT_MR_WDIDLEHLT                  // WDT stops in idle state.
+      WDT_MR_WDIDLEHLT;                   // WDT stops in idle state.
-    );
 
     #if ENABLED(WATCHDOG_RESET_MANUAL)
       // We enable the watchdog timer, but only for the interrupt.

Marlin/src/HAL/DUE/HAL.h

@@ -35,9 +35,67 @@
 
 #include <stdint.h>
 
-//
+#include "../../core/serial_hook.h"
-// Serial Ports
+
-//
+// ------------------------
+// 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
 
 #include "MarlinSerial.h"
 #include "MarlinSerialUSB.h"
@@ -69,7 +127,7 @@ typedef Servo hal_servo_t;
 #define HAL_ADC_RESOLUTION  10
 
 #ifndef analogInputToDigitalPin
-  #define analogInputToDigitalPin(p) pin_t((p < 12U) ? (p) + 54U : -1)
+  #define analogInputToDigitalPin(p) ((p < 12U) ? (p) + 54U : -1)
 #endif
 
 //
@@ -132,7 +190,7 @@ public:
 
   static void delay_ms(const int ms) { delay(ms); }
 
-  // Tasks, called from marlin.idle()
+  // Tasks, called from idle()
   static void idletask();
 
   // Reset

Marlin/src/HAL/DUE/HAL_SPI.cpp

@@ -42,7 +42,7 @@
 // Public functions
 // ------------------------
 
-#if ANY(SOFTWARE_SPI, FORCE_SOFT_SPI)
+#if ANY(DUE_SOFTWARE_SPI, FORCE_SOFT_SPI)
 
   // ------------------------
   // Software SPI
@@ -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 ),
+      : [bin]"+r"(bin),
-        [work]"+r"( work )
+        [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 ),
+      : [ptr]"+r"(ptr),
-        [todo]"+r"( todo ),
+        [todo]"+r"(todo),
-        [bin]"+r"( bin ),
+        [bin]"+r"(bin),
-        [work]"+r"( work )
+        [work]"+r"(work)
       : [bitband_miso_port]"r"( BITBAND_MISO_PORT ),
         [sck_mask]"r"( SCK_MASK ),
         [sck_port]"r"( SCK_PORT_PLUS30 )
@@ -600,8 +600,9 @@
       OUT_WRITE(SPI_EEPROM1_CS_PIN, HIGH);
       OUT_WRITE(SPI_EEPROM2_CS_PIN, HIGH);
       OUT_WRITE(SPI_FLASH_CS_PIN, HIGH);
-      OUT_WRITE(SD_SS_PIN, HIGH);
+      WRITE(SD_SS_PIN, HIGH);
-      WRITE(SD_SS_PIN, LOW);
+
+      OUT_WRITE(SDSS, LOW);
 
       PIO_Configure(
         g_APinDescription[SPI_PIN].pPort,
@@ -766,7 +767,7 @@
 
       // Disable PIO on A26 and A27
       REG_PIOA_PDR = 0x0C000000;
-      OUT_WRITE(SD_SS_PIN, HIGH);
+      OUT_WRITE(SDSS, HIGH);
 
       // Reset SPI0 (from sam lib)
       SPI0->SPI_CR = SPI_CR_SPIDIS;

Marlin/src/HAL/DUE/MarlinSerial.cpp

@@ -31,6 +31,7 @@
 
 #include "MarlinSerial.h"
 #include "InterruptVectors.h"
+#include "../../MarlinCore.h"
 
 template<typename Cfg> typename MarlinSerial<Cfg>::ring_buffer_r MarlinSerial<Cfg>::rx_buffer = { 0, 0, { 0 } };
 template<typename Cfg> typename MarlinSerial<Cfg>::ring_buffer_t MarlinSerial<Cfg>::tx_buffer = { 0 };
@@ -473,6 +474,7 @@ void MarlinSerial<Cfg>::flushTX() {
   }
 }
 
+
 // If not using the USB port as serial port
 #if defined(SERIAL_PORT) && SERIAL_PORT >= 0
   template class MarlinSerial< MarlinSerialCfg<SERIAL_PORT> >;

Marlin/src/HAL/DUE/MarlinSerial.h

@@ -33,21 +33,6 @@
 #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

Marlin/src/HAL/DUE/Servo.cpp

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

Marlin/src/HAL/DUE/eeprom_flash.cpp

@@ -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,19 +953,19 @@ 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
 #endif
-size_t PersistentStore::capacity()    { return MARLIN_EEPROM_SIZE - eeprom_exclude_size; }
+size_t PersistentStore::capacity()    { return MARLIN_EEPROM_SIZE; }
 bool PersistentStore::access_start()  { ee_Init();  return true; }
 bool PersistentStore::access_finish() { ee_Flush(); 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 * const p = (uint8_t * const)REAL_EEPROM_ADDR(pos);
+    uint8_t * const p = (uint8_t * const)pos;
     uint8_t v = *value;
     if (v != ee_Read(uint32_t(p))) { // EEPROM has only ~100,000 write cycles, so only write bytes that have changed!
       ee_Write(uint32_t(p), v);
@@ -984,7 +984,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
 
 bool PersistentStore::read_data(int &pos, uint8_t *value, size_t size, uint16_t *crc, const bool writing/*=true*/) {
   do {
-    uint8_t c = ee_Read(uint32_t(REAL_EEPROM_ADDR(pos)));
+    uint8_t c = ee_Read(uint32_t(pos));
     if (writing) *value = c;
     crc16(crc, &c, 1);
     pos++;

Marlin/src/HAL/DUE/eeprom_wired.cpp

@@ -21,7 +21,7 @@
  */
 #ifdef ARDUINO_ARCH_SAM
 
-#include "../../../inc/MarlinConfig.h"
+#include "../../inc/MarlinConfig.h"
 
 #if USE_WIRED_EEPROM
 
@@ -30,20 +30,20 @@
  * with simple implementations supplied by Marlin.
  */
 
-#include "../../shared/eeprom_if.h"
+#include "../shared/eeprom_if.h"
-#include "../../shared/eeprom_api.h"
+#include "../shared/eeprom_api.h"
 
 #ifndef MARLIN_EEPROM_SIZE
   #error "MARLIN_EEPROM_SIZE is required for I2C / SPI EEPROM."
 #endif
-size_t PersistentStore::capacity()    { return MARLIN_EEPROM_SIZE - eeprom_exclude_size; }
+size_t PersistentStore::capacity()    { return MARLIN_EEPROM_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 * const p = (uint8_t * const)REAL_EEPROM_ADDR(pos);
+    uint8_t * const p = (uint8_t * const)pos;
     uint8_t v = *value;
     if (v != eeprom_read_byte(p)) { // EEPROM has only ~100,000 write cycles, so only write bytes that have changed!
       eeprom_write_byte(p, v);
@@ -62,7 +62,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
 
 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));
+    uint8_t c = eeprom_read_byte((uint8_t*)pos);
     if (writing) *value = c;
     crc16(crc, &c, 1);
     pos++;

Marlin/src/HAL/DUE/endstop_interrupts.h

@@ -64,7 +64,6 @@ 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));

Marlin/src/HAL/DUE/fastio/G2_PWM.cpp

@@ -40,12 +40,11 @@
  * Some jitter in the Vref signal is OK so the interrupt priority is left at its default value.
  */
 
-#include "../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfig.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
@@ -57,12 +56,16 @@
 #else
   #define G2_PWM_Y 0
 #endif
-#if HAS_MOTOR_CURRENT_PWM_Z
+#if PIN_EXISTS(MOTOR_CURRENT_PWM_Z)
   #define G2_PWM_Z 1
 #else
   #define G2_PWM_Z 0
 #endif
-#define G2_PWM_E HAS_MOTOR_CURRENT_PWM_E
+#if PIN_EXISTS(MOTOR_CURRENT_PWM_E)
+  #define G2_PWM_E 1
+#else
+  #define G2_PWM_E 0
+#endif
 #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))
@@ -77,22 +80,17 @@ PWM_map ISR_table[NUM_PWMS] = PWM_MAP_INIT;
 
 void Stepper::digipot_init() {
 
-  #if G2_PWM_X
+  #if PIN_EXISTS(MOTOR_CURRENT_PWM_X)
-    OUT_WRITE(MOTOR_CURRENT_PWM_X_PIN, LOW);  // init pins
+    OUT_WRITE(MOTOR_CURRENT_PWM_X_PIN, 0);  // init pins
   #endif
-  #if G2_PWM_Y
+  #if PIN_EXISTS(MOTOR_CURRENT_PWM_Y)
-    OUT_WRITE(MOTOR_CURRENT_PWM_Y_PIN, LOW);
+    OUT_WRITE(MOTOR_CURRENT_PWM_Y_PIN, 0);
   #endif
   #if G2_PWM_Z
-    OUT_WRITE(MOTOR_CURRENT_PWM_Z_PIN, LOW);
+    OUT_WRITE(MOTOR_CURRENT_PWM_Z_PIN, 0);
   #endif
   #if G2_PWM_E
-    #if PIN_EXISTS(MOTOR_CURRENT_PWM_E)
+    OUT_WRITE(MOTOR_CURRENT_PWM_E_PIN, 0);
-      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

Marlin/src/HAL/DUE/fastio/G2_PWM.h

@@ -26,7 +26,10 @@
  * PR #7500. It is hardwired for the PRINTRBOARD_G2 Motor Current needs.
  */
 
-#include <stdint.h>
+#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
 
 #define PWM_PERIOD_US  100  // base repetition rate in micro seconds
 
@@ -46,6 +49,7 @@ extern volatile uint32_t *SODR_A, *SODR_B, *CODR_A, *CODR_B;
 
 #define PWM_MAP_INIT_ROW(IO,ZZ) { ZZ == 'A' ? SODR_A : SODR_B,  ZZ == 'A' ? CODR_A : CODR_B, 1 << _PIN(IO) }
 
+
 #define PWM_MAP_INIT {  PWM_MAP_INIT_ROW(MOTOR_CURRENT_PWM_X_PIN, 'B'), \
                         PWM_MAP_INIT_ROW(MOTOR_CURRENT_PWM_Y_PIN, 'B'), \
                         PWM_MAP_INIT_ROW(MOTOR_CURRENT_PWM_Z_PIN, 'B'), \

Marlin/src/HAL/DUE/fastio/G2_pins.h

@@ -168,6 +168,7 @@ const G2_PinDescription G2_g_APinDescription[] = {
   { PIOB, PIO_PB21,          ID_PIOB, PIO_OUTPUT_0, PIO_DEFAULT, PIN_ATTR_DIGITAL,                  NO_ADC, NO_ADC, NOT_ON_PWM,  NOT_ON_TIMER }, // PIN 52
   { PIOB, PIO_PB14,          ID_PIOB, PIO_OUTPUT_0, PIO_DEFAULT, PIN_ATTR_DIGITAL,                  NO_ADC, NO_ADC, NOT_ON_PWM,  NOT_ON_TIMER }, // PIN 53
 
+
   // 54 .. 65 - Analog pins
   // ----------------------
   { PIOA, PIO_PA16X1_AD7,    ID_PIOA, PIO_INPUT,    PIO_DEFAULT, PIN_ATTR_ANALOG,                   ADC0,   ADC7,   NOT_ON_PWM,  NOT_ON_TIMER }, // AD0

Marlin/src/HAL/DUE/inc/Conditionals_type.h

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

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

@@ -68,15 +68,16 @@
  * 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)
-  #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 ENABLED(TMC_USE_SW_SPI)
-  #if DISABLED(SOFTWARE_SPI) && ENABLED(TMC_USE_SW_SPI) && (_IS_HW_SPI(MOSI) || _IS_HW_SPI(MISO) || _IS_HW_SPI(SCK))
+    #if DISABLED(DUE_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."
+      #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
+    #endif
-  #if ENABLED(SOFTWARE_SPI) && DISABLED(TMC_USE_SW_SPI)
+  #elif ENABLED(DUE_SOFTWARE_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

Marlin/src/HAL/DUE/pinsDebug.h

@@ -19,26 +19,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#pragma once
 
 /**
- * Pins Debugging for DUE
+ * Support routines for Due
- *
+ */
- *   - NUMBER_PINS_TOTAL
+
- *   - MULTI_NAME_PAD
+/**
- *   - getPinByIndex(index)
+ * Translation of routines & variables used by pinsDebug.h
- *   - 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"
@@ -76,20 +63,20 @@
 
 #define NUMBER_PINS_TOTAL PINS_COUNT
 
-#define digitalRead_mod(P) extDigitalRead(P)  // AVR digitalRead disabled PWM before it read the pin
+#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 PRINT_ARRAY_NAME(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 PRINT_PIN(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 PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); SERIAL_ECHO(buffer); }while(0)
-#define getPinByIndex(x) pin_array[x].pin
+#define GET_ARRAY_PIN(p) pin_array[p].pin
-#define getPinIsDigitalByIndex(x) pin_array[x].is_digital
+#define GET_ARRAY_IS_DIGITAL(p) pin_array[p].is_digital
-#define isValidPin(P) (P >= 0 && P < pin_t(NUMBER_PINS_TOTAL))
+#define VALID_PIN(pin) (pin >= 0 && pin < int8_t(NUMBER_PINS_TOTAL))
-#define digitalPinToAnalogIndex(P) int(P - analogInputToDigitalPin(0))
+#define DIGITAL_PIN_TO_ANALOG_PIN(p) int(p - analogInputToDigitalPin(0))
-#define isAnalogPin(P) WITHIN(P, pin_t(analogInputToDigitalPin(0)), pin_t(analogInputToDigitalPin(NUM_ANALOG_INPUTS - 1)))
+#define IS_ANALOG(P) WITHIN(P, char(analogInputToDigitalPin(0)), char(analogInputToDigitalPin(NUM_ANALOG_INPUTS - 1)))
-#define pwm_status(P) (((g_pinStatus[P] & 0xF) == PIN_STATUS_PWM) && \
+#define pwm_status(pin) (((g_pinStatus[pin] & 0xF) == PIN_STATUS_PWM) && \
-                        ((g_APinDescription[P].ulPinAttribute & PIN_ATTR_PWM) == PIN_ATTR_PWM))
+                        ((g_APinDescription[pin].ulPinAttribute & PIN_ATTR_PWM) == PIN_ATTR_PWM))
 #define MULTI_NAME_PAD 14 // space needed to be pretty if not first name assigned to a pin
 
-bool getValidPinMode(const pin_t pin) {  // 1: output, 0: input
+bool GET_PINMODE(int8_t pin) {  // 1: output, 0: input
   volatile Pio* port = g_APinDescription[pin].pPort;
   uint32_t mask = g_APinDescription[pin].ulPin;
   uint8_t pin_status = g_pinStatus[pin] & 0xF;
@@ -98,14 +85,14 @@ bool getValidPinMode(const pin_t pin) {  // 1: output, 0: input
           || pwm_status(pin));
 }
 
-void printPinPWM(const int32_t pin) {
+void pwm_details(int32_t pin) {
   if (pwm_status(pin)) {
     uint32_t chan = g_APinDescription[pin].ulPWMChannel;
     SERIAL_ECHOPGM("PWM = ", PWM_INTERFACE->PWM_CH_NUM[chan].PWM_CDTY);
   }
 }
 
-void printPinPort(const pin_t) {}
+void print_port(const pin_t) {}
 
 /**
  * DUE Board pin   |  PORT  | Label

Marlin/src/HAL/DUE/spi_pins.h

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

Marlin/src/HAL/DUE/timers.h

@@ -34,7 +34,7 @@
 #define FORCE_INLINE __attribute__((always_inline)) inline
 
 typedef uint32_t hal_timer_t;
-#define HAL_TIMER_TYPE_MAX 0xFFFFFFFFUL
+#define HAL_TIMER_TYPE_MAX 0xFFFFFFFF
 
 #define HAL_TIMER_PRESCALER    2
 #define HAL_TIMER_RATE         ((F_CPU) / (HAL_TIMER_PRESCALER))  // frequency of timers peripherals
@@ -52,19 +52,19 @@ typedef uint32_t hal_timer_t;
   #define MF_TIMER_TONE         6  // index of timer to use for beeper tones
 #endif
 
-#define TEMP_TIMER_FREQUENCY   1000 // (Hz) Temperature ISR frequency
+#define TEMP_TIMER_FREQUENCY   1000 // temperature interrupt frequency
 
-#define STEPPER_TIMER_RATE          HAL_TIMER_RATE                                  // (Hz) Frequency of Stepper Timer ISR (HAL_TIMER_RATE / STEPPER_TIMER_PRESCALE)
+#define STEPPER_TIMER_RATE          HAL_TIMER_RATE                                        // frequency of stepper timer (HAL_TIMER_RATE / STEPPER_TIMER_PRESCALE)
-#define STEPPER_TIMER_TICKS_PER_US  ((STEPPER_TIMER_RATE) / 1000000UL)              // (MHz) Stepper Timer ticks per µs
+#define STEPPER_TIMER_TICKS_PER_US  ((STEPPER_TIMER_RATE) / 1000000)                      // stepper timer ticks per µs
 #define STEPPER_TIMER_PRESCALE      (CYCLES_PER_MICROSECOND / STEPPER_TIMER_TICKS_PER_US)
 
-#define PULSE_TIMER_RATE            STEPPER_TIMER_RATE                              // (Hz) Frequency of Pulse Timer
+#define PULSE_TIMER_RATE            STEPPER_TIMER_RATE                                    // frequency of pulse timer
-#define PULSE_TIMER_TICKS_PER_US    STEPPER_TIMER_TICKS_PER_US
 #define PULSE_TIMER_PRESCALE        STEPPER_TIMER_PRESCALE
+#define PULSE_TIMER_TICKS_PER_US    STEPPER_TIMER_TICKS_PER_US
 
-#define ENABLE_STEPPER_DRIVER_INTERRUPT()   HAL_timer_enable_interrupt(MF_TIMER_STEP)
+#define ENABLE_STEPPER_DRIVER_INTERRUPT() HAL_timer_enable_interrupt(MF_TIMER_STEP)
 #define DISABLE_STEPPER_DRIVER_INTERRUPT()  HAL_timer_disable_interrupt(MF_TIMER_STEP)
-#define STEPPER_ISR_ENABLED()               HAL_timer_interrupt_enabled(MF_TIMER_STEP)
+#define STEPPER_ISR_ENABLED() HAL_timer_interrupt_enabled(MF_TIMER_STEP)
 
 #define ENABLE_TEMPERATURE_INTERRUPT()  HAL_timer_enable_interrupt(MF_TIMER_TEMP)
 #define DISABLE_TEMPERATURE_INTERRUPT() HAL_timer_disable_interrupt(MF_TIMER_TEMP)
@@ -127,4 +127,4 @@ FORCE_INLINE static void HAL_timer_isr_prologue(const uint8_t timer_num) {
   pConfig->pTimerRegs->TC_CHANNEL[pConfig->channel].TC_SR;
 }
 
-inline void HAL_timer_isr_epilogue(const uint8_t) {}
+#define HAL_timer_isr_epilogue(T) NOOP

Marlin/src/HAL/DUE/u8g/u8g_com_HAL_DUE_sw_spi.cpp

@@ -66,7 +66,7 @@
 
 #include <U8glib-HAL.h>
 
-#if U8G_SPI_USE_MODE_3
+#if ENABLED(FYSETC_MINI_12864)
   #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 U8G_SPI_USE_MODE_3                        // LCD SPI is running mode 3 while SD card is running mode 0
+      #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
+        if (arg_val) {                        //   SCK idle state needs to be set to the proper idle state before
-                                                    //  the next chip select goes active
+                                               //   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_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);

Marlin/src/HAL/DUE/upload_extra_script.py

@@ -11,7 +11,7 @@ if pioutil.is_pio_build():
 
     if current_OS == 'Windows':
 
-        env = pioutil.env
+        Import("env")
 
         # Use bossac.exe on Windows
         env.Replace(

Marlin/src/HAL/DUE/usb/compiler.h

@@ -142,6 +142,7 @@
  */
 #define COMPILER_PACK_RESET()          COMPILER_PRAGMA(pack())
 
+
 /**
  * \brief Set aligned boundary.
  */
@@ -282,6 +283,7 @@ typedef double                  F64;  //!< 64-bit floating-point number.
 typedef uint32_t                iram_size_t;
 //! @}
 
+
 /*! \name Status Types
  */
 //! @{
@@ -289,6 +291,7 @@ typedef bool                Status_bool_t;  //!< Boolean status.
 typedef U8                  Status_t;       //!< 8-bit-coded status.
 //! @}
 
+
 /*! \name Aliasing Aggregate Types
  */
 //! @{
@@ -459,6 +462,7 @@ typedef struct
 #endif
 //! @}
 
+
 #ifndef __ASSEMBLY__ // not for assembling.
 
 //! \name Optimization Control
@@ -577,6 +581,7 @@ typedef struct
 
 //! @}
 
+
 /*! \name Zero-Bit Counting
  *
  * Under GCC, __builtin_clz and __builtin_ctz behave like macros when
@@ -687,6 +692,7 @@ typedef struct
 
 //! @}
 
+
 /*! \name Bit Reversing
  */
 //! @{
@@ -726,6 +732,7 @@ typedef struct
 
 //! @}
 
+
 /*! \name Alignment
  */
 //! @{
@@ -791,6 +798,7 @@ typedef struct
  */
 #define Long_call(addr)                   ((*(void (*)(void))(addr))())
 
+
 /*! \name MCU Endianism Handling
  * ARM is MCU little endianism.
  */
@@ -860,6 +868,7 @@ typedef struct
 #define  CPU_TO_BE32(x) swap32(x)
 //! @}
 
+
 /*! \name Endianism Conversion
  *
  * The same considerations as for clz and ctz apply here but GCC's
@@ -946,6 +955,7 @@ typedef struct
 
 //! @}
 
+
 /*! \name Target Abstraction
  */
 //! @{
@@ -987,6 +997,7 @@ typedef U8                  Byte;       //!< 8-bit unsigned integer.
 
 #endif  // #ifndef __ASSEMBLY__
 
+
 #ifdef __ICCARM__
 #define SHORTENUM           __packed
 #elif defined(__GNUC__)

Marlin/src/HAL/DUE/usb/conf_access.h

@@ -81,6 +81,7 @@
 #define LUN_0_NAME                              "\"SD/MMC Card\""
 //! @}
 
+
 /*! \name Actions Associated with Memory Accesses
  *
  * Write here the action to associate with each memory access.
@@ -111,4 +112,5 @@
 #define GLOBAL_WR_PROTECT    false   //!< Management of a global write protection.
 //! @}
 
+
 #endif // _CONF_ACCESS_H_

Marlin/src/HAL/DUE/usb/conf_clock.h

@@ -96,4 +96,5 @@
 // - UPLL frequency: 480MHz
 // - USB clock: 480 / 1 = 480MHz
 
+
 #endif /* CONF_CLOCK_H_INCLUDED */

Marlin/src/HAL/DUE/usb/conf_usb.h

@@ -88,6 +88,7 @@
 #endif
 //@}
 
+
 /**
  * USB Device Callbacks definitions (Optional)
  * @{
@@ -149,6 +150,7 @@
 
 //@}
 
+
 /**
  * USB Interface Configuration
  * @{
@@ -208,6 +210,7 @@
   //@}
   //@}
 
+
   /**
    * Configuration of MSC interface
    * @{
@@ -242,6 +245,7 @@
 
   //@}
 
+
   /**
    * Description of Composite Device
    * @{

Marlin/src/HAL/DUE/usb/ctrl_access.c

@@ -63,11 +63,12 @@
 #include "compiler.h"
 #include "preprocessor.h"
 #ifdef FREERTOS_USED
-#include <FreeRTOS.h>
+#include "FreeRTOS.h"
-#include <semphr.h>
+#include "semphr.h"
 #endif
 #include "ctrl_access.h"
 
+
 //_____ D E F I N I T I O N S ______________________________________________
 
 #ifdef FREERTOS_USED
@@ -111,6 +112,7 @@ static xSemaphoreHandle ctrl_access_semphr = NULL;
 
 #endif  // FREERTOS_USED
 
+
 #if MAX_LUN
 
 /*! \brief Initializes an entry of the LUN descriptor table.
@@ -240,14 +242,17 @@ static const struct
 
 #endif
 
+
 #if GLOBAL_WR_PROTECT == true
 bool g_wr_protect;
 #endif
 
+
 /*! \name Control Interface
  */
 //! @{
 
+
 #ifdef FREERTOS_USED
 
 bool ctrl_access_init(void)
@@ -265,6 +270,7 @@ bool ctrl_access_init(void)
   return true;
 }
 
+
 /*! \brief Locks accesses to LUNs.
  *
  * \return \c true if the access was successfully locked, else \c false.
@@ -282,6 +288,7 @@ static bool ctrl_access_lock(void)
 
 #endif  // FREERTOS_USED
 
+
 U8 get_nb_lun(void)
 {
 #if MEM_USB == ENABLE
@@ -302,11 +309,13 @@ U8 get_nb_lun(void)
 #endif
 }
 
+
 U8 get_cur_lun(void)
 {
   return LUN_ID_0;
 }
 
+
 Ctrl_status mem_test_unit_ready(U8 lun)
 {
   Ctrl_status status;
@@ -328,6 +337,7 @@ Ctrl_status mem_test_unit_ready(U8 lun)
   return status;
 }
 
+
 Ctrl_status mem_read_capacity(U8 lun, U32 *u32_nb_sector)
 {
   Ctrl_status status;
@@ -349,6 +359,7 @@ Ctrl_status mem_read_capacity(U8 lun, U32 *u32_nb_sector)
   return status;
 }
 
+
 U8 mem_sector_size(U8 lun)
 {
   U8 sector_size;
@@ -370,6 +381,7 @@ U8 mem_sector_size(U8 lun)
   return sector_size;
 }
 
+
 bool mem_unload(U8 lun, bool unload)
 {
   bool unloaded;
@@ -421,6 +433,7 @@ bool mem_wr_protect(U8 lun)
   return wr_protect;
 }
 
+
 bool mem_removal(U8 lun)
 {
   bool removal;
@@ -445,6 +458,7 @@ bool mem_removal(U8 lun)
   return removal;
 }
 
+
 const char *mem_name(U8 lun)
 {
 #if MAX_LUN==0
@@ -461,14 +475,17 @@ const char *mem_name(U8 lun)
 #endif
 }
 
+
 //! @}
 
+
 #if ACCESS_USB == true
 
 /*! \name MEM <-> USB Interface
  */
 //! @{
 
+
 Ctrl_status memory_2_usb(U8 lun, U32 addr, U16 nb_sector)
 {
   Ctrl_status status;
@@ -488,6 +505,7 @@ Ctrl_status memory_2_usb(U8 lun, U32 addr, U16 nb_sector)
   return status;
 }
 
+
 Ctrl_status usb_2_memory(U8 lun, U32 addr, U16 nb_sector)
 {
   Ctrl_status status;
@@ -507,16 +525,19 @@ Ctrl_status usb_2_memory(U8 lun, U32 addr, U16 nb_sector)
   return status;
 }
 
+
 //! @}
 
 #endif  // ACCESS_USB == true
 
+
 #if ACCESS_MEM_TO_RAM == true
 
 /*! \name MEM <-> RAM Interface
  */
 //! @{
 
+
 Ctrl_status memory_2_ram(U8 lun, U32 addr, void *ram)
 {
   Ctrl_status status;
@@ -543,6 +564,7 @@ Ctrl_status memory_2_ram(U8 lun, U32 addr, void *ram)
   return status;
 }
 
+
 Ctrl_status ram_2_memory(U8 lun, U32 addr, const void *ram)
 {
   Ctrl_status status;
@@ -569,16 +591,19 @@ Ctrl_status ram_2_memory(U8 lun, U32 addr, const void *ram)
   return status;
 }
 
+
 //! @}
 
 #endif  // ACCESS_MEM_TO_RAM == true
 
+
 #if ACCESS_STREAM == true
 
 /*! \name Streaming MEM <-> MEM Interface
  */
 //! @{
 
+
   #if ACCESS_MEM_TO_MEM == true
 
 #include "fat.h"
@@ -600,18 +625,21 @@ Ctrl_status stream_mem_to_mem(U8 src_lun, U32 src_addr, U8 dest_lun, U32 dest_ad
 
   #endif  // ACCESS_MEM_TO_MEM == true
 
+
 Ctrl_status stream_state(U8 id)
 {
   UNUSED(id);
   return CTRL_GOOD;
 }
 
+
 U16 stream_stop(U8 id)
 {
   UNUSED(id);
   return 0;
 }
 
+
 //! @}
 
 #endif // ACCESS_STREAM

Marlin/src/HAL/DUE/usb/ctrl_access.h

@@ -56,6 +56,7 @@
  * Support and FAQ: visit <a href="https://www.atmel.com/design-support/">Atmel Support</a>
  */
 
+
 #ifndef _CTRL_ACCESS_H_
 #define _CTRL_ACCESS_H_
 
@@ -88,6 +89,7 @@ typedef enum
   CTRL_BUSY       = FAIL + 2  //!< Memory not initialized or changed.
 } Ctrl_status;
 
+
 // FYI: Each Logical Unit Number (LUN) corresponds to a memory.
 
 // Check LUN defines.
@@ -134,6 +136,7 @@ typedef enum
 #define LUN_ID_USB      (MAX_LUN)           //!< First dynamic LUN (USB host mass storage).
 //! @}
 
+
 // Include LUN header files.
 #if LUN_0 == ENABLE
   #include LUN_0_INCLUDE
@@ -163,11 +166,13 @@ typedef enum
   #include LUN_USB_INCLUDE
 #endif
 
+
 // Check the configuration of write protection in conf_access.h.
 #ifndef GLOBAL_WR_PROTECT
   #error GLOBAL_WR_PROTECT must be defined as true or false in conf_access.h
 #endif
 
+
 #if GLOBAL_WR_PROTECT == true
 
 //! Write protect.
@@ -175,6 +180,7 @@ extern bool g_wr_protect;
 
 #endif
 
+
 /*! \name Control Interface
  */
 //! @{
@@ -273,6 +279,7 @@ extern const char *mem_name(U8 lun);
 
 //! @}
 
+
 #if ACCESS_USB == true
 
 /*! \name MEM <-> USB Interface
@@ -303,6 +310,7 @@ extern Ctrl_status usb_2_memory(U8 lun, U32 addr, U16 nb_sector);
 
 #endif  // ACCESS_USB == true
 
+
 #if ACCESS_MEM_TO_RAM == true
 
 /*! \name MEM <-> RAM Interface
@@ -333,6 +341,7 @@ extern Ctrl_status ram_2_memory(U8 lun, U32 addr, const void *ram);
 
 #endif  // ACCESS_MEM_TO_RAM == true
 
+
 #if ACCESS_STREAM == true
 
 /*! \name Streaming MEM <-> MEM Interface

Marlin/src/HAL/DUE/usb/mrepeat.h

@@ -57,6 +57,7 @@
 
 #include "preprocessor.h"
 
+
 //! Maximal number of repetitions supported by MREPEAT.
 #define MREPEAT_LIMIT   256
 

Marlin/src/HAL/DUE/usb/osc.h

@@ -128,6 +128,7 @@ static inline void osc_enable(uint32_t ul_id) {
     pmc_switch_sclk_to_32kxtal(PMC_OSC_BYPASS);
     break;
 
+
   case OSC_MAINCK_4M_RC:
     pmc_switch_mainck_to_fastrc(CKGR_MOR_MOSCRCF_4_MHz);
     break;
@@ -140,6 +141,7 @@ static inline void osc_enable(uint32_t ul_id) {
     pmc_switch_mainck_to_fastrc(CKGR_MOR_MOSCRCF_12_MHz);
     break;
 
+
   case OSC_MAINCK_XTAL:
     pmc_switch_mainck_to_xtal(PMC_OSC_XTAL/*,
       pmc_us_to_moscxtst(BOARD_OSC_STARTUP_US,

Marlin/src/HAL/DUE/usb/preprocessor.h

@@ -51,4 +51,5 @@
 #include "stringz.h"
 #include "mrepeat.h"
 
+
 #endif  // _PREPROCESSOR_H_

Marlin/src/HAL/DUE/usb/sbc_protocol.h

@@ -86,6 +86,7 @@ enum scsi_sbc_mode {
   SCSI_MS_MODE_CACHING = 0x08,    //!< Caching mode page
 };
 
+
 //! \name SBC-2 Device-Specific Parameter
 //@{
 #define SCSI_MS_SBC_WP              0x80    //!< Write Protected

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

@@ -18,29 +18,30 @@ extern "C" {
 void sd_mmc_spi_mem_init() {
 }
 
-inline bool media_ready() {
+Ctrl_status sd_mmc_spi_test_unit_ready() {
-  return card.isMounted() && card.isInserted() && !card.isFileOpen() && !card.isStillPrinting();
+  #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;
 }
 
 bool sd_mmc_spi_unload(bool) { return true; }
 
 bool sd_mmc_spi_wr_protect() { return false; }
 
-bool sd_mmc_spi_removal() { return !media_ready(); }
+bool sd_mmc_spi_removal() {
-
+  return (!IS_SD_INSERTED() || IS_SD_PRINTING() || IS_SD_FILE_OPEN() || !card.isMounted());
-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
@@ -57,11 +58,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) {
-  #if ENABLED(DISABLE_DUE_SD_MMC)
+  #ifdef DISABLE_DUE_SD_MMC
     return CTRL_NO_PRESENT;
   #endif
-
+  if (!IS_SD_INSERTED() || IS_SD_PRINTING() || IS_SD_FILE_OPEN() || !card.isMounted())
-  if (sd_mmc_spi_removal()) return CTRL_NO_PRESENT;
+    return CTRL_NO_PRESENT;
 
   #ifdef DEBUG_MMC
   {
@@ -97,11 +98,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) {
-  #if ENABLED(DISABLE_DUE_SD_MMC)
+  #ifdef DISABLE_DUE_SD_MMC
     return CTRL_NO_PRESENT;
   #endif
-
+  if (!IS_SD_INSERTED() || IS_SD_PRINTING() || IS_SD_FILE_OPEN() || !card.isMounted())
-  if (sd_mmc_spi_removal()) return CTRL_NO_PRESENT;
+    return CTRL_NO_PRESENT;
 
   #ifdef DEBUG_MMC
   {

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

@@ -45,6 +45,7 @@
  * Support and FAQ: visit <a href="https://www.atmel.com/design-support/">Atmel Support</a>
  */
 
+
 #ifndef _SD_MMC_SPI_MEM_H_
 #define _SD_MMC_SPI_MEM_H_
 
@@ -62,19 +63,22 @@
   #error sd_mmc_spi_mem.h is #included although SD_MMC_SPI_MEM is disabled
 #endif
 
+
 #include "ctrl_access.h"
 
+
 //_____ D E F I N I T I O N S ______________________________________________
 
 #define   SD_MMC_REMOVED       0
 #define   SD_MMC_INSERTED      1
 #define   SD_MMC_REMOVING      2
 
+
 //---- CONTROL FUNCTIONS ----
 //!
 //! @brief This function initializes the hw/sw resources required to drive the SD_MMC_SPI.
 //!/
-void sd_mmc_spi_mem_init();
+extern void           sd_mmc_spi_mem_init(void);
 
 //!
 //! @brief This function tests the state of the SD_MMC memory and sends it to the Host.
@@ -87,7 +91,7 @@ void sd_mmc_spi_mem_init();
 //!   Media not present    ->    CTRL_NO_PRESENT
 //!   Media has changed    ->    CTRL_BUSY
 //!/
-Ctrl_status sd_mmc_spi_test_unit_ready();
+extern Ctrl_status    sd_mmc_spi_test_unit_ready(void);
 
 //!
 //! @brief This function gives the address of the last valid sector.
@@ -98,7 +102,7 @@ Ctrl_status sd_mmc_spi_test_unit_ready();
 //!   Media ready          ->  CTRL_GOOD
 //!   Media not present    ->  CTRL_NO_PRESENT
 //!/
-Ctrl_status sd_mmc_spi_read_capacity(uint32_t *nb_sector);
+extern Ctrl_status    sd_mmc_spi_read_capacity(uint32_t *nb_sector);
 
 /*! \brief Unload/Load the SD/MMC card selected
  *
@@ -109,7 +113,7 @@ Ctrl_status sd_mmc_spi_read_capacity(uint32_t *nb_sector);
  *
  * \return \c true if unload/load done success.
  */
-bool sd_mmc_spi_unload(bool unload);
+extern bool sd_mmc_spi_unload(bool unload);
 
 //!
 //! @brief This function returns the write protected status of the memory.
@@ -120,14 +124,15 @@ bool sd_mmc_spi_unload(bool unload);
 //!
 //! @return false  -> the memory is not write-protected (always)
 //!/
-bool sd_mmc_spi_wr_protect();
+extern bool           sd_mmc_spi_wr_protect(void);
 
 //!
 //! @brief This function tells if the memory has been removed or not.
 //!
 //! @return false  -> The memory isn't removed
 //!
-bool sd_mmc_spi_removal();
+extern bool           sd_mmc_spi_removal(void);
+
 
 //---- ACCESS DATA FUNCTIONS ----
 
@@ -147,7 +152,7 @@ bool sd_mmc_spi_removal();
 //!   It is ready    ->    CTRL_GOOD
 //!   A error occur  ->    CTRL_FAIL
 //!
-Ctrl_status sd_mmc_spi_usb_read_10(uint32_t addr, uint16_t nb_sector);
+extern 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 +166,7 @@ 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
 //!
-Ctrl_status sd_mmc_spi_usb_write_10(uint32_t addr, uint16_t nb_sector);
+extern Ctrl_status    sd_mmc_spi_usb_write_10(uint32_t addr, uint16_t nb_sector);
 
 #endif // #if ACCESS_USB == true
 

Marlin/src/HAL/DUE/usb/sysclk.h

@@ -212,6 +212,7 @@ extern "C" {
   #define CONFIG_USBCLK_DIV
 #endif
 
+
 extern void sysclk_enable_usb(void);
 extern void sysclk_disable_usb(void);
 

Marlin/src/HAL/DUE/usb/udc.c

@@ -83,6 +83,7 @@ static usb_iface_desc_t UDC_DESC_STORAGE *udc_ptr_iface;
 
 //! @}
 
+
 //! \name Internal structure to store the USB device main strings
 //! @{
 

Marlin/src/HAL/DUE/usb/udc.h

@@ -229,7 +229,7 @@ usb_iface_desc_t UDC_DESC_STORAGE *udc_get_interface_desc(void);
  * - USB Device Controller (UDC) provides USB chapter 9 compliance
  * - USB Device Interface (UDI) provides USB Class compliance
  * - USB Device Driver (UDD) provides USB Driver for each Atmel MCU
- *
+
  * Many USB Device applications can be implemented on Atmel MCU.
  * Atmel provides many application notes for different applications:
  * - AVR4900, provides general information about Device Stack
@@ -685,4 +685,6 @@ usb_iface_desc_t UDC_DESC_STORAGE *udc_get_interface_desc(void);
    } \endcode
  */
 
+
+
 #endif // _UDC_H_

Marlin/src/HAL/DUE/usb/udd.h

@@ -213,6 +213,7 @@ void udd_send_remotewakeup(void);
  */
 void udd_set_setup_payload( uint8_t *payload, uint16_t payload_size );
 
+
 /**
  * \name Endpoint Management
  *

Marlin/src/HAL/DUE/usb/udi_cdc.c

@@ -457,6 +457,7 @@ void udi_cdc_data_sof_notify(void)
 #endif
 }
 
+
 // ------------------------
 //------- Internal routines to control serial line
 
@@ -519,6 +520,7 @@ static void udi_cdc_ctrl_state_change(uint8_t port, bool b_set, le16_t bit_mask)
 	udi_cdc_ctrl_state_notify(port, ep_comm);
 }
 
+
 static void udi_cdc_ctrl_state_notify(uint8_t port, udd_ep_id_t ep)
 {
 #if UDI_CDC_PORT_NB == 1 // To optimize code
@@ -540,6 +542,7 @@ static void udi_cdc_ctrl_state_notify(uint8_t port, udd_ep_id_t ep)
 	}
 }
 
+
 static void udi_cdc_serial_state_msg_sent(udd_ep_status_t status, iram_size_t n, udd_ep_id_t ep)
 {
 	uint8_t port;
@@ -575,9 +578,11 @@ static void udi_cdc_serial_state_msg_sent(udd_ep_status_t status, iram_size_t n,
 	udi_cdc_ctrl_state_notify(port, ep);
 }
 
+
 // ------------------------
 //------- Internal routines to process data transfer
 
+
 static bool udi_cdc_rx_start(uint8_t port)
 {
 	irqflags_t flags;
@@ -627,6 +632,7 @@ static bool udi_cdc_rx_start(uint8_t port)
 			udi_cdc_data_received);
 }
 
+
 static void udi_cdc_data_received(udd_ep_status_t status, iram_size_t n, udd_ep_id_t ep)
 {
 	uint8_t buf_sel_trans;
@@ -662,6 +668,7 @@ static void udi_cdc_data_received(udd_ep_status_t status, iram_size_t n, udd_ep_
 	udi_cdc_rx_start(port);
 }
 
+
 static void udi_cdc_data_sent(udd_ep_status_t status, iram_size_t n, udd_ep_id_t ep)
 {
 	uint8_t port;
@@ -693,6 +700,7 @@ static void udi_cdc_data_sent(udd_ep_status_t status, iram_size_t n, udd_ep_id_t
 	udi_cdc_tx_send(port);
 }
 
+
 static void udi_cdc_tx_send(uint8_t port)
 {
 	irqflags_t flags;
@@ -772,9 +780,11 @@ static void udi_cdc_tx_send(uint8_t port)
 			udi_cdc_data_sent);
 }
 
+
 // ------------------------
 //------- Application interface
 
+
 //------- Application interface
 
 void udi_cdc_ctrl_signal_dcd(bool b_set)

Marlin/src/HAL/DUE/usb/udi_cdc.h

@@ -106,6 +106,7 @@ typedef struct {
   usb_ep_desc_t ep_notify;
 } udi_cdc_comm_desc_t;
 
+
 /**
  * \brief Data Class interface descriptor
  *
@@ -120,6 +121,7 @@ typedef struct {
   usb_ep_desc_t ep_out;
 } udi_cdc_data_desc_t;
 
+
 //! CDC communication endpoints size for all speeds
 #define UDI_CDC_COMM_EP_SIZE        64
 //! CDC data endpoints size for FS speed (8B, 16B, 32B, 64B)

Marlin/src/HAL/DUE/usb/udi_cdc_desc.c

@@ -109,6 +109,7 @@ UDC_DESC_STORAGE usb_dev_desc_t udc_device_desc = {
   .bNumConfigurations = 1
 };
 
+
 #ifdef USB_DEVICE_HS_SUPPORT
 //! USB Device Qualifier Descriptor for HS
 COMPILER_WORD_ALIGNED

Marlin/src/HAL/DUE/usb/udi_composite_desc.c

@@ -93,6 +93,7 @@ UDC_DESC_STORAGE usb_dev_desc_t udc_device_desc = {
   .bNumConfigurations        = 1
 };
 
+
 #ifdef USB_DEVICE_HS_SUPPORT
 //! USB Device Qualifier Descriptor for HS
 COMPILER_WORD_ALIGNED
@@ -146,6 +147,7 @@ UDC_DESC_STORAGE udc_desc_t udc_desc_hs = {
 };
 #endif
 
+
 /**
  * \name UDC structures which contains all USB Device definitions
  */

Marlin/src/HAL/DUE/usb/udi_msc.c

@@ -86,6 +86,7 @@ UDC_DESC_STORAGE udi_api_t udi_api_msc = {
 };
 //@}
 
+
 /**
  * \ingroup udi_msc_group
  * \defgroup udi_msc_group_internal Implementation of UDI MSC
@@ -136,6 +137,7 @@ volatile bool udi_msc_b_reset_trans = true;
 
 //@}
 
+
 /**
  * \name Internal routines
  */
@@ -188,6 +190,7 @@ static void udi_msc_cbw_received(udd_ep_status_t status,
 static bool udi_msc_cbw_validate(uint32_t alloc_len, uint8_t dir_flag);
 //@}
 
+
 /**
  * \name Routines to process small data packet
  */
@@ -214,6 +217,7 @@ static void udi_msc_data_sent(udd_ep_status_t status, iram_size_t nb_sent,
     udd_ep_id_t ep);
 //@}
 
+
 /**
  * \name Routines to process CSW packet
  */
@@ -246,6 +250,7 @@ static void udi_msc_csw_sent(udd_ep_status_t status, iram_size_t nb_sent,
     udd_ep_id_t ep);
 //@}
 
+
 /**
  * \name Routines manage sense data
  */
@@ -302,6 +307,7 @@ static void udi_msc_sense_fail_cdb_invalid(void);
 static void udi_msc_sense_command_invalid(void);
 //@}
 
+
 /**
  * \name Routines manage SCSI Commands
  */

Marlin/src/HAL/DUE/usb/uotghs_device_due.c

@@ -293,6 +293,7 @@ do { \
 # endif
 #endif
 
+
 /**
  * \name Power management routine.
  */
@@ -309,6 +310,7 @@ static bool udd_b_idle;
 //! State of sleep manager
 static bool udd_b_sleep_initialized = false;
 
+
 /*! \brief Authorize or not the CPU powerdown mode
  *
  * \param b_enable true to authorize idle mode
@@ -336,6 +338,7 @@ static void udd_sleep_mode(bool b_idle)
 
 //@}
 
+
 /**
  * \name Control endpoint low level management routine.
  *
@@ -407,6 +410,7 @@ static void udd_ctrl_send_zlp_out(void);
 //! \brief Call callback associated to setup request
 static void udd_ctrl_endofrequest(void);
 
+
 /**
  * \brief Main interrupt routine for control endpoint
  *
@@ -418,6 +422,7 @@ static bool udd_ctrl_interrupt(void);
 
 //@}
 
+
 /**
  * \name Management of bulk/interrupt/isochronous endpoints
  *
@@ -455,6 +460,7 @@ typedef struct {
 	uint8_t stall_requested:1;
 } udd_ep_job_t;
 
+
 //! Array to register a job on bulk/interrupt/isochronous endpoint
 static udd_ep_job_t udd_ep_job[USB_DEVICE_MAX_EP];
 
@@ -516,6 +522,7 @@ static bool udd_ep_interrupt(void);
 #endif // (0!=USB_DEVICE_MAX_EP)
 //@}
 
+
 // ------------------------
 //--- INTERNAL ROUTINES TO MANAGED GLOBAL EVENTS
 
@@ -523,7 +530,7 @@ static bool udd_ep_interrupt(void);
  * \internal
  * \brief Function called by UOTGHS interrupt to manage USB Device interrupts
  *
- * USB Device interrupt events are split in three parts:
+ * USB Device interrupt events are splited in three parts:
  * - USB line events (SOF, reset, suspend, resume, wakeup)
  * - control endpoint events (setup reception, end of data transfer, underflow, overflow, stall)
  * - bulk/interrupt/isochronous endpoints events (end of data transfer)
@@ -664,11 +671,13 @@ udd_interrupt_sof_end:
 	return;
 }
 
+
 bool udd_include_vbus_monitoring(void)
 {
 	return true;
 }
 
+
 void udd_enable(void)
 {
 	irqflags_t flags;
@@ -755,6 +764,7 @@ void udd_enable(void)
 	cpu_irq_restore(flags);
 }
 
+
 void udd_disable(void)
 {
 	irqflags_t flags;
@@ -856,6 +866,7 @@ void udd_attach(void)
 	cpu_irq_restore(flags);
 }
 
+
 void udd_detach(void)
 {
 	otg_unfreeze_clock();
@@ -872,6 +883,7 @@ void udd_detach(void)
 	udd_sleep_mode(false);
 }
 
+
 bool udd_is_high_speed(void)
 {
 #ifdef USB_DEVICE_HS_SUPPORT
@@ -881,6 +893,7 @@ bool udd_is_high_speed(void)
 #endif
 }
 
+
 void udd_set_address(uint8_t address)
 {
 	udd_disable_address();
@@ -888,11 +901,13 @@ void udd_set_address(uint8_t address)
 	udd_enable_address();
 }
 
+
 uint8_t udd_getaddress(void)
 {
 	return udd_get_configured_address();
 }
 
+
 uint16_t udd_get_frame_number(void)
 {
 	return udd_frame_number();
@@ -915,12 +930,14 @@ void udd_send_remotewakeup(void)
 	}
 }
 
+
 void udd_set_setup_payload(uint8_t *payload, uint16_t payload_size)
 {
 	udd_g_ctrlreq.payload = payload;
 	udd_g_ctrlreq.payload_size = payload_size;
 }
 
+
 #if (0 != USB_DEVICE_MAX_EP)
 bool udd_ep_alloc(udd_ep_id_t ep, uint8_t bmAttributes,
 		uint16_t MaxEndpointSize)
@@ -1044,6 +1061,7 @@ bool udd_ep_alloc(udd_ep_id_t ep, uint8_t bmAttributes,
 	return true;
 }
 
+
 void udd_ep_free(udd_ep_id_t ep)
 {
 	uint8_t ep_index = ep & USB_EP_ADDR_MASK;
@@ -1056,12 +1074,14 @@ void udd_ep_free(udd_ep_id_t ep)
 	udd_ep_job[ep_index - 1].stall_requested = false;
 }
 
+
 bool udd_ep_is_halted(udd_ep_id_t ep)
 {
 	uint8_t ep_index = ep & USB_EP_ADDR_MASK;
 	return Is_udd_endpoint_stall_requested(ep_index);
 }
 
+
 bool udd_ep_set_halt(udd_ep_id_t ep)
 {
 	uint8_t ep_index = ep & USB_EP_ADDR_MASK;
@@ -1102,6 +1122,7 @@ bool udd_ep_set_halt(udd_ep_id_t ep)
 	return true;
 }
 
+
 bool udd_ep_clear_halt(udd_ep_id_t ep)
 {
 	uint8_t ep_index = ep & USB_EP_ADDR_MASK;
@@ -1142,6 +1163,7 @@ bool udd_ep_clear_halt(udd_ep_id_t ep)
 	return true;
 }
 
+
 bool udd_ep_run(udd_ep_id_t ep, bool b_shortpacket,
 		uint8_t * buf, iram_size_t buf_size,
 		udd_callback_trans_t callback)
@@ -1208,6 +1230,7 @@ bool udd_ep_run(udd_ep_id_t ep, bool b_shortpacket,
 #endif
 }
 
+
 void udd_ep_abort(udd_ep_id_t ep)
 {
 	uint8_t ep_index = ep & USB_EP_ADDR_MASK;
@@ -1236,6 +1259,7 @@ void udd_ep_abort(udd_ep_id_t ep)
 	udd_ep_abort_job(ep);
 }
 
+
 bool udd_ep_wait_stall_clear(udd_ep_id_t ep,
 		udd_callback_halt_cleared_t callback)
 {
@@ -1270,6 +1294,7 @@ bool udd_ep_wait_stall_clear(udd_ep_id_t ep,
 }
 #endif // (0 != USB_DEVICE_MAX_EP)
 
+
 #ifdef USB_DEVICE_HS_SUPPORT
 
 void udd_test_mode_j(void)
@@ -1278,17 +1303,20 @@ void udd_test_mode_j(void)
 	udd_enable_hs_test_mode_j();
 }
 
+
 void udd_test_mode_k(void)
 {
 	udd_enable_hs_test_mode();
 	udd_enable_hs_test_mode_k();
 }
 
+
 void udd_test_mode_se0_nak(void)
 {
 	udd_enable_hs_test_mode();
 }
 
+
 void udd_test_mode_packet(void)
 {
 	uint8_t i;
@@ -1332,6 +1360,8 @@ void udd_test_mode_packet(void)
 }
 #endif // USB_DEVICE_HS_SUPPORT
 
+
+
 // ------------------------
 //--- INTERNAL ROUTINES TO MANAGED THE CONTROL ENDPOINT
 
@@ -1381,6 +1411,7 @@ static void udd_ctrl_init(void)
 	udd_ep_control_state = UDD_EPCTRL_SETUP;
 }
 
+
 static void udd_ctrl_setup_received(void)
 {
 	irqflags_t flags;
@@ -1442,6 +1473,7 @@ static void udd_ctrl_setup_received(void)
 	}
 }
 
+
 static void udd_ctrl_in_sent(void)
 {
 	static bool b_shortpacket = false;
@@ -1525,6 +1557,7 @@ static void udd_ctrl_in_sent(void)
 	cpu_irq_restore(flags);
 }
 
+
 static void udd_ctrl_out_received(void)
 {
 	irqflags_t flags;
@@ -1567,7 +1600,7 @@ static void udd_ctrl_out_received(void)
 							udd_ctrl_payload_buf_cnt))) {
 		// End of reception because it is a short packet
 		// Before send ZLP, call intermediate callback
-		// in case of data receive generate a stall
+		// in case of data receiv generate a stall
 		udd_g_ctrlreq.payload_size = udd_ctrl_payload_buf_cnt;
 		if (NULL != udd_g_ctrlreq.over_under_run) {
 			if (!udd_g_ctrlreq.over_under_run()) {
@@ -1615,6 +1648,7 @@ static void udd_ctrl_out_received(void)
 	cpu_irq_restore(flags);
 }
 
+
 static void udd_ctrl_underflow(void)
 {
 	if (Is_udd_out_received(0))
@@ -1631,6 +1665,7 @@ static void udd_ctrl_underflow(void)
 	}
 }
 
+
 static void udd_ctrl_overflow(void)
 {
 	if (Is_udd_in_send(0))
@@ -1646,6 +1681,7 @@ static void udd_ctrl_overflow(void)
 	}
 }
 
+
 static void udd_ctrl_stall_data(void)
 {
 	// Stall all packets on IN & OUT control endpoint
@@ -1653,6 +1689,7 @@ static void udd_ctrl_stall_data(void)
 	udd_enable_stall_handshake(0);
 }
 
+
 static void udd_ctrl_send_zlp_in(void)
 {
 	irqflags_t flags;
@@ -1670,6 +1707,7 @@ static void udd_ctrl_send_zlp_in(void)
 	cpu_irq_restore(flags);
 }
 
+
 static void udd_ctrl_send_zlp_out(void)
 {
 	irqflags_t flags;
@@ -1685,6 +1723,7 @@ static void udd_ctrl_send_zlp_out(void)
 	cpu_irq_restore(flags);
 }
 
+
 static void udd_ctrl_endofrequest(void)
 {
 	// If a callback is registered then call it
@@ -1693,6 +1732,7 @@ static void udd_ctrl_endofrequest(void)
 	}
 }
 
+
 static bool udd_ctrl_interrupt(void)
 {
 
@@ -1743,6 +1783,7 @@ static bool udd_ctrl_interrupt(void)
 	return false;
 }
 
+
 // ------------------------
 //--- INTERNAL ROUTINES TO MANAGED THE BULK/INTERRUPT/ISOCHRONOUS ENDPOINTS
 
@@ -1757,6 +1798,7 @@ static void udd_ep_job_table_reset(void)
 	}
 }
 
+
 static void udd_ep_job_table_kill(void)
 {
 	uint8_t i;
@@ -1767,6 +1809,7 @@ static void udd_ep_job_table_kill(void)
 	}
 }
 
+
 static void udd_ep_abort_job(udd_ep_id_t ep)
 {
 	ep &= USB_EP_ADDR_MASK;
@@ -1775,6 +1818,7 @@ static void udd_ep_abort_job(udd_ep_id_t ep)
 	udd_ep_finish_job(&udd_ep_job[ep - 1], true, ep);
 }
 
+
 static void udd_ep_finish_job(udd_ep_job_t * ptr_job, bool b_abort, uint8_t ep_num)
 {
 	if (ptr_job->busy == false) {
@@ -1808,7 +1852,7 @@ static void udd_ep_trans_done(udd_ep_id_t ep)
 	}
 
 	if (ptr_job->buf_cnt != ptr_job->buf_size) {
-		// Need to send or receive other data
+		// Need to send or receiv other data
 		next_trans = ptr_job->buf_size - ptr_job->buf_cnt;
 
 		if (UDD_ENDPOINT_MAX_TRANS < next_trans) {
@@ -1845,6 +1889,7 @@ static void udd_ep_trans_done(udd_ep_id_t ep)
 		udd_dma_ctrl |= UOTGHS_DEVDMACONTROL_END_BUFFIT |
 				UOTGHS_DEVDMACONTROL_CHANN_ENB;
 
+
 		// Disable IRQs to have a short sequence
 		// between read of EOT_STA and DMA enable
 		flags = cpu_irq_save();

Marlin/src/HAL/DUE/usb/uotghs_device_due.h

@@ -129,6 +129,7 @@ extern "C" {
 #define Is_udd_vbus_transition()          (Tst_bits(UOTGHS->UOTGHS_SR, UOTGHS_SR_VBUSTI))
 //! @}
 
+
 //! @name UOTGHS device attach control
 //! These macros manage the UOTGHS Device attach.
 //! @{
@@ -140,6 +141,7 @@ extern "C" {
 #define Is_udd_detached()                 (Tst_bits(UOTGHS->UOTGHS_DEVCTRL, UOTGHS_DEVCTRL_DETACH))
 //! @}
 
+
 //! @name UOTGHS device bus events control
 //! These macros manage the UOTGHS Device bus events.
 //! @{
@@ -244,6 +246,7 @@ extern "C" {
 #define udd_get_configured_address()              (Rd_bitfield(UOTGHS->UOTGHS_DEVCTRL, UOTGHS_DEVCTRL_UADD_Msk))
 //! @}
 
+
 //! @name UOTGHS Device endpoint drivers
 //! These macros manage the common features of the endpoints.
 //! @{
@@ -327,6 +330,7 @@ extern "C" {
 #define udd_data_toggle(ep)                       (Rd_bitfield(UOTGHS_ARRAY(UOTGHS_DEVEPTISR[0], ep), UOTGHS_DEVEPTISR_DTSEQ_Msk))
 //! @}
 
+
 //! @name UOTGHS Device control endpoint
 //! These macros control the endpoints.
 //! @{
@@ -526,6 +530,7 @@ extern "C" {
   //! Tests if IN sending interrupt is enabled
 #define Is_udd_in_send_interrupt_enabled(ep)      (Tst_bits(UOTGHS_ARRAY(UOTGHS_DEVEPTIMR[0], ep), UOTGHS_DEVEPTIMR_TXINE))
 
+
   //! Get 64-, 32-, 16- or 8-bit access to FIFO data register of selected endpoint.
   //! @param ep Endpoint of which to access FIFO data register
   //! @param scale Data scale in bits: 64, 32, 16 or 8
@@ -647,6 +652,7 @@ typedef struct {
 //! @}
 //! @}
 
+
 /// @cond 0
 /**INDENT-OFF**/
 #ifdef __cplusplus

Marlin/src/HAL/DUE/usb/uotghs_otg.h

@@ -53,6 +53,7 @@
 extern "C" {
 #endif
 
+
 //! \ingroup usb_group
 //! \defgroup otg_group UOTGHS OTG Driver
 //! UOTGHS low-level driver for OTG features
@@ -73,6 +74,7 @@ bool otg_dual_enable(void);
  */
 void otg_dual_disable(void);
 
+
 //! @name UOTGHS OTG ID pin management
 //! The ID pin come from the USB OTG connector (A and B receptable) and
 //! allows to select the USB mode host or device.

Marlin/src/HAL/DUE/usb/usb_protocol.h

@@ -374,6 +374,7 @@ typedef struct {
   uint8_t bNumDeviceCaps;
 } usb_dev_bos_desc_t;
 
+
 /**
  * \brief USB Device Capabilities - USB 2.0 Extension Descriptor structure
  *
@@ -410,6 +411,7 @@ typedef struct {
   uint8_t iFunction;        //!< Index of string descriptor
 } usb_association_desc_t;
 
+
 /**
  * \brief Standard USB configuration descriptor structure
  */
@@ -424,6 +426,7 @@ typedef struct {
   uint8_t bMaxPower;
 } usb_conf_desc_t;
 
+
 #define  USB_CONFIG_ATTR_MUST_SET         (1 << 7) //!< Must always be set
 #define  USB_CONFIG_ATTR_BUS_POWERED      (0 << 6) //!< Bus-powered
 #define  USB_CONFIG_ATTR_SELF_POWERED     (1 << 6) //!< Self-powered
@@ -472,6 +475,7 @@ typedef struct {
   uint8_t bInterval;
 } usb_ep_desc_t;
 
+
 /**
  * \brief A standard USB string descriptor structure
  */

Marlin/src/HAL/DUE/usb/usb_protocol_cdc.h

@@ -168,6 +168,7 @@ COMPILER_PACK_SET(1)
 //! \name USB CDC Descriptors
 //@{
 
+
 //! CDC Header Functional Descriptor
 typedef struct {
   uint8_t bFunctionLength;
@@ -202,6 +203,7 @@ typedef struct {
   uint8_t bSlaveInterface0;
 } usb_cdc_union_desc_t;
 
+
 //! \name USB CDC Call Management Capabilities
 //@{
 //! Device handles call management itself
@@ -276,6 +278,7 @@ typedef struct {
 //@}
 //@}
 
+
 //! \name USB CDC notification message
 //@{
 

Marlin/src/HAL/DUE/usb/usb_protocol_msc.h

@@ -47,6 +47,7 @@
 #ifndef _USB_PROTOCOL_MSC_H_
 #define _USB_PROTOCOL_MSC_H_
 
+
 /**
  * \ingroup usb_protocol_group
  * \defgroup usb_msc_protocol USB Mass Storage Class (MSC) protocol definitions
@@ -88,6 +89,7 @@
 #define MSC_PROTOCOL_BULK           0x50  //!< Bulk-only
 //@}
 
+
 /**
  * \brief MSC USB requests (bRequest)
  */
@@ -96,6 +98,7 @@ enum usb_reqid_msc {
   USB_REQ_MSC_GET_MAX_LUN = 0xFE  //!< Get Max LUN
 };
 
+
 COMPILER_PACK_SET(1)
 
 /**
@@ -119,6 +122,7 @@ struct usb_msc_cbw {
 #define USB_CBW_LEN_MASK            0x1F  //!< Valid bits in bCBWCBLength
 //@}
 
+
 /**
  * \name A Command Status Wrapper (CSW).
  */

Marlin/src/HAL/ESP32/HAL.cpp

@@ -34,13 +34,13 @@
 
 #if ENABLED(WIFISUPPORT)
   #include <ESPAsyncWebServer.h>
-  #include "wifi/wifi.h"
+  #include "wifi.h"
   #if ENABLED(OTASUPPORT)
-    #include "wifi/ota.h"
+    #include "ota.h"
   #endif
   #if ENABLED(WEBSUPPORT)
-    #include "wifi/spiffs.h"
+    #include "spiffs.h"
-    #include "wifi/web.h"
+    #include "web.h"
   #endif
 #endif
 
@@ -175,6 +175,8 @@ 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(); }
 
@@ -207,17 +209,16 @@ int MarlinHAL::freeMemory() { return ESP.getFreeHeap(); }
 // ADC
 // ------------------------
 
-// https://docs.espressif.com/projects/esp-idf/en/release-v4.4/esp32/api-reference/peripherals/adc.html
+#define ADC1_CHANNEL(pin) ADC1_GPIO ## pin ## _CHANNEL
+
 adc1_channel_t get_channel(int pin) {
   switch (pin) {
-    case 39: return ADC1_CHANNEL_3;
+    case 39: return ADC1_CHANNEL(39);
-    case 36: return ADC1_CHANNEL_0;
+    case 36: return ADC1_CHANNEL(36);
-    case 35: return ADC1_CHANNEL_7;
+    case 35: return ADC1_CHANNEL(35);
-    case 34: return ADC1_CHANNEL_6;
+    case 34: return ADC1_CHANNEL(34);
-    case 33: return ADC1_CHANNEL_5;
+    case 33: return ADC1_CHANNEL(33);
-    case 32: return ADC1_CHANNEL_4;
+    case 32: return ADC1_CHANNEL(32);
-    case 37: return ADC1_CHANNEL_1;
-    case 38: return ADC1_CHANNEL_2;
   }
   return ADC1_CHANNEL_MAX;
 }
@@ -242,13 +243,12 @@ void MarlinHAL::adc_init() {
   TERN_(HAS_TEMP_ADC_5,        adc1_set_attenuation(get_channel(TEMP_5_PIN), ADC_ATTEN_11db));
   TERN_(HAS_TEMP_ADC_6,        adc2_set_attenuation(get_channel(TEMP_6_PIN), ADC_ATTEN_11db));
   TERN_(HAS_TEMP_ADC_7,        adc3_set_attenuation(get_channel(TEMP_7_PIN), ADC_ATTEN_11db));
-  TERN_(HAS_TEMP_ADC_BED,      adc1_set_attenuation(get_channel(TEMP_BED_PIN), ADC_ATTEN_11db));
+  TERN_(HAS_HEATED_BED,        adc1_set_attenuation(get_channel(TEMP_BED_PIN), ADC_ATTEN_11db));
-  TERN_(HAS_TEMP_ADC_CHAMBER,  adc1_set_attenuation(get_channel(TEMP_CHAMBER_PIN), ADC_ATTEN_11db));
+  TERN_(HAS_TEMP_CHAMBER,      adc1_set_attenuation(get_channel(TEMP_CHAMBER_PIN), ADC_ATTEN_11db));
-  TERN_(HAS_TEMP_ADC_PROBE,    adc1_set_attenuation(get_channel(TEMP_PROBE_PIN), ADC_ATTEN_11db));
+  TERN_(HAS_TEMP_PROBE,        adc1_set_attenuation(get_channel(TEMP_PROBE_PIN), ADC_ATTEN_11db));
-  TERN_(HAS_TEMP_ADC_COOLER,   adc1_set_attenuation(get_channel(TEMP_COOLER_PIN), ADC_ATTEN_11db));
+  TERN_(HAS_TEMP_COOLER,       adc1_set_attenuation(get_channel(TEMP_COOLER_PIN), ADC_ATTEN_11db));
-  TERN_(HAS_TEMP_ADC_BOARD,    adc1_set_attenuation(get_channel(TEMP_BOARD_PIN), ADC_ATTEN_11db));
+  TERN_(HAS_TEMP_BOARD,        adc1_set_attenuation(get_channel(TEMP_BOARD_PIN), ADC_ATTEN_11db));
-  TERN_(HAS_FILWIDTH_ADC,      adc1_set_attenuation(get_channel(FILWIDTH_PIN), ADC_ATTEN_11db));
+  TERN_(FILAMENT_WIDTH_SENSOR, adc1_set_attenuation(get_channel(FILWIDTH_PIN), ADC_ATTEN_11db));
-  TERN_(HAS_FILWIDTH2_ADC,     adc1_set_attenuation(get_channel(FILWIDTH2_PIN), ADC_ATTEN_11db));
 
   // Note that adc2 is shared with the WiFi module, which has higher priority, so the conversion may fail.
   // That's why we're not setting it up here.

Marlin/src/HAL/ESP32/HAL.h

@@ -37,11 +37,11 @@
 #include "i2s.h"
 
 #if ENABLED(WIFISUPPORT)
-  #include "wifi/WebSocketSerial.h"
+  #include "WebSocketSerial.h"
 #endif
 
 #if ENABLED(ESP3D_WIFISUPPORT)
-  #include <esp3dlib.h>
+  #include "esp3dlib.h"
 #endif
 
 #include "FlushableHardwareSerial.h"
@@ -64,10 +64,10 @@
 #define CRITICAL_SECTION_END()   portEXIT_CRITICAL(&hal.spinlock)
 
 #define HAL_CAN_SET_PWM_FREQ   // This HAL supports PWM Frequency adjustment
-#define PWM_FREQUENCY  1000U   // Default PWM frequency when set_pwm_duty() is called without set_pwm_frequency()
+#define PWM_FREQUENCY  1000u   // Default PWM frequency when set_pwm_duty() is called without set_pwm_frequency()
-#define PWM_RESOLUTION   10U   // Default PWM bit resolution
+#define PWM_RESOLUTION   10u   // Default PWM bit resolution
-#define CHANNEL_MAX_NUM  15U   // max PWM channel # to allocate (7 to only use low speed, 15 to use low & high)
+#define CHANNEL_MAX_NUM  15u   // max PWM channel # to allocate (7 to only use low speed, 15 to use low & high)
-#define MAX_PWM_IOPIN    33U   // hardware pwm pins < 34
+#define MAX_PWM_IOPIN    33u   // hardware pwm pins < 34
 #ifndef MAX_EXPANDER_BITS
   #define MAX_EXPANDER_BITS 32 // I2S expander bit width (max 32)
 #endif
@@ -165,6 +165,8 @@ int freeMemory();
 
 #pragma GCC diagnostic pop
 
+void _delay_ms(const int ms);
+
 // ------------------------
 // MarlinHAL Class
 // ------------------------
@@ -192,9 +194,9 @@ 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); }
+  static void delay_ms(const int ms) { _delay_ms(ms); }
 
-  // Tasks, called from marlin.idle()
+  // Tasks, called from idle()
   static void idletask();
 
   // Reset