Merge pull request adafruit#3020 from DavePutz/issue2958

tannewt · web-flow · commit 9b8d6489869a · 2020-06-09T12:41:18.000-07:00
Issue adafruit#2958 Correct calculation of subticks being returned from port_get_raw_ticks() for esp32s2
diff --git a/ports/esp32s2/supervisor/port.c b/ports/esp32s2/supervisor/port.c
@@ -118,7 +118,8 @@ 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 * 2) / 71;
     if (subticks != NULL) {
         *subticks = all_subticks % 32;
     }
