diff --git a/.github/workflows/test-builds.yml b/.github/workflows/ci-build-tests.yml
similarity index 98%
rename from .github/workflows/test-builds.yml
rename to .github/workflows/ci-build-tests.yml
index a3cf32739c92..ad37100d6031 100644
--- a/.github/workflows/test-builds.yml
+++ b/.github/workflows/ci-build-tests.yml
@@ -1,9 +1,9 @@
 #
-# test-builds.yml
+# ci-build-tests.yml
 # Do test builds to catch compile errors
 #
 
-name: CI
+name: CI - Build Tests
 
 on:
   pull_request:
@@ -27,7 +27,7 @@ on:
 
 jobs:
   test_builds:
-    name: Run All Tests
+    name: Build Test
     if: github.repository == 'MarlinFirmware/Marlin'
 
     runs-on: ubuntu-latest
diff --git a/.github/workflows/ci-unit-tests.yml b/.github/workflows/ci-unit-tests.yml
new file mode 100644
index 000000000000..caed5b1fbc95
--- /dev/null
+++ b/.github/workflows/ci-unit-tests.yml
@@ -0,0 +1,73 @@
+#
+# 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
diff --git a/Makefile b/Makefile
index bc26173aaf36..029ab3ada13f 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,12 @@ help:
 	@echo "make tests-single-local-docker : Run a single test locally, using docker"
 	@echo "make tests-all-local           : Run all tests locally"
 	@echo "make tests-all-local-docker    : Run all tests locally, using docker"
-	@echo "make setup-local-docker        : Build the local docker image"
+#	@echo "make unit-test-single-ci      : Run a single code test from inside the CI"
+#	@echo "make unit-test-single-local   : Run a single code test locally"
+#	@echo "make unit-test-single-local-docker : Run a single code test locally, using docker-compose"
+	@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-compose"
+	@echo "make setup-local-docker        : Setup local docker-compose"
 	@echo ""
 	@echo "Options for testing:"
 	@echo "  TEST_TARGET          Set when running tests-single-*, to select the"
@@ -43,7 +48,7 @@ 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)"
 
 tests-all-local:
 	export PATH="./buildroot/bin/:./buildroot/tests/:${PATH}" \
