Final binaries

Fix compiling errors for DGUS displays

.aiderignore

@@ -1,21 +0,0 @@
-# Build artifacts
-buildroot/
-*.o
-*.a
-*.so
-*.dylib
-*.dll
-*.exe
-
-# Web assets
-*.min.js
-*.min.css
-
-# Generated files
-__pycache__/
-*.pyc
-.DS_Store
-
-# IDE files
-.vscode/
-.idea/

.devcontainer/Dockerfile

@@ -1,29 +0,0 @@
-# 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}

.devcontainer/devcontainer.json

@@ -1,51 +0,0 @@
-// 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"
-}

.editorconfig

@@ -1,29 +1,19 @@
 # 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

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,7 +1,6 @@
 name: 🪲 Report a bug
 description: Create a bug report to help improve Marlin Firmware
 title: "[BUG] (bug summary)"
-labels: ["Bug: Potential ?"]
 body:
   - type: markdown
     attributes:
@@ -101,7 +100,7 @@ body:
   - type: input
     attributes:
       label: Printer model
-      description: Creality Ender-3, Prusa mini, or Kossel Delta?
+      description: Creality Ender 3, Prusa mini, or Kossel Delta?
 
   - type: input
     attributes:
@@ -110,13 +109,8 @@ body:
 
   - type: input
     attributes:
-      label: LCD/Controller
-      description: Some Marlin behaviors are determined by the controller. Describe your LCD/Controller model and version.
-
-  - type: input
-    attributes:
-      label: Other add-ons
-      description: Please list any other hardware add-ons that could be involved.
+      label: Add-ons
+      description: Please list any hardware add-ons that could be involved.
 
   - type: dropdown
     attributes:

.github/ISSUE_TEMPLATE/config.yml

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

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,7 +1,7 @@
 name: ✨ Request a feature
 description: Request a new Marlin Firmware feature
 title: "[FR] (feature summary)"
-labels: ["T: Feature Request"]
+labels: 'T: Feature Request'
 body:
   - type: markdown
     attributes:

.github/code_of_conduct.md

@@ -28,9 +28,15 @@ 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 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.
+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.
 
 ## Attribution
 

.github/contributing.md

@@ -26,12 +26,11 @@ 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 by following GitHub's [reporting abuse or spam article](https://docs.github.com/en/communities/maintaining-your-safety-on-github/reporting-abuse-or-spam).
+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).
 
 ## 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.
 
@@ -43,7 +42,7 @@ We have a Message Board and a Facebook group where our knowledgable user communi
 
 If chat is more your speed, you can join the MarlinFirmware Discord server:
 
-* Use the link https://discord.com/servers/marlin-firmware-461605380783472640 to join up as a General User.
+* Use the link https://discord.gg/n5NJ59y to join up as a General User.
 * Even though our Discord is pretty active, it may take a while for community members to respond — please be patient!
 * Use the `#general` channel for general questions or discussion about Marlin.
 * Other channels exist for certain topics or are limited to Patrons. Check the channel list.
@@ -56,8 +55,7 @@ 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?
 

.github/lock.yml

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

.github/workflows/auto-label.yml

@@ -1,41 +0,0 @@
-#
-# auto-label.yml
-# - Find all open issues without a label and a title containing "[BUG]".
-# - Apply the label "Bug: Potential ?" to these issues.
-#
-
-name: Label Old Bugs
-
-on:
-  schedule:
-  - cron: "30 8 * * *"
-
-jobs:
-  autolabel:
-    name: Auto Label
-    if: github.repository == 'MarlinFirmware/Marlin'
-    runs-on: ubuntu-22.04
-    steps:
-    - name: Auto Label for [BUG]
-      uses: actions/github-script@v7
-      with:
-        script: |
-          // Get all open issues in this repository
-          const issueList = await github.rest.issues.listForRepo({
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            state: 'open'
-          });
-          // Filter issues without labels that have a title containing '[BUG]'.
-          const matchingIssues = issueList.data.filter(
-            issue => issue.title.includes('[BUG]') && issue.labels.length === 0
-          );
-          // Process the first 50
-          for (const issue of matchingIssues.slice(0, 50)) {
-            await github.rest.issues.addLabels({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: issue.number,
-              labels: ['Bug: Potential ?']
-            });
-          }

.github/workflows/bump-date.yml

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

.github/workflows/check-pr.yml

@@ -12,13 +12,14 @@ on:
     - 1.0.x
     - 1.1.x
     - 2.0.x
+    - 2.1.x
 
 jobs:
   bad_target:
     name: PR Bad Target
     if: github.repository == 'MarlinFirmware/Marlin'
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
 
     steps:
     - uses: superbrothers/close-pull-request@v3

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

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

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

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

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

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

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

@@ -1,51 +0,0 @@
-#
-# ci-validate-pins.yml
-# Validate that all of the pins files are unchanged by pinsformat.py
-#
-
-name: CI - Validate Pins Files
-
-on:
-  pull_request:
-    branches:
-      - bugfix-2.1.x
-    # Cannot be enabled on 2.1.x until it contains the unit test framework
-    #- 2.1.x
-    paths:
-      - "Marlin/src/pins/*/**"
-  push:
-    branches:
-      - bugfix-2.1.x
-    # Cannot be enabled on 2.1.x until it contains the unit test framework
-    #- 2.1.x
-    paths:
-      - "Marlin/src/pins/*/**"
-
-jobs:
-  validate_pins_files:
-    name: Validate Pins Files
-    if: github.repository == 'MarlinFirmware/Marlin'
-
-    runs-on: ubuntu-22.04
-
-    steps:
-      - name: Check out the PR
-        uses: actions/checkout@v4
-
-      - name: Cache pip
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-validation-v1
-          restore-keys: |
-            ${{ runner.os }}-pip-validation-
-
-      - name: Select Python 3.9
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.9"
-          architecture: "x64"
-
-      - name: Validate all pins files
-        run: |
-          make validate-pins -j

.github/workflows/clean-closed.yml

@@ -13,7 +13,7 @@ on:
 
 jobs:
   remove_label:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
 
     strategy:
       matrix:
@@ -23,7 +23,6 @@ jobs:
           - "S: Please Merge"
           - "S: Please Test"
           - "help wanted"
-          - "Bug: Potential ?"
           - "Needs: Discussion"
           - "Needs: Documentation"
           - "Needs: More Data"
@@ -32,7 +31,7 @@ jobs:
           - "Needs: Work"
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
       - name: Remove Labels
         uses: actions-ecosystem/action-remove-labels@v1
         with:

.github/workflows/close-stale.yml

@@ -14,27 +14,15 @@ jobs:
     name: Close Stale Issues
     if: github.repository == 'MarlinFirmware/Marlin'
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/stale@v9
+    - uses: actions/stale@v3
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
-        stale-issue-message: |
-          Greetings from the Marlin AutoBot!
-          This issue has had no activity for the last 90 days.
-          Do you still see this issue with the latest `bugfix-2.1.x` code?
-          Please add a reply within 14 days or this issue will be automatically closed.
-          To keep a confirmed issue open we can also add a "Bug: Confirmed" tag.
-
-          Disclaimer: This is an open community project with lots of activity and limited
-          resources. The main project contributors will do a bug sweep ahead of the next
-          release, but any skilled member of the community may jump in at any time to fix
-          this issue. That can take a while depending on our busy lives so please be patient,
-          and take advantage of other resources such as the MarlinFirmware Discord to help
-          solve the issue.
-        days-before-stale: 90
-        days-before-close: 14
+        stale-issue-message: 'This issue has had no activity in the last 60 days. Please add a reply if you want to keep this issue active, otherwise it will be automatically closed within 10 days.'
+        days-before-stale: 60
+        days-before-close: 10
         stale-issue-label: 'stale-closing-soon'
         exempt-all-assignees: true
         exempt-issue-labels: 'Bug: Confirmed !,T: Feature Request,Needs: More Data,Needs: Discussion,Needs: Documentation,Needs: Patch,Needs: Work,Needs: Testing,help wanted,no-locking'

.github/workflows/lock-closed.yml

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

.github/workflows/test-builds.yml

@@ -1,199 +1,146 @@
 #
-# ci-build-tests.yml
+# test-builds.yml
 # Do test builds to catch compile errors
 #
 
-name: CI - Build Tests
+name: CI
 
 on:
   pull_request:
     branches:
     - bugfix-2.1.x
-    - 2.1.x
     paths-ignore:
     - config/**
     - data/**
     - docs/**
-    - test/**
-    - Marlin/tests/**
     - '**/*.md'
   push:
     branches:
     - bugfix-2.1.x
-    - 2.1.x
-    - release-*
     paths-ignore:
     - config/**
     - data/**
     - docs/**
-    - test/**
-    - Marlin/tests/**
     - '**/*.md'
 
 jobs:
   test_builds:
-    name: Build Test
+    name: Run All Tests
     if: github.repository == 'MarlinFirmware/Marlin'
 
-    runs-on: ubuntu-22.04
-
-    env:
-      CONFIG_BRANCH: ${{ github.base_ref || github.ref_name }}
+    runs-on: ubuntu-latest
 
     strategy:
-      fail-fast: true
       matrix:
         test-platform:
+        # Base Environments
 
-        # RP2040
-        - SKR_Pico
-
-        # Native
+        - DUE
+        - DUE_archim
+        - esp32
         - linux_native
-        - simulator_linux_release
-
-        # AVR
         - mega2560
-        - mega1280
         - at90usb1286_dfu
+        - teensy31
+        - teensy35
+        - teensy41
+        - SAMD21_minitronics20
+        - SAMD51_grandcentral_m4
+        - PANDA_PI_V29
 
-        # AVR Extended
-        - mega2560ext
-        - melzi_optiboot
+        # Extended AVR Environments
+
+        - FYSETC_F6
+        - mega1280
         - rambo
         - sanguino1284p
         - sanguino644p
 
-        # SAM3X8E
-        - DUE
-        - DUE_archim
+        # STM32F1 (Maple) Environments
 
-        # SAMD21
-        - SAMD51_grandcentral_m4
-        - SAMD21_minitronics20
-
-        # ESP32
-        - esp32
-        - mks_tinybee
-
-        # Teensy 2
-        #- at90usb1286_cdc
-
-        # Teensy MK20DX256
-        - teensy31
-
-        # Teensy MK64FX512, MK66FX1M0
-        - teensy35
-
-        # Teensy IMXRT1062DVx6A
-        - teensy41
-
-        # STM32F0
-        - malyan_M300
-        - STM32F070CB_malyan
-        - STM32F070RB_malyan
-
-        # STM32F1
-        - chitu_f103
-        - mks_robin
-        - mks_robin_nano_v1v2
-        - PANDA_PI_V29
-        - STM32F103RC_btt
-        - STM32F103RC_fysetc
-        - STM32F103RE_btt
-        - STM32F103RE_btt_USB
-        - STM32F103RE_creality
-        - STM32F103VE_longer
-        #- mks_robin_mini
-        #- mks_robin_nano_v1_3_f4_usbmod
-        #- mks_robin_nano_v1v2_usbmod
-        #- STM32F103CB_malyan
-        #- STM32F103RC_btt_USB
-        #- STM32F103RE
-
-        # STM32F4
-        - ARMED
-        - BTT_BTT002
-        - BTT_GTR_V1_0
-        - BTT_SKR_PRO
-        - FLYF407ZG
-        - STM32F446VE_fysetc
-        - LERDGEK
-        - LERDGEX
-        - mks_robin_pro2
-        - Opulo_Lumen_REV3
-        - rumba32
-        - STM32F401RC_creality
-        - STM32F407VE_black
-        - I3DBEEZ9_V1
-
-        # STM32F7
-        - NUCLEO_F767ZI
-        - REMRAM_V1
-
-        # STM32H7
-        - BTT_SKR_SE_BX
-        - STM32H743VI_btt
-
-        # STM32F1 (Maple)
-        - jgaurora_a5s_a1_maple
-        - mks_robin_lite_maple
-        - mks_robin_pro_maple
+        #- STM32F103RC_btt_maple
         - STM32F103RC_btt_USB_maple
         - STM32F103RC_fysetc_maple
         - STM32F103RC_meeb_maple
+        - jgaurora_a5s_a1_maple
         - STM32F103VE_longer_maple
-        - STM32F103VE_ZM3E4V2_USB_maple
         #- mks_robin_maple
+        - mks_robin_lite_maple
+        - mks_robin_pro_maple
         #- mks_robin_nano_v1v2_maple
-        #- STM32F103RC_btt_maple
         #- STM32F103RE_creality_maple
+        - STM32F103VE_ZM3E4V2_USB_maple
 
-        # STM32G0
-        - STM32G0B1RE_btt
+        # STM32 (ST) Environments
 
-        # HC32
-        - HC32F460C_aquila_101
+        - STM32F103RC_btt
+        #- STM32F103RC_btt_USB
+        - STM32F103RE_btt
+        - STM32F103RE_btt_USB
+        - STM32F103RE_creality
+        - STM32F401RC_creality
+        - STM32F103VE_longer
+        - STM32F407VE_black
+        - BIGTREE_BTT002
+        - BIGTREE_SKR_PRO
+        - BIGTREE_GTR_V1_0
+        - mks_robin
+        - ARMED
+        - FYSETC_S6
+        - STM32F070CB_malyan
+        - STM32F070RB_malyan
+        - malyan_M300
+        - FLYF407ZG
+        - rumba32
+        - LERDGEX
+        - LERDGEK
+        - mks_robin_nano_v1v2
+        #- mks_robin_nano_v1v2_usbmod
+        #- mks_robin_nano_v1_3_f4_usbmod
+        - NUCLEO_F767ZI
+        - REMRAM_V1
+        - BTT_SKR_SE_BX
+        - chitu_f103
+        - Opulo_Lumen_REV3
 
-        # GD32F3
-        - GD32F303RE_creality_mfl
+        # ESP32 environments
+        - mks_tinybee
 
-        # GD32F1
-        - GD32F103RC_aquila_mfl
+        # Put lengthy tests last
 
-        # LPC176x - Lengthy tests
         - LPC1768
         - LPC1769
 
+        # Non-working environment tests
+        #- at90usb1286_cdc
+        #- STM32F103CB_malyan
+        #- STM32F103RE
+        #- mks_robin_mini
+
     steps:
 
     - name: Check out the PR
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
 
     - name: Cache pip
-      uses: actions/cache@v4
+      uses: actions/cache@v3
       with:
         path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-build-v1
+        key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
         restore-keys: |
-          ${{ runner.os }}-pip-build-
+          ${{ runner.os }}-pip-
 
     - name: Cache PlatformIO
-      uses: actions/cache@v4
+      uses: actions/cache@v3
       with:
-        path: |
-          ~/.platformio
-          .pio/build
-          .pio/libdeps
-        key: ${{ runner.os }}-pio-build-v1
-        restore-keys: |
-          ${{ runner.os }}-pio-build-
+        path: ~/.platformio
+        key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
 
-    - name: Select Python 3.9
-      uses: actions/setup-python@v5
+    - name: Select Python 3.7
+      uses: actions/setup-python@v3
       with:
-        python-version: '3.9'
-        architecture: 'x64'
+        python-version: '3.7' # 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
       run: |
@@ -201,14 +148,6 @@ jobs:
         pio upgrade --dev
         pio pkg update --global
 
-    - name: Install Simulator dependencies
-      run: |
-        sudo apt-get update
-        sudo apt-get install build-essential
-        sudo apt-get install libsdl2-dev
-        sudo apt-get install libsdl2-net-dev
-        sudo apt-get install libglm-dev
-
     - name: Run ${{ matrix.test-platform }} Tests
       run: |
         make tests-single-ci TEST_TARGET=${{ matrix.test-platform }}

.github/workflows/unlock-reopened.yml

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

.gitignore

@@ -21,26 +21,35 @@
 
 # Generated files
 _Version.h
-bdf2u8g.exe
-genpages.exe
+bdf2u8g
 marlin_config.json
 mczip.h
-language*.csv
-out-csv/
-out-language/
 *.gen
 *.sublime-workspace
 
-# npm
-node_modules/
-package.json
-package-lock.json
-
+#
 # OS
+#
 applet/
 .DS_Store
 
-# Compiled C++ Object files
+#
+# Misc
+#
+*~
+*.orig
+*.rej
+*.bak
+*.idea
+*.i
+*.ii
+*.swp
+tags
+
+#
+# C++
+#
+# Compiled Object files
 *.slo
 *.lo
 *.o
@@ -71,7 +80,10 @@ applet/
 *.out
 *.app
 
-# Compiled C Object files
+#
+# C
+#
+# Object files
 *.o
 *.ko
 *.obj
@@ -99,7 +111,7 @@ applet/
 *.app
 *.i*86
 *.x86_64
-*.hex
+
 
 # Debug files
 *.dSYM/
