diff --git a/.github/workflows/micropython.yml b/.github/workflows/micropython.yml index 9609f4a..ea8e515 100644 --- a/.github/workflows/micropython.yml +++ b/.github/workflows/micropython.yml @@ -9,6 +9,7 @@ on: env: MICROPYTHON_VERSION: feature/psram MICROPYTHON_FLAVOUR: pimoroni + PIMORONI_PICO_VERSION: feature/sdk-2.0.0 jobs: build: @@ -37,7 +38,7 @@ jobs: RELEASE_FILE: ${{ matrix.name }}-${{ github.event.release.tag_name || github.sha }}-pimoroni-micropython PIMORONI_PICO_DIR: "${{ github.workspace }}/pimoroni-pico-rp2350-${{ github.sha }}" MICROPY_BOARD_DIR: "${{ github.workspace }}/pimoroni-pico-rp2350-${{ github.sha }}/micropython/board/${{ matrix.BOARD }}" - USER_C_MODULES: "${{ github.workspace }}/pimoroni-pico-rp2350-${{ github.sha }}/micropython/modules/micropython-${{ matrix.name }}.cmake" + USER_C_MODULES: "${{ github.workspace }}/pimoroni-pico-rp2350-${{ github.sha }}/micropython/micropython-pico2.cmake" TAG_OR_SHA: ${{ github.event.release.tag_name || github.sha }} MICROPY_BOARD: ${{ matrix.board }} MICROPY_BOARD_VARIANT: ${{ matrix.variant }} @@ -59,6 +60,13 @@ jobs: submodules: true path: pimoroni-pico-rp2350-${{ github.sha }} + - uses: actions/checkout@v4 + with: + repository: pimoroni/pimoroni-pico + ref: ${{env.PIMORONI_PICO_VERSION}} + submodules: true + path: pimoroni-pico + - name: Install Arm GNU Toolchain (arm-none-eabi-gcc) uses: carlosperate/arm-none-eabi-gcc-action@v1 with: diff --git a/micropython/micropython-pico2.cmake b/micropython/micropython-pico2.cmake new file mode 100644 index 0000000..93a2554 --- /dev/null +++ b/micropython/micropython-pico2.cmake @@ -0,0 +1,17 @@ +include_directories(${CMAKE_CURRENT_LIST_DIR}/../../) + +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../") +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../../") + +set(CMAKE_C_STANDARD 11) +set(CMAKE_CXX_STANDARD 17) + +include(micropython-common) +enable_ulab() + +# C++ Magic Memory +include(cppmem/micropython) + +# Disable build-busting C++ exceptions +include(micropython-disable-exceptions) \ No newline at end of file