Skip to content

Commit ee2f7bd

Browse files
tannewttannewt
authored
Merge branch 'main' into rp2350_rgbmatrix
2 parents a802f12 + 668020b commit ee2f7bd

File tree

35 files changed

+602
-241
lines changed

35 files changed

+602
-241
lines changed

‎lib/tlsf‎

Submodule tlsf updated 1 file

‎locale/circuitpython.pot‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1187,10 +1187,12 @@ msgstr ""
11871187
#: ports/raspberrypi/common-hal/picodvi/Framebuffer_RP2040.c py/argcheck.c
11881188
#: shared-bindings/digitalio/DigitalInOut.c
11891189
#: shared-bindings/epaperdisplay/EPaperDisplay.c shared-bindings/pwmio/PWMOut.c
1190+
#: shared-module/aurora_epaper/aurora_framebuffer.c
11901191
msgid "Invalid %q"
11911192
msgstr ""
11921193

11931194
#: ports/raspberrypi/common-hal/picodvi/Framebuffer_RP2350.c
1195+
#: shared-module/aurora_epaper/aurora_framebuffer.c
11941196
msgid "Invalid %q and %q"
11951197
msgstr ""
11961198

@@ -1214,11 +1216,6 @@ msgstr ""
12141216
msgid "Invalid BSSID"
12151217
msgstr ""
12161218

1217-
#: shared-module/aurora_epaper/aurora_framebuffer.c
1218-
#, c-format
1219-
msgid "Invalid CoG id=%d"
1220-
msgstr ""
1221-
12221219
#: shared-bindings/wifi/Radio.c
12231220
msgid "Invalid MAC address"
12241221
msgstr ""
@@ -2166,14 +2163,6 @@ msgstr ""
21662163
msgid "Unknown BLE error: %d"
21672164
msgstr ""
21682165

2169-
#: shared-module/aurora_epaper/aurora_framebuffer.c
2170-
msgid "Unknown device size."
2171-
msgstr ""
2172-
2173-
#: shared-module/aurora_epaper/aurora_framebuffer.c
2174-
msgid "Unknown display type!"
2175-
msgstr ""
2176-
21772166
#: ports/espressif/common-hal/max3421e/Max3421E.c
21782167
#: ports/raspberrypi/common-hal/wifi/__init__.c
21792168
#, c-format
@@ -2231,10 +2220,6 @@ msgstr ""
22312220
msgid "Unsupported colorspace"
22322221
msgstr ""
22332222

2234-
#: shared-module/aurora_epaper/aurora_framebuffer.c
2235-
msgid "Unsupported device size."
2236-
msgstr ""
2237-
22382223
#: shared-module/displayio/bus_core.c
22392224
msgid "Unsupported display bus type"
22402225
msgstr ""

‎ports/espressif/boards/adafruit_feather_esp32c6_4mbflash_nopsram/pins.c‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,21 @@ static const mp_rom_map_elem_t board_module_globals_table[] = {
1616
{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO4) },
1717
{ MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },
1818

19-
{ MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO3) },
20-
{ MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) },
21-
22-
{ MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO2) },
23-
{ MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) },
24-
25-
{ MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO6) },
19+
{ MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO6) },
2620
{ MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },
27-
{ MP_ROM_QSTR(MP_QSTR_D24), MP_ROM_PTR(&pin_GPIO6) },
21+
// Also shared with right side.
22+
{ MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) },
2823

29-
{ MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO5) },
24+
{ MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO5) },
3025
{ MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },
31-
{ MP_ROM_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO5) },
26+
// Also shared with right side.
27+
{ MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) },
28+
29+
{ MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_GPIO3) },
30+
{ MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) },
31+
32+
{ MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO2) },
33+
{ MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) },
3234

3335
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO21) },
3436
{ MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },
@@ -66,18 +68,15 @@ static const mp_rom_map_elem_t board_module_globals_table[] = {
6668
{ MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },
6769
{ MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO7) },
6870

69-
// These two are shared with the left side!
70-
{ MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) },
71-
72-
{ MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) },
71+
// See left side above for IO6 and IO5, which are duplicated on both sides.
7372

7473
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO18) },
7574
{ MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) },
7675

7776
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO19) },
7877
{ MP_ROM_QSTR(MP_QSTR_IO19), MP_ROM_PTR(&pin_GPIO19) },
7978

80-
{ MP_ROM_QSTR(MP_QSTR_I2C_POWER), MP_ROM_PTR(&pin_GPIO20) },
79+
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL_I2C_POWER), MP_ROM_PTR(&pin_GPIO20) },
8180

8281
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
8382
{ MP_ROM_QSTR(MP_QSTR_STEMMA_I2C), MP_ROM_PTR(&board_i2c_obj) },

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// This file is part of the CircuitPython project: https://circuitpython.org
2+
//
3+
// SPDX-FileCopyrightText: Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
4+
//
5+
// SPDX-License-Identifier: MIT
6+
7+
#include "supervisor/board.h"
8+
9+
// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.

