Move init() from display to main. Add include guards where necessary.

markshannon · dpgeorge · commit 81ea004c32b8 · 2015-11-01T10:46:34.000Z
diff --git a/inc/microbit/microbitdisplay.h b/inc/microbit/microbitdisplay.h
@@ -1,4 +1,9 @@
 
+#ifndef __MICROPY_INCLUDED_MICROBIT_DISPLAY_H__
+#define __MICROPY_INCLUDED_MICROBIT_DISPLAY_H__
+
+#include "py/runtime.h"
+#include "microbitimage.h"
 
 typedef struct _microbit_display_obj_t {
     mp_obj_base_t base;
@@ -23,6 +28,9 @@ typedef struct _microbit_display_obj_t {
 
 extern microbit_display_obj_t microbit_display_obj;
 
+
+extern "C" {
+
 void microbit_display_print(microbit_display_obj_t *display, microbit_image_obj_t *image);
 
 void microbit_display_animate(microbit_display_obj_t *display, mp_obj_t iterable, mp_int_t delay, bool wait, bool loop);
@@ -33,5 +41,12 @@ mp_int_t microbit_display_get_pixel(microbit_display_obj_t *display, mp_int_t x,
 
 void microbit_display_set_pixel(microbit_display_obj_t *display, mp_int_t x, mp_int_t y, mp_int_t val);
 
+void microbit_display_clear(void);
+
+void microbit_display_init(void);
+
+void microbit_display_tick(void);
+
+}
 
-void microbit_display_clear(void);
+#endif // __MICROPY_INCLUDED_MICROBIT_DISPLAY_H__
diff --git a/inc/microbit/microbitimage.h b/inc/microbit/microbitimage.h
@@ -1,4 +1,5 @@
-
+#ifndef __MICROPY_INCLUDED_MICROBIT_IMAGE_H__
+#define __MICROPY_INCLUDED_MICROBIT_IMAGE_H__
 
 #include "py/runtime.h"
    
@@ -85,4 +86,4 @@ microbit_image_obj_t *microbit_image_for_char(char c);
 microbit_image_obj_t *microbit_image_dim(microbit_image_obj_t *lhs, mp_float_t fval);
 microbit_image_obj_t *microbit_image_sum(microbit_image_obj_t *lhs, microbit_image_obj_t *rhs, bool add);
 
-
+#endif // __MICROPY_INCLUDED_MICROBIT_IMAGE_H__
diff --git a/source/microbit/main.cpp b/source/microbit/main.cpp
@@ -1,9 +1,8 @@
 #include "MicroBit.h"
+#include "microbitdisplay.h"
 
 extern "C" {
     void mp_run(void);
-
-    void microbit_display_tick(void);
     
 }
 
@@ -30,3 +29,37 @@ void app_main() {
         mp_run();
     }
 }
+
+extern bool compass_up_to_date;
+extern bool accelerometer_up_to_date;
+
+static void ticker(void) {
+
+    // increment our real-time counter.
+    ticks += FIBER_TICK_PERIOD_MS;
+
+    if (uBit.compass.isCalibrating()) {
+        uBit.compass.idleTick();
+    }
+
+    compass_up_to_date = false;
+    accelerometer_up_to_date = false;
+
+    // Update buttons
+    uBit.buttonA.systemTick();
+    uBit.buttonB.systemTick();
+
+    // Update the display.
+    microbit_display_tick();
+}
+
+extern "C" {
+
+void microbit_init(void) {
+    microbit_display_init();
+
+    // Hijack the DAL system ticker.
+    uBit.systemTicker.attach(ticker, MICROBIT_DISPLAY_REFRESH_PERIOD);
+}
+
+}
diff --git a/source/microbit/microbitdisplay.cpp b/source/microbit/microbitdisplay.cpp
@@ -298,6 +298,7 @@ void microbit_display_tick(void) {
     }
 }
 
+
 void microbit_display_animate(microbit_display_obj_t *self, mp_obj_t iterable, mp_int_t delay, bool wait, bool loop) {
     // Reset the repeat state.
     MP_STATE_PORT(async_data)[0] = NULL;
@@ -461,37 +462,11 @@ microbit_display_obj_t microbit_display_obj = {
     .strobe_mask = 0x20
 };
 
-extern bool compass_up_to_date;
-extern bool accelerometer_up_to_date;
-
-static void ticker(void) {
-
-    // increment our real-time counter.
-    ticks += FIBER_TICK_PERIOD_MS;
-
-    if (uBit.compass.isCalibrating()) {
-        uBit.compass.idleTick();
-    }
-
-    compass_up_to_date = false;
-    accelerometer_up_to_date = false;
-
-    // Update buttons
-    uBit.buttonA.systemTick();
-    uBit.buttonB.systemTick();
-
-    // Update the display.
-    microbit_display_tick();
-}
-
 void microbit_display_init(void) {
     //  Set pins as output.
     nrf_gpio_range_cfg_output(MICROBIT_DISPLAY_COLUMN_START,MICROBIT_DISPLAY_COLUMN_START + MICROBIT_DISPLAY_COLUMN_COUNT + MICROBIT_DISPLAY_ROW_COUNT);
 
     uBit.display.disable();
-
-    // Hijack the DAL system ticker.
-    uBit.systemTicker.attach(ticker, MICROBIT_DISPLAY_REFRESH_PERIOD);
 }
 
 }
diff --git a/source/microbit/mprun.c b/source/microbit/mprun.c
@@ -11,7 +11,7 @@
 #include "pyexec.h"
 #include MICROPY_HAL_H
 
-extern void microbit_display_init(void);
+extern void microbit_init(void);
     
 void microbit_display_exception(mp_obj_t exc_in) {
     mp_uint_t n, *values;
@@ -92,7 +92,8 @@ void mp_run(void) {
 
     mp_init();
     mp_hal_init();
-    microbit_display_init();
+
+    microbit_init();
 
     if (APPENDED_SCRIPT->header[0] == 'M' && APPENDED_SCRIPT->header[1] == 'P') {
         // run appended script
