Skip to content

Commit 453fd92

Browse files
authored
Merge pull request #2 from adafruit/main
update fork
2 parents 1a8bb1c + f7f6a42 commit 453fd92

File tree

2,456 files changed

+65368
-49305
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,456 files changed

+65368
-49305
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
*.deb binary
1919
*.zip binary
2020
*.pdf binary
21+
*.wav binary
2122

2223
# These should also not be modified by git.
2324
tests/basics/string_cr_conversion.py -text

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: 'bug'
6+
assignees: ''
7+
8+
---
9+
10+
<!-- Thanks! for testing out CircuitPython. Now that you have got a problem...
11+
you can file a bug report for it. Feel free to modify the below format to better
12+
suit your issue. :) -->
13+
14+
**Firmware**
15+
16+
<!-- Include the version of CircuitPython you're running. You can see it in the
17+
`boot_out.txt` file, as well as in the REPL. -->
18+
19+
```python
20+
Adafruit CircuitPython 6.2.0-beta.2 on 2021-03-01; Raspberry Pi Pico with rp2040
21+
```
22+
23+
**Code/REPL**
24+
25+
<!-- Include your code that reproduces the bug here. Try to distill down to the
26+
minimum possible to reproduce. -->
27+
28+
```python
29+
import busio, bitbangio
30+
i2c = bitbangio.I2C(board.GP1, board.GP0)
31+
```
32+
33+
**Behavior**
34+
35+
<!-- What happens when you run the code above? Include any error messages. -->
36+
37+
```python
38+
Traceback (most recent call last):
39+
File "<stdin>", line 1, in <module>
40+
TimeoutError: Clock stretch too long
41+
```
42+
43+
**Description**
44+
45+
<!-- Optionally, describe the issue in more detail. Here are some examples: -->
46+
47+
- Error while using i2c...
48+
- Only happens when...
49+
- might be related to #4291...
50+
51+
**Additional Info**
52+
53+
<!-- Optionally, add any other information like hardware connection, scope output etc.
54+
If you have already done some debugging, mention it here. -->

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
contact_links:
2+
- name: Adafruit Forum
3+
url: https://forums.adafruit.com/
4+
about: Official Adafruit technical support forum. Good for getting help on getting a project working.
5+
- name: Adafruit Discord
6+
url: https://adafru.it/discord
7+
about: Unofficial chat with many helpful folks and normally prompt replies.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: 'enhancement'
6+
assignees: ''
7+
8+
---
9+
10+
<!-- We are always adding new features and enhancements to CircuitPython 🚀
11+
and would love ❤ to see what new challenge you have got for us... 🙂 -->

.github/workflows/build.yml

