From bfd1e75c040d0c6a0b2c4900649c3094770503a9 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 23 Sep 2017 17:25:18 -0500 Subject: [PATCH] Patch for caselight + lcd compile issues --- Marlin/src/feature/caselight.cpp | 3 +-- Marlin/src/feature/caselight.h | 2 +- Marlin/src/lcd/ultralcd.cpp | 6 ++---- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Marlin/src/feature/caselight.cpp b/Marlin/src/feature/caselight.cpp index 6d755ff9d..22ace5871 100644 --- a/Marlin/src/feature/caselight.cpp +++ b/Marlin/src/feature/caselight.cpp @@ -24,7 +24,7 @@ #if HAS_CASE_LIGHT -int case_light_brightness = CASE_LIGHT_DEFAULT_BRIGHTNESS; +uint8_t case_light_brightness = CASE_LIGHT_DEFAULT_BRIGHTNESS; bool case_light_on = CASE_LIGHT_DEFAULT_ON; #ifndef INVERT_CASE_LIGHT @@ -33,7 +33,6 @@ bool case_light_on = CASE_LIGHT_DEFAULT_ON; void update_case_light() { SET_OUTPUT(CASE_LIGHT_PIN); - uint8_t case_light_bright = (uint8_t)case_light_brightness; if (case_light_on) { if (USEABLE_HARDWARE_PWM(CASE_LIGHT_PIN)) { analogWrite(CASE_LIGHT_PIN, INVERT_CASE_LIGHT ? 255 - case_light_brightness : case_light_brightness ); diff --git a/Marlin/src/feature/caselight.h b/Marlin/src/feature/caselight.h index 98b8c7d52..e97051d2e 100644 --- a/Marlin/src/feature/caselight.h +++ b/Marlin/src/feature/caselight.h @@ -23,7 +23,7 @@ #ifndef __CASELIGHT_H__ #define __CASELIGHT_H__ -extern int case_light_brightness; // LCD routine wants INT +extern uint8_t case_light_brightness; extern bool case_light_on; void update_case_light(); diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp index 386b8aa9b..b10eff5e3 100644 --- a/Marlin/src/lcd/ultralcd.cpp +++ b/Marlin/src/lcd/ultralcd.cpp @@ -761,9 +761,7 @@ void kill_screen(const char* lcd_msg) { #if ENABLED(MENU_ITEM_CASE_LIGHT) - extern int case_light_brightness; - extern bool case_light_on; - extern void update_case_light(); + #include "../feature/caselight.h" void case_light_menu() { START_MENU(); @@ -771,7 +769,7 @@ void kill_screen(const char* lcd_msg) { // ^ Main // MENU_BACK(MSG_MAIN); - MENU_ITEM_EDIT_CALLBACK(int3, MSG_CASE_LIGHT_BRIGHTNESS, &case_light_brightness, 0, 255, update_case_light, true); + MENU_ITEM_EDIT_CALLBACK(int8, MSG_CASE_LIGHT_BRIGHTNESS, &case_light_brightness, 0, 255, update_case_light, true); MENU_ITEM_EDIT_CALLBACK(bool, MSG_CASE_LIGHT, (bool*)&case_light_on, update_case_light); END_MENU(); }