Skip to content

Commit a134eeb

Browse files
committed
Merge branch 'main' of https://github.com/adafruit/circuitpython into arduino-nano-esp32s3
2 parents e47e7bc + 688f62a commit a134eeb

File tree

30 files changed

+276
-111
lines changed

30 files changed

+276
-111
lines changed

lib/tinyusb

Submodule tinyusb updated 57 files

locale/de_DE.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ msgstr ""
66
"Project-Id-Version: \n"
77
"Report-Msgid-Bugs-To: \n"
88
"POT-Creation-Date: 2021-01-04 12:55-0600\n"
9-
"PO-Revision-Date: 2023-07-10 14:50+0000\n"
9+
"PO-Revision-Date: 2023-07-19 21:06+0000\n"
1010
"Last-Translator: Luc <[email protected]>\n"
1111
"Language: de_DE\n"
1212
"MIME-Version: 1.0\n"
@@ -487,7 +487,7 @@ msgstr "Alle Kanäle werden verwendet"
487487

488488
#: ports/raspberrypi/common-hal/usb_host/Port.c
489489
msgid "All dma channels in use"
490-
msgstr ""
490+
msgstr "All DMA-Kanäle in Verwendung"
491491

492492
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
493493
msgid "All event channels in use"

locale/en_GB.po

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: PACKAGE VERSION\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"PO-Revision-Date: 2023-05-23 22:55+0000\n"
10+
"PO-Revision-Date: 2023-07-19 21:06+0000\n"
1111
"Last-Translator: Andi Chandler <[email protected]>\n"
1212
"Language-Team: none\n"
1313
"Language: en_GB\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=2; plural=n != 1;\n"
18-
"X-Generator: Weblate 4.18-dev\n"
18+
"X-Generator: Weblate 5.0-dev\n"
1919

2020
#: main.c
2121
msgid ""
@@ -486,7 +486,7 @@ msgstr "All channels in use"
486486

487487
#: ports/raspberrypi/common-hal/usb_host/Port.c
488488
msgid "All dma channels in use"
489-
msgstr ""
489+
msgstr "All DMA channels in use"
490490

491491
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
492492
msgid "All event channels in use"
@@ -1378,7 +1378,7 @@ msgstr "Mismatched swap flag"
13781378

13791379
#: ports/mimxrt10xx/common-hal/busio/SPI.c
13801380
msgid "Missing MISO or MOSI Pin"
1381-
msgstr "Missing MISO or MOSI pin"
1381+
msgstr "Missing MISO or MOSI Pin"
13821382

13831383
#: ports/stm/common-hal/busio/SPI.c
13841384
msgid "Missing MISO or MOSI pin"
@@ -1493,7 +1493,7 @@ msgstr "No IP"
14931493
#: ports/espressif/common-hal/busio/SPI.c
14941494
#: ports/mimxrt10xx/common-hal/busio/SPI.c
14951495
msgid "No MISO Pin"
1496-
msgstr "No MISO pin"
1496+
msgstr "No MISO Pin"
14971497

14981498
#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c
14991499
msgid "No MISO pin"
@@ -1502,7 +1502,7 @@ msgstr "No MISO pin"
15021502
#: ports/espressif/common-hal/busio/SPI.c
15031503
#: ports/mimxrt10xx/common-hal/busio/SPI.c
15041504
msgid "No MOSI Pin"
1505-
msgstr "No MOSI pin"
1505+
msgstr "No MOSI Pin"
15061506

15071507
#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c
15081508
msgid "No MOSI pin"

locale/zh_Latn_pinyin.po

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ 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: 2023-07-16 04:32+0000\n"
10+
"PO-Revision-Date: 2023-07-21 00:10+0000\n"
1111
"Last-Translator: hexthat <[email protected]>\n"
1212
"Language-Team: Chinese Hanyu Pinyin\n"
1313
"Language: zh_Latn_pinyin\n"
@@ -1641,7 +1641,7 @@ msgstr "Bù zhīchí jīshù"
16411641