@@ -130,18 +142,15 @@ vc-fileutils.settings
 # Visual Studio Code
 .vscode/*
 !.vscode/extensions.json
-*.code-workspace
 
-# Simulation files
+#Simulation
 imgui.ini
 eeprom.dat
 spi_flash.bin
 fs.img
 
-# CMake
-buildroot/share/cmake/*
+#cmake
 CMakeLists.txt
-!buildroot/share/cmake/CMakeLists.txt
 src/CMakeLists.txt
 CMakeListsPrivate.txt
 build/
@@ -161,19 +170,4 @@ __pycache__
 
 # IOLogger logs
 *_log.csv
-
-# Misc.
-*~
-*.orig
-*.rej
-*.bak
-*.idea
-*.i
-*.ii
-*.swp
-tags
-*.logs
-*.bak
-.aider*
-!.aiderignore
-.env
+.vscode/extensions.json

.prettierignore

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

.vscode/extensions.json

@@ -6,7 +6,6 @@
         "platformio.platformio-ide"
     ],
     "unwantedRecommendations": [
-        "ms-vscode-remote.remote-containers",
         "ms-vscode.cpptools-extension-pack"
     ]
 }

.zed/settings.json

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

Makefile

@@ -1,51 +1,11 @@
-SCRIPTS_DIR := buildroot/share/scripts
-CONTAINER_RT_BIN := docker
-CONTAINER_RT_OPTS := --rm -v $(PWD):/code -v platformio-cache:/root/.platformio
-CONTAINER_IMAGE := marlin-dev
-UNIT_TEST_CONFIG ?= default
-
-# Find a Python 3 interpreter
-ifeq ($(OS),Windows_NT)
-	# Windows: use `where` – fall back through the three common names
-	PYTHON := $(shell which python 2>nul || which python3 2>nul || which py 2>nul)
-	# Windows: Use cmd tools to find pins files
-	PINS_RAW := $(shell cmd //c "dir /s /b Marlin\src\pins\*.h 2>nul | findstr /r ".*Marlin\\\\src\\\\pins\\\\.*\\\\pins_.*\.h"")
-	PINS := $(subst \,/,$(PINS_RAW))
-else
-	# POSIX: use `command -v` – prefer python3 over python
-	PYTHON := $(shell command -v python3 2>/dev/null || command -v python 2>/dev/null)
-	# Unix/Linux: Use find command
-	PINS := $(shell find Marlin/src/pins -mindepth 2 -name 'pins_*.h')
-endif
-
-# Check that the found interpreter is Python 3
-# Error if there's no Python 3 available
-ifneq ($(strip $(PYTHON)),)
-	PYTHON_VERSION := $(shell $(PYTHON) -c "import sys; print(sys.version_info[0])" 2>/dev/null)
-	ifneq ($(PYTHON_VERSION),3)
-		$(error $(PYTHON) is not Python 3 – install a Python‑3.x interpreter or adjust your PATH)
-	endif
-else
-	$(error No Python executable found – install Python 3.x and make sure it is in your PATH)
-endif
-
 help:
 	@echo "Tasks for local development:"
-	@echo "make marlin                    : Build Marlin for the configured board"
-	@echo "make format-pins -j            : Reformat all pins files (-j for parallel execution)"
-	@echo "make validate-lines -j         : Validate line endings, fails on trailing whitespace, etc."
-	@echo "make validate-pins -j          : Validate all pins files, fails if any require reformatting"
-	@echo "make validate-boards -j        : Validate boards.h and pins.h for standards compliance"
-	@echo "make tests-single-ci           : Run a single test from inside the CI"
-	@echo "make tests-single-local        : Run a single test locally"
-	@echo "make tests-single-local-docker : Run a single test locally, using docker"
-	@echo "make tests-all-local           : Run all tests locally"
-	@echo "make tests-all-local-docker    : Run all tests locally, using docker"
-	@echo "make unit-test-single-local    : Run unit tests for a single config locally"
-	@echo "make unit-test-single-local-docker : Run unit tests for a single config locally, using docker"
-	@echo "make unit-test-all-local       : Run all code tests locally"
-	@echo "make unit-test-all-local-docker : Run all code tests locally, using docker"
-	@echo "make setup-local-docker        : Setup local docker"
+	@echo "* 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 ""
 	@echo "Options for testing:"
 	@echo "  TEST_TARGET          Set when running tests-single-*, to select the"
@@ -55,117 +15,38 @@ help:
 	@echo "                       run on GitHub CI"
 	@echo "  ONLY_TEST            Limit tests to only those that contain this, or"
 	@echo "                       the index of the test (1-based)"
-	@echo "  UNIT_TEST_CONFIG     Set the name of the config from the test folder, without"
-	@echo "                       the leading number. Default is 'default'". Used with the
-	@echo "                       unit-test-single-* tasks"
 	@echo "  VERBOSE_PLATFORMIO   If you want the full PIO output, set any value"
 	@echo "  GIT_RESET_HARD       Used by CI: reset all local changes. WARNING:"
 	@echo "                       THIS WILL UNDO ANY CHANGES YOU'VE MADE!"
-
-marlin:
-	./buildroot/bin/mftest -a
-.PHONY: marlin
-
-clean:
-	rm -rf .pio/build*
+.PHONY: help
 
 tests-single-ci:
 	export GIT_RESET_HARD=true
-	$(MAKE) tests-single-local TEST_TARGET=$(TEST_TARGET) PLATFORMIO_BUILD_FLAGS=-DGITHUB_ACTION
+	$(MAKE) tests-single-local TEST_TARGET=$(TEST_TARGET)
+.PHONY: tests-single-ci
 
 tests-single-local:
 	@if ! test -n "$(TEST_TARGET)" ; then echo "***ERROR*** Set TEST_TARGET=<your-module> or use make tests-all-local" ; return 1; fi
 	export PATH="./buildroot/bin/:./buildroot/tests/:${PATH}" \
 	  && export VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) \
 	  && run_tests . $(TEST_TARGET) "$(ONLY_TEST)"
+.PHONY: tests-single-local
 
 tests-single-local-docker:
 	@if ! test -n "$(TEST_TARGET)" ; then echo "***ERROR*** Set TEST_TARGET=<your-module> or use make tests-all-local-docker" ; return 1; fi
-	@if ! $(CONTAINER_RT_BIN) images -q $(CONTAINER_IMAGE) > /dev/null ; then $(MAKE) setup-local-docker ; fi
-	$(CONTAINER_RT_BIN) run $(CONTAINER_RT_OPTS) $(CONTAINER_IMAGE) make tests-single-local TEST_TARGET=$(TEST_TARGET) VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) GIT_RESET_HARD=$(GIT_RESET_HARD) ONLY_TEST="$(ONLY_TEST)"
+	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
 
 tests-all-local:
-	@$(PYTHON) -c "import yaml" 2>/dev/null || (echo 'pyyaml module is not installed. Install it with "$(PYTHON) -m pip install pyyaml"' && exit 1)
 	export PATH="./buildroot/bin/:./buildroot/tests/:${PATH}" \
 	  && export VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) \
-	  && for TEST_TARGET in $$($(PYTHON) $(SCRIPTS_DIR)/get_test_targets.py) ; do \
-	    if [ "$$TEST_TARGET" = "linux_native" ] && [ "$$(uname)" = "Darwin" ]; then \
-	      echo "Skipping tests for $$TEST_TARGET on macOS" ; \
-	      continue ; \
-	    fi ; \
-	    echo "Running tests for $$TEST_TARGET" ; \
-	    run_tests . $$TEST_TARGET || exit 1 ; \
-	    sleep 5; \
-	  done
+	  && for TEST_TARGET in $$(./get_test_targets.py) ; do echo "Running tests for $$TEST_TARGET" ; run_tests . $$TEST_TARGET ; done
+.PHONY: tests-all-local
 
 tests-all-local-docker:
-	@if ! $(CONTAINER_RT_BIN) images -q $(CONTAINER_IMAGE) > /dev/null ; then $(MAKE) setup-local-docker ; fi
-	$(CONTAINER_RT_BIN) run $(CONTAINER_RT_OPTS) $(CONTAINER_IMAGE) make tests-all-local VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) GIT_RESET_HARD=$(GIT_RESET_HARD)
-
-unit-test-single-local:
-	platformio run -t marlin_$(UNIT_TEST_CONFIG) -e linux_native_test
-
-unit-test-single-local-docker:
-	@if ! $(CONTAINER_RT_BIN) images -q $(CONTAINER_IMAGE) > /dev/null ; then $(MAKE) setup-local-docker ; fi
-	$(CONTAINER_RT_BIN) run $(CONTAINER_RT_OPTS)  $(CONTAINER_IMAGE) make unit-test-single-local UNIT_TEST_CONFIG=$(UNIT_TEST_CONFIG)
-
-unit-test-all-local:
-	platformio run -t test-marlin -e linux_native_test
-
-unit-test-all-local-docker:
-	@if ! $(CONTAINER_RT_BIN) images -q $(CONTAINER_IMAGE) > /dev/null ; then $(MAKE) setup-local-docker ; fi
-	$(CONTAINER_RT_BIN) run $(CONTAINER_RT_OPTS)  $(CONTAINER_IMAGE) make unit-test-all-local
-
-USERNAME := $(shell whoami)
-USER_ID  := $(shell id -u)
-GROUP_ID := $(shell id -g)
-
-.PHONY: setup-local-docker setup-local-docker-old
+	docker-compose run --rm marlin $(MAKE) tests-all-local VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) GIT_RESET_HARD=$(GIT_RESET_HARD)
+.PHONY: tests-all-local-docker
 
 setup-local-docker:
-	@echo "Building marlin-dev Docker image..."
-	$(CONTAINER_RT_BIN) build -t $(CONTAINER_IMAGE) \
-	  --build-arg USERNAME=$(USERNAME) \
-	  --build-arg USER_ID=$(USER_ID) \
-	  --build-arg GROUP_ID=$(GROUP_ID) \
-	  -f docker/Dockerfile .
-	@echo
-	@echo "To run all tests in Docker:"
-	@echo "  make tests-all-local-docker"
-	@echo "To run a single test in Docker:"
-	@echo "  make tests-single-local-docker TEST_TARGET=mega2560"
-
-setup-local-docker-old:
-	$(CONTAINER_RT_BIN) buildx build -t $(CONTAINER_IMAGE) -f docker/Dockerfile .
-
-.PHONY: $(PINS) format-pins validate-pins
-
-$(PINS): %:
-	@echo "Formatting pins $@"
-	@$(PYTHON) $(SCRIPTS_DIR)/pinsformat.py $< $@
-
-format-pins: $(PINS)
-	@echo "Processed $(words $(PINS)) pins files"
-
-validate-pins: format-pins
-	@echo "Validating pins files"
-	@git diff --exit-code || (git status && echo "\nError: Pins files are not formatted correctly. Run \"make format-pins\" to fix.\n" && exit 1)
-
-.PHONY: format-lines validate-lines
-
-format-lines:
-	@echo "Formatting all sources"
-	@$(PYTHON) $(SCRIPTS_DIR)/linesformat.py buildroot
-	@$(PYTHON) $(SCRIPTS_DIR)/linesformat.py Marlin
-
-validate-lines:
-	@echo "Validating text formatting"
-	@npx prettier --check . --editorconfig --object-wrap preserve
-
-BOARDS_FILE := Marlin/src/core/boards.h
-
-.PHONY: validate-boards
-
-validate-boards:
-	@echo "Validating boards.h file"
-	@$(PYTHON) $(SCRIPTS_DIR)/validate_boards.py $(BOARDS_FILE) || (echo "\nError: boards.h file is not valid. Please check and correct it.\n" && exit 1)
+	docker-compose build
+.PHONY: setup-local-docker

Marlin/Makefile

@@ -63,8 +63,8 @@ HARDWARE_MOTHERBOARD ?= 1020
 
 ifeq ($(OS),Windows_NT)
   # Windows
-  ARDUINO_INSTALL_DIR ?= ${HOME}/AppData/Local/Arduino
-  ARDUINO_USER_DIR ?= ${HOME}/Documents/Arduino
+  ARDUINO_INSTALL_DIR ?= ${HOME}/Arduino
+  ARDUINO_USER_DIR ?= ${HOME}/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}/AppData/Local/Arduino       # C:/Users/${USERNAME}/AppData/Local/Arduino
-ARDUINO_VERSION      ?= 10819
+ARDUINO_INSTALL_DIR  ?= ${HOME}/Arduino
+ARDUINO_VERSION      ?= 106
 
 # The installed Libraries are in the User folder
-ARDUINO_USER_DIR ?= ${HOME}/Documents/Arduino
+ARDUINO_USER_DIR ?= ${HOME}/Arduino
 
 # You can optionally set a path to the avr-gcc tools.
 # Requires a trailing slash. For example, /usr/local/avr-gcc/bin/
@@ -127,9 +127,9 @@ NEOPIXEL           ?= 0
 # on GCC versions:
 #   https://www.avrfreaks.net/comment/1789106#comment-1789106
 
-CC_MAJ:=$(shell $(CC) -dM -E - < /dev/null | grep __GNUC__ | cut -f3 -d' ' )
-CC_MIN:=$(shell $(CC) -dM -E - < /dev/null | grep __GNUC_MINOR__ | cut -f3 -d' ' )
-CC_PATCHLEVEL:=$(shell $(CC) -dM -E - < /dev/null | grep __GNUC_PATCHLEVEL__ | cut -f3 -d' ' )
+CC_MAJ:=$(shell $(CC) -dM -E - < /dev/null | grep __GNUC__ | cut -f3 -d\ )
+CC_MIN:=$(shell $(CC) -dM -E - < /dev/null | grep __GNUC_MINOR__ | cut -f3 -d\ )
+CC_PATCHLEVEL:=$(shell $(CC) -dM -E - < /dev/null | grep __GNUC_PATCHLEVEL__ | cut -f3 -d\ )
 CC_VER:=$(shell echo $$(( $(CC_MAJ) * 10000 + $(CC_MIN) * 100 + $(CC_PATCHLEVEL) )))
 ifeq ($(shell test $(CC_VER) -lt 40901 && echo 1),1)
   $(warning This GCC version $(CC_VER) is likely broken. Enabling relocation workaround.)
@@ -187,17 +187,6 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1033)
 # RAMPS Plus 3DYMY (Power outputs: Spindle, Controller Fan)
 else ifeq ($(HARDWARE_MOTHERBOARD),1034)
 
-# RAMPS 1.6+ (Power outputs: Hotend, Fan, Bed)
-else ifeq ($(HARDWARE_MOTHERBOARD),1040)
-# RAMPS 1.6+ (Power outputs: Hotend0, Hotend1, Bed)
-else ifeq ($(HARDWARE_MOTHERBOARD),1041)
-# RAMPS 1.6+ (Power outputs: Hotend, Fan0, Fan1)
-else ifeq ($(HARDWARE_MOTHERBOARD),1042)
-# RAMPS 1.6+ (Power outputs: Hotend0, Hotend1, Fan)
-else ifeq ($(HARDWARE_MOTHERBOARD),1043)
-# RAMPS 1.6+ (Power outputs: Spindle, Controller Fan)
-else ifeq ($(HARDWARE_MOTHERBOARD),1044)
-
 #
 # RAMPS Derivatives - ATmega1280, ATmega2560
 #
@@ -232,79 +221,79 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1112)
 else ifeq ($(HARDWARE_MOTHERBOARD),1113)
 # BigTreeTech or BIQU KFB2.0
 else ifeq ($(HARDWARE_MOTHERBOARD),1114)
-# Zonestar zrib V2.0 (Chinese RAMPS replica)
+# zrib V2.0 (Chinese RAMPS replica)
 else ifeq ($(HARDWARE_MOTHERBOARD),1115)
-# Zonestar zrib V5.2 (Chinese RAMPS replica)
+# zrib V5.2 (Chinese RAMPS replica)
 else ifeq ($(HARDWARE_MOTHERBOARD),1116)
-# Zonestar zrib V5.3 (Chinese RAMPS replica)
-else ifeq ($(HARDWARE_MOTHERBOARD),1117)
 # Felix 2.0+ Electronics Board (RAMPS like)
-else ifeq ($(HARDWARE_MOTHERBOARD),1118)
+else ifeq ($(HARDWARE_MOTHERBOARD),1117)
 # Invent-A-Part RigidBoard
-else ifeq ($(HARDWARE_MOTHERBOARD),1119)
+else ifeq ($(HARDWARE_MOTHERBOARD),1118)
 # Invent-A-Part RigidBoard V2
-else ifeq ($(HARDWARE_MOTHERBOARD),1120)
+else ifeq ($(HARDWARE_MOTHERBOARD),1119)
 # Sainsmart 2-in-1 board
-else ifeq ($(HARDWARE_MOTHERBOARD),1121)
+else ifeq ($(HARDWARE_MOTHERBOARD),1120)
 # Ultimaker
-else ifeq ($(HARDWARE_MOTHERBOARD),1122)
+else ifeq ($(HARDWARE_MOTHERBOARD),1121)
 # Ultimaker (Older electronics. Pre 1.5.4. This is rare)
-else ifeq ($(HARDWARE_MOTHERBOARD),1123)
+else ifeq ($(HARDWARE_MOTHERBOARD),1122)
   MCU              ?= atmega1280
   PROG_MCU         ?= m1280
 # Azteeg X3
-else ifeq ($(HARDWARE_MOTHERBOARD),1124)
+else ifeq ($(HARDWARE_MOTHERBOARD),1123)
 # Azteeg X3 Pro
-else ifeq ($(HARDWARE_MOTHERBOARD),1125)
+else ifeq ($(HARDWARE_MOTHERBOARD),1124)
 # Ultimainboard 2.x (Uses TEMP_SENSOR 20)
-else ifeq ($(HARDWARE_MOTHERBOARD),1126)
+else ifeq ($(HARDWARE_MOTHERBOARD),1125)
 # Rumba
-else ifeq ($(HARDWARE_MOTHERBOARD),1127)
+else ifeq ($(HARDWARE_MOTHERBOARD),1126)
 # Raise3D N series Rumba derivative
-else ifeq ($(HARDWARE_MOTHERBOARD),1128)
+else ifeq ($(HARDWARE_MOTHERBOARD),1127)
 # Rapide Lite 200 (v1, low-cost RUMBA clone with drv)
-else ifeq ($(HARDWARE_MOTHERBOARD),1129)
+else ifeq ($(HARDWARE_MOTHERBOARD),1128)
 # Formbot T-Rex 2 Plus
-else ifeq ($(HARDWARE_MOTHERBOARD),1130)
+else ifeq ($(HARDWARE_MOTHERBOARD),1129)
 # Formbot T-Rex 3
-else ifeq ($(HARDWARE_MOTHERBOARD),1131)
+else ifeq ($(HARDWARE_MOTHERBOARD),1130)
 # Formbot Raptor
-else ifeq ($(HARDWARE_MOTHERBOARD),1132)
+else ifeq ($(HARDWARE_MOTHERBOARD),1131)
 # Formbot Raptor 2
-else ifeq ($(HARDWARE_MOTHERBOARD),1133)
+else ifeq ($(HARDWARE_MOTHERBOARD),1132)
 # bq ZUM Mega 3D
-else ifeq ($(HARDWARE_MOTHERBOARD),1134)
+else ifeq ($(HARDWARE_MOTHERBOARD),1133)
 # MakeBoard Mini v2.1.2 by MicroMake
-else ifeq ($(HARDWARE_MOTHERBOARD),1135)
+else ifeq ($(HARDWARE_MOTHERBOARD),1134)
 # TriGorilla Anycubic version 1.3-based on RAMPS EFB
-else ifeq ($(HARDWARE_MOTHERBOARD),1136)
+else ifeq ($(HARDWARE_MOTHERBOARD),1135)
 #   ... Ver 1.4
-else ifeq ($(HARDWARE_MOTHERBOARD),1137)
+else ifeq ($(HARDWARE_MOTHERBOARD),1136)
 #   ... Rev 1.1 (new servo pin order)
-else ifeq ($(HARDWARE_MOTHERBOARD),1138)
+else ifeq ($(HARDWARE_MOTHERBOARD),1137)
 # Creality: Ender-4, CR-8
-else ifeq ($(HARDWARE_MOTHERBOARD),1139)
+else ifeq ($(HARDWARE_MOTHERBOARD),1138)
 # Creality: CR10S, CR20, CR-X
-else ifeq ($(HARDWARE_MOTHERBOARD),1140)
-# Creality CR-10 V2, CR-10 V3
-else ifeq ($(HARDWARE_MOTHERBOARD),1141)
+else ifeq ($(HARDWARE_MOTHERBOARD),1139)
 # Dagoma F5
-else ifeq ($(HARDWARE_MOTHERBOARD),1142)
-# Dagoma D6 (as found in the Dagoma DiscoUltimate V2 TMC)
-else ifeq ($(HARDWARE_MOTHERBOARD),1143)
+else ifeq ($(HARDWARE_MOTHERBOARD),1140)
 # FYSETC F6 1.3
-else ifeq ($(HARDWARE_MOTHERBOARD),1144)
+else ifeq ($(HARDWARE_MOTHERBOARD),1141)
 # FYSETC F6 1.4
-else ifeq ($(HARDWARE_MOTHERBOARD),1145)
+else ifeq ($(HARDWARE_MOTHERBOARD),1142)
 # Wanhao Duplicator i3 Plus
-else ifeq ($(HARDWARE_MOTHERBOARD),1146)
+else ifeq ($(HARDWARE_MOTHERBOARD),1143)
 # VORON Design
-else ifeq ($(HARDWARE_MOTHERBOARD),1147)
+else ifeq ($(HARDWARE_MOTHERBOARD),1144)
 # Tronxy TRONXY-V3-1.0
-else ifeq ($(HARDWARE_MOTHERBOARD),1148)
+else ifeq ($(HARDWARE_MOTHERBOARD),1145)
 # Z-Bolt X Series
-else ifeq ($(HARDWARE_MOTHERBOARD),1149)
+else ifeq ($(HARDWARE_MOTHERBOARD),1146)
 # TT OSCAR
+else ifeq ($(HARDWARE_MOTHERBOARD),1147)
+# Overlord/Overlord Pro
+else ifeq ($(HARDWARE_MOTHERBOARD),1148)
+# ADIMLab Gantry v1
+else ifeq ($(HARDWARE_MOTHERBOARD),1149)
+# ADIMLab Gantry v2
 else ifeq ($(HARDWARE_MOTHERBOARD),1150)
 # BIQU Tango V1
 else ifeq ($(HARDWARE_MOTHERBOARD),1151)
@@ -318,7 +307,7 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1154)
 else ifeq ($(HARDWARE_MOTHERBOARD),1155)
 # Tenlog D3 Hero IDEX printer
 else ifeq ($(HARDWARE_MOTHERBOARD),1156)
-# Tenlog D3, D5, D6 IDEX Printer
+# Tenlog D3,5,6 Pro IDEX printers
 else ifeq ($(HARDWARE_MOTHERBOARD),1157)
 # Ramps S 1.2 by Sakul.cz (Power outputs: Hotend0, Hotend1, Fan, Bed)
 else ifeq ($(HARDWARE_MOTHERBOARD),1158)
@@ -330,18 +319,10 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1160)
 else ifeq ($(HARDWARE_MOTHERBOARD),1161)
 # Longer LKx PRO / Alfawise Uxx Pro (PRO version)
 else ifeq ($(HARDWARE_MOTHERBOARD),1162)
-# Pxmalion Core I3
+# Zonestar zrib V5.3 (Chinese RAMPS replica)
 else ifeq ($(HARDWARE_MOTHERBOARD),1163)
-# Panowin Cutlass (as found in the Panowin F1)
+# Pxmalion Core I3
 else ifeq ($(HARDWARE_MOTHERBOARD),1164)
-# Kodama Bardo V1.x (as found in the Kodama Trinus)
-else ifeq ($(HARDWARE_MOTHERBOARD),1165)
-# XTLW MFF V1.0
-else ifeq ($(HARDWARE_MOTHERBOARD),1166)
-# XTLW MFF V2.0
-else ifeq ($(HARDWARE_MOTHERBOARD),1167)
-# E3D Rumba BigBox
-else ifeq ($(HARDWARE_MOTHERBOARD),1168)
 
 #
 # RAMBo and derivatives
@@ -359,7 +340,7 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1203)
 else ifeq ($(HARDWARE_MOTHERBOARD),1204)
 # abee Scoovo X9H
 else ifeq ($(HARDWARE_MOTHERBOARD),1205)
-# ThinkerV2
+# Rambo ThinkerV2
 else ifeq ($(HARDWARE_MOTHERBOARD),1206)
 
 #
@@ -402,42 +383,30 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1315)
 else ifeq ($(HARDWARE_MOTHERBOARD),1316)
 # Geeetech GT2560 Rev B for A10(M/T/D)
 else ifeq ($(HARDWARE_MOTHERBOARD),1317)
-# Geeetech GT2560 Rev B for Mecreator2
-else ifeq ($(HARDWARE_MOTHERBOARD),1318)
-# Geeetech GT2560 Rev B for A20(M/T/D)
-else ifeq ($(HARDWARE_MOTHERBOARD),1319)
 # Geeetech GT2560 Rev B for A10(M/T/D)
-else ifeq ($(HARDWARE_MOTHERBOARD),1320)
+else ifeq ($(HARDWARE_MOTHERBOARD),1318)
+# Geeetech GT2560 Rev B for Mecreator2
+else ifeq ($(HARDWARE_MOTHERBOARD),1319)
 # Geeetech GT2560 Rev B for A20(M/T/D)
-else ifeq ($(HARDWARE_MOTHERBOARD),1321)
-# Geeetech GT2560 V4.1B for A10(M/T/D)
-else ifeq ($(HARDWARE_MOTHERBOARD),1322)
+else ifeq ($(HARDWARE_MOTHERBOARD),1320)
 # Einstart retrofit
-else ifeq ($(HARDWARE_MOTHERBOARD),1323)
+else ifeq ($(HARDWARE_MOTHERBOARD),1321)
 # Wanhao 0ne+ i3 Mini
-else ifeq ($(HARDWARE_MOTHERBOARD),1324)
-# Wanhao D9 MK2
-else ifeq ($(HARDWARE_MOTHERBOARD),1325)
-# Overlord/Overlord Pro
-else ifeq ($(HARDWARE_MOTHERBOARD),1326)
-# ADIMLab Gantry v1
-else ifeq ($(HARDWARE_MOTHERBOARD),1327)
-# ADIMLab Gantry v2
-else ifeq ($(HARDWARE_MOTHERBOARD),1328)
+else ifeq ($(HARDWARE_MOTHERBOARD),1322)
 # Leapfrog Xeed 2015
-else ifeq ($(HARDWARE_MOTHERBOARD),1329)
+else ifeq ($(HARDWARE_MOTHERBOARD),1323)
 # PICA Shield (original version)
-else ifeq ($(HARDWARE_MOTHERBOARD),1330)
+else ifeq ($(HARDWARE_MOTHERBOARD),1324)
 # PICA Shield (rev C or later)
-else ifeq ($(HARDWARE_MOTHERBOARD),1331)
+else ifeq ($(HARDWARE_MOTHERBOARD),1325)
 # Intamsys 4.0 (Funmat HT)
-else ifeq ($(HARDWARE_MOTHERBOARD),1332)
-# Malyan M180 Mainboard Version 2
-else ifeq ($(HARDWARE_MOTHERBOARD),1333)
+else ifeq ($(HARDWARE_MOTHERBOARD),1326)
+# Malyan M180 Mainboard Version 2 (no display function, direct G-code only)
+else ifeq ($(HARDWARE_MOTHERBOARD),1327)
+# Geeetech GT2560 Rev B for A20(M/T/D)
+else ifeq ($(HARDWARE_MOTHERBOARD),1328)
 # Mega controller & Protoneer CNC Shield V3.00
-else ifeq ($(HARDWARE_MOTHERBOARD),1334)
-# WEEDO 62A board (TINA2, Monoprice Cadet, etc.)
-else ifeq ($(HARDWARE_MOTHERBOARD),1335)
+else ifeq ($(HARDWARE_MOTHERBOARD),1329)
 
 #
 # ATmega1281, ATmega2561
@@ -471,7 +440,7 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1502)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega644p
   PROG_MCU         ?= m644p
-# Melzi V2
+# Melzi V2.0
 else ifeq ($(HARDWARE_MOTHERBOARD),1503)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega1284p
@@ -481,43 +450,38 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1504)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega1284p
   PROG_MCU         ?= m1284p
-# Melzi Creality3D (for CR-10 etc)
+# Melzi Creality3D board (for CR-10 etc)
 else ifeq ($(HARDWARE_MOTHERBOARD),1505)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega1284p
   PROG_MCU         ?= m1284p
-# Melzi Creality3D (for Ender-2)
+# Melzi Malyan M150 board
 else ifeq ($(HARDWARE_MOTHERBOARD),1506)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega1284p
   PROG_MCU         ?= m1284p
-# Melzi Malyan M150
+# Tronxy X5S
 else ifeq ($(HARDWARE_MOTHERBOARD),1507)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega1284p
   PROG_MCU         ?= m1284p
-# Tronxy X5S
+# STB V1.1
 else ifeq ($(HARDWARE_MOTHERBOARD),1508)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega1284p
   PROG_MCU         ?= m1284p
-# STB V1.1
+# Azteeg X1
 else ifeq ($(HARDWARE_MOTHERBOARD),1509)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega1284p
   PROG_MCU         ?= m1284p
-# Azteeg X1
+# Anet 1.0 (Melzi clone)
 else ifeq ($(HARDWARE_MOTHERBOARD),1510)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega1284p
   PROG_MCU         ?= m1284p
-# Anet 1.0 (Melzi clone)
-else ifeq ($(HARDWARE_MOTHERBOARD),1511)
-  HARDWARE_VARIANT ?= Sanguino
-  MCU              ?= atmega1284p
-  PROG_MCU         ?= m1284p
 # ZoneStar ZMIB V2
-else ifeq ($(HARDWARE_MOTHERBOARD),1512)
+else ifeq ($(HARDWARE_MOTHERBOARD),1511)
   HARDWARE_VARIANT ?= Sanguino
   MCU              ?= atmega1284p
   PROG_MCU         ?= m1284p
@@ -631,10 +595,6 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1707)
   MCU              ?= at90usb1286
   PROG_MCU         ?= usb1286
 
-#
-# SAM3X8E ARM Cortex-M3
-#
-
 # UltiMachine Archim1 (with DRV8825 drivers)
 else ifeq ($(HARDWARE_MOTHERBOARD),3023)
   HARDWARE_VARIANT ?= archim
@@ -696,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)/packages/arduino/hardware/arduino/avr/1.8.6/libraries/SPI/src
+  VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/avr/libraries/SPI/src
 endif
 
 ifeq ($(IS_MCU),1)
-  VPATH += $(ARDUINO_INSTALL_DIR)/packages/arduino/hardware/arduino/avr/1.8.6/cores/arduino
+  VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/avr/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)/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
+  VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/avr/libraries/SPI/src
+  VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/avr/libraries/SoftwareSerial/src
 endif
 
 VPATH += $(ARDUINO_INSTALL_DIR)/libraries/LiquidCrystal/src
@@ -721,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)/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
+  VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/avr/libraries/Wire/src
+  VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/avr/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-HAL
-VPATH += $(ARDUINO_INSTALL_DIR)/libraries/U8glib-HAL/src
-# VPATH += $(ARDUINO_INSTALL_DIR)/libraries/U8glib
-# VPATH += $(ARDUINO_INSTALL_DIR)/libraries/U8glib/src
+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
 endif
 ifeq ($(TMC), 1)
 VPATH += $(ARDUINO_INSTALL_DIR)/libraries/TMCStepper/src
@@ -740,9 +700,9 @@ endif
 
 ifeq ($(HARDWARE_VARIANT), arduino)
   HARDWARE_SUB_VARIANT ?= mega
-  VPATH += $(ARDUINO_INSTALL_DIR)/packages/arduino/hardware/avr/1.8.6/variants/$(HARDWARE_SUB_VARIANT)
+  VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/avr/variants/$(HARDWARE_SUB_VARIANT)
 else ifeq ($(HARDWARE_VARIANT), Sanguino)
-  VPATH += $(ARDUINO_INSTALL_DIR)/packages/arduino/hardware/avr/1.8.6/variants/sanguino
+  VPATH += $(ARDUINO_INSTALL_DIR)/hardware/marlin/avr/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/
@@ -758,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)/packages/arduino/hardware/avr/1.8.6/variants/$(HARDWARE_SUB_VARIANT)
+  VPATH += $(ARDUINO_INSTALL_DIR)/hardware/$(HARDWARE_VARIANT)/variants/$(HARDWARE_SUB_VARIANT)
 endif
 
 LIB_SRC = wiring.c \
@@ -773,7 +733,7 @@ endif
 
 ifeq ($(HARDWARE_VARIANT), Teensy)
   LIB_SRC = wiring.c
-  VPATH += $(ARDUINO_INSTALL_DIR)/packages/arduino/hardware/teensy/cores/teensy
+  VPATH += $(ARDUINO_INSTALL_DIR)/hardware/teensy/cores/teensy
 endif
 
 LIB_CXXSRC = WMath.cpp WString.cpp Print.cpp SPI.cpp
@@ -807,10 +767,10 @@ endif
 
 ifeq ($(TMC), 1)
   LIB_CXXSRC += TMCStepper.cpp COOLCONF.cpp DRV_STATUS.cpp IHOLD_IRUN.cpp \
-    CHOPCONF.cpp GCONF.cpp PWMCONF.cpp DRV_CONF.cpp DRVCONF.cpp DRVCTRL.cpp DRVSTATUS.cpp \
-    GLOBAL_SCALER.cpp SLAVECONF.cpp IOIN.cpp ENCMODE.cpp RAMP_STAT.cpp SGCSCONF.cpp \
-    SHORT_CONF.cpp SMARTEN.cpp SW_MODE.cpp SW_SPI.cpp TMC2130Stepper.cpp TMC2208Stepper.cpp \
-    TMC2209Stepper.cpp TMC2240Stepper.cpp TMC2660Stepper.cpp TMC5130Stepper.cpp TMC5160Stepper.cpp
+    CHOPCONF.cpp GCONF.cpp PWMCONF.cpp DRV_CONF.cpp DRVCONF.cpp DRVCTRL.cpp \
+    DRVSTATUS.cpp ENCMODE.cpp RAMP_STAT.cpp SGCSCONF.cpp SHORT_CONF.cpp \
+    SMARTEN.cpp SW_MODE.cpp SW_SPI.cpp TMC2130Stepper.cpp TMC2208Stepper.cpp \
+    TMC2209Stepper.cpp TMC2660Stepper.cpp TMC5130Stepper.cpp TMC5160Stepper.cpp
 endif
 
 ifeq ($(RELOC_WORKAROUND), 1)
@@ -877,8 +837,8 @@ else ifeq ($(HARDWARE_VARIANT), archim)
 endif
 
 # Add all the source directories as include directories too
-CINCS = ${addprefix -I, ${VPATH}}
-CXXINCS = ${addprefix -I, ${VPATH}}
+CINCS = ${addprefix -I ,${VPATH}}
+CXXINCS = ${addprefix -I ,${VPATH}}
 
 # Silence warnings for library code (won't work for .h files, unfortunately)
 LIBWARN = -w -Wno-packed-bitfield-compat
@@ -920,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)/packages/arduino/tools/avrdude/6.3.0-arduino17/etc/avrdude.conf
+  AVRDUDE_CONF = $(ARDUINO_INSTALL_DIR)/hardware/tools/avr/etc/avrdude.conf
 endif
 AVRDUDE_FLAGS = -D -C$(AVRDUDE_CONF) \
   -p$(PROG_MCU) -P$(AVRDUDE_PORT) -c$(AVRDUDE_PROGRAMMER) \
@@ -1035,7 +995,7 @@ extcoff: $(TARGET).elf
 	$(NM) -n $< > $@
 
 # Link: create ELF output file from library.
-LDFLAGS+= -Wl,-V
+
 $(BUILD_DIR)/$(TARGET).elf: $(OBJ) Configuration.h
 	$(Pecho) "  CXX   $@"
 	$P $(CXX) $(LD_PREFIX) $(ALL_CXXFLAGS) -o $@ -L. $(OBJ) $(LDFLAGS) $(LD_SUFFIX)

Marlin/Marlin.ino

@@ -2,7 +2,7 @@
 
   Marlin Firmware
 
-  (c) 2011-2024 MarlinFirmware
+  (c) 2011-2020 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://youtu.be/3gwWVFtdg-4
+  - https://www.youtube.com/watch?v=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

Marlin/Version.h

@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 #pragma once
@@ -28,32 +28,73 @@
 /**
  * Marlin release version identifier
  */
