Shorter paths to HAL, ExtUI (#17156)

Marlin/src/HAL/AVR/MarlinSerial.cpp

@@ -55,7 +55,7 @@
   // A SW memory barrier, to ensure GCC does not overoptimize loops
   #define sw_barrier() asm volatile("": : :"memory");
 
-  #include "../../feature/emergency_parser.h"
+  #include "../../feature/e_parser.h"
 
   // "Atomically" read the RX head index value without disabling interrupts:
   // This MUST be called with RX interrupts enabled, and CAN'T be called

Marlin/src/HAL/DUE/MarlinSerial.cpp

@@ -45,7 +45,7 @@ template<typename Cfg> typename MarlinSerial<Cfg>::ring_buffer_pos_t MarlinSeria
 // A SW memory barrier, to ensure GCC does not overoptimize loops
 #define sw_barrier() asm volatile("": : :"memory");
 
-#include "../../feature/emergency_parser.h"
+#include "../../feature/e_parser.h"
 
 // (called with RX interrupts disabled)
 template<typename Cfg>

Marlin/src/HAL/DUE/MarlinSerialUSB.cpp

@@ -34,7 +34,7 @@
 #include "MarlinSerialUSB.h"
 
 #if ENABLED(EMERGENCY_PARSER)
-  #include "../../feature/emergency_parser.h"
+  #include "../../feature/e_parser.h"
 #endif
 
 // Imports from Atmel USB Stack/CDC implementation

Marlin/src/HAL/LINUX/include/serial.h

@@ -23,7 +23,7 @@
 
 #include "../../../inc/MarlinConfigPre.h"
 #if ENABLED(EMERGENCY_PARSER)
-  #include "../../../feature/emergency_parser.h"
+  #include "../../../feature/e_parser.h"
 #endif
 
 #include <stdarg.h>

Marlin/src/HAL/LPC1768/MarlinSerial.h

@@ -26,7 +26,7 @@
 
 #include "../../inc/MarlinConfigPre.h"
 #if ENABLED(EMERGENCY_PARSER)
-  #include "../../feature/emergency_parser.h"
+  #include "../../feature/e_parser.h"
 #endif
 
 #ifndef SERIAL_PORT

Marlin/src/HAL/LPC1768/usb_serial.cpp

@@ -26,7 +26,7 @@
 
 #if ENABLED(EMERGENCY_PARSER)
 
-#include "../../feature/emergency_parser.h"
+#include "../../feature/e_parser.h"
 EmergencyParser::State emergency_state;
 bool CDC_RecvCallback(const char buffer) {
   emergency_parser.update(emergency_state, buffer);

Marlin/src/HAL/STM32/pinsDebug_STM32GENERIC.h

@@ -29,9 +29,9 @@
 #ifdef BOARD_NR_GPIO_PINS  // Only in STM32GENERIC (Maple)
 
 #ifdef __STM32F1__
-  #include "../HAL_STM32F1/fastio.h"
+  #include "../STM32F1/fastio.h"
 #elif defined(STM32F4) || defined(STM32F7)
-  #include "../HAL_STM32_F4_F7/fastio.h"
+  #include "../STM32_F4_F7/fastio.h"
 #else
   #include "fastio.h"
 #endif

Marlin/src/HAL/STM32F1/build_flags.py

@@ -15,7 +15,7 @@ if __name__ == "__main__":
                     "--specs=nano.specs",
                     "--specs=nosys.specs",
 
-                    "-IMarlin/src/HAL/HAL_STM32F1",
+                    "-IMarlin/src/HAL/STM32F1",
 
                     "-MMD",
                     "-MP",

Marlin/src/HAL/STM32F1/pinsDebug.h

@@ -19,9 +19,9 @@
 #pragma once
 
 #ifdef NUM_DIGITAL_PINS             // Only in ST's Arduino core (STM32duino, STM32Core)
-  #include "../HAL_STM32/pinsDebug_STM32duino.h"
+  #include "../STM32/pinsDebug_STM32duino.h"
 #elif defined(BOARD_NR_GPIO_PINS)   // Only in STM32GENERIC (Maple)
-  #include "../HAL_STM32/pinsDebug_STM32GENERIC.h"
+  #include "../STM32/pinsDebug_STM32GENERIC.h"
 #else
   #error "M43 not supported for this board"
 #endif

Marlin/src/HAL/STM32_F4_F7/pinsDebug.h

@@ -19,9 +19,9 @@
 #pragma once
 
 #ifdef NUM_DIGITAL_PINS             // Only in ST's Arduino core (STM32duino, STM32Core)
-  #include "../HAL_STM32/pinsDebug_STM32duino.h"
+  #include "../STM32/pinsDebug_STM32duino.h"
 #elif defined(BOARD_NR_GPIO_PINS)   // Only in STM32GENERIC (Maple)
-  #include "../HAL_STM32/pinsDebug_STM32GENERIC.h"
+  #include "../STM32/pinsDebug_STM32GENERIC.h"
 #else
   #error "M43 Pins Debugging not supported for this board."
 #endif

Marlin/src/HAL/platforms.h

@@ -21,32 +21,30 @@
  */
 #pragma once
 
+#define XSTR(V...) #V
+
 #ifdef __AVR__
-  #define HAL_PLATFORM HAL_AVR
+  #define HAL_PATH(PATH, NAME) XSTR(PATH/AVR/NAME)
 #elif defined(ARDUINO_ARCH_SAM)
-  #define HAL_PLATFORM HAL_DUE
+  #define HAL_PATH(PATH, NAME) XSTR(PATH/DUE/NAME)
 #elif defined(__MK20DX256__)
-  #define HAL_PLATFORM HAL_TEENSY31_32
+  #define HAL_PATH(PATH, NAME) XSTR(PATH/TEENSY31_32/NAME)
 #elif defined(__MK64FX512__) || defined(__MK66FX1M0__)
-  #define HAL_PLATFORM HAL_TEENSY35_36
+  #define HAL_PATH(PATH, NAME) XSTR(PATH/TEENSY35_36/NAME)
 #elif defined(TARGET_LPC1768)
-  #define HAL_PLATFORM HAL_LPC1768
+  #define HAL_PATH(PATH, NAME) XSTR(PATH/LPC1768/NAME)
 #elif defined(__STM32F1__) || defined(TARGET_STM32F1)
-  #define HAL_PLATFORM HAL_STM32F1
+  #define HAL_PATH(PATH, NAME) XSTR(PATH/STM32F1/NAME)
 #elif defined(STM32GENERIC) && (defined(STM32F4) || defined(STM32F7))
-  #define HAL_PLATFORM HAL_STM32_F4_F7
+  #define HAL_PATH(PATH, NAME) XSTR(PATH/STM32_F4_F7/NAME)
 #elif defined(ARDUINO_ARCH_STM32)
-  #define HAL_PLATFORM HAL_STM32
+  #define HAL_PATH(PATH, NAME) XSTR(PATH/STM32/NAME)
 #elif defined(ARDUINO_ARCH_ESP32)
-  #define HAL_PLATFORM HAL_ESP32
+  #define HAL_PATH(PATH, NAME) XSTR(PATH/ESP32/NAME)
 #elif defined(__PLAT_LINUX__)
-  #define HAL_PLATFORM HAL_LINUX
+  #define HAL_PATH(PATH, NAME) XSTR(PATH/LINUX/NAME)
 #elif defined(__SAMD51__)
-  #define HAL_PLATFORM HAL_SAMD51
+  #define HAL_PATH(PATH, NAME) XSTR(PATH/SAMD51/NAME)
 #else
   #error "Unsupported Platform!"
 #endif
-
-#define XSTR_(M) #M
-#define XSTR(M) XSTR_(M)
-#define HAL_PATH(PATH, NAME) XSTR(PATH/HAL_PLATFORM/NAME)

Marlin/src/HAL/shared/HAL_ST7920.h

@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * HAL/HAL_ST7920.h
+ * HAL/ST7920.h
  * For the HALs that provide direct access to the ST7920 display
  * (bypassing U8G), it will allow the LIGHTWEIGHT_UI to operate.
  */

Marlin/src/HAL/shared/servo.h

@@ -68,19 +68,19 @@
  */
 
 #if IS_TEENSY32
-  #include "../HAL_TEENSY31_32/Servo.h"
+  #include "../TEENSY31_32/Servo.h"
 #elif IS_TEENSY35 || IS_TEENSY36
-  #include "../HAL_TEENSY35_36/Servo.h"
+  #include "../TEENSY35_36/Servo.h"
 #elif defined(TARGET_LPC1768)
-  #include "../HAL_LPC1768/Servo.h"
+  #include "../LPC1768/Servo.h"
 #elif defined(__STM32F1__) || defined(TARGET_STM32F1)
-  #include "../HAL_STM32F1/Servo.h"
+  #include "../STM32F1/Servo.h"
 #elif defined(STM32GENERIC) && defined(STM32F4)
-  #include "../HAL_STM32_F4_F7/Servo.h"
+  #include "../STM32_F4_F7/Servo.h"
 #elif defined(ARDUINO_ARCH_STM32)
-  #include "../HAL_STM32/Servo.h"
+  #include "../STM32/Servo.h"
 #elif defined(ARDUINO_ARCH_ESP32)
-  #include "../HAL_ESP32/Servo.h"
+  #include "../ESP32/Servo.h"
 #else
   #include <stdint.h>
 

Marlin/src/HAL/shared/servo_private.h

@@ -44,11 +44,11 @@
 
 // Architecture specific include
 #ifdef __AVR__
-  #include "../HAL_AVR/ServoTimers.h"
+  #include "../AVR/ServoTimers.h"
 #elif defined(ARDUINO_ARCH_SAM)
-  #include "../HAL_DUE/ServoTimers.h"
+  #include "../DUE/ServoTimers.h"
 #elif defined(__SAMD51__)
-  #include "../HAL_SAMD51/ServoTimers.h"
+  #include "../SAMD51/ServoTimers.h"
 #else
   #error "This library only supports boards with an AVR, SAM3X or SAMD51 processor."
 #endif

Marlin/src/MarlinCore.cpp

@@ -78,7 +78,7 @@
 #endif
 
 #if ENABLED(MAX7219_DEBUG)
-  #include "feature/Max7219_Debug_LEDs.h"
+  #include "feature/max7219.h"
 #endif
 
 #if HAS_COLOR_LEDS
@@ -107,7 +107,7 @@
 #endif
 
 #if ENABLED(I2C_POSITION_ENCODERS)
-  #include "feature/I2CPositionEncoder.h"
+  #include "feature/encoder_i2c.h"
 #endif
 
 #if HAS_TRINAMIC_CONFIG && DISABLED(PSU_DEFAULT_OFF)
@@ -142,7 +142,7 @@
 #endif
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "feature/power_loss_recovery.h"
+  #include "feature/powerloss.h"
 #endif
 
 #if ENABLED(CANCEL_OBJECTS)
@@ -174,7 +174,7 @@
 #endif
 
 #if ENABLED(PRUSA_MMU2)
-  #include "feature/prusa_MMU2/mmu2.h"
+  #include "feature/mmu2/mmu2.h"
 #endif
 
 #if HAS_L64XX

Marlin/src/feature/bedlevel/abl/abl.cpp

@@ -32,7 +32,7 @@
 #include "../../../core/debug_out.h"
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../../../lcd/extensible_ui/ui_api.h"
+  #include "../../../lcd/extui/ui_api.h"
 #endif
 
 xy_pos_t bilinear_grid_spacing, bilinear_start;

Marlin/src/feature/bedlevel/bedlevel.cpp

@@ -43,7 +43,7 @@
 #include "../../core/debug_out.h"
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../../lcd/extensible_ui/ui_api.h"
+  #include "../../lcd/extui/ui_api.h"
 #endif
 
 bool leveling_is_valid() {

Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.cpp

@@ -29,7 +29,7 @@
   #include "../../../module/motion.h"
 
   #if ENABLED(EXTENSIBLE_UI)
-    #include "../../../lcd/extensible_ui/ui_api.h"
+    #include "../../../lcd/extui/ui_api.h"
   #endif
 
   mesh_bed_leveling mbl;

Marlin/src/feature/bedlevel/ubl/ubl.cpp

@@ -37,7 +37,7 @@
   #include "../../../module/probe.h"
 
   #if ENABLED(EXTENSIBLE_UI)
-    #include "../../../lcd/extensible_ui/ui_api.h"
+    #include "../../../lcd/extui/ui_api.h"
   #endif
 
   #include "math.h"

Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp

@@ -46,7 +46,7 @@
   #include "../../../core/debug_out.h"
 
   #if ENABLED(EXTENSIBLE_UI)
-    #include "../../../lcd/extensible_ui/ui_api.h"
+    #include "../../../lcd/extui/ui_api.h"
   #endif
 
   #include <math.h>

Marlin/src/feature/e_parser.cpp

@@ -28,7 +28,7 @@
 
 #if ENABLED(EMERGENCY_PARSER)
 
-#include "emergency_parser.h"
+#include "e_parser.h"
 
 // Static data members
 bool EmergencyParser::killed_by_M112, // = false

Marlin/src/feature/e_parser.h

@@ -75,6 +75,7 @@ public:
   FORCE_INLINE static void disable() { enabled = false; }
 
   FORCE_INLINE static void update(State &state, const uint8_t c) {
+    #define ISEOL(C) ((C) == '\n' || (C) == '\r')
     switch (state) {
       case EP_RESET:
         switch (c) {
@@ -164,11 +165,11 @@ public:
       #endif
 
       case EP_IGNORE:
-        if (c == '\n' || c == '\r') state = EP_RESET;
+        if (ISEOL(c)) state = EP_RESET;
         break;
 
       default:
-        if (c == '\n' || c == '\r') {
+        if (ISEOL(c)) {
           if (enabled) switch (state) {
             case EP_M108: wait_for_user = wait_for_heatup = false; break;
             case EP_M112: killed_by_M112 = true; break;

Marlin/src/feature/encoder_i2c.cpp

@@ -32,7 +32,7 @@
 
 #if ENABLED(I2C_POSITION_ENCODERS)
 
-#include "I2CPositionEncoder.h"
+#include "encoder_i2c.h"
 
 #include "../module/temperature.h"
 #include "../module/stepper.h"

Marlin/src/feature/joystick.cpp

@@ -37,7 +37,7 @@
 Joystick joystick;
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../lcd/extensible_ui/ui_api.h"
+  #include "../lcd/extui/ui_api.h"
 #endif
 
 #if HAS_JOY_ADC_X

Marlin/src/feature/max7219.cpp

@@ -41,7 +41,7 @@
 
 #define MAX7219_ERRORS // Disable to save 406 bytes of Program Memory
 
-#include "Max7219_Debug_LEDs.h"
+#include "max7219.h"
 
 #include "../module/planner.h"
 #include "../module/stepper.h"

Marlin/src/feature/mmu2/mmu2.cpp

@@ -43,7 +43,7 @@ MMU2 mmu2;
 #endif
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../../lcd/extensible_ui/ui_api.h"
+  #include "../../lcd/extui/ui_api.h"
 #endif
 
 #define DEBUG_OUT ENABLED(MMU2_DEBUG)

Marlin/src/feature/pause.cpp

@@ -50,7 +50,7 @@
 #endif
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../lcd/extensible_ui/ui_api.h"
+  #include "../lcd/extui/ui_api.h"
 #endif
 
 #include "../core/language.h"

Marlin/src/feature/powerloss.cpp

@@ -28,7 +28,7 @@
 
 #if ENABLED(POWER_LOSS_RECOVERY)
 
-#include "power_loss_recovery.h"
+#include "powerloss.h"
 #include "../core/macros.h"
 
 bool PrintJobRecovery::enabled; // Initialized by settings.load()

Marlin/src/feature/probe_temp_comp.cpp

@@ -24,7 +24,7 @@
 
 #if ENABLED(PROBE_TEMP_COMPENSATION)
 
-#include "probe_temp_compensation.h"
+#include "probe_temp_comp.h"
 #include <math.h>
 
 ProbeTempComp temp_comp;

Marlin/src/feature/runout.cpp

@@ -69,7 +69,7 @@ void FilamentSensorBase::filament_present(const uint8_t extruder) {
 #endif
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../lcd/extensible_ui/ui_api.h"
+  #include "../lcd/extui/ui_api.h"
 #endif
 
 void event_filament_runout() {

Marlin/src/feature/runout.h

@@ -34,7 +34,7 @@
 #include "../inc/MarlinConfig.h"
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../lcd/extensible_ui/ui_api.h"
+  #include "../lcd/extui/ui_api.h"
 #endif
 
 #if ENABLED(ADVANCED_PAUSE_FEATURE)

Marlin/src/gcode/bedlevel/M420.cpp

@@ -34,7 +34,7 @@
 #endif
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../../lcd/extensible_ui/ui_api.h"
+  #include "../../lcd/extui/ui_api.h"
 #endif
 
 //#define M420_C_USE_MEAN

Marlin/src/gcode/bedlevel/abl/G29.cpp

@@ -37,7 +37,7 @@
 #include "../../queue.h"
 
 #if ENABLED(PROBE_TEMP_COMPENSATION)
-  #include "../../../feature/probe_temp_compensation.h"
+  #include "../../../feature/probe_temp_comp.h"
   #include "../../../module/temperature.h"
 #endif
 
@@ -57,7 +57,7 @@
 #include "../../../core/debug_out.h"
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../../../lcd/extensible_ui/ui_api.h"
+  #include "../../../lcd/extui/ui_api.h"
 #endif
 
 #if HOTENDS > 1

Marlin/src/gcode/bedlevel/abl/M421.cpp

@@ -32,7 +32,7 @@
 #include "../../../feature/bedlevel/bedlevel.h"
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../../../lcd/extensible_ui/ui_api.h"
+  #include "../../../lcd/extui/ui_api.h"
 #endif
 
 /**

Marlin/src/gcode/bedlevel/mbl/G29.cpp

@@ -39,7 +39,7 @@
 #include "../../../module/stepper.h"
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../../../lcd/extensible_ui/ui_api.h"
+  #include "../../../lcd/extui/ui_api.h"
 #endif
 
 // Save 130 bytes with non-duplication of PSTR

Marlin/src/gcode/bedlevel/ubl/M421.cpp

@@ -32,7 +32,7 @@
 #include "../../../feature/bedlevel/bedlevel.h"
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../../../lcd/extensible_ui/ui_api.h"
+  #include "../../../lcd/extui/ui_api.h"
 #endif
 
 /**

Marlin/src/gcode/calibrate/G76_M871.cpp

@@ -35,7 +35,7 @@
 #include "../../feature/bedlevel/bedlevel.h"
 #include "../../module/temperature.h"
 #include "../../module/probe.h"
-#include "../../feature/probe_temp_compensation.h"
+#include "../../feature/probe_temp_comp.h"
 
 /**
  * G76: calibrate probe and/or bed temperature offsets

Marlin/src/gcode/config/M43.cpp

@@ -43,7 +43,7 @@
 #endif
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../../lcd/extensible_ui/ui_api.h"
+  #include "../../lcd/extui/ui_api.h"
 #endif
 
 #ifndef GET_PIN_MAP_PIN_M43

Marlin/src/gcode/control/T.cpp

@@ -28,7 +28,7 @@
 #endif
 
 #if ENABLED(PRUSA_MMU2)
-  #include "../../feature/prusa_MMU2/mmu2.h"
+  #include "../../feature/mmu2/mmu2.h"
 #endif
 
 #define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)

Marlin/src/gcode/feature/leds/M7219.cpp

@@ -25,7 +25,7 @@
 #if ENABLED(MAX7219_GCODE)
 
 #include "../../gcode.h"
-#include "../../../feature/Max7219_Debug_LEDs.h"
+#include "../../../feature/max7219.h"
 
 /**
  * M7219: Control the Max7219 LED matrix

Marlin/src/gcode/feature/pause/M125.cpp

@@ -36,7 +36,7 @@
 #endif
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../../feature/power_loss_recovery.h"
+  #include "../../../feature/powerloss.h"
 #endif
 
 /**

Marlin/src/gcode/feature/pause/M701_M702.cpp

@@ -39,7 +39,7 @@
 #endif
 
 #if ENABLED(PRUSA_MMU2)
-  #include "../../../feature/prusa_MMU2/mmu2.h"
+  #include "../../../feature/mmu2/mmu2.h"
 #endif
 
 #if ENABLED(MIXING_EXTRUDER)

Marlin/src/gcode/feature/powerloss/M1000.cpp

@@ -25,11 +25,11 @@
 #if ENABLED(POWER_LOSS_RECOVERY)
 
 #include "../../gcode.h"
-#include "../../../feature/power_loss_recovery.h"
+#include "../../../feature/powerloss.h"
 #include "../../../module/motion.h"
 #include "../../../lcd/ultralcd.h"
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../../../lcd/extensible_ui/ui_api.h"
+  #include "../../../lcd/extui/ui_api.h"
 #endif
 
 #define DEBUG_OUT ENABLED(DEBUG_POWER_LOSS_RECOVERY)

Marlin/src/gcode/feature/powerloss/M413.cpp

@@ -25,7 +25,7 @@
 #if ENABLED(POWER_LOSS_RECOVERY)
 
 #include "../../gcode.h"
-#include "../../../feature/power_loss_recovery.h"
+#include "../../../feature/powerloss.h"
 #include "../../../module/motion.h"
 #include "../../../lcd/ultralcd.h"
 

Marlin/src/gcode/feature/prusa_MMU2/M403.cpp

@@ -25,7 +25,7 @@
 #if ENABLED(PRUSA_MMU2)
 
 #include "../../gcode.h"
-#include "../../../feature/prusa_MMU2/mmu2.h"
+#include "../../../feature/mmu2/mmu2.h"
 
 /**
  * M403: Set filament type for MMU2

Marlin/src/gcode/gcode.cpp

@@ -46,7 +46,7 @@ GcodeSuite gcode;
 
 #if ENABLED(POWER_LOSS_RECOVERY)
   #include "../sd/cardreader.h"
-  #include "../feature/power_loss_recovery.h"
+  #include "../feature/powerloss.h"
 #endif
 
 #if ENABLED(CANCEL_OBJECTS)

Marlin/src/gcode/gcode.h

@@ -287,7 +287,7 @@
 #include "parser.h"
 
 #if ENABLED(I2C_POSITION_ENCODERS)
-  #include "../feature/I2CPositionEncoder.h"
+  #include "../feature/encoder_i2c.h"
 #endif
 
 enum AxisRelative : uint8_t { REL_X, REL_Y, REL_Z, REL_E, E_MODE_ABS, E_MODE_REL };

Marlin/src/gcode/geometry/G92.cpp

@@ -25,7 +25,7 @@
 #include "../../module/stepper.h"
 
 #if ENABLED(I2C_POSITION_ENCODERS)
-  #include "../../feature/I2CPositionEncoder.h"
+  #include "../../feature/encoder_i2c.h"
 #endif
 
 /**

Marlin/src/gcode/lcd/M0_M1.cpp

@@ -34,7 +34,7 @@
 #endif
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../../lcd/extensible_ui/ui_api.h"
+  #include "../../lcd/extui/ui_api.h"
 #endif
 
 #if HAS_LEDS_OFF_FLAG

Marlin/src/gcode/queue.cpp

@@ -44,7 +44,7 @@ GCodeQueue queue;
 #endif
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../feature/power_loss_recovery.h"
+  #include "../feature/powerloss.h"
 #endif
 
 /**
@@ -150,6 +150,8 @@ bool GCodeQueue::_enqueue(const char* cmd, bool say_ok/*=false*/
   return true;
 }
 
+#define ISEOL(C) ((C) == '\n' || (C) == '\r')
+
 /**
  * Enqueue with Serial Echo
  * Return true if the command was consumed
@@ -160,7 +162,7 @@ bool GCodeQueue::enqueue_one(const char* cmd) {
   //SERIAL_ECHO(cmd);
   //SERIAL_ECHOPGM("\") \n");
 
-  if (*cmd == 0 || *cmd == '\n' || *cmd == '\r') return true;
+  if (*cmd == 0 || ISEOL(*cmd)) return true;
 
   if (_enqueue(cmd)) {
     SERIAL_ECHO_MSG(STR_ENQUEUEING, cmd, "\"");
@@ -432,7 +434,7 @@ void GCodeQueue::get_serial_commands() {
 
       const char serial_char = c;
 
-      if (serial_char == '\n' || serial_char == '\r') {
+      if (ISEOL(serial_char)) {
 
         // Reset our state, continue if the line was empty
         if (process_line_done(serial_input_state[i], serial_line_buffer[i], serial_count[i]))
@@ -549,7 +551,7 @@ void GCodeQueue::get_serial_commands() {
       if (n < 0 && !card_eof) { SERIAL_ERROR_MSG(STR_SD_ERR_READ); continue; }
 
       const char sd_char = (char)n;
-      const bool is_eol = sd_char == '\n' || sd_char == '\r';
+      const bool is_eol = ISEOL(sd_char);
       if (is_eol || card_eof) {
 
         // Reset stream state, terminate the buffer, and commit a non-empty command

Marlin/src/gcode/sd/M24_M25.cpp

@@ -39,7 +39,7 @@
 #endif
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../feature/power_loss_recovery.h"
+  #include "../../feature/powerloss.h"
 #endif
 
 #include "../../MarlinCore.h" // for startOrResumeJob

Marlin/src/gcode/temp/M104_M109.cpp

@@ -21,7 +21,7 @@
  */
 
 /**
- * gcode/temperature/M104_M109.cpp
+ * gcode/temp/M104_M109.cpp
  *
  * Hotend target temperature control
  */

Marlin/src/gcode/temp/M140_M190.cpp

@@ -21,7 +21,7 @@
  */
 
 /**
- * gcode/temperature/M140_M190.cpp
+ * gcode/temp/M140_M190.cpp
  *
  * Bed target temperature control
  */

Marlin/src/gcode/temp/M141_M191.cpp

@@ -21,7 +21,7 @@
  */
 
 /**
- * gcode/temperature/M141_M191.cpp
+ * gcode/temp/M141_M191.cpp
  *
  * Chamber target temperature control
  */

Marlin/src/gcode/temp/M303.cpp

@@ -28,7 +28,7 @@
 #include "../../module/temperature.h"
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../../lcd/extensible_ui/ui_api.h"
+  #include "../../lcd/extui/ui_api.h"
 #endif
 
 /**

Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp

@@ -32,7 +32,7 @@
 
 #include "DGUSDisplay.h"
 #include "DGUSVPVariable.h"
-#include "DGUSDisplayDefinition.h"
+#include "DGUSDisplayDef.h"
 
 #include "../../ui_api.h"
 
@@ -45,7 +45,7 @@
 #include "../../../../libs/duration_t.h"
 #include "../../../../module/printcounter.h"
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../../../feature/power_loss_recovery.h"
+  #include "../../../../feature/powerloss.h"
 #endif
 
 // Preamble... 2 Bytes, usually 0x5A 0xA5, but configurable

Marlin/src/lcd/extui/lib/dgus/DGUSDisplayDef.h

@@ -42,9 +42,9 @@ extern const struct VPMapping VPMap[];
 extern const struct DGUS_VP_Variable ListOfVP[];
 
 #if ENABLED(DGUS_LCD_UI_ORIGIN)
-  #include "DGUSDisplayDefinitionOrigin.h"
+  #include "origin/DGUSDisplayDef.h"
 #elif ENABLED(DGUS_LCD_UI_FYSETC)
-  #include "DGUSDisplayDefinitionFYSETC.h"
+  #include "fysetc/DGUSDisplayDef.h"
 #elif ENABLED(DGUS_LCD_UI_HIPRECY)
-  #include "DGUSDisplayDefinitionHIPRECY.h"
+  #include "hiprecy/DGUSDisplayDef.h"
 #endif

Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.cpp

@@ -22,19 +22,19 @@
 
 /* DGUS VPs changed by George Fu in 2019 for Marlin */
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(DGUS_LCD_UI_FYSETC)
 
-#include "DGUSDisplayDefinition.h"
+#include "../DGUSDisplayDef.h"
-#include "DGUSDisplay.h"
+#include "../DGUSDisplay.h"
 
-#include "../../../../module/temperature.h"
+#include "../../../../../module/temperature.h"
-#include "../../../../module/motion.h"
+#include "../../../../../module/motion.h"
-#include "../../../../module/planner.h"
+#include "../../../../../module/planner.h"
 
-#include "../../ui_api.h"
+#include "../../../ui_api.h"
-#include "../../../ultralcd.h"
+#include "../../../../ultralcd.h"
 
 #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
   uint16_t distanceToMove = 0.1;

Marlin/src/lcd/extui/lib/dgus/hiprecy/DGUSDisplayDef.cpp

@@ -22,19 +22,19 @@
 
 /* DGUS VPs changed by George Fu in 2019 for Marlin */
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(DGUS_LCD_UI_HIPRECY)
 
-#include "DGUSDisplayDefinition.h"
+#include "../DGUSDisplayDef.h"
-#include "DGUSDisplay.h"
+#include "../DGUSDisplay.h"
 
-#include "../../../../module/temperature.h"
+#include "../../../../../module/temperature.h"
-#include "../../../../module/motion.h"
+#include "../../../../../module/motion.h"
-#include "../../../../module/planner.h"
+#include "../../../../../module/planner.h"
 
-#include "../../ui_api.h"
+#include "../../../ui_api.h"
-#include "../../../ultralcd.h"
+#include "../../../../ultralcd.h"
 
 #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
   uint16_t distanceToMove = 0.1;

Marlin/src/lcd/extui/lib/dgus/origin/DGUSDisplayDef.cpp

@@ -22,18 +22,18 @@
 
 /* DGUS implementation written by coldtobi in 2019 for Marlin */
 
-#include "../../../../inc/MarlinConfigPre.h"
+#include "../../../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(DGUS_LCD_UI_ORIGIN)
 
-#include "DGUSDisplayDefinition.h"
+#include "../DGUSDisplayDef.h"
-#include "DGUSDisplay.h"
+#include "../DGUSDisplay.h"
 
-#include "../../../../module/temperature.h"
+#include "../../../../../module/temperature.h"
-#include "../../../../module/motion.h"
+#include "../../../../../module/motion.h"
-#include "../../../../module/planner.h"
+#include "../../../../../module/planner.h"
 
-#include "../../../ultralcd.h"
+#include "../../../../ultralcd.h"
 
 #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
   uint16_t distanceToMove = 0.1;

Marlin/src/lcd/extui/ui_api.cpp

@@ -65,7 +65,7 @@
 #endif
 
 #if ENABLED(EMERGENCY_PARSER)
-  #include "../../feature/emergency_parser.h"
+  #include "../../feature/e_parser.h"
 #endif
 
 #if ENABLED(SDSUPPORT)

Marlin/src/lcd/extui_dgus_lcd.cpp

@@ -30,9 +30,9 @@
 
 #if HAS_DGUS_LCD
 
-#include "extensible_ui/ui_api.h"
+#include "extui/ui_api.h"
-#include "extensible_ui/lib/dgus/DGUSDisplay.h"
+#include "extui/lib/dgus/DGUSDisplay.h"
-#include "extensible_ui/lib/dgus/DGUSDisplayDefinition.h"
+#include "extui/lib/dgus/DGUSDisplayDef.h"
 
 extern const char NUL_STR[];
 

Marlin/src/lcd/extui_example.cpp

@@ -23,7 +23,7 @@
 
 #if BOTH(EXTUI_EXAMPLE, EXTENSIBLE_UI)
 
-#include "extensible_ui/ui_api.h"
+#include "extui/ui_api.h"
 
 // To implement a new UI, complete the functions below and
 // read or update Marlin's state using the methods in the

Marlin/src/lcd/extui_malyan_lcd.cpp

@@ -47,7 +47,7 @@
 
 #define DEBUG_MALYAN_LCD
 
-#include "extensible_ui/ui_api.h"
+#include "extui/ui_api.h"
 
 #include "ultralcd.h"
 #include "../sd/cardreader.h"

Marlin/src/lcd/menu/menu_configuration.cpp

@@ -37,7 +37,7 @@
 #endif
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../feature/power_loss_recovery.h"
+  #include "../../feature/powerloss.h"
 #endif
 
 #if HAS_BED_PROBE

Marlin/src/lcd/menu/menu_delta_calibrate.cpp

@@ -37,7 +37,7 @@
 #endif
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../../lcd/extensible_ui/ui_api.h"
+  #include "../../lcd/extui/ui_api.h"
 #endif
 
 void _man_probe_pt(const xy_pos_t &xy) {

Marlin/src/lcd/menu/menu_job_recovery.cpp

@@ -31,7 +31,7 @@
 #include "menu.h"
 #include "../../gcode/queue.h"
 #include "../../sd/cardreader.h"
-#include "../../feature/power_loss_recovery.h"
+#include "../../feature/powerloss.h"
 
 static void lcd_power_loss_recovery_resume() {
   ui.return_to_status();

Marlin/src/lcd/menu/menu_mmu2.cpp

@@ -24,7 +24,7 @@
 
 #if HAS_LCD_MENU && ENABLED(MMU2_MENUS)
 
-#include "../../feature/prusa_MMU2/mmu2.h"
+#include "../../feature/mmu2/mmu2.h"
 #include "menu_mmu2.h"
 #include "menu.h"
 

Marlin/src/lcd/ultralcd.cpp

@@ -1309,7 +1309,7 @@ void MarlinUI::update() {
 #if HAS_DISPLAY
 
   #if ENABLED(EXTENSIBLE_UI)
-    #include "extensible_ui/ui_api.h"
+    #include "extui/ui_api.h"
   #endif
 
   ////////////////////////////////////////////

Marlin/src/libs/buzzer.cpp

@@ -28,7 +28,7 @@
 #include "../module/temperature.h"
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../lcd/extensible_ui/ui_api.h"
+  #include "../lcd/extui/ui_api.h"
 #endif
 
 Buzzer::state_t Buzzer::state;

Marlin/src/libs/stopwatch.cpp

@@ -25,7 +25,7 @@
 #include "../inc/MarlinConfig.h"
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../lcd/extensible_ui/ui_api.h"
+  #include "../lcd/extui/ui_api.h"
 #endif
 
 Stopwatch::State Stopwatch::state;

Marlin/src/module/configuration_store.cpp

@@ -71,7 +71,7 @@
 #endif
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../lcd/extensible_ui/ui_api.h"
+  #include "../lcd/extui/ui_api.h"
 #endif
 
 #if HAS_SERVOS
@@ -87,7 +87,7 @@
 #include "../feature/fwretract.h"
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../feature/power_loss_recovery.h"
+  #include "../feature/powerloss.h"
 #endif
 
 #include "../feature/pause.h"
@@ -119,7 +119,7 @@
 #endif
 
 #if ENABLED(PROBE_TEMP_COMPENSATION)
-  #include "../feature/probe_temp_compensation.h"
+  #include "../feature/probe_temp_comp.h"
 #endif
 
 #pragma pack(push, 1) // No padding between variables

Marlin/src/module/planner.cpp

@@ -101,7 +101,7 @@
 #endif
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../feature/power_loss_recovery.h"
+  #include "../feature/powerloss.h"
 #endif
 
 #if HAS_CUTTER

Marlin/src/module/printcounter.cpp

@@ -30,7 +30,7 @@ Stopwatch print_job_timer;      // Global Print Job Timer instance
 #else // PRINTCOUNTER
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../lcd/extensible_ui/ui_api.h"
+  #include "../lcd/extui/ui_api.h"
 #endif
 
 #include "printcounter.h"

Marlin/src/module/probe.cpp

@@ -78,7 +78,7 @@
 #endif
 
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../lcd/extensible_ui/ui_api.h"
+  #include "../lcd/extui/ui_api.h"
 #endif
 
 #define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)

Marlin/src/module/stepper.cpp

@@ -130,7 +130,7 @@ Stepper stepper; // Singleton
 #endif
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../feature/power_loss_recovery.h"
+  #include "../feature/powerloss.h"
 #endif
 
 // public:

Marlin/src/module/stepper/TMC26X.h

@@ -32,7 +32,7 @@
 
 #include <SPI.h>
 #if defined(STM32GENERIC) && defined(STM32F7)
-  #include "../../HAL/HAL_STM32_F4_F7/STM32F7/TMC2660.h"
+  #include "../../HAL/STM32_F4_F7/STM32F7/TMC2660.h"
 #else
   #include <TMC26XStepper.h>
 #endif

Marlin/src/module/temperature.cpp

@@ -33,7 +33,7 @@
 #include "../core/language.h"
 #include "../HAL/shared/Delay.h"
 #if ENABLED(EXTENSIBLE_UI)
-  #include "../lcd/extensible_ui/ui_api.h"
+  #include "../lcd/extui/ui_api.h"
 #endif
 
 #if ENABLED(MAX6675_IS_MAX31865)
@@ -80,7 +80,7 @@
 #endif
 
 #if ENABLED(EMERGENCY_PARSER)
-  #include "../feature/emergency_parser.h"
+  #include "../feature/e_parser.h"
 #endif
 
 #if ENABLED(PRINTER_EVENT_LEDS)

Marlin/src/module/tool_change.cpp

@@ -74,7 +74,7 @@
 #endif
 
 #if ENABLED(PRUSA_MMU2)
-  #include "../feature/prusa_MMU2/mmu2.h"
+  #include "../feature/mmu2/mmu2.h"
 #endif
 
 #if HAS_LCD_MENU

Marlin/src/sd/cardreader.cpp

@@ -35,11 +35,11 @@
 #include "../module/configuration_store.h"
 
 #if ENABLED(EMERGENCY_PARSER)
-  #include "../feature/emergency_parser.h"
+  #include "../feature/e_parser.h"
 #endif
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../feature/power_loss_recovery.h"
+  #include "../feature/powerloss.h"
 #endif
 
 #if ENABLED(ADVANCED_PAUSE_FEATURE)

platformio.ini

@@ -63,7 +63,7 @@ board             = megaatmega2560
 board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # ATmega1280
@@ -74,7 +74,7 @@ board             = megaatmega1280
 board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # RAMBo
@@ -85,7 +85,7 @@ board             = reprap_rambo
 board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # FYSETC F6 V1.3
@@ -96,7 +96,7 @@ board             = fysetc_f6_13
 board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # FYSETC F6 V1.4
@@ -107,7 +107,7 @@ board             = fysetc_f6_14
 board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # Sanguinololu (ATmega644p)
@@ -117,7 +117,7 @@ platform      = atmelavr
 board         = sanguino_atmega644p
 lib_deps      = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter    = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # Sanguinololu (ATmega1284p)
@@ -127,7 +127,7 @@ platform      = atmelavr
 board         = sanguino_atmega1284p
 lib_deps      = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter    = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # Melzi and clones (ATmega1284p)
@@ -137,7 +137,7 @@ platform      = atmelavr
 board         = sanguino_atmega1284p
 lib_deps      = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter    = ${common.default_src_filter} +<src/HAL/AVR>
 lib_ignore    = TMCStepper
 upload_speed  = 57600
 
@@ -149,7 +149,7 @@ platform      = atmelavr
 board         = sanguino_atmega1284p
 lib_deps      = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter    = ${common.default_src_filter} +<src/HAL/AVR>
 lib_ignore    = TMCStepper
 upload_speed  = 115200
 
@@ -166,7 +166,7 @@ board         = at90usb1286
 lib_deps      = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
 lib_ignore    = TMCStepper
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter    = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # AT90USB1286 boards using DFU bootloader
@@ -179,7 +179,7 @@ platform      = teensy
 board         = at90usb1286
 lib_deps      = ${common.lib_deps}
 lib_ignore    = TMCStepper
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+src_filter    = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # Due (Atmel SAM3X8E ARM Cortex-M3)
@@ -190,18 +190,18 @@ src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
 [env:DUE]
 platform      = atmelsam
 board         = due
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_DUE>
+src_filter    = ${common.default_src_filter} +<src/HAL/DUE>
 
 [env:DUE_USB]
 platform      = atmelsam
 board         = dueUSB
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_DUE>
+src_filter    = ${common.default_src_filter} +<src/HAL/DUE>
 
 [env:DUE_debug]
 # Used when WATCHDOG_RESET_MANUAL is enabled
 platform      = atmelsam
 board         = due
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_DUE>
+src_filter    = ${common.default_src_filter} +<src/HAL/DUE>
 build_flags   = ${common.build_flags}
   -funwind-tables
   -mpoke-function-name
@@ -212,14 +212,14 @@ build_flags   = ${common.build_flags}
 [env:LPC1768]
 platform          = https://github.com/p3p/pio-nxplpc-arduino-lpc176x/archive/0.1.2.zip
 board             = nxp_lpc1768
-build_flags       = -DU8G_HAL_LINKS -IMarlin/src/HAL/HAL_LPC1768/include -IMarlin/src/HAL/HAL_LPC1768/u8g ${common.build_flags}
+build_flags       = -DU8G_HAL_LINKS -IMarlin/src/HAL/LPC1768/include -IMarlin/src/HAL/LPC1768/u8g ${common.build_flags}
 # debug options for backtrace
 #  -funwind-tables
 #  -mpoke-function-name
 lib_ldf_mode      = off
 lib_compat_mode   = strict
-extra_scripts     = Marlin/src/HAL/HAL_LPC1768/upload_extra_script.py
+extra_scripts     = Marlin/src/HAL/LPC1768/upload_extra_script.py
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_LPC1768>
+src_filter        = ${common.default_src_filter} +<src/HAL/LPC1768>
 lib_deps          = Servo
   LiquidCrystal
   U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip
@@ -230,14 +230,14 @@ lib_deps          = Servo
 [env:LPC1769]
 platform          = https://github.com/p3p/pio-nxplpc-arduino-lpc176x/archive/0.1.2.zip
 board             = nxp_lpc1769
-build_flags       = -DU8G_HAL_LINKS -IMarlin/src/HAL/HAL_LPC1768/include -IMarlin/src/HAL/HAL_LPC1768/u8g ${common.build_flags}
+build_flags       = -DU8G_HAL_LINKS -IMarlin/src/HAL/LPC1768/include -IMarlin/src/HAL/LPC1768/u8g ${common.build_flags}
 # debug options for backtrace
 #  -funwind-tables
 #  -mpoke-function-name
 lib_ldf_mode      = off
 lib_compat_mode   = strict
-extra_scripts     = Marlin/src/HAL/HAL_LPC1768/upload_extra_script.py
+extra_scripts     = Marlin/src/HAL/LPC1768/upload_extra_script.py
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_LPC1768>
+src_filter        = ${common.default_src_filter} +<src/HAL/LPC1768>
 lib_deps          = Servo
   LiquidCrystal
   U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip
@@ -252,10 +252,10 @@ lib_deps          = Servo
 platform          = ststm32
 board             = genericSTM32F103RC
 platform_packages = tool-stm32duino
-build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags       = !python Marlin/src/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>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore        = Adafruit NeoPixel, SPI
@@ -269,11 +269,11 @@ platform          = ststm32
 board             = genericSTM32F103RC
 #board_build.core = maple
 platform_packages = tool-stm32duino
-build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14 -DDEBUG_LEVEL=0 -DHAVE_SW_SERIAL
 build_unflags     = -std=gnu++11
 extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore        = Adafruit NeoPixel, SPI
@@ -294,11 +294,11 @@ upload_protocol   = serial
 platform          = ststm32
 board             = genericSTM32F103RC
 platform_packages = tool-stm32duino
-build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -DDEBUG_LEVEL=0 -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4
 build_unflags     = -std=gnu++11
 extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RC_SKR_MINI.py
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore        = Adafruit NeoPixel, SPI
@@ -308,11 +308,11 @@ monitor_speed     = 115200
 platform          = ststm32
 board             = genericSTM32F103RC
 platform_packages = tool-stm32duino
-build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -DDEBUG_LEVEL=0 -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4 -DUSE_USB_COMPOSITE
 build_unflags     = -std=gnu++11
 extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RC_SKR_MINI.py
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore        = Adafruit NeoPixel, SPI
@@ -323,11 +323,11 @@ platform          = ststm32
 board             = genericSTM32F103RC
 board_upload.maximum_size=524288
 platform_packages = tool-stm32duino
-build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -DDEBUG_LEVEL=0 -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4 -DSTM32_FLASH_SIZE=512
 build_unflags     = -std=gnu++11
 extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RC_SKR_MINI.py
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore        = Adafruit NeoPixel, SPI
@@ -338,11 +338,11 @@ platform          = ststm32
 board             = genericSTM32F103RC
 board_upload.maximum_size=524288
 platform_packages = tool-stm32duino
-build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -DDEBUG_LEVEL=0 -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4 -DSTM32_FLASH_SIZE=512 -DUSE_USB_COMPOSITE
 build_unflags     = -std=gnu++11
 extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RC_SKR_MINI.py
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore        = Adafruit NeoPixel, SPI
@@ -355,10 +355,10 @@ monitor_speed     = 115200
 platform          = ststm32
 board             = genericSTM32F103RE
 platform_packages = tool-stm32duino
-build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags       = !python Marlin/src/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>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore        = Adafruit NeoPixel, SPI
@@ -372,11 +372,11 @@ monitor_speed     = 115200
 platform          = ststm32
 board             = genericSTM32F103RE
 platform_packages = tool-stm32duino
-build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -DDEBUG_LEVEL=0 -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4
 build_unflags     = -std=gnu++11
 extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RE_SKR_E3_DIP.py
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore        = Adafruit NeoPixel, SPI
@@ -388,11 +388,11 @@ monitor_speed     = 115200
 platform          = ststm32
 board             = genericSTM32F103RE
 platform_packages = tool-stm32duino
-build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -DDEBUG_LEVEL=0 -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4 -DUSE_USB_COMPOSITE
 build_unflags     = -std=gnu++11
 extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RE_SKR_E3_DIP.py
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore        = Adafruit NeoPixel, SPI
@@ -408,7 +408,7 @@ platform      = ststm32
 board         = disco_f407vg
 build_flags   = ${common.build_flags} -DUSE_STM32GENERIC -DSTM32GENERIC -DSTM32F4 -DMENU_USB_SERIAL -DMENU_SERIAL=SerialUSB -DHAL_IWDG_MODULE_ENABLED
 lib_ignore    = Adafruit NeoPixel, TMCStepper
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32_F4_F7> -<src/HAL/HAL_STM32_F4_F7/STM32F7>
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32_F4_F7> -<src/HAL/STM32_F4_F7/STM32F7>
 
 #
 # STM32F7 with STM32GENERIC
@@ -418,7 +418,7 @@ platform      = ststm32
 board         = remram_v1
 build_flags   = ${common.build_flags} -DUSE_STM32GENERIC -DSTM32GENERIC -DSTM32F7 -DMENU_USB_SERIAL -DMENU_SERIAL=SerialUSB -DHAL_IWDG_MODULE_ENABLED
 lib_ignore    = Adafruit NeoPixel, TMCStepper
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32_F4_F7> -<src/HAL/HAL_STM32_F4_F7/STM32F4>
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32_F4_F7> -<src/HAL/STM32_F4_F7/STM32F4>
 
 #
 # ARMED (STM32)
@@ -429,9 +429,9 @@ board         = armed_v1
 build_flags   = ${common.build_flags}
   -DUSBCON -DUSBD_VID=0x0483 '-DUSB_MANUFACTURER="Unknown"' '-DUSB_PRODUCT="ARMED_V1"' -DUSBD_USE_CDC
   -O2 -ffreestanding -fsigned-char -fno-move-loop-invariants -fno-strict-aliasing -std=gnu11 -std=gnu++11
-  -IMarlin/src/HAL/HAL_STM32
+  -IMarlin/src/HAL/STM32
 lib_ignore    = Adafruit NeoPixel, SoftwareSerial
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32>
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32>
 
 #
 # Geeetech GTM32 (STM32F103VET6)
@@ -439,12 +439,12 @@ src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32>
 [env:STM32F103VE_GTM32]
 platform        = ststm32
 board           = genericSTM32F103VE
-build_flags     = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags     = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -DDEBUG_LEVEL=DEBUG_NONE -std=gnu++14 -MMD -ffunction-sections -fdata-sections -nostdlib
   -DBOARD_generic_stm32f103v -DARDUINO_GENERIC_STM32F103V -DARDUINO_ARCH_STM32F1
   -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1 -DVECT_TAB_ADDR=0x8000000 -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6
 build_unflags = -std=gnu++11
-src_filter      = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter      = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_ignore      = Adafruit NeoPixel, SPI
 upload_protocol = serial
 
@@ -454,12 +454,12 @@ upload_protocol = serial
 [env:STM32F103VE_longer]
 platform      = ststm32
 board         = genericSTM32F103VE
-build_flags   = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14 -USERIAL_USB
   -DSTM32F1xx -DU20 -DTS_V12
 build_unflags = -std=gnu++11 -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1 -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6
 extra_scripts = buildroot/share/PlatformIO/scripts/STM32F103VE_longer.py
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_ignore    = Adafruit NeoPixel, LiquidTWI2, SPI
 
 #
@@ -468,11 +468,11 @@ lib_ignore    = Adafruit NeoPixel, LiquidTWI2, SPI
 [env:mks_robin_mini]
 platform      = ststm32
 board         = genericSTM32F103VE
-build_flags   = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14
 build_unflags = -std=gnu++11
 extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_mini.py
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_ignore    = Adafruit NeoPixel, SPI
 
 #
@@ -482,11 +482,11 @@ lib_ignore    = Adafruit NeoPixel, SPI
 platform      = ststm32
 board         = genericSTM32F103VE
 platform_packages = tool-stm32duino
-build_flags   = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4
 build_unflags = -std=gnu++11
 extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_nano.py
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore    = Adafruit NeoPixel, SPI
@@ -497,11 +497,11 @@ lib_ignore    = Adafruit NeoPixel, SPI
 [env:mks_robin]
 platform      = ststm32
 board         = genericSTM32F103ZE
-build_flags   = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14 -DSTM32_XL_DENSITY
 build_unflags = -std=gnu++11
 extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin.py
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_ignore    = Adafruit NeoPixel, SPI
 
 #
@@ -511,10 +511,10 @@ lib_ignore    = Adafruit NeoPixel, SPI
 platform      = ststm32
 board         = genericSTM32F103ZE
 extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_pro.py
-build_flags   = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14 -DSTM32_XL_DENSITY
 build_unflags = -std=gnu++11
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps      = ${common.lib_deps}
 lib_ignore    = Adafruit NeoPixel, SPI, TMCStepper
 
@@ -524,11 +524,11 @@ lib_ignore    = Adafruit NeoPixel, SPI, TMCStepper
 [env:mks_robin_lite]
 platform      = ststm32
 board         = genericSTM32F103RC
-build_flags   = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14
 build_unflags = -std=gnu++11
 extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_lite.py
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_ignore    = Adafruit NeoPixel, SPI
 
 #
@@ -538,10 +538,10 @@ lib_ignore    = Adafruit NeoPixel, SPI
 platform      = ststm32
 board         = genericSTM32F103RC
 extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_lite3.py
-build_flags   = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags   = !python Marlin/src/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>
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps      = ${common.lib_deps}
 lib_ignore    = Adafruit NeoPixel, SPI
 
@@ -551,11 +551,11 @@ lib_ignore    = Adafruit NeoPixel, SPI
 [env:jgaurora_a5s_a1]
 platform      = ststm32
 board         = genericSTM32F103ZE
-build_flags   = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -DSTM32F1xx -std=gnu++14 -DSTM32_XL_DENSITY
 build_unflags = -std=gnu++11
 extra_scripts = buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_ignore    = Adafruit NeoPixel, SPI
 
 #
@@ -564,9 +564,9 @@ lib_ignore    = Adafruit NeoPixel, SPI
 [env:STM32F103CB_malyan]
 platform    = ststm32
 board       = malyanM200
-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
+build_flags = !python Marlin/src/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 -D__MARLIN_FIRMWARE__
-src_filter  = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter  = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_ignore  = Adafruit NeoPixel, LiquidCrystal, LiquidTWI2, TMCStepper, U8glib-HAL, SPI
 
 #
@@ -575,11 +575,11 @@ lib_ignore  = Adafruit NeoPixel, LiquidCrystal, LiquidTWI2, TMCStepper, U8glib-H
 [env:chitu_f103]
 platform      = ststm32
 board         = genericSTM32F103ZE
-build_flags   = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
+build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -DSTM32F1xx -std=gnu++14 -DSTM32_XL_DENSITY
 build_unflags = -std=gnu++11 -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG= -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6
 extra_scripts = buildroot/share/PlatformIO/scripts/chitu_crypt.py
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_ignore    = Adafruit NeoPixel
 
 #
@@ -594,12 +594,12 @@ build_flags       = ${common.build_flags}
  -DTARGET_STM32F4 -DARDUINO_STEVAL -DSTM32F401xE
  -DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483 -DUSB_PRODUCT=\"STEVAL_F401VE\"
  -DDISABLE_GENERIC_SERIALUSB
- -IMarlin/src/HAL/HAL_STM32
+ -IMarlin/src/HAL/STM32
 build_unflags     = -std=gnu++11
 extra_scripts     = pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
   buildroot/share/PlatformIO/scripts/STEVAL__F401XX.py
 lib_ignore        = Adafruit NeoPixel, TMCStepper, SailfishLCD, SailfishRGB_LED, SlowSoftI2CMaster, SoftwareSerial
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32>
 
 #
 # FLYF407ZG
@@ -611,11 +611,11 @@ platform_packages = framework-arduinoststm32@>=3.107,<4
 build_flags       = ${common.build_flags}
   -DSTM32F4 -DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483 -DUSB_PRODUCT=\"STM32F407ZG\"
   -DTARGET_STM32F4 -DVECT_TAB_OFFSET=0x8000
-  -IMarlin/src/HAL/HAL_STM32
+  -IMarlin/src/HAL/STM32
 build_unflags     = -std=gnu++11
 extra_scripts     = pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
 lib_ignore        = Adafruit NeoPixel, TMCStepper, SailfishLCD, SailfishRGB_LED, SlowSoftI2CMaster, SoftwareSerial
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32>
 
 
 #
@@ -633,7 +633,7 @@ build_flags       = ${common.build_flags}
   -DUSBCON -DUSBD_USE_CDC -DHAL_PCD_MODULE_ENABLED -DUSBD_VID=0x0483 '-DUSB_PRODUCT="FYSETC_S6"'
 build_unflags     = -std=gnu++11
 extra_scripts     = pre:buildroot/share/PlatformIO/scripts/fysetc_STM32S6.py
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32>
 lib_ignore        = Arduino-L6470
 debug_tool        = stlink
 #upload_protocol   = stlink
@@ -651,11 +651,11 @@ platform_packages = framework-arduinoststm32@>=3.107,<4
 build_flags       = ${common.build_flags}
  -DTARGET_STM32F4 -DARDUINO_BLACK_F407VE
  -DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483 -DUSB_PRODUCT=\"BLACK_F407VE\"
-  -IMarlin/src/HAL/HAL_STM32
+  -IMarlin/src/HAL/STM32
 build_unflags     = -std=gnu++11
 extra_scripts     = pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
 lib_ignore        = Adafruit NeoPixel, TMCStepper, SailfishLCD, SailfishRGB_LED, SlowSoftI2CMaster, SoftwareSerial
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32>
 
 #
 # BigTreeTech SKR Pro (STM32F407ZGT6 ARM Cortex-M4)
@@ -667,11 +667,11 @@ platform_packages = framework-arduinoststm32@>=3.107,<4
 build_flags       = ${common.build_flags}
   -DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483 -DUSB_PRODUCT=\"STM32F407ZG\"
   -DTARGET_STM32F4 -DSTM32F407_5ZX -DVECT_TAB_OFFSET=0x8000
-  -IMarlin/src/HAL/HAL_STM32
+  -IMarlin/src/HAL/STM32
 build_unflags     = -std=gnu++11
 extra_scripts     = pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
 lib_ignore        = SoftwareSerial, SoftwareSerialM
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32>
 #upload_protocol   = stlink
 #upload_command    = "$PROJECT_PACKAGES_DIR/tool-stm32duino/stlink/ST-LINK_CLI.exe" -c SWD -P "$BUILD_DIR/firmware.bin" 0x8008000 -Rst -Run
 debug_tool        = stlink
@@ -689,7 +689,7 @@ extra_scripts     = pre:buildroot/share/PlatformIO/scripts/generic_create_varian
 build_flags       = ${common.build_flags}
   -DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483 -DUSB_PRODUCT=\"STM32F407IG\"
   -DTARGET_STM32F4 -DSTM32F407IX -DVECT_TAB_OFFSET=0x8000
-  -IMarlin/src/HAL/HAL_STM32
+  -IMarlin/src/HAL/STM32
 lib_deps          =
   U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip
   LiquidCrystal
@@ -698,7 +698,7 @@ lib_deps          =
   LiquidTWI2=https://github.com/lincomatic/LiquidTWI2/archive/master.zip
   Arduino-L6470=https://github.com/ameyer/Arduino-L6470/archive/dev.zip
 lib_ignore        = SoftwareSerial, SoftwareSerialM
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32>
 monitor_speed     = 250000
 
 #
@@ -718,7 +718,7 @@ build_flags       = ${common.build_flags}
 build_unflags     = -std=gnu++11
 extra_scripts     = pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
 lib_ignore        = Adafruit NeoPixel, SailfishLCD, SailfishRGB_LED, SlowSoftI2CMaster
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32>
+src_filter        = ${common.default_src_filter} +<src/HAL/STM32>
 
 #
 # Teensy 3.1 / 3.2 (ARM Cortex-M4)
@@ -729,7 +729,7 @@ board         = teensy31
 lib_deps      = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
 lib_ignore    = Adafruit NeoPixel
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_TEENSY31_32>
+src_filter    = ${common.default_src_filter} +<src/HAL/TEENSY31_32>
 
 #
 # Teensy 3.5 / 3.6 (ARM Cortex-M4)
@@ -740,7 +740,7 @@ board         = teensy35
 lib_deps      = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
 lib_ignore    = Adafruit NeoPixel
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_TEENSY35_36>
+src_filter    = ${common.default_src_filter} +<src/HAL/TEENSY35_36>
 
 #
 # Espressif ESP32
@@ -756,7 +756,7 @@ lib_deps      = ${common.lib_deps}
   arduinoWebSockets=https://github.com/Links2004/arduinoWebSockets.git
   ESP32SSDP=https://github.com/luc-github/ESP32SSDP.git
 lib_ignore    = LiquidCrystal, LiquidTWI2, SailfishLCD, SailfishRGB_LED, ESPAsyncTCP
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_ESP32>
+src_filter    = ${common.default_src_filter} +<src/HAL/ESP32>
 upload_speed  = 115200
 #upload_port   = marlinesp.local
 #board_build.flash_mode = qio
@@ -769,11 +769,11 @@ upload_speed  = 115200
 platform        = native
 framework       =
 build_flags     = -D__PLAT_LINUX__ -std=gnu++17 -ggdb -g -lrt -lpthread -D__MARLIN_FIRMWARE__ -Wno-expansion-to-defined
-src_build_flags = -Wall -IMarlin/src/HAL/HAL_LINUX/include
+src_build_flags = -Wall -IMarlin/src/HAL/LINUX/include
 build_unflags   = -Wall
 lib_ldf_mode    = off
 lib_deps        =
-src_filter      = ${common.default_src_filter} +<src/HAL/HAL_LINUX>
+src_filter      = ${common.default_src_filter} +<src/HAL/LINUX>
 
 #
 # Adafruit Grand Central M4 (Atmel SAMD51P20A ARM Cortex-M4)
@@ -783,7 +783,7 @@ platform       = atmelsam
 board          = adafruit_grandcentral_m4
 build_flags    = ${common.build_flags} -std=gnu++17 -Wno-register
 build_unflags  = -std=gnu++11
-src_filter     = ${common.default_src_filter} +<src/HAL/HAL_SAMD51>
+src_filter     = ${common.default_src_filter} +<src/HAL/SAMD51>
 lib_deps       = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 debug_tool     = jlink
@@ -810,7 +810,7 @@ build_flags   = ${common.build_flags}
   -DHAL_UART_MODULE_ENABLED
   -Os
 lib_ignore    = Adafruit NeoPixel
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32>
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32>
 monitor_speed = 500000
 upload_protocol = dfu
 
@@ -831,7 +831,7 @@ build_flags   = ${common.build_flags}
   -DHAL_UART_MODULE_ENABLED
   -Os
 lib_ignore    = Adafruit NeoPixel
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32> +<src/HAL/HAL_STM32_F4_F7> -<src/HAL/HAL_STM32_F4_F7/STM32F7>
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32> +<src/HAL/STM32_F4_F7> -<src/HAL/STM32_F4_F7/STM32F7>
 upload_protocol = dfu
 
 #