Skip to content

Commit f6892ce

Browse files
yeyeto2788yeyeto2788
authored
Merge pull request adafruit#4 from adafruit/master
Get latest changes to translate
2 parents 948cc03 + 94822ee commit f6892ce

578 files changed

Lines changed: 39019 additions & 41140 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.

‎.gitmodules‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,3 +86,15 @@
8686
[submodule "tools/adabot"]
8787
path = tools/adabot
8888
url = https://github.com/adafruit/adabot.git
89+
[submodule "tools/bitmap_font"]
90+
path = tools/bitmap_font
91+
url = https://github.com/adafruit/Adafruit_CircuitPython_BitmapFont.git
92+
[submodule "tools/Tecate-bitmap-fonts"]
93+
path = tools/Tecate-bitmap-fonts
94+
url = https://github.com/Tecate/bitmap-fonts.git
95+
[submodule "frozen/pew-pewpew-standalone-10.x"]
96+
path = frozen/pew-pewpew-standalone-10.x
97+
url = https://github.com/pewpew-game/pew-pewpew-standalone-10.x.git
98+
[submodule "frozen/circuitpython-stage"]
99+
path = frozen/circuitpython-stage
100+
url = https://github.com/python-ugame/circuitpython-stage.git

‎.travis.yml‎

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ language: c
44
compiler:
55
- gcc
66
git:
7-
depth: 1
7+
depth: 6
88

99
# Each item under 'env' is a separate Travis job to execute.
1010
# They run in separate environments, so each one must take the time
@@ -21,26 +21,25 @@ 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="feather_huzzah circuitplayground_express mini_sam_m4 grandcentral_m4_express pca10056 pca10059 feather_nrf52832 feather_nrf52840_express makerdiary_nrf52840_mdk particle_boron particle_argon particle_xenon sparkfun_nrf52840_mini" TRAVIS_SDK=arm:nrf:esp8266
25-
- TRAVIS_BOARDS="metro_m0_express metro_m4_express pirkey_m0 trellis_m4_express trinket_m0" TRAVIS_SDK=arm
26-
- TRAVIS_BOARDS="feather_radiofruit_zigbee gemma_m0 hallowing_m0_express itsybitsy_m0_express itsybitsy_m4_express meowmeow" TRAVIS_SDK=arm
27-
- 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 pyportal" TRAVIS_SDK=arm
24+
- TRAVIS_TESTS="unix docs translations website" TRAVIS_BOARDS="circuitplayground_express mini_sam_m4 grandcentral_m4_express pca10056 pca10059 feather_nrf52840_express makerdiary_nrf52840_mdk makerdiary_nrf52840_mdk_usb_dongle particle_boron particle_argon particle_xenon sparkfun_nrf52840_mini" TRAVIS_SDK=arm:nrf
25+
- TRAVIS_BOARDS="metro_m0_express metro_m4_express pirkey_m0 trellis_m4_express trinket_m0 sparkfun_lumidrive sparkfun_redboard_turbo pybadge" TRAVIS_SDK=arm
26+
- TRAVIS_BOARDS="feather_radiofruit_zigbee gemma_m0 hallowing_m0_express itsybitsy_m0_express itsybitsy_m4_express meowmeow sam32 uchip" TRAVIS_SDK=arm
27+
- TRAVIS_BOARDS="feather_m0_express_crickit feather_m0_rfm69 feather_m0_rfm9x feather_m4_express arduino_zero arduino_mkr1300 arduino_mkrzero pewpew10" TRAVIS_SDK=arm
28+
- TRAVIS_BOARDS="circuitplayground_express_crickit feather_m0_adalogger feather_m0_basic feather_m0_express catwan_usbstick pyportal sparkfun_samd21_mini sparkfun_samd21_dev" TRAVIS_SDK=arm
2929

