Skip to content

Commit 3806475

Browse files
hierophecthierophect
committed
Merge remote-tracking branch 'upstream/master' into stm32-pulsein
2 parents 2b161d3 + d988af0 commit 3806475

File tree

105 files changed

+1041
-383
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+1041
-383
lines changed

‎.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
url = https://github.com/adafruit/Adafruit_CircuitPython_Register.git
117117
[submodule "extmod/ulab"]
118118
path = extmod/ulab
119-
url = https://github.com/adafruit/circuitpython-ulab
119+
url = https://github.com/v923z/micropython-ulab/
120120
[submodule "frozen/Adafruit_CircuitPython_ESP32SPI"]
121121
path = frozen/Adafruit_CircuitPython_ESP32SPI
122122
url = https://github.com/adafruit/Adafruit_CircuitPython_ESP32SPI

‎docs/design_guide.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -476,6 +476,8 @@ properties.
476476
+-----------------------+-----------------------+-------------------------------------------------------------------------+
477477
| ``distance`` | float | centimeters |
478478
+-----------------------+-----------------------+-------------------------------------------------------------------------+
479+
| ``proximity`` | int | non-unit-specifc proximity values (monotonic but not actual distance) |
480+
+-----------------------+-----------------------+-------------------------------------------------------------------------+
479481
| ``light`` | float | non-unit-specific light levels (should be monotonic but is not lux) |
480482
+-----------------------+-----------------------+-------------------------------------------------------------------------+
481483
| ``lux`` | float | SI lux |
@@ -504,6 +506,8 @@ properties.
504506
+-----------------------+-----------------------+-------------------------------------------------------------------------+
505507
| ``weight`` | float | grams (g) |
506508
+-----------------------+-----------------------+-------------------------------------------------------------------------+
509+
| ``sound_level`` | float | non-unit-specific sound level (monotonic but not actual decibels) |
510+
+-----------------------+-----------------------+-------------------------------------------------------------------------+
507511

508512
Adding native modules
509513
--------------------------------------------------------------------------------

‎extmod/ulab

Submodule ulab updated 1 file

‎locale/ID.po

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-03-03 20:13-0600\n"
11+
"POT-Creation-Date: 2020-03-09 08:19-0500\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -2080,6 +2080,26 @@ msgstr "argumen keyword ekstra telah diberikan"
20802080
msgid "extra positional arguments given"
20812081
msgstr "argumen posisi ekstra telah diberikan"
20822082

2083+
#: py/parse.c
2084+
msgid "f-string expression part cannot include a '#'"
2085+
msgstr ""
2086+
2087+
#: py/parse.c
2088+
msgid "f-string expression part cannot include a backslash"
2089+
msgstr ""
2090+
2091+
#: py/parse.c
2092+
msgid "f-string: empty expression not allowed"
2093+
msgstr ""
2094+
2095+
#: py/parse.c
2096+
msgid "f-string: expecting '}'"
2097+
msgstr ""
2098+
2099+
#: py/parse.c
2100+
msgid "f-string: single '}' is not allowed"
2101+
msgstr ""
2102+
20832103
#: shared-bindings/audiocore/WaveFile.c shared-bindings/audiomp3/MP3Decoder.c
20842104
#: shared-bindings/displayio/OnDiskBitmap.c
20852105
msgid "file must be a file opened in byte mode"
@@ -2393,6 +2413,10 @@ msgstr ""
23932413
msgid "long int not supported in this build"
23942414
msgstr ""
23952415

2416+
#: py/parse.c
2417+
msgid "malformed f-string"
2418+
msgstr ""
2419+
23962420
#: shared-bindings/_stage/Layer.c
23972421
msgid "map buffer too small"
23982422
msgstr ""
@@ -2721,6 +2745,10 @@ msgstr ""
27212745
msgid "queue overflow"
27222746
msgstr "antrian meluap (overflow)"
27232747

2748+
#: py/parse.c
2749+
msgid "raw f-strings are not implemented"
2750+
msgstr ""
2751+
27242752
#: extmod/ulab/code/fft.c
27252753
msgid "real and imaginary parts must be of equal length"
27262754
msgstr ""

‎locale/circuitpython.pot

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-03-03 20:13-0600\n"
11+
"POT-Creation-Date: 2020-03-09 08:19-0500\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -2056,6 +2056,26 @@ msgstr ""
20562056
msgid "extra positional arguments given"
20572057
msgstr ""
20582058

