diff --git a/Firmware/Configuration_adv.h b/Firmware/Configuration_adv.h index d115e558d560..aa663228d584 100644 --- a/Firmware/Configuration_adv.h +++ b/Firmware/Configuration_adv.h @@ -453,14 +453,6 @@ const unsigned int dropsegments=5; //everything with less than this number of st #define THERMISTORHEATER_0 TEMP_SENSOR_0 #define HEATER_0_USES_THERMISTOR #endif -#if TEMP_SENSOR_1 > 0 - #define THERMISTORHEATER_1 TEMP_SENSOR_1 - #define HEATER_1_USES_THERMISTOR -#endif -#if TEMP_SENSOR_2 > 0 - #define THERMISTORHEATER_2 TEMP_SENSOR_2 - #define HEATER_2_USES_THERMISTOR -#endif #if TEMP_SENSOR_BED > 0 #define THERMISTORBED TEMP_SENSOR_BED #define BED_USES_THERMISTOR @@ -474,12 +466,6 @@ const unsigned int dropsegments=5; //everything with less than this number of st #if TEMP_SENSOR_0 == -1 #define HEATER_0_USES_AD595 #endif -#if TEMP_SENSOR_1 == -1 - #define HEATER_1_USES_AD595 -#endif -#if TEMP_SENSOR_2 == -1 - #define HEATER_2_USES_AD595 -#endif #if TEMP_SENSOR_BED == -1 #define BED_USES_AD595 #endif @@ -490,14 +476,6 @@ const unsigned int dropsegments=5; //everything with less than this number of st #undef HEATER_0_MINTEMP #undef HEATER_0_MAXTEMP #endif -#if TEMP_SENSOR_1 == 0 - #undef HEATER_1_MINTEMP - #undef HEATER_1_MAXTEMP -#endif -#if TEMP_SENSOR_2 == 0 - #undef HEATER_2_MINTEMP - #undef HEATER_2_MAXTEMP -#endif #if TEMP_SENSOR_BED == 0 #undef BED_MINTEMP #undef BED_MAXTEMP diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index d198d406f29b..c05a27261dc3 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -181,21 +181,6 @@ void manage_inactivity(bool ignore_stepper_queue=false); #define disable_z() disable_force_z() #endif // PSU_Delta - -//#if defined(Z_ENABLE_PIN) && Z_ENABLE_PIN > -1 -//#ifdef Z_DUAL_STEPPER_DRIVERS -//#define enable_z() { WRITE(Z_ENABLE_PIN, Z_ENABLE_ON); WRITE(Z2_ENABLE_PIN, Z_ENABLE_ON); } -//#define disable_z() { WRITE(Z_ENABLE_PIN,!Z_ENABLE_ON); WRITE(Z2_ENABLE_PIN,!Z_ENABLE_ON); axis_known_position[Z_AXIS] = false; } -//#else -//#define enable_z() WRITE(Z_ENABLE_PIN, Z_ENABLE_ON) -//#define disable_z() { WRITE(Z_ENABLE_PIN,!Z_ENABLE_ON); axis_known_position[Z_AXIS] = false; } -//#endif -//#else -//#define enable_z() ; -//#define disable_z() ; -//#endif - - #if defined(E0_ENABLE_PIN) && (E0_ENABLE_PIN > -1) #define enable_e0() WRITE(E0_ENABLE_PIN, E_ENABLE_ON) #define disable_e0() WRITE(E0_ENABLE_PIN,!E_ENABLE_ON) @@ -204,23 +189,6 @@ void manage_inactivity(bool ignore_stepper_queue=false); #define disable_e0() /* nothing */ #endif -#if (EXTRUDERS > 1) && defined(E1_ENABLE_PIN) && (E1_ENABLE_PIN > -1) - #define enable_e1() WRITE(E1_ENABLE_PIN, E_ENABLE_ON) - #define disable_e1() WRITE(E1_ENABLE_PIN,!E_ENABLE_ON) -#else - #define enable_e1() /* nothing */ - #define disable_e1() /* nothing */ -#endif - -#if (EXTRUDERS > 2) && defined(E2_ENABLE_PIN) && (E2_ENABLE_PIN > -1) - #define enable_e2() WRITE(E2_ENABLE_PIN, E_ENABLE_ON) - #define disable_e2() WRITE(E2_ENABLE_PIN,!E_ENABLE_ON) -#else - #define enable_e2() /* nothing */ - #define disable_e2() /* nothing */ -#endif - - enum AxisEnum {X_AXIS=0, Y_AXIS=1, Z_AXIS=2, E_AXIS=3, X_HEAD=4, Y_HEAD=5}; #define X_AXIS_MASK 1 #define Y_AXIS_MASK 2 diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 0bdd2b4a52d1..ce66afc25c85 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -4938,8 +4938,6 @@ void process_commands() disable_y(); disable_z(); disable_e0(); - disable_e1(); - disable_e2(); setTargetBed(0); //set bed target temperature back to 0 lcd_show_fullscreen_message_and_wait_P(_T(MSG_PINDA_CALIBRATION_DONE)); eeprom_update_byte((unsigned char *)EEPROM_TEMP_CAL_ACTIVE, 1); @@ -5269,8 +5267,6 @@ void process_commands() enable_y(); enable_z(); enable_e0(); - enable_e1(); - enable_e2(); break; #ifdef SDSUPPORT @@ -6211,8 +6207,6 @@ SERIAL_PROTOCOLPGM("\n\n"); disable_heater(); st_synchronize(); disable_e0(); - disable_e1(); - disable_e2(); finishAndDisableSteppers(); fanSpeed = 0; _delay(1000); // Wait a little before to switch off @@ -6275,23 +6269,17 @@ SERIAL_PROTOCOLPGM("\n\n"); { st_synchronize(); disable_e0(); - disable_e1(); - disable_e2(); finishAndDisableSteppers(); } else { st_synchronize(); - if (code_seen('X')) disable_x(); - if (code_seen('Y')) disable_y(); - if (code_seen('Z')) disable_z(); -#if ((E0_ENABLE_PIN != X_ENABLE_PIN) && (E1_ENABLE_PIN != Y_ENABLE_PIN)) // Only enable on boards that have seperate ENABLE_PINS - if (code_seen('E')) { - disable_e0(); - disable_e1(); - disable_e2(); - } - #endif + if (code_seen('X')) disable_x(); + if (code_seen('Y')) disable_y(); + if (code_seen('Z')) disable_z(); +#if (E0_ENABLE_PIN != X_ENABLE_PIN) // Only enable on boards that have seperate ENABLE_PINS + if (code_seen('E')) disable_e0(); +#endif } } break; @@ -9277,15 +9265,6 @@ void controllerFan() lastMotorCheck = _millis(); if(!READ(X_ENABLE_PIN) || !READ(Y_ENABLE_PIN) || !READ(Z_ENABLE_PIN) || (soft_pwm_bed > 0) - #if EXTRUDERS > 2 - || !READ(E2_ENABLE_PIN) - #endif - #if EXTRUDER > 1 - #if defined(X2_ENABLE_PIN) && X2_ENABLE_PIN > -1 - || !READ(X2_ENABLE_PIN) - #endif - || !READ(E1_ENABLE_PIN) - #endif || !READ(E0_ENABLE_PIN)) //If any of the drivers are enabled... { lastMotor = _millis(); //... set time to NOW so the fan will turn on @@ -9318,9 +9297,6 @@ void controllerFan() */ static void handleSafetyTimer() { -#if (EXTRUDERS > 1) -#error Implemented only for one extruder. -#endif //(EXTRUDERS > 1) if (printer_active() || (!degTargetBed() && !degTargetHotend(0)) || (!safetytimer_inactive_time)) { safetyTimer.stop(); @@ -9370,8 +9346,6 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) //default argument s disable_y(); disable_z(); disable_e0(); - disable_e1(); - disable_e2(); } } } @@ -9459,8 +9433,6 @@ void kill(const char *full_screen_message) { disable_y(); poweroff_z(); disable_e0(); - disable_e1(); - disable_e2(); SERIAL_ERROR_START; SERIAL_ERRORLNRPGM(PSTR("Printer halted. kill() called!")); @@ -9571,8 +9543,6 @@ void finishAndDisableSteppers() disable_y(); disable_z(); disable_e0(); - disable_e1(); - disable_e2(); #ifndef LA_NOCOMPAT // Steppers are disabled both when a print is stopped and also via M84 (which is additionally diff --git a/Firmware/planner.cpp b/Firmware/planner.cpp index 46b679793e6e..001b2137b06e 100644 --- a/Firmware/planner.cpp +++ b/Firmware/planner.cpp @@ -554,12 +554,7 @@ void check_axes_activity() if((DISABLE_X) && (x_active == 0)) disable_x(); if((DISABLE_Y) && (y_active == 0)) disable_y(); if((DISABLE_Z) && (z_active == 0)) disable_z(); - if((DISABLE_E) && (e_active == 0)) - { - disable_e0(); - disable_e1(); - disable_e2(); - } + if((DISABLE_E) && (e_active == 0)) disable_e0(); #if defined(FAN_PIN) && FAN_PIN > -1 #ifdef FAN_KICKSTART_TIME static unsigned long fan_kick_end; diff --git a/Firmware/stepper.cpp b/Firmware/stepper.cpp index 758e0dcdb1a4..3e7e4c72c77c 100644 --- a/Firmware/stepper.cpp +++ b/Firmware/stepper.cpp @@ -1102,12 +1102,6 @@ void st_init() #if defined(E0_DIR_PIN) && E0_DIR_PIN > -1 SET_OUTPUT(E0_DIR_PIN); #endif - #if defined(E1_DIR_PIN) && (E1_DIR_PIN > -1) - SET_OUTPUT(E1_DIR_PIN); - #endif - #if defined(E2_DIR_PIN) && (E2_DIR_PIN > -1) - SET_OUTPUT(E2_DIR_PIN); - #endif //Initialize Enable Pins - steppers default to disabled. @@ -1141,14 +1135,6 @@ void st_init() SET_OUTPUT(E0_ENABLE_PIN); if(!E_ENABLE_ON) WRITE(E0_ENABLE_PIN,HIGH); #endif - #if defined(E1_ENABLE_PIN) && (E1_ENABLE_PIN > -1) - SET_OUTPUT(E1_ENABLE_PIN); - if(!E_ENABLE_ON) WRITE(E1_ENABLE_PIN,HIGH); - #endif - #if defined(E2_ENABLE_PIN) && (E2_ENABLE_PIN > -1) - SET_OUTPUT(E2_ENABLE_PIN); - if(!E_ENABLE_ON) WRITE(E2_ENABLE_PIN,HIGH); - #endif //endstops and pullups #if defined(X_MIN_PIN) && X_MIN_PIN > -1 @@ -1246,16 +1232,6 @@ void st_init() WRITE(E0_STEP_PIN,INVERT_E_STEP_PIN); disable_e0(); #endif - #if defined(E1_STEP_PIN) && (E1_STEP_PIN > -1) - SET_OUTPUT(E1_STEP_PIN); - WRITE(E1_STEP_PIN,INVERT_E_STEP_PIN); - disable_e1(); - #endif - #if defined(E2_STEP_PIN) && (E2_STEP_PIN > -1) - SET_OUTPUT(E2_STEP_PIN); - WRITE(E2_STEP_PIN,INVERT_E_STEP_PIN); - disable_e2(); - #endif // waveform generation = 0100 = CTC TCCR1B &= ~(1< 3 - # error Unsupported number of extruders -#elif EXTRUDERS > 2 - # define ARRAY_BY_EXTRUDERS(v1, v2, v3) { v1, v2, v3 } -#elif EXTRUDERS > 1 - # define ARRAY_BY_EXTRUDERS(v1, v2, v3) { v1, v2 } -#else - # define ARRAY_BY_EXTRUDERS(v1, v2, v3) { v1 } -#endif +#define ARRAY_BY_EXTRUDERS(v1 ) { v1 } // Init min and max temp with extreme values to prevent false errors during startup -static int minttemp_raw[EXTRUDERS] = ARRAY_BY_EXTRUDERS( HEATER_0_RAW_LO_TEMP , HEATER_1_RAW_LO_TEMP , HEATER_2_RAW_LO_TEMP ); -static int maxttemp_raw[EXTRUDERS] = ARRAY_BY_EXTRUDERS( HEATER_0_RAW_HI_TEMP , HEATER_1_RAW_HI_TEMP , HEATER_2_RAW_HI_TEMP ); -static int minttemp[EXTRUDERS] = ARRAY_BY_EXTRUDERS( 0, 0, 0 ); -static int maxttemp[EXTRUDERS] = ARRAY_BY_EXTRUDERS( 16383, 16383, 16383 ); +static int minttemp_raw[EXTRUDERS] = ARRAY_BY_EXTRUDERS( HEATER_0_RAW_LO_TEMP ); +static int maxttemp_raw[EXTRUDERS] = ARRAY_BY_EXTRUDERS( HEATER_0_RAW_HI_TEMP ); +static int minttemp[EXTRUDERS] = ARRAY_BY_EXTRUDERS( 0 ); +static int maxttemp[EXTRUDERS] = ARRAY_BY_EXTRUDERS( 16383 ); #ifdef BED_MINTEMP static int bed_minttemp_raw = HEATER_BED_RAW_LO_TEMP; #endif @@ -217,8 +209,8 @@ static int ambient_minttemp_raw = AMBIENT_RAW_LO_TEMP; static int ambient_maxttemp_raw = AMBIENT_RAW_HI_TEMP; #endif -static void *heater_ttbl_map[EXTRUDERS] = ARRAY_BY_EXTRUDERS( (void *)HEATER_0_TEMPTABLE, (void *)HEATER_1_TEMPTABLE, (void *)HEATER_2_TEMPTABLE ); -static uint8_t heater_ttbllen_map[EXTRUDERS] = ARRAY_BY_EXTRUDERS( HEATER_0_TEMPTABLE_LEN, HEATER_1_TEMPTABLE_LEN, HEATER_2_TEMPTABLE_LEN ); +static void *heater_ttbl_map[EXTRUDERS] = ARRAY_BY_EXTRUDERS( (void *)HEATER_0_TEMPTABLE ); +static uint8_t heater_ttbllen_map[EXTRUDERS] = ARRAY_BY_EXTRUDERS( HEATER_0_TEMPTABLE_LEN ); static float analog2temp(int raw, uint8_t e); static float analog2tempBed(int raw); @@ -252,14 +244,6 @@ static void temp_runaway_check(uint8_t _heater_id, float _target_temperature, fl static void temp_runaway_stop(bool isPreheat, bool isBed); #endif -// return "false", if all extruder-heaters are 'off' (ie. "true", if any heater is 'on') -bool checkAllHotends(void) -{ - bool result=false; - for(int i=0;i -1) SET_OUTPUT(HEATER_0_PIN); - #endif - #if defined(HEATER_1_PIN) && (HEATER_1_PIN > -1) - SET_OUTPUT(HEATER_1_PIN); - #endif - #if defined(HEATER_2_PIN) && (HEATER_2_PIN > -1) - SET_OUTPUT(HEATER_2_PIN); - #endif + #endif #if defined(HEATER_BED_PIN) && (HEATER_BED_PIN > -1) SET_OUTPUT(HEATER_BED_PIN); #endif @@ -797,48 +775,6 @@ void soft_pwm_init() } #endif //MAXTEMP -#if (EXTRUDERS > 1) && defined(HEATER_1_MINTEMP) - minttemp[1] = HEATER_1_MINTEMP; - while(analog2temp(minttemp_raw[1], 1) < HEATER_1_MINTEMP) { -#if HEATER_1_RAW_LO_TEMP < HEATER_1_RAW_HI_TEMP - minttemp_raw[1] += OVERSAMPLENR; -#else - minttemp_raw[1] -= OVERSAMPLENR; -#endif - } -#endif // MINTEMP 1 -#if (EXTRUDERS > 1) && defined(HEATER_1_MAXTEMP) - maxttemp[1] = HEATER_1_MAXTEMP; - while(analog2temp(maxttemp_raw[1], 1) > HEATER_1_MAXTEMP) { -#if HEATER_1_RAW_LO_TEMP < HEATER_1_RAW_HI_TEMP - maxttemp_raw[1] -= OVERSAMPLENR; -#else - maxttemp_raw[1] += OVERSAMPLENR; -#endif - } -#endif //MAXTEMP 1 - -#if (EXTRUDERS > 2) && defined(HEATER_2_MINTEMP) - minttemp[2] = HEATER_2_MINTEMP; - while(analog2temp(minttemp_raw[2], 2) < HEATER_2_MINTEMP) { -#if HEATER_2_RAW_LO_TEMP < HEATER_2_RAW_HI_TEMP - minttemp_raw[2] += OVERSAMPLENR; -#else - minttemp_raw[2] -= OVERSAMPLENR; -#endif - } -#endif //MINTEMP 2 -#if (EXTRUDERS > 2) && defined(HEATER_2_MAXTEMP) - maxttemp[2] = HEATER_2_MAXTEMP; - while(analog2temp(maxttemp_raw[2], 2) > HEATER_2_MAXTEMP) { -#if HEATER_2_RAW_LO_TEMP < HEATER_2_RAW_HI_TEMP - maxttemp_raw[2] -= OVERSAMPLENR; -#else - maxttemp_raw[2] += OVERSAMPLENR; -#endif - } -#endif //MAXTEMP 2 - #ifdef BED_MINTEMP while(analog2tempBed(bed_minttemp_raw) < BED_MINTEMP) { #if HEATER_BED_RAW_LO_TEMP < HEATER_BED_RAW_HI_TEMP @@ -1191,28 +1127,11 @@ FORCE_INLINE static void soft_pwm_core() static unsigned char slow_pwm_count = 0; static unsigned char state_heater_0 = 0; static unsigned char state_timer_heater_0 = 0; -#endif -#if (EXTRUDERS > 1) || defined(HEATERS_PARALLEL) - static unsigned char soft_pwm_1; -#ifdef SLOW_PWM_HEATERS - static unsigned char state_heater_1 = 0; - static unsigned char state_timer_heater_1 = 0; -#endif -#endif -#if EXTRUDERS > 2 - static unsigned char soft_pwm_2; -#ifdef SLOW_PWM_HEATERS - static unsigned char state_heater_2 = 0; - static unsigned char state_timer_heater_2 = 0; -#endif -#endif #if HEATER_BED_PIN > -1 - // @@DR static unsigned char soft_pwm_b; -#ifdef SLOW_PWM_HEATERS static unsigned char state_heater_b = 0; static unsigned char state_timer_heater_b = 0; -#endif -#endif +#endif // HEATER_BED_PIN > -1 +#endif // SLOW_PWM_HEATERS #ifndef SLOW_PWM_HEATERS /* @@ -1228,14 +1147,6 @@ FORCE_INLINE static void soft_pwm_core() WRITE(HEATER_1_PIN,1); #endif } else WRITE(HEATER_0_PIN,0); -#if EXTRUDERS > 1 - soft_pwm_1 = soft_pwm[1]; - if(soft_pwm_1 > 0) WRITE(HEATER_1_PIN,1); else WRITE(HEATER_1_PIN,0); -#endif -#if EXTRUDERS > 2 - soft_pwm_2 = soft_pwm[2]; - if(soft_pwm_2 > 0) WRITE(HEATER_2_PIN,1); else WRITE(HEATER_2_PIN,0); -#endif } #if defined(HEATER_BED_PIN) && HEATER_BED_PIN > -1 @@ -1272,13 +1183,6 @@ FORCE_INLINE static void soft_pwm_core() #endif } -#if EXTRUDERS > 1 - if(soft_pwm_1 < pwm_count) WRITE(HEATER_1_PIN,0); -#endif -#if EXTRUDERS > 2 - if(soft_pwm_2 < pwm_count) WRITE(HEATER_2_PIN,0); -#endif - #if 0 // @@DR #if defined(HEATER_BED_PIN) && HEATER_BED_PIN > -1 if (soft_pwm_b < (pwm_count & ((1 << HEATER_BED_SOFT_PWM_BITS) - 1))){ @@ -1333,59 +1237,7 @@ FORCE_INLINE static void soft_pwm_core() #endif } } - -#if EXTRUDERS > 1 - // EXTRUDER 1 - soft_pwm_1 = soft_pwm[1]; - if (soft_pwm_1 > 0) { - // turn ON heather only if the minimum time is up - if (state_timer_heater_1 == 0) { - // if change state set timer - if (state_heater_1 == 0) { - state_timer_heater_1 = MIN_STATE_TIME; - } - state_heater_1 = 1; - WRITE(HEATER_1_PIN, 1); - } - } else { - // turn OFF heather only if the minimum time is up - if (state_timer_heater_1 == 0) { - // if change state set timer - if (state_heater_1 == 1) { - state_timer_heater_1 = MIN_STATE_TIME; - } - state_heater_1 = 0; - WRITE(HEATER_1_PIN, 0); - } - } -#endif - -#if EXTRUDERS > 2 - // EXTRUDER 2 - soft_pwm_2 = soft_pwm[2]; - if (soft_pwm_2 > 0) { - // turn ON heather only if the minimum time is up - if (state_timer_heater_2 == 0) { - // if change state set timer - if (state_heater_2 == 0) { - state_timer_heater_2 = MIN_STATE_TIME; - } - state_heater_2 = 1; - WRITE(HEATER_2_PIN, 1); - } - } else { - // turn OFF heather only if the minimum time is up - if (state_timer_heater_2 == 0) { - // if change state set timer - if (state_heater_2 == 1) { - state_timer_heater_2 = MIN_STATE_TIME; - } - state_heater_2 = 0; - WRITE(HEATER_2_PIN, 0); - } - } -#endif - + #if defined(HEATER_BED_PIN) && HEATER_BED_PIN > -1 // BED soft_pwm_b = soft_pwm_bed; @@ -1428,37 +1280,7 @@ FORCE_INLINE static void soft_pwm_core() #endif } } - -#if EXTRUDERS > 1 - // EXTRUDER 1 - if (soft_pwm_1 < slow_pwm_count) { - // turn OFF heather only if the minimum time is up - if (state_timer_heater_1 == 0) { - // if change state set timer - if (state_heater_1 == 1) { - state_timer_heater_1 = MIN_STATE_TIME; - } - state_heater_1 = 0; - WRITE(HEATER_1_PIN, 0); - } - } -#endif - -#if EXTRUDERS > 2 - // EXTRUDER 2 - if (soft_pwm_2 < slow_pwm_count) { - // turn OFF heather only if the minimum time is up - if (state_timer_heater_2 == 0) { - // if change state set timer - if (state_heater_2 == 1) { - state_timer_heater_2 = MIN_STATE_TIME; - } - state_heater_2 = 0; - WRITE(HEATER_2_PIN, 0); - } - } -#endif - + #if defined(HEATER_BED_PIN) && HEATER_BED_PIN > -1 // BED if (soft_pwm_b < slow_pwm_count) { @@ -1493,20 +1315,8 @@ FORCE_INLINE static void soft_pwm_core() // Extruder 0 if (state_timer_heater_0 > 0) { state_timer_heater_0--; - } - -#if EXTRUDERS > 1 - // Extruder 1 - if (state_timer_heater_1 > 0) - state_timer_heater_1--; -#endif - -#if EXTRUDERS > 2 - // Extruder 2 - if (state_timer_heater_2 > 0) - state_timer_heater_2--; -#endif - + } + #if defined(HEATER_BED_PIN) && HEATER_BED_PIN > -1 // Bed if (state_timer_heater_b > 0) @@ -2203,12 +2013,6 @@ void disable_heater() #if defined(HEATER_0_PIN) && HEATER_0_PIN > -1 && EXTRUDERS > 0 WRITE(HEATER_0_PIN,LOW); #endif -#if defined(HEATER_1_PIN) && HEATER_1_PIN > -1 && EXTRUDERS > 1 - WRITE(HEATER_1_PIN,LOW); -#endif -#if defined(HEATER_2_PIN) && HEATER_2_PIN > -1 && EXTRUDERS > 2 - WRITE(HEATER_2_PIN,LOW); -#endif #if defined(HEATER_BED_PIN) && HEATER_BED_PIN > -1 // TODO: this doesn't take immediate effect! timer02_set_pwm0(0); diff --git a/Firmware/temperature.h b/Firmware/temperature.h index cc018be0f709..1e0a5c14864a 100755 --- a/Firmware/temperature.h +++ b/Firmware/temperature.h @@ -30,8 +30,6 @@ void temp_mgr_init(); //initialize the temperature handler void manage_heater(); //it is critical that this is called periodically. bool get_temp_error(); //return true if any thermal error is set -extern bool checkAllHotends(void); - // low level conversion routines // do not use these routines and variables outside of temperature.cpp extern int target_temperature[EXTRUDERS]; @@ -156,7 +154,7 @@ FORCE_INLINE bool isCoolingBed() { #define isCoolingHotend0() isCoolingHotend(0) // return "false", if all heaters are 'off' (ie. "true", if any heater is 'on') -#define CHECK_ALL_HEATERS (checkAllHotends()||(target_temperature_bed!=0)) +#define CHECK_ALL_HEATERS ((target_temperature[0] != 0) || (target_temperature_bed != 0)) int getHeaterPower(int heater); void disable_heater(); // Disable all heaters *instantaneously* diff --git a/Firmware/thermistortables.h b/Firmware/thermistortables.h index 721c6b359f2e..c262025b50c3 100644 --- a/Firmware/thermistortables.h +++ b/Firmware/thermistortables.h @@ -6,7 +6,7 @@ #define OVERSAMPLENR 16 -#if (THERMISTORHEATER_0 == 1) || (THERMISTORHEATER_1 == 1) || (THERMISTORHEATER_2 == 1) || (THERMISTORBED == 1) //100k bed thermistor +#if (THERMISTORHEATER_0 == 1) || (THERMISTORBED == 1) //100k bed thermistor const short temptable_1[][2] PROGMEM = { { 23*OVERSAMPLENR , 300 }, @@ -72,7 +72,7 @@ const short temptable_1[][2] PROGMEM = { { 1008*OVERSAMPLENR , 0 } //safety }; #endif -#if (THERMISTORHEATER_0 == 2) || (THERMISTORHEATER_1 == 2) || (THERMISTORHEATER_2 == 2) || (THERMISTORBED == 2) //200k bed thermistor +#if (THERMISTORHEATER_0 == 2) || (THERMISTORBED == 2) //200k bed thermistor const short temptable_2[][2] PROGMEM = { //200k ATC Semitec 204GT-2 //Verified by linagee. Source: http://shop.arcol.hu/static/datasheets/thermistors.pdf @@ -112,7 +112,7 @@ const short temptable_2[][2] PROGMEM = { }; #endif -#if (THERMISTORHEATER_0 == 3) || (THERMISTORHEATER_1 == 3) || (THERMISTORHEATER_2 == 3) || (THERMISTORBED == 3) //mendel-parts +#if (THERMISTORHEATER_0 == 3) || (THERMISTORBED == 3) //mendel-parts const short temptable_3[][2] PROGMEM = { {1*OVERSAMPLENR,864}, {21*OVERSAMPLENR,300}, @@ -145,7 +145,7 @@ const short temptable_3[][2] PROGMEM = { }; #endif -#if (THERMISTORHEATER_0 == 4) || (THERMISTORHEATER_1 == 4) || (THERMISTORHEATER_2 == 4) || (THERMISTORBED == 4) //10k thermistor +#if (THERMISTORHEATER_0 == 4) || (THERMISTORBED == 4) //10k thermistor const short temptable_4[][2] PROGMEM = { {1*OVERSAMPLENR, 430}, {54*OVERSAMPLENR, 137}, @@ -170,7 +170,7 @@ const short temptable_4[][2] PROGMEM = { }; #endif -#if (THERMISTORHEATER_0 == 5) || (THERMISTORHEATER_1 == 5) || (THERMISTORHEATER_2 == 5) || (THERMISTORBED == 5) //100k ParCan thermistor (104GT-2) +#if (THERMISTORHEATER_0 == 5) || (THERMISTORBED == 5) //100k ParCan thermistor (104GT-2) const short temptable_5[][2] PROGMEM = { // ATC Semitec 104GT-2 (Used in ParCan) // Verified by linagee. Source: http://shop.arcol.hu/static/datasheets/thermistors.pdf @@ -210,7 +210,7 @@ const short temptable_5[][2] PROGMEM = { }; #endif -#if (THERMISTORHEATER_0 == 6) || (THERMISTORHEATER_1 == 6) || (THERMISTORHEATER_2 == 6) || (THERMISTORBED == 6) // 100k Epcos thermistor +#if (THERMISTORHEATER_0 == 6) || (THERMISTORBED == 6) // 100k Epcos thermistor const short temptable_6[][2] PROGMEM = { {1*OVERSAMPLENR, 350}, {28*OVERSAMPLENR, 250}, //top rating 250C @@ -253,7 +253,7 @@ const short temptable_6[][2] PROGMEM = { }; #endif -#if (THERMISTORHEATER_0 == 7) || (THERMISTORHEATER_1 == 7) || (THERMISTORHEATER_2 == 7) || (THERMISTORBED == 7) // 100k Honeywell 135-104LAG-J01 +#if (THERMISTORHEATER_0 == 7) || (THERMISTORBED == 7) // 100k Honeywell 135-104LAG-J01 const short temptable_7[][2] PROGMEM = { {1*OVERSAMPLENR, 941}, {19*OVERSAMPLENR, 362}, @@ -316,7 +316,7 @@ const short temptable_7[][2] PROGMEM = { }; #endif -#if (THERMISTORHEATER_0 == 71) || (THERMISTORHEATER_1 == 71) || (THERMISTORHEATER_2 == 71) || (THERMISTORBED == 71) // 100k Honeywell 135-104LAF-J01 +#if (THERMISTORHEATER_0 == 71) || (THERMISTORBED == 71) // 100k Honeywell 135-104LAF-J01 // R0 = 100000 Ohm // T0 = 25 °C // Beta = 3974 @@ -467,7 +467,7 @@ const short temptable_71[][2] PROGMEM = { }; #endif -#if (THERMISTORHEATER_0 == 8) || (THERMISTORHEATER_1 == 8) || (THERMISTORHEATER_2 == 8) || (THERMISTORBED == 8) +#if (THERMISTORHEATER_0 == 8) || (THERMISTORBED == 8) // 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) const short temptable_8[][2] PROGMEM = { {1*OVERSAMPLENR, 704}, @@ -492,7 +492,7 @@ const short temptable_8[][2] PROGMEM = { {1008*OVERSAMPLENR, 0} }; #endif -#if (THERMISTORHEATER_0 == 9) || (THERMISTORHEATER_1 == 9) || (THERMISTORHEATER_2 == 9) || (THERMISTORBED == 9) +#if (THERMISTORHEATER_0 == 9) || (THERMISTORBED == 9) // 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup) const short temptable_9[][2] PROGMEM = { {1*OVERSAMPLENR, 936}, @@ -528,7 +528,7 @@ const short temptable_9[][2] PROGMEM = { {1016*OVERSAMPLENR, 0} }; #endif -#if (THERMISTORHEATER_0 == 10) || (THERMISTORHEATER_1 == 10) || (THERMISTORHEATER_2 == 10) || (THERMISTORBED == 10) +#if (THERMISTORHEATER_0 == 10) || (THERMISTORBED == 10) // 100k RS thermistor 198-961 (4.7k pullup) const short temptable_10[][2] PROGMEM = { {1*OVERSAMPLENR, 929}, @@ -565,7 +565,7 @@ const short temptable_10[][2] PROGMEM = { }; #endif -#if (THERMISTORHEATER_0 == 11) || (THERMISTORHEATER_1 == 11) || (THERMISTORHEATER_2 == 11) || (THERMISTORBED == 11) +#if (THERMISTORHEATER_0 == 11) || (THERMISTORBED == 11) // QU-BD silicone bed QWG-104F-3950 thermistor const short temptable_11[][2] PROGMEM = { @@ -622,7 +622,7 @@ const short temptable_11[][2] PROGMEM = { }; #endif -#if (THERMISTORHEATER_0 == 13) || (THERMISTORHEATER_1 == 13) || (THERMISTORHEATER_2 == 13) || (THERMISTORBED == 13) +#if (THERMISTORHEATER_0 == 13) || (THERMISTORBED == 13) // Hisens thermistor B25/50 =3950 +/-1% const short temptable_13[][2] PROGMEM = { @@ -691,21 +691,13 @@ const short temptable_13[][2] PROGMEM = { }; #endif -#if (THERMISTORHEATER_0 == 20) || (THERMISTORHEATER_1 == 20) || (THERMISTORHEATER_2 == 20) || (THERMISTORBED == 20) // PT100 with INA826 amp on Ultimaker v2.0 electronics +#if (THERMISTORHEATER_0 == 20) || (THERMISTORBED == 20) // PT100 with INA826 amp on Ultimaker v2.0 electronics /* The PT100 in the Ultimaker v2.0 electronics has a high sample value for a high temperature. This does not match the normal thermistor behaviour so we need to set the following defines */ #if (THERMISTORHEATER_0 == 20) # define HEATER_0_RAW_HI_TEMP 16383 # define HEATER_0_RAW_LO_TEMP 0 #endif -#if (THERMISTORHEATER_1 == 20) -# define HEATER_1_RAW_HI_TEMP 16383 -# define HEATER_1_RAW_LO_TEMP 0 -#endif -#if (THERMISTORHEATER_2 == 20) -# define HEATER_2_RAW_HI_TEMP 16383 -# define HEATER_2_RAW_LO_TEMP 0 -#endif #if (THERMISTORBED == 20) # define HEATER_BED_RAW_HI_TEMP 16383 # define HEATER_BED_RAW_LO_TEMP 0 @@ -763,7 +755,7 @@ const short temptable_20[][2] PROGMEM = { }; #endif -#if (THERMISTORHEATER_0 == 51) || (THERMISTORHEATER_1 == 51) || (THERMISTORHEATER_2 == 51) || (THERMISTORBED == 51) +#if (THERMISTORHEATER_0 == 51) || (THERMISTORBED == 51) // 100k EPCOS (WITH 1kohm RESISTOR FOR PULLUP, R9 ON SANGUINOLOLU! NOT FOR 4.7kohm PULLUP! THIS IS NOT NORMAL!) // Verified by linagee. // Calculated using 1kohm pullup, voltage divider math, and manufacturer provided temp/resistance @@ -825,7 +817,7 @@ const short temptable_51[][2] PROGMEM = { }; #endif -#if (THERMISTORHEATER_0 == 52) || (THERMISTORHEATER_1 == 52) || (THERMISTORHEATER_2 == 52) || (THERMISTORBED == 52) +#if (THERMISTORHEATER_0 == 52) || (THERMISTORBED == 52) // 200k ATC Semitec 204GT-2 (WITH 1kohm RESISTOR FOR PULLUP, R9 ON SANGUINOLOLU! NOT FOR 4.7kohm PULLUP! THIS IS NOT NORMAL!) // Verified by linagee. Source: http://shop.arcol.hu/static/datasheets/thermistors.pdf // Calculated using 1kohm pullup, voltage divider math, and manufacturer provided temp/resistance @@ -866,7 +858,7 @@ const short temptable_52[][2] PROGMEM = { }; #endif -#if (THERMISTORHEATER_0 == 55) || (THERMISTORHEATER_1 == 55) || (THERMISTORHEATER_2 == 55) || (THERMISTORBED == 55) +#if (THERMISTORHEATER_0 == 55) || (THERMISTORBED == 55) // 100k ATC Semitec 104GT-2 (Used on ParCan) (WITH 1kohm RESISTOR FOR PULLUP, R9 ON SANGUINOLOLU! NOT FOR 4.7kohm PULLUP! THIS IS NOT NORMAL!) // Verified by linagee. Source: http://shop.arcol.hu/static/datasheets/thermistors.pdf // Calculated using 1kohm pullup, voltage divider math, and manufacturer provided temp/resistance @@ -907,7 +899,7 @@ const short temptable_55[][2] PROGMEM = { }; #endif -#if (THERMISTORHEATER_0 == 60) || (THERMISTORHEATER_1 == 60) || (THERMISTORHEATER_2 == 60) || (THERMISTORBED == 60) // Maker's Tool Works Kapton Bed Thermister +#if (THERMISTORHEATER_0 == 60) || (THERMISTORBED == 60) // Maker's Tool Works Kapton Bed Thermister // ./createTemperatureLookup.py --r0=100000 --t0=25 --r1=0 --r2=4700 --beta=3950 // r0: 100000 // t0: 25 @@ -1040,7 +1032,7 @@ const short temptable_12[][2] PROGMEM = { #define PtAdVal(T,R0,Rup) (short)(1024/(Rup/PtRt(T,R0)+1)) #define PtLine(T,R0,Rup) { PtAdVal(T,R0,Rup)*OVERSAMPLENR, T }, -#if (THERMISTORHEATER_0 == 110) || (THERMISTORHEATER_1 == 110) || (THERMISTORHEATER_2 == 110) || (THERMISTORBED == 110) // Pt100 with 1k0 pullup +#if (THERMISTORHEATER_0 == 110) || (THERMISTORBED == 110) // Pt100 with 1k0 pullup const short temptable_110[][2] PROGMEM = { // only few values are needed as the curve is very flat PtLine(0,100,1000) @@ -1052,7 +1044,7 @@ const short temptable_110[][2] PROGMEM = { PtLine(300,100,1000) }; #endif -#if (THERMISTORHEATER_0 == 147) || (THERMISTORHEATER_1 == 147) || (THERMISTORHEATER_2 == 147) || (THERMISTORBED == 147) // Pt100 with 4k7 pullup +#if (THERMISTORHEATER_0 == 147) || (THERMISTORBED == 147) // Pt100 with 4k7 pullup const short temptable_147[][2] PROGMEM = { // only few values are needed as the curve is very flat PtLine(0,100,4700) @@ -1065,7 +1057,7 @@ const short temptable_147[][2] PROGMEM = { }; #endif // E3D Pt100 with 4k7 MiniRambo pullup, no Amp on the MiniRambo v1.3a -#if (THERMISTORHEATER_0 == 148) || (THERMISTORHEATER_1 == 148) || (THERMISTORHEATER_2 == 148) || (THERMISTORBED == 148) +#if (THERMISTORHEATER_0 == 148) || (THERMISTORBED == 148) const short temptable_148[][2] PROGMEM = { // These values have been calculated and tested over many days. See https://docs.google.com/spreadsheets/d/1MJXa6feEe0mGVCT2TrBwLxVOMoLDkJlvfQ4JXhAdV_E // Values that are missing from the 5C gap are missing due to resolution limits. @@ -1127,7 +1119,7 @@ const short temptable_148[][2] PROGMEM = { {49.00000 * OVERSAMPLENR,405}, }; #endif -#if (THERMISTORHEATER_0 == 247) || (THERMISTORHEATER_1 == 247) || (THERMISTORHEATER_2 == 247) || (THERMISTORBED == 247) // Pt100 with 4k7 MiniRambo pullup & PT100 Amplifier +#if (THERMISTORHEATER_0 == 247) || (THERMISTORBED == 247) // Pt100 with 4k7 MiniRambo pullup & PT100 Amplifier const short temptable_247[][2] PROGMEM = { // Calculated from Bob-the-Kuhn's PT100 calculator listed in https://github.com/MarlinFirmware/Marlin/issues/5543 // and the table provided by E3D at http://wiki.e3d-online.com/wiki/E3D_PT100_Amplifier_Documentation#Output_Characteristics. @@ -1182,7 +1174,7 @@ const short temptable_247[][2] PROGMEM = { {960 * OVERSAMPLENR, 1100}, }; #endif -#if (THERMISTORHEATER_0 == 1010) || (THERMISTORHEATER_1 == 1010) || (THERMISTORHEATER_2 == 1010) || (THERMISTORBED == 1010) // Pt1000 with 1k0 pullup +#if (THERMISTORHEATER_0 == 1010) || (THERMISTORBED == 1010) // Pt1000 with 1k0 pullup const short temptable_1010[][2] PROGMEM = { PtLine(0,1000,1000) PtLine(25,1000,1000) @@ -1199,7 +1191,7 @@ const short temptable_1010[][2] PROGMEM = { PtLine(300,1000,1000) }; #endif -#if (THERMISTORHEATER_0 == 1047) || (THERMISTORHEATER_1 == 1047) || (THERMISTORHEATER_2 == 1047) || (THERMISTORBED == 1047) // Pt1000 with 4k7 pullup +#if (THERMISTORHEATER_0 == 1047) || (THERMISTORBED == 1047) // Pt1000 with 4k7 pullup const short temptable_1047[][2] PROGMEM = { // only few values are needed as the curve is very flat PtLine(0,1000,4700) @@ -1315,52 +1307,6 @@ const short temptable_2000[][2] PROGMEM = { # endif #endif -#ifdef THERMISTORHEATER_1 -# define HEATER_1_TEMPTABLE TT_NAME(THERMISTORHEATER_1) -# define HEATER_1_TEMPTABLE_LEN (sizeof(HEATER_1_TEMPTABLE)/sizeof(*HEATER_1_TEMPTABLE)) -#else -# ifdef HEATER_1_USES_THERMISTOR -# error No heater 1 thermistor table specified -# else // HEATER_1_USES_THERMISTOR -# define HEATER_1_TEMPTABLE NULL -# define HEATER_1_TEMPTABLE_LEN 0 -# endif // HEATER_1_USES_THERMISTOR -#endif - -//Set the high and low raw values for the heater, this indicates which raw value is a high or low temperature -#ifndef HEATER_1_RAW_HI_TEMP -# ifdef HEATER_1_USES_THERMISTOR //In case of a thermistor the highest temperature results in the lowest ADC value -# define HEATER_1_RAW_HI_TEMP 0 -# define HEATER_1_RAW_LO_TEMP 16383 -# else //In case of an thermocouple the highest temperature results in the highest ADC value -# define HEATER_1_RAW_HI_TEMP 16383 -# define HEATER_1_RAW_LO_TEMP 0 -# endif -#endif - -#ifdef THERMISTORHEATER_2 -# define HEATER_2_TEMPTABLE TT_NAME(THERMISTORHEATER_2) -# define HEATER_2_TEMPTABLE_LEN (sizeof(HEATER_2_TEMPTABLE)/sizeof(*HEATER_2_TEMPTABLE)) -#else -# ifdef HEATER_2_USES_THERMISTOR -# error No heater 2 thermistor table specified -# else // HEATER_2_USES_THERMISTOR -# define HEATER_2_TEMPTABLE NULL -# define HEATER_2_TEMPTABLE_LEN 0 -# endif // HEATER_2_USES_THERMISTOR -#endif - -//Set the high and low raw values for the heater, this indicates which raw value is a high or low temperature -#ifndef HEATER_2_RAW_HI_TEMP -# ifdef HEATER_2_USES_THERMISTOR //In case of a thermistor the highest temperature results in the lowest ADC value -# define HEATER_2_RAW_HI_TEMP 0 -# define HEATER_2_RAW_LO_TEMP 16383 -# else //In case of an thermocouple the highest temperature results in the highest ADC value -# define HEATER_2_RAW_HI_TEMP 16383 -# define HEATER_2_RAW_LO_TEMP 0 -# endif -#endif - #ifdef THERMISTORBED # define BEDTEMPTABLE TT_NAME(THERMISTORBED) # define BEDTEMPTABLE_LEN (sizeof(BEDTEMPTABLE)/sizeof(*BEDTEMPTABLE)) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 7fbb8f60dbfb..a2bfd7bd6f0f 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3188,8 +3188,6 @@ void lcd_temp_cal_show_result(bool result) { disable_y(); disable_z(); disable_e0(); - disable_e1(); - disable_e2(); setTargetBed(0); //set bed target temperature back to 0 // Store boolean result @@ -4940,8 +4938,6 @@ void unload_filament(float unloadLength) //disable extruder steppers so filament can be removed disable_e0(); - disable_e1(); - disable_e2(); _delay(100); Sound_MakeSound(e_SOUND_TYPE_StandardPrompt); @@ -5574,12 +5570,6 @@ static void lcd_control_temperature_menu() #if TEMP_SENSOR_0 != 0 MENU_ITEM_EDIT_int3_P(_T(MSG_NOZZLE), &target_temperature[0], 0, HEATER_0_MAXTEMP - 10); #endif -#if TEMP_SENSOR_1 != 0 - MENU_ITEM_EDIT_int3_P(_n("Nozzle2"), &target_temperature[1], 0, HEATER_1_MAXTEMP - 10); -#endif -#if TEMP_SENSOR_2 != 0 - MENU_ITEM_EDIT_int3_P(_n("Nozzle3"), &target_temperature[2], 0, HEATER_2_MAXTEMP - 10); -#endif #if TEMP_SENSOR_BED != 0 MENU_ITEM_EDIT_int3_P(_T(MSG_BED), &target_temperature_bed, 0, BED_MAXTEMP - 3); #endif diff --git a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h index f1fd2f730972..d227f54af618 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h @@ -50,8 +50,6 @@ #define INVERT_Y_DIR 0 // for Mendel set to 1, for Orca set to 0 #define INVERT_Z_DIR 0 // for Mendel set to 0, for Orca set to 1 #define INVERT_E0_DIR 1 // for direct drive extruder v9 set to 1, for geared extruder set to 0 -#define INVERT_E1_DIR 1 // for direct drive extruder v9 set to 1, for geared extruder set to 0 -#define INVERT_E2_DIR 1 // for direct drive extruder v9 set to 1, for geared extruder set to 0 // Home position #define MANUAL_X_HOME_POS 0 @@ -163,8 +161,6 @@ // Mintemps #define HEATER_0_MINTEMP 30 -#define HEATER_1_MINTEMP 5 -#define HEATER_2_MINTEMP 5 #define HEATER_MINTEMP_DELAY 15000 // [ms] ! if changed, check maximal allowed value @ ShortTimer #if HEATER_MINTEMP_DELAY>USHRT_MAX #error "Check maximal allowed value @ ShortTimer (see HEATER_MINTEMP_DELAY definition)" @@ -184,8 +180,6 @@ #else #define HEATER_0_MAXTEMP 305 #endif -#define HEATER_1_MAXTEMP 305 -#define HEATER_2_MAXTEMP 305 #define BED_MAXTEMP 125 #if defined(E3D_PT100_EXTRUDER_WITH_AMP) || defined(E3D_PT100_EXTRUDER_NO_AMP) @@ -208,8 +202,6 @@ // Extruder cooling fans #define EXTRUDER_0_AUTO_FAN_PIN 8 -#define EXTRUDER_1_AUTO_FAN_PIN -1 -#define EXTRUDER_2_AUTO_FAN_PIN -1 #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed @@ -437,8 +429,6 @@ #else #define TEMP_SENSOR_0 5 #endif -#define TEMP_SENSOR_1 0 -#define TEMP_SENSOR_2 0 #if defined(E3D_PT100_BED_WITH_AMP) #define TEMP_SENSOR_BED 247 #elif defined(E3D_PT100_BED_NO_AMP) diff --git a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h index 3cd87e2afdd8..33217ad6535a 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h @@ -50,8 +50,6 @@ #define INVERT_Y_DIR 0 // for Mendel set to 1, for Orca set to 0 #define INVERT_Z_DIR 0 // for Mendel set to 0, for Orca set to 1 #define INVERT_E0_DIR 1 // for direct drive extruder v9 set to 1, for geared extruder set to 0 -#define INVERT_E1_DIR 1 // for direct drive extruder v9 set to 1, for geared extruder set to 0 -#define INVERT_E2_DIR 1 // for direct drive extruder v9 set to 1, for geared extruder set to 0 // Home position #define MANUAL_X_HOME_POS 0 @@ -164,8 +162,6 @@ // Mintemps #define HEATER_0_MINTEMP 30 -#define HEATER_1_MINTEMP 5 -#define HEATER_2_MINTEMP 5 #define HEATER_MINTEMP_DELAY 15000 // [ms] ! if changed, check maximal allowed value @ ShortTimer #if HEATER_MINTEMP_DELAY>USHRT_MAX #error "Check maximal allowed value @ ShortTimer (see HEATER_MINTEMP_DELAY definition)" @@ -185,8 +181,6 @@ #else #define HEATER_0_MAXTEMP 305 #endif -#define HEATER_1_MAXTEMP 305 -#define HEATER_2_MAXTEMP 305 #define BED_MAXTEMP 125 #if defined(E3D_PT100_EXTRUDER_WITH_AMP) || defined(E3D_PT100_EXTRUDER_NO_AMP) @@ -209,8 +203,6 @@ // Extruder cooling fans #define EXTRUDER_0_AUTO_FAN_PIN 8 -#define EXTRUDER_1_AUTO_FAN_PIN -1 -#define EXTRUDER_2_AUTO_FAN_PIN -1 #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed @@ -438,8 +430,6 @@ #else #define TEMP_SENSOR_0 5 #endif -#define TEMP_SENSOR_1 0 -#define TEMP_SENSOR_2 0 #if defined(E3D_PT100_BED_WITH_AMP) #define TEMP_SENSOR_BED 247 #elif defined(E3D_PT100_BED_NO_AMP) diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h index 480f7b9b5f8f..6b0d3e8a7049 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h @@ -50,8 +50,6 @@ #define INVERT_Y_DIR 0 // for Mendel set to 1, for Orca set to 0 #define INVERT_Z_DIR 0 // for Mendel set to 0, for Orca set to 1 #define INVERT_E0_DIR 1 // for direct drive extruder v9 set to 1, for geared extruder set to 0 -#define INVERT_E1_DIR 1 // for direct drive extruder v9 set to 1, for geared extruder set to 0 -#define INVERT_E2_DIR 1 // for direct drive extruder v9 set to 1, for geared extruder set to 0 // Home position #define MANUAL_X_HOME_POS 0 @@ -163,8 +161,6 @@ // Mintemps #define HEATER_0_MINTEMP 30 -#define HEATER_1_MINTEMP 5 -#define HEATER_2_MINTEMP 5 #define HEATER_MINTEMP_DELAY 15000 // [ms] ! if changed, check maximal allowed value @ ShortTimer #if HEATER_MINTEMP_DELAY>USHRT_MAX #error "Check maximal allowed value @ ShortTimer (see HEATER_MINTEMP_DELAY definition)" @@ -184,8 +180,6 @@ #else #define HEATER_0_MAXTEMP 305 #endif -#define HEATER_1_MAXTEMP 305 -#define HEATER_2_MAXTEMP 305 #define BED_MAXTEMP 125 #if defined(E3D_PT100_EXTRUDER_WITH_AMP) || defined(E3D_PT100_EXTRUDER_NO_AMP) @@ -208,8 +202,6 @@ // Extruder cooling fans #define EXTRUDER_0_AUTO_FAN_PIN 8 -#define EXTRUDER_1_AUTO_FAN_PIN -1 -#define EXTRUDER_2_AUTO_FAN_PIN -1 #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed @@ -437,8 +429,6 @@ #else #define TEMP_SENSOR_0 5 #endif -#define TEMP_SENSOR_1 0 -#define TEMP_SENSOR_2 0 #if defined(E3D_PT100_BED_WITH_AMP) #define TEMP_SENSOR_BED 247 #elif defined(E3D_PT100_BED_NO_AMP) diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h index 387a03507129..692616786d21 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h @@ -50,8 +50,6 @@ #define INVERT_Y_DIR 0 // for Mendel set to 1, for Orca set to 0 #define INVERT_Z_DIR 0 // for Mendel set to 0, for Orca set to 1 #define INVERT_E0_DIR 1 // for direct drive extruder v9 set to 1, for geared extruder set to 0 -#define INVERT_E1_DIR 1 // for direct drive extruder v9 set to 1, for geared extruder set to 0 -#define INVERT_E2_DIR 1 // for direct drive extruder v9 set to 1, for geared extruder set to 0 // Home position #define MANUAL_X_HOME_POS 0 @@ -164,8 +162,6 @@ // Mintemps #define HEATER_0_MINTEMP 30 -#define HEATER_1_MINTEMP 5 -#define HEATER_2_MINTEMP 5 #define HEATER_MINTEMP_DELAY 15000 // [ms] ! if changed, check maximal allowed value @ ShortTimer #if HEATER_MINTEMP_DELAY>USHRT_MAX #error "Check maximal allowed value @ ShortTimer (see HEATER_MINTEMP_DELAY definition)" @@ -185,8 +181,6 @@ #else #define HEATER_0_MAXTEMP 305 #endif -#define HEATER_1_MAXTEMP 305 -#define HEATER_2_MAXTEMP 305 #define BED_MAXTEMP 125 #if defined(E3D_PT100_EXTRUDER_WITH_AMP) || defined(E3D_PT100_EXTRUDER_NO_AMP) @@ -209,8 +203,6 @@ // Extruder cooling fans #define EXTRUDER_0_AUTO_FAN_PIN 8 -#define EXTRUDER_1_AUTO_FAN_PIN -1 -#define EXTRUDER_2_AUTO_FAN_PIN -1 #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed @@ -438,8 +430,6 @@ #else #define TEMP_SENSOR_0 5 #endif -#define TEMP_SENSOR_1 0 -#define TEMP_SENSOR_2 0 #if defined(E3D_PT100_BED_WITH_AMP) #define TEMP_SENSOR_BED 247 #elif defined(E3D_PT100_BED_NO_AMP) diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index 070d63ef105f..dffc509d374a 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -52,8 +52,6 @@ #define INVERT_Y_DIR 0 // for Mendel set to 1, for Orca set to 0 #define INVERT_Z_DIR 1 // for Mendel set to 0, for Orca set to 1 #define INVERT_E0_DIR 0 // for direct drive extruder v9 set to 1, for geared extruder set to 0 -#define INVERT_E1_DIR 0 // for direct drive extruder v9 set to 1, for geared extruder set to 0 -#define INVERT_E2_DIR 0 // for direct drive extruder v9 set to 1, for geared extruder set to 0 // Home position #define MANUAL_X_HOME_POS 0 @@ -300,8 +298,6 @@ // Mintemps #define HEATER_0_MINTEMP 10 -#define HEATER_1_MINTEMP 5 -#define HEATER_2_MINTEMP 5 #define HEATER_MINTEMP_DELAY 15000 // [ms] ! if changed, check maximal allowed value @ ShortTimer #if HEATER_MINTEMP_DELAY>USHRT_MAX #error "Check maximal allowed value @ ShortTimer (see HEATER_MINTEMP_DELAY definition)" @@ -322,8 +318,6 @@ #else #define HEATER_0_MAXTEMP 305 #endif -#define HEATER_1_MAXTEMP 305 -#define HEATER_2_MAXTEMP 305 #define BED_MAXTEMP 125 #define AMBIENT_MAXTEMP 100 @@ -347,8 +341,6 @@ // Extruder cooling fans #define EXTRUDER_0_AUTO_FAN_PIN 8 -#define EXTRUDER_1_AUTO_FAN_PIN -1 -#define EXTRUDER_2_AUTO_FAN_PIN -1 #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed @@ -588,8 +580,6 @@ #else #define TEMP_SENSOR_0 5 #endif -#define TEMP_SENSOR_1 0 -#define TEMP_SENSOR_2 0 #if defined(E3D_PT100_BED_WITH_AMP) #define TEMP_SENSOR_BED 247 #elif defined(E3D_PT100_BED_NO_AMP) diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index 12d8971a08f1..3a2a1359cb97 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -54,8 +54,6 @@ #define INVERT_Y_DIR 0 // for Mendel set to 1, for Orca set to 0 #define INVERT_Z_DIR 1 // for Mendel set to 0, for Orca set to 1 #define INVERT_E0_DIR 0 // for direct drive extruder v9 set to 1, for geared extruder set to 0 -#define INVERT_E1_DIR 0 // for direct drive extruder v9 set to 1, for geared extruder set to 0 -#define INVERT_E2_DIR 0 // for direct drive extruder v9 set to 1, for geared extruder set to 0 // Home position #define MANUAL_X_HOME_POS 0 @@ -302,8 +300,6 @@ // Mintemps #define HEATER_0_MINTEMP 10 -#define HEATER_1_MINTEMP 5 -#define HEATER_2_MINTEMP 5 #define HEATER_MINTEMP_DELAY 15000 // [ms] ! if changed, check maximal allowed value @ ShortTimer #if HEATER_MINTEMP_DELAY>USHRT_MAX #error "Check maximal allowed value @ ShortTimer (see HEATER_MINTEMP_DELAY definition)" @@ -324,8 +320,6 @@ #else #define HEATER_0_MAXTEMP 305 #endif -#define HEATER_1_MAXTEMP 305 -#define HEATER_2_MAXTEMP 305 #define BED_MAXTEMP 125 #define AMBIENT_MAXTEMP 100 @@ -349,8 +343,6 @@ // Extruder cooling fans #define EXTRUDER_0_AUTO_FAN_PIN 8 -#define EXTRUDER_1_AUTO_FAN_PIN -1 -#define EXTRUDER_2_AUTO_FAN_PIN -1 #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed #define EXTRUDER_ALTFAN_DETECT @@ -592,8 +584,6 @@ #else #define TEMP_SENSOR_0 5 #endif -#define TEMP_SENSOR_1 0 -#define TEMP_SENSOR_2 0 #if defined(E3D_PT100_BED_WITH_AMP) #define TEMP_SENSOR_BED 247 #elif defined(E3D_PT100_BED_NO_AMP) diff --git a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h index 3851e2220a03..31ded6c88b14 100644 --- a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h @@ -46,9 +46,6 @@ AXIS SETTINGS #define INVERT_Y_DIR 0 // for Mendel set to 1, for Orca set to 0 #define INVERT_Z_DIR 0 // for Mendel set to 0, for Orca set to 1 #define INVERT_E0_DIR 1 // for direct drive extruder v9 set to 1, for geared extruder set to 0 -#define INVERT_E1_DIR 1 // for direct drive extruder v9 set to 1, for geared extruder set to 0 -#define INVERT_E2_DIR 1 // for direct drive extruder v9 set to 1, for geared extruder set to 0 - // Home position #define MANUAL_X_HOME_POS 0 @@ -102,8 +99,6 @@ EXTRUDER SETTINGS // Mintemps #define HEATER_0_MINTEMP 30 -#define HEATER_1_MINTEMP 5 -#define HEATER_2_MINTEMP 5 #define HEATER_MINTEMP_DELAY 15000 // [ms] ! if changed, check maximal allowed value @ ShortTimer #if HEATER_MINTEMP_DELAY>USHRT_MAX #error "Check maximal allowed value @ ShortTimer (see HEATER_MINTEMP_DELAY definition)" @@ -120,8 +115,6 @@ EXTRUDER SETTINGS #else #define HEATER_0_MAXTEMP 305 #endif -#define HEATER_1_MAXTEMP 305 -#define HEATER_2_MAXTEMP 305 #define BED_MAXTEMP 150 #if defined(E3D_PT100_EXTRUDER_WITH_AMP) || defined(E3D_PT100_EXTRUDER_NO_AMP) @@ -141,8 +134,6 @@ EXTRUDER SETTINGS // Extruder cooling fans #define EXTRUDER_0_AUTO_FAN_PIN 8 -#define EXTRUDER_1_AUTO_FAN_PIN -1 -#define EXTRUDER_2_AUTO_FAN_PIN -1 #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed @@ -367,8 +358,6 @@ THERMISTORS SETTINGS #else #define TEMP_SENSOR_0 5 #endif -#define TEMP_SENSOR_1 0 -#define TEMP_SENSOR_2 0 #if defined(E3D_PT100_BED_WITH_AMP) #define TEMP_SENSOR_BED 247 #elif defined(E3D_PT100_BED_NO_AMP) diff --git a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h index 9dc2069593d5..9a80867393c3 100644 --- a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h @@ -46,9 +46,6 @@ AXIS SETTINGS #define INVERT_Y_DIR 0 // for Mendel set to 1, for Orca set to 0 #define INVERT_Z_DIR 0 // for Mendel set to 0, for Orca set to 1 #define INVERT_E0_DIR 1 // for direct drive extruder v9 set to 1, for geared extruder set to 0 -#define INVERT_E1_DIR 1 // for direct drive extruder v9 set to 1, for geared extruder set to 0 -#define INVERT_E2_DIR 1 // for direct drive extruder v9 set to 1, for geared extruder set to 0 - // Home position #define MANUAL_X_HOME_POS 0 @@ -101,8 +98,6 @@ EXTRUDER SETTINGS // Mintemps #define HEATER_0_MINTEMP 30 -#define HEATER_1_MINTEMP 5 -#define HEATER_2_MINTEMP 5 #define HEATER_MINTEMP_DELAY 15000 // [ms] ! if changed, check maximal allowed value @ ShortTimer #if HEATER_MINTEMP_DELAY>USHRT_MAX #error "Check maximal allowed value @ ShortTimer (see HEATER_MINTEMP_DELAY definition)" @@ -119,8 +114,6 @@ EXTRUDER SETTINGS #else #define HEATER_0_MAXTEMP 305 #endif -#define HEATER_1_MAXTEMP 305 -#define HEATER_2_MAXTEMP 305 #define BED_MAXTEMP 150 #if defined(E3D_PT100_EXTRUDER_WITH_AMP) || defined(E3D_PT100_EXTRUDER_NO_AMP) @@ -140,8 +133,6 @@ EXTRUDER SETTINGS // Extruder cooling fans #define EXTRUDER_0_AUTO_FAN_PIN 8 -#define EXTRUDER_1_AUTO_FAN_PIN -1 -#define EXTRUDER_2_AUTO_FAN_PIN -1 #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed @@ -366,8 +357,6 @@ THERMISTORS SETTINGS #else #define TEMP_SENSOR_0 5 #endif -#define TEMP_SENSOR_1 0 -#define TEMP_SENSOR_2 0 #if defined(E3D_PT100_BED_WITH_AMP) #define TEMP_SENSOR_BED 247 #elif defined(E3D_PT100_BED_NO_AMP)