-//#define SHORT_BUILD_VERSION "bugfix-2.1.x"
+#define SHORT_BUILD_VERSION "2.1.2_Beta1"
 
 /**
  * Verbose version identifier which should contain a reference to the location
  * from where the binary was downloaded or the source code was compiled.
  */
-//#define DETAILED_BUILD_VERSION SHORT_BUILD_VERSION
+
+#if(ENABLED(DriverA4988))
+  #define VerChar1 "A"
+#elif(ENABLED(Driver2209))
+  #define VerChar1 "T"
+#endif
+
+#if(ENABLED(BL_Touch))
+  #define VerChar2 "B"
+#else
+  #define VerChar2 "E"
+#endif
+
+#if(ENABLED(LOWRES_DWIN))
+#define VerChar3 "L"
+  #else
+#define VerChar3 "H"
+#endif
+
+
+#if(ENABLED(ACBed))
+  #define VerChar4 "A"
+#else
+  #define VerChar4 "D"
+#endif
+
+#if(ENABLED(OpticalY))
+  #define VerChar5 "O"
+#else
+  #define VerChar5 "M"
+#endif
+
+#if(ENABLED(TitanExtruder))
+  #define VerChar6 "T"
+#elif ANY(BMGExtruderV2, BMGExtruderV3)
+  #define VerChar6 "B"
+#elif ENABLED(BondtechLGX)
+  #define VerChar6 "L"
+#else
+  #define VerChar6 "S"
+#endif
+
+#define DETAILED_BUILD_VERSION SHORT_BUILD_VERSION "_" VerChar1 VerChar2 VerChar3 VerChar4 VerChar5 VerChar6
 
 /**
  * The STRING_DISTRIBUTION_DATE represents when the binary file was built,
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2025-12-02"
-
-/**
- * The protocol for communication to the host. Protocol indicates communication
- * standards such as the use of ASCII, "echo:" and "error:" line prefixes, etc.
- * (Other behaviors are given by the firmware version and capabilities report.)
- */
-//#define PROTOCOL_VERSION "1.0"
+#define STRING_DISTRIBUTION_DATE "2023-02-03"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
  */
-//#define MACHINE_NAME "3D Printer"
+#if(ENABLED(MachineTLD3P))
+  #define CUSTOM_MACHINE_NAME "TL D3P"
+#elif(ENABLED(MachineTLD5))
+  #define CUSTOM_MACHINE_NAME "TL D5"
+#elif(ENABLED(MachineTLD6))
+  #define CUSTOM_MACHINE_NAME "TL D6"
+#endif
 
 /**
  * The SOURCE_CODE_URL is the location where users will find the Marlin Source
@@ -61,7 +102,7 @@
  * has a distinct Github fork— the Source Code URL should just be the main
  * Marlin repository.
  */
-//#define SOURCE_CODE_URL "github.com/MarlinFirmware/Marlin"
+#define SOURCE_CODE_URL "https://github.com/InsanityAutomation/Marlin/tree/Tenlog_DWIN"
 
 /**
  * Default generic printer UUID.
@@ -72,12 +113,12 @@
  * The WEBSITE_URL is the location where users can get more information such as
  * documentation about a specific Marlin release.
  */
-//#define WEBSITE_URL "marlinfw.org"
+#define WEBSITE_URL "http://www.lnl3d.com     "
 
 /**
- * Set the vendor info the serial USB interface, if changeable.
- * Currently only supported by DUE platform.
+ * Set the vendor info the serial USB interface, if changable
+ * Currently only supported by DUE platform
  */
-//#define USB_DEVICE_VENDOR_ID           0x0000
-//#define USB_DEVICE_PRODUCT_ID          0x0000
-//#define USB_DEVICE_MANUFACTURE_NAME    WEBSITE_URL
+//#define  USB_DEVICE_VENDOR_ID           0x0000
+//#define  USB_DEVICE_PRODUCT_ID          0x0000
+//#define  USB_DEVICE_MANUFACTURE_NAME    WEBSITE_URL

Marlin/_Bootscreen.h

@@ -0,0 +1,93 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * Custom Bitmap for splashscreen
+ *
+ * You may use one of the following tools to generate the C++ bitmap array from
+ * a black and white image:
+ *
+ *  - http://www.marlinfw.org/tools/u8glib/converter.html
+ *  - http://www.digole.com/tools/PicturetoC_Hex_converter.php
+ */
+
+#define CUSTOM_BOOTSCREEN_TIMEOUT   2500
+#define CUSTOM_BOOTSCREEN_BMPWIDTH  128
+#define CUSTOM_BOOTSCREEN_INVERTED
+
+const unsigned char custom_start_bmp[] PROGMEM = {
+  B11111101,B01010101,B01010101,B01010101,B01010101,B01010101,B01011111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
+  B11111110,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
+  B11111101,B00000000,B00000000,B00000111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
+  B11111110,B00000111,B11000000,B00000101,B01010101,B01010101,B01010101,B01010101,B01010101,B01011111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
+  B11111100,B00001010,B00100000,B00000110,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
+  B11111110,B00010100,B00010000,B00000101,B00000000,B00000000,B00000111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
+  B11111100,B00101000,B00001000,B00000110,B00000111,B11000000,B00000101,B01010101,B01010101,B01010101,B01010101,B01010101,B01011111,B11111111,B11111111,B11111111,
+  B11111110,B01010100,B00000100,B00000100,B00001010,B00100000,B00000110,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,B11111111,B11111111,B11111111,
+  B11111100,B01100000,B00000100,B00000110,B00010100,B00010000,B00000101,B00000000,B00000000,B00000111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
+  B11111110,B01010000,B00000100,B00000100,B00101000,B00001000,B00000110,B00000111,B11000000,B00000101,B01010101,B01010101,B01010101,B01010101,B01010101,B01011111,
+  B11111100,B01100000,B00000100,B00000110,B01010100,B00000100,B00000100,B00001010,B00100000,B00000110,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,
+  B11111110,B01010100,B00000100,B00011100,B01100000,B00000100,B00000110,B00010100,B00010000,B00000101,B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,
+  B11111100,B00101000,B00001000,B00101110,B01010000,B00000100,B00000100,B00101000,B00001000,B00000110,B00000111,B11000000,B00000000,B00000001,B11110000,B00111111,
+  B11111110,B00010100,B00010000,B01010100,B01100000,B00000100,B00000110,B01010100,B00000100,B00000100,B00001010,B00100000,B00000000,B00000010,B00001000,B00011111,
+  B11111100,B00001010,B00100000,B01100110,B01010100,B00000100,B00011100,B01100000,B00000100,B00000110,B00010100,B00010000,B00000000,B00000101,B00000100,B00111111,
+  B11111110,B00000111,B11000000,B01010100,B00101000,B00001000,B00101110,B01010000,B00000100,B00000100,B00101000,B00001000,B00000000,B00001010,B00000010,B00011111,
+  B11111100,B00000000,B00000000,B00101110,B00010100,B00010000,B01010100,B01100000,B00000100,B00000110,B01010100,B00000100,B00000000,B00010101,B00000001,B00111111,
+  B11111110,B00000000,B00000000,B00011100,B00001010,B00100000,B01100110,B01010100,B00000100,B00011100,B01100000,B00000100,B00000000,B00011000,B00000001,B00011111,
+  B11111100,B00000000,B00000000,B00000110,B00000111,B11000000,B01010100,B00101000,B00001000,B00101110,B01010000,B00000100,B00000000,B00010100,B00000001,B00111111,
+  B11111110,B00000000,B00000000,B00000100,B00000000,B00000000,B00101110,B00010100,B00010000,B01010100,B01100000,B00000100,B00000000,B00011000,B00000001,B00011111,
+  B11111100,B11111111,B11111111,B11111110,B00000000,B00000000,B00011100,B00001010,B00100000,B01100110,B01010100,B00000100,B00011100,B00010101,B00000001,B00111111,
+  B11111110,B11010101,B01010101,B01010100,B00000000,B00000000,B00000110,B00000111,B11000000,B01010100,B00101000,B00001000,B00101010,B00001010,B00000010,B00011111,
+  B11111100,B10000100,B00010000,B01000110,B00000000,B00000000,B00000100,B00000000,B00000000,B00101110,B00010100,B00010000,B01010001,B00000101,B00000100,B00111111,
+  B11111110,B11000100,B00010000,B01000100,B11111111,B11111111,B11111110,B00000000,B00000000,B00011100,B00001010,B00100000,B01100001,B00000010,B10001000,B00011111,
+  B11111100,B10000100,B00010000,B01000110,B11010101,B01010101,B01010100,B00000000,B00000000,B00000110,B00000111,B11000000,B01010001,B00000001,B11110000,B00111111,
+  B11111110,B10000100,B00010000,B01000100,B10000100,B00010000,B01000110,B00000000,B00000000,B00000100,B00000000,B00000000,B00101010,B00000000,B00000000,B00011111,
+  B11111100,B11000100,B00010000,B01000110,B11000100,B00010000,B01000100,B11111111,B11111111,B11111110,B00000000,B00000000,B00011100,B00000000,B00000000,B00111111,
+  B11111110,B10000100,B00010000,B01000100,B10000100,B00010000,B01000110,B11010101,B01010101,B01010100,B00000000,B00000000,B00000000,B00000000,B00000000,B00011111,
+  B11111100,B11010101,B01010101,B01010110,B10000100,B00010000,B01000100,B10000100,B00010000,B01000110,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,
+  B11111100,B11111111,B11111111,B11111100,B11000100,B00010000,B01000110,B11000100,B00010000,B01000100,B11111111,B11111111,B11111111,B11111111,B11111111,B10011111,
+  B11111110,B00000000,B00000000,B00000110,B10000100,B00010000,B01000100,B10000100,B00010000,B01000110,B11010101,B01010101,B01010101,B01010101,B01010101,B10111111,
+  B11111101,B01010101,B01010101,B01010100,B11010101,B01010101,B01010110,B10000100,B00010000,B01000100,B10000100,B00010000,B01000001,B00000100,B00010000,B10011111,
+  B11111111,B11111111,B11111111,B11111100,B11111111,B11111111,B11111100,B11000100,B00010000,B01000110,B11000100,B00010000,B01000001,B00000100,B00010001,B10111111,
+  B11111111,B11111111,B11111111,B11111110,B00000000,B00000000,B00000110,B10000100,B00010000,B01000100,B10000100,B00010000,B01000001,B00000100,B00010000,B10011111,
+  B11111111,B11111111,B11111111,B11111101,B01010101,B01010101,B01010100,B11010101,B01010101,B01010110,B10000100,B00010000,B01000001,B00000100,B00010000,B10011111,
+  B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111100,B11111111,B11111111,B11111100,B11000100,B00010000,B01000001,B00000100,B00010001,B10111111,
+  B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111110,B00000000,B00000000,B00000110,B10000100,B00010000,B01000001,B00000100,B00010000,B10011111,
+  B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111101,B01010101,B01010101,B01010100,B11010101,B01010101,B01010101,B01010101,B01010101,B10111111,
+  B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111100,B11111111,B11111111,B11111111,B11111111,B11111111,B10011111,
+  B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111110,B00000000,B00000000,B00000000,B00000000,B00000000,B00111111,
+  B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111101,B01010101,B01010101,B01010101,B01010101,B01010101,B01011111,
+  B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
+  B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
+  B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
+  B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
+  B11100000,B00101110,B11111011,B01111101,B11111011,B11111011,B11001111,B11000001,B11011111,B10111011,B00111110,B11000000,B11100001,B11111110,B00111100,B00011111,
+  B11111101,B11101110,B01111011,B00111001,B11111001,B11110011,B11001111,B10011110,B11011111,B10111011,B00111110,B11011111,B11011110,B11111100,B11011101,B11100111,
+  B11111101,B11101110,B00111011,B10111011,B11111001,B11101011,B11010111,B10111111,B01011111,B10111011,B01011110,B11011111,B11011110,B11111101,B11101101,B11110111,
+  B11111101,B11101110,B10111011,B11010011,B11111010,B11101011,B10110111,B00111111,B11011111,B10111011,B01001110,B11011111,B11011111,B11111111,B11001101,B11110011,
+  B11111101,B11101110,B11011011,B11000111,B11111010,B11101011,B10111011,B01111111,B11000000,B00111011,B01101110,B11000000,B11100011,B11111111,B00011101,B11110011,
+  B11111101,B11101110,B11001011,B11101111,B11111010,B11011011,B10111011,B01111111,B11011111,B10111011,B01100110,B11011111,B11111000,B11111111,B11001101,B11110011,
+  B11111101,B11101110,B11101011,B11101111,B11111011,B01011011,B00000011,B00111111,B01011111,B10111011,B01110110,B11011111,B11111110,B01111111,B11101101,B11110011,
+  B11111101,B11101110,B11110011,B11101111,B11111011,B01011011,B01111001,B10111110,B11011111,B10111011,B01111010,B11011111,B11011110,B01111101,B11101101,B11110111,
+  B11111101,B11101110,B11110011,B11101111,B11111011,B10111010,B11111101,B10011110,B11011111,B10111011,B01111100,B11011111,B11011110,B11111101,B11001101,B11100111,
+  B11111101,B11101110,B11111011,B11101111,B11111011,B10111010,B11111101,B11000001,B11011111,B10111011,B01111110,B11000000,B11100000,B11111110,B00011100,B00011111
+};

Marlin/_Statusscreen.h

@@ -0,0 +1,74 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * Custom Status Screen bitmap
+ *
+ * Place this file in the root with your configuration files
+ * and enable CUSTOM_STATUS_SCREEN_IMAGE in Configuration.h.
+ *
+ * Use the Marlin Bitmap Converter to make your own:
+ * http://marlinfw.org/tools/u8glib/converter.html
+ */
+
+//
+// Status Screen Logo bitmap
+//
+#define STATUS_LOGO_Y            3
+#define STATUS_LOGO_WIDTH       24
+
+const unsigned char status_logo_bmp[] PROGMEM = {
+  B11111111,B11111111,B11111111,
+  B10000000,B00000000,B00000001,
+  B10001110,B00000000,B11100001,
+  B10011111,B00000001,B11110001,
+  B10010011,B10000001,B00111001,
+  B10011111,B10000001,B11111001,
+  B10011111,B10000001,B11111001,
+  B10011111,B10111001,B11111001,
+  B10001111,B00101000,B11110001,
+  B10000000,B00111000,B00000001,
+  B10000000,B00000000,B00000001,
+  B10011111,B11111111,B11111001,
+  B10010001,B01110100,B10011001,
+  B10011011,B00000110,B10101001,
+  B10011011,B01010100,B10101001,
+  B10011011,B01010110,B10101001,
+  B10011011,B01010100,B10011001,
+  B10011111,B11111111,B11111001,
+  B11111111,B11111111,B11111111
+};
+
+//
+// Use default bitmaps
+//
+#define STATUS_HOTEND_ANIM
+#define STATUS_BED_ANIM
+#if HOTENDS < 2
+  #define STATUS_LOGO_X          8
+  #define STATUS_HEATERS_X      40
+  #define STATUS_BED_X          72
+#else
+  #define STATUS_LOGO_X          0
+  #define STATUS_HEATERS_X      32
+  #define STATUS_BED_X          80
+#endif

Marlin/config.ini

@@ -3,50 +3,10 @@
 # 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
