Skip to content

Commit f495e6d

Browse files
eightycceightycc
authored
Merge branch 'adafruit:main' into issue-10191
2 parents a3ccaf9 + 1e4d766 commit f495e6d

File tree

202 files changed

+118410
-115700
lines changed

Some content is hidden

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

202 files changed

+118410
-115700
lines changed

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@
173173
[submodule "ports/raspberrypi/sdk"]
174174
path = ports/raspberrypi/sdk
175175
url = https://github.com/adafruit/pico-sdk.git
176-
branch = force_inline_critical_section
176+
branch = force_inline_critical_section_2.1.1
177177
[submodule "data/nvm.toml"]
178178
path = data/nvm.toml
179179
url = https://github.com/adafruit/nvm.toml.git

‎extmod/modasyncio.c‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -160,11 +160,6 @@ static const mp_rom_map_elem_t task_queue_locals_dict_table[] = {
160160
{ MP_ROM_QSTR(MP_QSTR_push), MP_ROM_PTR(&task_queue_push_obj) },
161161
{ MP_ROM_QSTR(MP_QSTR_pop), MP_ROM_PTR(&task_queue_pop_obj) },
162162
{ MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&task_queue_remove_obj) },
163-
164-
// CIRCUITPY-CHANGE: Remove these in CircuitPython 10.0.0
165-
{ MP_ROM_QSTR(MP_QSTR_push_head), MP_ROM_PTR(&task_queue_push_obj) },
166-
{ MP_ROM_QSTR(MP_QSTR_push_sorted), MP_ROM_PTR(&task_queue_push_obj) },
167-
{ MP_ROM_QSTR(MP_QSTR_pop_head), MP_ROM_PTR(&task_queue_pop_obj) },
168163
};
169164
static MP_DEFINE_CONST_DICT(task_queue_locals_dict, task_queue_locals_dict_table);
170165

‎extmod/vfs_fat.c‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838

3939
// CIRCUITPY-CHANGE: extra includes
4040
#include <string.h>
41+
#include "py/gc.h"
4142
#include "py/obj.h"
4243
#include "py/objproperty.h"
4344
#include "py/runtime.h"
@@ -342,7 +343,10 @@ static mp_obj_t fat_vfs_stat(mp_obj_t vfs_in, mp_obj_t path_in) {
342343
FRESULT res = f_stat(&self->fatfs, path, &fno);
343344
if (res != FR_OK) {
344345
// CIRCUITPY-CHANGE
345-
mp_raise_OSError_fresult(res);
346+
if (gc_alloc_possible()) {
347+
mp_raise_OSError_fresult(res);
348+
}
349+
return mp_const_none;
346350
}
347351
}
348352

‎locale/ID.po‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,10 @@ msgstr "%q berisi pin duplikat"
114114
msgid "%q failure: %d"
115115
msgstr "%q gagal: %d"
116116

117+
#: shared-module/audiodelays/MultiTapDelay.c
118+
msgid "%q in %q must be of type %q or %q, not %q"
119+
msgstr ""
120+
117121
#: py/argcheck.c shared-module/audiofilters/Filter.c
118122
msgid "%q in %q must be of type %q, not %q"
119123
msgstr "%q dalam %q harus bertipe %q, bukan %q"
@@ -236,7 +240,8 @@ msgid "%q must be of type %q, %q, or %q, not %q"
236240
msgstr "%q harus bertipe %q, %q, atau %q, bukan %q"
237241

238242
#: py/argcheck.c py/runtime.c shared-bindings/bitmapfilter/__init__.c
239-
#: shared-module/synthio/Note.c shared-module/synthio/__init__.c
243+
#: shared-module/audiodelays/MultiTapDelay.c shared-module/synthio/Note.c
244+
#: shared-module/synthio/__init__.c
240245
msgid "%q must be of type %q, not %q"
241246
msgstr "%q harus bertipe %q, %q, atau %q, bukan %q"
242247

@@ -2636,8 +2641,14 @@ msgid "bits must be 32 or less"
26362641
msgstr ""
26372642

