Skip to content

Commit e232ec1

Browse files
hierophecthierophect
authored
Merge branch 'main' into stm32-timer-allocator
2 parents 138189b + 05a10f7 commit e232ec1

File tree

563 files changed

+3501
-2494
lines changed

Some content is hidden

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

563 files changed

+3501
-2494
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: 13 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
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"
@@ -196,6 +203,8 @@ jobs:
196203
- "itsybitsy_nrf52840_express"
197204
- "kicksat-sprite"
198205
- "loc_ber_m4_base_board"
206+
- "makerdiary_m60_keyboard"
207+
- "makerdiary_nrf52840_m2_devkit"
199208
- "makerdiary_nrf52840_mdk"
200209
- "makerdiary_nrf52840_mdk_usb_dongle"
201210
- "meowbit_v121"
@@ -265,6 +274,7 @@ jobs:
265274
- "teensy41"
266275
- "teknikio_bluebird"
267276
- "thunderpack"
277+
- "tinkeringtech_scoutmakes_azul"
268278
- "trellis_m4_express"
269279
- "trinket_m0"
270280
- "trinket_m0_haxpress"

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

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

0 commit comments

Comments
 (0)