@@ -62,11 +22,6 @@ motherboard                              = BOARD_RAMPS_14_EFB
 serial_port                              = 0
 baudrate                                 = 250000
 
-string_config_h_author                   = "(default from config.ini)"
-
-capabilities_report                      = on
-extended_capabilities_report             = on
-
 use_watchdog                             = on
 thermal_protection_hotends               = on
 thermal_protection_hysteresis            = 4
@@ -82,25 +37,18 @@ temp_sensor_0                            = 1
 temp_hysteresis                          = 3
 heater_0_mintemp                         = 5
 heater_0_maxtemp                         = 275
+preheat_1_temp_hotend                    = 180
 
+bang_max                                 = 255
 pidtemp                                  = on
 pid_k1                                   = 0.95
-pid_max                                  = 255
-pid_functional_range                     = 20
+pid_max                                  = BANG_MAX
+pid_functional_range                     = 10
 
 default_kp                               = 22.20
 default_ki                               = 1.08
 default_kd                               = 114.00
 
-temp_sensor_bed                          = 1
-bed_check_interval                       = 5000
-bed_mintemp                              = 5
-bed_maxtemp                              = 150
-
-thermal_protection_bed                   = on
-thermal_protection_bed_hysteresis        = 2
-thermal_protection_bed_period            = 20
-
 x_driver_type                            = A4988
 y_driver_type                            = A4988
 z_driver_type                            = A4988
@@ -121,9 +69,13 @@ x_home_dir                               = -1
 y_home_dir                               = -1
 z_home_dir                               = -1
 
-x_min_endstop_hit_state                  = HIGH
-y_min_endstop_hit_state                  = HIGH
-z_min_endstop_hit_state                  = HIGH
+use_xmin_plug                            = on
+use_ymin_plug                            = on
+use_zmin_plug                            = on
+
+x_min_endstop_inverting                  = false
+y_min_endstop_inverting                  = false
+z_min_endstop_inverting                  = false
 
 default_axis_steps_per_unit              = { 80, 80, 400, 500 }
 axis_relative_modes                      = { false, false, false, false }
@@ -133,20 +85,25 @@ default_max_acceleration                 = { 3000, 3000, 100, 10000 }
 homing_feedrate_mm_m                     = { (50*60), (50*60), (4*60) }
 homing_bump_divisor                      = { 2, 2, 4 }
 
-x_enable_on                              = LOW
-y_enable_on                              = LOW
-z_enable_on                              = LOW
-e_enable_on                              = LOW
+x_enable_on                              = 0
+y_enable_on                              = 0
+z_enable_on                              = 0
+e_enable_on                              = 0
 
 invert_x_dir                             = false
 invert_y_dir                             = true
 invert_z_dir                             = false
 invert_e0_dir                            = false
 
-step_state_e                             = HIGH
-step_state_x                             = HIGH
-step_state_y                             = HIGH
-step_state_z                             = HIGH
+invert_e_step_pin                        = false
+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
 
 proportional_font_ratio                  = 1.0
 default_nominal_filament_dia             = 1.75
@@ -160,33 +117,30 @@ default_retract_acceleration             = 3000
 default_minimumfeedrate                  = 0.0
 default_mintravelfeedrate                = 0.0
 
+minimum_planner_speed                    = 0.05
 min_steps_per_segment                    = 6
 default_minsegmenttime                   = 20000
 
 [config:basic]
-hotend_overshoot                         = 15
 bed_overshoot                            = 10
-max_bed_power                            = 255
-
 busy_while_heating                       = on
-host_keepalive_feature                   = on
+default_ejerk                            = 5.0
 default_keepalive_interval               = 2
-printjob_timer_autostart                 = on
-
-jd_handle_small_segments                 = on
-validate_homing_endstops                 = on
-editable_steps_per_unit                  = on
-
+default_leveling_fade_height             = 0.0
+disable_inactive_extruder                = on
+display_charset_hd44780                  = JAPANESE
 eeprom_boot_silent                       = on
 eeprom_chitchat                          = on
-
 endstoppullups                           = on
-
-prevent_cold_extrusion                   = on
-extrude_mintemp                          = 170
-prevent_lengthy_extrude                  = on
 extrude_maxlength                        = 200
-
+extrude_mintemp                          = 170
+host_keepalive_feature                   = on
+hotend_overshoot                         = 15
+jd_handle_small_segments                 = on
+lcd_info_screen_style                    = 0
+lcd_language                             = en
+max_bed_power                            = 255
+mesh_inset                               = 0
 min_software_endstops                    = on
 max_software_endstops                    = on
 min_software_endstop_x                   = on
@@ -195,60 +149,63 @@ min_software_endstop_z                   = on
 max_software_endstop_x                   = on
 max_software_endstop_y                   = on
 max_software_endstop_z                   = on
-
-preheat_1_label                          = "PLA"
-preheat_1_temp_hotend                    = 180
-preheat_1_temp_bed                       = 70
 preheat_1_fan_speed                      = 0
-
-preheat_2_label                          = "ABS"
-preheat_2_temp_hotend                    = 240
-preheat_2_temp_bed                       = 110
-preheat_2_fan_speed                      = 0
-
+preheat_1_label                          = "PLA"
+preheat_1_temp_bed                       = 70
+prevent_cold_extrusion                   = on
+prevent_lengthy_extrude                  = on
+printjob_timer_autostart                 = on
+probing_margin                           = 10
+show_bootscreen                          = on
+soft_pwm_scale                           = 0
+string_config_h_author                   = "(none, default config)"
 temp_bed_hysteresis                      = 3
 temp_bed_residency_time                  = 10
 temp_bed_window                          = 1
 temp_residency_time                      = 10
 temp_window                              = 1
+validate_homing_endstops                 = on
+xy_probe_feedrate                        = (133*60)
+z_clearance_between_probes               = 5
+z_clearance_deploy_probe                 = 10
+z_clearance_multi_probe                  = 5
 
 [config:advanced]
 arc_support                              = on
-min_arc_segment_mm                       = 0.1
+auto_report_temperatures                 = on
+autotemp                                 = on
+autotemp_oldweight                       = 0.98
+bed_check_interval                       = 5000
+default_stepper_deactive_time            = 120
+default_volumetric_extruder_limit        = 0.00
+disable_inactive_e                       = true
+disable_inactive_x                       = true
+disable_inactive_y                       = true
+disable_inactive_z                       = true
+e0_auto_fan_pin                          = -1
+encoder_100x_steps_per_sec               = 80
+encoder_10x_steps_per_sec                = 30
+encoder_rate_multiplier                  = on
+extended_capabilities_report             = on
+extruder_auto_fan_speed                  = 255
+extruder_auto_fan_temperature            = 50
+fanmux0_pin                              = -1
+fanmux1_pin                              = -1
+fanmux2_pin                              = -1
+faster_gcode_parser                      = on
+homing_bump_mm                           = { 5, 5, 2 }
 max_arc_segment_mm                       = 1.0
+min_arc_segment_mm                       = 0.1
 min_circle_segments                      = 72
 n_arc_correction                         = 25
-
-auto_report_temperatures                 = on
-
-autotemp                                 = on
-autotemp_min                             = 210
-autotemp_max                             = 250
-autotemp_factor                          = 0.1f
-autotemp_oldweight                       = 0.98
-
-default_stepper_timeout_sec              = 120
-disable_idle_x                           = on
-disable_idle_y                           = on
-disable_idle_z                           = on
-disable_idle_e                           = on
-
-e0_auto_fan_pin                          = -1
-
-faster_gcode_parser                      = on
-debug_flags_gcode                        = on
-
-homing_bump_mm                           = { 5, 5, 2 }
-
+serial_overrun_protection                = on
 slowdown                                 = on
 slowdown_divisor                         = 2
-multistepping_limit                      = 16
-
-serial_overrun_protection                = on
+temp_sensor_bed                          = 0
+thermal_protection_bed_hysteresis        = 2
+thermocouple_max_errors                  = 15
 tx_buffer_size                           = 0
-
-watch_temp_increase                      = 2
-watch_temp_period                        = 40
-
 watch_bed_temp_increase                  = 2
 watch_bed_temp_period                    = 60
+watch_temp_increase                      = 2
+watch_temp_period                        = 20

Marlin/src/HAL/AVR/HAL.cpp

@@ -61,46 +61,23 @@ void save_reset_reason() {
   wdt_disable();
 }
 
