Skip to content

Commit b1ce99a

Browse files
dhalbertdhalbert
committed
Merge branch 'main' of https://github.com/adafruit/circuitpython into wifi-power-management
2 parents ef2a624 + ceda2f0 commit b1ce99a

Some content is hidden

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

70 files changed

+1238
-174
lines changed

‎data/nvm.toml‎

‎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

‎frozen/Adafruit_CircuitPython_Bitmap_Font‎

‎frozen/Adafruit_CircuitPython_Display_Text‎

Submodule Adafruit_CircuitPython_Display_Text updated 30 files

‎frozen/Adafruit_CircuitPython_ST7789‎

‎frozen/Adafruit_CircuitPython_asyncio‎

‎locale/ID.po‎

Lines changed: 7 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,6 +2641,7 @@ 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
26412647
#: shared-bindings/audiofilters/Filter.c shared-bindings/audiomixer/Mixer.c

‎locale/circuitpython.pot‎

Lines changed: 7 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,6 +2592,7 @@ 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
25922598
#: shared-bindings/audiofilters/Filter.c shared-bindings/audiomixer/Mixer.c

‎locale/cs.po‎

Lines changed: 7 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,6 +2621,7 @@ 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
26212627
#: shared-bindings/audiofilters/Filter.c shared-bindings/audiomixer/Mixer.c

‎locale/de_DE.po‎

Lines changed: 7 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,6 +2653,7 @@ 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
26532659
#: shared-bindings/audiofilters/Filter.c shared-bindings/audiomixer/Mixer.c

0 commit comments

Comments
 (0)