Bladeren bron

Fix heater status display for advanced pause

Thomas Moore 8 jaren geleden
bovenliggende
commit
a32f7b329c
3 gewijzigde bestanden met toevoegingen van 6 en 6 verwijderingen
  1. 2
    1
      Marlin/Marlin_main.cpp
  2. 3
    1
      Marlin/ultralcd_impl_DOGM.h
  3. 1
    4
      Marlin/ultralcd_impl_HD44780.h

+ 2
- 1
Marlin/Marlin_main.cpp Bestand weergeven

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

+ 3
- 1
Marlin/ultralcd_impl_DOGM.h Bestand weergeven

@@ -704,7 +704,9 @@ static void lcd_implementation_status_screen() {
704 704
       lcd_print(' ');
705 705
       lcd_print(itostr3(thermalManager.degHotend(active_extruder)));
706 706
       lcd_print('/');
707
-      lcd_print(itostr3(thermalManager.degTargetHotend(active_extruder)));
707
+
708
+      if (lcd_blink() || !thermalManager.is_heater_idle(active_extruder))
709
+        lcd_print(itostr3(thermalManager.degTargetHotend(active_extruder)));
708 710
     }
709 711
 
710 712
   #endif // ADVANCED_PAUSE_FEATURE

+ 1
- 4
Marlin/ultralcd_impl_HD44780.h Bestand weergeven

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

Laden…
Annuleren
Opslaan