merge from adafruit/circuitpython

16 files changed, 457 insertions, 381 deletions

diff --git a/shared-bindings/_bleio/PacketBuffer.c b/shared-bindings/_bleio/PacketBuffer.c
new file mode 100644
index 000000000..f9f171870
--- /dev/null
+++ b/shared-bindings/_bleio/PacketBuffer.c
@@ -0,0 +1,201 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/mperrno.h"
+#include "py/ioctl.h"
+#include "py/objproperty.h"
+#include "py/runtime.h"
+#include "py/stream.h"
+
+#include "shared-bindings/_bleio/__init__.h"
+#include "shared-bindings/_bleio/PacketBuffer.h"
+#include "shared-bindings/_bleio/UUID.h"
+#include "shared-bindings/util.h"
+
+//| .. currentmodule:: _bleio
+//|
+//| :class:`PacketBuffer` -- Packet-oriented characteristic usage.
+//| =====================================================================
+//|
+//| Accumulates a Characteristic's incoming packets in a FIFO buffer and facilitates packet aware
+//| outgoing writes. A packet's size is either the characteristic length or the maximum transmission
+//| unit (MTU), whichever is smaller. The MTU can change so check `packet_size` before creating a
+//| buffer to store data.
+//|
+//| When we're the server, we ignore all connections besides the first to subscribe to
+//| notifications.
+//|
+//| .. class:: PacketBuffer(characteristic, *, buffer_size)
+//|
+//|   Monitor the given Characteristic. Each time a new value is written to the Characteristic
+//|   add the newly-written bytes to a FIFO buffer.
+//|
+//|   :param Characteristic characteristic: The Characteristic to monitor.
+//|     It may be a local Characteristic provided by a Peripheral Service, or a remote Characteristic
+//|     in a remote Service that a Central has connected to.
+//|   :param int buffer_size: Size of ring buffer (in packets of the Characteristic's maximum
+//|     length) that stores incoming packets coming from the peer.
+//|
+STATIC mp_obj_t bleio_packet_buffer_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_characteristic, ARG_buffer_size };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_characteristic,  MP_ARG_REQUIRED | MP_ARG_OBJ },
+        { MP_QSTR_buffer_size, MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT },
+    };
+
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    const mp_obj_t characteristic = args[ARG_characteristic].u_obj;
+
+    const int buffer_size = args[ARG_buffer_size].u_int;
+    if (buffer_size < 1) {
+        mp_raise_ValueError_varg(translate("%q must be >= 1"), MP_QSTR_buffer_size);
+    }
+
+    if (!MP_OBJ_IS_TYPE(characteristic, &bleio_characteristic_type)) {
+        mp_raise_TypeError(translate("Expected a Characteristic"));
+    }
+
+    bleio_packet_buffer_obj_t *self = m_new_obj(bleio_packet_buffer_obj_t);
+    self->base.type = &bleio_packet_buffer_type;
+
+    common_hal_bleio_packet_buffer_construct(self, MP_OBJ_TO_PTR(characteristic), buffer_size);
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+STATIC void check_for_deinit(bleio_packet_buffer_obj_t *self) {
+    if (common_hal_bleio_packet_buffer_deinited(self)) {
+        raise_deinited_error();
+    }
+}
+
+//|   .. method:: readinto(buf)
+//|
+//|     Reads a single BLE packet into the ``buf``. Raises an exception if the next packet is longer
+//|     than the given buffer. Use `packet_size` to read the maximum length of a single packet.
+//|
+//|     :return: number of bytes read and stored into ``buf``
+//|     :rtype: int
+//|
+STATIC mp_obj_t bleio_packet_buffer_readinto(mp_obj_t self_in, mp_obj_t buffer_obj) {
+    bleio_packet_buffer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(buffer_obj, &bufinfo, MP_BUFFER_WRITE);
+
+    return MP_OBJ_NEW_SMALL_INT(common_hal_bleio_packet_buffer_readinto(self, bufinfo.buf, bufinfo.len));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(bleio_packet_buffer_readinto_obj, bleio_packet_buffer_readinto);
+
+//|   .. method:: write(data, *, header=None)
+//|
+//|     Writes all bytes from data into the same outgoing packet. The bytes from header are included
+//|     before data when the pending packet is currently empty.
+//|
+//|     This does not block until the data is sent. It only blocks until the data is pending.
+//|
+// TODO: Add a kwarg `merge=False` to dictate whether subsequent writes are merged into a pending
+// one.
+STATIC mp_obj_t bleio_packet_buffer_write(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_data, ARG_header };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_data,  MP_ARG_REQUIRED | MP_ARG_OBJ },
+        { MP_QSTR_header, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL}},
+    };
+
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    bleio_packet_buffer_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+    check_for_deinit(self);
+
+    mp_buffer_info_t data_bufinfo;
+    mp_get_buffer_raise(args[ARG_data].u_obj, &data_bufinfo, MP_BUFFER_READ);
+
+    mp_buffer_info_t header_bufinfo;
+    header_bufinfo.len = 0;
+    if (args[ARG_header].u_obj != MP_OBJ_NULL) {
+        mp_get_buffer_raise(args[ARG_header].u_obj, &header_bufinfo, MP_BUFFER_READ);
+    }
+
+    common_hal_bleio_packet_buffer_write(self, data_bufinfo.buf, data_bufinfo.len,
+                                         header_bufinfo.buf, header_bufinfo.len);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(bleio_packet_buffer_write_obj, 1, bleio_packet_buffer_write);
+
+//|   .. method:: deinit()
+//|
+//|     Disable permanently.
+//|
+STATIC mp_obj_t bleio_packet_buffer_deinit(mp_obj_t self_in) {
+    bleio_packet_buffer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    common_hal_bleio_packet_buffer_deinit(self);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_packet_buffer_deinit_obj, bleio_packet_buffer_deinit);
+
+//|   .. attribute:: packet_size
+//|
+//|     Maximum size of each packet in bytes. This is the minimum of the Characterstic length and
+//|     the negotiated Maximum Transfer Unit (MTU).
+//|
+STATIC mp_obj_t bleio_packet_buffer_get_packet_size(mp_obj_t self_in) {
+    bleio_packet_buffer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    return mp_obj_new_bool(common_hal_bleio_packet_buffer_get_packet_size(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_packet_buffer_get_packet_size_obj, bleio_packet_buffer_get_packet_size);
+
+const mp_obj_property_t bleio_packet_buffer_packet_size_obj = {
+    .base.type = &mp_type_property,
+    .proxy = { (mp_obj_t)&bleio_packet_buffer_get_packet_size_obj,
+               (mp_obj_t)&mp_const_none_obj,
+               (mp_obj_t)&mp_const_none_obj },
+};
+
+STATIC const mp_rom_map_elem_t bleio_packet_buffer_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_deinit),             MP_ROM_PTR(&bleio_packet_buffer_deinit_obj) },
+
+    // Standard stream methods.
+    { MP_OBJ_NEW_QSTR(MP_QSTR_readinto),       MP_ROM_PTR(&bleio_packet_buffer_readinto_obj) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_write),          MP_ROM_PTR(&bleio_packet_buffer_write_obj) },
+
+    { MP_OBJ_NEW_QSTR(MP_QSTR_packet_size),    MP_ROM_PTR(&bleio_packet_buffer_packet_size_obj) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(bleio_packet_buffer_locals_dict, bleio_packet_buffer_locals_dict_table);
+
+
+const mp_obj_type_t bleio_packet_buffer_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_PacketBuffer,
+    .make_new = bleio_packet_buffer_make_new,
+    .locals_dict = (mp_obj_dict_t*)&bleio_packet_buffer_locals_dict
+};
diff --git a/shared-bindings/_bleio/PacketBuffer.h b/shared-bindings/_bleio/PacketBuffer.h
new file mode 100644
index 000000000..990a2f8bb
--- /dev/null
+++ b/shared-bindings/_bleio/PacketBuffer.h
@@ -0,0 +1,43 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_BLEIO_PACKETBUFFER_H
+#define MICROPY_INCLUDED_SHARED_BINDINGS_BLEIO_PACKETBUFFER_H
+
+#include "common-hal/_bleio/PacketBuffer.h"
+
+extern const mp_obj_type_t bleio_packet_buffer_type;
+
+extern void common_hal_bleio_packet_buffer_construct(
+    bleio_packet_buffer_obj_t *self, bleio_characteristic_obj_t *characteristic,
+    size_t buffer_size);
+void common_hal_bleio_packet_buffer_write(bleio_packet_buffer_obj_t *self, uint8_t *data, size_t len, uint8_t* header, size_t header_len);
+int common_hal_bleio_packet_buffer_readinto(bleio_packet_buffer_obj_t *self, uint8_t *data, size_t len);
+uint16_t common_hal_bleio_packet_buffer_get_packet_size(bleio_packet_buffer_obj_t *self);
+bool common_hal_bleio_packet_buffer_deinited(bleio_packet_buffer_obj_t *self);
+void common_hal_bleio_packet_buffer_deinit(bleio_packet_buffer_obj_t *self);
+
+#endif // MICROPY_INCLUDED_SHARED_BINDINGS_BLEIO_PACKETBUFFER_H
diff --git a/shared-bindings/_bleio/__init__.c b/shared-bindings/_bleio/__init__.c
index ba2454da4..5d26862a6 100644
--- a/shared-bindings/_bleio/__init__.c
+++ b/shared-bindings/_bleio/__init__.c
@@ -35,6 +35,7 @@
 #include "shared-bindings/_bleio/CharacteristicBuffer.h"
 #include "shared-bindings/_bleio/Connection.h"
 #include "shared-bindings/_bleio/Descriptor.h"