Lines changed: 56 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,11 @@ jobs:
3838
sudo apt-get update
3939
sudo apt-get install -y eatmydata
4040
sudo eatmydata apt-get install -y gettext librsvg2-bin mingw-w64 latexmk texlive-fonts-recommended texlive-latex-recommended texlive-latex-extra
41-
pip install requests sh click setuptools cpp-coveralls "Sphinx<4" sphinx-rtd-theme recommonmark sphinx-autoapi sphinxcontrib-svg2pdfconverter polib pyyaml astroid isort black awscli mypy
41+
pip install -r requirements-dev.txt
4242
- name: Versions
4343
run: |
4444
gcc --version
4545
python3 --version
46-
- name: Translations
47-
run: make check-translate
4846
- name: New boards check
4947
run: python3 -u ci_new_boards_check.py
5048
working-directory: tools
@@ -81,6 +79,7 @@ jobs:
8179
working-directory: tests
8280
- name: Print failure info
8381
run: |
82+
shopt -s nullglob;
8483
for exp in *.exp;
8584
do testbase=$(basename $exp .exp);
8685
echo -e "\nFAILURE $testbase";
@@ -133,15 +132,6 @@ jobs:
133132
env:
134133
GITHUB_CONTEXT: ${{ toJson(github) }}
135134
run: echo "$GITHUB_CONTEXT"
136-
- name: Install dependencies
137-
run: |
138-
brew install gettext
139-
echo >>$GITHUB_PATH /usr/local/opt/gettext/bin
140-
- name: Versions
141-
run: |
142-
gcc --version
143-
python3 --version
144-
msgfmt --version
145135
- uses: actions/[email protected]
146136
with:
147137
submodules: true
@@ -151,6 +141,15 @@ jobs:
151141
run: |
152142
git describe --dirty --tags
153143
echo >>$GITHUB_ENV CP_VERSION=$(git describe --dirty --tags)
144+
- name: Install dependencies
145+
run: |
146+
brew install gettext
147+
echo >>$GITHUB_PATH /usr/local/opt/gettext/bin
148+
- name: Versions
149+
run: |
150+
gcc --version
151+
python3 --version
152+
msgfmt --version
154153
- name: Build mpy-cross
155154
run: make -C mpy-cross -j2
156155
- uses: actions/upload-artifact@v2
@@ -178,7 +177,14 @@ jobs:
178177
- "ADM_B_NRF52840_1"
179178
- "TG-Watch"
180179
- "adafruit_feather_rp2040"
180+
- "adafruit_itsybitsy_rp2040"
181+
- "adafruit_neokey_trinkey_m0"
182+
- "adafruit_proxlight_trinkey_m0"
183+
- "adafruit_qtpy_rp2040"
184+
- "adafruit_rotary_trinkey_m0"
185+
- "adafruit_slide_trinkey_m0"
181186
- "aloriumtech_evo_m51"
187+
- "aramcon2_badge"
182188
- "aramcon_badge_2019"
183189
- "arduino_mkr1300"
184190
- "arduino_mkrzero"
@@ -189,6 +195,7 @@ jobs:
189195
- "bastble"
190196
- "bdmicro_vina_d21"
191197
- "bdmicro_vina_d51"
198+
- "bdmicro_vina_d51_pcb7"
192199
- "bless_dev_board_multi_sensor"
193200
- "blm_badge"
194201
- "capablerobot_usbhub"
@@ -208,6 +215,7 @@ jobs:
208215
- "datum_imu"
209216
- "datum_light"
210217
- "datum_weather"
218+
- "dynalora_usb"
211219
- "dynossat_edu_eps"
212220
- "dynossat_edu_obc"
213221
- "electronut_labs_blip"
@@ -237,6 +245,7 @@ jobs:
237245
- "hallowing_m0_express"
238246
- "hallowing_m4_express"
239247
- "hiibot_bluefi"
248+
- "huntercat_nfc"
240249
- "ikigaisense_vita"
241250
- "imxrt1010_evk"
242251
- "imxrt1020_evk"
@@ -280,6 +289,11 @@ jobs:
280289
- "pewpew10"
281290
- "pewpew_m4"
282291
- "picoplanet"
292+
- "pimoroni_keybow2040"
293+
- "pimoroni_picolipo_16mb"
294+
- "pimoroni_picolipo_4mb"
295+
- "pimoroni_picosystem"
296+
- "pimoroni_tiny2040"
283297
- "pirkey_m0"
284298
- "pitaya_go"
285299
- "pyb_nano_v2"
@@ -302,19 +316,24 @@ jobs:
302316
- "same54_xplained"
303317
- "seeeduino_wio_terminal"
304318
- "seeeduino_xiao"
319+
- "sensebox_mcu"
305320
- "serpente"
306321
- "shirtty"
307322
- "silicognition-m4-shim"
308323
- "simmel"
309324
- "snekboard"
310325
- "sparkfun_lumidrive"
326+
- "sparkfun_micromod_rp2040"
327+
- "sparkfun_nrf52840_micromod"
311328
- "sparkfun_nrf52840_mini"
329+
- "sparkfun_pro_micro_rp2040"
312330
- "sparkfun_qwiic_micro_no_flash"
313331
- "sparkfun_qwiic_micro_with_flash"
314332
- "sparkfun_redboard_turbo"
315333
- "sparkfun_samd21_dev"
316334
- "sparkfun_samd21_mini"
317335
- "sparkfun_samd51_thing_plus"
336+
- "sparkfun_thing_plus_rp2040"
318337
- "spresense"
319338
- "stackrduino_m0_pro"
320339
- "stm32f411ce_blackpill"
@@ -346,24 +365,26 @@ jobs:
346365
uses: actions/setup-python@v1
347366
with:
348367
python-version: 3.8
368+
- uses: actions/[email protected]
369+
with:
370+
submodules: true
371+
fetch-depth: 0
372+
- run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
349373
- name: Install deps
350374
run: |
351375
sudo apt-get install -y gettext
352-
pip install requests sh click setuptools awscli
376+
pip install -r requirements-dev.txt
353377
wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2
354378
sudo tar -C /usr --strip-components=1 -xaf gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2
355379
- name: Versions
356380
run: |
357381
gcc --version
358382
arm-none-eabi-gcc --version
359383
python3 --version
360-
- uses: actions/[email protected]
361-
with:
362-
submodules: true
363-
fetch-depth: 0
364-
- run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
365384
- name: mpy-cross
366385
run: make -C mpy-cross -j2
386+
- name: Setup build failure matcher
387+
run: echo "::add-matcher::$GITHUB_WORKSPACE/.github/workflows/match-build-fail.json"
367388
- name: build
368389
run: python3 -u build_release_files.py
369390
working-directory: tools
@@ -395,6 +416,11 @@ jobs:
395416
uses: actions/setup-python@v1
396417
with:
397418
python-version: 3.8
419+
- uses: actions/[email protected]
420+
with:
421+
submodules: true
422+
fetch-depth: 0
423+
- run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
398424
- name: Install deps
399425
run: |
400426
sudo apt-get install -y gettext
@@ -406,13 +432,10 @@ jobs:
406432
gcc --version
407433
riscv64-unknown-elf-gcc --version
408434
python3 --version
409-
- uses: actions/[email protected]
410-
with:
411-
submodules: true
412-
fetch-depth: 0
413-
- run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
414435
- name: mpy-cross
415436
run: make -C mpy-cross -j2
437+
- name: Setup build failure matcher
438+
run: echo "::add-matcher::$GITHUB_WORKSPACE/.github/workflows/match-build-fail.json"
416439
- name: build
417440
run: python3 -u build_release_files.py
418441
working-directory: tools
@@ -438,19 +461,25 @@ jobs:
438461
board:
439462
- "adafruit_feather_esp32s2_nopsram"
440463
- "adafruit_feather_esp32s2_tftback_nopsram"
464+
- "adafruit_funhouse"
441465
- "adafruit_magtag_2.9_grayscale"
442466
- "adafruit_metro_esp32s2"
467+
- "artisense_rd00"
468+
- "atmegazero_esp32s2"
443469
- "electroniccats_bastwifi"
444470
- "espressif_kaluga_1"
445471
- "espressif_saola_1_wroom"
446472
- "espressif_saola_1_wrover"
473+
- "franzininho_wifi_wroom"
474+
- "franzininho_wifi_wrover"
447475
- "lilygo_ttgo_t8_s2_st7789"
448476
- "microdev_micro_s2"
449477
- "muselab_nanoesp32_s2"
450478
- "targett_module_clip_wroom"
451479
- "targett_module_clip_wrover"
452480
- "unexpectedmaker_feathers2"
453481
- "unexpectedmaker_feathers2_prerelease"
482+
- "unexpectedmaker_tinys2"
454483

