mirror/Grbl_Esp32
1
0
Fork 0
mirror of https://github.com/bdring/Grbl_Esp32.git synced 2025-09-01 18:32:37 +02:00
Code Issues Releases Wiki Activity

fixed dual switches when inverted (#614)

Browse Source 
* fixed dual switches when inverted

* Removed debug message
This commit is contained in:
bdring
2020-09-24 18:22:36 -05:00
committed by GitHub
parent c656a62d41
commit 1c12106869
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Grbl_Esp32/src/Limits.cpp
View File

@@ -376,7 +376,10 @@ uint8_t limits_get_state() {
for (int gang_index = 0; gang_index < 2; gang_index++) { for (int gang_index = 0; gang_index < 2; gang_index++) {
uint8_t pin = limit_pins[axis][gang_index]; uint8_t pin = limit_pins[axis][gang_index];
if (pin != UNDEFINED_PIN) { if (pin != UNDEFINED_PIN) {
pinMask |= (digitalRead(pin) << axis); if (limit_invert->get())
pinMask |= (!digitalRead(pin) << axis);
else
pinMask |= (digitalRead(pin) << axis);
} }
} }
} }
@@ -384,9 +387,6 @@ uint8_t limits_get_state() {
#ifdef INVERT_LIMIT_PIN_MASK // not normally used..unless you have both normal and inverted switches #ifdef INVERT_LIMIT_PIN_MASK // not normally used..unless you have both normal and inverted switches
pinMask ^= INVERT_LIMIT_PIN_MASK; pinMask ^= INVERT_LIMIT_PIN_MASK;
#endif #endif
if (limit_invert->get()) {
pinMask ^= limit_mask;
}
return pinMask; return pinMask;
} }