Add FatBoy config

Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marlin into bugfix-2.1.x
2024-01-06 13:35:08 -05:00 · 2024-01-01 14:03:46 -05:00 · 2023-11-08 09:39:42 -05:00 · 2023-08-04 09:47:12 -04:00 · 2023-07-26 11:52:43 -04:00 · 2023-06-23 09:26:59 -04:00
902 changed files with 20465 additions and 31229 deletions
@@ -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
@@ -19,7 +19,7 @@ jobs:
    steps:

    - name: Check out bugfix-2.0.x
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
      with:
        ref: bugfix-2.0.x

@@ -39,7 +39,7 @@ jobs:
        exit 0

    - name: Check out bugfix-2.1.x
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
      with:
        ref: bugfix-2.1.x

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

    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
      - name: Remove Labels
        uses: actions-ecosystem/action-remove-labels@v1
        with:
@@ -17,7 +17,7 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-    - uses: actions/stale@v9
+    - uses: actions/stale@v8
      with:
        repo-token: ${{ secrets.GITHUB_TOKEN }}
        stale-issue-message: |
@@ -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'
-        exclude-issue-created-before: ''
-        exclude-any-issue-labels: 'no-locking'
-        add-issue-labels: ''
-        issue-comment: >
+        issue-lock-inactive-days: '60'
+        issue-exclude-created-before: ''
+        issue-exclude-labels: 'no-locking'
+        issue-lock-labels: ''
+        issue-lock-comment: >
          This issue has been automatically locked since there
          has not been any recent activity after it was closed.
          Please open a new issue for related bugs.
@@ -1,9 +1,9 @@
 #
-# ci-build-tests.yml
+# test-builds.yml
 # Do test builds to catch compile errors
 #

-name: CI - Build Tests
+name: CI

 on:
  pull_request:
@@ -14,8 +14,6 @@ on:
    - config/**
    - data/**
    - docs/**
-    - test/**
-    - Marlin/tests/**
    - '**/*.md'
  push:
    branches:
@@ -25,13 +23,11 @@ on:
    - config/**
    - data/**
    - docs/**
-    - test/**
-    - Marlin/tests/**
    - '**/*.md'

 jobs:
  test_builds:
-    name: Build Test
+    name: Run All Tests
    if: github.repository == 'MarlinFirmware/Marlin'

    runs-on: ubuntu-latest
@@ -156,7 +152,7 @@ jobs:
      uses: actions/checkout@v4

    - name: Cache pip
-      uses: actions/cache@v4
+      uses: actions/cache@v3
      with:
        path: ~/.cache/pip
        key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
@@ -164,13 +160,13 @@ 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
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
      with:
        python-version: '3.9'
        architecture: 'x64'
@@ -2,23 +2,16 @@ SCRIPTS_DIR := buildroot/share/scripts
 CONTAINER_RT_BIN := docker
 CONTAINER_RT_OPTS := --rm -v $(PWD):/code -v platformio-cache:/root/.platformio
 CONTAINER_IMAGE := marlin-dev
-UNIT_TEST_CONFIG ?= default

 help:
 	@echo "Tasks for local development:"
-	@echo "make marlin                    : Build marlin for the configured board"
-	@echo "make format-pins -j            : Reformat all pins files (-j for parallel execution)"
-	@echo "make validate-pins -j          : Validate all pins files, fails if any require reformatting"
-	@echo "make tests-single-ci           : Run a single test from inside the CI"
-	@echo "make tests-single-local        : Run a single test locally"
-	@echo "make tests-single-local-docker : Run a single test locally, using docker"
-	@echo "make tests-all-local           : Run all tests locally"
-	@echo "make tests-all-local-docker    : Run all tests locally, using docker"
-	@echo "make unit-test-single-local    : Run unit tests for a single config locally"
-	@echo "make unit-test-single-local-docker : Run unit tests for a single config locally, using docker"
-	@echo "make unit-test-all-local      : Run all code tests locally"
-	@echo "make unit-test-all-local-docker : Run all code tests locally, using docker"
-	@echo "make setup-local-docker        : Setup local docker using buildx"
+	@echo "* format-pins:                 Reformat all pins files"
+	@echo "* tests-single-ci:             Run a single test from inside the CI"
+	@echo "* tests-single-local:          Run a single test locally"
+	@echo "* tests-single-local-docker:   Run a single test locally, using docker"
+	@echo "* tests-all-local:             Run all tests locally"
+	@echo "* tests-all-local-docker:      Run all tests locally, using docker"
+	@echo "* setup-local-docker:          Build the local docker image"
 	@echo ""
 	@echo "Options for testing:"
 	@echo "  TEST_TARGET          Set when running tests-single-*, to select the"
@@ -28,77 +21,49 @@ help:
 	@echo "                       run on GitHub CI"
 	@echo "  ONLY_TEST            Limit tests to only those that contain this, or"
 	@echo "                       the index of the test (1-based)"
-	@echo "  UNIT_TEST_CONFIG     Set the name of the config from the test folder, without"
-	@echo "                       the leading number. Default is 'default'". Used with the
-	@echo "                       unit-test-single-* tasks"
 	@echo "  VERBOSE_PLATFORMIO   If you want the full PIO output, set any value"
 	@echo "  GIT_RESET_HARD       Used by CI: reset all local changes. WARNING:"
 	@echo "                       THIS WILL UNDO ANY CHANGES YOU'VE MADE!"
-
-marlin:
-	./buildroot/bin/mftest -a
-.PHONY: marlin
+.PHONY: help

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

 tests-single-local:
 	@if ! test -n "$(TEST_TARGET)" ; then echo "***ERROR*** Set TEST_TARGET=<your-module> or use make tests-all-local" ; return 1; fi
 	export PATH="./buildroot/bin/:./buildroot/tests/:${PATH}" \
 	  && export VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) \
 	  && run_tests . $(TEST_TARGET) "$(ONLY_TEST)"
+.PHONY: tests-single-local

 tests-single-local-docker:
 	@if ! test -n "$(TEST_TARGET)" ; then echo "***ERROR*** Set TEST_TARGET=<your-module> or use make tests-all-local-docker" ; return 1; fi
 	@if ! $(CONTAINER_RT_BIN) images -q $(CONTAINER_IMAGE) > /dev/null ; then $(MAKE) setup-local-docker ; fi
-	$(CONTAINER_RT_BIN) run $(CONTAINER_RT_OPTS) $(CONTAINER_IMAGE) make tests-single-local TEST_TARGET=$(TEST_TARGET) VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) GIT_RESET_HARD=$(GIT_RESET_HARD) ONLY_TEST="$(ONLY_TEST)"
+	$(CONTAINER_RT_BIN) run $(CONTAINER_RT_OPTS) $(CONTAINER_IMAGE) $(MAKE) tests-single-local TEST_TARGET=$(TEST_TARGET) VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) GIT_RESET_HARD=$(GIT_RESET_HARD) ONLY_TEST="$(ONLY_TEST)"
+.PHONY: tests-single-local-docker

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

 tests-all-local-docker:
 	@if ! $(CONTAINER_RT_BIN) images -q $(CONTAINER_IMAGE) > /dev/null ; then $(MAKE) setup-local-docker ; fi
-	$(CONTAINER_RT_BIN) run $(CONTAINER_RT_OPTS) $(CONTAINER_IMAGE) make tests-all-local VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) GIT_RESET_HARD=$(GIT_RESET_HARD)
-
-unit-test-single-local:
-	platformio run -t marlin_$(UNIT_TEST_CONFIG) -e linux_native_test
-
-unit-test-single-local-docker:
-	@if ! $(CONTAINER_RT_BIN) images -q $(CONTAINER_IMAGE) > /dev/null ; then $(MAKE) setup-local-docker ; fi
-	$(CONTAINER_RT_BIN) run $(CONTAINER_RT_OPTS)  $(CONTAINER_IMAGE) make unit-test-single-local UNIT_TEST_CONFIG=$(UNIT_TEST_CONFIG)
-
-unit-test-all-local:
-	platformio run -t test-marlin -e linux_native_test
-
-unit-test-all-local-docker:
-	@if ! $(CONTAINER_RT_BIN) images -q $(CONTAINER_IMAGE) > /dev/null ; then $(MAKE) setup-local-docker ; fi
-	$(CONTAINER_RT_BIN) run $(CONTAINER_RT_OPTS)  $(CONTAINER_IMAGE) make unit-test-all-local
+	$(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) buildx build -t $(CONTAINER_IMAGE) -f docker/Dockerfile .
+	$(CONTAINER_RT_BIN) build -t $(CONTAINER_IMAGE) -f docker/Dockerfile .
+.PHONY: setup-local-docker

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

-.PHONY: $(PINS) format-pins validate-pins
+.PHONY: $(PINS)

 $(PINS): %:
-	@echo "Formatting $@"
-	@python $(SCRIPTS_DIR)/pinsformat.py $< $@
+	@echo "Formatting $@" && node buildroot/share/scripts/pinsformat.js $@

 format-pins: $(PINS)
-
-validate-pins: format-pins
-	@echo "Validating pins files"
-	@git diff --exit-code || (git status && echo "\nError: Pins files are not formatted correctly. Run \"make format-pins\" to fix.\n" && exit 1)
@@ -68,7 +68,7 @@

 // Choose the name from boards.h that matches your setup
 #ifndef MOTHERBOARD
-  #define MOTHERBOARD BOARD_EBAB
+  #define MOTHERBOARD BOARD_BTT_OCTOPUS_V1_0
 #endif

 /**
@@ -101,7 +101,7 @@
 * Currently Ethernet (-2) is only supported on Teensy 4.1 boards.
 * :[-2, -1, 0, 1, 2, 3, 4, 5, 6, 7]
 */
-//#define SERIAL_PORT_2 1
+#define SERIAL_PORT_2 1
 //#define BAUDRATE_2 250000   // :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000] Enable to override BAUDRATE

 /**
@@ -139,14 +139,14 @@
 *          TMC5130, TMC5130_STANDALONE, TMC5160, TMC5160_STANDALONE
 * :['A4988', 'A5984', 'DRV8825', 'LV8729', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC2209', 'TMC2209_STANDALONE', 'TMC26X', 'TMC26X_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE']
 */
-#define X_DRIVER_TYPE  TMC5160
-#define Y_DRIVER_TYPE  TMC5160
-#define Z_DRIVER_TYPE  TMC5160_STANDALONE
+#define X_DRIVER_TYPE  TB6560
+#define Y_DRIVER_TYPE  TB6560
+#define Z_DRIVER_TYPE  TB6560
 //#define X2_DRIVER_TYPE A4988
-#define Y2_DRIVER_TYPE TMC5160
-#define Z2_DRIVER_TYPE TMC5160_STANDALONE
-#define Z3_DRIVER_TYPE TMC5160_STANDALONE
-#define Z4_DRIVER_TYPE TMC5160_STANDALONE
+#define Y2_DRIVER_TYPE TB6560
+#define Z2_DRIVER_TYPE TB6560
+#define Z3_DRIVER_TYPE TB6560
+#define Z4_DRIVER_TYPE TB6560
 //#define I_DRIVER_TYPE  A4988
 //#define J_DRIVER_TYPE  A4988
 //#define K_DRIVER_TYPE  A4988
@@ -399,37 +399,19 @@
  //#define MKS_PWC                 // Using the MKS PWC add-on
  //#define PS_OFF_CONFIRM          // Confirm dialog when power off
  //#define PS_OFF_SOUND            // Beep 1s when power off
-  #define PSU_ACTIVE_STATE HIGH      // Set 'LOW' for ATX, 'HIGH' for X-Box
+  #define PSU_ACTIVE_STATE LOW      // Set 'LOW' for ATX, 'HIGH' for X-Box

-  #define PSU_DEFAULT_OFF               // Keep power off until enabled directly with M80
-  #define PSU_POWERUP_DELAY      750    // (ms) Delay for the PSU to warm up to full power
+  //#define PSU_DEFAULT_OFF               // Keep power off until enabled directly with M80
+  //#define PSU_POWERUP_DELAY      250    // (ms) Delay for the PSU to warm up to full power
  //#define LED_POWEROFF_TIMEOUT 10000    // (ms) Turn off LEDs after power-off, with this amount of delay

-  #define PSU_OFF_REDUNDANT             // Second pin for redundant power control
-  //#define PSU_OFF_REDUNDANT_OPPOSING    // Redundant pin works opposite standard pin
-  #define PS_ON_PIN                  P4_28  // Redundant Pin
-  #define PS_ON1_PIN                 P1_03  // Redundant Pin
-
-  #define PS_ON_EDM_PIN             P4_29    // EDM Pins to monitor feedback on external power control relay. Fault on mismatch.
-  #define PS_ON1_EDM_PIN            P1_17
-  #define PS_EDM_RESPONSE       1000     // Time in MS to allow for relay action
-
-  #define PSU_OFF_REDUNDANT             // Second pin for redundant power control
-  //#define PSU_OFF_REDUNDANT_OPPOSING    // Redundant pin works opposite standard pin
-  #define PS_ON_PIN                  P4_28  // Redundant Pin
-  #define PS_ON1_PIN                 P1_03  // Redundant Pin
-
-  #define PS_ON_EDM_PIN             P4_29    // EDM Pins to monitor feedback on external power control relay. Fault on mismatch.
-  #define PS_ON1_EDM_PIN            P1_17
-  #define PS_EDM_RESPONSE       1000     // Time in MS to allow for relay action
-
  //#define POWER_OFF_TIMER               // Enable M81 D<seconds> to power off after a delay
  //#define POWER_OFF_WAIT_FOR_COOLDOWN   // Enable M81 S to power off only after cooldown

  //#define PSU_POWERUP_GCODE  "M355 S1"  // G-code to run after power-on (e.g., case light on)
  //#define PSU_POWEROFF_GCODE "M355 S0"  // G-code to run before power-off (e.g., case light off)

-  #define AUTO_POWER_CONTROL      // Enable automatic control of the PS_ON pin
+  //#define AUTO_POWER_CONTROL      // Enable automatic control of the PS_ON pin
  #if ENABLED(AUTO_POWER_CONTROL)
    #define AUTO_POWER_FANS           // Turn on PSU for fans
    #define AUTO_POWER_E_FANS         // Turn on PSU for E Fans
@@ -1186,9 +1168,9 @@
 * Endstop "Hit" State
 * Set to the state (HIGH or LOW) that applies to each endstop.
 */
-#define X_MIN_ENDSTOP_HIT_STATE LOW
+#define X_MIN_ENDSTOP_HIT_STATE HIGH
 #define X_MAX_ENDSTOP_HIT_STATE HIGH
-#define Y_MIN_ENDSTOP_HIT_STATE LOW
+#define Y_MIN_ENDSTOP_HIT_STATE HIGH
 #define Y_MAX_ENDSTOP_HIT_STATE HIGH
 #define Z_MIN_ENDSTOP_HIT_STATE HIGH
 #define Z_MAX_ENDSTOP_HIT_STATE HIGH
@@ -1249,16 +1231,11 @@

 /**
 * Default Axis Steps Per Unit (linear=steps/mm, rotational=steps/°)
- * Override with M92 (when enabled below)
+ * Override with M92
 *                                      X, Y, Z [, I [, J [, K...]]], E0 [, E1[, E2...]]
 */
 #define DEFAULT_AXIS_STEPS_PER_UNIT   { 40, 40, 200, 425 }

-/**
- * Enable support for M92. Disable to save at least ~530 bytes of flash.
- */
-#define EDITABLE_STEPS_PER_UNIT
-
 /**
 * Default Max Feed Rate (linear=mm/s, rotational=°/s)
 * Override with M203
@@ -1348,11 +1325,6 @@
 * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
 */
 #define S_CURVE_ACCELERATION
-#if ENABLED(S_CURVE_ACCELERATION)
-  // Uncomment to use 4th instead of 6th order motion curve
-  #define S_CURVE_FACTOR 0.35    // Initial and final acceleration factor, ideally 0.1 to 0.4
-                                   // Shouldn't generally require tuning
-#endif

 //===========================================================================
 //============================= Z Probe Options =============================
@@ -2748,7 +2720,7 @@
 // If you have a speaker that can produce tones, enable it here.
 // By default Marlin assumes you have a buzzer with a fixed frequency.
 //
-//#define SPEAKER
+#define SPEAKER

 //
 // The duration and frequency for the UI feedback sound.
@@ -3043,11 +3015,6 @@
 //
 //#define BTT_MINI_12864

-//
-// BEEZ MINI 12864 is an alias for FYSETC_MINI_12864_2_1. Type A/B. NeoPixel RGB Backlight.
-//
-//#define BEEZ_MINI_12864
-
 //
 // Factory display for Creality CR-10 / CR-7 / Ender-3
 // https://www.aliexpress.com/item/32833148327.html
@@ -1386,7 +1386,7 @@
 * Multi-stepping sends steps in bursts to reduce MCU usage for high step-rates.
 * This allows higher feedrates than the MCU could otherwise support.
 */
