From 2d16215ac1ab7de2bda43514ae102227072b2308 Mon Sep 17 00:00:00 2001
From: Fortinbra <fortinbra@becauseimclever.com>
Date: Fri, 4 Oct 2024 20:30:17 -0500
Subject: [PATCH] More updates

---
 .gitignore                             |  1 +
 lib/NeoPico/src/generated/ws2812.pio.h | 10 ++++++++++
 pico_sdk_import.cmake                  | 15 +++++++++++++--
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index db45ca04d..0f485cc82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ env.ini
 .devcontainer
 *Dockerfile
 *docker-compose.yml
+lib/NeoPico/src/generated/ws2812.pio.h
diff --git a/lib/NeoPico/src/generated/ws2812.pio.h b/lib/NeoPico/src/generated/ws2812.pio.h
index 8cbeea6b7..4a564101f 100644
--- a/lib/NeoPico/src/generated/ws2812.pio.h
+++ b/lib/NeoPico/src/generated/ws2812.pio.h
@@ -14,6 +14,7 @@
 
 #define ws2812_wrap_target 0
 #define ws2812_wrap 3
+#define ws2812_pio_version 0
 
 #define ws2812_T1 2
 #define ws2812_T2 5
@@ -33,6 +34,10 @@ 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) {
@@ -65,6 +70,7 @@ 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
@@ -84,6 +90,10 @@ 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/pico_sdk_import.cmake b/pico_sdk_import.cmake
index 65f8a6f7d..a0721d0d1 100644
--- a/pico_sdk_import.cmake
+++ b/pico_sdk_import.cmake
@@ -18,9 +18,20 @@ 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)
@@ -34,14 +45,14 @@ if (NOT PICO_SDK_PATH)
             FetchContent_Declare(
                     pico_sdk
                     GIT_REPOSITORY https://github.com/raspberrypi/pico-sdk
-                    GIT_TAG master
+                    GIT_TAG ${PICO_SDK_FETCH_FROM_GIT_TAG}
                     GIT_SUBMODULES_RECURSE FALSE
             )
         else ()
             FetchContent_Declare(
                     pico_sdk
                     GIT_REPOSITORY https://github.com/raspberrypi/pico-sdk
-                    GIT_TAG master
+                    GIT_TAG ${PICO_SDK_FETCH_FROM_GIT_TAG}
             )
         endif ()