+#include "shared-bindings/_bleio/PacketBuffer.h"
 #include "shared-bindings/_bleio/ScanEntry.h"
 #include "shared-bindings/_bleio/ScanResults.h"
 #include "shared-bindings/_bleio/Service.h"
@@ -69,6 +70,7 @@
 //|     CharacteristicBuffer
 //|     Connection
 //|     Descriptor
+//|     PacketBuffer
 //|     ScanEntry
 //|     ScanResults
 //|     Service
@@ -140,8 +142,9 @@ STATIC const mp_rom_map_elem_t bleio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_Characteristic),       MP_ROM_PTR(&bleio_characteristic_type) },
     { MP_ROM_QSTR(MP_QSTR_CharacteristicBuffer), MP_ROM_PTR(&bleio_characteristic_buffer_type) },
     { MP_ROM_QSTR(MP_QSTR_Descriptor),           MP_ROM_PTR(&bleio_descriptor_type) },
+    { MP_ROM_QSTR(MP_QSTR_PacketBuffer),         MP_ROM_PTR(&bleio_packet_buffer_type) },
     { MP_ROM_QSTR(MP_QSTR_ScanEntry),            MP_ROM_PTR(&bleio_scanentry_type) },
-    { MP_ROM_QSTR(MP_QSTR_ScanResults),            MP_ROM_PTR(&bleio_scanresults_type) },
+    { MP_ROM_QSTR(MP_QSTR_ScanResults),          MP_ROM_PTR(&bleio_scanresults_type) },
     { MP_ROM_QSTR(MP_QSTR_Service),              MP_ROM_PTR(&bleio_service_type) },
     { MP_ROM_QSTR(MP_QSTR_UUID),                 MP_ROM_PTR(&bleio_uuid_type) },
 
diff --git a/shared-bindings/_pixelbuf/PixelBuf.c b/shared-bindings/_pixelbuf/PixelBuf.c
index 420720e62..3e9319047 100644
--- a/shared-bindings/_pixelbuf/PixelBuf.c
+++ b/shared-bindings/_pixelbuf/PixelBuf.c
@@ -26,6 +26,7 @@
 
 #include "py/obj.h"
 #include "py/objarray.h"
+#include "py/objtype.h"
 #include "py/mphal.h"
 #include "py/runtime.h"
 #include "py/binary.h"
@@ -40,8 +41,6 @@
 #include "../../shared-module/_pixelbuf/PixelBuf.h"
 #include "shared-bindings/digitalio/DigitalInOut.h"
 
-extern const pixelbuf_byteorder_obj_t byteorder_BGR;
-extern const mp_obj_type_t pixelbuf_byteorder_type;
 extern const int32_t colorwheel(float pos);
 
 //| .. currentmodule:: pixelbuf
@@ -51,7 +50,7 @@ extern const int32_t colorwheel(float pos);
 //|
 //| :class:`~_pixelbuf.PixelBuf` implements an RGB[W] bytearray abstraction.
 //|
-//| .. class:: PixelBuf(size, buf, byteorder=BGR, brightness=0, rawbuf=None, offset=0, dotstar=False, auto_write=False, write_function=None, write_args=None)
+//| .. class:: PixelBuf(size, buf, byteorder="BGR", brightness=0, rawbuf=None, offset=0, auto_write=False)
 //|
 //|   Create a PixelBuf object of the specified size, byteorder, and bits per pixel.
 //|
@@ -60,50 +59,69 @@ extern const int32_t colorwheel(float pos);
 //|
 //|   When only given ``buf``, ``brightness`` applies to the next pixel assignment.
 //|
-//|   When ``dotstar`` is True, and ``bpp`` is 4, the 4th value in a tuple/list
-//|   is the individual pixel brightness (0-1).  Not compatible with RGBW Byteorders.
-//|   Compatible `ByteOrder` classes are bpp=3, or bpp=4 and has_luminosity=True (g LBGR).
+//|   When ``P`` (pwm duration) is present as the 4th character of the byteorder 
+//|   string, the 4th value in the tuple/list for a pixel is the individual pixel 
+//|   brightness (0.0-1.0) and will enable a Dotstar compatible 1st byte in the
+//|   output buffer (``buf``).
 //|
 //|   :param ~int size: Number of pixelsx
-//|   :param ~bytearray buf: Bytearray to store pixel data in
-//|   :param ~_pixelbuf.ByteOrder byteorder: Byte order constant from `_pixelbuf`
+//|   :param ~bytearray buf: Bytearray in which to store pixel data
+//|   :param ~str byteorder: Byte order string (such as "BGR" or "PBGR")
 //|   :param ~float brightness: Brightness (0 to 1.0, default 1.0)
-//|   :param ~bytearray rawbuf: Bytearray to store raw pixel colors in
+//|   :param ~bytearray rawbuf: Bytearray in which to store raw pixel data (before brightness adjustment)
 //|   :param ~int offset: Offset from start of buffer (default 0)
-//|   :param ~bool dotstar: Dotstar mode (default False)
 //|   :param ~bool auto_write: Whether to automatically write pixels (Default False)
-//|   :param ~callable write_function: (optional) Callable to use to send pixels
-//|   :param ~list write_args: (optional) Tuple or list of args to pass to ``write_function``.  The
-//|          PixelBuf instance is appended after these args.
 //|
 STATIC mp_obj_t pixelbuf_pixelbuf_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     mp_arg_check_num(n_args, kw_args, 2, MP_OBJ_FUN_ARGS_MAX, true);
-    enum { ARG_size, ARG_buf, ARG_byteorder, ARG_brightness, ARG_rawbuf, ARG_offset, ARG_dotstar,
-           ARG_auto_write, ARG_write_function, ARG_write_args };
+    enum { ARG_size, ARG_buf, ARG_byteorder, ARG_brightness, ARG_rawbuf, ARG_offset,
+           ARG_auto_write };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_size, MP_ARG_REQUIRED | MP_ARG_INT },
         { MP_QSTR_buf, MP_ARG_REQUIRED | MP_ARG_OBJ },