-#define MULTISTEPPING_LIMIT   32  //: [1, 2, 4, 8, 16, 32, 64, 128]
+#define MULTISTEPPING_LIMIT   16  //: [1, 2, 4, 8, 16, 32, 64, 128]

 /**
 * Adaptive Step Smoothing increases the resolution of multi-axis moves, particularly at step frequencies
@@ -1394,7 +1394,7 @@
 * vibration and surface artifacts. The algorithm adapts to provide the best possible step smoothing at the
 * lowest stepping frequencies.
 */
-#define ADAPTIVE_STEP_SMOOTHING
+//#define ADAPTIVE_STEP_SMOOTHING

 /**
 * Custom Microstepping
@@ -1743,20 +1743,19 @@
   */
  //#define POWER_LOSS_RECOVERY
  #if ENABLED(POWER_LOSS_RECOVERY)
-    #define PLR_ENABLED_DEFAULT       false // Power Loss Recovery enabled by default. (Set with 'M413 Sn' & M500)
-    //#define PLR_BED_THRESHOLD BED_MAXTEMP // (°C) Skip user confirmation at or above this bed temperature (0 to disable)
-    //#define BACKUP_POWER_SUPPLY           // Backup power / UPS to move the steppers on power loss
-    //#define POWER_LOSS_ZRAISE           2 // (mm) Z axis raise on resume (on power loss with UPS)
-    //#define POWER_LOSS_PIN             44 // Pin to detect power loss. Set to -1 to disable default pin on boards without module.
-    //#define POWER_LOSS_STATE         HIGH // State of pin indicating power loss
-    //#define POWER_LOSS_PULLUP             // Set pullup / pulldown as appropriate for your sensor
+    #define PLR_ENABLED_DEFAULT   false // Power Loss Recovery enabled by default. (Set with 'M413 Sn' & M500)
+    //#define BACKUP_POWER_SUPPLY       // Backup power / UPS to move the steppers on power loss
+    //#define POWER_LOSS_ZRAISE       2 // (mm) Z axis raise on resume (on power loss with UPS)
+    //#define POWER_LOSS_PIN         44 // Pin to detect power loss. Set to -1 to disable default pin on boards without module.
+    //#define POWER_LOSS_STATE     HIGH // State of pin indicating power loss
+    //#define POWER_LOSS_PULLUP         // Set pullup / pulldown as appropriate for your sensor
    //#define POWER_LOSS_PULLDOWN
-    //#define POWER_LOSS_PURGE_LEN       20 // (mm) Length of filament to purge on resume
-    //#define POWER_LOSS_RETRACT_LEN     10 // (mm) Length of filament to retract on fail. Requires backup power.
+    //#define POWER_LOSS_PURGE_LEN   20 // (mm) Length of filament to purge on resume
+    //#define POWER_LOSS_RETRACT_LEN 10 // (mm) Length of filament to retract on fail. Requires backup power.

    // Without a POWER_LOSS_PIN the following option helps reduce wear on the SD card,
    // especially with "vase mode" printing. Set too high and vases cannot be continued.
-    #define POWER_LOSS_MIN_Z_CHANGE    0.05 // (mm) Minimum Z change before saving power-loss data
+    #define POWER_LOSS_MIN_Z_CHANGE 0.05 // (mm) Minimum Z change before saving power-loss data

    // Enable if Z homing is needed for proper recovery. 99.9% of the time this should be disabled!
    //#define POWER_LOSS_RECOVER_ZHOME
@@ -1913,7 +1912,7 @@
   *
   * :[ 'LCD', 'ONBOARD', 'CUSTOM_CABLE' ]
   */
-  #define SDCARD_CONNECTION ONBOARD
+  //#define SDCARD_CONNECTION LCD

  // Enable if SD detect is rendered useless (e.g., by using an SD extender)
  //#define NO_SD_DETECT
@@ -2289,7 +2288,7 @@
  #define BABYSTEP_ZPROBE_OFFSET          // Combine M851 Z and Babystepping
  #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
    //#define BABYSTEP_HOTEND_Z_OFFSET      // For multiple hotends, babystep relative Z offsets
-    //#define BABYSTEP_GFX_OVERLAY          // Enable graphical overlay on Z-offset editor
+    #define BABYSTEP_GFX_OVERLAY          // Enable graphical overlay on Z-offset editor
  #endif
 #endif

@@ -2319,6 +2318,7 @@
  #endif
  //#define ADVANCE_K_EXTRA       // Add a second linear advance constant, configurable with M900 L.
  //#define LA_DEBUG              // Print debug information to serial during operation. Disable for production use.
+  #define ALLOW_LOW_EJERK       // Allow a DEFAULT_EJERK value of <10. Recommended for direct drive hotends.
  //#define EXPERIMENTAL_I2S_LA   // Allow I2S_STEPPER_STREAM to be used with LA. Performance degrades as the LA step rate reaches ~20kHz.
 #endif

@@ -2564,7 +2564,7 @@
 *
 * Override the default value based on the driver type set in Configuration.h.
 */
-//#define MINIMUM_STEPPER_PULSE 5
+//#define MINIMUM_STEPPER_PULSE 2

 /**
 * Maximum stepping rate (in Hz) the stepper driver allows
@@ -2578,7 +2578,7 @@
 *
 * Override the default value based on the driver type set in Configuration.h.
 */
-//#define MAXIMUM_STEPPER_RATE 150000
+//#define MAXIMUM_STEPPER_RATE 250000

 // @section temperature

@@ -2929,7 +2929,6 @@

  #define FILAMENT_LOAD_UNLOAD_GCODES           // Add M701/M702 Load/Unload G-codes, plus Load/Unload in the LCD Prepare menu.
  #define FILAMENT_UNLOAD_ALL_EXTRUDERS         // Allow M702 to unload all extruders above a minimum target temp (as set by M302)
-  #define CONFIGURE_FILAMENT_CHANGE               // Add M603 G-code and menu items. Requires ~1.3K bytes of flash.
 #endif

 // @section tmc_smart
@@ -2960,7 +2959,7 @@
 */
 #if HAS_TRINAMIC_CONFIG || HAS_TMC26X

-  #define HOLD_MULTIPLIER    0.7  // Scales down the holding current from run current
+  #define HOLD_MULTIPLIER    0.5  // Scales down the holding current from run current

  /**
   * Interpolate microsteps to 256
@@ -2972,7 +2971,7 @@
    #define X_CURRENT       800        // (mA) RMS current. Multiply by 1.414 for peak current.
    #define X_CURRENT_HOME  X_CURRENT  // (mA) RMS current for sensorless homing
    #define X_MICROSTEPS     16        // 0..256
-    #define X_RSENSE          0.022     // Multiplied x1000 for TMC26X
+    #define X_RSENSE          0.11     // Multiplied x1000 for TMC26X
    #define X_CHAIN_POS      -1        // -1..0: Not chained. 1: MCU MOSI connected. 2: Next in chain, ...
    //#define X_INTERPOLATE  true      // Enable to override 'INTERPOLATE' for the X axis
    //#define X_HOLD_MULTIPLIER 0.5    // Enable to override 'HOLD_MULTIPLIER' for the X axis
@@ -2992,7 +2991,7 @@
    #define Y_CURRENT       800
    #define Y_CURRENT_HOME  Y_CURRENT
    #define Y_MICROSTEPS     16
-    #define Y_RSENSE          0.022
+    #define Y_RSENSE          0.11
    #define Y_CHAIN_POS      -1
    //#define Y_INTERPOLATE  true
    //#define Y_HOLD_MULTIPLIER 0.5
@@ -3214,7 +3213,7 @@
   * The default SW SPI pins are defined the respective pins files,
   * but you can override or define them here.
   */
-  #define TMC_USE_SW_SPI
+  //#define TMC_USE_SW_SPI
  //#define TMC_SPI_MOSI  -1
  //#define TMC_SPI_MISO  -1
  //#define TMC_SPI_SCK   -1
@@ -3274,7 +3273,7 @@
   * When disabled, Marlin will use spreadCycle stepping mode.
   */
  #if HAS_STEALTHCHOP
-    //#define STEALTHCHOP_XY
+    #define STEALTHCHOP_XY
    #define STEALTHCHOP_Z
    #define STEALTHCHOP_I
    #define STEALTHCHOP_J
@@ -3300,11 +3299,11 @@
   * Define your own with:
   * { <off_time[1..15]>, <hysteresis_end[-3..12]>, hysteresis_start[1..8] }
   */
-  //#define CHOPPER_TIMING CHOPPER_DEFAULT_36V        // All axes (override below)
-  #define CHOPPER_TIMING_X  CHOPPER_DEFAULT_36V        // For X Axes (override below)
+  #define CHOPPER_TIMING CHOPPER_DEFAULT_24V        // All axes (override below)
+  //#define CHOPPER_TIMING_X  CHOPPER_TIMING        // For X Axes (override below)
  //#define CHOPPER_TIMING_X2 CHOPPER_TIMING_X
-  #define CHOPPER_TIMING_Y  CHOPPER_DEFAULT_36V        // For Y Axes (override below)
-  #define CHOPPER_TIMING_Y2 CHOPPER_TIMING_Y
+  //#define CHOPPER_TIMING_Y  CHOPPER_TIMING        // For Y Axes (override below)
+  //#define CHOPPER_TIMING_Y2 CHOPPER_TIMING_Y
  //#define CHOPPER_TIMING_Z  CHOPPER_TIMING        // For Z Axes (override below)
  //#define CHOPPER_TIMING_Z2 CHOPPER_TIMING_Z
  //#define CHOPPER_TIMING_Z3 CHOPPER_TIMING_Z
@@ -3315,7 +3314,7 @@
  //#define CHOPPER_TIMING_U  CHOPPER_TIMING        // For U Axis
  //#define CHOPPER_TIMING_V  CHOPPER_TIMING        // For V Axis
  //#define CHOPPER_TIMING_W  CHOPPER_TIMING        // For W Axis
-  #define CHOPPER_TIMING_E  CHOPPER_DEFAULT_24V        // For Extruders (override below)
+  //#define CHOPPER_TIMING_E  CHOPPER_TIMING        // For Extruders (override below)
  //#define CHOPPER_TIMING_E1 CHOPPER_TIMING_E
  //#define CHOPPER_TIMING_E2 CHOPPER_TIMING_E
  //#define CHOPPER_TIMING_E3 CHOPPER_TIMING_E
@@ -3337,12 +3336,12 @@
   * M912 - Clear stepper driver overtemperature pre-warn condition flag.
   * M122 - Report driver parameters (Requires TMC_DEBUG)
   */
-  #define MONITOR_DRIVER_STATUS
+  //#define MONITOR_DRIVER_STATUS

  #if ENABLED(MONITOR_DRIVER_STATUS)
    #define CURRENT_STEP_DOWN     50  // [mA]
    #define REPORT_CURRENT_CHANGE
-    //#define STOP_ON_ERROR
+    #define STOP_ON_ERROR
  #endif

  // @section tmc/hybrid
@@ -3836,6 +3835,38 @@
 */
 //#define CNC_COORDINATE_SYSTEMS

+// @section reporting
+
+/**
+ * Auto-report fan speed with M123 S<seconds>
+ * Requires fans with tachometer pins
+ */
+//#define AUTO_REPORT_FANS
+
+/**
+ * Auto-report temperatures with M155 S<seconds>
+ */
+#define AUTO_REPORT_TEMPERATURES
+#if ENABLED(AUTO_REPORT_TEMPERATURES) && TEMP_SENSOR_REDUNDANT
+  //#define AUTO_REPORT_REDUNDANT // Include the "R" sensor in the auto-report
+#endif
+
+/**
+ * Auto-report position with M154 S<seconds>
+ */
+#define AUTO_REPORT_POSITION
+#if ENABLED(AUTO_REPORT_POSITION)
+  //#define AUTO_REPORT_REAL_POSITION // Auto-report the real position
+#endif
+
+/**
+ * Include capabilities in M115 output
+ */
+#define EXTENDED_CAPABILITIES_REPORT
+#if ENABLED(EXTENDED_CAPABILITIES_REPORT)
+  //#define M115_GEOMETRY_REPORT
+#endif
+
 // @section security

 /**
@@ -3878,50 +3909,13 @@

 // @section reporting

-/**
- * Extra options for the M114 "Current Position" report
- */
+// Extra options for the M114 "Current Position" report
 //#define M114_DETAIL         // Use 'M114` for details to check planner calculations
 //#define M114_REALTIME       // Real current position based on forward kinematics
 //#define M114_LEGACY         // M114 used to synchronize on every call. Enable if needed.

-/**
- * Auto-report fan speed with M123 S<seconds>
- * Requires fans with tachometer pins
- */
-//#define AUTO_REPORT_FANS
-
 //#define REPORT_FAN_CHANGE   // Report the new fan speed when changed by M106 (and others)

-/**
- * Auto-report temperatures with M155 S<seconds>
- */
-#define AUTO_REPORT_TEMPERATURES
-#if ENABLED(AUTO_REPORT_TEMPERATURES) && TEMP_SENSOR_REDUNDANT
-  //#define AUTO_REPORT_REDUNDANT // Include the "R" sensor in the auto-report
-#endif
-
-/**
- * Auto-report position with M154 S<seconds>
- */
-//#define AUTO_REPORT_POSITION
-#if ENABLED(AUTO_REPORT_POSITION)
-  //#define AUTO_REPORT_REAL_POSITION // Auto-report the real position
-#endif
-
-/**
- * M115 - Report capabilites. Disable to save ~1150 bytes of flash.
- *        Some hosts (and serial TFT displays) rely on this feature.
- */
-#define CAPABILITIES_REPORT
-#if ENABLED(CAPABILITIES_REPORT)
-  // Include capabilities in M115 output
-  #define EXTENDED_CAPABILITIES_REPORT
-  #if ENABLED(EXTENDED_CAPABILITIES_REPORT)
-    //#define M115_GEOMETRY_REPORT
-  #endif
-#endif
-
 // @section gcode

 /**
@@ -3933,9 +3927,7 @@
  //#define GCODE_QUOTED_STRINGS  // Support for quoted string parameters
 #endif

-/**
- * Support for MeatPack G-code compression (https://github.com/scottmudge/OctoPrint-MeatPack)
- */
+// Support for MeatPack G-code compression (https://github.com/scottmudge/OctoPrint-MeatPack)
 //#define MEATPACK_ON_SERIAL_PORT_1
 //#define MEATPACK_ON_SERIAL_PORT_2

@@ -3943,12 +3935,6 @@

 //#define REPETIER_GCODE_M360     // Add commands originally from Repetier FW

