Skip to content

Commit 86943ca

Browse files
committed
Merge remote-tracking branch 'adafruit/master'
2 parents 01e260b + 29e7d00 commit 86943ca

351 files changed

Lines changed: 26335 additions & 5379 deletions

File tree

Some content is hidden

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

.github/workflows/build.yml

Lines changed: 33 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,16 @@ jobs:
1616
env:
1717
GITHUB_CONTEXT: ${{ toJson(github) }}
1818
run: echo "$GITHUB_CONTEXT"
19+
- uses: actions/checkout@v2
20+
with:
21+
submodules: true
22+
fetch-depth: 0
23+
- run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
24+
- run: git submodule sync
25+
- run: git submodule foreach git remote -v
26+
- run: git submodule foreach git fetch --recurse-submodules=no origin +refs/tags/*:refs/tags/*
27+
- name: CircuitPython version
28+
run: git describe --dirty --tags
1929
- name: Set up Python 3.8
2030
uses: actions/setup-python@v1
2131
with:
@@ -24,16 +34,11 @@ jobs:
2434
run: |
2535
sudo apt-get install -y eatmydata
2636
sudo eatmydata apt-get install -y gettext librsvg2-bin mingw-w64
27-
pip install requests sh click setuptools cpp-coveralls "Sphinx<3" sphinx-rtd-theme recommonmark sphinxcontrib-svg2pdfconverter polib pyyaml
37+
pip install requests sh click setuptools cpp-coveralls "Sphinx<4" sphinx-rtd-theme recommonmark sphinxcontrib-svg2pdfconverter polib pyyaml
2838
- name: Versions
2939
run: |
3040
gcc --version
3141
python3 --version
32-
- uses: actions/checkout@v1
33-
with:
34-
submodules: true
35-
- name: CircuitPython version
36-
run: git describe --dirty --always --tags
3742
- name: Build mpy-cross
3843
run: make -C mpy-cross -j2
3944
- name: Build unix port
@@ -89,25 +94,31 @@ jobs:
8994
path: mpy-cross/mpy-cross.static.exe
9095

9196
mpy-cross-mac:
92-
runs-on: macos-latest
97+
runs-on: macos-10.15
9398
steps:
9499
- name: Dump GitHub context
95100
env:
96101
GITHUB_CONTEXT: ${{ toJson(github) }}
97102
run: echo "$GITHUB_CONTEXT"
98-
- name: Install deps
103+
- name: Make gettext programs available
99104
run: |
100-
brew link --force gettext
105+
brew install gettext
106+
echo "::set-env name=PATH::/usr/local/opt/gettext/bin:$PATH"
101107
- name: Versions
102108
run: |
103109
gcc --version
104110
python3 --version
105111
msgfmt --version
106-
- uses: actions/checkout@v1
112+
- uses: actions/checkout@v2
107113
with:
108114
submodules: true
115+
fetch-depth: 0
116+
- run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
117+
- run: git submodule sync
118+
- run: git submodule foreach git remote -v
119+
- run: git submodule foreach git fetch --recurse-submodules=no origin +refs/tags/*:refs/tags/*
109120
- name: CircuitPython version
110-
run: git describe --dirty --always --tags
121+
run: git describe --dirty --tags
111122
- name: Build mpy-cross
112123
run: make -C mpy-cross -j2
113124
- uses: actions/upload-artifact@v1.0.0
@@ -189,6 +200,10 @@ jobs:
189200
- "mini_sam_m4"
190201
- "monster_m4sk"
191202
- "ndgarage_ndbit6"
203+
- "nfc_copy_cat"
204+
- "nucleo_f746zg"
205+
- "nucleo_f767zi"
206+
- "nucleo_h743zi_2"
192207
- "ohs2020_badge"
193208
- "openbook_m4"
194209
- "particle_argon"
@@ -229,6 +244,7 @@ jobs:
229244
- "stm32f411ve_discovery"
230245
- "stm32f412zg_discovery"
231246
- "stm32f4_discovery"
247+
- "stm32f746g_disco"
232248
- "stringcar_m0_express"
233249
- "teensy40"
234250
- "teknikio_bluebird"
@@ -260,9 +276,14 @@ jobs:
260276
gcc --version
261277
arm-none-eabi-gcc --version
262278
python3 --version
263-
- uses: actions/checkout@v1
279+
- uses: actions/checkout@v2
264280
with:
265281
submodules: true
282+
fetch-depth: 0
283+
- run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
284+
- run: git submodule sync
285+
- run: git submodule foreach git remote -v
286+
- run: git submodule foreach git fetch --recurse-submodules=no origin +refs/tags/*:refs/tags/*
266287
- name: mpy-cross
267288
run: make -C mpy-cross -j2
268289
- name: build

.github/workflows/create_website_pr.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,14 @@ jobs:
2323
run: |
2424
gcc --version
2525
python3 --version
26-
- uses: actions/checkout@v1
26+
- uses: actions/checkout@v2
2727
with:
2828
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/*
2932
- name: CircuitPython version
30-
run: git describe --dirty --always --tags
33+
run: git describe --dirty --tags
3134
- name: Website
3235
run: python3 build_board_info.py
3336
working-directory: tools

.gitmodules

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
url = https://github.com/adafruit/Adafruit_CircuitPython_Register.git
110110
[submodule "extmod/ulab"]
111111
path = extmod/ulab
112-
url = https://github.com/v923z/micropython-ulab/
112+
url = https://github.com/v923z/micropython-ulab
113113
[submodule "frozen/Adafruit_CircuitPython_ESP32SPI"]
114114
path = frozen/Adafruit_CircuitPython_ESP32SPI
115115
url = https://github.com/adafruit/Adafruit_CircuitPython_ESP32SPI
@@ -119,3 +119,6 @@
119119
[submodule "ports/stm/st_driver"]
120120
path = ports/stm/st_driver
121121
url = https://github.com/hathach/st_driver.git
122+
[submodule "lib/protomatter"]
123+
path = lib/protomatter
124+
url = https://github.com/adafruit/Adafruit_Protomatter

CODE_OF_CONDUCT.md

Lines changed: 90 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,129 @@
1-
# Contributor Covenant Code of Conduct
1+
# Adafruit Community Code of Conduct
22

33
## Our Pledge
44

55
In the interest of fostering an open and welcoming environment, we as
6-
contributors and maintainers pledge to making participation in our project and
6+
contributors and leaders pledge to making participation in our project and
77
our community a harassment-free experience for everyone, regardless of age, body
8-
size, disability, ethnicity, gender identity and expression, level of experience,
9-
nationality, personal appearance, race, religion, or sexual identity and
10-
orientation.
8+
size, disability, ethnicity, gender identity and expression, level or type of
9+
experience, education, socio-economic status, nationality, personal appearance,
10+
race, religion, or sexual identity and orientation.
1111

1212
## Our Standards
1313

14+
We are committed to providing a friendly, safe and welcoming environment for
15+
all.
16+
1417
Examples of behavior that contributes to creating a positive environment
1518
include:
1619

20+
* Be kind and courteous to others
1721
* Using welcoming and inclusive language
1822
* Being respectful of differing viewpoints and experiences
23+
* Collaborating with other community members
1924
* Gracefully accepting constructive criticism
2025
* Focusing on what is best for the community
2126
* Showing empathy towards other community members
2227

2328
Examples of unacceptable behavior by participants include:
2429

25-
* The use of sexualized language or imagery and unwelcome sexual attention or
26-
advances
30+
* The use of sexualized language or imagery and sexual attention or advances
31+
* The use of inappropriate images, including in a community member's avatar
32+
* The use of inappropriate language, including in a community member's nickname
33+
* Any spamming, flaming, baiting or other attention-stealing behavior
34+
* Excessive or unwelcome helping; answering outside the scope of the question
35+
asked
2736
* Trolling, insulting/derogatory comments, and personal or political attacks
37+
* Promoting or spreading disinformation, lies, or conspiracy theories against
38+
a person, group, organisation, project, or community
2839
* Public or private harassment
2940
* Publishing others' private information, such as a physical or electronic
3041
address, without explicit permission
31-
* Other conduct which could reasonably be considered inappropriate in a
32-
professional setting
42+
* Other conduct which could reasonably be considered inappropriate
43+
44+
The goal of the standards and moderation guidelines outlined here is to build
45+
and maintain a respectful community. We ask that you don’t just aim to be
46+
"technically unimpeachable", but rather try to be your best self.
47+
48+
We value many things beyond technical expertise, including collaboration and
49+
supporting others within our community. Providing a positive experience for
50+
other community members can have a much more significant impact than simply
51+
providing the correct answer.
3352

3453
## Our Responsibilities
3554

36-
Project maintainers are responsible for clarifying the standards of acceptable
55+
Project leaders are responsible for clarifying the standards of acceptable
3756
behavior and are expected to take appropriate and fair corrective action in
3857
response to any instances of unacceptable behavior.
3958

40-
Project maintainers have the right and responsibility to remove, edit, or
41-
reject comments, commits, code, wiki edits, issues, and other contributions
59+
Project leaders have the right and responsibility to remove, edit, or
60+
reject messages, comments, commits, code, issues, and other contributions
4261
that are not aligned to this Code of Conduct, or to ban temporarily or
43-
permanently any contributor for other behaviors that they deem inappropriate,
44-
threatening, offensive, or harmful.
62+
permanently any community member for other behaviors that they deem
63+
inappropriate, threatening, offensive, or harmful.
4564

46-
## Scope
65+
## Moderation
4766

48-
This Code of Conduct applies both within project spaces and in public spaces
49-
when an individual is representing the project or its community. Examples of
50-
representing a project or community include using an official project e-mail
51-
address, posting via an official social media account, or acting as an appointed
52-
representative at an online or offline event. Representation of a project may be
53-
further defined and clarified by project maintainers.
67+
Instances of behaviors that violate the Adafruit Community Code of Conduct
68+
may be reported by any member of the community. Community members are
69+
encouraged to report these situations, including situations they witness
70+
involving other community members.
71+
72+
You may report in the following ways:
73+
74+
In any situation, you may send an email to <support@adafruit.com>.
5475

55-
## Enforcement
76+
On the Adafruit Discord, you may send an open message from any channel
77+
to all Community Moderators by tagging @community moderators. You may
78+
also send an open message from any channel, or a direct message to
79+
@kattni#1507, @tannewt#4653, @danh#1614, @cater#2442,
80+
@sommersoft#0222, @Mr. Certainly#0472 or @Andon#8175.
5681

57-
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58-
reported by contacting the project team at support@adafruit.com. All
59-
complaints will be reviewed and investigated and will result in a response that
60-
is deemed necessary and appropriate to the circumstances. The project team is
61-
obligated to maintain confidentiality with regard to the reporter of an incident.
62-
Further details of specific enforcement policies may be posted separately.
82+
Email and direct message reports will be kept confidential.
6383

64-
Project maintainers who do not follow or enforce the Code of Conduct in good
65-
faith may face temporary or permanent repercussions as determined by other
66-
members of the project's leadership.
84+
In situations on Discord where the issue is particularly egregious, possibly
85+
illegal, requires immediate action, or violates the Discord terms of service,
86+
you should also report the message directly to Discord.
87+
88+
These are the steps for upholding our community’s standards of conduct.
89+
90+
1. Any member of the community may report any situation that violates the
91+
Adafruit Community Code of Conduct. All reports will be reviewed and
92+
investigated.
93+
2. If the behavior is an egregious violation, the community member who
94+
committed the violation may be banned immediately, without warning.
95+
3. Otherwise, moderators will first respond to such behavior with a warning.
96+
4. Moderators follow a soft "three strikes" policy - the community member may
97+
be given another chance, if they are receptive to the warning and change their
98+
behavior.
99+
5. If the community member is unreceptive or unreasonable when warned by a
100+
moderator, or the warning goes unheeded, they may be banned for a first or
101+
second offense. Repeated offenses will result in the community member being
102+
banned.
103+
104+
## Scope
105+
106+
This Code of Conduct and the enforcement policies listed above apply to all
107+
Adafruit Community venues. This includes but is not limited to any community
108+
spaces (both public and private), the entire Adafruit Discord server, and
109+
Adafruit GitHub repositories. Examples of Adafruit Community spaces include
110+
but are not limited to meet-ups, audio chats on the Adafruit Discord, or
111+
interaction at a conference.
112+
113+
This Code of Conduct applies both within project spaces and in public spaces
114+
when an individual is representing the project or its community. As a community
115+
member, you are representing our community, and are expected to behave
116+
accordingly.
67117

68118
## Attribution
69119

70-
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
71-
available at [http://contributor-covenant.org/version/1/4][version]
120+
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
121+
version 1.4, available at
122+
<https://www.contributor-covenant.org/version/1/4/code-of-conduct.html>,
123+
and the [Rust Code of Conduct](https://www.rust-lang.org/en-US/conduct.html).
72124

73-
[homepage]: http://contributor-covenant.org
74-
[version]: http://contributor-covenant.org/version/1/4/
125+
For other projects adopting the Adafruit Community Code of
126+
Conduct, please contact the maintainers of those projects for enforcement.
127+
If you wish to use this code of conduct for your own project, consider
128+
explicitly mentioning your moderation policy or making a copy with your
129+
own moderation policy so as to avoid confusion.

conf.py

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import sys
1818
import os
1919

20-
from recommonmark.parser import CommonMarkParser
20+
import recommonmark
2121

2222
# If extensions (or modules to document with autodoc) are in another directory,
2323
# add these directories to sys.path here. If the directory is relative to the
@@ -55,16 +55,20 @@
5555
'sphinx.ext.todo',
5656
'sphinx.ext.coverage',
5757
'rstjinja',
58-
'c2rst'
58+
'c2rst',
59+
'recommonmark',
5960
]
6061

6162
# Add any paths that contain templates here, relative to this directory.
6263
templates_path = ['templates']
6364

6465
# The suffix of source filenames.
65-
source_suffix = ['.rst', '.md', '.c', '.h']
66+
source_suffix = {
67+
'.rst': 'restructuredtext',
68+
'.md': 'markdown',
69+
'.c': ''
70+
}
6671

67-
source_parsers = {'.md': CommonMarkParser}
6872

6973
# The encoding of source files.
7074
#source_encoding = 'utf-8-sig'
@@ -134,6 +138,7 @@
134138
"ports/nrf/peripherals",
135139
"ports/nrf/usb",
136140
"ports/stm/st_driver",
141+
"ports/stm/packages",
137142
"ports/stm/peripherals",
138143
"ports/stm/ref",
139144
"ports/unix",
@@ -357,4 +362,4 @@
357362
"register": ('https://circuitpython.readthedocs.io/projects/register/en/latest/', None)}
358363

359364
def setup(app):
360-
app.add_stylesheet("customstyle.css")
365+
app.add_css_file("customstyle.css")

docs/library/network.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ Methods
247247
nic.ifconfig(('192.168.0.4', '255.255.255.0', '192.168.0.1', '8.8.8.8'))
248248

249249
.. method:: wlan.config('param')
250-
.. method:: wlan.config(param=value, ...)
250+
wlan.config(param=value, ...)
251251

252252
Get or set general network interface parameters. These methods allow to work
253253
with additional parameters beyond standard IP configuration (as dealt with by

0 commit comments

Comments
 (0)