3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove HotendTempBckp global variable.

Browse source
This commit is contained in:
Marek Bel 2018-09-06 10:05:59 +02:00
parent d71311f13f
commit b43c8dad74
2 changed files with 4 additions and 7 deletions

3
Firmware/Marlin.h
View file

@ -335,7 +335,6 @@ extern uint8_t active_extruder;
//Long pause //Long pause
extern int saved_feedmultiply; extern int saved_feedmultiply;
extern float HotendTempBckp;
extern int fanSpeedBckp; extern int fanSpeedBckp;
extern unsigned long pause_time; extern unsigned long pause_time;
extern unsigned long start_pause_print; extern unsigned long start_pause_print;
@ -476,5 +475,5 @@ void proc_commands();
void M600_load_filament(); void M600_load_filament();
void M600_load_filament_movements(); void M600_load_filament_movements();
void M600_wait_for_user(); void M600_wait_for_user(float HotendTempBckp);
void M600_check_state(); void M600_check_state();

8
Firmware/Marlin_main.cpp
View file

@ -331,7 +331,6 @@ unsigned int usb_printing_counter;
int8_t lcd_change_fil_state = 0; int8_t lcd_change_fil_state = 0;
int feedmultiplyBckp = 100; int feedmultiplyBckp = 100;
float HotendTempBckp = 0;
int fanSpeedBckp = 0; int fanSpeedBckp = 0;
unsigned long pause_time = 0; unsigned long pause_time = 0;
unsigned long start_pause_print = millis(); unsigned long start_pause_print = millis();
@ -3059,7 +3058,7 @@ static void gcode_M600(bool automatic, float x_position, float y_position, float
//First backup current position and settings //First backup current position and settings
feedmultiplyBckp = feedmultiply; feedmultiplyBckp = feedmultiply;
HotendTempBckp = degTargetHotend(active_extruder); float HotendTempBckp = degTargetHotend(active_extruder);
fanSpeedBckp = fanSpeed; fanSpeedBckp = fanSpeed;
lastpos[X_AXIS] = current_position[X_AXIS]; lastpos[X_AXIS] = current_position[X_AXIS];
@ -3087,7 +3086,7 @@ static void gcode_M600(bool automatic, float x_position, float y_position, float
st_synchronize(); st_synchronize();
//Beep, manage nozzle heater and wait for user to start unload filament //Beep, manage nozzle heater and wait for user to start unload filament
if(!mmu_enabled) M600_wait_for_user(); if(!mmu_enabled) M600_wait_for_user(HotendTempBckp);
lcd_change_fil_state = 0; lcd_change_fil_state = 0;
@ -8116,7 +8115,6 @@ void long_pause() //long pause print
//save currently set parameters to global variables //save currently set parameters to global variables
saved_feedmultiply = feedmultiply; saved_feedmultiply = feedmultiply;
HotendTempBckp = degTargetHotend(active_extruder);
fanSpeedBckp = fanSpeed; fanSpeedBckp = fanSpeed;
start_pause_print = millis(); start_pause_print = millis();
@ -8912,7 +8910,7 @@ void M600_check_state()
} }
} }
void M600_wait_for_user() { void M600_wait_for_user(float HotendTempBckp) {
//Beep, manage nozzle heater and wait for user to start unload filament //Beep, manage nozzle heater and wait for user to start unload filament
KEEPALIVE_STATE(PAUSED_FOR_USER); KEEPALIVE_STATE(PAUSED_FOR_USER);