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.

Sign up for GitHub

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

Jump to bottom

TEST: Experimental build against pins.csv patch #74

Closed
wants to merge 5 commits into from
Closed

TEST: Experimental build against pins.csv patch #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b229e35
CI: Bump MicroPython and pimoroni-pico to v1.22.1.
Gadgetoid Feb 22, 2024
39ceffb
CI: Update exception handling patch.
Gadgetoid Feb 22, 2024
f649dd1
CI: Bump littlefs-python version for LFS v2.1 support.
Gadgetoid Feb 22, 2024
473bdcc
CI: Bump dir2uf2 version for littlefs-python v0.9.3 compatibility.
Gadgetoid Feb 22, 2024
b31249c
CI: TEST: Build against pins.csv patch.
Gadgetoid Feb 27, 2024
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
10 changes: 5 additions & 5 deletions .github/workflows/micropython.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ on:
types: [created]

env:
MICROPYTHON_VERSION: v1.21.0
PIMORONI_PICO_VERSION: v1.21.0
MICROPYTHON_VERSION: patch-rp2-pins-location
PIMORONI_PICO_VERSION: ci/micropython-edge
WORKFLOW_VERSION: v2

jobs:
Expand All @@ -30,7 +30,7 @@ jobs:
if: steps.cache.outputs.cache-hit != 'true'
uses: actions/checkout@v3
with:
repository: micropython/micropython
repository: pimoroni/micropython
ref: ${{env.MICROPYTHON_VERSION}}
submodules: false # MicroPython submodules are hideously broken
path: micropython
Expand Down Expand Up @@ -116,7 +116,7 @@ jobs:
- uses: actions/checkout@v3
with:
repository: gadgetoid/dir2uf2
ref: v0.0.1
ref: v0.0.3
path: dir2uf2

# HACK: Patch startup overclock into Pico SDK
Expand Down Expand Up @@ -161,7 +161,7 @@ jobs:
- name: Append Filesystem
shell: bash
run: |
python3 -m pip install littlefs-python==0.4.0
python3 -m pip install littlefs-python==0.9.3
./dir2uf2/dir2uf2 --fs-start ${{matrix.dir2uf2_fs_start}} --fs-size ${{matrix.dir2uf2_fs_size}} --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
Expand Down
11 changes: 6 additions & 5 deletions firmware/micropython_nano_specs.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 094031c6852a..5f268414c08f 100644
index 281b0c3bc..7e04bb549 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -374,6 +374,15 @@ target_compile_options(${MICROPY_TARGET} PRIVATE
target_link_options(${MICROPY_TARGET} PRIVATE
-Wl,--defsym=__micropy_c_heap_size__=${MICROPY_C_HEAP_SIZE}
@@ -453,6 +453,16 @@ target_link_options(${MICROPY_TARGET} PRIVATE
-Wl,--wrap=dcd_event_handler
)

+# 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>:
Expand All @@ -15,6 +15,7 @@ index 094031c6852a..5f268414c08f 100644
+ -fno-use-cxa-atexit
+>)
+target_link_options(usermod INTERFACE -specs=nano.specs)

+
set_source_files_properties(
${PICO_SDK_PATH}/src/rp2_common/pico_double/double_math.c
${PICO_SDK_PATH}/src/rp2_common/pico_float/float_math.c
Loading