10000 Merge pull request #10370 from dhalbert/merge-from-9.2.x-2025-05-23 · samdev-7/circuitpython@ef9e14b · GitHub
[go: up one dir, main page]
Skip to content

Commit ef9e14b

Browse files
eightycceightycc
authored
Merge pull request adafruit#10370 from dhalbert/merge-from-9.2.x-2025-05-23
Merge from 9.2.x 2025 05 23
2 parents c6e4d72 + f219aad commit ef9e14b

File tree

27 files changed

+141
-78
lines changed

27 files changed

+141
-78
lines changed

‎ports/atmel-samd/boards/openbook_m4/board.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ void board_init(void) {
8585
false, // chip_select (don't always toggle chip select)
8686
false, // grayscale
8787
false, // acep
88+
false, // spectra6
8889
false, // two_byte_sequence_length
8990
false); // address_little_endian
9091
}

‎ports/espressif/boards/adafruit_magtag_2.9_grayscale/board.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ void board_init(void) {
141141
false, // always_toggle_chip_select
142142
true, // grayscale
143143
false, // acep
144+
false, // spectra6
144145
false, // two_byte_sequence_length
145146
false); // address_little_endian
146147
}

‎ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m
1010
CIRCUITPY_ESP_FLASH_SIZE = 4MB
1111

1212
CIRCUITPY_ESPCAMERA = 0
13+
CIRCUITPY_PARALLELDISPLAYBUS = 0
1314

1415
# Include these Python libraries in firmware.
1516
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_ConnectionManager

‎ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ CIRCUITPY_CODEOP = 0
1616

1717
# Not enough pins.
1818
CIRCUITPY_PARALLELDISPLAYBUS = 0
19+
CIRCUITPY_RGBMATRIX = 0

‎ports/espressif/boards/elecrow_crowpanel_4_2_epaper/board.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ void board_init(void) {
9696
false, // always_toggle_chip_select
9797
false, // grayscale
9898
false, // acep
99+
false, // spectra6
99100
false, // two_byte_sequence_length
100101
false); // address_little_endian
101102
}

‎ports/espressif/boards/heltec_vision_master_e290/board.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ void board_init(void) {
9494
false, // always_toggle_chip_select
9595
false, // grayscale
9696
false, // acep
97+
false, // spectra6
9798
false, // two_byte_sequence_length
9899
true); // address_little_endian
99100
}

‎ports/espressif/boards/heltec_wireless_paper/board.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ void board_init(void) {
134134
false, // always_toggle_chip_select
135135
false, // grayscale
136136
false, // acep
137+
false, // spectra6
137138
false, // two_byte_sequence_length
138139
false); // address_little_endian
139140
}

‎ports/espressif/boards/m5stack_m5paper/board.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ void board_init(void) {
7474
// false, // always_toggle_chip_select
7575
// false, // grayscale
7676
// true, // acep
77+
// false, // spectra6
7778
// false, // two_byte_sequence_length
7879
// false // address_little_endian
7980
// );

‎ports/espressif/boards/makergo_esp32c3_supermini/mpconfigboard.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ CIRCUITPY_ESP_FLASH_MODE=dio
77
CIRCUITPY_ESP_FLASH_FREQ=80m
88
CIRCUITPY_ESP_FLASH_SIZE=4MB
99

10+
CIRCUITPY_CODEOP = 0
11+
1012
CIRCUITPY_LEGACY_4MB_FLASH_LAYOUT = 1
1113

1214
CIRCUITPY_ESP_USB_SERIAL_JTAG = 1

‎ports/espressif/boards/sqfmi_watchy/board.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ void board_init(void) {
190190
false, // always_toggle_chip_select
191191
false, // grayscale
192192
false, // acep
193+
false, // spectra6
193194
false, // two_byte_sequence_length
194195
true // address_little_endian
195196
);

‎ports/espressif/common-hal/audiobusio/__init__.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ void port_i2s_play(i2s_t *self, mp_obj_t sample, bool loop) {
184184
self->next_buffer_size = sizeof(starting_frame);
185185
i2s_fill_buffer(self);
186186
i2s_channel_preload_data(self->handle, &starting_frame, sizeof(uint32_t), &bytes_loaded);
187-
preloaded += 1;
187+
preloaded += bytes_loaded;
188188
}
189189

190190
// enable the channel

‎ports/raspberrypi/boards/42keebs_frood/pins.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ static const mp_rom_map_elem_t board_module_globals_table[] = {
4949
{ MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_GPIO15) },
5050
{ MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO16) },
5151

