Skip to content

Commit bed6d43

Browse files
dhalbertdhalbert
committed
merge from upstream; WIP redo Address; no more AddressType
2 parents 6fed24e + 6be7cf7 commit bed6d43

175 files changed

Lines changed: 3341 additions & 1216 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.

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212

1313
# Packages
1414
############
15+
dist/
16+
*.egg-info
1517

1618
# Logs and Databases
1719
######################
@@ -25,6 +27,7 @@
2527
######################
2628
build/
2729
bin/
30+
circuitpython-stubs/
2831

2932
# Test failure outputs
3033
######################

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ git:
2121
# that SDK is shortest and add it there. In the case of major re-organizations,
2222
# just try to make the builds "about equal in run time"
2323
env:
24-
- TRAVIS_TESTS="unix docs translations website" TRAVIS_BOARDS="circuitplayground_express mini_sam_m4 grandcentral_m4_express capablerobot_usbhub pca10056 pca10059 feather_nrf52840_express makerdiary_nrf52840_mdk makerdiary_nrf52840_mdk_usb_dongle particle_boron particle_argon particle_xenon sparkfun_nrf52840_mini electronut_labs_papyr" TRAVIS_SDK=arm:nrf
24+
- TRAVIS_TESTS="unix docs translations website" TRAVIS_BOARDS="circuitplayground_express mini_sam_m4 grandcentral_m4_express capablerobot_usbhub pygamer pca10056 pca10059 feather_nrf52840_express makerdiary_nrf52840_mdk makerdiary_nrf52840_mdk_usb_dongle particle_boron particle_argon particle_xenon sparkfun_nrf52840_mini electronut_labs_papyr electronut_labs_blip" TRAVIS_SDK=arm:nrf
2525
- TRAVIS_BOARDS="metro_m0_express metro_m4_express metro_m4_airlift_lite pirkey_m0 trellis_m4_express trinket_m0 sparkfun_lumidrive sparkfun_redboard_turbo bast_pro_mini_m0" TRAVIS_SDK=arm
2626
- TRAVIS_BOARDS="feather_radiofruit_zigbee gemma_m0 hallowing_m0_express itsybitsy_m0_express itsybitsy_m4_express meowmeow sam32 uchip escornabot_makech" TRAVIS_SDK=arm
2727
- TRAVIS_BOARDS="feather_m0_express_crickit feather_m0_rfm69 feather_m0_rfm9x feather_m4_express arduino_zero arduino_mkr1300 arduino_mkrzero pewpew10 kicksat-sprite ugame10 robohatmm1" TRAVIS_SDK=arm

‎Makefile‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Makefile for Sphinx documentation
1+
# Top-level Makefile for documentation builds and miscellaneous tasks.
22
#
33

44
# You can set these variables from the command line.
@@ -17,6 +17,13 @@ CONFDIR = .
1717
FORCE = -E
1818
VERBOSE = -v
1919

20+
# path to generated type stubs
21+
STUBDIR = circuitpython-stubs
22+
# Run "make VALIDATE= stubs" to avoid validating generated stub files
23+
VALIDATE = -v
24+
# path to pypi source distributions
25+
DISTDIR = dist
26+
2027
# Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the
2128
# full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the
2229
# executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
@@ -31,7 +38,7 @@ I18NSPHINXOPTS = $(BASEOPTS)
3138

3239
TRANSLATE_SOURCES = extmod lib main.c ports/atmel-samd ports/nrf py shared-bindings shared-module supervisor
3340

34-
.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
41+
.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext stubs
3542

3643
help:
3744
@echo "Please use \`make <target>' where <target> is one of"
@@ -60,6 +67,7 @@ help:
6067

