Skip to content

Commit e1eda27

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

File tree

6 files changed

+30
-40
lines changed

6 files changed

+30
-40
lines changed

‎Makefile

Lines changed: 0 additions & 6 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."

‎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 <iqbalrifai@163.com>\n"
9+
"PO-Revision-Date: 2025-06-18 17:01+0000\n"
10+
"Last-Translator: Dan Halbert <halbert@halwitz.org>\n"
1111
"Language-Team: LANGUAGE <LL@li.org>\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/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 <deepserket@gmail.com>\n"
10+
"PO-Revision-Date: 2025-06-18 17:01+0000\n"
11+
"Last-Translator: Dan Halbert <halbert@halwitz.org>\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ı <qwehacim3542qwe@gmail.com>\n"
10+
"PO-Revision-Date: 2025-06-18 17:01+0000\n"
11+
"Last-Translator: Dan Halbert <halbert@halwitz.org>\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

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy