Skip to content

Commit 19f9163

Browse files
dkulinskidkulinski
committed
Bringing branch up to date with current main
2 parents 6080106 + 5010170 commit 19f9163

File tree

182 files changed

+4216
-1157
lines changed

Some content is hidden

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

182 files changed

+4216
-1157
lines changed

‎.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
url = https://github.com/adafruit/Adafruit_CircuitPython_RFM69.git
149149
[submodule "ports/espressif/esp-idf"]
150150
path = ports/espressif/esp-idf
151-
url = https://github.com/espressif/esp-idf.git
151+
url = https://github.com/adafruit/esp-idf.git
152152
branch = release/v4.4
153153
[submodule "ports/espressif/certificates/nina-fw"]
154154
path = ports/espressif/certificates/nina-fw

‎BUILDING.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ https://learn.adafruit.com/building-circuitpython/
1515

1616
## Setup
1717

18-
Please ensure you setup your build environment appropriately, as per the guide. You will need:
18+
Please ensure you set up your build environment appropriately, as per the guide. You will need:
1919

2020
* Linux: https://learn.adafruit.com/building-circuitpython/linux
2121
* MacOS: https://learn.adafruit.com/building-circuitpython/macos
@@ -25,8 +25,9 @@ Please ensure you setup your build environment appropriately, as per the guide.
2525

2626
This project has a bunch of git submodules. You will need to update them regularly.
2727

28-
git submodule sync
29-
git submodule update --init
28+
In the root folder of the CircuitPython repository, execute the following:
29+
30+
make fetch-submodules
3031

3132
### Required Python Packages
3233

‎docs/templates/breadcrumbs.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{%- extends "sphinx_rtd_theme/breadcrumbs.html" %}
2+
3+
{% block breadcrumbs_aside %}
4+
{% endblock %}

‎extmod/ulab

Submodule ulab updated 99 files