26382643
#: shared-bindings/audiodelays/Chorus.c shared-bindings/audiodelays/Echo.c
2644+
#: shared-bindings/audiodelays/MultiTapDelay.c
26392645
#: shared-bindings/audiodelays/PitchShift.c
26402646
#: shared-bindings/audiofilters/Distortion.c
2647+
#: shared-bindings/audiodelays/Reverb.c
2648+
msgid "bits_per_sample must be 16"
2649+
msgstr ""
2650+
2651+
#: shared-bindings/audiodelays/Echo.c shared-bindings/audiofilters/Distortion.c
26412652
#: shared-bindings/audiofilters/Filter.c shared-bindings/audiomixer/Mixer.c
26422653
msgid "bits_per_sample must be 8 or 16"
26432654
msgstr ""
@@ -4055,6 +4066,10 @@ msgstr ""
40554066
msgid "rsplit(None,n)"
40564067
msgstr ""
40574068

4069+
#: shared-bindings/audiodelays/Reverb.c
4070+
msgid "samples_signed must be true"
4071+
msgstr ""
4072+
40584073
#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
40594074
#: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
40604075
msgid "sampling rate out of range"

‎locale/circuitpython.pot‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,10 @@ msgstr ""
102102
msgid "%q failure: %d"
103103
msgstr ""
104104

105+
#: shared-module/audiodelays/MultiTapDelay.c
106+
msgid "%q in %q must be of type %q or %q, not %q"
107+
msgstr ""
108+
105109
#: py/argcheck.c shared-module/audiofilters/Filter.c
106110
msgid "%q in %q must be of type %q, not %q"
107111
msgstr ""
@@ -224,7 +228,8 @@ msgid "%q must be of type %q, %q, or %q, not %q"
224228
msgstr ""
225229

226230
#: py/argcheck.c py/runtime.c shared-bindings/bitmapfilter/__init__.c
227-
#: shared-module/synthio/Note.c shared-module/synthio/__init__.c
231+
#: shared-module/audiodelays/MultiTapDelay.c shared-module/synthio/Note.c
232+
#: shared-module/synthio/__init__.c
228233
msgid "%q must be of type %q, not %q"
229234
msgstr ""
230235

@@ -2587,8 +2592,14 @@ msgid "bits must be 32 or less"
25872592
msgstr ""
25882593

25892594
#: shared-bindings/audiodelays/Chorus.c shared-bindings/audiodelays/Echo.c
2595+
#: shared-bindings/audiodelays/MultiTapDelay.c
25902596
#: shared-bindings/audiodelays/PitchShift.c
25912597
#: shared-bindings/audiofilters/Distortion.c
2598+
#: shared-bindings/audiodelays/Reverb.c
2599+
msgid "bits_per_sample must be 16"
2600+
msgstr ""
2601+
2602+
#: shared-bindings/audiodelays/Echo.c shared-bindings/audiofilters/Distortion.c
25922603
#: shared-bindings/audiofilters/Filter.c shared-bindings/audiomixer/Mixer.c
25932604
msgid "bits_per_sample must be 8 or 16"
25942605
msgstr ""
@@ -4006,6 +4017,10 @@ msgstr ""
40064017
msgid "rsplit(None,n)"
40074018
msgstr ""
40084019

4020+
#: shared-bindings/audiodelays/Reverb.c
4021+
msgid "samples_signed must be true"
4022+
msgstr ""
4023+
40094024
#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
40104025
#: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
40114026
msgid "sampling rate out of range"

‎locale/cs.po‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,10 @@ msgstr "%q obsahuje duplicitní piny"
113113
msgid "%q failure: %d"
114114
msgstr "%q: selhání %d"
115115

116+
#: shared-module/audiodelays/MultiTapDelay.c
117+
msgid "%q in %q must be of type %q or %q, not %q"
118+
msgstr ""
119+
116120
#: py/argcheck.c shared-module/audiofilters/Filter.c
117121
msgid "%q in %q must be of type %q, not %q"
118122
msgstr "%q v %q musí být typu %q, ne %q"
@@ -235,7 +239,8 @@ msgid "%q must be of type %q, %q, or %q, not %q"
235239
msgstr ""
236240

