Browse Source

Fix compile error with 6 hot-ends (#15405)

Ludy 5 years ago
parent
commit
a628d77798
2 changed files with 3 additions and 3 deletions
  1. 2
    2
      Marlin/src/lcd/extensible_ui/ui_api.cpp
  2. 1
    1
      Marlin/src/lcd/menu/menu.h

+ 2
- 2
Marlin/src/lcd/extensible_ui/ui_api.cpp View File

@@ -884,7 +884,7 @@ namespace ExtUI {
884 884
     #endif
885 885
       {
886 886
         #if HOTENDS
887
-          static constexpr int16_t heater_maxtemp[HOTENDS] = ARRAY_BY_HOTENDS(HEATER_0_MAXTEMP, HEATER_1_MAXTEMP, HEATER_2_MAXTEMP, HEATER_3_MAXTEMP, HEATER_4_MAXTEMP);
887
+          static constexpr int16_t heater_maxtemp[HOTENDS] = ARRAY_BY_HOTENDS(HEATER_0_MAXTEMP, HEATER_1_MAXTEMP, HEATER_2_MAXTEMP, HEATER_3_MAXTEMP, HEATER_4_MAXTEMP, HEATER_5_MAXTEMP);
888 888
           const int16_t e = heater - H0;
889 889
           thermalManager.setTargetHotend(constrain(value, 0, heater_maxtemp[e] - 15), e);
890 890
         #endif
@@ -893,7 +893,7 @@ namespace ExtUI {
893 893
 
894 894
   void setTargetTemp_celsius(float value, const extruder_t extruder) {
895 895
     #if HOTENDS
896
-      constexpr int16_t heater_maxtemp[HOTENDS] = ARRAY_BY_HOTENDS(HEATER_0_MAXTEMP, HEATER_1_MAXTEMP, HEATER_2_MAXTEMP, HEATER_3_MAXTEMP, HEATER_4_MAXTEMP);
896
+      constexpr int16_t heater_maxtemp[HOTENDS] = ARRAY_BY_HOTENDS(HEATER_0_MAXTEMP, HEATER_1_MAXTEMP, HEATER_2_MAXTEMP, HEATER_3_MAXTEMP, HEATER_4_MAXTEMP, HEATER_5_MAXTEMP);
897 897
       const int16_t e = extruder - E0;
898 898
       enableHeater(extruder);
899 899
       thermalManager.setTargetHotend(constrain(value, 0, heater_maxtemp[e] - 15), e);

+ 1
- 1
Marlin/src/lcd/menu/menu.h View File

@@ -31,7 +31,7 @@ extern int8_t encoderLine, encoderTopLine, screen_items;
31 31
 extern bool screen_changed;
32 32
 
33 33
 #if HOTENDS
34
-  constexpr int16_t heater_maxtemp[HOTENDS] = ARRAY_BY_HOTENDS(HEATER_0_MAXTEMP, HEATER_1_MAXTEMP, HEATER_2_MAXTEMP, HEATER_3_MAXTEMP, HEATER_4_MAXTEMP);
34
+  constexpr int16_t heater_maxtemp[HOTENDS] = ARRAY_BY_HOTENDS(HEATER_0_MAXTEMP, HEATER_1_MAXTEMP, HEATER_2_MAXTEMP, HEATER_3_MAXTEMP, HEATER_4_MAXTEMP, HEATER_5_MAXTEMP);
35 35
 #endif
36 36
 
37 37
 void scroll_screen(const uint8_t limit, const bool is_menu);

Loading…
Cancel
Save