Browse Source

🎨 Apply HAS_MULTI_HOTEND conditional

Scott Lahteine 3 years ago
parent
commit
aa2c6387e9
41 changed files with 100 additions and 106 deletions
  1. 7
    8
      Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
  2. 4
    4
      Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp
  3. 6
    6
      Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp
  4. 2
    2
      Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp
  5. 19
    25
      Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp
  6. 3
    3
      Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp
  7. 5
    5
      Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp
  8. 5
    5
      Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.cpp
  9. 3
    3
      Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp
  10. 6
    6
      Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
  11. 4
    4
      Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp
  12. 2
    2
      Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Addr.h
  13. 2
    2
      Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VPList.cpp
  14. 4
    3
      Marlin/src/lcd/menu/menu_temperature.cpp
  15. 2
    2
      Marlin/src/lcd/tft/ui_common.h
  16. 1
    1
      Marlin/src/pins/esp32/pins_E4D.h
  17. 1
    1
      Marlin/src/pins/esp32/pins_FYSETC_E4.h
  18. 1
    1
      Marlin/src/pins/esp32/pins_MRR_ESPA.h
  19. 1
    1
      Marlin/src/pins/esp32/pins_MRR_ESPE.h
  20. 1
    1
      Marlin/src/pins/ramps/pins_K8600.h
  21. 1
    1
      Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h
  22. 1
    1
      Marlin/src/pins/ramps/pins_RAMPS_ENDER_4.h
  23. 1
    1
      Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
  24. 1
    1
      Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
  25. 1
    1
      Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
  26. 1
    1
      Marlin/src/pins/stm32f1/pins_CREALITY_V452.h
  27. 1
    1
      Marlin/src/pins/stm32f1/pins_CREALITY_V453.h
  28. 1
    1
      Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
  29. 1
    1
      Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h
  30. 1
    1
      Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h
  31. 1
    1
      Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3.h
  32. 1
    1
      Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3D.h
  33. 1
    1
      Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3D_V1_1.h
  34. 1
    1
      Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
  35. 1
    1
      Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_V1_1.h
  36. 1
    1
      Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
  37. 1
    1
      Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
  38. 1
    1
      Marlin/src/pins/stm32f4/pins_ANET_ET4.h
  39. 1
    1
      Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
  40. 1
    1
      Marlin/src/pins/stm32f4/pins_LERDGE_X.h
  41. 1
    1
      Marlin/src/pins/stm32f7/pins_REMRAM_V1.h

+ 7
- 8
Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp View File

132
   }
132
   }
133
 }
133
 }
134
 
134
 
135
-#if HOTENDS > 2
136
-  #define HOTEND_STATS 3
137
-#elif HOTENDS > 1
138
-  #define HOTEND_STATS 2
139
-#elif HAS_HOTEND
140
-  #define HOTEND_STATS 1
141
-#endif
142
-
143
 /**
135
 /**
144
  * Draw a single heater icon with current and target temperature, at the given XY
136
  * Draw a single heater icon with current and target temperature, at the given XY
145
  */
137
  */