237241
#: py/argcheck.c py/runtime.c shared-bindings/bitmapfilter/__init__.c
238-
#: shared-module/synthio/Note.c shared-module/synthio/__init__.c
242+
#: shared-module/audiodelays/MultiTapDelay.c shared-module/synthio/Note.c
243+
#: shared-module/synthio/__init__.c
239244
msgid "%q must be of type %q, not %q"
240245
msgstr "%q musí být typu %q, ne %q"
241246

@@ -2616,8 +2621,14 @@ msgid "bits must be 32 or less"
26162621
msgstr "počet bitů nesmí přesáhnout 32"
26172622

26182623
#: shared-bindings/audiodelays/Chorus.c shared-bindings/audiodelays/Echo.c
2624+
#: shared-bindings/audiodelays/MultiTapDelay.c
26192625
#: shared-bindings/audiodelays/PitchShift.c
26202626
#: shared-bindings/audiofilters/Distortion.c
2627+
#: shared-bindings/audiodelays/Reverb.c
2628+
msgid "bits_per_sample must be 16"
2629+
msgstr ""
2630+
2631+
#: shared-bindings/audiodelays/Echo.c shared-bindings/audiofilters/Distortion.c
26212632
#: shared-bindings/audiofilters/Filter.c shared-bindings/audiomixer/Mixer.c
26222633
msgid "bits_per_sample must be 8 or 16"
26232634
msgstr ""
@@ -4035,6 +4046,10 @@ msgstr ""
40354046
msgid "rsplit(None,n)"
40364047
msgstr ""
40374048

4049+
#: shared-bindings/audiodelays/Reverb.c
4050+
msgid "samples_signed must be true"
4051+
msgstr ""
4052+
40384053
#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
40394054
#: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
40404055
msgid "sampling rate out of range"

‎locale/de_DE.po‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,10 @@ msgstr "%q enthält doppelte Pins"
115115
msgid "%q failure: %d"
116116
msgstr "%q Fehler: %d"
117117

118+
#: shared-module/audiodelays/MultiTapDelay.c
119+
msgid "%q in %q must be of type %q or %q, not %q"
120+
msgstr ""
121+
118122
#: py/argcheck.c shared-module/audiofilters/Filter.c
119123
msgid "%q in %q must be of type %q, not %q"
120124
msgstr "%q in %q muss von Typ %q sein, nicht %q"
@@ -238,7 +242,8 @@ msgid "%q must be of type %q, %q, or %q, not %q"
238242
msgstr "%q muss vom Typ %q, %q oder %q sein, und nicht %q"
239243

240244
#: py/argcheck.c py/runtime.c shared-bindings/bitmapfilter/__init__.c
241-
#: shared-module/synthio/Note.c shared-module/synthio/__init__.c
245+
#: shared-module/audiodelays/MultiTapDelay.c shared-module/synthio/Note.c
246+
#: shared-module/synthio/__init__.c
242247
msgid "%q must be of type %q, not %q"
243248
msgstr "%q muss von Typ %q sein, nicht %q"
244249

@@ -2648,8 +2653,14 @@ msgid "bits must be 32 or less"
26482653
msgstr "bits müssen 32 oder kleiner sein"
26492654

26502655
#: shared-bindings/audiodelays/Chorus.c shared-bindings/audiodelays/Echo.c
2656+
#: shared-bindings/audiodelays/MultiTapDelay.c
26512657
#: shared-bindings/audiodelays/PitchShift.c
26522658
#: shared-bindings/audiofilters/Distortion.c
2659+
#: shared-bindings/audiodelays/Reverb.c
2660+
msgid "bits_per_sample must be 16"
2661+
msgstr ""
2662+
2663+
#: shared-bindings/audiodelays/Echo.c shared-bindings/audiofilters/Distortion.c
26532664
#: shared-bindings/audiofilters/Filter.c shared-bindings/audiomixer/Mixer.c
26542665
msgid "bits_per_sample must be 8 or 16"
26552666
msgstr "Es müssen 8 oder 16 bits_per_sample sein"
@@ -4093,6 +4104,10 @@ msgstr "Roll-Argument muss ein ndarray sein"
40934104
msgid "rsplit(None,n)"
40944105
msgstr "rsplit(None,n)"
40954106

