Skip to content

Commit bd99a37

Browse files
authored
Merge branch 'adafruit:main' into main
2 parents 941c4b5 + 121d9ee commit bd99a37

154 files changed

Lines changed: 2286 additions & 539 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: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
cp-version: ${{ needs.scheduler.outputs.cp-version }}
103103

104104
mpy-cross-mac:
105-
runs-on: macos-11
105+
runs-on: macos-12
106106
needs: scheduler
107107
if: needs.scheduler.outputs.ports != '{}'
108108
env:
@@ -129,29 +129,29 @@ jobs:
129129
run: make -C mpy-cross -j4
130130
- uses: actions/upload-artifact@v4
131131
with:
132-
name: mpy-cross-macos-11-x64
132+
name: mpy-cross-macos-x64
133133
path: mpy-cross/build/mpy-cross
134134
- name: Build mpy-cross (arm64)
135135
run: make -C mpy-cross -j4 -f Makefile.m1 V=2
136136
- uses: actions/upload-artifact@v4
137137
with:
138-
name: mpy-cross-macos-11-arm64
138+
name: mpy-cross-macos-arm64
139139
path: mpy-cross/build-arm64/mpy-cross-arm64
140140
- name: Make universal binary
141141
run: lipo -create -output mpy-cross-macos-universal mpy-cross/build/mpy-cross mpy-cross/build-arm64/mpy-cross-arm64
142142
- name: Upload artifact
143143
uses: actions/upload-artifact@v4
144144
with:
145-
name: mpy-cross-macos-11-universal
145+
name: mpy-cross-macos-universal
146146
path: mpy-cross-macos-universal
147147
- name: Upload to S3
148148
if: >-
149149
(github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') ||
150150
(github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
151151
run: |
152-
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross-macos-universal s3://adafruit-circuit-python/bin/mpy-cross/macos-11/mpy-cross-macos-11-${{ env.CP_VERSION }}-universal --no-progress --region us-east-1
153-
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/build-arm64/mpy-cross-arm64 s3://adafruit-circuit-python/bin/mpy-cross/macos-11/mpy-cross-macos-11-${{ env.CP_VERSION }}-arm64 --no-progress --region us-east-1
154-
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/build/mpy-cross s3://adafruit-circuit-python/bin/mpy-cross/macos-11/mpy-cross-macos-11-${{ env.CP_VERSION }}-x64 --no-progress --region us-east-1
152+
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross-macos-universal s3://adafruit-circuit-python/bin/mpy-cross/macos/mpy-cross-macos-${{ env.CP_VERSION }}-universal --no-progress --region us-east-1
153+
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/build-arm64/mpy-cross-arm64 s3://adafruit-circuit-python/bin/mpy-cross/macos/mpy-cross-macos-${{ env.CP_VERSION }}-arm64 --no-progress --region us-east-1
154+
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/build/mpy-cross s3://adafruit-circuit-python/bin/mpy-cross/macos/mpy-cross-macos-${{ env.CP_VERSION }}-x64 --no-progress --region us-east-1
155155
env:
156156
AWS_PAGER: ''
157157
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}

.gitmodules

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,3 +386,12 @@
386386
[submodule "frozen/Adafruit_CircuitPython_Bitmap_Font"]
387387
path = frozen/Adafruit_CircuitPython_Bitmap_Font
388388
url = https://github.com/adafruit/Adafruit_CircuitPython_Bitmap_Font
389+
[submodule "frozen/Adafruit_CircuitPython_MPU6050"]
390+
path = frozen/Adafruit_CircuitPython_MPU6050
391+
url = https://github.com/adafruit/Adafruit_CircuitPython_MPU6050
392+
[submodule "frozen/Adafruit_CircuitPython_Pixel_Framebuf"]
393+
path = frozen/Adafruit_CircuitPython_Pixel_Framebuf
394+
url = https://github.com/adafruit/Adafruit_CircuitPython_Pixel_Framebuf
395+
[submodule "frozen/Adafruit_CircuitPython_LED_Animation"]
396+
path = frozen/Adafruit_CircuitPython_LED_Animation
397+
url = https://github.com/adafruit/Adafruit_CircuitPython_LED_Animation

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,8 @@ stubs:
274274
@$(PYTHON) tools/board_stubs/build_board_specific_stubs/board_stub_builder.py
275275
@cp -r tools/board_stubs/circuitpython_setboard circuitpython-stubs/circuitpython_setboard
276276
@$(PYTHON) -m build circuitpython-stubs
277+
@touch circuitpython-stubs/board/__init__.py
278+
@touch circuitpython-stubs/board_definitions/__init__.py
277279

278280
.PHONY: check-stubs
279281
check-stubs: stubs

README.rst

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -223,24 +223,10 @@ Ports
223223

224224
Ports include the code unique to a microcontroller line.
225225

226-
================ ============================================================
227-
Supported Support status
228-
================ ============================================================
229-
atmel-samd ``SAMD21`` stable | ``SAMD51`` stable
230-
cxd56 stable
231-
espressif ``ESP32`` beta | ``ESP32-C3`` beta | ``ESP32-S2`` stable | ``ESP32-S3`` beta
232-
litex alpha
233-
mimxrt10xx alpha
234-
nordic stable
235-
raspberrypi stable
236-
silabs (efr32) alpha
237-
stm ``F4`` stable | ``others`` beta
238-
unix alpha
239-
================ ============================================================
240-
241-
- ``stable`` Highly unlikely to have bugs or missing functionality.
242-
- ``beta`` Being actively improved but may be missing functionality and have bugs.
243-
- ``alpha`` Will have bugs and missing functionality.
226+
The following ports are available: ``atmel-samd``, ``cxd56``, ``espressif``, ``litex``, ``mimxrt10xx``, ``nordic``, ``raspberrypi``, ``renode``, ``silabs`` (``efr32``), ``stm``, ``unix``.
227+
228+
However, not all ports are fully functional. Some have limited limited functionality and known serious bugs.
229+
For details, refer to the **Port status** section in the `latest release <https://github.com/adafruit/circuitpython/releases/latest>`__ notes.
244230

245231
Boards
246232
~~~~~~

0 commit comments

Comments
 (0)