Skip to content

Commit 0084f0a

Browse files
authored
Merge pull request #2 from adafruit/master
Master
2 parents 9aebe2f + 4d7b9cd commit 0084f0a

File tree

2,920 files changed

+201166
-263699
lines changed

Some content is hidden

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

2,920 files changed

+201166
-263699
lines changed

.github/workflows/build.yml

+446
Large diffs are not rendered by default.
+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: Update CircuitPython.org
2+
3+
on:
4+
release:
5+
types: [published]
6+
7+
jobs:
8+
website:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Dump GitHub context
12+
env:
13+
GITHUB_CONTEXT: ${{ toJson(github) }}
14+
run: echo "$GITHUB_CONTEXT"
15+
- name: Set up Python 3.8
16+
uses: actions/setup-python@v1
17+
with:
18+
python-version: 3.8
19+
- name: Install deps
20+
run: |
21+
pip install requests sh click
22+
- name: Versions
23+
run: |
24+
gcc --version
25+
python3 --version
26+
- uses: actions/checkout@v2
27+
with:
28+
submodules: true
29+
fetch-depth: 0
30+
- run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
31+
- run: git submodule foreach git fetch --recurse-submodules=no origin +refs/tags/*:refs/tags/*
32+
- name: CircuitPython version
33+
run: git describe --dirty --tags
34+
- name: Website
35+
run: python3 build_board_info.py
36+
working-directory: tools
37+
env:
38+
RELEASE_TAG: ${{ github.event.release.tag_name }}
39+
ADABOT_GITHUB_ACCESS_TOKEN: ${{ secrets.BLINKA_GITHUB_ACCESS_TOKEN }}
40+
if: github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested')

.github/workflows/pre-commit.yml

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# SPDX-FileCopyrightText: Copyright (c) 2019 Anthony Sottile
2+
#
3+
# SPDX-License-Identifier: MIT
4+
5+
name: pre-commit
6+
7+
on:
8+
pull_request:
9+
push:
10+
branches: [master]
11+
12+
jobs:
13+
pre-commit:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: actions/checkout@v1
17+
- uses: actions/setup-python@v1
18+
- name: set PY
19+
run: echo "::set-env name=PY::$(python -c 'import hashlib, sys;print(hashlib.sha256(sys.version.encode()+sys.executable.encode()).hexdigest())')"
20+
- uses: actions/cache@v1
21+
with:
22+
path: ~/.cache/pre-commit
23+
key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
24+
- uses: pre-commit/[email protected]

.gitignore

+9
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
# Packages
1414
############
15+
dist/
16+
*.egg-info
17+
.eggs
1518

1619
# Logs and Databases
1720
######################
@@ -25,6 +28,7 @@
2528
######################
2629
build/
2730
bin/
31+
circuitpython-stubs/
2832

2933
# Test failure outputs
3034
######################
@@ -48,6 +52,7 @@ _build
4852
# Generated rst files
4953
######################
5054
genrst/
55+
/autoapi/
5156

5257
# ctags and similar
5358
###################
@@ -62,7 +67,11 @@ TAGS
6267
*~
6368

6469
*.DS_Store
70+
**/*.DS_Store
71+
*.icloud
6572

6673
# POEdit mo files
6774
####################
6875
*.mo
76+
77+
.vscode

.gitmodules

