djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'adafruit:main' into st_drivers_to_submodules

This commit is contained in:
Scott Gauche 2022-02-03 19:21:30 -05:00 committed by GitHub
parent 70ba229d23 a39f0cfede
commit b2b657547d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 87 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
locale/ID.po
View File

@ -1529,6 +1529,10 @@ msgstr "Pin MISO gagal inisialisasi."
msgid "MOSI pin init failed."
msgstr "Pin MOSI gagal inisialisasi."
#: shared-bindings/is31fl3741/__init__.c
msgid "Mapping must be a tuple"
msgstr ""
#: shared-module/displayio/Shape.c
#, c-format
msgid "Maximum x value when mirrored is %d"

4
locale/cs.po
View File

@ -1517,6 +1517,10 @@ msgstr ""
msgid "MOSI pin init failed."
msgstr ""
#: shared-bindings/is31fl3741/__init__.c
msgid "Mapping must be a tuple"
msgstr ""
#: shared-module/displayio/Shape.c
#, c-format
msgid "Maximum x value when mirrored is %d"

4
locale/de_DE.po
View File

@ -1528,6 +1528,10 @@ msgstr "MISO pin Initialisierung fehlgeschlagen."
msgid "MOSI pin init failed."
msgstr "MOSI pin Initialisierung fehlgeschlagen."
#: shared-bindings/is31fl3741/__init__.c
msgid "Mapping must be a tuple"
msgstr ""
#: shared-module/displayio/Shape.c
#, c-format
msgid "Maximum x value when mirrored is %d"

4
locale/el.po
View File

@ -1508,6 +1508,10 @@ msgstr ""
msgid "MOSI pin init failed."
msgstr ""
#: shared-bindings/is31fl3741/__init__.c
msgid "Mapping must be a tuple"
msgstr ""
#: shared-module/displayio/Shape.c
#, c-format
msgid "Maximum x value when mirrored is %d"

4
locale/en_GB.po
View File

@ -1523,6 +1523,10 @@ msgstr "MISO pin init failed."
msgid "MOSI pin init failed."
msgstr "MOSI pin init failed."
#: shared-bindings/is31fl3741/__init__.c
msgid "Mapping must be a tuple"
msgstr ""
#: shared-module/displayio/Shape.c
#, c-format
msgid "Maximum x value when mirrored is %d"

4
locale/es.po
View File

@ -1541,6 +1541,10 @@ msgstr "MISO pin init fallido."
msgid "MOSI pin init failed."
msgstr "MOSI pin init fallido."
#: shared-bindings/is31fl3741/__init__.c
msgid "Mapping must be a tuple"
msgstr ""
#: shared-module/displayio/Shape.c
#, c-format
msgid "Maximum x value when mirrored is %d"

4
locale/fil.po
View File

@ -1523,6 +1523,10 @@ msgstr "Hindi ma-initialize ang MISO pin."
msgid "MOSI pin init failed."
msgstr "Hindi ma-initialize ang MOSI pin."
#: shared-bindings/is31fl3741/__init__.c
msgid "Mapping must be a tuple"
msgstr ""
#: shared-module/displayio/Shape.c
#, c-format
msgid "Maximum x value when mirrored is %d"

4
locale/fr.po
View File

@ -1554,6 +1554,10 @@ msgstr "Échec de l'initialization de la broche MISO."
msgid "MOSI pin init failed."
msgstr "Échec de l'initialization de la broche MOSI."
#: shared-bindings/is31fl3741/__init__.c
msgid "Mapping must be a tuple"
msgstr ""
#: shared-module/displayio/Shape.c
#, c-format
msgid "Maximum x value when mirrored is %d"

4
locale/hi.po
View File

@ -1508,6 +1508,10 @@ msgstr ""
msgid "MOSI pin init failed."
msgstr ""
#: shared-bindings/is31fl3741/__init__.c
msgid "Mapping must be a tuple"
msgstr ""
#: shared-module/displayio/Shape.c
#, c-format
msgid "Maximum x value when mirrored is %d"

4
locale/it_IT.po
View File

@ -1533,6 +1533,10 @@ msgstr "inizializzazione del pin MISO fallita."
msgid "MOSI pin init failed."
msgstr "inizializzazione del pin MOSI fallita."
#: shared-bindings/is31fl3741/__init__.c
msgid "Mapping must be a tuple"
msgstr ""
#: shared-module/displayio/Shape.c
#, c-format
msgid "Maximum x value when mirrored is %d"

4
locale/ja.po
View File

@ -1519,6 +1519,10 @@ msgstr "MISOピン初期化に失敗"
msgid "MOSI pin init failed."
msgstr "MOSIピン初期化に失敗"
#: shared-bindings/is31fl3741/__init__.c
msgid "Mapping must be a tuple"
msgstr ""
#: shared-module/displayio/Shape.c
#, c-format
msgid "Maximum x value when mirrored is %d"

