Merge pull request #143 from StefanBruens/fix_stm32_probe

Correct bitmask/bool mixup for STM32 probe pin
terjeio · Dec 18, 2020 · 2569bb2 · 2569bb2
2 parents 498320f + e84af59
commit 2569bb2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/drivers/STM32F1xx/Src/driver.c b/drivers/STM32F1xx/Src/driver.c
@@ -368,10 +368,10 @@ static control_signals_t systemGetState (void)
 // and the probing cycle modes for toward-workpiece/away-from-workpiece.
 static void probeConfigure(bool is_probe_away, bool probing)
 {
-    probe_invert = settings.probe.invert_probe_pin;
+    probe_invert = settings.probe.invert_probe_pin ? 1 : 0;
 
     if (is_probe_away)
-        probe_invert ^= PROBE_BIT;
+        probe_invert ^= 1;
 }
 
 // Returns the probe connected and triggered pin states.

diff --git a/drivers/STM32F4xx/Src/driver.c b/drivers/STM32F4xx/Src/driver.c
@@ -554,10 +554,10 @@ static control_signals_t systemGetState (void)
 // and the probing cycle modes for toward-workpiece/away-from-workpiece.
 static void probeConfigure(bool is_probe_away, bool probing)
 {
-    probe_invert = settings.probe.invert_probe_pin;
+    probe_invert = settings.probe.invert_probe_pin ? 1 : 0;
 #ifdef PROBE_PIN
     if (is_probe_away)
-        probe_invert ^= PROBE_BIT;
+        probe_invert ^= 1;
 #endif
 }