From 09dc46a98480350b157636ffff8b89470f595f6e Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Tue, 10 Mar 2020 13:12:01 -0500
Subject: Add Protomatter and FramebufferDisplay

---
 shared-bindings/framebufferio/FramebufferDisplay.c | 452 +++++++++++++++++++++
 1 file changed, 452 insertions(+)
 create mode 100644 shared-bindings/framebufferio/FramebufferDisplay.c

(limited to 'shared-bindings/framebufferio/FramebufferDisplay.c')

diff --git a/shared-bindings/framebufferio/FramebufferDisplay.c b/shared-bindings/framebufferio/FramebufferDisplay.c
new file mode 100644
index 000000000..9f1df8bfa
--- /dev/null
+++ b/shared-bindings/framebufferio/FramebufferDisplay.c
@@ -0,0 +1,452 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 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 "shared-bindings/framebufferio/FramebufferDisplay.h"
+
+#include <stdint.h>
+
+#include "lib/utils/context_manager_helpers.h"
+#include "py/binary.h"
+#include "py/objproperty.h"
+#include "py/objtype.h"
+#include "py/runtime.h"
+#include "shared-bindings/displayio/Group.h"
+#include "shared-bindings/microcontroller/Pin.h"
+#include "shared-bindings/util.h"
+#include "shared-module/displayio/__init__.h"
+#include "supervisor/shared/translate.h"
+
+//| .. currentmodule:: framebufferio
+//|
+//| :class:`FramebufferDisplay` -- Manage updating a display with framebuffer in RAM
+//| ================================================================================
+//|
+//| This initializes a display and connects it into CircuitPython. Unlike other
+//| objects in CircuitPython, Display objects live until `displayio.release_displays()`
+//| is called. This is done so that CircuitPython can use the display itself.
+//|
+//| .. class:: FramebufferDisplay(framebuffer, *, width, height, colstart=0, rowstart=0, rotation=0, color_depth=16, grayscale=False, pixels_in_byte_share_row=True, bytes_per_cell=1, reverse_pixels_in_byte=False, backlight_pin=None, brightness=1.0, auto_brightness=False, auto_refresh=True, native_frames_per_second=60)
+//|
+//|   Create a Display object with the given framebuffer (a buffer, array, ulab.array, etc)
+//|
+//|   :param framebuffer: The framebuffer that the display is connected to
+//|   :type framebuffer: any core object implementing the framebuffer protocol
+//|   :param callback: Function or bound method to call when the framebuffer has been updated.  The callback receives one argument, the framebuffer object.
+//|   :param int width: Width in pixels
+//|   :param int height: Height in pixels
+//|   :param int colstart: The index if the first visible column
+//|   :param int rowstart: The index if the first visible row
+//|   :param int rotation: The rotation of the display in degrees clockwise. Must be in 90 degree increments (0, 90, 180, 270)
+//|   :param int color_depth: The number of bits of color per pixel transmitted. (Some displays
+//|       support 18 bit but 16 is easier to transmit. The last bit is extrapolated.)
+//|   :param bool grayscale: True if the display only shows a single color.
+//|   :param bool pixels_in_byte_share_row: True when pixels are less than a byte and a byte includes pixels from the same row of the display. When False, pixels share a column.
+//|   :param int bytes_per_cell: Number of bytes per addressable memory location when color_depth < 8. When greater than one, bytes share a row or column according to pixels_in_byte_share_row.
+//|   :param bool reverse_pixels_in_byte: Reverses the pixel order within each byte when color_depth < 8. Does not apply across multiple bytes even if there is more than one byte per cell (bytes_per_cell.)
+//|   :param bool reverse_pixels_in_byte: Reverses the pixel order within each byte when color_depth < 8. Does not apply across multiple bytes even if there is more than one byte per cell (bytes_per_cell.)
+//|   :param bool reverse_bytes_in_word: Reverses the order of bytes within a word when color_depth == 16
+//|   :param microcontroller.Pin backlight_pin: Pin connected to the display's backlight
+//|   :param bool brightness: Initial display brightness. This value is ignored if auto_brightness is True.
+//|   :param bool auto_brightness: If True, brightness is controlled via an ambient light sensor or other mechanism.
+//|   :param bool auto_refresh: Automatically refresh the screen
+//|   :param int native_frames_per_second: Number of display refreshes per second
+//|
+STATIC mp_obj_t framebufferio_framebufferdisplay_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_framebuffer, ARG_width, ARG_height, ARG_colstart, ARG_rowstart, ARG_rotation, ARG_color_depth, ARG_grayscale, ARG_pixels_in_byte_share_row, ARG_bytes_per_cell, ARG_reverse_pixels_in_byte, ARG_reverse_bytes_in_word, ARG_backlight_pin, ARG_brightness, ARG_auto_brightness, ARG_auto_refresh, ARG_native_frames_per_second, NUM_ARGS };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_framebuffer, MP_ARG_REQUIRED | MP_ARG_OBJ },
+        { MP_QSTR_width, MP_ARG_INT | MP_ARG_KW_ONLY | MP_ARG_REQUIRED, },
+        { MP_QSTR_height, MP_ARG_INT | MP_ARG_KW_ONLY | MP_ARG_REQUIRED, },
+        { MP_QSTR_colstart, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 0} },
+        { MP_QSTR_rowstart, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 0} },
+        { MP_QSTR_rotation, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 0} },
+        { MP_QSTR_color_depth, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 16} },
+        { MP_QSTR_grayscale, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = false} },
+        { MP_QSTR_pixels_in_byte_share_row, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = true} },
+        { MP_QSTR_bytes_per_cell, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 1} },
+        { MP_QSTR_reverse_pixels_in_byte, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = false} },
+        { MP_QSTR_reverse_bytes_in_word, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = false} },
+        { MP_QSTR_backlight_pin, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = mp_const_none} },
+        { MP_QSTR_brightness, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = MP_OBJ_NEW_SMALL_INT(1)} },
+        { MP_QSTR_auto_brightness, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = false} },
+        { MP_QSTR_auto_refresh, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = true} },
+        { MP_QSTR_native_frames_per_second, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 60} },
+    };
+    MP_STATIC_ASSERT( MP_ARRAY_SIZE(allowed_args) == NUM_ARGS );
+    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);
+
+    mp_obj_t framebuffer = args[ARG_framebuffer].u_obj;
+
+    const mcu_pin_obj_t* backlight_pin = validate_obj_is_free_pin_or_none(args[ARG_backlight_pin].u_obj);
+
+    mp_float_t brightness = mp_obj_get_float(args[ARG_brightness].u_obj);
+
+    mp_int_t rotation = args[ARG_rotation].u_int;
+    if (rotation % 90 != 0) {
+        mp_raise_ValueError(translate("Display rotation must be in 90 degree increments"));
+    }
+
+    primary_display_t *disp = allocate_display_or_raise();
+    framebufferio_framebufferdisplay_obj_t *self = &disp->framebuffer_display;
+    self->base.type = &framebufferio_framebufferdisplay_type;
+    common_hal_framebufferio_framebufferdisplay_construct(
+        self,
+        framebuffer,
+        args[ARG_width].u_int, args[ARG_height].u_int,
+        args[ARG_colstart].u_int, args[ARG_rowstart].u_int, rotation,
+        args[ARG_color_depth].u_int, args[ARG_grayscale].u_bool,
+        args[ARG_pixels_in_byte_share_row].u_bool,
+        args[ARG_bytes_per_cell].u_bool,
+        args[ARG_reverse_pixels_in_byte].u_bool,
+        args[ARG_reverse_bytes_in_word].u_bool,
+        MP_OBJ_TO_PTR(backlight_pin),
+        brightness,
+        args[ARG_auto_brightness].u_bool,
+        args[ARG_auto_refresh].u_bool,
+        args[ARG_native_frames_per_second].u_int
+        );
+
+    return self;
+}
+
+// Helper to ensure we have the native super class instead of a subclass.
+static framebufferio_framebufferdisplay_obj_t* native_display(mp_obj_t display_obj) {
+    mp_obj_t native_display = mp_instance_cast_to_native_base(display_obj, &framebufferio_framebufferdisplay_type);
+    mp_obj_assert_native_inited(native_display);
+    return MP_OBJ_TO_PTR(native_display);
+}
+
+//|   .. method:: show(group)
+//|
+//|     Switches to displaying the given group of layers. When group is None, the default
+//|     CircuitPython terminal will be shown.
+//|
+//|     :param Group group: The group to show.
+//|
+STATIC mp_obj_t framebufferio_framebufferdisplay_obj_show(mp_obj_t self_in, mp_obj_t group_in) {
+    framebufferio_framebufferdisplay_obj_t *self = native_display(self_in);
+    displayio_group_t* group = NULL;
+    if (group_in != mp_const_none) {
+        group = MP_OBJ_TO_PTR(native_group(group_in));
+    }
+
+    bool ok = common_hal_framebufferio_framebufferdisplay_show(self, group);
+    if (!ok) {
+        mp_raise_ValueError(translate("Group already used"));
+    }
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(framebufferio_framebufferdisplay_show_obj, framebufferio_framebufferdisplay_obj_show);
+
+//|   .. method:: refresh(*, target_frames_per_second=60, minimum_frames_per_second=1)
+//|
+//|     When auto refresh is off, waits for the target frame rate and then refreshes the display,
+//|     returning True. If the call has taken too long since the last refresh call for the given
+//|     target frame rate, then the refresh returns False immediately without updating the screen to
+//|     hopefully help getting caught up.
+//|
+//|     If the time since the last successful refresh is below the minimum frame rate, then an
+//|     exception will be raised. Set minimum_frames_per_second to 0 to disable.
+//|
+//|     When auto refresh is on, updates the display immediately. (The display will also update
+//|     without calls to this.)
+//|
+//|   :param int target_frames_per_second: How many times a second `refresh` should be called and the screen updated.
+//|   :param int minimum_frames_per_second: The minimum number of times the screen should be updated per second.
+//|
+STATIC mp_obj_t framebufferio_framebufferdisplay_obj_refresh(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_target_frames_per_second, ARG_minimum_frames_per_second };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_target_frames_per_second, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 60} },
+        { MP_QSTR_minimum_frames_per_second, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1} },
+    };
+    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);
+
+    framebufferio_framebufferdisplay_obj_t *self = native_display(pos_args[0]);
+    uint32_t maximum_ms_per_real_frame = 0xffffffff;
+    mp_int_t minimum_frames_per_second = args[ARG_minimum_frames_per_second].u_int;
+    if (minimum_frames_per_second > 0) {
+        maximum_ms_per_real_frame = 1000 / minimum_frames_per_second;
+    }
+    return mp_obj_new_bool(common_hal_framebufferio_framebufferdisplay_refresh(self, 1000 / args[ARG_target_frames_per_second].u_int, maximum_ms_per_real_frame));
+}
+MP_DEFINE_CONST_FUN_OBJ_KW(framebufferio_framebufferdisplay_refresh_obj, 1, framebufferio_framebufferdisplay_obj_refresh);
+
+//|   .. attribute:: auto_refresh
+//|
+//|     True when the display is refreshed automatically.
+//|
+STATIC mp_obj_t framebufferio_framebufferdisplay_obj_get_auto_refresh(mp_obj_t self_in) {
+    framebufferio_framebufferdisplay_obj_t *self = native_display(self_in);
+    return mp_obj_new_bool(common_hal_framebufferio_framebufferdisplay_get_auto_refresh(self));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(framebufferio_framebufferdisplay_get_auto_refresh_obj, framebufferio_framebufferdisplay_obj_get_auto_refresh);
+
+STATIC mp_obj_t framebufferio_framebufferdisplay_obj_set_auto_refresh(mp_obj_t self_in, mp_obj_t auto_refresh) {
+    framebufferio_framebufferdisplay_obj_t *self = native_display(self_in);
+
+    common_hal_framebufferio_framebufferdisplay_set_auto_refresh(self, mp_obj_is_true(auto_refresh));
+
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(framebufferio_framebufferdisplay_set_auto_refresh_obj, framebufferio_framebufferdisplay_obj_set_auto_refresh);
+
+const mp_obj_property_t framebufferio_framebufferdisplay_auto_refresh_obj = {
+    .base.type = &mp_type_property,
+    .proxy = {(mp_obj_t)&framebufferio_framebufferdisplay_get_auto_refresh_obj,
+              (mp_obj_t)&framebufferio_framebufferdisplay_set_auto_refresh_obj,
+              (mp_obj_t)&mp_const_none_obj},
+};
+
+//|   .. attribute:: brightness
+//|
+//|     The brightness of the display as a float. 0.0 is off and 1.0 is full brightness. When
+//|     `auto_brightness` is True, the value of `brightness` will change automatically.
+//|     If `brightness` is set, `auto_brightness` will be disabled and will be set to False.
+//|
+STATIC mp_obj_t framebufferio_framebufferdisplay_obj_get_brightness(mp_obj_t self_in) {
+    framebufferio_framebufferdisplay_obj_t *self = native_display(self_in);
+    mp_float_t brightness = common_hal_framebufferio_framebufferdisplay_get_brightness(self);
+    if (brightness < 0) {
+        mp_raise_RuntimeError(translate("Brightness not adjustable"));
+    }
+    return mp_obj_new_float(brightness);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(framebufferio_framebufferdisplay_get_brightness_obj, framebufferio_framebufferdisplay_obj_get_brightness);
+
+STATIC mp_obj_t framebufferio_framebufferdisplay_obj_set_brightness(mp_obj_t self_in, mp_obj_t brightness_obj) {
+    framebufferio_framebufferdisplay_obj_t *self = native_display(self_in);
+    common_hal_framebufferio_framebufferdisplay_set_auto_brightness(self, false);
+    mp_float_t brightness = mp_obj_get_float(brightness_obj);
+    if (brightness < 0 || brightness > 1.0) {
+        mp_raise_ValueError(translate("Brightness must be 0-1.0"));
+    }
+    bool ok = common_hal_framebufferio_framebufferdisplay_set_brightness(self, brightness);
+    if (!ok) {
+        mp_raise_RuntimeError(translate("Brightness not adjustable"));
+    }
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(framebufferio_framebufferdisplay_set_brightness_obj, framebufferio_framebufferdisplay_obj_set_brightness);
+
+const mp_obj_property_t framebufferio_framebufferdisplay_brightness_obj = {
+    .base.type = &mp_type_property,
+    .proxy = {(mp_obj_t)&framebufferio_framebufferdisplay_get_brightness_obj,
+              (mp_obj_t)&framebufferio_framebufferdisplay_set_brightness_obj,
+              (mp_obj_t)&mp_const_none_obj},
+};
+
+//|   .. attribute:: auto_brightness
+//|
+//|     True when the display brightness is adjusted automatically, based on an ambient
+//|     light sensor or other method. Note that some displays may have this set to True by default,
+//|     but not actually implement automatic brightness adjustment. `auto_brightness` is set to False
+//|     if `brightness` is set manually.
+//|
+STATIC mp_obj_t framebufferio_framebufferdisplay_obj_get_auto_brightness(mp_obj_t self_in) {
+    framebufferio_framebufferdisplay_obj_t *self = native_display(self_in);
+    return mp_obj_new_bool(common_hal_framebufferio_framebufferdisplay_get_auto_brightness(self));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(framebufferio_framebufferdisplay_get_auto_brightness_obj, framebufferio_framebufferdisplay_obj_get_auto_brightness);
+
+STATIC mp_obj_t framebufferio_framebufferdisplay_obj_set_auto_brightness(mp_obj_t self_in, mp_obj_t auto_brightness) {
+    framebufferio_framebufferdisplay_obj_t *self = native_display(self_in);
+
+    common_hal_framebufferio_framebufferdisplay_set_auto_brightness(self, mp_obj_is_true(auto_brightness));
+
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(framebufferio_framebufferdisplay_set_auto_brightness_obj, framebufferio_framebufferdisplay_obj_set_auto_brightness);
+
+const mp_obj_property_t framebufferio_framebufferdisplay_auto_brightness_obj = {
+    .base.type = &mp_type_property,
+    .proxy = {(mp_obj_t)&framebufferio_framebufferdisplay_get_auto_brightness_obj,
+              (mp_obj_t)&framebufferio_framebufferdisplay_set_auto_brightness_obj,
+              (mp_obj_t)&mp_const_none_obj},
+};
+
+//|   .. attribute:: width
+//|
+//|	Gets the width of the framebuffer
+//|
+STATIC mp_obj_t framebufferio_framebufferdisplay_obj_get_width(mp_obj_t self_in) {
+    framebufferio_framebufferdisplay_obj_t *self = native_display(self_in);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_framebufferio_framebufferdisplay_get_width(self));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(framebufferio_framebufferdisplay_get_width_obj, framebufferio_framebufferdisplay_obj_get_width);
+
+const mp_obj_property_t framebufferio_framebufferdisplay_width_obj = {
+    .base.type = &mp_type_property,
+    .proxy = {(mp_obj_t)&framebufferio_framebufferdisplay_get_width_obj,
+              (mp_obj_t)&mp_const_none_obj,
+              (mp_obj_t)&mp_const_none_obj},
+};
+
+//|   .. attribute:: height
+//|
+//|	Gets the height of the framebuffer
+//|
+STATIC mp_obj_t framebufferio_framebufferdisplay_obj_get_height(mp_obj_t self_in) {
+    framebufferio_framebufferdisplay_obj_t *self = native_display(self_in);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_framebufferio_framebufferdisplay_get_height(self));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(framebufferio_framebufferdisplay_get_height_obj, framebufferio_framebufferdisplay_obj_get_height);
+
+const mp_obj_property_t framebufferio_framebufferdisplay_height_obj = {
+    .base.type = &mp_type_property,
+    .proxy = {(mp_obj_t)&framebufferio_framebufferdisplay_get_height_obj,
+              (mp_obj_t)&mp_const_none_obj,
+              (mp_obj_t)&mp_const_none_obj},
+};
+
+//|   .. attribute:: rotation
+//|
+//|     The rotation of the display as an int in degrees.
+//|
+STATIC mp_obj_t framebufferio_framebufferdisplay_obj_get_rotation(mp_obj_t self_in) {
+    framebufferio_framebufferdisplay_obj_t *self = native_display(self_in);
+    return MP_OBJ_NEW_SMALL_INT(common_hal_framebufferio_framebufferdisplay_get_rotation(self));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(framebufferio_framebufferdisplay_get_rotation_obj, framebufferio_framebufferdisplay_obj_get_rotation);
+STATIC mp_obj_t framebufferio_framebufferdisplay_obj_set_rotation(mp_obj_t self_in, mp_obj_t value) {
+    framebufferio_framebufferdisplay_obj_t *self = native_display(self_in);
+    common_hal_framebufferio_framebufferdisplay_set_rotation(self, mp_obj_get_int(value));
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(framebufferio_framebufferdisplay_set_rotation_obj, framebufferio_framebufferdisplay_obj_set_rotation);
+
+
+const mp_obj_property_t framebufferio_framebufferdisplay_rotation_obj = {
+    .base.type = &mp_type_property,
+    .proxy = {(mp_obj_t)&framebufferio_framebufferdisplay_get_rotation_obj,
+              (mp_obj_t)&framebufferio_framebufferdisplay_set_rotation_obj,
+              (mp_obj_t)&mp_const_none_obj},
+};
+
+//|   .. attribute:: framebuffer
+//|
+//|	The framebuffer being used by the display
+//|
+//|
+STATIC mp_obj_t framebufferio_framebufferdisplay_obj_get_framebuffer(mp_obj_t self_in) {
+    framebufferio_framebufferdisplay_obj_t *self = native_display(self_in);
+    return common_hal_framebufferio_framebufferdisplay_get_framebuffer(self);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(framebufferio_framebufferdisplay_get_framebuffer_obj, framebufferio_framebufferdisplay_obj_get_framebuffer);
+
+const mp_obj_property_t framebufferio_framebufferframebuffer_obj = {
+    .base.type = &mp_type_property,
+    .proxy = {(mp_obj_t)&framebufferio_framebufferdisplay_get_framebuffer_obj,
+              (mp_obj_t)&mp_const_none_obj,
+              (mp_obj_t)&mp_const_none_obj},
+};
+
+
+//|   .. method:: fill_row(y, buffer)
+//|
+//|     Extract the pixels from a single row
+//|
+//|     :param int y: The top edge of the area
+//|     :param bytearray buffer: The buffer in which to place the pixel data
+STATIC mp_obj_t framebufferio_framebufferdisplay_obj_fill_row(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_y, ARG_buffer };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_y, MP_ARG_INT | MP_ARG_REQUIRED, {.u_int = -1} },
+        { MP_QSTR_buffer, MP_ARG_OBJ | MP_ARG_REQUIRED, {} },
+    };
+    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);
+    framebufferio_framebufferdisplay_obj_t *self = native_display(pos_args[0]);
+    mp_int_t y = args[ARG_y].u_int;
+    mp_obj_t *result = args[ARG_buffer].u_obj;
+
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(result, &bufinfo, MP_BUFFER_WRITE);
+
+    if (bufinfo.typecode != BYTEARRAY_TYPECODE) {
+      mp_raise_ValueError(translate("Buffer is not a bytearray."));
+    }
+    if (self->core.colorspace.depth != 16) {
+      mp_raise_ValueError(translate("Display must have a 16 bit colorspace."));
+    }
+
+    displayio_area_t area = {
+      .x1 = 0,
+      .y1 = y,
+      .x2 = self->core.width,
+      .y2 = y + 1
+    };
+    uint8_t pixels_per_word = (sizeof(uint32_t) * 8) / self->core.colorspace.depth;
+    uint16_t buffer_size = self->core.width / pixels_per_word;
+    uint16_t pixels_per_buffer = displayio_area_size(&area);
+    if (pixels_per_buffer % pixels_per_word) {
+      buffer_size += 1;
+    }
+
+    uint32_t *result_buffer = bufinfo.buf;
+    size_t result_buffer_size = bufinfo.len;
+
+    if (result_buffer_size >= (buffer_size * 4)) {
+      volatile uint32_t mask_length = (pixels_per_buffer / 32) + 1;
+      uint32_t mask[mask_length];
+
+      for (uint16_t k = 0; k < mask_length; k++) {
+        mask[k] = 0x00000000;
+      }
+
+      displayio_display_core_fill_area(&self->core, &area, mask, result_buffer);
+      return result;
+    } else {
+      mp_raise_ValueError(translate("Buffer is too small"));
+    }
+}
+MP_DEFINE_CONST_FUN_OBJ_KW(framebufferio_framebufferdisplay_fill_row_obj, 1, framebufferio_framebufferdisplay_obj_fill_row);
+
+STATIC const mp_rom_map_elem_t framebufferio_framebufferdisplay_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_show), MP_ROM_PTR(&framebufferio_framebufferdisplay_show_obj) },
+    { MP_ROM_QSTR(MP_QSTR_refresh), MP_ROM_PTR(&framebufferio_framebufferdisplay_refresh_obj) },
+    { MP_ROM_QSTR(MP_QSTR_fill_row), MP_ROM_PTR(&framebufferio_framebufferdisplay_fill_row_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_auto_refresh), MP_ROM_PTR(&framebufferio_framebufferdisplay_auto_refresh_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_brightness), MP_ROM_PTR(&framebufferio_framebufferdisplay_brightness_obj) },
+    { MP_ROM_QSTR(MP_QSTR_auto_brightness), MP_ROM_PTR(&framebufferio_framebufferdisplay_auto_brightness_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&framebufferio_framebufferdisplay_width_obj) },
+    { MP_ROM_QSTR(MP_QSTR_height), MP_ROM_PTR(&framebufferio_framebufferdisplay_height_obj) },
+    { MP_ROM_QSTR(MP_QSTR_rotation), MP_ROM_PTR(&framebufferio_framebufferdisplay_rotation_obj) },
+    { MP_ROM_QSTR(MP_QSTR_framebuffer), MP_ROM_PTR(&framebufferio_framebufferframebuffer_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(framebufferio_framebufferdisplay_locals_dict, framebufferio_framebufferdisplay_locals_dict_table);
+
+const mp_obj_type_t framebufferio_framebufferdisplay_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_FramebufferDisplay,
+    .make_new = framebufferio_framebufferdisplay_make_new,
+    .locals_dict = (mp_obj_dict_t*)&framebufferio_framebufferdisplay_locals_dict,
+};
-- 
cgit v1.2.3


From baf04b7738bdcf234eecad9e03904c1cadc44f50 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Fri, 3 Apr 2020 10:59:06 -0500
Subject: FramebufferDisplay: remove probably not needed constructor arguments

---
 shared-bindings/framebufferio/FramebufferDisplay.c | 25 ++++------------------
 shared-bindings/framebufferio/FramebufferDisplay.h |  5 ++---
 shared-module/framebufferio/FramebufferDisplay.c   | 10 ++++-----
 3 files changed, 11 insertions(+), 29 deletions(-)

(limited to 'shared-bindings/framebufferio/FramebufferDisplay.c')

diff --git a/shared-bindings/framebufferio/FramebufferDisplay.c b/shared-bindings/framebufferio/FramebufferDisplay.c
index 9f1df8bfa..9b761dd2d 100644
--- a/shared-bindings/framebufferio/FramebufferDisplay.c
+++ b/shared-bindings/framebufferio/FramebufferDisplay.c
@@ -54,20 +54,12 @@
 //|
 //|   :param framebuffer: The framebuffer that the display is connected to
 //|   :type framebuffer: any core object implementing the framebuffer protocol
-//|   :param callback: Function or bound method to call when the framebuffer has been updated.  The callback receives one argument, the framebuffer object.
 //|   :param int width: Width in pixels
 //|   :param int height: Height in pixels
-//|   :param int colstart: The index if the first visible column
-//|   :param int rowstart: The index if the first visible row
 //|   :param int rotation: The rotation of the display in degrees clockwise. Must be in 90 degree increments (0, 90, 180, 270)
 //|   :param int color_depth: The number of bits of color per pixel transmitted. (Some displays
 //|       support 18 bit but 16 is easier to transmit. The last bit is extrapolated.)
-//|   :param bool grayscale: True if the display only shows a single color.
-//|   :param bool pixels_in_byte_share_row: True when pixels are less than a byte and a byte includes pixels from the same row of the display. When False, pixels share a column.
 //|   :param int bytes_per_cell: Number of bytes per addressable memory location when color_depth < 8. When greater than one, bytes share a row or column according to pixels_in_byte_share_row.
-//|   :param bool reverse_pixels_in_byte: Reverses the pixel order within each byte when color_depth < 8. Does not apply across multiple bytes even if there is more than one byte per cell (bytes_per_cell.)
-//|   :param bool reverse_pixels_in_byte: Reverses the pixel order within each byte when color_depth < 8. Does not apply across multiple bytes even if there is more than one byte per cell (bytes_per_cell.)
-//|   :param bool reverse_bytes_in_word: Reverses the order of bytes within a word when color_depth == 16
 //|   :param microcontroller.Pin backlight_pin: Pin connected to the display's backlight
 //|   :param bool brightness: Initial display brightness. This value is ignored if auto_brightness is True.
 //|   :param bool auto_brightness: If True, brightness is controlled via an ambient light sensor or other mechanism.
@@ -75,20 +67,14 @@
 //|   :param int native_frames_per_second: Number of display refreshes per second
 //|
 STATIC mp_obj_t framebufferio_framebufferdisplay_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_framebuffer, ARG_width, ARG_height, ARG_colstart, ARG_rowstart, ARG_rotation, ARG_color_depth, ARG_grayscale, ARG_pixels_in_byte_share_row, ARG_bytes_per_cell, ARG_reverse_pixels_in_byte, ARG_reverse_bytes_in_word, ARG_backlight_pin, ARG_brightness, ARG_auto_brightness, ARG_auto_refresh, ARG_native_frames_per_second, NUM_ARGS };
+    enum { ARG_framebuffer, ARG_width, ARG_height, ARG_rotation, ARG_color_depth, ARG_bytes_per_cell, ARG_backlight_pin, ARG_brightness, ARG_auto_brightness, ARG_auto_refresh, ARG_native_frames_per_second, NUM_ARGS };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_framebuffer, MP_ARG_REQUIRED | MP_ARG_OBJ },
         { MP_QSTR_width, MP_ARG_INT | MP_ARG_KW_ONLY | MP_ARG_REQUIRED, },
         { MP_QSTR_height, MP_ARG_INT | MP_ARG_KW_ONLY | MP_ARG_REQUIRED, },
-        { MP_QSTR_colstart, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 0} },
-        { MP_QSTR_rowstart, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 0} },
         { MP_QSTR_rotation, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 0} },
         { MP_QSTR_color_depth, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 16} },
-        { MP_QSTR_grayscale, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = false} },
-        { MP_QSTR_pixels_in_byte_share_row, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = true} },
         { MP_QSTR_bytes_per_cell, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 1} },
-        { MP_QSTR_reverse_pixels_in_byte, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = false} },
-        { MP_QSTR_reverse_bytes_in_word, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = false} },
         { MP_QSTR_backlight_pin, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = mp_const_none} },
         { MP_QSTR_brightness, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = MP_OBJ_NEW_SMALL_INT(1)} },
         { MP_QSTR_auto_brightness, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = false} },
@@ -117,12 +103,9 @@ STATIC mp_obj_t framebufferio_framebufferdisplay_make_new(const mp_obj_type_t *t
         self,
         framebuffer,
         args[ARG_width].u_int, args[ARG_height].u_int,
-        args[ARG_colstart].u_int, args[ARG_rowstart].u_int, rotation,
-        args[ARG_color_depth].u_int, args[ARG_grayscale].u_bool,
-        args[ARG_pixels_in_byte_share_row].u_bool,
-        args[ARG_bytes_per_cell].u_bool,
-        args[ARG_reverse_pixels_in_byte].u_bool,
-        args[ARG_reverse_bytes_in_word].u_bool,
+        rotation,
+        args[ARG_color_depth].u_int,
+        args[ARG_bytes_per_cell].u_int,
         MP_OBJ_TO_PTR(backlight_pin),
         brightness,
         args[ARG_auto_brightness].u_bool,
diff --git a/shared-bindings/framebufferio/FramebufferDisplay.h b/shared-bindings/framebufferio/FramebufferDisplay.h
index af0bd2c41..b63439e0c 100644
--- a/shared-bindings/framebufferio/FramebufferDisplay.h
+++ b/shared-bindings/framebufferio/FramebufferDisplay.h
@@ -40,9 +40,8 @@ extern const mp_obj_type_t framebufferio_framebufferdisplay_type;
 
 void common_hal_framebufferio_framebufferdisplay_construct(framebufferio_framebufferdisplay_obj_t* self,
         mp_obj_t framebuffer, uint16_t width, uint16_t height,
-        int16_t colstart, int16_t rowstart,
-        uint16_t rotation, uint16_t color_depth, bool grayscale, bool pixels_in_byte_share_row,
-        uint8_t bytes_per_cell, bool reverse_pixels_in_byte, bool reverse_bytes_in_word,
+        uint16_t rotation, uint16_t color_depth,
+        uint8_t bytes_per_cell,
         const mcu_pin_obj_t* backlight_pin, mp_float_t brightness, bool auto_brightness,
         bool auto_refresh, uint16_t native_frames_per_second);
 
diff --git a/shared-module/framebufferio/FramebufferDisplay.c b/shared-module/framebufferio/FramebufferDisplay.c
index 967316c21..ec2fe7b31 100644
--- a/shared-module/framebufferio/FramebufferDisplay.c
+++ b/shared-module/framebufferio/FramebufferDisplay.c
@@ -42,9 +42,9 @@
 #include "tick.h"
 
 void common_hal_framebufferio_framebufferdisplay_construct(framebufferio_framebufferdisplay_obj_t* self,
-        mp_obj_t framebuffer, uint16_t width, uint16_t height, int16_t colstart, int16_t rowstart,
-        uint16_t rotation, uint16_t color_depth, bool grayscale, bool pixels_in_byte_share_row,
-        uint8_t bytes_per_cell, bool reverse_pixels_in_byte, bool reverse_bytes_in_word,
+        mp_obj_t framebuffer, uint16_t width, uint16_t height,
+        uint16_t rotation, uint16_t color_depth,
+        uint8_t bytes_per_cell,
         const mcu_pin_obj_t* backlight_pin, mp_float_t brightness, bool auto_brightness,
         bool auto_refresh, uint16_t native_frames_per_second) {
     // Turn off auto-refresh as we init.
@@ -55,8 +55,8 @@ void common_hal_framebufferio_framebufferdisplay_construct(framebufferio_framebu
     uint16_t ram_width = 0x100;
     uint16_t ram_height = 0x100;
 
-    displayio_display_core_construct(&self->core, NULL, width, height, ram_width, ram_height, colstart, rowstart, rotation,
-        color_depth, grayscale, pixels_in_byte_share_row, bytes_per_cell, reverse_pixels_in_byte, reverse_bytes_in_word);
+    displayio_display_core_construct(&self->core, NULL, width, height, ram_width, ram_height, 0, 0, rotation,
+        color_depth, false, false, bytes_per_cell, false, false);
 
     self->auto_brightness = auto_brightness;
     self->first_manual_refresh = !auto_refresh;
-- 
cgit v1.2.3


From ba20bc8b4322373ec9ed55ed9f299675ea2801f8 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Fri, 10 Apr 2020 09:07:06 -0500
Subject: framebufferio: move backlight down to the underlying framebuffer

---
 shared-bindings/_protomatter/Protomatter.c         |  3 +-
 shared-bindings/framebufferio/FramebufferDisplay.c | 17 ++----
 shared-bindings/framebufferio/FramebufferDisplay.h |  3 +-
 shared-module/framebufferio/FramebufferDisplay.c   | 65 +++++-----------------
 shared-module/framebufferio/FramebufferDisplay.h   | 15 +++--
 5 files changed, 28 insertions(+), 75 deletions(-)

(limited to 'shared-bindings/framebufferio/FramebufferDisplay.c')

diff --git a/shared-bindings/_protomatter/Protomatter.c b/shared-bindings/_protomatter/Protomatter.c
index f6ac19188..50480004c 100644
--- a/shared-bindings/_protomatter/Protomatter.c
+++ b/shared-bindings/_protomatter/Protomatter.c
@@ -317,8 +317,9 @@ STATIC void protomatter_protomatter_deinit_void(mp_obj_t self_in) {
     protomatter_protomatter_deinit(self_in);
 }
 
-STATIC void protomatter_protomatter_set_brightness(mp_obj_t self_in, mp_float_t value) {
+STATIC bool protomatter_protomatter_set_brightness(mp_obj_t self_in, mp_float_t value) {
     common_hal_protomatter_protomatter_set_paused(self_in, value <= 0);
+    return true;
 }
 
 STATIC const framebuffer_p_t protomatter_protomatter_proto = {
diff --git a/shared-bindings/framebufferio/FramebufferDisplay.c b/shared-bindings/framebufferio/FramebufferDisplay.c
index 9b761dd2d..538d3afb4 100644
--- a/shared-bindings/framebufferio/FramebufferDisplay.c
+++ b/shared-bindings/framebufferio/FramebufferDisplay.c
@@ -67,7 +67,7 @@
 //|   :param int native_frames_per_second: Number of display refreshes per second
 //|
 STATIC mp_obj_t framebufferio_framebufferdisplay_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_framebuffer, ARG_width, ARG_height, ARG_rotation, ARG_color_depth, ARG_bytes_per_cell, ARG_backlight_pin, ARG_brightness, ARG_auto_brightness, ARG_auto_refresh, ARG_native_frames_per_second, NUM_ARGS };
+    enum { ARG_framebuffer, ARG_width, ARG_height, ARG_rotation, ARG_color_depth, ARG_bytes_per_cell, ARG_auto_refresh, ARG_native_frames_per_second, NUM_ARGS };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_framebuffer, MP_ARG_REQUIRED | MP_ARG_OBJ },
         { MP_QSTR_width, MP_ARG_INT | MP_ARG_KW_ONLY | MP_ARG_REQUIRED, },
@@ -75,9 +75,6 @@ STATIC mp_obj_t framebufferio_framebufferdisplay_make_new(const mp_obj_type_t *t
         { MP_QSTR_rotation, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 0} },
         { MP_QSTR_color_depth, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 16} },
         { MP_QSTR_bytes_per_cell, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 1} },
-        { MP_QSTR_backlight_pin, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = mp_const_none} },
-        { MP_QSTR_brightness, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = MP_OBJ_NEW_SMALL_INT(1)} },
-        { MP_QSTR_auto_brightness, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = false} },
         { MP_QSTR_auto_refresh, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = true} },
         { MP_QSTR_native_frames_per_second, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 60} },
     };
@@ -87,10 +84,6 @@ STATIC mp_obj_t framebufferio_framebufferdisplay_make_new(const mp_obj_type_t *t
 
     mp_obj_t framebuffer = args[ARG_framebuffer].u_obj;
 
-    const mcu_pin_obj_t* backlight_pin = validate_obj_is_free_pin_or_none(args[ARG_backlight_pin].u_obj);
-
-    mp_float_t brightness = mp_obj_get_float(args[ARG_brightness].u_obj);
-
     mp_int_t rotation = args[ARG_rotation].u_int;
     if (rotation % 90 != 0) {
         mp_raise_ValueError(translate("Display rotation must be in 90 degree increments"));
@@ -106,9 +99,6 @@ STATIC mp_obj_t framebufferio_framebufferdisplay_make_new(const mp_obj_type_t *t
         rotation,
         args[ARG_color_depth].u_int,
         args[ARG_bytes_per_cell].u_int,
-        MP_OBJ_TO_PTR(backlight_pin),
-        brightness,
-        args[ARG_auto_brightness].u_bool,
         args[ARG_auto_refresh].u_bool,
         args[ARG_native_frames_per_second].u_int
         );
@@ -260,7 +250,10 @@ MP_DEFINE_CONST_FUN_OBJ_1(framebufferio_framebufferdisplay_get_auto_brightness_o
 STATIC mp_obj_t framebufferio_framebufferdisplay_obj_set_auto_brightness(mp_obj_t self_in, mp_obj_t auto_brightness) {
     framebufferio_framebufferdisplay_obj_t *self = native_display(self_in);
 
-    common_hal_framebufferio_framebufferdisplay_set_auto_brightness(self, mp_obj_is_true(auto_brightness));
+    bool ok = common_hal_framebufferio_framebufferdisplay_set_auto_brightness(self, mp_obj_is_true(auto_brightness));
+    if (!ok) {
+        mp_raise_RuntimeError(translate("Brightness not adjustable"));
+    }
 
     return mp_const_none;
 }
diff --git a/shared-bindings/framebufferio/FramebufferDisplay.h b/shared-bindings/framebufferio/FramebufferDisplay.h
index b63439e0c..56ef8abc4 100644
--- a/shared-bindings/framebufferio/FramebufferDisplay.h
+++ b/shared-bindings/framebufferio/FramebufferDisplay.h
@@ -42,7 +42,6 @@ void common_hal_framebufferio_framebufferdisplay_construct(framebufferio_framebu
         mp_obj_t framebuffer, uint16_t width, uint16_t height,
         uint16_t rotation, uint16_t color_depth,
         uint8_t bytes_per_cell,
-        const mcu_pin_obj_t* backlight_pin, mp_float_t brightness, bool auto_brightness,
         bool auto_refresh, uint16_t native_frames_per_second);
 
 bool common_hal_framebufferio_framebufferdisplay_show(framebufferio_framebufferdisplay_obj_t* self,
@@ -59,7 +58,7 @@ uint16_t common_hal_framebufferio_framebufferdisplay_get_rotation(framebufferio_
 void common_hal_framebufferio_framebufferdisplay_set_rotation(framebufferio_framebufferdisplay_obj_t* self, int rotation);
 
 bool common_hal_framebufferio_framebufferdisplay_get_auto_brightness(framebufferio_framebufferdisplay_obj_t* self);
-void common_hal_framebufferio_framebufferdisplay_set_auto_brightness(framebufferio_framebufferdisplay_obj_t* self, bool auto_brightness);
+bool common_hal_framebufferio_framebufferdisplay_set_auto_brightness(framebufferio_framebufferdisplay_obj_t* self, bool auto_brightness);
 
 bool common_hal_framebufferio_framebufferdisplay_get_dither(framebufferio_framebufferdisplay_obj_t* self);
 void common_hal_framebufferio_framebufferdisplay_set_dither(framebufferio_framebufferdisplay_obj_t* self, bool dither);
diff --git a/shared-module/framebufferio/FramebufferDisplay.c b/shared-module/framebufferio/FramebufferDisplay.c
index ec2fe7b31..bd0764e8e 100644
--- a/shared-module/framebufferio/FramebufferDisplay.c
+++ b/shared-module/framebufferio/FramebufferDisplay.c
@@ -45,7 +45,6 @@ void common_hal_framebufferio_framebufferdisplay_construct(framebufferio_framebu
         mp_obj_t framebuffer, uint16_t width, uint16_t height,
         uint16_t rotation, uint16_t color_depth,
         uint8_t bytes_per_cell,
-        const mcu_pin_obj_t* backlight_pin, mp_float_t brightness, bool auto_brightness,
         bool auto_refresh, uint16_t native_frames_per_second) {
     // Turn off auto-refresh as we init.
     self->auto_refresh = false;
@@ -58,7 +57,6 @@ void common_hal_framebufferio_framebufferdisplay_construct(framebufferio_framebu
     displayio_display_core_construct(&self->core, NULL, width, height, ram_width, ram_height, 0, 0, rotation,
         color_depth, false, false, bytes_per_cell, false, false);
 
-    self->auto_brightness = auto_brightness;
     self->first_manual_refresh = !auto_refresh;
 
     self->native_frames_per_second = native_frames_per_second;
@@ -66,25 +64,6 @@ void common_hal_framebufferio_framebufferdisplay_construct(framebufferio_framebu
 
     supervisor_start_terminal(width, height);
 
-    // Always set the backlight type in case we're reusing memory.
-    self->backlight_inout.base.type = &mp_type_NoneType;
-    if (backlight_pin != NULL && common_hal_mcu_pin_is_free(backlight_pin)) {
-        pwmout_result_t result = common_hal_pulseio_pwmout_construct(&self->backlight_pwm, backlight_pin, 0, 50000, false);
-        if (result != PWMOUT_OK) {
-            self->backlight_inout.base.type = &digitalio_digitalinout_type;
-            common_hal_digitalio_digitalinout_construct(&self->backlight_inout, backlight_pin);
-            common_hal_never_reset_pin(backlight_pin);
-        } else {
-            self->backlight_pwm.base.type = &pulseio_pwmout_type;
-            common_hal_pulseio_pwmout_never_reset(&self->backlight_pwm);
-        }
-    }
-    if (!self->auto_brightness && (self->framebuffer_protocol->set_brightness != NULL || self->backlight_inout.base.type != &mp_type_NoneType)) {
-        common_hal_framebufferio_framebufferdisplay_set_brightness(self, brightness);
-    } else {
-        self->current_brightness = -1.0;
-    }
-
     // Set the group after initialization otherwise we may send pixels while we delay in
     // initialization.
     common_hal_framebufferio_framebufferdisplay_show(self, &circuitpython_splash);
@@ -104,33 +83,31 @@ uint16_t common_hal_framebufferio_framebufferdisplay_get_height(framebufferio_fr
 }
 
 bool common_hal_framebufferio_framebufferdisplay_get_auto_brightness(framebufferio_framebufferdisplay_obj_t* self) {
-    return self->auto_brightness;
+    if (self->framebuffer_protocol->get_auto_brightness) {
+        return self->framebuffer_protocol->get_auto_brightness(self->framebuffer);
+    }
+    return true;
 }
 
-void common_hal_framebufferio_framebufferdisplay_set_auto_brightness(framebufferio_framebufferdisplay_obj_t* self, bool auto_brightness) {
-    self->auto_brightness = auto_brightness;
+bool common_hal_framebufferio_framebufferdisplay_set_auto_brightness(framebufferio_framebufferdisplay_obj_t* self, bool auto_brightness) {
+    if (self->framebuffer_protocol->set_auto_brightness) {
+        return self->framebuffer_protocol->set_auto_brightness(self->framebuffer, auto_brightness);
+    }
+    return false;
 }
 
 mp_float_t common_hal_framebufferio_framebufferdisplay_get_brightness(framebufferio_framebufferdisplay_obj_t* self) {
-    return self->current_brightness;
+    if (self->framebuffer_protocol->set_brightness) {
+        return self->framebuffer_protocol->get_brightness(self->framebuffer);
+    }
+    return -1;
 }
 
 bool common_hal_framebufferio_framebufferdisplay_set_brightness(framebufferio_framebufferdisplay_obj_t* self, mp_float_t brightness) {
-    self->updating_backlight = true;
     bool ok = false;
     if (self->framebuffer_protocol->set_brightness) {
         self->framebuffer_protocol->set_brightness(self->framebuffer, brightness);
         ok = true;
-    } else if (self->backlight_pwm.base.type == &pulseio_pwmout_type) {
-        common_hal_pulseio_pwmout_set_duty_cycle(&self->backlight_pwm, (uint16_t) (0xffff * brightness));
-        ok = true;
-    } else if (self->backlight_inout.base.type == &digitalio_digitalinout_type) {
-        common_hal_digitalio_digitalinout_set_value(&self->backlight_inout, brightness > 0.99);
-        ok = true;
-    }
-    self->updating_backlight = false;
-    if (ok) {
-        self->current_brightness = brightness;
     }
     return ok;
 }
@@ -295,17 +272,8 @@ void common_hal_framebufferio_framebufferdisplay_set_auto_refresh(framebufferio_
 }
 
 STATIC void _update_backlight(framebufferio_framebufferdisplay_obj_t* self) {
-    if (!self->auto_brightness || self->updating_backlight) {
-        return;
-    }
-    if (supervisor_ticks_ms64() - self->last_backlight_refresh < 100) {
-        return;
-    }
     // TODO(tannewt): Fade the backlight based on it's existing value and a target value. The target
     // should account for ambient light when possible.
-    common_hal_framebufferio_framebufferdisplay_set_brightness(self, 1.0);
-
-    self->last_backlight_refresh = supervisor_ticks_ms64();
 }
 
 void framebufferio_framebufferdisplay_background(framebufferio_framebufferdisplay_obj_t* self) {
@@ -318,18 +286,11 @@ void framebufferio_framebufferdisplay_background(framebufferio_framebufferdispla
 
 void release_framebufferdisplay(framebufferio_framebufferdisplay_obj_t* self) {
     release_display_core(&self->core);
-    if (self->backlight_pwm.base.type == &pulseio_pwmout_type) {
-        common_hal_pulseio_pwmout_reset_ok(&self->backlight_pwm);
-        common_hal_pulseio_pwmout_deinit(&self->backlight_pwm);
-    } else if (self->backlight_inout.base.type == &digitalio_digitalinout_type) {
-        common_hal_digitalio_digitalinout_deinit(&self->backlight_inout);
-    }
     self->framebuffer_protocol->deinit(self->framebuffer);
 }
 
 void reset_framebufferdisplay(framebufferio_framebufferdisplay_obj_t* self) {
     self->auto_refresh = true;
-    self->auto_brightness = true;
     common_hal_framebufferio_framebufferdisplay_show(self, NULL);
 }
 
diff --git a/shared-module/framebufferio/FramebufferDisplay.h b/shared-module/framebufferio/FramebufferDisplay.h
index a5c8607bb..a7b91a522 100644
--- a/shared-module/framebufferio/FramebufferDisplay.h
+++ b/shared-module/framebufferio/FramebufferDisplay.h
@@ -40,22 +40,15 @@
 typedef struct {
     mp_obj_base_t base;
     displayio_display_core_t core;
-    union {
-        digitalio_digitalinout_obj_t backlight_inout;
-        pulseio_pwmout_obj_t backlight_pwm;
-    };
     mp_obj_t framebuffer;
     const struct _framebuffer_p_t *framebuffer_protocol;
     mp_buffer_info_t bufinfo;
     uint64_t last_backlight_refresh;
     uint64_t last_refresh_call;
-    mp_float_t current_brightness;
     uint16_t native_frames_per_second;
     uint16_t native_ms_per_frame;
     bool auto_refresh;
     bool first_manual_refresh;
-    bool auto_brightness;
-    bool updating_backlight;
 } framebufferio_framebufferdisplay_obj_t;
 
 void framebufferio_framebufferdisplay_background(framebufferio_framebufferdisplay_obj_t* self);
@@ -69,14 +62,20 @@ mp_obj_t common_hal_framebufferio_framebufferdisplay_get_framebuffer(framebuffer
 typedef void (*framebuffer_get_bufinfo_fun)(mp_obj_t, mp_buffer_info_t *bufinfo);
 typedef void (*framebuffer_swapbuffers_fun)(mp_obj_t);
 typedef void (*framebuffer_deinit_fun)(mp_obj_t);
-typedef void (*framebuffer_set_brightness_fun)(mp_obj_t, mp_float_t);
+typedef bool (*framebuffer_set_brightness_fun)(mp_obj_t, mp_float_t);
+typedef mp_float_t (*framebuffer_get_brightness_fun)(mp_obj_t);
+typedef bool (*framebuffer_set_auto_brightness_fun)(mp_obj_t, bool);
+typedef bool (*framebuffer_get_auto_brightness_fun)(mp_obj_t);
 
 typedef struct _framebuffer_p_t {
     MP_PROTOCOL_HEAD // MP_QSTR_protocol_framebuffer
     framebuffer_get_bufinfo_fun get_bufinfo;
     framebuffer_swapbuffers_fun swapbuffers;
     framebuffer_deinit_fun deinit;
+    framebuffer_get_brightness_fun get_brightness;
     framebuffer_set_brightness_fun set_brightness;
+    framebuffer_get_auto_brightness_fun get_auto_brightness;
+    framebuffer_set_auto_brightness_fun set_auto_brightness;
 } framebuffer_p_t;
 
 #endif // MICROPY_INCLUDED_SHARED_MODULE_DISPLAYIO_FRAMEBUFFERDISPLAY_H
-- 
cgit v1.2.3


From 880fff80e904ef4b173d551742b7acde56114f0c Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Mon, 13 Apr 2020 08:51:35 -0500
Subject: protomatter: Respond to review comments

 - rename oe_pin -> output_enable_pin
 - improve and reorganize docstrings
 - rename swapbuffers->refresh
 - rename "paused" -> "brightness", change semantics slightly
 - common_hal several functions
 - clarify why the common_hal routines can't be used directly in the
   protocol's function pointers
 - whitespace cleanups
 - remove prototypes for nonexistent functions
---
 shared-bindings/_protomatter/Protomatter.c         | 108 +++++++++++----------
 shared-bindings/_protomatter/Protomatter.h         |   1 +
 shared-bindings/framebufferio/FramebufferDisplay.c |   2 +-
 shared-bindings/framebufferio/FramebufferDisplay.h |   3 -
 shared-module/_protomatter/Protomatter.c           |  10 +-
 shared-module/_protomatter/allocator.h             |   4 +-
 6 files changed, 71 insertions(+), 57 deletions(-)

(limited to 'shared-bindings/framebufferio/FramebufferDisplay.c')

diff --git a/shared-bindings/_protomatter/Protomatter.c b/shared-bindings/_protomatter/Protomatter.c
index 3b3fdae8c..cfc0ba6ed 100644
--- a/shared-bindings/_protomatter/Protomatter.c
+++ b/shared-bindings/_protomatter/Protomatter.c
@@ -135,7 +135,7 @@ STATIC void preflight_pins_or_throw(uint8_t clock_pin, uint8_t *rgb_pins, uint8_
 
 //| :class:`~_protomatter.Protomatter` displays an in-memory framebuffer to an LED matrix.
 //|
-//| .. class:: Protomatter(width, bit_depth, rgb_pins, addr_pins, clock_pin, latch_pin, oe_pin, *, doublebuffer=True, framebuffer=None)
+//| .. class:: Protomatter(width, bit_depth, rgb_pins, addr_pins, clock_pin, latch_pin, output_enable_pin, *, doublebuffer=True, framebuffer=None)
 //|
 //|   Create a Protomatter object with the given attributes.  The height of
 //|   the display is determined by the number of rgb and address pins:
@@ -153,12 +153,17 @@ STATIC void preflight_pins_or_throw(uint8_t clock_pin, uint8_t *rgb_pins, uint8_
 //|   microcontroller board.  For instance, the Feather M4 Express works
 //|   together with the RGB Matrix Feather.
 //|
-//|   When specified as True, double buffering can reduce some flickering of
-//|   the matrix; however, this increases memory usage.
+//|   The framebuffer is in "RGB565" format.
 //|
-//|   The framebuffer is in "RGB565" format.  If a framebuffer is not
-//|   passed in, one is allocated and initialized to all black.  To update
-//|   the content, modify the framebuffer and call swapbuffers.
+//|   "RGB565" means that it is organized as a series of 16-bit numbers
+//|   where the highest 5 bits are interpreted as red, the next 6 as
+//|   green, and the final 5 as blue.  The object can be any buffer, but
+//|   `array.array` and `ulab.array` objects are most often useful.
+//|   To update the content, modify the framebuffer and call refresh.
+//|
+//|   If a framebuffer is not passed in, one is allocated and initialized
+//|   to all black.  In any case, the framebuffer can be retrieved
+//|   by passing the protomatter object to memoryview().
 //|
 //|   If doublebuffer is False, some memory is saved, but the display may
 //|   flicker during updates.
@@ -166,10 +171,13 @@ STATIC void preflight_pins_or_throw(uint8_t clock_pin, uint8_t *rgb_pins, uint8_
 //|   If a framebuffer is not passed in, one is allocated internally.  To
 //|   retrieve it, pass the protomatter object to memoryview().
 //|
+//|   A Protomatter framebuffer is often used in conjunction with a
+//|   `framebufferio.FramebufferDisplay`.
+//|
 
 STATIC mp_obj_t protomatter_protomatter_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_width, ARG_bit_depth, ARG_rgb_list, ARG_addr_list,
-        ARG_clock_pin, ARG_latch_pin, ARG_oe_pin, ARG_doublebuffer, ARG_framebuffer };
+        ARG_clock_pin, ARG_latch_pin, ARG_output_enable_pin, ARG_doublebuffer, ARG_framebuffer };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_width, MP_ARG_INT | MP_ARG_REQUIRED },
         { MP_QSTR_bit_depth, MP_ARG_INT | MP_ARG_REQUIRED },
@@ -177,7 +185,7 @@ STATIC mp_obj_t protomatter_protomatter_make_new(const mp_obj_type_t *type, size
         { MP_QSTR_addr_pins, MP_ARG_OBJ | MP_ARG_REQUIRED },
         { MP_QSTR_clock_pin, MP_ARG_OBJ | MP_ARG_REQUIRED },
         { MP_QSTR_latch_pin, MP_ARG_OBJ | MP_ARG_REQUIRED },
-        { MP_QSTR_oe_pin, MP_ARG_OBJ | MP_ARG_REQUIRED },
+        { MP_QSTR_output_enable_pin, MP_ARG_OBJ | MP_ARG_REQUIRED },
         { MP_QSTR_doublebuffer, MP_ARG_BOOL, { .u_bool = true } },
         { MP_QSTR_framebuffer, MP_ARG_OBJ, { .u_obj = mp_const_none } },
     };
@@ -195,7 +203,7 @@ STATIC mp_obj_t protomatter_protomatter_make_new(const mp_obj_type_t *type, size
     uint8_t addr_pins[MP_ARRAY_SIZE(self->addr_pins)];
     uint8_t clock_pin = validate_pin(args[ARG_clock_pin].u_obj);
     uint8_t latch_pin = validate_pin(args[ARG_latch_pin].u_obj);
-    uint8_t oe_pin = validate_pin(args[ARG_oe_pin].u_obj);
+    uint8_t output_enable_pin = validate_pin(args[ARG_output_enable_pin].u_obj);
 
     validate_pins(MP_QSTR_rgb_pins, rgb_pins, MP_ARRAY_SIZE(self->rgb_pins), args[ARG_rgb_list].u_obj, &rgb_count);
     validate_pins(MP_QSTR_addr_pins, addr_pins, MP_ARRAY_SIZE(self->addr_pins), args[ARG_addr_list].u_obj, &addr_count);
@@ -214,14 +222,14 @@ STATIC mp_obj_t protomatter_protomatter_make_new(const mp_obj_type_t *type, size
         args[ARG_bit_depth].u_int,
         rgb_count, rgb_pins,
         addr_count, addr_pins,
-        clock_pin, latch_pin, oe_pin,
+        clock_pin, latch_pin, output_enable_pin,
         args[ARG_doublebuffer].u_bool,
         framebuffer, NULL);
 
     claim_and_never_reset_pins(args[ARG_rgb_list].u_obj);
     claim_and_never_reset_pins(args[ARG_addr_list].u_obj);
     claim_and_never_reset_pin(args[ARG_clock_pin].u_obj);
-    claim_and_never_reset_pin(args[ARG_oe_pin].u_obj);
+    claim_and_never_reset_pin(args[ARG_output_enable_pin].u_obj);
     claim_and_never_reset_pin(args[ARG_latch_pin].u_obj);
 
     return MP_OBJ_FROM_PTR(self);
@@ -247,79 +255,80 @@ static void check_for_deinit(protomatter_protomatter_obj_t *self) {
     }
 }
 
-//|   .. attribute:: paused
+//|   .. attribute:: brightness
 //|
-//|     When paused, the matrix is not driven and all its LEDs are unlit.
+//|     In the current implementation, 0.0 turns the display off entirely
+//|     and any other value up to 1.0 turns the display on fully.
 //|
-STATIC mp_obj_t protomatter_protomatter_get_paused(mp_obj_t self_in) {
+STATIC mp_obj_t protomatter_protomatter_get_brightness(mp_obj_t self_in) {
     protomatter_protomatter_obj_t *self = (protomatter_protomatter_obj_t*)self_in;
     check_for_deinit(self);
-    return mp_obj_new_bool(common_hal_protomatter_protomatter_get_paused(self));
+    return mp_obj_new_float(common_hal_protomatter_protomatter_get_paused(self)? 0.0f : 1.0f);
 }
-MP_DEFINE_CONST_FUN_OBJ_1(protomatter_protomatter_get_paused_obj, protomatter_protomatter_get_paused);
+MP_DEFINE_CONST_FUN_OBJ_1(protomatter_protomatter_get_brightness_obj, protomatter_protomatter_get_brightness);
 
-STATIC mp_obj_t protomatter_protomatter_set_paused(mp_obj_t self_in, mp_obj_t value_in)  {
+STATIC mp_obj_t protomatter_protomatter_set_brightness(mp_obj_t self_in, mp_obj_t value_in)  {
     protomatter_protomatter_obj_t *self = (protomatter_protomatter_obj_t*)self_in;
     check_for_deinit(self);
-    bool paused = mp_obj_is_true(value_in);
-    common_hal_protomatter_protomatter_set_paused(self, paused);
+    mp_float_t brightness = mp_obj_get_float(value_in);
+    if (brightness < 0.0f || brightness > 1.0f) {
+        mp_raise_ValueError(translate("Brightness must be 0-1.0"));
+    }
+    common_hal_protomatter_protomatter_set_paused(self_in, brightness <= 0);
 
     return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_2(protomatter_protomatter_set_paused_obj, protomatter_protomatter_set_paused);
+MP_DEFINE_CONST_FUN_OBJ_2(protomatter_protomatter_set_brightness_obj, protomatter_protomatter_set_brightness);
 
-const mp_obj_property_t protomatter_protomatter_paused_obj = {
+const mp_obj_property_t protomatter_protomatter_brightness_obj = {
     .base.type = &mp_type_property,
-    .proxy = {(mp_obj_t)&protomatter_protomatter_get_paused_obj,
-              (mp_obj_t)&protomatter_protomatter_set_paused_obj,
+    .proxy = {(mp_obj_t)&protomatter_protomatter_get_brightness_obj,
+              (mp_obj_t)&protomatter_protomatter_set_brightness_obj,
               (mp_obj_t)&mp_const_none_obj},
 };
 
-//|   .. method:: swapbuffers()
-//|
-//|     Transmits the color data in the buffer to the pixels so that they are shown.
+//|   .. method:: refresh()
 //|
-//|     The data in the buffer must be in "RGB565" format.  This means
-//|     that it is organized as a series of 16-bit numbers where the highest 5
-//|     bits are interpreted as red, the next 6 as green, and the final 5 as
-//|     blue.  The object can be any buffer, but `array.array` and `ulab.array`
-//|     objects are most often useful.
+//|     Transmits the color data in the buffer to the pixels so that
+//|     they are shown.
 //|
-STATIC mp_obj_t protomatter_protomatter_swapbuffers(mp_obj_t self_in) {
+STATIC mp_obj_t protomatter_protomatter_refresh(mp_obj_t self_in) {
     protomatter_protomatter_obj_t *self = (protomatter_protomatter_obj_t*)self_in;
     check_for_deinit(self);
-
-    _PM_convert_565(&self->core, self->bufinfo.buf, self->width);
-    _PM_swapbuffer_maybe(&self->core);
+    common_hal_protomatter_protomatter_refresh(self);
     return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_1(protomatter_protomatter_swapbuffers_obj, protomatter_protomatter_swapbuffers);
+MP_DEFINE_CONST_FUN_OBJ_1(protomatter_protomatter_refresh_obj, protomatter_protomatter_refresh);
 
 STATIC const mp_rom_map_elem_t protomatter_protomatter_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&protomatter_protomatter_deinit_obj) },
-    { MP_ROM_QSTR(MP_QSTR_paused), MP_ROM_PTR(&protomatter_protomatter_paused_obj) },
-    { MP_ROM_QSTR(MP_QSTR_swapbuffers), MP_ROM_PTR(&protomatter_protomatter_swapbuffers_obj) },
+    { MP_ROM_QSTR(MP_QSTR_brightness), MP_ROM_PTR(&protomatter_protomatter_brightness_obj) },
+    { MP_ROM_QSTR(MP_QSTR_refresh), MP_ROM_PTR(&protomatter_protomatter_refresh_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(protomatter_protomatter_locals_dict, protomatter_protomatter_locals_dict_table);
 
 STATIC void protomatter_protomatter_get_bufinfo(mp_obj_t self_in, mp_buffer_info_t *bufinfo) {
     protomatter_protomatter_obj_t *self = (protomatter_protomatter_obj_t*)self_in;
     check_for_deinit(self);
-    
+
     *bufinfo = self->bufinfo;
 }
 
-// This version exists so that the return value of the function can be none, matching the protocol
-STATIC void protomatter_protomatter_swapbuffers_void(mp_obj_t self_in) {
-    protomatter_protomatter_swapbuffers(self_in);
+// These version exists so that the prototype matches the protocol,
+// avoiding a type cast that can hide errors
+STATIC void protomatter_protomatter_swapbuffers(mp_obj_t self_in) {
+    common_hal_protomatter_protomatter_refresh(self_in);
+}
+
+STATIC void protomatter_protomatter_deinit_proto(mp_obj_t self_in) {
+    common_hal_protomatter_protomatter_deinit(self_in);
 }
 
-// This version exists so that the return value of the function can be none, matching the protocol
-STATIC void protomatter_protomatter_deinit_void(mp_obj_t self_in) {
-    protomatter_protomatter_deinit(self_in);
+STATIC float protomatter_protomatter_get_brightness_proto(mp_obj_t self_in) {
+    return common_hal_protomatter_protomatter_get_paused(self_in) ? 0.0f : 1.0f;
 }
 
-STATIC bool protomatter_protomatter_set_brightness(mp_obj_t self_in, mp_float_t value) {
+STATIC bool protomatter_protomatter_set_brightness_proto(mp_obj_t self_in, mp_float_t value) {
     common_hal_protomatter_protomatter_set_paused(self_in, value <= 0);
     return true;
 }
@@ -327,9 +336,10 @@ STATIC bool protomatter_protomatter_set_brightness(mp_obj_t self_in, mp_float_t
 STATIC const framebuffer_p_t protomatter_protomatter_proto = {
     MP_PROTO_IMPLEMENT(MP_QSTR_protocol_framebuffer)
     .get_bufinfo = protomatter_protomatter_get_bufinfo,
-    .set_brightness = protomatter_protomatter_set_brightness,
-    .swapbuffers = protomatter_protomatter_swapbuffers_void,
-    .deinit = protomatter_protomatter_deinit_void,
+    .set_brightness = protomatter_protomatter_set_brightness_proto,
+    .get_brightness = protomatter_protomatter_get_brightness_proto,
+    .swapbuffers = protomatter_protomatter_swapbuffers,
+    .deinit = protomatter_protomatter_deinit_proto,
 };
 
 STATIC mp_int_t protomatter_protomatter_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
diff --git a/shared-bindings/_protomatter/Protomatter.h b/shared-bindings/_protomatter/Protomatter.h
index 0a52c556f..9499da22c 100644
--- a/shared-bindings/_protomatter/Protomatter.h
+++ b/shared-bindings/_protomatter/Protomatter.h
@@ -54,5 +54,6 @@ void protomatter_protomatter_collect_ptrs(protomatter_protomatter_obj_t*);
 void common_hal_protomatter_protomatter_reconstruct(protomatter_protomatter_obj_t* self, mp_obj_t framebuffer);
 void common_hal_protomatter_protomatter_set_paused(protomatter_protomatter_obj_t* self, bool paused);
 bool common_hal_protomatter_protomatter_get_paused(protomatter_protomatter_obj_t* self);
+void common_hal_protomatter_protomatter_refresh(protomatter_protomatter_obj_t* self);
 
 #endif
diff --git a/shared-bindings/framebufferio/FramebufferDisplay.c b/shared-bindings/framebufferio/FramebufferDisplay.c
index 538d3afb4..aa8fc1a63 100644
--- a/shared-bindings/framebufferio/FramebufferDisplay.c
+++ b/shared-bindings/framebufferio/FramebufferDisplay.c
@@ -216,7 +216,7 @@ STATIC mp_obj_t framebufferio_framebufferdisplay_obj_set_brightness(mp_obj_t sel
     framebufferio_framebufferdisplay_obj_t *self = native_display(self_in);
     common_hal_framebufferio_framebufferdisplay_set_auto_brightness(self, false);
     mp_float_t brightness = mp_obj_get_float(brightness_obj);
-    if (brightness < 0 || brightness > 1.0) {
+    if (brightness < 0.0f || brightness > 1.0f) {
         mp_raise_ValueError(translate("Brightness must be 0-1.0"));
     }
     bool ok = common_hal_framebufferio_framebufferdisplay_set_brightness(self, brightness);
diff --git a/shared-bindings/framebufferio/FramebufferDisplay.h b/shared-bindings/framebufferio/FramebufferDisplay.h
index 56ef8abc4..b472088d2 100644
--- a/shared-bindings/framebufferio/FramebufferDisplay.h
+++ b/shared-bindings/framebufferio/FramebufferDisplay.h
@@ -60,9 +60,6 @@ void common_hal_framebufferio_framebufferdisplay_set_rotation(framebufferio_fram
 bool common_hal_framebufferio_framebufferdisplay_get_auto_brightness(framebufferio_framebufferdisplay_obj_t* self);
 bool common_hal_framebufferio_framebufferdisplay_set_auto_brightness(framebufferio_framebufferdisplay_obj_t* self, bool auto_brightness);
 
-bool common_hal_framebufferio_framebufferdisplay_get_dither(framebufferio_framebufferdisplay_obj_t* self);
-void common_hal_framebufferio_framebufferdisplay_set_dither(framebufferio_framebufferdisplay_obj_t* self, bool dither);
-
 mp_float_t common_hal_framebufferio_framebufferdisplay_get_brightness(framebufferio_framebufferdisplay_obj_t* self);
 bool common_hal_framebufferio_framebufferdisplay_set_brightness(framebufferio_framebufferdisplay_obj_t* self, mp_float_t brightness);
 
diff --git a/shared-module/_protomatter/Protomatter.c b/shared-module/_protomatter/Protomatter.c
index 9f67bfad3..77ca63476 100644
--- a/shared-module/_protomatter/Protomatter.c
+++ b/shared-module/_protomatter/Protomatter.c
@@ -53,7 +53,7 @@ void common_hal_protomatter_protomatter_construct(protomatter_protomatter_obj_t
     self->oe_pin = oe_pin;
     self->latch_pin = latch_pin;
     self->doublebuffer = doublebuffer;
-    
+
     self->timer = timer ? timer : common_hal_protomatter_timer_allocate();
     if (self->timer == NULL) {
         mp_raise_ValueError(translate("No timer available"));
@@ -90,7 +90,7 @@ void common_hal_protomatter_protomatter_reconstruct(protomatter_protomatter_obj_
     }
 
     ProtomatterStatus stat = _PM_init(&self->core,
-        self->width, self->bit_depth, 
+        self->width, self->bit_depth,
         self->rgb_count/6, self->rgb_pins,
         self->addr_count, self->addr_pins,
         self->clock_pin, self->latch_pin, self->oe_pin,
@@ -192,3 +192,9 @@ void common_hal_protomatter_protomatter_set_paused(protomatter_protomatter_obj_t
 bool common_hal_protomatter_protomatter_get_paused(protomatter_protomatter_obj_t* self) {
     return self->paused;
 }
+
+void common_hal_protomatter_protomatter_refresh(protomatter_protomatter_obj_t* self) {
+    _PM_convert_565(&self->core, self->bufinfo.buf, self->width);
+    _PM_swapbuffer_maybe(&self->core);
+}
+
diff --git a/shared-module/_protomatter/allocator.h b/shared-module/_protomatter/allocator.h
index 1ae127de2..b7f517ce5 100644
--- a/shared-module/_protomatter/allocator.h
+++ b/shared-module/_protomatter/allocator.h
@@ -13,14 +13,14 @@ static inline void *_PM_allocator_impl(size_t sz) {
     if (gc_alloc_possible()) {
         return m_malloc(sz + sizeof(void*), true);
     } else {
-        supervisor_allocation *allocation = allocate_memory(align32_size(sz), false);    
+        supervisor_allocation *allocation = allocate_memory(align32_size(sz), false);
         return allocation ? allocation->ptr : NULL;
     }
 }
 
 static inline void _PM_free_impl(void *ptr_in) {
     supervisor_allocation *allocation = allocation_from_ptr(ptr_in);
-    
+
     if (allocation) {
         free_memory(allocation);
     }
-- 
cgit v1.2.3


From d1ff23e0046a6462d4939b4b8c79f10182fabf9d Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Wed, 15 Apr 2020 09:13:02 -0500
Subject: framebufferio: get width, height from framebuffer properties

---
 shared-bindings/framebufferio/FramebufferDisplay.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'shared-bindings/framebufferio/FramebufferDisplay.c')

diff --git a/shared-bindings/framebufferio/FramebufferDisplay.c b/shared-bindings/framebufferio/FramebufferDisplay.c
index aa8fc1a63..cccbc423c 100644
--- a/shared-bindings/framebufferio/FramebufferDisplay.c
+++ b/shared-bindings/framebufferio/FramebufferDisplay.c
@@ -39,6 +39,10 @@
 #include "shared-module/displayio/__init__.h"
 #include "supervisor/shared/translate.h"
 
+STATIC int get_int_property(mp_obj_t obj, qstr attr) {
+    return mp_obj_get_int(mp_load_attr(obj, attr));
+}
+
 //| .. currentmodule:: framebufferio
 //|
 //| :class:`FramebufferDisplay` -- Manage updating a display with framebuffer in RAM
@@ -70,8 +74,8 @@ STATIC mp_obj_t framebufferio_framebufferdisplay_make_new(const mp_obj_type_t *t
     enum { ARG_framebuffer, ARG_width, ARG_height, ARG_rotation, ARG_color_depth, ARG_bytes_per_cell, ARG_auto_refresh, ARG_native_frames_per_second, NUM_ARGS };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_framebuffer, MP_ARG_REQUIRED | MP_ARG_OBJ },
-        { MP_QSTR_width, MP_ARG_INT | MP_ARG_KW_ONLY | MP_ARG_REQUIRED, },
-        { MP_QSTR_height, MP_ARG_INT | MP_ARG_KW_ONLY | MP_ARG_REQUIRED, },
+        { MP_QSTR_width, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 0} },
+        { MP_QSTR_height, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 0} },
         { MP_QSTR_rotation, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 0} },
         { MP_QSTR_color_depth, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 16} },
         { MP_QSTR_bytes_per_cell, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 1} },
@@ -84,6 +88,14 @@ STATIC mp_obj_t framebufferio_framebufferdisplay_make_new(const mp_obj_type_t *t
 
     mp_obj_t framebuffer = args[ARG_framebuffer].u_obj;
 
+    if (args[ARG_width].u_int == 0) {
+        args[ARG_width].u_int = get_int_property(framebuffer, MP_QSTR_width);
+    }
+
+    if (args[ARG_height].u_int == 0) {
+        args[ARG_height].u_int = get_int_property(framebuffer, MP_QSTR_height);
+    }
+
     mp_int_t rotation = args[ARG_rotation].u_int;
     if (rotation % 90 != 0) {
         mp_raise_ValueError(translate("Display rotation must be in 90 degree increments"));
-- 
cgit v1.2.3


From 1a91a75b9cf13e5ccfda9e6ef92b842ca6474d9e Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Wed, 15 Apr 2020 09:29:59 -0500
Subject: framebufferio: get more properties direct from underlying framebuffer

---
 shared-bindings/framebufferio/FramebufferDisplay.c | 43 ++++++----------
 shared-bindings/protomatter/Protomatter.c          | 58 ++++++++++++++++++++++
 2 files changed, 72 insertions(+), 29 deletions(-)

(limited to 'shared-bindings/framebufferio/FramebufferDisplay.c')

diff --git a/shared-bindings/framebufferio/FramebufferDisplay.c b/shared-bindings/framebufferio/FramebufferDisplay.c
index cccbc423c..5014f3924 100644
--- a/shared-bindings/framebufferio/FramebufferDisplay.c
+++ b/shared-bindings/framebufferio/FramebufferDisplay.c
@@ -52,35 +52,21 @@ STATIC int get_int_property(mp_obj_t obj, qstr attr) {
 //| objects in CircuitPython, Display objects live until `displayio.release_displays()`
 //| is called. This is done so that CircuitPython can use the display itself.
 //|
-//| .. class:: FramebufferDisplay(framebuffer, *, width, height, colstart=0, rowstart=0, rotation=0, color_depth=16, grayscale=False, pixels_in_byte_share_row=True, bytes_per_cell=1, reverse_pixels_in_byte=False, backlight_pin=None, brightness=1.0, auto_brightness=False, auto_refresh=True, native_frames_per_second=60)
+//| .. class:: FramebufferDisplay(framebuffer, *, rotation=0, auto_refresh=True)
 //|
 //|   Create a Display object with the given framebuffer (a buffer, array, ulab.array, etc)
 //|
 //|   :param framebuffer: The framebuffer that the display is connected to
 //|   :type framebuffer: any core object implementing the framebuffer protocol
-//|   :param int width: Width in pixels
-//|   :param int height: Height in pixels
-//|   :param int rotation: The rotation of the display in degrees clockwise. Must be in 90 degree increments (0, 90, 180, 270)
-//|   :param int color_depth: The number of bits of color per pixel transmitted. (Some displays
-//|       support 18 bit but 16 is easier to transmit. The last bit is extrapolated.)
-//|   :param int bytes_per_cell: Number of bytes per addressable memory location when color_depth < 8. When greater than one, bytes share a row or column according to pixels_in_byte_share_row.
-//|   :param microcontroller.Pin backlight_pin: Pin connected to the display's backlight
-//|   :param bool brightness: Initial display brightness. This value is ignored if auto_brightness is True.
-//|   :param bool auto_brightness: If True, brightness is controlled via an ambient light sensor or other mechanism.
 //|   :param bool auto_refresh: Automatically refresh the screen
-//|   :param int native_frames_per_second: Number of display refreshes per second
+//|   :param int rotation: The rotation of the display in degrees clockwise. Must be in 90 degree increments (0, 90, 180, 270)
 //|
 STATIC mp_obj_t framebufferio_framebufferdisplay_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_framebuffer, ARG_width, ARG_height, ARG_rotation, ARG_color_depth, ARG_bytes_per_cell, ARG_auto_refresh, ARG_native_frames_per_second, NUM_ARGS };
+    enum { ARG_framebuffer, ARG_rotation, ARG_auto_refresh, NUM_ARGS };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_framebuffer, MP_ARG_REQUIRED | MP_ARG_OBJ },
-        { MP_QSTR_width, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 0} },
-        { MP_QSTR_height, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 0} },
         { MP_QSTR_rotation, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 0} },
-        { MP_QSTR_color_depth, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 16} },
-        { MP_QSTR_bytes_per_cell, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 1} },
         { MP_QSTR_auto_refresh, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = true} },
-        { MP_QSTR_native_frames_per_second, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 60} },
     };
     MP_STATIC_ASSERT( MP_ARRAY_SIZE(allowed_args) == NUM_ARGS );
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
@@ -88,31 +74,30 @@ STATIC mp_obj_t framebufferio_framebufferdisplay_make_new(const mp_obj_type_t *t
 
     mp_obj_t framebuffer = args[ARG_framebuffer].u_obj;
 
-    if (args[ARG_width].u_int == 0) {
-        args[ARG_width].u_int = get_int_property(framebuffer, MP_QSTR_width);
-    }
-
-    if (args[ARG_height].u_int == 0) {
-        args[ARG_height].u_int = get_int_property(framebuffer, MP_QSTR_height);
-    }
-
     mp_int_t rotation = args[ARG_rotation].u_int;
     if (rotation % 90 != 0) {
         mp_raise_ValueError(translate("Display rotation must be in 90 degree increments"));
     }
 
+    int width = get_int_property(framebuffer, MP_QSTR_width);
+    int height = get_int_property(framebuffer, MP_QSTR_height);
+    int color_depth = get_int_property(framebuffer, MP_QSTR_color_depth);
+    int bytes_per_cell = get_int_property(framebuffer, MP_QSTR_bytes_per_cell);
+    int native_frames_per_second = get_int_property(framebuffer, MP_QSTR_native_frames_per_second);
+
     primary_display_t *disp = allocate_display_or_raise();
     framebufferio_framebufferdisplay_obj_t *self = &disp->framebuffer_display;
     self->base.type = &framebufferio_framebufferdisplay_type;
     common_hal_framebufferio_framebufferdisplay_construct(
         self,
         framebuffer,
-        args[ARG_width].u_int, args[ARG_height].u_int,
+        width,
+        height,
         rotation,
-        args[ARG_color_depth].u_int,
-        args[ARG_bytes_per_cell].u_int,
+        color_depth,
+        bytes_per_cell,
         args[ARG_auto_refresh].u_bool,
-        args[ARG_native_frames_per_second].u_int
+        native_frames_per_second
         );
 
     return self;
diff --git a/shared-bindings/protomatter/Protomatter.c b/shared-bindings/protomatter/Protomatter.c
index cb4618634..59e41ceeb 100644
--- a/shared-bindings/protomatter/Protomatter.c
+++ b/shared-bindings/protomatter/Protomatter.c
@@ -350,6 +350,61 @@ const mp_obj_property_t protomatter_protomatter_height_obj = {
               (mp_obj_t)&mp_const_none_obj},
 };
 
+//|   .. attribute:: bytes_per_cell
+//|
+//|     The bytes_per_cell of the display, in pixels.  Always equal to 1.
+//|
+STATIC mp_obj_t protomatter_protomatter_get_bytes_per_cell(mp_obj_t self_in) {
+    protomatter_protomatter_obj_t *self = (protomatter_protomatter_obj_t*)self_in;
+    check_for_deinit(self);
+    return MP_OBJ_NEW_SMALL_INT(1);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(protomatter_protomatter_get_bytes_per_cell_obj, protomatter_protomatter_get_bytes_per_cell);
+
+const mp_obj_property_t protomatter_protomatter_bytes_per_cell_obj = {
+    .base.type = &mp_type_property,
+    .proxy = {(mp_obj_t)&protomatter_protomatter_get_bytes_per_cell_obj,
+              (mp_obj_t)&mp_const_none_obj,
+              (mp_obj_t)&mp_const_none_obj},
+};
+
+//|   .. attribute:: color_depth
+//|
+//|     The color_depth of the framebuffer, in bits.  Always equal to 16. This
+//|     is different than the constructor's "bit_depth".
+//|
+STATIC mp_obj_t protomatter_protomatter_get_color_depth(mp_obj_t self_in) {
+    protomatter_protomatter_obj_t *self = (protomatter_protomatter_obj_t*)self_in;
+    check_for_deinit(self);
+    return MP_OBJ_NEW_SMALL_INT(16);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(protomatter_protomatter_get_color_depth_obj, protomatter_protomatter_get_color_depth);
+
+const mp_obj_property_t protomatter_protomatter_color_depth_obj = {
+    .base.type = &mp_type_property,
+    .proxy = {(mp_obj_t)&protomatter_protomatter_get_color_depth_obj,
+              (mp_obj_t)&mp_const_none_obj,
+              (mp_obj_t)&mp_const_none_obj},
+};
+
+//|   .. attribute:: native_frames_per_second
+//|
+//|     The native_frames_per_second of the display.  Always equal to 250.
+//|
+STATIC mp_obj_t protomatter_protomatter_get_native_frames_per_second(mp_obj_t self_in) {
+    protomatter_protomatter_obj_t *self = (protomatter_protomatter_obj_t*)self_in;
+    check_for_deinit(self);
+    return MP_OBJ_NEW_SMALL_INT(250);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(protomatter_protomatter_get_native_frames_per_second_obj, protomatter_protomatter_get_native_frames_per_second);
+
+const mp_obj_property_t protomatter_protomatter_native_frames_per_second_obj = {
+    .base.type = &mp_type_property,
+    .proxy = {(mp_obj_t)&protomatter_protomatter_get_native_frames_per_second_obj,
+              (mp_obj_t)&mp_const_none_obj,
+              (mp_obj_t)&mp_const_none_obj},
+};
+
 
 STATIC const mp_rom_map_elem_t protomatter_protomatter_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&protomatter_protomatter_deinit_obj) },
@@ -357,6 +412,9 @@ STATIC const mp_rom_map_elem_t protomatter_protomatter_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_refresh), MP_ROM_PTR(&protomatter_protomatter_refresh_obj) },
     { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&protomatter_protomatter_width_obj) },
     { MP_ROM_QSTR(MP_QSTR_height), MP_ROM_PTR(&protomatter_protomatter_height_obj) },
+    { MP_ROM_QSTR(MP_QSTR_color_depth), MP_ROM_PTR(&protomatter_protomatter_color_depth_obj) },
+    { MP_ROM_QSTR(MP_QSTR_bytes_per_cell), MP_ROM_PTR(&protomatter_protomatter_bytes_per_cell_obj) },
+    { MP_ROM_QSTR(MP_QSTR_native_frames_per_second), MP_ROM_PTR(&protomatter_protomatter_native_frames_per_second_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(protomatter_protomatter_locals_dict, protomatter_protomatter_locals_dict_table);
 
-- 
cgit v1.2.3


From 57ce2d1f417bd4c2988155d45739a3a61950471f Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Wed, 15 Apr 2020 12:29:32 -0500
Subject: framebufferio: get width, etc., from protocol, not object property

---
 shared-bindings/framebufferio/FramebufferDisplay.c | 17 +-----------
 shared-bindings/framebufferio/FramebufferDisplay.h |  7 +++--
 shared-bindings/rgbmatrix/RGBMatrix.c              | 26 ++++++++++++++++++
 shared-module/framebufferio/FramebufferDisplay.c   | 31 +++++++++++++++-------
 shared-module/framebufferio/FramebufferDisplay.h   | 10 +++++++
 5 files changed, 62 insertions(+), 29 deletions(-)

(limited to 'shared-bindings/framebufferio/FramebufferDisplay.c')

diff --git a/shared-bindings/framebufferio/FramebufferDisplay.c b/shared-bindings/framebufferio/FramebufferDisplay.c
index 5014f3924..820eda51a 100644
--- a/shared-bindings/framebufferio/FramebufferDisplay.c
+++ b/shared-bindings/framebufferio/FramebufferDisplay.c
@@ -39,10 +39,6 @@
 #include "shared-module/displayio/__init__.h"
 #include "supervisor/shared/translate.h"
 
-STATIC int get_int_property(mp_obj_t obj, qstr attr) {
-    return mp_obj_get_int(mp_load_attr(obj, attr));
-}
-
 //| .. currentmodule:: framebufferio
 //|
 //| :class:`FramebufferDisplay` -- Manage updating a display with framebuffer in RAM
@@ -79,25 +75,14 @@ STATIC mp_obj_t framebufferio_framebufferdisplay_make_new(const mp_obj_type_t *t
         mp_raise_ValueError(translate("Display rotation must be in 90 degree increments"));
     }
 
-    int width = get_int_property(framebuffer, MP_QSTR_width);
-    int height = get_int_property(framebuffer, MP_QSTR_height);
-    int color_depth = get_int_property(framebuffer, MP_QSTR_color_depth);
-    int bytes_per_cell = get_int_property(framebuffer, MP_QSTR_bytes_per_cell);
-    int native_frames_per_second = get_int_property(framebuffer, MP_QSTR_native_frames_per_second);
-
     primary_display_t *disp = allocate_display_or_raise();
     framebufferio_framebufferdisplay_obj_t *self = &disp->framebuffer_display;
     self->base.type = &framebufferio_framebufferdisplay_type;
     common_hal_framebufferio_framebufferdisplay_construct(
         self,
         framebuffer,
-        width,
-        height,
         rotation,
-        color_depth,
-        bytes_per_cell,
-        args[ARG_auto_refresh].u_bool,
-        native_frames_per_second
+        args[ARG_auto_refresh].u_bool
         );
 
     return self;
diff --git a/shared-bindings/framebufferio/FramebufferDisplay.h b/shared-bindings/framebufferio/FramebufferDisplay.h
index b472088d2..e7ead6ac5 100644
--- a/shared-bindings/framebufferio/FramebufferDisplay.h
+++ b/shared-bindings/framebufferio/FramebufferDisplay.h
@@ -39,10 +39,9 @@ extern const mp_obj_type_t framebufferio_framebufferdisplay_type;
 #define NO_BRIGHTNESS_COMMAND 0x100
 
 void common_hal_framebufferio_framebufferdisplay_construct(framebufferio_framebufferdisplay_obj_t* self,
-        mp_obj_t framebuffer, uint16_t width, uint16_t height,
-        uint16_t rotation, uint16_t color_depth,
-        uint8_t bytes_per_cell,
-        bool auto_refresh, uint16_t native_frames_per_second);
+        mp_obj_t framebuffer,
+        uint16_t rotation,
+        bool auto_refresh);
 
 bool common_hal_framebufferio_framebufferdisplay_show(framebufferio_framebufferdisplay_obj_t* self,
                                        displayio_group_t* root_group);
diff --git a/shared-bindings/rgbmatrix/RGBMatrix.c b/shared-bindings/rgbmatrix/RGBMatrix.c
index c62b587bf..368b73091 100644
--- a/shared-bindings/rgbmatrix/RGBMatrix.c
+++ b/shared-bindings/rgbmatrix/RGBMatrix.c
@@ -443,11 +443,37 @@ STATIC bool protomatter_protomatter_set_brightness_proto(mp_obj_t self_in, mp_fl
     return true;
 }
 
+STATIC int protomatter_protomatter_get_width_proto(mp_obj_t self_in) {
+    return common_hal_protomatter_protomatter_get_width(self_in);
+}
+
+STATIC int protomatter_protomatter_get_height_proto(mp_obj_t self_in) {
+    return common_hal_protomatter_protomatter_get_height(self_in);
+}
+
+STATIC int protomatter_protomatter_get_color_depth_proto(mp_obj_t self_in) {
+    return 16;
+}
+
+STATIC int protomatter_protomatter_get_bytes_per_cell_proto(mp_obj_t self_in) {
+    return 1;
+}
+
+STATIC int protomatter_protomatter_get_native_frames_per_second_proto(mp_obj_t self_in) {
+    return 250;
+}
+
+
 STATIC const framebuffer_p_t protomatter_protomatter_proto = {
     MP_PROTO_IMPLEMENT(MP_QSTR_protocol_framebuffer)
     .get_bufinfo = protomatter_protomatter_get_bufinfo,
     .set_brightness = protomatter_protomatter_set_brightness_proto,
     .get_brightness = protomatter_protomatter_get_brightness_proto,
+    .get_width = protomatter_protomatter_get_width_proto,
+    .get_height = protomatter_protomatter_get_height_proto,
+    .get_color_depth = protomatter_protomatter_get_color_depth_proto,
+    .get_bytes_per_cell = protomatter_protomatter_get_bytes_per_cell_proto,
+    .get_native_frames_per_second = protomatter_protomatter_get_native_frames_per_second_proto,
     .swapbuffers = protomatter_protomatter_swapbuffers,
     .deinit = protomatter_protomatter_deinit_proto,
 };
diff --git a/shared-module/framebufferio/FramebufferDisplay.c b/shared-module/framebufferio/FramebufferDisplay.c
index bd0764e8e..db17013ea 100644
--- a/shared-module/framebufferio/FramebufferDisplay.c
+++ b/shared-module/framebufferio/FramebufferDisplay.c
@@ -42,10 +42,9 @@
 #include "tick.h"
 
 void common_hal_framebufferio_framebufferdisplay_construct(framebufferio_framebufferdisplay_obj_t* self,
-        mp_obj_t framebuffer, uint16_t width, uint16_t height,
-        uint16_t rotation, uint16_t color_depth,
-        uint8_t bytes_per_cell,
-        bool auto_refresh, uint16_t native_frames_per_second) {
+        mp_obj_t framebuffer,
+        uint16_t rotation,
+        bool auto_refresh) {
     // Turn off auto-refresh as we init.
     self->auto_refresh = false;
     self->framebuffer = framebuffer;
@@ -54,15 +53,29 @@ void common_hal_framebufferio_framebufferdisplay_construct(framebufferio_framebu
     uint16_t ram_width = 0x100;
     uint16_t ram_height = 0x100;
 
-    displayio_display_core_construct(&self->core, NULL, width, height, ram_width, ram_height, 0, 0, rotation,
-        color_depth, false, false, bytes_per_cell, false, false);
+    displayio_display_core_construct(
+        &self->core,
+        NULL,
+        self->framebuffer_protocol->get_width(self->framebuffer),
+        self->framebuffer_protocol->get_height(self->framebuffer),
+        ram_width, 
+        ram_height,
+        0,
+        0,
+        rotation,
+        self->framebuffer_protocol->get_color_depth(self->framebuffer),
+        false,
+        false,
+        self->framebuffer_protocol->get_bytes_per_cell(self->framebuffer),
+        false,
+        false);
 
     self->first_manual_refresh = !auto_refresh;
 
-    self->native_frames_per_second = native_frames_per_second;
-    self->native_ms_per_frame = 1000 / native_frames_per_second;
+    self->native_frames_per_second = self->framebuffer_protocol->get_native_frames_per_second(self->framebuffer);
+    self->native_ms_per_frame = 1000 / self->native_frames_per_second;
 
-    supervisor_start_terminal(width, height);
+    supervisor_start_terminal(self->core.width, self->core.height);
 
     // Set the group after initialization otherwise we may send pixels while we delay in
     // initialization.
diff --git a/shared-module/framebufferio/FramebufferDisplay.h b/shared-module/framebufferio/FramebufferDisplay.h
index a7b91a522..ea2fe168e 100644
--- a/shared-module/framebufferio/FramebufferDisplay.h
+++ b/shared-module/framebufferio/FramebufferDisplay.h
@@ -66,12 +66,22 @@ typedef bool (*framebuffer_set_brightness_fun)(mp_obj_t, mp_float_t);
 typedef mp_float_t (*framebuffer_get_brightness_fun)(mp_obj_t);
 typedef bool (*framebuffer_set_auto_brightness_fun)(mp_obj_t, bool);
 typedef bool (*framebuffer_get_auto_brightness_fun)(mp_obj_t);
+typedef int (*framebuffer_get_width_fun)(mp_obj_t);
+typedef int (*framebuffer_get_height_fun)(mp_obj_t);
+typedef int (*framebuffer_get_color_depth_fun)(mp_obj_t);
+typedef int (*framebuffer_get_bytes_per_cell_fun)(mp_obj_t);
+typedef int (*framebuffer_get_native_frames_per_second_fun)(mp_obj_t);
 
 typedef struct _framebuffer_p_t {
     MP_PROTOCOL_HEAD // MP_QSTR_protocol_framebuffer
     framebuffer_get_bufinfo_fun get_bufinfo;
     framebuffer_swapbuffers_fun swapbuffers;
     framebuffer_deinit_fun deinit;
+    framebuffer_get_width_fun get_width;
+    framebuffer_get_height_fun get_height;
+    framebuffer_get_color_depth_fun get_color_depth;
+    framebuffer_get_bytes_per_cell_fun get_bytes_per_cell;
+    framebuffer_get_native_frames_per_second_fun get_native_frames_per_second;
     framebuffer_get_brightness_fun get_brightness;
     framebuffer_set_brightness_fun set_brightness;
     framebuffer_get_auto_brightness_fun get_auto_brightness;
-- 
cgit v1.2.3


From 9bfe6b719718441ce9b661f1c3d92e707ad10131 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Fri, 17 Apr 2020 08:16:56 -0500
Subject: framebufferio: update copyright information

---
 shared-bindings/framebufferio/FramebufferDisplay.c | 1 +
 shared-bindings/framebufferio/FramebufferDisplay.h | 1 +
 shared-module/framebufferio/FramebufferDisplay.c   | 1 +
 shared-module/framebufferio/FramebufferDisplay.h   | 1 +
 4 files changed, 4 insertions(+)

(limited to 'shared-bindings/framebufferio/FramebufferDisplay.c')

diff --git a/shared-bindings/framebufferio/FramebufferDisplay.c b/shared-bindings/framebufferio/FramebufferDisplay.c
index 820eda51a..9ff6cc12d 100644
--- a/shared-bindings/framebufferio/FramebufferDisplay.c
+++ b/shared-bindings/framebufferio/FramebufferDisplay.c
@@ -4,6 +4,7 @@
  * The MIT License (MIT)
  *
  * Copyright (c) 2018 Scott Shawcroft for Adafruit Industries
+ * Copyright (c) 2020 Jeff Epler 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
diff --git a/shared-bindings/framebufferio/FramebufferDisplay.h b/shared-bindings/framebufferio/FramebufferDisplay.h
index e7ead6ac5..c41e041ce 100644
--- a/shared-bindings/framebufferio/FramebufferDisplay.h
+++ b/shared-bindings/framebufferio/FramebufferDisplay.h
@@ -4,6 +4,7 @@
  * The MIT License (MIT)
  *
  * Copyright (c) 2017, 2018 Scott Shawcroft for Adafruit Industries
+ * Copyright (c) 2020 Jeff Epler 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
diff --git a/shared-module/framebufferio/FramebufferDisplay.c b/shared-module/framebufferio/FramebufferDisplay.c
index db17013ea..13fbb2629 100644
--- a/shared-module/framebufferio/FramebufferDisplay.c
+++ b/shared-module/framebufferio/FramebufferDisplay.c
@@ -4,6 +4,7 @@
  * The MIT License (MIT)
  *
  * Copyright (c) 2018 Scott Shawcroft for Adafruit Industries
+ * Copyright (c) 2020 Jeff Epler 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
diff --git a/shared-module/framebufferio/FramebufferDisplay.h b/shared-module/framebufferio/FramebufferDisplay.h
index ea2fe168e..1b68d2ab0 100644
--- a/shared-module/framebufferio/FramebufferDisplay.h
+++ b/shared-module/framebufferio/FramebufferDisplay.h
@@ -4,6 +4,7 @@
  * The MIT License (MIT)
  *
  * Copyright (c) 2019 Scott Shawcroft for Adafruit Industries
+ * Copyright (c) 2020 Jeff Epler 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
-- 
cgit v1.2.3


From a3d5adb43c897d591baabaaf1e7ef83deedbd3ce Mon Sep 17 00:00:00 2001
From: dherrada <dylan.herrada@gmail.com>
Date: Thu, 7 May 2020 11:56:46 -0400
Subject: Did _eve, fontio, framebufferio, and frequencyio

---
 shared-bindings/_eve/__init__.c                    | 441 +++++++++++----------
 shared-bindings/fontio/BuiltinFont.c               |  38 +-
 shared-bindings/fontio/Glyph.c                     |  29 +-
 shared-bindings/fontio/__init__.c                  |   4 +-
 shared-bindings/framebufferio/FramebufferDisplay.c | 109 +++--
 shared-bindings/framebufferio/__init__.c           |   4 +-
 shared-bindings/frequencyio/FrequencyIn.c          | 106 ++---
 shared-bindings/frequencyio/__init__.c             |   4 +-
 8 files changed, 371 insertions(+), 364 deletions(-)

(limited to 'shared-bindings/framebufferio/FramebufferDisplay.c')

diff --git a/shared-bindings/_eve/__init__.c b/shared-bindings/_eve/__init__.c
index 9bc790f5d..0e78cea16 100644
--- a/shared-bindings/_eve/__init__.c
+++ b/shared-bindings/_eve/__init__.c
@@ -34,7 +34,20 @@
 #include "shared-module/_eve/__init__.h"
 #include "shared-bindings/_eve/__init__.h"
 
-//| :mod:`_eve` --- low-level BridgeTek EVE bindings
+
+
+
+
+
+
+
+
+
+
+
+
+
+//| """:mod:`_eve` --- low-level BridgeTek EVE bindings
 //| ================================================
 //|
 //| .. module:: _eve
@@ -43,7 +56,7 @@
 //|
 //| The `_eve` module provides a class _EVE which
 //| contains methods for constructing EVE command 
-//| buffers and appending basic graphics commands.
+//| buffers and appending basic graphics commands."""
 //|
 
 typedef struct _mp_obj__EVE_t {
@@ -63,11 +76,11 @@ STATIC mp_obj_t _register(mp_obj_t self, mp_obj_t o) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(register_obj, _register);
 
-//|   .. method:: flush()
-//| 
-//|     Send any queued drawing commands directly to the hardware.
+//| def flush(self, ) -> Any:
+//|     """Send any queued drawing commands directly to the hardware.
 //|
-//|     :param int width: The width of the grid in tiles, or 1 for sprites.
+//|     :param int width: The width of the grid in tiles, or 1 for sprites."""
+//|     ...
 //|
 STATIC mp_obj_t _flush(mp_obj_t self) {
     common_hal__eve_flush(EVEHAL(self));
@@ -75,11 +88,11 @@ STATIC mp_obj_t _flush(mp_obj_t self) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(flush_obj, _flush);
 
-//|   .. method:: cc(b)
-//| 
-//|     Append bytes to the command FIFO.
+//| def cc(self, b: bytes) -> Any:
+//|     """Append bytes to the command FIFO.
 //|
-//|     :param bytes b: The bytes to add
+//|     :param bytes b: The bytes to add"""
+//|     ...
 //|
 STATIC mp_obj_t _cc(mp_obj_t self, mp_obj_t b) {
     mp_buffer_info_t buffer_info;
@@ -91,14 +104,14 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(cc_obj, _cc);
 
 //{
 
-//|   .. method:: AlphaFunc(func, ref)
-//|
-//|     Set the alpha test function
+//| def AlphaFunc(self, func: int, ref: int) -> Any:
+//|     """Set the alpha test function
 //|
 //|     :param int func: specifies the test function, one of ``NEVER``, ``LESS``, ``LEQUAL``, ``GREATER``, ``GEQUAL``, ``EQUAL``, ``NOTEQUAL``, or ``ALWAYS``. Range 0-7. The initial value is ALWAYS(7)
 //|     :param int ref: specifies the reference value for the alpha test. Range 0-255. The initial value is 0
 //|
-//|     These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|     These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|     ...
 //|
 
 STATIC mp_obj_t _alphafunc(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
@@ -109,14 +122,14 @@ STATIC mp_obj_t _alphafunc(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_3(alphafunc_obj, _alphafunc);
 
-//|   .. method:: Begin(prim)
-//|
-//|     Begin drawing a graphics primitive
+//| def Begin(self, prim: int) -> Any:
+//|     """Begin drawing a graphics primitive
 //|
 //|     :param int prim: graphics primitive.
 //|
-//|     Valid primitives are ``BITMAPS``, ``POINTS``, ``LINES``, ``LINE_STRIP``, ``EDGE_STRIP_R``, ``EDGE_STRIP_L``, ``EDGE_STRIP_A``, ``EDGE_STRIP_B`` and ``RECTS``.
-//| 
+//|     Valid primitives are ``BITMAPS``, ``POINTS``, ``LINES``, ``LINE_STRIP``, ``EDGE_STRIP_R``, ``EDGE_STRIP_L``, ``EDGE_STRIP_A``, ``EDGE_STRIP_B`` and ``RECTS``."""
+//|     ...
+//|
 
 STATIC mp_obj_t _begin(mp_obj_t self, mp_obj_t a0) {
     uint32_t prim   = mp_obj_get_int_truncated(a0);
@@ -125,11 +138,11 @@ STATIC mp_obj_t _begin(mp_obj_t self, mp_obj_t a0) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(begin_obj, _begin);
 
-//|   .. method:: BitmapExtFormat(format)
+//| def BitmapExtFormat(self, format: int) -> Any:
+//|     """Set the bitmap format
 //|
-//|     Set the bitmap format
-//|
-//|     :param int format: bitmap pixel format.
+//|     :param int format: bitmap pixel format."""
+//|     ...
 //|
 
 STATIC mp_obj_t _bitmapextformat(mp_obj_t self, mp_obj_t a0) {
@@ -139,13 +152,13 @@ STATIC mp_obj_t _bitmapextformat(mp_obj_t self, mp_obj_t a0) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(bitmapextformat_obj, _bitmapextformat);
 
-//|   .. method:: BitmapHandle(handle)
-//|
-//|     Set the bitmap handle
+//| def BitmapHandle(self, handle: int) -> Any:
+//|     """Set the bitmap handle
 //|
 //|     :param int handle: bitmap handle. Range 0-31. The initial value is 0
 //|
-//|     This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|     This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|     ...
 //|
 
 STATIC mp_obj_t _bitmaphandle(mp_obj_t self, mp_obj_t a0) {
@@ -155,12 +168,12 @@ STATIC mp_obj_t _bitmaphandle(mp_obj_t self, mp_obj_t a0) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(bitmaphandle_obj, _bitmaphandle);
 
-//|   .. method:: BitmapLayoutH(linestride, height)
-//|
-//|     Set the source bitmap memory format and layout for the current handle. high bits for large bitmaps
+//| def BitmapLayoutH(self, linestride: int, height: int) -> Any:
+//|     """Set the source bitmap memory format and layout for the current handle. high bits for large bitmaps
 //|
 //|     :param int linestride: high part of bitmap line stride, in bytes. Range 0-7
-//|     :param int height: high part of bitmap height, in lines. Range 0-3
+//|     :param int height: high part of bitmap height, in lines. Range 0-3"""
+//|     ...
 //|
 
 STATIC mp_obj_t _bitmaplayouth(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
@@ -171,13 +184,13 @@ STATIC mp_obj_t _bitmaplayouth(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_3(bitmaplayouth_obj, _bitmaplayouth);
 
-//|   .. method:: BitmapLayout(format, linestride, height)
-//|
-//|     Set the source bitmap memory format and layout for the current handle
+//| def BitmapLayout(self, format: int, linestride: int, height: int) -> Any:
+//|     """Set the source bitmap memory format and layout for the current handle
 //|
 //|     :param int format: bitmap pixel format, or GLFORMAT to use BITMAP_EXT_FORMAT instead. Range 0-31
 //|     :param int linestride: bitmap line stride, in bytes. Range 0-1023
-//|     :param int height: bitmap height, in lines. Range 0-511
+//|     :param int height: bitmap height, in lines. Range 0-511"""
+//|     ...
 //|
 
 STATIC mp_obj_t _bitmaplayout(size_t n_args, const mp_obj_t *args) {
@@ -189,12 +202,12 @@ STATIC mp_obj_t _bitmaplayout(size_t n_args, const mp_obj_t *args) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bitmaplayout_obj, 4, 4, _bitmaplayout);
 
-//|   .. method:: BitmapSizeH(width, height)
-//|
-//|     Set the screen drawing of bitmaps for the current handle. high bits for large bitmaps
+//| def BitmapSizeH(self, width: int, height: int) -> Any:
+//|     """Set the screen drawing of bitmaps for the current handle. high bits for large bitmaps
 //|
 //|     :param int width: high part of drawn bitmap width, in pixels. Range 0-3
-//|     :param int height: high part of drawn bitmap height, in pixels. Range 0-3
+//|     :param int height: high part of drawn bitmap height, in pixels. Range 0-3"""
+//|     ...
 //|
 
 STATIC mp_obj_t _bitmapsizeh(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
@@ -205,15 +218,15 @@ STATIC mp_obj_t _bitmapsizeh(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_3(bitmapsizeh_obj, _bitmapsizeh);
 
-//|   .. method:: BitmapSize(filter, wrapx, wrapy, width, height)
-//|
-//|     Set the screen drawing of bitmaps for the current handle
+//| def BitmapSize(self, filter: int, wrapx: int, wrapy: int, width: int, height: int) -> Any:
+//|     """Set the screen drawing of bitmaps for the current handle
 //|
 //|     :param int filter: bitmap filtering mode, one of ``NEAREST`` or ``BILINEAR``. Range 0-1
 //|     :param int wrapx: bitmap :math:`x` wrap mode, one of ``REPEAT`` or ``BORDER``. Range 0-1
 //|     :param int wrapy: bitmap :math:`y` wrap mode, one of ``REPEAT`` or ``BORDER``. Range 0-1
 //|     :param int width: drawn bitmap width, in pixels. Range 0-511
-//|     :param int height: drawn bitmap height, in pixels. Range 0-511
+//|     :param int height: drawn bitmap height, in pixels. Range 0-511"""
+//|     ...
 //|
 
 STATIC mp_obj_t _bitmapsize(size_t n_args, const mp_obj_t *args) {
@@ -227,11 +240,11 @@ STATIC mp_obj_t _bitmapsize(size_t n_args, const mp_obj_t *args) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bitmapsize_obj, 6, 6, _bitmapsize);
 
-//|   .. method:: BitmapSource(addr)
+//| def BitmapSource(self, addr: int) -> Any:
+//|     """Set the source address for bitmap graphics
 //|
-//|     Set the source address for bitmap graphics
-//|
-//|     :param int addr: Bitmap start address, pixel-aligned. May be in SRAM or flash. Range 0-16777215
+//|     :param int addr: Bitmap start address, pixel-aligned. May be in SRAM or flash. Range 0-16777215"""
+//|     ...
 //|
 
 STATIC mp_obj_t _bitmapsource(mp_obj_t self, mp_obj_t a0) {
@@ -241,14 +254,14 @@ STATIC mp_obj_t _bitmapsource(mp_obj_t self, mp_obj_t a0) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(bitmapsource_obj, _bitmapsource);
 
-//|   .. method:: BitmapSwizzle(r, g, b, a)
-//|
-//|     Set the source for the r,g,b and a channels of a bitmap
+//| def BitmapSwizzle(self, r: int, g: int, b: int, a: int) -> Any:
+//|     """Set the source for the r,g,b and a channels of a bitmap
 //|
 //|     :param int r: red component source channel. Range 0-7
 //|     :param int g: green component source channel. Range 0-7
 //|     :param int b: blue component source channel. Range 0-7
-//|     :param int a: alpha component source channel. Range 0-7
+//|     :param int a: alpha component source channel. Range 0-7"""
+//|     ...
 //|
 
 STATIC mp_obj_t _bitmapswizzle(size_t n_args, const mp_obj_t *args) {
@@ -261,16 +274,16 @@ STATIC mp_obj_t _bitmapswizzle(size_t n_args, const mp_obj_t *args) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bitmapswizzle_obj, 5, 5, _bitmapswizzle);
 
-//|   .. method:: BitmapTransformA(p, v)
-//|
-//|     Set the :math:`a` component of the bitmap transform matrix
+//| def BitmapTransformA(self, p: Any, v: int) -> Any:
+//|     """Set the :math:`a` component of the bitmap transform matrix
 //|
 //|     :param int p: precision control: 0 is 8.8, 1 is 1.15. Range 0-1. The initial value is 0
 //|     :param int v: The :math:`a` component of the bitmap transform matrix, in signed 8.8 or 1.15 bit fixed-point form. Range 0-131071. The initial value is 256
 //|
 //|     The initial value is **p** = 0, **v** = 256. This represents the value 1.0.
 //|
-//|     These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|     These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|     ...
 //|
 
 STATIC mp_obj_t _bitmaptransforma(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
@@ -281,16 +294,16 @@ STATIC mp_obj_t _bitmaptransforma(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_3(bitmaptransforma_obj, _bitmaptransforma);
 
-//|   .. method:: BitmapTransformB(p, v)
-//|
-//|     Set the :math:`b` component of the bitmap transform matrix
+//| def BitmapTransformB(self, p: Any, v: int) -> Any:
+//|     """Set the :math:`b` component of the bitmap transform matrix
 //|
 //|     :param int p: precision control: 0 is 8.8, 1 is 1.15. Range 0-1. The initial value is 0
 //|     :param int v: The :math:`b` component of the bitmap transform matrix, in signed 8.8 or 1.15 bit fixed-point form. Range 0-131071. The initial value is 0
 //|
 //|     The initial value is **p** = 0, **v** = 0. This represents the value 0.0.
 //|
-//|     These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|     These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|     ...
 //|
 
 STATIC mp_obj_t _bitmaptransformb(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
@@ -301,13 +314,13 @@ STATIC mp_obj_t _bitmaptransformb(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_3(bitmaptransformb_obj, _bitmaptransformb);
 
-//|   .. method:: BitmapTransformC(v)
-//|
-//|     Set the :math:`c` component of the bitmap transform matrix
+//| def BitmapTransformC(self, v: int) -> Any:
+//|     """Set the :math:`c` component of the bitmap transform matrix
 //|
 //|     :param int v: The :math:`c` component of the bitmap transform matrix, in signed 15.8 bit fixed-point form. Range 0-16777215. The initial value is 0
 //|
-//|     This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|     This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|     ...
 //|
 
 STATIC mp_obj_t _bitmaptransformc(mp_obj_t self, mp_obj_t a0) {
@@ -317,16 +330,16 @@ STATIC mp_obj_t _bitmaptransformc(mp_obj_t self, mp_obj_t a0) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(bitmaptransformc_obj, _bitmaptransformc);
 
-//|   .. method:: BitmapTransformD(p, v)
-//|
-//|     Set the :math:`d` component of the bitmap transform matrix
+//| def BitmapTransformD(self, p: Any, v: int) -> Any:
+//|     """Set the :math:`d` component of the bitmap transform matrix
 //|
 //|     :param int p: precision control: 0 is 8.8, 1 is 1.15. Range 0-1. The initial value is 0
 //|     :param int v: The :math:`d` component of the bitmap transform matrix, in signed 8.8 or 1.15 bit fixed-point form. Range 0-131071. The initial value is 0
 //|
 //|     The initial value is **p** = 0, **v** = 0. This represents the value 0.0.
 //|
-//|     These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|     These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|     ...
 //|
 
 STATIC mp_obj_t _bitmaptransformd(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
@@ -337,16 +350,16 @@ STATIC mp_obj_t _bitmaptransformd(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_3(bitmaptransformd_obj, _bitmaptransformd);
 
-//|   .. method:: BitmapTransformE(p, v)
-//|
-//|     Set the :math:`e` component of the bitmap transform matrix
+//| def BitmapTransformE(self, p: Any, v: int) -> Any:
+//|     """Set the :math:`e` component of the bitmap transform matrix
 //|
 //|     :param int p: precision control: 0 is 8.8, 1 is 1.15. Range 0-1. The initial value is 0
 //|     :param int v: The :math:`e` component of the bitmap transform matrix, in signed 8.8 or 1.15 bit fixed-point form. Range 0-131071. The initial value is 256
 //|
 //|     The initial value is **p** = 0, **v** = 256. This represents the value 1.0.
 //|
-//|     These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|     These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|     ...
 //|
 
 STATIC mp_obj_t _bitmaptransforme(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
@@ -357,13 +370,13 @@ STATIC mp_obj_t _bitmaptransforme(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_3(bitmaptransforme_obj, _bitmaptransforme);
 
-//|   .. method:: BitmapTransformF(v)
-//|
-//|     Set the :math:`f` component of the bitmap transform matrix
+//| def BitmapTransformF(self, v: int) -> Any:
+//|     """Set the :math:`f` component of the bitmap transform matrix
 //|
 //|     :param int v: The :math:`f` component of the bitmap transform matrix, in signed 15.8 bit fixed-point form. Range 0-16777215. The initial value is 0
 //|
-//|     This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|     This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|     ...
 //|
 
 STATIC mp_obj_t _bitmaptransformf(mp_obj_t self, mp_obj_t a0) {
@@ -373,14 +386,14 @@ STATIC mp_obj_t _bitmaptransformf(mp_obj_t self, mp_obj_t a0) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(bitmaptransformf_obj, _bitmaptransformf);
 
-//|   .. method:: BlendFunc(src, dst)
-//|
-//|     Set pixel arithmetic
+//| def BlendFunc(self, src: int, dst: int) -> Any:
+//|     """Set pixel arithmetic
 //|
 //|     :param int src: specifies how the source blending factor is computed.  One of ``ZERO``, ``ONE``, ``SRC_ALPHA``, ``DST_ALPHA``, ``ONE_MINUS_SRC_ALPHA`` or ``ONE_MINUS_DST_ALPHA``. Range 0-7. The initial value is SRC_ALPHA(2)
 //|     :param int dst: specifies how the destination blending factor is computed, one of the same constants as **src**. Range 0-7. The initial value is ONE_MINUS_SRC_ALPHA(4)
 //|
-//|     These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|     These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|     ...
 //|
 
 STATIC mp_obj_t _blendfunc(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
@@ -391,11 +404,11 @@ STATIC mp_obj_t _blendfunc(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_3(blendfunc_obj, _blendfunc);
 
-//|   .. method:: Call(dest)
-//|
-//|     Execute a sequence of commands at another location in the display list
+//| def Call(self, dest: int) -> Any:
+//|     """Execute a sequence of commands at another location in the display list
 //|
-//|     :param int dest: display list address. Range 0-65535
+//|     :param int dest: display list address. Range 0-65535"""
+//|     ...
 //|
 
 STATIC mp_obj_t _call(mp_obj_t self, mp_obj_t a0) {
@@ -405,13 +418,13 @@ STATIC mp_obj_t _call(mp_obj_t self, mp_obj_t a0) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(call_obj, _call);
 
-//|   .. method:: Cell(cell)
-//|
-//|     Set the bitmap cell number for the vertex2f command
+//| def Cell(self, cell: int) -> Any:
+//|     """Set the bitmap cell number for the vertex2f command
 //|
 //|     :param int cell: bitmap cell number. Range 0-127. The initial value is 0
 //|
-//|     This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|     This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|     ...
 //|
 
 STATIC mp_obj_t _cell(mp_obj_t self, mp_obj_t a0) {
@@ -421,13 +434,13 @@ STATIC mp_obj_t _cell(mp_obj_t self, mp_obj_t a0) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(cell_obj, _cell);
 
-//|   .. method:: ClearColorA(alpha)
-//|
-//|     Set clear value for the alpha channel
+//| def ClearColorA(self, alpha: int) -> Any:
+//|     """Set clear value for the alpha channel
 //|
 //|     :param int alpha: alpha value used when the color buffer is cleared. Range 0-255. The initial value is 0
 //|
-//|     This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|     This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|     ...
 //|
 
 STATIC mp_obj_t _clearcolora(mp_obj_t self, mp_obj_t a0) {
@@ -437,15 +450,15 @@ STATIC mp_obj_t _clearcolora(mp_obj_t self, mp_obj_t a0) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(clearcolora_obj, _clearcolora);
 
-//|   .. method:: ClearColorRGB(red, green, blue)
-//|
-//|     Set clear values for red, green and blue channels
+//| def ClearColorRGB(self, red: int, green: int, blue: int) -> Any:
+//|     """Set clear values for red, green and blue channels
 //|
 //|     :param int red: red value used when the color buffer is cleared. Range 0-255. The initial value is 0
 //|     :param int green: green value used when the color buffer is cleared. Range 0-255. The initial value is 0
 //|     :param int blue: blue value used when the color buffer is cleared. Range 0-255. The initial value is 0
 //|
-//|     These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|     These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|     ...
 //|
 
 STATIC mp_obj_t _clearcolorrgb(size_t n_args, const mp_obj_t *args) {
@@ -457,13 +470,13 @@ STATIC mp_obj_t _clearcolorrgb(size_t n_args, const mp_obj_t *args) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(clearcolorrgb_obj, 4, 4, _clearcolorrgb);
 
-//|   .. method:: Clear(c, s, t)
-//|
-//|     Clear buffers to preset values
+//| def Clear(self, c: int, s: int, t: int) -> Any:
+//|     """Clear buffers to preset values
 //|
 //|     :param int c: clear color buffer. Range 0-1
 //|     :param int s: clear stencil buffer. Range 0-1
-//|     :param int t: clear tag buffer. Range 0-1
+//|     :param int t: clear tag buffer. Range 0-1"""
+//|     ...
 //|
 
 STATIC mp_obj_t _clear(size_t n_args, const mp_obj_t *args) {
@@ -475,13 +488,13 @@ STATIC mp_obj_t _clear(size_t n_args, const mp_obj_t *args) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(clear_obj, 1, 4, _clear);
 
-//|   .. method:: ClearStencil(s)
-//|
-//|     Set clear value for the stencil buffer
+//| def ClearStencil(self, s: int) -> Any:
+//|     """Set clear value for the stencil buffer
 //|
 //|     :param int s: value used when the stencil buffer is cleared. Range 0-255. The initial value is 0
 //|
-//|     This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|     This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|     ...
 //|
 
 STATIC mp_obj_t _clearstencil(mp_obj_t self, mp_obj_t a0) {
@@ -491,13 +504,12 @@ STATIC mp_obj_t _clearstencil(mp_obj_t self, mp_obj_t a0) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(clearstencil_obj, _clearstencil);
 
-//|   .. method:: ClearTag(s)
-//|
-//|     Set clear value for the tag buffer
+//| def ClearTag(self, s: int) -> Any:
+//|     """Set clear value for the tag buffer
 //|
 //|     :param int s: value used when the tag buffer is cleared. Range 0-255. The initial value is 0
 //|
-//|     This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|     This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
 //|
 
 STATIC mp_obj_t _cleartag(mp_obj_t self, mp_obj_t a0) {
@@ -507,13 +519,13 @@ STATIC mp_obj_t _cleartag(mp_obj_t self, mp_obj_t a0) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(cleartag_obj, _cleartag);
 
-//|   .. method:: ColorA(alpha)
-//|
-//|     Set the current color alpha
+//| def ColorA(self, alpha: int) -> Any:
+//|     """Set the current color alpha
 //|
 //|     :param int alpha: alpha for the current color. Range 0-255. The initial value is 255
 //|
-//|     This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|     This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|     ...
 //|
 
 STATIC mp_obj_t _colora(mp_obj_t self, mp_obj_t a0) {
@@ -523,16 +535,16 @@ STATIC mp_obj_t _colora(mp_obj_t self, mp_obj_t a0) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(colora_obj, _colora);
 
-//|   .. method:: ColorMask(r, g, b, a)
-//|
-//|     Enable and disable writing of frame buffer color components
+//| def ColorMask(self, r: int, g: int, b: int, a: int) -> Any:
+//|     """Enable and disable writing of frame buffer color components
 //|
 //|     :param int r: allow updates to the frame buffer red component. Range 0-1. The initial value is 1
 //|     :param int g: allow updates to the frame buffer green component. Range 0-1. The initial value is 1
 //|     :param int b: allow updates to the frame buffer blue component. Range 0-1. The initial value is 1
 //|     :param int a: allow updates to the frame buffer alpha component. Range 0-1. The initial value is 1
 //|
-//|     These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|     These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|     ...
 //|
 
 STATIC mp_obj_t _colormask(size_t n_args, const mp_obj_t *args) {
@@ -545,15 +557,15 @@ STATIC mp_obj_t _colormask(size_t n_args, const mp_obj_t *args) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(colormask_obj, 5, 5, _colormask);
 
-//|   .. method:: ColorRGB(red, green, blue)
-//|
-//|     Set the drawing color
+//| def ColorRGB(self, red: int, green: int, blue: int) -> Any:
+//|     """Set the drawing color
 //|
 //|     :param int red: red value for the current color. Range 0-255. The initial value is 255
 //|     :param int green: green for the current color. Range 0-255. The initial value is 255
 //|     :param int blue: blue for the current color. Range 0-255. The initial value is 255
 //|
-//|     These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|     These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|     ...
 //|
 
 STATIC mp_obj_t _colorrgb(size_t n_args, const mp_obj_t *args) {
@@ -565,9 +577,8 @@ STATIC mp_obj_t _colorrgb(size_t n_args, const mp_obj_t *args) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(colorrgb_obj, 4, 4, _colorrgb);
 
-//|   .. method:: Display()
-//|
-//|     End the display list
+//| def Display(self, ) -> Any: ...
+//| """End the display list"""
 //|
 
 STATIC mp_obj_t _display(mp_obj_t self) {
@@ -577,12 +588,12 @@ STATIC mp_obj_t _display(mp_obj_t self) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(display_obj, _display);
 
-//|   .. method:: End()
+//| def End(self, ) -> Any:
+//|     """End drawing a graphics primitive
 //|
-//|     End drawing a graphics primitive
+//|     :meth:`Vertex2ii` and :meth:`Vertex2f` calls are ignored until the next :meth:`Begin`."""
+//|     ...
 //|
-//|     :meth:`Vertex2ii` and :meth:`Vertex2f` calls are ignored until the next :meth:`Begin`.
-//| 
 
 STATIC mp_obj_t _end(mp_obj_t self) {
 
@@ -591,11 +602,11 @@ STATIC mp_obj_t _end(mp_obj_t self) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(end_obj, _end);
 
-//|   .. method:: Jump(dest)
+//| def Jump(self, dest: int) -> Any:
+//|     """Execute commands at another location in the display list
 //|
-//|     Execute commands at another location in the display list
-//|
-//|     :param int dest: display list address. Range 0-65535
+//|     :param int dest: display list address. Range 0-65535"""
+//|     ...
 //|
 
 STATIC mp_obj_t _jump(mp_obj_t self, mp_obj_t a0) {
@@ -605,13 +616,13 @@ STATIC mp_obj_t _jump(mp_obj_t self, mp_obj_t a0) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(jump_obj, _jump);
 
-//|   .. method:: LineWidth(width)
-//|
-//|     Set the width of rasterized lines
+//| def LineWidth(self, width: int) -> Any:
+//|     """Set the width of rasterized lines
 //|
 //|     :param int width: line width in :math:`1/16` pixel. Range 0-4095. The initial value is 16
 //|
-//|     This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|     This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|     ...
 //|
 
 STATIC mp_obj_t _linewidth(mp_obj_t self, mp_obj_t a0) {
@@ -621,11 +632,11 @@ STATIC mp_obj_t _linewidth(mp_obj_t self, mp_obj_t a0) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(linewidth_obj, _linewidth);
 
-//|   .. method:: Macro(m)
+//| def Macro(self, m: int) -> Any:
+//|     """Execute a single command from a macro register
 //|
-//|     Execute a single command from a macro register
-//|
-//|     :param int m: macro register to read. Range 0-1
+//|     :param int m: macro register to read. Range 0-1"""
+//|     ...
 //|
 
 STATIC mp_obj_t _macro(mp_obj_t self, mp_obj_t a0) {
@@ -635,9 +646,9 @@ STATIC mp_obj_t _macro(mp_obj_t self, mp_obj_t a0) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(macro_obj, _macro);
 
-//|   .. method:: Nop()
-//|
-//|     No operation
+//| def Nop(self, ) -> Any:
+//|     """No operation"""
+//|     ...
 //|
 
 STATIC mp_obj_t _nop(mp_obj_t self) {
@@ -647,13 +658,13 @@ STATIC mp_obj_t _nop(mp_obj_t self) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(nop_obj, _nop);
 
-//|   .. method:: PaletteSource(addr)
-//|
-//|     Set the base address of the palette
+//| def PaletteSource(self, addr: int) -> Any:
+//|     """Set the base address of the palette
 //|
 //|     :param int addr: Address in graphics SRAM, 2-byte aligned. Range 0-4194303. The initial value is 0
 //|
-//|     This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|     This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|     ...
 //|
 
 STATIC mp_obj_t _palettesource(mp_obj_t self, mp_obj_t a0) {
@@ -663,13 +674,13 @@ STATIC mp_obj_t _palettesource(mp_obj_t self, mp_obj_t a0) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(palettesource_obj, _palettesource);
 
-//|   .. method:: PointSize(size)
-//|
-//|     Set the radius of rasterized points
+//| def PointSize(self, size: int) -> Any:
+//|     """Set the radius of rasterized points
 //|
 //|     :param int size: point radius in :math:`1/16` pixel. Range 0-8191. The initial value is 16
 //|
-//|     This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|     This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|     ...
 //|
 
 STATIC mp_obj_t _pointsize(mp_obj_t self, mp_obj_t a0) {
@@ -679,9 +690,9 @@ STATIC mp_obj_t _pointsize(mp_obj_t self, mp_obj_t a0) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(pointsize_obj, _pointsize);
 
-//|   .. method:: RestoreContext()
-//|
-//|     Restore the current graphics context from the context stack
+//| def RestoreContext(self, ) -> Any:
+//|     """Restore the current graphics context from the context stack"""
+//|     ...
 //|
 
 STATIC mp_obj_t _restorecontext(mp_obj_t self) {
@@ -691,9 +702,9 @@ STATIC mp_obj_t _restorecontext(mp_obj_t self) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(restorecontext_obj, _restorecontext);
 
-//|   .. method:: Return()
-//|
-//|     Return from a previous call command
+//| def Return(self, ) -> Any:
+//|     """Return from a previous call command"""
+//|     ...
 //|
 
 STATIC mp_obj_t _return(mp_obj_t self) {
@@ -703,9 +714,9 @@ STATIC mp_obj_t _return(mp_obj_t self) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(return_obj, _return);
 
-//|   .. method:: SaveContext()
-//|
-//|     Push the current graphics context on the context stack
+//| def SaveContext(self, ) -> Any:
+//|     """Push the current graphics context on the context stack"""
+//|     ...
 //|
 
 STATIC mp_obj_t _savecontext(mp_obj_t self) {
@@ -715,14 +726,14 @@ STATIC mp_obj_t _savecontext(mp_obj_t self) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(savecontext_obj, _savecontext);
 
-//|   .. method:: ScissorSize(width, height)
-//|
-//|     Set the size of the scissor clip rectangle
+//| def ScissorSize(self, width: int, height: int) -> Any:
+//|     """Set the size of the scissor clip rectangle
 //|
 //|     :param int width: The width of the scissor clip rectangle, in pixels. Range 0-4095. The initial value is hsize
 //|     :param int height: The height of the scissor clip rectangle, in pixels. Range 0-4095. The initial value is 2048
 //|
-//|     These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|     These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|     ...
 //|
 
 STATIC mp_obj_t _scissorsize(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
@@ -733,14 +744,14 @@ STATIC mp_obj_t _scissorsize(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_3(scissorsize_obj, _scissorsize);
 
-//|   .. method:: ScissorXY(x, y)
-//|
-//|     Set the top left corner of the scissor clip rectangle
+//| def ScissorXY(self, x: int, y: int) -> Any:
+//|     """Set the top left corner of the scissor clip rectangle
 //|
 //|     :param int x: The :math:`x` coordinate of the scissor clip rectangle, in pixels. Range 0-2047. The initial value is 0
 //|     :param int y: The :math:`y` coordinate of the scissor clip rectangle, in pixels. Range 0-2047. The initial value is 0
 //|
-//|     These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|     These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|     ...
 //|
 
 STATIC mp_obj_t _scissorxy(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
@@ -751,15 +762,15 @@ STATIC mp_obj_t _scissorxy(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_3(scissorxy_obj, _scissorxy);
 
-//|   .. method:: StencilFunc(func, ref, mask)
-//|
-//|     Set function and reference value for stencil testing
+//| def StencilFunc(self, func: int, ref: int, mask: int) -> Any:
+//|     """Set function and reference value for stencil testing
 //|
 //|     :param int func: specifies the test function, one of ``NEVER``, ``LESS``, ``LEQUAL``, ``GREATER``, ``GEQUAL``, ``EQUAL``, ``NOTEQUAL``, or ``ALWAYS``. Range 0-7. The initial value is ALWAYS(7)
 //|     :param int ref: specifies the reference value for the stencil test. Range 0-255. The initial value is 0
 //|     :param int mask: specifies a mask that is ANDed with the reference value and the stored stencil value. Range 0-255. The initial value is 255
 //|
-//|     These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|     These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|     ...
 //|
 
 STATIC mp_obj_t _stencilfunc(size_t n_args, const mp_obj_t *args) {
@@ -771,13 +782,13 @@ STATIC mp_obj_t _stencilfunc(size_t n_args, const mp_obj_t *args) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(stencilfunc_obj, 4, 4, _stencilfunc);
 
-//|   .. method:: StencilMask(mask)
-//|
-//|     Control the writing of individual bits in the stencil planes
+//| def StencilMask(self, mask: int) -> Any:
+//|     """Control the writing of individual bits in the stencil planes
 //|
 //|     :param int mask: the mask used to enable writing stencil bits. Range 0-255. The initial value is 255
 //|
-//|     This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|     This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|     ...
 //|
 
 STATIC mp_obj_t _stencilmask(mp_obj_t self, mp_obj_t a0) {
@@ -787,14 +798,14 @@ STATIC mp_obj_t _stencilmask(mp_obj_t self, mp_obj_t a0) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(stencilmask_obj, _stencilmask);
 
-//|   .. method:: StencilOp(sfail, spass)
-//|
-//|     Set stencil test actions
+//| def StencilOp(self, sfail: int, spass: int) -> Any:
+//|     """Set stencil test actions
 //|
 //|     :param int sfail: specifies the action to take when the stencil test fails, one of ``KEEP``, ``ZERO``, ``REPLACE``, ``INCR``, ``INCR_WRAP``, ``DECR``, ``DECR_WRAP``, and ``INVERT``. Range 0-7. The initial value is KEEP(1)
 //|     :param int spass: specifies the action to take when the stencil test passes, one of the same constants as **sfail**. Range 0-7. The initial value is KEEP(1)
 //|
-//|     These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|     These values are part of the graphics context and are saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|     ...
 //|
 
 STATIC mp_obj_t _stencilop(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
@@ -805,13 +816,13 @@ STATIC mp_obj_t _stencilop(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_3(stencilop_obj, _stencilop);
 
-//|   .. method:: TagMask(mask)
-//|
-//|     Control the writing of the tag buffer
+//| def TagMask(self, mask: int) -> Any:
+//|     """Control the writing of the tag buffer
 //|
 //|     :param int mask: allow updates to the tag buffer. Range 0-1. The initial value is 1
 //|
-//|     This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|     This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|     ...
 //|
 
 STATIC mp_obj_t _tagmask(mp_obj_t self, mp_obj_t a0) {
@@ -821,13 +832,13 @@ STATIC mp_obj_t _tagmask(mp_obj_t self, mp_obj_t a0) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(tagmask_obj, _tagmask);
 
-//|   .. method:: Tag(s)
-//|
-//|     Set the current tag value
+//| def Tag(self, s: int) -> Any:
+//|     """Set the current tag value
 //|
 //|     :param int s: tag value. Range 0-255. The initial value is 255
 //|
-//|     This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|     This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|     ...
 //|
 
 STATIC mp_obj_t _tag(mp_obj_t self, mp_obj_t a0) {
@@ -837,13 +848,13 @@ STATIC mp_obj_t _tag(mp_obj_t self, mp_obj_t a0) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(tag_obj, _tag);
 
-//|   .. method:: VertexTranslateX(x)
-//|
-//|     Set the vertex transformation's x translation component
+//| def VertexTranslateX(self, x: int) -> Any:
+//|     """Set the vertex transformation's x translation component
 //|
 //|     :param int x: signed x-coordinate in :math:`1/16` pixel. Range 0-131071. The initial value is 0
 //|
-//|     This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|     This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|     ...
 //|
 
 STATIC mp_obj_t _vertextranslatex(mp_obj_t self, mp_obj_t a0) {
@@ -853,13 +864,13 @@ STATIC mp_obj_t _vertextranslatex(mp_obj_t self, mp_obj_t a0) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(vertextranslatex_obj, _vertextranslatex);
 
-//|   .. method:: VertexTranslateY(y)
-//|
-//|     Set the vertex transformation's y translation component
+//| def VertexTranslateY(self, y: int) -> Any:
+//|     """Set the vertex transformation's y translation component
 //|
 //|     :param int y: signed y-coordinate in :math:`1/16` pixel. Range 0-131071. The initial value is 0
 //|
-//|     This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|     This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|     ...
 //|
 
 
@@ -870,13 +881,13 @@ STATIC mp_obj_t _vertextranslatey(mp_obj_t self, mp_obj_t a0) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(vertextranslatey_obj, _vertextranslatey);
 
-//|   .. method:: VertexFormat(frac)
-//|
-//|     Set the precision of vertex2f coordinates
+//| def VertexFormat(self, frac: int) -> Any:
+//|     """Set the precision of vertex2f coordinates
 //|
 //|     :param int frac: Number of fractional bits in X,Y coordinates, 0-4. Range 0-7. The initial value is 4
 //|
-//|     This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`.
+//|     This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`."""
+//|     ...
 //|
 
 STATIC mp_obj_t _vertexformat(mp_obj_t self, mp_obj_t a0) {
@@ -886,15 +897,15 @@ STATIC mp_obj_t _vertexformat(mp_obj_t self, mp_obj_t a0) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(vertexformat_obj, _vertexformat);
 
-//|   .. method:: Vertex2ii(x, y, handle, cell)
-//|
-//|     :param int x: x-coordinate in pixels. Range 0-511
+//| def Vertex2ii(self, x: int, y: int, handle: int, cell: int) -> Any:
+//|     """:param int x: x-coordinate in pixels. Range 0-511
 //|     :param int y: y-coordinate in pixels. Range 0-511
 //|     :param int handle: bitmap handle. Range 0-31
 //|     :param int cell: cell number. Range 0-127
 //|
-//|     This method is an alternative to :meth:`Vertex2f`.
-//| 
+//|     This method is an alternative to :meth:`Vertex2f`."""
+//|     ...
+//|
 
 STATIC mp_obj_t _vertex2ii(size_t n_args, const mp_obj_t *args) {
     uint32_t x      = mp_obj_get_int_truncated(args[1]);
@@ -961,12 +972,12 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(vertex2ii_obj, 3, 5, _vertex2ii);
 
 // Hand-written functions {
 
-//|   .. method:: Vertex2f(b)
-//| 
-//|     Draw a point.
+//| def Vertex2f(self, b: Any) -> Any:
+//|     """Draw a point.
 //|
 //|     :param float x: pixel x-coordinate
-//|     :param float y: pixel y-coordinate
+//|     :param float y: pixel y-coordinate"""
+//|     ...
 //|
 STATIC mp_obj_t _vertex2f(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) {
     mp_float_t x = mp_obj_get_float(a0);
@@ -980,14 +991,14 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(vertex2f_obj, _vertex2f);
 #define ADD_X(self, x) \
     common_hal__eve_add(EVEHAL(self), sizeof(x), &(x));
 
-//|   .. method:: cmd0(n)
-//| 
-//|     Append the command word n to the FIFO
+//| def cmd0(self, n: int) -> Any:
+//|     """Append the command word n to the FIFO
 //|
 //|     :param int n: The command code
 //|
 //|     This method is used by the ``eve`` module to efficiently add
-//|     commands to the FIFO.
+//|     commands to the FIFO."""
+//|     ...
 //|
 
 STATIC mp_obj_t _cmd0(mp_obj_t self, mp_obj_t n) {
@@ -997,9 +1008,8 @@ STATIC mp_obj_t _cmd0(mp_obj_t self, mp_obj_t n) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(cmd0_obj, _cmd0);
 
-//|   .. method:: cmd(n, fmt, args)
-//| 
-//|     Append a command packet to the FIFO.
+//| def cmd(self, n: int, fmt: str, args: tuple) -> Any:
+//|     """Append a command packet to the FIFO.
 //|
 //|     :param int n: The command code
 //|     :param str fmt: The command format `struct` layout
@@ -1008,7 +1018,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(cmd0_obj, _cmd0);
 //|     Supported format codes: h, H, i, I.
 //|
 //|     This method is used by the ``eve`` module to efficiently add
-//|     commands to the FIFO.
+//|     commands to the FIFO."""
+//|     ...
 //|
 STATIC mp_obj_t _cmd(size_t n_args, const mp_obj_t *args) {
     mp_obj_t self = args[0];
diff --git a/shared-bindings/fontio/BuiltinFont.c b/shared-bindings/fontio/BuiltinFont.c
index 74bc4d29e..f60c9e36c 100644
--- a/shared-bindings/fontio/BuiltinFont.c
+++ b/shared-bindings/fontio/BuiltinFont.c
@@ -36,25 +36,25 @@
 #include "shared-bindings/util.h"
 #include "supervisor/shared/translate.h"
 
-//| .. currentmodule:: fontio
+//| class BuiltinFont:
+//|     """.. currentmodule:: fontio
 //|
-//| :class:`BuiltinFont` -- A font built into CircuitPython
-//| =========================================================================================
+//|     :class:`BuiltinFont` -- A font built into CircuitPython
+//|     =========================================================================================
 //|
-//| A font built into CircuitPython.
+//|     A font built into CircuitPython."""
 //|
-//| .. class:: BuiltinFont()
-//|
-//|   Creation not supported. Available fonts are defined when CircuitPython is built. See the
-//|   `Adafruit_CircuitPython_Bitmap_Font <https://github.com/adafruit/Adafruit_CircuitPython_Bitmap_Font>`_
-//|   library for dynamically loaded fonts.
+//|     def __init__(self, ):
+//|         """Creation not supported. Available fonts are defined when CircuitPython is built. See the
+//|         `Adafruit_CircuitPython_Bitmap_Font <https://github.com/adafruit/Adafruit_CircuitPython_Bitmap_Font>`_
+//|         library for dynamically loaded fonts."""
+//|         ...
 //|
 
-//|   .. attribute:: bitmap
-//|
-//|     Bitmap containing all font glyphs starting with ASCII and followed by unicode. Use
+//|     bitmap: Any = ...
+//|     """Bitmap containing all font glyphs starting with ASCII and followed by unicode. Use
 //|     `get_glyph` in most cases. This is useful for use with `displayio.TileGrid` and
-//|     `terminalio.Terminal`.
+//|     `terminalio.Terminal`."""
 //|
 STATIC mp_obj_t fontio_builtinfont_obj_get_bitmap(mp_obj_t self_in) {
     fontio_builtinfont_t *self = MP_OBJ_TO_PTR(self_in);
@@ -69,9 +69,9 @@ const mp_obj_property_t fontio_builtinfont_bitmap_obj = {
               (mp_obj_t)&mp_const_none_obj},
 };
 
-//|   .. method:: get_bounding_box()
-//|
-//|     Returns the maximum bounds of all glyphs in the font in a tuple of two values: width, height.
+//|     def get_bounding_box(self, ) -> Any:
+//|         """Returns the maximum bounds of all glyphs in the font in a tuple of two values: width, height."""
+//|         ...
 //|
 STATIC mp_obj_t fontio_builtinfont_obj_get_bounding_box(mp_obj_t self_in) {
     fontio_builtinfont_t *self = MP_OBJ_TO_PTR(self_in);
@@ -81,9 +81,9 @@ STATIC mp_obj_t fontio_builtinfont_obj_get_bounding_box(mp_obj_t self_in) {
 MP_DEFINE_CONST_FUN_OBJ_1(fontio_builtinfont_get_bounding_box_obj, fontio_builtinfont_obj_get_bounding_box);
 
 
-//|   .. method:: get_glyph(codepoint)
-//|
-//|     Returns a `fontio.Glyph` for the given codepoint or None if no glyph is available.
+//|     def get_glyph(self, codepoint: Any) -> Any:
+//|         """Returns a `fontio.Glyph` for the given codepoint or None if no glyph is available."""
+//|         ...
 //|
 STATIC mp_obj_t fontio_builtinfont_obj_get_glyph(mp_obj_t self_in, mp_obj_t codepoint_obj) {
     fontio_builtinfont_t *self = MP_OBJ_TO_PTR(self_in);
diff --git a/shared-bindings/fontio/Glyph.c b/shared-bindings/fontio/Glyph.c
index a23284152..6235dbc46 100644
--- a/shared-bindings/fontio/Glyph.c
+++ b/shared-bindings/fontio/Glyph.c
@@ -28,23 +28,24 @@
 
 #include <stdint.h>
 
-//| .. currentmodule:: fontio
+//| class Glyph:
+//|     """.. currentmodule:: fontio
 //|
-//| :class:`Glyph` -- Storage of glyph info
-//| ==========================================================================
+//|     :class:`Glyph` -- Storage of glyph info
+//|     =========================================================================="""
 //|
-//| .. class:: Glyph(bitmap, tile_index, width, height, dx, dy, shift_x, shift_y)
+//|     def __init__(self, bitmap: displayio.Bitmap, tile_index: int, width: int, height: int, dx: int, dy: int, shift_x: int, shift_y: int):
+//|         """Named tuple used to capture a single glyph and its attributes.
 //|
-//|   Named tuple used to capture a single glyph and its attributes.
-//|
-//|   :param displayio.Bitmap bitmap: the bitmap including the glyph
-//|   :param int tile_index: the tile index within the bitmap
-//|   :param int width: the width of the glyph's bitmap
-//|   :param int height: the height of the glyph's bitmap
-//|   :param int dx: x adjustment to the bitmap's position
-//|   :param int dy: y adjustment to the bitmap's position
-//|   :param int shift_x: the x difference to the next glyph
-//|   :param int shift_y: the y difference to the next glyph
+//|         :param displayio.Bitmap bitmap: the bitmap including the glyph
+//|         :param int tile_index: the tile index within the bitmap
+//|         :param int width: the width of the glyph's bitmap
+//|         :param int height: the height of the glyph's bitmap
+//|         :param int dx: x adjustment to the bitmap's position
+//|         :param int dy: y adjustment to the bitmap's position
+//|         :param int shift_x: the x difference to the next glyph
+//|         :param int shift_y: the y difference to the next glyph"""
+//|         ...
 //|
 const mp_obj_namedtuple_type_t fontio_glyph_type = {
     .base = {
diff --git a/shared-bindings/fontio/__init__.c b/shared-bindings/fontio/__init__.c
index cd0f5ab0f..478fc1806 100644
--- a/shared-bindings/fontio/__init__.c
+++ b/shared-bindings/fontio/__init__.c
@@ -33,7 +33,7 @@
 #include "shared-bindings/fontio/BuiltinFont.h"
 #include "shared-bindings/fontio/Glyph.h"
 
-//| :mod:`fontio` --- Core font related data structures
+//| """:mod:`fontio` --- Core font related data structures
 //| =========================================================================
 //|
 //| .. module:: fontio
@@ -48,7 +48,7 @@
 //|     :maxdepth: 3
 //|
 //|     BuiltinFont
-//|     Glyph
+//|     Glyph"""
 //|
 
 STATIC const mp_rom_map_elem_t fontio_module_globals_table[] = {
diff --git a/shared-bindings/framebufferio/FramebufferDisplay.c b/shared-bindings/framebufferio/FramebufferDisplay.c
index 9ff6cc12d..5e63b988e 100644
--- a/shared-bindings/framebufferio/FramebufferDisplay.c
+++ b/shared-bindings/framebufferio/FramebufferDisplay.c
@@ -40,23 +40,24 @@
 #include "shared-module/displayio/__init__.h"
 #include "supervisor/shared/translate.h"
 
-//| .. currentmodule:: framebufferio
+//| class FramebufferDisplay:
+//|     """.. currentmodule:: framebufferio
 //|
-//| :class:`FramebufferDisplay` -- Manage updating a display with framebuffer in RAM
-//| ================================================================================
+//|     :class:`FramebufferDisplay` -- Manage updating a display with framebuffer in RAM
+//|     ================================================================================
 //|
-//| This initializes a display and connects it into CircuitPython. Unlike other
-//| objects in CircuitPython, Display objects live until `displayio.release_displays()`
-//| is called. This is done so that CircuitPython can use the display itself.
+//|     This initializes a display and connects it into CircuitPython. Unlike other
+//|     objects in CircuitPython, Display objects live until `displayio.release_displays()`
+//|     is called. This is done so that CircuitPython can use the display itself."""
 //|
-//| .. class:: FramebufferDisplay(framebuffer, *, rotation=0, auto_refresh=True)
+//|     def __init__(self, framebuffer: Any, *, rotation: int = 0, auto_refresh: bool = True):
+//|         """Create a Display object with the given framebuffer (a buffer, array, ulab.array, etc)
 //|
-//|   Create a Display object with the given framebuffer (a buffer, array, ulab.array, etc)
-//|
-//|   :param framebuffer: The framebuffer that the display is connected to
-//|   :type framebuffer: any core object implementing the framebuffer protocol
-//|   :param bool auto_refresh: Automatically refresh the screen
-//|   :param int rotation: The rotation of the display in degrees clockwise. Must be in 90 degree increments (0, 90, 180, 270)
+//|         :param framebuffer: The framebuffer that the display is connected to
+//|         :type framebuffer: any core object implementing the framebuffer protocol
+//|         :param bool auto_refresh: Automatically refresh the screen
+//|         :param int rotation: The rotation of the display in degrees clockwise. Must be in 90 degree increments (0, 90, 180, 270)"""
+//|         ...
 //|
 STATIC mp_obj_t framebufferio_framebufferdisplay_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_framebuffer, ARG_rotation, ARG_auto_refresh, NUM_ARGS };
@@ -96,12 +97,12 @@ static framebufferio_framebufferdisplay_obj_t* native_display(mp_obj_t display_o
     return MP_OBJ_TO_PTR(native_display);
 }
 
-//|   .. method:: show(group)
-//|
-//|     Switches to displaying the given group of layers. When group is None, the default
-//|     CircuitPython terminal will be shown.
+//|     def show(self, group: Group) -> Any:
+//|         """Switches to displaying the given group of layers. When group is None, the default
+//|         CircuitPython terminal will be shown.
 //|
-//|     :param Group group: The group to show.
+//|         :param Group group: The group to show."""
+//|         ...
 //|
 STATIC mp_obj_t framebufferio_framebufferdisplay_obj_show(mp_obj_t self_in, mp_obj_t group_in) {
     framebufferio_framebufferdisplay_obj_t *self = native_display(self_in);
@@ -118,21 +119,21 @@ STATIC mp_obj_t framebufferio_framebufferdisplay_obj_show(mp_obj_t self_in, mp_o
 }
 MP_DEFINE_CONST_FUN_OBJ_2(framebufferio_framebufferdisplay_show_obj, framebufferio_framebufferdisplay_obj_show);
 
-//|   .. method:: refresh(*, target_frames_per_second=60, minimum_frames_per_second=1)
-//|
-//|     When auto refresh is off, waits for the target frame rate and then refreshes the display,
-//|     returning True. If the call has taken too long since the last refresh call for the given
-//|     target frame rate, then the refresh returns False immediately without updating the screen to
-//|     hopefully help getting caught up.
+//|     def refresh(self, *, target_frames_per_second: int = 60, minimum_frames_per_second: int = 1) -> Any:
+//|         """When auto refresh is off, waits for the target frame rate and then refreshes the display,
+//|         returning True. If the call has taken too long since the last refresh call for the given
+//|         target frame rate, then the refresh returns False immediately without updating the screen to
+//|         hopefully help getting caught up.
 //|
-//|     If the time since the last successful refresh is below the minimum frame rate, then an
-//|     exception will be raised. Set minimum_frames_per_second to 0 to disable.
+//|         If the time since the last successful refresh is below the minimum frame rate, then an
+//|         exception will be raised. Set minimum_frames_per_second to 0 to disable.
 //|
-//|     When auto refresh is on, updates the display immediately. (The display will also update
-//|     without calls to this.)
+//|         When auto refresh is on, updates the display immediately. (The display will also update
+//|         without calls to this.)
 //|
-//|   :param int target_frames_per_second: How many times a second `refresh` should be called and the screen updated.
-//|   :param int minimum_frames_per_second: The minimum number of times the screen should be updated per second.
+//|         :param int target_frames_per_second: How many times a second `refresh` should be called and the screen updated.
+//|         :param int minimum_frames_per_second: The minimum number of times the screen should be updated per second."""
+//|         ...
 //|
 STATIC mp_obj_t framebufferio_framebufferdisplay_obj_refresh(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_target_frames_per_second, ARG_minimum_frames_per_second };
@@ -153,9 +154,8 @@ STATIC mp_obj_t framebufferio_framebufferdisplay_obj_refresh(size_t n_args, cons
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(framebufferio_framebufferdisplay_refresh_obj, 1, framebufferio_framebufferdisplay_obj_refresh);
 
-//|   .. attribute:: auto_refresh
-//|
-//|     True when the display is refreshed automatically.
+//|     auto_refresh: Any = ...
+//|     """True when the display is refreshed automatically."""
 //|
 STATIC mp_obj_t framebufferio_framebufferdisplay_obj_get_auto_refresh(mp_obj_t self_in) {
     framebufferio_framebufferdisplay_obj_t *self = native_display(self_in);
@@ -179,11 +179,10 @@ const mp_obj_property_t framebufferio_framebufferdisplay_auto_refresh_obj = {
               (mp_obj_t)&mp_const_none_obj},
 };
 
-//|   .. attribute:: brightness
-//|
-//|     The brightness of the display as a float. 0.0 is off and 1.0 is full brightness. When
+//|     brightness: Any = ...
+//|     """The brightness of the display as a float. 0.0 is off and 1.0 is full brightness. When
 //|     `auto_brightness` is True, the value of `brightness` will change automatically.
-//|     If `brightness` is set, `auto_brightness` will be disabled and will be set to False.
+//|     If `brightness` is set, `auto_brightness` will be disabled and will be set to False."""
 //|
 STATIC mp_obj_t framebufferio_framebufferdisplay_obj_get_brightness(mp_obj_t self_in) {
     framebufferio_framebufferdisplay_obj_t *self = native_display(self_in);
@@ -217,12 +216,11 @@ const mp_obj_property_t framebufferio_framebufferdisplay_brightness_obj = {
               (mp_obj_t)&mp_const_none_obj},
 };
 
-//|   .. attribute:: auto_brightness
-//|
-//|     True when the display brightness is adjusted automatically, based on an ambient
+//|     auto_brightness: Any = ...
+//|     """True when the display brightness is adjusted automatically, based on an ambient
 //|     light sensor or other method. Note that some displays may have this set to True by default,
 //|     but not actually implement automatic brightness adjustment. `auto_brightness` is set to False
-//|     if `brightness` is set manually.
+//|     if `brightness` is set manually."""
 //|
 STATIC mp_obj_t framebufferio_framebufferdisplay_obj_get_auto_brightness(mp_obj_t self_in) {
     framebufferio_framebufferdisplay_obj_t *self = native_display(self_in);
@@ -249,9 +247,8 @@ const mp_obj_property_t framebufferio_framebufferdisplay_auto_brightness_obj = {
               (mp_obj_t)&mp_const_none_obj},
 };
 
-//|   .. attribute:: width
-//|
-//|	Gets the width of the framebuffer
+//|     width: Any = ...
+//|	    """Gets the width of the framebuffer"""
 //|
 STATIC mp_obj_t framebufferio_framebufferdisplay_obj_get_width(mp_obj_t self_in) {
     framebufferio_framebufferdisplay_obj_t *self = native_display(self_in);
@@ -266,9 +263,8 @@ const mp_obj_property_t framebufferio_framebufferdisplay_width_obj = {
               (mp_obj_t)&mp_const_none_obj},
 };
 
-//|   .. attribute:: height
-//|
-//|	Gets the height of the framebuffer
+//|     height: Any = ...
+//|	    """Gets the height of the framebuffer"""
 //|
 STATIC mp_obj_t framebufferio_framebufferdisplay_obj_get_height(mp_obj_t self_in) {
     framebufferio_framebufferdisplay_obj_t *self = native_display(self_in);
@@ -283,9 +279,8 @@ const mp_obj_property_t framebufferio_framebufferdisplay_height_obj = {
               (mp_obj_t)&mp_const_none_obj},
 };
 
-//|   .. attribute:: rotation
-//|
-//|     The rotation of the display as an int in degrees.
+//|     rotation: Any = ...
+//|     """The rotation of the display as an int in degrees."""
 //|
 STATIC mp_obj_t framebufferio_framebufferdisplay_obj_get_rotation(mp_obj_t self_in) {
     framebufferio_framebufferdisplay_obj_t *self = native_display(self_in);
@@ -307,9 +302,8 @@ const mp_obj_property_t framebufferio_framebufferdisplay_rotation_obj = {
               (mp_obj_t)&mp_const_none_obj},
 };
 
-//|   .. attribute:: framebuffer
-//|
-//|	The framebuffer being used by the display
+//|     framebuffer: Any = ...
+//|	    """The framebuffer being used by the display"""
 //|
 //|
 STATIC mp_obj_t framebufferio_framebufferdisplay_obj_get_framebuffer(mp_obj_t self_in) {
@@ -326,12 +320,13 @@ const mp_obj_property_t framebufferio_framebufferframebuffer_obj = {
 };
 
 
-//|   .. method:: fill_row(y, buffer)
+//|     def fill_row(self, y: int, buffer: bytearray) -> Any:
+//|         """Extract the pixels from a single row
 //|
-//|     Extract the pixels from a single row
+//|         :param int y: The top edge of the area
+//|         :param bytearray buffer: The buffer in which to place the pixel data"""
+//|         ...
 //|
-//|     :param int y: The top edge of the area
-//|     :param bytearray buffer: The buffer in which to place the pixel data
 STATIC mp_obj_t framebufferio_framebufferdisplay_obj_fill_row(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_y, ARG_buffer };
     static const mp_arg_t allowed_args[] = {
diff --git a/shared-bindings/framebufferio/__init__.c b/shared-bindings/framebufferio/__init__.c
index 88f69bb2c..50725c515 100644
--- a/shared-bindings/framebufferio/__init__.c
+++ b/shared-bindings/framebufferio/__init__.c
@@ -28,7 +28,7 @@
 #include "shared-bindings/framebufferio/__init__.h"
 #include "shared-bindings/framebufferio/FramebufferDisplay.h"
 
-//| :mod:`framebufferio` --- Native framebuffer display driving
+//| """:mod:`framebufferio` --- Native framebuffer display driving
 //| =========================================================================
 //|
 //| .. module:: framebufferio
@@ -46,7 +46,7 @@
 //| .. toctree::
 //|     :maxdepth: 3
 //|
-//|     FramebufferDisplay
+//|     FramebufferDisplay"""
 //|
 
 #if CIRCUITPY_FRAMEBUFFERIO
diff --git a/shared-bindings/frequencyio/FrequencyIn.c b/shared-bindings/frequencyio/FrequencyIn.c
index 6743f8706..270fa87c3 100644
--- a/shared-bindings/frequencyio/FrequencyIn.c
+++ b/shared-bindings/frequencyio/FrequencyIn.c
@@ -35,43 +35,44 @@
 #include "shared-bindings/util.h"
 #include "supervisor/shared/translate.h"
 
-//| .. currentmodule:: frequencyio
+//| class FrequencyIn:
+//|     """.. currentmodule:: frequencyio
 //|
-//| :class:`FrequencyIn` -- Read a frequency signal
-//| ========================================================
+//|     :class:`FrequencyIn` -- Read a frequency signal
+//|     ========================================================
 //|
-//| FrequencyIn is used to measure the frequency, in hertz, of a digital signal
-//| on an incoming pin. Accuracy has shown to be within 10%, if not better. It
-//| is recommended to utilize an average of multiple samples to smooth out readings.
+//|     FrequencyIn is used to measure the frequency, in hertz, of a digital signal
+//|     on an incoming pin. Accuracy has shown to be within 10%, if not better. It
+//|     is recommended to utilize an average of multiple samples to smooth out readings.
 //|
-//| Frequencies below 1KHz are not currently detectable.
+//|     Frequencies below 1KHz are not currently detectable.
 //|
-//| FrequencyIn will not determine pulse width (use ``PulseIn``).
+//|     FrequencyIn will not determine pulse width (use ``PulseIn``)."""
 //|
-//| .. class:: FrequencyIn(pin, capture_period=10)
+//|     def __init__(self, pin: microcontroller.Pin, capture_period: int = 10):
+//|         """Create a FrequencyIn object associated with the given pin.
 //|
-//|   Create a FrequencyIn object associated with the given pin.
+//|         :param ~microcontroller.Pin pin: Pin to read frequency from.
+//|         :param int capture_period: Keyword argument to set the measurement period, in
+//|                                    milliseconds. Default is 10ms; range is 1ms - 500ms.
 //|
-//|   :param ~microcontroller.Pin pin: Pin to read frequency from.
-//|   :param int capture_period: Keyword argument to set the measurement period, in
-//|                              milliseconds. Default is 10ms; range is 1ms - 500ms.
+//|         Read the incoming frequency from a pin::
 //|
-//|   Read the incoming frequency from a pin::
+//|           import frequencyio
+//|           import board
 //|
-//|     import frequencyio
-//|     import board
+//|           frequency = frequencyio.FrequencyIn(board.D11)
 //|
-//|     frequency = frequencyio.FrequencyIn(board.D11)
+//|           # Loop while printing the detected frequency
+//|           while True:
+//|               print(frequency.value)
 //|
-//|     # Loop while printing the detected frequency
-//|     while True:
-//|         print(frequency.value)
-//|
-//|         # Optional clear() will reset the value
-//|         # to zero. Without this, if the incoming
-//|         # signal stops, the last reading will remain
-//|         # as the value.
-//|         frequency.clear()
+//|               # Optional clear() will reset the value
+//|               # to zero. Without this, if the incoming
+//|               # signal stops, the last reading will remain
+//|               # as the value.
+//|               frequency.clear()"""
+//|         ...
 //|
 STATIC mp_obj_t frequencyio_frequencyin_make_new(const mp_obj_type_t *type, size_t n_args,
          const mp_obj_t *pos_args, mp_map_t *kw_args) {
@@ -96,9 +97,9 @@ STATIC mp_obj_t frequencyio_frequencyin_make_new(const mp_obj_type_t *type, size
     return MP_OBJ_FROM_PTR(self);
 }
 
-//|   .. method:: deinit()
-//|
-//|      Deinitialises the FrequencyIn and releases any hardware resources for reuse.
+//|     def deinit(self, ) -> Any:
+//|         """Deinitialises the FrequencyIn and releases any hardware resources for reuse."""
+//|         ...
 //|
 STATIC mp_obj_t frequencyio_frequencyin_deinit(mp_obj_t self_in) {
     frequencyio_frequencyin_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -113,16 +114,16 @@ STATIC void check_for_deinit(frequencyio_frequencyin_obj_t *self) {
     }
 }
 
-//|   .. method:: __enter__()
-//|
-//|      No-op used by Context Managers.
+//|     def __enter__(self, ) -> Any:
+//|         """No-op used by Context Managers."""
+//|         ...
 //|
 //  Provided by context manager helper.
 
-//|   .. method:: __exit__()
-//|
-//|      Automatically deinitializes the hardware when exiting a context. See
-//|      :ref:`lifetime-and-contextmanagers` for more info.
+//|     def __exit__(self, ) -> Any:
+//|         """Automatically deinitializes the hardware when exiting a context. See
+//|         :ref:`lifetime-and-contextmanagers` for more info."""
+//|         ...
 //|
 STATIC mp_obj_t frequencyio_frequencyin_obj___exit__(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
@@ -131,9 +132,9 @@ STATIC mp_obj_t frequencyio_frequencyin_obj___exit__(size_t n_args, const mp_obj
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(frequencyio_frequencyin___exit___obj, 4, 4, frequencyio_frequencyin_obj___exit__);
 
-//|   .. method:: pause()
-//|
-//|     Pause frequency capture.
+//|     def pause(self, ) -> Any:
+//|         """Pause frequency capture."""
+//|         ...
 //|
 STATIC mp_obj_t frequencyio_frequencyin_obj_pause(mp_obj_t self_in) {
     frequencyio_frequencyin_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -144,9 +145,9 @@ STATIC mp_obj_t frequencyio_frequencyin_obj_pause(mp_obj_t self_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(frequencyio_frequencyin_pause_obj, frequencyio_frequencyin_obj_pause);
 
-//|   .. method:: resume()
-//|
-//|     Resumes frequency capture.
+//|     def resume(self, ) -> Any:
+//|         """Resumes frequency capture."""
+//|         ...
 //|
 STATIC mp_obj_t frequencyio_frequencyin_obj_resume(mp_obj_t self_in) {
     frequencyio_frequencyin_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -157,9 +158,9 @@ STATIC mp_obj_t frequencyio_frequencyin_obj_resume(mp_obj_t self_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(frequencyio_frequencyin_resume_obj, frequencyio_frequencyin_obj_resume);
 
-//|   .. method:: clear()
-//|
-//|     Clears the last detected frequency capture value.
+//|     def clear(self, ) -> Any:
+//|         """Clears the last detected frequency capture value."""
+//|         ...
 //|
 
 STATIC mp_obj_t frequencyio_frequencyin_obj_clear(mp_obj_t self_in) {
@@ -171,14 +172,13 @@ STATIC mp_obj_t frequencyio_frequencyin_obj_clear(mp_obj_t self_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(frequencyio_frequencyin_clear_obj, frequencyio_frequencyin_obj_clear);
 
-//|   .. attribute:: capture_period
-//|
-//|     The capture measurement period. Lower incoming frequencies will be measured
+//|     capture_period: Any = ...
+//|     """The capture measurement period. Lower incoming frequencies will be measured
 //|     more accurately with longer capture periods. Higher frequencies are more
 //|     accurate with shorter capture periods.
 //|
-//|   .. note:: When setting a new ``capture_period``, all previous capture information is
-//|             cleared with a call to ``clear()``.
+//|     .. note:: When setting a new ``capture_period``, all previous capture information is
+//|               cleared with a call to ``clear()``."""
 //|
 STATIC mp_obj_t frequencyio_frequencyin_obj_get_capture_period(mp_obj_t self_in) {
     frequencyio_frequencyin_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -204,9 +204,9 @@ const mp_obj_property_t frequencyio_frequencyin_capture_period_obj = {
               (mp_obj_t)&mp_const_none_obj},
 };
 
-//|   .. method:: __get__(index)
-//|
-//|     Returns the value of the last frequency captured.
+//|     def __get__(self, index: Any) -> Any:
+//|         """Returns the value of the last frequency captured."""
+//|         ...
 //|
 STATIC mp_obj_t frequencyio_frequencyin_obj_get_value(mp_obj_t self_in) {
     frequencyio_frequencyin_obj_t *self = MP_OBJ_TO_PTR(self_in);
diff --git a/shared-bindings/frequencyio/__init__.c b/shared-bindings/frequencyio/__init__.c
index 48a026824..219d5f645 100644
--- a/shared-bindings/frequencyio/__init__.c
+++ b/shared-bindings/frequencyio/__init__.c
@@ -33,7 +33,7 @@
 #include "shared-bindings/frequencyio/__init__.h"
 #include "shared-bindings/frequencyio/FrequencyIn.h"
 
-//| :mod:`frequencyio` --- Support for frequency based protocols
+//| """:mod:`frequencyio` --- Support for frequency based protocols
 //| =============================================================
 //|
 //| .. module:: frequencyio
@@ -73,7 +73,7 @@
 //| :py:data:`~frequencyio.FrequencyIn.capture_period`, and then sleep 0.1 seconds.
 //| CircuitPython will automatically turn off FrequencyIn capture when it resets all
 //| hardware after program completion. Use ``deinit()`` or a ``with`` statement
-//| to do it yourself.
+//| to do it yourself."""
 //|
 
 STATIC const mp_rom_map_elem_t frequencyio_module_globals_table[] = {
-- 
cgit v1.2.3


From 4e8de3c554024d3ac89e9ee77b958a6932a64bec Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott@tannewt.org>
Date: Tue, 12 May 2020 17:15:28 -0700
Subject: Swap sphinx to autoapi and the inline stubs

---
 .github/workflows/build.yml                        |   2 +-
 .gitignore                                         |   2 +
 Makefile                                           |   6 +-
 conf.py                                            |  14 +-
 docs/c2rst.py                                      |  31 --
 ports/atmel-samd/README.rst                        |   2 +-
 ports/atmel-samd/bindings/samd/Clock.c             |  36 +-
 ports/atmel-samd/bindings/samd/__init__.c          |  19 +-
 setup.py                                           |   8 +-
 shared-bindings/_bleio/Adapter.c                   |   5 +-
 shared-bindings/_bleio/Address.c                   |   9 +-
 shared-bindings/_bleio/Attribute.c                 |   6 +-
 shared-bindings/_bleio/Characteristic.c            |   9 +-
 shared-bindings/_bleio/CharacteristicBuffer.c      |   7 +-
 shared-bindings/_bleio/Connection.c                |  14 +-
 shared-bindings/_bleio/Descriptor.c                |   6 +-
 shared-bindings/_bleio/PacketBuffer.c              |  26 +-
 shared-bindings/_bleio/ScanEntry.c                 |   9 +-
 shared-bindings/_bleio/ScanResults.c               |   7 +-
 shared-bindings/_bleio/Service.c                   |   7 +-
 shared-bindings/_bleio/UUID.c                      |   9 +-
 shared-bindings/_bleio/__init__.c                  |  26 +-
 shared-bindings/_eve/__init__.c                    |  22 +-
 shared-bindings/_pew/PewPew.c                      |   7 +-
 shared-bindings/_pew/__init__.c                    |  12 +-
 shared-bindings/_pixelbuf/PixelBuf.c               |   7 +-
 shared-bindings/_pixelbuf/__init__.c               |  27 +-
 shared-bindings/_stage/Layer.c                     |   5 +-
 shared-bindings/_stage/Text.c                      |   7 +-
 shared-bindings/_stage/__init__.c                  |  16 +-
 shared-bindings/aesio/__init__.c                   |  17 +-
 shared-bindings/aesio/aes.c                        |  64 ++-
 shared-bindings/analogio/AnalogIn.c                |   5 +-
 shared-bindings/analogio/AnalogOut.c               |   7 +-
 shared-bindings/analogio/__init__.c                |  15 +-
 shared-bindings/audiobusio/I2SOut.c                |   7 +-
 shared-bindings/audiobusio/PDMIn.c                 |   7 +-
 shared-bindings/audiobusio/__init__.c              |  15 +-
 shared-bindings/audiocore/RawSample.c              |  13 +-
 shared-bindings/audiocore/WaveFile.c               |   5 +-
 shared-bindings/audiocore/__init__.c               |  17 +-
 shared-bindings/audioio/AudioOut.c                 |   7 +-
 shared-bindings/audioio/__init__.c                 |  14 +-
 shared-bindings/audiomixer/Mixer.c                 |   7 +-
 shared-bindings/audiomixer/MixerVoice.c            |   5 +-
 shared-bindings/audiomixer/__init__.c              |  16 +-
 shared-bindings/audiomp3/MP3Decoder.c              |   7 +-
 shared-bindings/audiomp3/__init__.c                |  15 +-
 shared-bindings/audiopwmio/PWMAudioOut.c           |   7 +-
 shared-bindings/audiopwmio/__init__.c              |  14 +-
 shared-bindings/bitbangio/I2C.c                    |   5 +-
 shared-bindings/bitbangio/OneWire.c                |   5 +-
 shared-bindings/bitbangio/SPI.c                    |   5 +-
 shared-bindings/bitbangio/__init__.c               |  16 +-
 shared-bindings/board/__init__.c                   |   6 +-
 shared-bindings/busio/I2C.c                        |   5 +-
 shared-bindings/busio/OneWire.c                    |   5 +-
 shared-bindings/busio/SPI.c                        |   7 +-
 shared-bindings/busio/UART.c                       |   5 +-
 shared-bindings/busio/__init__.c                   |  17 +-
 shared-bindings/digitalio/DigitalInOut.c           |   5 +-
 shared-bindings/digitalio/Direction.c              |   5 +-
 shared-bindings/digitalio/DriveMode.c              |   5 +-
 shared-bindings/digitalio/Pull.c                   |   5 +-
 shared-bindings/digitalio/__init__.c               |  17 +-
 shared-bindings/displayio/Bitmap.c                 |   7 +-
 shared-bindings/displayio/ColorConverter.c         |   7 +-
 shared-bindings/displayio/Display.c                |   5 +-
 shared-bindings/displayio/EPaperDisplay.c          |   5 +-
 shared-bindings/displayio/FourWire.c               |   7 +-
 shared-bindings/displayio/Group.c                  |   7 +-
 shared-bindings/displayio/I2CDisplay.c             |   7 +-
 shared-bindings/displayio/OnDiskBitmap.c           |   7 +-
 shared-bindings/displayio/Palette.c                |   7 +-
 shared-bindings/displayio/ParallelBus.c            |   7 +-
 shared-bindings/displayio/Shape.c                  |   7 +-
 shared-bindings/displayio/TileGrid.c               |   5 +-
 shared-bindings/displayio/__init__.c               |  27 +-
 shared-bindings/fontio/BuiltinFont.c               |   7 +-
 shared-bindings/fontio/Glyph.c                     |  31 +-
 shared-bindings/fontio/__init__.c                  |  17 +-
 shared-bindings/framebufferio/FramebufferDisplay.c |   5 +-
 shared-bindings/framebufferio/__init__.c           |  16 +-
 shared-bindings/frequencyio/FrequencyIn.c          |   5 +-
 shared-bindings/frequencyio/__init__.c             |  17 +-
 shared-bindings/gamepad/GamePad.c                  |   7 +-
 shared-bindings/gamepad/__init__.c                 |  12 +-
 shared-bindings/gamepadshift/GamePadShift.c        |   5 +-
 shared-bindings/gamepadshift/__init__.c            |  12 +-
 shared-bindings/help.c                             |  34 --
 shared-bindings/help.rst                           |  31 ++
 shared-bindings/i2cslave/I2CSlave.c                |  36 +-
 shared-bindings/i2cslave/__init__.c                |  14 +-
 shared-bindings/index.rst                          |  10 +-
 shared-bindings/math/__init__.c                    |   7 +-
 shared-bindings/microcontroller/Pin.c              |   7 +-
 shared-bindings/microcontroller/Processor.c        |  11 +-
 shared-bindings/microcontroller/RunMode.c          |   5 +-
 shared-bindings/microcontroller/__init__.c         |  20 +-
 shared-bindings/multiterminal/__init__.c           |   7 +-
 shared-bindings/neopixel_write/__init__.c          |  13 +-
 shared-bindings/network/__init__.c                 |   7 +-
 shared-bindings/nvm/ByteArray.c                    |   8 +-
 shared-bindings/nvm/__init__.c                     |  17 +-
 shared-bindings/os/__init__.c                      |   7 +-
 shared-bindings/ps2io/Ps2.c                        |   5 +-
 shared-bindings/ps2io/__init__.c                   |  14 +-
 shared-bindings/pulseio/PWMOut.c                   |   7 +-
 shared-bindings/pulseio/PulseIn.c                  |  12 +-
 shared-bindings/pulseio/PulseOut.c                 |  13 +-
 shared-bindings/pulseio/__init__.c                 |  16 +-
 shared-bindings/random/__init__.c                  |   7 +-
 shared-bindings/rgbmatrix/RGBMatrix.c              |  14 +-
 shared-bindings/rgbmatrix/__init__.c               |  11 +-
 shared-bindings/rotaryio/IncrementalEncoder.c      |   7 +-
 shared-bindings/rotaryio/__init__.c                |  18 +-
 shared-bindings/rtc/RTC.c                          |  13 +-
 shared-bindings/rtc/__init__.c                     |  16 +-
 shared-bindings/socket/__init__.c                  |   8 +-
 shared-bindings/storage/__init__.c                 |   7 +-
 shared-bindings/struct/__init__.c                  |   9 +-
 shared-bindings/supervisor/Runtime.c               |  11 +-
 shared-bindings/supervisor/__init__.c              |  30 +-
 shared-bindings/terminalio/Terminal.c              |   5 +-
 shared-bindings/terminalio/__init__.c              |  16 +-
 shared-bindings/time/__init__.c                    |   7 +-
 shared-bindings/touchio/TouchIn.c                  |   5 +-
 shared-bindings/touchio/__init__.c                 |  14 +-
 shared-bindings/uheap/__init__.c                   |   6 +-
 shared-bindings/ulab/__init__.pyi                  | 523 +++++++++++++++++++++
 shared-bindings/ulab/__init__.rst                  | 523 ---------------------
 shared-bindings/usb_hid/Device.c                   |   5 +-
 shared-bindings/usb_hid/__init__.c                 |  15 +-
 shared-bindings/usb_midi/PortIn.c                  |   7 +-
 shared-bindings/usb_midi/PortOut.c                 |   5 +-
 shared-bindings/usb_midi/__init__.c                |  17 +-
 shared-bindings/ustack/__init__.c                  |  10 +-
 shared-bindings/wiznet/__init__.c                  |  16 +-
 shared-bindings/wiznet/wiznet5k.c                  |   5 +-
 tools/extract_pyi.py                               |  12 +-
 140 files changed, 860 insertions(+), 1762 deletions(-)
 delete mode 100644 docs/c2rst.py
 delete mode 100644 shared-bindings/help.c
 create mode 100644 shared-bindings/help.rst
 create mode 100644 shared-bindings/ulab/__init__.pyi
 delete mode 100644 shared-bindings/ulab/__init__.rst

(limited to 'shared-bindings/framebufferio/FramebufferDisplay.c')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3dda76db4..057395eee 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -34,7 +34,7 @@ jobs:
       run: |
         sudo apt-get install -y eatmydata
         sudo eatmydata apt-get install -y gettext librsvg2-bin mingw-w64
-        pip install requests sh click setuptools cpp-coveralls "Sphinx<4" sphinx-rtd-theme recommonmark sphinxcontrib-svg2pdfconverter polib pyyaml
+        pip install requests sh click setuptools cpp-coveralls "Sphinx<4" sphinx-rtd-theme recommonmark sphinx-autoapi sphinxcontrib-svg2pdfconverter polib pyyaml
     - name: Versions
       run: |
         gcc --version
diff --git a/.gitignore b/.gitignore
index 435ed73a7..403fcc299 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@
 ############
 dist/
 *.egg-info
+.eggs
 
 # Logs and Databases
 ######################
@@ -51,6 +52,7 @@ _build
 # Generated rst files
 ######################
 genrst/
+autoapi/
 
 # ctags and similar
 ###################
diff --git a/Makefile b/Makefile
index aa8fc26d1..1971076a3 100644
--- a/Makefile
+++ b/Makefile
@@ -69,7 +69,7 @@ clean:
 	rm -rf $(BUILDDIR)/*
 	rm -rf $(STUBDIR) $(DISTDIR) *.egg-info
 
-html:
+html: stubs
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
@@ -213,8 +213,10 @@ check-translate: locale/circuitpython.pot $(wildcard locale/*.po)
 	$(PYTHON) tools/check_translations.py $^
 
 stubs:
+	mkdir -p circuitpython-stubs
 	python tools/extract_pyi.py shared-bindings/ $(STUBDIR)
-	#python setup.py sdist
+	python tools/extract_pyi.py ports/atmel-samd/bindings $(STUBDIR)
+	python setup.py sdist
 
 update-frozen-libraries:
 	@echo "Updating all frozen libraries to latest tagged version."
diff --git a/conf.py b/conf.py
index 2e503737c..aea84dd21 100644
--- a/conf.py
+++ b/conf.py
@@ -55,7 +55,6 @@ extensions = [
     'sphinx.ext.todo',
     'sphinx.ext.coverage',
     'rstjinja',
-    'c2rst',
     'recommonmark',
 ]
 
@@ -66,9 +65,17 @@ templates_path = ['templates']
 source_suffix = {
     '.rst': 'restructuredtext',
     '.md': 'markdown',
-    '.c': ''
 }
 
+extensions.append('autoapi.extension')
+
+autoapi_type = 'python'
+# Uncomment this if debugging autoapi
+# autoapi_keep_files = True
+autoapi_dirs = ['circuitpython-stubs']
+autoapi_add_toctree_entry = False
+autoapi_options = ['members', 'undoc-members', 'private-members', 'show-inheritance', 'special-members', 'show-module-summary']
+autoapi_template_dir = 'docs/autoapi/templates'
 
 # The encoding of source files.
 #source_encoding = 'utf-8-sig'
@@ -78,7 +85,7 @@ source_suffix = {
 
 # General information about the project.
 project = 'Adafruit CircuitPython'
-copyright = '2014-2018, MicroPython & CircuitPython contributors (https://github.com/adafruit/circuitpython/graphs/contributors)'
+copyright = '2014-2020, MicroPython & CircuitPython contributors (https://github.com/adafruit/circuitpython/graphs/contributors)'
 
 # These are overwritten on ReadTheDocs.
 # The version info for the project you're documenting, acts as replacement for
@@ -105,6 +112,7 @@ exclude_patterns = ["**/build*",
                     ".git",
                     ".venv",
                     ".direnv",
+                    "docs/autoapi",
                     "docs/README.md",
                     "drivers",
                     "examples",
diff --git a/docs/c2rst.py b/docs/c2rst.py
deleted file mode 100644
index 76489dca3..000000000
--- a/docs/c2rst.py
+++ /dev/null
@@ -1,31 +0,0 @@
-def c2rst(app, docname, source):
-    """ Pre-parse '.c' & '.h' files that contain rST source.
-    """
-    # Make sure we're outputting HTML
-    if app.builder.format != 'html':
-        return
-
-    fname = app.env.doc2path(docname)
-    if (not fname.endswith(".c") and
-        not fname.endswith(".h")):
-            #print("skipping:", fname)
-            return
-
-    src = source[0]
-
-    stripped = []
-    for line in src.split("\n"):
-        line = line.strip()
-        if line == "//|":
-            stripped.append("")
-        elif line.startswith("//| "):
-            stripped.append(line[len("//| "):])
-    stripped = "\r\n".join(stripped)
-
-    rendered = app.builder.templates.render_string(
-        stripped, app.config.html_context
-    )
-    source[0] = rendered
-
-def setup(app):
-    app.connect("source-read", c2rst)
diff --git a/ports/atmel-samd/README.rst b/ports/atmel-samd/README.rst
index 721177275..a6881902e 100644
--- a/ports/atmel-samd/README.rst
+++ b/ports/atmel-samd/README.rst
@@ -21,4 +21,4 @@ Port Specific modules
 ---------------------
 
 .. toctree::
-    bindings/samd/__init__
+    ../../autoapi/samd/index
diff --git a/ports/atmel-samd/bindings/samd/Clock.c b/ports/atmel-samd/bindings/samd/Clock.c
index b88bb82e2..24e425e8c 100644
--- a/ports/atmel-samd/bindings/samd/Clock.c
+++ b/ports/atmel-samd/bindings/samd/Clock.c
@@ -30,18 +30,12 @@
 #include "py/objproperty.h"
 #include "py/runtime.h"
 
-//| .. currentmodule:: samd
+//| import typing
+//| class Clock:
+//|     """Identifies a clock on the microcontroller.
 //|
-//| :class:`Clock` --- Clock reference
-//| ------------------------------------------
-//|
-//| Identifies a clock on the microcontroller.
-//|
-//| .. class:: Clock
-//|
-//|    Identifies a clock on the microcontroller. They are fixed by the
-//|    hardware so they cannot be constructed on demand. Instead, use
-//|    `samd.clock` to reference the desired clock.
+//|        They are fixed by the hardware so they cannot be constructed on demand. Instead, use
+//|        ``samd.clock`` to reference the desired clock."""
 //|
 
 STATIC void samd_clock_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
@@ -50,9 +44,8 @@ STATIC void samd_clock_print(const mp_print_t *print, mp_obj_t self_in, mp_print
     mp_printf(print, "%q.%q.%q", MP_QSTR_samd, MP_QSTR_clock, self->name);
 }
 
-//|     .. attribute:: enabled
-//|
-//|       Is the clock enabled? (read-only)
+//|     enabled: bool = ...
+//|     """Is the clock enabled? (read-only)"""
 //|
 STATIC mp_obj_t samd_clock_get_enabled(mp_obj_t self_in) {
     samd_clock_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -69,9 +62,8 @@ const mp_obj_property_t samd_clock_enabled_obj = {
     },
 };
 
-//|     .. attribute:: parent
-//|
-//|       Clock parent. (read-only)
+//|     parent: typing.Union(Clock | None) = ...
+//|     """Clock parent. (read-only)"""
 //|
 STATIC mp_obj_t samd_clock_get_parent(mp_obj_t self_in) {
     samd_clock_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -98,9 +90,8 @@ const mp_obj_property_t samd_clock_parent_obj = {
     },
 };
 
-//|     .. attribute:: frequency
-//|
-//|       Clock frequency. (read-only)
+//|     frequency: int = ...
+//|     """Clock frequency in Herz. (read-only)"""
 //|
 STATIC mp_obj_t samd_clock_get_frequency(mp_obj_t self_in) {
     samd_clock_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -117,9 +108,8 @@ const mp_obj_property_t samd_clock_frequency_obj = {
     },
 };
 
-//|     .. attribute:: calibration
-//|
-//|       Clock calibration. Not all clocks can be calibrated.
+//|     calibration: int = ...
+//|     """Clock calibration. Not all clocks can be calibrated."""
 //|
 STATIC mp_obj_t samd_clock_get_calibration(mp_obj_t self_in) {
     samd_clock_obj_t *self = MP_OBJ_TO_PTR(self_in);
diff --git a/ports/atmel-samd/bindings/samd/__init__.c b/ports/atmel-samd/bindings/samd/__init__.c
index 55a10001d..6e9b68ccc 100644
--- a/ports/atmel-samd/bindings/samd/__init__.c
+++ b/ports/atmel-samd/bindings/samd/__init__.c
@@ -30,29 +30,16 @@
 
 #include "bindings/samd/Clock.h"
 
-//| :mod:`samd` --- SAMD implementation settings
-//| =================================================
-//|
-//| .. module:: samd
-//|   :synopsis: SAMD implementation settings
-//|   :platform: SAMD21
-//|
-//| Libraries
-//|
-//| .. toctree::
-//|     :maxdepth: 3
-//|
-//|     Clock
-//|
+//| """SAMD implementation settings"""
 
-//| :mod:`samd.clock` --- samd clock names
+//| """:mod:`samd.clock` --- samd clock names
 //| --------------------------------------------------------
 //|
 //| .. module:: samd.clock
 //|   :synopsis: samd clock names
 //|   :platform: SAMD21
 //|
-//| References to clocks as named by the microcontroller
+//| References to clocks as named by the microcontroller"""
 //|
 const mp_obj_module_t samd_clock_module = {
     .base = { &mp_type_module },
diff --git a/setup.py b/setup.py
index 1e0d81da3..37afb6f1b 100644
--- a/setup.py
+++ b/setup.py
@@ -5,18 +5,16 @@ from pathlib import Path
 stub_root = Path("circuitpython-stubs")
 stubs = [p.relative_to(stub_root).as_posix() for p in stub_root.glob("*.pyi")]
 
-now = datetime.utcnow()
-version = now.strftime("%Y.%m.%d")
-
 setup(
     name="circuitpython-stubs",
     description="PEP 561 type stubs for CircuitPython",
     url="https://github.com/adafruit/circuitpython",
     maintainer="CircuitPythonistas",
     author_email="circuitpython@adafruit.com",
-    version=version,
+    use_scm_version=True,
     license="MIT",
     package_data={"circuitpython-stubs": stubs},
     packages=["circuitpython-stubs"],
-    setup_requires=["setuptools>=38.6.0"],
+    setup_requires=["setuptools>=38.6.0",
+                    "setuptools_scm"],
 )
diff --git a/shared-bindings/_bleio/Adapter.c b/shared-bindings/_bleio/Adapter.c
index 6fb5c323d..4816294f7 100644
--- a/shared-bindings/_bleio/Adapter.c
+++ b/shared-bindings/_bleio/Adapter.c
@@ -48,10 +48,7 @@
 #define WINDOW_DEFAULT (0.1f)
 
 //| class Adapter:
-//|     """.. currentmodule:: _bleio
-//|
-//|     :class:`Adapter` --- BLE adapter
-//|     ----------------------------------------------------
+//|     """BLE adapter
 //|
 //|     The Adapter manages the discovery and connection to other nearby Bluetooth Low Energy devices.
 //|     This part of the Bluetooth Low Energy Specification is known as Generic Access Profile (GAP).
diff --git a/shared-bindings/_bleio/Address.c b/shared-bindings/_bleio/Address.c
index 2071bd3b2..ccbab1b9d 100644
--- a/shared-bindings/_bleio/Address.c
+++ b/shared-bindings/_bleio/Address.c
@@ -35,12 +35,7 @@
 #include "shared-module/_bleio/Address.h"
 
 //| class Address:
-//|     """.. currentmodule:: _bleio
-//|
-//|     :class:`Address` -- BLE address
-//|     =========================================================
-//|
-//|     Encapsulates the address of a BLE device."""
+//|     """Encapsulates the address of a BLE device."""
 //|
 
 //|     def __init__(self, address: buf, address_type: Any):
@@ -97,7 +92,7 @@ STATIC mp_obj_t bleio_address_make_new(const mp_obj_type_t *type, size_t n_args,
 //|       >>> _bleio.adapter.address
 //|       <Address c8:1d:f5:ed:a8:35>
 //|       >>> _bleio.adapter.address.address_bytes
-//|       b'5\xa8\xed\xf5\x1d\xc8'"""
+//|       b'5\\xa8\\xed\\xf5\\x1d\\xc8'"""
 //|
 STATIC mp_obj_t bleio_address_get_address_bytes(mp_obj_t self_in) {
     bleio_address_obj_t *self = MP_OBJ_TO_PTR(self_in);
diff --git a/shared-bindings/_bleio/Attribute.c b/shared-bindings/_bleio/Attribute.c
index 72fd13d1c..6c47c87ba 100644
--- a/shared-bindings/_bleio/Attribute.c
+++ b/shared-bindings/_bleio/Attribute.c
@@ -30,12 +30,8 @@
 #include "shared-bindings/_bleio/UUID.h"
 
 //| class Attribute:
-//|     """.. currentmodule:: _bleio
+//|     """Definitions associated with all BLE attributes: characteristics, descriptors, etc.
 //|
-//|     :class:`Attribute` -- BLE Attribute
-//|     =========================================================
-//|
-//|     Definitions associated with all BLE attributes: characteristics, descriptors, etc.
 //|     :py:class:`~_bleio.Attribute` is, notionally, a superclass of
 //|     :py:class:`~Characteristic` and :py:class:`~Descriptor`,
 //|     but is not defined as a Python superclass of those classes."""
diff --git a/shared-bindings/_bleio/Characteristic.c b/shared-bindings/_bleio/Characteristic.c
index f8f18d0bd..785b677d6 100644
--- a/shared-bindings/_bleio/Characteristic.c
+++ b/shared-bindings/_bleio/Characteristic.c
@@ -34,13 +34,8 @@
 #include "shared-bindings/_bleio/UUID.h"
 
 //| class Characteristic:
-//|     """.. currentmodule:: _bleio
-//|
-//|     :class:`Characteristic` -- BLE service characteristic
-//|     =========================================================
-//|
-//|     Stores information about a BLE service characteristic and allows reading
-//|     and writing of the characteristic's value."""
+//|     """Stores information about a BLE service characteristic and allows reading
+//|        and writing of the characteristic's value."""
 //|
 //|     def __init__(self, ):
 //|         """There is no regular constructor for a Characteristic. A new local Characteristic can be created
diff --git a/shared-bindings/_bleio/CharacteristicBuffer.c b/shared-bindings/_bleio/CharacteristicBuffer.c
index f38f650d9..6cbd587c6 100644
--- a/shared-bindings/_bleio/CharacteristicBuffer.c
+++ b/shared-bindings/_bleio/CharacteristicBuffer.c
@@ -42,12 +42,7 @@ STATIC void raise_error_if_not_connected(bleio_characteristic_buffer_obj_t *self
 }
 
 //| class CharacteristicBuffer:
-//|     """.. currentmodule:: _bleio
-//|
-//|     :class:`CharacteristicBuffer` -- BLE Service incoming values buffer.
-//|     =====================================================================
-//|
-//|     Accumulates a Characteristic's incoming values in a FIFO buffer."""
+//|     """Accumulates a Characteristic's incoming values in a FIFO buffer."""
 //|
 //|     def __init__(self, characteristic: Characteristic, *, timeout: int = 1, buffer_size: int = 64):
 //|
diff --git a/shared-bindings/_bleio/Connection.c b/shared-bindings/_bleio/Connection.c
index 93600e76d..0a96d8a11 100644
--- a/shared-bindings/_bleio/Connection.c
+++ b/shared-bindings/_bleio/Connection.c
@@ -43,12 +43,7 @@
 #include "shared-bindings/_bleio/Service.h"
 
 //| class Connection:
-//|     """.. currentmodule:: _bleio
-//|
-//|     :class:`Connection` -- A BLE connection
-//|     =========================================================
-//|
-//|     A BLE connection to another device. Used to discover and interact with services on the other
+//|     """A BLE connection to another device. Used to discover and interact with services on the other
 //|     device.
 //|
 //|     Usage::
@@ -211,15 +206,14 @@ STATIC mp_obj_t bleio_connection_get_connection_interval(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_connection_get_connection_interval_obj, bleio_connection_get_connection_interval);
 
-//|   .. attribute:: max_packet_length
-//|
-//|     The maximum number of data bytes that can be sent in a single transmission,
+//|     attribute: Any = ...
+//|     """The maximum number of data bytes that can be sent in a single transmission,
 //|     not including overhead bytes.
 //|
 //|     This is the maximum number of bytes that can be sent in a notification,
 //|     which must be sent in a single packet.
 //|     But for a regular characteristic read or write, may be sent in multiple packets,
-//|     so this limit does not apply.
+//|     so this limit does not apply."""
 //|
 STATIC mp_obj_t bleio_connection_get_max_packet_length(mp_obj_t self_in) {
     bleio_connection_obj_t *self = MP_OBJ_TO_PTR(self_in);
diff --git a/shared-bindings/_bleio/Descriptor.c b/shared-bindings/_bleio/Descriptor.c
index 00b3bacf5..9d7020849 100644
--- a/shared-bindings/_bleio/Descriptor.c
+++ b/shared-bindings/_bleio/Descriptor.c
@@ -34,12 +34,8 @@
 #include "shared-bindings/_bleio/UUID.h"
 
 //| class Descriptor:
-//|     """.. currentmodule:: _bleio
+//|     """Stores information about a BLE descriptor.
 //|
-//|     :class:`Descriptor` -- BLE descriptor
-//|     =========================================================
-//|
-//|     Stores information about a BLE descriptor.
 //|     Descriptors are attached to BLE characteristics and provide contextual
 //|     information about the characteristic."""
 //|
diff --git a/shared-bindings/_bleio/PacketBuffer.c b/shared-bindings/_bleio/PacketBuffer.c
index 80beadb15..907bfabd2 100644
--- a/shared-bindings/_bleio/PacketBuffer.c
+++ b/shared-bindings/_bleio/PacketBuffer.c
@@ -36,12 +36,7 @@
 #include "shared-bindings/util.h"
 
 //| class PacketBuffer:
-//|     """.. currentmodule:: _bleio
-//|
-//|     :class:`PacketBuffer` -- Packet-oriented characteristic usage.
-//|     =====================================================================
-//|
-//|     Accumulates a Characteristic's incoming packets in a FIFO buffer and facilitates packet aware
+//|     """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) minus overhead, whichever is smaller. The MTU can change so check `incoming_packet_length`
 //|     and `outgoing_packet_length` before creating a buffer to store data.
@@ -60,7 +55,7 @@
 //|           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.
+//|           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) {
@@ -126,11 +121,11 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(bleio_packet_buffer_readinto_obj, bleio_packet_
 //|         """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."""
-//|         ...
+//|         This does not block until the data is sent. It only blocks until the data is pending.
 //|
-//|     :return: number of bytes written. May include header bytes when packet is empty.
-//|     :rtype: int
+//|         :return: number of bytes written. May include header bytes when packet is empty.
+//|         :rtype: int"""
+//|         ...
 //|
 // TODO: Add a kwarg `merge=False` to dictate whether subsequent writes are merged into a pending
 // one.
@@ -174,7 +169,7 @@ STATIC mp_obj_t bleio_packet_buffer_write(mp_uint_t n_args, const mp_obj_t *pos_
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(bleio_packet_buffer_write_obj, 1, bleio_packet_buffer_write);
 
-//|     def deinit(self, ) -> Any:
+//|     def deinit(self) -> Any:
 //|         """Disable permanently."""
 //|         ...
 STATIC mp_obj_t bleio_packet_buffer_deinit(mp_obj_t self_in) {
@@ -184,7 +179,7 @@ STATIC mp_obj_t bleio_packet_buffer_deinit(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_packet_buffer_deinit_obj, bleio_packet_buffer_deinit);
 
-//|     packet_size: Any = ...
+//|     packet_size: int = ...
 //|     """`packet_size` is the same as `incoming_packet_length`.
 //|     The name `packet_size` is deprecated and
 //|     will be removed in CircuitPython 6.0.0."""
@@ -210,9 +205,8 @@ const mp_obj_property_t bleio_packet_buffer_incoming_packet_length_obj = {
                (mp_obj_t)&mp_const_none_obj },
 };
 
-//|   .. attribute:: outgoing_packet_length
-//|
-//|     Maximum length in bytes of a packet we are writing.
+//|     outgoing_packet_length: int = ...
+//|     """Maximum length in bytes of a packet we are writing."""
 //|
 STATIC mp_obj_t bleio_packet_buffer_get_outgoing_packet_length(mp_obj_t self_in) {
     bleio_packet_buffer_obj_t *self = MP_OBJ_TO_PTR(self_in);
diff --git a/shared-bindings/_bleio/ScanEntry.c b/shared-bindings/_bleio/ScanEntry.c
index a92b247be..905bea81d 100644
--- a/shared-bindings/_bleio/ScanEntry.c
+++ b/shared-bindings/_bleio/ScanEntry.c
@@ -36,12 +36,7 @@
 #include "shared-module/_bleio/ScanEntry.h"
 
 //| class ScanEntry:
-//|     """.. currentmodule:: _bleio
-//|
-//|     :class:`ScanEntry` -- BLE scan data
-//|     =========================================================
-//|
-//|     Encapsulates information about a device that was received during scanning. It can be
+//|     """Encapsulates information about a device that was received during scanning. It can be
 //|     advertisement or scan response data. This object may only be created by a `_bleio.ScanResults`:
 //|     it has no user-visible constructor."""
 //|
@@ -68,7 +63,7 @@ STATIC mp_obj_t bleio_scanentry_matches(mp_uint_t n_args, const mp_obj_t *pos_ar
     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);
 
-    
+
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(args[ARG_prefixes].u_obj, &bufinfo, MP_BUFFER_READ);
     return mp_obj_new_bool(common_hal_bleio_scanentry_matches(self, bufinfo.buf, bufinfo.len, args[ARG_all].u_bool));
diff --git a/shared-bindings/_bleio/ScanResults.c b/shared-bindings/_bleio/ScanResults.c
index 4b274fc68..6077dcbda 100644
--- a/shared-bindings/_bleio/ScanResults.c
+++ b/shared-bindings/_bleio/ScanResults.c
@@ -33,12 +33,7 @@
 #include "shared-bindings/_bleio/ScanResults.h"
 
 //| class ScanResults:
-//|     """.. currentmodule:: _bleio
-//|
-//|     :class:`ScanResults` -- An Iterator over BLE scanning results
-//|     ===============================================================
-//|
-//|     Iterates over advertising data received while scanning. This object is always created
+//|     """Iterates over advertising data received while scanning. This object is always created
 //|     by a `_bleio.Adapter`: it has no user-visible constructor."""
 //|
 STATIC mp_obj_t scanresults_iternext(mp_obj_t self_in) {
diff --git a/shared-bindings/_bleio/Service.c b/shared-bindings/_bleio/Service.c
index 3526ce189..5ca7504f2 100644
--- a/shared-bindings/_bleio/Service.c
+++ b/shared-bindings/_bleio/Service.c
@@ -33,12 +33,7 @@
 #include "shared-bindings/_bleio/UUID.h"
 
 //| class Service:
-//|     """.. currentmodule:: _bleio
-//|
-//|     :class:`Service` -- BLE GATT Service
-//|     =========================================================
-//|
-//|     Stores information about a BLE service and its characteristics."""
+//|     """Stores information about a BLE service and its characteristics."""
 //|
 //|     def __init__(self, uuid: UUID, *, secondary: bool = False):
 //|         """Create a new Service identified by the specified UUID. It can be accessed by all
diff --git a/shared-bindings/_bleio/UUID.c b/shared-bindings/_bleio/UUID.c
index d4b0f84ca..78161b956 100644
--- a/shared-bindings/_bleio/UUID.c
+++ b/shared-bindings/_bleio/UUID.c
@@ -34,12 +34,7 @@
 #include "shared-bindings/_bleio/UUID.h"
 
 //| class UUID:
-//|     """.. currentmodule:: _bleio
-//|
-//|     :class:`UUID` -- BLE UUID
-//|     =========================================================
-//|
-//|     A 16-bit or 128-bit UUID. Can be used for services, characteristics, descriptors and more."""
+//|     """A 16-bit or 128-bit UUID. Can be used for services, characteristics, descriptors and more."""
 //|
 //|     def __init__(self, value: Any):
 //|         """Create a new UUID or UUID object encapsulating the uuid value.
@@ -207,7 +202,7 @@ STATIC mp_obj_t bleio_uuid_pack_into(mp_uint_t n_args, const mp_obj_t *pos_args,
     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);
 
-    
+
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(args[ARG_buffer].u_obj, &bufinfo, MP_BUFFER_WRITE);
 
diff --git a/shared-bindings/_bleio/__init__.c b/shared-bindings/_bleio/__init__.c
index da7bfdd81..90b185f79 100644
--- a/shared-bindings/_bleio/__init__.c
+++ b/shared-bindings/_bleio/__init__.c
@@ -41,13 +41,7 @@
 #include "shared-bindings/_bleio/Service.h"
 #include "shared-bindings/_bleio/UUID.h"
 
-//| """:mod:`_bleio` --- Bluetooth Low Energy (BLE) communication
-//| ================================================================
-//|
-//| .. module:: _bleio
-//|   :synopsis: Bluetooth Low Energy functionality
-//|   :platform: nRF
-//|
+//| """
 //| The `_bleio` module provides necessary low-level functionality for communicating
 //| using Bluetooth Low Energy (BLE). The '_' prefix indicates this module is meant
 //| for internal use by libraries but not by the end user. Its API may change incompatibly
@@ -58,24 +52,6 @@
 //| provides higher-level convenience functionality, including predefined beacons, clients,
 //| servers.
 //|
-//| Libraries
-//|
-//| .. toctree::
-//|     :maxdepth: 3
-//|
-//|     Address
-//|     Adapter
-//|     Attribute
-//|     Characteristic
-//|     CharacteristicBuffer
-//|     Connection
-//|     Descriptor
-//|     PacketBuffer
-//|     ScanEntry
-//|     ScanResults
-//|     Service
-//|     UUID
-//|
 //| .. attribute:: adapter
 //|
 //|   BLE Adapter used to manage device discovery and connections.
diff --git a/shared-bindings/_eve/__init__.c b/shared-bindings/_eve/__init__.c
index 0e78cea16..4fa48f2c7 100644
--- a/shared-bindings/_eve/__init__.c
+++ b/shared-bindings/_eve/__init__.c
@@ -34,28 +34,10 @@
 #include "shared-module/_eve/__init__.h"
 #include "shared-bindings/_eve/__init__.h"
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-//| """:mod:`_eve` --- low-level BridgeTek EVE bindings
-//| ================================================
-//|
-//| .. module:: _eve
-//|   :synopsis: low-level BridgeTek EVE bindings
-//|   :platform: SAMD21/SAMD51
+//| """Low-level BridgeTek EVE bindings
 //|
 //| The `_eve` module provides a class _EVE which
-//| contains methods for constructing EVE command 
+//| contains methods for constructing EVE command
 //| buffers and appending basic graphics commands."""
 //|
 
diff --git a/shared-bindings/_pew/PewPew.c b/shared-bindings/_pew/PewPew.c
index 37188d2b7..82bf04a61 100644
--- a/shared-bindings/_pew/PewPew.c
+++ b/shared-bindings/_pew/PewPew.c
@@ -35,12 +35,7 @@
 #include "supervisor/shared/translate.h"
 
 //| class PewPew:
-//|     """.. currentmodule:: _pew
-//|
-//|     :class:`PewPew` -- LED matrix and button driver
-//|     ===============================================
-//|
-//|     This is an internal module to be used by the ``pew.py`` library from
+//|     """This is an internal module to be used by the ``pew.py`` library from
 //|     https://github.com/pewpew-game/pew-pewpew-standalone-10.x to handle the
 //|     LED matrix display and buttons on the ``pewpew10`` board.
 //|
diff --git a/shared-bindings/_pew/__init__.c b/shared-bindings/_pew/__init__.c
index b6aab6726..6e0070d8e 100644
--- a/shared-bindings/_pew/__init__.c
+++ b/shared-bindings/_pew/__init__.c
@@ -41,17 +41,7 @@ STATIC mp_obj_t get_pressed(void) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_pressed_obj, get_pressed);
 
 
-//| """:mod:`_pew` --- LED matrix driver
-//| ==================================
-//|
-//| .. module:: _pew
-//|   :synopsis: LED matrix driver
-//|   :platform: SAMD21
-//|
-//| .. toctree::
-//|     :maxdepth: 3
-//|
-//|     PewPew"""
+//| """LED matrix driver"""
 //|
 STATIC const mp_rom_map_elem_t pew_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__pew) },
diff --git a/shared-bindings/_pixelbuf/PixelBuf.c b/shared-bindings/_pixelbuf/PixelBuf.c
index 2d1f4fff2..71a91d707 100644
--- a/shared-bindings/_pixelbuf/PixelBuf.c
+++ b/shared-bindings/_pixelbuf/PixelBuf.c
@@ -45,12 +45,7 @@ extern const int32_t colorwheel(float pos);
 static void parse_byteorder(mp_obj_t byteorder_obj, pixelbuf_byteorder_details_t* parsed);
 
 //| class PixelBuf:
-//|     """.. currentmodule:: _pixelbuf
-//|
-//|     :class:`PixelBuf` -- A fast RGB[W] pixel buffer for LED and similar devices
-//|     ===========================================================================
-//|
-//|     :class:`~_pixelbuf.PixelBuf` implements an RGB[W] bytearray abstraction."""
+//|     """A fast RGB[W] pixel buffer for LED and similar devices."""
 //|
 //|     def __init__(self, size: int, *, byteorder: str = "BGR", brightness: float = 0, auto_write: bool = False, header: bytes = b"", trailer: bytes = b""):
 //|         """Create a PixelBuf object of the specified size, byteorder, and bits per pixel.
diff --git a/shared-bindings/_pixelbuf/__init__.c b/shared-bindings/_pixelbuf/__init__.c
index 30656f1c7..bfd479fde 100644
--- a/shared-bindings/_pixelbuf/__init__.c
+++ b/shared-bindings/_pixelbuf/__init__.c
@@ -33,35 +33,22 @@
 #include "shared-bindings/_pixelbuf/PixelBuf.h"
 
 
-//| """:mod:`_pixelbuf` --- Fast RGB(W) pixel buffer and helpers
-//| ===========================================================
-
-//| .. module:: _pixelbuf
-//|   :synopsis: A fast RGB(W) pixel buffer library for like NeoPixel and DotStar.
+//| """A fast RGB(W) pixel buffer library for like NeoPixel and DotStar.
 //|
 //| 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.
+//| Byteorders are configured with strings, such as "RGB" or "RGBD"."""
+// TODO: Pull in docs from pypixelbuf.
 
-//| Libraries
-//|
-//| .. toctree::
-//|     :maxdepth: 3
-//|
-//|     PixelBuf"""
-
-//| def colorwheel(n: Any) -> Any: ...
-//|
-
-//| def wheel(n: Any) -> Any:
+//| def colorwheel(n: int) -> Any:
 //|     """C implementation of the common wheel() function found in many examples.
 //|     Returns the colorwheel RGB value as an integer value for n (usable in :py:class:`PixelBuf`, neopixel, and dotstar)."""
 //|     ...
 //|
-//| .. function:: wheel(n)
-//|     Use of wheel() is deprecated. Please use colorwheel().
+//| def wheel(n: Any) -> Any:
+//|     """Use of wheel() is deprecated. Please use colorwheel()."""
+//|
 
 STATIC mp_obj_t pixelbuf_colorwheel(mp_obj_t n) {
     return MP_OBJ_NEW_SMALL_INT(colorwheel(MP_OBJ_IS_SMALL_INT(n) ? MP_OBJ_SMALL_INT_VALUE(n) : mp_obj_float_get(n)));
diff --git a/shared-bindings/_stage/Layer.c b/shared-bindings/_stage/Layer.c
index 437114cd3..0f8260e53 100644
--- a/shared-bindings/_stage/Layer.c
+++ b/shared-bindings/_stage/Layer.c
@@ -31,10 +31,7 @@
 #include "supervisor/shared/translate.h"
 
 //| class Layer:
-//|     """.. currentmodule:: _stage
-//|
-//|     :class:`Layer` -- Keep information about a single layer of graphics
-//|     ==================================================================="""
+//|     """Keep information about a single layer of graphics"""
 //|
 //|     def __init__(self, width: int, height: int, graphic: bytearray, palette: bytearray, grid: bytearray):
 //|         """Keep internal information about a layer of graphics (either a
diff --git a/shared-bindings/_stage/Text.c b/shared-bindings/_stage/Text.c
index 8797f74db..b0ff1525c 100644
--- a/shared-bindings/_stage/Text.c
+++ b/shared-bindings/_stage/Text.c
@@ -31,13 +31,10 @@
 #include "supervisor/shared/translate.h"
 
 //| class Text:
-//|     """.. currentmodule:: _stage
-//|
-//|     :class:`Text` -- Keep information about a single text of text
-//|     =============================================================="""
+//|     """Keep information about a single grid of text"""
 //|
 //|     def __init__(self, width: int, height: int, font: bytearray, palette: bytearray, chars: bytearray):
-//|         """Keep internal information about a text of text
+//|         """Keep internal information about a grid of text
 //|         in a format suitable for fast rendering
 //|         with the ``render()`` function.
 //|
diff --git a/shared-bindings/_stage/__init__.c b/shared-bindings/_stage/__init__.c
index 6b5c4fd8b..6a5638185 100644
--- a/shared-bindings/_stage/__init__.c
+++ b/shared-bindings/_stage/__init__.c
@@ -34,22 +34,10 @@
 #include "Layer.h"
 #include "Text.h"
 
-//| """:mod:`_stage` --- C-level helpers for animation of sprites on a stage
-//| =====================================================================
-//|
-//| .. module:: _stage
-//|   :synopsis: C-level helpers for animation of sprites on a stage
-//|   :platform: SAMD21
+//| """C-level helpers for animation of sprites on a stage
 //|
 //| The `_stage` module contains native code to speed-up the ```stage`` Library
-//| <https://github.com/python-ugame/circuitpython-stage>`_.
-//| Libraries
-//|
-//| .. toctree::
-//|     :maxdepth: 3
-//|
-//|     Layer
-//|     Text"""
+//| <https://github.com/python-ugame/circuitpython-stage>`_."""
 //|
 //| def render(x0: int, y0: int, x1: int, y1: int, layers: list, buffer: bytearray, display: displayio.Display, scale: int, background: int) -> Any:
 //|     """Render and send to the display a fragment of the screen.
diff --git a/shared-bindings/aesio/__init__.c b/shared-bindings/aesio/__init__.c
index 43dc73e8b..fa2a2c426 100644
--- a/shared-bindings/aesio/__init__.c
+++ b/shared-bindings/aesio/__init__.c
@@ -31,23 +31,10 @@
 
 #include "__init__.h"
 
-//| :mod:`aesio` --- AES encryption routines
-//| ========================================
-//|
-//| .. module:: aesio
-//|   :synopsis: Embedded implementation of AES
+//| """AES encryption routines
 //|
 //| The `AES` module contains classes used to implement encryption
-//| and decryption. It aims to be low overhead in terms of memory.
-//|
-//|
-
-//| Libraries
-//|
-//| .. toctree::
-//|     :maxdepth: 3
-//|
-//|     aes
+//| and decryption. It aims to be low overhead in terms of memory."""
 
 
 STATIC const mp_obj_tuple_t mp_aes_key_size_obj = {
diff --git a/shared-bindings/aesio/aes.c b/shared-bindings/aesio/aes.c
index 4ddcfa898..7a559b0bb 100644
--- a/shared-bindings/aesio/aes.c
+++ b/shared-bindings/aesio/aes.c
@@ -9,35 +9,31 @@
 
 // Defined at the end of this file
 
-//| .. currentmodule:: aesio
+//| class AES:
+//|     """Encrypt and decrypt AES streams"""
 //|
-//| :class:`aesio` -- Encrypt and decrypt AES streams
-//| =====================================================
+//|     def __init__(self, key, mode=0, iv=None, segment_size=8) -> Any:
+//|         """Create a new AES state with the given key.
 //|
-//| An object that represents an AES stream, including the current state.
+//|            :param bytearray key: A 16-, 24-, or 32-byte key
+//|            :param int mode: AES mode to use.  One of: AES.MODE_ECB, AES.MODE_CBC, or
+//|                             AES.MODE_CTR
+//|            :param bytearray iv: Initialization vector to use for CBC or CTR mode
 //|
-//| .. class:: AES(key, mode=0, iv=None, segment_size=8)
+//|            Additional arguments are supported for legacy reasons.
 //|
-//|   Create a new AES state with the given key.
+//|            Encrypting a string::
 //|
-//|   :param bytearray key: A 16-, 24-, or 32-byte key
-//|   :param int mode: AES mode to use.  One of: AES.MODE_ECB, AES.MODE_CBC, or
-//|                    AES.MODE_CTR
-//|   :param bytearray iv: Initialization vector to use for CBC or CTR mode
+//|              import aesio
+//|              from binascii import hexlify
 //|
-//|   Additional arguments are supported for legacy reasons.
-//|
-//|   Encrypting a string::
-//|
-//|     import aesio
-//|     from binascii import hexlify
-//|
-//|     key = b'Sixteen byte key'
-//|     inp = b'Circuit Python!!' # Note: 16-bytes long
-//|     outp = bytearray(len(inp))
-//|     cipher = aesio.AES(key, aesio.mode.MODE_ECB)
-//|     cipher.encrypt_into(inp, outp)
-//|     hexlify(outp)
+//|              key = b'Sixteen byte key'
+//|              inp = b'Circuit Python!!' # Note: 16-bytes long
+//|              outp = bytearray(len(inp))
+//|              cipher = aesio.AES(key, aesio.mode.MODE_ECB)
+//|              cipher.encrypt_into(inp, outp)
+//|              hexlify(outp)"""
+//|         ...
 //|
 
 STATIC mp_obj_t aesio_aes_make_new(const mp_obj_type_t *type, size_t n_args,
@@ -154,12 +150,13 @@ STATIC void validate_length(aesio_aes_obj_t *self, size_t src_length,
   }
 }
 
-//|   .. method:: encrypt_into(src, dest)
+//|     def encrypt_into(src, dest) -> None:
+//|         """Encrypt the buffer from ``src`` into ``dest``.
 //|
-//|      Encrypt the buffer from ``src`` into ``dest``.
-//|      For ECB mode, the buffers must be 16 bytes long.  For CBC mode, the
-//|      buffers must be a multiple of 16 bytes, and must be equal length.  For
-//|      CTX mode, there are no restrictions.
+//|            For ECB mode, the buffers must be 16 bytes long.  For CBC mode, the
+//|            buffers must be a multiple of 16 bytes, and must be equal length.  For
+//|            CTX mode, there are no restrictions."""
+//|         ...
 //|
 STATIC mp_obj_t aesio_aes_encrypt_into(mp_obj_t aesio_obj, mp_obj_t src,
                                        mp_obj_t dest) {
@@ -184,12 +181,13 @@ STATIC mp_obj_t aesio_aes_encrypt_into(mp_obj_t aesio_obj, mp_obj_t src,
 STATIC MP_DEFINE_CONST_FUN_OBJ_3(aesio_aes_encrypt_into_obj,
                                  aesio_aes_encrypt_into);
 
-//|   .. method:: decrypt_into(src, dest)
+//|     def decrypt_into(src, dest) -> None:
 //|
-//|      Decrypt the buffer from ``src`` into ``dest``.
-//|      For ECB mode, the buffers must be 16 bytes long.  For CBC mode, the
-//|      buffers must be a multiple of 16 bytes, and must be equal length.  For
-//|      CTX mode, there are no restrictions.
+//|         """Decrypt the buffer from ``src`` into ``dest``.
+//|            For ECB mode, the buffers must be 16 bytes long.  For CBC mode, the
+//|            buffers must be a multiple of 16 bytes, and must be equal length.  For
+//|            CTX mode, there are no restrictions."""
+//|         ...
 //|
 STATIC mp_obj_t aesio_aes_decrypt_into(mp_obj_t aesio_obj, mp_obj_t src,
                                        mp_obj_t dest) {
diff --git a/shared-bindings/analogio/AnalogIn.c b/shared-bindings/analogio/AnalogIn.c
index 2fb5051eb..bafa287ff 100644
--- a/shared-bindings/analogio/AnalogIn.c
+++ b/shared-bindings/analogio/AnalogIn.c
@@ -37,10 +37,7 @@
 #include "shared-bindings/util.h"
 
 //| class AnalogIn:
-//|     """.. currentmodule:: analogio
-//|
-//|     :class:`AnalogIn` -- read analog voltage
-//|     ============================================
+//|     """Read analog voltage levels
 //|
 //|     Usage::
 //|
diff --git a/shared-bindings/analogio/AnalogOut.c b/shared-bindings/analogio/AnalogOut.c
index 9064bb5dc..a8edcc0ae 100644
--- a/shared-bindings/analogio/AnalogOut.c
+++ b/shared-bindings/analogio/AnalogOut.c
@@ -37,12 +37,7 @@
 #include "supervisor/shared/translate.h"
 
 //| class AnalogOut:
-//|     """.. currentmodule:: analogio
-//|
-//|     :class:`AnalogOut` -- output analog voltage
-//|     ============================================
-//|
-//|     The AnalogOut is used to output analog values (a specific voltage).
+//|     """Output analog values (a specific voltage).
 //|
 //|     Example usage::
 //|
diff --git a/shared-bindings/analogio/__init__.c b/shared-bindings/analogio/__init__.c
index 79627f16a..1f059f340 100644
--- a/shared-bindings/analogio/__init__.c
+++ b/shared-bindings/analogio/__init__.c
@@ -34,25 +34,12 @@
 #include "shared-bindings/analogio/AnalogIn.h"
 #include "shared-bindings/analogio/AnalogOut.h"
 
-//| """:mod:`analogio` --- Analog hardware support
-//| =================================================
-//|
-//| .. module:: analogio
-//|   :synopsis: Analog hardware support
-//|   :platform: SAMD21, ESP8266
+//| """Analog hardware support
 //|
 //| The `analogio` module contains classes to provide access to analog IO
 //| typically implemented with digital-to-analog (DAC) and analog-to-digital
 //| (ADC) converters.
 //|
-//| Libraries
-//|
-//| .. toctree::
-//|     :maxdepth: 3
-//|
-//|     AnalogIn
-//|     AnalogOut
-//|
 //| All classes change hardware state and should be deinitialized when they
 //| are no longer needed if the program continues after use. To do so, either
 //| call :py:meth:`!deinit` or use a context manager. See
diff --git a/shared-bindings/audiobusio/I2SOut.c b/shared-bindings/audiobusio/I2SOut.c
index 724a65a34..d965aac89 100644
--- a/shared-bindings/audiobusio/I2SOut.c
+++ b/shared-bindings/audiobusio/I2SOut.c
@@ -36,12 +36,7 @@
 #include "supervisor/shared/translate.h"
 
 //| class I2SOut:
-//|     """.. currentmodule:: audiobusio
-//|
-//|     :class:`I2SOut` -- Output an I2S audio signal
-//|     ========================================================
-//|
-//|     I2S is used to output an audio signal on an I2S bus."""
+//|     """Output an I2S audio signal"""
 //|
 //|     def __init__(self, bit_clock: microcontroller.Pin, word_select: microcontroller.Pin, data: microcontroller.Pin, *, left_justified: bool):
 //|         """Create a I2SOut object associated with the given pins.
diff --git a/shared-bindings/audiobusio/PDMIn.c b/shared-bindings/audiobusio/PDMIn.c
index 6cc834724..5b950297b 100644
--- a/shared-bindings/audiobusio/PDMIn.c
+++ b/shared-bindings/audiobusio/PDMIn.c
@@ -37,12 +37,7 @@
 #include "supervisor/shared/translate.h"
 
 //| class PDMIn:
-//|     """.. currentmodule:: audiobusio
-//|
-//|     :class:`PDMIn` -- Record an input PDM audio stream
-//|     ========================================================
-//|
-//|     PDMIn can be used to record an input audio signal on a given set of pins."""
+//|     """Record an input PDM audio stream"""
 //|
 //|     def __init__(self, clock_pin: microcontroller.Pin, data_pin: microcontroller.Pin, *, sample_rate: int = 16000, bit_depth: int = 8, mono: bool = True, oversample: int = 64, startup_delay: float = 0.11):
 //|         """Create a PDMIn object associated with the given pins. This allows you to
diff --git a/shared-bindings/audiobusio/__init__.c b/shared-bindings/audiobusio/__init__.c
index c5c387361..89ccbb88b 100644
--- a/shared-bindings/audiobusio/__init__.c
+++ b/shared-bindings/audiobusio/__init__.c
@@ -34,26 +34,13 @@
 #include "shared-bindings/audiobusio/I2SOut.h"
 #include "shared-bindings/audiobusio/PDMIn.h"
 
-//| """:mod:`audiobusio` --- Support for audio input and output over digital bus
-//| =========================================================================
-//|
-//| .. module:: audiobusio
-//|   :synopsis: Support for audio input and output over digital bus
-//|   :platform: SAMD21
+//| """Support for audio input and output over digital buses
 //|
 //| The `audiobusio` module contains classes to provide access to audio IO
 //| over digital buses. These protocols are used to communicate audio to other
 //| chips in the same circuit. It doesn't include audio interconnect protocols
 //| such as S/PDIF.
 //|
-//| Libraries
-//|
-//| .. toctree::
-//|     :maxdepth: 3
-//|
-//|     I2SOut
-//|     PDMIn
-//|
 //| All libraries change hardware state and should be deinitialized when they
 //| are no longer needed. To do so, either call :py:meth:`!deinit` or use a
 //| context manager."""
diff --git a/shared-bindings/audiocore/RawSample.c b/shared-bindings/audiocore/RawSample.c
index 6091fbfc0..c0f9325e6 100644
--- a/shared-bindings/audiocore/RawSample.c
+++ b/shared-bindings/audiocore/RawSample.c
@@ -35,19 +35,8 @@
 #include "shared-bindings/audiocore/RawSample.h"
 #include "supervisor/shared/translate.h"
 
-
-
-
-
-
-
 //| class RawSample:
-//|     """.. currentmodule:: audiocore
-//|
-//|     :class:`RawSample` -- A raw audio sample buffer
-//|     ========================================================
-//|
-//|     An in-memory sound sample"""
+//|     """A raw audio sample buffer in memory"""
 //|
 //|     def __init__(self, buffer: array.array, *, channel_count: int = 1, sample_rate: int = 8000):
 //|         """Create a RawSample based on the given buffer of signed values. If channel_count is more than
diff --git a/shared-bindings/audiocore/WaveFile.c b/shared-bindings/audiocore/WaveFile.c
index 65b42fb6c..a067f6cda 100644
--- a/shared-bindings/audiocore/WaveFile.c
+++ b/shared-bindings/audiocore/WaveFile.c
@@ -34,10 +34,7 @@
 #include "supervisor/shared/translate.h"
 
 //| class WaveFile:
-//|     """.. currentmodule:: audiocore
-//|
-//|     :class:`WaveFile` -- Load a wave file for audio playback
-//|     ========================================================
+//|     """Load a wave file for audio playback
 //|
 //|     A .wav 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
diff --git a/shared-bindings/audiocore/__init__.c b/shared-bindings/audiocore/__init__.c
index 38f91d8ee..b400b9454 100644
--- a/shared-bindings/audiocore/__init__.c
+++ b/shared-bindings/audiocore/__init__.c
@@ -35,22 +35,7 @@
 #include "shared-bindings/audiocore/WaveFile.h"
 //#include "shared-bindings/audiomixer/Mixer.h"
 
-//| """:mod:`audiocore` --- Support for audio samples and mixer
-//| ========================================================
-//|
-//| .. module:: audiocore
-//|   :synopsis: Support for audio samples and mixer
-//|   :platform: SAMD21
-//|
-//| The `audiocore` module contains core classes for audio IO
-//|
-//| Libraries
-//|
-//| .. toctree::
-//|     :maxdepth: 3
-//|
-//|     RawSample
-//|     WaveFile"""
+//| """Support for audio samples"""
 //|
 
 STATIC const mp_rom_map_elem_t audiocore_module_globals_table[] = {
diff --git a/shared-bindings/audioio/AudioOut.c b/shared-bindings/audioio/AudioOut.c
index 84e5e4422..574868202 100644
--- a/shared-bindings/audioio/AudioOut.c
+++ b/shared-bindings/audioio/AudioOut.c
@@ -37,12 +37,7 @@
 #include "supervisor/shared/translate.h"
 
 //| class AudioOut:
-//|     """.. currentmodule:: audioio
-//|
-//|     :class:`AudioOut` -- Output an analog audio signal
-//|     ========================================================
-//|
-//|     AudioOut can be used to output an analog audio signal on a given pin."""
+//|     """Output an analog audio signal"""
 //|
 //|     def __init__(self, left_channel: microcontroller.Pin, *, right_channel: microcontroller.Pin = None, quiescent_value: int = 0x8000):
 //|         """Create a AudioOut object associated with the given pin(s). This allows you to
diff --git a/shared-bindings/audioio/__init__.c b/shared-bindings/audioio/__init__.c
index bc2e26cfc..7ec927834 100644
--- a/shared-bindings/audioio/__init__.c
+++ b/shared-bindings/audioio/__init__.c
@@ -42,22 +42,10 @@
 #include "shared-bindings/audiomixer/Mixer.h"
 #endif
 
-//| """:mod:`audioio` --- Support for audio input and output
-//| ======================================================
-//|
-//| .. module:: audioio
-//|   :synopsis: Support for audio input and output
-//|   :platform: SAMD21
+//| """Support for audio output
 //|
 //| The `audioio` module contains classes to provide access to audio IO.
 //|
-//| Libraries
-//|
-//| .. toctree::
-//|     :maxdepth: 3
-//|
-//|     AudioOut
-//|
 //| All classes change hardware state and should be deinitialized when they
 //| are no longer needed if the program continues after use. To do so, either
 //| call :py:meth:`!deinit` or use a context manager. See
diff --git a/shared-bindings/audiomixer/Mixer.c b/shared-bindings/audiomixer/Mixer.c
index 966581d45..31e62cdae 100644
--- a/shared-bindings/audiomixer/Mixer.c
+++ b/shared-bindings/audiomixer/Mixer.c
@@ -39,12 +39,7 @@
 #include "supervisor/shared/translate.h"
 
 //| class Mixer:
-//|     """.. currentmodule:: audiomixer
-//|
-//|     :class:`Mixer` -- Mixes one or more audio samples together
-//|     ===========================================================
-//|
-//|     Mixer mixes multiple samples into one sample."""
+//|     """Mixes one or more audio samples together into one sample."""
 //|
 //|     def __init__(self, voice_count: int = 2, buffer_size: int = 1024, channel_count: int = 2, bits_per_sample: int = 16, samples_signed: bool = True, sample_rate: int = 8000):
 //|         """Create a Mixer object that can mix multiple channels with the same sample rate.
diff --git a/shared-bindings/audiomixer/MixerVoice.c b/shared-bindings/audiomixer/MixerVoice.c
index 257d9507b..ec5768d2f 100644
--- a/shared-bindings/audiomixer/MixerVoice.c
+++ b/shared-bindings/audiomixer/MixerVoice.c
@@ -38,10 +38,7 @@
 #include "supervisor/shared/translate.h"
 
 //| class MixerVoice:
-//|     """.. currentmodule:: audiomixer
-//|
-//|     :class:`MixerVoice` -- Voice objects used with Mixer
-//|     =====================================================
+//|     """Voice objects used with Mixer
 //|
 //|     Used to access and control samples with `audiomixer.Mixer`."""
 //|
diff --git a/shared-bindings/audiomixer/__init__.c b/shared-bindings/audiomixer/__init__.c
index c90a4a0e6..1146bb798 100644
--- a/shared-bindings/audiomixer/__init__.c
+++ b/shared-bindings/audiomixer/__init__.c
@@ -32,21 +32,7 @@
 #include "shared-bindings/microcontroller/Pin.h"
 #include "shared-bindings/audiomixer/Mixer.h"
 
-//| """:mod:`audiomixer` --- Support for audio mixer
-//| ========================================================
-//|
-//| .. module:: audiomixer
-//|   :synopsis: Support for audio mixer
-//|
-//| The `audiomixer` module contains core classes for mixing audio sources
-//|
-//| Libraries
-//|
-//| .. toctree::
-//|     :maxdepth: 3
-//|
-//|     Mixer
-//|     MixerVoice"""
+//| """Support for audio mixing"""
 //|
 
 STATIC const mp_rom_map_elem_t audiomixer_module_globals_table[] = {
diff --git a/shared-bindings/audiomp3/MP3Decoder.c b/shared-bindings/audiomp3/MP3Decoder.c
index d9c85bbf6..e6d48e32c 100644
--- a/shared-bindings/audiomp3/MP3Decoder.c
+++ b/shared-bindings/audiomp3/MP3Decoder.c
@@ -35,12 +35,7 @@
 #include "supervisor/shared/translate.h"
 
 //| class MP3:
-//|     """.. currentmodule:: audiomp3
-//|
-//|     :class:`MP3Decoder` -- Load a mp3 file for audio playback
-//|     =========================================================
-//|
-//|     An object that decodes MP3 files for playback on an audio device."""
+//|     """Load a mp3 file for audio playback"""
 //|
 //|     def __init__(self, file: typing.BinaryIO, buffer: bytearray):
 //|
diff --git a/shared-bindings/audiomp3/__init__.c b/shared-bindings/audiomp3/__init__.c
index 50b29da52..62e5f56cb 100644
--- a/shared-bindings/audiomp3/__init__.c
+++ b/shared-bindings/audiomp3/__init__.c
@@ -31,20 +31,7 @@
 
 #include "shared-bindings/audiomp3/MP3Decoder.h"
 
-//| """:mod:`audiomp3` --- Support for MP3-compressed audio files
-//| ==========================================================
-//|
-//| .. module:: audiomp3
-//|   :synopsis: Support for mp3 files
-//|
-//| The `audiomp3` module contains an mp3 decoder
-//|
-//| Libraries
-//|
-//| .. toctree::
-//|     :maxdepth: 3
-//|
-//|     MP3Decoder"""
+//| """Support for MP3-compressed audio files"""
 //|
 
 STATIC const mp_rom_map_elem_t audiomp3_module_globals_table[] = {
diff --git a/shared-bindings/audiopwmio/PWMAudioOut.c b/shared-bindings/audiopwmio/PWMAudioOut.c
index 17f82e3f6..d6b102317 100644
--- a/shared-bindings/audiopwmio/PWMAudioOut.c
+++ b/shared-bindings/audiopwmio/PWMAudioOut.c
@@ -37,12 +37,7 @@
 #include "supervisor/shared/translate.h"
 
 //| class PWMAudioOut:
-//|     """.. currentmodule:: audiopwmio
-//|
-//|     :class:`PWMAudioOut` -- Output an analog audio signal
-//|     ========================================================
-//|
-//|     AudioOut can be used to output an analog audio signal on a given pin."""
+//|     """Output an analog audio signal by varying the PWM duty cycle."""
 //|
 //|     def __init__(self, left_channel: microcontroller.Pin, *, right_channel: microcontroller.Pin = None, quiescent_value: int = 0x8000):
 //|         """Create a PWMAudioOut object associated with the given pin(s). This allows you to
diff --git a/shared-bindings/audiopwmio/__init__.c b/shared-bindings/audiopwmio/__init__.c
index 74d22b45e..5caea1420 100644
--- a/shared-bindings/audiopwmio/__init__.c
+++ b/shared-bindings/audiopwmio/__init__.c
@@ -33,22 +33,10 @@
 #include "shared-bindings/audiopwmio/__init__.h"
 #include "shared-bindings/audiopwmio/PWMAudioOut.h"
 
-//| """:mod:`audiopwmio` --- Support for audio input and output
-//| ========================================================
-//|
-//| .. module:: audiopwmio
-//|   :synopsis: Support for audio output via digital PWM
-//|   :platform: NRF52
+//| """Audio output via digital PWM
 //|
 //| The `audiopwmio` module contains classes to provide access to audio IO.
 //|
-//| Libraries
-//|
-//| .. toctree::
-//|     :maxdepth: 3
-//|
-//|     PWMAudioOut
-//|
 //| All classes change hardware state and should be deinitialized when they
 //| are no longer needed if the program continues after use. To do so, either
 //| call :py:meth:`!deinit` or use a context manager. See
diff --git a/shared-bindings/bitbangio/I2C.c b/shared-bindings/bitbangio/I2C.c
index a682e050e..2043fc903 100644
--- a/shared-bindings/bitbangio/I2C.c
+++ b/shared-bindings/bitbangio/I2C.c
@@ -38,10 +38,7 @@
 #include "supervisor/shared/translate.h"
 
 //| class I2C:
-//|     """.. currentmodule:: bitbangio
-//|
-//|     :class:`I2C` --- Two wire serial protocol
-//|     ------------------------------------------"""
+//|     """Two wire serial protocol"""
 //|
 //|     def __init__(self, scl: microcontroller.Pin, sda: microcontroller.Pin, *, frequency: int = 400000, timeout: int):
 //|         """I2C is a two-wire protocol for communicating between devices.  At the
diff --git a/shared-bindings/bitbangio/OneWire.c b/shared-bindings/bitbangio/OneWire.c
index 1c9405bd8..a236f4c2a 100644
--- a/shared-bindings/bitbangio/OneWire.c
+++ b/shared-bindings/bitbangio/OneWire.c
@@ -35,10 +35,7 @@
 #include "shared-bindings/util.h"
 
 //| class OneWire:
-//|     """.. currentmodule:: bitbangio
-//|
-//|     :class:`OneWire` -- Lowest-level of the Maxim OneWire protocol
-//|     ===============================================================
+//|     """Lowest-level of the Maxim OneWire protocol
 //|
 //|     :class:`~bitbangio.OneWire` implements the timing-sensitive foundation of
 //|     the Maxim (formerly Dallas Semi) OneWire protocol.
diff --git a/shared-bindings/bitbangio/SPI.c b/shared-bindings/bitbangio/SPI.c
index 38e0926e8..08bbf1257 100644
--- a/shared-bindings/bitbangio/SPI.c
+++ b/shared-bindings/bitbangio/SPI.c
@@ -40,10 +40,7 @@
 #include "supervisor/shared/translate.h"
 
 //| class SPI:
-//|     """.. currentmodule:: bitbangio
-//|
-//|     :class:`SPI` -- a 3-4 wire serial protocol
-//|     -----------------------------------------------
+//|     """A 3-4 wire serial protocol
 //|
 //|     SPI is a serial protocol that has exclusive pins for data in and out of the
 //|     master.  It is typically faster than :py:class:`~bitbangio.I2C` because a
diff --git a/shared-bindings/bitbangio/__init__.c b/shared-bindings/bitbangio/__init__.c
index e9600a7e6..e04bdf701 100644
--- a/shared-bindings/bitbangio/__init__.c
+++ b/shared-bindings/bitbangio/__init__.c
@@ -40,12 +40,7 @@
 
 #include "py/runtime.h"
 
-//| """:mod:`bitbangio` --- Digital protocols implemented by the CPU
-//| =============================================================
-//|
-//| .. module:: bitbangio
-//|   :synopsis: Digital protocols implemented by the CPU
-//|   :platform: SAMD21, ESP8266
+//| """Digital protocols implemented by the CPU
 //|
 //| The `bitbangio` module contains classes to provide digital bus protocol
 //| support regardless of whether the underlying hardware exists to use the
@@ -55,15 +50,6 @@
 //| hardware to implement the protocols. Native implementations will be faster
 //| than bitbanged versions and have more capabilities.
 //|
-//| Libraries
-//|
-//| .. toctree::
-//|     :maxdepth: 3
-//|
-//|     I2C
-//|     OneWire
-//|     SPI
-//|
 //| All classes change hardware state and should be deinitialized when they
 //| are no longer needed if the program continues after use. To do so, either
 //| call :py:meth:`!deinit` or use a context manager. See
diff --git a/shared-bindings/board/__init__.c b/shared-bindings/board/__init__.c
index 77675e093..010a9fb92 100644
--- a/shared-bindings/board/__init__.c
+++ b/shared-bindings/board/__init__.c
@@ -29,11 +29,7 @@
 
 #include "shared-bindings/board/__init__.h"
 
-//| """:mod:`board` --- Board specific pin names
-//| ========================================================
-//|
-//| .. module:: board
-//|   :synopsis: Board specific pin names
+//| """Board specific pin names
 //|
 //| Common container for board base pin names. These will vary from board to
 //| board so don't expect portability when using this module.
diff --git a/shared-bindings/busio/I2C.c b/shared-bindings/busio/I2C.c
index 8ae3658ee..7e8af765f 100644
--- a/shared-bindings/busio/I2C.c
+++ b/shared-bindings/busio/I2C.c
@@ -37,10 +37,7 @@
 #include "supervisor/shared/translate.h"
 
 //| class I2C:
-//|     """.. currentmodule:: busio
-//|
-//|     :class:`I2C` --- Two wire serial protocol
-//|     ------------------------------------------"""
+//|     """Two wire serial protocol"""
 //|
 //|     def __init__(self, scl: microcontroller.Pin, sda: microcontroller.Pin, *, frequency: int = 400000, timeout: int = 255):
 //|
diff --git a/shared-bindings/busio/OneWire.c b/shared-bindings/busio/OneWire.c
index 556e567ef..723cc031a 100644
--- a/shared-bindings/busio/OneWire.c
+++ b/shared-bindings/busio/OneWire.c
@@ -35,10 +35,7 @@
 #include "shared-bindings/util.h"
 
 //| class OneWire:
-//|     """.. currentmodule:: busio
-//|
-//|     :class:`OneWire` -- Lowest-level of the Maxim OneWire protocol
-//|     ================================================================="""
+//|     """Lowest-level of the Maxim OneWire protocol"""
 //|
 //|     def __init__(self, pin: microcontroller.Pin):
 //|         """(formerly Dallas Semi) OneWire protocol.
diff --git a/shared-bindings/busio/SPI.c b/shared-bindings/busio/SPI.c
index 5b1881702..2ba9a4c22 100644
--- a/shared-bindings/busio/SPI.c
+++ b/shared-bindings/busio/SPI.c
@@ -42,10 +42,7 @@
 
 
 //| class SPI:
-//|     """.. currentmodule:: busio
-//|
-//|     `SPI` -- a 3-4 wire serial protocol
-//|     -----------------------------------------------
+//|     """A 3-4 wire serial protocol
 //|
 //|     SPI is a serial protocol that has exclusive pins for data in and out of the
 //|     master.  It is typically faster than :py:class:`~busio.I2C` because a
@@ -147,7 +144,7 @@ STATIC void check_for_deinit(busio_spi_obj_t *self) {
 //|     def configure(self, *, baudrate: int = 100000, polarity: int = 0, phase: int = 0, bits: int = 8) -> Any:
 //|         """Configures the SPI bus. The SPI object must be locked.
 //|
-//|        :param int baudrate: the desired clock rate in Hertz. The actual clock rate may be higher or lower
+//|         :param int baudrate: the desired clock rate in Hertz. The actual clock rate may be higher or lower
 //|           due to the granularity of available clock settings.
 //|           Check the `frequency` attribute for the actual clock rate.
 //|         :param int polarity: the base state of the clock line (0 or 1)
diff --git a/shared-bindings/busio/UART.c b/shared-bindings/busio/UART.c
index 5984194a9..d4642225c 100644
--- a/shared-bindings/busio/UART.c
+++ b/shared-bindings/busio/UART.c
@@ -43,10 +43,7 @@
 // #define STREAM_DEBUG(...) mp_printf(&mp_plat_print __VA_OPT__(,) __VA_ARGS__)
 
 //| class UART:
-//|     """.. currentmodule:: busio
-//|
-//|     :class:`UART` -- a bidirectional serial protocol
-//|     ================================================="""
+//|     """A bidirectional serial protocol"""
 //|     def __init__(self, tx: microcontroller.Pin, rx: microcontroller.Pin, *, baudrate: int = 9600, bits: int = 8, parity: Parity = None, stop: int = 1, timeout: float = 1, receiver_buffer_size: int = 64):
 //|         """A common bidirectional serial protocol that uses an an agreed upon speed
 //|         rather than a shared clock line.
diff --git a/shared-bindings/busio/__init__.c b/shared-bindings/busio/__init__.c
index 212b3218c..04632c2f4 100644
--- a/shared-bindings/busio/__init__.c
+++ b/shared-bindings/busio/__init__.c
@@ -38,12 +38,7 @@
 
 #include "py/runtime.h"
 
-//| """:mod:`busio` --- Hardware accelerated behavior
-//| =================================================
-//|
-//| .. module:: busio
-//|   :synopsis: Hardware accelerated behavior
-//|   :platform: SAMD21
+//| """Hardware accelerated external bus access
 //|
 //| The `busio` module contains classes to support a variety of serial
 //| protocols.
@@ -54,16 +49,6 @@
 //| then a RuntimeError will be raised. Use the `bitbangio` module to explicitly
 //| bitbang a serial protocol on any general purpose pins.
 //|
-//| Libraries
-//|
-//| .. toctree::
-//|     :maxdepth: 3
-//|
-//|     I2C
-//|     OneWire
-//|     SPI
-//|     UART
-//|
 //| All classes change hardware state and should be deinitialized when they
 //| are no longer needed if the program continues after use. To do so, either
 //| call :py:meth:`!deinit` or use a context manager. See
diff --git a/shared-bindings/digitalio/DigitalInOut.c b/shared-bindings/digitalio/DigitalInOut.c
index 5fffb3f65..54ced099d 100644
--- a/shared-bindings/digitalio/DigitalInOut.c
+++ b/shared-bindings/digitalio/DigitalInOut.c
@@ -44,10 +44,7 @@
 #include "supervisor/shared/translate.h"
 
 //| class DigitalInOut:
-//|     """.. currentmodule:: digitalio
-//|
-//|     :class:`DigitalInOut` -- digital input and output
-//|     =========================================================
+//|     """Digital input and output
 //|
 //|     A DigitalInOut is used to digitally control I/O pins. For analog control of
 //|     a pin, see the :py:class:`analogio.AnalogIn` and
diff --git a/shared-bindings/digitalio/Direction.c b/shared-bindings/digitalio/Direction.c
index 0586e95de..dbd0e93e4 100644
--- a/shared-bindings/digitalio/Direction.c
+++ b/shared-bindings/digitalio/Direction.c
@@ -39,10 +39,7 @@
 #include "shared-bindings/digitalio/DigitalInOut.h"
 
 //| class Direction:
-//|     """.. currentmodule:: digitalio
-//|
-//|     :class:`Direction` -- defines the direction of a digital pin
-//|     ============================================================="""
+//|     """Defines the direction of a digital pin"""
 //|
 //|     def __init__(self, ):
 //|         """Enum-like class to define which direction the digital values are
diff --git a/shared-bindings/digitalio/DriveMode.c b/shared-bindings/digitalio/DriveMode.c
index 23745b046..31b682d38 100644
--- a/shared-bindings/digitalio/DriveMode.c
+++ b/shared-bindings/digitalio/DriveMode.c
@@ -27,10 +27,7 @@
 #include "shared-bindings/digitalio/DriveMode.h"
 
 //| class DriveMode:
-//|     """.. currentmodule:: digitalio
-//|
-//|     :class:`DriveMode` -- defines the drive mode of a digital pin
-//|     ============================================================="""
+//|     """Defines the drive mode of a digital pin"""
 //|
 //|     def __init__(self, ):
 //|         """Enum-like class to define the drive mode used when outputting
diff --git a/shared-bindings/digitalio/Pull.c b/shared-bindings/digitalio/Pull.c
index 1e64d0788..9aeec1f33 100644
--- a/shared-bindings/digitalio/Pull.c
+++ b/shared-bindings/digitalio/Pull.c
@@ -27,10 +27,7 @@
 #include "shared-bindings/digitalio/Pull.h"
 
 //| class Pull:
-//|     """.. currentmodule:: digitalio
-//|
-//|     :class:`Pull` -- defines the pull of a digital input pin
-//|     ============================================================="""
+//|     """Defines the pull of a digital input pin"""
 //|
 //|     def __init__(self, ):
 //|         """Enum-like class to define the pull value, if any, used while reading
diff --git a/shared-bindings/digitalio/__init__.c b/shared-bindings/digitalio/__init__.c
index 5a11436a2..f8f45b158 100644
--- a/shared-bindings/digitalio/__init__.c
+++ b/shared-bindings/digitalio/__init__.c
@@ -38,25 +38,10 @@
 
 #include "py/runtime.h"
 
-//| """:mod:`digitalio` --- Basic digital pin support
-//| =================================================
-//|
-//| .. module:: digitalio
-//|   :synopsis: Basic digital pin support
-//|   :platform: SAMD21, ESP8266
+//| """Basic digital pin support
 //|
 //| The `digitalio` module contains classes to provide access to basic digital IO.
 //|
-//| Libraries
-//|
-//| .. toctree::
-//|     :maxdepth: 3
-//|
-//|     DigitalInOut
-//|     Direction
-//|     DriveMode
-//|     Pull
-//|
 //| All classes change hardware state and should be deinitialized when they
 //| are no longer needed if the program continues after use. To do so, either
 //| call :py:meth:`!deinit` or use a context manager. See
diff --git a/shared-bindings/displayio/Bitmap.c b/shared-bindings/displayio/Bitmap.c
index d15c3b107..a52840f2e 100644
--- a/shared-bindings/displayio/Bitmap.c
+++ b/shared-bindings/displayio/Bitmap.c
@@ -37,12 +37,7 @@
 #include "supervisor/shared/translate.h"
 
 //| class Bitmap:
-//|     """.. currentmodule:: displayio
-//|
-//|     :class:`Bitmap` -- Stores values in a 2D array
-//|     ==========================================================================
-//|
-//|     Stores values of a certain size in a 2D array"""
+//|     """Stores values of a certain size in a 2D array"""
 //|
 //|     def __init__(self, width: int, height: int, value_count: int):
 //|         """Create a Bitmap object with the given fixed size. Each pixel stores a value that is used to
diff --git a/shared-bindings/displayio/ColorConverter.c b/shared-bindings/displayio/ColorConverter.c
index 1d6e5a0cc..505e9f766 100644
--- a/shared-bindings/displayio/ColorConverter.c
+++ b/shared-bindings/displayio/ColorConverter.c
@@ -37,12 +37,7 @@
 #include "supervisor/shared/translate.h"
 
 //| class ColorConverter:
-//|     """.. currentmodule:: displayio
-//|
-//|     :class:`ColorConverter` -- Converts one color format to another
-//|     =========================================================================================
-//|
-//|     Converts one color format to another."""
+//|     """Converts one color format to another."""
 //|
 //|     def __init__(self, *, dither: bool = False):
 //|         """Create a ColorConverter object to convert color formats. Only supports RGB888 to RGB565
diff --git a/shared-bindings/displayio/Display.c b/shared-bindings/displayio/Display.c
index 12abec1c8..62ef0f5d0 100644
--- a/shared-bindings/displayio/Display.c
+++ b/shared-bindings/displayio/Display.c
@@ -40,10 +40,7 @@
 #include "supervisor/shared/translate.h"
 
 //| class Display:
-//|     """.. currentmodule:: displayio
-//|
-//|     :class:`Display` -- Manage updating a display over a display bus
-//|     ==========================================================================
+//|     """Manage updating a display over a display bus
 //|
 //|     This initializes a display and connects it into CircuitPython. Unlike other
 //|     objects in CircuitPython, Display objects live until `displayio.release_displays()`
diff --git a/shared-bindings/displayio/EPaperDisplay.c b/shared-bindings/displayio/EPaperDisplay.c
index 8b03ddc06..8b77e4df3 100644
--- a/shared-bindings/displayio/EPaperDisplay.c
+++ b/shared-bindings/displayio/EPaperDisplay.c
@@ -40,10 +40,7 @@
 #include "supervisor/shared/translate.h"
 
 //| class EPaperDisplay:
-//|     """.. currentmodule:: displayio
-//|
-//|     :class:`EPaperDisplay` -- Manage updating an epaper display over a display bus
-//|     ==============================================================================
+//|     """Manage updating an epaper display over a display bus
 //|
 //|     This initializes an epaper display and connects it into CircuitPython. Unlike other
 //|     objects in CircuitPython, EPaperDisplay objects live until `displayio.release_displays()`
diff --git a/shared-bindings/displayio/FourWire.c b/shared-bindings/displayio/FourWire.c
index 649045039..5ee4ec5a9 100644
--- a/shared-bindings/displayio/FourWire.c
+++ b/shared-bindings/displayio/FourWire.c
@@ -39,12 +39,7 @@
 #include "supervisor/shared/translate.h"
 
 //| class FourWire:
-//|     """.. currentmodule:: displayio
-//|
-//|     :class:`FourWire` -- Manage updating a display over SPI four wire protocol
-//|     ==========================================================================
-//|
-//|     Manage updating a display over SPI four wire protocol in the background while Python code runs.
+//|     """Manage updating a display over SPI four wire protocol in the background while Python code runs.
 //|     It doesn't handle display initialization."""
 //|
 //|     def __init__(self, spi_bus: busio.SPI, *, command: microcontroller.Pin, chip_select: microcontroller.Pin, reset: microcontroller.Pin = None, baudrate: int = 24000000, polarity: int = 0, phase: int = 0):
diff --git a/shared-bindings/displayio/Group.c b/shared-bindings/displayio/Group.c
index 36e137dc9..b6f96883b 100644
--- a/shared-bindings/displayio/Group.c
+++ b/shared-bindings/displayio/Group.c
@@ -36,12 +36,7 @@
 #include "supervisor/shared/translate.h"
 
 //| class Group:
-//|     """.. currentmodule:: displayio
-//|
-//|     :class:`Group` -- Group together sprites and subgroups
-//|     ==========================================================================
-//|
-//|     Manage a group of sprites and groups and how they are inter-related."""
+//|     """Manage a group of sprites and groups and how they are inter-related."""
 //|
 //|     def __init__(self, *, max_size: int = 4, scale: int = 1, x: int = 0, y: int = 0):
 //|         """Create a Group of a given size and scale. Scale is in one dimension. For example, scale=2
diff --git a/shared-bindings/displayio/I2CDisplay.c b/shared-bindings/displayio/I2CDisplay.c
index e2402dc49..0cfac6672 100644
--- a/shared-bindings/displayio/I2CDisplay.c
+++ b/shared-bindings/displayio/I2CDisplay.c
@@ -39,12 +39,7 @@
 #include "supervisor/shared/translate.h"
 
 //| class I2CDisplay:
-//|     """.. currentmodule:: displayio
-//|
-//|     :class:`I2CDisplay` -- Manage updating a display over I2C
-//|     ==========================================================================
-//|
-//|     Manage updating a display over I2C in the background while Python code runs.
+//|     """Manage updating a display over I2C in the background while Python code runs.
 //|     It doesn't handle display initialization."""
 //|
 //|     def __init__(self, i2c_bus: busio.I2C, *, device_address: int, reset: microcontroller.Pin = None):
diff --git a/shared-bindings/displayio/OnDiskBitmap.c b/shared-bindings/displayio/OnDiskBitmap.c
index 95c890c3b..170873653 100644
--- a/shared-bindings/displayio/OnDiskBitmap.c
+++ b/shared-bindings/displayio/OnDiskBitmap.c
@@ -34,12 +34,7 @@
 #include "shared-bindings/displayio/OnDiskBitmap.h"
 
 //| class OnDiskBitmap:
-//|     """.. currentmodule:: displayio
-//|
-//|     :class:`OnDiskBitmap` -- Loads pixels straight from disk
-//|     ==========================================================================
-//|
-//|     Loads values straight from disk. This minimizes memory use but can lead to
+//|     """Loads values straight from disk. This minimizes memory use but can lead to
 //|     much slower pixel load times. These load times may result in frame tearing where only part of
 //|     the image is visible.
 //|
diff --git a/shared-bindings/displayio/Palette.c b/shared-bindings/displayio/Palette.c
index 5df11d2b1..871b2b06a 100644
--- a/shared-bindings/displayio/Palette.c
+++ b/shared-bindings/displayio/Palette.c
@@ -43,12 +43,7 @@
 
 
 //| class Palette:
-//|     """.. currentmodule:: displayio
-//|
-//|     :class:`Palette` -- Stores a mapping from bitmap pixel palette_indexes to display colors
-//|     =========================================================================================
-//|
-//|     Map a pixel palette_index to a full color. Colors are transformed to the display's format internally to
+//|     """Map a pixel palette_index to a full color. Colors are transformed to the display's format internally to
 //|     save memory."""
 //|
 //|     def __init__(self, color_count: int):
diff --git a/shared-bindings/displayio/ParallelBus.c b/shared-bindings/displayio/ParallelBus.c
index cedcf1de5..eb75ecc03 100644
--- a/shared-bindings/displayio/ParallelBus.c
+++ b/shared-bindings/displayio/ParallelBus.c
@@ -38,12 +38,7 @@
 #include "supervisor/shared/translate.h"
 
 //| class ParallelBus:
-//|     """.. currentmodule:: displayio
-//|
-//|     :class:`ParallelBus` -- Manage updating a display over 8-bit parallel bus
-//|     ==============================================================================
-//|
-//|     Manage updating a display over 8-bit parallel bus in the background while Python code runs. This
+//|     """Manage updating a display over 8-bit parallel bus in the background while Python code runs. This
 //|     protocol may be refered to as 8080-I Series Parallel Interface in datasheets. It doesn't handle
 //|     display initialization."""
 //|
diff --git a/shared-bindings/displayio/Shape.c b/shared-bindings/displayio/Shape.c
index 0f22bb2a3..fce89c771 100644
--- a/shared-bindings/displayio/Shape.c
+++ b/shared-bindings/displayio/Shape.c
@@ -35,12 +35,7 @@
 #include "supervisor/shared/translate.h"
 
 //| class Shape:
-//|     """.. currentmodule:: displayio
-//|
-//|     :class:`Shape` -- Represents a shape by defining its bounds on each row
-//|     ==========================================================================
-//|
-//|     Represents any shape made by defining boundaries that may be mirrored."""
+//|     """Represents a shape made by defining boundaries that may be mirrored."""
 //|
 //|     def __init__(self, width: int, height: int, *, mirror_x: bool = False, mirror_y: bool = 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/displayio/TileGrid.c b/shared-bindings/displayio/TileGrid.c
index e7410e4b6..01fba46a5 100644
--- a/shared-bindings/displayio/TileGrid.c
+++ b/shared-bindings/displayio/TileGrid.c
@@ -41,10 +41,7 @@
 #include "supervisor/shared/translate.h"
 
 //| class TileGrid:
-//|     """.. currentmodule:: displayio
-//|
-//|     :class:`TileGrid` -- A grid of tiles sourced out of one bitmap
-//|     ==========================================================================
+//|     """A grid of tiles sourced out of one bitmap
 //|
 //|     Position a grid of tiles sourced from a bitmap and pixel_shader combination. Multiple grids
 //|     can share bitmaps and pixel shaders.
diff --git a/shared-bindings/displayio/__init__.c b/shared-bindings/displayio/__init__.c
index 37c025329..b791336b5 100644
--- a/shared-bindings/displayio/__init__.c
+++ b/shared-bindings/displayio/__init__.c
@@ -43,33 +43,10 @@
 #include "shared-bindings/displayio/Shape.h"
 #include "shared-bindings/displayio/TileGrid.h"
 
-//| """:mod:`displayio` --- Native display driving
-//| =========================================================================
-//|
-//| .. module:: displayio
-//|   :synopsis: Native helpers for driving displays
-//|   :platform: SAMD21, SAMD51, nRF52
+//| """Native helpers for driving displays
 //|
 //| The `displayio` module contains classes to manage display output
-//| including synchronizing with refresh rates and partial updating.
-//|
-//| Libraries
-//|
-//| .. toctree::
-//|     :maxdepth: 3
-//|
-//|     Bitmap
-//|     ColorConverter
-//|     Display
-//|     EPaperDisplay
-//|     FourWire
-//|     Group
-//|     I2CDisplay
-//|     OnDiskBitmap
-//|     Palette
-//|     ParallelBus
-//|     Shape
-//|     TileGrid"""
+//| including synchronizing with refresh rates and partial updating."""
 //|
 
 
diff --git a/shared-bindings/fontio/BuiltinFont.c b/shared-bindings/fontio/BuiltinFont.c
index f60c9e36c..bf9a65873 100644
--- a/shared-bindings/fontio/BuiltinFont.c
+++ b/shared-bindings/fontio/BuiltinFont.c
@@ -37,12 +37,7 @@
 #include "supervisor/shared/translate.h"
 
 //| class BuiltinFont:
-//|     """.. currentmodule:: fontio
-//|
-//|     :class:`BuiltinFont` -- A font built into CircuitPython
-//|     =========================================================================================
-//|
-//|     A font built into CircuitPython."""
+//|     """A font built into CircuitPython"""
 //|
 //|     def __init__(self, ):
 //|         """Creation not supported. Available fonts are defined when CircuitPython is built. See the
diff --git a/shared-bindings/fontio/Glyph.c b/shared-bindings/fontio/Glyph.c
index 6235dbc46..6558e2e7a 100644
--- a/shared-bindings/fontio/Glyph.c
+++ b/shared-bindings/fontio/Glyph.c
@@ -29,22 +29,27 @@
 #include <stdint.h>
 
 //| class Glyph:
-//|     """.. currentmodule:: fontio
+//|     """Storage of glyph info"""
 //|
-//|     :class:`Glyph` -- Storage of glyph info
-//|     =========================================================================="""
-//|
-//|     def __init__(self, bitmap: displayio.Bitmap, tile_index: int, width: int, height: int, dx: int, dy: int, shift_x: int, shift_y: int):
+//|     def __init__(self,
+//|                  bitmap: displayio.Bitmap,
+//|                  tile_index: int,
+//|                  width: int,
+//|                  height: int,
+//|                  dx: int,
+//|                  dy: int,
+//|                  shift_x: int,
+//|                  shift_y: int):
 //|         """Named tuple used to capture a single glyph and its attributes.
 //|
-//|         :param displayio.Bitmap bitmap: the bitmap including the glyph
-//|         :param int tile_index: the tile index within the bitmap
-//|         :param int width: the width of the glyph's bitmap
-//|         :param int height: the height of the glyph's bitmap
-//|         :param int dx: x adjustment to the bitmap's position
-//|         :param int dy: y adjustment to the bitmap's position
-//|         :param int shift_x: the x difference to the next glyph
-//|         :param int shift_y: the y difference to the next glyph"""
+//|         :param bitmap: the bitmap including the glyph
+//|         :param tile_index: the tile index within the bitmap
+//|         :param width: the width of the glyph's bitmap
+//|         :param height: the height of the glyph's bitmap
+//|         :param dx: x adjustment to the bitmap's position
+//|         :param dy: y adjustment to the bitmap's position
+//|         :param shift_x: the x difference to the next glyph
+//|         :param shift_y: the y difference to the next glyph"""
 //|         ...
 //|
 const mp_obj_namedtuple_type_t fontio_glyph_type = {
diff --git a/shared-bindings/fontio/__init__.c b/shared-bindings/fontio/__init__.c
index 478fc1806..f376f3503 100644
--- a/shared-bindings/fontio/__init__.c
+++ b/shared-bindings/fontio/__init__.c
@@ -33,22 +33,7 @@
 #include "shared-bindings/fontio/BuiltinFont.h"
 #include "shared-bindings/fontio/Glyph.h"
 
-//| """:mod:`fontio` --- Core font related data structures
-//| =========================================================================
-//|
-//| .. module:: fontio
-//|   :synopsis: Core font related data structures
-//|   :platform: SAMD21, SAMD51, nRF52
-//|
-//| The `fontio` module contains classes to store font related information.
-//|
-//| Libraries
-//|
-//| .. toctree::
-//|     :maxdepth: 3
-//|
-//|     BuiltinFont
-//|     Glyph"""
+//| """Core font related data structures"""
 //|
 
 STATIC const mp_rom_map_elem_t fontio_module_globals_table[] = {
diff --git a/shared-bindings/framebufferio/FramebufferDisplay.c b/shared-bindings/framebufferio/FramebufferDisplay.c
index 5e63b988e..51ef09059 100644
--- a/shared-bindings/framebufferio/FramebufferDisplay.c
+++ b/shared-bindings/framebufferio/FramebufferDisplay.c
@@ -41,10 +41,7 @@
 #include "supervisor/shared/translate.h"
 
 //| class FramebufferDisplay:
-//|     """.. currentmodule:: framebufferio
-//|
-//|     :class:`FramebufferDisplay` -- Manage updating a display with framebuffer in RAM
-//|     ================================================================================
+//|     """Manage updating a display with framebuffer in RAM
 //|
 //|     This initializes a display and connects it into CircuitPython. Unlike other
 //|     objects in CircuitPython, Display objects live until `displayio.release_displays()`
diff --git a/shared-bindings/framebufferio/__init__.c b/shared-bindings/framebufferio/__init__.c
index 50725c515..492423464 100644
--- a/shared-bindings/framebufferio/__init__.c
+++ b/shared-bindings/framebufferio/__init__.c
@@ -28,25 +28,13 @@
 #include "shared-bindings/framebufferio/__init__.h"
 #include "shared-bindings/framebufferio/FramebufferDisplay.h"
 
-//| """:mod:`framebufferio` --- Native framebuffer display driving
-//| =========================================================================
-//|
-//| .. module:: framebufferio
-//|   :synopsis: Native helpers for driving displays
-//|   :platform: SAMD51, nRF52
+//| """Native framebuffer display driving
 //|
 //| The `framebufferio` module contains classes to manage display output
 //| including synchronizing with refresh rates and partial updating.
 //| It is used in conjunction with classes from `displayio` to actually
 //| place items on the display; and classes like `RGBMatrix` to actually
-//| drive the display.
-//|
-//| Libraries
-//|
-//| .. toctree::
-//|     :maxdepth: 3
-//|
-//|     FramebufferDisplay"""
+//| drive the display."""
 //|
 
 #if CIRCUITPY_FRAMEBUFFERIO
diff --git a/shared-bindings/frequencyio/FrequencyIn.c b/shared-bindings/frequencyio/FrequencyIn.c
index 270fa87c3..2d628088b 100644
--- a/shared-bindings/frequencyio/FrequencyIn.c
+++ b/shared-bindings/frequencyio/FrequencyIn.c
@@ -36,10 +36,7 @@
 #include "supervisor/shared/translate.h"
 
 //| class FrequencyIn:
-//|     """.. currentmodule:: frequencyio
-//|
-//|     :class:`FrequencyIn` -- Read a frequency signal
-//|     ========================================================
+//|     """Read a frequency signal
 //|
 //|     FrequencyIn is used to measure the frequency, in hertz, of a digital signal
 //|     on an incoming pin. Accuracy has shown to be within 10%, if not better. It
diff --git a/shared-bindings/frequencyio/__init__.c b/shared-bindings/frequencyio/__init__.c
index 219d5f645..031004d4b 100644
--- a/shared-bindings/frequencyio/__init__.c
+++ b/shared-bindings/frequencyio/__init__.c
@@ -33,23 +33,8 @@
 #include "shared-bindings/frequencyio/__init__.h"
 #include "shared-bindings/frequencyio/FrequencyIn.h"
 
-//| """:mod:`frequencyio` --- Support for frequency based protocols
-//| =============================================================
+//| """Support for frequency based protocols
 //|
-//| .. module:: frequencyio
-//|   :synopsis: Support for frequency based protocols
-//|   :platform: SAMD51
-//|
-//| The `frequencyio` module contains classes to provide access to basic frequency IO.
-//|
-//| Libraries
-//|
-//| .. toctree::
-//|     :maxdepth: 3
-//|
-//|     FrequencyIn
-//|
-
 //| .. warning:: This module is not available in SAMD21 builds. See the
 //|   :ref:`module-support-matrix` for more info.
 //|
diff --git a/shared-bindings/gamepad/GamePad.c b/shared-bindings/gamepad/GamePad.c
index 946a24dbf..a750892fe 100644
--- a/shared-bindings/gamepad/GamePad.c
+++ b/shared-bindings/gamepad/GamePad.c
@@ -35,10 +35,7 @@
 #include "supervisor/shared/translate.h"
 
 //| class GamePad:
-//|     """.. currentmodule:: gamepad
-//|
-//|     :class:`GamePad` -- Scan buttons for presses
-//|     ============================================
+//|     """Scan buttons for presses
 //|
 //|     Usage::
 //|
@@ -90,7 +87,7 @@
 //|         on delays.
 //|
 //|         They button presses are accumulated, until the ``get_pressed`` method
-//|         is called, at which point the button state is cleared, and the new 
+//|         is called, at which point the button state is cleared, and the new
 //|         button presses start to be recorded."""
 //|         ...
 //|
diff --git a/shared-bindings/gamepad/__init__.c b/shared-bindings/gamepad/__init__.c
index 0c32fd6c1..557777f50 100644
--- a/shared-bindings/gamepad/__init__.c
+++ b/shared-bindings/gamepad/__init__.c
@@ -29,17 +29,7 @@
 #include "shared-bindings/gamepad/GamePad.h"
 #include "shared-bindings/util.h"
 
-//| """:mod:`gamepad` --- Button handling
-//| ==================================
-//|
-//| .. module:: gamepad
-//|   :synopsis: Button handling
-//|   :platform: SAMD21
-//|
-//| .. toctree::
-//|     :maxdepth: 3
-//|
-//|     GamePad"""
+//| """Button handling in the background"""
 //|
 STATIC const mp_rom_map_elem_t gamepad_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_gamepad) },
diff --git a/shared-bindings/gamepadshift/GamePadShift.c b/shared-bindings/gamepadshift/GamePadShift.c
index 37be3d957..48b579457 100644
--- a/shared-bindings/gamepadshift/GamePadShift.c
+++ b/shared-bindings/gamepadshift/GamePadShift.c
@@ -33,10 +33,7 @@
 #include "supervisor/shared/translate.h"
 
 //| class GamePadShift:
-//|     """.. currentmodule:: gamepadshift
-//|
-//|     :class:`GamePadShift` -- Scan buttons for presses through a shift register
-//|     ==========================================================================="""
+//|     """Scan buttons for presses through a shift register"""
 //|
 //|     def __init__(self, clock: Any, data: Any, latch: Any):
 //|         """Initializes button scanning routines.
diff --git a/shared-bindings/gamepadshift/__init__.c b/shared-bindings/gamepadshift/__init__.c
index 3763b0487..f17135893 100644
--- a/shared-bindings/gamepadshift/__init__.c
+++ b/shared-bindings/gamepadshift/__init__.c
@@ -30,17 +30,7 @@
 #include "shared-bindings/digitalio/DigitalInOut.h"
 #include "shared-bindings/util.h"
 
-//| """:mod:`gamepadshift` --- Tracks button presses read through a shift register
-//| ===========================================================================
-//|
-//| .. module:: gamepadshift
-//|   :synopsis: Tracks button presses read through a shift register
-//|   :platform: SAMD21, SAMD51
-//|
-//| .. toctree::
-//|     :maxdepth: 3
-//|
-//|     GamePadShift"""
+//| """Tracks button presses read through a shift register"""
 //|
 STATIC const mp_rom_map_elem_t gamepadshift_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_gamepadshift) },
diff --git a/shared-bindings/help.c b/shared-bindings/help.c
deleted file mode 100644
index 4e7c3a78b..000000000
--- a/shared-bindings/help.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2016 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.
- */
-
-//| :func:`help` - Built-in method to provide helpful information
-//| ==============================================================
-//|
-//| .. function:: help(object=None)
-//|
-//|   Prints a help method about the given object. When ``object`` is none,
-//|   prints general port information.
-//|
diff --git a/shared-bindings/help.rst b/shared-bindings/help.rst
new file mode 100644
index 000000000..63991bff2
--- /dev/null
+++ b/shared-bindings/help.rst
@@ -0,0 +1,31 @@
+# This file is part of the MicroPython project, http://micropython.org/
+#
+# The MIT License (MIT)
+#
+# Copyright (c) 2016 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.
+
+:func:`help` - Built-in method to provide helpful information
+==============================================================
+
+.. function:: help(object=None)
+
+  Prints a help method about the given object. When ``object`` is none,
+  prints general port information.
diff --git a/shared-bindings/i2cslave/I2CSlave.c b/shared-bindings/i2cslave/I2CSlave.c
index 5bab2af74..80875ce75 100644
--- a/shared-bindings/i2cslave/I2CSlave.c
+++ b/shared-bindings/i2cslave/I2CSlave.c
@@ -50,10 +50,7 @@ STATIC mp_obj_t mp_obj_new_i2cslave_i2c_slave_request(i2cslave_i2c_slave_obj_t *
 }
 
 //| class I2CSlave:
-//|     """.. currentmodule:: i2cslave
-//|
-//|     :class:`I2CSlave` --- Two wire serial protocol slave
-//|     ----------------------------------------------------"""
+//|     """Two wire serial protocol slave"""
 //|
 //|     def __init__(self, scl: microcontroller.Pin, sda: microcontroller.Pin, addresses: tuple, smbus: bool = False):
 //|         """I2C is a two-wire protocol for communicating between devices.
@@ -229,17 +226,15 @@ const mp_obj_type_t i2cslave_i2c_slave_type = {
 };
 
 //| class I2CSlaveRequest:
-//|     """:class:`I2CSlaveRequest` --- I2C Slave Request
-//|     ----------------------------------------------"""
 //|
 //|     def __init__(self, slave: i2cslave.I2CSlave, address: int, is_read: bool, is_restart: bool):
 //|         """I2C transfer request from a master.
 //|         This cannot be instantiated directly, but is returned by :py:meth:`I2CSlave.request`.
 //|
-//|         :param ~i2cslave.I2CSlave slave: The I2C Slave receiving this request
-//|         :param int address: I2C address
-//|         :param bool is_read: I2C Master read request
-//|         :param bool is_restart: Repeated Start Condition"""
+//|         :param slave: The I2C Slave receiving this request
+//|         :param address: I2C address
+//|         :param is_read: I2C Master read request
+//|         :param is_restart: Repeated Start Condition"""
 //|
 STATIC mp_obj_t i2cslave_i2c_slave_request_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
     mp_arg_check_num(n_args, kw_args, 4, 4, false);
@@ -264,7 +259,7 @@ STATIC mp_obj_t i2cslave_i2c_slave_request_obj___exit__(size_t n_args, const mp_
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(i2cslave_i2c_slave_request___exit___obj, 4, 4, i2cslave_i2c_slave_request_obj___exit__);
 
-//|     address: Any = ...
+//|     address: int = ...
 //|     """The I2C address of the request."""
 //|
 STATIC mp_obj_t i2cslave_i2c_slave_request_get_address(mp_obj_t self_in) {
@@ -274,7 +269,7 @@ STATIC mp_obj_t i2cslave_i2c_slave_request_get_address(mp_obj_t self_in) {
 }
 MP_DEFINE_CONST_PROP_GET(i2cslave_i2c_slave_request_address_obj, i2cslave_i2c_slave_request_get_address);
 
-//|     is_read: Any = ...
+//|     is_read: bool = ...
 //|     """The I2C master is reading from the device."""
 //|
 STATIC mp_obj_t i2cslave_i2c_slave_request_get_is_read(mp_obj_t self_in) {
@@ -284,7 +279,7 @@ STATIC mp_obj_t i2cslave_i2c_slave_request_get_is_read(mp_obj_t self_in) {
 }
 MP_DEFINE_CONST_PROP_GET(i2cslave_i2c_slave_request_is_read_obj, i2cslave_i2c_slave_request_get_is_read);
 
-//|     is_restart: Any = ...
+//|     is_restart: bool = ...
 //|     """Is Repeated Start Condition."""
 //|
 STATIC mp_obj_t i2cslave_i2c_slave_request_get_is_restart(mp_obj_t self_in) {
@@ -294,14 +289,13 @@ STATIC mp_obj_t i2cslave_i2c_slave_request_get_is_restart(mp_obj_t self_in) {
 }
 MP_DEFINE_CONST_PROP_GET(i2cslave_i2c_slave_request_is_restart_obj, i2cslave_i2c_slave_request_get_is_restart);
 
-//|     def read(self, n: int = -1, ack: bool = True) -> Any:
+//|     def read(self, n: int = -1, ack: bool = True) -> bytearray:
 //|         """Read data.
 //|         If ack=False, the caller is responsible for calling :py:meth:`I2CSlaveRequest.ack`.
 //|
-//|         :param int n: Number of bytes to read (negative means all)
-//|         :param bool ack: Whether or not to send an ACK after the n'th byte
-//|         :return: Bytes read
-//|         :rtype: bytearray"""
+//|         :param n: Number of bytes to read (negative means all)
+//|         :param ack: Whether or not to send an ACK after the n'th byte
+//|         :return: Bytes read"""
 //|         ...
 //|
 STATIC mp_obj_t i2cslave_i2c_slave_request_read(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
@@ -355,10 +349,10 @@ STATIC mp_obj_t i2cslave_i2c_slave_request_read(size_t n_args, const mp_obj_t *p
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(i2cslave_i2c_slave_request_read_obj, 1, i2cslave_i2c_slave_request_read);
 
-//|     def write(self, buffer: bytearray) -> Any:
+//|     def write(self, buffer: bytearray) -> int:
 //|         """Write the data contained in buffer.
 //|
-//|         :param bytearray buffer: Write out the data in this buffer
+//|         :param buffer: Write out the data in this buffer
 //|         :return: Number of bytes written"""
 //|         ...
 //|
@@ -393,7 +387,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(i2cslave_i2c_slave_request_write_obj, i2cslave_
 //|         """Acknowledge or Not Acknowledge last byte received.
 //|         Use together with :py:meth:`I2CSlaveRequest.read` ack=False.
 //|
-//|         :param bool ack: Whether to send an ACK or NACK"""
+//|         :param ack: Whether to send an ACK or NACK"""
 //|         ...
 //|
 STATIC mp_obj_t i2cslave_i2c_slave_request_ack(uint n_args, const mp_obj_t *args) {
diff --git a/shared-bindings/i2cslave/__init__.c b/shared-bindings/i2cslave/__init__.c
index ffeb216fa..41b42fef8 100644
--- a/shared-bindings/i2cslave/__init__.c
+++ b/shared-bindings/i2cslave/__init__.c
@@ -35,22 +35,10 @@
 
 #include "py/runtime.h"
 
-//| """:mod:`i2cslave` --- Two wire serial protocol slave
-//| ==================================================
-//|
-//| .. module:: i2cslave
-//|   :synopsis: Two wire serial protocol slave
-//|   :platform: SAMD21, SAMD51
+//| """Two wire serial protocol slave
 //|
 //| The `i2cslave` module contains classes to support a I2C slave.
 //|
-//| Classes
-//|
-//| .. toctree::
-//|     :maxdepth: 3
-//|
-//|     I2CSlave
-//|
 //| Example emulating 2 devices::
 //|
 //|   import board
diff --git a/shared-bindings/index.rst b/shared-bindings/index.rst
index cbffdb614..d94177394 100644
--- a/shared-bindings/index.rst
+++ b/shared-bindings/index.rst
@@ -7,13 +7,17 @@ present or if flash space is limited. For example, a microcontroller without
 analog features will not have `analogio`. See the `support_matrix` page for
 a list of modules supported on each board.
 
+.. toctree::
+    :hidden:
+
+    support_matrix
+
 Modules
 ---------
 
 .. toctree::
     :glob:
-    :maxdepth: 3
+    :maxdepth: 2
 
-    support_matrix
-    */__init__
+    ../autoapi/*/index
     help
diff --git a/shared-bindings/math/__init__.c b/shared-bindings/math/__init__.c
index 755bf7589..56155306f 100644
--- a/shared-bindings/math/__init__.c
+++ b/shared-bindings/math/__init__.c
@@ -38,12 +38,7 @@
 #define MP_PI MICROPY_FLOAT_CONST(3.14159265358979323846)
 
 
-//| """:mod:`math` --- mathematical functions
-//| ========================================================
-//|
-//| .. module:: math
-//|   :synopsis: mathematical functions
-//|   :platform: SAMD21/SAMD51
+//| """mathematical functions
 //|
 //| The `math` module provides some basic mathematical functions for
 //| working with floating-point numbers."""
diff --git a/shared-bindings/microcontroller/Pin.c b/shared-bindings/microcontroller/Pin.c
index cad0d67b1..765e602e5 100644
--- a/shared-bindings/microcontroller/Pin.c
+++ b/shared-bindings/microcontroller/Pin.c
@@ -34,12 +34,7 @@
 #include "supervisor/shared/translate.h"
 
 //| class Pin:
-//|     """.. currentmodule:: microcontroller
-//|
-//|     :class:`Pin` --- Pin reference
-//|     ------------------------------------------
-//|
-//|     Identifies an IO pin on the microcontroller."""
+//|     """Identifies an IO pin on the microcontroller."""
 //|
 //|     def __init__(self, ):
 //|         """Identifies an IO pin on the microcontroller. They are fixed by the
diff --git a/shared-bindings/microcontroller/Processor.c b/shared-bindings/microcontroller/Processor.c
index dedb5a27c..c4b249124 100644
--- a/shared-bindings/microcontroller/Processor.c
+++ b/shared-bindings/microcontroller/Processor.c
@@ -35,12 +35,7 @@
 #include "py/runtime.h"
 
 //| class Processor:
-//|     """.. currentmodule:: microcontroller
-//|
-//|     :class:`Processor` --- Microcontroller CPU information and control
-//|     ------------------------------------------------------------------
-//|
-//|     Get information about the microcontroller CPU and control it.
+//|     """Microcontroller CPU information and control
 //|
 //|     Usage::
 //|
@@ -55,8 +50,8 @@
 //|         ...
 //|
 
-//|     frequency: Any = ...
-//|     """The CPU operating frequency as an `int`, in Hertz. (read-only)"""
+//|     frequency: int = ...
+//|     """The CPU operating frequency in Hertz. (read-only)"""
 //|
 STATIC mp_obj_t mcu_processor_get_frequency(mp_obj_t self) {
     return mp_obj_new_int_from_uint(common_hal_mcu_processor_get_frequency());
diff --git a/shared-bindings/microcontroller/RunMode.c b/shared-bindings/microcontroller/RunMode.c
index df3ff4186..6db315d8d 100644
--- a/shared-bindings/microcontroller/RunMode.c
+++ b/shared-bindings/microcontroller/RunMode.c
@@ -27,10 +27,7 @@
 #include "shared-bindings/microcontroller/RunMode.h"
 
 //| class RunMode:
-//|     """.. currentmodule:: microcontroller
-//|
-//|     :class:`RunMode` -- run state of the microcontroller
-//|     ============================================================="""
+//|     """run state of the microcontroller"""
 //|
 //|     def __init__(self, ):
 //|         """Enum-like class to define the run mode of the microcontroller and
diff --git a/shared-bindings/microcontroller/__init__.c b/shared-bindings/microcontroller/__init__.c
index 75b763980..21e1c90a9 100644
--- a/shared-bindings/microcontroller/__init__.c
+++ b/shared-bindings/microcontroller/__init__.c
@@ -42,27 +42,13 @@
 #include "py/runtime.h"
 #include "supervisor/shared/translate.h"
 
-//| """:mod:`microcontroller` --- Pin references and cpu functionality
-//| ================================================================
-//|
-//| .. module:: microcontroller
-//|   :synopsis: Pin references and core functionality
-//|   :platform: SAMD21, ESP8266
+//| """Pin references and cpu functionality
 //|
 //| The `microcontroller` module defines the pins from the perspective of the
-//| microcontroller. See `board` for board-specific pin mappings.
-//|
-//| Libraries
-//|
-//| .. toctree::
-//|     :maxdepth: 3
-//|
-//|     Pin
-//|     Processor
-//|     RunMode"""
+//| microcontroller. See `board` for board-specific pin mappings."""
 //|
 
-//| cpu: Any = ... 
+//| cpu: Processor = ...
 //| """CPU information and control, such as ``cpu.temperature`` and ``cpu.frequency``
 //| (clock frequency).
 //| This object is the sole instance of `microcontroller.Processor`."""
diff --git a/shared-bindings/multiterminal/__init__.c b/shared-bindings/multiterminal/__init__.c
index 3a4065019..baf2fb674 100644
--- a/shared-bindings/multiterminal/__init__.c
+++ b/shared-bindings/multiterminal/__init__.c
@@ -30,12 +30,7 @@
 #include "py/runtime.h"
 #include "supervisor/shared/translate.h"
 
-//| """:mod:`multiterminal` --- Manage additional terminal sources
-//| ===========================================================
-//|
-//| .. module:: multiterminal
-//|   :synopsis: Manage additional terminal sources
-//|   :platform: ESP8266
+//| """Manage additional terminal sources
 //|
 //| The `multiterminal` module allows you to configure an additional serial
 //| terminal source. Incoming characters are accepted from both the internal
diff --git a/shared-bindings/neopixel_write/__init__.c b/shared-bindings/neopixel_write/__init__.c
index f18c7fdfd..5e5bc31eb 100644
--- a/shared-bindings/neopixel_write/__init__.c
+++ b/shared-bindings/neopixel_write/__init__.c
@@ -31,12 +31,7 @@
 #include "shared-bindings/digitalio/DigitalInOut.h"
 #include "supervisor/shared/translate.h"
 
-//| """:mod:`neopixel_write` --- Low-level neopixel implementation
-//| ===========================================================
-//|
-//| .. module:: neopixel_write
-//|   :synopsis: Low-level neopixel implementation
-//|   :platform: SAMD21
+//| """Low-level neopixel implementation
 //|
 //| The `neopixel_write` module contains a helper method to write out bytes in
 //| the 800khz neopixel protocol.
@@ -55,11 +50,11 @@
 //|   pixel_off = bytearray([0, 0, 0])
 //|   neopixel_write.neopixel_write(pin, pixel_off)"""
 //|
-//| def neopixel_write(digitalinout: digitalio.DigitalInOut, buf: bytearray) -> Any:
+//| def neopixel_write(digitalinout: digitalio.DigitalInOut, buf: bytearray) -> None:
 //|   """Write buf out on the given DigitalInOut.
 //|
-//|   :param ~digitalio.DigitalInOut digitalinout: the DigitalInOut to output with
-//|   :param bytearray buf: The bytes to clock out. No assumption is made about color order"""
+//|   :param digitalinout: the DigitalInOut to output with
+//|   :param buf: The bytes to clock out. No assumption is made about color order"""
 //|   ...
 STATIC mp_obj_t neopixel_write_neopixel_write_(mp_obj_t digitalinout_obj, mp_obj_t buf) {
     if (!MP_OBJ_IS_TYPE(digitalinout_obj, &digitalio_digitalinout_type)) {
diff --git a/shared-bindings/network/__init__.c b/shared-bindings/network/__init__.c
index 4f03781cf..6af86688e 100644
--- a/shared-bindings/network/__init__.c
+++ b/shared-bindings/network/__init__.c
@@ -38,12 +38,7 @@
 
 #if CIRCUITPY_NETWORK
 
-//| """:mod:`network` --- Network Interface Management
-//| ===============================================
-//|
-//| .. module:: network
-//|   :synopsis: Network Interface Management
-//|   :platform: SAMD
+//| """Network Interface Management
 //|
 //| This module provides a registry of configured NICs.
 //| It is used by the 'socket' module to look up a suitable
diff --git a/shared-bindings/nvm/ByteArray.c b/shared-bindings/nvm/ByteArray.c
index a28c2c4f9..326f719a8 100644
--- a/shared-bindings/nvm/ByteArray.c
+++ b/shared-bindings/nvm/ByteArray.c
@@ -31,14 +31,8 @@
 #include "shared-bindings/nvm/ByteArray.h"
 #include "supervisor/shared/translate.h"
 
-
-
-
 //| class ByteArray:
-//|     """.. currentmodule:: nvm
-//|
-//|     :class:`ByteArray` -- Presents a stretch of non-volatile memory as a bytearray.
-//|     ================================================================================
+//|     """Presents a stretch of non-volatile memory as a bytearray.
 //|
 //|     Non-volatile memory is available as a byte array that persists over reloads
 //|     and power cycles. Each assignment causes an erase and write cycle so its recommended to assign
diff --git a/shared-bindings/nvm/__init__.c b/shared-bindings/nvm/__init__.c
index 3bd9a309b..51c5bb278 100644
--- a/shared-bindings/nvm/__init__.c
+++ b/shared-bindings/nvm/__init__.c
@@ -31,23 +31,10 @@
 #include "shared-bindings/nvm/__init__.h"
 #include "shared-bindings/nvm/ByteArray.h"
 
-//| """:mod:`nvm` --- Non-volatile memory
-//| ===========================================================
-//|
-//| .. module:: nvm
-//|   :synopsis: Non-volatile memory
-//|   :platform: SAMD21
+//| """Non-volatile memory
 //|
 //| The `nvm` module allows you to store whatever raw bytes you wish in a
-//| reserved section non-volatile memory.
-//|
-
-//| Libraries
-//|
-//| .. toctree::
-//|     :maxdepth: 3
-//|
-//|     ByteArray"""
+//| reserved section non-volatile memory."""
 //|
 STATIC const mp_rom_map_elem_t nvm_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_nvm) },
diff --git a/shared-bindings/os/__init__.c b/shared-bindings/os/__init__.c
index 2a6b13c9b..4e991d089 100644
--- a/shared-bindings/os/__init__.c
+++ b/shared-bindings/os/__init__.c
@@ -37,12 +37,7 @@
 #include "py/runtime.h"
 #include "shared-bindings/os/__init__.h"
 
-//| """:mod:`os` --- functions that an OS normally provides
-//| ========================================================
-//|
-//| .. module:: os
-//|   :synopsis: functions that an OS normally provides
-//|   :platform: SAMD21
+//| """functions that an OS normally provides
 //|
 //| The `os` module is a strict subset of the CPython `cpython:os` module. So,
 //| code written in CircuitPython will work in CPython but not necessarily the
diff --git a/shared-bindings/ps2io/Ps2.c b/shared-bindings/ps2io/Ps2.c
index d327d4180..a87b14ddd 100644
--- a/shared-bindings/ps2io/Ps2.c
+++ b/shared-bindings/ps2io/Ps2.c
@@ -37,10 +37,7 @@
 #include "supervisor/shared/translate.h"
 
 //| class Ps2:
-//|     """.. currentmodule:: ps2io
-//|
-//|     :class:`Ps2` -- Communicate with a PS/2 keyboard or mouse
-//|     =========================================================
+//|     """Communicate with a PS/2 keyboard or mouse
 //|
 //|     Ps2 implements the PS/2 keyboard/mouse serial protocol, used in
 //|     legacy devices. It is similar to UART but there are only two
diff --git a/shared-bindings/ps2io/__init__.c b/shared-bindings/ps2io/__init__.c
index 081127bac..38a70b1a2 100644
--- a/shared-bindings/ps2io/__init__.c
+++ b/shared-bindings/ps2io/__init__.c
@@ -33,22 +33,10 @@
 #include "shared-bindings/microcontroller/Pin.h"
 #include "shared-bindings/ps2io/Ps2.h"
 
-//| """:mod:`ps2io` --- Support for PS/2 protocol
-//| =====================================================
-//|
-//| .. module:: ps2io
-//|   :synopsis: Support for PS/2 based devices 
-//|   :platform: SAMD21
+//| """Support for PS/2 protocol
 //|
 //| The `ps2io` module contains classes to provide PS/2 communication.
 //|
-//| Libraries
-//|
-//| .. toctree::
-//|     :maxdepth: 3
-//|
-//|     Ps2
-//|
 
 //| .. warning:: This module is not available in some SAMD21 builds. See the
 //|   :ref:`module-support-matrix` for more info.
diff --git a/shared-bindings/pulseio/PWMOut.c b/shared-bindings/pulseio/PWMOut.c
index 3a25d6938..7970c02f3 100644
--- a/shared-bindings/pulseio/PWMOut.c
+++ b/shared-bindings/pulseio/PWMOut.c
@@ -36,12 +36,7 @@
 #include "supervisor/shared/translate.h"
 
 //| class PWMOut:
-//|     """.. currentmodule:: pulseio
-//|
-//|     :class:`PWMOut` -- Output a Pulse Width Modulated signal
-//|     ========================================================
-//|
-//|     PWMOut can be used to output a PWM signal on a given pin."""
+//|     """Output a Pulse Width Modulated signal on a given pin."""
 //|
 //|     def __init__(self, pin: microcontroller.Pin, *, duty_cycle: int = 0, frequency: int = 500, variable_frequency: bool = False):
 //|         """Create a PWM object associated with the given pin. This allows you to
diff --git a/shared-bindings/pulseio/PulseIn.c b/shared-bindings/pulseio/PulseIn.c
index 9024f53e3..5c52b2582 100644
--- a/shared-bindings/pulseio/PulseIn.c
+++ b/shared-bindings/pulseio/PulseIn.c
@@ -36,15 +36,9 @@
 #include "supervisor/shared/translate.h"
 
 //| class PulseIn:
-//|     """.. currentmodule:: pulseio
-//|
-//|     :class:`PulseIn` -- Read a series of pulse durations
-//|     ========================================================
-//|
-//|     PulseIn is used to measure a series of active and idle pulses. This is
-//|     commonly used in infrared receivers and low cost temperature sensors (DHT).
-//|     The pulsed signal consists of timed active and idle periods. Unlike PWM,
-//|     there is no set duration for active and idle pairs."""
+//|     """Measure a series of active and idle pulses. This is commonly used in infrared receivers
+//|        and low cost temperature sensors (DHT). The pulsed signal consists of timed active and
+//|        idle periods. Unlike PWM, there is no set duration for active and idle pairs."""
 //|
 //|     def __init__(self, pin: microcontroller.Pin, maxlen: int = 2, *, idle_state: bool = False):
 //|         """Create a PulseIn object associated with the given pin. The object acts as
diff --git a/shared-bindings/pulseio/PulseOut.c b/shared-bindings/pulseio/PulseOut.c
index 9c650731b..16b0a6f0c 100644
--- a/shared-bindings/pulseio/PulseOut.c
+++ b/shared-bindings/pulseio/PulseOut.c
@@ -37,14 +37,9 @@
 #include "supervisor/shared/translate.h"
 
 //| class PulseOut:
-//|     """.. currentmodule:: pulseio
-//|
-//|     :class:`PulseOut` -- Output a pulse train
-//|     ========================================================
-//|
-//|     PulseOut is used to pulse PWM "carrier" output on and off. This is commonly
-//|     used in infrared remotes. The pulsed signal consists of timed on and off
-//|     periods. Unlike PWM, there is no set duration for on and off pairs."""
+//|     """Pulse PWM "carrier" output on and off. This is commonly used in infrared remotes. The
+//|        pulsed signal consists of timed on and off periods. Unlike PWM, there is no set duration
+//|        for on and off pairs."""
 //|
 //|     def __init__(self, carrier: pulseio.PWMOut):
 //|         """Create a PulseOut object associated with the given PWMout object.
@@ -115,7 +110,7 @@ STATIC mp_obj_t pulseio_pulseout_obj___exit__(size_t n_args, const mp_obj_t *arg
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pulseio_pulseout___exit___obj, 4, 4, pulseio_pulseout_obj___exit__);
 
-//|     def send(self, pulses: array.array) -> Any: 
+//|     def send(self, pulses: array.array) -> Any:
 //|         """Pulse alternating on and off durations in microseconds starting with on.
 //|         ``pulses`` must be an `array.array` with data type 'H' for unsigned
 //|         halfword (two bytes).
diff --git a/shared-bindings/pulseio/__init__.c b/shared-bindings/pulseio/__init__.c
index 70cb61fc3..87946e5f0 100644
--- a/shared-bindings/pulseio/__init__.c
+++ b/shared-bindings/pulseio/__init__.c
@@ -35,24 +35,10 @@
 #include "shared-bindings/pulseio/PulseOut.h"
 #include "shared-bindings/pulseio/PWMOut.h"
 
-//| """:mod:`pulseio` --- Support for pulse based protocols
-//| =====================================================
-//|
-//| .. module:: pulseio
-//|   :synopsis: Support for pulse based protocols
-//|   :platform: SAMD21, ESP8266
+//| """Support for pulse based protocols
 //|
 //| The `pulseio` module contains classes to provide access to basic pulse IO.
 //|
-//| Libraries
-//|
-//| .. toctree::
-//|     :maxdepth: 3
-//|
-//|     PulseIn
-//|     PulseOut
-//|     PWMOut
-//|
 
 //| All classes change hardware state and should be deinitialized when they
 //| are no longer needed if the program continues after use. To do so, either
diff --git a/shared-bindings/random/__init__.c b/shared-bindings/random/__init__.c
index d8b266be0..c0124df41 100644
--- a/shared-bindings/random/__init__.c
+++ b/shared-bindings/random/__init__.c
@@ -33,12 +33,7 @@
 #include "shared-bindings/random/__init__.h"
 #include "supervisor/shared/translate.h"
 
-//| """:mod:`random` --- pseudo-random numbers and choices
-//| ========================================================
-//|
-//| .. module:: random
-//|   :synopsis: pseudo-random numbers and choices
-//|   :platform: SAMD21, ESP8266
+//| """pseudo-random numbers and choices
 //|
 //| The `random` module is a strict subset of the CPython `cpython:random`
 //| module. So, code written in CircuitPython will work in CPython but not
diff --git a/shared-bindings/rgbmatrix/RGBMatrix.c b/shared-bindings/rgbmatrix/RGBMatrix.c
index e2393eb61..cbf570958 100644
--- a/shared-bindings/rgbmatrix/RGBMatrix.c
+++ b/shared-bindings/rgbmatrix/RGBMatrix.c
@@ -39,10 +39,7 @@
 #include "shared-module/framebufferio/FramebufferDisplay.h"
 
 //| class RGBMatrix:
-//|     """.. currentmodule:: rgbmatrix
-//|
-//|     :class:`RGBMatrix` --  Driver for HUB75-style RGB LED matrices
-//|     ================================================================
+//|     """Displays an in-memory framebuffer to a HUB75-style RGB LED matrix."""
 //|
 
 extern Protomatter_core *_PM_protoPtr;
@@ -134,9 +131,6 @@ STATIC void preflight_pins_or_throw(uint8_t clock_pin, uint8_t *rgb_pins, uint8_
     }
 }
 
-
-//|     :class:`~rgbmatrix.RGBMatrix` displays an in-memory framebuffer to an LED matrix."""
-//|
 //|     def __init__(self, *, width: Any, bit_depth: Any, rgb_pins: Any, addr_pins: Any, clock_pin: Any, latch_pin: Any, output_enable_pin: Any, doublebuffer: Any = True, framebuffer: Any = None, height: Any = 0):
 //|         """Create a RGBMatrix object with the given attributes.  The height of
 //|         the display is determined by the number of rgb and address pins:
@@ -297,7 +291,7 @@ const mp_obj_property_t rgbmatrix_rgbmatrix_brightness_obj = {
               (mp_obj_t)&mp_const_none_obj},
 };
 
-//|     def refresh(self, ) -> Any: ...
+//|     def refresh(self) -> Any: ...
 //|     """Transmits the color data in the buffer to the pixels so that
 //|     they are shown."""
 //|
@@ -309,7 +303,7 @@ STATIC mp_obj_t rgbmatrix_rgbmatrix_refresh(mp_obj_t self_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(rgbmatrix_rgbmatrix_refresh_obj, rgbmatrix_rgbmatrix_refresh);
 
-//|     width: Any = ...
+//|     width: int = ...
 //|     """The width of the display, in pixels"""
 //|
 STATIC mp_obj_t rgbmatrix_rgbmatrix_get_width(mp_obj_t self_in) {
@@ -325,7 +319,7 @@ const mp_obj_property_t rgbmatrix_rgbmatrix_width_obj = {
               (mp_obj_t)&mp_const_none_obj},
 };
 
-//|     height: Any = ...
+//|     height: int = ...
 //|     """The height of the display, in pixels"""
 //|
 STATIC mp_obj_t rgbmatrix_rgbmatrix_get_height(mp_obj_t self_in) {
diff --git a/shared-bindings/rgbmatrix/__init__.c b/shared-bindings/rgbmatrix/__init__.c
index f61002a78..7f0576652 100644
--- a/shared-bindings/rgbmatrix/__init__.c
+++ b/shared-bindings/rgbmatrix/__init__.c
@@ -31,16 +31,7 @@
 
 #include "shared-bindings/rgbmatrix/RGBMatrix.h"
 
-//| """:mod:`rgbmatrix` --- Low-level routines for bitbanged LED matrices
-//| =====================================================================
-//|
-//| .. module:: rgbmatrix
-//|   :synopsis: Low-level routines for bitbanged LED matrices
-//|
-//| .. toctree::
-//|     :maxdepth: 3
-//|
-//|     RGBMatrix"""
+//| """Low-level routines for bitbanged LED matrices"""
 //|
 
 STATIC const mp_rom_map_elem_t rgbmatrix_module_globals_table[] = {
diff --git a/shared-bindings/rotaryio/IncrementalEncoder.c b/shared-bindings/rotaryio/IncrementalEncoder.c
index a10fb6fd5..8b2723866 100644
--- a/shared-bindings/rotaryio/IncrementalEncoder.c
+++ b/shared-bindings/rotaryio/IncrementalEncoder.c
@@ -35,12 +35,7 @@
 #include "shared-bindings/util.h"
 
 //| class IncrementalEncoder:
-//|     """.. currentmodule:: rotaryio
-//|
-//|     :class:`IncrementalEncoder` -- Track the relative position of an incremental encoder
-//|     ====================================================================================
-//|
-//|     IncrementalEncoder determines the relative rotational position based on two series of pulses."""
+//|     """IncrementalEncoder determines the relative rotational position based on two series of pulses."""
 //|
 //|     def __init__(self, pin_a: microcontroller.Pin, pin_b: microcontroller.Pin):
 //|         """Create an IncrementalEncoder object associated with the given pins. It tracks the positional
diff --git a/shared-bindings/rotaryio/__init__.c b/shared-bindings/rotaryio/__init__.c
index 0cc8eb556..0fa457ca7 100644
--- a/shared-bindings/rotaryio/__init__.c
+++ b/shared-bindings/rotaryio/__init__.c
@@ -33,27 +33,13 @@
 #include "shared-bindings/rotaryio/__init__.h"
 #include "shared-bindings/rotaryio/IncrementalEncoder.h"
 
-//| """:mod:`rotaryio` --- Support for reading rotation sensors
-//| ========================================================
-//|
-//| .. module:: rotaryio
-//|   :synopsis: Support for reading rotation sensors
-//|   :platform: SAMD
+//| """Support for reading rotation sensors
 //|
 //| The `rotaryio` module contains classes to read different rotation encoding schemes. See
 //| `Wikipedia's Rotary Encoder page <https://en.wikipedia.org/wiki/Rotary_encoder>`_ for more
 //| background.
-//|
-//| Libraries
-//|
-//| .. toctree::
-//|     :maxdepth: 3
-//|
-//|     IncrementalEncoder
-//|
 
-//| .. warning:: This module is not available in some SAMD21 (aka M0) builds. See the
-//|   :ref:`module-support-matrix` for more info.
+//| .. warning:: This module is not available in some SAMD21 (aka M0) builds. See the :ref:`module-support-matrix` for more info.
 //|
 
 //| All classes change hardware state and should be deinitialized when they
diff --git a/shared-bindings/rtc/RTC.c b/shared-bindings/rtc/RTC.c
index 663f5be6c..58fe308f5 100644
--- a/shared-bindings/rtc/RTC.c
+++ b/shared-bindings/rtc/RTC.c
@@ -38,15 +38,8 @@
 
 const rtc_rtc_obj_t rtc_rtc_obj = {{&rtc_rtc_type}};
 
-
-
-
-
 //| class RTC:
-//|     """.. currentmodule:: rtc
-//|
-//|     :class:`RTC` --- Real Time Clock
-//|     --------------------------------"""
+//|     """Real Time Clock"""
 //|
 //|     def __init__(self, ):
 //|         """This class represents the onboard Real Time Clock. It is a singleton and will always return the same instance."""
@@ -60,7 +53,7 @@ STATIC mp_obj_t rtc_rtc_make_new(const mp_obj_type_t *type, size_t n_args, const
     return (mp_obj_t)&rtc_rtc_obj;
 }
 
-//|     datetime: Any = ...
+//|     datetime: time.struct_time = ...
 //|     """The current date and time of the RTC as a `time.struct_time`.
 //|
 //|     This must be set to the current date and time whenever the board loses power::
@@ -101,7 +94,7 @@ const mp_obj_property_t rtc_rtc_datetime_obj = {
               (mp_obj_t)&mp_const_none_obj},
 };
 
-//|     calibration: Any = ...
+//|     calibration: int = ...
 //|     """The RTC calibration value as an `int`.
 //|
 //|     A positive value speeds up the clock and a negative value slows it down.
diff --git a/shared-bindings/rtc/__init__.c b/shared-bindings/rtc/__init__.c
index 66669ca5f..b204d511c 100644
--- a/shared-bindings/rtc/__init__.c
+++ b/shared-bindings/rtc/__init__.c
@@ -31,23 +31,11 @@
 #include "shared-bindings/rtc/RTC.h"
 #include "shared-bindings/time/__init__.h"
 
-//| """:mod:`rtc` --- Real Time Clock
-//| ========================================================
-//|
-//| .. module:: rtc
-//|   :synopsis: Real Time Clock
-//|   :platform: SAMD21, SAMD51, nRF52
+//| """Real Time Clock
 //|
 //| The `rtc` module provides support for a Real Time Clock. You can access and manage the
 //| RTC using :class:`rtc.RTC`. It also backs the :func:`time.time` and :func:`time.localtime`
-//| functions using the onboard RTC if present.
-//|
-//| Classes
-//|
-//| .. toctree::
-//|     :maxdepth: 3
-//|
-//|     RTC"""
+//| functions using the onboard RTC if present."""
 //|
 
 void rtc_reset(void) {
diff --git a/shared-bindings/socket/__init__.c b/shared-bindings/socket/__init__.c
index 4c0811bdb..19c4850cd 100644
--- a/shared-bindings/socket/__init__.c
+++ b/shared-bindings/socket/__init__.c
@@ -37,12 +37,7 @@
 
 #include "shared-module/network/__init__.h"
 
-//| """:mod:`socket` --- TCP, UDP and RAW socket support
-//| =================================================
-//|
-//| .. module:: socket
-//|   :synopsis: TCP, UDP and RAW sockets
-//|   :platform: SAMD21, SAMD51
+//| """TCP, UDP and RAW socket support
 //|
 //| Create TCP, UDP and RAW sockets for communicating over the Internet."""
 //|
@@ -50,7 +45,6 @@
 STATIC const mp_obj_type_t socket_type;
 
 //| class socket:
-//|     """.. currentmodule:: socket"""
 //|
 //|     def __init__(self, family: int, type: int, proto: int):
 //|         """Create a new socket
diff --git a/shared-bindings/storage/__init__.c b/shared-bindings/storage/__init__.c
index feb1a9bd7..8ac08d8c9 100644
--- a/shared-bindings/storage/__init__.c
+++ b/shared-bindings/storage/__init__.c
@@ -35,12 +35,7 @@
 #include "shared-bindings/storage/__init__.h"
 #include "supervisor/shared/translate.h"
 
-//| """:mod:`storage` --- storage management
-//| ========================================================
-//|
-//| .. module:: storage
-//|   :synopsis: storage management
-//|   :platform: SAMD21, SAMD51
+//| """Storage management
 //|
 //| The `storage` provides storage management functionality such as mounting and
 //| unmounting which is typically handled by the operating system hosting Python.
diff --git a/shared-bindings/struct/__init__.c b/shared-bindings/struct/__init__.c
index 3772f93a7..256b385c8 100644
--- a/shared-bindings/struct/__init__.c
+++ b/shared-bindings/struct/__init__.c
@@ -38,12 +38,7 @@
 #include "shared-module/struct/__init__.h"
 #include "supervisor/shared/translate.h"
 
-//| """:mod:`struct` --- manipulation of c-style data
-//| ========================================================
-//|
-//| .. module:: struct
-//|   :synopsis: byte data control
-//|   :platform: SAMD21
+//| """Manipulation of c-style data
 //|
 //| This module implements a subset of the corresponding CPython module,
 //| as described below. For more information, refer to the original CPython
@@ -56,7 +51,7 @@
 //|
 
 
-//| def calcsize(fmt: Any) -> Any:
+//| def calcsize(fmt: str) -> int:
 //|     """Return the number of bytes needed to store the given fmt."""
 //|     ...
 //|
diff --git a/shared-bindings/supervisor/Runtime.c b/shared-bindings/supervisor/Runtime.c
index 05921899c..a420d5b80 100755
--- a/shared-bindings/supervisor/Runtime.c
+++ b/shared-bindings/supervisor/Runtime.c
@@ -30,12 +30,7 @@
 
 //TODO: add USB, REPL to description once they're operational
 //| class Runtime:
-//|     """.. currentmodule:: supervisor
-//|
-//|     :class:`Runtime` --- Supervisor Runtime information
-//|     ----------------------------------------------------
-//|
-//|     Get current status of runtime objects.
+//|     """Current status of runtime objects.
 //|
 //|     Usage::
 //|
@@ -50,7 +45,7 @@
 //|         ...
 //|
 
-//|     runtime.serial_connected: Any = ...
+//|     serial_connected: bool = ...
 //|     """Returns the USB serial communication status (read-only).
 //|
 //|     .. note::
@@ -78,7 +73,7 @@ const mp_obj_property_t supervisor_serial_connected_obj = {
 };
 
 
-//|     runtime.serial_bytes_available: Any = ...
+//|     serial_bytes_available: int = ...
 //|     """Returns the whether any bytes are available to read
 //|     on the USB serial input.  Allows for polling to see whether
 //|     to call the built-in input() or wait. (read-only)"""
diff --git a/shared-bindings/supervisor/__init__.c b/shared-bindings/supervisor/__init__.c
index 7fe6668f4..1830308b7 100644
--- a/shared-bindings/supervisor/__init__.c
+++ b/shared-bindings/supervisor/__init__.c
@@ -36,30 +36,16 @@
 #include "shared-bindings/supervisor/__init__.h"
 #include "shared-bindings/supervisor/Runtime.h"
 
-//| """:mod:`supervisor` --- Supervisor settings
-//| =================================================
-//|
-//| .. module:: supervisor
-//|   :synopsis: Supervisor settings
-//|   :platform: SAMD21/51 (All), nRF (Runtime only)
-//|
-//| The `supervisor` module. (TODO: expand description)
-//|
-//| Libraries
-//|
-//| .. toctree::
-//|     :maxdepth: 3
-//|
-//|     Runtime"""
+//| """Supervisor settings"""
 //|
 
-//| runtime: Any = ...
-//| """Runtime information, such as `runtime.serial_connected`
+//| runtime: Runtime = ...
+//| """Runtime information, such as ``runtime.serial_connected``
 //| (USB serial connection status).
 //| This object is the sole instance of `supervisor.Runtime`."""
 //|
 
-//| def enable_autoreload(self, ) -> Any:
+//| def enable_autoreload(self) -> None:
 //|     """Enable autoreload based on USB file write activity."""
 //|     ...
 //|
@@ -69,7 +55,7 @@ STATIC mp_obj_t supervisor_enable_autoreload(void) {
 }
 MP_DEFINE_CONST_FUN_OBJ_0(supervisor_enable_autoreload_obj, supervisor_enable_autoreload);
 
-//| def disable_autoreload(self, ) -> Any:
+//| def disable_autoreload(self) -> None:
 //|     """Disable autoreload based on USB file write activity until
 //|     `enable_autoreload` is called."""
 //|     ...
@@ -80,7 +66,7 @@ STATIC mp_obj_t supervisor_disable_autoreload(void) {
 }
 MP_DEFINE_CONST_FUN_OBJ_0(supervisor_disable_autoreload_obj, supervisor_disable_autoreload);
 
-//| def set_rgb_status_brightness(self, ) -> Any:
+//| def set_rgb_status_brightness(self, brightness: int) -> None:
 //|     """Set brightness of status neopixel from 0-255
 //|     `set_rgb_status_brightness` is called."""
 //|     ...
@@ -96,7 +82,7 @@ STATIC mp_obj_t supervisor_set_rgb_status_brightness(mp_obj_t lvl){
 }
 MP_DEFINE_CONST_FUN_OBJ_1(supervisor_set_rgb_status_brightness_obj, supervisor_set_rgb_status_brightness);
 
-//| def reload(self, ) -> Any:
+//| def reload(self) -> None:
 //|     """Reload the main Python code and run it (equivalent to hitting Ctrl-D at the REPL)."""
 //|     ...
 //|
@@ -107,7 +93,7 @@ STATIC mp_obj_t supervisor_reload(void) {
 }
 MP_DEFINE_CONST_FUN_OBJ_0(supervisor_reload_obj, supervisor_reload);
 
-//| def set_next_stack_limit(self, size: Any) -> Any:
+//| def set_next_stack_limit(self, size: int) -> None:
 //|     """Set the size of the stack for the next vm run. If its too large, the default will be used."""
 //|     ...
 //|
diff --git a/shared-bindings/terminalio/Terminal.c b/shared-bindings/terminalio/Terminal.c
index 1288b7018..5c045fdee 100644
--- a/shared-bindings/terminalio/Terminal.c
+++ b/shared-bindings/terminalio/Terminal.c
@@ -38,10 +38,7 @@
 #include "supervisor/shared/translate.h"
 
 //| class Terminal:
-//|     """.. currentmodule:: terminalio
-//|
-//|     :class:`Terminal` -- display a character stream with a TileGrid
-//|     ================================================================"""
+//|     """Display a character stream with a TileGrid"""
 //|
 //|     def __init__(self, tilegrid: Any, font: Any):
 //|         """Terminal manages tile indices and cursor position based on VT100 commands. The font should be
diff --git a/shared-bindings/terminalio/__init__.c b/shared-bindings/terminalio/__init__.c
index 591be839a..589211139 100644
--- a/shared-bindings/terminalio/__init__.c
+++ b/shared-bindings/terminalio/__init__.c
@@ -35,22 +35,10 @@
 
 #include "py/runtime.h"
 
-//| """:mod:`terminalio` --- Displays text in a TileGrid
-//| =================================================
-//|
-//| .. module:: terminalio
-//|   :synopsis: Displays text in a TileGrid
+//| """Displays text in a TileGrid
 //|
 //| The `terminalio` module contains classes to display a character stream on a display. The built
-//| in font is available as ``terminalio.FONT``.
-//|
-//| Libraries
-//|
-//| .. toctree::
-//|     :maxdepth: 3
-//|
-//|     Terminal"""
-//|
+//| in font is available as ``terminalio.FONT``."""
 //|
 STATIC const mp_rom_map_elem_t  terminalio_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_terminalio) },
diff --git a/shared-bindings/time/__init__.c b/shared-bindings/time/__init__.c
index 36eaa27f6..20277d6b0 100644
--- a/shared-bindings/time/__init__.c
+++ b/shared-bindings/time/__init__.c
@@ -36,12 +36,7 @@
 #include "shared-bindings/time/__init__.h"
 #include "supervisor/shared/translate.h"
 
-//| """:mod:`time` --- time and timing related functions
-//| ========================================================
-//|
-//| .. module:: time
-//|   :synopsis: time and timing related functions
-//|   :platform: SAMD21
+//| """time and timing related functions
 //|
 //| The `time` module is a strict subset of the CPython `cpython:time` module. So, code
 //| written in MicroPython will work in CPython but not necessarily the other
diff --git a/shared-bindings/touchio/TouchIn.c b/shared-bindings/touchio/TouchIn.c
index 6d59a1744..4c1d534ea 100644
--- a/shared-bindings/touchio/TouchIn.c
+++ b/shared-bindings/touchio/TouchIn.c
@@ -39,10 +39,7 @@
 #include "supervisor/shared/translate.h"
 
 //| class TouchIn:
-//|     """.. currentmodule:: touchio
-//|
-//|     :class:`TouchIn` -- Read the state of a capacitive touch sensor
-//|     ===================================================================
+//|     """Read the state of a capacitive touch sensor
 //|
 //|     Usage::
 //|
diff --git a/shared-bindings/touchio/__init__.c b/shared-bindings/touchio/__init__.c
index 96367f082..92e067cf6 100644
--- a/shared-bindings/touchio/__init__.c
+++ b/shared-bindings/touchio/__init__.c
@@ -35,23 +35,11 @@
 
 #include "py/runtime.h"
 
-//| """:mod:`touchio` --- Touch related IO
-//| =================================================
-//|
-//| .. module:: touchio
-//|   :synopsis: Hardware accelerated behavior
-//|   :platform: SAMD21
+//| """Touch related IO
 //|
 //| The `touchio` module contains classes to provide access to touch IO typically
 //| accelerated by hardware on the onboard microcontroller.
 //|
-//| Libraries
-//|
-//| .. toctree::
-//|     :maxdepth: 3
-//|
-//|     TouchIn
-//|
 //| All classes change hardware state and should be deinitialized when they
 //| are no longer needed if the program continues after use. To do so, either
 //| call :py:meth:`!deinit` or use a context manager. See
diff --git a/shared-bindings/uheap/__init__.c b/shared-bindings/uheap/__init__.c
index f1be30424..f089f2922 100644
--- a/shared-bindings/uheap/__init__.c
+++ b/shared-bindings/uheap/__init__.c
@@ -31,11 +31,7 @@
 
 #include "shared-bindings/uheap/__init__.h"
 
-//| """:mod:`uheap` --- Heap size analysis
-//| ================================================================
-//|
-//| .. module:: uheap
-//|   :synopsis: Heap size analysis"""
+//| """Heap size analysis"""
 //|
 
 //| def info(object: Any) -> Any:
diff --git a/shared-bindings/ulab/__init__.pyi b/shared-bindings/ulab/__init__.pyi
new file mode 100644
index 000000000..d2ff7eb80
--- /dev/null
+++ b/shared-bindings/ulab/__init__.pyi
@@ -0,0 +1,523 @@
+
+:mod:`ulab` --- Manipulate numeric data similar to numpy
+========================================================
+
+.. module:: ulab
+   :synopsis: Manipulate numeric data similar to numpy
+
+`ulab` is a numpy-like module for micropython, meant to simplify and
+speed up common mathematical operations on arrays. The primary goal was to
+implement a small subset of numpy that might be useful in the context of a
+microcontroller. This means low-level data processing of linear (array) and
+two-dimensional (matrix) data.
+
+`ulab` is adapted from micropython-ulab, and the original project's
+documentation can be found at
+https://micropython-ulab.readthedocs.io/en/latest/
+
+`ulab` is modeled after numpy, and aims to be a compatible subset where
+possible.  Numpy's documentation can be found at
+https://docs.scipy.org/doc/numpy/index.html
+
+.. contents::
+
+.. attribute:: __version__
+
+The closest corresponding version of micropython-ulab
+
+ulab.array -- 1- and 2- dimensional array
+-----------------------------------------
+
+.. class:: ulab.array(values, \*, dtype=float)
+
+  :param sequence values: Sequence giving the initial content of the array.
+  :param dtype: The type of array values, ``int8``, ``uint8``, ``int16``, ``uint16``, or ``float``
+
+  The `values` sequence can either be another ~ulab.array, sequence of numbers
+  (in which case a 1-dimensional array is created), or a sequence where each
+  subsequence has the same length (in which case a 2-dimensional array is
+  created).
+
+  Passing a ~ulab.array and a different dtype can be used to convert an array
+  from one dtype to another.
+
+  In many cases, it is more convenient to create an array from a function
+  like `zeros` or `linspace`.
+
+  `ulab.array` implements the buffer protocol, so it can be used in many
+  places an `array.array` can be used.
+
+   .. attribute:: shape
+
+      The size of the array, a tuple of length 1 or 2
+
+   .. attribute:: size
+
+      The number of elements in the array
+
+   .. attribute:: itemsize
+
+      The number of elements in the array
+
+   .. method:: flatten(\*, order='C')
+
+      :param order: Whether to flatten by rows ('C') or columns ('F')
+
+      Returns a new `ulab.array` object which is always 1 dimensional.
+      If order is 'C' (the default", then the data is ordered in rows;
+      If it is 'F', then the data is ordered in columns.  "C" and "F" refer
+      to the typical storage organization of the C and Fortran languages.
+
+   .. method:: sort(\*, axis=1)
+
+      :param axis: Whether to sort elements within rows (0), columns (1), or elements (None)
+
+   .. method:: transpose()
+
+      Swap the rows and columns of a 2-dimensional array
+
+   .. method:: __add__()
+
+      Adds corresponding elements of the two arrays, or adds a number to all
+      elements of the array.  If both arguments are arrays, their sizes must match.
+
+   .. method:: __sub__()
+
+      Subtracts corresponding elements of the two arrays, or adds a number to all
+      elements of the array.  If both arguments are arrays, their sizes must match.
+
+   .. method:: __mul__()
+
+      Multiplies corresponding elements of the two arrays, or multiplies
+      all elements of the array by a number.  If both arguments are arrays,
+      their sizes must match.
+
+   .. method:: __div__()
+
+      Multiplies corresponding elements of the two arrays, or divides
+      all elements of the array by a number.  If both arguments are arrays,
+      their sizes must match.
+
+   .. method:: __pow__()
+
+      Computes the power (x**y) of corresponding elements of the the two arrays,
+      or one number and one array.  If both arguments are arrays, their sizes
+      must match.
+
+   .. method:: __getitem__()
+
+      Retrieve an element of the array.
+
+   .. method:: __setitem__()
+
+      Set an element of the array.
+
+Array type codes
+----------------
+.. attribute:: int8
+
+   Type code for signed integers in the range -128 .. 127 inclusive, like the 'b' typecode of `array.array`
+
+.. attribute:: int16
+
+   Type code for signed integers in the range -32768 .. 32767 inclusive, like the 'h' typecode of `array.array`
+
+.. attribute:: float
+
+   Type code for floating point values, like the 'f' typecode of `array.array`
+
+.. attribute:: uint8
+
+   Type code for unsigned integers in the range 0 .. 255 inclusive, like the 'H' typecode of `array.array`
+
+.. attribute:: uint16
+
+   Type code for unsigned integers in the range 0 .. 65535 inclusive, like the 'h' typecode of `array.array`
+
+
+Basic Array defining functions
+------------------------------
+
+.. method:: ones(shape, \*, dtype=float)
+
+   .. param: shape
+      Shape of the array, either an integer (for a 1-D array) or a tuple of 2 integers (for a 2-D array)
+
+   .. param: dtype
+      Type of values in the array
+
+   Return a new array of the given shape with all elements set to 1.
+
+.. method:: zeros
+
+   .. param: shape
+      Shape of the array, either an integer (for a 1-D array) or a tuple of 2 integers (for a 2-D array)
+
+   .. param: dtype
+      Type of values in the array
+
+   Return a new array of the given shape with all elements set to 0.
+
+
+.. method:: eye(size, \*, dtype=float)
+
+   Return a new square array of size, with the diagonal elements set to 1
+   and the other elements set to 0.
+
+.. method:: linspace(start, stop, \*, dtype=float, num=50, endpoint=True)
+
+   .. param: start
+
+      First value in the array
+
+   .. param: stop
+
+      Final value in the array
+
+   .. param int: num
+
+      Count of values in the array
+
+   .. param: dtype
+
+      Type of values in the array
+
+   .. param bool: endpoint
+
+      Whether the ``stop`` value is included.  Note that even when
+      endpoint=True, the exact ``stop`` value may not be included due to the
+      inaccuracy of floating point arithmetic.
+
+   Return a new 1-D array with ``num`` elements ranging from ``start`` to ``stop`` linearly.
+
+
+:mod:`ulab.compare` --- Comparison functions
+============================================
+
+.. module::ulab.compare
+
+.. method:: clip(x1, x2, x3)
+
+   Constrain the values from ``x1`` to be between ``x2`` and ``x3``.
+   ``x2`` is assumed to be less than or equal to ``x3``.
+
+   Arguments may be ulab arrays or numbers.  All array arguments
+   must be the same size.  If the inputs are all scalars, a 1-element
+   array is returned.
+
+   Shorthand for ``ulab.maximum(x2, ulab.minimum(x1, x3))``
+
+.. method:: maximum(x1, x2)
+
+   Compute the element by element maximum of the arguments.
+
+   Arguments may be ulab arrays or numbers.  All array arguments
+   must be the same size.  If the inputs are both scalars, a number is
+   returned
+
+.. method:: minimum(x1, x2)
+
+   Compute the element by element minimum of the arguments.
+
+   Arguments may be ulab arrays or numbers.  All array arguments
+   must be the same size.  If the inputs are both scalars, a number is
+   returned
+
+
+:mod:`ulab.vector` --- Element-by-element functions
+===================================================
+
+.. module:: ulab.vector
+
+These functions can operate on numbers, 1-D arrays, or 2-D arrays by
+applying the function to every element in the array.  This is typically
+much more efficient than expressing the same operation as a Python loop.
+
+.. method:: acos
+
+   Computes the inverse cosine function
+
+.. method:: acosh
+
+   Computes the inverse hyperbolic cosine function
+
+.. method:: asin
+
+   Computes the inverse sine function
+
+.. method:: asinh
+
+   Computes the inverse hyperbolic sine function
+
+.. method:: around(a, \*, decimals)
+
+   Returns a new float array in which each element is rounded to
+   ``decimals`` places.
+
+.. method:: atan
+
+   Computes the inverse tangent function; the return values are in the
+   range [-pi/2,pi/2].
+
+.. method:: atan2(y,x)
+
+   Computes the inverse tangent function of y/x; the return values are in
+   the range [-pi, pi].
+
+.. method:: atanh
+
+   Computes the inverse hyperbolic tangent function
+
+.. method:: ceil
+
+   Rounds numbers up to the next whole number
+
+.. method:: cos
+
+   Computes the cosine function
+
+.. method:: erf
+
+   Computes the error function, which has applications in statistics
+
+.. method:: erfc
+
+   Computes the complementary error function, which has applications in statistics
+
+.. method:: exp
+
+   Computes the exponent function.
+
+.. method:: expm1
+
+   Computes $e^x-1$.  In certain applications, using this function preserves numeric accuracy better than the `exp` function.
+
+.. method:: floor
+
+   Rounds numbers up to the next whole number
+
+.. method:: gamma
+
+   Computes the gamma function
+
+.. method:: lgamma
+
+   Computes the natural log of the gamma function
+
+.. method:: log
+
+   Computes the natural log
+
+.. method:: log10
+
+   Computes the log base 10
+
+.. method:: log2
+
+   Computes the log base 2
+
+.. method:: sin
+
+   Computes the sine
+
+.. method:: sinh
+
+   Computes the hyperbolic sine
+
+.. method:: sqrt
+
+   Computes the square root
+
+.. method:: tan
+
+   Computes the tangent
+
+.. method:: tanh
+
+   Computes the hyperbolic tangent
+
+:mod:`ulab.linalg` - Linear algebra functions
+=============================================
+
+.. module:: ulab.linalg
+
+.. method:: cholesky(A)
+
+   :param ~ulab.array A: a positive definite, symmetric square matrix
+   :return ~ulab.array L: a square root matrix in the lower triangular form
+   :raises ValueError: If the input does not fulfill the necessary conditions
+
+   The returned matrix satisfies the equation m=LL*
+
+.. method:: det
+
+   :param: m, a square matrix
+   :return float: The determinant of the matrix
+
+   Computes the eigenvalues and eigenvectors of a square matrix
+
+.. method:: dot(m1, m2)
+
+   :param ~ulab.array m1: a matrix
+   :param ~ulab.array m2: a matrix
+
+   Computes the matrix product of two matrices
+
+   **WARNING:** Unlike ``numpy``, this function cannot be used to compute the dot product of two vectors
+
+.. method:: eig(m)
+
+   :param m: a square matrix
+   :return tuple (eigenvectors, eigenvalues):
+
+   Computes the eigenvalues and eigenvectors of a square matrix
+
+.. method:: inv(m)
+
+   :param ~ulab.array m: a square matrix
+   :return: The inverse of the matrix, if it exists
+   :raises ValueError: if the matrix is not invertible
+
+   Computes the inverse of a square matrix
+
+.. method:: size(array)
+
+   Return the total number of elements in the array, as an integer.
+
+.. method:: trace(m)
+
+   :param m: a square matrix
+
+   Compute the trace of the matrix, the sum of its diagonal elements.
+
+:mod:`ulab.filter` --- Filtering functions
+==========================================
+
+.. module:: ulab.filter
+
+.. method:: convolve(r, c=None)
+
+   :param ulab.array a:
+   :param ulab.array v:
+
+   Returns the discrete, linear convolution of two one-dimensional sequences.
+   The result is always an array of float.  Only the ``full`` mode is supported,
+   and the ``mode`` named parameter of numpy is not accepted. Note that all other
+   modes can be had by slicing a ``full`` result.
+
+   Convolution filters can implement high pass, low pass, band pass, etc.,
+   filtering operations.  Convolution filters are typically constructed ahead
+   of time.  This can be done using desktop python with scipy, or on web pages
+   such as https://fiiir.com/
+
+   Convolution is most time-efficient when both inputs are of float type.
+
+:mod:`ulab.fft` --- Frequency-domain functions
+==============================================
+
+.. module:: ulab.fft
+
+.. method:: fft(r, c=None)
+
+   :param ulab.array r: A 1-dimension array of values whose size is a power of 2
+   :param ulab.array c: An optional 1-dimension array of values whose size is a power of 2, giving the complex part of the value
+   :return tuple (r, c): The real and complex parts of the FFT
+
+   Perform a Fast Fourier Transform from the time domain into the frequency domain
+
+    See also ~ulab.extras.spectrum, which computes the magnitude of the fft,
+    rather than separately returning its real and imaginary parts.
+
+.. method:: ifft(r, c=None)
+
+   :param ulab.array r: A 1-dimension array of values whose size is a power of 2
+   :param ulab.array c: An optional 1-dimension array of values whose size is a power of 2, giving the complex part of the value
+   :return tuple (r, c): The real and complex parts of the inverse FFT
+
+   Perform an Inverse Fast Fourier Transform from the frequeny domain into the time domain
+
+:mod:`ulab.numerical` --- Numerical and Statistical functions
+=============================================================
+
+.. module:: ulab.numerical
+
+Most of these functions take an "axis" argument, which indicates whether to
+operate over the flattened array (None), rows (0), or columns (1).
+
+.. method:: argmax(array, \*, axis=None)
+
+   Return the index of the maximum element of the 1D array
+
+.. method:: argmin(array, \*, axis=None)
+
+   Return the index of the minimum element of the 1D array
+
+.. method:: argsort(array, \*, axis=None)
+
+   Returns an array which gives indices into the input array from least to greatest.
+
+.. method:: diff(array, \*, axis=1)
+
+   Return the numerical derivative of successive elements of the array, as
+   an array.  axis=None is not supported.
+
+.. method:: flip(array, \*, axis=None)
+
+   Returns a new array that reverses the order of the elements along the
+   given axis, or along all axes if axis is None.
+
+.. method:: max(array, \*, axis=None)
+
+   Return the maximum element of the 1D array
+
+.. method:: mean(array, \*, axis=None)
+
+   Return the mean element of the 1D array, as a number if axis is None, otherwise as an array.
+
+.. method:: min(array, \*, axis=None)
+
+   Return the minimum element of the 1D array
+
+.. method:: roll(array, distance, \*, axis=None)
+
+   Shift the content of a vector by the positions given as the second
+   argument. If the ``axis`` keyword is supplied, the shift is applied to
+   the given axis.  The array is modified in place.
+
+.. method:: std(array, \*, axis=None)
+
+   Return the standard deviation of the array, as a number if axis is None, otherwise as an array.
+
+.. method:: sum(array, \*, axis=None)
+
+   Return the sum of the array, as a number if axis is None, otherwise as an array.
+
+.. method:: sort(array, \*, axis=0)
+
+   Sort the array along the given axis, or along all axes if axis is None.
+   The array is modified in place.
+
+:mod:`ulab.poly` --- Polynomial functions
+=========================================
+
+.. module:: ulab.poly
+
+.. method:: polyfit([x, ] y, degree)
+
+   Return a polynomial of given degree that approximates the function
+   f(x)=y.  If x is not supplied, it is the range(len(y)).
+
+.. method:: polyval(p, x)
+
+   Evaluate the polynomial p at the points x.  x must be an array.
+
+:mod:`ulab.extras` --- Additional functions not in numpy
+========================================================
+
+.. method:: spectrum(r):
+
+   :param ulab.array r: A 1-dimension array of values whose size is a power of 2
+
+   Computes the spectrum of the input signal.  This is the absolute value of the (complex-valued) fft of the signal.
+
+   This function is similar to scipy's ``scipy.signal.spectrogram``.
diff --git a/shared-bindings/ulab/__init__.rst b/shared-bindings/ulab/__init__.rst
deleted file mode 100644
index d2ff7eb80..000000000
--- a/shared-bindings/ulab/__init__.rst
+++ /dev/null
@@ -1,523 +0,0 @@
-
-:mod:`ulab` --- Manipulate numeric data similar to numpy
-========================================================
-
-.. module:: ulab
-   :synopsis: Manipulate numeric data similar to numpy
-
-`ulab` is a numpy-like module for micropython, meant to simplify and
-speed up common mathematical operations on arrays. The primary goal was to
-implement a small subset of numpy that might be useful in the context of a
-microcontroller. This means low-level data processing of linear (array) and
-two-dimensional (matrix) data.
-
-`ulab` is adapted from micropython-ulab, and the original project's
-documentation can be found at
-https://micropython-ulab.readthedocs.io/en/latest/
-
-`ulab` is modeled after numpy, and aims to be a compatible subset where
-possible.  Numpy's documentation can be found at
-https://docs.scipy.org/doc/numpy/index.html
-
-.. contents::
-
-.. attribute:: __version__
-
-The closest corresponding version of micropython-ulab
-
-ulab.array -- 1- and 2- dimensional array
------------------------------------------
-
-.. class:: ulab.array(values, \*, dtype=float)
-
-  :param sequence values: Sequence giving the initial content of the array.
-  :param dtype: The type of array values, ``int8``, ``uint8``, ``int16``, ``uint16``, or ``float``
-
-  The `values` sequence can either be another ~ulab.array, sequence of numbers
-  (in which case a 1-dimensional array is created), or a sequence where each
-  subsequence has the same length (in which case a 2-dimensional array is
-  created).
-
-  Passing a ~ulab.array and a different dtype can be used to convert an array
-  from one dtype to another.
-
-  In many cases, it is more convenient to create an array from a function
-  like `zeros` or `linspace`.
-
-  `ulab.array` implements the buffer protocol, so it can be used in many
-  places an `array.array` can be used.
-
-   .. attribute:: shape
-
-      The size of the array, a tuple of length 1 or 2
-
-   .. attribute:: size
-
-      The number of elements in the array
-
-   .. attribute:: itemsize
-
-      The number of elements in the array
-
-   .. method:: flatten(\*, order='C')
-
-      :param order: Whether to flatten by rows ('C') or columns ('F')
-
-      Returns a new `ulab.array` object which is always 1 dimensional.
-      If order is 'C' (the default", then the data is ordered in rows;
-      If it is 'F', then the data is ordered in columns.  "C" and "F" refer
-      to the typical storage organization of the C and Fortran languages.
-
-   .. method:: sort(\*, axis=1)
-
-      :param axis: Whether to sort elements within rows (0), columns (1), or elements (None)
-
-   .. method:: transpose()
-
-      Swap the rows and columns of a 2-dimensional array
-
-   .. method:: __add__()
-
-      Adds corresponding elements of the two arrays, or adds a number to all
-      elements of the array.  If both arguments are arrays, their sizes must match.
-
-   .. method:: __sub__()
-
-      Subtracts corresponding elements of the two arrays, or adds a number to all
-      elements of the array.  If both arguments are arrays, their sizes must match.
-
-   .. method:: __mul__()
-
-      Multiplies corresponding elements of the two arrays, or multiplies
-      all elements of the array by a number.  If both arguments are arrays,
-      their sizes must match.
-
-   .. method:: __div__()
-
-      Multiplies corresponding elements of the two arrays, or divides
-      all elements of the array by a number.  If both arguments are arrays,
-      their sizes must match.
-
-   .. method:: __pow__()
-
-      Computes the power (x**y) of corresponding elements of the the two arrays,
-      or one number and one array.  If both arguments are arrays, their sizes
-      must match.
-
-   .. method:: __getitem__()
-
-      Retrieve an element of the array.
-
-   .. method:: __setitem__()
-
-      Set an element of the array.
-
-Array type codes
-----------------
-.. attribute:: int8
-
-   Type code for signed integers in the range -128 .. 127 inclusive, like the 'b' typecode of `array.array`
-
-.. attribute:: int16
-
-   Type code for signed integers in the range -32768 .. 32767 inclusive, like the 'h' typecode of `array.array`
-
-.. attribute:: float
-
-   Type code for floating point values, like the 'f' typecode of `array.array`
-
-.. attribute:: uint8
-
-   Type code for unsigned integers in the range 0 .. 255 inclusive, like the 'H' typecode of `array.array`
-
-.. attribute:: uint16
-
-   Type code for unsigned integers in the range 0 .. 65535 inclusive, like the 'h' typecode of `array.array`
-
-
-Basic Array defining functions
-------------------------------
-
-.. method:: ones(shape, \*, dtype=float)
-
-   .. param: shape
-      Shape of the array, either an integer (for a 1-D array) or a tuple of 2 integers (for a 2-D array)
-
-   .. param: dtype
-      Type of values in the array
-
-   Return a new array of the given shape with all elements set to 1.
-
-.. method:: zeros
-
-   .. param: shape
-      Shape of the array, either an integer (for a 1-D array) or a tuple of 2 integers (for a 2-D array)
-
-   .. param: dtype
-      Type of values in the array
-
-   Return a new array of the given shape with all elements set to 0.
-
-
-.. method:: eye(size, \*, dtype=float)
-
-   Return a new square array of size, with the diagonal elements set to 1
-   and the other elements set to 0.
-
-.. method:: linspace(start, stop, \*, dtype=float, num=50, endpoint=True)
-
-   .. param: start
-
-      First value in the array
-
-   .. param: stop
-
-      Final value in the array
-
-   .. param int: num
-
-      Count of values in the array
-
-   .. param: dtype
-
-      Type of values in the array
-
-   .. param bool: endpoint
-
-      Whether the ``stop`` value is included.  Note that even when
-      endpoint=True, the exact ``stop`` value may not be included due to the
-      inaccuracy of floating point arithmetic.
-
-   Return a new 1-D array with ``num`` elements ranging from ``start`` to ``stop`` linearly.
-
-
-:mod:`ulab.compare` --- Comparison functions
-============================================
-
-.. module::ulab.compare
-
-.. method:: clip(x1, x2, x3)
-
-   Constrain the values from ``x1`` to be between ``x2`` and ``x3``.
-   ``x2`` is assumed to be less than or equal to ``x3``.
-
-   Arguments may be ulab arrays or numbers.  All array arguments
-   must be the same size.  If the inputs are all scalars, a 1-element
-   array is returned.
-
-   Shorthand for ``ulab.maximum(x2, ulab.minimum(x1, x3))``
-
-.. method:: maximum(x1, x2)
-
-   Compute the element by element maximum of the arguments.
-
-   Arguments may be ulab arrays or numbers.  All array arguments
-   must be the same size.  If the inputs are both scalars, a number is
-   returned
-
-.. method:: minimum(x1, x2)
-
-   Compute the element by element minimum of the arguments.
-
-   Arguments may be ulab arrays or numbers.  All array arguments
-   must be the same size.  If the inputs are both scalars, a number is
-   returned
-
-
-:mod:`ulab.vector` --- Element-by-element functions
-===================================================
-
-.. module:: ulab.vector
-
-These functions can operate on numbers, 1-D arrays, or 2-D arrays by
-applying the function to every element in the array.  This is typically
-much more efficient than expressing the same operation as a Python loop.
-
-.. method:: acos
-
-   Computes the inverse cosine function
-
-.. method:: acosh
-
-   Computes the inverse hyperbolic cosine function
-
-.. method:: asin
-
-   Computes the inverse sine function
-
-.. method:: asinh
-
-   Computes the inverse hyperbolic sine function
-
-.. method:: around(a, \*, decimals)
-
-   Returns a new float array in which each element is rounded to
-   ``decimals`` places.
-
-.. method:: atan
-
-   Computes the inverse tangent function; the return values are in the
-   range [-pi/2,pi/2].
-
-.. method:: atan2(y,x)
-
-   Computes the inverse tangent function of y/x; the return values are in
-   the range [-pi, pi].
-
-.. method:: atanh
-
-   Computes the inverse hyperbolic tangent function
-
-.. method:: ceil
-
-   Rounds numbers up to the next whole number
-
-.. method:: cos
-
-   Computes the cosine function
-
-.. method:: erf
-
-   Computes the error function, which has applications in statistics
-
-.. method:: erfc
-
-   Computes the complementary error function, which has applications in statistics
-
-.. method:: exp
-
-   Computes the exponent function.
-
-.. method:: expm1
-
-   Computes $e^x-1$.  In certain applications, using this function preserves numeric accuracy better than the `exp` function.
-
-.. method:: floor
-
-   Rounds numbers up to the next whole number
-
-.. method:: gamma
-
-   Computes the gamma function
-
-.. method:: lgamma
-
-   Computes the natural log of the gamma function
-
-.. method:: log
-
-   Computes the natural log
-
-.. method:: log10
-
-   Computes the log base 10
-
-.. method:: log2
-
-   Computes the log base 2
-
-.. method:: sin
-
-   Computes the sine
-
-.. method:: sinh
-
-   Computes the hyperbolic sine
-
-.. method:: sqrt
-
-   Computes the square root
-
-.. method:: tan
-
-   Computes the tangent
-
-.. method:: tanh
-
-   Computes the hyperbolic tangent
-
-:mod:`ulab.linalg` - Linear algebra functions
-=============================================
-
-.. module:: ulab.linalg
-
-.. method:: cholesky(A)
-
-   :param ~ulab.array A: a positive definite, symmetric square matrix
-   :return ~ulab.array L: a square root matrix in the lower triangular form
-   :raises ValueError: If the input does not fulfill the necessary conditions
-
-   The returned matrix satisfies the equation m=LL*
-
-.. method:: det
-
-   :param: m, a square matrix
-   :return float: The determinant of the matrix
-
-   Computes the eigenvalues and eigenvectors of a square matrix
-
-.. method:: dot(m1, m2)
-
-   :param ~ulab.array m1: a matrix
-   :param ~ulab.array m2: a matrix
-
-   Computes the matrix product of two matrices
-
-   **WARNING:** Unlike ``numpy``, this function cannot be used to compute the dot product of two vectors
-
-.. method:: eig(m)
-
-   :param m: a square matrix
-   :return tuple (eigenvectors, eigenvalues):
-
-   Computes the eigenvalues and eigenvectors of a square matrix
-
-.. method:: inv(m)
-
-   :param ~ulab.array m: a square matrix
-   :return: The inverse of the matrix, if it exists
-   :raises ValueError: if the matrix is not invertible
-
-   Computes the inverse of a square matrix
-
-.. method:: size(array)
-
-   Return the total number of elements in the array, as an integer.
-
-.. method:: trace(m)
-
-   :param m: a square matrix
-
-   Compute the trace of the matrix, the sum of its diagonal elements.
-
-:mod:`ulab.filter` --- Filtering functions
-==========================================
-
-.. module:: ulab.filter
-
-.. method:: convolve(r, c=None)
-
-   :param ulab.array a:
-   :param ulab.array v:
-
-   Returns the discrete, linear convolution of two one-dimensional sequences.
-   The result is always an array of float.  Only the ``full`` mode is supported,
-   and the ``mode`` named parameter of numpy is not accepted. Note that all other
-   modes can be had by slicing a ``full`` result.
-
-   Convolution filters can implement high pass, low pass, band pass, etc.,
-   filtering operations.  Convolution filters are typically constructed ahead
-   of time.  This can be done using desktop python with scipy, or on web pages
-   such as https://fiiir.com/
-
-   Convolution is most time-efficient when both inputs are of float type.
-
-:mod:`ulab.fft` --- Frequency-domain functions
-==============================================
-
-.. module:: ulab.fft
-
-.. method:: fft(r, c=None)
-
-   :param ulab.array r: A 1-dimension array of values whose size is a power of 2
-   :param ulab.array c: An optional 1-dimension array of values whose size is a power of 2, giving the complex part of the value
-   :return tuple (r, c): The real and complex parts of the FFT
-
-   Perform a Fast Fourier Transform from the time domain into the frequency domain
-
-    See also ~ulab.extras.spectrum, which computes the magnitude of the fft,
-    rather than separately returning its real and imaginary parts.
-
-.. method:: ifft(r, c=None)
-
-   :param ulab.array r: A 1-dimension array of values whose size is a power of 2
-   :param ulab.array c: An optional 1-dimension array of values whose size is a power of 2, giving the complex part of the value
-   :return tuple (r, c): The real and complex parts of the inverse FFT
-
-   Perform an Inverse Fast Fourier Transform from the frequeny domain into the time domain
-
-:mod:`ulab.numerical` --- Numerical and Statistical functions
-=============================================================
-
-.. module:: ulab.numerical
-
-Most of these functions take an "axis" argument, which indicates whether to
-operate over the flattened array (None), rows (0), or columns (1).
-
-.. method:: argmax(array, \*, axis=None)
-
-   Return the index of the maximum element of the 1D array
-
-.. method:: argmin(array, \*, axis=None)
-
-   Return the index of the minimum element of the 1D array
-
-.. method:: argsort(array, \*, axis=None)
-
-   Returns an array which gives indices into the input array from least to greatest.
-
-.. method:: diff(array, \*, axis=1)
-
-   Return the numerical derivative of successive elements of the array, as
-   an array.  axis=None is not supported.
-
-.. method:: flip(array, \*, axis=None)
-
-   Returns a new array that reverses the order of the elements along the
-   given axis, or along all axes if axis is None.
-
-.. method:: max(array, \*, axis=None)
-
-   Return the maximum element of the 1D array
-
-.. method:: mean(array, \*, axis=None)
-
-   Return the mean element of the 1D array, as a number if axis is None, otherwise as an array.
-
-.. method:: min(array, \*, axis=None)
-
-   Return the minimum element of the 1D array
-
-.. method:: roll(array, distance, \*, axis=None)
-
-   Shift the content of a vector by the positions given as the second
-   argument. If the ``axis`` keyword is supplied, the shift is applied to
-   the given axis.  The array is modified in place.
-
-.. method:: std(array, \*, axis=None)
-
-   Return the standard deviation of the array, as a number if axis is None, otherwise as an array.
-
-.. method:: sum(array, \*, axis=None)
-
-   Return the sum of the array, as a number if axis is None, otherwise as an array.
-
-.. method:: sort(array, \*, axis=0)
-
-   Sort the array along the given axis, or along all axes if axis is None.
-   The array is modified in place.
-
-:mod:`ulab.poly` --- Polynomial functions
-=========================================
-
-.. module:: ulab.poly
-
-.. method:: polyfit([x, ] y, degree)
-
-   Return a polynomial of given degree that approximates the function
-   f(x)=y.  If x is not supplied, it is the range(len(y)).
-
-.. method:: polyval(p, x)
-
-   Evaluate the polynomial p at the points x.  x must be an array.
-
-:mod:`ulab.extras` --- Additional functions not in numpy
-========================================================
-
-.. method:: spectrum(r):
-
-   :param ulab.array r: A 1-dimension array of values whose size is a power of 2
-
-   Computes the spectrum of the input signal.  This is the absolute value of the (complex-valued) fft of the signal.
-
-   This function is similar to scipy's ``scipy.signal.spectrogram``.
diff --git a/shared-bindings/usb_hid/Device.c b/shared-bindings/usb_hid/Device.c
index bcea5b2c5..8c0c364ff 100644
--- a/shared-bindings/usb_hid/Device.c
+++ b/shared-bindings/usb_hid/Device.c
@@ -28,10 +28,7 @@
 #include "shared-bindings/usb_hid/Device.h"
 
 //| class Device:
-//|     """.. currentmodule:: usb_hid
-//|
-//|     :class:`Device` -- HID Device
-//|     ============================================
+//|     """HID Device
 //|
 //|     Usage::
 //|
diff --git a/shared-bindings/usb_hid/__init__.c b/shared-bindings/usb_hid/__init__.c
index 3d0978d62..e12ea8da4 100644
--- a/shared-bindings/usb_hid/__init__.c
+++ b/shared-bindings/usb_hid/__init__.c
@@ -31,12 +31,7 @@
 #include "shared-bindings/usb_hid/__init__.h"
 #include "shared-bindings/usb_hid/Device.h"
 
-//| """:mod:`usb_hid` --- USB Human Interface Device
-//| ===========================================================
-//|
-//| .. module:: usb_hid
-//|   :synopsis: USB Human Interface Device
-//|   :platform: SAMD21
+//| """USB Human Interface Device
 //|
 //| The `usb_hid` module allows you to output data as a HID device."""
 //|
@@ -44,14 +39,6 @@
 //| usb_hid.devices: Any = ...
 //| """Tuple of all active HID device interfaces."""
 //|
-
-//| """Libraries
-//|
-//| .. toctree::
-//|     :maxdepth: 3
-//|
-//|     Device"""
-//|
 STATIC const mp_rom_map_elem_t usb_hid_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_usb_hid) },
     { MP_ROM_QSTR(MP_QSTR_devices), MP_ROM_PTR(&common_hal_usb_hid_devices) },
diff --git a/shared-bindings/usb_midi/PortIn.c b/shared-bindings/usb_midi/PortIn.c
index 55a5865ca..9d9310b47 100644
--- a/shared-bindings/usb_midi/PortIn.c
+++ b/shared-bindings/usb_midi/PortIn.c
@@ -36,12 +36,9 @@
 #include "supervisor/shared/translate.h"
 
 //| class PortIn:
-//|     """.. currentmodule:: usb_midi
+//|     """Receives midi commands over USB"""
 //|
-//|     :class:`PortIn` -- receives midi commands over USB
-//|     ==================================================="""
-//|
-//|     def __init__(self, ):
+//|     def __init__(self):
 //|         """You cannot create an instance of `usb_midi.PortIn`.
 //|
 //|         PortIn objects are constructed for every corresponding entry in the USB
diff --git a/shared-bindings/usb_midi/PortOut.c b/shared-bindings/usb_midi/PortOut.c
index d83eb53b6..14ed0e767 100644
--- a/shared-bindings/usb_midi/PortOut.c
+++ b/shared-bindings/usb_midi/PortOut.c
@@ -36,10 +36,7 @@
 #include "supervisor/shared/translate.h"
 
 //| class PortOut:
-//|     """.. currentmodule:: usb_midi
-//|
-//|     :class:`PortOut` -- sends midi messages to a computer over USB
-//|     =============================================================="""
+//|     """Sends midi messages to a computer over USB"""
 //|
 //|     def __init__(self, ):
 //|         """You cannot create an instance of `usb_midi.PortOut`.
diff --git a/shared-bindings/usb_midi/__init__.c b/shared-bindings/usb_midi/__init__.c
index 2631d8a88..5570b601c 100644
--- a/shared-bindings/usb_midi/__init__.c
+++ b/shared-bindings/usb_midi/__init__.c
@@ -35,22 +35,7 @@
 
 #include "py/runtime.h"
 
-//| """:mod:`usb_midi` --- MIDI over USB
-//| =================================================
-//|
-//| .. module:: usb_midi
-//|   :synopsis: MIDI over USB
-//|
-//| The `usb_midi` module contains classes to transmit and receive MIDI messages over USB
-//|
-//| Libraries
-//|
-//| .. toctree::
-//|     :maxdepth: 3
-//|
-//|     PortIn
-//|     PortOut"""
-//|
+//| """Classes to transmit and receive MIDI messages over USB"""
 //|
 mp_map_elem_t usb_midi_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_usb_midi) },
diff --git a/shared-bindings/ustack/__init__.c b/shared-bindings/ustack/__init__.c
index 073840aba..e5fac6941 100644
--- a/shared-bindings/ustack/__init__.c
+++ b/shared-bindings/ustack/__init__.c
@@ -34,15 +34,11 @@
 
 
 
-//| """:mod:`ustack` --- Stack information and analysis
-//| ========================================================
-//|
-//| .. module:: ustack
-//|   :synopsis: stack information functions"""
+//| """Stack information and analysis"""
 //|
 
 #if MICROPY_MAX_STACK_USAGE
-//| def max_stack_usage() -> Any:
+//| def max_stack_usage() -> int:
 //|     """Return the maximum excursion of the stack so far."""
 //|     ...
 //|
@@ -53,7 +49,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(max_stack_usage_obj, max_stack_usage);
 
 #endif // MICROPY_MAX_STACK_USAGE
 
-//| def stack_size() -> Any:
+//| def stack_size() -> int:
 //|     """Return the size of the entire stack.
 //|     Same as in micropython.mem_info(), but returns a value instead
 //|     of just printing it."""
diff --git a/shared-bindings/wiznet/__init__.c b/shared-bindings/wiznet/__init__.c
index 5c8e8d3fd..0b0b7b14b 100644
--- a/shared-bindings/wiznet/__init__.c
+++ b/shared-bindings/wiznet/__init__.c
@@ -35,21 +35,7 @@
 
 #include "shared-module/network/__init__.h"
 
-//| """:mod:`wiznet` --- Support for WizNet hardware
-//| =============================================
-//|
-//| .. module:: wiznet
-//|   :synopsis: Support for WizNet hardware
-//|   :platform: SAMD
-//|
-//| Support for WizNet hardware, including the WizNet 5500 Ethernet adaptor.
-//|
-//| Libraries
-//|
-//| .. toctree::
-//|   :maxdepth: 3
-//|
-//|   wiznet5k"""
+//| """Support for WizNet hardware, including the WizNet 5500 Ethernet adaptor."""
 //|
 
 extern const mod_network_nic_type_t mod_network_nic_type_wiznet5k;
diff --git a/shared-bindings/wiznet/wiznet5k.c b/shared-bindings/wiznet/wiznet5k.c
index 2e2ee3949..2f49dffea 100644
--- a/shared-bindings/wiznet/wiznet5k.c
+++ b/shared-bindings/wiznet/wiznet5k.c
@@ -47,10 +47,7 @@
 #include "shared-module/wiznet/wiznet5k.h"
 
 //| class WIZNET5K:
-//|     """.. currentmodule:: wiznet
-//|
-//|     :class:`WIZNET5K` -- wrapper for Wiznet 5500 Ethernet interface
-//|     ==============================================================="""
+//|     """Wrapper for Wiznet 5500 Ethernet interface"""
 //|
 //|     def __init__(self, spi: busio.SPI, cs: microcontroller.Pin, rst: microcontroller.Pin, dhcp: bool = True):
 //|         """Create a new WIZNET5500 interface using the specified pins
diff --git a/tools/extract_pyi.py b/tools/extract_pyi.py
index de783eb27..95370f761 100644
--- a/tools/extract_pyi.py
+++ b/tools/extract_pyi.py
@@ -22,7 +22,7 @@ for module in modules:
     pyi_lines = []
     classes = os.listdir(module_path)
     classes = [x for x in sorted(classes) if x.endswith(".c")]
-    if classes[-1] == "__init__.c":
+    if classes and classes[-1] == "__init__.c":
         classes.insert(0, classes.pop())
     for class_file in classes:
         class_path = os.path.join(module_path, class_file)
@@ -37,6 +37,13 @@ for module in modules:
                         continue
                     pyi_lines.append(line)
 
+    raw_stubs = [x for x in sorted(classes) if x.endswith(".pyi")]
+    if raw_stubs and raw_stubs[-1] == "__init__.pyi":
+        raw_stubs.insert(0, raw_stubs.pop())
+    for raw_stub in raw_stubs:
+        raw_stub_path = os.path.join(module_path, raw_stub)
+        with open(raw_stub_path, "r") as f:
+            pyi_lines.extend(f.readlines())
     stub_filename = os.path.join(stub_directory, module + ".pyi")
     print(stub_filename)
     stub_contents = "".join(pyi_lines)
@@ -54,3 +61,6 @@ for module in modules:
     print()
 
 print(f"{ok} ok out of {total}")
+
+if ok != total:
+    sys.exit(total - ok)
-- 
cgit v1.2.3