fix inits

Init values to FAN_OFF_PWM, compare for greater than instead of not equal to in order to catch edge cases
part cooling too
2022-10-20 17:04:22 -05:00 · 2022-10-17 18:39:02 -04:00 · 2022-10-17 15:03:41 -05:00 · 2022-10-17 14:58:45 -05:00 · 2022-10-17 14:43:39 -05:00 · 2022-10-17 14:38:15 -05:00
2190 changed files with 91540 additions and 211296 deletions
@@ -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}
@@ -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"
 }
@@ -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
@@ -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
+      label: Add-ons
-      description: Some Marlin behaviors are determined by the controller. Describe your LCD/Controller model and version.
+      description: Please list any hardware add-ons that could be involved.
  - type: input
    attributes:
      label: Other add-ons
      description: Please list any other hardware add-ons that could be involved.
  - type: dropdown
    attributes:
@@ -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:
@@ -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
@@ -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]
+> **Note:** Please don't file an issue to ask a question. You'll get faster results by using the resources below.
 > 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.
@@ -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]
+> **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.
 > 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?
@@ -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
@@ -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-latest
    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 ?']
            });
          }
@@ -18,10 +18,10 @@ jobs:
    steps:
-    - name: Check out bugfix-2.0.x
+    - name: Check out bugfix-2.1.x
-      uses: actions/checkout@v4
+      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
@@ -12,6 +12,7 @@ on:
    - 1.0.x
    - 1.1.x
    - 2.0.x
    - 2.1.x
 jobs:
  bad_target:
@@ -28,6 +29,6 @@ jobs:
          Please redo this PR starting with the `bugfix-2.1.x` branch and be careful to target `bugfix-2.1.x` when resubmitting the PR. Patches may also target `bugfix-2.0.x` if they are specifically for 2.0.9.x.
