From d3869bd8579e7591d06843f37078a684880c1d83 Mon Sep 17 00:00:00 2001 From: MRprusa3d Date: Tue, 28 Aug 2018 16:12:59 +0200 Subject: [PATCH 1/6] Z-endstop @ MK3 add show P.I.N.D.A. state menu item @ CalibrationMenu --- Firmware/ultralcd.cpp | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 3ba483fc..09992050 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3555,6 +3555,27 @@ void lcd_diag_show_end_stops() lcd_return_to_status(); } +#ifdef TMC2130 +static void lcd_show_pinda_state() +{ +lcd_set_cursor(0, 0); +lcd_puts_P((PSTR("P.I.N.D.A. state"))); +lcd_set_cursor(0, 2); +lcd_puts_P(READ(Z_MIN_PIN)?(PSTR("Z1 (LED off)")):(PSTR("Z0 (LED on) "))); // !!! both strings must have same length (due to dynamic refreshing) +} + +static void menu_show_pinda_state() +{ +lcd_timeoutToStatus.stop(); +lcd_show_pinda_state(); +if(LCD_CLICKED) + { + lcd_timeoutToStatus.start(); + menu_back(); + } +} +#endif // defined TMC2130 + void prusa_statistics(int _message, uint8_t _fil_nr) { @@ -4792,7 +4813,9 @@ static void lcd_calibration_menu() MENU_ITEM_SUBMENU_P(_i("Bed level correct"), lcd_adjust_bed);////MSG_BED_CORRECTION_MENU c=0 r=0 MENU_ITEM_SUBMENU_P(_i("PID calibration"), pid_extruder);////MSG_PID_EXTRUDER c=17 r=1 -#ifndef TMC2130 +#ifdef TMC2130 + MENU_ITEM_SUBMENU_P(_i("Show pinda state"), menu_show_pinda_state); +#else MENU_ITEM_SUBMENU_P(_i("Show end stops"), menu_show_end_stops);////MSG_SHOW_END_STOPS c=17 r=1 #endif #ifndef MK1BP From 9fb68fb7248c2106cf4cc49d1d6a41993ddb74d0 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 28 Aug 2018 18:08:21 +0200 Subject: [PATCH 2/6] Remove usage of global variable tmp_extruder in M200. --- Firmware/Marlin_main.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index c31130d6..3491bb04 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -5819,10 +5819,10 @@ Sigma_Exit: case 200: // M200 D set filament diameter and set E axis units to cubic millimeters (use S0 to set back to millimeters). { - tmp_extruder = active_extruder; + uint8_t extruder = active_extruder; if(code_seen('T')) { - tmp_extruder = code_value(); - if(tmp_extruder >= EXTRUDERS) { + extruder = code_value(); + if(extruder >= EXTRUDERS) { SERIAL_ECHO_START; SERIAL_ECHO(_i("M200 Invalid extruder "));////MSG_M200_INVALID_EXTRUDER c=0 r=0 break; @@ -5836,7 +5836,7 @@ Sigma_Exit: // for all extruders volumetric_enabled = false; } else { - filament_size[tmp_extruder] = (float)code_value(); + filament_size[extruder] = (float)code_value(); // make sure all extruders have some sane value for the filament size filament_size[0] = (filament_size[0] == 0.0 ? DEFAULT_NOMINAL_FILAMENT_DIA : filament_size[0]); #if EXTRUDERS > 1 From 55eaa1de830acb9045e7c0692f54fe640d7b1801 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 28 Aug 2018 18:26:10 +0200 Subject: [PATCH 3/6] Fix code indentation. --- Firmware/Marlin_main.cpp | 218 +++++++++++++++++++-------------------- 1 file changed, 109 insertions(+), 109 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 3491bb04..2a956a85 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -6793,132 +6793,132 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) else if(code_seen('T')) { - int index; - st_synchronize(); - for (index = 1; *(strchr_pointer + index) == ' ' || *(strchr_pointer + index) == '\t'; index++); - - if ((*(strchr_pointer + index) < '0' || *(strchr_pointer + index) > '9') && *(strchr_pointer + index) != '?') { - SERIAL_ECHOLNPGM("Invalid T code."); - } - else { - if (*(strchr_pointer + index) == '?') { - tmp_extruder = choose_extruder_menu(); - } - else { - tmp_extruder = code_value(); - } - snmm_filaments_used |= (1 << tmp_extruder); //for stop print + int index; + st_synchronize(); + for (index = 1; *(strchr_pointer + index) == ' ' || *(strchr_pointer + index) == '\t'; index++); -if (mmu_enabled) -{ - //printf_P(PSTR("T code: %d \n"), tmp_extruder); - //mmu_printf_P(PSTR("T%d\n"), tmp_extruder); - mmu_command(MMU_CMD_T0 + tmp_extruder); + if ((*(strchr_pointer + index) < '0' || *(strchr_pointer + index) > '9') && *(strchr_pointer + index) != '?') { + SERIAL_ECHOLNPGM("Invalid T code."); + } + else { + if (*(strchr_pointer + index) == '?') { + tmp_extruder = choose_extruder_menu(); + } + else { + tmp_extruder = code_value(); + } + snmm_filaments_used |= (1 << tmp_extruder); //for stop print - manage_response(true, true); - mmu_command(MMU_CMD_C0); - mmu_extruder = tmp_extruder; //filament change is finished + if (mmu_enabled) + { + //printf_P(PSTR("T code: %d \n"), tmp_extruder); + //mmu_printf_P(PSTR("T%d\n"), tmp_extruder); + mmu_command(MMU_CMD_T0 + tmp_extruder); - if (*(strchr_pointer + index) == '?')// for single material usage with mmu - mmu_load_to_nozzle(); -} -else -{ + manage_response(true, true); + mmu_command(MMU_CMD_C0); + mmu_extruder = tmp_extruder; //filament change is finished + + if (*(strchr_pointer + index) == '?')// for single material usage with mmu + mmu_load_to_nozzle(); + } + else + { #ifdef SNMM - #ifdef LIN_ADVANCE - if (mmu_extruder != tmp_extruder) - clear_current_adv_vars(); //Check if the selected extruder is not the active one and reset LIN_ADVANCE variables if so. - #endif - - mmu_extruder = tmp_extruder; +#ifdef LIN_ADVANCE + if (mmu_extruder != tmp_extruder) + clear_current_adv_vars(); //Check if the selected extruder is not the active one and reset LIN_ADVANCE variables if so. +#endif - - delay(100); + mmu_extruder = tmp_extruder; - disable_e0(); - disable_e1(); - disable_e2(); - pinMode(E_MUX0_PIN, OUTPUT); - pinMode(E_MUX1_PIN, OUTPUT); + delay(100); - delay(100); - SERIAL_ECHO_START; - SERIAL_ECHO("T:"); - SERIAL_ECHOLN((int)tmp_extruder); - switch (tmp_extruder) { - case 1: - WRITE(E_MUX0_PIN, HIGH); - WRITE(E_MUX1_PIN, LOW); + disable_e0(); + disable_e1(); + disable_e2(); - break; - case 2: - WRITE(E_MUX0_PIN, LOW); - WRITE(E_MUX1_PIN, HIGH); + pinMode(E_MUX0_PIN, OUTPUT); + pinMode(E_MUX1_PIN, OUTPUT); - break; - case 3: - WRITE(E_MUX0_PIN, HIGH); - WRITE(E_MUX1_PIN, HIGH); + delay(100); + SERIAL_ECHO_START; + SERIAL_ECHO("T:"); + SERIAL_ECHOLN((int)tmp_extruder); + switch (tmp_extruder) { + case 1: + WRITE(E_MUX0_PIN, HIGH); + WRITE(E_MUX1_PIN, LOW); - break; - default: - WRITE(E_MUX0_PIN, LOW); - WRITE(E_MUX1_PIN, LOW); + break; + case 2: + WRITE(E_MUX0_PIN, LOW); + WRITE(E_MUX1_PIN, HIGH); - break; - } - delay(100); + break; + case 3: + WRITE(E_MUX0_PIN, HIGH); + WRITE(E_MUX1_PIN, HIGH); + + break; + default: + WRITE(E_MUX0_PIN, LOW); + WRITE(E_MUX1_PIN, LOW); + + break; + } + delay(100); #else //SNMM - if (tmp_extruder >= EXTRUDERS) { - SERIAL_ECHO_START; - SERIAL_ECHOPGM("T"); - SERIAL_PROTOCOLLN((int)tmp_extruder); - SERIAL_ECHOLNRPGM(_n("Invalid extruder"));////MSG_INVALID_EXTRUDER c=0 r=0 - } - else { - #if EXTRUDERS > 1 - boolean make_move = false; - #endif - if (code_seen('F')) { - #if EXTRUDERS > 1 - make_move = true; - #endif - next_feedrate = code_value(); - if (next_feedrate > 0.0) { - feedrate = next_feedrate; - } - } - #if EXTRUDERS > 1 - if (tmp_extruder != active_extruder) { - // Save current position to return to after applying extruder offset - memcpy(destination, current_position, sizeof(destination)); - // Offset extruder (only by XY) - int i; - for (i = 0; i < 2; i++) { - current_position[i] = current_position[i] - - extruder_offset[i][active_extruder] + - extruder_offset[i][tmp_extruder]; - } - // Set the new active extruder and position - active_extruder = tmp_extruder; - plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]); - // Move to the old position if 'F' was in the parameters - if (make_move && Stopped == false) { - prepare_move(); - } - } - #endif - SERIAL_ECHO_START; - SERIAL_ECHORPGM(_n("Active Extruder: "));////MSG_ACTIVE_EXTRUDER c=0 r=0 - SERIAL_PROTOCOLLN((int)active_extruder); - } + if (tmp_extruder >= EXTRUDERS) { + SERIAL_ECHO_START; + SERIAL_ECHOPGM("T"); + SERIAL_PROTOCOLLN((int)tmp_extruder); + SERIAL_ECHOLNRPGM(_n("Invalid extruder"));////MSG_INVALID_EXTRUDER c=0 r=0 + } + else { +#if EXTRUDERS > 1 + boolean make_move = false; +#endif + if (code_seen('F')) { +#if EXTRUDERS > 1 + make_move = true; +#endif + next_feedrate = code_value(); + if (next_feedrate > 0.0) { + feedrate = next_feedrate; + } + } +#if EXTRUDERS > 1 + if (tmp_extruder != active_extruder) { + // Save current position to return to after applying extruder offset + memcpy(destination, current_position, sizeof(destination)); + // Offset extruder (only by XY) + int i; + for (i = 0; i < 2; i++) { + current_position[i] = current_position[i] - + extruder_offset[i][active_extruder] + + extruder_offset[i][tmp_extruder]; + } + // Set the new active extruder and position + active_extruder = tmp_extruder; + plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]); + // Move to the old position if 'F' was in the parameters + if (make_move && Stopped == false) { + prepare_move(); + } + } +#endif + SERIAL_ECHO_START; + SERIAL_ECHORPGM(_n("Active Extruder: "));////MSG_ACTIVE_EXTRUDER c=0 r=0 + SERIAL_PROTOCOLLN((int)active_extruder); + } #endif //SNMM -} - } + } + } } // end if(code_seen('T')) (end of T codes) else if (code_seen('D')) // D codes (debug) From 8aeb7e04f1c48eeed546487c7b3606567c83bce5 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 28 Aug 2018 18:52:16 +0200 Subject: [PATCH 4/6] Fix bound check for T0 .. T4 command. Document mmu_load_to_nozzle(). --- Firmware/Marlin_main.cpp | 6 +++--- Firmware/mmu.cpp | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 2a956a85..0106718d 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -6797,7 +6797,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) st_synchronize(); for (index = 1; *(strchr_pointer + index) == ' ' || *(strchr_pointer + index) == '\t'; index++); - if ((*(strchr_pointer + index) < '0' || *(strchr_pointer + index) > '9') && *(strchr_pointer + index) != '?') { + if ((*(strchr_pointer + index) < '0' || *(strchr_pointer + index) > '4') && *(strchr_pointer + index) != '?') { SERIAL_ECHOLNPGM("Invalid T code."); } else { @@ -6811,8 +6811,6 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) if (mmu_enabled) { - //printf_P(PSTR("T code: %d \n"), tmp_extruder); - //mmu_printf_P(PSTR("T%d\n"), tmp_extruder); mmu_command(MMU_CMD_T0 + tmp_extruder); manage_response(true, true); @@ -6820,7 +6818,9 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) mmu_extruder = tmp_extruder; //filament change is finished if (*(strchr_pointer + index) == '?')// for single material usage with mmu + { mmu_load_to_nozzle(); + } } else { diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index 40bf5ce9..07361848 100644 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -380,6 +380,12 @@ void manage_response(bool move_axes, bool turn_off_nozzle) if (lcd_update_was_enabled) lcd_update_enable(true); } +//! @brief load filament to nozzle of multimaterial printer +//! +//! This function is used only only after T? (user select filament) and M600 (change filament). +//! It is not used after T0 .. T4 command (select filament), in such case, gcode is responsible for loading +//! filament to nozzle. +//! void mmu_load_to_nozzle() { st_synchronize(); From 0695f3f345540f39ee70ae29ff3a0348a4140062 Mon Sep 17 00:00:00 2001 From: MRprusa3d Date: Tue, 28 Aug 2018 19:58:03 +0200 Subject: [PATCH 5/6] Z-move correction Z-move inhibition after FactoryReset --- Firmware/Marlin_main.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index c31130d6..a6f724c5 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1355,6 +1355,7 @@ void setup() plan_init(); // Initialize planner; factory_reset(); + lcd_encoder_diff=0; #ifdef TMC2130 uint8_t silentMode = eeprom_read_byte((uint8_t*)EEPROM_SILENT); From 2cd86913764587838e87bbc68f82b1034266582f Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 28 Aug 2018 20:26:33 +0200 Subject: [PATCH 6/6] Do not use global variable tmp_extruder when setting temperature. --- Firmware/Marlin.h | 3 +- Firmware/Marlin_main.cpp | 96 ++++++++++++++++++++++++---------------- 2 files changed, 59 insertions(+), 40 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 1f51b665..0681aae2 100644 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -394,7 +394,6 @@ uint8_t check_printer_version(); float temp_compensation_pinda_thermistor_offset(float temperature_pinda); #endif //PINDA_THERMISTOR -void wait_for_heater(long codenum); void serialecho_temperatures(); bool check_commands(); @@ -471,4 +470,4 @@ void proc_commands(); void M600_load_filament(); void M600_load_filament_movements(); void M600_wait_for_user(); -void M600_check_state(); \ No newline at end of file +void M600_check_state(); diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 0106718d..b2bee4bc 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -543,8 +543,9 @@ static bool saved_extruder_relative_mode = false; //=========================================================================== static void get_arc_coordinates(); -static bool setTargetedHotend(int code); +static bool setTargetedHotend(int code, uint8_t &extruder); static void print_time_remaining_init(); +static void wait_for_heater(long codenum, uint8_t extruder); uint16_t gcode_in_progress = 0; uint16_t mcode_in_progress = 0; @@ -5353,15 +5354,18 @@ Sigma_Exit: break; case 104: // M104 - if(setTargetedHotend(104)){ - break; - } - if (code_seen('S')) - { - setTargetHotendSafe(code_value(), tmp_extruder); - } - setWatch(); - break; + { + uint8_t extruder; + if(setTargetedHotend(104,extruder)){ + break; + } + if (code_seen('S')) + { + setTargetHotendSafe(code_value(), extruder); + } + setWatch(); + break; + } case 112: // M112 -Emergency Stop kill(_n(""), 3); break; @@ -5369,14 +5373,16 @@ Sigma_Exit: if (code_seen('S')) setTargetBed(code_value()); break; case 105 : // M105 - if(setTargetedHotend(105)){ + { + uint8_t extruder; + if(setTargetedHotend(105, extruder)){ break; } #if defined(TEMP_0_PIN) && TEMP_0_PIN > -1 SERIAL_PROTOCOLPGM("ok T:"); - SERIAL_PROTOCOL_F(degHotend(tmp_extruder),1); + SERIAL_PROTOCOL_F(degHotend(extruder),1); SERIAL_PROTOCOLPGM(" /"); - SERIAL_PROTOCOL_F(degTargetHotend(tmp_extruder),1); + SERIAL_PROTOCOL_F(degTargetHotend(extruder),1); #if defined(TEMP_BED_PIN) && TEMP_BED_PIN > -1 SERIAL_PROTOCOLPGM(" B:"); SERIAL_PROTOCOL_F(degBed(),1); @@ -5401,7 +5407,7 @@ Sigma_Exit: SERIAL_PROTOCOL((EXTRUDER_WATTS * getHeaterPower(tmp_extruder))/127); SERIAL_PROTOCOLPGM("W"); #else - SERIAL_PROTOCOL(getHeaterPower(tmp_extruder)); + SERIAL_PROTOCOL(getHeaterPower(extruder)); #endif SERIAL_PROTOCOLPGM(" B@:"); @@ -5459,9 +5465,11 @@ Sigma_Exit: KEEPALIVE_STATE(NOT_BUSY); return; break; + } case 109: {// M109 - Wait for extruder heater to reach target. - if(setTargetedHotend(109)){ + uint8_t extruder; + if(setTargetedHotend(109, extruder)){ break; } LCD_MESSAGERPGM(_T(MSG_HEATING)); @@ -5472,10 +5480,10 @@ Sigma_Exit: autotemp_enabled=false; #endif if (code_seen('S')) { - setTargetHotendSafe(code_value(), tmp_extruder); + setTargetHotendSafe(code_value(), extruder); CooldownNoWait = true; } else if (code_seen('R')) { - setTargetHotendSafe(code_value(), tmp_extruder); + setTargetHotendSafe(code_value(), extruder); CooldownNoWait = false; } #ifdef AUTOTEMP @@ -5492,13 +5500,13 @@ Sigma_Exit: codenum = millis(); /* See if we are heating up or cooling down */ - target_direction = isHeatingHotend(tmp_extruder); // true if heating, false if cooling + target_direction = isHeatingHotend(extruder); // true if heating, false if cooling KEEPALIVE_STATE(NOT_BUSY); cancel_heatup = false; - wait_for_heater(codenum); //loops until target temperature is reached + wait_for_heater(codenum, extruder); //loops until target temperature is reached LCD_MESSAGERPGM(_T(MSG_HEATING_COMPLETE)); KEEPALIVE_STATE(IN_HANDLER); @@ -6024,25 +6032,26 @@ Sigma_Exit: #if EXTRUDERS > 1 case 218: // M218 - set hotend offset (in mm), T X Y { - if(setTargetedHotend(218)){ + uint8_t extruder; + if(setTargetedHotend(218, extruder)){ break; } if(code_seen('X')) { - extruder_offset[X_AXIS][tmp_extruder] = code_value(); + extruder_offset[X_AXIS][extruder] = code_value(); } if(code_seen('Y')) { - extruder_offset[Y_AXIS][tmp_extruder] = code_value(); + extruder_offset[Y_AXIS][extruder] = code_value(); } SERIAL_ECHO_START; SERIAL_ECHORPGM(MSG_HOTEND_OFFSET); - for(tmp_extruder = 0; tmp_extruder < EXTRUDERS; tmp_extruder++) + for(extruder = 0; extruder < EXTRUDERS; extruder++) { SERIAL_ECHO(" "); - SERIAL_ECHO(extruder_offset[X_AXIS][tmp_extruder]); + SERIAL_ECHO(extruder_offset[X_AXIS][extruder]); SERIAL_ECHO(","); - SERIAL_ECHO(extruder_offset[Y_AXIS][tmp_extruder]); + SERIAL_ECHO(extruder_offset[Y_AXIS][extruder]); } SERIAL_ECHOLN(""); }break; @@ -6062,10 +6071,11 @@ Sigma_Exit: int tmp_code = code_value(); if (code_seen('T')) { - if(setTargetedHotend(221)){ + uint8_t extruder; + if(setTargetedHotend(221, extruder)){ break; } - extruder_multiply[tmp_extruder] = tmp_code; + extruder_multiply[extruder] = tmp_code; } else { @@ -7571,11 +7581,21 @@ void setPwmFrequency(uint8_t pin, int val) } #endif //FAST_PWM_FAN -bool setTargetedHotend(int code){ - tmp_extruder = active_extruder; +//! @brief Get and validate extruder number +//! +//! If it is not specified, active_extruder is returned in parameter extruder. +//! @param [in] code M code number +//! @param [out] extruder +//! @return error +//! @retval true Invalid extruder specified in T code +//! @retval false Valid extruder specified in T code, or not specifiead + +bool setTargetedHotend(int code, uint8_t &extruder) +{ + extruder = active_extruder; if(code_seen('T')) { - tmp_extruder = code_value(); - if(tmp_extruder >= EXTRUDERS) { + extruder = code_value(); + if(extruder >= EXTRUDERS) { SERIAL_ECHO_START; switch(code){ case 104: @@ -7594,7 +7614,7 @@ bool setTargetedHotend(int code){ SERIAL_ECHO(_i("M221 Invalid extruder "));////MSG_M221_INVALID_EXTRUDER c=0 r=0 break; } - SERIAL_PROTOCOLLN((int)tmp_extruder); + SERIAL_PROTOCOLLN((int)extruder); return true; } } @@ -7659,7 +7679,7 @@ void delay_keep_alive(unsigned int ms) } } -void wait_for_heater(long codenum) { +static void wait_for_heater(long codenum, uint8_t extruder) { #ifdef TEMP_RESIDENCY_TIME long residencyStart; @@ -7675,9 +7695,9 @@ void wait_for_heater(long codenum) { { //Print Temp Reading and remaining time every 1 second while heating up/cooling down if (!farm_mode) { SERIAL_PROTOCOLPGM("T:"); - SERIAL_PROTOCOL_F(degHotend(tmp_extruder), 1); + SERIAL_PROTOCOL_F(degHotend(extruder), 1); SERIAL_PROTOCOLPGM(" E:"); - SERIAL_PROTOCOL((int)tmp_extruder); + SERIAL_PROTOCOL((int)extruder); #ifdef TEMP_RESIDENCY_TIME SERIAL_PROTOCOLPGM(" W:"); @@ -7702,9 +7722,9 @@ void wait_for_heater(long codenum) { #ifdef TEMP_RESIDENCY_TIME /* start/restart the TEMP_RESIDENCY_TIME timer whenever we reach target temp for the first time or when current temp falls outside the hysteresis after target temp was reached */ - if ((residencyStart == -1 && target_direction && (degHotend(tmp_extruder) >= (degTargetHotend(tmp_extruder) - TEMP_WINDOW))) || - (residencyStart == -1 && !target_direction && (degHotend(tmp_extruder) <= (degTargetHotend(tmp_extruder) + TEMP_WINDOW))) || - (residencyStart > -1 && labs(degHotend(tmp_extruder) - degTargetHotend(tmp_extruder)) > TEMP_HYSTERESIS)) + if ((residencyStart == -1 && target_direction && (degHotend(extruder) >= (degTargetHotend(extruder) - TEMP_WINDOW))) || + (residencyStart == -1 && !target_direction && (degHotend(extruder) <= (degTargetHotend(extruder) + TEMP_WINDOW))) || + (residencyStart > -1 && labs(degHotend(extruder) - degTargetHotend(extruder)) > TEMP_HYSTERESIS)) { residencyStart = millis(); }