Merge pull request #322 from Paciente8159/321-bug-probe-fails-using-i…

…sr-on-stm32 fixed PROBE ISR for STM32
Paciente8159 · Oct 28, 2022 · 6dce7fb · 6dce7fb
2 parents 0bcc89b + cedc50c
commit 6dce7fb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/uCNC/src/core/motion_control.c b/uCNC/src/core/motion_control.c
@@ -664,7 +664,7 @@ uint8_t mc_probe(float *target, uint8_t flags, motion_data_t *block_data)
 			return STATUS_CRITICAL_FAIL;
 		}
 
-#if (defined(FORCE_SOFT_POLLING) || (PROBEEN_MASK != PROBEISR_MASK))
+#if (defined(FORCE_SOFT_POLLING) || !defined(PROBE_ISR))
 		if (io_get_probe() ^ (flags & 0x01))
 		{
 			mcu_probe_changed_cb();

diff --git a/uCNC/src/hal/mcus/stm32f1x/mcu_stm32f1x.c b/uCNC/src/hal/mcus/stm32f1x/mcu_stm32f1x.c
@@ -216,7 +216,7 @@ static void mcu_input_isr(void)
 		mcu_controls_changed_cb();
 	}
 #endif
-#if (PROBE_EXTIBITMASK & 0x01)
+#if (PROBE_EXTIBITMASK != 0)
 	if (EXTI->PR & PROBE_EXTIBITMASK)
 	{
 		mcu_probe_changed_cb();

diff --git a/uCNC/src/hal/mcus/stm32f4x/mcu_stm32f4x.c b/uCNC/src/hal/mcus/stm32f4x/mcu_stm32f4x.c
@@ -198,7 +198,7 @@ static void mcu_input_isr(void)
 		mcu_controls_changed_cb();
 	}
 #endif
-#if (PROBE_EXTIBITMASK & 0x01)
+#if (PROBE_EXTIBITMASK != 0)
 	if (EXTI->PR & PROBE_EXTIBITMASK)
 	{
 		mcu_probe_changed_cb();