‎extmod/vfs_fat_file.c

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,39 +139,58 @@ STATIC const mp_arg_t file_open_args[] = {
139139
STATIC mp_obj_t file_open(fs_user_mount_t *vfs, const mp_obj_type_t *type, mp_arg_val_t *args) {
140140
int mode = 0;
141141
const char *mode_s = mp_obj_str_get_str(args[1].u_obj);
142-
// TODO make sure only one of r, w, x, a, and b, t are specified
142+
uint32_t rwxa_count = 0;
143+
uint32_t bt_count = 0;
144+
uint32_t plus_count = 0;
145+
bool bad_mode = false;
143146
while (*mode_s) {
144147
switch (*mode_s++) {
145148
case 'r':
146149
mode |= FA_READ;
150+
rwxa_count++;
147151
break;
148152
case 'w':
149153
mode |= FA_WRITE | FA_CREATE_ALWAYS;
154+
rwxa_count++;
150155
break;
151156
case 'x':
152157
mode |= FA_WRITE | FA_CREATE_NEW;
158+
rwxa_count++;
153159
break;
154160
case 'a':
155161
mode |= FA_WRITE | FA_OPEN_ALWAYS;
162+
rwxa_count++;
156163
break;
157164
case '+':
158165
mode |= FA_READ | FA_WRITE;
166+
plus_count++;
159167
break;
160168
#if MICROPY_PY_IO_FILEIO
161169
case 'b':
170+
bt_count++;
162171
type = &mp_type_vfs_fat_fileio;
163172
break;
164173
#endif
165174
case 't':
175+
bt_count++;
166176
type = &mp_type_vfs_fat_textio;
167177
break;
178+
default:
179+
bad_mode = true;
180+
break;
168181
}
169182
}
183+
184+
if (rwxa_count != 1 || plus_count > 1 || bt_count > 1 || bad_mode) {
185+
mp_raise_ValueError(translate("Invalid mode"));
186+
}
187+
170188
assert(vfs != NULL);
171189
if ((mode & FA_WRITE) != 0 && !filesystem_is_writable_by_python(vfs)) {
172190
mp_raise_OSError(MP_EROFS);
173191
}
174192

193+
175194
pyb_file_obj_t *o = m_new_obj_with_finaliser(pyb_file_obj_t);
176195
o->base.type = type;
177196

‎locale/ID.po

Lines changed: 64 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1391,6 +1391,10 @@ msgstr "Ukuran potongan format tidak valid"
13911391
msgid "Invalid memory access."
13921392
msgstr "Akses memori tidak valid."
13931393

1394+
#: extmod/vfs_fat_file.c
1395+
msgid "Invalid mode"
1396+
msgstr ""
1397+
13941398
#: ports/espressif/common-hal/wifi/Radio.c
13951399
msgid "Invalid multicast MAC address"
13961400
msgstr ""
@@ -2661,7 +2665,7 @@ msgstr "berusaha mendapatkan argmin/argmax dari urutan kosong"
26612665
msgid "attributes not supported yet"
26622666
msgstr "atribut belum didukung"
26632667

2664-
#: extmod/ulab/code/numpy/numerical.c
2668+
#: extmod/ulab/code/ulab_tools.c
26652669
msgid "axis is out of bounds"
26662670
msgstr ""
26672671

@@ -2717,11 +2721,11 @@ msgstr ""
27172721
msgid "branch not in range"
27182722
msgstr ""
27192723

2720-
#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c
2724+
#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c
27212725
msgid "buffer is smaller than requested size"
27222726
msgstr ""
27232727

2724-
#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c
2728+
#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c
27252729
msgid "buffer size must be a multiple of element size"
27262730
msgstr ""
27272731

@@ -2813,6 +2817,10 @@ msgstr ""
28132817
msgid "can't convert '%q' object to %q implicitly"
28142818
msgstr ""
28152819

2820+
#: extmod/ulab/code/numpy/vector.c
2821+
msgid "can't convert complex to float"
2822+
msgstr ""
2823+
28162824
#: py/obj.c
28172825
msgid "can't convert to %q"
28182826
msgstr ""
@@ -2907,6 +2915,14 @@ msgstr ""
29072915
msgid "cannot cast output with casting rule"
29082916
msgstr ""
29092917

2918+
#: extmod/ulab/code/ndarray.c
2919+
msgid "cannot convert complex to dtype"
2920+
msgstr ""
2921+
2922+
#: extmod/ulab/code/ndarray.c
2923+
msgid "cannot convert complex type"
2924+
msgstr ""
2925+
29102926
#: py/objtype.c
29112927
msgid "cannot create '%q' instances"
29122928
msgstr ""
@@ -3098,6 +3114,10 @@ msgstr ""
30983114
msgid "divisor must be 4"
30993115
msgstr ""
31003116

3117+
#: extmod/ulab/code/numpy/vector.c
3118+
msgid "dtype must be float, or complex"
3119+
msgstr ""
3120+
31013121
#: py/objdeque.c
31023122
msgid "empty"
31033123
msgstr ""
@@ -3201,7 +3221,7 @@ msgstr ""
32013221
msgid "first argument must be a function"
32023222
msgstr ""
32033223

3204-
#: extmod/ulab/code/ulab_create.c
3224+
#: extmod/ulab/code/numpy/create.c
32053225
msgid "first argument must be a tuple of ndarrays"
32063226
msgstr ""
32073227

@@ -3266,6 +3286,10 @@ msgstr ""
32663286
msgid "function is defined for ndarrays only"
32673287
msgstr ""
32683288

3289+
#: extmod/ulab/code/numpy/carray/carray.c
3290+
msgid "function is implemented for ndarrays only"
3291+
msgstr ""
3292+
32693293
#: py/argcheck.c
32703294
#, c-format
32713295
msgid "function missing %d required positional arguments"
@@ -3379,22 +3403,26 @@ msgstr "inline assembler harus sebuah fungsi"
33793403
msgid "input and output shapes are not compatible"
33803404
msgstr ""
33813405

3382-
#: extmod/ulab/code/ulab_create.c
3406+
#: extmod/ulab/code/numpy/create.c
33833407
msgid "input argument must be an integer, a tuple, or a list"
33843408
msgstr ""
33853409

33863410
#: extmod/ulab/code/numpy/fft/fft_tools.c
33873411
msgid "input array length must be power of 2"
33883412
msgstr ""
33893413

3390-
#: extmod/ulab/code/ulab_create.c
3414+
#: extmod/ulab/code/numpy/create.c
33913415
msgid "input arrays are not compatible"
33923416
msgstr ""
33933417

33943418
#: extmod/ulab/code/numpy/poly.c
33953419
msgid "input data must be an iterable"
33963420
msgstr ""
33973421

3422+
#: extmod/ulab/code/numpy/vector.c
3423+
msgid "input dtype must be float or complex"
3424+
msgstr ""
3425+
33983426
#: extmod/ulab/code/numpy/linalg/linalg.c
33993427
msgid "input matrix is asymmetric"
34003428
msgstr ""
@@ -3404,18 +3432,26 @@ msgstr ""
34043432
msgid "input matrix is singular"
34053433
msgstr ""
34063434

3435+
#: extmod/ulab/code/numpy/carray/carray.c
3436+
msgid "input must be a 1D ndarray"
3437+
msgstr ""
3438+
34073439
#: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c
34083440
msgid "input must be a dense ndarray"
34093441
msgstr ""
34103442

3411-
#: extmod/ulab/code/ulab_create.c
3443+
#: extmod/ulab/code/numpy/create.c
34123444
msgid "input must be a tensor of rank 2"
34133445
msgstr ""
34143446

3415-
#: extmod/ulab/code/ulab_create.c extmod/ulab/code/user/user.c
3447+
#: extmod/ulab/code/numpy/create.c extmod/ulab/code/user/user.c
34163448
msgid "input must be an ndarray"
34173449
msgstr ""
34183450

3451+
#: extmod/ulab/code/numpy/carray/carray.c
3452+
msgid "input must be an ndarray, or a scalar"
3453+
msgstr ""
3454+
34193455
#: extmod/ulab/code/scipy/signal/signal.c
34203456
msgid "input must be one-dimensional"
34213457
msgstr ""
@@ -3786,7 +3822,11 @@ msgstr ""
37863822
msgid "not enough arguments for format string"
37873823
msgstr ""
37883824

3789-
#: extmod/ulab/code/ulab_create.c
3825+
#: extmod/ulab/code/numpy/carray/carray_tools.c
3826+
msgid "not implemented for complex dtype"
3827+
msgstr ""
3828+
3829+
#: extmod/ulab/code/numpy/create.c
37903830
msgid "number of points must be at least 2"
37913831
msgstr ""
37923832

@@ -3844,15 +3884,15 @@ msgstr ""
38443884
msgid "odd-length string"
38453885
msgstr "panjang data string memiliki keganjilan (odd-length)"
38463886

3847-
#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c
3887+
#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c
38483888
msgid "offset is too large"
38493889
msgstr ""
38503890

38513891
#: shared-bindings/dualbank/__init__.c
38523892
msgid "offset must be >= 0"
38533893
msgstr ""
38543894

3855-
#: extmod/ulab/code/ulab_create.c
3895+
#: extmod/ulab/code/numpy/create.c
38563896
msgid "offset must be non-negative and no greater than buffer length"
38573897
msgstr ""
38583898

@@ -3994,22 +4034,26 @@ msgstr ""
39944034
msgid "pow() with 3 arguments requires integers"
39954035
msgstr ""
39964036

4037+
#: ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.h
39974038
#: ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.h
39984039
#: ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.h
39994040
#: ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h
40004041
#: ports/espressif/boards/adafruit_funhouse/mpconfigboard.h
40014042
#: ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h
40024043
#: ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.h
40034044
#: ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.h
4045+
#: ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.h
40044046
#: ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.h
40054047
#: ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h
40064048
#: ports/espressif/boards/artisense_rd00/mpconfigboard.h
40074049
#: ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.h
40084050
#: ports/espressif/boards/crumpspace_crumps2/mpconfigboard.h
40094051
#: ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.h
4052+
#: ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.h
40104053
#: ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.h
4011-
#: ports/espressif/boards/espressif_esp32s3_devkitc_1/mpconfigboard.h
4012-
#: ports/espressif/boards/espressif_esp32s3_devkitc_1_nopsram/mpconfigboard.h
4054+
#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.h
4055+
#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/mpconfigboard.h
4056+
#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.h
40134057
#: ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.h
40144058
#: ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.h
40154059
#: ports/espressif/boards/espressif_kaluga_1/mpconfigboard.h
@@ -4332,7 +4376,7 @@ msgstr ""
43324376
msgid "too many arguments provided with the given format"
43334377
msgstr ""
43344378

4335-
#: extmod/ulab/code/ndarray.c extmod/ulab/code/ulab_create.c
4379+
#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c
43364380
msgid "too many dimensions"
43374381
msgstr ""
43384382

@@ -4533,15 +4577,19 @@ msgstr "jendela harus <= interval"
45334577
msgid "wrong axis index"
45344578
msgstr "indeks sumbu salah"
45354579

4536-
#: extmod/ulab/code/ulab_create.c
4580+
#: extmod/ulab/code/numpy/create.c
45374581
msgid "wrong axis specified"
45384582
msgstr "sumbu yang ditentukan salah"
45394583

45404584
#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/vector.c
45414585
msgid "wrong input type"
45424586
msgstr "tipe input salah"
45434587

4544-
#: extmod/ulab/code/ulab_create.c py/objarray.c py/objstr.c
4588+
#: extmod/ulab/code/numpy/transform.c
4589+
msgid "wrong length of condition array"
4590+
msgstr ""
4591+
4592+
#: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c
45454593
msgid "wrong number of arguments"
45464594
msgstr "jumlah argumen salah"
45474595

0 commit comments

Comments
 (0)