-        { MP_QSTR_byteorder, MP_ARG_OBJ, { .u_obj = mp_const_none } },
+        { MP_QSTR_byteorder, MP_ARG_OBJ, { .u_obj = MP_OBJ_NEW_QSTR(MP_QSTR_BGR) } },
         { MP_QSTR_brightness, MP_ARG_OBJ, { .u_obj = mp_const_none } },
         { MP_QSTR_rawbuf, MP_ARG_OBJ, { .u_obj = mp_const_none } },
         { MP_QSTR_offset, MP_ARG_INT, { .u_int = 0 } },
-        { MP_QSTR_dotstar, MP_ARG_BOOL, { .u_bool = false } },
         { MP_QSTR_auto_write, MP_ARG_BOOL, {.u_bool = false} },
-        { MP_QSTR_write_function, MP_ARG_OBJ, {.u_obj = mp_const_none} },
-        { MP_QSTR_write_args, MP_ARG_OBJ, {.u_obj = mp_const_none} },
     };
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+    const char *byteorder = NULL;
+    pixelbuf_byteorder_details_t byteorder_details;
+    size_t bo_len;
+
+    if (!MP_OBJ_IS_STR(args[ARG_byteorder].u_obj))
+        mp_raise_TypeError(translate("byteorder is not a string"));
+
+    byteorder = mp_obj_str_get_data(args[ARG_byteorder].u_obj, &bo_len);
+    if (bo_len < 3 || bo_len > 4)
+        mp_raise_ValueError(translate("Invalid byteorder string"));
+    byteorder_details.order = args[ARG_byteorder].u_obj;
+
+    byteorder_details.bpp = bo_len;
+    char *dotstar = strchr(byteorder, 'P');
+    char *r = strchr(byteorder, 'R');
+    char *g = strchr(byteorder, 'G');
+    char *b = strchr(byteorder, 'B');
+    char *w = strchr(byteorder, 'W');
+    int num_chars = (dotstar ? 1 : 0) + (w ? 1 : 0) + (r ? 1 : 0) + (g ? 1 : 0) + (b ? 1 : 0);
+    if ((num_chars < byteorder_details.bpp) || !(r && b && g))
+        mp_raise_ValueError(translate("Invalid byteorder string"));
+    byteorder_details.is_dotstar = dotstar ? true : false;
+    byteorder_details.has_white = w ? true : false;
+    byteorder_details.byteorder.r = r - byteorder;
+    byteorder_details.byteorder.g = g - byteorder;
+    byteorder_details.byteorder.b = b - 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 (dotstar && byteorder[0] != 'P') {
+        mp_raise_ValueError(translate("Invalid byteorder string"));
+    }
+    if (byteorder_details.has_white && byteorder_details.is_dotstar)
+        mp_raise_ValueError(translate("Invalid byteorder string"));
 
-    if (mp_obj_is_subclass_fast(args[ARG_byteorder].u_obj, &pixelbuf_byteorder_type))
-        mp_raise_TypeError_varg(translate("byteorder is not an instance of ByteOrder (got a %s)"), mp_obj_get_type_str(args[ARG_byteorder].u_obj));
-
-    pixelbuf_byteorder_obj_t *byteorder = (args[ARG_byteorder].u_obj == mp_const_none) ? MP_OBJ_FROM_PTR(&byteorder_BGR) : args[ARG_byteorder].u_obj;
-
-    if (byteorder->has_white && args[ARG_dotstar].u_bool)
-        mp_raise_ValueError_varg(translate("Can not use dotstar with %s"), mp_obj_get_type_str(byteorder));
-
-    size_t effective_bpp = args[ARG_dotstar].u_bool ? 4 : byteorder->bpp; // Always 4 for DotStar
+    size_t effective_bpp = byteorder_details.is_dotstar ? 4 : byteorder_details.bpp; // Always 4 for DotStar
     size_t bytes = args[ARG_size].u_int * effective_bpp;
     size_t offset = args[ARG_offset].u_int;
     mp_buffer_info_t bufinfo, rawbufinfo;
