CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Common pin_is_protected function

Browse Source
This commit is contained in:
Scott Lahteine 2016-10-05 01:50:36 -05:00
parent 49d77720d5
commit 0c0deb5194
1 changed files with 34 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Marlin/Marlin_main.cpp
View File

@ -414,8 +414,6 @@ const char axis_codes[NUM_AXIS] = {'X', 'Y', 'Z', 'E'};
static int serial_count = 0; static int serial_count = 0;
const int sensitive_pins[] = SENSITIVE_PINS; ///< Sensitive pin list for M42
// Inactivity shutdown // Inactivity shutdown
millis_t previous_cmd_ms = 0; millis_t previous_cmd_ms = 0;
static millis_t max_inactive_time = 0; static millis_t max_inactive_time = 0;
@ -4609,6 +4607,16 @@ inline void gcode_M31() {
#endif // SDSUPPORT #endif // SDSUPPORT
/**
* Sensitive pin test for M42, M226
*/
static bool pin_is_protected(uint8_t pin) {
static const int sensitive_pins[] = SENSITIVE_PINS;
for (uint8_t i = 0; i < COUNT(sensitive_pins); i++)
if (sensitive_pins[i] == pin) return true;
return false;
}
/** /**
* M42: Change pin status via GCode * M42: Change pin status via GCode
* *
@ -4624,8 +4632,7 @@ inline void gcode_M42() {
int pin_number = code_seen('P') ? code_value_int() : LED_PIN; int pin_number = code_seen('P') ? code_value_int() : LED_PIN;
if (pin_number < 0) return; if (pin_number < 0) return;
for (uint8_t i = 0; i < COUNT(sensitive_pins); i++) if (pin_is_protected(pin_number)) {
if (pin_number == sensitive_pins[i]) {
SERIAL_ERROR_START; SERIAL_ERROR_START;
SERIAL_ERRORLNPGM(MSG_ERR_PROTECTED_PIN); SERIAL_ERRORLNPGM(MSG_ERR_PROTECTED_PIN);
return; return;
@ -6050,34 +6057,23 @@ inline void gcode_M221() {
*/ */
inline void gcode_M226() { inline void gcode_M226() {
if (code_seen('P')) { if (code_seen('P')) {
int pin_number = code_value_int(); int pin_number = code_value_int(),
int pin_state = code_seen('S') ? code_value_int() : -1; // required pin state - default is inverted pin_state = code_seen('S') ? code_value_int() : -1; // required pin state - default is inverted
if (pin_state >= -1 && pin_state <= 1) { if (pin_state >= -1 && pin_state <= 1 && pin_number > -1 && !pin_is_protected(pin_number)) {
for (uint8_t i = 0; i < COUNT(sensitive_pins); i++) {
if (sensitive_pins[i] == pin_number) {
pin_number = -1;
break;
}
}
if (pin_number > -1) {
int target = LOW; int target = LOW;
stepper.synchronize(); stepper.synchronize();
pinMode(pin_number, INPUT); pinMode(pin_number, INPUT);
switch (pin_state) { switch (pin_state) {
case 1: case 1:
target = HIGH; target = HIGH;
break; break;
case 0: case 0:
target = LOW; target = LOW;
break; break;
case -1: case -1:
target = !digitalRead(pin_number); target = !digitalRead(pin_number);
break; break;
@ -6085,8 +6081,7 @@ inline void gcode_M226() {
while (digitalRead(pin_number) != target) idle(); while (digitalRead(pin_number) != target) idle();
} // pin_number > -1 } // pin_state -1 0 1 && pin_number > -1
} // pin_state -1 0 1
} // code_seen('P') } // code_seen('P')
} }