Update all modules to use new sleep(): mp_hal_delay_ms.

Author: markshannon

inc/microbit/mphal.h

@@ -35,7 +35,6 @@ extern "C" {
 void mp_hal_init(void);
 
 unsigned int mp_hal_get_milliseconds(void);
-void mp_hal_milli_delay(unsigned int ms);
 
 void mp_hal_set_interrupt_char(int c);
 bool mp_hal_stdin_rx_any(void);
@@ -50,6 +49,8 @@ void mp_hal_erase_line_from_cursor(uint n_chars);
 
 void mp_hal_display_string(const char*);
 
+void mp_hal_delay_ms(int ms);
+
 #ifdef __cplusplus
 }
 #endif

source/microbit/microbitmusic.cpp

@@ -29,6 +29,7 @@
 
 extern "C" {
 
+#include "mphal.h"
 #include "py/runtime.h"
 #include "py/objstr.h"
 #include "modmicrobit.h"
@@ -152,15 +153,15 @@ STATIC void play_note(microbit_music_obj_t *self, const char *note_str, size_t n
     }
 
     // Cut off 10ms from end of note so we hear articulation.
-    uBit.sleep((ms_per_tick * self->last_duration) - 10);
+    mp_hal_delay_ms((ms_per_tick * self->last_duration) - 10);
 
     if (note_index >= 10) {
         pin->setAnalogValue(128);
     }
 
     pin->setAnalogValue(0);
     // Add 10ms of silence to the end of note so we hear articulation.
-    uBit.sleep(10);
+    mp_hal_delay_ms(10);
 }
 
 STATIC mp_obj_t microbit_music_reset(mp_obj_t self_in) {
@@ -241,7 +242,7 @@ STATIC mp_obj_t microbit_music_play(mp_uint_t n_args, const mp_obj_t *pos_args,
                 const char * note_str = mp_obj_str_get_data(items[i], &note_len);
                 play_note(self, note_str, note_len, pin, args[2].u_bool);
             } else {
-                uBit.sleep((60000/self->bpm));
+                mp_hal_delay_ms((60000/self->bpm));
             }
             // allow CTRL-C to stop the tune
             if (MP_STATE_VM(mp_pending_exception) != MP_OBJ_NULL) {
@@ -280,7 +281,7 @@ STATIC mp_obj_t microbit_music_pitch(mp_uint_t n_args, const mp_obj_t *pos_args,
 
     if (length >= 0) {
         if (wait) {
-            uBit.sleep(length);
+            mp_hal_delay_ms(length);
             pin->setAnalogValue(0);
         } else {
             // FIXME: schedule a callback to stop

source/microbit/modantigravity.cpp

@@ -30,6 +30,7 @@
 
 extern "C" {
 
+#include "mphal.h"
 #include "microbitimage.h"
 #include "microbitdisplay.h"
 
@@ -40,7 +41,7 @@ void antigravity(uint8_t interval = 200 /* ms */) {
     // move all of the LED's upwards (we can move them in other directions in the future)
 
     for (uint8_t iteration = 0; iteration < 5; iteration++) {
-        uBit.sleep(interval);
+        mp_hal_delay_ms(interval);
         bool wait = false;
         for (uint8_t row = 1; row < 5 - iteration; row++) {
             for (uint8_t col = 0; col < 5; col++) {

source/microbit/modlove.cpp

@@ -30,6 +30,7 @@
 
 extern "C" {
 
+#include "mphal.h"
 #include "microbitimage.h"
 #include "microbitdisplay.h"
 
@@ -46,11 +47,11 @@ void love(int interval = 80 /* ms */) {
     for(int iteration = 0; iteration < 5; iteration++) {
         for(int step = 0; step < 7; ++step) {
             microbit_display_print(&microbit_display_obj, hearts[step]);
-            uBit.sleep(interval);
+            mp_hal_delay_ms(interval);
         }
         for(int step = 6; step >= 0; --step) {
             microbit_display_print(&microbit_display_obj, hearts[step]);
-            uBit.sleep(interval);
+            mp_hal_delay_ms(interval);
         }
     }
     microbit_display_clear();

source/microbit/modmicrobit.cpp

@@ -29,6 +29,7 @@
 extern "C" {
 
 #include "py/obj.h"
+#include "mphal.h"
 #include "modmicrobit.h"
 
 STATIC mp_obj_t microbit_reset_(void) {
@@ -39,19 +40,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(microbit_reset_obj, microbit_reset_);
 
 STATIC mp_obj_t microbit_sleep(mp_obj_t ms_in) {
     mp_int_t ms = mp_obj_get_int(ms_in);
-    if (ms <= 0)
-        return mp_const_none;
-    unsigned long current = uBit.systemTime();
-    unsigned long wakeup = current + ms;
-    if (wakeup < current) {
-        // Overflow
-        do {
-            __WFI();
-        } while (uBit.systemTime() > current);
-    }
-    do {
-        __WFI();
-    } while (uBit.systemTime() < wakeup);
+    mp_hal_delay_ms(ms);
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_1(microbit_sleep_obj, microbit_sleep);

source/microbit/mphal.cpp

@@ -127,4 +127,20 @@ void mp_hal_display_string(const char *str) {
     microbit_display_scroll(&microbit_display_obj, str, strlen(str), false);
 }
 
+void mp_hal_delay_ms(mp_int_t ms) {
+    if (ms <= 0)
+        return;
+    unsigned long current = uBit.systemTime();
+    unsigned long wakeup = current + ms;
+    if (wakeup < current) {
+        // Overflow
+        do {
+            __WFI();
+        } while (uBit.systemTime() > current);
+    }
+    do {
+        __WFI();
+    } while (uBit.systemTime() < wakeup);
+}
+
 }