Correct ticks being returned from port_get_raw_ticks()

DavePutz · web-flow · commit d8bb2d7c6d32 · 2020-06-08T10:52:27.000-05:00
Issue #2958 . Correct calculation of usec back to ticks in port_get_raw_ticks().
diff --git a/ports/esp32s2/supervisor/port.c b/ports/esp32s2/supervisor/port.c
@@ -118,11 +118,12 @@ uint32_t port_get_saved_word(void) {
 uint64_t port_get_raw_ticks(uint8_t* subticks) {
     struct timeval tv_now;
     gettimeofday(&tv_now, NULL);
-    uint64_t all_subticks = (uint64_t)tv_now.tv_usec / 32768;
+    // convert usec back to ticks
+    uint64_t all_subticks = (uint64_t)tv_now.tv_usec / 1024;
     if (subticks != NULL) {
         *subticks = all_subticks % 32;
     }
-    return (uint64_t)tv_now.tv_sec * 1024L + all_subticks / 32;
+    return (uint64_t)tv_now.tv_sec * 1024L + all_subticks;
 }
 
 // Enable 1/1024 second tick.

Original file line number	Diff line number	Diff line change
`@@ -118,11 +118,12 @@ uint32_t port_get_saved_word(void) {`
`118`	`118`	`uint64_t port_get_raw_ticks(uint8_t* subticks) {`
`119`	`119`	`struct timeval tv_now;`
`120`	`120`	`gettimeofday(&tv_now, NULL);`
`121`		`- uint64_t all_subticks = (uint64_t)tv_now.tv_usec / 32768;`
	`121`	`+ // convert usec back to ticks`
	`122`	`+ uint64_t all_subticks = (uint64_t)tv_now.tv_usec / 1024;`
`122`	`123`	`if (subticks != NULL) {`
`123`	`124`	`*subticks = all_subticks % 32;`
`124`	`125`	`}`
`125`		`- return (uint64_t)tv_now.tv_sec * 1024L + all_subticks / 32;`
	`126`	`+ return (uint64_t)tv_now.tv_sec * 1024L + all_subticks;`
`126`	`127`	`}`
`127`	`128`
`128`	`129`	`// Enable 1/1024 second tick.`