Skip to content

Commit a6e0ea3

Browse files
authored
Merge pull request #3 from adafruit/master
Add latest changes on repo
2 parents 749b2b0 + dabb8ff commit a6e0ea3

29 files changed

+848
-660
lines changed

.travis.yml

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ env:
2525
- TRAVIS_BOARDS="metro_m0_express metro_m4_express pirkey_m0 trellis_m4_express trinket_m0" TRAVIS_SDK=arm
2626
- TRAVIS_BOARDS="feather_radiofruit_zigbee gemma_m0 hallowing_m0_express itsybitsy_m0_express itsybitsy_m4_express meowmeow" 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" TRAVIS_SDK=arm
28-
- TRAVIS_BOARDS="circuitplayground_express_crickit feather_m0_adalogger feather_m0_basic feather_m0_express catwan_usbstick" TRAVIS_SDK=arm
28+
- TRAVIS_BOARDS="circuitplayground_express_crickit feather_m0_adalogger feather_m0_basic feather_m0_express catwan_usbstick pyportal" TRAVIS_SDK=arm
2929

3030
addons:
3131
artifacts:
@@ -77,7 +77,7 @@ before_script:
7777
- sudo apt-get install -y python3-pip
7878
- pip3 install --user sh click
7979
- ([[ -z "$TRAVIS_TESTS" ]] || sudo pip install --upgrade cpp-coveralls)
80-
- (! var_search "${TRAVIS_TESTS-}" docs || pip install --user 'Sphinx<1.8.0' sphinx-rtd-theme recommonmark)
80+
- (! var_search "${TRAVIS_TESTS-}" docs || pip install --user Sphinx sphinx-rtd-theme recommonmark)
8181
- (! var_search "${TRAVIS_TESTS-}" translations || pip3 install --user polib)
8282

8383
# report some good version numbers to the build
@@ -88,47 +88,47 @@ before_script:
8888

8989
script:
9090
# Build mpy-cross first because other builds depend on it.
91-
- echo 'Building mpy-cross' && echo -en 'travis_fold:start:mpy-cross\\r'
92-
- make -C mpy-cross -j2
93-
- echo -en 'travis_fold:end:mpy-cross\\r'
91+
- echo 'Building mpy-cross' && echo 'travis_fold:start:mpy-cross'
92+
- make -C mpy-cross -j2 ; echo $? > status
93+
- echo 'travis_fold:end:mpy-cross' && tools/print_status.py status
9494

9595
# Use unbuffered output because building all the releases can take a long time.
9696
# Travis will cancel the job if it sees no output for >10 minutes.
9797
- cd tools && python3 -u build_release_files.py
9898
- cd ..
9999

100-
- echo 'Building unix' && echo -en 'travis_fold:start:unix\\r'
101-
- (! var_search "${TRAVIS_TESTS-}" unix || (make -C ports/unix deplibs -j2 && make -C ports/unix -j2 && make -C ports/unix coverage -j2))
102-
- echo -en 'travis_fold:end:unix\\r'
100+
- echo 'Building unix' && echo 'travis_fold:start:unix'
101+
- (! var_search "${TRAVIS_TESTS-}" unix || (make -C ports/unix deplibs -j2 && make -C ports/unix -j2 && make -C ports/unix coverage -j2)) ; echo $? > status
102+
- echo 'travis_fold:end:unix' && tools/print_status.py status
103103

104104
# run tests without coverage info
105105
#- (cd tests && MICROPY_CPYTHON3=python3.4 ./run-tests -j1)
106106
#- (cd tests && MICROPY_CPYTHON3=python3.4 ./run-tests -j1 --emit native)
107107

108108
# run tests with coverage info
109-
- echo 'Test all' && echo -en 'travis_fold:start:test_all\\r'
110-
- (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1))
111-
- echo -en 'travis_fold:end:test_all\\r'
109+
- echo 'Test all' && echo 'travis_fold:start:test_all'
110+
- (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1)) ; echo $? > status
111+
- echo 'travis_fold:end:test_all' && tools/print_status.py status
112112

