From a7495a49c55cae7e248acd8deee758718426c95c Mon Sep 17 00:00:00 2001 From: Knutwurst <36196269+knutwurst@users.noreply.github.com> Date: Sun, 9 Jan 2022 15:07:10 +0100 Subject: [PATCH] Cleanup unused environment variables from older build configurations --- Marlin/Configuration.h | 97 +++--------------------------------- Marlin/Configuration_adv.h | 2 +- Marlin/src/feature/pause.cpp | 7 +-- 3 files changed, 13 insertions(+), 93 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 5dc7e817..473b1ed6 100755 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -38,7 +38,7 @@ #define CONFIGURATION_H_VERSION 02000902 #define ANYCUBIC_TOUCHSCREEN -#if NONE(KNUTWURST_4MAX, KNUTWURST_4MAXP2) +#if DISABLED(KNUTWURST_4MAXP2) #define ANYCUBIC_FILAMENT_RUNOUT_SENSOR #endif #define KNUTWURST_SPECIAL_MENU @@ -85,7 +85,7 @@ * this has to be enabled to alter the motherboard * configuration for the 4MAX printer family */ -#if EITHER(KNUTWURST_4MAX, KNUTWURST_4MAXP2) +#if ENABLED(KNUTWURST_4MAXP2) #define ANYCUBIC_4_MAX_PRO_ENDSTOPS #endif @@ -581,7 +581,7 @@ * 999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below. * */ -#if EITHER(KNUTWURST_4MAX, KNUTWURST_4MAXP2) +#if ENABLED(KNUTWURST_4MAXP2) #define TEMP_SENSOR_0 1 #else #define TEMP_SENSOR_0 5 @@ -713,12 +713,6 @@ #define DEFAULT_Kd 106.55 #endif - #if ENABLED(KNUTWURST_4MAX) - #define DEFAULT_Kp 22.2 - #define DEFAULT_Ki 1.08 - #define DEFAULT_Kd 114 - #endif - #if ENABLED(KNUTWURST_4MAXP2) #define DEFAULT_Kp 17.13 #define DEFAULT_Ki 0.93 @@ -778,7 +772,7 @@ #define DEFAULT_bedKd 1675.16 #endif - #if ANY(KNUTWURST_4MAX, KNUTWURST_4MAXP2) + #if ENABLED(KNUTWURST_4MAXP2) #define DEFAULT_bedKp 251.78 #define DEFAULT_bedKi 49.57 #define DEFAULT_bedKd 319.73 @@ -976,7 +970,7 @@ //#define ENDSTOPPULLDOWN_ZMIN_PROBE #endif -#if ANY(KNUTWURST_MEGA, KNUTWURST_MEGA_S, KNUTWURST_MEGA_P, KNUTWURST_4MAX, KNUTWURST_4MAXP2) +#if ANY(KNUTWURST_MEGA, KNUTWURST_MEGA_S, KNUTWURST_MEGA_P, KNUTWURST_4MAXP2) // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup). #define X_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop. #define Y_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop. @@ -1131,10 +1125,6 @@ #define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 100, 400, 415 } #endif -#if ENABLED(KNUTWURST_4MAX) - #define DEFAULT_AXIS_STEPS_PER_UNIT { 100, 80, 800, 415 } -#endif - #if ENABLED(KNUTWURST_4MAXP2) #define DEFAULT_AXIS_STEPS_PER_UNIT { 100, 80, 800, 415 } #endif @@ -1176,10 +1166,6 @@ #endif #endif -#if ENABLED(KNUTWURST_4MAX) - #define DEFAULT_MAX_FEEDRATE { 150, 150, 18, 80 } -#endif - #if ENABLED(KNUTWURST_4MAXP2) #define DEFAULT_MAX_FEEDRATE { 150, 150, 18, 30 } #endif @@ -1209,10 +1195,6 @@ #define DEFAULT_MAX_ACCELERATION { 350, 350, 50, 20000 } #endif -#if ENABLED(KNUTWURST_4MAX) - #define DEFAULT_MAX_ACCELERATION { 1500, 1500, 100, 10000 } -#endif - #if ENABLED(KNUTWURST_4MAXP2) #define DEFAULT_MAX_ACCELERATION { 1500, 1500, 70, 15000 } #endif @@ -1267,12 +1249,6 @@ #define DEFAULT_TRAVEL_ACCELERATION 350 // X, Y, Z acceleration for travel (non printing) moves #endif -#if ENABLED(KNUTWURST_4MAX) - #define DEFAULT_ACCELERATION 1500 // X, Y, Z and E acceleration for printing moves - #define DEFAULT_RETRACT_ACCELERATION 1500 // E acceleration for retracts - #define DEFAULT_TRAVEL_ACCELERATION 1800 // X, Y, Z acceleration for travel (non printing) moves -#endif - #if ENABLED(KNUTWURST_4MAXP2) #define DEFAULT_ACCELERATION 800 // X, Y, Z and E acceleration for printing moves #define DEFAULT_RETRACT_ACCELERATION 1500 // E acceleration for retracts @@ -1309,7 +1285,7 @@ #define DEFAULT_ZJERK 0.4 #endif - #if ANY(KNUTWURST_4MAX, KNUTWURST_4MAXP2) + #if ENABLED(KNUTWURST_4MAXP2) #define DEFAULT_XJERK 8.0 #define DEFAULT_YJERK 8.0 #define DEFAULT_ZJERK 0.2 @@ -1345,7 +1321,7 @@ #define JUNCTION_DEVIATION_MM 0.018 // (mm) Distance from real junction edge #endif - #if EITHER(KNUTWURST_4MAX, KNUTWURST_4MAXP2) + #if ENABLED(KNUTWURST_4MAXP2) #define JUNCTION_DEVIATION_MM 0.016 // (mm) Distance from real junction edge #endif @@ -1767,29 +1743,6 @@ #define INVERT_E7_DIR false #endif - #if ENABLED(KNUTWURST_4MAX) - // Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way. - #define INVERT_X_DIR false // set to true for stock drivers or TMC2208 with reversed connectors - #define INVERT_Y_DIR false // set to false for stock drivers or TMC2208 with reversed connectors - #define INVERT_Z_DIR false // set to false for stock drivers or TMC2208 with reversed connectors - - // @section extruder - - // For direct drive extruder v9 set to true, for geared extruder set to false. - #if ENABLED(KNUTWURST_BMG) - #define INVERT_E0_DIR false // set to false for stock drivers or TMC2208 with reversed connectors - #else - #define INVERT_E0_DIR true // set to false for stock drivers or TMC2208 with reversed connectors - #endif - #define INVERT_E1_DIR false // set to false for stock drivers or TMC2208 with reversed connectors - #define INVERT_E2_DIR false - #define INVERT_E3_DIR false - #define INVERT_E4_DIR false - #define INVERT_E5_DIR false - #define INVERT_E6_DIR false - #define INVERT_E7_DIR false - #endif - #if ENABLED(KNUTWURST_4MAXP2) // Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way. #define INVERT_X_DIR false // set to true for stock drivers or TMC2208 with reversed connectors @@ -1887,29 +1840,6 @@ #define INVERT_E7_DIR false #endif - #if ENABLED(KNUTWURST_4MAX) - // Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way. - #define INVERT_X_DIR true // set to true for stock drivers or TMC2208 with reversed connectors - #define INVERT_Y_DIR true // set to false for stock drivers or TMC2208 with reversed connectors - #define INVERT_Z_DIR true // set to false for stock drivers or TMC2208 with reversed connectors - - // @section extruder - - // For direct drive extruder v9 set to true, for geared extruder set to false. - #if ENABLED(KNUTWURST_BMG) - #define INVERT_E0_DIR true // set to false for stock drivers or TMC2208 with reversed connectors - #else - #define INVERT_E0_DIR false // set to false for stock drivers or TMC2208 with reversed connectors - #endif - #define INVERT_E1_DIR true // set to false for stock drivers or TMC2208 with reversed connectors - #define INVERT_E2_DIR false - #define INVERT_E3_DIR false - #define INVERT_E4_DIR false - #define INVERT_E5_DIR false - #define INVERT_E6_DIR false - #define INVERT_E7_DIR false - #endif - #if ENABLED(KNUTWURST_4MAXP2) // Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way. #define INVERT_X_DIR false // set to true for stock drivers or TMC2208 with reversed connectors @@ -2015,17 +1945,6 @@ #define Y_MAX_POS Y_BED_SIZE +10 #endif -#if ENABLED(KNUTWURST_4MAX) -#define X_MIN_POS -5 - #define Y_MIN_POS 0 - #define Z_MIN_POS 0 - #define X_BED_SIZE 210 - #define Y_BED_SIZE 210 - #define Z_MAX_POS 300 - #define X_MAX_POS X_BED_SIZE - #define Y_MAX_POS Y_BED_SIZE -#endif - #if ENABLED(KNUTWURST_4MAXP2) #define X_MIN_POS -6 #define Y_MIN_POS 0 @@ -2439,7 +2358,7 @@ #define HOMING_FEEDRATE_MM_M { (30*60), (30*60), (6*60) } #endif -#if EITHER(KNUTWURST_4MAX, KNUTWURST_4MAXP2) +#if ENABLED(KNUTWURST_4MAXP2) // Homing speeds (mm/m) #define HOMING_FEEDRATE_MM_M { (40*60), (40*60), (4*60) } #endif diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index edbfa63c..03f0cd7a 100755 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -643,7 +643,7 @@ /** * M355 Case Light on-off / brightness */ -#if EITHER(KNUTWURST_4MAX, KNUTWURST_4MAXP2) +#if ENABLED(KNUTWURST_4MAXP2) #define CASE_LIGHT_ENABLE #endif diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp index f86543ca..73ea5333 100644 --- a/Marlin/src/feature/pause.cpp +++ b/Marlin/src/feature/pause.cpp @@ -38,6 +38,7 @@ #include "../module/stepper.h" #include "../module/printcounter.h" #include "../module/temperature.h" +#include "../core/serial.h" #if ENABLED(FWRETRACT) #include "fwretract.h" @@ -536,7 +537,7 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep if (AnycubicTouchscreen.ai3m_pause_state < 3) { AnycubicTouchscreen.ai3m_pause_state += 2; #ifdef ANYCUBIC_TFT_DEBUG - SERIAL_ECHOPAIR(" DEBUG: NTO - AI3M Pause State set to: ", AnycubicTouchscreen.ai3m_pause_state); + SERIAL_ECHOPGM(" DEBUG: NTO - AI3M Pause State set to: ", AnycubicTouchscreen.ai3m_pause_state); SERIAL_EOL(); #endif } @@ -580,7 +581,7 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep if (AnycubicTouchscreen.ai3m_pause_state > 3) { AnycubicTouchscreen.ai3m_pause_state -= 2; #ifdef ANYCUBIC_TFT_DEBUG - SERIAL_ECHOPAIR(" DEBUG: NTO - AI3M Pause State set to: ", AnycubicTouchscreen.ai3m_pause_state); + SERIAL_ECHOPGM(" DEBUG: NTO - AI3M Pause State set to: ", AnycubicTouchscreen.ai3m_pause_state); SERIAL_EOL(); #endif } @@ -636,7 +637,7 @@ void resume_print(const_float_t slow_load_length/*=0*/, const_float_t fast_load_ if (AnycubicTouchscreen.ai3m_pause_state > 3) { AnycubicTouchscreen.ai3m_pause_state -= 2; #ifdef ANYCUBIC_TFT_DEBUG - SERIAL_ECHOPAIR(" DEBUG: NTO - AI3M Pause State set to: ", AnycubicTouchscreen.ai3m_pause_state); + SERIAL_ECHOPGM(" DEBUG: NTO - AI3M Pause State set to: ", AnycubicTouchscreen.ai3m_pause_state); SERIAL_EOL(); #endif }