Merge branch 'jcw-delay-losing-time' into development

2015-11-04 09:40:50 +11:00 · 2015-11-04 09:40:50 +11:00 · d94452f1d5
parent e48ff38e52 cc85e58a37
commit d94452f1d5
1 changed files with 3 additions and 4 deletions
--- a/STM32F1/cores/maple/wirish_time.cpp
+++ b/STM32F1/cores/maple/wirish_time.cpp
@ -34,10 +34,9 @@
 #include <libmaple/delay.h>

 void delay(unsigned long ms) {
-    uint32 i;
-    for (i = 0; i < ms; i++) {
-        delayMicroseconds(1000);
-    }
+    uint32 start = millis();
+    while (millis() - start < ms)
+        ;
 }

 void delayMicroseconds(uint32 us) {