Skip to content

Commit c010cc2

Browse files
authored
Merge pull request #1 from adafruit/main
Merged main to fork
2 parents 36ef347 + debbf10 commit c010cc2

File tree

823 files changed

+18419
-5547
lines changed

Some content is hidden

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

823 files changed

+18419
-5547
lines changed

.gitattributes

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# SPDX-FileCopyrightText: 2014 MicroPython & CircuitPython contributors (https://github.com/adafruit/circuitpython/graphs/contributors)
2+
#
3+
# SPDX-License-Identifier: MIT
4+
15
# Per default everything gets normalized and gets LF line endings on checkout.
26
* text eol=lf
37

.github/workflows/build.yml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# SPDX-FileCopyrightText: 2014 MicroPython & CircuitPython contributors (https://github.com/adafruit/circuitpython/graphs/contributors)
2+
#
3+
# SPDX-License-Identifier: MIT
4+
15
name: Build CI
26

37
on:
@@ -22,7 +26,9 @@ jobs:
2226
fetch-depth: 0
2327
- run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
2428
- name: CircuitPython version
25-
run: git describe --dirty --tags
29+
run: |
30+
git describe --dirty --tags
31+
echo "::set-env name=CP_VERSION::$(git describe --dirty --tags)"
2632
- name: Set up Python 3.8
2733
uses: actions/setup-python@v1
2834
with:
@@ -31,7 +37,7 @@ jobs:
3137
run: |
3238
sudo apt-get install -y eatmydata
3339
sudo eatmydata apt-get install -y gettext librsvg2-bin mingw-w64
34-
pip install requests sh click setuptools cpp-coveralls "Sphinx<4" sphinx-rtd-theme recommonmark sphinx-autoapi sphinxcontrib-svg2pdfconverter polib pyyaml astroid
40+
pip install requests sh click setuptools cpp-coveralls "Sphinx<4" sphinx-rtd-theme recommonmark sphinx-autoapi sphinxcontrib-svg2pdfconverter polib pyyaml astroid isort black
3541
- name: Versions
3642
run: |
3743
gcc --version
@@ -68,7 +74,7 @@ jobs:
6874
name: stubs
6975
path: circuitpython-stubs*
7076
- name: Docs
71-
run: sphinx-build -E -W -b html . _build/html
77+
run: sphinx-build -E -W -b html -D version=${{ env.CP_VERSION }} -D release=${{ env.CP_VERSION }} . _build/html
7278
- uses: actions/upload-artifact@v2
7379
with:
7480
name: docs
@@ -147,6 +153,7 @@ jobs:
147153
- "arduino_zero"
148154
- "bast_pro_mini_m0"
149155
- "bdmicro_vina_m0"
156+
- "bless_dev_board_multi_sensor"
150157
- "capablerobot_usbhub"
151158
- "catwan_usbstick"
152159
- "circuitbrains_basic_m0"
@@ -188,6 +195,7 @@ jobs:
188195
- "hallowing_m0_express"
189196
- "hallowing_m4_express"
190197
- "hiibot_bluefi"
198+
- "ikigaisense_vita"
191199
- "imxrt1010_evk"
192200
- "imxrt1020_evk"
193201
- "imxrt1060_evk"
@@ -196,6 +204,8 @@ jobs:
196204
- "itsybitsy_nrf52840_express"
197205
- "kicksat-sprite"
198206
- "loc_ber_m4_base_board"
207+
- "makerdiary_m60_keyboard"
208+
- "makerdiary_nrf52840_m2_devkit"
199209
- "makerdiary_nrf52840_mdk"
200210
- "makerdiary_nrf52840_mdk_usb_dongle"
201211
- "meowbit_v121"
@@ -207,6 +217,7 @@ jobs:
207217
- "mini_sam_m4"
208218
- "monster_m4sk"
209219
- "ndgarage_ndbit6"
220+
- "ndgarage_ndbit6_v2"
210221
- "nfc_copy_cat"
211222
- "nice_nano"
212223
- "nucleo_f746zg"
@@ -236,6 +247,7 @@ jobs:
236247
- "pyportal"
237248
- "pyportal_titano"
238249
- "pyruler"
250+
- "raytac_mdbt50q-db-40"
239251
- "robohatmm1_m4"
240252
- "sam32"
241253
- "same54_xplained"
@@ -264,6 +276,7 @@ jobs:
264276
- "teensy41"
265277
- "teknikio_bluebird"
266278
- "thunderpack"
279+
- "tinkeringtech_scoutmakes_azul"
267280
- "trellis_m4_express"
268281
- "trinket_m0"
269282
- "trinket_m0_haxpress"
@@ -370,6 +383,7 @@ jobs:
370383
board:
371384
- "espressif_saola_1_wroom"
372385
- "espressif_saola_1_wrover"
386+
- "unexpectedmaker_feathers2"
373387

