Skip to content

Commit cc0a6c8

Browse files
tannewttannewt
committed
Merge remote-tracking branch 'adafruit/main' into fix_nrf_wdt_crashes
2 parents a4246bc + 65753a1 commit cc0a6c8

File tree

79 files changed

+385
-557
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+385
-557
lines changed

‎docs/redirects.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ shared-bindings/displayio/Group.rst shared-bindings/displayio/#displayio.Group
7171
shared-bindings/displayio/I2CDisplay.rst shared-bindings/displayio/#displayio.I2CDisplay
7272
shared-bindings/displayio/OnDiskBitmap.rst shared-bindings/displayio/#displayio.OnDiskBitmap
7373
shared-bindings/displayio/Palette.rst shared-bindings/displayio/#displayio.Palette
74-
shared-bindings/displayio/ParallelBus.rst shared-bindings/displayio/#displayio.ParallelBus
74+
shared-bindings/paralleldisplay/ParallelBus.rst shared-bindings/paralleldisplay/#paralleldisplay.ParallelBus
7575
shared-bindings/displayio/Shape.rst shared-bindings/displayio/#displayio.Shape
7676
shared-bindings/displayio/TileGrid.rst shared-bindings/displayio/#displayio.TileGrid
7777
shared-bindings/displayio/__init__.rst shared-bindings/displayio/

‎frozen/circuitpython-stage

‎ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ CIRCUITPY_USB_MIDI = 0
2020
# So not all of displayio, sorry!
2121
CIRCUITPY_VECTORIO = 0
2222
CIRCUITPY_BITMAPTOOLS = 0
23+
CIRCUITPY_PARALLELDISPLAY = 0
2324

2425
# Include these Python libraries in firmware.
2526
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground

‎ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ CIRCUITPY_BITBANG_APA102 = 0
2020
CIRCUITPY_FREQUENCYIO = 0
2121
CIRCUITPY_I2CPERIPHERAL = 0
2222
CIRCUITPY_NEOPIXEL_WRITE = 0
23+
CIRCUITPY_PARALLELDISPLAY = 0
2324
CIRCUITPY_PIXELBUF = 0
2425
CIRCUITPY_PS2IO = 0
2526
CIRCUITPY_PULSEIO = 0

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ uint8_t display_init_sequence[] = {
6161
};
6262

