🐛 Use setTargetHotend in menus (MarlinFirmware#22247)

ptoal · Dec 16, 2021 · ce8da02 · ce8da02
1 parent 77c7a71
commit ce8da02
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/Marlin/src/lcd/menu/menu.h b/Marlin/src/lcd/menu/menu.h
@@ -132,14 +132,15 @@ class MenuItem_confirm : public MenuItemBase {
 
 // The Menu Edit shadow value
 typedef union {
- bool state;
- float decimal;
- int8_t int8;
- int16_t int16;
- int32_t int32;
- uint8_t uint8;
- uint16_t uint16;
- uint32_t uint32;
+ bool state;
+ float decimal;
+ int8_t int8;
+ int16_t int16;
+ int32_t int32;
+ uint8_t uint8;
+ uint16_t uint16;
+ uint32_t uint32;
+ celsius_t celsius;
 } chimera_t;
 extern chimera_t editable;
 

diff --git a/Marlin/src/lcd/menu/menu_temperature.cpp b/Marlin/src/lcd/menu/menu_temperature.cpp
@@ -169,10 +169,13 @@ void menu_temperature() {
  // Nozzle [1-5]:
  //
  #if HOTENDS == 1
- EDIT_ITEM_FAST(int3, MSG_NOZZLE, &thermalManager.temp_hotend[0].target, 0, thermalManager.hotend_max_target(0), []{ thermalManager.start_watching_hotend(0); });
+ editable.celsius = thermalManager.temp_hotend[0].target;
+ EDIT_ITEM_FAST(int3, MSG_NOZZLE, &editable.celsius, 0, thermalManager.hotend_max_target(0), []{ thermalManager.setTargetHotend(editable.celsius, 0); });
  #elif HAS_MULTI_HOTEND
- HOTEND_LOOP()
- EDIT_ITEM_FAST_N(int3, e, MSG_NOZZLE_N, &thermalManager.temp_hotend[e].target, 0, thermalManager.hotend_max_target(e), []{ thermalManager.start_watching_hotend(MenuItemBase::itemIndex); });
+ HOTEND_LOOP() {
+ editable.celsius = thermalManager.temp_hotend[e].target;
+ EDIT_ITEM_FAST_N(int3, e, MSG_NOZZLE_N, &editable.celsius, 0, thermalManager.hotend_max_target(e), []{ thermalManager.setTargetHotend(editable.celsius, MenuItemBase::itemIndex); });
+ }
  #endif
 
  #if ENABLED(SINGLENOZZLE_STANDBY_TEMP)