From d8500f99d8a72d3b1e8b409adaccc59f7f701b3e Mon Sep 17 00:00:00 2001 From: Kai Date: Thu, 17 Nov 2016 19:37:57 +0100 Subject: [PATCH 1/7] Case light improvement --- Marlin/Configuration_adv.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index f750c42faccb..cc2cd9c85596 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -225,8 +225,9 @@ #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed // Define a pin to turn case light on/off -//#define CASE_LIGHT_PIN 4 -//#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on +//#define CASE_LIGHT_PIN 11 // M355 S1 or M355 S0 to switch On / Off +//#define CASE_LIGHT_DEFAULT_ON // Uncomment to set default state to on +//#define MENU_ITEM_CASE_LIGHT // Uncomment to have a Case Light On / Off entry in main menu //=========================================================================== //============================ Mechanical Settings ========================== From 169572cedd3366b52a053a10abce368765d2ee04 Mon Sep 17 00:00:00 2001 From: Kai Date: Thu, 17 Nov 2016 19:40:09 +0100 Subject: [PATCH 2/7] Case light improvement --- Marlin/Marlin_main.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 2dd6610f2a97..e4fa9e7f9053 100755 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -524,6 +524,16 @@ static uint8_t target_extruder; ; #endif +#if ENABLED(ULTIPANEL) && HAS_CASE_LIGHT + bool caselight = + #if ENABLED(CASE_LIGHT_DEFAULT_ON) + true + #else + false + #endif + ; +#endif + #if ENABLED(DELTA) #define SIN_60 0.8660254037844386 From 6faf69af36336e72f9160edb9a6232de8c9a437b Mon Sep 17 00:00:00 2001 From: Kai Date: Thu, 17 Nov 2016 19:42:13 +0100 Subject: [PATCH 3/7] Update Marlin_main.cpp --- Marlin/Marlin_main.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index e4fa9e7f9053..3ab20d08e75a 100755 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -7232,13 +7232,16 @@ inline void gcode_M907() { static bool case_light_on #if ENABLED(CASE_LIGHT_DEFAULT_ON) = true - #else - ; + caselight=true + #else + ; #endif static uint8_t case_light_brightness = 255; if (code_seen('P')) case_light_brightness = code_value_byte(); if (code_seen('S')) { case_light_on = code_value_bool(); + if (case_light_on == 0) caselight = false; + if (case_light_on == 1) caselight = true; digitalWrite(CASE_LIGHT_PIN, case_light_on ? HIGH : LOW); analogWrite(CASE_LIGHT_PIN, case_light_on ? case_light_brightness : 0); } From 74474f7f6dfb4531f34904910cc0f64942972be5 Mon Sep 17 00:00:00 2001 From: Kai Date: Thu, 17 Nov 2016 19:43:56 +0100 Subject: [PATCH 4/7] Update ultralcd.cpp --- Marlin/ultralcd.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 2216a9f1cb0b..ab34be135bb2 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 caselight; + #endif const float manual_feedrate_mm_m[] = MANUAL_FEEDRATE; static void lcd_main_menu(); static void lcd_tune_menu(); @@ -580,7 +583,15 @@ void kill_screen(const char* lcd_msg) { static void lcd_main_menu() { START_MENU(); MENU_BACK(MSG_WATCH); - + // + // Switch case light on/off + // + #if HAS_CASE_LIGHT && ENABLED(MENU_ITEM_CASE_LIGHT) + if (caselight) + MENU_ITEM(gcode, MSG_LIGHTS_OFF, PSTR("M355 S0")); + else + MENU_ITEM(gcode, MSG_LIGHTS_ON, PSTR("M355 S1")); + #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))); From 95e0c2a4a5c22c985616be945fc792f2448908b1 Mon Sep 17 00:00:00 2001 From: Kai Date: Thu, 17 Nov 2016 19:46:02 +0100 Subject: [PATCH 5/7] Update language_en.h --- Marlin/language_en.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Marlin/language_en.h b/Marlin/language_en.h index 648cee6c9a91..58689bd8134e 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 > 19 #ifndef MSG_INFO_PRINT_COUNT From d96efffd8bb5b3a4b1217f043d2f9fb476440216 Mon Sep 17 00:00:00 2001 From: Kai Date: Thu, 17 Nov 2016 19:48:19 +0100 Subject: [PATCH 6/7] Update language_de.h --- Marlin/language_de.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Marlin/language_de.h b/Marlin/language_de.h index 0b64e6739680..ddce4b2b0424 100644 --- a/Marlin/language_de.h +++ b/Marlin/language_de.h @@ -184,6 +184,8 @@ #define MSG_INFO_EXTRUDERS "Extruders" #define MSG_INFO_BAUDRATE "Baud" #define MSG_INFO_PROTOCOL "Protokol" +#define MSG_LIGHTS_ON "Gehäuse Licht an" +#define MSG_LIGHTS_OFF "Gehäuse Licht aus" #if LCD_WIDTH > 19 #define MSG_INFO_PRINT_COUNT "Gesamte Drucke" From 3a690bc5e55b346b6535237cee7fe4a537d2b55f Mon Sep 17 00:00:00 2001 From: Kai Date: Thu, 17 Nov 2016 20:12:28 +0100 Subject: [PATCH 7/7] Update Marlin_main.cpp --- Marlin/Marlin_main.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 3ab20d08e75a..3331c74f6115 100755 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -7231,9 +7231,8 @@ inline void gcode_M907() { inline void gcode_M355() { static bool case_light_on #if ENABLED(CASE_LIGHT_DEFAULT_ON) - = true - caselight=true - #else + = true; + #else ; #endif static uint8_t case_light_brightness = 255;