Reduce dependency on DAL for display and image.

markshannon · markshannon · commit 901421419a47 · 2016-03-23T21:08:07.000Z
diff --git a/inc/microbit/MicroBitCustomConfig.h b/inc/microbit/MicroBitCustomConfig.h
@@ -20,7 +20,4 @@
 #define MICROBIT_BLE_DEVICE_INFORMATION_SERVICE     0
 #define MICROBIT_BLE_PAIRING_MODE   0
 
-// Slow this down a bit as proportional spacing reduces length
-#define MICROBIT_DEFAULT_SCROLL_SPEED       150
-
 #endif
diff --git a/inc/microbit/microbitobj.h b/inc/microbit/microbitobj.h
@@ -29,6 +29,7 @@
 extern "C" {
 
 #include "py/obj.h"
+#include "PinNames.h"
 
 class MicroBitPin *microbit_obj_get_pin(mp_obj_t o);
 PinName microbit_obj_get_pin_name(mp_obj_t o);
diff --git a/source/microbit/main.cpp b/source/microbit/main.cpp
@@ -74,6 +74,7 @@ void __register_exitproc() {
 }
 
 void microbit_init(void) {
+    uBit.display.disable();
     microbit_display_init();
 
     // Start the ticker.
diff --git a/source/microbit/microbitconstimage.cpp b/source/microbit/microbitconstimage.cpp
@@ -24,7 +24,6 @@
  * THE SOFTWARE.
  */
 
-#include "MicroBit.h"
 #include "microbitobj.h"
 
 extern "C" {
diff --git a/source/microbit/microbitdisplay.cpp b/source/microbit/microbitdisplay.cpp
@@ -24,19 +24,20 @@
  * THE SOFTWARE.
  */
 
-#include "MicroBit.h"
+#include <string.h>
 #include "microbitobj.h"
 #include "nrf_gpio.h"
 
 extern "C" {
-
 #include "py/runtime.h"
 #include "modmicrobit.h"
 #include "microbitimage.h"
 #include "microbitdisplay.h"
 #include "lib/iters.h"
 #include "lib/ticker.h"
 
+#define min(a,b) (((a)<(b))?(a):(b))
+
 void microbit_display_show(microbit_display_obj_t *display, microbit_image_obj_t *image) {
     mp_int_t w = min(image->width(), 5);
     mp_int_t h = min(image->height(), 5);
@@ -61,6 +62,9 @@ void microbit_display_show(microbit_display_obj_t *display, microbit_image_obj_t
     display->brightnesses = brightnesses;
 }
 
+#define DEFAULT_PRINT_SPEED 400
+
+
 mp_obj_t microbit_display_show_func(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
 
     // Cancel any animations.
@@ -69,7 +73,7 @@ mp_obj_t microbit_display_show_func(mp_uint_t n_args, const mp_obj_t *pos_args,
 
     static const mp_arg_t show_allowed_args[] = {
         { MP_QSTR_image,    MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
-        { MP_QSTR_delay,    MP_ARG_INT, {.u_int = MICROBIT_DEFAULT_PRINT_SPEED} },
+        { MP_QSTR_delay,    MP_ARG_INT, {.u_int = DEFAULT_PRINT_SPEED} },
         { MP_QSTR_clear,     MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
         { MP_QSTR_wait,     MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = true} },
         { MP_QSTR_loop,     MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
@@ -158,7 +162,10 @@ struct DisplayPoint {
 
 #define NO_CONN 0
 
-static const DisplayPoint display_map[MICROBIT_DISPLAY_COLUMN_COUNT][MICROBIT_DISPLAY_ROW_COUNT] = {
+#define ROW_COUNT 3
+#define COLUMN_COUNT 9
+
+static const DisplayPoint display_map[COLUMN_COUNT][ROW_COUNT] = {
     {{0,0}, {4,2}, {2,4}},
     {{2,0}, {0,2}, {4,4}},
     {{4,0}, {2,2}, {0,4}},
@@ -193,7 +200,7 @@ void microbit_display_obj_t::advanceRow() {
     strobe_row++;
 
     // Reset the row counts and bit mask when we have hit the max.
-    if (strobe_row == MICROBIT_DISPLAY_ROW_COUNT) {
+    if (strobe_row == ROW_COUNT) {
         strobe_row = 0;
     }
 
@@ -202,7 +209,7 @@ void microbit_display_obj_t::advanceRow() {
     for (int i = 0; i <= MAX_BRIGHTNESS; i++) {
         pins_for_brightness[i] = 0;
     }
-    for (int i = 0; i < MICROBIT_DISPLAY_COLUMN_COUNT; i++) {
+    for (int i = 0; i < COLUMN_COUNT; i++) {
         int x = display_map[i][strobe_row].x;
         int y = display_map[i][strobe_row].y;
         uint8_t brightness = microbit_display_obj.image_buffer[x][y];
@@ -247,7 +254,7 @@ static int32_t callback(void) {
 
 
 static void microbit_display_update(void) {
-    async_tick += FIBER_TICK_PERIOD_MS;
+    async_tick += MILLISECONDS_PER_MACRO_TICK;
     if (async_tick < async_delay) {
         return;
     }
@@ -337,16 +344,20 @@ void microbit_display_animate(microbit_display_obj_t *self, mp_obj_t iterable, m
     }
 }
 
+
+// Delay in ms in between moving display one column to the left.
+#define DEFAULT_SCROLL_SPEED       150
+
 void microbit_display_scroll(microbit_display_obj_t *self, const char* str) {
     mp_obj_t iterable = scrolling_string_image_iterable(str, strlen(str), NULL, false);
-    microbit_display_animate(self, iterable, MICROBIT_DEFAULT_SCROLL_SPEED, false, true);
+    microbit_display_animate(self, iterable, DEFAULT_SCROLL_SPEED, false, true);
 }
 
 
 mp_obj_t microbit_display_scroll_func(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     static const mp_arg_t scroll_allowed_args[] = {
         { MP_QSTR_text, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
-        { MP_QSTR_delay, MP_ARG_INT, {.u_int = MICROBIT_DEFAULT_SCROLL_SPEED} },
+        { MP_QSTR_delay, MP_ARG_INT, {.u_int = DEFAULT_SCROLL_SPEED} },
         { MP_QSTR_wait, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = true} },
         { MP_QSTR_monospace, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
         { MP_QSTR_loop, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
@@ -370,7 +381,7 @@ void microbit_display_clear(void) {
     // Reset repeat state, cancel animation and clear screen.
     wakeup_event = false;
     async_mode = ASYNC_MODE_CLEAR;
-    async_tick = async_delay - FIBER_TICK_PERIOD_MS;
+    async_tick = async_delay - MILLISECONDS_PER_MACRO_TICK;
     wait_for_event();
 }
 
@@ -452,9 +463,7 @@ microbit_display_obj_t microbit_display_obj = {
 
 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();
+    nrf_gpio_range_cfg_output(MIN_COLUMN_PIN, MIN_COLUMN_PIN + COLUMN_COUNT + ROW_COUNT);
 }
 
 }
diff --git a/source/microbit/microbitimage.cpp b/source/microbit/microbitimage.cpp
@@ -24,8 +24,9 @@
  * THE SOFTWARE.
  */
 
-#include "MicroBit.h"
+#include <string.h>
 #include "microbitobj.h"
+#include "MicroBitFont.h"
 
 extern "C" {
 
@@ -34,6 +35,9 @@ extern "C" {
 #include "microbitimage.h"
 #include "py/runtime0.h"
 
+#define min(a,b) (((a)<(b))?(a):(b))
+#define max(a,b) (((a)>(b))?(a):(b))
+
 const monochrome_5by5_t microbit_blank_image = {
     { &microbit_image_type },
     1, 0, 0, 0,
@@ -523,15 +527,17 @@ STATIC const mp_map_elem_t microbit_image_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(microbit_image_locals_dict, microbit_image_locals_dict_table);
 
+#define THE_FONT MicroBitFont::defaultFont
+
+#define ASCII_START 32
+#define ASCII_END 126
 
 STATIC const unsigned char *get_font_data_from_char(char c) {
-    MicroBitFont font = uBit.display.getFont();
-    if (c < MICROBIT_FONT_ASCII_START || c > font.asciiEnd) {
+    if (c < ASCII_START || c > ASCII_END) {
         c = '?';
     }
-    /* The following logic belongs in MicroBitFont */
-    int offset = (c-MICROBIT_FONT_ASCII_START) * 5;
-    return font.characters + offset;
+    int offset = (c-ASCII_START) * 5;
+    return THE_FONT + offset;
 }
 
 STATIC mp_int_t get_pixel_from_font_data(const unsigned char *data, int x, int y) {

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@ void __register_exitproc() {`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`void microbit_init(void) {`
	`77`	`+ uBit.display.disable();`
`77`	`78`	`microbit_display_init();`
`78`	`79`
`79`	`80`	`// Start the ticker.`