Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
e136222
use rbuf for busio uart
hathach Dec 13, 2018
b37b2fa
overwrite old data if fifo is full
hathach Dec 13, 2018
5e4b3a8
Merge pull request #1402 from hathach/nrf_uartio_fix
dhalbert Dec 13, 2018
a9f0b31
Update README.rst
ladyada Dec 19, 2018
ca60a03
Merge pull request #1411 from adafruit/ladyada-patch-1
dhalbert Dec 19, 2018
5f3a259
Sync with micropython. closes #1414
CarlFK Dec 21, 2018
bce6d12
Don't check for corrupt heap too early; Fix QSPI timing
dhalbert Dec 21, 2018
e312b93
Update Tagalog translations
Dec 21, 2018
9c26c58
Update fil.po
Dec 21, 2018
0dfe2db
return error status on more routines; minor simplification of freq se…
dhalbert Dec 21, 2018
c8397b0
Merge pull request #1417 from CarlFK/tinytest-t
dhalbert Dec 26, 2018
4f25cc1
Merge pull request #1419 from eighthree/4.x-Tagalog-Language-Update
dhalbert Dec 26, 2018
0b35227
Updated fr.po
Dec 26, 2018
5c776db
make translate
Dec 26, 2018
60a509b
Merge pull request #1426 from arofarn/update-fr
dhalbert Dec 26, 2018
6d60b81
Merge pull request #1418 from dhalbert/feather52840-rgb-qspi-fixes
dhalbert Dec 26, 2018
55084b3
remome FRAMEBUF from nrf builds - use QSPI for particle ARGON
jerryneedell Dec 27, 2018
ddf0d3f
Merge pull request #1427 from jerryneedell/jerryn_argon
dhalbert Dec 27, 2018
d092722
fix #1407 keep receiving in case of error
hathach Dec 27, 2018
3ee766b
put received bytes to fifo when error
hathach Dec 27, 2018
dcdd82c
Merge pull request #1428 from hathach/nrf52_esp83266_uart_bug
dhalbert Dec 27, 2018
a8486c6
Adding header logo resized
kattni Dec 28, 2018
e699d10
Merge pull request #1430 from adafruit/header-logo
dhalbert Dec 28, 2018
a4ee808
fix #1422 correct i2c max xfer len (size in bits)
hathach Dec 28, 2018
6b0d93c
correct i2c max len
hathach Dec 28, 2018
84060e6
Merge pull request #1431 from hathach/nrf52_i2c_1kb
dhalbert Dec 28, 2018
715064a
Adding MIT license badge
kattni Dec 28, 2018
0757f54
Merge pull request #1432 from adafruit/license-badge
kattni Dec 28, 2018
a48a08d
Added header image and license badge
kattni Dec 28, 2018
555da95
Merge pull request #1433 from adafruit/add-image-badge
kattni Dec 28, 2018
d3aeca1
Initial pass at pyportal board define.
tannewt Jan 7, 2019
a49683e
Build with Travis
tannewt Jan 7, 2019
172311f
Merge pull request #1442 from tannewt/pyportal
dhalbert Jan 8, 2019
d41ed76
Fix sphinx build issues; add better travis fold reporting; update aut…
dhalbert Jan 9, 2019
dabb8ff
Merge pull request #1448 from dhalbert/sphinx-fixes
tannewt Jan 9, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ env:
- TRAVIS_BOARDS="metro_m0_express metro_m4_express pirkey_m0 trellis_m4_express trinket_m0" TRAVIS_SDK=arm
- TRAVIS_BOARDS="feather_radiofruit_zigbee gemma_m0 hallowing_m0_express itsybitsy_m0_express itsybitsy_m4_express meowmeow" TRAVIS_SDK=arm
- TRAVIS_BOARDS="feather_m0_express_crickit feather_m0_rfm69 feather_m0_rfm9x feather_m4_express arduino_zero arduino_mkr1300 arduino_mkrzero" TRAVIS_SDK=arm
- TRAVIS_BOARDS="circuitplayground_express_crickit feather_m0_adalogger feather_m0_basic feather_m0_express catwan_usbstick" TRAVIS_SDK=arm
- TRAVIS_BOARDS="circuitplayground_express_crickit feather_m0_adalogger feather_m0_basic feather_m0_express catwan_usbstick pyportal" TRAVIS_SDK=arm

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

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

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

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

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

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

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

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

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