-#include "registers.h"
-
-MarlinHAL::MarlinHAL() {
-  TERN_(HAL_AVR_DIRTY_INIT, _ATmega_resetperipherals()); // Clean-wipe the device state.
-}
-
 void MarlinHAL::init() {
   // Init Servo Pins
+  #define INIT_SERVO(N) OUT_WRITE(SERVO##N##_PIN, LOW)
   #if HAS_SERVO_0
-    OUT_WRITE(SERVO0_PIN, LOW);
+    INIT_SERVO(0);
   #endif
   #if HAS_SERVO_1
-    OUT_WRITE(SERVO1_PIN, LOW);
+    INIT_SERVO(1);
   #endif
   #if HAS_SERVO_2
-    OUT_WRITE(SERVO2_PIN, LOW);
+    INIT_SERVO(2);
   #endif
   #if HAS_SERVO_3
-    OUT_WRITE(SERVO3_PIN, LOW);
-  #endif
-  #if HAS_SERVO_4
-    OUT_WRITE(SERVO4_PIN, LOW);
-  #endif
-  #if HAS_SERVO_5
-    OUT_WRITE(SERVO5_PIN, LOW);
+    INIT_SERVO(3);
   #endif
 
   init_pwm_timers();   // Init user timers to default frequency - 1000HZ
-
-  #if PIN_EXISTS(BEEPER) && ENABLED(HAL_AVR_DIRTY_INIT) && DISABLED(ATMEGA_NO_BEEPFIX)
-    // Make sure no alternative is locked onto the BEEPER.
-    // This fixes the issue where the ATmega is constantly beeping.
-    // Might disable other peripherals using the pin; to circumvent that please undefine one of the above things!
-    // The true culprit is the AVR ArduinoCore that enables peripherals redundantly.
-    // (USART1 on the GeeeTech GT2560)
-    // https://www.youtube.com/watch?v=jMgCvRXkexk
-    _ATmega_savePinAlternate(BEEPER_PIN);
-
-    OUT_WRITE(BEEPER_PIN, LOW);
-  #endif
 }
 
 void MarlinHAL::reboot() {
@@ -119,6 +96,7 @@ void MarlinHAL::reboot() {
 #if ENABLED(USE_WATCHDOG)
 
   #include <avr/wdt.h>
+  #include "../../MarlinCore.h"
 
   // Initialize watchdog with 8s timeout, if possible. Otherwise, make it 4s.
   void MarlinHAL::watchdog_init() {
@@ -153,7 +131,7 @@ void MarlinHAL::reboot() {
     ISR(WDT_vect) {
       sei();  // With the interrupt driven serial we need to allow interrupts.
       SERIAL_ERROR_MSG(STR_WATCHDOG_FIRED);
-      marlin.minkill();  // interrupt-safe final kill and infinite loop
+      minkill();  // interrupt-safe final kill and infinite loop
     }
   #endif
 
@@ -167,12 +145,12 @@ void MarlinHAL::reboot() {
 // Free Memory Accessor
 // ------------------------
 
-#if HAS_MEDIA
+#if ENABLED(SDSUPPORT)
 
   #include "../../sd/SdFatUtil.h"
   int freeMemory() { return SdFatUtil::FreeRam(); }
 
-#else // !HAS_MEDIA
+#else // !SDSUPPORT
 
   extern "C" {
     extern char __bss_end;
@@ -189,6 +167,6 @@ void MarlinHAL::reboot() {
     }
   }
 
-#endif // !HAS_MEDIA
+#endif // !SDSUPPORT
 
 #endif // __AVR__

Marlin/src/HAL/AVR/HAL.h

@@ -1,9 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  *
  * 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
@@ -129,11 +127,11 @@ typedef Servo hal_servo_t;
   #endif
 #endif
 
-#ifdef MMU_SERIAL_PORT
-  #if !WITHIN(MMU_SERIAL_PORT, 0, 3)
-    #error "MMU_SERIAL_PORT must be from 0 to 3"
+#ifdef MMU2_SERIAL_PORT
+  #if !WITHIN(MMU2_SERIAL_PORT, 0, 3)
+    #error "MMU2_SERIAL_PORT must be from 0 to 3"
   #endif
-  #define MMU_SERIAL mmuSerial
+  #define MMU2_SERIAL mmuSerial
 #endif
 
 #ifdef LCD_SERIAL_PORT
@@ -141,16 +139,16 @@ typedef Servo hal_servo_t;
     #error "LCD_SERIAL_PORT must be from 0 to 3."
   #endif
   #define LCD_SERIAL lcdSerial
-  #if ANY(HAS_DGUS_LCD, EXTENSIBLE_UI)
-    #define LCD_SERIAL_TX_BUFFER_FREE() LCD_SERIAL.get_tx_buffer_free()
+  #if HAS_DGUS_LCD || ENABLED(DGUS_LCD_UI_CREALITY_TOUCH)
+    #define SERIAL_GET_TX_BUFFER_FREE() LCD_SERIAL.get_tx_buffer_free()
   #endif
 #endif
 
 //
 // ADC
 //
-#define HAL_ADC_VREF_MV   5000
-#define HAL_ADC_RESOLUTION  10
+#define HAL_ADC_VREF        5.0
+#define HAL_ADC_RESOLUTION 10
 
 //
 // Pin Mapping for M42, M43, M226
@@ -159,7 +157,7 @@ typedef Servo hal_servo_t;
 #define GET_PIN_MAP_INDEX(pin) pin
 #define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
 
-#define HAL_SENSITIVE_PINS 0, 1
+#define HAL_SENSITIVE_PINS 0, 1,
 
 #ifdef __AVR_AT90USB1286__
   #define JTAG_DISABLE() do{ MCUCR = 0x80; MCUCR = 0x80; }while(0)
@@ -189,7 +187,7 @@ class MarlinHAL {
 public:
 
   // Earliest possible init, before setup()
-  MarlinHAL();
+  MarlinHAL() {}
 
   // Watchdog
   static void watchdog_init()    IF_DISABLED(USE_WATCHDOG, {});
@@ -204,9 +202,9 @@ public:
   static void isr_on()  { sei(); }
   static void isr_off() { cli(); }
 
-  static void delay_ms(const int ms) { delay(ms); }
+  static void delay_ms(const int ms) { _delay_ms(ms); }
 
-  // Tasks, called from marlin.idle()
+  // Tasks, called from idle()
   static void idletask() {}
 
   // Reset

Marlin/src/HAL/AVR/HAL_SPI.cpp

@@ -119,6 +119,7 @@ void spiBegin() {
     while (!TEST(SPSR, SPIF)) { /* Intentionally left empty */ }
   }
 
+
   /** begin spi transaction */
   void spiBeginTransaction(uint32_t spiClock, uint8_t bitOrder, uint8_t dataMode) {
     // Based on Arduino SPI library
@@ -174,6 +175,7 @@ void spiBegin() {
     SPSR = clockDiv | 0x01;
   }
 
+
 #else // SOFTWARE_SPI || FORCE_SOFT_SPI
 
   // ------------------------
@@ -196,7 +198,7 @@ void spiBegin() {
     // output pin high - like sending 0xFF
     WRITE(SD_MOSI_PIN, HIGH);
 
-    for (uint8_t i = 0; i < 8; ++i) {
+    LOOP_L_N(i, 8) {
       WRITE(SD_SCK_PIN, HIGH);
 
       nop; // adjust so SCK is nice
@@ -223,7 +225,7 @@ void spiBegin() {
   void spiSend(uint8_t data) {
     // no interrupts during byte send - about 8µs
     cli();
-    for (uint8_t i = 0; i < 8; ++i) {
+    LOOP_L_N(i, 8) {
       WRITE(SD_SCK_PIN, LOW);
       WRITE(SD_MOSI_PIN, data & 0x80);
       data <<= 1;

Marlin/src/HAL/AVR/MarlinSerial.cpp

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

Marlin/src/HAL/AVR/MarlinSerial.h

@@ -34,9 +34,12 @@
 #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.
@@ -135,6 +138,10 @@
 
   #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:
@@ -157,7 +164,7 @@
     static constexpr B_U2Xx<Cfg::PORT>   B_U2X   = 0;
 
     // Base size of type on buffer size
-    typedef uvalue_t(Cfg::RX_SIZE - 1) ring_buffer_pos_t;
+    typedef typename TypeSelector<(Cfg::RX_SIZE>256), uint16_t, uint8_t>::type ring_buffer_pos_t;
 
     struct ring_buffer_r {
       volatile ring_buffer_pos_t head, tail;
@@ -205,7 +212,7 @@
     static ring_buffer_pos_t available();
     static void write(const uint8_t c);
     static void flushTX();
-    #if ANY(HAS_DGUS_LCD, EXTENSIBLE_UI)
+    #if HAS_DGUS_LCD || ENABLED(DGUS_LCD_UI_CREALITY_TOUCH)
       static ring_buffer_pos_t get_tx_buffer_free();
     #endif
 
@@ -246,7 +253,7 @@
 
 #endif // !USBCON
 
-#ifdef MMU_SERIAL_PORT
+#ifdef MMU2_SERIAL_PORT
   template <uint8_t serial>
   struct MMU2SerialCfg {
     static constexpr int PORT               = serial;
@@ -260,7 +267,7 @@
     static constexpr bool RX_OVERRUNS       = false;
   };
 
-  typedef Serial1Class< MarlinSerial< MMU2SerialCfg<MMU_SERIAL_PORT> > > MSerialMMU2;
+  typedef Serial1Class< MarlinSerial< MMU2SerialCfg<MMU2_SERIAL_PORT> > > MSerialMMU2;
   extern MSerialMMU2 mmuSerial;
 #endif
 
@@ -276,7 +283,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       = ALL(HAS_DGUS_LCD, SERIAL_STATS_RX_BUFFER_OVERRUNS);
+    static constexpr bool RX_OVERRUNS       = BOTH(HAS_DGUS_LCD, SERIAL_STATS_RX_BUFFER_OVERRUNS);
   };
 
   typedef Serial1Class< MarlinSerial< LCDSerialCfg<LCD_SERIAL_PORT> > > MSerialLCD;

Marlin/src/HAL/AVR/Servo.cpp

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

Marlin/src/HAL/AVR/eeprom.cpp

@@ -23,7 +23,7 @@
 
 #include "../../inc/MarlinConfig.h"
 
-#if ANY(EEPROM_SETTINGS, SD_FIRMWARE_UPDATE)
+#if EITHER(EEPROM_SETTINGS, SD_FIRMWARE_UPDATE)
 
 /**
  * PersistentStore for Arduino-style EEPROM interface
@@ -35,14 +35,14 @@
 #ifndef MARLIN_EEPROM_SIZE
   #define MARLIN_EEPROM_SIZE size_t(E2END + 1)
 #endif
-size_t PersistentStore::capacity()    { return MARLIN_EEPROM_SIZE - eeprom_exclude_size; }
+size_t PersistentStore::capacity()    { return MARLIN_EEPROM_SIZE; }
 bool PersistentStore::access_start()  { return true; }
 bool PersistentStore::access_finish() { return true; }
 
 bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, uint16_t *crc) {
   uint16_t written = 0;
   while (size--) {
-    uint8_t * const p = (uint8_t * const)REAL_EEPROM_ADDR(pos);
+    uint8_t * const p = (uint8_t * const)pos;
     uint8_t v = *value;
     if (v != eeprom_read_byte(p)) { // EEPROM has only ~100,000 write cycles, so only write bytes that have changed!
       eeprom_write_byte(p, v);
@@ -61,7 +61,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
 
 bool PersistentStore::read_data(int &pos, uint8_t *value, size_t size, uint16_t *crc, const bool writing/*=true*/) {
   do {
-    const uint8_t c = eeprom_read_byte((uint8_t*)REAL_EEPROM_ADDR(pos));
+    uint8_t c = eeprom_read_byte((uint8_t*)pos);
     if (writing) *value = c;
     crc16(crc, &c, 1);
     pos++;

Marlin/src/HAL/AVR/endstop_interrupts.h

@@ -91,6 +91,7 @@ void endstop_ISR() { endstops.update(); }
 
 #endif
 
+
 // Install Pin change interrupt for a pin. Can be called multiple times.
 void pciSetup(const int8_t pin) {
   if (digitalPinHasPCICR(pin)) {
@@ -119,7 +120,7 @@ void pciSetup(const int8_t pin) {
 
 void setup_endstop_interrupts() {
   #define _ATTACH(P) attachInterrupt(digitalPinToInterrupt(P), endstop_ISR, CHANGE)
-  #if USE_X_MAX
+  #if HAS_X_MAX
     #if (digitalPinToInterrupt(X_MAX_PIN) != NOT_AN_INTERRUPT)
       _ATTACH(X_MAX_PIN);
     #else
@@ -127,7 +128,7 @@ void setup_endstop_interrupts() {
       pciSetup(X_MAX_PIN);
     #endif
   #endif
-  #if USE_X_MIN
+  #if HAS_X_MIN
     #if (digitalPinToInterrupt(X_MIN_PIN) != NOT_AN_INTERRUPT)
       _ATTACH(X_MIN_PIN);
     #else
@@ -135,7 +136,7 @@ void setup_endstop_interrupts() {
       pciSetup(X_MIN_PIN);
     #endif
   #endif
-  #if USE_Y_MAX
+  #if HAS_Y_MAX
     #if (digitalPinToInterrupt(Y_MAX_PIN) != NOT_AN_INTERRUPT)
       _ATTACH(Y_MAX_PIN);
     #else
@@ -143,7 +144,7 @@ void setup_endstop_interrupts() {
       pciSetup(Y_MAX_PIN);
     #endif
   #endif
-  #if USE_Y_MIN
+  #if HAS_Y_MIN
     #if (digitalPinToInterrupt(Y_MIN_PIN) != NOT_AN_INTERRUPT)
       _ATTACH(Y_MIN_PIN);
     #else
@@ -151,7 +152,7 @@ void setup_endstop_interrupts() {
       pciSetup(Y_MIN_PIN);
     #endif
   #endif
-  #if USE_Z_MAX
+  #if HAS_Z_MAX
     #if (digitalPinToInterrupt(Z_MAX_PIN) != NOT_AN_INTERRUPT)
       _ATTACH(Z_MAX_PIN);
     #else
@@ -159,7 +160,7 @@ void setup_endstop_interrupts() {
       pciSetup(Z_MAX_PIN);
     #endif
   #endif
-  #if USE_Z_MIN
+  #if HAS_Z_MIN
     #if (digitalPinToInterrupt(Z_MIN_PIN) != NOT_AN_INTERRUPT)
       _ATTACH(Z_MIN_PIN);
     #else
@@ -167,97 +168,97 @@ void setup_endstop_interrupts() {
       pciSetup(Z_MIN_PIN);
     #endif
   #endif
-  #if USE_I_MAX
+  #if HAS_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. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
+      static_assert(digitalPinHasPCICR(I_MAX_PIN), "I_MAX_PIN is not interrupt-capable");
       pciSetup(I_MAX_PIN);
     #endif
-  #elif USE_I_MIN
+  #elif HAS_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. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
+      static_assert(digitalPinHasPCICR(I_MIN_PIN), "I_MIN_PIN is not interrupt-capable");
       pciSetup(I_MIN_PIN);
     #endif
   #endif
-  #if USE_J_MAX
+  #if HAS_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. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
+      static_assert(digitalPinHasPCICR(J_MAX_PIN), "J_MAX_PIN is not interrupt-capable");
       pciSetup(J_MAX_PIN);
     #endif
-  #elif USE_J_MIN
+  #elif HAS_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. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
+      static_assert(digitalPinHasPCICR(J_MIN_PIN), "J_MIN_PIN is not interrupt-capable");
       pciSetup(J_MIN_PIN);
     #endif
   #endif
-  #if USE_K_MAX
+  #if HAS_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. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
+      static_assert(digitalPinHasPCICR(K_MAX_PIN), "K_MAX_PIN is not interrupt-capable");
       pciSetup(K_MAX_PIN);
     #endif
-  #elif USE_K_MIN
+  #elif HAS_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. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
+      static_assert(digitalPinHasPCICR(K_MIN_PIN), "K_MIN_PIN is not interrupt-capable");
       pciSetup(K_MIN_PIN);
     #endif
   #endif
-  #if USE_U_MAX
+  #if HAS_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. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
+      static_assert(digitalPinHasPCICR(U_MAX_PIN), "U_MAX_PIN is not interrupt-capable");
       pciSetup(U_MAX_PIN);
     #endif
-  #elif USE_U_MIN
+  #elif HAS_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. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
+      static_assert(digitalPinHasPCICR(U_MIN_PIN), "U_MIN_PIN is not interrupt-capable");
       pciSetup(U_MIN_PIN);
     #endif
   #endif
-  #if USE_V_MAX
+  #if HAS_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. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
+      static_assert(digitalPinHasPCICR(V_MAX_PIN), "V_MAX_PIN is not interrupt-capable");
       pciSetup(V_MAX_PIN);
     #endif
-  #elif USE_V_MIN
+  #elif HAS_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. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
+      static_assert(digitalPinHasPCICR(V_MIN_PIN), "V_MIN_PIN is not interrupt-capable");
       pciSetup(V_MIN_PIN);
     #endif
   #endif
-  #if USE_W_MAX
+  #if HAS_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. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
+      static_assert(digitalPinHasPCICR(W_MAX_PIN), "W_MAX_PIN is not interrupt-capable");
       pciSetup(W_MAX_PIN);
     #endif
-  #elif USE_W_MIN
+  #elif HAS_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. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
+      static_assert(digitalPinHasPCICR(W_MIN_PIN), "W_MIN_PIN is not interrupt-capable");
       pciSetup(W_MIN_PIN);
     #endif
   #endif
-  #if USE_X2_MAX
+  #if HAS_X2_MAX
     #if (digitalPinToInterrupt(X2_MAX_PIN) != NOT_AN_INTERRUPT)
       _ATTACH(X2_MAX_PIN);
     #else
@@ -265,7 +266,7 @@ void setup_endstop_interrupts() {
       pciSetup(X2_MAX_PIN);
     #endif
   #endif
-  #if USE_X2_MIN
+  #if HAS_X2_MIN
     #if (digitalPinToInterrupt(X2_MIN_PIN) != NOT_AN_INTERRUPT)
       _ATTACH(X2_MIN_PIN);
     #else
@@ -273,7 +274,7 @@ void setup_endstop_interrupts() {
       pciSetup(X2_MIN_PIN);
     #endif
   #endif
-  #if USE_Y2_MAX
+  #if HAS_Y2_MAX
     #if (digitalPinToInterrupt(Y2_MAX_PIN) != NOT_AN_INTERRUPT)
       _ATTACH(Y2_MAX_PIN);
     #else
@@ -281,7 +282,7 @@ void setup_endstop_interrupts() {
       pciSetup(Y2_MAX_PIN);
     #endif
   #endif
-  #if USE_Y2_MIN
+  #if HAS_Y2_MIN
     #if (digitalPinToInterrupt(Y2_MIN_PIN) != NOT_AN_INTERRUPT)
       _ATTACH(Y2_MIN_PIN);
     #else
@@ -289,7 +290,7 @@ void setup_endstop_interrupts() {
       pciSetup(Y2_MIN_PIN);
     #endif
   #endif
-  #if USE_Z2_MAX
+  #if HAS_Z2_MAX
     #if (digitalPinToInterrupt(Z2_MAX_PIN) != NOT_AN_INTERRUPT)
       _ATTACH(Z2_MAX_PIN);
     #else
@@ -297,7 +298,7 @@ void setup_endstop_interrupts() {
       pciSetup(Z2_MAX_PIN);
     #endif
   #endif
-  #if USE_Z2_MIN
+  #if HAS_Z2_MIN
     #if (digitalPinToInterrupt(Z2_MIN_PIN) != NOT_AN_INTERRUPT)
       _ATTACH(Z2_MIN_PIN);
     #else
@@ -305,7 +306,7 @@ void setup_endstop_interrupts() {
       pciSetup(Z2_MIN_PIN);
     #endif
   #endif
-  #if USE_Z3_MAX
+  #if HAS_Z3_MAX
     #if (digitalPinToInterrupt(Z3_MAX_PIN) != NOT_AN_INTERRUPT)
       _ATTACH(Z3_MAX_PIN);
     #else
@@ -313,7 +314,7 @@ void setup_endstop_interrupts() {
       pciSetup(Z3_MAX_PIN);
     #endif
   #endif
-  #if USE_Z3_MIN
+  #if HAS_Z3_MIN
     #if (digitalPinToInterrupt(Z3_MIN_PIN) != NOT_AN_INTERRUPT)
       _ATTACH(Z3_MIN_PIN);
     #else
@@ -321,7 +322,7 @@ void setup_endstop_interrupts() {
       pciSetup(Z3_MIN_PIN);
     #endif
   #endif
-  #if USE_Z4_MAX
+  #if HAS_Z4_MAX
     #if (digitalPinToInterrupt(Z4_MAX_PIN) != NOT_AN_INTERRUPT)
       _ATTACH(Z4_MAX_PIN);
     #else
@@ -329,7 +330,7 @@ void setup_endstop_interrupts() {
       pciSetup(Z4_MAX_PIN);
     #endif
   #endif
-  #if USE_Z4_MIN
+  #if HAS_Z4_MIN
     #if (digitalPinToInterrupt(Z4_MIN_PIN) != NOT_AN_INTERRUPT)
       _ATTACH(Z4_MIN_PIN);
     #else
@@ -337,7 +338,7 @@ void setup_endstop_interrupts() {
       pciSetup(Z4_MIN_PIN);
     #endif
   #endif
-  #if USE_Z_MIN_PROBE
+  #if HAS_Z_MIN_PROBE_PIN
     #if (digitalPinToInterrupt(Z_MIN_PROBE_PIN) != NOT_AN_INTERRUPT)
       _ATTACH(Z_MIN_PROBE_PIN);
     #else
@@ -345,14 +346,6 @@ void setup_endstop_interrupts() {
       pciSetup(Z_MIN_PROBE_PIN);
     #endif
   #endif
-  #if USE_CALIBRATION
-    #if (digitalPinToInterrupt(CALIBRATION_PIN) != NOT_AN_INTERRUPT)
-      _ATTACH(CALIBRATION_PIN);
-    #else
-      static_assert(digitalPinHasPCICR(CALIBRATION_PIN), "CALIBRATION_PIN is not interrupt-capable. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
-      pciSetup(CALIBRATION_PIN);
-    #endif
-  #endif
 
   // If we arrive here without raising an assertion, each pin has either an EXT-interrupt or a PCI.
 }

Marlin/src/HAL/AVR/fast_pwm.cpp

@@ -23,10 +23,6 @@
 
 #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
@@ -112,15 +108,12 @@ 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
@@ -128,29 +121,23 @@ 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) / (uint32_t(maxtop) << 11) + 1;      // Start with the lowest non-zero frequency achievable (for 16MHz, 1 or 31)
+    uint16_t f = (F_CPU) / (2 * 1024 * maxtop) + 1;           // Start with the lowest non-zero frequency achievable (1 or 31)
 
-    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);
+    LOOP_L_N(i, COUNT(prescaler)) {                           // Loop through all prescaler values
+      const uint16_t p = prescaler[i];
       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;
       }
@@ -160,27 +147,23 @@ 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) / ((p * res_pc_temp) << 1),
-                     f_diff      = _MAX(f, f_desired) - _MIN(f, f_desired),
+                     f_pc_temp   = (F_CPU) / (2 * p * res_pc_temp);
+      const int      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);
@@ -232,7 +215,7 @@ void MarlinHAL::init_pwm_timers() {
     #endif
   };
 
-  for (uint8_t i = 0; i < COUNT(pwm_pin); ++i)
+  LOOP_L_N(i, COUNT(pwm_pin))
     set_pwm_frequency(pwm_pin[i], 1000);
 }
 

Marlin/src/HAL/AVR/fastio.cpp

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

Marlin/src/HAL/AVR/fastio.h

@@ -255,6 +255,84 @@ 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_PIN || P == MOTOR_CURRENT_PWM_E0_PIN  || P == MOTOR_CURRENT_PWM_E1_PIN || P == MOTOR_CURRENT_PWM_Z_PIN || P == MOTOR_CURRENT_PWM_XY_PIN)
+  #elif PIN_EXISTS(MOTOR_CURRENT_PWM_Z)
+    #define PWM_CHK_MOTOR_CURRENT(P) (P == MOTOR_CURRENT_PWM_E_PIN || P == MOTOR_CURRENT_PWM_E0_PIN  || P == MOTOR_CURRENT_PWM_E1_PIN || P == MOTOR_CURRENT_PWM_Z_PIN)
+  #else
+    #define PWM_CHK_MOTOR_CURRENT(P) (P == MOTOR_CURRENT_PWM_E_PIN || P == MOTOR_CURRENT_PWM_E0_PIN  || P == MOTOR_CURRENT_PWM_E1_PIN)
+  #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

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

@@ -27,41 +27,43 @@
  *   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         0
-#define TXD         1
+#define RXD         DIO0
+#define TXD         DIO1
 
 // SPI
-#define MISO        50
-#define MOSI        51
-#define SCK         52
-#define SS          53
+#define SCK         DIO52
+#define MISO        DIO50
+#define MOSI        DIO51
+#define SS          DIO53
 
 // TWI (I2C)
-#define SCL         21
-#define SDA         20
+#define SCL         DIO21
+#define SDA         DIO20
 
 // Timers and PWM
-#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
+#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
 
 // Digital I/O
 

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

@@ -30,29 +30,32 @@
 
 #include "../fastio.h"
 
+// change for your board
+#define DEBUG_LED   DIO46
+
 // UART
-#define RXD         0
-#define TXD         1
+#define RXD         DIO0
+#define TXD         DIO1
 
 // SPI
-#define SCK         10
-#define MISO        12
-#define MOSI        11
-#define SS          16
+#define SCK         DIO10
+#define MISO        DIO12
+#define MOSI        DIO11
+#define SS          DIO16
 
 // TWI (I2C)
-#define SCL         17
-#define SDA         18
+#define SCL         DIO17
+#define SDA         DIO18
 
 // Timers and PWM
-#define OC0A        9
-#define OC0B        4
-#define OC1A        7
-#define OC1B        8
-#define OC2A        6
-#define OC3A        5
-#define OC3B        2
-#define OC3C        3
+#define OC0A        DIO9
+#define OC0B        DIO4
+#define OC1A        DIO7
+#define OC1B        DIO8
+#define OC2A        DIO6
+#define OC3A        DIO5
+#define OC3B        DIO2
+#define OC3C        DIO3
 
 // Digital I/O
 

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

@@ -30,27 +30,29 @@
 
 #include "../fastio.h"
 
+#define DEBUG_LED   AIO5
+
 // UART
-#define RXD         0
-#define TXD         1
+#define RXD         DIO0
+#define TXD         DIO1
 
 // SPI
-#define SS          10
-#define MOSI        11
-#define MISO        12
-#define SCK         13
+#define SCK         DIO13
+#define MISO        DIO12
+#define MOSI        DIO11
+#define SS          DIO10
 
 // TWI (I2C)
 #define SCL         AIO5
 #define SDA         AIO4
 
 // Timers and PWM
-#define OC0A        6
-#define OC0B        5
-#define OC1A        9
-#define OC1B        10
-#define OC2A        11
-#define OC2B        3
+#define OC0A        DIO6
+#define OC0B        DIO5
+#define OC1A        DIO9
+#define OC1B        DIO10
+#define OC2A        DIO11
+#define OC2B        DIO3
 
 // Digital I/O
 

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

@@ -56,32 +56,34 @@
 
 #include "../fastio.h"
 
-// UART
-#define RXD         8
-#define TXD         9
-#define RXD0        8
-#define TXD0        9
+#define DEBUG_LED   DIO0
 
-#define RXD1        10
-#define TXD1        11
+// UART
+#define RXD         DIO8
+#define TXD         DIO9
+#define RXD0        DIO8
+#define TXD0        DIO9
+
+#define RXD1        DIO10
+#define TXD1        DIO11
 
 // SPI
-#define SS          4
-#define MOSI        5
-#define MISO        6
-#define SCK         7
+#define SCK         DIO7
+#define MISO        DIO6
+#define MOSI        DIO5
+#define SS          DIO4
 
 // TWI (I2C)
-#define SCL         16
-#define SDA         17
+#define SCL         DIO16
+#define SDA         DIO17
 
 // Timers and PWM
-#define OC0A        3
-#define OC0B        4
-#define OC1A        13
-#define OC1B        12
-#define OC2A        15
-#define OC2B        14
+#define OC0A        DIO3
+#define OC0B        DIO4
+#define OC1A        DIO13
+#define OC1B        DIO12
+#define OC2A        DIO15
+#define OC2B        DIO14
 
 // Digital I/O
 

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

@@ -26,16 +26,19 @@
  *
  *   Logical Pin: 28 29 30 31 32 33 34 35 20 21 22 23 24 25 26 27 10 11 12 13 14 15 16 17 00 01 02 03 04 05 06 07 08 09(46*47)36 37 18 19 38 39 40 41 42 43 44 45
  *   Port:        A0 A1 A2 A3 A4 A5 A6 A7 B0 B1 B2 B3 B4 B5 B6 B7 C0 C1 C2 C3 C4 C5 C6 C7 D0 D1 D2 D3 D4 D5 D6 D7 E0 E1 E2 E3 E4 E5 E6 E7 F0 F1 F2 F3 F4 F5 F6 F7
- *            Logical pins 46-47 aren't supported by Teensyduino, but are supported below as E2 and E3
+ *            The logical pins 46 and 47 are not supported by Teensyduino, but are supported below as E2 and E3
  */
 
 #include "../fastio.h"
 
+// change for your board
+#define DEBUG_LED   DIO31 /* led D5 red */
+
 // SPI
-#define SS          20  //  8
-#define SCK         21  //  9
-#define MOSI        22  // 10
-#define MISO        23  // 11
+#define SCK         DIO21  //  9
+#define MISO        DIO23  // 11
+#define MOSI        DIO22  // 10
+#define SS          DIO20  //  8
 
 // Digital I/O
 
@@ -363,11 +366,8 @@
 #define AIO7_PWM    0
 #define AIO7_DDR    DDRF
 
-//-- 46-47 are not supported by Teensyduino
-//-- Don't use Arduino functions (pinMode, digitalWrite, etc.) on these pins
-#define PIN_E2   46
-#define PIN_E3   47
-
+//-- Begin not supported by Teensyduino
+//-- don't use Arduino functions on these pins pinMode/digitalWrite/etc
 #define DIO46_PIN   PINE2
 #define DIO46_RPORT PINE
 #define DIO46_WPORT PORTE
@@ -380,7 +380,10 @@
 #define DIO47_PWM   0
 #define DIO47_DDR   DDRE
 
-//--
+#define TEENSY_E2   46
+#define TEENSY_E3   47
+
+//-- end not supported by Teensyduino
 
 #undef PA0
 #define PA0_PIN     PINA0
@@ -676,6 +679,7 @@
 #define PF7_PWM     0
 #define PF7_DDR     DDRF
 
+
 /**
  * Some of the pin mapping functions of the Teensduino extension to the Arduino IDE
  * do not function the same as the other Arduino extensions.

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

@@ -21,6 +21,6 @@
  */
 #pragma once
 
-#ifndef SERIAL_PORT
-  #define SERIAL_PORT 0
+#if HAS_SPI_TFT || HAS_FSMC_TFT
+  #error "Sorry! TFT displays are not available for HAL/AVR."
 #endif

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

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

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

@@ -25,21 +25,17 @@
  * 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
  */
 #define CHECK_SERIAL_PIN(N) ( \
-     X_STOP_PIN == N || Y_STOP_PIN == N || Z_STOP_PIN  == N \
-  || X_MIN_PIN  == N || Y_MIN_PIN  == N || Z_MIN_PIN   == N \
-  || X_MAX_PIN  == N || Y_MAX_PIN  == N || Z_MAX_PIN   == N \
-  || 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 || LCD_PINS_EN == N \
+     X_STOP_PIN == N || Y_STOP_PIN == N || Z_STOP_PIN == N \
+  || X_MIN_PIN  == N || Y_MIN_PIN  == N || Z_MIN_PIN  == N \
+  || X_MAX_PIN  == N || Y_MAX_PIN  == N || Z_MAX_PIN  == N \
+  || 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 \
 )
 #if SERIAL_IN_USE(0)
   // D0-D1. No known conflicts.
@@ -73,8 +69,8 @@
 /**
  * Checks for SOFT PWM
  */
-#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)."
+#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)."
   #error "Disable SPEAKER or enable FAN_SOFT_PWM."
 #endif
 
@@ -95,11 +91,11 @@
 /**
  * The Trinamic library includes SoftwareSerial.h, leading to a compile error.
  */
-#if ALL(HAS_TMC_SW_SERIAL, ENDSTOP_INTERRUPTS_FEATURE)
+#if BOTH(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 ALL(HAS_TMC_SW_SERIAL, MONITOR_DRIVER_STATUS)
+#if BOTH(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
 

Marlin/src/HAL/AVR/math.h

@@ -84,26 +84,32 @@ FORCE_INLINE static uint16_t MultiU24X32toH16(uint32_t longIn1, uint32_t longIn2
   return intRes;
 }
 
-// charRes = charIn1 * charIn2 >> 8
+// intRes = intIn1 * intIn2 >> 8
 // uses:
-// r1, r0 for the result of mul. After the mul, r0 holds bits 0-7 of the 16 bit result,
-//        and the top bit of r0 is used for rounding.
-// [charRes] is bits 8-15 and is the returned value.
+// 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.
-// [charIn2] is an 8 bit parameter.
+// [intIn2] (B A) is a 16 bit parameter.
 //
-FORCE_INLINE static uint8_t MultiU8X8toH8(uint8_t charIn1, uint8_t charIn2) {
-  uint8_t charRes;
+FORCE_INLINE static uint16_t MultiU8X16toH16(uint8_t charIn1, uint16_t intIn2) {
+  uint8_t tmp;
+  uint16_t intRes;
   __asm__ __volatile__ (
-    A("mul %[charIn1], %[charIn2]")
-    A("mov %[charRes], r1")
-    A("clr r1")
+    A("clr %[tmp]")
+    A("mul %[charIn1], %B[intIn2]")
+    A("movw %A[intRes], r0")
+    A("mul %[charIn1], %A[intIn2]")
     A("lsl r0")
-    A("adc %[charRes], r1")
-      : [charRes] "=&r" (charRes)
+    A("adc %A[intRes], r1")
+    A("adc %B[intRes], %[tmp]")
+    A("clr r1")
+      : [intRes] "=&r" (intRes),
+        [tmp] "=&r" (tmp)
       : [charIn1] "d" (charIn1),
-        [charIn2] "d" (charIn2)
+        [intIn2] "d" (intIn2)
       : "cc"
   );
-  return charRes;
+  return intRes;
 }

Marlin/src/HAL/AVR/pinsDebug.h

@@ -22,23 +22,7 @@
 #pragma once
 
 /**
- * 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)
+ * PWM print routines for Atmel 8 bit AVR CPUs
  */
 
 #include "../../inc/MarlinConfig.h"
@@ -55,56 +39,55 @@
   #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 getValidPinMode(P) (*portModeRegister(P) & digitalPinToBitMask_DEBUG(P))
+  #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))
 
 #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 getValidPinMode(pin_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 GET_PINMODE(int8_t pin) {return *portModeRegister(digitalPinToPort_DEBUG(pin)) & digitalPinToBitMask_DEBUG(pin); }
 
 #else
 
-  #define digitalPinToTimer_DEBUG(P) digitalPinToTimer(P)
-  #define digitalPinToBitMask_DEBUG(P) digitalPinToBitMask(P)
-  #define digitalPinToPort_DEBUG(P) digitalPinToPort(P)
-  bool getValidPinMode(pin_t pin) {return *portModeRegister(digitalPinToPort_DEBUG(pin)) & digitalPinToBitMask_DEBUG(pin); }
-  #define getPinByIndex(x) pgm_read_byte(&pin_array[x].pin)
+  #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)
 
 #endif
 
-#define isValidPin(P) (P >= 0 && P < NUMBER_PINS_TOTAL)
+#define VALID_PIN(pin) (pin >= 0 && pin < NUM_DIGITAL_PINS ? 1 : 0)
 #if AVR_ATmega1284_FAMILY
-  #define isAnalogPin(P) WITHIN(P, analogInputToDigitalPin(7), analogInputToDigitalPin(0))
-  #define digitalPinToAnalogIndex(P) int(isAnalogPin(P) ? (P) - analogInputToDigitalPin(7) : -1)
+  #define DIGITAL_PIN_TO_ANALOG_PIN(P) int(analogInputToDigitalPin(0) - (P))
+  #define IS_ANALOG(P) ((P) >= analogInputToDigitalPin(7) && (P) <= analogInputToDigitalPin(0))
 #else
-  #define _ANALOG1(P) WITHIN(P, analogInputToDigitalPin(0), analogInputToDigitalPin(7))
-  #define _ANALOG2(P) WITHIN(P, analogInputToDigitalPin(8), analogInputToDigitalPin(15))
-  #define isAnalogPin(P) (_ANALOG1(P) || _ANALOG2(P))
-  #define digitalPinToAnalogIndex(P) int(_ANALOG1(P) ? (P) - analogInputToDigitalPin(0) : _ANALOG2(P) ? (P) - analogInputToDigitalPin(8) + 8 : -1)
+  #define DIGITAL_PIN_TO_ANALOG_PIN(P) int((P) - analogInputToDigitalPin(0))
+  #define IS_ANALOG(P) ((P) >= analogInputToDigitalPin(0) && ((P) <= analogInputToDigitalPin(15) || (P) <= analogInputToDigitalPin(7)))
 #endif
-#define getPinByIndex(x) pgm_read_byte(&pin_array[x].pin)
+#define GET_ARRAY_PIN(p) pgm_read_byte(&pin_array[p].pin)
 #define MULTI_NAME_PAD 26 // space needed to be pretty if not first name assigned to a pin
 
-void printPinNameByIndex(const uint8_t index) {
-  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) {
+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) {
     char temp_char = pgm_read_byte(name_mem_pointer + y);
     if (temp_char != 0)
       SERIAL_CHAR(temp_char);
     else {
-      for (uint8_t i = 0; i < MAX_NAME_LENGTH - y; ++i) SERIAL_CHAR(' ');
+      LOOP_L_N(i, MAX_NAME_LENGTH - y) SERIAL_CHAR(' ');
       break;
     }
   }
 }
 
-#define getPinIsDigitalByIndex(x)   pgm_read_byte(&pin_array[x].is_digital)
+#define GET_ARRAY_IS_DIGITAL(x)   pgm_read_byte(&pin_array[x].is_digital)
+
 
 #if defined(__AVR_ATmega1284P__)  // 1284 IDE extensions set this to the number of
   #undef NUM_DIGITAL_PINS         // digital only pins while all other CPUs have it
@@ -125,7 +108,7 @@ void printPinNameByIndex(const uint8_t index) {
  * Print a pin's PWM status.
  * Return true if it's currently a PWM pin.
  */
-bool pwm_status(const uint8_t pin) {
+static bool pwm_status(uint8_t pin) {
   char buffer[20];   // for the sprintf statements
 
   switch (digitalPinToTimer_DEBUG(pin)) {
@@ -179,6 +162,7 @@ bool pwm_status(const uint8_t pin) {
   SERIAL_ECHO_SP(2);
 } // pwm_status
 
+
 const volatile uint8_t* const PWM_other[][3] PROGMEM = {
     { &TCCR0A, &TCCR0B, &TIMSK0 },
     { &TCCR1A, &TCCR1B, &TIMSK1 },
@@ -196,6 +180,7 @@ const volatile uint8_t* const PWM_other[][3] PROGMEM = {
   #endif
 };
 
+
 const volatile uint8_t* const PWM_OCR[][3] PROGMEM = {
 
   #ifdef TIMER0A
@@ -231,6 +216,7 @@ const volatile uint8_t* const PWM_OCR[][3] PROGMEM = {
   #endif
 };
 
+
 #define TCCR_A(T)   pgm_read_word(&PWM_other[T][0])
 #define TCCR_B(T)   pgm_read_word(&PWM_other[T][1])
 #define TIMSK(T)    pgm_read_word(&PWM_other[T][2])
@@ -245,12 +231,12 @@ const volatile uint8_t* const PWM_OCR[][3] PROGMEM = {
 
 #define OCR_VAL(T, L)   pgm_read_word(&PWM_OCR[T][L])
 
-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); }
+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 com_print(const uint8_t N, const uint8_t Z) {
+inline 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);
@@ -292,7 +278,7 @@ void timer_prefix(uint8_t T, char L, uint8_t N) {  // T - timer    L - pwm  N -
   if (TEST(*TMSK, TOIE)) err_prob_interrupt();
 }
 
-void printPinPWM(const uint8_t pin) {
+static void pwm_details(uint8_t pin) {
   switch (digitalPinToTimer_DEBUG(pin)) {
 
     #if ABTEST(0)
@@ -363,46 +349,52 @@ void printPinPWM(const uint8_t pin) {
   #else
     UNUSED(print_is_also_tied);
   #endif
-} // printPinPWM
+} // pwm_details
 
 #ifndef digitalRead_mod                   // Use Teensyduino's version of digitalRead - it doesn't disable the PWMs
-  int digitalRead_mod(const pin_t pin) {  // same as digitalRead except the PWM stop section has been removed
+  int digitalRead_mod(const int8_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
 
-void printPinPort(const pin_t pin) {   // print port number
-  #ifdef digitalPinToPort_DEBUG
-    uint8_t x;
-    SERIAL_ECHOPGM("  Port: ");
-    #if AVR_AT90USB1286_FAMILY
-      x = (pin == PIN_E2 || pin == PIN_E3) ? 'E' : 'A' + digitalPinToPort_DEBUG(pin) - 1;
-    #else
-      x = 'A' + digitalPinToPort_DEBUG(pin) - 1;
-    #endif
-    SERIAL_CHAR(x);
+#ifndef PRINT_PORT
 
-    #if AVR_AT90USB1286_FAMILY
-      if (pin == PIN_E2)
-        x = '2';
-      else if (pin == PIN_E3)
-        x = '3';
-      else {
+  void print_port(int8_t pin) {   // print port number
+    #ifdef digitalPinToPort_DEBUG
+      uint8_t x;
+      SERIAL_ECHOPGM("  Port: ");
+      #if AVR_AT90USB1286_FAMILY
+        x = (pin == 46 || pin == 47) ? 'E' : digitalPinToPort_DEBUG(pin) + 64;
+      #else
+        x = digitalPinToPort_DEBUG(pin) + 64;
+      #endif
+      SERIAL_CHAR(x);
+
+      #if AVR_AT90USB1286_FAMILY
+        if (pin == 46)
+          x = '2';
+        else if (pin == 47)
+          x = '3';
+        else {
+          uint8_t temp = digitalPinToBitMask_DEBUG(pin);
+          for (x = '0'; x < '9' && temp != 1; x++) temp >>= 1;
+        }
+      #else
         uint8_t temp = digitalPinToBitMask_DEBUG(pin);
         for (x = '0'; x < '9' && temp != 1; x++) temp >>= 1;
-      }
+      #endif
+      SERIAL_CHAR(x);
     #else
-      uint8_t temp = digitalPinToBitMask_DEBUG(pin);
-      for (x = '0'; x < '9' && temp != 1; x++) temp >>= 1;
+      SERIAL_ECHO_SP(10);
     #endif
-    SERIAL_CHAR(x);
-  #else
-    SERIAL_ECHO_SP(10);
-  #endif
-}
+  }
 
-#define printPinNumber(P) do{ sprintf_P(buffer, PSTR("%3d "), P); SERIAL_ECHO(buffer); }while(0)
-#define printPinAnalog(P) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), digitalPinToAnalogIndex(P)); SERIAL_ECHO(buffer); }while(0)
+  #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)
 
 #undef ABTEST

Marlin/src/HAL/AVR/pinsDebug_Teensyduino.h

@@ -22,10 +22,11 @@
 #pragma once
 
 //
-// Some of the pin mapping functions of the Arduino IDE Teensduino extension
-// function differently from other Arduino extensions.
+//  some of the pin mapping functions of the Teensduino extension to the Arduino IDE
+//  do not function the same as the other Arduino extensions
 //
 
+
 #define TEENSYDUINO_IDE
 
 //digitalPinToTimer(pin) function works like Arduino but Timers are not defined
@@ -47,6 +48,8 @@
 #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
@@ -98,11 +101,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

Marlin/src/HAL/AVR/pinsDebug_plus_70.h

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

Marlin/src/HAL/AVR/registers.cpp

@@ -1,979 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2023 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-#ifdef __AVR__
-
-#include "../../inc/MarlinConfigPre.h"
-
-#if ENABLED(HAL_AVR_DIRTY_INIT)
-
-#include "registers.h"
-
-// Since the compiler could be creating multiple copies of function code-graphs for each header inline-inclusion,
-// we want to off-load the function definitions that define static memory into this solitary compilation unit.
-// This way the ROM is NOT bloated (who knows if the compiler is optimizing same-content constant objects into one?)
-
-ATmegaPinFunctions _ATmega_getPinFunctions(int pin) {
-  if (pin < 0) return {};
-
-  ATmegaPinInfo info = _ATmega_getPinInfo((unsigned int)pin);
-
-  #ifdef __AVR_TRM01__
-    if (info.port == eATmegaPort::PORT_A) {
-      if (info.pinidx == 7) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EXTMEM_AD7 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 6) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EXTMEM_AD6 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 5) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EXTMEM_AD5 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 4) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EXTMEM_AD4 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 3) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EXTMEM_AD3 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 2) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EXTMEM_AD2 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 1) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EXTMEM_AD1 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 0) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EXTMEM_AD0 };
-        return { funcs, countof(funcs) };
-      }
-    }
-    else if (info.port == eATmegaPort::PORT_B) {
-      if (info.pinidx == 7) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TOC0A, eATmegaPinFunc::TOC1C, eATmegaPinFunc::PCI7 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 6) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TOC1B, eATmegaPinFunc::PCI6 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 5) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TOC1A, eATmegaPinFunc::PCI5 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 4) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TOC2A, eATmegaPinFunc::PCI4 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 3) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::SPI_MISO, eATmegaPinFunc::PCI3 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 2) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::SPI_MOSI, eATmegaPinFunc::PCI2 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 1) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::SPI_SCK, eATmegaPinFunc::PCI1 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 0) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::SPI_CS, eATmegaPinFunc::PCI0 };
-        return { funcs, countof(funcs) };
-      }
-    }
-    else if (info.port == eATmegaPort::PORT_C) {
-      if (info.pinidx == 7) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EXTMEM_AD15 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 6) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EXTMEM_AD14 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 5) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EXTMEM_AD13 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 4) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EXTMEM_AD12 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 3) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EXTMEM_AD11 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 2) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EXTMEM_AD10 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 1) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EXTMEM_AD9 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 0) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EXTMEM_AD8 };
-        return { funcs, countof(funcs) };
-      }
-    }
-    else if (info.port == eATmegaPort::PORT_D) {
-      if (info.pinidx == 7) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TIMER0_CLKI };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 6) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TIMER1_CLKI };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 5) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::USART1_CLK };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 4) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TIMER1_ICP };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 3) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EINT3, eATmegaPinFunc::USART1_TXD };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 2) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EINT2, eATmegaPinFunc::USART1_RXD };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 1) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EINT1, eATmegaPinFunc::TWI_SDA };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 0) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EINT0, eATmegaPinFunc::TWI_CLK };
-        return { funcs, countof(funcs) };
-      }
-    }
-    else if (info.port == eATmegaPort::PORT_E) {
-      if (info.pinidx == 7) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EINT7, eATmegaPinFunc::TIMER3_ICP, eATmegaPinFunc::CLKO };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 6) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EINT6, eATmegaPinFunc::TIMER3_CLKI };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 5) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EINT5, eATmegaPinFunc::TOC3C };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 4) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EINT4, eATmegaPinFunc::TOC3B };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 3) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::AIN1, eATmegaPinFunc::TOC3A };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 2) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::AIN0, eATmegaPinFunc::USART0_CLK };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 1) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::PDO, eATmegaPinFunc::USART0_TXD };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 0) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::PDI, eATmegaPinFunc::USART0_RXD, eATmegaPinFunc::PCI8 };
-        return { funcs, countof(funcs) };
-      }
-    }
-    else if (info.port == eATmegaPort::PORT_F) {
-      if (info.pinidx == 7) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::ADC7 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 6) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::ADC6 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 5) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::ADC5 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 4) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::ADC4 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 3) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::ADC3 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 2) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::ADC2 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 1) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::ADC1 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 0) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::ADC0 };
-        return { funcs, countof(funcs) };
-      }
-    }
-    else if (info.port == eATmegaPort::PORT_G) {
-      if (info.pinidx == 5) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TOC0B };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 4) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TOSC1 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 3 ) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TOSC2 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 2) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EXTMEM_ALE };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 1) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EXTMEM_RD };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 0) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EXTMEM_WR };
-        return { funcs, countof(funcs) };
-      }
-    }
-    else if (info.port == eATmegaPort::PORT_H) {
-      if (info.pinidx == 7) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TIMER4_CLKI };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 6) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TOC2B };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 5) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TOC4C };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 4) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TOC4B };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 3) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TOC4A };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 2) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::USART2_CLK };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 1) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::USART2_TXD };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 0) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::USART2_RXD };
-        return { funcs, countof(funcs) };
-      }
-    }
-    else if (info.port == eATmegaPort::PORT_J) {
-      if (info.pinidx == 6) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::PCI15 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 5) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::PCI14 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 4) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::PCI13 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 3) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::PCI12 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 2) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::USART3_CLK, eATmegaPinFunc::PCI11 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 1) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::USART3_TXD, eATmegaPinFunc::PCI10 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 0) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::USART3_RXD, eATmegaPinFunc::PCI9 };
-        return { funcs, countof(funcs) };
-      }
-    }
-    else if (info.port == eATmegaPort::PORT_K) {
-      if (info.pinidx == 7) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::ADC15, eATmegaPinFunc::PCI23 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 6) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::ADC14, eATmegaPinFunc::PCI22 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 5) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::ADC13, eATmegaPinFunc::PCI21 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 4) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::ADC12, eATmegaPinFunc::PCI20 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 3) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::ADC11, eATmegaPinFunc::PCI19 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 2) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::ADC10, eATmegaPinFunc::PCI18 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 1) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::ADC9, eATmegaPinFunc::PCI17 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 0) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::ADC8, eATmegaPinFunc::PCI16 };
-        return { funcs, countof(funcs) };
-      }
-    }
-    else if (info.port == eATmegaPort::PORT_L) {
-      if (info.pinidx == 5) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TOC5C };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 4) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TOC5B };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 3) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TOC5A };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 2) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TIMER5_CLKI };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 1) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TIMER5_ICP };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 0) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TIMER4_ICP };
-        return { funcs, countof(funcs) };
-      }
-    }
-  #elif defined(__AVR_TRM02__)
-    if (info.port == eATmegaPort::PORT_A) {
-      if (info.pinidx == 7) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::PCI7, eATmegaPinFunc::ADC7 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 6) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::PCI6, eATmegaPinFunc::ADC6 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 5) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::PCI5, eATmegaPinFunc::ADC5 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 4) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::PCI4, eATmegaPinFunc::ADC4 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 3) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::PCI3, eATmegaPinFunc::ADC3 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 2) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::PCI2, eATmegaPinFunc::ADC2 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 1) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::PCI1, eATmegaPinFunc::ADC1 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 0) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::PCI0, eATmegaPinFunc::ADC0 };
-        return { funcs, countof(funcs) };
-      }
-    }
-    else if (info.port == eATmegaPort::PORT_B) {
-      if (info.pinidx == 7) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::SPI_SCK, eATmegaPinFunc::TOC3B, eATmegaPinFunc::PCI15 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 6) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::SPI_MISO, eATmegaPinFunc::TOC3A, eATmegaPinFunc::PCI14 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 5) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::SPI_MOSI, eATmegaPinFunc::TIMER3_ICP, eATmegaPinFunc::PCI13 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 4) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::SPI_CS, eATmegaPinFunc::TOC0B, eATmegaPinFunc::PCI12 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 3) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::AIN1, eATmegaPinFunc::TOC0A, eATmegaPinFunc::PCI11 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 2) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::AIN0, eATmegaPinFunc::EINT2, eATmegaPinFunc::PCI10 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 1) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TIMER1_ECI, eATmegaPinFunc::CLKO, eATmegaPinFunc::PCI9 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 0) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TIMER0_ECI, eATmegaPinFunc::USART0_CLK, eATmegaPinFunc::PCI8 };
-        return { funcs, countof(funcs) };
-      }
-    }
-    else if (info.port == eATmegaPort::PORT_C) {
-      if (info.pinidx == 7) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TOSC2, eATmegaPinFunc::PCI23 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 6) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TOSC1, eATmegaPinFunc::PCI22 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 5) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::PCI21 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 4) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::PCI20 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 3) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::PCI19 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 2) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::PCI18 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 1) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::PCI17, eATmegaPinFunc::TWI_SDA };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 0) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TWI_CLK, eATmegaPinFunc::PCI16 };
-        return { funcs, countof(funcs) };
-      }
-    }
-    else if (info.port == eATmegaPort::PORT_D) {
-      if (info.pinidx == 7) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TOC2A, eATmegaPinFunc::PCI31 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 6) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TIMER1_ICP, eATmegaPinFunc::TOC2B, eATmegaPinFunc::PCI30 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 5) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TOC1A, eATmegaPinFunc::PCI29 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 4) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TOC1B, eATmegaPinFunc::USART1_CLK, eATmegaPinFunc::PCI28 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 3) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EINT1, eATmegaPinFunc::USART1_TXD, eATmegaPinFunc::PCI27 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 2) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EINT0, eATmegaPinFunc::USART1_RXD, eATmegaPinFunc::PCI26 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 1) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::USART0_TXD, eATmegaPinFunc::PCI25 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 0) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::USART0_TXD, eATmegaPinFunc::PCI24, eATmegaPinFunc::TIMER3_ECI };
-        return { funcs, countof(funcs) };
-      }
-    }
-  #elif defined(__AVR_TRM03__)
-    if (info.port == eATmegaPort::PORT_B) {
-      if (info.pinidx == 7) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::XTAL2, eATmegaPinFunc::TOSC2, eATmegaPinFunc::PCI7 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 6) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::XTAL1, eATmegaPinFunc::TOSC1, eATmegaPinFunc::PCI6 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 5) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::SPI_SCK, eATmegaPinFunc::PCI5 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 4) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::SPI_MISO, eATmegaPinFunc::PCI4 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 3) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::SPI_MOSI, eATmegaPinFunc::TOC2A, eATmegaPinFunc::PCI3 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 2) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::SPI_CS, eATmegaPinFunc::TOC1B, eATmegaPinFunc::PCI2 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 1) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TOC1A, eATmegaPinFunc::PCI1 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 0) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TIMER1_ICP, eATmegaPinFunc::CLKO, eATmegaPinFunc::PCI0 };
-        return { funcs, countof(funcs) };
-      }
-    }
-    else if (info.port == eATmegaPort::PORT_C) {
-      if (info.pinidx == 6) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::PCI14 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 5) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::ADC5, eATmegaPinFunc::TWI_CLK, eATmegaPinFunc::PCI13 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 4) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::ADC4, eATmegaPinFunc::TWI_SDA, eATmegaPinFunc::PCI12 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 3) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::ADC3, eATmegaPinFunc::PCI11 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 2) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::ADC2, eATmegaPinFunc::PCI10 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 1) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::ADC1, eATmegaPinFunc::PCI9 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 0) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::ADC0, eATmegaPinFunc::PCI8 };
-        return { funcs, countof(funcs) };
-      }
-    }
-    else if (info.port == eATmegaPort::PORT_D) {
-      if (info.pinidx == 7) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::AIN1, eATmegaPinFunc::PCI23 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 6) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::AIN0, eATmegaPinFunc::TOC0A, eATmegaPinFunc::PCI22 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 5) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TIMER1_ECI, eATmegaPinFunc::TOC0B, eATmegaPinFunc::PCI21 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 4) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::USART_CLK, eATmegaPinFunc::TIMER0_ECI, eATmegaPinFunc::PCI20 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 3) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EINT1, eATmegaPinFunc::TOC2B, eATmegaPinFunc::PCI19 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 2) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EINT0, eATmegaPinFunc::PCI18 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 1) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::USART_TXD, eATmegaPinFunc::PCI17 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 0) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::USART_RXD, eATmegaPinFunc::PCI16 };
-        return { funcs, countof(funcs) };
-      }
-    }
-  #elif defined(__AVR_TRM04__)
-    if (info.port == eATmegaPort::PORT_A) {
-      if (info.pinidx == 7) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EXTMEM_AD7 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 6) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EXTMEM_AD6 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 5) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EXTMEM_AD5 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 4) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EXTMEM_AD4 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 3) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EXTMEM_AD3 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 2) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EXTMEM_AD2 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 1) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EXTMEM_AD1 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 0) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EXTMEM_AD0 };
-        return { funcs, countof(funcs) };
-      }
-    }
-    else if (info.port == eATmegaPort::PORT_B) {
-      if (info.pinidx == 7) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TOC0A, eATmegaPinFunc::TOC1C, eATmegaPinFunc::PCI7 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 6) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TOC1B, eATmegaPinFunc::PCI6 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 5) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TOC1A, eATmegaPinFunc::PCI5 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 4) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TOC2A, eATmegaPinFunc::PCI4 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 3) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::PDO, eATmegaPinFunc::SPI_MISO, eATmegaPinFunc::PCI3 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 2) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::PDI, eATmegaPinFunc::SPI_MOSI, eATmegaPinFunc::PCI2 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 1) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::SPI_SCK, eATmegaPinFunc::PCI1 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 0) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::SPI_CS, eATmegaPinFunc::PCI0 };
-        return { funcs, countof(funcs) };
-      }
-    }
-    else if (info.port == eATmegaPort::PORT_C) {
-      if (info.pinidx == 7) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EXTMEM_AD15, eATmegaPinFunc::TIMER3_ICP, eATmegaPinFunc::CLKO };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 6) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EXTMEM_AD14, eATmegaPinFunc::TOC3A };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 5) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EXTMEM_AD13, eATmegaPinFunc::TOC3B };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 4) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EXTMEM_AD12, eATmegaPinFunc::TOC3C };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 3) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EXTMEM_AD11, eATmegaPinFunc::TIMER3_CLKI };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 2) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EXTMEM_AD10 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 1) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EXTMEM_AD9 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 0) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EXTMEM_AD8 };
-        return { funcs, countof(funcs) };
-      }
-    }
-    else if (info.port == eATmegaPort::PORT_D) {
-      if (info.pinidx == 7) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TIMER0_CLKI };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 6) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TIMER1_CLKI };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 5) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::USART1_CLK };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 4) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TIMER1_ICP };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 3) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EINT3, eATmegaPinFunc::USART1_TXD };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 2) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EINT2, eATmegaPinFunc::USART1_RXD };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 1) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EINT1, eATmegaPinFunc::TWI_SDA, eATmegaPinFunc::TOC2B };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 0) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EINT0, eATmegaPinFunc::TWI_CLK, eATmegaPinFunc::TOC0B };
-        return { funcs, countof(funcs) };
-      }
-    }
-    else if (info.port == eATmegaPort::PORT_E) {
-      if (info.pinidx == 7) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EINT7, eATmegaPinFunc::AIN1, eATmegaPinFunc::UVCON };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 6) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EINT6, eATmegaPinFunc::AIN0 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 5) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EINT5, eATmegaPinFunc::TOSC2 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 4) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EINT4, eATmegaPinFunc::TOSC2 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 3) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::UID };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 2) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EXTMEM_ALE };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 1) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EXTMEM_RD };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 0) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EXTMEM_WR };
-        return { funcs, countof(funcs) };
-      }
-    }
-    else if (info.port == eATmegaPort::PORT_F) {
-      if (info.pinidx == 7) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::ADC7 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 6) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::ADC6 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 5) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::ADC5 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 4) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::ADC4 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 3) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::ADC3 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 2) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::ADC2 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 1) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::ADC1 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 0) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::ADC0 };
-        return { funcs, countof(funcs) };
-      }
-    }
-  #elif defined(__AVR_TRM05__)
-    if (info.port == eATmegaPort::PORT_A) {
-      if (info.pinidx == 7) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::ADC7, eATmegaPinFunc::PCI7 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 6) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::ADC6, eATmegaPinFunc::PCI6 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 5) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::ADC5, eATmegaPinFunc::PCI5 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 4) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::ADC4, eATmegaPinFunc::PCI4 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 3) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::ADC3, eATmegaPinFunc::PCI3 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 2) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::ADC2, eATmegaPinFunc::PCI2 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 1) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::ADC1, eATmegaPinFunc::PCI1 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 0) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::ADC0, eATmegaPinFunc::PCI0 };
-        return { funcs, countof(funcs) };
-      }
-    }
-    else if (info.port == eATmegaPort::PORT_B) {
-      if (info.pinidx == 7) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::SPI_SCK, eATmegaPinFunc::PCI15 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 6) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::SPI_MISO, eATmegaPinFunc::PCI14 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 5) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::SPI_MOSI, eATmegaPinFunc::PCI13 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 4) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::SPI_CS, eATmegaPinFunc::TOC0B, eATmegaPinFunc::PCI12 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 3) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::AIN1, eATmegaPinFunc::TOC0A, eATmegaPinFunc::PCI11 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 2) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::AIN0, eATmegaPinFunc::EINT2, eATmegaPinFunc::PCI10 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 1) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TIMER1_ECI, eATmegaPinFunc::CLKO, eATmegaPinFunc::PCI9 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 0) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TIMER0_ECI, eATmegaPinFunc::USART0_CLK, eATmegaPinFunc::PCI8 };
-        return { funcs, countof(funcs) };
-      }
-    }
-    else if (info.port == eATmegaPort::PORT_C) {
-      if (info.pinidx == 7) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TOSC2, eATmegaPinFunc::PCI23 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 6) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TOSC1, eATmegaPinFunc::PCI22 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 5) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::PCI21 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 4) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::PCI20 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 3) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::PCI19 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 2) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::PCI18 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 1) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TWI_SDA, eATmegaPinFunc::PCI17 };
-        return { funcs, countof(funcs) };
-      }
-      else if (info.pinidx == 0) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TWI_CLK, eATmegaPinFunc::PCI16 };
-        return { funcs, countof(funcs) };
-      }
-    }
-    else if (info.port == eATmegaPort::PORT_D) {
-      if (info.pinidx == 7) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TOC2A, eATmegaPinFunc::PCI31 };
-        return { funcs, countof(funcs) };
-      }
-      if (info.pinidx == 6) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TIMER1_ICP, eATmegaPinFunc::TOC2B, eATmegaPinFunc::PCI30 };
-        return { funcs, countof(funcs) };
-      }
-      if (info.pinidx == 5) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TOC1A, eATmegaPinFunc::PCI29 };
-        return { funcs, countof(funcs) };
-      }
-      if (info.pinidx == 4) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::TOC1B, eATmegaPinFunc::USART1_CLK, eATmegaPinFunc::PCI28 };
-        return { funcs, countof(funcs) };
-      }
-      if (info.pinidx == 3) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EINT1, eATmegaPinFunc::USART1_TXD, eATmegaPinFunc::PCI27 };
-        return { funcs, countof(funcs) };
-      }
-      if (info.pinidx == 2) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::EINT0, eATmegaPinFunc::USART1_RXD, eATmegaPinFunc::PCI26 };
-        return { funcs, countof(funcs) };
-      }
-      if (info.pinidx == 1) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::USART0_TXD, eATmegaPinFunc::PCI25 };
-        return { funcs, countof(funcs) };
-      }
-      if (info.pinidx == 0) {
-        static const eATmegaPinFunc funcs[] = { eATmegaPinFunc::USART0_RXD, eATmegaPinFunc::PCI24 };
-        return { funcs, countof(funcs) };
-      }
-    }
-  #endif
-
-  return ATmegaPinFunctions();  // default and empty.
-}
-
-#endif // HAL_AVR_DIRTY_INIT
-#endif // __AVR__

