Merge pull request #557 from stklcode/marlin-2.1.2.5

Merge upstream changes from Marlin 2.1.2.5
2024-11-25 11:29:55 +01:00 · 2024-11-23 13:46:10 +01:00 · 2024-06-24 11:03:01 +02:00 · 2024-06-23 18:03:17 +02:00 · 2024-06-05 18:39:17 +02:00 · 2024-06-05 18:32:51 +02:00
1616 changed files with 88109 additions and 64094 deletions
--- a/.aiderignore
+++ b/.aiderignore
@@ -0,0 +1,21 @@
+# Build artifacts
+buildroot/
+*.o
+*.a
+*.so
+*.dylib
+*.dll
+*.exe
+
+# Web assets
+*.min.js
+*.min.css
+
+# Generated files
+__pycache__/
+*.pyc
+.DS_Store
+
+# IDE files
+.vscode/
+.idea/
--- a/.clang-format
+++ b/.clang-format
@@ -0,0 +1,222 @@
+---
+Language:        Cpp
+# BasedOnStyle:  LLVM
+AccessModifierOffset: -2
+AlignAfterOpenBracket: Align
+AlignArrayOfStructures: None
+AlignConsecutiveAssignments:
+  Enabled:         true
+  AcrossEmptyLines: false
+  AcrossComments:  true
+  AlignCompound:   true
+  PadOperators:    true
+AlignConsecutiveBitFields:
+  Enabled:         true
+  AcrossEmptyLines: false
+  AcrossComments:  true
+  AlignCompound:   false
+  PadOperators:    false
+AlignConsecutiveDeclarations:
+  Enabled:         true
+  AcrossEmptyLines: false
+  AcrossComments:  true
+  AlignCompound:   false
+  PadOperators:    false
+AlignConsecutiveMacros:
+  Enabled:         true
+  AcrossEmptyLines: false
+  AcrossComments:  true
+  AlignCompound:   false
+  PadOperators:    false
+AlignEscapedNewlines: Right
+AlignOperands:   Align
+AlignTrailingComments:
+  Kind:            Always
+  OverEmptyLines:  0
+AllowAllArgumentsOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: Never
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortEnumsOnASingleLine: true
+AllowShortFunctionsOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLambdasOnASingleLine: All
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: MultiLine
+AttributeMacros:
+  - __capability
+BinPackArguments: true
+BinPackParameters: true
+BitFieldColonSpacing: Both
+BraceWrapping:
+  AfterCaseLabel:  false
+  AfterClass:      false
+  AfterControlStatement: Never
+  AfterEnum:       false
+  AfterExternBlock: false
+  AfterFunction:   false
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     false
+  AfterUnion:      false
+  BeforeCatch:     true
+  BeforeElse:      true
+  BeforeLambdaBody: false
+  BeforeWhile:     false
+  IndentBraces:    true
+  SplitEmptyFunction: true
+  SplitEmptyRecord: true
+  SplitEmptyNamespace: true
+BreakAfterAttributes: Never
+BreakArrays:     true
+BreakBeforeBinaryOperators: None
+BreakBeforeConceptDeclarations: Always
+BreakBeforeBraces: Attach
+BreakBeforeInlineASMColon: OnlyMultiline
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: BeforeColon
+BreakInheritanceList: BeforeColon
+BreakStringLiterals: true
+ColumnLimit:     120
+CommentPragmas:  '^ IWYU pragma:'
+CompactNamespaces: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+DisableFormat:   false
+EmptyLineAfterAccessModifier: Never
+EmptyLineBeforeAccessModifier: LogicalBlock
+ExperimentalAutoDetectBinPacking: false
+FixNamespaceComments: true
+ForEachMacros:
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+IfMacros:
+  - KJ_IF_MAYBE
+IncludeBlocks:   Preserve
+IncludeCategories:
+  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
+    Priority:        2
+    SortPriority:    0
+    CaseSensitive:   false
+  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
+    Priority:        3
+    SortPriority:    0
+    CaseSensitive:   false
+  - Regex:           '.*'
+    Priority:        1
+    SortPriority:    0
+    CaseSensitive:   false
+IncludeIsMainRegex: '(Test)?$'
+IncludeIsMainSourceRegex: ''
+IndentAccessModifiers: true
+IndentCaseBlocks: true
+IndentCaseLabels: true
+IndentExternBlock: AfterExternBlock
+IndentGotoLabels: true
+IndentPPDirectives: BeforeHash
+IndentRequiresClause: true
+IndentWidth:     2
+IndentWrappedFunctionNames: true
+InsertBraces:    true
+InsertNewlineAtEOF: true
+InsertTrailingCommas: None
+IntegerLiteralSeparator:
+  Binary:          0
+  BinaryMinDigits: 0
+  Decimal:         0
+  DecimalMinDigits: 0
+  Hex:             0
+  HexMinDigits:    0
+KeepEmptyLinesAtTheStartOfBlocks: true
+LambdaBodyIndentation: Signature
+LineEnding:      DeriveLF
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 2
+NamespaceIndentation: All
+ObjCBinPackProtocolList: Auto
+ObjCBlockIndentWidth: 2
+ObjCBreakBeforeNestedBlockParam: true
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PackConstructorInitializers: BinPack
+PenaltyBreakAssignment: 2
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakOpenParenthesis: 0
+PenaltyBreakString: 1000
+PenaltyBreakTemplateDeclaration: 10
+PenaltyExcessCharacter: 1000000
+PenaltyIndentedWhitespace: 0
+PenaltyReturnTypeOnItsOwnLine: 60
+PointerAlignment: Left
+PPIndentWidth:   -1
+QualifierAlignment: Leave
+ReferenceAlignment: Pointer
+ReflowComments:  true
+RemoveBracesLLVM: false
+RemoveSemicolon: false
+RequiresClausePosition: OwnLine
+RequiresExpressionIndentation: OuterScope
+SeparateDefinitionBlocks: Leave
+ShortNamespaceLines: 1
+SortIncludes:    CaseSensitive
+SortJavaStaticImport: Before
+SortUsingDeclarations: LexicographicNumeric
+SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: true
+SpaceAroundPointerQualifiers: Default
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCaseColon: false
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceBeforeParensOptions:
+  AfterControlStatements: true
+  AfterForeachMacros: true
+  AfterFunctionDefinitionName: false
+  AfterFunctionDeclarationName: false
+  AfterIfMacros:   true
+  AfterOverloadedOperator: false
+  AfterRequiresInClause: false
+  AfterRequiresInExpression: false
+  BeforeNonEmptyParentheses: false
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceBeforeSquareBrackets: false
+SpaceInEmptyBlock: false
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  Never
+SpacesInConditionalStatement: false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInLineCommentPrefix:
+  Minimum:         1
+  Maximum:         -1
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard:        Latest
+StatementAttributeLikeMacros:
+  - Q_EMIT
+StatementMacros:
+  - Q_UNUSED
+  - QT_REQUIRE_VERSION
+TabWidth:        8
+UseTab:          Never
+WhitespaceSensitiveMacros:
+  - BOOST_PP_STRINGIZE
+  - CF_SWIFT_NAME
+  - NS_SWIFT_NAME
+  - PP_STRINGIZE
+  - STRINGIZE
+...
+
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -0,0 +1,29 @@
+# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.187.0/containers/python-3/.devcontainer/base.Dockerfile
+
+# [Choice] Python version: 3, 3.9, 3.8, 3.7, 3.6
+ARG VARIANT="3.9.0-buster"
+FROM python:${VARIANT}
+
+# [Option] Install Node.js
+ARG INSTALL_NODE="true"
+ARG NODE_VERSION="lts/*"
+RUN if [ "${INSTALL_NODE}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
+
+# [Optional] If your pip requirements rarely change, uncomment this section to add them to the image.
+# COPY requirements.txt /tmp/pip-tmp/
+# RUN pip3 --disable-pip-version-check --no-cache-dir install -r /tmp/pip-tmp/requirements.txt \
+#    && rm -rf /tmp/pip-tmp
+
+# [Optional] Uncomment this section to install additional OS packages.
+# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+#     && apt-get -y install --no-install-recommends <your-package-list-here>
+
+# [Optional] Uncomment this line to install global node packages.
+# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1
+
+
+RUN pip install -U https://github.com/platformio/platformio-core/archive/develop.zip
+RUN platformio update
+# To get the test platforms
+RUN pip install PyYaml
+#ENV PATH /code/buildroot/bin/:/code/buildroot/tests/:${PATH}
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,51 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.187.0/containers/python-3
+{
+  "name": "Python 3",
+  "build": {
+    "dockerfile": "Dockerfile",
+    "context": "..",
+    "args": {
+      // Update 'VARIANT' to pick a Python version: 3, 3.6, 3.7, 3.8, 3.9
+      "VARIANT": "3.9.0-buster",
+      // Options
+      "INSTALL_NODE": "false",
+      "NODE_VERSION": "lts/*"
+    }
+  },
+
+  // Set *default* container specific settings.json values on container create.
+  "settings": {
+    "python.pythonPath": "/usr/local/bin/python",
+    "python.languageServer": "Pylance",
+    "python.linting.enabled": true,
+    "python.linting.pylintEnabled": true,
+    "python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8",
+    "python.formatting.blackPath": "/usr/local/py-utils/bin/black",
+    "python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf",
+    "python.linting.banditPath": "/usr/local/py-utils/bin/bandit",
+    "python.linting.flake8Path": "/usr/local/py-utils/bin/flake8",
+    "python.linting.mypyPath": "/usr/local/py-utils/bin/mypy",
+    "python.linting.pycodestylePath": "/usr/local/py-utils/bin/pycodestyle",
+    "python.linting.pydocstylePath": "/usr/local/py-utils/bin/pydocstyle",
+    "python.linting.pylintPath": "/usr/local/py-utils/bin/pylint"
+  },
+
+  // Add the IDs of extensions you want installed when the container is created.
+  "extensions": [
+    "ms-python.python",
+    "ms-python.vscode-pylance",
+    "platformio.platformio-ide",
+    "marlinfirmware.auto-build",
+    "editorconfig.editorconfig"
+  ],
+
+  // Use 'forwardPorts' to make a list of ports inside the container available locally.
+  // "forwardPorts": [],
+
+  // Use 'postCreateCommand' to run commands after the container is created.
+  // "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"
+}
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,19 +1,29 @@
 # editorconfig.org
 root = true

+[*]
+trim_trailing_whitespace = true
+insert_final_newline = true
+
 [{*.patch,syntax_test_*}]
 trim_trailing_whitespace = false

+[{*.c,*.cpp,*.h,*.ino,*.py,Makefile}]
+end_of_line = lf
+
 [{*.c,*.cpp,*.h,*.ino}]
 charset = utf-8
-
-[{*.c,*.cpp,*.h,*.ino,Makefile}]
-trim_trailing_whitespace = true
-insert_final_newline = true
-end_of_line = lf
 indent_style = space
 indent_size = 2

+[{Makefile}]
+indent_style = tab
+indent_size = 2
+
+[*.md]
+# Two spaces at the end of the line means newline in Markdown
+trim_trailing_whitespace = false
+
 [{*.py}]
 indent_style = space
 indent_size = 4
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
--- a/.github/code_of_conduct.md
+++ b/.github/code_of_conduct.md
@@ -28,15 +28,9 @@ Project maintainers are responsible for clarifying the standards of acceptable b

 Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.

-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
-
 ## Enforcement

-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [marlinfirmware@github.com](mailto:marlinfirmware@github.com). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by following GitHub's [reporting abuse or spam article](https://docs.github.com/en/communities/maintaining-your-safety-on-github/reporting-abuse-or-spam). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances.

 ## Attribution

--- a/.github/contributing.md
+++ b/.github/contributing.md
@@ -26,11 +26,12 @@ The following is a set of guidelines for contributing to Marlin, hosted by the [

 ## Code of Conduct

-This project and everyone participating in it is governed by the [Marlin Code of Conduct](code_of_conduct.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to [marlinfirmware@github.com](mailto:marlinfirmware@github.com).
+This project and everyone participating in it is governed by the [Marlin Code of Conduct](code_of_conduct.md). By participating, you are expected to uphold this code. Please report unacceptable behavior by following GitHub's [reporting abuse or spam article](https://docs.github.com/en/communities/maintaining-your-safety-on-github/reporting-abuse-or-spam).

 ## I don't want to read this whole thing I just have a question!!!

-> **Note:** Please don't file an issue to ask a question. You'll get faster results by using the resources below.
+> [!NOTE]
+> Please don't file an issue to ask a question. You'll get faster results by using the resources below.

 We have a Message Board and a Facebook group where our knowledgable user community can provide helpful advice if you have questions.

@@ -55,7 +56,8 @@ This section guides you through submitting a Bug Report for Marlin. Following th

 Before creating a Bug Report, please test the "nightly" development branch, as you might find out that you don't need to create one. When you are creating a Bug Report, please [include as many details as possible](#how-do-i-submit-a-good-bug-report). Fill out [the required template](ISSUE_TEMPLATE/bug_report.yml), the information it asks for helps us resolve issues faster.

-> **Note:** Regressions can happen. If you find a **Closed** issue that seems like your issue, go ahead and open a new issue and include a link to the original issue in the body of your new one. All you need to create a link is the issue number, preceded by #. For example, #8888.
+> [!NOTE]
+> Regressions can happen. If you find a **Closed** issue that seems like your issue, go ahead and open a new issue and include a link to the original issue in the body of your new one. All you need to create a link is the issue number, preceded by #. For example, #8888.

 #### How Do I Submit A (Good) Bug Report?

--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -28,9 +28,6 @@ Clearly describe the submitted changes with lots of details. Include images wher

 <!-- Attach Configurations ZIP and any other files needed to test this PR. -->

-### Configurations
-
-<!-- Attach any Configuration.h, Configuration_adv.h, or platformio.ini files needed to compile/test your Pull Request. -->

 ### Related Issues

--- a/.github/workflows/build-all.yml
+++ b/.github/workflows/build-all.yml
@@ -90,10 +90,10 @@ jobs:

    steps:

-    - name: Setup Python 3.7
-      uses: actions/setup-python@v1
+    - name: Setup Python
+      uses: actions/setup-python@v5
      with:
-        python-version: '3.7' # Version range or exact version of a Python version to use, using semvers version range syntax.
+        python-version: '3.10' # Version range or exact version of a Python version to use, using semvers version range syntax.
        architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified

    - name: Install PlatformIO
@@ -124,7 +124,7 @@ jobs:
    #     .pio/build/${{ matrix.platform }}/${{ matrix.platform }}_v*.hex

    - name: Archive all artifacts into one ZIP file
-      uses: actions/upload-artifact@master
+      uses: actions/upload-artifact@v3
      with:
        name: Knuwurst-all-in-one-${{github.sha}}
        path: |
--- a/.gitignore
+++ b/.gitignore
@@ -21,35 +21,21 @@

 # Generated files
 _Version.h
-bdf2u8g
+bdf2u8g.exe
+genpages.exe
 marlin_config.json
 mczip.h
+language*.csv
+out-csv/
+out-language/
 *.gen
 *.sublime-workspace

-#
 # OS
-#
 applet/
 .DS_Store

-#
-# Misc
-#
-*~
-*.orig
-*.rej
-*.bak
-*.idea
-*.i
-*.ii
-*.swp
-tags
-
-#
-# C++
-#
-# Compiled Object files
+# Compiled C++ Object files
 *.slo
 *.lo
 *.o
@@ -80,10 +66,7 @@ tags
 *.out
 *.app

-#
-# C
-#
-# Object files
+# Compiled C Object files
 *.o
 *.ko
 *.obj
@@ -142,15 +125,18 @@ vc-fileutils.settings
 # Visual Studio Code
 .vscode/*
 !.vscode/extensions.json
+*.code-workspace

-#Simulation
+# Simulation files
 imgui.ini
 eeprom.dat
 spi_flash.bin
 fs.img

-#cmake
+# CMake
+buildroot/share/cmake/*
 CMakeLists.txt
+!buildroot/share/cmake/CMakeLists.txt
 src/CMakeLists.txt
 CMakeListsPrivate.txt
 build/
@@ -170,3 +156,19 @@ __pycache__

 # IOLogger logs
 *_log.csv
+
+# Misc.
+*~
+*.orig
+*.rej
+*.bak
+*.idea
+*.i
+*.ii
+*.swp
+tags
+*.logs
+*.bak
+.aider*
+!.aiderignore
+.env
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -6,6 +6,7 @@
        "platformio.platformio-ide"
    ],
    "unwantedRecommendations": [
+        "ms-vscode-remote.remote-containers",
        "ms-vscode.cpptools-extension-pack"
    ]
 }
--- a/.zed/settings.json
+++ b/.zed/settings.json
@@ -0,0 +1,16 @@
+/**
+ * Marlin-specific settings for Zed
+ *
+ * For a full list of overridable settings, and general information on folder-specific settings,
+ * see the documentation: https://zed.dev/docs/configuring-zed#settings-files
+ */
+{
+  "languages": {
+    "C": {
+      "enable_language_server": false
+    },
+    "C++": {
+      "enable_language_server": false
+    }
+  }
+}
--- a/0
+++ b/0
--- a/49
+++ b/49
@@ -1,11 +1,18 @@
+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
+
 help:
 	@echo "Tasks for local development:"
-	@echo "* tests-single-ci:             Run a single test from inside the CI"
-	@echo "* tests-single-local:          Run a single test locally"
-	@echo "* tests-single-local-docker:   Run a single test locally, using docker-compose"
-	@echo "* tests-all-local:             Run all tests locally"
-	@echo "* tests-all-local-docker:      Run all tests locally, using docker-compose"
-	@echo "* setup-local-docker:          Setup local docker-compose"
+	@echo "make marlin                    : Build marlin for the configured board"
+	@echo "make format-pins               : Reformat all pins files"
+	@echo "make tests-single-ci           : Run a single test from inside the CI"
+	@echo "make tests-single-local        : Run a single test locally"
+	@echo "make tests-single-local-docker : Run a single test locally, using docker"
+	@echo "make tests-all-local           : Run all tests locally"
+	@echo "make tests-all-local-docker    : Run all tests locally, using docker"
+	@echo "make setup-local-docker        : Build the local docker image"
 	@echo ""
 	@echo "Options for testing:"
 	@echo "  TEST_TARGET          Set when running tests-single-*, to select the"
@@ -18,35 +25,41 @@ help:
 	@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

 tests-single-ci:
 	export GIT_RESET_HARD=true
-	$(MAKE) tests-single-local TEST_TARGET=$(TEST_TARGET)
-.PHONY: tests-single-ci
+	$(MAKE) tests-single-local TEST_TARGET=$(TEST_TARGET) PLATFORMIO_BUILD_FLAGS=-DGITHUB_ACTION

 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
-	docker-compose run --rm marlin $(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
+	@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)"

 tests-all-local:
 	export PATH="./buildroot/bin/:./buildroot/tests/:${PATH}" \
 	  && export VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) \
-	  && for TEST_TARGET in $$(./get_test_targets.py) ; do echo "Running tests for $$TEST_TARGET" ; run_tests . $$TEST_TARGET ; done
-.PHONY: tests-all-local
+	  && for TEST_TARGET in $$($(SCRIPTS_DIR)/get_test_targets.py) ; do echo "Running tests for $$TEST_TARGET" ; run_tests . $$TEST_TARGET ; done

 tests-all-local-docker:
-	docker-compose run --rm marlin $(MAKE) tests-all-local VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) GIT_RESET_HARD=$(GIT_RESET_HARD)
-.PHONY: 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)

 setup-local-docker:
-	docker-compose build
-.PHONY: setup-local-docker
+	$(CONTAINER_RT_BIN) build -t $(CONTAINER_IMAGE) -f docker/Dockerfile .
+
+PINS := $(shell find Marlin/src/pins -mindepth 2 -name '*.h')
+
+$(PINS): %:
+	@echo "Formatting $@" && node $(SCRIPTS_DIR)/pinsformat.js $@
+
+format-pins: $(PINS)
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
--- a/Marlin/Makefile
+++ b/Marlin/Makefile
@@ -63,8 +63,8 @@ HARDWARE_MOTHERBOARD ?= 1020

 ifeq ($(OS),Windows_NT)
  # Windows
-  ARDUINO_INSTALL_DIR ?= ${HOME}/Arduino
-  ARDUINO_USER_DIR ?= ${HOME}/Arduino
+  ARDUINO_INSTALL_DIR ?= ${HOME}/AppData/Local/Arduino
+  ARDUINO_USER_DIR ?= ${HOME}/Documents/Arduino
 else
  UNAME_S := $(shell uname -s)
  ifeq ($(UNAME_S),Linux)
@@ -82,11 +82,11 @@ endif

 # Arduino source install directory, and version number
 # On most linuxes this will be /usr/share/arduino
-ARDUINO_INSTALL_DIR  ?= ${HOME}/Arduino
-ARDUINO_VERSION      ?= 106
+ARDUINO_INSTALL_DIR  ?= ${HOME}/AppData/Local/Arduino       # C:/Users/${USERNAME}/AppData/Local/Arduino
+ARDUINO_VERSION      ?= 10819

 # The installed Libraries are in the User folder
-ARDUINO_USER_DIR ?= ${HOME}/Arduino
+ARDUINO_USER_DIR ?= ${HOME}/Documents/Arduino

 # You can optionally set a path to the avr-gcc tools.
 # Requires a trailing slash. For example, /usr/local/avr-gcc/bin/