-/**
- * Enable M111 debug flags 1=ECHO, 2=INFO, 4=ERRORS (unimplemented).
- * Disable to save some flash. Some hosts (Repetier Host) may rely on this feature.
- */
-#define DEBUG_FLAGS_GCODE
-
 /**
 * Enable this option for a leaner build of Marlin that removes
 * workspace offsets to slightly optimize performance.
@@ -3976,6 +3962,8 @@
  //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
 #endif

+// @section gcode
+
 /**
 * Startup commands
 *
@@ -4493,7 +4481,7 @@
 //
 // M43 - display pin status, toggle pins, watch pins, watch endstops & toggle LED, test servo probe
 //
-//#define PINS_DEBUGGING
+#define PINS_DEBUGGING

 // Enable Tests that will run at startup and produce a report
 //#define MARLIN_TEST_BUILD
@@ -2,7 +2,7 @@

  Marlin Firmware

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

@@ -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-05-27"
+//#define STRING_DISTRIBUTION_DATE "2024-01-01"

 /**
 * Defines a generic printer name to be output to the LCD after booting Marlin.
@@ -81,12 +81,6 @@ void MarlinHAL::init() {
  #if HAS_SERVO_3
    OUT_WRITE(SERVO3_PIN, LOW);
  #endif
-  #if HAS_SERVO_4
-    OUT_WRITE(SERVO4_PIN, LOW);
-  #endif
-  #if HAS_SERVO_5
-    OUT_WRITE(SERVO5_PIN, LOW);
-  #endif

  init_pwm_timers();   // Init user timers to default frequency - 1000HZ

@@ -119,6 +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

  // ------------------------
@@ -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) {
@@ -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)) {
@@ -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.
@@ -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
@@ -163,6 +163,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 +181,7 @@ const volatile uint8_t* const PWM_other[][3] PROGMEM = {
  #endif
 };

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

  #ifdef TIMER0A
@@ -215,6 +217,7 @@ const volatile uint8_t* const PWM_OCR[][3] PROGMEM = {
  #endif
 };

+
 #define TCCR_A(T)   pgm_read_word(&PWM_other[T][0])
 #define TCCR_B(T)   pgm_read_word(&PWM_other[T][1])
 #define TIMSK(T)    pgm_read_word(&PWM_other[T][2])
@@ -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
@@ -42,7 +42,7 @@
 // Public functions
 // ------------------------

-#if ANY(SOFTWARE_SPI, FORCE_SOFT_SPI)
+#if ANY(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> >;
@@ -958,14 +958,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 +984,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui

 bool PersistentStore::read_data(int &pos, uint8_t *value, size_t size, uint16_t *crc, const bool writing/*=true*/) {
  do {
-    uint8_t c = ee_Read(uint32_t(REAL_EEPROM_ADDR(pos)));
+    uint8_t c = ee_Read(uint32_t(pos));
    if (writing) *value = c;
    crc16(crc, &c, 1);
    pos++;
@@ -36,14 +36,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 +62,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui

 bool PersistentStore::read_data(int &pos, uint8_t *value, size_t size, uint16_t *crc, const bool writing/*=true*/) {
  do {
-    const uint8_t c = eeprom_read_byte((uint8_t*)REAL_EEPROM_ADDR(pos));
+    uint8_t c = eeprom_read_byte((uint8_t*)pos);
    if (writing) *value = c;
    crc16(crc, &c, 1);
    pos++;
@@ -61,7 +61,7 @@
 #else
  #define G2_PWM_Z 0
 #endif
-#if HAS_MOTOR_CURRENT_PWM_E
+#if PIN_EXISTS(MOTOR_CURRENT_PWM_E)
  #define G2_PWM_E 1
 #else
  #define G2_PWM_E 0
@@ -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'), \
@@ -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
@@ -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
@@ -72,10 +72,10 @@

 #if HAS_MEDIA && HAS_DRIVER(TMC2130)
  #if ENABLED(TMC_USE_SW_SPI)
-    #if DISABLED(SOFTWARE_SPI) && (_IS_HW_SPI(MOSI) || _IS_HW_SPI(MISO) || _IS_HW_SPI(SCK))
+    #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
@@ -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,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)
 * @{
@@ -149,6 +150,7 @@

 //@}

+
 /**
 * USB Interface Configuration
 * @{
@@ -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
@@ -57,6 +57,7 @@

 #include "preprocessor.h"

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

@@ -128,6 +128,7 @@ static inline void osc_enable(uint32_t ul_id) {
    pmc_switch_sclk_to_32kxtal(PMC_OSC_BYPASS);
    break;

+
  case OSC_MAINCK_4M_RC:
    pmc_switch_mainck_to_fastrc(CKGR_MOR_MOSCRCF_4_MHz);
    break;
@@ -140,6 +141,7 @@ static inline void osc_enable(uint32_t ul_id) {
    pmc_switch_mainck_to_fastrc(CKGR_MOR_MOSCRCF_12_MHz);
    break;

+
  case OSC_MAINCK_XTAL:
    pmc_switch_mainck_to_xtal(PMC_OSC_XTAL/*,
      pmc_us_to_moscxtst(BOARD_OSC_STARTUP_US,
@@ -51,4 +51,5 @@
 #include "stringz.h"
 #include "mrepeat.h"

+
 #endif  // _PREPROCESSOR_H_
@@ -86,6 +86,7 @@ enum scsi_sbc_mode {
  SCSI_MS_MODE_CACHING = 0x08,    //!< Caching mode page
 };

+
 //! \name SBC-2 Device-Specific Parameter
 //@{
 #define SCSI_MS_SBC_WP              0x80    //!< Write Protected
@@ -18,32 +18,32 @@ extern "C" {
 void sd_mmc_spi_mem_init() {
 }

-inline bool media_ready() {
-  return IS_SD_INSERTED() && !IS_SD_PRINTING() && !IS_SD_FILE_OPEN() && card.isMounted();
-}
-
-bool sd_mmc_spi_unload(bool) { return true; }
-
-bool sd_mmc_spi_wr_protect() { return false; }
-
-bool sd_mmc_spi_removal() { return !media_ready(); }
-
 Ctrl_status sd_mmc_spi_test_unit_ready() {
  #ifdef DISABLE_DUE_SD_MMC
    return CTRL_NO_PRESENT;
  #endif
-  if (!media_ready()) return CTRL_NO_PRESENT;
+  if (!IS_SD_INSERTED() || IS_SD_PRINTING() || IS_SD_FILE_OPEN() || !card.isMounted())
+    return CTRL_NO_PRESENT;
  return CTRL_GOOD;
 }

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

+bool sd_mmc_spi_unload(bool) { return true; }
+
+bool sd_mmc_spi_wr_protect() { return false; }
+
+bool sd_mmc_spi_removal() {
+  return (!IS_SD_INSERTED() || IS_SD_PRINTING() || IS_SD_FILE_OPEN() || !card.isMounted());
+}
+
 #if ACCESS_USB == true
 /**
 * \name MEM <-> USB Interface
@@ -61,7 +61,8 @@ Ctrl_status sd_mmc_spi_usb_read_10(uint32_t addr, uint16_t nb_sector) {
  #ifdef DISABLE_DUE_SD_MMC
    return CTRL_NO_PRESENT;
  #endif
-  if (!media_ready()) return CTRL_NO_PRESENT;
+  if (!IS_SD_INSERTED() || IS_SD_PRINTING() || IS_SD_FILE_OPEN() || !card.isMounted())
+    return CTRL_NO_PRESENT;

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

  #ifdef DEBUG_MMC
  {
@@ -45,6 +45,7 @@
 * Support and FAQ: visit <a href="https://www.atmel.com/design-support/">Atmel Support</a>
 */

+
 #ifndef _SD_MMC_SPI_MEM_H_
 #define _SD_MMC_SPI_MEM_H_

@@ -62,19 +63,22 @@
  #error sd_mmc_spi_mem.h is #included although SD_MMC_SPI_MEM is disabled
 #endif

+
 #include "ctrl_access.h"

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

 #define   SD_MMC_REMOVED       0
 #define   SD_MMC_INSERTED      1
 #define   SD_MMC_REMOVING      2

+
 //---- CONTROL FUNCTIONS ----
 //!
 //! @brief This function initializes the hw/sw resources required to drive the SD_MMC_SPI.
 //!/
-void sd_mmc_spi_mem_init();
+extern void           sd_mmc_spi_mem_init(void);

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

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

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

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

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

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

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

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

 #endif // #if ACCESS_USB == true

@@ -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
 //! @{

@@ -685,4 +685,6 @@ usb_iface_desc_t UDC_DESC_STORAGE *udc_get_interface_desc(void);
   } \endcode
 */

+
+
 #endif // _UDC_H_
@@ -213,6 +213,7 @@ void udd_send_remotewakeup(void);
 */
 void udd_set_setup_payload( uint8_t *payload, uint16_t payload_size );

+
 /**
 * \name Endpoint Management
 *
@@ -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)
@@ -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
@@ -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
 */
@@ -86,6 +86,7 @@ UDC_DESC_STORAGE udi_api_t udi_api_msc = {
 };
 //@}

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

 //@}

+
 /**
 * \name Internal routines
 */
@@ -188,6 +190,7 @@ static void udi_msc_cbw_received(udd_ep_status_t status,
 static bool udi_msc_cbw_validate(uint32_t alloc_len, uint8_t dir_flag);
 //@}

+
 /**
 * \name Routines to process small data packet
 */
@@ -214,6 +217,7 @@ static void udi_msc_data_sent(udd_ep_status_t status, iram_size_t nb_sent,
    udd_ep_id_t ep);
 //@}

+
 /**
 * \name Routines to process CSW packet
 */
@@ -246,6 +250,7 @@ static void udi_msc_csw_sent(udd_ep_status_t status, iram_size_t nb_sent,
    udd_ep_id_t ep);
 //@}

+
 /**
 * \name Routines manage sense data
 */
@@ -302,6 +307,7 @@ static void udi_msc_sense_fail_cdb_invalid(void);
 static void udi_msc_sense_command_invalid(void);
 //@}

+
 /**
 * \name Routines manage SCSI Commands
 */
@@ -116,23 +116,6 @@
 //#define dbg_print printf
 #define dbg_print(...)

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

+
 /**
 * \name Power management routine.
 */
@@ -309,6 +293,7 @@ static bool udd_b_idle;
 //! State of sleep manager
 static bool udd_b_sleep_initialized = false;

+
 /*! \brief Authorize or not the CPU powerdown mode
 *
 * \param b_enable true to authorize idle mode
@@ -336,6 +321,7 @@ static void udd_sleep_mode(bool b_idle)

 //@}

+
 /**
 * \name Control endpoint low level management routine.
 *
@@ -407,6 +393,7 @@ static void udd_ctrl_send_zlp_out(void);
 //! \brief Call callback associated to setup request
 static void udd_ctrl_endofrequest(void);

+
 /**
 * \brief Main interrupt routine for control endpoint
 *
@@ -418,6 +405,7 @@ static bool udd_ctrl_interrupt(void);

 //@}

+
 /**
 * \name Management of bulk/interrupt/isochronous endpoints
 *
@@ -455,6 +443,7 @@ typedef struct {
 	uint8_t stall_requested:1;
 } udd_ep_job_t;

+
 //! Array to register a job on bulk/interrupt/isochronous endpoint
 static udd_ep_job_t udd_ep_job[USB_DEVICE_MAX_EP];

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

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

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

+
 bool udd_include_vbus_monitoring(void)
 {
 	return true;
 }

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

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

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

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

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

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

+
 void udd_detach(void)
 {
 	otg_unfreeze_clock();

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

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

+
 void udd_set_address(uint8_t address)
 {
 	udd_disable_address();
@@ -888,11 +846,13 @@ void udd_set_address(uint8_t address)
 	udd_enable_address();
 }

+
 uint8_t udd_getaddress(void)
 {
 	return udd_get_configured_address();
 }

+
 uint16_t udd_get_frame_number(void)
 {
 	return udd_frame_number();
@@ -915,12 +875,14 @@ void udd_send_remotewakeup(void)
 	}
 }

+
 void udd_set_setup_payload(uint8_t *payload, uint16_t payload_size)
 {
 	udd_g_ctrlreq.payload = payload;
 	udd_g_ctrlreq.payload_size = payload_size;
 }

+
 #if (0 != USB_DEVICE_MAX_EP)
 bool udd_ep_alloc(udd_ep_id_t ep, uint8_t bmAttributes,
 		uint16_t MaxEndpointSize)
@@ -1044,6 +1006,7 @@ bool udd_ep_alloc(udd_ep_id_t ep, uint8_t bmAttributes,
 	return true;
 }

+
 void udd_ep_free(udd_ep_id_t ep)
 {
 	uint8_t ep_index = ep & USB_EP_ADDR_MASK;
@@ -1056,12 +1019,14 @@ void udd_ep_free(udd_ep_id_t ep)
 	udd_ep_job[ep_index - 1].stall_requested = false;
 }

+
 bool udd_ep_is_halted(udd_ep_id_t ep)
 {
 	uint8_t ep_index = ep & USB_EP_ADDR_MASK;
 	return Is_udd_endpoint_stall_requested(ep_index);
 }

+
 bool udd_ep_set_halt(udd_ep_id_t ep)
 {
 	uint8_t ep_index = ep & USB_EP_ADDR_MASK;
@@ -1102,6 +1067,7 @@ bool udd_ep_set_halt(udd_ep_id_t ep)
 	return true;
 }

+
 bool udd_ep_clear_halt(udd_ep_id_t ep)
 {
 	uint8_t ep_index = ep & USB_EP_ADDR_MASK;
@@ -1142,6 +1108,7 @@ bool udd_ep_clear_halt(udd_ep_id_t ep)
 	return true;
 }

+
 bool udd_ep_run(udd_ep_id_t ep, bool b_shortpacket,
 		uint8_t * buf, iram_size_t buf_size,
 		udd_callback_trans_t callback)
@@ -1208,6 +1175,7 @@ bool udd_ep_run(udd_ep_id_t ep, bool b_shortpacket,
 #endif
 }

+
 void udd_ep_abort(udd_ep_id_t ep)
 {
 	uint8_t ep_index = ep & USB_EP_ADDR_MASK;
@@ -1236,6 +1204,7 @@ void udd_ep_abort(udd_ep_id_t ep)
 	udd_ep_abort_job(ep);
 }

+
 bool udd_ep_wait_stall_clear(udd_ep_id_t ep,
 		udd_callback_halt_cleared_t callback)
 {
@@ -1270,6 +1239,7 @@ bool udd_ep_wait_stall_clear(udd_ep_id_t ep,
 }
 #endif // (0 != USB_DEVICE_MAX_EP)

+
 #ifdef USB_DEVICE_HS_SUPPORT

 void udd_test_mode_j(void)
@@ -1278,17 +1248,20 @@ void udd_test_mode_j(void)
 	udd_enable_hs_test_mode_j();
 }

+
 void udd_test_mode_k(void)
 {
 	udd_enable_hs_test_mode();
 	udd_enable_hs_test_mode_k();
 }

+
 void udd_test_mode_se0_nak(void)
 {
 	udd_enable_hs_test_mode();
 }

+
 void udd_test_mode_packet(void)
 {
 	uint8_t i;
@@ -1332,6 +1305,8 @@ void udd_test_mode_packet(void)
 }
 #endif // USB_DEVICE_HS_SUPPORT

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

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

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

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

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

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

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

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

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

+
 static void udd_ctrl_send_zlp_out(void)
 {
 	irqflags_t flags;
@@ -1685,6 +1668,7 @@ static void udd_ctrl_send_zlp_out(void)
 	cpu_irq_restore(flags);
 }

+
 static void udd_ctrl_endofrequest(void)
 {
 	// If a callback is registered then call it
@@ -1693,6 +1677,7 @@ static void udd_ctrl_endofrequest(void)
 	}
 }

+
 static bool udd_ctrl_interrupt(void)
 {

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

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

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

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

+
 static void udd_ep_abort_job(udd_ep_id_t ep)
 {
 	ep &= USB_EP_ADDR_MASK;
@@ -1775,6 +1763,7 @@ static void udd_ep_abort_job(udd_ep_id_t ep)
 	udd_ep_finish_job(&udd_ep_job[ep - 1], true, ep);
 }

+
 static void udd_ep_finish_job(udd_ep_job_t * ptr_job, bool b_abort, uint8_t ep_num)
 {
 	if (ptr_job->busy == false) {
@@ -1845,6 +1834,7 @@ static void udd_ep_trans_done(udd_ep_id_t ep)
 		udd_dma_ctrl |= UOTGHS_DEVDMACONTROL_END_BUFFIT |
 				UOTGHS_DEVDMACONTROL_CHANN_ENB;

+
 		// Disable IRQs to have a short sequence
 		// between read of EOT_STA and DMA enable
 		flags = cpu_irq_save();
@@ -2053,12 +2043,6 @@ static bool udd_ep_interrupt(void)
 				dbg_print("I ");
 				udd_disable_in_send_interrupt(ep);
 				// One bank is free then send a ZLP
-
-				// Marlin modification: Add a barrier to ensure in_send is disabled
-				// before it is cleared. This was not an observed problem, but
-				// other interrupts were seen to misbehave without this barrier.
-				__DSB();
-
 				udd_ack_in_send(ep);
 				udd_ack_fifocon(ep);
 				udd_ep_finish_job(ptr_job, false, ep);
@@ -129,6 +129,7 @@ extern "C" {
 #define Is_udd_vbus_transition()          (Tst_bits(UOTGHS->UOTGHS_SR, UOTGHS_SR_VBUSTI))
 //! @}

+
 //! @name UOTGHS device attach control
 //! These macros manage the UOTGHS Device attach.
 //! @{
@@ -140,6 +141,7 @@ extern "C" {
 #define Is_udd_detached()                 (Tst_bits(UOTGHS->UOTGHS_DEVCTRL, UOTGHS_DEVCTRL_DETACH))
 //! @}

+
 //! @name UOTGHS device bus events control
 //! These macros manage the UOTGHS Device bus events.
 //! @{
@@ -244,6 +246,7 @@ extern "C" {
 #define udd_get_configured_address()              (Rd_bitfield(UOTGHS->UOTGHS_DEVCTRL, UOTGHS_DEVCTRL_UADD_Msk))
 //! @}

+
 //! @name UOTGHS Device endpoint drivers
 //! These macros manage the common features of the endpoints.
 //! @{
@@ -327,6 +330,7 @@ extern "C" {
 #define udd_data_toggle(ep)                       (Rd_bitfield(UOTGHS_ARRAY(UOTGHS_DEVEPTISR[0], ep), UOTGHS_DEVEPTISR_DTSEQ_Msk))
 //! @}

+
 //! @name UOTGHS Device control endpoint
 //! These macros control the endpoints.
 //! @{
@@ -526,6 +530,7 @@ extern "C" {
  //! Tests if IN sending interrupt is enabled
 #define Is_udd_in_send_interrupt_enabled(ep)      (Tst_bits(UOTGHS_ARRAY(UOTGHS_DEVEPTIMR[0], ep), UOTGHS_DEVEPTIMR_TXINE))

+
  //! Get 64-, 32-, 16- or 8-bit access to FIFO data register of selected endpoint.
  //! @param ep Endpoint of which to access FIFO data register
  //! @param scale Data scale in bits: 64, 32, 16 or 8
@@ -647,6 +652,7 @@ typedef struct {
 //! @}
 //! @}

+
 /// @cond 0
 /**INDENT-OFF**/
 #ifdef __cplusplus
@@ -53,6 +53,7 @@
 extern "C" {
 #endif

+
 //! \ingroup usb_group
 //! \defgroup otg_group UOTGHS OTG Driver
 //! UOTGHS low-level driver for OTG features
@@ -73,6 +74,7 @@ bool otg_dual_enable(void);
 */
 void otg_dual_disable(void);

+
 //! @name UOTGHS OTG ID pin management
 //! The ID pin come from the USB OTG connector (A and B receptable) and
 //! allows to select the USB mode host or device.
@@ -374,6 +374,7 @@ typedef struct {
  uint8_t bNumDeviceCaps;
 } usb_dev_bos_desc_t;

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

+
 /**
 * \brief Standard USB configuration descriptor structure
 */
@@ -424,6 +426,7 @@ typedef struct {
  uint8_t bMaxPower;
 } usb_conf_desc_t;

+
 #define  USB_CONFIG_ATTR_MUST_SET         (1 << 7) //!< Must always be set
 #define  USB_CONFIG_ATTR_BUS_POWERED      (0 << 6) //!< Bus-powered
 #define  USB_CONFIG_ATTR_SELF_POWERED     (1 << 6) //!< Self-powered
@@ -472,6 +475,7 @@ typedef struct {
  uint8_t bInterval;
 } usb_ep_desc_t;

+
 /**
 * \brief A standard USB string descriptor structure
 */
@@ -168,6 +168,7 @@ COMPILER_PACK_SET(1)
 //! \name USB CDC Descriptors
 //@{

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

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

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

@@ -47,6 +47,7 @@
 #ifndef _USB_PROTOCOL_MSC_H_
 #define _USB_PROTOCOL_MSC_H_

+
 /**
 * \ingroup usb_protocol_group
 * \defgroup usb_msc_protocol USB Mass Storage Class (MSC) protocol definitions
@@ -88,6 +89,7 @@
 #define MSC_PROTOCOL_BULK           0x50  //!< Bulk-only
 //@}

+
 /**
 * \brief MSC USB requests (bRequest)
 */
@@ -96,6 +98,7 @@ enum usb_reqid_msc {
  USB_REQ_MSC_GET_MAX_LUN = 0xFE  //!< Get Max LUN
 };

+
 COMPILER_PACK_SET(1)

 /**
@@ -119,6 +122,7 @@ struct usb_msc_cbw {
 #define USB_CBW_LEN_MASK            0x1F  //!< Valid bits in bCBWCBLength
 //@}

+
 /**
 * \name A Command Status Wrapper (CSW).
 */
@@ -31,28 +31,24 @@
 #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()  { return EEPROM.begin(MARLIN_EEPROM_SIZE); }
 bool PersistentStore::access_finish() { EEPROM.end(); return true; }

 bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, uint16_t *crc) {
  for (size_t i = 0; i < size; i++) {
-    const int p = REAL_EEPROM_ADDR(pos);
-    EEPROM.write(p, value[i]);
+    EEPROM.write(pos++, value[i]);
    crc16(crc, &value[i], 1);
-    ++pos;
  }
  return false;
 }

 bool PersistentStore::read_data(int &pos, uint8_t *value, size_t size, uint16_t *crc, const bool writing/*=true*/) {
  for (size_t i = 0; i < size; i++) {
-    const int p = REAL_EEPROM_ADDR(pos);
-    uint8_t c = EEPROM.read(p);
+    uint8_t c = EEPROM.read(pos++);
    if (writing) value[i] = c;
    crc16(crc, &c, 1);
-    ++pos;
  }
  return false;
 }
@@ -34,10 +34,6 @@
 #include <freertos/queue.h>
 #include "../../module/stepper.h"

-#if ENABLED(FT_MOTION)
-  #include "../../module/ft_motion.h"
-#endif
-
 #define DMA_BUF_COUNT 8                                // number of DMA buffers to store data
 #define DMA_BUF_LEN   4092                             // maximum size in bytes
 #define I2S_SAMPLE_SIZE 4                              // 4 bytes, 32 bits per sample
@@ -138,8 +134,8 @@ static void IRAM_ATTR i2s_intr_handler_default(void *arg) {

  if (high_priority_task_awoken == pdTRUE) portYIELD_FROM_ISR();

-  // Clear pending interrupt
-  I2S0.int_clr.val = I2S0.int_st.val;
+  // clear interrupt
+  I2S0.int_clr.val = I2S0.int_st.val; //clear pending interrupt
 }

 void stepperTask(void *parameter) {
@@ -152,43 +148,29 @@ void stepperTask(void *parameter) {
    xQueueReceive(dma.queue, &dma.current, portMAX_DELAY);
    dma.rw_pos = 0;

-    const bool using_ftMotion = TERN0(FT_MOTION, ftMotion.cfg.mode);
-
    while (dma.rw_pos < DMA_SAMPLE_COUNT) {
-
-      #if ENABLED(FT_MOTION)
-
-        if (using_ftMotion) {
-          if (!nextMainISR) stepper.ftMotion_stepper();
-          nextMainISR = 0;
-        }
-
-      #endif
-
-      if (!using_ftMotion) {
-        if (!nextMainISR) {
-          Stepper::pulse_phase_isr();
-          nextMainISR = Stepper::block_phase_isr();
-        }
-        #if ENABLED(LIN_ADVANCE)
-          else if (!nextAdvanceISR) {
-            Stepper::advance_isr();
-            nextAdvanceISR = Stepper::la_interval;
-          }
-        #endif
-        else
-          i2s_push_sample();
-
-        nextMainISR--;
-
-        #if ENABLED(LIN_ADVANCE)
-          if (nextAdvanceISR == Stepper::LA_ADV_NEVER)
-            nextAdvanceISR = Stepper::la_interval;
-
-          if (nextAdvanceISR && nextAdvanceISR != Stepper::LA_ADV_NEVER)
-            nextAdvanceISR--;
-        #endif
+      if (!nextMainISR) {
+        Stepper::pulse_phase_isr();
+        nextMainISR = Stepper::block_phase_isr();
      }
+      #if ENABLED(LIN_ADVANCE)
+        else if (!nextAdvanceISR) {
+          Stepper::advance_isr();
+          nextAdvanceISR = Stepper::la_interval;
+        }
+      #endif
+      else
+        i2s_push_sample();
+
+      nextMainISR--;
+
+      #if ENABLED(LIN_ADVANCE)
+        if (nextAdvanceISR == Stepper::LA_ADV_NEVER)
+          nextAdvanceISR = Stepper::la_interval;
+
+        if (nextAdvanceISR && nextAdvanceISR != Stepper::LA_ADV_NEVER)
+          nextAdvanceISR--;
+      #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
@@ -53,11 +53,12 @@ typedef uint64_t hal_timer_t;
 #if ENABLED(I2S_STEPPER_STREAM)
  #define STEPPER_TIMER_PRESCALE     1
  #define STEPPER_TIMER_RATE         250000                           // 250khz, 4µs pulses of i2s word clock
+  #define STEPPER_TIMER_TICKS_PER_US ((STEPPER_TIMER_RATE) / 1000000) // stepper timer ticks per µs // wrong would be 0.25
 #else
  #define STEPPER_TIMER_PRESCALE     40
  #define STEPPER_TIMER_RATE         ((HAL_TIMER_RATE) / (STEPPER_TIMER_PRESCALE)) // frequency of stepper timer, 2MHz
+  #define STEPPER_TIMER_TICKS_PER_US ((STEPPER_TIMER_RATE) / 1000000)              // stepper timer ticks per µs
 #endif
-#define STEPPER_TIMER_TICKS_PER_US   ((STEPPER_TIMER_RATE) / 1000000) // stepper timer ticks per µs

 #define STEP_TIMER_MIN_INTERVAL   8 // minimum time in µs between stepper interrupts

@@ -142,31 +142,12 @@
 // ADC
 //
 #define HAL_ADC_VREF_MV 3300
-#define HAL_ADC_RESOLUTION 12
+#define HAL_ADC_RESOLUTION 10

 #define GET_PIN_MAP_PIN(index) index
 #define GET_PIN_MAP_INDEX(pin) pin
 #define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)

-//
-// Debug port disable
-// JTMS / SWDIO = PA13
-// JTCK / SWCLK = PA14
-// JTDI         = PA15
-// JTDO         = PB3
-// NJTRST       = PB4
-//
-#define DBG_SWCLK _BV(0)
-#define DBG_SWDIO _BV(1)
-#define DBG_TDO   _BV(2)
-#define DBG_TDI   _BV(3)
-#define DBG_TRST  _BV(4)
-#define DBG_ALL (DBG_SWCLK | DBG_SWDIO | DBG_TDO | DBG_TDI | DBG_TRST)
-
-#define JTAGSWD_RESET() PORT_DebugPortSetting(DBG_ALL, Enable);
-#define JTAG_DISABLE() PORT_DebugPortSetting(DBG_TDO | DBG_TDI | DBG_TRST, Disable);
-#define JTAGSWD_DISABLE() PORT_DebugPortSetting(DBG_ALL, Disable);
-
 //
 // MarlinHAL implementation
 //
@@ -123,11 +123,6 @@ void MarlinHAL::init() {

  // Register min serial
  TERN_(POSTMORTEM_DEBUGGING, install_min_serial());
-
-  // warn if low memory after init
-  if (freeMemory() < 1024) {
-    SERIAL_WARN_MSG("HAL: low memory after init!\n");
-  }
 }

 void MarlinHAL::init_board() {}
@@ -152,31 +147,7 @@ void MarlinHAL::delay_ms(const int ms) {
  delay(ms);
 }

-void MarlinHAL::idletask() {
-  #if ENABLED(MARLIN_DEV_MODE)
-    // check & print serial RX errors
-    MSerialT *serials[] = { &MSerial1, &MSerial2 };
-    for (int serial = 0; serial < 2; serial++) {
-      usart_receive_error_t err = serials[serial]->getReceiveError();
-      if (err != usart_receive_error_t::None) {
-        // "Warning: MSerial[n] RX [Framing|Parity|Overrun] Error"
-        SERIAL_WARN_START();
-        SERIAL_ECHOPGM(" MSerial");
-        SERIAL_ECHO(serial + 1);
-        SERIAL_ECHOPGM(" RX ");
-        switch(err) {
-          case usart_receive_error_t::FramingError: SERIAL_ECHOPGM("Framing"); break;
-          case usart_receive_error_t::ParityError:  SERIAL_ECHOPGM("Parity");  break;
-          case usart_receive_error_t::OverrunError: SERIAL_ECHOPGM("Overrun"); break;
-          case usart_receive_error_t::RxDataDropped: SERIAL_ECHOPGM("DataDropped"); break;
-          default: break;
-        }
-        SERIAL_ECHOPGM(" Error");
-        SERIAL_EOL();
-      }
-    }
-  #endif
-}
+void MarlinHAL::idletask() {}

 uint8_t MarlinHAL::get_reset_source() {
  // Query reset cause from RMU
@@ -232,9 +203,7 @@ int MarlinHAL::freeMemory() {
  return &top - _sbrk(0);
 }

-void MarlinHAL::adc_init() {
-  analogReadResolution(HAL_ADC_RESOLUTION);
-}
+void MarlinHAL::adc_init() {}

 void MarlinHAL::adc_enable(const pin_t pin) {
  #if TEMP_SENSOR_SOC
@@ -27,7 +27,7 @@

 /**
 * Not every MarlinSerial instance should handle emergency parsing, as
- * it would not make sense to parse G-Code from TMC responses
+ * it would not make sense to parse GCode from TMC responses
 */
 constexpr bool serial_handles_emergency(int port) {
  return false
@@ -46,34 +46,14 @@ constexpr bool serial_handles_emergency(int port) {
 //
 // Define serial ports
 //
-
-// serial port where RX and TX use IRQs
-#define DEFINE_IRQ_SERIAL_MARLIN(name, n)      \
+#define DEFINE_HWSERIAL_MARLIN(name, n)      \
  MSerialT name(serial_handles_emergency(n), \
                &USART##n##_config,          \
                BOARD_USART##n##_TX_PIN,     \
                BOARD_USART##n##_RX_PIN);

-// serial port where RX uses DMA and TX uses IRQs
-// all serial ports use DMA1
-// since there are 4 USARTs and 4 DMA channels, we can use the USART number as the DMA channel
-#define DEFINE_DMA_SERIAL_MARLIN(name, n)      \
-  MSerialT name(serial_handles_emergency(n), \
-                &USART##n##_config,          \
-                BOARD_USART##n##_TX_PIN,     \
-                BOARD_USART##n##_RX_PIN,     \
-                M4_DMA1,                     \
-                ((en_dma_channel_t)(n - 1))); // map USART1 to DMA channel 0, USART2 to DMA channel 1, etc.
-
-#define DEFINE_SERIAL_MARLIN(name, n) TERN(SERIAL_DMA, DEFINE_DMA_SERIAL_MARLIN(name, n), DEFINE_IRQ_SERIAL_MARLIN(name, n))
-
-DEFINE_SERIAL_MARLIN(MSerial1, 1);
-DEFINE_SERIAL_MARLIN(MSerial2, 2);
-
-// TODO: remove this warning when SERIAL_DMA has been tested some more
-#if ENABLED(SERIAL_DMA)
-  #warning "SERIAL_DMA may be unstable on HC32F460."
-#endif
+DEFINE_HWSERIAL_MARLIN(MSerial1, 1);
+DEFINE_HWSERIAL_MARLIN(MSerial2, 2);

 //
 // Serial port assertions
@@ -25,42 +25,17 @@
 #include <drivers/usart/Usart.h>

 // Optionally set uart IRQ priority to reduce overflow errors
-//#define UART_RX_IRQ_PRIO 1
-//#define UART_TX_IRQ_PRIO 1
-//#define UART_RX_DMA_IRQ_PRIO 1
+// #define UART_IRQ_PRIO 1

 struct MarlinSerial : public Usart {
-  MarlinSerial(
-    struct usart_config_t *usart_device,
-    gpio_pin_t tx_pin,
-    gpio_pin_t rx_pin
-    #if ENABLED(SERIAL_DMA)
-    , M4_DMA_TypeDef *dma_unit = nullptr,
-    en_dma_channel_t rx_dma_channel = DmaCh0
-    #endif
-  ) : Usart(usart_device, tx_pin, rx_pin) {
-    #if ENABLED(SERIAL_DMA)
-      if (dma_unit != nullptr) {
-        enableRxDma(dma_unit, rx_dma_channel);
-      }
-    #endif
-  }
+  MarlinSerial(struct usart_config_t *usart_device, gpio_pin_t tx_pin, gpio_pin_t rx_pin) : Usart(usart_device, tx_pin, rx_pin) {}

-  #if defined(UART_RX_IRQ_PRIO) || defined(UART_TX_IRQ_PRIO) || defined(UART_RX_DMA_IRQ_PRIO)
+  #ifdef UART_IRQ_PRIO
    void setPriority() {
-      #if defined(UART_RX_IRQ_PRIO)
-        NVIC_SetPriority(c_dev()->interrupts.rx_data_available.interrupt_number, UART_RX_IRQ_PRIO);
-        NVIC_SetPriority(c_dev()->interrupts.rx_error.interrupt_number, UART_RX_IRQ_PRIO);
-      #endif
-
-      #if defined(UART_TX_IRQ_PRIO)
-        NVIC_SetPriority(c_dev()->interrupts.tx_buffer_empty.interrupt_number, UART_TX_IRQ_PRIO);
-        NVIC_SetPriority(c_dev()->interrupts.tx_complete.interrupt_number, UART_TX_IRQ_PRIO);
-      #endif
-
-      #if defined(UART_RX_DMA_IRQ_PRIO) && ENABLED(SERIAL_DMA)
-        NVIC_SetPriority(c_dev()->dma.rx.rx_data_available_dma_btc.interrupt_number, UART_RX_DMA_IRQ_PRIO);
-      #endif
+      NVIC_SetPriority(c_dev()->interrupts.rx_data_available.interrupt_number, UART_IRQ_PRIO);
+      NVIC_SetPriority(c_dev()->interrupts.rx_error.interrupt_number, UART_IRQ_PRIO);
+      NVIC_SetPriority(c_dev()->interrupts.tx_buffer_empty.interrupt_number, UART_IRQ_PRIO);
+      NVIC_SetPriority(c_dev()->interrupts.tx_complete.interrupt_number, UART_IRQ_PRIO);
    }

    void begin(uint32_t baud) {
@@ -72,12 +47,7 @@ struct MarlinSerial : public Usart {
      Usart::begin(baud, config);
      setPriority();
    }
-
-    void begin(uint32_t baud, const stc_usart_uart_init_t *config, const bool rxNoiseFilter = true) {
-      Usart::begin(baud, config, rxNoiseFilter);
-      setPriority();
-    }
-  #endif // UART_RX_IRQ_PRIO || UART_TX_IRQ_PRIO || UART_RX_DMA_IRQ_PRIO
+  #endif
 };

 typedef Serial1Class<MarlinSerial> MSerialT;
@@ -1,75 +0,0 @@
-/**
- * app_config.h is included by the hc32f460 arduino build script for every source file.
- * it is used to configure the arduino core (and ddl) automatically according
- * to the settings in Configuration.h and Configuration_adv.h.
- */
-#pragma once
-#ifndef _HC32_APP_CONFIG_H_
-#define _HC32_APP_CONFIG_H_
-
-#include "../../inc/MarlinConfigPre.h"
-
-//
-// dev mode
-//
-#if ENABLED(MARLIN_DEV_MODE)
-  #define __DEBUG 1
-  #define __CORE_DEBUG 1
-#endif
-
-//
-// Fault Handlers and Panic
-//
-
-#if ENABLED(POSTMORTEM_DEBUGGING)
-  // disable arduino core fault handler, as we define our own
-  #define CORE_DISABLE_FAULT_HANDLER 1
-#endif
-
-// force-enable panic handler so that we can use our custom one (in MinSerial)
-#define PANIC_ENABLE 1
-
-// use short filenames in ddl debug and core panic output
-#define __DEBUG_SHORT_FILENAMES 1
-#define __PANIC_SHORT_FILENAMES 1
-
-// omit panic messages in core panic output
-#define __OMIT_PANIC_MESSAGE 1
-
-//
-// Usart
-//
-
-// disable serial globals (Serial1, Serial2, ...), as we define our own
-#define DISABLE_SERIAL_GLOBALS 1
-
-// increase the size of the Usart buffers (both RX and TX)
-// NOTE:
-// the heap usage will increase by (SERIAL_BUFFER_SIZE - 64) * "number of serial ports used"
-// if running out of heap, the system may become unstable
-//#define SERIAL_BUFFER_SIZE 256
-
-// enable support for Usart Clock Divider / Oversampling auto config
-#define USART_AUTO_CLKDIV_OS_CONFIG 1
-
-// enable USART_RX_DMA_SUPPORT core option when SERIAL_DMA is enabled
-#if ENABLED(SERIAL_DMA)
-  #define USART_RX_DMA_SUPPORT 1
-#endif
-
-//
-// Misc.
-//
-
-// redirect printf to host serial
-#define REDIRECT_PRINTF_TO_SERIAL 1
-
-// F_CPU must be known at compile time, but on HC32F460 it's not.
-// Thus we assume HCLK to be 200MHz, as that's what is configured in
-// 'core_hook_sysclock_init' in 'sysclock.cpp'.
-// If you face issues with this assumption, please double-check with the values
-// printed by 'MarlinHAL::HAL_clock_frequencies_dump'.
-// see also: HAL_TIMER_RATE in timers.h
-#define F_CPU 200000000 // 200MHz HCLK
-
-#endif // _HC32_APP_CONFIG_H_
@@ -37,7 +37,7 @@
  #error "MARLIN_EEPROM_SIZE is required for IIC_BL24CXX_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();
@@ -49,7 +49,7 @@ bool PersistentStore::access_finish() { return true; }
 bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, uint16_t *crc) {
  while (size--) {
    uint8_t v = *value;
-    uint8_t * const p = (uint8_t * const)REAL_EEPROM_ADDR(pos);
+    uint8_t *const p = (uint8_t *const)pos;

    // EEPROM has only ~100,000 write cycles,
    // so only write bytes that have changed!
@@ -70,10 +70,16 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
  return false;
 }

-bool PersistentStore::read_data(int &pos, uint8_t *value, size_t size, uint16_t *crc, const bool writing /*=true*/) {
+bool PersistentStore::read_data(int &pos, uint8_t *value, size_t size,
+                                uint16_t *crc, const bool writing /*=true*/) {
  do {
-    const uint8_t c = eeprom_read_byte((uint8_t*)REAL_EEPROM_ADDR(pos));
-    if (writing) *value = c;
+    uint8_t *const p = (uint8_t *const)pos;
+    uint8_t c = eeprom_read_byte(p);
+    if (writing)
+    {
+      *value = c;
+    }
+
    crc16(crc, &c, 1);
    pos++;
    value++;
@@ -38,7 +38,9 @@
  #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;
+}

 #define _ALIGN(x) __attribute__((aligned(x)))
 static char _ALIGN(4) HAL_eeprom_data[MARLIN_EEPROM_SIZE];
@@ -83,10 +85,11 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui

 bool PersistentStore::read_data(int &pos, uint8_t *value, const size_t size, uint16_t *crc, const bool writing /*=true*/) {
  for (size_t i = 0; i < size; i++) {
-    const uint8_t c = HAL_eeprom_data[pos + i];
+    uint8_t c = HAL_eeprom_data[pos + i];
    if (writing) value[i] = c;
    crc16(crc, &c, 1);
  }
+
  pos += size;
  return false;
 }
@@ -35,7 +35,7 @@
 #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_finish() { return true; }

@@ -56,7 +56,7 @@ bool PersistentStore::access_start() {

 bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, uint16_t *crc) {
  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;
    // EEPROM has only ~100,000 write cycles,
    // so only write bytes that have changed!
@@ -77,8 +77,10 @@ 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));
-    if (writing && value) *value = c;
+    uint8_t c = eeprom_read_byte((uint8_t *)pos);
+    if (writing && value) {
+      *value = c;
+    }

    crc16(crc, &c, 1);
    pos++;
@@ -40,15 +40,9 @@ void endstopIRQHandler() {
  CHECK(X_MAX);
  CHECK(X_MIN);

-  CHECK(X2_MAX);
-  CHECK(X2_MIN);
-
  CHECK(Y_MAX);
  CHECK(Y_MIN);

-  CHECK(Y2_MAX);
-  CHECK(Y2_MIN);
-
  CHECK(Z_MAX);
  CHECK(Z_MIN);

@@ -58,9 +52,6 @@ void endstopIRQHandler() {
  CHECK(Z3_MAX);
  CHECK(Z3_MIN);

-  CHECK(Z4_MAX);
-  CHECK(Z4_MIN);
-
  CHECK(Z_MIN_PROBE);

  // Update endstops
@@ -78,15 +69,9 @@ void setup_endstop_interrupts() {
  SETUP(X_MAX);
  SETUP(X_MIN);

-  SETUP(X2_MAX);
-  SETUP(X2_MIN);
-
  SETUP(Y_MAX);
  SETUP(Y_MIN);

-  SETUP(Y2_MAX);
-  SETUP(Y2_MIN);
-
  SETUP(Z_MAX);
  SETUP(Z_MIN);

@@ -96,9 +81,6 @@ void setup_endstop_interrupts() {
  SETUP(Z3_MAX);
  SETUP(Z3_MIN);

-  SETUP(Z4_MAX);
-  SETUP(Z4_MIN);
-
  SETUP(Z_MIN_PROBE);

  #undef SETUP
@@ -106,7 +88,7 @@ void setup_endstop_interrupts() {

 // Ensure 1 - 10 IRQs are registered
 // Disable some endstops if you encounter this error
-#define ENDSTOPS_INTERRUPTS_COUNT COUNT_ENABLED(USE_X_MAX, USE_X_MIN, USE_X2_MAX, USE_X2_MIN, USE_Y_MAX, USE_Y_MIN, USE_Y2_MAX, USE_Y2_MIN, USE_Z_MAX, USE_Z_MIN, USE_Z2_MAX, USE_Z2_MIN, USE_Z3_MAX, USE_Z3_MIN, USE_Z4_MAX, USE_Z4_MIN, USE_Z_MIN_PROBE)
+#define ENDSTOPS_INTERRUPTS_COUNT COUNT_ENABLED(USE_X_MAX, USE_X_MIN, USE_Y_MAX, USE_Y_MIN, USE_Z_MAX, USE_Z_MIN, USE_Z2_MAX, USE_Z2_MIN, USE_Z3_MAX, USE_Z3_MIN, USE_Z_MIN_PROBE)
 #if ENDSTOPS_INTERRUPTS_COUNT > 10
  #error "Too many endstop interrupts! HC32F460 only supports 10 endstop interrupts."
 #elif ENDSTOPS_INTERRUPTS_COUNT == 0
@@ -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
@@ -20,20 +20,6 @@
 *
 */
 #pragma once
-#include <core_util.h>
-
-#if !defined(ARDUINO_CORE_VERSION_INT) || !defined(GET_VERSION_INT)
-  // version macros were introduced in arduino core version 1.1.0
-  // below that version, we polyfill them
-  #define GET_VERSION_INT(major, minor, patch) ((major * 100000) + (minor * 1000) + patch)
-  #define ARDUINO_CORE_VERSION_INT GET_VERSION_INT(1, 0, 0)
-#endif
-
-#if ARDUINO_CORE_VERSION_INT < GET_VERSION_INT(1, 1, 0)
-  // because we use app_config.h introduced in arduino core version 1.1.0, the
-  // HAL is not compatible with older versions
-  #error "The HC32 HAL is not compatible with Arduino Core versions < 1.1.0. Consider updating the Arduino Core."
-#endif

 #ifndef BOARD_XTAL_FREQUENCY
  #error "BOARD_XTAL_FREQUENCY is required for HC32F460."
@@ -72,9 +58,11 @@
 #endif

 #if TEMP_SENSOR_SOC
-  #ifndef TEMP_SOC_PIN
+  #if !defined(TEMP_SOC_PIN)
    #error "TEMP_SOC_PIN must be defined to use TEMP_SENSOR_SOC."
-  #elif IS_GPIO_PIN(TEMP_SOC_PIN)
+  #endif
+
+  #if defined(TEMP_SOC_PIN) && IS_GPIO_PIN(TEMP_SOC_PIN)
    #error "TEMP_SOC_PIN must not be a valid GPIO pin to avoid conflicts."
  #endif
 #endif
@@ -88,18 +76,3 @@
    #error "HC32 HAL uses a custom panic handler. Do not define PANIC_USARTx_TX_PIN."
  #endif
 #endif
-
-#if ENABLED(SERIAL_DMA)
-  #if !defined(USART_RX_DMA_SUPPORT)
-    #error "SERIAL_DMA requires USART_RX_DMA_SUPPORT to be enabled in the arduino core."
-  #endif
-
-  // USART_RX_DMA_SUPPORT does not implement core_hook_usart_rx_irq, which is required for the emergency parser
-  #if ENABLED(EMERGENCY_PARSER)
-    #error "EMERGENCY_PARSER is not supported with SERIAL_DMA. Please disable either SERIAL_DMA or EMERGENCY_PARSER."
-  #endif
-
-  #if ARDUINO_CORE_VERSION_INT < GET_VERSION_INT(1, 1, 0)
-    #error "SERIAL_DMA is not supported with arduino core version < 1.1.0."
-  #endif
-#endif
@@ -23,7 +23,7 @@
 #ifdef ARDUINO_ARCH_HC32
 #ifdef REDIRECT_PRINTF_TO_SERIAL

-#ifndef __GNUC__
+#if !defined(__GNUC__)
  #error "only GCC is supported"
 #endif

@@ -54,7 +54,7 @@
    fn                                              \
  }

-stc_sd_handle_t *handle = nullptr;
+stc_sd_handle_t *handle;

 bool SDIO_Init() {
  // Configure SDIO pins
@@ -66,45 +66,36 @@ bool SDIO_Init() {
  GPIO_SetFunc(BOARD_SDIO_CMD, Func_Sdio);
  GPIO_SetFunc(BOARD_SDIO_DET, Func_Sdio);

-  // If a handle is already initialized, free it before creating a new one
-  // otherwise, we will leak memory, which will eventually crash the system
-  if (handle != nullptr) {
-    delete handle->pstcDmaInitCfg;
-    delete handle->pstcCardInitCfg;
-    delete handle;
-    handle = nullptr;
-  }
-
  // Create DMA configuration
  stc_sdcard_dma_init_t *dmaConf = new stc_sdcard_dma_init_t;
  dmaConf->DMAx = SDIO_DMA_PERIPHERAL;
  dmaConf->enDmaCh = SDIO_DMA_CHANNEL;

-  // Create card configuration
-  // This should be a fairly safe configuration for most cards
-  stc_sdcard_init_t *cardConf = new stc_sdcard_init_t;
-  cardConf->enBusWidth = SdiocBusWidth4Bit;
-  cardConf->enClkFreq = SdiocClk400K;
-  cardConf->enSpeedMode = SdiocNormalSpeedMode;
-  cardConf->pstcInitCfg = nullptr;
-
  // Create handle in DMA mode
  handle = new stc_sd_handle_t;
  handle->SDIOCx = SDIO_PERIPHERAL;
  handle->enDevMode = SdCardDmaMode;
  handle->pstcDmaInitCfg = dmaConf;
-  //handle->pstcCardInitCfg = cardConf; // assigned in SDCARD_Init
+
+  // Create card configuration
+  // This should be a fairly safe configuration for most cards
+  stc_sdcard_init_t cardConf = {
+    .enBusWidth = SdiocBusWidth4Bit,
+    .enClkFreq = SdiocClk400K,
+    .enSpeedMode = SdiocNormalSpeedMode,
+    //.pstcInitCfg = NULL,
+  };

  // Initialize sd card
-  en_result_t rc = SDCARD_Init(handle, cardConf);
+  en_result_t rc = SDCARD_Init(handle, &cardConf);
  if (rc != Ok) printf("SDIO_Init() error (rc=%u)\n", rc);

  return rc == Ok;
 }

 bool SDIO_ReadBlock(uint32_t block, uint8_t *dst) {
-  CORE_ASSERT(handle != nullptr, "SDIO not initialized", return false);
-  CORE_ASSERT(dst != nullptr, "SDIO_ReadBlock dst is NULL", return false);
+  CORE_ASSERT(handle != NULL, "SDIO not initialized");
+  CORE_ASSERT(dst != NULL, "SDIO_ReadBlock dst is NULL");

  WITH_RETRY(SDIO_READ_RETRIES, {
    en_result_t rc = SDCARD_ReadBlocks(handle, block, 1, dst, SDIO_READ_TIMEOUT);
@@ -116,8 +107,8 @@ bool SDIO_ReadBlock(uint32_t block, uint8_t *dst) {
 }

 bool SDIO_WriteBlock(uint32_t block, const uint8_t *src) {
-  CORE_ASSERT(handle != nullptr, "SDIO not initialized", return false);
-  CORE_ASSERT(src != nullptr, "SDIO_WriteBlock src is NULL", return false);
+  CORE_ASSERT(handle != NULL, "SDIO not initialized");
+  CORE_ASSERT(src != NULL, "SDIO_WriteBlock src is NULL");

  WITH_RETRY(SDIO_WRITE_RETRIES, {
    en_result_t rc = SDCARD_WriteBlocks(handle, block, 1, (uint8_t *)src, SDIO_WRITE_TIMEOUT);
@@ -129,12 +120,12 @@ bool SDIO_WriteBlock(uint32_t block, const uint8_t *src) {
 }

 bool SDIO_IsReady() {
-  CORE_ASSERT(handle != nullptr, "SDIO not initialized", return false);
+  CORE_ASSERT(handle != NULL, "SDIO not initialized");
  return bool(handle->stcCardStatus.READY_FOR_DATA);
 }

 uint32_t SDIO_GetCardSize() {
-  CORE_ASSERT(handle != nullptr, "SDIO not initialized", return 0);
+  CORE_ASSERT(handle != NULL, "SDIO not initialized");

  // Multiply number of blocks with block size to get size in bytes
  const uint64_t cardSizeBytes = uint64_t(handle->stcSdCardInfo.u32LogBlockNbr) * uint64_t(handle->stcSdCardInfo.u32LogBlockSize);
@@ -96,44 +96,29 @@ void core_hook_sysclock_init() {
    #endif
  #endif

-  // sysclk is now configured according to F_CPU (i.e., 200MHz PLL output)
-  constexpr uint32_t sysclock = F_CPU;
-
-  // Setup clock divisors for sysclk = 200 MHz
+  // Setup clock divisors for sysclk = 200 MHz:
  // Note: PCLK1 is used for step+temp timers, and need to be kept at 50 MHz (until there is a better solution)
-  constexpr stc_clk_sysclk_cfg_t sysClkConf = {
+  stc_clk_sysclk_cfg_t sysClkConf = {
      .enHclkDiv = ClkSysclkDiv1,  // HCLK  = 200 MHz (CPU)
      .enExclkDiv = ClkSysclkDiv2, // EXCLK = 100 MHz (SDIO)
-      .enPclk0Div = ClkSysclkDiv2, // PCLK0 = 100 MHz (Timer6 (not used))
+      .enPclk0Div = ClkSysclkDiv1, // PCLK0 = 200 MHz (Timer6 (not used))
      .enPclk1Div = ClkSysclkDiv4, // PCLK1 = 50 MHz (USART, SPI, I2S, Timer0 (step+temp), TimerA (Servo))
-      .enPclk2Div = ClkSysclkDiv8, // PCLK2 = 25 MHz (ADC)
-      .enPclk3Div = ClkSysclkDiv8, // PCLK3 = 25 MHz (I2C, WDT)
+      .enPclk2Div = ClkSysclkDiv4, // PCLK2 = 50 MHz (ADC)
+      .enPclk3Div = ClkSysclkDiv4, // PCLK3 = 50 MHz (I2C, WDT)
      .enPclk4Div = ClkSysclkDiv2, // PCLK4 = 100 MHz (ADC ctl)
  };
-
-  #if ARDUINO_CORE_VERSION_INT >= GET_VERSION_INT(1, 2, 0)
-    assert_system_clocks_valid<
-      sysclock,
-      sysClkConf.enHclkDiv,
-      sysClkConf.enPclk0Div,
-      sysClkConf.enPclk1Div,
-      sysClkConf.enPclk2Div,
-      sysClkConf.enPclk3Div,
-      sysClkConf.enPclk4Div,
-      sysClkConf.enExclkDiv
-    >();
-  #endif
-
  sysclock_set_clock_dividers(&sysClkConf);

  // Set power mode
-  power_mode_update_pre(sysclock);
+  #define POWER_MODE_SYSTEM_CLOCK 200000000 // 200 MHz
+  power_mode_update_pre(POWER_MODE_SYSTEM_CLOCK);

  // Switch to MPLL as sysclk source
  CLK_SetSysClkSource(CLKSysSrcMPLL);

  // Set power mode
-  power_mode_update_post(sysclock);
+  power_mode_update_post(POWER_MODE_SYSTEM_CLOCK);
+  #undef POWER_MODE_SYSTEM_CLOCK
 }

 #endif // ARDUINO_ARCH_HC32
@@ -38,48 +38,44 @@ extern Timer0 step_timer;
 // Timer Configurations
 //

-/**
- * HAL_TIMER_RATE must be known at compile time since it's used to calculate
- * STEPPER_TIMER_RATE, which is used in 'constexpr' calculations.
- * On the HC32F460 the timer rate depends on PCLK1, which is derived from the
- * system clock configured at runtime. As a workaround, we use the existing
- * assumption of a 200MHz clock, defining F_CPU as 200000000, then configure PCLK1
- * as F_CPU with a divider of 4 in 'sysclock.cpp::core_hook_sysclock_init'.
- *
- * If you face issues with this assumption, please double-check with the values
- * printed by 'MarlinHAL::HAL_clock_frequencies_dump'.
- *
- * TODO: If the 'constexpr' requirement is ever lifted, use TIMER0_BASE_FREQUENCY instead
- */
-#define HAL_TIMER_RATE (F_CPU / 4) // i.e., 50MHz
-//#define HAL_TIMER_RATE TIMER0_BASE_FREQUENCY
+// TODO: some calculations (step irq min_step_rate) require the timer rate to be known at compile time
+//       this is not possible with the HC32F460, as the timer rate depends on PCLK1
+//       as a workaround, PCLK1 = 50MHz is assumed (check with clock dump in MarlinHAL::init())
+#define HAL_TIMER_RATE 50000000 // 50MHz
+// #define HAL_TIMER_RATE TIMER0_BASE_FREQUENCY
+
+// TODO: CYCLES_PER_MICROSECOND seems to be used by Marlin to calculate the number of cycles per microsecond in the timer ISRs
+//       by default, it uses F_CPU, but since that is not known at compile time for HC32, we overwrite it here
+#undef CYCLES_PER_MICROSECOND
+#define CYCLES_PER_MICROSECOND (HAL_TIMER_RATE / 1000000UL)

 // Temperature timer
-#define TEMP_TIMER_NUM        (&temp_timer)
-#define TEMP_TIMER_PRIORITY   DDL_IRQ_PRIORITY_02
-#define TEMP_TIMER_PRESCALE     16UL          // 12.5MHz
-#define TEMP_TIMER_RATE       1000            // 1kHz
-#define TEMP_TIMER_FREQUENCY  TEMP_TIMER_RATE // 1kHz also
+#define TEMP_TIMER_NUM (&temp_timer)
+#define TEMP_TIMER_PRIORITY DDL_IRQ_PRIORITY_02
+#define TEMP_TIMER_PRESCALE 16ul
+#define TEMP_TIMER_RATE 1000                 // 1kHz
+#define TEMP_TIMER_FREQUENCY TEMP_TIMER_RATE // Alias for Marlin

 // Stepper timer
-#define STEP_TIMER_NUM         (&step_timer)
-#define STEP_TIMER_PRIORITY    DDL_IRQ_PRIORITY_00  // Top priority, nothing else uses it
-#define STEPPER_TIMER_PRESCALE  16UL                // 12.5MHz
+#define STEP_TIMER_NUM (&step_timer)
+#define STEP_TIMER_PRIORITY DDL_IRQ_PRIORITY_01
+#define STEPPER_TIMER_PRESCALE 16ul

-#define STEPPER_TIMER_RATE (HAL_TIMER_RATE / STEPPER_TIMER_PRESCALE)  // 50MHz / 16 = 3.125MHz
-#define STEPPER_TIMER_TICKS_PER_US (STEPPER_TIMER_RATE / 1000000UL)   // Integer 3
+// TODO: STEPPER_TIMER_RATE seems to work fine like this, but requires further testing...
+#define STEPPER_TIMER_RATE (HAL_TIMER_RATE / STEPPER_TIMER_PRESCALE) // 50MHz / 16 = 3.125MHz
+#define STEPPER_TIMER_TICKS_PER_US (STEPPER_TIMER_RATE / 1000000)

 // Pulse timer (== stepper timer)
-#define PULSE_TIMER_NUM           STEP_TIMER_NUM
-#define PULSE_TIMER_PRESCALE      STEPPER_TIMER_PRESCALE
-#define PULSE_TIMER_TICKS_PER_US  STEPPER_TIMER_TICKS_PER_US
+#define PULSE_TIMER_NUM STEP_TIMER_NUM
+#define PULSE_TIMER_PRESCALE STEPPER_TIMER_PRESCALE
+#define PULSE_TIMER_TICKS_PER_US STEPPER_TIMER_TICKS_PER_US

 //
 // Channel aliases
 //
-#define MF_TIMER_TEMP   TEMP_TIMER_NUM
-#define MF_TIMER_STEP   STEP_TIMER_NUM
-#define MF_TIMER_PULSE  PULSE_TIMER_NUM
+#define MF_TIMER_TEMP TEMP_TIMER_NUM
+#define MF_TIMER_STEP STEP_TIMER_NUM
+#define MF_TIMER_PULSE PULSE_TIMER_NUM

 //
 // HAL functions
@@ -19,7 +19,6 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 *
 */
-
 #ifdef __PLAT_LINUX__

 #include "../../inc/MarlinConfig.h"
@@ -58,49 +57,4 @@ uint16_t MarlinHAL::adc_value() {

 void MarlinHAL::reboot() { /* Reset the application state and GPIO */ }

-// ------------------------
-// BSD String
-// ------------------------
-
-/**
- * Copyright (c) 1998, 2015 Todd C. Miller <Todd.Miller@courtesan.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef HAS_LIBBSD
-
-  /**
-   * Copy string src to buffer dst of size dsize.  At most dsize-1
-   * chars will be copied.  Always NUL terminates (unless dsize == 0).
-   * Returns strlen(src); if retval >= dsize, truncation occurred.
-   */
-  size_t MarlinHAL::_strlcpy(char *dst, const char *src, size_t dsize) {
-    const char *osrc = src;
-    size_t nleft = dsize;
-
-    // Copy as many bytes as will fit.
-    if (nleft != 0) while (--nleft != 0) if ((*dst++ = *src++) == '\0') break;
-
-    // Not enough room in dst, add NUL and traverse rest of src.
-    if (nleft == 0) {
-      if (dsize != 0) *dst = '\0';    // NUL-terminate dst
-      while (*src++) { /* nada */ }
-    }
-
-    return (src - osrc - 1); // count does not include NUL
-  }
-
-#endif // HAS_LIBBSD
-
 #endif // __PLAT_LINUX__
@@ -26,11 +26,6 @@
 #include <iostream>
 #include <stdint.h>
 #include <stdarg.h>
-
-#ifdef HAS_LIBBSD
-  #include <bsd/string.h>
-#endif
-
 #undef min
 #undef max
 #include <algorithm>
@@ -167,13 +162,4 @@ public:
  }

  static void set_pwm_frequency(const pin_t, int) {}
-
-  #ifndef HAS_LIBBSD
-    /**
-     * Redirect missing strlcpy here
-     */
-    static size_t _strlcpy(char *dst, const char *src, size_t dsize);
-    #define strlcpy hal._strlcpy
-  #endif
-
 };
@@ -35,7 +35,7 @@
 uint8_t buffer[MARLIN_EEPROM_SIZE];
 char filename[] = "eeprom.dat";

-size_t PersistentStore::capacity() { return MARLIN_EEPROM_SIZE - eeprom_exclude_size; }
+size_t PersistentStore::capacity() { return MARLIN_EEPROM_SIZE; }

 bool PersistentStore::access_start() {
  const char eeprom_erase_value = 0xFF;
@@ -37,10 +37,7 @@ Timer::Timer() {
 }

 Timer::~Timer() {
-  if (timerid != 0) {
-    timer_delete(timerid);
-    timerid = 0;
-  }
+  timer_delete(timerid);
 }

 void Timer::init(uint32_t sig_id, uint32_t sim_freq, callback_fn* fn) {
@@ -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
@@ -28,6 +28,9 @@

 #include <pinmapping.h>

+#define strlcpy(A, B, C)   strncpy(A, B, (C) - 1)
+#define strlcpy_P(A, B, C) strncpy_P(A, B, (C) - 1)
+
 #define HIGH         0x01
 #define LOW          0x00

@@ -21,7 +21,6 @@
 */

 #ifdef __PLAT_LINUX__
-#ifndef UNIT_TEST

 //#define GPIO_LOGGING // Full GPIO and Positional Logging

@@ -136,5 +135,4 @@ int main() {
  read_serial.join();
 }

-#endif // UNIT_TEST
 #endif // __PLAT_LINUX__
@@ -60,6 +60,7 @@

 #define INVALID_SERVO         255     // flag indicating an invalid servo index

+
 // Types

 typedef struct {
@@ -21,6 +21,9 @@
 */
 #pragma once

+#include "../../core/macros.h"
+#include "../../inc/MarlinConfigPre.h"
+
 #if ALL(HAS_MARLINUI_U8GLIB, HAS_MEDIA) && (LCD_PINS_D4 == SD_SCK_PIN || LCD_PINS_EN == SD_MOSI_PIN || DOGLCD_SCK == SD_SCK_PIN || DOGLCD_MOSI == SD_MOSI_PIN)
  #define SOFTWARE_SPI  // If the SD card and LCD adapter share the same SPI pins, then software SPI is currently
                        // needed due to the speed and mode required for communicating with each device being different.
@@ -111,12 +111,6 @@ void MarlinHAL::init() {
  #if HAS_SERVO_3
    INIT_SERVO(3);
  #endif
-  #if HAS_SERVO_4
-    INIT_SERVO(4);
-  #endif
-  #if HAS_SERVO_5
-    INIT_SERVO(5);
-  #endif

  //debug_frmwrk_init();
  //_DBG("\n\nDebug running\n");
@@ -61,7 +61,7 @@ static uint8_t ram_eeprom[MARLIN_EEPROM_SIZE] __attribute__((aligned(4))) = {0};
 static bool eeprom_dirty = false;
 static int current_slot = 0;

-size_t PersistentStore::capacity() { return MARLIN_EEPROM_SIZE - eeprom_exclude_size; }
+size_t PersistentStore::capacity() { return MARLIN_EEPROM_SIZE; }

 bool PersistentStore::access_start() {
  uint32_t first_nblank_loc, first_nblank_val;
@@ -112,8 +112,7 @@ bool PersistentStore::access_finish() {
 }

 bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, uint16_t *crc) {
-  const int p = REAL_EEPROM_ADDR(pos);
-  for (size_t i = 0; i < size; i++) ram_eeprom[p + i] = value[i];
+  for (size_t i = 0; i < size; i++) ram_eeprom[pos + i] = value[i];
  eeprom_dirty = true;
  crc16(crc, value, size);
  pos += size;
@@ -121,9 +120,8 @@ 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*/) {
-  const int p = REAL_EEPROM_ADDR(pos);
  const uint8_t * const buff = writing ? &value[0] : &ram_eeprom[pos];
-  if (writing) for (size_t i = 0; i < size; i++) value[i] = ram_eeprom[p + i];
+  if (writing) for (size_t i = 0; i < size; i++) value[i] = ram_eeprom[pos + i];
  crc16(crc, buff, size);
  pos += size;
  return false;  // return true for any error
@@ -49,7 +49,7 @@ bool eeprom_file_open = false;
  #define MARLIN_EEPROM_SIZE size_t(0x1000) // 4KiB of Emulated 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() {
  const char eeprom_erase_value = 0xFF;
@@ -36,7 +36,7 @@
 #ifndef MARLIN_EEPROM_SIZE
  #define MARLIN_EEPROM_SIZE           0x8000 // 32K
 #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; }
@@ -45,7 +45,7 @@ bool PersistentStore::write_data(int &pos, const uint8_t *value, size_t size, ui
  uint16_t written = 0;
  while (size--) {
    uint8_t v = *value;
-    uint8_t * const p = (uint8_t * const)REAL_EEPROM_ADDR(pos);
+    uint8_t * const p = (uint8_t * const)pos;
    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);
      if (++written & 0x7F) delay(2); else safe_delay(2); // Avoid triggering watchdog during long EEPROM writes
@@ -64,7 +64,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 {
    // Read from external EEPROM
-    const uint8_t c = eeprom_read_byte((uint8_t*)REAL_EEPROM_ADDR(pos));
+    const uint8_t c = eeprom_read_byte((uint8_t*)pos);
    if (writing) *value = c;
    crc16(crc, &c, 1);
    pos++;
@@ -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
@@ -21,7 +21,9 @@
 */
 #pragma once

-#if ALL(HAS_MARLINUI_U8GLIB, HAS_MEDIA) && (LCD_PINS_D4 == SD_SCK_PIN || LCD_PINS_EN == SD_MOSI_PIN || DOGLCD_SCK == SD_SCK_PIN || DOGLCD_MOSI == SD_MOSI_PIN)
+#include "../../core/macros.h"
+
+#if ALL(HAS_MEDIA, HAS_MARLINUI_U8GLIB) && (LCD_PINS_D4 == SD_SCK_PIN || LCD_PINS_EN == SD_MOSI_PIN || DOGLCD_SCK == SD_SCK_PIN || DOGLCD_MOSI == SD_MOSI_PIN)
  #define SOFTWARE_SPI  // If the SD card and LCD adapter share the same SPI pins, then software SPI is currently
                        // needed due to the speed and mode required for communicating with each device being different.
                        // This requirement can be removed if the SPI access to these devices is updated to use
@@ -8,12 +8,14 @@ DriverVer =04/14/2008, 5.1.2600.5512
 [Manufacturer]
 %PROVIDER%=DeviceList,ntamd64

+
 [DeviceList]
 %DESCRIPTION%=LPC1768USB, USB\VID_1D50&PID_6029&MI_00

 [DeviceList.ntamd64]
 %DESCRIPTION%=LPC1768USB, USB\VID_1D50&PID_6029&MI_00

+
 [LPC1768USB]
 include=mdmcpq.inf
 CopyFiles=FakeModemCopyFileSection
@@ -26,8 +28,9 @@ AddService=usbser, 0x00000002, LowerFilter_Service_Inst
 [SerialPropPageAddReg]
 HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider"

+
 [Strings]
 PROVIDER   = "marlinfw.org"
 DRIVER.SVC = "Marlin USB Driver"
 DESCRIPTION= "Marlin USB Serial"
-COMPOSITE  = "Marlin USB VCOM"
+COMPOSITE  = "Marlin USB VCOM"
@@ -1,125 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * 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 TARGET_LPC4078
-
-#include "../../inc/MarlinConfig.h"
-#include "../shared/Delay.h"
-#include "../../../gcode/parser.h"
-
-DefaultSerial1 USBSerial(false, MCDCSerial0);
-
-uint32_t MarlinHAL::adc_result = 0;
-
-// U8glib required functions
-extern "C" {
-  void u8g_xMicroDelay(uint16_t val) { DELAY_US(val); }
-  void u8g_MicroDelay()              { u8g_xMicroDelay(1); }
-  void u8g_10MicroDelay()            { u8g_xMicroDelay(10); }
-  void u8g_Delay(uint16_t val)       { delay(val); }
-}
-
-// return free heap space
-int freeMemory() {
-  char stack_end;
-  void *heap_start = malloc(sizeof(uint32_t));
-  if (heap_start == 0) return 0;
-
-  uint32_t result = (uint32_t)&stack_end - (uint32_t)heap_start;
-  free(heap_start);
-  return result;
-}
-
-void MarlinHAL::reboot() { MCUCore::nvic_system_reset(); }
-
-uint8_t MarlinHAL::get_reset_source() {
-  #if ENABLED(USE_WATCHDOG)
-    if (watchdog_timed_out()) return RST_WATCHDOG;
-  #endif
-  return RST_POWER_ON;
-}
-
-void MarlinHAL::clear_reset_source() { watchdog_clear_timeout_flag(); }
-
-void flashFirmware(const int16_t) {
-  delay(500);          // Give OS time to disconnect
-  //USB_Connect(false);  // USB clear connection
-  delay(1000);         // Give OS time to notice
-  hal.reboot();
-}
-
-#if ENABLED(USE_WATCHDOG)
-
-  #define WDT_TIMEOUT TERN(WATCHDOG_DURATION_8S, 8.0f, 4.0f) // 4 or 8 second timeout
-
-  void MarlinHAL::watchdog_init() {
-    #if ENABLED(WATCHDOG_RESET_MANUAL)
-      // We enable the watchdog timer, but only for the interrupt.
-
-      // Configure WDT to only trigger an interrupt
-      // Disable WDT interrupt (just in case, to avoid triggering it!)
-      NVIC_DisableIRQ(WDT_IRQn);
-
-      // We NEED memory barriers to ensure Interrupts are actually disabled!
-      // ( https://dzone.com/articles/nvic-disabling-interrupts-on-arm-cortex-m-and-the )
-      __DSB();
-      __ISB();
-
-      // WDT defaults to trigger an interrupt
-
-      // Configure and enable WDT interrupt.
-      NVIC_ClearPendingIRQ(WDT_IRQn);
-      NVIC_SetPriority(WDT_IRQn, 0); // Use highest priority, so we detect all kinds of lockups
-      NVIC_EnableIRQ(WDT_IRQn);
-    #else
-      MCUI::watchdog_set_timeout_triggers_reset();
-    #endif
-    MCUI::watchdog_set_timeout_in_seconds(WDT_TIMEOUT);
-    MCUI::watchdog_enable();
-  }
-
-  void MarlinHAL::watchdog_refresh() {
-    MCUI::watchdog_feed();
-    #if DISABLED(PINS_DEBUGGING) && PIN_EXISTS(LED)
-      static millis_t next_flash = millis();
-      if (ELAPSED(millis(), next_flash)) {
-        next_flash = millis() + 200;
-        TOGGLE(LED_PIN);  // heartbeat indicator
-      }
-    #endif
-  }
-
-  // Timeout state
-  bool MarlinHAL::watchdog_timed_out() { return MCUI::watchdog_has_triggered(); }
-  void MarlinHAL::watchdog_clear_timeout_flag() { MCUI::watchdog_clear_timeout_flag(); }
-
-#endif // USE_WATCHDOG
-
-// For M42/M43, scan command line for pin code
-//   return index into pin map array if found and the pin is valid.
-//   return dval if not found or not a valid pin.
-int16_t PARSED_PIN_INDEX(const char code, const int16_t dval) {
-  const uint16_t val = (uint16_t)parser.intval(code, -1), port = val / 100, pin = val % 100;
-  const  int16_t ind = (port < ((NUM_DIGITAL_PINS) >> 5) && pin < 32) ? ((port << 5) | pin) : -2;
-  return ind > -1 ? ind : dval;
-}
-
-#endif // TARGET_LPC4078
@@ -1,276 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- *
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
- * Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
- *
- * 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
-
-/**
- * HAL_LPC1768/HAL.h
- * Hardware Abstraction Layer for NXP LPC1768
- */
-
-#define CPU_32_BIT
-
-#include <stdint.h>
-#include <stdarg.h>
-#include <algorithm>
-
-#include "../shared/Marduino.h"
-#include "../shared/Delay.h"
-#include "../shared/math_32bit.h"
-#include "../shared/HAL_SPI.h"
-#include "fastio.h"
-#include "MarlinSerial.h"
-
-#include <mcu_interface.h>
-
-// ------------------------
-// Serial ports
-// ------------------------
-
-typedef ForwardSerial1Class< decltype(MCDCSerial0) > DefaultSerial1;
-extern DefaultSerial1 USBSerial;
-
-#define _MSERIAL(X) MSerial##X
-#define MSERIAL(X) _MSERIAL(X)
-
-#if SERIAL_PORT == -1
-  #define MYSERIAL1 USBSerial
-#elif WITHIN(SERIAL_PORT, 0, 3)
-  #define MYSERIAL1 MSERIAL(SERIAL_PORT)
-#else
-  #error "SERIAL_PORT must be from 0 to 3. You can also use -1 if the board supports Native USB."
-#endif
-
-#ifdef SERIAL_PORT_2
-  #if SERIAL_PORT_2 == -1
-    #define MYSERIAL2 USBSerial
-  #elif WITHIN(SERIAL_PORT_2, 0, 3)
-    #define MYSERIAL2 MSERIAL(SERIAL_PORT_2)
-  #else
-    #error "SERIAL_PORT_2 must be from 0 to 3. You can also use -1 if the board supports Native USB."
-  #endif
-#endif
-
-#ifdef SERIAL_PORT_3
-  #if SERIAL_PORT_3 == -1
-    #define MYSERIAL3 USBSerial
-  #elif WITHIN(SERIAL_PORT_3, 0, 3)
-    #define MYSERIAL3 MSERIAL(SERIAL_PORT_3)
-  #else
-    #error "SERIAL_PORT_3 must be from 0 to 3. You can also use -1 if the board supports Native USB."
-  #endif
-#endif
-
-#ifdef MMU2_SERIAL_PORT
-  #if MMU2_SERIAL_PORT == -1
-    #define MMU2_SERIAL USBSerial
-  #elif WITHIN(MMU2_SERIAL_PORT, 0, 3)
-    #define MMU2_SERIAL MSERIAL(MMU2_SERIAL_PORT)
-  #else
-    #error "MMU2_SERIAL_PORT must be from 0 to 3. You can also use -1 if the board supports Native USB."
-  #endif
-#endif
-
-#ifdef LCD_SERIAL_PORT
-  #if LCD_SERIAL_PORT == -1
-    #define LCD_SERIAL USBSerial
-  #elif WITHIN(LCD_SERIAL_PORT, 0, 3)
-    #define LCD_SERIAL MSERIAL(LCD_SERIAL_PORT)
-  #else
-    #error "LCD_SERIAL_PORT must be from 0 to 3. You can also use -1 if the board supports Native USB."
-  #endif
-  #if HAS_DGUS_LCD
-    #define SERIAL_GET_TX_BUFFER_FREE() LCD_SERIAL.available()
-  #endif
-#endif
-
-//
-// Interrupts
-//
-
-#define CRITICAL_SECTION_START()  const bool irqon = !MCUCore::primask(); MCUCore::nvic_interrupts_disable()
-#define CRITICAL_SECTION_END()    if (irqon) MCUCore::nvic_interrupts_enable()
-#define cli() noInterrupts()
-#define sei() interrupts()
-//
-// ADC
-//
-
-#define ADC_MEDIAN_FILTER_SIZE (23) // Higher values increase step delay (phase shift),
-                                    // (ADC_MEDIAN_FILTER_SIZE + 1) / 2 sample step delay (12 samples @ 500Hz: 24ms phase shift)
-                                    // Memory usage per ADC channel (bytes): (6 * ADC_MEDIAN_FILTER_SIZE) + 16
-                                    // 8 * ((6 * 23) + 16 ) = 1232 Bytes for 8 channels
-
-#define ADC_LOWPASS_K_VALUE    (2)  // Higher values increase rise time
-                                    // Rise time sample delays for 100% signal convergence on full range step
-                                    // (1 : 13, 2 : 32, 3 : 67, 4 : 139, 5 : 281, 6 : 565, 7 : 1135, 8 : 2273)
-                                    // K = 6, 565 samples, 500Hz sample rate, 1.13s convergence on full range step
-                                    // Memory usage per ADC channel (bytes): 4 (32 Bytes for 8 channels)
-
-#define HAL_ADC_VREF            3.3 // ADC voltage reference
-
-#define HAL_ADC_RESOLUTION     12   // 15 bit maximum, raw temperature is stored as int16_t
-#define HAL_ADC_FILTERED            // Disable oversampling done in Marlin as ADC values already filtered in HAL
-
-//
-// Pin Mapping for M42, M43, M226
-//
-
-// Test whether the pin is valid
-constexpr bool VALID_PIN(const pin_t pin) {
-  return MCUI::pin_is_valid(pin);
-}
-
-// Get the analog index for a digital pin
-constexpr int8_t DIGITAL_PIN_TO_ANALOG_PIN(const pin_t pin) {
-  return (MCUI::pin_is_valid(pin) && MCUI::pin_has_adc(pin)) ? pin : -1;
-}
-
-//
-// Misc. Functions
-//
-#ifndef analogInputToDigitalPin
-  #define analogInputToDigitalPin(p) (p)
-#endif
-
-
-// Return the index of a pin number
-constexpr int16_t GET_PIN_MAP_INDEX(const pin_t pin) {
-  return MCUI::pin_index(pin);
-}
-
-// Get the pin number at the given index
-constexpr pin_t GET_PIN_MAP_PIN(const int16_t index) {
-  return MCUI::pin_index(index);
-}
-
-// Parse a G-code word into a pin index
-int16_t PARSED_PIN_INDEX(const char code, const int16_t dval);
-// P0.6 thru P0.9 are for the onboard SD card
-#define HAL_SENSITIVE_PINS P0_06, P0_07, P0_08, P0_09,
-
-// ------------------------
-// Defines
-// ------------------------
-
-void flashFirmware(const int16_t);
-
-#define HAL_CAN_SET_PWM_FREQ   // This HAL supports PWM Frequency adjustment
-
-// Default graphical display delays
-#define CPU_ST7920_DELAY_1 600
-#define CPU_ST7920_DELAY_2 750
-#define CPU_ST7920_DELAY_3 750
-
-// ------------------------
-// Free Memory Accessor
-// ------------------------
-
-#pragma GCC diagnostic push
-#if GCC_VERSION <= 50000
-  #pragma GCC diagnostic ignored "-Wunused-function"
-#endif
-
-int freeMemory();
-
-#pragma GCC diagnostic pop
-
-// ------------------------
-// MarlinHAL Class
-// ------------------------
-
-class MarlinHAL {
-public:
-
-  // Earliest possible init, before setup()
-  MarlinHAL() {}
-
-  static void init();          // Called early in setup()
-  static void init_board() {}  // Called less early in setup()
-  static void reboot();        // Restart the firmware from 0x0
-
-  // Interrupts
-  static bool isr_state() { return MCUCore::primask(); }
-  static void isr_on()  { MCUCore::nvic_interrupts_enable(); }
-  static void isr_off() {  MCUCore::nvic_interrupts_disable(); }
-
-  static void delay_ms(const int ms) { DELAY_US(ms * 1000); }
-
-  // Watchdog
-  static void watchdog_init() IF_DISABLED(USE_WATCHDOG, {});
-  static void watchdog_refresh() IF_DISABLED(USE_WATCHDOG, {});
-  static bool watchdog_timed_out() IF_DISABLED(USE_WATCHDOG, { return false; });
-  static void watchdog_clear_timeout_flag() IF_DISABLED(USE_WATCHDOG, {});
-
-  // Tasks, called from idle()
-  static void idletask();
-
-  // Reset
-  static uint8_t get_reset_source();
-  static void clear_reset_source();
-
-  // Free SRAM
-  static int freeMemory() { return ::freeMemory(); }
-
-  //
-  // ADC Methods
-  //
-
-  using FilteredADC = MCUI::ADC<ADC_LOWPASS_K_VALUE, ADC_MEDIAN_FILTER_SIZE>;
-
-  // Called by Temperature::init once at startup
-  static void adc_init() {
-    // Turn on and initialise ADC in burst mode
-    MCUI::adc_hardware.init();
-    MCUI::adc_hardware.burst_start();
-  }
-
-  // Called by Temperature::init for each sensor at startup
-  static void adc_enable(const pin_t pin) {
-    FilteredADC::enable_channel(pin);
-  }
-
-  // Begin ADC sampling on the given pin. Called from Temperature::isr!
-  static uint32_t adc_result;
-  static void adc_start(const pin_t pin) {
-    adc_result = FilteredADC::read(pin) >> (16 - HAL_ADC_RESOLUTION); // returns 16bit value, reduce to required bits
-  }
-
-  // Is the ADC ready for reading?
-  static bool adc_ready() { return true; }
-
-  // The current value of the ADC register
-  static uint16_t adc_value() { return uint16_t(adc_result); }
-
-  /**
-   * Set the PWM duty cycle for the pin to the given value.
-   * Optionally invert the duty cycle [default = false]
-   * Optionally change the scale of the provided value to enable finer PWM duty control [default = 255]
-   */
-  static void set_pwm_duty(const pin_t pin, const uint16_t v, const uint16_t v_size=255, const bool invert=false);
-
-  /**
-   * Set the frequency of the timer corresponding to the provided pin
-   * All Hardware PWM pins will run at the same frequency and
-   * All Software PWM pins will run at the same frequency
-   */
-  static void set_pwm_frequency(const pin_t pin, const uint16_t f_desired);
-};
@@ -1,376 +0,0 @@
-// /**
-//  * Marlin 3D Printer Firmware
-//  * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
-//  *
-//  * Based on Sprinter and grbl.
-//  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
-//  *
-//  * 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/>.
-//  *
-//  */
-
-// /**
-//  * Software SPI functions originally from Arduino Sd2Card Library
-//  * Copyright (c) 2009 by William Greiman
-//  */
-
-// /**
-//  * For TARGET_LPC4078
-//  */
-
-// /**
-//  * Hardware SPI and Software SPI implementations are included in this file.
-//  * The hardware SPI runs faster and has higher throughput but is not compatible
-//  * with some LCD interfaces/adapters.
-//  *
-//  * Control of the slave select pin(s) is handled by the calling routines.
-//  *
-//  * Some of the LCD interfaces/adapters result in the LCD SPI and the SD card
-//  * SPI sharing pins. The SCK, MOSI & MISO pins can NOT be set/cleared with
-//  * WRITE nor digitalWrite when the hardware SPI module within the LPC17xx is
-//  * active. If any of these pins are shared then the software SPI must be used.
-//  *
-//  * A more sophisticated hardware SPI can be found at the following link.
-//  * This implementation has not been fully debugged.
-//  * https://github.com/MarlinFirmware/Marlin/tree/071c7a78f27078fd4aee9a3ef365fcf5e143531e
-//  */
-
-#ifdef TARGET_LPC4078
-
-#include "../../inc/MarlinConfig.h"
-#include <SPI.h>
-
-// Hardware SPI and SPIClass
-
-#include "../shared/HAL_SPI.h"
-
-#define LPC_SOFTWARE_SPI
-
-// ------------------------
-// Public functions
-// ------------------------
-#if ENABLED(LPC_SOFTWARE_SPI)
-  #include "SoftwareSPI.h"
-
-  // Software SPI
-  static uint8_t SPI_speed = SPI_FULL_SPEED;
-
-  static uint8_t spiTransfer(uint8_t b) {
-    return swSpiTransfer(b, SPI_speed, SD_SCK_PIN, SD_MISO_PIN, SD_MOSI_PIN);
-  }
-
-  void spiBegin() {
-    swSpiBegin(SD_SCK_PIN, SD_MISO_PIN, SD_MOSI_PIN);
-  }
-
-  void spiInit(uint8_t spiRate) {
-    SPI_speed = swSpiInit(spiRate, SD_SCK_PIN, SD_MOSI_PIN);
-  }
-
-  uint8_t spiRec() { return spiTransfer(0xFF); }
-
-  void spiRead(uint8_t*buf, uint16_t nbyte) {
-    for (int i = 0; i < nbyte; i++)
-      buf[i] = spiTransfer(0xFF);
-  }
-
-  void spiSend(uint8_t b) { (void)spiTransfer(b); }
-
-  void spiSend(const uint8_t *buf, size_t nbyte) {
-    for (uint16_t i = 0; i < nbyte; i++)
-      (void)spiTransfer(buf[i]);
-  }
-
-  void spiSendBlock(uint8_t token, const uint8_t *buf) {
-    (void)spiTransfer(token);
-    for (uint16_t i = 0; i < 512; i++)
-      (void)spiTransfer(buf[i]);
-  }
-
-#else
-
-  #ifdef SD_SPI_SPEED
-    #define INIT_SPI_SPEED SD_SPI_SPEED
-  #else
-    #define INIT_SPI_SPEED SPI_FULL_SPEED
-  #endif
-
-  void spiBegin() { spiInit(INIT_SPI_SPEED); } // Set up SCK, MOSI & MISO pins for SSP0
-
-  void spiInit(uint8_t spiRate) {
-    #if SD_MISO_PIN == BOARD_SPI1_MISO_PIN
-      SPI.setModule(1);
-    #elif SD_MISO_PIN == BOARD_SPI2_MISO_PIN
-      SPI.setModule(2);
-    #endif
-    SPI.setDataSize(DATA_SIZE_8BIT);
-    SPI.setDataMode(SPI_MODE0);
-
-    SPI.setClock(SPISettings::spiRate2Clock(spiRate));
-    SPI.begin();
-  }
-
-  static uint8_t doio(uint8_t b) {
-    return SPI.transfer(b & 0x00FF) & 0x00FF;
-  }
-
-  void spiSend(uint8_t b) { doio(b); }
-
-  void spiSend(const uint8_t *buf, size_t nbyte) {
-    for (uint16_t i = 0; i < nbyte; i++) doio(buf[i]);
-  }
-
-  void spiSend(uint32_t chan, byte b) {}
-
-  void spiSend(uint32_t chan, const uint8_t *buf, size_t nbyte) {}
-
-  // Read single byte from SPI
-  uint8_t spiRec() { return doio(0xFF); }
-
-  uint8_t spiRec(uint32_t chan) { return 0; }
-
-  // Read from SPI into buffer
-  void spiRead(uint8_t *buf, uint16_t nbyte) {
-    for (uint16_t i = 0; i < nbyte; i++) buf[i] = doio(0xFF);
-  }
-
-  uint8_t spiTransfer(uint8_t b) { return doio(b); }
-
-  // Write from buffer to SPI
-  void spiSendBlock(uint8_t token, const uint8_t *buf) {
-   (void)spiTransfer(token);
-    for (uint16_t i = 0; i < 512; i++)
-      (void)spiTransfer(buf[i]);
-  }
-
-  // Begin SPI transaction, set clock, bit order, data mode
-  void spiBeginTransaction(uint32_t spiClock, uint8_t bitOrder, uint8_t dataMode) {
-    // TODO: Implement this method
-  }
-
-#endif // LPC_SOFTWARE_SPI
-
-// /**
-//  * @brief Wait until TXE (tx empty) flag is set and BSY (busy) flag unset.
-//  */
-static inline void waitSpiTxEnd(void *spi_d) {
-  // while (SSP_GetStatus(spi_d, SSP_STAT_TXFIFO_EMPTY) == RESET) { /* nada */ } // wait until TXE=1
-  // while (SSP_GetStatus(spi_d, SSP_STAT_BUSY) == SET) { /* nada */ }     // wait until BSY=0
-}
-
-// // Retain the pin init state of the SPI, to avoid init more than once,
-// // even if more instances of SPIClass exist
-static bool spiInitialised[BOARD_NR_SPI] = {};
-
-SPIClass::SPIClass(uint8_t device) {
-//   // Init things specific to each SPI device
-//   // clock divider setup is a bit of hack, and needs to be improved at a later date.
-
-  #if BOARD_NR_SPI >= 1
-    _settings[0].device_id = 0;
-    _settings[0].m_config.pin_miso = BOARD_SPI1_MISO_PIN;
-    _settings[0].m_config.pin_mosi = BOARD_SPI1_MOSI_PIN;
-    _settings[0].m_config.pin_sck  = BOARD_SPI1_SCK_PIN;
-    _settings[0].m_config.pin_ssel = BOARD_SPI1_NSS_PIN;
-    _settings[0].m_config.frequency = 100000;
-    _settings[0].m_config.data_bits = 8;
-    _settings[0].m_config.mode = 0;
-    _settings[0].m_config.format = MCUI::SSP::Config::Format::SPI;
-
-
-//     _settings[0].dataMode = SPI_MODE0;
-//     _settings[0].dataSize = DATA_SIZE_8BIT;
-//     _settings[0].clock = SPI_CLOCK_MAX;
-//     //_settings[0].clockDivider = determine_baud_rate(_settings[0].spi_d, _settings[0].clock);
-  #endif
-
-  #if BOARD_NR_SPI >= 2
-    _settings[1].device_id = 2;
-    _settings[1].m_config.pin_miso = BOARD_SPI2_MISO_PIN;
-    _settings[1].m_config.pin_mosi = BOARD_SPI2_MOSI_PIN;
-    _settings[1].m_config.pin_sck  = BOARD_SPI2_SCK_PIN;
-    _settings[1].m_config.pin_ssel = BOARD_SPI2_NSS_PIN;
-//     _settings[1].dataMode = SPI_MODE0;
-//     _settings[1].dataSize = DATA_SIZE_8BIT;
-//     _settings[1].clock = SPI_CLOCK_MAX;
-//     //_settings[1].clockDivider = determine_baud_rate(_settings[1].spi_d, _settings[1].clock);
-  #endif
-
-  #if BOARD_NR_SPI >= 3
-    _settings[2].device_id = 1;
-    _settings[2].m_config.pin_miso = BOARD_SPI3_MISO_PIN;
-    _settings[2].m_config.pin_mosi = BOARD_SPI3_MOSI_PIN;
-    _settings[2].m_config.pin_sck  = BOARD_SPI3_SCK_PIN;
-    _settings[2].m_config.pin_ssel = BOARD_SPI3_NSS_PIN;
-//     _settings[1].dataMode = SPI_MODE0;
-//     _settings[1].dataSize = DATA_SIZE_8BIT;
-//     _settings[1].clock = SPI_CLOCK_MAX;
-//     //_settings[1].clockDivider = determine_baud_rate(_settings[1].spi_d, _settings[1].clock);
-  #endif
-
-  setModule(device);
-
-//   // Init the GPDMA controller
-//   // TODO: call once in the constructor? or each time?
-//   GPDMA_Init();
-}
-
-SPIClass::SPIClass(pin_t mosi, pin_t miso, pin_t sclk, pin_t ssel) {
-  #if BOARD_NR_SPI >= 1
-    if (mosi == BOARD_SPI1_MOSI_PIN) SPIClass(1);
-  #endif
-  #if BOARD_NR_SPI >= 2
-    if (mosi == BOARD_SPI2_MOSI_PIN) SPIClass(2);
-  #endif
-  #if BOARD_NR_SPI >= 3
-    if (mosi == BOARD_SPI3_MOSI_PIN) SPIClass(3);
-  #endif
-}
-
-void SPIClass::begin() {
-//   // Init the SPI pins in the first begin call
-  if ((_currentSetting->device_id == 0 && spiInitialised[0] == false) ||
-      (_currentSetting->device_id == 1 && spiInitialised[1] == false) ||
-      (_currentSetting->device_id == 2 && spiInitialised[2] == false)) {
-    MCUI::SSP::init(_currentSetting->device_id, _currentSetting->m_config);
-    spiInitialised[_currentSetting->device_id] = true;
-  }
-  updateSettings();
-}
-
-void SPIClass::beginTransaction(const SPISettings &cfg) {
-  setBitOrder(cfg.bitOrder);
-  setDataMode(cfg.dataMode);
-  setDataSize(cfg.dataSize);
-  //setClockDivider(determine_baud_rate(_currentSetting->spi_d, settings.clock));
-  begin();
-}
-
-uint8_t SPIClass::transfer(const uint16_t b) {
-  uint16_t rx_word = 0;
-  // clear rx fifo
-  while(MCUI::SSP::read(_currentSetting->device_id, &rx_word) == 1);
-  MCUI::SSP::write(_currentSetting->device_id, b);
-  while(MCUI::SSP::read(_currentSetting->device_id, &rx_word) != 1);
-  return rx_word;
-}
-
-uint16_t SPIClass::transfer16(const uint16_t data) {
-   return (transfer((data >> 8) & 0xFF) << 8) | (transfer(data & 0xFF) & 0xFF);
-}
-
-void SPIClass::end() {
-//   // Neither is needed for Marlin
-//   //SSP_Cmd(_currentSetting->spi_d, DISABLE);
-//   //SSP_DeInit(_currentSetting->spi_d);
-}
-
-void SPIClass::send(uint8_t data) {
-  MCUI::SSP::write(_currentSetting->device_id, data);
-}
-
-void SPIClass::dmaSend(void *buf, uint16_t length, bool minc) {
-//   //TODO: LPC dma can only write 0xFFF bytes at once.
-//   GPDMA_Channel_CFG_Type GPDMACfg;
-
-//   /* Configure GPDMA channel 0 -------------------------------------------------------------*/
-//   /* DMA Channel 0 */
-//   GPDMACfg.ChannelNum = 0;
-//   // Source memory
-//   GPDMACfg.SrcMemAddr = (uint32_t)buf;
-//   // Destination memory - Not used
-//   GPDMACfg.DstMemAddr = 0;
-//   // Transfer size
-//   GPDMACfg.TransferSize = length;
-//   // Transfer width
-//   GPDMACfg.TransferWidth = (_currentSetting->dataSize == DATA_SIZE_16BIT) ? GPDMA_WIDTH_HALFWORD : GPDMA_WIDTH_BYTE;
-//   // Transfer type
-//   GPDMACfg.TransferType = GPDMA_TRANSFERTYPE_M2P;
-//   // Source connection - unused
-//   GPDMACfg.SrcConn = 0;
-//   // Destination connection
-//   GPDMACfg.DstConn = (_currentSetting->spi_d == LPC_SSP0) ? GPDMA_CONN_SSP0_Tx : GPDMA_CONN_SSP1_Tx;
-
-//   GPDMACfg.DMALLI = 0;
-
-//   // Enable dma on SPI
-//   SSP_DMACmd(_currentSetting->spi_d, SSP_DMA_TX, ENABLE);
-
-//   // Only increase memory if minc is true
-//   GPDMACfg.MemoryIncrease = (minc ? GPDMA_DMACCxControl_SI : 0);
-
-//   // Setup channel with given parameter
-//   GPDMA_Setup(&GPDMACfg);
-
-//   // Enable DMA
-//   GPDMA_ChannelCmd(0, ENABLE);
-
-//   // Wait for data transfer
-//   while (!GPDMA_IntGetStatus(GPDMA_STAT_RAWINTTC, 0) && !GPDMA_IntGetStatus(GPDMA_STAT_RAWINTERR, 0)) { }
-
-//   // Clear err and int
-//   GPDMA_ClearIntPending (GPDMA_STATCLR_INTTC, 0);
-//   GPDMA_ClearIntPending (GPDMA_STATCLR_INTERR, 0);
-
-//   // Disable DMA
-//   GPDMA_ChannelCmd(0, DISABLE);
-
-//   waitSpiTxEnd(_currentSetting->spi_d);
-
-//   SSP_DMACmd(_currentSetting->spi_d, SSP_DMA_TX, DISABLE);
-}
-
-uint16_t SPIClass::read() {
-  uint16_t rx_word = 0;
-  MCUI::SSP::read(_currentSetting->device_id, &rx_word);
-  return rx_word;
-}
-
-void SPIClass::read(uint8_t *buf, uint32_t len) {
-  uint16_t rx_word = 0;
-  // clear rx fifo
-  while(MCUI::SSP::read(_currentSetting->device_id, &rx_word) == 1);
-  for (uint16_t i = 0; i < len; i++) {
-    MCUI::SSP::write(_currentSetting->device_id, 0xFF);
-    while(MCUI::SSP::read(_currentSetting->device_id, &rx_word) != 1);
-    buf[i] = rx_word;
-  }
-}
-
-void SPIClass::setClock(uint32_t clock) { _currentSetting->clock = clock; }
-
-void SPIClass::setModule(uint8_t device) { _currentSetting = &_settings[device - 1]; } // SPI channels are called 1, 2, and 3 but the array is zero-indexed
-
-void SPIClass::setBitOrder(uint8_t bitOrder) { _currentSetting->bitOrder = bitOrder; }
-
-void SPIClass::setDataMode(uint8_t dataMode) { _currentSetting->dataMode = dataMode; }
-
-void SPIClass::setDataSize(uint32_t dataSize) { _currentSetting->dataSize = dataSize; }
-
-// /**
-//  * Set up/tear down
-//  */
-void SPIClass::updateSettings() {
-  MCUI::SSP::configure(_currentSetting->device_id, _currentSetting->m_config);
-}
-
-SPIClass SPI(1);
-
-#if SD_MISO_PIN == BOARD_SPI1_MISO_PIN
-  SPIClass SPI(1);
-#elif SD_MISO_PIN == BOARD_SPI2_MISO_PIN
-  SPIClass SPI(2);
-#endif
-
-#endif // TARGET_LPC4078
@@ -1,45 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-#include <SPI.h>
-
-/**
- * Marlin currently requires 3 SPI classes:
- *
- * SPIClass:
- *  This class is normally provided by frameworks and has a semi-default interface.
- *  This is needed because some libraries reference it globally.
- *
- * SPISettings:
- *  Container for SPI configs for SPIClass. As above, libraries may reference it globally.
- *
- * These two classes are often provided by frameworks so we cannot extend them to add
- * useful methods for Marlin.
- *
- * MarlinSPI:
- *  Provides the default SPIClass interface plus some Marlin goodies such as a simplified
- *  interface for SPI DMA transfer.
- *
- */
-
-using MarlinSPI = SPIClass;
@@ -1,78 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * 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 TARGET_LPC4078
-
-#include "MarlinSerial.h"
-
-#include "../../inc/MarlinConfig.h"
-
-MarlinCDCSerial MCDCSerial0;
-
-#define MarlinSerial(ID) \
-  MarlinSerial _MSerial##ID(ID); \
-  MSerialT MSerial##ID(true, _MSerial##ID)
-
-#if USING_HW_SERIAL0
-  MarlinSerial(0);
-#endif
-#if USING_HW_SERIAL1
-  MarlinSerial(1);
-#endif
-#if USING_HW_SERIAL2
-  MarlinSerial(2);
-#endif
-#if USING_HW_SERIAL3
-  MarlinSerial(3);
-#endif
-
-#if ENABLED(EMERGENCY_PARSER)
-
-  bool MarlinSerial::recv_callback(const char c) {
-    // Need to figure out which serial port we are and react in consequence (Marlin does not have CONTAINER_OF macro)
-    if (false) {}
-    #if USING_HW_SERIAL0
-      else if (this == &_MSerial0) emergency_parser.update(MSerial0.emergency_state, c);
-    #endif
-    #if USING_HW_SERIAL1
-      else if (this == &_MSerial1) emergency_parser.update(MSerial1.emergency_state, c);
-    #endif
-    #if USING_HW_SERIAL2
-      else if (this == &_MSerial2) emergency_parser.update(MSerial2.emergency_state, c);
-    #endif
-    #if USING_HW_SERIAL3
-      else if (this == &_MSerial3) emergency_parser.update(MSerial3.emergency_state, c);
-    #endif
-    return true;
-  }
-
-  #include "../../feature/e_parser.h"
-
-  EmergencyParser::State emergency_state;
-
-  bool CDC_RecvCallback(const char c) {
-    emergency_parser.update(emergency_state, c);
-    return true;
-  }
-
-#endif
-
-#endif // TARGET_LPC4078
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
InsanityAutomation	1549a256d2	Add FatBoy config	2024-01-06 13:35:08 -05:00
InsanityAutomation	832e1ca0e7	Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marlin into bugfix-2.1.x	2024-01-01 14:03:46 -05:00
InsanityAutomation	83bdfeb5cb	Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marlin into bugfix-2.1.x	2023-11-08 09:39:42 -05:00
InsanityAutomation	6128d61186	Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marlin into bugfix-2.1.x	2023-08-04 09:47:12 -04:00
InsanityAutomation	6657c44cc7	Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marlin into bugfix-2.1.x	2023-07-26 11:52:43 -04:00
InsanityAutomation	52c37ee699	Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marlin into bugfix-2.1.x	2023-06-23 09:26:59 -04:00
InsanityAutomation	134958a535	Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marlin into bugfix-2.1.x	2023-04-24 13:25:58 -04:00
InsanityAutomation	0f7ef6b586	Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marlin into bugfix-2.1.x	2023-03-10 09:10:03 -05:00
InsanityAutomation	9cbb6b1512	Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marlin into bugfix-2.1.x	2023-02-06 15:59:13 -05:00
InsanityAutomation	af85a271a5	Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marlin into bugfix-2.1.x	2023-02-03 15:20:56 -05:00
MarkMan0	a7eacbcc49	🐛 Fix, Refactor PID scaling (#25096 )	2022-12-17 23:48:33 -06:00
Scott Lahteine	05e2e059e3	🐛 Fix M593 F	2022-12-17 23:04:49 -06:00