Skip to content

Commit 1263d11

Browse files
dhalbertdhalbert
committed
Merge remote-tracking branch 'adafruit/main' into merge-micropython-v1.25.0
2 parents 5fb3f96 + 773d72f commit 1263d11

File tree

13 files changed

+91
-74
lines changed

13 files changed

+91
-74
lines changed

‎.codespell/ignore-words.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@ ftbfs
2626
straightaway
2727
ftbs
2828
ftb
29+
curren

‎Makefile

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -156,28 +156,22 @@ epub:
156156
@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
157157

158158
latex:
159-
$(PYTHON) docs/prepare_readme_for_latex.py
160159
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
161-
mv README.rst.bak README.rst
162160
@echo
163161
@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
164162
@echo "Run \`make' in that directory to run these through (pdf)latex" \
165163
"(use \`make latexpdf' here to do that automatically)."
166164

167165
# seems to be malfunctioning
168166
latexpdf:
169-
$(PYTHON) docs/prepare_readme_for_latex.py
170167
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
171-
mv README.rst.bak README.rst
172168
@echo "Running LaTeX files through pdflatex..."
173169
$(MAKE) -C $(BUILDDIR)/latex all-pdf
174170
@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
175171

176172
# seems to be malfunctioning
177173
latexpdfja:
178-
$(PYTHON) docs/prepare_readme_for_latex.py
179174
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
180-
mv README.rst.bak README.rst
181175
@echo "Running LaTeX files through platex and dvipdfmx..."
182176
$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
183177
@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
@@ -277,20 +271,20 @@ check-translate:
277271

278272
.PHONY: stubs
279273
stubs:
280-
@rm -rf circuitpython-stubs
281-
@mkdir circuitpython-stubs
282-
@$(PYTHON) tools/extract_pyi.py shared-bindings/ $(STUBDIR)
283-
@$(PYTHON) tools/extract_pyi.py extmod/ulab/code/ $(STUBDIR)/ulab
284-
@for d in ports/*/bindings; do \
274+
rm -rf circuitpython-stubs
275+
mkdir circuitpython-stubs
276+
$(PYTHON) tools/extract_pyi.py shared-bindings/ $(STUBDIR)
277+
$(PYTHON) tools/extract_pyi.py extmod/ulab/code/ $(STUBDIR)/ulab
278+
for d in ports/*/bindings; do \
285279
$(PYTHON) tools/extract_pyi.py "$$d" $(STUBDIR); done
286-
@sed -e "s,__version__,`python -msetuptools_scm`," < setup.py-stubs > circuitpython-stubs/setup.py
287-
@cp README.rst-stubs circuitpython-stubs/README.rst
288-
@cp MANIFEST.in-stubs circuitpython-stubs/MANIFEST.in
289-
@$(PYTHON) tools/board_stubs/build_board_specific_stubs/board_stub_builder.py
290-
@cp -r tools/board_stubs/circuitpython_setboard circuitpython-stubs/circuitpython_setboard
291-
@$(PYTHON) -m build circuitpython-stubs
292-
@touch circuitpython-stubs/board/__init__.py
293-
@touch circuitpython-stubs/board_definitions/__init__.py
280+
sed -e "s,__version__,`python -msetuptools_scm`," < setup.py-stubs > circuitpython-stubs/setup.py
281+
cp README.rst-stubs circuitpython-stubs/README.rst
282+
cp MANIFEST.in-stubs circuitpython-stubs/MANIFEST.in
283+
$(PYTHON) tools/board_stubs/build_board_specific_stubs/board_stub_builder.py
284+
cp -r tools/board_stubs/circuitpython_setboard circuitpython-stubs/circuitpython_setboard
285+
$(PYTHON) -m build circuitpython-stubs
286+
touch circuitpython-stubs/board/__init__.py
287+
touch circuitpython-stubs/board_definitions/__init__.py
294288

