From 22182d9a983a57c48bcf34f71f4b71095c6151cd Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 30 Nov 2024 19:40:58 -0600 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20#include=20cleanup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/src/HAL/ESP32/wifi.cpp | 3 ++- Marlin/src/HAL/HC32/HAL.h | 3 --- Marlin/src/feature/mixing.cpp | 4 ---- Marlin/src/feature/powerloss.cpp | 4 ++-- Marlin/src/gcode/eeprom/M500-M504.cpp | 1 - Marlin/src/gcode/motion/M290.cpp | 4 ---- Marlin/src/gcode/stats/M31.cpp | 1 - Marlin/src/lcd/e3v2/creality/dwin.cpp | 2 -- Marlin/src/lcd/e3v2/proui/dwin.cpp | 2 -- Marlin/src/lcd/sovol_rts/sovol_rts.cpp | 3 --- Marlin/src/libs/hex_print.cpp | 1 - 11 files changed, 4 insertions(+), 24 deletions(-) diff --git a/Marlin/src/HAL/ESP32/wifi.cpp b/Marlin/src/HAL/ESP32/wifi.cpp index 060f3bdb4874..aa2796adeae4 100644 --- a/Marlin/src/HAL/ESP32/wifi.cpp +++ b/Marlin/src/HAL/ESP32/wifi.cpp @@ -21,11 +21,12 @@ */ #ifdef ARDUINO_ARCH_ESP32 -#include "../../core/serial.h" #include "../../inc/MarlinConfigPre.h" #if ENABLED(WIFISUPPORT) +#include "../../core/serial.h" + #include #include #include diff --git a/Marlin/src/HAL/HC32/HAL.h b/Marlin/src/HAL/HC32/HAL.h index 8111e1b57ee6..3f4ba1461550 100644 --- a/Marlin/src/HAL/HC32/HAL.h +++ b/Marlin/src/HAL/HC32/HAL.h @@ -30,7 +30,6 @@ #include "../../inc/MarlinConfig.h" -#include "../../core/macros.h" #include "../shared/Marduino.h" #include "../shared/math_32bit.h" #include "../shared/HAL_SPI.h" @@ -39,8 +38,6 @@ #include "timers.h" #include "MarlinSerial.h" -#include - // // Serial Ports // diff --git a/Marlin/src/feature/mixing.cpp b/Marlin/src/feature/mixing.cpp index 4021393f18e6..f3fb2d07a3a2 100644 --- a/Marlin/src/feature/mixing.cpp +++ b/Marlin/src/feature/mixing.cpp @@ -28,10 +28,6 @@ Mixer mixer; -#ifdef MIXER_NORMALIZER_DEBUG - #include "../core/serial.h" -#endif - // Used up to Planner level uint_fast8_t Mixer::selected_vtool = 0; float Mixer::collector[MIXING_STEPPERS]; // mix proportion. 0.0 = off, otherwise <= COLOR_A_MASK. diff --git a/Marlin/src/feature/powerloss.cpp b/Marlin/src/feature/powerloss.cpp index a97887773c51..3cd96e11550c 100644 --- a/Marlin/src/feature/powerloss.cpp +++ b/Marlin/src/feature/powerloss.cpp @@ -28,8 +28,9 @@ #if ENABLED(POWER_LOSS_RECOVERY) +#include "../inc/MarlinConfig.h" + #include "powerloss.h" -#include "../core/macros.h" #if ENABLED(EXTENSIBLE_UI) #include "../lcd/extui/ui_api.h" @@ -60,7 +61,6 @@ uint32_t PrintJobRecovery::cmd_sdpos, // = 0 #include "../module/planner.h" #include "../module/printcounter.h" #include "../module/temperature.h" -#include "../core/serial.h" #if HOMING_Z_WITH_PROBE #include "../module/probe.h" diff --git a/Marlin/src/gcode/eeprom/M500-M504.cpp b/Marlin/src/gcode/eeprom/M500-M504.cpp index c3962117e51f..ffa6d5c6860e 100644 --- a/Marlin/src/gcode/eeprom/M500-M504.cpp +++ b/Marlin/src/gcode/eeprom/M500-M504.cpp @@ -22,7 +22,6 @@ #include "../gcode.h" #include "../../module/settings.h" -#include "../../core/serial.h" #include "../../inc/MarlinConfig.h" #if ENABLED(CONFIGURATION_EMBEDDING) diff --git a/Marlin/src/gcode/motion/M290.cpp b/Marlin/src/gcode/motion/M290.cpp index d10f9ee73caa..192efe7e7f98 100644 --- a/Marlin/src/gcode/motion/M290.cpp +++ b/Marlin/src/gcode/motion/M290.cpp @@ -29,10 +29,6 @@ #include "../../module/probe.h" #include "../../module/planner.h" -#if ENABLED(BABYSTEP_ZPROBE_OFFSET) - #include "../../core/serial.h" -#endif - #if ENABLED(MESH_BED_LEVELING) #include "../../feature/bedlevel/bedlevel.h" #endif diff --git a/Marlin/src/gcode/stats/M31.cpp b/Marlin/src/gcode/stats/M31.cpp index ad48eae8663f..a826f9fa8c22 100644 --- a/Marlin/src/gcode/stats/M31.cpp +++ b/Marlin/src/gcode/stats/M31.cpp @@ -21,7 +21,6 @@ */ #include "../gcode.h" -#include "../../core/serial.h" #include "../../module/printcounter.h" #include "../../libs/duration_t.h" #include "../../lcd/marlinui.h" diff --git a/Marlin/src/lcd/e3v2/creality/dwin.cpp b/Marlin/src/lcd/e3v2/creality/dwin.cpp index 34bdd29694a4..04135ff58bc3 100644 --- a/Marlin/src/lcd/e3v2/creality/dwin.cpp +++ b/Marlin/src/lcd/e3v2/creality/dwin.cpp @@ -51,8 +51,6 @@ #include "../../../sd/cardreader.h" #include "../../../MarlinCore.h" -#include "../../../core/serial.h" -#include "../../../core/macros.h" #include "../../../gcode/queue.h" #include "../../../module/temperature.h" diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp index f4b5ba5339ac..8ed75ae1c004 100644 --- a/Marlin/src/lcd/e3v2/proui/dwin.cpp +++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp @@ -40,8 +40,6 @@ #include "../../marlinui.h" #include "../../extui/ui_api.h" #include "../../../MarlinCore.h" -#include "../../../core/serial.h" -#include "../../../core/macros.h" #include "../../../module/temperature.h" #include "../../../module/printcounter.h" #include "../../../module/motion.h" diff --git a/Marlin/src/lcd/sovol_rts/sovol_rts.cpp b/Marlin/src/lcd/sovol_rts/sovol_rts.cpp index 13db7452bc3a..cdffca409b5e 100644 --- a/Marlin/src/lcd/sovol_rts/sovol_rts.cpp +++ b/Marlin/src/lcd/sovol_rts/sovol_rts.cpp @@ -39,8 +39,6 @@ RTS rts; #include #include #include "../../MarlinCore.h" -#include "../../core/serial.h" -#include "../../core/macros.h" #include "../../sd/cardreader.h" #include "../../module/temperature.h" #include "../../module/planner.h" @@ -56,7 +54,6 @@ RTS rts; #include "../../gcode/queue.h" #include "../../gcode/gcode.h" #include "../marlinui.h" -//#include "../utf8.h" #include "../../libs/BL24CXX.h" #if ENABLED(FIX_MOUNTED_PROBE) diff --git a/Marlin/src/libs/hex_print.cpp b/Marlin/src/libs/hex_print.cpp index 9a354011e841..9ff3fc6eb2f4 100644 --- a/Marlin/src/libs/hex_print.cpp +++ b/Marlin/src/libs/hex_print.cpp @@ -25,7 +25,6 @@ #if NEED_HEX_PRINT #include "hex_print.h" -#include "../core/serial.h" static char _hex[] = "0x00000000"; // 0:adr32 2:long 4:adr16 6:word 8:byte