6168
clean:
6269
rm -rf $(BUILDDIR)/*
70+
rm -rf $(STUBDIR) $(DISTDIR) *.egg-info
6371

6472
html:
6573
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
@@ -203,3 +211,11 @@ translate: locale/circuitpython.pot
203211

204212
check-translate: locale/circuitpython.pot $(wildcard locale/*.po)
205213
$(PYTHON) tools/check_translations.py $^
214+
215+
stubs:
216+
rst2pyi $(VALIDATE) shared-bindings/ $(STUBDIR)
217+
python setup.py sdist
218+
219+
update-frozen-libraries:
220+
@echo "Updating all frozen libraries to latest tagged version."
221+
cd frozen; for library in *; do cd $$library; ../../tools/git-checkout-latest-tag.sh; cd ..; done

‎README.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ Behavior
115115
output is written to ``boot_out.txt``.
116116
- ``code.py`` (or ``main.py``) is run after every reload until it
117117
finishes or is interrupted. After it is done running, the vm and
118-
hardware is reinitialized. **This means you cannot read state from
119-
``code.py`` in the REPL anymore.** CircuitPython's goal for this
118+
hardware is reinitialized. **This means you cannot read state from**
119+
``code.py`` **in the REPL anymore.** CircuitPython's goal for this
120120
change includes reduce confusion about pins and memory being used.
121121
- After ``code.py`` the REPL can be entered by pressing any key. It no
122122
longer shares state with ``code.py`` so it is a fresh vm.
@@ -131,9 +131,9 @@ Behavior
131131
``samd.disable_autoreload()``)
132132
- Entering the REPL after the main code is finished requires a key press which enters the REPL and
133133
disables autoreload.
134-
- Main is one of these: ``code.txt``, **``code.py``**, ``main.py``,
134+
- Main is one of these: ``code.txt``, ``code.py``, ``main.py``,
135135
``main.txt``
136-
- Boot is one of these: ``settings.txt``, ``settings.py``, **``boot.py``**,
136+
- Boot is one of these: ``settings.txt``, ``settings.py``, ``boot.py``,
137137
``boot.txt``
138138

139139
API

‎locale/ID.po‎

Lines changed: 19 additions & 2 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: 2019-05-13 17:34-0700\n"
11+
"POT-Creation-Date: 2019-06-11 14:59-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"
@@ -518,6 +518,7 @@ msgid "Drive mode not used when direction is input."
518518
msgstr ""
519519

520520
#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
521+
#: ports/atmel-samd/common-hal/ps2io/Ps2.c
521522
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
522523
msgid "EXTINT channel already in use"
523524
msgstr "Channel EXTINT sedang digunakan"
@@ -546,6 +547,10 @@ msgstr ""
546547
msgid "Expected tuple of length %d, got %d"
547548
msgstr ""
548549

550+
#: shared-bindings/ps2io/Ps2.c
551+
msgid "Failed sending command."
552+
msgstr ""
553+
549554
#: ports/nrf/common-hal/bleio/Device.c
550555
#, fuzzy
551556
msgid "Failed to acquire mutex"
@@ -851,6 +856,10 @@ msgstr ""
851856
msgid "LHS of keyword arg must be an id"
852857
msgstr "LHS dari keyword arg harus menjadi sebuah id"
853858

859+
#: shared-module/displayio/Group.c
860+
msgid "Layer already in a group."
861+
msgstr ""
862+
854863
#: shared-module/displayio/Group.c
855864
msgid "Layer must be a Group or TileGrid subclass."
856865
msgstr ""
@@ -932,6 +941,10 @@ msgstr "Tidak ada GCLK yang kosong"
932941
msgid "No hardware random available"
933942
msgstr ""
934943

944+
#: ports/atmel-samd/common-hal/ps2io/Ps2.c
945+
msgid "No hardware support on clk pin"
946+
msgstr ""
947+
935948
#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
936949
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
937950
msgid "No hardware support on pin"
@@ -1015,6 +1028,10 @@ msgstr ""
10151028
msgid "Plus any modules on the filesystem\n"
10161029
msgstr "Tambahkan module apapun pada filesystem\n"
10171030

1031+
#: shared-bindings/ps2io/Ps2.c
1032+
msgid "Pop from an empty Ps2 buffer"
1033+
msgstr ""
1034+
10181035
#: main.c
10191036
msgid "Press any key to enter the REPL. Use CTRL-D to reload."
10201037
msgstr ""
@@ -2176,7 +2193,7 @@ msgstr ""
21762193
msgid "object not callable"
21772194
msgstr ""
21782195

2179-
#: py/sequence.c
2196+
#: py/sequence.c shared-bindings/displayio/Group.c
21802197
msgid "object not in sequence"
21812198
msgstr ""
21822199

‎locale/circuitpython.pot‎

Lines changed: 19 additions & 2 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: 2019-05-13 17:41-0700\n"
11+
"POT-Creation-Date: 2019-06-12 00:59-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"
@@ -506,6 +506,7 @@ msgid "Drive mode not used when direction is input."
506506
msgstr ""
507507

508508
#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
509+
#: ports/atmel-samd/common-hal/ps2io/Ps2.c
509510
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
510511
msgid "EXTINT channel already in use"
511512
msgstr ""
@@ -534,6 +535,10 @@ msgstr ""
534535
msgid "Expected tuple of length %d, got %d"
535536
msgstr ""
536537

538+
#: shared-bindings/ps2io/Ps2.c
539+
msgid "Failed sending command."
540+
msgstr ""
541+
537542
#: ports/nrf/common-hal/bleio/Device.c
538543
msgid "Failed to acquire mutex"
539544
msgstr ""
@@ -826,6 +831,10 @@ msgstr ""
826831
msgid "LHS of keyword arg must be an id"
827832
msgstr ""
828833

834+
#: shared-module/displayio/Group.c
835+
msgid "Layer already in a group."
836+
msgstr ""
837+
829838
#: shared-module/displayio/Group.c
830839
msgid "Layer must be a Group or TileGrid subclass."
831840
msgstr ""
@@ -907,6 +916,10 @@ msgstr ""
907916
msgid "No hardware random available"
908917
msgstr ""
909918

919+
#: ports/atmel-samd/common-hal/ps2io/Ps2.c
920+
msgid "No hardware support on clk pin"
921+
msgstr ""
922+
910923
#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
911924
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
912925
msgid "No hardware support on pin"
@@ -989,6 +1002,10 @@ msgstr ""
9891002
msgid "Plus any modules on the filesystem\n"
9901003
msgstr ""
9911004

1005+
#: shared-bindings/ps2io/Ps2.c
1006+
msgid "Pop from an empty Ps2 buffer"
1007+
msgstr ""
1008+
9921009
#: main.c
9931010
msgid "Press any key to enter the REPL. Use CTRL-D to reload."
9941011
msgstr ""
@@ -2131,7 +2148,7 @@ msgstr ""
21312148
msgid "object not callable"
21322149
msgstr ""
21332150

2134-
#: py/sequence.c
2151+
#: py/sequence.c shared-bindings/displayio/Group.c
21352152
msgid "object not in sequence"
21362153
msgstr ""
21372154

‎locale/de_DE.po‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2019-05-13 17:34-0700\n"
10+
"POT-Creation-Date: 2019-06-11 14:59-0700\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: Pascal Deneaux\n"
1313
"Language-Team: Sebastian Plamauer, Pascal Deneaux\n"
@@ -510,6 +510,7 @@ msgid "Drive mode not used when direction is input."
510510
msgstr "Drive mode wird nicht verwendet, wenn die Richtung input ist."
511511

512512
#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
513+
#: ports/atmel-samd/common-hal/ps2io/Ps2.c
513514
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
514515
msgid "EXTINT channel already in use"
515516
msgstr "EXTINT Kanal ist schon in Benutzung"
@@ -538,6 +539,10 @@ msgstr "Eine UUID wird erwartet"
538539
msgid "Expected tuple of length %d, got %d"
539540
msgstr "Habe ein Tupel der Länge %d erwartet aber %d erhalten"
540541

542+
#: shared-bindings/ps2io/Ps2.c
543+
msgid "Failed sending command."
544+
msgstr ""
545+
541546
#: ports/nrf/common-hal/bleio/Device.c
542547
msgid "Failed to acquire mutex"
543548
msgstr "Akquirieren des Mutex gescheitert"
@@ -832,6 +837,10 @@ msgstr "Ungültige wave Datei"
832837
msgid "LHS of keyword arg must be an id"
833838
msgstr "LHS des Schlüsselwortarguments muss eine id sein"
834839

840+
#: shared-module/displayio/Group.c
841+
msgid "Layer already in a group."
842+
msgstr ""
843+
835844
#: shared-module/displayio/Group.c
836845
msgid "Layer must be a Group or TileGrid subclass."
837846
msgstr "Layer muss eine Group- oder TileGrid-Unterklasse sein."
@@ -920,6 +929,10 @@ msgstr "Keine freien GCLKs"
920929
msgid "No hardware random available"
921930
msgstr "Kein hardware random verfügbar"
922931

932+
#: ports/atmel-samd/common-hal/ps2io/Ps2.c
933+
msgid "No hardware support on clk pin"
934+
msgstr ""
935+
923936
#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
924937
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
925938
msgid "No hardware support on pin"
@@ -1004,6 +1017,10 @@ msgstr "Pixel außerhalb der Puffergrenzen"
10041017
msgid "Plus any modules on the filesystem\n"
10051018
msgstr "und alle Module im Dateisystem \n"
10061019

1020+
#: shared-bindings/ps2io/Ps2.c
1021+
msgid "Pop from an empty Ps2 buffer"
1022+
msgstr ""
1023+
10071024
#: main.c
10081025
msgid "Press any key to enter the REPL. Use CTRL-D to reload."
10091026
msgstr ""
@@ -2178,7 +2195,7 @@ msgstr "Objekt ist kein Iterator"
21782195
msgid "object not callable"
21792196
msgstr ""
21802197

2181-
#: py/sequence.c
2198+
#: py/sequence.c shared-bindings/displayio/Group.c
21822199
msgid "object not in sequence"
21832200
msgstr "Objekt ist nicht in sequence"
21842201

‎locale/en_US.po‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2019-05-13 17:34-0700\n"
10+
"POT-Creation-Date: 2019-06-11 14:59-0700\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -506,6 +506,7 @@ msgid "Drive mode not used when direction is input."
506506
msgstr ""
507507

508508
#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
509+
#: ports/atmel-samd/common-hal/ps2io/Ps2.c
509510
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
510511
msgid "EXTINT channel already in use"
511512
msgstr ""
@@ -534,6 +535,10 @@ msgstr ""
534535
msgid "Expected tuple of length %d, got %d"
535536
msgstr ""
536537

538+
#: shared-bindings/ps2io/Ps2.c
539+
msgid "Failed sending command."
540+
msgstr ""
541+
537542
#: ports/nrf/common-hal/bleio/Device.c
538543
msgid "Failed to acquire mutex"
539544
msgstr ""
@@ -826,6 +831,10 @@ msgstr ""
826831
msgid "LHS of keyword arg must be an id"
827832
msgstr ""
828833

834+
#: shared-module/displayio/Group.c
835+
msgid "Layer already in a group."
836+
msgstr ""
837+
829838
#: shared-module/displayio/Group.c
830839
msgid "Layer must be a Group or TileGrid subclass."
831840
msgstr ""
@@ -907,6 +916,10 @@ msgstr ""
907916
msgid "No hardware random available"
908917
msgstr ""
909918

919+
#: ports/atmel-samd/common-hal/ps2io/Ps2.c
920+
msgid "No hardware support on clk pin"
921+
msgstr ""
922+
910923
#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
911924
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
912925
msgid "No hardware support on pin"
@@ -989,6 +1002,10 @@ msgstr ""
9891002
msgid "Plus any modules on the filesystem\n"
9901003
msgstr ""
9911004

1005+
#: shared-bindings/ps2io/Ps2.c
1006+
msgid "Pop from an empty Ps2 buffer"
1007+
msgstr ""
1008+
9921009
#: main.c
9931010
msgid "Press any key to enter the REPL. Use CTRL-D to reload."
9941011
msgstr ""
@@ -2131,7 +2148,7 @@ msgstr ""
21312148
msgid "object not callable"
21322149
msgstr ""
21332150

2134-
#: py/sequence.c
2151+
#: py/sequence.c shared-bindings/displayio/Group.c
21352152
msgid "object not in sequence"
21362153
msgstr ""
21372154

0 commit comments

Comments
 (0)