Skip to content

Commit 23bbb19

Browse files
tannewttannewt
committed
Merge remote-tracking branch 'adafruit/main' into websocket_serial
2 parents 15fe386 + 506a7b8 commit 23bbb19

File tree

46 files changed

+1537
-310
lines changed

Some content is hidden

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

46 files changed

+1537
-310
lines changed

‎.github/workflows/build.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -287,12 +287,13 @@ jobs:
287287
fetch-depth: 1
288288
- name: Get CP deps
289289
run: python tools/ci_fetch_deps.py ${{ matrix.board }} ${{ github.sha }}
290+
- uses: carlosperate/arm-none-eabi-gcc-action@v1
291+
with:
292+
release: '10-2020-q4'
290293
- name: Install dependencies
291294
run: |
292295
sudo apt-get install -y gettext
293296
pip install -r requirements-ci.txt -r requirements-dev.txt
294-
wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2
295-
sudo tar -C /usr --strip-components=1 -xaf gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2
296297
- name: Versions
297298
run: |
298299
gcc --version
@@ -487,8 +488,9 @@ jobs:
487488
pip install -r requirements-ci.txt -r requirements-dev.txt
488489
wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
489490
sudo tar -C /usr --strip-components=1 -xaf gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
490-
wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2
491-
sudo tar -C /usr --strip-components=1 -xaf gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2
491+
- uses: carlosperate/arm-none-eabi-gcc-action@v1
492+
with:
493+
release: '10-2020-q4'
492494
- name: Install mkfs.fat
493495
run: |
494496
wget https://github.com/dosfstools/dosfstools/releases/download/v4.2/dosfstools-4.2.tar.gz

‎BUILDING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ The test suite in the top level `tests` directory. It needs the unix port to ru
7070
Then you can run the test suite:
7171

7272
cd ../../tests
73-
./run-tests
73+
./run-tests.py
7474

7575
A successful run will say something like
7676

‎README.rst

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,11 @@ If you'd like to use the term "CircuitPython" and Blinka for your product here i
9090
* Your product is listed on `circuitpython.org <https://circuitpython.org>`__ (source
9191
`here <https://github.com/adafruit/circuitpython-org/>`_). This is to ensure that a user of your
9292
product can always download the latest version of CircuitPython from the standard place.
93-
* Your product has a user accessible USB plug which appears as a CIRCUITPY drive when plugged in
94-
AND/OR provides file and serial access over Bluetooth Low Energy. Boards that do not support USB
95-
should be clearly marked as BLE-only CircuitPython.
93+
* Your product supports at least one standard "`Workflow <https://docs.circuitpython.org/en/latest/docs/workflows.html>`__" for serial and file access:
94+
* With a user accessible USB plug which appears as a CIRCUITPY drive when plugged in.
95+
* With file and serial access over Bluetooth Low Energy using the BLE Workflow.
96+
* With file access over WiFi using the WiFi Workflow with serial access over USB and/or WebSocket.
97+
* Boards that do not support the USB Workflow should be clearly marked.
9698

9799
If you choose not to meet these requirements, then we ask you call your version of CircuitPython
98100
something else (for example, SuperDuperPython) and not use the Blinka logo. You can say it is

‎extmod/ulab

Submodule ulab updated 109 files

‎frozen/circuitpython_picoed

‎frozen/pew-pewpew-lcd

‎locale/ID.po

Lines changed: 45 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2383,6 +2383,10 @@ msgstr "argumen harus berupa ndarrays"
23832383
msgid "array and index length must be equal"
23842384
msgstr ""
23852385

2386+
#: extmod/ulab/code/numpy/io/io.c
2387+
msgid "array has too many dimensions"
2388+
msgstr ""
2389+
23862390
#: py/objarray.c shared-bindings/alarm/SleepMemory.c
23872391
#: shared-bindings/nvm/ByteArray.c
23882392
msgid "array/bytes required on right side"
@@ -2750,6 +2754,10 @@ msgstr ""
27502754
msgid "convolve arguments must not be empty"
27512755
msgstr ""
27522756

2757+
#: extmod/ulab/code/numpy/io/io.c
2758+
msgid "corrupted file"
2759+
msgstr ""
2760+
27532761
#: extmod/ulab/code/numpy/poly.c
27542762
msgid "could not invert Vandermonde matrix"
27552763
msgstr ""
@@ -2841,6 +2849,10 @@ msgstr ""
28412849
msgid "empty"
28422850
msgstr ""
28432851

2852+
#: extmod/ulab/code/numpy/io/io.c
2853+
msgid "empty file"
2854+
msgstr ""
2855+
28442856
#: extmod/moduasyncio.c extmod/moduheapq.c extmod/modutimeq.c
28452857
msgid "empty heap"
28462858
msgstr "heap kosong"
@@ -2944,7 +2956,7 @@ msgstr ""
29442956
msgid "first argument must be a tuple of ndarrays"
29452957
msgstr ""
29462958

