8000 Merge pull request #1 from adafruit/master · adafruit/circuitpython@025852c · GitHub
[go: up one dir, main page]
Skip to content

Commit 025852c

Browse files
chaleichalei
authored
Merge pull request #1 from adafruit/master
update from original
2 parents 57c2c41 + 172311f commit 025852c

File tree

122 files changed

+3843
-1793
lines changed

Some content is hidden

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

122 files changed

+3843
-1793
lines changed

‎.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
url = https://github.com/adafruit/nrfx.git
7979
[submodule "lib/tinyusb"]
8080
path = lib/tinyusb
81-
url = https://github.com/tannewt/tinyusb.git
81+
url = https://github.com/hathach/tinyusb.git
8282
branch = develop
8383
[submodule "tools/huffman"]
8484
path = tools/huffman

‎.travis.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ 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 grandcentral_m4_express pca10056 pca10059 feather_nrf52832 feather_nrf52840_express makerdiary_nrf52840_mdk" TRAVIS_SDK=arm:nrf:esp8266
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
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
27-
- TRAVIS_BOARDS="feather_m0_express_crickit feather_m0_rfm69 feather_m0_rfm9x feather_m4_express arduino_zero arduino_mkr1300" TRAVIS_SDK=arm
28-
- TRAVIS_BOARDS="circuitplayground_express_crickit feather_m0_adalogger feather_m0_basic feather_m0_express catwan_usbstick" 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
2929

3030
addons:
3131
artifacts:
@@ -37,8 +37,8 @@ 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="
40-
file:
41-
- $(ls -d1 bin/*/* | tr "\n" ":")
40+
file_glob: true
41+
file: "$TRAVIS_BUILD_DIR/bin/*/*"
4242
skip_cleanup: true
4343
draft: true
4444
on:
@@ -92,7 +92,9 @@ script:
9292
- make -C mpy-cross -j2
9393
- echo -en 'travis_fold:end:mpy-cross\\r'
9494

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

98100
- echo 'Building unix' && echo -en 'travis_fold:start:unix\\r'

‎README.rst

Lines changed: 11 additions & 5 deletions
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>`__ \|
@@ -60,13 +62,15 @@ Other
6062
supported using the `Adafruit CircuitPython SD
6163
library <https://github.com/adafruit/Adafruit_CircuitPython_SD>`__)
6264
- `Arduino Zero <https://www.arduino.cc/en/Main/ArduinoBoardZero>`__
65+
- `Arduino MKR Zero <https://store.arduino.cc/arduino-mkrzero>`__ (MicroSD card
66+
supported using the `Adafruit CircuitPython SD
67+
library <https://github.com/adafruit/Adafruit_CircuitPython_SD>`__)
6368

6469
"Third-party" or "non-Adafruit" boards
6570
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
6671

6772
- `Electronic Cats Meow Meow <https://electroniccats.com/gomeow/>`__
68-
- `Electronic Cats CatWAN USB Stick <https://electroniccats.com/producto/catwan_usb_stick/>`__
69-
73+
- `Electronic Cats CatWAN USB Stick <https://electroniccats.com/producto/catwan_usb_stick/>`__
7074

7175
Download
7276
--------
@@ -207,7 +211,7 @@ amongst ports including CircuitPython:
207211
- ``extmod`` Shared C code used in multiple ports' modules.
208212
- ``lib`` Shared core C code including externally developed libraries
209213
such as FATFS.
210-
- ``logo`` The MicroPython logo.
214+
- ``logo`` The CircuitPython logo.
211215
- ``mpy-cross`` A cross compiler that converts Python files to byte
212216
code prior to being run in MicroPython. Useful for reducing library
213217
size.
@@ -262,9 +266,11 @@ project.
262266

263267
`⬆ back to top <#adafruit-circuitpython>`__
264268

265-
.. |Build Status| image:: https://travis-ci.org/adafruit/circuitpython.svg?branch=master
269+
.. |Build Status| image:: https://travis-ci.com/adafruit/circuitpython.svg?branch=master
266270
:target: https://travis-ci.org/adafruit/circuitpython
267271
.. |Doc Status| image:: https://readthedocs.org/projects/circuitpython/badge/?version=latest
268272
:target: http://circuitpython.readthedocs.io/
269273
.. |Discord| image:: https://img.shields.io/discord/327254708534116352.svg
270274
: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

‎lib/tinyusb

0 commit comments

Comments
 (0)
0