4107+
#: shared-bindings/audiodelays/Reverb.c
4108+
msgid "samples_signed must be true"
4109+
msgstr ""
4110+
40964111
#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
40974112
#: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
40984113
msgid "sampling rate out of range"

‎locale/el.po‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,10 @@ msgstr "%q περιέχει διπλότυπα pins"
117117
msgid "%q failure: %d"
118118
msgstr "%q αποτυχία: %d"
119119

120+
#: shared-module/audiodelays/MultiTapDelay.c
121+
msgid "%q in %q must be of type %q or %q, not %q"
122+
msgstr ""
123+
120124
#: py/argcheck.c shared-module/audiofilters/Filter.c
121125
msgid "%q in %q must be of type %q, not %q"
122126
msgstr "%q στο %q πρέπει να είναι τύπου %q, όχι %q"
@@ -239,7 +243,8 @@ msgid "%q must be of type %q, %q, or %q, not %q"
239243
msgstr ""
240244

241245
#: py/argcheck.c py/runtime.c shared-bindings/bitmapfilter/__init__.c
242-
#: shared-module/synthio/Note.c shared-module/synthio/__init__.c
246+
#: shared-module/audiodelays/MultiTapDelay.c shared-module/synthio/Note.c
247+
#: shared-module/synthio/__init__.c
243248
msgid "%q must be of type %q, not %q"
244249
msgstr "%q πρέπει να είναι τύπου %q, όχι %q"
245250

@@ -2615,8 +2620,14 @@ msgid "bits must be 32 or less"
26152620
msgstr ""
26162621

26172622
#: shared-bindings/audiodelays/Chorus.c shared-bindings/audiodelays/Echo.c
2623+
#: shared-bindings/audiodelays/MultiTapDelay.c
26182624
#: shared-bindings/audiodelays/PitchShift.c
26192625
#: shared-bindings/audiofilters/Distortion.c
2626+
#: shared-bindings/audiodelays/Reverb.c
2627+
msgid "bits_per_sample must be 16"
2628+
msgstr ""
2629+
2630+
#: shared-bindings/audiodelays/Echo.c shared-bindings/audiofilters/Distortion.c
26202631
#: shared-bindings/audiofilters/Filter.c shared-bindings/audiomixer/Mixer.c
26212632
msgid "bits_per_sample must be 8 or 16"
26222633
msgstr ""
@@ -4034,6 +4045,10 @@ msgstr ""
40344045
msgid "rsplit(None,n)"
40354046
msgstr ""
40364047

4048+
#: shared-bindings/audiodelays/Reverb.c
4049+
msgid "samples_signed must be true"
4050+
msgstr ""
4051+
40374052
#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
40384053
#: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
40394054
msgid "sampling rate out of range"

‎locale/en_GB.po‎

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: PACKAGE VERSION\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"PO-Revision-Date: 2025-03-06 13:42+0000\n"
10+
"PO-Revision-Date: 2025-04-25 15:04+0000\n"
1111
"Last-Translator: Andi Chandler <[email protected]>\n"
1212
"Language-Team: none\n"
1313
"Language: en_GB\n"
1414
"MIME-Version: 1.0\n"
1515
"Content-Type: text/plain; charset=UTF-8\n"
1616
"Content-Transfer-Encoding: 8bit\n"
1717
"Plural-Forms: nplurals=2; plural=n != 1;\n"
18-
"X-Generator: Weblate 5.10.3-dev\n"
18+
"X-Generator: Weblate 5.12-dev\n"
1919

