diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 07a7d7840b3b..4a091aad65dc 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -439,16 +439,17 @@ const bool Z_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic o #define ABS_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255 //LCD and SD support -//#define ULTRA_LCD //general lcd support, also 16x2 +#define ULTRA_LCD //general lcd support, also 16x2 //#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) #define SDSUPPORT // Enable SD Card Support in Hardware Console //#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error) //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking -//#define NEWPANEL +#define NEWPANEL +#define DISABLE_LCD_MOTION_MENU //#define ULTIMAKERCONTROLLER //as available from the ultimaker online store. -//#define ULTIPANEL //the ultipanel as on thingiverse +#define ULTIPANEL //the ultipanel as on thingiverse // The MaKr3d Makr-Panel with graphic controller and SD support // http://reprap.org/wiki/MaKr3d_MaKrPanel diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index b86f896bab16..56e2cc1be0a7 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -55,7 +55,9 @@ static void lcd_control_menu(); static void lcd_control_temperature_menu(); static void lcd_control_temperature_preheat_pla_settings_menu(); static void lcd_control_temperature_preheat_abs_settings_menu(); +#ifndef DISABLE_LCD_MOTION_MENU static void lcd_control_motion_menu(); +#endif #ifdef DOGLCD static void lcd_set_contrast(); #endif @@ -615,7 +617,9 @@ static void lcd_control_menu() START_MENU(); MENU_ITEM(back, MSG_MAIN, lcd_main_menu); MENU_ITEM(submenu, MSG_TEMPERATURE, lcd_control_temperature_menu); +#ifndef DISABLE_LCD_MOTION_MENU MENU_ITEM(submenu, MSG_MOTION, lcd_control_motion_menu); +#endif #ifdef DOGLCD // MENU_ITEM_EDIT(int3, MSG_CONTRAST, &lcd_contrast, 0, 63); MENU_ITEM(submenu, MSG_CONTRAST, lcd_set_contrast); @@ -702,6 +706,7 @@ static void lcd_control_temperature_preheat_abs_settings_menu() END_MENU(); } +#ifndef DISABLE_LCD_MOTION_MENU static void lcd_control_motion_menu() { START_MENU(); @@ -731,6 +736,7 @@ static void lcd_control_motion_menu() #endif END_MENU(); } +#endif #ifdef DOGLCD static void lcd_set_contrast()