Shorter paths to HAL, ExtUI (#17156)

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
 
 /**