3030
addons:
3131
artifacts:
3232
paths:
33-
- $(ls -d1 bin/*/* | tr "\n" ":")
33+
- $(ls -d1 bin/*/*/* | tr "\n" ":")
3434
target_paths: /
3535

3636
deploy:
3737
provider: releases
3838
api_key:
3939
secure: "jdqVFw6itRY4qwQF4ReXo0uaymT+Mob6RhYX0lw8KWFNqBgHnLVuKmKKcGMEuRvBVMPkvxF7bMuOQzSBOunqwlHFse3oMzdWvQODv1zwV7pSRXGwTdIvTPbBjKWxnBG9uSNRf2R5AMflJFUxy2CbtBpgvNzr+4VLREZDrrjEu8C1iTtXGpSm5AQ5iIp2fkMAWD85FP7CQPpkqRoxhSIFZmTdurfYRmenq1OZ/4SeD5TESKcyvqJNzVT9z210B3cg3eAkP6ukvelW4qE2zgIANqUkGqvDEnAvEII9M89kuwhCMAekdfwnUSPrry+g77i1dUZHoRN1+MFj+waYtPaqxdYo2G1sysa6enxlu4jHMR5MfMk9eKHgaNgL3PiyANusYSS44amh8QIiVaX5nw82myZDCpQOZW7YqJKE6WX70Lbs4mS+wIs+ig4KIXO1B0p9kMb0OeVjHRl+KcXsWGRu/ECG/ExpqlVIssSPU407LohMXT2cJ37CY/R/EeK2XSDsQ2M3L3EAGUjCJdBGuwsOJ+2lG+HQpAVu9vAB4kq5jy9Ye+MG+8Xlkly3XZZ5+FkXyYxKnXb26/QVv0e5sIG5OmdJCPYFaH2J1QdKo7CdhEcBtrf6DMPWaimGMldShFqzLjOz3b3qLysRxFF0aGb7ipKPa57vawNzYHoPAViOcXQ="
4040
file_glob: true
41-
file: "$TRAVIS_BUILD_DIR/bin/*/*"
41+
file: "$TRAVIS_BUILD_DIR/bin/*/*/*"
4242
skip_cleanup: true
43-
draft: true
4443
on:
4544
tags: true
4645

@@ -57,7 +56,6 @@ notifications:
5756
before_script:
5857
# Expand the git tree back to 4.0.0-alpha.1 and then fetch the latest tag.
5958
- LAST_TAG=`git ls-remote --quiet --tags --sort=version:refname | egrep -o "refs/tags/[0-9]+.*\$" | tail -n 1`
60-
- git fetch --shallow-exclude=4.0.0-alpha.1 || git fetch --unshallow
6159
- git fetch --depth 1 origin $LAST_TAG:$LAST_TAG
6260
- git describe --dirty --always --tags
6361
- function var_search () { case "$1" in *$2*) true;; *) false;; esac; }
@@ -66,9 +64,6 @@ before_script:
6664