295289
.PHONY: check-stubs
296290
check-stubs: stubs

‎docs/prepare_readme_for_latex.py

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎locale/ID.po

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ msgstr ""
66
"Project-Id-Version: PACKAGE VERSION\n"
77
"Report-Msgid-Bugs-To: \n"
88
"POT-Creation-Date: 2021-01-04 12:55-0600\n"
9-
"PO-Revision-Date: 2024-11-12 08:09+0000\n"
10-
"Last-Translator: Iqbal Rifai <[email protected]>\n"
9+
"PO-Revision-Date: 2025-06-18 17:01+0000\n"
10+
"Last-Translator: Dan Halbert <[email protected]>\n"
1111
"Language-Team: LANGUAGE <[email protected]>\n"
1212
"Language: ID\n"
1313
"MIME-Version: 1.0\n"
1414
"Content-Type: text/plain; charset=UTF-8\n"
1515
"Content-Transfer-Encoding: 8bit\n"
1616
"Plural-Forms: nplurals=1; plural=0;\n"
17-
"X-Generator: Weblate 5.8.2\n"
17+
"X-Generator: Weblate 5.12.1\n"
1818

1919
#: main.c
2020
msgid ""
@@ -76,7 +76,7 @@ msgstr " tidak ketemu.\n"
7676

7777
#: main.c
7878
msgid " output:\n"
79-
msgstr "output:\n"
79+
msgstr " output:\n"
8080

8181
#: py/objstr.c
8282
#, c-format
@@ -2362,7 +2362,7 @@ msgstr "Kesalahan firmware sistem tidak diketahui: %d"
23622362
#: shared-module/_pixelmap/PixelMap.c
23632363
#, c-format
23642364
msgid "Unmatched number of items on RHS (expected %d, got %d)."
2365-
msgstr "Jumlah item pada RHS tidak cocok (diharapkan %d, didapatkan %d)."
2365+
msgstr "Jumlah item pada RHS tidak cocok (diharapkan %d, didapatkan %d)."
23662366

23672367
#: ports/nordic/common-hal/_bleio/__init__.c
23682368
msgid ""

‎locale/circuitpython.pot

Lines changed: 37 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -158,10 +158,6 @@ msgstr ""
158158
msgid "%q length must be >= %d"
159159
msgstr ""
160160

161-
#: py/runtime.c
162-
msgid "%q moved from %q to %q"
163-
msgstr ""
164-
165161
#: py/argcheck.c
166162
msgid "%q must be %d"
167163
msgstr ""
@@ -250,7 +246,7 @@ msgstr ""
250246
msgid "%q out of range"
251247
msgstr ""
252248

253-
#: py/objmodule.c py/runtime.c
249+
#: py/objmodule.c
254250
msgid "%q renamed %q"
255251
msgstr ""
256252

@@ -2698,6 +2694,10 @@ msgstr ""
26982694
msgid "can only have one parent"
26992695
msgstr ""
27002696

2697+
#: py/emitinlinerv32.c
2698+
msgid "can only have up to 4 parameters for RV32 assembly"
2699+
msgstr ""
2700+
27012701
#: py/emitinlinethumb.c
27022702
msgid "can only have up to 4 parameters to Thumb assembly"
27032703
msgstr ""
@@ -3867,6 +3867,30 @@ msgstr ""
38673867
msgid "opcode"
38683868
msgstr ""
38693869

