Merge branch 'master' into patch-3

Author: kilograham

.github/workflows/choco_packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="gcc-arm-embedded" version="10.2.1" />
-  <package id="cmake" version="3.25.2" installArguments="ADD_CMAKE_TO_PATH=System" />
+  <package id="cmake" version="3.31.0" installArguments="ADD_CMAKE_TO_PATH=System" />
   <package id="mingw" version="12.2.0" />
   <package id="ninja" version="1.11.1" />
 </packages>

.github/workflows/cmake.yml

@@ -18,12 +18,12 @@ jobs:
         mkdir -p "${{ github.workspace }}"
 
     - name: Checkout pico-examples
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         path: pico-examples
 
     - name: Checkout pico-sdk/develop
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         repository: raspberrypi/pico-sdk
         ref: develop

.github/workflows/macOS.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   build:
-    runs-on: macos-12
+    runs-on: macos-latest
     steps:
       - name: Clean workspace
         run: |
@@ -18,12 +18,12 @@ jobs:
           mkdir -p "${{ github.workspace }}"
 
       - name: Checkout pico-examples
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           path: pico-examples
 
       - name: Checkout pico-sdk/develop
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           repository: raspberrypi/pico-sdk
           ref: develop

.github/workflows/multi-gcc.yml

@@ -19,12 +19,12 @@ jobs:
         mkdir -p "${{ github.workspace }}"
 
     - name: Checkout pico-examples
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         path: pico-examples
 
     - name: Checkout pico-sdk/develop
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         repository: raspberrypi/pico-sdk
         ref: develop

.github/workflows/windows.yml

@@ -18,12 +18,12 @@ jobs:
           rm -rf "${{ github.workspace }}/pico-sdk"
           rm -rf "${{ github.workspace }}/pico-examples"
       - name: Checkout pico-examples
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           path: pico-examples
 
       - name: Checkout pico-sdk/develop
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           repository: raspberrypi/pico-sdk
           ref: develop
@@ -39,8 +39,7 @@ jobs:
 
       - name: Build Project
         working-directory: ${{github.workspace}}/pico-examples
-        # bash required otherwise this mysteriously (no error) fails at "Generating cyw43_bus_pio_spi.pio.h"
-        shell: bash
+        shell: pwsh
         run: |
           mkdir build
           cd build

CMakeLists.txt

@@ -9,8 +9,8 @@ project(pico_examples C CXX ASM)
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_CXX_STANDARD 17)
 
-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 "2.1.0")
+    message(FATAL_ERROR "Raspberry Pi Pico SDK version 2.1.0 (or later) required. Your version is ${PICO_SDK_VERSION_STRING}")
 endif()
 
 set(PICO_EXAMPLES_PATH ${PROJECT_SOURCE_DIR})
@@ -59,6 +59,7 @@ endif()
 
 # Hardware-specific examples in subdirectories:
 add_subdirectory(adc)
+add_subdirectory(binary_info)
 add_subdirectory(bootloaders)
 add_subdirectory(clocks)
 add_subdirectory(cmake)

README.md

@@ -19,9 +19,9 @@ App| Description
 ---|----------------------------------------------------------------------------|---
 [hello_serial](hello_world/serial) | The obligatory Hello World program for Pico (Output over serial version)   |
 [hello_usb](hello_world/usb) | The obligatory Hello World program for Pico (Output over USB version)      | https://rptl.io/pico-hello-usb
-[blink](blink) | Blink an LED on and off. Works on both boards with regular LEDs and Pico W | https://rptl.io/pico-blink
-[blink_simple](blink_simple) | Blink an LED on and off. Does not work on Pico W.                          | https://rptl.io/pico-blink
-[picow_blink](pico_w/wifi/blink) | Blinks the Pico W on-board LED (which is connected via the WiFi chip).     | http://rptl.io/pico-w-blink
+[blink](blink) | Blink a LED on and off. Works on both boards with regular LEDs and boards like Pico W where the led is connected via the Wi-Fi chip | https://rptl.io/pico-blink
+[blink_simple](blink_simple) | Blink a LED on and off. Does not work on boards like Pico W where the led is connected via the Wi-Fi chip. | https://rptl.io/pico-blink
+[picow_blink](pico_w/wifi/blink) | Blinks the on-board LED on boards like Pico W where the led is connected via the Wi-Fi chip. | http://rptl.io/pico-w-blink
 
 ### ADC
 