6765
- (! var_search "${TRAVIS_SDK-}" arm || (wget https://s3.amazonaws.com/adafruit-circuit-python/gcc-arm-embedded_7-2018q2-1~xenial1_amd64.deb && sudo dpkg -i gcc-arm-embedded*_amd64.deb))
6866

69-
# For nrf builds
70-
- (! var_search "${TRAVIS_SDK-}" nrf || sudo ports/nrf/bluetooth/download_ble_stack.sh)
71-
7267
# For huzzah builds
7368
- (! var_search "${TRAVIS_SDK-}" esp8266 || (wget https://github.com/jepler/esp-open-sdk/releases/download/2018-06-10/xtensa-lx106-elf-standalone.tar.gz && tar -C .. -xaf xtensa-lx106-elf-standalone.tar.gz))
7469
- if var_search "${TRAVIS_SDK-}" esp8266 ; then PATH=$(readlink -f ../xtensa-lx106-elf/bin):$PATH; fi
@@ -89,7 +84,7 @@ before_script:
8984
script:
9085
# Build mpy-cross first because other builds depend on it.
9186
- echo 'Building mpy-cross' && echo 'travis_fold:start:mpy-cross'
92-
- make -C mpy-cross -j2 ; echo $? > status
87+
- make -C mpy-cross -j2 ; S=$? ; echo $S > status ; (exit $S)
9388
- echo 'travis_fold:end:mpy-cross' && tools/print_status.py status
9489

9590
# Use unbuffered output because building all the releases can take a long time.
@@ -98,7 +93,7 @@ script:
9893
- cd ..
9994

10095
- 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
96+
- (! var_search "${TRAVIS_TESTS-}" unix || (make -C ports/unix deplibs -j2 && make -C ports/unix -j2 && make -C ports/unix coverage -j2)) ; S=$? ; echo $S > status ; (exit $S)
10297
- echo 'travis_fold:end:unix' && tools/print_status.py status
10398

10499
# run tests without coverage info
@@ -107,27 +102,27 @@ script:
107102

108103
# run tests with coverage info
109104
- 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
105+
- (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1)) ; S=$? ; echo $S > status ; (exit $S)
111106
- echo 'travis_fold:end:test_all' && tools/print_status.py status
112107

113108
- 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
109+
- (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 -d thread)) ; S=$? ; echo $S > status ; (exit $S)
115110
- echo 'travis_fold:end:test_threads' && tools/print_status.py status
116111

117112
- 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
113+
- (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --emit native)) ; S=$? ; echo $S > status ; (exit $S)
119114
- echo 'travis_fold:end:test_native' && tools/print_status.py status
120115

121116
- (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
117+
- (! 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)) ; S=$? ; echo $S > status ; (exit $S)
123118
- echo 'travis_fold:end:test_mpy' && tools/print_status.py status
124119

125120
- (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
121+
- (! var_search "${TRAVIS_TESTS-}" docs || sphinx-build -E -W -b html . _build/html) ; S=$? ; echo $S > status ; (exit $S)
127122
- echo 'travis_fold:end:build_docs' && tools/print_status.py status
128123

129124
- (echo 'Building translations' && echo 'travis_fold:start:build_translations')
130-
- (! var_search "${TRAVIS_TESTS-}" translations || make check-translate) ; echo $? >status
125+
- (! var_search "${TRAVIS_TESTS-}" translations || make check-translate) ; S=$? ; echo $S > status ; (exit $S)
131126
- echo 'travis_fold:end:build_translations' && tools/print_status.py status
132127

133128
# run coveralls coverage analysis (try to, even if some builds/tests failed)

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,10 +194,10 @@ pseudoxml:
194194
all-source:
195195

196196
locale/circuitpython.pot: all-source
197-
find . -iname "*.c" | xargs xgettext -L C --keyword=translate -F -o circuitpython.pot -p locale
197+
find . -iname "*.c" | xargs xgettext -L C -s --add-location=file --keyword=translate -o circuitpython.pot -p locale
198198

199199
translate: locale/circuitpython.pot
200-
for po in $(shell ls locale/*.po); do msgmerge -U -F $$po locale/circuitpython.pot; done
200+
for po in $(shell ls locale/*.po); do msgmerge -U $$po -s --no-fuzzy-matching --add-location=file locale/circuitpython.pot; done
201201

202202
check-translate: locale/circuitpython.pot $(wildcard locale/*.po)
203203
$(PYTHON) tools/check_translations.py $^

‎README.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ Behavior
157157
API
158158
~~~
159159

160-
- Unified hardware APIs: `audioio <https://circuitpython.readthedocs.io/en/latest/shared-bindings/audioio/__init__.html>`_, `analogio <https://circuitpython.readthedocs.io/en/latest/shared-bindings/analogio/__init__.html>`_, `busio <https://circuitpython.readthedocs.io/en/latest/shared-bindings/busio/__init__.html>`_, `digitalio <https://circuitpython.readthedocs.io/en/latest/shared-bindings/digitalio/__init__.html>`_, `pulseio <https://circuitpython.readthedocs.io/en/latest/shared-bindings/pulseio/__init__.html>`_, `touchio <https://circuitpython.readthedocs.io/en/latest/shared-bindings/touchio/__init__.html>`_, `microcontroller <https://circuitpython.readthedocs.io/en/latest/shared-bindings/microcontroller/__init__.html>`_, `board <https://circuitpython.readthedocs.io/en/latest/shared-bindings/board/__init__.html>`_, `bitbangio <https://circuitpython.readthedocs.io/en/latest/shared-bindings/bitbangio/__init__.html>`_
160+
- Unified hardware APIs: `audioio <https://circuitpython.readthedocs.io/en/latest/shared-bindings/audioio/__init__.html>`_, `analogio <https://circuitpython.readthedocs.io/en/latest/shared-bindings/analogio/__init__.html>`_, `bleio <https://circuitpython.readthedocs.io/en/latest/shared-bindings/bleio/__init__.html>`_, `busio <https://circuitpython.readthedocs.io/en/latest/shared-bindings/busio/__init__.html>`_, `digitalio <https://circuitpython.readthedocs.io/en/latest/shared-bindings/digitalio/__init__.html>`_, `pulseio <https://circuitpython.readthedocs.io/en/latest/shared-bindings/pulseio/__init__.html>`_, `touchio <https://circuitpython.readthedocs.io/en/latest/shared-bindings/touchio/__init__.html>`_, `microcontroller <https://circuitpython.readthedocs.io/en/latest/shared-bindings/microcontroller/__init__.html>`_, `board <https://circuitpython.readthedocs.io/en/latest/shared-bindings/board/__init__.html>`_, `bitbangio <https://circuitpython.readthedocs.io/en/latest/shared-bindings/bitbangio/__init__.html>`_
161161
- No ``machine`` API on Atmel SAMD21 port.
162162

163163
Modules
@@ -271,6 +271,6 @@ project.
271271
.. |Doc Status| image:: https://readthedocs.org/projects/circuitpython/badge/?version=latest
272272
:target: http://circuitpython.readthedocs.io/
273273
.. |Discord| image:: https://img.shields.io/discord/327254708534116352.svg
274-
:target: https://discord.gg/nBQh6qu
274+
:target: https://adafru.it/discord
275275
.. |License| image:: https://github.com/adafruit/circuitpython/blob/master/logo/license-MIT-brightgreen.svg
276276
:target: https://opensource.org/licenses/MIT

‎docs/design_guide.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -500,6 +500,8 @@ properties.
500500
+-----------------------+-----------------------+-------------------------------------------------------------------------+
501501
| ``value`` | int | 16-bit Analog value, unit-less |
502502
+-----------------------+-----------------------+-------------------------------------------------------------------------+
503+
| ``weight`` | float | grams (g) |
504+
+-----------------------+-----------------------+-------------------------------------------------------------------------+
503505

504506
Adding native modules
505507
--------------------------------------------------------------------------------

0 commit comments

Comments
 (0)