2947-
#: extmod/ulab/code/numpy/vector.c
2959+
#: extmod/ulab/code/numpy/transform.c extmod/ulab/code/numpy/vector.c
29482960
msgid "first argument must be an ndarray"
29492961
msgstr ""
29502962

@@ -3092,7 +3104,7 @@ msgstr ""
30923104
msgid "incorrect padding"
30933105
msgstr "lapisan (padding) tidak benar"
30943106

3095-
#: extmod/ulab/code/ndarray.c
3107+
#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/transform.c
30963108
msgid "index is out of bounds"
30973109
msgstr ""
30983110

@@ -3159,6 +3171,10 @@ msgstr ""
31593171
msgid "input matrix is singular"
31603172
msgstr ""
31613173

3174+
#: extmod/ulab/code/numpy/create.c
3175+
msgid "input must be 1- or 2-d"
3176+
msgstr ""
3177+
31623178
#: extmod/ulab/code/numpy/carray/carray.c
31633179
msgid "input must be a 1D ndarray"
31643180
msgstr ""
@@ -3167,11 +3183,7 @@ msgstr ""
31673183
msgid "input must be a dense ndarray"
31683184
msgstr ""
31693185

3170-
#: extmod/ulab/code/numpy/create.c
3171-
msgid "input must be a tensor of rank 2"
3172-
msgstr ""
3173-
3174-
#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c
3186+
#: extmod/ulab/code/user/user.c
31753187
msgid "input must be an ndarray"
31763188
msgstr ""
31773189

@@ -3372,7 +3384,7 @@ msgid "max_length must be 0-%d when fixed_length is %s"
33723384
msgstr ""
33733385

33743386
#: extmod/ulab/code/ndarray.c
3375-
msgid "maximum number of dimensions is 4"
3387+
msgid "maximum number of dimensions is "
33763388
msgstr ""
33773389

33783390
#: py/runtime.c
@@ -3621,7 +3633,7 @@ msgstr "panjang data string memiliki keganjilan (odd-length)"
36213633
msgid "off"
36223634
msgstr ""
36233635

3624-
#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c
3636+
#: extmod/ulab/code/utils/utils.c
36253637
msgid "offset is too large"
36263638
msgstr ""
36273639

@@ -3772,6 +3784,7 @@ msgid "pow() with 3 arguments requires integers"
37723784
msgstr ""
37733785

37743786
#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
3787+
#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
37753788
#: supervisor/shared/safe_mode.c
37763789
msgid "pressing boot button at start up.\n"
37773790
msgstr ""
@@ -4207,6 +4220,14 @@ msgstr ""
42074220
msgid "unsupported types for %q: '%q', '%q'"
42084221
msgstr ""
42094222

4223+
#: extmod/ulab/code/numpy/io/io.c
4224+
msgid "usecols is too high"
4225+
msgstr ""
4226+
4227+
#: extmod/ulab/code/numpy/io/io.c
4228+
msgid "usecols keyword must be specified"
4229+
msgstr ""
4230+
42104231
#: py/objint.c
42114232
#, c-format
42124233
msgid "value must fit in %d byte(s)"
@@ -4248,14 +4269,28 @@ msgstr "indeks sumbu salah"
42484269
msgid "wrong axis specified"
42494270
msgstr "sumbu yang ditentukan salah"
42504271

4251-
#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/vector.c
4272+
#: extmod/ulab/code/numpy/io/io.c
4273+
msgid "wrong dtype"
4274+
msgstr ""
4275+
4276+
#: extmod/ulab/code/numpy/transform.c
4277+
msgid "wrong index type"
4278+
msgstr ""
4279+
4280+
#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/create.c
4281+
#: extmod/ulab/code/numpy/io/io.c extmod/ulab/code/numpy/transform.c
4282+
#: extmod/ulab/code/numpy/vector.c
42524283
msgid "wrong input type"
42534284
msgstr "tipe input salah"
42544285

42554286
#: extmod/ulab/code/numpy/transform.c
42564287
msgid "wrong length of condition array"
42574288
msgstr ""
42584289

4290+
#: extmod/ulab/code/numpy/transform.c
4291+
msgid "wrong length of index array"
4292+
msgstr ""
4293+
42594294
#: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c
42604295
msgid "wrong number of arguments"
42614296
msgstr "jumlah argumen salah"

‎locale/circuitpython.pot

Lines changed: 45 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2356,6 +2356,10 @@ msgstr ""
23562356
msgid "array and index length must be equal"
23572357
msgstr ""
23582358

2359+
#: extmod/ulab/code/numpy/io/io.c
2360+
msgid "array has too many dimensions"
2361+
msgstr ""
2362+
23592363
#: py/objarray.c shared-bindings/alarm/SleepMemory.c
23602364
#: shared-bindings/nvm/ByteArray.c
23612365
msgid "array/bytes required on right side"
@@ -2723,6 +2727,10 @@ msgstr ""
27232727
msgid "convolve arguments must not be empty"
27242728
msgstr ""
27252729

