From a62a1ae2bd16a4d8e4029b26bd23761da1b12d5f Mon Sep 17 00:00:00 2001
From: Roy Hooper <rhooper@toybox.ca>
Date: Sun, 21 Jul 2019 16:30:09 -0400
Subject: WIP: refactor _pixelbuf to use strings instead of classes

---
 shared-module/_pixelbuf/PixelBuf.c | 6 +++---
 shared-module/_pixelbuf/PixelBuf.h | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'shared-module/_pixelbuf')

diff --git a/shared-module/_pixelbuf/PixelBuf.c b/shared-module/_pixelbuf/PixelBuf.c
index d32697239..6b222eec8 100644
--- a/shared-module/_pixelbuf/PixelBuf.c
+++ b/shared-module/_pixelbuf/PixelBuf.c
@@ -31,7 +31,7 @@
 #include "PixelBuf.h"
 #include <string.h>
 
-void pixelbuf_set_pixel_int(uint8_t *buf, mp_int_t value, pixelbuf_byteorder_obj_t *byteorder) {
+void pixelbuf_set_pixel_int(uint8_t *buf, mp_int_t value, pixelbuf_byteorder_details_t *byteorder) {
     buf[byteorder->byteorder.r] = value >> 16 & 0xff;
     buf[byteorder->byteorder.g] = (value >> 8) & 0xff;
     buf[byteorder->byteorder.b] = value & 0xff;
@@ -43,7 +43,7 @@ void pixelbuf_set_pixel_int(uint8_t *buf, mp_int_t value, pixelbuf_byteorder_obj
     }
 }
 
-void pixelbuf_set_pixel(uint8_t *buf, uint8_t *rawbuf, float brightness, mp_obj_t *item, pixelbuf_byteorder_obj_t *byteorder, bool dotstar) {
+void pixelbuf_set_pixel(uint8_t *buf, uint8_t *rawbuf, float brightness, mp_obj_t *item, pixelbuf_byteorder_details_t *byteorder, bool dotstar) {
     if (MP_OBJ_IS_INT(item)) {
         uint8_t *target = rawbuf ? rawbuf : buf;
         pixelbuf_set_pixel_int(target, mp_obj_get_int_truncated(item), byteorder);
@@ -94,7 +94,7 @@ void pixelbuf_set_pixel(uint8_t *buf, uint8_t *rawbuf, float brightness, mp_obj_
     }
 }
 
-mp_obj_t *pixelbuf_get_pixel_array(uint8_t *buf, uint len, pixelbuf_byteorder_obj_t *byteorder, uint8_t step, bool dotstar) {
+mp_obj_t *pixelbuf_get_pixel_array(uint8_t *buf, uint len, pixelbuf_byteorder_details_t *byteorder, uint8_t step, bool dotstar) {
     mp_obj_t elems[len];
     for (uint i = 0; i < len; i++) {
         elems[i] = pixelbuf_get_pixel(buf + (i * step), byteorder, dotstar);
diff --git a/shared-module/_pixelbuf/PixelBuf.h b/shared-module/_pixelbuf/PixelBuf.h
index 9e115fe0c..6b3272e19 100644
--- a/shared-module/_pixelbuf/PixelBuf.h
+++ b/shared-module/_pixelbuf/PixelBuf.h
@@ -42,9 +42,9 @@
 #define DOTSTAR_GET_BRIGHTNESS(value) ((value & 0b00011111) / 31.0)
 #define DOTSTAR_LED_START_FULL_BRIGHT 0xFF
 
-void pixelbuf_set_pixel(uint8_t *buf, uint8_t *rawbuf, float brightness, mp_obj_t *item, pixelbuf_byteorder_obj_t *byteorder, bool dotstar);
-mp_obj_t *pixelbuf_get_pixel(uint8_t *buf, pixelbuf_byteorder_obj_t *byteorder, bool dotstar);
-mp_obj_t *pixelbuf_get_pixel_array(uint8_t *buf, uint len, pixelbuf_byteorder_obj_t *byteorder, uint8_t step, bool dotstar);
-void pixelbuf_set_pixel_int(uint8_t *buf, mp_int_t value, pixelbuf_byteorder_obj_t *byteorder);
+void pixelbuf_set_pixel(uint8_t *buf, uint8_t *rawbuf, float brightness, mp_obj_t *item, pixelbuf_byteorder_details_t *byteorder, bool dotstar);
+mp_obj_t *pixelbuf_get_pixel(uint8_t *buf, pixelbuf_byteorder_details_t *byteorder, bool dotstar);
+mp_obj_t *pixelbuf_get_pixel_array(uint8_t *buf, uint len, pixelbuf_byteorder_details_t *byteorder, uint8_t step, bool dotstar);
+void pixelbuf_set_pixel_int(uint8_t *buf, mp_int_t value, pixelbuf_byteorder_details_t *byteorder);
 
 #endif
-- 
cgit v1.2.3


From 31e4591691891abd92d8e3851cd13fb6dbc9bf64 Mon Sep 17 00:00:00 2001
From: Roy Hooper <rhooper@toybox.ca>
Date: Sun, 21 Jul 2019 16:37:06 -0400
Subject: WIP: refactor _pixelbuf to use strings instead of classes

---
 shared-bindings/_pixelbuf/PixelBuf.c |   2 +-
 shared-bindings/_pixelbuf/__init__.c | 122 +----------------------------------
 shared-module/_pixelbuf/PixelBuf.c   |   2 +-
 3 files changed, 3 insertions(+), 123 deletions(-)

(limited to 'shared-module/_pixelbuf')

diff --git a/shared-bindings/_pixelbuf/PixelBuf.c b/shared-bindings/_pixelbuf/PixelBuf.c
index 2ea40d1de..01ba702c3 100644
--- a/shared-bindings/_pixelbuf/PixelBuf.c
+++ b/shared-bindings/_pixelbuf/PixelBuf.c
@@ -133,7 +133,7 @@ STATIC mp_obj_t pixelbuf_pixelbuf_make_new(const mp_obj_type_t *type, size_t n_a
     if (args[ARG_byteorder].u_obj == NULL)
         byteorder_str = "BGR";
     else 
-        byteorder_str = mp_obj_str_get_data(byteorder_str, bo_len);
+        byteorder_str = mp_obj_str_get_data(args[ARG_byteorder].u_obj, &bo_len);
 
     parse_byteorder_string(byteorder_str, byteorder_details);
 
diff --git a/shared-bindings/_pixelbuf/__init__.c b/shared-bindings/_pixelbuf/__init__.c
index 229c04603..02d5f49b3 100644
--- a/shared-bindings/_pixelbuf/__init__.c
+++ b/shared-bindings/_pixelbuf/__init__.c
@@ -82,126 +82,6 @@ const int32_t colorwheel(float pos) {
     }
 }
 
-
-/// RGB
-//| .. data:: RGB
-//|
-//|    * **order** Red, Green, Blue
-//|    * **bpp** 3
-PIXELBUF_BYTEORDER(RGB, 3, 0, 1, 2, 3, false, false)
-//| .. data:: RBG
-//|
-//|    * **order** Red, Blue, Green
-//|    * **bpp** 3
-PIXELBUF_BYTEORDER(RBG, 3, 0, 2, 1, 3, false, false)
-//| .. data:: GRB
-//|
-//|    * **order** Green, Red, Blue
-//|    * **bpp** 3
-//|
-//|    Commonly used by NeoPixel.
-PIXELBUF_BYTEORDER(GRB, 3, 1, 0, 2, 3, false, false)
-//| .. data:: GBR
-//|
-//|    * **order** Green, Blue, Red
-//|    * **bpp** 3
-PIXELBUF_BYTEORDER(GBR, 3, 1, 2, 0, 3, false, false)
-//| .. data:: BRG
-//|
-//|    * **order** Blue, Red, Green
-//|    * **bpp** 3
-PIXELBUF_BYTEORDER(BRG, 3, 2, 0, 1, 3, false, false)
-//| .. data:: BGR
-//|
-//|    * **order** Blue, Green, Red
-//|    * **bpp** 3
-//|
-//|    Commonly used by Dotstar.
-PIXELBUF_BYTEORDER(BGR, 3, 2, 1, 0, 3, false, false)
-
-// RGBW
-//| .. data:: RGBW
-//|
-//|    * **order** Red, Green, Blue, White
-//|    * **bpp** 4
-//|    * **has_white** True
-PIXELBUF_BYTEORDER(RGBW, 4, 0, 1, 2, 3, true, false)
-//| .. data:: RBGW
-//|
-//|    * **order** Red, Blue, Green, White
-//|    * **bpp** 4
-//|    * **has_white** True
-PIXELBUF_BYTEORDER(RBGW, 4, 0, 2, 1, 3, true, false)
-//| .. data:: GRBW
-//|
-//|    * **order** Green, Red, Blue, White
-//|    * **bpp** 4
-//|    * **has_white** True
-//|
-//|    Commonly used by RGBW NeoPixels.
-PIXELBUF_BYTEORDER(GRBW, 4, 1, 0, 2, 3, true, false)
-//| .. data:: GBRW
-//|
-//|    * **order** Green, Blue, Red, White
-//|    * **bpp** 4
-//|    * **has_white** True
-PIXELBUF_BYTEORDER(GBRW, 4, 1, 2, 0, 3, true, false)
-//| .. data:: BRGW
-//|
-//|    * **order** Blue, Red, Green, White
-//|    * **bpp** 4
-//|    * **has_white** True
-PIXELBUF_BYTEORDER(BRGW, 4, 2, 0, 1, 3, true, false)
-//| .. data:: BGRW
-//|
-//|    * **order** Blue, Green, Red, White
-//|    * **bpp** 4
-//|    * **has_white** True
-PIXELBUF_BYTEORDER(BGRW, 4, 2, 1, 0, 3, true, false)
-
-// Luminosity + RGB (eg for Dotstar)
-// Luminosity chosen because the luminosity of a Dotstar at full bright
-// burns the eyes like looking at the Sun.
-// https://www.thesaurus.com/browse/luminosity?s=t
-//| .. data:: LRGB
-//|
-//|    * **order** *Luminosity*, Red, Green, Blue
-//|    * **bpp** 4
-//|    * **has_luminosity** True
-PIXELBUF_BYTEORDER(LRGB, 4, 1, 2, 3, 0, false, true)
-//| .. data:: LRBG
-//|
-//|    * **order** *Luminosity*, Red, Blue, Green
-//|    * **bpp** 4
-//|    * **has_luminosity** True
-PIXELBUF_BYTEORDER(LRBG, 4, 1, 3, 2, 0, false, true)
-//| .. data:: LGRB
-//|
-//|    * **order** *Luminosity*, Green, Red, Blue
-//|    * **bpp** 4
-//|    * **has_luminosity** True
-PIXELBUF_BYTEORDER(LGRB, 4, 2, 1, 3, 0, false, true)
-//| .. data:: LGBR
-//|
-//|    * **order** *Luminosity*, Green, Blue, Red
-//|    * **bpp** 4
-//|    * **has_luminosity** True
-PIXELBUF_BYTEORDER(LGBR, 4, 2, 3, 1, 0, false, true)
-//| .. data:: LBRG
-//|
-//|    * **order** *Luminosity*, Blue, Red, Green
-//|    * **bpp** 4
-//|    * **has_luminosity** True
-PIXELBUF_BYTEORDER(LBRG, 4, 3, 1, 2, 0, false, true)
-//| .. data:: LBGR
-//|
-//|    * **order** *Luminosity*, Blue, Green, Red
-//|    * **bpp** 4
-//|    * **has_luminosity** True
-//|
-//|    Actual format commonly used by DotStar (5 bit luninance value)
-PIXELBUF_BYTEORDER(LBGR, 4, 3, 2, 1, 0, false, true)
-
 STATIC const mp_rom_map_elem_t pixelbuf_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__pixelbuf) },
     { MP_ROM_QSTR(MP_QSTR_PixelBuf), MP_ROM_PTR(&pixelbuf_pixelbuf_type) },
@@ -223,7 +103,7 @@ STATIC const mp_rom_map_elem_t pixelbuf_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_GBRD),  MP_ROM_QSTR(MP_QSTR_GBRD) },
     { MP_ROM_QSTR(MP_QSTR_BRGD),  MP_ROM_QSTR(MP_QSTR_BRGD) },
     { MP_ROM_QSTR(MP_QSTR_BGRD),  MP_ROM_QSTR(MP_QSTR_BGRD) },
-    { MP_ROM_QSTR(MP_QSTR_wheel), MP_ROM_QSTR(&pixelbuf_wheel_obj) },
+    { MP_ROM_QSTR(MP_QSTR_wheel), MP_ROM_PTR(&pixelbuf_wheel_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(pixelbuf_module_globals, pixelbuf_module_globals_table);
diff --git a/shared-module/_pixelbuf/PixelBuf.c b/shared-module/_pixelbuf/PixelBuf.c
index 6b222eec8..b7cdef483 100644
--- a/shared-module/_pixelbuf/PixelBuf.c
+++ b/shared-module/_pixelbuf/PixelBuf.c
@@ -102,7 +102,7 @@ mp_obj_t *pixelbuf_get_pixel_array(uint8_t *buf, uint len, pixelbuf_byteorder_de
     return mp_obj_new_tuple(len, elems);
 }
 
-mp_obj_t *pixelbuf_get_pixel(uint8_t *buf, pixelbuf_byteorder_obj_t *byteorder, bool dotstar) {
+mp_obj_t *pixelbuf_get_pixel(uint8_t *buf, pixelbuf_byteorder_details_t *byteorder, bool dotstar) {
     mp_obj_t elems[byteorder->bpp];
    
     elems[0] = mp_obj_new_int(buf[byteorder->byteorder.r]);
-- 
cgit v1.2.3


From 3cf9a475b99090d72b9992816808cbde309dcc40 Mon Sep 17 00:00:00 2001
From: Roy Hooper <rhooper@toybox.ca>
Date: Sun, 4 Aug 2019 11:02:33 -0400
Subject: fix 'white' byte for dotstars

---
 shared-bindings/_pixelbuf/PixelBuf.c | 4 ++--
 shared-module/_pixelbuf/PixelBuf.c   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'shared-module/_pixelbuf')

diff --git a/shared-bindings/_pixelbuf/PixelBuf.c b/shared-bindings/_pixelbuf/PixelBuf.c
index 90210d4f3..969d16709 100644
--- a/shared-bindings/_pixelbuf/PixelBuf.c
+++ b/shared-bindings/_pixelbuf/PixelBuf.c
@@ -119,8 +119,7 @@ STATIC mp_obj_t pixelbuf_pixelbuf_make_new(const mp_obj_type_t *type, size_t n_a
     byteorder_details.byteorder.r = r - byteorder;
     byteorder_details.byteorder.g = g - byteorder;
     byteorder_details.byteorder.b = b - byteorder;
-    if (w) 
-        byteorder_details.byteorder.w = w - byteorder;
+    byteorder_details.byteorder.w = w ? w - byteorder : 0;
     // The dotstar brightness byte is always first (as it goes with the pixel start bits)
     // if 'D' is found at the end, adjust byte position
     // if 'D' is elsewhere, error out
@@ -130,6 +129,7 @@ STATIC mp_obj_t pixelbuf_pixelbuf_make_new(const mp_obj_type_t *type, size_t n_a
             byteorder_details.byteorder.b += 1;
             byteorder_details.byteorder.g += 1;
             byteorder_details.byteorder.r += 1;
+            byteorder_details.byteorder.w = 0;
         } else if (dotstar_pos != 0) {
             mp_raise_ValueError(translate("Invalid byteorder string"));
         }
diff --git a/shared-module/_pixelbuf/PixelBuf.c b/shared-module/_pixelbuf/PixelBuf.c
index b7cdef483..e26f05ac3 100644
--- a/shared-module/_pixelbuf/PixelBuf.c
+++ b/shared-module/_pixelbuf/PixelBuf.c
@@ -47,11 +47,11 @@ void pixelbuf_set_pixel(uint8_t *buf, uint8_t *rawbuf, float brightness, mp_obj_
     if (MP_OBJ_IS_INT(item)) {
         uint8_t *target = rawbuf ? rawbuf : buf;
         pixelbuf_set_pixel_int(target, mp_obj_get_int_truncated(item), byteorder);
-         if (dotstar) {
+        if (dotstar) {
             buf[0] = DOTSTAR_LED_START_FULL_BRIGHT;
             if (rawbuf) 
                 rawbuf[0] = DOTSTAR_LED_START_FULL_BRIGHT;
-         }
+        }
         if (rawbuf) {
             buf[byteorder->byteorder.r] = rawbuf[byteorder->byteorder.r] * brightness;
             buf[byteorder->byteorder.g] = rawbuf[byteorder->byteorder.g] * brightness;
-- 
cgit v1.2.3


From 2970680e6af663200b35227bfbca5240542a4c47 Mon Sep 17 00:00:00 2001
From: Roy Hooper <rhooper@toybox.ca>
Date: Sun, 20 Oct 2019 19:54:25 -0400
Subject: fix show and fix step > 1

---
 py/obj.c                             |  9 +++++++--
 py/objtype.c                         |  3 ++-
 shared-bindings/_pixelbuf/PixelBuf.c | 31 +++++++++++++++++++------------
 shared-bindings/_pixelbuf/PixelBuf.h |  2 +-
 shared-module/_pixelbuf/PixelBuf.c   |  7 +++++--
 shared-module/_pixelbuf/PixelBuf.h   |  2 +-
 6 files changed, 35 insertions(+), 19 deletions(-)

(limited to 'shared-module/_pixelbuf')

diff --git a/py/obj.c b/py/obj.c
index bd2aaf9d2..f91b00a64 100644
--- a/py/obj.c
+++ b/py/obj.c
@@ -489,14 +489,19 @@ mp_obj_t mp_obj_len_maybe(mp_obj_t o_in) {
 
 mp_obj_t mp_obj_subscr(mp_obj_t base, mp_obj_t index, mp_obj_t value) {
     mp_obj_type_t *type = mp_obj_get_type(base);
+    mp_obj_t instance = base;
+    // If we got an MP_OBJ_SENTINEL as the type, then we got called by instance_subscr
+    if (type == MP_OBJ_SENTINEL) {
+        instance = ((mp_obj_t *)base)[1];
+        type = mp_obj_get_type(((mp_obj_t *)base)[2]);
+    }
     if (type->subscr != NULL) {
-        mp_obj_t ret = type->subscr(base, index, value);
+        mp_obj_t ret = type->subscr(instance, index, value);
         // May have called port specific C code. Make sure it didn't mess up the heap.
         assert_heap_ok();
         if (ret != MP_OBJ_NULL) {
             return ret;
         }
-        // TODO: call base classes here?
     }
     if (value == MP_OBJ_NULL) {
         if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
diff --git a/py/objtype.c b/py/objtype.c
index 5133d849f..7d41b8656 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -850,7 +850,8 @@ STATIC mp_obj_t instance_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value
         meth_args = 3;
     }
     if (member[0] == MP_OBJ_SENTINEL) {
-        return mp_obj_subscr(self->subobj[0], index, value);
+        mp_obj_t args[3] = {MP_OBJ_SENTINEL, self_in, self->subobj[0]};
+        return mp_obj_subscr(args, index, value);
     } else if (member[0] != MP_OBJ_NULL) {
         mp_obj_t args[3] = {self_in, index, value};
         // TODO probably need to call mp_convert_member_lookup, and use mp_call_method_n_kw
diff --git a/shared-bindings/_pixelbuf/PixelBuf.c b/shared-bindings/_pixelbuf/PixelBuf.c
index 3a2c88ef6..aeed6f504 100644
--- a/shared-bindings/_pixelbuf/PixelBuf.c
+++ b/shared-bindings/_pixelbuf/PixelBuf.c
@@ -230,7 +230,7 @@ STATIC mp_obj_t pixelbuf_pixelbuf_obj_set_brightness(mp_obj_t self_in, mp_obj_t
     if (self->two_buffers)
         pixelbuf_recalculate_brightness(self);
     if (self->auto_write)
-        call_show(self_in);
+        call_show(self_in, 'b');
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_2(pixelbuf_pixelbuf_set_brightness_obj, pixelbuf_pixelbuf_obj_set_brightness);
@@ -253,7 +253,7 @@ void pixelbuf_recalculate_brightness(pixelbuf_pixelbuf_obj_t *self) {
     }
 }
 
-mp_obj_t call_show(mp_obj_t self_in) {
+mp_obj_t call_show(mp_obj_t self_in, char origin) {
     mp_obj_t dest[2];
     mp_load_method(self_in, MP_QSTR_show, dest);
     return mp_call_method_n_kw(0, 0, dest);
@@ -356,29 +356,35 @@ STATIC mp_obj_t pixelbuf_pixelbuf_subscr(mp_obj_t self_in, mp_obj_t index_in, mp
     }
 
     pixelbuf_pixelbuf_obj_t *self = native_pixelbuf(self_in);
+
     if (0) {
 #if MICROPY_PY_BUILTINS_SLICE
     } else if (MP_OBJ_IS_TYPE(index_in, &mp_type_slice)) {
         mp_bound_slice_t slice;
 
-        if (!mp_seq_get_fast_slice_indexes(self->bytes, index_in, &slice))
-            // TODO support stepping!!!
-            mp_raise_NotImplementedError(translate("Only slices with step=1 (aka None) are supported"));
+        mp_seq_get_fast_slice_indexes(self->bytes, index_in, &slice);
+
         if ((slice.stop * self->pixel_step) > self->bytes)
             mp_raise_IndexError(translate("Range out of bounds"));
+        if (slice.step < 0)
+            mp_raise_IndexError(translate("Negative step not supported"));
 
         if (value == MP_OBJ_SENTINEL) { // Get
             size_t len = slice.stop - slice.start;
             uint8_t *readbuf = self->two_buffers ? self->rawbuf : self->buf;
-            return pixelbuf_get_pixel_array(readbuf + slice.start, len, &self->byteorder, self->pixel_step, self->byteorder.is_dotstar);
+            return pixelbuf_get_pixel_array(readbuf + slice.start, len, &self->byteorder, self->pixel_step, slice.step, self->byteorder.is_dotstar);
         } else { // Set
             #if MICROPY_PY_ARRAY_SLICE_ASSIGN
 
             if (!(MP_OBJ_IS_TYPE(value, &mp_type_list) || MP_OBJ_IS_TYPE(value, &mp_type_tuple)))
                 mp_raise_ValueError(translate("tuple/list required on RHS"));
 
-            size_t dst_len = slice.stop - slice.start;
-
+            size_t dst_len = (slice.stop - slice.start);
+            dst_len = (slice.stop - slice.start) / slice.step;
+            if (slice.step > 1) {
+                if ((slice.stop - slice.start) % slice.step)
+                    dst_len ++;
+            }
             mp_obj_t *src_objs;
             size_t num_items;
             if (MP_OBJ_IS_TYPE(value, &mp_type_list)) {
@@ -394,16 +400,17 @@ STATIC mp_obj_t pixelbuf_pixelbuf_subscr(mp_obj_t self_in, mp_obj_t index_in, mp
                 mp_raise_ValueError_varg(translate("Unmatched number of items on RHS (expected %d, got %d)."),
                                                    dst_len, num_items);
 
-            for (size_t i = slice.start; i < slice.stop; i++) {
+            size_t target_i = slice.start;
+            for (size_t i = slice.start; target_i < slice.stop; i++, target_i += slice.step) {
                 mp_obj_t *item = src_objs[i-slice.start];
                 if (MP_OBJ_IS_TYPE(value, &mp_type_list) || MP_OBJ_IS_TYPE(value, &mp_type_tuple) || MP_OBJ_IS_INT(value)) {
-                    pixelbuf_set_pixel(self->buf + (i * self->pixel_step),
+                    pixelbuf_set_pixel(self->buf + (target_i * self->pixel_step),
                         self->two_buffers ? self->rawbuf + (i * self->pixel_step) : NULL,
                         self->brightness, item, &self->byteorder, self->byteorder.is_dotstar);
                 }
             }
             if (self->auto_write)
-                call_show(self_in);
+                call_show(self_in, 's');
             return mp_const_none;
             #else
             return MP_OBJ_NULL; // op not supported
@@ -423,7 +430,7 @@ STATIC mp_obj_t pixelbuf_pixelbuf_subscr(mp_obj_t self_in, mp_obj_t index_in, mp
             pixelbuf_set_pixel(self->buf + offset, self->two_buffers ? self->rawbuf + offset : NULL,
                 self->brightness, value, &self->byteorder, self->byteorder.is_dotstar);
             if (self->auto_write)
-                call_show(self_in);
+                call_show(self_in, 'i');
             return mp_const_none;
         }
     }
diff --git a/shared-bindings/_pixelbuf/PixelBuf.h b/shared-bindings/_pixelbuf/PixelBuf.h
index aa09e9261..18caa9219 100644
--- a/shared-bindings/_pixelbuf/PixelBuf.h
+++ b/shared-bindings/_pixelbuf/PixelBuf.h
@@ -48,6 +48,6 @@ typedef struct {
 } pixelbuf_pixelbuf_obj_t;
 
 void pixelbuf_recalculate_brightness(pixelbuf_pixelbuf_obj_t *self);
-mp_obj_t call_show(mp_obj_t self_in);
+mp_obj_t call_show(mp_obj_t self_in, char origin);
 
 #endif  // CP_SHARED_BINDINGS_PIXELBUF_PIXELBUF_H
diff --git a/shared-module/_pixelbuf/PixelBuf.c b/shared-module/_pixelbuf/PixelBuf.c
index e26f05ac3..a0071903a 100644
--- a/shared-module/_pixelbuf/PixelBuf.c
+++ b/shared-module/_pixelbuf/PixelBuf.c
@@ -94,10 +94,13 @@ void pixelbuf_set_pixel(uint8_t *buf, uint8_t *rawbuf, float brightness, mp_obj_
     }
 }
 
-mp_obj_t *pixelbuf_get_pixel_array(uint8_t *buf, uint len, pixelbuf_byteorder_details_t *byteorder, uint8_t step, bool dotstar) {
+mp_obj_t *pixelbuf_get_pixel_array(uint8_t *buf, uint len, pixelbuf_byteorder_details_t *byteorder, uint8_t step, mp_int_t slice_step, bool dotstar) {
     mp_obj_t elems[len];
+    if (slice_step > 1) {
+        len = len / slice_step;
+    }
     for (uint i = 0; i < len; i++) {
-        elems[i] = pixelbuf_get_pixel(buf + (i * step), byteorder, dotstar);
+        elems[i] = pixelbuf_get_pixel(buf + ((i * slice_step) * step), byteorder, dotstar);
     }
     return mp_obj_new_tuple(len, elems);
 }
diff --git a/shared-module/_pixelbuf/PixelBuf.h b/shared-module/_pixelbuf/PixelBuf.h
index 6b3272e19..173ce61a8 100644
--- a/shared-module/_pixelbuf/PixelBuf.h
+++ b/shared-module/_pixelbuf/PixelBuf.h
@@ -44,7 +44,7 @@
 
 void pixelbuf_set_pixel(uint8_t *buf, uint8_t *rawbuf, float brightness, mp_obj_t *item, pixelbuf_byteorder_details_t *byteorder, bool dotstar);
 mp_obj_t *pixelbuf_get_pixel(uint8_t *buf, pixelbuf_byteorder_details_t *byteorder, bool dotstar);
-mp_obj_t *pixelbuf_get_pixel_array(uint8_t *buf, uint len, pixelbuf_byteorder_details_t *byteorder, uint8_t step, bool dotstar);
+mp_obj_t *pixelbuf_get_pixel_array(uint8_t *buf, uint len, pixelbuf_byteorder_details_t *byteorder, uint8_t step, mp_int_t slice_step, bool dotstar);
 void pixelbuf_set_pixel_int(uint8_t *buf, mp_int_t value, pixelbuf_byteorder_details_t *byteorder);
 
 #endif
-- 
cgit v1.2.3


From 222dd29a142a530b43fdf4d1ea01e276962b9886 Mon Sep 17 00:00:00 2001
From: Roy Hooper <rhooper@toybox.ca>
Date: Tue, 10 Dec 2019 20:42:39 -0500
Subject: Fix slice step.

---
 shared-bindings/_pixelbuf/PixelBuf.c | 8 +++++---
 shared-module/_pixelbuf/PixelBuf.c   | 3 ---
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'shared-module/_pixelbuf')

diff --git a/shared-bindings/_pixelbuf/PixelBuf.c b/shared-bindings/_pixelbuf/PixelBuf.c
index dabc23d35..feda2c573 100644
--- a/shared-bindings/_pixelbuf/PixelBuf.c
+++ b/shared-bindings/_pixelbuf/PixelBuf.c
@@ -391,6 +391,9 @@ STATIC mp_obj_t pixelbuf_pixelbuf_subscr(mp_obj_t self_in, mp_obj_t index_in, mp
 
         if (value == MP_OBJ_SENTINEL) { // Get
             size_t len = slice.stop - slice.start;
+            if (slice.step > 1) {
+                len = (len / slice.step) + (len % slice.step ? 1 : 0);
+            }
             uint8_t *readbuf = self->two_buffers ? self->rawbuf : self->buf;
             return pixelbuf_get_pixel_array(readbuf + slice.start, len, &self->byteorder, self->pixel_step, slice.step, self->byteorder.is_dotstar);
         } else { // Set
@@ -399,10 +402,9 @@ STATIC mp_obj_t pixelbuf_pixelbuf_subscr(mp_obj_t self_in, mp_obj_t index_in, mp
             if (!(MP_OBJ_IS_TYPE(value, &mp_type_list) || MP_OBJ_IS_TYPE(value, &mp_type_tuple)))
                 mp_raise_ValueError(translate("tuple/list required on RHS"));
 
-            size_t dst_len = (slice.stop - slice.start) / slice.step;
+            size_t dst_len = (slice.stop - slice.start);
             if (slice.step > 1) {
-                if ((slice.stop - slice.start) % slice.step)
-                    dst_len ++;
+                dst_len = (dst_len / slice.step) + (dst_len % slice.step ? 1 : 0);
             }
             mp_obj_t *src_objs;
             size_t num_items;
diff --git a/shared-module/_pixelbuf/PixelBuf.c b/shared-module/_pixelbuf/PixelBuf.c
index a0071903a..020151bc3 100644
--- a/shared-module/_pixelbuf/PixelBuf.c
+++ b/shared-module/_pixelbuf/PixelBuf.c
@@ -96,9 +96,6 @@ void pixelbuf_set_pixel(uint8_t *buf, uint8_t *rawbuf, float brightness, mp_obj_
 
 mp_obj_t *pixelbuf_get_pixel_array(uint8_t *buf, uint len, pixelbuf_byteorder_details_t *byteorder, uint8_t step, mp_int_t slice_step, bool dotstar) {
     mp_obj_t elems[len];
-    if (slice_step > 1) {
-        len = len / slice_step;
-    }
     for (uint i = 0; i < len; i++) {
         elems[i] = pixelbuf_get_pixel(buf + ((i * slice_step) * step), byteorder, dotstar);
     }
-- 
cgit v1.2.3