Skip to content

Case light menu entry #5254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Kaibob2 wants to merge 6 commits into from
Closed

Case light menu entry #5254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
da19a60
Update Marlin_main.cpp
Kaibob2 Nov 18, 2016
14dcfb4
Update language_de.h
Kaibob2 Nov 18, 2016
f515365
Update Marlin_main.cpp
Kaibob2 Nov 19, 2016
d9217fb
Update ultralcd.cpp
Kaibob2 Nov 19, 2016
9591878
Update language_en.h
Kaibob2 Nov 19, 2016
66323d7
Update language_de.h
Kaibob2 Nov 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions Marlin/Marlin_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -7219,12 +7229,6 @@ inline void gcode_M907() {
* P<byte> 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')) {
Expand Down
42 changes: 22 additions & 20 deletions Marlin/language_de.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand All @@ -178,12 +178,14 @@

#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"
#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"
Expand All @@ -210,21 +212,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..."
Expand Down
6 changes: 6 additions & 0 deletions Marlin/language_en.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 12 additions & 1 deletion Marlin/ultralcd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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)));
Expand Down