Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI: Some basic tooling upgrades #87

Merged
merged 2 commits into from
Jul 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions .github/workflows/micropython.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ jobs:
- uses: actions/checkout@v4
with:
repository: gadgetoid/dir2uf2
ref: v0.0.4
ref: v0.0.5
path: dir2uf2

# HACK: Patch startup overclock into Pico SDK
Expand All @@ -127,12 +127,11 @@ jobs:
run: |
git apply "${{env.FIRMWARE_DIR}}/startup_overclock.patch"

- name: "HACK: CMakeLists.txt Disable C++ Exceptions Patch"
- name: "HACK: MicroPython out of tree board pins.csv fix"
shell: bash
working-directory: micropython
run: |
git apply "${{env.FIRMWARE_DIR}}/932f76c6ba64c5a3e68de3324556d9979f09303b.patch"
git apply "${{env.FIRMWARE_DIR}}/micropython_nano_specs.patch"

# Install apt packages
- name: Install CCache & Compiler
Expand Down Expand Up @@ -169,8 +168,8 @@ jobs:
- name: Append Filesystem
shell: bash
run: |
python3 -m pip install littlefs-python==0.4.0
./dir2uf2/dir2uf2 --append-to micropython/ports/rp2/build/${{env.RELEASE_FILE}} --manifest ${{env.BOARD_DIR}}/uf2-manifest.txt --filename with-badger-os.uf2 ${{env.BADGER_OS_DIR}}/
python3 -m pip install littlefs-python==0.12.0
./dir2uf2/dir2uf2 --fs-compact --append-to micropython/ports/rp2/build/${{env.RELEASE_FILE}} --manifest ${{env.BOARD_DIR}}/uf2-manifest.txt --filename with-badger-os.uf2 ${{env.BADGER_OS_DIR}}/

- name: Store .uf2 as artifact
uses: actions/upload-artifact@v4
Expand Down
11 changes: 11 additions & 0 deletions firmware/PIMORONI_BADGER2040/micropython.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,14 @@ include(motor/micropython)

# version.py and pimoroni.py
include(modules_py/modules_py)

# TODO: Use `include(micropython-disable-exceptions)`
# Do not include stack unwinding & exception handling for C++ user modules
target_compile_definitions(usermod INTERFACE PICO_CXX_ENABLE_EXCEPTIONS=0)
target_compile_options(usermod INTERFACE $<$<COMPILE_LANGUAGE:CXX>:
-fno-exceptions
-fno-unwind-tables
-fno-rtti
-fno-use-cxa-atexit
>)
target_link_options(usermod INTERFACE -specs=nano.specs)
11 changes: 11 additions & 0 deletions firmware/PIMORONI_BADGER2040W/micropython.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,14 @@ include(motor/micropython)

# version.py, pimoroni.py and boot.py
include(modules_py/modules_py)

# TODO: Use `include(micropython-disable-exceptions)`
# Do not include stack unwinding & exception handling for C++ user modules
target_compile_definitions(usermod INTERFACE PICO_CXX_ENABLE_EXCEPTIONS=0)
target_compile_options(usermod INTERFACE $<$<COMPILE_LANGUAGE:CXX>:
-fno-exceptions
-fno-unwind-tables
-fno-rtti
-fno-use-cxa-atexit
>)
target_link_options(usermod INTERFACE -specs=nano.specs)
21 changes: 0 additions & 21 deletions firmware/micropython_nano_specs.patch

This file was deleted.