MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix caselight compile issues

Browse Source
This commit is contained in:
Scott Lahteine 2017-09-23 18:45:13 -05:00
parent 386b74f8c2
commit 0afd25a010
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Marlin/Marlin_main.cpp
View File

@ -10097,12 +10097,11 @@ inline void gcode_M907() {
#ifndef INVERT_CASE_LIGHT #ifndef INVERT_CASE_LIGHT
#define INVERT_CASE_LIGHT false #define INVERT_CASE_LIGHT false
#endif #endif
int case_light_brightness; // LCD routine wants INT uint8_t case_light_brightness; // LCD routine wants INT
bool case_light_on; bool case_light_on;
void update_case_light() { void update_case_light() {
pinMode(CASE_LIGHT_PIN, OUTPUT); // digitalWrite doesn't set the port mode pinMode(CASE_LIGHT_PIN, OUTPUT); // digitalWrite doesn't set the port mode
uint8_t case_light_bright = (uint8_t)case_light_brightness;
if (case_light_on) { if (case_light_on) {
if (USEABLE_HARDWARE_PWM(CASE_LIGHT_PIN)) { if (USEABLE_HARDWARE_PWM(CASE_LIGHT_PIN)) {
analogWrite(CASE_LIGHT_PIN, INVERT_CASE_LIGHT ? 255 - case_light_brightness : case_light_brightness); analogWrite(CASE_LIGHT_PIN, INVERT_CASE_LIGHT ? 255 - case_light_brightness : case_light_brightness);
@ -10139,7 +10138,7 @@ inline void gcode_M355() {
} }
else { else {
if (!USEABLE_HARDWARE_PWM(CASE_LIGHT_PIN)) SERIAL_ECHOLN("Case light: on"); if (!USEABLE_HARDWARE_PWM(CASE_LIGHT_PIN)) SERIAL_ECHOLN("Case light: on");
else SERIAL_ECHOLNPAIR("Case light: ", case_light_brightness); else SERIAL_ECHOLNPAIR("Case light: ", (int)case_light_brightness);
} }
#else #else

4
Marlin/ultralcd.cpp
View File

@ -752,7 +752,7 @@ void kill_screen(const char* lcd_msg) {
#if ENABLED(MENU_ITEM_CASE_LIGHT) #if ENABLED(MENU_ITEM_CASE_LIGHT)
extern int case_light_brightness; extern uint8_t case_light_brightness;
extern bool case_light_on; extern bool case_light_on;
extern void update_case_light(); extern void update_case_light();
@ -762,7 +762,7 @@ void kill_screen(const char* lcd_msg) {
// ^ Main // ^ Main
// //
MENU_BACK(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); MENU_ITEM_EDIT_CALLBACK(bool, MSG_CASE_LIGHT, (bool*)&case_light_on, update_case_light);
END_MENU(); END_MENU();
} }