2059+
#: py/parse.c
2060+
msgid "f-string expression part cannot include a '#'"
2061+
msgstr ""
2062+
2063+
#: py/parse.c
2064+
msgid "f-string expression part cannot include a backslash"
2065+
msgstr ""
2066+
2067+
#: py/parse.c
2068+
msgid "f-string: empty expression not allowed"
2069+
msgstr ""
2070+
2071+
#: py/parse.c
2072+
msgid "f-string: expecting '}'"
2073+
msgstr ""
2074+
2075+
#: py/parse.c
2076+
msgid "f-string: single '}' is not allowed"
2077+
msgstr ""
2078+
20592079
#: shared-bindings/audiocore/WaveFile.c shared-bindings/audiomp3/MP3Decoder.c
20602080
#: shared-bindings/displayio/OnDiskBitmap.c
20612081
msgid "file must be a file opened in byte mode"
@@ -2369,6 +2389,10 @@ msgstr ""
23692389
msgid "long int not supported in this build"
23702390
msgstr ""
23712391

2392+
#: py/parse.c
2393+
msgid "malformed f-string"
2394+
msgstr ""
2395+
23722396
#: shared-bindings/_stage/Layer.c
23732397
msgid "map buffer too small"
23742398
msgstr ""
@@ -2696,6 +2720,10 @@ msgstr ""
26962720
msgid "queue overflow"
26972721
msgstr ""
26982722

2723+
#: py/parse.c
2724+
msgid "raw f-strings are not implemented"
2725+
msgstr ""
2726+
26992727
#: extmod/ulab/code/fft.c
27002728
msgid "real and imaginary parts must be of equal length"
27012729
msgstr ""

‎locale/de_DE.po

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2020-03-03 20:13-0600\n"
10+
"POT-Creation-Date: 2020-03-09 08:19-0500\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: Pascal Deneaux\n"
1313
"Language-Team: Sebastian Plamauer, Pascal Deneaux\n"
@@ -2085,6 +2085,26 @@ msgstr "Es wurden zusätzliche Keyword-Argumente angegeben"
20852085
msgid "extra positional arguments given"
20862086
msgstr "Es wurden zusätzliche Argumente ohne Keyword angegeben"
20872087

2088+
#: py/parse.c
2089+
msgid "f-string expression part cannot include a '#'"
2090+
msgstr ""
2091+
2092+
#: py/parse.c
2093+
msgid "f-string expression part cannot include a backslash"
2094+
msgstr ""
2095+
2096+
#: py/parse.c
2097+
msgid "f-string: empty expression not allowed"
2098+
msgstr ""
2099+
2100+
#: py/parse.c
2101+
msgid "f-string: expecting '}'"
2102+
msgstr ""
2103+
2104+
#: py/parse.c
2105+
msgid "f-string: single '}' is not allowed"
2106+
msgstr ""
2107+
20882108
#: shared-bindings/audiocore/WaveFile.c shared-bindings/audiomp3/MP3Decoder.c
20892109
#: shared-bindings/displayio/OnDiskBitmap.c
20902110
msgid "file must be a file opened in byte mode"
@@ -2405,6 +2425,10 @@ msgstr ""
24052425
msgid "long int not supported in this build"
24062426
msgstr "long int wird in diesem Build nicht unterstützt"
24072427

2428+
#: py/parse.c
2429+
msgid "malformed f-string"
2430+
msgstr ""
2431+
24082432
#: shared-bindings/_stage/Layer.c
24092433
msgid "map buffer too small"
24102434
msgstr "map buffer zu klein"
@@ -2734,6 +2758,10 @@ msgstr ""
27342758
msgid "queue overflow"
27352759
msgstr "Warteschlangenüberlauf"
27362760

2761+
#: py/parse.c
2762+
msgid "raw f-strings are not implemented"
2763+
msgstr ""
2764+
27372765
#: extmod/ulab/code/fft.c
27382766
msgid "real and imaginary parts must be of equal length"
27392767
msgstr ""

‎locale/en_US.po

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2020-03-03 20:13-0600\n"
10+
"POT-Creation-Date: 2020-03-09 08:19-0500\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -2056,6 +2056,26 @@ msgstr ""
20562056
msgid "extra positional arguments given"
20572057
msgstr ""
20582058

2059+
#: py/parse.c
2060+
msgid "f-string expression part cannot include a '#'"
2061+
msgstr ""
2062+
2063+
#: py/parse.c
2064+
msgid "f-string expression part cannot include a backslash"
2065+
msgstr ""
2066+
2067+
#: py/parse.c
2068+
msgid "f-string: empty expression not allowed"
2069+
msgstr ""
2070+
2071+
#: py/parse.c
2072+
msgid "f-string: expecting '}'"
2073+
msgstr ""
2074+
2075+
#: py/parse.c
2076+
msgid "f-string: single '}' is not allowed"
2077+
msgstr ""
2078+
20592079
#: shared-bindings/audiocore/WaveFile.c shared-bindings/audiomp3/MP3Decoder.c
20602080
#: shared-bindings/displayio/OnDiskBitmap.c
20612081
msgid "file must be a file opened in byte mode"
@@ -2369,6 +2389,10 @@ msgstr ""
23692389
msgid "long int not supported in this build"
23702390
msgstr ""
23712391