Marlin/src/HAL/AVR/spi_pins.h

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

Marlin/src/HAL/AVR/timers.h

@@ -1,9 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  *
  * 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
@@ -28,7 +26,7 @@
 // ------------------------
 
 typedef uint16_t hal_timer_t;
-#define HAL_TIMER_TYPE_MAX 0xFFFFU
+#define HAL_TIMER_TYPE_MAX 0xFFFF
 
 // ------------------------
 // Defines
@@ -46,15 +44,15 @@ typedef uint16_t hal_timer_t;
   #define MF_TIMER_TEMP         0
 #endif
 
-#define TEMP_TIMER_FREQUENCY        (((F_CPU) + 0x2000) / 0x4000)
+#define TEMP_TIMER_FREQUENCY    ((F_CPU) / 64.0 / 256.0)
 
-#define STEPPER_TIMER_RATE          HAL_TIMER_RATE
-#define STEPPER_TIMER_PRESCALE      8
-#define STEPPER_TIMER_TICKS_PER_US  ((STEPPER_TIMER_RATE) / 1000000UL)
+#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 PULSE_TIMER_RATE            STEPPER_TIMER_RATE                              // (Hz) Frequency of Pulse Timer
-#define PULSE_TIMER_TICKS_PER_US    STEPPER_TIMER_TICKS_PER_US
-#define PULSE_TIMER_PRESCALE        STEPPER_TIMER_PRESCALE
+#define PULSE_TIMER_RATE       STEPPER_TIMER_RATE   // frequency of pulse timer
+#define PULSE_TIMER_PRESCALE   STEPPER_TIMER_PRESCALE
+#define PULSE_TIMER_TICKS_PER_US STEPPER_TIMER_TICKS_PER_US
 
 #define ENABLE_STEPPER_DRIVER_INTERRUPT()  SBI(TIMSK1, OCIE1A)
 #define DISABLE_STEPPER_DRIVER_INTERRUPT() CBI(TIMSK1, OCIE1A)
