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

Merge branch 'main' of https://github.com/adafruit/circuitpython into arduino-nano-esp32s3

Browse Source
This commit is contained in:
Melissa LeBlanc-Williams 2023-08-09 08:08:03 -07:00
commit ab638d4bf2
23 changed files with 175 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
locale/ID.po
View File

@ -1485,6 +1485,10 @@ msgstr "Tidak ada clocks yang tersedia"
msgid "No capture in progress"
msgstr ""
#: shared-module/usb/core/Device.c
msgid "No configuration set"
msgstr ""
#: shared-bindings/_bleio/PacketBuffer.c
msgid "No connection: length cannot be determined"
msgstr "Tidak ada koneksi: panjang tidak dapat ditentukan"
@ -1548,6 +1552,10 @@ msgstr "Tidak ada file/direktori"
msgid "No timer available"
msgstr "Penghitung waktu tidak tersedia"
#: shared-module/usb/core/Device.c
msgid "No usb host port initialized"
msgstr ""
#: ports/nrf/common-hal/_bleio/__init__.c
msgid "Nordic system firmware out of memory"
msgstr ""

8
locale/cs.po
View File

@ -1485,6 +1485,10 @@ msgstr "Žádné dostupné hodiny"
msgid "No capture in progress"
msgstr ""
#: shared-module/usb/core/Device.c
msgid "No configuration set"
msgstr ""
#: shared-bindings/_bleio/PacketBuffer.c
msgid "No connection: length cannot be determined"
msgstr "Žádné připojení: nelze určit délku"
@ -1548,6 +1552,10 @@ msgstr "Žádný takový soubor / adresář"
msgid "No timer available"
msgstr "Není k dispozici žádný časovač"
#: shared-module/usb/core/Device.c
msgid "No usb host port initialized"
msgstr ""
#: ports/nrf/common-hal/_bleio/__init__.c
msgid "Nordic system firmware out of memory"
msgstr ""

8
locale/de_DE.po
View File

@ -1510,6 +1510,10 @@ msgstr "Keine Taktgeber verfügbar"
msgid "No capture in progress"
msgstr "Kein laufende Aufzeichnung"
#: shared-module/usb/core/Device.c
msgid "No configuration set"
msgstr ""
#: shared-bindings/_bleio/PacketBuffer.c
msgid "No connection: length cannot be determined"
msgstr "Keine Verbindung: Länge kann nicht bestimmt werden"
@ -1573,6 +1577,10 @@ msgstr "Keine solche Datei/Verzeichnis"
msgid "No timer available"
msgstr "Kein Timer verfügbar"
#: shared-module/usb/core/Device.c
msgid "No usb host port initialized"
msgstr ""
#: ports/nrf/common-hal/_bleio/__init__.c
msgid "Nordic system firmware out of memory"
msgstr "Nordic System-Firmware kein Speicher verfügbar"

8
locale/el.po
View File

@ -1500,6 +1500,10 @@ msgstr ""
msgid "No capture in progress"
msgstr ""
#: shared-module/usb/core/Device.c
msgid "No configuration set"
msgstr ""
#: shared-bindings/_bleio/PacketBuffer.c
msgid "No connection: length cannot be determined"
msgstr ""
@ -1563,6 +1567,10 @@ msgstr ""
msgid "No timer available"
msgstr ""
#: shared-module/usb/core/Device.c
msgid "No usb host port initialized"
msgstr ""
#: ports/nrf/common-hal/_bleio/__init__.c
msgid "Nordic system firmware out of memory"
msgstr ""

12
locale/en_GB.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"PO-Revision-Date: 2023-07-30 11:47+0000\n"
"PO-Revision-Date: 2023-08-06 17:45+0000\n"
"Last-Translator: Andi Chandler <andi@gowling.com>\n"
"Language-Team: none\n"
"Language: en_GB\n"
@ -1494,6 +1494,10 @@ msgstr "No available clocks"
msgid "No capture in progress"
msgstr "No capture in progress"
#: shared-module/usb/core/Device.c
msgid "No configuration set"
msgstr "No configuration set"
#: shared-bindings/_bleio/PacketBuffer.c
msgid "No connection: length cannot be determined"
msgstr "No connection: length cannot be determined"
@ -1557,6 +1561,10 @@ msgstr "No such file/directory"
msgid "No timer available"
msgstr "No timer available"
#: shared-module/usb/core/Device.c
msgid "No usb host port initialized"
msgstr "No USB host port initialised"
#: ports/nrf/common-hal/_bleio/__init__.c
msgid "Nordic system firmware out of memory"
msgstr "Nordic system firmware out of memory"
@ -3304,7 +3312,7 @@ msgstr "input dtype must be float or complex"
#: extmod/ulab/code/numpy/poly.c
msgid "input is not iterable"
msgstr ""
msgstr "input is not iterable"
#: extmod/ulab/code/numpy/linalg/linalg.c
msgid "input matrix is asymmetric"

