josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix setTargetHotend array overflow 

Special function may be used instead (setTargetHotends(temp))
This commit is contained in:
Petr Ledvina 2018-07-17 17:07:15 +02:00
parent 8cea3a714f
commit 3f92630fd1
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Firmware/Marlin_main.cpp
View File

@ -2906,9 +2906,9 @@ bool gcode_M45(bool onlyZ, int8_t verbosity_level)
if (!onlyZ) if (!onlyZ)
{ {
setTargetBed(0); setTargetBed(0);
setTargetHotend(0, 0); setTargetHotend0(0);
setTargetHotend(0, 1); setTargetHotend1(0);
setTargetHotend(0, 2); setTargetHotend2(0);
adjust_bed_reset(); //reset bed level correction adjust_bed_reset(); //reset bed level correction
} }
@ -6353,9 +6353,9 @@ Sigma_Exit:
if (millis() > waiting_start_time + (unsigned long)M600_TIMEOUT * 1000) { if (millis() > waiting_start_time + (unsigned long)M600_TIMEOUT * 1000) {
lcd_display_message_fullscreen_P(_i("Press knob to preheat nozzle and continue."));////MSG_PRESS_TO_PREHEAT c=20 r=4 lcd_display_message_fullscreen_P(_i("Press knob to preheat nozzle and continue."));////MSG_PRESS_TO_PREHEAT c=20 r=4
wait_for_user_state = 1; wait_for_user_state = 1;
setTargetHotend(0, 0); setTargetHotend0(0);
setTargetHotend(0, 1); setTargetHotend1(0);
setTargetHotend(0, 2); setTargetHotend2(0);
st_synchronize(); st_synchronize();
disable_e0(); disable_e0();
disable_e1(); disable_e1();
@ -8407,9 +8407,9 @@ void long_pause() //long pause print
plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 15, active_extruder); plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 15, active_extruder);
//set nozzle target temperature to 0 //set nozzle target temperature to 0
setTargetHotend(0, 0); setTargetHotend0(0);
setTargetHotend(0, 1); setTargetHotend1(0);
setTargetHotend(0, 2); setTargetHotend2(0);
//Move XY to side //Move XY to side
current_position[X_AXIS] = X_PAUSE_POS; current_position[X_AXIS] = X_PAUSE_POS;

6
Firmware/ultralcd.cpp
View File

@ -1747,9 +1747,9 @@ void lcd_commands()
cancel_heatup = true; cancel_heatup = true;
setTargetBed(0); setTargetBed(0);
#ifndef SNMM #ifndef SNMM
setTargetHotend(0, 0); //heating when changing filament for multicolor setTargetHotend0(0); //heating when changing filament for multicolor
setTargetHotend(0, 1); setTargetHotend1(0);
setTargetHotend(0, 2); setTargetHotend2(0);
#endif #endif
manage_heater(); manage_heater();
custom_message = true; custom_message = true;