bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Move M355 caselight to cpp

Browse Source
This commit is contained in:
Scott Lahteine
2017-09-17 18:56:29 -05:00
parent 59608086e6
commit 8ca0b2fd68
5 changed files with 89 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Marlin/src/gcode/feature/caselight/M355.h → Marlin/src/gcode/feature/caselight/M355.cpp
View File

@ -20,27 +20,13 @@
*
*/
#include "../../gcode.h"
#include "../../../inc/MarlinConfig.h"
#if HAS_CASE_LIGHT
#ifndef INVERT_CASE_LIGHT
#define INVERT_CASE_LIGHT false
#endif
int case_light_brightness; // LCD routine wants INT
bool case_light_on;
void update_case_light() {
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 (USEABLE_HARDWARE_PWM(CASE_LIGHT_PIN)) {
analogWrite(CASE_LIGHT_PIN, INVERT_CASE_LIGHT ? 255 - case_light_brightness : case_light_brightness );
}
else WRITE(CASE_LIGHT_PIN, INVERT_CASE_LIGHT ? LOW : HIGH);
}
else WRITE(CASE_LIGHT_PIN, INVERT_CASE_LIGHT ? HIGH : LOW);
}
#endif // HAS_CASE_LIGHT
#include "../../../feature/caselight.h"
#endif
/**
* M355: Turn case light on/off and set brightness
@ -54,7 +40,7 @@
* M355 P200 S0 turns off the light & sets the brightness level
* M355 S1 turns on the light with a brightness of 200 (assuming a PWM pin)
*/
void gcode_M355() {
void GcodeSuite::M355() {
#if HAS_CASE_LIGHT
uint8_t args = 0;
if (parser.seenval('P')) ++args, case_light_brightness = parser.value_byte();

5
Marlin/src/gcode/gcode.cpp
View File

@ -119,7 +119,6 @@ void GcodeSuite::dwell(millis_t time) {
extern void gcode_M163();
extern void gcode_M164();
extern void gcode_M165();
extern void gcode_M355();
extern void gcode_M999();
extern void gcode_T(uint8_t tmp_extruder);
@ -676,9 +675,7 @@ void GcodeSuite::process_next_command() {
case 351: M351(); break; // M351: Toggle MS1 MS2 pins directly, S# determines MS1 or MS2, X# sets the pin high/low.
#endif
case 355: // M355 set case light brightness
gcode_M355();
break;
case 355: M355(); break; // M355: Set case light brightness
#if ENABLED(DEBUG_GCODE_PARSER)
case 800: