From 0c341f0c50a6b98bccf812d31f9a44312db0eac1 Mon Sep 17 00:00:00 2001 From: Kai Date: Sat, 19 Nov 2016 11:17:39 +0100 Subject: [PATCH] Added Menu entry for Case light --- Marlin/Marlin_main.cpp | 15 ++++++++++----- Marlin/language_en.h | 6 ++++++ Marlin/ultralcd.cpp | 17 +++++++++++++++-- 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index da54ce4d6..90a06c98a 100755 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -530,6 +530,16 @@ static uint8_t target_extruder; ; #endif +#if ENABLED(ULTIPANEL) && HAS_CASE_LIGHT + bool case_light_on = + #if ENABLED(CASE_LIGHT_DEFAULT_ON) + true + #else + false + #endif + ; +#endif + #if ENABLED(DELTA) #define SIN_60 0.8660254037844386 @@ -7225,11 +7235,6 @@ inline void gcode_M907() { * P Set case light brightness (PWM pin required) */ inline void gcode_M355() { - static bool case_light_on - #if ENABLED(CASE_LIGHT_DEFAULT_ON) - = true - #endif - ; static uint8_t case_light_brightness = 255; if (code_seen('P')) case_light_brightness = code_value_byte(); if (code_seen('S')) { diff --git a/Marlin/language_en.h b/Marlin/language_en.h index d0439f5a0..0529d9869 100644 --- a/Marlin/language_en.h +++ b/Marlin/language_en.h @@ -487,6 +487,12 @@ #ifndef MSG_INFO_PROTOCOL #define MSG_INFO_PROTOCOL "Protocol" #endif +#ifndef MSG_LIGHTS_ON + #define MSG_LIGHTS_ON "Case light on" +#endif +#ifndef MSG_LIGHTS_OFF + #define MSG_LIGHTS_OFF "Case light off" +#endif #if LCD_WIDTH >= 20 #ifndef MSG_INFO_PRINT_COUNT diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 7073b9125..3a912d182 100755 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -110,6 +110,9 @@ uint8_t lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; // Set when the LCD needs to #if HAS_POWER_SWITCH extern bool powersupply; #endif + #if HAS_CASE_LIGHT + extern bool case_light_on; + #endif const float manual_feedrate_mm_m[] = MANUAL_FEEDRATE; static void lcd_main_menu(); static void lcd_tune_menu(); @@ -581,6 +584,16 @@ void kill_screen(const char* lcd_msg) { START_MENU(); MENU_BACK(MSG_WATCH); + // + // Switch case light on/off + // + #if HAS_CASE_LIGHT && ENABLED(MENU_ITEM_CASE_LIGHT) + if (case_light_on == 0) + MENU_ITEM(gcode, MSG_LIGHTS_ON, PSTR("M355 S1")); + else + MENU_ITEM(gcode, MSG_LIGHTS_OFF, PSTR("M355 S0")); + #endif + #if ENABLED(BLTOUCH) if (!endstops.z_probe_enabled && TEST_BLTOUCH()) MENU_ITEM(gcode, MSG_BLTOUCH_RESET, PSTR("M280 P" STRINGIFY(Z_ENDSTOP_SERVO_NR) " S" STRINGIFY(BLTOUCH_RESET))); @@ -857,7 +870,7 @@ void kill_screen(const char* lcd_msg) { static void lcd_dac_menu() { dac_driver_getValues(); - START_MENU(); + START_MENU(); MENU_BACK(MSG_CONTROL); MENU_ITEM_EDIT_CALLBACK(int3, MSG_X " " MSG_DAC_PERCENT, &driverPercent[X_AXIS], 0, 100, dac_driver_commit); MENU_ITEM_EDIT_CALLBACK(int3, MSG_Y " " MSG_DAC_PERCENT, &driverPercent[Y_AXIS], 0, 100, dac_driver_commit); @@ -1547,7 +1560,7 @@ void kill_screen(const char* lcd_msg) { MENU_ITEM(submenu, MSG_RETRACT, lcd_control_retract_menu); #endif #if ENABLED(DAC_STEPPER_CURRENT) - MENU_ITEM(submenu, MSG_DRIVE_STRENGTH, lcd_dac_menu); + MENU_ITEM(submenu, MSG_DRIVE_STRENGTH, lcd_dac_menu); #endif #if ENABLED(EEPROM_SETTINGS)