Selaa lähdekoodia

Use temperature accessors

Scott Lahteine 4 vuotta sitten
vanhempi
commit
dfcccb63a1

+ 1
- 1
Marlin/src/lcd/dwin/e3v2/dwin.cpp Näytä tiedosto

2709
           case 4: // Extruder
2709
           case 4: // Extruder
2710
             // window tips
2710
             // window tips
2711
             #ifdef PREVENT_COLD_EXTRUSION
2711
             #ifdef PREVENT_COLD_EXTRUSION
2712
-              if (thermalManager.wholeDegHotend(0) < (EXTRUDE_MINTEMP)) {
2712
+              if (thermalManager.tooColdToExtrude(0)) {
2713
                 HMI_flag.ETempTooLow_flag = true;
2713
                 HMI_flag.ETempTooLow_flag = true;
2714
                 Popup_Window_ETempTooLow();
2714
                 Popup_Window_ETempTooLow();
2715
                 DWIN_UpdateLCD();
2715
                 DWIN_UpdateLCD();

+ 1
- 1
Marlin/src/lcd/menu/menu_filament.cpp Näytä tiedosto

67
 }
67
 }
68
 
68
 
69
 static void _change_filament_with_custom() {
69
 static void _change_filament_with_custom() {
70
-  _change_filament_with_temp(thermalManager.temp_hotend[MenuItemBase::itemIndex].target);
70
+  _change_filament_with_temp(thermalManager.degTargetHotend(MenuItemBase::itemIndex));
71
 }
71
 }
72
 
72
 
73
 //
73
 //

+ 2
- 2
Marlin/src/lcd/menu/menu_temperature.cpp Näytä tiedosto

147
   #if HAS_TEMP_HOTEND || HAS_HEATED_BED
147
   #if HAS_TEMP_HOTEND || HAS_HEATED_BED
148
     bool has_heat = false;
148
     bool has_heat = false;
149
     #if HAS_TEMP_HOTEND
149
     #if HAS_TEMP_HOTEND
150
-      HOTEND_LOOP() if (thermalManager.temp_hotend[HOTEND_INDEX].target) { has_heat = true; break; }
150
+      HOTEND_LOOP() if (thermalManager.degTargetHotend(HOTEND_INDEX)) { has_heat = true; break; }
151
     #endif
151
     #endif
152
   #endif
152
   #endif
153
 
153
 
271
     //
271
     //
272
     // Cooldown
272
     // Cooldown
273
     //
273
     //
274
-    if (TERN0(HAS_HEATED_BED, thermalManager.temp_bed.target)) has_heat = true;
274
+    if (TERN0(HAS_HEATED_BED, thermalManager.degTargetBed())) has_heat = true;
275
     if (has_heat) ACTION_ITEM(MSG_COOLDOWN, lcd_cooldown);
275
     if (has_heat) ACTION_ITEM(MSG_COOLDOWN, lcd_cooldown);
276
   #endif
276
   #endif
277
 
277
 

+ 1
- 1
Marlin/src/lcd/tft/ui_1024x600.cpp Näytä tiedosto

644
 static void moveAxis(AxisEnum axis, const int8_t direction) {
644
 static void moveAxis(AxisEnum axis, const int8_t direction) {
645
   quick_feedback();
645
   quick_feedback();
646
 
646
 
647
-  if (axis == E_AXIS && thermalManager.temp_hotend[motionAxisState.e_selection].celsius < EXTRUDE_MINTEMP) {
647
+  if (axis == E_AXIS && thermalManager.tooColdToExtrude(motionAxisState.e_selection)) {
648
     drawMessage("Too cold");
648
     drawMessage("Too cold");
649
     return;
649
     return;
650
   }
650
   }

+ 1
- 1
Marlin/src/lcd/tft/ui_480x320.cpp Näytä tiedosto

636
 static void moveAxis(AxisEnum axis, const int8_t direction) {
636
 static void moveAxis(AxisEnum axis, const int8_t direction) {
637
   quick_feedback();
637
   quick_feedback();
638
 
638
 
639
-  if (axis == E_AXIS && thermalManager.temp_hotend[motionAxisState.e_selection].celsius < EXTRUDE_MINTEMP) {
639
+  if (axis == E_AXIS && thermalManager.tooColdToExtrude(motionAxisState.e_selection)) {
640
     drawMessage("Too cold");
640
     drawMessage("Too cold");
641
     return;
641
     return;
642
   }
642
   }

+ 1
- 1
Marlin/src/module/tool_change.cpp Näytä tiedosto

1381
 
1381
 
1382
     // Migrate the temperature to the new hotend
1382
     // Migrate the temperature to the new hotend
1383
     #if HAS_MULTI_HOTEND
1383
     #if HAS_MULTI_HOTEND
1384
-      thermalManager.setTargetHotend(thermalManager.temp_hotend[active_extruder].target, migration_extruder);
1384
+      thermalManager.setTargetHotend(thermalManager.degTargetHotend(active_extruder), migration_extruder);
1385
       TERN_(AUTOTEMP, planner.autotemp_update());
1385
       TERN_(AUTOTEMP, planner.autotemp_update());
1386
       TERN_(HAS_STATUS_MESSAGE, thermalManager.set_heating_message(0));
1386
       TERN_(HAS_STATUS_MESSAGE, thermalManager.set_heating_message(0));
1387
       thermalManager.wait_for_hotend(active_extruder);
1387
       thermalManager.wait_for_hotend(active_extruder);

Loading…
Peruuta
Tallenna