2020
#: main.c
2121
msgid ""
@@ -115,6 +115,10 @@ msgstr "%q contains duplicate pins"
115115
msgid "%q failure: %d"
116116
msgstr "%q failure: %d"
117117

118+
#: shared-module/audiodelays/MultiTapDelay.c
119+
msgid "%q in %q must be of type %q or %q, not %q"
120+
msgstr "%q in %q must be of type %q or %q, not %q"
121+
118122
#: py/argcheck.c shared-module/audiofilters/Filter.c
119123
msgid "%q in %q must be of type %q, not %q"
120124
msgstr "%q in %q must be of type %q, not %q"
@@ -237,7 +241,8 @@ msgid "%q must be of type %q, %q, or %q, not %q"
237241
msgstr "%q must be of type %q, %q, or %q, not %q"
238242

239243
#: py/argcheck.c py/runtime.c shared-bindings/bitmapfilter/__init__.c
240-
#: shared-module/synthio/Note.c shared-module/synthio/__init__.c
244+
#: shared-module/audiodelays/MultiTapDelay.c shared-module/synthio/Note.c
245+
#: shared-module/synthio/__init__.c
241246
msgid "%q must be of type %q, not %q"
242247
msgstr "%q must be of type %q, not %q"
243248

@@ -805,7 +810,7 @@ msgstr "Cannot record to a file"
805810

806811
#: shared-module/storage/__init__.c
807812
msgid "Cannot remount path when visible via USB."
808-
msgstr ""
813+
msgstr "Cannot remount path when visible via USB."
809814

810815
#: shared-bindings/digitalio/DigitalInOut.c
811816
msgid "Cannot set value when direction is input."
@@ -1391,7 +1396,7 @@ msgstr "MITM security is not supported"
13911396
#: ports/stm/common-hal/sdioio/SDCard.c
13921397
#, c-format
13931398
msgid "MMC/SDIO Clock Error %x"
1394-
msgstr ""
1399+
msgstr "MMC/SDIO Clock Error %x"
13951400

13961401
#: shared-bindings/is31fl3741/IS31FL3741.c
13971402
msgid "Mapping must be a tuple"
@@ -1581,7 +1586,7 @@ msgstr "No pulldown on pin; 1Mohm recommended"
15811586

15821587
#: shared-module/touchio/TouchIn.c
15831588
msgid "No pullup on pin; 1Mohm recommended"
1584-
msgstr ""
1589+
msgstr "No pullup on pin; 1Mohm recommended"
15851590

15861591
#: py/moderrno.c
15871592
msgid "No space left on device"
@@ -2620,8 +2625,14 @@ msgid "bits must be 32 or less"
26202625
msgstr "bits must be 32 or less"
26212626

26222627
#: shared-bindings/audiodelays/Chorus.c shared-bindings/audiodelays/Echo.c
2628+
#: shared-bindings/audiodelays/MultiTapDelay.c
26232629
#: shared-bindings/audiodelays/PitchShift.c
26242630
#: shared-bindings/audiofilters/Distortion.c
2631+
#: shared-bindings/audiodelays/Reverb.c
2632+
msgid "bits_per_sample must be 16"
2633+
msgstr "bits_per_sample must be 16"
2634+
2635+
#: shared-bindings/audiodelays/Echo.c shared-bindings/audiofilters/Distortion.c
26252636
#: shared-bindings/audiofilters/Filter.c shared-bindings/audiomixer/Mixer.c
26262637
msgid "bits_per_sample must be 8 or 16"
26272638
msgstr "bits_per_sample must be 8 or 16"
@@ -4042,6 +4053,10 @@ msgstr "roll argument must be an ndarray"
40424053
msgid "rsplit(None,n)"
40434054
msgstr "rsplit(None,n)"
40444055

4056+
#: shared-bindings/audiodelays/Reverb.c
4057+
msgid "samples_signed must be true"
4058+
msgstr "samples_signed must be true"
4059+
40454060
#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
40464061
#: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
40474062
msgid "sampling rate out of range"

0 commit comments

Comments
 (0)