Skip to content

Commit 3574670

Browse files
dhalbertdhalbert
authored
Merge pull request adafruit#2931 from tannewt/esp32s2_digitalio
Finish digitalio and pin use tracking for ESP32S2
2 parents c917270 + 2ffd704 commit 3574670

41 files changed

Lines changed: 1011 additions & 831 deletions

File tree

Some content is hidden

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

‎Makefile‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,12 @@ locale/circuitpython.pot: all-source
210210
translate: locale/circuitpython.pot
211211
for po in $(shell ls locale/*.po); do msgmerge -U $$po -s --no-fuzzy-matching --add-location=file locale/circuitpython.pot; done
212212

213+
merge-translate:
214+
git merge HEAD 1>&2 2> /dev/null; test $$? -eq 128
215+
rm locale/*~ || true
216+
git checkout --ours -- locale/*
217+
make translate
218+
213219
check-translate: locale/circuitpython.pot $(wildcard locale/*.po)
214220
$(PYTHON) tools/check_translations.py $^
215221

‎locale/ID.po‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-05-19 15:01+0800\n"
11+
"POT-Creation-Date: 2020-05-26 13:09-0700\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1082,10 +1082,6 @@ msgstr ""
10821082
msgid "Name too long"
10831083
msgstr ""
10841084

1085-
#: shared-bindings/_pixelbuf/PixelBuf.c
1086-
msgid "Negative step not supported"
1087-
msgstr ""
1088-
10891085
#: ports/nrf/common-hal/_bleio/Characteristic.c
10901086
msgid "No CCCD for this Characteristic"
10911087
msgstr ""
@@ -1249,6 +1245,10 @@ msgstr ""
12491245
msgid "Pin does not have ADC capabilities"
12501246
msgstr "Pin tidak mempunya kemampuan untuk ADC (Analog Digital Converter)"
12511247

1248+
#: shared-bindings/digitalio/DigitalInOut.c
1249+
msgid "Pin is input only"
1250+
msgstr ""
1251+
12521252
#: ports/atmel-samd/common-hal/countio/Counter.c
12531253
msgid "Pin must support hardware interrupts"
12541254
msgstr ""

‎locale/circuitpython.pot‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-05-19 15:01+0800\n"
11+
"POT-Creation-Date: 2020-05-26 13:09-0700\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1071,10 +1071,6 @@ msgstr ""
10711071
msgid "Name too long"
10721072
msgstr ""
10731073

1074-
#: shared-bindings/_pixelbuf/PixelBuf.c
1075-
msgid "Negative step not supported"
1076-
msgstr ""
1077-
10781074
#: ports/nrf/common-hal/_bleio/Characteristic.c
10791075
msgid "No CCCD for this Characteristic"
10801076
msgstr ""
@@ -1237,6 +1233,10 @@ msgstr ""
12371233
msgid "Pin does not have ADC capabilities"
12381234
msgstr ""
12391235

1236+
#: shared-bindings/digitalio/DigitalInOut.c
1237+
msgid "Pin is input only"
1238+
msgstr ""
1239+
12401240
#: ports/atmel-samd/common-hal/countio/Counter.c
12411241
msgid "Pin must support hardware interrupts"
12421242
msgstr ""

‎locale/cs.po‎

Lines changed: 21 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,99 +3,91 @@
33
# This file is distributed under the same license as the PACKAGE package.
44
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
55
#
6+
#, fuzzy
67
msgid ""
78
msgstr ""
89
"Project-Id-Version: PACKAGE VERSION\n"
910
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2020-05-19 15:01+0800\n"
11-
"PO-Revision-Date: 2020-05-24 03:22+0000\n"
12-
"Last-Translator: dronecz <mzuzelka@gmail.com>\n"
11+
"POT-Creation-Date: 2020-05-26 13:09-0700\n"
12+
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13+
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1314
"Language-Team: LANGUAGE <LL@li.org>\n"
14-
"Language: cs\n"
15+
"Language: \n"
1516
"MIME-Version: 1.0\n"
1617
"Content-Type: text/plain; charset=UTF-8\n"
1718
"Content-Transfer-Encoding: 8bit\n"
18-
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
19-
"X-Generator: Weblate 4.1-dev\n"
2019

2120
#: main.c
2221
msgid ""
2322
"\n"
2423
"Code done running. Waiting for reload.\n"
2524
msgstr ""
26-
"\n"
27-
"Kód byl dokončen. Čekám na opětovné načtení.\n"
2825

2926
#: supervisor/shared/safe_mode.c
3027
msgid ""
3128
"\n"
3229
"Please file an issue with the contents of your CIRCUITPY drive at \n"
3330
"https://github.com/adafruit/circuitpython/issues\n"
3431
msgstr ""
35-
"\n"
36-
"Založte prosím problém s obsahem vaší jednotky CIRCUITPY na adrese\n"
37-
"https://github.com/adafruit/circuitpython/issues\n"
3832

3933
#: supervisor/shared/safe_mode.c
4034
msgid ""
4135
"\n"
4236
"To exit, please reset the board without "
4337
msgstr ""
44-
"\n"
45-
"Pro ukončení, prosím resetujte desku bez "
4638

4739
#: py/obj.c
4840
msgid " File \"%q\""
49-
msgstr "  Soubor \"% q\""
41+
msgstr ""
5042

5143
#: py/obj.c
5244
msgid " File \"%q\", line %d"
53-
msgstr "  Soubor \"% q\", řádek% d"
45+
msgstr ""
5446

5547
#: main.c
5648
msgid " output:\n"
57-
msgstr " výstup:\n"
49+
msgstr ""
5850

5951
#: py/objstr.c
6052
#, c-format
6153
msgid "%%c requires int or char"
62-
msgstr "%% c vyžaduje int nebo char"
54+
msgstr ""
6355

6456
#: shared-bindings/rgbmatrix/RGBMatrix.c
6557
#, c-format
6658
msgid "%d address pins and %d rgb pins indicate a height of %d, not %d"
67-
msgstr "%d adresní piny a %d rgb piny označují výšku %d, nikoli %d"
59+
msgstr ""
6860

6961
#: shared-bindings/microcontroller/Pin.c
7062
msgid "%q in use"
71-
msgstr "%q se nyní používá"
63+
msgstr ""
7264

7365
#: py/obj.c
7466
msgid "%q index out of range"
75-
msgstr "%q index je mimo rozsah"
67+
msgstr ""
7668

7769
#: py/obj.c
7870
msgid "%q indices must be integers, not %s"
79-
msgstr "Indexy% q musí být celá čísla, nikoli% s"
71+
msgstr ""
8072

8173
#: shared-bindings/vectorio/Polygon.c
8274
msgid "%q list must be a list"
83-
msgstr "Seznam% q musí být seznam"
75+
msgstr ""
8476

8577
#: shared-bindings/_bleio/CharacteristicBuffer.c
8678
#: shared-bindings/_bleio/PacketBuffer.c shared-bindings/displayio/Group.c
8779
#: shared-bindings/displayio/Shape.c shared-bindings/vectorio/Circle.c
8880
#: shared-bindings/vectorio/Rectangle.c
8981
msgid "%q must be >= 1"
90-
msgstr "% q musí být > = 1"
82+
msgstr ""
9183

9284
#: shared-module/vectorio/Polygon.c
9385
msgid "%q must be a tuple of length 2"
94-
msgstr "% q musí být n-tice délky 2"
86+
msgstr ""
9587

9688
#: shared-bindings/fontio/BuiltinFont.c
9789
msgid "%q should be an int"
98-
msgstr "% q by měl být int"
90+
msgstr ""
9991

10092
#: py/bc.c py/objnamedtuple.c
10193
msgid "%q() takes %d positional arguments but %d were given"
@@ -1079,10 +1071,6 @@ msgstr ""
10791071
msgid "Name too long"
10801072
msgstr ""
10811073

1082-
#: shared-bindings/_pixelbuf/PixelBuf.c
1083-
msgid "Negative step not supported"
1084-
msgstr ""
1085-
10861074
#: ports/nrf/common-hal/_bleio/Characteristic.c
10871075
msgid "No CCCD for this Characteristic"
10881076
msgstr ""
@@ -1245,6 +1233,10 @@ msgstr ""
12451233
msgid "Pin does not have ADC capabilities"
12461234
msgstr ""
12471235

1236+
#: shared-bindings/digitalio/DigitalInOut.c
1237+
msgid "Pin is input only"
1238+
msgstr ""
1239+
12481240
#: ports/atmel-samd/common-hal/countio/Counter.c
12491241
msgid "Pin must support hardware interrupts"
12501242
msgstr ""

0 commit comments

Comments
 (0)