16421642
#: supervisor/shared/bluetooth/bluetooth.c
16431643
msgid "Off"
1644-
msgstr "guānbì"
1644+
msgstr "Guānbì"
16451645

16461646
#: supervisor/shared/bluetooth/bluetooth.c
16471647
msgid "Ok"
@@ -3286,7 +3286,7 @@ msgstr "bù zhèngquè de tiánchōng"
32863286

32873287
#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/transform.c
32883288
msgid "index is out of bounds"
3289-
msgstr "suǒyǐn chāochū fànwéi"
3289+
msgstr "suǒyǐn yuèjiè"
32903290

32913291
#: shared-bindings/_pixelmap/PixelMap.c
32923292
msgid "index must be tuple or int"

ports/atmel-samd/boards/mini_sam_m4/mpconfigboard.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ LONGINT_IMPL = MPZ
1212

1313
# No I2S on SAMD51G
1414
CIRCUITPY_AUDIOBUSIO = 0
15+
CIRCUITPY_SYNTHIO = 0
1516

1617
CIRCUITPY_BITBANG_APA102 = 1
1718

ports/espressif/boards/unexpectedmaker_feathers3/mpconfigboard.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@
3434

3535
#define MICROPY_HW_LED_STATUS (&pin_GPIO13)
3636

37-
#define DEFAULT_I2C_BUS_SCL (&pin_GPIO9)
38-
#define DEFAULT_I2C_BUS_SDA (&pin_GPIO8)
37+
#define CIRCUITPY_BOARD_I2C (2)
38+
#define CIRCUITPY_BOARD_I2C_PIN {{.scl = &pin_GPIO9, .sda = &pin_GPIO8}, \
39+
{.scl = &pin_GPIO15, .sda = &pin_GPIO16}}
3940

4041
#define DEFAULT_SPI_BUS_SCK (&pin_GPIO36)
4142
#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO35)

ports/espressif/boards/unexpectedmaker_feathers3/pins.c

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#include "shared-bindings/board/__init__.h"
22

3+
CIRCUITPY_BOARD_BUS_SINGLETON(stemma_i2c, i2c, 1)
4+
35
STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
46
CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
57

@@ -89,11 +91,16 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
8991
{ MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO11) },
9092
{ MP_ROM_QSTR(MP_QSTR_A10), MP_ROM_PTR(&pin_GPIO11) },
9193

92-
{ MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO13) }, // Blue LED
94+
// Blue LED
95+
{ MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO13) },
96+
97+
// STEMMA QT Vertical Connector I2C IO
98+
{ MP_ROM_QSTR(MP_QSTR_IO15), MP_ROM_PTR(&pin_GPIO15) },
99+
{ MP_ROM_QSTR(MP_QSTR_SCL2), MP_ROM_PTR(&pin_GPIO15) },
100+
{ MP_ROM_QSTR(MP_QSTR_IO16), MP_ROM_PTR(&pin_GPIO16) },
101+
{ MP_ROM_QSTR(MP_QSTR_SDA2), MP_ROM_PTR(&pin_GPIO16) },
93102

94103
// Battery voltage sense pin
95-
// I really don't know what name to use here. Adafruit use BATTERY & VOLTAGE_MONITOR
96-
// I prefer VBAT or VBAT_SENSE
97104
{ MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_GPIO2) },
98105
{ MP_ROM_QSTR(MP_QSTR_VBAT), MP_ROM_PTR(&pin_GPIO2) },
99106
{ MP_ROM_QSTR(MP_QSTR_VBAT_SENSE), MP_ROM_PTR(&pin_GPIO2) },
@@ -103,18 +110,29 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
103110
{ MP_ROM_QSTR(MP_QSTR_VBUS), MP_ROM_PTR(&pin_GPIO34) },
104111
{ MP_ROM_QSTR(MP_QSTR_VBUS_SENSE), MP_ROM_PTR(&pin_GPIO34) },
105112

113+
// Neopixel pins
106114
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL_POWER), MP_ROM_PTR(&pin_GPIO39) },
107115
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO40) },
108116

