8000 update fruit jam to rev D · cezer-io/circuitpython@9dd53eb · GitHub
[go: up one dir, main page]
Skip to content

Commit 9dd53eb

Browse files
dhalbertdhalbert
committed
update fruit jam to rev D
1 parent 9a05e64 commit 9dd53eb

File tree

2 files changed

+23
-6
lines changed

2 files changed

+23
-6
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO31)
1818
#define DEFAULT_SPI_BUS_MISO (&pin_GPIO28)
1919

20+
#define DEFAULT_UART_BUS_RX (&pin_GPIO9)
21+
#define DEFAULT_UART_BUS_TX (&pin_GPIO8)
22+
2023
#define DEFAULT_USB_HOST_DATA_PLUS (&pin_GPIO1)
2124
#define DEFAULT_USB_HOST_DATA_MINUS (&pin_GPIO2)
2225
#define DEFAULT_USB_HOST_5V_POWER (&pin_GPIO11)

‎ports/raspberrypi/boards/adafruit_fruit_jam/pins.c

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ static const mp_rom_map_elem_t board_module_globals_table[] = {
2828

2929
{ MP_OBJ_NEW_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO29) },
3030

31+
{ MP_OBJ_NEW_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO32) },
32+
3133
{ MP_OBJ_NEW_QSTR(MP_QSTR_BUTTON1), MP_ROM_PTR(&pin_GPIO0) },
3234
{ MP_OBJ_NEW_QSTR(MP_QSTR_BOOT), MP_ROM_PTR(&pin_GPIO0) },
3335

@@ -41,9 +43,19 @@ static const mp_rom_map_elem_t board_module_globals_table[] = {
4143
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO31) },
4244
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO28) },
4345

44-
{ MP_ROM_QSTR(MP_QSTR_ESP_CS), MP_ROM_PTR(&pin_GPIO46) },
46+
// Shared with ESP TX/RX.
47+
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO8) },
48+
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO9) },
4549

46-
{ MP_OBJ_NEW_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO32) },
50+
{ MP_ROM_QSTR(MP_QSTR_ESP_CS), MP_ROM_PTR(&pin_GPIO46) },
51+
// was GPIO0 on ESP32. Used for IRQ and mode switching.
52+
{ MP_ROM_QSTR(MP_QSTR_ESP_IRQ), MP_ROM_PTR(&pin_GPIO23) },
53+
// BUSY is also known as READY, and is RTS for BLE mode.
54+
{ MP_ROM_QSTR(MP_QSTR_ESP_BUSY), MP_ROM_PTR(&pin_GPIO3) },
55+
{ MP_ROM_QSTR(MP_QSTR_ESP_RESET), MP_ROM_PTR(&pin_GPIO22) },
56+
// TX and RX are from the point of view of the RP2350.
57+
{ MP_ROM_QSTR(MP_QSTR_ESP_TX), MP_ROM_PTR(&pin_GPIO8) },
58+
{ MP_ROM_QSTR(MP_QSTR_ESP_RX), MP_ROM_PTR(&pin_GPIO9) },
4759

4860
{ MP_ROM_QSTR(MP_QSTR_CKN), MP_ROM_PTR(&pin_GPIO12) },
4961
{ MP_ROM_QSTR(MP_QSTR_CKP), MP_ROM_PTR(&pin_GPIO13) },
@@ -56,11 +68,11 @@ static const mp_rom_map_elem_t board_module_globals_table[] = {
5668

5769
{ MP_ROM_QSTR(MP_QSTR_PERIPH_RESET), MP_ROM_PTR(&pin_GPIO22) },
5870

59-
{ MP_ROM_QSTR(MP_QSTR_I2S_MCLK), MP_ROM_PTR(&pin_GPIO27) },
60-
{ MP_ROM_QSTR(MP_QSTR_I2S_BCLK), MP_ROM_PTR(&pin_GPIO26) },
61-
{ MP_ROM_QSTR(MP_QSTR_I2S_WS), MP_ROM_PTR(&pin_GPIO25) },
6271
{ MP_ROM_QSTR(MP_QSTR_I2S_DIN), MP_ROM_PTR(&pin_GPIO24) },
63-
{ MP_ROM_QSTR(MP_QSTR_I2S_GPIO1), MP_ROM_PTR(&pin_GPIO23) },
72+
{ MP_ROM_QSTR(MP_QSTR_I2S_MCLK), MP_ROM_PTR(&pin_GPIO25) },
73+
{ MP_ROM_QSTR(MP_QSTR_I2S_BCLK), MP_ROM_PTR(&pin_GPIO26) },
74+
{ MP_ROM_QSTR(MP_QSTR_I2S_WS), MP_ROM_PTR(&pin_GPIO27) },
75+
{ MP_ROM_QSTR(MP_QSTR_I2S_IRQ), MP_ROM_PTR(&pin_GPIO23) },
6476

6577
{ MP_OBJ_NEW_QSTR(MP_QSTR_SD_SCK), MP_ROM_PTR(&pin_GPIO34) },
6678
{ MP_OBJ_NEW_QSTR(MP_QSTR_SDIO_CLOCK), MP_ROM_PTR(&pin_GPIO34) },
@@ -86,5 +98,7 @@ static const mp_rom_map_elem_t board_module_globals_table[] = {
8698
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
8799
{ MP_ROM_QSTR(MP_QSTR_STEMMA_I2C), MP_ROM_PTR(&board_i2c_obj) },
88100
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
101+
// Shared with ESP TX/RX.
102+
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
89103
};
90104
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

0 commit comments

Comments
 (0)
0