Update version

Increase LWIP timeouts to avoid MDNS panics (#2653 )
Bump up the LWIP_ARP setting to increase the LWIP timeout pool to avoid a panic when using SimpleMDNS and TCP clients. Fixes #2650
2024-12-02 11:39:24 -08:00 · 2024-11-30 10:43:19 -08:00 · 2024-11-27 13:04:36 -08:00 · 2024-11-27 12:40:09 -08:00 · 2024-11-26 00:48:34 -08:00 · 2024-11-26 00:31:41 -08:00
240 changed files with 30068 additions and 5057 deletions
@@ -0,0 +1,42 @@
+# Run whenever it is manually triggered, a pull request or a push is done that modifes the libpico configuration 
+
+name: libpico Builder
+
+on:
+  pull_request:
+    paths:
+      - tools/libpico/**  
+  workflow_dispatch:
+  push:
+    paths:
+      - tools/libpico/**
+jobs:
+    build-libpico:
+        name: Build libpico precompiled libraries
+        runs-on: ubuntu-latest
+        steps:
+        - uses: actions/checkout@v4
+          with:
+            submodules: false
+        - name: Get submodules for pico-sdk
+          run: cd pico-sdk && git submodule update --init --recursive
+        - name: Install dependencies
+          run: |
+            sudo apt update
+            sudo apt install cmake make build-essential wget
+            # Automatically get correct toolchain
+            cd tools && python3 get.py && cd ..
+            # add to PATH
+            echo "$GITHUB_WORKSPACE/system/riscv32-unknown-elf/bin" >> "$GITHUB_PATH"
+            echo "$GITHUB_WORKSPACE/system/arm-none-eabi/bin" >> "$GITHUB_PATH"
+        - name: Build libpico
+          run: |
+            cd tools/libpico
+            ./make-libpico.sh
+        - uses: actions/upload-artifact@v4
+          with:
+            name: libpico
+            path: |
+              tools/libpico/build-rp2040/*.a
+              tools/libpico/build-rp2350/*.a
+              tools/libpico/build-rp2350-riscv/*.a
@@ -17,7 +17,7 @@ jobs:
      with:
        submodules: false
    - name: Run codespell
-      uses: codespell-project/actions-codespell@master
+      uses: codespell-project/actions-codespell@v2
      with:
        skip: ./ArduinoCore-API,./libraries/ESP8266SdFat,./libraries/Adafruit_TinyUSB_Arduino,./libraries/LittleFS/lib,./tools/pyserial,./pico-sdk,./.github,./docs/i2s.rst,./cores/rp2040/api,./libraries/FreeRTOS,./tools/libbearssl/bearssl,./include,./libraries/WiFi/examples/BearSSL_Server,./ota/uzlib,./libraries/http-parser/lib,./libraries/WebServer/examples/HelloServerBearSSL/HelloServerBearSSL.ino,./libraries/HTTPUpdateServer/examples/SecureBearSSLUpdater/SecureBearSSLUpdater.ino,./.git,./libraries/FatFS/lib/fatfs,./libraries/FatFS/src/diskio.h,./libraries/FatFS/src/ff.cpp,./libraries/FatFS/src/ffconf.h,./libraries/FatFS/src/ffsystem.cpp,./libraries/FatFS/src/ff.h,./libraries/lwIP_WINC1500/src/driver,./libraries/lwIP_WINC1500/src/common,./libraries/lwIP_WINC1500/src/bus_wrapper,./libraries/lwIP_WINC1500/src/spi_flash
        ignore_words_list: ser,dout,shiftIn,acount
@@ -101,6 +101,37 @@ jobs:
        cd ..
        bash ./tests/build-rp2350.sh

+# Build all rp2350-riscv examples on linux (core and Arduino IDE)
+  build-rp2350-riscv-linux:
+    name: Build RP2350-RISCV ${{ matrix.chunk }}
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        chunk: [0, 1, 2, 3, 4, 5]
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
+    - uses: actions/setup-python@v5
+      with:
+        python-version: '3.x'
+    - name: Cache Linux toolchain
+      id: cache-linux
+      uses: actions/cache@v4
+      with:
+        path: ./tools/dist
+        key: ${{ runner.os }}-${{ hashFiles('package/package_pico_index.template.json', 'tests/common.sh') }}
+    - name: Build Sketches
+      env:
+        BUILD_PARITY: custom
+        mod: 6
+        rem: ${{ matrix.chunk }}
+      run: |
+        cd pico-sdk
+        git submodule update --init
+        cd ..
+        bash ./tests/build-rp2350-riscv.sh
+
 # Build TinyUSB examples, requires custom build command line
  build-tinyusb:
    name: Build TinyUSB Examples
@@ -234,10 +265,13 @@ jobs:
        python -m pip install --upgrade pip
        pip install --upgrade platformio
        pio pkg install --global --platform https://github.com/maxgerhardt/platform-raspberrypi.git
+        pio pkg update --global --platform https://github.com/maxgerhardt/platform-raspberrypi.git
        pio pkg install --global --tool symlink://.
        cp -f /home/runner/work/arduino-pico/arduino-pico/tools/json/*.json /home/runner/.platformio/platforms/raspberrypi/boards/.
    - name: Build Multicore Example
      run: pio ci -v --board=rpipico --board=rpipico2 --board=adafruit_feather -O "platform_packages=framework-arduinopico@symlink:///home/runner/work/arduino-pico/arduino-pico" libraries/rp2040/examples/Multicore/Multicore.ino
+    - name: Build Multicore Example (RISC-V)
+      run: pio ci -v --board=rpipico2 -O "board_build.mcu = rp2350-riscv" -O "platform_packages=framework-arduinopico@symlink:///home/runner/work/arduino-pico/arduino-pico" libraries/rp2040/examples/Multicore/Multicore.ino
    - name: Build Fade Example
      run: pio ci --board=rpipico --board=adafruit_feather -O "platform_packages=framework-arduinopico@symlink:///home/runner/work/arduino-pico/arduino-pico" libraries/rp2040/examples/Fade/Fade.ino
    - name: Build TinyUSB Example
@@ -288,6 +322,7 @@ jobs:
        python -m pip install --upgrade pip
        pip install --upgrade platformio
        pio pkg install --global --platform https://github.com/maxgerhardt/platform-raspberrypi.git
+        pio pkg update --global --platform https://github.com/maxgerhardt/platform-raspberrypi.git
        pio pkg install --global --tool symlink://.
        cp -f /home/runner/work/arduino-pico/arduino-pico/tools/json/*.json /home/runner/.platformio/platforms/raspberrypi/boards/.
    - name: Build Every Variant
@@ -46,3 +46,6 @@
 [submodule "cores/rp2040/tlsf"]
 	path = lib/tlsf
 	url = https://github.com/earlephilhower/tlsf.git
+[submodule "libraries/ESPHost"]
+	path = libraries/ESPHost
+	url = https://github.com/Networking-for-Arduino/ESPHost.git
@@ -4,7 +4,7 @@

 Raspberry Pi Pico Arduino core, for all RP2040 and RP2350 boards

-This is a port of Arduino to the RP2040 (Raspberry Pi Pico processor) and RP2350 (Raspberry Pi Pico 2 processor). It uses the bare Raspberry Pi Pico SDK and a custom GCC 12.3/Newlib 4.0 toolchain.
+This is a port of Arduino to the RP2040 (Raspberry Pi Pico processor) and RP2350 (Raspberry Pi Pico 2 processor). It uses the bare Raspberry Pi Pico SDK and a custom GCC 14.2/Newlib 4.3 toolchain and supports ARM and RISC-V cores.

 # Documentation
 See https://arduino-pico.readthedocs.io/en/latest/ along with the examples for more detailed usage information.
@@ -16,9 +16,11 @@ Read the [Contributing Guide](https://github.com/earlephilhower/arduino-pico/blo
 * Raspberry Pi Pico
 * Raspberry Pi Pico W
 * Raspberry Pi Pico 2
+* Raspberry Pi Pico 2W
 * 0xCB Helios
 * Adafruit Feather RP2040
 * Adafruit Feather RP2040 SCORPIO
+* Adafruit Floppsy RP2040
 * Adafruit ItsyBitsy RP2040
 * Adafruit KB2040
 * Adafruit Macropad RP2040
@@ -30,6 +32,8 @@ Read the [Contributing Guide](https://github.com/earlephilhower/arduino-pico/blo
 * Amken Revelop 
 * Amken Revelop Plus 
 * Amken Revelop eS
+* Architeuthis Flux Jumperless
+* Architeuthis Flux Jumperless V5
 * Arduino Nano RP2040 Connect
 * ArtronShop RP2 Nano
 * Breadstick Raspberry
@@ -40,7 +44,8 @@ Read the [Contributing Guide](https://github.com/earlephilhower/arduino-pico/blo
 * Cytron Maker Nano RP2040
 * Cytron Maker Uno RP2040
 * Cytron Motion 2350 Pro
-* DatanoiseTV PicoADK+
+* Datanoise PicoADK v1
+* Datanoise PicoADK v2 (RP2350)
 * Degz Suibo RP2040
 * DeRuiLab FlyBoard2040 Core
 * DFRobot Beetle RP2040
@@ -69,6 +74,7 @@ Read the [Contributing Guide](https://github.com/earlephilhower/arduino-pico/blo
 * nullbits Bit-C PRO
 * Pimoroni PGA2040
 * Pimoroni Pico Plus 2
+* Pimoroni Pico Plus 2W
 * Pimoroni Plasma2040
 * Pimoroni Tiny2040
 * Pimoroni Tiny2350
@@ -79,6 +85,7 @@ Read the [Contributing Guide](https://github.com/earlephilhower/arduino-pico/blo
 * Sea-Picro
 * Seeed Indicator RP2040
 * Seeed XIAO RP2040
+* Seeed XIAO RP2350
 * Silicognition RP2040-Shim
 * Solder Party RP2040 Stamp
 * Solder Party RP2350 Stamp
@@ -87,6 +94,7 @@ Read the [Contributing Guide](https://github.com/earlephilhower/arduino-pico/blo
 * SparkFun ProMicro RP2040
 * SparkFun ProMicro RP2350
 * SparkFun Thing Plus RP2040
+* SparkFun Thing Plus RP2350
 * uPesy RP2040 DevKit
 * VCC-GND YD-RP2040
 * Viyalab Mizu RP2040
@@ -98,7 +106,10 @@ Read the [Contributing Guide](https://github.com/earlephilhower/arduino-pico/blo
 * Waveshare RP2040 Matrix
 * Waveshare RP2040 PiZero
 * WIZnet W5100S-EVB-Pico
+* WIZnet W5100S-EVB-Pico2
 * WIZnet W5500-EVB-Pico
+* WIZnet W5500-EVB-Pico2
+* WIZnet W55RP20-EVB-Pico
 * WIZnet WizFi360-EVB-Pico
 * Generic RP2040 (configurable flash, I/O pins)
 * Generic RP2350 (configurable flash, I/O pins)
@@ -125,6 +136,7 @@ Read the [Contributing Guide](https://github.com/earlephilhower/arduino-pico/blo
 * Peripherals:  SPI master/slave, Wire(I2C) master/slave, dual UART, emulated EEPROM, I2S audio input/output, Servo
 * printf (i.e. debug) output over USB serial
 * Transparent use of PSRAM globals and heap (RP2350 only)
+* ARM or RISC-V (Hazard3) support for the RP2350

 The RP2040 PIO state machines (SMs) are used to generate jitter-free:
 * Servos
@@ -261,6 +273,7 @@ The installed tools include a version of OpenOCD (in the pqt-openocd directory)
 * [Xoshiro-cpp](https://github.com/Reputeless/Xoshiro-cpp) is copyright (c) 2020 Ryo Suzuki and distributed under the MIT license.
 * [FatFS low-level filesystem](http://elm-chan.org/fsw/ff/) code is Copyright (C) 2024, ChaN, all rights reserved.
 * [TLSF memory manager for PSRAM from Espressif fork](https://github.com/espressif/tlsf) of [original](https://github.com/mattconte/tlsf) by Matthew Conte is copyright Matthew Conte and licensed under the MIT license.
+* [ESPHost library](https://github.com/Networking-for-Arduino/ESPHost) is LGPL licensed by its maintainers.

 -Earle F. Philhower, III  
 earlephilhower@yahoo.com
@@ -0,0 +1,4 @@
+.section .boot2, "ax"
+
+.global __boot2_entry_point
+__boot2_entry_point:
@@ -1,25 +0,0 @@
-// Padded and checksummed version of: boot2_generic_03h.2.bin
-
-.cpu cortex-m0plus
-.thumb
-
-.section .boot2, "ax"
-
-.global __boot2_entry_point
-__boot2_entry_point:
-.byte 0x00, 0xb5, 0x05, 0x4b, 0x05, 0x48, 0xd8, 0x60, 0x4f, 0xf0, 0x03, 0x00, 0x58, 0x61, 0x4f, 0xf4
-.byte 0x80, 0x50, 0x18, 0x61, 0x00, 0xbd, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x40, 0x02, 0x01, 0x00, 0x40
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
@@ -1,25 +0,0 @@
-// Padded and checksummed version of: boot2_generic_03h.4.bin
-
-.cpu cortex-m0plus
-.thumb
-
-.section .boot2, "ax"
-
-.global __boot2_entry_point
-__boot2_entry_point:
-.byte 0x00, 0xb5, 0x05, 0x4b, 0x05, 0x48, 0xd8, 0x60, 0x4f, 0xf0, 0x03, 0x00, 0x58, 0x61, 0x4f, 0xf4
-.byte 0x80, 0x50, 0x18, 0x61, 0x00, 0xbd, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x40, 0x04, 0x01, 0x00, 0x40
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
@@ -1,25 +0,0 @@
-// Padded and checksummed version of: boot2_w25q080.2.bin
-
-.cpu cortex-m0plus
-.thumb
-
-.section .boot2, "ax"
-
-.global __boot2_entry_point
-__boot2_entry_point:
-.byte 0x00, 0xb5, 0x24, 0x4b, 0x21, 0x20, 0x58, 0x60, 0x13, 0xf5, 0x40, 0x53, 0x02, 0x20, 0x98, 0x60
-.byte 0xd8, 0x60, 0x18, 0x61, 0x58, 0x61, 0x13, 0xf5, 0x0d, 0x23, 0x1f, 0x49, 0x19, 0x60, 0x18, 0x68
-.byte 0x10, 0xf0, 0x02, 0x0f, 0xfb, 0xd1, 0x35, 0x20, 0x00, 0xf0, 0x2c, 0xf8, 0x02, 0x28, 0x14, 0xd0
-.byte 0x06, 0x20, 0x58, 0x60, 0x00, 0xf0, 0x22, 0xf8, 0x98, 0x68, 0x01, 0x20, 0x58, 0x60, 0x00, 0x20
-.byte 0x58, 0x60, 0x02, 0x20, 0x58, 0x60, 0x00, 0xf0, 0x19, 0xf8, 0x98, 0x68, 0x98, 0x68, 0x98, 0x68
-.byte 0x05, 0x20, 0x00, 0xf0, 0x17, 0xf8, 0x40, 0x08, 0xfa, 0xd2, 0x31, 0xf0, 0x01, 0x01, 0x19, 0x60
-.byte 0x0e, 0x48, 0xd8, 0x60, 0x4a, 0xf2, 0xeb, 0x00, 0x58, 0x61, 0x0d, 0x48, 0x18, 0x61, 0x4f, 0xf0
-.byte 0xa0, 0x51, 0x09, 0x78, 0x20, 0xf4, 0x80, 0x50, 0x18, 0x61, 0x00, 0xbd, 0x18, 0x68, 0x80, 0x08
-.byte 0xfc, 0xd2, 0x70, 0x47, 0x00, 0xb5, 0x58, 0x60, 0x58, 0x60, 0xff, 0xf7, 0xf7, 0xff, 0x98, 0x68
-.byte 0x98, 0x68, 0x00, 0xbd, 0x00, 0x00, 0x04, 0x40, 0x41, 0x00, 0x80, 0x07, 0x02, 0x02, 0x00, 0x40
-.byte 0xa8, 0x92, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
@@ -1,25 +0,0 @@
-// Padded and checksummed version of: boot2_w25q080.4.bin
-
-.cpu cortex-m0plus
-.thumb
-
-.section .boot2, "ax"
-
-.global __boot2_entry_point
-__boot2_entry_point:
-.byte 0x00, 0xb5, 0x24, 0x4b, 0x21, 0x20, 0x58, 0x60, 0x13, 0xf5, 0x40, 0x53, 0x02, 0x20, 0x98, 0x60
-.byte 0xd8, 0x60, 0x18, 0x61, 0x58, 0x61, 0x13, 0xf5, 0x0d, 0x23, 0x1f, 0x49, 0x19, 0x60, 0x18, 0x68
-.byte 0x10, 0xf0, 0x02, 0x0f, 0xfb, 0xd1, 0x35, 0x20, 0x00, 0xf0, 0x2c, 0xf8, 0x02, 0x28, 0x14, 0xd0
-.byte 0x06, 0x20, 0x58, 0x60, 0x00, 0xf0, 0x22, 0xf8, 0x98, 0x68, 0x01, 0x20, 0x58, 0x60, 0x00, 0x20
-.byte 0x58, 0x60, 0x02, 0x20, 0x58, 0x60, 0x00, 0xf0, 0x19, 0xf8, 0x98, 0x68, 0x98, 0x68, 0x98, 0x68
-.byte 0x05, 0x20, 0x00, 0xf0, 0x17, 0xf8, 0x40, 0x08, 0xfa, 0xd2, 0x31, 0xf0, 0x01, 0x01, 0x19, 0x60
-.byte 0x0e, 0x48, 0xd8, 0x60, 0x4a, 0xf2, 0xeb, 0x00, 0x58, 0x61, 0x0d, 0x48, 0x18, 0x61, 0x4f, 0xf0
-.byte 0xa0, 0x51, 0x09, 0x78, 0x20, 0xf4, 0x80, 0x50, 0x18, 0x61, 0x00, 0xbd, 0x18, 0x68, 0x80, 0x08
-.byte 0xfc, 0xd2, 0x70, 0x47, 0x00, 0xb5, 0x58, 0x60, 0x58, 0x60, 0xff, 0xf7, 0xf7, 0xff, 0x98, 0x68
-.byte 0x98, 0x68, 0x00, 0xbd, 0x00, 0x00, 0x04, 0x40, 0x41, 0x00, 0x80, 0x07, 0x04, 0x02, 0x00, 0x40
-.byte 0xa8, 0x92, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
@@ -0,0 +1,4 @@
+.section .boot2, "ax"
+
+.global __boot2_entry_point
+__boot2_entry_point:
@@ -37,7 +37,7 @@
 #ifdef abs
 #undef abs
 #endif // abs
-#ifdef __cplusplus
+#if defined(__cplusplus) && !defined(__riscv)
 using std::abs;
 using std::round;
 #else
@@ -26,7 +26,9 @@ static bool __no_inline_not_in_flash_func(get_bootsel_button)() {

    // Must disable interrupts, as interrupt handlers may be in flash, and we
    // are about to temporarily disable flash access!
-    noInterrupts();
+    if (!__isFreeRTOS) {
+        noInterrupts();
+    }
    rp2040.idleOtherCore();

    // Set chip select to Hi-Z
@@ -53,7 +55,9 @@ static bool __no_inline_not_in_flash_func(get_bootsel_button)() {
                    IO_QSPI_GPIO_QSPI_SS_CTRL_OEOVER_BITS);

    rp2040.resumeOtherCore();
-    interrupts();
+    if (!__isFreeRTOS) {
+        interrupts();
+    }

    return button_state;
 }
@@ -18,6 +18,8 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */

+#ifdef PICO_RP2040
+
 #include <Arduino.h>
 #include <hardware/structs/psm.h>

@@ -31,3 +33,5 @@ void RP2040::enableDoubleResetBootloader() {
        boot_double_tap_check();
    }
 }
+
+#endif
@@ -22,6 +22,11 @@
 #include <hardware/irq.h>
 #include <hardware/pio.h>
 #include <pico/unique_id.h>
+#ifdef PICO_RP2350
+#include <hardware/regs/powman.h>
+#else
+#include <hardware/regs/vreg_and_chip_reset.h>
+#endif
 #include <hardware/exception.h>
 #include <hardware/watchdog.h>
 #include <hardware/structs/rosc.h>
@@ -175,18 +180,22 @@ public:

    void begin() {
        _epoch = 0;
+#if !defined(__riscv)
        if (!__isFreeRTOS) {
            // Enable SYSTICK exception
            exception_set_exclusive_handler(SYSTICK_EXCEPTION, _SystickHandler);
            systick_hw->csr = 0x7;
            systick_hw->rvr = 0x00FFFFFF;
        } else {
+#endif
            int off = 0;
            _ccountPgm = new PIOProgram(&ccount_program);
            _ccountPgm->prepare(&_pio, &_sm, &off);
            ccount_program_init(_pio, _sm, off);
            pio_sm_set_enabled(_pio, _sm, true);
+#if !defined(__riscv)
        }
+#endif
    }

    // Convert from microseconds to PIO clock cycles
@@ -208,6 +217,7 @@ public:
    // Get CPU cycle count.  Needs to do magic to extens 24b HW to something longer
    volatile uint64_t _epoch = 0;
    inline uint32_t getCycleCount() {
+#if !defined(__riscv)
        if (!__isFreeRTOS) {
            uint32_t epoch;
            uint32_t ctr;
@@ -217,11 +227,15 @@ public:
            } while (epoch != (uint32_t)_epoch);
            return epoch + (1 << 24) - ctr; /* CTR counts down from 1<<24-1 */
        } else {
+#endif
            return ccount_read(_pio, _sm);
+#if !defined(__riscv)
        }
+#endif
    }

    inline uint64_t getCycleCount64() {
+#if !defined(__riscv)
        if (!__isFreeRTOS) {
            uint64_t epoch;
            uint64_t ctr;
@@ -231,8 +245,11 @@ public:
            } while (epoch != _epoch);
            return epoch + (1LL << 24) - ctr;
        } else {
+#endif
            return ccount_read(_pio, _sm);
+#if !defined(__riscv)
        }
+#endif
    }

    inline int getFreeHeap() {
@@ -272,7 +289,11 @@ public:

    inline uint32_t getStackPointer() {
        uint32_t *sp;
+#if defined(__riscv)
+        asm volatile("mv %0, sp" : "=r"(sp));
+#else
        asm volatile("mov %0, sp" : "=r"(sp));
+#endif
        return (uint32_t)sp;
    }

@@ -330,7 +351,9 @@ public:
        }
    }

+#ifdef PICO_RP2040
    static void enableDoubleResetBootloader();
+#endif

    void wdt_begin(uint32_t delay_ms) {
        watchdog_enable(delay_ms, 1);
@@ -340,6 +363,61 @@ public:
        watchdog_update();
    }