-          It may help to set your fork's default branch to `bugfix-2.1.x`.
+          It may help to set your fork's default branch to `bugfix-2.0.x`.
          See [this page](https://marlinfw.org/docs/development/getting_started_pull_requests.html) for full instructions.
@@ -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:
@@ -17,24 +17,12 @@ jobs:
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/stale@v9
+    - uses: actions/stale@v3
      with:
        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        stale-issue-message: |
+        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.'
-          Greetings from the Marlin AutoBot!
+        days-before-stale: 60
-          This issue has had no activity for the last 90 days.
+        days-before-close: 10
          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-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'
@@ -17,15 +17,15 @@ jobs:
    runs-on: ubuntu-latest
    steps:
-    - uses: dessant/lock-threads@v5
+    - uses: dessant/lock-threads@v2
      with:
        github-token: ${{ github.token }}
        process-only: 'issues'
-        issue-inactive-days: '60'
+        issue-lock-inactive-days: '60'
-        exclude-issue-created-before: ''
+        issue-exclude-created-before: ''
-        exclude-any-issue-labels: 'no-locking'
+        issue-exclude-labels: 'no-locking'
-        add-issue-labels: ''
+        issue-lock-labels: ''
-        issue-comment: >
+        issue-lock-comment: >
          This issue has been automatically locked since there
          has not been any recent activity after it was closed.
          Please open a new issue for related bugs.
@@ -9,7 +9,6 @@ on:
  pull_request:
    branches:
    - bugfix-2.1.x
    - 2.1.x
    paths-ignore:
    - config/**
    - data/**
@@ -18,7 +17,6 @@ on:
  push:
    branches:
    - bugfix-2.1.x
    - 2.1.x
    paths-ignore:
    - config/**
    - data/**
@@ -35,124 +33,96 @@ jobs:
    strategy:
      matrix:
        test-platform:
        # Base Environments
-        # Native
+        - DUE
        - DUE_archim
        - esp32
        - linux_native
        # AVR
        - mega2560
        - mega1280
        - at90usb1286_dfu
        - teensy31
        - teensy35
        - teensy41
        - SAMD51_grandcentral_m4
        - PANDA_PI_V29
        # Extended AVR Environments
        # AVR Extended
        - FYSETC_F6
-        - melzi_optiboot
+        - mega1280
        - rambo
        - sanguino1284p
        - sanguino644p
-        # SAM3X8E
+        # STM32F1 (Maple) Environments
        - DUE
        - DUE_archim
-        # SAMD21
+        #- STM32F103RC_btt_maple
        - 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
        - BIGTREE_BTT002
        - BIGTREE_GTR_V1_0
        - BIGTREE_SKR_PRO
        - FLYF407ZG
        - FYSETC_S6
        - 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_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
+        # STM32 (ST) Environments
        - STM32G0B1RE_btt
-        # HC32
+        - STM32F103RC_btt
-        - HC32F460C_aquila_101
+        #- 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
        # ESP32 environments
        - mks_tinybee
        # 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-${{ hashFiles('**/requirements.txt') }}
@@ -160,16 +130,16 @@ jobs:
          ${{ runner.os }}-pip-
    - name: Cache PlatformIO
-      uses: actions/cache@v4
+      uses: actions/cache@v3
      with:
        path: ~/.platformio
        key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
-    - name: Select Python 3.9
+    - name: Select Python 3.7
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v3
      with:
-        python-version: '3.9'
+        python-version: '3.7' # Version range or exact version of a Python version to use, using semvers version range syntax.
-        architecture: 'x64'
+        architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
    - name: Install PlatformIO
      run: |
@@ -21,21 +21,35 @@
 # Generated files
 _Version.h
-bdf2u8g.exe
+bdf2u8g
 genpages.exe
 marlin_config.json
 mczip.h
 language*.csv
 out-csv/
 out-language/
 *.gen
 *.sublime-workspace
 #
 # OS
 #
 applet/
 .DS_Store
-# Compiled C++ Object files
+#
 # Misc
 #
 *~
 *.orig
 *.rej
 *.bak
 *.idea
 *.i
 *.ii
 *.swp
 tags
 #
 # C++
 #
 # Compiled Object files
 *.slo
 *.lo
 *.o
@@ -66,7 +80,10 @@ applet/
 *.out
 *.app
-# Compiled C Object files
+#
 # C
 #
 # Object files
 *.o
 *.ko
 *.obj
@@ -126,16 +143,14 @@ vc-fileutils.settings
 .vscode/*
 !.vscode/extensions.json
-# Simulation files
+#Simulation
 imgui.ini
 eeprom.dat
 spi_flash.bin
 fs.img
-# CMake
+#cmake
 buildroot/share/cmake/*
 CMakeLists.txt
 !buildroot/share/cmake/CMakeLists.txt
 src/CMakeLists.txt
 CMakeListsPrivate.txt
 build/
@@ -155,16 +170,3 @@ __pycache__
 # IOLogger logs
 *_log.csv
 # Misc.
 *~
 *.orig
 *.rej
 *.bak
 *.idea
 *.i
 *.ii
 *.swp
 tags
 *.logs
 *.bak
@@ -6,7 +6,6 @@
        "platformio.platformio-ide"
    ],
    "unwantedRecommendations": [
        "ms-vscode-remote.remote-containers",
        "ms-vscode.cpptools-extension-pack"
    ]
 }
@@ -1,18 +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
 help:
 	@echo "Tasks for local development:"
-	@echo "make marlin                    : Build marlin for the configured board"
+	@echo "* tests-single-ci:             Run a single test from inside the CI"
-	@echo "make format-pins               : Reformat all pins files"
+	@echo "* tests-single-local:          Run a single test locally"
-	@echo "make tests-single-ci           : Run a single test from inside the CI"
+	@echo "* tests-single-local-docker:   Run a single test locally, using docker-compose"
-	@echo "make tests-single-local        : Run a single test locally"
+	@echo "* tests-all-local:             Run all tests locally"
-	@echo "make tests-single-local-docker : Run a single test locally, using docker"
+	@echo "* tests-all-local-docker:      Run all tests locally, using docker-compose"
-	@echo "make tests-all-local           : Run all tests locally"
+	@echo "* setup-local-docker:          Setup local docker-compose"
 	@echo "make tests-all-local-docker    : Run all tests locally, using docker"
 	@echo "make setup-local-docker        : Build the local docker image"
 	@echo ""
 	@echo "Options for testing:"
 	@echo "  TEST_TARGET          Set when running tests-single-*, to select the"
@@ -25,41 +18,35 @@ help:
 	@echo "  VERBOSE_PLATFORMIO   If you want the full PIO output, set any value"
 	@echo "  GIT_RESET_HARD       Used by CI: reset all local changes. WARNING:"
 	@echo "                       THIS WILL UNDO ANY CHANGES YOU'VE MADE!"
-
+.PHONY: help
 marlin:
 	./buildroot/bin/mftest -a
 .PHONY: marlin
 tests-single-ci:
 	export GIT_RESET_HARD=true
-	$(MAKE) tests-single-local TEST_TARGET=$(TEST_TARGET) 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 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
+	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)"
-	$(CONTAINER_RT_BIN) run $(CONTAINER_RT_OPTS) $(CONTAINER_IMAGE) $(MAKE) tests-single-local TEST_TARGET=$(TEST_TARGET) VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) GIT_RESET_HARD=$(GIT_RESET_HARD) ONLY_TEST="$(ONLY_TEST)"
+.PHONY: tests-single-local-docker
 tests-all-local:
-	export PATH="./buildroot/bin/:./buildroot/tests/:${PATH}" \
+	export PATH=./buildroot/bin/:./buildroot/tests/:${PATH} \
 	  && export VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) \
-	  && for TEST_TARGET in $$($(SCRIPTS_DIR)/get_test_targets.py) ; do echo "Running tests for $$TEST_TARGET" ; run_tests . $$TEST_TARGET ; done
+	  && for TEST_TARGET in $$(./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
+	docker-compose run --rm marlin $(MAKE) tests-all-local VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) GIT_RESET_HARD=$(GIT_RESET_HARD)
-	$(CONTAINER_RT_BIN) run $(CONTAINER_RT_OPTS) $(CONTAINER_IMAGE) $(MAKE) tests-all-local VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) GIT_RESET_HARD=$(GIT_RESET_HARD)
+.PHONY: tests-all-local-docker
 setup-local-docker:
-	$(CONTAINER_RT_BIN) build -t $(CONTAINER_IMAGE) -f docker/Dockerfile .
+	docker-compose build
-
+.PHONY: setup-local-docker
 PINS := $(shell find Marlin/src/pins -mindepth 2 -name '*.h')
 $(PINS): %:
 	@echo "Formatting $@" && node $(SCRIPTS_DIR)/pinsformat.js $@
 format-pins: $(PINS)
@@ -63,8 +63,8 @@ HARDWARE_MOTHERBOARD ?= 1020
 ifeq ($(OS),Windows_NT)
  # Windows
-  ARDUINO_INSTALL_DIR ?= ${HOME}/AppData/Local/Arduino
+  ARDUINO_INSTALL_DIR ?= ${HOME}/Arduino
-  ARDUINO_USER_DIR ?= ${HOME}/Documents/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_INSTALL_DIR  ?= ${HOME}/Arduino
-ARDUINO_VERSION      ?= 10819
+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/
@@ -307,22 +307,20 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1154)
 else ifeq ($(HARDWARE_MOTHERBOARD),1155)
 # Tenlog D3 Hero IDEX printer
 else ifeq ($(HARDWARE_MOTHERBOARD),1156)
 # Tenlog D3,5,6 Pro IDEX printers
 else ifeq ($(HARDWARE_MOTHERBOARD),1157)
 # Ramps S 1.2 by Sakul.cz (Power outputs: Hotend0, Hotend1, Fan, Bed)
-else ifeq ($(HARDWARE_MOTHERBOARD),1158)
+else ifeq ($(HARDWARE_MOTHERBOARD),1157)
 # Ramps S 1.2 by Sakul.cz (Power outputs: Hotend0, Hotend1, Hotend2, Bed)
-else ifeq ($(HARDWARE_MOTHERBOARD),1159)
+else ifeq ($(HARDWARE_MOTHERBOARD),1158)
 # Ramps S 1.2 by Sakul.cz (Power outputs: Hotend, Fan0, Fan1, Bed)
-else ifeq ($(HARDWARE_MOTHERBOARD),1160)
+else ifeq ($(HARDWARE_MOTHERBOARD),1159)
 # Longer LK1 PRO / Alfawise U20 Pro (PRO version)
-else ifeq ($(HARDWARE_MOTHERBOARD),1161)
+else ifeq ($(HARDWARE_MOTHERBOARD),1160)
 # Longer LKx PRO / Alfawise Uxx Pro (PRO version)
-else ifeq ($(HARDWARE_MOTHERBOARD),1162)
+else ifeq ($(HARDWARE_MOTHERBOARD),1161)
 # Zonestar zrib V5.3 (Chinese RAMPS replica)
-else ifeq ($(HARDWARE_MOTHERBOARD),1163)
+else ifeq ($(HARDWARE_MOTHERBOARD),1162)
 # Pxmalion Core I3
-else ifeq ($(HARDWARE_MOTHERBOARD),1164)
+else ifeq ($(HARDWARE_MOTHERBOARD),1163)
 #
 # RAMBo and derivatives
@@ -656,18 +654,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)/hardware/arduino/avr/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/SoftwareSerial/src
 endif
 VPATH += $(ARDUINO_INSTALL_DIR)/libraries/LiquidCrystal/src
@@ -681,17 +679,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)/hardware/arduino/avr/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/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
-VPATH += $(ARDUINO_INSTALL_DIR)/libraries/U8glib-HAL/src
+VPATH += $(ARDUINO_INSTALL_DIR)/libraries/U8glib/csrc
-# VPATH += $(ARDUINO_INSTALL_DIR)/libraries/U8glib
+VPATH += $(ARDUINO_INSTALL_DIR)/libraries/U8glib/cppsrc
-# VPATH += $(ARDUINO_INSTALL_DIR)/libraries/U8glib/src
+VPATH += $(ARDUINO_INSTALL_DIR)/libraries/U8glib/fntsrc
 endif
 ifeq ($(TMC), 1)
 VPATH += $(ARDUINO_INSTALL_DIR)/libraries/TMCStepper/src
@@ -700,9 +698,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/
@@ -718,7 +716,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 \
@@ -733,7 +731,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
@@ -880,7 +878,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) \
@@ -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
@@ -41,7 +41,7 @@
 * here we define this default string as the date where the latest release
 * version was tagged.
 */
-//#define STRING_DISTRIBUTION_DATE "2024-04-10"
+//#define STRING_DISTRIBUTION_DATE "2022-10-12"
 /**
 * Defines a generic printer name to be output to the LCD after booting Marlin.
@@ -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
@@ -82,7 +42,7 @@ preheat_1_temp_hotend                    = 180
 bang_max                                 = 255
 pidtemp                                  = on
 pid_k1                                   = 0.95
-pid_max                                  = 255
+pid_max                                  = BANG_MAX
 pid_functional_range                     = 10
 default_kp                               = 22.20
@@ -109,9 +69,13 @@ x_home_dir                               = -1
 y_home_dir                               = -1
 z_home_dir                               = -1
-x_min_endstop_hit_state                  = HIGH
+use_xmin_plug                            = on
-y_min_endstop_hit_state                  = HIGH
+use_ymin_plug                            = on
-z_min_endstop_hit_state                  = HIGH
+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 }
@@ -131,15 +95,15 @@ invert_y_dir                             = true
 invert_z_dir                             = false
 invert_e0_dir                            = false
-step_state_e                             = HIGH
+invert_e_step_pin                        = false
-step_state_x                             = HIGH
+invert_x_step_pin                        = false
-step_state_y                             = HIGH
+invert_y_step_pin                        = false
-step_state_z                             = HIGH
+invert_z_step_pin                        = false
-disable_x                                = off
+disable_x                                = false
-disable_y                                = off
+disable_y                                = false
-disable_z                                = off
+disable_z                                = false
-disable_e                                = off
+disable_e                                = false
 proportional_font_ratio                  = 1.0
 default_nominal_filament_dia             = 1.75
@@ -163,7 +127,7 @@ busy_while_heating                       = on
 default_ejerk                            = 5.0
 default_keepalive_interval               = 2
 default_leveling_fade_height             = 0.0
-disable_other_extruders                  = on
+disable_inactive_extruder                = on
 display_charset_hd44780                  = JAPANESE
 eeprom_boot_silent                       = on
 eeprom_chitchat                          = on
@@ -212,12 +176,12 @@ auto_report_temperatures                 = on
 autotemp                                 = on
 autotemp_oldweight                       = 0.98
 bed_check_interval                       = 5000
-default_stepper_timeout_sec              = 120
+default_stepper_deactive_time            = 120
 default_volumetric_extruder_limit        = 0.00
-disable_idle_x                           = on
+disable_inactive_e                       = true
-disable_idle_y                           = on
+disable_inactive_x                       = true
-disable_idle_z                           = on
+disable_inactive_y                       = true
-disable_idle_e                           = on
+disable_inactive_z                       = true
 e0_auto_fan_pin                          = -1
 encoder_100x_steps_per_sec               = 80
 encoder_10x_steps_per_sec                = 30
@@ -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);
+    INIT_SERVO(3);
  #endif
  #if HAS_SERVO_4
    OUT_WRITE(SERVO4_PIN, LOW);
  #endif
  #if HAS_SERVO_5
    OUT_WRITE(SERVO5_PIN, LOW);
  #endif
  init_pwm_timers();   // Init user timers to default frequency - 1000HZ
  #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() {
@@ -168,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;
@@ -190,6 +167,6 @@ void MarlinHAL::reboot() {
    }
  }
-#endif // !HAS_MEDIA
+#endif // !SDSUPPORT
 #endif // __AVR__
@@ -1,9 +1,7 @@
 /**
 * Marlin 3D Printer Firmware
 * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
+ * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
 * Based on Sprinter and grbl.
 * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -34,7 +32,6 @@
  #include <HardwareSerial.h>
 #else
  #include "MarlinSerial.h"
  #define BOARD_NO_NATIVE_USB
 #endif
 #include <stdint.h>
@@ -109,47 +106,47 @@ typedef Servo hal_servo_t;
  #define MYSERIAL1 TERN(BLUETOOTH, btSerial, MSerial0)
 #else
-  #if !WITHIN(SERIAL_PORT, 0, 3)
+  #if !WITHIN(SERIAL_PORT, -1, 3)
-    #error "SERIAL_PORT must be from 0 to 3."
+    #error "SERIAL_PORT must be from 0 to 3, or -1 for USB Serial."
  #endif
  #define MYSERIAL1 customizedSerial1
  #ifdef SERIAL_PORT_2
-    #if !WITHIN(SERIAL_PORT_2, 0, 3)
+    #if !WITHIN(SERIAL_PORT_2, -1, 3)
-      #error "SERIAL_PORT_2 must be from 0 to 3."
+      #error "SERIAL_PORT_2 must be from 0 to 3, or -1 for USB Serial."
    #endif
    #define MYSERIAL2 customizedSerial2
  #endif
  #ifdef SERIAL_PORT_3
-    #if !WITHIN(SERIAL_PORT_3, 0, 3)
+    #if !WITHIN(SERIAL_PORT_3, -1, 3)
-      #error "SERIAL_PORT_3 must be from 0 to 3."
+      #error "SERIAL_PORT_3 must be from 0 to 3, or -1 for USB Serial."
    #endif
    #define MYSERIAL3 customizedSerial3
  #endif
 #endif
 #ifdef MMU2_SERIAL_PORT
-  #if !WITHIN(MMU2_SERIAL_PORT, 0, 3)
+  #if !WITHIN(MMU2_SERIAL_PORT, -1, 3)
-    #error "MMU2_SERIAL_PORT must be from 0 to 3"
+    #error "MMU2_SERIAL_PORT must be from 0 to 3, or -1 for USB Serial."
  #endif
  #define MMU2_SERIAL mmuSerial
 #endif
 #ifdef LCD_SERIAL_PORT
-  #if !WITHIN(LCD_SERIAL_PORT, 0, 3)
+  #if !WITHIN(LCD_SERIAL_PORT, -1, 3)
-    #error "LCD_SERIAL_PORT must be from 0 to 3."
+    #error "LCD_SERIAL_PORT must be from 0 to 3, or -1 for USB Serial."
  #endif
  #define LCD_SERIAL lcdSerial
  #if HAS_DGUS_LCD
-    #define LCD_SERIAL_TX_BUFFER_FREE() LCD_SERIAL.get_tx_buffer_free()
+    #define SERIAL_GET_TX_BUFFER_FREE() LCD_SERIAL.get_tx_buffer_free()
  #endif
 #endif
 //
 // ADC
 //
-#define HAL_ADC_VREF_MV   5000
+#define HAL_ADC_VREF        5.0
 #define HAL_ADC_RESOLUTION 10
 //
@@ -189,7 +186,7 @@ class MarlinHAL {
 public:
  // Earliest possible init, before setup()
-  MarlinHAL();
+  MarlinHAL() {}
  // Watchdog
  static void watchdog_init()    IF_DISABLED(USE_WATCHDOG, {});
@@ -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;
@@ -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;
@@ -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;
@@ -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) {
@@ -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++;
@@ -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
@@ -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);
+    LOOP_L_N(i, COUNT(prescaler)) {                           // Loop through all prescaler values
-    DEBUG_ECHOLNPGM("(prescaler loop)");
+      const uint16_t p = prescaler[i];
    for (uint8_t i = 0; i < COUNT(prescaler); ++i) {          // Loop through all prescaler values
      const uint32_t p = prescaler[i];                        // Extend to 32 bits for calculations
      DEBUG_ECHOLNPGM("prescaler[", i, "]=", p);
      uint16_t res_fast_temp, res_pc_temp;
      if (is_timer2) {
        #if ENABLED(USE_OCR2A_AS_TOP)                         // No resolution calculation for TIMER2 unless enabled USE_OCR2A_AS_TOP
          const uint16_t rft = (F_CPU) / (p * f_desired);
          res_fast_temp = rft - 1;
          res_pc_temp = rft / 2;
          DEBUG_ECHOLNPGM("(Timer2) res_fast_temp=", res_fast_temp, " res_pc_temp=", res_pc_temp);
        #else
          res_fast_temp = res_pc_temp = maxtop;
          DEBUG_ECHOLNPGM("(Timer2) res_fast_temp=", maxtop, " res_pc_temp=", maxtop);
        #endif
      }
      else {
        if (p == 32 || p == 128) continue;                    // Skip TIMER2 specific prescalers when not TIMER2
        const uint16_t rft = (F_CPU) / (p * f_desired);
        DEBUG_ECHOLNPGM("(Not Timer 2) F_CPU=" STRINGIFY(F_CPU), " prescaler=", p, " f_desired=", f_desired);
        res_fast_temp = rft - 1;
        res_pc_temp = rft / 2;
      }
@@ -159,28 +146,24 @@ void MarlinHAL::set_pwm_frequency(const pin_t pin, const uint16_t f_desired) {
      LIMIT(res_pc_temp, 1U, maxtop);
      // Calculate frequencies of test prescaler and resolution values
-      const uint16_t f_fast_temp = (F_CPU) / (p * (1 + res_fast_temp)),
+      const uint32_t f_diff      = _MAX(f, f_desired) - _MIN(f, f_desired),
-                     f_pc_temp   = (F_CPU) / ((p * res_pc_temp) << 1),
+                     f_fast_temp = (F_CPU) / (p * (1 + res_fast_temp)),
                     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_temp   = (F_CPU) / (2 * p * res_pc_temp),
                     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);
 }
@@ -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 || P == MOTOR_CURRENT_PWM_Z || P == MOTOR_CURRENT_PWM_XY)
  #elif PIN_EXISTS(MOTOR_CURRENT_PWM_Z)
    #define PWM_CHK_MOTOR_CURRENT(P) (P == MOTOR_CURRENT_PWM_E || P == MOTOR_CURRENT_PWM_Z)
  #else
    #define PWM_CHK_MOTOR_CURRENT(P) (P == MOTOR_CURRENT_PWM_E)
  #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
@@ -27,44 +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
 *
 * Arduino Pin Layout video: https://youtu.be/rIqeVCX09FA
 * AVR alternate pin function overview video: https://youtu.be/1yd8wuI5Plg
 */
 #include "../fastio.h"
 // change for your board
 #define DEBUG_LED   DIO21
 // UART
-#define RXD         0
+#define RXD         DIO0
-#define TXD         1
+#define TXD         DIO1
 // SPI
-#define MISO        50
+#define SCK         DIO52
-#define MOSI        51
+#define MISO        DIO50
-#define SCK         52
+#define MOSI        DIO51
-#define SS          53
+#define SS          DIO53
 // TWI (I2C)
-#define SCL         21
+#define SCL         DIO21
-#define SDA         20
+#define SDA         DIO20
 // Timers and PWM
-#define OC0A        13
+#define OC0A        DIO13
-#define OC0B        4
+#define OC0B        DIO4
-#define OC1A        11
+#define OC1A        DIO11
-#define OC1B        12
+#define OC1B        DIO12
-#define OC2A        10
+#define OC2A        DIO10
-#define OC2B        9
+#define OC2B        DIO9
-#define OC3A        5
+#define OC3A        DIO5
-#define OC3B        2
+#define OC3B        DIO2
-#define OC3C        3
+#define OC3C        DIO3
-#define OC4A        6
+#define OC4A        DIO6
-#define OC4B        7
+#define OC4B        DIO7
-#define OC4C        8
+#define OC4C        DIO8
-#define OC5A        46
+#define OC5A        DIO46
-#define OC5B        45
+#define OC5B        DIO45
-#define OC5C        44
+#define OC5C        DIO44
 // Digital I/O
@@ -26,36 +26,36 @@
 *
 *   Logical Pin: 38 39 40 41 42 43 44 45 16 10 11 12 06 07 08 09 30 31 32 33 34 35 36 37 17 18 19 20 21 22 23 24 00 01 13 05 02 03 14 15 46 47 48 49 50 51 52 53 25 26 27 28 29 04
 *   Port:        A0 A1 A2 A3 A4 A5 A6 A7 B0 B1 B2 B3 B4 B5 B6 B7 C0 C1 C2 C3 C4 C5 C6 C7 D0 D1 D2 D3 D4 D5 D6 D7 E0 E1 E2 E3 E4 E5 E6 E7 F0 F1 F2 F3 F4 F5 F6 F7 G0 G1 G2 G3 G4 G5
 *
 * Arduino Pin Layout video: https://youtu.be/rIqeVCX09FA
 * AVR alternate pin function overview video: https://youtu.be/1yd8wuI5Plg
 */
 #include "../fastio.h"
 // change for your board
 #define DEBUG_LED   DIO46
 // UART
-#define RXD         0
+#define RXD         DIO0
-#define TXD         1
+#define TXD         DIO1
 // SPI
-#define SCK         10
+#define SCK         DIO10
-#define MISO        12
+#define MISO        DIO12
-#define MOSI        11
+#define MOSI        DIO11
-#define SS          16
+#define SS          DIO16
 // TWI (I2C)
-#define SCL         17
+#define SCL         DIO17
-#define SDA         18
+#define SDA         DIO18
 // Timers and PWM
-#define OC0A        9
+#define OC0A        DIO9
-#define OC0B        4
+#define OC0B        DIO4
-#define OC1A        7
+#define OC1A        DIO7
-#define OC1B        8
+#define OC1B        DIO8
-#define OC2A        6
+#define OC2A        DIO6
-#define OC3A        5
+#define OC3A        DIO5
-#define OC3B        2
+#define OC3B        DIO2
-#define OC3C        3
+#define OC3C        DIO3
 // Digital I/O
@@ -26,34 +26,33 @@
 *
 *   Logical Pin: 08 09 10 11 12 13 14 15 16 17 18 19 20 21 00 01 02 03 04 05 06 07
 *   Port:        B0 B1 B2 B3 B4 B5 C0 C1 C2 C3 C4 C5 C6 C7 D0 D1 D2 D3 D4 D5 D6 D7
 *
 * Arduino Pin Layout video: https://youtu.be/rIqeVCX09FA
 * AVR alternate pin function overview video: https://youtu.be/1yd8wuI5Plg
 */
 #include "../fastio.h"
 #define DEBUG_LED   AIO5
 // UART
-#define RXD         0
+#define RXD         DIO0
-#define TXD         1
+#define TXD         DIO1
 // SPI
-#define SS          10
+#define SCK         DIO13
-#define MOSI        11
+#define MISO        DIO12
-#define MISO        12
+#define MOSI        DIO11
-#define SCK         13
+#define SS          DIO10
 // TWI (I2C)
 #define SCL         AIO5
 #define SDA         AIO4
 // Timers and PWM
-#define OC0A        6
+#define OC0A        DIO6
-#define OC0B        5
+#define OC0B        DIO5
-#define OC1A        9
+#define OC1A        DIO9
-#define OC1B        10
+#define OC1B        DIO10
-#define OC2A        11
+#define OC2A        DIO11
-#define OC2B        3
+#define OC2B        DIO3
 // Digital I/O
@@ -26,9 +26,6 @@
 *
 *   Logical Pin: 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31
 *   Port:        B0 B1 B2 B3 B4 B5 B6 B7 D0 D1 D2 D3 D4 D5 D6 D7 C0 C1 C2 C3 C4 C5 C6 C7 A7 A6 A5 A4 A3 A2 A1 A0
 *
 * Arduino Pin Layout video: https://youtu.be/rIqeVCX09FA
 * AVR alternate pin function overview video: https://youtu.be/1yd8wuI5Plg
 */
 /**                        ATMega644
@@ -59,32 +56,34 @@
 #include "../fastio.h"
-// UART
+#define DEBUG_LED   DIO0
 #define RXD         8
 #define TXD         9
 #define RXD0        8
 #define TXD0        9
-#define RXD1        10
+// UART
-#define TXD1        11
+#define RXD         DIO8
 #define TXD         DIO9
 #define RXD0        DIO8
 #define TXD0        DIO9
 #define RXD1        DIO10
 #define TXD1        DIO11
 // SPI
-#define SS          4
+#define SCK         DIO7
-#define MOSI        5
+#define MISO        DIO6
-#define MISO        6
+#define MOSI        DIO5
-#define SCK         7
+#define SS          DIO4
 // TWI (I2C)
-#define SCL         16
+#define SCL         DIO16
-#define SDA         17
+#define SDA         DIO17
 // Timers and PWM
-#define OC0A        3
+#define OC0A        DIO3
-#define OC0B        4
+#define OC0B        DIO4
-#define OC1A        13
+#define OC1A        DIO13
-#define OC1B        12
+#define OC1B        DIO12
-#define OC2A        15
+#define OC2A        DIO15
-#define OC2B        14
+#define OC2B        DIO14
 // Digital I/O
@@ -27,18 +27,18 @@
 *   Logical Pin: 28 29 30 31 32 33 34 35 20 21 22 23 24 25 26 27 10 11 12 13 14 15 16 17 00 01 02 03 04 05 06 07 08 09(46*47)36 37 18 19 38 39 40 41 42 43 44 45
 *   Port:        A0 A1 A2 A3 A4 A5 A6 A7 B0 B1 B2 B3 B4 B5 B6 B7 C0 C1 C2 C3 C4 C5 C6 C7 D0 D1 D2 D3 D4 D5 D6 D7 E0 E1 E2 E3 E4 E5 E6 E7 F0 F1 F2 F3 F4 F5 F6 F7
 *            The logical pins 46 and 47 are not supported by Teensyduino, but are supported below as E2 and E3
 *
 * Arduino Pin Layout video: https://youtu.be/rIqeVCX09FA
 * AVR alternate pin function overview video: https://youtu.be/1yd8wuI5Plg
 */
 #include "../fastio.h"
 // change for your board
 #define DEBUG_LED   DIO31 /* led D5 red */
 // SPI
-#define SS          20  //  8
+#define SCK         DIO21  //  9
-#define SCK         21  //  9
+#define MISO        DIO23  // 11
-#define MOSI        22  // 10
+#define MOSI        DIO22  // 10
-#define MISO        23  // 11
+#define SS          DIO20  //  8
 // Digital I/O
@@ -679,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.
@@ -21,6 +21,6 @@
 */
 #pragma once
-#ifndef SERIAL_PORT
+#if HAS_SPI_TFT || HAS_FSMC_TFT
-  #define SERIAL_PORT 0
+  #error "Sorry! TFT displays are not available for HAL/AVR."
 #endif
@@ -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
@@ -25,10 +25,6 @@
 * 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
 */
@@ -39,26 +35,24 @@
  || 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 \
+  || BTN_EN1    == N || BTN_EN2    == N \
 )
