Merge branch 'master' into prevent-jitter-with-emulated-coms

Paciente8159 · Nov 14, 2023 · 362ba4b · 362ba4b
2 parents 1325c8b + f1e974b
commit 362ba4b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/uCNC/src/hal/mcus/esp32/mcu_esp32.c b/uCNC/src/hal/mcus/esp32/mcu_esp32.c
@@ -739,7 +739,7 @@ void mcu_freq_to_clocks(float frequency, uint16_t *ticks, uint16_t *prescaller)
 #ifndef IC74HC595_HAS_PWMS
 	uint32_t totalticks = (uint32_t)(500000.0f / frequency);
 #else
-	uint32_t totalticks = (uint32_t)(125000.0f / frequency);
+	uint32_t totalticks = (uint32_t)(62500.0f / frequency);
 #endif
 	*prescaller = 1;
 	while (totalticks > 0xFFFF)
@@ -756,7 +756,7 @@ float mcu_clocks_to_freq(uint16_t ticks, uint16_t prescaller)
 #ifndef IC74HC595_HAS_PWMS
 	return (500000.0f / ((float)ticks * (float)prescaller));
 #else
-	return (125000.0f / ((float)ticks * (float)prescaller));
+	return (62500.0f / ((float)ticks * (float)prescaller));
 #endif
 }
 

diff --git a/uCNC/src/interface/serial.c b/uCNC/src/interface/serial.c
@@ -175,7 +175,7 @@ static FORCEINLINE char _serial_peek(void)
 
 	while (!serial_available())
 	{
-		mcu_dotasks();
+		cnc_dotasks();
 	}
 
 #ifndef DISABLE_MULTISTREAM_SERIAL