@@ -52,10 +57,31 @@ 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)
+	$(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-ci:
+#	export GIT_RESET_HARD=true
+#	$(MAKE) unit-test-single-local TEST_TARGET=$(TEST_TARGET)
+
+# TODO: How can we limit tests with ONLY_TEST with platformio?
+#unit-test-single-local:
+#	@if ! test -n "$(TEST_TARGET)" ; then echo "***ERROR*** Set TEST_TARGET=<your-module> or use make unit-test-all-local" ; return 1; fi
+#	platformio run -t marlin_$(TEST_TARGET)
+
+#unit-test-single-local-docker:
+#	@if ! test -n "$(TEST_TARGET)" ; then echo "***ERROR*** Set TEST_TARGET=<your-module> or use make unit-test-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 unit-test-single-local TEST_TARGET=$(TEST_TARGET) ONLY_TEST="$(ONLY_TEST)"
+
+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
 
 setup-local-docker:
-	$(CONTAINER_RT_BIN) build -t $(CONTAINER_IMAGE) -f docker/Dockerfile .
+	$(CONTAINER_RT_BIN) buildx build -t $(CONTAINER_IMAGE) -f docker/Dockerfile .
 
 PINS := $(shell find Marlin/src/pins -mindepth 2 -name '*.h')
 
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 915a004ac63e..430edb61c03d 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -2715,7 +2715,7 @@
  * This feature is EXPERIMENTAL so use with caution and test thoroughly.
  * Enable this option to receive data on the serial ports via the onboard DMA
  * controller for more stable and reliable high-speed serial communication.
- * Only some STM32 MCUs are currently supported.
+ * Support is currently limited to some STM32 MCUs and all HC32 MCUs.
  * Note: This has no effect on emulated USB serial ports.
  */
 //#define SERIAL_DMA
diff --git a/Marlin/Version.h b/Marlin/Version.h
index 113c27fe54a7..d9ddcdd0b836 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2024-04-13"
+//#define STRING_DISTRIBUTION_DATE "2024-04-19"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
diff --git a/Marlin/src/HAL/HC32/MarlinHAL.cpp b/Marlin/src/HAL/HC32/MarlinHAL.cpp
index 1ab374fbf15c..acb96dadc600 100644
--- a/Marlin/src/HAL/HC32/MarlinHAL.cpp
+++ b/Marlin/src/HAL/HC32/MarlinHAL.cpp
@@ -123,6 +123,11 @@ 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() {}
@@ -147,7 +152,31 @@ void MarlinHAL::delay_ms(const int ms) {
   delay(ms);
 }
 
-void MarlinHAL::idletask() {}
+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
+}
 
 uint8_t MarlinHAL::get_reset_source() {
   // Query reset cause from RMU
diff --git a/Marlin/src/HAL/HC32/MarlinSerial.cpp b/Marlin/src/HAL/HC32/MarlinSerial.cpp
index eb203f79d3ba..11d4abfab969 100644
--- a/Marlin/src/HAL/HC32/MarlinSerial.cpp
+++ b/Marlin/src/HAL/HC32/MarlinSerial.cpp
@@ -46,14 +46,34 @@ constexpr bool serial_handles_emergency(int port) {
 //
 // Define serial ports
 //
-#define DEFINE_HWSERIAL_MARLIN(name, n)      \
+
+// serial port where RX and TX use IRQs
+#define DEFINE_IRQ_SERIAL_MARLIN(name, n)      \
   MSerialT name(serial_handles_emergency(n), \
                 &USART##n##_config,          \
                 BOARD_USART##n##_TX_PIN,     \
                 BOARD_USART##n##_RX_PIN);
 
-DEFINE_HWSERIAL_MARLIN(MSerial1, 1);
-DEFINE_HWSERIAL_MARLIN(MSerial2, 2);
+// 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
 
 //
 // Serial port assertions
diff --git a/Marlin/src/HAL/HC32/MarlinSerial.h b/Marlin/src/HAL/HC32/MarlinSerial.h
index 08eeef43951e..b63b069b9dd5 100644
--- a/Marlin/src/HAL/HC32/MarlinSerial.h
+++ b/Marlin/src/HAL/HC32/MarlinSerial.h
@@ -25,17 +25,42 @@
 #include <drivers/usart/Usart.h>
 
 // Optionally set uart IRQ priority to reduce overflow errors
-// #define UART_IRQ_PRIO 1
+//#define UART_RX_IRQ_PRIO 1
+//#define UART_TX_IRQ_PRIO 1
+//#define UART_RX_DMA_IRQ_PRIO 1
 
 struct MarlinSerial : public Usart {
-  MarlinSerial(struct usart_config_t *usart_device, gpio_pin_t tx_pin, gpio_pin_t rx_pin) : Usart(usart_device, tx_pin, rx_pin) {}
+  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
+  }
 
-  #ifdef UART_IRQ_PRIO
+  #if defined(UART_RX_IRQ_PRIO) || defined(UART_TX_IRQ_PRIO) || defined(UART_RX_DMA_IRQ_PRIO)
     void setPriority() {
-      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);
+      #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
     }
 
     void begin(uint32_t baud) {
@@ -47,7 +72,12 @@ struct MarlinSerial : public Usart {
       Usart::begin(baud, config);
       setPriority();
     }
-  #endif
+
+    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
 };
 
 typedef Serial1Class<MarlinSerial> MSerialT;
diff --git a/Marlin/src/HAL/HC32/app_config.h b/Marlin/src/HAL/HC32/app_config.h
new file mode 100644
index 000000000000..bc9d14b4c6b8
--- /dev/null
+++ b/Marlin/src/HAL/HC32/app_config.h
@@ -0,0 +1,70 @@
+/**
+ * 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
+
+// FIXME override F_CPU to PCLK1, as marlin freaks out otherwise
+#define F_CPU (SYSTEM_CLOCK_FREQUENCIES.pclk1)
+
+#endif // _HC32_APP_CONFIG_H_
diff --git a/Marlin/src/HAL/HC32/inc/SanityCheck.h b/Marlin/src/HAL/HC32/inc/SanityCheck.h
index ef8d9a997583..0d05448f9815 100644
--- a/Marlin/src/HAL/HC32/inc/SanityCheck.h
+++ b/Marlin/src/HAL/HC32/inc/SanityCheck.h
@@ -20,6 +20,20 @@
  *
  */
 #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."
@@ -74,3 +88,18 @@
     #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
diff --git a/Marlin/src/HAL/HC32/sdio.cpp b/Marlin/src/HAL/HC32/sdio.cpp
index 4360d715ff19..3c4038f92d4f 100644
--- a/Marlin/src/HAL/HC32/sdio.cpp
+++ b/Marlin/src/HAL/HC32/sdio.cpp
@@ -54,7 +54,7 @@
     fn                                              \
   }
 
-stc_sd_handle_t *handle;
+stc_sd_handle_t *handle = nullptr;
 
 bool SDIO_Init() {
   // Configure SDIO pins
@@ -66,36 +66,45 @@ 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;
-
-  // 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,
-  };
+  //handle->pstcCardInitCfg = cardConf; // assigned in SDCARD_Init
 
   // 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 != NULL, "SDIO not initialized");
-  CORE_ASSERT(dst != NULL, "SDIO_ReadBlock dst is NULL");
+  CORE_ASSERT(handle != nullptr, "SDIO not initialized", return false);
+  CORE_ASSERT(dst != nullptr, "SDIO_ReadBlock dst is NULL", return false);
 
   WITH_RETRY(SDIO_READ_RETRIES, {
     en_result_t rc = SDCARD_ReadBlocks(handle, block, 1, dst, SDIO_READ_TIMEOUT);
@@ -107,8 +116,8 @@ bool SDIO_ReadBlock(uint32_t block, uint8_t *dst) {
 }
 
 bool SDIO_WriteBlock(uint32_t block, const uint8_t *src) {
-  CORE_ASSERT(handle != NULL, "SDIO not initialized");
-  CORE_ASSERT(src != NULL, "SDIO_WriteBlock src is NULL");
+  CORE_ASSERT(handle != nullptr, "SDIO not initialized", return false);
+  CORE_ASSERT(src != nullptr, "SDIO_WriteBlock src is NULL", return false);
 
   WITH_RETRY(SDIO_WRITE_RETRIES, {
     en_result_t rc = SDCARD_WriteBlocks(handle, block, 1, (uint8_t *)src, SDIO_WRITE_TIMEOUT);
@@ -120,12 +129,12 @@ bool SDIO_WriteBlock(uint32_t block, const uint8_t *src) {
 }
 
 bool SDIO_IsReady() {
-  CORE_ASSERT(handle != NULL, "SDIO not initialized");
+  CORE_ASSERT(handle != nullptr, "SDIO not initialized", return false);
   return bool(handle->stcCardStatus.READY_FOR_DATA);
 }
 
 uint32_t SDIO_GetCardSize() {
-  CORE_ASSERT(handle != NULL, "SDIO not initialized");
+  CORE_ASSERT(handle != nullptr, "SDIO not initialized", return 0);
 
   // 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);
diff --git a/Marlin/src/HAL/LINUX/hardware/Timer.cpp b/Marlin/src/HAL/LINUX/hardware/Timer.cpp
index 9f0d6a8f3ae2..013690a404bf 100644
--- a/Marlin/src/HAL/LINUX/hardware/Timer.cpp
+++ b/Marlin/src/HAL/LINUX/hardware/Timer.cpp
@@ -37,7 +37,10 @@ Timer::Timer() {
 }
 
 Timer::~Timer() {
-  timer_delete(timerid);
+  if (timerid != 0) {
+    timer_delete(timerid);
+    timerid = 0;
+  }
 }
 
 void Timer::init(uint32_t sig_id, uint32_t sim_freq, callback_fn* fn) {
diff --git a/Marlin/src/HAL/LINUX/main.cpp b/Marlin/src/HAL/LINUX/main.cpp
index f2af2ff33f52..27a066d619ce 100644
--- a/Marlin/src/HAL/LINUX/main.cpp
+++ b/Marlin/src/HAL/LINUX/main.cpp
@@ -21,6 +21,7 @@
  */
 
 #ifdef __PLAT_LINUX__
+#ifndef UNIT_TEST
 
 //#define GPIO_LOGGING // Full GPIO and Positional Logging
 
@@ -135,4 +136,5 @@ int main() {
   read_serial.join();
 }
 
+#endif // UNIT_TEST
 #endif // __PLAT_LINUX__
diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index 1dfcabdefb86..cef30c5cd226 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -131,6 +131,7 @@
 #define BOARD_PXMALION_CORE_I3        1164  // Pxmalion Core I3
 #define BOARD_PANOWIN_CUTLASS         1165  // Panowin Cutlass (as found in the Panowin F1)
 #define BOARD_KODAMA_BARDO            1166  // Kodama Bardo V1.x (as found in the Kodama Trinus)
+#define BOARD_DAGOMA_D6               1167  // Dagoma D6 (as found in the Dagoma DiscoUltimate V2 TMC)
 
 //
 // RAMBo and derivatives
diff --git a/Marlin/src/gcode/control/M10-M11.cpp b/Marlin/src/gcode/control/M10_M11.cpp
similarity index 95%
rename from Marlin/src/gcode/control/M10-M11.cpp
rename to Marlin/src/gcode/control/M10_M11.cpp
index d5a69dcfccfb..8fd299c5465b 100644
--- a/Marlin/src/gcode/control/M10-M11.cpp
+++ b/Marlin/src/gcode/control/M10_M11.cpp
@@ -20,6 +20,11 @@
  *
  */
 
+/**
+ * gcode/control/M10_M11.cpp
+ * Air Evacuation
+ */
+
 #include "../../inc/MarlinConfig.h"
 
 #if ENABLED(AIR_EVACUATION)
diff --git a/Marlin/src/gcode/temp/M86-M87.cpp b/Marlin/src/gcode/temp/M86_M87.cpp
similarity index 98%
rename from Marlin/src/gcode/temp/M86-M87.cpp
rename to Marlin/src/gcode/temp/M86_M87.cpp
index a64358d21278..502052e87be9 100644
--- a/Marlin/src/gcode/temp/M86-M87.cpp
+++ b/Marlin/src/gcode/temp/M86_M87.cpp
@@ -21,7 +21,7 @@
  */
 
 /**
- * gcode/temp/M86-M87.cpp
+ * gcode/temp/M86_M87.cpp
  *
  * Hotend Idle Timeout
  */
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 392d75675e2d..5f14c568ae24 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -235,9 +235,11 @@ static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _L
   #error "SERIAL_XON_XOFF and SERIAL_STATS_* features not supported on USB-native AVR devices."
 #endif
 
-// Serial DMA is only available for some STM32 MCUs
+// Serial DMA is only available for some STM32 MCUs and HC32
 #if ENABLED(SERIAL_DMA)
-  #if !HAL_STM32 || NONE(STM32F0xx, STM32F1xx, STM32F2xx, STM32F4xx, STM32F7xx)
+  #if defined(ARDUINO_ARCH_HC32)
+    // checks for HC32 are located in HAL/HC32/inc/SanityCheck.h
+  #elif !HAL_STM32 || NONE(STM32F0xx, STM32F1xx, STM32F2xx, STM32F4xx, STM32F7xx)
     #error "SERIAL_DMA is only available for some STM32 MCUs and requires HAL/STM32."
   #elif !defined(HAL_UART_MODULE_ENABLED) || defined(HAL_UART_MODULE_ONLY)
     #error "SERIAL_DMA requires STM32 platform HAL UART (without HAL_UART_MODULE_ONLY)."
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 1fa8ce961fa7..4a15d226add0 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2024-04-13"
+  #define STRING_DISTRIBUTION_DATE "2024-04-19"
 #endif
 
 /**
diff --git a/Marlin/src/inc/Warnings.cpp b/Marlin/src/inc/Warnings.cpp
index 3a2153916f20..2c2a82497839 100644
--- a/Marlin/src/inc/Warnings.cpp
+++ b/Marlin/src/inc/Warnings.cpp
@@ -99,7 +99,7 @@
   #warning "Warning! Don't use dummy thermistors (998/999) for final build!"
 #endif
 
-#if NONE(HAS_RESUME_CONTINUE, HOST_PROMPT_SUPPORT)
+#if NONE(HAS_RESUME_CONTINUE, HOST_PROMPT_SUPPORT, UNIT_TEST)
   #warning "Your Configuration provides no method to acquire user feedback!"
 #endif
 
diff --git a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
index a96d8e300287..06a234d04d09 100644
--- a/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
+++ b/Marlin/src/lcd/dogm/marlinui_DOGM.cpp
@@ -377,7 +377,13 @@ void MarlinUI::draw_kill_screen() {
 void MarlinUI::clear_lcd() { } // Automatically cleared by Picture Loop
 
 #if HAS_DISPLAY_SLEEP
-  void MarlinUI::sleep_display(const bool sleep/*=true*/) { sleep ? u8g.sleepOn() : u8g.sleepOff(); }
+  void MarlinUI::sleep_display(const bool sleep/*=true*/) { 
+    static bool asleep = false;
+    if (asleep != sleep){
+      sleep ? u8g.sleepOn() : u8g.sleepOff(); 
+      asleep = sleep;
+    }
+  }
 #endif
 
 #if HAS_LCD_BRIGHTNESS
diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp
index 4c5f91e03222..a0e2f8898bdd 100644
--- a/Marlin/src/lcd/e3v2/proui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp
@@ -3145,7 +3145,7 @@ void drawControlMenu() {
         enableLiveCaseLightBrightness = true;  // Allow live update of brightness in control menu
         MENU_ITEM(ICON_CaseLight, MSG_CASE_LIGHT, onDrawSubMenu, drawCaseLightMenu);
       #else
-        MENU_ITEM(ICON_CaseLight, MSG_CASE_LIGHT, onDrawChkbMenu, setCaseLight, &caselight.on);
+        EDIT_ITEM(ICON_CaseLight, MSG_CASE_LIGHT, onDrawChkbMenu, setCaseLight, &caselight.on);
       #endif
     #endif
     #if ENABLED(LED_CONTROL_MENU)
diff --git a/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h b/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
index 569c9781d270..6d5a3c70b5a2 100644
--- a/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
+++ b/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
@@ -23,7 +23,6 @@
 
 /**
  * AZSMZ MINI pin assignments
- * Schematic: http://green-candy.osdn.jp/external/MarlinFW/board_schematics/AZSMZ%20MINI/AZSMZ.svg
  * Source: https://raw.githubusercontent.com/Rose-Fish/AZSMZ-mini/master/AZSMZ.sch
  */
 
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
index 008fc3d4a0b3..be6da885df10 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
@@ -23,8 +23,7 @@
 
 /**
  * BigTreeTech SKR 1.1 pin assignments
- * Schematic: http://green-candy.osdn.jp/external/MarlinFW/board_schematics/BTT%20SKR%20V1.1/SKR-V1.1SchDoc.pdf
- * Origin: https://github.com/bigtreetech/BIGTREETECH-SKR-V1.1/blob/master/hardware/SKR-V1.1SchDoc.pdf
+ * Schematic: https://github.com/bigtreetech/BIGTREETECH-SKR-V1.1/blob/master/hardware/SKR-V1.1SchDoc.pdf
  */
 
 #define BOARD_INFO_NAME "BTT SKR V1.1"
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
index 63496c407daa..664a179c1a90 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -23,8 +23,7 @@
 
 /**
  * BigTreeTech SKR 1.3 pin assignments
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/BTT%20SKR%20V1.3/SKR-V1.3-SCH.pdf
- * Origin: https://github.com/bigtreetech/BIGTREETECH-SKR-V1.3/blob/master/BTT%20SKR%20V1.3/hardware/SKR-V1.3-SCH.pdf
+ * Schematic: https://github.com/bigtreetech/BIGTREETECH-SKR-V1.3/blob/master/BTT%20SKR%20V1.3/hardware/SKR-V1.3-SCH.pdf
  */
 
 #define BOARD_INFO_NAME "BTT SKR V1.3"
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
index ea340a9f9f36..60ceab5f89d0 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -23,8 +23,7 @@
 
 /**
  * BigTreeTech SKR 1.4 pin assignments
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/BTT%20SKR%20V1.4%20+%20Turbo/BTT%20SKR%20V1.4-SCH.pdf
- * Origin: https://github.com/bigtreetech/BIGTREETECH-SKR-V1.3/blob/master/BTT%20SKR%20V1.4/Hardware/BTT%20SKR%20V1.4-SCH.pdf
+ * Schematic: https://github.com/bigtreetech/BIGTREETECH-SKR-V1.3/blob/master/BTT%20SKR%20V1.4/Hardware/BTT%20SKR%20V1.4-SCH.pdf
  */
 
 #include "env_validate.h"
diff --git a/Marlin/src/pins/lpc1768/pins_EMOTRONIC.h b/Marlin/src/pins/lpc1768/pins_EMOTRONIC.h
index 5c4e8d40e85b..52bf4b0abb82 100644
--- a/Marlin/src/pins/lpc1768/pins_EMOTRONIC.h
+++ b/Marlin/src/pins/lpc1768/pins_EMOTRONIC.h
@@ -23,8 +23,7 @@
 
 /**
  * eMotion-Tech eMotronic pin assignments
- * Schematic: http://green-candy.osdn.jp/external/MarlinFW/board_schematics/eMotion-Tech%20eMotronic/eMotronic_brd_sources_1.0.4/eMotronic_sch.pdf
- * Origin: https://data.emotion-tech.com/ftp/Datasheets_et_sources/Sources/eMotronic_brd_sources_1.0.4.zip
+ * Schematic: https://data.emotion-tech.com/ftp/Datasheets_et_sources/Sources/eMotronic_brd_sources_1.0.4.zip
  *
  * Board pins<->features assignments are based on the
  * Micro-Delta Rework printer default connections.
diff --git a/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h b/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
index 7aa4aa642349..f785d3b7378c 100644
--- a/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
+++ b/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
@@ -23,8 +23,7 @@
 
 /**
  * GMARSH X6 Rev.1 pin assignments
- * Schematic: http://green-candy.osdn.jp/external/MarlinFW/board_schematics/GMARSH%20X6%20Rev.1/armprinter_2208_1heater.pdf
- * Origin: https://github.com/gmarsh/gmarsh_x6/blob/master/armprinter_2208_1heater.pdf
+ * Schematic: https://github.com/gmarsh/gmarsh_x6/blob/master/armprinter_2208_1heater.pdf
  */
 
 #include "env_validate.h"
diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
index 039d906efcad..8a39e2790a73 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
@@ -23,8 +23,6 @@
 
 /**
  * Makerbase MKS SBASE pin assignments
- * Schematic (V1.3): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/MKS%20SBASE%20V1.3/MKS%20SBASE%20V1.3_002%20SCH.pdf
- * Origin (V1.3): http://green-candy.osdn.jp/external/MarlinFW/board_schematics/MKS%20SBASE%20V1.3/MKS%20SBASE%20V1.3_002%20SCH.pdf
  */
 
 #include "env_validate.h"
diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
index 8e87ce4d886d..38c7cac3d4b7 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
@@ -23,8 +23,7 @@
 
 /**
  * Makerbase MKS SGEN-L pin assignments
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/MKS_GEN_L_V1_0/MKS%20Gen_L%20V1.0_008%20SCH.pdf
- * Origin: https://github.com/makerbase-mks/SGEN_L/blob/master/Hardware/MKS%20SGEN_L%20V1.0_001/MKS%20SGEN_L%20V1.0_001%20SCH.pdf
+ * Schematic: https://github.com/makerbase-mks/SGEN_L/blob/master/Hardware/MKS%20SGEN_L%20V1.0_001/MKS%20SGEN_L%20V1.0_001%20SCH.pdf
  */
 
 #include "env_validate.h"
diff --git a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
index 84c2eca91984..8cbe9a7e7e9f 100644
--- a/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
+++ b/Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
@@ -23,8 +23,7 @@
 
 /**
  * Re-ARM with RAMPS v1.4 pin assignments
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Re-ARM%20RAMPS%201.4/Re_ARM_Schematic.pdf
- * Origin: https://reprap.org/mediawiki/images/f/fa/Re_ARM_Schematic.pdf
+ * Schematic: https://reprap.org/mediawiki/images/f/fa/Re_ARM_Schematic.pdf
  *
  * Applies to the following boards:
  *
diff --git a/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h b/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h
index 16858c0b566a..2d27b8e0f6ba 100644
--- a/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h
+++ b/Marlin/src/pins/lpc1768/pins_SELENA_COMPACT.h
@@ -23,8 +23,7 @@
 
 /**
  * Selena Compact pin assignments
- * Pinout: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Selena%20Compact/Compact%20Pinout.pdf
- * Origin: https://github.com/f61/Selena/blob/master/Compact%20Pinout.pdf
+ * Schematic: https://github.com/f61/Selena/blob/master/Compact%20Pinout.pdf
  */
 
 #include "env_validate.h"
diff --git a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h
index 8412f1c12d3b..26f0ff39cec6 100644
--- a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h
+++ b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_GT.h
@@ -23,8 +23,7 @@
 
 /**
  * Azteeg X5 GT pin assignments
- * Wiring diagram: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Azteeg%20X5%20GT/X5%20GT%20Wiring%20Diagram.pdf
- * Origin: https://panucattdevices.freshdesk.com/support/solutions/articles/1000244740-support-files
+ * Schematic: https://panucattdevices.freshdesk.com/support/solutions/articles/1000244740-support-files
  */
 
 #include "env_validate.h"
diff --git a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
index f1753d0e2b95..5256da2ef22f 100644
--- a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
+++ b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
@@ -23,10 +23,7 @@
 
 /**
  * Azteeg X5 MINI pin assignments
- * Schematic (V1): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Azteeg%20X5%20MINI/x5mini_design_files/X5mini_design_files/V1/X5%20Mini%20PUB%20v1.0.pdf
- * Schematic (V2): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Azteeg%20X5%20MINI/x5mini_design_files/X5mini_design_files/V2/X5%20Mini%20V2%20SCH%20Pub.pdf
- * Schematic (V3): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Azteeg%20X5%20MINI/x5mini_design_files/X5mini_design_files/V3/X5%20Mini%20V3%20SCH%20Pub.pdf
- * Origin: http://files.panucatt.com/datasheets/x5mini_design_files.zip
+ * Schematic: http://files.panucatt.com/datasheets/x5mini_design_files.zip
  */
 #include "env_validate.h"
 
diff --git a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI_WIFI.h b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI_WIFI.h
index 74439e4f3d27..fd69efa8e879 100644
--- a/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI_WIFI.h
+++ b/Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI_WIFI.h
@@ -23,8 +23,7 @@
 
 /**
  * Azteeg X5 MINI WIFI pin assignments
- * Wiring diagram: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Azteeg%20X5%20MINI%20WIFI/x5mini_wifi_wiring.pdf
- * Origin: http://files.panucatt.com/datasheets/x5mini_wifi_wiring.pdf
+ * Schematic: http://files.panucatt.com/datasheets/x5mini_wifi_wiring.pdf
  */
 
 #include "env_validate.h"
diff --git a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
index f329636f2b30..a3754a391c37 100644
--- a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
+++ b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
@@ -23,8 +23,7 @@
 
 /**
  * BigTreeTech SKR E3 Turbo pin assignments
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/BTT%20SKR%20E3%20Turbo/BTT%20SKR%20E3%20Turbo-SCH.pdf
- * Origin: https://github.com/bigtreetech/BIGTREETECH-SKR-E3-Turbo/blob/master/Hardware/BTT%20SKR%20E3%20Turbo-SCH.pdf
+ * Schematic: https://github.com/bigtreetech/BIGTREETECH-SKR-E3-Turbo/blob/master/Hardware/BTT%20SKR%20E3%20Turbo-SCH.pdf
  */
 
 #include "env_validate.h"
diff --git a/Marlin/src/pins/lpc1769/pins_BTT_SKR_V1_4_TURBO.h b/Marlin/src/pins/lpc1769/pins_BTT_SKR_V1_4_TURBO.h
index 1bd70d8fb598..2e24197106bd 100644
--- a/Marlin/src/pins/lpc1769/pins_BTT_SKR_V1_4_TURBO.h
+++ b/Marlin/src/pins/lpc1769/pins_BTT_SKR_V1_4_TURBO.h
@@ -23,8 +23,7 @@
 
 /**
  * BigTreeTech SKR 1.4 Turbo pin assignments
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/BTT%20SKR%20V1.4%20+%20Turbo/BTT%20SKR%20V1.4-SCH.pdf
- * Origin: https://github.com/bigtreetech/BIGTREETECH-SKR-V1.3/blob/master/BTT%20SKR%20V1.4/Hardware/BTT%20SKR%20V1.4-SCH.pdf
+ * Schematic: https://github.com/bigtreetech/BIGTREETECH-SKR-V1.3/blob/master/BTT%20SKR%20V1.4/Hardware/BTT%20SKR%20V1.4-SCH.pdf
  */
 
 #define BOARD_INFO_NAME "BTT SKR V1.4 TURBO"
diff --git a/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h b/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h
index 70781cb0b588..485b3109ad03 100644
--- a/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h
+++ b/Marlin/src/pins/lpc1769/pins_COHESION3D_MINI.h
@@ -23,8 +23,7 @@
 
 /**
  * Cohesion3D Mini pin assignments
- * Pinout: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Cohesion3D%20Mini/c3d-pinout.jpg
- * Origin: https://lasergods.com/cohesion3d-mini-pinout-diagram/
+ * Schematic: https://lasergods.com/cohesion3d-mini-pinout-diagram/
  */
 
 #include "env_validate.h"
diff --git a/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h b/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h
index a6acde35ffe3..d1ecb0e7dd03 100644
--- a/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h
+++ b/Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h
@@ -23,8 +23,7 @@
 
 /**
  * Cohesion3D ReMix pin assignments
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Cohesion3D%20ReMix/C3D%20ReMix%20rev2.svg
- * Origin: https://github.com/Cohesion3D/Cohesion3D-ReMix/blob/master/C3D%20ReMix%20rev2.sch
+ * Schematic: https://github.com/Cohesion3D/Cohesion3D-ReMix/blob/master/C3D%20ReMix%20rev2.sch
  */
 
 #include "env_validate.h"
diff --git a/Marlin/src/pins/lpc1769/pins_FLY_CDY.h b/Marlin/src/pins/lpc1769/pins_FLY_CDY.h
index d5a7a38c234d..9b22214a7a1c 100644
--- a/Marlin/src/pins/lpc1769/pins_FLY_CDY.h
+++ b/Marlin/src/pins/lpc1769/pins_FLY_CDY.h
@@ -23,8 +23,7 @@
 
 /**
  * FLYmaker FLY-CDY pin assignments
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/FLYmaker%20FLY-CDY%20V1/FLY_CDY%20SCH.pdf
- * Origin: https://github.com/Mellow-3D/FLY-CDY/blob/master/Motherboard%20information/FLY_CDY%20SCH.pdf
+ * Schematic: https://github.com/Mellow-3D/FLY-CDY/blob/master/Motherboard%20information/FLY_CDY%20SCH.pdf
  */
 
 #include "env_validate.h"
diff --git a/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h b/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h
index 5e552353cd31..64abf5212f66 100644
--- a/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h
+++ b/Marlin/src/pins/lpc1769/pins_MKS_SGEN.h
@@ -23,8 +23,7 @@
 
 /**
  * MKS SGen pin assignments
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/MKS%20SGEN/MKS%20SGEN%20V1.0_001%20SCH.pdf
- * Origin: https://github.com/makerbase-mks/MKS-SGen/blob/master/Hardware/MKS%20SGEN%20V1.0_001/MKS%20SGEN%20V1.0_001%20SCH.pdf
+ * Schematic: https://github.com/makerbase-mks/MKS-SGen/blob/master/Hardware/MKS%20SGEN%20V1.0_001/MKS%20SGEN%20V1.0_001%20SCH.pdf
  *
  * Pins diagram:
  * https://github.com/makerbase-mks/MKS-SGen/blob/master/Hardware/MKS%20SGEN%20V1.0_001/MKS%20SGEN%20V1.0_001%20PIN.pdf
diff --git a/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h b/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
index 613ba19e15ae..aec4240276e7 100644
--- a/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
+++ b/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
@@ -23,8 +23,7 @@
 
 /**
  * MKS SGen-L V2 pin assignments
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/MKS%20SGEN_L%20V2/MKS%20SGEN_L%20V2.0_003%20SCH.pdf
- * Origin: https://github.com/makerbase-mks/MKS-SGEN_L-V2/blob/master/Hardware/MKS%20SGEN_L%20V2.0_003/MKS%20SGEN_L%20V2.0_003%20SCH.pdf
+ * Schematic: https://github.com/makerbase-mks/MKS-SGEN_L-V2/blob/master/Hardware/MKS%20SGEN_L%20V2.0_003/MKS%20SGEN_L%20V2.0_003%20SCH.pdf
  */
 
 #include "env_validate.h"
diff --git a/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h b/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
index 0134e936319d..8856d69720f7 100644
--- a/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
+++ b/Marlin/src/pins/lpc1769/pins_SMOOTHIEBOARD.h
@@ -23,8 +23,7 @@
 
 /**
  * Smoothieware Smoothieboard pin assignments
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Smoothieware%20Smoothieboard%20V1/http.i.imgur.com.oj4zqs3.png
- * Origin: http://smoothieware.org/_media///external/http.i.imgur.com.oj4zqs3.png
+ * Schematic: http://smoothieware.org/_media///external/http.i.imgur.com.oj4zqs3.png
  */
 
 #include "env_validate.h"
diff --git a/Marlin/src/pins/mega/pins_ELEFU_3.h b/Marlin/src/pins/mega/pins_ELEFU_3.h
index 71797a30fff8..623b7a0d4335 100644
--- a/Marlin/src/pins/mega/pins_ELEFU_3.h
+++ b/Marlin/src/pins/mega/pins_ELEFU_3.h
@@ -23,8 +23,7 @@
 
 /**
  * Elefu RA Board Pin Assignments
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Elefu%20Ra%20v3/schematic.pdf
- * Origin: https://github.com/kiyoshigawa/Elefu-RAv3/blob/master/RA_Circuits.zip
+ * Schematic: https://github.com/kiyoshigawa/Elefu-RAv3/blob/master/RA_Circuits.zip
  * ATmega2560
  */
 
diff --git a/Marlin/src/pins/mega/pins_GT2560_REV_A.h b/Marlin/src/pins/mega/pins_GT2560_REV_A.h
index 55632e97bff4..96e3e5c36ff6 100644
--- a/Marlin/src/pins/mega/pins_GT2560_REV_A.h
+++ b/Marlin/src/pins/mega/pins_GT2560_REV_A.h
@@ -25,8 +25,7 @@
  * Geeetech GT2560 Revision A board pin assignments, based on the work of
  * George Robles (https://georges3dprinters.com) and
  * Richard Smith <galorin@gmail.com>
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Geeetech%20GT2560%20Revision%20A/GT2560_sch.pdf
- * Origin: https://www.geeetech.com/wiki/images/9/90/GT2560_sch.pdf
+ * Schematic: https://www.geeetech.com/wiki/images/9/90/GT2560_sch.pdf
  * ATmega2560
  */
 
diff --git a/Marlin/src/pins/mega/pins_GT2560_REV_A_PLUS.h b/Marlin/src/pins/mega/pins_GT2560_REV_A_PLUS.h
index a90c075be57f..a593393f08a7 100644
--- a/Marlin/src/pins/mega/pins_GT2560_REV_A_PLUS.h
+++ b/Marlin/src/pins/mega/pins_GT2560_REV_A_PLUS.h
@@ -23,8 +23,7 @@
 
 /**
  * Geeetech GT2560 Revision A+ board pin assignments
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Geeetech%20GT2560%20Revision%20A+/Hardware_GT2560_RevA+.pdf
- * Origin: https://www.geeetech.com/wiki/images/d/d3/Hardware_GT2560_RevA%2B.pdf
+ * Schematic: https://www.geeetech.com/wiki/images/d/d3/Hardware_GT2560_RevA%2B.pdf
  * ATmega2560
  */
 
diff --git a/Marlin/src/pins/mega/pins_GT2560_REV_B.h b/Marlin/src/pins/mega/pins_GT2560_REV_B.h
index 0702d14eb8d2..24915ce395e6 100644
--- a/Marlin/src/pins/mega/pins_GT2560_REV_B.h
+++ b/Marlin/src/pins/mega/pins_GT2560_REV_B.h
@@ -23,8 +23,7 @@
 
 /**
  * Geeetech GT2560 Rev B Pins
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Geeetech%20GT2560%20Rev%20B/GT2560_REVB.pdf
- * Origin: https://www.geeetech.com/wiki/images/7/72/GT2560_REVB.pdf
+ * Schematic: https://www.geeetech.com/wiki/images/7/72/GT2560_REVB.pdf
  * ATmega2560
  */
 
diff --git a/Marlin/src/pins/mega/pins_GT2560_V3.h b/Marlin/src/pins/mega/pins_GT2560_V3.h
index b684214c6964..1323ae3c8e24 100644
--- a/Marlin/src/pins/mega/pins_GT2560_V3.h
+++ b/Marlin/src/pins/mega/pins_GT2560_V3.h
@@ -23,8 +23,7 @@
 
 /**
  * Geeetech GT2560 3.0/3.1 pin assignments
- * Schematic (3.0): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Geeetech%20GT2560%203.0/GT2560_V3.0_SCH.pdf
- * Origin (3.0): https://github.com/Geeetech3D/Diagram/blob/master/GT2560_V3.0_SCH.pdf
+ * Schematic (3.0): https://github.com/Geeetech3D/Diagram/blob/master/GT2560_V3.0_SCH.pdf
  * ATmega2560
  *
  * Also GT2560 RevB and GT2560 4.0/4.1
diff --git a/Marlin/src/pins/mega/pins_GT2560_V4.h b/Marlin/src/pins/mega/pins_GT2560_V4.h
index 98f503886f89..f931238f9245 100644
--- a/Marlin/src/pins/mega/pins_GT2560_V4.h
+++ b/Marlin/src/pins/mega/pins_GT2560_V4.h
@@ -23,9 +23,7 @@
 
 /**
  * Geeetech GT2560 V4.X Pins
- * Schematic (4.0): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Geeetech%20GT2560%20V4.x%20+%20A20/GT2560V4.0SCHA20T.pdf
- * Schematic (4.1B): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Geeetech%20GT2560%20V4.x%20+%20A20/GT2560V4.1BSCHA20T.pdf
- * Origin: https://www.geeetech.com/download.html?spm=a2g0s.imconversation.0.0.22d23e5fXlQBWv&download_id=45
+ * Schematic: https://www.geeetech.com/download.html?spm=a2g0s.imconversation.0.0.22d23e5fXlQBWv&download_id=45
  */
 
 #define BOARD_INFO_NAME "GT2560 4.x"
diff --git a/Marlin/src/pins/mega/pins_GT2560_V41b.h b/Marlin/src/pins/mega/pins_GT2560_V41b.h
index 12d45be9853d..3ffaaabef49e 100644
--- a/Marlin/src/pins/mega/pins_GT2560_V41b.h
+++ b/Marlin/src/pins/mega/pins_GT2560_V41b.h
@@ -23,8 +23,7 @@
 
 /**
  * Geeetech GT2560 V4.1b Pins
- * Schematic (4.1B): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Geeetech%20GT2560%20V4.x%20+%20A20/GT2560V4.1BSCHA20T.pdf
- * Origin: https://www.geeetech.com/download.html?spm=a2g0s.imconversation.0.0.22d23e5fXlQBWv&download_id=45
+ * Schematic: https://www.geeetech.com/download.html?spm=a2g0s.imconversation.0.0.22d23e5fXlQBWv&download_id=45
  * ATmega2560
 */
 
diff --git a/Marlin/src/pins/mega/pins_MEGACONTROLLER.h b/Marlin/src/pins/mega/pins_MEGACONTROLLER.h
index 688c147a6890..514f7b255efb 100644
--- a/Marlin/src/pins/mega/pins_MEGACONTROLLER.h
+++ b/Marlin/src/pins/mega/pins_MEGACONTROLLER.h
@@ -23,8 +23,7 @@
 
 /**
  * Mega controller pin assignments
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Mega%20Controller/Mega_controller.pdf
- * Origin: https://reprap.org/mediawiki/images/b/ba/Mega_controller.pdf
+ * Schematic: https://reprap.org/mediawiki/images/b/ba/Mega_controller.pdf
  * ATmega2560
  */
 
diff --git a/Marlin/src/pins/mega/pins_MEGATRONICS.h b/Marlin/src/pins/mega/pins_MEGATRONICS.h
index 066b577c629b..90d128c9fc02 100644
--- a/Marlin/src/pins/mega/pins_MEGATRONICS.h
+++ b/Marlin/src/pins/mega/pins_MEGATRONICS.h
@@ -23,8 +23,7 @@
 
 /**
  * MegaTronics pin assignments
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/MegaTronics/Megatronics_1_0_sch.pdf
- * Origin: https://reprap.org/mediawiki/images/a/a3/Megatronics_1_0_sch.pdf
+ * Schematic: https://reprap.org/mediawiki/images/a/a3/Megatronics_1_0_sch.pdf
  * ATmega2560
  */
 
diff --git a/Marlin/src/pins/mega/pins_MEGATRONICS_2.h b/Marlin/src/pins/mega/pins_MEGATRONICS_2.h
index ff118e732315..285a77b6361a 100644
--- a/Marlin/src/pins/mega/pins_MEGATRONICS_2.h
+++ b/Marlin/src/pins/mega/pins_MEGATRONICS_2.h
@@ -23,8 +23,7 @@
 
 /**
  * MegaTronics v2.0 pin assignments
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Megatronics%20v2.0/megatronics%20-%20Project.pdf
- * Origin: https://reprap.org/wiki/File:Megatronicsv2PDF.zip
+ * Schematic: https://reprap.org/wiki/File:Megatronicsv2PDF.zip
  * ATmega2560
  */
 
diff --git a/Marlin/src/pins/mega/pins_MEGATRONICS_3.h b/Marlin/src/pins/mega/pins_MEGATRONICS_3.h
index 5e571d5a3fa2..5a7199406306 100644
--- a/Marlin/src/pins/mega/pins_MEGATRONICS_3.h
+++ b/Marlin/src/pins/mega/pins_MEGATRONICS_3.h
@@ -23,7 +23,7 @@
 
 /**
  * MegaTronics v3.0 / v3.1 / v3.2 pin assignments
- * Schematic Origin: https://github.com/brupje/Megatronics_3/blob/master/Design%20Files/megatronics.sch
+ * Schematic: https://github.com/brupje/Megatronics_3/blob/master/Design%20Files/megatronics.sch
  * ATmega2560
  */
 
diff --git a/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h b/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
index 22c14fc5e89e..fb7366081591 100644
--- a/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
+++ b/Marlin/src/pins/mega/pins_MIGHTYBOARD_REVE.h
@@ -23,8 +23,7 @@
 
 /**
  * Mightyboard Rev.E pin assignments
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Mightyboard%20Rev.E/MakerBot%20MightyBoard%20REVE%20Schematic.pdf
- * Origin: https://github.com/sciguy14/HelioWatcher/blob/master/HelioWatcher%20Circuit/MakerBot%20MightyBoard%20REVE%20Schematic.pdf
+ * Schematic: https://github.com/sciguy14/HelioWatcher/blob/master/HelioWatcher%20Circuit/MakerBot%20MightyBoard%20REVE%20Schematic.pdf
  * also works for Rev D boards. It's all rev E despite what the silk screen says
  */
 
diff --git a/Marlin/src/pins/mega/pins_MINITRONICS.h b/Marlin/src/pins/mega/pins_MINITRONICS.h
index c8828faea7ab..e6e24f8886bf 100644
--- a/Marlin/src/pins/mega/pins_MINITRONICS.h
+++ b/Marlin/src/pins/mega/pins_MINITRONICS.h
@@ -23,10 +23,8 @@
 
 /**
  * Minitronics v1.0/1.1 pin assignments
- * Schematic (1.0): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Minitronics%20v1.0/minitronics%20-%20Project.pdf
- * Origin (1.0): https://reprap.org/wiki/File:MinitronicsPDF.zip
- * Datasheet (1.1): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Minitronics%20v1.1/datasheet%20minitronics%20v1.1.pdf
- * Origin (1.1): https://reprapworld.nl/documentation/datasheet%20minitronics%20v1.1.pdf
+ * Schematic (1.0): https://reprap.org/wiki/File:MinitronicsPDF.zip
+ * Schematic (1.1): https://reprapworld.nl/documentation/datasheet%20minitronics%20v1.1.pdf
  * ATmega1281
  */
 
diff --git a/Marlin/src/pins/mega/pins_OVERLORD.h b/Marlin/src/pins/mega/pins_OVERLORD.h
index 332d7d4cb4dc..804aa38e59d6 100644
--- a/Marlin/src/pins/mega/pins_OVERLORD.h
+++ b/Marlin/src/pins/mega/pins_OVERLORD.h
@@ -23,8 +23,7 @@
 
 /**
  * Dreammaker Overlord v1.1 pin assignments
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Dreammaker%20Overlord%20v1.1/Schematic.pdf
- * Origin: https://github.com/jdpiercy/Overlord-Pro/blob/master/Motherboard/Schematic.pdf
+ * Schematic: https://github.com/jdpiercy/Overlord-Pro/blob/master/Motherboard/Schematic.pdf
  * ATmega2560
  */
 
diff --git a/Marlin/src/pins/mega/pins_PICA.h b/Marlin/src/pins/mega/pins_PICA.h
index 0a6478439c58..63e14d9bf2d2 100644
--- a/Marlin/src/pins/mega/pins_PICA.h
+++ b/Marlin/src/pins/mega/pins_PICA.h
@@ -23,8 +23,7 @@
 
 /**
  * Arduino Mega with PICA pin assignments
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/PICA/pica_schematic.pdf
- * Origin: https://github.com/mjrice/PICA/blob/master/pica_schematic.pdf
+ * Schematic: https://github.com/mjrice/PICA/blob/master/pica_schematic.pdf
  * ATmega2560
  *
  * PICA is Power, Interface, and Control Adapter and is open source hardware.
diff --git a/Marlin/src/pins/mega/pins_PICAOLD.h b/Marlin/src/pins/mega/pins_PICAOLD.h
index 3654a45d3fdd..4a9ab4e6fcf3 100644
--- a/Marlin/src/pins/mega/pins_PICAOLD.h
+++ b/Marlin/src/pins/mega/pins_PICAOLD.h
@@ -21,8 +21,7 @@
  */
 #pragma once
 
-// Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/PICAOLD/pica_schematic.pdf
-// Origin: https://github.com/mjrice/PICA/blob/97ab9e7771a8e5eef97788f3adcc17a9fa9de9b9/pica_schematic.pdf
+// Schematic: https://github.com/mjrice/PICA/blob/97ab9e7771a8e5eef97788f3adcc17a9fa9de9b9/pica_schematic.pdf
 // ATmega2560
 
 #define HEATER_0_PIN                           9  // E0
diff --git a/Marlin/src/pins/mega/pins_PROTONEER_CNC_SHIELD_V3.h b/Marlin/src/pins/mega/pins_PROTONEER_CNC_SHIELD_V3.h
index 962fddc19248..4b7d1007be2a 100644
--- a/Marlin/src/pins/mega/pins_PROTONEER_CNC_SHIELD_V3.h
+++ b/Marlin/src/pins/mega/pins_PROTONEER_CNC_SHIELD_V3.h
@@ -23,8 +23,7 @@
 
 /**
  * Protoneer v3.00 pin assignments
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Protoneer%20CNC%20Shield%20v3.00/Arduino-CNC-Shield-Scematics-V3.XX_.webp
- * Origin: https://i0.wp.com/blog.protoneer.co.nz/wp-content/uploads/2013/07/Arduino-CNC-Shield-Scematics-V3.XX_.jpg
+ * Schematic: https://i0.wp.com/blog.protoneer.co.nz/wp-content/uploads/2013/07/Arduino-CNC-Shield-Scematics-V3.XX_.jpg
  * ATmega2560
  *
  * This CNC shield has an UNO pinout and fits all Arduino-compatibles.
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 53d31c016819..cdc4fdb7a406 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -224,6 +224,8 @@
   #include "ramps/pins_RAMPS_CREALITY.h"            // ATmega2560                           env:mega2560
 #elif MB(DAGOMA_F5)
   #include "ramps/pins_DAGOMA_F5.h"                 // ATmega2560                           env:mega2560
+#elif MB(DAGOMA_D6)
+  #include "ramps/pins_DAGOMA_D6.h"                 // ATmega2560                           env:mega2560ext
 #elif MB(FYSETC_F6_13)
   #include "ramps/pins_FYSETC_F6_13.h"              // ATmega2560                           env:FYSETC_F6
 #elif MB(FYSETC_F6_14)
diff --git a/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h b/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
index ada4885752a3..8315de6ee30b 100644
--- a/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
+++ b/Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
@@ -23,8 +23,7 @@
 
 /**
  * Einsy-Rambo pin assignments
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Einsy-Rambo/Schematic%20Prints_Einsy%20Rambo_1.1a.PDF
- * Origin: https://github.com/ultimachine/Einsy-Rambo/blob/1.1a/board/Project%20Outputs/Schematic%20Prints_Einsy%20Rambo_1.1a.PDF
+ * Schematic: https://github.com/ultimachine/Einsy-Rambo/blob/1.1a/board/Project%20Outputs/Schematic%20Prints_Einsy%20Rambo_1.1a.PDF
  */
 
 #include "env_validate.h"
diff --git a/Marlin/src/pins/rambo/pins_EINSY_RETRO.h b/Marlin/src/pins/rambo/pins_EINSY_RETRO.h
index 75d0974b0a36..1f5061d4ce15 100644
--- a/Marlin/src/pins/rambo/pins_EINSY_RETRO.h
+++ b/Marlin/src/pins/rambo/pins_EINSY_RETRO.h
@@ -23,10 +23,8 @@
 
 /**
  * Einsy-Retro pin assignments
- * Schematic (1.0b): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Einsy-Retro/Schematic%20Prints_EinsyRetro_1.0b.PDF
- * Origin (1.0b): https://github.com/ultimachine/EinsyRetro/blob/master/board/Project%20Outputs/Schematic%20Prints_EinsyRetro_1.0b.PDF
- * Schematic (1.0c): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Einsy-Retro/Schematic%20Prints_EinsyRetro_1.0c.PDF
- * Origin (1.0c): https://github.com/ultimachine/EinsyRetro/blob/master/board/Project%20Outputs/Schematic%20Prints_EinsyRetro_1.0c.PDF
+ * Schematic (1.0b): https://github.com/ultimachine/EinsyRetro/blob/master/board/Project%20Outputs/Schematic%20Prints_EinsyRetro_1.0b.PDF
+ * Schematic (1.0c): https://github.com/ultimachine/EinsyRetro/blob/master/board/Project%20Outputs/Schematic%20Prints_EinsyRetro_1.0c.PDF
  */
 
 #include "env_validate.h"
diff --git a/Marlin/src/pins/rambo/pins_MINIRAMBO.h b/Marlin/src/pins/rambo/pins_MINIRAMBO.h
index c0bac9b36328..18f73a81d562 100644
--- a/Marlin/src/pins/rambo/pins_MINIRAMBO.h
+++ b/Marlin/src/pins/rambo/pins_MINIRAMBO.h
@@ -23,10 +23,8 @@
 
 /**
  * Mini-RAMBo pin assignments
- * Schematic (1.3a): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Mini%20RAMBo/Mini-Rambo.PDF
- * Origin (1.3a): https://github.com/ultimachine/Mini-Rambo/blob/1.3a/board/Project%20Outputs%20for%20Mini-Rambo/Mini-Rambo.PDF
- * Schematic (1.0a): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Mini%20RAMBo%201.0a/Mini-Rambo.PDF
- * Origin (1.0a): https://github.com/ultimachine/Mini-Rambo/blob/v1.1b/board/Project%20Outputs%20for%20Mini-Rambo/Mini-Rambo.PDF
+ * Schematic (1.3a): https://github.com/ultimachine/Mini-Rambo/blob/1.3a/board/Project%20Outputs%20for%20Mini-Rambo/Mini-Rambo.PDF
+ * Schematic (1.0a): https://github.com/ultimachine/Mini-Rambo/blob/v1.1b/board/Project%20Outputs%20for%20Mini-Rambo/Mini-Rambo.PDF
  */
 
 #include "env_validate.h"
diff --git a/Marlin/src/pins/rambo/pins_RAMBO.h b/Marlin/src/pins/rambo/pins_RAMBO.h
index 8ea3c15b4620..7e46b171512e 100644
--- a/Marlin/src/pins/rambo/pins_RAMBO.h
+++ b/Marlin/src/pins/rambo/pins_RAMBO.h
@@ -39,8 +39,7 @@
 
 /**
  * Rambo pin assignments
- * Schematic (1.1b): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/RAMBo/Rambo1-1-schematic.png
- * Origin (1.1b): https://www.reprap.org/wiki/File:Rambo1-1-schematic.png
+ * Schematic (1.1b): https://www.reprap.org/wiki/File:Rambo1-1-schematic.png
  */
 
 #include "env_validate.h"
diff --git a/Marlin/src/pins/ramps/pins_3DRAG.h b/Marlin/src/pins/ramps/pins_3DRAG.h
index 3a2d7ea19561..de4b3cfeb9ac 100644
--- a/Marlin/src/pins/ramps/pins_3DRAG.h
+++ b/Marlin/src/pins/ramps/pins_3DRAG.h
@@ -24,8 +24,7 @@
 /**
  * 3DRAG (and K8200 / K8400) Arduino Mega with RAMPS v1.4 pin assignments
  * This may be compatible with the standalone Controller variant.
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/3DRAG%20+%20Controller/Schema_base.jpg
- * Origin: https://reprap.org/wiki/File:Schema_base.jpg
+ * Schematic: https://reprap.org/wiki/File:Schema_base.jpg
  * ATmega2560, ATmega1280
  */
 
diff --git a/Marlin/src/pins/ramps/pins_AZTEEG_X3.h b/Marlin/src/pins/ramps/pins_AZTEEG_X3.h
index 17581dca6241..39c25a7fd131 100644
--- a/Marlin/src/pins/ramps/pins_AZTEEG_X3.h
+++ b/Marlin/src/pins/ramps/pins_AZTEEG_X3.h
@@ -23,8 +23,7 @@
 
 /**
  * AZTEEG_X3 Arduino Mega with RAMPS v1.4 pin assignments
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/AZTEEG_X3/AZTEEG%20X3%20PUB%20v1.12.pdf
- * Origin: http://files.panucatt.com/datasheets/azteegx3_designfiles.zip
+ * Schematic: http://files.panucatt.com/datasheets/azteegx3_designfiles.zip
  * ATmega2560
  */
 
diff --git a/Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h b/Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h
index ddd56b28e859..76a29930b0ae 100644
--- a/Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h
+++ b/Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h
@@ -23,8 +23,7 @@
 
 /**
  * AZTEEG_X3_PRO (Arduino Mega) pin assignments
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/AZTEEG_X3_PRO/AZTEEG%20X3%20PRO%201.0%20PUB.pdf
- * Origin: http://files.panucatt.com/datasheets/x3pro_sch_v1.0.zip
+ * Schematic: http://files.panucatt.com/datasheets/x3pro_sch_v1.0.zip
  * ATmega2560
  */
 
diff --git a/Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h b/Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h
index cf237fb9c11e..4f4e31f9a141 100644
--- a/Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h
+++ b/Marlin/src/pins/ramps/pins_BAM_DICE_DUE.h
@@ -23,8 +23,7 @@
 
 /**
  * BAM&DICE Due (Arduino Mega) pin assignments
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/BAM&DICE%20Due/2PRINTBETA-BAM&DICE-DUE-V1.1-sch.pdf
- * Origin: http://www.2printbeta.de/download/2PRINTBETA-BAM&DICE-DUE-V1.1-sch.pdf
+ * Schematic: http://www.2printbeta.de/download/2PRINTBETA-BAM&DICE-DUE-V1.1-sch.pdf
  * ATmega2560, ATmega1280
  */
 
diff --git a/Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h b/Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h
index 08d4492ccb5e..fb6689c0ce01 100644
--- a/Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h
+++ b/Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h
@@ -23,8 +23,7 @@
 
 /**
  * bq ZUM Mega 3D board definition
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/bq%20ZUM%20Mega%203D/Zum%20Mega%203D.PDF
- * Origin: https://github.com/bq/zum/blob/master/zum-mega3d/Zum%20Mega%203D.PDF
+ * Schematic: https://github.com/bq/zum/blob/master/zum-mega3d/Zum%20Mega%203D.PDF
  * ATmega2560
  */
 
diff --git a/Marlin/src/pins/ramps/pins_DAGOMA_D6.h b/Marlin/src/pins/ramps/pins_DAGOMA_D6.h
new file mode 100644
index 000000000000..2a89647376e1
--- /dev/null
+++ b/Marlin/src/pins/ramps/pins_DAGOMA_D6.h
@@ -0,0 +1,119 @@
+/**
+ * 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
+
+#if HOTENDS > 2 || E_STEPPERS > 2
+  #error "Dagoma3D D6 supports up to 2 hotends / E-steppers."
+#endif
+
+#define BOARD_INFO_NAME "Dagoma3D D6"
+
+//
+// Trinamic Stallguard pins
+//
+#define X_DIAG_PIN                            43
+#define Y_DIAG_PIN                            41
+#define Z_DIAG_PIN                            47
+#define E0_DIAG_PIN                           21
+#define E1_DIAG_PIN                           20
+
+//
+// Endstops
+//
+#define X_STOP_PIN                             2
+#define Y_STOP_PIN                             3
+#define Z_STOP_PIN                            15
+
+//
+// Filament Runout Sensor
+//
+#ifndef FIL_RUNOUT_PIN
+  #define FIL_RUNOUT_PIN                      39
+#endif
+#if EXTRUDERS > 1 && !defined(FIL_RUNOUT2_PIN)
+  #define FIL_RUNOUT2_PIN                     14
+#endif
+
+// Alter timing for graphical display
+#if IS_U8GLIB_ST7920
+  #ifndef BOARD_ST7920_DELAY_1
+    #define BOARD_ST7920_DELAY_1               0
+  #endif
+  #ifndef BOARD_ST7920_DELAY_2
+    #define BOARD_ST7920_DELAY_2             250
+  #endif
+  #ifndef BOARD_ST7920_DELAY_3
+    #define BOARD_ST7920_DELAY_3             250
+  #endif
+#endif
+
+#define KILL_PIN                              -1  // NC
+
+#define LCD_CONTRAST_DEFAULT                 255
+
+//
+// Sensorless homing DIAG pin is not directly connected to the MCU. Close
+// the jumper next to the limit switch socket when using sensorless homing.
+//
+#if HAS_TMC_UART
+  /**
+   * TMC2208/TMC2209 stepper drivers
+   */
+  #define X_SERIAL_RX_PIN                     73
+  #define X_SERIAL_TX_PIN                     73
+  #define Y_SERIAL_RX_PIN                     73
+  #define Y_SERIAL_TX_PIN                     73
+  #define Z_SERIAL_RX_PIN                     73
+  #define Z_SERIAL_TX_PIN                     73
+  #define E0_SERIAL_RX_PIN                    73
+  #define E0_SERIAL_TX_PIN                    73
+  #define E1_SERIAL_RX_PIN                    12
+  #define E1_SERIAL_TX_PIN                    12
+
+  // Default TMC slave addresses
+  #ifndef X_SLAVE_ADDRESS
+    #define X_SLAVE_ADDRESS                    0
+  #endif
+  #ifndef Y_SLAVE_ADDRESS
+    #define Y_SLAVE_ADDRESS                    1
+  #endif
+  #ifndef Z_SLAVE_ADDRESS
+    #define Z_SLAVE_ADDRESS                    2
+  #endif
+  #ifndef E0_SLAVE_ADDRESS
+    #define E0_SLAVE_ADDRESS                   3
+  #endif
+  #ifndef E1_SLAVE_ADDRESS
+    #define E1_SLAVE_ADDRESS                   3
+  #endif
+  static_assert(X_SLAVE_ADDRESS == 0, "X_SLAVE_ADDRESS must be 0 for BOARD_DAGOMA_D6.");
+  static_assert(Y_SLAVE_ADDRESS == 1, "Y_SLAVE_ADDRESS must be 1 for BOARD_DAGOMA_D6.");
+  static_assert(Z_SLAVE_ADDRESS == 2, "Z_SLAVE_ADDRESS must be 2 for BOARD_DAGOMA_D6.");
+  static_assert(E0_SLAVE_ADDRESS == 3, "E0_SLAVE_ADDRESS must be 3 for BOARD_DAGOMA_D6.");
+  static_assert(E1_SLAVE_ADDRESS == 3, "E1_SLAVE_ADDRESS must be 3 for BOARD_DAGOMA_D6.");
+
+#endif
+
+//
+// Import default RAMPS 1.4 pins
+//
+#include "pins_RAMPS.h"
diff --git a/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h b/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
index 102595363377..59c4c7988421 100644
--- a/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
+++ b/Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
@@ -23,8 +23,7 @@
 
 //
 // FYSETC F6 1.3 (and 1.4) pin assignments
-// Schematic (1.3): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/RAMPS/FYSETC%20F6%201.3/F6_V13.pdf
-// Origin: https://github.com/FYSETC/FYSETC-F6/blob/master/Hardware/V1.3/F6_V13.pdf
+// Schematic: https://github.com/FYSETC/FYSETC-F6/blob/master/Hardware/V1.3/F6_V13.pdf
 // ATmega2560
 //
 
diff --git a/Marlin/src/pins/ramps/pins_FYSETC_F6_14.h b/Marlin/src/pins/ramps/pins_FYSETC_F6_14.h
index 9604d0ecbfc1..5fdaa1941959 100644
--- a/Marlin/src/pins/ramps/pins_FYSETC_F6_14.h
+++ b/Marlin/src/pins/ramps/pins_FYSETC_F6_14.h
@@ -23,8 +23,7 @@
 
 //
 // FYSETC F6 v1.4 pin assignments
-// Schematic (1.4): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/RAMPS/FYSETC%20F6%20v1.4/F6%20V1.4%20Sch.pdf
-// Origin (1.4): https://github.com/FYSETC/FYSETC-F6/blob/master/Hardware/V1.4/F6%20V1.4%20Sch.pdf
+// Schematic (1.4): https://github.com/FYSETC/FYSETC-F6/blob/master/Hardware/V1.4/F6%20V1.4%20Sch.pdf
 // ATmega2560
 //
 
diff --git a/Marlin/src/pins/ramps/pins_K8200.h b/Marlin/src/pins/ramps/pins_K8200.h
index d2557b26c3ee..b6bed2dc556b 100644
--- a/Marlin/src/pins/ramps/pins_K8200.h
+++ b/Marlin/src/pins/ramps/pins_K8200.h
@@ -24,8 +24,7 @@
 /**
  * K8200 Arduino Mega with RAMPS v1.3 pin assignments
  * Identical to 3DRAG
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/RAMPS/Velleman%20K8200/K8200diagram.jpg
- * Origin: https://www.velleman.eu/images/tmp/K8200diagram.jpg
+ * Schematic: https://www.velleman.eu/images/tmp/K8200diagram.jpg
  * ATmega2560
  */
 
diff --git a/Marlin/src/pins/ramps/pins_K8400.h b/Marlin/src/pins/ramps/pins_K8400.h
index 048b9656c4af..31912064d061 100644
--- a/Marlin/src/pins/ramps/pins_K8400.h
+++ b/Marlin/src/pins/ramps/pins_K8400.h
@@ -24,8 +24,7 @@
 /**
  * Velleman K8400 (Vertex)
  * 3DRAG clone
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/RAMPS/Velleman%20K8400/k8400-schema-electronique.jpg
- * Origin: https://filimprimante3d.fr/documents/k8400-schema-electronique.jpg
+ * Schematic: https://filimprimante3d.fr/documents/k8400-schema-electronique.jpg
  * ATmega2560, ATmega1280
  *
  * K8400 has some minor differences over a normal 3Drag:
diff --git a/Marlin/src/pins/ramps/pins_K8800.h b/Marlin/src/pins/ramps/pins_K8800.h
index 826e1b206aad..1f477300de73 100644
--- a/Marlin/src/pins/ramps/pins_K8800.h
+++ b/Marlin/src/pins/ramps/pins_K8800.h
@@ -23,8 +23,7 @@
 
 /**
  * Velleman K8800 (Vertex)
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/RAMPS/Velleman%20K8800/K8800-schematic-V1.4.pdf
- * Origin: https://www.velleman.eu/downloads/files/vertex-delta/schematics/K8800-schematic-V1.4.pdf
+ * Schematic: https://www.velleman.eu/downloads/files/vertex-delta/schematics/K8800-schematic-V1.4.pdf
  * ATmega2560, ATmega1280
  */
 
diff --git a/Marlin/src/pins/ramps/pins_MKS_BASE_10.h b/Marlin/src/pins/ramps/pins_MKS_BASE_10.h
index 8d46ac36fa6e..3d58d8ba912d 100644
--- a/Marlin/src/pins/ramps/pins_MKS_BASE_10.h
+++ b/Marlin/src/pins/ramps/pins_MKS_BASE_10.h
@@ -24,10 +24,7 @@
 /**
  * MKS BASE 1.0 – Arduino Mega2560 with RAMPS v1.4 pin assignments
  * Schematics:
- * - https://green-candy.osdn.jp/external/MarlinFW/board_schematics/RAMPS/MKS%20BASE%201.0/PAGE1.pdf
- * - https://green-candy.osdn.jp/external/MarlinFW/board_schematics/RAMPS/MKS%20BASE%201.0/PAGE2.pdf
- * - https://green-candy.osdn.jp/external/MarlinFW/board_schematics/RAMPS/MKS%20BASE%201.0/PAGE3.pdf
- * Origin: https://reprap.org/wiki/File:MKS_Base_V1.0_source.zip
+ * Schematic: https://reprap.org/wiki/File:MKS_Base_V1.0_source.zip
  * ATmega2560
  *
  * Rev B - Override pin definitions for CASE_LIGHT and M3/M4/M5 spindle control
diff --git a/Marlin/src/pins/ramps/pins_MKS_BASE_16.h b/Marlin/src/pins/ramps/pins_MKS_BASE_16.h
index bb6def5ca46f..e5797493116b 100644
--- a/Marlin/src/pins/ramps/pins_MKS_BASE_16.h
+++ b/Marlin/src/pins/ramps/pins_MKS_BASE_16.h
@@ -23,8 +23,7 @@
 
 /**
  * MKS BASE v1.6 with A4982 stepper drivers and digital micro-stepping
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/RAMPS/MKS%20BASE%201.6/MKS%20Base%20V1.6_004%20SCH.pdf
- * Origin: https://github.com/makerbase-mks/MKS-BASE/blob/master/hardware/MKS%20Base%20V1.6_004/MKS%20Base%20V1.6_004%20SCH.pdf
+ * Schematic: https://github.com/makerbase-mks/MKS-BASE/blob/master/hardware/MKS%20Base%20V1.6_004/MKS%20Base%20V1.6_004%20SCH.pdf
  * ATmega2560
  */
 
diff --git a/Marlin/src/pins/ramps/pins_MKS_GEN_13.h b/Marlin/src/pins/ramps/pins_MKS_GEN_13.h
index 6ef77909d163..5797424c66c9 100644
--- a/Marlin/src/pins/ramps/pins_MKS_GEN_13.h
+++ b/Marlin/src/pins/ramps/pins_MKS_GEN_13.h
@@ -23,8 +23,7 @@
 
 /**
  * Arduino Mega with RAMPS v1.4 adjusted pin assignments
- * Schematic (1.4): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/RAMPS/MKS%20GEN%20v1.4/MKS%20GEN%20V1.4_004%20SCH.pdf
- * Origin (1.4): https://github.com/makerbase-mks/MKS-GEN/blob/master/hardware/MKS%20GEN%20V1.4_004/MKS%20GEN%20V1.4_004%20SCH.pdf
+ * Schematic (1.4): https://github.com/makerbase-mks/MKS-GEN/blob/master/hardware/MKS%20GEN%20V1.4_004/MKS%20GEN%20V1.4_004%20SCH.pdf
  * ATmega2560, ATmega1280
  *
  *  MKS GEN v1.3  (Extruder, Fan, Bed)
diff --git a/Marlin/src/pins/ramps/pins_MKS_GEN_L.h b/Marlin/src/pins/ramps/pins_MKS_GEN_L.h
index 73e7aa577d50..dfd8736c81fe 100644
--- a/Marlin/src/pins/ramps/pins_MKS_GEN_L.h
+++ b/Marlin/src/pins/ramps/pins_MKS_GEN_L.h
@@ -23,8 +23,7 @@
 
 /**
  * MKS GEN L – Arduino Mega2560 with RAMPS v1.4 pin assignments
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/RAMPS/MKS%20GEN%20L%20v1.0/MKS%20Gen_L%20V1.0_008%20SCH.pdf
- * Origin: https://github.com/makerbase-mks/MKS-GEN_L/blob/master/hardware/MKS%20Gen_L%20V1.0_008/MKS%20Gen_L%20V1.0_008%20SCH.pdf
+ * Schematic: https://github.com/makerbase-mks/MKS-GEN_L/blob/master/hardware/MKS%20Gen_L%20V1.0_008/MKS%20Gen_L%20V1.0_008%20SCH.pdf
  * ATmega2560, ATmega1280
  */
 
diff --git a/Marlin/src/pins/ramps/pins_MKS_GEN_L_V2.h b/Marlin/src/pins/ramps/pins_MKS_GEN_L_V2.h
index 931843de7c73..54c739326653 100644
--- a/Marlin/src/pins/ramps/pins_MKS_GEN_L_V2.h
+++ b/Marlin/src/pins/ramps/pins_MKS_GEN_L_V2.h
@@ -23,8 +23,7 @@
 
 /**
  * MKS GEN L V2 – Arduino Mega2560 with RAMPS v1.4 pin assignments
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/RAMPS/MKS%20GEN%20L%20V2.0/MKS%20Gen_L%20V2.0_001%20SCH.pdf
- * Origin: https://github.com/makerbase-mks/MKS-GEN_L/blob/master/hardware/MKS%20Gen_L%20V2.0_001/MKS%20Gen_L%20V2.0_001%20SCH.pdf
+ * Schematic: https://github.com/makerbase-mks/MKS-GEN_L/blob/master/hardware/MKS%20Gen_L%20V2.0_001/MKS%20Gen_L%20V2.0_001%20SCH.pdf
  * ATmega2560
  */
 
diff --git a/Marlin/src/pins/ramps/pins_MKS_GEN_L_V21.h b/Marlin/src/pins/ramps/pins_MKS_GEN_L_V21.h
index 6cea92c15b78..594be3c5df1d 100644
--- a/Marlin/src/pins/ramps/pins_MKS_GEN_L_V21.h
+++ b/Marlin/src/pins/ramps/pins_MKS_GEN_L_V21.h
@@ -23,8 +23,7 @@
 
 /**
  * MKS GEN L V2 – Arduino Mega2560 with RAMPS v1.4 pin assignments
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/RAMPS/MKS%20GEN%20L%20V2.1/MKS%20GEN_L%20V2.1_001%20SCH.pdf
- * Origin: https://github.com/makerbase-mks/MKS-GEN_L/blob/master/hardware/MKS%20Gen_L%20V2.1_001/MKS%20GEN_L%20V2.1_001%20SCH.pdf
+ * Schematic: https://github.com/makerbase-mks/MKS-GEN_L/blob/master/hardware/MKS%20Gen_L%20V2.1_001/MKS%20GEN_L%20V2.1_001%20SCH.pdf
  * ATmega2560
  */
 
diff --git a/Marlin/src/pins/ramps/pins_RUMBA.h b/Marlin/src/pins/ramps/pins_RUMBA.h
index 9a4a384e4ab5..24cc2bada089 100644
--- a/Marlin/src/pins/ramps/pins_RUMBA.h
+++ b/Marlin/src/pins/ramps/pins_RUMBA.h
@@ -23,8 +23,7 @@
 
 /**
  * RUMBA pin assignments
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/RAMPS/RUMBA/RRD-RUMBA_SCHEMATICS.png
- * Origin: https://reprap.org/wiki/File:RRD-RUMBA_SCHEMATICS.png
+ * Schematic: https://reprap.org/wiki/File:RRD-RUMBA_SCHEMATICS.png
  * ATmega2560
  */
 
diff --git a/Marlin/src/pins/ramps/pins_TANGO.h b/Marlin/src/pins/ramps/pins_TANGO.h
index 54dd4433998f..0f8aaca0e2c8 100644
--- a/Marlin/src/pins/ramps/pins_TANGO.h
+++ b/Marlin/src/pins/ramps/pins_TANGO.h
@@ -23,8 +23,7 @@
 
 /**
  * BIQU Tango pin assignments
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/RAMPS/BIQU%20Tango/schematic.png
- * Origin: https://github.com/bigtreetech/Tango-3D-Printer-Motherboard/blob/master/Schematic/Tango%20V1.0.SchDoc
+ * Schematic: https://github.com/bigtreetech/Tango-3D-Printer-Motherboard/blob/master/Schematic/Tango%20V1.0.SchDoc
  * ATmega2560
  */
 
diff --git a/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h b/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h
index 049e8bc5d80c..ca1b4b883b3a 100644
--- a/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h
+++ b/Marlin/src/pins/ramps/pins_ULTIMAIN_2.h
@@ -24,11 +24,6 @@
 /**
  * Ultiboard v2.0 pin assignments
  * Schematics (2.1.4):
- * - https://green-candy.osdn.jp/external/MarlinFW/board_schematics/RAMPS/Ultimaker%202.1.4/schema1.png
- * - https://green-candy.osdn.jp/external/MarlinFW/board_schematics/RAMPS/Ultimaker%202.1.4/schema2.png
- * - https://green-candy.osdn.jp/external/MarlinFW/board_schematics/RAMPS/Ultimaker%202.1.4/schema3.png
- * - https://green-candy.osdn.jp/external/MarlinFW/board_schematics/RAMPS/Ultimaker%202.1.4/schema4.png
- * - https://green-candy.osdn.jp/external/MarlinFW/board_schematics/RAMPS/Ultimaker%202.1.4/schema5.png
  * Origins (2.1.4):
  * - https://github.com/Ultimaker/Ultimaker2/blob/master/1546%20ultimainboard%20V2.1.4/schema1.SchDoc
  * - https://github.com/Ultimaker/Ultimaker2/blob/master/1546%20ultimainboard%20V2.1.4/schema2.SchDoc
@@ -36,11 +31,7 @@
  * - https://github.com/Ultimaker/Ultimaker2/blob/master/1546%20ultimainboard%20V2.1.4/schema4.SchDoc
  * - https://github.com/Ultimaker/Ultimaker2/blob/master/1546%20ultimainboard%20V2.1.4/schema5.SchDoc
  * Schematics (Original+):
- * - https://green-candy.osdn.jp/external/MarlinFW/board_schematics/RAMPS/Ultimaker%20Original+/Ultimainboard%20rev.%202.1.1%20altium/schema1.png
- * - https://green-candy.osdn.jp/external/MarlinFW/board_schematics/RAMPS/Ultimaker%20Original+/Ultimainboard%20rev.%202.1.1%20altium/schema2.png
- * - https://green-candy.osdn.jp/external/MarlinFW/board_schematics/RAMPS/Ultimaker%20Original+/Ultimainboard%20rev.%202.1.1%20altium/schema3.png
- * - https://green-candy.osdn.jp/external/MarlinFW/board_schematics/RAMPS/Ultimaker%20Original+/Ultimainboard%20rev.%202.1.1%20altium/schema4.png
- * Origin (Original+): https://github.com/Ultimaker/Ultimaker-Original-Plus/blob/master/1091_Main_board_v2.1.1_(x1)/Ultimainboard%20rev.%202.1.1%20altium.zip
+ * Schematic (Original+): https://github.com/Ultimaker/Ultimaker-Original-Plus/blob/master/1091_Main_board_v2.1.1_(x1)/Ultimainboard%20rev.%202.1.1%20altium.zip
  * ATmega2560
  */
 
diff --git a/Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h b/Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h
index 5cf143a09cf6..c366b152961b 100644
--- a/Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h
+++ b/Marlin/src/pins/ramps/pins_ULTIMAKER_OLD.h
@@ -23,8 +23,6 @@
 
 /**
  * Ultimaker pin assignments (Old electronics)
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/RAMPS/Ultimaker%201.0/ultipanel%20rev1.1.sch.pdf
- * Origin: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/RAMPS/Ultimaker%201.0/ultipanel%20rev1.1.sch.pdf
  * ATmega2560, ATmega1280
  */
 
diff --git a/Marlin/src/pins/ramps/pins_ZRIB_V20.h b/Marlin/src/pins/ramps/pins_ZRIB_V20.h
index d1c80f6a4afc..8218ba12c544 100644
--- a/Marlin/src/pins/ramps/pins_ZRIB_V20.h
+++ b/Marlin/src/pins/ramps/pins_ZRIB_V20.h
@@ -24,10 +24,8 @@
 /**
  * ZONESTAR ZRIB V2.0 & V3.0 pin assignments
  * V2 and V3 Boards only differ in USB controller, nothing affecting the pins.
- * Schematic (2.0): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/RAMPS/ZONESTAR%20ZRIB%20V2.0/ZRIB_V2_Schematic.pdf
- * Origin (2.0): https://github.com/ZONESTAR3D/Control-Board/blob/main/8bit/ZRIB/ZRIB_V2/ZRIB_V2_Schematic.pdf
- * Schematic (3.0): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/RAMPS/ZONESTAR%20ZRIB%20V3.0/ZRIB_V3_Schematic.pdf
- * Origin (3.0): https://github.com/ZONESTAR3D/Control-Board/blob/main/8bit/ZRIB/ZRIB_V3/ZRIB_V3_Schematic.pdf
+ * Schematic (2.0): https://github.com/ZONESTAR3D/Control-Board/blob/main/8bit/ZRIB/ZRIB_V2/ZRIB_V2_Schematic.pdf
+ * Schematic (3.0): https://github.com/ZONESTAR3D/Control-Board/blob/main/8bit/ZRIB/ZRIB_V3/ZRIB_V3_Schematic.pdf
  * ATmega2560, ATmega1280
  */
 
diff --git a/Marlin/src/pins/ramps/pins_ZRIB_V52.h b/Marlin/src/pins/ramps/pins_ZRIB_V52.h
index 5eada31c9cf9..016501241ae9 100644
--- a/Marlin/src/pins/ramps/pins_ZRIB_V52.h
+++ b/Marlin/src/pins/ramps/pins_ZRIB_V52.h
@@ -23,8 +23,7 @@
 
 /**
  * ZONESTAR ZRIB V5.2 Based on MKS BASE v1.4 with A4982 stepper drivers and digital micro-stepping
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/RAMPS/ZONESTAR%20ZRIB%20V5.2/ZRIB_V52_Schematic.pdf
- * Origin: https://github.com/ZONESTAR3D/Control-Board/blob/main/8bit/ZRIB/ZRIB_V5/ZRIB_V52_Schematic.pdf
+ * Schematic: https://github.com/ZONESTAR3D/Control-Board/blob/main/8bit/ZRIB/ZRIB_V5/ZRIB_V52_Schematic.pdf
  * ATmega2560, ATmega1280
  */
 
diff --git a/Marlin/src/pins/sanguino/pins_ANET_10.h b/Marlin/src/pins/sanguino/pins_ANET_10.h
index 8abf0c07e735..ee9fa327742f 100644
--- a/Marlin/src/pins/sanguino/pins_ANET_10.h
+++ b/Marlin/src/pins/sanguino/pins_ANET_10.h
@@ -23,8 +23,7 @@
 
 /**
  * Anet V1.0 board pin assignments
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Anet%20V1.0/ANET3D_Board_Schematic.pdf
- * Origin: https://github.com/ralf-e/ANET-3D-Board-V1.0/blob/master/ANET3D_Board_Schematic.pdf
+ * Schematic: https://github.com/ralf-e/ANET-3D-Board-V1.0/blob/master/ANET3D_Board_Schematic.pdf
  */
 
 /**
diff --git a/Marlin/src/pins/sanguino/pins_AZTEEG_X1.h b/Marlin/src/pins/sanguino/pins_AZTEEG_X1.h
index 1cbafab432c4..c88b666f6c1c 100644
--- a/Marlin/src/pins/sanguino/pins_AZTEEG_X1.h
+++ b/Marlin/src/pins/sanguino/pins_AZTEEG_X1.h
@@ -23,8 +23,7 @@
 
 /**
  * Azteeg X1 pin assignments
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Azteeg%20X1/Azteeg_X1_schematics.pdf
- * Origin: https://reprap.org/mediawiki/images/0/07/Azteeg_X1_schematics.pdf
+ * Schematic: https://reprap.org/mediawiki/images/0/07/Azteeg_X1_schematics.pdf
  */
 
 #define BOARD_INFO_NAME "Azteeg X1"
diff --git a/Marlin/src/pins/sanguino/pins_GEN6.h b/Marlin/src/pins/sanguino/pins_GEN6.h
index 4a6136e0810a..3fb1671b7342 100644
--- a/Marlin/src/pins/sanguino/pins_GEN6.h
+++ b/Marlin/src/pins/sanguino/pins_GEN6.h
@@ -23,8 +23,7 @@
 
 /**
  * Gen6 pin assignments
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Gen6/GEN6_Mendel_Circuit.pdf
- * Origin: https://reprap.org/mediawiki/images/0/0f/GEN6_Mendel_Circuit.pdf
+ * Schematic: https://reprap.org/mediawiki/images/0/0f/GEN6_Mendel_Circuit.pdf
  */
 
  /**
diff --git a/Marlin/src/pins/sanguino/pins_GEN7_12.h b/Marlin/src/pins/sanguino/pins_GEN7_12.h
index 0bf65c37cd38..503066624523 100644
--- a/Marlin/src/pins/sanguino/pins_GEN7_12.h
+++ b/Marlin/src/pins/sanguino/pins_GEN7_12.h
@@ -23,14 +23,10 @@
 
 /**
  * Gen7 v1.1, v1.2, v1.3 pin assignments
- * Schematic (1.1): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Gen7%20v1.1/Gen7Board%20Schematic.pdf
- * Origin (1.1): https://github.com/Traumflug/Generation_7_Electronics/blob/release-1.1/release%20documents/Gen7Board%20Schematic.pdf
- * Schematic (1.2): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Gen7%20v1.2/Gen7Board%20Schematic.pdf
- * Origin (1.2): https://github.com/Traumflug/Generation_7_Electronics/blob/release-1.2/release%20documents/Gen7Board%20Schematic.pdf
- * Schematic (1.3): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Gen7%20v1.3/Gen7Board%20Schematic.pdf
- * Origin (1.3): https://github.com/Traumflug/Generation_7_Electronics/blob/release-1.3/release%20documents/Gen7Board%20Schematic.pdf
- * Schematic (1.3.1): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Gen7%20v1.3.1/Gen7Board%20Schematic.pdf
- * Origin (1.3.1): https://github.com/Traumflug/Generation_7_Electronics/blob/release-1.3.1/release%20documents/Gen7Board%20Schematic.pdf
+ * Schematic (1.1): https://github.com/Traumflug/Generation_7_Electronics/blob/release-1.1/release%20documents/Gen7Board%20Schematic.pdf
+ * Schematic (1.2): https://github.com/Traumflug/Generation_7_Electronics/blob/release-1.2/release%20documents/Gen7Board%20Schematic.pdf
+ * Schematic (1.3): https://github.com/Traumflug/Generation_7_Electronics/blob/release-1.3/release%20documents/Gen7Board%20Schematic.pdf
+ * Schematic (1.3.1): https://github.com/Traumflug/Generation_7_Electronics/blob/release-1.3.1/release%20documents/Gen7Board%20Schematic.pdf
  */
 
  /**
diff --git a/Marlin/src/pins/sanguino/pins_GEN7_14.h b/Marlin/src/pins/sanguino/pins_GEN7_14.h
index db80c45eeefe..10e578496616 100644
--- a/Marlin/src/pins/sanguino/pins_GEN7_14.h
+++ b/Marlin/src/pins/sanguino/pins_GEN7_14.h
@@ -23,10 +23,8 @@
 
 /**
  * Gen7 v1.4 pin assignments
- * Schematic (1.4): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Gen7%20v1.4/Gen7Board%201.4%20Schematic.pdf
- * Origin (1.4): https://github.com/Traumflug/Generation_7_Electronics/blob/Gen7Board-1.4/release%20documents/Gen7Board%201.4%20Schematic.pdf
- * Schematic (1.4.1): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Gen7%20v1.4.1/Gen7Board%201.4.1%20Schematic.pdf
- * Origin (1.4.1): https://github.com/Traumflug/Generation_7_Electronics/blob/Gen7Board-1.4.1/release%20documents/Gen7Board%201.4.1%20Schematic.pdf
+ * Schematic (1.4): https://github.com/Traumflug/Generation_7_Electronics/blob/Gen7Board-1.4/release%20documents/Gen7Board%201.4%20Schematic.pdf
+ * Schematic (1.4.1): https://github.com/Traumflug/Generation_7_Electronics/blob/Gen7Board-1.4.1/release%20documents/Gen7Board%201.4.1%20Schematic.pdf
  */
 
 /**
diff --git a/Marlin/src/pins/sanguino/pins_MELZI.h b/Marlin/src/pins/sanguino/pins_MELZI.h
index a0c7050a9111..27df72d92226 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI.h
@@ -23,8 +23,7 @@
 
 /**
  * Melzi pin assignments
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Melzi/schematic.pdf
- * Origin: https://github.com/mosfet/melzi/blob/master/melzi.sch
+ * Schematic: https://github.com/mosfet/melzi/blob/master/melzi.sch
  */
 
 #ifndef BOARD_INFO_NAME
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h b/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
index f441523322e3..2915c77d70c9 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
@@ -23,8 +23,7 @@
 
 /**
  * Melzi (Creality) pin assignments
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Melzi%20(Creality)/CR-10%20Schematic.pdf
- * Origin: https://github.com/Creality3DPrinting/CR10-Melzi-1.1.2/blob/master/Circuit%20diagram/Motherboard/CR-10%20Schematic.pdf
+ * Schematic: https://github.com/Creality3DPrinting/CR10-Melzi-1.1.2/blob/master/Circuit%20diagram/Motherboard/CR-10%20Schematic.pdf
  * ATmega1284P
  *
  * The Creality board needs a bootloader installed before Marlin can be uploaded.
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_V2.h b/Marlin/src/pins/sanguino/pins_MELZI_V2.h
index b48e77a5c367..d90cd01af2c8 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_V2.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_V2.h
@@ -23,8 +23,7 @@
 
 /**
  * Melzi V2.0 as found at https://www.reprap.org/wiki/Melzi
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Melzi%20V2/Melzi-circuit.png
- * Origin: https://www.reprap.org/mediawiki/images/7/7d/Melzi-circuit.png
+ * Schematic: https://www.reprap.org/mediawiki/images/7/7d/Melzi-circuit.png
  *
  * ATmega644P
  */
diff --git a/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h b/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
index bee2a30e44ab..a381088ecf90 100644
--- a/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
+++ b/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
@@ -23,16 +23,11 @@
 
 /**
  * Sanguinololu board pin assignments
- * Schematic (0.1): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Sanguinololu%20v0.1/schematic.png
- * Origin (0.1): https://github.com/mosfet/Sanguinololu/blob/master/rev0.1/sanguinololu.sch
- * Schematic (0.6): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Sanguinololu%20v0.6/schematic.jpg
- * Origin (0.6): https://github.com/mosfet/Sanguinololu/blob/master/rev0.6/images/schematic.jpg
- * Schematic (0.7): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Sanguinololu%20v0.7/schematic.jpg
- * Origin (0.7): https://github.com/mosfet/Sanguinololu/blob/master/rev0.7/images/schematic.jpg
- * Schematic (1.0): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Sanguinololu%20v1.0/Sanguinololu-schematic.jpg
- * Origin (1.0): https://reprap.org/wiki/File:Sanguinololu-schematic.jpg
- * Schematic (1.1): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Sanguinololu%20v1.1/schematic.png
- * Origin (1.1): https://github.com/mosfet/Sanguinololu/blob/master/rev1.1/sanguinololu.sch
+ * Schematic (0.1): https://github.com/mosfet/Sanguinololu/blob/master/rev0.1/sanguinololu.sch
+ * Schematic (0.6): https://github.com/mosfet/Sanguinololu/blob/master/rev0.6/images/schematic.jpg
+ * Schematic (0.7): https://github.com/mosfet/Sanguinololu/blob/master/rev0.7/images/schematic.jpg
+ * Schematic (1.0): https://reprap.org/wiki/File:Sanguinololu-schematic.jpg
+ * Schematic (1.1): https://github.com/mosfet/Sanguinololu/blob/master/rev1.1/sanguinololu.sch
  */
 
 /**
diff --git a/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_12.h b/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_12.h
index 37d1e7030b42..a86f2382dbc2 100644
--- a/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_12.h
+++ b/Marlin/src/pins/sanguino/pins_SANGUINOLOLU_12.h
@@ -23,12 +23,9 @@
 
 /**
  * Sanguinololu V1.2 pin assignments
- * Schematic (1.2): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Sanguinololu%20v1.2/schematic.png
- * Origin (1.2): https://github.com/mosfet/Sanguinololu/blob/master/rev1.2/sanguinololu.sch
- * Schematic (1.3): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Sanguinololu%20v1.3/schematic.png
- * Origin (1.3): https://github.com/mosfet/Sanguinololu/blob/master/rev1.3/sanguinololu.sch
- * Schematic (1.3a): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Sanguinololu%20v1.3a/schematic.png
- * Origin (1.3a): https://github.com/mosfet/Sanguinololu/blob/master/rev1.3a/sanguinololu.sch
+ * Schematic (1.2): https://github.com/mosfet/Sanguinololu/blob/master/rev1.2/sanguinololu.sch
+ * Schematic (1.3): https://github.com/mosfet/Sanguinololu/blob/master/rev1.3/sanguinololu.sch
+ * Schematic (1.3a): https://github.com/mosfet/Sanguinololu/blob/master/rev1.3a/sanguinololu.sch
  *
  * Applies to the following boards:
  *
diff --git a/Marlin/src/pins/sanguino/pins_ZMIB_V2.h b/Marlin/src/pins/sanguino/pins_ZMIB_V2.h
index ade9c08aa045..39d55d1b2831 100644
--- a/Marlin/src/pins/sanguino/pins_ZMIB_V2.h
+++ b/Marlin/src/pins/sanguino/pins_ZMIB_V2.h
@@ -31,8 +31,7 @@
 
 /**
  * ZMIB pin assignments
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/ZONESTAR%20ZMIB%20V2/ZMIB_V2_Schmatic.pdf
- * Origin: https://github.com/ZONESTAR3D/Control-Board/blob/main/8bit/ZMIB/ZMIB%20V2/ZMIB_V2_Schmatic.pdf
+ * Schematic: https://github.com/ZONESTAR3D/Control-Board/blob/main/8bit/ZMIB/ZMIB%20V2/ZMIB_V2_Schmatic.pdf
  *
  * The ZMIB board needs a bootloader installed before Marlin can be uploaded.
  * If you don't have a chip programmer you can use a spare Arduino plus a few
diff --git a/Marlin/src/pins/stm32f4/pins_BLACKBEEZMINI.h b/Marlin/src/pins/stm32f4/pins_BLACKBEEZMINI.h
index 886dd092fb84..ead1ee5e05ba 100644
--- a/Marlin/src/pins/stm32f4/pins_BLACKBEEZMINI.h
+++ b/Marlin/src/pins/stm32f4/pins_BLACKBEEZMINI.h
@@ -29,8 +29,8 @@
 
 #include "env_validate.h"
 
-#ifndef DEFAULT_MACHINE_NAME
-  #define DEFAULT_MACHINE_NAME "I3DBEE BP_01"
+#ifndef BOARD_INFO_NAME
+  #define BOARD_INFO_NAME "I3DBEE BP_01"
 #endif
 
 #define TEMP_TIMER 5
@@ -97,7 +97,7 @@
 #define HEATER_0_PIN                        PA2   // HOTEND MOSFET
 #define HEATER_BED_PIN                      PA0   // BED MOSFET
 
-#define FAN1_PIN                            PA1   // FAN1 header on board - PRINT FAN
+#define FAN0_PIN                            PA1   // FAN1 header on board - PRINT FAN
 
 //
 // SD Card
diff --git a/Marlin/src/pins/teensy2/pins_5DPRINT.h b/Marlin/src/pins/teensy2/pins_5DPRINT.h
index 798f98dae509..1b1bbf122d87 100644
--- a/Marlin/src/pins/teensy2/pins_5DPRINT.h
+++ b/Marlin/src/pins/teensy2/pins_5DPRINT.h
@@ -64,8 +64,7 @@
 
 /**
  * 5DPrint D8 Driver board pin assignments
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/5DPrint%20D8/5DPD8_v1.0_OS_schematics.PDF
- * Origin: https://bitbucket.org/makible/5dprint-d8-controller-board/src/master/5DPD8_v1.0_OS_schematics.PDF
+ * Schematic: https://bitbucket.org/makible/5dprint-d8-controller-board/src/master/5DPD8_v1.0_OS_schematics.PDF
  *
  * https://bitbucket.org/makible/5dprint-d8-controller-board
  */
diff --git a/Marlin/src/pins/teensy2/pins_BRAINWAVE.h b/Marlin/src/pins/teensy2/pins_BRAINWAVE.h
index 900eae6dd49e..8bdd926dda2d 100644
--- a/Marlin/src/pins/teensy2/pins_BRAINWAVE.h
+++ b/Marlin/src/pins/teensy2/pins_BRAINWAVE.h
@@ -28,8 +28,7 @@
  * Requires hardware bundle for Arduino:
  * https://github.com/unrepentantgeek/brainwave-arduino
  *
- * Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Brainwave/schematic.pdf
- * Origin: https://github.com/unrepentantgeek/Brainwave/blob/master/brainwave/brainwave.sch
+ * Schematic: https://github.com/unrepentantgeek/Brainwave/blob/master/brainwave/brainwave.sch
  */
 
 /**
diff --git a/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h b/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h
index ab4427a8892d..f36ea66cf7a3 100644
--- a/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h
+++ b/Marlin/src/pins/teensy2/pins_PRINTRBOARD.h
@@ -26,14 +26,10 @@
  *
  *  Converted to Arduino pin numbering
  *
- *  Schematic (RevA): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Printrboard%20Rev.A/schematic.png
- *  Origin (RevA): https://raw.githubusercontent.com/lwalkera/printrboard/revA/Printrboard.sch
- *  Schematic (RevB): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Printrboard%20Rev.B/schematic.png
- *  Origin (RevB): https://raw.githubusercontent.com/lwalkera/printrboard/revB/Printrboard.sch
- *  Schematic (RevC): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Printrboard%20Rev.C/schematic.png
- *  Origin (RevC): https://raw.githubusercontent.com/lwalkera/printrboard/revC/Printrboard.sch
- *  Schematic (RevD): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Printrboard%20Rev.D/schematic.png
- *  Origin (RevD): https://raw.githubusercontent.com/lwalkera/printrboard/RevD/Printrboard.sch
+ *  Schematic (RevA): https://raw.githubusercontent.com/lwalkera/printrboard/revA/Printrboard.sch
+ *  Schematic (RevB): https://raw.githubusercontent.com/lwalkera/printrboard/revB/Printrboard.sch
+ *  Schematic (RevC): https://raw.githubusercontent.com/lwalkera/printrboard/revC/Printrboard.sch
+ *  Schematic (RevD): https://raw.githubusercontent.com/lwalkera/printrboard/RevD/Printrboard.sch
  */
 
 /**
diff --git a/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h b/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h
index 62922399d827..ef70d1a2cba2 100644
--- a/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h
+++ b/Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h
@@ -26,18 +26,12 @@
  *
  *  Converted to Arduino pin numbering
  *
- *  Schematic (RevF): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Printrboard%20Rev.F/schematic.png
- *  Origin (RevF): https://github.com/lwalkera/printrboard/raw/revF/Printrboard.sch
- *  Schematic (RevF2): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Printrboard%20Rev.F2/schematic.png
- *  Origin (RevF2): https://raw.githubusercontent.com/lwalkera/printrboard/revF2/Printrboard.sch
- *  Schematic (RevF3): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Printrboard%20Rev.F3/schematic.png
- *  Origin (RevF3): https://raw.githubusercontent.com/lwalkera/printrboard/revF3/Printrboard.sch
- *  Schematic (RevF4): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Printrboard%20Rev.F4/schematic.png
- *  Origin (RevF4): https://raw.githubusercontent.com/lwalkera/printrboard/revF4/Printrboard.sch
- *  Schematic (RevF5): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Printrboard%20Rev.F5/schematic.png
- *  Origin (RevF5): https://raw.githubusercontent.com/lwalkera/printrboard/revF5/Printrboard.sch
- *  Schematic (RevF6): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Printrboard%20Rev.F6/schematic.png
- *  Origin (RevF6): https://raw.githubusercontent.com/lwalkera/printrboard/revF6/Printrboard.sch
+ *  Schematic (RevF): https://github.com/lwalkera/printrboard/raw/revF/Printrboard.sch
+ *  Schematic (RevF2): https://raw.githubusercontent.com/lwalkera/printrboard/revF2/Printrboard.sch
+ *  Schematic (RevF3): https://raw.githubusercontent.com/lwalkera/printrboard/revF3/Printrboard.sch
+ *  Schematic (RevF4): https://raw.githubusercontent.com/lwalkera/printrboard/revF4/Printrboard.sch
+ *  Schematic (RevF5): https://raw.githubusercontent.com/lwalkera/printrboard/revF5/Printrboard.sch
+ *  Schematic (RevF6): https://raw.githubusercontent.com/lwalkera/printrboard/revF6/Printrboard.sch
  */
 
 /**
diff --git a/Marlin/src/pins/teensy2/pins_SAV_MKI.h b/Marlin/src/pins/teensy2/pins_SAV_MKI.h
index 9f590cbbb4e0..a0d056f85014 100644
--- a/Marlin/src/pins/teensy2/pins_SAV_MKI.h
+++ b/Marlin/src/pins/teensy2/pins_SAV_MKI.h
@@ -26,8 +26,7 @@
  *
  *  Converted to Arduino pin numbering
  *
- *  Schematic: https://green-candy.osdn.jp/external/MarlinFW/board_schematics/SAV%20MkI/SAV_MK-I.pdf
- *  Origin: https://reprap.org/mediawiki/images/3/3c/SAV_MK-I.pdf
+ *  Schematic: https://reprap.org/mediawiki/images/3/3c/SAV_MK-I.pdf
  */
 
 /**
diff --git a/Marlin/src/pins/teensy2/pins_TEENSYLU.h b/Marlin/src/pins/teensy2/pins_TEENSYLU.h
index a6a16f2be158..454aff91fcd8 100644
--- a/Marlin/src/pins/teensy2/pins_TEENSYLU.h
+++ b/Marlin/src/pins/teensy2/pins_TEENSYLU.h
@@ -25,8 +25,7 @@
  *
  *  Converted to Arduino pin numbering
  *
- *  Schematic (1.0): https://green-candy.osdn.jp/external/MarlinFW/board_schematics/Teensylu%20v1.0/schematic.png
- *  Origin (1.0): https://raw.githubusercontent.com/StephS/Teensylu/master/working/Teensylu-1.0.sch
+ *  Schematic (1.0): https://raw.githubusercontent.com/StephS/Teensylu/master/working/Teensylu-1.0.sch
  *  (*) Other versions are discouraged by creator.
  */
 
diff --git a/Marlin/src/tests/marlin_tests.cpp b/Marlin/src/tests/marlin_tests.cpp
index f61f840176f2..89e5664345d8 100644
--- a/Marlin/src/tests/marlin_tests.cpp
+++ b/Marlin/src/tests/marlin_tests.cpp
@@ -37,41 +37,6 @@
 // Startup tests are run at the end of setup()
 void runStartupTests() {
   // Call post-setup tests here to validate behaviors.
-
-  // String with cutoff at 20 chars:
-  // "F-string, 1234.50, 2"
-  SString<20> str20;
-  str20 = F("F-string, ");
-  str20.append(1234.5f).append(',').append(' ')
-       .append(2345.67).append(',').append(' ')
-       .echoln();
-
-  // Truncate to "F-string"
-  str20.trunc(8).echoln();
-
-  // 100 dashes, but chopped down to DEFAULT_MSTRING_SIZE (20)
-  TSS(repchr_t('-', 100)).echoln();
-
-  // Hello World!-123456------   <spaces!33
-  // ^ eol! ... 1234.50*2345.602 = 2895645.67
-  SString<100> str(F("Hello"));
-  str.append(F(" World!"));
-  str += '-';
-  str += uint8_t(123);
-  str += F("456");
-  str += repchr_t('-', 6);
-  str += Spaces(3);
-  str += "< spaces!";
-  str += int8_t(33);
-  str.eol();
-  str += "^ eol!";
-
-  str.append("...", 1234.5f, '*', p_float_t(2345.602, 3), F(" = "), 1234.5 * 2345.602).echoln();
-
-  // Print it again with SERIAL_ECHOLN
-  auto print_char_ptr = [](char * const str) { SERIAL_ECHOLN(str); };
-  print_char_ptr(str);
-
 }
 
 // Periodic tests are run from within loop()
diff --git a/Marlin/tests/README.md b/Marlin/tests/README.md
new file mode 100644
index 000000000000..883069f044bd
--- /dev/null
+++ b/Marlin/tests/README.md
@@ -0,0 +1,5 @@
+These test files are executed by the unit-tests built from the `<root>/test` folder.
+
+These are placed outside of the main PlatformIO test folder so we can collect all test files and compile them into multiple PlatformIO test binaries. This enables tests to be executed against a variety of Marlin configurations.
+
+To execute these tests, refer to the top-level Makefile.
diff --git a/Marlin/tests/core/test_macros.cpp b/Marlin/tests/core/test_macros.cpp
new file mode 100644
index 000000000000..235334292839
--- /dev/null
+++ b/Marlin/tests/core/test_macros.cpp
@@ -0,0 +1,1215 @@
+/**
+ * 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/>.
+ *
+ */
+
+#include "../test/unit_tests.h"
+#include <src/core/macros.h>
+
+// These represent enabled and disabled configuration options for testing.
+// They will be used by multiple tests.
+#define OPTION_ENABLED 1
+#define OPTION_DISABLED 0
+
+MARLIN_TEST(macros_bitwise_8, TEST) {
+  uint8_t odd_set = 0xAA;
+  uint8_t even_set = 0x55;
+  for (uint8_t b = 0; b < 8; ++b) {
+    TEST_ASSERT_EQUAL((b % 2) != 0, TEST(odd_set, b));
+    TEST_ASSERT_EQUAL((b % 2) == 0, TEST(even_set, b));
+  }
+}
+
+MARLIN_TEST(macros_bitwise_8, SET_BIT_TO) {
+  uint8_t n = 0x00;
+
+  // Test LSB
+  SET_BIT_TO(n, 0, true);
+  TEST_ASSERT_EQUAL(0x01, n);
+  SET_BIT_TO(n, 0, false);
+  TEST_ASSERT_EQUAL(0x00, n);
+
+  // Test MSB
+  SET_BIT_TO(n, 7, true);
+  TEST_ASSERT_EQUAL(0x80, n);
+  SET_BIT_TO(n, 7, false);
+  TEST_ASSERT_EQUAL(0x00, n);
+
+  // Test a bit in the middle
+  SET_BIT_TO(n, 3, true);
+  TEST_ASSERT_EQUAL(0x08, n);
+  SET_BIT_TO(n, 3, false);
+  TEST_ASSERT_EQUAL(0x00, n);
+}
+
+MARLIN_TEST(macros_bitwise_8, SBI) {
+  uint8_t n;
+
+  // Test LSB
+  n = 0x00;
+  SBI(n, 0);
+  TEST_ASSERT_EQUAL(0x01, n);
+
+  // Test MSB
+  n = 0x00;
+  SBI(n, 7);
+  TEST_ASSERT_EQUAL(0x80, n);
+
+  // Test a bit in the middle
+  n = 0x00;
+  SBI(n, 3);
+  TEST_ASSERT_EQUAL(0x08, n);
+}
+
+MARLIN_TEST(macros_bitwise_8, CBI) {
+  uint8_t n;
+
+  // Test LSB
+  n = 0xFF;
+  CBI(n, 0);
+  TEST_ASSERT_EQUAL(0xFE, n);
+
+  // Test MSB
+  n = 0xFF;
+  CBI(n, 7);
+  TEST_ASSERT_EQUAL(0x7F, n);
+
+  // Test a bit in the middle
+  n = 0xFF;
+  CBI(n, 3);
+  TEST_ASSERT_EQUAL(0xF7, n);
+}
+
+MARLIN_TEST(macros_bitwise_8, TBI) {
+  uint8_t n;
+
+  // Test LSB
+  n = 0xAA;
+  TBI(n, 0);
+  TEST_ASSERT_EQUAL(0xAB, n);
+
+  // Test MSB
+  n = 0xAA;
+  TBI(n, 7);
+  TEST_ASSERT_EQUAL(0x2A, n);
+
+  // Test a bit in the middle
+  n = 0xAA;
+  TBI(n, 3);
+  TEST_ASSERT_EQUAL(0xA2, n);
+}
+
+// 32-bit BIT operation tests
+// These verify the above macros, but specifically with the MSB of a uint32_t.
+// This ensures that the macros are not limited to 8-bit operations.
+
+MARLIN_TEST(macros_bitwise_32, TEST_32bit) {
+  uint32_t odd_set = 0x80000000;
+  uint32_t even_set = 0x00000000;
+  TEST_ASSERT_EQUAL(true, TEST(odd_set, 31));
+  TEST_ASSERT_EQUAL(false, TEST(even_set, 31));
+}
+
+MARLIN_TEST(macros_bitwise_32, SET_BIT_TO_32bit) {
+  uint32_t n = 0x00000000;
+
+  // Test MSB
+  SET_BIT_TO(n, 31, true);
+  TEST_ASSERT_EQUAL(0x80000000, n);
+  SET_BIT_TO(n, 31, false);
+  TEST_ASSERT_EQUAL(0x00000000, n);
+}
+
+MARLIN_TEST(macros_bitwise_32, SBI_32bit) {
+  uint32_t n = 0x00000000;
+
+  // Test MSB
+  SBI(n, 31);
+  TEST_ASSERT_EQUAL(0x80000000, n);
+}
+
+MARLIN_TEST(macros_bitwise_32, CBI_32bit) {
+  uint32_t n = 0xFFFFFFFF;
+
+  // Test MSB
+  CBI(n, 31);
+  TEST_ASSERT_EQUAL(0x7FFFFFFF, n);
+}
+
+MARLIN_TEST(macros_bitwise_32, TBI_32bit) {
+  uint32_t n = 0x7FFFFFFF;
+
+  // Test MSB
+  TBI(n, 31);
+  TEST_ASSERT_EQUAL(0xFFFFFFFF, n);
+}
+
+// Geometry macros
+MARLIN_TEST(macros_geometry, cu_int) {
+  TEST_ASSERT_EQUAL(8, cu(2));
+  TEST_ASSERT_EQUAL(27, cu(3));
+}
+
+MARLIN_TEST(macros_geometry, cu_float) {
+  TEST_ASSERT_FLOAT_WITHIN(0.001f, 8.615f, cu(2.05f));
+  TEST_ASSERT_FLOAT_WITHIN(0.001f, 28.094f, cu(3.04f));
+  TEST_ASSERT_FLOAT_WITHIN(0.001f, 13.998f, cu(2.41f));
+}
+
+MARLIN_TEST(macros_geometry, RADIANS) {
+  TEST_ASSERT_FLOAT_WITHIN(0.001f, float(M_PI), RADIANS(180.0f));
+  TEST_ASSERT_FLOAT_WITHIN(0.001f, 0.0f, RADIANS(0.0f));
+  TEST_ASSERT_FLOAT_WITHIN(0.001f, float(M_PI) / 4, RADIANS(45.0f));
+  TEST_ASSERT_FLOAT_WITHIN(0.001f, float(M_PI) / 2, RADIANS(90.0f));
+  TEST_ASSERT_FLOAT_WITHIN(0.001f, 3 * float(M_PI) / 2, RADIANS(270.0f));
+  TEST_ASSERT_FLOAT_WITHIN(0.001f, 4 * float(M_PI), RADIANS(720.0f));
+}
+
+MARLIN_TEST(macros_geometry, DEGREES) {
+  TEST_ASSERT_FLOAT_WITHIN(0.001f, 180.0f, DEGREES(float(M_PI)));
+  TEST_ASSERT_FLOAT_WITHIN(0.001f, 0.0f, DEGREES(0.0f));
+  TEST_ASSERT_FLOAT_WITHIN(0.001f, 45.0f, DEGREES(float(M_PI) / 4));
+  TEST_ASSERT_FLOAT_WITHIN(0.001f, 90.0f, DEGREES(float(M_PI) / 2));
+  TEST_ASSERT_FLOAT_WITHIN(0.001f, 270.0f, DEGREES(3 * float(M_PI) / 2));
+  TEST_ASSERT_FLOAT_WITHIN(0.001f, 720.0f, DEGREES(4 * float(M_PI)));
+}
+
+MARLIN_TEST(macros_geometry, HYPOT2) {
+  TEST_ASSERT_EQUAL(25, HYPOT2(3, 4));
+  TEST_ASSERT_FLOAT_WITHIN(0.001f, 13.0f, HYPOT2(2.0f, 3.0f));
+  TEST_ASSERT_FLOAT_WITHIN(0.001f, 18.72f, HYPOT2(2.4f, 3.6f));
+}
+
+MARLIN_TEST(macros_geometry, NORMSQ) {
+  TEST_ASSERT_EQUAL(14, NORMSQ(1, 2, 3));
+  TEST_ASSERT_FLOAT_WITHIN(0.001f, 14.0f, NORMSQ(1.0f, 2.0f, 3.0f));
+  TEST_ASSERT_FLOAT_WITHIN(0.001f, 20.16f, NORMSQ(1.2f, 2.4f, 3.6f));
+}
+
+MARLIN_TEST(macros_geometry, CIRCLE_AREA) {
+  TEST_ASSERT_EQUAL(float(M_PI) * 4, CIRCLE_AREA(2));
+}
+
+MARLIN_TEST(macros_geometry, CIRCLE_CIRC) {
+  TEST_ASSERT_EQUAL(2 * float(M_PI) * 3, CIRCLE_CIRC(3));
+}
+
+MARLIN_TEST(macros_numeric, SIGN) {
+  TEST_ASSERT_EQUAL(1, SIGN(100));
+  TEST_ASSERT_EQUAL(-1, SIGN(-100));
+  TEST_ASSERT_EQUAL(0, SIGN(0));
+}
+
+MARLIN_TEST(macros_numeric, IS_POWER_OF_2) {
+  TEST_ASSERT_EQUAL(false, IS_POWER_OF_2(0));
+  TEST_ASSERT_EQUAL(true, IS_POWER_OF_2(1));
+  TEST_ASSERT_EQUAL(true, IS_POWER_OF_2(4));
+  TEST_ASSERT_EQUAL(false, IS_POWER_OF_2(5));
+  TEST_ASSERT_EQUAL(false, IS_POWER_OF_2(0x80000001));
+  TEST_ASSERT_EQUAL(true, IS_POWER_OF_2(0x80000000));
+}
+
+// Numeric constraints
+MARLIN_TEST(macros_numeric, NOLESS_int) {
+  // Scenario 1: Input was already acceptable
+  int a = 8;
+  NOLESS(a, 5);
+  TEST_ASSERT_EQUAL(8, a);
+
+  // Original scenario: Input was less than the limit
+  a = 5;
+  NOLESS(a, 10);
+  TEST_ASSERT_EQUAL(10, a);
+
+  // Scenario 2: Input is negative, and coerces to a positive number
+  a = -5;
+  NOLESS(a, 0);
+  TEST_ASSERT_EQUAL(0, a);
+
+  // Scenario 3: Input is negative, and coerces to another negative number
+  a = -10;
+  NOLESS(a, -5);
+  TEST_ASSERT_EQUAL(-5, a);
+}
+
+MARLIN_TEST(macros_numeric, NOLESS_uint) {
+  // Scenario 1: Input was already acceptable
+  unsigned int b = 8u;
+  NOLESS(b, 5u);
+  TEST_ASSERT_EQUAL(8u, b);
+
+  // Original scenario: Input was less than the limit
+  b = 5u;
+  NOLESS(b, 10u);
+  TEST_ASSERT_EQUAL(10u, b);
+}
+
+MARLIN_TEST(macros_numeric, NOLESS_float) {
+  // Scenario 1: Input was already acceptable
+  float c = 8.5f;
+  NOLESS(c, 5.5f);
+  TEST_ASSERT_EQUAL_FLOAT(8.5f, c);
+
+  // Original scenario: Input was less than the limit
+  c = 5.5f;
+  NOLESS(c, 10.5f);
+  TEST_ASSERT_EQUAL_FLOAT(10.5f, c);
+
+  // Scenario 2: Input is negative, and coerces to a positive number
+  c = -5.5f;
+  NOLESS(c, 5.0f);
+  TEST_ASSERT_EQUAL_FLOAT(5.0f, c);
+
+  // Scenario 3: Input is negative, and coerces to another negative number
+  c = -10.5f;
+  NOLESS(c, -5.5f);
+  TEST_ASSERT_EQUAL_FLOAT(-5.5f, c);
+  c = -5.5f;
+  NOLESS(c, -10.5f);
+  TEST_ASSERT_EQUAL_FLOAT(-5.5f, c);
+}
+
+MARLIN_TEST(macros_numeric, NOMORE_int) {
+  // Scenario 1: Input was already acceptable
+  int a = 8;
+  NOMORE(a, 10);
+  TEST_ASSERT_EQUAL(8, a);
+
+  // Original scenario: Input was more than the limit
+  a = 15;
+  NOMORE(a, 10);
+  TEST_ASSERT_EQUAL(10, a);
+
+  // Scenario 2: Input is positive, and coerces to a negative number
+  a = 5;
+  NOMORE(a, -2);
+  TEST_ASSERT_EQUAL(-2, a);
+
+  // Scenario 3: Input is negative, and coerces to another negative number
+  a = -5;
+  NOMORE(a, -10);
+  TEST_ASSERT_EQUAL(-10, a);
+}
+
+MARLIN_TEST(macros_numeric, NOMORE_uint) {
+  // Scenario 1: Input was already acceptable
+  unsigned int b = 8u;
+  NOMORE(b, 10u);
+  TEST_ASSERT_EQUAL(8u, b);
+
+  // Original scenario: Input was more than the limit
+  b = 15u;
+  NOMORE(b, 10u);
+  TEST_ASSERT_EQUAL(10u, b);
+}
+
+MARLIN_TEST(macros_numeric, NOMORE_float) {
+  // Scenario 1: Input was already acceptable
+  float c = 8.5f;
+  NOMORE(c, 10.5f);
+  TEST_ASSERT_EQUAL_FLOAT(8.5f, c);
+
+  // Original scenario: Input was more than the limit
+  c = 15.5f;
+  NOMORE(c, 10.5f);
+  TEST_ASSERT_EQUAL_FLOAT(10.5f, c);
+
+  // Scenario 2: Input is positive, and coerces to a negative number
+  c = 5.5f;
+  NOMORE(c, -1.7f);
+  TEST_ASSERT_EQUAL_FLOAT(-1.7f, c);
+
+  // Scenario 3: Input is negative, and coerces to another negative number
+  c = -5.5f;
+  NOMORE(c, -10.5f);
+  TEST_ASSERT_EQUAL_FLOAT(-10.5f, c);
+}
+
+MARLIN_TEST(macros_numeric, LIMIT_int) {
+  int a = 15;
+  LIMIT(a, 10, 20);
+  TEST_ASSERT_EQUAL(15, a);
+
+  a = 5;
+  LIMIT(a, 10, 20);
+  TEST_ASSERT_EQUAL(10, a);
+
+  a = 25;
+  LIMIT(a, 10, 20);
+  TEST_ASSERT_EQUAL(20, a);
+
+  // Scenario: Range is [-10, -5]
+  a = -8;
+  LIMIT(a, -10, -5);
+  TEST_ASSERT_EQUAL(-8, a);
+
+  a = -12;
+  LIMIT(a, -10, -5);
+  TEST_ASSERT_EQUAL(-10, a);
+
+  a = -3;
+  LIMIT(a, -10, -5);
+  TEST_ASSERT_EQUAL(-5, a);
+
+  // Scenario: Range is [-10, 5]
+  a = 0;
+  LIMIT(a, -10, 5);
+  TEST_ASSERT_EQUAL(0, a);
+
+  a = -12;
+  LIMIT(a, -10, 5);
+  TEST_ASSERT_EQUAL(-10, a);
+
+  a = 6;
+  LIMIT(a, -10, 5);
+  TEST_ASSERT_EQUAL(5, a);
+}
+
+MARLIN_TEST(macros_numeric, LIMIT_uint) {
+  unsigned int b = 15u;
+  LIMIT(b, 10u, 20u);
+  TEST_ASSERT_EQUAL(15u, b);
+
+  b = 5u;
+  LIMIT(b, 10u, 20u);
+  TEST_ASSERT_EQUAL(10u, b);
+
+  b = 25u;
+  LIMIT(b, 10u, 20u);
+  TEST_ASSERT_EQUAL(20u, b);
+}
+
+MARLIN_TEST(macros_numeric, LIMIT_float) {
+  float c = 15.5f;
+  LIMIT(c, 10.5f, 20.5f);
+  TEST_ASSERT_EQUAL_FLOAT(15.5f, c);
+
+  c = 5.5f;
+  LIMIT(c, 10.5f, 20.5f);
+  TEST_ASSERT_EQUAL_FLOAT(10.5f, c);
+
+  c = 25.5f;
+  LIMIT(c, 10.5f, 20.5f);
+  TEST_ASSERT_EQUAL_FLOAT(20.5f, c);
+
+  // Scenario: Range is [-10.5, -5.5]
+  c = -8.5f;
+  LIMIT(c, -10.5f, -5.5f);
+  TEST_ASSERT_EQUAL_FLOAT(-8.5f, c);
+
+  c = -12.5f;
+  LIMIT(c, -10.5f, -5.5f);
+  TEST_ASSERT_EQUAL_FLOAT(-10.5f, c);
+
+  c = -3.5f;
+  LIMIT(c, -10.5f, -5.5f);
+  TEST_ASSERT_EQUAL_FLOAT(-5.5f, c);
+
+  // Scenario: Range is [-10.5, 5.5]
+  c = 0.0f;
+  LIMIT(c, -10.5f, 5.5f);
+  TEST_ASSERT_EQUAL_FLOAT(0.0f, c);
+
+  c = -12.5f;
+  LIMIT(c, -10.5f, 5.5f);
+  TEST_ASSERT_EQUAL_FLOAT(-10.5f, c);
+
+  c = 6.5f;
+  LIMIT(c, -10.5f, 5.5f);
+  TEST_ASSERT_EQUAL_FLOAT(5.5f, c);
+}
+
+
+// Looping macros
+MARLIN_TEST(macros_looping, DO_macro) {
+  #define _M_1(A) (A)
+  int sum = DO(M, +, 1, 2, 3, 4, 5);
+  TEST_ASSERT_EQUAL(15, sum);
+
+  // Test with maximum number of arguments
+  sum = DO(M, +, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+           21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40);
+  TEST_ASSERT_EQUAL(820, sum);
+  #undef _M_1
+}
+
+// Configuration Options
+MARLIN_TEST(macros_options, ENABLED_DISABLED) {
+  #define OPTION_A
+  #define OPTION_B 1
+  #define OPTION_C true
+  #define OPTION_D 0
+  #define OPTION_E false
+  // #define OPTION_F
+
+  // Test ENABLED macro
+  TEST_ASSERT_TRUE(ENABLED(OPTION_A));
+  TEST_ASSERT_TRUE(ENABLED(OPTION_B));
+  TEST_ASSERT_TRUE(ENABLED(OPTION_C));
+  TEST_ASSERT_FALSE(ENABLED(OPTION_D));
+  TEST_ASSERT_FALSE(ENABLED(OPTION_E));
+  TEST_ASSERT_FALSE(ENABLED(OPTION_F));
+
+  // Test DISABLED macro
+  TEST_ASSERT_FALSE(DISABLED(OPTION_A));
+  TEST_ASSERT_FALSE(DISABLED(OPTION_B));
+  TEST_ASSERT_FALSE(DISABLED(OPTION_C));
+  TEST_ASSERT_TRUE(DISABLED(OPTION_D));
+  TEST_ASSERT_TRUE(DISABLED(OPTION_E));
+  TEST_ASSERT_TRUE(DISABLED(OPTION_F));
+
+  #undef OPTION_A
+  #undef OPTION_B
+  #undef OPTION_C
+  #undef OPTION_D
+  #undef OPTION_E
+}
+
+MARLIN_TEST(macros_options, ANY) {
+  TEST_ASSERT_TRUE(ANY(OPTION_DISABLED, OPTION_ENABLED, OPTION_DISABLED)); // Enabled option in the middle
+  TEST_ASSERT_TRUE(ANY(OPTION_ENABLED, OPTION_DISABLED, OPTION_DISABLED)); // Enabled option at the beginning
+  TEST_ASSERT_TRUE(ANY(OPTION_DISABLED, OPTION_DISABLED, OPTION_ENABLED)); // Enabled option at the end
+  TEST_ASSERT_FALSE(ANY(OPTION_DISABLED, OPTION_DISABLED, OPTION_DISABLED)); // All options disabled
+}
+
+MARLIN_TEST(macros_options, ALL) {
+  TEST_ASSERT_TRUE(ALL(OPTION_ENABLED, OPTION_ENABLED, OPTION_ENABLED)); // All options enabled
+  TEST_ASSERT_FALSE(ALL(OPTION_ENABLED, OPTION_DISABLED, OPTION_ENABLED)); // Disabled option in the middle
+  TEST_ASSERT_FALSE(ALL(OPTION_DISABLED, OPTION_ENABLED, OPTION_ENABLED)); // Disabled option at the beginning
+  TEST_ASSERT_FALSE(ALL(OPTION_ENABLED, OPTION_ENABLED, OPTION_DISABLED)); // Disabled option at the end
+  TEST_ASSERT_FALSE(ALL(OPTION_DISABLED, OPTION_DISABLED, OPTION_DISABLED)); // All options disabled
+}
+
+MARLIN_TEST(macros_options, NONE) {
+  TEST_ASSERT_FALSE(NONE(OPTION_ENABLED, OPTION_ENABLED, OPTION_ENABLED)); // All options enabled
+  TEST_ASSERT_FALSE(NONE(OPTION_ENABLED, OPTION_DISABLED, OPTION_ENABLED)); // Disabled option in the middle
+  TEST_ASSERT_FALSE(NONE(OPTION_DISABLED, OPTION_ENABLED, OPTION_ENABLED)); // Disabled option at the beginning
+  TEST_ASSERT_FALSE(NONE(OPTION_ENABLED, OPTION_ENABLED, OPTION_DISABLED)); // Disabled option at the end
+  TEST_ASSERT_TRUE(NONE(OPTION_DISABLED, OPTION_DISABLED, OPTION_DISABLED)); // All options disabled
+}
+
+MARLIN_TEST(macros_options, COUNT_ENABLED) {
+  TEST_ASSERT_EQUAL(3, COUNT_ENABLED(OPTION_ENABLED, OPTION_ENABLED, OPTION_ENABLED)); // All options enabled
+  TEST_ASSERT_EQUAL(2, COUNT_ENABLED(OPTION_ENABLED, OPTION_DISABLED, OPTION_ENABLED)); // Disabled option in the middle
+  TEST_ASSERT_EQUAL(2, COUNT_ENABLED(OPTION_DISABLED, OPTION_ENABLED, OPTION_ENABLED)); // Disabled option at the beginning
+  TEST_ASSERT_EQUAL(2, COUNT_ENABLED(OPTION_ENABLED, OPTION_ENABLED, OPTION_DISABLED)); // Disabled option at the end
+  TEST_ASSERT_EQUAL(0, COUNT_ENABLED(OPTION_DISABLED, OPTION_DISABLED, OPTION_DISABLED)); // All options disabled
+}
+
+MARLIN_TEST(macros_options, MANY) {
+  TEST_ASSERT_FALSE(MANY(OPTION_ENABLED, OPTION_DISABLED, OPTION_DISABLED)); // Only one option enabled
+  TEST_ASSERT_TRUE(MANY(OPTION_ENABLED, OPTION_ENABLED, OPTION_DISABLED)); // Two options enabled
+  TEST_ASSERT_TRUE(MANY(OPTION_ENABLED, OPTION_ENABLED, OPTION_ENABLED)); // All options enabled
+  TEST_ASSERT_FALSE(MANY(OPTION_DISABLED, OPTION_DISABLED, OPTION_DISABLED)); // No options enabled
+}
+
+
+// Ternary macros
+MARLIN_TEST(macros_options, TERN) {
+  TEST_ASSERT_EQUAL(1, TERN(OPTION_ENABLED, 1, 0)); // OPTION_ENABLED is enabled, so it should return '1'
+  TEST_ASSERT_EQUAL(0, TERN(OPTION_DISABLED, 1, 0)); // OPTION_DISABLED is disabled, so it should return '0'
+}
+
+MARLIN_TEST(macros_options, TERN0) {
+  TEST_ASSERT_EQUAL(1, TERN0(OPTION_ENABLED, 1)); // OPTION_ENABLED is enabled, so it should return '1'
+  TEST_ASSERT_EQUAL(0, TERN0(OPTION_DISABLED, 1)); // OPTION_DISABLED is disabled, so it should return '0'
+}
+
+MARLIN_TEST(macros_options, TERN1) {
+  TEST_ASSERT_EQUAL(0, TERN1(OPTION_ENABLED, 0)); // OPTION_ENABLED is enabled, so it should return '0'
+  TEST_ASSERT_EQUAL(1, TERN1(OPTION_DISABLED, 0)); // OPTION_DISABLED is disabled, so it should return '1'
+}
+
+MARLIN_TEST(macros_options, TERN_) {
+  TEST_ASSERT_EQUAL(-1, TERN_(OPTION_ENABLED, -)1); // OPTION_ENABLED is enabled, so it should return '1'
+  TEST_ASSERT_EQUAL(1, TERN_(OPTION_DISABLED, -)1); // OPTION_DISABLED is disabled, so it should return nothing
+}
+
+MARLIN_TEST(macros_options, IF_DISABLED) {
+  TEST_ASSERT_EQUAL(1, IF_DISABLED(OPTION_ENABLED, -)1); // OPTION_ENABLED is enabled, so it should return nothing
+  TEST_ASSERT_EQUAL(-1, IF_DISABLED(OPTION_DISABLED, -)1); // OPTION_DISABLED is disabled, so it should return '1'
+}
+
+MARLIN_TEST(macros_options, OPTITEM) {
+  int enabledArray[] = {OPTITEM(OPTION_ENABLED, 1, 2)};
+  int disabledArray[] = {OPTITEM(OPTION_DISABLED, 1, 2)};
+  TEST_ASSERT_EQUAL(2, sizeof(enabledArray) / sizeof(int)); // OPTION_ENABLED is enabled, so it should return an array of size 2
+  TEST_ASSERT_EQUAL(0, sizeof(disabledArray) / sizeof(int)); // OPTION_DISABLED is disabled, so it should return an array of size 0
+}
+
+MARLIN_TEST(macros_options, OPTARG) {
+  int enabledArgs[] = {0 OPTARG(OPTION_ENABLED, 1, 2)};
+  int disabledArgs[] = {0 OPTARG(OPTION_DISABLED, 1, 2)};
+  
+  int sumEnabledArgs = 0;
+  for (const auto& arg : enabledArgs) {
+    sumEnabledArgs += arg;
+  }
+
+  int sumDisabledArgs = 0;
+  for (const auto& arg : disabledArgs) {
+    sumDisabledArgs += arg;
+  }
+
+  TEST_ASSERT_EQUAL(3, sumEnabledArgs); // OPTION_ENABLED is enabled, so it should return 3
+  TEST_ASSERT_EQUAL(0, sumDisabledArgs); // OPTION_DISABLED is disabled, so it should return 0
+}
+
+MARLIN_TEST(macros_options, OPTCODE) {
+  int enabledCode = 0; OPTCODE(OPTION_ENABLED, enabledCode = 1);
+  int disabledCode = 0; OPTCODE(OPTION_DISABLED, disabledCode = 1);
+  TEST_ASSERT_EQUAL(1, enabledCode); // OPTION_ENABLED is enabled, so it should return 1
+  TEST_ASSERT_EQUAL(0, disabledCode); // OPTION_DISABLED is disabled, so it should return 0
+}
+
+MARLIN_TEST(macros_optional_math, PLUS_TERN0) {
+  int enabledPlus = 5 PLUS_TERN0(OPTION_ENABLED, 2);
+  int disabledPlus = 5 PLUS_TERN0(OPTION_DISABLED, 2);
+  TEST_ASSERT_EQUAL(7, enabledPlus); // OPTION_ENABLED is enabled, so it should return 7
+  TEST_ASSERT_EQUAL(5, disabledPlus); // OPTION_DISABLED is disabled, so it should return 5
+}
+
+MARLIN_TEST(macros_optional_math, MINUS_TERN0) {
+  int enabledMinus = 5 MINUS_TERN0(OPTION_ENABLED, 2);
+  int disabledMinus = 5 MINUS_TERN0(OPTION_DISABLED, 2);
+  TEST_ASSERT_EQUAL(3, enabledMinus); // OPTION_ENABLED is enabled, so it should return 3
+  TEST_ASSERT_EQUAL(5, disabledMinus); // OPTION_DISABLED is disabled, so it should return 5
+}
+
+MARLIN_TEST(macros_optional_math, MUL_TERN1) {
+  int enabledMul = 5 MUL_TERN1(OPTION_ENABLED, 2);
+  int disabledMul = 5 MUL_TERN1(OPTION_DISABLED, 2);
+  TEST_ASSERT_EQUAL(10, enabledMul); // OPTION_ENABLED is enabled, so it should return 10
+  TEST_ASSERT_EQUAL(5, disabledMul); // OPTION_DISABLED is disabled, so it should return 5
+}
+
+MARLIN_TEST(macros_optional_math, DIV_TERN1) {
+  int enabledDiv = 10 DIV_TERN1(OPTION_ENABLED, 2);
+  int disabledDiv = 10 DIV_TERN1(OPTION_DISABLED, 2);
+  TEST_ASSERT_EQUAL(5, enabledDiv); // OPTION_ENABLED is enabled, so it should return 5
+  TEST_ASSERT_EQUAL(10, disabledDiv); // OPTION_DISABLED is disabled, so it should return 10
+}
+
+MARLIN_TEST(macros_optional_math, SUM_TERN) {
+  int enabledSum = SUM_TERN(OPTION_ENABLED, 5, 2);
+  int disabledSum = SUM_TERN(OPTION_DISABLED, 5, 2);
+  TEST_ASSERT_EQUAL(7, enabledSum); // OPTION_ENABLED is enabled, so it should return 7
+  TEST_ASSERT_EQUAL(5, disabledSum); // OPTION_DISABLED is disabled, so it should return 5
+}
+
+MARLIN_TEST(macros_optional_math, DIFF_TERN) {
+  int enabledDiff = DIFF_TERN(OPTION_ENABLED, 5, 2);
+  int disabledDiff = DIFF_TERN(OPTION_DISABLED, 5, 2);
+  TEST_ASSERT_EQUAL(3, enabledDiff); // OPTION_ENABLED is enabled, so it should return 3
+  TEST_ASSERT_EQUAL(5, disabledDiff); // OPTION_DISABLED is disabled, so it should return 5
+}
+
+MARLIN_TEST(macros_optional_math, MUL_TERN) {
+  int enabledMul = MUL_TERN(OPTION_ENABLED, 5, 2);
+  int disabledMul = MUL_TERN(OPTION_DISABLED, 5, 2);
+  TEST_ASSERT_EQUAL(10, enabledMul); // OPTION_ENABLED is enabled, so it should return 10
+  TEST_ASSERT_EQUAL(5, disabledMul); // OPTION_DISABLED is disabled, so it should return 5
+}
+
+MARLIN_TEST(macros_optional_math, DIV_TERN) {
+  int enabledDiv = DIV_TERN(OPTION_ENABLED, 10, 2);
+  int disabledDiv = DIV_TERN(OPTION_DISABLED, 10, 2);
+  TEST_ASSERT_EQUAL(5, enabledDiv); // OPTION_ENABLED is enabled, so it should return 5
+  TEST_ASSERT_EQUAL(10, disabledDiv); // OPTION_DISABLED is disabled, so it should return 10
+}
+
+// Mock pin definitions
+#define PIN1_PIN 1
+#define PIN2_PIN 2
+#define PIN3_PIN -1
+
+MARLIN_TEST(macros_pins, PIN_EXISTS) {
+  // Test PIN_EXISTS macro
+  int pin1_exists, pin2_exists, pin3_exists, pin4_exists;
+
+  #if PIN_EXISTS(PIN1)
+    pin1_exists = 1;
+  #else
+    pin1_exists = 0;
+  #endif
+
+  #if PIN_EXISTS(PIN2)
+    pin2_exists = 1;
+  #else
+    pin2_exists = 0;
+  #endif
+
+  #if PIN_EXISTS(PIN3)
+    pin3_exists = 1;
+  #else
+    pin3_exists = 0;
+  #endif
+
+  #if PIN_EXISTS(PIN4)
+    pin4_exists = 1;
+  #else
+    pin4_exists = 0;
+  #endif
+
+  TEST_ASSERT_TRUE(pin1_exists);
+  TEST_ASSERT_TRUE(pin2_exists);
+  TEST_ASSERT_FALSE(pin3_exists);
+  TEST_ASSERT_FALSE(pin4_exists);
+}
+
+MARLIN_TEST(macros_pins, PINS_EXIST) {
+  // Test PINS_EXIST macro
+  int pins1_2_exist, pins1_3_exist;
+
+  #if PINS_EXIST(PIN1, PIN2)
+    pins1_2_exist = 1;
+  #else
+    pins1_2_exist = 0;
+  #endif
+
+  #if PINS_EXIST(PIN1, PIN3)
+    pins1_3_exist = 1;
+  #else
+    pins1_3_exist = 0;
+  #endif
+
+  TEST_ASSERT_TRUE(pins1_2_exist);
+  TEST_ASSERT_FALSE(pins1_3_exist);
+}
+
+MARLIN_TEST(macros_pins, ANY_PIN) {
+  // Test ANY_PIN macro
+  int any_pin1_3, any_pin3_4;
+
+  #if ANY_PIN(PIN1, PIN3)
+    any_pin1_3 = 1;
+  #else
+    any_pin1_3 = 0;
+  #endif
+
+  #if ANY_PIN(PIN3, PIN4)
+    any_pin3_4 = 1;
+  #else
+    any_pin3_4 = 0;
+  #endif
+
+  TEST_ASSERT_TRUE(any_pin1_3);
+  TEST_ASSERT_FALSE(any_pin3_4);
+}
+
+// Undefine mock pin definitions
+#undef PIN1_PIN
+#undef PIN2_PIN
+#undef PIN3_PIN
+
+
+// Mock button definitions
+#define BTN_BUTTON1 1
+#define BTN_BUTTON2 2
+#define BTN_BUTTON3 -1
+
+MARLIN_TEST(macros_buttons, BUTTON_EXISTS) {
+  // Test BUTTON_EXISTS macro
+  int button1_exists, button2_exists, button3_exists, button4_exists;
+
+  #if BUTTON_EXISTS(BUTTON1)
+    button1_exists = 1;
+  #else
+    button1_exists = 0;
+  #endif
+
+  #if BUTTON_EXISTS(BUTTON2)
+    button2_exists = 1;
+  #else
+    button2_exists = 0;
+  #endif
+
+  #if BUTTON_EXISTS(BUTTON3)
+    button3_exists = 1;
+  #else
+    button3_exists = 0;
+  #endif
+
+  #if BUTTON_EXISTS(BUTTON4)
+    button4_exists = 1;
+  #else
+    button4_exists = 0;
+  #endif
+
+  TEST_ASSERT_TRUE(button1_exists);
+  TEST_ASSERT_TRUE(button2_exists);
+  TEST_ASSERT_FALSE(button3_exists);
+  TEST_ASSERT_FALSE(button4_exists);
+}
+
+MARLIN_TEST(macros_buttons, BUTTONS_EXIST) {
+  // Test BUTTONS_EXIST macro
+  int buttons1_2_exist, buttons1_3_exist;
+
+  #if BUTTONS_EXIST(BUTTON1, BUTTON2)
+    buttons1_2_exist = 1;
+  #else
+    buttons1_2_exist = 0;
+  #endif
+
+  #if BUTTONS_EXIST(BUTTON1, BUTTON3)
+    buttons1_3_exist = 1;
+  #else
+    buttons1_3_exist = 0;
+  #endif
+
+  TEST_ASSERT_TRUE(buttons1_2_exist);
+  TEST_ASSERT_FALSE(buttons1_3_exist);
+}
+
+MARLIN_TEST(macros_buttons, ANY_BUTTON) {
+  // Test ANY_BUTTON macro
+  int any_button1_3, any_button3_4;
+
+  #if ANY_BUTTON(BUTTON1, BUTTON3)
+    any_button1_3 = 1;
+  #else
+    any_button1_3 = 0;
+  #endif
+
+  #if ANY_BUTTON(BUTTON3, BUTTON4)
+    any_button3_4 = 1;
+  #else
+    any_button3_4 = 0;
+  #endif
+
+  TEST_ASSERT_TRUE(any_button1_3);
+  TEST_ASSERT_FALSE(any_button3_4);
+}
+
+// Undefine mock button definitions
+#undef BTN_BUTTON1
+#undef BTN_BUTTON2
+#undef BTN_BUTTON3
+
+
+MARLIN_TEST(macros_value_functions, WITHIN) {
+  // Test WITHIN macro
+  TEST_ASSERT_TRUE(WITHIN(5, 1, 10)); // 5 is within 1 and 10
+  TEST_ASSERT_TRUE(WITHIN(1, 1, 10)); // Edge case: 1 is the lower limit
+  TEST_ASSERT_TRUE(WITHIN(10, 1, 10)); // Edge case: 10 is the upper limit
+  TEST_ASSERT_FALSE(WITHIN(0, 1, 10)); // Edge case: 0 is just below the lower limit
+  TEST_ASSERT_FALSE(WITHIN(11, 1, 10)); // Edge case: 11 is just above the upper limit
+  TEST_ASSERT_FALSE(WITHIN(15, 1, 10)); // 15 is not within 1 and 10
+}
+
+MARLIN_TEST(macros_value_functions, ISEOL) {
+  // Test ISEOL macro
+  TEST_ASSERT_TRUE(ISEOL('\n')); // '\n' is an end-of-line character
+  TEST_ASSERT_TRUE(ISEOL('\r')); // '\r' is an end-of-line character
+  TEST_ASSERT_FALSE(ISEOL('a')); // 'a' is not an end-of-line character
+}
+
+MARLIN_TEST(macros_value_functions, NUMERIC) {
+  // Test NUMERIC macro
+  TEST_ASSERT_TRUE(NUMERIC('0')); // Edge case: '0' is the lowest numeric character
+  TEST_ASSERT_TRUE(NUMERIC('5')); // '5' is a numeric character
+  TEST_ASSERT_TRUE(NUMERIC('9')); // Edge case: '9' is the highest numeric character
+  TEST_ASSERT_FALSE(NUMERIC('0' - 1)); // Edge case: '/' is just before '0' in ASCII
+  TEST_ASSERT_FALSE(NUMERIC('9' + 1)); // Edge case: ':' is just after '9' in ASCII
+  TEST_ASSERT_FALSE(NUMERIC('a')); // 'a' is not a numeric character
+}
+
+MARLIN_TEST(macros_value_functions, DECIMAL) {
+  // Test DECIMAL macro
+  TEST_ASSERT_TRUE(DECIMAL('0')); // Edge case: '0' is the lowest numeric character
+  TEST_ASSERT_TRUE(DECIMAL('5')); // '5' is a numeric character
+  TEST_ASSERT_TRUE(DECIMAL('9')); // Edge case: '9' is the highest numeric character
+  TEST_ASSERT_TRUE(DECIMAL('.')); // '.' is a decimal character
+  TEST_ASSERT_FALSE(DECIMAL('0' - 1)); // Edge case: '/' is just before '0' in ASCII
+  TEST_ASSERT_FALSE(DECIMAL('9' + 1)); // Edge case: ':' is just after '9' in ASCII
+  TEST_ASSERT_FALSE(DECIMAL('-')); // '-' is not a decimal character, but can appear in numbers
+  TEST_ASSERT_FALSE(DECIMAL('+')); // '+' is not a decimal character, but can appear in numbers
+  TEST_ASSERT_FALSE(DECIMAL('e')); // 'e' is not a decimal character, but can appear in scientific notation
+}
+
+MARLIN_TEST(macros_value_functions, HEXCHR) {
+  // Test HEXCHR macro
+  TEST_ASSERT_EQUAL(0, HEXCHR('0')); // Edge case: '0' is the lowest numeric character
+  TEST_ASSERT_EQUAL(9, HEXCHR('9')); // Edge case: '9' is the highest numeric character
+  TEST_ASSERT_EQUAL(10, HEXCHR('a')); // 'a' is a hex character with value 10
+  TEST_ASSERT_EQUAL(10, HEXCHR('A')); // 'A' is a hex character with value 10
+  TEST_ASSERT_EQUAL(15, HEXCHR('f')); // Edge case: 'f' is the highest lowercase hex character
+  TEST_ASSERT_EQUAL(15, HEXCHR('F')); // Edge case: 'F' is the highest uppercase hex character
+  TEST_ASSERT_EQUAL(-1, HEXCHR('g')); // 'g' is not a hex character
+}
+
+MARLIN_TEST(macros_value_functions, NUMERIC_SIGNED) {
+  // Test NUMERIC_SIGNED macro
+  TEST_ASSERT_TRUE(NUMERIC_SIGNED('0')); // Edge case: '0' is the lowest numeric character
+  TEST_ASSERT_TRUE(NUMERIC_SIGNED('5')); // '5' is a numeric character
+  TEST_ASSERT_TRUE(NUMERIC_SIGNED('9')); // Edge case: '9' is the highest numeric character
+  TEST_ASSERT_TRUE(NUMERIC_SIGNED('-')); // '-' is not a numeric character, but can appear in signed numbers
+  TEST_ASSERT_TRUE(NUMERIC_SIGNED('+')); // '+' is not a numeric character, but can appear in signed numbers
+  TEST_ASSERT_FALSE(NUMERIC_SIGNED('.')); // '.' is not a numeric character
+  TEST_ASSERT_FALSE(NUMERIC_SIGNED('0' - 1)); // Edge case: '/' is just before '0' in ASCII
+  TEST_ASSERT_FALSE(NUMERIC_SIGNED('9' + 1)); // Edge case: ':' is just after '9' in ASCII
+  TEST_ASSERT_FALSE(NUMERIC_SIGNED('e')); // 'e' is not a numeric character, but can appear in scientific notation
+}
+
+MARLIN_TEST(macros_value_functions, DECIMAL_SIGNED) {
+  // Test DECIMAL_SIGNED macro
+  TEST_ASSERT_TRUE(DECIMAL_SIGNED('0')); // Edge case: '0' is the lowest numeric character
+  TEST_ASSERT_TRUE(DECIMAL_SIGNED('5')); // '5' is a decimal character
+  TEST_ASSERT_TRUE(DECIMAL_SIGNED('9')); // Edge case: '9' is the highest numeric character
+  TEST_ASSERT_TRUE(DECIMAL_SIGNED('-')); // '-' is not a numeric character, but can appear in signed numbers
+  TEST_ASSERT_TRUE(DECIMAL_SIGNED('+')); // '+' is not a numeric character, but can appear in signed numbers
+  TEST_ASSERT_TRUE(DECIMAL_SIGNED('.')); // '.' is a decimal character
+  TEST_ASSERT_FALSE(DECIMAL_SIGNED('0' - 1)); // Edge case: '/' is just before '0' in ASCII
+  TEST_ASSERT_FALSE(DECIMAL_SIGNED('9' + 1)); // Edge case: ':' is just after '9' in ASCII
+  TEST_ASSERT_FALSE(DECIMAL_SIGNED('e')); // 'e' is not a decimal character, but can appear in scientific notation
+}
+
+MARLIN_TEST(macros_array, COUNT) {
+  // Test COUNT macro
+  int array[10];
+  TEST_ASSERT_EQUAL(10, COUNT(array)); // The array has 10 elements
+}
+
+MARLIN_TEST(macros_array, ZERO) {
+  // Test ZERO macro
+  int array[5] = {1, 2, 3, 4, 5};
+  ZERO(array);
+  for (auto& element : array) {
+    TEST_ASSERT_EQUAL(0, element);
+  }
+}
+
+MARLIN_TEST(macros_array, COPY) {
+  int array1[5] = {1, 2, 3, 4, 5};
+  int array2[5] = {0};
+  COPY(array2, array1);
+  for (const auto& element : array1) {
+    TEST_ASSERT_EQUAL(element, array2[&element - &array1[0]]); // All elements should be equal
+  }
+}
+
+MARLIN_TEST(macros_expansion, CODE_N) {
+  int a = 0;
+  CODE_N(0, a+=1, a+=2, a+=3, a+=4, a+=5, a+=6, a+=7, a+=8, a+=9, a+=10, a+=11, a+=12, a+=13, a+=14, a+=15, a+=16);
+  TEST_ASSERT_EQUAL(0, a);
+
+  a = 0;
+  CODE_N(1, a+=1, a+=2, a+=3, a+=4, a+=5, a+=6, a+=7, a+=8, a+=9, a+=10, a+=11, a+=12, a+=13, a+=14, a+=15, a+=16);
+  TEST_ASSERT_EQUAL(1, a);
+
+  a = 0;
+  CODE_N(2, a+=1, a+=2, a+=3, a+=4, a+=5, a+=6, a+=7, a+=8, a+=9, a+=10, a+=11, a+=12, a+=13, a+=14, a+=15, a+=16);
+  TEST_ASSERT_EQUAL(3, a);
+
+  a = 0;
+  CODE_N(16, a+=1, a+=2, a+=3, a+=4, a+=5, a+=6, a+=7, a+=8, a+=9, a+=10, a+=11, a+=12, a+=13, a+=14, a+=15, a+=16);
+  TEST_ASSERT_EQUAL(136, a);
+
+  // 16 is the highest number supported by the CODE_N macro
+}
+
+MARLIN_TEST(macros_expansion, GANG_N) {
+  TEST_ASSERT_EQUAL(0, 0 GANG_N(0, +1, +2, +3, +4, +5, +6, +7, +8, +9, +10, +11, +12, +13, +14, +15, +16));
+  TEST_ASSERT_EQUAL(1, 0 GANG_N(1, +1, +2, +3, +4, +5, +6, +7, +8, +9, +10, +11, +12, +13, +14, +15, +16));
+  TEST_ASSERT_EQUAL(3, 0 GANG_N(2, +1, +2, +3, +4, +5, +6, +7, +8, +9, +10, +11, +12, +13, +14, +15, +16));
+  TEST_ASSERT_EQUAL(136, 0 GANG_N(16, +1, +2, +3, +4, +5, +6, +7, +8, +9, +10, +11, +12, +13, +14, +15, +16));
+
+  // 16 is the highest number supported by the GANG_N macro
+}
+
+MARLIN_TEST(macros_expansion, GANG_N_1) {
+  // Count by twos to be sure it can't bass by returning N
+  TEST_ASSERT_EQUAL(0, 0 GANG_N_1(0, +2));
+  TEST_ASSERT_EQUAL(2, 0 GANG_N_1(1, +2));
+  TEST_ASSERT_EQUAL(4, 0 GANG_N_1(2, +2));
+  TEST_ASSERT_EQUAL(32, 0 GANG_N_1(16, +2));
+}
+
+MARLIN_TEST(macros_expansion, LIST_N) {
+  std::vector<int> expected, result;
+  int compare_size;
+
+  expected = {};
+  result = {LIST_N(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)};
+  TEST_ASSERT_EQUAL(expected.size(), result.size());
+  compare_size = _MIN(expected.size(), result.size());
+  for (int i = 0; i < compare_size; i++) {
+    TEST_ASSERT_EQUAL(expected[i], result[i]);
+  }
+
+  expected = {1};
+  result = {LIST_N(1, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)};
+  TEST_ASSERT_EQUAL(expected.size(), result.size());
+  compare_size = _MIN(expected.size(), result.size());
+  for (int i = 0; i < compare_size; i++) {
+    TEST_ASSERT_EQUAL(expected[i], result[i]);
+  }
+
+  expected = {1, 2};
+  result = {LIST_N(2, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)};
+  TEST_ASSERT_EQUAL(expected.size(), result.size());
+  compare_size = _MIN(expected.size(), result.size());
+  for (int i = 0; i < compare_size; i++) {
+    TEST_ASSERT_EQUAL(expected[i], result[i]);
+  }
+
+  expected = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
+  result = {LIST_N(16, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)};
+  TEST_ASSERT_EQUAL(expected.size(), result.size());
+  compare_size = _MIN(expected.size(), result.size());
+  for (int i = 0; i < compare_size; i++) {
+    TEST_ASSERT_EQUAL(expected[i], result[i]);
+  }
+}
+
+MARLIN_TEST(macros_expansion, LIST_N_1) {
+  std::vector<int> expected, result;
+  int compare_size;
+
+  expected = {};
+  result = {LIST_N_1(0, 1)};
+  TEST_ASSERT_EQUAL(expected.size(), result.size());
+  compare_size = _MIN(expected.size(), result.size());
+  for (int i = 0; i < compare_size; i++) {
+    TEST_ASSERT_EQUAL(expected[i], result[i]);
+  }
+
+  expected = {2};
+  result = {LIST_N_1(1, 2)};
+  TEST_ASSERT_EQUAL(expected.size(), result.size());
+  compare_size = _MIN(expected.size(), result.size());
+  for (int i = 0; i < compare_size; i++) {
+    TEST_ASSERT_EQUAL(expected[i], result[i]);
+  }
+
+  expected = {1, 1};
+  result = {LIST_N_1(2, 1)};
+  TEST_ASSERT_EQUAL(expected.size(), result.size());
+  compare_size = _MIN(expected.size(), result.size());
+  for (int i = 0; i < compare_size; i++) {
+    TEST_ASSERT_EQUAL(expected[i], result[i]);
+  }
+
+  expected = std::vector<int>(16, 1);
+  result = {LIST_N_1(16, 1)};
+  TEST_ASSERT_EQUAL(expected.size(), result.size());
+  compare_size = _MIN(expected.size(), result.size());
+  for (int i = 0; i < compare_size; i++) {
+    TEST_ASSERT_EQUAL(expected[i], result[i]);
+  }
+}
+
+MARLIN_TEST(macros_expansion, ARRAY_N) {
+  // Test ARRAY_N macro
+  std::array<int, 5> expected = {1, 2, 3, 4, 5};
+  std::array<int, 5> result = ARRAY_N(5, 1, 2, 3, 4, 5);
+  TEST_ASSERT_EQUAL(expected.size(), result.size());
+
+  std::array<int, 3> expected2 = {1, 2, 3};
+  std::array<int, 3> result2 = ARRAY_N(3, 1, 2, 3);
+  TEST_ASSERT_EQUAL(expected2.size(), result2.size());
+}
+
+MARLIN_TEST(macros_expansion, ARRAY_N_1) {
+  // Test ARRAY_N_1 macro
+  std::array<int, 5> expected = {2, 2, 2, 2, 2};
+  std::array<int, 5> result = ARRAY_N_1(5, 2);
+  TEST_ASSERT_EQUAL(expected.size(), result.size());
+
+  std::array<int, 3> expected2 = {1, 1, 1};
+  std::array<int, 3> result2 = ARRAY_N_1(3, 1);
+  TEST_ASSERT_EQUAL(expected2.size(), result2.size());
+}
+
+MARLIN_TEST(macros_math, CEILING) {
+  TEST_ASSERT_EQUAL(2, CEILING(3, 2));
+  TEST_ASSERT_EQUAL(5, CEILING(10, 2));
+  TEST_ASSERT_EQUAL(0, CEILING(0, 2));
+}
+
+MARLIN_TEST(macros_math, ABS) {
+  TEST_ASSERT_EQUAL(5, ABS(-5));
+  TEST_ASSERT_EQUAL(5, ABS(5));
+  TEST_ASSERT_EQUAL_FLOAT(5.5, ABS(-5.5));
+  TEST_ASSERT_EQUAL_FLOAT(5.5, ABS(5.5));
+}
+
+MARLIN_TEST(macros_float, UNEAR_ZERO) {
+  TEST_ASSERT_TRUE(UNEAR_ZERO(0.0000009f));
+  TEST_ASSERT_FALSE(UNEAR_ZERO(0.000001f));
+}
+
+MARLIN_TEST(macros_float, NEAR_ZERO) {
+  TEST_ASSERT_TRUE(NEAR_ZERO(0.0000001f));
+  TEST_ASSERT_TRUE(NEAR_ZERO(-0.0000001f));
+  TEST_ASSERT_FALSE(NEAR_ZERO(0.0000011f));
+  TEST_ASSERT_FALSE(NEAR_ZERO(-0.0000011f));
+}
+
+MARLIN_TEST(macros_float, NEAR) {
+  TEST_ASSERT_TRUE(NEAR(0.000001f, 0.000002f));
+  TEST_ASSERT_FALSE(NEAR(0.0000009f, 0.000002f));
+}
+
+MARLIN_TEST(macros_float, RECIPROCAL) {
+  TEST_ASSERT_EQUAL_FLOAT(1.0f, RECIPROCAL(1.0f));
+  TEST_ASSERT_EQUAL_FLOAT(0.0f, RECIPROCAL(0.0f));
+  TEST_ASSERT_EQUAL_FLOAT(2.0f, RECIPROCAL(0.5f));
+  TEST_ASSERT_EQUAL_FLOAT(-2.0f, RECIPROCAL(-0.5f));
+  TEST_ASSERT_EQUAL_FLOAT(0.0f, RECIPROCAL(0.0000001f));
+  TEST_ASSERT_EQUAL_FLOAT(0.0f, RECIPROCAL(-0.0000001f));
+}
+
+MARLIN_TEST(macros_float, FIXFLOAT) {
+  TEST_ASSERT_EQUAL(0.0000005f, FIXFLOAT(0.0f));
+  TEST_ASSERT_EQUAL(-0.0000005f, FIXFLOAT(-0.0f));
+}
+
+MARLIN_TEST(macros_math, MATH_MACROS) {
+  // Sanity check of macros typically mapped to compiler functions
+  TEST_ASSERT_EQUAL_FLOAT(0.0f, ACOS(1.0f));
+  TEST_ASSERT_EQUAL_FLOAT(0.785398f, ATAN2(1.0f, 1.0f));
+  TEST_ASSERT_EQUAL_FLOAT(8.0f, POW(2.0f, 3.0f));
+  TEST_ASSERT_EQUAL_FLOAT(2.0f, SQRT(4.0f));
+  TEST_ASSERT_EQUAL_FLOAT(0.5f, RSQRT(4.0f));
+  TEST_ASSERT_EQUAL_FLOAT(2.0f, CEIL(1.5f));
+  TEST_ASSERT_EQUAL_FLOAT(1.0f, FLOOR(1.5f));
+  TEST_ASSERT_EQUAL_FLOAT(1.0f, TRUNC(1.5f));
+  TEST_ASSERT_EQUAL(2, LROUND(1.5f));
+  TEST_ASSERT_EQUAL_FLOAT(1.0f, FMOD(5.0f, 2.0f));
+  TEST_ASSERT_EQUAL_FLOAT(5.0f, HYPOT(3.0f, 4.0f));
+}
+
+MARLIN_TEST(macros_math, MIN_MAX) {
+  // _MIN tests
+  TEST_ASSERT_EQUAL(-1, _MIN(-1, 0));
+  TEST_ASSERT_EQUAL(-1, _MIN(0, -1));
+  TEST_ASSERT_EQUAL(-1, _MIN(-1, 1));
+  TEST_ASSERT_EQUAL(-1, _MIN(1, -1));
+  TEST_ASSERT_EQUAL(-1, _MIN(-1, -1));
+  TEST_ASSERT_EQUAL(1, _MIN(1, 1));
+  TEST_ASSERT_EQUAL_FLOAT(-1.5f, _MIN(-1.5f, 0.5f));
+  TEST_ASSERT_EQUAL_FLOAT(-1.5f, _MIN(0.5f, -1.5f));
+
+  // _MAX tests
+  TEST_ASSERT_EQUAL(0, _MAX(-1, 0));
+  TEST_ASSERT_EQUAL(0, _MAX(0, -1));
+  TEST_ASSERT_EQUAL(1, _MAX(-1, 1));
+  TEST_ASSERT_EQUAL(1, _MAX(1, -1));
+  TEST_ASSERT_EQUAL(-1, _MAX(-1, -1));
+  TEST_ASSERT_EQUAL(1, _MAX(1, 1));
+  TEST_ASSERT_EQUAL_FLOAT(0.5f, _MAX(-1.5f, 0.5f));
+  TEST_ASSERT_EQUAL_FLOAT(0.5f, _MAX(0.5f, -1.5f));
+}
+
+MARLIN_TEST(macros_math, INCREMENT) {
+  TEST_ASSERT_EQUAL(1, INCREMENT(0));
+  TEST_ASSERT_EQUAL(21, INCREMENT(20));
+  // 20 is the highest number supported by the INCREMENT macro
+}
+
+MARLIN_TEST(macros_math, ADD) {
+  // Test smallest add
+  TEST_ASSERT_EQUAL(0, ADD0(0));
+  TEST_ASSERT_EQUAL(10, ADD0(10));
+
+  // Test largest add
+  TEST_ASSERT_EQUAL(10, ADD10(0));
+  TEST_ASSERT_EQUAL(20, ADD10(10));
+}
+
+MARLIN_TEST(macros_math, SUM) {
+  // Test smallest sum
+  TEST_ASSERT_EQUAL(3, SUM(0, 3));
+  TEST_ASSERT_EQUAL(7, SUM(3, 4));
+
+  // Test largest sum
+  TEST_ASSERT_EQUAL(15, SUM(10, 5));
+  TEST_ASSERT_EQUAL(19, SUM(9, 10));
+}
+
+MARLIN_TEST(macros_math, DOUBLE) {
+  // Test double
+  TEST_ASSERT_EQUAL(0, DOUBLE(0));
+  TEST_ASSERT_EQUAL(2, DOUBLE(1));
+  TEST_ASSERT_EQUAL(4, DOUBLE(2));
+  TEST_ASSERT_EQUAL(20, DOUBLE(10));
+}
+
+MARLIN_TEST(macros_math, DECREMENT) {
+  TEST_ASSERT_EQUAL(0, DECREMENT(1));
+  TEST_ASSERT_EQUAL(14, DECREMENT(15));
+}
+
+MARLIN_TEST(macros_math, SUB) {
+  // Test smallest subtraction
+  TEST_ASSERT_EQUAL(0, SUB0(0));
+  TEST_ASSERT_EQUAL(10, SUB0(10));
+
+  // Test subtracting 1
+  TEST_ASSERT_EQUAL(0, SUB1(1));
+  TEST_ASSERT_EQUAL(5, SUB1(6));
+
+  // Test largest subtraction
+  TEST_ASSERT_EQUAL(0, SUB10(10));
+  TEST_ASSERT_EQUAL(5, SUB10(15));
+}
+
+
+// Define a helper macro for testing
+#define TEST_OP(i) ++counter;
+#define TEST_OP2(i, j) counter += j;
+
+MARLIN_TEST(macros_repeat, REPEAT) {
+  int counter = 0;
+  REPEAT(5, TEST_OP);
+  TEST_ASSERT_EQUAL(5, counter);
+}
+
+MARLIN_TEST(macros_repeat, REPEAT_1) {
+  int counter = 0;
+  REPEAT_1(5, TEST_OP);
+  TEST_ASSERT_EQUAL(5, counter);
+}
+
+MARLIN_TEST(macros_repeat, REPEAT2) {
+  int counter = 0;
+  REPEAT2(5, TEST_OP2, 1);
+  TEST_ASSERT_EQUAL(5, counter);
+}
+
+MARLIN_TEST(macros_repeat, RREPEAT) {
+  int counter = 0;
+  RREPEAT(5, TEST_OP);
+  TEST_ASSERT_EQUAL(5, counter);
+}
+
+MARLIN_TEST(macros_repeat, RREPEAT_1) {
+  int counter = 0;
+  RREPEAT_1(5, TEST_OP);
+  TEST_ASSERT_EQUAL(5, counter);
+}
+
+MARLIN_TEST(macros_repeat, RREPEAT2) {
+  int counter = 0;
+  RREPEAT2(5, TEST_OP2, 1);
+  TEST_ASSERT_EQUAL(5, counter);
+}
diff --git a/Marlin/tests/gcode/test_gcode.cpp b/Marlin/tests/gcode/test_gcode.cpp
new file mode 100644
index 000000000000..be364cb90550
--- /dev/null
+++ b/Marlin/tests/gcode/test_gcode.cpp
@@ -0,0 +1,58 @@
+/**
+ * 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/>.
+ *
+ */
+
+#include "../test/unit_tests.h"
+#include <src/gcode/gcode.h>
+#include <src/gcode/parser.h>
+
+MARLIN_TEST(gcode, process_parsed_command) {
+  GcodeSuite suite;
+  parser.command_letter = 'G';
+  parser.codenum = 0;
+  suite.process_parsed_command(false);
+}
+
+MARLIN_TEST(gcode, parse_g1_xz) {
+  char current_command[] = "G0 X10 Z30";
+  parser.command_letter = -128;
+  parser.codenum = -1;
+  parser.parse(current_command);
+  TEST_ASSERT_EQUAL('G', parser.command_letter);
+  TEST_ASSERT_EQUAL(0, parser.codenum);
+  TEST_ASSERT_TRUE(parser.seen('X'));
+  TEST_ASSERT_FALSE(parser.seen('Y'));
+  TEST_ASSERT_TRUE(parser.seen('Z'));
+  TEST_ASSERT_FALSE(parser.seen('E'));
+}
+
+MARLIN_TEST(gcode, parse_g1_nxz) {
+  char current_command[] = "N123 G0 X10 Z30";
+  parser.command_letter = -128;
+  parser.codenum = -1;
+  parser.parse(current_command);
+  TEST_ASSERT_EQUAL('G', parser.command_letter);
+  TEST_ASSERT_EQUAL(0, parser.codenum);
+  TEST_ASSERT_TRUE(parser.seen('X'));
+  TEST_ASSERT_FALSE(parser.seen('Y'));
+  TEST_ASSERT_TRUE(parser.seen('Z'));
+  TEST_ASSERT_FALSE(parser.seen('E'));
+}
diff --git a/Marlin/tests/runout/test_runout_sensor.cpp b/Marlin/tests/runout/test_runout_sensor.cpp
new file mode 100644
index 000000000000..2719446437fa
--- /dev/null
+++ b/Marlin/tests/runout/test_runout_sensor.cpp
@@ -0,0 +1,36 @@
+/**
+ * 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/>.
+ *
+ */
+
+#include "../test/unit_tests.h"
+
+#if ENABLED(FILAMENT_RUNOUT_SENSOR)
+
+#include <src/feature/runout.h>
+
+MARLIN_TEST(runout, poll_runout_states) {
+  FilamentSensorBase sensor;
+  // Expected default value is one bit set for each extruder
+  uint8_t expected = static_cast<uint8_t>(~(~0u << NUM_RUNOUT_SENSORS));
+  TEST_ASSERT_EQUAL(expected, sensor.poll_runout_states());
+}
+
+#endif
diff --git a/Marlin/tests/types/test_types.cpp b/Marlin/tests/types/test_types.cpp
new file mode 100644
index 000000000000..11ed19f4c3b1
--- /dev/null
+++ b/Marlin/tests/types/test_types.cpp
@@ -0,0 +1,160 @@
+/**
+ * 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/>.
+ *
+ */
+
+#include "../test/unit_tests.h"
+#include "src/core/types.h"
+
+MARLIN_TEST(types, XYval_const_as_bools) {
+  const XYval<int> xy_const_true = {1, 2};
+  TEST_ASSERT_TRUE(xy_const_true);
+
+  const XYval<int> xy_const_false = {0, 0};
+  TEST_ASSERT_FALSE(xy_const_false);
+}
+
+MARLIN_TEST(types, XYval_non_const_as_bools) {
+  XYval<int> xy_true = {1, 2};
+  TEST_ASSERT_TRUE(xy_true);
+
+  XYval<int> xy_false = {0, 0};
+  TEST_ASSERT_FALSE(xy_false);
+}
+
+MARLIN_TEST(types, XYZval_const_as_bools) {
+  const XYZval<int> xyz_const_true = {1, 2, 3};
+  TEST_ASSERT_TRUE(xyz_const_true);
+
+  const XYZval<int> xyz_const_false = {0, 0, 0};
+  TEST_ASSERT_FALSE(xyz_const_false);
+}
+
+MARLIN_TEST(types, XYZval_non_const_as_bools) {
+  XYZval<int> xyz_true = {1, 2, 3};
+  TEST_ASSERT_TRUE(xyz_true);
+
+  XYZval<int> xyz_false = {0, 0, 0};
+  TEST_ASSERT_FALSE(xyz_false);
+}
+
+MARLIN_TEST(types, XYZEval_const_as_bools) {
+  const XYZEval<int> xyze_const_true = {1, 2, 3, 4};
+  TEST_ASSERT_TRUE(xyze_const_true);
+
+  const XYZEval<int> xyze_const_false = {0, 0, 0, 0};
+  TEST_ASSERT_FALSE(xyze_const_false);
+}
+
+MARLIN_TEST(types, XYZEval_non_const_as_bools) {
+  XYZEval<int> xyze_true = {1, 2, 3, 4};
+  TEST_ASSERT_TRUE(xyze_true);
+
+  XYZEval<int> xyze_false = {0, 0, 0, 0};
+  TEST_ASSERT_FALSE(xyze_false);
+}
+
+MARLIN_TEST(types, Flags_const_as_bools) {
+  const Flags<32> flags_const_false = {0};
+  TEST_ASSERT_FALSE(flags_const_false);
+
+  const Flags<32> flags_const_true = {1};
+  TEST_ASSERT_TRUE(flags_const_true);
+}
+
+MARLIN_TEST(types, Flags_non_const_as_bools) {
+  Flags<32> flags_false = {0};
+  TEST_ASSERT_FALSE(flags_false);
+
+  Flags<32> flags_true = {1};
+  TEST_ASSERT_TRUE(flags_true);
+}
+
+MARLIN_TEST(types, AxisFlags_const_as_bools) {
+  const AxisFlags axis_flags_const_false = {0};
+  TEST_ASSERT_FALSE(axis_flags_const_false);
+
+  const AxisFlags axis_flags_const_true = {1};
+  TEST_ASSERT_TRUE(axis_flags_const_true);
+}
+
+MARLIN_TEST(types, AxisFlags_non_const_as_bools) {
+  AxisFlags axis_flags_false = {0};
+  TEST_ASSERT_FALSE(axis_flags_false);
+
+  AxisFlags axis_flags_true = {1};
+  TEST_ASSERT_TRUE(axis_flags_true);
+}
+
+MARLIN_TEST(types, AxisBits_const_as_bools) {
+  const AxisBits axis_bits_const_false = {0};
+  TEST_ASSERT_FALSE(axis_bits_const_false);
+
+  const AxisBits axis_bits_const_true = {1};
+  TEST_ASSERT_TRUE(axis_bits_const_true);
+}
+
+MARLIN_TEST(types, AxisBits_non_const_as_bools) {
+  AxisBits axis_bits_false = {0};
+  TEST_ASSERT_FALSE(axis_bits_false);
+
+  AxisBits axis_bits_true = {1};
+  TEST_ASSERT_TRUE(axis_bits_true);
+}
+
+MARLIN_TEST(types, MString1) {
+  // String with cutoff at 20 chars:
+  // "F-string, 1234.50, 2"
+  MString<20> str20;
+  str20 = F("F-string, ");
+  str20.append(1234.5f).append(',').append(' ')
+       .append(2345.67).append(',').append(' ');
+
+  TEST_ASSERT_TRUE(strcmp_P(str20, PSTR("F-string, 1234.50, 2")) == 0);
+
+  // Truncate to "F-string"
+  str20.trunc(8);
+
+  TEST_ASSERT_FALSE(strcmp_P(&str20, PSTR("F-string")) != 0);
+}
+
+MARLIN_TEST(types, MString2) {
+  // 100 dashes, but chopped down to DEFAULT_MSTRING_SIZE (20)
+  TEST_ASSERT_TRUE(TSS(repchr_t('-', 100)).length() == 20);
+}
+
+MARLIN_TEST(types, SString) {
+  // Hello World!-123456------   < spaces!33
+  // ^ eol! ... 1234.50*2345.602 = 2895645.67
+  SString<100> str(F("Hello"));
+  str.append(F(" World!"));
+  str += '-';
+  str += uint8_t(123);
+  str += F("456");
+  str += repchr_t('-', 6);
+  str += Spaces(3);
+  str += "< spaces!";
+  str += int8_t(33);
+  str.eol();
+  str += "^ eol!";
+  str.append(" ... ", 1234.5f, '*', p_float_t(2345.602, 3), F(" = "), 1234.5 * 2345.602);
+
+  TEST_ASSERT_TRUE(strcmp_P(str, PSTR("Hello World!-123456------   < spaces!33\n^ eol! ... 1234.50*2345.602 = 2895645.67")) == 0);
+}
diff --git a/README.md b/README.md
index 83614ad9ccef..373444a1649a 100644
--- a/README.md
+++ b/README.md
@@ -39,16 +39,16 @@ To build and upload Marlin you will use one of these tools:
 
 Marlin is optimized to build with the **PlatformIO IDE** extension for **Visual Studio Code**. You can still build Marlin with **Arduino IDE**, and we hope to improve the Arduino build experience, but at this time PlatformIO is the better choice.
 
+## 8-Bit AVR Boards
+
+We intend to continue supporting 8-bit AVR boards in perpetuity, maintaining a single codebase that can apply to all machines. We want casual hobbyists and tinkerers and owners of older machines to benefit from the community's innovations just as much as those with fancier machines. Plus, those old AVR-based machines are often the best for your testing and feedback!
+
 ## Hardware Abstraction Layer (HAL)
 
 Marlin includes an abstraction layer to provide a common API for all the platforms it targets. This allows Marlin code to address the details of motion and user interface tasks at the lowest and highest levels with no system overhead, tying all events directly to the hardware clock.
 
 Every new HAL opens up a world of hardware. At this time we need HALs for RP2040 and the Duet3D family of boards. A HAL that wraps an RTOS is an interesting concept that could be explored. Did you know that Marlin includes a Simulator that can run on Windows, macOS, and Linux? Join the Discord to help move these sub-projects forward!
 
-## 8-Bit AVR Boards
-
-A core tenet of this project is to keep supporting 8-bit AVR boards while also maintaining a single codebase that applies equally to all machines. We want casual hobbyists to benefit from the community's innovations as much as possible just as much as those with fancier machines. Plus, those old AVR-based machines are often the best for your testing and feedback!
-
 ### Supported Platforms
 
   Platform|MCU|Example Boards
@@ -71,22 +71,9 @@ A core tenet of this project is to keep supporting 8-bit AVR boards while also m
   [Teensy 4.1](https://www.pjrc.com/store/teensy41.html)|ARM® Cortex-M7|
   Linux Native|x86/ARM/etc.|Raspberry Pi
 
-## Submitting Patches
-
-Proposed patches should be submitted as a Pull Request against the ([bugfix-2.1.x](https://github.com/MarlinFirmware/Marlin/tree/bugfix-2.1.x)) branch.
-
-- This branch is for fixing bugs and integrating any new features for the duration of the Marlin 2.1.x life-cycle.
-- Follow the [Coding Standards](https://marlinfw.org/docs/development/coding_standards.html) to gain points with the maintainers.
-- Please submit Feature Requests and Bug Reports to the [Issue Queue](https://github.com/MarlinFirmware/Marlin/issues/new/choose). Support resources are also listed there.
-- Whenever you add new features, be sure to add tests to `buildroot/tests` and then run your tests locally, if possible.
-  - It's optional: Running all the tests on Windows might take a long time, and they will run anyway on GitHub.
-  - If you're running the tests on Linux (or on WSL with the code on a Linux volume) the speed is much faster.
-  - You can use `make tests-all-local` or `make tests-single-local TEST_TARGET=...`.
-  - If you prefer Docker you can use `make tests-all-local-docker` or `make tests-all-local-docker TEST_TARGET=...`.
-
 ## Marlin Support
 
-The Issue Queue is reserved for Bug Reports and Feature Requests. To get help with configuration and troubleshooting, please use the following resources:
+The Issue Queue is reserved for Bug Reports and Feature Requests. Please use the following resources for help with configuration and troubleshooting:
 
 - [Marlin Documentation](https://marlinfw.org) - Official Marlin documentation
 - [Marlin Discord](https://discord.gg/n5NJ59y) - Discuss issues with Marlin users and developers
@@ -95,59 +82,48 @@ The Issue Queue is reserved for Bug Reports and Feature Requests. To get help wi
 - Facebook Group ["Marlin Firmware for 3D Printers"](https://www.facebook.com/groups/3Dtechtalk/)
 - [Marlin Configuration](https://www.youtube.com/results?search_query=marlin+configuration) on YouTube
 
-## Contributors
-
-Marlin is constantly improving thanks to a huge number of contributors from all over the world bringing their specialties and talents. Huge thanks are due to [all the contributors](https://github.com/MarlinFirmware/Marlin/graphs/contributors) who regularly patch up bugs, help direct traffic, and basically keep Marlin from falling apart. Marlin's continued existence would not be possible without them.
-
-## Administration
+## Contributing Patches
 
-Regular users can open and close their own issues, but only the administrators can do project-related things like add labels, merge changes, set milestones, and kick trolls. The current Marlin admin team consists of:
+You can contribute patches by submitting a Pull Request to the ([bugfix-2.1.x](https://github.com/MarlinFirmware/Marlin/tree/bugfix-2.1.x)) branch.
 
-<table align="center">
-<tr><td>Project Maintainer</td></tr>
-<tr><td>
-
- 🇺🇸  **Scott Lahteine**
-       [@thinkyhead](https://github.com/thinkyhead)
-       [<kbd>  Donate 💸  </kbd>](https://www.thinkyhead.com/donate-to-marlin)
-
-</td><td>
-
- 🇺🇸  **Roxanne Neufeld**
-       [@Roxy-3D](https://github.com/Roxy-3D)
-
- 🇺🇸  **Keith Bennett**
-       [@thisiskeithb](https://github.com/thisiskeithb)
-       [<kbd>  Donate 💸  </kbd>](https://github.com/sponsors/thisiskeithb)
-
- 🇺🇸  **Jason Smith**
-       [@sjasonsmith](https://github.com/sjasonsmith)
-
-</td><td>
-
- 🇧🇷  **Victor Oliveira**
-       [@rhapsodyv](https://github.com/rhapsodyv)
-
- 🇬🇧  **Chris Pepper**
-       [@p3p](https://github.com/p3p)
-
-🇳🇿  **Peter Ellens**
-       [@ellensp](https://github.com/ellensp)
-       [<kbd>  Donate 💸  </kbd>](https://ko-fi.com/ellensp)
+- We use branches named with a "bugfix" or "dev" prefix to fix bugs and integrate new features.
+- Follow the [Coding Standards](https://marlinfw.org/docs/development/coding_standards.html) to gain points with the maintainers.
+- Please submit Feature Requests and Bug Reports to the [Issue Queue](https://github.com/MarlinFirmware/Marlin/issues/new/choose). See above for user support.
+- Whenever you add new features, be sure to add one or more build tests to `buildroot/tests`. Any tests added to a PR will be run within that PR on GitHub servers as soon as they are pushed. To minimize iteration be sure to run your new tests locally, if possible.
+  - Local build tests:
+    - All: `make tests-config-all-local`
+    - Single: `make tests-config-single-local TEST_TARGET=...`
+  - Local build tests in Docker:
+    - All: `make tests-config-all-local-docker`
+    - Single: `make tests-config-all-local-docker TEST_TARGET=...`
+  - To run all unit test suites:
+    - Using PIO: `platformio run -t test-marlin`
+    - Using Make: `make unit-test-all-local`
+    - Using Docker + make: `maker unit-test-all-local-docker`
+  - To run a single unit test suite:
+    - Using PIO: `platformio run -t marlin_<test-suite-name>`
+    - Using make: `make unit-test-single-local TEST_TARGET=<test-suite-name>`
+    - Using Docker + make: `maker unit-test-single-local-docker TEST_TARGET=<test-suite-name>`
+- If your feature can be unit tested, add one or more unit tests. For more information see our documentation on [Unit Tests](test).
 
-</td><td>
+## Contributors
 
- 🇺🇸  **Bob Kuhn**
-       [@Bob-the-Kuhn](https://github.com/Bob-the-Kuhn)
+Marlin is constantly improving thanks to a huge number of contributors from all over the world bringing their specialties and talents. Huge thanks are due to [all the contributors](https://github.com/MarlinFirmware/Marlin/graphs/contributors) who regularly patch up bugs, help direct traffic, and basically keep Marlin from falling apart. Marlin's continued existence would not be possible without them.
 
- 🇳🇱  **Erik van der Zalm**
-       [@ErikZalm](https://github.com/ErikZalm)
+## Project Leadership
 
-</td></tr>
-</table>
+Name|Role|Link|Donate
+----|----|----|----
+🇺🇸 Scott Lahteine|Project Lead|[[@thinkyhead](https://github.com/thinkyhead)]|[💸 Donate](https://marlinfw.org/docs/development/contributing.html#donate)
+🇺🇸 Roxanne Neufeld|Admin|[[@Roxy-3D](https://github.com/Roxy-3D)]|
+🇺🇸 Keith Bennett|Admin|[[@thisiskeithb](https://github.com/thisiskeithb)]|[💸 Donate](https://github.com/sponsors/thisiskeithb)
+🇺🇸 Jason Smith|Admin|[[@sjasonsmith](https://github.com/sjasonsmith)]|
+🇧🇷 Victor Oliveira|Admin|[[@rhapsodyv](https://github.com/rhapsodyv)]|
+🇬🇧 Chris Pepper|Admin|[[@p3p](https://github.com/p3p)]|
+🇳🇿 Peter Ellens|Admin|[[@ellensp](https://github.com/ellensp)]|[💸 Donate](https://ko-fi.com/ellensp)
+🇺🇸 Bob Kuhn|Admin|[[@Bob-the-Kuhn](https://github.com/Bob-the-Kuhn)]|
+🇳🇱 Erik van der Zalm|Founder|[[@ErikZalm](https://github.com/ErikZalm)]|
 
 ## License
 
 Marlin is published under the [GPL license](/LICENSE) because we believe in open development. The GPL comes with both rights and obligations. Whether you use Marlin firmware as the driver for your open or closed-source product, you must keep Marlin open, and you must provide your compatible Marlin source code to end users upon request. The most straightforward way to comply with the Marlin license is to make a fork of Marlin on Github, perform your modifications, and direct users to your modified fork.
-
-While we can't prevent the use of this code in products (3D printers, CNC, etc.) that are closed source or crippled by a patent, we would prefer that you choose another firmware or, better yet, make your own.
diff --git a/buildroot/bin/restore_configs b/buildroot/bin/restore_configs
index ea998484c243..51f72c579258 100755
--- a/buildroot/bin/restore_configs
+++ b/buildroot/bin/restore_configs
@@ -7,5 +7,5 @@ if [[ $1 == '-d' || $1 == '--default' ]]; then
 else
   git checkout Marlin/Configuration.h 2>/dev/null
   git checkout Marlin/Configuration_adv.h 2>/dev/null
-  git checkout Marlin/src/pins/ramps/pins_RAMPS.h 2>/dev/null
+  git checkout Marlin/src/pins/*/pins_*.h 2>/dev/null
 fi
diff --git a/buildroot/share/PlatformIO/scripts/collect-code-tests.py b/buildroot/share/PlatformIO/scripts/collect-code-tests.py
new file mode 100644
index 000000000000..a0e0e86b1176
--- /dev/null
+++ b/buildroot/share/PlatformIO/scripts/collect-code-tests.py
@@ -0,0 +1,59 @@
+#
+# collect-code-tests.py
+# Convenience script to collect all code tests. Used by env:linux_native_test in native.ini.
+#
+
+import pioutil
+if pioutil.is_pio_build():
+
+    import os, re
+    Import("env")
+    Import("projenv")
+
+    os.environ['PATH'] = f"./buildroot/bin/:./buildroot/tests/:{os.environ['PATH']}"
+
+    def collect_test_suites():
+        """Get all the test suites"""
+        from pathlib import Path
+        return sorted(list(Path("./test").glob("*.ini")))
+
+    def register_test_suites():
+        """Register all the test suites"""
+        targets = []
+        test_suites = collect_test_suites()
+        for path in test_suites:
+            name = re.sub(r'^\d+-|\.ini$', '', path.name)
+            targets += [name];
+
+            env.AddCustomTarget(
+                name = f"marlin_{name}",
+                dependencies = None,
+                actions = [
+                    f"echo ====== Configuring for marlin_{name} ======",
+                    "restore_configs",
+                    f"cp -f {path} ./Marlin/config.ini",
+                    "python ./buildroot/share/PlatformIO/scripts/configuration.py",
+                    f"platformio test -e linux_native_test -f {name}",
+                    "restore_configs",
+                ],
+                title = "Marlin: {}".format(name.lower().title().replace("_", " ")),
+                description = (
+                    f"Run a Marlin test suite, with the appropriate configuration, "
+                    f"that sits in {path}"
+                )
+            )
+
+        env.AddCustomTarget(
+            name = "test-marlin",
+            dependencies = None,
+            actions = [
+                f"platformio run -t marlin_{name} -e linux_native_test"
+                for name in targets
+            ],
+            title = "Marlin: Test all code test suites",
+            description = (
+                f"Run all Marlin code test suites ({len(targets)} found)."
+            ),
+        )
+
+    register_test_suites()
diff --git a/buildroot/share/PlatformIO/scripts/preflight-checks.py b/buildroot/share/PlatformIO/scripts/preflight-checks.py
index 2e4ab5c92d54..2a5f98dbbfc5 100644
--- a/buildroot/share/PlatformIO/scripts/preflight-checks.py
+++ b/buildroot/share/PlatformIO/scripts/preflight-checks.py
@@ -71,7 +71,9 @@ def sanity_check_target():
         config = env.GetProjectConfig()
         result = check_envs("env:"+build_env, board_envs, config)
 
-        if not result:
+        # Make sure board is compatible with the build environment. Skip for _test,
+        # since the board is manipulated as each unit test is executed.
+        if not result and build_env != "linux_native_test":
             err = "Error: Build environment '%s' is incompatible with %s. Use one of these environments: %s" % \
                   ( build_env, motherboard, ", ".join([ e[4:] for e in board_envs if e.startswith("env:") ]) )
             raise SystemExit(err)
diff --git a/buildroot/tests/STM32F103RE_creality b/buildroot/tests/STM32F103RE_creality
index 1fea3c963f02..44d818b62400 100755
--- a/buildroot/tests/STM32F103RE_creality
+++ b/buildroot/tests/STM32F103RE_creality
@@ -28,8 +28,9 @@ opt_disable DWIN_CREALITY_LCD Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN AUTO_BED_LEVELI
 opt_enable DWIN_LCD_PROUI INDIVIDUAL_AXIS_HOMING_SUBMENU SET_PROGRESS_MANUALLY SET_PROGRESS_PERCENT STATUS_MESSAGE_SCROLLING \
            SOUND_MENU_ITEM PRINTCOUNTER NOZZLE_PARK_FEATURE ADVANCED_PAUSE_FEATURE FILAMENT_RUNOUT_SENSOR \
            BLTOUCH Z_SAFE_HOMING AUTO_BED_LEVELING_UBL MESH_EDIT_MENU LCD_BED_TRAMMING \
-           LIMITED_MAX_FR_EDITING LIMITED_MAX_ACCEL_EDITING LIMITED_JERK_EDITING BAUD_RATE_GCODE
-opt_set PREHEAT_3_LABEL '"CUSTOM"' PREHEAT_3_TEMP_HOTEND 240 PREHEAT_3_TEMP_BED 60 PREHEAT_3_FAN_SPEED 128 BOOTSCREEN_TIMEOUT 1100
+           LIMITED_MAX_FR_EDITING LIMITED_MAX_ACCEL_EDITING LIMITED_JERK_EDITING BAUD_RATE_GCODE \
+           CASE_LIGHT_ENABLE CASE_LIGHT_MENU CASE_LIGHT_NO_BRIGHTNESS
+opt_set PREHEAT_3_LABEL '"CUSTOM"' PREHEAT_3_TEMP_HOTEND 240 PREHEAT_3_TEMP_BED 60 PREHEAT_3_FAN_SPEED 128 BOOTSCREEN_TIMEOUT 1100 CASE_LIGHT_PIN 4
 exec_test $1 $2 "Ender-3 S1 - ProUI (PIDTEMP)" "$3"
 
 restore_configs
diff --git a/ini/features.ini b/ini/features.ini
index 1100216867bb..cb3b96c402a2 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -243,7 +243,7 @@ HAS_FANMUX                             = build_src_filter=+<src/feature/fanmux.c
 FILAMENT_WIDTH_SENSOR                  = build_src_filter=+<src/feature/filwidth.cpp> +<src/gcode/feature/filwidth>
 FWRETRACT                              = build_src_filter=+<src/feature/fwretract.cpp> +<src/gcode/feature/fwretract>
 HOST_ACTION_COMMANDS                   = build_src_filter=+<src/feature/host_actions.cpp>
-HOTEND_IDLE_TIMEOUT                    = build_src_filter=+<src/feature/hotend_idle.cpp> +<src/gcode/temp/M86-M87.cpp>
+HOTEND_IDLE_TIMEOUT                    = build_src_filter=+<src/feature/hotend_idle.cpp> +<src/gcode/temp/M86_M87.cpp>
 JOYSTICK                               = build_src_filter=+<src/feature/joystick.cpp>
 BLINKM                                 = build_src_filter=+<src/feature/leds/blinkm.cpp>
 HAS_COLOR_LEDS                         = build_src_filter=+<src/feature/leds/leds.cpp> +<src/gcode/feature/leds/M150.cpp>
@@ -299,7 +299,7 @@ SD_ABORT_ON_ENDSTOP_HIT                = build_src_filter=+<src/gcode/config/M54
 BAUD_RATE_GCODE                        = build_src_filter=+<src/gcode/config/M575.cpp>
 HAS_SMART_EFF_MOD                      = build_src_filter=+<src/gcode/config/M672.cpp>
 COOLANT_CONTROL|AIR_ASSIST             = build_src_filter=+<src/gcode/control/M7-M9.cpp>
-AIR_EVACUATION                         = build_src_filter=+<src/gcode/control/M10-M11.cpp>
+AIR_EVACUATION                         = build_src_filter=+<src/gcode/control/M10_M11.cpp>
 HAS_SOFTWARE_ENDSTOPS                  = build_src_filter=+<src/gcode/control/M211.cpp>
 SERVO_DETACH_GCODE                     = build_src_filter=+<src/gcode/control/M282.cpp>
 HAS_DUPLICATION_MODE                   = build_src_filter=+<src/gcode/control/M605.cpp>
@@ -314,7 +314,6 @@ HAS_ZV_SHAPING                         = build_src_filter=+<src/gcode/feature/in
 GCODE_MACROS                           = build_src_filter=+<src/gcode/feature/macro>
 GRADIENT_MIX                           = build_src_filter=+<src/gcode/feature/mixing/M166.cpp>
 NONLINEAR_EXTRUSION                    = build_src_filter=+<src/gcode/feature/nonlinear>
-OTA_FIRMWARE_UPDATE                    = build_src_filter=+<src/gcode/feature/ota>
 HAS_SAVED_POSITIONS                    = build_src_filter=+<src/gcode/feature/pause/G60.cpp> +<src/gcode/feature/pause/G61.cpp>
 PARK_HEAD_ON_PAUSE                     = build_src_filter=+<src/gcode/feature/pause/M125.cpp>
 FILAMENT_LOAD_UNLOAD_GCODES            = build_src_filter=+<src/gcode/feature/pause/M701_M702.cpp>
@@ -340,6 +339,7 @@ TOUCH_SCREEN_CALIBRATION               = build_src_filter=+<src/gcode/lcd/M995.c
 ARC_SUPPORT                            = build_src_filter=+<src/gcode/motion/G2_G3.cpp>
 GCODE_MOTION_MODES                     = build_src_filter=+<src/gcode/motion/G80.cpp>
 BABYSTEPPING                           = build_src_filter=+<src/gcode/motion/M290.cpp> +<src/feature/babystep.cpp>
+OTA_FIRMWARE_UPDATE                    = build_src_filter=+<src/gcode/ota/M936.cpp>
 Z_PROBE_SLED                           = build_src_filter=+<src/gcode/probe/G31_G32.cpp>
 G38_PROBE_TARGET                       = build_src_filter=+<src/gcode/probe/G38.cpp>
 MAGNETIC_PARKING_EXTRUDER              = build_src_filter=+<src/gcode/probe/M951.cpp>
diff --git a/ini/hc32.ini b/ini/hc32.ini
index 9bf15447e2cd..2af761128cae 100644
--- a/ini/hc32.ini
+++ b/ini/hc32.ini
@@ -33,22 +33,14 @@ build_src_filter = ${common.default_src_filter} +<src/HAL/HC32> +<src/HAL/shared
 build_type       = release
 build_flags      =
   -D ARDUINO_ARCH_HC32
-  -D REDIRECT_PRINTF_TO_SERIAL              # Redirect core-provided printf to host serial
-  -D F_CPU=SYSTEM_CLOCK_FREQUENCIES.pclk1   # Override F_CPU to PCLK1, as marlin freaks out otherwise...
-  -D PLATFORM_M997_SUPPORT                  # Enable M997 command
+  -D PLATFORM_M997_SUPPORT  # Enable M997 command
+                            # note: ddl and arduino debug mode are 
+                            # automatically enabled with MARLIN_DEV_MODE
+  #-D __DEBUG               # force DDL debug mode
+  #-D __CORE_DEBUG          # force Arduino core debug mode
 
-  # DDL / Arduino Configuration
-  -D DISABLE_SERIAL_GLOBALS                 # Disable global Serial objects, we use our own
-  -D CORE_DISABLE_FAULT_HANDLER             # Disable arduino core fault handler (we use our own)
-
-  # DDL / Arduino Debug Options
-  #-D __DEBUG                               # DDL debug mode
-  #-D __CORE_DEBUG                          # Arduino core debug mode
-  -D PANIC_ENABLE                           # enable custom panic handlers (in MinSerial)
-  # options to reduce debug mode footprint (-16K; messages are less verbose)
-  -D __DEBUG_SHORT_FILENAMES                # Use short filenames in DDL debug output
-  -D __PANIC_SHORT_FILENAMES                # Use short filenames in core panic output
-  -D __OMIT_PANIC_MESSAGE                   # Omit panic messages in core panic output
+# hc32 app configuration file
+board_build.app_config = Marlin/src/HAL/HC32/app_config.h
 
 # Drivers and Middleware required by the HC32 HAL
 board_build.ddl.ots    = true
@@ -58,6 +50,11 @@ board_build.ddl.timer0 = true
 board_build.ddl.timera = true
 board_build.mw.sd_card = true
 
+# extra build flags
+board_build.flags.common =
+  -g3                     # Force emit debug symbols to elf. this does not affect the final binary size
+  -fno-signed-char        # Force unsigned chars. this is required for meatpack to work
+
 # Additional flags to reduce binary size
 board_build.flags.cpp =
   -fno-threadsafe-statics # Disable thread-safe statics (only one core anyway)
diff --git a/ini/native.ini b/ini/native.ini
index d07eaa22051e..9df621172d1b 100644
--- a/ini/native.ini
+++ b/ini/native.ini
@@ -15,13 +15,26 @@
 [env:linux_native]
 platform         = native
 framework        =
-build_flags      = -D__PLAT_LINUX__ -std=gnu++17 -ggdb -g -lrt -lpthread -D__MARLIN_FIRMWARE__ -Wno-expansion-to-defined
+build_flags      = ${common.build_flags} -D__PLAT_LINUX__ -std=gnu++17 -ggdb -g -lrt -lpthread -D__MARLIN_FIRMWARE__ -Wno-expansion-to-defined
 build_src_flags  = -Wall -IMarlin/src/HAL/LINUX/include
 build_unflags    = -Wall
 lib_ldf_mode     = off
-lib_deps         =
 build_src_filter = ${common.default_src_filter} +<src/HAL/LINUX>
 
+# Environment specifically for unit testing through the Makefile
+# This is somewhat unorthodox, in that it uses the PlatformIO Unity testing framework,
+# but actual targets are dynamically generated during the build. This seems to prevent
+# Unity from being automatically included, so it is added here.
+[env:linux_native_test]
+extends          = env:linux_native
+extra_scripts    = ${common.extra_scripts}
+                   post:buildroot/share/PlatformIO/scripts/collect-code-tests.py
+build_src_filter = ${env:linux_native.build_src_filter} +<tests>
+lib_deps         = throwtheswitch/Unity@^2.5.2
+test_build_src   = true
+build_unflags    = 
+build_flags      = ${env:linux_native.build_flags} -Werror
+
 #
 # Native Simulation
 # Builds with a small subset of available features
diff --git a/test/001-default.ini b/test/001-default.ini
new file mode 100644
index 000000000000..b98042cc2dcb
--- /dev/null
+++ b/test/001-default.ini
@@ -0,0 +1,8 @@
+# This file should remain empty except for the motherboard.
+# If changes are needed by tests, it should be performed in another configuration.
+
+[config:base]
+ini_use_config = base
+
+# Unit tests must use BOARD_SIMULATED to run natively in Linux
+motherboard = BOARD_SIMULATED
diff --git a/test/002-extruders_1_runout.ini b/test/002-extruders_1_runout.ini
new file mode 100644
index 000000000000..74afa0f02f21
--- /dev/null
+++ b/test/002-extruders_1_runout.ini
@@ -0,0 +1,18 @@
+#
+# Test configuration with a single extruder and a filament runout sensor
+#
+[config:base]
+ini_use_config             = base
+
+# Unit tests must use BOARD_SIMULATED to run natively in Linux
+motherboard                = BOARD_SIMULATED
+
+# Options to support runout sensors test
+filament_runout_sensor     = on
+fil_runout_pin             = 4  # dummy
+advanced_pause_feature     = on
+emergency_parser           = on
+nozzle_park_feature        = on
+
+# Option to support testing parsing with parentheses comments enabled
+paren_comments             = on
diff --git a/test/003-extruders_3_runout.ini b/test/003-extruders_3_runout.ini
new file mode 100644
index 000000000000..4bd91e8b7cae
--- /dev/null
+++ b/test/003-extruders_3_runout.ini
@@ -0,0 +1,32 @@
+#
+# Test configuration with three extruders and filament runout sensors
+#
+[config:base]
+ini_use_config             = base
+
+# Unit tests must use BOARD_SIMULATED to run natively in Linux
+motherboard                = BOARD_SIMULATED
+
+# Options to support runout sensor tests on three extruders.
+# Options marked "dummy" are simply required to pass sanity checks.
+extruders                  = 3
+temp_sensor_1              = 1
+temp_sensor_2              = 1
+temp_2_pin                 = 4 # dummy
+temp_3_pin                 = 4 # dummy
+heater_2_pin               = 4 # dummy
+e2_step_pin                = 4 # dummy
+e2_dir_pin                 = 4 # dummy
+e2_enable_pin              = 4 # dummy
+e3_step_pin                = 4 # dummy
+e3_dir_pin                 = 4 # dummy
+e3_enable_pin              = 4 # dummy
+num_runout_sensors         = 3
+filament_runout_sensor     = on
+fil_runout_pin             = 4 # dummy
+fil_runout2_pin            = 4 # dummy
+fil_runout3_pin            = 4 # dummy
+filament_runout_script     = "M600 %%c"
+advanced_pause_feature     = on
+emergency_parser           = on
+nozzle_park_feature        = on
diff --git a/test/README.md b/test/README.md
new file mode 100644
index 000000000000..19b4cd7d5949
--- /dev/null
+++ b/test/README.md
@@ -0,0 +1,40 @@
+# Testing Marlin
+
+Marlin included two types of automated tests:
+- [Build Tests](../buildroot/tests) to catch syntax and code build errors.
+- Unit Tests (this folder) to catch implementation errors.
+
+This document focuses on Unit tests.
+
+## Unit tests
+
+Unit testing allows for functional testing of Marlin logic on a local machine. This strategy is available to all developers, and will be able to be used on generic GitHub workers to automate testing. While PlatformIO does support the execution of unit tests on target controllers, that is not yet implemented and not really practical. This would require dedicated testing labs, and would be less broadly usable than testing directly on the development or build machine.
+
+Unit tests verify the behavior of small discrete sections of Marlin code. By thoroughly unit testing important parts of Marlin code, we effectively provide "guard rails" which will prevent major regressions in behavior. As long as all submissions go through the Pull Request process and execute automated checks, it is possible to catch most major issues prior to completion of a PR.
+
+## What unit tests can and can't do
+
+Unit tests can be used to validate the logic of single functions or whole features, as long as that function or feature doesn't depend on real hardware. So, for example, we can test whether a G-code command is parsed correctly and produces all the expected state changes, but we can't test whether a G-code triggered an endstop or the filament runout sensor without adding a new layer to simulate pins.
+
+Generally speaking, the types of errors caught by unit tests are most often caught in the initial process of writing the tests, and thereafter they shore up the codebase against regressions, especially in core classes and types, which can be very useful for refactoring.
+
+### Unit test FAQ
+
+#### Q: Isn't writing unit tests a lot of work?
+A: Yes, and it can be especially difficult with existing code that wasn't designed for unit testing. Some common sense should be used to decide where to employ unit testing, and at what level to perform it. While unit testing takes effort, it pays dividends in preventing regressions, and helping to pinpoint the source of failures when they do occur.
+
+#### Q: Will this make refactoring harder?
+A: Yes and No. Of course if you refactor code that unit tests use directly, it will have to be reworked as well. It actually can make refactoring more efficient, by providing assurance that the mechanism still works as intended.
+
+#### Q: How can I debug one of these failing unit tests?
+A: That's a great question, without a known immediate answer. It is likely possible to debug them interactively through PlatformIO, but that can at times take some creativity to configure. Unit tests are generally extremely small, so even without interactive debugging it can get you fairly close to the cause of the problem.
+
+### Unit test architecture
+We are currently using [PlatformIO unit tests](https://docs.platformio.org/en/latest/plus/unit-testing.html).
+
+Since Marlin only compiles code required by the configuration, a separate test binary must be generated for any configuration change. The following process is used to unit test a variety of configurations:
+
+1. This folder contains a set of INI configuration files (See `config.ini`), each containing a distinct set of configuration options for unit testing. All applicable unit tests will be run for each of these configurations.
+2. The `Marlin/tests` folder contains the CPP code for all Unit Tests. Marlin macros (`ENABLED(feature)`, `TERN(FEATURE, A, B)`, etc.) are used to determine which tests should be registered and to alter test behavior.
+3. The `linux_native_test` PlatformIO environment specifies a script to collect all the tests from this folder and add them to PlatformIO's list of test targets.
+4. Tests are built and executed by the `Makefile` commands `unit-test-all-local` or `unit-test-all-local-docker`.
diff --git a/test/unit_tests.cpp b/test/unit_tests.cpp
new file mode 100644
index 000000000000..e22aa529d0d4
--- /dev/null
+++ b/test/unit_tests.cpp
@@ -0,0 +1,53 @@
+/**
+ * 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/>.
+ *
+ */
+
+/**
+ * Provide the main() function used for all compiled unit test binaries.
+ * It collects all the tests defined in the code and runs them through Unity.
+ */
+
+#include "unit_tests.h"
+
+static std::list<MarlinTest*> all_marlin_tests;
+
+MarlinTest::MarlinTest(const std::string _name, const void(*_test)(), const char *_file, const int _line)
+: name(_name), test(_test), file(_file), line(_line) {
+  all_marlin_tests.push_back(this);
+}
+
+void MarlinTest::run() {
+  Unity.TestFile = file.c_str();
+  UnityDefaultTestRun((UnityTestFunction)test, name.c_str(), line);
+}
+
+void run_all_marlin_tests() {
+  for (const auto registration : all_marlin_tests) {
+    registration->run();
+  }
+}
+
+int main(int argc, char **argv) {
+  UNITY_BEGIN();
+  run_all_marlin_tests();
+  UNITY_END();
+  return 0;
+}
diff --git a/test/unit_tests.h b/test/unit_tests.h
new file mode 100644
index 000000000000..53bb64074a1f
--- /dev/null
+++ b/test/unit_tests.h
@@ -0,0 +1,74 @@
+/**
+ * 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
+
+#include <list>
+#include <string>
+#include <unity.h>
+
+// Include MarlinConfig so configurations are available to all tests
+#include "src/inc/MarlinConfig.h"
+
+/**
+ * Class that allows us to dynamically collect tests
+ */
+class MarlinTest {
+public:
+    MarlinTest(const std::string name, const void(*test)(), const char *_file, const int line);
+    /**
+     * Run the test via Unity
+     */
+    void run();
+
+    /**
+     * The name, a pointer to the function, and the line number. These are
+     * passed to the Unity test framework.
+     */
+    const std::string name;
+    const void(*test)();
+    const std::string file;
+    const int line;
+};
+
+/**
+ * Internal macros used by MARLIN_TEST
+ */
+#define _MARLIN_TEST_CLASS_NAME(SUITE, NAME) MarlinTestClass_##SUITE##_##NAME
+#define _MARLIN_TEST_INSTANCE_NAME(SUITE, NAME) MarlinTestClass_##SUITE##_##NAME##_instance
+
+/**
+ * Macro to define a test. This will create a class with the test body and
+ * register it with the global list of tests.
+ *
+ * Usage:
+ * MARLIN_TEST(test_suite_name, test_name) {
+ *  // Test body
+ * }
+ */
+#define MARLIN_TEST(SUITE, NAME) \
+    class _MARLIN_TEST_CLASS_NAME(SUITE, NAME) : public MarlinTest { \
+    public: \
+        _MARLIN_TEST_CLASS_NAME(SUITE, NAME)() : MarlinTest(#SUITE "___" #NAME, (const void(*)())&TestBody, __FILE__, __LINE__) {} \
+        static void TestBody(); \
+    }; \
+    const _MARLIN_TEST_CLASS_NAME(SUITE, NAME) _MARLIN_TEST_INSTANCE_NAME(SUITE, NAME); \
+    void _MARLIN_TEST_CLASS_NAME(SUITE, NAME)::TestBody()