113-
- echo 'Test threads' && echo -en 'travis_fold:start:test_threads\\r'
114-
- (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 -d thread))
115-
- echo -en 'travis_fold:end:test_threads\\r'
113+
- echo 'Test threads' && echo 'travis_fold:start:test_threads'
114+
- (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 -d thread)) ; echo $? >status
115+
- echo 'travis_fold:end:test_threads' && tools/print_status.py status
116116

117-
- echo 'Testing with native' && echo -en 'travis_fold:start:test_native\\r'
118-
- (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --emit native))
119-
- echo -en 'travis_fold:end:test_native\\r'
117+
- echo 'Testing with native' && echo 'travis_fold:start:test_native'
118+
- (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --emit native)) ; echo $? >status
119+
- echo 'travis_fold:end:test_native' && tools/print_status.py status
120120

121-
- (echo 'Testing with mpy' && echo -en 'travis_fold:start:test_mpy\\r')
122-
- (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --via-mpy -d basics float))
123-
- echo -en 'travis_fold:end:test_mpy\\r'
121+
- (echo 'Testing with mpy' && echo 'travis_fold:start:test_mpy')
122+
- (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --via-mpy -d basics float)) ; echo $? >status
123+
- echo 'travis_fold:end:test_mpy' && tools/print_status.py status
124124

125-
- (echo 'Building docs' && echo -en 'travis_fold:start:build_docs\\r')
126-
- (! var_search "${TRAVIS_TESTS-}" docs || sphinx-build -E -W -b html . _build/html)
127-
- echo -en 'travis_fold:end:build_docs\\r'
125+
- (echo 'Building docs' && echo 'travis_fold:start:build_docs')
126+
- (! var_search "${TRAVIS_TESTS-}" docs || sphinx-build -E -W -b html . _build/html) ; echo $? >status
127+
- echo 'travis_fold:end:build_docs' && tools/print_status.py status
128128

129-
- (echo 'Building translations' && echo -en 'travis_fold:start:build_translations\\r')
130-
- (! var_search "${TRAVIS_TESTS-}" translations || make check-translate)
131-
- echo -en 'travis_fold:end:build_translations\\r'
129+
- (echo 'Building translations' && echo 'travis_fold:start:build_translations')
130+
- (! var_search "${TRAVIS_TESTS-}" translations || make check-translate) ; echo $? >status
131+
- echo 'travis_fold:end:build_translations' && tools/print_status.py status
132132

133133
# run coveralls coverage analysis (try to, even if some builds/tests failed)
134134
#- (cd ports/unix && coveralls --root ../.. --build-root . --gcov $(which gcov) --gcov-options '\-o build-coverage/' --include py --include extmod)

README.rst

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
Adafruit CircuitPython
22
======================
33

4-
|Build Status| |Doc Status| |Discord|
4+
.. image:: https://github.com/adafruit/circuitpython/blob/master/logo/CircuitPython_Repo_header_logo.png
5+
6+
|Build Status| |Doc Status| |License| |Discord|
57

68
`Status <#status>`__ \| `Supported Boards <#supported-boards>`__
79
\| `Download <#download>`__ \|
@@ -270,3 +272,5 @@ project.
270272
:target: http://circuitpython.readthedocs.io/
271273
.. |Discord| image:: https://img.shields.io/discord/327254708534116352.svg
272274
:target: https://discord.gg/nBQh6qu
275+
.. |License| image:: https://github.com/adafruit/circuitpython/blob/master/logo/license-MIT-brightgreen.svg
276+
:target: https://opensource.org/licenses/MIT

conf.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@
284284
# author, documentclass [howto, manual, or own class]).
285285
latex_documents = [
286286
(master_doc, 'CircuitPython.tex', 'CircuitPython Documentation',
287-
'Damien P. George, Paul Sokolovsky, and contributors', 'manual'),
287+
'CircuitPython Contributors', 'manual'),
288288
]
289289

290290
# The name of an image file (relative to this directory) to place at the top of
@@ -314,7 +314,7 @@
314314
# (source start file, name, description, authors, manual section).
315315
man_pages = [
316316
('index', 'CircuitPython', 'CircuitPython Documentation',
317-
['Damien P. George, Paul Sokolovsky, and contributors'], 1),
317+
['CircuitPython contributors'], 1),
318318
]
319319

