Handle better 160MHz cpu clock

me-no-dev · me-no-dev · commit 3e66aeff84d4 · 2018-12-18T22:04:02.000+01:00
diff --git a/cores/esp32/esp32-hal-misc.c b/cores/esp32/esp32-hal-misc.c
@@ -66,7 +66,7 @@ uint32_t cpuFrequencyGet(){
 
 unsigned long IRAM_ATTR micros()
 {
-    return (unsigned long) (esp_timer_get_time() * (240 / _cpu_freq_mhz));
+    return (unsigned long) ((esp_timer_get_time() * 240) / _cpu_freq_mhz);
 }
 
 unsigned long IRAM_ATTR millis()
@@ -76,7 +76,7 @@ unsigned long IRAM_ATTR millis()
 
 void delay(uint32_t ms)
 {
-    vTaskDelay(ms / portTICK_PERIOD_MS / (240 / _cpu_freq_mhz));
+    vTaskDelay((ms * _cpu_freq_mhz) / (portTICK_PERIOD_MS * 240));
 }
 
 void IRAM_ATTR delayMicroseconds(uint32_t us)

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ uint32_t cpuFrequencyGet(){`
`66`	`66`
`67`	`67`	`unsigned long IRAM_ATTR micros()`
`68`	`68`	`{`
`69`		`- return (unsigned long) (esp_timer_get_time() * (240 / _cpu_freq_mhz));`
	`69`	`+ return (unsigned long) ((esp_timer_get_time() * 240) / _cpu_freq_mhz);`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`unsigned long IRAM_ATTR millis()`
`@@ -76,7 +76,7 @@ unsigned long IRAM_ATTR millis()`
`76`	`76`
`77`	`77`	`void delay(uint32_t ms)`
`78`	`78`	`{`
`79`		`- vTaskDelay(ms / portTICK_PERIOD_MS / (240 / _cpu_freq_mhz));`
	`79`	`+ vTaskDelay((ms * _cpu_freq_mhz) / (portTICK_PERIOD_MS * 240));`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`void IRAM_ATTR delayMicroseconds(uint32_t us)`