Skip to content

Commit f58446e

Browse files
tannewttannewt
authored
Merge branch 'master' into master
2 parents 2d30321 + 7822d01 commit f58446e

File tree

231 files changed

+34371
-3600
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

231 files changed

+34371
-3600
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,3 +66,5 @@ TAGS
6666
# POEdit mo files
6767
####################
6868
*.mo
69+
70+
.vscode

‎.gitmodules

Lines changed: 0 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

‎.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ git:
2222
# just try to make the builds "about equal in run time"
2323
env:
2424
- 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
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" TRAVIS_SDK=arm
2626
- 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
27+
- 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" 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 pybadge" TRAVIS_SDK=arm
2929

3030
addons:
3131
artifacts:

‎Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(BASEOPTS)
2929
# the i18n builder cannot share the environment and doctrees with the others
3030
I18NSPHINXOPTS = $(BASEOPTS)
3131

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

3436
help:
@@ -194,7 +196,7 @@ pseudoxml:
194196
all-source:
195197

196198
locale/circuitpython.pot: all-source
197-
find . -iname "*.c" | xargs xgettext -L C -s --add-location=file --keyword=translate -o circuitpython.pot -p locale
199+
find $(TRANSLATE_SOURCES) -iname "*.c" | xargs xgettext -L C -s --add-location=file --keyword=translate -o circuitpython.pot -p locale
198200

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

‎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
--------------------------------------------------------------------------------

‎frozen/Adafruit_CircuitPython_BusDevice

‎frozen/Adafruit_CircuitPython_HID

‎frozen/Adafruit_CircuitPython_Motor

‎frozen/Adafruit_CircuitPython_NeoPixel

‎frozen/Adafruit_CircuitPython_seesaw

‎frozen/circuitpython-stage

‎lib/lwip

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎lib/tinyusb

Submodule tinyusb updated 798 files

0 commit comments

Comments
 (0)