Skip to content

Commit b2b6575

Browse files
sgauchesgauche
authored
Merge branch 'adafruit:main' into st_drivers_to_submodules
2 parents 70ba229 + a39f0cf commit b2b6575

File tree

27 files changed

+87
-6
lines changed

27 files changed

+87
-6
lines changed

‎locale/ID.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1529,6 +1529,10 @@ msgstr "Pin MISO gagal inisialisasi."
15291529
msgid "MOSI pin init failed."
15301530
msgstr "Pin MOSI gagal inisialisasi."
15311531

1532+
#: shared-bindings/is31fl3741/__init__.c
1533+
msgid "Mapping must be a tuple"
1534+
msgstr ""
1535+
15321536
#: shared-module/displayio/Shape.c
15331537
#, c-format
15341538
msgid "Maximum x value when mirrored is %d"

‎locale/cs.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1517,6 +1517,10 @@ msgstr ""
15171517
msgid "MOSI pin init failed."
15181518
msgstr ""
15191519

1520+
#: shared-bindings/is31fl3741/__init__.c
1521+
msgid "Mapping must be a tuple"
1522+
msgstr ""
1523+
15201524
#: shared-module/displayio/Shape.c
15211525
#, c-format
15221526
msgid "Maximum x value when mirrored is %d"

‎locale/de_DE.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1528,6 +1528,10 @@ msgstr "MISO pin Initialisierung fehlgeschlagen."
15281528
msgid "MOSI pin init failed."
15291529
msgstr "MOSI pin Initialisierung fehlgeschlagen."
15301530

1531+
#: shared-bindings/is31fl3741/__init__.c
1532+
msgid "Mapping must be a tuple"
1533+
msgstr ""
1534+
15311535
#: shared-module/displayio/Shape.c
15321536
#, c-format
15331537
msgid "Maximum x value when mirrored is %d"

‎locale/el.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1508,6 +1508,10 @@ msgstr ""
15081508
msgid "MOSI pin init failed."
15091509
msgstr ""
15101510

1511+
#: shared-bindings/is31fl3741/__init__.c
1512+
msgid "Mapping must be a tuple"
1513+
msgstr ""
1514+
15111515
#: shared-module/displayio/Shape.c
15121516
#, c-format
15131517
msgid "Maximum x value when mirrored is %d"

‎locale/en_GB.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1523,6 +1523,10 @@ msgstr "MISO pin init failed."
15231523
msgid "MOSI pin init failed."
15241524
msgstr "MOSI pin init failed."
15251525

1526+
#: shared-bindings/is31fl3741/__init__.c
1527+
msgid "Mapping must be a tuple"
1528+
msgstr ""
1529+
15261530
#: shared-module/displayio/Shape.c
15271531
#, c-format
15281532
msgid "Maximum x value when mirrored is %d"

‎locale/es.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1541,6 +1541,10 @@ msgstr "MISO pin init fallido."
15411541
msgid "MOSI pin init failed."
15421542
msgstr "MOSI pin init fallido."
15431543

1544+
#: shared-bindings/is31fl3741/__init__.c
1545+
msgid "Mapping must be a tuple"
1546+
msgstr ""
1547+
15441548
#: shared-module/displayio/Shape.c
15451549
#, c-format
15461550
msgid "Maximum x value when mirrored is %d"

‎locale/fil.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1523,6 +1523,10 @@ msgstr "Hindi ma-initialize ang MISO pin."
15231523
msgid "MOSI pin init failed."
15241524
msgstr "Hindi ma-initialize ang MOSI pin."
15251525

1526+
#: shared-bindings/is31fl3741/__init__.c
1527+
msgid "Mapping must be a tuple"
1528+
msgstr ""
1529+
15261530
#: shared-module/displayio/Shape.c
15271531
#, c-format
15281532
msgid "Maximum x value when mirrored is %d"

‎locale/fr.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1554,6 +1554,10 @@ msgstr "Échec de l'initialization de la broche MISO."
15541554
msgid "MOSI pin init failed."
15551555
msgstr "Échec de l'initialization de la broche MOSI."
15561556