4
locale/ko.po
View File

@ -1511,6 +1511,10 @@ msgstr ""
msgid "MOSI pin init failed."
msgstr ""
#: shared-bindings/is31fl3741/__init__.c
msgid "Mapping must be a tuple"
msgstr ""
#: shared-module/displayio/Shape.c
#, c-format
msgid "Maximum x value when mirrored is %d"

4
locale/nl.po
View File

@ -1520,6 +1520,10 @@ msgstr "MISO pin init mislukt."
msgid "MOSI pin init failed."
msgstr "MOSI pin init mislukt."
#: shared-bindings/is31fl3741/__init__.c
msgid "Mapping must be a tuple"
msgstr ""
#: shared-module/displayio/Shape.c
#, c-format
msgid "Maximum x value when mirrored is %d"

4
locale/pl.po
View File

@ -1519,6 +1519,10 @@ msgstr "Nie powiodło się ustawienie pinu MISO."
msgid "MOSI pin init failed."
msgstr "Nie powiodło się ustawienie pinu MOSI."
#: shared-bindings/is31fl3741/__init__.c
msgid "Mapping must be a tuple"
msgstr ""
#: shared-module/displayio/Shape.c
#, c-format
msgid "Maximum x value when mirrored is %d"

4
locale/pt_BR.po
View File

@ -1545,6 +1545,10 @@ msgstr "A inicialização do pino MISO falhou."
msgid "MOSI pin init failed."
msgstr "Inicialização do pino MOSI falhou."
#: shared-bindings/is31fl3741/__init__.c
msgid "Mapping must be a tuple"
msgstr ""
#: shared-module/displayio/Shape.c
#, c-format
msgid "Maximum x value when mirrored is %d"

4
locale/ru.po
View File

@ -1551,6 +1551,10 @@ msgstr "Не удалось инициализировать вывод MISO."
msgid "MOSI pin init failed."
msgstr "Не удалось инициализировать вывод MOSI."
#: shared-bindings/is31fl3741/__init__.c
msgid "Mapping must be a tuple"
msgstr ""
#: shared-module/displayio/Shape.c
#, c-format
msgid "Maximum x value when mirrored is %d"

8
locale/sv.po
View File

@ -6,7 +6,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-01-04 12:55-0600\n"
"PO-Revision-Date: 2022-01-29 07:53+0000\n"
"PO-Revision-Date: 2022-02-02 20:18+0000\n"
"Last-Translator: Jonny Bergdahl <jonny@bergdahl.it>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: sv\n"
@ -1527,6 +1527,10 @@ msgstr "init för MISO-pinne misslyckades."
msgid "MOSI pin init failed."
msgstr "init för MOSI-pinne misslyckades."
#: shared-bindings/is31fl3741/__init__.c
msgid "Mapping must be a tuple"
msgstr ""
#: shared-module/displayio/Shape.c
#, c-format
msgid "Maximum x value when mirrored is %d"
@ -1637,7 +1641,7 @@ msgstr "Ingen DMA pacing timer hittades"
#: shared-module/adafruit_bus_device/i2c_device/I2CDevice.c
#, c-format
msgid "No I2C device at address: 0x%x"
msgstr ""
msgstr "Ingen I2C-enhet på adress: 0x%x"
#: ports/espressif/common-hal/busio/SPI.c
#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c

4
locale/tr.po
View File

@ -1523,6 +1523,10 @@ msgstr ""
msgid "MOSI pin init failed."
msgstr ""
#: shared-bindings/is31fl3741/__init__.c
msgid "Mapping must be a tuple"
msgstr ""
#: shared-module/displayio/Shape.c
#, c-format
msgid "Maximum x value when mirrored is %d"

4
locale/zh_Latn_pinyin.po
View File

@ -1541,6 +1541,10 @@ msgstr "MISO yǐn jiǎo chūshǐhuà shībài."
msgid "MOSI pin init failed."
msgstr "MOSI yǐn jiǎo shūrù shībài."
#: shared-bindings/is31fl3741/__init__.c
msgid "Mapping must be a tuple"
msgstr ""
#: shared-module/displayio/Shape.c
#, c-format
msgid "Maximum x value when mirrored is %d"

2
ports/atmel-samd/boards/seeeduino_xiao/mpconfigboard.mk
View File

@ -9,3 +9,5 @@ CHIP_FAMILY = samd21
INTERNAL_FLASH_FILESYSTEM = 1
LONGINT_IMPL = NONE
CIRCUITPY_FULL_BUILD = 0
CIRCUITPY_ONEWIREIO = 0

1
ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/pins.c
View File