455484
steps:
456485
- name: Set up Python 3.8
@@ -469,7 +498,7 @@ jobs:
469498
id: idf-cache
470499
with:
471500
path: ${{ github.workspace }}/.idf_tools
472-
key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/esp32s2/esp-idf/HEAD') }}-20210128
501+
key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/esp32s2/esp-idf/HEAD') }}-20210422
473502
- name: Clone IDF submodules
474503
run: |
475504
(cd $IDF_PATH && git submodule update --init)
@@ -487,7 +516,7 @@ jobs:
487516
- name: Install CircuitPython deps
488517
run: |
489518
source $IDF_PATH/export.sh
490-
pip install requests sh click setuptools awscli
519+
pip install -r requirements-dev.txt
491520
sudo apt-get install -y gettext ninja-build
492521
env:
493522
IDF_PATH: ${{ github.workspace }}/ports/esp32s2/esp-idf
@@ -506,6 +535,8 @@ jobs:
506535
IDF_TOOLS_PATH: ${{ github.workspace }}/.idf_tools
507536
- name: mpy-cross
508537
run: make -C mpy-cross -j2
538+
- name: Setup build failure matcher
539+
run: echo "::add-matcher::$GITHUB_WORKSPACE/.github/workflows/match-build-fail.json"
509540
- name: build
510541
run: |
511542
source $IDF_PATH/export.sh

.github/workflows/create_website_pr.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,21 @@ jobs:
1616
env:
1717
GITHUB_CONTEXT: ${{ toJson(github) }}
1818
run: echo "$GITHUB_CONTEXT"
19+
- uses: actions/[email protected]
20+
with:
21+
submodules: true
22+
fetch-depth: 0
1923
- name: Set up Python 3.8
2024
uses: actions/setup-python@v1
2125
with:
2226
python-version: 3.8
2327
- name: Install deps
2428
run: |
25-
pip install requests sh click
29+
pip install -r requirements-dev.txt
2630
- name: Versions
2731
run: |
2832
gcc --version
2933
python3 --version
30-
- uses: actions/[email protected]
31-
with:
32-
submodules: true
33-
fetch-depth: 0
3434
- run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
3535
- name: CircuitPython version
3636
run: git describe --dirty --tags
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"problemMatcher": [
3+
{
4+
"severity": "error",
5+
"pattern": [
6+
{
7+
"regexp": "^(Build .+ and \\x1b\\[31mfailed\\x1b\\[0m)$",
8+
"message": 1
9+
}
10+
],
11+
"owner": "build-failed"
12+
}
13+
]
14+
}

.github/workflows/pre-commit.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ name: pre-commit
77
on:
88
pull_request:
99
push:
10-
branches: [main]
1110

1211
jobs:
1312
pre-commit:
@@ -16,10 +15,13 @@ jobs:
1615
- uses: actions/checkout@v1
1716
- uses: actions/setup-python@v1
1817
- name: Install deps
19-
run: sudo apt-get update && sudo apt-get install -y gettext
18+
run: |
19+
sudo apt-add-repository -y -u ppa:pybricks/ppa
20+
sudo apt-get install -y black gettext uncrustify
21+
pip3 install -r requirements-dev.txt
2022
- name: Populate selected submodules
2123
run: git submodule update --init extmod/ulab
22-
- name: set PY
24+
- name: Set PY
2325
run: echo >>$GITHUB_ENV PY="$(python -c 'import hashlib, sys;print(hashlib.sha256(sys.version.encode()+sys.executable.encode()).hexdigest())')"
2426
- uses: actions/cache@v2
2527
with:

0 commit comments

Comments
 (0)