Merge pull request adafruit#10370 from dhalbert/merge-from-9.2.x-2025-05-23

eightycc · web-flow · commit ef9e14bb3990 · 2025-05-23T08:00:43.000-07:00
Merge from 9.2.x 2025 05 23
diff --git a/ports/atmel-samd/boards/openbook_m4/board.c b/ports/atmel-samd/boards/openbook_m4/board.c
@@ -85,6 +85,7 @@ void board_init(void) {
         false, // chip_select (don't always toggle chip select)
         false, // grayscale
         false, // acep
+        false, // spectra6
         false, // two_byte_sequence_length
         false); // address_little_endian
 }
diff --git a/ports/espressif/boards/adafruit_magtag_2.9_grayscale/board.c b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/board.c
@@ -141,6 +141,7 @@ void board_init(void) {
         false,  // always_toggle_chip_select
         true, // grayscale
         false, // acep
+        false, // spectra6
         false,  // two_byte_sequence_length
         false); // address_little_endian
 }
diff --git a/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk
@@ -10,6 +10,7 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
 CIRCUITPY_ESP_FLASH_SIZE = 4MB
 
 CIRCUITPY_ESPCAMERA = 0
+CIRCUITPY_PARALLELDISPLAYBUS = 0
 
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_ConnectionManager
diff --git a/ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.mk b/ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.mk
@@ -16,3 +16,4 @@ CIRCUITPY_CODEOP = 0
 
 # Not enough pins.
 CIRCUITPY_PARALLELDISPLAYBUS = 0
+CIRCUITPY_RGBMATRIX = 0
diff --git a/ports/espressif/boards/elecrow_crowpanel_4_2_epaper/board.c b/ports/espressif/boards/elecrow_crowpanel_4_2_epaper/board.c
@@ -96,6 +96,7 @@ void board_init(void) {
         false, // always_toggle_chip_select
         false, // grayscale
         false, // acep
+        false, // spectra6
         false, // two_byte_sequence_length
         false); // address_little_endian
 }
diff --git a/ports/espressif/boards/heltec_vision_master_e290/board.c b/ports/espressif/boards/heltec_vision_master_e290/board.c
@@ -94,6 +94,7 @@ void board_init(void) {
         false, // always_toggle_chip_select
         false, // grayscale
         false, // acep
+        false, // spectra6
         false, // two_byte_sequence_length
         true); // address_little_endian
 }
diff --git a/ports/espressif/boards/heltec_wireless_paper/board.c b/ports/espressif/boards/heltec_wireless_paper/board.c
@@ -134,6 +134,7 @@ void board_init(void) {
         false, // always_toggle_chip_select
         false, // grayscale
         false, // acep
+        false, // spectra6
         false, // two_byte_sequence_length
         false); // address_little_endian
 }
diff --git a/ports/espressif/boards/m5stack_m5paper/board.c b/ports/espressif/boards/m5stack_m5paper/board.c
@@ -74,6 +74,7 @@ void board_init(void) {
     //     false,  // always_toggle_chip_select
     //     false, // grayscale
     //     true, // acep
+    //     false, // spectra6
     //     false,  // two_byte_sequence_length
     //     false  // address_little_endian
     // );
diff --git a/ports/espressif/boards/makergo_esp32c3_supermini/mpconfigboard.mk b/ports/espressif/boards/makergo_esp32c3_supermini/mpconfigboard.mk
@@ -7,6 +7,8 @@ CIRCUITPY_ESP_FLASH_MODE=dio
 CIRCUITPY_ESP_FLASH_FREQ=80m
 CIRCUITPY_ESP_FLASH_SIZE=4MB
 
+CIRCUITPY_CODEOP = 0
+
 CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
 
 CIRCUITPY_ESP_USB_SERIAL_JTAG = 1
diff --git a/ports/espressif/boards/sqfmi_watchy/board.c b/ports/espressif/boards/sqfmi_watchy/board.c
@@ -190,6 +190,7 @@ void board_init(void) {
         false,  // always_toggle_chip_select
         false, // grayscale
         false, // acep
+        false, // spectra6
         false,  // two_byte_sequence_length
         true // address_little_endian
         );
diff --git a/ports/espressif/common-hal/audiobusio/__init__.c b/ports/espressif/common-hal/audiobusio/__init__.c
@@ -184,7 +184,7 @@ void port_i2s_play(i2s_t *self, mp_obj_t sample, bool loop) {
         self->next_buffer_size = sizeof(starting_frame);
         i2s_fill_buffer(self);
         i2s_channel_preload_data(self->handle, &starting_frame, sizeof(uint32_t), &bytes_loaded);
-        preloaded += 1;
+        preloaded += bytes_loaded;
     }
 
     // enable the channel
diff --git a/ports/raspberrypi/boards/42keebs_frood/pins.c b/ports/raspberrypi/boards/42keebs_frood/pins.c
@@ -49,6 +49,9 @@ static const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO15) },
     { MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO16) },
 