3870+
#: py/emitinlinerv32.c
3871+
msgid "opcode '%q' argument %d: expecting %q"
3872+
msgstr ""
3873+
3874+
#: py/emitinlinerv32.c
3875+
msgid "opcode '%q' argument %d: must not be zero"
3876+
msgstr ""
3877+
3878+
#: py/emitinlinerv32.c
3879+
msgid "opcode '%q' argument %d: out of range"
3880+
msgstr ""
3881+
3882+
#: py/emitinlinerv32.c
3883+
msgid "opcode '%q' argument %d: undefined label '%q'"
3884+
msgstr ""
3885+
3886+
#: py/emitinlinerv32.c
3887+
msgid "opcode '%q' argument %d: unknown register"
3888+
msgstr ""
3889+
3890+
#: py/emitinlinerv32.c
3891+
msgid "opcode '%q': expecting %d arguments"
3892+
msgstr ""
3893+
38703894
#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/bitwise.c
38713895
#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/vector.c
38723896
msgid "operands could not be broadcast together"
@@ -3958,6 +3982,10 @@ msgstr ""
39583982
msgid "palette must be 32 bytes long"
39593983
msgstr ""
39603984

3985+
#: py/emitinlinerv32.c
3986+
msgid "parameters must be registers in sequence a0 to a3"
3987+
msgstr ""
3988+
39613989
#: py/emitinlinextensa.c
39623990
msgid "parameters must be registers in sequence a2 to a5"
39633991
msgstr ""
@@ -4147,10 +4175,6 @@ msgstr ""
41474175
msgid "splitting with sub-captures"
41484176
msgstr ""
41494177

4150-
#: py/objstr.c
4151-
msgid "start/end indices"
4152-
msgstr ""
4153-
41544178
#: shared-bindings/random/__init__.c
41554179
msgid "stop not reachable from start"
41564180
msgstr ""
@@ -4313,6 +4337,10 @@ msgstr ""
43134337
msgid "unindent doesn't match any outer indent level"
43144338
msgstr ""
43154339

4340+
#: py/emitinlinerv32.c
4341+
msgid "unknown RV32 instruction '%q'"
4342+
msgstr ""
4343+
43164344
#: py/objstr.c
43174345
#, c-format
43184346
msgid "unknown conversion specifier %c"

‎locale/it_IT.po

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ msgstr ""
77
"Project-Id-Version: PACKAGE VERSION\n"
88
"Report-Msgid-Bugs-To: \n"
99
"POT-Creation-Date: 2021-01-04 12:55-0600\n"
10-
"PO-Revision-Date: 2023-12-06 22:06+0000\n"
11-
"Last-Translator: deepserket <[email protected]>\n"
10+
"PO-Revision-Date: 2025-06-18 17:01+0000\n"
11+
"Last-Translator: Dan Halbert <[email protected]>\n"
1212
"Language-Team: \n"
1313
"Language: it_IT\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.3-dev\n"
18+
"X-Generator: Weblate 5.12.1\n"
1919

2020
#: main.c
2121
msgid ""
@@ -990,7 +990,7 @@ msgstr ""
990990
#: ports/nordic/sd_mutex.c
991991
#, c-format
992992
msgid "Failed to acquire mutex, err 0x%04x"
993-
msgstr "Impossibile acquisire il mutex, err 0x%04x"
993+
msgstr "Impossibile acquisire il mutex, err 0x%04x"
994994

995995
#: ports/raspberrypi/common-hal/mdns/Server.c
996996
msgid "Failed to add service TXT record"
@@ -1057,7 +1057,7 @@ msgstr ""
10571057
#: ports/nordic/sd_mutex.c
10581058
#, c-format
10591059
msgid "Failed to release mutex, err 0x%04x"
1060-
msgstr "Impossibile rilasciare il mutex, err 0x%04x"
1060+
msgstr "Impossibile rilasciare il mutex, err 0x%04x"
10611061

10621062
#: ports/zephyr-cp/common-hal/wifi/Radio.c
10631063
msgid "Failed to set hostname"
@@ -1829,9 +1829,10 @@ msgid "Pipe error"
18291829
msgstr ""
18301830

18311831
#: py/builtinhelp.c
1832-
#, fuzzy
18331832
msgid "Plus any modules on the filesystem\n"
1834-
msgstr "Imposssibile rimontare il filesystem"
1833+
msgstr ""
1834+
"Imposssibile rimontare il filesystem\\n"
1835+
"\n"
18351836