-#if SERIAL_IN_USE(0)
+#if CONF_SERIAL_IS(0)
  // D0-D1. No known conflicts.
 #endif
 #if SERIAL_IN_USE(1)
 #if NOT_TARGET(__AVR_ATmega644P__, __AVR_ATmega1284P__)
-    #if CHECK_SERIAL_PIN(18) || CHECK_SERIAL_PIN(19)
+  #if CONF_SERIAL_IS(1) && (CHECK_SERIAL_PIN(18) || CHECK_SERIAL_PIN(19))
    #error "Serial Port 1 pin D18 and/or D19 conflicts with another pin on the board."
  #endif
 #else
-    #if CHECK_SERIAL_PIN(10) || CHECK_SERIAL_PIN(11)
+  #if CONF_SERIAL_IS(1) && (CHECK_SERIAL_PIN(10) || CHECK_SERIAL_PIN(11))
    #error "Serial Port 1 pin D10 and/or D11 conflicts with another pin on the board."
  #endif
 #endif
-#endif
+#if CONF_SERIAL_IS(2) && (CHECK_SERIAL_PIN(16) || CHECK_SERIAL_PIN(17))
 #if SERIAL_IN_USE(2) && (CHECK_SERIAL_PIN(16) || CHECK_SERIAL_PIN(17))
  #error "Serial Port 2 pin D16 and/or D17 conflicts with another pin on the board."
 #endif
-#if SERIAL_IN_USE(3) && (CHECK_SERIAL_PIN(14) || CHECK_SERIAL_PIN(15))
+#if CONF_SERIAL_IS(3) && (CHECK_SERIAL_PIN(14) || CHECK_SERIAL_PIN(15))
  #error "Serial Port 3 pin D14 and/or D15 conflicts with another pin on the board."
 #endif
 #undef CHECK_SERIAL_PIN
@@ -73,8 +67,8 @@
 /**
 * Checks for SOFT PWM
 */
