Update NeoPixel API to be more Pythonic.

Can create multiple drivers (each one is an independent object).
Uses subscription to read and write colours.

Author: dpgeorge

inc/genhdr/qstrdefs.generated.h

@@ -609,4 +609,4 @@ QDEF(MP_QSTR_readinto, (const byte*)"\x4b\x08" "readinto")
 QDEF(MP_QSTR_ODD, (const byte*)"\x6a\x03" "ODD")
 QDEF(MP_QSTR_EVEN, (const byte*)"\xdd\x04" "EVEN")
 QDEF(MP_QSTR_neopixel, (const byte*)"\x69\x08" "neopixel")
-QDEF(MP_QSTR_set_colour, (const byte*)"\x10\x0a" "set_colour")
+QDEF(MP_QSTR_NeoPixel, (const byte*)"\x69\x08" "NeoPixel")

inc/microbit/mpconfigport.h

@@ -110,7 +110,6 @@ extern const struct _mp_obj_module_t neopixel_module;
     const char *readline_hist[8]; \
     mp_obj_t keyboard_interrupt_obj; \
     void *async_data[3]; \
-    struct _neopixel_strip_t *neopixel_strip; \
 
 // We need to provide a declaration/definition of alloca()
 #include <alloca.h>

inc/microbit/qstrdefsport.h

@@ -362,7 +362,6 @@ Q(ODD)
 Q(EVEN)
 
 Q(neopixel)
-Q(init)
+Q(NeoPixel)
 Q(clear)
 Q(show)
-Q(set_colour)

source/microbit/modneopixel.cpp