320320
# If true, show URL addresses after external links.
@@ -328,7 +328,7 @@
328328
# dir menu entry, description, category)
329329
texinfo_documents = [
330330
(master_doc, 'CircuitPython', 'CircuitPython Documentation',
331-
'Damien P. George, Paul Sokolovsky, and contributors', 'CircuitPython', 'One line description of project.',
331+
'CircuitPython contributors', 'CircuitPython', 'Python for Microcontrollers.',
332332
'Miscellaneous'),
333333
]
334334

locale/circuitpython.pot

Lines changed: 12 additions & 12 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: 2018-12-06 17:04-0800\n"
11+
"POT-Creation-Date: 2018-12-26 20:49+0100\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -346,12 +346,12 @@ msgid "bytes > 8 bits not supported"
346346
msgstr ""
347347

348348
#: ports/atmel-samd/common-hal/busio/UART.c:73
349-
#: ports/nrf/common-hal/busio/UART.c:83
349+
#: ports/nrf/common-hal/busio/UART.c:106
350350
msgid "tx and rx cannot both be None"
351351
msgstr ""
352352

353353
#: ports/atmel-samd/common-hal/busio/UART.c:146
354-
#: ports/nrf/common-hal/busio/UART.c:116
354+
#: ports/nrf/common-hal/busio/UART.c:140
355355
msgid "Failed to allocate RX buffer"
356356
msgstr ""
357357

@@ -360,12 +360,12 @@ msgid "Could not initialize UART"
360360
msgstr ""
361361

362362
#: ports/atmel-samd/common-hal/busio/UART.c:241
363-
#: ports/nrf/common-hal/busio/UART.c:157
363+
#: ports/nrf/common-hal/busio/UART.c:185
364364
msgid "No RX pin"
365365
msgstr ""
366366

367367
#: ports/atmel-samd/common-hal/busio/UART.c:300
368-
#: ports/nrf/common-hal/busio/UART.c:207
368+
#: ports/nrf/common-hal/busio/UART.c:220
369369
msgid "No TX pin"
370370
msgstr ""
371371

@@ -779,19 +779,19 @@ msgstr ""
779779
msgid "error = 0x%08lX"
780780
msgstr ""
781781

782-
#: ports/nrf/common-hal/busio/UART.c:87
782+
#: ports/nrf/common-hal/busio/UART.c:110
783783
msgid "Invalid buffer size"
784784
msgstr ""
785785

786-
#: ports/nrf/common-hal/busio/UART.c:91
786+
#: ports/nrf/common-hal/busio/UART.c:114
787787
msgid "Odd parity is not supported"
788788
msgstr ""
789789

790-
#: ports/nrf/common-hal/busio/UART.c:334 ports/nrf/common-hal/busio/UART.c:338
791-
#: ports/nrf/common-hal/busio/UART.c:343 ports/nrf/common-hal/busio/UART.c:348
792-
#: ports/nrf/common-hal/busio/UART.c:354 ports/nrf/common-hal/busio/UART.c:359
793-
#: ports/nrf/common-hal/busio/UART.c:364 ports/nrf/common-hal/busio/UART.c:368
794-
#: ports/nrf/common-hal/busio/UART.c:376
790+
#: ports/nrf/common-hal/busio/UART.c:346 ports/nrf/common-hal/busio/UART.c:350
791+
#: ports/nrf/common-hal/busio/UART.c:355 ports/nrf/common-hal/busio/UART.c:360
792+
#: ports/nrf/common-hal/busio/UART.c:366 ports/nrf/common-hal/busio/UART.c:371
793+
#: ports/nrf/common-hal/busio/UART.c:376 ports/nrf/common-hal/busio/UART.c:380
794+
#: ports/nrf/common-hal/busio/UART.c:388
795795
msgid "busio.UART not available"
796796
msgstr ""
797797

locale/de_DE.po