@@ -120,63 +138,22 @@ STATIC mp_obj_t pixelbuf_pixelbuf_make_new(const mp_obj_type_t *type, size_t n_a
     if (bytes + offset > bufinfo.len)
         mp_raise_ValueError_varg(translate("buf is too small. need %d bytes"), bytes + offset);
 
-    if (!MP_OBJ_IS_TYPE(args[ARG_write_args].u_obj, &mp_type_list) &&
-        !MP_OBJ_IS_TYPE(args[ARG_write_args].u_obj, &mp_type_tuple) &&
-        args[ARG_write_args].u_obj != mp_const_none)
-    {
-        mp_raise_ValueError(translate("write_args must be a list, tuple, or None"));
-    }
-
     // Validation complete, allocate and populate object.
     pixelbuf_pixelbuf_obj_t *self = m_new_obj(pixelbuf_pixelbuf_obj_t);
 
     self->base.type = &pixelbuf_pixelbuf_type;
     self->pixels = args[ARG_size].u_int;
     self->bytes = bytes;
-    self->byteorder = *byteorder;  // Copied because we modify for dotstar
+    self->byteorder = byteorder_details;  // Copied because we modify for dotstar
     self->bytearray = args[ARG_buf].u_obj;
     self->two_buffers = two_buffers;
     self->rawbytearray = two_buffers ? args[ARG_rawbuf].u_obj : NULL;
     self->offset = offset;
-    self->dotstar_mode = args[ARG_dotstar].u_bool;
     self->buf = (uint8_t *)bufinfo.buf + offset;
     self->rawbuf = two_buffers ? (uint8_t *)rawbufinfo.buf + offset : NULL;
     self->pixel_step = effective_bpp;
     self->auto_write = args[ARG_auto_write].u_bool;
 
-    if (self->dotstar_mode) {
-        // Ensure sane configuration
-        if (!self->byteorder.has_luminosity) {
-            self->byteorder.has_luminosity = true;
-            self->byteorder.byteorder.b += 1;
-            self->byteorder.byteorder.g += 1;
-            self->byteorder.byteorder.r += 1;
-        }
-        self->byteorder.byteorder.w = 0;
-    }
-
-    // Show/auto-write callbacks
-    self->write_function = args[ARG_write_function].u_obj;
-    mp_obj_t function_args = args[ARG_write_args].u_obj;
-    mp_obj_t *src_objs = (mp_obj_t *)&mp_const_none_obj;
-    size_t num_items = 0;
-    if (function_args != mp_const_none) {
-        if (MP_OBJ_IS_TYPE(function_args, &mp_type_list)) {
-            mp_obj_list_t *t = MP_OBJ_TO_PTR(function_args);
-            num_items = t->len;
-            src_objs = t->items;
-        } else {
-            mp_obj_tuple_t *l = MP_OBJ_TO_PTR(function_args);
-            num_items = l->len;
-            src_objs = l->items;
-        }
-    }
-    self->write_function_args = mp_obj_new_tuple(num_items + 1, NULL);
-    for (size_t i = 0; i < num_items; i++) {
-        self->write_function_args->items[i] = src_objs[i];
-    }
-    self->write_function_args->items[num_items] = self;
-
     if (args[ARG_brightness].u_obj == mp_const_none) {
         self->brightness = 1.0;
     } else {
@@ -187,9 +164,9 @@ STATIC mp_obj_t pixelbuf_pixelbuf_make_new(const mp_obj_type_t *type, size_t n_a
             self->brightness = 1;
     }
 
-    if (self->dotstar_mode) {
+    if (self->byteorder.is_dotstar) {
         // Initialize the buffer with the dotstar start bytes.
-        // Header and end must be setup by caller
+        // Note: Header and end must be setup by caller
         for (uint i = 0; i < self->pixels * 4; i += 4) {
             self->buf[i] = DOTSTAR_LED_START_FULL_BRIGHT;
             if (two_buffers) {
@@ -201,13 +178,20 @@ STATIC mp_obj_t pixelbuf_pixelbuf_make_new(const mp_obj_type_t *type, size_t n_a
     return MP_OBJ_FROM_PTR(self);
 }
 
+
+// Helper to ensure we have the native super class instead of a subclass.
+static pixelbuf_pixelbuf_obj_t* native_pixelbuf(mp_obj_t pixelbuf_obj) {
+    mp_obj_t native_pixelbuf = mp_instance_cast_to_native_base(pixelbuf_obj, &pixelbuf_pixelbuf_type);
+    mp_obj_assert_native_inited(native_pixelbuf);
+    return MP_OBJ_TO_PTR(native_pixelbuf);
+}
+
 //|   .. attribute:: bpp
 //|
 //|     The number of bytes per pixel in the buffer (read-only)
 //|
 STATIC mp_obj_t pixelbuf_pixelbuf_obj_get_bpp(mp_obj_t self_in) {
-    mp_check_self(MP_OBJ_IS_TYPE(self_in, &pixelbuf_pixelbuf_type));
-    pixelbuf_pixelbuf_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    pixelbuf_pixelbuf_obj_t *self = native_pixelbuf(self_in);
     return mp_obj_new_int_from_uint(self->byteorder.bpp);
 }
 MP_DEFINE_CONST_FUN_OBJ_1(pixelbuf_pixelbuf_get_bpp_obj, pixelbuf_pixelbuf_obj_get_bpp);
@@ -230,16 +214,14 @@ const mp_obj_property_t pixelbuf_pixelbuf_bpp_obj = {
 //|     In DotStar mode
 //|
 STATIC mp_obj_t pixelbuf_pixelbuf_obj_get_brightness(mp_obj_t self_in) {
-    mp_check_self(MP_OBJ_IS_TYPE(self_in, &pixelbuf_pixelbuf_type));
-    pixelbuf_pixelbuf_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    pixelbuf_pixelbuf_obj_t *self = native_pixelbuf(self_in);
     return mp_obj_new_float(self->brightness);
 }
 MP_DEFINE_CONST_FUN_OBJ_1(pixelbuf_pixelbuf_get_brightness_obj, pixelbuf_pixelbuf_obj_get_brightness);
 
 
 STATIC mp_obj_t pixelbuf_pixelbuf_obj_set_brightness(mp_obj_t self_in, mp_obj_t value) {
-    mp_check_self(MP_OBJ_IS_TYPE(self_in, &pixelbuf_pixelbuf_type));
-    pixelbuf_pixelbuf_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    pixelbuf_pixelbuf_obj_t *self = native_pixelbuf(self_in);
     self->brightness = mp_obj_float_get(value);
     if (self->brightness > 1)
         self->brightness = 1;
@@ -248,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_write_function(self);
+        pixelbuf_call_show(self_in);
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_2(pixelbuf_pixelbuf_set_brightness_obj, pixelbuf_pixelbuf_obj_set_brightness);
@@ -266,26 +248,30 @@ void pixelbuf_recalculate_brightness(pixelbuf_pixelbuf_obj_t *self) {
     // Compensate for shifted buffer (bpp=3 dotstar)
     for (uint i = 0; i < self->bytes; i++) {
         // Don't adjust per-pixel luminance bytes in dotstar mode
-        if (!self->dotstar_mode || (i % 4 != 0))
+        if (!self->byteorder.is_dotstar || (i % 4 != 0))
             buf[i] = rawbuf[i] * self->brightness;
     }
 }
 
+mp_obj_t pixelbuf_call_show(mp_obj_t self_in) {
+    mp_obj_t dest[2];
+    mp_load_method(self_in, MP_QSTR_show, dest);
+    return mp_call_method_n_kw(0, 0, dest);
+}
+
 //|   .. attribute:: auto_write
 //|
 //|     Whether to automatically write the pixels after each update.
 //|
 STATIC mp_obj_t pixelbuf_pixelbuf_obj_get_auto_write(mp_obj_t self_in) {
-    mp_check_self(MP_OBJ_IS_TYPE(self_in, &pixelbuf_pixelbuf_type));
-    pixelbuf_pixelbuf_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    pixelbuf_pixelbuf_obj_t *self = native_pixelbuf(self_in);
     return mp_obj_new_bool(self->auto_write);
 }
 MP_DEFINE_CONST_FUN_OBJ_1(pixelbuf_pixelbuf_get_auto_write_obj, pixelbuf_pixelbuf_obj_get_auto_write);
 
 
 STATIC mp_obj_t pixelbuf_pixelbuf_obj_set_auto_write(mp_obj_t self_in, mp_obj_t value) {
-    mp_check_self(MP_OBJ_IS_TYPE(self_in, &pixelbuf_pixelbuf_type));
-    pixelbuf_pixelbuf_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    pixelbuf_pixelbuf_obj_t *self = native_pixelbuf(self_in);
     self->auto_write = mp_obj_is_true(value);
     return mp_const_none;
 }
@@ -306,8 +292,7 @@ const mp_obj_property_t pixelbuf_pixelbuf_auto_write_obj = {
 //|     actual pixels.
 //|
 STATIC mp_obj_t pixelbuf_pixelbuf_obj_get_buf(mp_obj_t self_in) {
-    mp_check_self(MP_OBJ_IS_TYPE(self_in, &pixelbuf_pixelbuf_type));
-    pixelbuf_pixelbuf_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    pixelbuf_pixelbuf_obj_t *self = native_pixelbuf(self_in);
     return mp_obj_new_bytearray_by_ref(self->bytes, self->buf);
 }
 MP_DEFINE_CONST_FUN_OBJ_1(pixelbuf_pixelbuf_get_buf_obj, pixelbuf_pixelbuf_obj_get_buf);
@@ -321,25 +306,23 @@ const mp_obj_property_t pixelbuf_pixelbuf_buf_obj = {
 
 //|   .. attribute:: byteorder
 //|
-//|     `ByteOrder` class for the buffer (read-only)
+//|     byteorder string for the buffer (read-only)
 //|
 STATIC mp_obj_t pixelbuf_pixelbuf_obj_get_byteorder(mp_obj_t self_in) {
-    mp_check_self(MP_OBJ_IS_TYPE(self_in, &pixelbuf_pixelbuf_type));
-    pixelbuf_pixelbuf_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return &self->byteorder;
+    pixelbuf_pixelbuf_obj_t *self = native_pixelbuf(self_in);
+    return self->byteorder.order;
 }
-MP_DEFINE_CONST_FUN_OBJ_1(pixelbuf_pixelbuf_get_byteorder_obj, pixelbuf_pixelbuf_obj_get_byteorder);
+MP_DEFINE_CONST_FUN_OBJ_1(pixelbuf_pixelbuf_get_byteorder_str, pixelbuf_pixelbuf_obj_get_byteorder);
 
-const mp_obj_property_t pixelbuf_pixelbuf_byteorder_obj = {
+const mp_obj_property_t pixelbuf_pixelbuf_byteorder_str = {
     .base.type = &mp_type_property,
-    .proxy = {(mp_obj_t)&pixelbuf_pixelbuf_get_byteorder_obj,
+    .proxy = {(mp_obj_t)&pixelbuf_pixelbuf_get_byteorder_str,
               (mp_obj_t)&mp_const_none_obj,
               (mp_obj_t)&mp_const_none_obj},
 };
 
 STATIC mp_obj_t pixelbuf_pixelbuf_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
-    mp_check_self(MP_OBJ_IS_TYPE(self_in, &pixelbuf_pixelbuf_type));
-    pixelbuf_pixelbuf_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    pixelbuf_pixelbuf_obj_t *self = native_pixelbuf(self_in);
     switch (op) {
         case MP_UNARY_OP_BOOL: return mp_const_true;
         case MP_UNARY_OP_LEN: return MP_OBJ_NEW_SMALL_INT(self->pixels);
@@ -349,23 +332,14 @@ STATIC mp_obj_t pixelbuf_pixelbuf_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
 
 //|   .. method:: show()
 //|
-//|     Call the associated write function to display the pixels.
+//|     Must be implemented in subclasses.
 //|
 
 STATIC mp_obj_t pixelbuf_pixelbuf_show(mp_obj_t self_in) {
-    mp_check_self(MP_OBJ_IS_TYPE(self_in, &pixelbuf_pixelbuf_type));
-    pixelbuf_pixelbuf_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    call_write_function(self);
-    return mp_const_none;
+    mp_raise_NotImplementedError(NULL);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(pixelbuf_pixelbuf_show_obj, pixelbuf_pixelbuf_show);
 
-void call_write_function(pixelbuf_pixelbuf_obj_t *self) {
-    // execute function if it's set
-    if (self->write_function != mp_const_none) {
-        mp_call_function_n_kw(self->write_function, self->write_function_args->len, 0, self->write_function_args->items);
-    }
-}
 
 //|   .. method:: __getitem__(index)
 //|
@@ -376,36 +350,43 @@ void call_write_function(pixelbuf_pixelbuf_obj_t *self) {
 //|     Sets the pixel value at the given index.
 //|
 STATIC mp_obj_t pixelbuf_pixelbuf_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value) {
-    mp_check_self(MP_OBJ_IS_TYPE(self_in, &pixelbuf_pixelbuf_type));
-
     if (value == MP_OBJ_NULL) {
         // delete item
         // slice deletion
         return MP_OBJ_NULL; // op not supported
     }
 
-    pixelbuf_pixelbuf_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    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))
-            mp_raise_NotImplementedError(translate("Only slices with step=1 (aka None) are supported"));
+        mp_seq_get_fast_slice_indexes(self->pixels, 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;
-            return pixelbuf_get_pixel_array((uint8_t *) self->buf + slice.start, len, &self->byteorder, self->pixel_step, self->dotstar_mode);
+            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
             #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);
+            if (slice.step > 1) {
+                dst_len = (dst_len / slice.step) + (dst_len % slice.step ? 1 : 0);
+            }
             mp_obj_t *src_objs;
             size_t num_items;
             if (MP_OBJ_IS_TYPE(value, &mp_type_list)) {
@@ -421,16 +402,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->dotstar_mode);
+                        self->brightness, item, &self->byteorder, self->byteorder.is_dotstar);
                 }
             }
             if (self->auto_write)
-                call_write_function(self);
+                pixelbuf_call_show(self_in);
             return mp_const_none;
             #else
             return MP_OBJ_NULL; // op not supported
@@ -445,12 +427,12 @@ STATIC mp_obj_t pixelbuf_pixelbuf_subscr(mp_obj_t self_in, mp_obj_t index_in, mp
 
         if (value == MP_OBJ_SENTINEL) { // Get
             uint8_t *pixelstart = (uint8_t *)(self->two_buffers ? self->rawbuf : self->buf) + offset;
-            return pixelbuf_get_pixel(pixelstart, &self->byteorder, self->dotstar_mode);
+            return pixelbuf_get_pixel(pixelstart, &self->byteorder, self->byteorder.is_dotstar);
         } else { // Store
             pixelbuf_set_pixel(self->buf + offset, self->two_buffers ? self->rawbuf + offset : NULL,
-                self->brightness, value, &self->byteorder, self->dotstar_mode);
+                self->brightness, value, &self->byteorder, self->byteorder.is_dotstar);
             if (self->auto_write)
-                call_write_function(self);
+                pixelbuf_call_show(self_in);
             return mp_const_none;
         }
     }
@@ -461,7 +443,7 @@ STATIC const mp_rom_map_elem_t pixelbuf_pixelbuf_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_bpp), MP_ROM_PTR(&pixelbuf_pixelbuf_bpp_obj)},
     { MP_ROM_QSTR(MP_QSTR_brightness), MP_ROM_PTR(&pixelbuf_pixelbuf_brightness_obj)},
     { MP_ROM_QSTR(MP_QSTR_buf), MP_ROM_PTR(&pixelbuf_pixelbuf_buf_obj)},
-    { MP_ROM_QSTR(MP_QSTR_byteorder), MP_ROM_PTR(&pixelbuf_pixelbuf_byteorder_obj)},
+    { MP_ROM_QSTR(MP_QSTR_byteorder), MP_ROM_PTR(&pixelbuf_pixelbuf_byteorder_str)},
     { MP_ROM_QSTR(MP_QSTR_show), MP_ROM_PTR(&pixelbuf_pixelbuf_show_obj)},
 };
 
@@ -474,6 +456,7 @@ const mp_obj_type_t pixelbuf_pixelbuf_type = {
         .subscr = pixelbuf_pixelbuf_subscr,
         .make_new = pixelbuf_pixelbuf_make_new,
         .unary_op = pixelbuf_pixelbuf_unary_op,
+        .getiter = mp_obj_new_generic_iterator,
         .print = NULL,
         .locals_dict = (mp_obj_t)&pixelbuf_pixelbuf_locals_dict,
 };
diff --git a/shared-bindings/_pixelbuf/PixelBuf.h b/shared-bindings/_pixelbuf/PixelBuf.h
index 0b1e36278..691da3cd3 100644
--- a/shared-bindings/_pixelbuf/PixelBuf.h
+++ b/shared-bindings/_pixelbuf/PixelBuf.h
@@ -36,21 +36,18 @@ typedef struct {
     size_t pixels;
     size_t bytes;
     size_t pixel_step;
-    pixelbuf_byteorder_obj_t byteorder;
+    pixelbuf_byteorder_details_t byteorder;
     mp_obj_t bytearray;
     mp_obj_t rawbytearray;
     mp_float_t brightness;
     bool two_buffers;
     size_t offset;
-    bool dotstar_mode;
     uint8_t *rawbuf;
     uint8_t *buf;
-    mp_obj_t write_function;
-    mp_obj_tuple_t *write_function_args;
     bool auto_write;
 } pixelbuf_pixelbuf_obj_t;
 
 void pixelbuf_recalculate_brightness(pixelbuf_pixelbuf_obj_t *self);
-void call_write_function(pixelbuf_pixelbuf_obj_t *self);
+mp_obj_t pixelbuf_call_show(mp_obj_t self_in);
 
 #endif  // CP_SHARED_BINDINGS_PIXELBUF_PIXELBUF_H
diff --git a/shared-bindings/_pixelbuf/__init__.c b/shared-bindings/_pixelbuf/__init__.c
index eb0cb2984..ed264f3bb 100644
--- a/shared-bindings/_pixelbuf/__init__.c
+++ b/shared-bindings/_pixelbuf/__init__.c
@@ -42,9 +42,11 @@
 //| .. module:: _pixelbuf
 //|   :synopsis: A fast RGB(W) pixel buffer library for like NeoPixel and DotStar.
 //|
-//| The `_pixelbuf` module provides :py:class:`PixelBuf` and :py:class:`ByteOrder` classes to accelerate
+//| The `_pixelbuf` module provides the :py:class:`PixelBuf` class to accelerate
 //| RGB(W) strip/matrix manipulation, such as DotStar and Neopixel.
 //|
+//| Byteorders are configured with strings, such as "RGB" or "RGBD".
+//| TODO: Pull in docs from pypixelbuf.
 
 //| Libraries
 //|
@@ -53,93 +55,6 @@
 //|
 //|     PixelBuf
 
-//| .. class:: ByteOrder()
-//|
-//|   Classes representing byteorders for CircuitPython
-
-
-//|   .. attribute:: bpp
-//|
-//|     The number of bytes per pixel (read-only)
-//|
-
-//|   .. attribute:: has_white
-//|
-//|     Whether the pixel has white (in addition to RGB)
-//|
-
-//|   .. attribute:: has_luminosity
-//|
-//|     Whether the pixel has luminosity (in addition to RGB)
-//|
-
-//|   .. attribute:: byteorder
-//|
-//|     Tuple of byte order (r, g, b) or (r, g, b, w) or (r, g, b, l)
-//|
-
-
-STATIC void pixelbuf_byteorder_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
-    mp_check_self(MP_OBJ_IS_TYPE(self_in, &pixelbuf_byteorder_type));
-    pixelbuf_byteorder_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    if (dest[0] == MP_OBJ_NULL) {
-        // load attribute
-        mp_obj_t val;
-        if (attr == MP_QSTR_bpp) {
-            val = MP_OBJ_NEW_SMALL_INT(self->bpp);
-        } else if (attr == MP_QSTR_has_white) {
-            val = mp_obj_new_bool(self->has_white);
-        } else if (attr == MP_QSTR_has_luminosity) {
-            val = mp_obj_new_bool(self->has_luminosity);
-        } else if (attr == MP_QSTR_byteorder) {
-            mp_obj_t items[4];
-            uint8_t n = self->bpp;
-            if (self->has_luminosity || self->has_white) {
-                n = 4;
-            }
-            uint8_t *values = (uint8_t *)&(self->byteorder);
-            for (uint8_t i=0; i<n; i++) {
-                items[i] = MP_OBJ_NEW_SMALL_INT(values[i]);
-            }
-            val = mp_obj_new_tuple(n, items);
-        } else {
-            mp_raise_AttributeError(translate("no such attribute"));
-        }
-        dest[0] = val;
-    } else {
-        // delete/store attribute (ignored)
-        dest[0] = MP_OBJ_NULL;
-        mp_raise_AttributeError(translate("readonly attribute"));
-    }
-}
-
-STATIC mp_obj_t pixelbuf_byteorder_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
-    pixelbuf_byteorder_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    switch (op) {
-        case MP_UNARY_OP_LEN: return MP_OBJ_NEW_SMALL_INT(self->bpp);
-        default: return MP_OBJ_NULL; // op not supported
-    }
-}
-
-const mp_obj_type_t pixelbuf_byteorder_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_ByteOrder,
-    .print = pixelbuf_byteorder_print,
-    .unary_op = pixelbuf_byteorder_unary_op,
-    .attr = pixelbuf_byteorder_attr,
-};
-
-
-// This macro is used to simplify RGB subclass definition
-#define PIXELBUF_BYTEORDER(p_name, p_bpp, p_r, p_g, p_b, p_w, p_has_white, p_has_luminosity) \
-const pixelbuf_byteorder_obj_t byteorder_## p_name = { \
-    { &pixelbuf_byteorder_type }, \
-    .name = MP_QSTR_## p_name, \
-    .bpp = p_bpp, \
-    .byteorder = { p_r, p_g, p_b, p_w }, \
-    .has_white = p_has_white, \
-    .has_luminosity = p_has_luminosity, \
-};
 
 //| .. function:: wheel(n)
 //|
@@ -168,158 +83,37 @@ 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
+//| .. function:: fill(pixelbuf, color)
 //|
-//|    * **order** Blue, Green, Red
-//|    * **bpp** 3
+//|   Fills the given pixelbuf with the given color.
 //|
-//|    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)
+STATIC mp_obj_t pixelbuf_fill(mp_obj_t pixelbuf_in, mp_obj_t value) {
+    mp_obj_t obj = mp_instance_cast_to_native_base(pixelbuf_in, &pixelbuf_pixelbuf_type);
+    if (obj == MP_OBJ_NULL)
+        mp_raise_TypeError(translate("Expected a PixelBuf instance"));
+    pixelbuf_pixelbuf_obj_t *pixelbuf = MP_OBJ_TO_PTR(obj);
+
+    for (size_t offset = 0; offset < pixelbuf->bytes; offset+= pixelbuf->pixel_step) {
+        pixelbuf_set_pixel(pixelbuf->buf + offset, pixelbuf->two_buffers ? (pixelbuf->rawbuf + offset) : NULL,
+                           pixelbuf->brightness, value, &pixelbuf->byteorder, pixelbuf->byteorder.is_dotstar);
+    }
+    if (pixelbuf->auto_write)
+        pixelbuf_call_show(pixelbuf_in);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(pixelbuf_fill_obj, pixelbuf_fill);
 
-// 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 luminance 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) },
-    { MP_ROM_QSTR(MP_QSTR_ByteOrder), MP_ROM_PTR(&pixelbuf_byteorder_type) },
-    { MP_ROM_QSTR(MP_QSTR_RGB),  MP_ROM_PTR(&byteorder_RGB) },
-    { MP_ROM_QSTR(MP_QSTR_RBG),  MP_ROM_PTR(&byteorder_RBG) },
-    { MP_ROM_QSTR(MP_QSTR_GRB),  MP_ROM_PTR(&byteorder_GRB) },
-    { MP_ROM_QSTR(MP_QSTR_GBR),  MP_ROM_PTR(&byteorder_GBR) },
-    { MP_ROM_QSTR(MP_QSTR_BRG),  MP_ROM_PTR(&byteorder_BRG) },
-    { MP_ROM_QSTR(MP_QSTR_BGR),  MP_ROM_PTR(&byteorder_BGR) },
-    { MP_ROM_QSTR(MP_QSTR_RGBW), MP_ROM_PTR(&byteorder_RGBW) },
-    { MP_ROM_QSTR(MP_QSTR_RBGW), MP_ROM_PTR(&byteorder_RBGW) },
-    { MP_ROM_QSTR(MP_QSTR_GRBW), MP_ROM_PTR(&byteorder_GRBW) },
-    { MP_ROM_QSTR(MP_QSTR_GBRW), MP_ROM_PTR(&byteorder_GBRW) },
-    { MP_ROM_QSTR(MP_QSTR_BRGW), MP_ROM_PTR(&byteorder_BRGW) },
-    { MP_ROM_QSTR(MP_QSTR_BGRW), MP_ROM_PTR(&byteorder_BGRW) },
-    { MP_ROM_QSTR(MP_QSTR_LRGB), MP_ROM_PTR(&byteorder_LRGB) },
-    { MP_ROM_QSTR(MP_QSTR_LRBG), MP_ROM_PTR(&byteorder_LRBG) },
-    { MP_ROM_QSTR(MP_QSTR_LGRB), MP_ROM_PTR(&byteorder_LGRB) },
-    { MP_ROM_QSTR(MP_QSTR_LGBR), MP_ROM_PTR(&byteorder_LGBR) },
-    { MP_ROM_QSTR(MP_QSTR_LBRG), MP_ROM_PTR(&byteorder_LBRG) },
-    { MP_ROM_QSTR(MP_QSTR_LBGR), MP_ROM_PTR(&byteorder_LBGR) },
     { MP_ROM_QSTR(MP_QSTR_wheel), MP_ROM_PTR(&pixelbuf_wheel_obj) },
+    { MP_ROM_QSTR(MP_QSTR_fill), MP_ROM_PTR(&pixelbuf_fill_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(pixelbuf_module_globals, pixelbuf_module_globals_table);
 
-STATIC void pixelbuf_byteorder_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
-    pixelbuf_byteorder_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_printf(print, "%q.%q", MP_QSTR__pixelbuf, self->name);
-    return;
-}
-
 const mp_obj_module_t pixelbuf_module = {
         .base = { &mp_type_module },
         .globals = (mp_obj_dict_t*)&pixelbuf_module_globals,
diff --git a/shared-bindings/_pixelbuf/__init__.h b/shared-bindings/_pixelbuf/__init__.h
index a62d67c4a..f70ffe508 100644
--- a/shared-bindings/_pixelbuf/__init__.h
+++ b/shared-bindings/_pixelbuf/__init__.h
@@ -29,9 +29,7 @@
 
 #include "common-hal/digitalio/DigitalInOut.h"
 
-STATIC void pixelbuf_byteorder_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind);
 const int32_t colorwheel(float pos);
-const mp_obj_type_t pixelbuf_byteorder_type;
 extern void common_hal_neopixel_write(const digitalio_digitalinout_obj_t* gpio, uint8_t *pixels, uint32_t numBytes);
 
 #endif //CP_SHARED_BINDINGS_PIXELBUF_INIT_H
diff --git a/shared-bindings/_pixelbuf/types.h b/shared-bindings/_pixelbuf/types.h
index f7d757791..f7dc1a109 100644
--- a/shared-bindings/_pixelbuf/types.h
+++ b/shared-bindings/_pixelbuf/types.h
@@ -37,12 +37,11 @@ typedef struct {
 } pixelbuf_rgbw_t;
 
 typedef struct {
-    mp_obj_base_t base;
-    qstr name;
     uint8_t bpp;
     pixelbuf_rgbw_t byteorder;
     bool has_white;
-    bool has_luminosity;
-} pixelbuf_byteorder_obj_t;
+    bool is_dotstar;
+    mp_obj_t *order;
+} pixelbuf_byteorder_details_t;
 
 #endif // CIRCUITPYTHON_PIXELBUF_TYPES_H
diff --git a/shared-bindings/audiomp3/MP3File.c b/shared-bindings/audiomp3/MP3Decoder.c
index f518bae4b..224042212 100644
--- a/shared-bindings/audiomp3/MP3File.c
+++ b/shared-bindings/audiomp3/MP3Decoder.c
@@ -30,18 +30,16 @@
 #include "lib/utils/context_manager_helpers.h"
 #include "py/objproperty.h"
 #include "py/runtime.h"
-#include "shared-bindings/audiomp3/MP3File.h"
+#include "shared-bindings/audiomp3/MP3Decoder.h"
 #include "shared-bindings/util.h"
 #include "supervisor/shared/translate.h"
 
 //| .. currentmodule:: audiomp3
 //|
-//| :class:`MP3` -- Load a mp3 file for audio playback
-//| ========================================================
+//| :class:`MP3Decoder` -- Load a mp3 file for audio playback
+//| =========================================================
 //|
-//| A .mp3 file prepped for audio playback. Only mono and stereo files are supported. Samples must
-//| be 8 bit unsigned or 16 bit signed. If a buffer is provided, it will be used instead of allocating
-//| an internal buffer.
+//| An object that decodes MP3 files for playback on an audio device.
 //|
 //| .. class:: MP3(file[, buffer])
 //|
@@ -63,7 +61,7 @@
 //|     speaker_enable.switch_to_output(value=True)
 //|
 //|     data = open("cplay-16bit-16khz-64kbps.mp3", "rb")
-//|     mp3 = audiomp3.MP3File(data)
+//|     mp3 = audiomp3.MP3Decoder(data)
 //|     a = audioio.AudioOut(board.A0)
 //|
 //|     print("playing")
@@ -129,6 +127,37 @@ STATIC mp_obj_t audiomp3_mp3file_obj___exit__(size_t n_args, const mp_obj_t *arg
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(audiomp3_mp3file___exit___obj, 4, 4, audiomp3_mp3file_obj___exit__);
 
+//|   .. attribute:: file
+//|
+//|     File to play back.
+//|
+STATIC mp_obj_t audiomp3_mp3file_obj_get_file(mp_obj_t self_in) {
+    audiomp3_mp3file_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return self->file;
+}
+MP_DEFINE_CONST_FUN_OBJ_1(audiomp3_mp3file_get_file_obj, audiomp3_mp3file_obj_get_file);
+
+STATIC mp_obj_t audiomp3_mp3file_obj_set_file(mp_obj_t self_in, mp_obj_t file) {
+    audiomp3_mp3file_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    if (!MP_OBJ_IS_TYPE(file, &mp_type_fileio)) {
+        mp_raise_TypeError(translate("file must be a file opened in byte mode"));
+    }
+    common_hal_audiomp3_mp3file_set_file(self, file);
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(audiomp3_mp3file_set_file_obj, audiomp3_mp3file_obj_set_file);
+
+const mp_obj_property_t audiomp3_mp3file_file_obj = {
+    .base.type = &mp_type_property,
+    .proxy = {(mp_obj_t)&audiomp3_mp3file_get_file_obj,
+              (mp_obj_t)&audiomp3_mp3file_set_file_obj,
+              (mp_obj_t)&mp_const_none_obj},
+};
+
+
+
 //|   .. attribute:: sample_rate
 //|
 //|     32 bit value that dictates how quickly samples are loaded into the DAC
@@ -193,6 +222,24 @@ const mp_obj_property_t audiomp3_mp3file_channel_count_obj = {
               (mp_obj_t)&mp_const_none_obj},
 };
 
+//|   .. attribute:: rms_level
+//|
+//|     The RMS audio level of a recently played moment of audio. (read only)
+//|
+STATIC mp_obj_t audiomp3_mp3file_obj_get_rms_level(mp_obj_t self_in) {
+    audiomp3_mp3file_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_for_deinit(self);
+    return mp_obj_new_float(common_hal_audiomp3_mp3file_get_rms_level(self));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(audiomp3_mp3file_get_rms_level_obj, audiomp3_mp3file_obj_get_rms_level);
+
+const mp_obj_property_t audiomp3_mp3file_rms_level_obj = {
+    .base.type = &mp_type_property,
+    .proxy = {(mp_obj_t)&audiomp3_mp3file_get_rms_level_obj,
+              (mp_obj_t)&mp_const_none_obj,
+              (mp_obj_t)&mp_const_none_obj},
+};
+
 
 STATIC const mp_rom_map_elem_t audiomp3_mp3file_locals_dict_table[] = {
     // Methods
@@ -201,9 +248,11 @@ STATIC const mp_rom_map_elem_t audiomp3_mp3file_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&audiomp3_mp3file___exit___obj) },
 
     // Properties
+    { MP_ROM_QSTR(MP_QSTR_file), MP_ROM_PTR(&audiomp3_mp3file_file_obj) },
     { MP_ROM_QSTR(MP_QSTR_sample_rate), MP_ROM_PTR(&audiomp3_mp3file_sample_rate_obj) },
     { MP_ROM_QSTR(MP_QSTR_bits_per_sample), MP_ROM_PTR(&audiomp3_mp3file_bits_per_sample_obj) },
     { MP_ROM_QSTR(MP_QSTR_channel_count), MP_ROM_PTR(&audiomp3_mp3file_channel_count_obj) },
+    { MP_ROM_QSTR(MP_QSTR_rms_level), MP_ROM_PTR(&audiomp3_mp3file_rms_level_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(audiomp3_mp3file_locals_dict, audiomp3_mp3file_locals_dict_table);
 
@@ -219,7 +268,7 @@ STATIC const audiosample_p_t audiomp3_mp3file_proto = {
 
 const mp_obj_type_t audiomp3_mp3file_type = {
     { &mp_type_type },
-    .name = MP_QSTR_MP3File,
+    .name = MP_QSTR_MP3Decoder,
     .make_new = audiomp3_mp3file_make_new,
     .locals_dict = (mp_obj_dict_t*)&audiomp3_mp3file_locals_dict,
     .protocol = &audiomp3_mp3file_proto,
diff --git a/shared-bindings/audiomp3/MP3File.h b/shared-bindings/audiomp3/MP3Decoder.h
index adc13ea2c..36d525e93 100644
--- a/shared-bindings/audiomp3/MP3File.h
+++ b/shared-bindings/audiomp3/MP3Decoder.h
@@ -31,18 +31,20 @@
 #include "py/obj.h"
 #include "extmod/vfs_fat.h"
 
-#include "shared-module/audiomp3/MP3File.h"
+#include "shared-module/audiomp3/MP3Decoder.h"
 
 extern const mp_obj_type_t audiomp3_mp3file_type;
 
 void common_hal_audiomp3_mp3file_construct(audiomp3_mp3file_obj_t* self,
     pyb_file_obj_t* file, uint8_t *buffer, size_t buffer_size);
 
+void common_hal_audiomp3_mp3file_set_file(audiomp3_mp3file_obj_t* self, pyb_file_obj_t* file);
 void common_hal_audiomp3_mp3file_deinit(audiomp3_mp3file_obj_t* self);
 bool common_hal_audiomp3_mp3file_deinited(audiomp3_mp3file_obj_t* self);
 uint32_t common_hal_audiomp3_mp3file_get_sample_rate(audiomp3_mp3file_obj_t* self);
 void common_hal_audiomp3_mp3file_set_sample_rate(audiomp3_mp3file_obj_t* self, uint32_t sample_rate);
 uint8_t common_hal_audiomp3_mp3file_get_bits_per_sample(audiomp3_mp3file_obj_t* self);
 uint8_t common_hal_audiomp3_mp3file_get_channel_count(audiomp3_mp3file_obj_t* self);
+float common_hal_audiomp3_mp3file_get_rms_level(audiomp3_mp3file_obj_t* self);
 
 #endif // MICROPY_INCLUDED_SHARED_BINDINGS_AUDIOIO_MP3FILE_H
diff --git a/shared-bindings/audiomp3/__init__.c b/shared-bindings/audiomp3/__init__.c
index 06f852ff1..fb2187669 100644
--- a/shared-bindings/audiomp3/__init__.c
+++ b/shared-bindings/audiomp3/__init__.c
@@ -29,7 +29,7 @@
 #include "py/obj.h"
 #include "py/runtime.h"
 
-#include "shared-bindings/audiomp3/MP3File.h"
+#include "shared-bindings/audiomp3/MP3Decoder.h"
 
 //| :mod:`audiomp3` --- Support for MP3-compressed audio files
 //| ==========================================================
@@ -44,12 +44,12 @@
 //| .. toctree::
 //|     :maxdepth: 3
 //|
-//|     MP3File
+//|     MP3Decoder
 //|
 
 STATIC const mp_rom_map_elem_t audiomp3_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_audiomp3) },
-    { MP_ROM_QSTR(MP_QSTR_MP3File), MP_ROM_PTR(&audiomp3_mp3file_type) },
+    { MP_ROM_QSTR(MP_QSTR_MP3Decoder), MP_ROM_PTR(&audiomp3_mp3file_type) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(audiomp3_module_globals, audiomp3_module_globals_table);
diff --git a/shared-bindings/displayio/Display.c b/shared-bindings/displayio/Display.c
index 5ce7b3581..5759e8ad2 100644
--- a/shared-bindings/displayio/Display.c
+++ b/shared-bindings/displayio/Display.c
@@ -394,11 +394,18 @@ STATIC mp_obj_t displayio_display_obj_get_rotation(mp_obj_t self_in) {
     return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_display_get_rotation(self));
 }
 MP_DEFINE_CONST_FUN_OBJ_1(displayio_display_get_rotation_obj, displayio_display_obj_get_rotation);
+STATIC mp_obj_t displayio_display_obj_set_rotation(mp_obj_t self_in, mp_obj_t value) {
+    displayio_display_obj_t *self = native_display(self_in);
+    common_hal_displayio_display_set_rotation(self, mp_obj_get_int(value));
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(displayio_display_set_rotation_obj, displayio_display_obj_set_rotation);
+
 
 const mp_obj_property_t displayio_display_rotation_obj = {
     .base.type = &mp_type_property,
     .proxy = {(mp_obj_t)&displayio_display_get_rotation_obj,
-              (mp_obj_t)&mp_const_none_obj,
+              (mp_obj_t)&displayio_display_set_rotation_obj,
               (mp_obj_t)&mp_const_none_obj},
 };
 
diff --git a/shared-bindings/displayio/Display.h b/shared-bindings/displayio/Display.h
index ca2b2d476..b82a68ebe 100644
--- a/shared-bindings/displayio/Display.h
+++ b/shared-bindings/displayio/Display.h
@@ -58,6 +58,7 @@ void common_hal_displayio_display_set_auto_refresh(displayio_display_obj_t* self
 uint16_t common_hal_displayio_display_get_width(displayio_display_obj_t* self);
 uint16_t common_hal_displayio_display_get_height(displayio_display_obj_t* self);
 uint16_t common_hal_displayio_display_get_rotation(displayio_display_obj_t* self);
+void common_hal_displayio_display_set_rotation(displayio_display_obj_t* self, int rotation);
 
 bool common_hal_displayio_display_get_auto_brightness(displayio_display_obj_t* self);
 void common_hal_displayio_display_set_auto_brightness(displayio_display_obj_t* self, bool auto_brightness);
diff --git a/shared-bindings/displayio/Shape.c b/shared-bindings/displayio/Shape.c
index faa9472fa..7c7b10501 100644
--- a/shared-bindings/displayio/Shape.c
+++ b/shared-bindings/displayio/Shape.c
@@ -41,8 +41,6 @@
 //|
 //| Represents any shape made by defining boundaries that may be mirrored.
 //|
-//| .. warning:: This will likely be changed before 4.0.0. Consider it very experimental.
-//|
 //| .. class:: Shape(width, height, *, mirror_x=False, mirror_y=False)
 //|
 //|   Create a Shape object with the given fixed size. Each pixel is one bit and is stored by the
diff --git a/shared-bindings/os/__init__.c b/shared-bindings/os/__init__.c
index 55ebd6f59..c2b63bbce 100644
--- a/shared-bindings/os/__init__.c
+++ b/shared-bindings/os/__init__.c
@@ -33,6 +33,7 @@
 #include "lib/oofatfs/diskio.h"
 #include "py/mpstate.h"
 #include "py/obj.h"
+#include "py/objstr.h"
 #include "py/runtime.h"
 #include "shared-bindings/os/__init__.h"
 
@@ -195,11 +196,11 @@ MP_DEFINE_CONST_FUN_OBJ_0(os_sync_obj, os_sync);
 //|
 STATIC mp_obj_t os_urandom(mp_obj_t size_in) {
     mp_int_t size = mp_obj_get_int(size_in);
-    uint8_t tmp[size];
-    if (!common_hal_os_urandom(tmp, size)) {
+    mp_obj_str_t *result = MP_OBJ_TO_PTR(mp_obj_new_bytes_of_zeros(size));
+    if (!common_hal_os_urandom((uint8_t*) result->data, size)) {
         mp_raise_NotImplementedError(translate("No hardware random available"));
     }
-    return mp_obj_new_bytes(tmp, size);
+    return result;
 }
 MP_DEFINE_CONST_FUN_OBJ_1(os_urandom_obj, os_urandom);
 
diff --git a/shared-bindings/random/__init__.c b/shared-bindings/random/__init__.c
index 83698eac5..de4c90910 100644
--- a/shared-bindings/random/__init__.c
+++ b/shared-bindings/random/__init__.c
@@ -33,11 +33,11 @@
 #include "shared-bindings/random/__init__.h"
 #include "supervisor/shared/translate.h"
 
-//| :mod:`random` --- psuedo-random numbers and choices
+//| :mod:`random` --- pseudo-random numbers and choices
 //| ========================================================
 //|
 //| .. module:: random
-//|   :synopsis: psuedo-random numbers and choices
+//|   :synopsis: pseudo-random numbers and choices
 //|   :platform: SAMD21, ESP8266
 //|
 //| The `random` module is a strict subset of the CPython `cpython:random`