109-
{ MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) }, // Ambient Light Sensor
110-
{ MP_ROM_QSTR(MP_QSTR_AMB), MP_ROM_PTR(&pin_GPIO4) }, // Ambient Light Sensor
117+
// Ambient Light Sensor
118+
{ MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },
119+
{ MP_ROM_QSTR(MP_QSTR_AMB), MP_ROM_PTR(&pin_GPIO4) },
111120

112-
{ MP_ROM_QSTR(MP_QSTR_LDO2), MP_ROM_PTR(&pin_GPIO39) }, // Second LDO Enable control
113-
{ MP_ROM_QSTR(MP_QSTR_IO39), MP_ROM_PTR(&pin_GPIO39) }, // Second LDO Enable control
121+
// Second LDO Enable control
122+
{ MP_ROM_QSTR(MP_QSTR_LDO2), MP_ROM_PTR(&pin_GPIO39) },
123+
{ MP_ROM_QSTR(MP_QSTR_IO39), MP_ROM_PTR(&pin_GPIO39) },
114124

125+
// I2C
115126
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
116127
{ MP_ROM_QSTR(MP_QSTR_STEMMA_I2C), MP_ROM_PTR(&board_i2c_obj) },
128+
{ MP_ROM_QSTR(MP_QSTR_STEMMA_VERTICAL_I2C), MP_ROM_PTR(&board_stemma_i2c_obj) },
129+
{ MP_ROM_QSTR(MP_QSTR_STEMMA_I2C2), MP_ROM_PTR(&board_stemma_i2c_obj) },
130+
{ MP_ROM_QSTR(MP_QSTR_I2C2), MP_ROM_PTR(&board_stemma_i2c_obj) },
131+
132+
// SPI
117133
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
134+
135+
// UART
118136
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
119137
};
120138
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

ports/mimxrt10xx/boards/imxrt1060_evk/board.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
#include "supervisor/board.h"
2929
#include "shared-bindings/microcontroller/Pin.h"
3030

31+
#include "shared-bindings/usb_host/Port.h"
32+
3133
// These pins should never ever be reset; doing so could interfere with basic operation.
3234
// Used in common-hal/microcontroller/Pin.c
3335
const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[] = {
@@ -55,4 +57,8 @@ const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[] = {
5557
NULL, // Must end in NULL.
5658
};
5759

60+
void board_init(void) {
61+
common_hal_usb_host_port_construct(&pin_USB_OTG2_DP, &pin_USB_OTG2_DN);
62+
}
63+
5864
// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.

ports/mimxrt10xx/boards/imxrt1060_evkb/board.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
#include "supervisor/board.h"
2929
#include "shared-bindings/microcontroller/Pin.h"
3030

31+
#include "shared-bindings/usb_host/Port.h"
32+
3133
// These pins should never ever be reset; doing so could interfere with basic operation.
3234
// Used in common-hal/microcontroller/Pin.c
3335
const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[] = {
@@ -52,7 +54,11 @@ const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[] = {
5254
// USB Pins
5355
&pin_GPIO_AD_B0_01, // ID Pin
5456
&pin_GPIO_AD_B0_03, // OC/Fault Pin
55-
NULL, // Must end in NULL.
57+
NULL, // Must end in NULL.
5658
};
5759

60+
void board_init(void) {
61+
common_hal_usb_host_port_construct(&pin_USB_OTG2_DP, &pin_USB_OTG2_DN);
62+
}
63+
5864
// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.

ports/mimxrt10xx/boards/teensy41/board.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
#include "supervisor/board.h"
2929
#include "shared-bindings/microcontroller/Pin.h"
3030

31+
#include "shared-bindings/usb_host/Port.h"
32+
3133
// These pins should never ever be reset; doing so could interfere with basic operation.
3234
// Used in common-hal/microcontroller/Pin.c
3335
const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[] = {
@@ -54,4 +56,8 @@ const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[] = {
5456
NULL, // Must end in NULL.
5557
};
5658

59+
void board_init(void) {
60+
common_hal_usb_host_port_construct(&pin_USB_OTG2_DP, &pin_USB_OTG2_DN);
61+
}
62+
5763
// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.

0 commit comments

Comments
 (0)