@@ -35,6 +35,13 @@ App|Description
 [dma_capture](adc/dma_capture) | Use the DMA to capture many samples from the ADC.
 [read_vsys](adc/read_vsys) | Demonstrates how to read VSYS to get the voltage of the power supply.
 
+### Binary Info
+
+App|Description
+---|---
+[blink_any](binary_info/blink_any) | Uses `bi_ptr` variables to create a configurable blink binary - see the separate [README](binary_info/README.md) for more details
+[hello_anything](binary_info/hello_anything) | Uses `bi_ptr` variables to create a configurable hello_world binary - see the separate [README](binary_info/README.md) for more details
+
 ### Bootloaders (RP235x Only)
 App|Description
 ---|---
@@ -128,6 +135,7 @@ App|Description
 [pcf8523_i2c](i2c/pcf8523_i2c) | Read time and date values from a real time clock. Set current time and alarms on it.
 [ht16k33_i2c](i2c/ht16k33_i2c) | Drive a 4 digit 14 segment LED with an HT16K33.
 [slave_mem_i2c](i2c/slave_mem_i2c) | i2c slave example where the slave implements a 256 byte memory
+[slave_mem_i2c_burst](i2c/slave_mem_i2c) | i2c slave example where the slave implements a 256 byte memory. This version inefficiently writes each byte in a separate call to demonstrate read and write burst mode.
 
 ### Interpolator
 
@@ -157,15 +165,16 @@ App|Description
 [blinky](picoboard/blinky) | Blink "hello, world" in Morse code on Pico's LED
 [button](picoboard/button) | Use Pico's BOOTSEL button as a regular button input, by temporarily suspending flash access.
 
-### Pico W Networking
+### Pico Networking
 
-These examples are for the Pico W, and are only available for `PICO_BOARD=pico_w`
+These networking examples are only available if Wi-Fi is supported by the board.
 
 App|Description
 ---|---
 [picow_access_point](pico_w/wifi/access_point) | Starts a WiFi access point, and fields DHCP requests.
 [picow_blink](pico_w/wifi/blink) | Blinks the on-board LED (which is connected via the WiFi chip).
-[picow_blink_slow_clock](pico_w/wifi/blink_slow_clock) | Blinks the on-board LED (which is connected via the WiFi chip) with a slower system clock to show how to reconfigure communication with the WiFi chip under those circumstances
+[picow_blink_slow_clock](pico_w/wifi/blink) | Blinks the on-board LED (which is connected via the WiFi chip) with a slower system clock to show how to reconfigure communication with the WiFi chip at run time under those circumstances
+[picow_blink_fast_clock](pico_w/wifi/blink) | Blinks the on-board LED (which is connected via the WiFi chip) with a faster system clock to show how to reconfigure communication with the WiFi chip at build time under those circumstances
 [picow_iperf_server](pico_w/wifi/iperf) | Runs an "iperf" server for WiFi speed testing.
 [picow_ntp_client](pico_w/wifi/ntp_client) | Connects to an NTP server to fetch and display the current time.
 [picow_tcp_client](pico_w/wifi/tcp_client) | A simple TCP client. You can run [python_test_tcp_server.py](pico_w/wifi/python_test_tcp/python_test_tcp_server.py) for it to connect to.
@@ -175,10 +184,12 @@ App|Description
 [picow_wifi_scan](pico_w/wifi/wifi_scan) | Scans for WiFi networks and prints the results.
 [picow_udp_beacon](pico_w/wifi/udp_beacon) | A simple UDP transmitter.
 [picow_httpd](pico_w/wifi/httpd) | Runs a LWIP HTTP server test app
+[picow_http_client](pico_w/wifi/http_client) | Demonstrates how to make http and https requests
+[picow_http_client_verify](pico_w/wifi/http_client) | Demonstrates how to make a https request with server authentication
 
 #### FreeRTOS examples
 
-These are examples of integrating Pico W networking under FreeRTOS, and require you to set the `FREERTOS_KERNEL_PATH`
+These are examples of integrating Wi-Fi networking under FreeRTOS, and require you to set the `FREERTOS_KERNEL_PATH`
 to point to the FreeRTOS Kernel. See https://github.com/FreeRTOS/FreeRTOS-Kernel
 
 App|Description
