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 <devel.20.webmeister@spamgourmet.com>
6+
Alexander Steffen <devel.20.webmeister@spamgourmet.com> <Alexander.Steffen@infineon.com>
7+
Alexander Steffen <devel.20.webmeister@spamgourmet.com> <webmeister@users.noreply.github.com>
8+
Benjamin Vernoux <bvernoux@gmail.com>
9+
Brent Rubell <robots199@me.com>
10+
Brent Rubell <robots199@me.com> <brent@xn.home>
11+
Brent Rubell <robots199@me.com> <brentru@users.noreply.github.com>
12+
Carlos <carlos.santiago.diaz@gmail.com>
13+
Chris Packham <judge.packham@gmail.com>
14+
Chris Packham <judge.packham@gmail.com> <chris.packham@alliedtelesis.co.nz>
15+
Damiano Mazzella <damianomazzella@gmail.com>
16+
Damien George <damien.p.george@gmail.com>
17+
Dan Halbert <halbert@adafruit.com>
18+
Dan Halbert <halbert@adafruit.com> <halbert@halwitz.org>
19+
Daniel Pollard <daniel@learnweaver.com>
20+
Daniel Pollard <daniel@learnweaver.com> <daniel.pollard@learnweaver.com>
21+
Daniel Tralamazza <daniel@tralamazza.com>
22+
Daniel Tralamazza <daniel@tralamazza.com> <tralamazza@users.noreply.github.com>
23+
David Glaude <david.glaude@gmail.com>
24+
David Glaude <david.glaude@gmail.com> <dglaude@users.noreply.github.com>
25+
George Waters <gwatersdev@gmail.com>
26+
George Waters <gwatersdev@gmail.com> <george@georgeh2os.com>
27+
Ha Thach <thach@tinyusb.org>
28+
Henrik Sölver <henrik.solver@gmail.com>
29+
Ilya Dmitrichenko <errordeveloper@gmail.com>
30+
Ilya Dmitrichenko <errordeveloper@gmail.com> <ilya@xively.com>
31+
Jason Pecor <14111408+jpecor@users.noreply.github.com>
32+
Jeff Epler <jepler@gmail.com>
33+
Jeff Epler <jepler@gmail.com> <jeff@adafruit.com>
34+
Jeff Epler <jepler@gmail.com> <jepler@de11.u>
35+
Jeff Epler <jepler@gmail.com> <jepler@unpythonic.net>
36+
Jerry Needell <jerryneedell@gmail.com>
37+
Joe Bakalor <jmbakalor@gmail.com>
38+
Josh Klar <josh@klar.sh>
39+
Josh Klar <josh@klar.sh> <j@iv597.com>
40+
Juan Biondi <juanernestobiondi@gmail.com>
41+
Juan Biondi <juanernestobiondi@gmail.com> <juanernestobiondi@hotmail.com>
42+
KalbeAbbas <kalbeabbas142@gmail.com>
43+
KalbeAbbas <kalbeabbas142@gmail.com> <kalbeabbas@142@gmail.com>
44+
Kamil Tomaszewski <kamil.tomaszewski@sony.com>
45+
Kamil Tomaszewski <kamil.tomaszewski@sony.com> <46525824+kamtom480@users.noreply.github.com>
46+
Kattni <kattni@adafruit.com> <kattni@kittyfish.org>
47+
Kattni Rembor <kattni@adafruit.com>
48+
Kenny <WarriorOfWire@users.noreply.github.com>
49+
Kenny <WarriorOfWire@users.noreply.github.com> <3454741+WarriorOfWire@users.noreply.github.com>
50+
Kevin Townsend <contact@microbuilder.eu>
51+
Kevin Townsend <contact@microbuilder.eu> <microbuilder@users.noreply.github.com>
52+
Krzysztof Blazewicz <blazewicz.krzysztof@gmail.com>
53+
Krzysztof Blazewicz <blazewicz.krzysztof@gmail.com> <krzysztof.blazewicz@uxeon.com>
54+
Li Weiwei <liweiwei@yeweitech.org>
55+
Li Weiwei <liweiwei@yeweitech.org> <liweiwei@yeweitech.com>
56+
Limor "Ladyada" Fried <limor@ladyada.net>
57+
Limor "Ladyada" Fried <limor@ladyada.net> <ladyada>
58+
Lucian Copeland <hierophect@gmail.com>
59+
Lucian Copeland <hierophect@gmail.com> <hierophect@Lucians-MacBook-Air-2.local>
60+
Mark Olsson <post@markolsson.se>
61+
Mark Olsson <post@markolsson.se> <mark@markolsson.se>
62+
Matt Land <matt-land@users.noreply.github.com>
63+
Matt Land <matt-land@users.noreply.github.com> <mland@sparefoot.com>
64+
Matt Wozniski <godlygeek+git@gmail.com>
65+
Matt Wozniski <godlygeek+git@gmail.com> <mwozniski@bloomberg.net>
66+
Melissa LeBlanc-Williams <melissa@adafruit.com>
67+
Melissa LeBlanc-Williams <melissa@adafruit.com> <melissa@melissagirl.com>
68+
Metallicow <metaliobovinus@gmail.com>
69+
Metallicow <metaliobovinus@gmail.com> <edg62702@yahoo.com>
70+
Peter Hinch <peter@hinch.me.uk>
71+
Peter Hinch <peter@hinch.me.uk> <peterhinch@users.noreply.github.com>
72+
Radomir Dopieralski <openstack@sheep.art.pl>
73+
Radomir Dopieralski <openstack@sheep.art.pl> <deshipu@users.noreply.github.com>
74+
Rafa Gould <rafagoulds@gmail.com>
75+
Rafa Gould <rafagoulds@gmail.com> <50337143+rafa-gould@users.noreply.github.com>
76+
Ryan Shaw <ryan.shaw@wisetechglobal.com>
77+
Ryan Shaw <ryan.shaw@wisetechglobal.com> <ryannathans@hotmail.com>
78+
Sabas <s@electroniccats.com>
79+
Sabas <s@electroniccats.com> <s@theinventorhouse.org>
80+
Sabas <s@electroniccats.com> <sabasjimenez@gmail.com>
81+
Scott Shawcroft <scott@adafruit.com>
82+
Scott Shawcroft <scott@adafruit.com> <devnull@unpythonic.net>
83+
Scott Shawcroft <scott@adafruit.com> <scott.shawcroft@gmail.com>
84+
Scott Shawcroft <scott@adafruit.com> <scott@chickadee.tech>
85+
Scott Shawcroft <scott@adafruit.com> <scott@tannewt.org>
86+
Sebastian Plamauer <oeplse@gmail.com>
87+
Sebastian Plamauer <oeplse@gmail.com> <oepse@gmail.com>
88+
Senuros <Senuros@users.noreply.github.com>
89+
Senuros <Senuros@users.noreply.github.com> <senuros@noreply.github.com>
90+
Stewart Colborne <tscolborne@outlook.com>
91+
Stewart Colborne <tscolborne@outlook.com> <tscolborne@hotmail.com>
92+
TG-Techie <TGTechie01@gmail.com>
93+
TG-Techie <TGTechie01@gmail.com> <39284876+TG-Techie@users.noreply.github.com>
94+
Thea Flowers <me@thea.codes>
95+
Thea Flowers <me@thea.codes> <theaflowers@google.com>
96+
Tobias Badertscher <badi@baerospace.ch>
97+
Tobias Badertscher <badi@baerospace.ch> <python@baerospace.ch>
98+
danicampora <danicampora@gmail.com>
99+
danicampora <danicampora@gmail.com> <daniel@wipy.io>
100+
dherrada <dylan.herrada@gmail.com>
101+
dherrada <dylan.herrada@gmail.com> <33632497+dherrada@users.noreply.github.com>
102+
dherrada <dylan.herrada@gmail.com> <=>
103+
glennrub <glennbakke@gmail.com>
104+
retoc <retoc@users.noreply.github.com>
105+
retoc <retoc@users.noreply.github.com> <Retoc@noreply.github.com>
106+
siddacious <nospam187+github@gmail.com>
107+
siddacious <nospam187+github@gmail.com> <bsiepert@gmail.com>
108+
siddacious <nospam187+github@gmail.com> <bsiepert@lbl.gov>
109+
sommersoft <sommersoft@gmail.com>
110+
sommersoft <sommersoft@gmail.com> <sommersoft@users.noreply.github.com>
111+
stijn <stijn@ignitron.net>
112+
stijn <stijn@ignitron.net> <stinos@zoho.com>

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