Release 2.1.1

.github/workflows/bazel_build.yml

@@ -41,8 +41,8 @@ jobs:
       - name: Full Bazel build with develop Picotool
         run: python3 tools/run_all_bazel_checks.py --program=build --picotool-dir=lib/picotool
       # Checks that the current BCR-requested version of Picotool builds.
-      - name: Bazel Picotool backwards compatibility
-        run: bazel build @picotool//:picotool
+      # - name: Bazel Picotool backwards compatibility
+      #   run: bazel build @picotool//:picotool
   other-bazel-checks:
     runs-on: ubuntu-latest
     steps:

MODULE.bazel

@@ -1,12 +1,12 @@
 module(
     name = "pico-sdk",
-    version = "2.1.1-develop",
+    version = "2.1.1",
 )
 
 bazel_dep(name = "platforms", version = "0.0.9")
 bazel_dep(name = "bazel_skylib", version = "1.6.1")
 bazel_dep(name = "rules_python", version = "0.36.0")
-bazel_dep(name = "picotool", version = "2.1.0")
+bazel_dep(name = "picotool", version = "2.1.1")
 bazel_dep(name = "rules_cc", version = "0.0.10")
 
 http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

pico_sdk_version.cmake

@@ -9,7 +9,7 @@ set(PICO_SDK_VERSION_MINOR 1)
 set(PICO_SDK_VERSION_REVISION 1)
 # PICO_BUILD_DEFINE: PICO_SDK_VERSION_PRE_RELEASE_ID, Optional SDK pre-release version identifier, default=Current SDK pre-release identifier, type=string, group=pico_base
 # PICO_CMAKE_CONFIG: PICO_SDK_VERSION_PRE_RELEASE_ID, Optional SDK pre-release version identifier, default=Current SDK pre-release identifier, type=string, group=pico_base
-set(PICO_SDK_VERSION_PRE_RELEASE_ID develop)
+# set(PICO_SDK_VERSION_PRE_RELEASE_ID develop)
 
 # PICO_BUILD_DEFINE: PICO_SDK_VERSION_STRING, SDK version string, type=string, default=Current SDK version string, group=pico_base
 # PICO_CMAKE_CONFIG: PICO_SDK_VERSION_STRING, SDK version string, type=string, default=Current SDK version string, group=pico_base

src/rp2_common/hardware_pio/pio.c

@@ -168,7 +168,7 @@ static int add_program_at_offset(PIO pio, const pio_program_t *program, uint off
             // base is 16 we need to flip bit 4 (which is equivalent to subtracting 16 from
             // the original number 16-47 stored as 16-31 and 0-15)
             static_assert(PIO_GPIOBASE_BITS == 16, ""); // only works for gpio base being 0 or 16
-            instr ^= pio_get_gpio_base(pio);
+            instr ^= (uint16_t)pio_get_gpio_base(pio);
         }
 #endif
         pio->instr_mem[offset + i] = pio_instr_bits_jmp != _pio_major_instr_bits(instr) ? instr : instr + offset;

tools/CMakeLists.txt

@@ -101,7 +101,7 @@ endfunction()
 
 # Check picotool is installed, or download and build it if not installed
 function(pico_init_picotool)
-    set(picotool_VERSION_REQUIRED 2.1.0)
+    set(picotool_VERSION_REQUIRED 2.1.1)
     if (NOT TARGET picotool AND NOT DEFINED picotool_FOUND)
         # Build path of local install dir
         if (DEFINED ENV{PICOTOOL_FETCH_FROM_GIT_PATH} AND (NOT PICOTOOL_FETCH_FROM_GIT_PATH))