Skip to content

Commit 9939d0c

Browse files
sommersoftsommersoft
committed
Merge branch 'master' of https://github.com/adafruit/circuitpython into mixer_voice
2 parents a498bcd + 366fdcc commit 9939d0c

652 files changed

Lines changed: 66071 additions & 7746 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: 5 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
######################
@@ -66,3 +69,5 @@ TAGS
6669
# POEdit mo files
6770
####################
6871
*.mo
72+
73+
.vscode

‎.gitmodules‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
[submodule "lib/libffi"]
66
path = lib/libffi
77
url = https://github.com/atgreen/libffi
8-
[submodule "lib/lwip"]
9-
path = lib/lwip
10-
url = https://git.savannah.gnu.org/r/lwip.git
118
[submodule "lib/berkeley-db-1.xx"]
129
path = lib/berkeley-db-1.xx
1310
url = https://github.com/pfalcon/berkeley-db-1.xx
@@ -95,3 +92,9 @@
9592
[submodule "frozen/pew-pewpew-standalone-10.x"]
9693
path = frozen/pew-pewpew-standalone-10.x
9794
url = https://github.com/pewpew-game/pew-pewpew-standalone-10.x.git
95+
[submodule "frozen/circuitpython-stage"]
96+
path = frozen/circuitpython-stage
97+
url = https://github.com/python-ugame/circuitpython-stage.git
98+
[submodule "ports/stm32f4/stm32f4"]
99+
path = ports/stm32f4/stm32f4
100+
url = https://github.com/adafruit/stm32f4.git

‎.readthedocs.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,10 @@
1+
# .readthedocs.yml
2+
# Read the Docs configuration file
3+
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
4+
5+
version: 2
6+
17
python:
28
version: 3
9+
install:
10+
- requirements: docs/requirements.txt

‎.travis.yml‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,28 @@ 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 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" TRAVIS_SDK=arm
26-
- TRAVIS_BOARDS="feather_radiofruit_zigbee gemma_m0 hallowing_m0_express itsybitsy_m0_express itsybitsy_m4_express meowmeow sam32" 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 sparkfun_samd21_mini sparkfun_samd21_dev" TRAVIS_SDK=arm
24+
- TRAVIS_TESTS="unix docs translations website" TRAVIS_BOARDS="trinket_m0_haxpress 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
25+
- 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 datum_distance pyruler" TRAVIS_SDK=arm
26+
- TRAVIS_BOARDS="cp32-m4 feather_radiofruit_zigbee gemma_m0 hallowing_m0_express itsybitsy_m0_express itsybitsy_m4_express meowmeow sam32 uchip escornabot_makech pygamer_advance datum_imu" TRAVIS_SDK=arm
27+
- TRAVIS_BOARDS="feather_m0_supersized feather_m0_express_crickit feather_m0_rfm69 feather_m0_rfm9x feather_m4_express arduino_zero arduino_mkr1300 arduino_mkrzero pewpew10 kicksat-sprite ugame10 robohatmm1_m0 robohatmm1_m4 datum_light" TRAVIS_SDK=arm
28+
- TRAVIS_BOARDS="datalore_ip_m4 circuitplayground_express_crickit feather_m0_adalogger feather_m0_basic feather_m0_express catwan_usbstick pyportal sparkfun_samd21_mini sparkfun_samd21_dev pybadge pybadge_airlift datum_weather" TRAVIS_SDK=arm
2929

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

36+
# Some deploy jobs take over 10 minutes so use this keep alive hack to make sure Travis doesn't kill us.
37+
before_deploy: |
38+
function keep_alive() {
39+
while true; do
40+
echo -en "\a"
41+
sleep 5
42+
done
43+
}
44+
keep_alive &
45+
3646
deploy:
3747
provider: releases
3848
api_key:
@@ -61,7 +71,6 @@ before_script:
6171
- function var_search () { case "$1" in *$2*) true;; *) false;; esac; }
6272
- sudo dpkg --add-architecture i386
6373

64-
6574
- (! 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))
6675

6776
# For huzzah builds
@@ -70,11 +79,16 @@ before_script:
7079

7180
# For coverage testing (upgrade is used to get latest urllib3 version)
7281
- sudo apt-get install -y python3-pip
73-
- pip3 install --user sh click
82+
- pip3 install --user sh click setuptools
7483
- ([[ -z "$TRAVIS_TESTS" ]] || sudo pip install --upgrade cpp-coveralls)
75-
- (! var_search "${TRAVIS_TESTS-}" docs || pip install --user Sphinx sphinx-rtd-theme recommonmark)
84+
- (! var_search "${TRAVIS_TESTS-}" docs || sudo apt-get install -y librsvg2-bin)
85+
- (! var_search "${TRAVIS_TESTS-}" docs || pip3 install --user Sphinx sphinx-rtd-theme recommonmark sphinxcontrib-svg2pdfconverter)
7686
- (! var_search "${TRAVIS_TESTS-}" translations || pip3 install --user polib)
7787

88+
# Check if there's any board missing in TRAVIS_BOARDS
89+
- cd tools && python3 -u travis_new_boards_check.py
90+
- cd ..
91+
7892
# report some good version numbers to the build
7993
- gcc --version
8094
- (! var_search "${TRAVIS_SDK-}" arm || arm-none-eabi-gcc --version)

‎CONTRIBUTING.md‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,15 @@ If you have an employment contract with your employer please make sure that they
1414
don't automatically own your work product. Make sure to get any necessary approvals
1515
before contributing. Another term for this contribution off-hours is moonlighting.
1616

17-
## Getting started
17+
## Ways to contribute
18+
As CircuitPython grows, there are more and more ways to contribute. Here are some ideas:
19+
20+
* Build a project with CircuitPython and share how to do it online.
21+
* Test the latest libraries and CircuitPython versions with your projects and file issues for any bugs you find.
22+
* Contribute Python code to CircuitPython libraries that support new devices or features of an existing device.
23+
* Contribute C code to CircuitPython which fixes an open issue or adds a new feature.
24+
25+
## Getting started with C
1826
CircuitPython developer Dan Halbert (@dhalbert) has written up build instructions using native build
1927
tools [here](https://learn.adafruit.com/building-circuitpython).
2028

‎Makefile‎

Lines changed: 22 additions & 4 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/)
@@ -29,7 +36,9 @@ ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(BASEOPTS)
2936
# the i18n builder cannot share the environment and doctrees with the others
3037
I18NSPHINXOPTS = $(BASEOPTS)
3138

32-
.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
39+
TRANSLATE_SOURCES = extmod lib main.c ports/atmel-samd ports/nrf py shared-bindings shared-module supervisor
40+
41+
.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext stubs
3342

3443
help:
3544
@echo "Please use \`make <target>' where <target> is one of"
@@ -58,6 +67,7 @@ help:
5867

5968
clean:
6069
rm -rf $(BUILDDIR)/*
70+
rm -rf $(STUBDIR) $(DISTDIR) *.egg-info
6171

6272
html:
6373
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
@@ -194,10 +204,18 @@ pseudoxml:
194204
all-source:
195205

196206
locale/circuitpython.pot: all-source
197-
find . -iname "*.c" | xargs xgettext -L C -s --no-location --keyword=translate -o circuitpython.pot -p locale
207+
find $(TRANSLATE_SOURCES) -iname "*.c" -print0 | (LC_ALL=C sort -z) | xargs -0 xgettext -L C -s --add-location=file --keyword=translate -o circuitpython.pot -p locale
198208

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

202212
check-translate: locale/circuitpython.pot $(wildcard locale/*.po)
203213
$(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

0 commit comments

Comments
 (0)