2730+
#: extmod/ulab/code/numpy/io/io.c
2731+
msgid "corrupted file"
2732+
msgstr ""
2733+
27262734
#: extmod/ulab/code/numpy/poly.c
27272735
msgid "could not invert Vandermonde matrix"
27282736
msgstr ""
@@ -2814,6 +2822,10 @@ msgstr ""
28142822
msgid "empty"
28152823
msgstr ""
28162824

2825+
#: extmod/ulab/code/numpy/io/io.c
2826+
msgid "empty file"
2827+
msgstr ""
2828+
28172829
#: extmod/moduasyncio.c extmod/moduheapq.c extmod/modutimeq.c
28182830
msgid "empty heap"
28192831
msgstr ""
@@ -2917,7 +2929,7 @@ msgstr ""
29172929
msgid "first argument must be a tuple of ndarrays"
29182930
msgstr ""
29192931

2920-
#: extmod/ulab/code/numpy/vector.c
2932+
#: extmod/ulab/code/numpy/transform.c extmod/ulab/code/numpy/vector.c
29212933
msgid "first argument must be an ndarray"
29222934
msgstr ""
29232935

@@ -3065,7 +3077,7 @@ msgstr ""
30653077
msgid "incorrect padding"
30663078
msgstr ""
30673079

3068-
#: extmod/ulab/code/ndarray.c
3080+
#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/transform.c
30693081
msgid "index is out of bounds"
30703082
msgstr ""
30713083

@@ -3132,6 +3144,10 @@ msgstr ""
31323144
msgid "input matrix is singular"
31333145
msgstr ""
31343146

3147+
#: extmod/ulab/code/numpy/create.c
3148+
msgid "input must be 1- or 2-d"
3149+
msgstr ""
3150+
31353151
#: extmod/ulab/code/numpy/carray/carray.c
31363152
msgid "input must be a 1D ndarray"
31373153
msgstr ""
@@ -3140,11 +3156,7 @@ msgstr ""
31403156
msgid "input must be a dense ndarray"
31413157
msgstr ""
31423158

3143-
#: extmod/ulab/code/numpy/create.c
3144-
msgid "input must be a tensor of rank 2"
3145-
msgstr ""
3146-
3147-
#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c
3159+
#: extmod/ulab/code/user/user.c
31483160
msgid "input must be an ndarray"
31493161
msgstr ""
31503162

@@ -3345,7 +3357,7 @@ msgid "max_length must be 0-%d when fixed_length is %s"
33453357
msgstr ""
33463358

33473359
#: extmod/ulab/code/ndarray.c
3348-
msgid "maximum number of dimensions is 4"
3360+
msgid "maximum number of dimensions is "
33493361
msgstr ""
33503362

33513363
#: py/runtime.c
@@ -3594,7 +3606,7 @@ msgstr ""
35943606
msgid "off"
35953607
msgstr ""
35963608

3597-
#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c
3609+
#: extmod/ulab/code/utils/utils.c
35983610
msgid "offset is too large"
35993611
msgstr ""
36003612

@@ -3744,6 +3756,7 @@ msgid "pow() with 3 arguments requires integers"
37443756
msgstr ""
37453757

37463758
#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
3759+
#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
37473760
#: supervisor/shared/safe_mode.c
37483761
msgid "pressing boot button at start up.\n"
37493762
msgstr ""
@@ -4179,6 +4192,14 @@ msgstr ""
41794192
msgid "unsupported types for %q: '%q', '%q'"
41804193
msgstr ""
41814194

4195+
#: extmod/ulab/code/numpy/io/io.c
4196+
msgid "usecols is too high"
4197+
msgstr ""
4198+
4199+
#: extmod/ulab/code/numpy/io/io.c
4200+
msgid "usecols keyword must be specified"
4201+
msgstr ""
4202+
41824203
#: py/objint.c
41834204
#, c-format
41844205
msgid "value must fit in %d byte(s)"
@@ -4220,14 +4241,28 @@ msgstr ""
42204241
msgid "wrong axis specified"
42214242
msgstr ""
42224243

4223-
#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/vector.c
4244+
#: extmod/ulab/code/numpy/io/io.c
4245+
msgid "wrong dtype"
4246+
msgstr ""
4247+
4248+
#: extmod/ulab/code/numpy/transform.c
4249+
msgid "wrong index type"
4250+
msgstr ""
4251+
4252+
#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/create.c
4253+
#: extmod/ulab/code/numpy/io/io.c extmod/ulab/code/numpy/transform.c
4254+
#: extmod/ulab/code/numpy/vector.c
42244255
msgid "wrong input type"
42254256
msgstr ""
42264257

42274258
#: extmod/ulab/code/numpy/transform.c
42284259
msgid "wrong length of condition array"
42294260
msgstr ""
42304261

4262+
#: extmod/ulab/code/numpy/transform.c
4263+
msgid "wrong length of index array"
4264+
msgstr ""
4265+
42314266
#: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c
42324267
msgid "wrong number of arguments"
42334268
msgstr ""

0 commit comments

Comments
 (0)