Merge pull request #40 from KurtE/arduino

facchinm · web-flow · commit 870c5f965af4 · 2025-01-22T12:05:57.000+01:00
Fix micros() rollover
diff --git a/cores/arduino/zephyrCommon.cpp b/cores/arduino/zephyrCommon.cpp
@@ -271,7 +271,7 @@ void delay(unsigned long ms) { k_sleep(K_MSEC(ms)); }
 void delayMicroseconds(unsigned int us) { k_sleep(K_USEC(us)); }
 
 unsigned long micros(void) {
-  return k_cyc_to_us_floor32(k_cycle_get_32());
+  return k_cyc_to_us_floor32(k_cycle_get_64());
 }
 
 unsigned long millis(void) { return k_uptime_get_32(); }

Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@ void delay(unsigned long ms) { k_sleep(K_MSEC(ms)); }`
`271`	`271`	`void delayMicroseconds(unsigned int us) { k_sleep(K_USEC(us)); }`
`272`	`272`
`273`	`273`	`unsigned long micros(void) {`
`274`		`- return k_cyc_to_us_floor32(k_cycle_get_32());`
	`274`	`+ return k_cyc_to_us_floor32(k_cycle_get_64());`
`275`	`275`	`}`
`276`	`276`
`277`	`277`	`unsigned long millis(void) { return k_uptime_get_32(); }`