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

Additional tweaks to M42 exit conditions

Browse Source
This commit is contained in:
Scott Lahteine 2016-03-06 02:20:03 -08:00
parent 4bbea5124d
commit 38b0082bf2
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Marlin/Marlin_main.cpp
View File

@ -3584,39 +3584,39 @@ inline void gcode_M31() {
/** /**
* M42: Change pin status via GCode * M42: Change pin status via GCode
*
* P<pin> Pin number (LED if omitted)
* S<byte> Pin status from 0 - 255
*/ */
inline void gcode_M42() { inline void gcode_M42() {
if (code_seen('S')) { if (code_seen('S')) {
int pin_status = code_value_short(), int pin_status = code_value_short();
pin_number = LED_PIN; if (pin_status < 0 || pin_status > 255) return;
if (code_seen('P') && pin_status >= 0 && pin_status <= 255) int pin_number = code_seen('P') ? code_value_short() : LED_PIN;
pin_number = code_value_short(); if (pin_number < 0) return;
for (uint8_t i = 0; i < COUNT(sensitive_pins); i++) { for (uint8_t i = 0; i < COUNT(sensitive_pins); i++)
if (sensitive_pins[i] == pin_number) { if (pin_number == sensitive_pins[i]) return;
pin_number = -1;
break;
}
}
#if HAS_FAN0
if (pin_number == FAN_PIN) fanSpeeds[0] = pin_status;
#endif
#if HAS_FAN1
if (pin_number == FAN1_PIN) fanSpeeds[1] = pin_status;
#endif
#if HAS_FAN2
if (pin_number == FAN2_PIN) fanSpeeds[2] = pin_status;
#endif
if (pin_number > -1) {
pinMode(pin_number, OUTPUT); pinMode(pin_number, OUTPUT);
digitalWrite(pin_number, pin_status); digitalWrite(pin_number, pin_status);
analogWrite(pin_number, pin_status); analogWrite(pin_number, pin_status);
#if FAN_COUNT > 0
switch (pin_number) {
#if HAS_FAN0
case FAN_PIN: fanSpeeds[0] = pin_status; break;
#endif
#if HAS_FAN1
case FAN1_PIN: fanSpeeds[1] = pin_status; break;
#endif
#if HAS_FAN2
case FAN2_PIN: fanSpeeds[2] = pin_status; break;
#endif
} }
#endif
} // code_seen('S') } // code_seen('S')
} }