@@ -1,10 +1,9 @@
-
 /*
- * This file is part of the Micro Python project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015 Damien P. George
+ * Copyright (c) 2015-2016 Damien P. George
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -30,43 +29,106 @@
 
 extern "C" {
 
-#include "py/mpstate.h"
+#include "py/runtime.h"
 #include "lib/neopixel.h"
 #include "microbitobj.h"
 
-STATIC mp_obj_t mod_neopixel_init(mp_obj_t pin_in, mp_obj_t num_leds_in) {
-    PinName pin = microbit_obj_get_pin(pin_in)->name;
-    MP_STATE_PORT(neopixel_strip) = m_new_obj(neopixel_strip_t);
-    neopixel_init(MP_STATE_PORT(neopixel_strip), pin, mp_obj_get_int(num_leds_in));
-    return mp_const_none;
+extern const mp_obj_type_t neopixel_type;
+
+typedef struct _neopixel_obj_t {
+    mp_obj_base_t base;
+    neopixel_strip_t strip;
+} neopixel_obj_t;
+
+STATIC mp_obj_t neopixel_make_new(mp_obj_t type_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args) {
+    (void)type_in;
+    mp_arg_check_num(n_args, n_kw, 2, 2, false);
+
+    PinName pin = microbit_obj_get_pin(args[0])->name;
+    mp_int_t num_pixels = mp_obj_get_int(args[1]);
+
+    if (num_pixels <= 0) {
+        nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "invalid number of pixels"));
+    }
+
+    neopixel_obj_t *self = m_new_obj(neopixel_obj_t);
+    self->base.type = &neopixel_type;
+    neopixel_init(&self->strip, pin, num_pixels);
+
+    return self;
 }
-MP_DEFINE_CONST_FUN_OBJ_2(mod_neopixel_init_obj, mod_neopixel_init);
 
-STATIC mp_obj_t mod_neopixel_clear(void) {
-    neopixel_clear(MP_STATE_PORT(neopixel_strip));
-    return mp_const_none;
+STATIC mp_obj_t neopixel_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value) {
+    neopixel_obj_t *self = (neopixel_obj_t*)self_in;
+    mp_uint_t index = mp_get_index(self->base.type, self->strip.num_leds, index_in, false);
+    if (value == MP_OBJ_NULL) {
+        // delete item
+        return MP_OBJ_NULL; // op not supported
+    } else if (value == MP_OBJ_SENTINEL) {
+        // load
+        mp_obj_t rgb[3] = {
+            MP_OBJ_NEW_SMALL_INT(self->strip.leds[index].simple.r),
+            MP_OBJ_NEW_SMALL_INT(self->strip.leds[index].simple.g),
+            MP_OBJ_NEW_SMALL_INT(self->strip.leds[index].simple.b),
+        };
+        return mp_obj_new_tuple(3, rgb);
+    } else {
+        // store
+        mp_obj_t *rgb;
+        mp_obj_get_array_fixed_n(value, 3, &rgb);
+        mp_int_t r = mp_obj_get_int(rgb[0]);
+        mp_int_t g = mp_obj_get_int(rgb[1]);
+        mp_int_t b = mp_obj_get_int(rgb[2]);
+        if (r < 0 || r > 255 || g < 0 || g > 255 || b < 0 || b > 255) {
+            nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "invalid colour"));
+        }
+        neopixel_set_color(&self->strip, index, r, g, b);
+        return mp_const_none;
+    }
 }
-MP_DEFINE_CONST_FUN_OBJ_0(mod_neopixel_clear_obj, mod_neopixel_clear);
 
-STATIC mp_obj_t mod_neopixel_show(void) {
-    neopixel_show(MP_STATE_PORT(neopixel_strip));
+STATIC mp_obj_t neopixel_clear_(mp_obj_t self_in) {
+    neopixel_obj_t *self = (neopixel_obj_t*)self_in;
+    neopixel_clear(&self->strip);
     return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_0(mod_neopixel_show_obj, mod_neopixel_show);
+MP_DEFINE_CONST_FUN_OBJ_1(neopixel_clear_obj, neopixel_clear_);
 
-STATIC mp_obj_t mod_neopixel_set_colour(mp_uint_t n_args, const mp_obj_t *args) {
-    (void)n_args;
-    neopixel_set_color(MP_STATE_PORT(neopixel_strip), mp_obj_get_int(args[0]), mp_obj_get_int(args[1]), mp_obj_get_int(args[2]), mp_obj_get_int(args[3]));
+STATIC mp_obj_t neopixel_show_(mp_obj_t self_in) {
+    neopixel_obj_t *self = (neopixel_obj_t*)self_in;
+    neopixel_show(&self->strip);
     return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_neopixel_set_colour_obj, 4, 4, mod_neopixel_set_colour);
+MP_DEFINE_CONST_FUN_OBJ_1(neopixel_show_obj, neopixel_show_);
+
+STATIC const mp_map_elem_t neopixel_locals_dict_table[] = {
+    { MP_OBJ_NEW_QSTR(MP_QSTR_clear), (mp_obj_t)&neopixel_clear_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_show), (mp_obj_t)&neopixel_show_obj },
+};
+
+STATIC MP_DEFINE_CONST_DICT(neopixel_locals_dict, neopixel_locals_dict_table);
+
+const mp_obj_type_t neopixel_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_NeoPixel,
+    .print = NULL,
+    .make_new = neopixel_make_new,
+    .call = NULL,
+    .unary_op = NULL,
+    .binary_op = NULL,
+    .attr = NULL,
+    .subscr = neopixel_subscr,
+    .getiter = NULL,
+    .iternext = NULL,
+    .buffer_p = {NULL},
+    .stream_p = NULL,
+    .bases_tuple = MP_OBJ_NULL,
+    .locals_dict = (mp_obj_t)&neopixel_locals_dict,
+};
 
 STATIC const mp_map_elem_t neopixel_module_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_neopixel) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_init), (mp_obj_t)&mod_neopixel_init_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_clear), (mp_obj_t)&mod_neopixel_clear_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_show), (mp_obj_t)&mod_neopixel_show_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_set_colour), (mp_obj_t)&mod_neopixel_set_colour_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_NeoPixel), (mp_obj_t)&neopixel_type },
 };
 
 STATIC MP_DEFINE_CONST_DICT(neopixel_module_globals, neopixel_module_globals_table);