+    { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO10) },
+    { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO11) },
+
     { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO17) },
     { MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO17) },
     { MP_ROM_QSTR(MP_QSTR_VBUS_SENSE), MP_ROM_PTR(&pin_GPIO19) },
diff --git a/ports/raspberrypi/boards/bradanlanestudio_explorer_rp2040/board.c b/ports/raspberrypi/boards/bradanlanestudio_explorer_rp2040/board.c
@@ -281,6 +281,7 @@ void board_init(void) {
             true,                                                                                           // always_toggle_chip_select
             false,                                                                                          // not grayscale
             false,                                                                                          // not acep
+            false,                                                                                          // not spectra6
             false,                                                                                          // not two_byte_sequence_length
             true);                                                                                          // address_little_endian
     } else if (vid_setting == 2) {  // Explorer SSD1608 BW
@@ -314,6 +315,7 @@ void board_init(void) {
             true,                                                                                           // always_toggle_chip_select
             false,                                                                                          // not grayscale
             false,                                                                                          // not acep
+            false,                                                                                          // not spectra6
             false,                                                                                          // not two_byte_sequence_length
             true);                                                                                          // address_little_endian
     } else {
diff --git a/ports/raspberrypi/boards/pimoroni_badger2040/board.c b/ports/raspberrypi/boards/pimoroni_badger2040/board.c
@@ -303,6 +303,7 @@ void board_init(void) {
         false,  // always_toggle_chip_select
         false, // grayscale
         false, // acep
+        false, // spectra6
         false,  // two_byte_sequence_length
         false); // address_little_endian
 }
diff --git a/ports/raspberrypi/boards/pimoroni_badger2040w/board.c b/ports/raspberrypi/boards/pimoroni_badger2040w/board.c
@@ -303,6 +303,7 @@ void board_init(void) {
         false,  // always_toggle_chip_select
         false, // grayscale
         false, // acep
+        false, // spectra6
         false,  // two_byte_sequence_length
         false); // address_little_endian
 }
diff --git a/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/board.c b/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/board.c
@@ -97,6 +97,7 @@ void board_init(void) {
         false,  // always_toggle_chip_select
         false, // grayscale
         true, // acep
+        false, // spectra6
         false,  // two_byte_sequence_length
         false); // address_little_endian
 }
diff --git a/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/mpconfigboard.h b/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/mpconfigboard.h
@@ -14,8 +14,8 @@
 
 #define MICROPY_HW_LED_STATUS   (&pin_GPIO6)
 
-#define DEFAULT_I2C_BUS_SCL (&pin_GPIO4)
-#define DEFAULT_I2C_BUS_SDA (&pin_GPIO5)
+#define DEFAULT_I2C_BUS_SDA (&pin_GPIO4)
+#define DEFAULT_I2C_BUS_SCL (&pin_GPIO5)
 
 #define DEFAULT_UART_BUS_TX (&pin_GPIO0)
 #define DEFAULT_UART_BUS_RX (&pin_GPIO1)
diff --git a/ports/raspberrypi/boards/pimoroni_inky_frame_7_3/board.c b/ports/raspberrypi/boards/pimoroni_inky_frame_7_3/board.c
@@ -156,6 +156,7 @@ void board_init(void) {
         false,  // always_toggle_chip_select
         false, // grayscale
         true, // acep
+        false, // spectra6
         false,  // two_byte_sequence_length
         false); // address_little_endian
 }