@@ -111,8 +109,8 @@ FORCE_INLINE void HAL_timer_start(const uint8_t timer_num, const uint32_t) {
  * (otherwise, characters will be lost due to UART overflow).
  * Then: Stepper, Endstops, Temperature, and -finally- all others.
  */
-inline void HAL_timer_isr_prologue(const uint8_t) {}
-inline void HAL_timer_isr_epilogue(const uint8_t) {}
+#define HAL_timer_isr_prologue(T) NOOP
+#define HAL_timer_isr_epilogue(T) NOOP
 
 #ifndef HAL_STEP_TIMER_ISR
 

Marlin/src/HAL/AVR/u8g/LCD_defines.h

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

Marlin/src/HAL/AVR/u8g_com_HAL_AVR_sw_spi.cpp

@@ -55,12 +55,12 @@
 
 #if defined(ARDUINO) && !defined(ARDUINO_ARCH_STM32) && !defined(ARDUINO_ARCH_SAM)
 
-#include "../../../inc/MarlinConfigPre.h"
+#include "../../inc/MarlinConfigPre.h"
 
 #if HAS_MARLINUI_U8GLIB
 
-#include "../../shared/Marduino.h"
-#include "../../shared/Delay.h"
+#include "../shared/Marduino.h"
+#include "../shared/Delay.h"
 
 #include <U8glib-HAL.h>
 
@@ -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();
-  for (uint8_t i = 0; i < 8; ++i) {
+  LOOP_L_N(i, 8) {
     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();
-  for (uint8_t i = 0; i < 8; ++i) {
+  LOOP_L_N(i, 8) {
     *outClock &= bitNotClock;
     if (val & 0x80)
       *outData |= bitData;
@@ -120,7 +120,8 @@ void u8g_spiSend_sw_AVR_mode_3(uint8_t val) {
   U8G_ATOMIC_END();
 }
 
-#if U8G_SPI_USE_MODE_3
+
+#if ENABLED(FYSETC_MINI_12864)
   #define SPISEND_SW_AVR u8g_spiSend_sw_AVR_mode_3
 #else
   #define SPISEND_SW_AVR u8g_spiSend_sw_AVR_mode_0
@@ -143,9 +144,9 @@ uint8_t u8g_com_HAL_AVR_sw_sp_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void
       break;
 
     case U8G_COM_MSG_CHIP_SELECT:
-      #if U8G_SPI_USE_MODE_3                                  // LCD SPI is running mode 3 while SD card is running mode 0
-        if (arg_val) {                                        // SCK idle state needs to be set to the proper idle state before
-                                                              //  the next chip select goes active
+      #if ENABLED(FYSETC_MINI_12864)           // LCD SPI is running mode 3 while SD card is running mode 0
+        if (arg_val) {                         //   SCK idle state needs to be set to the proper idle state before
+                                               //   the next chip select goes active
           u8g_com_arduino_digital_write(u8g, U8G_PI_SCK, 1);  // Set SCK to mode 3 idle state before CS goes active
           u8g_com_arduino_digital_write(u8g, U8G_PI_CS, LOW);
         }

Marlin/src/HAL/DUE/HAL.cpp

@@ -1,9 +1,7 @@
 /**
  * Marlin 3D Printer Firmware
  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  *
  * 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
@@ -27,6 +25,7 @@
 #ifdef ARDUINO_ARCH_SAM
 
 #include "../../inc/MarlinConfig.h"
+#include "../../MarlinCore.h"
 
 #include <Wire.h>
 #include "usb/usb_task.h"
@@ -46,8 +45,8 @@ uint16_t MarlinHAL::adc_result;
 #endif
 
 void MarlinHAL::init() {
-  #if HAS_MEDIA
-    OUT_WRITE(SD_SS_PIN, HIGH);  // Try to set SDSS inactive before any other SPI users start up
+  #if ENABLED(SDSUPPORT)
+    OUT_WRITE(SDSS, HIGH);  // Try to set SDSS inactive before any other SPI users start up
   #endif
   usb_task_init();          // Initialize the USB stack
   TERN_(POSTMORTEM_DEBUGGING, install_min_serial()); // Install the min serial handler
@@ -101,10 +100,6 @@ void watchdogSetup() {
 
   #if ENABLED(USE_WATCHDOG)
 
-    #ifndef WATCHDOG_PIO_RESET
-      #define WATCHDOG_PIO_RESET
-    #endif
-
     // 4 seconds timeout
     uint32_t timeout = TERN(WATCHDOG_DURATION_8S, 8000, 4000);
 
@@ -118,16 +113,15 @@ void watchdogSetup() {
       timeout = 0xFFF;
 
     // We want to enable the watchdog with the specified timeout
-    uint32_t value = (0
-      | WDT_MR_WDV(timeout)               // With the specified timeout
-      | WDT_MR_WDD(timeout)               // and no invalid write window
-      #if NONE(WATCHDOG_PIO_RESET, SAMV70, SAMV71, SAME70, SAMS70)
-        | WDT_MR_WDRPROC                  // WDT fault resets processor only with this flag.
-                                          // Omit to also reset the PIO controller.
-      #endif
-      | WDT_MR_WDDBGHLT                   // WDT stops in debug state.
-      | WDT_MR_WDIDLEHLT                  // WDT stops in idle state.
-    );
+    uint32_t value =
+      WDT_MR_WDV(timeout) |               // With the specified timeout
+      WDT_MR_WDD(timeout) |               // and no invalid write window
+    #if !(SAMV70 || SAMV71 || SAME70 || SAMS70)
+      WDT_MR_WDRPROC   |                  // WDT fault resets processor only - We want
+                                          // to keep PIO controller state
+    #endif
+      WDT_MR_WDDBGHLT  |                  // WDT stops in debug state.
+      WDT_MR_WDIDLEHLT;                   // WDT stops in idle state.
 
     #if ENABLED(WATCHDOG_RESET_MANUAL)
       // We enable the watchdog timer, but only for the interrupt.

Marlin/src/HAL/DUE/HAL.h

@@ -1,9 +1,9 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ * 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
  *
  * 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
@@ -35,9 +35,67 @@
 
 #include <stdint.h>
 
-//
-// Serial Ports
-//
+#include "../../core/serial_hook.h"
+
+// ------------------------
+// Serial ports
+// ------------------------
+
+typedef ForwardSerial1Class< decltype(Serial) > DefaultSerial1;
+typedef ForwardSerial1Class< decltype(Serial1) > DefaultSerial2;
+typedef ForwardSerial1Class< decltype(Serial2) > DefaultSerial3;
+typedef ForwardSerial1Class< decltype(Serial3) > DefaultSerial4;
+extern DefaultSerial1 MSerial0;
+extern DefaultSerial2 MSerial1;
+extern DefaultSerial3 MSerial2;
+extern DefaultSerial4 MSerial3;
+
+#define _MSERIAL(X) MSerial##X
+#define MSERIAL(X) _MSERIAL(X)
+
+#if SERIAL_PORT == -1 || ENABLED(EMERGENCY_PARSER)
+  #define MYSERIAL1 customizedSerial1
+#elif WITHIN(SERIAL_PORT, 0, 3)
+  #define MYSERIAL1 MSERIAL(SERIAL_PORT)
+#else
+  #error "The required SERIAL_PORT must be from 0 to 3, or -1 for USB Serial."
+#endif
+
+#ifdef SERIAL_PORT_2
+  #if SERIAL_PORT_2 == -1 || ENABLED(EMERGENCY_PARSER)
+    #define MYSERIAL2 customizedSerial2
+  #elif WITHIN(SERIAL_PORT_2, 0, 3)
+    #define MYSERIAL2 MSERIAL(SERIAL_PORT_2)
+  #else
+    #error "SERIAL_PORT_2 must be from 0 to 3, or -1 for USB Serial."
+  #endif
+#endif
+
+#ifdef SERIAL_PORT_3
+  #if SERIAL_PORT_3 == -1 || ENABLED(EMERGENCY_PARSER)
+    #define MYSERIAL3 customizedSerial3
+  #elif WITHIN(SERIAL_PORT_3, 0, 3)
+    #define MYSERIAL3 MSERIAL(SERIAL_PORT_3)
+  #else
+    #error "SERIAL_PORT_3 must be from 0 to 3, or -1 for USB Serial."
+  #endif
+#endif
+
+#ifdef MMU2_SERIAL_PORT
+  #if WITHIN(MMU2_SERIAL_PORT, 0, 3)
+    #define MMU2_SERIAL MSERIAL(MMU2_SERIAL_PORT)
+  #else
+    #error "MMU2_SERIAL_PORT must be from 0 to 3."
+  #endif
+#endif
+
+#ifdef LCD_SERIAL_PORT
+  #if WITHIN(LCD_SERIAL_PORT, 0, 3)
+    #define LCD_SERIAL MSERIAL(LCD_SERIAL_PORT)
+  #else
+    #error "LCD_SERIAL_PORT must be from 0 to 3."
+  #endif
+#endif
 
 #include "MarlinSerial.h"
 #include "MarlinSerialUSB.h"
@@ -65,11 +123,11 @@ typedef Servo hal_servo_t;
 //
 // ADC
 //
-#define HAL_ADC_VREF_MV   3300
+#define HAL_ADC_VREF         3.3
 #define HAL_ADC_RESOLUTION  10
 
 #ifndef analogInputToDigitalPin
-  #define analogInputToDigitalPin(p) pin_t((p < 12U) ? (p) + 54U : -1)
+  #define analogInputToDigitalPin(p) ((p < 12U) ? (p) + 54U : -1)
 #endif
 
 //
@@ -132,7 +190,7 @@ public:
 
   static void delay_ms(const int ms) { delay(ms); }
 
-  // Tasks, called from marlin.idle()
+  // Tasks, called from idle()
   static void idletask();
 
   // Reset

Marlin/src/HAL/DUE/HAL_SPI.cpp

@@ -42,7 +42,7 @@
 // Public functions
 // ------------------------
 
-#if ANY(SOFTWARE_SPI, FORCE_SOFT_SPI)
+#if EITHER(DUE_SOFTWARE_SPI, FORCE_SOFT_SPI)
 
   // ------------------------
   // Software SPI
@@ -208,8 +208,8 @@
       A("str %[sck_mask],[%[sck_port],#0x4]")      /* CODR */
       A("bfi %[bin],%[work],#0,#1")                /* Store read bit as the bit 0 */
 
-      : [bin]"+r"( bin ),
-        [work]"+r"( work )
+      : [bin]"+r"(bin),
+        [work]"+r"(work)
       : [bitband_miso_port]"r"( BITBAND_MISO_PORT ),
         [sck_mask]"r"( SCK_MASK ),
         [sck_port]"r"( SCK_PORT_PLUS30 )
@@ -350,7 +350,7 @@
   static void spiRxBlock0(uint8_t *ptr, uint32_t todo) {
     uint32_t bin = 0;
     uint32_t work = 0;
-    uint32_t BITBAND_MISO_PORT = BITBAND_ADDRESS(((uint32_t)PORT(SD_MISO_PIN))+0x3C, PIN_SHIFT(SD_MISO_PIN)); /* PDSR of port in bitband area */
+    uint32_t BITBAND_MISO_PORT = BITBAND_ADDRESS( ((uint32_t)PORT(SD_MISO_PIN))+0x3C, PIN_SHIFT(SD_MISO_PIN));  /* PDSR of port in bitband area */
     uint32_t SCK_PORT_PLUS30 = ((uint32_t) PORT(SD_SCK_PIN)) + 0x30;    /* SODR of port */
     uint32_t SCK_MASK = PIN_MASK(SD_SCK_PIN);
 
@@ -412,10 +412,10 @@
       A("strb.w %[bin], [%[ptr]], #1")             /* Store read value into buffer, increment buffer pointer */
       A("bne.n loop%=")                            /* Repeat until done */
 
-      : [ptr]"+r"( ptr ),
-        [todo]"+r"( todo ),
-        [bin]"+r"( bin ),
-        [work]"+r"( work )
+      : [ptr]"+r"(ptr),
+        [todo]"+r"(todo),
+        [bin]"+r"(bin),
+        [work]"+r"(work)
       : [bitband_miso_port]"r"( BITBAND_MISO_PORT ),
         [sck_mask]"r"( SCK_MASK ),
         [sck_port]"r"( SCK_PORT_PLUS30 )
@@ -600,8 +600,9 @@
       OUT_WRITE(SPI_EEPROM1_CS_PIN, HIGH);
       OUT_WRITE(SPI_EEPROM2_CS_PIN, HIGH);
       OUT_WRITE(SPI_FLASH_CS_PIN, HIGH);
-      OUT_WRITE(SD_SS_PIN, HIGH);
-      WRITE(SD_SS_PIN, LOW);
+      WRITE(SD_SS_PIN, HIGH);
+
+      OUT_WRITE(SDSS, LOW);
 
       PIO_Configure(
         g_APinDescription[SPI_PIN].pPort,
@@ -766,7 +767,7 @@
 
       // Disable PIO on A26 and A27
       REG_PIOA_PDR = 0x0C000000;
-      OUT_WRITE(SD_SS_PIN, HIGH);
+      OUT_WRITE(SDSS, HIGH);
 
       // Reset SPI0 (from sam lib)
       SPI0->SPI_CR = SPI_CR_SPIDIS;

Marlin/src/HAL/DUE/MarlinSerial.cpp

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

Marlin/src/HAL/DUE/MarlinSerial.h

@@ -30,24 +30,8 @@
 #include <WString.h>
 
 #include "../../inc/MarlinConfigPre.h"
-#include "../../core/types.h"
 #include "../../core/serial_hook.h"
 
-typedef ForwardSerial1Class< decltype(Serial) > DefaultSerial1;
-typedef ForwardSerial1Class< decltype(Serial1) > DefaultSerial2;
-typedef ForwardSerial1Class< decltype(Serial2) > DefaultSerial3;
-typedef ForwardSerial1Class< decltype(Serial3) > DefaultSerial4;
-extern DefaultSerial1 MSerial0;
-extern DefaultSerial2 MSerial1;
-extern DefaultSerial3 MSerial2;
-extern DefaultSerial4 MSerial3;
-
-#define SERIAL_INDEX_MIN 0
-#define SERIAL_INDEX_MAX 3
-#define EP_SERIAL_PORT(N) customizedSerial##N
-#define USB_SERIAL_PORT(N) customizedSerial##N
-#include "../shared/serial_ports.h"
-
 // Define constants and variables for buffering incoming serial data.  We're
 // using a ring buffer (I think), in which rx_buffer_head is the index of the
 // location to which to write the next incoming character and rx_buffer_tail
@@ -68,6 +52,10 @@ extern DefaultSerial4 MSerial3;
 //  #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) {}
@@ -88,7 +76,7 @@ protected:
   static constexpr int HWUART_IRQ_ID = IRQ_IDS[Cfg::PORT];
 
   // Base size of type on buffer size
-  typedef uvalue_t(Cfg::RX_SIZE - 1) ring_buffer_pos_t;
+  typedef typename TypeSelector<(Cfg::RX_SIZE>256), uint16_t, uint8_t>::type ring_buffer_pos_t;
 
   struct ring_buffer_r {
     volatile ring_buffer_pos_t head, tail;

Marlin/src/HAL/DUE/MinSerial.cpp

@@ -73,18 +73,18 @@ void install_min_serial() {
 }
 
 #if DISABLED(DYNAMIC_VECTORTABLE)
-  extern "C" {
-    __attribute__((naked)) void JumpHandler_ASM() {
-      __asm__ __volatile__ (
-        "b CommonHandler_ASM\n"
-      );
-    }
-    void __attribute__((naked, alias("JumpHandler_ASM"))) HardFault_Handler();
-    void __attribute__((naked, alias("JumpHandler_ASM"))) BusFault_Handler();
-    void __attribute__((naked, alias("JumpHandler_ASM"))) UsageFault_Handler();
-    void __attribute__((naked, alias("JumpHandler_ASM"))) MemManage_Handler();
-    void __attribute__((naked, alias("JumpHandler_ASM"))) NMI_Handler();
+extern "C" {
+  __attribute__((naked)) void JumpHandler_ASM() {
+    __asm__ __volatile__ (
+      "b CommonHandler_ASM\n"
+    );
   }
+  void __attribute__((naked, alias("JumpHandler_ASM"))) HardFault_Handler();
+  void __attribute__((naked, alias("JumpHandler_ASM"))) BusFault_Handler();
+  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

Marlin/src/HAL/DUE/Servo.cpp

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

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

@@ -66,7 +66,7 @@
 
 #include <U8glib-HAL.h>
 
-#if U8G_SPI_USE_MODE_3
+#if ENABLED(FYSETC_MINI_12864)
   #define SPISEND_SW_DUE u8g_spiSend_sw_DUE_mode_3
 #else
   #define SPISEND_SW_DUE u8g_spiSend_sw_DUE_mode_0
@@ -96,15 +96,15 @@ uint8_t u8g_com_HAL_DUE_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void
       break;
 
     case U8G_COM_MSG_CHIP_SELECT:
-      #if U8G_SPI_USE_MODE_3                        // LCD SPI is running mode 3 while SD card is running mode 0
-        if (arg_val) {                              // SCK idle state needs to be set to the proper idle state before
-                                                    //  the next chip select goes active
-          u8g_SetPILevel_DUE(u8g, U8G_PI_SCK, 1);   // Set SCK to mode 3 idle state before CS goes active
+      #if ENABLED(FYSETC_MINI_12864)           // LCD SPI is running mode 3 while SD card is running mode 0
+        if (arg_val) {                        //   SCK idle state needs to be set to the proper idle state before
+                                               //   the next chip select goes active
+          u8g_SetPILevel_DUE(u8g, U8G_PI_SCK, 1);  //set SCK to mode 3 idle state before CS goes active
           u8g_SetPILevel_DUE(u8g, U8G_PI_CS, LOW);
         }
         else {
           u8g_SetPILevel_DUE(u8g, U8G_PI_CS, HIGH);
-          u8g_SetPILevel_DUE(u8g, U8G_PI_SCK, 0);   // Set SCK to mode 0 idle state after CS goes inactive
+          u8g_SetPILevel_DUE(u8g, U8G_PI_SCK, 0); //set SCK to mode 0 idle state after CS goes inactive
         }
       #else
         u8g_SetPILevel_DUE(u8g, U8G_PI_CS, !arg_val);

Marlin/src/HAL/DUE/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
-  for (uint8_t i = 0; i < 8; ++i) {
+  LOOP_L_N(i, 8) {
     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
-  for (uint8_t i = 0; i < 8; ++i) {
+  LOOP_L_N(i, 8) {
     SCK_pPio->PIO_CODR = SCK_dwMask;
     DELAY_NS(50);
     if (val & 0x80)

Marlin/src/HAL/DUE/eeprom_flash.cpp

@@ -1,9 +1,10 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ * 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
  *
  * 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
@@ -21,7 +22,7 @@
  */
 #ifdef ARDUINO_ARCH_SAM
 
-#include "../../../inc/MarlinConfig.h"
+#include "../../inc/MarlinConfig.h"
 
 #if ENABLED(FLASH_EEPROM_EMULATION)
 
@@ -132,7 +133,7 @@ static uint8_t buffer[256] = {0},   // The RAM buffer to accumulate writes
                curGroup = 0xFF;     // Current FLASH group
 
 #define DEBUG_OUT ENABLED(EE_EMU_DEBUG)
-#include "../../../core/debug_out.h"
+#include "../../core/debug_out.h"
 
 static void ee_Dump(const int page, const void *data) {
 
@@ -291,7 +292,7 @@ static bool ee_PageWrite(uint16_t page, const void *data) {
       uint32_t *p1 = (uint32_t*)addrflash;
       uint32_t *p2 = (uint32_t*)data;
       int count = 0;
-      for (i = 0; i < PageSize >> 2; i++) {
+      for (i =0; i<PageSize >> 2; i++) {
         if (p1[i] != p2[i]) {
           uint32_t delta = p1[i] ^ p2[i];
           while (delta) {
@@ -953,19 +954,19 @@ static void ee_Init() {
 
 /* PersistentStore -----------------------------------------------------------*/
 
-#include "../../shared/eeprom_api.h"
+#include "../shared/eeprom_api.h"
 
 #ifndef MARLIN_EEPROM_SIZE
   #define MARLIN_EEPROM_SIZE 0x1000 // 4KB
 #endif
-size_t PersistentStore::capacity()    { return MARLIN_EEPROM_SIZE - eeprom_exclude_size; }
+size_t PersistentStore::capacity()    { return MARLIN_EEPROM_SIZE; }
 bool PersistentStore::access_start()  { ee_Init();  return true; }
 bool PersistentStore::access_finish() { ee_Flush(); return true; }
 
 bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, uint16_t *crc) {
   uint16_t written = 0;
   while (size--) {
-    uint8_t * const p = (uint8_t * const)REAL_EEPROM_ADDR(pos);
+    uint8_t * const p = (uint8_t * const)pos;
     uint8_t v = *value;
     if (v != ee_Read(uint32_t(p))) { // EEPROM has only ~100,000 write cycles, so only write bytes that have changed!
       ee_Write(uint32_t(p), v);
@@ -984,7 +985,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
 
 bool PersistentStore::read_data(int &pos, uint8_t *value, size_t size, uint16_t *crc, const bool writing/*=true*/) {
   do {
-    uint8_t c = ee_Read(uint32_t(REAL_EEPROM_ADDR(pos)));
+    uint8_t c = ee_Read(uint32_t(pos));
     if (writing) *value = c;
     crc16(crc, &c, 1);
     pos++;

Marlin/src/HAL/DUE/eeprom_wired.cpp

@@ -1,9 +1,10 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ * 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
  *
  * 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
@@ -21,7 +22,7 @@
  */
 #ifdef ARDUINO_ARCH_SAM
 
-#include "../../../inc/MarlinConfig.h"
+#include "../../inc/MarlinConfig.h"
 
 #if USE_WIRED_EEPROM
 
@@ -30,20 +31,20 @@
  * with simple implementations supplied by Marlin.
  */
 
-#include "../../shared/eeprom_if.h"
-#include "../../shared/eeprom_api.h"
+#include "../shared/eeprom_if.h"
+#include "../shared/eeprom_api.h"
 
 #ifndef MARLIN_EEPROM_SIZE
   #error "MARLIN_EEPROM_SIZE is required for I2C / SPI EEPROM."
 #endif
-size_t PersistentStore::capacity()    { return MARLIN_EEPROM_SIZE - eeprom_exclude_size; }
+size_t PersistentStore::capacity()    { return MARLIN_EEPROM_SIZE; }
 bool PersistentStore::access_start()  { eeprom_init(); return true; }
 bool PersistentStore::access_finish() { return true; }
 
 bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, uint16_t *crc) {
   uint16_t written = 0;
   while (size--) {
-    uint8_t * const p = (uint8_t * const)REAL_EEPROM_ADDR(pos);
+    uint8_t * const p = (uint8_t * const)pos;
     uint8_t v = *value;
     if (v != eeprom_read_byte(p)) { // EEPROM has only ~100,000 write cycles, so only write bytes that have changed!
       eeprom_write_byte(p, v);
@@ -62,7 +63,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
 
 bool PersistentStore::read_data(int &pos, uint8_t *value, size_t size, uint16_t *crc, const bool writing/*=true*/) {
   do {
-    const uint8_t c = eeprom_read_byte((uint8_t*)REAL_EEPROM_ADDR(pos));
+    uint8_t c = eeprom_read_byte((uint8_t*)pos);
     if (writing) *value = c;
     crc16(crc, &c, 1);
     pos++;

Marlin/src/HAL/DUE/endstop_interrupts.h

@@ -47,34 +47,33 @@ void endstop_ISR() { endstops.update(); }
 
 void setup_endstop_interrupts() {
   #define _ATTACH(P) attachInterrupt(digitalPinToInterrupt(P), endstop_ISR, CHANGE)
-  TERN_(USE_X_MAX,       _ATTACH(X_MAX_PIN));
-  TERN_(USE_X_MIN,       _ATTACH(X_MIN_PIN));
-  TERN_(USE_Y_MAX,       _ATTACH(Y_MAX_PIN));
-  TERN_(USE_Y_MIN,       _ATTACH(Y_MIN_PIN));
-  TERN_(USE_Z_MAX,       _ATTACH(Z_MAX_PIN));
-  TERN_(USE_Z_MIN,       _ATTACH(Z_MIN_PIN));
-  TERN_(USE_X2_MAX,      _ATTACH(X2_MAX_PIN));
-  TERN_(USE_X2_MIN,      _ATTACH(X2_MIN_PIN));
-  TERN_(USE_Y2_MAX,      _ATTACH(Y2_MAX_PIN));
-  TERN_(USE_Y2_MIN,      _ATTACH(Y2_MIN_PIN));
-  TERN_(USE_Z2_MAX,      _ATTACH(Z2_MAX_PIN));
-  TERN_(USE_Z2_MIN,      _ATTACH(Z2_MIN_PIN));
-  TERN_(USE_Z3_MAX,      _ATTACH(Z3_MAX_PIN));
-  TERN_(USE_Z3_MIN,      _ATTACH(Z3_MIN_PIN));
-  TERN_(USE_Z4_MAX,      _ATTACH(Z4_MAX_PIN));
-  TERN_(USE_Z4_MIN,      _ATTACH(Z4_MIN_PIN));
-  TERN_(USE_Z_MIN_PROBE, _ATTACH(Z_MIN_PROBE_PIN));
-  TERN_(USE_CALIBRATION, _ATTACH(CALIBRATION_PIN));
-  TERN_(USE_I_MAX,       _ATTACH(I_MAX_PIN));
-  TERN_(USE_I_MIN,       _ATTACH(I_MIN_PIN));
-  TERN_(USE_J_MAX,       _ATTACH(J_MAX_PIN));
-  TERN_(USE_J_MIN,       _ATTACH(J_MIN_PIN));
-  TERN_(USE_K_MAX,       _ATTACH(K_MAX_PIN));
-  TERN_(USE_K_MIN,       _ATTACH(K_MIN_PIN));
-  TERN_(USE_U_MAX,       _ATTACH(U_MAX_PIN));
-  TERN_(USE_U_MIN,       _ATTACH(U_MIN_PIN));
-  TERN_(USE_V_MAX,       _ATTACH(V_MAX_PIN));
-  TERN_(USE_V_MIN,       _ATTACH(V_MIN_PIN));
-  TERN_(USE_W_MAX,       _ATTACH(W_MAX_PIN));
-  TERN_(USE_W_MIN,       _ATTACH(W_MIN_PIN));
+  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_(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));
 }

Marlin/src/HAL/DUE/fastio.h

@@ -189,12 +189,12 @@
  */
 
 // UART
-#define RXD        0
-#define TXD        1
+#define RXD        DIO0
+#define TXD        DIO1
 
 // TWI (I2C)
-#define SCL        21
-#define SDA        20
+#define SCL        DIO21
+#define SDA        DIO20
 
 /**
  * pins

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

@@ -40,12 +40,11 @@
  * Some jitter in the Vref signal is OK so the interrupt priority is left at its default value.
  */
 
-#include "../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfig.h"
 
 #if MB(PRINTRBOARD_G2)
 
 #include "G2_PWM.h"
-#include "../../../module/stepper.h"
 
 #if PIN_EXISTS(MOTOR_CURRENT_PWM_X)
   #define G2_PWM_X 1
@@ -57,12 +56,16 @@
 #else
   #define G2_PWM_Y 0
 #endif
-#if HAS_MOTOR_CURRENT_PWM_Z
+#if PIN_EXISTS(MOTOR_CURRENT_PWM_Z)
   #define G2_PWM_Z 1
 #else
   #define G2_PWM_Z 0
 #endif
-#define G2_PWM_E HAS_MOTOR_CURRENT_PWM_E
+#if PIN_EXISTS(MOTOR_CURRENT_PWM_E)
+  #define G2_PWM_E 1
+#else
+  #define G2_PWM_E 0
+#endif
 #define G2_MASK_X(V) (G2_PWM_X * (V))
 #define G2_MASK_Y(V) (G2_PWM_Y * (V))
 #define G2_MASK_Z(V) (G2_PWM_Z * (V))
@@ -77,22 +80,17 @@ PWM_map ISR_table[NUM_PWMS] = PWM_MAP_INIT;
 
 void Stepper::digipot_init() {
 
-  #if G2_PWM_X
-    OUT_WRITE(MOTOR_CURRENT_PWM_X_PIN, LOW);  // init pins
+  #if PIN_EXISTS(MOTOR_CURRENT_PWM_X)
+    OUT_WRITE(MOTOR_CURRENT_PWM_X_PIN, 0);  // init pins
   #endif
-  #if G2_PWM_Y
-    OUT_WRITE(MOTOR_CURRENT_PWM_Y_PIN, LOW);
+  #if PIN_EXISTS(MOTOR_CURRENT_PWM_Y)
+    OUT_WRITE(MOTOR_CURRENT_PWM_Y_PIN, 0);
   #endif
   #if G2_PWM_Z
-    OUT_WRITE(MOTOR_CURRENT_PWM_Z_PIN, LOW);
+    OUT_WRITE(MOTOR_CURRENT_PWM_Z_PIN, 0);
   #endif
   #if G2_PWM_E
-    #if PIN_EXISTS(MOTOR_CURRENT_PWM_E)
-      OUT_WRITE(MOTOR_CURRENT_PWM_E_PIN, LOW);
-    #endif
-    #if PIN_EXISTS(MOTOR_CURRENT_PWM_E0)
-      OUT_WRITE(MOTOR_CURRENT_PWM_E0_PIN, LOW);
-    #endif
+    OUT_WRITE(MOTOR_CURRENT_PWM_E_PIN, 0);
   #endif
 
   #define WPKEY          (0x50574D << 8) // “PWM” in ASCII

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

@@ -26,7 +26,10 @@
  * PR #7500. It is hardwired for the PRINTRBOARD_G2 Motor Current needs.
  */
 
-#include <stdint.h>
+#include "../../../inc/MarlinConfigPre.h"
+#include "../../../module/stepper.h"
+//C:\Users\bobku\Documents\GitHub\Marlin-Bob-2\Marlin\src\module\stepper.h
+//C:\Users\bobku\Documents\GitHub\Marlin-Bob-2\Marlin\src\HAL\HAL_DUE\G2_PWM.h
 
 #define PWM_PERIOD_US  100  // base repetition rate in micro seconds
 
@@ -46,6 +49,7 @@ extern volatile uint32_t *SODR_A, *SODR_B, *CODR_A, *CODR_B;
 
 #define PWM_MAP_INIT_ROW(IO,ZZ) { ZZ == 'A' ? SODR_A : SODR_B,  ZZ == 'A' ? CODR_A : CODR_B, 1 << _PIN(IO) }
 
+
 #define PWM_MAP_INIT {  PWM_MAP_INIT_ROW(MOTOR_CURRENT_PWM_X_PIN, 'B'), \
                         PWM_MAP_INIT_ROW(MOTOR_CURRENT_PWM_Y_PIN, 'B'), \
                         PWM_MAP_INIT_ROW(MOTOR_CURRENT_PWM_Z_PIN, 'B'), \
@@ -59,7 +63,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{ for (uint8_t i = 0; i < 6; ++i) work_table[i] = active_table[i]; }while(0)
+#define COPY_ACTIVE_TABLE() do{ LOOP_L_N(i, 6) 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

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

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

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

@@ -20,3 +20,7 @@
  *
  */
 #pragma once
+
+#if HAS_SPI_TFT || HAS_FSMC_TFT
+  #error "Sorry! TFT displays are not available for HAL/DUE."
+#endif

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

@@ -23,6 +23,6 @@
 
 #if USE_FALLBACK_EEPROM
   #define FLASH_EEPROM_EMULATION
-#elif ANY(I2C_EEPROM, SPI_EEPROM)
+#elif EITHER(I2C_EEPROM, SPI_EEPROM)
   #define USE_SHARED_EEPROM 1
 #endif

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

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

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

@@ -25,10 +25,6 @@
  * 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
  */
@@ -68,19 +64,20 @@
  * 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.
  */
-#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(SOFTWARE_SPI) && ENABLED(TMC_USE_SW_SPI) && (_IS_HW_SPI(MOSI) || _IS_HW_SPI(MISO) || _IS_HW_SPI(SCK))
-    #error "DUE hardware SPI is required but is incompatible with TMC2130 software SPI. Either disable TMC_USE_SW_SPI or use separate pins for the two SPIs."
-  #endif
-  #if ENABLED(SOFTWARE_SPI) && DISABLED(TMC_USE_SW_SPI)
+#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))
+      #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)
     #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 for HAL/DUE."
+  #error "Features requiring Hardware PWM (FAST_PWM_FAN, SPINDLE_LASER_FREQUENCY) are not yet supported on DUE."
 #endif
 
 #if HAS_TMC_SW_SERIAL

Marlin/src/HAL/DUE/pinsDebug.h

@@ -19,26 +19,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#pragma once
 
 /**
- * Pins Debugging for DUE
- *
- *   - 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)
+ * Support routines for Due
+ */
+
+/**
+ * Translation of routines & variables used by pinsDebug.h
  */
 
 #include "../shared/Marduino.h"
@@ -76,20 +63,21 @@
 
 #define NUMBER_PINS_TOTAL PINS_COUNT
 
-#define digitalRead_mod(P) extDigitalRead(P)  // AVR digitalRead disabled PWM before it read the pin
-#define printPinNameByIndex(x) do{ sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); SERIAL_ECHO(buffer); }while(0)
-#define printPinNumber(P) do{ sprintf_P(buffer, PSTR("%02d"), P); SERIAL_ECHO(buffer); }while(0)
-#define printPinAnalog(P) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), digitalPinToAnalogIndex(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 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 MULTI_NAME_PAD 14 // space needed to be pretty if not first name assigned to a pin
 
-bool getValidPinMode(const pin_t pin) {  // 1: output, 0: input
+bool GET_PINMODE(int8_t pin) {  // 1: output, 0: input
   volatile Pio* port = g_APinDescription[pin].pPort;
   uint32_t mask = g_APinDescription[pin].ulPin;
   uint8_t pin_status = g_pinStatus[pin] & 0xF;
@@ -98,15 +86,13 @@ bool getValidPinMode(const pin_t pin) {  // 1: output, 0: input
           || pwm_status(pin));
 }
 
-void printPinPWM(const int32_t pin) {
+void pwm_details(int32_t pin) {
   if (pwm_status(pin)) {
     uint32_t chan = g_APinDescription[pin].ulPWMChannel;
     SERIAL_ECHOPGM("PWM = ", PWM_INTERFACE->PWM_CH_NUM[chan].PWM_CDTY);
   }
 }
 
-void printPinPort(const pin_t) {}
-
 /**
  * DUE Board pin   |  PORT  | Label
  * ----------------+--------+-------

Marlin/src/HAL/DUE/spi_pins.h

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

Marlin/src/HAL/DUE/timers.cpp

@@ -1,9 +1,9 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ * 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
  *
  * 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

Marlin/src/HAL/DUE/timers.h

@@ -1,9 +1,8 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
  *
  * 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
@@ -34,7 +33,7 @@
 #define FORCE_INLINE __attribute__((always_inline)) inline
 
 typedef uint32_t hal_timer_t;
-#define HAL_TIMER_TYPE_MAX 0xFFFFFFFFUL
+#define HAL_TIMER_TYPE_MAX 0xFFFFFFFF
 
 #define HAL_TIMER_PRESCALER    2
 #define HAL_TIMER_RATE         ((F_CPU) / (HAL_TIMER_PRESCALER))  // frequency of timers peripherals
@@ -52,19 +51,19 @@ typedef uint32_t hal_timer_t;
   #define MF_TIMER_TONE         6  // index of timer to use for beeper tones
 #endif
 
-#define TEMP_TIMER_FREQUENCY   1000 // (Hz) Temperature ISR frequency
+#define TEMP_TIMER_FREQUENCY   1000 // temperature interrupt frequency
 
-#define STEPPER_TIMER_RATE          HAL_TIMER_RATE                                  // (Hz) Frequency of Stepper Timer ISR (HAL_TIMER_RATE / STEPPER_TIMER_PRESCALE)
-#define STEPPER_TIMER_TICKS_PER_US  ((STEPPER_TIMER_RATE) / 1000000UL)              // (MHz) Stepper Timer ticks per µs
+#define STEPPER_TIMER_RATE          HAL_TIMER_RATE                                        // frequency of stepper timer (HAL_TIMER_RATE / STEPPER_TIMER_PRESCALE)
+#define STEPPER_TIMER_TICKS_PER_US  ((STEPPER_TIMER_RATE) / 1000000)                      // stepper timer ticks per µs
 #define STEPPER_TIMER_PRESCALE      (CYCLES_PER_MICROSECOND / STEPPER_TIMER_TICKS_PER_US)
 
-#define PULSE_TIMER_RATE            STEPPER_TIMER_RATE                              // (Hz) Frequency of Pulse Timer
-#define PULSE_TIMER_TICKS_PER_US    STEPPER_TIMER_TICKS_PER_US
+#define PULSE_TIMER_RATE            STEPPER_TIMER_RATE                                    // frequency of pulse timer
 #define PULSE_TIMER_PRESCALE        STEPPER_TIMER_PRESCALE
+#define PULSE_TIMER_TICKS_PER_US    STEPPER_TIMER_TICKS_PER_US
 
-#define ENABLE_STEPPER_DRIVER_INTERRUPT()   HAL_timer_enable_interrupt(MF_TIMER_STEP)
+#define ENABLE_STEPPER_DRIVER_INTERRUPT() HAL_timer_enable_interrupt(MF_TIMER_STEP)
 #define DISABLE_STEPPER_DRIVER_INTERRUPT()  HAL_timer_disable_interrupt(MF_TIMER_STEP)
-#define STEPPER_ISR_ENABLED()               HAL_timer_interrupt_enabled(MF_TIMER_STEP)
+#define STEPPER_ISR_ENABLED() HAL_timer_interrupt_enabled(MF_TIMER_STEP)
 
 #define ENABLE_TEMPERATURE_INTERRUPT()  HAL_timer_enable_interrupt(MF_TIMER_TEMP)
 #define DISABLE_TEMPERATURE_INTERRUPT() HAL_timer_disable_interrupt(MF_TIMER_TEMP)
@@ -127,4 +126,4 @@ FORCE_INLINE static void HAL_timer_isr_prologue(const uint8_t timer_num) {
   pConfig->pTimerRegs->TC_CHANNEL[pConfig->channel].TC_SR;
 }
 
-inline void HAL_timer_isr_epilogue(const uint8_t) {}
+#define HAL_timer_isr_epilogue(T) NOOP

Marlin/src/HAL/DUE/u8g/LCD_defines.h

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

Marlin/src/HAL/DUE/upload_extra_script.py

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

Marlin/src/HAL/DUE/usb/README.md

@@ -1,29 +0,0 @@
-# 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.

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

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

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

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

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

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

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

@@ -88,6 +88,7 @@
 #endif
 //@}
 
+
 /**
  * USB Device Callbacks definitions (Optional)
  * @{
@@ -100,7 +101,7 @@
 #define  USB_DEVICE_SPECIFIC_REQUEST()  usb_task_other_requests()
 //@}
 
-#if HAS_MEDIA
+#if ENABLED(SDSUPPORT)
   /**
    * USB Device low level configuration
    * When only one interface is used, these configurations are defined by the class module.
@@ -149,6 +150,7 @@
 
 //@}
 
+
 /**
  * USB Interface Configuration
  * @{
@@ -183,7 +185,7 @@
 //! Enable id string of interface to add an extra USB string
 #define  UDI_CDC_IAD_STRING_ID            4
 
-#if HAS_MEDIA
+#if ENABLED(SDSUPPORT)
   /**
    * USB CDC low level configuration
    * In standalone these configurations are defined by the CDC module.
@@ -208,6 +210,7 @@
   //@}
   //@}
 
+
   /**
    * Configuration of MSC interface
    * @{
@@ -242,6 +245,7 @@
 
   //@}
 
+
   /**
    * Description of Composite Device
    * @{