‎ports/espressif/boards/adafruit_vindie_s2/mpconfigboard.h‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// This file is part of the CircuitPython project: https://circuitpython.org
2+
//
3+
// SPDX-FileCopyrightText: Copyright (c) 2019 Scott Shawcroft for Adafruit Industries
4+
//
5+
// SPDX-License-Identifier: MIT
6+
7+
#pragma once
8+
9+
// Micropython setup
10+
11+
#define MICROPY_HW_BOARD_NAME "Adafruit Vindie S2"
12+
#define MICROPY_HW_MCU_NAME "ESP32S2"
13+
14+
#define MICROPY_HW_NEOPIXEL (&pin_GPIO33)
15+
#define MICROPY_HW_NEOPIXEL_COUNT (4)
16+
17+
#define MICROPY_HW_LED_STATUS (&pin_GPIO18)
18+
19+
#define DEFAULT_I2C_BUS_SCL (&pin_GPIO11)
20+
#define DEFAULT_I2C_BUS_SDA (&pin_GPIO12)
21+
22+
#define DEFAULT_UART_BUS_RX (&pin_GPIO21)
23+
#define DEFAULT_UART_BUS_TX (&pin_GPIO45)
24+
25+
#define DOUBLE_TAP_PIN (&pin_GPIO17)

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
USB_VID = 0x239A
2+
USB_PID = 0x8160
3+
USB_PRODUCT = "Adafruit Vindie S2"
4+
USB_MANUFACTURER = "Adafruit"
5+
6+
IDF_TARGET = esp32s2
7+
8+
CIRCUITPY_ESP_FLASH_SIZE = 4MB
9+
CIRCUITPY_ESP_FLASH_MODE = qio
10+
CIRCUITPY_ESP_FLASH_FREQ = 80m
11+
12+
CIRCUITPY_ESP_PSRAM_SIZE = 2MB
13+
CIRCUITPY_ESP_PSRAM_MODE = qio
14+
CIRCUITPY_ESP_PSRAM_FREQ = 80m
15+
16+
CIRCUITPY_PARALLELDISPLAYBUS = 0

‎ports/espressif/boards/adafruit_vindie_s2/pins.c‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
// This file is part of the CircuitPython project: https://circuitpython.org
2+
//
3+
// SPDX-FileCopyrightText: Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
4+
//
5+
// SPDX-License-Identifier: MIT
6+
7+
#include "shared-bindings/board/__init__.h"
8+
9+
static const mp_rom_map_elem_t board_module_globals_table[] = {
10+
CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
11+
12+
{ MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) },
13+
{ MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO0) },
14+
{ MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO0) },
15+
16+
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO12) },
17+
{ MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12) },
18+
19+
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO11) },
20+
{ MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_GPIO11) },
21+
22+
{ MP_ROM_QSTR(MP_QSTR_FAN), MP_ROM_PTR(&pin_GPIO34) },
23+
{ MP_ROM_QSTR(MP_QSTR_D34), MP_ROM_PTR(&pin_GPIO34) },
24+
25+
{ MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO18) },
26+
{ MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO18) },
27+
{ MP_ROM_QSTR(MP_QSTR_L), MP_ROM_PTR(&pin_GPIO18) },
28+
29+
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO21) },
30+
{ MP_ROM_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_GPIO21) },
31+
32+
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO45) },
33+
{ MP_ROM_QSTR(MP_QSTR_D45), MP_ROM_PTR(&pin_GPIO45) },
34+
35+
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO33) },
36+
37+
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
38+
{ MP_ROM_QSTR(MP_QSTR_STEMMA_I2C), MP_ROM_PTR(&board_i2c_obj) },
39+
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) }
40+
};
41+
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

‎ports/espressif/boards/adafruit_vindie_s2/sdkconfig‎

Whitespace-only changes.

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// This file is part of the CircuitPython project: https://circuitpython.org
2+
//
3+
// SPDX-FileCopyrightText: Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
4+
//
5+
// SPDX-License-Identifier: MIT
6+
7+
#include "supervisor/board.h"
8+
9+
// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.

‎ports/espressif/boards/espressif_esp32s3_devkitc_1_n16/mpconfigboard.h‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// This file is part of the CircuitPython project: https://circuitpython.org
2+
//
3+
// SPDX-FileCopyrightText: Copyright (c) 2019 Scott Shawcroft for Adafruit Industries
4+
//
5+
// SPDX-License-Identifier: MIT
6+
7+
#pragma once
8+
9+
// Micropython setup
10+
11+
#define MICROPY_HW_BOARD_NAME "ESP32-S3-DevKitC-1-N16"
12+
#define MICROPY_HW_MCU_NAME "ESP32S3"
13+
14+
#define MICROPY_HW_NEOPIXEL (&pin_GPIO48)
15+
16+
#define DEFAULT_UART_BUS_RX (&pin_GPIO44)
17+
#define DEFAULT_UART_BUS_TX (&pin_GPIO43)

0 commit comments

Comments
 (0)