diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4706bb5052454b017797e75b34eb86a807ecb3e3..cb8c31b22b52a5ac139a4a173b17cbb7b751eddd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -240,10 +240,10 @@ jobs:
build_marlin_pio ./ ${TEST_PLATFORM}
restore_configs
echo testing STM32F1 targets...
- export TEST_PLATFORM="-e STM32F1"
+ export TEST_PLATFORM="-e STM32F103R"
restore_configs
- echo use_example_configs STM32/STM32F10
- use_example_configs STM32/STM32F10
+ echo use_example_configs STM32/STM32F103R
+ use_example_configs STM32/STM32F103R
build_marlin_pio ./ ${TEST_PLATFORM}
restore_configs
echo use_example_configs STM32/stm32f103ret6
diff --git a/.travis.yml b/.travis.yml
index 06a8a0bae9d758681bede224f2bbff46e2bd3191..c2312c349e29eb8e68e5be81dfee25591d9fa383 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,37 +9,46 @@ notifications:
email: false
env:
- - TEST_PLATFORM="ARMED"
- #- TEST_PLATFORM="at90usb1286_cdc"
- #- TEST_PLATFORM="at90usb1286_dfu"
+ # Base Environments
- TEST_PLATFORM="DUE"
- TEST_PLATFORM="esp32"
- - TEST_PLATFORM="fysetc_f6_13"
- - TEST_PLATFORM="jgaurora_a5s_a1"
- TEST_PLATFORM="linux_native"
- TEST_PLATFORM="LPC1768"
- TEST_PLATFORM="LPC1769"
- #- TEST_PLATFORM="malyanm200"
- - TEST_PLATFORM="megaatmega1280"
- TEST_PLATFORM="megaatmega2560"
+ - TEST_PLATFORM="SAMD51_grandcentral_m4"
+ - TEST_PLATFORM="STM32F103R"
+ - TEST_PLATFORM="teensy31"
+ - TEST_PLATFORM="teensy35"
+
+ # Extended AVR Environments
+ - TEST_PLATFORM="fysetc_f6_13"
+ - TEST_PLATFORM="megaatmega1280"
+ - TEST_PLATFORM="rambo"
+ - TEST_PLATFORM="sanguino_atmega1284p"
+ - TEST_PLATFORM="sanguino_atmega644p"
+
+ # Extended STM32 Environments
+ - TEST_PLATFORM="ARMED"
+ - TEST_PLATFORM="BIGTREE_BTT002"
+ - TEST_PLATFORM="BIGTREE_SKR_PRO"
+ - TEST_PLATFORM="STM32F103R_bigtree"
+ - TEST_PLATFORM="jgaurora_a5s_a1"
+ - TEST_PLATFORM="STM32F103V_longer"
+ - TEST_PLATFORM="STM32F407VE_black"
+
+ # Non-working environment tests
+ #- TEST_PLATFORM="at90usb1286_cdc"
+ #- TEST_PLATFORM="at90usb1286_dfu"
+ #- TEST_PLATFORM="malyanm200"
#- TEST_PLATFORM="mks_robin"
#- TEST_PLATFORM="mks_robin_lite"
#- TEST_PLATFORM="mks_robin_mini"
#- TEST_PLATFORM="mks_robin_nano"
- - TEST_PLATFORM="rambo"
- - TEST_PLATFORM="adafruit_grandcentral_m4"
- - TEST_PLATFORM="sanguino_atmega1284p"
- - TEST_PLATFORM="sanguino_atmega644p"
- - TEST_PLATFORM="STM32F1"
- - TEST_PLATFORM="BIGTREE_SKR_MINI"
- #- TEST_PLATFORM="fysetc_STM32F1"
- - TEST_PLATFORM="alfawise_U20"
+ #- TEST_PLATFORM="STM32F103R_bigtree"
+ #- TEST_PLATFORM="STM32F103R_fysetc"
#- TEST_PLATFORM="STM32F4"
- - TEST_PLATFORM="black_stm32f407ve"
- - TEST_PLATFORM="BIGTREE_SKR_PRO"
#- TEST_PLATFORM="STM32F7"
- - TEST_PLATFORM="teensy31"
- - TEST_PLATFORM="teensy35"
before_install:
#
diff --git a/Marlin/src/HAL/HAL_AVR/HAL.h b/Marlin/src/HAL/HAL_AVR/HAL.h
index 807f21bb6bf15da0004c8bc6c09a12d6e953a355..7328aec2f149e1646667fa363a2b2eb8e49ef72f 100644
--- a/Marlin/src/HAL/HAL_AVR/HAL.h
+++ b/Marlin/src/HAL/HAL_AVR/HAL.h
@@ -20,9 +20,9 @@
#include "../shared/Marduino.h"
#include "../shared/HAL_SPI.h"
-#include "fastio_AVR.h"
-#include "watchdog_AVR.h"
-#include "math_AVR.h"
+#include "fastio.h"
+#include "watchdog.h"
+#include "math.h"
#ifdef USBCON
#include "HardwareSerial.h"
diff --git a/Marlin/src/HAL/HAL_AVR/HAL_spi_AVR.cpp b/Marlin/src/HAL/HAL_AVR/HAL_SPI.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/HAL_spi_AVR.cpp
rename to Marlin/src/HAL/HAL_AVR/HAL_SPI.cpp
diff --git a/Marlin/src/HAL/HAL_AVR/servo_AVR.cpp b/Marlin/src/HAL/HAL_AVR/Servo.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/servo_AVR.cpp
rename to Marlin/src/HAL/HAL_AVR/Servo.cpp
diff --git a/Marlin/src/HAL/HAL_AVR/fastio_AVR.cpp b/Marlin/src/HAL/HAL_AVR/fastio.cpp
similarity index 99%
rename from Marlin/src/HAL/HAL_AVR/fastio_AVR.cpp
rename to Marlin/src/HAL/HAL_AVR/fastio.cpp
index 8f79555f691eed879393645322830459b01f766d..f0f7688f1b06b47949ee87a7ec72b647e25ceea1 100644
--- a/Marlin/src/HAL/HAL_AVR/fastio_AVR.cpp
+++ b/Marlin/src/HAL/HAL_AVR/fastio.cpp
@@ -26,7 +26,7 @@
#ifdef __AVR__
-#include "fastio_AVR.h"
+#include "fastio.h"
#ifdef FASTIO_EXT_START
diff --git a/Marlin/src/HAL/HAL_AVR/fastio_AVR.h b/Marlin/src/HAL/HAL_AVR/fastio.h
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/fastio_AVR.h
rename to Marlin/src/HAL/HAL_AVR/fastio.h
diff --git a/Marlin/src/HAL/HAL_AVR/fastio/fastio_1280.h b/Marlin/src/HAL/HAL_AVR/fastio/fastio_1280.h
index ac2b650119fe1eb181699b15b8b967fb42004876..62de534d5371d5c9a5aa95f420f8d0c5eaec6f8a 100644
--- a/Marlin/src/HAL/HAL_AVR/fastio/fastio_1280.h
+++ b/Marlin/src/HAL/HAL_AVR/fastio/fastio_1280.h
@@ -29,7 +29,7 @@
* Logical Pin : 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 | 78 79 80 xx xx 84 85 71 70 xx xx xx xx xx 81 82 83 xx xx 72 72 75 76 77 74 xx xx xx xx xx
*/
-#include "../fastio_AVR.h"
+#include "../fastio.h"
// change for your board
#define DEBUG_LED DIO21
diff --git a/Marlin/src/HAL/HAL_AVR/fastio/fastio_1281.h b/Marlin/src/HAL/HAL_AVR/fastio/fastio_1281.h
index e3501f48494db92f8fcc28c555667c4b2ed4980c..e3d2f12851b9678a0b83c1b212d96a3384d2ee43 100644
--- a/Marlin/src/HAL/HAL_AVR/fastio/fastio_1281.h
+++ b/Marlin/src/HAL/HAL_AVR/fastio/fastio_1281.h
@@ -28,7 +28,7 @@
* Port: A0 A1 A2 A3 A4 A5 A6 A7 B0 B1 B2 B3 B4 B5 B6 B7 C0 C1 C2 C3 C4 C5 C6 C7 D0 D1 D2 D3 D4 D5 D6 D7 E0 E1 E2 E3 E4 E5 E6 E7 F0 F1 F2 F3 F4 F5 F6 F7 G0 G1 G2 G3 G4 G5
*/
-#include "../fastio_AVR.h"
+#include "../fastio.h"
// change for your board
#define DEBUG_LED DIO46
diff --git a/Marlin/src/HAL/HAL_AVR/fastio/fastio_168.h b/Marlin/src/HAL/HAL_AVR/fastio/fastio_168.h
index 32db8cae0c5ed5d927faba5e6728bbdc4f6e85f9..f6ee7a5d00168958db1df0260d5d7b87fb9cbfe5 100644
--- a/Marlin/src/HAL/HAL_AVR/fastio/fastio_168.h
+++ b/Marlin/src/HAL/HAL_AVR/fastio/fastio_168.h
@@ -28,7 +28,7 @@
* Port: B0 B1 B2 B3 B4 B5 C0 C1 C2 C3 C4 C5 C6 C7 D0 D1 D2 D3 D4 D5 D6 D7
*/
-#include "../fastio_AVR.h"
+#include "../fastio.h"
#define DEBUG_LED AIO5
diff --git a/Marlin/src/HAL/HAL_AVR/fastio/fastio_644.h b/Marlin/src/HAL/HAL_AVR/fastio/fastio_644.h
index 582c76f7e4ed75232f2b3409d16aff370b0a1879..180a3c4e32022ddb610f1198ce5eb10afc14ecfb 100644
--- a/Marlin/src/HAL/HAL_AVR/fastio/fastio_644.h
+++ b/Marlin/src/HAL/HAL_AVR/fastio/fastio_644.h
@@ -54,7 +54,7 @@
* +--------+
*/
-#include "../fastio_AVR.h"
+#include "../fastio.h"
#define DEBUG_LED DIO0
diff --git a/Marlin/src/HAL/HAL_AVR/fastio/fastio_AT90USB.h b/Marlin/src/HAL/HAL_AVR/fastio/fastio_AT90USB.h
index bd37f0599040ef0a83ac79d62745659eaa5e6c49..3f17a2e26109080a6cd7d1cb62cfe333cb960f2f 100644
--- a/Marlin/src/HAL/HAL_AVR/fastio/fastio_AT90USB.h
+++ b/Marlin/src/HAL/HAL_AVR/fastio/fastio_AT90USB.h
@@ -29,7 +29,7 @@
* The logical pins 46 and 47 are not supported by Teensyduino, but are supported below as E2 and E3
*/
-#include "../fastio_AVR.h"
+#include "../fastio.h"
// change for your board
#define DEBUG_LED DIO31 /* led D5 red */
diff --git a/Marlin/src/HAL/HAL_AVR/math_AVR.h b/Marlin/src/HAL/HAL_AVR/math.h
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/math_AVR.h
rename to Marlin/src/HAL/HAL_AVR/math.h
diff --git a/Marlin/src/HAL/HAL_AVR/watchdog_AVR.cpp b/Marlin/src/HAL/HAL_AVR/watchdog.cpp
similarity index 99%
rename from Marlin/src/HAL/HAL_AVR/watchdog_AVR.cpp
rename to Marlin/src/HAL/HAL_AVR/watchdog.cpp
index 3ea44e7dce765085ab38dc77ee1bdbedf0103b15..63a503196631ea2109e18372d12948a03fcf02b7 100644
--- a/Marlin/src/HAL/HAL_AVR/watchdog_AVR.cpp
+++ b/Marlin/src/HAL/HAL_AVR/watchdog.cpp
@@ -26,7 +26,7 @@
#if ENABLED(USE_WATCHDOG)
-#include "watchdog_AVR.h"
+#include "watchdog.h"
#include "../../Marlin.h"
diff --git a/Marlin/src/HAL/HAL_AVR/watchdog_AVR.h b/Marlin/src/HAL/HAL_AVR/watchdog.h
similarity index 100%
rename from Marlin/src/HAL/HAL_AVR/watchdog_AVR.h
rename to Marlin/src/HAL/HAL_AVR/watchdog.h
diff --git a/Marlin/src/HAL/HAL_DUE/DebugMonitor_Due.cpp b/Marlin/src/HAL/HAL_DUE/DebugMonitor.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/DebugMonitor_Due.cpp
rename to Marlin/src/HAL/HAL_DUE/DebugMonitor.cpp
diff --git a/Marlin/src/HAL/HAL_DUE/EepromEmulation_Due.cpp b/Marlin/src/HAL/HAL_DUE/EepromEmulation.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/EepromEmulation_Due.cpp
rename to Marlin/src/HAL/HAL_DUE/EepromEmulation.cpp
diff --git a/Marlin/src/HAL/HAL_DUE/HAL.h b/Marlin/src/HAL/HAL_DUE/HAL.h
index 7f45a964b6583defb8c902353aa62cedea997fab..514c7a2f72f083be08cc7e5a7c49424ed9a278cf 100644
--- a/Marlin/src/HAL/HAL_DUE/HAL.h
+++ b/Marlin/src/HAL/HAL_DUE/HAL.h
@@ -32,9 +32,9 @@
#include "../shared/Marduino.h"
#include "../shared/math_32bit.h"
#include "../shared/HAL_SPI.h"
-#include "fastio_Due.h"
-#include "watchdog_Due.h"
-#include "HAL_timers_Due.h"
+#include "fastio.h"
+#include "watchdog.h"
+#include "timers.h"
#include <stdint.h>
@@ -58,8 +58,8 @@
#define NUM_SERIAL 1
#endif
-#include "MarlinSerial_Due.h"
-#include "MarlinSerialUSB_Due.h"
+#include "MarlinSerial.h"
+#include "MarlinSerialUSB.h"
// On AVR this is in math.h?
#define square(x) ((x)*(x))
diff --git a/Marlin/src/HAL/HAL_DUE/HAL_spi_Due.cpp b/Marlin/src/HAL/HAL_DUE/HAL_SPI.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/HAL_spi_Due.cpp
rename to Marlin/src/HAL/HAL_DUE/HAL_SPI.cpp
diff --git a/Marlin/src/HAL/HAL_DUE/InterruptVectors_Due.cpp b/Marlin/src/HAL/HAL_DUE/InterruptVectors.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_DUE/InterruptVectors_Due.cpp
rename to Marlin/src/HAL/HAL_DUE/InterruptVectors.cpp
index c92736f69edc727964d017c56fc9c73008d9f547..f6061530db32dd64bb22d83f5a2d5e05f302ab39 100644
--- a/Marlin/src/HAL/HAL_DUE/InterruptVectors_Due.cpp
+++ b/Marlin/src/HAL/HAL_DUE/InterruptVectors.cpp
@@ -34,7 +34,7 @@
#include "../../inc/MarlinConfig.h"
#include "HAL.h"
-#include "InterruptVectors_Due.h"
+#include "InterruptVectors.h"
/* The relocated Exception/Interrupt Table - According to the ARM
reference manual, alignment to 128 bytes should suffice, but in
diff --git a/Marlin/src/HAL/HAL_DUE/InterruptVectors_Due.h b/Marlin/src/HAL/HAL_DUE/InterruptVectors.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/InterruptVectors_Due.h
rename to Marlin/src/HAL/HAL_DUE/InterruptVectors.h
diff --git a/Marlin/src/HAL/HAL_DUE/MarlinSerial_Due.cpp b/Marlin/src/HAL/HAL_DUE/MarlinSerial.cpp
similarity index 99%
rename from Marlin/src/HAL/HAL_DUE/MarlinSerial_Due.cpp
rename to Marlin/src/HAL/HAL_DUE/MarlinSerial.cpp
index db5c93d8b4517fbd16b830050ce634befc177147..6d9d2cbd03a58a31d6c631a25e4bb38035e94277 100644
--- a/Marlin/src/HAL/HAL_DUE/MarlinSerial_Due.cpp
+++ b/Marlin/src/HAL/HAL_DUE/MarlinSerial.cpp
@@ -29,8 +29,8 @@
#include "../../inc/MarlinConfig.h"
-#include "MarlinSerial_Due.h"
-#include "InterruptVectors_Due.h"
+#include "MarlinSerial.h"
+#include "InterruptVectors.h"
#include "../../Marlin.h"
template<typename Cfg> typename MarlinSerial<Cfg>::ring_buffer_r MarlinSerial<Cfg>::rx_buffer = { 0, 0, { 0 } };
diff --git a/Marlin/src/HAL/HAL_DUE/MarlinSerial_Due.h b/Marlin/src/HAL/HAL_DUE/MarlinSerial.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/MarlinSerial_Due.h
rename to Marlin/src/HAL/HAL_DUE/MarlinSerial.h
diff --git a/Marlin/src/HAL/HAL_DUE/MarlinSerialUSB_Due.cpp b/Marlin/src/HAL/HAL_DUE/MarlinSerialUSB.cpp
similarity index 99%
rename from Marlin/src/HAL/HAL_DUE/MarlinSerialUSB_Due.cpp
rename to Marlin/src/HAL/HAL_DUE/MarlinSerialUSB.cpp
index 58cc8460029dac182fb8fc157c89d88877bc1ed3..0aeec96c497cc0c8afc147b9e707829d52978e76 100644
--- a/Marlin/src/HAL/HAL_DUE/MarlinSerialUSB_Due.cpp
+++ b/Marlin/src/HAL/HAL_DUE/MarlinSerialUSB.cpp
@@ -31,7 +31,7 @@
#if SERIAL_PORT == -1
-#include "MarlinSerialUSB_Due.h"
+#include "MarlinSerialUSB.h"
#if ENABLED(EMERGENCY_PARSER)
#include "../../feature/emergency_parser.h"
diff --git a/Marlin/src/HAL/HAL_DUE/MarlinSerialUSB_Due.h b/Marlin/src/HAL/HAL_DUE/MarlinSerialUSB.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/MarlinSerialUSB_Due.h
rename to Marlin/src/HAL/HAL_DUE/MarlinSerialUSB.h
diff --git a/Marlin/src/HAL/HAL_DUE/Servo_Due.cpp b/Marlin/src/HAL/HAL_DUE/Servo.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/Servo_Due.cpp
rename to Marlin/src/HAL/HAL_DUE/Servo.cpp
diff --git a/Marlin/src/HAL/HAL_DUE/Tone.cpp b/Marlin/src/HAL/HAL_DUE/Tone.cpp
index b3d7e2169889e9bbc5379aed90046eacf667c775..2af97aac611f0f34052ae0fbbe8a40f863648758 100644
--- a/Marlin/src/HAL/HAL_DUE/Tone.cpp
+++ b/Marlin/src/HAL/HAL_DUE/Tone.cpp
@@ -31,7 +31,7 @@
#include "../../inc/MarlinConfig.h"
#include "HAL.h"
-#include "HAL_timers_Due.h"
+#include "timers.h"
static pin_t tone_pin;
volatile static int32_t toggles;
diff --git a/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp b/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp
index 8f9f745723c79e48c6ddc1767f81cd0ad3b5f44d..5e5a4e5fc1851c90598abb926d0886dbb41bf3e2 100644
--- a/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp
+++ b/Marlin/src/HAL/HAL_DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp
@@ -71,7 +71,7 @@ void spiSend(uint8_t b);
void spiSend(const uint8_t* buf, size_t n);
#include "../../shared/Marduino.h"
-#include "../fastio_Due.h"
+#include "../fastio.h"
void u8g_SetPIOutput_DUE_hw_spi(u8g_t *u8g, uint8_t pin_index) {
PIO_Configure(g_APinDescription[u8g->pin_list[pin_index]].pPort, PIO_OUTPUT_1,
diff --git a/Marlin/src/HAL/HAL_DUE/fastio_Due.h b/Marlin/src/HAL/HAL_DUE/fastio.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/fastio_Due.h
rename to Marlin/src/HAL/HAL_DUE/fastio.h
diff --git a/Marlin/src/HAL/HAL_DUE/HAL_timers_Due.cpp b/Marlin/src/HAL/HAL_DUE/timers.cpp
similarity index 99%
rename from Marlin/src/HAL/HAL_DUE/HAL_timers_Due.cpp
rename to Marlin/src/HAL/HAL_DUE/timers.cpp
index 64ca0ac0f19ade149c85c1a12cad97d312d1d457..57dd9f924f5e48e1ce5a3459efb225b6bac54541 100644
--- a/Marlin/src/HAL/HAL_DUE/HAL_timers_Due.cpp
+++ b/Marlin/src/HAL/HAL_DUE/timers.cpp
@@ -34,7 +34,7 @@
#include "../../inc/MarlinConfig.h"
#include "HAL.h"
-#include "HAL_timers_Due.h"
+#include "timers.h"
// ------------------------
// Local defines
diff --git a/Marlin/src/HAL/HAL_DUE/HAL_timers_Due.h b/Marlin/src/HAL/HAL_DUE/timers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/HAL_timers_Due.h
rename to Marlin/src/HAL/HAL_DUE/timers.h
diff --git a/Marlin/src/HAL/HAL_DUE/watchdog_Due.cpp b/Marlin/src/HAL/HAL_DUE/watchdog.cpp
similarity index 99%
rename from Marlin/src/HAL/HAL_DUE/watchdog_Due.cpp
rename to Marlin/src/HAL/HAL_DUE/watchdog.cpp
index f1df75eaa6f54fcc436e6ed71d5223bda6ce2ada..6d687bac40ea21d77a568fc398f69d77912cd46f 100644
--- a/Marlin/src/HAL/HAL_DUE/watchdog_Due.cpp
+++ b/Marlin/src/HAL/HAL_DUE/watchdog.cpp
@@ -24,7 +24,7 @@
#include "../../inc/MarlinConfig.h"
#include "../../Marlin.h"
-#include "watchdog_Due.h"
+#include "watchdog.h"
// Override Arduino runtime to either config or disable the watchdog
//
diff --git a/Marlin/src/HAL/HAL_DUE/watchdog_Due.h b/Marlin/src/HAL/HAL_DUE/watchdog.h
similarity index 100%
rename from Marlin/src/HAL/HAL_DUE/watchdog_Due.h
rename to Marlin/src/HAL/HAL_DUE/watchdog.h
diff --git a/Marlin/src/HAL/HAL_ESP32/HAL.cpp b/Marlin/src/HAL/HAL_ESP32/HAL.cpp
index 535e3b32699095c427cde71c66f28661ddf999e9..32bc4de30a8e871f2b1fa1a22e6c2b2f4b077544 100644
--- a/Marlin/src/HAL/HAL_ESP32/HAL.cpp
+++ b/Marlin/src/HAL/HAL_ESP32/HAL.cpp
@@ -23,7 +23,7 @@
#ifdef ARDUINO_ARCH_ESP32
#include "HAL.h"
-#include "HAL_timers_ESP32.h"
+#include "timers.h"
#include <rom/rtc.h>
#include <driver/adc.h>
#include <esp_adc_cal.h>
diff --git a/Marlin/src/HAL/HAL_ESP32/HAL.h b/Marlin/src/HAL/HAL_ESP32/HAL.h
index 467e5e0de5a74200a2d38417c9f0028a78334e4e..d77a698ec5d514f58fada383e784a7e8736fe332 100644
--- a/Marlin/src/HAL/HAL_ESP32/HAL.h
+++ b/Marlin/src/HAL/HAL_ESP32/HAL.h
@@ -30,11 +30,11 @@
#include "../shared/math_32bit.h"
#include "../shared/HAL_SPI.h"
-#include "fastio_ESP32.h"
-#include "watchdog_ESP32.h"
+#include "fastio.h"
+#include "watchdog.h"
#include "i2s.h"
-#include "HAL_timers_ESP32.h"
+#include "timers.h"
#include "WebSocketSerial.h"
#include "FlushableHardwareSerial.h"
diff --git a/Marlin/src/HAL/HAL_ESP32/HAL_spi_ESP32.cpp b/Marlin/src/HAL/HAL_ESP32/HAL_SPI.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/HAL_spi_ESP32.cpp
rename to Marlin/src/HAL/HAL_ESP32/HAL_SPI.cpp
diff --git a/Marlin/src/HAL/HAL_ESP32/HAL_Servo_ESP32.cpp b/Marlin/src/HAL/HAL_ESP32/Servo.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_ESP32/HAL_Servo_ESP32.cpp
rename to Marlin/src/HAL/HAL_ESP32/Servo.cpp
index 5f2dd40e19daa960de75d04da1bef1ba7e389b4b..c6be4b1280f301c76e164b3b3460600bcbcf1159 100644
--- a/Marlin/src/HAL/HAL_ESP32/HAL_Servo_ESP32.cpp
+++ b/Marlin/src/HAL/HAL_ESP32/Servo.cpp
@@ -25,7 +25,7 @@
#if HAS_SERVOS
-#include "HAL_Servo_ESP32.h"
+#include "Servo.h"
// Adjacent channels (0/1, 2/3 etc.) share the same timer and therefore the same frequency and resolution settings on ESP32,
// so we only allocate servo channels up high to avoid side effects with regards to analogWrite (fans, leds, laser pwm etc.)
diff --git a/Marlin/src/HAL/HAL_ESP32/HAL_Servo_ESP32.h b/Marlin/src/HAL/HAL_ESP32/Servo.h
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/HAL_Servo_ESP32.h
rename to Marlin/src/HAL/HAL_ESP32/Servo.h
diff --git a/Marlin/src/HAL/HAL_ESP32/fastio_ESP32.h b/Marlin/src/HAL/HAL_ESP32/fastio.h
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/fastio_ESP32.h
rename to Marlin/src/HAL/HAL_ESP32/fastio.h
diff --git a/Marlin/src/HAL/HAL_ESP32/HAL_timers_ESP32.cpp b/Marlin/src/HAL/HAL_ESP32/timers.cpp
similarity index 99%
rename from Marlin/src/HAL/HAL_ESP32/HAL_timers_ESP32.cpp
rename to Marlin/src/HAL/HAL_ESP32/timers.cpp
index fc90af4b8fd5bc8e145c7df1d032bcef2111029b..79a79e37cdf2fff70e6887e81885158df7e26b87 100644
--- a/Marlin/src/HAL/HAL_ESP32/HAL_timers_ESP32.cpp
+++ b/Marlin/src/HAL/HAL_ESP32/timers.cpp
@@ -30,7 +30,7 @@
#include "HAL.h"
-#include "HAL_timers_ESP32.h"
+#include "timers.h"
// ------------------------
// Local defines
diff --git a/Marlin/src/HAL/HAL_ESP32/HAL_timers_ESP32.h b/Marlin/src/HAL/HAL_ESP32/timers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/HAL_timers_ESP32.h
rename to Marlin/src/HAL/HAL_ESP32/timers.h
diff --git a/Marlin/src/HAL/HAL_ESP32/watchdog_ESP32.cpp b/Marlin/src/HAL/HAL_ESP32/watchdog.cpp
similarity index 97%
rename from Marlin/src/HAL/HAL_ESP32/watchdog_ESP32.cpp
rename to Marlin/src/HAL/HAL_ESP32/watchdog.cpp
index cbd5d989cd3f6fd829a99b37194960eccb6e1773..c653a356cfd30cd059e78dd466fcb7c74893d7a5 100644
--- a/Marlin/src/HAL/HAL_ESP32/watchdog_ESP32.cpp
+++ b/Marlin/src/HAL/HAL_ESP32/watchdog.cpp
@@ -26,7 +26,7 @@
#if ENABLED(USE_WATCHDOG)
-#include "watchdog_ESP32.h"
+#include "watchdog.h"
void watchdogSetup(void) {
// do whatever. don't remove this function.
diff --git a/Marlin/src/HAL/HAL_ESP32/watchdog_ESP32.h b/Marlin/src/HAL/HAL_ESP32/watchdog.h
similarity index 100%
rename from Marlin/src/HAL/HAL_ESP32/watchdog_ESP32.h
rename to Marlin/src/HAL/HAL_ESP32/watchdog.h
diff --git a/Marlin/src/HAL/HAL_LINUX/HAL.h b/Marlin/src/HAL/HAL_LINUX/HAL.h
index db771f06c0785fded98c885860bf7df9ba2a6d1b..4f872371ef3938387a3690285e788ba80e559784 100644
--- a/Marlin/src/HAL/HAL_LINUX/HAL.h
+++ b/Marlin/src/HAL/HAL_LINUX/HAL.h
@@ -56,7 +56,7 @@ uint8_t _getc();
#include "../shared/HAL_SPI.h"
#include "fastio.h"
#include "watchdog.h"
-#include "HAL_timers.h"
+#include "timers.h"
#include "serial.h"
#define SHARED_SERVOS HAS_SERVOS
diff --git a/Marlin/src/HAL/HAL_LINUX/arduino.cpp b/Marlin/src/HAL/HAL_LINUX/arduino.cpp
index a7e451ebcc1d739a2ae0e80f871aff124a39cd74..2ead6d595d947fad14709736f43d76389fbc787a 100644
--- a/Marlin/src/HAL/HAL_LINUX/arduino.cpp
+++ b/Marlin/src/HAL/HAL_LINUX/arduino.cpp
@@ -90,7 +90,7 @@ void eeprom_read_block(void *__dst, const void *__src, size_t __n) { }
void eeprom_update_block(const void *__src, void *__dst, size_t __n) { }
-char *dtostrf (double __val, signed char __width, unsigned char __prec, char *__s) {
+char *dtostrf(double __val, signed char __width, unsigned char __prec, char *__s) {
char format_string[20];
snprintf(format_string, 20, "%%%d.%df", __width, __prec);
sprintf(__s, format_string, __val);
diff --git a/Marlin/src/HAL/HAL_LINUX/include/Arduino.h b/Marlin/src/HAL/HAL_LINUX/include/Arduino.h
index dfe0228ac2a02670c7890787b18454da9c467ac0..1fbd1ba2497cedccea74f63a0b2934eaf626456b 100644
--- a/Marlin/src/HAL/HAL_LINUX/include/Arduino.h
+++ b/Marlin/src/HAL/HAL_LINUX/include/Arduino.h
@@ -109,13 +109,13 @@ uint16_t analogRead(pin_t);
// EEPROM
void eeprom_write_byte(unsigned char *pos, unsigned char value);
unsigned char eeprom_read_byte(unsigned char *pos);
-void eeprom_read_block (void *__dst, const void *__src, size_t __n);
-void eeprom_update_block (const void *__src, void *__dst, size_t __n);
+void eeprom_read_block(void *__dst, const void *__src, size_t __n);
+void eeprom_update_block(const void *__src, void *__dst, size_t __n);
int32_t random(int32_t);
int32_t random(int32_t, int32_t);
void randomSeed(uint32_t);
-char *dtostrf (double __val, signed char __width, unsigned char __prec, char *__s);
+char *dtostrf(double __val, signed char __width, unsigned char __prec, char *__s);
int map(uint16_t x, uint16_t in_min, uint16_t in_max, uint16_t out_min, uint16_t out_max);
diff --git a/Marlin/src/HAL/HAL_LINUX/HAL_timers.cpp b/Marlin/src/HAL/HAL_LINUX/timers.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_LINUX/HAL_timers.cpp
rename to Marlin/src/HAL/HAL_LINUX/timers.cpp
index 48c033d87eeff05c6fb11f88eb8e823b5fdccd73..625ea7a277c6d9025faea53c43f6e5f299f30da6 100644
--- a/Marlin/src/HAL/HAL_LINUX/HAL_timers.cpp
+++ b/Marlin/src/HAL/HAL_LINUX/timers.cpp
@@ -25,7 +25,7 @@
#include "hardware/Timer.h"
#include "../../inc/MarlinConfig.h"
-#include "HAL_timers.h"
+#include "timers.h"
/**
* Use POSIX signals to attempt to emulate Interrupts
diff --git a/Marlin/src/HAL/HAL_LINUX/HAL_timers.h b/Marlin/src/HAL/HAL_LINUX/timers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LINUX/HAL_timers.h
rename to Marlin/src/HAL/HAL_LINUX/timers.h
diff --git a/Marlin/src/HAL/HAL_LPC1768/DebugMonitor_LPC1768.cpp b/Marlin/src/HAL/HAL_LPC1768/DebugMonitor.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/DebugMonitor_LPC1768.cpp
rename to Marlin/src/HAL/HAL_LPC1768/DebugMonitor.cpp
diff --git a/Marlin/src/HAL/HAL_LPC1768/HAL.h b/Marlin/src/HAL/HAL_LPC1768/HAL.h
index 45be77f41c8b89c3463465b1348565c99880e797..00b01adf6aff82892fafedb1f07a49c87bc95b73 100644
--- a/Marlin/src/HAL/HAL_LPC1768/HAL.h
+++ b/Marlin/src/HAL/HAL_LPC1768/HAL.h
@@ -41,7 +41,7 @@ extern "C" volatile uint32_t _millis;
#include "../shared/HAL_SPI.h"
#include "fastio.h"
#include "watchdog.h"
-#include "HAL_timers.h"
+#include "timers.h"
#include "MarlinSerial.h"
#include <adc.h>
diff --git a/Marlin/src/HAL/HAL_LPC1768/HAL_spi.cpp b/Marlin/src/HAL/HAL_LPC1768/HAL_SPI.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/HAL_spi.cpp
rename to Marlin/src/HAL/HAL_LPC1768/HAL_SPI.cpp
diff --git a/Marlin/src/HAL/HAL_LPC1768/HAL_Servo_LPC1768.h b/Marlin/src/HAL/HAL_LPC1768/Servo.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/HAL_Servo_LPC1768.h
rename to Marlin/src/HAL/HAL_LPC1768/Servo.h
diff --git a/Marlin/src/HAL/HAL_LPC1768/main.cpp b/Marlin/src/HAL/HAL_LPC1768/main.cpp
index fa3d27dbb6d6b1417c09a819808427d226e201d5..b7b5040a2007e10a37dae45ec02997fa2b53ee48 100644
--- a/Marlin/src/HAL/HAL_LPC1768/main.cpp
+++ b/Marlin/src/HAL/HAL_LPC1768/main.cpp
@@ -38,7 +38,7 @@ extern "C" {
#include "../../sd/cardreader.h"
#include "../../inc/MarlinConfig.h"
#include "HAL.h"
-#include "HAL_timers.h"
+#include "timers.h"
extern uint32_t MSC_SD_Init(uint8_t pdrv);
extern "C" int isLPC1769();
diff --git a/Marlin/src/HAL/HAL_LPC1768/HAL_timers.cpp b/Marlin/src/HAL/HAL_LPC1768/timers.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_LPC1768/HAL_timers.cpp
rename to Marlin/src/HAL/HAL_LPC1768/timers.cpp
index 2274630ca88bbd770df4288ee78dabdd2b06034f..914f980fc00dc5359aa96996d395a192ff1e56df 100644
--- a/Marlin/src/HAL/HAL_LPC1768/HAL_timers.cpp
+++ b/Marlin/src/HAL/HAL_LPC1768/timers.cpp
@@ -29,7 +29,7 @@
#ifdef TARGET_LPC1768
#include "../../inc/MarlinConfig.h"
-#include "HAL_timers.h"
+#include "timers.h"
void HAL_timer_init(void) {
SBI(LPC_SC->PCONP, SBIT_TIMER0); // Power ON Timer 0
diff --git a/Marlin/src/HAL/HAL_LPC1768/HAL_timers.h b/Marlin/src/HAL/HAL_LPC1768/timers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_LPC1768/HAL_timers.h
rename to Marlin/src/HAL/HAL_LPC1768/timers.h
diff --git a/Marlin/src/HAL/HAL_SAMD51/HAL.h b/Marlin/src/HAL/HAL_SAMD51/HAL.h
index dac982a44daaa733787e15a9a2923d8b730011ed..87b2838eeebd41c2e639c4151a39ab695f95e213 100644
--- a/Marlin/src/HAL/HAL_SAMD51/HAL.h
+++ b/Marlin/src/HAL/HAL_SAMD51/HAL.h
@@ -25,9 +25,9 @@
#include "../shared/Marduino.h"
#include "../shared/math_32bit.h"
#include "../shared/HAL_SPI.h"
-#include "fastio_SAMD51.h"
-#include "watchdog_SAMD51.h"
-#include "HAL_timers_SAMD51.h"
+#include "fastio.h"
+#include "watchdog.h"
+#include "timers.h"
#ifdef ADAFRUIT_GRAND_CENTRAL_M4
#include "MarlinSerial_AGCM4.h"
diff --git a/Marlin/src/HAL/HAL_SAMD51/HAL_spi_SAMD51.cpp b/Marlin/src/HAL/HAL_SAMD51/HAL_SPI.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_SAMD51/HAL_spi_SAMD51.cpp
rename to Marlin/src/HAL/HAL_SAMD51/HAL_SPI.cpp
diff --git a/Marlin/src/HAL/HAL_SAMD51/Servo_SAMD51.cpp b/Marlin/src/HAL/HAL_SAMD51/Servo.cpp
similarity index 99%
rename from Marlin/src/HAL/HAL_SAMD51/Servo_SAMD51.cpp
rename to Marlin/src/HAL/HAL_SAMD51/Servo.cpp
index c4fd2d57bc69eff6954df001832266354be22bed..f9b0eb339402c819f48d00513216c3f2bb3f8023 100644
--- a/Marlin/src/HAL/HAL_SAMD51/Servo_SAMD51.cpp
+++ b/Marlin/src/HAL/HAL_SAMD51/Servo.cpp
@@ -33,7 +33,7 @@
#include "../shared/servo.h"
#include "../shared/servo_private.h"
#include "SAMD51.h"
-#include "HAL_timers_SAMD51.h"
+#include "timers.h"
#define __TC_GCLK_ID(t) TC##t##_GCLK_ID
#define _TC_GCLK_ID(t) __TC_GCLK_ID(t)
diff --git a/Marlin/src/HAL/HAL_SAMD51/fastio_SAMD51.h b/Marlin/src/HAL/HAL_SAMD51/fastio.h
similarity index 100%
rename from Marlin/src/HAL/HAL_SAMD51/fastio_SAMD51.h
rename to Marlin/src/HAL/HAL_SAMD51/fastio.h
diff --git a/Marlin/src/HAL/HAL_SAMD51/HAL_timers_SAMD51.cpp b/Marlin/src/HAL/HAL_SAMD51/timers.cpp
similarity index 99%
rename from Marlin/src/HAL/HAL_SAMD51/HAL_timers_SAMD51.cpp
rename to Marlin/src/HAL/HAL_SAMD51/timers.cpp
index ea02e839fe72ce492c69026fb32d646bb76aeefd..63902c3c5e265b11dc08b60971c59648f6f256b9 100644
--- a/Marlin/src/HAL/HAL_SAMD51/HAL_timers_SAMD51.cpp
+++ b/Marlin/src/HAL/HAL_SAMD51/timers.cpp
@@ -25,7 +25,7 @@
// Includes
// --------------------------------------------------------------------------
#include "../../inc/MarlinConfig.h"
-#include "HAL_timers_SAMD51.h"
+#include "timers.h"
// --------------------------------------------------------------------------
// Local defines
diff --git a/Marlin/src/HAL/HAL_SAMD51/HAL_timers_SAMD51.h b/Marlin/src/HAL/HAL_SAMD51/timers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_SAMD51/HAL_timers_SAMD51.h
rename to Marlin/src/HAL/HAL_SAMD51/timers.h
diff --git a/Marlin/src/HAL/HAL_SAMD51/watchdog_SAMD51.cpp b/Marlin/src/HAL/HAL_SAMD51/watchdog.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_SAMD51/watchdog_SAMD51.cpp
rename to Marlin/src/HAL/HAL_SAMD51/watchdog.cpp
index fad3410cff95981a553db6045e8b80c9b62e54d4..f46565b9a34aed588bb6ab3af2fec6580a97640f 100644
--- a/Marlin/src/HAL/HAL_SAMD51/watchdog_SAMD51.cpp
+++ b/Marlin/src/HAL/HAL_SAMD51/watchdog.cpp
@@ -25,7 +25,7 @@
#if ENABLED(USE_WATCHDOG)
- #include "watchdog_SAMD51.h"
+ #include "watchdog.h"
void watchdog_init(void) {
// The low-power oscillator used by the WDT runs at 32,768 Hz with
diff --git a/Marlin/src/HAL/HAL_SAMD51/watchdog_SAMD51.h b/Marlin/src/HAL/HAL_SAMD51/watchdog.h
similarity index 100%
rename from Marlin/src/HAL/HAL_SAMD51/watchdog_SAMD51.h
rename to Marlin/src/HAL/HAL_SAMD51/watchdog.h
diff --git a/Marlin/src/HAL/HAL_STM32/HAL.h b/Marlin/src/HAL/HAL_STM32/HAL.h
index ccbe8a7c5dfe776c185357c178bbd37f2a2238ee..f48ec41783822d1f2efb01fd299a4e37218b66f2 100644
--- a/Marlin/src/HAL/HAL_STM32/HAL.h
+++ b/Marlin/src/HAL/HAL_STM32/HAL.h
@@ -28,8 +28,8 @@
#include "../shared/Marduino.h"
#include "../shared/math_32bit.h"
#include "../shared/HAL_SPI.h"
-#include "fastio_STM32.h"
-#include "watchdog_STM32.h"
+#include "fastio.h"
+#include "watchdog.h"
#include "../../inc/MarlinConfigPre.h"
@@ -96,7 +96,7 @@
#define NUM_SERIAL 1
#endif
-#include "HAL_timers_STM32.h"
+#include "timers.h"
/**
* TODO: review this to return 1 for pins that are not analog input
diff --git a/Marlin/src/HAL/HAL_STM32/HAL_spi_STM32.cpp b/Marlin/src/HAL/HAL_STM32/HAL_SPI.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/HAL_spi_STM32.cpp
rename to Marlin/src/HAL/HAL_STM32/HAL_SPI.cpp
diff --git a/Marlin/src/HAL/HAL_STM32/HAL_Servo_STM32.cpp b/Marlin/src/HAL/HAL_STM32/Servo.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_STM32/HAL_Servo_STM32.cpp
rename to Marlin/src/HAL/HAL_STM32/Servo.cpp
index fa68c4834235f5ebe2b9754628c91b47438f377b..93154f7847625d578027054d0aa247a1510f04e0 100644
--- a/Marlin/src/HAL/HAL_STM32/HAL_Servo_STM32.cpp
+++ b/Marlin/src/HAL/HAL_STM32/Servo.cpp
@@ -26,7 +26,7 @@
#if HAS_SERVOS
-#include "HAL_Servo_STM32.h"
+#include "Servo.h"
uint8_t servoPin[MAX_SERVOS] = { 0 };
diff --git a/Marlin/src/HAL/HAL_STM32/HAL_Servo_STM32.h b/Marlin/src/HAL/HAL_STM32/Servo.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/HAL_Servo_STM32.h
rename to Marlin/src/HAL/HAL_STM32/Servo.h
diff --git a/Marlin/src/HAL/HAL_STM32/fastio_STM32.cpp b/Marlin/src/HAL/HAL_STM32/fastio.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/fastio_STM32.cpp
rename to Marlin/src/HAL/HAL_STM32/fastio.cpp
diff --git a/Marlin/src/HAL/HAL_STM32/fastio_STM32.h b/Marlin/src/HAL/HAL_STM32/fastio.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/fastio_STM32.h
rename to Marlin/src/HAL/HAL_STM32/fastio.h
diff --git a/Marlin/src/HAL/HAL_STM32/pinsDebug_STM32GENERIC.h b/Marlin/src/HAL/HAL_STM32/pinsDebug_STM32GENERIC.h
index 3e66fda65773ce384ff8f79df3e83057454acc2f..b1c256218596628ba2214f5adfc11d10e7d8eb5d 100644
--- a/Marlin/src/HAL/HAL_STM32/pinsDebug_STM32GENERIC.h
+++ b/Marlin/src/HAL/HAL_STM32/pinsDebug_STM32GENERIC.h
@@ -29,9 +29,11 @@
#ifdef BOARD_NR_GPIO_PINS // Only in STM32GENERIC (Maple)
#ifdef __STM32F1__
- #include "../HAL_STM32F1/fastio_STM32F1.h"
+ #include "../HAL_STM32F1/fastio.h"
#elif defined(STM32F4) || defined(STM32F7)
- #include "../HAL_STM32_F4_F7/fastio_STM32_F4_F7.h"
+ #include "../HAL_STM32_F4_F7/fastio.h"
+#else
+ #include "fastio.h"
#endif
extern const stm32_pin_info PIN_MAP[BOARD_NR_GPIO_PINS];
diff --git a/Marlin/src/HAL/HAL_STM32/HAL_timers_STM32.cpp b/Marlin/src/HAL/HAL_STM32/timers.cpp
similarity index 99%
rename from Marlin/src/HAL/HAL_STM32/HAL_timers_STM32.cpp
rename to Marlin/src/HAL/HAL_STM32/timers.cpp
index beefdb3083fa9d793477ef2d457620d9cc223749..51f84e657fa6242786c02f50ea4fcc3c5fe59081 100644
--- a/Marlin/src/HAL/HAL_STM32/HAL_timers_STM32.cpp
+++ b/Marlin/src/HAL/HAL_STM32/timers.cpp
@@ -24,7 +24,7 @@
#include "HAL.h"
-#include "HAL_timers_STM32.h"
+#include "timers.h"
// ------------------------
// Local defines
diff --git a/Marlin/src/HAL/HAL_STM32/HAL_timers_STM32.h b/Marlin/src/HAL/HAL_STM32/timers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/HAL_timers_STM32.h
rename to Marlin/src/HAL/HAL_STM32/timers.h
diff --git a/Marlin/src/HAL/HAL_STM32/watchdog_STM32.cpp b/Marlin/src/HAL/HAL_STM32/watchdog.cpp
similarity index 97%
rename from Marlin/src/HAL/HAL_STM32/watchdog_STM32.cpp
rename to Marlin/src/HAL/HAL_STM32/watchdog.cpp
index ae9f1e35838c698c6e4ba8da48cac23ba3225d1c..8963d55cfc8835b81301319349d1bae264c7e92a 100644
--- a/Marlin/src/HAL/HAL_STM32/watchdog_STM32.cpp
+++ b/Marlin/src/HAL/HAL_STM32/watchdog.cpp
@@ -28,7 +28,7 @@
#include "../../inc/MarlinConfig.h"
- #include "watchdog_STM32.h"
+ #include "watchdog.h"
#include <IWatchdog.h>
void watchdog_init() { IWatchdog.begin(4000000); } // 4 sec timeout
diff --git a/Marlin/src/HAL/HAL_STM32/watchdog_STM32.h b/Marlin/src/HAL/HAL_STM32/watchdog.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32/watchdog_STM32.h
rename to Marlin/src/HAL/HAL_STM32/watchdog.h
diff --git a/Marlin/src/HAL/HAL_STM32F1/HAL.h b/Marlin/src/HAL/HAL_STM32F1/HAL.h
index 227b495ed8ac8c1a6c1b06e6b5a70ba5e7d7cd07..a8de9a16da509ae6244811708f0b683722f49990 100644
--- a/Marlin/src/HAL/HAL_STM32F1/HAL.h
+++ b/Marlin/src/HAL/HAL_STM32F1/HAL.h
@@ -33,10 +33,10 @@
#include "../shared/math_32bit.h"
#include "../shared/HAL_SPI.h"
-#include "fastio_STM32F1.h"
-#include "watchdog_STM32F1.h"
+#include "fastio.h"
+#include "watchdog.h"
-#include "HAL_timers_STM32F1.h"
+#include "timers.h"
#include <stdint.h>
#include <util/atomic.h>
diff --git a/Marlin/src/HAL/HAL_STM32F1/HAL_spi_STM32F1.cpp b/Marlin/src/HAL/HAL_STM32F1/HAL_SPI.cpp
similarity index 99%
rename from Marlin/src/HAL/HAL_STM32F1/HAL_spi_STM32F1.cpp
rename to Marlin/src/HAL/HAL_STM32F1/HAL_SPI.cpp
index 4b8177addb4c5db29636df59b4a3b1f904379c39..5acae7bf9153eb3d61fee01ffb17998fcc6e84b0 100644
--- a/Marlin/src/HAL/HAL_STM32F1/HAL_spi_STM32F1.cpp
+++ b/Marlin/src/HAL/HAL_STM32F1/HAL_SPI.cpp
@@ -33,7 +33,7 @@
#ifdef __STM32F1__
#include "../../inc/MarlinConfig.h"
-#include "SPI.h"
+#include <SPI.h>
// ------------------------
// Public functions
diff --git a/Marlin/src/HAL/HAL_STM32F1/SPI.cpp b/Marlin/src/HAL/HAL_STM32F1/SPI.cpp
index a869951034cf4477edef0576803d0b65fc188503..d8bf68d15067505f7ef4bbf1f8a9eed0edec18fe 100644
--- a/Marlin/src/HAL/HAL_STM32F1/SPI.cpp
+++ b/Marlin/src/HAL/HAL_STM32F1/SPI.cpp
@@ -31,7 +31,7 @@
#ifdef __STM32F1__
-#include "SPI.h"
+#include <SPI.h>
#include <libmaple/timer.h>
#include <libmaple/util.h>
diff --git a/Marlin/src/HAL/HAL_STM32F1/HAL_Servo_STM32F1.cpp b/Marlin/src/HAL/HAL_STM32F1/Servo.cpp
similarity index 99%
rename from Marlin/src/HAL/HAL_STM32F1/HAL_Servo_STM32F1.cpp
rename to Marlin/src/HAL/HAL_STM32F1/Servo.cpp
index 7fbc0f61d0f361d2272454a1ed1a1c37f0f1a1a8..ae7f847b8523176a57b4c79e1f61f180160c473a 100644
--- a/Marlin/src/HAL/HAL_STM32F1/HAL_Servo_STM32F1.cpp
+++ b/Marlin/src/HAL/HAL_STM32F1/Servo.cpp
@@ -29,8 +29,8 @@
uint8_t ServoCount = 0;
-#include "HAL_Servo_STM32F1.h"
-#include "HAL_timers_STM32F1.h"
+#include "Servo.h"
+#include "timers.h"
//#include "Servo.h"
diff --git a/Marlin/src/HAL/HAL_STM32F1/HAL_Servo_STM32F1.h b/Marlin/src/HAL/HAL_STM32F1/Servo.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/HAL_Servo_STM32F1.h
rename to Marlin/src/HAL/HAL_STM32F1/Servo.h
diff --git a/Marlin/src/HAL/HAL_STM32F1/STM32F1_flag_script.py b/Marlin/src/HAL/HAL_STM32F1/build_flags.py
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/STM32F1_flag_script.py
rename to Marlin/src/HAL/HAL_STM32F1/build_flags.py
diff --git a/Marlin/src/HAL/HAL_STM32F1/fastio_STM32F1.h b/Marlin/src/HAL/HAL_STM32F1/fastio.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/fastio_STM32F1.h
rename to Marlin/src/HAL/HAL_STM32F1/fastio.h
diff --git a/Marlin/src/HAL/HAL_STM32F1/HAL_sdio_STM32F1.cpp b/Marlin/src/HAL/HAL_STM32F1/sdio.cpp
similarity index 99%
rename from Marlin/src/HAL/HAL_STM32F1/HAL_sdio_STM32F1.cpp
rename to Marlin/src/HAL/HAL_STM32F1/sdio.cpp
index d2d59811a81ab7046e79dfabb61acfa32b5d0e5d..89bb481bd2536cdb9a839c14fe4f1b7acd12964f 100644
--- a/Marlin/src/HAL/HAL_STM32F1/HAL_sdio_STM32F1.cpp
+++ b/Marlin/src/HAL/HAL_STM32F1/sdio.cpp
@@ -29,7 +29,7 @@
#if defined(STM32_HIGH_DENSITY) || defined(STM32_XL_DENSITY)
-#include "HAL_sdio_STM32F1.h"
+#include "sdio.h"
SDIO_CardInfoTypeDef SdCard;
diff --git a/Marlin/src/HAL/HAL_STM32F1/HAL_sdio_STM32F1.h b/Marlin/src/HAL/HAL_STM32F1/sdio.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/HAL_sdio_STM32F1.h
rename to Marlin/src/HAL/HAL_STM32F1/sdio.h
diff --git a/Marlin/src/HAL/HAL_STM32F1/HAL_timers_STM32F1.cpp b/Marlin/src/HAL/HAL_STM32F1/timers.cpp
similarity index 99%
rename from Marlin/src/HAL/HAL_STM32F1/HAL_timers_STM32F1.cpp
rename to Marlin/src/HAL/HAL_STM32F1/timers.cpp
index faff842eb0c5426a9d04bf12e3c0cd3e01c7b923..a21dc12c12cd298fc5f1710d3ffd0abcefcdc3e6 100644
--- a/Marlin/src/HAL/HAL_STM32F1/HAL_timers_STM32F1.cpp
+++ b/Marlin/src/HAL/HAL_STM32F1/timers.cpp
@@ -28,7 +28,7 @@
#include "HAL.h"
-#include "HAL_timers_STM32F1.h"
+#include "timers.h"
// ------------------------
// Local defines
diff --git a/Marlin/src/HAL/HAL_STM32F1/HAL_timers_STM32F1.h b/Marlin/src/HAL/HAL_STM32F1/timers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/HAL_timers_STM32F1.h
rename to Marlin/src/HAL/HAL_STM32F1/timers.h
diff --git a/Marlin/src/HAL/HAL_STM32F1/watchdog_STM32F1.cpp b/Marlin/src/HAL/HAL_STM32F1/watchdog.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_STM32F1/watchdog_STM32F1.cpp
rename to Marlin/src/HAL/HAL_STM32F1/watchdog.cpp
index 62e4d077ebaced7aa42d8b737ca41791ce5c1f11..ed83daba799476e4311dc1d30e55d64e7491a573 100644
--- a/Marlin/src/HAL/HAL_STM32F1/watchdog_STM32F1.cpp
+++ b/Marlin/src/HAL/HAL_STM32F1/watchdog.cpp
@@ -31,7 +31,7 @@
#if ENABLED(USE_WATCHDOG)
#include <libmaple/iwdg.h>
-#include "watchdog_STM32F1.h"
+#include "watchdog.h"
void watchdog_reset() {
#if DISABLED(PINS_DEBUGGING) && PIN_EXISTS(LED)
diff --git a/Marlin/src/HAL/HAL_STM32F1/watchdog_STM32F1.h b/Marlin/src/HAL/HAL_STM32F1/watchdog.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32F1/watchdog_STM32F1.h
rename to Marlin/src/HAL/HAL_STM32F1/watchdog.h
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/HAL.h b/Marlin/src/HAL/HAL_STM32_F4_F7/HAL.h
index e3cfe00e6183c496dd78db53816fb73313a68ed2..554f8e1b32bdfca5091d520187a871ca9533f1d2 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/HAL.h
+++ b/Marlin/src/HAL/HAL_STM32_F4_F7/HAL.h
@@ -28,10 +28,10 @@
#include "../shared/math_32bit.h"
#include "../shared/HAL_SPI.h"
-#include "fastio_STM32_F4_F7.h"
-#include "watchdog_STM32_F4_F7.h"
+#include "fastio.h"
+#include "watchdog.h"
-#include "HAL_timers_STM32_F4_F7.h"
+#include "timers.h"
#include "../../inc/MarlinConfigPre.h"
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/HAL_spi_STM32_F4_F7.cpp b/Marlin/src/HAL/HAL_STM32_F4_F7/HAL_SPI.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/HAL_spi_STM32_F4_F7.cpp
rename to Marlin/src/HAL/HAL_STM32_F4_F7/HAL_SPI.cpp
index ca7cc5b5430742b4db945da4372bfc00286b7de5..d36e817752b8d42f9b98103edabae68035f678f6 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/HAL_spi_STM32_F4_F7.cpp
+++ b/Marlin/src/HAL/HAL_STM32_F4_F7/HAL_SPI.cpp
@@ -32,12 +32,12 @@
#if defined(STM32GENERIC) && (defined(STM32F4) || defined(STM32F7))
-#include "HAL.h"
-#include "../shared/HAL_SPI.h"
+#include "../../inc/MarlinConfig.h"
+
+#include <SPI.h>
#include <pins_arduino.h>
+#include "../shared/HAL_SPI.h"
#include "spi_pins.h"
-#include "../../core/macros.h"
-#include <SPI.h>
// ------------------------
// Public Variables
@@ -72,7 +72,7 @@ static SPISettings spiConfig;
* @details Only configures SS pin since libmaple creates and initialize the SPI object
*/
void spiBegin(void) {
- #if !PIN_EXISTS(SS)
+ #if !defined(SS_PIN) || SS_PIN < 0
#error SS_PIN not defined!
#endif
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F4/HAL_timers_STM32F4.cpp b/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F4/timers.cpp
similarity index 99%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/STM32F4/HAL_timers_STM32F4.cpp
rename to Marlin/src/HAL/HAL_STM32_F4_F7/STM32F4/timers.cpp
index 26ea90e6d4c55d5be2cb6ca37e133d3687774efa..d8701ce0b2e61d7ffb91cc3142f8cf743db7dafc 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F4/HAL_timers_STM32F4.cpp
+++ b/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F4/timers.cpp
@@ -23,7 +23,7 @@
#if defined(STM32GENERIC) && defined(STM32F4)
#include "../HAL.h"
-#include "HAL_timers_STM32F4.h"
+#include "timers.h"
// ------------------------
// Local defines
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F4/HAL_timers_STM32F4.h b/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F4/timers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/STM32F4/HAL_timers_STM32F4.h
rename to Marlin/src/HAL/HAL_STM32_F4_F7/STM32F4/timers.h
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/HAL_timers_STM32F7.cpp b/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/timers.cpp
similarity index 99%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/HAL_timers_STM32F7.cpp
rename to Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/timers.cpp
index 32697d7ccd824480d7668bb80d98525a50e90eb6..95125ade881b7f625e83475bc0cace05fc5537a1 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/HAL_timers_STM32F7.cpp
+++ b/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/timers.cpp
@@ -23,7 +23,7 @@
#if defined(STM32GENERIC) && defined(STM32F7)
#include "../HAL.h"
-#include "HAL_timers_STM32F7.h"
+#include "timers.h"
// ------------------------
// Local defines
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/HAL_timers_STM32F7.h b/Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/timers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/HAL_timers_STM32F7.h
rename to Marlin/src/HAL/HAL_STM32_F4_F7/STM32F7/timers.h
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/HAL_Servo_STM32_F4_F7.cpp b/Marlin/src/HAL/HAL_STM32_F4_F7/Servo.cpp
similarity index 97%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/HAL_Servo_STM32_F4_F7.cpp
rename to Marlin/src/HAL/HAL_STM32_F4_F7/Servo.cpp
index 5c585e663d2263b7b8a72012cca6a4822a056943..736ddd45e432cfb4ceebb476d155baca1cc8e96c 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/HAL_Servo_STM32_F4_F7.cpp
+++ b/Marlin/src/HAL/HAL_STM32_F4_F7/Servo.cpp
@@ -27,7 +27,7 @@
#if HAS_SERVOS
-#include "HAL_Servo_STM32_F4_F7.h"
+#include "Servo.h"
int8_t libServo::attach(const int pin) {
if (this->servoIndex >= MAX_SERVOS) return -1;
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/HAL_Servo_STM32_F4_F7.h b/Marlin/src/HAL/HAL_STM32_F4_F7/Servo.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/HAL_Servo_STM32_F4_F7.h
rename to Marlin/src/HAL/HAL_STM32_F4_F7/Servo.h
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/fastio.h b/Marlin/src/HAL/HAL_STM32_F4_F7/fastio.h
new file mode 100644
index 0000000000000000000000000000000000000000..1e5ef2ef3085f7234dbfbd46d654014f99abebc0
--- /dev/null
+++ b/Marlin/src/HAL/HAL_STM32_F4_F7/fastio.h
@@ -0,0 +1,310 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (c) 2017 Victor Perez
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/**
+ * Fast I/O interfaces for STM32F4/7
+ * These use GPIO functions instead of Direct Port Manipulation, as on AVR.
+ */
+
+#ifndef PWM
+ #define PWM OUTPUT
+#endif
+
+#define READ(IO) digitalRead(IO)
+#define WRITE(IO,V) digitalWrite(IO,V)
+
+#define _GET_MODE(IO)
+#define _SET_MODE(IO,M) pinMode(IO, M)
+#define _SET_OUTPUT(IO) pinMode(IO, OUTPUT) /*!< Output Push Pull Mode & GPIO_NOPULL */
+
+#define OUT_WRITE(IO,V) do{ _SET_OUTPUT(IO); WRITE(IO,V); }while(0)
+
+#define SET_INPUT(IO) _SET_MODE(IO, INPUT) /*!< Input Floating Mode */
+#define SET_INPUT_PULLUP(IO) _SET_MODE(IO, INPUT_PULLUP) /*!< Input with Pull-up activation */
+#define SET_INPUT_PULLDOWN(IO) _SET_MODE(IO, INPUT_PULLDOWN) /*!< Input with Pull-down activation */
+#define SET_OUTPUT(IO) OUT_WRITE(IO, LOW)
+#define SET_PWM(IO) _SET_MODE(IO, PWM)
+
+#define TOGGLE(IO) OUT_WRITE(IO, !READ(IO))
+
+#define IS_INPUT(IO)
+#define IS_OUTPUT(IO)
+
+#define PWM_PIN(P) true
+
+// digitalRead/Write wrappers
+#define extDigitalRead(IO) digitalRead(IO)
+#define extDigitalWrite(IO,V) digitalWrite(IO,V)
+
+//
+// Pins Definitions
+//
+#define PORTA 0
+#define PORTB 1
+#define PORTC 2
+#define PORTD 3
+#define PORTE 4
+#define PORTF 5
+#define PORTG 6
+
+#define _STM32_PIN(P,PN) ((PORT##P * 16) + PN)
+
+#undef PA0
+#define PA0 _STM32_PIN(A, 0)
+#undef PA1
+#define PA1 _STM32_PIN(A, 1)
+#undef PA2
+#define PA2 _STM32_PIN(A, 2)
+#undef PA3
+#define PA3 _STM32_PIN(A, 3)
+#undef PA4
+#define PA4 _STM32_PIN(A, 4)
+#undef PA5
+#define PA5 _STM32_PIN(A, 5)
+#undef PA6
+#define PA6 _STM32_PIN(A, 6)
+#undef PA7
+#define PA7 _STM32_PIN(A, 7)
+#undef PA8
+#define PA8 _STM32_PIN(A, 8)
+#undef PA9
+#define PA9 _STM32_PIN(A, 9)
+#undef PA10
+#define PA10 _STM32_PIN(A, 10)
+#undef PA11
+#define PA11 _STM32_PIN(A, 11)
+#undef PA12
+#define PA12 _STM32_PIN(A, 12)
+#undef PA13
+#define PA13 _STM32_PIN(A, 13)
+#undef PA14
+#define PA14 _STM32_PIN(A, 14)
+#undef PA15
+#define PA15 _STM32_PIN(A, 15)
+
+#undef PB0
+#define PB0 _STM32_PIN(B, 0)
+#undef PB1
+#define PB1 _STM32_PIN(B, 1)
+#undef PB2
+#define PB2 _STM32_PIN(B, 2)
+#undef PB3
+#define PB3 _STM32_PIN(B, 3)
+#undef PB4
+#define PB4 _STM32_PIN(B, 4)
+#undef PB5
+#define PB5 _STM32_PIN(B, 5)
+#undef PB6
+#define PB6 _STM32_PIN(B, 6)
+#undef PB7
+#define PB7 _STM32_PIN(B, 7)
+#undef PB8
+#define PB8 _STM32_PIN(B, 8)
+#undef PB9
+#define PB9 _STM32_PIN(B, 9)
+#undef PB10
+#define PB10 _STM32_PIN(B, 10)
+#undef PB11
+#define PB11 _STM32_PIN(B, 11)
+#undef PB12
+#define PB12 _STM32_PIN(B, 12)
+#undef PB13
+#define PB13 _STM32_PIN(B, 13)
+#undef PB14
+#define PB14 _STM32_PIN(B, 14)
+#undef PB15
+#define PB15 _STM32_PIN(B, 15)
+
+#undef PC0
+#define PC0 _STM32_PIN(C, 0)
+#undef PC1
+#define PC1 _STM32_PIN(C, 1)
+#undef PC2
+#define PC2 _STM32_PIN(C, 2)
+#undef PC3
+#define PC3 _STM32_PIN(C, 3)
+#undef PC4
+#define PC4 _STM32_PIN(C, 4)
+#undef PC5
+#define PC5 _STM32_PIN(C, 5)
+#undef PC6
+#define PC6 _STM32_PIN(C, 6)
+#undef PC7
+#define PC7 _STM32_PIN(C, 7)
+#undef PC8
+#define PC8 _STM32_PIN(C, 8)
+#undef PC9
+#define PC9 _STM32_PIN(C, 9)
+#undef PC10
+#define PC10 _STM32_PIN(C, 10)
+#undef PC11
+#define PC11 _STM32_PIN(C, 11)
+#undef PC12
+#define PC12 _STM32_PIN(C, 12)
+#undef PC13
+#define PC13 _STM32_PIN(C, 13)
+#undef PC14
+#define PC14 _STM32_PIN(C, 14)
+#undef PC15
+#define PC15 _STM32_PIN(C, 15)
+
+#undef PD0
+#define PD0 _STM32_PIN(D, 0)
+#undef PD1
+#define PD1 _STM32_PIN(D, 1)
+#undef PD2
+#define PD2 _STM32_PIN(D, 2)
+#undef PD3
+#define PD3 _STM32_PIN(D, 3)
+#undef PD4
+#define PD4 _STM32_PIN(D, 4)
+#undef PD5
+#define PD5 _STM32_PIN(D, 5)
+#undef PD6
+#define PD6 _STM32_PIN(D, 6)
+#undef PD7
+#define PD7 _STM32_PIN(D, 7)
+#undef PD8
+#define PD8 _STM32_PIN(D, 8)
+#undef PD9
+#define PD9 _STM32_PIN(D, 9)
+#undef PD10
+#define PD10 _STM32_PIN(D, 10)
+#undef PD11
+#define PD11 _STM32_PIN(D, 11)
+#undef PD12
+#define PD12 _STM32_PIN(D, 12)
+#undef PD13
+#define PD13 _STM32_PIN(D, 13)
+#undef PD14
+#define PD14 _STM32_PIN(D, 14)
+#undef PD15
+#define PD15 _STM32_PIN(D, 15)
+
+#undef PE0
+#define PE0 _STM32_PIN(E, 0)
+#undef PE1
+#define PE1 _STM32_PIN(E, 1)
+#undef PE2
+#define PE2 _STM32_PIN(E, 2)
+#undef PE3
+#define PE3 _STM32_PIN(E, 3)
+#undef PE4
+#define PE4 _STM32_PIN(E, 4)
+#undef PE5
+#define PE5 _STM32_PIN(E, 5)
+#undef PE6
+#define PE6 _STM32_PIN(E, 6)
+#undef PE7
+#define PE7 _STM32_PIN(E, 7)
+#undef PE8
+#define PE8 _STM32_PIN(E, 8)
+#undef PE9
+#define PE9 _STM32_PIN(E, 9)
+#undef PE10
+#define PE10 _STM32_PIN(E, 10)
+#undef PE11
+#define PE11 _STM32_PIN(E, 11)
+#undef PE12
+#define PE12 _STM32_PIN(E, 12)
+#undef PE13
+#define PE13 _STM32_PIN(E, 13)
+#undef PE14
+#define PE14 _STM32_PIN(E, 14)
+#undef PE15
+#define PE15 _STM32_PIN(E, 15)
+
+#ifdef STM32F7
+
+ #undef PORTF
+ #define PORTF 5
+ #undef PF0
+ #define PF0 _STM32_PIN(F, 0)
+ #undef PF1
+ #define PF1 _STM32_PIN(F, 1)
+ #undef PF2
+ #define PF2 _STM32_PIN(F, 2)
+ #undef PF3
+ #define PF3 _STM32_PIN(F, 3)
+ #undef PF4
+ #define PF4 _STM32_PIN(F, 4)
+ #undef PF5
+ #define PF5 _STM32_PIN(F, 5)
+ #undef PF6
+ #define PF6 _STM32_PIN(F, 6)
+ #undef PF7
+ #define PF7 _STM32_PIN(F, 7)
+ #undef PF8
+ #define PF8 _STM32_PIN(F, 8)
+ #undef PF9
+ #define PF9 _STM32_PIN(F, 9)
+ #undef PF10
+ #define PF10 _STM32_PIN(F, 10)
+ #undef PF11
+ #define PF11 _STM32_PIN(F, 11)
+ #undef PF12
+ #define PF12 _STM32_PIN(F, 12)
+ #undef PF13
+ #define PF13 _STM32_PIN(F, 13)
+ #undef PF14
+ #define PF14 _STM32_PIN(F, 14)
+ #undef PF15
+ #define PF15 _STM32_PIN(F, 15)
+
+ #undef PORTG
+ #define PORTG 6
+ #undef PG0
+ #define PG0 _STM32_PIN(G, 0)
+ #undef PG1
+ #define PG1 _STM32_PIN(G, 1)
+ #undef PG2
+ #define PG2 _STM32_PIN(G, 2)
+ #undef PG3
+ #define PG3 _STM32_PIN(G, 3)
+ #undef PG4
+ #define PG4 _STM32_PIN(G, 4)
+ #undef PG5
+ #define PG5 _STM32_PIN(G, 5)
+ #undef PG6
+ #define PG6 _STM32_PIN(G, 6)
+ #undef PG7
+ #define PG7 _STM32_PIN(G, 7)
+ #undef PG8
+ #define PG8 _STM32_PIN(G, 8)
+ #undef PG9
+ #define PG9 _STM32_PIN(G, 9)
+ #undef PG10
+ #define PG10 _STM32_PIN(G, 10)
+ #undef PG11
+ #define PG11 _STM32_PIN(G, 11)
+ #undef PG12
+ #define PG12 _STM32_PIN(G, 12)
+ #undef PG13
+ #define PG13 _STM32_PIN(G, 13)
+ #undef PG14
+ #define PG14 _STM32_PIN(G, 14)
+ #undef PG15
+ #define PG15 _STM32_PIN(G, 15)
+
+#endif // STM32GENERIC && STM32F7
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/fastio_STM32_F4_F7.h b/Marlin/src/HAL/HAL_STM32_F4_F7/fastio_STM32_F4_F7.h
deleted file mode 100644
index 566f1a08516e75ef74f0c2e8be111429f59c055e..0000000000000000000000000000000000000000
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/fastio_STM32_F4_F7.h
+++ /dev/null
@@ -1,210 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- * Copyright (c) 2017 Victor Perez
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-#pragma once
-
-/**
- * Fast I/O interfaces for STM32F4/7
- * These use GPIO functions instead of Direct Port Manipulation, as on AVR.
- */
-
-#ifndef PWM
- #define PWM OUTPUT
-#endif
-
-#define READ(IO) digitalRead(IO)
-#define WRITE(IO,V) digitalWrite(IO,V)
-
-#define _GET_MODE(IO)
-#define _SET_MODE(IO,M) pinMode(IO, M)
-#define _SET_OUTPUT(IO) pinMode(IO, OUTPUT) /*!< Output Push Pull Mode & GPIO_NOPULL */
-
-#define OUT_WRITE(IO,V) do{ _SET_OUTPUT(IO); WRITE(IO,V); }while(0)
-
-#define SET_INPUT(IO) _SET_MODE(IO, INPUT) /*!< Input Floating Mode */
-#define SET_INPUT_PULLUP(IO) _SET_MODE(IO, INPUT_PULLUP) /*!< Input with Pull-up activation */
-#define SET_INPUT_PULLDOWN(IO) _SET_MODE(IO, INPUT_PULLDOWN) /*!< Input with Pull-down activation */
-#define SET_OUTPUT(IO) OUT_WRITE(IO, LOW)
-#define SET_PWM(IO) _SET_MODE(IO, PWM)
-
-#define TOGGLE(IO) OUT_WRITE(IO, !READ(IO))
-
-#define IS_INPUT(IO)
-#define IS_OUTPUT(IO)
-
-#define PWM_PIN(P) true
-
-// digitalRead/Write wrappers
-#define extDigitalRead(IO) digitalRead(IO)
-#define extDigitalWrite(IO,V) digitalWrite(IO,V)
-
-//
-// Pins Definitions
-//
-#define PORTA 0
-#define PORTB 1
-#define PORTC 2
-#define PORTD 3
-#define PORTE 4
-#define PORTF 5
-#define PORTG 6
-
-#define _STM32_PIN(P,PN) ((PORT##P * 16) + PN)
-
-#ifndef PA0
- #define PA0 _STM32_PIN(A, 0)
- #define PA1 _STM32_PIN(A, 1)
- #define PA2 _STM32_PIN(A, 2)
- #define PA3 _STM32_PIN(A, 3)
- #define PA4 _STM32_PIN(A, 4)
- #define PA5 _STM32_PIN(A, 5)
- #define PA6 _STM32_PIN(A, 6)
- #define PA7 _STM32_PIN(A, 7)
- #define PA8 _STM32_PIN(A, 8)
- #define PA9 _STM32_PIN(A, 9)
- #define PA10 _STM32_PIN(A, 10)
- #define PA11 _STM32_PIN(A, 11)
- #define PA12 _STM32_PIN(A, 12)
- #define PA13 _STM32_PIN(A, 13)
- #define PA14 _STM32_PIN(A, 14)
- #define PA15 _STM32_PIN(A, 15)
-#endif
-
-#ifndef PB0
- #define PB0 _STM32_PIN(B, 0)
- #define PB1 _STM32_PIN(B, 1)
- #define PB2 _STM32_PIN(B, 2)
- #define PB3 _STM32_PIN(B, 3)
- #define PB4 _STM32_PIN(B, 4)
- #define PB5 _STM32_PIN(B, 5)
- #define PB6 _STM32_PIN(B, 6)
- #define PB7 _STM32_PIN(B, 7)
- #define PB8 _STM32_PIN(B, 8)
- #define PB9 _STM32_PIN(B, 9)
- #define PB10 _STM32_PIN(B, 10)
- #define PB11 _STM32_PIN(B, 11)
- #define PB12 _STM32_PIN(B, 12)
- #define PB13 _STM32_PIN(B, 13)
- #define PB14 _STM32_PIN(B, 14)
- #define PB15 _STM32_PIN(B, 15)
-#endif
-
-#ifndef PC0
- #define PC0 _STM32_PIN(C, 0)
- #define PC1 _STM32_PIN(C, 1)
- #define PC2 _STM32_PIN(C, 2)
- #define PC3 _STM32_PIN(C, 3)
- #define PC4 _STM32_PIN(C, 4)
- #define PC5 _STM32_PIN(C, 5)
- #define PC6 _STM32_PIN(C, 6)
- #define PC7 _STM32_PIN(C, 7)
- #define PC8 _STM32_PIN(C, 8)
- #define PC9 _STM32_PIN(C, 9)
- #define PC10 _STM32_PIN(C, 10)
- #define PC11 _STM32_PIN(C, 11)
- #define PC12 _STM32_PIN(C, 12)
- #define PC13 _STM32_PIN(C, 13)
- #define PC14 _STM32_PIN(C, 14)
- #define PC15 _STM32_PIN(C, 15)
-#endif
-
-#ifndef PD0
- #define PD0 _STM32_PIN(D, 0)
- #define PD1 _STM32_PIN(D, 1)
- #define PD2 _STM32_PIN(D, 2)
- #define PD3 _STM32_PIN(D, 3)
- #define PD4 _STM32_PIN(D, 4)
- #define PD5 _STM32_PIN(D, 5)
- #define PD6 _STM32_PIN(D, 6)
- #define PD7 _STM32_PIN(D, 7)
- #define PD8 _STM32_PIN(D, 8)
- #define PD9 _STM32_PIN(D, 9)
- #define PD10 _STM32_PIN(D, 10)
- #define PD11 _STM32_PIN(D, 11)
- #define PD12 _STM32_PIN(D, 12)
- #define PD13 _STM32_PIN(D, 13)
- #define PD14 _STM32_PIN(D, 14)
- #define PD15 _STM32_PIN(D, 15)
-#endif
-
-#ifndef PE0
- #define PE0 _STM32_PIN(E, 0)
- #define PE1 _STM32_PIN(E, 1)
- #define PE2 _STM32_PIN(E, 2)
- #define PE3 _STM32_PIN(E, 3)
- #define PE4 _STM32_PIN(E, 4)
- #define PE5 _STM32_PIN(E, 5)
- #define PE6 _STM32_PIN(E, 6)
- #define PE7 _STM32_PIN(E, 7)
- #define PE8 _STM32_PIN(E, 8)
- #define PE9 _STM32_PIN(E, 9)
- #define PE10 _STM32_PIN(E, 10)
- #define PE11 _STM32_PIN(E, 11)
- #define PE12 _STM32_PIN(E, 12)
- #define PE13 _STM32_PIN(E, 13)
- #define PE14 _STM32_PIN(E, 14)
- #define PE15 _STM32_PIN(E, 15)
-#endif
-
-#ifdef STM32F7
-
- #ifndef PF0
- #define PORTF 5
- #define PF0 _STM32_PIN(F, 0)
- #define PF1 _STM32_PIN(F, 1)
- #define PF2 _STM32_PIN(F, 2)
- #define PF3 _STM32_PIN(F, 3)
- #define PF4 _STM32_PIN(F, 4)
- #define PF5 _STM32_PIN(F, 5)
- #define PF6 _STM32_PIN(F, 6)
- #define PF7 _STM32_PIN(F, 7)
- #define PF8 _STM32_PIN(F, 8)
- #define PF9 _STM32_PIN(F, 9)
- #define PF10 _STM32_PIN(F, 10)
- #define PF11 _STM32_PIN(F, 11)
- #define PF12 _STM32_PIN(F, 12)
- #define PF13 _STM32_PIN(F, 13)
- #define PF14 _STM32_PIN(F, 14)
- #define PF15 _STM32_PIN(F, 15)
- #endif
-
- #ifndef PG0
- #define PORTG 6
- #define PG0 _STM32_PIN(G, 0)
- #define PG1 _STM32_PIN(G, 1)
- #define PG2 _STM32_PIN(G, 2)
- #define PG3 _STM32_PIN(G, 3)
- #define PG4 _STM32_PIN(G, 4)
- #define PG5 _STM32_PIN(G, 5)
- #define PG6 _STM32_PIN(G, 6)
- #define PG7 _STM32_PIN(G, 7)
- #define PG8 _STM32_PIN(G, 8)
- #define PG9 _STM32_PIN(G, 9)
- #define PG10 _STM32_PIN(G, 10)
- #define PG11 _STM32_PIN(G, 11)
- #define PG12 _STM32_PIN(G, 12)
- #define PG13 _STM32_PIN(G, 13)
- #define PG14 _STM32_PIN(G, 14)
- #define PG15 _STM32_PIN(G, 15)
- #endif
-
-#endif // STM32GENERIC && STM32F7
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/HAL_timers_STM32_F4_F7.h b/Marlin/src/HAL/HAL_STM32_F4_F7/timers.h
similarity index 91%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/HAL_timers_STM32_F4_F7.h
rename to Marlin/src/HAL/HAL_STM32_F4_F7/timers.h
index e7fcd6c7c64c2af344647a4eff764a78d3e543a3..cf33205bddab453136ee043dc70bbf2c7c4e3c83 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/HAL_timers_STM32_F4_F7.h
+++ b/Marlin/src/HAL/HAL_STM32_F4_F7/timers.h
@@ -22,7 +22,7 @@
#pragma once
#ifdef STM32F4
- #include "STM32F4/HAL_timers_STM32F4.h"
+ #include "STM32F4/timers.h"
#else
- #include "STM32F7/HAL_timers_STM32F7.h"
+ #include "STM32F7/timers.h"
#endif
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/watchdog_STM32_F4_F7.cpp b/Marlin/src/HAL/HAL_STM32_F4_F7/watchdog.cpp
similarity index 97%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/watchdog_STM32_F4_F7.cpp
rename to Marlin/src/HAL/HAL_STM32_F4_F7/watchdog.cpp
index efb72a8ba7e43e772b8c95b9891f461b05f55b4b..e078d7a1048c17450940a13bedd06b44841ae2cb 100644
--- a/Marlin/src/HAL/HAL_STM32_F4_F7/watchdog_STM32_F4_F7.cpp
+++ b/Marlin/src/HAL/HAL_STM32_F4_F7/watchdog.cpp
@@ -26,7 +26,7 @@
#if ENABLED(USE_WATCHDOG)
- #include "watchdog_STM32_F4_F7.h"
+ #include "watchdog.h"
IWDG_HandleTypeDef hiwdg;
diff --git a/Marlin/src/HAL/HAL_STM32_F4_F7/watchdog_STM32_F4_F7.h b/Marlin/src/HAL/HAL_STM32_F4_F7/watchdog.h
similarity index 100%
rename from Marlin/src/HAL/HAL_STM32_F4_F7/watchdog_STM32_F4_F7.h
rename to Marlin/src/HAL/HAL_STM32_F4_F7/watchdog.h
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/HAL.h b/Marlin/src/HAL/HAL_TEENSY31_32/HAL.h
index 8911f9cf3b3ed899b9d75b097c87419e875625f8..8c3c355e9c0e5551caa43462013c957250383799 100644
--- a/Marlin/src/HAL/HAL_TEENSY31_32/HAL.h
+++ b/Marlin/src/HAL/HAL_TEENSY31_32/HAL.h
@@ -31,10 +31,10 @@
#include "../shared/math_32bit.h"
#include "../shared/HAL_SPI.h"
-#include "fastio_Teensy.h"
-#include "watchdog_Teensy.h"
+#include "fastio.h"
+#include "watchdog.h"
-#include "HAL_timers_Teensy.h"
+#include "timers.h"
#include <stdint.h>
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/HAL_spi_Teensy.cpp b/Marlin/src/HAL/HAL_TEENSY31_32/HAL_SPI.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY31_32/HAL_spi_Teensy.cpp
rename to Marlin/src/HAL/HAL_TEENSY31_32/HAL_SPI.cpp
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/HAL_Servo_Teensy.cpp b/Marlin/src/HAL/HAL_TEENSY31_32/Servo.cpp
similarity index 98%
rename from Marlin/src/HAL/HAL_TEENSY31_32/HAL_Servo_Teensy.cpp
rename to Marlin/src/HAL/HAL_TEENSY31_32/Servo.cpp
index 2ffd96e3e1bc08e104a4c47d0f042ac02cae1579..7af900b149a2968718791fb7b22e013f5daed99b 100644
--- a/Marlin/src/HAL/HAL_TEENSY31_32/HAL_Servo_Teensy.cpp
+++ b/Marlin/src/HAL/HAL_TEENSY31_32/Servo.cpp
@@ -25,7 +25,7 @@
#if HAS_SERVOS
-#include "HAL_Servo_Teensy.h"
+#include "Servo.h"
uint8_t servoPin[MAX_SERVOS] = { 0 };
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/HAL_Servo_Teensy.h b/Marlin/src/HAL/HAL_TEENSY31_32/Servo.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY31_32/HAL_Servo_Teensy.h
rename to Marlin/src/HAL/HAL_TEENSY31_32/Servo.h
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/fastio_Teensy.h b/Marlin/src/HAL/HAL_TEENSY31_32/fastio.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY31_32/fastio_Teensy.h
rename to Marlin/src/HAL/HAL_TEENSY31_32/fastio.h
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/HAL_timers_Teensy.cpp b/Marlin/src/HAL/HAL_TEENSY31_32/timers.cpp
similarity index 99%
rename from Marlin/src/HAL/HAL_TEENSY31_32/HAL_timers_Teensy.cpp
rename to Marlin/src/HAL/HAL_TEENSY31_32/timers.cpp
index ac04325649786586d4b812a3d0875098fb1d06c6..8531883afa742532323a69db9a524c7560fdbb0b 100644
--- a/Marlin/src/HAL/HAL_TEENSY31_32/HAL_timers_Teensy.cpp
+++ b/Marlin/src/HAL/HAL_TEENSY31_32/timers.cpp
@@ -27,7 +27,7 @@
#ifdef __MK20DX256__
#include "HAL.h"
-#include "HAL_timers_Teensy.h"
+#include "timers.h"
/** \brief Instruction Synchronization Barrier
Instruction Synchronization Barrier flushes the pipeline in the processor,
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/HAL_timers_Teensy.h b/Marlin/src/HAL/HAL_TEENSY31_32/timers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY31_32/HAL_timers_Teensy.h
rename to Marlin/src/HAL/HAL_TEENSY31_32/timers.h
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/watchdog_Teensy.cpp b/Marlin/src/HAL/HAL_TEENSY31_32/watchdog.cpp
similarity index 97%
rename from Marlin/src/HAL/HAL_TEENSY31_32/watchdog_Teensy.cpp
rename to Marlin/src/HAL/HAL_TEENSY31_32/watchdog.cpp
index bf812d9a51d73d48c03fa545ef3e35fbac89ffb3..d1313e1f5debfe946f4630c6c6d1146e9a85868b 100644
--- a/Marlin/src/HAL/HAL_TEENSY31_32/watchdog_Teensy.cpp
+++ b/Marlin/src/HAL/HAL_TEENSY31_32/watchdog.cpp
@@ -26,7 +26,7 @@
#if ENABLED(USE_WATCHDOG)
-#include "watchdog_Teensy.h"
+#include "watchdog.h"
void watchdog_init() {
WDOG_TOVALH = 0;
diff --git a/Marlin/src/HAL/HAL_TEENSY31_32/watchdog_Teensy.h b/Marlin/src/HAL/HAL_TEENSY31_32/watchdog.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY31_32/watchdog_Teensy.h
rename to Marlin/src/HAL/HAL_TEENSY31_32/watchdog.h
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/HAL.h b/Marlin/src/HAL/HAL_TEENSY35_36/HAL.h
index fb152ee30a1ed7be7c235d121d24d2652cdb516c..ff83bd6491ee9512d3c1a6f93e1a45f7dcd9d955 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/HAL.h
+++ b/Marlin/src/HAL/HAL_TEENSY35_36/HAL.h
@@ -31,10 +31,10 @@
#include "../shared/math_32bit.h"
#include "../shared/HAL_SPI.h"
-#include "fastio_Teensy.h"
-#include "watchdog_Teensy.h"
+#include "fastio.h"
+#include "watchdog.h"
-#include "HAL_timers_Teensy.h"
+#include "timers.h"
#include <stdint.h>
#include <util/atomic.h>
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/HAL_spi_Teensy.cpp b/Marlin/src/HAL/HAL_TEENSY35_36/HAL_SPI.cpp
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY35_36/HAL_spi_Teensy.cpp
rename to Marlin/src/HAL/HAL_TEENSY35_36/HAL_SPI.cpp
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/HAL_Servo_Teensy.cpp b/Marlin/src/HAL/HAL_TEENSY35_36/Servo.cpp
similarity index 96%
rename from Marlin/src/HAL/HAL_TEENSY35_36/HAL_Servo_Teensy.cpp
rename to Marlin/src/HAL/HAL_TEENSY35_36/Servo.cpp
index ff56036ccd7a632ebd3dd1e49290e79c026e173b..faf72e9d1e3369048d84e6572201a02b531b7f7d 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/HAL_Servo_Teensy.cpp
+++ b/Marlin/src/HAL/HAL_TEENSY35_36/Servo.cpp
@@ -4,7 +4,7 @@
#if HAS_SERVOS
-#include "HAL_Servo_Teensy.h"
+#include "Servo.h"
uint8_t servoPin[MAX_SERVOS] = { 0 };
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/HAL_Servo_Teensy.h b/Marlin/src/HAL/HAL_TEENSY35_36/Servo.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY35_36/HAL_Servo_Teensy.h
rename to Marlin/src/HAL/HAL_TEENSY35_36/Servo.h
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/fastio_Teensy.h b/Marlin/src/HAL/HAL_TEENSY35_36/fastio.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY35_36/fastio_Teensy.h
rename to Marlin/src/HAL/HAL_TEENSY35_36/fastio.h
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/HAL_timers_Teensy.cpp b/Marlin/src/HAL/HAL_TEENSY35_36/timers.cpp
similarity index 99%
rename from Marlin/src/HAL/HAL_TEENSY35_36/HAL_timers_Teensy.cpp
rename to Marlin/src/HAL/HAL_TEENSY35_36/timers.cpp
index 8c01120cc7861e26687c1f8e8d7226aad2e0adae..af7808618f3d8905bb2e4b59e1481eeec14965ee 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/HAL_timers_Teensy.cpp
+++ b/Marlin/src/HAL/HAL_TEENSY35_36/timers.cpp
@@ -28,7 +28,7 @@
#if defined(__MK64FX512__) || defined(__MK66FX1M0__)
#include "HAL.h"
-#include "HAL_timers_Teensy.h"
+#include "timers.h"
/** \brief Instruction Synchronization Barrier
Instruction Synchronization Barrier flushes the pipeline in the processor,
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/HAL_timers_Teensy.h b/Marlin/src/HAL/HAL_TEENSY35_36/timers.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY35_36/HAL_timers_Teensy.h
rename to Marlin/src/HAL/HAL_TEENSY35_36/timers.h
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/watchdog_Teensy.cpp b/Marlin/src/HAL/HAL_TEENSY35_36/watchdog.cpp
similarity index 97%
rename from Marlin/src/HAL/HAL_TEENSY35_36/watchdog_Teensy.cpp
rename to Marlin/src/HAL/HAL_TEENSY35_36/watchdog.cpp
index 7924c03730639f7a115a6ccfe27e7b050b2074ce..f58217c7505440c5c4fc401f660e366faae34c4f 100644
--- a/Marlin/src/HAL/HAL_TEENSY35_36/watchdog_Teensy.cpp
+++ b/Marlin/src/HAL/HAL_TEENSY35_36/watchdog.cpp
@@ -26,7 +26,7 @@
#if ENABLED(USE_WATCHDOG)
-#include "watchdog_Teensy.h"
+#include "watchdog.h"
void watchdog_init() {
WDOG_TOVALH = 0;
diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/watchdog_Teensy.h b/Marlin/src/HAL/HAL_TEENSY35_36/watchdog.h
similarity index 100%
rename from Marlin/src/HAL/HAL_TEENSY35_36/watchdog_Teensy.h
rename to Marlin/src/HAL/HAL_TEENSY35_36/watchdog.h
diff --git a/Marlin/src/HAL/shared/servo.h b/Marlin/src/HAL/shared/servo.h
index 51b0c7b5714ba34c71b0a76a51179208856a3be0..e4905b7295c8e10f1efa4b0cad5230c355bd477b 100644
--- a/Marlin/src/HAL/shared/servo.h
+++ b/Marlin/src/HAL/shared/servo.h
@@ -68,19 +68,19 @@
*/
#if IS_TEENSY32
- #include "../HAL_TEENSY31_32/HAL_Servo_Teensy.h"
+ #include "../HAL_TEENSY31_32/Servo.h"
#elif IS_TEENSY35 || IS_TEENSY36
- #include "../HAL_TEENSY35_36/HAL_Servo_Teensy.h"
+ #include "../HAL_TEENSY35_36/Servo.h"
#elif defined(TARGET_LPC1768)
- #include "../HAL_LPC1768/HAL_Servo_LPC1768.h"
+ #include "../HAL_LPC1768/Servo.h"
#elif defined(__STM32F1__) || defined(TARGET_STM32F1)
- #include "../HAL_STM32F1/HAL_Servo_STM32F1.h"
+ #include "../HAL_STM32F1/Servo.h"
#elif defined(STM32GENERIC) && defined(STM32F4)
- #include "../HAL_STM32F4/HAL_Servo_STM32F4.h"
+ #include "../HAL_STM32_F4_F7/Servo.h"
#elif defined(ARDUINO_ARCH_STM32)
- #include "../HAL_STM32/HAL_Servo_STM32.h"
+ #include "../HAL_STM32/Servo.h"
#elif defined(ARDUINO_ARCH_ESP32)
- #include "../HAL_ESP32/HAL_Servo_ESP32.h"
+ #include "../HAL_ESP32/Servo.h"
#else
#include <stdint.h>
diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h
index c35aac8ce64115106b3c991f5454e0938a6d0aa0..d02713d273e590e63e4a1804d2f7962e24e15393 100644
--- a/Marlin/src/core/boards.h
+++ b/Marlin/src/core/boards.h
@@ -255,9 +255,9 @@
// STM32 ARM Cortex-M3
//
-#define BOARD_STM32F1R 4000 // STM32R Libmaple-based STM32F1 controller
-#define BOARD_MALYAN_M200 4001 // STM32C8T6 Libmaple-based STM32F1 controller
-#define BOARD_STM3R_MINI 4002 // STM32 Libmaple-based STM32F1 controller
+#define BOARD_STM32F103R 4000 // STM32F103R Libmaple-based STM32F1 controller
+#define BOARD_MALYAN_M200 4001 // STM32C8T6 Libmaple-based STM32F1 controller
+#define BOARD_STM3R_MINI 4002 // STM32F103R Libmaple-based STM32F1 controller
#define BOARD_GTM32_PRO_VB 4003 // STM32F103VET6 controller
#define BOARD_MORPHEUS 4004 // STM32F103C8 / STM32F103CB Libmaple-based STM32F1 controller
#define BOARD_CHITU3D 4005 // Chitu3D (STM32F103RET6)
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 0f4de7e8c526f59ef91b367434df353f91ce00f2..b7633402f35b740078230de75b83d73bab0c70f5 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -395,6 +395,7 @@
#define BOARD_RURAMPS4D -1002
#define BOARD_FORMBOT_TREX2 -1003
#define BOARD_BIQU_SKR_V1_1 -1004
+#define BOARD_STM32F1R -1005
#if MB(MKS_13)
#error "BOARD_MKS_13 has been renamed BOARD_MKS_GEN_13. Please update your configuration."
#elif MB(TRIGORILLA)
@@ -405,12 +406,15 @@
#error "FORMBOT_TREX2 has been renamed BOARD_FORMBOT_TREX2PLUS. Please update your configuration."
#elif MB(BIQU_SKR_V1_1)
#error "BOARD_BIQU_SKR_V1_1 has been renamed BOARD_BIGTREE_SKR_V1_1. Please update your configuration."
+#elif MB(STM32F1R)
+ #error "BOARD_STM32F1R has been renamed BOARD_STM32F103R. Please update your configuration."
#endif
#undef BOARD_MKS_13
#undef BOARD_TRIGORILLA
#undef BOARD_RURAMPS4D
#undef BOARD_FORMBOT_TREX2
#undef BOARD_BIQU_SKR_V1_1
+#undef BOARD_STM32F1R
/**
* Marlin release, version and default string
@@ -1108,6 +1112,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
#error "TOUCH_MI_PROBE requires Z_MIN_PROBE_ENDSTOP_INVERTING to be set to false."
#elif DISABLED(BABYSTEP_ZPROBE_OFFSET)
#error "TOUCH_MI_PROBE requires BABYSTEPPING with BABYSTEP_ZPROBE_OFFSET."
+ #elif !HAS_RESUME_CONTINUE
+ #error "TOUCH_MI_PROBE currently requires an LCD controller or EMERGENCY_PARSER."
#endif
#endif
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 3f4bf1f41b2f0248ef800baa7737f87c9f5c7865..3e1373c628d576917f97f98b9f330a86deb2bed2 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -442,18 +442,18 @@
// STM32 ARM Cortex-M3
//
-#elif MB(STM32F1R)
- #include "stm32/pins_STM32F1R.h" // STM32F1 env:STM32F1
+#elif MB(STM32F103R)
+ #include "stm32/pins_STM32F1R.h" // STM32F1 env:STM32F103R
#elif MB(MALYAN_M200)
#include "stm32/pins_MALYAN_M200.h" // STM32F1 env:malyanm200
#elif MB(STM3R_MINI)
- #include "stm32/pins_STM3R_MINI.h" // STM32F1 env:STM32F1
+ #include "stm32/pins_STM3R_MINI.h" // STM32F1 env:STM32F103R
#elif MB(GTM32_PRO_VB)
- #include "stm32/pins_GTM32_PRO_VB.h" // STM32F1 env:STM32F1
+ #include "stm32/pins_GTM32_PRO_VB.h" // STM32F1 env:STM32F103R
#elif MB(MORPHEUS)
- #include "stm32/pins_MORPHEUS.h" // STM32F1 env:STM32F1
+ #include "stm32/pins_MORPHEUS.h" // STM32F1 env:STM32F103R
#elif MB(CHITU3D)
- #include "stm32/pins_CHITU3D.h" // STM32F1 env:STM32F1
+ #include "stm32/pins_CHITU3D.h" // STM32F1 env:STM32F103R
#elif MB(MKS_ROBIN)
#include "stm32/pins_MKS_ROBIN.h" // STM32F1 env:mks_robin
#elif MB(MKS_ROBIN_MINI)
@@ -463,21 +463,21 @@
#elif MB(MKS_ROBIN_LITE)
#include "stm32/pins_MKS_ROBIN_LITE.h" // STM32F1 env:mks_robin_lite
#elif MB(BIGTREE_SKR_MINI_V1_1)
- #include "stm32/pins_BIGTREE_SKR_MINI_V1_1.h" // STM32F1 env:BIGTREE_SKR_MINI
+ #include "stm32/pins_BIGTREE_SKR_MINI_V1_1.h" // STM32F1 env:STM32F103R_bigtree
#elif MB(BIGTREE_SKR_MINI_E3)
- #include "stm32/pins_BIGTREE_SKR_MINI_E3.h" // STM32F1 env:BIGTREE_SKR_MINI
+ #include "stm32/pins_BIGTREE_SKR_MINI_E3.h" // STM32F1 env:STM32F103R_bigtree
#elif MB(BIGTREE_SKR_E3_DIP)
- #include "stm32/pins_BIGTREE_SKR_E3_DIP.h" // STM32F1 env:BIGTREE_SKR_MINI
+ #include "stm32/pins_BIGTREE_SKR_E3_DIP.h" // STM32F1 env:STM32F103R_bigtree
#elif MB(JGAURORA_A5S_A1)
#include "stm32/pins_JGAURORA_A5S_A1.h" // STM32F1 env:jgaurora_a5s_a1
#elif MB(FYSETC_AIO_II)
- #include "stm32/pins_FYSETC_AIO_II.h" // STM32F1 env:fysetc_STM32F1
+ #include "stm32/pins_FYSETC_AIO_II.h" // STM32F1 env:STM32F103R_fysetc
#elif MB(FYSETC_CHEETAH)
- #include "stm32/pins_FYSETC_CHEETAH.h" // STM32F1 env:fysetc_STM32F1
+ #include "stm32/pins_FYSETC_CHEETAH.h" // STM32F1 env:STM32F103R_fysetc
#elif MB(FYSETC_CHEETAH_V12)
- #include "stm32/pins_FYSETC_CHEETAH_V12.h" // STM32F1 env:fysetc_STM32F1
+ #include "stm32/pins_FYSETC_CHEETAH_V12.h" // STM32F1 env:STM32F103R_fysetc
#elif MB(LONGER3D_LK)
- #include "stm32/pins_LONGER3D_LK.h" // STM32F1 env:alfawise_U20
+ #include "stm32/pins_LONGER3D_LK.h" // STM32F1 env:STM32F103V_longer
//
// ARM Cortex-M4F
@@ -501,7 +501,7 @@
#elif MB(RUMBA32)
#include "stm32/pins_RUMBA32.h" // STM32F4 env:RUMBA32
#elif MB(BLACK_STM32F407VE)
- #include "stm32/pins_BLACK_STM32F407VE.h" // STM32F4 env:black_stm32f407ve
+ #include "stm32/pins_BLACK_STM32F407VE.h" // STM32F4 env:STM32F407VE_black
#elif MB(STEVAL)
#include "stm32/pins_STEVAL.h" // STM32F4 env:STM32F4
#elif MB(BIGTREE_SKR_PRO_V1_1)
@@ -530,7 +530,7 @@
//
#elif MB(AGCM4_RURAMPS4D_13)
- #include "samd/pins_AGCM4_RURAMPS4D_13.h" // SAMD51 env:adafruit_grandcentral_m4
+ #include "samd/pins_AGCM4_RURAMPS4D_13.h" // SAMD51 env:SAMD51_grandcentral_m4
//
// Linux Native Debug board
diff --git a/Marlin/src/pins/stm32/pins_STM32F4.h b/Marlin/src/pins/stm32/pins_STM32F4.h
index 48ae32f108c0e8fc75569189a70e893b521c3432..39ccf57dff2e28e8fde6e6f546932d873b52cf23 100644
--- a/Marlin/src/pins/stm32/pins_STM32F4.h
+++ b/Marlin/src/pins/stm32/pins_STM32F4.h
@@ -21,6 +21,10 @@
*/
#pragma once
+/**
+ * To build with Arduino IDE use "Discovery F407VG"
+ * To build with PlatformIO use environment "STM32F4"
+ */
#if !defined(STM32F4) && !defined(STM32F4xx)
#error "Oops! Select an STM32F4 board in 'Tools > Board.'"
#elif HOTENDS > 2 || E_STEPPERS > 2
diff --git a/buildroot/share/PlatformIO/ldscripts/alfawise_Ux0.ld b/buildroot/share/PlatformIO/ldscripts/longer_STM32.ld
similarity index 100%
rename from buildroot/share/PlatformIO/ldscripts/alfawise_Ux0.ld
rename to buildroot/share/PlatformIO/ldscripts/longer_STM32.ld
diff --git a/buildroot/share/PlatformIO/scripts/fysetc_STM32F1.py b/buildroot/share/PlatformIO/scripts/STM32F103R_fysetc.py
similarity index 100%
rename from buildroot/share/PlatformIO/scripts/fysetc_STM32F1.py
rename to buildroot/share/PlatformIO/scripts/STM32F103R_fysetc.py
diff --git a/buildroot/share/PlatformIO/scripts/alfawise_Ux0.py b/buildroot/share/PlatformIO/scripts/longer_STM32.py
similarity index 97%
rename from buildroot/share/PlatformIO/scripts/alfawise_Ux0.py
rename to buildroot/share/PlatformIO/scripts/longer_STM32.py
index e2716a76be15a0977a84d4de67ca5a929ab6d10a..77df4825c12766ea010f8e15bf952855023e711a 100644
--- a/buildroot/share/PlatformIO/scripts/alfawise_Ux0.py
+++ b/buildroot/share/PlatformIO/scripts/longer_STM32.py
@@ -5,7 +5,7 @@ for define in env['CPPDEFINES']:
if define[0] == "VECT_TAB_ADDR":
env['CPPDEFINES'].remove(define)
env['CPPDEFINES'].append(("VECT_TAB_ADDR", "0x08010000"))
-env.Replace(LDSCRIPT_PATH="buildroot/share/PlatformIO/ldscripts/alfawise_Ux0.ld")
+env.Replace(LDSCRIPT_PATH="buildroot/share/PlatformIO/ldscripts/longer_STM32.ld")
# Rename ${PROGNAME}.bin and save it as 'project.bin' (No encryption on the Longer3D)
def encrypt(source, target, env):
diff --git a/buildroot/share/git/mftest b/buildroot/share/git/mftest
index c2b57086ff10fe8a6b5941ac5dd3106619a6507e..6c345f7906d29a16041421b670116f7096bccef1 100755
--- a/buildroot/share/git/mftest
+++ b/buildroot/share/git/mftest
@@ -26,8 +26,8 @@ case $TESTENV in
lpc?(8)) TESTENV='LPC1768' ;;
lpc9) TESTENV='LPC1769' ;;
mega) TESTENV='megaatmega2560' ;;
- stm) TESTENV='STM32F1' ;;
- f1) TESTENV='STM32F1' ;;
+ stm) TESTENV='STM32F103R' ;;
+ f1) TESTENV='STM32F103R' ;;
f4) TESTENV='STM32F4' ;;
f7) TESTENV='STM32F7' ;;
teensy) TESTENV='teensy31' ;;
diff --git a/buildroot/share/tests/BIGTREE_BTT002-tests b/buildroot/share/tests/BIGTREE_BTT002-tests
new file mode 100644
index 0000000000000000000000000000000000000000..45366e3f5a5d08b375370c90f8d28ce280c93de0
--- /dev/null
+++ b/buildroot/share/tests/BIGTREE_BTT002-tests
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+#
+# Build tests for STM32F407VET6 BigTreeTech BTT002
+#
+
+# exit on first failure
+set -e
+
+#
+# Build with the default configurations
+#
+restore_configs
+opt_set MOTHERBOARD BOARD_BIGTREE_BTT002_V1_0
+opt_set SERIAL_PORT 1
+exec_test $1 $2 "BigTreeTech BTT002 Default Configuration"
+
+# clean up
+restore_configs
diff --git a/buildroot/share/tests/BIGTREE_SKR_PRO-tests b/buildroot/share/tests/BIGTREE_SKR_PRO-tests
index d0a99679e6e77eccf10914a1a51006c8ae14cd7e..ef4dc606107a379d91fb451bf93d46dd1e5ff7f3 100644
--- a/buildroot/share/tests/BIGTREE_SKR_PRO-tests
+++ b/buildroot/share/tests/BIGTREE_SKR_PRO-tests
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
-# Build tests for STM32F4 BigTree_SKR_Pro
+# Build tests for STM32F407ZG BigTreeTech SKR Pro
#
# exit on first failure
@@ -12,7 +12,7 @@ set -e
restore_configs
opt_set MOTHERBOARD BOARD_BIGTREE_SKR_PRO_V1_1
opt_set SERIAL_PORT 1
-exec_test $1 $2 "Default Configuration"
+exec_test $1 $2 "BigTreeTech SKR Pro Default Configuration"
# clean up
restore_configs
diff --git a/buildroot/share/tests/LPC1768-tests b/buildroot/share/tests/LPC1768-tests
index 0ba62ab6a31f40243e0f6aa5753c9caa3b93fb35..e66087a00c593be2a911b7fe53b59896f84635f3 100755
--- a/buildroot/share/tests/LPC1768-tests
+++ b/buildroot/share/tests/LPC1768-tests
@@ -9,9 +9,9 @@ set -e
#
# Build with the default configurations
#
-restore_configs
-opt_set MOTHERBOARD BOARD_RAMPS_14_RE_ARM_EFB
-exec_test $1 $2 "Default Configuration"
+#restore_configs
+#opt_set MOTHERBOARD BOARD_RAMPS_14_RE_ARM_EFB
+#exec_test $1 $2 "Default Configuration"
restore_configs
opt_set MOTHERBOARD BOARD_RAMPS_14_RE_ARM_EFB
@@ -19,9 +19,9 @@ opt_enable VIKI2 SDSUPPORT SERIAL_PORT2 NEOPIXEL_LED BAUD_RATE_GCODE
opt_set NEOPIXEL_PIN P1_16
exec_test $1 $2 "ReARM EFB VIKI2, SDSUPPORT, 2 Serial ports (USB CDC + UART0), NeoPixel"
-restore_configs
-use_example_configs Mks/Sbase
-exec_test $1 $2 "MKS SBASE Example Config"
+#restore_configs
+#use_example_configs Mks/Sbase
+#exec_test $1 $2 "MKS SBASE Example Config"
restore_configs
opt_set MOTHERBOARD BOARD_MKS_SBASE
@@ -47,21 +47,5 @@ opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT ADAPTIVE_FAN_
opt_set GRID_MAX_POINTS_X 16
exec_test $1 $2 "Re-ARM with Many Features"
-restore_configs
-opt_set MOTHERBOARD BOARD_RAMPS_14_RE_ARM_EFB
-opt_enable COREYX USE_XMAX_PLUG DAC_MOTOR_CURRENT_DEFAULT \
- REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT BABYSTEPPING \
- AUTO_BED_LEVELING_UBL RESTORE_LEVELING_AFTER_G28 EEPROM_SETTINGS \
- FILAMENT_LCD_DISPLAY FILAMENT_WIDTH_SENSOR FAN_SOFT_PWM \
- SHOW_TEMP_ADC_VALUES HOME_Y_BEFORE_X EMERGENCY_PARSER FAN_KICKSTART_TIME \
- SD_ABORT_ON_ENDSTOP_HIT ADVANCED_OK GCODE_MACROS \
- VOLUMETRIC_DEFAULT_ON NO_WORKSPACE_OFFSETS ACTION_ON_KILL \
- EXTRA_FAN_SPEED FWRETRACT Z_DUAL_STEPPER_DRIVERS Z_DUAL_ENDSTOPS \
- MENU_ADDAUTOSTART SDCARD_SORT_ALPHA
-opt_set FAN_MIN_PWM 50
-opt_set FAN_KICKSTART_TIME 100
-opt_set XY_FREQUENCY_LIMIT 15
-exec_test $1 $2 "Re-ARM with Many less common options"
-
# clean up
restore_configs
diff --git a/buildroot/share/tests/LPC1769-tests b/buildroot/share/tests/LPC1769-tests
index 5d3631aae12c2bb3d8f5a5c01bcd1678edaaed26..e993f864921ea9e69bb51ca728cdb2a617c0c5a1 100755
--- a/buildroot/share/tests/LPC1769-tests
+++ b/buildroot/share/tests/LPC1769-tests
@@ -24,22 +24,22 @@ opt_enable VIKI2 SDSUPPORT ADAPTIVE_FAN_SLOWING NO_FAN_SLOWING_IN_PID_TUNING \
Z_SAFE_HOMING ADVANCED_PAUSE_FEATURE PARK_HEAD_ON_PAUSE BAUD_RATE_GCODE \
LCD_INFO_MENU ARC_SUPPORT BEZIER_CURVE_SUPPORT EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES SDCARD_SORT_ALPHA
opt_set GRID_MAX_POINTS_X 16
-exec_test $1 $2 "Smoothieboard Many Features"
+exec_test $1 $2 "Smoothieboard with many features"
-restore_configs
-opt_set MOTHERBOARD BOARD_AZTEEG_X5_MINI_WIFI
-opt_enable COREYX USE_XMAX_PLUG DAC_MOTOR_CURRENT_DEFAULT \
- REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT BABYSTEPPING \
- AUTO_BED_LEVELING_UBL RESTORE_LEVELING_AFTER_G28 EEPROM_SETTINGS \
- FILAMENT_LCD_DISPLAY FILAMENT_WIDTH_SENSOR FAN_SOFT_PWM \
- SHOW_TEMP_ADC_VALUES HOME_Y_BEFORE_X EMERGENCY_PARSER FAN_KICKSTART_TIME \
- SD_ABORT_ON_ENDSTOP_HIT ADVANCED_OK GCODE_MACROS BAUD_RATE_GCODE \
- VOLUMETRIC_DEFAULT_ON NO_WORKSPACE_OFFSETS ACTION_ON_KILL \
- EXTRA_FAN_SPEED FWRETRACT MENU_ADDAUTOSTART SDCARD_SORT_ALPHA
-opt_set FAN_MIN_PWM 50
-opt_set FAN_KICKSTART_TIME 100
-opt_set XY_FREQUENCY_LIMIT 15
-exec_test $1 $2 "Azteeg X5 MINI WIFI Many less common options"
+#restore_configs
+#opt_set MOTHERBOARD BOARD_AZTEEG_X5_MINI_WIFI
+#opt_enable COREYX USE_XMAX_PLUG DAC_MOTOR_CURRENT_DEFAULT \
+# REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT BABYSTEPPING \
+# AUTO_BED_LEVELING_UBL RESTORE_LEVELING_AFTER_G28 EEPROM_SETTINGS \
+# FILAMENT_LCD_DISPLAY FILAMENT_WIDTH_SENSOR FAN_SOFT_PWM \
+# SHOW_TEMP_ADC_VALUES HOME_Y_BEFORE_X EMERGENCY_PARSER FAN_KICKSTART_TIME \
+# SD_ABORT_ON_ENDSTOP_HIT ADVANCED_OK GCODE_MACROS BAUD_RATE_GCODE \
+# VOLUMETRIC_DEFAULT_ON NO_WORKSPACE_OFFSETS ACTION_ON_KILL \
+# EXTRA_FAN_SPEED FWRETRACT MENU_ADDAUTOSTART SDCARD_SORT_ALPHA
+#opt_set FAN_MIN_PWM 50
+#opt_set FAN_KICKSTART_TIME 100
+#opt_set XY_FREQUENCY_LIMIT 15
+#exec_test $1 $2 "Azteeg X5 MINI WIFI Many less common options"
restore_configs
use_example_configs delta/generic
@@ -51,7 +51,7 @@ opt_set Y_DRIVER_TYPE TMC2130
opt_set Z_DRIVER_TYPE TMC2130
opt_enable TMC_USE_SW_SPI MONITOR_DRIVER_STATUS STEALTHCHOP_XY STEALTHCHOP_Z HYBRID_THRESHOLD TMC_DEBUG \
SENSORLESS_PROBING X_STALL_SENSITIVITY Y_STALL_SENSITIVITY Z_STALL_SENSITIVITY
-exec_test $1 $2 "Delta Config (generic) + BOARD_COHESION3D_REMIX + UBL + EEPROM_SETTINGS + SENSORLESS_PROBING"
+exec_test $1 $2 "Cohesion3D Remix DELTA + ABL Bilinear + EEPROM + SENSORLESS_PROBING"
# clean up
restore_configs
diff --git a/buildroot/share/tests/adafruit_grandcentral_m4-tests b/buildroot/share/tests/SAMD51_grandcentral_m4-tests
similarity index 100%
rename from buildroot/share/tests/adafruit_grandcentral_m4-tests
rename to buildroot/share/tests/SAMD51_grandcentral_m4-tests
diff --git a/buildroot/share/tests/STM32F1-tests b/buildroot/share/tests/STM32F103R-tests
similarity index 94%
rename from buildroot/share/tests/STM32F1-tests
rename to buildroot/share/tests/STM32F103R-tests
index d7420a667e17c6d5616330fc149e93946c74554d..519957c470c60400f26dc64de091b9abaaee3069 100755
--- a/buildroot/share/tests/STM32F1-tests
+++ b/buildroot/share/tests/STM32F103R-tests
@@ -10,7 +10,7 @@ set -e
# Build with the default configurations
#
restore_configs
-opt_set MOTHERBOARD BOARD_STM32F1R
+opt_set MOTHERBOARD BOARD_STM32F103R
opt_set EXTRUDERS 2
opt_set SERIAL_PORT -1
opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT \
diff --git a/buildroot/share/tests/BIGTREE_SKR_MINI-tests b/buildroot/share/tests/STM32F103R_bigtree-tests
similarity index 100%
rename from buildroot/share/tests/BIGTREE_SKR_MINI-tests
rename to buildroot/share/tests/STM32F103R_bigtree-tests
diff --git a/buildroot/share/tests/fysetc_STM32F1-tests b/buildroot/share/tests/STM32F103R_fysetc-tests
similarity index 100%
rename from buildroot/share/tests/fysetc_STM32F1-tests
rename to buildroot/share/tests/STM32F103R_fysetc-tests
diff --git a/buildroot/share/tests/alfawise_U20-tests b/buildroot/share/tests/STM32F103V_longer-tests
similarity index 100%
rename from buildroot/share/tests/alfawise_U20-tests
rename to buildroot/share/tests/STM32F103V_longer-tests
diff --git a/buildroot/share/tests/black_stm32f407ve-tests b/buildroot/share/tests/STM32F407VE_black-tests
similarity index 100%
rename from buildroot/share/tests/black_stm32f407ve-tests
rename to buildroot/share/tests/STM32F407VE_black-tests
diff --git a/buildroot/share/tests/megaatmega1280-tests b/buildroot/share/tests/megaatmega1280-tests
index ec30d478d59df06b9d1a3b84a1c22ff2006279d3..947938bdde27efad5027d81a2ec1d784c2269888 100644
--- a/buildroot/share/tests/megaatmega1280-tests
+++ b/buildroot/share/tests/megaatmega1280-tests
@@ -9,8 +9,16 @@ set -e
#
# Build with the default configurations
#
+#restore_configs
+#exec_test $1 $2 "Default Configuration"
+
+#
+# Test MESH_BED_LEVELING feature, with LCD
+#
restore_configs
-exec_test $1 $2 "Default Configuration"
+opt_enable SPINDLE_FEATURE MESH_BED_LEVELING G26_MESH_EDITING MESH_G28_REST_ORIGIN LCD_BED_LEVELING MESH_EDIT_MENU ULTIMAKERCONTROLLER
+exec_test $1 $2 "Spindle, MESH_BED_LEVELING, and LCD"
+
# clean up
restore_configs
diff --git a/buildroot/share/tests/megaatmega2560-tests b/buildroot/share/tests/megaatmega2560-tests
index a1c10a4942c15b931c4ba22f7b780a2bc7b64b16..9f65ba9fd600d03a0467f09dce209483ac780f1f 100755
--- a/buildroot/share/tests/megaatmega2560-tests
+++ b/buildroot/share/tests/megaatmega2560-tests
@@ -9,14 +9,15 @@ set -e
#
# Build with the default configurations
#
-restore_configs
-exec_test $1 $2 "Default Configuration"
+#restore_configs
+#exec_test $1 $2 "Default Configuration"
#
# Test 2 extruders (one MAX6675) and heated bed on basic RAMPS 1.4
# Test a "Fix Mounted" Probe with Safe Homing, some arc options,
# linear bed leveling, M48, leveling debug, and firmware retraction.
#
+restore_configs
opt_set MOTHERBOARD BOARD_RAMPS_14_EEB
opt_set EXTRUDERS 2
opt_set TEMP_SENSOR_0 -2
@@ -81,13 +82,6 @@ opt_set NUM_SERVOS 1
opt_enable NO_VOLUMETRICS EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES AUTOTEMP G38_PROBE_TARGET
exec_test $1 $2 "RAMPS with ZONESTAR_LCD, Servo Probe, 3-Point ABL, DEBUG_LEVELING_FEATURE, EEPROM, G38, and more"
-#
-# Test MESH_BED_LEVELING feature, with LCD
-#
-restore_configs
-opt_enable SPINDLE_FEATURE MESH_BED_LEVELING G26_MESH_EDITING MESH_G28_REST_ORIGIN LCD_BED_LEVELING MESH_EDIT_MENU ULTIMAKERCONTROLLER
-exec_test $1 $2 "Spindle, MESH_BED_LEVELING, and LCD"
-
#
# Test MINIRAMBO with PWM_MOTOR_CURRENT and many features
#
diff --git a/config/examples/STM32/STM32F10/Configuration.h b/config/examples/STM32/STM32F103R/Configuration.h
similarity index 99%
rename from config/examples/STM32/STM32F10/Configuration.h
rename to config/examples/STM32/STM32F103R/Configuration.h
index adbc7fc5cc95427d7e3cdbefbfae85483d843350..19c5724fbdb683f0c870ba9b627104ffb63d8d26 100644
--- a/config/examples/STM32/STM32F10/Configuration.h
+++ b/config/examples/STM32/STM32F103R/Configuration.h
@@ -129,7 +129,7 @@
// Choose the name from boards.h that matches your setup
#ifndef MOTHERBOARD
- #define MOTHERBOARD BOARD_STM32F1R
+ #define MOTHERBOARD BOARD_STM32F103R
#endif
// Name displayed in the LCD "Ready" message and Info menu
diff --git a/config/examples/STM32/stm32f103ret6/Configuration.h b/config/examples/STM32/stm32f103ret6/Configuration.h
index 2a4bb277624b4337f73b8d96e1c20e37de7afb14..ed02c0957c3d2d9978d2c7420b665faa16ae8bdc 100644
--- a/config/examples/STM32/stm32f103ret6/Configuration.h
+++ b/config/examples/STM32/stm32f103ret6/Configuration.h
@@ -129,7 +129,7 @@
// Choose the name from boards.h that matches your setup
#ifndef MOTHERBOARD
- #define MOTHERBOARD BOARD_STM32F1R
+ #define MOTHERBOARD BOARD_STM32F103R
#endif
// Name displayed in the LCD "Ready" message and Info menu
diff --git a/platformio.ini b/platformio.ini
index 18b1439544fc37c02ef642b6a3b8b9c316045dfe..cdf5c7614387ceae68a32fd1a457ddd25b5cc26c 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -257,11 +257,11 @@ monitor_speed = 250000
#
# STM32F103RE
#
-[env:STM32F1]
+[env:STM32F103R]
platform = ststm32
framework = arduino
board = genericSTM32F103RE
-build_flags = !python Marlin/src/HAL/HAL_STM32F1/STM32F1_flag_script.py
+build_flags = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
${common.build_flags} -std=gnu++14
-DDEBUG_LEVEL=0
build_unflags = -std=gnu++11
@@ -271,16 +271,16 @@ src_filter = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
monitor_speed = 250000
#
-# fysetc_STM32F1
+# STM32F103R_fysetc
#
-[env:fysetc_STM32F1]
+[env:STM32F103R_fysetc]
platform = ststm32
framework = arduino
board = genericSTM32F103RC
#board_build.core = maple
platform_packages = tool-stm32duino
-extra_scripts = buildroot/share/PlatformIO/scripts/fysetc_STM32F1.py
-build_flags = !python Marlin/src/HAL/HAL_STM32F1/STM32F1_flag_script.py
+extra_scripts = buildroot/share/PlatformIO/scripts/STM32F103R_fysetc.py
+build_flags = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
${common.build_flags} -std=gnu++14
-DDEBUG_LEVEL=0 -DHAVE_SW_SERIAL
build_unflags = -std=gnu++11
@@ -296,13 +296,13 @@ upload_protocol = serial
#
# BigTree SKR Mini V1.1 / SKR mini E3 / SKR E3 DIP (STM32F103RCT6 ARM Cortex-M3)
#
-[env:BIGTREE_SKR_MINI]
+[env:STM32F103R_bigtree]
platform = ststm32
framework = arduino
board = genericSTM32F103RC
platform_packages = tool-stm32duino
extra_scripts = buildroot/share/PlatformIO/scripts/STM32F1_SKR_MINI.py
-build_flags = !python Marlin/src/HAL/HAL_STM32F1/STM32F1_flag_script.py
+build_flags = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
${common.build_flags} -std=gnu++14
-DDEBUG_LEVEL=0
build_unflags = -std=gnu++11
@@ -355,13 +355,13 @@ monitor_speed = 250000
#
# Longer 3D board in Alfawise U20 (STM32F103VET6)
#
-[env:alfawise_U20]
+[env:STM32F103V_longer]
platform = ststm32
framework = arduino
board = genericSTM32F103VE
monitor_speed = 250000
-extra_scripts = buildroot/share/PlatformIO/scripts/alfawise_Ux0.py
-build_flags = !python Marlin/src/HAL/HAL_STM32F1/STM32F1_flag_script.py
+extra_scripts = buildroot/share/PlatformIO/scripts/longer_STM32.py
+build_flags = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
${common.build_flags} -std=gnu++14
-DSTM32F1xx -DU20 -DTS_V12
build_unflags = -std=gnu++11 -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1 -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6
@@ -377,7 +377,7 @@ platform = ststm32
framework = arduino
board = genericSTM32F103ZE
extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin.py
-build_flags = !python Marlin/src/HAL/HAL_STM32F1/STM32F1_flag_script.py
+build_flags = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
${common.build_flags} -std=gnu++14
build_unflags = -std=gnu++11
src_filter = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
@@ -392,7 +392,7 @@ platform = ststm32
framework = arduino
board = genericSTM32F103RC
extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_lite.py
-build_flags = !python Marlin/src/HAL/HAL_STM32F1/STM32F1_flag_script.py
+build_flags = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
${common.build_flags} -std=gnu++14
build_unflags = -std=gnu++11
src_filter = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
@@ -407,7 +407,7 @@ platform = ststm32
framework = arduino
board = genericSTM32F103VE
extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_mini.py
-build_flags = !python Marlin/src/HAL/HAL_STM32F1/STM32F1_flag_script.py
+build_flags = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
${common.build_flags} -std=gnu++14
build_unflags = -std=gnu++11
src_filter = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
@@ -422,7 +422,7 @@ platform = ststm32
framework = arduino
board = genericSTM32F103VE
extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_nano.py
-build_flags = !python Marlin/src/HAL/HAL_STM32F1/STM32F1_flag_script.py
+build_flags = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
${common.build_flags} -std=gnu++14
build_unflags = -std=gnu++11
src_filter = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
@@ -437,7 +437,7 @@ platform = ststm32
framework = arduino
board = genericSTM32F103ZE
extra_scripts = buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py
-build_flags = !python Marlin/src/HAL/HAL_STM32F1/STM32F1_flag_script.py
+build_flags = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
${common.build_flags} -DSTM32F1xx -std=gnu++14
build_unflags = -std=gnu++11
src_filter = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
@@ -450,7 +450,7 @@ monitor_speed = 250000
# 'Black' STM32F407VET6 board - http://wiki.stm32duino.com/index.php?title=STM32F407
# Shield - https://github.com/jmz52/Hardware
#
-[env:black_stm32f407ve]
+[env:STM32F407VE_black]
platform = ststm32@5.4.3
framework = arduino
board = blackSTM32F407VET6
@@ -533,7 +533,7 @@ monitor_speed = 250000
platform = ststm32
framework = arduino
board = malyanM200
-build_flags = !python Marlin/src/HAL/HAL_STM32F1/STM32F1_flag_script.py -DMCU_STM32F103CB -D __STM32F1__=1 -std=c++1y -D MOTHERBOARD="BOARD_MALYAN_M200" -DSERIAL_USB -ffunction-sections -fdata-sections -Wl,--gc-sections
+build_flags = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py -DMCU_STM32F103CB -D __STM32F1__=1 -std=c++1y -D MOTHERBOARD="BOARD_MALYAN_M200" -DSERIAL_USB -ffunction-sections -fdata-sections -Wl,--gc-sections
-DDEBUG_LEVEL=0
src_filter = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
#-<frameworks>
@@ -586,7 +586,7 @@ src_filter = ${common.default_src_filter} +<src/HAL/HAL_LINUX>
#
# Adafruit Grand Central M4 (Atmel SAMD51P20A ARM Cortex-M4)
#
-[env:adafruit_grandcentral_m4]
+[env:SAMD51_grandcentral_m4]
platform = atmelsam
board = adafruit_grandcentral_m4
framework = arduino