6363
void board_init(void) {
64-
displayio_parallelbus_obj_t *bus = &displays[0].parallel_bus;
65-
bus->base.type = &displayio_parallelbus_type;
66-
common_hal_displayio_parallelbus_construct(bus,
64+
paralleldisplay_parallelbus_obj_t *bus = &displays[0].parallel_bus;
65+
bus->base.type = &paralleldisplay_parallelbus_type;
66+
common_hal_paralleldisplay_parallelbus_construct(bus,
6767
&pin_PA16, // Data0
6868
&pin_PB05, // Command or data
6969
&pin_PB06, // Chip select

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ uint8_t display_init_sequence[] = {
7878
};
7979

8080
void board_init(void) {
81-
displayio_parallelbus_obj_t *bus = &displays[0].parallel_bus;
82-
bus->base.type = &displayio_parallelbus_type;
83-
common_hal_displayio_parallelbus_construct(bus,
81+
paralleldisplay_parallelbus_obj_t *bus = &displays[0].parallel_bus;
82+
bus->base.type = &paralleldisplay_parallelbus_type;
83+
common_hal_paralleldisplay_parallelbus_construct(bus,
8484
&pin_PA16, // Data0
8585
&pin_PB05, // Command or data
8686
&pin_PB06, // Chip select

‎ports/atmel-samd/boards/ugame10/mpconfigboard.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ CIRCUITPY_BITMAPTOOLS = 0
2424
CIRCUITPY_FREQUENCYIO = 0
2525
CIRCUITPY_I2CPERIPHERAL = 0
2626
CIRCUITPY_NEOPIXEL_WRITE = 0
27+
CIRCUITPY_PARALLELDISPLAY = 0
2728
CIRCUITPY_PIXELBUF = 0
2829
CIRCUITPY_RTC = 0
2930
CIRCUITPY_TOUCHIO = 0

‎ports/atmel-samd/common-hal/displayio/ParallelBus.c renamed to ‎ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* THE SOFTWARE.
2525
*/
2626

27-
#include "shared-bindings/displayio/ParallelBus.h"
27+
#include "shared-bindings/paralleldisplay/ParallelBus.h"
2828

2929
#include <stdint.h>
3030

@@ -33,7 +33,7 @@
3333
#include "shared-bindings/digitalio/DigitalInOut.h"
3434
#include "shared-bindings/microcontroller/__init__.h"
3535

36-
void common_hal_displayio_parallelbus_construct(displayio_parallelbus_obj_t *self,
36+
void common_hal_paralleldisplay_parallelbus_construct(paralleldisplay_parallelbus_obj_t *self,
3737
const mcu_pin_obj_t *data0, const mcu_pin_obj_t *command, const mcu_pin_obj_t *chip_select,
3838
const mcu_pin_obj_t *write, const mcu_pin_obj_t *read, const mcu_pin_obj_t *reset, uint32_t frequency) {
3939

@@ -83,7 +83,7 @@ void common_hal_displayio_parallelbus_construct(displayio_parallelbus_obj_t *sel
8383
common_hal_digitalio_digitalinout_construct(&self->reset, reset);
8484
common_hal_digitalio_digitalinout_switch_to_output(&self->reset, true, DRIVE_MODE_PUSH_PULL);
8585
never_reset_pin_number(reset->number);
86-
common_hal_displayio_parallelbus_reset(self);
86+
common_hal_paralleldisplay_parallelbus_reset(self);
8787
}
8888

8989
never_reset_pin_number(command->number);
@@ -95,7 +95,7 @@ void common_hal_displayio_parallelbus_construct(displayio_parallelbus_obj_t *sel
9595
}
9696
}
9797

98-
void common_hal_displayio_parallelbus_deinit(displayio_parallelbus_obj_t *self) {
98+
void common_hal_paralleldisplay_parallelbus_deinit(paralleldisplay_parallelbus_obj_t *self) {
9999
for (uint8_t i = 0; i < 8; i++) {
100100
reset_pin_number(self->data0_pin + i);
101101
}
@@ -107,8 +107,8 @@ void common_hal_displayio_parallelbus_deinit(displayio_parallelbus_obj_t *self)
107107
reset_pin_number(self->reset.pin->number);
108108
}
109109

110-
bool common_hal_displayio_parallelbus_reset(mp_obj_t obj) {
111-
displayio_parallelbus_obj_t *self = MP_OBJ_TO_PTR(obj);
110+
bool common_hal_paralleldisplay_parallelbus_reset(mp_obj_t obj) {
111+
paralleldisplay_parallelbus_obj_t *self = MP_OBJ_TO_PTR(obj);
112112
if (self->reset.base.type == &mp_type_NoneType) {
113113
return false;
114114
}
@@ -119,19 +119,19 @@ bool common_hal_displayio_parallelbus_reset(mp_obj_t obj) {
119119
return true;
120120
}
121121

122-
bool common_hal_displayio_parallelbus_bus_free(mp_obj_t obj) {
122+
bool common_hal_paralleldisplay_parallelbus_bus_free(mp_obj_t obj) {
123123
return true;
124124
}
125125

126-
bool common_hal_displayio_parallelbus_begin_transaction(mp_obj_t obj) {
127-
displayio_parallelbus_obj_t *self = MP_OBJ_TO_PTR(obj);
126+
bool common_hal_paralleldisplay_parallelbus_begin_transaction(mp_obj_t obj) {
127+
paralleldisplay_parallelbus_obj_t *self = MP_OBJ_TO_PTR(obj);
128128
common_hal_digitalio_digitalinout_set_value(&self->chip_select, false);
129129
return true;
130130
}
131131

132-
void common_hal_displayio_parallelbus_send(mp_obj_t obj, display_byte_type_t byte_type,
132+
void common_hal_paralleldisplay_parallelbus_send(mp_obj_t obj, display_byte_type_t byte_type,
133133
display_chip_select_behavior_t chip_select, const uint8_t *data, uint32_t data_length) {
134-
displayio_parallelbus_obj_t *self = MP_OBJ_TO_PTR(obj);
134+
paralleldisplay_parallelbus_obj_t *self = MP_OBJ_TO_PTR(obj);
135135
common_hal_digitalio_digitalinout_set_value(&self->command, byte_type == DISPLAY_DATA);
136136
uint32_t *clear_write = (uint32_t *)&self->write_group->OUTCLR.reg;
137137
uint32_t *set_write = (uint32_t *)&self->write_group->OUTSET.reg;
@@ -143,7 +143,7 @@ void common_hal_displayio_parallelbus_send(mp_obj_t obj, display_byte_type_t byt
143143
}
144144
}
145145

146-
void common_hal_displayio_parallelbus_end_transaction(mp_obj_t obj) {
147-
displayio_parallelbus_obj_t *self = MP_OBJ_TO_PTR(obj);
146+
void common_hal_paralleldisplay_parallelbus_end_transaction(mp_obj_t obj) {
147+
paralleldisplay_parallelbus_obj_t *self = MP_OBJ_TO_PTR(obj);
148148
common_hal_digitalio_digitalinout_set_value(&self->chip_select, true);
149149
}

‎ports/atmel-samd/common-hal/displayio/ParallelBus.h renamed to ‎ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
* THE SOFTWARE.
2525
*/
2626

27-
#ifndef MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_DISPLAYIO_PARALLELBUS_H
28-
#define MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_DISPLAYIO_PARALLELBUS_H
27+
#ifndef MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_PARALLELDISPLAY_PARALLELBUS_H
28+
#define MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_PARALLELDISPLAY_PARALLELBUS_H
2929

3030
#include "common-hal/digitalio/DigitalInOut.h"
3131

@@ -40,6 +40,6 @@ typedef struct {
4040
uint8_t data0_pin;
4141
PortGroup *write_group;
4242
uint32_t write_mask;
43-
} displayio_parallelbus_obj_t;
43+
} paralleldisplay_parallelbus_obj_t;
4444

45-
#endif // MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_DISPLAYIO_PARALLELBUS_H
45+
#endif // MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_PARALLELDISPLAY_PARALLELBUS_H

‎ports/esp32s2/common-hal/displayio/ParallelBus.c renamed to ‎ports/esp32s2/common-hal/paralleldisplay/ParallelBus.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* THE SOFTWARE.
2525
*/
2626

27-
#include "shared-bindings/displayio/ParallelBus.h"
27+
#include "shared-bindings/paralleldisplay/ParallelBus.h"
2828

2929
#include <stdint.h>
3030

@@ -38,7 +38,7 @@
3838
* - data0 pin must be byte aligned
3939
*/
4040

41-
void common_hal_displayio_parallelbus_construct(displayio_parallelbus_obj_t *self,
41+
void common_hal_paralleldisplay_parallelbus_construct(paralleldisplay_parallelbus_obj_t *self,
4242
const mcu_pin_obj_t *data0, const mcu_pin_obj_t *command, const mcu_pin_obj_t *chip_select,
4343
const mcu_pin_obj_t *write, const mcu_pin_obj_t *read, const mcu_pin_obj_t *reset, uint32_t frequency) {
4444

@@ -120,7 +120,7 @@ void common_hal_displayio_parallelbus_construct(displayio_parallelbus_obj_t *sel
120120
common_hal_digitalio_digitalinout_construct(&self->reset, reset);
121121
common_hal_digitalio_digitalinout_switch_to_output(&self->reset, true, DRIVE_MODE_PUSH_PULL);
122122
never_reset_pin_number(reset->number);
123-
common_hal_displayio_parallelbus_reset(self);
123+
common_hal_paralleldisplay_parallelbus_reset(self);
124124
}
125125

126126
never_reset_pin_number(command->number);
@@ -133,7 +133,7 @@ void common_hal_displayio_parallelbus_construct(displayio_parallelbus_obj_t *sel
133133

134134
}
135135

136-
void common_hal_displayio_parallelbus_deinit(displayio_parallelbus_obj_t *self) {
136+
void common_hal_paralleldisplay_parallelbus_deinit(paralleldisplay_parallelbus_obj_t *self) {
137137
/* SNIP - same as from SAMD and NRF ports */
138138
for (uint8_t i = 0; i < 8; i++) {
139139
reset_pin_number(self->data0_pin + i);
@@ -146,9 +146,9 @@ void common_hal_displayio_parallelbus_deinit(displayio_parallelbus_obj_t *self)
146146
reset_pin_number(self->reset.pin->number);
147147
}
148148

149-
bool common_hal_displayio_parallelbus_reset(mp_obj_t obj) {
149+
bool common_hal_paralleldisplay_parallelbus_reset(mp_obj_t obj) {
150150
/* SNIP - same as from SAMD and NRF ports */
151-
displayio_parallelbus_obj_t *self = MP_OBJ_TO_PTR(obj);
151+
paralleldisplay_parallelbus_obj_t *self = MP_OBJ_TO_PTR(obj);
152152
if (self->reset.base.type == &mp_type_NoneType) {
153153
return false;
154154
}
@@ -160,21 +160,21 @@ bool common_hal_displayio_parallelbus_reset(mp_obj_t obj) {
160160

161161
}
162162

163-
bool common_hal_displayio_parallelbus_bus_free(mp_obj_t obj) {
163+
bool common_hal_paralleldisplay_parallelbus_bus_free(mp_obj_t obj) {
164164
/* SNIP - same as from SAMD and NRF ports */
165165
return true;
166166
}
167167

168-
bool common_hal_displayio_parallelbus_begin_transaction(mp_obj_t obj) {
168+
bool common_hal_paralleldisplay_parallelbus_begin_transaction(mp_obj_t obj) {
169169
/* SNIP - same as from SAMD and NRF ports */
170-
displayio_parallelbus_obj_t *self = MP_OBJ_TO_PTR(obj);
170+
paralleldisplay_parallelbus_obj_t *self = MP_OBJ_TO_PTR(obj);
171171
common_hal_digitalio_digitalinout_set_value(&self->chip_select, false);
172172
return true;
173173
}
174174

175-
void common_hal_displayio_parallelbus_send(mp_obj_t obj, display_byte_type_t byte_type,
175+
void common_hal_paralleldisplay_parallelbus_send(mp_obj_t obj, display_byte_type_t byte_type,
176176
display_chip_select_behavior_t chip_select, const uint8_t *data, uint32_t data_length) {
177-
displayio_parallelbus_obj_t *self = MP_OBJ_TO_PTR(obj);
177+
paralleldisplay_parallelbus_obj_t *self = MP_OBJ_TO_PTR(obj);
178178
common_hal_digitalio_digitalinout_set_value(&self->command, byte_type == DISPLAY_DATA);
179179

180180
uint32_t *clear_write = self->write_clear_register;
@@ -220,8 +220,8 @@ void common_hal_displayio_parallelbus_send(mp_obj_t obj, display_byte_type_t byt
220220

221221
}
222222

223-
void common_hal_displayio_parallelbus_end_transaction(mp_obj_t obj) {
223+
void common_hal_paralleldisplay_parallelbus_end_transaction(mp_obj_t obj) {
224224
/* SNIP - same as from SAMD and NRF ports */
225-
displayio_parallelbus_obj_t *self = MP_OBJ_TO_PTR(obj);
225+
paralleldisplay_parallelbus_obj_t *self = MP_OBJ_TO_PTR(obj);
226226
common_hal_digitalio_digitalinout_set_value(&self->chip_select, true);
227227
}

0 commit comments

Comments
 (0)