From fed42db5bd18d29dce18a28fa0b5a4d989f67e62 Mon Sep 17 00:00:00 2001 From: Knutwurst <36196269+knutwurst@users.noreply.github.com> Date: Mon, 2 Nov 2020 21:19:58 +0100 Subject: [PATCH] Code Cleanup --- Marlin/Configuration.h | 55 +++++++------------------ Marlin/src/lcd/anycubic_touchscreen.cpp | 15 +++---- 2 files changed, 24 insertions(+), 46 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 72597b61..a613572a 100755 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -849,45 +849,22 @@ * TMC5130, TMC5130_STANDALONE, TMC5160, TMC5160_STANDALONE * :['A4988', 'A5984', 'DRV8825', 'LV8729', 'L6470', 'L6474', 'POWERSTEP01', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC2209', 'TMC2209_STANDALONE', 'TMC26X', 'TMC26X_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE'] */ -/* -#if ENABLED(KNUTWURST_TMC) - #define X_DRIVER_TYPE TMC2208_STANDALONE - #define Y_DRIVER_TYPE TMC2208_STANDALONE - #define Z_DRIVER_TYPE TMC2208_STANDALONE - //#define X2_DRIVER_TYPE TMC2208_STANDALONE - //#define Y2_DRIVER_TYPE TMC2208_STANDALONE - //#define Z2_DRIVER_TYPE TMC2208_STANDALONE - //#define Z3_DRIVER_TYPE TMC2208_STANDALONE - //#define Z4_DRIVER_TYPE TMC2208_STANDALONE - #define E0_DRIVER_TYPE TMC2208_STANDALONE - #define E1_DRIVER_TYPE TMC2208_STANDALONE - //#define E2_DRIVER_TYPE TMC2208_STANDALONE - //#define E3_DRIVER_TYPE TMC2208_STANDALONE - //#define E4_DRIVER_TYPE TMC2208_STANDALONE - //#define E5_DRIVER_TYPE TMC2208_STANDALONE - //#define E6_DRIVER_TYPE TMC2208_STANDALONE - //#define E7_DRIVER_TYPE TMC2208_STANDALONE -#endif - -#if DISABLED(KNUTWURST_TMC) -*/ - #define X_DRIVER_TYPE A4988 - #define Y_DRIVER_TYPE A4988 - #define Z_DRIVER_TYPE A4988 - //#define X2_DRIVER_TYPE A4988 - //#define Y2_DRIVER_TYPE A4988 - //#define Z2_DRIVER_TYPE A4988 - //#define Z3_DRIVER_TYPE A4988 - //#define Z4_DRIVER_TYPE A4988 - #define E0_DRIVER_TYPE A4988 - #define E1_DRIVER_TYPE A4988 - //#define E2_DRIVER_TYPE A4988 - //#define E3_DRIVER_TYPE A4988 - //#define E4_DRIVER_TYPE A4988 - //#define E5_DRIVER_TYPE A4988 - //#define E6_DRIVER_TYPE A4988 - //#define E7_DRIVER_TYPE A4988 -//#endif +#define X_DRIVER_TYPE A4988 +#define Y_DRIVER_TYPE A4988 +#define Z_DRIVER_TYPE A4988 +//#define X2_DRIVER_TYPE A4988 +//#define Y2_DRIVER_TYPE A4988 +//#define Z2_DRIVER_TYPE A4988 +//#define Z3_DRIVER_TYPE A4988 +//#define Z4_DRIVER_TYPE A4988 +#define E0_DRIVER_TYPE A4988 +#define E1_DRIVER_TYPE A4988 +//#define E2_DRIVER_TYPE A4988 +//#define E3_DRIVER_TYPE A4988 +//#define E4_DRIVER_TYPE A4988 +//#define E5_DRIVER_TYPE A4988 +//#define E6_DRIVER_TYPE A4988 +//#define E7_DRIVER_TYPE A4988 // Enable this feature if all enabled endstop pins are interrupt-capable. // This will remove the need to poll the interrupt pins, saving many CPU cycles. diff --git a/Marlin/src/lcd/anycubic_touchscreen.cpp b/Marlin/src/lcd/anycubic_touchscreen.cpp index 8de5885d..a64ef9f0 100755 --- a/Marlin/src/lcd/anycubic_touchscreen.cpp +++ b/Marlin/src/lcd/anycubic_touchscreen.cpp @@ -24,21 +24,22 @@ #include #include -#include "../MarlinCore.h" -#include "../core/language.h" -#include "../core/macros.h" -#include "../core/serial.h" #include "../gcode/queue.h" #include "../feature/e_parser.h" #include "../feature/pause.h" -#include "../inc/MarlinConfig.h" #include "../libs/buzzer.h" #include "../module/planner.h" #include "../module/printcounter.h" -#include "../module/stepper.h" #include "../module/temperature.h" #include "../sd/cardreader.h" -#include "../module/configuration_store.h" +//#include "../MarlinCore.h" +//#include "../core/language.h" +//#include "../core/macros.h" +//#include "../core/serial.h" +//#include "../module/stepper.h" +//#include "../inc/MarlinConfig.h" +//#include "../module/configuration_store.h" + #ifdef ANYCUBIC_TOUCHSCREEN #include "anycubic_touchscreen.h"