52+
{ MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO10) },
53+
{ MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO11) },
54+
5255
{ MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO17) },
5356
{ MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO17) },
5457
{ MP_ROM_QSTR(MP_QSTR_VBUS_SENSE), MP_ROM_PTR(&pin_GPIO19) },

‎ports/raspberrypi/boards/bradanlanestudio_explorer_rp2040/board.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,7 @@ void board_init(void) {
281281
true, // always_toggle_chip_select
282282
false, // not grayscale
283283
false, // not acep
284+
false, // not spectra6
284285
false, // not two_byte_sequence_length
285286
true); // address_little_endian
286287
} else if (vid_setting == 2) { // Explorer SSD1608 BW
@@ -314,6 +315,7 @@ void board_init(void) {
314315
true, // always_toggle_chip_select
315316
false, // not grayscale
316317
false, // not acep
318+
false, // not spectra6
317319
false, // not two_byte_sequence_length
318320
true); // address_little_endian
319321
} else {

‎ports/raspberrypi/boards/pimoroni_badger2040/board.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,7 @@ void board_init(void) {
303303
false, // always_toggle_chip_select
304304
false, // grayscale
305305
false, // acep
306+
false, // spectra6
306307
false, // two_byte_sequence_length
307308
false); // address_little_endian
308309
}

‎ports/raspberrypi/boards/pimoroni_badger2040w/board.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,7 @@ void board_init(void) {
303303
false, // always_toggle_chip_select
304304
false, // grayscale
305305
false, // acep
306+
false, // spectra6
306307
false, // two_byte_sequence_length
307308
false); // address_little_endian
308309
}

‎ports/raspberrypi/boards/pimoroni_inky_frame_5_7/board.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ void board_init(void) {
9797
false, // always_toggle_chip_select
9898
false, // grayscale
9999
true, // acep
100+
false, // spectra6
100101
false, // two_byte_sequence_length
101102
false); // address_little_endian
102103
}

‎ports/raspberrypi/boards/pimoroni_inky_frame_5_7/mpconfigboard.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
#define MICROPY_HW_LED_STATUS (&pin_GPIO6)
1616

17-
#define DEFAULT_I2C_BUS_SCL (&pin_GPIO4)
18-
#define DEFAULT_I2C_BUS_SDA (&pin_GPIO5)
17+
#define DEFAULT_I2C_BUS_SDA (&pin_GPIO4)
18+
#define DEFAULT_I2C_BUS_SCL (&pin_GPIO5)
1919

2020
#define DEFAULT_UART_BUS_TX (&pin_GPIO0)
2121
#define DEFAULT_UART_BUS_RX (&pin_GPIO1)

‎ports/raspberrypi/boards/pimoroni_inky_frame_7_3/board.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ void board_init(void) {
156156
false, // always_toggle_chip_select
157157
false, // grayscale
158158
true, // acep
159+
false, // spectra6
159160
false, // two_byte_sequence_length
160161
false); // address_little_endian
161162
}

‎ports/raspberrypi/boards/pimoroni_inky_frame_7_3/mpconfigboard.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
#define MICROPY_HW_LED_STATUS (&pin_GPIO6)
1616

17-
#define DEFAULT_I2C_BUS_SCL (&pin_GPIO4)
18-
#define DEFAULT_I2C_BUS_SDA (&pin_GPIO5)
17+
#define DEFAULT_I2C_BUS_SDA (&pin_GPIO4)
18+
#define DEFAULT_I2C_BUS_SCL (&pin_GPIO5)
1919