1557+
#: shared-bindings/is31fl3741/__init__.c
1558+
msgid "Mapping must be a tuple"
1559+
msgstr ""
1560+
15571561
#: shared-module/displayio/Shape.c
15581562
#, c-format
15591563
msgid "Maximum x value when mirrored is %d"

‎locale/hi.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1508,6 +1508,10 @@ msgstr ""
15081508
msgid "MOSI pin init failed."
15091509
msgstr ""
15101510

1511+
#: shared-bindings/is31fl3741/__init__.c
1512+
msgid "Mapping must be a tuple"
1513+
msgstr ""
1514+
15111515
#: shared-module/displayio/Shape.c
15121516
#, c-format
15131517
msgid "Maximum x value when mirrored is %d"

‎locale/it_IT.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1533,6 +1533,10 @@ msgstr "inizializzazione del pin MISO fallita."
15331533
msgid "MOSI pin init failed."
15341534
msgstr "inizializzazione del pin MOSI fallita."
15351535

1536+
#: shared-bindings/is31fl3741/__init__.c
1537+
msgid "Mapping must be a tuple"
1538+
msgstr ""
1539+
15361540
#: shared-module/displayio/Shape.c
15371541
#, c-format
15381542
msgid "Maximum x value when mirrored is %d"

‎locale/ja.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1519,6 +1519,10 @@ msgstr "MISOピン初期化に失敗"
15191519
msgid "MOSI pin init failed."
15201520
msgstr "MOSIピン初期化に失敗"
15211521

1522+
#: shared-bindings/is31fl3741/__init__.c
1523+
msgid "Mapping must be a tuple"
1524+
msgstr ""
1525+
15221526
#: shared-module/displayio/Shape.c
15231527
#, c-format
15241528
msgid "Maximum x value when mirrored is %d"

‎locale/ko.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1511,6 +1511,10 @@ msgstr ""
15111511
msgid "MOSI pin init failed."
15121512
msgstr ""
15131513

1514+
#: shared-bindings/is31fl3741/__init__.c
1515+
msgid "Mapping must be a tuple"
1516+
msgstr ""
1517+
15141518
#: shared-module/displayio/Shape.c
15151519
#, c-format
15161520
msgid "Maximum x value when mirrored is %d"

‎locale/nl.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1520,6 +1520,10 @@ msgstr "MISO pin init mislukt."
15201520
msgid "MOSI pin init failed."
15211521
msgstr "MOSI pin init mislukt."
15221522

1523+
#: shared-bindings/is31fl3741/__init__.c
1524+
msgid "Mapping must be a tuple"
1525+
msgstr ""
1526+
15231527
#: shared-module/displayio/Shape.c
15241528
#, c-format
15251529
msgid "Maximum x value when mirrored is %d"

‎locale/pl.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1519,6 +1519,10 @@ msgstr "Nie powiodło się ustawienie pinu MISO."
15191519
msgid "MOSI pin init failed."
15201520
msgstr "Nie powiodło się ustawienie pinu MOSI."
15211521

1522+
#: shared-bindings/is31fl3741/__init__.c
1523+
msgid "Mapping must be a tuple"
1524+
msgstr ""
1525+
15221526
#: shared-module/displayio/Shape.c
15231527
#, c-format
15241528
msgid "Maximum x value when mirrored is %d"

‎locale/pt_BR.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1545,6 +1545,10 @@ msgstr "A inicialização do pino MISO falhou."
15451545
msgid "MOSI pin init failed."
15461546
msgstr "Inicialização do pino MOSI falhou."
15471547

1548+
#: shared-bindings/is31fl3741/__init__.c
1549+
msgid "Mapping must be a tuple"
1550+
msgstr ""
1551+
15481552
#: shared-module/displayio/Shape.c
15491553
#, c-format
15501554
msgid "Maximum x value when mirrored is %d"

‎locale/ru.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1551,6 +1551,10 @@ msgstr "Не удалось инициализировать вывод MISO."
15511551
msgid "MOSI pin init failed."
15521552
msgstr "Не удалось инициализировать вывод MOSI."
15531553