2392+
#: py/parse.c
2393+
msgid "malformed f-string"
2394+
msgstr ""
2395+
23722396
#: shared-bindings/_stage/Layer.c
23732397
msgid "map buffer too small"
23742398
msgstr ""
@@ -2696,6 +2720,10 @@ msgstr ""
26962720
msgid "queue overflow"
26972721
msgstr ""
26982722

2723+
#: py/parse.c
2724+
msgid "raw f-strings are not implemented"
2725+
msgstr ""
2726+
26992727
#: extmod/ulab/code/fft.c
27002728
msgid "real and imaginary parts must be of equal length"
27012729
msgstr ""

‎locale/en_x_pirate.po

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2020-03-03 20:13-0600\n"
10+
"POT-Creation-Date: 2020-03-09 08:19-0500\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: @sommersoft, @MrCertainly\n"
@@ -2060,6 +2060,26 @@ msgstr ""
20602060
msgid "extra positional arguments given"
20612061
msgstr ""
20622062

2063+
#: py/parse.c
2064+
msgid "f-string expression part cannot include a '#'"
2065+
msgstr ""
2066+
2067+
#: py/parse.c
2068+
msgid "f-string expression part cannot include a backslash"
2069+
msgstr ""
2070+
2071+
#: py/parse.c
2072+
msgid "f-string: empty expression not allowed"
2073+
msgstr ""
2074+
2075+
#: py/parse.c
2076+
msgid "f-string: expecting '}'"
2077+
msgstr ""
2078+
2079+
#: py/parse.c
2080+
msgid "f-string: single '}' is not allowed"
2081+
msgstr ""
2082+
20632083
#: shared-bindings/audiocore/WaveFile.c shared-bindings/audiomp3/MP3Decoder.c
20642084
#: shared-bindings/displayio/OnDiskBitmap.c
20652085
msgid "file must be a file opened in byte mode"
@@ -2373,6 +2393,10 @@ msgstr ""
23732393
msgid "long int not supported in this build"
23742394
msgstr ""
23752395

2396+
#: py/parse.c
2397+
msgid "malformed f-string"
2398+
msgstr ""
2399+
23762400
#: shared-bindings/_stage/Layer.c
23772401
msgid "map buffer too small"
23782402
msgstr ""
@@ -2700,6 +2724,10 @@ msgstr ""
27002724
msgid "queue overflow"
27012725
msgstr ""
27022726

2727+
#: py/parse.c
2728+
msgid "raw f-strings are not implemented"
2729+
msgstr ""
2730+
27032731
#: extmod/ulab/code/fft.c
27042732
msgid "real and imaginary parts must be of equal length"
27052733
msgstr ""

‎locale/es.po

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2020-03-03 20:13-0600\n"
10+
"POT-Creation-Date: 2020-03-09 08:19-0500\n"
1111
"PO-Revision-Date: 2018-08-24 22:56-0500\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -2087,6 +2087,26 @@ msgstr "argumento(s) por palabra clave adicionales fueron dados"
20872087
msgid "extra positional arguments given"
20882088
msgstr "argumento posicional adicional dado"
20892089

2090+
#: py/parse.c
2091+
msgid "f-string expression part cannot include a '#'"
2092+
msgstr ""
2093+
2094+
#: py/parse.c
2095+
msgid "f-string expression part cannot include a backslash"
2096+
msgstr ""
2097+
2098+
#: py/parse.c
2099+
msgid "f-string: empty expression not allowed"
2100+
msgstr ""
2101+
2102+
#: py/parse.c
2103+
msgid "f-string: expecting '}'"
2104+
msgstr ""
2105+
2106+
#: py/parse.c
2107+
msgid "f-string: single '}' is not allowed"
2108+
msgstr ""
2109+
20902110
#: shared-bindings/audiocore/WaveFile.c shared-bindings/audiomp3/MP3Decoder.c
20912111
#: shared-bindings/displayio/OnDiskBitmap.c
20922112
msgid "file must be a file opened in byte mode"
@@ -2403,6 +2423,10 @@ msgstr "variable local referenciada antes de la asignación"
24032423
msgid "long int not supported in this build"
24042424
msgstr "long int no soportado en esta compilación"
24052425

2426+
#: py/parse.c
2427+
msgid "malformed f-string"
2428+
msgstr ""
2429+
24062430
#: shared-bindings/_stage/Layer.c
24072431
msgid "map buffer too small"
24082432
msgstr "map buffer muy pequeño"
@@ -2734,6 +2758,10 @@ msgstr "pow() con 3 argumentos requiere enteros"
27342758
msgid "queue overflow"
27352759
msgstr "desbordamiento de cola(queue)"
27362760

2761+
#: py/parse.c
2762+
msgid "raw f-strings are not implemented"
2763+
msgstr ""
2764+
27372765
#: extmod/ulab/code/fft.c
27382766
msgid "real and imaginary parts must be of equal length"
27392767
msgstr ""

0 commit comments

Comments
 (0)