146
 FORCE_INLINE void _draw_heater_status(const heater_id_t heater, const uint16_t x, const uint16_t y) {
138
 FORCE_INLINE void _draw_heater_status(const heater_id_t heater, const uint16_t x, const uint16_t y) {
147
 
139
 
148
   #if HAS_HOTEND
140
   #if HAS_HOTEND
141
+    #if HOTENDS > 2
142
+      #define HOTEND_STATS 3
143
+    #elif HOTENDS > 1
144
+      #define HOTEND_STATS 2
145
+    #elif HAS_HOTEND
146
+      #define HOTEND_STATS 1
147
+    #endif
149
     static celsius_t old_temp[HOTEND_STATS] = ARRAY_N_1(HOTEND_STATS, 500),
148
     static celsius_t old_temp[HOTEND_STATS] = ARRAY_N_1(HOTEND_STATS, 500),
150
                      old_target[HOTEND_STATS] = ARRAY_N_1(HOTEND_STATS, 500);
149
                      old_target[HOTEND_STATS] = ARRAY_N_1(HOTEND_STATS, 500);
151
     static bool old_on[HOTEND_STATS] = ARRAY_N_1(HOTEND_STATS, false);
150
     static bool old_on[HOTEND_STATS] = ARRAY_N_1(HOTEND_STATS, false);

+ 4
- 4
Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp View File

185
         case VP_E0_PID_I: valuesend = unscalePID_i(value); break;
185
         case VP_E0_PID_I: valuesend = unscalePID_i(value); break;
186
         case VP_E0_PID_D: valuesend = unscalePID_d(value); break;
186
         case VP_E0_PID_D: valuesend = unscalePID_d(value); break;
187
       #endif
187
       #endif
188
-      #if HOTENDS >= 2
188
+      #if HAS_MULTI_HOTEND
189
         case VP_E1_PID_P: valuesend = value; break;
189
         case VP_E1_PID_P: valuesend = value; break;
190
         case VP_E1_PID_I: valuesend = unscalePID_i(value); break;
190
         case VP_E1_PID_I: valuesend = unscalePID_i(value); break;
191
         case VP_E1_PID_D: valuesend = unscalePID_d(value); break;
191
         case VP_E1_PID_D: valuesend = unscalePID_d(value); break;
400
         acceptedvalue = thermalManager.degTargetHotend(0);
400
         acceptedvalue = thermalManager.degTargetHotend(0);
401
         break;
401
         break;
402
     #endif
402
     #endif
403
-    #if HOTENDS >= 2
403
+    #if HAS_MULTI_HOTEND
404
       case VP_T_E1_Set:
404
       case VP_T_E1_Set:
405
         NOMORE(newvalue, HEATER_1_MAXTEMP);
405
         NOMORE(newvalue, HEATER_1_MAXTEMP);
406
         thermalManager.setTargetHotend(newvalue, 1);
406
         thermalManager.setTargetHotend(newvalue, 1);
551
               sprintf_P(buf, PSTR("M303 E%d C5 S210 U1"), ExtUI::extruder_t::E0);
551
               sprintf_P(buf, PSTR("M303 E%d C5 S210 U1"), ExtUI::extruder_t::E0);
552
               break;
552
               break;
553
           #endif
553
           #endif
554
-          #if HOTENDS >= 2
554
+          #if HAS_MULTI_HOTEND
555
             case VP_PID_AUTOTUNE_E1:
555
             case VP_PID_AUTOTUNE_E1:
556
               sprintf_P(buf, PSTR("M303 E%d C5 S210 U1"), ExtUI::extruder_t::E1);
556
               sprintf_P(buf, PSTR("M303 E%d C5 S210 U1"), ExtUI::extruder_t::E1);
557
               break;
557
               break;
598
   switch (var.VP) {
598
   switch (var.VP) {
599
     #if HAS_HOTEND
599
     #if HAS_HOTEND
600
       case VP_E0_CONTROL:
600
       case VP_E0_CONTROL:
601
-      #if HOTENDS >= 2
601
+      #if HAS_MULTI_HOTEND
602
         case VP_E1_CONTROL:
602
         case VP_E1_CONTROL:
603
         #if HOTENDS >= 3
603
         #if HOTENDS >= 3
604
           case VP_E2_CONTROL:
604
           case VP_E2_CONTROL:

+ 6
- 6
Marlin/src/lcd/extui/dgus/fysetc/DGUSDisplayDef.cpp View File

51
   #if HAS_HOTEND
51
   #if HAS_HOTEND
52
     VP_T_E0_Is, VP_T_E0_Set, VP_E0_STATUS,
52
     VP_T_E0_Is, VP_T_E0_Set, VP_E0_STATUS,
53
   #endif
53
   #endif
54
-  #if HOTENDS >= 2
54
+  #if HAS_MULTI_HOTEND
55
     VP_T_E1_Is, VP_T_E1_Set,
55
     VP_T_E1_Is, VP_T_E1_Set,
56
   #endif
56
   #endif
57
   #if HAS_HEATED_BED
57
   #if HAS_HEATED_BED
73
   #if HAS_HOTEND
73
   #if HAS_HOTEND
74
     VP_T_E0_Is, VP_T_E0_Set,
74
     VP_T_E0_Is, VP_T_E0_Set,
75
   #endif
75
   #endif
76
-  #if HOTENDS >= 2
76
+  #if HAS_MULTI_HOTEND
77
     VP_T_E1_Is, VP_T_E1_Set,
77
     VP_T_E1_Is, VP_T_E1_Set,
78
   #endif
78
   #endif
79
   #if HAS_HEATED_BED
79
   #if HAS_HEATED_BED
87
   #if HAS_HOTEND
87
   #if HAS_HOTEND
88
     VP_T_E0_Is, VP_T_E0_Set,
88
     VP_T_E0_Is, VP_T_E0_Set,
89
   #endif
89
   #endif
90
-  #if HOTENDS >= 2
90
+  #if HAS_MULTI_HOTEND
91
     VP_T_E1_Is, VP_T_E1_Set,
91
     VP_T_E1_Is, VP_T_E1_Set,
92
   #endif
92
   #endif
93
   #if HAS_HEATED_BED
93
   #if HAS_HEATED_BED
120
   #if HAS_HOTEND
120
   #if HAS_HOTEND
121
     VP_T_E0_Is, VP_T_E0_Set,
121
     VP_T_E0_Is, VP_T_E0_Set,
122
   #endif
122
   #endif
123
-  #if HOTENDS >= 2
123
+  #if HAS_MULTI_HOTEND
124
     VP_T_E1_Is, VP_T_E1_Set,
124
     VP_T_E1_Is, VP_T_E1_Set,
125
   #endif
125
   #endif
126
   #if HAS_HEATED_BED
126
   #if HAS_HEATED_BED
187
   #if HAS_HOTEND
187
   #if HAS_HOTEND
188
     VP_T_E0_Is, VP_T_E0_Set,
188
     VP_T_E0_Is, VP_T_E0_Set,
189
   #endif
189
   #endif
190
-  #if HOTENDS >= 2
190
+  #if HAS_MULTI_HOTEND
191
     VP_T_E1_Is, VP_T_E1_Set,
191
     VP_T_E1_Is, VP_T_E1_Set,
192
   #endif
192
   #endif
193
   #if HAS_HEATED_BED
193
   #if HAS_HEATED_BED
379
       VPHELPER(VP_E0_FILAMENT_LOAD_UNLOAD, nullptr, ScreenHandler.HandleFilamentOption, ScreenHandler.HandleFilamentLoadUnload),
379
       VPHELPER(VP_E0_FILAMENT_LOAD_UNLOAD, nullptr, ScreenHandler.HandleFilamentOption, ScreenHandler.HandleFilamentLoadUnload),
380
     #endif
380
     #endif
381
   #endif
381
   #endif
382
-  #if HOTENDS >= 2
382
+  #if HAS_MULTI_HOTEND
383
     VPHELPER(VP_T_E1_Is, &thermalManager.temp_hotend[1].celsius, nullptr, ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<0>),
383
     VPHELPER(VP_T_E1_Is, &thermalManager.temp_hotend[1].celsius, nullptr, ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<0>),
384
     VPHELPER(VP_T_E1_Set, &thermalManager.temp_hotend[1].target, ScreenHandler.HandleTemperatureChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
384
     VPHELPER(VP_T_E1_Set, &thermalManager.temp_hotend[1].target, ScreenHandler.HandleTemperatureChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
385
     VPHELPER(VP_Flowrate_E1, &planner.flow_percentage[ExtUI::extruder_t::E1], ScreenHandler.HandleFlowRateChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),  // ERROR: Flow is per-extruder, not per-hotend
385
     VPHELPER(VP_Flowrate_E1, &planner.flow_percentage[ExtUI::extruder_t::E1], ScreenHandler.HandleFlowRateChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),  // ERROR: Flow is per-extruder, not per-hotend

+ 2
- 2
Marlin/src/lcd/extui/dgus/fysetc/DGUSScreenHandler.cpp View File

256
           case VP_E0_PID_I: newvalue = scalePID_i(value); break;
256
           case VP_E0_PID_I: newvalue = scalePID_i(value); break;
257
           case VP_E0_PID_D: newvalue = scalePID_d(value); break;
257
           case VP_E0_PID_D: newvalue = scalePID_d(value); break;
258
         #endif
258
         #endif
259
-        #if HOTENDS >= 2
259
+        #if HAS_MULTI_HOTEND
260
           case VP_E1_PID_P: newvalue = value; break;
260
           case VP_E1_PID_P: newvalue = value; break;
261
           case VP_E1_PID_I: newvalue = scalePID_i(value); break;
261
           case VP_E1_PID_I: newvalue = scalePID_i(value); break;
262
           case VP_E1_PID_D: newvalue = scalePID_d(value); break;
262
           case VP_E1_PID_D: newvalue = scalePID_d(value); break;
334
       #if HAS_HOTEND
334
       #if HAS_HOTEND
335
         thermalManager.setTargetHotend(e_temp, ExtUI::extruder_t::E0);
335
         thermalManager.setTargetHotend(e_temp, ExtUI::extruder_t::E0);
336
       #endif
336
       #endif
337
-      #if HOTENDS >= 2
337
+      #if HAS_MULTI_HOTEND
338
         thermalManager.setTargetHotend(e_temp, ExtUI::extruder_t::E1);
338
         thermalManager.setTargetHotend(e_temp, ExtUI::extruder_t::E1);
339
       #endif
339
       #endif
340
       GotoScreen(DGUSLCD_SCREEN_UTILITY);
340
       GotoScreen(DGUSLCD_SCREEN_UTILITY);

+ 19
- 25
Marlin/src/lcd/extui/dgus/hiprecy/DGUSDisplayDef.cpp View File

50
   // VP_M117, for completeness, but it cannot be auto-uploaded.
50
   // VP_M117, for completeness, but it cannot be auto-uploaded.
51
   #if HAS_HOTEND
51
   #if HAS_HOTEND
52
     VP_T_E0_Is, VP_T_E0_Set, VP_E0_STATUS,
52
     VP_T_E0_Is, VP_T_E0_Set, VP_E0_STATUS,
53
-    #if HOTENDS >= 2
53
+    #if HAS_MULTI_HOTEND
54
       VP_T_E1_Is, VP_T_E1_Set,
54
       VP_T_E1_Is, VP_T_E1_Set,
55
     #endif
55
     #endif
56
   #endif
56
   #endif
72
 const uint16_t VPList_Temp[] PROGMEM = {
72
 const uint16_t VPList_Temp[] PROGMEM = {
73
   #if HAS_HOTEND
73
   #if HAS_HOTEND
74
     VP_T_E0_Is, VP_T_E0_Set,
74
     VP_T_E0_Is, VP_T_E0_Set,
75
-    #if HOTENDS >= 2
75
+    #if HAS_MULTI_HOTEND
76
       VP_T_E1_Is, VP_T_E1_Set,
76
       VP_T_E1_Is, VP_T_E1_Set,
77
     #endif
77
     #endif
78
   #endif
78
   #endif
86
   // VP_M117, for completeness, but it cannot be auto-uploaded
86
   // VP_M117, for completeness, but it cannot be auto-uploaded
87
   #if HAS_HOTEND
87
   #if HAS_HOTEND
88
     VP_T_E0_Is, VP_T_E0_Set,
88
     VP_T_E0_Is, VP_T_E0_Set,
89
-    #if HOTENDS >= 2
89
+    #if HAS_MULTI_HOTEND
90
       VP_T_E1_Is, VP_T_E1_Set,
90
       VP_T_E1_Is, VP_T_E1_Set,
91
     #endif
91
     #endif
92
   #endif
92
   #endif
107
   // VP_M117, for completeness, but it cannot be auto-uploaded
107
   // VP_M117, for completeness, but it cannot be auto-uploaded
108
   #if HAS_HOTEND
108
   #if HAS_HOTEND
109
     VP_Flowrate_E0,
109
     VP_Flowrate_E0,
110
-    #if HOTENDS >= 2
110
+    #if HAS_MULTI_HOTEND
111
       VP_Flowrate_E1,
111
       VP_Flowrate_E1,
112
     #endif
112
     #endif
113
   #endif
113
   #endif
119
 const uint16_t VPList_Preheat[] PROGMEM = {
119
 const uint16_t VPList_Preheat[] PROGMEM = {
120
   #if HAS_HOTEND
120
   #if HAS_HOTEND
121
     VP_T_E0_Is, VP_T_E0_Set,
121
     VP_T_E0_Is, VP_T_E0_Set,
122
-    #if HOTENDS >= 2
122
+    #if HAS_MULTI_HOTEND
123
       VP_T_E1_Is, VP_T_E1_Set,
123
       VP_T_E1_Is, VP_T_E1_Set,
124
     #endif
124
     #endif
125
   #endif
125
   #endif
137
 const uint16_t VPList_ManualExtrude[] PROGMEM = {
137
 const uint16_t VPList_ManualExtrude[] PROGMEM = {
138
   #if HAS_HOTEND
138
   #if HAS_HOTEND
139
     VP_T_E0_Is, VP_T_E0_Set,
139
     VP_T_E0_Is, VP_T_E0_Set,
140
-    #if HOTENDS >= 2
140
+    #if HAS_MULTI_HOTEND
141
       VP_T_E1_Is, VP_T_E1_Set,
141
       VP_T_E1_Is, VP_T_E1_Set,
142
     #endif
142
     #endif
143
   #endif
143
   #endif
159
   #if HAS_HOTEND
159
   #if HAS_HOTEND
160
     VP_T_E0_Is, VP_T_E0_Set,
160
     VP_T_E0_Is, VP_T_E0_Set,
161
     VP_E0_FILAMENT_LOAD_UNLOAD,
161
     VP_E0_FILAMENT_LOAD_UNLOAD,
162
-    #if HOTENDS >= 2
162
+    #if HAS_MULTI_HOTEND
163
       VP_T_E1_Is, VP_T_E1_Set,
163
       VP_T_E1_Is, VP_T_E1_Set,
164
     #endif
164
     #endif
165
   #endif
165
   #endif
169
 const uint16_t VPList_Filament_load_unload[] PROGMEM = {
169
 const uint16_t VPList_Filament_load_unload[] PROGMEM = {
170
   #if HAS_HOTEND
170
   #if HAS_HOTEND
171
     VP_E0_FILAMENT_LOAD_UNLOAD,
171
     VP_E0_FILAMENT_LOAD_UNLOAD,
172
-    #if HOTENDS >= 2
172
+    #if HAS_MULTI_HOTEND
173
       VP_E1_FILAMENT_LOAD_UNLOAD,
173
       VP_E1_FILAMENT_LOAD_UNLOAD,
174
     #endif
174
     #endif
175
   #endif
175
   #endif
185
   VP_PrintProgress_Percentage, VP_PrintTime,
185
   VP_PrintProgress_Percentage, VP_PrintTime,
186
   #if HAS_HOTEND
186
   #if HAS_HOTEND
187
     VP_T_E0_Is, VP_T_E0_Set,
187
     VP_T_E0_Is, VP_T_E0_Set,
188
-    #if HOTENDS >= 2
188
+    #if HAS_MULTI_HOTEND
189
       VP_T_E1_Is, VP_T_E1_Set,
189
       VP_T_E1_Is, VP_T_E1_Set,
190
     #endif
190
     #endif
191
   #endif
191
   #endif
205
 const uint16_t VPList_SDPrintTune[] PROGMEM = {
205
 const uint16_t VPList_SDPrintTune[] PROGMEM = {
206
   #if HAS_HOTEND
206
   #if HAS_HOTEND
207
     VP_T_E0_Is, VP_T_E0_Set,
207
     VP_T_E0_Is, VP_T_E0_Set,
208
-    #if HOTENDS >= 2
208
+    #if HAS_MULTI_HOTEND
209
       VP_T_E1_Is, VP_T_E1_Set,
209
       VP_T_E1_Is, VP_T_E1_Set,
210
     #endif
210
     #endif
211
   #endif
211
   #endif
222
 };
222
 };
223
 
223
 
224
 const uint16_t VPList_StepPerMM[] PROGMEM = {
224
 const uint16_t VPList_StepPerMM[] PROGMEM = {
225
-  VP_X_STEP_PER_MM,
226
-  VP_Y_STEP_PER_MM,
227
-  VP_Z_STEP_PER_MM,
228
-  #if HAS_HOTEND
229
-    VP_E0_STEP_PER_MM,
230
-    #if HOTENDS >= 2
231
-      VP_E1_STEP_PER_MM,
232
-    #endif
233
-  #endif
234
-  0x0000
225
+  VP_X_STEP_PER_MM
226
+  , VP_Y_STEP_PER_MM
227
+  , VP_Z_STEP_PER_MM
228
+  OPTARG(HAS_HOTEND,       VP_E0_STEP_PER_MM)
229
+  OPTARG(HAS_MULTI_HOTEND, VP_E1_STEP_PER_MM)
230
+  , 0x0000
235
 };
231
 };
236
 
232
 
237
 const uint16_t VPList_PIDE0[] PROGMEM = {
233
 const uint16_t VPList_PIDE0[] PROGMEM = {
238
   #if ENABLED(PIDTEMP)
234
   #if ENABLED(PIDTEMP)
239
-    VP_E0_PID_P,
240
-    VP_E0_PID_I,
241
-    VP_E0_PID_D,
235
+    VP_E0_PID_P, VP_E0_PID_I, VP_E0_PID_D,
242
   #endif
236
   #endif
243
   0x0000
237
   0x0000
244
 };
238
 };
382
       VPHELPER(VP_PID_AUTOTUNE_E0, nullptr, ScreenHandler.HandlePIDAutotune, nullptr),
376
       VPHELPER(VP_PID_AUTOTUNE_E0, nullptr, ScreenHandler.HandlePIDAutotune, nullptr),
383
     #endif
377
     #endif
384
   #endif
378
   #endif
385
-  #if HOTENDS >= 2
379
+  #if HAS_MULTI_HOTEND
386
     VPHELPER(VP_T_E1_Is, &thermalManager.temp_hotend[1].celsius, nullptr, ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<0>),
380
     VPHELPER(VP_T_E1_Is, &thermalManager.temp_hotend[1].celsius, nullptr, ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<0>),
387
     VPHELPER(VP_T_E1_Set, &thermalManager.temp_hotend[1].target, ScreenHandler.HandleTemperatureChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
381
     VPHELPER(VP_T_E1_Set, &thermalManager.temp_hotend[1].target, ScreenHandler.HandleTemperatureChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
388
     VPHELPER(VP_Flowrate_E1, nullptr, ScreenHandler.HandleFlowRateChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
382
     VPHELPER(VP_Flowrate_E1, nullptr, ScreenHandler.HandleFlowRateChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
435
   VPHELPER(VP_Z_STEP_PER_MM, &planner.settings.axis_steps_per_mm[Z_AXIS], ScreenHandler.HandleStepPerMMChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<1>),
429
   VPHELPER(VP_Z_STEP_PER_MM, &planner.settings.axis_steps_per_mm[Z_AXIS], ScreenHandler.HandleStepPerMMChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<1>),
436
   #if HAS_HOTEND
430
   #if HAS_HOTEND
437
     VPHELPER(VP_E0_STEP_PER_MM, &planner.settings.axis_steps_per_mm[E_AXIS_N(0)], ScreenHandler.HandleStepPerMMExtruderChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<1>),
431
     VPHELPER(VP_E0_STEP_PER_MM, &planner.settings.axis_steps_per_mm[E_AXIS_N(0)], ScreenHandler.HandleStepPerMMExtruderChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<1>),
438
-    #if HOTENDS >= 2
432
+    #if HAS_MULTI_HOTEND
439
       VPHELPER(VP_E1_STEP_PER_MM, &planner.settings.axis_steps_per_mm[E_AXIS_N(1)], ScreenHandler.HandleStepPerMMExtruderChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<1>),
433
       VPHELPER(VP_E1_STEP_PER_MM, &planner.settings.axis_steps_per_mm[E_AXIS_N(1)], ScreenHandler.HandleStepPerMMExtruderChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<1>),
440
     #endif
434
     #endif
441
   #endif
435
   #endif

+ 3
- 3
Marlin/src/lcd/extui/dgus/hiprecy/DGUSScreenHandler.cpp View File

256
           case VP_E0_PID_I: newvalue = scalePID_i(value); break;
256
           case VP_E0_PID_I: newvalue = scalePID_i(value); break;
257
           case VP_E0_PID_D: newvalue = scalePID_d(value); break;
257
           case VP_E0_PID_D: newvalue = scalePID_d(value); break;
258
         #endif
258
         #endif
259
-        #if HOTENDS >= 2
259
+        #if HAS_MULTI_HOTEND
260
           case VP_E1_PID_P: newvalue = value; break;
260
           case VP_E1_PID_P: newvalue = value; break;
261
           case VP_E1_PID_I: newvalue = scalePID_i(value); break;
261
           case VP_E1_PID_I: newvalue = scalePID_i(value); break;
262
           case VP_E1_PID_D: newvalue = scalePID_d(value); break;
262
           case VP_E1_PID_D: newvalue = scalePID_d(value); break;
333
     if (filament_data.action == 0) { // Go back to utility screen
333
     if (filament_data.action == 0) { // Go back to utility screen
334
       #if HAS_HOTEND
334
       #if HAS_HOTEND
335
         thermalManager.setTargetHotend(e_temp, ExtUI::extruder_t::E0);
335
         thermalManager.setTargetHotend(e_temp, ExtUI::extruder_t::E0);
336
-        #if HOTENDS >= 2
336
+        #if HAS_MULTI_HOTEND
337
           thermalManager.setTargetHotend(e_temp, ExtUI::extruder_t::E1);
337
           thermalManager.setTargetHotend(e_temp, ExtUI::extruder_t::E1);
338
         #endif
338
         #endif
339
       #endif
339
       #endif
348
               thermalManager.setTargetHotend(e_temp, filament_data.extruder);
348
               thermalManager.setTargetHotend(e_temp, filament_data.extruder);
349
               break;
349
               break;
350
           #endif
350
           #endif
351
-          #if HOTENDS >= 2
351
+          #if HAS_MULTI_HOTEND
352
             case VP_E1_FILAMENT_LOAD_UNLOAD:
352
             case VP_E1_FILAMENT_LOAD_UNLOAD:
353
               filament_data.extruder = ExtUI::extruder_t::E1;
353
               filament_data.extruder = ExtUI::extruder_t::E1;
354
               thermalManager.setTargetHotend(e_temp, filament_data.extruder);
354
               thermalManager.setTargetHotend(e_temp, filament_data.extruder);

+ 5
- 5
Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.cpp View File

122
   // VP_M117, for completeness, but it cannot be auto-uploaded.
122
   // VP_M117, for completeness, but it cannot be auto-uploaded.
123
   #if HAS_HOTEND
123
   #if HAS_HOTEND
124
     MKSLIST_E_ITEM(0) VP_E0_STATUS,
124
     MKSLIST_E_ITEM(0) VP_E0_STATUS,
125
-    #if HOTENDS >= 2
125
+    #if HAS_MULTI_HOTEND
126
       MKSLIST_E_ITEM(1) VP_E1_STATUS,
126
       MKSLIST_E_ITEM(1) VP_E1_STATUS,
127
     #endif
127
     #endif
128
   #endif
128
   #endif
567
     #endif
567
     #endif
568
   #endif
568
   #endif
569
 
569
 
570
-  #if HOTENDS >= 2
570
+  #if HAS_MULTI_HOTEND
571
     VPHELPER(VP_T_E1_Is, &thermalManager.temp_hotend[1].celsius, nullptr, ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<0>),
571
     VPHELPER(VP_T_E1_Is, &thermalManager.temp_hotend[1].celsius, nullptr, ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<0>),
572
     VPHELPER(VP_T_E1_Set, &thermalManager.temp_hotend[1].target, ScreenHandler.HandleTemperatureChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
572
     VPHELPER(VP_T_E1_Set, &thermalManager.temp_hotend[1].target, ScreenHandler.HandleTemperatureChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
573
     VPHELPER(VP_Flowrate_E1, &planner.flow_percentage[ExtUI::extruder_t::E1], ScreenHandler.HandleFlowRateChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
573
     VPHELPER(VP_Flowrate_E1, &planner.flow_percentage[ExtUI::extruder_t::E1], ScreenHandler.HandleFlowRateChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
656
 
656
 
657
   #if HAS_HOTEND
657
   #if HAS_HOTEND
658
     VPHELPER(VP_E0_MAX_SPEED, &planner.settings.max_feedrate_mm_s[E_AXIS_N(0)], ScreenHandler.HandleExtruderMaxSpeedChange_MKS, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
658
     VPHELPER(VP_E0_MAX_SPEED, &planner.settings.max_feedrate_mm_s[E_AXIS_N(0)], ScreenHandler.HandleExtruderMaxSpeedChange_MKS, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
659
-    #if HOTENDS >= 2
659
+    #if HAS_MULTI_HOTEND
660
       VPHELPER(VP_E1_MAX_SPEED, &planner.settings.max_feedrate_mm_s[E_AXIS_N(1)], ScreenHandler.HandleExtruderMaxSpeedChange_MKS, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
660
       VPHELPER(VP_E1_MAX_SPEED, &planner.settings.max_feedrate_mm_s[E_AXIS_N(1)], ScreenHandler.HandleExtruderMaxSpeedChange_MKS, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
661
     #endif
661
     #endif
662
   #endif
662
   #endif
667
 
667
 
668
   #if HAS_HOTEND
668
   #if HAS_HOTEND
669
     VPHELPER(VP_E0_ACC_MAX_SPEED, (uint16_t *)&planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(0)], ScreenHandler.HandleExtruderAccChange_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
669
     VPHELPER(VP_E0_ACC_MAX_SPEED, (uint16_t *)&planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(0)], ScreenHandler.HandleExtruderAccChange_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
670
-    #if HOTENDS >= 2
670
+    #if HAS_MULTI_HOTEND
671
       VPHELPER(VP_E1_ACC_MAX_SPEED, (uint16_t *)&planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(1)], ScreenHandler.HandleExtruderAccChange_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
671
       VPHELPER(VP_E1_ACC_MAX_SPEED, (uint16_t *)&planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(1)], ScreenHandler.HandleExtruderAccChange_MKS, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
672
     #endif
672
     #endif
673
   #endif
673
   #endif
744
 
744
 
745
   #if HAS_HOTEND
745
   #if HAS_HOTEND
746
     VPHELPER(VP_E0_STEP_PER_MM, &planner.settings.axis_steps_per_mm[E_AXIS_N(0)], ScreenHandler.HandleStepPerMMExtruderChanged_MKS, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
746
     VPHELPER(VP_E0_STEP_PER_MM, &planner.settings.axis_steps_per_mm[E_AXIS_N(0)], ScreenHandler.HandleStepPerMMExtruderChanged_MKS, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
747
-    #if HOTENDS >= 2
747
+    #if HAS_MULTI_HOTEND
748
       VPHELPER(VP_E1_STEP_PER_MM, &planner.settings.axis_steps_per_mm[E_AXIS_N(1)], ScreenHandler.HandleStepPerMMExtruderChanged_MKS, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
748
       VPHELPER(VP_E1_STEP_PER_MM, &planner.settings.axis_steps_per_mm[E_AXIS_N(1)], ScreenHandler.HandleStepPerMMExtruderChanged_MKS, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<0>),
749
     #endif
749
     #endif
750
   #endif
750
   #endif

+ 5
- 5
Marlin/src/lcd/extui/dgus/origin/DGUSDisplayDef.cpp View File

57
 const uint16_t VPList_Temp[] PROGMEM = {
57
 const uint16_t VPList_Temp[] PROGMEM = {
58
   #if HAS_HOTEND
58
   #if HAS_HOTEND
59
     VP_T_E0_Is, VP_T_E0_Set,
59
     VP_T_E0_Is, VP_T_E0_Set,
60
-    #if HOTENDS >= 2
60
+    #if HAS_MULTI_HOTEND
61
       VP_T_E1_Is, VP_T_E1_Set,
61
       VP_T_E1_Is, VP_T_E1_Set,
62
     #endif
62
     #endif
63
   #endif
63
   #endif
71
   // VP_M117, for completeness, but it cannot be auto-uploaded
71
   // VP_M117, for completeness, but it cannot be auto-uploaded
72
   #if HAS_HOTEND
72
   #if HAS_HOTEND
73
     VP_T_E0_Is, VP_T_E0_Set,
73
     VP_T_E0_Is, VP_T_E0_Set,
74
-    #if HOTENDS >= 2
74
+    #if HAS_MULTI_HOTEND
75
       VP_T_E1_Is, VP_T_E1_Set,
75
       VP_T_E1_Is, VP_T_E1_Set,
76
     #endif
76
     #endif
77
   #endif
77
   #endif
92
   // VP_M117, for completeness, but it cannot be auto-uploaded
92
   // VP_M117, for completeness, but it cannot be auto-uploaded
93
   #if HAS_HOTEND
93
   #if HAS_HOTEND
94
     VP_Flowrate_E0,
94
     VP_Flowrate_E0,
95
-    #if HOTENDS >= 2
95
+    #if HAS_MULTI_HOTEND
96
       VP_Flowrate_E1,
96
       VP_Flowrate_E1,
97
     #endif
97
     #endif
98
   #endif
98
   #endif
182
       VPHELPER(VP_E0_FILAMENT_LOAD_UNLOAD, nullptr, ScreenHandler.HandleFilamentOption, ScreenHandler.HandleFilamentLoadUnload),
182
       VPHELPER(VP_E0_FILAMENT_LOAD_UNLOAD, nullptr, ScreenHandler.HandleFilamentOption, ScreenHandler.HandleFilamentLoadUnload),
183
     #endif
183
     #endif
184
   #endif
184
   #endif
185
-  #if HOTENDS >= 2
185
+  #if HAS_MULTI_HOTEND
186
     VPHELPER(VP_T_E1_Is, &thermalManager.temp_hotend[1].celsius, nullptr, ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<0>),
186
     VPHELPER(VP_T_E1_Is, &thermalManager.temp_hotend[1].celsius, nullptr, ScreenHandler.DGUSLCD_SendFloatAsLongValueToDisplay<0>),
187
     VPHELPER(VP_T_E1_Set, &thermalManager.temp_hotend[1].target, ScreenHandler.HandleTemperatureChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
187
     VPHELPER(VP_T_E1_Set, &thermalManager.temp_hotend[1].target, ScreenHandler.HandleTemperatureChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
188
     VPHELPER(VP_Flowrate_E1, nullptr, ScreenHandler.HandleFlowRateChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
188
     VPHELPER(VP_Flowrate_E1, nullptr, ScreenHandler.HandleFlowRateChanged, ScreenHandler.DGUSLCD_SendWordValueToDisplay),
237
   VPHELPER(VP_Z_STEP_PER_MM, &planner.settings.axis_steps_per_mm[Z_AXIS], ScreenHandler.HandleStepPerMMChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<1>),
237
   VPHELPER(VP_Z_STEP_PER_MM, &planner.settings.axis_steps_per_mm[Z_AXIS], ScreenHandler.HandleStepPerMMChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<1>),
238
   #if HAS_HOTEND
238
   #if HAS_HOTEND
239
     VPHELPER(VP_E0_STEP_PER_MM, &planner.settings.axis_steps_per_mm[E_AXIS_N(0)], ScreenHandler.HandleStepPerMMExtruderChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<1>),
239
     VPHELPER(VP_E0_STEP_PER_MM, &planner.settings.axis_steps_per_mm[E_AXIS_N(0)], ScreenHandler.HandleStepPerMMExtruderChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<1>),
240
-    #if HOTENDS >= 2
240
+    #if HAS_MULTI_HOTEND
241
       VPHELPER(VP_E1_STEP_PER_MM, &planner.settings.axis_steps_per_mm[E_AXIS_N(1)], ScreenHandler.HandleStepPerMMExtruderChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<1>),
241
       VPHELPER(VP_E1_STEP_PER_MM, &planner.settings.axis_steps_per_mm[E_AXIS_N(1)], ScreenHandler.HandleStepPerMMExtruderChanged, ScreenHandler.DGUSLCD_SendFloatAsIntValueToDisplay<1>),
242
     #endif
242
     #endif
243
   #endif
243
   #endif

+ 3
- 3
Marlin/src/lcd/extui/dgus/origin/DGUSScreenHandler.cpp View File

256
           case VP_E0_PID_I: newvalue = scalePID_i(value); break;
256
           case VP_E0_PID_I: newvalue = scalePID_i(value); break;
257
           case VP_E0_PID_D: newvalue = scalePID_d(value); break;
257
           case VP_E0_PID_D: newvalue = scalePID_d(value); break;
258
         #endif
258
         #endif
259
-        #if HOTENDS >= 2
259
+        #if HAS_MULTI_HOTEND
260
           case VP_E1_PID_P: newvalue = value; break;
260
           case VP_E1_PID_P: newvalue = value; break;
261
           case VP_E1_PID_I: newvalue = scalePID_i(value); break;
261
           case VP_E1_PID_I: newvalue = scalePID_i(value); break;
262
           case VP_E1_PID_D: newvalue = scalePID_d(value); break;
262
           case VP_E1_PID_D: newvalue = scalePID_d(value); break;
333
     if (filament_data.action == 0) { // Go back to utility screen
333
     if (filament_data.action == 0) { // Go back to utility screen
334
       #if HAS_HOTEND
334
       #if HAS_HOTEND
335
         thermalManager.setTargetHotend(e_temp, ExtUI::extruder_t::E0);
335
         thermalManager.setTargetHotend(e_temp, ExtUI::extruder_t::E0);
336
-        #if HOTENDS >= 2
336
+        #if HAS_MULTI_HOTEND
337
           thermalManager.setTargetHotend(e_temp, ExtUI::extruder_t::E1);
337
           thermalManager.setTargetHotend(e_temp, ExtUI::extruder_t::E1);
338
         #endif
338
         #endif
339
       #endif
339
       #endif
348
               thermalManager.setTargetHotend(e_temp, filament_data.extruder);
348
               thermalManager.setTargetHotend(e_temp, filament_data.extruder);
349
               break;
349
               break;
350
           #endif
350
           #endif
351
-          #if HOTENDS >= 2
351
+          #if HAS_MULTI_HOTEND
352
             case VP_E1_FILAMENT_LOAD_UNLOAD:
352
             case VP_E1_FILAMENT_LOAD_UNLOAD:
353
               filament_data.extruder = ExtUI::extruder_t::E1;
353
               filament_data.extruder = ExtUI::extruder_t::E1;
354
               thermalManager.setTargetHotend(e_temp, filament_data.extruder);
354
               thermalManager.setTargetHotend(e_temp, filament_data.extruder);

+ 6
- 6
Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp View File

327
     case DGUS_Addr::TEMP_SetTarget_H0:
327
     case DGUS_Addr::TEMP_SetTarget_H0:
328
       ExtUI::setTargetTemp_celsius(temp, ExtUI::H0);
328
       ExtUI::setTargetTemp_celsius(temp, ExtUI::H0);
329
       break;
329
       break;
330
-    #if HOTENDS > 1
330
+    #if HAS_MULTI_HOTEND
331
       case DGUS_Addr::TEMP_SetTarget_H1:
331
       case DGUS_Addr::TEMP_SetTarget_H1:
332
         ExtUI::setTargetTemp_celsius(temp, ExtUI::H1);
332
         ExtUI::setTargetTemp_celsius(temp, ExtUI::H1);
333
         break;
333
         break;
347
     case DGUS_Data::Heater::ALL:
347
     case DGUS_Data::Heater::ALL:
348
       ExtUI::setTargetTemp_celsius(0, ExtUI::BED);
348
       ExtUI::setTargetTemp_celsius(0, ExtUI::BED);
349
       ExtUI::setTargetTemp_celsius(0, ExtUI::H0);
349
       ExtUI::setTargetTemp_celsius(0, ExtUI::H0);
350
-      #if HOTENDS > 1
350
+      #if HAS_MULTI_HOTEND
351
         ExtUI::setTargetTemp_celsius(0, ExtUI::H1);
351
         ExtUI::setTargetTemp_celsius(0, ExtUI::H1);
352
       #endif
352
       #endif
353
       break;
353
       break;
357
     case DGUS_Data::Heater::H0:
357
     case DGUS_Data::Heater::H0:
358
       ExtUI::setTargetTemp_celsius(0, ExtUI::H0);
358
       ExtUI::setTargetTemp_celsius(0, ExtUI::H0);
359
       break;
359
       break;
360
-    #if HOTENDS > 1
360
+    #if HAS_MULTI_HOTEND
361
       case DGUS_Data::Heater::H1:
361
       case DGUS_Data::Heater::H1:
362
         ExtUI::setTargetTemp_celsius(0, ExtUI::H1);
362
         ExtUI::setTargetTemp_celsius(0, ExtUI::H1);
363
         break;
363
         break;
827
       dgus_screen_handler.pid_heater = heater;
827
       dgus_screen_handler.pid_heater = heater;
828
       break;
828
       break;
829
     case DGUS_Data::Heater::H0:
829
     case DGUS_Data::Heater::H0:
830
-    #if HOTENDS > 1
830
+    #if HAS_MULTI_HOTEND
831
       case DGUS_Data::Heater::H1:
831
       case DGUS_Data::Heater::H1:
832
     #endif
832
     #endif
833
       dgus_screen_handler.pid_temp = DGUS_PLA_TEMP_HOTEND;
833
       dgus_screen_handler.pid_temp = DGUS_PLA_TEMP_HOTEND;
858
     case DGUS_Data::Heater::H0:
858
     case DGUS_Data::Heater::H0:
859
       temp = constrain(temp, HEATER_0_MINTEMP, (HEATER_0_MAXTEMP - HOTEND_OVERSHOOT));
859
       temp = constrain(temp, HEATER_0_MINTEMP, (HEATER_0_MAXTEMP - HOTEND_OVERSHOOT));
860
       break;
860
       break;
861
-    #if HOTENDS > 1
861
+    #if HAS_MULTI_HOTEND
862
       case DGUS_Data::Heater::H1:
862
       case DGUS_Data::Heater::H1:
863
         temp = constrain(temp, HEATER_1_MINTEMP, (HEATER_1_MAXTEMP - HOTEND_OVERSHOOT));
863
         temp = constrain(temp, HEATER_1_MINTEMP, (HEATER_1_MAXTEMP - HOTEND_OVERSHOOT));
864
         break;
864
         break;
900
         dgus_screen_handler.SetStatusMessage(F("PID disabled"));
900
         dgus_screen_handler.SetStatusMessage(F("PID disabled"));
901
         return;
901
         return;
902
       #endif
902
       #endif
903
-    #if HOTENDS > 1
903
+    #if HAS_MULTI_HOTEND
904
       case DGUS_Data::Heater::H1:
904
       case DGUS_Data::Heater::H1:
905
         #if ENABLED(PIDTEMP)
905
         #if ENABLED(PIDTEMP)
906
           heater = H_E1;
906
           heater = H_E1;

+ 4
- 4
Marlin/src/lcd/extui/dgus_reloaded/DGUSTxHandler.cpp View File

275
     case DGUS_Addr::TEMP_Max_H0:
275
     case DGUS_Addr::TEMP_Max_H0:
276
       temp = HEATER_0_MAXTEMP - HOTEND_OVERSHOOT;
276
       temp = HEATER_0_MAXTEMP - HOTEND_OVERSHOOT;
277
       break;
277
       break;
278
-    #if HOTENDS > 1
278
+    #if HAS_MULTI_HOTEND
279
       case DGUS_Addr::TEMP_Max_H1:
279
       case DGUS_Addr::TEMP_Max_H1:
280
         temp = HEATER_1_MAXTEMP - HOTEND_OVERSHOOT;
280
         temp = HEATER_1_MAXTEMP - HOTEND_OVERSHOOT;
281
         break;
281
         break;
428
       case DGUS_Data::Heater::H0:
428
       case DGUS_Data::Heater::H0:
429
         value = ExtUI::getPIDValues_Kp(ExtUI::E0);
429
         value = ExtUI::getPIDValues_Kp(ExtUI::E0);
430
         break;
430
         break;
431
-      #if HOTENDS > 1
431
+      #if HAS_MULTI_HOTEND
432
         case DGUS_Data::Heater::H1:
432
         case DGUS_Data::Heater::H1:
433
           value = ExtUI::getPIDValues_Kp(ExtUI::E1);
433
           value = ExtUI::getPIDValues_Kp(ExtUI::E1);
434
           break;
434
           break;
454
       case DGUS_Data::Heater::H0:
454
       case DGUS_Data::Heater::H0:
455
         value = ExtUI::getPIDValues_Ki(ExtUI::E0);
455
         value = ExtUI::getPIDValues_Ki(ExtUI::E0);
456
         break;
456
         break;
457
-      #if HOTENDS > 1
457
+      #if HAS_MULTI_HOTEND
458
         case DGUS_Data::Heater::H1:
458
         case DGUS_Data::Heater::H1:
459
           value = ExtUI::getPIDValues_Ki(ExtUI::E1);
459
           value = ExtUI::getPIDValues_Ki(ExtUI::E1);
460
           break;
460
           break;
480
       case DGUS_Data::Heater::H0:
480
       case DGUS_Data::Heater::H0:
481
         value = ExtUI::getPIDValues_Kd(ExtUI::E0);
481
         value = ExtUI::getPIDValues_Kd(ExtUI::E0);
482
         break;
482
         break;
483
-      #if HOTENDS > 1
483
+      #if HAS_MULTI_HOTEND
484
         case DGUS_Data::Heater::H1:
484
         case DGUS_Data::Heater::H1:
485
           value = ExtUI::getPIDValues_Kd(ExtUI::E1);
485
           value = ExtUI::getPIDValues_Kd(ExtUI::E1);
486
           break;
486
           break;

+ 2
- 2
Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Addr.h View File

64
   TEMP_Preset               = 0x2010, // Popup / Data: DGUS_Data::TempPreset
64
   TEMP_Preset               = 0x2010, // Popup / Data: DGUS_Data::TempPreset
65
   TEMP_SetTarget_Bed        = 0x2011, // Type: Integer (16 bits signed)
65
   TEMP_SetTarget_Bed        = 0x2011, // Type: Integer (16 bits signed)
66
   TEMP_SetTarget_H0         = 0x2012, // Type: Integer (16 bits signed)
66
   TEMP_SetTarget_H0         = 0x2012, // Type: Integer (16 bits signed)
67
-  #if HOTENDS > 1
67
+  #if HAS_MULTI_HOTEND
68
     TEMP_SetTarget_H1       = 0x2013, // Type: Integer (16 bits signed)
68
     TEMP_SetTarget_H1       = 0x2013, // Type: Integer (16 bits signed)
69
   #endif
69
   #endif
70
   TEMP_Cool                 = 0x2014, // Data: DGUS_Data::Heater
70
   TEMP_Cool                 = 0x2014, // Data: DGUS_Data::Heater
123
   TEMP_Current_H0           = 0x30FF, // Type: Integer (16 bits signed)
123
   TEMP_Current_H0           = 0x30FF, // Type: Integer (16 bits signed)
124
   TEMP_Target_H0            = 0x3100, // Type: Integer (16 bits signed)
124
   TEMP_Target_H0            = 0x3100, // Type: Integer (16 bits signed)
125
   TEMP_Max_H0               = 0x3101, // Type: Integer (16 bits unsigned)
125
   TEMP_Max_H0               = 0x3101, // Type: Integer (16 bits unsigned)
126
-  #if HOTENDS > 1
126
+  #if HAS_MULTI_HOTEND
127
     TEMP_Current_H1         = 0x3102, // Type: Integer (16 bits signed)
127
     TEMP_Current_H1         = 0x3102, // Type: Integer (16 bits signed)
128
     TEMP_Target_H1          = 0x3103, // Type: Integer (16 bits signed)
128
     TEMP_Target_H1          = 0x3103, // Type: Integer (16 bits signed)
129
     TEMP_Max_H1             = 0x3104, // Type: Integer (16 bits unsigned)
129
     TEMP_Max_H1             = 0x3104, // Type: Integer (16 bits unsigned)

+ 2
- 2
Marlin/src/lcd/extui/dgus_reloaded/definition/DGUS_VPList.cpp View File

102
   VP_HELPER_RX(DGUS_Addr::TEMP_Preset,        &DGUSRxHandler::TempPreset),
102
   VP_HELPER_RX(DGUS_Addr::TEMP_Preset,        &DGUSRxHandler::TempPreset),
103
   VP_HELPER_RX(DGUS_Addr::TEMP_SetTarget_Bed, &DGUSRxHandler::TempTarget),
103
   VP_HELPER_RX(DGUS_Addr::TEMP_SetTarget_Bed, &DGUSRxHandler::TempTarget),
104
   VP_HELPER_RX(DGUS_Addr::TEMP_SetTarget_H0,  &DGUSRxHandler::TempTarget),
104
   VP_HELPER_RX(DGUS_Addr::TEMP_SetTarget_H0,  &DGUSRxHandler::TempTarget),
105
-  #if HOTENDS > 1
105
+  #if HAS_MULTI_HOTEND
106
     VP_HELPER_RX(DGUS_Addr::TEMP_SetTarget_H1,  &DGUSRxHandler::TempTarget),
106
     VP_HELPER_RX(DGUS_Addr::TEMP_SetTarget_H1,  &DGUSRxHandler::TempTarget),
107
   #endif
107
   #endif
108
   VP_HELPER_RX(DGUS_Addr::TEMP_Cool,          &DGUSRxHandler::TempCool),
108
   VP_HELPER_RX(DGUS_Addr::TEMP_Cool,          &DGUSRxHandler::TempCool),
217
                     &thermalManager.temp_hotend[ExtUI::heater_t::H0].target,
217
                     &thermalManager.temp_hotend[ExtUI::heater_t::H0].target,
218
                     &DGUSTxHandler::ExtraToInteger<int16_t>),
218
                     &DGUSTxHandler::ExtraToInteger<int16_t>),
219
   VP_HELPER_TX(DGUS_Addr::TEMP_Max_H0, &DGUSTxHandler::TempMax),
219
   VP_HELPER_TX(DGUS_Addr::TEMP_Max_H0, &DGUSTxHandler::TempMax),
220
-  #if HOTENDS > 1
220
+  #if HAS_MULTI_HOTEND
221
     VP_HELPER_TX_AUTO(DGUS_Addr::TEMP_Current_H1,
221
     VP_HELPER_TX_AUTO(DGUS_Addr::TEMP_Current_H1,
222
                       &thermalManager.temp_hotend[ExtUI::heater_t::H1].celsius,
222
                       &thermalManager.temp_hotend[ExtUI::heater_t::H1].celsius,
223
                       &DGUSTxHandler::ExtraToInteger<float>),
223
                       &DGUSTxHandler::ExtraToInteger<float>),

+ 4
- 3
Marlin/src/lcd/menu/menu_temperature.cpp View File

122
 
122
 
123
         HOTEND_LOOP() PREHEAT_ITEMS(editable.int8, e);
123
         HOTEND_LOOP() PREHEAT_ITEMS(editable.int8, e);
124
         ACTION_ITEM_S(ui.get_preheat_label(m), MSG_PREHEAT_M_ALL, []() {
124
         ACTION_ITEM_S(ui.get_preheat_label(m), MSG_PREHEAT_M_ALL, []() {
125
-          HOTEND_LOOP() thermalManager.setTargetHotend(ui.material_preset[editable.int8].hotend_temp, e);
125
+          const celsius_t t = ui.material_preset[editable.int8].hotend_temp;
126
+          HOTEND_LOOP() thermalManager.setTargetHotend(t, e);
126
           TERN(HAS_HEATED_BED, _preheat_bed(editable.int8), ui.return_to_status());
127
           TERN(HAS_HEATED_BED, _preheat_bed(editable.int8), ui.return_to_status());
127
         });
128
         });
128
 
129
 
268
     //
269
     //
269
     LOOP_L_N(m, PREHEAT_COUNT) {
270
     LOOP_L_N(m, PREHEAT_COUNT) {
270
       editable.int8 = m;
271
       editable.int8 = m;
271
-      #if HOTENDS > 1 || HAS_HEATED_BED
272
+      #if HAS_MULTI_HOTEND || HAS_HEATED_BED
272
         SUBMENU_S(ui.get_preheat_label(m), MSG_PREHEAT_M, menu_preheat_m);
273
         SUBMENU_S(ui.get_preheat_label(m), MSG_PREHEAT_M, menu_preheat_m);
273
       #elif HAS_HOTEND
274
       #elif HAS_HOTEND
274
         ACTION_ITEM_S(ui.get_preheat_label(m), MSG_PREHEAT_M, do_preheat_end_m);
275
         ACTION_ITEM_S(ui.get_preheat_label(m), MSG_PREHEAT_M, do_preheat_end_m);
295
 
296
 
296
     LOOP_L_N(m, PREHEAT_COUNT) {
297
     LOOP_L_N(m, PREHEAT_COUNT) {
297
       editable.int8 = m;
298
       editable.int8 = m;
298
-      #if HOTENDS > 1 || HAS_HEATED_BED
299
+      #if HAS_MULTI_HOTEND || HAS_HEATED_BED
299
         SUBMENU_S(ui.get_preheat_label(m), MSG_PREHEAT_M, menu_preheat_m);
300
         SUBMENU_S(ui.get_preheat_label(m), MSG_PREHEAT_M, menu_preheat_m);
300
       #else
301
       #else
301
         ACTION_ITEM_S(ui.get_preheat_label(m), MSG_PREHEAT_M, do_preheat_end_m);
302
         ACTION_ITEM_S(ui.get_preheat_label(m), MSG_PREHEAT_M, do_preheat_end_m);

+ 2
- 2
Marlin/src/lcd/tft/ui_common.h View File

57
 
57
 
58
 #define ABSOLUTE_ZERO     -273.15
58
 #define ABSOLUTE_ZERO     -273.15
59
 
59
 
60
-#if HAS_TEMP_CHAMBER && HOTENDS > 1
60
+#if HAS_TEMP_CHAMBER && HAS_MULTI_HOTEND
61
   #define ITEM_E0         0
61
   #define ITEM_E0         0
62
   #define ITEM_E1         1
62
   #define ITEM_E1         1
63
   #define ITEM_BED        2
63
   #define ITEM_BED        2
74
   #define ITEM_COOLER     0
74
   #define ITEM_COOLER     0
75
   #define ITEM_FAN        1
75
   #define ITEM_FAN        1
76
   #define ITEMS_COUNT     2
76
   #define ITEMS_COUNT     2
77
-#elif HOTENDS > 1
77
+#elif HAS_MULTI_HOTEND
78
   #define ITEM_E0         0
78
   #define ITEM_E0         0
79
   #define ITEM_E1         1
79
   #define ITEM_E1         1
80
   #define ITEM_BED        2
80
   #define ITEM_BED        2

+ 1
- 1
Marlin/src/pins/esp32/pins_E4D.h View File

32
 
32
 
33
 #if EXTRUDERS > 1 || E_STEPPERS > 1
33
 #if EXTRUDERS > 1 || E_STEPPERS > 1
34
   #error "E4d@box only supports one E Stepper. Comment out this line to continue."
34
   #error "E4d@box only supports one E Stepper. Comment out this line to continue."
35
-#elif HOTENDS > 1
35
+#elif HAS_MULTI_HOTEND
36
   #error "E4d@box only supports one hotend / E-stepper. Comment out this line to continue."
36
   #error "E4d@box only supports one hotend / E-stepper. Comment out this line to continue."
37
 #endif
37
 #endif
38
 
38
 

+ 1
- 1
Marlin/src/pins/esp32/pins_FYSETC_E4.h View File

32
 
32
 
33
 #if EXTRUDERS > 1 || E_STEPPERS > 1
33
 #if EXTRUDERS > 1 || E_STEPPERS > 1
34
   #error "FYSETC E4 only supports one E Stepper. Comment out this line to continue."
34
   #error "FYSETC E4 only supports one E Stepper. Comment out this line to continue."
35
-#elif HOTENDS > 1
35
+#elif HAS_MULTI_HOTEND
36
   #error "FYSETC E4 only supports one hotend / E-stepper. Comment out this line to continue."
36
   #error "FYSETC E4 only supports one hotend / E-stepper. Comment out this line to continue."
37
 #endif
37
 #endif
38
 
38
 

+ 1
- 1
Marlin/src/pins/esp32/pins_MRR_ESPA.h View File

32
 
32
 
33
 #if EXTRUDERS > 1 || E_STEPPERS > 1
33
 #if EXTRUDERS > 1 || E_STEPPERS > 1
34
   #error "MRR ESPA only supports one E Stepper. Comment out this line to continue."
34
   #error "MRR ESPA only supports one E Stepper. Comment out this line to continue."
35
-#elif HOTENDS > 1
35
+#elif HAS_MULTI_HOTEND
36
   #error "MRR ESPA only supports one hotend / E-stepper. Comment out this line to continue."
36
   #error "MRR ESPA only supports one hotend / E-stepper. Comment out this line to continue."
37
 #endif
37
 #endif
38
 
38
 

+ 1
- 1
Marlin/src/pins/esp32/pins_MRR_ESPE.h View File

33
 
33
 
34
 #if EXTRUDERS > 2 || E_STEPPERS > 2
34
 #if EXTRUDERS > 2 || E_STEPPERS > 2
35
   #error "MRR ESPE only supports two E Steppers. Comment out this line to continue."
35
   #error "MRR ESPE only supports two E Steppers. Comment out this line to continue."
36
-#elif HOTENDS > 1
36
+#elif HAS_MULTI_HOTEND
37
   #error "MRR ESPE only supports one hotend / E-stepper. Comment out this line to continue."
37
   #error "MRR ESPE only supports one hotend / E-stepper. Comment out this line to continue."
38
 #endif
38
 #endif
39
 
39
 

+ 1
- 1
Marlin/src/pins/ramps/pins_K8600.h View File

25
  * VERTEX NANO Arduino Mega with RAMPS EFB v1.4 pin assignments.
25
  * VERTEX NANO Arduino Mega with RAMPS EFB v1.4 pin assignments.
26
  */
26
  */
27
 
27
 
28
-#if HOTENDS > 1
28
+#if HAS_MULTI_HOTEND
29
   #error "Only 1 hotend is supported for Vertex Nano."
29
   #error "Only 1 hotend is supported for Vertex Nano."
30
 #endif
30
 #endif
31
 
31
 

+ 1
- 1
Marlin/src/pins/ramps/pins_LONGER3D_LKx_PRO.h View File

28
 #define REQUIRE_MEGA2560
28
 #define REQUIRE_MEGA2560
29
 #include "env_validate.h"
29
 #include "env_validate.h"
30
 
30
 
31
-#if HOTENDS > 1 || E_STEPPERS > 1
31
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
32
   #error "Longer3D LGT KIT V1.0 board only supports one hotend / E-stepper. Comment out this line to continue."
32
   #error "Longer3D LGT KIT V1.0 board only supports one hotend / E-stepper. Comment out this line to continue."
33
 #endif
33
 #endif
34
 
34
 

+ 1
- 1
Marlin/src/pins/ramps/pins_RAMPS_ENDER_4.h View File

21
  */
21
  */
22
 #pragma once
22
 #pragma once
23
 
23
 
24
-#if HOTENDS > 1 || E_STEPPERS > 1
24
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
25
   #error "Ender-4 only supports one hotend / E-stepper. Comment out this line to continue."
25
   #error "Ender-4 only supports one hotend / E-stepper. Comment out this line to continue."
26
 #endif
26
 #endif
27
 
27
 

+ 1
- 1
Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h View File

23
 
23
 
24
 #include "env_validate.h"
24
 #include "env_validate.h"
25
 
25
 
26
-#if HOTENDS > 1 || E_STEPPERS > 1
26
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
27
   #error "CCROBOT-ONLINE MEEB_3DP only supports one hotend / E-stepper. Comment out this line to continue."
27
   #error "CCROBOT-ONLINE MEEB_3DP only supports one hotend / E-stepper. Comment out this line to continue."
28
 #endif
28
 #endif
29
 
29
 

+ 1
- 1
Marlin/src/pins/stm32f1/pins_CREALITY_V4.h View File

27
 
27
 
28
 #include "env_validate.h"
28
 #include "env_validate.h"
29
 
29
 
30
-#if HOTENDS > 1 || E_STEPPERS > 1
30
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
31
   #error "Creality V4 only supports one hotend / E-stepper. Comment out this line to continue."
31
   #error "Creality V4 only supports one hotend / E-stepper. Comment out this line to continue."
32
 #endif
32
 #endif
33
 
33
 

+ 1
- 1
Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h View File

27
 
27
 
28
 #include "env_validate.h"
28
 #include "env_validate.h"
29
 
29
 
30
-#if HOTENDS > 1 || E_STEPPERS > 1
30
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
31
   #error "CREALITY supports up to 1 hotends / E-steppers. Comment out this line to continue."
31
   #error "CREALITY supports up to 1 hotends / E-steppers. Comment out this line to continue."
32
 #endif
32
 #endif
33
 
33
 

+ 1
- 1
Marlin/src/pins/stm32f1/pins_CREALITY_V452.h View File

25
  * Creality v4.5.2 (STM32F103RET6) board pin assignments
25
  * Creality v4.5.2 (STM32F103RET6) board pin assignments
26
  */
26
  */
27
 
27
 
28
-#if HOTENDS > 1 || E_STEPPERS > 1
28
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
29
   #error "Creality v4.5.2 only supports one hotend / E-stepper. Comment out this line to continue."
29
   #error "Creality v4.5.2 only supports one hotend / E-stepper. Comment out this line to continue."
30
 #endif
30
 #endif
31
 
31
 

+ 1
- 1
Marlin/src/pins/stm32f1/pins_CREALITY_V453.h View File

25
  * Creality v4.5.3 (STM32F103RET6) board pin assignments
25
  * Creality v4.5.3 (STM32F103RET6) board pin assignments
26
  */
26
  */
27
 
27
 
28
-#if HOTENDS > 1 || E_STEPPERS > 1
28
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
29
   #error "Creality v4.5.3 only supports one hotend / E-stepper. Comment out this line to continue."
29
   #error "Creality v4.5.3 only supports one hotend / E-stepper. Comment out this line to continue."
30
 #endif
30
 #endif
31
 
31
 

+ 1
- 1
Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h View File

31
 
31
 
32
 #if NOT_TARGET(__STM32F1__, STM32F1xx)
32
 #if NOT_TARGET(__STM32F1__, STM32F1xx)
33
   #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
33
   #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
34
-#elif HOTENDS > 1 || E_STEPPERS > 1
34
+#elif HAS_MULTI_HOTEND || E_STEPPERS > 1
35
   #error "FLSUN HiSpeedV1 only supports one hotend / E-stepper. Comment out this line to continue."
35
   #error "FLSUN HiSpeedV1 only supports one hotend / E-stepper. Comment out this line to continue."
36
 #endif
36
 #endif
37
 
37
 

+ 1
- 1
Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h View File

32
 
32
 
33
 #include "env_validate.h"
33
 #include "env_validate.h"
34
 
34
 
35
-#if HOTENDS > 1 || E_STEPPERS > 1
35
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
36
   #error "JGAurora A5S A1 only supports one hotend / E-stepper. Comment out this line to continue."
36
   #error "JGAurora A5S A1 only supports one hotend / E-stepper. Comment out this line to continue."
37
 #endif
37
 #endif
38
 
38
 

+ 1
- 1
Marlin/src/pins/stm32f1/pins_LONGER3D_LK.h View File

27
 
27
 
28
 #if NOT_TARGET(__STM32F1__, STM32F1xx)
28
 #if NOT_TARGET(__STM32F1__, STM32F1xx)
29
   #error "Oops! Select a STM32F1 board in 'Tools > Board.'"
29
   #error "Oops! Select a STM32F1 board in 'Tools > Board.'"
30
-#elif HOTENDS > 1 || E_STEPPERS > 1
30
+#elif HAS_MULTI_HOTEND || E_STEPPERS > 1
31
   #error "Longer3D only supports one hotend / E-stepper. Comment out this line to continue."
31
   #error "Longer3D only supports one hotend / E-stepper. Comment out this line to continue."
32
 #endif
32
 #endif
33
 
33
 

+ 1
- 1
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3.h View File

25
  * MKS Robin E3 (STM32F103RCT6) board pin assignments
25
  * MKS Robin E3 (STM32F103RCT6) board pin assignments
26
  */
26
  */
27
 
27
 
28
-#if HOTENDS > 1 || E_STEPPERS > 1
28
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
29
   #error "MKS Robin E3 only supports one hotend / E-stepper. Comment out this line to continue."
29
   #error "MKS Robin E3 only supports one hotend / E-stepper. Comment out this line to continue."
30
 #endif
30
 #endif
31
 
31
 

+ 1
- 1
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3D.h View File

25
  * MKS Robin E3D (STM32F103RCT6) board pin assignments
25
  * MKS Robin E3D (STM32F103RCT6) board pin assignments
26
  */
26
  */
27
 
27
 
28
-#if HOTENDS > 1 || E_STEPPERS > 1
28
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
29
   #error "MKS Robin E3D only supports one hotend / E-stepper. Comment out this line to continue."
29
   #error "MKS Robin E3D only supports one hotend / E-stepper. Comment out this line to continue."
30
 #endif
30
 #endif
31
 
31
 

+ 1
- 1
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3D_V1_1.h View File

25
  * MKS Robin E3D v1.1 (STM32F103RCT6) board pin assignments
25
  * MKS Robin E3D v1.1 (STM32F103RCT6) board pin assignments
26
  */
26
  */
27
 
27
 
28
-#if HOTENDS > 1 || E_STEPPERS > 1
28
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
29
   #error "MKS Robin E3D v1.1 only supports one hotend / E-stepper. Comment out this line to continue."
29
   #error "MKS Robin E3D v1.1 only supports one hotend / E-stepper. Comment out this line to continue."
30
 #endif
30
 #endif
31
 
31
 

+ 1
- 1
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h View File

27
 
27
 
28
 #include "env_validate.h"
28
 #include "env_validate.h"
29
 
29
 
30
-#if HOTENDS > 1 || E_STEPPERS > 1
30
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
31
   #error "MKS Robin E3P only supports one hotend / E-stepper. Comment out this line to continue."
31
   #error "MKS Robin E3P only supports one hotend / E-stepper. Comment out this line to continue."
32
 #elif HAS_FSMC_TFT
32
 #elif HAS_FSMC_TFT
33
   #error "MKS Robin E3P doesn't support FSMC-based TFT displays."
33
   #error "MKS Robin E3P doesn't support FSMC-based TFT displays."

+ 1
- 1
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_V1_1.h View File

25
  * MKS Robin E3 v1.1 (STM32F103RCT6) board pin assignments
25
  * MKS Robin E3 v1.1 (STM32F103RCT6) board pin assignments
26
  */
26
  */
27
 
27
 
28
-#if HOTENDS > 1 || E_STEPPERS > 1
28
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
29
   #error "MKS Robin E3 v1.1 only supports one hotend / E-stepper. Comment out this line to continue."
29
   #error "MKS Robin E3 v1.1 only supports one hotend / E-stepper. Comment out this line to continue."
30
 #endif
30
 #endif
31
 
31
 

+ 1
- 1
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h View File

23
 
23
 
24
 #include "env_validate.h"
24
 #include "env_validate.h"
25
 
25
 
26
-#if HOTENDS > 1 || E_STEPPERS > 1
26
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
27
   #error "MKS Robin Lite only supports one hotend / E-stepper. Comment out this line to continue."
27
   #error "MKS Robin Lite only supports one hotend / E-stepper. Comment out this line to continue."
28
 #endif
28
 #endif
29
 
29
 

+ 1
- 1
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h View File

27
 
27
 
28
 #include "env_validate.h"
28
 #include "env_validate.h"
29
 
29
 
30
-#if HOTENDS > 1 || E_STEPPERS > 1
30
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
31
   #error "MKS Robin mini only supports one hotend / E-stepper. Comment out this line to continue."
31
   #error "MKS Robin mini only supports one hotend / E-stepper. Comment out this line to continue."
32
 #endif
32
 #endif
33
 
33
 

+ 1
- 1
Marlin/src/pins/stm32f4/pins_ANET_ET4.h View File

23
 
23
 
24
 #include "env_validate.h"
24
 #include "env_validate.h"
25
 
25
 
26
-#if HOTENDS > 1 || E_STEPPERS > 1
26
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
27
   #error "Anet ET4 only supports one hotend / E-stepper. Comment out this line to continue."
27
   #error "Anet ET4 only supports one hotend / E-stepper. Comment out this line to continue."
28
 #endif
28
 #endif
29
 
29
 

+ 1
- 1
Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h View File

23
 
23
 
24
 #include "env_validate.h"
24
 #include "env_validate.h"
25
 
25
 
26
-#if HOTENDS > 1 || E_STEPPERS > 1
26
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
27
   #error "BIGTREE BTT002 V1.0 only supports one hotend / E-stepper. Comment out this line to continue."
27
   #error "BIGTREE BTT002 V1.0 only supports one hotend / E-stepper. Comment out this line to continue."
28
 #endif
28
 #endif
29
 
29
 

+ 1
- 1
Marlin/src/pins/stm32f4/pins_LERDGE_X.h View File

24
 #define ALLOW_STM32DUINO
24
 #define ALLOW_STM32DUINO
25
 #include "env_validate.h"
25
 #include "env_validate.h"
26
 
26
 
27
-#if HOTENDS > 1 || E_STEPPERS > 1
27
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
28
   #error "LERDGE X only supports one hotend / E-stepper. Comment out this line to continue."
28
   #error "LERDGE X only supports one hotend / E-stepper. Comment out this line to continue."
29
 #endif
29
 #endif
30
 
30
 

+ 1
- 1
Marlin/src/pins/stm32f7/pins_REMRAM_V1.h View File

32
   #define SRAM_EEPROM_EMULATION                   // Emulate the EEPROM using Backup SRAM
32
   #define SRAM_EEPROM_EMULATION                   // Emulate the EEPROM using Backup SRAM
33
 #endif
33
 #endif
34
 
34
 
35
-#if HOTENDS > 1 || E_STEPPERS > 1
35
+#if HAS_MULTI_HOTEND || E_STEPPERS > 1
36
   #error "RemRam only supports one hotend / E-stepper. Comment out this line to continue."
36
   #error "RemRam only supports one hotend / E-stepper. Comment out this line to continue."
37
 #endif
37
 #endif
38
 
38
 

Loading…
Cancel
Save