12
locale/es.po
View File

@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-01-04 12:55-0600\n"
"PO-Revision-Date: 2023-07-30 11:47+0000\n"
"PO-Revision-Date: 2023-08-06 17:45+0000\n"
"Last-Translator: Pablo Martinez Bernal <elpekenin@elpekenin.dev>\n"
"Language-Team: \n"
"Language: es\n"
@ -1522,6 +1522,10 @@ msgstr "Relojes no disponibles"
msgid "No capture in progress"
msgstr "No hay captura en marcha"
#: shared-module/usb/core/Device.c
msgid "No configuration set"
msgstr "No hay configuración"
#: shared-bindings/_bleio/PacketBuffer.c
msgid "No connection: length cannot be determined"
msgstr "Sin conexión: no se puede determinar la longitud"
@ -1585,6 +1589,10 @@ msgstr "No existe el archivo/directorio"
msgid "No timer available"
msgstr "No hay temporizador disponible"
#: shared-module/usb/core/Device.c
msgid "No usb host port initialized"
msgstr "No hay ningún puerto USB host inicializado"
#: ports/nrf/common-hal/_bleio/__init__.c
msgid "Nordic system firmware out of memory"
msgstr "El firmware del sistema Nordic no tiene memoria"
@ -3352,7 +3360,7 @@ msgstr "dtype de entrada debe ser float o complex"
#: extmod/ulab/code/numpy/poly.c
msgid "input is not iterable"
msgstr ""
msgstr "input no es iterable"
#: extmod/ulab/code/numpy/linalg/linalg.c
msgid "input matrix is asymmetric"

8
locale/fil.po
View File

@ -1485,6 +1485,10 @@ msgstr ""
msgid "No capture in progress"
msgstr ""
#: shared-module/usb/core/Device.c
msgid "No configuration set"
msgstr ""
#: shared-bindings/_bleio/PacketBuffer.c
msgid "No connection: length cannot be determined"
msgstr ""
@ -1548,6 +1552,10 @@ msgstr "Walang file/directory"
msgid "No timer available"
msgstr ""
#: shared-module/usb/core/Device.c
msgid "No usb host port initialized"
msgstr ""
#: ports/nrf/common-hal/_bleio/__init__.c
msgid "Nordic system firmware out of memory"
msgstr ""

8
locale/fr.po
View File

@ -1532,6 +1532,10 @@ msgstr "Pas d'horloge disponible"
msgid "No capture in progress"
msgstr "Aucune capture en cours"
#: shared-module/usb/core/Device.c
msgid "No configuration set"
msgstr ""
#: shared-bindings/_bleio/PacketBuffer.c
msgid "No connection: length cannot be determined"
msgstr "Pas de connexion : la longueur ne peut pas être déterminée"
@ -1595,6 +1599,10 @@ msgstr "Fichier/répertoire introuvable"
msgid "No timer available"
msgstr "Aucun minuteur disponible"
#: shared-module/usb/core/Device.c
msgid "No usb host port initialized"
msgstr ""
#: ports/nrf/common-hal/_bleio/__init__.c
msgid "Nordic system firmware out of memory"
msgstr "Logiciel système Nordic n'a plus de mémoire"

8
locale/hi.po
View File

@ -1473,6 +1473,10 @@ msgstr ""
msgid "No capture in progress"
msgstr ""
#: shared-module/usb/core/Device.c
msgid "No configuration set"
msgstr ""
#: shared-bindings/_bleio/PacketBuffer.c
msgid "No connection: length cannot be determined"
msgstr ""
@ -1536,6 +1540,10 @@ msgstr ""
msgid "No timer available"
msgstr ""
#: shared-module/usb/core/Device.c
msgid "No usb host port initialized"
msgstr ""
#: ports/nrf/common-hal/_bleio/__init__.c
msgid "Nordic system firmware out of memory"
msgstr ""

