Skip to content

Commit 109674d

Browse files
sanhu88sanhu88
authored
Merge branch 'adafruit:main' into espressif_esp32s3_lcd_ev_v1.5
2 parents 0666375 + 561578f commit 109674d

File tree

26 files changed

+514
-154
lines changed

26 files changed

+514
-154
lines changed

‎docs/shared_bindings_matrix.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565

6666
ADDITIONAL_MODULES = {
6767
"_asyncio": "MICROPY_PY_ASYNCIO",
68+
"_eve": "CIRCUITPY__EVE",
6869
"adafruit_bus_device": "CIRCUITPY_BUSDEVICE",
6970
"adafruit_pixelbuf": "CIRCUITPY_PIXELBUF",
7071
"array": "CIRCUITPY_ARRAY",

‎locale/zh_Latn_pinyin.po

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ msgstr ""
77
"Project-Id-Version: circuitpython-cn\n"
88
"Report-Msgid-Bugs-To: \n"
99
"POT-Creation-Date: 2021-01-04 12:55-0600\n"
10-
"PO-Revision-Date: 2024-08-19 18:09+0000\n"
10+
"PO-Revision-Date: 2024-09-06 04:09+0000\n"
1111
"Last-Translator: hexthat <[email protected]>\n"
1212
"Language-Team: Chinese Hanyu Pinyin\n"
1313
"Language: zh_Latn_pinyin\n"
1414
"MIME-Version: 1.0\n"
1515
"Content-Type: text/plain; charset=UTF-8\n"
1616
"Content-Transfer-Encoding: 8bit\n"
1717
"Plural-Forms: nplurals=1; plural=0;\n"
18-
"X-Generator: Weblate 5.7\n"
18+
"X-Generator: Weblate 5.8-dev\n"
1919

2020
#: main.c
2121
msgid ""
@@ -3574,7 +3574,7 @@ msgstr "míngchēng wèi dìngyì"
35743574

35753575
#: py/qstr.c
35763576
msgid "name too long"
3577-
msgstr ""
3577+
msgstr "míngchēng tàicháng"
35783578

35793579
#: py/persistentcode.c
35803580
msgid "native code in .mpy unsupported"

‎ports/atmel-samd/boards/feather_m4_express/mpconfigboard.h

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,20 @@
2828
#define DEFAULT_UART_BUS_RX (&pin_PB17)
2929
#define DEFAULT_UART_BUS_TX (&pin_PB16)
3030

31+
// Used for 32 kHZ crystal
32+
#define IGNORE_PIN_PA00 1
33+
#define IGNORE_PIN_PA01 1
34+
3135
// USB is always used internally so skip the pin objects for it.
3236
#define IGNORE_PIN_PA24 1
3337
#define IGNORE_PIN_PA25 1
38+
39+
// Not connected
40+
#define IGNORE_PIN_PA15 1
41+
#define IGNORE_PIN_PA27 1
42+
#define IGNORE_PIN_PB00 1
43+
#define IGNORE_PIN_PB04 1
44+
#define IGNORE_PIN_PB06 1
45+
#define IGNORE_PIN_PB07 1
46+
#define IGNORE_PIN_PB30 1
47+
#define IGNORE_PIN_PB31 1

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@ CHIP_FAMILY = samd21
99
SPI_FLASH_FILESYSTEM = 1
1010
EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C, W25Q16JVxQ"
1111
LONGINT_IMPL = MPZ
12+
13+
CIRCUITPY_RAINBOWIO = 0

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ QSPI_FLASH_FILESYSTEM = 1
1010
EXTERNAL_FLASH_DEVICES = "S25FL116K, S25FL216K, GD25Q16C, W25Q16JVxQ"
1111
LONGINT_IMPL = MPZ
1212

13-
CIRCUITPY__EVE = 1
13+
CIRCUITPY__EVE = 0
1414
CIRCUITPY_FLOPPYIO = 0
1515
CIRCUITPY_JPEGIO = 0
1616
CIRCUITPY_SYNTHIO = 0

‎ports/atmel-samd/boards/metro_m4_express/mpconfigboard.h

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,19 @@
3232
#define DEFAULT_UART_BUS_RX (&pin_PA23)
3333
#define DEFAULT_UART_BUS_TX (&pin_PA22)
3434

35+
// Used for 32 kHz crystal
36+
#define IGNORE_PIN_PA00 1
37+
#define IGNORE_PIN_PA01 1
38+
3539
// USB is always used internally so skip the pin objects for it.
3640
#define IGNORE_PIN_PA24 1
3741
#define IGNORE_PIN_PA25 1
42+
43+
// Not connected
44+
#define IGNORE_PIN_PA07 1
45+
#define IGNORE_PIN_PA15 1
46+
#define IGNORE_PIN_PB00 1
47+
#define IGNORE_PIN_PB01 1
48+
#define IGNORE_PIN_PB04 1
49+
#define IGNORE_PIN_PB05 1
50+
#define IGNORE_PIN_PB23 1

‎ports/espressif/boards/barduino/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/barduino/mpconfigboard.h

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
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 "BARDUINO 4.0.2"
12+
#define MICROPY_HW_MCU_NAME "ESP32S3"
13+
14+
#define MICROPY_HW_LED_STATUS (&pin_GPIO48)
15+
16+
#define DEFAULT_UART_BUS_RX (&pin_GPIO44)
17+
#define DEFAULT_UART_BUS_TX (&pin_GPIO43)
18+
19+
#define DEFAULT_I2C_BUS_SCL (&pin_GPIO9)
20+
#define DEFAULT_I2C_BUS_SDA (&pin_GPIO8)
21+
22+
#define DEFAULT_SPI_BUS_SCK (&pin_GPIO12)
23+
#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO11)
24+
#define DEFAULT_SPI_BUS_MISO (&pin_GPIO13)
25+
26+
27+
#define DOUBLE_TAP_PIN (&pin_GPIO34)

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
USB_VID = 0x303A
2+
USB_PID = 0x8244
3+
USB_PRODUCT = "Barduino 4.0.2"
4+
USB_MANUFACTURER = "Fablab Barcelona"
5+
6+
IDF_TARGET = esp32s3
7+
8+
CIRCUITPY_ESP_FLASH_MODE = qio
9+
CIRCUITPY_ESP_FLASH_FREQ = 80m
10+
CIRCUITPY_ESP_FLASH_SIZE = 8MB
11+
CIRCUITPY_ESPCAMERA = 0

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

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
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_IO0), MP_ROM_PTR(&pin_GPIO0) },
14+
15+
{ MP_ROM_QSTR(MP_QSTR_IO1), MP_ROM_PTR(&pin_GPIO1) },
16+
{ MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) },
17+
18+
{ MP_ROM_QSTR(MP_QSTR_LIGHT), MP_ROM_PTR(&pin_GPIO3) },
19+
{ MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) },
20+
21+
{ MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },
22+
{ MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) },
23+
{ MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) },
24+
{ MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) },
25+
26+
{ MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO8) },
27+
{ MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) },
28+
29+
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO9) },
30+
{ MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) },
31+
{ MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) },
32+
33+
{ MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO11) },
34+
{ MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11) },
35+
36+
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO12) },
37+
{ MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },
38+
39+
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO13) },
40+
{ MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },
41+
42+
{ MP_ROM_QSTR(MP_QSTR_IO14), MP_ROM_PTR(&pin_GPIO14) },
43+
{ MP_ROM_QSTR(MP_QSTR_IO15), MP_ROM_PTR(&pin_GPIO15) },
44+
{ MP_ROM_QSTR(MP_QSTR_IO16), MP_ROM_PTR(&pin_GPIO16) },
45+
{ MP_ROM_QSTR(MP_QSTR_IO17), MP_ROM_PTR(&pin_GPIO17) },
46+
{ MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) },
47+
{ MP_ROM_QSTR(MP_QSTR_IO19), MP_ROM_PTR(&pin_GPIO19) },
48+
{ MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) },
49+
{ MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },
50+
{ MP_ROM_QSTR(MP_QSTR_IO35), MP_ROM_PTR(&pin_GPIO35) },
51+
{ MP_ROM_QSTR(MP_QSTR_IO36), MP_ROM_PTR(&pin_GPIO36) },
52+
{ MP_ROM_QSTR(MP_QSTR_IO37), MP_ROM_PTR(&pin_GPIO37) },
53+
54+
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO38) },
55+
{ MP_ROM_QSTR(MP_QSTR_IO38), MP_ROM_PTR(&pin_GPIO38) },
56+
57+
{ MP_ROM_QSTR(MP_QSTR_IO39), MP_ROM_PTR(&pin_GPIO39) },
58+
{ MP_ROM_QSTR(MP_QSTR_IO40), MP_ROM_PTR(&pin_GPIO40) },
59+
{ MP_ROM_QSTR(MP_QSTR_IO41), MP_ROM_PTR(&pin_GPIO41) },
60+
{ MP_ROM_QSTR(MP_QSTR_IO42), MP_ROM_PTR(&pin_GPIO42) },
61+
62+
{ MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) },
63+
{ MP_ROM_QSTR(MP_QSTR_IO43), MP_ROM_PTR(&pin_GPIO43) },
64+
65+
{ MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) },
66+
{ MP_ROM_QSTR(MP_QSTR_IO44), MP_ROM_PTR(&pin_GPIO44) },
67+
68+
{ MP_ROM_QSTR(MP_QSTR_IO45), MP_ROM_PTR(&pin_GPIO45) },
69+
70+
{ MP_ROM_QSTR(MP_QSTR_BUZZER), MP_ROM_PTR(&pin_GPIO46) },
71+
{ MP_ROM_QSTR(MP_QSTR_IO46), MP_ROM_PTR(&pin_GPIO46) },
72+
73+
{ MP_ROM_QSTR(MP_QSTR_IO47), MP_ROM_PTR(&pin_GPIO47) },
74+
75+
{ MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO48) },
76+
{ MP_ROM_QSTR(MP_QSTR_IO48), MP_ROM_PTR(&pin_GPIO48) },
77+
78+
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
79+
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
80+
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
81+
};
82+
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

0 commit comments

Comments
 (0)