+66-9
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
@@ -32,10 +29,6 @@
3229
[submodule "tools/python-semver"]
3330
path = tools/python-semver
3431
url = https://github.com/k-bx/python-semver.git
35-
[submodule "lib/stm32lib"]
36-
path = lib/stm32lib
37-
url = https://github.com/micropython/stm32lib
38-
branch = work-F4-1.13.1+F7-1.5.0+L4-1.3.0
3932
[submodule "atmel-samd/asf4"]
4033
path = ports/atmel-samd/asf4
4134
url = https://github.com/adafruit/asf4.git
@@ -78,11 +71,75 @@
7871
url = https://github.com/adafruit/nrfx.git
7972
[submodule "lib/tinyusb"]
8073
path = lib/tinyusb
81-
url = https://github.com/tannewt/tinyusb.git
82-
branch = develop
74+
url = https://github.com/hathach/tinyusb.git
75+
branch = master
76+
fetchRecurseSubmodules = false
8377
[submodule "tools/huffman"]
8478
path = tools/huffman
8579
url = https://github.com/tannewt/huffman.git
8680
[submodule "tools/adabot"]
8781
path = tools/adabot
8882
url = https://github.com/adafruit/adabot.git
83+
[submodule "tools/bitmap_font"]
84+
path = tools/bitmap_font
85+
url = https://github.com/adafruit/Adafruit_CircuitPython_BitmapFont.git
86+
[submodule "tools/Tecate-bitmap-fonts"]
87+
path = tools/Tecate-bitmap-fonts
88+
url = https://github.com/Tecate/bitmap-fonts.git
89+
[submodule "frozen/pew-pewpew-standalone-10.x"]
90+
path = frozen/pew-pewpew-standalone-10.x
91+
url = https://github.com/pewpew-game/pew-pewpew-standalone-10.x.git
92+
[submodule "frozen/circuitpython-stage"]
93+
path = frozen/circuitpython-stage
94+
url = https://github.com/python-ugame/circuitpython-stage.git
95+
[submodule "ports/cxd56/spresense-exported-sdk"]
96+
path = ports/cxd56/spresense-exported-sdk
97+
url = https://github.com/sonydevworld/spresense-exported-sdk.git
98+
[submodule "frozen/Adafruit_CircuitPython_SD"]
99+
path = frozen/Adafruit_CircuitPython_SD
100+
url = https://github.com/adafruit/Adafruit_CircuitPython_SD.git
101+
[submodule "lib/mp3"]
102+
path = lib/mp3
103+
url = https://github.com/adafruit/Adafruit_MP3
104+
[submodule "ports/mimxrt10xx/sdk"]
105+
path = ports/mimxrt10xx/sdk
106+
url = https://github.com/adafruit/MIMXRT10xx_SDK
107+
[submodule "frozen/Adafruit_CircuitPython_Register"]
108+
path = frozen/Adafruit_CircuitPython_Register
109+
url = https://github.com/adafruit/Adafruit_CircuitPython_Register.git
110+
[submodule "extmod/ulab"]
111+
path = extmod/ulab
112+
url = https://github.com/v923z/micropython-ulab
113+
[submodule "frozen/Adafruit_CircuitPython_ESP32SPI"]
114+
path = frozen/Adafruit_CircuitPython_ESP32SPI
115+
url = https://github.com/adafruit/Adafruit_CircuitPython_ESP32SPI
116+
[submodule "frozen/Adafruit_CircuitPython_Requests"]
117+
path = frozen/Adafruit_CircuitPython_Requests
118+
url = https://github.com/adafruit/Adafruit_CircuitPython_Requests
119+
[submodule "ports/stm/st_driver"]
120+
path = ports/stm/st_driver
121+
url = https://github.com/hathach/st_driver.git
122+
[submodule "lib/protomatter"]
123+
path = lib/protomatter
124+
url = https://github.com/adafruit/Adafruit_Protomatter
125+
[submodule "frozen/Adafruit_CircuitPython_LSM6DS"]
126+
path = frozen/Adafruit_CircuitPython_LSM6DS
127+
url = https://github.com/adafruit/Adafruit_CircuitPython_LSM6DS
128+
[submodule "frozen/Adafruit_CircuitPython_FocalTouch"]
129+
path = frozen/Adafruit_CircuitPython_FocalTouch
130+
url = https://github.com/adafruit/Adafruit_CircuitPython_FocalTouch
131+
[submodule "frozen/Adafruit_CircuitPython_DS3231"]
132+
path = frozen/Adafruit_CircuitPython_DS3231
133+
url = https://github.com/adafruit/Adafruit_CircuitPython_DS3231
134+
[submodule "frozen/Adafruit_CircuitPython_DRV2605"]
135+
path = frozen/Adafruit_CircuitPython_DRV2605
136+
url = https://github.com/adafruit/Adafruit_CircuitPython_DRV2605
137+
[submodule "frozen/Adafruit_CircuitPython_BLE"]
138+
path = frozen/Adafruit_CircuitPython_BLE
139+
url = https://github.com/adafruit/Adafruit_CircuitPython_BLE
140+
[submodule "frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center"]
141+
path = frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center
142+
url = https://github.com/adafruit/Adafruit_CircuitPython_BLE_Apple_Notification_Center
143+
[submodule "ports/esp32s2/esp-idf"]
144+
path = ports/esp32s2/esp-idf
145+
url = https://github.com/tannewt/esp-idf.git

.pre-commit-config.yaml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# SPDX-FileCopyrightText: 2020 Diego Elio Pettenò
2+
#
3+
# SPDX-License-Identifier: Unlicense
4+
5+
repos:
6+
- repo: https://github.com/pre-commit/pre-commit-hooks
7+
rev: v2.3.0
8+
hooks:
9+
- id: check-yaml
10+
- id: end-of-file-fixer
11+
exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*)'
12+
- id: trailing-whitespace
13+
exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*)'

.readthedocs.yml

+8
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

-137
This file was deleted.

0 commit comments

Comments
 (0)