@ -30,6 +30,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
{ MP_ROM_QSTR(MP_QSTR_IO37), MP_ROM_PTR(&pin_GPIO37) },
{ MP_ROM_QSTR(MP_QSTR_IO38), MP_ROM_PTR(&pin_GPIO38) },
{ MP_ROM_QSTR(MP_QSTR_IO39), MP_ROM_PTR(&pin_GPIO39) },
{ MP_ROM_QSTR(MP_QSTR_IO40), MP_ROM_PTR(&pin_GPIO40) },
{ MP_ROM_QSTR(MP_QSTR_IO41), MP_ROM_PTR(&pin_GPIO41) },
{ MP_ROM_QSTR(MP_QSTR_IO42), MP_ROM_PTR(&pin_GPIO42) },
{ MP_ROM_QSTR(MP_QSTR_IO43), MP_ROM_PTR(&pin_GPIO43) },

1
ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/pins.c
View File

@ -30,6 +30,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
{ MP_ROM_QSTR(MP_QSTR_IO37), MP_ROM_PTR(&pin_GPIO37) },
{ MP_ROM_QSTR(MP_QSTR_IO38), MP_ROM_PTR(&pin_GPIO38) },
{ MP_ROM_QSTR(MP_QSTR_IO39), MP_ROM_PTR(&pin_GPIO39) },
{ MP_ROM_QSTR(MP_QSTR_IO40), MP_ROM_PTR(&pin_GPIO40) },
{ MP_ROM_QSTR(MP_QSTR_IO41), MP_ROM_PTR(&pin_GPIO41) },
{ MP_ROM_QSTR(MP_QSTR_IO42), MP_ROM_PTR(&pin_GPIO42) },
{ MP_ROM_QSTR(MP_QSTR_IO43), MP_ROM_PTR(&pin_GPIO43) },

1
ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/pins.c
View File

@ -30,6 +30,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
{ MP_ROM_QSTR(MP_QSTR_IO37), MP_ROM_PTR(&pin_GPIO37) },
{ MP_ROM_QSTR(MP_QSTR_IO38), MP_ROM_PTR(&pin_GPIO38) },
{ MP_ROM_QSTR(MP_QSTR_IO39), MP_ROM_PTR(&pin_GPIO39) },
{ MP_ROM_QSTR(MP_QSTR_IO40), MP_ROM_PTR(&pin_GPIO40) },
{ MP_ROM_QSTR(MP_QSTR_IO41), MP_ROM_PTR(&pin_GPIO41) },
{ MP_ROM_QSTR(MP_QSTR_IO42), MP_ROM_PTR(&pin_GPIO42) },
{ MP_ROM_QSTR(MP_QSTR_IO43), MP_ROM_PTR(&pin_GPIO43) },

2
ports/raspberrypi/Makefile
View File

@ -187,7 +187,7 @@ SRC_SDK := \
src/rp2_common/pico_unique_id/unique_id.c \
SRC_SDK := $(addprefix sdk/, $(SRC_SDK))
$(patsubst %.c,$(BUILD)/%.o,$(SRC_SDK)): CFLAGS += -Wno-missing-prototypes
$(patsubst %.c,$(BUILD)/%.o,$(SRC_SDK)): CFLAGS += -Wno-missing-prototypes -Wno-undef
SRC_C += \
boards/$(BOARD)/board.c \

2
ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
View File

@ -44,8 +44,6 @@
#include "src/rp2040/hardware_structs/include/hardware/structs/dma.h"
#include "src/rp2_common/hardware_pwm/include/hardware/pwm.h"
#define NUM_DMA_TIMERS 4
// The PWM clock frequency is base_clock_rate / PWM_TOP, typically 125_000_000 / PWM_TOP.
// We pick BITS_PER_SAMPLE so we get a clock frequency that is above what would cause aliasing.
#define BITS_PER_SAMPLE 10

2
ports/raspberrypi/sdk

@ -1 +1 @@
Subproject commit bfcbefafc5d2a210551a4d9d80b4303d4ae0adf7
Subproject commit 2062372d203b372849d573f252cf7c6dc2800c0a

2
shared-module/bitbangio/I2C.c
View File

@ -49,9 +49,11 @@ STATIC void scl_release(bitbangio_i2c_obj_t *self) {
uint32_t count = self->us_timeout;
delay(self);
// For clock stretching, wait for the SCL pin to be released, with timeout.
common_hal_digitalio_digitalinout_switch_to_input(&self->scl, PULL_UP);
for (; !common_hal_digitalio_digitalinout_get_value(&self->scl) && count; --count) {
common_hal_mcu_delay_us(1);
}
common_hal_digitalio_digitalinout_switch_to_output(&self->scl, true, DRIVE_MODE_OPEN_DRAIN);
// raise exception on timeout
if (count == 0) {
mp_raise_msg(&mp_type_TimeoutError, translate("Clock stretch too long"));