1554+
#: shared-bindings/is31fl3741/__init__.c
1555+
msgid "Mapping must be a tuple"
1556+
msgstr ""
1557+
15541558
#: shared-module/displayio/Shape.c
15551559
#, c-format
15561560
msgid "Maximum x value when mirrored is %d"

‎locale/sv.po

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ msgstr ""
66
"Project-Id-Version: PACKAGE VERSION\n"
77
"Report-Msgid-Bugs-To: \n"
88
"POT-Creation-Date: 2021-01-04 12:55-0600\n"
9-
"PO-Revision-Date: 2022-01-29 07:53+0000\n"
9+
"PO-Revision-Date: 2022-02-02 20:18+0000\n"
1010
"Last-Translator: Jonny Bergdahl <[email protected]>\n"
1111
"Language-Team: LANGUAGE <[email protected]>\n"
1212
"Language: sv\n"
@@ -1527,6 +1527,10 @@ msgstr "init för MISO-pinne misslyckades."
15271527
msgid "MOSI pin init failed."
15281528
msgstr "init för MOSI-pinne misslyckades."
15291529

1530+
#: shared-bindings/is31fl3741/__init__.c
1531+
msgid "Mapping must be a tuple"
1532+
msgstr ""
1533+
15301534
#: shared-module/displayio/Shape.c
15311535
#, c-format
15321536
msgid "Maximum x value when mirrored is %d"
@@ -1637,7 +1641,7 @@ msgstr "Ingen DMA pacing timer hittades"
16371641
#: shared-module/adafruit_bus_device/i2c_device/I2CDevice.c
16381642
#, c-format
16391643
msgid "No I2C device at address: 0x%x"
1640-
msgstr ""
1644+
msgstr "Ingen I2C-enhet på adress: 0x%x"
16411645

16421646
#: ports/espressif/common-hal/busio/SPI.c
16431647
#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c

‎locale/tr.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1523,6 +1523,10 @@ msgstr ""
15231523
msgid "MOSI pin init failed."
15241524
msgstr ""
15251525

1526+
#: shared-bindings/is31fl3741/__init__.c
1527+
msgid "Mapping must be a tuple"
1528+
msgstr ""
1529+
15261530
#: shared-module/displayio/Shape.c
15271531
#, c-format
15281532
msgid "Maximum x value when mirrored is %d"

‎locale/zh_Latn_pinyin.po

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1541,6 +1541,10 @@ msgstr "MISO yǐn jiǎo chūshǐhuà shībài."
15411541
msgid "MOSI pin init failed."
15421542
msgstr "MOSI yǐn jiǎo shūrù shībài."
15431543

