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

Merge remote-tracking branch 'adafruit/main' into cache_config_desc

Browse Source
This commit is contained in:
Scott Shawcroft 2023-08-03 13:37:53 -07:00
commit 9152659912
No known key found for this signature in database
GPG Key ID: 0DFD512649C052DA
26 changed files with 162 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/shared_bindings_matrix.py
View File

@ -177,7 +177,7 @@ def get_settings_from_makefile(port_dir, board_name):
in this script, something that has proved error-prone
"""
contents = subprocess.run(
["make", "-C", port_dir, "-f", "Makefile", f"BOARD={board_name}", "print-CFLAGS", "print-CIRCUITPY_BUILD_EXTENSIONS", "print-FROZEN_MPY_DIRS"],
["make", "-C", port_dir, "-f", "Makefile", f"BOARD={board_name}", "print-CFLAGS", "print-CIRCUITPY_BUILD_EXTENSIONS", "print-FROZEN_MPY_DIRS", "print-SRC_PATTERNS"],
encoding="utf-8",
errors="replace",
stdout=subprocess.PIPE,

2
extmod/ulab

@ -1 +1 @@
Subproject commit 3728d22732dedc8a591b7df18a16d3ef1aed6a39
Subproject commit 84f99f17fc02b03c13f99485d9cf68bc9d17c600

8
locale/ID.po
View File

@ -3287,6 +3287,10 @@ msgstr ""
msgid "input dtype must be float or complex"
msgstr ""
#: extmod/ulab/code/numpy/poly.c
msgid "input is not iterable"
msgstr ""
#: extmod/ulab/code/numpy/linalg/linalg.c
msgid "input matrix is asymmetric"
msgstr ""
@ -3332,10 +3336,6 @@ msgstr ""
msgid "input vectors must be of equal length"
msgstr ""
#: extmod/ulab/code/numpy/poly.c
msgid "inputs are not iterable"
msgstr ""
#: extmod/ulab/code/numpy/approx.c
msgid "interp is defined for 1D iterables of equal length"
msgstr ""

12
locale/circuitpython.pot
View File

@ -1540,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 ""
@ -3263,6 +3267,10 @@ msgstr ""
msgid "input dtype must be float or complex"
msgstr ""
#: extmod/ulab/code/numpy/poly.c
msgid "input is not iterable"
msgstr ""
#: extmod/ulab/code/numpy/linalg/linalg.c
msgid "input matrix is asymmetric"
msgstr ""
@ -3308,10 +3316,6 @@ msgstr ""
msgid "input vectors must be of equal length"
msgstr ""
#: extmod/ulab/code/numpy/poly.c
msgid "inputs are not iterable"
msgstr ""
#: extmod/ulab/code/numpy/approx.c
msgid "interp is defined for 1D iterables of equal length"
msgstr ""

8
locale/cs.po
View File

@ -3274,6 +3274,10 @@ msgstr ""
msgid "input dtype must be float or complex"
msgstr ""
#: extmod/ulab/code/numpy/poly.c
msgid "input is not iterable"
msgstr ""
#: extmod/ulab/code/numpy/linalg/linalg.c
msgid "input matrix is asymmetric"
msgstr ""
@ -3319,10 +3323,6 @@ msgstr ""
msgid "input vectors must be of equal length"
msgstr ""
#: extmod/ulab/code/numpy/poly.c
msgid "inputs are not iterable"
msgstr ""
#: extmod/ulab/code/numpy/approx.c
msgid "interp is defined for 1D iterables of equal length"
msgstr ""

11
locale/de_DE.po
View File

@ -3347,6 +3347,10 @@ msgstr "Eingabedaten müssen iterierbar sein"
msgid "input dtype must be float or complex"
msgstr "Eingabe dtype muss float oder complex sein"
#: extmod/ulab/code/numpy/poly.c
msgid "input is not iterable"
msgstr ""
#: extmod/ulab/code/numpy/linalg/linalg.c
msgid "input matrix is asymmetric"
msgstr "Eingabematrix ist asymmetrisch"
@ -3392,10 +3396,6 @@ msgstr "Die Eingabe muss Tupel, Liste, Bereich oder Ndarray sein"
msgid "input vectors must be of equal length"
msgstr "Eingabevektoren müssen gleich lang sein"
#: extmod/ulab/code/numpy/poly.c
msgid "inputs are not iterable"
msgstr "Eingaben sind nicht iterierbar"
#: extmod/ulab/code/numpy/approx.c
msgid "interp is defined for 1D iterables of equal length"
msgstr "interp ist für 1D-Iterables gleicher Länge definiert"
@ -4463,6 +4463,9 @@ msgstr "zi muss eine Gleitkommazahl sein"
msgid "zi must be of shape (n_section, 2)"
msgstr "zi muss die Form (n_section, 2) haben"
#~ msgid "inputs are not iterable"
#~ msgstr "Eingaben sind nicht iterierbar"
#~ msgid "Too many display busses"
#~ msgstr "Zu viele Anzeigebusse"

8
locale/el.po
View File

@ -3288,6 +3288,10 @@ msgstr ""
msgid "input dtype must be float or complex"
msgstr ""
#: extmod/ulab/code/numpy/poly.c
msgid "input is not iterable"
msgstr ""
#: extmod/ulab/code/numpy/linalg/linalg.c
msgid "input matrix is asymmetric"
msgstr ""
@ -3333,10 +3337,6 @@ msgstr ""
msgid "input vectors must be of equal length"
msgstr ""
#: extmod/ulab/code/numpy/poly.c
msgid "inputs are not iterable"
msgstr ""
#: extmod/ulab/code/numpy/approx.c
msgid "interp is defined for 1D iterables of equal length"
msgstr ""

11
locale/en_GB.po
View File

@ -3302,6 +3302,10 @@ msgstr "input data must be an iterable"
msgid "input dtype must be float or complex"
msgstr "input dtype must be float or complex"
#: extmod/ulab/code/numpy/poly.c
msgid "input is not iterable"
msgstr ""
#: extmod/ulab/code/numpy/linalg/linalg.c
msgid "input matrix is asymmetric"
msgstr "input matrix is asymmetric"
@ -3347,10 +3351,6 @@ msgstr "input must be tuple, list, range, or ndarray"
msgid "input vectors must be of equal length"
msgstr "input vectors must be of equal length"
#: extmod/ulab/code/numpy/poly.c
msgid "inputs are not iterable"
msgstr "inputs are not iterable"
#: extmod/ulab/code/numpy/approx.c
msgid "interp is defined for 1D iterables of equal length"
msgstr "interp is defined for 1D iterables of equal length"
@ -4404,6 +4404,9 @@ msgstr "zi must be of float type"
msgid "zi must be of shape (n_section, 2)"
msgstr "zi must be of shape (n_section, 2)"
#~ msgid "inputs are not iterable"
#~ msgstr "inputs are not iterable"
#~ msgid "Too many display busses"
#~ msgstr "Too many display busses"

11
locale/es.po
View File

@ -3350,6 +3350,10 @@ msgstr "los datos de entrada deben ser iterables"
msgid "input dtype must be float or complex"
msgstr "dtype de entrada debe ser float o complex"
#: extmod/ulab/code/numpy/poly.c
msgid "input is not iterable"
msgstr ""
#: extmod/ulab/code/numpy/linalg/linalg.c
msgid "input matrix is asymmetric"
msgstr "la matriz de entrada es asimétrica"
@ -3395,10 +3399,6 @@ msgstr "la entrada debe ser una tupla, lista, rango o ndarray"
msgid "input vectors must be of equal length"
msgstr "los vectores de entrada deben ser de igual tamaño"
#: extmod/ulab/code/numpy/poly.c
msgid "inputs are not iterable"
msgstr "Entradas no son iterables"
#: extmod/ulab/code/numpy/approx.c
msgid "interp is defined for 1D iterables of equal length"
msgstr "interp está definido para iterables 1D de igual tamaño"
@ -4460,6 +4460,9 @@ msgstr "zi debe ser de tipo flotante"
msgid "zi must be of shape (n_section, 2)"
msgstr "zi debe ser una forma (n_section,2)"
#~ msgid "inputs are not iterable"
#~ msgstr "Entradas no son iterables"
#~ msgid "Too many display busses"
#~ msgstr "Demasiados buses de pantalla"

8
locale/fil.po
View File

@ -3289,6 +3289,10 @@ msgstr ""
msgid "input dtype must be float or complex"
msgstr ""
#: extmod/ulab/code/numpy/poly.c
msgid "input is not iterable"
msgstr ""
#: extmod/ulab/code/numpy/linalg/linalg.c
msgid "input matrix is asymmetric"
msgstr ""
@ -3334,10 +3338,6 @@ msgstr ""
msgid "input vectors must be of equal length"
msgstr ""
#: extmod/ulab/code/numpy/poly.c
msgid "inputs are not iterable"
msgstr ""
#: extmod/ulab/code/numpy/approx.c
msgid "interp is defined for 1D iterables of equal length"
msgstr ""

11
locale/fr.po
View File

@ -3368,6 +3368,10 @@ msgstr "les données d'entrée doivent être un itérable"
msgid "input dtype must be float or complex"
msgstr "le dtype d'entrée doit être un flottant ou un complexe"
#: extmod/ulab/code/numpy/poly.c
msgid "input is not iterable"
msgstr ""
#: extmod/ulab/code/numpy/linalg/linalg.c
msgid "input matrix is asymmetric"
msgstr "la matrice d'entrée est asymétrique"
@ -3413,10 +3417,6 @@ msgstr "l'entrée 'input' doit être tuple, list, range ou ndarray"
msgid "input vectors must be of equal length"
msgstr "les vecteurs d'entrée doivent être de longueur égale"
#: extmod/ulab/code/numpy/poly.c
msgid "inputs are not iterable"
msgstr "les entrées ne sont pas itérables"
#: extmod/ulab/code/numpy/approx.c
msgid "interp is defined for 1D iterables of equal length"
msgstr "interp n'est défini que pour les 1D itérables de taille identique"
@ -4482,6 +4482,9 @@ msgstr "zi doit être de type float"
msgid "zi must be of shape (n_section, 2)"
msgstr "zi doit être de forme (n_section, 2)"
#~ msgid "inputs are not iterable"
#~ msgstr "les entrées ne sont pas itérables"
#~ msgid "Too many display busses"
#~ msgstr "Trop de bus d'affichage"

8
locale/hi.po
View File

@ -3259,6 +3259,10 @@ msgstr ""
msgid "input dtype must be float or complex"
msgstr ""
#: extmod/ulab/code/numpy/poly.c
msgid "input is not iterable"
msgstr ""
#: extmod/ulab/code/numpy/linalg/linalg.c
msgid "input matrix is asymmetric"
msgstr ""
@ -3304,10 +3308,6 @@ msgstr ""
msgid "input vectors must be of equal length"
msgstr ""
#: extmod/ulab/code/numpy/poly.c
msgid "inputs are not iterable"
msgstr ""
#: extmod/ulab/code/numpy/approx.c
msgid "interp is defined for 1D iterables of equal length"
msgstr ""

8
locale/it_IT.po
View File

@ -3294,6 +3294,10 @@ msgstr ""
msgid "input dtype must be float or complex"
msgstr ""
#: extmod/ulab/code/numpy/poly.c
msgid "input is not iterable"
msgstr ""
#: extmod/ulab/code/numpy/linalg/linalg.c
msgid "input matrix is asymmetric"
msgstr ""
@ -3339,10 +3343,6 @@ msgstr ""
msgid "input vectors must be of equal length"
msgstr ""
#: extmod/ulab/code/numpy/poly.c
msgid "inputs are not iterable"
msgstr ""
#: extmod/ulab/code/numpy/approx.c
msgid "interp is defined for 1D iterables of equal length"
msgstr ""

8
locale/ja.po
View File

@ -3281,6 +3281,10 @@ msgstr ""
msgid "input dtype must be float or complex"
msgstr ""
#: extmod/ulab/code/numpy/poly.c
msgid "input is not iterable"
msgstr ""
#: extmod/ulab/code/numpy/linalg/linalg.c
msgid "input matrix is asymmetric"
msgstr "入力行列が非対称"
@ -3326,10 +3330,6 @@ msgstr "入力はtuple, list, range, ndarrayでなければなりません"
msgid "input vectors must be of equal length"
msgstr ""
#: extmod/ulab/code/numpy/poly.c
msgid "inputs are not iterable"
msgstr ""
#: extmod/ulab/code/numpy/approx.c
msgid "interp is defined for 1D iterables of equal length"
msgstr ""

8
locale/ko.po
View File

@ -3263,6 +3263,10 @@ msgstr ""
msgid "input dtype must be float or complex"
msgstr ""
#: extmod/ulab/code/numpy/poly.c
msgid "input is not iterable"
msgstr ""
#: extmod/ulab/code/numpy/linalg/linalg.c
msgid "input matrix is asymmetric"
msgstr ""
@ -3308,10 +3312,6 @@ msgstr ""
msgid "input vectors must be of equal length"
msgstr ""
#: extmod/ulab/code/numpy/poly.c
msgid "inputs are not iterable"
msgstr ""
#: extmod/ulab/code/numpy/approx.c
msgid "interp is defined for 1D iterables of equal length"
msgstr ""

11
locale/nl.po
View File

@ -3290,6 +3290,10 @@ msgstr "invoerdata moet itereerbaar zijn"
msgid "input dtype must be float or complex"
msgstr ""
#: extmod/ulab/code/numpy/poly.c
msgid "input is not iterable"
msgstr ""
#: extmod/ulab/code/numpy/linalg/linalg.c
msgid "input matrix is asymmetric"
msgstr "invoermatrix is asymmetrisch"
@ -3335,10 +3339,6 @@ msgstr "invoer moet een tuple, lijst, bereik of ndarray zijn"
msgid "input vectors must be of equal length"
msgstr "invoervectors moeten van gelijke lengte zijn"
#: extmod/ulab/code/numpy/poly.c
msgid "inputs are not iterable"
msgstr "invoer is niet itereerbaar"
#: extmod/ulab/code/numpy/approx.c
msgid "interp is defined for 1D iterables of equal length"
msgstr ""
@ -4395,6 +4395,9 @@ msgstr "zi moet van type float zijn"
msgid "zi must be of shape (n_section, 2)"
msgstr "zi moet vorm (n_section, 2) hebben"
#~ msgid "inputs are not iterable"
#~ msgstr "invoer is niet itereerbaar"
#~ msgid "Too many display busses"
#~ msgstr "Teveel beeldscherm bussen"

8
locale/pl.po
View File

@ -3268,6 +3268,10 @@ msgstr ""
msgid "input dtype must be float or complex"
msgstr ""
#: extmod/ulab/code/numpy/poly.c
msgid "input is not iterable"
msgstr ""
#: extmod/ulab/code/numpy/linalg/linalg.c
msgid "input matrix is asymmetric"
msgstr ""
@ -3313,10 +3317,6 @@ msgstr ""
msgid "input vectors must be of equal length"
msgstr "wektory wejściowe muszą być równej długości"
#: extmod/ulab/code/numpy/poly.c
msgid "inputs are not iterable"
msgstr ""
#: extmod/ulab/code/numpy/approx.c
msgid "interp is defined for 1D iterables of equal length"
msgstr ""

15
locale/pt_BR.po
View File

@ -2123,8 +2123,8 @@ msgstr "Muitos canais na amostra."
#: shared-module/displayio/__init__.c
msgid "Too many display busses; forgot displayio.release_displays() ?"
msgstr ""
"Excesso de barramentos de exibição; esqueceu do displayio.release_displays() "
"?"
"Excesso de barramentos de exibição; esqueceu do displayio."
"release_displays() ?"
#: shared-module/displayio/__init__.c
msgid "Too many displays"
@ -3350,6 +3350,10 @@ msgstr "os dados da entrada devem ser iteráveis"
msgid "input dtype must be float or complex"
msgstr "o tipo da entrada dtype deve ser flutuante ou complexo"
#: extmod/ulab/code/numpy/poly.c
msgid "input is not iterable"
msgstr ""
#: extmod/ulab/code/numpy/linalg/linalg.c
msgid "input matrix is asymmetric"
msgstr "a matriz da entrada é assimétrica"
@ -3395,10 +3399,6 @@ msgstr "A entrada deve ser tupla, lista, intervalo ou matriz"
msgid "input vectors must be of equal length"
msgstr "os vetores da entrada devem ter o mesmo comprimento"
#: extmod/ulab/code/numpy/poly.c
msgid "inputs are not iterable"
msgstr "as entradas não são iteráveis"
#: extmod/ulab/code/numpy/approx.c
msgid "interp is defined for 1D iterables of equal length"
msgstr "o interp é definido para iteráveis 1D com comprimento igual"
@ -4462,6 +4462,9 @@ msgstr "zi deve ser de um tipo float"
msgid "zi must be of shape (n_section, 2)"
msgstr "zi deve estar na forma (n_section, 2)"
#~ msgid "inputs are not iterable"
#~ msgstr "as entradas não são iteráveis"
#~ msgid "Too many display busses"
#~ msgstr "Muitos barramentos estão sendo exibidos"

8
locale/ru.po
View File

@ -3322,6 +3322,10 @@ msgstr ""
msgid "input dtype must be float or complex"
msgstr ""
#: extmod/ulab/code/numpy/poly.c
msgid "input is not iterable"
msgstr ""
#: extmod/ulab/code/numpy/linalg/linalg.c
msgid "input matrix is asymmetric"
msgstr ""
@ -3367,10 +3371,6 @@ msgstr ""
msgid "input vectors must be of equal length"
msgstr ""
#: extmod/ulab/code/numpy/poly.c
msgid "inputs are not iterable"
msgstr ""
#: extmod/ulab/code/numpy/approx.c
msgid "interp is defined for 1D iterables of equal length"
msgstr ""

13
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-07-30 11:47+0000\n"
"PO-Revision-Date: 2023-08-03 16:12+0000\n"
"Last-Translator: Jonny Bergdahl <jonny@bergdahl.it>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: sv\n"
@ -3316,6 +3316,10 @@ msgstr "indata måste vara en iterable"
msgid "input dtype must be float or complex"
msgstr "indatatyp måste vara float eller complex"
#: extmod/ulab/code/numpy/poly.c
msgid "input is not iterable"
msgstr "indata är inte itererbar"
#: extmod/ulab/code/numpy/linalg/linalg.c
msgid "input matrix is asymmetric"
msgstr "indatamatrisen är asymmetrisk"
@ -3361,10 +3365,6 @@ msgstr "indata måste vara tupel, lista, range, eller ndarray"
msgid "input vectors must be of equal length"
msgstr "indatavektorer måste ha samma längd"
#: extmod/ulab/code/numpy/poly.c
msgid "inputs are not iterable"
msgstr "indata är inte iterbara"
#: extmod/ulab/code/numpy/approx.c
msgid "interp is defined for 1D iterables of equal length"
msgstr "interp är definierad för 1D-iterabla med samma längd"
@ -4422,6 +4422,9 @@ msgstr "zi måste vara av typ float"
msgid "zi must be of shape (n_section, 2)"
msgstr "zi måste vara i formen (n_section, 2)"
#~ msgid "inputs are not iterable"
#~ msgstr "indata är inte iterbara"
#~ msgid "Too many display busses"
#~ msgstr "För många display-bussar"

8
locale/tr.po
View File

@ -3281,6 +3281,10 @@ msgstr ""
msgid "input dtype must be float or complex"
msgstr ""
#: extmod/ulab/code/numpy/poly.c
msgid "input is not iterable"
msgstr ""
#: extmod/ulab/code/numpy/linalg/linalg.c
msgid "input matrix is asymmetric"
msgstr ""
@ -3326,10 +3330,6 @@ msgstr ""
msgid "input vectors must be of equal length"
msgstr ""
#: extmod/ulab/code/numpy/poly.c
msgid "inputs are not iterable"
msgstr ""
#: extmod/ulab/code/numpy/approx.c
msgid "interp is defined for 1D iterables of equal length"
msgstr ""

35
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-07-21 00:10+0000\n"
"PO-Revision-Date: 2023-08-02 22:07+0000\n"
"Last-Translator: hexthat <hexthat@gmail.com>\n"
"Language-Team: Chinese Hanyu Pinyin\n"
"Language: zh_Latn_pinyin\n"
@ -1793,7 +1793,7 @@ msgstr "yǐn jiǎo bì xū gòng xiǎng PWM qiē piàn"
#: shared-module/usb/core/Device.c
msgid "Pipe error"
msgstr ""
msgstr "guǎndào cuòwù"
#: py/builtinhelp.c
msgid "Plus any modules on the filesystem\n"
@ -2104,7 +2104,7 @@ msgstr "Chōuyàng zhōng de píndào tài duō."
#: shared-module/displayio/__init__.c
msgid "Too many display busses; forgot displayio.release_displays() ?"
msgstr ""
msgstr "Xiǎnshì zǒngxiàn guòduō;wàngjì displayio.release_displays() ?"
#: shared-module/displayio/__init__.c
msgid "Too many displays"
@ -2828,7 +2828,7 @@ msgstr "wúfǎ chuàngjiàn shílì"
#: extmod/ulab/code/ndarray.c
msgid "cannot delete array elements"
msgstr ""
msgstr "wúfǎ shānchú shùzǔ yuánsù"
#: py/runtime.c
msgid "cannot import name %q"
@ -3296,11 +3296,11 @@ msgstr "nèi lián jíhé bìxū shì yīgè hánshù"
#: extmod/ulab/code/numpy/vector.c
msgid "input and output dimensions differ"
msgstr ""
msgstr "shūrù hé shūchū chǐcùn bùtóng"
#: extmod/ulab/code/numpy/vector.c
msgid "input and output shapes differ"
msgstr ""
msgstr "shūrù hé shūchū xíngzhuàng bùtóng"
#: extmod/ulab/code/numpy/create.c
msgid "input argument must be an integer, a tuple, or a list"
@ -3322,6 +3322,10 @@ msgstr "shūrù shùjù bìxū shì kě diédài de"
msgid "input dtype must be float or complex"
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 ""
#: extmod/ulab/code/numpy/linalg/linalg.c
msgid "input matrix is asymmetric"
msgstr "shūrù jǔzhèn bù duìchèn"
@ -3367,10 +3371,6 @@ msgstr "shūrù bìxū shì yuán zǔ, lièbiǎo, fànwéi huò ndarray"
msgid "input vectors must be of equal length"
msgstr "shūrù xiàngliàng de chángdù bìxū xiāngděng"
#: extmod/ulab/code/numpy/poly.c
msgid "inputs are not iterable"
msgstr "shū rù bù kě yí dòng"
#: extmod/ulab/code/numpy/approx.c
msgid "interp is defined for 1D iterables of equal length"
msgstr "zhōng jiān wéi cháng dù xiāng děng de 1D kě yì jiāo qì dìng yì"
@ -3633,7 +3633,7 @@ msgstr "yuán chǎn"
#: extmod/ulab/code/ndarray.c
msgid "ndarray length overflows"
msgstr ""
msgstr "ndarray chángdù yìchū"
#: py/runtime.c
#, c-format
@ -3735,7 +3735,7 @@ msgstr "wèi zhēn duì fù zá de dtype shí xiàn"
#: extmod/ulab/code/numpy/bitwise.c
msgid "not supported for input types"
msgstr ""
msgstr "bù zhīchí shūrù lèixíng"
#: extmod/ulab/code/numpy/create.c
msgid "number of points must be at least 2"
@ -3887,11 +3887,11 @@ msgstr "chū zhèn liè tài xiǎo"
#: extmod/ulab/code/numpy/vector.c
msgid "out keyword is not supported for complex dtype"
msgstr ""
msgstr "fùzá de dtype bù zhīchí out guānjiànzì"
#: extmod/ulab/code/numpy/vector.c
msgid "out keyword is not supported for function"
msgstr ""
msgstr "hánshù bù zhīchí out guānjiànzì"
#: extmod/ulab/code/utils/utils.c
msgid "out must be a float dense array"
@ -3899,11 +3899,11 @@ msgstr "chū bì xū shì yí gè fú dòng mì jí zhèn liè"
#: extmod/ulab/code/numpy/vector.c
msgid "out must be an ndarray"
msgstr ""
msgstr "shūchū bìxū shì ndarray"
#: extmod/ulab/code/numpy/vector.c
msgid "out must be of float dtype"
msgstr ""
msgstr "out bìxū shì fúdiǎn xíng dtype"
#: shared-bindings/bitmaptools/__init__.c
msgid "out of range of target"
@ -4428,6 +4428,9 @@ msgstr "zi bìxū wèi fú diǎn xíng"
msgid "zi must be of shape (n_section, 2)"
msgstr "zi bìxū jùyǒu xíngzhuàng (n_section,2)"
#~ msgid "inputs are not iterable"
#~ msgstr "shū rù bù kě yí dòng"
#~ msgid "Too many display busses"
#~ msgstr "Xiǎnshì zǒngxiàn tài duōle"

2
ports/raspberrypi/link.ld
View File

@ -211,7 +211,7 @@ SECTIONS
_ld_dtcm_data_flash_copy = LOADADDR(.dtcm_data);
_ld_dtcm_data_size = SIZEOF(.dtcm_data);
.dtcm_bss :
.dtcm_bss (NOLOAD) :
{
. = ALIGN(4);

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

@ -302,9 +302,9 @@ mp_uint_t supervisor_flash_read_blocks(uint8_t *dest, uint32_t block, uint32_t n
uint32_t sector_start_addr;
flash_get_sector_info(src, &sector_start_addr, &sector_size);
// Count how many blocks are left in the sector
uint32_t count = (sector_size - (src - sector_start_addr)) / FILESYSTEM_BLOCK_SIZE;
uint32_t blocks_left_in_sector = (sector_size - (src - sector_start_addr)) / FILESYSTEM_BLOCK_SIZE;
if (count <= num_blocks && _cache_flash_addr == sector_start_addr) {
if (num_blocks <= blocks_left_in_sector && _cache_flash_addr == sector_start_addr) {
// Read is contained in the cache, so just read cache
memcpy(dest, (_flash_cache + (src - sector_start_addr)), FILESYSTEM_BLOCK_SIZE * num_blocks);
} else {

60
shared-bindings/bitmaptools/__init__.c
View File

@ -949,37 +949,37 @@ STATIC mp_obj_t bitmaptools_obj_draw_circle(size_t n_args, const mp_obj_t *pos_a
MP_DEFINE_CONST_FUN_OBJ_KW(bitmaptools_draw_circle_obj, 0, bitmaptools_obj_draw_circle);
//| def blit(
//| dest_bitmap: displayio.Bitmap,
//| source_bitmap: displayio.Bitmap,
//| x: int,
//| y: int,
//| *,
//| x1: int,
//| y1: int,
//| x2: int,
//| y2: int,
//| skip_source_index: int,
//| skip_dest_index: int
//| ) -> None:
//| """Inserts the source_bitmap region defined by rectangular boundaries
//| (x1,y1) and (x2,y2) into the bitmap at the specified (x,y) location.
//| def blit(
//| dest_bitmap: displayio.Bitmap,
//| source_bitmap: displayio.Bitmap,
//| x: int,
//| y: int,
//| *,
//| x1: int,
//| y1: int,
//| x2: int,
//| y2: int,
//| skip_source_index: int,
//| skip_dest_index: int
//| ) -> None:
//| """Inserts the source_bitmap region defined by rectangular boundaries
//| (x1,y1) and (x2,y2) into the bitmap at the specified (x,y) location.
//|
//| :param bitmap dest_bitmap: Destination bitmap that the area will be copied into.
//| :param bitmap source_bitmap: Source bitmap that contains the graphical region to be copied
//| :param int x: Horizontal pixel location in bitmap where source_bitmap upper-left
//| corner will be placed
//| :param int y: Vertical pixel location in bitmap where source_bitmap upper-left
//| corner will be placed
//| :param int x1: Minimum x-value for rectangular bounding box to be copied from the source bitmap
//| :param int y1: Minimum y-value for rectangular bounding box to be copied from the source bitmap
//| :param int x2: Maximum x-value (exclusive) for rectangular bounding box to be copied from the source bitmap
//| :param int y2: Maximum y-value (exclusive) for rectangular bounding box to be copied from the source bitmap
//| :param int skip_source_index: bitmap palette index in the source that will not be copied,
//| set to None to copy all pixels
//| :param int skip_dest_index: bitmap palette index in the destination bitmap that will not get overwritten
//| by the pixels from the source"""
//| ...
//| :param bitmap dest_bitmap: Destination bitmap that the area will be copied into.
//| :param bitmap source_bitmap: Source bitmap that contains the graphical region to be copied
//| :param int x: Horizontal pixel location in bitmap where source_bitmap upper-left
//| corner will be placed
//| :param int y: Vertical pixel location in bitmap where source_bitmap upper-left
//| corner will be placed
//| :param int x1: Minimum x-value for rectangular bounding box to be copied from the source bitmap
//| :param int y1: Minimum y-value for rectangular bounding box to be copied from the source bitmap
//| :param int x2: Maximum x-value (exclusive) for rectangular bounding box to be copied from the source bitmap
//| :param int y2: Maximum y-value (exclusive) for rectangular bounding box to be copied from the source bitmap
//| :param int skip_source_index: bitmap palette index in the source that will not be copied,
//| set to None to copy all pixels
//| :param int skip_dest_index: bitmap palette index in the destination bitmap that will not get overwritten
//| by the pixels from the source"""
//| ...
//|
STATIC mp_obj_t bitmaptools_obj_blit(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
enum {ARG_destination, ARG_source, ARG_x, ARG_y, ARG_x1, ARG_y1, ARG_x2, ARG_y2, ARG_skip_source_index, ARG_skip_dest_index};

4
shared-module/usb/core/Device.c
View File

@ -51,6 +51,10 @@ void tuh_umount_cb(uint8_t dev_addr) {
STATIC xfer_result_t _xfer_result;
STATIC size_t _actual_len;
bool common_hal_usb_core_device_construct(usb_core_device_obj_t *self, uint8_t device_number) {
if (!tuh_inited()) {
mp_raise_RuntimeError(translate("No usb host port initialized"));
}
if (device_number == 0 || device_number > CFG_TUH_DEVICE_MAX + CFG_TUH_HUB) {
return false;
}