Skip to content

Commit 6bb4703

Browse files
dhalbertdhalbert
committed
Merge remote-tracking branch 'adafruit/main' into adcdma
2 parents 0ab4f12 + 27c2dfb commit 6bb4703

48 files changed

Lines changed: 684 additions & 124 deletions

File tree

Some content is hidden

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

‎main.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -967,15 +967,15 @@ int __attribute__((used)) main(void) {
967967
safe_mode = NO_CIRCUITPY;
968968
}
969969

970-
// displays init after filesystem, since they could share the flash SPI
971-
board_init();
972-
973970
// Reset everything and prep MicroPython to run boot.py.
974971
reset_port();
975972
// Port-independent devices, like CIRCUITPY_BLEIO_HCI.
976973
reset_devices();
977974
reset_board();
978975

976+
// displays init after filesystem, since they could share the flash SPI
977+
board_init();
978+
979979
// This is first time we are running CircuitPython after a reset or power-up.
980980
supervisor_set_run_reason(RUN_REASON_STARTUP);
981981

‎ports/broadcom/boards/diodes_delight_piunora/mpconfigboard.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@
44
#define DEFAULT_I2C_BUS_SDA (&pin_GPIO2)
55

66
#define MICROPY_HW_NEOPIXEL (&pin_GPIO12)
7+
8+
#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO4)
9+
#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO5)

‎ports/broadcom/boards/raspberrypi_cm4io/mpconfigboard.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@
44
#define DEFAULT_I2C_BUS_SDA (&pin_GPIO2)
55

66
#define MICROPY_HW_LED_STATUS (&pin_GPIO42)
7+
8+
#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO14)
9+
#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO15)

‎ports/broadcom/boards/raspberrypi_pi4b/mpconfigboard.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@
44
#define DEFAULT_I2C_BUS_SDA (&pin_GPIO2)
55

66
#define MICROPY_HW_LED_STATUS (&pin_GPIO42)
7+
8+
#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO14)
9+
#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO15)

‎ports/broadcom/boards/raspberrypi_zero/mpconfigboard.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@
44
#define DEFAULT_I2C_BUS_SDA (&pin_GPIO2)
55

66
#define MICROPY_HW_LED_STATUS (&pin_GPIO47)
7+
8+
#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO14)
9+
#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO15)

‎ports/broadcom/boards/raspberrypi_zero2w/mpconfigboard.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,8 @@
22

33
#define DEFAULT_I2C_BUS_SCL (&pin_GPIO3)
44
#define DEFAULT_I2C_BUS_SDA (&pin_GPIO2)
5+
6+
#define MICROPY_HW_LED_STATUS (&pin_GPIO29)
7+
8+
#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO14)
9+
#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO15)

‎ports/broadcom/boards/raspberrypi_zero2w/pins.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
5555
{ MP_ROM_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO25) },
5656
{ MP_ROM_QSTR(MP_QSTR_D26), MP_ROM_PTR(&pin_GPIO26) },
5757
{ MP_ROM_QSTR(MP_QSTR_D27), MP_ROM_PTR(&pin_GPIO27) },
58+
{ MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO29) },
5859

5960
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
6061
{ MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display)},

‎ports/broadcom/boards/raspberrypi_zero_w/mpconfigboard.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@
44
#define DEFAULT_I2C_BUS_SDA (&pin_GPIO2)
55

66
#define MICROPY_HW_LED_STATUS (&pin_GPIO47)
7+
8+
#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO14)
9+
#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO15)

‎ports/broadcom/mpconfigport.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,4 @@
6060
#define MICROPY_PORT_ROOT_POINTERS \
6161
CIRCUITPY_COMMON_ROOT_POINTERS
6262

63-
#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO14)
64-
#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO15)
65-
6663
#endif // __INCLUDED_MPCONFIGPORT_H

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,6 @@ void board_init(void) {
6363
0, // Polarity
6464
0); // Phase
6565

66-
// workaround as board_init() is called before reset_port() in main.c
67-
pwmout_reset();
68-
6966
displayio_display_obj_t *display = &displays[0].display;
7067
display->base.type = &displayio_display_type;
7168
common_hal_displayio_display_construct(

0 commit comments

Comments
 (0)