8
locale/it_IT.po
View File

@ -1488,6 +1488,10 @@ msgstr "Nessun orologio a disposizione"
msgid "No capture in progress"
msgstr ""
#: shared-module/usb/core/Device.c
msgid "No configuration set"
msgstr ""
#: shared-bindings/_bleio/PacketBuffer.c
msgid "No connection: length cannot be determined"
msgstr ""
@ -1551,6 +1555,10 @@ msgstr "Nessun file/directory esistente"
msgid "No timer available"
msgstr ""
#: shared-module/usb/core/Device.c
msgid "No usb host port initialized"
msgstr ""
#: ports/nrf/common-hal/_bleio/__init__.c
msgid "Nordic system firmware out of memory"
msgstr ""

8
locale/ja.po
View File

@ -1486,6 +1486,10 @@ msgstr "利用できるクロックがありません"
msgid "No capture in progress"
msgstr ""
#: shared-module/usb/core/Device.c
msgid "No configuration set"
msgstr ""
#: shared-bindings/_bleio/PacketBuffer.c
msgid "No connection: length cannot be determined"
msgstr "接続なし: 長さが決定できません"
@ -1549,6 +1553,10 @@ msgstr "指定されたファイル/ディレクトリはありません"
msgid "No timer available"
msgstr "利用できるタイマーなし"
#: shared-module/usb/core/Device.c
msgid "No usb host port initialized"
msgstr ""
#: ports/nrf/common-hal/_bleio/__init__.c
msgid "Nordic system firmware out of memory"
msgstr ""

8
locale/ko.po
View File

@ -1476,6 +1476,10 @@ msgstr ""
msgid "No capture in progress"
msgstr ""
#: shared-module/usb/core/Device.c
msgid "No configuration set"
msgstr ""
#: shared-bindings/_bleio/PacketBuffer.c
msgid "No connection: length cannot be determined"
msgstr ""
@ -1539,6 +1543,10 @@ msgstr ""
msgid "No timer available"
msgstr ""
#: shared-module/usb/core/Device.c
msgid "No usb host port initialized"
msgstr ""
#: ports/nrf/common-hal/_bleio/__init__.c
msgid "Nordic system firmware out of memory"
msgstr ""

8
locale/nl.po
View File

@ -1481,6 +1481,10 @@ msgstr "Geen klokken beschikbaar"
msgid "No capture in progress"
msgstr ""
#: shared-module/usb/core/Device.c
msgid "No configuration set"
msgstr ""
#: shared-bindings/_bleio/PacketBuffer.c
msgid "No connection: length cannot be determined"
msgstr "Geen verbinding: lengte kan niet worden bepaald"
@ -1544,6 +1548,10 @@ msgstr "Bestand/map bestaat niet"
msgid "No timer available"
msgstr "Geen timer beschikbaar"
#: shared-module/usb/core/Device.c
msgid "No usb host port initialized"
msgstr ""
#: ports/nrf/common-hal/_bleio/__init__.c
msgid "Nordic system firmware out of memory"
msgstr ""

8
locale/pl.po
View File

@ -1481,6 +1481,10 @@ msgstr "Brak wolnych zegarów"
msgid "No capture in progress"
msgstr ""
#: shared-module/usb/core/Device.c
msgid "No configuration set"
msgstr ""
#: shared-bindings/_bleio/PacketBuffer.c
msgid "No connection: length cannot be determined"
msgstr "Brak połączenia: nie można ustalić długości"
@ -1544,6 +1548,10 @@ msgstr "Brak pliku/katalogu"
msgid "No timer available"
msgstr "Brak dostępnego timera"
#: shared-module/usb/core/Device.c
msgid "No usb host port initialized"
msgstr ""
#: ports/nrf/common-hal/_bleio/__init__.c
msgid "Nordic system firmware out of memory"
msgstr ""

