From acda53aa1c386324b6fb2cf30c77f4e3d06914dc Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 8 Jan 2021 15:07:35 -0600 Subject: [PATCH] Clean up some includes --- Marlin/src/feature/encoder_i2c.cpp | 5 ++--- Marlin/src/feature/joystick.cpp | 1 - Marlin/src/feature/joystick.h | 2 -- Marlin/src/gcode/feature/filwidth/M404-M407.cpp | 1 - Marlin/src/gcode/motion/M290.cpp | 1 - Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp | 2 -- Marlin/src/lcd/extui/lib/mks_ui/draw_number_key.cpp | 1 - Marlin/src/lcd/extui/lib/mks_ui/printer_operation.cpp | 1 - Marlin/src/module/stepper.cpp | 1 - 9 files changed, 2 insertions(+), 13 deletions(-) diff --git a/Marlin/src/feature/encoder_i2c.cpp b/Marlin/src/feature/encoder_i2c.cpp index 028e3abe5..dda165edf 100644 --- a/Marlin/src/feature/encoder_i2c.cpp +++ b/Marlin/src/feature/encoder_i2c.cpp @@ -34,7 +34,6 @@ #include "encoder_i2c.h" -#include "../module/temperature.h" #include "../module/stepper.h" #include "../gcode/parser.h" @@ -85,7 +84,7 @@ void I2CPositionEncoder::update() { * the encoder would be re-enabled. */ - /* + #if 0 // If the magnetic strength has been good for a certain time, start trusting the module again if (millis() - lastErrorTime > I2CPE_TIME_TRUSTED) { @@ -111,7 +110,7 @@ void I2CPositionEncoder::update() { SERIAL_ECHOLNPGM(")"); #endif } - */ + #endif return; } diff --git a/Marlin/src/feature/joystick.cpp b/Marlin/src/feature/joystick.cpp index d2041598a..3dca2eb2e 100644 --- a/Marlin/src/feature/joystick.cpp +++ b/Marlin/src/feature/joystick.cpp @@ -32,7 +32,6 @@ #include "../inc/MarlinConfig.h" // for pins #include "../module/planner.h" -#include "../module/temperature.h" Joystick joystick; diff --git a/Marlin/src/feature/joystick.h b/Marlin/src/feature/joystick.h index 1d25a30cc..0c2616671 100644 --- a/Marlin/src/feature/joystick.h +++ b/Marlin/src/feature/joystick.h @@ -27,8 +27,6 @@ #include "../inc/MarlinConfigPre.h" #include "../core/types.h" -#include "../core/macros.h" -#include "../module/temperature.h" class Joystick { friend class Temperature; diff --git a/Marlin/src/gcode/feature/filwidth/M404-M407.cpp b/Marlin/src/gcode/feature/filwidth/M404-M407.cpp index 516289fe2..a70f7a61f 100644 --- a/Marlin/src/gcode/feature/filwidth/M404-M407.cpp +++ b/Marlin/src/gcode/feature/filwidth/M404-M407.cpp @@ -26,7 +26,6 @@ #include "../../../feature/filwidth.h" #include "../../../module/planner.h" -#include "../../../module/temperature.h" #include "../../../MarlinCore.h" #include "../../gcode.h" diff --git a/Marlin/src/gcode/motion/M290.cpp b/Marlin/src/gcode/motion/M290.cpp index 18cc161fc..df8dad799 100644 --- a/Marlin/src/gcode/motion/M290.cpp +++ b/Marlin/src/gcode/motion/M290.cpp @@ -27,7 +27,6 @@ #include "../gcode.h" #include "../../feature/babystep.h" #include "../../module/probe.h" -#include "../../module/temperature.h" #include "../../module/planner.h" #if ENABLED(BABYSTEP_ZPROBE_OFFSET) diff --git a/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp b/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp index 8577b76ce..c7cd76733 100644 --- a/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp +++ b/Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp @@ -33,11 +33,9 @@ #include "../../ui_api.h" #include "../../../../MarlinCore.h" -#include "../../../../module/temperature.h" #include "../../../../module/motion.h" #include "../../../../gcode/queue.h" #include "../../../../module/planner.h" -#include "../../../../sd/cardreader.h" #include "../../../../libs/duration_t.h" #include "../../../../module/printcounter.h" #if ENABLED(POWER_LOSS_RECOVERY) diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_number_key.cpp b/Marlin/src/lcd/extui/lib/mks_ui/draw_number_key.cpp index 0989b95f8..54ae27d96 100644 --- a/Marlin/src/lcd/extui/lib/mks_ui/draw_number_key.cpp +++ b/Marlin/src/lcd/extui/lib/mks_ui/draw_number_key.cpp @@ -33,7 +33,6 @@ #include "../../../../gcode/gcode.h" #include "../../../../gcode/queue.h" #include "../../../../module/planner.h" -#include "../../../../module/temperature.h" #include "../../../../inc/MarlinConfig.h" #if ENABLED(POWER_LOSS_RECOVERY) diff --git a/Marlin/src/lcd/extui/lib/mks_ui/printer_operation.cpp b/Marlin/src/lcd/extui/lib/mks_ui/printer_operation.cpp index 58f9f4fce..1b611aba6 100644 --- a/Marlin/src/lcd/extui/lib/mks_ui/printer_operation.cpp +++ b/Marlin/src/lcd/extui/lib/mks_ui/printer_operation.cpp @@ -27,7 +27,6 @@ #include #include "../../../../gcode/gcode.h" -#include "../../../../module/temperature.h" #include "../../../../module/planner.h" #include "../../../../module/motion.h" #include "../../../../sd/cardreader.h" diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp index c92dd4512..466f4f333 100644 --- a/Marlin/src/module/stepper.cpp +++ b/Marlin/src/module/stepper.cpp @@ -91,7 +91,6 @@ Stepper stepper; // Singleton #include "planner.h" #include "motion.h" -#include "temperature.h" #include "../lcd/marlinui.h" #include "../gcode/queue.h" #include "../sd/cardreader.h"