2020
#define DEFAULT_UART_BUS_TX (&pin_GPIO0)
2121
#define DEFAULT_UART_BUS_RX (&pin_GPIO1)

‎shared-bindings/epaperdisplay/EPaperDisplay.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
//| always_toggle_chip_select: bool = False,
6363
//| grayscale: bool = False,
6464
//| advanced_color_epaper: bool = False,
65+
//| spectra6: bool = False,
6566
//| two_byte_sequence_length: bool = False,
6667
//| start_up_time: float = 0,
6768
//| address_little_endian: bool = False,
@@ -104,6 +105,7 @@
104105
//| :param bool always_toggle_chip_select: When True, chip select is toggled every byte
105106
//| :param bool grayscale: When true, the color ram is the low bit of 2-bit grayscale
106107
//| :param bool advanced_color_epaper: When true, the display is a 7-color advanced color epaper (ACeP)
108+
//| :param bool spectra6: When true, the display is a 6-color spectra6 epaper
107109
//| :param bool two_byte_sequence_length: When true, use two bytes to define sequence length
108110
//| :param float start_up_time: Time to wait after reset before sending commands
109111
//| :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,
117119
ARG_set_current_row_command, ARG_write_black_ram_command, ARG_black_bits_inverted,
118120
ARG_write_color_ram_command, ARG_color_bits_inverted, ARG_highlight_color,
119121
ARG_refresh_display_command, ARG_refresh_time, ARG_busy_pin, ARG_busy_state,
120-
ARG_seconds_per_frame, ARG_always_toggle_chip_select, ARG_grayscale, ARG_advanced_color_epaper,
122+
ARG_seconds_per_frame, ARG_always_toggle_chip_select, ARG_grayscale, ARG_advanced_color_epaper, ARG_spectra6,
121123
ARG_two_byte_sequence_length, ARG_start_up_time, ARG_address_little_endian };
122124
static const mp_arg_t allowed_args[] = {
123125
{ 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,
147149
{ MP_QSTR_always_toggle_chip_select, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = false} },
148150
{ MP_QSTR_grayscale, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = false} },
149151
{ MP_QSTR_advanced_color_epaper, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = false} },
152+
{ MP_QSTR_spectra6, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = false} },
150153
{ MP_QSTR_two_byte_sequence_length, MP_ARG_BOOL | MP_ARG_KW_ONLY, {.u_bool = false} },
151154
{ MP_QSTR_start_up_time, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = MP_OBJ_NEW_SMALL_INT(0)} },
152155
{ 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,
215218
args[ARG_write_black_ram_command].u_int, args[ARG_black_bits_inverted].u_bool, write_color_ram_command,
216219
args[ARG_color_bits_inverted].u_bool, highlight_color, refresh_buf, refresh_buf_len, refresh_time,
217220
busy_pin, args[ARG_busy_state].u_bool, seconds_per_frame,
218-
args[ARG_always_toggle_chip_select].u_bool, args[ARG_grayscale].u_bool, args[ARG_advanced_color_epaper].u_bool,
221+
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,
219222
two_byte_sequence_length, args[ARG_address_little_endian].u_bool
220223
);
221224

‎shared-bindings/epaperdisplay/EPaperDisplay.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ void common_hal_epaperdisplay_epaperdisplay_construct(epaperdisplay_epaperdispla
2626
uint16_t write_color_ram_command, bool color_bits_inverted, uint32_t highlight_color,
2727
const uint8_t *refresh_sequence, uint16_t refresh_sequence_len, mp_float_t refresh_time,
2828
const mcu_pin_obj_t *busy_pin, bool busy_state, mp_float_t seconds_per_frame,
29-
bool always_toggle_chip_select, bool grayscale, bool acep, bool two_byte_sequence_length,
29+
bool always_toggle_chip_select, bool grayscale, bool acep, bool spectra6, bool two_byte_sequence_length,
3030
bool address_little_endian);
3131

3232
bool common_hal_epaperdisplay_epaperdisplay_refresh(epaperdisplay_epaperdisplay_obj_t *self);

0 commit comments

Comments
 (0)
0