Added static vars chapter

0x0014_static-variables/.gitignore

@@ -1,5 +1,2 @@
-.idea
-_deps
-cmake-*
 build
-.DS_Store
+!.vscode/*

0x0014_static-variables/.vscode/.cortex-debug.peripherals.state.json

@@ -1 +0,0 @@
-[]

0x0014_static-variables/.vscode/.cortex-debug.registers.state.json

@@ -1 +0,0 @@
-[]

0x0014_static-variables/.vscode/c_cpp_properties.json

@@ -1,18 +1,22 @@
 {
-  "configurations": [
+    "configurations": [
-    {
+        {
-      "name": "Pico",
+            "name": "Pico",
-      "includePath": [
+            "includePath": [
-        "${workspaceFolder}/**",
+                "${workspaceFolder}/**",
-        "${env:PICO_SDK_PATH}/**"
+                "${userHome}/.pico-sdk/sdk/2.2.0/**"
-      ],
+            ],
-      "defines": [],
+            "forcedInclude": [
-      "compilerPath": "${env:PICO_INSTALL_PATH}/gcc-arm-none-eabi/bin/arm-none-eabi-gcc.exe",
+                "${workspaceFolder}/build/generated/pico_base/pico/config_autogen.h",
-      "cStandard": "c11",
+                "${userHome}/.pico-sdk/sdk/2.2.0/src/common/pico_base_headers/include/pico.h"
-      "cppStandard": "c++11",
+            ],
-      "intelliSenseMode": "linux-gcc-arm",
+            "defines": [],
-      "configurationProvider": "ms-vscode.cmake-tools"
+            "compilerPath": "${userHome}/.pico-sdk/toolchain/14_2_Rel1/bin/arm-none-eabi-gcc.exe",
-    }
+            "compileCommands": "${workspaceFolder}/build/compile_commands.json",
-  ],
+            "cStandard": "c17",
-  "version": 4
+            "cppStandard": "c++14",
+            "intelliSenseMode": "linux-gcc-arm"
+        }
+    ],
+    "version": 4
 }

0x0014_static-variables/.vscode/cmake-kits.json

@@ -0,0 +1,15 @@
+[
+    {
+        "name": "Pico",
+        "compilers": {
+            "C": "${command:raspberry-pi-pico.getCompilerPath}",
+            "CXX": "${command:raspberry-pi-pico.getCxxCompilerPath}"
+        },
+        "environmentVariables": {
+            "PATH": "${command:raspberry-pi-pico.getEnvPath};${env:PATH}"
+        },
+        "cmakeSettings": {
+            "Python3_EXECUTABLE": "${command:raspberry-pi-pico.getPythonPath}"
+        }
+    }
+]

0x0014_static-variables/.vscode/extensions.json

@@ -1,9 +1,9 @@
 {
-  "recommendations": [
+    "recommendations": [
-    "marus25.cortex-debug",
+        "marus25.cortex-debug",
-    "ms-vscode.cmake-tools",
+        "ms-vscode.cpptools",
-    "ms-vscode.cpptools",
+        "ms-vscode.cpptools-extension-pack",
-    "ms-vscode.cpptools-extension-pack",
+        "ms-vscode.vscode-serial-monitor",
-    "ms-vscode.vscode-serial-monitor"
+        "raspberry-pi.raspberry-pi-pico"
-  ]
+    ]
 }

0x0014_static-variables/.vscode/launch.json

@@ -1,58 +1,50 @@
 {
-  "version": "0.2.0",
+    "version": "0.2.0",
-  "configurations": [
+    "configurations": [
-    {
+        {
-      "name": "Pico Debug (Cortex-Debug)",
+            "name": "Pico Debug (Cortex-Debug)",
-      "cwd": "${workspaceFolder}",
+            "cwd": "${userHome}/.pico-sdk/openocd/0.12.0+dev/scripts",
-      "executable": "${command:cmake.launchTargetPath}",
+            "executable": "${command:raspberry-pi-pico.launchTargetPath}",
-      "request": "launch",
+            "request": "launch",
-      "type": "cortex-debug",
+            "type": "cortex-debug",
-      "servertype": "openocd",
+            "servertype": "openocd",
-      "gdbPath": "arm-none-eabi-gdb",
+            "serverpath": "${userHome}/.pico-sdk/openocd/0.12.0+dev/openocd.exe",
-      "device": "RP2040",
+            "gdbPath": "${command:raspberry-pi-pico.getGDBPath}",
-      "configFiles": [
+            "device": "${command:raspberry-pi-pico.getChipUppercase}",
-        "interface/cmsis-dap.cfg",
+            "configFiles": [
-        "target/rp2040.cfg"
+                "interface/cmsis-dap.cfg",
-      ],
+                "target/${command:raspberry-pi-pico.getTarget}.cfg"
-      "svdFile": "${env:PICO_SDK_PATH}/src/rp2040/hardware_regs/rp2040.svd",
+            ],
-      "runToEntryPoint": "main",
+            "svdFile": "${userHome}/.pico-sdk/sdk/2.2.0/src/${command:raspberry-pi-pico.getChip}/hardware_regs/${command:raspberry-pi-pico.getChipUppercase}.svd",
-      "openOCDLaunchCommands": [
+            "runToEntryPoint": "main",
-        "adapter speed 1000"
+            // Fix for no_flash binaries, where monitor reset halt doesn't do what is expected
-      ]
+            // Also works fine for flash binaries
-    },
+            "overrideLaunchCommands": [
-    {
+                "monitor reset init",
-      "name": "Pico Debug (Cortex-Debug with external OpenOCD)",
+                "load \"${command:raspberry-pi-pico.launchTargetPath}\""
-      "cwd": "${workspaceFolder}",
+            ],
-      "executable": "${command:cmake.launchTargetPath}",
+            "openOCDLaunchCommands": [
-      "request": "launch",
+                "adapter speed 5000"
-      "type": "cortex-debug",
+            ]
-      "servertype": "external",
+        },
-      "gdbTarget": "localhost:3333",
+        {
-      "gdbPath": "arm-none-eabi-gdb",
+            "name": "Pico Debug (Cortex-Debug with external OpenOCD)",
-      "device": "RP2040",
+            "cwd": "${workspaceRoot}",
-      "svdFile": "${env:PICO_SDK_PATH}/src/rp2040/hardware_regs/rp2040.svd",
+            "executable": "${command:raspberry-pi-pico.launchTargetPath}",
-      "runToEntryPoint": "main"
+            "request": "launch",
-    },
+            "type": "cortex-debug",
-    {
+            "servertype": "external",
-      "name": "Pico Debug (C++ Debugger)",
+            "gdbTarget": "localhost:3333",
-      "type": "cppdbg",
+            "gdbPath": "${command:raspberry-pi-pico.getGDBPath}",
-      "request": "launch",
+            "device": "${command:raspberry-pi-pico.getChipUppercase}",
-      "cwd": "${workspaceFolder}",
+            "svdFile": "${userHome}/.pico-sdk/sdk/2.2.0/src/${command:raspberry-pi-pico.getChip}/hardware_regs/${command:raspberry-pi-pico.getChipUppercase}.svd",
-      "program": "${command:cmake.launchTargetPath}",
+            "runToEntryPoint": "main",
-      "MIMode": "gdb",
+            // Fix for no_flash binaries, where monitor reset halt doesn't do what is expected
-      "miDebuggerPath": "arm-none-eabi-gdb",
+            // Also works fine for flash binaries
-      "miDebuggerServerAddress": "localhost:3333",
+            "overrideLaunchCommands": [
-      "debugServerPath": "openocd",
+                "monitor reset init",
-      "debugServerArgs": "-f interface/cmsis-dap.cfg -f target/rp2040.cfg -c \"adapter speed 1000\"",
+                "load \"${command:raspberry-pi-pico.launchTargetPath}\""
-      "serverStarted": "Listening on port .* for gdb connections",
+            ]
-      "filterStderr": true,
+        },
-      "stopAtEntry": true,
+    ]
-      "hardwareBreakpoints": {
-        "require": true,
-        "limit": 4
-      },
-      "preLaunchTask": "Flash",
-      "svdPath": "${env:PICO_SDK_PATH}/src/rp2040/hardware_regs/rp2040.svd"
-    }
-  ]
 }

0x0014_static-variables/.vscode/settings.json

@@ -1,30 +1,40 @@
 {
-    // These settings tweaks to the cmake plugin will ensure
+    "cmake.showSystemKits": false,
-    // that you debug using cortex-debug instead of trying to launch
+    "cmake.options.statusBarVisibility": "hidden",
-    // a Pico binary on the host
+    "cmake.options.advanced": {
-    "cmake.statusbar.advanced": {
+        "build": {
-        "debug": {
+            "statusBarVisibility": "hidden"
-            "visibility": "hidden"
         },
         "launch": {
-            "visibility": "hidden"
+            "statusBarVisibility": "hidden"
         },
-        "build": {
+        "debug": {
-            "visibility": "hidden"
+            "statusBarVisibility": "hidden"
-        },
-        "buildTarget": {
-            "visibility": "hidden"
         }
     },
-    "cmake.buildBeforeRun": true,
+    "cmake.configureOnEdit": false,
-    "cmake.configureOnOpen": true,
+    "cmake.automaticReconfigure": false,
-    "cmake.configureSettings": {
+    "cmake.configureOnOpen": false,
-      "CMAKE_MODULE_PATH": "${env:PICO_INSTALL_PATH}/pico-sdk-tools"
-    },
     "cmake.generator": "Ninja",
-    "C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools",
+    "cmake.cmakePath": "${userHome}/.pico-sdk/cmake/v3.31.5/bin/cmake",
-    "C_Cpp.errorSquiggles": "enabled",
+    "C_Cpp.debugShortcut": false,
-    "files.associations": {
+    "terminal.integrated.env.windows": {
-        "stdlib.h": "c"
+        "PICO_SDK_PATH": "${env:USERPROFILE}/.pico-sdk/sdk/2.2.0",
-    }
+        "PICO_TOOLCHAIN_PATH": "${env:USERPROFILE}/.pico-sdk/toolchain/14_2_Rel1",
+        "Path": "${env:USERPROFILE}/.pico-sdk/toolchain/14_2_Rel1/bin;${env:USERPROFILE}/.pico-sdk/picotool/2.2.0-a4/picotool;${env:USERPROFILE}/.pico-sdk/cmake/v3.31.5/bin;${env:USERPROFILE}/.pico-sdk/ninja/v1.12.1;${env:PATH}"
+    },
+    "terminal.integrated.env.osx": {
+        "PICO_SDK_PATH": "${env:HOME}/.pico-sdk/sdk/2.2.0",
+        "PICO_TOOLCHAIN_PATH": "${env:HOME}/.pico-sdk/toolchain/14_2_Rel1",
+        "PATH": "${env:HOME}/.pico-sdk/toolchain/14_2_Rel1/bin:${env:HOME}/.pico-sdk/picotool/2.2.0-a4/picotool:${env:HOME}/.pico-sdk/cmake/v3.31.5/bin:${env:HOME}/.pico-sdk/ninja/v1.12.1:${env:PATH}"
+    },
+    "terminal.integrated.env.linux": {
+        "PICO_SDK_PATH": "${env:HOME}/.pico-sdk/sdk/2.2.0",
+        "PICO_TOOLCHAIN_PATH": "${env:HOME}/.pico-sdk/toolchain/14_2_Rel1",
+        "PATH": "${env:HOME}/.pico-sdk/toolchain/14_2_Rel1/bin:${env:HOME}/.pico-sdk/picotool/2.2.0-a4/picotool:${env:HOME}/.pico-sdk/cmake/v3.31.5/bin:${env:HOME}/.pico-sdk/ninja/v1.12.1:${env:PATH}"
+    },
+    "raspberry-pi-pico.cmakeAutoConfigure": true,
+    "raspberry-pi-pico.useCmakeTools": false,
+    "raspberry-pi-pico.cmakePath": "${HOME}/.pico-sdk/cmake/v3.31.5/bin/cmake",
+    "raspberry-pi-pico.ninjaPath": "${HOME}/.pico-sdk/ninja/v1.12.1/ninja"
 }

0x0014_static-variables/.vscode/tasks.json

@@ -1,29 +1,102 @@
 {
-  "version": "2.0.0",
+    "version": "2.0.0",
-  "tasks": [
+    "tasks": [
-    {
+        {
-      "label": "Flash",
+            "label": "Compile Project",
-      "type": "shell",
+            "type": "process",
-      "command": "openocd",
+            "isBuildCommand": true,
-      "args": [
+            "command": "${userHome}/.pico-sdk/ninja/v1.12.1/ninja",
-        "-f",
+            "args": ["-C", "${workspaceFolder}/build"],
-        "interface/cmsis-dap.cfg",
+            "group": "build",
-        "-f",
+            "presentation": {
-        "target/rp2040.cfg",
+                "reveal": "always",
-        "-c",
+                "panel": "dedicated"
-        "adapter speed 1000; program {${command:cmake.launchTargetPath}} verify reset exit"
+            },
-      ],
+            "problemMatcher": "$gcc",
-      "problemMatcher": []
+            "windows": {
-    },
+                "command": "${env:USERPROFILE}/.pico-sdk/ninja/v1.12.1/ninja.exe"
-    {
+            }
-      "label": "Build",
+        },
-      "type": "cmake",
+        {
-      "command": "build",
+            "label": "Run Project",
-      "problemMatcher": "$gcc",
+            "type": "process",
-      "group": {
+            "command": "${env:HOME}/.pico-sdk/picotool/2.2.0-a4/picotool/picotool",
-        "kind": "build",
+            "args": [
-        "isDefault": true
+                "load",
-      }
+                "${command:raspberry-pi-pico.launchTargetPath}",
-    }
+                "-fx"
-  ]
+            ],
+            "presentation": {
+                "reveal": "always",
+                "panel": "dedicated"
+            },
+            "problemMatcher": [],
+            "windows": {
+                "command": "${env:USERPROFILE}/.pico-sdk/picotool/2.2.0-a4/picotool/picotool.exe"
+            }
+        },
+        {
+            "label": "Flash",
+            "type": "process",
+            "command": "${userHome}/.pico-sdk/openocd/0.12.0+dev/openocd.exe",
+            "args": [
+                "-s",
+                "${userHome}/.pico-sdk/openocd/0.12.0+dev/scripts",
+                "-f",
+                "interface/cmsis-dap.cfg",
+                "-f",
+                "target/${command:raspberry-pi-pico.getTarget}.cfg",
+                "-c",
+                "adapter speed 5000; program \"${command:raspberry-pi-pico.launchTargetPath}\" verify reset exit"
+            ],
+            "problemMatcher": [],
+            "windows": {
+                "command": "${env:USERPROFILE}/.pico-sdk/openocd/0.12.0+dev/openocd.exe",
+            }
+        },
+        {
+            "label": "Rescue Reset",
+            "type": "process",
+            "command": "${userHome}/.pico-sdk/openocd/0.12.0+dev/openocd.exe",
+            "args": [
+                "-s",
+                "${userHome}/.pico-sdk/openocd/0.12.0+dev/scripts",
+                "-f",
+                "interface/cmsis-dap.cfg",
+                "-f",
+                "target/${command:raspberry-pi-pico.getChip}-rescue.cfg",
+                "-c",
+                "adapter speed 5000; reset halt; exit"
+            ],
+            "problemMatcher": [],
+            "windows": {
+                "command": "${env:USERPROFILE}/.pico-sdk/openocd/0.12.0+dev/openocd.exe",
+            }
+        },
+        {
+            "label": "RISC-V Reset (RP2350)",
+            "type": "process",
+            "command": "${userHome}/.pico-sdk/openocd/0.12.0+dev/openocd.exe",
+            "args": [
+                "-s",
+                "${userHome}/.pico-sdk/openocd/0.12.0+dev/scripts",
+                "-c",
+                "set USE_CORE { rv0 rv1 cm0 cm1 }",
+                "-f",
+                "interface/cmsis-dap.cfg",
+                "-f",
+                "target/rp2350.cfg",
+                "-c",
+                "adapter speed 5000; init;",
+                "-c",
+                "write_memory 0x40120158 8 { 0x3 }; echo [format \"Info : ARCHSEL 0x%02x\" [read_memory 0x40120158 8 1]];",
+                "-c",
+                "reset halt; targets rp2350.rv0; echo [format \"Info : ARCHSEL_STATUS 0x%02x\" [read_memory 0x4012015C 8 1]]; exit"
+            ],
+            "problemMatcher": [],
+            "windows": {
+                "command": "${env:USERPROFILE}/.pico-sdk/openocd/0.12.0+dev/openocd.exe",
+            }
+        }
+    ]
 }

0x0014_static-variables/0x0014_static-variables.c

@@ -0,0 +1,31 @@
+#include <stdio.h>
+#include "pico/stdlib.h"
+
+int main(void) {
+    stdio_init_all();
+
+    const uint BUTTON_GPIO = 15;
+    const uint LED_GPIO = 16;
+    bool pressed = 0;
+
+    gpio_init(BUTTON_GPIO);
+    gpio_set_dir(BUTTON_GPIO, GPIO_IN);
+    gpio_pull_up(BUTTON_GPIO);
+
+    gpio_init(LED_GPIO);
+    gpio_set_dir(LED_GPIO, GPIO_OUT);
+
+    while (true) {
+        uint8_t regular_fav_num = 42;
+        static uint8_t static_fav_num = 42;
+        
+        printf("regular_fav_num: %d\r\n", regular_fav_num);
+        printf("static_fav_num: %d\r\n", static_fav_num);
+        
+        regular_fav_num++;
+        static_fav_num++;
+        
+        pressed = gpio_get(BUTTON_GPIO);
+        gpio_put(LED_GPIO, pressed ? 0 : 1);
+    }
+}

0x0014_static-variables/CMakeLists.txt

@@ -1,21 +1,57 @@
+# Generated Cmake Pico project file
+
 cmake_minimum_required(VERSION 3.13)
 
-include(pico_sdk_import.cmake)
-project(0x0014_static-variables C CXX ASM)
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
+# Initialise pico_sdk from installed location
+# (note this can come from environment, CMake cache etc)
+
+# == DO NOT EDIT THE FOLLOWING LINES for the Raspberry Pi Pico VS Code Extension to work ==
+if(WIN32)
+    set(USERHOME $ENV{USERPROFILE})
+else()
+    set(USERHOME $ENV{HOME})
+endif()
+set(sdkVersion 2.2.0)
+set(toolchainVersion 14_2_Rel1)
+set(picotoolVersion 2.2.0-a4)
+set(picoVscode ${USERHOME}/.pico-sdk/cmake/pico-vscode.cmake)
+if (EXISTS ${picoVscode})
+    include(${picoVscode})
+endif()
+# ====================================================================================
+set(PICO_BOARD pico2 CACHE STRING "Board type")
+
+# Pull in Raspberry Pi Pico SDK (must be before project)
+include(pico_sdk_import.cmake)
+
+project(0x0014_static-variables C CXX ASM)
+
+# Initialise the Raspberry Pi Pico SDK
 pico_sdk_init()
 
-add_executable(0x0014_static-variables
+# Add executable. Default name is the project name, version 0.1
-    main.c
-)
 
-pico_enable_stdio_usb(0x0014_static-variables 1)
+add_executable(0x0014_static-variables 0x0014_static-variables.c )
+
+pico_set_program_name(0x0014_static-variables "0x0014_static-variables")
+pico_set_program_version(0x0014_static-variables "0.1")
+
+# Modify the below lines to enable/disable output over UART/USB
 pico_enable_stdio_uart(0x0014_static-variables 1)
+pico_enable_stdio_usb(0x0014_static-variables 0)
+
+# Add the standard library to the build
+target_link_libraries(0x0014_static-variables
+        pico_stdlib)
+
+# Add the standard include files to the build
+target_include_directories(0x0014_static-variables PRIVATE
+        ${CMAKE_CURRENT_LIST_DIR}
+)
 
 pico_add_extra_outputs(0x0014_static-variables)
 
-target_link_libraries(0x0014_static-variables 
-    pico_stdlib
-)

0x0014_static-variables/main.c

@@ -1,17 +0,0 @@
-#include <stdio.h>
-#include "pico/stdlib.h"
-
-int main(void) {
-    stdio_init_all();
-
-    while (true) {
-        static int static_fav_num = 42;
-        int regular_fav_num = 42;
-
-        printf("static_fav_num: %d\r\n", static_fav_num);
-        printf("regular_fav_num: %d\r\n", regular_fav_num);
-
-        static_fav_num++;
-        regular_fav_num++;
-    }
-}

0x0014_static-variables/pico_sdk_import.cmake

@@ -3,6 +3,28 @@
 # This can be dropped into an external project to help locate this SDK
 # It should be include()ed prior to project()
 
+# Copyright 2020 (c) 2020 Raspberry Pi (Trading) Ltd.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
+# following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following
+# disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following
+# disclaimer in the documentation and/or other materials provided with the distribution.
+#
+# 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 if (DEFINED ENV{PICO_SDK_PATH} AND (NOT PICO_SDK_PATH))
     set(PICO_SDK_PATH $ENV{PICO_SDK_PATH})
     message("Using PICO_SDK_PATH from environment ('${PICO_SDK_PATH}')")
@@ -18,9 +40,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)
@@ -29,25 +62,40 @@ if (NOT PICO_SDK_PATH)
         if (PICO_SDK_FETCH_FROM_GIT_PATH)
             get_filename_component(FETCHCONTENT_BASE_DIR "${PICO_SDK_FETCH_FROM_GIT_PATH}" REALPATH BASE_DIR "${CMAKE_SOURCE_DIR}")
         endif ()
-        # GIT_SUBMODULES_RECURSE was added in 3.17
+        FetchContent_Declare(
-        if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.17.0")
+                pico_sdk
-            FetchContent_Declare(
+                GIT_REPOSITORY https://github.com/raspberrypi/pico-sdk
-                    pico_sdk
+                GIT_TAG ${PICO_SDK_FETCH_FROM_GIT_TAG}
-                    GIT_REPOSITORY https://github.com/raspberrypi/pico-sdk
+        )
-                    GIT_TAG master
-                    GIT_SUBMODULES_RECURSE FALSE
-            )
-        else ()
-            FetchContent_Declare(
-                    pico_sdk
-                    GIT_REPOSITORY https://github.com/raspberrypi/pico-sdk
-                    GIT_TAG master
-            )
-        endif ()
 
         if (NOT pico_sdk)
             message("Downloading Raspberry Pi Pico SDK")
-            FetchContent_Populate(pico_sdk)
+            # GIT_SUBMODULES_RECURSE was added in 3.17
+            if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.17.0")
+                FetchContent_Populate(
+                        pico_sdk
+                        QUIET
+                        GIT_REPOSITORY https://github.com/raspberrypi/pico-sdk
+                        GIT_TAG ${PICO_SDK_FETCH_FROM_GIT_TAG}
+                        GIT_SUBMODULES_RECURSE FALSE
+
+                        SOURCE_DIR ${FETCHCONTENT_BASE_DIR}/pico_sdk-src
+                        BINARY_DIR ${FETCHCONTENT_BASE_DIR}/pico_sdk-build
+                        SUBBUILD_DIR ${FETCHCONTENT_BASE_DIR}/pico_sdk-subbuild
+                )
+            else ()
+                FetchContent_Populate(
+                        pico_sdk
+                        QUIET
+                        GIT_REPOSITORY https://github.com/raspberrypi/pico-sdk
+                        GIT_TAG ${PICO_SDK_FETCH_FROM_GIT_TAG}
+
+                        SOURCE_DIR ${FETCHCONTENT_BASE_DIR}/pico_sdk-src
+                        BINARY_DIR ${FETCHCONTENT_BASE_DIR}/pico_sdk-build
+                        SUBBUILD_DIR ${FETCHCONTENT_BASE_DIR}/pico_sdk-subbuild
+                )
+            endif ()
+
             set(PICO_SDK_PATH ${pico_sdk_SOURCE_DIR})
         endif ()
         set(FETCHCONTENT_BASE_DIR ${FETCHCONTENT_BASE_DIR_SAVE})