From da19a60e31de3d4e781ec43a14de6c33bcd5438a Mon Sep 17 00:00:00 2001 From: Kai Date: Fri, 18 Nov 2016 13:11:24 +0100 Subject: [PATCH 1/6] Update Marlin_main.cpp RCBugFix won't compile due to a missing semicolon in marlin_main.cpp when CASE_LIGHT_DEFAULT_ON is enabled. --- Marlin/Marlin_main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 2dd6610f2a97..7f95bbe831b5 100755 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -7221,7 +7221,7 @@ inline void gcode_M907() { inline void gcode_M355() { static bool case_light_on #if ENABLED(CASE_LIGHT_DEFAULT_ON) - = true + = true; #else ; #endif From 14dcfb49bcf6daa44be78bb8985004ca8931c5ee Mon Sep 17 00:00:00 2001 From: Kai Date: Fri, 18 Nov 2016 13:19:40 +0100 Subject: [PATCH 2/6] Update language_de.h Grammar and "better german" corrections --- Marlin/language_de.h | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/Marlin/language_de.h b/Marlin/language_de.h index 0b64e6739680..a253baa37720 100644 --- a/Marlin/language_de.h +++ b/Marlin/language_de.h @@ -152,7 +152,7 @@ #define MSG_BABYSTEP_X "Babystep X" #define MSG_BABYSTEP_Y "Babystep Y" #define MSG_BABYSTEP_Z "Babystep Z" -#define MSG_ENDSTOP_ABORT "Endstop-Abbr. ein" +#define MSG_ENDSTOP_ABORT "Endstopp-Abbr. ein" #define MSG_HEATING_FAILED_LCD "HEIZEN FEHLGESCHLAGEN" #define MSG_ERR_REDUNDANT_TEMP "REDUND. TEMPERATURABWEICHUNG" #define MSG_THERMAL_RUNAWAY LCD_STR_THERMOMETER " NICHT ERREICHT" @@ -162,7 +162,7 @@ #define MSG_ERR_MINTEMP_BED "BETT " LCD_STR_THERMOMETER " UNTERSCHRITTEN" #define MSG_ERR_Z_HOMING "G28 Z verboten" #define MSG_HALTED "DRUCKER STOPP" -#define MSG_PLEASE_RESET "Bitte Resetten" +#define MSG_PLEASE_RESET "Bitte Reset drücken" #define MSG_SHORT_DAY "t" // One character only #define MSG_SHORT_HOUR "h" // One character only #define MSG_SHORT_MINUTE "m" // One character only @@ -178,12 +178,12 @@ #define MSG_INFO_MENU "Über den Drucker" #define MSG_INFO_PRINTER_MENU "Drucker Info" -#define MSG_INFO_STATS_MENU "Drucker Stats" +#define MSG_INFO_STATS_MENU "Drucker Statistik" #define MSG_INFO_BOARD_MENU "Board Info" -#define MSG_INFO_THERMISTOR_MENU "Thermistors" -#define MSG_INFO_EXTRUDERS "Extruders" +#define MSG_INFO_THERMISTOR_MENU "Thermistoren" +#define MSG_INFO_EXTRUDERS "Extruder" #define MSG_INFO_BAUDRATE "Baud" -#define MSG_INFO_PROTOCOL "Protokol" +#define MSG_INFO_PROTOCOL "Protokoll" #if LCD_WIDTH > 19 #define MSG_INFO_PRINT_COUNT "Gesamte Drucke" @@ -210,21 +210,21 @@ #if LCD_HEIGHT >= 4 #define MSG_FILAMENT_CHANGE_INIT_1 "Warte auf den" #define MSG_FILAMENT_CHANGE_INIT_2 "Start des " - #define MSG_FILAMENT_CHANGE_INIT_3 "Filamentwechsels" - #define MSG_FILAMENT_CHANGE_UNLOAD_1 "Warte auf das" - #define MSG_FILAMENT_CHANGE_UNLOAD_2 "Herausnehmen" - #define MSG_FILAMENT_CHANGE_UNLOAD_3 "des Filaments" - #define MSG_FILAMENT_CHANGE_INSERT_1 "Fädle Filament" - #define MSG_FILAMENT_CHANGE_INSERT_2 "ein und drücke" - #define MSG_FILAMENT_CHANGE_INSERT_3 "den Knopf..." - #define MSG_FILAMENT_CHANGE_LOAD_1 "Warte auf das" + #define MSG_FILAMENT_CHANGE_INIT_3 "Filamentwechsels." + #define MSG_FILAMENT_CHANGE_UNLOAD_1 "Warte auf " + #define MSG_FILAMENT_CHANGE_UNLOAD_2 "Herausnahme" + #define MSG_FILAMENT_CHANGE_UNLOAD_3 "des Filaments." + #define MSG_FILAMENT_CHANGE_INSERT_1 "Filament einfädeln" + #define MSG_FILAMENT_CHANGE_INSERT_2 "und Knopf" + #define MSG_FILAMENT_CHANGE_INSERT_3 "drücken..." + #define MSG_FILAMENT_CHANGE_LOAD_1 "Warte auf " #define MSG_FILAMENT_CHANGE_LOAD_2 "Laden des" - #define MSG_FILAMENT_CHANGE_LOAD_3 "Filaments" - #define MSG_FILAMENT_CHANGE_EXTRUDE_1 "Warte auf das" - #define MSG_FILAMENT_CHANGE_EXTRUDE_2 "Extrudieren des" - #define MSG_FILAMENT_CHANGE_EXTRUDE_3 "Filaments" - #define MSG_FILAMENT_CHANGE_RESUME_1 "Warte auf das" - #define MSG_FILAMENT_CHANGE_RESUME_2 "Fortsetzen des" + #define MSG_FILAMENT_CHANGE_LOAD_3 "Filaments." + #define MSG_FILAMENT_CHANGE_EXTRUDE_1 "Warte auf " + #define MSG_FILAMENT_CHANGE_EXTRUDE_2 "Extrusion des" + #define MSG_FILAMENT_CHANGE_EXTRUDE_3 "Filaments." + #define MSG_FILAMENT_CHANGE_RESUME_1 "Warte auf " + #define MSG_FILAMENT_CHANGE_RESUME_2 "Fortsetzung des" #define MSG_FILAMENT_CHANGE_RESUME_3 "Druckes" #else // LCD_HEIGHT < 4 #define MSG_FILAMENT_CHANGE_INIT_1 "Bitte warten..." From f515365462c085269b528a6281910118c94697ff Mon Sep 17 00:00:00 2001 From: Kai Date: Sat, 19 Nov 2016 10:33:01 +0100 Subject: [PATCH 3/6] Update Marlin_main.cpp --- Marlin/Marlin_main.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 7f95bbe831b5..6d08c054ac18 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 case_light_on = + #if ENABLED(CASE_LIGHT_DEFAULT_ON) + true + #else + false + #endif + ; +#endif + #if ENABLED(DELTA) #define SIN_60 0.8660254037844386 @@ -7219,12 +7229,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; - #else - ; - #endif static uint8_t case_light_brightness = 255; if (code_seen('P')) case_light_brightness = code_value_byte(); if (code_seen('S')) { From d9217fbae0011f16f1a8e9ad5af91f6bc32e0575 Mon Sep 17 00:00:00 2001 From: Kai Date: Sat, 19 Nov 2016 10:37:55 +0100 Subject: [PATCH 4/6] 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..0c31f4ade287 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(); @@ -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 (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))); From 9591878cb85948a747a5b40105ace65a90e4cc4e Mon Sep 17 00:00:00 2001 From: Kai Date: Sat, 19 Nov 2016 10:39:22 +0100 Subject: [PATCH 5/6] 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 66323d72782a611477d855de412f6bf88a5e64b6 Mon Sep 17 00:00:00 2001 From: Kai Date: Sat, 19 Nov 2016 10:40:30 +0100 Subject: [PATCH 6/6] 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 a253baa37720..963e50d58628 100644 --- a/Marlin/language_de.h +++ b/Marlin/language_de.h @@ -184,6 +184,8 @@ #define MSG_INFO_EXTRUDERS "Extruder" #define MSG_INFO_BAUDRATE "Baud" #define MSG_INFO_PROTOCOL "Protokoll" +#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"