Skip to content

Commit c316b95

Browse files
committed
merge from adafruit/main
2 parents d869b44 + f95bd24 commit c316b95

Some content is hidden

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

76 files changed

+2656
-408
lines changed

.github/workflows/build.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -287,12 +287,13 @@ jobs:
287287
fetch-depth: 1
288288
- name: Get CP deps
289289
run: python tools/ci_fetch_deps.py ${{ matrix.board }} ${{ github.sha }}
290+
- uses: carlosperate/arm-none-eabi-gcc-action@v1
291+
with:
292+
release: '10-2020-q4'
290293
- name: Install dependencies
291294
run: |
292295
sudo apt-get install -y gettext
293296
pip install -r requirements-ci.txt -r requirements-dev.txt
294-
wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2
295-
sudo tar -C /usr --strip-components=1 -xaf gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2
296297
- name: Versions
297298
run: |
298299
gcc --version
@@ -487,8 +488,9 @@ jobs:
487488
pip install -r requirements-ci.txt -r requirements-dev.txt
488489
wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
489490
sudo tar -C /usr --strip-components=1 -xaf gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
490-
wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2
491-
sudo tar -C /usr --strip-components=1 -xaf gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2
491+
- uses: carlosperate/arm-none-eabi-gcc-action@v1
492+
with:
493+
release: '10-2020-q4'
492494
- name: Install mkfs.fat
493495
run: |
494496
wget https://github.com/dosfstools/dosfstools/releases/download/v4.2/dosfstools-4.2.tar.gz

.gitmodules

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@
145145
url = https://github.com/adafruit/Adafruit_CircuitPython_RFM69.git
146146
[submodule "ports/espressif/esp-idf"]
147147
path = ports/espressif/esp-idf
148-
url = https://github.com/espressif/esp-idf.git
149-
branch = release/v4.4
148+
url = https://github.com/adafruit/esp-idf.git
149+
branch = circuitpython8
150150
[submodule "ports/espressif/certificates/nina-fw"]
151151
path = ports/espressif/certificates/nina-fw
152152
url = https://github.com/adafruit/nina-fw.git
@@ -292,3 +292,18 @@
292292
[submodule "frozen/mixgo_cp_lib"]
293293
path = frozen/mixgo_cp_lib
294294
url = https://github.com/dahanzimin/circuitpython_lib.git
295+
[submodule "frozen/Adafruit_CircuitPython_IS31FL3731"]
296+
path = frozen/Adafruit_CircuitPython_IS31FL3731
297+
url = https://github.com/adafruit/Adafruit_CircuitPython_IS31FL3731.git
298+
[submodule "frozen/Adafruit_CircuitPython_Ticks"]
299+
path = frozen/Adafruit_CircuitPython_Ticks
300+
url = https://github.com/adafruit/Adafruit_CircuitPython_Ticks.git
301+
[submodule "frozen/Adafruit_CircuitPython_asyncio"]
302+
path = frozen/Adafruit_CircuitPython_asyncio
303+
url = https://github.com/adafruit/Adafruit_CircuitPython_asyncio.git
304+
[submodule "frozen/circuitpython_ef_music"]
305+
path = frozen/circuitpython_ef_music
306+
url = https://github.com/elecfreaks/circuitpython_ef_music.git
307+
[submodule "frozen/circuitpython_picoed"]
308+
path = frozen/circuitpython_picoed
309+
url = https://github.com/elecfreaks/circuitpython_picoed.git

BUILDING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ The test suite in the top level `tests` directory. It needs the unix port to ru
7070
Then you can run the test suite:
7171

7272
cd ../../tests
73-
./run-tests
73+
./run-tests.py
7474

7575
A successful run will say something like
7676

README.rst

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,11 @@ If you'd like to use the term "CircuitPython" and Blinka for your product here i
9090
* Your product is listed on `circuitpython.org <https://circuitpython.org>`__ (source
9191
`here <https://github.com/adafruit/circuitpython-org/>`_). This is to ensure that a user of your
9292
product can always download the latest version of CircuitPython from the standard place.
93-
* Your product has a user accessible USB plug which appears as a CIRCUITPY drive when plugged in
94-
AND/OR provides file and serial access over Bluetooth Low Energy. Boards that do not support USB
95-
should be clearly marked as BLE-only CircuitPython.
93+
* Your product supports at least one standard "`Workflow <https://docs.circuitpython.org/en/latest/docs/workflows.html>`__" for serial and file access:
94+
* With a user accessible USB plug which appears as a CIRCUITPY drive when plugged in.
95+
* With file and serial access over Bluetooth Low Energy using the BLE Workflow.
96+
* With file access over WiFi using the WiFi Workflow with serial access over USB and/or WebSocket.
97+
* Boards that do not support the USB Workflow should be clearly marked.
9698

9799
If you choose not to meet these requirements, then we ask you call your version of CircuitPython
98100
something else (for example, SuperDuperPython) and not use the Blinka logo. You can say it is

docs/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ Full Table of Contents
2222
supported_ports.rst
2323
troubleshooting.rst
2424
drivers.rst
25+
workflows
2526
environment.rst
2627

2728
.. toctree::

0 commit comments

Comments
 (0)