18361837
#: shared-module/vectorio/Polygon.c
18371838
msgid "Polygon needs at least 3 points"

‎locale/tr.po

Lines changed: 4 additions & 4 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: 2024-07-03 19:09+0000\n"
11-
"Last-Translator: Hacı <[email protected]>\n"
10+
"PO-Revision-Date: 2025-06-18 17:01+0000\n"
11+
"Last-Translator: Dan Halbert <[email protected]>\n"
1212
"Language-Team: none\n"
1313
"Language: tr\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.7-dev\n"
18+
"X-Generator: Weblate 5.12.1\n"
1919

2020
#: main.c
2121
msgid ""
@@ -750,7 +750,7 @@ msgstr ""
750750

751751
#: ports/espressif/common-hal/alarm/pin/PinAlarm.c
752752
msgid "Can only alarm on RTC IO from deep sleep."
753-
msgstr ""
753+
msgstr "Sadece alarm RTC IO'yu uyandırabilir."
754754

755755
#: ports/espressif/common-hal/alarm/pin/PinAlarm.c
756756
msgid "Can only alarm on one low pin while others alarm high from deep sleep."

‎ports/raspberrypi/bindings/picodvi/Framebuffer.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,11 +178,24 @@ MP_DEFINE_CONST_FUN_OBJ_1(picodvi_framebuffer_get_height_obj, picodvi_framebuffe
178178
MP_PROPERTY_GETTER(picodvi_framebuffer_height_obj,
179179
(mp_obj_t)&picodvi_framebuffer_get_height_obj);
180180

181+
//| color_depth: int
182+
//| """The color depth of the framebuffer."""
183+
static mp_obj_t picodvi_framebuffer_get_color_depth(mp_obj_t self_in) {
184+
picodvi_framebuffer_obj_t *self = (picodvi_framebuffer_obj_t *)self_in;
185+
check_for_deinit(self);
186+
return MP_OBJ_NEW_SMALL_INT(common_hal_picodvi_framebuffer_get_color_depth(self));
187+
}
188+
MP_DEFINE_CONST_FUN_OBJ_1(picodvi_framebuffer_get_color_depth_obj, picodvi_framebuffer_get_color_depth);
189+
MP_PROPERTY_GETTER(picodvi_framebuffer_color_depth_obj,
190+
(mp_obj_t)&picodvi_framebuffer_get_color_depth_obj);
191+
192+
181193
static const mp_rom_map_elem_t picodvi_framebuffer_locals_dict_table[] = {
182194
{ MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&picodvi_framebuffer_deinit_obj) },
183195

184196
{ MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&picodvi_framebuffer_width_obj) },
185197
{ MP_ROM_QSTR(MP_QSTR_height), MP_ROM_PTR(&picodvi_framebuffer_height_obj) },
198+
{ MP_ROM_QSTR(MP_QSTR_color_depth), MP_ROM_PTR(&picodvi_framebuffer_color_depth_obj) },
186199
};
187200
static MP_DEFINE_CONST_DICT(picodvi_framebuffer_locals_dict, picodvi_framebuffer_locals_dict_table);
188201

‎ports/silabs/common-hal/digitalio/DigitalInOut.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* This file is part of Adafruit for EFR32 project
3-
3+
*/
44
#ifndef MICROPY_INCLUDED_EFR32_COMMON_HAL_DIGITALIO_DIGITALINOUT_H
55
#define MICROPY_INCLUDED_EFR32_COMMON_HAL_DIGITALIO_DIGITALINOUT_H
66

‎py/runtime.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050

5151
#if MICROPY_VFS_ROM && MICROPY_VFS_ROM_IOCTL
5252
#include "extmod/vfs.h"
53-
#endif
53+
#endif
5454

5555
// CIRCUITPY-CHANGE
5656
#if CIRCUITPY_WARNINGS

0 commit comments

Comments
 (0)