+    enum resetReason_t {UNKNOWN_RESET, PWRON_RESET, RUN_PIN_RESET, SOFT_RESET, WDT_RESET, DEBUG_RESET, GLITCH_RESET, BROWNOUT_RESET};
+
+    resetReason_t getResetReason(void) {
+        io_rw_32 *WD_reason_reg = (io_rw_32 *)(WATCHDOG_BASE + WATCHDOG_REASON_OFFSET);
+
+        if (watchdog_caused_reboot() && watchdog_enable_caused_reboot()) { // watchdog timer
+            return WDT_RESET;
+        }
+
+        if (*WD_reason_reg & WATCHDOG_REASON_TIMER_BITS) { // soft reset() or reboot()
+            return SOFT_RESET;
+        }
+
+#ifdef PICO_RP2350
+        // **** RP2350 is untested ****
+        io_rw_32 *rrp = (io_rw_32 *)(POWMAN_BASE + POWMAN_CHIP_RESET_OFFSET);
+
+        if (*rrp & POWMAN_CHIP_RESET_HAD_POR_BITS) { // POR: power-on reset (brownout is separately detected on RP2350)
+            return PWRON_RESET;
+        }
+
+        if (*rrp & POWMAN_CHIP_RESET_HAD_RUN_LOW_BITS) { // RUN pin
+            return RUN_PIN_RESET;
+        }
+
+        if ((*rrp & POWMAN_CHIP_RESET_HAD_DP_RESET_REQ_BITS) || (*rrp & POWMAN_CHIP_RESET_HAD_RESCUE_BITS) || (*rrp & POWMAN_CHIP_RESET_HAD_HZD_SYS_RESET_REQ_BITS)) { // DEBUG port
+            return DEBUG_RESET;
+        }
+
+        if (*rrp & POWMAN_CHIP_RESET_HAD_GLITCH_DETECT_BITS) { // power supply glitch
+            return GLITCH_RESET;
+        }
+
+        if (*rrp & POWMAN_CHIP_RESET_HAD_BOR_BITS) { // power supply brownout reset
+            return BROWNOUT_RESET;
+        }
+
+#else
+        io_rw_32 *rrp = (io_rw_32 *)(VREG_AND_CHIP_RESET_BASE + VREG_AND_CHIP_RESET_CHIP_RESET_OFFSET);
+
+        if (*rrp & VREG_AND_CHIP_RESET_CHIP_RESET_HAD_POR_BITS) { // POR: power-on reset or brown-out detection
+            return PWRON_RESET;
+        }
+
+        if (*rrp & VREG_AND_CHIP_RESET_CHIP_RESET_HAD_RUN_BITS) { // RUN pin
+            return RUN_PIN_RESET;
+        }
+
+        if (*rrp & VREG_AND_CHIP_RESET_CHIP_RESET_HAD_PSM_RESTART_BITS) { // DEBUG port
+            return DEBUG_RESET; // **** untested **** debug reset may just cause a rebootToBootloader()
+        }
+#endif
+        return UNKNOWN_RESET;
+    }
+
    const char *getChipID() {
        static char id[2 * PICO_UNIQUE_BOARD_ID_SIZE_BYTES + 1] = { 0 };
        if (!id[0]) {
@@ -387,7 +465,7 @@ public:
    }

    bool isPicoW() {
-#if !defined(ARDUINO_RASPBERRY_PI_PICO_W)
+#if !defined(PICO_CYW43_SUPPORTED)
        return false;
 #else
        extern bool __isPicoW;
@@ -1,5 +1,5 @@
 #pragma once
 #define ARDUINO_PICO_MAJOR 4
-#define ARDUINO_PICO_MINOR 0
-#define ARDUINO_PICO_REVISION 2
-#define ARDUINO_PICO_VERSION_STR "4.0.2"
+#define ARDUINO_PICO_MINOR 3
+#define ARDUINO_PICO_REVISION 1
+#define ARDUINO_PICO_VERSION_STR "4.3.1"
@@ -79,9 +79,9 @@ static int _parity(int bits, int data) {

 // We need to cache generated SerialPIOs so we can add data to them from
 // the shared handler
-static SerialPIO *_pioSP[2][4];
+static SerialPIO *_pioSP[3][4];
 static void __not_in_flash_func(_fifoIRQ)() {
-    for (int p = 0; p < 2; p++) {
+    for (int p = 0; p < 3; p++) {
        for (int sm = 0; sm < 4; sm++) {
            SerialPIO *s = _pioSP[p][sm];
            if (s) {
@@ -148,6 +148,21 @@ SerialPIO::~SerialPIO() {
    delete[] _queue;
 }

+static int pio_irq_0(PIO p) {
+    switch (pio_get_index(p)) {
+    case 0:
+        return PIO0_IRQ_0;
+    case 1:
+        return PIO1_IRQ_0;
+#if defined(PICO_RP2350)
+    case 2:
+        return PIO2_IRQ_0;
+#endif
+    default:
+        return -1;
+    }
+}
+
 void SerialPIO::begin(unsigned long baud, uint16_t config) {
    _overflow = false;
    _baud = baud;
@@ -247,7 +262,7 @@ void SerialPIO::begin(unsigned long baud, uint16_t config) {
        case 2: pio_set_irq0_source_enabled(_rxPIO, pis_sm2_rx_fifo_not_empty, true); break;
        case 3: pio_set_irq0_source_enabled(_rxPIO, pis_sm3_rx_fifo_not_empty, true); break;
        }
-        auto irqno = pio_get_index(_rxPIO) == 0 ? PIO0_IRQ_0 : PIO1_IRQ_0;
+        auto irqno = pio_irq_0(_rxPIO);
        irq_set_exclusive_handler(irqno, _fifoIRQ);
        irq_set_enabled(irqno, true);

@@ -278,7 +293,7 @@ void SerialPIO::end() {
            used = used || !!_pioSP[pioNum][i];
        }
        if (!used) {
-            auto irqno = pioNum == 0 ? PIO0_IRQ_0 : PIO1_IRQ_0;
+            auto irqno = pio_irq_0(_rxPIO);
            irq_set_enabled(irqno, false);
        }
        gpio_set_inover(_rx, 0);
@@ -32,7 +32,7 @@ extern void serialEvent1() __attribute__((weak));
 extern void serialEvent2() __attribute__((weak));

 bool SerialUART::setRX(pin_size_t pin) {
-#ifdef RP2350B
+#ifdef PICO_RP2350B
    constexpr uint64_t valid[2] = { __bitset({1, 13, 17, 29, 33, 45}) /* UART0 */,
                                    __bitset({5, 9, 21, 25, 37, 41})  /* UART1 */
                                  };
@@ -59,7 +59,7 @@ bool SerialUART::setRX(pin_size_t pin) {
 }

 bool SerialUART::setTX(pin_size_t pin) {
-#ifdef RP2350B
+#ifdef PICO_RP2350B
    constexpr uint64_t valid[2] = { __bitset({0, 12, 16, 28, 32, 44}) /* UART0 */,
                                    __bitset({4, 8, 20, 24, 36, 40})  /* UART1 */
                                  };
@@ -86,7 +86,7 @@ bool SerialUART::setTX(pin_size_t pin) {
 }

 bool SerialUART::setRTS(pin_size_t pin) {
-#ifdef RP2350B
+#ifdef PICO_RP2350B
    constexpr uint64_t valid[2] = { __bitset({3, 15, 19, 31, 35, 47}) /* UART0 */,
                                    __bitset({7, 11, 23, 27, 39, 43})  /* UART1 */
                                  };
@@ -113,7 +113,7 @@ bool SerialUART::setRTS(pin_size_t pin) {
 }

 bool SerialUART::setCTS(pin_size_t pin) {
-#ifdef RP2350B
+#ifdef PICO_RP2350B
    constexpr uint64_t valid[2] = { __bitset({2, 14, 18, 30, 34, 46}) /* UART0 */,
                                    __bitset({6, 10, 22, 26, 38, 42})  /* UART1 */
                                  };
@@ -100,6 +100,8 @@ void tone(uint8_t pin, unsigned int frequency, unsigned long duration) {
    }
    pio_sm_clear_fifos(newTone->pio, newTone->sm); // Remove any old updates that haven't yet taken effect
    pio_sm_put_blocking(newTone->pio, newTone->sm, RP2040::usToPIOCycles(us));
+    pio_sm_exec(newTone->pio, newTone->sm, pio_encode_pull(false, false));
+    pio_sm_exec(newTone->pio, newTone->sm, pio_encode_mov(pio_x, pio_osr));
    pio_sm_set_enabled(newTone->pio, newTone->sm, true);

    _toneMap.insert({pin, newTone});
@@ -31,7 +31,7 @@ typedef struct {
 static FMMap *_map = nullptr;
 SemaphoreHandle_t __get_freertos_mutex_for_ptr(mutex_t *m, bool recursive) {
    if (!_map) {
-        _map = (FMMap *)calloc(sizeof(FMMap), 16);
+        _map = (FMMap *)calloc(16, sizeof(FMMap));
    }
    // Pre-existing map
    for (int i = 0; i < 16; i++) {
@@ -54,5 +54,8 @@ extern "C" {

    extern void __freertos_idle_other_core() __attribute__((weak));
    extern void __freertos_resume_other_core() __attribute__((weak));
+
+    extern void __freertos_task_exit_critical() __attribute__((weak));
+    extern void __freertos_task_enter_critical() __attribute__((weak));
 }
 extern SemaphoreHandle_t __get_freertos_mutex_for_ptr(mutex_t *m, bool recursive = false);
@@ -17,7 +17,7 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */

-#if defined(ARDUINO_RASPBERRY_PI_PICO_W)
+#if defined(PICO_CYW43_SUPPORTED)

 #include <lwip/netif.h>
 extern "C" {
@@ -25,6 +25,12 @@ extern "C" {
 #include <cyw43_stats.h>
 }
 #include <pico/cyw43_arch.h>
+#include <pico/cyw43_driver.h>
+#include <pico/lwip_nosys.h>
+#include <hardware/resets.h>
+#include <hardware/gpio.h>
+#include <hardware/adc.h>
+#include <hardware/clocks.h>
 #include <Arduino.h>

 // From cyw43_ctrl.c
@@ -101,4 +107,100 @@ extern "C" void __wrap_cyw43_cb_tcpip_deinit(cyw43_t *self, int itf) {
    (void) itf;
 }

+#ifndef WIFICC
+#define WIFICC CYW43_COUNTRY_WORLDWIDE
+#endif
+
+// Taken from https://datasheets.raspberrypi.com/picow/connecting-to-the-internet-with-pico-w.pdf
+// also discussion in https://github.com/earlephilhower/arduino-pico/issues/849
+static bool CheckPicoW() {
+#ifdef PICO_RP2040
+    adc_init();
+    auto dir = gpio_get_dir(29);
+    auto fnc = gpio_get_function(29);
+    adc_gpio_init(29);
+    adc_select_input(3);
+    auto adc29 = adc_read();
+    gpio_set_function(29, fnc);
+    gpio_set_dir(29, dir);
+
+    dir = gpio_get_dir(25);
+    fnc = gpio_get_function(25);
+    gpio_init(25);
+    gpio_set_dir(25, GPIO_IN);
+    auto gp25 = gpio_get(25);
+    gpio_set_function(25, fnc);
+    gpio_set_dir(25, dir);
+
+    if (gp25) {
+        return true; // Can't tell, so assume yes
+    } else if (adc29 < 200) {
+        return true; // PicoW
+    } else {
+        return false;
+    }
+#else
+    return true;
+#endif
+}
+
+bool __isPicoW = true;
+
+extern "C" void init_cyw43_wifi() {
+    __isPicoW = CheckPicoW();
+    if (__isPicoW) {
+        // Fix for overclocked CPU: SPI communication breaks down with default "div by 2" speed
+        // So, divide clock by 4 for anything including and above 250MHz CPU frequency.
+        if (clock_get_hz(clk_sys) >= 250000000) {
+            cyw43_set_pio_clock_divisor(4, 0); // div by 4.0
+        }
+        cyw43_arch_init_with_country(WIFICC);
+    }
+}
+
+extern "C" void __lockBluetooth() {
+    async_context_acquire_lock_blocking(cyw43_arch_async_context());
+}
+
+extern "C" void __unlockBluetooth() {
+    async_context_release_lock(cyw43_arch_async_context());
+}
+
+extern "C" void __pinMode(pin_size_t pin, PinMode mode);
+extern "C" void __digitalWrite(pin_size_t pin, PinStatus val);
+extern "C" PinStatus __digitalRead(pin_size_t pin);
+
+extern "C" void cyw43_pinMode(pin_size_t pin, PinMode mode) {
+    if (!__isPicoW && (pin == PIN_LED)) {
+        pin = 25;  // Silently swap in the Pico's LED
+    }
+    if (pin < 64) {
+        __pinMode(pin, mode);
+    } else {
+        // TBD - There is no GPIO direction control in the driver
+    }
+}
+
+extern "C" void cyw43_digitalWrite(pin_size_t pin, PinStatus val) {
+    if (!__isPicoW && (pin == PIN_LED)) {
+        pin = 25;  // Silently swap in the Pico's LED
+    }
+    if (pin < 64) {
+        __digitalWrite(pin, val);
+    } else {
+        cyw43_arch_gpio_put(pin - 64, val == HIGH ? 1 : 0);
+    }
+}
+
+extern "C" PinStatus cyw43_digitalRead(pin_size_t pin) {
+    if (!__isPicoW && (pin == PIN_LED)) {
+        pin = 25;  // Silently swap in the Pico's LED
+    }
+    if (pin < 64) {
+        return __digitalRead(pin);
+    } else {
+        return cyw43_arch_gpio_get(pin - 64) ? HIGH : LOW;
+    }
+}
+
 #endif
@@ -0,0 +1,37 @@
+/*
+    CYW43 TCP/Ethernet wrappers
+    Copyright (c) 2023 Earle F. Philhower, III <earlephilhower@yahoo.com>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#pragma once
+
+#include <Arduino.h>
+#include <pico/cyw43_driver.h>
+
+extern bool __isPicoW;
+#ifdef __cplusplus
+extern "C" {
+#endif
+void init_cyw43_wifi();
+void __lockBluetooth();
+void __unlockBluetooth();
+void cyw43_pinMode(pin_size_t pin, PinMode mode);
+void cyw43_digitalWrite(pin_size_t pin, PinStatus val);
+PinStatus cyw43_digitalRead(pin_size_t pin);
+#ifdef __cplusplus
+}
+#endif
@@ -99,7 +99,7 @@ static SemaphoreHandle_t __getFreeRTOSRecursiveMutex(_LOCK_T lock) {
    return __get_freertos_mutex_for_ptr((mutex_t *)l, true);
 }

-void __retarget_lock_init(_LOCK_T *lock) {
+void __retarget_lock_init(_LOCK_T lock) {
    if (__freeRTOSinitted) {
        mutex_t *l = (mutex_t *)lock;
        if ((l == &__lock___at_quick_exit_mutex) || (l == &__lock___tz_mutex) || (l == &__lock___dd_hash_mutex) || (l == &__lock___arc4random_mutex)) {
@@ -113,7 +113,7 @@ void __retarget_lock_init(_LOCK_T *lock) {
    }
 }

-void __retarget_lock_init_recursive(_LOCK_T *lock) {
+void __retarget_lock_init_recursive(_LOCK_T lock) {
    if (__freeRTOSinitted) {
        recursive_mutex_t *l = (recursive_mutex_t *)lock;
        if ((l == &__lock___sinit_recursive_mutex) || (l == &__lock___sfp_recursive_mutex) || (l == &__lock___atexit_recursive_mutex) || (l == &__lock___malloc_recursive_mutex) || (l == &__lock___env_recursive_mutex)) {
@@ -26,9 +26,7 @@
 #include <lwip/dns.h>
 #include <lwip/raw.h>
 #include <lwip/timeouts.h>
-#ifdef PICO_RP2040
 #include <pico/cyw43_arch.h>
-#endif
 #include <pico/mutex.h>
 #include <sys/lock.h>
 #include "_xoshiro.h"
@@ -46,7 +44,7 @@ public:
        if (ethernet_arch_lwip_gpio_mask)  {
            ethernet_arch_lwip_gpio_mask();
        }
-#if defined(ARDUINO_RASPBERRY_PI_PICO_W)
+#if defined(PICO_CYW43_SUPPORTED)
        if (rp2040.isPicoW()) {
            cyw43_arch_lwip_begin();
            return;
@@ -60,7 +58,7 @@ public:
    }

    ~LWIPMutex() {
-#if defined(ARDUINO_RASPBERRY_PI_PICO_W)
+#if defined(PICO_CYW43_SUPPORTED)
        if (rp2040.isPicoW()) {
            cyw43_arch_lwip_end();
        } else {
@@ -70,7 +68,7 @@ public:
            } else {
                recursive_mutex_exit(&__lwipMutex);
            }
-#if defined(ARDUINO_RASPBERRY_PI_PICO_W)
+#if defined(PICO_CYW43_SUPPORTED)
        }
 #endif
        if (ethernet_arch_lwip_gpio_unmask) {
@@ -88,7 +88,7 @@ extern "C" int main() {

    // Allocate impure_ptr (newlib temps) if there is a 2nd core running
    if (!__isFreeRTOS && (setup1 || loop1)) {
-        _impure_ptr1 = (struct _reent*)calloc(sizeof(struct _reent), 1);
+        _impure_ptr1 = (struct _reent*)calloc(1, sizeof(struct _reent));
        _REENT_INIT_PTR(_impure_ptr1);
    }

@@ -134,7 +134,6 @@ extern "C" int main() {
        }
        rp2040.fifo.registerCore();
    }
-
    if (!__isFreeRTOS) {
        if (setup1 || loop1) {
            delay(1); // Needed to make Picoprobe upload start 2nd core
@@ -76,10 +76,13 @@ extern "C" void *pcalloc(size_t count, size_t size) {
 #else
 // No PSRAM, always fail
 extern "C" void *pmalloc(size_t size) {
+    (void) size;
    return nullptr;
 }

 extern "C" void *pcalloc(size_t count, size_t size) {
+    (void) count;
+    (void) size;
    return nullptr;
 }
 #endif
@@ -88,7 +91,7 @@ extern "C" void *__wrap_realloc(void *mem, size_t size) {
    void *rc;
    noInterrupts();
 #ifdef RP2350_PSRAM_CS
-    if (mem < __ram_start) {
+    if (mem && (mem < __ram_start)) {
        rc = __psram_realloc(mem, size);
    } else {
        rc = __real_realloc(mem, size);
@@ -103,7 +106,7 @@ extern "C" void *__wrap_realloc(void *mem, size_t size) {
 extern "C" void __wrap_free(void *mem) {
    noInterrupts();
 #ifdef RP2350_PSRAM_CS
-    if (mem < __ram_start) {
+    if (mem && (mem < __ram_start)) {
        __psram_free(mem);
    } else {
        __real_free(mem);
@@ -0,0 +1,383 @@
+/*
+ * Copyright (c) 2011 ARM Ltd
+ * All rights reserved.
+ *
+ * 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. The name of the company may not be used to endorse or promote
+ *    products derived from this software without specific prior written
+ *    permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY ARM LTD ``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 ARM LTD 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(PICO_RP2350) && defined(__arm__)
+	/* Prototype: void *memcpy (void *dst, const void *src, size_t count).  */
+        /* Use the version of memcpy implemented using LDRD and STRD.
+           This version is tuned for Cortex-A15.
+           This might not be the best for other ARMv7-A CPUs,
+           but there is no predefine to distinguish between
+           different CPUs in the same architecture,
+           and this version is better than the plain memcpy provided in newlib.
+           Therefore, we use this version for all ARMv7-A CPUS.  */
+        /* To make the same code compile for both ARM and Thumb instruction
+	   sets, switch to unified syntax at the beginning of this function.
+           However, by using the same code, we may be missing optimization
+	   opportunities.  For instance, in LDRD/STRD instructions, the first
+	   destination register must be even and the second consecutive in
+	   ARM state, but not in Thumb state.  */
+        .syntax         unified
+#if defined (__thumb__)
+        .thumb
+        .thumb_func
+#endif
+#ifdef __native_client__
+#define SFI_BREG(reg)	sfi_breg reg,
+#define IT(insn)
+#ifdef __thumb__
+#error "thumb and native_client are not compatible!"
+#endif
+	.p2align 4
+#else
+#define SFI_BREG(reg)
+#define IT(insn)	insn
+#endif
+        .global __wrap_memcpy
+        .type   __wrap_memcpy, %function
+//        .section .time_critical.memcpy // Actually slows down a bit because RAM and program RAM conflict
+__wrap_memcpy:
+       /* Assumes that n >= 0, and dst, src are valid pointers.
+          If there is at least 8 bytes to copy, use LDRD/STRD.
+          If src and dst are misaligned with different offsets,
+          first copy byte by byte until dst is aligned,
+          and then copy using LDRD/STRD and shift if needed.
+          When less than 8 left, copy a word and then byte by byte.  */
+       /* Save registers (r0 holds the return value):
+          optimized push {r0, r4, r5, lr}.
+          To try and improve performance, stack layout changed,
+          i.e., not keeping the stack looking like users expect
+          (highest numbered register at highest address).  */
+        push {r0, lr}
+        strd r4, r5, [sp, #-8]!
+       /* TODO: Add debug frame directives.
+          We don't need exception unwind directives, because the code below
+	  does not throw any exceptions and does not call any other functions.
+          Generally, newlib functions like this lack debug information for
+	  assembler source.  */
+        /* Get copying of tiny blocks out of the way first.  */
+        /* Is there at least 4 bytes to copy?  */
+        subs    r2, r2, #4
+        blt     copy_less_than_4                 /* If n < 4.  */
+        /* Check word alignment.  */
+        ands    ip, r0, #3                       /* ip = last 2 bits of dst.  */
+        bne     dst_not_word_aligned             /* If dst is not word-aligned.  */
+        /* Get here if dst is word-aligned.  */
+        ands    ip, r1, #3                      /* ip = last 2 bits of src.  */
+        bne     src_not_word_aligned            /* If src is not word-aligned.  */
+word_aligned:
+        /* Get here if source and dst both are word-aligned.
+           The number of bytes remaining to copy is r2+4.  */
+        /* Is there is at least 64 bytes to copy?  */
+        subs    r2, r2, #60
+        blt     copy_less_than_64                /* If r2 + 4 < 64.  */
+        /* First, align the destination buffer to 8-bytes,
+           to make sure double loads and stores don't cross cache line boundary,
+           as they are then more expensive even if the data is in the cache
+           (require two load/store issue cycles instead of one).
+           If only one of the buffers is not 8-bytes aligned,
+           then it's more important to align dst than src,
+           because there is more penalty for stores
+           than loads that cross cacheline boundary.
+           This check and realignment are only worth doing
+           if there is a lot to copy.  */
+        /* Get here if dst is word aligned,
+           i.e., the 2 least significant bits are 0.
+           If dst is not 2w aligned (i.e., the 3rd bit is not set in dst),
+           then copy 1 word (4 bytes).  */
+        ands    r3, r0, #4
+        beq     11f                  /* If dst already two-word aligned.  */
+	SFI_BREG(r1) \
+        ldr     r3, [r1], #4
+	SFI_BREG(r0) \
+        str     r3, [r0], #4
+        subs    r2, r2, #4
+        blt     copy_less_than_64
+11:
+        /* TODO: Align to cacheline (useful for PLD optimization).  */
+        /* Every loop iteration copies 64 bytes.  */
+1:
+        .irp    offset, #0, #8, #16, #24, #32, #40, #48, #56
+	SFI_BREG(r1) \
+        ldrd    r4, r5, [r1, \offset]
+	SFI_BREG(r0) \
+        strd    r4, r5, [r0, \offset]
+        .endr
+        add     r0, r0, #64
+        add     r1, r1, #64
+        subs    r2, r2, #64
+        bge     1b                            /* If there is more to copy.  */
+copy_less_than_64:
+        /* Get here if less than 64 bytes to copy, -64 <= r2 < 0.
+           Restore the count if there is more than 7 bytes to copy.  */
+        adds    r2, r2, #56
+        blt     copy_less_than_8
+        /* Copy 8 bytes at a time.  */
+2:
+	SFI_BREG(r1) \
+        ldrd    r4, r5, [r1], #8
+	SFI_BREG(r0) \
+        strd    r4, r5, [r0], #8
+        subs    r2, r2, #8
+        bge     2b                            /* If there is more to copy.  */
+copy_less_than_8:
+        /* Get here if less than 8 bytes to copy, -8 <= r2 < 0.
+           Check if there is more to copy.  */
+        cmn     r2, #8
+        beq     return                          /* If r2 + 8 == 0.  */
+        /* Restore the count if there is more than 3 bytes to copy.  */
+        adds    r2, r2, #4
+        blt     copy_less_than_4
+        /* Copy 4 bytes.  */
+	SFI_BREG(r1) \
+        ldr     r3, [r1], #4
+	SFI_BREG(r0) \
+        str     r3, [r0], #4
+copy_less_than_4:
+        /* Get here if less than 4 bytes to copy, -4 <= r2 < 0.  */
+        /* Restore the count, check if there is more to copy.  */
+        adds    r2, r2, #4
+        beq     return                          /* If r2 == 0.  */
+        /* Get here with r2 is in {1,2,3}={01,10,11}.  */
+        /* Logical shift left r2, insert 0s, update flags.  */
+        lsls    r2, r2, #31
+        /* Copy byte by byte.
+           Condition ne means the last bit of r2 is 0.
+           Condition cs means the second to last bit of r2 is set,
+           i.e., r2 is 1 or 3.  */
+        IT(itt	ne)
+	SFI_BREG(r1) \
+        ldrbne  r3, [r1], #1
+	SFI_BREG(r0) \
+        strbne  r3, [r0], #1
+        IT(itttt cs)
+	SFI_BREG(r1) \
+        ldrbcs  r4, [r1], #1
+	SFI_BREG(r1) \
+        ldrbcs  r5, [r1]
+	SFI_BREG(r0) \
+        strbcs  r4, [r0], #1
+	SFI_BREG(r0) \
+        strbcs  r5, [r0]
+return:
+        /* Restore registers: optimized pop {r0, r4, r5, pc}   */
+        ldrd r4, r5, [sp], #8
+#ifdef __native_client__
+	pop	{r0, lr}
+	sfi_bx	lr
+#else
+        pop {r0, pc}           /* This is the only return point of memcpy.  */
+#endif
+#ifndef __ARM_FEATURE_UNALIGNED
+       /* The following assembly macro implements misaligned copy in software.
+          Assumes that dst is word aligned, src is at offset "pull" bits from
+	  word, push = 32 - pull, and the number of bytes that remain to copy
+	  is r2 + 4, r2 >= 0.  */
+       /* In the code below, r2 is the number of bytes that remain to be
+	  written.  The number of bytes read is always larger, because we have
+	  partial words in the shift queue.  */
+        .macro  miscopy pull push shiftleft shiftright
+        /* Align src to the previous word boundary.  */
+        bic     r1, r1, #3
+        /* Initialize the shift queue.  */
+	SFI_BREG(r1) \
+        ldr     r5, [r1], #4                   /* Load a word from source.  */
+        subs    r2, r2, #4
+        blt     6f          /* Go to misaligned copy of less than 8 bytes.  */
+       /* Get here if there is more than 8 bytes to copy.
+          The number of bytes to copy is r2+8, r2 >= 0.  */
+       /* Save registers: push { r6, r7 }.
+          We need additional registers for LDRD and STRD, because in ARM state
+          the first destination register must be even and the second
+	  consecutive.  */
+       strd     r6, r7, [sp, #-8]!
+       subs     r2, r2, #56
+       blt      4f         /* Go to misaligned copy of less than 64 bytes.  */
+3:
+       /* Get here if there is more than 64 bytes to copy.
+          The number of bytes to copy is r2+64, r2 >= 0.  */
+       /* Copy 64 bytes in every iteration.
+          Use a partial word from the shift queue.  */
+        .irp    offset, #0, #8, #16, #24, #32, #40, #48, #56
+        mov     r6, r5, \shiftleft #\pull
+	SFI_BREG(r1) \
+        ldrd    r4, r5, [r1, \offset]
+        orr     r6, r6, r4, \shiftright #\push
+        mov     r7, r4, \shiftleft #\pull
+        orr     r7, r7, r5, \shiftright #\push
+	SFI_BREG(r0) \
+        strd    r6, r7, [r0, \offset]
+        .endr
+        add     r1, r1, #64
+        add     r0, r0, #64
+        subs    r2, r2, #64
+        bge     3b
+4:
+       /* Get here if there is less than 64 bytes to copy (-64 <= r2 < 0)
+	  and they are misaligned.  */
+       /* Restore the count if there is more than 7 bytes to copy.  */
+        adds    r2, r2, #56
+       /* If less than 8 bytes to copy,
+          restore registers saved for this loop: optimized poplt { r6, r7 }. */
+        itt     lt
+        ldrdlt  r6, r7, [sp], #8
+        blt     6f          /* Go to misaligned copy of less than 8 bytes.  */
+5:
+        /* Copy 8 bytes at a time.
+           Use a partial word from the shift queue.  */
+        mov     r6, r5, \shiftleft #\pull
+	SFI_BREG(r1) \
+        ldrd    r4, r5, [r1], #8
+        orr     r6, r6, r4, \shiftright #\push
+        mov     r7, r4, \shiftleft #\pull
+        orr     r7, r7, r5, \shiftright #\push
+	SFI_BREG(r0) \
+        strd    r6, r7, [r0], #8
+        subs    r2, r2, #8
+        bge     5b                        /* If there is more to copy.  */
+        /* Restore registers saved for this loop: optimized pop { r6, r7 }.  */
+        ldrd    r6, r7, [sp], #8
+6:
+        /* Get here if there less than 8 bytes to copy (-8 <= r2 < 0)
+           and they are misaligned.  */
+        /* Check if there is more to copy.  */
+        cmn     r2, #8
+        beq     return
+        /* Check if there is less than 4 bytes to copy.  */
+        cmn     r2, #4
+        itt     lt
+        /* Restore src offset from word-align.  */
+        sublt   r1, r1, #(\push / 8)
+        blt     copy_less_than_4
+        /* Use a partial word from the shift queue.  */
+        mov     r3, r5, \shiftleft #\pull
+        /* Load a word from src, but without writeback
+           (this word is not fully written to dst).  */
+	SFI_BREG(r1) \
+        ldr     r5, [r1]
+        /* Restore src offset from word-align.  */
+        add     r1, r1, #(\pull / 8)
+        /* Shift bytes to create one dst word and store it.  */
+        orr     r3, r3, r5, \shiftright #\push
+	SFI_BREG(r0) \
+        str     r3, [r0], #4
+        /* Use single byte copying of the remaining bytes.  */
+        b       copy_less_than_4
+        .endm
+#endif /* not __ARM_FEATURE_UNALIGNED  */
+dst_not_word_aligned:
+       /* Get here when dst is not aligned and ip has the last 2 bits of dst,
+          i.e., ip is the offset of dst from word.
+          The number of bytes that remains to copy is r2 + 4,
+          i.e., there are at least 4 bytes to copy.
+          Write a partial word (0 to 3 bytes), such that dst becomes
+	  word-aligned.  */
+       /* If dst is at ip bytes offset from a word (with 0 < ip < 4),
+          then there are (4 - ip) bytes to fill up to align dst to the next
+	  word.  */
+        rsb     ip, ip, #4                        /* ip = #4 - ip.  */
+        cmp     ip, #2
+       /* Copy byte by byte with conditionals.  */
+        IT(itt	gt)
+	SFI_BREG(r1) \
+        ldrbgt  r3, [r1], #1
+	SFI_BREG(r0) \
+        strbgt  r3, [r0], #1
+        IT(itt	ge)
+	SFI_BREG(r1) \
+        ldrbge  r4, [r1], #1
+	SFI_BREG(r0) \
+        strbge  r4, [r0], #1
+	SFI_BREG(r1) \
+        ldrb    lr, [r1], #1
+	SFI_BREG(r0) \
+        strb    lr, [r0], #1
+       /* Update the count.
+          ip holds the number of bytes we have just copied.  */
+        subs    r2, r2, ip                        /* r2 = r2 - ip.  */
+        blt     copy_less_than_4                  /* If r2 < ip.  */
+       /* Get here if there are more than 4 bytes to copy.
+          Check if src is aligned.  If beforehand src and dst were not word
+	  aligned but congruent (same offset), then now they are both
+	  word-aligned, and we can copy the rest efficiently (without
+	  shifting).  */
+        ands    ip, r1, #3                    /* ip = last 2 bits of src.  */
+        beq     word_aligned                  /* If r1 is word-aligned.  */
+src_not_word_aligned:
+       /* Get here when src is not word-aligned, but dst is word-aligned.
+          The number of bytes that remains to copy is r2+4.  */
+#ifdef __ARM_FEATURE_UNALIGNED
+       /* Copy word by word using LDR when alignment can be done in hardware,
+          i.e., SCTLR.A is set, supporting unaligned access in LDR and STR.  */
+        subs    r2, r2, #60
+        blt     8f
+7:
+        /* Copy 64 bytes in every loop iteration.  */
+        .irp    offset, #0, #4, #8, #12, #16, #20, #24, #28, #32, #36, #40, #44, #48, #52, #56, #60
+	SFI_BREG(r1) \
+        ldr     r3, [r1, \offset]
+	SFI_BREG(r0) \
+        str     r3, [r0, \offset]
+        .endr
+        add     r0, r0, #64
+        add     r1, r1, #64
+        subs    r2, r2, #64
+        bge     7b
+8:
+        /* Get here if less than 64 bytes to copy, -64 <= r2 < 0.
+           Check if there is more than 3 bytes to copy.  */
+        adds    r2, r2, #60
+        blt     copy_less_than_4
+9:
+       /* Get here if there is less than 64 but at least 4 bytes to copy,
+          where the number of bytes to copy is r2+4.  */
+	SFI_BREG(r1) \
+        ldr     r3, [r1], #4
+	SFI_BREG(r0) \
+        str     r3, [r0], #4
+        subs    r2, r2, #4
+        bge     9b
+        b       copy_less_than_4
+#else /* not __ARM_FEATURE_UNALIGNED  */
+       /* ip has last 2 bits of src,
+          i.e., ip is the offset of src from word, and ip > 0.
+          Compute shifts needed to copy from src to dst.  */
+        cmp     ip, #2
+        beq     miscopy_16_16             /* If ip == 2.  */
+        bge     miscopy_24_8              /* If ip == 3.  */
+        /* Get here if ip == 1.  */
+        /* Endian independent macros for shifting bytes within registers.  */
+#ifndef __ARMEB__
+miscopy_8_24:   miscopy pull=8 push=24 shiftleft=lsr shiftright=lsl
+miscopy_16_16:  miscopy pull=16 push=16 shiftleft=lsr shiftright=lsl
+miscopy_24_8:   miscopy pull=24 push=8 shiftleft=lsr shiftright=lsl
+#else  /* not __ARMEB__ */
+miscopy_8_24:   miscopy pull=8 push=24 shiftleft=lsl shiftright=lsr
+miscopy_16_16:  miscopy pull=16 push=16 shiftleft=lsl shiftright=lsr
+miscopy_24_8:   miscopy pull=24 push=8 shiftleft=lsl shiftright=lsr
+#endif  /* not __ARMEB__ */
+#endif  /* not __ARM_FEATURE_UNALIGNED  */
+#endif  /* memcpy */
@@ -1,443 +0,0 @@
-/*
-    Copyright (C) 2014 BlueKitchen GmbH
-
-    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 holders nor the names of
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-    4. Any redistribution, use, or modification is done solely for
-      personal benefit and not for any commercial purpose or for
-      monetary gain.
-
-    THIS SOFTWARE IS PROVIDED BY BLUEKITCHEN GMBH 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 BLUEKITCHEN
-    GMBH 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.
-
-    Please inquire about commercial licensing options at
-    contact@bluekitchen-gmbh.com
-
-*/
-
-/**
-    @title ATT Database Engine
-
-*/
-
-#ifndef ATT_DB_H
-#define ATT_DB_H
-
-#if defined ENABLE_CLASSIC
-
-#include <stdint.h>
-#include <sdkoverride/bluetooth.h>
-#include "btstack_linked_list.h"
-#include "btstack_defines.h"
-#include "btstack_bool.h"
-
-#if defined __cplusplus
-extern "C" {
-#endif
-
-    // MARK: Attribute PDU Opcodes
-#define ATT_ERROR_RESPONSE              0x01u
-
-#define ATT_EXCHANGE_MTU_REQUEST        0x02u
-#define ATT_EXCHANGE_MTU_RESPONSE       0x03u
-
-#define ATT_FIND_INFORMATION_REQUEST    0x04u
-#define ATT_FIND_INFORMATION_REPLY      0x05u
-#define ATT_FIND_BY_TYPE_VALUE_REQUEST  0x06u
-#define ATT_FIND_BY_TYPE_VALUE_RESPONSE 0x07u
-
-#define ATT_READ_BY_TYPE_REQUEST        0x08u
-#define ATT_READ_BY_TYPE_RESPONSE       0x09u
-#define ATT_READ_REQUEST                0x0au
-#define ATT_READ_RESPONSE               0x0bu
-#define ATT_READ_BLOB_REQUEST           0x0cu
-#define ATT_READ_BLOB_RESPONSE          0x0du
-#define ATT_READ_MULTIPLE_REQUEST       0x0eu
-#define ATT_READ_MULTIPLE_RESPONSE      0x0fu
-#define ATT_READ_BY_GROUP_TYPE_REQUEST  0x10u
-#define ATT_READ_BY_GROUP_TYPE_RESPONSE 0x11u
-
-#define ATT_WRITE_REQUEST               0x12u
-#define ATT_WRITE_RESPONSE              0x13u
-
-#define ATT_PREPARE_WRITE_REQUEST       0x16u
-#define ATT_PREPARE_WRITE_RESPONSE      0x17u
-#define ATT_EXECUTE_WRITE_REQUEST       0x18u
-#define ATT_EXECUTE_WRITE_RESPONSE      0x19u
-
-#define ATT_HANDLE_VALUE_NOTIFICATION   0x1bu
-#define ATT_HANDLE_VALUE_INDICATION     0x1du
-#define ATT_HANDLE_VALUE_CONFIRMATION   0x1eu
-
-#define ATT_READ_MULTIPLE_VARIABLE_REQ  0x20u
-#define ATT_READ_MULTIPLE_VARIABLE_RSP  0x21u
-#define ATT_MULTIPLE_HANDLE_VALUE_NTF   0x23u
-
-#define ATT_WRITE_COMMAND                0x52u
-#define ATT_SIGNED_WRITE_COMMAND         0xD2u
-
-
-    // internal additions
-    // 128 bit UUID used
-#define ATT_PROPERTY_UUID128             0x200u
-    // Read/Write Permission bits
-#define ATT_PROPERTY_READ_PERMISSION_BIT_0  0x0400u
-#define ATT_PROPERTY_READ_PERMISSION_BIT_1  0x0800u
-#define ATT_PROPERTY_WRITE_PERMISSION_BIT_0 0x0001u
-#define ATT_PROPERTY_WRITE_PERMISSION_BIT_1 0x0010u
-#define ATT_PROPERTY_READ_PERMISSION_SC     0x0020u
-#define ATT_PROPERTY_WRITE_PERMISSION_SC    0x0080u
-
-
-    typedef struct att_connection {
-        hci_con_handle_t con_handle;
-        uint16_t mtu;       // initialized to ATT_DEFAULT_MTU (23), negotiated during MTU exchange
-        uint16_t max_mtu;   // local maximal L2CAP_MTU, set to l2cap_max_le_mtu()
-        bool     mtu_exchanged;
-        uint8_t  encryption_key_size;
-        uint8_t  authenticated;
-        uint8_t  authorized;
-        uint8_t  secure_connection;
-    } att_connection_t;
-
-    /* API_START */
-
-    // map ATT ERROR CODES on to att_read_callback length
-#define ATT_READ_ERROR_CODE_OFFSET       0xfe00u
-
-    // custom BTstack ATT Response Pending for att_read_callback
-#define ATT_READ_RESPONSE_PENDING                 0xffffu
-
-    // internally used to signal write response pending
-#define ATT_INTERNAL_WRITE_RESPONSE_PENDING       0xfffeu
-
-    /**
-        @brief ATT Client Read Callback for Dynamic Data
-        - if buffer == NULL, don't copy data, just return size of value
-        - if buffer != NULL, copy data and return number bytes copied
-        If ENABLE_ATT_DELAYED_READ_RESPONSE is defined, you may return ATT_READ_RESPONSE_PENDING if data isn't available yet
-        @param con_handle of hci le connection
-        @param attribute_handle to be read
-        @param offset defines start of attribute value
-        @param buffer
-        @param buffer_size
-        @return size of value if buffer is NULL, otherwise number of bytes copied
-    */
-    typedef uint16_t (*att_read_callback_t)(hci_con_handle_t con_handle, uint16_t attribute_handle, uint16_t offset, uint8_t * buffer, uint16_t buffer_size);
-
-    /**
-        @brief ATT Client Write Callback for Dynamic Data
-        Each Prepared Write Request triggers a callback with transaction mode ATT_TRANSACTION_MODE_ACTIVE.
-        On Execute Write, the callback will be called with ATT_TRANSACTION_MODE_VALIDATE and allows to validate all queued writes and return an application error.
-        If none of the registered callbacks return an error for ATT_TRANSACTION_MODE_VALIDATE and the callback will be called with ATT_TRANSACTION_MODE_EXECUTE.
-        Otherwise, all callbacks will be called with ATT_TRANSACTION_MODE_CANCEL.
-
-        If the additional validation step is not needed, just return 0 for all callbacks with transaction mode ATT_TRANSACTION_MODE_VALIDATE.
-
-        @param con_handle of hci le connection
-        @param attribute_handle to be written
-        @param transaction - ATT_TRANSACTION_MODE_NONE for regular writes. For prepared writes: ATT_TRANSACTION_MODE_ACTIVE, ATT_TRANSACTION_MODE_VALIDATE, ATT_TRANSACTION_MODE_EXECUTE, ATT_TRANSACTION_MODE_CANCEL
-        @param offset into the value - used for queued writes and long attributes
-        @param buffer
-        @param buffer_size
-        @param signature used for signed write commands
-        @return 0 if write was ok, ATT_ERROR_PREPARE_QUEUE_FULL if no space in queue, ATT_ERROR_INVALID_OFFSET if offset is larger than max buffer
-    */
-    typedef int (*att_write_callback_t)(hci_con_handle_t con_handle, uint16_t attribute_handle, uint16_t transaction_mode, uint16_t offset, uint8_t *buffer, uint16_t buffer_size);
-
-    // Read & Write Callbacks for handle range
-    typedef struct att_service_handler {
-        btstack_linked_item_t * item;
-        uint16_t start_handle;
-        uint16_t end_handle;
-        att_read_callback_t read_callback;
-        att_write_callback_t write_callback;
-        btstack_packet_handler_t packet_handler;
-    } att_service_handler_t;
-
-    // MARK: ATT Operations
-
-    /**
-        @brief setup ATT database
-        @param db
-    */
-    void att_set_db(uint8_t const * db);
-
-    /*
-        @brief set callback for read of dynamic attributes
-        @param callback
-    */
-    void att_set_read_callback(att_read_callback_t callback);
-
-    /**
-        @brief set callback for write of dynamic attributes
-        @param callback
-    */
-    void att_set_write_callback(att_write_callback_t callback);
-
-    /**
-        @brief debug helper, dump ATT database to stdout using log_info
-    */
-    void att_dump_attributes(void);
-
-    /**
-        @brief process ATT request against database and put response into response buffer
-        @param att_connection used for mtu and security properties
-        @param request_buffer, request_len: ATT request from client
-        @param response_buffer for result
-        @return len of data in response buffer. 0 = no response,
-                ATT_READ_RESPONSE_PENDING if it was returned at least once for dynamic data (requires ENABLE_ATT_DELAYED_READ_RESPONSE)
-    */
-    uint16_t att_handle_request(att_connection_t * att_connection,
-                                uint8_t * request_buffer,
-                                uint16_t request_len,
-                                uint8_t * response_buffer);
-
-    /**
-        @brief setup value notification in response buffer for a given handle and value
-        @param att_connection
-        @param attribute_handle
-        @param value
-        @param value_len
-        @param response_buffer for notification
-    */
-    uint16_t att_prepare_handle_value_notification(att_connection_t * att_connection,
-            uint16_t attribute_handle,
-            const uint8_t *value,
-            uint16_t value_len,
-            uint8_t * response_buffer);
-
-    /**
-        @brief setup value notification in response buffer for multiple handles and values
-        @param att_connection
-        @param attribute_handle
-        @param value
-        @param value_len
-        @param response_buffer for notification
-    */
-    uint16_t att_prepare_handle_value_multiple_notification(att_connection_t * att_connection,
-            uint8_t num_attributes,
-            const uint16_t * attribute_handles,
-            const uint8_t ** values_data,
-            const uint16_t * values_len,
-            uint8_t * response_buffer);
-
-    /**
-        @brief setup value indication in response buffer for a given handle and value
-        @param att_connection
-        @param attribute_handle
-        @param value
-        @param value_len
-        @param response_buffer for indication
-    */
-    uint16_t att_prepare_handle_value_indication(att_connection_t * att_connection,
-            uint16_t attribute_handle,
-            const uint8_t *value,
-            uint16_t value_len,
-            uint8_t * response_buffer);
-
-    /**
-        @brief transaction queue of prepared writes, e.g., after disconnect
-        @return att_connection
-    */
-    void att_clear_transaction_queue(att_connection_t * att_connection);
-
-    // att_read_callback helpers for a various data types
-
-    /**
-        @brief Handle read of blob like data for att_read_callback
-        @param blob of data
-        @param blob_size of blob
-        @param offset from att_read_callback
-        @param buffer from att_read_callback
-        @param buffer_size from att_read_callback
-        @return value size for buffer == 0 and num bytes copied otherwise
-    */
-    uint16_t att_read_callback_handle_blob(const uint8_t * blob, uint16_t blob_size, uint16_t offset, uint8_t * buffer, uint16_t buffer_size);
-
-    /**
-        @brief Handle read of little endian unsigned 32 bit value for att_read_callback
-        @param value
-        @param offset from att_read_callback
-        @param buffer from att_read_callback
-        @param buffer_size from att_read_callback
-        @return value size for buffer == 0 and num bytes copied otherwise
-    */
-    uint16_t att_read_callback_handle_little_endian_32(uint32_t value, uint16_t offset, uint8_t * buffer, uint16_t buffer_size);
-
-    /**
-        @brief Handle read of little endian unsigned 16 bit value for att_read_callback
-        @param value
-        @param offset from att_read_callback
-        @param buffer from att_read_callback
-        @param buffer_size from att_read_callback
-        @return value size for buffer == 0 and num bytes copied otherwise
-    */
-    uint16_t att_read_callback_handle_little_endian_16(uint16_t value, uint16_t offset, uint8_t * buffer, uint16_t buffer_size);
-
-    /**
-        @brief Handle read of single byte for att_read_callback
-        @param blob of data
-        @param blob_size of blob
-        @param offset from att_read_callback
-        @param buffer from att_read_callback
-        @param buffer_size from att_read_callback
-        @return value size for buffer == 0 and num bytes copied otherwise
-    */
-    uint16_t att_read_callback_handle_byte(uint8_t value, uint16_t offset, uint8_t * buffer, uint16_t buffer_size);
-
-
-    // experimental client API
-    /**
-        @brief Get UUID for handle
-        @param attribute_handle
-        @return 0 if not found
-    */
-    uint16_t att_uuid_for_handle(uint16_t attribute_handle);
-
-    /**
-        @brief Get const value for handle
-        @param attribute_handle
-        @param out_value_len  output variable that hold value len
-        @return value
-    */
-
-    const uint8_t * gatt_server_get_const_value_for_handle(uint16_t attribute_handle, uint16_t * out_value_len);
-
-    // experimental GATT Server API
-
-    /**
-        @brief Get handle range for primary service.
-        @param uuid16
-        @param start_handle
-        @param end_handle
-        @return false if not found
-    */
-    bool gatt_server_get_handle_range_for_service_with_uuid16(uint16_t uuid16, uint16_t * start_handle, uint16_t * end_handle);
-
-    /**
-        @brief Get handle range for included service.
-        @param start_handle
-        @param end_handle
-        @param uuid16
-        @param out_included_service_handle
-        @param out_included_service_start_handle
-        @param out_included_service_end_handle
-        @return false if not found
-    */
-    bool gatt_server_get_included_service_with_uuid16(uint16_t start_handle, uint16_t end_handle, uint16_t uuid16,
-            uint16_t * out_included_service_handle, uint16_t * out_included_service_start_handle, uint16_t * out_included_service_end_handle);
-
-    /**
-        @brief Get value handle for characteristic.
-        @param start_handle
-        @param end_handle
-        @param uuid16
-        @return 0 if not found
-    */
-    uint16_t gatt_server_get_value_handle_for_characteristic_with_uuid16(uint16_t start_handle, uint16_t end_handle, uint16_t uuid16);
-
-    /**
-        @brief Get descriptor handle for characteristic.
-        @param start_handle
-        @param end_handle
-        @param characteristic_uuid16
-        @param descriptor_uuid16
-        @return 0 if not found
-    */
-    uint16_t gatt_server_get_descriptor_handle_for_characteristic_with_uuid16(uint16_t start_handle, uint16_t end_handle, uint16_t characteristic_uuid16, uint16_t descriptor_uuid16);
-
-    /**
-        @brief Get client configuration handle for characteristic.
-        @param start_handle
-        @param end_handle
-        @param characteristic_uuid16
-        @return 0 if not found
-    */
-    uint16_t gatt_server_get_client_configuration_handle_for_characteristic_with_uuid16(uint16_t start_handle, uint16_t end_handle, uint16_t characteristic_uuid16);
-
-    /**
-        @brief Get server configuration handle for characteristic.
-        @param start_handle
-        @param end_handle
-        @param characteristic_uuid16
-        @param descriptor_uuid16
-        @return 0 if not found
-    */
-    uint16_t gatt_server_get_server_configuration_handle_for_characteristic_with_uuid16(uint16_t start_handle, uint16_t end_handle, uint16_t characteristic_uuid16);
-
-
-    /**
-        @brief Get handle range for primary service.
-        @param uuid128
-        @param start_handle
-        @param end_handle
-        @return false if not found
-    */
-    bool gatt_server_get_handle_range_for_service_with_uuid128(const uint8_t * uuid128, uint16_t * start_handle, uint16_t * end_handle);
-
-    /**
-        @brief Get value handle.
-        @param start_handle
-        @param end_handle
-        @param uuid128
-        @return 0 if not found
-    */
-    uint16_t gatt_server_get_value_handle_for_characteristic_with_uuid128(uint16_t start_handle, uint16_t end_handle, const uint8_t * uuid128);
-
-    /**
-        @brief Get client configuration handle.
-        @param start_handle
-        @param end_handle
-        @param uuid128
-        @return 0 if not found
-    */
-    uint16_t gatt_server_get_client_configuration_handle_for_characteristic_with_uuid128(uint16_t start_handle, uint16_t end_handle, const uint8_t * uuid128);
-
-    /* API_END */
-
-    // non-user functionality for att_server
-
-    /**
-        @brief Check if writes to handle should be persistent
-        @param handle
-        @return 1 if persistent
-    */
-    bool att_is_persistent_ccc(uint16_t handle);
-
-
-
-    // auto-pts testing, returns response size
-#ifdef ENABLE_BTP
-    uint16_t btp_att_get_attributes_by_uuid16(uint16_t start_handle, uint16_t end_handle, uint16_t uuid16, uint8_t * response_buffer, uint16_t response_buffer_size);
-    uint16_t btp_att_get_attributes_by_uuid128(uint16_t start_handle, uint16_t end_handle, const uint8_t * uuid128, uint8_t * response_buffer, uint16_t response_buffer_size);
-    uint16_t btp_att_get_attribute_value(att_connection_t * att_connection, uint16_t attribute_handle, uint8_t * response_buffer, uint16_t response_buffer_size);
-#endif
-
-#if defined __cplusplus
-}
-#endif
-
-#endif
-
-#endif // ATT_H
@@ -1,926 +0,0 @@
-/*
-    Copyright (C) 2015 BlueKitchen GmbH
-
-    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 holders nor the names of
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-    4. Any redistribution, use, or modification is done solely for
-      personal benefit and not for any commercial purpose or for
-      monetary gain.
-
-    THIS SOFTWARE IS PROVIDED BY BLUEKITCHEN GMBH 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 BLUEKITCHEN
-    GMBH 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.
-
-    Please inquire about commercial licensing options at
-    contact@bluekitchen-gmbh.com
-
-*/
-
-/*
-    bluetooth.h
-
-    Numbers defined or derived from the official Bluetooth specification
-*/
-
-#ifndef BLUETOOTH_H
-#define BLUETOOTH_H
-
-#include <stdint.h>
-
-/**
-    @brief hci connection handle type
-*/
-typedef uint16_t hci_con_handle_t;
-
-/**
-    @brief Length of a bluetooth device address.
-*/
-#define BD_ADDR_LEN 6
-
-/**
-    @brief Bluetooth address
-*/
-typedef uint8_t bd_addr_t[BD_ADDR_LEN];
-
-/**
-    Address types
-*/
-typedef enum {
-    // Public Device Address
-    BD_ADDR_TYPE_LE_PUBLIC = 0,
-    // Random Device Address
-    BD_ADDR_TYPE_LE_RANDOM = 1,
-    // Public Identity Address (Corresponds to Resolved Private Address)
-    BD_ADDR_TYPE_LE_PUBLIC_IDENTITY = 2,
-    // Random (static) Identity Address (Corresponds to Resolved Private Address)
-    BD_ADDR_TYPE_LE_RANDOM_IDENTITY = 3,
-    // internal BTstack addr types for Classic connections
-    BD_ADDR_TYPE_SCO       = 0xfc,
-    BD_ADDR_TYPE_ACL       = 0xfd,
-    BD_ADDR_TYPE_UNKNOWN   = 0xfe,  // also used as 'invalid'
-} bd_addr_type_t;
-
-/**
-    Link types for BR/EDR Connections
-*/
-typedef enum {
-    HCI_LINK_TYPE_SCO  = 0,
-    HCI_LINK_TYPE_ACL  = 1,
-    HCI_LINK_TYPE_ESCO = 2,
-} hci_link_type_t;
-
-
-/**
-    @brief link key
-*/
-#define LINK_KEY_LEN 16
-#define LINK_KEY_STR_LEN (LINK_KEY_LEN*2)
-typedef uint8_t link_key_t[LINK_KEY_LEN];
-
-/**
-    @brief link key type
-*/
-typedef enum {
-    INVALID_LINK_KEY = 0xffff,
-    COMBINATION_KEY = 0,  // standard pairing
-    LOCAL_UNIT_KEY,     // ?
-    REMOTE_UNIT_KEY,    // ?
-    DEBUG_COMBINATION_KEY,  // SSP with debug
-    UNAUTHENTICATED_COMBINATION_KEY_GENERATED_FROM_P192, // SSP Simple Pairing
-    AUTHENTICATED_COMBINATION_KEY_GENERATED_FROM_P192,   // SSP Passkey, Number confirm, OOB
-    CHANGED_COMBINATION_KEY,               // Link key changed using Change Connection Lnk Key
-    UNAUTHENTICATED_COMBINATION_KEY_GENERATED_FROM_P256, // SSP Simpe Pairing
-    AUTHENTICATED_COMBINATION_KEY_GENERATED_FROM_P256,   // SSP Passkey, Number confirm, OOB
-} link_key_type_t;
-
-/**
-    LE Privacy 1.2
-*/
-typedef enum {
-    LE_PRIVACY_MODE_NETWORK = 0,
-    LE_PRIVACY_MODE_DEVICE = 1,
-} le_privacy_mode_t;
-
-/**
-    @brief Extended Inquiry Response
-*/
-#define EXTENDED_INQUIRY_RESPONSE_DATA_LEN 240
-
-/**
-    @brief Inquiry modes
-*/
-typedef enum {
-    INQUIRY_MODE_STANDARD = 0,
-    INQUIRY_MODE_RSSI,
-    INQUIRY_MODE_RSSI_AND_EIR,
-} inquiry_mode_t;
-
-/**
-    @brief Page Scan Types
-*/
-typedef enum {
-    PAGE_SCAN_MODE_STANDARD = 0,
-    PAGE_SCAN_MODE_INTERLACED,
-} page_scan_type_t;
-
-/**
-    @brief Inquiry Scan Types
-*/
-typedef enum {
-    INQUIRY_SCAN_MODE_STANDARD = 0,
-    INQUIRY_SCAN_MODE_INTERLACED,
-} inquiry_scan_type_t;
-
-/**
-    Link Supervision Timeout Default, 0x7d00 * 0.625ms = 20s
-*/
-#define HCI_LINK_SUPERVISION_TIMEOUT_DEFAULT 0x7D00
-
-/**
-    Service Type used for QoS Setup and Flow Specification
-*/
-typedef enum {
-    HCI_SERVICE_TYPE_NO_TRAFFIC = 0,
-    HCI_SERVICE_TYPE_BEST_EFFORT,
-    HCI_SERVICE_TYPE_GUARANTEED,
-    HCI_SERVICE_TYPE_INVALID,
-} hci_service_type_t;
-
-/**
-    HCI Transport
-*/
-
-/**
-    packet types - used in BTstack and over the H4 UART interface
-*/
-#define HCI_COMMAND_DATA_PACKET 0x01
-#define HCI_ACL_DATA_PACKET     0x02
-#define HCI_SCO_DATA_PACKET     0x03
-#define HCI_EVENT_PACKET        0x04
-#define HCI_ISO_DATA_PACKET     0x05
-
-/**
-    Other assigned numbers, Assigned_Numbers_Host Controller Interface.pdf
-*/
-
-typedef enum {
-    HCI_AUDIO_CODING_FORMAT_U_LAW_LOG = 0x00,
-    HCI_AUDIO_CODING_FORMAT_A_LAW_LOG,
-    HCI_AUDIO_CODING_FORMAT_CVSD,
-    HCI_AUDIO_CODING_FORMAT_TRANSPARENT, // Indicates that the controller does not do any transcoding or resampling. This is also used for test mode.
-    HCI_AUDIO_CODING_FORMAT_LINEAR_PCM,
-    HCI_AUDIO_CODING_FORMAT_MSBC,
-    HCI_AUDIO_CODING_FORMAT_LC3,
-    HCI_AUDIO_CODING_FORMAT_G_729A,
-    HCI_AUDIO_CODING_FORMAT_RFU,
-    HCI_AUDIO_CODING_FORMAT_VENDOR_SPECIFIC = 0xFF
-} hci_audio_coding_format_t;
-
-/**
-    HCI Layer
-*/
-
-//
-// Error Codes rfom Bluetooth Core Specification
-//
-
-/* ENUM_START: BLUETOOTH_ERROR_CODE */
-#define ERROR_CODE_SUCCESS                                 0x00
-#define ERROR_CODE_UNKNOWN_HCI_COMMAND                     0x01
-#define ERROR_CODE_UNKNOWN_CONNECTION_IDENTIFIER           0x02
-#define ERROR_CODE_HARDWARE_FAILURE                        0x03
-#define ERROR_CODE_PAGE_TIMEOUT                            0x04
-#define ERROR_CODE_AUTHENTICATION_FAILURE                  0x05
-#define ERROR_CODE_PIN_OR_KEY_MISSING                      0x06
-#define ERROR_CODE_MEMORY_CAPACITY_EXCEEDED                0x07
-#define ERROR_CODE_CONNECTION_TIMEOUT                      0x08
-#define ERROR_CODE_CONNECTION_LIMIT_EXCEEDED               0x09
-#define ERROR_CODE_SYNCHRONOUS_CONNECTION_LIMIT_TO_A_DEVICE_EXCEEDED  0x0A
-#define ERROR_CODE_ACL_CONNECTION_ALREADY_EXISTS           0x0B
-#define ERROR_CODE_COMMAND_DISALLOWED                      0x0C
-#define ERROR_CODE_CONNECTION_REJECTED_DUE_TO_LIMITED_RESOURCES 0x0D
-#define ERROR_CODE_CONNECTION_REJECTED_DUE_TO_SECURITY_REASONS  0x0E
-#define ERROR_CODE_CONNECTION_REJECTED_DUE_TO_UNACCEPTABLE_BD_ADDR 0x0F
-#define ERROR_CODE_CONNECTION_ACCEPT_TIMEOUT_EXCEEDED      0x10
-#define ERROR_CODE_UNSUPPORTED_FEATURE_OR_PARAMETER_VALUE  0x11
-#define ERROR_CODE_INVALID_HCI_COMMAND_PARAMETERS          0x12
-#define ERROR_CODE_REMOTE_USER_TERMINATED_CONNECTION       0x13
-#define ERROR_CODE_REMOTE_DEVICE_TERMINATED_CONNECTION_DUE_TO_LOW_RESOURCES 0x14
-#define ERROR_CODE_REMOTE_DEVICE_TERMINATED_CONNECTION_DUE_TO_POWER_OFF     0x15
-#define ERROR_CODE_CONNECTION_TERMINATED_BY_LOCAL_HOST     0x16
-#define ERROR_CODE_REPEATED_ATTEMPTS                       0x17
-#define ERROR_CODE_PAIRING_NOT_ALLOWED                     0x18
-#define ERROR_CODE_UNKNOWN_LMP_PDU                         0x19
-#define ERROR_CODE_UNSUPPORTED_REMOTE_FEATURE_UNSUPPORTED_LMP_FEATURE 0x1A
-#define ERROR_CODE_SCO_OFFSET_REJECTED                     0x1B
-#define ERROR_CODE_SCO_INTERVAL_REJECTED                   0x1C
-#define ERROR_CODE_SCO_AIR_MODE_REJECTED                   0x1D
-#define ERROR_CODE_INVALID_LMP_PARAMETERS_INVALID_LL_PARAMETERS 0x1E
-#define ERROR_CODE_UNSPECIFIED_ERROR                       0x1F
-#define ERROR_CODE_UNSUPPORTED_LMP_PARAMETER_VALUE_UNSUPPORTED_LL_PARAMETER_VALUE 0x20
-#define ERROR_CODE_ROLE_CHANGE_NOT_ALLOWED                 0x21
-#define ERROR_CODE_LMP_RESPONSE_TIMEOUT_LL_RESPONSE_TIMEOUT 0x22
-#define ERROR_CODE_LMP_ERROR_TRANSACTION_COLLISION         0x23
-#define ERROR_CODE_LMP_PDU_NOT_ALLOWED                     0x24
-#define ERROR_CODE_ENCRYPTION_MODE_NOT_ACCEPTABLE          0x25
-#define ERROR_CODE_LINK_KEY_CANNOT_BE_CHANGED              0x26
-#define ERROR_CODE_REQUESTED_QOS_NOT_SUPPORTED             0x27
-#define ERROR_CODE_INSTANT_PASSED                          0x28
-#define ERROR_CODE_PAIRING_WITH_UNIT_KEY_NOT_SUPPORTED     0x29
-#define ERROR_CODE_DIFFERENT_TRANSACTION_COLLISION         0x2A
-#define ERROR_CODE_RESERVED                                0x2B
-#define ERROR_CODE_QOS_UNACCEPTABLE_PARAMETER              0x2C
-#define ERROR_CODE_QOS_REJECTED                            0x2D
-#define ERROR_CODE_CHANNEL_CLASSIFICATION_NOT_SUPPORTED    0x2E
-#define ERROR_CODE_INSUFFICIENT_SECURITY                   0x2F
-#define ERROR_CODE_PARAMETER_OUT_OF_MANDATORY_RANGE        0x30
-// #define ERROR_CODE_RESERVED
-#define ERROR_CODE_ROLE_SWITCH_PENDING                     0x32
-// #define ERROR_CODE_RESERVED
-#define ERROR_CODE_RESERVED_SLOT_VIOLATION                 0x34
-#define ERROR_CODE_ROLE_SWITCH_FAILED                      0x35
-#define ERROR_CODE_EXTENDED_INQUIRY_RESPONSE_TOO_LARGE     0x36
-#define ERROR_CODE_SECURE_SIMPLE_PAIRING_NOT_SUPPORTED_BY_HOST 0x37
-#define ERROR_CODE_HOST_BUSY_PAIRING                       0x38
-#define ERROR_CODE_CONNECTION_REJECTED_DUE_TO_NO_SUITABLE_CHANNEL_FOUND 0x39
-#define ERROR_CODE_CONTROLLER_BUSY                         0x3A
-#define ERROR_CODE_UNACCEPTABLE_CONNECTION_PARAMETERS      0x3B
-#define ERROR_CODE_DIRECTED_ADVERTISING_TIMEOUT            0x3C
-#define ERROR_CODE_CONNECTION_TERMINATED_DUE_TO_MIC_FAILURE 0x3D
-#define ERROR_CODE_CONNECTION_FAILED_TO_BE_ESTABLISHED     0x3E
-#define ERROR_CODE_MAC_CONNECTION_FAILED                   0x3F
-#define ERROR_CODE_COARSE_CLOCK_ADJUSTMENT_REJECTED_BUT_WILL_TRY_TO_ADJUST_USING_CLOCK_DRAGGING 0x40
-
-// BTstack defined ERRORS, mapped into BLuetooth status code range
-
-#define BTSTACK_CONNECTION_TO_BTDAEMON_FAILED              0x50
-#define BTSTACK_ACTIVATION_FAILED_SYSTEM_BLUETOOTH         0x51
-#define BTSTACK_ACTIVATION_POWERON_FAILED                  0x52
-#define BTSTACK_ACTIVATION_FAILED_UNKNOWN                  0x53
-#define BTSTACK_NOT_ACTIVATED                              0x54
-#define BTSTACK_BUSY                                       0x55
-#define BTSTACK_MEMORY_ALLOC_FAILED                        0x56
-#define BTSTACK_ACL_BUFFERS_FULL                           0x57
-
-// l2cap errors - enumeration by the command that created them
-#define L2CAP_COMMAND_REJECT_REASON_COMMAND_NOT_UNDERSTOOD 0x60
-#define L2CAP_COMMAND_REJECT_REASON_SIGNALING_MTU_EXCEEDED 0x61
-#define L2CAP_COMMAND_REJECT_REASON_INVALID_CID_IN_REQUEST 0x62
-
-#define L2CAP_CONNECTION_RESPONSE_RESULT_SUCCESSFUL        0x63
-#define L2CAP_CONNECTION_RESPONSE_RESULT_PENDING           0x64
-#define L2CAP_CONNECTION_RESPONSE_RESULT_REFUSED_PSM       0x65
-#define L2CAP_CONNECTION_RESPONSE_RESULT_REFUSED_SECURITY  0x66
-#define L2CAP_CONNECTION_RESPONSE_RESULT_REFUSED_RESOURCES 0x67
-#define L2CAP_CONNECTION_RESPONSE_RESULT_ERTM_NOT_SUPPORTED 0x68
-
-// should be L2CAP_CONNECTION_RTX_TIMEOUT
-#define L2CAP_CONNECTION_RESPONSE_RESULT_RTX_TIMEOUT       0x69
-#define L2CAP_CONNECTION_BASEBAND_DISCONNECT               0x6A
-#define L2CAP_SERVICE_ALREADY_REGISTERED                   0x6B
-#define L2CAP_DATA_LEN_EXCEEDS_REMOTE_MTU                  0x6C
-#define L2CAP_SERVICE_DOES_NOT_EXIST                       0x6D
-#define L2CAP_LOCAL_CID_DOES_NOT_EXIST                     0x6E
-#define L2CAP_CONNECTION_RESPONSE_UNKNOWN_ERROR            0x6F
-
-#define RFCOMM_MULTIPLEXER_STOPPED                         0x70
-#define RFCOMM_CHANNEL_ALREADY_REGISTERED                  0x71
-#define RFCOMM_NO_OUTGOING_CREDITS                         0x72
-#define RFCOMM_AGGREGATE_FLOW_OFF                          0x73
-#define RFCOMM_DATA_LEN_EXCEEDS_MTU                        0x74
-
-#define HFP_REMOTE_REJECTS_AUDIO_CONNECTION                0x7F
-
-#define SDP_HANDLE_ALREADY_REGISTERED                      0x80
-#define SDP_QUERY_INCOMPLETE                               0x81
-#define SDP_SERVICE_NOT_FOUND                              0x82
-#define SDP_HANDLE_INVALID                                 0x83
-#define SDP_QUERY_BUSY                                     0x84
-
-#define ATT_HANDLE_VALUE_INDICATION_IN_PROGRESS            0x90
-#define ATT_HANDLE_VALUE_INDICATION_TIMEOUT                0x91
-#define ATT_HANDLE_VALUE_INDICATION_DISCONNECT             0x92
-
-#define GATT_CLIENT_NOT_CONNECTED                          0x93
-#define GATT_CLIENT_BUSY                                   0x94
-#define GATT_CLIENT_IN_WRONG_STATE                         0x95
-#define GATT_CLIENT_DIFFERENT_CONTEXT_FOR_ADDRESS_ALREADY_EXISTS 0x96
-#define GATT_CLIENT_VALUE_TOO_LONG                         0x97
-#define GATT_CLIENT_CHARACTERISTIC_NOTIFICATION_NOT_SUPPORTED 0x98
-#define GATT_CLIENT_CHARACTERISTIC_INDICATION_NOT_SUPPORTED   0x99
-
-#define BNEP_SERVICE_ALREADY_REGISTERED                    0xA0
-#define BNEP_CHANNEL_NOT_CONNECTED                         0xA1
-#define BNEP_DATA_LEN_EXCEEDS_MTU                          0xA2
-
-// OBEX ERRORS
-#define OBEX_UNKNOWN_ERROR                                 0xB0
-#define OBEX_CONNECT_FAILED                                0xB1
-#define OBEX_DISCONNECTED                                  0xB2
-#define OBEX_NOT_FOUND                                     0xB3
-#define OBEX_NOT_ACCEPTABLE                                0xB4
-#define OBEX_ABORTED                                       0xB5
-
-#define MESH_ERROR_APPKEY_INDEX_INVALID                    0xD0
-/* ENUM_END */
-
-
-/* ENUM_START: AVRCP_BROWSING_ERROR_CODE */
-#define AVRCP_BROWSING_ERROR_CODE_INVALID_COMMAND                     0x00  // Sent if TG received a PDU that it did not understand. Valid for All.
-#define AVRCP_BROWSING_ERROR_CODE_INVALID_PARAMETER                   0x01  // Sent if the TG received a PDU with a parameter ID that it did not understand. Sent if there is only one parameter ID in the PDU. Valid for All.
-#define AVRCP_BROWSING_ERROR_CODE_SPECIFIED_PARAMETER_NOT_FOUND       0x02  // Sent if the parameter ID is understood, but content is wrong or corrupted. Valid for All.
-#define AVRCP_BROWSING_ERROR_CODE_INTERNAL_ERROR                      0x03  // Sent if there are error conditions not covered by a more specific error code. Valid for All.
-#define AVRCP_BROWSING_ERROR_CODE_SUCCESS                             0x04  // This is the status that should be returned if the operation was successful. Valid for All except where the response CType is AV/C REJECTED.
-#define AVRCP_BROWSING_ERROR_CODE_UID_CHANGED                         0x05  // The UIDs on the device have changed. Valid for All.
-#define AVRCP_BROWSING_ERROR_CODE_RESERVED_06                         0x06  // Valid for All.
-#define AVRCP_BROWSING_ERROR_CODE_INVALID_DIRECTION                   0x07  // The Direction parameter is invalid. Valid for Change Path.
-#define AVRCP_BROWSING_ERROR_CODE_NOT_A_DIRECTORY                     0x08  // The UID provided does not refer to a folder item. Valid for Change Path.
-#define AVRCP_BROWSING_ERROR_CODE_DOES_NOT_EXIST                      0x09  // The UID provided does not refer to any currently valid. Valid for Change Path, PlayItem, AddToNowPlaying, GetItemAttributes.
-#define AVRCP_BROWSING_ERROR_CODE_INVALID_SCOPE                       0x0a  // The scope parameter is invalid. Valid for GetFolderItems, PlayItem, AddToNowPlayer, GetItemAttributes,.
-#define AVRCP_BROWSING_ERROR_CODE_RANGE_OUT_OF_BOUNDS                 0x0b  // The start of range provided is not valid. Valid for GetFolderItems.
-#define AVRCP_BROWSING_ERROR_CODE_UID_IS_A_DIRECTORY                  0x0c  // The UID provided refers to a directory, which cannot be handled by this media player. Valid for PlayItem, AddToNowPlaying.
-#define AVRCP_BROWSING_ERROR_CODE_MEDIA_IN_USES                       0x0d  // The media is not able to be used for this operation at this time. Valid for PlayItem, AddToNowPlaying.
-#define AVRCP_BROWSING_ERROR_CODE_NOW_PLAYING_LIST_FULL               0x0e  // No more items can be added to the Now Playing List. Valid for AddToNowPlaying.
-#define AVRCP_BROWSING_ERROR_CODE_SEARCH_NOT_SUPPORTED                0x0f  // The Browsed Media Player does not support search. Valid for Search.
-#define AVRCP_BROWSING_ERROR_CODE_SEARCH_IN_PROGRESS                  0x10  // A search operation is already in progress. Valid for Search.
-#define AVRCP_BROWSING_ERROR_CODE_INVALID_PLAYER_ID                   0x11  // The specified Player Id does not refer to a valid player. Valid for SetAddressedPlayer, SetBrowsedPlayer.
-#define AVRCP_BROWSING_ERROR_CODE_PLAYER_NOT_BROWSABLE                0x12  // The Player Id supplied refers to a Media Player which does not support browsing. Valid for SetBrowsedPlayer.
-#define AVRCP_BROWSING_ERROR_CODE_PLAYER_NOT_ADDRESSED                0x13  // The Player Id supplied refers to a player which is not currently addressed, and the command is not able to be performed if the player is not set as addressed. Valid for Search SetBrowsedPlayer.
-#define AVRCP_BROWSING_ERROR_CODE_NO_VALID_SEARCH_RESULTS             0x14  // The Search result list does not contain valid entries, e.g. after being invalidated due to change of browsed player. Valid for GetFolderItems.
-#define AVRCP_BROWSING_ERROR_CODE_NO_AVAILABLE_PLAYERS                0x15  // Valid for All.
-#define AVRCP_BROWSING_ERROR_CODE_ADDRESSED_PLAYER_CHANGED            0x16  // Valid for Register Notification.
-// 0x17-0xff Reserved
-/* ENUM_END */
-
-// HCI roles
-typedef enum {
-    HCI_ROLE_MASTER = 0,
-    HCI_ROLE_SLAVE  = 1,
-    HCI_ROLE_INVALID = 0xff,
-} hci_role_t;
-
-// packet sizes (max payload)
-#define HCI_ACL_DM1_SIZE            17
-#define HCI_ACL_DH1_SIZE            27
-#define HCI_ACL_2DH1_SIZE           54
-#define HCI_ACL_3DH1_SIZE           83
-#define HCI_ACL_DM3_SIZE           121
-#define HCI_ACL_DH3_SIZE           183
-#define HCI_ACL_DM5_SIZE           224
-#define HCI_ACL_DH5_SIZE           339
-#define HCI_ACL_2DH3_SIZE          367
-#define HCI_ACL_3DH3_SIZE          552
-#define HCI_ACL_2DH5_SIZE          679
-#define HCI_ACL_3DH5_SIZE         1021
-#define HCI_SCO_HV1_SIZE            10
-#define HCI_SCO_HV2_SIZE            20
-#define HCI_SCO_HV3_SIZE            30
-#define HCI_SCO_EV3_SIZE            30
-#define HCI_SCO_EV4_SIZE           120
-#define HCI_SCO_EV5_SIZE           180
-#define HCI_SCO_2EV3_SIZE           60
-#define HCI_SCO_2EV5_SIZE          360
-#define HCI_SCO_3EV3_SIZE           90
-#define HCI_SCO_3EV5_SIZE          540
-
-#define LE_ADVERTISING_DATA_SIZE    31
-#define LE_EXTENDED_ADVERTISING_DATA_SIZE    229
-#define LE_EXTENDED_ADVERTISING_MAX_HANDLE 0xEFu
-#define LE_EXTENDED_ADVERTISING_MAX_CHUNK_LEN 251
-
-// advertising event properties for extended advertising
-#define LE_ADVERTISING_PROPERTIES_CONNECTABLE      (1u<<0)
-#define LE_ADVERTISING_PROPERTIES_SCANNABLE        (1u<<1)
-#define LE_ADVERTISING_PROPERTIES_DIRECTED         (1u<<2)
-#define LE_ADVERTISING_PROPERTIES_HIGH_DUTY_CYCLE  (1u<<3)
-#define LE_ADVERTISING_PROPERTIES_LEGACY           (1u<<4)
-#define LE_ADVERTISING_PROPERTIES_ANONYMOUS        (1u<<5)
-#define LE_ADVERTISING_PROPERTIES_INCLUDE_TX_POWER (1u<<6)
-
-
-// SCO Packet Types
-#define SCO_PACKET_TYPES_NONE  0x0000
-#define SCO_PACKET_TYPES_HV1   0x0001
-#define SCO_PACKET_TYPES_HV2   0x0002
-#define SCO_PACKET_TYPES_HV3   0x0004
-#define SCO_PACKET_TYPES_EV3   0x0008
-#define SCO_PACKET_TYPES_EV4   0x0010
-#define SCO_PACKET_TYPES_EV5   0x0020
-#define SCO_PACKET_TYPES_2EV3  0x0040
-#define SCO_PACKET_TYPES_3EV3  0x0080
-#define SCO_PACKET_TYPES_2EV5  0x0100
-#define SCO_PACKET_TYPES_3EV5  0x0200
-#define SCO_PACKET_TYPES_ALL   0x03FF
-#define SCO_PACKET_TYPES_SCO   0x0007
-#define SCO_PACKET_TYPES_ESCO  0x03F8
-
-// Link Policy Settings
-#define LM_LINK_POLICY_DISABLE_ALL_LM_MODES  0
-#define LM_LINK_POLICY_ENABLE_ROLE_SWITCH    1
-#define LM_LINK_POLICY_ENABLE_HOLD_MODE      2
-#define LM_LINK_POLICY_ENABLE_SNIFF_MODE     4
-
-// ACL Connection Modes
-#define ACL_CONNECTION_MODE_ACTIVE 0
-#define ACL_CONNECTION_MODE_HOLD   1
-#define ACL_CONNECTION_MODE_SNIFF  2
-
-/**
-    Default INQ Mode
-*/
-#define GAP_IAC_GENERAL_INQUIRY 0x9E8B33L // General/Unlimited Inquiry Access Code (GIAC)
-#define GAP_IAC_LIMITED_INQUIRY 0x9E8B00L // Limited Dedicated Inquiry Access Code (LIAC)
-
-/**
-    SSP IO Capabilities
-*/
-#define SSP_IO_CAPABILITY_DISPLAY_ONLY   0
-#define SSP_IO_CAPABILITY_DISPLAY_YES_NO 1
-#define SSP_IO_CAPABILITY_KEYBOARD_ONLY  2
-#define SSP_IO_CAPABILITY_NO_INPUT_NO_OUTPUT 3
-#define SSP_IO_CAPABILITY_UNKNOWN 0xff
-
-
-/**
-    SSP Authentication Requirements, see IO Capability Request Reply Command
-*/
-
-// Numeric comparison with automatic accept allowed.
-#define SSP_IO_AUTHREQ_MITM_PROTECTION_NOT_REQUIRED_NO_BONDING 0x00
-
-// Use IO Capabilities to deter- mine authentication procedure
-#define SSP_IO_AUTHREQ_MITM_PROTECTION_REQUIRED_NO_BONDING 0x01
-
-// Numeric compar- ison with automatic accept allowed.
-#define SSP_IO_AUTHREQ_MITM_PROTECTION_NOT_REQUIRED_DEDICATED_BONDING 0x02
-
-// Use IO Capabilities to determine authentication procedure
-#define SSP_IO_AUTHREQ_MITM_PROTECTION_REQUIRED_DEDICATED_BONDING 0x03
-
-// Numeric Compari- son with automatic accept allowed.
-#define SSP_IO_AUTHREQ_MITM_PROTECTION_NOT_REQUIRED_GENERAL_BONDING 0x04
-
-// Use IO capabilities to determine authentication procedure.
-#define SSP_IO_AUTHREQ_MITM_PROTECTION_REQUIRED_GENERAL_BONDING 0x05
-
-
-// OGFs
-#define OGF_LINK_CONTROL          0x01
-#define OGF_LINK_POLICY           0x02
-#define OGF_CONTROLLER_BASEBAND   0x03
-#define OGF_INFORMATIONAL_PARAMETERS 0x04
-#define OGF_STATUS_PARAMETERS     0x05
-#define OGF_TESTING               0x06
-#define OGF_LE_CONTROLLER 0x08
-#define OGF_VENDOR  0x3f
-
-
-
-
-/**
-    L2CAP Layer
-*/
-
-#define L2CAP_HEADER_SIZE 4
-
-// minimum signaling MTU
-#define L2CAP_MINIMAL_MTU 48
-#define L2CAP_DEFAULT_MTU 672
-
-// Minimum/default MTU
-#define L2CAP_LE_DEFAULT_MTU  23
-
-// L2CAP Fixed Channel IDs
-#define L2CAP_CID_SIGNALING                        0x0001
-#define L2CAP_CID_CONNECTIONLESS_CHANNEL           0x0002
-#define L2CAP_CID_ATTRIBUTE_PROTOCOL               0x0004
-#define L2CAP_CID_SIGNALING_LE                     0x0005
-#define L2CAP_CID_SECURITY_MANAGER_PROTOCOL        0x0006
-#define L2CAP_CID_BR_EDR_SECURITY_MANAGER          0x0007
-
-// L2CAP Channels in Basic and Enhanced Retransmission Mode
-
-// connection response result
-#define L2CAP_CONNECTION_RESULT_SUCCESS                         0x0000
-#define L2CAP_CONNECTION_RESULT_PENDING                         0x0001
-#define L2CAP_CONNECTION_RESULT_PSM_NOT_SUPPORTED               0x0002
-#define L2CAP_CONNECTION_RESULT_SECURITY_BLOCK                  0x0003
-#define L2CAP_CONNECTION_RESULT_NO_RESOURCES_AVAILABLE          0x0004
-#define L2CAP_CONNECTION_RESULT_INVALID_SOURCE_CID              0x0006
-#define L2CAP_CONNECTION_RESULT_SOURCE_CID_ALREADY_ALLOCATED    0x0007
-
-// L2CAP Channels in LE Credit-Based Flow-Control Mode
-
-// connection response result
-#define L2CAP_CBM_CONNECTION_RESULT_SUCCESS                         0x0000
-#define L2CAP_CBM_CONNECTION_RESULT_SPSM_NOT_SUPPORTED              0x0002
-#define L2CAP_CBM_CONNECTION_RESULT_NO_RESOURCES_AVAILABLE          0x0004
-#define L2CAP_CBM_CONNECTION_RESULT_INSUFFICIENT_AUTHENTICATION     0x0005
-#define L2CAP_CBM_CONNECTION_RESULT_INSUFFICIENT_AUTHORIZATION      0x0006
-#define L2CAP_CBM_CONNECTION_RESULT_ENCYRPTION_KEY_SIZE_TOO_SHORT   0x0007
-#define L2CAP_CBM_CONNECTION_RESULT_INSUFFICIENT_ENCRYPTION         0x0008
-#define L2CAP_CBM_CONNECTION_RESULT_INVALID_SOURCE_CID              0x0009
-#define L2CAP_CBM_CONNECTION_RESULT_SOURCE_CID_ALREADY_ALLOCATED    0x000A
-#define L2CAP_CBM_CONNECTION_RESULT_UNACCEPTABLE_PARAMETERS         0x000B
-
-
-// L2CAP Channels in Enhanced Credit-Based Flow-Control Mode
-
-// number of CIDs in single connection+reconfiguration request/response
-#define L2CAP_ECBM_MAX_CID_ARRAY_SIZE        5
-
-// connection response result
-#define L2CAP_ECBM_CONNECTION_RESULT_ALL_SUCCESS                                    0x0000
-#define L2CAP_ECBM_CONNECTION_RESULT_ALL_REFUSED_SPSM_NOT_SUPPORTED                 0x0002
-#define L2CAP_ECBM_CONNECTION_RESULT_SOME_REFUSED_INSUFFICIENT_RESOURCES_AVAILABLE  0x0004
-#define L2CAP_ECBM_CONNECTION_RESULT_ALL_REFUSED_INSUFFICIENT_AUTHENTICATION        0x0005
-#define L2CAP_ECBM_CONNECTION_RESULT_ALL_REFUSED_INSUFFICIENT_AUTHORIZATION         0x0006
-#define L2CAP_ECBM_CONNECTION_RESULT_ALL_REFUSED_ENCYRPTION_KEY_SIZE_TOO_SHORT      0x0007
-#define L2CAP_ECBM_CONNECTION_RESULT_ALL_REFUSED_INSUFFICIENT_ENCRYPTION            0x0008
-#define L2CAP_ECBM_CONNECTION_RESULT_SOME_REFUSED_INVALID_SOURCE_CID                0x0009
-#define L2CAP_ECBM_CONNECTION_RESULT_SOME_REFUSED_SOURCE_CID_ALREADY_ALOCATED       0x000A
-#define L2CAP_ECBM_CONNECTION_RESULT_ALL_REFUSED_UNACCEPTABLE_PARAMETERS            0x000B
-#define L2CAP_ECBM_CONNECTION_RESULT_ALL_REFUSED_INVALID_PARAMETERS                 0x000C
-#define L2CAP_ECBM_CONNECTION_RESULT_ALL_PENDING_NO_FURTHER_INFORMATION             0x000D
-#define L2CAP_ECBM_CONNECTION_RESULT_ALL_PENDING_AUTHENTICATION                     0x000E
-#define L2CAP_ECBM_CONNECTION_RESULT_ALL_PENDING_AUTHORIZATION                      0x000F
-
-
-// Result for Reconfigure Request
-#define L2CAP_ECBM_RECONFIGURE_SUCCESS                                 0
-#define L2CAP_ECBM_RECONFIGURE_FAILED_MTU_REDUCTION_NOT_ALLOWED        1
-#define L2CAP_ECBM_RECONFIGURE_FAILED_MPS_REDUCTION_MULTIPLE_CHANNELS  2
-#define L2CAP_ECBM_RECONFIGURE_FAILED_DESTINATION_CID_INVALID          3
-#define L2CAP_ECBM_RECONFIGURE_FAILED_UNACCEPTABLE_PARAMETERS          4
-
-/**
-    SDP Protocol
-*/
-
-// Device Vendor ID Sources
-#define DEVICE_ID_VENDOR_ID_SOURCE_BLUETOOTH 0x0001
-#define DEVICE_ID_VENDOR_ID_SOURCE_USB       0x0002
-
-// OBEX
-#define SDP_vCard_2_1       0x01
-#define SDP_vCard_3_0       0x02
-#define SDP_vCal_1_0        0x03
-#define SDP_iCal_2_0        0x04
-#define SDP_vNote           0x05
-#define SDP_vMessage        0x06
-#define SDP_OBEXFileTypeAny 0xFF
-
-/**
-    RFCOMM Protocol
-*/
-
-// Line Status
-#define LINE_STATUS_NO_ERROR       0x00
-#define LINE_STATUS_OVERRUN_ERROR  0x03
-#define LINE_STATUS_PARITY_ERORR   0x05
-#define LINE_STATUS_FRAMING_ERROR  0x09
-
-// Modem Status Flags
-#define MODEM_STATUS_FC   0x02
-#define MODEM_STATUS_RTC  0x04
-#define MODEM_STATUS_RTR  0x08
-#define MODEM_STATUS_IC   0x40
-#define MODEM_STATUS_DV   0x80
-
-typedef enum rpn_baud {
-    RPN_BAUD_2400 = 0,
-    RPN_BAUD_4800,
-    RPN_BAUD_7200,
-    RPN_BAUD_9600,
-    RPN_BAUD_19200,
-    RPN_BAUD_38400,
-    RPN_BAUD_57600,
-    RPN_BAUD_115200,
-    RPN_BAUD_230400
-} rpn_baud_t;
-
-typedef enum rpn_data_bits {
-    RPN_DATA_BITS_5 = 0,
-    RPN_DATA_BITS_6 = 0,
-    RPN_DATA_BITS_7 = 0,
-    RPN_DATA_BITS_8 = 0
-} rpn_data_bits_t;
-
-typedef enum rpn_stop_bits {
-    RPN_STOP_BITS_1_0 = 0,
-    RPN_STOP_BITS_1_5
-} rpn_stop_bits_t;
-
-typedef enum rpn_parity {
-    RPN_PARITY_NONE  = 0,
-    RPN_PARITY_ODD   = 1,
-    RPN_PARITY_EVEN  = 3,
-    RPN_PARITY_MARK  = 5,
-    RPN_PARITY_SPACE = 7,
-} rpn_parity_t;
-
-#define RPN_FLOW_CONTROL_XONXOFF_ON_INPUT  0x01
-#define RPN_FLOW_CONTROL_XONXOFF_ON_OUTPUT 0x02
-#define RPN_FLOW_CONTROL_RTR_ON_INPUT      0x04
-#define RPN_FLOW_CONTROL_RTR_ON_OUTPUT     0x08
-#define RPN_FLOW_CONTROL_RTC_ON_INPUT      0x10
-#define RPN_FLOW_CONTROL_RTC_ON_OUTPUT     0x20
-
-#define RPN_PARAM_MASK_0_BAUD             0x01
-#define RPN_PARAM_MASK_0_DATA_BITS        0x02
-#define RPN_PARAM_MASK_0_STOP_BITS        0x04
-#define RPN_PARAM_MASK_0_PARITY           0x08
-#define RPN_PARAM_MASK_0_PARITY_TYPE      0x10
-#define RPN_PARAM_MASK_0_XON_CHAR         0x20
-#define RPN_PARAM_MASK_0_XOFF_CHAR        0x40
-#define RPN_PARAM_MASK_0_RESERVED         0x80
-
-// @note: values are identical to rpn_flow_control_t
-#define RPN_PARAM_MASK_1_XONOFF_ON_INPUT  0x01
-#define RPN_PARAM_MASK_1_XONOFF_ON_OUTPUT 0x02
-#define RPN_PARAM_MASK_1_RTR_ON_INPUT     0x04
-#define RPN_PARAM_MASK_1_RTR_ON_OUTPUT    0x08
-#define RPN_PARAM_MASK_1_RTC_ON_INPUT     0x10
-#define RPN_PARAM_MASK_1_RTC_ON_OUTPUT    0x20
-#define RPN_PARAM_MASK_1_RESERVED_0       0x40
-#define RPN_PARAM_MASK_1_RESERVED_1       0x80
-
-/**
-    BNEP Protocol
-*/
-
-#ifndef ETHER_ADDR_LEN
-#define ETHER_ADDR_LEN 6
-#endif
-
-#ifndef ETHERTYPE_VLAN
-#define ETHERTYPE_VLAN                                  0x8100 /* IEEE 802.1Q VLAN tag */
-#endif
-
-#define BNEP_MTU_MIN                                    1691
-
-
-/**
-    PAN Profile
-*/
-
-typedef enum {
-    BNEP_SECURITY_NONE = 0x0000,
-    BNEP_SECURITY_SERVICE_LEVEL_ENFORCED,
-    BNEP_SECURITY_802_1X
-} security_description_t;
-
-typedef enum {
-    PAN_NET_ACCESS_TYPE_PSTN = 0x0000,
-    PAN_NET_ACCESS_TYPE_ISDN,
-    PAN_NET_ACCESS_TYPE_DSL,
-    PAN_NET_ACCESS_TYPE_CABLE_MODEM,
-    PAN_NET_ACCESS_TYPE_10MB_ETHERNET,
-    PAN_NET_ACCESS_TYPE_100MB_ETHERNET,
-    PAN_NET_ACCESS_TYPE_4MB_TOKEN_RING,
-    PAN_NET_ACCESS_TYPE_16MB_TOKEN_RING,
-    PAN_NET_ACCESS_TYPE_100MB_TOKEN_RING,
-    PAN_NET_ACCESS_TYPE_FDDI,
-    PAN_NET_ACCESS_TYPE_GSM,
-    PAN_NET_ACCESS_TYPE_CDMA,
-    PAN_NET_ACCESS_TYPE_GPRS,
-    PAN_NET_ACCESS_TYPE_3G,
-    PAN_NET_ACCESS_TYPE_CELULAR,
-    PAN_NET_ACCESS_TYPE_OTHER = 0xFFFE,
-    PAN_NET_ACCESS_TYPE_NONE
-} net_access_type_t;
-
-/**
-    ATT
-*/
-
-// Minimum/default MTU
-#define ATT_DEFAULT_MTU               23
-
-// MARK: ATT Error Codes
-#define ATT_ERROR_SUCCESS                          0x00
-#define ATT_ERROR_INVALID_HANDLE                   0x01
-#define ATT_ERROR_READ_NOT_PERMITTED               0x02
-#define ATT_ERROR_WRITE_NOT_PERMITTED              0x03
-#define ATT_ERROR_INVALID_PDU                      0x04
-#define ATT_ERROR_INSUFFICIENT_AUTHENTICATION      0x05
-#define ATT_ERROR_REQUEST_NOT_SUPPORTED            0x06
-#define ATT_ERROR_INVALID_OFFSET                   0x07
-#define ATT_ERROR_INSUFFICIENT_AUTHORIZATION       0x08
-#define ATT_ERROR_PREPARE_QUEUE_FULL               0x09
-#define ATT_ERROR_ATTRIBUTE_NOT_FOUND              0x0a
-#define ATT_ERROR_ATTRIBUTE_NOT_LONG               0x0b
-#define ATT_ERROR_INSUFFICIENT_ENCRYPTION_KEY_SIZE 0x0c
-#define ATT_ERROR_INVALID_ATTRIBUTE_VALUE_LENGTH   0x0d
-#define ATT_ERROR_UNLIKELY_ERROR                   0x0e
-#define ATT_ERROR_INSUFFICIENT_ENCRYPTION          0x0f
-#define ATT_ERROR_UNSUPPORTED_GROUP_TYPE           0x10
-#define ATT_ERROR_INSUFFICIENT_RESOURCES           0x11
-#define ATT_ERROR_VALUE_NOT_ALLOWED                0x13
-
-// MARK: ATT Error Codes defined by BTstack
-#define ATT_ERROR_HCI_DISCONNECT_RECEIVED          0x1f
-#define ATT_ERROR_BONDING_INFORMATION_MISSING      0x70
-#define ATT_ERROR_DATA_MISMATCH                    0x7e
-#define ATT_ERROR_TIMEOUT                          0x7F
-#define ATT_ERROR_WRITE_RESPONSE_PENDING           0x100
-
-// MARK: ATT Error Codes from Bluetooth Core Specification Supplement, Version 9 or later
-#define ATT_ERROR_WRITE_REQUEST_REJECTED                                                      0xFC
-#define ATT_ERROR_CLIENT_CHARACTERISTIC_CONFIGURATION_DESCRIPTOR_IMPROPERLY_CONFIGURED        0xFD
-#define ATT_ERROR_PROCEDURE_ALREADY_IN_PROGRESS                                               0xFE
-#define ATT_ERROR_OUT_OF_RANGE                                                                0xFF
-
-// MARK: ATT Error Codes from Cycling Power Service spec
-#define CYCLING_POWER_ERROR_CODE_INAPPROPRIATE_CONNECTION_PARAMETERS                          0x80
-#define CYCLING_POWER_ERROR_CODE_PROCEDURE_ALREADY_IN_PROGRESS                                0xFE
-#define CYCLING_POWER_ERROR_CODE_CCC_DESCRIPTOR_IMPROPERLY_CONFIGURED                         0xFD
-
-// MARK: ATT Error Codes from Cycling Speed and Cadence Service spec
-#define CYCLING_SPEED_AND_CADENCE_ERROR_CODE_PROCEDURE_ALREADY_IN_PROGRESS                    0x80
-#define CYCLING_SPEED_AND_CADENCE_ERROR_CODE_CCC_DESCRIPTOR_IMPROPERLY_CONFIGURED             0x81
-
-
-// MARK: Attribute Property Flags
-#define ATT_PROPERTY_BROADCAST           0x01
-#define ATT_PROPERTY_READ                0x02
-#define ATT_PROPERTY_WRITE_WITHOUT_RESPONSE 0x04
-#define ATT_PROPERTY_WRITE               0x08
-#define ATT_PROPERTY_NOTIFY              0x10
-#define ATT_PROPERTY_INDICATE            0x20
-#define ATT_PROPERTY_AUTHENTICATED_SIGNED_WRITE 0x40
-#define ATT_PROPERTY_EXTENDED_PROPERTIES 0x80
-
-// MARK: Attribute Property Flag, BTstack extension
-// value is asked from client
-#define ATT_PROPERTY_DYNAMIC             0x100
-
-// Security levels
-#define ATT_SECURITY_NONE 0
-#define ATT_SECURITY_ENCRYPTED 1
-#define ATT_SECURITY_AUTHENTICATED 2
-#define ATT_SECURITY_AUTHORIZED 3
-#define ATT_SECURITY_AUTHENTICATED_SC 4
-
-// ATT Transaction Timeout of 30 seconds for Command/Response or Indication/Confirmation
-#define ATT_TRANSACTION_TIMEOUT_MS     30000
-
-#define ATT_TRANSACTION_MODE_NONE      0x0
-#define ATT_TRANSACTION_MODE_ACTIVE    0x1
-#define ATT_TRANSACTION_MODE_EXECUTE   0x2
-#define ATT_TRANSACTION_MODE_CANCEL    0x3
-#define ATT_TRANSACTION_MODE_VALIDATE  0x4
-
-// MARK: GATT UUIDs
-#define GATT_PRIMARY_SERVICE_UUID                   0x2800
-#define GATT_SECONDARY_SERVICE_UUID                 0x2801
-#define GATT_INCLUDE_SERVICE_UUID                   0x2802
-#define GATT_CHARACTERISTICS_UUID                   0x2803
-#define GATT_CHARACTERISTIC_EXTENDED_PROPERTIES     0x2900
-#define GATT_CHARACTERISTIC_USER_DESCRIPTION        0x2901
-#define GATT_CLIENT_CHARACTERISTICS_CONFIGURATION   0x2902
-#define GATT_SERVER_CHARACTERISTICS_CONFIGURATION   0x2903
-#define GATT_CHARACTERISTIC_PRESENTATION_FORMAT     0x2904
-#define GATT_CHARACTERISTIC_AGGREGATE_FORMAT        0x2905
-#define GATT_CLIENT_SUPPORTED_FEATURES              0x2B29
-#define GATT_SERVER_SUPPORTED_FEATURES              0x2B3A
-
-#define GATT_CLIENT_CHARACTERISTICS_CONFIGURATION_NONE          0
-#define GATT_CLIENT_CHARACTERISTICS_CONFIGURATION_NOTIFICATION  1
-#define GATT_CLIENT_CHARACTERISTICS_CONFIGURATION_INDICATION    2
-
-#define GATT_CLIENT_ANY_CONNECTION      0xffff
-#define GATT_CLIENT_ANY_VALUE_HANDLE    0x0000
-
-// GAP Service and Characteristics
-#define GAP_SERVICE_UUID               0x1800
-#define GAP_DEVICE_NAME_UUID           0x2a00
-#define GAP_APPEARANCE_UUID            0x2a01
-#define GAP_PERIPHERAL_PRIVACY_FLAG    0x2a02
-#define GAP_RECONNECTION_ADDRESS_UUID  0x2a03
-#define GAP_PERIPHERAL_PREFERRED_CONNECTION_PARAMETERS_UUID 0x2a04
-#define GAP_SERVICE_CHANGED            0x2a05
-
-// Bluetooth GATT types
-
-typedef struct {
-    uint16_t year;      // 0 - year  is not known; or [1582,9999]
-    uint8_t  month;     // 0 - month is not known; or [1,12]
-    uint8_t  day;       // 0 - day   is not known; or [1,31]
-    uint8_t  hours;     // [0,23]
-    uint8_t  minutes;   // [0,59]
-    uint8_t  seconds;   // [0,59]
-} gatt_date_time_t;
-
-typedef enum {
-    GATT_MICROPHONE_CONTROL_MUTE_OFF = 0x00,
-    GATT_MICROPHONE_CONTROL_MUTE_ON,
-    GATT_MICROPHONE_CONTROL_MUTE_DISABLED
-} gatt_microphone_control_mute_t;
-
-/**
-    SM - LE Security Manager
-*/
-// Bluetooth Spec definitions
-typedef enum {
-    SM_CODE_PAIRING_REQUEST = 0X01,
-    SM_CODE_PAIRING_RESPONSE,
-    SM_CODE_PAIRING_CONFIRM,
-    SM_CODE_PAIRING_RANDOM,
-    SM_CODE_PAIRING_FAILED,
-    SM_CODE_ENCRYPTION_INFORMATION,
-    SM_CODE_MASTER_IDENTIFICATION,
-    SM_CODE_IDENTITY_INFORMATION,
-    SM_CODE_IDENTITY_ADDRESS_INFORMATION,
-    SM_CODE_SIGNING_INFORMATION,
-    SM_CODE_SECURITY_REQUEST,
-    SM_CODE_PAIRING_PUBLIC_KEY,
-    SM_CODE_PAIRING_DHKEY_CHECK,
-    SM_CODE_KEYPRESS_NOTIFICATION,
-} SECURITY_MANAGER_COMMANDS;
-
-// IO Capability Values
-typedef enum {
-    IO_CAPABILITY_DISPLAY_ONLY = 0,
-    IO_CAPABILITY_DISPLAY_YES_NO,
-    IO_CAPABILITY_KEYBOARD_ONLY,
-    IO_CAPABILITY_NO_INPUT_NO_OUTPUT,
-    IO_CAPABILITY_KEYBOARD_DISPLAY, // not used by secure simple pairing
-} io_capability_t;
-
-// Authentication requirement flags
-#define SM_AUTHREQ_NO_BONDING        0x00
-#define SM_AUTHREQ_BONDING           0x01
-#define SM_AUTHREQ_MITM_PROTECTION   0x04
-#define SM_AUTHREQ_SECURE_CONNECTION 0x08
-#define SM_AUTHREQ_KEYPRESS          0x10
-#define SM_AUTHREQ_CT2               0x20
-
-// Key distribution flags used by spec
-#define SM_KEYDIST_ENC_KEY  0x01
-#define SM_KEYDIST_ID_KEY   0x02
-#define SM_KEYDIST_SIGN     0x04
-#define SM_KEYDIST_LINK_KEY 0x08
-
-// Key distribution flags used internally
-#define SM_KEYDIST_FLAG_ENCRYPTION_INFORMATION       0x01
-#define SM_KEYDIST_FLAG_MASTER_IDENTIFICATION        0x02
-#define SM_KEYDIST_FLAG_IDENTITY_INFORMATION         0x04
-#define SM_KEYDIST_FLAG_IDENTITY_ADDRESS_INFORMATION 0x08
-#define SM_KEYDIST_FLAG_SIGNING_IDENTIFICATION       0x10
-
-// STK Generation Methods
-#define SM_STK_GENERATION_METHOD_JUST_WORKS          0x01
-#define SM_STK_GENERATION_METHOD_OOB                 0x02
-#define SM_STK_GENERATION_METHOD_PASSKEY             0x04
-#define SM_STK_GENERATION_METHOD_NUMERIC_COMPARISON  0x08
-
-// Pairing Failed Reasons
-#define SM_REASON_RESERVED                     0x00
-#define SM_REASON_PASSKEY_ENTRY_FAILED         0x01
-#define SM_REASON_OOB_NOT_AVAILABLE            0x02
-#define SM_REASON_AUTHENTHICATION_REQUIREMENTS 0x03
-#define SM_REASON_CONFIRM_VALUE_FAILED         0x04
-#define SM_REASON_PAIRING_NOT_SUPPORTED        0x05
-#define SM_REASON_ENCRYPTION_KEY_SIZE          0x06
-#define SM_REASON_COMMAND_NOT_SUPPORTED        0x07
-#define SM_REASON_UNSPECIFIED_REASON           0x08
-#define SM_REASON_REPEATED_ATTEMPTS            0x09
-#define SM_REASON_INVALID_PARAMETERS           0x0a
-#define SM_REASON_DHKEY_CHECK_FAILED           0x0b
-#define SM_REASON_NUMERIC_COMPARISON_FAILED    0x0c
-#define SM_REASON_BR_EDR_PAIRING_IN_PROGRESS   0x0d
-#define SM_REASON_CROSS_TRANSPORT_KEY_DERIVATION_NOT_ALLOWED 0x0e
-#define SM_REASON_KEY_REJECTED                 0x0f
-
-// also, invalid parameters
-// and reserved
-
-// Keypress Notifications
-#define SM_KEYPRESS_PASSKEY_ENTRY_STARTED      0x00
-#define SM_KEYPRESS_PASSKEY_DIGIT_ENTERED      0x01
-#define SM_KEYPRESS_PASSKEY_DIGIT_ERASED       0x02
-#define SM_KEYPRESS_PASSKEY_CLEARED            0x03
-#define SM_KEYPRESS_PASSKEY_ENTRY_COMPLETED    0x04
-
-
-#endif
@@ -49,11 +49,15 @@ static uint32_t pico_flash_bank_get_alignment(void * context) {
 static void pico_flash_bank_erase(void * context, int bank) {
    (void)(context);
    DEBUG_PRINT("erase: bank %d\n", bank);
-    noInterrupts();
+    if (!__isFreeRTOS) {
+        noInterrupts();
+    }
    rp2040.idleOtherCore();
    flash_range_erase(PICO_FLASH_BANK_STORAGE_OFFSET + (PICO_FLASH_BANK_SIZE * bank), PICO_FLASH_BANK_SIZE);
    rp2040.resumeOtherCore();
-    interrupts();
+    if (!__isFreeRTOS) {
+        interrupts();
+    }
 }

 static void pico_flash_bank_read(void *context, int bank, uint32_t offset, uint8_t *buffer, uint32_t size) {
@@ -147,11 +151,15 @@ static void pico_flash_bank_write(void * context, int bank, uint32_t offset, con
        offset = 0;

        // Now program the entire page
-        noInterrupts();
+        if (!__isFreeRTOS) {
+            noInterrupts();
+        }
        rp2040.idleOtherCore();
        flash_range_program(bank_start_pos + (page * FLASH_PAGE_SIZE), page_data, FLASH_PAGE_SIZE);
        rp2040.resumeOtherCore();
-        interrupts();
+        if (!__isFreeRTOS) {
+            interrupts();
+        }
    }
 }

@@ -1,524 +0,0 @@
-/*
-    Copyright (C) 2014 BlueKitchen GmbH
-
-    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 holders nor the names of
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-    4. Any redistribution, use, or modification is done solely for
-      personal benefit and not for any commercial purpose or for
-      monetary gain.
-
-    THIS SOFTWARE IS PROVIDED BY BLUEKITCHEN GMBH 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 BLUEKITCHEN
-    GMBH 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.
-
-    Please inquire about commercial licensing options at
-    contact@bluekitchen-gmbh.com
-
-*/
-
-#if defined ENABLE_CLASSIC
-
-#define BTSTACK_FILE__ "hids_device.c"
-
-/**
-    Implementation of the GATT HIDS Device
-    To use with your application, add '#import <hids.gatt>' to your .gatt file
-*/
-
-#include "hids_device.h"
-
-#include "ble/att_db.h"
-#include "ble/att_server.h"
-#include "bluetooth_gatt.h"
-#include "btstack_util.h"
-#include "btstack_debug.h"
-
-#define HIDS_DEVICE_ERROR_CODE_INAPPROPRIATE_CONNECTION_PARAMETERS    0x80
-
-// storage for 'generic' HID Device with single Input, Output, and Feature Report
-static hids_device_report_t hid_reports_generic_storage[3];
-
-typedef struct {
-    uint16_t        con_handle;
-
-    uint8_t         hid_country_code;
-    const uint8_t * hid_descriptor;
-    uint16_t        hid_descriptor_size;
-
-    uint16_t        hid_report_map_handle;
-    uint8_t         hid_protocol_mode;
-    uint16_t        hid_protocol_mode_value_handle;
-
-    uint16_t        hid_boot_mouse_input_value_handle;
-    uint16_t        hid_boot_mouse_input_client_configuration_handle;
-    uint16_t        hid_boot_mouse_input_client_configuration_value;
-
-    uint16_t        hid_boot_keyboard_input_value_handle;
-    uint16_t        hid_boot_keyboard_input_client_configuration_handle;
-    uint16_t        hid_boot_keyboard_input_client_configuration_value;
-
-    hids_device_report_t * hid_reports;
-
-    uint8_t         hid_input_reports_num;
-    uint8_t         hid_output_reports_num;
-    uint8_t         hid_feature_reports_num;
-
-    uint16_t        hid_control_point_value_handle;
-    uint8_t         hid_control_point_suspend;
-
-    btstack_context_callback_registration_t  battery_callback;
-} hids_device_t;
-
-static hids_device_t hids_device;
-
-static btstack_packet_handler_t packet_handler;
-static att_service_handler_t hid_service;
-
-// TODO: store hids device connection into list
-static hids_device_t * hids_device_get_instance_for_con_handle(uint16_t con_handle) {
-    UNUSED(con_handle);
-    return &hids_device;
-}
-
-static hids_device_t * hids_device_create_instance(void) {
-    memset(&hids_device, 0, sizeof(hids_device_t));
-    return &hids_device;
-}
-
-static hids_device_report_t * hids_device_get_report_for_client_configuration_handle(hids_device_t * device, uint16_t client_configuration_handle) {
-    uint8_t pos;
-    uint8_t total_reports =  device->hid_input_reports_num + device->hid_output_reports_num + device->hid_feature_reports_num;
-    for (pos = 0 ; pos < total_reports ; pos++) {
-        if (device->hid_reports[pos].client_configuration_handle == client_configuration_handle) {
-            return &device->hid_reports[pos];
-        }
-    }
-    return NULL;
-}
-
-static hids_device_report_t *
-hids_device_get_report_for_id_and_type(hids_device_t *device, uint16_t report_id, hid_report_type_t type) {
-    uint8_t pos;
-    uint8_t total_reports =  device->hid_input_reports_num + device->hid_output_reports_num + device->hid_feature_reports_num;
-    for (pos = 0 ; pos < total_reports ; pos++) {
-        if ((device->hid_reports[pos].type == type) && (device->hid_reports[pos].id == report_id)) {
-            return &device->hid_reports[pos];
-        }
-    }
-    return NULL;
-}
-
-static void hids_device_emit_event_with_uint8(uint8_t event, hci_con_handle_t con_handle, uint8_t value) {
-    hids_device_t * instance = hids_device_get_instance_for_con_handle(con_handle);
-    if (!instance) {
-        log_error("no instance for handle 0x%02x", con_handle);
-        return;
-    }
-
-    if (!packet_handler) {
-        return;
-    }
-    uint8_t buffer[6];
-    buffer[0] = HCI_EVENT_HIDS_META;
-    buffer[1] = 4;
-    buffer[2] = event;
-    little_endian_store_16(buffer, 3, (uint16_t) con_handle);
-    buffer[5] = value;
-    (*packet_handler)(HCI_EVENT_PACKET, 0, buffer, sizeof(buffer));
-}
-
-static void hids_device_emit_event_with_uint8_uint8_t(uint8_t event, hci_con_handle_t con_handle, uint8_t value_1, uint8_t value_2) {
-    hids_device_t * instance = hids_device_get_instance_for_con_handle(con_handle);
-    if (!instance) {
-        log_error("no instance for handle 0x%02x", con_handle);
-        return;
-    }
-
-    if (!packet_handler) {
-        return;
-    }
-    uint8_t buffer[7];
-    buffer[0] = HCI_EVENT_HIDS_META;
-    buffer[1] = 4;
-    buffer[2] = event;
-    little_endian_store_16(buffer, 3, (uint16_t) con_handle);
-    buffer[5] = value_1;
-    buffer[6] = value_2;
-    (*packet_handler)(HCI_EVENT_PACKET, 0, buffer, sizeof(buffer));
-}
-
-static void hids_device_emit_event(uint8_t event, hci_con_handle_t con_handle) {
-    hids_device_t * instance = hids_device_get_instance_for_con_handle(con_handle);
-    if (!instance) {
-        log_error("no instance for handle 0x%02x", con_handle);
-        return;
-    }
-
-    if (!packet_handler) {
-        return;
-    }
-    uint8_t buffer[5];
-    buffer[0] = HCI_EVENT_HIDS_META;
-    buffer[1] = 4;
-    buffer[2] = event;
-    little_endian_store_16(buffer, 3, (uint16_t) con_handle);
-    (*packet_handler)(HCI_EVENT_PACKET, 0, buffer, sizeof(buffer));
-}
-
-static void hids_device_can_send_now(void * context) {
-    hci_con_handle_t con_handle = (hci_con_handle_t)(uintptr_t) context;
-    // notify client
-    hids_device_t * instance = hids_device_get_instance_for_con_handle(con_handle);
-    if (!instance) {
-        log_error("no instance for handle 0x%02x", con_handle);
-        return;
-    }
-
-    if (!packet_handler) {
-        return;
-    }
-    uint8_t buffer[5];
-    buffer[0] = HCI_EVENT_HIDS_META;
-    buffer[1] = 3;
-    buffer[2] = HIDS_SUBEVENT_CAN_SEND_NOW;
-    little_endian_store_16(buffer, 3, (uint16_t) con_handle);
-    (*packet_handler)(HCI_EVENT_PACKET, 0, buffer, sizeof(buffer));
-}
-
-// ATT Client Read Callback for Dynamic Data
-// - if buffer == NULL, don't copy data, just return size of value
-// - if buffer != NULL, copy data and return number bytes copied
-static uint16_t att_read_callback(hci_con_handle_t con_handle, uint16_t att_handle, uint16_t offset, uint8_t * buffer, uint16_t buffer_size) {
-    hids_device_t * instance = hids_device_get_instance_for_con_handle(con_handle);
-    if (!instance) {
-        log_error("no instance for handle 0x%02x", con_handle);
-        return HIDS_DEVICE_ERROR_CODE_INAPPROPRIATE_CONNECTION_PARAMETERS;
-    }
-
-    if (att_handle == instance->hid_protocol_mode_value_handle) {
-        log_info("Read protocol mode");
-        return att_read_callback_handle_byte(instance->hid_protocol_mode, offset, buffer, buffer_size);
-    }
-
-    if (att_handle == instance->hid_report_map_handle) {
-        log_info("Read report map");
-        return att_read_callback_handle_blob(instance->hid_descriptor, instance->hid_descriptor_size, offset, buffer, buffer_size);
-    }
-
-    if (att_handle == instance->hid_boot_mouse_input_client_configuration_handle) {
-        return att_read_callback_handle_little_endian_16(instance->hid_boot_mouse_input_client_configuration_value, offset, buffer, buffer_size);
-    }
-
-    if (att_handle == instance->hid_boot_keyboard_input_client_configuration_handle) {
-        return att_read_callback_handle_little_endian_16(instance->hid_boot_keyboard_input_client_configuration_value, offset, buffer, buffer_size);
-    }
-
-    if (att_handle == instance->hid_control_point_value_handle) {
-        if (buffer && (buffer_size >= 1u)) {
-            buffer[0] = instance->hid_control_point_suspend;
-        }
-        return 1;
-    }
-
-    hids_device_report_t * report = hids_device_get_report_for_client_configuration_handle(instance, att_handle);
-    if (report != NULL) {
-        return att_read_callback_handle_little_endian_16(report->client_configuration_value, offset, buffer, buffer_size);
-    }
-    return 0;
-}
-
-static int att_write_callback(hci_con_handle_t con_handle, uint16_t att_handle, uint16_t transaction_mode, uint16_t offset, uint8_t *buffer, uint16_t buffer_size) {
-    UNUSED(transaction_mode);
-    UNUSED(buffer_size);
-    UNUSED(offset);
-
-    hids_device_t * instance = hids_device_get_instance_for_con_handle(con_handle);
-    if (!instance) {
-        log_error("no instance for handle 0x%02x", con_handle);
-        return HIDS_DEVICE_ERROR_CODE_INAPPROPRIATE_CONNECTION_PARAMETERS;
-    }
-
-    if (att_handle == instance->hid_boot_mouse_input_client_configuration_handle) {
-        uint16_t new_value = little_endian_read_16(buffer, 0);
-        instance->hid_boot_mouse_input_client_configuration_value = new_value;
-        hids_device_emit_event_with_uint8(HIDS_SUBEVENT_BOOT_MOUSE_INPUT_REPORT_ENABLE, con_handle, (uint8_t) new_value);
-    }
-    if (att_handle == instance->hid_boot_keyboard_input_client_configuration_handle) {
-        uint16_t new_value = little_endian_read_16(buffer, 0);
-        instance->hid_boot_keyboard_input_client_configuration_value = new_value;
-        hids_device_emit_event_with_uint8(HIDS_SUBEVENT_BOOT_KEYBOARD_INPUT_REPORT_ENABLE, con_handle, (uint8_t) new_value);
-    }
-
-    if (att_handle == instance->hid_protocol_mode_value_handle) {
-        instance->hid_protocol_mode = buffer[0];
-        log_info("Set protocol mode: %u", instance->hid_protocol_mode);
-        hids_device_emit_event_with_uint8(HIDS_SUBEVENT_PROTOCOL_MODE, con_handle, instance->hid_protocol_mode);
-    }
-
-    if (att_handle == instance->hid_control_point_value_handle) {
-        if (buffer_size < 1u) {
-            return ATT_ERROR_INVALID_OFFSET;
-        }
-        instance->hid_control_point_suspend = buffer[0];
-        instance->con_handle = con_handle;
-        log_info("Set suspend tp: %u", instance->hid_control_point_suspend);
-        if (instance->hid_control_point_suspend == 0u) {
-            hids_device_emit_event(HIDS_SUBEVENT_SUSPEND, con_handle);
-        } else if (instance->hid_control_point_suspend == 1u) {
-            hids_device_emit_event(HIDS_SUBEVENT_EXIT_SUSPEND, con_handle);
-        }
-    }
-
-    hids_device_report_t * report = hids_device_get_report_for_client_configuration_handle(instance, att_handle);
-    if (report != NULL) {
-        uint16_t new_value = little_endian_read_16(buffer, 0);
-        report->client_configuration_value = new_value;
-        log_info("Enable Report (type %u) notifications: %x", (uint8_t) report->type, new_value);
-
-        switch (report->type) {
-        case HID_REPORT_TYPE_INPUT:
-            hids_device_emit_event_with_uint8_uint8_t(HIDS_SUBEVENT_INPUT_REPORT_ENABLE, con_handle, report->id, (uint8_t) new_value);
-            break;
-        case HID_REPORT_TYPE_OUTPUT:
-            hids_device_emit_event_with_uint8_uint8_t(HIDS_SUBEVENT_OUTPUT_REPORT_ENABLE, con_handle, report->id, (uint8_t) new_value);
-            break;
-        case HID_REPORT_TYPE_FEATURE:
-            hids_device_emit_event_with_uint8_uint8_t(HIDS_SUBEVENT_FEATURE_REPORT_ENABLE, con_handle, report->id, (uint8_t) new_value);
-            break;
-        default:
-            btstack_unreachable();
-            break;
-        }
-    }
-    return 0;
-}
-
-void hids_device_init_with_storage(uint8_t hid_country_code, const uint8_t * hid_descriptor, uint16_t hid_descriptor_size,
-                                   uint16_t num_reports, hids_device_report_t * report_storage) {
-
-    hids_device_t * instance = hids_device_create_instance();
-
-    btstack_assert(num_reports > 0);
-    btstack_assert(report_storage != NULL);
-
-    instance->hid_country_code    = hid_country_code;
-    instance->hid_descriptor      = hid_descriptor;
-    instance->hid_descriptor_size = hid_descriptor_size;
-
-    // default
-    instance->hid_protocol_mode   = 1;
-
-    // get service handle range
-    uint16_t start_handle = 0;
-    uint16_t end_handle   = 0xffff;
-    int service_found = gatt_server_get_handle_range_for_service_with_uuid16(ORG_BLUETOOTH_SERVICE_HUMAN_INTERFACE_DEVICE, &start_handle, &end_handle);
-    btstack_assert(service_found != 0);
-    UNUSED(service_found);
-
-    // get report map handle
-    instance->hid_report_map_handle                               = gatt_server_get_value_handle_for_characteristic_with_uuid16(start_handle, end_handle, ORG_BLUETOOTH_CHARACTERISTIC_REPORT_MAP);
-
-    // get report map handle
-    instance->hid_protocol_mode_value_handle                      = gatt_server_get_value_handle_for_characteristic_with_uuid16(start_handle, end_handle, ORG_BLUETOOTH_CHARACTERISTIC_PROTOCOL_MODE);
-
-    // get value and client configuration handles for boot mouse input, boot keyboard input and report input
-    instance->hid_boot_mouse_input_value_handle                   = gatt_server_get_value_handle_for_characteristic_with_uuid16(start_handle, end_handle, ORG_BLUETOOTH_CHARACTERISTIC_BOOT_MOUSE_INPUT_REPORT);
-    instance->hid_boot_mouse_input_client_configuration_handle    = gatt_server_get_client_configuration_handle_for_characteristic_with_uuid16(start_handle, end_handle, ORG_BLUETOOTH_CHARACTERISTIC_BOOT_MOUSE_INPUT_REPORT);
-
-    instance->hid_boot_keyboard_input_value_handle                = gatt_server_get_value_handle_for_characteristic_with_uuid16(start_handle, end_handle, ORG_BLUETOOTH_CHARACTERISTIC_BOOT_KEYBOARD_INPUT_REPORT);
-    instance->hid_boot_keyboard_input_client_configuration_handle = gatt_server_get_client_configuration_handle_for_characteristic_with_uuid16(start_handle, end_handle, ORG_BLUETOOTH_CHARACTERISTIC_BOOT_KEYBOARD_INPUT_REPORT);
-
-    instance->hid_control_point_value_handle = gatt_server_get_value_handle_for_characteristic_with_uuid16(start_handle, end_handle, ORG_BLUETOOTH_CHARACTERISTIC_HID_CONTROL_POINT);
-
-    log_info("hid_report_map_handle                               0x%02x", instance->hid_report_map_handle);
-    log_info("hid_protocol_mode_value_handle                      0x%02x", instance->hid_protocol_mode_value_handle);
-    log_info("hid_boot_mouse_input_value_handle                   0x%02x", instance->hid_boot_mouse_input_value_handle);
-    log_info("hid_boot_mouse_input_client_configuration_handle    0x%02x", instance->hid_boot_mouse_input_client_configuration_handle);
-    log_info("hid_boot_keyboard_input_value_handle                0x%02x", instance->hid_boot_keyboard_input_value_handle);
-    log_info("hid_boot_keyboard_input_client_configuration_handle 0x%02x", instance->hid_boot_keyboard_input_client_configuration_handle);
-    log_info("hid_control_point_value_handle                      0x%02x", instance->hid_control_point_value_handle);
-
-    instance->hid_reports = report_storage;
-
-    uint16_t hid_reports_num = num_reports;
-    uint16_t assigned_reports_num = 0;
-    uint16_t start_chr_handle = start_handle;
-
-    while ((start_chr_handle < end_handle) && (assigned_reports_num < hid_reports_num)) {
-        // mandatory
-        uint16_t chr_value_handle = gatt_server_get_value_handle_for_characteristic_with_uuid16(start_chr_handle, end_handle, ORG_BLUETOOTH_CHARACTERISTIC_REPORT);
-        if (chr_value_handle == 0) {
-            break;
-        }
-
-        // optional
-        uint16_t chr_client_configuration_handle = gatt_server_get_client_configuration_handle_for_characteristic_with_uuid16(start_chr_handle, end_handle, ORG_BLUETOOTH_CHARACTERISTIC_REPORT);
-
-        // mandatory
-        uint16_t report_reference_handle = gatt_server_get_descriptor_handle_for_characteristic_with_uuid16(start_chr_handle, end_handle, ORG_BLUETOOTH_CHARACTERISTIC_REPORT, ORG_BLUETOOTH_DESCRIPTOR_REPORT_REFERENCE);
-        if (report_reference_handle == 0) {
-            break;
-        }
-
-        // get report id and type from report reference
-        uint16_t report_reference_value_len;
-        const uint8_t * report_reference_value = gatt_server_get_const_value_for_handle(report_reference_handle, &report_reference_value_len);
-        if (report_reference_value == NULL) {
-            break;
-        }
-        if (report_reference_value_len != 2) {
-            break;
-        }
-        uint8_t report_id = report_reference_value[0];
-        hid_report_type_t report_type = (hid_report_type_t) report_reference_value[1];
-
-        // store report info
-        hids_device_report_t * report = &report_storage[assigned_reports_num];
-        report->value_handle = chr_value_handle;
-        report->client_configuration_handle = chr_client_configuration_handle;
-        report->client_configuration_value = 0;
-        report->id   = report_id;
-        report->type = report_type;
-
-        switch (report->type) {
-        case HID_REPORT_TYPE_INPUT:
-            instance->hid_input_reports_num++;
-            break;
-        case HID_REPORT_TYPE_OUTPUT:
-            instance->hid_output_reports_num++;
-            break;
-        case HID_REPORT_TYPE_FEATURE:
-            instance->hid_feature_reports_num++;
-            break;
-        default:
-            btstack_unreachable();
-            return;
-        }
-        log_info("hid_report_value_handle                       0x%02x, id %u, type %u", report->value_handle, report->id, (uint8_t)report->type);
-        if (report->client_configuration_handle != 0) {
-            log_info("hid_report_client_configuration_handle        0x%02x", report->client_configuration_handle);
-        }
-
-        assigned_reports_num++;
-        start_chr_handle = report_reference_handle + 1;
-    }
-
-    // register service with ATT Server
-    hid_service.start_handle   = start_handle;
-    hid_service.end_handle     = end_handle;
-    hid_service.read_callback  = &att_read_callback;
-    hid_service.write_callback = &att_write_callback;
-    att_server_register_service_handler(&hid_service);
-}
-
-/**
-    @brief Set up HIDS Device
-*/
-void hids_device_init(uint8_t country_code, const uint8_t * descriptor, uint16_t descriptor_size) {
-    uint16_t hid_reports_num = sizeof(hid_reports_generic_storage) / sizeof(hids_device_report_t);
-    hids_device_init_with_storage(country_code, descriptor, descriptor_size, hid_reports_num, hid_reports_generic_storage);
-}
-
-/**
-    @brief Register callback for the HIDS Device client.
-    @param callback
-*/
-void hids_device_register_packet_handler(btstack_packet_handler_t callback) {
-    packet_handler = callback;
-}
-
-/**
-    @brief Request can send now event to send HID Report
-    Generates an HIDS_SUBEVENT_CAN_SEND_NOW subevent
-    @param hid_cid
-*/
-void hids_device_request_can_send_now_event(hci_con_handle_t con_handle) {
-    hids_device_t * instance = hids_device_get_instance_for_con_handle(con_handle);
-    if (!instance) {
-        log_error("no instance for handle 0x%02x", con_handle);
-        return;
-    }
-
-    instance->battery_callback.callback = &hids_device_can_send_now;
-    instance->battery_callback.context  = (void*)(uintptr_t) con_handle;
-    att_server_register_can_send_now_callback(&instance->battery_callback, con_handle);
-}
-
-uint8_t hids_device_send_input_report_for_id(hci_con_handle_t con_handle, uint16_t report_id, const uint8_t * report, uint16_t report_len) {
-    hids_device_t * instance = hids_device_get_instance_for_con_handle(con_handle);
-    if (!instance) {
-        log_error("no instance for handle 0x%02x", con_handle);
-        return ERROR_CODE_UNKNOWN_CONNECTION_IDENTIFIER;
-    }
-
-    hids_device_report_t * report_storage = hids_device_get_report_for_id_and_type(instance, report_id,
-                                            HID_REPORT_TYPE_INPUT);
-    if (report_storage == NULL) {
-        return ERROR_CODE_UNSUPPORTED_FEATURE_OR_PARAMETER_VALUE;
-    }
-
-    return att_server_notify(con_handle, report_storage->value_handle, report, report_len);
-}
-
-uint8_t hids_device_send_input_report(hci_con_handle_t con_handle, const uint8_t * report, uint16_t report_len) {
-    hids_device_t * device = hids_device_get_instance_for_con_handle(con_handle);
-    if (!device) {
-        log_error("no instance for handle 0x%02x", con_handle);
-        return ERROR_CODE_UNKNOWN_CONNECTION_IDENTIFIER;
-    }
-
-    uint8_t pos;
-    uint8_t total_reports =  device->hid_input_reports_num + device->hid_output_reports_num + device->hid_feature_reports_num;
-    for (pos = 0 ; pos < total_reports ; pos++) {
-        hids_device_report_t * report_storage = &device->hid_reports[pos];
-        if (report_storage->type == HID_REPORT_TYPE_INPUT) {
-            return att_server_notify(con_handle, report_storage->value_handle, report, report_len);
-        }
-    }
-    return ERROR_CODE_UNSUPPORTED_FEATURE_OR_PARAMETER_VALUE;
-}
-
-/**
-    @brief Send HID Boot Mouse Input Report
-*/
-uint8_t hids_device_send_boot_mouse_input_report(hci_con_handle_t con_handle, const uint8_t * report, uint16_t report_len) {
-    hids_device_t * instance = hids_device_get_instance_for_con_handle(con_handle);
-    if (!instance) {
-        log_error("no instance for handle 0x%02x", con_handle);
-        return ERROR_CODE_UNKNOWN_CONNECTION_IDENTIFIER;
-    }
-    return att_server_notify(con_handle, instance->hid_boot_mouse_input_value_handle, report, report_len);
-}
-
-/**
-    @brief Send HID Boot Mouse Input Report
-*/
-uint8_t hids_device_send_boot_keyboard_input_report(hci_con_handle_t con_handle, const uint8_t * report, uint16_t report_len) {
-    hids_device_t * instance = hids_device_get_instance_for_con_handle(con_handle);
-    if (!instance) {
-        log_error("no instance for handle 0x%02x", con_handle);
-        return ERROR_CODE_UNKNOWN_CONNECTION_IDENTIFIER;
-    }
-    return att_server_notify(con_handle, instance->hid_boot_keyboard_input_value_handle, report, report_len);
-}
-
-#endif
@@ -1,143 +0,0 @@
-/*
-    Copyright (C) 2014 BlueKitchen GmbH
-
-    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 holders nor the names of
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-    4. Any redistribution, use, or modification is done solely for
-      personal benefit and not for any commercial purpose or for
-      monetary gain.
-
-    THIS SOFTWARE IS PROVIDED BY BLUEKITCHEN GMBH 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 BLUEKITCHEN
-    GMBH 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.
-
-    Please inquire about commercial licensing options at
-    contact@bluekitchen-gmbh.com
-
-*/
-
-/**
-    @title HID Service Server
-
-*/
-
-#ifndef HIDS_DEVICE_H
-#define HIDS_DEVICE_H
-
-#if defined ENABLE_CLASSIC
-
-#include <sdkoverride/att_db.h>
-#include <stdint.h>
-#include "btstack_defines.h"
-#include "btstack_hid.h"
-#include "bluetooth.h"
-
-#if defined __cplusplus
-extern "C" {
-#endif
-
-    /* API_START */
-
-    typedef struct {
-        uint16_t value_handle;
-        uint16_t client_configuration_handle;
-        uint16_t client_configuration_value;
-
-        hid_report_type_t type;
-        uint16_t id;
-    } hids_device_report_t;
-
-    /**
-        @text Implementation of the GATT HIDS Device
-        To use with your application, add '#import <hids.gatt>' to your .gatt file
-    */
-
-    /**
-        @brief Set up HIDS Device with single INPUT, OUTPUT and FEATURE report
-    */
-    void hids_device_init(uint8_t hid_country_code, const uint8_t * hid_descriptor, uint16_t hid_descriptor_size);
-
-    /**
-        @brief Set up HIDS Device for multiple instances of INPUT, OUTPUT and FEATURE reports
-    */
-    void hids_device_init_with_storage(uint8_t hid_country_code, const uint8_t * hid_descriptor, uint16_t hid_descriptor_size,
-                                       uint16_t num_reports, hids_device_report_t * report_storage);
-
-    /**
-        @brief Register callback for the HIDS Device client.
-        @param callback
-    */
-    void hids_device_register_packet_handler(btstack_packet_handler_t callback);
-
-    /**
-        @brief Request can send now event to send HID Report
-        Generates an HIDS_SUBEVENT_CAN_SEND_NOW subevent
-        @param hid_cid
-    */
-    void hids_device_request_can_send_now_event(hci_con_handle_t con_handle);
-
-    /**
-        @brief Send HID Input Report for Report ID
-        @param con_handle
-        @param report_id
-        @param report
-        @param report_len
-        @returns status
-    */
-    uint8_t hids_device_send_input_report_for_id(hci_con_handle_t con_handle, uint16_t report_id, const uint8_t * report, uint16_t report_len);
-
-    /**
-        @brief Send HID Input Report for first Input Report
-        @param con_handle
-        @param report
-        @param report_len
-        @returns status
-    */
-    uint8_t hids_device_send_input_report(hci_con_handle_t con_handle, const uint8_t * report, uint16_t report_len);
-
-    /**
-        @brief Send HID Boot Mouse Input Report
-        @param con_handle
-        @param report
-        @param report_len
-        @returns status
-    */
-    uint8_t hids_device_send_boot_mouse_input_report(hci_con_handle_t con_handle, const uint8_t * report, uint16_t report_len);
-
-    /**
-        @brief Send HID Boot Mouse Input Report
-        @param con_handle
-        @param report
-        @param report_len
-        @returns status
-    */
-    uint8_t hids_device_send_boot_keyboard_input_report(hci_con_handle_t con_handle, const uint8_t * report, uint16_t report_len);
-
-    /* API_END */
-
-#if defined __cplusplus
-}
-#endif
-
-#endif
-
-#endif
@@ -23,8 +23,8 @@
 .program tone2
 .side_set 1 opt

-    pull                     ; TXFIFO -> OSR, or X -> OSR if no new period
-    mov x, osr               ; OSR -> X
+;    pull                     ; TXFIFO -> OSR, or X -> OSR if no new period
+;    mov x, osr               ; OSR -> X

 high:
    pull noblock             ; Potentially grab new HALFCYCLECOUNT, OTW copy from backup in X
@@ -13,27 +13,25 @@
 // ----- //

 #define tone2_wrap_target 0
-#define tone2_wrap 8
+#define tone2_wrap 6
 #define tone2_pio_version 0

 static const uint16_t tone2_program_instructions[] = {
    //     .wrap_target
-    0x80a0, //  0: pull   block
+    0x8080, //  0: pull   noblock
    0xa027, //  1: mov    x, osr
-    0x8080, //  2: pull   noblock
-    0xa027, //  3: mov    x, osr
-    0xb847, //  4: mov    y, osr          side 1
+    0xb847, //  2: mov    y, osr          side 1
+    0x0083, //  3: jmp    y--, 3
+    0xb047, //  4: mov    y, osr          side 0
    0x0085, //  5: jmp    y--, 5
-    0xb047, //  6: mov    y, osr          side 0
-    0x0087, //  7: jmp    y--, 7
-    0x0002, //  8: jmp    2
+    0x0000, //  6: jmp    0
    //     .wrap
 };

 #if !PICO_NO_HARDWARE
 static const struct pio_program tone2_program = {
    .instructions = tone2_program_instructions,
-    .length = 9,
+    .length = 7,
    .origin = -1,
    .pio_version = 0,
 #if PICO_PIO_VERSION > 0
@@ -22,7 +22,8 @@
 #include <CoreMutex.h>
 #include <hardware/gpio.h>
 #include <hardware/sync.h>
-#include <map>
+#include "_freertos.h"
+

 // Support nested IRQ disable/re-enable
 #ifndef maxIRQs
@@ -32,69 +33,59 @@ static uint32_t _irqStackTop[2] = { 0, 0 };
 static uint32_t _irqStack[2][maxIRQs];

 extern "C" void interrupts() {
-    auto core = get_core_num();
-    if (!_irqStackTop[core]) {
-        // ERROR
-        return;
+    if (__freeRTOSinitted) {
+        __freertos_task_exit_critical();
+    } else {
+        auto core = get_core_num();
+        if (!_irqStackTop[core]) {
+            // ERROR
+            return;
+        }
+        restore_interrupts(_irqStack[core][--_irqStackTop[core]]);
    }
-    restore_interrupts(_irqStack[core][--_irqStackTop[core]]);
 }

 extern "C" void noInterrupts() {
-    auto core = get_core_num();
-    if (_irqStackTop[core] == maxIRQs) {
-        // ERROR
-        panic("IRQ stack overflow");
+    if (__freeRTOSinitted) {
+        __freertos_task_enter_critical();
+    } else {
+        auto core = get_core_num();
+        if (_irqStackTop[core] == maxIRQs) {
+            // ERROR
+            panic("IRQ stack overflow");
+        }
+        _irqStack[core][_irqStackTop[core]++] = save_and_disable_interrupts();
    }
-
-    _irqStack[core][_irqStackTop[core]++] = save_and_disable_interrupts();
 }

+auto_init_mutex(_irqMutex);
+static uint64_t _gpioIrqEnabled = 0; // Sized to work with RP2350B, 48 GPIOs
+static uint64_t _gpioIrqUseParam;
+void *_gpioIrqCB[__GPIOCNT];
+void *_gpioIrqCBParam[__GPIOCNT];
+
 // Only 1 GPIO IRQ callback for all pins, so we need to look at the pin it's for and
 // dispatch to the real callback manually
-auto_init_mutex(_irqMutex);
-class CBInfo {
-public:
-    CBInfo(voidFuncPtr cb) : _cb(cb), _useParam(false), _param(nullptr) { };
-    CBInfo(voidFuncPtrParam cbParam, void *param) : _cbParam(cbParam), _useParam(true), _param(param) { };
-    void callback() {
-        if (_useParam && _cbParam) {
-            _cbParam(_param);
-        } else if (_cb) {
-            _cb();
-        }
-    }
-private:
-    union {
-        voidFuncPtr _cb;
-        voidFuncPtrParam _cbParam;
-    };
-    bool _useParam;
-    void *_param;
-};
-
-
-static std::map<pin_size_t, CBInfo> _map;
-
 void _gpioInterruptDispatcher(uint gpio, uint32_t events) {
    (void) events;
-    // Only need to lock around the std::map check, not the whole IRQ callback
-    CoreMutex m(&_irqMutex);
-    if (m) {
-        auto irq = _map.find(gpio);
-        if (irq != _map.end()) {
-            auto cb = irq->second;
-            cb.callback();
+    uint64_t mask = 1LL << gpio;
+    if (_gpioIrqEnabled & mask) {
+        if (_gpioIrqUseParam & mask) {
+            voidFuncPtr cb = (voidFuncPtr)_gpioIrqCB[gpio];
+            cb();
+        } else {
+            voidFuncPtrParam cb = (voidFuncPtrParam)_gpioIrqCB[gpio];
+            cb(_gpioIrqCBParam[gpio]);
        }
    }
 }

 // To be called when appropriately protected w/IRQ and mutex protects
 static void _detachInterruptInternal(pin_size_t pin) {
-    auto irq = _map.find(pin);
-    if (irq != _map.end()) {
+    uint64_t mask = 1LL << pin;
+    if (_gpioIrqEnabled & mask) {
        gpio_set_irq_enabled(pin, 0x0f /* all */, false);
-        _map.erase(pin);
+        _gpioIrqEnabled &= ~mask;
    }
 }

@@ -103,7 +94,7 @@ extern "C" void attachInterrupt(pin_size_t pin, voidFuncPtr callback, PinStatus
    if (!m) {
        return;
    }
-
+    uint64_t mask = 1LL << pin;
    uint32_t events;
    switch (mode) {
    case LOW:     events = 1; break;
@@ -115,8 +106,9 @@ extern "C" void attachInterrupt(pin_size_t pin, voidFuncPtr callback, PinStatus
    }
    noInterrupts();
    _detachInterruptInternal(pin);
-    CBInfo cb(callback);
-    _map.insert({pin, cb});
+    _gpioIrqEnabled |= mask;
+    _gpioIrqUseParam &= ~mask; // No parameter
+    _gpioIrqCB[pin] = (void *)callback;
    gpio_set_irq_enabled_with_callback(pin, events, true, _gpioInterruptDispatcher);
    interrupts();
 }
@@ -126,7 +118,7 @@ void attachInterruptParam(pin_size_t pin, voidFuncPtrParam callback, PinStatus m
    if (!m) {
        return;
    }
-
+    uint64_t mask = 1LL << pin;
    uint32_t events;
    switch (mode) {
    case LOW:     events = 1; break;
@@ -138,8 +130,10 @@ void attachInterruptParam(pin_size_t pin, voidFuncPtrParam callback, PinStatus m
    }
    noInterrupts();
    _detachInterruptInternal(pin);
-    CBInfo cb(callback, param);
-    _map.insert({pin, cb});
+    _gpioIrqEnabled |= mask;
+    _gpioIrqUseParam &= ~mask; // No parameter
+    _gpioIrqCB[pin] = (void *)callback;
+    _gpioIrqCBParam[pin] = param;
    gpio_set_irq_enabled_with_callback(pin, events, true, _gpioInterruptDispatcher);
    interrupts();
 }
@@ -54,9 +54,9 @@ author = u'Earle F. Philhower, III'
 # built documents.
 #
 # The short X.Y version.
-version = u'4.0.2'
+version = u'4.3.1'
 # The full version, including alpha/beta/rc tags.
-release = u'4.0.2'
+release = u'4.3.1'

 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -1,8 +1,6 @@
 FreeRTOS SMP
 ============

-**NOTE:** FreeRTOS is not yet supported on the RP2350.  PRs gladly accepted!
-
 The SMP (multicore) port of FreeRTOS is included with the core.  This allows complex
 task operations and real preemptive multithreading in your sketches.  While the
 ``setup1`` and ``loop1`` way of multitasking is simplest for most folks, FreeRTOS
@@ -7,7 +7,7 @@ RP2040 (Raspberry Pi Pico processor) and RP2350 (Raspberry Pi Pico 2
 processor), intended to make it easier and more fun to use and
 program the Raspberry Pi Pico / RP2040 / RP2350 based boards.

-This Arduino core uses a custom toolset with GCC 12.3 and Newlib 4.0.0
+This Arduino core uses a custom toolset with GCC 14.2 and Newlib 4.3
 and doesn't require any system-installed prerequisites.

 For the latest version, always check https://github.com/earlephilhower/arduino-pico
@@ -1,8 +1,6 @@
 OTA Updates
 ===========

-**NOTE:** OTA is not yet supported on the RP2350.  PRs gladly accepted!
-
 Introduction
 ------------

@@ -237,7 +235,7 @@ Requirements
 Implementation Overview
 ~~~~~~~~~~~~~~~~~~~~~~~

-Updates with a web browser are implemented using ``HTTPUpdateServer`` class together with ``WebServer`` and ``LEAmDNS`` classes. The following code is required to get it work:
+Updates with a web browser are implemented using ``HTTPUpdateServer`` class together with ``WebServer`` and ``LEAmDNS`` or ``SimpleMDNS``  classes. The following code is required to get it work:

 setup()

@@ -156,6 +156,22 @@ platform <https://github.com/maxgerhardt/platform-raspberrypi/blob/77e0d3a29d1db
    ; Flash Size: 2MB (Sketch: 0.5MB, FS:1.5MB)
    board_build.filesystem_size = 1.5m

+PSRAM size
+----------
+
+For RP2350 based boards, this controls how much PSRAM the firmware will think it has available in bytes, mapped at starting address 0x11000000.
+
+To learn more about PSRAM usage, see: :doc:`RP2350 PSRAM Support <psram>` 
+
+.. code:: ini
+
+    ; PSRAM size: 1MB
+    board_upload.psram_length = 1048576
+    ; PSRAM size: 2MB
+    board_upload.psram_length = 2097152
+    ; PSRAM size: 4MB
+    board_upload.psram_length = 4194304
+
 CPU Speed
 ---------

@@ -262,6 +278,18 @@ default Pico SDK USB stack. To change it, add
 Note that the special "No USB" setting is also supported, through the
 shortcut-define ``PIO_FRAMEWORK_ARDUINO_NO_USB``.

+USB Customization
+-----------------
+
+If you want to change the USB VID, PID, product or manufacturer name that the device will appear under, configure them as follows:
+
+.. code:: ini
+
+    board_build.arduino.earlephilhower.usb_manufacturer = Custom Manufacturer
+    board_build.arduino.earlephilhower.usb_product = Ultra Cool Product
+    board_build.arduino.earlephilhower.usb_vid = 0xABCD
+    board_build.arduino.earlephilhower.usb_pid = 0x1337
+
 IP Stack
 --------

@@ -309,6 +337,19 @@ local copy of the core (with e.g. some modifications) on disk (`see documentatio
 Note that this can only be done for versions that have the PlatformIO
 builder script it in, so versions before 1.9.2 are not supported.

+Selecting the CPU architecture
+------------------------------
+
+By default Platform.IO will build for the onboard ARM cores on the RP2350.  To build RISC-V binaries
+adjust the ``board_build.mcu`` option accordingly:
+
+.. code:: ini
+
+    ; RP2350 based (RISC-V)
+    [env:rpipico2-riscv]
+    board = rpipico2
+    board_build.mcu = rp2350-riscv
+
 Examples
 --------

@@ -53,7 +53,7 @@ The following example will **NOT** work:
 Using PSRAM for dynamic allocations
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-PSRAM can also be used as a heap for dynamica allocations using ``pmalloc`` and
+PSRAM can also be used as a heap for dynamic allocations using ``pmalloc`` and
 ``pcalloc``.  These calls function exactly like normal ``malloc`` and ``calloc``
 except they allocate space from PSRAM.

@@ -57,6 +57,11 @@ void rp2040.wdt_reset()
 ~~~~~~~~~~~~~~~~~~~~~~~
 Reloads the watchdog's counter with the amount of time set by wdt_begin.

+RP2040::resetReason_t rp2040.getResetReason()
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Returns the reason for the last reset, defined in enum ``RP2040::resetReason_t``.
+See example ```ResetReason``` for some details.
+

 Memory Information
 ------------------
@@ -90,8 +95,8 @@ doing any WiFi calls.
 Bootloader
 ----------

-void rp2040.enableDoubleResetBootloader()
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+void rp2040.enableDoubleResetBootloader()  (Pico/RP2040 only)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Add a call anywhere in the sketch to ``rp2040.enableDoubleResetBootloader()`` and
 the core will check for a double-tap on reset, and if found will start the USB
 bootloader.
@@ -6,8 +6,14 @@ is supported by the core with some minor caveats:

 * PSRAM is supported via a new ``pmalloc`` call and ``PSRAM`` variable decorator.
 * Both RP2350A and RP2350B (48 GPIOs) are supported.
-* Only ARM mode is available.  For RISC-V (Hazard3), please use the raw SDK.
-* FreeRTOS and OTA are not yet supported.
+
+ARM and RISC-V Modes
+~~~~~~~~~~~~~~~~~~~~
+
+Either set of cores can be used on the RP2350, ARM Cortex-M33 or RISC-V Hazard3.
+Select the desired core from the IDE menus under ``Tools->CPU Architecture``.
+As of the initial release, all libraries should work under the new RISC-V mode with
+the exception of FreeRTOS.  If not, patches are always welcome.

 P2350-E9 Errata ("Increased leakage current on Bank 0 GPIO when pad input is enabled")
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -44,7 +44,7 @@ Please note that WiFi on the Pico W is a work-in-progress and there are some imp

  * FreeRTOS is supported only on core 0 and from within ``setup`` and ``loop``, not tasks, due to the requirement for a very different LWIP implementation.  PRs always appreciated!

-  * LEAmDNS (``MDNS``) is not supported in FreeRTOS due to internal IRQ-time memory allocations.
+  * LEAmDNS (``MDNS``) is not supported in FreeRTOS due to internal IRQ-time memory allocations.  Instead, use the SimpleMDNS library ( ``#include <SimpleMDNS.h>`` ) which has no such allocations.

 The WiFi library borrows much work from the `ESP8266 Arduino Core <https://github.com/esp8266/Arduino>`__ , especially the ``WiFiClient`` and ``WiFiServer`` classes.

@@ -1,2 +1,2 @@
 // Do not edit -- Automatically generated by tools/sdk/ssl/bearssl/Makefile
-#define BEARSSL_GIT c2c9d9d
+#define BEARSSL_GIT 5b7f3d5
@@ -21,50 +21,56 @@ extern unsigned long __lwip_rand(void);
 // Common settings used in most of the pico_w examples
 // (see https://www.nongnu.org/lwip/2_1_x/group__lwip__opts.html for details)

-#define NO_SYS                      1
-#define LWIP_SOCKET                 0
-#define MEM_LIBC_MALLOC             0
+#define NO_SYS                        1
+#define LWIP_SOCKET                   0
+#define MEM_LIBC_MALLOC               0

-#define MEM_ALIGNMENT               4
-#define MEM_SIZE                    (__LWIP_MEMMULT * 16384)
-#define MEMP_NUM_TCP_SEG            (32)
-#define MEMP_NUM_ARP_QUEUE          (10)
-#define PBUF_POOL_SIZE              (__LWIP_MEMMULT > 1 ? 32 : 24)
-#define LWIP_ARP                    2
-#define LWIP_ETHERNET               1
-#define LWIP_ICMP                   1
-#define LWIP_RAW                    1
-#define TCP_WND                     (8 * TCP_MSS)
-#define TCP_MSS                     1460
-#define TCP_SND_BUF                 (8 * TCP_MSS)
-#define TCP_SND_QUEUELEN            ((4 * (TCP_SND_BUF) + (TCP_MSS - 1)) / (TCP_MSS))
-#define LWIP_NETIF_STATUS_CALLBACK  1
-#define LWIP_NETIF_LINK_CALLBACK    1
-#define LWIP_NETIF_HOSTNAME         1
-#define LWIP_NETCONN                0
-#define LWIP_STATS                  0
-#define LWIP_STATS_DISPLAY          0
-#define MEM_STATS                   0
-#define SYS_STATS                   0
-#define MEMP_STATS                  0
-#define LINK_STATS                  0
-#define LWIP_CHKSUM_ALGORITHM       0
-#define LWIP_DHCP                   1
-#define LWIP_IPV4                   1
-#define LWIP_TCP                    1
-#define LWIP_UDP                    1
-#define LWIP_DNS                    1
-#define LWIP_TCP_KEEPALIVE          1
-#define LWIP_NETIF_TX_SINGLE_PBUF   1
-#define DHCP_DOES_ARP_CHECK         0
-#define LWIP_DHCP_DOES_ACD_CHECK    0
+#define MEM_ALIGNMENT                 4
+#define MEM_SIZE                      (__LWIP_MEMMULT * 16384)
+#define MEMP_NUM_TCP_SEG              (32)
+#define MEMP_NUM_ARP_QUEUE            (10)
+#define PBUF_POOL_SIZE                (__LWIP_MEMMULT > 1 ? 32 : 24)
+#define LWIP_ARP                      7
+#define LWIP_ETHERNET                 1
+#define LWIP_ICMP                     1
+#define LWIP_RAW                      1
+#define TCP_WND                       (8 * TCP_MSS)
+#define TCP_MSS                       1460
+#define TCP_SND_BUF                   (8 * TCP_MSS)
+#define TCP_SND_QUEUELEN              ((4 * (TCP_SND_BUF) + (TCP_MSS - 1)) / (TCP_MSS))
+#define LWIP_NETIF_STATUS_CALLBACK    1
+#define LWIP_NETIF_LINK_CALLBACK      1
+#define LWIP_NETIF_HOSTNAME           1
+#define LWIP_NUM_NETIF_CLIENT_DATA    5
+#define LWIP_NETCONN                  0
+#define LWIP_STATS                    0
+#define LWIP_STATS_DISPLAY            0
+#define MEM_STATS                     0
+#define SYS_STATS                     0
+#define MEMP_STATS                    0
+#define LINK_STATS                    0
+#define LWIP_CHKSUM_ALGORITHM         0
+#define LWIP_DHCP                     1
+#define LWIP_IPV4                     1
+#define LWIP_TCP                      1
+#define LWIP_UDP                      1
+#define LWIP_DNS                      1
+#define LWIP_DNS_SUPPORT_MDNS_QUERIES 1
+#define LWIP_TCP_KEEPALIVE            1
+#define LWIP_NETIF_TX_SINGLE_PBUF     1
+#define DHCP_DOES_ARP_CHECK           0
+#define LWIP_DHCP_DOES_ACD_CHECK      0
+#define LWIP_IGMP                     1
+#define LWIP_MDNS_RESPONDER           1
+#define MDNS_MAX_SERVICES             4

 // See #1285
-#define MEMP_NUM_UDP_PCB            (__LWIP_MEMMULT * 6)
-#define MEMP_NUM_TCP_PCB            (__LWIP_MEMMULT * 5)
+#define MEMP_NUM_UDP_PCB              (__LWIP_MEMMULT * 7)
+#define MEMP_NUM_TCP_PCB              (__LWIP_MEMMULT * 5)

 #if LWIP_IPV6
-#define LWIP_IPV6_DHCP6             1
+#define LWIP_IPV6_DHCP6               1
+#define LWIP_IPV6_MLD                 1
 #endif

 // NTP
@@ -12,8 +12,8 @@
 #define _PICO_VERSION_H

 #define PICO_SDK_VERSION_MAJOR    2
-#define PICO_SDK_VERSION_MINOR    0
+#define PICO_SDK_VERSION_MINOR    1
 #define PICO_SDK_VERSION_REVISION 0
-#define PICO_SDK_VERSION_STRING   "2.0.0"
+#define PICO_SDK_VERSION_STRING   "2.1.0"

 #endif
@@ -12,8 +12,8 @@
 #define _PICO_VERSION_H

 #define PICO_SDK_VERSION_MAJOR    2
-#define PICO_SDK_VERSION_MINOR    0
+#define PICO_SDK_VERSION_MINOR    1
 #define PICO_SDK_VERSION_REVISION 0
-#define PICO_SDK_VERSION_STRING   "2.0.0"
+#define PICO_SDK_VERSION_STRING   "2.1.0"

 #endif
@@ -15,6 +15,7 @@
 -iwithprefixbefore/pico-sdk/src/common/pico_util/include
 -iwithprefixbefore/pico-sdk/src/common/pico_stdlib_headers/include
 -iwithprefixbefore/pico-sdk/src/common/pico_usb_reset_interface_headers/include
+-iwithprefixbefore/pico-sdk/src/rp2_common/boot_bootrom_headers/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/cmsis/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/cmsis/stub/CMSIS/Core/Include
 -iwithprefixbefore/pico-sdk/src/rp2_common/hardware_adc/include
@@ -42,10 +43,12 @@
 -iwithprefixbefore/pico-sdk/src/rp2_common/hardware_vreg/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/hardware_watchdog/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/hardware_xosc/include
+-iwithprefixbefore/pico-sdk/src/rp2_common/pico_aon_timer/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/pico_async_context/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/pico_bootrom/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/pico_double/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/pico_fix/rp2040_usb_device_enumeration/include
+-iwithprefixbefore/pico-sdk/src/rp2_common/pico_flash/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/pico_float/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/pico_int64_ops/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/pico_lwip/include
@@ -1,5 +1,6 @@
 -DPICO_CYW43_ARCH_THREADSAFE_BACKGROUND=1
 -DCYW43_LWIP=1
+-DCYW43_PIO_CLOCK_DIV_DYNAMIC=1
 -DCFG_TUSB_MCU=OPT_MCU_RP2040
 -DARM_MATH_CM0_FAMILY
 -DARM_MATH_CM0_PLUS
@@ -0,0 +1,336 @@
+/* Based on GCC ARM embedded samples.
+   Defines the following symbols for use by code:
+    __exidx_start
+    __exidx_end
+    __etext
+    __data_start__
+    __preinit_array_start
+    __preinit_array_end
+    __init_array_start
+    __init_array_end
+    __fini_array_start
+    __fini_array_end
+    __data_end__
+    __bss_start__
+    __bss_end__
+    __end__
+    end
+    __HeapLimit
+    __StackLimit
+    __StackTop
+    __stack (== StackTop)
+*/
+
+
+
+
+MEMORY
+{
+    FLASH(rx) : ORIGIN = 0x10000000, LENGTH = __FLASH_LENGTH__
+    PSRAM(rwx) : ORIGIN = 0x11000000, LENGTH = __PSRAM_LENGTH__
+    RAM(rwx) : ORIGIN =  0x20000000, LENGTH = __RAM_LENGTH__
+    SCRATCH_X(rwx) : ORIGIN = 0x20080000, LENGTH = 4k
+    SCRATCH_Y(rwx) : ORIGIN = 0x20081000, LENGTH = 4k
+}
+
+PROVIDE ( _EEPROM_start = __EEPROM_START__ );
+PROVIDE ( _FS_start     = __FS_START__ );
+PROVIDE ( _FS_end       = __FS_END__ );
+
+ENTRY(_entry_point)
+
+SECTIONS
+{
+    .flash_begin : {
+        __flash_binary_start = .;
+    } > FLASH
+
+    .ota : {
+        /* Start image with OTA */
+        KEEP (*(.OTA))
+        *ota.o
+    } > FLASH
+
+    .partition : {
+        . = __flash_binary_start + 0x2ff0;
+        LONG(__FS_START__)
+        LONG(__FS_END__)
+        LONG(__EEPROM_START__)
+        LONG(__FLASH_LENGTH__)
+    } > FLASH
+
+    /* The bootrom will enter the image at the point indicated in your
+       IMAGE_DEF, which is usually the reset handler of your vector table.
+
+       The debugger will use the ELF entry point, which is the _entry_point
+       symbol, and in our case is *different from the bootrom's entry point.*
+       This is used to go back through the bootrom on debugger launches only,
+       to perform the same initial flash setup that would be performed on a
+       cold boot.
+    */
+
+    .text : {
+        KEEP (*(.vectors))
+        __logical_binary_start = .;
+        KEEP (*(.binary_info_header))
+        __binary_info_header_end = .;
+        KEEP (*(.embedded_block))
+        __embedded_block_end = .;
+        KEEP (*(.reset))
+        /* TODO revisit this now memset/memcpy/float in ROM */
+        /* bit of a hack right now to exclude all floating point and time critical (e.g. memset, memcpy) code from
+         * FLASH ... we will include any thing excluded here in .data below by default */
+        *(.init)
+        *libgcc.a:cmse_nonsecure_call.o
+        *(EXCLUDE_FILE(*libgcc.a: *libc.a:*lib_a-mem*.o *libm.a:) .text*)
+        *(.fini)
+        /* Pull all c'tors into .text */
+        *crtbegin.o(.ctors)
+        *crtbegin?.o(.ctors)
+        *(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+        *(SORT(.ctors.*))
+        *(.ctors)
+        /* Followed by destructors */
+        *crtbegin.o(.dtors)
+        *crtbegin?.o(.dtors)
+        *(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+        *(SORT(.dtors.*))
+        *(.dtors)
+
+        . = ALIGN(4);
+        /* preinit data */
+        PROVIDE_HIDDEN (__preinit_array_start = .);
+        KEEP(*(SORT(.preinit_array.*)))
+        KEEP(*(.preinit_array))
+        PROVIDE_HIDDEN (__preinit_array_end = .);
+
+        . = ALIGN(4);
+        /* init data */
+        PROVIDE_HIDDEN (__init_array_start = .);
+        KEEP(*(SORT(.init_array.*)))
+        KEEP(*(.init_array))
+        PROVIDE_HIDDEN (__init_array_end = .);
+
+        . = ALIGN(4);
+        /* finit data */
+        PROVIDE_HIDDEN (__fini_array_start = .);
+        *(SORT(.fini_array.*))
+        *(.fini_array)
+        PROVIDE_HIDDEN (__fini_array_end = .);
+
+        *(.eh_frame*)
+        . = ALIGN(4);
+    } > FLASH
+
+    /* Note the boot2 section is optional, and should be discarded if there is
+       no reference to it *inside* the binary, as it is not called by the
+       bootrom. (The bootrom performs a simple best-effort XIP setup and
+       leaves it to the binary to do anything more sophisticated.) However
+       there is still a size limit of 256 bytes, to ensure the boot2 can be
+       stored in boot RAM.
+
+       Really this is a "XIP setup function" -- the name boot2 is historic and
+       refers to its dual-purpose on RP2040, where it also handled vectoring
+       from the bootrom into the user image.
+    */
+/*
+    .boot2 : {
+        __boot2_start__ = .;
+        *(.boot2)
+        __boot2_end__ = .;
+    } > FLASH
+
+    ASSERT(__boot2_end__ - __boot2_start__ <= 256,
+        "ERROR: Pico second stage bootloader must be no more than 256 bytes in size")
+*/
+    .rodata : {
+        *(EXCLUDE_FILE(*libgcc.a: *libc.a:*lib_a-mem*.o *libm.a:) .rodata*)
+        *(.srodata*)
+        . = ALIGN(4);
+        *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.flashdata*)))
+        . = ALIGN(4);
+    } > FLASH
+
+    .ARM.extab :
+    {
+        *(.ARM.extab* .gnu.linkonce.armextab.*)
+    } > FLASH
+
+    __exidx_start = .;
+    .ARM.exidx :
+    {
+        *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+    } > FLASH
+    __exidx_end = .;
+
+    /* Machine inspectable binary information */
+    . = ALIGN(4);
+    __binary_info_start = .;
+    .binary_info :
+    {
+        KEEP(*(.binary_info.keep.*))
+        *(.binary_info.*)
+    } > FLASH
+    __binary_info_end = .;
+    . = ALIGN(4);
+
+    .ram_vector_table (NOLOAD): {
+        *(.ram_vector_table)
+    } > RAM
+
+    .uninitialized_data (NOLOAD): {
+        . = ALIGN(4);
+        *(.uninitialized_data*)
+    } > RAM
+
+    .data : {
+        __data_start__ = .;
+        *(vtable)
+
+        *(.time_critical*)
+
+        /* remaining .text and .rodata; i.e. stuff we exclude above because we want it in RAM */
+        *(.text*)
+        . = ALIGN(4);
+        *(.rodata*)
+        . = ALIGN(4);
+
+        *(.data*)
+        *(.sdata*)
+
+        . = ALIGN(4);
+        *(.after_data.*)
+        . = ALIGN(4);
+        /* preinit data */
+        PROVIDE_HIDDEN (__mutex_array_start = .);
+        KEEP(*(SORT(.mutex_array.*)))
+        KEEP(*(.mutex_array))
+        PROVIDE_HIDDEN (__mutex_array_end = .);
+
+        *(.jcr)
+        . = ALIGN(4);
+    } > RAM AT> FLASH
+
+    .tdata : {
+        . = ALIGN(4);
+		*(.tdata .tdata.* .gnu.linkonce.td.*)
+        /* All data end */
+        __tdata_end = .;
+    } > RAM AT> FLASH
+    PROVIDE(__data_end__ = .);
+
+    /* __etext is (for backwards compatibility) the name of the .data init source pointer (...) */
+    __etext = LOADADDR(.data);
+
+    .tbss (NOLOAD) : {
+        . = ALIGN(4);
+        __bss_start__ = .;
+        __tls_base = .;
+        *(.tbss .tbss.* .gnu.linkonce.tb.*)
+        *(.tcommon)
+
+        __tls_end = .;
+    } > RAM
+
+    .bss (NOLOAD) : {
+        . = ALIGN(4);
+        __tbss_end = .;
+
+        *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.bss*)))
+        *(COMMON)
+        PROVIDE(__global_pointer$ = . + 2K);
+        *(.sbss*)
+        . = ALIGN(4);
+        __bss_end__ = .;
+    } > RAM
+
+    .heap (NOLOAD):
+    {
+        __end__ = .;
+        end = __end__;
+        KEEP(*(.heap*))
+        /* historically on GCC sbrk was growing past __HeapLimit to __StackLimit, however
+           to be more compatible, we now set __HeapLimit explicitly to where the end of the heap is */
+        . = ORIGIN(RAM) + LENGTH(RAM);
+        __HeapLimit = .;
+    } > RAM
+
+    /* Start and end symbols must be word-aligned */
+    .scratch_x : {
+        __scratch_x_start__ = .;
+        *(.scratch_x.*)
+        . = ALIGN(4);
+        __scratch_x_end__ = .;
+    } > SCRATCH_X AT > FLASH
+    __scratch_x_source__ = LOADADDR(.scratch_x);
+
+    .scratch_y : {
+        __scratch_y_start__ = .;
+        *(.scratch_y.*)
+        . = ALIGN(4);
+        __scratch_y_end__ = .;
+    } > SCRATCH_Y AT > FLASH
+    __scratch_y_source__ = LOADADDR(.scratch_y);
+
+    /* .stack*_dummy section doesn't contains any symbols. It is only
+     * used for linker to calculate size of stack sections, and assign
+     * values to stack symbols later
+     *
+     * stack1 section may be empty/missing if platform_launch_core1 is not used */
+
+    /* by default we put core 0 stack at the end of scratch Y, so that if core 1
+     * stack is not used then all of SCRATCH_X is free.
+     */
+    .stack1_dummy (NOLOAD):
+    {
+        *(.stack1*)
+    } > SCRATCH_X
+    .stack_dummy (NOLOAD):
+    {
+        KEEP(*(.stack*))
+    } > SCRATCH_Y
+
+    .flash_end : {
+        KEEP(*(.embedded_end_block*))
+        PROVIDE(__flash_binary_end = .);
+    } > FLASH = 0xaa
+
+    .psram (NOLOAD) : {
+        __psram_start__ = .;
+        *(.psram*)
+        . = ALIGN(4096);
+        __psram_heap_start__ = .;
+    } > PSRAM
+
+    /* stack limit is poorly named, but historically is maximum heap ptr */
+    __StackLimit = ORIGIN(RAM) + LENGTH(RAM);
+    __StackOneTop = ORIGIN(SCRATCH_X) + LENGTH(SCRATCH_X);
+    __StackTop = ORIGIN(SCRATCH_Y) + LENGTH(SCRATCH_Y);
+    __StackOneBottom = __StackOneTop - SIZEOF(.stack1_dummy);
+    __StackBottom = __StackTop - SIZEOF(.stack_dummy);
+    PROVIDE(__stack = __StackTop);
+
+    /* picolibc and LLVM */
+    PROVIDE (__heap_start = __end__);
+    PROVIDE (__heap_end = __HeapLimit);
+    PROVIDE( __tls_align = MAX(ALIGNOF(.tdata), ALIGNOF(.tbss)) );
+    PROVIDE( __tls_size_align = (__tls_size + __tls_align - 1) & ~(__tls_align - 1));
+    PROVIDE( __arm32_tls_tcb_offset = MAX(8, __tls_align) );
+
+    /* TLSF */
+    PROVIDE (__psram_start = __psram_start__);
+    PROVIDE (__psram_heap_start = __psram_heap_start__);
+
+    /* llvm-libc */
+    PROVIDE (_end = __end__);
+    PROVIDE (__llvm_libc_heap_limit = __HeapLimit);
+
+    /* Check if data + heap + stack exceeds RAM limit */
+    ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed")
+
+    ASSERT( __binary_info_header_end - __logical_binary_start <= 1024, "Binary info must be in first 1024 bytes of the binary")
+    ASSERT( __embedded_block_end - __logical_binary_start <= 4096, "Embedded block must be in first 4096 bytes of the binary")
+
+    /* todo assert on extra code */
+}
+
@@ -0,0 +1,3 @@
+source [find interface/cmsis-dap.cfg]
+adapter speed 5000
+source [find target/rp2350-riscv.cfg]
@@ -0,0 +1,56 @@
+-DPICO_CYW43_ARCH_THREADSAFE_BACKGROUND=1
+-DCYW43_LWIP=1
+-DCYW43_PIO_CLOCK_DIV_DYNAMIC=1
+-DCFG_TUSB_MCU=OPT_MCU_RP2040
+-DCFG_TUSB_OS=OPT_OS_PICO
+-DLIB_BOOT_STAGE2_HEADERS=1
+-DLIB_PICO_ATOMIC=1
+-DLIB_PICO_BIT_OPS=1
+-DLIB_PICO_BIT_OPS_PICO=1
+-DLIB_PICO_CLIB_INTERFACE=1
+-DLIB_PICO_CRT0=1
+-DLIB_PICO_CXX_OPTIONS=1
+-DLIB_PICO_DIVIDER=1
+-DLIB_PICO_DIVIDER_COMPILER=1
+-DLIB_PICO_DOUBLE=1
+-DLIB_PICO_DOUBLE_PICO=1
+-DLIB_PICO_FIX_RP2040_USB_DEVICE_ENUMERATION=1
+-DLIB_PICO_FLOAT=1
+-DLIB_PICO_FLOAT_PICO=1
+-DLIB_PICO_FLOAT_PICO_VFP=1
+-DLIB_PICO_INT64_OPS=1
+-DLIB_PICO_INT64_OPS_COMPILER=1
+-DLIB_PICO_MEM_OPS=1
+-DLIB_PICO_MEM_OPS_COMPILER=1
+-DLIB_PICO_NEWLIB_INTERFACE=1
+-DLIB_PICO_PLATFORM=1
+-DLIB_PICO_PLATFORM_COMPILER=1
+-DLIB_PICO_PLATFORM_PANIC=1
+-DLIB_PICO_PLATFORM_SECTIONS=1
+-DLIB_PICO_RUNTIME=1
+-DLIB_PICO_RUNTIME_INIT=1
+-DLIB_PICO_STANDARD_BINARY_INFO=1
+-DLIB_PICO_STANDARD_LINK=1
+-DLIB_PICO_SYNC=1
+-DLIB_PICO_SYNC_CRITICAL_SECTION=1
+-DLIB_PICO_SYNC_MUTEX=1
+-DLIB_PICO_SYNC_SEM=1
+-DLIB_PICO_TIME=1
+-DLIB_PICO_TIME_ADAPTER=1
+-DLIB_PICO_UNIQUE_ID=1
+-DLIB_PICO_UTIL=1
+-DLIB_TINYUSB_BOARD=1
+-DLIB_TINYUSB_DEVICE=1
+-DPICO_32BIT=1
+-DPICO_BOARD=\"solderparty_rp2350_stamp_xl\"
+-DPICO_BUILD=1
+-DPICO_COPY_TO_RAM=0
+-DPICO_CXX_ENABLE_EXCEPTIONS=0
+-DPICO_NO_FLASH=0
+-DPICO_NO_HARDWARE=0
+-DPICO_ON_DEVICE=1
+-DPICO_RP2040_USB_DEVICE_ENUMERATION_FIX=1
+-DPICO_RP2040_USB_DEVICE_UFRAME_FIX=1
+-DPICO_RP2350=1
+-DPICO_RISCV=1
+-DPICO_USE_BLOCKED_RAM=0
@@ -0,0 +1,18 @@
+-iwithprefixbefore/include/rp2350
+-iwithprefixbefore/include/rp2350/pico_base
+-iwithprefixbefore/pico-sdk/src/rp2350/hardware_regs/include
+-iwithprefixbefore/pico-sdk/src/rp2350/hardware_structs/include
+-iwithprefixbefore/pico-sdk/src/rp2350/pico_platform/include
+-iwithprefixbefore/pico-sdk/src/rp2_common/hardware_riscv/include
+-iwithprefixbefore/pico-sdk/src/rp2_common/hardware_riscv_platform_timer/include
+-iwithprefixbefore/pico-sdk/src/rp2_common/hardware_hazard3/include
+-iwithprefixbefore/pico-sdk/src/rp2_common/hardware_sha256/include
+-iwithprefixbefore/pico-sdk/src/rp2_common/pico_sha256/include
+-iwithprefixbefore/pico-sdk/src/rp2_common/pico_btstack/include
+-iwithprefixbefore/pico-sdk/src/rp2_common/pico_cyw43_arch/include
+-iwithprefixbefore/pico-sdk/src/rp2_common/pico_cyw43_driver/include
+-iwithprefixbefore/pico-sdk/lib/cyw43-driver/src
+-iwithprefixbefore/pico-sdk/lib/btstack/src
+-iwithprefixbefore/pico-sdk/lib/btstack/3rd-party/bluedroid/decoder/include
+-iwithprefixbefore/pico-sdk/lib/btstack/3rd-party/bluedroid/encoder/include
+-iwithprefixbefore/pico-sdk/lib/btstack/platform/embedded
@@ -0,0 +1 @@
+-Wl,--wrap=__ctzdi2
@@ -21,6 +21,9 @@
    __stack (== StackTop)
 */

+
+
+
 MEMORY
 {
    FLASH(rx) : ORIGIN = 0x10000000, LENGTH = __FLASH_LENGTH__
@@ -42,6 +45,20 @@ SECTIONS
        __flash_binary_start = .;
    } > FLASH

+    .ota : {
+        /* Start image with OTA */
+        KEEP (*(.OTA))
+        *ota.o
+    } > FLASH
+
+    .partition : {
+        . = __flash_binary_start + 0x2ff0;
+        LONG(__FS_START__)
+        LONG(__FS_END__)
+        LONG(__EEPROM_START__)
+        LONG(__FLASH_LENGTH__)
+    } > FLASH
+
    /* The bootrom will enter the image at the point indicated in your
       IMAGE_DEF, which is usually the reset handler of your vector table.

@@ -53,8 +70,8 @@ SECTIONS
    */

    .text : {
-        __logical_binary_start = .;
        KEEP (*(.vectors))
+        __logical_binary_start = .;
        KEEP (*(.binary_info_header))
        __binary_info_header_end = .;
        KEEP (*(.embedded_block))
@@ -116,7 +133,7 @@ SECTIONS
       refers to its dual-purpose on RP2040, where it also handled vectoring
       from the bootrom into the user image.
    */
-
+/*
    .boot2 : {
        __boot2_start__ = .;
        *(.boot2)
@@ -125,7 +142,7 @@ SECTIONS

    ASSERT(__boot2_end__ - __boot2_start__ <= 256,
        "ERROR: Pico second stage bootloader must be no more than 256 bytes in size")
-
+*/
    .rodata : {
        *(EXCLUDE_FILE(*libgcc.a: *libc.a:*lib_a-mem*.o *libm.a:) .rodata*)
        *(.srodata*)
@@ -276,7 +293,7 @@ SECTIONS
    .flash_end : {
        KEEP(*(.embedded_end_block*))
        PROVIDE(__flash_binary_end = .);
-    } > FLASH =0xaa
+    } > FLASH = 0xaa

    .psram (NOLOAD) : {
        __psram_start__ = .;
@@ -1,4 +1,6 @@
-DCFG_TUSB_DEBUG=0
+-DPICO_CYW43_ARCH_THREADSAFE_BACKGROUND=1
+-DCYW43_LWIP=1
+-DCYW43_PIO_CLOCK_DIV_DYNAMIC=1
 -DCFG_TUSB_MCU=OPT_MCU_RP2040
 -DCFG_TUSB_OS=OPT_OS_PICO
 -DLIB_BOOT_STAGE2_HEADERS=1
@@ -40,7 +42,7 @@
 -DLIB_TINYUSB_BOARD=1
 -DLIB_TINYUSB_DEVICE=1
 -DPICO_32BIT=1
-DPICO_BOARD=\"pico2\"
+-DPICO_BOARD=\"solderparty_rp2350_stamp_xl\"
 -DPICO_BUILD=1
 -DPICO_COPY_TO_RAM=0
 -DPICO_CXX_ENABLE_EXCEPTIONS=0
@@ -6,3 +6,11 @@
 -iwithprefixbefore/pico-sdk/src/rp2_common/cmsis/stub/CMSIS/Device/RP2350/Include
 -iwithprefixbefore/pico-sdk/src/rp2_common/hardware_sha256/include
 -iwithprefixbefore/pico-sdk/src/rp2_common/pico_sha256/include
+-iwithprefixbefore/pico-sdk/src/rp2_common/pico_btstack/include
+-iwithprefixbefore/pico-sdk/src/rp2_common/pico_cyw43_arch/include
+-iwithprefixbefore/pico-sdk/src/rp2_common/pico_cyw43_driver/include
+-iwithprefixbefore/pico-sdk/lib/cyw43-driver/src
+-iwithprefixbefore/pico-sdk/lib/btstack/src
+-iwithprefixbefore/pico-sdk/lib/btstack/3rd-party/bluedroid/decoder/include
+-iwithprefixbefore/pico-sdk/lib/btstack/3rd-party/bluedroid/encoder/include
+-iwithprefixbefore/pico-sdk/lib/btstack/platform/embedded
@@ -97,3 +97,5 @@
 -Wl,--wrap=tanhf
 -Wl,--wrap=trunc
 -Wl,--wrap=truncf
+
+-Wl,--wrap=memcpy
@@ -24,9 +24,9 @@
 #include "ADCInput.h"
 #include <hardware/adc.h>

-ADCInput::ADCInput(pin_size_t p0, pin_size_t p1, pin_size_t p2, pin_size_t p3) {
+ADCInput::ADCInput(pin_size_t p0, pin_size_t p1, pin_size_t p2, pin_size_t p3, pin_size_t p4, pin_size_t p5, pin_size_t p6, pin_size_t p7) {
    _running = false;
-    setPins(p0, p1, p2, p3);
+    setPins(p0, p1, p2, p3, p4, p5, p6, p7);
    _freq = 48000;
    _arb = nullptr;
    _cb = nullptr;
@@ -49,19 +49,30 @@ bool ADCInput::setBuffers(size_t buffers, size_t bufferWords) {

 int ADCInput::_mask(pin_size_t p) {
    switch (p) {
+#if !defined(PICO_RP2350B)
    case 26: return 1;
    case 27: return 2;
    case 28: return 4;
    case 29: return 8;
+#else // Starts at 40 and there are 8 of them
+    case 40: return 1;
+    case 41: return 2;
+    case 42: return 4;
+    case 43: return 8;
+    case 44: return 16;
+    case 45: return 32;
+    case 46: return 64;
+    case 47: return 128;
+#endif
    default: return 0;
    }
 }

-bool ADCInput::setPins(pin_size_t pin0, pin_size_t pin1, pin_size_t pin2, pin_size_t pin3) {
+bool ADCInput::setPins(pin_size_t pin0, pin_size_t pin1, pin_size_t pin2, pin_size_t pin3, pin_size_t pin4, pin_size_t pin5, pin_size_t pin6, pin_size_t pin7) {
    if (_running) {
        return false;
    }
-    _pinMask = _mask(pin0) | _mask(pin1) | _mask(pin2) | _mask(pin3);
+    _pinMask = _mask(pin0) | _mask(pin1) | _mask(pin2) | _mask(pin3) | _mask(pin4) | _mask(pin5) | _mask(pin6) | _mask(pin7);
    return true;
 }

@@ -94,10 +105,17 @@ bool ADCInput::begin() {
    // Set up the GPIOs to go to ADC
    adc_init();
    int cnt = 0;
-    for (int mask = 1, pin = 26; pin <= 29; mask <<= 1, pin++) {
+#if !defined(PICO_RP2350B)
+    int startpin = 26;
+    int maxpin = 29;
+#else
+    int startpin = 40;
+    int maxpin = 47;
+#endif
+    for (int mask = 1, pin = startpin; pin <= maxpin; mask <<= 1, pin++) {
        if (_pinMask & mask) {
            if (!cnt) {
-                adc_select_input(pin - 26);
+                adc_select_input(pin - startpin);
            }
            cnt++;
            adc_gpio_init(pin);
@@ -26,12 +26,12 @@

 class ADCInput : public Stream {
 public:
-    ADCInput(pin_size_t pin0, pin_size_t pin1 = 255, pin_size_t pin2 = 255, pin_size_t pin3 = 255);
+    ADCInput(pin_size_t pin0, pin_size_t pin1 = 255, pin_size_t pin2 = 255, pin_size_t pin3 = 255, pin_size_t pin4 = 255, pin_size_t pin5 = 255, pin_size_t pin6 = 255, pin_size_t pin7 = 255);
    virtual ~ADCInput();

    bool setBuffers(size_t buffers, size_t bufferWords);
    bool setFrequency(int newFreq);
-    bool setPins(pin_size_t pin0, pin_size_t pin1 = 255, pin_size_t pin2 = 255, pin_size_t pin3 = 255);
+    bool setPins(pin_size_t pin0, pin_size_t pin1 = 255, pin_size_t pin2 = 255, pin_size_t pin3 = 255, pin_size_t pin4 = 255, pin_size_t pin5 = 255, pin_size_t pin6 = 255, pin_size_t pin7 = 255);

    bool begin(long sampleRate) {
        setFrequency(sampleRate);
@@ -1,5 +1,5 @@
 #include <WiFi.h>
-#include <LEAmDNS.h>
+#include <SimpleMDNS.h>
 #include <WiFiUdp.h>
 #include <ArduinoOTA.h>

@@ -1,5 +1,5 @@
 #include <WiFi.h>
-#include <LEAmDNS.h>
+#include <SimpleMDNS.h>
 #include <WiFiUdp.h>
 #include <ArduinoOTA.h>

@@ -13,7 +13,7 @@


 #include <WiFi.h>
-#include <LEAmDNS.h>
+#include <SimpleMDNS.h>
 #include <WiFiUdp.h>
 #include <ArduinoOTA.h>

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Earle F. Philhower, III	34e02aaeb5	Update version	2024-12-02 11:39:24 -08:00
Earle F. Philhower, III	6024e9a7e8	Increase LWIP timeouts to avoid MDNS panics (#2653 ) Bump up the LWIP_ARP setting to increase the LWIP timeout pool to avoid a panic when using SimpleMDNS and TCP clients. Fixes #2650	2024-11-30 10:43:19 -08:00
Earle F. Philhower, III	633faa18ac	Update to Adafruit TinyUSB 3.4.1 (#2647 )	2024-11-27 13:04:36 -08:00
Earle F. Philhower, III	90d4841be7	Fix LED pin for Pico 2W (#2646 ) Fixes #2644	2024-11-27 12:40:09 -08:00
Linar Yusupov	e16c459598	Fix for cyw43_wrappers.h build with C code (#2639 )	2024-11-26 00:48:34 -08:00
Earle F. Philhower, III	33b0fd57a0	Fix pinMode for RP2040 PicoW (#2638 ) Enable WL_DYNAMIC on the RP2040 lib builds. Fixes #2637	2024-11-26 00:31:41 -08:00
Earle F. Philhower, III	7add6250e0	Update version	2024-11-25 10:44:58 -08:00
Earle F. Philhower, III	4068601b01	Update to SDK 2.1.0, add Pico 2W (#2629 ) Update to Pico SDK 2.1.0, remove XIP and PSRAM workarounds. Add Pico2W board.	2024-11-25 10:43:55 -08:00
Earle F. Philhower, III	9cea4708c8	Update README.md	2024-11-21 15:31:40 -08:00
Jeff Eplerandladyada	1a41be1eb0	Add Adafruit Floppsy board (#2628 ) Co-authored-by: ladyada <limor@ladyada.net>	2024-11-21 15:30:59 -08:00
Earle F. Philhower, III	996c3bfab9	Clean up unused parameter warnings (#2624 )	2024-11-19 13:55:00 -08:00
Earle F. Philhower, III	322a1af6da	Avoid memory (de)allocation in GPIO ISR handler (#2623 ) Replace std::map, which can `new` and `delete` elements of the tree, with a statically allocated array and housekeeping. Fixes #2622	2024-11-19 12:26:47 -08:00
Earle F. Philhower, III	e25d382732	Support WiFi/BT/BLT with RP2350 CYW43 boards (#2616 ) Using pico-sdk develop branch, add in support for CYW43-based WiFi/BT/BLE boards on the RP2350 such as the SparkFun Thing Plus RP2350 or the Pimoroni Pico Plus 2W. Fixes #2608 Rolls in dynamic SPI divider #2600 * Support LED digitalWrite on RP2350+CYW Also move "special GPIO" to 64 since the Pimoroni Pico 2W uses the RP2350B with 48 GPIOs. * Enable CYW43_PIN_WL_DYNAMIC in IDE and P.IO Allows calling `cyw43_set_pins_wl(cyw43_pin_array);` to redefine the CYW43 hookup in the variant initialization.	2024-11-19 10:28:12 -08:00
Earle F. Philhower, III	bda12cd7e7	WiFiUDP only emit a packet on flush if not ended (#2618 ) A flush() on a packet that's already been sent should be a no-op, not send a 0-byte UDP packet. Track when an outgoing packet is dirty and only endPacket()/transmit it when so. Fixes #2617	2024-11-17 08:58:44 -08:00
Earle F. Philhower, III	ca30518510	Update version	2024-11-15 10:03:00 -08:00
Dryw Wade	17aab7e373	Add SparkFun Thing Plus RP2350 (#2605 ) * Add SparkFun Thing Plus RP2350 * Add Thing Plus RP2350 PSRAM definition * Remove radio from Thing Plus RP2350 Will need to add back once full radio support is added, see #2605	2024-11-14 12:22:31 -08:00
Earle F. Philhower, III	083d86d251	rp2040.enableDoubleResetBootloader only on RP2040 (#2607 ) The RP2350 boot ROM seems to randomize memory on a HW reset, including both CPU stacks where we normally stuff the "reset to bootloader" flag. Update the docs and source to remove rp2040.enableDoubleResetBootloader() on RP2350-based boards. Fixes #2606	2024-11-14 10:46:53 -08:00
Kjell Braden	7a0adfebd1	lwIP_Ethernet: rename copied cyw43 mac function (#2604 ) Prevent symbol conflicts when including both Wifi.h and cyw43.h Fixes #2602	2024-11-13 03:35:26 -08:00
Maximilian Gerhardt	db4b167aaa	Build libpico in CI (#2596 ) * Build libpico in CI * Use our arm-none-eabi-gcc, apply Pico-SDK patch * Indentation fix, add comment	2024-11-11 12:53:49 -08:00
GUVWAF	5a428647d4	SimpleMDNS: let `begin` return a bool (#2599 ) SimpleMDNS: let `begin` return a bool To be compatible with LEAmDNS	2024-11-11 12:04:08 -08:00
CIncinnatus	6c8d62fdb8	Correct pin definitions for XIAO RP2350 (#2591 )	2024-11-10 14:21:51 -08:00
JimMacA	64156c42b1	Delay LRCK to falling edge of BCK in I2S input (#2592 ) In input mode, LRCK needs to change on falling edge of BCK Fixes #2584.	2024-11-09 12:44:15 -08:00
Earle F. Philhower, III	f5c4136b94	Add SimpleMDNS, IGMP, and .local lookup (#2582 ) * Enable LWIP IGMP, MDNS internal server * Enable MDNS lookup from LWIP DNS * Add SimpleMDNS responder, small code and no malloc * Ensure we copy out lwipopts in make-libpico Adds a small wrapper around the LWIP-provided MDNS responder application. Drop-in replacement in many basic cases for LEAmDNS. For FreeRTOS it is important to not allocate memory on an LWIP callback. LEAmDNS needs to do this to create response objects, leading to crashes. Increase LWIP timers by bumping the LWIP_ARP number (as done before). Replace ArduinoOTA LEAmDNS with SimpleMDNS and update a HTTPUpdateServer example.	2024-11-07 10:09:44 -08:00
Earle F. Philhower, III	c4b6521849	Add wiznet_5100s_evb_pico2, wiznet_5500_evb_pico2 (#2575 ) Add 2 new WIZNet Pico2 boards, same pinouts as Pico revs. Fixes #2574	2024-11-03 09:47:31 -08:00
Maximilian Gerhardt	593b3bece4	Add WIZnet W55RP20-EVB-Pico into README (#2566 )	2024-10-29 13:49:10 -07:00
Earle F. Philhower, III	5ef8a5a5cc	Update version	2024-10-29 07:08:45 -07:00
wiznet-mason	b0e7ad3de2	Add WIZnet W55RP20-EVB-Pico board (#2555 )	2024-10-28 18:10:33 -07:00
Earle F. Philhower, III	0d26c5eded	Update PSRAM cache flush algorithm (#2563 ) New info from RPI engineers give a slightly better/safer method.	2024-10-28 16:27:23 -07:00
Earle F. Philhower, III	5b135fabc4	Fix 2.0 SDK BLE devices (#2560 ) Remove old pre-release BTStack files from sdkoverrides (were needed for compound BLE devices, but the latest BTStack now incorporates these changes). Fixes #2547	2024-10-27 12:52:43 -07:00
Ikechukwu Ofili	3aa8df5ab7	GPIO interrupt dispatcher, minimize blocking (#2558 ) Only need to lock around the std::map check, not the whole IRQ callback This is important if you have a time sensitive interrupt on one of the cores	2024-10-26 13:37:24 -07:00
ldursw	9c217b13df	FreeRTOS: Add ISR check to critical section (#2559 )	2024-10-26 13:08:21 -07:00
Earle F. Philhower, III	d96c0e6818	Update FreeRTOS examples for PicoW (#2557 ) The PicoW can't access the LED from core 1, because it is driven by the CYW43 chip, so make sure any blinking is on core 0. Fixes #2553	2024-10-23 18:02:29 -07:00
Earle F. Philhower, III	599c226b8c	Workaround PSRAM cache invalid'n by reading flash (#2551 ) * Workaround PSRAM cache invalid'n by reading flash Fixes #2537 While waiting for a working direct cache flush routine, try and force the cache to evict all PSRAM values by reading a bunch of flash addresses (which share the XIP cache). This hurts performance when PSRAM is not used, but is required for correctness until we have a working XIP flush. * Invalidate after cleaning the cache line gmx from the RPI forums came up with this hack and it seems to work! https://forums.raspberrypi.com/viewtopic.php?p=2262371#p2262371	2024-10-23 16:12:37 -07:00
Earle F. Philhower, III	e7419fbdf9	Add ARM assembly optimized memcpy for RP2350 (#2552 ) 33% faster for 4K memcpy using DMAMemcyp example With this assembly: CPU: 4835 clock cycles for 4K DMA: 2169 clock cycles for 4K Using stock Newlib memcpy: CPU: 7314 clock cycles for 4K DMA: 2175 clock cycles for 4K	2024-10-23 15:11:19 -07:00
Yveaux	060b15fa27	Remove DEBUGV for lfs_file_close (#2554 )	2024-10-22 11:12:12 -07:00
Earle F. Philhower, III	4e9a6de09e	Latest ESPHost, much better performance using DMA (#2545 )	2024-10-14 19:34:17 -07:00
Earle F. Philhower, III	4aee8beeea	Update Adafruit TinyUSB to 3.3.4 (#2543 )	2024-10-14 17:54:16 -07:00
Earle F. Philhower, III	fdd7557156	Preserve PSRAM QMI interface around flash ops (#2539 ) The flash ROM routines seem to overwrite the QMI configuration we set for PSRAM, rendering it unreadable after any erase or write or ID command. Wrap the 4 flash control functions to preserve the QMI state on the RP2350. On the RP2040, simply pass through the call. Fixes #2537	2024-10-12 12:32:56 -07:00
CIncinnatus	49f83c4310	Add seeed xiao rp2350 board (#2533 )	2024-10-11 02:00:15 -07:00
Earle F. Philhower, III	edba2faa34	Increase default PWMAudio buffer sizes (#2530 ) Help ensure click-free playback by default. App overide will still be obeyed.	2024-10-08 17:48:18 -07:00
Sylwester	c97c61dce5	Add PSRAM Size selection and Frequency Selection for Datanoise PicoADK V2. (#2529 )	2024-10-08 11:50:12 -07:00
Maximilian Gerhardt	a314a8c3d7	Document setting the PSRAM size for PlatformIO (#2527 )	2024-10-06 09:45:48 -07:00
Maximilian Gerhardt	58c0d95114	Fix getStackPointer() to work in RISC-V and ARM mode (#2526 )	2024-10-06 09:44:30 -07:00
Earle F. Philhower, III	2324d52023	Typo fix platform.txt	2024-10-04 17:55:39 -07:00
Earle F. Philhower, III	b9dadbbdc2	Typo fix rp2040.rst	2024-10-04 17:41:53 -07:00
Earle F. Philhower, III	6eead5b0df	Typo fix psram.rst	2024-10-04 17:40:57 -07:00
Earle F. Philhower, III	5f77e12984	Add PSRAM size menu to Adafruit Feather RP2350 HSTX (#2521 ) See #2512	2024-10-04 17:39:19 -07:00
Thomas Pfister	2f55223b70	Add getResetReason() by palmerr23 (#2516 ) * Add support for RP2350	2024-10-04 17:37:36 -07:00
Earle F. Philhower, III	67bf5a734a	Remove 2 instructions from tone PIO program (#2515 ) Manually load the 2 needed registers using pio_execute to save a couple PIO instruction slots.	2024-10-03 13:27:14 -07:00
Earle F. Philhower, III	ec6bb7e924	Update README.md	2024-10-03 12:39:18 -07:00
Kevin Santo Cappuccio	059bd590d7	Add Jumperless and Jumperless V5 to supported boards (#2514 )	2024-10-03 10:02:42 -07:00
Earle F. Philhower, III	9d17f42a35	Update version	2024-10-02 10:26:19 -07:00
Earle F. Philhower, III	1f1fa11216	Allow IDE install to call RISC-V compiler (#2513 ) Released packages have a post-processing step to allow them to work with IDE installed toolchains. This was not updated for the RISC-V compiler, so R5 compiles fail under the release IDE package. Update to call proper compiler path. Fixes #2510	2024-10-02 10:25:32 -07:00
Earle F. Philhower, III	690293e7e1	RP2350B additional ADC inputs for ADCInput (#2509 ) Fix pin offset and maximum count of ADC inputs for the RP2350B variant.	2024-10-01 18:22:11 -07:00
Earle F. Philhower, III	500fcf2513	Update version	2024-10-01 09:25:29 -07:00
Maximilian Gerhardt	a2164a5b10	Update PIO USB docs, fixup used VID/PID macros (#2505 )	2024-09-30 09:57:21 -07:00
Maximilian Gerhardt	25501953df	Update PIO platform before compile, add RISC-V PIO build to CI (#2504 )	2024-09-30 09:41:16 -07:00
Earle F. Philhower, III	f6973fc64d	Add RISC-V support, GCC 14 move (#2491 ) * Adds RISC-V compilation option to the IDE and Platform.IO. * Build RP2350-RISCV libpico, libbearssl * Fix RP2350 BearSSL library (was copied from RP2040, now built for M33) * New GCC 14.2 toolchain is required (12.4 RISC-V support is borked) * Newlib locking fixed prototypes * Manually force all runtime init code into RP2350 binaries * Add RISC-V to CI * Remove RP2350 BOOT2.S files, binaries (not used) * Clean up minor GCC 14.x warnings * Add RP2350-RISCV OTA build, link * Add RISC-V FreeRTOS files (configuration still not running, but builds) * Add basic documentation	2024-09-29 15:10:36 -07:00
Earle F. Philhower, III	f49d058477	Update version	2024-09-24 06:59:23 -07:00
Earle F. Philhower, III	777eacdfc3	Wire probe clock stretch up to 500us (#2493 ) As reported by @Rasmusfk in #2455, allow for a longer clock stretch period during probes.	2024-09-24 06:58:41 -07:00
Sylwester	39ad2aeced	Add Datanoise PicoADK v2 (RP2350). (#2413 )	2024-09-24 06:46:05 -07:00
Earle F. Philhower, III	a9fd579ce9	Add new Pico SDK AON_Timer module (#2489 ) Fixes #2488	2024-09-22 15:16:28 -07:00
Earle F. Philhower, III	a6ab6e1f95	Fix FreeRTOS Flash Freeze, Fastly (#2486 ) Fixes #2485	2024-09-20 15:04:56 -07:00
Earle F. Philhower, III	b2ec6ecb09	GCC to 12.4, Newlib to 4.3.0, faster RP2350 libs (#2480 ) Newlib built using `-Os` causes things like `memcpy` to be very slow on the RP2350 because it uses byte-wise operations. On the RP2040 this doesn't matter because there is a ROM routine we use instead of the library, but on the Pico 2 it's almost 10x slower than the optimal method. Update GCC to 12.4 Update Newlib to 4.4.0 Move to -O2 library compilation New toolchain looks to add ~10K to RP2350 flash usage (less on the RP2040).	2024-09-19 17:03:23 -07:00
Earle F. Philhower, III	f18fa88565	Update DMAMemcpy.ino (#2481 ) Use 64-bit cycle counts to avoid occasional overflows.	2024-09-19 09:25:29 -07:00
Tom MagnierandTom Magnier	07b7d9748b	I2C lib : implement "bus recovery" feature on timeout reset (#2479 ) * I2C lib : implement "bus recovery" feature on timeout reset --------- Co-authored-by: Tom Magnier <tom@tmagnier.fr>	2024-09-19 08:58:47 -07:00
Earle F. Philhower, III	66c1f78f7d	Minimize skipped ESPHost CI tests (#2477 )	2024-09-18 08:28:05 -07:00
Pontus OldbergandPontus Oldberg	f6940cc04e	Adds support for ESP Hosted to WiFi/BLE boards and adds a menu item for ESP WiFi selection (#2468 ) * Adds a menu item for selecting type of ESP wifi type. * Updated pin definitions to work with ESP hosted. * Fixed residual debug modification. * Added ESPHost support library. * Removed local cloning of ESPHost and added to excluded from CI * Updated boards.txt --------- Co-authored-by: Pontus Oldberg <pontus.oldberg@non.se.com>	2024-09-18 07:16:23 -07:00
Earle F. Philhower, III	5830cd8e7d	Clean up libpico Cmakefile, 1 entry per line (#2474 ) Split the 1300+ char define-setting line into a multi-line value. Makes it more maintainable and easier to see when changes needed. No settings should have been modified.	2024-09-17 18:26:16 -07:00
Earle F. Philhower, III	2063a2d23d	Enable OTA support for RP2350 (#2472 ) The RP2350 has a different blob header requirement to identify a working image. Ensure that header is present in the OTA loader. Update the PicoOTA examples for the 2350	2024-09-17 15:05:42 -07:00
Earle F. Philhower, III	4504d72972	Don't realloc(nullptr) from PSRAM by default (#2473 ) Several Arduino APIs realloc(NULL) which is legal and equivalent to "malloc()", but the PSRAM logic was placing those malloc calls in PSRAM and not RAM because "0" < RAM_START. Ensure the realloc address is non-null and before RAM_START before using PSRAM.	2024-09-17 14:46:41 -07:00
Yveaux	5db8063756	Also remove CFG_TUSB_DEBUG from platformio-build.py for rp2350 (#2471 )	2024-09-17 11:52:30 -07:00
Yveaux	5fbda35282	Remove CFG_TUSB_DEBUG for rp2350 (#2469 )	2024-09-17 11:21:16 -07:00
Liz Scott Shawcroft ladyada	163b209d6c	Add Adafruit Feather RP2350 with HSTX (#2459 ) * Add xosc delay for RP2350 * init feather rp2350 addition * Update Feather RP2350 JSON --------- Co-authored-by: Scott Shawcroft <scott@tannewt.org> Co-authored-by: ladyada <support@adafruit.com>	2024-09-17 09:45:45 -07:00
Earle F. Philhower, III	ccdc76c279	Update freertos.rst - FreeRTOS RP2350 support added	2024-09-16 16:59:19 -07:00
Earle F. Philhower, III	e88d2d0469	Update rp2350.rst - FreeRTOS support added	2024-09-16 16:57:32 -07:00
Earle F. Philhower, IIIandfietser28	a0b3876de4	Add FreeRTOS support for RP2350 (#2406 ) Pull in Raspberry Pi's custom RP2350 ARM and RISC-V ports for FreeRTOS. Basic tests run, but stress mutex test is failing in unique and interesting ways. * Add simplified switching test catching task swap problem * Freertosrp2350: use FreeRTOS macros in noInterrupts/interrupts when applicable. (#2456) * Use FreeRTOS macros in noInterrupts/interrupts when applicable. * Fixed calling taskEXIT_CRITICAL and taskENTER_CRITICAL --------- Co-authored-by: fietser28 <fietser28@users.noreply.github.com>	2024-09-16 16:56:22 -07:00
Earle F. Philhower, III	5f6e4aff5c	Allow LWIP Ethernet HW IRQs > 32 (#2464 ) Allow RP2350B boards to use GPIOs 31+ for the Ethernet HW IRQ line. Also update SPI debug output with the new registers.	2024-09-16 12:35:46 -07:00
Earle F. Philhower, III	4d1d1d2304	Fix PICO_RP2350B define check for other peripherals (#2463 ) Fixes #2461	2024-09-16 11:16:08 -07:00
Earle F. Philhower, III	1f291482cd	Fix SerialUART RP2350B define checks Fixes #2460	2024-09-16 09:27:08 -07:00
Tom MagnierandTom Magnier	d26a358055	I2C lib: Handle timeout in write() (#2458 ) Co-authored-by: Tom Magnier <tom@tmagnier.fr>	2024-09-16 08:08:21 -07:00
Earle F. Philhower, III	aaaa99d969	Support PIO2 for SoftwareSerial/SerialPIO (#2451 ) New IRQs and PIO pointers required for the 3rd PIO on the 2350. Fixes #2447	2024-09-13 12:25:55 -07:00
SamHalvoe	12130eb767	Add "#define PICO_RP2350B 1" since this board is based on RP2350B (#2445 )	2024-09-12 12:50:04 -07:00
arturo182	f5c85fa958	Solderparty_rp2350_stamp_xl: Properly mark as using RP2350B (#2446 )	2024-09-12 11:52:30 -07:00