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

Some cleanup to M43

Browse Source
This commit is contained in:
Scott Lahteine 2016-10-30 20:10:17 -05:00
parent 24f6612551
commit 04a1fac029
1 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Marlin/Marlin_main.cpp
View File

@ -4676,26 +4676,43 @@ inline void gcode_M42() {
/** /**
* M43: Pin report and debug * M43: Pin report and debug
* *
* pin report if just M43 with no codes * E<bool> Enable / disable background endstop monitoring
* P<pin> Will read/watch a single pin * - Machine continues to operate
* W Watch pins for changes until reboot * - Reports changes to endstops
* E toggles endstop monitor * - Toggles LED when an endstop changes
* reports changes to endstops *
* toggles LED when endstop changes * or
* background function (machine continues to operate as normal) *
* P<pin> Pin to read or watch. If omitted, read/watch all pins.
* W<bool> Watch pins -reporting changes- until reset, click, or M108.
* I<bool> Flag to ignore Marlin's pin protection.
* *
*/ */
inline void gcode_M43() { inline void gcode_M43() {
// Enable or disable endstop monitoring
if (code_seen('E')) {
endstop_monitor_flag = code_value_bool();
SERIAL_PROTOCOLPGM("endstop monitor ");
SERIAL_PROTOCOL(endstop_monitor_flag ? "en" : "dis");
SERIAL_PROTOCOLLNPGM("abled");
return;
}
// Get the range of pins to test or watch
int first_pin = 0, last_pin = DIO_COUNT - 1; int first_pin = 0, last_pin = DIO_COUNT - 1;
if (code_seen('P')) { if (code_seen('P')) {
first_pin = last_pin = code_value_byte(); first_pin = last_pin = code_value_byte();
if (first_pin > DIO_COUNT - 1) return; if (first_pin > DIO_COUNT - 1) return;
} }
bool ignore_protection = code_seen('I') ? code_value_bool() : false;
// Watch until click, M108, or reset
if (code_seen('W') && code_value_bool()) { // watch digital pins if (code_seen('W') && code_value_bool()) { // watch digital pins
byte pin_state[last_pin - first_pin + 1]; byte pin_state[last_pin - first_pin + 1];
for (int8_t pin = first_pin; pin <= last_pin; pin++) { for (int8_t pin = first_pin; pin <= last_pin; pin++) {
if (pin_is_protected(pin)) continue; if (pin_is_protected(pin) && !ignore_protection) continue;
pinMode(pin, INPUT_PULLUP); pinMode(pin, INPUT_PULLUP);
// if (IS_ANALOG(pin)) // if (IS_ANALOG(pin))
// pin_state[pin - first_pin] = analogRead(pin - analogInputToDigitalPin(0)); // int16_t pin_state[...] // pin_state[pin - first_pin] = analogRead(pin - analogInputToDigitalPin(0)); // int16_t pin_state[...]
@ -4727,17 +4744,12 @@ inline void gcode_M42() {
safe_delay(500); safe_delay(500);
} }
return;
} }
if ( !(code_seen('P') || code_seen('W') || code_seen('E'))) // single pins report
for (uint8_t pin = first_pin; pin <= last_pin; pin++)
report_pin_state_extended(pin, code_seen('I') ); // "hidden" option to ignore protected list
if (code_seen('E')) { // Report current state of selected pin(s)
endstop_monitor_flag ^= true; for (uint8_t pin = first_pin; pin <= last_pin; pin++)
SERIAL_PROTOCOLPGM("endstop monitor "); report_pin_state_extended(pin, ignore_protection);
SERIAL_PROTOCOL(endstop_monitor_flag ? "en" : "dis");
SERIAL_PROTOCOLLNPGM("abled");
}
} }
#endif // PINS_DEBUGGING #endif // PINS_DEBUGGING