Lines changed: 40 additions & 40 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: 2018-12-06 17:04-0800\n"
10+
"POT-Creation-Date: 2018-12-26 20:49+0100\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: Sebastian Plamauer\n"
1313
"Language-Team: \n"
@@ -350,12 +350,12 @@ msgid "bytes > 8 bits not supported"
350350
msgstr "bytes mit merh als 8 bits werden nicht unterstützt"
351351

352352
#: ports/atmel-samd/common-hal/busio/UART.c:73
353-
#: ports/nrf/common-hal/busio/UART.c:83
353+
#: ports/nrf/common-hal/busio/UART.c:106
354354
msgid "tx and rx cannot both be None"
355355
msgstr "tx und rx können nicht beide None sein"
356356

357357
#: ports/atmel-samd/common-hal/busio/UART.c:146
358-
#: ports/nrf/common-hal/busio/UART.c:116
358+
#: ports/nrf/common-hal/busio/UART.c:140
359359
msgid "Failed to allocate RX buffer"
360360
msgstr "Konnte keinen RX Buffer allozieren"
361361

@@ -364,12 +364,12 @@ msgid "Could not initialize UART"
364364
msgstr "Konnte UART nicht initialisieren"
365365

366366
#: ports/atmel-samd/common-hal/busio/UART.c:241
367-
#: ports/nrf/common-hal/busio/UART.c:157
367+
#: ports/nrf/common-hal/busio/UART.c:185
368368
msgid "No RX pin"
369369
msgstr "Kein RX Pin"
370370

371371
#: ports/atmel-samd/common-hal/busio/UART.c:300
372-
#: ports/nrf/common-hal/busio/UART.c:207
372+
#: ports/nrf/common-hal/busio/UART.c:220
373373
msgid "No TX pin"
374374
msgstr "Kein TX Pin"
375375

@@ -789,21 +789,21 @@ msgstr "Alle timer werden benutzt"
789789
msgid "error = 0x%08lX"
790790
msgstr ""
791791

792-
#: ports/nrf/common-hal/busio/UART.c:87
792+
#: ports/nrf/common-hal/busio/UART.c:110
793793
#, fuzzy
794794
msgid "Invalid buffer size"
795795
msgstr "ungültiger dupterm index"
796796

797-
#: ports/nrf/common-hal/busio/UART.c:91
797+
#: ports/nrf/common-hal/busio/UART.c:114
798798
#, fuzzy
799799
msgid "Odd parity is not supported"
800800
msgstr "bytes mit merh als 8 bits werden nicht unterstützt"
801801

802-
#: ports/nrf/common-hal/busio/UART.c:334 ports/nrf/common-hal/busio/UART.c:338
803-
#: ports/nrf/common-hal/busio/UART.c:343 ports/nrf/common-hal/busio/UART.c:348
804-
#: ports/nrf/common-hal/busio/UART.c:354 ports/nrf/common-hal/busio/UART.c:359
805-
#: ports/nrf/common-hal/busio/UART.c:364 ports/nrf/common-hal/busio/UART.c:368
806-
#: ports/nrf/common-hal/busio/UART.c:376
802+
#: ports/nrf/common-hal/busio/UART.c:346 ports/nrf/common-hal/busio/UART.c:350
803+
#: ports/nrf/common-hal/busio/UART.c:355 ports/nrf/common-hal/busio/UART.c:360
804+
#: ports/nrf/common-hal/busio/UART.c:366 ports/nrf/common-hal/busio/UART.c:371
805+
#: ports/nrf/common-hal/busio/UART.c:376 ports/nrf/common-hal/busio/UART.c:380
806+
#: ports/nrf/common-hal/busio/UART.c:388
807807
msgid "busio.UART not available"
808808
msgstr ""
809809

@@ -2571,28 +2571,20 @@ msgid ""
25712571
"exit safe mode.\n"
25722572
msgstr ""
25732573