374388
steps:
375389
- name: Set up Python 3.8

.github/workflows/create_website_pr.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# SPDX-FileCopyrightText: 2014 MicroPython & CircuitPython contributors (https://github.com/adafruit/circuitpython/graphs/contributors)
2+
#
3+
# SPDX-License-Identifier: MIT
4+
15
name: Update CircuitPython.org
26

37
on:

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# SPDX-FileCopyrightText: 2014 MicroPython & CircuitPython contributors (https://github.com/adafruit/circuitpython/graphs/contributors)
2+
#
3+
# SPDX-License-Identifier: MIT
4+
15
# Compiled Sources
26
###################
37
*.o

.gitmodules

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# SPDX-FileCopyrightText: 2014 MicroPython & CircuitPython contributors (https://github.com/adafruit/circuitpython/graphs/contributors)
2+
#
3+
# SPDX-License-Identifier: MIT
4+
15
[submodule "lib/axtls"]
26
path = lib/axtls
37
url = https://github.com/pfalcon/axtls

.mailmap

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
# SPDX-FileCopyrightText: 2020 Diego Elio Pettenò
2+
#
3+
# SPDX-License-Identifier: Unlicense
4+
5+
Alexander Steffen <[email protected]>
6+
7+
8+
Benjamin Vernoux <[email protected]>
9+
Brent Rubell <[email protected]>
10+
11+
12+
13+
Chris Packham <[email protected]>
14+
15+
Damiano Mazzella <[email protected]>
16+
Damien George <[email protected]>
17+
Dan Halbert <[email protected]>
18+
19+
Daniel Pollard <[email protected]>
20+
21+
Daniel Tralamazza <[email protected]>
22+
23+
David Glaude <[email protected]>
24+
25+
George Waters <[email protected]>
26+
27+
28+
Henrik Sölver <[email protected]>
29+
Ilya Dmitrichenko <[email protected]>
30+
31+
Jason Pecor <[email protected]>
32+
Jeff Epler <[email protected]>
33+
34+
35+
36+
Jerry Needell <[email protected]>
37+
Joe Bakalor <[email protected]>
38+
Josh Klar <[email protected]>
39+
40+
Juan Biondi <[email protected]>
41+
42+
KalbeAbbas <[email protected]>
43+
KalbeAbbas <[email protected]> <kalbeabbas@[email protected]>
44+
Kamil Tomaszewski <[email protected]>
45+
46+
47+
Kattni Rembor <[email protected]>
48+
49+
50+
Kevin Townsend <[email protected]>
51+
52+
Krzysztof Blazewicz <[email protected]>
53+
Krzysztof Blazewicz <[email protected]> <[email protected]>
54+
Li Weiwei <[email protected]>
55+
56+
Limor "Ladyada" Fried <[email protected]>
57+
Limor "Ladyada" Fried <[email protected]> <ladyada>
58+
Lucian Copeland <[email protected]>
59+
60+
Mark Olsson <[email protected]>
61+
62+
Matt Land <[email protected]>
63+
64+
Matt Wozniski <[email protected]>
65+
66+
Melissa LeBlanc-Williams <[email protected]>
67+
Melissa LeBlanc-Williams <[email protected]> <[email protected]>
68+
Metallicow <[email protected]>
69+
70+
Peter Hinch <[email protected]>
71+
72+
Radomir Dopieralski <[email protected]>
73+
Radomir Dopieralski <[email protected]> <[email protected]>
74+
Rafa Gould <[email protected]>
75+
76+
Ryan Shaw <[email protected]>
77+
78+
79+
80+
81+
Scott Shawcroft <[email protected]>
82+
83+
84+
85+
86+
Sebastian Plamauer <[email protected]>
87+
Sebastian Plamauer <[email protected]> <[email protected]>
88+
89+
90+
Stewart Colborne <[email protected]>
91+
92+
TG-Techie <[email protected]>
93+
94+
Thea Flowers <[email protected]>
95+
96+
Tobias Badertscher <[email protected]>
97+
Tobias Badertscher <[email protected]> <[email protected]>
98+
danicampora <[email protected]>
99+
100+
101+
102+
dherrada <[email protected]> <=>
103+
104+
105+
106+
siddacious <[email protected]>
107+
108+
109+
sommersoft <[email protected]>
110+
111+
112+

