repeat preheat

Author: thinkyhead

Marlin/src/core/macros.h

@@ -712,10 +712,11 @@
     ( DEFER2(__RREPEAT2)()(ADD1(_RPT_I),SUB1(_RPT_N),_RPT_OP,V) ) \
     ( /* Do nothing */ )
 #define __RREPEAT2() _RREPEAT2
-#define RREPEAT_S(S,N,OP)        EVAL1024(_RREPEAT(S,SUB##S(N),OP))
-#define RREPEAT(N,OP)            RREPEAT_S(0,N,OP)
-#define RREPEAT2_S(S,N,OP,V...)  EVAL1024(_RREPEAT2(S,SUB##S(N),OP,V))
-#define RREPEAT2(N,OP,V...)      RREPEAT2_S(0,N,OP,V)
+#define RREPEAT_S(S,N,OP)       EVAL1024(_RREPEAT(S,SUB##S(N),OP))
+#define RREPEAT(N,OP)           RREPEAT_S(0,N,OP)
+#define RREPEAT_1(N,OP)         RREPEAT_S(1,INCREMENT(N),OP)
+#define RREPEAT2_S(S,N,OP,V...) EVAL1024(_RREPEAT2(S,SUB##S(N),OP,V))
+#define RREPEAT2(N,OP,V...)     RREPEAT2_S(0,N,OP,V)
 
 // Call OP(A) with each item as an argument
 #define _MAP(_MAP_OP,A,V...)       \

Marlin/src/lcd/marlinui.cpp

@@ -149,7 +149,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
     const preheat_t &pre = material_preset[m];
     TERN_(HAS_HOTEND,           if (TEST(pmask, PT_HOTEND))  thermalManager.setTargetHotend(pre.hotend_temp, e));
     TERN_(HAS_HEATED_BED,       if (TEST(pmask, PT_BED))     thermalManager.setTargetBed(pre.bed_temp));
-    //TERN_(HAS_HEATED_CHAMBER, if (TEST(pmask, PT_CHAMBER)) thermalManager.setTargetBed(pre.chamber_temp));
+    //TERN_(HAS_HEATED_CHAMBER, if (TEST(pmask, PT_CHAMBER)) thermalManager.setTargetChamber(pre.chamber_temp));
     TERN_(HAS_FAN,              if (TEST(pmask, PT_FAN))     thermalManager.set_fan_speed(0, pre.fan_speed));
   }
 #endif

Marlin/src/module/temperature.cpp

@@ -316,7 +316,6 @@ PGMSTR(str_t_heating_failed, STR_T_HEATING_FAILED);
 #endif
 
 #if HAS_HOTEND
-
   hotend_info_t Temperature::temp_hotend[HOTENDS];
   const celsius_t Temperature::hotend_maxtemp[HOTENDS] = ARRAY_BY_HOTENDS(HEATER_0_MAXTEMP, HEATER_1_MAXTEMP, HEATER_2_MAXTEMP, HEATER_3_MAXTEMP, HEATER_4_MAXTEMP, HEATER_5_MAXTEMP, HEATER_6_MAXTEMP, HEATER_7_MAXTEMP);
 
@@ -325,47 +324,15 @@ PGMSTR(str_t_heating_failed, STR_T_HEATING_FAILED);
     S >= 998 || M <= _MAX(TT_NAME(S)[0].celsius, TT_NAME(S)[COUNT(TT_NAME(S)) - 1].celsius) - HOTEND_OVERSHOOT, \
     "HEATER_" STRINGIFY(N) "_MAXTEMP (" STRINGIFY(M) ") is too high for thermistor_" STRINGIFY(S) ".h with HOTEND_OVERSHOOT=" STRINGIFY(HOTEND_OVERSHOOT) ".");
   #define CHECK_MAXTEMP(N) TERN(TEMP_SENSOR_##N##_IS_THERMISTOR, CHECK_MAXTEMP_, CODE_0)(N, HEATER_##N##_MAXTEMP, TEMP_SENSOR_##N)
-
   REPEAT(HOTENDS, CHECK_MAXTEMP)
 
-  #undef CHECK_MAXTEMP_
-  #undef CHECK_MAXTEMP
-
-  #define CHECK_PREHEAT_(N,P,T,M) static_assert(T <= M - HOTEND_OVERSHOOT, "PREHEAT_" STRINGIFY(P) "_TEMP_HOTEND (" STRINGIFY(T) ") must be less than HEATER_" STRINGIFY(N) "_MAXTEMP (" STRINGIFY(M) ") - " STRINGIFY(HOTEND_OVERSHOOT) ".");
-  #define CHECK_PREHEAT(N,P) CHECK_PREHEAT_(N,P,PREHEAT_##P##_TEMP_HOTEND,HEATER_##N##_MAXTEMP)
-  #if PREHEAT_1_TEMP_HOTEND
-    REPEAT2(HOTENDS, CHECK_PREHEAT, 1)
-  #endif
-  #if PREHEAT_2_TEMP_HOTEND
-    REPEAT2(HOTENDS, CHECK_PREHEAT, 2)
-  #endif
-  #if PREHEAT_3_TEMP_HOTEND
-    REPEAT2(HOTENDS, CHECK_PREHEAT, 3)
-  #endif
-  #if PREHEAT_4_TEMP_HOTEND
-    REPEAT2(HOTENDS, CHECK_PREHEAT, 4)
-  #endif
-  #if PREHEAT_5_TEMP_HOTEND
-    REPEAT2(HOTENDS, CHECK_PREHEAT, 5)
-  #endif
-  #if PREHEAT_6_TEMP_HOTEND
-    REPEAT2(HOTENDS, CHECK_PREHEAT, 6)
-  #endif
-  #if PREHEAT_7_TEMP_HOTEND
-    REPEAT2(HOTENDS, CHECK_PREHEAT, 7)
-  #endif
-  #if PREHEAT_8_TEMP_HOTEND
-    REPEAT2(HOTENDS, CHECK_PREHEAT, 8)
-  #endif
-  #if PREHEAT_9_TEMP_HOTEND
-    REPEAT2(HOTENDS, CHECK_PREHEAT, 9)
-  #endif
-  #if PREHEAT_10_TEMP_HOTEND
-    REPEAT2(HOTENDS, CHECK_PREHEAT, 10)
+  #if HAS_PREHEAT
+    #define CHECK_PREHEAT__(N,P,T,M) static_assert(T <= M - HOTEND_OVERSHOOT, "PREHEAT_" STRINGIFY(P) "_TEMP_HOTEND (" STRINGIFY(T) ") must be less than HEATER_" STRINGIFY(N) "_MAXTEMP (" STRINGIFY(M) ") - " STRINGIFY(HOTEND_OVERSHOOT) ".");
+    #define CHECK_PREHEAT_(N,P) CHECK_PREHEAT__(N, P, PREHEAT_##P##_TEMP_HOTEND, HEATER_##N##_MAXTEMP);
+    #define CHECK_PREHEAT(P) REPEAT2(HOTENDS, CHECK_PREHEAT_, P);
+    RREPEAT_1(PREHEAT_COUNT, CHECK_PREHEAT)
   #endif
 
-  #undef CHECK_PREHEAT_
-  #undef CHECK_PREHEAT
 #endif
 
 #if HAS_TEMP_REDUNDANT