bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Apply HAS_LCD_MENU in EEPROM code

Browse Source
This commit is contained in:
Scott Lahteine
2018-11-08 09:48:09 -06:00
parent b169320a03
commit ef724edd80
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Marlin/src/module/configuration_store.cpp
View File

@@ -680,7 +680,7 @@ void MarlinSettings::postprocess() {
{ {
_FIELD_TEST(lcd_preheat_hotend_temp); _FIELD_TEST(lcd_preheat_hotend_temp);
#if DISABLED(ULTIPANEL) #if !HAS_LCD_MENU
constexpr int16_t lcd_preheat_hotend_temp[2] = { PREHEAT_1_TEMP_HOTEND, PREHEAT_2_TEMP_HOTEND }, constexpr int16_t lcd_preheat_hotend_temp[2] = { PREHEAT_1_TEMP_HOTEND, PREHEAT_2_TEMP_HOTEND },
lcd_preheat_bed_temp[2] = { PREHEAT_1_TEMP_BED, PREHEAT_2_TEMP_BED }; lcd_preheat_bed_temp[2] = { PREHEAT_1_TEMP_BED, PREHEAT_2_TEMP_BED };
constexpr uint8_t lcd_preheat_fan_speed[2] = { PREHEAT_1_FAN_SPEED, PREHEAT_2_FAN_SPEED }; constexpr uint8_t lcd_preheat_fan_speed[2] = { PREHEAT_1_FAN_SPEED, PREHEAT_2_FAN_SPEED };
@@ -1306,7 +1306,7 @@ void MarlinSettings::postprocess() {
{ {
_FIELD_TEST(lcd_preheat_hotend_temp); _FIELD_TEST(lcd_preheat_hotend_temp);
#if DISABLED(ULTIPANEL) #if !HAS_LCD_MENU
int16_t lcd_preheat_hotend_temp[2], lcd_preheat_bed_temp[2]; int16_t lcd_preheat_hotend_temp[2], lcd_preheat_bed_temp[2];
uint8_t lcd_preheat_fan_speed[2]; uint8_t lcd_preheat_fan_speed[2];
#endif #endif
@@ -2027,7 +2027,7 @@ void MarlinSettings::reset(PORTARG_SOLO) {
#endif #endif
#if ENABLED(ULTIPANEL) #if HAS_LCD_MENU
lcd_preheat_hotend_temp[0] = PREHEAT_1_TEMP_HOTEND; lcd_preheat_hotend_temp[0] = PREHEAT_1_TEMP_HOTEND;
lcd_preheat_hotend_temp[1] = PREHEAT_2_TEMP_HOTEND; lcd_preheat_hotend_temp[1] = PREHEAT_2_TEMP_HOTEND;
lcd_preheat_bed_temp[0] = PREHEAT_1_TEMP_BED; lcd_preheat_bed_temp[0] = PREHEAT_1_TEMP_BED;
@@ -2184,7 +2184,7 @@ void MarlinSettings::reset(PORTARG_SOLO) {
#endif #endif
SERIAL_EOL_P(port); SERIAL_EOL_P(port);
#if ENABLED(ULTIPANEL) #if HAS_LCD_MENU
// Temperature units - for Ultipanel temperature options // Temperature units - for Ultipanel temperature options
@@ -2555,7 +2555,8 @@ void MarlinSettings::reset(PORTARG_SOLO) {
#endif // [XYZ]_DUAL_ENDSTOPS #endif // [XYZ]_DUAL_ENDSTOPS
#if ENABLED(ULTIPANEL) #if HAS_LCD_MENU
if (!forReplay) { if (!forReplay) {
CONFIG_ECHO_START; CONFIG_ECHO_START;
SERIAL_ECHOLNPGM_P(port, "Material heatup parameters:"); SERIAL_ECHOLNPGM_P(port, "Material heatup parameters:");
@@ -2567,7 +2568,8 @@ void MarlinSettings::reset(PORTARG_SOLO) {
SERIAL_ECHOPAIR_P(port, " B", TEMP_UNIT(lcd_preheat_bed_temp[i])); SERIAL_ECHOPAIR_P(port, " B", TEMP_UNIT(lcd_preheat_bed_temp[i]));
SERIAL_ECHOLNPAIR_P(port, " F", int(lcd_preheat_fan_speed[i])); SERIAL_ECHOLNPAIR_P(port, " F", int(lcd_preheat_fan_speed[i]));
} }
#endif // ULTIPANEL
#endif
#if HAS_PID_HEATING #if HAS_PID_HEATING

2
Marlin/src/module/tool_change.cpp
View File

@@ -538,7 +538,7 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n
#endif #endif
} }
#if ENABLED(ULTIPANEL) #if HAS_LCD_MENU
lcd_return_to_status(); lcd_return_to_status();
#endif #endif