diff --git a/ports/raspberrypi/boards/pimoroni_inky_frame_7_3/mpconfigboard.h b/ports/raspberrypi/boards/pimoroni_inky_frame_7_3/mpconfigboard.h
@@ -14,8 +14,8 @@
 
 #define MICROPY_HW_LED_STATUS   (&pin_GPIO6)
 
-#define DEFAULT_I2C_BUS_SCL (&pin_GPIO4)
-#define DEFAULT_I2C_BUS_SDA (&pin_GPIO5)
+#define DEFAULT_I2C_BUS_SDA (&pin_GPIO4)
+#define DEFAULT_I2C_BUS_SCL (&pin_GPIO5)
 
 #define DEFAULT_UART_BUS_TX (&pin_GPIO0)
 #define DEFAULT_UART_BUS_RX (&pin_GPIO1)
diff --git a/shared-bindings/epaperdisplay/EPaperDisplay.c b/shared-bindings/epaperdisplay/EPaperDisplay.c
@@ -62,6 +62,7 @@
 //|         always_toggle_chip_select: bool = False,
 //|         grayscale: bool = False,
 //|         advanced_color_epaper: bool = False,
+//|         spectra6: bool = False,
 //|         two_byte_sequence_length: bool = False,
 //|         start_up_time: float = 0,
 //|         address_little_endian: bool = False,
@@ -104,6 +105,7 @@
 //|         :param bool always_toggle_chip_select: When True, chip select is toggled every byte
 //|         :param bool grayscale: When true, the color ram is the low bit of 2-bit grayscale
 //|         :param bool advanced_color_epaper: When true, the display is a 7-color advanced color epaper (ACeP)
+//|         :param bool spectra6: When true, the display is a 6-color spectra6 epaper
 //|         :param bool two_byte_sequence_length: When true, use two bytes to define sequence length
 //|         :param float start_up_time: Time to wait after reset before sending commands
 //|         :param bool address_little_endian: Send the least significant byte (not bit) of multi-byte addresses first. Ignored when ram is addressed with one byte
@@ -117,7 +119,7 @@ static mp_obj_t epaperdisplay_epaperdisplay_make_new(const mp_obj_type_t *type,
            ARG_set_current_row_command, ARG_write_black_ram_command, ARG_black_bits_inverted,
            ARG_write_color_ram_command, ARG_color_bits_inverted, ARG_highlight_color,
            ARG_refresh_display_command,  ARG_refresh_time, ARG_busy_pin, ARG_busy_state,
-           ARG_seconds_per_frame, ARG_always_toggle_chip_select, ARG_grayscale, ARG_advanced_color_epaper,
+           ARG_seconds_per_frame, ARG_always_toggle_chip_select, ARG_grayscale, ARG_advanced_color_epaper, ARG_spectra6,
            ARG_two_byte_sequence_length, ARG_start_up_time, ARG_address_little_endian };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_display_bus, MP_ARG_REQUIRED | MP_ARG_OBJ },
@@ -147,6 +149,7 @@ static mp_obj_t epaperdisplay_epaperdisplay_make_new(const mp_obj_type_t *type,
         { MP_QSTR_always_toggle_chip_select, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = false} },
         { MP_QSTR_grayscale, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = false} },
         { MP_QSTR_advanced_color_epaper, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = false} },
+        { MP_QSTR_spectra6, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = false} },
         { MP_QSTR_two_byte_sequence_length, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = false} },
         { MP_QSTR_start_up_time, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = MP_OBJ_NEW_SMALL_INT(0)} },
         { MP_QSTR_address_little_endian, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = false} },
@@ -215,7 +218,7 @@ static mp_obj_t epaperdisplay_epaperdisplay_make_new(const mp_obj_type_t *type,
         args[ARG_write_black_ram_command].u_int, args[ARG_black_bits_inverted].u_bool, write_color_ram_command,
         args[ARG_color_bits_inverted].u_bool, highlight_color, refresh_buf, refresh_buf_len, refresh_time,
         busy_pin, args[ARG_busy_state].u_bool, seconds_per_frame,
-        args[ARG_always_toggle_chip_select].u_bool, args[ARG_grayscale].u_bool, args[ARG_advanced_color_epaper].u_bool,
+        args[ARG_always_toggle_chip_select].u_bool, args[ARG_grayscale].u_bool, args[ARG_advanced_color_epaper].u_bool, args[ARG_spectra6].u_bool,
         two_byte_sequence_length, args[ARG_address_little_endian].u_bool
         );
 
