bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Merge pull request #6921 from tcm0116/pause_flash

Browse Source 
Fix issues with advanced pause
This commit is contained in:
Scott Lahteine 2017-06-01 18:04:25 -05:00 committed by GitHub
commit e800743268
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Marlin/Marlin_main.cpp
View File

@ -5931,7 +5931,8 @@ inline void gcode_M17() {
idle(); idle();
wait_for_heatup = false; wait_for_heatup = false;
HOTEND_LOOP() { HOTEND_LOOP() {
if (abs(thermalManager.degHotend(e) - thermalManager.degTargetHotend(e)) > 3) { const int16_t target_temp = thermalManager.degTargetHotend(e);
if (target_temp && abs(thermalManager.degHotend(e) - target_temp) > 3) {
wait_for_heatup = true; wait_for_heatup = true;
break; break;
} }

2
Marlin/ultralcd_impl_DOGM.h
View File

@ -704,6 +704,8 @@ static void lcd_implementation_status_screen() {
lcd_print(' '); lcd_print(' ');
lcd_print(itostr3(thermalManager.degHotend(active_extruder))); lcd_print(itostr3(thermalManager.degHotend(active_extruder)));
lcd_print('/'); lcd_print('/');
if (lcd_blink() || !thermalManager.is_heater_idle(active_extruder))
lcd_print(itostr3(thermalManager.degTargetHotend(active_extruder))); lcd_print(itostr3(thermalManager.degTargetHotend(active_extruder)));
} }

5
Marlin/ultralcd_impl_HD44780.h
View File

@ -844,10 +844,7 @@ static void lcd_implementation_status_screen() {
static void lcd_implementation_hotend_status(const uint8_t row) { static void lcd_implementation_hotend_status(const uint8_t row) {
if (row < LCD_HEIGHT) { if (row < LCD_HEIGHT) {
lcd.setCursor(LCD_WIDTH - 9, row); lcd.setCursor(LCD_WIDTH - 9, row);
lcd.print(LCD_STR_THERMOMETER[0]); _draw_heater_status(active_extruder, LCD_STR_THERMOMETER[0], lcd_blink());
lcd.print(itostr3(thermalManager.degHotend(active_extruder)));
lcd.print('/');
lcd.print(itostr3(thermalManager.degTargetHotend(active_extruder)));
} }
} }