@@ -190,10 +201,11 @@ App|Description
 [picow_freertos_ntp_client_socket](pico_w/wifi/freertos/ntp_client_socket) | Connects to an NTP server using the LwIP Socket API with FreeRTOS in NO_SYS=0 (i.e. full FreeRTOS integration) mode.
 [pico_freertos_httpd_nosys](pico_w/wifi/freertos/httpd) | Runs a LWIP HTTP server test app under FreeRTOS in NO_SYS=1 mode.
 [pico_freertos_httpd_sys](pico_w/wifi/freertos/httpd) | Runs a LWIP HTTP server test app under FreeRTOS in NO_SYS=0 (i.e. full FreeRTOS integration) mode.
+[picow_freertos_http_client_sys](pico_w/wifi/freertos/http_client) | Demonstrates how to make a https request in NO_SYS=0 (i.e. full FreeRTOS integration)
 
-### Pico W Bluetooth
+### Pico Bluetooth
 
-These examples are for the Pico W, and are only available for `PICO_BOARD=pico_w`.
+These Bluetooth examples are only available for boards that support Bluetooth.
 They are examples from the Blue Kitchen Bluetooth stack, see [here](https://bluekitchen-gmbh.com/btstack/#examples/examples/index.html) for a full description.
 
 By default, the Bluetooth examples are only built in one "mode" only (*background*, *poll*, or *freertos*), with the 
@@ -363,8 +375,9 @@ These require you to set `PICO_ARM_TOOLCHAIN_PATH` and `PICO_RISCV_TOOLCHAIN_PAT
 
 App|Description
 ---|---
+[blink](universal/CMakeLists.txt#L126) | Same as the [blink](blink) example, but universal.
 [hello_universal](universal/hello_universal) | The obligatory Hello World program for Pico (USB and serial output). On RP2350 it will reboot to the other architecture after every 10 prints.
-[nuke_universal](universal/CMakeLists.txt#L107) | Same as the [nuke](flash/nuke) binary, but universal. On RP2350 runs as a packaged SRAM binary, so is written to flash and copied to SRAM by the bootloader
+[nuke_universal](universal/CMakeLists.txt#L132) | Same as the [nuke](flash/nuke) example, but universal. On RP2350 runs as a packaged SRAM binary, so is written to flash and copied to SRAM by the bootloader
 
 ### USB Device
 

adc/read_vsys/power_status.h

@@ -11,7 +11,7 @@
  * \brief Get power source
  *
  * Returns whether battery powered
- * \note On Pico W must have called cyw43_arch_init
+ * \note On boards that support Wi-Fi you must have called cyw43_arch_init first
  *
  * \param battery_powered True if powered by battery, False if powered by USB or another means
  * \return Zero if the battery status can be determined, an error code otherwise \see pico_error_codes

binary_info/CMakeLists.txt

@@ -0,0 +1,2 @@
+add_subdirectory_exclude_platforms(blink_any host)
+add_subdirectory_exclude_platforms(hello_anything host)

binary_info/README.md

@@ -0,0 +1,60 @@
+These programs demonstrate use of `bi_ptr` variables, which can be configured in a binary post-compilation using the `picotool config` command.
+
+You can view the configurable variables with
+```
+$ picotool blink_any.uf2 
+File blink_any.uf2:
+
+LED Configuration:
+ LED_PIN = 25
+ LED_TYPE = 0
+
+$ picotool config hello_anything.uf2 
+File hello_anything.uf2:
+
+text = "Hello, world!"
+Enabled Interfaces:
+ use_usb = 1
+ use_uart = 1
+UART Configuration:
+ uart_baud = 115200
+ uart_rx = 1
+ uart_tx = 0
+ uart_num = 0
+```
+
+For example, to blink the LED on pin 7 instead of 25 use
+```
+$ picotool config blink_any.uf2 -s LED_PIN 7
+File blink_any.uf2:
+
+LED_PIN = 25
+setting LED_PIN -> 7
+```
+
+Or to change the printed string use
+```
+$ picotool config hello_anything.uf2 -s text "Goodbye, world!"
+File hello_anything.uf2:
+
+text = "Hello, world!"
+setting text -> "Goodbye, world!"
+```
+
+The binaries can also be configured after being loaded onto the device with
+```
+$ picotool config
+text = "Hello, world!"
+Enabled Interfaces:
+ use_usb = 1
+ use_uart = 1
+UART Configuration:
+ uart_baud = 115200
+ uart_rx = 1
+ uart_tx = 0
+ uart_num = 0
+
+$ picotool config -s use_uart 0
+use_uart = 1
+setting use_uart -> 0
+```