diff --git a/shared-bindings/epaperdisplay/EPaperDisplay.h b/shared-bindings/epaperdisplay/EPaperDisplay.h
@@ -26,7 +26,7 @@ void common_hal_epaperdisplay_epaperdisplay_construct(epaperdisplay_epaperdispla
     uint16_t write_color_ram_command, bool color_bits_inverted, uint32_t highlight_color,
     const uint8_t *refresh_sequence, uint16_t refresh_sequence_len, mp_float_t refresh_time,
     const mcu_pin_obj_t *busy_pin, bool busy_state, mp_float_t seconds_per_frame,
-    bool always_toggle_chip_select, bool grayscale, bool acep, bool two_byte_sequence_length,
+    bool always_toggle_chip_select, bool grayscale, bool acep, bool spectra6, bool two_byte_sequence_length,
     bool address_little_endian);
 
 bool common_hal_epaperdisplay_epaperdisplay_refresh(epaperdisplay_epaperdisplay_obj_t *self);
diff --git a/shared-module/audiodelays/Echo.c b/shared-module/audiodelays/Echo.c
diff --git a/shared-module/audiodelays/Echo.h b/shared-module/audiodelays/Echo.h
diff --git a/shared-module/displayio/ColorConverter.c b/shared-module/displayio/ColorConverter.c
diff --git a/shared-module/displayio/ColorConverter.h b/shared-module/displayio/ColorConverter.h
diff --git a/shared-module/displayio/Palette.h b/shared-module/displayio/Palette.h
diff --git a/shared-module/epaperdisplay/EPaperDisplay.c b/shared-module/epaperdisplay/EPaperDisplay.c

Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,7 @@ void board_init(void) {`
`85`	`85`	`false, // chip_select (don't always toggle chip select)`
`86`	`86`	`false, // grayscale`
`87`	`87`	`false, // acep`
	`88`	`+ false, // spectra6`
`88`	`89`	`false, // two_byte_sequence_length`
`89`	`90`	`false); // address_little_endian`
`90`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -141,6 +141,7 @@ void board_init(void) {`
`141`	`141`	`false, // always_toggle_chip_select`
`142`	`142`	`true, // grayscale`
`143`	`143`	`false, // acep`
	`144`	`+ false, // spectra6`
`144`	`145`	`false, // two_byte_sequence_length`
`145`	`146`	`false); // address_little_endian`
`146`	`147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,3 +16,4 @@ CIRCUITPY_CODEOP = 0`
`16`	`16`
`17`	`17`	`# Not enough pins.`
`18`	`18`	`CIRCUITPY_PARALLELDISPLAYBUS = 0`
	`19`	`+CIRCUITPY_RGBMATRIX = 0`
Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,7 @@ void board_init(void) {`
`96`	`96`	`false, // always_toggle_chip_select`
`97`	`97`	`false, // grayscale`
`98`	`98`	`false, // acep`
	`99`	`+ false, // spectra6`
`99`	`100`	`false, // two_byte_sequence_length`
`100`	`101`	`false); // address_little_endian`
`101`	`102`	`}`
Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,7 @@ void board_init(void) {`
`94`	`94`	`false, // always_toggle_chip_select`
`95`	`95`	`false, // grayscale`
`96`	`96`	`false, // acep`
	`97`	`+ false, // spectra6`
`97`	`98`	`false, // two_byte_sequence_length`
`98`	`99`	`true); // address_little_endian`
`99`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -134,6 +134,7 @@ void board_init(void) {`
`134`	`134`	`false, // always_toggle_chip_select`
`135`	`135`	`false, // grayscale`
`136`	`136`	`false, // acep`
	`137`	`+ false, // spectra6`
`137`	`138`	`false, // two_byte_sequence_length`
`138`	`139`	`false); // address_little_endian`
`139`	`140`	`}`