From f44e17a5faa035f3e4e0131d1d414b05956b41ac Mon Sep 17 00:00:00 2001 From: Luke A Date: Tue, 15 Oct 2024 15:17:01 -0400 Subject: [PATCH] Revert "Updating pico build version" (#1196) Revert "Updating pico build version (#1179)" This reverts commit 9e5c338bcac1f0abcae4ce84c9a1b47da60f4790. --- .github/workflows/cmake.yml | 2 +- .gitignore | 1 - CMakeLists.txt | 20 ++------------------ lib/NeoPico/src/generated/ws2812.pio.h | 10 ---------- lib/pico_pio_usb | 2 +- pico_sdk_import.cmake | 15 ++------------- 6 files changed, 6 insertions(+), 44 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index db5eb530f..abbd1a63c 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -34,7 +34,7 @@ jobs: fetch-tags: true - name: Setup SDK pipeline - uses: Fortinbra/RaspberryPiPicoBuild@v4 + uses: Fortinbra/RaspberryPiPicoBuild@v3 - name: Download a Build Artifact uses: actions/download-artifact@v4.1.2 diff --git a/.gitignore b/.gitignore index 0f485cc82..db45ca04d 100644 --- a/.gitignore +++ b/.gitignore @@ -18,4 +18,3 @@ env.ini .devcontainer *Dockerfile *docker-compose.yml -lib/NeoPico/src/generated/ws2812.pio.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 90661b7b3..54f6e70be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,31 +1,15 @@ -# == DO NEVER EDIT THE NEXT LINES for Raspberry Pi Pico VS Code Extension to work == -if(WIN32) - set(USERHOME $ENV{USERPROFILE}) -else() - set(USERHOME $ENV{HOME}) -endif() -set(sdkVersion 2.0.0) -set(toolchainVersion 13_2_Rel1) -set(picotoolVersion 2.0.0) -set(picoVscode ${USERHOME}/.pico-sdk/cmake/pico-vscode.cmake) -if (EXISTS ${picoVscode}) - include(${picoVscode}) -endif() -# ==================================================================================== - cmake_minimum_required(VERSION 3.13) include(CMakePrintHelpers) # enable compile commands for use by IDE autocompletion set(CMAKE_EXPORT_COMPILE_COMMANDS ON) - # initialize the SDK based on PICO_SDK_PATH # note: this must happen before project() include(pico_sdk_import.cmake) -if (PICO_SDK_VERSION_STRING VERSION_LESS "2.0.0") - message(FATAL_ERROR "Raspberry Pi Pico SDK version 2.0.0 (or later) required. Your version is ${PICO_SDK_VERSION_STRING}") +if (PICO_SDK_VERSION_STRING VERSION_LESS "1.5.0") + message(FATAL_ERROR "Raspberry Pi Pico SDK version 1.5.0 (or later) required. Your version is ${PICO_SDK_VERSION_STRING}") endif() # set the version for webconfig, etc. based on git diff --git a/lib/NeoPico/src/generated/ws2812.pio.h b/lib/NeoPico/src/generated/ws2812.pio.h index 4a564101f..8cbeea6b7 100644 --- a/lib/NeoPico/src/generated/ws2812.pio.h +++ b/lib/NeoPico/src/generated/ws2812.pio.h @@ -14,7 +14,6 @@ #define ws2812_wrap_target 0 #define ws2812_wrap 3 -#define ws2812_pio_version 0 #define ws2812_T1 2 #define ws2812_T2 5 @@ -34,10 +33,6 @@ static const struct pio_program ws2812_program = { .instructions = ws2812_program_instructions, .length = 4, .origin = -1, - .pio_version = 0, -#if PICO_PIO_VERSION > 0 - .used_gpio_ranges = 0x0 -#endif }; static inline pio_sm_config ws2812_program_get_default_config(uint offset) { @@ -70,7 +65,6 @@ static inline void ws2812_program_init(PIO pio, uint sm, uint offset, uint pin, #define ws2812_parallel_wrap_target 0 #define ws2812_parallel_wrap 3 -#define ws2812_parallel_pio_version 0 #define ws2812_parallel_T1 2 #define ws2812_parallel_T2 5 @@ -90,10 +84,6 @@ static const struct pio_program ws2812_parallel_program = { .instructions = ws2812_parallel_program_instructions, .length = 4, .origin = -1, - .pio_version = 0, -#if PICO_PIO_VERSION > 0 - .used_gpio_ranges = 0x0 -#endif }; static inline pio_sm_config ws2812_parallel_program_get_default_config(uint offset) { diff --git a/lib/pico_pio_usb b/lib/pico_pio_usb index fe9133fc5..0f747aaa0 160000 --- a/lib/pico_pio_usb +++ b/lib/pico_pio_usb @@ -1 +1 @@ -Subproject commit fe9133fc513b82cc3dc62c67cb51f2339cf29ef7 +Subproject commit 0f747aaa0c16f750bdfa2ba37ec25d6c8e1bc117 diff --git a/pico_sdk_import.cmake b/pico_sdk_import.cmake index a0721d0d1..65f8a6f7d 100644 --- a/pico_sdk_import.cmake +++ b/pico_sdk_import.cmake @@ -18,20 +18,9 @@ if (DEFINED ENV{PICO_SDK_FETCH_FROM_GIT_PATH} AND (NOT PICO_SDK_FETCH_FROM_GIT_P message("Using PICO_SDK_FETCH_FROM_GIT_PATH from environment ('${PICO_SDK_FETCH_FROM_GIT_PATH}')") endif () -if (DEFINED ENV{PICO_SDK_FETCH_FROM_GIT_TAG} AND (NOT PICO_SDK_FETCH_FROM_GIT_TAG)) - set(PICO_SDK_FETCH_FROM_GIT_TAG $ENV{PICO_SDK_FETCH_FROM_GIT_TAG}) - message("Using PICO_SDK_FETCH_FROM_GIT_TAG from environment ('${PICO_SDK_FETCH_FROM_GIT_TAG}')") -endif () - -if (PICO_SDK_FETCH_FROM_GIT AND NOT PICO_SDK_FETCH_FROM_GIT_TAG) - set(PICO_SDK_FETCH_FROM_GIT_TAG "master") - message("Using master as default value for PICO_SDK_FETCH_FROM_GIT_TAG") -endif() - set(PICO_SDK_PATH "${PICO_SDK_PATH}" CACHE PATH "Path to the Raspberry Pi Pico SDK") set(PICO_SDK_FETCH_FROM_GIT "${PICO_SDK_FETCH_FROM_GIT}" CACHE BOOL "Set to ON to fetch copy of SDK from git if not otherwise locatable") set(PICO_SDK_FETCH_FROM_GIT_PATH "${PICO_SDK_FETCH_FROM_GIT_PATH}" CACHE FILEPATH "location to download SDK") -set(PICO_SDK_FETCH_FROM_GIT_TAG "${PICO_SDK_FETCH_FROM_GIT_TAG}" CACHE FILEPATH "release tag for SDK") if (NOT PICO_SDK_PATH) if (PICO_SDK_FETCH_FROM_GIT) @@ -45,14 +34,14 @@ if (NOT PICO_SDK_PATH) FetchContent_Declare( pico_sdk GIT_REPOSITORY https://github.com/raspberrypi/pico-sdk - GIT_TAG ${PICO_SDK_FETCH_FROM_GIT_TAG} + GIT_TAG master GIT_SUBMODULES_RECURSE FALSE ) else () FetchContent_Declare( pico_sdk GIT_REPOSITORY https://github.com/raspberrypi/pico-sdk - GIT_TAG ${PICO_SDK_FETCH_FROM_GIT_TAG} + GIT_TAG master ) endif ()