From 2a0e22f8b40182a25adaefab9e2ab95e4e1a0d67 Mon Sep 17 00:00:00 2001 From: jflyper Date: Wed, 5 Oct 2016 02:00:02 +0900 Subject: [PATCH] Travis, what did you do with common/atomic.h? --- src/main/drivers/system.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/drivers/system.c b/src/main/drivers/system.c index 13c7a04152..6fa44a1c96 100644 --- a/src/main/drivers/system.c +++ b/src/main/drivers/system.c @@ -122,6 +122,7 @@ uint32_t micros(void) */ asm volatile("\tnop\n"); } while (ms != sysTickUptime); + return (ms * 1000) + (usTicks * 1000 - cycle_cnt) / usTicks; }