12
locale/pt_BR.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: 2023-07-30 11:47+0000\n"
"PO-Revision-Date: 2023-08-06 17:45+0000\n"
"Last-Translator: Wellington Terumi Uemura <wellingtonuemura@gmail.com>\n"
"Language-Team: \n"
"Language: pt_BR\n"
@ -1515,6 +1515,10 @@ msgstr "Nenhum clock disponível"
msgid "No capture in progress"
msgstr "Não há nenhuma captura em andamento"
#: shared-module/usb/core/Device.c
msgid "No configuration set"
msgstr "Nenhum conjunto de configuração"
#: shared-bindings/_bleio/PacketBuffer.c
msgid "No connection: length cannot be determined"
msgstr "Sem conexão: o comprimento não pode ser determinado"
@ -1580,6 +1584,10 @@ msgstr "Este arquivo/diretório não existe"
msgid "No timer available"
msgstr "Não há um temporizador disponível"
#: shared-module/usb/core/Device.c
msgid "No usb host port initialized"
msgstr "Nenhuma porta do host usb foi inicializada"
#: ports/nrf/common-hal/_bleio/__init__.c
msgid "Nordic system firmware out of memory"
msgstr "O firmware do sistema nórdico está sem memória"
@ -3352,7 +3360,7 @@ msgstr "o tipo da entrada dtype deve ser flutuante ou complexo"
#: extmod/ulab/code/numpy/poly.c
msgid "input is not iterable"
msgstr ""
msgstr "a entrada não é iterável"
#: extmod/ulab/code/numpy/linalg/linalg.c
msgid "input matrix is asymmetric"

8
locale/ru.po
View File

@ -1521,6 +1521,10 @@ msgstr ""
msgid "No capture in progress"
msgstr "Захват не ведется"
#: shared-module/usb/core/Device.c
msgid "No configuration set"
msgstr ""
#: shared-bindings/_bleio/PacketBuffer.c
msgid "No connection: length cannot be determined"
msgstr "Нет соединения: длина не может быть определена"
@ -1586,6 +1590,10 @@ msgstr "Файл/директория не существует"
msgid "No timer available"
msgstr "Нет доступного таймера"
#: shared-module/usb/core/Device.c
msgid "No usb host port initialized"
msgstr ""
#: ports/nrf/common-hal/_bleio/__init__.c
msgid "Nordic system firmware out of memory"
msgstr ""

10
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: 2023-08-03 16:12+0000\n"
"PO-Revision-Date: 2023-08-04 16:42+0000\n"
"Last-Translator: Jonny Bergdahl <jonny@bergdahl.it>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: sv\n"
@ -1501,6 +1501,10 @@ msgstr "Inga tillgängliga klockor"
msgid "No capture in progress"
msgstr "Ingen insamling pågår"
#: shared-module/usb/core/Device.c
msgid "No configuration set"
msgstr "Ingen konfiguration gjord"
#: shared-bindings/_bleio/PacketBuffer.c
msgid "No connection: length cannot be determined"
msgstr "Ingen anslutning: längden kan inte bestämmas"
@ -1564,6 +1568,10 @@ msgstr "Ingen sådan fil/katalog"
msgid "No timer available"
msgstr "Ingen timer tillgänglig"
#: shared-module/usb/core/Device.c
msgid "No usb host port initialized"
msgstr "Ingen usb värdport initialiserad"
#: ports/nrf/common-hal/_bleio/__init__.c
msgid "Nordic system firmware out of memory"
msgstr "Nordic systemfirmware fick slut på minne"

8
locale/tr.po
View File

@ -1492,6 +1492,10 @@ msgstr "Kullanılabilir saat yok"
msgid "No capture in progress"
msgstr ""
#: shared-module/usb/core/Device.c
msgid "No configuration set"
msgstr ""
#: shared-bindings/_bleio/PacketBuffer.c
msgid "No connection: length cannot be determined"
msgstr ""
@ -1555,6 +1559,10 @@ msgstr ""
msgid "No timer available"
msgstr ""
#: shared-module/usb/core/Device.c
msgid "No usb host port initialized"
msgstr ""
#: ports/nrf/common-hal/_bleio/__init__.c
msgid "Nordic system firmware out of memory"
msgstr ""

12
locale/zh_Latn_pinyin.po
View File