1544+
#: shared-bindings/is31fl3741/__init__.c
1545+
msgid "Mapping must be a tuple"
1546+
msgstr ""
1547+
15441548
#: shared-module/displayio/Shape.c
15451549
#, c-format
15461550
msgid "Maximum x value when mirrored is %d"

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@ CHIP_FAMILY = samd21
99
INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = NONE
1111
CIRCUITPY_FULL_BUILD = 0
12+
13+
CIRCUITPY_ONEWIREIO = 0

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
3030
{ MP_ROM_QSTR(MP_QSTR_IO37), MP_ROM_PTR(&pin_GPIO37) },
3131
{ MP_ROM_QSTR(MP_QSTR_IO38), MP_ROM_PTR(&pin_GPIO38) },
3232
{ MP_ROM_QSTR(MP_QSTR_IO39), MP_ROM_PTR(&pin_GPIO39) },
33+
{ MP_ROM_QSTR(MP_QSTR_IO40), MP_ROM_PTR(&pin_GPIO40) },
3334
{ MP_ROM_QSTR(MP_QSTR_IO41), MP_ROM_PTR(&pin_GPIO41) },
3435
{ MP_ROM_QSTR(MP_QSTR_IO42), MP_ROM_PTR(&pin_GPIO42) },
3536
{ MP_ROM_QSTR(MP_QSTR_IO43), MP_ROM_PTR(&pin_GPIO43) },

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
3030
{ MP_ROM_QSTR(MP_QSTR_IO37), MP_ROM_PTR(&pin_GPIO37) },
3131
{ MP_ROM_QSTR(MP_QSTR_IO38), MP_ROM_PTR(&pin_GPIO38) },
3232
{ MP_ROM_QSTR(MP_QSTR_IO39), MP_ROM_PTR(&pin_GPIO39) },
33+
{ MP_ROM_QSTR(MP_QSTR_IO40), MP_ROM_PTR(&pin_GPIO40) },
3334
{ MP_ROM_QSTR(MP_QSTR_IO41), MP_ROM_PTR(&pin_GPIO41) },
3435
{ MP_ROM_QSTR(MP_QSTR_IO42), MP_ROM_PTR(&pin_GPIO42) },
3536
{ MP_ROM_QSTR(MP_QSTR_IO43), MP_ROM_PTR(&pin_GPIO43) },

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
3030
{ MP_ROM_QSTR(MP_QSTR_IO37), MP_ROM_PTR(&pin_GPIO37) },
3131
{ MP_ROM_QSTR(MP_QSTR_IO38), MP_ROM_PTR(&pin_GPIO38) },
3232
{ MP_ROM_QSTR(MP_QSTR_IO39), MP_ROM_PTR(&pin_GPIO39) },
33+
{ MP_ROM_QSTR(MP_QSTR_IO40), MP_ROM_PTR(&pin_GPIO40) },
3334
{ MP_ROM_QSTR(MP_QSTR_IO41), MP_ROM_PTR(&pin_GPIO41) },
3435
{ MP_ROM_QSTR(MP_QSTR_IO42), MP_ROM_PTR(&pin_GPIO42) },
3536
{ MP_ROM_QSTR(MP_QSTR_IO43), MP_ROM_PTR(&pin_GPIO43) },

‎ports/raspberrypi/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ SRC_SDK := \
187187
src/rp2_common/pico_unique_id/unique_id.c \
188188

189189
SRC_SDK := $(addprefix sdk/, $(SRC_SDK))
190-
$(patsubst %.c,$(BUILD)/%.o,$(SRC_SDK)): CFLAGS += -Wno-missing-prototypes
190+
$(patsubst %.c,$(BUILD)/%.o,$(SRC_SDK)): CFLAGS += -Wno-missing-prototypes -Wno-undef
191191

192192
SRC_C += \
193193
boards/$(BOARD)/board.c \

‎ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@
4444
#include "src/rp2040/hardware_structs/include/hardware/structs/dma.h"
4545
#include "src/rp2_common/hardware_pwm/include/hardware/pwm.h"
4646

47-
#define NUM_DMA_TIMERS 4
48-
4947
// The PWM clock frequency is base_clock_rate / PWM_TOP, typically 125_000_000 / PWM_TOP.
5048
// We pick BITS_PER_SAMPLE so we get a clock frequency that is above what would cause aliasing.
5149
#define BITS_PER_SAMPLE 10

‎ports/raspberrypi/sdk

Submodule sdk updated 158 files

‎shared-module/bitbangio/I2C.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,11 @@ STATIC void scl_release(bitbangio_i2c_obj_t *self) {
4949
uint32_t count = self->us_timeout;
5050
delay(self);
5151
// For clock stretching, wait for the SCL pin to be released, with timeout.
52+
common_hal_digitalio_digitalinout_switch_to_input(&self->scl, PULL_UP);
5253
for (; !common_hal_digitalio_digitalinout_get_value(&self->scl) && count; --count) {
5354
common_hal_mcu_delay_us(1);
5455
}
56+
common_hal_digitalio_digitalinout_switch_to_output(&self->scl, true, DRIVE_MODE_OPEN_DRAIN);
5557
// raise exception on timeout
5658
if (count == 0) {
5759
mp_raise_msg(&mp_type_TimeoutError, translate("Clock stretch too long"));

0 commit comments

Comments
 (0)