|
|
@ -33,13 +33,8 @@
|
|
|
|
#include "printcounter.h"
|
|
|
|
#include "printcounter.h"
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
int plaPreheatHotendTemp;
|
|
|
|
int preheatHotendTemp1, preheatBedTemp1, preheatFanSpeed1,
|
|
|
|
int plaPreheatHPBTemp;
|
|
|
|
preheatHotendTemp2, preheatBedTemp2, preheatFanSpeed2;
|
|
|
|
int plaPreheatFanSpeed;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int absPreheatHotendTemp;
|
|
|
|
|
|
|
|
int absPreheatHPBTemp;
|
|
|
|
|
|
|
|
int absPreheatFanSpeed;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#if ENABLED(FILAMENT_LCD_DISPLAY)
|
|
|
|
#if ENABLED(FILAMENT_LCD_DISPLAY)
|
|
|
|
millis_t previous_lcd_status_ms = 0;
|
|
|
|
millis_t previous_lcd_status_ms = 0;
|
|
|
@ -885,29 +880,29 @@ void kill_screen(const char* lcd_msg) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#if TEMP_SENSOR_0 != 0
|
|
|
|
#if TEMP_SENSOR_0 != 0
|
|
|
|
void lcd_preheat_pla0() { _lcd_preheat(0, plaPreheatHotendTemp, plaPreheatHPBTemp, plaPreheatFanSpeed); }
|
|
|
|
void lcd_preheat_pla0() { _lcd_preheat(0, preheatHotendTemp1, preheatBedTemp1, preheatFanSpeed1); }
|
|
|
|
void lcd_preheat_abs0() { _lcd_preheat(0, absPreheatHotendTemp, absPreheatHPBTemp, absPreheatFanSpeed); }
|
|
|
|
void lcd_preheat_abs0() { _lcd_preheat(0, preheatHotendTemp2, preheatBedTemp2, preheatFanSpeed2); }
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
#if HOTENDS > 1
|
|
|
|
#if HOTENDS > 1
|
|
|
|
void lcd_preheat_pla1() { _lcd_preheat(1, plaPreheatHotendTemp, plaPreheatHPBTemp, plaPreheatFanSpeed); }
|
|
|
|
void lcd_preheat_pla1() { _lcd_preheat(1, preheatHotendTemp1, preheatBedTemp1, preheatFanSpeed1); }
|
|
|
|
void lcd_preheat_abs1() { _lcd_preheat(1, absPreheatHotendTemp, absPreheatHPBTemp, absPreheatFanSpeed); }
|
|
|
|
void lcd_preheat_abs1() { _lcd_preheat(1, preheatHotendTemp2, preheatBedTemp2, preheatFanSpeed2); }
|
|
|
|
#if HOTENDS > 2
|
|
|
|
#if HOTENDS > 2
|
|
|
|
void lcd_preheat_pla2() { _lcd_preheat(2, plaPreheatHotendTemp, plaPreheatHPBTemp, plaPreheatFanSpeed); }
|
|
|
|
void lcd_preheat_pla2() { _lcd_preheat(2, preheatHotendTemp1, preheatBedTemp1, preheatFanSpeed1); }
|
|
|
|
void lcd_preheat_abs2() { _lcd_preheat(2, absPreheatHotendTemp, absPreheatHPBTemp, absPreheatFanSpeed); }
|
|
|
|
void lcd_preheat_abs2() { _lcd_preheat(2, preheatHotendTemp2, preheatBedTemp2, preheatFanSpeed2); }
|
|
|
|
#if HOTENDS > 3
|
|
|
|
#if HOTENDS > 3
|
|
|
|
void lcd_preheat_pla3() { _lcd_preheat(3, plaPreheatHotendTemp, plaPreheatHPBTemp, plaPreheatFanSpeed); }
|
|
|
|
void lcd_preheat_pla3() { _lcd_preheat(3, preheatHotendTemp1, preheatBedTemp1, preheatFanSpeed1); }
|
|
|
|
void lcd_preheat_abs3() { _lcd_preheat(3, absPreheatHotendTemp, absPreheatHPBTemp, absPreheatFanSpeed); }
|
|
|
|
void lcd_preheat_abs3() { _lcd_preheat(3, preheatHotendTemp2, preheatBedTemp2, preheatFanSpeed2); }
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
void lcd_preheat_pla0123() {
|
|
|
|
void lcd_preheat_pla0123() {
|
|
|
|
#if HOTENDS > 1
|
|
|
|
#if HOTENDS > 1
|
|
|
|
thermalManager.setTargetHotend(plaPreheatHotendTemp, 1);
|
|
|
|
thermalManager.setTargetHotend(preheatHotendTemp1, 1);
|
|
|
|
#if HOTENDS > 2
|
|
|
|
#if HOTENDS > 2
|
|
|
|
thermalManager.setTargetHotend(plaPreheatHotendTemp, 2);
|
|
|
|
thermalManager.setTargetHotend(preheatHotendTemp1, 2);
|
|
|
|
#if HOTENDS > 3
|
|
|
|
#if HOTENDS > 3
|
|
|
|
thermalManager.setTargetHotend(plaPreheatHotendTemp, 3);
|
|
|
|
thermalManager.setTargetHotend(preheatHotendTemp1, 3);
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
@ -915,11 +910,11 @@ void kill_screen(const char* lcd_msg) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
void lcd_preheat_abs0123() {
|
|
|
|
void lcd_preheat_abs0123() {
|
|
|
|
#if HOTENDS > 1
|
|
|
|
#if HOTENDS > 1
|
|
|
|
thermalManager.setTargetHotend(absPreheatHotendTemp, 1);
|
|
|
|
thermalManager.setTargetHotend(preheatHotendTemp2, 1);
|
|
|
|
#if HOTENDS > 2
|
|
|
|
#if HOTENDS > 2
|
|
|
|
thermalManager.setTargetHotend(absPreheatHotendTemp, 2);
|
|
|
|
thermalManager.setTargetHotend(preheatHotendTemp2, 2);
|
|
|
|
#if HOTENDS > 3
|
|
|
|
#if HOTENDS > 3
|
|
|
|
thermalManager.setTargetHotend(absPreheatHotendTemp, 3);
|
|
|
|
thermalManager.setTargetHotend(preheatHotendTemp2, 3);
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
@ -929,8 +924,8 @@ void kill_screen(const char* lcd_msg) {
|
|
|
|
#endif // HOTENDS > 1
|
|
|
|
#endif // HOTENDS > 1
|
|
|
|
|
|
|
|
|
|
|
|
#if TEMP_SENSOR_BED != 0
|
|
|
|
#if TEMP_SENSOR_BED != 0
|
|
|
|
void lcd_preheat_pla_bedonly() { _lcd_preheat(0, 0, plaPreheatHPBTemp, plaPreheatFanSpeed); }
|
|
|
|
void lcd_preheat_pla_bedonly() { _lcd_preheat(0, 0, preheatBedTemp1, preheatFanSpeed1); }
|
|
|
|
void lcd_preheat_abs_bedonly() { _lcd_preheat(0, 0, absPreheatHPBTemp, absPreheatFanSpeed); }
|
|
|
|
void lcd_preheat_abs_bedonly() { _lcd_preheat(0, 0, preheatBedTemp2, preheatFanSpeed2); }
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
#if TEMP_SENSOR_0 != 0 && (TEMP_SENSOR_1 != 0 || TEMP_SENSOR_2 != 0 || TEMP_SENSOR_3 != 0 || TEMP_SENSOR_BED != 0)
|
|
|
|
#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();
|
|
|
|
START_MENU();
|
|
|
|
MENU_ITEM(back, MSG_PREPARE);
|
|
|
|
MENU_ITEM(back, MSG_PREPARE);
|
|
|
|
#if HOTENDS == 1
|
|
|
|
#if HOTENDS == 1
|
|
|
|
MENU_ITEM(function, MSG_PREHEAT_PLA, lcd_preheat_pla0);
|
|
|
|
MENU_ITEM(function, MSG_PREHEAT_1, lcd_preheat_pla0);
|
|
|
|
#else
|
|
|
|
#else
|
|
|
|
MENU_ITEM(function, MSG_PREHEAT_PLA_N MSG_H1, lcd_preheat_pla0);
|
|
|
|
MENU_ITEM(function, MSG_PREHEAT_1_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_H2, lcd_preheat_pla1);
|
|
|
|
#if HOTENDS > 2
|
|
|
|
#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
|
|
|
|
#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
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
MENU_ITEM(function, MSG_PREHEAT_PLA_ALL, lcd_preheat_pla0123);
|
|
|
|
MENU_ITEM(function, MSG_PREHEAT_1_ALL, lcd_preheat_pla0123);
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#if TEMP_SENSOR_BED != 0
|
|
|
|
#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
|
|
|
|
#endif
|
|
|
|
END_MENU();
|
|
|
|
END_MENU();
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -961,20 +956,20 @@ void kill_screen(const char* lcd_msg) {
|
|
|
|
START_MENU();
|
|
|
|
START_MENU();
|
|
|
|
MENU_ITEM(back, MSG_PREPARE);
|
|
|
|
MENU_ITEM(back, MSG_PREPARE);
|
|
|
|
#if HOTENDS == 1
|
|
|
|
#if HOTENDS == 1
|
|
|
|
MENU_ITEM(function, MSG_PREHEAT_ABS, lcd_preheat_abs0);
|
|
|
|
MENU_ITEM(function, MSG_PREHEAT_2, lcd_preheat_abs0);
|
|
|
|
#else
|
|
|
|
#else
|
|
|
|
MENU_ITEM(function, MSG_PREHEAT_ABS_N MSG_H1, lcd_preheat_abs0);
|
|
|
|
MENU_ITEM(function, MSG_PREHEAT_2_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_H2, lcd_preheat_abs1);
|
|
|
|
#if HOTENDS > 2
|
|
|
|
#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
|
|
|
|
#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
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
MENU_ITEM(function, MSG_PREHEAT_ABS_ALL, lcd_preheat_abs0123);
|
|
|
|
MENU_ITEM(function, MSG_PREHEAT_2_ALL, lcd_preheat_abs0123);
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#if TEMP_SENSOR_BED != 0
|
|
|
|
#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
|
|
|
|
#endif
|
|
|
|
END_MENU();
|
|
|
|
END_MENU();
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -1250,11 +1245,11 @@ void kill_screen(const char* lcd_msg) {
|
|
|
|
//
|
|
|
|
//
|
|
|
|
#if TEMP_SENSOR_0 != 0
|
|
|
|
#if TEMP_SENSOR_0 != 0
|
|
|
|
#if TEMP_SENSOR_1 != 0 || TEMP_SENSOR_2 != 0 || TEMP_SENSOR_3 != 0 || TEMP_SENSOR_BED != 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_1, lcd_preheat_pla_menu);
|
|
|
|
MENU_ITEM(submenu, MSG_PREHEAT_ABS, lcd_preheat_abs_menu);
|
|
|
|
MENU_ITEM(submenu, MSG_PREHEAT_2, lcd_preheat_abs_menu);
|
|
|
|
#else
|
|
|
|
#else
|
|
|
|
MENU_ITEM(function, MSG_PREHEAT_PLA, lcd_preheat_pla0);
|
|
|
|
MENU_ITEM(function, MSG_PREHEAT_1, lcd_preheat_pla0);
|
|
|
|
MENU_ITEM(function, MSG_PREHEAT_ABS, lcd_preheat_abs0);
|
|
|
|
MENU_ITEM(function, MSG_PREHEAT_2, lcd_preheat_abs0);
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
@ -1713,12 +1708,12 @@ void kill_screen(const char* lcd_msg) {
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// Preheat PLA conf
|
|
|
|
// 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
|
|
|
|
// 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();
|
|
|
|
END_MENU();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -1730,12 +1725,12 @@ void kill_screen(const char* lcd_msg) {
|
|
|
|
static void lcd_control_temperature_preheat_pla_settings_menu() {
|
|
|
|
static void lcd_control_temperature_preheat_pla_settings_menu() {
|
|
|
|
START_MENU();
|
|
|
|
START_MENU();
|
|
|
|
MENU_ITEM(back, MSG_TEMPERATURE);
|
|
|
|
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
|
|
|
|
#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
|
|
|
|
#endif
|
|
|
|
#if TEMP_SENSOR_BED != 0
|
|
|
|
#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
|
|
|
|
#endif
|
|
|
|
#if ENABLED(EEPROM_SETTINGS)
|
|
|
|
#if ENABLED(EEPROM_SETTINGS)
|
|
|
|
MENU_ITEM(function, MSG_STORE_EPROM, Config_StoreSettings);
|
|
|
|
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() {
|
|
|
|
static void lcd_control_temperature_preheat_abs_settings_menu() {
|
|
|
|
START_MENU();
|
|
|
|
START_MENU();
|
|
|
|
MENU_ITEM(back, MSG_TEMPERATURE);
|
|
|
|
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
|
|
|
|
#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
|
|
|
|
#endif
|
|
|
|
#if TEMP_SENSOR_BED != 0
|
|
|
|
#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
|
|
|
|
#endif
|
|
|
|
#if ENABLED(EEPROM_SETTINGS)
|
|
|
|
#if ENABLED(EEPROM_SETTINGS)
|
|
|
|
MENU_ITEM(function, MSG_STORE_EPROM, Config_StoreSettings);
|
|
|
|
MENU_ITEM(function, MSG_STORE_EPROM, Config_StoreSettings);
|
|
|
|