ESP32 S3 and C3 fix

Paciente8159 · Paciente8159 · commit daa0a9fa6142 · 2026-03-28T15:21:45.000Z
diff --git a/uCNC/src/hal/mcus/esp32c3/mcu_esp32c3.c b/uCNC/src/hal/mcus/esp32c3/mcu_esp32c3.c
@@ -453,7 +453,7 @@ void mcu_config_timeout(mcu_timeout_delgate fp, uint32_t timeout)
 {
 	mcu_timeout_cb = fp;
 #if defined(MCU_HAS_ONESHOT_TIMER) && defined(ENABLE_RT_SYNC_MOTIONS)
-	esp32_oneshot_reload = ((ITP_SAMPLE_RATE >> 1) / timeout);
+	esp32_oneshot_reload = (timeout / signal_timer.us_step);
 #elif defined(MCU_HAS_ONESHOT_TIMER)
 	timer_config_t config = {0};
 	config.divider = getApbFrequency() / 1000000UL; // 1us per count
diff --git a/uCNC/src/hal/mcus/esp32s3/mcu_esp32s3.c b/uCNC/src/hal/mcus/esp32s3/mcu_esp32s3.c
@@ -291,7 +291,7 @@ bool mcu_get_global_isr(void)
 	{
 		return false;
 	}
-	
+
 	uint32_t ps;
 	__asm__ volatile("rsr.ps %0" : "=a"(ps));
 	// INTLEVEL is bits [3:0] of PS
@@ -436,7 +436,7 @@ void mcu_config_timeout(mcu_timeout_delgate fp, uint32_t timeout)
 {
 	mcu_timeout_cb = fp;
 #if defined(MCU_HAS_ONESHOT_TIMER) && defined(ENABLE_RT_SYNC_MOTIONS)
-	esp32_oneshot_reload = ((ITP_SAMPLE_RATE >> 1) / timeout);
+	esp32_oneshot_reload = (timeout / signal_timer.us_step);
 #elif defined(MCU_HAS_ONESHOT_TIMER)
 	timer_config_t config = {0};
 	config.divider = getApbFrequency() / 1000000UL; // 1us per count

Original file line number	Diff line number	Diff line change
`@@ -453,7 +453,7 @@ void mcu_config_timeout(mcu_timeout_delgate fp, uint32_t timeout)`
`453`	`453`	`{`
`454`	`454`	`mcu_timeout_cb = fp;`
`455`	`455`	`#if defined(MCU_HAS_ONESHOT_TIMER) && defined(ENABLE_RT_SYNC_MOTIONS)`
`456`		`- esp32_oneshot_reload = ((ITP_SAMPLE_RATE >> 1) / timeout);`
	`456`	`+ esp32_oneshot_reload = (timeout / signal_timer.us_step);`
`457`	`457`	`#elif defined(MCU_HAS_ONESHOT_TIMER)`
`458`	`458`	`timer_config_t config = {0};`
`459`	`459`	`config.divider = getApbFrequency() / 1000000UL; // 1us per count`
Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,7 @@ bool mcu_get_global_isr(void)`
`291`	`291`	`{`
`292`	`292`	`return false;`
`293`	`293`	`}`
`294`		`-`
	`294`	`+`
`295`	`295`	`uint32_t ps;`
`296`	`296`	`__asm__ volatile("rsr.ps %0" : "=a"(ps));`
`297`	`297`	`// INTLEVEL is bits [3:0] of PS`
`@@ -436,7 +436,7 @@ void mcu_config_timeout(mcu_timeout_delgate fp, uint32_t timeout)`
`436`	`436`	`{`
`437`	`437`	`mcu_timeout_cb = fp;`
`438`	`438`	`#if defined(MCU_HAS_ONESHOT_TIMER) && defined(ENABLE_RT_SYNC_MOTIONS)`
`439`		`- esp32_oneshot_reload = ((ITP_SAMPLE_RATE >> 1) / timeout);`
	`439`	`+ esp32_oneshot_reload = (timeout / signal_timer.us_step);`
`440`	`440`	`#elif defined(MCU_HAS_ONESHOT_TIMER)`
`441`	`441`	`timer_config_t config = {0};`
`442`	`442`	`config.divider = getApbFrequency() / 1000000UL; // 1us per count`