diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 41f3f129e006ffc765e473b4e7b5683bfe376e22..94c1d32e9e8bbd2d901ddccbb0aa63432fb687d6 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -779,13 +779,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 180
-#define PLA_PREHEAT_HPB_TEMP 70
-#define PLA_PREHEAT_FAN_SPEED 0 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 180
+#define PREHEAT_1_TEMP_BED 70
+#define PREHEAT_1_FAN_SPEED 0 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 240
-#define ABS_PREHEAT_HPB_TEMP 110
-#define ABS_PREHEAT_FAN_SPEED 0 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 240
+#define PREHEAT_2_TEMP_BED 110
+#define PREHEAT_2_FAN_SPEED 0 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 5c302ac2f5efc9623a7496f21ba9db830f265807..b335f965624cea6feeba1ec9a51c1304552b8d85 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -4862,32 +4862,32 @@ inline void gcode_M140() {
case 0:
if (code_seen('H')) {
v = code_value_int();
- plaPreheatHotendTemp = constrain(v, EXTRUDE_MINTEMP, HEATER_0_MAXTEMP - 15);
+ preheatHotendTemp1 = constrain(v, EXTRUDE_MINTEMP, HEATER_0_MAXTEMP - 15);
}
if (code_seen('F')) {
v = code_value_int();
- plaPreheatFanSpeed = constrain(v, 0, 255);
+ preheatFanSpeed1 = constrain(v, 0, 255);
}
#if TEMP_SENSOR_BED != 0
if (code_seen('B')) {
v = code_value_int();
- plaPreheatHPBTemp = constrain(v, BED_MINTEMP, BED_MAXTEMP - 15);
+ preheatBedTemp1 = constrain(v, BED_MINTEMP, BED_MAXTEMP - 15);
}
#endif
break;
case 1:
if (code_seen('H')) {
v = code_value_int();
- absPreheatHotendTemp = constrain(v, EXTRUDE_MINTEMP, HEATER_0_MAXTEMP - 15);
+ preheatHotendTemp2 = constrain(v, EXTRUDE_MINTEMP, HEATER_0_MAXTEMP - 15);
}
if (code_seen('F')) {
v = code_value_int();
- absPreheatFanSpeed = constrain(v, 0, 255);
+ preheatFanSpeed2 = constrain(v, 0, 255);
}
#if TEMP_SENSOR_BED != 0
if (code_seen('B')) {
v = code_value_int();
- absPreheatHPBTemp = constrain(v, BED_MINTEMP, BED_MAXTEMP - 15);
+ preheatBedTemp2 = constrain(v, BED_MINTEMP, BED_MAXTEMP - 15);
}
#endif
break;
diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h
index 9c251500a08ae3ef18fd04b7a5340282653e2ddc..3dc330885e063bc2d8e9aef79edf3e1fd9720a6c 100644
--- a/Marlin/SanityCheck.h
+++ b/Marlin/SanityCheck.h
@@ -632,6 +632,18 @@
#error "SERVO_DEACTIVATION_DELAY is deprecated. Use SERVO_DELAY instead."
#elif ENABLED(FILAMENTCHANGEENABLE)
#error "FILAMENTCHANGEENABLE is now FILAMENT_CHANGE_FEATURE. Please update your configuration."
+#elif defined(PLA_PREHEAT_HOTEND_TEMP)
+ #error "PLA_PREHEAT_HOTEND_TEMP is now PREHEAT_1_TEMP_HOTEND. Please update your configuration."
+#elif defined(PLA_PREHEAT_HPB_TEMP)
+ #error "PLA_PREHEAT_HPB_TEMP is now PREHEAT_1_TEMP_BED. Please update your configuration."
+#elif defined(PLA_PREHEAT_FAN_SPEED)
+ #error "PLA_PREHEAT_FAN_SPEED is now PREHEAT_1_FAN_SPEED. Please update your configuration."
+#elif defined(ABS_PREHEAT_HOTEND_TEMP)
+ #error "ABS_PREHEAT_HOTEND_TEMP is now PREHEAT_2_TEMP_HOTEND. Please update your configuration."
+#elif defined(ABS_PREHEAT_HPB_TEMP)
+ #error "ABS_PREHEAT_HPB_TEMP is now PREHEAT_2_TEMP_BED. Please update your configuration."
+#elif defined(ABS_PREHEAT_FAN_SPEED)
+ #error "ABS_PREHEAT_FAN_SPEED is now PREHEAT_2_FAN_SPEED. Please update your configuration."
#endif
#endif //SANITYCHECK_H
diff --git a/Marlin/configuration_store.cpp b/Marlin/configuration_store.cpp
index 1af06ecd1e89d022c422ecea7553eedae715bd15..fd8d41b4bf89a68218bd475ec14fc31aab0396bd 100644
--- a/Marlin/configuration_store.cpp
+++ b/Marlin/configuration_store.cpp
@@ -85,12 +85,12 @@
* 285 M666 Z z_endstop_adj (float)
*
* ULTIPANEL:
- * 289 M145 S0 H plaPreheatHotendTemp (int)
- * 291 M145 S0 B plaPreheatHPBTemp (int)
- * 293 M145 S0 F plaPreheatFanSpeed (int)
- * 295 M145 S1 H absPreheatHotendTemp (int)
- * 297 M145 S1 B absPreheatHPBTemp (int)
- * 299 M145 S1 F absPreheatFanSpeed (int)
+ * 289 M145 S0 H preheatHotendTemp1 (int)
+ * 291 M145 S0 B preheatBedTemp1 (int)
+ * 293 M145 S0 F preheatFanSpeed1 (int)
+ * 295 M145 S1 H preheatHotendTemp2 (int)
+ * 297 M145 S1 B preheatBedTemp2 (int)
+ * 299 M145 S1 F preheatFanSpeed2 (int)
*
* PIDTEMP:
* 301 M301 E0 PIDC Kp[0], Ki[0], Kd[0], Kc[0] (float x4)
@@ -262,16 +262,16 @@ void Config_StoreSettings() {
#endif
#if DISABLED(ULTIPANEL)
- int plaPreheatHotendTemp = PLA_PREHEAT_HOTEND_TEMP, plaPreheatHPBTemp = PLA_PREHEAT_HPB_TEMP, plaPreheatFanSpeed = PLA_PREHEAT_FAN_SPEED,
- absPreheatHotendTemp = ABS_PREHEAT_HOTEND_TEMP, absPreheatHPBTemp = ABS_PREHEAT_HPB_TEMP, absPreheatFanSpeed = ABS_PREHEAT_FAN_SPEED;
+ int preheatHotendTemp1 = PREHEAT_1_TEMP_HOTEND, preheatBedTemp1 = PREHEAT_1_TEMP_BED, preheatFanSpeed1 = PREHEAT_1_FAN_SPEED,
+ preheatHotendTemp2 = PREHEAT_2_TEMP_HOTEND, preheatBedTemp2 = PREHEAT_2_TEMP_BED, preheatFanSpeed2 = PREHEAT_2_FAN_SPEED;
#endif // !ULTIPANEL
- EEPROM_WRITE_VAR(i, plaPreheatHotendTemp);
- EEPROM_WRITE_VAR(i, plaPreheatHPBTemp);
- EEPROM_WRITE_VAR(i, plaPreheatFanSpeed);
- EEPROM_WRITE_VAR(i, absPreheatHotendTemp);
- EEPROM_WRITE_VAR(i, absPreheatHPBTemp);
- EEPROM_WRITE_VAR(i, absPreheatFanSpeed);
+ EEPROM_WRITE_VAR(i, preheatHotendTemp1);
+ EEPROM_WRITE_VAR(i, preheatBedTemp1);
+ EEPROM_WRITE_VAR(i, preheatFanSpeed1);
+ EEPROM_WRITE_VAR(i, preheatHotendTemp2);
+ EEPROM_WRITE_VAR(i, preheatBedTemp2);
+ EEPROM_WRITE_VAR(i, preheatFanSpeed2);
for (uint8_t e = 0; e < MAX_EXTRUDERS; e++) {
@@ -447,16 +447,16 @@ void Config_RetrieveSettings() {
#endif
#if DISABLED(ULTIPANEL)
- int plaPreheatHotendTemp, plaPreheatHPBTemp, plaPreheatFanSpeed,
- absPreheatHotendTemp, absPreheatHPBTemp, absPreheatFanSpeed;
+ int preheatHotendTemp1, preheatBedTemp1, preheatFanSpeed1,
+ preheatHotendTemp2, preheatBedTemp2, preheatFanSpeed2;
#endif
- EEPROM_READ_VAR(i, plaPreheatHotendTemp);
- EEPROM_READ_VAR(i, plaPreheatHPBTemp);
- EEPROM_READ_VAR(i, plaPreheatFanSpeed);
- EEPROM_READ_VAR(i, absPreheatHotendTemp);
- EEPROM_READ_VAR(i, absPreheatHPBTemp);
- EEPROM_READ_VAR(i, absPreheatFanSpeed);
+ EEPROM_READ_VAR(i, preheatHotendTemp1);
+ EEPROM_READ_VAR(i, preheatBedTemp1);
+ EEPROM_READ_VAR(i, preheatFanSpeed1);
+ EEPROM_READ_VAR(i, preheatHotendTemp2);
+ EEPROM_READ_VAR(i, preheatBedTemp2);
+ EEPROM_READ_VAR(i, preheatFanSpeed2);
#if ENABLED(PIDTEMP)
for (uint8_t e = 0; e < MAX_EXTRUDERS; e++) {
@@ -604,12 +604,12 @@ void Config_ResetDefault() {
#endif
#if ENABLED(ULTIPANEL)
- plaPreheatHotendTemp = PLA_PREHEAT_HOTEND_TEMP;
- plaPreheatHPBTemp = PLA_PREHEAT_HPB_TEMP;
- plaPreheatFanSpeed = PLA_PREHEAT_FAN_SPEED;
- absPreheatHotendTemp = ABS_PREHEAT_HOTEND_TEMP;
- absPreheatHPBTemp = ABS_PREHEAT_HPB_TEMP;
- absPreheatFanSpeed = ABS_PREHEAT_FAN_SPEED;
+ preheatHotendTemp1 = PREHEAT_1_TEMP_HOTEND;
+ preheatBedTemp1 = PREHEAT_1_TEMP_BED;
+ preheatFanSpeed1 = PREHEAT_1_FAN_SPEED;
+ preheatHotendTemp2 = PREHEAT_2_TEMP_HOTEND;
+ preheatBedTemp2 = PREHEAT_2_TEMP_BED;
+ preheatFanSpeed2 = PREHEAT_2_FAN_SPEED;
#endif
#if HAS_LCD_CONTRAST
@@ -814,14 +814,14 @@ void Config_PrintSettings(bool forReplay) {
SERIAL_ECHOLNPGM("Material heatup parameters:");
CONFIG_ECHO_START;
}
- SERIAL_ECHOPAIR(" M145 S0 H", plaPreheatHotendTemp);
- SERIAL_ECHOPAIR(" B", plaPreheatHPBTemp);
- SERIAL_ECHOPAIR(" F", plaPreheatFanSpeed);
+ SERIAL_ECHOPAIR(" M145 S0 H", preheatHotendTemp1);
+ SERIAL_ECHOPAIR(" B", preheatBedTemp1);
+ SERIAL_ECHOPAIR(" F", preheatFanSpeed1);
SERIAL_EOL;
CONFIG_ECHO_START;
- SERIAL_ECHOPAIR(" M145 S1 H", absPreheatHotendTemp);
- SERIAL_ECHOPAIR(" B", absPreheatHPBTemp);
- SERIAL_ECHOPAIR(" F", absPreheatFanSpeed);
+ SERIAL_ECHOPAIR(" M145 S1 H", preheatHotendTemp2);
+ SERIAL_ECHOPAIR(" B", preheatBedTemp2);
+ SERIAL_ECHOPAIR(" F", preheatFanSpeed2);
SERIAL_EOL;
#endif // ULTIPANEL
diff --git a/Marlin/example_configurations/Cartesio/Configuration.h b/Marlin/example_configurations/Cartesio/Configuration.h
index 3545e5994c327271138e25401a9db95704f66cba..a875ecce66022b2c6c19b30ea983ce470da40452 100644
--- a/Marlin/example_configurations/Cartesio/Configuration.h
+++ b/Marlin/example_configurations/Cartesio/Configuration.h
@@ -778,13 +778,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 190
-#define PLA_PREHEAT_HPB_TEMP 50
-#define PLA_PREHEAT_FAN_SPEED 0 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 190
+#define PREHEAT_1_TEMP_BED 50
+#define PREHEAT_1_FAN_SPEED 0 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 240
-#define ABS_PREHEAT_HPB_TEMP 110
-#define ABS_PREHEAT_FAN_SPEED 0 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 240
+#define PREHEAT_2_TEMP_BED 110
+#define PREHEAT_2_FAN_SPEED 0 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h
index 737aad19b64653ce6028eba413f904c732bf1f9c..d3543127f85c92c4897fd70d022717e2431831e9 100644
--- a/Marlin/example_configurations/Felix/Configuration.h
+++ b/Marlin/example_configurations/Felix/Configuration.h
@@ -762,13 +762,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 180
-#define PLA_PREHEAT_HPB_TEMP 70
-#define PLA_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 180
+#define PREHEAT_1_TEMP_BED 70
+#define PREHEAT_1_FAN_SPEED 255 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 240
-#define ABS_PREHEAT_HPB_TEMP 100
-#define ABS_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 240
+#define PREHEAT_2_TEMP_BED 100
+#define PREHEAT_2_FAN_SPEED 255 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/example_configurations/Felix/DUAL/Configuration.h b/Marlin/example_configurations/Felix/DUAL/Configuration.h
index f2b35df5cd10a93c150806b417895ab4c1220c92..097c1e2ee8dd2b3c1d49de36ee4e18269a0c166b 100644
--- a/Marlin/example_configurations/Felix/DUAL/Configuration.h
+++ b/Marlin/example_configurations/Felix/DUAL/Configuration.h
@@ -760,13 +760,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 180
-#define PLA_PREHEAT_HPB_TEMP 70
-#define PLA_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 180
+#define PREHEAT_1_TEMP_BED 70
+#define PREHEAT_1_FAN_SPEED 255 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 240
-#define ABS_PREHEAT_HPB_TEMP 100
-#define ABS_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 240
+#define PREHEAT_2_TEMP_BED 100
+#define PREHEAT_2_FAN_SPEED 255 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h
index a8dc026f54a8af2951d6bbafb5cf179159ca26ce..ad3d59088a7ed2d22013b9db67ba634cf4ade566 100644
--- a/Marlin/example_configurations/Hephestos/Configuration.h
+++ b/Marlin/example_configurations/Hephestos/Configuration.h
@@ -771,13 +771,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 200
-#define PLA_PREHEAT_HPB_TEMP 0
-#define PLA_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 200
+#define PREHEAT_1_TEMP_BED 0
+#define PREHEAT_1_FAN_SPEED 255 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 220
-#define ABS_PREHEAT_HPB_TEMP 100
-#define ABS_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 220
+#define PREHEAT_2_TEMP_BED 100
+#define PREHEAT_2_FAN_SPEED 255 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/example_configurations/Hephestos_2/Configuration.h b/Marlin/example_configurations/Hephestos_2/Configuration.h
index 05e6de775f3c43b08e541f8dcfe0c66a0cb9c6da..0d6252eabd89ee094b864b2c6a35ab706b4f6007 100644
--- a/Marlin/example_configurations/Hephestos_2/Configuration.h
+++ b/Marlin/example_configurations/Hephestos_2/Configuration.h
@@ -773,13 +773,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 210
-#define PLA_PREHEAT_HPB_TEMP 70
-#define PLA_PREHEAT_FAN_SPEED 0 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 210
+#define PREHEAT_1_TEMP_BED 70
+#define PREHEAT_1_FAN_SPEED 0 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 240
-#define ABS_PREHEAT_HPB_TEMP 110
-#define ABS_PREHEAT_FAN_SPEED 0 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 240
+#define PREHEAT_2_TEMP_BED 110
+#define PREHEAT_2_FAN_SPEED 0 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h
index 0e2a4d2c8af4996dcea9526b80d9c0cde6fd98b3..2a1ed29817a1a2ff1d32730027396e798723d12a 100644
--- a/Marlin/example_configurations/K8200/Configuration.h
+++ b/Marlin/example_configurations/K8200/Configuration.h
@@ -796,13 +796,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 190
-#define PLA_PREHEAT_HPB_TEMP 50 // K8200: set back to 70 if you have an upgraded heatbed power supply
-#define PLA_PREHEAT_FAN_SPEED 0 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 190
+#define PREHEAT_1_TEMP_BED 50 // K8200: set back to 70 if you have an upgraded heatbed power supply
+#define PREHEAT_1_FAN_SPEED 0 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 240
-#define ABS_PREHEAT_HPB_TEMP 60 // K8200: set back to 110 if you have an upgraded heatbed power supply
-#define ABS_PREHEAT_FAN_SPEED 0 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 240
+#define PREHEAT_2_TEMP_BED 60 // K8200: set back to 110 if you have an upgraded heatbed power supply
+#define PREHEAT_2_FAN_SPEED 0 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/example_configurations/K8400/Configuration.h b/Marlin/example_configurations/K8400/Configuration.h
index 17e5c28719d79e1420a950941e51a6d32402f59e..6cec00cb21bc18aa426e0b59baad101f22ddcac9 100644
--- a/Marlin/example_configurations/K8400/Configuration.h
+++ b/Marlin/example_configurations/K8400/Configuration.h
@@ -779,13 +779,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 210
-#define PLA_PREHEAT_HPB_TEMP 0
-#define PLA_PREHEAT_FAN_SPEED 165 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 210
+#define PREHEAT_1_TEMP_BED 0
+#define PREHEAT_1_FAN_SPEED 165 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 245
-#define ABS_PREHEAT_HPB_TEMP 0
-#define ABS_PREHEAT_FAN_SPEED 165 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 245
+#define PREHEAT_2_TEMP_BED 0
+#define PREHEAT_2_FAN_SPEED 165 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/example_configurations/K8400/Dual Heads/Configuration.h b/Marlin/example_configurations/K8400/Dual Heads/Configuration.h
index 2d706afffe5c523114f1466da352b5fb96d069b2..2dc75368a7f34c186141b61e94f75e0fbb86d589 100644
--- a/Marlin/example_configurations/K8400/Dual Heads/Configuration.h
+++ b/Marlin/example_configurations/K8400/Dual Heads/Configuration.h
@@ -779,13 +779,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 210
-#define PLA_PREHEAT_HPB_TEMP 0
-#define PLA_PREHEAT_FAN_SPEED 165 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 210
+#define PREHEAT_1_TEMP_BED 0
+#define PREHEAT_1_FAN_SPEED 165 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 245
-#define ABS_PREHEAT_HPB_TEMP 0
-#define ABS_PREHEAT_FAN_SPEED 165 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 245
+#define PREHEAT_2_TEMP_BED 0
+#define PREHEAT_2_FAN_SPEED 165 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
index 6b073db8f3c3233b11e90be0c4a1233bc57ebe60..ab6c8dcd91ea49975e77e910c7fcfbd44f6943d5 100644
--- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
+++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
@@ -779,13 +779,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 180
-#define PLA_PREHEAT_HPB_TEMP 70
-#define PLA_PREHEAT_FAN_SPEED 0 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 180
+#define PREHEAT_1_TEMP_BED 70
+#define PREHEAT_1_FAN_SPEED 0 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 240
-#define ABS_PREHEAT_HPB_TEMP 110
-#define ABS_PREHEAT_FAN_SPEED 0 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 240
+#define PREHEAT_2_TEMP_BED 110
+#define PREHEAT_2_FAN_SPEED 0 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h
index d097b0a20d7749c054489a91da353a68142f2ad0..f24a4ea07679669a64afddf52c85e1938fb48ea5 100644
--- a/Marlin/example_configurations/RigidBot/Configuration.h
+++ b/Marlin/example_configurations/RigidBot/Configuration.h
@@ -777,13 +777,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 180
-#define PLA_PREHEAT_HPB_TEMP 70
-#define PLA_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 180
+#define PREHEAT_1_TEMP_BED 70
+#define PREHEAT_1_FAN_SPEED 255 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 240
-#define ABS_PREHEAT_HPB_TEMP 110
-#define ABS_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 240
+#define PREHEAT_2_TEMP_BED 110
+#define PREHEAT_2_FAN_SPEED 255 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h
index 297b311394b1cc79fb4570f7975bc32ec108dc20..b8addb287196bfb53b645e25e1a0105e19a3c10c 100644
--- a/Marlin/example_configurations/SCARA/Configuration.h
+++ b/Marlin/example_configurations/SCARA/Configuration.h
@@ -787,13 +787,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 180
-#define PLA_PREHEAT_HPB_TEMP 70
-#define PLA_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 180
+#define PREHEAT_1_TEMP_BED 70
+#define PREHEAT_1_FAN_SPEED 255 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 240
-#define ABS_PREHEAT_HPB_TEMP 100
-#define ABS_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 240
+#define PREHEAT_2_TEMP_BED 100
+#define PREHEAT_2_FAN_SPEED 255 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/example_configurations/TAZ4/Configuration.h b/Marlin/example_configurations/TAZ4/Configuration.h
index 6db6caf30c10e073f34b6ac2f862223af5460560..e2782de05ec0c8064095a2a5fc6a92f9c47bcc22 100644
--- a/Marlin/example_configurations/TAZ4/Configuration.h
+++ b/Marlin/example_configurations/TAZ4/Configuration.h
@@ -800,13 +800,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 180
-#define PLA_PREHEAT_HPB_TEMP 70
-#define PLA_PREHEAT_FAN_SPEED 0 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 180
+#define PREHEAT_1_TEMP_BED 70
+#define PREHEAT_1_FAN_SPEED 0 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 230
-#define ABS_PREHEAT_HPB_TEMP 110
-#define ABS_PREHEAT_FAN_SPEED 0 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 230
+#define PREHEAT_2_TEMP_BED 110
+#define PREHEAT_2_FAN_SPEED 0 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h
index c71f965b1d0c9c06030c115d59835bf3cdd29438..06a5ae8fb95f6de91fee1ce310e4a021918444d0 100644
--- a/Marlin/example_configurations/WITBOX/Configuration.h
+++ b/Marlin/example_configurations/WITBOX/Configuration.h
@@ -771,13 +771,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 200
-#define PLA_PREHEAT_HPB_TEMP 0
-#define PLA_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 200
+#define PREHEAT_1_TEMP_BED 0
+#define PREHEAT_1_FAN_SPEED 255 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 220
-#define ABS_PREHEAT_HPB_TEMP 100
-#define ABS_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 220
+#define PREHEAT_2_TEMP_BED 100
+#define PREHEAT_2_FAN_SPEED 255 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h
index ff9bbf244c4c2836b854f77a5f213d931b3a4249..be81a9a2e7c85f90eef00e67adfd36353996d42b 100644
--- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h
+++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h
@@ -779,13 +779,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 180
-#define PLA_PREHEAT_HPB_TEMP 70
-#define PLA_PREHEAT_FAN_SPEED 0 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 180
+#define PREHEAT_1_TEMP_BED 70
+#define PREHEAT_1_FAN_SPEED 0 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 240
-#define ABS_PREHEAT_HPB_TEMP 110
-#define ABS_PREHEAT_FAN_SPEED 0 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 240
+#define PREHEAT_2_TEMP_BED 110
+#define PREHEAT_2_FAN_SPEED 0 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration.h b/Marlin/example_configurations/delta/biv2.5/Configuration.h
index 01d21032c77ffcf1667c76d39b0ef6d6403f2fe3..5cc2ed9d1836100d0d375fa439d43607b78797ec 100644
--- a/Marlin/example_configurations/delta/biv2.5/Configuration.h
+++ b/Marlin/example_configurations/delta/biv2.5/Configuration.h
@@ -874,13 +874,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 180
-#define PLA_PREHEAT_HPB_TEMP 70
-#define PLA_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 180
+#define PREHEAT_1_TEMP_BED 70
+#define PREHEAT_1_FAN_SPEED 255 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 240
-#define ABS_PREHEAT_HPB_TEMP 100
-#define ABS_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 240
+#define PREHEAT_2_TEMP_BED 100
+#define PREHEAT_2_FAN_SPEED 255 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h
index ad48fedc950ddea6e8123cef87bd797acfd7a682..31d6b3551f25dbe93e15bcdb9b0eff3d454be9e2 100644
--- a/Marlin/example_configurations/delta/generic/Configuration.h
+++ b/Marlin/example_configurations/delta/generic/Configuration.h
@@ -868,13 +868,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 180
-#define PLA_PREHEAT_HPB_TEMP 70
-#define PLA_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 180
+#define PREHEAT_1_TEMP_BED 70
+#define PREHEAT_1_FAN_SPEED 255 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 240
-#define ABS_PREHEAT_HPB_TEMP 100
-#define ABS_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 240
+#define PREHEAT_2_TEMP_BED 100
+#define PREHEAT_2_FAN_SPEED 255 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h
index d7fa60cbb850f4c17bdb569698d301931e03514b..2699a97f455ac42dab737e35cdf36b6914e21a41 100644
--- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h
+++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h
@@ -871,13 +871,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 180
-#define PLA_PREHEAT_HPB_TEMP 70
-#define PLA_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 180
+#define PREHEAT_1_TEMP_BED 70
+#define PREHEAT_1_FAN_SPEED 255 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 240
-#define ABS_PREHEAT_HPB_TEMP 100
-#define ABS_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 240
+#define PREHEAT_2_TEMP_BED 100
+#define PREHEAT_2_FAN_SPEED 255 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h
index f3753c75433c8f86aacd06ab2d607055820c19d0..dddb9c4357febd631087e5c0167be87fccc8af62 100644
--- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h
+++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h
@@ -871,13 +871,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 180
-#define PLA_PREHEAT_HPB_TEMP 70
-#define PLA_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 180
+#define PREHEAT_1_TEMP_BED 70
+#define PREHEAT_1_FAN_SPEED 255 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 240
-#define ABS_PREHEAT_HPB_TEMP 100
-#define ABS_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 240
+#define PREHEAT_2_TEMP_BED 100
+#define PREHEAT_2_FAN_SPEED 255 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration.h b/Marlin/example_configurations/delta/kossel_xl/Configuration.h
index 7c46535525afeb0ee1513bfec8418c0ff0bffe1c..58b162635733208d47f5e4a24f621633ce57cdcb 100644
--- a/Marlin/example_configurations/delta/kossel_xl/Configuration.h
+++ b/Marlin/example_configurations/delta/kossel_xl/Configuration.h
@@ -873,13 +873,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 180
-#define PLA_PREHEAT_HPB_TEMP 70
-#define PLA_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 180
+#define PREHEAT_1_TEMP_BED 70
+#define PREHEAT_1_FAN_SPEED 255 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 240
-#define ABS_PREHEAT_HPB_TEMP 100
-#define ABS_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 240
+#define PREHEAT_2_TEMP_BED 100
+#define PREHEAT_2_FAN_SPEED 255 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h
index ac4d1d888fe19bb2e4595cf6ac03fe957924c43e..9a4be404e47cb14df692304251a746cec631bb3e 100644
--- a/Marlin/example_configurations/makibox/Configuration.h
+++ b/Marlin/example_configurations/makibox/Configuration.h
@@ -782,13 +782,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 180
-#define PLA_PREHEAT_HPB_TEMP 70
-#define PLA_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 180
+#define PREHEAT_1_TEMP_BED 70
+#define PREHEAT_1_FAN_SPEED 255 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 240
-#define ABS_PREHEAT_HPB_TEMP 100
-#define ABS_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 240
+#define PREHEAT_2_TEMP_BED 100
+#define PREHEAT_2_FAN_SPEED 255 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h
index 1d137d3b7a936a3a67bc813e0257d2bff35a116b..a135d4d7b8dc1d73f8c6bb0d8c0ea9288732d2e4 100644
--- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h
+++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h
@@ -773,13 +773,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// @section temperature
// Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 180
-#define PLA_PREHEAT_HPB_TEMP 70
-#define PLA_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_1_TEMP_HOTEND 180
+#define PREHEAT_1_TEMP_BED 70
+#define PREHEAT_1_FAN_SPEED 255 // Value from 0 to 255
-#define ABS_PREHEAT_HOTEND_TEMP 240
-#define ABS_PREHEAT_HPB_TEMP 100
-#define ABS_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
+#define PREHEAT_2_TEMP_HOTEND 240
+#define PREHEAT_2_TEMP_BED 100
+#define PREHEAT_2_FAN_SPEED 255 // Value from 0 to 255
//
// Print job timer
diff --git a/Marlin/language_an.h b/Marlin/language_an.h
index 37ae982e19657341bfbb9138a3375a37bc5bacab..2423275d9896b8e90cb042084ec3ac14885a4d67 100644
--- a/Marlin/language_an.h
+++ b/Marlin/language_an.h
@@ -48,16 +48,16 @@
#define MSG_SET_HOME_OFFSETS "Set home offsets"
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
#define MSG_SET_ORIGIN "Establir zero"
-#define MSG_PREHEAT_PLA "Precalentar PLA"
-#define MSG_PREHEAT_PLA_N "Precalentar PLA "
-#define MSG_PREHEAT_PLA_ALL "Precalentar PLA a"
-#define MSG_PREHEAT_PLA_BEDONLY "Prec. PLA Base"
-#define MSG_PREHEAT_PLA_SETTINGS "Achustar tem. PLA"
-#define MSG_PREHEAT_ABS "Precalentar ABS"
-#define MSG_PREHEAT_ABS_N "Precalentar ABS "
-#define MSG_PREHEAT_ABS_ALL "Precalentar ABS a"
-#define MSG_PREHEAT_ABS_BEDONLY "Prec. ABS Base"
-#define MSG_PREHEAT_ABS_SETTINGS "Achustar tem. ABS"
+#define MSG_PREHEAT_1 "Precalentar PLA"
+#define MSG_PREHEAT_1_N "Precalentar PLA "
+#define MSG_PREHEAT_1_ALL "Precalentar PLA a"
+#define MSG_PREHEAT_1_BEDONLY "Prec. PLA Base"
+#define MSG_PREHEAT_1_SETTINGS "Achustar tem. PLA"
+#define MSG_PREHEAT_2 "Precalentar ABS"
+#define MSG_PREHEAT_2_N "Precalentar ABS "
+#define MSG_PREHEAT_2_ALL "Precalentar ABS a"
+#define MSG_PREHEAT_2_BEDONLY "Prec. ABS Base"
+#define MSG_PREHEAT_2_SETTINGS "Achustar tem. ABS"
#define MSG_COOLDOWN "Enfriar"
#define MSG_SWITCH_PS_ON "Enchegar Fuent"
#define MSG_SWITCH_PS_OFF "Desenchegar Fuent"
diff --git a/Marlin/language_bg.h b/Marlin/language_bg.h
index 3fc7a5bee78fdfb139c7f0efd281f703309e5100..8b42904673ea2a9da2425d51e1456ff4fa33102c 100644
--- a/Marlin/language_bg.h
+++ b/Marlin/language_bg.h
@@ -49,16 +49,16 @@
#define MSG_SET_HOME_OFFSETS "Задай Начало"
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
#define MSG_SET_ORIGIN "Изходна точка"
-#define MSG_PREHEAT_PLA "Подгряване PLA"
-#define MSG_PREHEAT_PLA_N "Подгряване PLA"
-#define MSG_PREHEAT_PLA_ALL "Подгр. PLA Всички"
-#define MSG_PREHEAT_PLA_BEDONLY "Подгр. PLA Легло"
-#define MSG_PREHEAT_PLA_SETTINGS "Настройки PLA"
-#define MSG_PREHEAT_ABS "Подгряване ABS"
-#define MSG_PREHEAT_ABS_N "Подгряване ABS"
-#define MSG_PREHEAT_ABS_ALL "Подгр. ABS Всички"
-#define MSG_PREHEAT_ABS_BEDONLY "Подгр. ABS Легло"
-#define MSG_PREHEAT_ABS_SETTINGS "Настройки ABS"
+#define MSG_PREHEAT_1 "Подгряване PLA"
+#define MSG_PREHEAT_1_N "Подгряване PLA"
+#define MSG_PREHEAT_1_ALL "Подгр. PLA Всички"
+#define MSG_PREHEAT_1_BEDONLY "Подгр. PLA Легло"
+#define MSG_PREHEAT_1_SETTINGS "Настройки PLA"
+#define MSG_PREHEAT_2 "Подгряване ABS"
+#define MSG_PREHEAT_2_N "Подгряване ABS"
+#define MSG_PREHEAT_2_ALL "Подгр. ABS Всички"
+#define MSG_PREHEAT_2_BEDONLY "Подгр. ABS Легло"
+#define MSG_PREHEAT_2_SETTINGS "Настройки ABS"
#define MSG_COOLDOWN "Охлаждане"
#define MSG_SWITCH_PS_ON "Вкл. захранване"
#define MSG_SWITCH_PS_OFF "Изкл. захранване"
diff --git a/Marlin/language_ca.h b/Marlin/language_ca.h
index 1c2e4924be6eadc9e7b86bfdabc1a7f5d2c1c240..27f9ff475d8fd20c4191b62576e22c6da5ca8e6d 100644
--- a/Marlin/language_ca.h
+++ b/Marlin/language_ca.h
@@ -49,16 +49,16 @@
#define MSG_SET_HOME_OFFSETS "Set home offsets"
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
#define MSG_SET_ORIGIN "Establir origen"
-#define MSG_PREHEAT_PLA "Preescalfar PLA"
-#define MSG_PREHEAT_PLA_N "Preescalfar PLA "
-#define MSG_PREHEAT_PLA_ALL "Preesc. tot PLA"
-#define MSG_PREHEAT_PLA_BEDONLY "Preesc. llit PLA"
-#define MSG_PREHEAT_PLA_SETTINGS "Configuració PLA"
-#define MSG_PREHEAT_ABS "Preescalfar ABS"
-#define MSG_PREHEAT_ABS_N "Preescalfar ABS "
-#define MSG_PREHEAT_ABS_ALL "Preesc. tot ABS"
-#define MSG_PREHEAT_ABS_BEDONLY "Preesc. llit ABS"
-#define MSG_PREHEAT_ABS_SETTINGS "Configuració ABS"
+#define MSG_PREHEAT_1 "Preescalfar PLA"
+#define MSG_PREHEAT_1_N "Preescalfar PLA "
+#define MSG_PREHEAT_1_ALL "Preesc. tot PLA"
+#define MSG_PREHEAT_1_BEDONLY "Preesc. llit PLA"
+#define MSG_PREHEAT_1_SETTINGS "Configuració PLA"
+#define MSG_PREHEAT_2 "Preescalfar ABS"
+#define MSG_PREHEAT_2_N "Preescalfar ABS "
+#define MSG_PREHEAT_2_ALL "Preesc. tot ABS"
+#define MSG_PREHEAT_2_BEDONLY "Preesc. llit ABS"
+#define MSG_PREHEAT_2_SETTINGS "Configuració ABS"
#define MSG_COOLDOWN "Refredar"
#define MSG_SWITCH_PS_ON "Switch power on"
#define MSG_SWITCH_PS_OFF "Switch power off"
diff --git a/Marlin/language_cn.h b/Marlin/language_cn.h
index de52af44fff46d1468c5cd0b6232d9c4c7a4aefb..dc102d7bf60fd46f51932a49fda6266d6f3f943d 100644
--- a/Marlin/language_cn.h
+++ b/Marlin/language_cn.h
@@ -45,16 +45,16 @@
#define MSG_SET_HOME_OFFSETS "\xbe\xbf\xbb\xbc\xbd\xc0\xc1"
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
#define MSG_SET_ORIGIN "\xbe\xbf\xbc\xbd"
-#define MSG_PREHEAT_PLA "\xc3\xc4 PLA"
-#define MSG_PREHEAT_PLA_N MSG_PREHEAT_PLA " "
-#define MSG_PREHEAT_PLA_ALL MSG_PREHEAT_PLA " \xc5\xc6"
-#define MSG_PREHEAT_PLA_BEDONLY MSG_PREHEAT_PLA " \xc4\xc7"
-#define MSG_PREHEAT_PLA_SETTINGS MSG_PREHEAT_PLA " \xbe\xbf"
-#define MSG_PREHEAT_ABS "\xc3\xc4 ABS"
-#define MSG_PREHEAT_ABS_N MSG_PREHEAT_ABS " "
-#define MSG_PREHEAT_ABS_ALL MSG_PREHEAT_ABS " \xc5\xc6"
-#define MSG_PREHEAT_ABS_BEDONLY MSG_PREHEAT_ABS " \xbe\xc6"
-#define MSG_PREHEAT_ABS_SETTINGS MSG_PREHEAT_ABS " \xbe\xbf"
+#define MSG_PREHEAT_1 "\xc3\xc4 PLA"
+#define MSG_PREHEAT_1_N MSG_PREHEAT_1 " "
+#define MSG_PREHEAT_1_ALL MSG_PREHEAT_1 " \xc5\xc6"
+#define MSG_PREHEAT_1_BEDONLY MSG_PREHEAT_1 " \xc4\xc7"
+#define MSG_PREHEAT_1_SETTINGS MSG_PREHEAT_1 " \xbe\xbf"
+#define MSG_PREHEAT_2 "\xc3\xc4 ABS"
+#define MSG_PREHEAT_2_N MSG_PREHEAT_2 " "
+#define MSG_PREHEAT_2_ALL MSG_PREHEAT_2 " \xc5\xc6"
+#define MSG_PREHEAT_2_BEDONLY MSG_PREHEAT_2 " \xbe\xc6"
+#define MSG_PREHEAT_2_SETTINGS MSG_PREHEAT_2 " \xbe\xbf"
#define MSG_COOLDOWN "\xc8\xc9"
#define MSG_SWITCH_PS_ON "\xb9\xcb\xca\xb3"
#define MSG_SWITCH_PS_OFF "\xb9\xcb\xb5\xb6"
diff --git a/Marlin/language_cz.h b/Marlin/language_cz.h
index 030b92e85e192ecf68647314f6c068c87e7c0e4b..461c41a0538488f2bb393652cce2c5fe2c150dc0 100644
--- a/Marlin/language_cz.h
+++ b/Marlin/language_cz.h
@@ -57,16 +57,16 @@
#define MSG_SET_HOME_OFFSETS "Nastavit ofsety"
#define MSG_HOME_OFFSETS_APPLIED "Ofsety nastaveny"
#define MSG_SET_ORIGIN "Nastavit pocatek"
-#define MSG_PREHEAT_PLA "Zahrat PLA"
-#define MSG_PREHEAT_PLA_N MSG_PREHEAT_PLA " "
-#define MSG_PREHEAT_PLA_ALL MSG_PREHEAT_PLA " Vse"
-#define MSG_PREHEAT_PLA_BEDONLY MSG_PREHEAT_PLA " Podloz"
-#define MSG_PREHEAT_PLA_SETTINGS MSG_PREHEAT_PLA " Nast"
-#define MSG_PREHEAT_ABS "Zahrat ABS"
-#define MSG_PREHEAT_ABS_N MSG_PREHEAT_ABS " "
-#define MSG_PREHEAT_ABS_ALL MSG_PREHEAT_ABS " Vse"
-#define MSG_PREHEAT_ABS_BEDONLY MSG_PREHEAT_ABS " Podloz"
-#define MSG_PREHEAT_ABS_SETTINGS MSG_PREHEAT_ABS " Nast"
+#define MSG_PREHEAT_1 "Zahrat PLA"
+#define MSG_PREHEAT_1_N MSG_PREHEAT_1 " "
+#define MSG_PREHEAT_1_ALL MSG_PREHEAT_1 " Vse"
+#define MSG_PREHEAT_1_BEDONLY MSG_PREHEAT_1 " Podloz"
+#define MSG_PREHEAT_1_SETTINGS MSG_PREHEAT_1 " Nast"
+#define MSG_PREHEAT_2 "Zahrat ABS"
+#define MSG_PREHEAT_2_N MSG_PREHEAT_2 " "
+#define MSG_PREHEAT_2_ALL MSG_PREHEAT_2 " Vse"
+#define MSG_PREHEAT_2_BEDONLY MSG_PREHEAT_2 " Podloz"
+#define MSG_PREHEAT_2_SETTINGS MSG_PREHEAT_2 " Nast"
#define MSG_H1 "1"
#define MSG_H2 "2"
#define MSG_H3 "3"
diff --git a/Marlin/language_da.h b/Marlin/language_da.h
index 55c9fd48c6b52a8a89dba669ad82e1dd2bc7efd1..833a6b26a80bf6b0099502c71555c5569741c4cc 100644
--- a/Marlin/language_da.h
+++ b/Marlin/language_da.h
@@ -54,16 +54,16 @@
#define MSG_SET_HOME_OFFSETS "Sæt forskyding af home"
#define MSG_HOME_OFFSETS_APPLIED "Forskydninger af home pos. er tilføjet"
#define MSG_SET_ORIGIN "Sæt origin"
-#define MSG_PREHEAT_PLA "Forvarm PLA"
-#define MSG_PREHEAT_PLA_N "Forvarm PLA "
-#define MSG_PREHEAT_PLA_ALL "Forvarm PLA Alle"
-#define MSG_PREHEAT_PLA_BEDONLY "Forvarm PLA Bed"
-#define MSG_PREHEAT_PLA_SETTINGS "Forvarm PLA conf"
-#define MSG_PREHEAT_ABS "Forvarm ABS"
-#define MSG_PREHEAT_ABS_N "Forvarm ABS "
-#define MSG_PREHEAT_ABS_ALL "Forvarm ABS Alle"
-#define MSG_PREHEAT_ABS_BEDONLY "Forvarm ABS Bed"
-#define MSG_PREHEAT_ABS_SETTINGS "Forvarm ABS conf"
+#define MSG_PREHEAT_1 "Forvarm PLA"
+#define MSG_PREHEAT_1_N "Forvarm PLA "
+#define MSG_PREHEAT_1_ALL "Forvarm PLA Alle"
+#define MSG_PREHEAT_1_BEDONLY "Forvarm PLA Bed"
+#define MSG_PREHEAT_1_SETTINGS "Forvarm PLA conf"
+#define MSG_PREHEAT_2 "Forvarm ABS"
+#define MSG_PREHEAT_2_N "Forvarm ABS "
+#define MSG_PREHEAT_2_ALL "Forvarm ABS Alle"
+#define MSG_PREHEAT_2_BEDONLY "Forvarm ABS Bed"
+#define MSG_PREHEAT_2_SETTINGS "Forvarm ABS conf"
#define MSG_H1 "1"
#define MSG_H2 "2"
#define MSG_H3 "3"
diff --git a/Marlin/language_de.h b/Marlin/language_de.h
index 58acd952783c143bdda86ce9dded0d88fcf2d4c5..3077e6b4584f2e3baec542259850b1117eefc8be 100644
--- a/Marlin/language_de.h
+++ b/Marlin/language_de.h
@@ -49,16 +49,16 @@
#define MSG_SET_HOME_OFFSETS "Setze Homeoffsets"
#define MSG_HOME_OFFSETS_APPLIED "Offsets aktiv"
#define MSG_SET_ORIGIN "Setze Nullpunkt" //"G92 X0 Y0 Z0" commented out in ultralcd.cpp
-#define MSG_PREHEAT_PLA "Vorwärmen PLA"
-#define MSG_PREHEAT_PLA_N "Vorwärmen PLA "
-#define MSG_PREHEAT_PLA_ALL "Vorw. PLA Alle"
-#define MSG_PREHEAT_PLA_BEDONLY "Vorw. PLA Bett"
-#define MSG_PREHEAT_PLA_SETTINGS "Vorw. PLA Einst."
-#define MSG_PREHEAT_ABS "Vorwärmen ABS"
-#define MSG_PREHEAT_ABS_N "Vorwärmen ABS "
-#define MSG_PREHEAT_ABS_ALL "Vorw. ABS Alle"
-#define MSG_PREHEAT_ABS_BEDONLY "Vorw. ABS Bett"
-#define MSG_PREHEAT_ABS_SETTINGS "Vorw. ABS Einst."
+#define MSG_PREHEAT_1 "Vorwärmen PLA"
+#define MSG_PREHEAT_1_N "Vorwärmen PLA "
+#define MSG_PREHEAT_1_ALL "Vorw. PLA Alle"
+#define MSG_PREHEAT_1_BEDONLY "Vorw. PLA Bett"
+#define MSG_PREHEAT_1_SETTINGS "Vorw. PLA Einst."
+#define MSG_PREHEAT_2 "Vorwärmen ABS"
+#define MSG_PREHEAT_2_N "Vorwärmen ABS "
+#define MSG_PREHEAT_2_ALL "Vorw. ABS Alle"
+#define MSG_PREHEAT_2_BEDONLY "Vorw. ABS Bett"
+#define MSG_PREHEAT_2_SETTINGS "Vorw. ABS Einst."
#define MSG_COOLDOWN "Abkühlen"
#define MSG_SWITCH_PS_ON "Netzteil ein"
#define MSG_SWITCH_PS_OFF "Netzteil aus"
diff --git a/Marlin/language_en.h b/Marlin/language_en.h
index a1612bdf21907b1b8f0789f100b51805ee329616..ef602209425a0a669d403190da56f00d83deb931 100644
--- a/Marlin/language_en.h
+++ b/Marlin/language_en.h
@@ -92,35 +92,35 @@
#ifndef MSG_SET_ORIGIN
#define MSG_SET_ORIGIN "Set origin"
#endif
-#ifndef MSG_PREHEAT_PLA
- #define MSG_PREHEAT_PLA "Preheat PLA"
+#ifndef MSG_PREHEAT_1
+ #define MSG_PREHEAT_1 "Preheat PLA"
#endif
-#ifndef MSG_PREHEAT_PLA_N
- #define MSG_PREHEAT_PLA_N MSG_PREHEAT_PLA " "
+#ifndef MSG_PREHEAT_1_N
+ #define MSG_PREHEAT_1_N MSG_PREHEAT_1 " "
#endif
-#ifndef MSG_PREHEAT_PLA_ALL
- #define MSG_PREHEAT_PLA_ALL MSG_PREHEAT_PLA " All"
+#ifndef MSG_PREHEAT_1_ALL
+ #define MSG_PREHEAT_1_ALL MSG_PREHEAT_1 " All"
#endif
-#ifndef MSG_PREHEAT_PLA_BEDONLY
- #define MSG_PREHEAT_PLA_BEDONLY MSG_PREHEAT_PLA " Bed"
+#ifndef MSG_PREHEAT_1_BEDONLY
+ #define MSG_PREHEAT_1_BEDONLY MSG_PREHEAT_1 " Bed"
#endif
-#ifndef MSG_PREHEAT_PLA_SETTINGS
- #define MSG_PREHEAT_PLA_SETTINGS MSG_PREHEAT_PLA " conf"
+#ifndef MSG_PREHEAT_1_SETTINGS
+ #define MSG_PREHEAT_1_SETTINGS MSG_PREHEAT_1 " conf"
#endif
-#ifndef MSG_PREHEAT_ABS
- #define MSG_PREHEAT_ABS "Preheat ABS"
+#ifndef MSG_PREHEAT_2
+ #define MSG_PREHEAT_2 "Preheat ABS"
#endif
-#ifndef MSG_PREHEAT_ABS_N
- #define MSG_PREHEAT_ABS_N MSG_PREHEAT_ABS " "
+#ifndef MSG_PREHEAT_2_N
+ #define MSG_PREHEAT_2_N MSG_PREHEAT_2 " "
#endif
-#ifndef MSG_PREHEAT_ABS_ALL
- #define MSG_PREHEAT_ABS_ALL MSG_PREHEAT_ABS " All"
+#ifndef MSG_PREHEAT_2_ALL
+ #define MSG_PREHEAT_2_ALL MSG_PREHEAT_2 " All"
#endif
-#ifndef MSG_PREHEAT_ABS_BEDONLY
- #define MSG_PREHEAT_ABS_BEDONLY MSG_PREHEAT_ABS " Bed"
+#ifndef MSG_PREHEAT_2_BEDONLY
+ #define MSG_PREHEAT_2_BEDONLY MSG_PREHEAT_2 " Bed"
#endif
-#ifndef MSG_PREHEAT_ABS_SETTINGS
- #define MSG_PREHEAT_ABS_SETTINGS MSG_PREHEAT_ABS " conf"
+#ifndef MSG_PREHEAT_2_SETTINGS
+ #define MSG_PREHEAT_2_SETTINGS MSG_PREHEAT_2 " conf"
#endif
#ifndef MSG_H1
#define MSG_H1 "1"
diff --git a/Marlin/language_es.h b/Marlin/language_es.h
index c5b3e0e7a4ba6e1490c51ead8798315a82cb1b24..8647a50faf8e2b635724d8c01bd6afee6075ccec 100644
--- a/Marlin/language_es.h
+++ b/Marlin/language_es.h
@@ -52,16 +52,16 @@
#define MSG_SET_HOME_OFFSETS "Ajustar desfases"
#define MSG_HOME_OFFSETS_APPLIED "Desfase aplicado"
#define MSG_SET_ORIGIN "Establecer origen"
-#define MSG_PREHEAT_PLA "Precalentar PLA"
-#define MSG_PREHEAT_PLA_N MSG_PREHEAT_PLA " "
-#define MSG_PREHEAT_PLA_ALL MSG_PREHEAT_PLA "Todo"
-#define MSG_PREHEAT_PLA_BEDONLY MSG_PREHEAT_PLA"Plataforma"
-#define MSG_PREHEAT_PLA_SETTINGS MSG_PREHEAT_PLA "Config"
-#define MSG_PREHEAT_ABS "Precalentar ABS"
-#define MSG_PREHEAT_ABS_N MSG_PREHEAT_ABS " "
-#define MSG_PREHEAT_ABS_ALL MSG_PREHEAT_ABS "Todo"
-#define MSG_PREHEAT_ABS_BEDONLY MSG_PREHEAT_ABS "Plataforma"
-#define MSG_PREHEAT_ABS_SETTINGS MSG_PREHEAT_ABS "Config"
+#define MSG_PREHEAT_1 "Precalentar PLA"
+#define MSG_PREHEAT_1_N MSG_PREHEAT_1 " "
+#define MSG_PREHEAT_1_ALL MSG_PREHEAT_1 "Todo"
+#define MSG_PREHEAT_1_BEDONLY MSG_PREHEAT_1"Plataforma"
+#define MSG_PREHEAT_1_SETTINGS MSG_PREHEAT_1 "Config"
+#define MSG_PREHEAT_2 "Precalentar ABS"
+#define MSG_PREHEAT_2_N MSG_PREHEAT_2 " "
+#define MSG_PREHEAT_2_ALL MSG_PREHEAT_2 "Todo"
+#define MSG_PREHEAT_2_BEDONLY MSG_PREHEAT_2 "Plataforma"
+#define MSG_PREHEAT_2_SETTINGS MSG_PREHEAT_2 "Config"
#define MSG_H1 "1"
#define MSG_H2 "2"
#define MSG_H3 "3"
diff --git a/Marlin/language_eu.h b/Marlin/language_eu.h
index 361fe0c4575f2e605fcb3f8e96dda1b989651874..2b246e20d04afd86998e77507770796c2c8f5e97 100644
--- a/Marlin/language_eu.h
+++ b/Marlin/language_eu.h
@@ -48,16 +48,16 @@
#define MSG_SET_HOME_OFFSETS "Set home offsets"
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
#define MSG_SET_ORIGIN "Hasiera ipini"
-#define MSG_PREHEAT_PLA "Aurreberotu PLA"
-#define MSG_PREHEAT_PLA_N "Aurreberotu PLA "
-#define MSG_PREHEAT_PLA_ALL "Berotu PLA Guztia"
-#define MSG_PREHEAT_PLA_BEDONLY "Berotu PLA Ohea"
-#define MSG_PREHEAT_PLA_SETTINGS "Berotu PLA Konfig"
-#define MSG_PREHEAT_ABS "Aurreberotu ABS"
-#define MSG_PREHEAT_ABS_N "Aurreberotu ABS "
-#define MSG_PREHEAT_ABS_ALL "Berotu ABS Guztia"
-#define MSG_PREHEAT_ABS_BEDONLY "Berotu ABS Ohea"
-#define MSG_PREHEAT_ABS_SETTINGS "Berotu ABS Konfig"
+#define MSG_PREHEAT_1 "Aurreberotu PLA"
+#define MSG_PREHEAT_1_N "Aurreberotu PLA "
+#define MSG_PREHEAT_1_ALL "Berotu PLA Guztia"
+#define MSG_PREHEAT_1_BEDONLY "Berotu PLA Ohea"
+#define MSG_PREHEAT_1_SETTINGS "Berotu PLA Konfig"
+#define MSG_PREHEAT_2 "Aurreberotu ABS"
+#define MSG_PREHEAT_2_N "Aurreberotu ABS "
+#define MSG_PREHEAT_2_ALL "Berotu ABS Guztia"
+#define MSG_PREHEAT_2_BEDONLY "Berotu ABS Ohea"
+#define MSG_PREHEAT_2_SETTINGS "Berotu ABS Konfig"
#define MSG_COOLDOWN "Hoztu"
#define MSG_SWITCH_PS_ON "Energia piztu"
#define MSG_SWITCH_PS_OFF "Energia itzali"
diff --git a/Marlin/language_fi.h b/Marlin/language_fi.h
index be3db646c581f9c3c2e1ab0e9eefe68432174145..f3f4db27e806d304f778e747b06aa8590d9fd103 100644
--- a/Marlin/language_fi.h
+++ b/Marlin/language_fi.h
@@ -49,16 +49,16 @@
#define MSG_SET_HOME_OFFSETS "Set home offsets"
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
#define MSG_SET_ORIGIN "Aseta origo"
-#define MSG_PREHEAT_PLA "Esilämmitä PLA"
-#define MSG_PREHEAT_PLA_N "Esilämmitä PLA "
-#define MSG_PREHEAT_PLA_ALL "Esilä. PLA Kaikki"
-#define MSG_PREHEAT_PLA_BEDONLY "Esilä. PLA Alusta"
-#define MSG_PREHEAT_PLA_SETTINGS "Esilämm. PLA konf"
-#define MSG_PREHEAT_ABS "Esilämmitä ABS"
-#define MSG_PREHEAT_ABS_N "Esilämmitä ABS "
-#define MSG_PREHEAT_ABS_ALL "Esilä. ABS Kaikki"
-#define MSG_PREHEAT_ABS_BEDONLY "Esilä. ABS Alusta"
-#define MSG_PREHEAT_ABS_SETTINGS "Esilämm. ABS konf"
+#define MSG_PREHEAT_1 "Esilämmitä PLA"
+#define MSG_PREHEAT_1_N "Esilämmitä PLA "
+#define MSG_PREHEAT_1_ALL "Esilä. PLA Kaikki"
+#define MSG_PREHEAT_1_BEDONLY "Esilä. PLA Alusta"
+#define MSG_PREHEAT_1_SETTINGS "Esilämm. PLA konf"
+#define MSG_PREHEAT_2 "Esilämmitä ABS"
+#define MSG_PREHEAT_2_N "Esilämmitä ABS "
+#define MSG_PREHEAT_2_ALL "Esilä. ABS Kaikki"
+#define MSG_PREHEAT_2_BEDONLY "Esilä. ABS Alusta"
+#define MSG_PREHEAT_2_SETTINGS "Esilämm. ABS konf"
#define MSG_COOLDOWN "Jäähdytä"
#define MSG_SWITCH_PS_ON "Virta päälle"
#define MSG_SWITCH_PS_OFF "Virta pois"
diff --git a/Marlin/language_fr.h b/Marlin/language_fr.h
index 63bba3c3ff7b9765be98b8d708e64634f7a5d624..30c45e78a24886826d05c3c5f77508d3e2b207dc 100644
--- a/Marlin/language_fr.h
+++ b/Marlin/language_fr.h
@@ -48,16 +48,16 @@
#define MSG_SET_HOME_OFFSETS "Regler decal. origine"
#define MSG_HOME_OFFSETS_APPLIED "Decalages appliques"
#define MSG_SET_ORIGIN "Regler origine"
-#define MSG_PREHEAT_PLA "Prechauffage PLA"
-#define MSG_PREHEAT_PLA_N "Prechauff. PLA "
-#define MSG_PREHEAT_PLA_ALL "Prech. PLA Tout"
-#define MSG_PREHEAT_PLA_BEDONLY "Prech. PLA Plateau"
-#define MSG_PREHEAT_PLA_SETTINGS "Regl. prech. PLA"
-#define MSG_PREHEAT_ABS "Prechauffage ABS"
-#define MSG_PREHEAT_ABS_N "Prechauff. ABS "
-#define MSG_PREHEAT_ABS_ALL "Prech. ABS Tout"
-#define MSG_PREHEAT_ABS_BEDONLY "Prech. ABS Plateau"
-#define MSG_PREHEAT_ABS_SETTINGS "Regl. prech. ABS"
+#define MSG_PREHEAT_1 "Prechauffage PLA"
+#define MSG_PREHEAT_1_N "Prechauff. PLA "
+#define MSG_PREHEAT_1_ALL "Prech. PLA Tout"
+#define MSG_PREHEAT_1_BEDONLY "Prech. PLA Plateau"
+#define MSG_PREHEAT_1_SETTINGS "Regl. prech. PLA"
+#define MSG_PREHEAT_2 "Prechauffage ABS"
+#define MSG_PREHEAT_2_N "Prechauff. ABS "
+#define MSG_PREHEAT_2_ALL "Prech. ABS Tout"
+#define MSG_PREHEAT_2_BEDONLY "Prech. ABS Plateau"
+#define MSG_PREHEAT_2_SETTINGS "Regl. prech. ABS"
#define MSG_COOLDOWN "Refroidir"
#define MSG_SWITCH_PS_ON "Allumer alim."
#define MSG_SWITCH_PS_OFF "Eteindre alim."
diff --git a/Marlin/language_gl.h b/Marlin/language_gl.h
index f4e4639fc319657b85f741e29e4b9f95d3bd4df3..87453b81c86445f5613f83a93bdc33de6cb35921 100644
--- a/Marlin/language_gl.h
+++ b/Marlin/language_gl.h
@@ -54,16 +54,16 @@
#define MSG_SET_HOME_OFFSETS "Offsets na orixe"
#define MSG_HOME_OFFSETS_APPLIED "Offsets fixados"
#define MSG_SET_ORIGIN "Fixar orixe"
-#define MSG_PREHEAT_PLA "Prequentar PLA"
-#define MSG_PREHEAT_PLA_N "Prequentar PLA "
-#define MSG_PREHEAT_PLA_ALL "Preque. PLA Todo"
-#define MSG_PREHEAT_PLA_BEDONLY "Preque. PLA Cama"
-#define MSG_PREHEAT_PLA_SETTINGS "Preque. PLA conf"
-#define MSG_PREHEAT_ABS "Prequentar ABS"
-#define MSG_PREHEAT_ABS_N "Prequentar ABS "
-#define MSG_PREHEAT_ABS_ALL "Preque. ABS Todo"
-#define MSG_PREHEAT_ABS_BEDONLY "Preque. ABS Cama"
-#define MSG_PREHEAT_ABS_SETTINGS "Preque. ABS conf"
+#define MSG_PREHEAT_1 "Prequentar PLA"
+#define MSG_PREHEAT_1_N "Prequentar PLA "
+#define MSG_PREHEAT_1_ALL "Preque. PLA Todo"
+#define MSG_PREHEAT_1_BEDONLY "Preque. PLA Cama"
+#define MSG_PREHEAT_1_SETTINGS "Preque. PLA conf"
+#define MSG_PREHEAT_2 "Prequentar ABS"
+#define MSG_PREHEAT_2_N "Prequentar ABS "
+#define MSG_PREHEAT_2_ALL "Preque. ABS Todo"
+#define MSG_PREHEAT_2_BEDONLY "Preque. ABS Cama"
+#define MSG_PREHEAT_2_SETTINGS "Preque. ABS conf"
#define MSG_H1 "1"
#define MSG_H2 "2"
#define MSG_H3 "3"
diff --git a/Marlin/language_hr.h b/Marlin/language_hr.h
index e6ebe7db80c7123704eeff5b3f073ef1b4af3b6b..83742ded9df82ecc4e13c418229681b6a856fc9d 100644
--- a/Marlin/language_hr.h
+++ b/Marlin/language_hr.h
@@ -54,16 +54,16 @@
#define MSG_SET_HOME_OFFSETS "Postavi home offsete"
#define MSG_HOME_OFFSETS_APPLIED "Offsets postavljeni"
#define MSG_SET_ORIGIN "Postavi ishodište"
-#define MSG_PREHEAT_PLA "Predgrij PLA"
-#define MSG_PREHEAT_PLA_N MSG_PREHEAT_PLA " "
-#define MSG_PREHEAT_PLA_ALL MSG_PREHEAT_PLA " Sve"
-#define MSG_PREHEAT_PLA_BEDONLY MSG_PREHEAT_PLA " Bed"
-#define MSG_PREHEAT_PLA_SETTINGS MSG_PREHEAT_PLA " conf"
-#define MSG_PREHEAT_ABS "Predgrij ABS"
-#define MSG_PREHEAT_ABS_N MSG_PREHEAT_ABS " "
-#define MSG_PREHEAT_ABS_ALL MSG_PREHEAT_ABS " Sve"
-#define MSG_PREHEAT_ABS_BEDONLY MSG_PREHEAT_ABS " Bed"
-#define MSG_PREHEAT_ABS_SETTINGS MSG_PREHEAT_ABS " conf"
+#define MSG_PREHEAT_1 "Predgrij PLA"
+#define MSG_PREHEAT_1_N MSG_PREHEAT_1 " "
+#define MSG_PREHEAT_1_ALL MSG_PREHEAT_1 " Sve"
+#define MSG_PREHEAT_1_BEDONLY MSG_PREHEAT_1 " Bed"
+#define MSG_PREHEAT_1_SETTINGS MSG_PREHEAT_1 " conf"
+#define MSG_PREHEAT_2 "Predgrij ABS"
+#define MSG_PREHEAT_2_N MSG_PREHEAT_2 " "
+#define MSG_PREHEAT_2_ALL MSG_PREHEAT_2 " Sve"
+#define MSG_PREHEAT_2_BEDONLY MSG_PREHEAT_2 " Bed"
+#define MSG_PREHEAT_2_SETTINGS MSG_PREHEAT_2 " conf"
#define MSG_H1 "1"
#define MSG_H2 "2"
#define MSG_H3 "3"
diff --git a/Marlin/language_it.h b/Marlin/language_it.h
index a8e08391f07dd7327a89940129c99c6242a65c8a..e393f59113e41eebed98619d618ffeba8009a8ab 100644
--- a/Marlin/language_it.h
+++ b/Marlin/language_it.h
@@ -53,16 +53,16 @@
#define MSG_SET_HOME_OFFSETS "Imp. offset home"
#define MSG_HOME_OFFSETS_APPLIED "Offset applicato"
#define MSG_SET_ORIGIN "Imposta Origine"
-#define MSG_PREHEAT_PLA "Preriscalda PLA"
-#define MSG_PREHEAT_PLA_N MSG_PREHEAT_PLA " "
-#define MSG_PREHEAT_PLA_ALL MSG_PREHEAT_PLA " Tutto"
-#define MSG_PREHEAT_PLA_BEDONLY MSG_PREHEAT_PLA " Piatto"
-#define MSG_PREHEAT_PLA_SETTINGS MSG_PREHEAT_PLA " conf"
-#define MSG_PREHEAT_ABS "Preriscalda ABS"
-#define MSG_PREHEAT_ABS_N MSG_PREHEAT_ABS " "
-#define MSG_PREHEAT_ABS_ALL MSG_PREHEAT_ABS " Tutto"
-#define MSG_PREHEAT_ABS_BEDONLY MSG_PREHEAT_ABS " Piatto"
-#define MSG_PREHEAT_ABS_SETTINGS MSG_PREHEAT_ABS " conf"
+#define MSG_PREHEAT_1 "Preriscalda PLA"
+#define MSG_PREHEAT_1_N MSG_PREHEAT_1 " "
+#define MSG_PREHEAT_1_ALL MSG_PREHEAT_1 " Tutto"
+#define MSG_PREHEAT_1_BEDONLY MSG_PREHEAT_1 " Piatto"
+#define MSG_PREHEAT_1_SETTINGS MSG_PREHEAT_1 " conf"
+#define MSG_PREHEAT_2 "Preriscalda ABS"
+#define MSG_PREHEAT_2_N MSG_PREHEAT_2 " "
+#define MSG_PREHEAT_2_ALL MSG_PREHEAT_2 " Tutto"
+#define MSG_PREHEAT_2_BEDONLY MSG_PREHEAT_2 " Piatto"
+#define MSG_PREHEAT_2_SETTINGS MSG_PREHEAT_2 " conf"
#define MSG_COOLDOWN "Raffredda"
#define MSG_SWITCH_PS_ON "Accendi aliment."
#define MSG_SWITCH_PS_OFF "Spegni aliment."
diff --git a/Marlin/language_kana.h b/Marlin/language_kana.h
index 3a824e9ae7ccddd0bc1b45d1696e76be598612ac..894bda043dc450dc40ef309d6bac69320d034811 100644
--- a/Marlin/language_kana.h
+++ b/Marlin/language_kana.h
@@ -55,16 +55,16 @@
#define MSG_SET_HOME_OFFSETS "\xb7\xbc\xde\xad\xdd\xb5\xcc\xbe\xaf\xc4\xbe\xaf\xc3\xb2" // "ｷｼﾞｭﾝｵﾌｾｯﾄｾｯﾃｲ" ("Set home offsets")
#define MSG_HOME_OFFSETS_APPLIED "\xb5\xcc\xbe\xaf\xc4\xb6\xde\xc3\xb7\xd6\xb3\xbb\xda\xcf\xbc\xc0" // "ｵﾌｾｯﾄｶﾞﾃｷﾖｳｻﾚﾏｼﾀ" ("Offsets applied")
#define MSG_SET_ORIGIN "\xb7\xbc\xde\xad\xdd\xbe\xaf\xc4" // "ｷｼﾞｭﾝｾｯﾄ" ("Set origin")
-#define MSG_PREHEAT_PLA "PLA \xd6\xc8\xc2" // "PLA ﾖﾈﾂ" ("Preheat PLA")
-#define MSG_PREHEAT_PLA_N MSG_PREHEAT_PLA " "
-#define MSG_PREHEAT_PLA_ALL MSG_PREHEAT_PLA " \xbd\xcd\xde\xc3" // " ｽﾍﾞﾃ" (" All")
-#define MSG_PREHEAT_PLA_BEDONLY MSG_PREHEAT_PLA " \xcd\xde\xaf\xc4\xde" // " ﾍﾞｯﾄﾞ" (" Bed")
-#define MSG_PREHEAT_PLA_SETTINGS MSG_PREHEAT_PLA " \xbe\xaf\xc3\xb2" // " ｾｯﾃｲ" (" conf")
-#define MSG_PREHEAT_ABS "ABS \xd6\xc8\xc2" // "ABS ﾖﾈﾂ" ("Preheat ABS")
-#define MSG_PREHEAT_ABS_N MSG_PREHEAT_ABS " "
-#define MSG_PREHEAT_ABS_ALL MSG_PREHEAT_ABS " \xbd\xcd\xde\xc3" // " ｽﾍﾞﾃ" (" All")
-#define MSG_PREHEAT_ABS_BEDONLY MSG_PREHEAT_ABS " \xcd\xde\xaf\xc4\xde" // " ﾍﾞｯﾄﾞ" (" Bed")
-#define MSG_PREHEAT_ABS_SETTINGS MSG_PREHEAT_ABS " \xbe\xaf\xc3\xb2" // " ｾｯﾃｲ" (" conf")
+#define MSG_PREHEAT_1 "PLA \xd6\xc8\xc2" // "PLA ﾖﾈﾂ" ("Preheat PLA")
+#define MSG_PREHEAT_1_N MSG_PREHEAT_1 " "
+#define MSG_PREHEAT_1_ALL MSG_PREHEAT_1 " \xbd\xcd\xde\xc3" // " ｽﾍﾞﾃ" (" All")
+#define MSG_PREHEAT_1_BEDONLY MSG_PREHEAT_1 " \xcd\xde\xaf\xc4\xde" // " ﾍﾞｯﾄﾞ" (" Bed")
+#define MSG_PREHEAT_1_SETTINGS MSG_PREHEAT_1 " \xbe\xaf\xc3\xb2" // " ｾｯﾃｲ" (" conf")
+#define MSG_PREHEAT_2 "ABS \xd6\xc8\xc2" // "ABS ﾖﾈﾂ" ("Preheat ABS")
+#define MSG_PREHEAT_2_N MSG_PREHEAT_2 " "
+#define MSG_PREHEAT_2_ALL MSG_PREHEAT_2 " \xbd\xcd\xde\xc3" // " ｽﾍﾞﾃ" (" All")
+#define MSG_PREHEAT_2_BEDONLY MSG_PREHEAT_2 " \xcd\xde\xaf\xc4\xde" // " ﾍﾞｯﾄﾞ" (" Bed")
+#define MSG_PREHEAT_2_SETTINGS MSG_PREHEAT_2 " \xbe\xaf\xc3\xb2" // " ｾｯﾃｲ" (" conf")
#define MSG_COOLDOWN "\xb6\xc8\xc2\xc3\xb2\xbc" // "ｶﾈﾂﾃｲｼ" ("Cooldown")
#define MSG_SWITCH_PS_ON "\xc3\xde\xdd\xb9\xde\xdd\x20\xb5\xdd" // "ﾃﾞﾝｹﾞﾝ ｵﾝ" ("Switch power on")
#define MSG_SWITCH_PS_OFF "\xc3\xde\xdd\xb9\xde\xdd\x20\xb5\xcc" // "ﾃﾞﾝｹﾞﾝ ｵﾌ" ("Switch power off")
diff --git a/Marlin/language_kana_utf8.h b/Marlin/language_kana_utf8.h
index 8a35e7cef8e1aa049c65e257bd1682ebe0c15d5c..b9121260708bb73876536d409ba66c79a7be64fb 100644
--- a/Marlin/language_kana_utf8.h
+++ b/Marlin/language_kana_utf8.h
@@ -59,16 +59,16 @@
#define MSG_SET_HOME_OFFSETS "キジュンオフセットセッテイ" // "Set home offsets"
#define MSG_HOME_OFFSETS_APPLIED "オフセットガテキヨウサレマシタ" // "Offsets applied"
#define MSG_SET_ORIGIN "キジュンセット" // "Set origin"
-#define MSG_PREHEAT_PLA "PLA ヨネツ" // "Preheat PLA"
-#define MSG_PREHEAT_PLA_N MSG_PREHEAT_PLA " "
-#define MSG_PREHEAT_PLA_ALL MSG_PREHEAT_PLA " スベテ" // " All"
-#define MSG_PREHEAT_PLA_BEDONLY MSG_PREHEAT_PLA " ベッド" // " Bed"
-#define MSG_PREHEAT_PLA_SETTINGS MSG_PREHEAT_PLA " セッテイ" // " conf"
-#define MSG_PREHEAT_ABS "ABS ヨネツ" // "Preheat ABS"
-#define MSG_PREHEAT_ABS_N MSG_PREHEAT_ABS " "
-#define MSG_PREHEAT_ABS_ALL MSG_PREHEAT_ABS " スベテ" // " All"
-#define MSG_PREHEAT_ABS_BEDONLY MSG_PREHEAT_ABS " ベッド" // " Bed"
-#define MSG_PREHEAT_ABS_SETTINGS MSG_PREHEAT_ABS " セッテイ" // " conf"
+#define MSG_PREHEAT_1 "PLA ヨネツ" // "Preheat PLA"
+#define MSG_PREHEAT_1_N MSG_PREHEAT_1 " "
+#define MSG_PREHEAT_1_ALL MSG_PREHEAT_1 " スベテ" // " All"
+#define MSG_PREHEAT_1_BEDONLY MSG_PREHEAT_1 " ベッド" // " Bed"
+#define MSG_PREHEAT_1_SETTINGS MSG_PREHEAT_1 " セッテイ" // " conf"
+#define MSG_PREHEAT_2 "ABS ヨネツ" // "Preheat ABS"
+#define MSG_PREHEAT_2_N MSG_PREHEAT_2 " "
+#define MSG_PREHEAT_2_ALL MSG_PREHEAT_2 " スベテ" // " All"
+#define MSG_PREHEAT_2_BEDONLY MSG_PREHEAT_2 " ベッド" // " Bed"
+#define MSG_PREHEAT_2_SETTINGS MSG_PREHEAT_2 " セッテイ" // " conf"
#define MSG_COOLDOWN "カネツテイシ" // "Cooldown"
#define MSG_SWITCH_PS_ON "デンゲン オン" // "Switch power on"
#define MSG_SWITCH_PS_OFF "デンゲン オフ" // "Switch power off"
diff --git a/Marlin/language_nl.h b/Marlin/language_nl.h
index 4dd07d82e8528f6f528610de36542139e41ef7db..1b1f91877b46681974ecff111aad9f7524d10228 100644
--- a/Marlin/language_nl.h
+++ b/Marlin/language_nl.h
@@ -48,16 +48,16 @@
#define MSG_SET_HOME_OFFSETS "Zet home offsets"
#define MSG_HOME_OFFSETS_APPLIED "H offset toegep."
#define MSG_SET_ORIGIN "Nulpunt instellen"
-#define MSG_PREHEAT_PLA "PLA voorverwarmen"
-#define MSG_PREHEAT_PLA_N "PLA voorverw. "
-#define MSG_PREHEAT_PLA_ALL "PLA voorverw. aan"
-#define MSG_PREHEAT_PLA_BEDONLY "PLA voorverw. Bed"
-#define MSG_PREHEAT_PLA_SETTINGS "PLA verw. conf"
-#define MSG_PREHEAT_ABS "ABS voorverwarmen"
-#define MSG_PREHEAT_ABS_N "ABS voorverw. "
-#define MSG_PREHEAT_ABS_ALL "ABS voorverw. aan"
-#define MSG_PREHEAT_ABS_BEDONLY "ABS voorverw. Bed"
-#define MSG_PREHEAT_ABS_SETTINGS "ABS verw. conf"
+#define MSG_PREHEAT_1 "PLA voorverwarmen"
+#define MSG_PREHEAT_1_N "PLA voorverw. "
+#define MSG_PREHEAT_1_ALL "PLA voorverw. aan"
+#define MSG_PREHEAT_1_BEDONLY "PLA voorverw. Bed"
+#define MSG_PREHEAT_1_SETTINGS "PLA verw. conf"
+#define MSG_PREHEAT_2 "ABS voorverwarmen"
+#define MSG_PREHEAT_2_N "ABS voorverw. "
+#define MSG_PREHEAT_2_ALL "ABS voorverw. aan"
+#define MSG_PREHEAT_2_BEDONLY "ABS voorverw. Bed"
+#define MSG_PREHEAT_2_SETTINGS "ABS verw. conf"
#define MSG_COOLDOWN "Afkoelen"
#define MSG_SWITCH_PS_ON "Stroom aan"
#define MSG_SWITCH_PS_OFF "Stroom uit"
diff --git a/Marlin/language_pl.h b/Marlin/language_pl.h
index 71d664c3c1f34eee8842ff7b22d867ec155d2759..8df809b62b8a4e1c0dd96b7f39dfeb40517706a2 100644
--- a/Marlin/language_pl.h
+++ b/Marlin/language_pl.h
@@ -50,16 +50,16 @@
#define MSG_SET_HOME_OFFSETS "Ust. poz. zer."
#define MSG_HOME_OFFSETS_APPLIED "Poz. zerowa ust."
#define MSG_SET_ORIGIN "Ustaw punkt zero"
-#define MSG_PREHEAT_PLA "Rozgrzej PLA"
-#define MSG_PREHEAT_PLA_N "Rozgrzej PLA "
-#define MSG_PREHEAT_PLA_ALL "Roz. PLA Wszystko"
-#define MSG_PREHEAT_PLA_BEDONLY "Rozgrzej PLA Loze"
-#define MSG_PREHEAT_PLA_SETTINGS "Ustaw. rozg. PLA"
-#define MSG_PREHEAT_ABS "Rozgrzej ABS"
-#define MSG_PREHEAT_ABS_N "Rozgrzej ABS "
-#define MSG_PREHEAT_ABS_ALL "Roz. ABS Wszystko"
-#define MSG_PREHEAT_ABS_BEDONLY "Rozgrzej ABS Loze"
-#define MSG_PREHEAT_ABS_SETTINGS "Ustaw. rozg. ABS"
+#define MSG_PREHEAT_1 "Rozgrzej PLA"
+#define MSG_PREHEAT_1_N "Rozgrzej PLA "
+#define MSG_PREHEAT_1_ALL "Roz. PLA Wszystko"
+#define MSG_PREHEAT_1_BEDONLY "Rozgrzej PLA Loze"
+#define MSG_PREHEAT_1_SETTINGS "Ustaw. rozg. PLA"
+#define MSG_PREHEAT_2 "Rozgrzej ABS"
+#define MSG_PREHEAT_2_N "Rozgrzej ABS "
+#define MSG_PREHEAT_2_ALL "Roz. ABS Wszystko"
+#define MSG_PREHEAT_2_BEDONLY "Rozgrzej ABS Loze"
+#define MSG_PREHEAT_2_SETTINGS "Ustaw. rozg. ABS"
#define MSG_H1 "1"
#define MSG_H2 "2"
#define MSG_H3 "3"
diff --git a/Marlin/language_pt-br.h b/Marlin/language_pt-br.h
index e9f27ecc800813b4b68b045e3184114ef89b6ec5..c8914fc4e1720897096c9c8a3fe797af2c9122de 100644
--- a/Marlin/language_pt-br.h
+++ b/Marlin/language_pt-br.h
@@ -48,16 +48,16 @@
#define MSG_SET_HOME_OFFSETS "Ajustar Jogo"
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
#define MSG_SET_ORIGIN "Ajustar orig."
-#define MSG_PREHEAT_PLA "Pre-aquecer PLA"
-#define MSG_PREHEAT_PLA_N "Pre-aquecer PLA"
-#define MSG_PREHEAT_PLA_ALL "Pre-aq.Todo PLA"
-#define MSG_PREHEAT_PLA_BEDONLY "Pre-aq. PLA " LCD_STR_THERMOMETER "Base"
-#define MSG_PREHEAT_PLA_SETTINGS "Ajustar PLA"
-#define MSG_PREHEAT_ABS "Pre-aquecer ABS"
-#define MSG_PREHEAT_ABS_N "Pre-aquecer ABS"
-#define MSG_PREHEAT_ABS_ALL "Pre-aq.Todo ABS"
-#define MSG_PREHEAT_ABS_BEDONLY "Pre-aq. ABS " LCD_STR_THERMOMETER "Base"
-#define MSG_PREHEAT_ABS_SETTINGS "Ajustar ABS"
+#define MSG_PREHEAT_1 "Pre-aquecer PLA"
+#define MSG_PREHEAT_1_N "Pre-aquecer PLA"
+#define MSG_PREHEAT_1_ALL "Pre-aq.Todo PLA"
+#define MSG_PREHEAT_1_BEDONLY "Pre-aq. PLA " LCD_STR_THERMOMETER "Base"
+#define MSG_PREHEAT_1_SETTINGS "Ajustar PLA"
+#define MSG_PREHEAT_2 "Pre-aquecer ABS"
+#define MSG_PREHEAT_2_N "Pre-aquecer ABS"
+#define MSG_PREHEAT_2_ALL "Pre-aq.Todo ABS"
+#define MSG_PREHEAT_2_BEDONLY "Pre-aq. ABS " LCD_STR_THERMOMETER "Base"
+#define MSG_PREHEAT_2_SETTINGS "Ajustar ABS"
#define MSG_COOLDOWN "Esfriar"
#define MSG_SWITCH_PS_ON "Ligar"
#define MSG_SWITCH_PS_OFF "Desligar"
diff --git a/Marlin/language_pt-br_utf8.h b/Marlin/language_pt-br_utf8.h
index 2909b3d55241b9d33efc222bf4d2a850d21bfea8..48731438bf0681991b331bdd578ddd276237639d 100644
--- a/Marlin/language_pt-br_utf8.h
+++ b/Marlin/language_pt-br_utf8.h
@@ -48,16 +48,16 @@
#define MSG_SET_HOME_OFFSETS "Ajustar Jogo"
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
#define MSG_SET_ORIGIN "Ajustar orig."
-#define MSG_PREHEAT_PLA "Pre-aquecer PLA"
-#define MSG_PREHEAT_PLA_N "Pre-aquecer PLA"
-#define MSG_PREHEAT_PLA_ALL "Pre-aq.Todo PLA"
-#define MSG_PREHEAT_PLA_BEDONLY "Pre-aq. PLA " LCD_STR_THERMOMETER "Base"
-#define MSG_PREHEAT_PLA_SETTINGS "Ajustar PLA"
-#define MSG_PREHEAT_ABS "Pre-aquecer ABS"
-#define MSG_PREHEAT_ABS_N "Pre-aquecer ABS"
-#define MSG_PREHEAT_ABS_ALL "Pre-aq.Todo ABS"
-#define MSG_PREHEAT_ABS_BEDONLY "Pre-aq. ABS " LCD_STR_THERMOMETER "Base"
-#define MSG_PREHEAT_ABS_SETTINGS "Ajustar ABS"
+#define MSG_PREHEAT_1 "Pre-aquecer PLA"
+#define MSG_PREHEAT_1_N "Pre-aquecer PLA"
+#define MSG_PREHEAT_1_ALL "Pre-aq.Todo PLA"
+#define MSG_PREHEAT_1_BEDONLY "Pre-aq. PLA " LCD_STR_THERMOMETER "Base"
+#define MSG_PREHEAT_1_SETTINGS "Ajustar PLA"
+#define MSG_PREHEAT_2 "Pre-aquecer ABS"
+#define MSG_PREHEAT_2_N "Pre-aquecer ABS"
+#define MSG_PREHEAT_2_ALL "Pre-aq.Todo ABS"
+#define MSG_PREHEAT_2_BEDONLY "Pre-aq. ABS " LCD_STR_THERMOMETER "Base"
+#define MSG_PREHEAT_2_SETTINGS "Ajustar ABS"
#define MSG_COOLDOWN "Esfriar"
#define MSG_SWITCH_PS_ON "Ligar"
#define MSG_SWITCH_PS_OFF "Desligar"
diff --git a/Marlin/language_pt.h b/Marlin/language_pt.h
index 2e88f11922eae1f4db9a3346faec6a8d08f28b31..b7c562c20b44e9d1937d9c28c573d48355dac69f 100644
--- a/Marlin/language_pt.h
+++ b/Marlin/language_pt.h
@@ -52,16 +52,16 @@
#define MSG_SET_HOME_OFFSETS "Definir desvio"
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
#define MSG_SET_ORIGIN "Definir origem"
-#define MSG_PREHEAT_PLA "Pre-aquecer PLA"
-#define MSG_PREHEAT_PLA_N "Pre-aquecer PLA"
-#define MSG_PREHEAT_PLA_ALL "Pre-aq. PLA Tudo"
-#define MSG_PREHEAT_PLA_BEDONLY "Pre-aq. PLA " LCD_STR_THERMOMETER "Base"
-#define MSG_PREHEAT_PLA_SETTINGS "Definicoes PLA"
-#define MSG_PREHEAT_ABS "Pre-aquecer ABS"
-#define MSG_PREHEAT_ABS_N "Pre-aquecer ABS "
-#define MSG_PREHEAT_ABS_ALL "Pre-aq. ABS Tudo"
-#define MSG_PREHEAT_ABS_BEDONLY "Pre-aq. ABS " LCD_STR_THERMOMETER "Base"
-#define MSG_PREHEAT_ABS_SETTINGS "Definicoes ABS"
+#define MSG_PREHEAT_1 "Pre-aquecer PLA"
+#define MSG_PREHEAT_1_N "Pre-aquecer PLA"
+#define MSG_PREHEAT_1_ALL "Pre-aq. PLA Tudo"
+#define MSG_PREHEAT_1_BEDONLY "Pre-aq. PLA " LCD_STR_THERMOMETER "Base"
+#define MSG_PREHEAT_1_SETTINGS "Definicoes PLA"
+#define MSG_PREHEAT_2 "Pre-aquecer ABS"
+#define MSG_PREHEAT_2_N "Pre-aquecer ABS "
+#define MSG_PREHEAT_2_ALL "Pre-aq. ABS Tudo"
+#define MSG_PREHEAT_2_BEDONLY "Pre-aq. ABS " LCD_STR_THERMOMETER "Base"
+#define MSG_PREHEAT_2_SETTINGS "Definicoes ABS"
#define MSG_COOLDOWN "Arrefecer"
#define MSG_SWITCH_PS_ON "Ligar"
#define MSG_SWITCH_PS_OFF "Desligar"
diff --git a/Marlin/language_pt_utf8.h b/Marlin/language_pt_utf8.h
index 9040951b3f866d3ce55088e393f4565acb490fb0..ac8b2440c6b8abb66a038c97acad7fcd23b54e39 100644
--- a/Marlin/language_pt_utf8.h
+++ b/Marlin/language_pt_utf8.h
@@ -52,16 +52,16 @@
#define MSG_SET_HOME_OFFSETS "Definir desvio"
#define MSG_HOME_OFFSETS_APPLIED "Offsets aplicados"
#define MSG_SET_ORIGIN "Definir origem"
-#define MSG_PREHEAT_PLA "Pre-aquecer PLA"
-#define MSG_PREHEAT_PLA_N "Pre-aquecer PLA"
-#define MSG_PREHEAT_PLA_ALL "Pre-aq. PLA Tudo"
-#define MSG_PREHEAT_PLA_BEDONLY "Pre-aq. PLA " LCD_STR_THERMOMETER "Base"
-#define MSG_PREHEAT_PLA_SETTINGS "Definições PLA"
-#define MSG_PREHEAT_ABS "Pre-aquecer ABS"
-#define MSG_PREHEAT_ABS_N "Pre-aquecer ABS "
-#define MSG_PREHEAT_ABS_ALL "Pre-aq. ABS Tudo"
-#define MSG_PREHEAT_ABS_BEDONLY "Pre-aq. ABS " LCD_STR_THERMOMETER "Base"
-#define MSG_PREHEAT_ABS_SETTINGS "Definições ABS"
+#define MSG_PREHEAT_1 "Pre-aquecer PLA"
+#define MSG_PREHEAT_1_N "Pre-aquecer PLA"
+#define MSG_PREHEAT_1_ALL "Pre-aq. PLA Tudo"
+#define MSG_PREHEAT_1_BEDONLY "Pre-aq. PLA " LCD_STR_THERMOMETER "Base"
+#define MSG_PREHEAT_1_SETTINGS "Definições PLA"
+#define MSG_PREHEAT_2 "Pre-aquecer ABS"
+#define MSG_PREHEAT_2_N "Pre-aquecer ABS "
+#define MSG_PREHEAT_2_ALL "Pre-aq. ABS Tudo"
+#define MSG_PREHEAT_2_BEDONLY "Pre-aq. ABS " LCD_STR_THERMOMETER "Base"
+#define MSG_PREHEAT_2_SETTINGS "Definições ABS"
#define MSG_COOLDOWN "Arrefecer"
#define MSG_SWITCH_PS_ON "Ligar"
#define MSG_SWITCH_PS_OFF "Desligar"
diff --git a/Marlin/language_ru.h b/Marlin/language_ru.h
index 4d0f976c90373c5a84853d4a1d22859b4b854fbe..c86e349833842a3ff54a30d2425a7ae7914c4578 100644
--- a/Marlin/language_ru.h
+++ b/Marlin/language_ru.h
@@ -49,16 +49,16 @@
#define MSG_SET_HOME_OFFSETS "Запомнить парковку"
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
#define MSG_SET_ORIGIN "Запомнить ноль"
-#define MSG_PREHEAT_PLA "Преднагрев PLA"
-#define MSG_PREHEAT_PLA_N "Греть PLA Сопло "
-#define MSG_PREHEAT_PLA_ALL "Греть PLA Все"
-#define MSG_PREHEAT_PLA_BEDONLY "Греть PLA Стол"
-#define MSG_PREHEAT_PLA_SETTINGS "Настройки PLA"
-#define MSG_PREHEAT_ABS "Преднагрев ABS"
-#define MSG_PREHEAT_ABS_N "Греть ABS Сопло "
-#define MSG_PREHEAT_ABS_ALL "Греть ABS Все"
-#define MSG_PREHEAT_ABS_BEDONLY "Греть ABS Стол"
-#define MSG_PREHEAT_ABS_SETTINGS "Настройки ABS"
+#define MSG_PREHEAT_1 "Преднагрев PLA"
+#define MSG_PREHEAT_1_N "Греть PLA Сопло "
+#define MSG_PREHEAT_1_ALL "Греть PLA Все"
+#define MSG_PREHEAT_1_BEDONLY "Греть PLA Стол"
+#define MSG_PREHEAT_1_SETTINGS "Настройки PLA"
+#define MSG_PREHEAT_2 "Преднагрев ABS"
+#define MSG_PREHEAT_2_N "Греть ABS Сопло "
+#define MSG_PREHEAT_2_ALL "Греть ABS Все"
+#define MSG_PREHEAT_2_BEDONLY "Греть ABS Стол"
+#define MSG_PREHEAT_2_SETTINGS "Настройки ABS"
#define MSG_COOLDOWN "Охлаждение"
#define MSG_SWITCH_PS_ON "Включить Питание"
#define MSG_SWITCH_PS_OFF "Отключить Питание"
diff --git a/Marlin/language_test.h b/Marlin/language_test.h
index ea1b0c4dbc3b2873ccada5b569b519c951748abd..99fa712a7155876a8673d513cc11bfb3408caaab 100644
--- a/Marlin/language_test.h
+++ b/Marlin/language_test.h
@@ -141,8 +141,8 @@
#define MSG_DISABLE_STEPPERS STRG_C2_8
#define MSG_AUTO_HOME STRG_C2_9
#define MSG_SET_HOME_OFFSETS STRG_C2_a
- #define MSG_PREHEAT_PLA STRG_C2_b
- #define MSG_PREHEAT_ABS STRG_C3_8
+ #define MSG_PREHEAT_1 STRG_C2_b
+ #define MSG_PREHEAT_2 STRG_C3_8
#define MSG_COOLDOWN STRG_C3_9
#define MSG_SWITCH_PS_OFF STRG_C3_a
#define MSG_MOVE_AXIS STRG_C3_b
@@ -176,8 +176,8 @@
#define MSG_DISABLE_STEPPERS STRG_D0_8
#define MSG_AUTO_HOME STRG_D0_9
#define MSG_SET_HOME_OFFSETS STRG_D0_a
- #define MSG_PREHEAT_PLA STRG_D0_b
- #define MSG_PREHEAT_ABS STRG_D1_8
+ #define MSG_PREHEAT_1 STRG_D0_b
+ #define MSG_PREHEAT_2 STRG_D1_8
#define MSG_COOLDOWN STRG_D1_9
#define MSG_SWITCH_PS_OFF STRG_D1_a
#define MSG_MOVE_AXIS STRG_D1_b
@@ -211,8 +211,8 @@
#define MSG_DISABLE_STEPPERS STRG_E382_8
#define MSG_AUTO_HOME STRG_E382_9
#define MSG_SET_HOME_OFFSETS STRG_E382_a
- #define MSG_PREHEAT_PLA STRG_E382_b
- #define MSG_PREHEAT_ABS STRG_E383_8
+ #define MSG_PREHEAT_1 STRG_E382_b
+ #define MSG_PREHEAT_2 STRG_E383_8
#define MSG_COOLDOWN STRG_E383_9
#define MSG_SWITCH_PS_OFF STRG_E383_a
#define MSG_MOVE_AXIS STRG_E383_b
diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp
index 00f9065c4beb33bee91d4800f9e6ec36aac6c134..b1a34702da017ff13533bf05b7f3c51070787be4 100755
--- a/Marlin/ultralcd.cpp
+++ b/Marlin/ultralcd.cpp
@@ -33,13 +33,8 @@
#include "printcounter.h"
#endif
-int plaPreheatHotendTemp;
-int plaPreheatHPBTemp;
-int plaPreheatFanSpeed;
-
-int absPreheatHotendTemp;
-int absPreheatHPBTemp;
-int absPreheatFanSpeed;
+int preheatHotendTemp1, preheatBedTemp1, preheatFanSpeed1,
+ preheatHotendTemp2, preheatBedTemp2, preheatFanSpeed2;
#if ENABLED(FILAMENT_LCD_DISPLAY)
millis_t previous_lcd_status_ms = 0;
@@ -885,29 +880,29 @@ void kill_screen(const char* lcd_msg) {
}
#if TEMP_SENSOR_0 != 0
- void lcd_preheat_pla0() { _lcd_preheat(0, plaPreheatHotendTemp, plaPreheatHPBTemp, plaPreheatFanSpeed); }
- void lcd_preheat_abs0() { _lcd_preheat(0, absPreheatHotendTemp, absPreheatHPBTemp, absPreheatFanSpeed); }
+ void lcd_preheat_pla0() { _lcd_preheat(0, preheatHotendTemp1, preheatBedTemp1, preheatFanSpeed1); }
+ void lcd_preheat_abs0() { _lcd_preheat(0, preheatHotendTemp2, preheatBedTemp2, preheatFanSpeed2); }
#endif
#if HOTENDS > 1
- void lcd_preheat_pla1() { _lcd_preheat(1, plaPreheatHotendTemp, plaPreheatHPBTemp, plaPreheatFanSpeed); }
- void lcd_preheat_abs1() { _lcd_preheat(1, absPreheatHotendTemp, absPreheatHPBTemp, absPreheatFanSpeed); }
+ void lcd_preheat_pla1() { _lcd_preheat(1, preheatHotendTemp1, preheatBedTemp1, preheatFanSpeed1); }
+ void lcd_preheat_abs1() { _lcd_preheat(1, preheatHotendTemp2, preheatBedTemp2, preheatFanSpeed2); }
#if HOTENDS > 2
- void lcd_preheat_pla2() { _lcd_preheat(2, plaPreheatHotendTemp, plaPreheatHPBTemp, plaPreheatFanSpeed); }
- void lcd_preheat_abs2() { _lcd_preheat(2, absPreheatHotendTemp, absPreheatHPBTemp, absPreheatFanSpeed); }
+ void lcd_preheat_pla2() { _lcd_preheat(2, preheatHotendTemp1, preheatBedTemp1, preheatFanSpeed1); }
+ void lcd_preheat_abs2() { _lcd_preheat(2, preheatHotendTemp2, preheatBedTemp2, preheatFanSpeed2); }
#if HOTENDS > 3
- void lcd_preheat_pla3() { _lcd_preheat(3, plaPreheatHotendTemp, plaPreheatHPBTemp, plaPreheatFanSpeed); }
- void lcd_preheat_abs3() { _lcd_preheat(3, absPreheatHotendTemp, absPreheatHPBTemp, absPreheatFanSpeed); }
+ void lcd_preheat_pla3() { _lcd_preheat(3, preheatHotendTemp1, preheatBedTemp1, preheatFanSpeed1); }
+ void lcd_preheat_abs3() { _lcd_preheat(3, preheatHotendTemp2, preheatBedTemp2, preheatFanSpeed2); }
#endif
#endif
void lcd_preheat_pla0123() {
#if HOTENDS > 1
- thermalManager.setTargetHotend(plaPreheatHotendTemp, 1);
+ thermalManager.setTargetHotend(preheatHotendTemp1, 1);
#if HOTENDS > 2
- thermalManager.setTargetHotend(plaPreheatHotendTemp, 2);
+ thermalManager.setTargetHotend(preheatHotendTemp1, 2);
#if HOTENDS > 3
- thermalManager.setTargetHotend(plaPreheatHotendTemp, 3);
+ thermalManager.setTargetHotend(preheatHotendTemp1, 3);
#endif
#endif
#endif
@@ -915,11 +910,11 @@ void kill_screen(const char* lcd_msg) {
}
void lcd_preheat_abs0123() {
#if HOTENDS > 1
- thermalManager.setTargetHotend(absPreheatHotendTemp, 1);
+ thermalManager.setTargetHotend(preheatHotendTemp2, 1);
#if HOTENDS > 2
- thermalManager.setTargetHotend(absPreheatHotendTemp, 2);
+ thermalManager.setTargetHotend(preheatHotendTemp2, 2);
#if HOTENDS > 3
- thermalManager.setTargetHotend(absPreheatHotendTemp, 3);
+ thermalManager.setTargetHotend(preheatHotendTemp2, 3);
#endif
#endif
#endif
@@ -929,8 +924,8 @@ void kill_screen(const char* lcd_msg) {
#endif // HOTENDS > 1
#if TEMP_SENSOR_BED != 0
- void lcd_preheat_pla_bedonly() { _lcd_preheat(0, 0, plaPreheatHPBTemp, plaPreheatFanSpeed); }
- void lcd_preheat_abs_bedonly() { _lcd_preheat(0, 0, absPreheatHPBTemp, absPreheatFanSpeed); }
+ void lcd_preheat_pla_bedonly() { _lcd_preheat(0, 0, preheatBedTemp1, preheatFanSpeed1); }
+ void lcd_preheat_abs_bedonly() { _lcd_preheat(0, 0, preheatBedTemp2, preheatFanSpeed2); }
#endif
#if TEMP_SENSOR_0 != 0 && (TEMP_SENSOR_1 != 0 || TEMP_SENSOR_2 != 0 || TEMP_SENSOR_3 != 0 || TEMP_SENSOR_BED != 0)
@@ -939,20 +934,20 @@ void kill_screen(const char* lcd_msg) {
START_MENU();
MENU_ITEM(back, MSG_PREPARE);
#if HOTENDS == 1
- MENU_ITEM(function, MSG_PREHEAT_PLA, lcd_preheat_pla0);
+ MENU_ITEM(function, MSG_PREHEAT_1, lcd_preheat_pla0);
#else
- MENU_ITEM(function, MSG_PREHEAT_PLA_N MSG_H1, lcd_preheat_pla0);
- MENU_ITEM(function, MSG_PREHEAT_PLA_N MSG_H2, lcd_preheat_pla1);
+ MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H1, lcd_preheat_pla0);
+ MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H2, lcd_preheat_pla1);
#if HOTENDS > 2
- MENU_ITEM(function, MSG_PREHEAT_PLA_N MSG_H3, lcd_preheat_pla2);
+ MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H3, lcd_preheat_pla2);
#if HOTENDS > 3
- MENU_ITEM(function, MSG_PREHEAT_PLA_N MSG_H4, lcd_preheat_pla3);
+ MENU_ITEM(function, MSG_PREHEAT_1_N MSG_H4, lcd_preheat_pla3);
#endif
#endif
- MENU_ITEM(function, MSG_PREHEAT_PLA_ALL, lcd_preheat_pla0123);
+ MENU_ITEM(function, MSG_PREHEAT_1_ALL, lcd_preheat_pla0123);
#endif
#if TEMP_SENSOR_BED != 0
- MENU_ITEM(function, MSG_PREHEAT_PLA_BEDONLY, lcd_preheat_pla_bedonly);
+ MENU_ITEM(function, MSG_PREHEAT_1_BEDONLY, lcd_preheat_pla_bedonly);
#endif
END_MENU();
}
@@ -961,20 +956,20 @@ void kill_screen(const char* lcd_msg) {
START_MENU();
MENU_ITEM(back, MSG_PREPARE);
#if HOTENDS == 1
- MENU_ITEM(function, MSG_PREHEAT_ABS, lcd_preheat_abs0);
+ MENU_ITEM(function, MSG_PREHEAT_2, lcd_preheat_abs0);
#else
- MENU_ITEM(function, MSG_PREHEAT_ABS_N MSG_H1, lcd_preheat_abs0);
- MENU_ITEM(function, MSG_PREHEAT_ABS_N MSG_H2, lcd_preheat_abs1);
+ MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H1, lcd_preheat_abs0);
+ MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H2, lcd_preheat_abs1);
#if HOTENDS > 2
- MENU_ITEM(function, MSG_PREHEAT_ABS_N MSG_H3, lcd_preheat_abs2);
+ MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H3, lcd_preheat_abs2);
#if HOTENDS > 3
- MENU_ITEM(function, MSG_PREHEAT_ABS_N MSG_H4, lcd_preheat_abs3);
+ MENU_ITEM(function, MSG_PREHEAT_2_N MSG_H4, lcd_preheat_abs3);
#endif
#endif
- MENU_ITEM(function, MSG_PREHEAT_ABS_ALL, lcd_preheat_abs0123);
+ MENU_ITEM(function, MSG_PREHEAT_2_ALL, lcd_preheat_abs0123);
#endif
#if TEMP_SENSOR_BED != 0
- MENU_ITEM(function, MSG_PREHEAT_ABS_BEDONLY, lcd_preheat_abs_bedonly);
+ MENU_ITEM(function, MSG_PREHEAT_2_BEDONLY, lcd_preheat_abs_bedonly);
#endif
END_MENU();
}
@@ -1250,11 +1245,11 @@ void kill_screen(const char* lcd_msg) {
//
#if TEMP_SENSOR_0 != 0
#if TEMP_SENSOR_1 != 0 || TEMP_SENSOR_2 != 0 || TEMP_SENSOR_3 != 0 || TEMP_SENSOR_BED != 0
- MENU_ITEM(submenu, MSG_PREHEAT_PLA, lcd_preheat_pla_menu);
- MENU_ITEM(submenu, MSG_PREHEAT_ABS, lcd_preheat_abs_menu);
+ MENU_ITEM(submenu, MSG_PREHEAT_1, lcd_preheat_pla_menu);
+ MENU_ITEM(submenu, MSG_PREHEAT_2, lcd_preheat_abs_menu);
#else
- MENU_ITEM(function, MSG_PREHEAT_PLA, lcd_preheat_pla0);
- MENU_ITEM(function, MSG_PREHEAT_ABS, lcd_preheat_abs0);
+ MENU_ITEM(function, MSG_PREHEAT_1, lcd_preheat_pla0);
+ MENU_ITEM(function, MSG_PREHEAT_2, lcd_preheat_abs0);
#endif
#endif
@@ -1713,12 +1708,12 @@ void kill_screen(const char* lcd_msg) {
//
// Preheat PLA conf
//
- MENU_ITEM(submenu, MSG_PREHEAT_PLA_SETTINGS, lcd_control_temperature_preheat_pla_settings_menu);
+ MENU_ITEM(submenu, MSG_PREHEAT_1_SETTINGS, lcd_control_temperature_preheat_pla_settings_menu);
//
// Preheat ABS conf
//
- MENU_ITEM(submenu, MSG_PREHEAT_ABS_SETTINGS, lcd_control_temperature_preheat_abs_settings_menu);
+ MENU_ITEM(submenu, MSG_PREHEAT_2_SETTINGS, lcd_control_temperature_preheat_abs_settings_menu);
END_MENU();
}
@@ -1730,12 +1725,12 @@ void kill_screen(const char* lcd_msg) {
static void lcd_control_temperature_preheat_pla_settings_menu() {
START_MENU();
MENU_ITEM(back, MSG_TEMPERATURE);
- MENU_ITEM_EDIT(int3, MSG_FAN_SPEED, &plaPreheatFanSpeed, 0, 255);
+ MENU_ITEM_EDIT(int3, MSG_FAN_SPEED, &preheatFanSpeed1, 0, 255);
#if TEMP_SENSOR_0 != 0
- MENU_ITEM_EDIT(int3, MSG_NOZZLE, &plaPreheatHotendTemp, HEATER_0_MINTEMP, HEATER_0_MAXTEMP - 15);
+ MENU_ITEM_EDIT(int3, MSG_NOZZLE, &preheatHotendTemp1, HEATER_0_MINTEMP, HEATER_0_MAXTEMP - 15);
#endif
#if TEMP_SENSOR_BED != 0
- MENU_ITEM_EDIT(int3, MSG_BED, &plaPreheatHPBTemp, BED_MINTEMP, BED_MAXTEMP - 15);
+ MENU_ITEM_EDIT(int3, MSG_BED, &preheatBedTemp1, BED_MINTEMP, BED_MAXTEMP - 15);
#endif
#if ENABLED(EEPROM_SETTINGS)
MENU_ITEM(function, MSG_STORE_EPROM, Config_StoreSettings);
@@ -1751,12 +1746,12 @@ void kill_screen(const char* lcd_msg) {
static void lcd_control_temperature_preheat_abs_settings_menu() {
START_MENU();
MENU_ITEM(back, MSG_TEMPERATURE);
- MENU_ITEM_EDIT(int3, MSG_FAN_SPEED, &absPreheatFanSpeed, 0, 255);
+ MENU_ITEM_EDIT(int3, MSG_FAN_SPEED, &preheatFanSpeed2, 0, 255);
#if TEMP_SENSOR_0 != 0
- MENU_ITEM_EDIT(int3, MSG_NOZZLE, &absPreheatHotendTemp, HEATER_0_MINTEMP, HEATER_0_MAXTEMP - 15);
+ MENU_ITEM_EDIT(int3, MSG_NOZZLE, &preheatHotendTemp2, HEATER_0_MINTEMP, HEATER_0_MAXTEMP - 15);
#endif
#if TEMP_SENSOR_BED != 0
- MENU_ITEM_EDIT(int3, MSG_BED, &absPreheatHPBTemp, BED_MINTEMP, BED_MAXTEMP - 15);
+ MENU_ITEM_EDIT(int3, MSG_BED, &preheatBedTemp2, BED_MINTEMP, BED_MAXTEMP - 15);
#endif
#if ENABLED(EEPROM_SETTINGS)
MENU_ITEM(function, MSG_STORE_EPROM, Config_StoreSettings);
diff --git a/Marlin/ultralcd.h b/Marlin/ultralcd.h
index fde78c0b1faddfc28c4e47a88e8b39157164f2db..7a0080698d2a27a7f9982230669dacd47b25d315 100644
--- a/Marlin/ultralcd.h
+++ b/Marlin/ultralcd.h
@@ -90,12 +90,12 @@
FORCE_INLINE void lcd_buttons_update() {}
#endif
- extern int plaPreheatHotendTemp;
- extern int plaPreheatHPBTemp;
- extern int plaPreheatFanSpeed;
- extern int absPreheatHotendTemp;
- extern int absPreheatHPBTemp;
- extern int absPreheatFanSpeed;
+ extern int preheatHotendTemp1;
+ extern int preheatBedTemp1;
+ extern int preheatFanSpeed1;
+ extern int preheatHotendTemp2;
+ extern int preheatBedTemp2;
+ extern int preheatFanSpeed2;
#if ENABLED(FILAMENT_LCD_DISPLAY)
extern millis_t previous_lcd_status_ms;