- (echo 'Testing with mpy' && echo -en 'travis_fold:start:test_mpy\\r')
- (! 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 -en 'travis_fold:end:test_mpy\\r'
- (echo 'Testing with mpy' && echo 'travis_fold:start:test_mpy')
- (! 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
- echo 'travis_fold:end:test_mpy' && tools/print_status.py status

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

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

# run coveralls coverage analysis (try to, even if some builds/tests failed)
#- (cd ports/unix && coveralls --root ../.. --build-root . --gcov $(which gcov) --gcov-options '\-o build-coverage/' --include py --include extmod)
Expand Down
6 changes: 5 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
Adafruit CircuitPython
======================

|Build Status| |Doc Status| |Discord|
.. image:: https://github.com/adafruit/circuitpython/blob/master/logo/CircuitPython_Repo_header_logo.png

|Build Status| |Doc Status| |License| |Discord|

`Status <#status>`__ \| `Supported Boards <#supported-boards>`__
\| `Download <#download>`__ \|
Expand Down Expand Up @@ -270,3 +272,5 @@ project.
:target: http://circuitpython.readthedocs.io/
.. |Discord| image:: https://img.shields.io/discord/327254708534116352.svg
:target: https://discord.gg/nBQh6qu
.. |License| image:: https://github.com/adafruit/circuitpython/blob/master/logo/license-MIT-brightgreen.svg
:target: https://opensource.org/licenses/MIT
6 changes: 3 additions & 3 deletions conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@
# author, documentclass [howto, manual, or own class]).
latex_documents = [
(master_doc, 'CircuitPython.tex', 'CircuitPython Documentation',
'Damien P. George, Paul Sokolovsky, and contributors', 'manual'),
'CircuitPython Contributors', 'manual'),
]

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

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

Expand Down
24 changes: 12 additions & 12 deletions locale/circuitpython.pot
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-12-06 17:04-0800\n"
"POT-Creation-Date: 2018-12-26 20:49+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -346,12 +346,12 @@ msgid "bytes > 8 bits not supported"
msgstr ""

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

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

Expand All @@ -360,12 +360,12 @@ msgid "Could not initialize UART"
msgstr ""

#: ports/atmel-samd/common-hal/busio/UART.c:241
#: ports/nrf/common-hal/busio/UART.c:157
#: ports/nrf/common-hal/busio/UART.c:185
msgid "No RX pin"
msgstr ""

#: ports/atmel-samd/common-hal/busio/UART.c:300
#: ports/nrf/common-hal/busio/UART.c:207
#: ports/nrf/common-hal/busio/UART.c:220
msgid "No TX pin"
msgstr ""

Expand Down Expand Up @@ -779,19 +779,19 @@ msgstr ""
msgid "error = 0x%08lX"
msgstr ""

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

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

#: ports/nrf/common-hal/busio/UART.c:334 ports/nrf/common-hal/busio/UART.c:338
#: ports/nrf/common-hal/busio/UART.c:343 ports/nrf/common-hal/busio/UART.c:348
#: ports/nrf/common-hal/busio/UART.c:354 ports/nrf/common-hal/busio/UART.c:359
#: ports/nrf/common-hal/busio/UART.c:364 ports/nrf/common-hal/busio/UART.c:368
#: ports/nrf/common-hal/busio/UART.c:376
#: ports/nrf/common-hal/busio/UART.c:346 ports/nrf/common-hal/busio/UART.c:350
#: ports/nrf/common-hal/busio/UART.c:355 ports/nrf/common-hal/busio/UART.c:360
#: ports/nrf/common-hal/busio/UART.c:366 ports/nrf/common-hal/busio/UART.c:371
#: ports/nrf/common-hal/busio/UART.c:376 ports/nrf/common-hal/busio/UART.c:380
#: ports/nrf/common-hal/busio/UART.c:388
msgid "busio.UART not available"
msgstr ""

Expand Down
80 changes: 40 additions & 40 deletions locale/de_DE.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-12-06 17:04-0800\n"
"POT-Creation-Date: 2018-12-26 20:49+0100\n"
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
"Last-Translator: Sebastian Plamauer\n"
"Language-Team: \n"
Expand Down Expand Up @@ -350,12 +350,12 @@ msgid "bytes > 8 bits not supported"
msgstr "bytes mit merh als 8 bits werden nicht unterstützt"

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

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

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

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

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

Expand Down Expand Up @@ -789,21 +789,21 @@ msgstr "Alle timer werden benutzt"
msgid "error = 0x%08lX"
msgstr ""

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

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

#: ports/nrf/common-hal/busio/UART.c:334 ports/nrf/common-hal/busio/UART.c:338
#: ports/nrf/common-hal/busio/UART.c:343 ports/nrf/common-hal/busio/UART.c:348
#: ports/nrf/common-hal/busio/UART.c:354 ports/nrf/common-hal/busio/UART.c:359
#: ports/nrf/common-hal/busio/UART.c:364 ports/nrf/common-hal/busio/UART.c:368
#: ports/nrf/common-hal/busio/UART.c:376
#: ports/nrf/common-hal/busio/UART.c:346 ports/nrf/common-hal/busio/UART.c:350
#: ports/nrf/common-hal/busio/UART.c:355 ports/nrf/common-hal/busio/UART.c:360
#: ports/nrf/common-hal/busio/UART.c:366 ports/nrf/common-hal/busio/UART.c:371
#: ports/nrf/common-hal/busio/UART.c:376 ports/nrf/common-hal/busio/UART.c:380
#: ports/nrf/common-hal/busio/UART.c:388
msgid "busio.UART not available"
msgstr ""

Expand Down Expand Up @@ -2571,28 +2571,20 @@ msgid ""
"exit safe mode.\n"
msgstr ""

#~ msgid "Looks like our core CircuitPython code crashed hard. Whoops!\n"
#~ msgstr "CircuitPython ist abgestürzt. Ups!\n"

#~ msgid ""
#~ "Please file an issue here with the contents of your CIRCUITPY drive:\n"
#~ msgstr ""
#~ "Bitte erstelle ein issue hier mit dem Inhalt deines CIRCUITPY-speichers:\n"

#~ msgid "Can not add Service."
#~ msgstr "Kann den Dienst nicht hinzufügen."
#~ msgid "Invalid Service type"
#~ msgstr "Ungültiger Diensttyp"

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

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

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

#~ msgid "Can not query for the device address."
#~ msgstr "Kann nicht nach der Geräteadresse suchen."
#~ msgid "Cannot set PPCP parameters."
#~ msgstr "Kann PPCP Parameter nicht setzen."

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

#~ msgid "Cannot set PPCP parameters."
#~ msgstr "Kann PPCP Parameter nicht setzen."
#~ msgid "Can not query for the device address."
#~ msgstr "Kann nicht nach der Geräteadresse suchen."

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

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

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

#~ msgid "Invalid Service type"
#~ msgstr "Ungültiger Diensttyp"
#~ msgid "Can not add Service."
#~ msgstr "Kann den Dienst nicht hinzufügen."

#~ msgid ""
#~ "Please file an issue here with the contents of your CIRCUITPY drive:\n"
#~ msgstr ""
#~ "Bitte erstelle ein issue hier mit dem Inhalt deines CIRCUITPY-speichers:\n"

#~ msgid "Looks like our core CircuitPython code crashed hard. Whoops!\n"
#~ msgstr "CircuitPython ist abgestürzt. Ups!\n"
Loading