@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: circuitpython-cn\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-01-04 12:55-0600\n"
"PO-Revision-Date: 2023-08-02 22:07+0000\n"
"PO-Revision-Date: 2023-08-07 14:52+0000\n"
"Last-Translator: hexthat <hexthat@gmail.com>\n"
"Language-Team: Chinese Hanyu Pinyin\n"
"Language: zh_Latn_pinyin\n"
@ -1508,6 +1508,10 @@ msgstr "Méiyǒu kěyòng de shízhōng"
msgid "No capture in progress"
msgstr "zhèng zài jìn xíng zhōng de wèi bǔ huò"
#: shared-module/usb/core/Device.c
msgid "No configuration set"
msgstr "wèi shèzhì pèizhì"
#: shared-bindings/_bleio/PacketBuffer.c
msgid "No connection: length cannot be determined"
msgstr "Wú liánjiē: Wúfǎ quèdìng chángdù"
@ -1571,6 +1575,10 @@ msgstr "Méiyǒu cǐ lèi wénjiàn/mùlù"
msgid "No timer available"
msgstr "Méiyǒu jìshí qì"
#: shared-module/usb/core/Device.c
msgid "No usb host port initialized"
msgstr "wèi chūshǐhuà USB zhǔjī duānkǒu"
#: ports/nrf/common-hal/_bleio/__init__.c
msgid "Nordic system firmware out of memory"
msgstr "běi ōu xì tǒng gù jiàn chū nèi cún"
@ -3324,7 +3332,7 @@ msgstr "shū rù dtype bì xū shì fú diǎn xíng huò fù shù"
#: extmod/ulab/code/numpy/poly.c
msgid "input is not iterable"
msgstr ""
msgstr "shūrù bùkě diédài"
#: extmod/ulab/code/numpy/linalg/linalg.c
msgid "input matrix is asymmetric"

2
ports/atmel-samd/common-hal/microcontroller/__init__.c
View File

@ -63,7 +63,7 @@ void common_hal_mcu_enable_interrupts(void) {
}
void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) {
if (runmode == RUNMODE_BOOTLOADER) {
if ((runmode == RUNMODE_BOOTLOADER) || (runmode == RUNMODE_UF2)) {
if (!bootloader_available()) {
mp_raise_ValueError(translate("Cannot reset into bootloader because no bootloader is present"));
}

2
ports/espressif/boards/adafruit_esp32s3_camera/mpconfigboard.h
View File

@ -40,3 +40,5 @@
#define DEFAULT_SPI_BUS_MISO (&pin_GPIO37)
#define DOUBLE_TAP_PIN (&pin_GPIO42)
#define DEFAULT_RESERVED_PSRAM (1048576)

4
ports/raspberrypi/supervisor/internal_flash.c
View File

@ -99,11 +99,15 @@ void port_internal_flash_flush(void) {
// Make sure we don't have an interrupt while we do flash operations.
common_hal_mcu_disable_interrupts();
// and audio DMA must be paused as well
#if CIRCUITPY_AUDIOCORE
uint32_t channel_mask = audio_dma_pause_all();
#endif
flash_range_erase(CIRCUITPY_CIRCUITPY_DRIVE_START_ADDR + _cache_lba, SECTOR_SIZE);
flash_range_program(CIRCUITPY_CIRCUITPY_DRIVE_START_ADDR + _cache_lba, _cache, SECTOR_SIZE);
_cache_lba = NO_CACHE;
#if CIRCUITPY_AUDIOCORE
audio_dma_unpause_mask(channel_mask);
#endif
common_hal_mcu_enable_interrupts();
}

13
shared-bindings/synthio/__init__.c
View File

@ -45,6 +45,13 @@
#include "shared-module/synthio/LFO.h"
//|
//| """Support for multi-channel audio synthesis
//|
//| At least 2 simultaneous notes are supported. samd5x, mimxrt10xx and rp2040 platforms support up to 12 notes.
//| """
//|
//| class EnvelopeState:
//| ATTACK: EnvelopeState
//| """The note is in its attack phase"""
@ -85,12 +92,6 @@ static const mp_arg_t envelope_properties[] = {
{ MP_QSTR_sustain_level, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = MP_OBJ_NULL } },
};
//|
//| """Support for multi-channel audio synthesis
//|
//| At least 2 simultaneous notes are supported. samd5x, mimxrt10xx and rp2040 platforms support up to 12 notes.
//| """
//|
//| BlockInput = Union["Math", "LFO", float, None]
//| """Blocks and Notes can take any of these types as inputs on certain attributes
//|