.readthedocs.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# SPDX-FileCopyrightText: 2014 MicroPython & CircuitPython contributors (https://github.com/adafruit/circuitpython/graphs/contributors)
2+
#
3+
# SPDX-License-Identifier: MIT
4+
15
# .readthedocs.yml
26
# Read the Docs configuration file
37
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details

.rosie.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# SPDX-FileCopyrightText: 2014 MicroPython & CircuitPython contributors (https://github.com/adafruit/circuitpython/graphs/contributors)
2+
#
3+
# SPDX-License-Identifier: MIT
4+
15
# This configuration file tells Rosie where to find prebuilt .bin files (Travis
26
# builds them) and where to find the tests.
37

ACKNOWLEDGEMENTS.license

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
SPDX-FileCopyrightText: 2014 MicroPython & CircuitPython contributors (https://github.com/adafruit/circuitpython/graphs/contributors)
2+
3+
SPDX-License-Identifier: MIT

BUILDING.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
<!--
2+
SPDX-FileCopyrightText: 2014 MicroPython & CircuitPython contributors (https://github.com/adafruit/circuitpython/graphs/contributors)
3+
4+
SPDX-License-Identifier: MIT
5+
-->
16

27
# Building CircuitPython
38

CONTRIBUTING.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
<!--
2+
SPDX-FileCopyrightText: 2014 MicroPython & CircuitPython contributors (https://github.com/adafruit/circuitpython/graphs/contributors)
3+
4+
SPDX-License-Identifier: MIT
5+
-->
6+
17
# Contributing
28
Please note that this project is released with a
39
[Contributor Code of Conduct](https://github.com/adafruit/circuitpython/blob/main/CODE_OF_CONDUCT.md).

LICENSES/BSD-3-Clause.txt

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
Copyright (c) <year> <owner>. All rights reserved.
2+
3+
Redistribution and use in source and binary forms, with or without modification,
4+
are permitted provided that the following conditions are met:
5+
6+
1. Redistributions of source code must retain the above copyright notice,
7+
this list of conditions and the following disclaimer.
8+
9+
2. Redistributions in binary form must reproduce the above copyright notice,
10+
this list of conditions and the following disclaimer in the documentation
11+
and/or other materials provided with the distribution.
12+
13+
3. Neither the name of the copyright holder nor the names of its contributors
14+
may be used to endorse or promote products derived from this software without
15+
specific prior written permission.
16+
17+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
18+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
19+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
20+
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
21+
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
23+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
24+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
25+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
26+
USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

0 commit comments

Comments
 (0)