2574-
#~ msgid "Looks like our core CircuitPython code crashed hard. Whoops!\n"
2575-
#~ msgstr "CircuitPython ist abgestürzt. Ups!\n"
2576-
2577-
#~ msgid ""
2578-
#~ "Please file an issue here with the contents of your CIRCUITPY drive:\n"
2579-
#~ msgstr ""
2580-
#~ "Bitte erstelle ein issue hier mit dem Inhalt deines CIRCUITPY-speichers:\n"
2581-
2582-
#~ msgid "Can not add Service."
2583-
#~ msgstr "Kann den Dienst nicht hinzufügen."
2574+
#~ msgid "Invalid Service type"
2575+
#~ msgstr "Ungültiger Diensttyp"
25842576

2585-
#~ msgid "Can encode UUID into the advertisement packet."
2586-
#~ msgstr "Kann UUID in das advertisement packet kodieren."
2577+
#~ msgid "Can not apply advertisement data. status: 0x%02x"
2578+
#~ msgstr "Kann advertisement data nicht anwenden. Status: 0x%02x"
25872579

2588-
#~ msgid "Can not encode UUID, to check length."
2589-
#~ msgstr "Kann UUID nicht kodieren, um die Länge zu überprüfen."
2580+
#~ msgid "Cannot apply GAP parameters."
2581+
#~ msgstr "Kann GAP Parameter nicht anwenden."
25902582

2591-
#~ msgid "Can not add Characteristic."
2592-
#~ msgstr "Kann das Merkmal nicht hinzufügen."
2583+
#~ msgid "Can not apply device name in the stack."
2584+
#~ msgstr "Der Gerätename kann nicht im Stack verwendet werden."
25932585

2594-
#~ msgid "Can not query for the device address."
2595-
#~ msgstr "Kann nicht nach der Geräteadresse suchen."
2586+
#~ msgid "Cannot set PPCP parameters."
2587+
#~ msgstr "Kann PPCP Parameter nicht setzen."
25962588

25972589
#~ msgid ""
25982590
#~ "enough power for the whole circuit and press reset (after ejecting "
@@ -2601,17 +2593,25 @@ msgstr ""
26012593
#~ "genug Strom für den ganzen Schaltkreis liefert und drücke reset (nach dem "
26022594
#~ "sicheren Auswerfen von CIRCUITPY.)\n"
26032595

2604-
#~ msgid "Cannot set PPCP parameters."
2605-
#~ msgstr "Kann PPCP Parameter nicht setzen."
2596+
#~ msgid "Can not query for the device address."
2597+
#~ msgstr "Kann nicht nach der Geräteadresse suchen."
26062598

2607-
#~ msgid "Can not apply device name in the stack."
2608-
#~ msgstr "Der Gerätename kann nicht im Stack verwendet werden."
2599+
#~ msgid "Can not add Characteristic."
2600+
#~ msgstr "Kann das Merkmal nicht hinzufügen."
26092601

2610-
#~ msgid "Cannot apply GAP parameters."
2611-
#~ msgstr "Kann GAP Parameter nicht anwenden."
2602+
#~ msgid "Can not encode UUID, to check length."
2603+
#~ msgstr "Kann UUID nicht kodieren, um die Länge zu überprüfen."
26122604

2613-
#~ msgid "Can not apply advertisement data. status: 0x%02x"
2614-
#~ msgstr "Kann advertisement data nicht anwenden. Status: 0x%02x"
2605+
#~ msgid "Can encode UUID into the advertisement packet."
2606+
#~ msgstr "Kann UUID in das advertisement packet kodieren."
26152607

2616-
#~ msgid "Invalid Service type"
2617-
#~ msgstr "Ungültiger Diensttyp"
2608+
#~ msgid "Can not add Service."
2609+
#~ msgstr "Kann den Dienst nicht hinzufügen."
2610+
2611+
#~ msgid ""
2612+
#~ "Please file an issue here with the contents of your CIRCUITPY drive:\n"
2613+
#~ msgstr ""
2614+
#~ "Bitte erstelle ein issue hier mit dem Inhalt deines CIRCUITPY-speichers:\n"
2615+
2616+
#~ msgid "Looks like our core CircuitPython code crashed hard. Whoops!\n"
2617+
#~ msgstr "CircuitPython ist abgestürzt. Ups!\n"

0 commit comments

Comments
 (0)