@@ -656,18 +656,18 @@ ifeq ($(HARDWARE_VARIANT), $(filter $(HARDWARE_VARIANT),arduino Teensy Sanguino)
  # Old libraries (avr-core 1.6.21 < / Arduino < 1.6.8)
  VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/avr/libraries/SPI
  # New libraries (avr-core >= 1.6.21 / Arduino >= 1.6.8)
-  VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/avr/libraries/SPI/src
+  VPATH += $(ARDUINO_INSTALL_DIR)/packages/arduino/hardware/arduino/avr/1.8.6/libraries/SPI/src
 endif

 ifeq ($(IS_MCU),1)
-  VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/avr/cores/arduino
+  VPATH += $(ARDUINO_INSTALL_DIR)/packages/arduino/hardware/arduino/avr/1.8.6/cores/arduino

  # Old libraries (avr-core 1.6.21 < / Arduino < 1.6.8)
  VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/avr/libraries/SPI
  VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/avr/libraries/SoftwareSerial
  # New libraries (avr-core >= 1.6.21 / Arduino >= 1.6.8)
-  VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/avr/libraries/SPI/src
-  VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/avr/libraries/SoftwareSerial/src
+  VPATH += $(ARDUINO_INSTALL_DIR)/packages/arduino/hardware/arduino/avr/1.8.6/libraries/SPI/src
+  VPATH += $(ARDUINO_INSTALL_DIR)/packages/arduino/hardware/arduino/avr/1.8.6/libraries/SoftwareSerial/src
 endif

 VPATH += $(ARDUINO_INSTALL_DIR)/libraries/LiquidCrystal/src
@@ -681,17 +681,17 @@ ifeq ($(WIRE), 1)
  VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/avr/libraries/Wire
  VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/avr/libraries/Wire/utility
  # New libraries (avr-core >= 1.6.21 / Arduino >= 1.6.8)
-  VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/avr/libraries/Wire/src
-  VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/avr/libraries/Wire/src/utility
+  VPATH += $(ARDUINO_INSTALL_DIR)/packages/arduino/hardware/avr/1.8.6/libraries/Wire/src
+  VPATH += $(ARDUINO_INSTALL_DIR)/packages/arduino/hardware/avr/1.8.6/libraries/Wire/src/utility
 endif
 ifeq ($(NEOPIXEL), 1)
 VPATH += $(ARDUINO_INSTALL_DIR)/libraries/Adafruit_NeoPixel
 endif
 ifeq ($(U8GLIB), 1)
-VPATH += $(ARDUINO_INSTALL_DIR)/libraries/U8glib
-VPATH += $(ARDUINO_INSTALL_DIR)/libraries/U8glib/csrc
-VPATH += $(ARDUINO_INSTALL_DIR)/libraries/U8glib/cppsrc
-VPATH += $(ARDUINO_INSTALL_DIR)/libraries/U8glib/fntsrc
+VPATH += $(ARDUINO_INSTALL_DIR)/libraries/U8glib-HAL
+VPATH += $(ARDUINO_INSTALL_DIR)/libraries/U8glib-HAL/src
+# VPATH += $(ARDUINO_INSTALL_DIR)/libraries/U8glib
+# VPATH += $(ARDUINO_INSTALL_DIR)/libraries/U8glib/src
 endif
 ifeq ($(TMC), 1)
 VPATH += $(ARDUINO_INSTALL_DIR)/libraries/TMCStepper/src
@@ -700,9 +700,9 @@ endif

 ifeq ($(HARDWARE_VARIANT), arduino)
  HARDWARE_SUB_VARIANT ?= mega
-  VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/avr/variants/$(HARDWARE_SUB_VARIANT)
+  VPATH += $(ARDUINO_INSTALL_DIR)/packages/arduino/hardware/avr/1.8.6/variants/$(HARDWARE_SUB_VARIANT)
 else ifeq ($(HARDWARE_VARIANT), Sanguino)
-  VPATH += $(ARDUINO_INSTALL_DIR)/hardware/marlin/avr/variants/sanguino
+  VPATH += $(ARDUINO_INSTALL_DIR)/packages/arduino/hardware/avr/1.8.6/variants/sanguino
 else ifeq ($(HARDWARE_VARIANT), archim)
  VPATH   += $(ARDUINO_INSTALL_DIR)/packages/ultimachine/hardware/sam/1.6.9-b/system/libsam
  VPATH   += $(ARDUINO_INSTALL_DIR)/packages/ultimachine/hardware/sam/1.6.9-b/system/CMSIS/CMSIS/Include/
@@ -718,7 +718,7 @@ else ifeq ($(HARDWARE_VARIANT), archim)
  LDLIBS   = $(ARDUINO_INSTALL_DIR)/packages/ultimachine/hardware/sam/1.6.9-b/variants/archim/libsam_sam3x8e_gcc_rel.a
 else
  HARDWARE_SUB_VARIANT ?= standard
-  VPATH += $(ARDUINO_INSTALL_DIR)/hardware/$(HARDWARE_VARIANT)/variants/$(HARDWARE_SUB_VARIANT)
+  VPATH += $(ARDUINO_INSTALL_DIR)/packages/arduino/hardware/avr/1.8.6/variants/$(HARDWARE_SUB_VARIANT)
 endif

 LIB_SRC = wiring.c \
@@ -733,7 +733,7 @@ endif

 ifeq ($(HARDWARE_VARIANT), Teensy)
  LIB_SRC = wiring.c
-  VPATH += $(ARDUINO_INSTALL_DIR)/hardware/teensy/cores/teensy
+  VPATH += $(ARDUINO_INSTALL_DIR)/packages/arduino/hardware/teensy/cores/teensy
 endif

 LIB_CXXSRC = WMath.cpp WString.cpp Print.cpp SPI.cpp
@@ -880,7 +880,7 @@ AVRDUDE_WRITE_FLASH = -Uflash:w:$(BUILD_DIR)/$(TARGET).hex:i
 ifeq ($(shell uname -s), Linux)
  AVRDUDE_CONF = /etc/avrdude/avrdude.conf
 else
-  AVRDUDE_CONF = $(ARDUINO_INSTALL_DIR)/hardware/tools/avr/etc/avrdude.conf
+  AVRDUDE_CONF = $(ARDUINO_INSTALL_DIR)/packages/arduino/tools/avrdude/6.3.0-arduino17/etc/avrdude.conf
 endif
 AVRDUDE_FLAGS = -D -C$(AVRDUDE_CONF) \
  -p$(PROG_MCU) -P$(AVRDUDE_PORT) -c$(AVRDUDE_PROGRAMMER) \
--- a/Marlin/Marlin.ino
+++ b/Marlin/Marlin.ino
@@ -2,7 +2,7 @@

  Marlin Firmware

-  (c) 2011-2020 MarlinFirmware
+  (c) 2011-2024 MarlinFirmware
  Portions of Marlin are (c) by their respective authors.
  All code complies with GPLv2 and/or GPLv3

@@ -27,7 +27,7 @@ Configuration
  - https://github.com/MarlinFirmware/Configurations
    Example configurations for several printer models.

-  - https://www.youtube.com/watch?v=3gwWVFtdg-4
+  - https://youtu.be/3gwWVFtdg-4
    A good 20-minute overview of Marlin configuration by Tom Sanladerer.
    (Applies to Marlin 1.0.x, so Jerk and Acceleration should be halved.)
    Also... https://www.google.com/search?tbs=vid%3A1&q=configure+marlin
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -28,7 +28,7 @@
 /**
 * Marlin release version identifier
 */
-//#define SHORT_BUILD_VERSION "2.1.2"
+//#define SHORT_BUILD_VERSION "2.1.2.5"

 /**
 * Verbose version identifier which should contain a reference to the location
@@ -41,7 +41,14 @@
 * here we define this default string as the date where the latest release
 * version was tagged.
 */
-//#define STRING_DISTRIBUTION_DATE "2022-08-06"
+//#define STRING_DISTRIBUTION_DATE "2024-11-18"
+
+/**
+ * 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.
@@ -68,8 +75,8 @@
 //#define WEBSITE_URL "marlinfw.org"

 /**
- * Set the vendor info the serial USB interface, if changable
- * Currently only supported by DUE platform
+ * Set the vendor info the serial USB interface, if changeable.
+ * Currently only supported by DUE platform.
 */
 //#define USB_DEVICE_VENDOR_ID           0x0000
 //#define USB_DEVICE_PRODUCT_ID          0x0000
--- a/Marlin/config.ini
+++ b/Marlin/config.ini
@@ -3,10 +3,50 @@
 # config.ini - Options to apply before the build
 #
 [config:base]
+#
+# ini_use_config - A comma-separated list of actions to apply to the Configuration files.
+#                  The actions will be applied in the listed order.
+#  - none
+#    Ignore this file and don't apply any configuration options
+#
+#  - base
+#    Just apply the options in config:base to the configuration
+#
+#  - minimal
+#    Just apply the options in config:minimal to the configuration
+#
+#  - all
+#    Apply all 'config:*' sections in this file to the configuration
+#
+#  - another.ini
+#    Load another INI file with a path relative to this config.ini file (i.e., within Marlin/)
+#
+#  - https://me.myserver.com/path/to/configs
+#    Fetch configurations from any URL.
+#
+#  - example/Creality/Ender-5 Plus @ bugfix-2.1.x
+#    Fetch example configuration files from the MarlinFirmware/Configurations repository
+#    https://raw.githubusercontent.com/MarlinFirmware/Configurations/bugfix-2.1.x/config/examples/Creality/Ender-5%20Plus/
+#
+#  - example/default @ release-2.0.9.7
+#    Fetch default configuration files from the MarlinFirmware/Configurations repository
+#    https://raw.githubusercontent.com/MarlinFirmware/Configurations/release-2.0.9.7/config/default/
+#
+#  - [disable]
+#    Comment out all #defines in both Configuration.h and Configuration_adv.h. This is useful
+#    to start with a clean slate before applying any config: options, so only the options explicitly
+#    set in config.ini will be enabled in the configuration.
+#
+#  - [flatten] (Not yet implemented)
+#    Produce a flattened set of Configuration.h and Configuration_adv.h files with only the enabled
+#    #defines and no comments. A clean look, but context-free.
+#
 ini_use_config                           = none

 # Load all config: sections in this file
 ;ini_use_config                          = all
+# Disable everything and apply subsequent config:base options
+;ini_use_config                          = [disable], base
 # Load config file relative to Marlin/
 ;ini_use_config                          = another.ini
 # Download configurations from GitHub
@@ -42,7 +82,7 @@ preheat_1_temp_hotend                    = 180
 bang_max                                 = 255
 pidtemp                                  = on
 pid_k1                                   = 0.95
-pid_max                                  = BANG_MAX
+pid_max                                  = 255
 pid_functional_range                     = 10

 default_kp                               = 22.20
@@ -100,10 +140,10 @@ invert_x_step_pin                        = false
 invert_y_step_pin                        = false
 invert_z_step_pin                        = false

-disable_x                                = false
-disable_y                                = false
-disable_z                                = false
-disable_e                                = false
+disable_x                                = off
+disable_y                                = off
+disable_z                                = off
+disable_e                                = off

 proportional_font_ratio                  = 1.0
 default_nominal_filament_dia             = 1.75
@@ -127,7 +167,7 @@ busy_while_heating                       = on
 default_ejerk                            = 5.0
 default_keepalive_interval               = 2
 default_leveling_fade_height             = 0.0
-disable_inactive_extruder                = on
+disable_other_extruders                  = on
 display_charset_hd44780                  = JAPANESE
 eeprom_boot_silent                       = on
 eeprom_chitchat                          = on
@@ -176,12 +216,12 @@ auto_report_temperatures                 = on
 autotemp                                 = on
 autotemp_oldweight                       = 0.98
 bed_check_interval                       = 5000
-default_stepper_deactive_time            = 120
+default_stepper_timeout_sec              = 120
 default_volumetric_extruder_limit        = 0.00
-disable_inactive_e                       = true
-disable_inactive_x                       = true
-disable_inactive_y                       = true
-disable_inactive_z                       = true
+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
--- a/Marlin/lib/readme.txt
+++ b/Marlin/lib/readme.txt
--- a/Marlin/src/HAL/AVR/HAL.cpp
+++ b/Marlin/src/HAL/AVR/HAL.cpp
@@ -63,18 +63,23 @@ void save_reset_reason() {

 void MarlinHAL::init() {
  // Init Servo Pins
-  #define INIT_SERVO(N) OUT_WRITE(SERVO##N##_PIN, LOW)
  #if HAS_SERVO_0
-    INIT_SERVO(0);
+    OUT_WRITE(SERVO0_PIN, LOW);
  #endif
  #if HAS_SERVO_1
-    INIT_SERVO(1);
+    OUT_WRITE(SERVO1_PIN, LOW);
  #endif
  #if HAS_SERVO_2
-    INIT_SERVO(2);
+    OUT_WRITE(SERVO2_PIN, LOW);
  #endif
  #if HAS_SERVO_3
-    INIT_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
@@ -145,12 +150,12 @@ void MarlinHAL::reboot() {
 // Free Memory Accessor
 // ------------------------

-#if ENABLED(SDSUPPORT)
+#if HAS_MEDIA

  #include "../../sd/SdFatUtil.h"
  int freeMemory() { return SdFatUtil::FreeRam(); }

-#else // !SDSUPPORT
+#else // !HAS_MEDIA

  extern "C" {
    extern char __bss_end;
@@ -167,6 +172,6 @@ void MarlinHAL::reboot() {
    }
  }

-#endif // !SDSUPPORT
+#endif // !HAS_MEDIA

 #endif // __AVR__
--- a/Marlin/src/HAL/AVR/HAL.h
+++ b/Marlin/src/HAL/AVR/HAL.h
@@ -1,7 +1,9 @@
 /**
 * Marlin 3D Printer Firmware
 * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
+ *
+ * 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
@@ -140,14 +142,14 @@ typedef Servo hal_servo_t;
  #endif
  #define LCD_SERIAL lcdSerial
  #if HAS_DGUS_LCD
-    #define SERIAL_GET_TX_BUFFER_FREE() LCD_SERIAL.get_tx_buffer_free()
+    #define LCD_SERIAL_TX_BUFFER_FREE() LCD_SERIAL.get_tx_buffer_free()
  #endif
 #endif

 //
 // ADC
 //
-#define HAL_ADC_VREF        5.0
+#define HAL_ADC_VREF_MV   5000
 #define HAL_ADC_RESOLUTION  10

 //
--- a/Marlin/src/HAL/AVR/HAL_SPI.cpp
+++ b/Marlin/src/HAL/AVR/HAL_SPI.cpp
@@ -119,7 +119,6 @@ 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
@@ -175,7 +174,6 @@ void spiBegin() {
    SPSR = clockDiv | 0x01;
  }

-
 #else // SOFTWARE_SPI || FORCE_SOFT_SPI

  // ------------------------
@@ -198,7 +196,7 @@ void spiBegin() {
    // output pin high - like sending 0xFF
    WRITE(SD_MOSI_PIN, HIGH);

-    LOOP_L_N(i, 8) {
+    for (uint8_t i = 0; i < 8; ++i) {
      WRITE(SD_SCK_PIN, HIGH);

      nop; // adjust so SCK is nice
@@ -225,7 +223,7 @@ void spiBegin() {
  void spiSend(uint8_t data) {
    // no interrupts during byte send - about 8µs
    cli();
-    LOOP_L_N(i, 8) {
+    for (uint8_t i = 0; i < 8; ++i) {
      WRITE(SD_SCK_PIN, LOW);
      WRITE(SD_MOSI_PIN, data & 0x80);
      data <<= 1;
--- a/Marlin/src/HAL/AVR/MarlinSerial.h
+++ b/Marlin/src/HAL/AVR/MarlinSerial.h
@@ -34,12 +34,9 @@
 #include <WString.h>

 #include "../../inc/MarlinConfigPre.h"
+#include "../../core/types.h"
 #include "../../core/serial_hook.h"

-#ifndef SERIAL_PORT
-  #define SERIAL_PORT 0
-#endif
-
 #ifndef USBCON

  // The presence of the UBRRH register is used to detect a UART.
@@ -138,10 +135,6 @@

  #define BYTE 0

-  // Templated type selector
-  template<bool b, typename T, typename F> struct TypeSelector { typedef T type;} ;
-  template<typename T, typename F> struct TypeSelector<false, T, F> { typedef F type; };
-
  template<typename Cfg>
  class MarlinSerial {
  protected:
@@ -164,7 +157,7 @@
    static constexpr B_U2Xx<Cfg::PORT>   B_U2X   = 0;

    // Base size of type on buffer size
-    typedef typename TypeSelector<(Cfg::RX_SIZE>256), uint16_t, uint8_t>::type ring_buffer_pos_t;
+    typedef uvalue_t(Cfg::RX_SIZE - 1) ring_buffer_pos_t;

    struct ring_buffer_r {
      volatile ring_buffer_pos_t head, tail;
@@ -283,7 +276,7 @@
    static constexpr bool DROPPED_RX        = false;
    static constexpr bool RX_FRAMING_ERRORS = false;
    static constexpr bool MAX_RX_QUEUED     = false;
-    static constexpr bool RX_OVERRUNS       = BOTH(HAS_DGUS_LCD, SERIAL_STATS_RX_BUFFER_OVERRUNS);
+    static constexpr bool RX_OVERRUNS       = ALL(HAS_DGUS_LCD, SERIAL_STATS_RX_BUFFER_OVERRUNS);
  };

  typedef Serial1Class< MarlinSerial< LCDSerialCfg<LCD_SERIAL_PORT> > > MSerialLCD;
--- a/Marlin/src/HAL/AVR/Servo.cpp
+++ b/Marlin/src/HAL/AVR/Servo.cpp
@@ -63,7 +63,6 @@

 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) {
--- a/Marlin/src/HAL/AVR/eeprom.cpp
+++ b/Marlin/src/HAL/AVR/eeprom.cpp
@@ -23,7 +23,7 @@

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

-#if EITHER(EEPROM_SETTINGS, SD_FIRMWARE_UPDATE)
+#if ANY(EEPROM_SETTINGS, SD_FIRMWARE_UPDATE)

 /**
 * PersistentStore for Arduino-style EEPROM interface
--- a/Marlin/src/HAL/AVR/endstop_interrupts.h
+++ b/Marlin/src/HAL/AVR/endstop_interrupts.h
@@ -91,7 +91,6 @@ 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)) {
@@ -120,7 +119,7 @@ void pciSetup(const int8_t pin) {

 void setup_endstop_interrupts() {
  #define _ATTACH(P) attachInterrupt(digitalPinToInterrupt(P), endstop_ISR, CHANGE)
-  #if HAS_X_MAX
+  #if USE_X_MAX
    #if (digitalPinToInterrupt(X_MAX_PIN) != NOT_AN_INTERRUPT)
      _ATTACH(X_MAX_PIN);
    #else
@@ -128,7 +127,7 @@ void setup_endstop_interrupts() {
      pciSetup(X_MAX_PIN);
    #endif
  #endif
-  #if HAS_X_MIN
+  #if USE_X_MIN
    #if (digitalPinToInterrupt(X_MIN_PIN) != NOT_AN_INTERRUPT)
      _ATTACH(X_MIN_PIN);
    #else
@@ -136,7 +135,7 @@ void setup_endstop_interrupts() {
      pciSetup(X_MIN_PIN);
    #endif
  #endif
-  #if HAS_Y_MAX
+  #if USE_Y_MAX
    #if (digitalPinToInterrupt(Y_MAX_PIN) != NOT_AN_INTERRUPT)
      _ATTACH(Y_MAX_PIN);
    #else
@@ -144,7 +143,7 @@ void setup_endstop_interrupts() {
      pciSetup(Y_MAX_PIN);
    #endif
  #endif
-  #if HAS_Y_MIN
+  #if USE_Y_MIN
    #if (digitalPinToInterrupt(Y_MIN_PIN) != NOT_AN_INTERRUPT)
      _ATTACH(Y_MIN_PIN);
    #else
@@ -152,7 +151,7 @@ void setup_endstop_interrupts() {
      pciSetup(Y_MIN_PIN);
    #endif
  #endif
-  #if HAS_Z_MAX
+  #if USE_Z_MAX
    #if (digitalPinToInterrupt(Z_MAX_PIN) != NOT_AN_INTERRUPT)
      _ATTACH(Z_MAX_PIN);
    #else
@@ -160,7 +159,7 @@ void setup_endstop_interrupts() {
      pciSetup(Z_MAX_PIN);
    #endif
  #endif
-  #if HAS_Z_MIN
+  #if USE_Z_MIN
    #if (digitalPinToInterrupt(Z_MIN_PIN) != NOT_AN_INTERRUPT)
      _ATTACH(Z_MIN_PIN);
    #else
@@ -168,97 +167,97 @@ void setup_endstop_interrupts() {
      pciSetup(Z_MIN_PIN);
    #endif
  #endif
-  #if HAS_I_MAX
+  #if USE_I_MAX
    #if (digitalPinToInterrupt(I_MAX_PIN) != NOT_AN_INTERRUPT)
      _ATTACH(I_MAX_PIN);
    #else
-      static_assert(digitalPinHasPCICR(I_MAX_PIN), "I_MAX_PIN is not interrupt-capable");
+      static_assert(digitalPinHasPCICR(I_MAX_PIN), "I_MAX_PIN is not interrupt-capable. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
      pciSetup(I_MAX_PIN);
    #endif
-  #elif HAS_I_MIN
+  #elif USE_I_MIN
    #if (digitalPinToInterrupt(I_MIN_PIN) != NOT_AN_INTERRUPT)
      _ATTACH(I_MIN_PIN);
    #else
-      static_assert(digitalPinHasPCICR(I_MIN_PIN), "I_MIN_PIN is not interrupt-capable");
+      static_assert(digitalPinHasPCICR(I_MIN_PIN), "I_MIN_PIN is not interrupt-capable. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
      pciSetup(I_MIN_PIN);
    #endif
  #endif
-  #if HAS_J_MAX
+  #if USE_J_MAX
    #if (digitalPinToInterrupt(J_MAX_PIN) != NOT_AN_INTERRUPT)
      _ATTACH(J_MAX_PIN);
    #else
-      static_assert(digitalPinHasPCICR(J_MAX_PIN), "J_MAX_PIN is not interrupt-capable");
+      static_assert(digitalPinHasPCICR(J_MAX_PIN), "J_MAX_PIN is not interrupt-capable. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
      pciSetup(J_MAX_PIN);
    #endif
-  #elif HAS_J_MIN
+  #elif USE_J_MIN
    #if (digitalPinToInterrupt(J_MIN_PIN) != NOT_AN_INTERRUPT)
      _ATTACH(J_MIN_PIN);
    #else
-      static_assert(digitalPinHasPCICR(J_MIN_PIN), "J_MIN_PIN is not interrupt-capable");
+      static_assert(digitalPinHasPCICR(J_MIN_PIN), "J_MIN_PIN is not interrupt-capable. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
      pciSetup(J_MIN_PIN);
    #endif
  #endif
-  #if HAS_K_MAX
+  #if USE_K_MAX
    #if (digitalPinToInterrupt(K_MAX_PIN) != NOT_AN_INTERRUPT)
      _ATTACH(K_MAX_PIN);
    #else
-      static_assert(digitalPinHasPCICR(K_MAX_PIN), "K_MAX_PIN is not interrupt-capable");
+      static_assert(digitalPinHasPCICR(K_MAX_PIN), "K_MAX_PIN is not interrupt-capable. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
      pciSetup(K_MAX_PIN);
    #endif
-  #elif HAS_K_MIN
+  #elif USE_K_MIN
    #if (digitalPinToInterrupt(K_MIN_PIN) != NOT_AN_INTERRUPT)
      _ATTACH(K_MIN_PIN);
    #else
-      static_assert(digitalPinHasPCICR(K_MIN_PIN), "K_MIN_PIN is not interrupt-capable");
+      static_assert(digitalPinHasPCICR(K_MIN_PIN), "K_MIN_PIN is not interrupt-capable. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
      pciSetup(K_MIN_PIN);
    #endif
  #endif
-  #if HAS_U_MAX
+  #if USE_U_MAX
    #if (digitalPinToInterrupt(U_MAX_PIN) != NOT_AN_INTERRUPT)
      _ATTACH(U_MAX_PIN);
    #else
-      static_assert(digitalPinHasPCICR(U_MAX_PIN), "U_MAX_PIN is not interrupt-capable");
+      static_assert(digitalPinHasPCICR(U_MAX_PIN), "U_MAX_PIN is not interrupt-capable. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
      pciSetup(U_MAX_PIN);
    #endif
-  #elif HAS_U_MIN
+  #elif USE_U_MIN
    #if (digitalPinToInterrupt(U_MIN_PIN) != NOT_AN_INTERRUPT)
      _ATTACH(U_MIN_PIN);
    #else
-      static_assert(digitalPinHasPCICR(U_MIN_PIN), "U_MIN_PIN is not interrupt-capable");
+      static_assert(digitalPinHasPCICR(U_MIN_PIN), "U_MIN_PIN is not interrupt-capable. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
      pciSetup(U_MIN_PIN);
    #endif
  #endif
-  #if HAS_V_MAX
+  #if USE_V_MAX
    #if (digitalPinToInterrupt(V_MAX_PIN) != NOT_AN_INTERRUPT)
      _ATTACH(V_MAX_PIN);
    #else
-      static_assert(digitalPinHasPCICR(V_MAX_PIN), "V_MAX_PIN is not interrupt-capable");
+      static_assert(digitalPinHasPCICR(V_MAX_PIN), "V_MAX_PIN is not interrupt-capable. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
      pciSetup(V_MAX_PIN);
    #endif
-  #elif HAS_V_MIN
+  #elif USE_V_MIN
    #if (digitalPinToInterrupt(V_MIN_PIN) != NOT_AN_INTERRUPT)
      _ATTACH(V_MIN_PIN);
    #else
-      static_assert(digitalPinHasPCICR(V_MIN_PIN), "V_MIN_PIN is not interrupt-capable");
+      static_assert(digitalPinHasPCICR(V_MIN_PIN), "V_MIN_PIN is not interrupt-capable. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
      pciSetup(V_MIN_PIN);
    #endif
  #endif
-  #if HAS_W_MAX
+  #if USE_W_MAX
    #if (digitalPinToInterrupt(W_MAX_PIN) != NOT_AN_INTERRUPT)
      _ATTACH(W_MAX_PIN);
    #else
-      static_assert(digitalPinHasPCICR(W_MAX_PIN), "W_MAX_PIN is not interrupt-capable");
+      static_assert(digitalPinHasPCICR(W_MAX_PIN), "W_MAX_PIN is not interrupt-capable. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
      pciSetup(W_MAX_PIN);
    #endif
-  #elif HAS_W_MIN
+  #elif USE_W_MIN
    #if (digitalPinToInterrupt(W_MIN_PIN) != NOT_AN_INTERRUPT)
      _ATTACH(W_MIN_PIN);
    #else
-      static_assert(digitalPinHasPCICR(W_MIN_PIN), "W_MIN_PIN is not interrupt-capable");
+      static_assert(digitalPinHasPCICR(W_MIN_PIN), "W_MIN_PIN is not interrupt-capable. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
      pciSetup(W_MIN_PIN);
    #endif
  #endif
-  #if HAS_X2_MAX
+  #if USE_X2_MAX
    #if (digitalPinToInterrupt(X2_MAX_PIN) != NOT_AN_INTERRUPT)
      _ATTACH(X2_MAX_PIN);
    #else
@@ -266,7 +265,7 @@ void setup_endstop_interrupts() {
      pciSetup(X2_MAX_PIN);
    #endif
  #endif
-  #if HAS_X2_MIN
+  #if USE_X2_MIN
    #if (digitalPinToInterrupt(X2_MIN_PIN) != NOT_AN_INTERRUPT)
      _ATTACH(X2_MIN_PIN);
    #else
@@ -274,7 +273,7 @@ void setup_endstop_interrupts() {
      pciSetup(X2_MIN_PIN);
    #endif
  #endif
-  #if HAS_Y2_MAX
+  #if USE_Y2_MAX
    #if (digitalPinToInterrupt(Y2_MAX_PIN) != NOT_AN_INTERRUPT)
      _ATTACH(Y2_MAX_PIN);
    #else
@@ -282,7 +281,7 @@ void setup_endstop_interrupts() {
      pciSetup(Y2_MAX_PIN);
    #endif
  #endif
-  #if HAS_Y2_MIN
+  #if USE_Y2_MIN
    #if (digitalPinToInterrupt(Y2_MIN_PIN) != NOT_AN_INTERRUPT)
      _ATTACH(Y2_MIN_PIN);
    #else
@@ -290,7 +289,7 @@ void setup_endstop_interrupts() {
      pciSetup(Y2_MIN_PIN);
    #endif
  #endif
-  #if HAS_Z2_MAX
+  #if USE_Z2_MAX
    #if (digitalPinToInterrupt(Z2_MAX_PIN) != NOT_AN_INTERRUPT)
      _ATTACH(Z2_MAX_PIN);
    #else
@@ -298,7 +297,7 @@ void setup_endstop_interrupts() {
      pciSetup(Z2_MAX_PIN);
    #endif
  #endif
-  #if HAS_Z2_MIN
+  #if USE_Z2_MIN
    #if (digitalPinToInterrupt(Z2_MIN_PIN) != NOT_AN_INTERRUPT)
      _ATTACH(Z2_MIN_PIN);
    #else
@@ -306,7 +305,7 @@ void setup_endstop_interrupts() {
      pciSetup(Z2_MIN_PIN);
    #endif
  #endif
-  #if HAS_Z3_MAX
+  #if USE_Z3_MAX
    #if (digitalPinToInterrupt(Z3_MAX_PIN) != NOT_AN_INTERRUPT)
      _ATTACH(Z3_MAX_PIN);
    #else
@@ -314,7 +313,7 @@ void setup_endstop_interrupts() {
      pciSetup(Z3_MAX_PIN);
    #endif
  #endif
-  #if HAS_Z3_MIN
+  #if USE_Z3_MIN
    #if (digitalPinToInterrupt(Z3_MIN_PIN) != NOT_AN_INTERRUPT)
      _ATTACH(Z3_MIN_PIN);
    #else
@@ -322,7 +321,7 @@ void setup_endstop_interrupts() {
      pciSetup(Z3_MIN_PIN);
    #endif
  #endif
-  #if HAS_Z4_MAX
+  #if USE_Z4_MAX
    #if (digitalPinToInterrupt(Z4_MAX_PIN) != NOT_AN_INTERRUPT)
      _ATTACH(Z4_MAX_PIN);
    #else
@@ -330,7 +329,7 @@ void setup_endstop_interrupts() {
      pciSetup(Z4_MAX_PIN);
    #endif
  #endif
-  #if HAS_Z4_MIN
+  #if USE_Z4_MIN
    #if (digitalPinToInterrupt(Z4_MIN_PIN) != NOT_AN_INTERRUPT)
      _ATTACH(Z4_MIN_PIN);
    #else
--- a/Marlin/src/HAL/AVR/fast_pwm.cpp
+++ b/Marlin/src/HAL/AVR/fast_pwm.cpp
@@ -23,6 +23,10 @@

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

+//#define DEBUG_AVR_FAST_PWM
+#define DEBUG_OUT ENABLED(DEBUG_AVR_FAST_PWM)
+#include "../../core/debug_out.h"
+
 struct Timer {
  volatile uint8_t* TCCRnQ[3];  // max 3 TCCR registers per timer
  volatile uint16_t* OCRnQ[3];  // max 3 OCR registers per timer
@@ -108,12 +112,15 @@ const Timer get_pwm_timer(const pin_t pin) {
 }

 void MarlinHAL::set_pwm_frequency(const pin_t pin, const uint16_t f_desired) {
+  DEBUG_ECHOLNPGM("set_pwm_frequency(pin=", pin, ", freq=", f_desired, ")");
  const Timer timer = get_pwm_timer(pin);
  if (timer.isProtected || !timer.isPWM) return; // Don't proceed if protected timer or not recognized

  const bool is_timer2 = timer.n == 2;
  const uint16_t maxtop = is_timer2 ? 0xFF : 0xFFFF;

+  DEBUG_ECHOLNPGM("maxtop=", maxtop);
+
  uint16_t res = 0xFF;        // resolution (TOP value)
  uint8_t j = CS_NONE;        // prescaler index
  uint8_t wgm = WGM_PWM_PC_8; // waveform generation mode
@@ -121,23 +128,29 @@ void MarlinHAL::set_pwm_frequency(const pin_t pin, const uint16_t f_desired) {
  // Calculating the prescaler and resolution to use to achieve closest frequency
  if (f_desired != 0) {
    constexpr uint16_t prescaler[] = { 1, 8, (32), 64, (128), 256, 1024 };  // (*) are Timer 2 only
-    uint16_t f = (F_CPU) / (2 * 1024 * maxtop) + 1;           // Start with the lowest non-zero frequency achievable (1 or 31)
+    uint16_t f = (F_CPU) / (uint32_t(maxtop) << 11) + 1;      // Start with the lowest non-zero frequency achievable (for 16MHz, 1 or 31)

-    LOOP_L_N(i, COUNT(prescaler)) {                           // Loop through all prescaler values
-      const uint16_t p = prescaler[i];
+    DEBUG_ECHOLNPGM("f=", f);
+    DEBUG_ECHOLNPGM("(prescaler loop)");
+    for (uint8_t i = 0; i < COUNT(prescaler); ++i) {          // Loop through all prescaler values
+      const uint32_t p = prescaler[i];                        // Extend to 32 bits for calculations
+      DEBUG_ECHOLNPGM("prescaler[", i, "]=", p);
      uint16_t res_fast_temp, res_pc_temp;
      if (is_timer2) {
        #if ENABLED(USE_OCR2A_AS_TOP)                         // No resolution calculation for TIMER2 unless enabled USE_OCR2A_AS_TOP
          const uint16_t rft = (F_CPU) / (p * f_desired);
          res_fast_temp = rft - 1;
          res_pc_temp = rft / 2;
+          DEBUG_ECHOLNPGM("(Timer2) res_fast_temp=", res_fast_temp, " res_pc_temp=", res_pc_temp);
        #else
          res_fast_temp = res_pc_temp = maxtop;
+          DEBUG_ECHOLNPGM("(Timer2) res_fast_temp=", maxtop, " res_pc_temp=", maxtop);
        #endif
      }
      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);
        res_fast_temp = rft - 1;
        res_pc_temp = rft / 2;
      }
@@ -147,23 +160,27 @@ void MarlinHAL::set_pwm_frequency(const pin_t pin, const uint16_t f_desired) {

      // Calculate frequencies of test prescaler and resolution values
      const uint16_t f_fast_temp = (F_CPU) / (p * (1 + res_fast_temp)),
-                     f_pc_temp   = (F_CPU) / (2 * p * res_pc_temp);
-      const int      f_diff      = _MAX(f, f_desired) - _MIN(f, f_desired),
+                     f_pc_temp   = (F_CPU) / ((p * res_pc_temp) << 1),
+                     f_diff      = _MAX(f, f_desired) - _MIN(f, f_desired),
                     f_fast_diff = _MAX(f_fast_temp, f_desired) - _MIN(f_fast_temp, f_desired),
                     f_pc_diff   = _MAX(f_pc_temp, f_desired) - _MIN(f_pc_temp, f_desired);

+      DEBUG_ECHOLNPGM("f_fast_temp=", f_fast_temp, " f_pc_temp=", f_pc_temp, " f_diff=", f_diff, " f_fast_diff=", f_fast_diff, " f_pc_diff=", f_pc_diff);
+
      if (f_fast_diff < f_diff && f_fast_diff <= f_pc_diff) { // FAST values are closest to desired f
        // Set the Wave Generation Mode to FAST PWM
        wgm = is_timer2 ? uint8_t(TERN(USE_OCR2A_AS_TOP, WGM2_FAST_PWM_OCR2A, WGM2_FAST_PWM)) : uint8_t(WGM_FAST_PWM_ICRn);
        // Remember this combination
        f = f_fast_temp; res = res_fast_temp; j = i + 1;
+        DEBUG_ECHOLNPGM("(FAST) updated f=", f);
      }
      else if (f_pc_diff < f_diff) {                          // PHASE CORRECT values are closes to desired f
        // Set the Wave Generation Mode to PWM PHASE CORRECT
        wgm = is_timer2 ? uint8_t(TERN(USE_OCR2A_AS_TOP, WGM2_PWM_PC_OCR2A, WGM2_PWM_PC)) : uint8_t(WGM_PWM_PC_ICRn);
        f = f_pc_temp; res = res_pc_temp; j = i + 1;
+        DEBUG_ECHOLNPGM("(PHASE) updated f=", f);
      }
-    }
+    } // prescaler loop
  }

  _SET_WGMnQ(timer, wgm);
@@ -215,7 +232,7 @@ void MarlinHAL::init_pwm_timers() {
    #endif
  };

-  LOOP_L_N(i, COUNT(pwm_pin))
+  for (uint8_t i = 0; i < COUNT(pwm_pin); ++i)
    set_pwm_frequency(pwm_pin[i], 1000);
 }

--- a/Marlin/src/HAL/AVR/fastio.h
+++ b/Marlin/src/HAL/AVR/fastio.h
@@ -255,84 +255,6 @@ enum ClockSource2 : uint8_t {
 #define SET_FOCB(T,V) SET_FOC(T,B,V)
 #define SET_FOCC(T,V) SET_FOC(T,C,V)

-#if 0
-
-/**
- * PWM availability macros
- */
-
-// Determine which hardware PWMs are already in use
-#define _PWM_CHK_FAN_B(P) (P == E0_AUTO_FAN_PIN || P == E1_AUTO_FAN_PIN || P == E2_AUTO_FAN_PIN || P == E3_AUTO_FAN_PIN || P == E4_AUTO_FAN_PIN || P == E5_AUTO_FAN_PIN || P == E6_AUTO_FAN_PIN || P == E7_AUTO_FAN_PIN || P == CHAMBER_AUTO_FAN_PIN || P == COOLER_AUTO_FAN_PIN)
-#if PIN_EXISTS(CONTROLLER_FAN)
-  #define PWM_CHK_FAN_B(P) (_PWM_CHK_FAN_B(P) || P == CONTROLLER_FAN_PIN)
-#else
-  #define PWM_CHK_FAN_B(P) _PWM_CHK_FAN_B(P)
-#endif
-
-#if ANY_PIN(FAN, FAN1, FAN2, FAN3, FAN4, FAN5, FAN6, FAN7)
-  #if PIN_EXISTS(FAN7)
-    #define PWM_CHK_FAN_A(P) (P == FAN0_PIN || P == FAN1_PIN || P == FAN2_PIN || P == FAN3_PIN || P == FAN4_PIN || P == FAN5_PIN || P == FAN6_PIN || P == FAN7_PIN)
-  #elif PIN_EXISTS(FAN6)
-    #define PWM_CHK_FAN_A(P) (P == FAN0_PIN || P == FAN1_PIN || P == FAN2_PIN || P == FAN3_PIN || P == FAN4_PIN || P == FAN5_PIN || P == FAN6_PIN)
-  #elif PIN_EXISTS(FAN5)
-    #define PWM_CHK_FAN_A(P) (P == FAN0_PIN || P == FAN1_PIN || P == FAN2_PIN || P == FAN3_PIN || P == FAN4_PIN || P == FAN5_PIN)
-  #elif PIN_EXISTS(FAN4)
-    #define PWM_CHK_FAN_A(P) (P == FAN0_PIN || P == FAN1_PIN || P == FAN2_PIN || P == FAN3_PIN || P == FAN4_PIN)
-  #elif PIN_EXISTS(FAN3)
-    #define PWM_CHK_FAN_A(P) (P == FAN0_PIN || P == FAN1_PIN || P == FAN2_PIN || P == FAN3_PIN)
-  #elif PIN_EXISTS(FAN2)
-    #define PWM_CHK_FAN_A(P) (P == FAN0_PIN || P == FAN1_PIN || P == FAN2_PIN)
-  #elif PIN_EXISTS(FAN1)
-    #define PWM_CHK_FAN_A(P) (P == FAN0_PIN || P == FAN1_PIN)
-  #else
-    #define PWM_CHK_FAN_A(P) (P == FAN0_PIN)
-  #endif
-#else
-  #define PWM_CHK_FAN_A(P) false
-#endif
-
-#if HAS_MOTOR_CURRENT_PWM
-  #if PIN_EXISTS(MOTOR_CURRENT_PWM_XY)
-    #define PWM_CHK_MOTOR_CURRENT(P) (P == MOTOR_CURRENT_PWM_E || P == MOTOR_CURRENT_PWM_E0  || P == MOTOR_CURRENT_PWM_E1 || P == MOTOR_CURRENT_PWM_Z || P == MOTOR_CURRENT_PWM_XY)
-  #elif PIN_EXISTS(MOTOR_CURRENT_PWM_Z)
-    #define PWM_CHK_MOTOR_CURRENT(P) (P == MOTOR_CURRENT_PWM_E || P == MOTOR_CURRENT_PWM_E0  || P == MOTOR_CURRENT_PWM_E1 || P == MOTOR_CURRENT_PWM_Z)
-  #else
-    #define PWM_CHK_MOTOR_CURRENT(P) (P == MOTOR_CURRENT_PWM_E || P == MOTOR_CURRENT_PWM_E0  || P == MOTOR_CURRENT_PWM_E1)
-  #endif
-#else
-  #define PWM_CHK_MOTOR_CURRENT(P) false
-#endif
-
-#ifdef NUM_SERVOS
-  #if AVR_ATmega2560_FAMILY
-    #define PWM_CHK_SERVO(P) (P == 5 || (NUM_SERVOS > 12 && P == 6) || (NUM_SERVOS > 24 && P == 46))  // PWMS 3A, 4A & 5A
-  #elif AVR_ATmega2561_FAMILY
-    #define PWM_CHK_SERVO(P)   (P == 5)  // PWM3A
-  #elif AVR_ATmega1284_FAMILY
-    #define PWM_CHK_SERVO(P)   false
-  #elif AVR_AT90USB1286_FAMILY
-    #define PWM_CHK_SERVO(P)   (P == 16) // PWM3A
-  #elif AVR_ATmega328_FAMILY
-    #define PWM_CHK_SERVO(P)   false
-  #endif
-#else
-  #define PWM_CHK_SERVO(P) false
-#endif
-
-#if ENABLED(BARICUDA)
-  #if HAS_HEATER_1 && HAS_HEATER_2
-    #define PWM_CHK_HEATER(P) (P == HEATER_1_PIN || P == HEATER_2_PIN)
-  #elif HAS_HEATER_1
-    #define PWM_CHK_HEATER(P) (P == HEATER_1_PIN)
-  #endif
-#else
-    #define PWM_CHK_HEATER(P) false
-#endif
-
-#define PWM_CHK(P) (PWM_CHK_HEATER(P) || PWM_CHK_SERVO(P) || PWM_CHK_MOTOR_CURRENT(P) || PWM_CHK_FAN_A(P) || PWM_CHK_FAN_B(P))
-
-#endif // PWM_CHK is not used in Marlin
-
 // define which hardware PWMs are available for the current CPU
 // all timer 1 PWMS deleted from this list because they are never available
 #if AVR_ATmega2560_FAMILY
--- a/Marlin/src/HAL/AVR/fastio/fastio_1280.h
+++ b/Marlin/src/HAL/AVR/fastio/fastio_1280.h
@@ -27,43 +27,41 @@
 *   Hardware Pin  : 02 03 06 07 01 05 15 16 17 18 23 24 25 26 64 63 13 12 46 45 44 43 78 77 76 75 74 73 72 71 60 59 58 57 56 55 54 53 50 70 52 51 42 41 40 39 38 37 36 35 22 21 20 19 97 96 95 94 93 92 91 90 89 88 87 86 85 84 83 82 | 04 08 09 10 11 14 27 28 29 30 31 32 33 34 47 48 49 61 62 65 66 67 68 69 79 80 81 98 99 100
 *   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
 */

 #include "../fastio.h"

-// change for your board
-#define DEBUG_LED   DIO21
-
 // UART
-#define RXD         DIO0
-#define TXD         DIO1
+#define RXD         0
+#define TXD         1

 // SPI
-#define SCK         DIO52
-#define MISO        DIO50
-#define MOSI        DIO51
-#define SS          DIO53
+#define MISO        50
+#define MOSI        51
+#define SCK         52
+#define SS          53

 // TWI (I2C)
-#define SCL         DIO21
-#define SDA         DIO20
+#define SCL         21
+#define SDA         20

 // Timers and PWM
-#define OC0A        DIO13
-#define OC0B        DIO4
-#define OC1A        DIO11
-#define OC1B        DIO12
-#define OC2A        DIO10
-#define OC2B        DIO9
-#define OC3A        DIO5
-#define OC3B        DIO2
-#define OC3C        DIO3
-#define OC4A        DIO6
-#define OC4B        DIO7
-#define OC4C        DIO8
-#define OC5A        DIO46
-#define OC5B        DIO45
-#define OC5C        DIO44
+#define OC0A        13
+#define OC0B        4
+#define OC1A        11
+#define OC1B        12
+#define OC2A        10
+#define OC2B        9
+#define OC3A        5
+#define OC3B        2
+#define OC3C        3
+#define OC4A        6
+#define OC4B        7
+#define OC4C        8
+#define OC5A        46
+#define OC5B        45
+#define OC5C        44

 // Digital I/O

--- a/Marlin/src/HAL/AVR/fastio/fastio_1281.h
+++ b/Marlin/src/HAL/AVR/fastio/fastio_1281.h
@@ -30,32 +30,29 @@

 #include "../fastio.h"

-// change for your board
-#define DEBUG_LED   DIO46
-
 // UART
-#define RXD         DIO0
-#define TXD         DIO1
+#define RXD         0
+#define TXD         1

 // SPI
-#define SCK         DIO10
-#define MISO        DIO12
-#define MOSI        DIO11
-#define SS          DIO16
+#define SCK         10
+#define MISO        12
+#define MOSI        11
+#define SS          16

 // TWI (I2C)
-#define SCL         DIO17
-#define SDA         DIO18
+#define SCL         17
+#define SDA         18

 // Timers and PWM
-#define OC0A        DIO9
-#define OC0B        DIO4
-#define OC1A        DIO7
-#define OC1B        DIO8
-#define OC2A        DIO6
-#define OC3A        DIO5
-#define OC3B        DIO2
-#define OC3C        DIO3
+#define OC0A        9
+#define OC0B        4
+#define OC1A        7
+#define OC1B        8
+#define OC2A        6
+#define OC3A        5
+#define OC3B        2
+#define OC3C        3

 // Digital I/O

--- a/Marlin/src/HAL/AVR/fastio/fastio_168.h
+++ b/Marlin/src/HAL/AVR/fastio/fastio_168.h
@@ -30,29 +30,27 @@

 #include "../fastio.h"

-#define DEBUG_LED   AIO5
-
 // UART
-#define RXD         DIO0
-#define TXD         DIO1
+#define RXD         0
+#define TXD         1

 // SPI
-#define SCK         DIO13
-#define MISO        DIO12
-#define MOSI        DIO11
-#define SS          DIO10
+#define SS          10
+#define MOSI        11
+#define MISO        12
+#define SCK         13

 // TWI (I2C)
 #define SCL         AIO5
 #define SDA         AIO4

 // Timers and PWM
-#define OC0A        DIO6
-#define OC0B        DIO5
-#define OC1A        DIO9
-#define OC1B        DIO10
-#define OC2A        DIO11
-#define OC2B        DIO3
+#define OC0A        6
+#define OC0B        5
+#define OC1A        9
+#define OC1B        10
+#define OC2A        11
+#define OC2B        3

 // Digital I/O

--- a/Marlin/src/HAL/AVR/fastio/fastio_644.h
+++ b/Marlin/src/HAL/AVR/fastio/fastio_644.h
@@ -56,34 +56,32 @@

 #include "../fastio.h"

-#define DEBUG_LED   DIO0
-
 // UART
-#define RXD         DIO8
-#define TXD         DIO9
-#define RXD0        DIO8
-#define TXD0        DIO9
+#define RXD         8
+#define TXD         9
+#define RXD0        8
+#define TXD0        9

-#define RXD1        DIO10
-#define TXD1        DIO11
+#define RXD1        10
+#define TXD1        11

 // SPI
-#define SCK         DIO7
-#define MISO        DIO6
-#define MOSI        DIO5
-#define SS          DIO4
+#define SS          4
+#define MOSI        5
+#define MISO        6
+#define SCK         7

 // TWI (I2C)
-#define SCL         DIO16
-#define SDA         DIO17
+#define SCL         16
+#define SDA         17

 // Timers and PWM
-#define OC0A        DIO3
-#define OC0B        DIO4
-#define OC1A        DIO13
-#define OC1B        DIO12
-#define OC2A        DIO15
-#define OC2B        DIO14
+#define OC0A        3
+#define OC0B        4
+#define OC1A        13
+#define OC1B        12
+#define OC2A        15
+#define OC2B        14

 // Digital I/O

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

 #include "../fastio.h"

-// change for your board
-#define DEBUG_LED   DIO31 /* led D5 red */
-
 // SPI
-#define SCK         DIO21  //  9
-#define MISO        DIO23  // 11
-#define MOSI        DIO22  // 10
-#define SS          DIO20  //  8
+#define SS          20  //  8
+#define SCK         21  //  9
+#define MOSI        22  // 10
+#define MISO        23  // 11

 // Digital I/O

@@ -679,7 +676,6 @@
 #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.
--- a/Marlin/src/HAL/AVR/inc/Conditionals_LCD.h
+++ b/Marlin/src/HAL/AVR/inc/Conditionals_LCD.h
@@ -21,6 +21,6 @@
 */
 #pragma once

-#if HAS_SPI_TFT || HAS_FSMC_TFT
-  #error "Sorry! TFT displays are not available for HAL/AVR."
+#ifndef SERIAL_PORT
+  #define SERIAL_PORT 0
 #endif
--- a/Marlin/src/HAL/AVR/inc/SanityCheck.h
+++ b/Marlin/src/HAL/AVR/inc/SanityCheck.h
@@ -25,6 +25,10 @@
 * Test AVR-specific configuration values for errors at compile-time.
 */

+#if HAS_SPI_TFT || HAS_FSMC_TFT
+  #error "Sorry! TFT displays are not available for HAL/AVR."
+#endif
+
 /**
 * Check for common serial pin conflicts
 */
@@ -35,7 +39,7 @@
  || X_STEP_PIN == N || Y_STEP_PIN == N || Z_STEP_PIN  == N \
  || X_DIR_PIN  == N || Y_DIR_PIN  == N || Z_DIR_PIN   == N \
  || X_ENA_PIN  == N || Y_ENA_PIN  == N || Z_ENA_PIN   == N \
-  || BTN_EN1    == N || BTN_EN2    == N \
+  || BTN_EN1    == N || BTN_EN2    == N || LCD_PINS_EN == N \
 )
 #if SERIAL_IN_USE(0)
  // D0-D1. No known conflicts.
@@ -69,8 +73,8 @@
 /**
 * Checks for SOFT PWM
 */
-#if HAS_FAN0 && FAN_PIN == 9 && DISABLED(FAN_SOFT_PWM) && ENABLED(SPEAKER)
-  #error "FAN_PIN 9 Hardware PWM uses Timer 2 which conflicts with Arduino AVR Tone Timer (for SPEAKER)."
+#if HAS_FAN0 && FAN0_PIN == 9 && DISABLED(FAN_SOFT_PWM) && ENABLED(SPEAKER)
+  #error "FAN0_PIN 9 Hardware PWM uses Timer 2 which conflicts with Arduino AVR Tone Timer (for SPEAKER)."
  #error "Disable SPEAKER or enable FAN_SOFT_PWM."
 #endif

@@ -91,11 +95,11 @@
 /**
 * The Trinamic library includes SoftwareSerial.h, leading to a compile error.
 */
-#if BOTH(HAS_TRINAMIC_CONFIG, 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

-#if BOTH(HAS_TMC_SW_SERIAL, MONITOR_DRIVER_STATUS)
+#if ALL(HAS_TMC_SW_SERIAL, MONITOR_DRIVER_STATUS)
  #error "MONITOR_DRIVER_STATUS causes performance issues when used with SoftwareSerial-connected drivers. Disable MONITOR_DRIVER_STATUS or use hardware serial to continue."
 #endif

--- a/Marlin/src/HAL/AVR/math.h
+++ b/Marlin/src/HAL/AVR/math.h
@@ -27,13 +27,14 @@

 // intRes = longIn1 * longIn2 >> 24
 // uses:
-// A[tmp] to store 0
-// B[tmp] to store bits 16-23 of the 48bit result. The top bit is used to round the two byte result.
-// note that the lower two bytes and the upper byte of the 48bit result are not calculated.
-// this can cause the result to be out by one as the lower bytes may cause carries into the upper ones.
-// B A are bits 24-39 and are the returned value
-// C B A is longIn1
-// D C B A is longIn2
+// r1, r0 for the result of mul.
+// [tmp1] to store 0.
+// [tmp2] to store bits 16-23 of the 56 bit result. The top bit of [tmp2] is used for rounding.
+// Note that the lower two bytes and the upper two bytes of the 56 bit result are not calculated.
+// This can cause the result to be out by one as the lower bytes may cause carries into the upper ones.
+// [intRes] (A B) is bits 24-39 and is the returned value.
+// [longIn1] (C B A) is a 24 bit parameter.
+// [longIn2] (D C B A) is a 32 bit parameter.
 //
 FORCE_INLINE static uint16_t MultiU24X32toH16(uint32_t longIn1, uint32_t longIn2) {
  uint8_t tmp1;
@@ -66,11 +67,9 @@ FORCE_INLINE static uint16_t MultiU24X32toH16(uint32_t longIn1, uint32_t longIn2
    A("add %[tmp2], r1")
    A("adc %A[intRes], %[tmp1]")
    A("adc %B[intRes], %[tmp1]")
-    A("lsr %[tmp2]")
-    A("adc %A[intRes], %[tmp1]")
-    A("adc %B[intRes], %[tmp1]")
    A("mul %D[longIn2], %A[longIn1]")
-    A("add %A[intRes], r0")
+    A("lsl %[tmp2]")
+    A("adc %A[intRes], r0")
    A("adc %B[intRes], r1")
    A("mul %D[longIn2], %B[longIn1]")
    A("add %B[intRes], r0")
@@ -85,11 +84,16 @@ FORCE_INLINE static uint16_t MultiU24X32toH16(uint32_t longIn1, uint32_t longIn2
  return intRes;
 }

-// intRes = intIn1 * intIn2 >> 16
+// intRes = intIn1 * intIn2 >> 8
 // uses:
-// r26 to store 0
-// r27 to store the byte 1 of the 24 bit result
-FORCE_INLINE static uint16_t MultiU16X8toH16(uint8_t charIn1, uint16_t intIn2) {
+// r1, r0 for the result of mul. After the second mul, r0 holds bits 0-7 of the 24 bit result and
+// the top bit of r0 is used for rounding.
+// [tmp] to store 0.
+// [intRes] (A B) is bits 8-15 and is the returned value.
+// [charIn1] is an 8 bit parameter.
+// [intIn2] (B A) is a 16 bit parameter.
+//
+FORCE_INLINE static uint16_t MultiU8X16toH16(uint8_t charIn1, uint16_t intIn2) {
  uint8_t tmp;
  uint16_t intRes;
  __asm__ __volatile__ (
@@ -97,10 +101,8 @@ FORCE_INLINE static uint16_t MultiU16X8toH16(uint8_t charIn1, uint16_t intIn2) {
    A("mul %[charIn1], %B[intIn2]")
    A("movw %A[intRes], r0")
    A("mul %[charIn1], %A[intIn2]")
-    A("add %A[intRes], r1")
-    A("adc %B[intRes], %[tmp]")
-    A("lsr r0")
-    A("adc %A[intRes], %[tmp]")
+    A("lsl r0")
+    A("adc %A[intRes], r1")
    A("adc %B[intRes], %[tmp]")
    A("clr r1")
      : [intRes] "=&r" (intRes),
--- a/Marlin/src/HAL/AVR/pinsDebug.h
+++ b/Marlin/src/HAL/AVR/pinsDebug.h
@@ -22,7 +22,23 @@
 #pragma once

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

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

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

  #include "pinsDebug_plus_70.h"
-  #define digitalPinToTimer_DEBUG(p) digitalPinToTimer_plus_70(p)
-  #define digitalPinToBitMask_DEBUG(p) digitalPinToBitMask_plus_70(p)
-  #define digitalPinToPort_DEBUG(p) digitalPinToPort_plus_70(p)
-  bool GET_PINMODE(int8_t pin) {return *portModeRegister(digitalPinToPort_DEBUG(pin)) & digitalPinToBitMask_DEBUG(pin); }
+  #define digitalPinToTimer_DEBUG(P) digitalPinToTimer_plus_70(P)
+  #define digitalPinToBitMask_DEBUG(P) digitalPinToBitMask_plus_70(P)
+  #define digitalPinToPort_DEBUG(P) digitalPinToPort_plus_70(P)
+  bool getValidPinMode(pin_t pin) {return *portModeRegister(digitalPinToPort_DEBUG(pin)) & digitalPinToBitMask_DEBUG(pin); }

 #else

-  #define digitalPinToTimer_DEBUG(p) digitalPinToTimer(p)
-  #define digitalPinToBitMask_DEBUG(p) digitalPinToBitMask(p)
-  #define digitalPinToPort_DEBUG(p) digitalPinToPort(p)
-  bool GET_PINMODE(int8_t pin) {return *portModeRegister(digitalPinToPort_DEBUG(pin)) & digitalPinToBitMask_DEBUG(pin); }
-  #define GET_ARRAY_PIN(p) pgm_read_byte(&pin_array[p].pin)
+  #define digitalPinToTimer_DEBUG(P) digitalPinToTimer(P)
+  #define digitalPinToBitMask_DEBUG(P) digitalPinToBitMask(P)
+  #define digitalPinToPort_DEBUG(P) digitalPinToPort(P)
+  bool getValidPinMode(pin_t pin) {return *portModeRegister(digitalPinToPort_DEBUG(pin)) & digitalPinToBitMask_DEBUG(pin); }
+  #define getPinByIndex(x) pgm_read_byte(&pin_array[x].pin)

 #endif

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

-void PRINT_ARRAY_NAME(uint8_t x) {
-  PGM_P const name_mem_pointer = (PGM_P)pgm_read_ptr(&pin_array[x].name);
-  LOOP_L_N(y, MAX_NAME_LENGTH) {
+void printPinNameByIndex(const uint8_t index) {
+  PGM_P const name_mem_pointer = (PGM_P)pgm_read_ptr(&pin_array[index].name);
+  for (uint8_t y = 0; y < MAX_NAME_LENGTH; ++y) {
    char temp_char = pgm_read_byte(name_mem_pointer + y);
    if (temp_char != 0)
      SERIAL_CHAR(temp_char);
    else {
-      LOOP_L_N(i, MAX_NAME_LENGTH - y) SERIAL_CHAR(' ');
+      for (uint8_t i = 0; i < MAX_NAME_LENGTH - y; ++i) SERIAL_CHAR(' ');
      break;
    }
  }
 }

-#define GET_ARRAY_IS_DIGITAL(x)   pgm_read_byte(&pin_array[x].is_digital)
-
+#define getPinIsDigitalByIndex(x)   pgm_read_byte(&pin_array[x].is_digital)

 #if defined(__AVR_ATmega1284P__)  // 1284 IDE extensions set this to the number of
  #undef NUM_DIGITAL_PINS         // digital only pins while all other CPUs have it
@@ -108,7 +125,7 @@ void PRINT_ARRAY_NAME(uint8_t x) {
 * Print a pin's PWM status.
 * Return true if it's currently a PWM pin.
 */
-static bool pwm_status(uint8_t pin) {
+bool pwm_status(const uint8_t pin) {
  char buffer[20];   // for the sprintf statements

  switch (digitalPinToTimer_DEBUG(pin)) {
@@ -162,7 +179,6 @@ static bool pwm_status(uint8_t pin) {
  SERIAL_ECHO_SP(2);
 } // pwm_status

-
 const volatile uint8_t* const PWM_other[][3] PROGMEM = {
    { &TCCR0A, &TCCR0B, &TIMSK0 },
    { &TCCR1A, &TCCR1B, &TIMSK1 },
@@ -180,7 +196,6 @@ const volatile uint8_t* const PWM_other[][3] PROGMEM = {
  #endif
 };

-
 const volatile uint8_t* const PWM_OCR[][3] PROGMEM = {

  #ifdef TIMER0A
@@ -216,7 +231,6 @@ 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])
@@ -231,12 +245,12 @@ const volatile uint8_t* const PWM_OCR[][3] PROGMEM = {

 #define OCR_VAL(T, L)   pgm_read_word(&PWM_OCR[T][L])

-static void err_is_counter()     { SERIAL_ECHOPGM("   non-standard PWM mode"); }
-static void err_is_interrupt()   { SERIAL_ECHOPGM("   compare interrupt enabled"); }
-static void err_prob_interrupt() { SERIAL_ECHOPGM("   overflow interrupt enabled"); }
-static void print_is_also_tied() { SERIAL_ECHOPGM(" is also tied to this pin"); SERIAL_ECHO_SP(14); }
+void err_is_counter()     { SERIAL_ECHOPGM("   non-standard PWM mode"); }
+void err_is_interrupt()   { SERIAL_ECHOPGM("   compare interrupt enabled"); }
+void err_prob_interrupt() { SERIAL_ECHOPGM("   overflow interrupt enabled"); }
+void print_is_also_tied() { SERIAL_ECHOPGM(" is also tied to this pin"); SERIAL_ECHO_SP(14); }

-inline void com_print(const uint8_t N, const uint8_t Z) {
+void com_print(const uint8_t N, const uint8_t Z) {
  const uint8_t *TCCRA = (uint8_t*)TCCR_A(N);
  SERIAL_ECHOPGM("    COM", AS_DIGIT(N));
  SERIAL_CHAR(Z);
@@ -278,7 +292,7 @@ void timer_prefix(uint8_t T, char L, uint8_t N) {  // T - timer    L - pwm  N -
  if (TEST(*TMSK, TOIE)) err_prob_interrupt();
 }

-static void pwm_details(uint8_t pin) {
+void printPinPWM(const uint8_t pin) {
  switch (digitalPinToTimer_DEBUG(pin)) {

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

 #ifndef digitalRead_mod                   // Use Teensyduino's version of digitalRead - it doesn't disable the PWMs
-  int digitalRead_mod(const int8_t pin) { // same as digitalRead except the PWM stop section has been removed
+  int digitalRead_mod(const pin_t pin) {  // same as digitalRead except the PWM stop section has been removed
    const uint8_t port = digitalPinToPort_DEBUG(pin);
    return (port != NOT_A_PIN) && (*portInputRegister(port) & digitalPinToBitMask_DEBUG(pin)) ? HIGH : LOW;
  }
 #endif

-#ifndef PRINT_PORT
-
-  void print_port(int8_t pin) {   // print port number
+void printPinPort(const pin_t pin) {   // print port number
  #ifdef digitalPinToPort_DEBUG
    uint8_t x;
    SERIAL_ECHOPGM("  Port: ");
@@ -388,13 +400,9 @@ static void pwm_details(uint8_t pin) {
  #else
    SERIAL_ECHO_SP(10);
  #endif
-  }
+}

-  #define PRINT_PORT(p) print_port(p)
-
-#endif
-
-#define PRINT_PIN(p) do{ sprintf_P(buffer, PSTR("%3d "), p); SERIAL_ECHO(buffer); }while(0)
-#define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); SERIAL_ECHO(buffer); }while(0)
+#define printPinNumber(P) do{ sprintf_P(buffer, PSTR("%3d "), P); SERIAL_ECHO(buffer); }while(0)
+#define printPinAnalog(P) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), digitalPinToAnalogIndex(P)); SERIAL_ECHO(buffer); }while(0)

 #undef ABTEST
--- a/Marlin/src/HAL/AVR/pinsDebug_Teensyduino.h
+++ b/Marlin/src/HAL/AVR/pinsDebug_Teensyduino.h
@@ -22,11 +22,10 @@
 #pragma once

 //
-//  some of the pin mapping functions of the Teensduino extension to the Arduino IDE
-//  do not function the same as the other Arduino extensions
+// Some of the pin mapping functions of the Arduino IDE Teensduino extension
+// function differently from other Arduino extensions.
 //

-
 #define TEENSYDUINO_IDE

 //digitalPinToTimer(pin) function works like Arduino but Timers are not defined
@@ -48,8 +47,6 @@
 #define PE 5
 #define PF 6

-#undef digitalPinToPort
-
 const uint8_t PROGMEM digital_pin_to_port_PGM[] = {
  PD, // 0  - PD0 - INT0 - PWM
  PD, // 1  - PD1 - INT1 - PWM
@@ -101,11 +98,11 @@ const uint8_t PROGMEM digital_pin_to_port_PGM[] = {
  PE, // 47 - PE3 (not defined in teensyduino)
 };

-#define digitalPinToPort(P) ( pgm_read_byte( digital_pin_to_port_PGM + (P) ) )
+#define digitalPinToPort(P) pgm_read_byte(digital_pin_to_port_PGM[P])

 // 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
--- a/Marlin/src/HAL/AVR/pinsDebug_plus_70.h
+++ b/Marlin/src/HAL/AVR/pinsDebug_plus_70.h
@@ -231,7 +231,6 @@ const uint8_t PROGMEM digital_pin_to_bit_mask_PGM_plus_70[] = {

 #define digitalPinToBitMask_plus_70(P) ( pgm_read_byte( digital_pin_to_bit_mask_PGM_plus_70 + (P) ) )

-
 const uint8_t PROGMEM digital_pin_to_timer_PGM_plus_70[] = {
  // TIMERS
  // ------------------------
--- a/Marlin/src/HAL/AVR/timers.h
+++ b/Marlin/src/HAL/AVR/timers.h
@@ -1,7 +1,9 @@
 /**
 * Marlin 3D Printer Firmware
 * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
+ *
+ * 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
@@ -44,13 +46,13 @@ typedef uint16_t hal_timer_t;
  #define MF_TIMER_TEMP         0
 #endif

-#define TEMP_TIMER_FREQUENCY    ((F_CPU) / 64.0 / 256.0)
+#define TEMP_TIMER_FREQUENCY    (((F_CPU) + 0x2000) / 0x4000)

 #define STEPPER_TIMER_RATE      HAL_TIMER_RATE
 #define STEPPER_TIMER_PRESCALE  8
-#define STEPPER_TIMER_TICKS_PER_US ((STEPPER_TIMER_RATE) / 1000000) // Cannot be of type double
+#define STEPPER_TIMER_TICKS_PER_US ((STEPPER_TIMER_RATE) / 1000000)

-#define PULSE_TIMER_RATE       STEPPER_TIMER_RATE   // frequency of pulse timer
+#define PULSE_TIMER_RATE         STEPPER_TIMER_RATE
 #define PULSE_TIMER_PRESCALE     STEPPER_TIMER_PRESCALE
 #define PULSE_TIMER_TICKS_PER_US STEPPER_TIMER_TICKS_PER_US

--- a/Marlin/src/HAL/AVR/u8g_com_HAL_AVR_sw_spi.cpp
+++ b/Marlin/src/HAL/AVR/u8g_com_HAL_AVR_sw_spi.cpp
@@ -88,7 +88,7 @@ void u8g_spiSend_sw_AVR_mode_0(uint8_t val) {
  volatile uint8_t *outData = u8g_outData,
                   *outClock = u8g_outClock;
  U8G_ATOMIC_START();
-  LOOP_L_N(i, 8) {
+  for (uint8_t i = 0; i < 8; ++i) {
    if (val & 0x80)
      *outData |= bitData;
    else
@@ -108,7 +108,7 @@ void u8g_spiSend_sw_AVR_mode_3(uint8_t val) {
  volatile uint8_t *outData = u8g_outData,
                   *outClock = u8g_outClock;
  U8G_ATOMIC_START();
-  LOOP_L_N(i, 8) {
+  for (uint8_t i = 0; i < 8; ++i) {
    *outClock &= bitNotClock;
    if (val & 0x80)
      *outData |= bitData;
@@ -120,7 +120,6 @@ void u8g_spiSend_sw_AVR_mode_3(uint8_t val) {
  U8G_ATOMIC_END();
 }

-
 #if ENABLED(FYSETC_MINI_12864)
  #define SPISEND_SW_AVR u8g_spiSend_sw_AVR_mode_3
 #else
--- a/Marlin/src/HAL/DUE/HAL.cpp
+++ b/Marlin/src/HAL/DUE/HAL.cpp
@@ -1,7 +1,9 @@
 /**
 * Marlin 3D Printer Firmware
 * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
+ *
+ * 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
@@ -45,7 +47,7 @@ uint16_t MarlinHAL::adc_result;
 #endif

 void MarlinHAL::init() {
-  #if ENABLED(SDSUPPORT)
+  #if HAS_MEDIA
    OUT_WRITE(SDSS, HIGH);  // Try to set SDSS inactive before any other SPI users start up
  #endif
  usb_task_init();          // Initialize the USB stack
--- a/Marlin/src/HAL/DUE/HAL.h
+++ b/Marlin/src/HAL/DUE/HAL.h
@@ -1,9 +1,9 @@
 /**
 * Marlin 3D Printer Firmware
- *
 * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
- * Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
+ *
+ * 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
@@ -123,11 +123,11 @@ typedef Servo hal_servo_t;
 //
 // ADC
 //
-#define HAL_ADC_VREF         3.3
+#define HAL_ADC_VREF_MV   3300
 #define HAL_ADC_RESOLUTION  10

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

 //
--- a/Marlin/src/HAL/DUE/HAL_SPI.cpp
+++ b/Marlin/src/HAL/DUE/HAL_SPI.cpp
@@ -42,7 +42,7 @@
 // Public functions
 // ------------------------

-#if EITHER(DUE_SOFTWARE_SPI, FORCE_SOFT_SPI)
+#if ANY(DUE_SOFTWARE_SPI, FORCE_SOFT_SPI)

  // ------------------------
  // Software SPI
--- a/Marlin/src/HAL/DUE/MarlinSerial.cpp
+++ b/Marlin/src/HAL/DUE/MarlinSerial.cpp
@@ -474,7 +474,6 @@ 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> >;
--- a/Marlin/src/HAL/DUE/MarlinSerial.h
+++ b/Marlin/src/HAL/DUE/MarlinSerial.h
@@ -30,6 +30,7 @@
 #include <WString.h>

 #include "../../inc/MarlinConfigPre.h"
+#include "../../core/types.h"
 #include "../../core/serial_hook.h"

 // Define constants and variables for buffering incoming serial data.  We're
@@ -52,10 +53,6 @@
 //  #error "TX_BUFFER_SIZE must be 0, a power of 2 greater than 1, and no greater than 256."
 //#endif

-// Templated type selector
-template<bool b, typename T, typename F> struct TypeSelector { typedef T type;} ;
-template<typename T, typename F> struct TypeSelector<false, T, F> { typedef F type; };
-
 // Templated structure wrapper
 template<typename S, unsigned int addr> struct StructWrapper {
  constexpr StructWrapper(int) {}
@@ -76,7 +73,7 @@ protected:
  static constexpr int HWUART_IRQ_ID = IRQ_IDS[Cfg::PORT];

  // Base size of type on buffer size
-  typedef typename TypeSelector<(Cfg::RX_SIZE>256), uint16_t, uint8_t>::type ring_buffer_pos_t;
+  typedef uvalue_t(Cfg::RX_SIZE - 1) ring_buffer_pos_t;

  struct ring_buffer_r {
    volatile ring_buffer_pos_t head, tail;
--- a/Marlin/src/HAL/DUE/MinSerial.cpp
+++ b/Marlin/src/HAL/DUE/MinSerial.cpp
@@ -73,7 +73,7 @@ void install_min_serial() {
 }

 #if DISABLED(DYNAMIC_VECTORTABLE)
-extern "C" {
+  extern "C" {
    __attribute__((naked)) void JumpHandler_ASM() {
      __asm__ __volatile__ (
        "b CommonHandler_ASM\n"
@@ -84,7 +84,7 @@ extern "C" {
    void __attribute__((naked, alias("JumpHandler_ASM"))) UsageFault_Handler();
    void __attribute__((naked, alias("JumpHandler_ASM"))) MemManage_Handler();
    void __attribute__((naked, alias("JumpHandler_ASM"))) NMI_Handler();
-}
+  }
 #endif

 #endif // POSTMORTEM_DEBUGGING
--- a/Marlin/src/HAL/DUE/Servo.cpp
+++ b/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);

--- a/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp
+++ b/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp
@@ -81,7 +81,7 @@ Pio *SCK_pPio, *MOSI_pPio;
 uint32_t SCK_dwMask, MOSI_dwMask;

 void u8g_spiSend_sw_DUE_mode_0(uint8_t val) { // 3MHz
-  LOOP_L_N(i, 8) {
+  for (uint8_t i = 0; i < 8; ++i) {
    if (val & 0x80)
      MOSI_pPio->PIO_SODR = MOSI_dwMask;
    else
@@ -95,7 +95,7 @@ void u8g_spiSend_sw_DUE_mode_0(uint8_t val) { // 3MHz
 }

 void u8g_spiSend_sw_DUE_mode_3(uint8_t val) { // 3.5MHz
-  LOOP_L_N(i, 8) {
+  for (uint8_t i = 0; i < 8; ++i) {
    SCK_pPio->PIO_CODR = SCK_dwMask;
    DELAY_NS(50);
    if (val & 0x80)
--- a/Marlin/src/HAL/DUE/eeprom_flash.cpp
+++ b/Marlin/src/HAL/DUE/eeprom_flash.cpp
@@ -1,10 +1,9 @@
 /**
 * Marlin 3D Printer Firmware
- *
 * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
- * Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
- * Copyright (c) 2016 Victor Perez victor_pv@hotmail.com
+ *
+ * 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
@@ -292,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) {
--- a/Marlin/src/HAL/DUE/eeprom_wired.cpp
+++ b/Marlin/src/HAL/DUE/eeprom_wired.cpp
@@ -1,10 +1,9 @@
 /**
 * Marlin 3D Printer Firmware
- *
 * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
- * Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
- * Copyright (c) 2016 Victor Perez victor_pv@hotmail.com
+ *
+ * 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
--- a/Marlin/src/HAL/DUE/endstop_interrupts.h
+++ b/Marlin/src/HAL/DUE/endstop_interrupts.h
@@ -47,33 +47,33 @@ void endstop_ISR() { endstops.update(); }

 void setup_endstop_interrupts() {
  #define _ATTACH(P) attachInterrupt(digitalPinToInterrupt(P), endstop_ISR, CHANGE)
-  TERN_(HAS_X_MAX, _ATTACH(X_MAX_PIN));
-  TERN_(HAS_X_MIN, _ATTACH(X_MIN_PIN));
-  TERN_(HAS_Y_MAX, _ATTACH(Y_MAX_PIN));
-  TERN_(HAS_Y_MIN, _ATTACH(Y_MIN_PIN));
-  TERN_(HAS_Z_MAX, _ATTACH(Z_MAX_PIN));
-  TERN_(HAS_Z_MIN, _ATTACH(Z_MIN_PIN));
-  TERN_(HAS_X2_MAX, _ATTACH(X2_MAX_PIN));
-  TERN_(HAS_X2_MIN, _ATTACH(X2_MIN_PIN));
-  TERN_(HAS_Y2_MAX, _ATTACH(Y2_MAX_PIN));
-  TERN_(HAS_Y2_MIN, _ATTACH(Y2_MIN_PIN));
-  TERN_(HAS_Z2_MAX, _ATTACH(Z2_MAX_PIN));
-  TERN_(HAS_Z2_MIN, _ATTACH(Z2_MIN_PIN));
-  TERN_(HAS_Z3_MAX, _ATTACH(Z3_MAX_PIN));
-  TERN_(HAS_Z3_MIN, _ATTACH(Z3_MIN_PIN));
-  TERN_(HAS_Z4_MAX, _ATTACH(Z4_MAX_PIN));
-  TERN_(HAS_Z4_MIN, _ATTACH(Z4_MIN_PIN));
+  TERN_(USE_X_MAX, _ATTACH(X_MAX_PIN));
+  TERN_(USE_X_MIN, _ATTACH(X_MIN_PIN));
+  TERN_(USE_Y_MAX, _ATTACH(Y_MAX_PIN));
+  TERN_(USE_Y_MIN, _ATTACH(Y_MIN_PIN));
+  TERN_(USE_Z_MAX, _ATTACH(Z_MAX_PIN));
+  TERN_(USE_Z_MIN, _ATTACH(Z_MIN_PIN));
+  TERN_(USE_X2_MAX, _ATTACH(X2_MAX_PIN));
+  TERN_(USE_X2_MIN, _ATTACH(X2_MIN_PIN));
+  TERN_(USE_Y2_MAX, _ATTACH(Y2_MAX_PIN));
+  TERN_(USE_Y2_MIN, _ATTACH(Y2_MIN_PIN));
+  TERN_(USE_Z2_MAX, _ATTACH(Z2_MAX_PIN));
+  TERN_(USE_Z2_MIN, _ATTACH(Z2_MIN_PIN));
+  TERN_(USE_Z3_MAX, _ATTACH(Z3_MAX_PIN));
+  TERN_(USE_Z3_MIN, _ATTACH(Z3_MIN_PIN));
+  TERN_(USE_Z4_MAX, _ATTACH(Z4_MAX_PIN));
+  TERN_(USE_Z4_MIN, _ATTACH(Z4_MIN_PIN));
  TERN_(HAS_Z_MIN_PROBE_PIN, _ATTACH(Z_MIN_PROBE_PIN));
-  TERN_(HAS_I_MAX, _ATTACH(I_MAX_PIN));
-  TERN_(HAS_I_MIN, _ATTACH(I_MIN_PIN));
-  TERN_(HAS_J_MAX, _ATTACH(J_MAX_PIN));
-  TERN_(HAS_J_MIN, _ATTACH(J_MIN_PIN));
-  TERN_(HAS_K_MAX, _ATTACH(K_MAX_PIN));
-  TERN_(HAS_K_MIN, _ATTACH(K_MIN_PIN));
-  TERN_(HAS_U_MAX, _ATTACH(U_MAX_PIN));
-  TERN_(HAS_U_MIN, _ATTACH(U_MIN_PIN));
-  TERN_(HAS_V_MAX, _ATTACH(V_MAX_PIN));
-  TERN_(HAS_V_MIN, _ATTACH(V_MIN_PIN));
-  TERN_(HAS_W_MAX, _ATTACH(W_MAX_PIN));
-  TERN_(HAS_W_MIN, _ATTACH(W_MIN_PIN));
+  TERN_(USE_I_MAX, _ATTACH(I_MAX_PIN));
+  TERN_(USE_I_MIN, _ATTACH(I_MIN_PIN));
+  TERN_(USE_J_MAX, _ATTACH(J_MAX_PIN));
+  TERN_(USE_J_MIN, _ATTACH(J_MIN_PIN));
+  TERN_(USE_K_MAX, _ATTACH(K_MAX_PIN));
+  TERN_(USE_K_MIN, _ATTACH(K_MIN_PIN));
+  TERN_(USE_U_MAX, _ATTACH(U_MAX_PIN));
+  TERN_(USE_U_MIN, _ATTACH(U_MIN_PIN));
+  TERN_(USE_V_MAX, _ATTACH(V_MAX_PIN));
+  TERN_(USE_V_MIN, _ATTACH(V_MIN_PIN));
+  TERN_(USE_W_MAX, _ATTACH(W_MAX_PIN));
+  TERN_(USE_W_MIN, _ATTACH(W_MIN_PIN));
 }
--- a/Marlin/src/HAL/DUE/fastio.h
+++ b/Marlin/src/HAL/DUE/fastio.h
@@ -189,12 +189,12 @@
 */

 // UART
-#define RXD        DIO0
-#define TXD        DIO1
+#define RXD        0
+#define TXD        1

 // TWI (I2C)
-#define SCL        DIO21
-#define SDA        DIO20
+#define SCL        21
+#define SDA        20

 /**
 * pins
--- a/Marlin/src/HAL/DUE/fastio/G2_PWM.h
+++ b/Marlin/src/HAL/DUE/fastio/G2_PWM.h
@@ -49,7 +49,6 @@ 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'), \
@@ -63,7 +62,7 @@ extern PWM_map ISR_table[NUM_PWMS];
 extern uint32_t motor_current_setting[3];

 #define IR_BIT(p) (WITHIN(p, 0, 3) ? (p) : (p) + 4)
-#define COPY_ACTIVE_TABLE() do{ LOOP_L_N(i, 6) work_table[i] = active_table[i]; }while(0)
+#define COPY_ACTIVE_TABLE() do{ for (uint8_t i = 0; i < 6; ++i) work_table[i] = active_table[i]; }while(0)

 #define PWM_MR0 19999         // base repetition rate minus one count - 20mS
 #define PWM_PR 24             // prescaler value - prescaler divide by 24 + 1  -  1 MHz output
--- a/Marlin/src/HAL/DUE/fastio/G2_pins.h
+++ b/Marlin/src/HAL/DUE/fastio/G2_pins.h
@@ -168,7 +168,6 @@ 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
--- a/Marlin/src/HAL/DUE/inc/Conditionals_LCD.h
+++ b/Marlin/src/HAL/DUE/inc/Conditionals_LCD.h
@@ -20,7 +20,3 @@
 *
 */
 #pragma once
-
-#if HAS_SPI_TFT || HAS_FSMC_TFT
-  #error "Sorry! TFT displays are not available for HAL/DUE."
-#endif
--- a/Marlin/src/HAL/DUE/inc/Conditionals_post.h
+++ b/Marlin/src/HAL/DUE/inc/Conditionals_post.h
@@ -23,6 +23,6 @@

 #if USE_FALLBACK_EEPROM
  #define FLASH_EEPROM_EMULATION
-#elif EITHER(I2C_EEPROM, SPI_EEPROM)
+#elif ANY(I2C_EEPROM, SPI_EEPROM)
  #define USE_SHARED_EEPROM 1
 #endif
--- a/Marlin/src/HAL/DUE/inc/SanityCheck.h
+++ b/Marlin/src/HAL/DUE/inc/SanityCheck.h
@@ -25,6 +25,10 @@
 * Test Arduino Due specific configuration values for errors at compile-time.
 */

+#if HAS_SPI_TFT || HAS_FSMC_TFT
+  #error "Sorry! TFT displays are not available for HAL/DUE."
+#endif
+
 /**
 * Check for common serial pin conflicts
 */
@@ -64,20 +68,19 @@
 * 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_SW_##P) && (TMC_SW_##P == SD_MOSI_PIN || TMC_SW_##P == SD_MISO_PIN || TMC_SW_##P == SD_SCK_PIN))
-
-#if ENABLED(SDSUPPORT) && HAS_DRIVER(TMC2130)
-  #if ENABLED(TMC_USE_SW_SPI)
-    #if DISABLED(DUE_SOFTWARE_SPI) && (_IS_HW_SPI(MOSI) || _IS_HW_SPI(MISO) || _IS_HW_SPI(SCK))
+#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 DISABLED(DUE_SOFTWARE_SPI) && ENABLED(TMC_USE_SW_SPI) && (_IS_HW_SPI(MOSI) || _IS_HW_SPI(MISO) || _IS_HW_SPI(SCK))
    #error "DUE hardware SPI is required but is incompatible with TMC2130 software SPI. Either disable TMC_USE_SW_SPI or use separate pins for the two SPIs."
  #endif
-  #elif ENABLED(DUE_SOFTWARE_SPI)
+  #if ENABLED(DUE_SOFTWARE_SPI) && DISABLED(TMC_USE_SW_SPI)
    #error "DUE software SPI is required but is incompatible with TMC2130 hardware SPI. Enable TMC_USE_SW_SPI to fix."
  #endif
+  #undef _IS_HW_SPI
 #endif

 #if ENABLED(FAST_PWM_FAN) || SPINDLE_LASER_FREQUENCY
-  #error "Features requiring Hardware PWM (FAST_PWM_FAN, SPINDLE_LASER_FREQUENCY) are not yet supported on DUE."
+  #error "Features requiring Hardware PWM (FAST_PWM_FAN, SPINDLE_LASER_FREQUENCY) are not yet supported for HAL/DUE."
 #endif

 #if HAS_TMC_SW_SERIAL
--- a/Marlin/src/HAL/DUE/pinsDebug.h
+++ b/Marlin/src/HAL/DUE/pinsDebug.h
@@ -19,13 +19,26 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 *
 */
+#pragma once

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

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

 #define NUMBER_PINS_TOTAL PINS_COUNT

-#define digitalRead_mod(p) extDigitalRead(p)  // AVR digitalRead disabled PWM before it read the pin
-#define PRINT_PORT(p)
-#define PRINT_ARRAY_NAME(x) do{ sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); SERIAL_ECHO(buffer); }while(0)
-#define PRINT_PIN(p) do{ sprintf_P(buffer, PSTR("%02d"), p); SERIAL_ECHO(buffer); }while(0)
-#define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); SERIAL_ECHO(buffer); }while(0)
-#define GET_ARRAY_PIN(p) pin_array[p].pin
-#define GET_ARRAY_IS_DIGITAL(p) pin_array[p].is_digital
-#define VALID_PIN(pin) (pin >= 0 && pin < int8_t(NUMBER_PINS_TOTAL))
-#define DIGITAL_PIN_TO_ANALOG_PIN(p) int(p - analogInputToDigitalPin(0))
-#define IS_ANALOG(P) WITHIN(P, char(analogInputToDigitalPin(0)), char(analogInputToDigitalPin(NUM_ANALOG_INPUTS - 1)))
-#define pwm_status(pin) (((g_pinStatus[pin] & 0xF) == PIN_STATUS_PWM) && \
-                        ((g_APinDescription[pin].ulPinAttribute & PIN_ATTR_PWM) == PIN_ATTR_PWM))
+#define digitalRead_mod(P) extDigitalRead(P)  // AVR digitalRead disabled PWM before it read the pin
+#define printPinNameByIndex(x) do{ sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); SERIAL_ECHO(buffer); }while(0)
+#define printPinNumber(P) do{ sprintf_P(buffer, PSTR("%02d"), P); SERIAL_ECHO(buffer); }while(0)
+#define printPinAnalog(P) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), digitalPinToAnalogIndex(P)); SERIAL_ECHO(buffer); }while(0)
+#define getPinByIndex(x) pin_array[x].pin
+#define getPinIsDigitalByIndex(x) pin_array[x].is_digital
+#define isValidPin(P) (P >= 0 && P < pin_t(NUMBER_PINS_TOTAL))
+#define digitalPinToAnalogIndex(P) int(P - analogInputToDigitalPin(0))
+#define isAnalogPin(P) WITHIN(P, pin_t(analogInputToDigitalPin(0)), pin_t(analogInputToDigitalPin(NUM_ANALOG_INPUTS - 1)))
+#define pwm_status(P) (((g_pinStatus[P] & 0xF) == PIN_STATUS_PWM) && \
+                        ((g_APinDescription[P].ulPinAttribute & PIN_ATTR_PWM) == PIN_ATTR_PWM))
 #define MULTI_NAME_PAD 14 // space needed to be pretty if not first name assigned to a pin

-bool GET_PINMODE(int8_t pin) {  // 1: output, 0: input
+bool getValidPinMode(const pin_t pin) {  // 1: output, 0: input
  volatile Pio* port = g_APinDescription[pin].pPort;
  uint32_t mask = g_APinDescription[pin].ulPin;
  uint8_t pin_status = g_pinStatus[pin] & 0xF;
@@ -86,13 +98,15 @@ bool GET_PINMODE(int8_t pin) {  // 1: output, 0: input
          || pwm_status(pin));
 }

-void pwm_details(int32_t pin) {
+void printPinPWM(const int32_t pin) {
  if (pwm_status(pin)) {
    uint32_t chan = g_APinDescription[pin].ulPWMChannel;
    SERIAL_ECHOPGM("PWM = ", PWM_INTERFACE->PWM_CH_NUM[chan].PWM_CDTY);
  }
 }

+void printPinPort(const pin_t) {}
+
 /**
 * DUE Board pin   |  PORT  | Label
 * ----------------+--------+-------
--- a/Marlin/src/HAL/DUE/spi_pins.h
+++ b/Marlin/src/HAL/DUE/spi_pins.h
@@ -24,7 +24,7 @@
 /**
 * Define SPI Pins: SCK, MISO, MOSI, SS
 *
- * Available chip select pins for HW SPI are 4 10 52 77
+ * Available chip select pins for HW SPI are 4 10 52 77 87
 */
 #if SDSS == 4 || SDSS == 10 || SDSS == 52 || SDSS == 77 || SDSS == 87
  #if SDSS == 4
--- a/Marlin/src/HAL/DUE/timers.cpp
+++ b/Marlin/src/HAL/DUE/timers.cpp
@@ -1,9 +1,9 @@
 /**
 * Marlin 3D Printer Firmware
- *
 * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
- * Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
+ *
+ * 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
--- a/Marlin/src/HAL/DUE/timers.h
+++ b/Marlin/src/HAL/DUE/timers.h
@@ -1,8 +1,9 @@
 /**
 * Marlin 3D Printer Firmware
- *
 * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
+ *
+ * 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
--- a/Marlin/src/HAL/DUE/upload_extra_script.py
+++ b/Marlin/src/HAL/DUE/upload_extra_script.py
@@ -11,7 +11,7 @@ if pioutil.is_pio_build():

    if current_OS == 'Windows':

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

        # Use bossac.exe on Windows
        env.Replace(
--- a/Marlin/src/HAL/DUE/usb/README.md
+++ b/Marlin/src/HAL/DUE/usb/README.md
@@ -0,0 +1,29 @@
+# USB Files Source Documentation
+
+## Source
+
+We sourced the USB files in Marlin from the Atmel ASF (Advanced Software Framework). The framework provides a variety of examples which were utilized in this project.
+
+Atmel doesn't provide these files in a source repository but they can be extracted from ASF, which can be downloaded from Atmel.
+
+[Advanced Software Framework](https://www.microchip.com/en-us/tools-resources/develop/libraries/advanced-software-framework)
+
+## Modifications
+
+The files are mostly unmodified except for minor cosmetic changes but some more significant changes were needed.
+
+The changes that prompted the addition of this README file are listed below. Other changes may have been made prior to this.
+
+1. Modified `uotghs_device_due.c` to resolve race conditions that could leave interrupts asserted when freezing the peripheral clock, resulting in hangs and watchdog resets due to the ensuing interrupt storm.
+
+## Version Information
+
+We don't know the exact version of ASF used as the source. However, the copyright information in the files indicates they are from 2015.
+
+## Upgrade Considerations
+
+We looked at the ASF 3.52.0 files released in 2022 but saw no immediate benefits to justify an upgrade. It's important to note that the files in Marlin don't follow the same folder structure as the files in ASF, which complicates the process of comparing and applying updated files.
+
+When these files are updated it's important to carefully compare them to Marlin's versions so any improvements in the Marlin sources are brought forward.
+
+It would be best to make Marlin's directory structure align with ASF or at least document the source of each file to ease future updates.
--- a/Marlin/src/HAL/DUE/usb/compiler.h
+++ b/Marlin/src/HAL/DUE/usb/compiler.h
@@ -142,7 +142,6 @@
 */
 #define COMPILER_PACK_RESET()          COMPILER_PRAGMA(pack())

-
 /**
 * \brief Set aligned boundary.
 */
@@ -283,7 +282,6 @@ typedef double                  F64;  //!< 64-bit floating-point number.
 typedef uint32_t                iram_size_t;
 //! @}

-
 /*! \name Status Types
 */
 //! @{
@@ -291,7 +289,6 @@ typedef bool                Status_bool_t;  //!< Boolean status.
 typedef U8                  Status_t;       //!< 8-bit-coded status.
 //! @}

-
 /*! \name Aliasing Aggregate Types
 */
 //! @{
@@ -462,7 +459,6 @@ typedef struct
 #endif
 //! @}

-
 #ifndef __ASSEMBLY__ // not for assembling.

 //! \name Optimization Control
@@ -581,7 +577,6 @@ typedef struct

 //! @}

-
 /*! \name Zero-Bit Counting
 *
 * Under GCC, __builtin_clz and __builtin_ctz behave like macros when
@@ -692,7 +687,6 @@ typedef struct

 //! @}

-
 /*! \name Bit Reversing
 */
 //! @{
@@ -732,7 +726,6 @@ typedef struct

 //! @}

-
 /*! \name Alignment
 */
 //! @{
@@ -798,7 +791,6 @@ typedef struct
 */
 #define Long_call(addr)                   ((*(void (*)(void))(addr))())

-
 /*! \name MCU Endianism Handling
 * ARM is MCU little endianism.
 */
@@ -868,7 +860,6 @@ 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
@@ -955,7 +946,6 @@ typedef struct

 //! @}

-
 /*! \name Target Abstraction
 */
 //! @{
@@ -997,7 +987,6 @@ typedef U8                  Byte;       //!< 8-bit unsigned integer.

 #endif  // #ifndef __ASSEMBLY__

-
 #ifdef __ICCARM__
 #define SHORTENUM           __packed
 #elif defined(__GNUC__)
--- a/Marlin/src/HAL/DUE/usb/conf_access.h
+++ b/Marlin/src/HAL/DUE/usb/conf_access.h
@@ -81,7 +81,6 @@
 #define LUN_0_NAME                              "\"SD/MMC Card\""
 //! @}

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

-
 #endif // _CONF_ACCESS_H_
--- a/Marlin/src/HAL/DUE/usb/conf_clock.h
+++ b/Marlin/src/HAL/DUE/usb/conf_clock.h
@@ -96,5 +96,4 @@
 // - UPLL frequency: 480MHz
 // - USB clock: 480 / 1 = 480MHz

-
 #endif /* CONF_CLOCK_H_INCLUDED */
--- a/Marlin/src/HAL/DUE/usb/conf_usb.h
+++ b/Marlin/src/HAL/DUE/usb/conf_usb.h
@@ -88,7 +88,6 @@
 #endif
 //@}

-
 /**
 * USB Device Callbacks definitions (Optional)
 * @{
@@ -101,7 +100,7 @@
 #define  USB_DEVICE_SPECIFIC_REQUEST()  usb_task_other_requests()
 //@}

-#if ENABLED(SDSUPPORT)
+#if HAS_MEDIA
  /**
   * USB Device low level configuration
   * When only one interface is used, these configurations are defined by the class module.
@@ -150,7 +149,6 @@

 //@}

-
 /**
 * USB Interface Configuration
 * @{
@@ -185,7 +183,7 @@
 //! Enable id string of interface to add an extra USB string
 #define  UDI_CDC_IAD_STRING_ID            4

-#if ENABLED(SDSUPPORT)
+#if HAS_MEDIA
  /**
   * USB CDC low level configuration
   * In standalone these configurations are defined by the CDC module.
@@ -210,7 +208,6 @@
  //@}
  //@}

-
  /**
   * Configuration of MSC interface
   * @{
@@ -245,7 +242,6 @@

  //@}

-
  /**
   * Description of Composite Device
   * @{
--- a/Marlin/src/HAL/DUE/usb/ctrl_access.c
+++ b/Marlin/src/HAL/DUE/usb/ctrl_access.c
@@ -68,7 +68,6 @@
 #endif
 #include "ctrl_access.h"

-
 //_____ D E F I N I T I O N S ______________________________________________

 #ifdef FREERTOS_USED
@@ -112,7 +111,6 @@ static xSemaphoreHandle ctrl_access_semphr = NULL;

 #endif  // FREERTOS_USED

-
 #if MAX_LUN

 /*! \brief Initializes an entry of the LUN descriptor table.
@@ -242,17 +240,14 @@ 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)
@@ -270,7 +265,6 @@ bool ctrl_access_init(void)
  return true;
 }

-
 /*! \brief Locks accesses to LUNs.
 *
 * \return \c true if the access was successfully locked, else \c false.
@@ -288,7 +282,6 @@ static bool ctrl_access_lock(void)

 #endif  // FREERTOS_USED

-
 U8 get_nb_lun(void)
 {
 #if MEM_USB == ENABLE
@@ -309,13 +302,11 @@ 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;
@@ -337,7 +328,6 @@ Ctrl_status mem_test_unit_ready(U8 lun)
  return status;
 }

-
 Ctrl_status mem_read_capacity(U8 lun, U32 *u32_nb_sector)
 {
  Ctrl_status status;
@@ -359,7 +349,6 @@ Ctrl_status mem_read_capacity(U8 lun, U32 *u32_nb_sector)
  return status;
 }

-
 U8 mem_sector_size(U8 lun)
 {
  U8 sector_size;
@@ -381,7 +370,6 @@ U8 mem_sector_size(U8 lun)
  return sector_size;
 }

-
 bool mem_unload(U8 lun, bool unload)
 {
  bool unloaded;
@@ -433,7 +421,6 @@ bool mem_wr_protect(U8 lun)
  return wr_protect;
 }

-
 bool mem_removal(U8 lun)
 {
  bool removal;
@@ -458,7 +445,6 @@ bool mem_removal(U8 lun)
  return removal;
 }

-
 const char *mem_name(U8 lun)
 {
 #if MAX_LUN==0
@@ -475,17 +461,14 @@ 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;
@@ -505,7 +488,6 @@ 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;
@@ -525,19 +507,16 @@ 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;
@@ -564,7 +543,6 @@ 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;
@@ -591,19 +569,16 @@ 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"
@@ -625,21 +600,18 @@ 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
--- a/Marlin/src/HAL/DUE/usb/ctrl_access.h
+++ b/Marlin/src/HAL/DUE/usb/ctrl_access.h
@@ -56,7 +56,6 @@
 * Support and FAQ: visit <a href="https://www.atmel.com/design-support/">Atmel Support</a>
 */

-
 #ifndef _CTRL_ACCESS_H_
 #define _CTRL_ACCESS_H_

@@ -89,7 +88,6 @@ 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.
@@ -136,7 +134,6 @@ 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
@@ -166,13 +163,11 @@ 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.
@@ -180,7 +175,6 @@ extern bool g_wr_protect;

 #endif

-
 /*! \name Control Interface
 */
 //! @{
@@ -279,7 +273,6 @@ extern const char *mem_name(U8 lun);

 //! @}

-
 #if ACCESS_USB == true

 /*! \name MEM <-> USB Interface
@@ -310,7 +303,6 @@ 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
@@ -341,7 +333,6 @@ 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
--- a/Marlin/src/HAL/DUE/usb/genclk.h
+++ b/Marlin/src/HAL/DUE/usb/genclk.h
@@ -108,31 +108,23 @@ struct genclk_config {
  uint32_t ctrl;
 };

-static inline void genclk_config_defaults(struct genclk_config *p_cfg,
-		uint32_t ul_id)
-{
+static inline void genclk_config_defaults(struct genclk_config *p_cfg, uint32_t ul_id) {
  ul_id = ul_id;
  p_cfg->ctrl = 0;
 }

-static inline void genclk_config_read(struct genclk_config *p_cfg,
-		uint32_t ul_id)
-{
+static inline void genclk_config_read(struct genclk_config *p_cfg, uint32_t ul_id) {
  p_cfg->ctrl = PMC->PMC_PCK[ul_id];
 }

-static inline void genclk_config_write(const struct genclk_config *p_cfg,
-		uint32_t ul_id)
-{
+static inline void genclk_config_write(const struct genclk_config *p_cfg, uint32_t ul_id) {
  PMC->PMC_PCK[ul_id] = p_cfg->ctrl;
 }

 //! \name Programmable Clock Source and Prescaler configuration
 //@{

-static inline void genclk_config_set_source(struct genclk_config *p_cfg,
-		enum genclk_source e_src)
-{
+static inline void genclk_config_set_source(struct genclk_config *p_cfg, enum genclk_source e_src) {
  p_cfg->ctrl &= (~PMC_PCK_CSS_Msk);

  switch (e_src) {
@@ -164,29 +156,23 @@ static inline void genclk_config_set_source(struct genclk_config *p_cfg,
  }
 }

-static inline void genclk_config_set_divider(struct genclk_config *p_cfg,
-		uint32_t e_divider)
-{
+static inline void genclk_config_set_divider(struct genclk_config *p_cfg, uint32_t e_divider) {
  p_cfg->ctrl &= ~PMC_PCK_PRES_Msk;
  p_cfg->ctrl |= e_divider;
 }

 //@}

-static inline void genclk_enable(const struct genclk_config *p_cfg,
-		uint32_t ul_id)
-{
+static inline void genclk_enable(const struct genclk_config *p_cfg, uint32_t ul_id) {
  PMC->PMC_PCK[ul_id] = p_cfg->ctrl;
  pmc_enable_pck(ul_id);
 }

-static inline void genclk_disable(uint32_t ul_id)
-{
+static inline void genclk_disable(uint32_t ul_id) {
  pmc_disable_pck(ul_id);
 }

-static inline void genclk_enable_source(enum genclk_source e_src)
-{
+static inline void genclk_enable_source(enum genclk_source e_src) {
  switch (e_src) {
  case GENCLK_PCK_SRC_SLCK_RC:
    if (!osc_is_ready(OSC_SLCK_32K_RC)) {
@@ -244,17 +230,17 @@ static inline void genclk_enable_source(enum genclk_source e_src)
    }
    break;

-#ifdef CONFIG_PLL0_SOURCE
+  #ifdef CONFIG_PLL0_SOURCE
    case GENCLK_PCK_SRC_PLLACK:
      pll_enable_config_defaults(0);
      break;
-#endif
+  #endif

-#ifdef CONFIG_PLL1_SOURCE
+  #ifdef CONFIG_PLL1_SOURCE
    case GENCLK_PCK_SRC_PLLBCK:
      pll_enable_config_defaults(1);
      break;
-#endif
+  #endif

  case GENCLK_PCK_SRC_MCK:
    break;
--- a/Marlin/src/HAL/DUE/usb/mrepeat.h
+++ b/Marlin/src/HAL/DUE/usb/mrepeat.h
@@ -57,7 +57,6 @@

 #include "preprocessor.h"

-
 //! Maximal number of repetitions supported by MREPEAT.
 #define MREPEAT_LIMIT   256

--- a/Marlin/src/HAL/DUE/usb/osc.h
+++ b/Marlin/src/HAL/DUE/usb/osc.h
@@ -62,28 +62,28 @@ extern "C" {
 * should be defined by the board code, otherwise default value are used.
 */
 #ifndef BOARD_FREQ_SLCK_XTAL
-#  warning The board slow clock xtal frequency has not been defined.
-#  define BOARD_FREQ_SLCK_XTAL      (32768UL)
+  #warning The board slow clock xtal frequency has not been defined.
+  #define BOARD_FREQ_SLCK_XTAL      (32768UL)
 #endif

 #ifndef BOARD_FREQ_SLCK_BYPASS
-#  warning The board slow clock bypass frequency has not been defined.
-#  define BOARD_FREQ_SLCK_BYPASS    (32768UL)
+  #warning The board slow clock bypass frequency has not been defined.
+  #define BOARD_FREQ_SLCK_BYPASS    (32768UL)
 #endif

 #ifndef BOARD_FREQ_MAINCK_XTAL
-#  warning The board main clock xtal frequency has not been defined.
-#  define BOARD_FREQ_MAINCK_XTAL    (12000000UL)
+  #warning The board main clock xtal frequency has not been defined.
+  #define BOARD_FREQ_MAINCK_XTAL    (12000000UL)
 #endif

 #ifndef BOARD_FREQ_MAINCK_BYPASS
-#  warning The board main clock bypass frequency has not been defined.
-#  define BOARD_FREQ_MAINCK_BYPASS  (12000000UL)
+  #warning The board main clock bypass frequency has not been defined.
+  #define BOARD_FREQ_MAINCK_BYPASS  (12000000UL)
 #endif

 #ifndef BOARD_OSC_STARTUP_US
-#  warning The board main clock xtal startup time has not been defined.
-#  define BOARD_OSC_STARTUP_US      (15625UL)
+  #warning The board main clock xtal startup time has not been defined.
+  #define BOARD_OSC_STARTUP_US      (15625UL)
 #endif

 /**
@@ -115,8 +115,7 @@ extern "C" {
 #define OSC_MAINCK_BYPASS_HZ        BOARD_FREQ_MAINCK_BYPASS        //!< External bypass oscillator.
 //@}

-static inline void osc_enable(uint32_t ul_id)
-{
+static inline void osc_enable(uint32_t ul_id) {
  switch (ul_id) {
  case OSC_SLCK_32K_RC:
    break;
@@ -129,7 +128,6 @@ 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;
@@ -142,7 +140,6 @@ 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,
@@ -157,8 +154,7 @@ static inline void osc_enable(uint32_t ul_id)
  }
 }

-static inline void osc_disable(uint32_t ul_id)
-{
+static inline void osc_disable(uint32_t ul_id) {
  switch (ul_id) {
  case OSC_SLCK_32K_RC:
  case OSC_SLCK_32K_XTAL:
@@ -181,8 +177,7 @@ static inline void osc_disable(uint32_t ul_id)
  }
 }

-static inline bool osc_is_ready(uint32_t ul_id)
-{
+static inline bool osc_is_ready(uint32_t ul_id) {
  switch (ul_id) {
  case OSC_SLCK_32K_RC:
    return 1;
@@ -202,8 +197,7 @@ static inline bool osc_is_ready(uint32_t ul_id)
  return 0;
 }

-static inline uint32_t osc_get_rate(uint32_t ul_id)
-{
+static inline uint32_t osc_get_rate(uint32_t ul_id) {
  switch (ul_id) {
  case OSC_SLCK_32K_RC:
    return OSC_SLCK_32K_RC_HZ;
@@ -241,8 +235,7 @@ static inline uint32_t osc_get_rate(uint32_t ul_id)
 *
 * \param id A number identifying the oscillator to wait for.
 */
-static inline void osc_wait_ready(uint8_t id)
-{
+static inline void osc_wait_ready(uint8_t id) {
  while (!osc_is_ready(id)) {
    /* Do nothing */
  }
--- a/Marlin/src/HAL/DUE/usb/pll.h
+++ b/Marlin/src/HAL/DUE/usb/pll.h
@@ -113,15 +113,15 @@ struct pll_config {
 * is hidden in this implementation. Use mul as mul effective value.
 */
 static inline void pll_config_init(struct pll_config *p_cfg,
-		enum pll_source e_src, uint32_t ul_div, uint32_t ul_mul)
-{
+    enum pll_source e_src, uint32_t ul_div, uint32_t ul_mul) {
  uint32_t vco_hz;

  Assert(e_src < PLL_NR_SOURCES);

  if (ul_div == 0 && ul_mul == 0) { /* Must only be true for UTMI PLL */
    p_cfg->ctrl = CKGR_UCKR_UPLLCOUNT(PLL_COUNT);
-	} else { /* PLLA */
+  }
+  else { /* PLLA */
    /* Calculate internal VCO frequency */
    vco_hz = osc_get_rate(e_src) / ul_div;
    Assert(vco_hz >= PLL_INPUT_MIN_HZ);
@@ -142,68 +142,55 @@ static inline void pll_config_init(struct pll_config *p_cfg,
      CONFIG_PLL##pll_id##_DIV,           \
      CONFIG_PLL##pll_id##_MUL)

-static inline void pll_config_read(struct pll_config *p_cfg, uint32_t ul_pll_id)
-{
+static inline void pll_config_read(struct pll_config *p_cfg, uint32_t ul_pll_id) {
  Assert(ul_pll_id < NR_PLLS);
-
-	if (ul_pll_id == PLLA_ID) {
-		p_cfg->ctrl = PMC->CKGR_PLLAR;
-	} else {
-		p_cfg->ctrl = PMC->CKGR_UCKR;
-	}
+  p_cfg->ctrl = ul_pll_id == PLLA_ID ? PMC->CKGR_PLLAR : PMC->CKGR_UCKR;
 }

-static inline void pll_config_write(const struct pll_config *p_cfg, uint32_t ul_pll_id)
-{
+static inline void pll_config_write(const struct pll_config *p_cfg, uint32_t ul_pll_id) {
  Assert(ul_pll_id < NR_PLLS);

  if (ul_pll_id == PLLA_ID) {
    pmc_disable_pllack(); // Always stop PLL first!
    PMC->CKGR_PLLAR = CKGR_PLLAR_ONE | p_cfg->ctrl;
-	} else {
+  }
+  else
    PMC->CKGR_UCKR = p_cfg->ctrl;
-	}
 }

-static inline void pll_enable(const struct pll_config *p_cfg, uint32_t ul_pll_id)
-{
+static inline void pll_enable(const struct pll_config *p_cfg, uint32_t ul_pll_id) {
  Assert(ul_pll_id < NR_PLLS);

  if (ul_pll_id == PLLA_ID) {
    pmc_disable_pllack(); // Always stop PLL first!
    PMC->CKGR_PLLAR = CKGR_PLLAR_ONE | p_cfg->ctrl;
-	} else {
-		PMC->CKGR_UCKR = p_cfg->ctrl | CKGR_UCKR_UPLLEN;
  }
+  else
+    PMC->CKGR_UCKR = p_cfg->ctrl | CKGR_UCKR_UPLLEN;
 }

 /**
 * \note This will only disable the selected PLL, not the underlying oscillator (mainck).
 */
-static inline void pll_disable(uint32_t ul_pll_id)
-{
+static inline void pll_disable(uint32_t ul_pll_id) {
  Assert(ul_pll_id < NR_PLLS);

-	if (ul_pll_id == PLLA_ID) {
+  if (ul_pll_id == PLLA_ID)
    pmc_disable_pllack();
-	} else {
+  else
    PMC->CKGR_UCKR &= ~CKGR_UCKR_UPLLEN;
-	}
 }

-static inline uint32_t pll_is_locked(uint32_t ul_pll_id)
-{
+static inline uint32_t pll_is_locked(uint32_t ul_pll_id) {
  Assert(ul_pll_id < NR_PLLS);

-	if (ul_pll_id == PLLA_ID) {
+  if (ul_pll_id == PLLA_ID)
    return pmc_is_locked_pllack();
-	} else {
+  else
    return pmc_is_locked_upll();
-	}
 }

-static inline void pll_enable_source(enum pll_source e_src)
-{
+static inline void pll_enable_source(enum pll_source e_src) {
  switch (e_src) {
  case PLL_SRC_MAINCK_4M_RC:
  case PLL_SRC_MAINCK_8M_RC:
@@ -220,15 +207,13 @@ static inline void pll_enable_source(enum pll_source e_src)
  }
 }

-static inline void pll_enable_config_defaults(unsigned int ul_pll_id)
-{
+static inline void pll_enable_config_defaults(unsigned int ul_pll_id) {
  struct pll_config pllcfg;

-	if (pll_is_locked(ul_pll_id)) {
-		return; // Pll already running
-	}
+  if (pll_is_locked(ul_pll_id)) return; // Pll already running
+
  switch (ul_pll_id) {
-#ifdef CONFIG_PLL0_SOURCE
+    #ifdef CONFIG_PLL0_SOURCE
      case 0:
        pll_enable_source(CONFIG_PLL0_SOURCE);
        pll_config_init(&pllcfg,
@@ -236,8 +221,8 @@ static inline void pll_enable_config_defaults(unsigned int ul_pll_id)
            CONFIG_PLL0_DIV,
            CONFIG_PLL0_MUL);
        break;
-#endif
-#ifdef CONFIG_PLL1_SOURCE
+    #endif
+    #ifdef CONFIG_PLL1_SOURCE
      case 1:
        pll_enable_source(CONFIG_PLL1_SOURCE);
        pll_config_init(&pllcfg,
@@ -245,7 +230,7 @@ static inline void pll_enable_config_defaults(unsigned int ul_pll_id)
            CONFIG_PLL1_DIV,
            CONFIG_PLL1_MUL);
        break;
-#endif
+    #endif
    default:
      Assert(false);
      break;
@@ -264,13 +249,10 @@ static inline void pll_enable_config_defaults(unsigned int ul_pll_id)
 * \retval STATUS_OK The PLL is now locked.
 * \retval ERR_TIMEOUT Timed out waiting for PLL to become locked.
 */
-static inline int pll_wait_for_lock(unsigned int pll_id)
-{
+static inline int pll_wait_for_lock(unsigned int pll_id) {
  Assert(pll_id < NR_PLLS);

-	while (!pll_is_locked(pll_id)) {
-		/* Do nothing */
-	}
+  while (!pll_is_locked(pll_id)) { /* Do nothing */ }

  return 0;
 }
--- a/Marlin/src/HAL/DUE/usb/preprocessor.h
+++ b/Marlin/src/HAL/DUE/usb/preprocessor.h
@@ -51,5 +51,4 @@
 #include "stringz.h"
 #include "mrepeat.h"

-
 #endif  // _PREPROCESSOR_H_
--- a/Marlin/src/HAL/DUE/usb/sbc_protocol.h
+++ b/Marlin/src/HAL/DUE/usb/sbc_protocol.h
@@ -57,7 +57,6 @@
 #ifndef _SBC_PROTOCOL_H_
 #define _SBC_PROTOCOL_H_

-
 /**
 * \ingroup usb_msc_protocol
 * \defgroup usb_sbc_protocol SCSI Block Commands protocol definitions
@@ -87,7 +86,6 @@ 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
@@ -139,16 +137,16 @@ struct sbc_caching_mode_page {
 struct sbc_rdwr_error_recovery_mode_page {
  uint8_t page_code;
  uint8_t page_length;
-#define  SPC_MP_RW_ERR_RECOV_PAGE_LENGTH    0x0A
+  #define  SPC_MP_RW_ERR_RECOV_PAGE_LENGTH    0x0A
  uint8_t flags1;
-#define  SBC_MP_RW_ERR_RECOV_AWRE   (1 << 7)
-#define  SBC_MP_RW_ERR_RECOV_ARRE   (1 << 6)
-#define  SBC_MP_RW_ERR_RECOV_TB     (1 << 5)
-#define  SBC_MP_RW_ERR_RECOV_RC     (1 << 4)
-#define  SBC_MP_RW_ERR_RECOV_ERR    (1 << 3)
-#define  SBC_MP_RW_ERR_RECOV_PER    (1 << 2)
-#define  SBC_MP_RW_ERR_RECOV_DTE    (1 << 1)
-#define  SBC_MP_RW_ERR_RECOV_DCR    (1 << 0)
+  #define  SBC_MP_RW_ERR_RECOV_AWRE   (1 << 7)
+  #define  SBC_MP_RW_ERR_RECOV_ARRE   (1 << 6)
+  #define  SBC_MP_RW_ERR_RECOV_TB     (1 << 5)
+  #define  SBC_MP_RW_ERR_RECOV_RC     (1 << 4)
+  #define  SBC_MP_RW_ERR_RECOV_ERR    (1 << 3)
+  #define  SBC_MP_RW_ERR_RECOV_PER    (1 << 2)
+  #define  SBC_MP_RW_ERR_RECOV_DTE    (1 << 1)
+  #define  SBC_MP_RW_ERR_RECOV_DCR    (1 << 0)
  uint8_t read_retry_count;
  uint8_t correction_span;
  uint8_t head_offset_count;
--- a/Marlin/src/HAL/DUE/usb/sd_mmc_spi_mem.cpp
+++ b/Marlin/src/HAL/DUE/usb/sd_mmc_spi_mem.cpp
@@ -6,7 +6,7 @@

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

-#if ENABLED(SDSUPPORT)
+#if HAS_MEDIA

 #include "../../../sd/cardreader.h"
 extern "C" {
@@ -18,30 +18,30 @@ extern "C" {
 void sd_mmc_spi_mem_init() {
 }

-Ctrl_status sd_mmc_spi_test_unit_ready() {
-  #ifdef DISABLE_DUE_SD_MMC
-    return CTRL_NO_PRESENT;
-  #endif
-  if (!IS_SD_INSERTED() || IS_SD_PRINTING() || IS_SD_FILE_OPEN() || !card.isMounted())
-    return CTRL_NO_PRESENT;
-  return CTRL_GOOD;
-}
-
-// NOTE: This function is defined as returning the address of the last block
-// in the card, which is cardSize() - 1
-Ctrl_status sd_mmc_spi_read_capacity(uint32_t *nb_sector) {
-  if (!IS_SD_INSERTED() || IS_SD_PRINTING() || IS_SD_FILE_OPEN() || !card.isMounted())
-    return CTRL_NO_PRESENT;
-  *nb_sector = card.diskIODriver()->cardSize() - 1;
-  return CTRL_GOOD;
+inline bool media_ready() {
+  return IS_SD_INSERTED() && !IS_SD_PRINTING() && !IS_SD_FILE_OPEN() && card.isMounted();
 }

 bool sd_mmc_spi_unload(bool) { return true; }

 bool sd_mmc_spi_wr_protect() { return false; }

-bool sd_mmc_spi_removal() {
-  return (!IS_SD_INSERTED() || IS_SD_PRINTING() || IS_SD_FILE_OPEN() || !card.isMounted());
+bool sd_mmc_spi_removal() { return !media_ready(); }
+
+Ctrl_status sd_mmc_spi_test_unit_ready() {
+  #ifdef DISABLE_DUE_SD_MMC
+    return CTRL_NO_PRESENT;
+  #endif
+  if (sd_mmc_spi_removal()) return CTRL_NO_PRESENT;
+  return CTRL_GOOD;
+}
+
+// NOTE: This function is defined as returning the address of the last block
+// in the card, which is cardSize() - 1
+Ctrl_status sd_mmc_spi_read_capacity(uint32_t *nb_sector) {
+  if (sd_mmc_spi_removal()) return CTRL_NO_PRESENT;
+  *nb_sector = card.diskIODriver()->cardSize() - 1;
+  return CTRL_GOOD;
 }

 #if ACCESS_USB == true
@@ -61,8 +61,7 @@ Ctrl_status sd_mmc_spi_usb_read_10(uint32_t addr, uint16_t nb_sector) {
  #ifdef DISABLE_DUE_SD_MMC
    return CTRL_NO_PRESENT;
  #endif
-  if (!IS_SD_INSERTED() || IS_SD_PRINTING() || IS_SD_FILE_OPEN() || !card.isMounted())
-    return CTRL_NO_PRESENT;
+  if (sd_mmc_spi_removal()) return CTRL_NO_PRESENT;

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

  #ifdef DEBUG_MMC
  {
@@ -138,5 +136,5 @@ Ctrl_status sd_mmc_spi_usb_write_10(uint32_t addr, uint16_t nb_sector) {

 #endif // ACCESS_USB == true

-#endif // SDSUPPORT
+#endif // HAS_MEDIA
 #endif // ARDUINO_ARCH_SAM
--- a/Marlin/src/HAL/DUE/usb/sd_mmc_spi_mem.h
+++ b/Marlin/src/HAL/DUE/usb/sd_mmc_spi_mem.h
@@ -45,7 +45,6 @@
 * 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_

@@ -63,22 +62,19 @@
  #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.
 //!/
-extern void           sd_mmc_spi_mem_init(void);
+void sd_mmc_spi_mem_init();

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

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

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

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

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

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

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

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

 #endif // #if ACCESS_USB == true

--- a/Marlin/src/HAL/DUE/usb/spc_protocol.h
+++ b/Marlin/src/HAL/DUE/usb/spc_protocol.h
@@ -85,51 +85,51 @@ COMPILER_PACK_SET(1)
 */
 struct scsi_inquiry_data {
  uint8_t pq_pdt; //!< Peripheral Qual / Peripheral Dev Type
-#define  SCSI_INQ_PQ_CONNECTED   0x00   //!< Peripheral connected
-#define  SCSI_INQ_PQ_NOT_CONN    0x20   //!< Peripheral not connected
-#define  SCSI_INQ_PQ_NOT_SUPP    0x60   //!< Peripheral not supported
-#define  SCSI_INQ_DT_DIR_ACCESS  0x00   //!< Direct Access (SBC)
-#define  SCSI_INQ_DT_SEQ_ACCESS  0x01   //!< Sequential Access
-#define  SCSI_INQ_DT_PRINTER     0x02   //!< Printer
-#define  SCSI_INQ_DT_PROCESSOR   0x03   //!< Processor device
-#define  SCSI_INQ_DT_WRITE_ONCE  0x04   //!< Write-once device
-#define  SCSI_INQ_DT_CD_DVD      0x05   //!< CD/DVD device
-#define  SCSI_INQ_DT_OPTICAL     0x07   //!< Optical Memory
-#define  SCSI_INQ_DT_MC          0x08   //!< Medium Changer
-#define  SCSI_INQ_DT_ARRAY       0x0C   //!< Storage Array Controller
-#define  SCSI_INQ_DT_ENCLOSURE   0x0D   //!< Enclosure Services
-#define  SCSI_INQ_DT_RBC         0x0E   //!< Simplified Direct Access
-#define  SCSI_INQ_DT_OCRW        0x0F   //!< Optical card reader/writer
-#define  SCSI_INQ_DT_BCC         0x10   //!< Bridge Controller Commands
-#define  SCSI_INQ_DT_OSD         0x11   //!< Object-based Storage
-#define  SCSI_INQ_DT_NONE        0x1F   //!< No Peripheral
+  #define SCSI_INQ_PQ_CONNECTED     0x00   //!< Peripheral connected
+  #define SCSI_INQ_PQ_NOT_CONN      0x20   //!< Peripheral not connected
+  #define SCSI_INQ_PQ_NOT_SUPP      0x60   //!< Peripheral not supported
+  #define SCSI_INQ_DT_DIR_ACCESS    0x00   //!< Direct Access (SBC)
+  #define SCSI_INQ_DT_SEQ_ACCESS    0x01   //!< Sequential Access
+  #define SCSI_INQ_DT_PRINTER       0x02   //!< Printer
+  #define SCSI_INQ_DT_PROCESSOR     0x03   //!< Processor device
+  #define SCSI_INQ_DT_WRITE_ONCE    0x04   //!< Write-once device
+  #define SCSI_INQ_DT_CD_DVD        0x05   //!< CD/DVD device
+  #define SCSI_INQ_DT_OPTICAL       0x07   //!< Optical Memory
+  #define SCSI_INQ_DT_MC            0x08   //!< Medium Changer
+  #define SCSI_INQ_DT_ARRAY         0x0C   //!< Storage Array Controller
+  #define SCSI_INQ_DT_ENCLOSURE     0x0D   //!< Enclosure Services
+  #define SCSI_INQ_DT_RBC           0x0E   //!< Simplified Direct Access
+  #define SCSI_INQ_DT_OCRW          0x0F   //!< Optical card reader/writer
+  #define SCSI_INQ_DT_BCC           0x10   //!< Bridge Controller Commands
+  #define SCSI_INQ_DT_OSD           0x11   //!< Object-based Storage
+  #define SCSI_INQ_DT_NONE          0x1F   //!< No Peripheral
  uint8_t flags1; //!< Flags (byte 1)
-#define  SCSI_INQ_RMB            0x80   //!< Removable Medium
+  #define SCSI_INQ_RMB              0x80   //!< Removable Medium
  uint8_t version; //!< Version
-#define  SCSI_INQ_VER_NONE       0x00   //!< No standards conformance
-#define  SCSI_INQ_VER_SPC        0x03   //!< SCSI Primary Commands     (link to SBC)
-#define  SCSI_INQ_VER_SPC2       0x04   //!< SCSI Primary Commands - 2 (link to SBC-2)
-#define  SCSI_INQ_VER_SPC3       0x05   //!< SCSI Primary Commands - 3 (link to SBC-2)
-#define  SCSI_INQ_VER_SPC4       0x06   //!< SCSI Primary Commands - 4 (link to SBC-3)
+  #define SCSI_INQ_VER_NONE         0x00   //!< No standards conformance
+  #define SCSI_INQ_VER_SPC          0x03   //!< SCSI Primary Commands     (link to SBC)
+  #define SCSI_INQ_VER_SPC2         0x04   //!< SCSI Primary Commands - 2 (link to SBC-2)
+  #define SCSI_INQ_VER_SPC3         0x05   //!< SCSI Primary Commands - 3 (link to SBC-2)
+  #define SCSI_INQ_VER_SPC4         0x06   //!< SCSI Primary Commands - 4 (link to SBC-3)
  uint8_t flags3; //!< Flags (byte 3)
-#define  SCSI_INQ_NORMACA        0x20   //!< Normal ACA Supported
-#define  SCSI_INQ_HISUP          0x10   //!< Hierarchal LUN addressing
-#define  SCSI_INQ_RSP_SPC2       0x02   //!< SPC-2 / SPC-3 response format
+  #define SCSI_INQ_NORMACA          0x20   //!< Normal ACA Supported
+  #define SCSI_INQ_HISUP            0x10   //!< Hierarchal LUN addressing
+  #define SCSI_INQ_RSP_SPC2         0x02   //!< SPC-2 / SPC-3 response format
  uint8_t addl_len; //!< Additional Length (n-4)
-#define  SCSI_INQ_ADDL_LEN(tot)  ((tot)-5) //!< Total length is \a tot
+  #define SCSI_INQ_ADDL_LEN(tot)  ((tot)-5) //!< Total length is \a tot
  uint8_t flags5; //!< Flags (byte 5)
-#define  SCSI_INQ_SCCS           0x80
+  #define SCSI_INQ_SCCS             0x80
  uint8_t flags6; //!< Flags (byte 6)
-#define  SCSI_INQ_BQUE           0x80
-#define  SCSI_INQ_ENCSERV        0x40
-#define  SCSI_INQ_MULTIP         0x10
-#define  SCSI_INQ_MCHGR          0x08
-#define  SCSI_INQ_ADDR16         0x01
+  #define SCSI_INQ_BQUE             0x80
+  #define SCSI_INQ_ENCSERV          0x40
+  #define SCSI_INQ_MULTIP           0x10
+  #define SCSI_INQ_MCHGR            0x08
+  #define SCSI_INQ_ADDR16           0x01
  uint8_t flags7; //!< Flags (byte 7)
-#define  SCSI_INQ_WBUS16         0x20
-#define  SCSI_INQ_SYNC           0x10
-#define  SCSI_INQ_LINKED         0x08
-#define  SCSI_INQ_CMDQUE         0x02
+  #define SCSI_INQ_WBUS16           0x20
+  #define SCSI_INQ_SYNC             0x10
+  #define SCSI_INQ_LINKED           0x08
+  #define SCSI_INQ_CMDQUE           0x02
  uint8_t vendor_id[8];   //!< T10 Vendor Identification
  uint8_t product_id[16]; //!< Product Identification
  uint8_t product_rev[4]; //!< Product Revision Level
@@ -141,28 +141,28 @@ struct scsi_inquiry_data {
 struct scsi_request_sense_data {
  /* 1st byte: REQUEST SENSE response flags*/
  uint8_t valid_reponse_code;
-#define  SCSI_SENSE_VALID              0x80 //!< Indicates the INFORMATION field contains valid information
-#define  SCSI_SENSE_RESPONSE_CODE_MASK 0x7F
-#define  SCSI_SENSE_CURRENT            0x70 //!< Response code 70h (current errors)
-#define  SCSI_SENSE_DEFERRED           0x71
+  #define SCSI_SENSE_VALID              0x80 //!< Indicates the INFORMATION field contains valid information
+  #define SCSI_SENSE_RESPONSE_CODE_MASK 0x7F
+  #define SCSI_SENSE_CURRENT            0x70 //!< Response code 70h (current errors)
+  #define SCSI_SENSE_DEFERRED           0x71

  /* 2nd byte */
  uint8_t obsolete;

  /* 3rd byte */
  uint8_t sense_flag_key;
-#define  SCSI_SENSE_FILEMARK        0x80 //!< Indicates that the current command has read a filemark or setmark.
-#define  SCSI_SENSE_EOM             0x40 //!< Indicates that an end-of-medium condition exists.
-#define  SCSI_SENSE_ILI             0x20 //!< Indicates that the requested logical block length did not match the logical block length of the data on the medium.
-#define  SCSI_SENSE_RESERVED        0x10 //!< Reserved
-#define  SCSI_SENSE_KEY(x)          (x&0x0F) //!< Sense Key
+  #define SCSI_SENSE_FILEMARK        0x80 //!< Indicates that the current command has read a filemark or setmark.
+  #define SCSI_SENSE_EOM             0x40 //!< Indicates that an end-of-medium condition exists.
+  #define SCSI_SENSE_ILI             0x20 //!< Indicates that the requested logical block length did not match the logical block length of the data on the medium.
+  #define SCSI_SENSE_RESERVED        0x10 //!< Reserved
+  #define SCSI_SENSE_KEY(x)          (x&0x0F) //!< Sense Key

  /* 4th to 7th bytes - INFORMATION field */
  uint8_t information[4];

  /* 8th byte  - ADDITIONAL SENSE LENGTH field */
  uint8_t AddSenseLen;
-#define  SCSI_SENSE_ADDL_LEN(total_len)   ((total_len) - 8)
+  #define SCSI_SENSE_ADDL_LEN(total_len)   ((total_len) - 8)

  /* 9th to 12th byte  - COMMAND-SPECIFIC INFORMATION field */
  uint8_t CmdSpecINFO[4];
@@ -178,7 +178,7 @@ struct scsi_request_sense_data {

  /* 16th byte */
  uint8_t SenseKeySpec[3];
-#define  SCSI_SENSE_SKSV            0x80 //!< Indicates the SENSE-KEY SPECIFIC field contains valid information
+  #define SCSI_SENSE_SKSV            0x80 //!< Indicates the SENSE-KEY SPECIFIC field contains valid information
 };

 COMPILER_PACK_RESET()
@@ -200,7 +200,6 @@ enum scsi_vpd_page_code {

 #define  SCSI_VPD_ID_TYPE_T10       1

-
 /* Sense keys */
 enum scsi_sense_key {
  SCSI_SK_NO_SENSE = 0x0,
@@ -252,27 +251,26 @@ enum scsi_spc_mode {
 struct spc_control_page_info_execpt {
  uint8_t page_code;
  uint8_t page_length;
-#define  SPC_MP_INFEXP_PAGE_LENGTH     0x0A
+  #define SPC_MP_INFEXP_PAGE_LENGTH             0x0A
  uint8_t flags1;
-#define  SPC_MP_INFEXP_PERF            (1<<7)   //!< Initiator Control
-#define  SPC_MP_INFEXP_EBF             (1<<5)   //!< Caching Analysis Permitted
-#define  SPC_MP_INFEXP_EWASC           (1<<4)   //!< Discontinuity
-#define  SPC_MP_INFEXP_DEXCPT          (1<<3)   //!< Size enable
-#define  SPC_MP_INFEXP_TEST            (1<<2)   //!< Writeback Cache Enable
-#define  SPC_MP_INFEXP_LOGERR          (1<<0)   //!< Log errors bit
+  #define SPC_MP_INFEXP_PERF                    (1<<7)   //!< Initiator Control
+  #define SPC_MP_INFEXP_EBF                     (1<<5)   //!< Caching Analysis Permitted
+  #define SPC_MP_INFEXP_EWASC                   (1<<4)   //!< Discontinuity
+  #define SPC_MP_INFEXP_DEXCPT                  (1<<3)   //!< Size enable
+  #define SPC_MP_INFEXP_TEST                    (1<<2)   //!< Writeback Cache Enable
+  #define SPC_MP_INFEXP_LOGERR                  (1<<0)   //!< Log errors bit
  uint8_t mrie;
-#define  SPC_MP_INFEXP_MRIE_NO_REPORT           0x00
-#define  SPC_MP_INFEXP_MRIE_ASYNC_EVENT         0x01
-#define  SPC_MP_INFEXP_MRIE_GEN_UNIT            0x02
-#define  SPC_MP_INFEXP_MRIE_COND_RECOV_ERROR    0x03
-#define  SPC_MP_INFEXP_MRIE_UNCOND_RECOV_ERROR  0x04
-#define  SPC_MP_INFEXP_MRIE_NO_SENSE            0x05
-#define  SPC_MP_INFEXP_MRIE_ONLY_REPORT         0x06
+  #define SPC_MP_INFEXP_MRIE_NO_REPORT          0x00
+  #define SPC_MP_INFEXP_MRIE_ASYNC_EVENT        0x01
+  #define SPC_MP_INFEXP_MRIE_GEN_UNIT           0x02
+  #define SPC_MP_INFEXP_MRIE_COND_RECOV_ERROR   0x03
+  #define SPC_MP_INFEXP_MRIE_UNCOND_RECOV_ERROR 0x04
+  #define SPC_MP_INFEXP_MRIE_NO_SENSE           0x05
+  #define SPC_MP_INFEXP_MRIE_ONLY_REPORT        0x06
  be32_t interval_timer;
  be32_t report_count;
 };

-
 enum scsi_spc_mode_sense_pc {
  SCSI_MS_SENSE_PC_CURRENT = 0,
  SCSI_MS_SENSE_PC_CHANGEABLE = 1,
@@ -280,20 +278,15 @@ enum scsi_spc_mode_sense_pc {
  SCSI_MS_SENSE_PC_SAVED = 3,
 };

-
-
-static inline bool scsi_mode_sense_dbd_is_set(const uint8_t * cdb)
-{
+static inline bool scsi_mode_sense_dbd_is_set(const uint8_t * cdb) {
  return (cdb[1] >> 3) & 1;
 }

-static inline uint8_t scsi_mode_sense_get_page_code(const uint8_t * cdb)
-{
+static inline uint8_t scsi_mode_sense_get_page_code(const uint8_t * cdb) {
  return cdb[2] & 0x3F;
 }

-static inline uint8_t scsi_mode_sense_get_pc(const uint8_t * cdb)
-{
+static inline uint8_t scsi_mode_sense_get_pc(const uint8_t * cdb) {
  return cdb[2] >> 6;
 }

--- a/Marlin/src/HAL/DUE/usb/sysclk.h
+++ b/Marlin/src/HAL/DUE/usb/sysclk.h
@@ -136,7 +136,7 @@ extern "C" {
 * initialization.
 */
 #ifndef CONFIG_SYSCLK_SOURCE
-# define CONFIG_SYSCLK_SOURCE   SYSCLK_SRC_MAINCK_4M_RC
+  #define CONFIG_SYSCLK_SOURCE   SYSCLK_SRC_MAINCK_4M_RC
 #endif
 /**
 * \def CONFIG_SYSCLK_PRES
@@ -149,7 +149,7 @@ extern "C" {
 * after initialization.
 */
 #ifndef CONFIG_SYSCLK_PRES
-# define CONFIG_SYSCLK_PRES  0
+  #define CONFIG_SYSCLK_PRES  0
 #endif

 //@}
@@ -197,7 +197,7 @@ extern "C" {
 * USB is not required.
 */
 #ifdef __DOXYGEN__
-# define CONFIG_USBCLK_SOURCE
+  #define CONFIG_USBCLK_SOURCE
 #endif

 /**
@@ -209,10 +209,9 @@ extern "C" {
 * defined.
 */
 #ifdef __DOXYGEN__
-# define CONFIG_USBCLK_DIV
+  #define CONFIG_USBCLK_DIV
 #endif

-
 extern void sysclk_enable_usb(void);
 extern void sysclk_disable_usb(void);

--- a/Marlin/src/HAL/DUE/usb/udc.c
+++ b/Marlin/src/HAL/DUE/usb/udc.c
@@ -83,7 +83,6 @@ static usb_iface_desc_t UDC_DESC_STORAGE *udc_ptr_iface;

 //! @}

-
 //! \name Internal structure to store the USB device main strings
 //! @{

--- a/Marlin/src/HAL/DUE/usb/udc.h
+++ b/Marlin/src/HAL/DUE/usb/udc.h
@@ -172,8 +172,7 @@ extern "C" {
  }
 \endcode
 */
-static inline bool udc_include_vbus_monitoring(void)
-{
+static inline bool udc_include_vbus_monitoring(void) {
  return udd_include_vbus_monitoring();
 }

@@ -192,32 +191,26 @@ void udc_stop(void);
 * then it will attach device when an acceptable Vbus
 * level from the host is detected.
 */
-static inline void udc_attach(void)
-{
+static inline void udc_attach(void) {
  udd_attach();
 }

-
 /**
 * \brief Detaches the device from the bus
 *
 * The driver must remove pull-up on USB line D- or D+.
 */
-static inline void udc_detach(void)
-{
+static inline void udc_detach(void) {
  udd_detach();
 }

-
 /*! \brief The USB driver sends a resume signal called \e "Upstream Resume"
 * This is authorized only when the remote wakeup feature is enabled by host.
 */
-static inline void udc_remotewakeup(void)
-{
+static inline void udc_remotewakeup(void) {
  udd_send_remotewakeup();
 }

-
 /**
 * \brief Returns a pointer on the current interface descriptor
 *
@@ -692,6 +685,4 @@ usb_iface_desc_t UDC_DESC_STORAGE *udc_get_interface_desc(void);
   } \endcode
 */

-
-
 #endif // _UDC_H_
--- a/Marlin/src/HAL/DUE/usb/udc_desc.h
+++ b/Marlin/src/HAL/DUE/usb/udc_desc.h
@@ -80,19 +80,17 @@ extern "C" {
 #define  UDC_DESC_STORAGE
  // Descriptor storage in internal RAM
 #if (defined UDC_DATA_USE_HRAM_SUPPORT)
-#	if defined(__GNUC__)
-#		define UDC_DATA(x)              COMPILER_WORD_ALIGNED __attribute__((__section__(".data_hram0")))
-#		define UDC_BSS(x)               COMPILER_ALIGNED(x)   __attribute__((__section__(".bss_hram0")))
-#	elif defined(__ICCAVR32__)
-#		define UDC_DATA(x)              COMPILER_ALIGNED(x)   __data32
-#		define UDC_BSS(x)               COMPILER_ALIGNED(x)   __data32
-#	endif
-#else
-#	define UDC_DATA(x)              COMPILER_ALIGNED(x)
-#	define UDC_BSS(x)               COMPILER_ALIGNED(x)
+  #if defined(__GNUC__)
+  #define UDC_DATA(x)   COMPILER_WORD_ALIGNED __attribute__((__section__(".data_hram0")))
+  #define UDC_BSS(x)    COMPILER_ALIGNED(x)   __attribute__((__section__(".bss_hram0")))
+#elif defined(__ICCAVR32__)
+  #define UDC_DATA(x)   COMPILER_ALIGNED(x)   __data32
+  #define UDC_BSS(x)    COMPILER_ALIGNED(x)   __data32
+#endif
+#else
+  #define UDC_DATA(x)   COMPILER_ALIGNED(x)
+  #define UDC_BSS(x)    COMPILER_ALIGNED(x)
 #endif
-
-

 /**
 * \brief Configuration descriptor and UDI link for one USB speed
@@ -104,7 +102,6 @@ typedef struct {
  udi_api_t UDC_DESC_STORAGE *UDC_DESC_STORAGE * udi_apis;
 } udc_config_speed_t;

-
 /**
 * \brief All information about the USB Device
 */
@@ -113,14 +110,14 @@ typedef struct {
  usb_dev_desc_t UDC_DESC_STORAGE *confdev_lsfs;
  //! USB configuration descriptor and UDI API pointers for low or full speed
  udc_config_speed_t UDC_DESC_STORAGE *conf_lsfs;
-#ifdef USB_DEVICE_HS_SUPPORT
+  #ifdef USB_DEVICE_HS_SUPPORT
    //! USB device descriptor for high speed
    usb_dev_desc_t UDC_DESC_STORAGE *confdev_hs;
    //! USB device qualifier, only use in high speed mode
    usb_dev_qual_desc_t UDC_DESC_STORAGE *qualifier;
    //! USB configuration descriptor and UDI API pointers for high speed
    udc_config_speed_t UDC_DESC_STORAGE *conf_hs;
-#endif
+  #endif
  usb_dev_bos_desc_t UDC_DESC_STORAGE *conf_bos;
 } udc_config_t;

--- a/Marlin/src/HAL/DUE/usb/udd.h
+++ b/Marlin/src/HAL/DUE/usb/udd.h
@@ -103,20 +103,16 @@ typedef struct {
 extern udd_ctrl_request_t udd_g_ctrlreq;

 //! Return true if the setup request \a udd_g_ctrlreq indicates IN data transfer
-#define  Udd_setup_is_in()       \
-      (USB_REQ_DIR_IN == (udd_g_ctrlreq.req.bmRequestType & USB_REQ_DIR_MASK))
+#define  Udd_setup_is_in()     (USB_REQ_DIR_IN == (udd_g_ctrlreq.req.bmRequestType & USB_REQ_DIR_MASK))

 //! Return true if the setup request \a udd_g_ctrlreq indicates OUT data transfer
-#define  Udd_setup_is_out()      \
-      (USB_REQ_DIR_OUT == (udd_g_ctrlreq.req.bmRequestType & USB_REQ_DIR_MASK))
+#define  Udd_setup_is_out()    (USB_REQ_DIR_OUT == (udd_g_ctrlreq.req.bmRequestType & USB_REQ_DIR_MASK))

 //! Return the type of the SETUP request \a udd_g_ctrlreq. \see usb_reqtype.
-#define  Udd_setup_type()        \
-      (udd_g_ctrlreq.req.bmRequestType & USB_REQ_TYPE_MASK)
+#define  Udd_setup_type()      (udd_g_ctrlreq.req.bmRequestType & USB_REQ_TYPE_MASK)

 //! Return the recipient of the SETUP request \a udd_g_ctrlreq. \see usb_recipient
-#define  Udd_setup_recipient()   \
-      (udd_g_ctrlreq.req.bmRequestType & USB_REQ_RECIP_MASK)
+#define  Udd_setup_recipient() (udd_g_ctrlreq.req.bmRequestType & USB_REQ_RECIP_MASK)

 /**
 * \brief End of halt callback function type.
@@ -134,8 +130,7 @@ typedef void (*udd_callback_halt_cleared_t)(void);
 * \param status     UDD_EP_TRANSFER_ABORT, if transfer is aborted
 * \param n          number of data transferred
 */
-typedef void (*udd_callback_trans_t) (udd_ep_status_t status,
-		iram_size_t nb_transferred, udd_ep_id_t ep);
+typedef void (*udd_callback_trans_t) (udd_ep_status_t status, iram_size_t nb_transferred, udd_ep_id_t ep);

 /**
 * \brief Authorizes the VBUS event
@@ -218,7 +213,6 @@ void udd_send_remotewakeup(void);
 */
 void udd_set_setup_payload( uint8_t *payload, uint16_t payload_size );

-
 /**
 * \name Endpoint Management
 *
@@ -239,8 +233,7 @@ void udd_set_setup_payload( uint8_t *payload, uint16_t payload_size );
 *
 * \return \c 1 if the endpoint is enabled, otherwise \c 0.
 */
-bool udd_ep_alloc(udd_ep_id_t ep, uint8_t bmAttributes,
-		uint16_t MaxEndpointSize);
+bool udd_ep_alloc(udd_ep_id_t ep, uint8_t bmAttributes, uint16_t MaxEndpointSize);

 /**
 * \brief Disables an endpoint
@@ -294,8 +287,7 @@ bool udd_ep_clear_halt(udd_ep_id_t ep);
 *
 * \return \c 1 if the register is accepted, otherwise \c 0.
 */
-bool udd_ep_wait_stall_clear(udd_ep_id_t ep,
-		udd_callback_halt_cleared_t callback);
+bool udd_ep_wait_stall_clear(udd_ep_id_t ep, udd_callback_halt_cleared_t callback);

 /**
 * \brief Allows to receive or send data on an endpoint
@@ -321,9 +313,8 @@ bool udd_ep_wait_stall_clear(udd_ep_id_t ep,
 *
 * \return \c 1 if function was successfully done, otherwise \c 0.
 */
-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);
+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);
+
 /**
 * \brief Aborts transfer on going on endpoint
 *
@@ -339,7 +330,6 @@ void udd_ep_abort(udd_ep_id_t ep);

 //@}

-
 /**
 * \name High speed test mode management
 *
@@ -352,7 +342,6 @@ void udd_test_mode_se0_nak(void);
 void udd_test_mode_packet(void);
 //@}

-
 /**
 * \name UDC callbacks to provide for UDD
 *
--- a/Marlin/src/HAL/DUE/usb/udi_cdc.c
+++ b/Marlin/src/HAL/DUE/usb/udi_cdc.c
@@ -457,7 +457,6 @@ void udi_cdc_data_sof_notify(void)
 #endif
 }

-
 // ------------------------
 //------- Internal routines to control serial line

@@ -520,7 +519,6 @@ 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
@@ -542,7 +540,6 @@ 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;
@@ -578,11 +575,9 @@ 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;
@@ -632,7 +627,6 @@ 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;
@@ -668,7 +662,6 @@ 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;
@@ -700,7 +693,6 @@ 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;
@@ -780,11 +772,9 @@ 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)
--- a/Marlin/src/HAL/DUE/usb/udi_cdc.h
+++ b/Marlin/src/HAL/DUE/usb/udi_cdc.h
@@ -106,7 +106,6 @@ typedef struct {
  usb_ep_desc_t ep_notify;
 } udi_cdc_comm_desc_t;

-
 /**
 * \brief Data Class interface descriptor
 *
@@ -121,7 +120,6 @@ 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)
@@ -136,13 +134,13 @@ typedef struct {
 //@{
 //! By default no string associated to these interfaces
 #ifndef UDI_CDC_IAD_STRING_ID_0
-#define UDI_CDC_IAD_STRING_ID_0   0
+  #define UDI_CDC_IAD_STRING_ID_0   0
 #endif
 #ifndef UDI_CDC_COMM_STRING_ID_0
-#define UDI_CDC_COMM_STRING_ID_0   0
+  #define UDI_CDC_COMM_STRING_ID_0   0
 #endif
 #ifndef UDI_CDC_DATA_STRING_ID_0
-#define UDI_CDC_DATA_STRING_ID_0   0
+  #define UDI_CDC_DATA_STRING_ID_0   0
 #endif
 #define UDI_CDC_IAD_DESC_0      UDI_CDC_IAD_DESC(0)
 #define UDI_CDC_COMM_DESC_0     UDI_CDC_COMM_DESC(0)
@@ -151,13 +149,13 @@ typedef struct {

 //! By default no string associated to these interfaces
 #ifndef UDI_CDC_IAD_STRING_ID_1
-#define UDI_CDC_IAD_STRING_ID_1  0
+  #define UDI_CDC_IAD_STRING_ID_1  0
 #endif
 #ifndef UDI_CDC_COMM_STRING_ID_1
-#define UDI_CDC_COMM_STRING_ID_1 0
+  #define UDI_CDC_COMM_STRING_ID_1 0
 #endif
 #ifndef UDI_CDC_DATA_STRING_ID_1
-#define UDI_CDC_DATA_STRING_ID_1 0
+  #define UDI_CDC_DATA_STRING_ID_1 0
 #endif
 #define UDI_CDC_IAD_DESC_1      UDI_CDC_IAD_DESC(1)
 #define UDI_CDC_COMM_DESC_1     UDI_CDC_COMM_DESC(1)
@@ -166,13 +164,13 @@ typedef struct {

 //! By default no string associated to these interfaces
 #ifndef UDI_CDC_IAD_STRING_ID_2
-#define UDI_CDC_IAD_STRING_ID_2   0
+  #define UDI_CDC_IAD_STRING_ID_2   0
 #endif
 #ifndef UDI_CDC_COMM_STRING_ID_2
-#define UDI_CDC_COMM_STRING_ID_2   0
+  #define UDI_CDC_COMM_STRING_ID_2  0
 #endif
 #ifndef UDI_CDC_DATA_STRING_ID_2
-#define UDI_CDC_DATA_STRING_ID_2   0
+  #define UDI_CDC_DATA_STRING_ID_2  0
 #endif
 #define UDI_CDC_IAD_DESC_2      UDI_CDC_IAD_DESC(2)
 #define UDI_CDC_COMM_DESC_2     UDI_CDC_COMM_DESC(2)
@@ -181,13 +179,13 @@ typedef struct {

 //! By default no string associated to these interfaces
 #ifndef UDI_CDC_IAD_STRING_ID_3
-#define UDI_CDC_IAD_STRING_ID_3   0
+  #define UDI_CDC_IAD_STRING_ID_3   0
 #endif
 #ifndef UDI_CDC_COMM_STRING_ID_3
-#define UDI_CDC_COMM_STRING_ID_3   0
+  #define UDI_CDC_COMM_STRING_ID_3  0
 #endif
 #ifndef UDI_CDC_DATA_STRING_ID_3
-#define UDI_CDC_DATA_STRING_ID_3   0
+  #define UDI_CDC_DATA_STRING_ID_3  0
 #endif
 #define UDI_CDC_IAD_DESC_3      UDI_CDC_IAD_DESC(3)
 #define UDI_CDC_COMM_DESC_3     UDI_CDC_COMM_DESC(3)
@@ -196,13 +194,13 @@ typedef struct {

 //! By default no string associated to these interfaces
 #ifndef UDI_CDC_IAD_STRING_ID_4
-#define UDI_CDC_IAD_STRING_ID_4   0
+  #define UDI_CDC_IAD_STRING_ID_4   0
 #endif
 #ifndef UDI_CDC_COMM_STRING_ID_4
-#define UDI_CDC_COMM_STRING_ID_4   0
+  #define UDI_CDC_COMM_STRING_ID_4  0
 #endif
 #ifndef UDI_CDC_DATA_STRING_ID_4
-#define UDI_CDC_DATA_STRING_ID_4   0
+  #define UDI_CDC_DATA_STRING_ID_4  0
 #endif
 #define UDI_CDC_IAD_DESC_4      UDI_CDC_IAD_DESC(4)
 #define UDI_CDC_COMM_DESC_4     UDI_CDC_COMM_DESC(4)
@@ -211,13 +209,13 @@ typedef struct {

 //! By default no string associated to these interfaces
 #ifndef UDI_CDC_IAD_STRING_ID_5
-#define UDI_CDC_IAD_STRING_ID_5   0
+  #define UDI_CDC_IAD_STRING_ID_5   0
 #endif
 #ifndef UDI_CDC_COMM_STRING_ID_5
-#define UDI_CDC_COMM_STRING_ID_5   0
+  #define UDI_CDC_COMM_STRING_ID_5  0
 #endif
 #ifndef UDI_CDC_DATA_STRING_ID_5
-#define UDI_CDC_DATA_STRING_ID_5   0
+  #define UDI_CDC_DATA_STRING_ID_5  0
 #endif
 #define UDI_CDC_IAD_DESC_5      UDI_CDC_IAD_DESC(5)
 #define UDI_CDC_COMM_DESC_5     UDI_CDC_COMM_DESC(5)
@@ -226,13 +224,13 @@ typedef struct {

 //! By default no string associated to these interfaces
 #ifndef UDI_CDC_IAD_STRING_ID_6
-#define UDI_CDC_IAD_STRING_ID_6   0
+  #define UDI_CDC_IAD_STRING_ID_6   0
 #endif
 #ifndef UDI_CDC_COMM_STRING_ID_6
-#define UDI_CDC_COMM_STRING_ID_6   0
+  #define UDI_CDC_COMM_STRING_ID_6  0
 #endif
 #ifndef UDI_CDC_DATA_STRING_ID_6
-#define UDI_CDC_DATA_STRING_ID_6   0
+  #define UDI_CDC_DATA_STRING_ID_6  0
 #endif
 #define UDI_CDC_IAD_DESC_6      UDI_CDC_IAD_DESC(6)
 #define UDI_CDC_COMM_DESC_6     UDI_CDC_COMM_DESC(6)
@@ -240,7 +238,6 @@ typedef struct {
 #define UDI_CDC_DATA_DESC_6_HS  UDI_CDC_DATA_DESC_HS(6)
 //@}

-
 //! Content of CDC IAD interface descriptor for all speeds
 #define UDI_CDC_IAD_DESC(port) { \
   .bLength                      = sizeof(usb_iad_desc_t),\
@@ -627,18 +624,15 @@ iram_size_t udi_cdc_multi_write_buf(uint8_t port, const void* buf, iram_size_t s
 * Add to application C-file:
 * \code
  static bool my_flag_autorize_cdc_transfert = false;
-	 bool my_callback_cdc_enable(void)
-	 {
+  bool my_callback_cdc_enable(void) {
    my_flag_autorize_cdc_transfert = true;
    return true;
  }
-	 void my_callback_cdc_disable(void)
-	 {
+  void my_callback_cdc_disable(void) {
    my_flag_autorize_cdc_transfert = false;
  }

-	 void task(void)
-	 {
+  void task(void) {
    if (my_flag_autorize_cdc_transfert) {
      udi_cdc_putc('A');
      udi_cdc_getc();
--- a/Marlin/src/HAL/DUE/usb/udi_cdc_desc.c
+++ b/Marlin/src/HAL/DUE/usb/udi_cdc_desc.c
@@ -51,7 +51,7 @@
 #include "udc_desc.h"
 #include "udi_cdc.h"

-#if DISABLED(SDSUPPORT)
+#if !HAS_MEDIA

 /**
 * \defgroup udi_cdc_group_single_desc USB device descriptors for a single interface
@@ -109,7 +109,6 @@ 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
@@ -256,6 +255,6 @@ UDC_DESC_STORAGE udc_config_t udc_config = {
 //@}
 //@}

-#endif // SDSUPPORT
+#endif // HAS_MEDIA

 #endif // ARDUINO_ARCH_SAM
--- a/Marlin/src/HAL/DUE/usb/udi_composite_desc.c
+++ b/Marlin/src/HAL/DUE/usb/udi_composite_desc.c
@@ -50,7 +50,7 @@
 #include "udd.h"
 #include "udc_desc.h"

-#if ENABLED(SDSUPPORT)
+#if HAS_MEDIA

 /**
 * \defgroup udi_group_desc Descriptors for a USB Device
@@ -93,7 +93,6 @@ 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
@@ -147,7 +146,6 @@ UDC_DESC_STORAGE udc_desc_t udc_desc_hs = {
 };
 #endif

-
 /**
 * \name UDC structures which contains all USB Device definitions
 */
@@ -189,4 +187,4 @@ UDC_DESC_STORAGE udc_config_t udc_config = {

 #endif // ARDUINO_ARCH_SAM

-#endif // SDSUPPORT
+#endif // HAS_MEDIA
--- a/Marlin/src/HAL/DUE/usb/udi_msc.c
+++ b/Marlin/src/HAL/DUE/usb/udi_msc.c
@@ -57,7 +57,7 @@
 #include "ctrl_access.h"
 #include <string.h>

-#if ENABLED(SDSUPPORT)
+#if HAS_MEDIA

 #ifndef UDI_MSC_NOTIFY_TRANS_EXT
 #  define UDI_MSC_NOTIFY_TRANS_EXT()
@@ -86,7 +86,6 @@ UDC_DESC_STORAGE udi_api_t udi_api_msc = {
 };
 //@}

-
 /**
 * \ingroup udi_msc_group
 * \defgroup udi_msc_group_internal Implementation of UDI MSC
@@ -137,7 +136,6 @@ volatile bool udi_msc_b_reset_trans = true;

 //@}

-
 /**
 * \name Internal routines
 */
@@ -190,7 +188,6 @@ 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
 */
@@ -217,7 +214,6 @@ 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
 */
@@ -250,7 +246,6 @@ 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
 */
@@ -307,7 +302,6 @@ static void udi_msc_sense_fail_cdb_invalid(void);
 static void udi_msc_sense_command_invalid(void);
 //@}

-
 /**
 * \name Routines manage SCSI Commands
 */
@@ -372,9 +366,7 @@ static void udi_msc_sbc_trans(bool b_read);

 //@}

-
-bool udi_msc_enable(void)
-{
+bool udi_msc_enable(void) {
  uint8_t lun;
  udi_msc_b_trans_req = false;
  udi_msc_b_cbw_invalid = false;
@@ -397,18 +389,14 @@ bool udi_msc_enable(void)
  return true;
 }

-
-void udi_msc_disable(void)
-{
+void udi_msc_disable(void) {
  udi_msc_b_trans_req = false;
  udi_msc_b_ack_trans = true;
  udi_msc_b_reset_trans = true;
  UDI_MSC_DISABLE_EXT();
 }

-
-bool udi_msc_setup(void)
-{
+bool udi_msc_setup(void) {
  if (Udd_setup_is_in()) {
    // Requests Interface GET
    if (Udd_setup_type() == USB_REQ_TYPE_CLASS) {
@@ -451,17 +439,14 @@ bool udi_msc_setup(void)
  return false; // Not supported request
 }

-uint8_t udi_msc_getsetting(void)
-{
+uint8_t udi_msc_getsetting(void) {
  return 0; // MSC don't have multiple alternate setting
 }

-
 // ------------------------
 //------- Routines to process CBW packet

-static void udi_msc_cbw_invalid(void)
-{
+static void udi_msc_cbw_invalid(void) {
  if (!udi_msc_b_cbw_invalid)
    return; // Don't re-stall endpoint if error reset by setup
  udd_ep_set_halt(UDI_MSC_EP_OUT);
@@ -469,8 +454,7 @@ static void udi_msc_cbw_invalid(void)
  udd_ep_wait_stall_clear(UDI_MSC_EP_OUT, udi_msc_cbw_invalid);
 }

-static void udi_msc_csw_invalid(void)
-{
+static void udi_msc_csw_invalid(void) {
  if (!udi_msc_b_cbw_invalid)
    return; // Don't re-stall endpoint if error reset by setup
  udd_ep_set_halt(UDI_MSC_EP_IN);
@@ -478,8 +462,7 @@ static void udi_msc_csw_invalid(void)
  udd_ep_wait_stall_clear(UDI_MSC_EP_IN, udi_msc_csw_invalid);
 }

-static void udi_msc_cbw_wait(void)
-{
+static void udi_msc_cbw_wait(void) {
  // Register buffer and callback on OUT endpoint
  if (!udd_ep_run(UDI_MSC_EP_OUT, true,
          (uint8_t *) & udi_msc_cbw,
@@ -490,10 +473,8 @@ static void udi_msc_cbw_wait(void)
  }
 }

-
 static void udi_msc_cbw_received(udd_ep_status_t status,
-    iram_size_t nb_received, udd_ep_id_t ep)
-{
+    iram_size_t nb_received, udd_ep_id_t ep) {
  UNUSED(ep);
  // Check status of transfer
  if (UDD_EP_TRANSFER_OK != status) {
@@ -582,9 +563,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)
-{
+static bool udi_msc_cbw_validate(uint32_t alloc_len, uint8_t dir_flag) {
  /*
   * The following cases should result in a phase error:
   *  - Case  2: Hn < Di
@@ -612,12 +591,10 @@ static bool udi_msc_cbw_validate(uint32_t alloc_len, uint8_t dir_flag)
  return true;
 }

-
 // ------------------------
 //------- Routines to process small data packet

-static void udi_msc_data_send(uint8_t * buffer, uint8_t buf_size)
-{
+static void udi_msc_data_send(uint8_t * buffer, uint8_t buf_size) {
  // Sends data on IN endpoint
  if (!udd_ep_run(UDI_MSC_EP_IN, true,
          buffer, buf_size, udi_msc_data_sent)) {
@@ -627,10 +604,8 @@ static void udi_msc_data_send(uint8_t * buffer, uint8_t buf_size)
  }
 }

-
 static void udi_msc_data_sent(udd_ep_status_t status, iram_size_t nb_sent,
-    udd_ep_id_t ep)
-{
+    udd_ep_id_t ep) {
  UNUSED(ep);
  if (UDD_EP_TRANSFER_OK != status) {
    // Error protocol
@@ -644,12 +619,10 @@ static void udi_msc_data_sent(udd_ep_status_t status, iram_size_t nb_sent,
  udi_msc_csw_process();
 }

-
 // ------------------------
 //------- Routines to process CSW packet

-static void udi_msc_csw_process(void)
-{
+static void udi_msc_csw_process(void) {
  if (0 != udi_msc_csw.dCSWDataResidue) {
    // Residue not NULL
    // then STALL next request from USB host on corresponding endpoint
@@ -664,9 +637,7 @@ static void udi_msc_csw_process(void)
  udi_msc_csw_send();
 }

-
-void udi_msc_csw_send(void)
-{
+void udi_msc_csw_send(void) {
  // Sends CSW on IN endpoint
  if (!udd_ep_run(UDI_MSC_EP_IN, false,
          (uint8_t *) & udi_msc_csw,
@@ -678,10 +649,8 @@ void udi_msc_csw_send(void)
  }
 }

-
 static void udi_msc_csw_sent(udd_ep_status_t status, iram_size_t nb_sent,
-    udd_ep_id_t ep)
-{
+    udd_ep_id_t ep) {
  UNUSED(ep);
  UNUSED(status);
  UNUSED(nb_sent);
@@ -690,20 +659,17 @@ static void udi_msc_csw_sent(udd_ep_status_t status, iram_size_t nb_sent,
  udi_msc_cbw_wait();
 }

-
 // ------------------------
 //------- Routines manage sense data

-static void udi_msc_clear_sense(void)
-{
+static void udi_msc_clear_sense(void) {
  memset((uint8_t*)&udi_msc_sense, 0, sizeof(struct scsi_request_sense_data));
  udi_msc_sense.valid_reponse_code = SCSI_SENSE_VALID | SCSI_SENSE_CURRENT;
  udi_msc_sense.AddSenseLen = SCSI_SENSE_ADDL_LEN(sizeof(udi_msc_sense));
 }

 static void udi_msc_sense_fail(uint8_t sense_key, uint16_t add_sense,
-    uint32_t lba)
-{
+    uint32_t lba) {
  udi_msc_clear_sense();
  udi_msc_csw.bCSWStatus = USB_CSW_STATUS_FAIL;
  udi_msc_sense.sense_flag_key = sense_key;
@@ -715,53 +681,39 @@ static void udi_msc_sense_fail(uint8_t sense_key, uint16_t add_sense,
  udi_msc_sense.AddSnsCodeQlfr = add_sense;
 }

-static void udi_msc_sense_pass(void)
-{
+static void udi_msc_sense_pass(void) {
  udi_msc_clear_sense();
  udi_msc_csw.bCSWStatus = USB_CSW_STATUS_PASS;
 }

-
-static void udi_msc_sense_fail_not_present(void)
-{
+static void udi_msc_sense_fail_not_present(void) {
  udi_msc_sense_fail(SCSI_SK_NOT_READY, SCSI_ASC_MEDIUM_NOT_PRESENT, 0);
 }

-static void udi_msc_sense_fail_busy_or_change(void)
-{
-  udi_msc_sense_fail(SCSI_SK_UNIT_ATTENTION,
-      SCSI_ASC_NOT_READY_TO_READY_CHANGE, 0);
+static void udi_msc_sense_fail_busy_or_change(void) {
+  udi_msc_sense_fail(SCSI_SK_UNIT_ATTENTION, SCSI_ASC_NOT_READY_TO_READY_CHANGE, 0);
 }

-static void udi_msc_sense_fail_hardware(void)
-{
-  udi_msc_sense_fail(SCSI_SK_HARDWARE_ERROR,
-      SCSI_ASC_NO_ADDITIONAL_SENSE_INFO, 0);
+static void udi_msc_sense_fail_hardware(void) {
+  udi_msc_sense_fail(SCSI_SK_HARDWARE_ERROR, SCSI_ASC_NO_ADDITIONAL_SENSE_INFO, 0);
 }

-static void udi_msc_sense_fail_protected(void)
-{
+static void udi_msc_sense_fail_protected(void) {
  udi_msc_sense_fail(SCSI_SK_DATA_PROTECT, SCSI_ASC_WRITE_PROTECTED, 0);
 }

-static void udi_msc_sense_fail_cdb_invalid(void)
-{
-  udi_msc_sense_fail(SCSI_SK_ILLEGAL_REQUEST,
-      SCSI_ASC_INVALID_FIELD_IN_CDB, 0);
+static void udi_msc_sense_fail_cdb_invalid(void) {
+  udi_msc_sense_fail(SCSI_SK_ILLEGAL_REQUEST, SCSI_ASC_INVALID_FIELD_IN_CDB, 0);
 }

-static void udi_msc_sense_command_invalid(void)
-{
-  udi_msc_sense_fail(SCSI_SK_ILLEGAL_REQUEST,
-      SCSI_ASC_INVALID_COMMAND_OPERATION_CODE, 0);
+static void udi_msc_sense_command_invalid(void) {
+  udi_msc_sense_fail(SCSI_SK_ILLEGAL_REQUEST, SCSI_ASC_INVALID_COMMAND_OPERATION_CODE, 0);
 }

-
 // ------------------------
 //------- Routines manage SCSI Commands

-static void udi_msc_spc_requestsense(void)
-{
+static void udi_msc_spc_requestsense(void) {
  uint8_t length = udi_msc_cbw.CDB[4];

  // Can't send more than sense data length
@@ -774,9 +726,7 @@ static void udi_msc_spc_requestsense(void)
  udi_msc_data_send((uint8_t*)&udi_msc_sense, length);
 }

-
-static void udi_msc_spc_inquiry(void)
-{
+static void udi_msc_spc_inquiry(void) {
  uint8_t length, i;
  UDC_DATA(4)
  // Constant inquiry data for all LUNs
@@ -835,9 +785,7 @@ static void udi_msc_spc_inquiry(void)
  udi_msc_data_send((uint8_t *) & udi_msc_inquiry_data, length);
 }

-
-static bool udi_msc_spc_testunitready_global(void)
-{
+static bool udi_msc_spc_testunitready_global(void) {
  switch (mem_test_unit_ready(udi_msc_cbw.bCBWLUN)) {
  case CTRL_GOOD:
    return true;  // Don't change sense data
@@ -855,9 +803,7 @@ static bool udi_msc_spc_testunitready_global(void)
  return false;
 }

-
-static void udi_msc_spc_testunitready(void)
-{
+static void udi_msc_spc_testunitready(void) {
  if (udi_msc_spc_testunitready_global()) {
    // LUN ready, then update sense data with status pass
    udi_msc_sense_pass();
@@ -866,9 +812,7 @@ static void udi_msc_spc_testunitready(void)
  udi_msc_csw_process();
 }

-
-static void udi_msc_spc_mode_sense(bool b_sense10)
-{
+static void udi_msc_spc_mode_sense(bool b_sense10) {
  // Union of all mode sense structures
  union sense_6_10 {
    struct {
@@ -943,9 +887,7 @@ static void udi_msc_spc_mode_sense(bool b_sense10)
  udi_msc_data_send((uint8_t *) & sense, request_lgt);
 }

-
-static void udi_msc_spc_prevent_allow_medium_removal(void)
-{
+static void udi_msc_spc_prevent_allow_medium_removal(void) {
  uint8_t prevent = udi_msc_cbw.CDB[4];
  if (0 == prevent) {
    udi_msc_sense_pass();
@@ -955,9 +897,7 @@ static void udi_msc_spc_prevent_allow_medium_removal(void)
  udi_msc_csw_process();
 }

-
-static void udi_msc_sbc_start_stop(void)
-{
+static void udi_msc_sbc_start_stop(void) {
  bool start = 0x1 & udi_msc_cbw.CDB[4];
  bool loej = 0x2 & udi_msc_cbw.CDB[4];
  if (loej) {
@@ -967,9 +907,7 @@ static void udi_msc_sbc_start_stop(void)
  udi_msc_csw_process();
 }

-
-static void udi_msc_sbc_read_capacity(void)
-{
+static void udi_msc_sbc_read_capacity(void) {
  UDC_BSS(4) static struct sbc_read_capacity10_data udi_msc_capacity;

  if (!udi_msc_cbw_validate(sizeof(udi_msc_capacity),
@@ -1003,9 +941,7 @@ static void udi_msc_sbc_read_capacity(void)
      sizeof(udi_msc_capacity));
 }

-
-static void udi_msc_sbc_trans(bool b_read)
-{
+static void udi_msc_sbc_trans(bool b_read) {
  uint32_t trans_size;

  if (!b_read) {
@@ -1038,9 +974,7 @@ static void udi_msc_sbc_trans(bool b_read)
  UDI_MSC_NOTIFY_TRANS_EXT();
 }

-
-bool udi_msc_process_trans(void)
-{
+bool udi_msc_process_trans(void) {
  Ctrl_status status;

  if (!udi_msc_b_trans_req)
@@ -1084,10 +1018,8 @@ bool udi_msc_process_trans(void)
  return true;
 }

-
 static void udi_msc_trans_ack(udd_ep_status_t status, iram_size_t n,
-    udd_ep_id_t ep)
-{
+    udd_ep_id_t ep) {
  UNUSED(ep);
  UNUSED(n);
  // Update variable to signal the end of transfer
@@ -1095,10 +1027,8 @@ static void udi_msc_trans_ack(udd_ep_status_t status, iram_size_t n,
  udi_msc_b_ack_trans = true;
 }

-
 bool udi_msc_trans_block(bool b_read, uint8_t * block, iram_size_t block_size,
-    void (*callback) (udd_ep_status_t status, iram_size_t n, udd_ep_id_t ep))
-{
+    void (*callback) (udd_ep_status_t status, iram_size_t n, udd_ep_id_t ep)) {
  if (!udi_msc_b_ack_trans)
    return false; // No possible, transfer on going

@@ -1127,6 +1057,6 @@ bool udi_msc_trans_block(bool b_read, uint8_t * block, iram_size_t block_size,

 //@}

-#endif // SDSUPPORT
+#endif // HAS_MEDIA

 #endif // ARDUINO_ARCH_SAM
--- a/Marlin/src/HAL/DUE/usb/udi_msc.h
+++ b/Marlin/src/HAL/DUE/usb/udi_msc.h
@@ -129,7 +129,6 @@ typedef struct {
   }
 //@}

-
 /**
 * \ingroup udi_group
 * \defgroup udi_msc_group USB Device Interface (UDI) for Mass Storage Class (MSC)
@@ -170,7 +169,6 @@ bool udi_msc_trans_block(bool b_read, uint8_t * block, iram_size_t block_size,
 }
 #endif

-
 /**
 * \page udi_msc_quickstart Quick start guide for USB device Mass Storage module (UDI MSC)
 *
@@ -215,18 +213,15 @@ bool udi_msc_trans_block(bool b_read, uint8_t * block, iram_size_t block_size,
 * Add to application C-file:
 * \code
  static bool my_flag_autorize_msc_transfert = false;
-	 bool my_callback_msc_enable(void)
-	 {
+  bool my_callback_msc_enable(void) {
    my_flag_autorize_msc_transfert = true;
    return true;
  }
-	 void my_callback_msc_disable(void)
-	 {
+  void my_callback_msc_disable(void) {
    my_flag_autorize_msc_transfert = false;
  }

-	 void task(void)
-	 {
+  void task(void) {
    udi_msc_process_trans();
  }
 \endcode
--- a/Marlin/src/HAL/DUE/usb/uotghs_device_due.c
+++ b/Marlin/src/HAL/DUE/usb/uotghs_device_due.c
@@ -116,6 +116,23 @@
 //#define dbg_print printf
 #define dbg_print(...)

+// Marlin modification: Redefine the otg_freeze_clock and otg_unfreeze_clock macros
+// to add memory barriers to ensure that any accesses to USB registers aren't re-ordered
+// to occur while the clock is frozen.
+#undef otg_freeze_clock
+#undef otg_unfreeze_clock
+
+#define otg_freeze_clock() do { \
+	__DSB(); \
+	Set_bits(UOTGHS->UOTGHS_CTRL, UOTGHS_CTRL_FRZCLK); \
+} while (0)
+
+#define otg_unfreeze_clock() \
+do { \
+	Clr_bits(UOTGHS->UOTGHS_CTRL, UOTGHS_CTRL_FRZCLK); \
+	__DSB(); \
+} while (0)
+
 /**
 * \ingroup udd_group
 * \defgroup udd_udphs_group USB On-The-Go High-Speed Port for device mode (UOTGHS)
@@ -276,7 +293,6 @@
 # endif
 #endif

-
 /**
 * \name Power management routine.
 */
@@ -293,7 +309,6 @@ 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
@@ -321,7 +336,6 @@ static void udd_sleep_mode(bool b_idle)

 //@}

-
 /**
 * \name Control endpoint low level management routine.
 *
@@ -393,7 +407,6 @@ 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
 *
@@ -405,7 +418,6 @@ static bool udd_ctrl_interrupt(void);

 //@}

-
 /**
 * \name Management of bulk/interrupt/isochronous endpoints
 *
@@ -443,7 +455,6 @@ 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];

@@ -505,7 +516,6 @@ static bool udd_ep_interrupt(void);
 #endif // (0!=USB_DEVICE_MAX_EP)
 //@}

-
 // ------------------------
 //--- INTERNAL ROUTINES TO MANAGED GLOBAL EVENTS

@@ -611,6 +621,18 @@ ISR(UDD_USB_INT_FUN)
 		// The wakeup interrupt is automatic acked when a suspend occur
 		udd_disable_wake_up_interrupt();
 		udd_enable_suspend_interrupt();
+
+		// Marlin modification: The RESET, SOF, and MSOF interrupts were previously
+		// enabled in udd_attach, which caused a race condition where they could
+		// be raised and unclearable with the clock is frozen. They are now
+		// enabled here, after the clock has been unfrozen in response to the wake
+		// interrupt.
+		udd_enable_reset_interrupt();
+		udd_enable_sof_interrupt();
+#ifdef USB_DEVICE_HS_SUPPORT
+		udd_enable_msof_interrupt();
+#endif
+
 		udd_sleep_mode(true); // Enter in IDLE mode
 #ifdef UDC_RESUME_EVENT
 		UDC_RESUME_EVENT();
@@ -642,13 +664,11 @@ udd_interrupt_sof_end:
 	return;
 }

-
 bool udd_include_vbus_monitoring(void)
 {
 	return true;
 }

-
 void udd_enable(void)
 {
 	irqflags_t flags;
@@ -735,7 +755,6 @@ void udd_enable(void)
 	cpu_irq_restore(flags);
 }

-
 void udd_disable(void)
 {
 	irqflags_t flags;
@@ -776,6 +795,27 @@ void udd_disable(void)
 	cpu_irq_restore(flags);
 }

+// Marlin modification: The original implementation did not use a memory
+// barrier between disabling and clearing interrupts. This sometimes
+// allowed interrupts to remain raised and unclearable after the clock
+// was frozen. This helper was added to ensure that memory barriers
+// are used consistently from all places where interrupts are disabled.
+static void disable_and_ack_sync_interrupts()
+{
+	// Disable USB line events
+	udd_disable_reset_interrupt();
+	udd_disable_sof_interrupt();
+#ifdef USB_DEVICE_HS_SUPPORT
+	udd_disable_msof_interrupt();
+#endif
+	__DSB();
+	udd_ack_reset();
+	udd_ack_sof();
+#ifdef USB_DEVICE_HS_SUPPORT
+	udd_ack_msof();
+#endif
+	__DSB();
+}

 void udd_attach(void)
 {
@@ -796,17 +836,16 @@ void udd_attach(void)
 	udd_attach_device();

 	// Enable USB line events
-	udd_enable_reset_interrupt();
 	udd_enable_suspend_interrupt();
 	udd_enable_wake_up_interrupt();
-	udd_enable_sof_interrupt();
-#ifdef USB_DEVICE_HS_SUPPORT
-	udd_enable_msof_interrupt();
-#endif
-	// Reset following interrupts flag
-	udd_ack_reset();
-	udd_ack_sof();
-	udd_ack_msof();
+
+	// Marlin modification: The RESET, SOF, and MSOF interrupts were previously
+	// enabled here, which caused a race condition where they could be raised
+	// and unclearable with the clock is frozen. They are now enabled in the
+	// wake interrupt handler, after the clock has been unfrozen. They are now
+	// explicitly disabled here to ensure that they cannot be raised before
+	// the clock is frozen.
+	disable_and_ack_sync_interrupts();

 	// The first suspend interrupt must be forced
 	// The first suspend interrupt is not detected else raise it
@@ -817,18 +856,22 @@ void udd_attach(void)
 	cpu_irq_restore(flags);
 }

-
 void udd_detach(void)
 {
 	otg_unfreeze_clock();

 	// Detach device from the bus
 	udd_detach_device();
+
+	// Marlin modification: Added the explicit disabling of the RESET, SOF, and
+	// MSOF interrupts here, to ensure that they cannot be raised after the
+	// clock is frozen.
+	disable_and_ack_sync_interrupts();
+
 	otg_freeze_clock();
 	udd_sleep_mode(false);
 }

-
 bool udd_is_high_speed(void)
 {
 #ifdef USB_DEVICE_HS_SUPPORT
@@ -838,7 +881,6 @@ bool udd_is_high_speed(void)
 #endif
 }

-
 void udd_set_address(uint8_t address)
 {
 	udd_disable_address();
@@ -846,13 +888,11 @@ 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();
@@ -875,14 +915,12 @@ 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)
@@ -1006,7 +1044,6 @@ 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;
@@ -1019,14 +1056,12 @@ 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;
@@ -1067,7 +1102,6 @@ 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;
@@ -1108,7 +1142,6 @@ 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)
@@ -1175,7 +1208,6 @@ 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;
@@ -1204,7 +1236,6 @@ 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)
 {
@@ -1239,7 +1270,6 @@ 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)
@@ -1248,20 +1278,17 @@ 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;
@@ -1305,8 +1332,6 @@ void udd_test_mode_packet(void)
 }
 #endif // USB_DEVICE_HS_SUPPORT

-
-
 // ------------------------
 //--- INTERNAL ROUTINES TO MANAGED THE CONTROL ENDPOINT

@@ -1356,7 +1381,6 @@ static void udd_ctrl_init(void)
 	udd_ep_control_state = UDD_EPCTRL_SETUP;
 }

-
 static void udd_ctrl_setup_received(void)
 {
 	irqflags_t flags;
@@ -1418,7 +1442,6 @@ static void udd_ctrl_setup_received(void)
 	}
 }

-
 static void udd_ctrl_in_sent(void)
 {
 	static bool b_shortpacket = false;
@@ -1502,7 +1525,6 @@ static void udd_ctrl_in_sent(void)
 	cpu_irq_restore(flags);
 }

-
 static void udd_ctrl_out_received(void)
 {
 	irqflags_t flags;
@@ -1593,7 +1615,6 @@ static void udd_ctrl_out_received(void)
 	cpu_irq_restore(flags);
 }

-
 static void udd_ctrl_underflow(void)
 {
 	if (Is_udd_out_received(0))
@@ -1610,7 +1631,6 @@ static void udd_ctrl_underflow(void)
 	}
 }

-
 static void udd_ctrl_overflow(void)
 {
 	if (Is_udd_in_send(0))
@@ -1626,7 +1646,6 @@ static void udd_ctrl_overflow(void)
 	}
 }

-
 static void udd_ctrl_stall_data(void)
 {
 	// Stall all packets on IN & OUT control endpoint
@@ -1634,7 +1653,6 @@ static void udd_ctrl_stall_data(void)
 	udd_enable_stall_handshake(0);
 }

-
 static void udd_ctrl_send_zlp_in(void)
 {
 	irqflags_t flags;
@@ -1652,7 +1670,6 @@ static void udd_ctrl_send_zlp_in(void)
 	cpu_irq_restore(flags);
 }

-
 static void udd_ctrl_send_zlp_out(void)
 {
 	irqflags_t flags;
@@ -1668,7 +1685,6 @@ 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
@@ -1677,7 +1693,6 @@ static void udd_ctrl_endofrequest(void)
 	}
 }

-
 static bool udd_ctrl_interrupt(void)
 {

@@ -1728,7 +1743,6 @@ static bool udd_ctrl_interrupt(void)
 	return false;
 }

-
 // ------------------------
 //--- INTERNAL ROUTINES TO MANAGED THE BULK/INTERRUPT/ISOCHRONOUS ENDPOINTS

@@ -1743,7 +1757,6 @@ static void udd_ep_job_table_reset(void)
 	}
 }

-
 static void udd_ep_job_table_kill(void)
 {
 	uint8_t i;
@@ -1754,7 +1767,6 @@ static void udd_ep_job_table_kill(void)
 	}
 }

-
 static void udd_ep_abort_job(udd_ep_id_t ep)
 {
 	ep &= USB_EP_ADDR_MASK;
@@ -1763,7 +1775,6 @@ 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) {
@@ -1834,7 +1845,6 @@ 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();
@@ -2043,6 +2053,12 @@ static bool udd_ep_interrupt(void)
 				dbg_print("I ");
 				udd_disable_in_send_interrupt(ep);
 				// One bank is free then send a ZLP
+
+				// Marlin modification: Add a barrier to ensure in_send is disabled
+				// before it is cleared. This was not an observed problem, but
+				// other interrupts were seen to misbehave without this barrier.
+				__DSB();
+
 				udd_ack_in_send(ep);
 				udd_ack_fifocon(ep);
 				udd_ep_finish_job(ptr_job, false, ep);
--- a/Marlin/src/HAL/DUE/usb/uotghs_device_due.h
+++ b/Marlin/src/HAL/DUE/usb/uotghs_device_due.h
@@ -129,7 +129,6 @@ 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.
 //! @{
@@ -141,7 +140,6 @@ 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.
 //! @{
@@ -246,7 +244,6 @@ 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.
 //! @{
@@ -330,7 +327,6 @@ 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.
 //! @{
@@ -530,7 +526,6 @@ 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
@@ -652,7 +647,6 @@ typedef struct {
 //! @}
 //! @}

-
 /// @cond 0
 /**INDENT-OFF**/
 #ifdef __cplusplus
--- a/Marlin/src/HAL/DUE/usb/uotghs_otg.h
+++ b/Marlin/src/HAL/DUE/usb/uotghs_otg.h
@@ -53,7 +53,6 @@
 extern "C" {
 #endif

-
 //! \ingroup usb_group
 //! \defgroup otg_group UOTGHS OTG Driver
 //! UOTGHS low-level driver for OTG features
@@ -74,7 +73,6 @@ 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.
@@ -130,8 +128,8 @@ void otg_dual_disable(void);
 #define otg_reset()                      \
  do {                                   \
    UOTGHS->UOTGHS_CTRL = 0;             \
-		while( UOTGHS->UOTGHS_SR & 0x3FFF) {\
-			UOTGHS->UOTGHS_SCR = 0xFFFFFFFF;\
+    while( UOTGHS->UOTGHS_SR & 0x3FFF) { \
+      UOTGHS->UOTGHS_SCR = 0xFFFFFFFF;   \
    }                                    \
  } while (0)
  //! Enable USB macro
@@ -166,7 +164,6 @@ void otg_dual_disable(void);
    Clr_bits(UOTGHS->UOTGHS_CTRL, UOTGHS_CTRL_UNLOCK),\
    Rd_bitfield(UOTGHS->UOTGHS_CTRL, UOTGHS_CTRL_TIMVALUE_Msk))

-
  //! Get the dual-role device state of the internal USB finite state machine of the UOTGHS controller
 #define otg_get_fsm_drd_state()             (Rd_bitfield(UOTGHS->UOTGHS_FSM, UOTGHS_FSM_DRDSTATE_Msk))
 #define Is_otg_a_suspend()                  (4==otg_get_fsm_drd_state())
--- a/Marlin/src/HAL/DUE/usb/usb_protocol.h
+++ b/Marlin/src/HAL/DUE/usb/usb_protocol.h
@@ -374,7 +374,6 @@ typedef struct {
  uint8_t bNumDeviceCaps;
 } usb_dev_bos_desc_t;

-
 /**
 * \brief USB Device Capabilities - USB 2.0 Extension Descriptor structure
 *
@@ -411,7 +410,6 @@ typedef struct {
  uint8_t iFunction;        //!< Index of string descriptor
 } usb_association_desc_t;

-
 /**
 * \brief Standard USB configuration descriptor structure
 */
@@ -426,7 +424,6 @@ 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
@@ -475,7 +472,6 @@ typedef struct {
  uint8_t bInterval;
 } usb_ep_desc_t;

-
 /**
 * \brief A standard USB string descriptor structure
 */
--- a/Marlin/src/HAL/DUE/usb/usb_protocol_cdc.h
+++ b/Marlin/src/HAL/DUE/usb/usb_protocol_cdc.h
@@ -168,7 +168,6 @@ COMPILER_PACK_SET(1)
 //! \name USB CDC Descriptors
 //@{

-
 //! CDC Header Functional Descriptor
 typedef struct {
  uint8_t bFunctionLength;
@@ -203,7 +202,6 @@ typedef struct {
  uint8_t bSlaveInterface0;
 } usb_cdc_union_desc_t;

-
 //! \name USB CDC Call Management Capabilities
 //@{
 //! Device handles call management itself
@@ -278,7 +276,6 @@ typedef struct {
 //@}
 //@}

-
 //! \name USB CDC notification message
 //@{

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Oliver Köster	6734173854	Merge pull request #557 from stklcode/marlin-2.1.2.5 Merge upstream changes from Marlin 2.1.2.5	2024-11-25 11:29:55 +01:00
Stefan Kalscheuer	c8ff13654b	Merge upstream changes from Marlin 2.1.2.5	2024-11-23 13:46:10 +01:00
Oliver Köster	c41a85354a	Merge pull request #538 from stklcode/marlin-2.1.2.4 Merge upstream changes from Marlin 2.1.2.4	2024-06-24 11:03:01 +02:00
Stefan Kalscheuer	d74a36128d	Merge upstream changes from Marlin 2.1.2.4 * Fix broken STEPTEST (already included) * Update SAMD51 build deps * Remove dead video links * Fix comma typo * Optimize LPC176x pin toggle * Misc. SPI cleanup * Overridable SUICIDE_PIN for RAMPS_CREALITY * Assume RAMPS_CREALITY is not CR2020 * "Boards Manager" * Prefer friendly Power Off over Auto-unalive * Adjust pulse_phase_isr code guards * Mount media early for POWER_LOSS_RECOVERY * Version 2.1.2.4	2024-06-23 18:03:17 +02:00
Knutwurst	1ef65dc26b	Update Builddate	2024-06-05 18:39:17 +02:00
Oliver Köster	c5ce3a3314	Merge pull request #537 from stklcode/fix/523 fix STEPTEST macro to restore homing with dual Z endstops	2024-06-05 18:32:51 +02:00
Stefan Kalscheuer	5eac0f6449	fix STEPTEST macro to restore homing with dual Z endstops This macro builds a string starting with "HAS_" but "HAS_" was replaced with "USE_" in Marlin 2.1.2.2. Backport the upstream patch should restore correct endstop polling and fix the bad homing behavior. Fixes: #523	2024-06-05 18:18:14 +02:00
Knutwurst	60b68f5228	Fix DGUS build by setting WAIT_MS_UNTIL_ACYCLIC_SEND globally	2024-06-03 22:41:56 +02:00
Oliver Köster	ca67eef340	Merge pull request #536 from uwetaz/fix_sporadic_display_issues Fix sporadic display issues on Anycubic 1.0 display	2024-06-03 22:26:12 +02:00
core.editor	a34fa2fae8	fix against too fast sending acycling display command Anycubic 1.0 display ignores acyclic telegrams as J23 or J18 if they are sent too fast after last cyclic telegram. This results for the user in sporadic not occuring mask "Lack of filament..." or no continue button at filament sensor or M600 G-Code command. The last issue is catatrophic for the print job because interrupted at this point. This commit fix the problem by integrating a minimum time delay which was seen at original anycubic i3 mega S fw.	2024-06-03 20:57:32 +02:00
core.editor	09e49ea1b3	cleanup alignments in huge switch case	2024-06-03 20:13:53 +02:00
core.editor	4efb65741f	cleanup some braces	2024-06-03 20:09:59 +02:00
Oliver Köster	90e77c2e78	Merge pull request #532 from stklcode/fix/regression-2122 Merge upstream changes from Marlin 2.1.2.3	2024-05-29 21:23:20 +02:00
Stefan Kalscheuer	35b6573a54	Merge upstream changes from Marlin 2.1.2.3	2024-05-29 18:50:54 +02:00
Oliver Köster	5c1cebc7d4	Merge pull request #531 from stklcode/fix/regression-2122 revert some unintentional config changes from 2.1.2.2 merge	2024-04-29 17:20:39 +02:00
Stefan Kalscheuer	cb39247a70	revert some unintentional config changes from 2.1.2.2 merge Walked through the diff and noticed some config flags that have been disabled unintentionally. Restore them. Fixes: `752476dc8f`	2024-04-29 17:07:56 +02:00
Oliver Köster	80e121b9c1	Merge pull request #529 from hostops/fix/ignored-z-endstop fix: ignored z endstop when single z endstop is used	2024-04-16 21:37:09 +02:00
Jakob Hostnik	18a5ab5c31	fix: ignored z endstop when single z endstop is used	2024-04-16 21:05:16 +02:00
Knutwurst	19d8c18f04	Increase version for upcoming release	2024-03-22 08:48:01 +01:00
Oliver Köster	bdb804fbb0	Merge pull request #513 from stklcode/marlin-2.1.2.2 Merge upstream changes from Marlin 2.1.2.2	2024-03-22 08:45:53 +01:00
Oliver Köster	3134ced532	Merge branch 'master' into marlin-2.1.2.2	2024-03-22 08:45:37 +01:00
Knutwurst	defcde923f	Bump Builddate.	2024-03-22 08:23:01 +01:00
Stefan Kalscheuer	752476dc8f	Merge upstream changes from Marlin 2.1.2.2	2024-02-13 20:40:24 +01:00
Knutwurst	e466309bfb	Increase python version to 3.10 which hopefully does not break the build process	2024-01-12 10:54:49 +01:00
Knutwurst	c697bb5d31	Revert to something that works	2024-01-12 10:44:37 +01:00
Knutwurst	bef8b81f06	Revert to Pythin 3,7 v1	2024-01-12 10:41:15 +01:00
Knutwurst	9cc14f19af	Try something else	2024-01-12 10:35:49 +01:00
Knutwurst	7454073163	Upse Python 3.10	2024-01-12 10:29:23 +01:00
Knutwurst	4227c9f662	Hopefully fix the python install in build script.	2024-01-12 10:27:54 +01:00
Knutwurst	e160b50639	Fix Typo in yaml.	2024-01-12 10:24:38 +01:00
Knutwurst	d9fbb65fad	Fix Python action	2024-01-12 10:22:42 +01:00
Knutwurst	f77932398c	Remove blank.	2024-01-12 10:19:11 +01:00
Knutwurst	05b6a78eef	Fix build yml.	2024-01-12 10:16:58 +01:00
Knutwurst	8c03cd38bf	Update Python and use actions/upload-artifact@v4	2024-01-12 10:14:58 +01:00
Knutwurst	b92eda5b0d	Revert to actions/upload-artifact@v3 to see if it fixes the upload-issue.	2024-01-12 10:03:19 +01:00
Oliver Köster	38444739b7	Merge pull request #509 from stklcode/fix/mega-p-leveling fix manual leveling from Mega P TFT	2024-01-11 22:11:15 +01:00
Stefan Kalscheuer	8b67bfe695	fix manual leveling from Mega P TFT Conversion from enqueue_now_P() to injectCommands() causes issues when executing multiple consecutive commands. Inject a single multi-line string instead of 3 injections make the leveling feature work again. Fixes: `524d6fbcdf`	2024-01-11 19:57:11 +01:00
Oliver Köster	48db31732f	Merge pull request #506 from stklcode/fix/501-runout-threshold increase threshold for filament runout	2024-01-07 16:58:21 +01:00
Stefan Kalscheuer	2f1941697d	increase threshold for filament runout Increase the threshold from 5 to 20 to reduce the chance of false positive triggers.	2024-01-06 18:44:14 +01:00
Knutwurst	f9164e3a6e	Set filament runout pins.	2023-10-14 13:43:10 +02:00
Knutwurst	ca34b2acc2	Cleanup old pin definitions to avoid confusion.	2023-10-14 09:44:56 +02:00
Knutwurst	e0a4e25ffa	More relaxed thermal runaway parameters for all printers especially for the print bed to allow higher temperatures.	2023-09-28 18:33:58 +02:00
Knutwurst	97c3391cd9	Revert "Disable file sorting (for testing purpose only)" This reverts commit `af83c12790`.	2023-07-17 11:06:38 +02:00
Knutwurst	ca66eeb43e	Reset SoftEndstop behaviour	2023-07-17 11:06:20 +02:00
Knutwurst	af83c12790	Disable file sorting (for testing purpose only)	2023-07-15 11:55:27 +02:00
Knutwurst	98613781e9	Disable ALL setSoftEndstopState() methods to rule out any issued regarding the soft endstops	2023-07-15 11:54:48 +02:00
Knutwurst	f122af1903	Revert "Disable SoftEndstop handling while printing." This reverts commit `76cb3aec92`.	2023-07-15 11:49:37 +02:00
Knutwurst	76cb3aec92	Disable SoftEndstop handling while printing.	2023-07-08 11:38:28 +02:00
Knutwurst	93e90f37f8	Bump build date and version	2023-07-06 16:27:34 +02:00
Oliver Köster	160575dd4f	Merge pull request #477 from stklcode/fix/render-folder-regression partially revert static outputString in RenderCurrentFolder	2023-06-25 16:53:55 +02:00
Stefan Kalscheuer	f10f396cc1	partially revert static outputString in RenderCurrentFolder The optimization only applies to targets with DGUS2_TFT set. On other targets the fixed-size array may be of insufficient size. However, remove the potentially problematic initialization with a single nullpointer (empty string), as this will be overwritten in the very next line anyway. Fixes: `a9c018f18c`	2023-06-25 15:42:12 +02:00
Knutwurst	e169b0e627	Decrease heater check count to 60000. This fixes #475	2023-06-24 15:18:07 +02:00
Oliver Köster	02d7c31b4c	Merge pull request #474 from stklcode/cleanup Cleanup	2023-06-24 14:52:58 +02:00
Stefan Kalscheuer	b93faf009c	github: remove duplicate "Configurations" section from PR template	2023-06-24 14:13:13 +02:00
Stefan Kalscheuer	33c91b345e	remove unused PowerKill()	2023-06-24 14:09:27 +02:00
Stefan Kalscheuer	1822172d44	use boolean literals instead of implicit int conversion	2023-06-24 14:04:11 +02:00
Stefan Kalscheuer	0cedfaf9a6	remove unused declarations from anycubic_touchscreen.h	2023-06-24 14:03:21 +02:00
Oliver Köster	0981430d4b	Merge pull request #473 from stklcode/fix/render-current-folder use static initialization for output string in RenderCurrentFolder	2023-06-24 12:50:47 +02:00
Stefan Kalscheuer	a9c018f18c	use static initialization for output string in RenderCurrentFolder The dynamic sized variable outputString may not be properly initialized. Second issue, we fill the line for directories beyond fileNameLength, so the initialization is not always sufficient. We now initialize outputString statically with the maximum printable size which should resolve both. Also clean up some variable declarations.	2023-06-24 12:37:51 +02:00
Knutwurst	4d5ba3899b	Remove duplicate softEndstop setting. It's already set by the print timer.	2023-06-24 11:38:08 +02:00
Knutwurst	339125801e	Fix typos	2023-06-20 15:07:17 +02:00
Knutwurst	614e54657d	Cleanup touchscreen code a little	2023-06-17 19:29:21 +02:00
Knutwurst	524d6fbcdf	Refactor A22 move X/Y/Z or extrude function.	2023-06-15 17:29:50 +02:00
Knutwurst	b940864e18	Implement 'M73' to set print job progress, overrides Knutwurst's built-in estimate	2023-06-14 22:18:43 +02:00
Knutwurst	71b3968100	Revert default ESP speed to 500k.	2023-06-14 21:37:00 +02:00
Knutwurst	fb335408dc	Activate assist level button on 4MAX. This is a trial and error commit.	2023-06-14 17:16:01 +02:00
Knutwurst	b24edb9de7	Add 4MAX Pro code for servo endstop angle adjustment.	2023-06-14 17:00:45 +02:00
Knutwurst	9bdf4d658e	Disable ESP.	2023-06-14 16:19:37 +02:00
Knutwurst	9afe777c26	Cleanup code and use clang-formatter to improve readabilty.	2023-06-14 15:11:17 +02:00
Knutwurst	1e27c22bdd	Bump build date and version	2023-06-14 11:41:25 +02:00
Knutwurst	b646757a1b	Implement 4MAX Pro 2.0 assisted level feature.	2023-06-14 11:04:00 +02:00
Knutwurst	4df951c501	Substiture KNUTWURST_TFT_LEVELING flag with KNUTWURST_CHIRON.	2023-06-14 10:35:01 +02:00
Knutwurst	e0bb686818	Add support for SD extender.	2023-06-13 13:39:30 +02:00
Knutwurst	ff3c981420	Add TODO for SD Extender support.	2023-06-13 12:45:35 +02:00
Knutwurst	f06a7a1454	Update build date.	2023-06-13 12:27:19 +02:00
Knutwurst	201a693283	Make sorting much faster and prevent it from using too much RAM.	2023-06-13 12:07:17 +02:00
Knutwurst	2a33df6da5	Remove unnecessary newlines in serial protocol	2023-06-13 08:54:19 +02:00
Knutwurst	05bd0da620	Add missing break;	2023-06-13 01:16:45 +02:00
Knutwurst	e4081fc7c3	Restructure A6 Get SD Card printing status	2023-06-13 01:12:13 +02:00
Knutwurst	1d2c42d994	A26 refresh SD routine refactoring to it is faster when no sd card is present.	2023-06-12 18:51:20 +02:00
Knutwurst	1be2be4b08	Update build date.	2023-06-12 09:36:27 +02:00
Knutwurst	afa7be67fa	Add clang-format config file.	2023-06-11 18:53:37 +02:00
Knutwurst	72c57b37e6	Remove FilamentRunoutCheck on Startup.	2023-06-11 13:42:29 +02:00
Knutwurst	688cb03275	Update Wifi pin header documentation.	2023-06-11 11:52:17 +02:00
Knutwurst	b356da3f9b	Update Bulddate.	2023-06-11 11:31:31 +02:00
Knutwurst	cb3848deaf	Refactor printing status and time display for anycubic 1.0 tft.	2023-06-11 11:27:17 +02:00
Knutwurst	68a4857305	Revert "Remove thermalManager dependency from 4MAX AutoPowerOff." This reverts commit `de446f0520`.	2023-06-11 08:57:12 +02:00
Knutwurst	000c489b63	Restructure fileList to load faster.	2023-06-10 17:32:34 +02:00
Knutwurst	556be8126b	Enable Autosave after ABL on chiron models.	2023-06-10 00:29:27 +02:00
Knutwurst	b21b25ddf9	Add initialization to OutputString. You never know.	2023-06-09 22:50:42 +02:00
Knutwurst	2849d5afc3	Switch back from char* to const char* withyout copy routine for testing.	2023-06-09 22:36:30 +02:00
Knutwurst	c10a05b8dd	Check for inserted flag from marlin instead of separate check.	2023-06-09 22:27:12 +02:00
Knutwurst	3225d0dad3	Revert File list refactoring `a253776`.	2023-06-09 22:07:34 +02:00
Knutwurst	d528646009	Remove duplicate sd card check	2023-06-09 13:46:36 +02:00
Knutwurst	a253776044	File list refactoring.	2023-06-09 13:16:27 +02:00
Oliver Köster	ecdbf477ec	Merge pull request #462 from stklcode/marlin-2.1.2.1 Merge upstream changes from Marlin 2.1.2.1	2023-06-09 08:50:09 +02:00
Knutwurst	4335238131	Fix anycubics typos in laser implementation.	2023-06-08 22:03:08 +02:00
Knutwurst	dc28578f54	Disable Steppers after one Minute	2023-06-08 18:26:53 +02:00
Knutwurst	de446f0520	Remove thermalManager dependency from 4MAX AutoPowerOff.	2023-06-08 18:17:51 +02:00
Knutwurst	f89e25ce3e	Remove debugging defines and auto save after BLTouch leveling. This is saved afterwards when closing the menu.	2023-06-08 18:07:49 +02:00
Knutwurst	4c0ed10367	Rework file counting and substitute probe.offset.z with setZOffset_mm which is an ExtUI function. Also increase build number.	2023-06-08 18:00:11 +02:00
Knutwurst	c77aacbbd9	Set build version for next release	2023-06-07 21:59:21 +02:00
Knutwurst	4206e3c4e8	Invert setSoftEndstopState logic on print stop	2023-06-07 21:39:14 +02:00
Knutwurst	dfc9cbe8b1	Change Chiron and 4MAX filament load length.	2023-06-07 18:55:48 +02:00
Knutwurst	9c7e330363	Fix AutoPowerOff menu selection.	2023-06-07 18:02:01 +02:00
Knutwurst	580d56bd37	Fix PowerOffFlag handling.	2023-06-07 16:16:06 +02:00
Knutwurst	588f703684	Add Special Menu BLTouch HighSpeed Mode selection	2023-06-07 12:39:56 +02:00
Knutwurst	c48395f801	Fix 4MAX build	2023-06-07 09:09:14 +02:00
Knutwurst	f7060d5524	Add more TFT debugging messages.	2023-06-07 09:03:20 +02:00
Knutwurst	acee1592c9	Add setSoftEndstopState to TFT print and stop functions.	2023-06-07 08:49:56 +02:00
Knutwurst	442f66c145	Disable soft endstops while printing, so that mesh points below 0 can be reached.	2023-06-07 08:48:05 +02:00
Knutwurst	b5b3da41f5	Disable software endstops when manual or auto leveling is activated, so the nozzle can be set to a lower point than the endstop.	2023-06-07 08:35:43 +02:00
Knutwurst	38edd9375b	Revert "Disable automatic mesh adjustment when Z offset is altered." This reverts commit `fb7a29ce8e`.	2023-06-07 08:14:28 +02:00
Knutwurst	fb7a29ce8e	Disable automatic mesh adjustment when Z offset is altered.	2023-06-06 21:44:08 +02:00
Knutwurst	056dd71494	Substitute LCD_SERIAL.println() with LCD_SERIAL.print(,2) to ensure display compatibility.	2023-06-06 19:06:50 +02:00
Knutwurst	09b448773f	Revert define, because it breaks the build.	2023-06-06 17:01:43 +02:00
Knutwurst	223df2956a	Fix display of single mesh points	2023-06-06 17:01:06 +02:00
Knutwurst	9376b95148	Fix live Z offset.	2023-06-06 16:46:09 +02:00
Knutwurst	fbd1b7b9bf	Fix PowerOff.	2023-06-03 21:15:52 +02:00
Knutwurst	61fba37678	Reenable auto power off on 4MAX Pro 2.0	2023-06-03 19:45:48 +02:00
Knutwurst	7b0aa6ec6a	Code cleanup.	2023-06-03 19:45:21 +02:00
Knutwurst	70ccd6a957	Refactor Chiron A31 Adjust all Probe Points routine	2023-06-03 19:29:59 +02:00
Knutwurst	6bc410a0e3	Unify special menu defines for both display types. Also fix NoSD message and error, when no SD card is present.	2023-06-03 18:51:02 +02:00
Knutwurst	011752e02a	Improve file list rendering speed.	2023-06-03 09:20:54 +02:00
Knutwurst	471d7f47a0	Remove unnecessary code from get-sd-list routine.	2023-06-03 00:20:25 +02:00
Knutwurst	0670fb9253	Revert from const char* to char* because it breaks Anycubic 1.0 without SD card.	2023-06-02 22:57:16 +02:00
Knutwurst	501ebfd159	Fix load fw defaults gcode in special menu.	2023-06-02 22:23:53 +02:00
Knutwurst	dedc00fb0d	Reenable automatic filament feed on M600, because a little purge is needed to enable the continue button.	2023-06-02 19:42:13 +02:00
Knutwurst	acc3c74905	New load/unload values for chiron.	2023-06-02 19:02:36 +02:00
Knutwurst	d1f269d654	Fix build	2023-06-02 18:59:12 +02:00
Knutwurst	d4fe673b96	Add M600 config for CHIRON.	2023-06-02 18:54:52 +02:00
Knutwurst	862ac308c7	Clean dead code and disable debugging messages.	2023-06-02 18:18:49 +02:00
Knutwurst	75c541cafb	Change preheat temperatures.	2023-06-02 18:02:17 +02:00
Knutwurst	bb4ee37676	Set release version and clean up some code snippets.	2023-06-02 17:42:29 +02:00
Knutwurst	bf80c9b8dd	Suppress AUTO_ASSIGN_WARNING on Chiron and 4MAX builds.	2023-06-02 17:01:25 +02:00
Knutwurst	79eaf1a8b5	Allow manual probing on Chiron.	2023-06-02 16:57:27 +02:00
Knutwurst	ff5b808dea	Add new mediaPrintingState for probing, which is needed by the chiron routine.	2023-06-02 16:48:10 +02:00
Knutwurst	37ef0ca742	Add more debug output.	2023-06-02 13:14:48 +02:00
Knutwurst	fd84ec3523	Add TODO in case A31 - Adjust all Probe Points	2023-06-02 11:16:11 +02:00
Knutwurst	afa411f065	Substitute settings() with command injection.	2023-06-02 08:52:05 +02:00
Knutwurst	d93ff45af6	Set build version and date. Also enable TFT debugging.	2023-06-02 08:48:41 +02:00
Knutwurst	8fb71f482e	Fix build	2023-06-02 08:47:06 +02:00
Knutwurst	325bcb7e01	Rebuild Chiron leveling feature.	2023-06-02 08:38:28 +02:00
Knutwurst	0af71b9817	Rename CodeSeen to FindToken.	2023-06-01 22:13:43 +02:00
Knutwurst	8e828a48b9	Revert duplicate Z2 pin definitions on 4MAX and Chiron.	2023-06-01 22:01:17 +02:00
Knutwurst	a356788dc7	Add fix for .GCO files on DGUS2 Clone Display	2023-06-01 19:27:01 +02:00
Knutwurst	6499c6b7c3	Simplify non-printable char filter loop.	2023-06-01 18:42:30 +02:00
Knutwurst	fda51c1c46	Remove unneccessary code in the filename check.	2023-06-01 17:13:17 +02:00
Knutwurst	0c25c876d3	Some refactoring and cleanup. No breaking changes.	2023-06-01 09:14:14 +02:00
Knutwurst	067fe2f074	Bump version and date for next major release.	2023-05-31 21:21:39 +02:00
Knutwurst	e8d38ba955	Enable alphabetical SD card file sorting.	2023-05-31 21:19:37 +02:00
Knutwurst	6d257896c0	Beautify DGUS2 Clone file display. Might need some refactoring.	2023-05-31 16:57:20 +02:00
Knutwurst	2af4a2d4e6	Fix sanitization of directory names on Anycubic 1.0 Display.	2023-05-31 15:19:18 +02:00
Knutwurst	c83dad91f3	Z2 Stepper pin definitions for CHIRON and 4MAX.	2023-05-30 22:10:31 +02:00
Knutwurst	429b8cc1fa	Fix warnings in 4MAX Build	2023-05-30 22:00:27 +02:00
Knutwurst	2e030524e2	Disable debug output.	2023-05-30 21:18:41 +02:00
Knutwurst	45cbc380d9	Update build date.	2023-05-30 19:26:27 +02:00
Knutwurst	cf0611a7d9	Use const char* because it's not altered past that point.	2023-05-30 17:33:39 +02:00
Knutwurst	9c4c58235b	Fix compiler warnings for Chiron build and Directory selection on Anycubic 1.0 displays.	2023-05-30 16:46:30 +02:00
Knutwurst	75ffa32980	Use SENDLINE instead of SEND to create directory name on anycubic 1.0 display.	2023-05-30 16:07:26 +02:00
Knutwurst	e0d858d812	Fix misuse of const char pointer by creating a new string which represents the filename.	2023-05-30 15:09:46 +02:00
Knutwurst	ad86d96a31	Cleanup	2023-05-30 09:22:25 +02:00
Knutwurst	6c4a0a887a	Remove old PrintList() implementation + some cleanup	2023-05-29 20:48:58 +02:00
Knutwurst	e940c218cd	Do not remove current selection if Special Menu is enabled, so items can be tapped multiple times.	2023-05-29 20:40:27 +02:00
Knutwurst	1df0ee59d2	Set correct filament sensor pins for chiron in correspondig header and enable new file list implementation.	2023-05-29 20:34:08 +02:00
Knutwurst	9244ea5890	New file list render implementation - WIP!	2023-05-29 20:07:06 +02:00
Knutwurst	8e34d7dc7c	Fix 4MAXP2 Build.	2023-05-29 19:27:55 +02:00
Knutwurst	7fbbbba752	Fix Typo	2023-05-29 14:20:28 +02:00
Knutwurst	2b5816037a	Add custom M600 configuration for DirectExtruder 4MAX Pro 2.0.	2023-05-29 12:35:07 +02:00
Knutwurst	e008a96269	Fix Chiron and 4MAX Pro 2.0 Filament rundout sensor.	2023-05-29 11:39:00 +02:00
Knutwurst	952e0db31e	Fix that you could not get out of a selected directory. Refactor Touchscreen file handling.	2023-05-29 11:20:22 +02:00
Knutwurst	69efa3376a	Set lowest point for BLTouch from 2 to 10 mm.	2023-05-28 22:57:50 +02:00
Stefan Kalscheuer	bdd6e0c7fe	lower the maximum hotend temperature to stay within the thermistor range The default thermistor type 1 supports a maximum value of 300°C. The maximum heater temperature plus overshoot value must stay within that range. For all targets but 4MAXP2 we use type 1 with a default overshoot value of 15°C, so let's lower the maximum heater temperature to 285.	2023-05-28 17:18:03 +02:00
Stefan Kalscheuer	f92a587638	Merge upstream changes from Marlin 2.1.2.1	2023-05-26 18:50:47 +02:00