-#if HAS_FAN0 && FAN0_PIN == 9 && DISABLED(FAN_SOFT_PWM) && ENABLED(SPEAKER)
+#if HAS_FAN0 && FAN_PIN == 9 && DISABLED(FAN_SOFT_PWM) && ENABLED(SPEAKER)
-  #error "FAN0_PIN 9 Hardware PWM uses Timer 2 which conflicts with Arduino AVR Tone Timer (for SPEAKER)."
+  #error "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 +89,11 @@
 /**
 * The Trinamic library includes SoftwareSerial.h, leading to a compile error.
 */
-#if ALL(HAS_TRINAMIC_CONFIG, 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
@@ -27,14 +27,13 @@
 // intRes = longIn1 * longIn2 >> 24
 // uses:
-// r1, r0 for the result of mul.
+// A[tmp] to store 0
-// [tmp1] to store 0.
+// B[tmp] to store bits 16-23 of the 48bit result. The top bit is used to round the two byte result.
-// [tmp2] to store bits 16-23 of the 56 bit result. The top bit of [tmp2] is used for rounding.
+// note that the lower two bytes and the upper byte of the 48bit result are not calculated.
-// Note that the lower two bytes and the upper two bytes of the 56 bit result are not calculated.
+// this can cause the result to be out by one as the lower bytes may cause carries into the upper ones.
-// This can cause the result to be out by one as the lower bytes may cause carries into the upper ones.
+// B A are bits 24-39 and are the returned value
-// [intRes] (A B) is bits 24-39 and is the returned value.
+// C B A is longIn1
-// [longIn1] (C B A) is a 24 bit parameter.
+// D C B A is longIn2
 // [longIn2] (D C B A) is a 32 bit parameter.
 //
 FORCE_INLINE static uint16_t MultiU24X32toH16(uint32_t longIn1, uint32_t longIn2) {
  uint8_t tmp1;
@@ -67,9 +66,11 @@ FORCE_INLINE static uint16_t MultiU24X32toH16(uint32_t longIn1, uint32_t longIn2
    A("add %[tmp2], r1")
    A("adc %A[intRes], %[tmp1]")
    A("adc %B[intRes], %[tmp1]")
    A("lsr %[tmp2]")
    A("adc %A[intRes], %[tmp1]")
    A("adc %B[intRes], %[tmp1]")
    A("mul %D[longIn2], %A[longIn1]")
-    A("lsl %[tmp2]")
+    A("add %A[intRes], r0")
    A("adc %A[intRes], r0")
    A("adc %B[intRes], r1")
    A("mul %D[longIn2], %B[longIn1]")
    A("add %B[intRes], r0")
@@ -84,26 +85,29 @@ FORCE_INLINE static uint16_t MultiU24X32toH16(uint32_t longIn1, uint32_t longIn2
  return intRes;
 }
-// charRes = charIn1 * charIn2 >> 8
+// intRes = intIn1 * intIn2 >> 16
 // uses:
-// r1, r0 for the result of mul. After the mul, r0 holds bits 0-7 of the 16 bit result,
+// r26 to store 0
-//        and the top bit of r0 is used for rounding.
+// r27 to store the byte 1 of the 24 bit result
-// [charRes] is bits 8-15 and is the returned value.
+FORCE_INLINE static uint16_t MultiU16X8toH16(uint8_t charIn1, uint16_t intIn2) {
-// [charIn1] is an 8 bit parameter.
+  uint8_t tmp;
-// [charIn2] is an 8 bit parameter.
+  uint16_t intRes;
 //
 FORCE_INLINE static uint8_t MultiU8X8toH8(uint8_t charIn1, uint8_t charIn2) {
  uint8_t charRes;
  __asm__ __volatile__ (
-    A("mul %[charIn1], %[charIn2]")
+    A("clr %[tmp]")
-    A("mov %[charRes], r1")
+    A("mul %[charIn1], %B[intIn2]")
    A("movw %A[intRes], r0")
    A("mul %[charIn1], %A[intIn2]")
    A("add %A[intRes], r1")
    A("adc %B[intRes], %[tmp]")
    A("lsr r0")
    A("adc %A[intRes], %[tmp]")
    A("adc %B[intRes], %[tmp]")
    A("clr r1")
-    A("lsl r0")
+      : [intRes] "=&r" (intRes),
-    A("adc %[charRes], r1")
+        [tmp] "=&r" (tmp)
      : [charRes] "=&r" (charRes)
      : [charIn1] "d" (charIn1),
-        [charIn2] "d" (charIn2)
+        [intIn2] "d" (intIn2)
      : "cc"
  );
-  return charRes;
+  return intRes;
 }
@@ -64,25 +64,23 @@
 #define VALID_PIN(pin) (pin >= 0 && pin < NUM_DIGITAL_PINS ? 1 : 0)
 #if AVR_ATmega1284_FAMILY
-  #define IS_ANALOG(P) WITHIN(P, analogInputToDigitalPin(7), analogInputToDigitalPin(0))
+  #define DIGITAL_PIN_TO_ANALOG_PIN(P) int(analogInputToDigitalPin(0) - (P))
-  #define DIGITAL_PIN_TO_ANALOG_PIN(P) int(IS_ANALOG(P) ? (P) - analogInputToDigitalPin(7) : -1)
+  #define IS_ANALOG(P) ((P) >= analogInputToDigitalPin(7) && (P) <= analogInputToDigitalPin(0))
 #else
-  #define _ANALOG1(P) WITHIN(P, analogInputToDigitalPin(0), analogInputToDigitalPin(7))
+  #define DIGITAL_PIN_TO_ANALOG_PIN(P) int((P) - analogInputToDigitalPin(0))
-  #define _ANALOG2(P) WITHIN(P, analogInputToDigitalPin(8), analogInputToDigitalPin(15))
+  #define IS_ANALOG(P) ((P) >= analogInputToDigitalPin(0) && ((P) <= analogInputToDigitalPin(15) || (P) <= analogInputToDigitalPin(7)))
  #define IS_ANALOG(P) (_ANALOG1(P) || _ANALOG2(P))
  #define DIGITAL_PIN_TO_ANALOG_PIN(P) int(_ANALOG1(P) ? (P) - analogInputToDigitalPin(0) : _ANALOG2(P) ? (P) - analogInputToDigitalPin(8) + 8 : -1)
 #endif
 #define 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 PRINT_ARRAY_NAME(uint8_t x) {
  PGM_P const name_mem_pointer = (PGM_P)pgm_read_ptr(&pin_array[x].name);
-  for (uint8_t y = 0; y < MAX_NAME_LENGTH; ++y) {
+  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;
    }
  }
@@ -90,6 +88,7 @@ void PRINT_ARRAY_NAME(uint8_t x) {
 #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
  #define NUM_DIGITAL_PINS 32     // set to digital only + digital/analog
@@ -109,7 +108,7 @@ void PRINT_ARRAY_NAME(uint8_t x) {
 * Print a pin's PWM status.
 * Return true if it's currently a PWM pin.
 */
-bool pwm_status(uint8_t pin) {
+static bool pwm_status(uint8_t pin) {
  char buffer[20];   // for the sprintf statements
  switch (digitalPinToTimer_DEBUG(pin)) {
@@ -163,6 +162,7 @@ bool pwm_status(uint8_t pin) {
  SERIAL_ECHO_SP(2);
 } // pwm_status
 const volatile uint8_t* const PWM_other[][3] PROGMEM = {
    { &TCCR0A, &TCCR0B, &TIMSK0 },
    { &TCCR1A, &TCCR1B, &TIMSK1 },
@@ -180,6 +180,7 @@ const volatile uint8_t* const PWM_other[][3] PROGMEM = {
  #endif
 };
 const volatile uint8_t* const PWM_OCR[][3] PROGMEM = {
  #ifdef TIMER0A
@@ -215,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])
@@ -229,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"); }
+static void err_is_counter()     { SERIAL_ECHOPGM("   non-standard PWM mode"); }
-void err_is_interrupt()   { SERIAL_ECHOPGM("   compare interrupt enabled"); }
+static void err_is_interrupt()   { SERIAL_ECHOPGM("   compare interrupt enabled"); }
-void err_prob_interrupt() { SERIAL_ECHOPGM("   overflow interrupt enabled"); }
+static 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 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);
@@ -276,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 pwm_details(uint8_t pin) {
+static void pwm_details(uint8_t pin) {
  switch (digitalPinToTimer_DEBUG(pin)) {
    #if ABTEST(0)
@@ -350,13 +352,15 @@ void pwm_details(uint8_t pin) {
 } // 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 print_port(const pin_t pin) {   // print port number
+#ifndef PRINT_PORT
  void print_port(int8_t pin) {   // print port number
    #ifdef digitalPinToPort_DEBUG
      uint8_t x;
      SERIAL_ECHOPGM("  Port: ");
@@ -386,6 +390,10 @@ void print_port(const pin_t pin) {   // print port number
    #endif
  }
  #define PRINT_PORT(p) print_port(p)
 #endif
 #define PRINT_PIN(p) do{ sprintf_P(buffer, PSTR("%3d "), p); SERIAL_ECHO(buffer); }while(0)
 #define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); SERIAL_ECHO(buffer); }while(0)
@@ -22,10 +22,11 @@
 #pragma once
 //
-// Some of the pin mapping functions of the Arduino IDE Teensduino extension
+//  some of the pin mapping functions of the Teensduino extension to the Arduino IDE
-// function differently from other Arduino extensions.
+//  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,7 +101,7 @@ 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
@@ -231,6 +231,7 @@ const uint8_t PROGMEM digital_pin_to_bit_mask_PGM_plus_70[] = {
 #define digitalPinToBitMask_plus_70(P) ( pgm_read_byte( digital_pin_to_bit_mask_PGM_plus_70 + (P) ) )
 const uint8_t PROGMEM digital_pin_to_timer_PGM_plus_70[] = {
  // TIMERS
  // ------------------------
@@ -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__
@@ -1,9 +1,7 @@
 /**
 * Marlin 3D Printer Firmware
 * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
+ * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
 * Based on Sprinter and grbl.
 * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -46,13 +44,13 @@ 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) / 1000000)
+#define STEPPER_TIMER_TICKS_PER_US ((STEPPER_TIMER_RATE) / 1000000) // Cannot be of type double
-#define PULSE_TIMER_RATE         STEPPER_TIMER_RATE
+#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
@@ -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
@@ -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,6 +120,7 @@ void u8g_spiSend_sw_AVR_mode_3(uint8_t val) {
  U8G_ATOMIC_END();
 }
 #if ENABLED(FYSETC_MINI_12864)
  #define SPISEND_SW_AVR u8g_spiSend_sw_AVR_mode_3
 #else
@@ -1,9 +1,7 @@
 /**
 * Marlin 3D Printer Firmware
 * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
+ * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
 * Based on Sprinter and grbl.
 * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -47,7 +45,7 @@ uint16_t MarlinHAL::adc_result;
 #endif
 void MarlinHAL::init() {
-  #if HAS_MEDIA
+  #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
@@ -1,9 +1,9 @@
 /**
 * Marlin 3D Printer Firmware
 * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
 *
- * Based on Sprinter and grbl.
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ * 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
@@ -123,7 +123,7 @@ 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
@@ -42,7 +42,7 @@
 // Public functions
 // ------------------------
-#if ANY(SOFTWARE_SPI, FORCE_SOFT_SPI)
+#if EITHER(DUE_SOFTWARE_SPI, FORCE_SOFT_SPI)
  // ------------------------
  // Software SPI
@@ -474,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> >;
@@ -30,7 +30,6 @@
 #include <WString.h>
 #include "../../inc/MarlinConfigPre.h"
 #include "../../core/types.h"
 #include "../../core/serial_hook.h"
 // Define constants and variables for buffering incoming serial data.  We're
@@ -53,6 +52,10 @@
 //  #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) {}
@@ -73,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;
@@ -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)
@@ -1,9 +1,10 @@
 /**
 * Marlin 3D Printer Firmware
 * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
 *
- * Based on Sprinter and grbl.
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ * 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
@@ -958,14 +959,14 @@ static void ee_Init() {
 #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++;
@@ -1,9 +1,10 @@
 /**
 * Marlin 3D Printer Firmware
 * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
 *
- * Based on Sprinter and grbl.
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ * 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
@@ -36,14 +37,14 @@
 #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++;
@@ -47,33 +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_(HAS_X_MAX, _ATTACH(X_MAX_PIN));
-  TERN_(USE_X_MIN,       _ATTACH(X_MIN_PIN));
+  TERN_(HAS_X_MIN, _ATTACH(X_MIN_PIN));
-  TERN_(USE_Y_MAX,       _ATTACH(Y_MAX_PIN));
+  TERN_(HAS_Y_MAX, _ATTACH(Y_MAX_PIN));
-  TERN_(USE_Y_MIN,       _ATTACH(Y_MIN_PIN));
+  TERN_(HAS_Y_MIN, _ATTACH(Y_MIN_PIN));
-  TERN_(USE_Z_MAX,       _ATTACH(Z_MAX_PIN));
+  TERN_(HAS_Z_MAX, _ATTACH(Z_MAX_PIN));
-  TERN_(USE_Z_MIN,       _ATTACH(Z_MIN_PIN));
+  TERN_(HAS_Z_MIN, _ATTACH(Z_MIN_PIN));
-  TERN_(USE_X2_MAX,      _ATTACH(X2_MAX_PIN));
+  TERN_(HAS_X2_MAX, _ATTACH(X2_MAX_PIN));
-  TERN_(USE_X2_MIN,      _ATTACH(X2_MIN_PIN));
+  TERN_(HAS_X2_MIN, _ATTACH(X2_MIN_PIN));
-  TERN_(USE_Y2_MAX,      _ATTACH(Y2_MAX_PIN));
+  TERN_(HAS_Y2_MAX, _ATTACH(Y2_MAX_PIN));
-  TERN_(USE_Y2_MIN,      _ATTACH(Y2_MIN_PIN));
+  TERN_(HAS_Y2_MIN, _ATTACH(Y2_MIN_PIN));
-  TERN_(USE_Z2_MAX,      _ATTACH(Z2_MAX_PIN));
+  TERN_(HAS_Z2_MAX, _ATTACH(Z2_MAX_PIN));
-  TERN_(USE_Z2_MIN,      _ATTACH(Z2_MIN_PIN));
+  TERN_(HAS_Z2_MIN, _ATTACH(Z2_MIN_PIN));
-  TERN_(USE_Z3_MAX,      _ATTACH(Z3_MAX_PIN));
+  TERN_(HAS_Z3_MAX, _ATTACH(Z3_MAX_PIN));
-  TERN_(USE_Z3_MIN,      _ATTACH(Z3_MIN_PIN));
+  TERN_(HAS_Z3_MIN, _ATTACH(Z3_MIN_PIN));
-  TERN_(USE_Z4_MAX,      _ATTACH(Z4_MAX_PIN));
+  TERN_(HAS_Z4_MAX, _ATTACH(Z4_MAX_PIN));
-  TERN_(USE_Z4_MIN,      _ATTACH(Z4_MIN_PIN));
+  TERN_(HAS_Z4_MIN, _ATTACH(Z4_MIN_PIN));
-  TERN_(USE_Z_MIN_PROBE, _ATTACH(Z_MIN_PROBE_PIN));
+  TERN_(HAS_Z_MIN_PROBE_PIN, _ATTACH(Z_MIN_PROBE_PIN));
-  TERN_(USE_I_MAX,       _ATTACH(I_MAX_PIN));
+  TERN_(HAS_I_MAX, _ATTACH(I_MAX_PIN));
-  TERN_(USE_I_MIN,       _ATTACH(I_MIN_PIN));
+  TERN_(HAS_I_MIN, _ATTACH(I_MIN_PIN));
-  TERN_(USE_J_MAX,       _ATTACH(J_MAX_PIN));
+  TERN_(HAS_J_MAX, _ATTACH(J_MAX_PIN));
-  TERN_(USE_J_MIN,       _ATTACH(J_MIN_PIN));
+  TERN_(HAS_J_MIN, _ATTACH(J_MIN_PIN));
-  TERN_(USE_K_MAX,       _ATTACH(K_MAX_PIN));
+  TERN_(HAS_K_MAX, _ATTACH(K_MAX_PIN));
-  TERN_(USE_K_MIN,       _ATTACH(K_MIN_PIN));
+  TERN_(HAS_K_MIN, _ATTACH(K_MIN_PIN));
-  TERN_(USE_U_MAX,       _ATTACH(U_MAX_PIN));
+  TERN_(HAS_U_MAX, _ATTACH(U_MAX_PIN));
-  TERN_(USE_U_MIN,       _ATTACH(U_MIN_PIN));
+  TERN_(HAS_U_MIN, _ATTACH(U_MIN_PIN));
-  TERN_(USE_V_MAX,       _ATTACH(V_MAX_PIN));
+  TERN_(HAS_V_MAX, _ATTACH(V_MAX_PIN));
-  TERN_(USE_V_MIN,       _ATTACH(V_MIN_PIN));
+  TERN_(HAS_V_MIN, _ATTACH(V_MIN_PIN));
-  TERN_(USE_W_MAX,       _ATTACH(W_MAX_PIN));
+  TERN_(HAS_W_MAX, _ATTACH(W_MAX_PIN));
-  TERN_(USE_W_MIN,       _ATTACH(W_MIN_PIN));
+  TERN_(HAS_W_MIN, _ATTACH(W_MIN_PIN));
 }
@@ -189,12 +189,12 @@
 */
 // UART
-#define RXD        0
+#define RXD        DIO0
-#define TXD        1
+#define TXD        DIO1
 // TWI (I2C)
-#define SCL        21
+#define SCL        DIO21
-#define SDA        20
+#define SDA        DIO20
 /**
 * pins
@@ -49,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'), \
@@ -62,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
@@ -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
@@ -20,3 +20,7 @@
 *
 */
 #pragma once
 #if HAS_SPI_TFT || HAS_FSMC_TFT
  #error "Sorry! TFT displays are not available for HAL/DUE."
 #endif
@@ -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
@@ -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
@@ -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
 */
@@ -40,15 +36,15 @@
  || X_DIR_PIN  == N || Y_DIR_PIN  == N || Z_DIR_PIN  == N \
  || X_ENA_PIN  == N || Y_ENA_PIN  == N || Z_ENA_PIN  == N \
 )
-#if SERIAL_IN_USE(0) // D0-D1. No known conflicts.
+#if CONF_SERIAL_IS(0) // D0-D1. No known conflicts.
 #endif
-#if SERIAL_IN_USE(1) && (CHECK_SERIAL_PIN(18) || CHECK_SERIAL_PIN(19))
+#if CONF_SERIAL_IS(1) && (CHECK_SERIAL_PIN(18) || CHECK_SERIAL_PIN(19))
  #error "Serial Port 1 pin D18 and/or D19 conflicts with another pin on the board."
 #endif
-#if SERIAL_IN_USE(2) && (CHECK_SERIAL_PIN(16) || CHECK_SERIAL_PIN(17))
+#if CONF_SERIAL_IS(2) && (CHECK_SERIAL_PIN(16) || CHECK_SERIAL_PIN(17))
  #error "Serial Port 2 pin D16 and/or D17 conflicts with another pin on the board."
 #endif
-#if SERIAL_IN_USE(3) && (CHECK_SERIAL_PIN(14) || CHECK_SERIAL_PIN(15))
+#if CONF_SERIAL_IS(3) && (CHECK_SERIAL_PIN(14) || CHECK_SERIAL_PIN(15))
  #error "Serial Port 3 pin D14 and/or D15 conflicts with another pin on the board."
 #endif
 #undef CHECK_SERIAL_PIN
@@ -68,20 +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.
 */
-#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))
+#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 HAS_MEDIA && HAS_DRIVER(TMC2130)
+#if ENABLED(SDSUPPORT) && HAS_DRIVER(TMC2130)
  #if ENABLED(TMC_USE_SW_SPI)
-    #if DISABLED(SOFTWARE_SPI) && (_IS_HW_SPI(MOSI) || _IS_HW_SPI(MISO) || _IS_HW_SPI(SCK))
+    #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(SOFTWARE_SPI)
+  #elif ENABLED(DUE_SOFTWARE_SPI)
    #error "DUE software SPI is required but is incompatible with TMC2130 hardware SPI. Enable TMC_USE_SW_SPI to fix."
  #endif
 #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
@@ -64,6 +64,7 @@
 #define NUMBER_PINS_TOTAL PINS_COUNT
 #define digitalRead_mod(p) extDigitalRead(p)  // AVR digitalRead disabled PWM before it read the pin
 #define PRINT_PORT(p)
 #define PRINT_ARRAY_NAME(x) do{ sprintf_P(buffer, PSTR("%-" STRINGIFY(MAX_NAME_LENGTH) "s"), pin_array[x].name); SERIAL_ECHO(buffer); }while(0)
 #define PRINT_PIN(p) do{ sprintf_P(buffer, PSTR("%02d"), p); SERIAL_ECHO(buffer); }while(0)
 #define PRINT_PIN_ANALOG(p) do{ sprintf_P(buffer, PSTR(" (A%2d)  "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); SERIAL_ECHO(buffer); }while(0)
@@ -92,8 +93,6 @@ void pwm_details(int32_t pin) {
  }
 }
 void print_port(const pin_t) {}
 /**
 * DUE Board pin   |  PORT  | Label
 * ----------------+--------+-------
@@ -48,7 +48,7 @@
  #define SD_MOSI_PIN       75
 #else
  // defaults
-  #define SOFTWARE_SPI
+  #define DUE_SOFTWARE_SPI
  #ifndef SD_SCK_PIN
    #define SD_SCK_PIN      52
  #endif
@@ -1,9 +1,9 @@
 /**
 * Marlin 3D Printer Firmware
 * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
 *
- * Based on Sprinter and grbl.
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ * 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
@@ -1,9 +1,8 @@
 /**
 * Marlin 3D Printer Firmware
 * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
 *
- * Based on Sprinter and grbl.
+ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- * 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
@@ -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
@@ -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.
@@ -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__)
@@ -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_
@@ -96,4 +96,5 @@
 // - UPLL frequency: 480MHz
 // - USB clock: 480 / 1 = 480MHz
 #endif /* CONF_CLOCK_H_INCLUDED */
@@ -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
   * @{
@@ -68,6 +68,7 @@
 #endif
 #include "ctrl_access.h"
 //_____ D E F I N I T I O N S ______________________________________________
 #ifdef FREERTOS_USED
@@ -111,6 +112,7 @@ static xSemaphoreHandle ctrl_access_semphr = NULL;
 #endif  // FREERTOS_USED
 #if MAX_LUN
 /*! \brief Initializes an entry of the LUN descriptor table.
@@ -240,14 +242,17 @@ static const struct
 #endif
 #if GLOBAL_WR_PROTECT == true
 bool g_wr_protect;
 #endif
 /*! \name Control Interface
 */
 //! @{
 #ifdef FREERTOS_USED
 bool ctrl_access_init(void)
@@ -265,6 +270,7 @@ bool ctrl_access_init(void)
  return true;
 }
 /*! \brief Locks accesses to LUNs.
 *
 * \return \c true if the access was successfully locked, else \c false.
@@ -282,6 +288,7 @@ static bool ctrl_access_lock(void)
 #endif  // FREERTOS_USED
 U8 get_nb_lun(void)
 {
 #if MEM_USB == ENABLE
@@ -302,11 +309,13 @@ U8 get_nb_lun(void)
 #endif
 }
 U8 get_cur_lun(void)
 {
  return LUN_ID_0;
 }
 Ctrl_status mem_test_unit_ready(U8 lun)
 {
  Ctrl_status status;
@@ -328,6 +337,7 @@ Ctrl_status mem_test_unit_ready(U8 lun)
  return status;
 }
 Ctrl_status mem_read_capacity(U8 lun, U32 *u32_nb_sector)
 {
  Ctrl_status status;
@@ -349,6 +359,7 @@ Ctrl_status mem_read_capacity(U8 lun, U32 *u32_nb_sector)
  return status;
 }
 U8 mem_sector_size(U8 lun)
 {
  U8 sector_size;
@@ -370,6 +381,7 @@ U8 mem_sector_size(U8 lun)
  return sector_size;
 }
 bool mem_unload(U8 lun, bool unload)
 {
  bool unloaded;
@@ -421,6 +433,7 @@ bool mem_wr_protect(U8 lun)
  return wr_protect;
 }
 bool mem_removal(U8 lun)
 {
  bool removal;
@@ -445,6 +458,7 @@ bool mem_removal(U8 lun)
  return removal;
 }
 const char *mem_name(U8 lun)
 {
 #if MAX_LUN==0
@@ -461,14 +475,17 @@ const char *mem_name(U8 lun)
 #endif
 }
 //! @}
 #if ACCESS_USB == true
 /*! \name MEM <-> USB Interface
 */
 //! @{
 Ctrl_status memory_2_usb(U8 lun, U32 addr, U16 nb_sector)
 {
  Ctrl_status status;
@@ -488,6 +505,7 @@ Ctrl_status memory_2_usb(U8 lun, U32 addr, U16 nb_sector)
  return status;
 }
 Ctrl_status usb_2_memory(U8 lun, U32 addr, U16 nb_sector)
 {
  Ctrl_status status;
@@ -507,16 +525,19 @@ Ctrl_status usb_2_memory(U8 lun, U32 addr, U16 nb_sector)
  return status;
 }
 //! @}
 #endif  // ACCESS_USB == true
 #if ACCESS_MEM_TO_RAM == true
 /*! \name MEM <-> RAM Interface
 */
 //! @{
 Ctrl_status memory_2_ram(U8 lun, U32 addr, void *ram)
 {
  Ctrl_status status;
@@ -543,6 +564,7 @@ Ctrl_status memory_2_ram(U8 lun, U32 addr, void *ram)
  return status;
 }
 Ctrl_status ram_2_memory(U8 lun, U32 addr, const void *ram)
 {
  Ctrl_status status;
@@ -569,16 +591,19 @@ Ctrl_status ram_2_memory(U8 lun, U32 addr, const void *ram)
  return status;
 }
 //! @}
 #endif  // ACCESS_MEM_TO_RAM == true
 #if ACCESS_STREAM == true
 /*! \name Streaming MEM <-> MEM Interface
 */
 //! @{
  #if ACCESS_MEM_TO_MEM == true
 #include "fat.h"
@@ -600,18 +625,21 @@ Ctrl_status stream_mem_to_mem(U8 src_lun, U32 src_addr, U8 dest_lun, U32 dest_ad
  #endif  // ACCESS_MEM_TO_MEM == true
 Ctrl_status stream_state(U8 id)
 {
  UNUSED(id);
  return CTRL_GOOD;
 }
 U16 stream_stop(U8 id)
 {
  UNUSED(id);
  return 0;
 }
 //! @}
 #endif // ACCESS_STREAM
@@ -56,6 +56,7 @@
 * Support and FAQ: visit <a href="https://www.atmel.com/design-support/">Atmel Support</a>
 */
 #ifndef _CTRL_ACCESS_H_
 #define _CTRL_ACCESS_H_
@@ -88,6 +89,7 @@ typedef enum
  CTRL_BUSY       = FAIL + 2  //!< Memory not initialized or changed.
 } Ctrl_status;
 // FYI: Each Logical Unit Number (LUN) corresponds to a memory.
 // Check LUN defines.
@@ -134,6 +136,7 @@ typedef enum
 #define LUN_ID_USB      (MAX_LUN)           //!< First dynamic LUN (USB host mass storage).
 //! @}
 // Include LUN header files.
 #if LUN_0 == ENABLE
  #include LUN_0_INCLUDE
@@ -163,11 +166,13 @@ typedef enum
  #include LUN_USB_INCLUDE
 #endif
 // Check the configuration of write protection in conf_access.h.
 #ifndef GLOBAL_WR_PROTECT
  #error GLOBAL_WR_PROTECT must be defined as true or false in conf_access.h
 #endif
 #if GLOBAL_WR_PROTECT == true
 //! Write protect.
@@ -175,6 +180,7 @@ extern bool g_wr_protect;
 #endif
 /*! \name Control Interface
 */
 //! @{
@@ -273,6 +279,7 @@ extern const char *mem_name(U8 lun);
 //! @}
 #if ACCESS_USB == true
 /*! \name MEM <-> USB Interface
@@ -303,6 +310,7 @@ extern Ctrl_status usb_2_memory(U8 lun, U32 addr, U16 nb_sector);
 #endif  // ACCESS_USB == true
 #if ACCESS_MEM_TO_RAM == true
 /*! \name MEM <-> RAM Interface
@@ -333,6 +341,7 @@ extern Ctrl_status ram_2_memory(U8 lun, U32 addr, const void *ram);
 #endif  // ACCESS_MEM_TO_RAM == true
 #if ACCESS_STREAM == true
 /*! \name Streaming MEM <-> MEM Interface
@@ -108,23 +108,31 @@ struct genclk_config {
 	uint32_t ctrl;
 };
-static inline void genclk_config_defaults(struct genclk_config *p_cfg, uint32_t ul_id) {
+static inline void genclk_config_defaults(struct genclk_config *p_cfg,
 		uint32_t ul_id)
 {
 	ul_id = ul_id;
 	p_cfg->ctrl = 0;
 }
-static inline void genclk_config_read(struct genclk_config *p_cfg, uint32_t ul_id) {
+static inline void genclk_config_read(struct genclk_config *p_cfg,
 		uint32_t ul_id)
 {
 	p_cfg->ctrl = PMC->PMC_PCK[ul_id];
 }
-static inline void genclk_config_write(const struct genclk_config *p_cfg, uint32_t ul_id) {
+static inline void genclk_config_write(const struct genclk_config *p_cfg,
 		uint32_t ul_id)
 {
 	PMC->PMC_PCK[ul_id] = p_cfg->ctrl;
 }
 //! \name Programmable Clock Source and Prescaler configuration
 //@{
-static inline void genclk_config_set_source(struct genclk_config *p_cfg, enum genclk_source e_src) {
+static inline void genclk_config_set_source(struct genclk_config *p_cfg,
 		enum genclk_source e_src)
 {
 	p_cfg->ctrl &= (~PMC_PCK_CSS_Msk);
 	switch (e_src) {
@@ -156,23 +164,29 @@ static inline void genclk_config_set_source(struct genclk_config *p_cfg, enum ge
 	}
 }
-static inline void genclk_config_set_divider(struct genclk_config *p_cfg, uint32_t e_divider) {
+static inline void genclk_config_set_divider(struct genclk_config *p_cfg,
 		uint32_t e_divider)
 {
 	p_cfg->ctrl &= ~PMC_PCK_PRES_Msk;
 	p_cfg->ctrl |= e_divider;
 }
 //@}
-static inline void genclk_enable(const struct genclk_config *p_cfg, uint32_t ul_id) {
+static inline void genclk_enable(const struct genclk_config *p_cfg,
 		uint32_t ul_id)
 {
 	PMC->PMC_PCK[ul_id] = p_cfg->ctrl;
 	pmc_enable_pck(ul_id);
 }
-static inline void genclk_disable(uint32_t ul_id) {
+static inline void genclk_disable(uint32_t ul_id)
 {
 	pmc_disable_pck(ul_id);
 }
-static inline void genclk_enable_source(enum genclk_source e_src) {
+static inline void genclk_enable_source(enum genclk_source e_src)
 {
 	switch (e_src) {
 	case GENCLK_PCK_SRC_SLCK_RC:
 		if (!osc_is_ready(OSC_SLCK_32K_RC)) {
@@ -57,6 +57,7 @@
 #include "preprocessor.h"
 //! Maximal number of repetitions supported by MREPEAT.
 #define MREPEAT_LIMIT   256
@@ -115,7 +115,8 @@ extern "C" {
 #define OSC_MAINCK_BYPASS_HZ        BOARD_FREQ_MAINCK_BYPASS        //!< External bypass oscillator.
 //@}
-static inline void osc_enable(uint32_t ul_id) {
+static inline void osc_enable(uint32_t ul_id)
 {
 	switch (ul_id) {
 	case OSC_SLCK_32K_RC:
 		break;
@@ -128,6 +129,7 @@ static inline void osc_enable(uint32_t ul_id) {
 		pmc_switch_sclk_to_32kxtal(PMC_OSC_BYPASS);
 		break;
 	case OSC_MAINCK_4M_RC:
 		pmc_switch_mainck_to_fastrc(CKGR_MOR_MOSCRCF_4_MHz);
 		break;
@@ -140,6 +142,7 @@ static inline void osc_enable(uint32_t ul_id) {
 		pmc_switch_mainck_to_fastrc(CKGR_MOR_MOSCRCF_12_MHz);
 		break;
 	case OSC_MAINCK_XTAL:
 		pmc_switch_mainck_to_xtal(PMC_OSC_XTAL/*,
 			pmc_us_to_moscxtst(BOARD_OSC_STARTUP_US,
@@ -154,7 +157,8 @@ static inline void osc_enable(uint32_t ul_id) {
 	}
 }
-static inline void osc_disable(uint32_t ul_id) {
+static inline void osc_disable(uint32_t ul_id)
 {
 	switch (ul_id) {
 	case OSC_SLCK_32K_RC:
 	case OSC_SLCK_32K_XTAL:
@@ -177,7 +181,8 @@ static inline void osc_disable(uint32_t ul_id) {
 	}
 }
-static inline bool osc_is_ready(uint32_t ul_id) {
+static inline bool osc_is_ready(uint32_t ul_id)
 {
 	switch (ul_id) {
 	case OSC_SLCK_32K_RC:
 		return 1;
@@ -197,7 +202,8 @@ static inline bool osc_is_ready(uint32_t ul_id) {
 	return 0;
 }
-static inline uint32_t osc_get_rate(uint32_t ul_id) {
+static inline uint32_t osc_get_rate(uint32_t ul_id)
 {
 	switch (ul_id) {
 	case OSC_SLCK_32K_RC:
 		return OSC_SLCK_32K_RC_HZ;
@@ -235,7 +241,8 @@ static inline uint32_t osc_get_rate(uint32_t ul_id) {
 *
 * \param id A number identifying the oscillator to wait for.
 */
-static inline void osc_wait_ready(uint8_t id) {
+static inline void osc_wait_ready(uint8_t id)
 {
 	while (!osc_is_ready(id)) {
 		/* Do nothing */
 	}
@@ -113,15 +113,15 @@ struct pll_config {
 * is hidden in this implementation. Use mul as mul effective value.
 */
 static inline void pll_config_init(struct pll_config *p_cfg,
-    enum pll_source e_src, uint32_t ul_div, uint32_t ul_mul) {
+		enum pll_source e_src, uint32_t ul_div, uint32_t ul_mul)
 {
 	uint32_t vco_hz;
 	Assert(e_src < PLL_NR_SOURCES);
 	if (ul_div == 0 && ul_mul == 0) { /* Must only be true for UTMI PLL */
 		p_cfg->ctrl = CKGR_UCKR_UPLLCOUNT(PLL_COUNT);
-  }
+	} else { /* PLLA */
  else { /* PLLA */
 		/* Calculate internal VCO frequency */
 		vco_hz = osc_get_rate(e_src) / ul_div;
 		Assert(vco_hz >= PLL_INPUT_MIN_HZ);
@@ -142,55 +142,68 @@ static inline void pll_config_init(struct pll_config *p_cfg,
 			CONFIG_PLL##pll_id##_DIV,                                      \
 			CONFIG_PLL##pll_id##_MUL)
-static inline void pll_config_read(struct pll_config *p_cfg, uint32_t ul_pll_id) {
+static inline void pll_config_read(struct pll_config *p_cfg, uint32_t ul_pll_id)
 {
 	Assert(ul_pll_id < NR_PLLS);
-  p_cfg->ctrl = ul_pll_id == PLLA_ID ? PMC->CKGR_PLLAR : PMC->CKGR_UCKR;
+
 	if (ul_pll_id == PLLA_ID) {
 		p_cfg->ctrl = PMC->CKGR_PLLAR;
 	} else {
 		p_cfg->ctrl = PMC->CKGR_UCKR;
 	}
 }
-static inline void pll_config_write(const struct pll_config *p_cfg, uint32_t ul_pll_id) {
+static inline void pll_config_write(const struct pll_config *p_cfg, uint32_t ul_pll_id)
 {
 	Assert(ul_pll_id < NR_PLLS);
 	if (ul_pll_id == PLLA_ID) {
 		pmc_disable_pllack(); // Always stop PLL first!
 		PMC->CKGR_PLLAR = CKGR_PLLAR_ONE | p_cfg->ctrl;
-  }
+	} else {
  else
 		PMC->CKGR_UCKR = p_cfg->ctrl;
 	}
 }
-static inline void pll_enable(const struct pll_config *p_cfg, uint32_t ul_pll_id) {
+static inline void pll_enable(const struct pll_config *p_cfg, uint32_t ul_pll_id)
 {
 	Assert(ul_pll_id < NR_PLLS);
 	if (ul_pll_id == PLLA_ID) {
 		pmc_disable_pllack(); // Always stop PLL first!
 		PMC->CKGR_PLLAR = CKGR_PLLAR_ONE | p_cfg->ctrl;
-  }
+	} else {
  else
 		PMC->CKGR_UCKR = p_cfg->ctrl | CKGR_UCKR_UPLLEN;
 	}
 }
 /**
 * \note This will only disable the selected PLL, not the underlying oscillator (mainck).
 */
-static inline void pll_disable(uint32_t ul_pll_id) {
+static inline void pll_disable(uint32_t ul_pll_id)
 {
 	Assert(ul_pll_id < NR_PLLS);
-  if (ul_pll_id == PLLA_ID)
+	if (ul_pll_id == PLLA_ID) {
 		pmc_disable_pllack();
-  else
+	} else {
 		PMC->CKGR_UCKR &= ~CKGR_UCKR_UPLLEN;
 	}
 static inline uint32_t pll_is_locked(uint32_t ul_pll_id) {
  Assert(ul_pll_id < NR_PLLS);
  if (ul_pll_id == PLLA_ID)
    return pmc_is_locked_pllack();
  else
    return pmc_is_locked_upll();
 }
-static inline void pll_enable_source(enum pll_source e_src) {
+static inline uint32_t pll_is_locked(uint32_t ul_pll_id)
 {
 	Assert(ul_pll_id < NR_PLLS);
 	if (ul_pll_id == PLLA_ID) {
 		return pmc_is_locked_pllack();
 	} else {
 		return pmc_is_locked_upll();
 	}
 }
 static inline void pll_enable_source(enum pll_source e_src)
 {
 	switch (e_src) {
 	case PLL_SRC_MAINCK_4M_RC:
 	case PLL_SRC_MAINCK_8M_RC:
@@ -207,11 +220,13 @@ static inline void pll_enable_source(enum pll_source e_src) {
 	}
 }
-static inline void pll_enable_config_defaults(unsigned int ul_pll_id) {
+static inline void pll_enable_config_defaults(unsigned int ul_pll_id)
 {
 	struct pll_config pllcfg;
-  if (pll_is_locked(ul_pll_id)) return; // Pll already running
+	if (pll_is_locked(ul_pll_id)) {
-
+		return; // Pll already running
 	}
 	switch (ul_pll_id) {
 #ifdef CONFIG_PLL0_SOURCE
 	case 0:
@@ -249,10 +264,13 @@ static inline void pll_enable_config_defaults(unsigned int ul_pll_id) {
 * \retval STATUS_OK The PLL is now locked.
 * \retval ERR_TIMEOUT Timed out waiting for PLL to become locked.
 */
-static inline int pll_wait_for_lock(unsigned int pll_id) {
+static inline int pll_wait_for_lock(unsigned int pll_id)
 {
 	Assert(pll_id < NR_PLLS);
-  while (!pll_is_locked(pll_id)) { /* Do nothing */ }
+	while (!pll_is_locked(pll_id)) {
 		/* Do nothing */
 	}
 	return 0;
 }
@@ -51,4 +51,5 @@
 #include "stringz.h"
 #include "mrepeat.h"
 #endif  // _PREPROCESSOR_H_
@@ -57,6 +57,7 @@
 #ifndef _SBC_PROTOCOL_H_
 #define _SBC_PROTOCOL_H_
 /**
 * \ingroup usb_msc_protocol
 * \defgroup usb_sbc_protocol SCSI Block Commands protocol definitions
@@ -86,6 +87,7 @@ enum scsi_sbc_mode {
 	SCSI_MS_MODE_CACHING = 0x08,	//!< Caching mode page
 };
 //! \name SBC-2 Device-Specific Parameter
 //@{
 #define SCSI_MS_SBC_WP              0x80	//!< Write Protected
@@ -6,7 +6,7 @@
 #include "../../../inc/MarlinConfig.h"
-#if HAS_MEDIA
+#if ENABLED(SDSUPPORT)
 #include "../../../sd/cardreader.h"
 extern "C" {
@@ -138,5 +138,5 @@ Ctrl_status sd_mmc_spi_usb_write_10(uint32_t addr, uint16_t nb_sector) {
 #endif // ACCESS_USB == true
-#endif // HAS_MEDIA
+#endif // SDSUPPORT
 #endif // ARDUINO_ARCH_SAM
@@ -45,6 +45,7 @@
 * Support and FAQ: visit <a href="https://www.atmel.com/design-support/">Atmel Support</a>
 */
 #ifndef _SD_MMC_SPI_MEM_H_
 #define _SD_MMC_SPI_MEM_H_
@@ -62,14 +63,17 @@
  #error sd_mmc_spi_mem.h is #included although SD_MMC_SPI_MEM is disabled
 #endif
 #include "ctrl_access.h"
 //_____ D E F I N I T I O N S ______________________________________________
 #define   SD_MMC_REMOVED       0
 #define   SD_MMC_INSERTED      1
 #define   SD_MMC_REMOVING      2
 //---- CONTROL FUNCTIONS ----
 //!
 //! @brief This function initializes the hw/sw resources required to drive the SD_MMC_SPI.
@@ -129,6 +133,7 @@ extern bool           sd_mmc_spi_wr_protect(void);
 //!
 extern bool           sd_mmc_spi_removal(void);
 //---- ACCESS DATA FUNCTIONS ----
 #if ACCESS_USB == true
@@ -200,6 +200,7 @@ enum scsi_vpd_page_code {
 #define  SCSI_VPD_ID_TYPE_T10       1
 /* Sense keys */
 enum scsi_sense_key {
 	SCSI_SK_NO_SENSE = 0x0,
@@ -271,6 +272,7 @@ struct spc_control_page_info_execpt {
 	be32_t report_count;
 };
 enum scsi_spc_mode_sense_pc {
 	SCSI_MS_SENSE_PC_CURRENT = 0,
 	SCSI_MS_SENSE_PC_CHANGEABLE = 1,
@@ -278,15 +280,20 @@ enum scsi_spc_mode_sense_pc {
 	SCSI_MS_SENSE_PC_SAVED = 3,
 };
-static inline bool scsi_mode_sense_dbd_is_set(const uint8_t * cdb) {
+
 static inline bool scsi_mode_sense_dbd_is_set(const uint8_t * cdb)
 {
 	return (cdb[1] >> 3) & 1;
 }
-static inline uint8_t scsi_mode_sense_get_page_code(const uint8_t * cdb) {
+static inline uint8_t scsi_mode_sense_get_page_code(const uint8_t * cdb)
 {
 	return cdb[2] & 0x3F;
 }
-static inline uint8_t scsi_mode_sense_get_pc(const uint8_t * cdb) {
+static inline uint8_t scsi_mode_sense_get_pc(const uint8_t * cdb)
 {
 	return cdb[2] >> 6;
 }
@@ -212,6 +212,7 @@ extern "C" {
 # define CONFIG_USBCLK_DIV
 #endif
 extern void sysclk_enable_usb(void);
 extern void sysclk_disable_usb(void);
@@ -83,6 +83,7 @@ static usb_iface_desc_t UDC_DESC_STORAGE *udc_ptr_iface;
 //! @}
 //! \name Internal structure to store the USB device main strings
 //! @{
@@ -172,7 +172,8 @@ extern "C" {
 	}
 \endcode
 */
-static inline bool udc_include_vbus_monitoring(void) {
+static inline bool udc_include_vbus_monitoring(void)
 {
 	return udd_include_vbus_monitoring();
 }
@@ -191,26 +192,32 @@ void udc_stop(void);
 * then it will attach device when an acceptable Vbus
 * level from the host is detected.
 */
-static inline void udc_attach(void) {
+static inline void udc_attach(void)
 {
 	udd_attach();
 }
 /**
 * \brief Detaches the device from the bus
 *
 * The driver must remove pull-up on USB line D- or D+.
 */
-static inline void udc_detach(void) {
+static inline void udc_detach(void)
 {
 	udd_detach();
 }
 /*! \brief The USB driver sends a resume signal called \e "Upstream Resume"
 * This is authorized only when the remote wakeup feature is enabled by host.
 */
-static inline void udc_remotewakeup(void) {
+static inline void udc_remotewakeup(void)
 {
 	udd_send_remotewakeup();
 }
 /**
 * \brief Returns a pointer on the current interface descriptor
 *
@@ -685,4 +692,6 @@ usb_iface_desc_t UDC_DESC_STORAGE *udc_get_interface_desc(void);
 	 } \endcode
 */
 #endif // _UDC_H_
@@ -92,6 +92,8 @@ extern "C" {
 #	define UDC_BSS(x)               COMPILER_ALIGNED(x)
 #endif
 /**
 * \brief Configuration descriptor and UDI link for one USB speed
 */
@@ -102,6 +104,7 @@ typedef struct {
 	udi_api_t UDC_DESC_STORAGE *UDC_DESC_STORAGE * udi_apis;
 } udc_config_speed_t;
 /**
 * \brief All information about the USB Device
 */
@@ -103,16 +103,20 @@ typedef struct {
 extern udd_ctrl_request_t udd_g_ctrlreq;
 //! Return true if the setup request \a udd_g_ctrlreq indicates IN data transfer
-#define  Udd_setup_is_in()     (USB_REQ_DIR_IN == (udd_g_ctrlreq.req.bmRequestType & USB_REQ_DIR_MASK))
+#define  Udd_setup_is_in()       \
      (USB_REQ_DIR_IN == (udd_g_ctrlreq.req.bmRequestType & USB_REQ_DIR_MASK))
 //! Return true if the setup request \a udd_g_ctrlreq indicates OUT data transfer
-#define  Udd_setup_is_out()    (USB_REQ_DIR_OUT == (udd_g_ctrlreq.req.bmRequestType & USB_REQ_DIR_MASK))
+#define  Udd_setup_is_out()      \
      (USB_REQ_DIR_OUT == (udd_g_ctrlreq.req.bmRequestType & USB_REQ_DIR_MASK))
 //! Return the type of the SETUP request \a udd_g_ctrlreq. \see usb_reqtype.
-#define  Udd_setup_type()      (udd_g_ctrlreq.req.bmRequestType & USB_REQ_TYPE_MASK)
+#define  Udd_setup_type()        \
      (udd_g_ctrlreq.req.bmRequestType & USB_REQ_TYPE_MASK)
 //! Return the recipient of the SETUP request \a udd_g_ctrlreq. \see usb_recipient
-#define  Udd_setup_recipient() (udd_g_ctrlreq.req.bmRequestType & USB_REQ_RECIP_MASK)
+#define  Udd_setup_recipient()   \
      (udd_g_ctrlreq.req.bmRequestType & USB_REQ_RECIP_MASK)
 /**
 * \brief End of halt callback function type.
@@ -130,7 +134,8 @@ typedef void (*udd_callback_halt_cleared_t)(void);
 * \param status     UDD_EP_TRANSFER_ABORT, if transfer is aborted
 * \param n          number of data transferred
 */
-typedef void (*udd_callback_trans_t) (udd_ep_status_t status, iram_size_t nb_transferred, udd_ep_id_t ep);
+typedef void (*udd_callback_trans_t) (udd_ep_status_t status,
 		iram_size_t nb_transferred, udd_ep_id_t ep);
 /**
 * \brief Authorizes the VBUS event
@@ -213,6 +218,7 @@ void udd_send_remotewakeup(void);
 */
 void udd_set_setup_payload( uint8_t *payload, uint16_t payload_size );
 /**
 * \name Endpoint Management
 *
@@ -233,7 +239,8 @@ void udd_set_setup_payload( uint8_t *payload, uint16_t payload_size );
 *
 * \return \c 1 if the endpoint is enabled, otherwise \c 0.
 */
-bool udd_ep_alloc(udd_ep_id_t ep, uint8_t bmAttributes, uint16_t MaxEndpointSize);
+bool udd_ep_alloc(udd_ep_id_t ep, uint8_t bmAttributes,
 		uint16_t MaxEndpointSize);
 /**
 * \brief Disables an endpoint
@@ -287,7 +294,8 @@ bool udd_ep_clear_halt(udd_ep_id_t ep);
 *
 * \return \c 1 if the register is accepted, otherwise \c 0.
 */
-bool udd_ep_wait_stall_clear(udd_ep_id_t ep, udd_callback_halt_cleared_t callback);
+bool udd_ep_wait_stall_clear(udd_ep_id_t ep,
 		udd_callback_halt_cleared_t callback);
 /**
 * \brief Allows to receive or send data on an endpoint
@@ -313,8 +321,9 @@ bool udd_ep_wait_stall_clear(udd_ep_id_t ep, udd_callback_halt_cleared_t callbac
 *
 * \return \c 1 if function was successfully done, otherwise \c 0.
 */
-bool udd_ep_run(udd_ep_id_t ep, bool b_shortpacket, uint8_t * buf, iram_size_t buf_size, udd_callback_trans_t callback);
+bool udd_ep_run(udd_ep_id_t ep, bool b_shortpacket,
-
+		uint8_t * buf, iram_size_t buf_size,
 		udd_callback_trans_t callback);
 /**
 * \brief Aborts transfer on going on endpoint
 *
@@ -330,6 +339,7 @@ void udd_ep_abort(udd_ep_id_t ep);
 //@}
 /**
 * \name High speed test mode management
 *
@@ -342,6 +352,7 @@ void udd_test_mode_se0_nak(void);
 void udd_test_mode_packet(void);
 //@}
 /**
 * \name UDC callbacks to provide for UDD
 *
@@ -457,6 +457,7 @@ void udi_cdc_data_sof_notify(void)
 #endif
 }
 // ------------------------
 //------- Internal routines to control serial line
@@ -519,6 +520,7 @@ static void udi_cdc_ctrl_state_change(uint8_t port, bool b_set, le16_t bit_mask)
 	udi_cdc_ctrl_state_notify(port, ep_comm);
 }
 static void udi_cdc_ctrl_state_notify(uint8_t port, udd_ep_id_t ep)
 {
 #if UDI_CDC_PORT_NB == 1 // To optimize code
@@ -540,6 +542,7 @@ static void udi_cdc_ctrl_state_notify(uint8_t port, udd_ep_id_t ep)
 	}
 }
 static void udi_cdc_serial_state_msg_sent(udd_ep_status_t status, iram_size_t n, udd_ep_id_t ep)
 {
 	uint8_t port;
@@ -575,9 +578,11 @@ static void udi_cdc_serial_state_msg_sent(udd_ep_status_t status, iram_size_t n,
 	udi_cdc_ctrl_state_notify(port, ep);
 }
 // ------------------------
 //------- Internal routines to process data transfer
 static bool udi_cdc_rx_start(uint8_t port)
 {
 	irqflags_t flags;
@@ -627,6 +632,7 @@ static bool udi_cdc_rx_start(uint8_t port)
 			udi_cdc_data_received);
 }
 static void udi_cdc_data_received(udd_ep_status_t status, iram_size_t n, udd_ep_id_t ep)
 {
 	uint8_t buf_sel_trans;
@@ -662,6 +668,7 @@ static void udi_cdc_data_received(udd_ep_status_t status, iram_size_t n, udd_ep_
 	udi_cdc_rx_start(port);
 }
 static void udi_cdc_data_sent(udd_ep_status_t status, iram_size_t n, udd_ep_id_t ep)
 {
 	uint8_t port;
@@ -693,6 +700,7 @@ static void udi_cdc_data_sent(udd_ep_status_t status, iram_size_t n, udd_ep_id_t
 	udi_cdc_tx_send(port);
 }
 static void udi_cdc_tx_send(uint8_t port)
 {
 	irqflags_t flags;
@@ -772,9 +780,11 @@ static void udi_cdc_tx_send(uint8_t port)
 			udi_cdc_data_sent);
 }
 // ------------------------
 //------- Application interface
 //------- Application interface
 void udi_cdc_ctrl_signal_dcd(bool b_set)
@@ -106,6 +106,7 @@ typedef struct {
 	usb_ep_desc_t ep_notify;
 } udi_cdc_comm_desc_t;
 /**
 * \brief Data Class interface descriptor
 *
@@ -120,6 +121,7 @@ typedef struct {
 	usb_ep_desc_t ep_out;
 } udi_cdc_data_desc_t;
 //! CDC communication endpoints size for all speeds
 #define UDI_CDC_COMM_EP_SIZE        64
 //! CDC data endpoints size for FS speed (8B, 16B, 32B, 64B)
@@ -238,6 +240,7 @@ typedef struct {
 #define UDI_CDC_DATA_DESC_6_HS  UDI_CDC_DATA_DESC_HS(6)
 //@}
 //! Content of CDC IAD interface descriptor for all speeds
 #define UDI_CDC_IAD_DESC(port) { \
   .bLength                      = sizeof(usb_iad_desc_t),\
@@ -624,15 +627,18 @@ iram_size_t udi_cdc_multi_write_buf(uint8_t port, const void* buf, iram_size_t s
 * Add to application C-file:
 * \code
 	 static bool my_flag_autorize_cdc_transfert = false;
-  bool my_callback_cdc_enable(void) {
+	 bool my_callback_cdc_enable(void)
 	 {
 	    my_flag_autorize_cdc_transfert = true;
 	    return true;
 	 }
-  void my_callback_cdc_disable(void) {
+	 void my_callback_cdc_disable(void)
 	 {
 	    my_flag_autorize_cdc_transfert = false;
 	 }
-  void task(void) {
+	 void task(void)
 	 {
 	    if (my_flag_autorize_cdc_transfert) {
 	        udi_cdc_putc('A');
 	        udi_cdc_getc();
@@ -51,7 +51,7 @@
 #include "udc_desc.h"
 #include "udi_cdc.h"
-#if !HAS_MEDIA
+#if DISABLED(SDSUPPORT)
 /**
 * \defgroup udi_cdc_group_single_desc USB device descriptors for a single interface
@@ -109,6 +109,7 @@ UDC_DESC_STORAGE usb_dev_desc_t udc_device_desc = {
  .bNumConfigurations = 1
 };
 #ifdef USB_DEVICE_HS_SUPPORT
 //! USB Device Qualifier Descriptor for HS
 COMPILER_WORD_ALIGNED
@@ -255,6 +256,6 @@ UDC_DESC_STORAGE udc_config_t udc_config = {
 //@}
 //@}
-#endif // HAS_MEDIA
+#endif // SDSUPPORT
 #endif // ARDUINO_ARCH_SAM
@@ -50,7 +50,7 @@
 #include "udd.h"
 #include "udc_desc.h"
-#if HAS_MEDIA
+#if ENABLED(SDSUPPORT)
 /**
 * \defgroup udi_group_desc Descriptors for a USB Device
@@ -93,6 +93,7 @@ UDC_DESC_STORAGE usb_dev_desc_t udc_device_desc = {
  .bNumConfigurations        = 1
 };
 #ifdef USB_DEVICE_HS_SUPPORT
 //! USB Device Qualifier Descriptor for HS
 COMPILER_WORD_ALIGNED
@@ -146,6 +147,7 @@ UDC_DESC_STORAGE udc_desc_t udc_desc_hs = {
 };
 #endif
 /**
 * \name UDC structures which contains all USB Device definitions
 */
@@ -187,4 +189,4 @@ UDC_DESC_STORAGE udc_config_t udc_config = {
 #endif // ARDUINO_ARCH_SAM
-#endif // HAS_MEDIA
+#endif // SDSUPPORT
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Scott Lahteine	8e027304c8	fix inits	2022-10-20 17:04:22 -05:00
InsanityAutomation	79dcfe5455	Init values to FAN_OFF_PWM, compare for greater than instead of not equal to in order to catch edge cases	2022-10-17 18:39:02 -04:00
Scott Lahteine	834025e486	part cooling too	2022-10-17 15:03:41 -05:00
Scott Lahteine	05d51f9c7f	Fan kickstart power option	2022-10-17 14:58:45 -05:00
Scott Lahteine	44589a964d	account for FAN_OFF_PWM	2022-10-17 14:43:39 -05:00
Scott Lahteine	b3e3a58e8b	millis_t is not an array	2022-10-17 14:38:15 -05:00
Scott Lahteine	16106e3961	remove unused wrapper (no 'break')	2022-10-17 14:38:15 -05:00
Scott Lahteine	6dad386de9	just because	2022-10-17 14:30:10 -05:00
InsanityAutomation	8df0cca036	Update controllerfan.cpp	2022-10-15 15:28:26 -04:00
InsanityAutomation	62c280a60f	Update controllerfan.cpp Update controllerfan.cpp	2022-10-15 10:15:06 -04:00
InsanityAutomation	2087a1330d	Update controllerfan.cpp	2022-10-13 16:01:35 -04:00