Update version

Fix pin assigment for Waveshare RP2040 1.28 LCD PIN_BAT_ADC (#1292 )
Manually add MDNS multicast Ethernet MACs to CYW43 (#1290 )
2023-03-10 09:08:28 -08:00 · 2023-03-10 04:31:33 -08:00 · 2023-03-09 14:15:14 -08:00 · 2023-03-09 10:30:54 -08:00 · 2023-03-08 11:48:23 -08:00 · 2023-03-05 14:56:53 -08:00
98 changed files with 2596 additions and 3162 deletions
@@ -217,3 +217,5 @@ jobs:
      run: pio ci --board=rpipicow -O "platform_packages=framework-arduinopico@symlink:///home/runner/work/arduino-pico/arduino-pico" libraries/WiFi/examples/ScanNetworks/ScanNetworks.ino
    - name: Build Signed OTA Example
      run: pio ci --board=rpipicow -O "platform_packages=framework-arduinopico@symlink:///home/runner/work/arduino-pico/arduino-pico" libraries/ArduinoOTA/examples/SignedOTA/SignedOTA.ino
+    - name: Build Bluetooth Example
+      run: pio ci --board=rpipicow -O "platform_packages=framework-arduinopico@symlink:///home/runner/work/arduino-pico/arduino-pico" -O "build_flags=-DPIO_FRAMEWORK_ARDUINO_ENABLE_BLUETOOTH" libraries/MouseBLE/examples/BLECircle/BLECircle.ino
@@ -14,14 +14,14 @@
 	path = libraries/ESP8266SdFat
 	url = https://github.com/earlephilhower/ESP8266SdFat.git
 [submodule "libraries/Keyboard"]
-	path = libraries/Keyboard
-	url = https://github.com/earlephilhower/Keyboard
+	path = libraries/HID_Keyboard
+	url = https://github.com/earlephilhower/Keyboard.git
 [submodule "libraries/Mouse"]
-	path = libraries/Mouse
-	url = https://github.com/earlephilhower/Mouse
+	path = libraries/HID_Mouse
+	url = https://github.com/earlephilhower/Mouse.git
 [submodule "libraries/Joystick"]
-	path = libraries/Joystick
-	url = https://github.com/benjaminaigner/Joystick
+	path = libraries/HID_Joystick
+	url = https://github.com/earlephilhower/Joystick.git
 [submodule "libraries/Adafruit_TinyUSB_Arduino"]
 	path = libraries/Adafruit_TinyUSB_Arduino
 	url = https://github.com/adafruit/Adafruit_TinyUSB_Arduino.git
@@ -43,6 +43,7 @@ Read the [Contributing Guide](https://github.com/earlephilhower/arduino-pico/blo
 * Invector Labs RPICO32
 * Melopero Cookie RP2040
 * Melopero Shake RP2040
+* Neko Systems BL2040 Mini
 * nullbits Bit-C PRO
 * Pimoroni PGA2040
 * Seeed XIAO RP2040
@@ -1233,6 +1233,10 @@ adafruit_feather_scorpio.menu.ipbtstack.ipv4btcble.build.libpicowdefs=-DLWIP_IPV
 adafruit_feather_scorpio.menu.ipbtstack.ipv4ipv6btcble=IPv4 + IPv6 + Bluetooth
 adafruit_feather_scorpio.menu.ipbtstack.ipv4ipv6btcble.build.libpicow=libpicow-ipv6-btc-ble.a
 adafruit_feather_scorpio.menu.ipbtstack.ipv4ipv6btcble.build.libpicowdefs=-DLWIP_IPV6=1 -DLWIP_IPV4=1 -DENABLE_CLASSIC=1 -DENABLE_BLE=1
+adafruit_feather_scorpio.menu.boot2.boot2_w25q080_2_padded_checksum=W25Q080 QSPI /2
+adafruit_feather_scorpio.menu.boot2.boot2_w25q080_2_padded_checksum.build.boot2=boot2_w25q080_2_padded_checksum
+adafruit_feather_scorpio.menu.boot2.boot2_w25q080_4_padded_checksum=W25Q080 QSPI /4
+adafruit_feather_scorpio.menu.boot2.boot2_w25q080_4_padded_checksum.build.boot2=boot2_w25q080_4_padded_checksum
 adafruit_feather_scorpio.menu.uploadmethod.default=Default (UF2)
 adafruit_feather_scorpio.menu.uploadmethod.default.build.ram_length=256k
 adafruit_feather_scorpio.menu.uploadmethod.default.build.debugscript=picoprobe.tcl
@@ -1267,6 +1271,244 @@ adafruit_feather_scorpio.menu.uploadmethod.picodebug.upload.maximum_data_size=24
 adafruit_feather_scorpio.menu.uploadmethod.picodebug.upload.tool=picodebug
 adafruit_feather_scorpio.menu.uploadmethod.picodebug.upload.tool.default=picodebug

+# -----------------------------------
+# Adafruit Feather RP2040 DVI
+# -----------------------------------
+adafruit_feather_dvi.name=Adafruit Feather RP2040 DVI
+adafruit_feather_dvi.vid.0=0x239a
+adafruit_feather_dvi.pid.0=0x8127
+adafruit_feather_dvi.vid.1=0x239a
+adafruit_feather_dvi.pid.1=0x8127
+adafruit_feather_dvi.vid.2=0x239a
+adafruit_feather_dvi.pid.2=0xc127
+adafruit_feather_dvi.vid.3=0x239a
+adafruit_feather_dvi.pid.3=0xc127
+adafruit_feather_dvi.vid.4=0x239a
+adafruit_feather_dvi.pid.4=0x8127
+adafruit_feather_dvi.vid.5=0x239a
+adafruit_feather_dvi.pid.5=0x8127
+adafruit_feather_dvi.vid.6=0x239a
+adafruit_feather_dvi.pid.6=0xc127
+adafruit_feather_dvi.vid.7=0x239a
+adafruit_feather_dvi.pid.7=0xc127
+adafruit_feather_dvi.build.usbvid=-DUSBD_VID=0x239a
+adafruit_feather_dvi.build.usbpid=-DUSBD_PID=0x8127
+adafruit_feather_dvi.build.usbpwr=-DUSBD_MAX_POWER_MA=250
+adafruit_feather_dvi.build.board=ADAFRUIT_FEATHER_RP2040_DVI
+adafruit_feather_dvi.build.mcu=cortex-m0plus
+adafruit_feather_dvi.build.variant=adafruit_feather_dvi
+adafruit_feather_dvi.upload.maximum_size=8388608
+adafruit_feather_dvi.upload.wait_for_upload_port=true
+adafruit_feather_dvi.upload.erase_cmd=
+adafruit_feather_dvi.serial.disableDTR=false
+adafruit_feather_dvi.serial.disableRTS=false
+adafruit_feather_dvi.build.f_cpu=125000000
+adafruit_feather_dvi.build.led=
+adafruit_feather_dvi.build.core=rp2040
+adafruit_feather_dvi.build.ldscript=memmap_default.ld
+adafruit_feather_dvi.build.boot2=boot2_w25q080_2_padded_checksum
+adafruit_feather_dvi.build.usb_manufacturer="Adafruit"
+adafruit_feather_dvi.build.usb_product="Feather RP2040 DVI"
+adafruit_feather_dvi.menu.flash.8388608_0=8MB (no FS)
+adafruit_feather_dvi.menu.flash.8388608_0.upload.maximum_size=8384512
+adafruit_feather_dvi.menu.flash.8388608_0.build.flash_length=8384512
+adafruit_feather_dvi.menu.flash.8388608_0.build.eeprom_start=276819968
+adafruit_feather_dvi.menu.flash.8388608_0.build.fs_start=276819968
+adafruit_feather_dvi.menu.flash.8388608_0.build.fs_end=276819968
+adafruit_feather_dvi.menu.flash.8388608_65536=8MB (Sketch: 8128KB, FS: 64KB)
+adafruit_feather_dvi.menu.flash.8388608_65536.upload.maximum_size=8318976
+adafruit_feather_dvi.menu.flash.8388608_65536.build.flash_length=8318976
+adafruit_feather_dvi.menu.flash.8388608_65536.build.eeprom_start=276819968
+adafruit_feather_dvi.menu.flash.8388608_65536.build.fs_start=276754432
+adafruit_feather_dvi.menu.flash.8388608_65536.build.fs_end=276819968
+adafruit_feather_dvi.menu.flash.8388608_131072=8MB (Sketch: 8064KB, FS: 128KB)
+adafruit_feather_dvi.menu.flash.8388608_131072.upload.maximum_size=8253440
+adafruit_feather_dvi.menu.flash.8388608_131072.build.flash_length=8253440
+adafruit_feather_dvi.menu.flash.8388608_131072.build.eeprom_start=276819968
+adafruit_feather_dvi.menu.flash.8388608_131072.build.fs_start=276688896
+adafruit_feather_dvi.menu.flash.8388608_131072.build.fs_end=276819968
+adafruit_feather_dvi.menu.flash.8388608_262144=8MB (Sketch: 7936KB, FS: 256KB)
+adafruit_feather_dvi.menu.flash.8388608_262144.upload.maximum_size=8122368
+adafruit_feather_dvi.menu.flash.8388608_262144.build.flash_length=8122368
+adafruit_feather_dvi.menu.flash.8388608_262144.build.eeprom_start=276819968
+adafruit_feather_dvi.menu.flash.8388608_262144.build.fs_start=276557824
+adafruit_feather_dvi.menu.flash.8388608_262144.build.fs_end=276819968
+adafruit_feather_dvi.menu.flash.8388608_524288=8MB (Sketch: 7680KB, FS: 512KB)
+adafruit_feather_dvi.menu.flash.8388608_524288.upload.maximum_size=7860224
+adafruit_feather_dvi.menu.flash.8388608_524288.build.flash_length=7860224
+adafruit_feather_dvi.menu.flash.8388608_524288.build.eeprom_start=276819968
+adafruit_feather_dvi.menu.flash.8388608_524288.build.fs_start=276295680
+adafruit_feather_dvi.menu.flash.8388608_524288.build.fs_end=276819968
+adafruit_feather_dvi.menu.flash.8388608_1048576=8MB (Sketch: 7MB, FS: 1MB)
+adafruit_feather_dvi.menu.flash.8388608_1048576.upload.maximum_size=7335936
+adafruit_feather_dvi.menu.flash.8388608_1048576.build.flash_length=7335936
+adafruit_feather_dvi.menu.flash.8388608_1048576.build.eeprom_start=276819968
+adafruit_feather_dvi.menu.flash.8388608_1048576.build.fs_start=275771392
+adafruit_feather_dvi.menu.flash.8388608_1048576.build.fs_end=276819968
+adafruit_feather_dvi.menu.flash.8388608_2097152=8MB (Sketch: 6MB, FS: 2MB)
+adafruit_feather_dvi.menu.flash.8388608_2097152.upload.maximum_size=6287360
+adafruit_feather_dvi.menu.flash.8388608_2097152.build.flash_length=6287360
+adafruit_feather_dvi.menu.flash.8388608_2097152.build.eeprom_start=276819968
+adafruit_feather_dvi.menu.flash.8388608_2097152.build.fs_start=274722816
+adafruit_feather_dvi.menu.flash.8388608_2097152.build.fs_end=276819968
+adafruit_feather_dvi.menu.flash.8388608_3145728=8MB (Sketch: 5MB, FS: 3MB)
+adafruit_feather_dvi.menu.flash.8388608_3145728.upload.maximum_size=5238784
+adafruit_feather_dvi.menu.flash.8388608_3145728.build.flash_length=5238784
+adafruit_feather_dvi.menu.flash.8388608_3145728.build.eeprom_start=276819968
+adafruit_feather_dvi.menu.flash.8388608_3145728.build.fs_start=273674240
+adafruit_feather_dvi.menu.flash.8388608_3145728.build.fs_end=276819968
+adafruit_feather_dvi.menu.flash.8388608_4194304=8MB (Sketch: 4MB, FS: 4MB)
+adafruit_feather_dvi.menu.flash.8388608_4194304.upload.maximum_size=4190208
+adafruit_feather_dvi.menu.flash.8388608_4194304.build.flash_length=4190208
+adafruit_feather_dvi.menu.flash.8388608_4194304.build.eeprom_start=276819968
+adafruit_feather_dvi.menu.flash.8388608_4194304.build.fs_start=272625664
+adafruit_feather_dvi.menu.flash.8388608_4194304.build.fs_end=276819968
+adafruit_feather_dvi.menu.flash.8388608_5242880=8MB (Sketch: 3MB, FS: 5MB)
+adafruit_feather_dvi.menu.flash.8388608_5242880.upload.maximum_size=3141632
+adafruit_feather_dvi.menu.flash.8388608_5242880.build.flash_length=3141632
+adafruit_feather_dvi.menu.flash.8388608_5242880.build.eeprom_start=276819968
+adafruit_feather_dvi.menu.flash.8388608_5242880.build.fs_start=271577088
+adafruit_feather_dvi.menu.flash.8388608_5242880.build.fs_end=276819968
+adafruit_feather_dvi.menu.flash.8388608_6291456=8MB (Sketch: 2MB, FS: 6MB)
+adafruit_feather_dvi.menu.flash.8388608_6291456.upload.maximum_size=2093056
+adafruit_feather_dvi.menu.flash.8388608_6291456.build.flash_length=2093056
+adafruit_feather_dvi.menu.flash.8388608_6291456.build.eeprom_start=276819968
+adafruit_feather_dvi.menu.flash.8388608_6291456.build.fs_start=270528512
+adafruit_feather_dvi.menu.flash.8388608_6291456.build.fs_end=276819968
+adafruit_feather_dvi.menu.flash.8388608_7340032=8MB (Sketch: 1MB, FS: 7MB)
+adafruit_feather_dvi.menu.flash.8388608_7340032.upload.maximum_size=1044480
+adafruit_feather_dvi.menu.flash.8388608_7340032.build.flash_length=1044480
+adafruit_feather_dvi.menu.flash.8388608_7340032.build.eeprom_start=276819968
+adafruit_feather_dvi.menu.flash.8388608_7340032.build.fs_start=269479936
+adafruit_feather_dvi.menu.flash.8388608_7340032.build.fs_end=276819968
+adafruit_feather_dvi.menu.freq.133=133 MHz
+adafruit_feather_dvi.menu.freq.133.build.f_cpu=133000000L
+adafruit_feather_dvi.menu.freq.50=50 MHz
+adafruit_feather_dvi.menu.freq.50.build.f_cpu=50000000L
+adafruit_feather_dvi.menu.freq.100=100 MHz
+adafruit_feather_dvi.menu.freq.100.build.f_cpu=100000000L
+adafruit_feather_dvi.menu.freq.120=120 MHz
+adafruit_feather_dvi.menu.freq.120.build.f_cpu=120000000L
+adafruit_feather_dvi.menu.freq.125=125 MHz
+adafruit_feather_dvi.menu.freq.125.build.f_cpu=125000000L
+adafruit_feather_dvi.menu.freq.150=150 MHz (Overclock)
+adafruit_feather_dvi.menu.freq.150.build.f_cpu=150000000L
+adafruit_feather_dvi.menu.freq.175=175 MHz (Overclock)
+adafruit_feather_dvi.menu.freq.175.build.f_cpu=175000000L
+adafruit_feather_dvi.menu.freq.200=200 MHz (Overclock)
+adafruit_feather_dvi.menu.freq.200.build.f_cpu=200000000L
+adafruit_feather_dvi.menu.freq.225=225 MHz (Overclock)
+adafruit_feather_dvi.menu.freq.225.build.f_cpu=225000000L
+adafruit_feather_dvi.menu.freq.240=240 MHz (Overclock)
+adafruit_feather_dvi.menu.freq.240.build.f_cpu=240000000L
+adafruit_feather_dvi.menu.freq.250=250 MHz (Overclock)
+adafruit_feather_dvi.menu.freq.250.build.f_cpu=250000000L
+adafruit_feather_dvi.menu.freq.275=275 MHz (Overclock)
+adafruit_feather_dvi.menu.freq.275.build.f_cpu=275000000L
+adafruit_feather_dvi.menu.freq.300=300 MHz (Overclock)
+adafruit_feather_dvi.menu.freq.300.build.f_cpu=300000000L
+adafruit_feather_dvi.menu.opt.Small=Small (-Os) (standard)
+adafruit_feather_dvi.menu.opt.Small.build.flags.optimize=-Os
+adafruit_feather_dvi.menu.opt.Optimize=Optimize (-O)
+adafruit_feather_dvi.menu.opt.Optimize.build.flags.optimize=-O
+adafruit_feather_dvi.menu.opt.Optimize2=Optimize More (-O2)
+adafruit_feather_dvi.menu.opt.Optimize2.build.flags.optimize=-O2
+adafruit_feather_dvi.menu.opt.Optimize3=Optimize Even More (-O3)
+adafruit_feather_dvi.menu.opt.Optimize3.build.flags.optimize=-O3
+adafruit_feather_dvi.menu.opt.Fast=Fast (-Ofast) (maybe slower)
+adafruit_feather_dvi.menu.opt.Fast.build.flags.optimize=-Ofast
+adafruit_feather_dvi.menu.opt.Debug=Debug (-Og)
+adafruit_feather_dvi.menu.opt.Debug.build.flags.optimize=-Og
+adafruit_feather_dvi.menu.rtti.Disabled=Disabled
+adafruit_feather_dvi.menu.rtti.Disabled.build.flags.rtti=-fno-rtti
+adafruit_feather_dvi.menu.rtti.Enabled=Enabled
+adafruit_feather_dvi.menu.rtti.Enabled.build.flags.rtti=
+adafruit_feather_dvi.menu.stackprotect.Disabled=Disabled
+adafruit_feather_dvi.menu.stackprotect.Disabled.build.flags.stackprotect=
+adafruit_feather_dvi.menu.stackprotect.Enabled=Enabled
+adafruit_feather_dvi.menu.stackprotect.Enabled.build.flags.stackprotect=-fstack-protector
+adafruit_feather_dvi.menu.exceptions.Disabled=Disabled
+adafruit_feather_dvi.menu.exceptions.Disabled.build.flags.exceptions=-fno-exceptions
+adafruit_feather_dvi.menu.exceptions.Disabled.build.flags.libstdcpp=-lstdc++
+adafruit_feather_dvi.menu.exceptions.Enabled=Enabled
+adafruit_feather_dvi.menu.exceptions.Enabled.build.flags.exceptions=-fexceptions
+adafruit_feather_dvi.menu.exceptions.Enabled.build.flags.libstdcpp=-lstdc++-exc
+adafruit_feather_dvi.menu.dbgport.Disabled=Disabled
+adafruit_feather_dvi.menu.dbgport.Disabled.build.debug_port=
+adafruit_feather_dvi.menu.dbgport.Serial=Serial
+adafruit_feather_dvi.menu.dbgport.Serial.build.debug_port=-DDEBUG_RP2040_PORT=Serial
+adafruit_feather_dvi.menu.dbgport.Serial1=Serial1
+adafruit_feather_dvi.menu.dbgport.Serial1.build.debug_port=-DDEBUG_RP2040_PORT=Serial1
+adafruit_feather_dvi.menu.dbgport.Serial2=Serial2
+adafruit_feather_dvi.menu.dbgport.Serial2.build.debug_port=-DDEBUG_RP2040_PORT=Serial2
+adafruit_feather_dvi.menu.dbglvl.None=None
+adafruit_feather_dvi.menu.dbglvl.None.build.debug_level=
+adafruit_feather_dvi.menu.dbglvl.Core=Core
+adafruit_feather_dvi.menu.dbglvl.Core.build.debug_level=-DDEBUG_RP2040_CORE
+adafruit_feather_dvi.menu.dbglvl.SPI=SPI
+adafruit_feather_dvi.menu.dbglvl.SPI.build.debug_level=-DDEBUG_RP2040_SPI
+adafruit_feather_dvi.menu.dbglvl.Wire=Wire
+adafruit_feather_dvi.menu.dbglvl.Wire.build.debug_level=-DDEBUG_RP2040_WIRE
+adafruit_feather_dvi.menu.dbglvl.All=All
+adafruit_feather_dvi.menu.dbglvl.All.build.debug_level=-DDEBUG_RP2040_WIRE -DDEBUG_RP2040_SPI -DDEBUG_RP2040_CORE
+adafruit_feather_dvi.menu.dbglvl.NDEBUG=NDEBUG
+adafruit_feather_dvi.menu.dbglvl.NDEBUG.build.debug_level=-DNDEBUG
+adafruit_feather_dvi.menu.usbstack.picosdk=Pico SDK
+adafruit_feather_dvi.menu.usbstack.picosdk.build.usbstack_flags=
+adafruit_feather_dvi.menu.usbstack.tinyusb=Adafruit TinyUSB
+adafruit_feather_dvi.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
+adafruit_feather_dvi.menu.usbstack.nousb=No USB
+adafruit_feather_dvi.menu.usbstack.nousb.build.usbstack_flags="-DNO_USB -DDISABLE_USB_SERIAL -I{runtime.platform.path}/tools/libpico"
+adafruit_feather_dvi.menu.ipbtstack.ipv4only=IPv4 Only
+adafruit_feather_dvi.menu.ipbtstack.ipv4only.build.libpicow=libpicow-noipv6-nobtc-noble.a
+adafruit_feather_dvi.menu.ipbtstack.ipv4only.build.libpicowdefs=-DLWIP_IPV6=0 -DLWIP_IPV4=1
+adafruit_feather_dvi.menu.ipbtstack.ipv4ipv6=IPv4 + IPv6
+adafruit_feather_dvi.menu.ipbtstack.ipv4ipv6.build.libpicow=libpicow-ipv6-nobtc-noble.a
+adafruit_feather_dvi.menu.ipbtstack.ipv4ipv6.build.libpicowdefs=-DLWIP_IPV6=1 -DLWIP_IPV4=1
+adafruit_feather_dvi.menu.ipbtstack.ipv4btcble=IPv4 + Bluetooth
+adafruit_feather_dvi.menu.ipbtstack.ipv4btcble.build.libpicow=libpicow-noipv6-btc-ble.a
+adafruit_feather_dvi.menu.ipbtstack.ipv4btcble.build.libpicowdefs=-DLWIP_IPV6=0 -DLWIP_IPV4=1 -DENABLE_CLASSIC=1 -DENABLE_BLE=1
+adafruit_feather_dvi.menu.ipbtstack.ipv4ipv6btcble=IPv4 + IPv6 + Bluetooth
+adafruit_feather_dvi.menu.ipbtstack.ipv4ipv6btcble.build.libpicow=libpicow-ipv6-btc-ble.a
+adafruit_feather_dvi.menu.ipbtstack.ipv4ipv6btcble.build.libpicowdefs=-DLWIP_IPV6=1 -DLWIP_IPV4=1 -DENABLE_CLASSIC=1 -DENABLE_BLE=1
+adafruit_feather_dvi.menu.boot2.boot2_w25q080_2_padded_checksum=W25Q080 QSPI /2
+adafruit_feather_dvi.menu.boot2.boot2_w25q080_2_padded_checksum.build.boot2=boot2_w25q080_2_padded_checksum
+adafruit_feather_dvi.menu.boot2.boot2_w25q080_4_padded_checksum=W25Q080 QSPI /4
+adafruit_feather_dvi.menu.boot2.boot2_w25q080_4_padded_checksum.build.boot2=boot2_w25q080_4_padded_checksum
+adafruit_feather_dvi.menu.uploadmethod.default=Default (UF2)
+adafruit_feather_dvi.menu.uploadmethod.default.build.ram_length=256k
+adafruit_feather_dvi.menu.uploadmethod.default.build.debugscript=picoprobe.tcl
+adafruit_feather_dvi.menu.uploadmethod.default.upload.maximum_data_size=262144
+adafruit_feather_dvi.menu.uploadmethod.default.upload.tool=uf2conv
+adafruit_feather_dvi.menu.uploadmethod.default.upload.tool.default=uf2conv
+adafruit_feather_dvi.menu.uploadmethod.default.upload.tool.network=uf2conv-network
+adafruit_feather_dvi.menu.uploadmethod.picotool=Picotool
+adafruit_feather_dvi.menu.uploadmethod.picotool.build.ram_length=256k
+adafruit_feather_dvi.menu.uploadmethod.picotool.build.debugscript=picoprobe.tcl
+adafruit_feather_dvi.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PICOTOOL_USB
+adafruit_feather_dvi.menu.uploadmethod.picotool.upload.maximum_data_size=262144
+adafruit_feather_dvi.menu.uploadmethod.picotool.upload.tool=picotool
+adafruit_feather_dvi.menu.uploadmethod.picotool.upload.tool.default=picotool
+adafruit_feather_dvi.menu.uploadmethod.picoprobe=Picoprobe
+adafruit_feather_dvi.menu.uploadmethod.picoprobe.build.ram_length=256k
+adafruit_feather_dvi.menu.uploadmethod.picoprobe.build.debugscript=picoprobe.tcl
+adafruit_feather_dvi.menu.uploadmethod.picoprobe.upload.maximum_data_size=262144
+adafruit_feather_dvi.menu.uploadmethod.picoprobe.upload.tool=picoprobe
+adafruit_feather_dvi.menu.uploadmethod.picoprobe.upload.tool.default=picoprobe
+adafruit_feather_dvi.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+adafruit_feather_dvi.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
+adafruit_feather_dvi.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
+adafruit_feather_dvi.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
+adafruit_feather_dvi.menu.uploadmethod.picoprobe_cmsis_dap.upload.tool=picoprobe_cmsis_dap
+adafruit_feather_dvi.menu.uploadmethod.picoprobe_cmsis_dap.upload.tool.default=picoprobe_cmsis_dap
+adafruit_feather_dvi.menu.uploadmethod.picodebug=Pico-Debug
+adafruit_feather_dvi.menu.uploadmethod.picodebug.build.ram_length=240k
+adafruit_feather_dvi.menu.uploadmethod.picodebug.build.debugscript=picodebug.tcl
+adafruit_feather_dvi.menu.uploadmethod.picodebug.build.picodebugflags=-UUSE_TINYUSB -DNO_USB -DDISABLE_USB_SERIAL -I{runtime.platform.path}/tools/libpico
+adafruit_feather_dvi.menu.uploadmethod.picodebug.upload.maximum_data_size=245760
+adafruit_feather_dvi.menu.uploadmethod.picodebug.upload.tool=picodebug
+adafruit_feather_dvi.menu.uploadmethod.picodebug.upload.tool.default=picodebug
+
 # -----------------------------------
 # Adafruit ItsyBitsy RP2040
 # -----------------------------------
@@ -1467,6 +1709,10 @@ adafruit_itsybitsy.menu.ipbtstack.ipv4btcble.build.libpicowdefs=-DLWIP_IPV6=0 -D
 adafruit_itsybitsy.menu.ipbtstack.ipv4ipv6btcble=IPv4 + IPv6 + Bluetooth
 adafruit_itsybitsy.menu.ipbtstack.ipv4ipv6btcble.build.libpicow=libpicow-ipv6-btc-ble.a
 adafruit_itsybitsy.menu.ipbtstack.ipv4ipv6btcble.build.libpicowdefs=-DLWIP_IPV6=1 -DLWIP_IPV4=1 -DENABLE_CLASSIC=1 -DENABLE_BLE=1
+adafruit_itsybitsy.menu.boot2.boot2_w25q080_2_padded_checksum=W25Q080 QSPI /2
+adafruit_itsybitsy.menu.boot2.boot2_w25q080_2_padded_checksum.build.boot2=boot2_w25q080_2_padded_checksum
+adafruit_itsybitsy.menu.boot2.boot2_w25q080_4_padded_checksum=W25Q080 QSPI /4
+adafruit_itsybitsy.menu.boot2.boot2_w25q080_4_padded_checksum.build.boot2=boot2_w25q080_4_padded_checksum
 adafruit_itsybitsy.menu.uploadmethod.default=Default (UF2)
 adafruit_itsybitsy.menu.uploadmethod.default.build.ram_length=256k
 adafruit_itsybitsy.menu.uploadmethod.default.build.debugscript=picoprobe.tcl
@@ -1701,6 +1947,10 @@ adafruit_qtpy.menu.ipbtstack.ipv4btcble.build.libpicowdefs=-DLWIP_IPV6=0 -DLWIP_
 adafruit_qtpy.menu.ipbtstack.ipv4ipv6btcble=IPv4 + IPv6 + Bluetooth
 adafruit_qtpy.menu.ipbtstack.ipv4ipv6btcble.build.libpicow=libpicow-ipv6-btc-ble.a
 adafruit_qtpy.menu.ipbtstack.ipv4ipv6btcble.build.libpicowdefs=-DLWIP_IPV6=1 -DLWIP_IPV4=1 -DENABLE_CLASSIC=1 -DENABLE_BLE=1
+adafruit_qtpy.menu.boot2.boot2_w25q080_2_padded_checksum=W25Q080 QSPI /2
+adafruit_qtpy.menu.boot2.boot2_w25q080_2_padded_checksum.build.boot2=boot2_w25q080_2_padded_checksum
+adafruit_qtpy.menu.boot2.boot2_w25q080_4_padded_checksum=W25Q080 QSPI /4
+adafruit_qtpy.menu.boot2.boot2_w25q080_4_padded_checksum.build.boot2=boot2_w25q080_4_padded_checksum
 adafruit_qtpy.menu.uploadmethod.default=Default (UF2)
 adafruit_qtpy.menu.uploadmethod.default.build.ram_length=256k
 adafruit_qtpy.menu.uploadmethod.default.build.debugscript=picoprobe.tcl
@@ -1935,6 +2185,10 @@ adafruit_stemmafriend.menu.ipbtstack.ipv4btcble.build.libpicowdefs=-DLWIP_IPV6=0
 adafruit_stemmafriend.menu.ipbtstack.ipv4ipv6btcble=IPv4 + IPv6 + Bluetooth
 adafruit_stemmafriend.menu.ipbtstack.ipv4ipv6btcble.build.libpicow=libpicow-ipv6-btc-ble.a
 adafruit_stemmafriend.menu.ipbtstack.ipv4ipv6btcble.build.libpicowdefs=-DLWIP_IPV6=1 -DLWIP_IPV4=1 -DENABLE_CLASSIC=1 -DENABLE_BLE=1
+adafruit_stemmafriend.menu.boot2.boot2_w25q080_2_padded_checksum=W25Q080 QSPI /2
+adafruit_stemmafriend.menu.boot2.boot2_w25q080_2_padded_checksum.build.boot2=boot2_w25q080_2_padded_checksum
+adafruit_stemmafriend.menu.boot2.boot2_w25q080_4_padded_checksum=W25Q080 QSPI /4
+adafruit_stemmafriend.menu.boot2.boot2_w25q080_4_padded_checksum.build.boot2=boot2_w25q080_4_padded_checksum
 adafruit_stemmafriend.menu.uploadmethod.default=Default (UF2)
 adafruit_stemmafriend.menu.uploadmethod.default.build.ram_length=256k
 adafruit_stemmafriend.menu.uploadmethod.default.build.debugscript=picoprobe.tcl
@@ -2169,6 +2423,10 @@ adafruit_trinkeyrp2040qt.menu.ipbtstack.ipv4btcble.build.libpicowdefs=-DLWIP_IPV
 adafruit_trinkeyrp2040qt.menu.ipbtstack.ipv4ipv6btcble=IPv4 + IPv6 + Bluetooth
 adafruit_trinkeyrp2040qt.menu.ipbtstack.ipv4ipv6btcble.build.libpicow=libpicow-ipv6-btc-ble.a
 adafruit_trinkeyrp2040qt.menu.ipbtstack.ipv4ipv6btcble.build.libpicowdefs=-DLWIP_IPV6=1 -DLWIP_IPV4=1 -DENABLE_CLASSIC=1 -DENABLE_BLE=1
+adafruit_trinkeyrp2040qt.menu.boot2.boot2_w25q080_2_padded_checksum=W25Q080 QSPI /2
+adafruit_trinkeyrp2040qt.menu.boot2.boot2_w25q080_2_padded_checksum.build.boot2=boot2_w25q080_2_padded_checksum
+adafruit_trinkeyrp2040qt.menu.boot2.boot2_w25q080_4_padded_checksum=W25Q080 QSPI /4
+adafruit_trinkeyrp2040qt.menu.boot2.boot2_w25q080_4_padded_checksum.build.boot2=boot2_w25q080_4_padded_checksum
 adafruit_trinkeyrp2040qt.menu.uploadmethod.default=Default (UF2)
 adafruit_trinkeyrp2040qt.menu.uploadmethod.default.build.ram_length=256k
 adafruit_trinkeyrp2040qt.menu.uploadmethod.default.build.debugscript=picoprobe.tcl
@@ -2403,6 +2661,10 @@ adafruit_macropad2040.menu.ipbtstack.ipv4btcble.build.libpicowdefs=-DLWIP_IPV6=0
 adafruit_macropad2040.menu.ipbtstack.ipv4ipv6btcble=IPv4 + IPv6 + Bluetooth
 adafruit_macropad2040.menu.ipbtstack.ipv4ipv6btcble.build.libpicow=libpicow-ipv6-btc-ble.a
 adafruit_macropad2040.menu.ipbtstack.ipv4ipv6btcble.build.libpicowdefs=-DLWIP_IPV6=1 -DLWIP_IPV4=1 -DENABLE_CLASSIC=1 -DENABLE_BLE=1
+adafruit_macropad2040.menu.boot2.boot2_w25q080_2_padded_checksum=W25Q080 QSPI /2
+adafruit_macropad2040.menu.boot2.boot2_w25q080_2_padded_checksum.build.boot2=boot2_w25q080_2_padded_checksum
+adafruit_macropad2040.menu.boot2.boot2_w25q080_4_padded_checksum=W25Q080 QSPI /4
+adafruit_macropad2040.menu.boot2.boot2_w25q080_4_padded_checksum.build.boot2=boot2_w25q080_4_padded_checksum
 adafruit_macropad2040.menu.uploadmethod.default=Default (UF2)
 adafruit_macropad2040.menu.uploadmethod.default.build.ram_length=256k
 adafruit_macropad2040.menu.uploadmethod.default.build.debugscript=picoprobe.tcl
@@ -2637,6 +2899,10 @@ adafruit_kb2040.menu.ipbtstack.ipv4btcble.build.libpicowdefs=-DLWIP_IPV6=0 -DLWI
 adafruit_kb2040.menu.ipbtstack.ipv4ipv6btcble=IPv4 + IPv6 + Bluetooth
 adafruit_kb2040.menu.ipbtstack.ipv4ipv6btcble.build.libpicow=libpicow-ipv6-btc-ble.a
 adafruit_kb2040.menu.ipbtstack.ipv4ipv6btcble.build.libpicowdefs=-DLWIP_IPV6=1 -DLWIP_IPV4=1 -DENABLE_CLASSIC=1 -DENABLE_BLE=1
+adafruit_kb2040.menu.boot2.boot2_w25q080_2_padded_checksum=W25Q080 QSPI /2
+adafruit_kb2040.menu.boot2.boot2_w25q080_2_padded_checksum.build.boot2=boot2_w25q080_2_padded_checksum
+adafruit_kb2040.menu.boot2.boot2_w25q080_4_padded_checksum=W25Q080 QSPI /4
+adafruit_kb2040.menu.boot2.boot2_w25q080_4_padded_checksum.build.boot2=boot2_w25q080_4_padded_checksum
 adafruit_kb2040.menu.uploadmethod.default=Default (UF2)
 adafruit_kb2040.menu.uploadmethod.default.build.ram_length=256k
 adafruit_kb2040.menu.uploadmethod.default.build.debugscript=picoprobe.tcl
@@ -7203,6 +7469,216 @@ melopero_shake_rp2040.menu.uploadmethod.picodebug.upload.maximum_data_size=24576
 melopero_shake_rp2040.menu.uploadmethod.picodebug.upload.tool=picodebug
 melopero_shake_rp2040.menu.uploadmethod.picodebug.upload.tool.default=picodebug

+# -----------------------------------
+# Neko Systems BL2040 Mini
+# -----------------------------------
+nekosystems_bl2040_mini.name=Neko Systems BL2040 Mini
+nekosystems_bl2040_mini.vid.0=0x2e8a
+nekosystems_bl2040_mini.pid.0=0x000a
+nekosystems_bl2040_mini.vid.1=0x2e8a
+nekosystems_bl2040_mini.pid.1=0x010a
+nekosystems_bl2040_mini.vid.2=0x2e8a
+nekosystems_bl2040_mini.pid.2=0x400a
+nekosystems_bl2040_mini.vid.3=0x2e8a
+nekosystems_bl2040_mini.pid.3=0x410a
+nekosystems_bl2040_mini.vid.4=0x2e8a
+nekosystems_bl2040_mini.pid.4=0x800a
+nekosystems_bl2040_mini.vid.5=0x2e8a
+nekosystems_bl2040_mini.pid.5=0x810a
+nekosystems_bl2040_mini.vid.6=0x2e8a
+nekosystems_bl2040_mini.pid.6=0xc00a
+nekosystems_bl2040_mini.vid.7=0x2e8a
+nekosystems_bl2040_mini.pid.7=0xc10a
+nekosystems_bl2040_mini.build.usbvid=-DUSBD_VID=0x2e8a
+nekosystems_bl2040_mini.build.usbpid=-DUSBD_PID=0x000a
+nekosystems_bl2040_mini.build.usbpwr=-DUSBD_MAX_POWER_MA=500
+nekosystems_bl2040_mini.build.board=NEKOSYSTEMS_BL2040_MINI
+nekosystems_bl2040_mini.build.mcu=cortex-m0plus
+nekosystems_bl2040_mini.build.variant=nekosystems_bl2040_mini
+nekosystems_bl2040_mini.upload.maximum_size=4194304
+nekosystems_bl2040_mini.upload.wait_for_upload_port=true
+nekosystems_bl2040_mini.upload.erase_cmd=
+nekosystems_bl2040_mini.serial.disableDTR=false
+nekosystems_bl2040_mini.serial.disableRTS=false
+nekosystems_bl2040_mini.build.f_cpu=125000000
+nekosystems_bl2040_mini.build.led=
+nekosystems_bl2040_mini.build.core=rp2040
+nekosystems_bl2040_mini.build.ldscript=memmap_default.ld
+nekosystems_bl2040_mini.build.boot2=boot2_generic_03h_2_padded_checksum
+nekosystems_bl2040_mini.build.usb_manufacturer="Neko Systems"
+nekosystems_bl2040_mini.build.usb_product="BL2040 Mini"
+nekosystems_bl2040_mini.menu.flash.4194304_0=4MB (no FS)
+nekosystems_bl2040_mini.menu.flash.4194304_0.upload.maximum_size=4190208
+nekosystems_bl2040_mini.menu.flash.4194304_0.build.flash_length=4190208
+nekosystems_bl2040_mini.menu.flash.4194304_0.build.eeprom_start=272625664
+nekosystems_bl2040_mini.menu.flash.4194304_0.build.fs_start=272625664
+nekosystems_bl2040_mini.menu.flash.4194304_0.build.fs_end=272625664
+nekosystems_bl2040_mini.menu.flash.4194304_65536=4MB (Sketch: 4032KB, FS: 64KB)
+nekosystems_bl2040_mini.menu.flash.4194304_65536.upload.maximum_size=4124672
+nekosystems_bl2040_mini.menu.flash.4194304_65536.build.flash_length=4124672
+nekosystems_bl2040_mini.menu.flash.4194304_65536.build.eeprom_start=272625664
+nekosystems_bl2040_mini.menu.flash.4194304_65536.build.fs_start=272560128
+nekosystems_bl2040_mini.menu.flash.4194304_65536.build.fs_end=272625664
+nekosystems_bl2040_mini.menu.flash.4194304_131072=4MB (Sketch: 3968KB, FS: 128KB)
+nekosystems_bl2040_mini.menu.flash.4194304_131072.upload.maximum_size=4059136
+nekosystems_bl2040_mini.menu.flash.4194304_131072.build.flash_length=4059136
+nekosystems_bl2040_mini.menu.flash.4194304_131072.build.eeprom_start=272625664
+nekosystems_bl2040_mini.menu.flash.4194304_131072.build.fs_start=272494592
+nekosystems_bl2040_mini.menu.flash.4194304_131072.build.fs_end=272625664
+nekosystems_bl2040_mini.menu.flash.4194304_262144=4MB (Sketch: 3840KB, FS: 256KB)
+nekosystems_bl2040_mini.menu.flash.4194304_262144.upload.maximum_size=3928064
+nekosystems_bl2040_mini.menu.flash.4194304_262144.build.flash_length=3928064
+nekosystems_bl2040_mini.menu.flash.4194304_262144.build.eeprom_start=272625664
+nekosystems_bl2040_mini.menu.flash.4194304_262144.build.fs_start=272363520
+nekosystems_bl2040_mini.menu.flash.4194304_262144.build.fs_end=272625664
+nekosystems_bl2040_mini.menu.flash.4194304_524288=4MB (Sketch: 3584KB, FS: 512KB)
+nekosystems_bl2040_mini.menu.flash.4194304_524288.upload.maximum_size=3665920
+nekosystems_bl2040_mini.menu.flash.4194304_524288.build.flash_length=3665920
+nekosystems_bl2040_mini.menu.flash.4194304_524288.build.eeprom_start=272625664
+nekosystems_bl2040_mini.menu.flash.4194304_524288.build.fs_start=272101376
+nekosystems_bl2040_mini.menu.flash.4194304_524288.build.fs_end=272625664
+nekosystems_bl2040_mini.menu.flash.4194304_1048576=4MB (Sketch: 3MB, FS: 1MB)
+nekosystems_bl2040_mini.menu.flash.4194304_1048576.upload.maximum_size=3141632
+nekosystems_bl2040_mini.menu.flash.4194304_1048576.build.flash_length=3141632
+nekosystems_bl2040_mini.menu.flash.4194304_1048576.build.eeprom_start=272625664
+nekosystems_bl2040_mini.menu.flash.4194304_1048576.build.fs_start=271577088
+nekosystems_bl2040_mini.menu.flash.4194304_1048576.build.fs_end=272625664
+nekosystems_bl2040_mini.menu.flash.4194304_2097152=4MB (Sketch: 2MB, FS: 2MB)
+nekosystems_bl2040_mini.menu.flash.4194304_2097152.upload.maximum_size=2093056
+nekosystems_bl2040_mini.menu.flash.4194304_2097152.build.flash_length=2093056
+nekosystems_bl2040_mini.menu.flash.4194304_2097152.build.eeprom_start=272625664
+nekosystems_bl2040_mini.menu.flash.4194304_2097152.build.fs_start=270528512
+nekosystems_bl2040_mini.menu.flash.4194304_2097152.build.fs_end=272625664
+nekosystems_bl2040_mini.menu.flash.4194304_3145728=4MB (Sketch: 1MB, FS: 3MB)
+nekosystems_bl2040_mini.menu.flash.4194304_3145728.upload.maximum_size=1044480
+nekosystems_bl2040_mini.menu.flash.4194304_3145728.build.flash_length=1044480
+nekosystems_bl2040_mini.menu.flash.4194304_3145728.build.eeprom_start=272625664
+nekosystems_bl2040_mini.menu.flash.4194304_3145728.build.fs_start=269479936
+nekosystems_bl2040_mini.menu.flash.4194304_3145728.build.fs_end=272625664
+nekosystems_bl2040_mini.menu.freq.133=133 MHz
+nekosystems_bl2040_mini.menu.freq.133.build.f_cpu=133000000L
+nekosystems_bl2040_mini.menu.freq.50=50 MHz
+nekosystems_bl2040_mini.menu.freq.50.build.f_cpu=50000000L
+nekosystems_bl2040_mini.menu.freq.100=100 MHz
+nekosystems_bl2040_mini.menu.freq.100.build.f_cpu=100000000L
+nekosystems_bl2040_mini.menu.freq.120=120 MHz
+nekosystems_bl2040_mini.menu.freq.120.build.f_cpu=120000000L
+nekosystems_bl2040_mini.menu.freq.125=125 MHz
+nekosystems_bl2040_mini.menu.freq.125.build.f_cpu=125000000L
+nekosystems_bl2040_mini.menu.freq.150=150 MHz (Overclock)
+nekosystems_bl2040_mini.menu.freq.150.build.f_cpu=150000000L
+nekosystems_bl2040_mini.menu.freq.175=175 MHz (Overclock)
+nekosystems_bl2040_mini.menu.freq.175.build.f_cpu=175000000L
+nekosystems_bl2040_mini.menu.freq.200=200 MHz (Overclock)
+nekosystems_bl2040_mini.menu.freq.200.build.f_cpu=200000000L
+nekosystems_bl2040_mini.menu.freq.225=225 MHz (Overclock)
+nekosystems_bl2040_mini.menu.freq.225.build.f_cpu=225000000L
+nekosystems_bl2040_mini.menu.freq.240=240 MHz (Overclock)
+nekosystems_bl2040_mini.menu.freq.240.build.f_cpu=240000000L
+nekosystems_bl2040_mini.menu.freq.250=250 MHz (Overclock)
+nekosystems_bl2040_mini.menu.freq.250.build.f_cpu=250000000L
+nekosystems_bl2040_mini.menu.freq.275=275 MHz (Overclock)
+nekosystems_bl2040_mini.menu.freq.275.build.f_cpu=275000000L
+nekosystems_bl2040_mini.menu.freq.300=300 MHz (Overclock)
+nekosystems_bl2040_mini.menu.freq.300.build.f_cpu=300000000L
+nekosystems_bl2040_mini.menu.opt.Small=Small (-Os) (standard)
+nekosystems_bl2040_mini.menu.opt.Small.build.flags.optimize=-Os
+nekosystems_bl2040_mini.menu.opt.Optimize=Optimize (-O)
+nekosystems_bl2040_mini.menu.opt.Optimize.build.flags.optimize=-O
+nekosystems_bl2040_mini.menu.opt.Optimize2=Optimize More (-O2)
+nekosystems_bl2040_mini.menu.opt.Optimize2.build.flags.optimize=-O2
+nekosystems_bl2040_mini.menu.opt.Optimize3=Optimize Even More (-O3)
+nekosystems_bl2040_mini.menu.opt.Optimize3.build.flags.optimize=-O3
+nekosystems_bl2040_mini.menu.opt.Fast=Fast (-Ofast) (maybe slower)
+nekosystems_bl2040_mini.menu.opt.Fast.build.flags.optimize=-Ofast
+nekosystems_bl2040_mini.menu.opt.Debug=Debug (-Og)
+nekosystems_bl2040_mini.menu.opt.Debug.build.flags.optimize=-Og
+nekosystems_bl2040_mini.menu.rtti.Disabled=Disabled
+nekosystems_bl2040_mini.menu.rtti.Disabled.build.flags.rtti=-fno-rtti
+nekosystems_bl2040_mini.menu.rtti.Enabled=Enabled
+nekosystems_bl2040_mini.menu.rtti.Enabled.build.flags.rtti=
+nekosystems_bl2040_mini.menu.stackprotect.Disabled=Disabled
+nekosystems_bl2040_mini.menu.stackprotect.Disabled.build.flags.stackprotect=
+nekosystems_bl2040_mini.menu.stackprotect.Enabled=Enabled
+nekosystems_bl2040_mini.menu.stackprotect.Enabled.build.flags.stackprotect=-fstack-protector
+nekosystems_bl2040_mini.menu.exceptions.Disabled=Disabled
+nekosystems_bl2040_mini.menu.exceptions.Disabled.build.flags.exceptions=-fno-exceptions
+nekosystems_bl2040_mini.menu.exceptions.Disabled.build.flags.libstdcpp=-lstdc++
+nekosystems_bl2040_mini.menu.exceptions.Enabled=Enabled
+nekosystems_bl2040_mini.menu.exceptions.Enabled.build.flags.exceptions=-fexceptions
+nekosystems_bl2040_mini.menu.exceptions.Enabled.build.flags.libstdcpp=-lstdc++-exc
+nekosystems_bl2040_mini.menu.dbgport.Disabled=Disabled
+nekosystems_bl2040_mini.menu.dbgport.Disabled.build.debug_port=
+nekosystems_bl2040_mini.menu.dbgport.Serial=Serial
+nekosystems_bl2040_mini.menu.dbgport.Serial.build.debug_port=-DDEBUG_RP2040_PORT=Serial
+nekosystems_bl2040_mini.menu.dbgport.Serial1=Serial1
+nekosystems_bl2040_mini.menu.dbgport.Serial1.build.debug_port=-DDEBUG_RP2040_PORT=Serial1
+nekosystems_bl2040_mini.menu.dbgport.Serial2=Serial2
+nekosystems_bl2040_mini.menu.dbgport.Serial2.build.debug_port=-DDEBUG_RP2040_PORT=Serial2
+nekosystems_bl2040_mini.menu.dbglvl.None=None
+nekosystems_bl2040_mini.menu.dbglvl.None.build.debug_level=
+nekosystems_bl2040_mini.menu.dbglvl.Core=Core
+nekosystems_bl2040_mini.menu.dbglvl.Core.build.debug_level=-DDEBUG_RP2040_CORE
+nekosystems_bl2040_mini.menu.dbglvl.SPI=SPI
+nekosystems_bl2040_mini.menu.dbglvl.SPI.build.debug_level=-DDEBUG_RP2040_SPI
+nekosystems_bl2040_mini.menu.dbglvl.Wire=Wire
+nekosystems_bl2040_mini.menu.dbglvl.Wire.build.debug_level=-DDEBUG_RP2040_WIRE
+nekosystems_bl2040_mini.menu.dbglvl.All=All
+nekosystems_bl2040_mini.menu.dbglvl.All.build.debug_level=-DDEBUG_RP2040_WIRE -DDEBUG_RP2040_SPI -DDEBUG_RP2040_CORE
+nekosystems_bl2040_mini.menu.dbglvl.NDEBUG=NDEBUG
+nekosystems_bl2040_mini.menu.dbglvl.NDEBUG.build.debug_level=-DNDEBUG
+nekosystems_bl2040_mini.menu.usbstack.picosdk=Pico SDK
+nekosystems_bl2040_mini.menu.usbstack.picosdk.build.usbstack_flags=
+nekosystems_bl2040_mini.menu.usbstack.tinyusb=Adafruit TinyUSB
+nekosystems_bl2040_mini.menu.usbstack.tinyusb.build.usbstack_flags=-DUSE_TINYUSB "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
+nekosystems_bl2040_mini.menu.usbstack.nousb=No USB
+nekosystems_bl2040_mini.menu.usbstack.nousb.build.usbstack_flags="-DNO_USB -DDISABLE_USB_SERIAL -I{runtime.platform.path}/tools/libpico"
+nekosystems_bl2040_mini.menu.ipbtstack.ipv4only=IPv4 Only
+nekosystems_bl2040_mini.menu.ipbtstack.ipv4only.build.libpicow=libpicow-noipv6-nobtc-noble.a
+nekosystems_bl2040_mini.menu.ipbtstack.ipv4only.build.libpicowdefs=-DLWIP_IPV6=0 -DLWIP_IPV4=1
+nekosystems_bl2040_mini.menu.ipbtstack.ipv4ipv6=IPv4 + IPv6
+nekosystems_bl2040_mini.menu.ipbtstack.ipv4ipv6.build.libpicow=libpicow-ipv6-nobtc-noble.a
+nekosystems_bl2040_mini.menu.ipbtstack.ipv4ipv6.build.libpicowdefs=-DLWIP_IPV6=1 -DLWIP_IPV4=1
+nekosystems_bl2040_mini.menu.ipbtstack.ipv4btcble=IPv4 + Bluetooth
+nekosystems_bl2040_mini.menu.ipbtstack.ipv4btcble.build.libpicow=libpicow-noipv6-btc-ble.a
+nekosystems_bl2040_mini.menu.ipbtstack.ipv4btcble.build.libpicowdefs=-DLWIP_IPV6=0 -DLWIP_IPV4=1 -DENABLE_CLASSIC=1 -DENABLE_BLE=1
+nekosystems_bl2040_mini.menu.ipbtstack.ipv4ipv6btcble=IPv4 + IPv6 + Bluetooth
+nekosystems_bl2040_mini.menu.ipbtstack.ipv4ipv6btcble.build.libpicow=libpicow-ipv6-btc-ble.a
+nekosystems_bl2040_mini.menu.ipbtstack.ipv4ipv6btcble.build.libpicowdefs=-DLWIP_IPV6=1 -DLWIP_IPV4=1 -DENABLE_CLASSIC=1 -DENABLE_BLE=1
+nekosystems_bl2040_mini.menu.uploadmethod.default=Default (UF2)
+nekosystems_bl2040_mini.menu.uploadmethod.default.build.ram_length=256k
+nekosystems_bl2040_mini.menu.uploadmethod.default.build.debugscript=picoprobe.tcl
+nekosystems_bl2040_mini.menu.uploadmethod.default.upload.maximum_data_size=262144
+nekosystems_bl2040_mini.menu.uploadmethod.default.upload.tool=uf2conv
+nekosystems_bl2040_mini.menu.uploadmethod.default.upload.tool.default=uf2conv
+nekosystems_bl2040_mini.menu.uploadmethod.default.upload.tool.network=uf2conv-network
+nekosystems_bl2040_mini.menu.uploadmethod.picotool=Picotool
+nekosystems_bl2040_mini.menu.uploadmethod.picotool.build.ram_length=256k
+nekosystems_bl2040_mini.menu.uploadmethod.picotool.build.debugscript=picoprobe.tcl
+nekosystems_bl2040_mini.menu.uploadmethod.picotool.build.picodebugflags=-DENABLE_PICOTOOL_USB
+nekosystems_bl2040_mini.menu.uploadmethod.picotool.upload.maximum_data_size=262144
+nekosystems_bl2040_mini.menu.uploadmethod.picotool.upload.tool=picotool
+nekosystems_bl2040_mini.menu.uploadmethod.picotool.upload.tool.default=picotool
+nekosystems_bl2040_mini.menu.uploadmethod.picoprobe=Picoprobe
+nekosystems_bl2040_mini.menu.uploadmethod.picoprobe.build.ram_length=256k
+nekosystems_bl2040_mini.menu.uploadmethod.picoprobe.build.debugscript=picoprobe.tcl
+nekosystems_bl2040_mini.menu.uploadmethod.picoprobe.upload.maximum_data_size=262144
+nekosystems_bl2040_mini.menu.uploadmethod.picoprobe.upload.tool=picoprobe
+nekosystems_bl2040_mini.menu.uploadmethod.picoprobe.upload.tool.default=picoprobe
+nekosystems_bl2040_mini.menu.uploadmethod.picoprobe_cmsis_dap=Picoprobe (CMSIS-DAP)
+nekosystems_bl2040_mini.menu.uploadmethod.picoprobe_cmsis_dap.build.ram_length=256k
+nekosystems_bl2040_mini.menu.uploadmethod.picoprobe_cmsis_dap.build.debugscript=picoprobe_cmsis_dap.tcl
+nekosystems_bl2040_mini.menu.uploadmethod.picoprobe_cmsis_dap.upload.maximum_data_size=262144
+nekosystems_bl2040_mini.menu.uploadmethod.picoprobe_cmsis_dap.upload.tool=picoprobe_cmsis_dap
+nekosystems_bl2040_mini.menu.uploadmethod.picoprobe_cmsis_dap.upload.tool.default=picoprobe_cmsis_dap
+nekosystems_bl2040_mini.menu.uploadmethod.picodebug=Pico-Debug
+nekosystems_bl2040_mini.menu.uploadmethod.picodebug.build.ram_length=240k
+nekosystems_bl2040_mini.menu.uploadmethod.picodebug.build.debugscript=picodebug.tcl
+nekosystems_bl2040_mini.menu.uploadmethod.picodebug.build.picodebugflags=-UUSE_TINYUSB -DNO_USB -DDISABLE_USB_SERIAL -I{runtime.platform.path}/tools/libpico
+nekosystems_bl2040_mini.menu.uploadmethod.picodebug.upload.maximum_data_size=245760
+nekosystems_bl2040_mini.menu.uploadmethod.picodebug.upload.tool=picodebug
+nekosystems_bl2040_mini.menu.uploadmethod.picodebug.upload.tool.default=picodebug
+
 # -----------------------------------
 # nullbits Bit-C PRO
 # -----------------------------------
@@ -383,6 +383,7 @@ void __USBStart() {
 // Invoked when received GET_REPORT control request
 // Application must fill buffer report's content and return its length.
 // Return zero will cause the stack to STALL request
+extern "C" uint16_t tud_hid_get_report_cb(uint8_t instance, uint8_t report_id, hid_report_type_t report_type, uint8_t* buffer, uint16_t reqlen) __attribute__((weak));
 extern "C" uint16_t tud_hid_get_report_cb(uint8_t instance, uint8_t report_id, hid_report_type_t report_type, uint8_t* buffer, uint16_t reqlen) {
    // TODO not implemented
    (void) instance;
@@ -396,6 +397,7 @@ extern "C" uint16_t tud_hid_get_report_cb(uint8_t instance, uint8_t report_id, h

 // Invoked when received SET_REPORT control request or
 // received data on OUT endpoint ( Report ID = 0, Type = 0 )
+extern "C" void tud_hid_set_report_cb(uint8_t instance, uint8_t report_id, hid_report_type_t report_type, uint8_t const* buffer, uint16_t bufsize) __attribute__((weak));
 extern "C" void tud_hid_set_report_cb(uint8_t instance, uint8_t report_id, hid_report_type_t report_type, uint8_t const* buffer, uint16_t bufsize) {
    // TODO set LED based on CAPLOCK, NUMLOCK etc...
    (void) instance;
@@ -1,5 +1,5 @@
 #pragma once
 #define ARDUINO_PICO_MAJOR 3
-#define ARDUINO_PICO_MINOR 0
+#define ARDUINO_PICO_MINOR 1
 #define ARDUINO_PICO_REVISION 0
-#define ARDUINO_PICO_VERSION_STR "3.0.0"
+#define ARDUINO_PICO_VERSION_STR "3.1.0"
@@ -256,14 +256,10 @@ extern "C" {
    }

    // sys_check_timeouts is special case because the async process will call it.  If we're already in a timeout check, just do a noop
-    auto_init_mutex(__sys_check_timeouts_mtx);
-    extern void __real_sys_check_timeouts(void);
+    extern void __real_sys_check_timeouts();
    void __wrap_sys_check_timeouts(void) {
-        uint32_t owner;
-        if (mutex_try_enter(&__sys_check_timeouts_mtx, &owner)) {
-            __real_sys_check_timeouts();
-            mutex_exit(&__sys_check_timeouts_mtx);
-        }
+        LWIPMutex m;
+        __real_sys_check_timeouts();
    }

    extern err_t __real_dns_gethostbyname(const char *hostname, ip_addr_t *addr, dns_found_callback found, void *callback_arg);
@@ -54,9 +54,9 @@ author = u'Earle F. Philhower, III'
 # built documents.
 #
 # The short X.Y version.
-version = u'3.0.0'
+version = u'3.1.0'
 # The full version, including alpha/beta/rc tags.
-release = u'3.0.0'
+release = u'3.1.0'

 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -6,6 +6,7 @@
 # Datatypes (KEYWORD1)
 #######################################

+PicoBluetoothHID	KEYWORD1
 PicoBluetoothBLEHID	KEYWORD1

 #######################################
@@ -21,6 +22,7 @@ send	KEYWORD2
 lockBluetooth	KEYWORD2
 unlockBluetooth	KEYWORD2
 getCID	KEYWORD2
+setBattery	KEYWORD2

 #######################################
 # Constants (LITERAL1)
@@ -1,9 +1,9 @@
-name=PicoBluetoothBLEHID
+name=HID_Bluetooth
 version=1.0.0
 author=Earle F. Philhower, III <earlephilhower@yahoo.com>
 maintainer=Earle F. Philhower, III <earlephilhower@yahoo.com>
-sentence=Implements a HID device base class for PicoW Bluetooth BLE
-paragraph=Implements a HID device base class for PicoW Bluetooth BLE
+sentence=Implements a HID device base class for PicoW Bluetooth
+paragraph=Implements a HID device base class for PicoW Bluetooth
 category=Device Control
 url=https://github.com/earlephilhower/arduino-pico
 architectures=rp2040
@@ -0,0 +1,7 @@
+#ifdef ENABLE_CLASSIC
+#include "PicoBluetoothHID.h"
+#endif
+
+#ifdef ENABLE_BLE
+#include "PicoBluetoothBLEHID.h"
+#endif
@@ -1,5 +1,5 @@
 /*
-    PicoBluetoothHID.h - Simple wrapper for BT-HID objects like
+    PicoBluetoothBLEHID.h - Simple wrapper for BT-HID objects like
    keyboards, mice, gamepads.
    Copyright (c) 2023 Earle F. Philhower, III.  All rights reserved.

@@ -219,6 +219,14 @@ public:
        return connected();
    }

+    bool setBattery(int level) {
+        if (!_running || (level < 0) || (level > 100)) {
+            return false;
+        }
+        battery_service_server_set_battery_value(level);
+        return true;
+    }
+
    static void lockBluetooth() {
        async_context_acquire_lock_blocking(cyw43_arch_async_context());
    }
@@ -10,6 +10,19 @@
            +--   ------------------------------------  --+
   left RPI | (1) GND (2) DIN (3) BCLK (4) LRCLK (5) 3.3V | AIY right
       logo +---------------------------------------------+ logo
+
+   For an Adfruit I2S MEMS microphone (https://www.adafruit.com/product/3421),
+   connect the pins as follows:
+
+      DOUT -> GPIO0
+      BCLK <- GPIO1
+      LRCL <- GPIO2  # LRCLK = BCLK + 1
+      GND <-> GND
+      3V  <-> 3V3OUT
+
+   The other idiosyncrasy of most modern MEMS microphones is that they
+   require a minimum clock rate to wake up. For example, the SPH0645
+   microphone needs at least 1MHz.
 */

 #include <I2S.h>
@@ -20,15 +33,21 @@ void setup() {
  Serial.begin(115200);

  i2s.setDATA(0);
-  i2s.setBCLK(1); // LRCLK = GP2
+  i2s.setBCLK(1); // Note: LRCLK = BCLK + 1
  i2s.setBitsPerSample(16);
  i2s.setFrequency(22050);
+  // NOTE: The following values are known to work with the Adafruit microphone:
+  // i2s.setBitsPerSample(32);
+  // i2s.setFrequency(16000);
  i2s.begin();

  while (1) {
    int16_t l, r;
    i2s.read16(&l, &r);
-    Serial.printf("%d %d\n", l, r);
+    // NOTE: Adafruit microphone word size needs to match the BPS above.
+    // int32_t l, r;
+    // i2s.read32(&l, &r);
+    Serial.printf("%d %d\r\n", l, r);
  }
 }

@@ -0,0 +1,32 @@
+:repository-owner: arduino-libraries
+:repository-name: Joystick
+
+= {repository-name} Library for Arduino (RP2040 based boards) =
+
+This library allows an RaspberryPi RP2040 board to act as a Joystick when
+Earle F. Philhower`s [arduino-pico](https://github.com/earlephilhower/arduino-pico)
+Core is used.
+
+== Acknowledgements / Credits ==
+
+* [arduino-pico](https://github.com/earlephilhower/arduino-pico) Earle F. Philhower providing the Arduino Core, on which this library is based on, available under LGPL.
+* [tinyUSB] (https://github.com/hathach/tinyusb) Ha Thach for providing tinyUSB under MIT license, which covers most of the USB functionality.
+
+
+== License ==
+
+Copyright (c) Benjamin Aigner <beni@asterics-foundation.org> All right reserved.
+
+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
@@ -0,0 +1,435 @@
+# Joystick library
+
+## Methods
+
+### `Joystick.begin()`
+
+Must be called before starting using the Joystick emulation. To end control, use `Joystick.end()`.
+
+#### Syntax 
+
+```
+Joystick.begin()
+```
+
+#### Parameters
+
+None.
+
+#### Returns
+
+None.
+
+#### Example
+
+```
+#include <Joystick.h>
+
+void setup() {
+  pinMode(2, INPUT_PULLUP);
+}
+
+void loop() {
+  // Initialize the Joystick library when button is pressed
+  if (digitalRead(2) == LOW) {
+    Joystick.begin();
+  }
+}
+```
+
+#### See also
+
+
+* [Joystick.button()](#joystickbutton)
+* [Joystick.end()](#joystickend)
+* [Joystick.send_now()](#joysticksend_now)
+* [Joystick.position()](#joystickposition)
+* [Joystick.X()](#joystickx)
+* [Joystick.hat()](#joystickhat)
+* [Joystick.use8bit()](#joystickuse8bit)
+* [Joystick.useManualSend()](#joystickuseManualSend)
+
+### `Joystick.button()`
+
+Updates a button of the USB joystick.
+
+#### Syntax 
+
+```
+Joystick.button(1,true);
+delay(250);
+Joystick.button(1,false);
+```
+
+#### Parameters
+
+* `button`: number of Joystick button, which status should be changed
+* `val`: state of button, `true` for pressed, `false` for released
+  
+#### Returns
+
+None.
+
+#### Example
+
+```
+#include <Joystick.h>
+
+void setup() {
+  pinMode(2, INPUT_PULLUP);
+  Joystick.begin();
+}
+
+void loop() {
+  uint8_t i = 1; //counter for the button number 1-32
+  if (digitalRead(2) == LOW) { //if button is pressed
+    Joystick.button(i,true); //"press" the Joystick button
+	delay(250); //wait for 0.25s
+	Joystick.button(i,false); //"release" the Joystick button
+	i = i + 1; //increment & use next Joystick button number
+	if(i > 32) i = 1; //we have 32 buttons available, wrap-around
+  }
+}
+```
+
+#### Notes
+
+* Up to 32 buttons are available, numbered as button 1 to button 32.
+* If manual_send is active, call `Joystick.send_now()` to send an update to the host.
+
+#### See also
+
+* [Joystick.send_now()](#joysticksend_now)
+* [Joystick.useManualSend()](#joystickuseManualSend)
+* [Joystick.X()](#joystickx)
+* [Joystick.hat()](#joystickhat)
+
+  
+### `Joystick.end()`
+
+Stops emulating the Joystick connected to a computer. To start control, use `Joystick.begin()`.
+
+#### Syntax 
+
+```
+Joystick.end()
+```
+
+#### Parameters
+
+None.
+
+#### Returns
+
+None.
+
+#### Example
+
+```
+#include <Joystick.h>
+
+void setup() {
+  pinMode(2, INPUT_PULLUP);
+  // Initiate the Joystick library
+  Joystick.begin();
+}
+
+void loop() {
+  // If the button is pressed, send a button 1 press / release
+  if (digitalRead(2) == LOW) {
+    Joystick.button(1,true);
+	delay(250);
+	Joystick.button(1,false);
+    // Then end the Joystick emulation
+    Joystick.end();
+  }
+}
+```
+
+#### See also
+
+* [Joystick.begin()](#joystickbegin)
+
+### `Joystick.use8bit()`
+
+Switch axis value range between 10bit and 8bit.
+* Default: 10bit, range for an axis from 0 to 1023
+* 8bit mode: range from -127 to 127.
+
+__Note:__ due to the gamepad descriptor of tinyUSB, the maximum range is -127/127. 10bit mode enables mapping, not a higher resolution.
+
+
+#### Syntax 
+
+```
+Joystick.use8bit(true)
+```
+
+#### Parameters
+
+* `mode`: true, if values from -127/127 are used. False to use a range from 0 to 1023.
+
+#### Returns
+
+None.
+
+#### Example
+
+```
+#include <Joystick.h>
+
+void setup() {
+  pinMode(2, INPUT_PULLUP);
+  Joystick.begin();
+}
+
+void loop() {
+  //send middle position in default 10bit mode
+  Joystick.position(512,512);
+  delay(250);
+  //enable 8bit mode
+  Joystick.use8bit(true);
+  //send middle position in 8bit mode
+  Joystick.position(0,0);
+  delay(250);
+  
+  //send maximum left in 10bit mode
+  Joystick.use8bit(false);
+  Joystick.position(0,0);
+  delay(250);
+  //enable 8bit mode
+  Joystick.use8bit(true);
+  //send left position in 8bit mode
+  Joystick.position(-127,-127);
+}
+```
+
+#### See also
+
+* [Joystick.position()](#joystickposition)
+* [Joystick.X()](#joystickx)
+* [Joystick.Y()](#joysticky)
+* [Joystick.Z()](#joystickz)
+* [Joystick.Zrotate()](#joystickrotate)
+* [Joystick.slider()](#joystickslider)
+* [Joystick.sliderLeft()](#joysticksliderleft)
+* [Joystick.sliderRight()](#joysticksliderright)
+
+
+### `Joystick.useManualSend()`
+
+To fully control transmitting the USB-HID reports, enable manual sending.
+If disabled, each call to a function updating the Joystick status (buttons, all axis, hat)
+will send a HID report. If you update in a loop, the time between updates (at least 1ms) is too short and something might be not transmitted correctly.
+If enabled, update all your axis values, buttons, hat and then send one report via `Joystick.send_now()`.
+
+#### Syntax 
+
+```
+Joystick.useManualSend(true)
+```
+
+#### Parameters
+
+* `mode`: false is sending report each Joystick update, true enables manual sending via send_now().
+
+#### Returns
+
+None.
+
+#### Example
+
+```
+#include <Joystick.h>
+
+void setup() {
+  pinMode(2, INPUT_PULLUP);
+  Joystick.begin();
+}
+
+void loop() {
+  if (digitalRead(2) == LOW) {
+      // send data in 4 different reports
+	  Joystick.button(1,true);
+	  Joystick.button(2,true);
+	  Joystick.button(3,true);
+	  Joystick.button(4,true);
+
+	  //enable manual send
+	  Joystick.useManualSend(true);
+
+	  //send same data in one report
+	  Joystick.button(1,false);
+	  Joystick.button(2,false);
+	  Joystick.button(3,false);
+	  Joystick.button(4,false);
+	  Joystick.send_now();
+  }
+}
+```
+
+#### See also
+
+* [Joystick.send_now()](#joysticksend_now)
+
+
+
+### `Joystick.send_now()`
+
+Send a HID report now. Used together with manual sending, see `Joystick.useManualSend()`.
+
+#### Syntax 
+
+```
+Joystick.send_now()
+```
+
+#### Parameters
+
+None.
+
+#### Returns
+
+None.
+
+#### Example
+
+```
+#include <Joystick.h>
+
+void setup() {
+  pinMode(2, INPUT_PULLUP);
+  Joystick.begin();
+  //enable manual sending in setup
+  Joystick.useManualSend(true);
+}
+
+void loop() {
+  if (digitalRead(2) == LOW) {
+      // update all buttons, but nothing is sent to the host
+	  for(uint8_t i = 1; i<=32; i++) Joystick.button(i,true);
+	  Joystick.X(256);
+	  Joystick.sliderLeft(0);
+	  
+	  //now send in one HID report
+	  Joystick.send_now();
+  }
+}
+```
+
+#### See also
+
+* [Joystick.useManualSend()](#joystickusemanualsend)
+
+
+### `Joystick.X()`
+
+Update X axis.
+__Note:__ If [manual send](#joystickusemanualsend) is active, the value is sent to the host only after calling [send_now](#joysticksend_now).
+__Note:__ If in 10bit mode (default), the parameter is interpreted from 0 to 1023.
+In 8bit mode from -127 to 127. The internal resolution is always 8bit. Change setting with [use8bit](#joystickuse8bit).
+
+#### Syntax 
+
+```
+Joystick.X(0)
+```
+
+#### Parameters
+
+* `val`: value from 0 to 1023 (default) or -127 to 127 (8bit mode)
+
+#### Returns
+
+None.
+
+#### Example
+
+```
+#include <Joystick.h>
+
+void setup() {
+  pinMode(2, INPUT_PULLUP);
+  Joystick.begin();
+}
+
+void loop() {
+  if (digitalRead(2) == LOW) {
+	  Joystick.X(256);
+	  delay(500);
+	  Joystick.X(512);
+  }
+}
+```
+
+#### See also
+
+* [Joystick.Y()](#joysticky)
+* [Joystick.Z()](#joystickz)
+* [Joystick.Zrotate()](#joystickrotate)
+* [Joystick.slider()](#joystickslider)
+* [Joystick.sliderLeft()](#joysticksliderleft)
+* [Joystick.sliderRight()](#joysticksliderright)
+* [Joystick.send_now()](#joysticksend_now)
+* [Joystick.position()](#joystickposition)
+* [Joystick.hat()](#joystickhat)
+* [Joystick.use8bit()](#joystickuse8bit)
+* [Joystick.useManualSend()](#joystickuseManualSend)
+
+### `Joystick.Y()`
+
+Update Y axis. Please refer to [Joystick.X()](#joystickx).
+
+### `Joystick.Z()`
+
+Update Z axis. Please refer to [Joystick.X()](#joystickx).
+
+### `Joystick.Zrotate()`
+
+Update Z rotate axis. Please refer to [Joystick.X()](#joystickx).
+
+### `Joystick.sliderLeft()`
+
+Left slider value. Please refer to [Joystick.X()](#joystickx).
+
+### `Joystick.sliderRight()`
+
+Right slider value. Please refer to [Joystick.X()](#joystickx).
+
+### `Joystick.slider()`
+
+Same as [Joystick.sliderLeft()](#joysticksliderleft).
+
+### `Joystick.position()`
+
+Sets X and Y axis in one call. If autosending is active, one report is generated. Please refer to [Joystick.X()](#joystickx).
+
+#### Syntax 
+
+```
+Joystick.position(512,512)
+```
+
+#### Parameters
+
+* `X`: value from 0 to 1023 (default) or -127 to 127 (8bit mode); for X axis
+* `Y`: value from 0 to 1023 (default) or -127 to 127 (8bit mode); for Y axis
+
+#### See also
+
+* [Joystick.X()](#joystickx)
+* [Joystick.Y()](#joysticky)
+
+### `Joystick.hat()`
+
+Set the hat value to selection angle or rest position.
+
+#### Syntax 
+
+```
+Joystick.hat(-1), // released/rest position
+```
+
+#### Parameters
+
+* `angle` Angle value from 0-360 degrees or -1 for released resting position. Mapped to 8 different directions.
@@ -0,0 +1,14 @@
+# Joystick library
+
+The Joystick functions enable a RP2040 board to act as a HID game controller.
+
+To use this library:
+
+```
+#include <Joystick.h>
+```
+
+
+## Examples
+
+* [Joystick-AllFunctions] Includes example calls for each Joystick function
@@ -0,0 +1,110 @@
+/* Benjamin Aigner, 2022 <beni@asterics-foundation.org> */
+/* Public domain / CC 0 */
+
+/** example code using all possibilities of the Joystick class
+   for the RP2040.
+*/
+
+#include <Joystick.h>
+
+void setup() {
+  Serial.begin(115200);
+  Serial.println("Use BOOTSEL to start the Joystick demo.");
+  Joystick.begin();
+}
+
+void loop() {
+  if (BOOTSEL) {
+    Serial.println("Joystick buttons");
+    for (uint8_t i = 1; i <= 32; i++) {
+      Joystick.button(i, true);
+      delay(250);
+      Joystick.button(i, false);
+      delay(10); //we need a short delay here, sending packets with less than 1ms leads to packet loss!
+    }
+    //alternativ with manual send:
+    Joystick.useManualSend(true);
+    Serial.println("Joystick buttons - manual send");
+    for (uint8_t i = 1; i <= 32; i++) {
+      Joystick.button(i, true);
+      Joystick.send_now();
+      delay(250);
+      Joystick.button(i, false);
+    }
+    Joystick.useManualSend(false);
+
+    //iterate all joystick axis
+    //Note: although you can use 0-1023 here (10bit), internally 8bits are used (-127 to 127)
+    Serial.println("Joystick X");
+    for (uint16_t i = 0; i < 1023; i++) {
+      Joystick.X(i);
+      delay(2);
+    } Joystick.X(512);
+    Serial.println("Joystick Y");
+    for (uint16_t i = 0; i < 1023; i++) {
+      Joystick.Y(i);
+      delay(2);
+    } Joystick.Y(512);
+    Serial.println("Joystick Z");
+    for (uint16_t i = 0; i < 1023; i++) {
+      Joystick.Z(i);
+      delay(2);
+    } Joystick.Z(512);
+    Serial.println("Joystick Zrotate");
+    for (uint16_t i = 0; i < 1023; i++) {
+      Joystick.Zrotate(i);
+      delay(2);
+    } Joystick.Zrotate(512);
+    Serial.println("Joystick sliderLeft");
+    for (uint16_t i = 0; i < 1023; i++) {
+      Joystick.sliderLeft(i);
+      delay(2);
+    } Joystick.sliderLeft(0);
+    Serial.println("Joystick sliderRight");
+    for (uint16_t i = 0; i < 1023; i++) {
+      Joystick.sliderRight(i);
+      delay(2);
+    } Joystick.sliderRight(0);
+    Serial.println("Joystick hat");
+    for (uint16_t i = 0; i < 360; i++) {
+      Joystick.hat(i);
+      delay(20);
+    } Joystick.hat(-1);
+
+    //use int8 mode for the axis.
+    //Note: hat is not used differently.
+    Serial.println("Now all axis in 8bit mode, -127 to 127");
+    Joystick.use8bit(true);
+    Serial.println("Joystick X");
+    for (int16_t i = -127; i < 128; i++) {
+      Joystick.X(i);
+      delay(2);
+    } Joystick.X(0);
+    Serial.println("Joystick Y");
+    for (int16_t i = -127; i < 128; i++) {
+      Joystick.Y(i);
+      delay(2);
+    } Joystick.Y(0);
+    Serial.println("Joystick Z");
+    for (int16_t i = -127; i < 128; i++) {
+      Joystick.Z(i);
+      delay(2);
+    } Joystick.Z(0);
+    Serial.println("Joystick Zrotate");
+    for (int16_t i = -127; i < 128; i++) {
+      Joystick.Zrotate(i);
+      delay(2);
+    } Joystick.Zrotate(0);
+    Serial.println("Joystick sliderLeft");
+    for (int16_t i = -127; i < 128; i++) {
+      Joystick.sliderLeft(i);
+      delay(2);
+    } Joystick.sliderLeft(0);
+    Serial.println("Joystick sliderRight");
+    for (int16_t i = -127; i < 128; i++) {
+      Joystick.sliderRight(i);
+      delay(2);
+    } Joystick.sliderRight(0);
+    Joystick.use8bit(false);
+  }
+}
@@ -0,0 +1,33 @@
+#######################################
+# Syntax Coloring Map For Joystick
+#######################################
+
+#######################################
+# Datatypes (KEYWORD1)
+#######################################
+
+Joystick	KEYWORD1
+
+#######################################
+# Methods and Functions (KEYWORD2)
+#######################################
+
+begin		KEYWORD2
+end			KEYWORD2
+use8bit		KEYWORD2
+X			KEYWORD2
+Y			KEYWORD2
+button		KEYWORD2
+position	KEYWORD2
+Z			KEYWORD2
+Zrotate		KEYWORD2
+sliderLeft	KEYWORD2
+slider		KEYWORD2
+sliderRight	KEYWORD2
+hat			KEYWORD2
+useManualSend KEYWORD2
+send_now	KEYWORD2
+
+#######################################
+# Constants (LITERAL1)
+#######################################
@@ -0,0 +1,9 @@
+name=Joystick
+version=1.0.1
+author=Benjamin Aigner
+maintainer=Benjamin Aigner <beni@asterics-foundation.org>
+sentence=Allows any RP2040 board to act as a joystick/gamepad
+paragraph=Allows the RP2040 to emulate a USB Joystick
+category=Device Control
+url=https://github.com/benjaminaigner/Joystick
+architectures=rp2040
@@ -0,0 +1,49 @@
+/*
+    Joystick.cpp
+
+    Copyright (c) 2022, Benjamin Aigner <beni@asterics-foundation.org>
+    Implementation loosely based on:
+    Mouse library from https://github.com/earlephilhower/arduino-pico
+    Joystick functions from Teensyduino https://github.com/PaulStoffregen
+
+    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
+*/
+
+#include "Joystick.h"
+#include "Arduino.h"
+#include <RP2040USB.h>
+
+#include "tusb.h"
+#include "class/hid/hid_device.h"
+
+// Weak function override to add our descriptor to the TinyUSB list
+void __USBInstallJoystick() { /* noop */ }
+
+Joystick_::Joystick_(void) {
+    // Everything set up in HID_Joystick constructor
+}
+
+
+//immediately send an HID report
+void Joystick_::send_now(void) {
+    CoreMutex m(&__usb_mutex);
+    tud_task();
+    if (tud_hid_ready()) {
+        tud_hid_n_report(0, __USBGetJoystickReportID(), &data, sizeof(data));
+    }
+    tud_task();
+}
+
+Joystick_ Joystick;
@@ -1,7 +1,7 @@
 /*
-    Keyboard_da_DK.h
+    Joystick.h

-    Copyright (c) 2021, Peter John
+    Copyright (c) 2022, Benjamin Aigner <beni@asterics-foundation.org>

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -18,27 +18,18 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */

-#ifndef KEYBOARD_DA_DK_h
-#define KEYBOARD_DA_DK_h
+#ifndef _JOYSTICK_h
+#define _JOYSTICK_h

-#include "HID.h"
+#include <HID_Joystick.h>
+#include "class/hid/hid.h"

-#if !defined(_USING_HID)
+//======================================================================
+class Joystick_ : public HID_Joystick {
+public:
+    Joystick_(void);
+    virtual void send_now(void) override;
+};
+extern Joystick_ Joystick;

-#warning "Using legacy HID core (non pluggable)"
-
-#else
-
-//================================================================================
-//================================================================================
-//  Keyboard
-
-// DA_DK keys
-#define KEY_A_RING        (136+0x2f)
-#define KEY_SLASHED_O     (136+0x34)
-#define KEY_ASH           (136+0x33)
-#define KEY_UMLAUT        (136+0x30)
-#define KEY_ACUTE_ACC     (136+0x2e)
-
-#endif
-#endif
+#endif /* _JOYSTICK_h */
@@ -27,6 +27,7 @@ sliderRight	KEYWORD2
 hat			KEYWORD2
 useManualSend KEYWORD2
 send_now	KEYWORD2
+setBattery	KEYWORD2

 #######################################
 # Constants (LITERAL1)
@@ -32,152 +32,31 @@
 //	Joystick/Gamepad

 JoystickBLE_::JoystickBLE_(void) {
-    _use8bit = false;
-    _autosend = true;
-    memset(&data, 0, sizeof(data));
-    //_X_axis = _Y_axis = _Z_axis = _Zrotate = _sliderLeft = _sliderRight = _hat = data.buttons = 0;
-}
-
-/** define the mapping of axes values
-    default: axes methods are accepting values from 0-1023 (compatibility to other Joystick libraries)
-		and are mapped internally to int8_t
-    if use8bit(true) is called, -127 to 127 values are used.*/
-void JoystickBLE_::use8bit(bool mode) {
-    _use8bit = mode;
-}
-
-//if set, the gamepad report is not automatically sent after an update of axes/buttons; use send_now to update
-void JoystickBLE_::useManualSend(bool mode) {
-    _autosend = !mode;
-}
-
-/** Maps values from 8bit signed or 10bit unsigned to report values
-
-    Depending on the setting via use8bit(), either values from 0-1023 or -127 - 127
-    are mapped.
-*/
-int JoystickBLE_::map8or10bit(int const value) {
-    if (_use8bit) {
-        if (value < -127) {
-            return -127;
-        } else if (value >  127) {
-            return 127;
-        } else {
-            return value;
-        }
-    } else {
-        if (value < 0) {
-            return 0;
-        }
-        if (value > 1023) {
-            return 1023;
-        }
-        return map(value, 0, 1023, -127, 127);
-    }
+    // Member vars set in base constructor
 }

 #define REPORT_ID 0x01
 static const uint8_t desc_joystick[] = {TUD_HID_REPORT_DESC_GAMEPAD(HID_REPORT_ID(REPORT_ID))};
-void JoystickBLE_::begin(void) {
-    PicoBluetoothBLEHID.startHID("PicoW BLE Joystick", "PicoW BLE Joystick", 0x03c4, desc_joystick, sizeof(desc_joystick));
+
+void JoystickBLE_::begin(const char *localName, const char *hidName) {
+    if (!localName) {
+        localName = "PicoW BLE Joystick";
+    }
+    if (!hidName) {
+        hidName = localName;
+    }
+    PicoBluetoothBLEHID.startHID(localName, hidName, 0x03c4, desc_joystick, sizeof(desc_joystick));
 }

-void JoystickBLE_::end(void) {
+void JoystickBLE_::end() {
    PicoBluetoothBLEHID.end();
 }

-void JoystickBLE_::button(uint8_t button, bool val) {
-    //I've no idea why, but without a second dword, it is not possible.
-    //maybe something with the alignment when using bit set/clear?!?
-    static uint32_t buttons_local = 0;
-
-    if (button >= 1 && button <= 32) {
-        if (val) {
-            buttons_local |= (1UL << (button - 1));
-        } else {
-            buttons_local &= ~(1UL << (button - 1));
-        }
-
-        data.buttons = buttons_local;
-        if (_autosend) {
-            send_now();
-        }
-    }
+void JoystickBLE_::setBattery(int lvl) {
+    PicoBluetoothBLEHID.setBattery(lvl);
 }

-void JoystickBLE_::X(int val) {
-    data.x = map8or10bit(val);
-    if (_autosend) {
-        send_now();
-    }
-}
-void JoystickBLE_::Y(int val) {
-    data.y = map8or10bit(val);
-    if (_autosend) {
-        send_now();
-    }
-}
-void JoystickBLE_::Z(int val) {
-    data.z = map8or10bit(val);
-    if (_autosend) {
-        send_now();
-    }
-}
-void JoystickBLE_::Zrotate(int val) {
-    data.rz = map8or10bit(val);
-    if (_autosend) {
-        send_now();
-    }
-}
-void JoystickBLE_::sliderLeft(int val) {
-    data.rx = map8or10bit(val);
-    if (_autosend) {
-        send_now();
-    }
-}
-void JoystickBLE_::sliderRight(int val) {
-    data.ry = map8or10bit(val);
-    if (_autosend) {
-        send_now();
-    }
-}
-
-void JoystickBLE_::slider(int val) {
-    data.rx = map8or10bit(val);
-    if (_autosend) {
-        send_now();
-    }
-}
-
-void JoystickBLE_::position(int X, int Y) {
-    data.x = map8or10bit(X);
-    data.y = map8or10bit(Y);
-    if (_autosend) {
-        send_now();
-    }
-}
-
-//compatibility: there is only one hat implemented, num parameter is ignored
-void JoystickBLE_::hat(unsigned int num, int angle) {
-    (void) num;
-    hat(angle);
-}
-
-//set the hat value, from 0-360. -1 is rest position
-void JoystickBLE_::hat(int angle) {
-    if (angle < 0) {
-        data.hat = 0;
-    }
-    if (angle >= 0 && angle <= 360) {
-        data.hat = map(angle, 0, 360, 1, 8);
-    }
-    if (_autosend) {
-        send_now();
-    }
-}
-
-//immediately send an HID report
-void JoystickBLE_::send_now(void) {
+void JoystickBLE_::send_now() {
    PicoBluetoothBLEHID.send(&data, sizeof(data));
 }

@@ -21,48 +21,16 @@

 #pragma once

-#include <Arduino.h>
+#include <HID_Joystick.h>
 #include "class/hid/hid.h"

 //======================================================================
-class JoystickBLE_ {
-private:
-    bool _autosend;
-    bool _use8bit;
-    hid_gamepad_report_t data;
-    int map8or10bit(int const value);
+class JoystickBLE_ : public HID_Joystick {
 public:
-    JoystickBLE_(void);
-    void begin(void);
-    void end(void);
-
-    //set a selected button to pressed/released
-    void button(uint8_t button, bool val);
-    //set axis values
-    void X(int val);
-    void Y(int val);
-    void position(int X, int Y);
-    void Z(int val);
-    void Zrotate(int val);
-    void sliderLeft(int val);
-    void sliderRight(int val);
-    //note: not implemented in TinyUSB gamepad, is mapped to sliderLeft.
-    void slider(int val);
-
-    //set the hat value, from 0-360. -1 is rest position
-    void hat(int angle);
-    //compatibility: there is only one hat implemented, num parameter is ignored
-    void hat(unsigned int num, int angle);
-
-
-    //if set, the gamepad report is not automatically sent after an update of axes/buttons; use send_now to update
-    void useManualSend(bool mode);
-    //immediately send an HID report
-    void send_now(void);
-    //define the mapping of axes values
-    //default: axes methods are accepting values from 0-1023 (compatibility to other Joystick libraries)
-    // and are mapped internally to int8_t
-    //if use8bit(true) is called, -127 to 127 values are used.
-    void use8bit(bool mode);
+    JoystickBLE_();
+    void begin(const char *localName = nullptr, const char *hidName = nullptr);
+    void end();
+    virtual void send_now() override;
+    void setBattery(int lvl);
 };
 extern JoystickBLE_ JoystickBLE;
@@ -10,7 +10,7 @@
 void setup() {
  Serial.begin(115200);
  Serial.println("Use BOOTSEL to start the Joystick demo.");
-  JoystickBT.begin();
+  JoystickBT.begin("PicoJoy Demo");
 }

 void loop() {
@@ -31,153 +31,29 @@
 //================================================================================
 //	Joystick/Gamepad

-JoystickBT_::JoystickBT_(void) {
-    _use8bit = false;
-    _autosend = true;
-    memset(&data, 0, sizeof(data));
-    //_X_axis = _Y_axis = _Z_axis = _Zrotate = _sliderLeft = _sliderRight = _hat = data.buttons = 0;
-}
-
-/** define the mapping of axes values
-    default: axes methods are accepting values from 0-1023 (compatibility to other Joystick libraries)
-		and are mapped internally to int8_t
-    if use8bit(true) is called, -127 to 127 values are used.*/
-void JoystickBT_::use8bit(bool mode) {
-    _use8bit = mode;
-}
-
-//if set, the gamepad report is not automatically sent after an update of axes/buttons; use send_now to update
-void JoystickBT_::useManualSend(bool mode) {
-    _autosend = !mode;
-}
-
-/** Maps values from 8bit signed or 10bit unsigned to report values
-
-    Depending on the setting via use8bit(), either values from 0-1023 or -127 - 127
-    are mapped.
-*/
-int JoystickBT_::map8or10bit(int const value) {
-    if (_use8bit) {
-        if (value < -127) {
-            return -127;
-        } else if (value >  127) {
-            return 127;
-        } else {
-            return value;
-        }
-    } else {
-        if (value < 0) {
-            return 0;
-        }
-        if (value > 1023) {
-            return 1023;
-        }
-        return map(value, 0, 1023, -127, 127);
-    }
+JoystickBT_::JoystickBT_() {
+    // HID_Joystick sets up all the member vars
 }

 #define REPORT_ID 0x01
 static const uint8_t desc_joystick[] = {TUD_HID_REPORT_DESC_GAMEPAD(HID_REPORT_ID(REPORT_ID))};
-void JoystickBT_::begin(void) {
-    PicoBluetoothHID.startHID("PicoW Joystick 00:00:00:00:00:00", "PicoW HID Joystick", 0x2508, 33, desc_joystick, sizeof(desc_joystick));
+
+void JoystickBT_::begin(const char *localName, const char *hidName) {
+    if (!localName) {
+        localName = "PicoW BT Joystick";
+    }
+    if (!hidName) {
+        hidName = localName;
+    }
+    PicoBluetoothHID.startHID(localName, hidName, 0x2508, 33, desc_joystick, sizeof(desc_joystick));
 }

-void JoystickBT_::end(void) {
+void JoystickBT_::end() {
    PicoBluetoothHID.end();
 }

-void JoystickBT_::button(uint8_t button, bool val) {
-    //I've no idea why, but without a second dword, it is not possible.
-    //maybe something with the alignment when using bit set/clear?!?
-    static uint32_t buttons_local = 0;
-
-    if (button >= 1 && button <= 32) {
-        if (val) {
-            buttons_local |= (1UL << (button - 1));
-        } else {
-            buttons_local &= ~(1UL << (button - 1));
-        }
-
-        data.buttons = buttons_local;
-        if (_autosend) {
-            send_now();
-        }
-    }
-}
-
-void JoystickBT_::X(int val) {
-    data.x = map8or10bit(val);
-    if (_autosend) {
-        send_now();
-    }
-}
-void JoystickBT_::Y(int val) {
-    data.y = map8or10bit(val);
-    if (_autosend) {
-        send_now();
-    }
-}
-void JoystickBT_::Z(int val) {
-    data.z = map8or10bit(val);
-    if (_autosend) {
-        send_now();
-    }
-}
-void JoystickBT_::Zrotate(int val) {
-    data.rz = map8or10bit(val);
-    if (_autosend) {
-        send_now();
-    }
-}
-void JoystickBT_::sliderLeft(int val) {
-    data.rx = map8or10bit(val);
-    if (_autosend) {
-        send_now();
-    }
-}
-void JoystickBT_::sliderRight(int val) {
-    data.ry = map8or10bit(val);
-    if (_autosend) {
-        send_now();
-    }
-}
-
-void JoystickBT_::slider(int val) {
-    data.rx = map8or10bit(val);
-    if (_autosend) {
-        send_now();
-    }
-}
-
-void JoystickBT_::position(int X, int Y) {
-    data.x = map8or10bit(X);
-    data.y = map8or10bit(Y);
-    if (_autosend) {
-        send_now();
-    }
-}
-
-//compatibility: there is only one hat implemented, num parameter is ignored
-void JoystickBT_::hat(unsigned int num, int angle) {
-    (void) num;
-    hat(angle);
-}
-
-//set the hat value, from 0-360. -1 is rest position
-void JoystickBT_::hat(int angle) {
-    if (angle < 0) {
-        data.hat = 0;
-    }
-    if (angle >= 0 && angle <= 360) {
-        data.hat = map(angle, 0, 360, 1, 8);
-    }
-    if (_autosend) {
-        send_now();
-    }
-}
-
 //immediately send an HID report
-void JoystickBT_::send_now(void) {
+void JoystickBT_::send_now() {
    PicoBluetoothHID.send(REPORT_ID, &data, sizeof(data));
 }

@@ -21,48 +21,15 @@

 #pragma once

-#include <Arduino.h>
+#include <HID_Joystick.h>
 #include "class/hid/hid.h"

 //======================================================================
-class JoystickBT_ {
-private:
-    bool _autosend;
-    bool _use8bit;
-    hid_gamepad_report_t data;
-    int map8or10bit(int const value);
+class JoystickBT_ : public HID_Joystick {
 public:
-    JoystickBT_(void);
-    void begin(void);
-    void end(void);
-
-    //set a selected button to pressed/released
-    void button(uint8_t button, bool val);
-    //set axis values
-    void X(int val);
-    void Y(int val);
-    void position(int X, int Y);
-    void Z(int val);
-    void Zrotate(int val);
-    void sliderLeft(int val);
-    void sliderRight(int val);
-    //note: not implemented in TinyUSB gamepad, is mapped to sliderLeft.
-    void slider(int val);
-
-    //set the hat value, from 0-360. -1 is rest position
-    void hat(int angle);
-    //compatibility: there is only one hat implemented, num parameter is ignored
-    void hat(unsigned int num, int angle);
-
-
-    //if set, the gamepad report is not automatically sent after an update of axes/buttons; use send_now to update
-    void useManualSend(bool mode);
-    //immediately send an HID report
-    void send_now(void);
-    //define the mapping of axes values
-    //default: axes methods are accepting values from 0-1023 (compatibility to other Joystick libraries)
-    // and are mapped internally to int8_t
-    //if use8bit(true) is called, -127 to 127 values are used.
-    void use8bit(bool mode);
+    JoystickBT_();
+    void begin(const char *localName = nullptr, const char *hidName = nullptr);
+    void end();
+    virtual void send_now() override;
 };
 extern JoystickBT_ JoystickBT;
@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
@@ -0,0 +1,31 @@
+:repository-owner: arduino-libraries
+:repository-name: Keyboard
+
+= {repository-name} Library for Arduino =
+
+image:https://github.com/{repository-owner}/{repository-name}/actions/workflows/check-arduino.yml/badge.svg["Check Arduino status", link="https://github.com/{repository-owner}/{repository-name}/actions/workflows/check-arduino.yml"]
+image:https://github.com/{repository-owner}/{repository-name}/actions/workflows/compile-examples.yml/badge.svg["Compile Examples status", link="https://github.com/{repository-owner}/{repository-name}/actions/workflows/compile-examples.yml"]
+image:https://github.com/{repository-owner}/{repository-name}/actions/workflows/spell-check.yml/badge.svg["Spell Check status", link="https://github.com/{repository-owner}/{repository-name}/actions/workflows/spell-check.yml"]
+
+This library allows an Arduino board with USB capabilities to act as a keyboard.
+
+For more information about this library please visit us at
+https://www.arduino.cc/reference/en/language/functions/usb/keyboard/
+
+== License ==
+
+Copyright (c) Arduino LLC. All right reserved.
+
+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
@@ -0,0 +1,32 @@
+/* Released into the public domain */
+/* Earle F. Philhower, III <earlephilhower@yahoo.com> */
+
+#include <Keyboard.h>
+
+void ledCB(bool numlock, bool capslock, bool scrolllock, bool compose, bool kana, void *cbData) {
+  (void) numlock;
+  (void) scrolllock;
+  (void) compose;
+  (void) kana;
+  (void) cbData;
+  digitalWrite(LED_BUILTIN, capslock ? HIGH : LOW);
+}
+
+void setup() {
+  Serial.begin(115200);
+  pinMode(LED_BUILTIN, OUTPUT);
+  digitalWrite(LED_BUILTIN, LOW);
+  Keyboard.onLED(ledCB);
+  Keyboard.begin();
+  delay(5000);
+  Serial.printf("Arduino USB Password Typer\n");
+  Serial.printf("Press BOOTSEL to enter your super-secure(not!) password\n\n");
+}
+
+void loop() {
+  if (BOOTSEL) {
+    Serial.println("Typing password for you...shhhh....");
+    Keyboard.print("ThisPasswordIsWeakLikeABaby");
+    while (BOOTSEL);
+  }
+}
@@ -0,0 +1,39 @@
+/*
+  Keyboard test
+
+  For the Arduino Leonardo, Micro or Due
+
+  Reads a byte from the serial port, sends a keystroke back.
+  The sent keystroke is one higher than what's received, e.g. if you send a,
+  you get b, send A you get B, and so forth.
+
+  The circuit:
+  - none
+
+  created 21 Oct 2011
+  modified 27 Mar 2012
+  by Tom Igoe
+
+  This example code is in the public domain.
+
+  https://www.arduino.cc/en/Tutorial/BuiltInExamples/KeyboardSerial
+*/
+
+#include "Keyboard.h"
+
+void setup() {
+  // open the serial port:
+  Serial.begin(9600);
+  // initialize control over the keyboard:
+  Keyboard.begin();
+}
+
+void loop() {
+  // check for incoming serial data:
+  if (Serial.available() > 0) {
+    // read incoming serial data:
+    char inChar = Serial.read();
+    // Type the next ASCII value from what you received:
+    Keyboard.write(inChar + 1);
+  }
+}
@@ -1,26 +1,22 @@
 #######################################
-# Syntax Coloring Map
+# Syntax Coloring Map For Keyboard
 #######################################

 #######################################
 # Datatypes (KEYWORD1)
 #######################################

-PicoBluetoothHID	KEYWORD1
+Keyboard	KEYWORD1

 #######################################
 # Methods and Functions (KEYWORD2)
 #######################################

-setOpenedCB	KEYWORD2
-setClosedCB	KEYWORD2
-setCanSendNowCB	KEYWORD2
-startHID	KEYWORD2
-connected	KEYWORD2
-send	KEYWORD2
-lockBluetooth	KEYWORD2
-unlockBluetooth	KEYWORD2
-getCID	KEYWORD2
+begin	KEYWORD2
+write	KEYWORD2
+press	KEYWORD2
+release	KEYWORD2
+releaseAll	KEYWORD2

 #######################################
 # Constants (LITERAL1)
@@ -0,0 +1,9 @@
+name=Keyboard
+version=1.0.3
+author=Arduino and EFP3
+maintainer=Earle F. Philhower, III <earlephilhower@yahoo.com>
+sentence=Allows a RP2040 to act as a Keyboard.
+paragraph=Port of pure Arduino Keyboard
+category=Device Control
+url=https://www.arduino.cc/reference/en/language/functions/usb/keyboard/
+architectures=rp2040
@@ -0,0 +1,59 @@
+/*
+    Keyboard.cpp
+
+    Modified by Earle F. Philhower, III <earlephilhower@yahoo.com>
+    Main Arduino Library Copyright (c) 2015, Arduino LLC
+    Original code (pre-library): Copyright (c) 2011, Peter Barrett
+
+    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
+*/
+
+#include "Keyboard.h"
+#include <RP2040USB.h>
+
+#include "tusb.h"
+#include "class/hid/hid_device.h"
+
+// Weak function override to add our descriptor to the TinyUSB list
+void __USBInstallKeyboard() { /* noop */ }
+
+//================================================================================
+//================================================================================
+//  Keyboard
+
+Keyboard_::Keyboard_(void) {
+    // Base class clears the members we care about
+}
+
+void Keyboard_::sendReport(KeyReport* keys) {
+    CoreMutex m(&__usb_mutex);
+    tud_task();
+    if (tud_hid_ready()) {
+        tud_hid_keyboard_report(__USBGetKeyboardReportID(), keys->modifiers, keys->keys);
+    }
+    tud_task();
+}
+
+extern "C" void tud_hid_set_report_cb(uint8_t instance, uint8_t report_id, hid_report_type_t report_type, uint8_t const* buffer, uint16_t bufsize) {
+    (void) report_id;
+    (void) instance;
+
+    if ((report_type == HID_REPORT_TYPE_OUTPUT) && (bufsize > 0) && (Keyboard._ledCB)) {
+        uint8_t const kbd_leds = buffer[0];
+        Keyboard._ledCB(kbd_leds & KEYBOARD_LED_NUMLOCK, kbd_leds & KEYBOARD_LED_CAPSLOCK, kbd_leds & KEYBOARD_LED_SCROLLLOCK, kbd_leds & KEYBOARD_LED_COMPOSE, kbd_leds & KEYBOARD_LED_KANA, Keyboard._ledCBdata);
+    }
+}
+
+Keyboard_ Keyboard;
@@ -1,7 +1,9 @@
 /*
-    Keyboard_sv_SE.h
+    Keyboard.h

-    Copyright (c) 2021, Peter John
+    Modified by Earle F. Philhower, III <earlephilhower@yahoo.com>
+    Main Arduino Library Copyright (c) 2015, Arduino LLC
+    Original code (pre-library): Copyright (c) 2011, Peter Barrett

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -18,27 +20,18 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */

-#ifndef KEYBOARD_SV_SE_h
-#define KEYBOARD_SV_SE_h
+#ifndef KEYBOARD_h
+#define KEYBOARD_h

-#include "HID.h"
+#include <HID_Keyboard.h>

-#if !defined(_USING_HID)
+class Keyboard_ : public HID_Keyboard {
+protected:
+    virtual void sendReport(KeyReport* keys) override;

-#warning "Using legacy HID core (non pluggable)"
-
-#else
-
-//================================================================================
-//================================================================================
-//  Keyboard
-
-// SV_SE keys
-#define KEY_A_RING        (136+0x2f)
-#define KEY_A_UMLAUT      (136+0x34)
-#define KEY_O_UMLAUT      (136+0x33)
-#define KEY_UMLAUT        (136+0x30)
-#define KEY_ACUTE_ACC     (136+0x2e)
+public:
+    Keyboard_(void);
+};
+extern Keyboard_ Keyboard;

 #endif
-#endif
@@ -15,6 +15,7 @@ void loop() {
  if (BOOTSEL) {
    Serial.println("Typing password for you...shhhh....");
    KeyboardBLE.print("ThisPasswordIsWeakLikeABaby");
+    KeyboardBLE.setBattery(random(0, 101)); // Set between 0...100%
    while (BOOTSEL);
  }
 }
@@ -17,8 +17,8 @@ write	KEYWORD2
 press	KEYWORD2
 release	KEYWORD2
 releaseAll	KEYWORD2
+setBattery	KEYWORD2

 #######################################
 # Constants (LITERAL1)
 #######################################
-
@@ -29,22 +29,32 @@
 //  Keyboard

 KeyboardBLE_::KeyboardBLE_(void) {
-    bzero(&_keyReport, sizeof(_keyReport));
-    _asciimap = KeyboardLayout_en_US;
+    // Base class clears the members we care about
 }

 #define REPORT_ID 0x01

 static const uint8_t desc_keyboard[] = {TUD_HID_REPORT_DESC_KEYBOARD(HID_REPORT_ID(REPORT_ID))};
-void KeyboardBLE_::begin(const uint8_t *layout) {
+
+void KeyboardBLE_::begin(const char *localName, const char *hidName, const uint8_t *layout) {
+    if (!localName) {
+        localName = "PicoW BLE Keyboard";
+    }
+    if (!hidName) {
+        hidName = localName;
+    }
    _asciimap = layout;
-    PicoBluetoothBLEHID.startHID("PicoW BLE Keyboard", "PicoW BLE Keyboard", 0x03c1, desc_keyboard, sizeof(desc_keyboard));
+    PicoBluetoothBLEHID.startHID(localName, hidName, 0x03c1, desc_keyboard, sizeof(desc_keyboard));
 }

 void KeyboardBLE_::end(void) {
    PicoBluetoothBLEHID.end();
 }

+void KeyboardBLE_::setBattery(int lvl) {
+    PicoBluetoothBLEHID.setBattery(lvl);
+}
+
 void KeyboardBLE_::sendReport(KeyReport* keys) {
    hid_keyboard_report_t data;
    data.modifier = keys->modifiers;
@@ -53,127 +63,4 @@ void KeyboardBLE_::sendReport(KeyReport* keys) {
    PicoBluetoothBLEHID.send(&data, sizeof(data));
 }

-// press() adds the specified key (printing, non-printing, or modifier)
-// to the persistent key report and sends the report.  Because of the way
-// USB HID works, the host acts like the key remains pressed until we
-// call release(), releaseAll(), or otherwise clear the report and resend.
-size_t KeyboardBLE_::press(uint8_t k) {
-    uint8_t i;
-    if (k >= 136) {			// it's a non-printing key (not a modifier)
-        k = k - 136;
-    } else if (k >= 128) {	// it's a modifier key
-        _keyReport.modifiers |= (1 << (k - 128));
-        k = 0;
-    } else {				// it's a printing key
-        k = pgm_read_byte(_asciimap + k);
-        if (!k) {
-            setWriteError();
-            return 0;
-        }
-        if ((k & ALT_GR) == ALT_GR) {
-            _keyReport.modifiers |= 0x40;   // AltGr = right Alt
-            k &= 0x3F;
-        } else if ((k & SHIFT) == SHIFT) {
-            _keyReport.modifiers |= 0x02;	// the left shift modifier
-            k &= 0x7F;
-        }
-        if (k == ISO_REPLACEMENT) {
-            k = ISO_KEY;
-        }
-    }
-
-    // Add k to the key report only if it's not already present
-    // and if there is an empty slot.
-    if (_keyReport.keys[0] != k && _keyReport.keys[1] != k &&
-            _keyReport.keys[2] != k && _keyReport.keys[3] != k &&
-            _keyReport.keys[4] != k && _keyReport.keys[5] != k) {
-
-        for (i = 0; i < 6; i++) {
-            if (_keyReport.keys[i] == 0x00) {
-                _keyReport.keys[i] = k;
-                break;
-            }
-        }
-        if (i == 6) {
-            setWriteError();
-            return 0;
-        }
-    }
-    sendReport(&_keyReport);
-    return 1;
-}
-
-// release() takes the specified key out of the persistent key report and
-// sends the report.  This tells the OS the key is no longer pressed and that
-// it shouldn't be repeated any more.
-size_t KeyboardBLE_::release(uint8_t k) {
-    uint8_t i;
-    if (k >= 136) {			// it's a non-printing key (not a modifier)
-        k = k - 136;
-    } else if (k >= 128) {	// it's a modifier key
-        _keyReport.modifiers &= ~(1 << (k - 128));
-        k = 0;
-    } else {				// it's a printing key
-        k = pgm_read_byte(_asciimap + k);
-        if (!k) {
-            return 0;
-        }
-        if ((k & ALT_GR) == ALT_GR) {
-            _keyReport.modifiers &= ~(0x40);   // AltGr = right Alt
-            k &= 0x3F;
-        } else if ((k & SHIFT) == SHIFT) {
-            _keyReport.modifiers &= ~(0x02);	// the left shift modifier
-            k &= 0x7F;
-        }
-        if (k == ISO_REPLACEMENT) {
-            k = ISO_KEY;
-        }
-    }
-
-    // Test the key report to see if k is present.  Clear it if it exists.
-    // Check all positions in case the key is present more than once (which it shouldn't be)
-    for (i = 0; i < 6; i++) {
-        if (0 != k && _keyReport.keys[i] == k) {
-            _keyReport.keys[i] = 0x00;
-        }
-    }
-
-    sendReport(&_keyReport);
-    return 1;
-}
-
-void KeyboardBLE_::releaseAll(void) {
-    _keyReport.keys[0] = 0;
-    _keyReport.keys[1] = 0;
-    _keyReport.keys[2] = 0;
-    _keyReport.keys[3] = 0;
-    _keyReport.keys[4] = 0;
-    _keyReport.keys[5] = 0;
-    _keyReport.modifiers = 0;
-    sendReport(&_keyReport);
-}
-
-size_t KeyboardBLE_::write(uint8_t c) {
-    uint8_t p = press(c);  // Keydown
-    delay(10);
-    release(c);            // Keyup
-    delay(10);
-    return p;              // just return the result of press() since release() almost always returns 1
-}
-
-size_t KeyboardBLE_::write(const uint8_t *buffer, size_t size) {
-    size_t n = 0;
-    while (size--) {
-        if (*buffer != '\r') {
-            if (write(*buffer)) {
-                n++;
-            } else {
-                break;
-            }
-        }
-        buffer++;
-    }
-    return n;
-}
-
 KeyboardBLE_ KeyboardBLE;
@@ -23,118 +23,16 @@
 #ifndef KEYBOARDBLE_h
 #define KEYBOARDBLE_h

-#include <Arduino.h>
+#include <HID_Keyboard.h>

-//================================================================================
-//================================================================================
-//  Keyboard
-
-// Modifiers
-#define KEY_LEFT_CTRL     0x80
-#define KEY_LEFT_SHIFT    0x81
-#define KEY_LEFT_ALT      0x82
-#define KEY_LEFT_GUI      0x83
-#define KEY_RIGHT_CTRL    0x84
-#define KEY_RIGHT_SHIFT   0x85
-#define KEY_RIGHT_ALT     0x86
-#define KEY_RIGHT_GUI     0x87
-
-// Misc keys
-#define KEY_UP_ARROW      0xDA
-#define KEY_DOWN_ARROW    0xD9
-#define KEY_LEFT_ARROW    0xD8
-#define KEY_RIGHT_ARROW   0xD7
-#define KEY_BACKSPACE     0xB2
-#define KEY_TAB           0xB3
-#define KEY_RETURN        0xB0
-#define KEY_MENU          0xED // "Keyboard Application" in USB standard
-#define KEY_ESC           0xB1
-#define KEY_INSERT        0xD1
-#define KEY_DELETE        0xD4
-#define KEY_PAGE_UP       0xD3
-#define KEY_PAGE_DOWN     0xD6
-#define KEY_HOME          0xD2
-#define KEY_END           0xD5
-#define KEY_CAPS_LOCK     0xC1
-#define KEY_PRINT_SCREEN  0xCE // Print Screen / SysRq
-#define KEY_SCROLL_LOCK   0xCF
-#define KEY_PAUSE         0xD0 // Pause / Break
-
-// Numeric keypad
-#define KEY_NUM_LOCK      0xDB
-#define KEY_KP_SLASH      0xDC
-#define KEY_KP_ASTERISK   0xDD
-#define KEY_KP_MINUS      0xDE
-#define KEY_KP_PLUS       0xDF
-#define KEY_KP_ENTER      0xE0
-#define KEY_KP_1          0xE1
-#define KEY_KP_2          0xE2
-#define KEY_KP_3          0xE3
-#define KEY_KP_4          0xE4
-#define KEY_KP_5          0xE5
-#define KEY_KP_6          0xE6
-#define KEY_KP_7          0xE7
-#define KEY_KP_8          0xE8
-#define KEY_KP_9          0xE9
-#define KEY_KP_0          0xEA
-#define KEY_KP_DOT        0xEB
-
-// Function keys
-#define KEY_F1            0xC2
-#define KEY_F2            0xC3
-#define KEY_F3            0xC4
-#define KEY_F4            0xC5
-#define KEY_F5            0xC6
-#define KEY_F6            0xC7
-#define KEY_F7            0xC8
-#define KEY_F8            0xC9
-#define KEY_F9            0xCA
-#define KEY_F10           0xCB
-#define KEY_F11           0xCC
-#define KEY_F12           0xCD
-#define KEY_F13           0xF0
-#define KEY_F14           0xF1
-#define KEY_F15           0xF2
-#define KEY_F16           0xF3
-#define KEY_F17           0xF4
-#define KEY_F18           0xF5
-#define KEY_F19           0xF6
-#define KEY_F20           0xF7
-#define KEY_F21           0xF8
-#define KEY_F22           0xF9
-#define KEY_F23           0xFA
-#define KEY_F24           0xFB
-
-// Supported keyboard layouts
-extern const uint8_t KeyboardLayout_de_DE[];
-extern const uint8_t KeyboardLayout_en_US[];
-extern const uint8_t KeyboardLayout_es_ES[];
-extern const uint8_t KeyboardLayout_fr_FR[];
-extern const uint8_t KeyboardLayout_it_IT[];
-extern const uint8_t KeyboardLayout_sv_SE[];
-extern const uint8_t KeyboardLayout_da_DK[];
-
-// Low level key report: up to 6 keys and shift, ctrl etc at once
-typedef struct {
-    uint8_t modifiers;
-    uint8_t reserved;
-    uint8_t keys[6];
-} KeyReport;
-
-class KeyboardBLE_ : public Print {
+class KeyboardBLE_ : public HID_Keyboard {
 private:
-    KeyReport _keyReport;
-    const uint8_t *_asciimap;
-    void sendReport(KeyReport* keys);
+    virtual void sendReport(KeyReport* keys) override;
 public:
    KeyboardBLE_(void);
-    void begin(const uint8_t *layout = KeyboardLayout_en_US);
+    void begin(const char *localName = nullptr, const char *hidName = nullptr, const uint8_t *layout = KeyboardLayout_en_US);
    void end(void);
-    size_t write(uint8_t k);
-    size_t write(const uint8_t *buffer, size_t size);
-    size_t press(uint8_t k);
-    size_t release(uint8_t k);
-    void releaseAll(void);
+    void setBattery(int lvl);
 };
 extern KeyboardBLE_ KeyboardBLE;

@@ -1,65 +0,0 @@
-/*
-    KeyboardLayout.h
-
-    This file is not part of the public API. It is meant to be included
-    only in Keyboard.cpp and the keyboard layout files. Layout files map
-    ASCII character codes to keyboard scan codes (technically, to USB HID
-    Usage codes), possibly altered by the SHIFT or ALT_GR modifiers.
-
-    == Creating your own layout ==
-
-    In order to create your own layout file, copy an existing layout that
-    is similar to yours, then modify it to use the correct keys. The
-    layout is an array in ASCII order. Each entry contains a scan code,
-    possibly modified by "|SHIFT" or "|ALT_GR", as in this excerpt from
-    the Italian layout:
-
-      0x35,          // bslash
-      0x30|ALT_GR,   // ]
-      0x2e|SHIFT,    // ^
-
-    Do not change the control characters (those before scan code 0x2c,
-    corresponding to space). Do not attempt to grow the table past DEL. Do
-    not use both SHIFT and ALT_GR on the same character: this is not
-    supported. Unsupported characters should have 0x00 as scan code.
-
-    For a keyboard with an ISO physical layout, use the scan codes below:
-
-      +---+---+---+---+---+---+---+---+---+---+---+---+---+-------+
-      |35 |1e |1f |20 |21 |22 |23 |24 |25 |26 |27 |2d |2e |BackSp |
-      +---+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-----+
-      | Tab |14 |1a |08 |15 |17 |1c |18 |0c |12 |13 |2f |30 | Ret |
-      +-----++--++--++--++--++--++--++--++--++--++--++--++--++    |
-      |CapsL |04 |16 |07 |09 |0a |0b |0d |0e |0f |33 |34 |31 |    |
-      +----+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+---+----+
-      |Shi.|32 |1d |1b |06 |19 |05 |11 |10 |36 |37 |38 |  Shift   |
-      +----+---++--+-+-+---+---+---+---+---+--++---+---++----+----+
-      |Ctrl|Win |Alt |                        |AlGr|Win |Menu|Ctrl|
-      +----+----+----+------------------------+----+----+----+----+
-
-    The ANSI layout is identical except that key 0x31 is above (rather
-    than next to) Return, and there is not key 0x32.
-
-    Give a unique name to the layout array, then declare it in Keyboard.h
-    with a line of the form:
-
-    extern const uint8_t KeyboardLayout_xx_YY[];
-
-    == Encoding details ==
-
-    All scan codes are less than 0x80, which makes bit 7 available to
-    signal that a modifier (Shift or AltGr) is needed to generate the
-    character. With only one exception, keys that are used with modifiers
-    have scan codes that are less than 0x40. This makes bit 6 available
-    to signal whether the modifier is Shift or AltGr. The exception is
-    0x64, the key next next to Left Shift on the ISO layout (and absent
-    from the ANSI layout). We handle it by replacing its value by 0x32 in
-    the layout arrays.
-*/
-
-#include <Arduino.h>
-
-#define SHIFT 0x80
-#define ALT_GR 0xc0
-#define ISO_KEY 0x64
-#define ISO_REPLACEMENT 0x32
@@ -1,137 +0,0 @@
-/*
-    Danish keyboard layout.
-*/
-
-#include "KeyboardLayout.h"
-
-extern const uint8_t KeyboardLayout_da_DK[128] PROGMEM = {
-    0x00,          // NUL
-    0x00,          // SOH
-    0x00,          // STX
-    0x00,          // ETX
-    0x00,          // EOT
-    0x00,          // ENQ
-    0x00,          // ACK
-    0x00,          // BEL
-    0x2a,          // BS  Backspace
-    0x2b,          // TAB Tab
-    0x28,          // LF  Enter
-    0x00,          // VT
-    0x00,          // FF
-    0x00,          // CR
-    0x00,          // SO
-    0x00,          // SI
-    0x00,          // DEL
-    0x00,          // DC1
-    0x00,          // DC2
-    0x00,          // DC3
-    0x00,          // DC4
-    0x00,          // NAK
-    0x00,          // SYN
-    0x00,          // ETB
-    0x00,          // CAN
-    0x00,          // EM
-    0x00,          // SUB
-    0x00,          // ESC
-    0x00,          // FS
-    0x00,          // GS
-    0x00,          // RS
-    0x00,          // US
-
-    0x2c,          // ' '
-    0x1e | SHIFT,  // !
-    0x1f | SHIFT,  // "
-    0x20 | SHIFT,  // #
-    0x21 | ALT_GR, // $
-    0x22 | SHIFT,  // %
-    0x23 | SHIFT,  // &
-    0x31,          // '
-    0x25 | SHIFT,  // (
-    0x26 | SHIFT,  // )
-    0x31 | SHIFT,  // *
-    0x2d,          // +
-    0x36,          // ,
-    0x38,          // -
-    0x37,          // .
-    0x24 | SHIFT,  // /
-    0x27,          // 0
-    0x1e,          // 1
-    0x1f,          // 2
-    0x20,          // 3
-    0x21,          // 4
-    0x22,          // 5
-    0x23,          // 6
-    0x24,          // 7
-    0x25,          // 8
-    0x26,          // 9
-    0x37 | SHIFT,  // :
-    0x36 | SHIFT,  // ;
-    0x32,          // <
-    0x27 | SHIFT,  // =
-    0x32 | SHIFT,  // >
-    0x2d | SHIFT,  // ?
-    0x1f | ALT_GR, // @
-    0x04 | SHIFT,  // A
-    0x05 | SHIFT,  // B
-    0x06 | SHIFT,  // C
-    0x07 | SHIFT,  // D
-    0x08 | SHIFT,  // E
-    0x09 | SHIFT,  // F
-    0x0a | SHIFT,  // G
-    0x0b | SHIFT,  // H
-    0x0c | SHIFT,  // I
-    0x0d | SHIFT,  // J
-    0x0e | SHIFT,  // K
-    0x0f | SHIFT,  // L
-    0x10 | SHIFT,  // M
-    0x11 | SHIFT,  // N
-    0x12 | SHIFT,  // O
-    0x13 | SHIFT,  // P
-    0x14 | SHIFT,  // Q
-    0x15 | SHIFT,  // R
-    0x16 | SHIFT,  // S
-    0x17 | SHIFT,  // T
-    0x18 | SHIFT,  // U
-    0x19 | SHIFT,  // V
-    0x1a | SHIFT,  // W
-    0x1b | SHIFT,  // X
-    0x1c | SHIFT,  // Y
-    0x1d | SHIFT,  // Z
-    0x25 | ALT_GR, // [
-    0x32 | ALT_GR, // bslash
-    0x26 | ALT_GR, // ]
-    0x00,          // ^  not supported (requires dead key + space)
-    0x38 | SHIFT,  // _
-    0x00,          // `  not supported (requires dead key + space)
-    0x04,          // a
-    0x05,          // b
-    0x06,          // c
-    0x07,          // d
-    0x08,          // e
-    0x09,          // f
-    0x0a,          // g
-    0x0b,          // h
-    0x0c,          // i
-    0x0d,          // j
-    0x0e,          // k
-    0x0f,          // l
-    0x10,          // m
-    0x11,          // n
-    0x12,          // o
-    0x13,          // p
-    0x14,          // q
-    0x15,          // r
-    0x16,          // s
-    0x17,          // t
-    0x18,          // u
-    0x19,          // v
-    0x1a,          // w
-    0x1b,          // x
-    0x1c,          // y
-    0x1d,          // z
-    0x24 | ALT_GR, // {
-    0x2e | ALT_GR, // |
-    0x27 | ALT_GR, // }
-    0x00,          // ~  not supported (requires dead key + space)
-    0x00           // DEL
-};
@@ -1,137 +0,0 @@
-/*
-    German keyboard layout.
-*/
-
-#include "KeyboardLayout.h"
-
-extern const uint8_t KeyboardLayout_de_DE[128] PROGMEM = {
-    0x00,          // NUL
-    0x00,          // SOH
-    0x00,          // STX
-    0x00,          // ETX
-    0x00,          // EOT
-    0x00,          // ENQ
-    0x00,          // ACK
-    0x00,          // BEL
-    0x2a,          // BS  Backspace
-    0x2b,          // TAB Tab
-    0x28,          // LF  Enter
-    0x00,          // VT
-    0x00,          // FF
-    0x00,          // CR
-    0x00,          // SO
-    0x00,          // SI
-    0x00,          // DEL
-    0x00,          // DC1
-    0x00,          // DC2
-    0x00,          // DC3
-    0x00,          // DC4
-    0x00,          // NAK
-    0x00,          // SYN
-    0x00,          // ETB
-    0x00,          // CAN
-    0x00,          // EM
-    0x00,          // SUB
-    0x00,          // ESC
-    0x00,          // FS
-    0x00,          // GS
-    0x00,          // RS
-    0x00,          // US
-
-    0x2c,          // ' '
-    0x1e | SHIFT,  // !
-    0x1f | SHIFT,  // "
-    0x31,          // #
-    0x21 | SHIFT,  // $
-    0x22 | SHIFT,  // %
-    0x23 | SHIFT,  // &
-    0x31 | SHIFT,  // '
-    0x25 | SHIFT,  // (
-    0x26 | SHIFT,  // )
-    0x30 | SHIFT,  // *
-    0x30,          // +
-    0x36,          // ,
-    0x38,          // -
-    0x37,          // .
-    0x24 | SHIFT,  // /
-    0x27,          // 0
-    0x1e,          // 1
-    0x1f,          // 2
-    0x20,          // 3
-    0x21,          // 4
-    0x22,          // 5
-    0x23,          // 6
-    0x24,          // 7
-    0x25,          // 8
-    0x26,          // 9
-    0x37 | SHIFT,  // :
-    0x36 | SHIFT,  // ;
-    0x32,          // <
-    0x27 | SHIFT,  // =
-    0x32 | SHIFT,  // >
-    0x2d | SHIFT,  // ?
-    0x14 | ALT_GR, // @
-    0x04 | SHIFT,  // A
-    0x05 | SHIFT,  // B
-    0x06 | SHIFT,  // C
-    0x07 | SHIFT,  // D
-    0x08 | SHIFT,  // E
-    0x09 | SHIFT,  // F
-    0x0a | SHIFT,  // G
-    0x0b | SHIFT,  // H
-    0x0c | SHIFT,  // I
-    0x0d | SHIFT,  // J
-    0x0e | SHIFT,  // K
-    0x0f | SHIFT,  // L
-    0x10 | SHIFT,  // M
-    0x11 | SHIFT,  // N
-    0x12 | SHIFT,  // O
-    0x13 | SHIFT,  // P
-    0x14 | SHIFT,  // Q
-    0x15 | SHIFT,  // R
-    0x16 | SHIFT,  // S
-    0x17 | SHIFT,  // T
-    0x18 | SHIFT,  // U
-    0x19 | SHIFT,  // V
-    0x1a | SHIFT,  // W
-    0x1b | SHIFT,  // X
-    0x1d | SHIFT,  // Y
-    0x1c | SHIFT,  // Z
-    0x25 | ALT_GR, // [
-    0x2d | ALT_GR, // bslash
-    0x26 | ALT_GR, // ]
-    0x00,          // ^  not supported (requires dead key + space)
-    0x38 | SHIFT,  // _
-    0x00,          // `  not supported (requires dead key + space)
-    0x04,          // a
-    0x05,          // b
-    0x06,          // c
-    0x07,          // d
-    0x08,          // e
-    0x09,          // f
-    0x0a,          // g
-    0x0b,          // h
-    0x0c,          // i
-    0x0d,          // j
-    0x0e,          // k
-    0x0f,          // l
-    0x10,          // m
-    0x11,          // n
-    0x12,          // o
-    0x13,          // p
-    0x14,          // q
-    0x15,          // r
-    0x16,          // s
-    0x17,          // t
-    0x18,          // u
-    0x19,          // v
-    0x1a,          // w
-    0x1b,          // x
-    0x1d,          // y
-    0x1c,          // z
-    0x24 | ALT_GR, // {
-    0x32 | ALT_GR, // |
-    0x27 | ALT_GR, // }
-    0x30 | ALT_GR, // ~
-    0x00           // DEL
-};
@@ -1,137 +0,0 @@
-/*
-    Standard US keyboard layout.
-*/
-
-#include "KeyboardLayout.h"
-
-extern const uint8_t KeyboardLayout_en_US[128] PROGMEM = {
-    0x00,          // NUL
-    0x00,          // SOH
-    0x00,          // STX
-    0x00,          // ETX
-    0x00,          // EOT
-    0x00,          // ENQ
-    0x00,          // ACK
-    0x00,          // BEL
-    0x2a,          // BS  Backspace
-    0x2b,          // TAB Tab
-    0x28,          // LF  Enter
-    0x00,          // VT
-    0x00,          // FF
-    0x00,          // CR
-    0x00,          // SO
-    0x00,          // SI
-    0x00,          // DEL
-    0x00,          // DC1
-    0x00,          // DC2
-    0x00,          // DC3
-    0x00,          // DC4
-    0x00,          // NAK
-    0x00,          // SYN
-    0x00,          // ETB
-    0x00,          // CAN
-    0x00,          // EM
-    0x00,          // SUB
-    0x00,          // ESC
-    0x00,          // FS
-    0x00,          // GS
-    0x00,          // RS
-    0x00,          // US
-
-    0x2c,          // ' '
-    0x1e | SHIFT,  // !
-    0x34 | SHIFT,  // "
-    0x20 | SHIFT,  // #
-    0x21 | SHIFT,  // $
-    0x22 | SHIFT,  // %
-    0x24 | SHIFT,  // &
-    0x34,          // '
-    0x26 | SHIFT,  // (
-    0x27 | SHIFT,  // )
-    0x25 | SHIFT,  // *
-    0x2e | SHIFT,  // +
-    0x36,          // ,
-    0x2d,          // -
-    0x37,          // .
-    0x38,          // /
-    0x27,          // 0
-    0x1e,          // 1
-    0x1f,          // 2
-    0x20,          // 3
-    0x21,          // 4
-    0x22,          // 5
-    0x23,          // 6
-    0x24,          // 7
-    0x25,          // 8
-    0x26,          // 9
-    0x33 | SHIFT,  // :
-    0x33,          // ;
-    0x36 | SHIFT,  // <
-    0x2e,          // =
-    0x37 | SHIFT,  // >
-    0x38 | SHIFT,  // ?
-    0x1f | SHIFT,  // @
-    0x04 | SHIFT,  // A
-    0x05 | SHIFT,  // B
-    0x06 | SHIFT,  // C
-    0x07 | SHIFT,  // D
-    0x08 | SHIFT,  // E
-    0x09 | SHIFT,  // F
-    0x0a | SHIFT,  // G
-    0x0b | SHIFT,  // H
-    0x0c | SHIFT,  // I
-    0x0d | SHIFT,  // J
-    0x0e | SHIFT,  // K
-    0x0f | SHIFT,  // L
-    0x10 | SHIFT,  // M
-    0x11 | SHIFT,  // N
-    0x12 | SHIFT,  // O
-    0x13 | SHIFT,  // P
-    0x14 | SHIFT,  // Q
-    0x15 | SHIFT,  // R
-    0x16 | SHIFT,  // S
-    0x17 | SHIFT,  // T
-    0x18 | SHIFT,  // U
-    0x19 | SHIFT,  // V
-    0x1a | SHIFT,  // W
-    0x1b | SHIFT,  // X
-    0x1c | SHIFT,  // Y
-    0x1d | SHIFT,  // Z
-    0x2f,          // [
-    0x31,          // bslash
-    0x30,          // ]
-    0x23 | SHIFT,  // ^
-    0x2d | SHIFT,  // _
-    0x35,          // `
-    0x04,          // a
-    0x05,          // b
-    0x06,          // c
-    0x07,          // d
-    0x08,          // e
-    0x09,          // f
-    0x0a,          // g
-    0x0b,          // h
-    0x0c,          // i
-    0x0d,          // j
-    0x0e,          // k
-    0x0f,          // l
-    0x10,          // m
-    0x11,          // n
-    0x12,          // o
-    0x13,          // p
-    0x14,          // q
-    0x15,          // r
-    0x16,          // s
-    0x17,          // t
-    0x18,          // u
-    0x19,          // v
-    0x1a,          // w
-    0x1b,          // x
-    0x1c,          // y
-    0x1d,          // z
-    0x2f | SHIFT,  // {
-    0x31 | SHIFT,  // |
-    0x30 | SHIFT,  // }
-    0x35 | SHIFT,  // ~
-    0x00           // DEL
-};
@@ -1,137 +0,0 @@
-/*
-    Spanish keyboard layout.
-*/
-
-#include "KeyboardLayout.h"
-
-extern const uint8_t KeyboardLayout_es_ES[128] PROGMEM = {
-    0x00,          // NUL
-    0x00,          // SOH
-    0x00,          // STX
-    0x00,          // ETX
-    0x00,          // EOT
-    0x00,          // ENQ
-    0x00,          // ACK
-    0x00,          // BEL
-    0x2a,          // BS  Backspace
-    0x2b,          // TAB Tab
-    0x28,          // LF  Enter
-    0x00,          // VT
-    0x00,          // FF
-    0x00,          // CR
-    0x00,          // SO
-    0x00,          // SI
-    0x00,          // DEL
-    0x00,          // DC1
-    0x00,          // DC2
-    0x00,          // DC3
-    0x00,          // DC4
-    0x00,          // NAK
-    0x00,          // SYN
-    0x00,          // ETB
-    0x00,          // CAN
-    0x00,          // EM
-    0x00,          // SUB
-    0x00,          // ESC
-    0x00,          // FS
-    0x00,          // GS
-    0x00,          // RS
-    0x00,          // US
-
-    0x2c,          // ' '
-    0x1e | SHIFT,  // !
-    0x1f | SHIFT,  // "
-    0x20 | ALT_GR, // #
-    0x21 | SHIFT,  // $
-    0x22 | SHIFT,  // %
-    0x23 | SHIFT,  // &
-    0x2d,          // '
-    0x25 | SHIFT,  // (
-    0x26 | SHIFT,  // )
-    0x30 | SHIFT,  // *
-    0x30,          // +
-    0x36,          // ,
-    0x38,          // -
-    0x37,          // .
-    0x24 | SHIFT,  // /
-    0x27,          // 0
-    0x1e,          // 1
-    0x1f,          // 2
-    0x20,          // 3
-    0x21,          // 4
-    0x22,          // 5
-    0x23,          // 6
-    0x24,          // 7
-    0x25,          // 8
-    0x26,          // 9
-    0x37 | SHIFT,  // :
-    0x36 | SHIFT,  // ;
-    0x32,          // <
-    0x27 | SHIFT,  // =
-    0x32 | SHIFT,  // >
-    0x2d | SHIFT,  // ?
-    0x1f | ALT_GR, // @
-    0x04 | SHIFT,  // A
-    0x05 | SHIFT,  // B
-    0x06 | SHIFT,  // C
-    0x07 | SHIFT,  // D
-    0x08 | SHIFT,  // E
-    0x09 | SHIFT,  // F
-    0x0a | SHIFT,  // G
-    0x0b | SHIFT,  // H
-    0x0c | SHIFT,  // I
-    0x0d | SHIFT,  // J
-    0x0e | SHIFT,  // K
-    0x0f | SHIFT,  // L
-    0x10 | SHIFT,  // M
-    0x11 | SHIFT,  // N
-    0x12 | SHIFT,  // O
-    0x13 | SHIFT,  // P
-    0x14 | SHIFT,  // Q
-    0x15 | SHIFT,  // R
-    0x16 | SHIFT,  // S
-    0x17 | SHIFT,  // T
-    0x18 | SHIFT,  // U
-    0x19 | SHIFT,  // V
-    0x1a | SHIFT,  // W
-    0x1b | SHIFT,  // X
-    0x1c | SHIFT,  // Y
-    0x1d | SHIFT,  // Z
-    0x2f | ALT_GR, // [
-    0x35 | ALT_GR, // bslash
-    0x30 | ALT_GR, // ]
-    0x00,          // ^  not supported (requires dead key + space)
-    0x38 | SHIFT,  // _
-    0x00,          // `  not supported (requires dead key + space)
-    0x04,          // a
-    0x05,          // b
-    0x06,          // c
-    0x07,          // d
-    0x08,          // e
-    0x09,          // f
-    0x0a,          // g
-    0x0b,          // h
-    0x0c,          // i
-    0x0d,          // j
-    0x0e,          // k
-    0x0f,          // l
-    0x10,          // m
-    0x11,          // n
-    0x12,          // o
-    0x13,          // p
-    0x14,          // q
-    0x15,          // r
-    0x16,          // s
-    0x17,          // t
-    0x18,          // u
-    0x19,          // v
-    0x1a,          // w
-    0x1b,          // x
-    0x1c,          // y
-    0x1d,          // z
-    0x34 | ALT_GR, // {
-    0x1e | ALT_GR, // |
-    0x31 | ALT_GR, // }
-    0x00,          // ~  not supported (requires dead key + space)
-    0x00           // DEL
-};
@@ -1,137 +0,0 @@
-/*
-    Traditional (not AFNOR) French keyboard layout.
-*/
-
-#include "KeyboardLayout.h"
-
-extern const uint8_t KeyboardLayout_fr_FR[128] PROGMEM = {
-    0x00,          // NUL
-    0x00,          // SOH
-    0x00,          // STX
-    0x00,          // ETX
-    0x00,          // EOT
-    0x00,          // ENQ
-    0x00,          // ACK
-    0x00,          // BEL
-    0x2a,          // BS  Backspace
-    0x2b,          // TAB Tab
-    0x28,          // LF  Enter
-    0x00,          // VT
-    0x00,          // FF
-    0x00,          // CR
-    0x00,          // SO
-    0x00,          // SI
-    0x00,          // DEL
-    0x00,          // DC1
-    0x00,          // DC2
-    0x00,          // DC3
-    0x00,          // DC4
-    0x00,          // NAK
-    0x00,          // SYN
-    0x00,          // ETB
-    0x00,          // CAN
-    0x00,          // EM
-    0x00,          // SUB
-    0x00,          // ESC
-    0x00,          // FS
-    0x00,          // GS
-    0x00,          // RS
-    0x00,          // US
-
-    0x2c,          // ' '
-    0x38,          // !
-    0x20,          // "
-    0x20 | ALT_GR, // #
-    0x30,          // $
-    0x34 | SHIFT,  // %
-    0x1E,          // &
-    0x21,          // '
-    0x22,          // (
-    0x2d,          // )
-    0x31,          // *
-    0x2e | SHIFT,  // +
-    0x10,          // ,
-    0x23,          // -
-    0x36 | SHIFT,  // .
-    0x37 | SHIFT,  // /
-    0x27 | SHIFT,  // 0
-    0x1e | SHIFT,  // 1
-    0x1f | SHIFT,  // 2
-    0x20 | SHIFT,  // 3
-    0x21 | SHIFT,  // 4
-    0x22 | SHIFT,  // 5
-    0x23 | SHIFT,  // 6
-    0x24 | SHIFT,  // 7
-    0x25 | SHIFT,  // 8
-    0x26 | SHIFT,  // 9
-    0x37,          // :
-    0x36,          // ;
-    0x32,          // <
-    0x2e,          // =
-    0x32 | SHIFT,  // >
-    0x10 | SHIFT,  // ?
-    0x27 | ALT_GR, // @
-    0x14 | SHIFT,  // A
-    0x05 | SHIFT,  // B
-    0x06 | SHIFT,  // C
-    0x07 | SHIFT,  // D
-    0x08 | SHIFT,  // E
-    0x09 | SHIFT,  // F
-    0x0a | SHIFT,  // G
-    0x0b | SHIFT,  // H
-    0x0c | SHIFT,  // I
-    0x0d | SHIFT,  // J
-    0x0e | SHIFT,  // K
-    0x0f | SHIFT,  // L
-    0x33 | SHIFT,  // M
-    0x11 | SHIFT,  // N
-    0x12 | SHIFT,  // O
-    0x13 | SHIFT,  // P
-    0x04 | SHIFT,  // Q
-    0x15 | SHIFT,  // R
-    0x16 | SHIFT,  // S
-    0x17 | SHIFT,  // T
-    0x18 | SHIFT,  // U
-    0x19 | SHIFT,  // V
-    0x1d | SHIFT,  // W
-    0x1b | SHIFT,  // X
-    0x1c | SHIFT,  // Y
-    0x1a | SHIFT,  // Z
-    0x22 | ALT_GR, // [
-    0x25 | ALT_GR, // bslash
-    0x2d | ALT_GR, // ]
-    0x26 | ALT_GR, // ^
-    0x25,          // _
-    0x24 | ALT_GR, // `
-    0x14,          // a
-    0x05,          // b
-    0x06,          // c
-    0x07,          // d
-    0x08,          // e
-    0x09,          // f
-    0x0a,          // g
-    0x0b,          // h
-    0x0c,          // i
-    0x0d,          // j
-    0x0e,          // k
-    0x0f,          // l
-    0x33,          // m
-    0x11,          // n
-    0x12,          // o
-    0x13,          // p
-    0x04,          // q
-    0x15,          // r
-    0x16,          // s
-    0x17,          // t
-    0x18,          // u
-    0x19,          // v
-    0x1d,          // w
-    0x1b,          // x
-    0x1c,          // y
-    0x1a,          // z
-    0x21 | ALT_GR, // {
-    0x23 | ALT_GR, // |
-    0x2e | ALT_GR, // }
-    0x1f | ALT_GR, // ~
-    0x00           // DEL
-};
@@ -1,137 +0,0 @@
-/*
-    Italian keyboard layout.
-*/
-
-#include "KeyboardLayout.h"
-
-extern const uint8_t KeyboardLayout_it_IT[128] PROGMEM = {
-    0x00,          // NUL
-    0x00,          // SOH
-    0x00,          // STX
-    0x00,          // ETX
-    0x00,          // EOT
-    0x00,          // ENQ
-    0x00,          // ACK
-    0x00,          // BEL
-    0x2a,          // BS  Backspace
-    0x2b,          // TAB Tab
-    0x28,          // LF  Enter
-    0x00,          // VT
-    0x00,          // FF
-    0x00,          // CR
-    0x00,          // SO
-    0x00,          // SI
-    0x00,          // DEL
-    0x00,          // DC1
-    0x00,          // DC2
-    0x00,          // DC3
-    0x00,          // DC4
-    0x00,          // NAK
-    0x00,          // SYN
-    0x00,          // ETB
-    0x00,          // CAN
-    0x00,          // EM
-    0x00,          // SUB
-    0x00,          // ESC
-    0x00,          // FS
-    0x00,          // GS
-    0x00,          // RS
-    0x00,          // US
-
-    0x2c,          // ' '
-    0x1e | SHIFT,  // !
-    0x1f | SHIFT,  // "
-    0x34 | ALT_GR, // #
-    0x21 | SHIFT,  // $
-    0x22 | SHIFT,  // %
-    0x23 | SHIFT,  // &
-    0x2d,          // '
-    0x25 | SHIFT,  // (
-    0x26 | SHIFT,  // )
-    0x30 | SHIFT,  // *
-    0x30,          // +
-    0x36,          // ,
-    0x38,          // -
-    0x37,          // .
-    0x24 | SHIFT,  // /
-    0x27,          // 0
-    0x1e,          // 1
-    0x1f,          // 2
-    0x20,          // 3
-    0x21,          // 4
-    0x22,          // 5
-    0x23,          // 6
-    0x24,          // 7
-    0x25,          // 8
-    0x26,          // 9
-    0x37 | SHIFT,  // :
-    0x36 | SHIFT,  // ;
-    0x32,          // <
-    0x27 | SHIFT,  // =
-    0x32 | SHIFT,  // >
-    0x2d | SHIFT,  // ?
-    0x33 | ALT_GR, // @
-    0x04 | SHIFT,  // A
-    0x05 | SHIFT,  // B
-    0x06 | SHIFT,  // C
-    0x07 | SHIFT,  // D
-    0x08 | SHIFT,  // E
-    0x09 | SHIFT,  // F
-    0x0a | SHIFT,  // G
-    0x0b | SHIFT,  // H
-    0x0c | SHIFT,  // I
-    0x0d | SHIFT,  // J
-    0x0e | SHIFT,  // K
-    0x0f | SHIFT,  // L
-    0x10 | SHIFT,  // M
-    0x11 | SHIFT,  // N
-    0x12 | SHIFT,  // O
-    0x13 | SHIFT,  // P
-    0x14 | SHIFT,  // Q
-    0x15 | SHIFT,  // R
-    0x16 | SHIFT,  // S
-    0x17 | SHIFT,  // T
-    0x18 | SHIFT,  // U
-    0x19 | SHIFT,  // V
-    0x1a | SHIFT,  // W
-    0x1b | SHIFT,  // X
-    0x1c | SHIFT,  // Y
-    0x1d | SHIFT,  // Z
-    0x2f | ALT_GR, // [
-    0x35,          // bslash
-    0x30 | ALT_GR, // ]
-    0x2e | SHIFT,  // ^
-    0x38 | SHIFT,  // _
-    0x00,          // `  not in this layout
-    0x04,          // a
-    0x05,          // b
-    0x06,          // c
-    0x07,          // d
-    0x08,          // e
-    0x09,          // f
-    0x0a,          // g
-    0x0b,          // h
-    0x0c,          // i
-    0x0d,          // j
-    0x0e,          // k
-    0x0f,          // l
-    0x10,          // m
-    0x11,          // n
-    0x12,          // o
-    0x13,          // p
-    0x14,          // q
-    0x15,          // r
-    0x16,          // s
-    0x17,          // t
-    0x18,          // u
-    0x19,          // v
-    0x1a,          // w
-    0x1b,          // x
-    0x1c,          // y
-    0x1d,          // z
-    0x00,          // {  not supported (requires AltGr+Shift)
-    0x35 | SHIFT,  // |
-    0x00,          // }  not supported (requires AltGr+Shift)
-    0x00,          // ~  not in this layout
-    0x00           // DEL
-};
@@ -1,137 +0,0 @@
-/*
-    Swedish keyboard layout.
-*/
-
-#include "KeyboardLayout.h"
-
-extern const uint8_t KeyboardLayout_sv_SE[128] PROGMEM = {
-    0x00,          // NUL
-    0x00,          // SOH
-    0x00,          // STX
-    0x00,          // ETX
-    0x00,          // EOT
-    0x00,          // ENQ
-    0x00,          // ACK
-    0x00,          // BEL
-    0x2a,          // BS  Backspace
-    0x2b,          // TAB Tab
-    0x28,          // LF  Enter
-    0x00,          // VT
-    0x00,          // FF
-    0x00,          // CR
-    0x00,          // SO
-    0x00,          // SI
-    0x00,          // DEL
-    0x00,          // DC1
-    0x00,          // DC2
-    0x00,          // DC3
-    0x00,          // DC4
-    0x00,          // NAK
-    0x00,          // SYN
-    0x00,          // ETB
-    0x00,          // CAN
-    0x00,          // EM
-    0x00,          // SUB
-    0x00,          // ESC
-    0x00,          // FS
-    0x00,          // GS
-    0x00,          // RS
-    0x00,          // US
-
-    0x2c,          // ' '
-    0x1e | SHIFT,  // !
-    0x1f | SHIFT,  // "
-    0x20 | SHIFT,  // #
-    0x21 | ALT_GR,  // $
-    0x22 | SHIFT,  // %
-    0x23 | SHIFT,  // &
-    0x31,          // '
-    0x25 | SHIFT,  // (
-    0x26 | SHIFT,  // )
-    0x31 | SHIFT,  // *
-    0x2d,          // +
-    0x36,          // ,
-    0x38,          // -
-    0x37,          // .
-    0x24 | SHIFT,  // /
-    0x27,          // 0
-    0x1e,          // 1
-    0x1f,          // 2
-    0x20,          // 3
-    0x21,          // 4
-    0x22,          // 5
-    0x23,          // 6
-    0x24,          // 7
-    0x25,          // 8
-    0x26,          // 9
-    0x37 | SHIFT,  // :
-    0x36 | SHIFT,  // ;
-    0x32,          // <
-    0x27 | SHIFT,  // =
-    0x32 | SHIFT,  // >
-    0x2d | SHIFT,  // ?
-    0x1f | ALT_GR, // @
-    0x04 | SHIFT,  // A
-    0x05 | SHIFT,  // B
-    0x06 | SHIFT,  // C
-    0x07 | SHIFT,  // D
-    0x08 | SHIFT,  // E
-    0x09 | SHIFT,  // F
-    0x0a | SHIFT,  // G
-    0x0b | SHIFT,  // H
-    0x0c | SHIFT,  // I
-    0x0d | SHIFT,  // J
-    0x0e | SHIFT,  // K
-    0x0f | SHIFT,  // L
-    0x10 | SHIFT,  // M
-    0x11 | SHIFT,  // N
-    0x12 | SHIFT,  // O
-    0x13 | SHIFT,  // P
-    0x14 | SHIFT,  // Q
-    0x15 | SHIFT,  // R
-    0x16 | SHIFT,  // S
-    0x17 | SHIFT,  // T
-    0x18 | SHIFT,  // U
-    0x19 | SHIFT,  // V
-    0x1a | SHIFT,  // W
-    0x1b | SHIFT,  // X
-    0x1c | SHIFT,  // Y
-    0x1d | SHIFT,  // Z
-    0x25 | ALT_GR, // [
-    0x2d | ALT_GR, // bslash
-    0x26 | ALT_GR, // ]
-    0x00,          // ^  not supported (requires dead key + space)
-    0x38 | SHIFT,  // _
-    0x00,          // `  not supported (requires dead key + space)
-    0x04,          // a
-    0x05,          // b
-    0x06,          // c
-    0x07,          // d
-    0x08,          // e
-    0x09,          // f
-    0x0a,          // g
-    0x0b,          // h
-    0x0c,          // i
-    0x0d,          // j
-    0x0e,          // k
-    0x0f,          // l
-    0x10,          // m
-    0x11,          // n
-    0x12,          // o
-    0x13,          // p
-    0x14,          // q
-    0x15,          // r
-    0x16,          // s
-    0x17,          // t
-    0x18,          // u
-    0x19,          // v
-    0x1a,          // w
-    0x1b,          // x
-    0x1c,          // y
-    0x1d,          // z
-    0x24 | ALT_GR, // {
-    0x32 | ALT_GR, // |
-    0x27 | ALT_GR, // }
-    0x00,          // ~  not supported (requires dead key + space)
-    0x00           // DEL
-};
@@ -3,8 +3,21 @@

 #include <KeyboardBT.h>

+void ledCB(bool numlock, bool capslock, bool scrolllock, bool compose, bool kana, void *cbData) {
+  (void) numlock;
+  (void) scrolllock;
+  (void) compose;
+  (void) kana;
+  (void) cbData;
+  digitalWrite(LED_BUILTIN, capslock ? HIGH : LOW);
+}
+
 void setup() {
  Serial.begin(115200);
+  KeyboardBT.begin("PicoW Password");
+  pinMode(LED_BUILTIN, OUTPUT);
+  digitalWrite(LED_BUILTIN, LOW);
+  KeyboardBT.onLED(ledCB);
  KeyboardBT.begin();
  delay(5000);
  Serial.printf("Arduino USB Password Typer\n");
@@ -29,16 +29,34 @@
 //  Keyboard

 KeyboardBT_::KeyboardBT_(void) {
-    bzero(&_keyReport, sizeof(_keyReport));
-    _asciimap = KeyboardLayout_en_US;
+    // Base class clears the members we care about
 }

 #define REPORT_ID 0x01

 static const uint8_t desc_keyboard[] = {TUD_HID_REPORT_DESC_KEYBOARD(HID_REPORT_ID(REPORT_ID))};
-void KeyboardBT_::begin(const uint8_t *layout) {
+
+static void _hidReportCB(uint16_t cid, hid_report_type_t report_type, uint16_t report_id, int report_size, uint8_t *report) {
+    (void) cid;
+    (void) report_id;
+    if ((report_type == HID_REPORT_TYPE_OUTPUT) && (report_size > 0) && (KeyboardBT._ledCB)) {
+        uint8_t const kbd_leds = report[0];
+        KeyboardBT._ledCB(kbd_leds & KEYBOARD_LED_NUMLOCK, kbd_leds & KEYBOARD_LED_CAPSLOCK, kbd_leds & KEYBOARD_LED_SCROLLLOCK, kbd_leds & KEYBOARD_LED_COMPOSE, kbd_leds & KEYBOARD_LED_KANA, KeyboardBT._ledCBdata);
+    }
+}
+
+void KeyboardBT_::begin(const char *localName, const char *hidName, const uint8_t *layout) {
+    if (!localName) {
+        localName = "PicoW BT Keyboard";
+    }
+    if (!hidName) {
+        hidName = localName;
+    }
    _asciimap = layout;
-    PicoBluetoothHID.startHID("PicoW Keyboard 00:00:00:00:00:00", "PicoW HID Keyboard", 0x2540, 33, desc_keyboard, sizeof(desc_keyboard));
+    // Required because the hid_report_type_t overlap in BTStack and TUSB
+    auto *fcn = (void (*)(short unsigned int, hid_report_type_t_bt, short unsigned int, int, unsigned char*))_hidReportCB;
+    hid_device_register_report_data_callback(fcn);
+    PicoBluetoothHID.startHID(localName, hidName, 0x2540, 33, desc_keyboard, sizeof(desc_keyboard));
 }

 void KeyboardBT_::end(void) {
@@ -53,127 +71,4 @@ void KeyboardBT_::sendReport(KeyReport* keys) {
    PicoBluetoothHID.send(REPORT_ID, &data, sizeof(data));
 }

-// press() adds the specified key (printing, non-printing, or modifier)
-// to the persistent key report and sends the report.  Because of the way
-// USB HID works, the host acts like the key remains pressed until we
-// call release(), releaseAll(), or otherwise clear the report and resend.
-size_t KeyboardBT_::press(uint8_t k) {
-    uint8_t i;
-    if (k >= 136) {			// it's a non-printing key (not a modifier)
-        k = k - 136;
-    } else if (k >= 128) {	// it's a modifier key
-        _keyReport.modifiers |= (1 << (k - 128));
-        k = 0;
-    } else {				// it's a printing key
-        k = pgm_read_byte(_asciimap + k);
-        if (!k) {
-            setWriteError();
-            return 0;
-        }
-        if ((k & ALT_GR) == ALT_GR) {
-            _keyReport.modifiers |= 0x40;   // AltGr = right Alt
-            k &= 0x3F;
-        } else if ((k & SHIFT) == SHIFT) {
-            _keyReport.modifiers |= 0x02;	// the left shift modifier
-            k &= 0x7F;
-        }
-        if (k == ISO_REPLACEMENT) {
-            k = ISO_KEY;
-        }
-    }
-
-    // Add k to the key report only if it's not already present
-    // and if there is an empty slot.
-    if (_keyReport.keys[0] != k && _keyReport.keys[1] != k &&
-            _keyReport.keys[2] != k && _keyReport.keys[3] != k &&
-            _keyReport.keys[4] != k && _keyReport.keys[5] != k) {
-
-        for (i = 0; i < 6; i++) {
-            if (_keyReport.keys[i] == 0x00) {
-                _keyReport.keys[i] = k;
-                break;
-            }
-        }
-        if (i == 6) {
-            setWriteError();
-            return 0;
-        }
-    }
-    sendReport(&_keyReport);
-    return 1;
-}
-
-// release() takes the specified key out of the persistent key report and
-// sends the report.  This tells the OS the key is no longer pressed and that
-// it shouldn't be repeated any more.
-size_t KeyboardBT_::release(uint8_t k) {
-    uint8_t i;
-    if (k >= 136) {			// it's a non-printing key (not a modifier)
-        k = k - 136;
-    } else if (k >= 128) {	// it's a modifier key
-        _keyReport.modifiers &= ~(1 << (k - 128));
-        k = 0;
-    } else {				// it's a printing key
-        k = pgm_read_byte(_asciimap + k);
-        if (!k) {
-            return 0;
-        }
-        if ((k & ALT_GR) == ALT_GR) {
-            _keyReport.modifiers &= ~(0x40);   // AltGr = right Alt
-            k &= 0x3F;
-        } else if ((k & SHIFT) == SHIFT) {
-            _keyReport.modifiers &= ~(0x02);	// the left shift modifier
-            k &= 0x7F;
-        }
-        if (k == ISO_REPLACEMENT) {
-            k = ISO_KEY;
-        }
-    }
-
-    // Test the key report to see if k is present.  Clear it if it exists.
-    // Check all positions in case the key is present more than once (which it shouldn't be)
-    for (i = 0; i < 6; i++) {
-        if (0 != k && _keyReport.keys[i] == k) {
-            _keyReport.keys[i] = 0x00;
-        }
-    }
-
-    sendReport(&_keyReport);
-    return 1;
-}
-
-void KeyboardBT_::releaseAll(void) {
-    _keyReport.keys[0] = 0;
-    _keyReport.keys[1] = 0;
-    _keyReport.keys[2] = 0;
-    _keyReport.keys[3] = 0;
-    _keyReport.keys[4] = 0;
-    _keyReport.keys[5] = 0;
-    _keyReport.modifiers = 0;
-    sendReport(&_keyReport);
-}
-
-size_t KeyboardBT_::write(uint8_t c) {
-    uint8_t p = press(c);  // Keydown
-    delay(10);
-    release(c);            // Keyup
-    delay(10);
-    return p;              // just return the result of press() since release() almost always returns 1
-}
-
-size_t KeyboardBT_::write(const uint8_t *buffer, size_t size) {
-    size_t n = 0;
-    while (size--) {
-        if (*buffer != '\r') {
-            if (write(*buffer)) {
-                n++;
-            } else {
-                break;
-            }
-        }
-        buffer++;
-    }
-    return n;
-}
-
 KeyboardBT_ KeyboardBT;
@@ -23,118 +23,15 @@
 #ifndef KEYBOARDBT_h
 #define KEYBOARDBT_h

-#include <Arduino.h>
+#include <HID_Keyboard.h>

-//================================================================================
-//================================================================================
-//  Keyboard
-
-// Modifiers
-#define KEY_LEFT_CTRL     0x80
-#define KEY_LEFT_SHIFT    0x81
-#define KEY_LEFT_ALT      0x82
-#define KEY_LEFT_GUI      0x83
-#define KEY_RIGHT_CTRL    0x84
-#define KEY_RIGHT_SHIFT   0x85
-#define KEY_RIGHT_ALT     0x86
-#define KEY_RIGHT_GUI     0x87
-
-// Misc keys
-#define KEY_UP_ARROW      0xDA
-#define KEY_DOWN_ARROW    0xD9
-#define KEY_LEFT_ARROW    0xD8
-#define KEY_RIGHT_ARROW   0xD7
-#define KEY_BACKSPACE     0xB2
-#define KEY_TAB           0xB3
-#define KEY_RETURN        0xB0
-#define KEY_MENU          0xED // "Keyboard Application" in USB standard
-#define KEY_ESC           0xB1
-#define KEY_INSERT        0xD1
-#define KEY_DELETE        0xD4
-#define KEY_PAGE_UP       0xD3
-#define KEY_PAGE_DOWN     0xD6
-#define KEY_HOME          0xD2
-#define KEY_END           0xD5
-#define KEY_CAPS_LOCK     0xC1
-#define KEY_PRINT_SCREEN  0xCE // Print Screen / SysRq
-#define KEY_SCROLL_LOCK   0xCF
-#define KEY_PAUSE         0xD0 // Pause / Break
-
-// Numeric keypad
-#define KEY_NUM_LOCK      0xDB
-#define KEY_KP_SLASH      0xDC
-#define KEY_KP_ASTERISK   0xDD
-#define KEY_KP_MINUS      0xDE
-#define KEY_KP_PLUS       0xDF
-#define KEY_KP_ENTER      0xE0
-#define KEY_KP_1          0xE1
-#define KEY_KP_2          0xE2
-#define KEY_KP_3          0xE3
-#define KEY_KP_4          0xE4
-#define KEY_KP_5          0xE5
-#define KEY_KP_6          0xE6
-#define KEY_KP_7          0xE7
-#define KEY_KP_8          0xE8
-#define KEY_KP_9          0xE9
-#define KEY_KP_0          0xEA
-#define KEY_KP_DOT        0xEB
-
-// Function keys
-#define KEY_F1            0xC2
-#define KEY_F2            0xC3
-#define KEY_F3            0xC4
-#define KEY_F4            0xC5
-#define KEY_F5            0xC6
-#define KEY_F6            0xC7
-#define KEY_F7            0xC8
-#define KEY_F8            0xC9
-#define KEY_F9            0xCA
-#define KEY_F10           0xCB
-#define KEY_F11           0xCC
-#define KEY_F12           0xCD
-#define KEY_F13           0xF0
-#define KEY_F14           0xF1
-#define KEY_F15           0xF2
-#define KEY_F16           0xF3
-#define KEY_F17           0xF4
-#define KEY_F18           0xF5
-#define KEY_F19           0xF6
-#define KEY_F20           0xF7
-#define KEY_F21           0xF8
-#define KEY_F22           0xF9
-#define KEY_F23           0xFA
-#define KEY_F24           0xFB
-
-// Supported keyboard layouts
-extern const uint8_t KeyboardLayout_de_DE[];
-extern const uint8_t KeyboardLayout_en_US[];
-extern const uint8_t KeyboardLayout_es_ES[];
-extern const uint8_t KeyboardLayout_fr_FR[];
-extern const uint8_t KeyboardLayout_it_IT[];
-extern const uint8_t KeyboardLayout_sv_SE[];
-extern const uint8_t KeyboardLayout_da_DK[];
-
-// Low level key report: up to 6 keys and shift, ctrl etc at once
-typedef struct {
-    uint8_t modifiers;
-    uint8_t reserved;
-    uint8_t keys[6];
-} KeyReport;
-
-class KeyboardBT_ : public Print {
-private:
-    KeyReport _keyReport;
-    const uint8_t *_asciimap;
-    void sendReport(KeyReport* keys);
+class KeyboardBT_ : public HID_Keyboard {
+protected:
+    virtual void sendReport(KeyReport* keys) override;
 public:
    KeyboardBT_(void);
-    void begin(const uint8_t *layout = KeyboardLayout_en_US);
+    void begin(const char *localName = nullptr, const char *hidName = nullptr, const uint8_t *layout = KeyboardLayout_en_US);
    void end(void);
-    size_t write(uint8_t k);
-    size_t write(const uint8_t *buffer, size_t size);
-    size_t press(uint8_t k);
-    size_t release(uint8_t k);
-    void releaseAll(void);
 };
 extern KeyboardBT_ KeyboardBT;

@@ -1,65 +0,0 @@
-/*
-    KeyboardLayout.h
-
-    This file is not part of the public API. It is meant to be included
-    only in Keyboard.cpp and the keyboard layout files. Layout files map
-    ASCII character codes to keyboard scan codes (technically, to USB HID
-    Usage codes), possibly altered by the SHIFT or ALT_GR modifiers.
-
-    == Creating your own layout ==
-
-    In order to create your own layout file, copy an existing layout that
-    is similar to yours, then modify it to use the correct keys. The
-    layout is an array in ASCII order. Each entry contains a scan code,
-    possibly modified by "|SHIFT" or "|ALT_GR", as in this excerpt from
-    the Italian layout:
-
-      0x35,          // bslash
-      0x30|ALT_GR,   // ]
-      0x2e|SHIFT,    // ^
-
-    Do not change the control characters (those before scan code 0x2c,
-    corresponding to space). Do not attempt to grow the table past DEL. Do
-    not use both SHIFT and ALT_GR on the same character: this is not
-    supported. Unsupported characters should have 0x00 as scan code.
-
-    For a keyboard with an ISO physical layout, use the scan codes below:
-
-      +---+---+---+---+---+---+---+---+---+---+---+---+---+-------+
-      |35 |1e |1f |20 |21 |22 |23 |24 |25 |26 |27 |2d |2e |BackSp |
-      +---+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-----+
-      | Tab |14 |1a |08 |15 |17 |1c |18 |0c |12 |13 |2f |30 | Ret |
-      +-----++--++--++--++--++--++--++--++--++--++--++--++--++    |
-      |CapsL |04 |16 |07 |09 |0a |0b |0d |0e |0f |33 |34 |31 |    |
-      +----+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+---+----+
-      |Shi.|32 |1d |1b |06 |19 |05 |11 |10 |36 |37 |38 |  Shift   |
-      +----+---++--+-+-+---+---+---+---+---+--++---+---++----+----+
-      |Ctrl|Win |Alt |                        |AlGr|Win |Menu|Ctrl|
-      +----+----+----+------------------------+----+----+----+----+
-
-    The ANSI layout is identical except that key 0x31 is above (rather
-    than next to) Return, and there is not key 0x32.
-
-    Give a unique name to the layout array, then declare it in Keyboard.h
-    with a line of the form:
-
-    extern const uint8_t KeyboardLayout_xx_YY[];
-
-    == Encoding details ==
-
-    All scan codes are less than 0x80, which makes bit 7 available to
-    signal that a modifier (Shift or AltGr) is needed to generate the
-    character. With only one exception, keys that are used with modifiers
-    have scan codes that are less than 0x40. This makes bit 6 available
-    to signal whether the modifier is Shift or AltGr. The exception is
-    0x64, the key next next to Left Shift on the ISO layout (and absent
-    from the ANSI layout). We handle it by replacing its value by 0x32 in
-    the layout arrays.
-*/
-
-#include <Arduino.h>
-
-#define SHIFT 0x80
-#define ALT_GR 0xc0
-#define ISO_KEY 0x64
-#define ISO_REPLACEMENT 0x32
@@ -1,137 +0,0 @@
-/*
-    Danish keyboard layout.
-*/
-
-#include "KeyboardLayout.h"
-
-extern const uint8_t KeyboardLayout_da_DK[128] PROGMEM = {
-    0x00,          // NUL
-    0x00,          // SOH
-    0x00,          // STX
-    0x00,          // ETX
-    0x00,          // EOT
-    0x00,          // ENQ
-    0x00,          // ACK
-    0x00,          // BEL
-    0x2a,          // BS  Backspace
-    0x2b,          // TAB Tab
-    0x28,          // LF  Enter
-    0x00,          // VT
-    0x00,          // FF
-    0x00,          // CR
-    0x00,          // SO
-    0x00,          // SI
-    0x00,          // DEL
-    0x00,          // DC1
-    0x00,          // DC2
-    0x00,          // DC3
-    0x00,          // DC4
-    0x00,          // NAK
-    0x00,          // SYN
-    0x00,          // ETB
-    0x00,          // CAN
-    0x00,          // EM
-    0x00,          // SUB
-    0x00,          // ESC
-    0x00,          // FS
-    0x00,          // GS
-    0x00,          // RS
-    0x00,          // US
-
-    0x2c,          // ' '
-    0x1e | SHIFT,  // !
-    0x1f | SHIFT,  // "
-    0x20 | SHIFT,  // #
-    0x21 | ALT_GR, // $
-    0x22 | SHIFT,  // %
-    0x23 | SHIFT,  // &
-    0x31,          // '
-    0x25 | SHIFT,  // (
-    0x26 | SHIFT,  // )
-    0x31 | SHIFT,  // *
-    0x2d,          // +
-    0x36,          // ,
-    0x38,          // -
-    0x37,          // .
-    0x24 | SHIFT,  // /
-    0x27,          // 0
-    0x1e,          // 1
-    0x1f,          // 2
-    0x20,          // 3
-    0x21,          // 4
-    0x22,          // 5
-    0x23,          // 6
-    0x24,          // 7
-    0x25,          // 8
-    0x26,          // 9
-    0x37 | SHIFT,  // :
-    0x36 | SHIFT,  // ;
-    0x32,          // <
-    0x27 | SHIFT,  // =
-    0x32 | SHIFT,  // >
-    0x2d | SHIFT,  // ?
-    0x1f | ALT_GR, // @
-    0x04 | SHIFT,  // A
-    0x05 | SHIFT,  // B
-    0x06 | SHIFT,  // C
-    0x07 | SHIFT,  // D
-    0x08 | SHIFT,  // E
-    0x09 | SHIFT,  // F
-    0x0a | SHIFT,  // G
-    0x0b | SHIFT,  // H
-    0x0c | SHIFT,  // I
-    0x0d | SHIFT,  // J
-    0x0e | SHIFT,  // K
-    0x0f | SHIFT,  // L
-    0x10 | SHIFT,  // M
-    0x11 | SHIFT,  // N
-    0x12 | SHIFT,  // O
-    0x13 | SHIFT,  // P
-    0x14 | SHIFT,  // Q
-    0x15 | SHIFT,  // R
-    0x16 | SHIFT,  // S
-    0x17 | SHIFT,  // T
-    0x18 | SHIFT,  // U
-    0x19 | SHIFT,  // V
-    0x1a | SHIFT,  // W
-    0x1b | SHIFT,  // X
-    0x1c | SHIFT,  // Y
-    0x1d | SHIFT,  // Z
-    0x25 | ALT_GR, // [
-    0x32 | ALT_GR, // bslash
-    0x26 | ALT_GR, // ]
-    0x00,          // ^  not supported (requires dead key + space)
-    0x38 | SHIFT,  // _
-    0x00,          // `  not supported (requires dead key + space)
-    0x04,          // a
-    0x05,          // b
-    0x06,          // c
-    0x07,          // d
-    0x08,          // e
-    0x09,          // f
-    0x0a,          // g
-    0x0b,          // h
-    0x0c,          // i
-    0x0d,          // j
-    0x0e,          // k
-    0x0f,          // l
-    0x10,          // m
-    0x11,          // n
-    0x12,          // o
-    0x13,          // p
-    0x14,          // q
-    0x15,          // r
-    0x16,          // s
-    0x17,          // t
-    0x18,          // u
-    0x19,          // v
-    0x1a,          // w
-    0x1b,          // x
-    0x1c,          // y
-    0x1d,          // z
-    0x24 | ALT_GR, // {
-    0x2e | ALT_GR, // |
-    0x27 | ALT_GR, // }
-    0x00,          // ~  not supported (requires dead key + space)
-    0x00           // DEL
-};
@@ -1,137 +0,0 @@
-/*
-    German keyboard layout.
-*/
-
-#include "KeyboardLayout.h"
-
-extern const uint8_t KeyboardLayout_de_DE[128] PROGMEM = {
-    0x00,          // NUL
-    0x00,          // SOH
-    0x00,          // STX
-    0x00,          // ETX
-    0x00,          // EOT
-    0x00,          // ENQ
-    0x00,          // ACK
-    0x00,          // BEL
-    0x2a,          // BS  Backspace
-    0x2b,          // TAB Tab
-    0x28,          // LF  Enter
-    0x00,          // VT
-    0x00,          // FF
-    0x00,          // CR
-    0x00,          // SO
-    0x00,          // SI
-    0x00,          // DEL
-    0x00,          // DC1
-    0x00,          // DC2
-    0x00,          // DC3
-    0x00,          // DC4
-    0x00,          // NAK
-    0x00,          // SYN
-    0x00,          // ETB
-    0x00,          // CAN
-    0x00,          // EM
-    0x00,          // SUB
-    0x00,          // ESC
-    0x00,          // FS
-    0x00,          // GS
-    0x00,          // RS
-    0x00,          // US
-
-    0x2c,          // ' '
-    0x1e | SHIFT,  // !
-    0x1f | SHIFT,  // "
-    0x31,          // #
-    0x21 | SHIFT,  // $
-    0x22 | SHIFT,  // %
-    0x23 | SHIFT,  // &
-    0x31 | SHIFT,  // '
-    0x25 | SHIFT,  // (
-    0x26 | SHIFT,  // )
-    0x30 | SHIFT,  // *
-    0x30,          // +
-    0x36,          // ,
-    0x38,          // -
-    0x37,          // .
-    0x24 | SHIFT,  // /
-    0x27,          // 0
-    0x1e,          // 1
-    0x1f,          // 2
-    0x20,          // 3
-    0x21,          // 4
-    0x22,          // 5
-    0x23,          // 6
-    0x24,          // 7
-    0x25,          // 8
-    0x26,          // 9
-    0x37 | SHIFT,  // :
-    0x36 | SHIFT,  // ;
-    0x32,          // <
-    0x27 | SHIFT,  // =
-    0x32 | SHIFT,  // >
-    0x2d | SHIFT,  // ?
-    0x14 | ALT_GR, // @
-    0x04 | SHIFT,  // A
-    0x05 | SHIFT,  // B
-    0x06 | SHIFT,  // C
-    0x07 | SHIFT,  // D
-    0x08 | SHIFT,  // E
-    0x09 | SHIFT,  // F
-    0x0a | SHIFT,  // G
-    0x0b | SHIFT,  // H
-    0x0c | SHIFT,  // I
-    0x0d | SHIFT,  // J
-    0x0e | SHIFT,  // K
-    0x0f | SHIFT,  // L
-    0x10 | SHIFT,  // M
-    0x11 | SHIFT,  // N
-    0x12 | SHIFT,  // O
-    0x13 | SHIFT,  // P
-    0x14 | SHIFT,  // Q
-    0x15 | SHIFT,  // R
-    0x16 | SHIFT,  // S
-    0x17 | SHIFT,  // T
-    0x18 | SHIFT,  // U
-    0x19 | SHIFT,  // V
-    0x1a | SHIFT,  // W
-    0x1b | SHIFT,  // X
-    0x1d | SHIFT,  // Y
-    0x1c | SHIFT,  // Z
-    0x25 | ALT_GR, // [
-    0x2d | ALT_GR, // bslash
-    0x26 | ALT_GR, // ]
-    0x00,          // ^  not supported (requires dead key + space)
-    0x38 | SHIFT,  // _
-    0x00,          // `  not supported (requires dead key + space)
-    0x04,          // a
-    0x05,          // b
-    0x06,          // c
-    0x07,          // d
-    0x08,          // e
-    0x09,          // f
-    0x0a,          // g
-    0x0b,          // h
-    0x0c,          // i
-    0x0d,          // j
-    0x0e,          // k
-    0x0f,          // l
-    0x10,          // m
-    0x11,          // n
-    0x12,          // o
-    0x13,          // p
-    0x14,          // q
-    0x15,          // r
-    0x16,          // s
-    0x17,          // t
-    0x18,          // u
-    0x19,          // v
-    0x1a,          // w
-    0x1b,          // x
-    0x1d,          // y
-    0x1c,          // z
-    0x24 | ALT_GR, // {
-    0x32 | ALT_GR, // |
-    0x27 | ALT_GR, // }
-    0x30 | ALT_GR, // ~
-    0x00           // DEL
-};
@@ -1,137 +0,0 @@
-/*
-    Standard US keyboard layout.
-*/
-
-#include "KeyboardLayout.h"
-
-extern const uint8_t KeyboardLayout_en_US[128] PROGMEM = {
-    0x00,          // NUL
-    0x00,          // SOH
-    0x00,          // STX
-    0x00,          // ETX
-    0x00,          // EOT
-    0x00,          // ENQ
-    0x00,          // ACK
-    0x00,          // BEL
-    0x2a,          // BS  Backspace
-    0x2b,          // TAB Tab
-    0x28,          // LF  Enter
-    0x00,          // VT
-    0x00,          // FF
-    0x00,          // CR
-    0x00,          // SO
-    0x00,          // SI
-    0x00,          // DEL
-    0x00,          // DC1
-    0x00,          // DC2
-    0x00,          // DC3
-    0x00,          // DC4
-    0x00,          // NAK
-    0x00,          // SYN
-    0x00,          // ETB
-    0x00,          // CAN
-    0x00,          // EM
-    0x00,          // SUB
-    0x00,          // ESC
-    0x00,          // FS
-    0x00,          // GS
-    0x00,          // RS
-    0x00,          // US
-
-    0x2c,          // ' '
-    0x1e | SHIFT,  // !
-    0x34 | SHIFT,  // "
-    0x20 | SHIFT,  // #
-    0x21 | SHIFT,  // $
-    0x22 | SHIFT,  // %
-    0x24 | SHIFT,  // &
-    0x34,          // '
-    0x26 | SHIFT,  // (
-    0x27 | SHIFT,  // )
-    0x25 | SHIFT,  // *
-    0x2e | SHIFT,  // +
-    0x36,          // ,
-    0x2d,          // -
-    0x37,          // .
-    0x38,          // /
-    0x27,          // 0
-    0x1e,          // 1
-    0x1f,          // 2
-    0x20,          // 3
-    0x21,          // 4
-    0x22,          // 5
-    0x23,          // 6
-    0x24,          // 7
-    0x25,          // 8
-    0x26,          // 9
-    0x33 | SHIFT,  // :
-    0x33,          // ;
-    0x36 | SHIFT,  // <
-    0x2e,          // =
-    0x37 | SHIFT,  // >
-    0x38 | SHIFT,  // ?
-    0x1f | SHIFT,  // @
-    0x04 | SHIFT,  // A
-    0x05 | SHIFT,  // B
-    0x06 | SHIFT,  // C
-    0x07 | SHIFT,  // D
-    0x08 | SHIFT,  // E
-    0x09 | SHIFT,  // F
-    0x0a | SHIFT,  // G
-    0x0b | SHIFT,  // H
-    0x0c | SHIFT,  // I
-    0x0d | SHIFT,  // J
-    0x0e | SHIFT,  // K
-    0x0f | SHIFT,  // L
-    0x10 | SHIFT,  // M
-    0x11 | SHIFT,  // N
-    0x12 | SHIFT,  // O
-    0x13 | SHIFT,  // P
-    0x14 | SHIFT,  // Q
-    0x15 | SHIFT,  // R
-    0x16 | SHIFT,  // S
-    0x17 | SHIFT,  // T
-    0x18 | SHIFT,  // U
-    0x19 | SHIFT,  // V
-    0x1a | SHIFT,  // W
-    0x1b | SHIFT,  // X
-    0x1c | SHIFT,  // Y
-    0x1d | SHIFT,  // Z
-    0x2f,          // [
-    0x31,          // bslash
-    0x30,          // ]
-    0x23 | SHIFT,  // ^
-    0x2d | SHIFT,  // _
-    0x35,          // `
-    0x04,          // a
-    0x05,          // b
-    0x06,          // c
-    0x07,          // d
-    0x08,          // e
-    0x09,          // f
-    0x0a,          // g
-    0x0b,          // h
-    0x0c,          // i
-    0x0d,          // j
-    0x0e,          // k
-    0x0f,          // l
-    0x10,          // m
-    0x11,          // n
-    0x12,          // o
-    0x13,          // p
-    0x14,          // q
-    0x15,          // r
-    0x16,          // s
-    0x17,          // t
-    0x18,          // u
-    0x19,          // v
-    0x1a,          // w
-    0x1b,          // x
-    0x1c,          // y
-    0x1d,          // z
-    0x2f | SHIFT,  // {
-    0x31 | SHIFT,  // |
-    0x30 | SHIFT,  // }
-    0x35 | SHIFT,  // ~
-    0x00           // DEL
-};
@@ -1,137 +0,0 @@
-/*
-    Spanish keyboard layout.
-*/
-
-#include "KeyboardLayout.h"
-
-extern const uint8_t KeyboardLayout_es_ES[128] PROGMEM = {
-    0x00,          // NUL
-    0x00,          // SOH
-    0x00,          // STX
-    0x00,          // ETX
-    0x00,          // EOT
-    0x00,          // ENQ
-    0x00,          // ACK
-    0x00,          // BEL
-    0x2a,          // BS  Backspace
-    0x2b,          // TAB Tab
-    0x28,          // LF  Enter
-    0x00,          // VT
-    0x00,          // FF
-    0x00,          // CR
-    0x00,          // SO
-    0x00,          // SI
-    0x00,          // DEL
-    0x00,          // DC1
-    0x00,          // DC2
-    0x00,          // DC3
-    0x00,          // DC4
-    0x00,          // NAK
-    0x00,          // SYN
-    0x00,          // ETB
-    0x00,          // CAN
-    0x00,          // EM
-    0x00,          // SUB
-    0x00,          // ESC
-    0x00,          // FS
-    0x00,          // GS
-    0x00,          // RS
-    0x00,          // US
-
-    0x2c,          // ' '
-    0x1e | SHIFT,  // !
-    0x1f | SHIFT,  // "
-    0x20 | ALT_GR, // #
-    0x21 | SHIFT,  // $
-    0x22 | SHIFT,  // %
-    0x23 | SHIFT,  // &
-    0x2d,          // '
-    0x25 | SHIFT,  // (
-    0x26 | SHIFT,  // )
-    0x30 | SHIFT,  // *
-    0x30,          // +
-    0x36,          // ,
-    0x38,          // -
-    0x37,          // .
-    0x24 | SHIFT,  // /
-    0x27,          // 0
-    0x1e,          // 1
-    0x1f,          // 2
-    0x20,          // 3
-    0x21,          // 4
-    0x22,          // 5
-    0x23,          // 6
-    0x24,          // 7
-    0x25,          // 8
-    0x26,          // 9
-    0x37 | SHIFT,  // :
-    0x36 | SHIFT,  // ;
-    0x32,          // <
-    0x27 | SHIFT,  // =
-    0x32 | SHIFT,  // >
-    0x2d | SHIFT,  // ?
-    0x1f | ALT_GR, // @
-    0x04 | SHIFT,  // A
-    0x05 | SHIFT,  // B
-    0x06 | SHIFT,  // C
-    0x07 | SHIFT,  // D
-    0x08 | SHIFT,  // E
-    0x09 | SHIFT,  // F
-    0x0a | SHIFT,  // G
-    0x0b | SHIFT,  // H
-    0x0c | SHIFT,  // I
-    0x0d | SHIFT,  // J
-    0x0e | SHIFT,  // K
-    0x0f | SHIFT,  // L
-    0x10 | SHIFT,  // M
-    0x11 | SHIFT,  // N
-    0x12 | SHIFT,  // O
-    0x13 | SHIFT,  // P
-    0x14 | SHIFT,  // Q
-    0x15 | SHIFT,  // R
-    0x16 | SHIFT,  // S
-    0x17 | SHIFT,  // T
-    0x18 | SHIFT,  // U
-    0x19 | SHIFT,  // V
-    0x1a | SHIFT,  // W
-    0x1b | SHIFT,  // X
-    0x1c | SHIFT,  // Y
-    0x1d | SHIFT,  // Z
-    0x2f | ALT_GR, // [
-    0x35 | ALT_GR, // bslash
-    0x30 | ALT_GR, // ]
-    0x00,          // ^  not supported (requires dead key + space)
-    0x38 | SHIFT,  // _
-    0x00,          // `  not supported (requires dead key + space)
-    0x04,          // a
-    0x05,          // b
-    0x06,          // c
-    0x07,          // d
-    0x08,          // e
-    0x09,          // f
-    0x0a,          // g
-    0x0b,          // h
-    0x0c,          // i
-    0x0d,          // j
-    0x0e,          // k
-    0x0f,          // l
-    0x10,          // m
-    0x11,          // n
-    0x12,          // o
-    0x13,          // p
-    0x14,          // q
-    0x15,          // r
-    0x16,          // s
-    0x17,          // t
-    0x18,          // u
-    0x19,          // v
-    0x1a,          // w
-    0x1b,          // x
-    0x1c,          // y
-    0x1d,          // z
-    0x34 | ALT_GR, // {
-    0x1e | ALT_GR, // |
-    0x31 | ALT_GR, // }
-    0x00,          // ~  not supported (requires dead key + space)
-    0x00           // DEL
-};
@@ -1,137 +0,0 @@
-/*
-    Traditional (not AFNOR) French keyboard layout.
-*/
-
-#include "KeyboardLayout.h"
-
-extern const uint8_t KeyboardLayout_fr_FR[128] PROGMEM = {
-    0x00,          // NUL
-    0x00,          // SOH
-    0x00,          // STX
-    0x00,          // ETX
-    0x00,          // EOT
-    0x00,          // ENQ
-    0x00,          // ACK
-    0x00,          // BEL
-    0x2a,          // BS  Backspace
-    0x2b,          // TAB Tab
-    0x28,          // LF  Enter
-    0x00,          // VT
-    0x00,          // FF
-    0x00,          // CR
-    0x00,          // SO
-    0x00,          // SI
-    0x00,          // DEL
-    0x00,          // DC1
-    0x00,          // DC2
-    0x00,          // DC3
-    0x00,          // DC4
-    0x00,          // NAK
-    0x00,          // SYN
-    0x00,          // ETB
-    0x00,          // CAN
-    0x00,          // EM
-    0x00,          // SUB
-    0x00,          // ESC
-    0x00,          // FS
-    0x00,          // GS
-    0x00,          // RS
-    0x00,          // US
-
-    0x2c,          // ' '
-    0x38,          // !
-    0x20,          // "
-    0x20 | ALT_GR, // #
-    0x30,          // $
-    0x34 | SHIFT,  // %
-    0x1E,          // &
-    0x21,          // '
-    0x22,          // (
-    0x2d,          // )
-    0x31,          // *
-    0x2e | SHIFT,  // +
-    0x10,          // ,
-    0x23,          // -
-    0x36 | SHIFT,  // .
-    0x37 | SHIFT,  // /
-    0x27 | SHIFT,  // 0
-    0x1e | SHIFT,  // 1
-    0x1f | SHIFT,  // 2
-    0x20 | SHIFT,  // 3
-    0x21 | SHIFT,  // 4
-    0x22 | SHIFT,  // 5
-    0x23 | SHIFT,  // 6
-    0x24 | SHIFT,  // 7
-    0x25 | SHIFT,  // 8
-    0x26 | SHIFT,  // 9
-    0x37,          // :
-    0x36,          // ;
-    0x32,          // <
-    0x2e,          // =
-    0x32 | SHIFT,  // >
-    0x10 | SHIFT,  // ?
-    0x27 | ALT_GR, // @
-    0x14 | SHIFT,  // A
-    0x05 | SHIFT,  // B
-    0x06 | SHIFT,  // C
-    0x07 | SHIFT,  // D
-    0x08 | SHIFT,  // E
-    0x09 | SHIFT,  // F
-    0x0a | SHIFT,  // G
-    0x0b | SHIFT,  // H
-    0x0c | SHIFT,  // I
-    0x0d | SHIFT,  // J
-    0x0e | SHIFT,  // K
-    0x0f | SHIFT,  // L
-    0x33 | SHIFT,  // M
-    0x11 | SHIFT,  // N
-    0x12 | SHIFT,  // O
-    0x13 | SHIFT,  // P
-    0x04 | SHIFT,  // Q
-    0x15 | SHIFT,  // R
-    0x16 | SHIFT,  // S
-    0x17 | SHIFT,  // T
-    0x18 | SHIFT,  // U
-    0x19 | SHIFT,  // V
-    0x1d | SHIFT,  // W
-    0x1b | SHIFT,  // X
-    0x1c | SHIFT,  // Y
-    0x1a | SHIFT,  // Z
-    0x22 | ALT_GR, // [
-    0x25 | ALT_GR, // bslash
-    0x2d | ALT_GR, // ]
-    0x26 | ALT_GR, // ^
-    0x25,          // _
-    0x24 | ALT_GR, // `
-    0x14,          // a
-    0x05,          // b
-    0x06,          // c
-    0x07,          // d
-    0x08,          // e
-    0x09,          // f
-    0x0a,          // g
-    0x0b,          // h
-    0x0c,          // i
-    0x0d,          // j
-    0x0e,          // k
-    0x0f,          // l
-    0x33,          // m
-    0x11,          // n
-    0x12,          // o
-    0x13,          // p
-    0x04,          // q
-    0x15,          // r
-    0x16,          // s
-    0x17,          // t
-    0x18,          // u
-    0x19,          // v
-    0x1d,          // w
-    0x1b,          // x
-    0x1c,          // y
-    0x1a,          // z
-    0x21 | ALT_GR, // {
-    0x23 | ALT_GR, // |
-    0x2e | ALT_GR, // }
-    0x1f | ALT_GR, // ~
-    0x00           // DEL
-};
@@ -1,137 +0,0 @@
-/*
-    Italian keyboard layout.
-*/
-
-#include "KeyboardLayout.h"
-
-extern const uint8_t KeyboardLayout_it_IT[128] PROGMEM = {
-    0x00,          // NUL
-    0x00,          // SOH
-    0x00,          // STX
-    0x00,          // ETX
-    0x00,          // EOT
-    0x00,          // ENQ
-    0x00,          // ACK
-    0x00,          // BEL
-    0x2a,          // BS  Backspace
-    0x2b,          // TAB Tab
-    0x28,          // LF  Enter
-    0x00,          // VT
-    0x00,          // FF
-    0x00,          // CR
-    0x00,          // SO
-    0x00,          // SI
-    0x00,          // DEL
-    0x00,          // DC1
-    0x00,          // DC2
-    0x00,          // DC3
-    0x00,          // DC4
-    0x00,          // NAK
-    0x00,          // SYN
-    0x00,          // ETB
-    0x00,          // CAN
-    0x00,          // EM
-    0x00,          // SUB
-    0x00,          // ESC
-    0x00,          // FS
-    0x00,          // GS
-    0x00,          // RS
-    0x00,          // US
-
-    0x2c,          // ' '
-    0x1e | SHIFT,  // !
-    0x1f | SHIFT,  // "
-    0x34 | ALT_GR, // #
-    0x21 | SHIFT,  // $
-    0x22 | SHIFT,  // %
-    0x23 | SHIFT,  // &
-    0x2d,          // '
-    0x25 | SHIFT,  // (
-    0x26 | SHIFT,  // )
-    0x30 | SHIFT,  // *
-    0x30,          // +
-    0x36,          // ,
-    0x38,          // -
-    0x37,          // .
-    0x24 | SHIFT,  // /
-    0x27,          // 0
-    0x1e,          // 1
-    0x1f,          // 2
-    0x20,          // 3
-    0x21,          // 4
-    0x22,          // 5
-    0x23,          // 6
-    0x24,          // 7
-    0x25,          // 8
-    0x26,          // 9
-    0x37 | SHIFT,  // :
-    0x36 | SHIFT,  // ;
-    0x32,          // <
-    0x27 | SHIFT,  // =
-    0x32 | SHIFT,  // >
-    0x2d | SHIFT,  // ?
-    0x33 | ALT_GR, // @
-    0x04 | SHIFT,  // A
-    0x05 | SHIFT,  // B
-    0x06 | SHIFT,  // C
-    0x07 | SHIFT,  // D
-    0x08 | SHIFT,  // E
-    0x09 | SHIFT,  // F
-    0x0a | SHIFT,  // G
-    0x0b | SHIFT,  // H
-    0x0c | SHIFT,  // I
-    0x0d | SHIFT,  // J
-    0x0e | SHIFT,  // K
-    0x0f | SHIFT,  // L
-    0x10 | SHIFT,  // M
-    0x11 | SHIFT,  // N
-    0x12 | SHIFT,  // O
-    0x13 | SHIFT,  // P
-    0x14 | SHIFT,  // Q
-    0x15 | SHIFT,  // R
-    0x16 | SHIFT,  // S
-    0x17 | SHIFT,  // T
-    0x18 | SHIFT,  // U
-    0x19 | SHIFT,  // V
-    0x1a | SHIFT,  // W
-    0x1b | SHIFT,  // X
-    0x1c | SHIFT,  // Y
-    0x1d | SHIFT,  // Z
-    0x2f | ALT_GR, // [
-    0x35,          // bslash
-    0x30 | ALT_GR, // ]
-    0x2e | SHIFT,  // ^
-    0x38 | SHIFT,  // _
-    0x00,          // `  not in this layout
-    0x04,          // a
-    0x05,          // b
-    0x06,          // c
-    0x07,          // d
-    0x08,          // e
-    0x09,          // f
-    0x0a,          // g
-    0x0b,          // h
-    0x0c,          // i
-    0x0d,          // j
-    0x0e,          // k
-    0x0f,          // l
-    0x10,          // m
-    0x11,          // n
-    0x12,          // o
-    0x13,          // p
-    0x14,          // q
-    0x15,          // r
-    0x16,          // s
-    0x17,          // t
-    0x18,          // u
-    0x19,          // v
-    0x1a,          // w
-    0x1b,          // x
-    0x1c,          // y
-    0x1d,          // z
-    0x00,          // {  not supported (requires AltGr+Shift)
-    0x35 | SHIFT,  // |
-    0x00,          // }  not supported (requires AltGr+Shift)
-    0x00,          // ~  not in this layout
-    0x00           // DEL
-};
@@ -1,137 +0,0 @@
-/*
-    Swedish keyboard layout.
-*/
-
-#include "KeyboardLayout.h"
-
-extern const uint8_t KeyboardLayout_sv_SE[128] PROGMEM = {
-    0x00,          // NUL
-    0x00,          // SOH
-    0x00,          // STX
-    0x00,          // ETX
-    0x00,          // EOT
-    0x00,          // ENQ
-    0x00,          // ACK
-    0x00,          // BEL
-    0x2a,          // BS  Backspace
-    0x2b,          // TAB Tab
-    0x28,          // LF  Enter
-    0x00,          // VT
-    0x00,          // FF
-    0x00,          // CR
-    0x00,          // SO
-    0x00,          // SI
-    0x00,          // DEL
-    0x00,          // DC1
-    0x00,          // DC2
-    0x00,          // DC3
-    0x00,          // DC4
-    0x00,          // NAK
-    0x00,          // SYN
-    0x00,          // ETB
-    0x00,          // CAN
-    0x00,          // EM
-    0x00,          // SUB
-    0x00,          // ESC
-    0x00,          // FS
-    0x00,          // GS
-    0x00,          // RS
-    0x00,          // US
-
-    0x2c,          // ' '
-    0x1e | SHIFT,  // !
-    0x1f | SHIFT,  // "
-    0x20 | SHIFT,  // #
-    0x21 | ALT_GR,  // $
-    0x22 | SHIFT,  // %
-    0x23 | SHIFT,  // &
-    0x31,          // '
-    0x25 | SHIFT,  // (
-    0x26 | SHIFT,  // )
-    0x31 | SHIFT,  // *
-    0x2d,          // +
-    0x36,          // ,
-    0x38,          // -
-    0x37,          // .
-    0x24 | SHIFT,  // /
-    0x27,          // 0
-    0x1e,          // 1
-    0x1f,          // 2
-    0x20,          // 3
-    0x21,          // 4
-    0x22,          // 5
-    0x23,          // 6
-    0x24,          // 7
-    0x25,          // 8
-    0x26,          // 9
-    0x37 | SHIFT,  // :
-    0x36 | SHIFT,  // ;
-    0x32,          // <
-    0x27 | SHIFT,  // =
-    0x32 | SHIFT,  // >
-    0x2d | SHIFT,  // ?
-    0x1f | ALT_GR, // @
-    0x04 | SHIFT,  // A
-    0x05 | SHIFT,  // B
-    0x06 | SHIFT,  // C
-    0x07 | SHIFT,  // D
-    0x08 | SHIFT,  // E
-    0x09 | SHIFT,  // F
-    0x0a | SHIFT,  // G
-    0x0b | SHIFT,  // H
-    0x0c | SHIFT,  // I
-    0x0d | SHIFT,  // J
-    0x0e | SHIFT,  // K
-    0x0f | SHIFT,  // L
-    0x10 | SHIFT,  // M
-    0x11 | SHIFT,  // N
-    0x12 | SHIFT,  // O
-    0x13 | SHIFT,  // P
-    0x14 | SHIFT,  // Q
-    0x15 | SHIFT,  // R
-    0x16 | SHIFT,  // S
-    0x17 | SHIFT,  // T
-    0x18 | SHIFT,  // U
-    0x19 | SHIFT,  // V
-    0x1a | SHIFT,  // W
-    0x1b | SHIFT,  // X
-    0x1c | SHIFT,  // Y
-    0x1d | SHIFT,  // Z
-    0x25 | ALT_GR, // [
-    0x2d | ALT_GR, // bslash
-    0x26 | ALT_GR, // ]
-    0x00,          // ^  not supported (requires dead key + space)
-    0x38 | SHIFT,  // _
-    0x00,          // `  not supported (requires dead key + space)
-    0x04,          // a
-    0x05,          // b
-    0x06,          // c
-    0x07,          // d
-    0x08,          // e
-    0x09,          // f
-    0x0a,          // g
-    0x0b,          // h
-    0x0c,          // i
-    0x0d,          // j
-    0x0e,          // k
-    0x0f,          // l
-    0x10,          // m
-    0x11,          // n
-    0x12,          // o
-    0x13,          // p
-    0x14,          // q
-    0x15,          // r
-    0x16,          // s
-    0x17,          // t
-    0x18,          // u
-    0x19,          // v
-    0x1a,          // w
-    0x1b,          // x
-    0x1c,          // y
-    0x1d,          // z
-    0x24 | ALT_GR, // {
-    0x32 | ALT_GR, // |
-    0x27 | ALT_GR, // }
-    0x00,          // ~  not supported (requires dead key + space)
-    0x00           // DEL
-};
@@ -0,0 +1,31 @@
+:repository-owner: arduino-libraries
+:repository-name: Mouse
+
+= {repository-name} Library for Arduino =
+
+image:https://github.com/{repository-owner}/{repository-name}/actions/workflows/check-arduino.yml/badge.svg["Check Arduino status", link="https://github.com/{repository-owner}/{repository-name}/actions/workflows/check-arduino.yml"]
+image:https://github.com/{repository-owner}/{repository-name}/actions/workflows/compile-examples.yml/badge.svg["Compile Examples status", link="https://github.com/{repository-owner}/{repository-name}/actions/workflows/compile-examples.yml"]
+image:https://github.com/{repository-owner}/{repository-name}/actions/workflows/spell-check.yml/badge.svg["Spell Check status", link="https://github.com/{repository-owner}/{repository-name}/actions/workflows/spell-check.yml"]
+
+This library allows an Arduino board with USB capabilities to act as a Mouse.
+
+For more information about this library please visit us at
+https://www.arduino.cc/reference/en/language/functions/usb/mouse/
+
+== License ==
+
+Copyright (c) Arduino LLC. All right reserved.
+
+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
@@ -0,0 +1,428 @@
+# Mouse library
+
+## Methods
+
+### `Mouse.begin()`
+
+Begins emulating the mouse connected to a computer. `begin()` must be called before controlling the computer. To end control, use `Mouse.end()`.
+
+#### Syntax 
+
+```
+Mouse.begin()
+```
+
+#### Parameters
+
+None.
+
+#### Returns
+
+None.
+
+#### Example
+
+```
+#include <Mouse.h>
+
+void setup() {
+  pinMode(2, INPUT);
+}
+
+void loop() {
+  // Initialize the Mouse library when button is pressed
+  if (digitalRead(2) == HIGH) {
+    Mouse.begin();
+  }
+}
+```
+
+#### See also
+
+* [Mouse.click()](#mouseclick)
+* [Mouse.end()](#mouseend)
+* [Mouse.move()](#mousemove)
+* [Mouse.press()](#mousepress)
+* [Mouse.release()](#mouserelease)
+* [Mouse.isPressed()](#mouseispressed)
+
+### `Mouse.click()`
+
+Sends a momentary click to the computer at the location of the cursor. This is the same as pressing and immediately releasing the mouse button.
+
+`Mouse.click()` defaults to the left mouse button.
+
+#### Syntax 
+
+```
+Mouse.click()
+Mouse.click(button)
+```
+
+#### Parameters
+
+* `button`: which mouse button to press (MOUSE_LEFT, MOUSE_RIGHT or MOUSE_MIDDLE, default is MOUSE_LEFT).
+  
+#### Returns
+
+None.
+
+#### Example
+
+```
+#include <Mouse.h>
+
+void setup() {
+  pinMode(2, INPUT);
+  // Initialize the Mouse library
+  Mouse.begin();
+}
+
+void loop() {
+  // If the button is pressed, send a left mouse click
+  if (digitalRead(2) == HIGH) {
+    Mouse.click();
+  }
+}
+```
+
+#### Notes and warnings
+
+When you use the `Mouse.click()` command, the Arduino takes over your mouse! Make sure you have control before you use the command. A pushbutton to toggle the mouse control state is effective.
+
+#### See also
+
+* [Mouse.begin()](#mousebegin)
+* [Mouse.end()](#mouseend)
+* [Mouse.move()](#mousemove)
+* [Mouse.press()](#mousepress)
+* [Mouse.release()](#mouserelease)
+* [Mouse.isPressed()](#mouseispressed)
+  
+### `Mouse.end()`
+
+Stops emulating the mouse connected to a computer. To start control, use `Mouse.begin()`.
+
+#### Syntax 
+
+```
+Mouse.end()
+```
+
+#### Parameters
+
+None.
+
+#### Returns
+
+None.
+
+#### Example
+
+```
+#include <Mouse.h>
+
+void setup() {
+  pinMode(2, INPUT);
+  // Initiate the Mouse library
+  Mouse.begin();
+}
+
+void loop() {
+  // If the button is pressed, send a left mouse click
+  if (digitalRead(2) == HIGH) {
+    Mouse.click();
+    // Then end the Mouse emulation
+    Mouse.end();
+  }
+}
+```
+
+#### See also
+
+* [Mouse.begin()](#mousebegin)
+* [Mouse.click()](#mouseclick)
+* [Mouse.move()](#mousemove)
+* [Mouse.press()](#mousepress)
+* [Mouse.release()](#mouserelease)
+* [Mouse.isPressed()](#mouseispressed)
+
+### `Mouse.move()`
+
+Moves the cursor on a connected computer. The motion onscreen is always relative to the cursor’s current location. Before using `Mouse.move()` you must call `Mouse.begin()`.
+
+#### Syntax 
+
+```
+Mouse.move(xVal, yVal, wheel)
+```
+
+#### Parameters
+
+* `xVal`: amount to move along the x-axis. Allowed data types: signed char.
+* `yVal`: amount to move along the y-axis. Allowed data types: signed char.
+* `wheel`: amount to move scroll wheel. Allowed data types: signed char.
+
+#### Returns
+
+None.
+
+#### Example
+
+```
+#include <Mouse.h>
+
+const int xAxis = A1;         // Analog sensor for X axis
+const int yAxis = A2;         // Analog sensor for Y axis
+
+int range = 12;               // Output range of X or Y movement
+int responseDelay = 2;        // Response delay of the mouse, in ms
+int threshold = range / 4;    // Resting threshold
+int center = range / 2;       // Resting position value
+int minima[] = {1023, 1023};  // Actual analogRead minima for (x, y)
+int maxima[] = {0, 0};        // Actual analogRead maxima for (x, y)
+int axis[] = {xAxis, yAxis};  // Pin numbers for (x, y)
+int mouseReading[2];          // Final mouse readings for (x, y)
+
+void setup() {
+  // Initialize the Mouse library
+  Mouse.begin();
+}
+
+void loop() {
+  // Read and scale the two axes
+  int xReading = readAxis(0);
+  int yReading = readAxis(1);
+
+  // Move the mouse
+  Mouse.move(xReading, yReading, 0);
+  delay(responseDelay);
+}
+
+/*
+  Reads an axis (0 or 1 for x or y) and scales the
+  analog input range to a range from 0 to <range>
+*/
+int readAxis(int axisNumber) {
+  int distance = 0; // Distance from center of the output range
+
+  // Read the analog input
+  int reading = analogRead(axis[axisNumber]);
+
+  // Of the current reading exceeds the max or min for this axis, reset the max or min
+  if (reading < minima[axisNumber]) {
+    minima[axisNumber] = reading;
+  }
+  if (reading > maxima[axisNumber]) {
+    maxima[axisNumber] = reading;
+  }
+
+  // Map the reading from the analog input range to the output range
+  reading = map(reading, minima[axisNumber], maxima[axisNumber], 0, range);
+
+  // If the output reading is outside from the rest position threshold,  use it
+  if (abs(reading - center) > threshold) {
+    distance = (reading - center);
+  }
+
+  // The Y axis needs to be inverted in order to map the movement correctly
+  if (axisNumber == 1) {
+    distance = -distance;
+  }
+
+  // Return the distance for this axis
+  return distance;
+}
+```
+
+#### Notes and warnings
+
+When you use the `Mouse.move()` command, the Arduino takes over your mouse! Make sure you have control before you use the command. A pushbutton to toggle the mouse control state is effective.
+
+#### See also
+
+* [Mouse.begin()](#mousebegin)
+* [Mouse.click()](#mouseclick)
+* [Mouse.end()](#mouseend)
+* [Mouse.press()](#mousepress)
+* [Mouse.release()](#mouserelease)
+* [Mouse.isPressed()](#mouseispressed)
+
+### `Mouse.press()`
+
+Sends a button press to a connected computer. A press is the equivalent of clicking and continuously holding the mouse button. A press is cancelled with `Mouse.release()`. Before using `Mouse.press()`, you need to start communication with `Mouse.begin()`. `Mouse.press()` defaults to a left button press.
+
+#### Syntax 
+
+```
+Mouse.press()
+Mouse.press(button)
+```
+
+#### Parameters
+
+* `button`: which mouse button to press (MOUSE_LEFT, MOUSE_RIGHT or MOUSE_MIDDLE, default is MOUSE_LEFT).
+
+#### Returns
+
+None.
+
+#### Example
+
+```
+#include <Mouse.h>
+
+void setup() {
+  // The switch that will initiate the Mouse press
+  pinMode(2, INPUT);
+  // The switch that will terminate the Mouse press
+  pinMode(3, INPUT);
+  // Initialize the Mouse library
+  Mouse.begin();
+}
+
+void loop() {
+  // If the switch attached to pin 2 is closed, press and hold the left mouse button
+  if (digitalRead(2) == HIGH) {
+    Mouse.press();
+  }
+  // If the switch attached to pin 3 is closed, release the left mouse button
+  if (digitalRead(3) == HIGH) {
+    Mouse.release();
+  }
+}
+```
+
+#### Notes and warnings
+
+When you use the `Mouse.press()` command, the Arduino takes over your mouse! Make sure you have control before you use the command. A pushbutton to toggle the mouse control state is effective.
+
+#### See also
+
+* [Mouse.begin()](#mousebegin)
+* [Mouse.click()](#mouseclick)
+* [Mouse.end()](#mouseend)
+* [Mouse.move()](#mousemove)
+* [Mouse.release()](#mouserelease)
+* [Mouse.isPressed()](#mouseispressed)
+
+### `Mouse.release()`
+
+Sends a message that a previously pressed button (invoked through `Mouse.press()`) is released. `Mouse.release()` defaults to the left button.
+
+#### Syntax 
+
+```
+Mouse.press()
+Mouse.press(button)
+```
+
+#### Parameters
+
+* `button`: which mouse button was released (MOUSE_LEFT, MOUSE_RIGHT or MOUSE_MIDDLE, default is MOUSE_LEFT).
+
+#### Returns
+
+None.
+
+#### Example
+
+```
+#include <Mouse.h>
+
+void setup() {
+  // The switch that will initiate the Mouse press
+  pinMode(2, INPUT);
+  // The switch that will terminate the Mouse press
+  pinMode(3, INPUT);
+  // Initialize the Mouse library
+  Mouse.begin();
+}
+
+void loop() {
+  // If the switch attached to pin 2 is closed, press and hold the left mouse button
+  if (digitalRead(2) == HIGH) {
+    Mouse.press();
+  }
+  // If the switch attached to pin 3 is closed, release the left mouse button
+  if (digitalRead(3) == HIGH) {
+    Mouse.release();
+  }
+}
+```
+
+#### Notes and warnings
+
+When you use the `Mouse.release()` command, the Arduino takes over your mouse! Make sure you have control before you use the command. A pushbutton to toggle the mouse control state is effective.
+
+#### See also
+
+* [Mouse.begin()](#mousebegin)
+* [Mouse.click()](#mouseclick)
+* [Mouse.end()](#mouseend)
+* [Mouse.move()](#mousemove)
+* [Mouse.press()](#mousepress)
+* [Mouse.isPressed()](#mouseispressed)
+
+### `Mouse.isPressed()`
+
+Checks the current status of all mouse buttons, and reports if any are pressed or not. By default, it checks the status of the left mouse button.
+
+#### Syntax 
+
+```
+Mouse.isPressed();
+Mouse.isPressed(button);
+```
+
+#### Parameters
+
+* `button`: which mouse button was released (MOUSE_LEFT, MOUSE_RIGHT or MOUSE_MIDDLE, default is MOUSE_LEFT).
+
+#### Returns
+
+1 if a button was pressed, 0 if a not.
+
+#### Example
+
+```
+#include <Mouse.h>
+
+void setup() {
+  // The switch that will initiate the Mouse press
+  pinMode(2, INPUT);
+  // The switch that will terminate the Mouse press
+  pinMode(3, INPUT);
+  // Start serial communication with the computer
+  Serial.begin(9600);
+  // Initialize the Mouse library
+  Mouse.begin();
+}
+
+void loop() {
+  // A variable for checking the button's state
+  int mouseState = 0;
+  // If the switch attached to pin 2 is closed, press and hold the left mouse button and save the state ina  variable
+  if (digitalRead(2) == HIGH) {
+    Mouse.press();
+    mouseState = Mouse.isPressed();
+  }
+  // If the switch attached to pin 3 is closed, release the left mouse button and save the state in a variable
+  if (digitalRead(3) == HIGH) {
+    Mouse.release();
+    mouseState = Mouse.isPressed();
+  }
+  // Print out the current mouse button state
+  Serial.println(mouseState);
+  delay(10);
+}
+```
+
+#### See also
+
+* [Mouse.begin()](#mousebegin)
+* [Mouse.click()](#mouseclick)
+* [Mouse.end()](#mouseend)
+* [Mouse.move()](#mousemove)
+* [Mouse.press()](#mousepress)
+* [Mouse.release()](#mouserelease)
@@ -0,0 +1,23 @@
+# Mouse library
+
+The mouse functions enable 32u4 or SAMD micro based boards to control cursor movement on a connected computer through their micro’s native USB port. When updating the cursor position, it is always relative to the cursor’s previous location.
+
+To use this library:
+
+```
+#include <Mouse.h>
+```
+
+## Notes and warnings
+
+These core libraries allow the 32u4 and SAMD based boards (Leonardo, Esplora, Zero, Due and MKR Family) to appear as a native Mouse and/or Keyboard to a connected computer.
+
+**A word of caution on using the Mouse and Keyboard libraries**: if the Mouse or Keyboard library is constantly running, it will be difficult to program your board. Functions such as `Mouse.move()` and `Keyboard.print()` will move your cursor or send keystrokes to a connected computer and should only be called when you are ready to handle them. It is recommended to use a control system to turn this functionality on, like a physical switch or only responding to specific input you can control. Refer to the Mouse and Keyboard examples for some ways to handle this.
+
+When using the Mouse or Keyboard library, it may be best to test your output first using `Serial.print()`. This way, you can be sure you know what values are being reported.
+
+## Examples
+
+* [KeyboardAndMouseControl](https://www.arduino.cc/en/Tutorial/BuiltInExamples/KeyboardAndMouseControl): Demonstrates the Mouse and Keyboard commands in one program.
+* [ButtonMouseControl](https://www.arduino.cc/en/Tutorial/BuiltInExamples/ButtonMouseControl): Control cursor movement with 5 pushbuttons. 
+* [JoystickMouseControl](https://www.arduino.cc/en/Tutorial/BuiltInExamples/JoystickMouseControl): Controls a computer’s cursor movement with a Joystick when a button is pressed.
@@ -0,0 +1,34 @@
+/* Earle F. Philhower, III <earlephilhower@yahoo.com> */
+/* Released to the public domain */
+
+
+#include <Mouse.h>
+
+void setup() {
+  Serial.begin(115200);
+  Mouse.begin();
+  delay(5000);
+  Serial.printf("Press BOOTSEL to move the mouse in a circle\n");
+}
+
+void loop() {
+  if (BOOTSEL) {
+    Serial.println("BARREL ROLL!!!");
+    float r = 100;
+    float ox = 0.0;
+    float oy = 0.0;
+    for (float a = 0; a < 2.0 * 3.14159; a += 0.1) {
+      float ax = r * cos(a);
+      float ay = r * sin(a);
+      float dx = ax - ox;
+      float dy = ay - oy;
+      Mouse.move(dx, dy, 0);
+      ox = ax;
+      oy = ay;
+      delay(10);
+    }
+    while (BOOTSEL) {
+      delay(1);
+    }
+  }
+}
@@ -0,0 +1,24 @@
+#######################################
+# Syntax Coloring Map For Mouse
+#######################################
+
+#######################################
+# Datatypes (KEYWORD1)
+#######################################
+
+Mouse	KEYWORD1
+
+#######################################
+# Methods and Functions (KEYWORD2)
+#######################################
+
+begin	KEYWORD2
+click	KEYWORD2
+move	KEYWORD2
+press	KEYWORD2
+release	KEYWORD2
+isPressed	KEYWORD2
+
+#######################################
+# Constants (LITERAL1)
+#######################################
@@ -0,0 +1,9 @@
+name=Mouse
+version=1.0.1
+author=Arduino and EFP3
+maintainer=Earle F. Philhower, III <earlephilhower@yahoo.com>
+sentence=Allows an Arduino board with USB capabilities to act as a Mouse.
+paragraph=Allows the RP2040 to emulate a USB mouse
+category=Device Control
+url=https://www.arduino.cc/reference/en/language/functions/usb/mouse/
+architectures=rp2040
@@ -1,7 +1,8 @@
 /*
-    Keyboard_sv_SE.h
+    Mouse.cpp

-    Copyright (c) 2021, Peter John
+    Copyright (c) 2015, Arduino LLC
+    Original code (pre-library): Copyright (c) 2011, Peter Barrett

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -18,27 +19,35 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */

-#ifndef KEYBOARD_SV_SE_h
-#define KEYBOARD_SV_SE_h
+#include "Mouse.h"
+#include <RP2040USB.h>

-#include "HID.h"
+#include "tusb.h"
+#include "class/hid/hid_device.h"

-#if !defined(_USING_HID)
-
-#warning "Using legacy HID core (non pluggable)"
-
-#else
+// Weak function override to add our descriptor to the TinyUSB list
+void __USBInstallMouse() { /* noop */ }

 //================================================================================
 //================================================================================
-//  Keyboard
+//	Mouse

-// SV_SE keys
-#define KEY_A_RING        (136+0x2f)
-#define KEY_A_UMLAUT      (136+0x34)
-#define KEY_O_UMLAUT      (136+0x33)
-#define KEY_UMLAUT        (136+0x30)
-#define KEY_ACUTE_ACC     (136+0x2e)
+/*  This function is for limiting the input value for x and y
+    axis to -127 <= x/y <= 127 since this is the allowed value
+    range for a USB HID device.
+*/

-#endif
-#endif
+Mouse_::Mouse_(void) {
+    /* noop */
+}
+
+void Mouse_::move(int x, int y, signed char wheel) {
+    CoreMutex m(&__usb_mutex);
+    tud_task();
+    if (tud_hid_ready()) {
+        tud_hid_mouse_report(__USBGetMouseReportID(), _buttons, limit_xy(x), limit_xy(y), wheel, 0);
+    }
+    tud_task();
+}
+
+Mouse_ Mouse;
@@ -1,7 +1,8 @@
 /*
-    Keyboard_da_DK.h
+    Mouse.h

-    Copyright (c) 2021, Peter John
+    Copyright (c) 2015, Arduino LLC
+    Original code (pre-library): Copyright (c) 2011, Peter Barrett

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -18,27 +19,16 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */

-#ifndef KEYBOARD_DA_DK_h
-#define KEYBOARD_DA_DK_h
+#ifndef MOUSE_h
+#define MOUSE_h

-#include "HID.h"
+#include <HID_Mouse.h>

-#if !defined(_USING_HID)
-
-#warning "Using legacy HID core (non pluggable)"
-
-#else
-
-//================================================================================
-//================================================================================
-//  Keyboard
-
-// DA_DK keys
-#define KEY_A_RING        (136+0x2f)
-#define KEY_SLASHED_O     (136+0x34)
-#define KEY_ASH           (136+0x33)
-#define KEY_UMLAUT        (136+0x30)
-#define KEY_ACUTE_ACC     (136+0x2e)
+class Mouse_ : public HID_Mouse {
+public:
+    Mouse_(void);
+    virtual void move(int x, int y, signed char wheel = 0) override;
+};
+extern Mouse_ Mouse;

 #endif
-#endif
@@ -5,7 +5,7 @@

 void setup() {
  Serial.begin(115200);
-  MouseBLE.begin();
+  MouseBLE.begin("CircleBLE Mouse");
  delay(5000);
  Serial.printf("Press BOOTSEL to move the mouse in a circle\n");
 }
@@ -26,6 +26,7 @@ void loop() {
      oy = ay;
      delay(10);
    }
+    MouseBLE.setBattery(random(0, 101)); // Set between 0...100%
    while (BOOTSEL) {
      delay(1);
    }
@@ -18,6 +18,7 @@ move	KEYWORD2
 press	KEYWORD2
 release	KEYWORD2
 isPressed	KEYWORD2
+setBattery	KEYWORD2

 #######################################
 # Constants (LITERAL1)
@@ -22,45 +22,28 @@
 #include "MouseBLE.h"
 #include <PicoBluetoothBLEHID.h>

-//================================================================================
-//================================================================================
-//	Mouse
-
-/*  This function is for limiting the input value for x and y
-    axis to -127 <= x/y <= 127 since this is the allowed value
-    range for a USB HID device.
-*/
-static signed char limit_xy(int const xy) {
-    if (xy < -127) {
-        return -127;
-    } else if (xy >  127) {
-        return 127;
-    } else {
-        return xy;
-    }
-}
-
-MouseBLE_::MouseBLE_(void) : _buttons(0) {
+MouseBLE_::MouseBLE_(void) {
    /* noop */
 }

 #define REPORT_ID 0x01
 const uint8_t desc_mouse[] = {TUD_HID_REPORT_DESC_MOUSE(HID_REPORT_ID(REPORT_ID))};
-void MouseBLE_::begin(void) {
-    PicoBluetoothBLEHID.startHID("PicoW BLE Mouse", "PicoW BLE Mouse", 0x03c2, desc_mouse, sizeof(desc_mouse));
+void MouseBLE_::begin(const char *localName, const char *hidName) {
+    if (!localName) {
+        localName = "PicoW BLE Mouse";
+    }
+    if (!hidName) {
+        hidName = localName;
+    }
+    PicoBluetoothBLEHID.startHID(localName, hidName, 0x03c2, desc_mouse, sizeof(desc_mouse));
 }

 void MouseBLE_::end(void) {
    PicoBluetoothBLEHID.end();
 }

-void MouseBLE_::click(uint8_t b) {
-    _buttons = b;
-    move(0, 0, 0);
-    delay(10);
-    _buttons = 0;
-    move(0, 0, 0);
-    delay(10);
+void MouseBLE_::setBattery(int lvl) {
+    PicoBluetoothBLEHID.setBattery(lvl);
 }

 void MouseBLE_::move(int x, int y, signed char wheel) {
@@ -73,27 +56,4 @@ void MouseBLE_::move(int x, int y, signed char wheel) {
    PicoBluetoothBLEHID.send(&data, sizeof(data));
 }

-void MouseBLE_::buttons(uint8_t b) {
-    if (b != _buttons) {
-        _buttons = b;
-        move(0, 0, 0);
-    }
-}
-
-void MouseBLE_::press(uint8_t b) {
-    buttons(_buttons | b);
-}
-
-void MouseBLE_::release(uint8_t b) {
-    buttons(_buttons & ~b);
-}
-
-bool MouseBLE_::isPressed(uint8_t b) {
-    if ((b & _buttons) > 0) {
-        return true;
-    } else {
-        return false;
-    }
-}
-
 MouseBLE_ MouseBLE;
@@ -22,30 +22,15 @@
 #ifndef MOUSEBLE_h
 #define MOUSEBLE_h

-#include <Arduino.h>
+#include <HID_Mouse.h>

-//================================================================================
-//================================================================================
-//  Mouse
-
-#define MOUSE_LEFT 1
-#define MOUSE_RIGHT 2
-#define MOUSE_MIDDLE 4
-#define MOUSE_ALL (MOUSE_LEFT | MOUSE_RIGHT | MOUSE_MIDDLE)
-
-class MouseBLE_ {
-private:
-    uint8_t _buttons;
-    void buttons(uint8_t b);
+class MouseBLE_ : public HID_Mouse {
 public:
    MouseBLE_(void);
-    void begin(void);
+    void begin(const char *localName = nullptr, const char *hidName = nullptr);
    void end(void);
-    void click(uint8_t b = MOUSE_LEFT);
-    void move(int x, int y, signed char wheel = 0);
-    void press(uint8_t b = MOUSE_LEFT);   // press LEFT by default
-    void release(uint8_t b = MOUSE_LEFT); // release LEFT by default
-    bool isPressed(uint8_t b = MOUSE_LEFT); // check LEFT by default
+    virtual void move(int x, int y, signed char wheel = 0) override;
+    void setBattery(int lvl);
 };
 extern MouseBLE_ MouseBLE;

@@ -6,7 +6,7 @@

 void setup() {
  Serial.begin(115200);
-  MouseBT.begin();
+  MouseBT.begin("BarrelMouse");
  delay(5000);
  Serial.printf("Press BOOTSEL to move the mouse in a circle\n");
 }
@@ -22,47 +22,27 @@
 #include "MouseBT.h"
 #include <PicoBluetoothHID.h>

-//================================================================================
-//================================================================================
-//	Mouse
-
-/*  This function is for limiting the input value for x and y
-    axis to -127 <= x/y <= 127 since this is the allowed value
-    range for a USB HID device.
-*/
-static signed char limit_xy(int const xy) {
-    if (xy < -127) {
-        return -127;
-    } else if (xy >  127) {
-        return 127;
-    } else {
-        return xy;
-    }
-}
-
-MouseBT_::MouseBT_(void) : _buttons(0) {
+MouseBT_::MouseBT_(void) {
    /* noop */
 }

 #define REPORT_ID 0x01
 const uint8_t desc_mouse[] = {TUD_HID_REPORT_DESC_MOUSE(HID_REPORT_ID(REPORT_ID))};
-void MouseBT_::begin(void) {
-    PicoBluetoothHID.startHID("PicoW Mouse 00:00:00:00:00:00", "PicoW HID Mouse", 0x2580, 33, desc_mouse, sizeof(desc_mouse));
+
+void MouseBT_::begin(const char *localName, const char *hidName) {
+    if (!localName) {
+        localName = "PicoW Mouse 00:00:00:00:00:00";
+    }
+    if (!hidName) {
+        hidName = localName;
+    }
+    PicoBluetoothHID.startHID(localName, hidName, 0x2580, 33, desc_mouse, sizeof(desc_mouse));
 }

 void MouseBT_::end(void) {
    PicoBluetoothHID.end();
 }

-void MouseBT_::click(uint8_t b) {
-    _buttons = b;
-    move(0, 0, 0);
-    delay(10);
-    _buttons = 0;
-    move(0, 0, 0);
-    delay(10);
-}
-
 void MouseBT_::move(int x, int y, signed char wheel) {
    hid_mouse_report_t data;
    data.buttons = _buttons;
@@ -73,27 +53,4 @@ void MouseBT_::move(int x, int y, signed char wheel) {
    PicoBluetoothHID.send(REPORT_ID, &data, sizeof(data));
 }

-void MouseBT_::buttons(uint8_t b) {
-    if (b != _buttons) {
-        _buttons = b;
-        move(0, 0, 0);
-    }
-}
-
-void MouseBT_::press(uint8_t b) {
-    buttons(_buttons | b);
-}
-
-void MouseBT_::release(uint8_t b) {
-    buttons(_buttons & ~b);
-}
-
-bool MouseBT_::isPressed(uint8_t b) {
-    if ((b & _buttons) > 0) {
-        return true;
-    } else {
-        return false;
-    }
-}
-
 MouseBT_ MouseBT;
@@ -22,30 +22,14 @@
 #ifndef MOUSEBT_h
 #define MOUSEBT_h

-#include <Arduino.h>
+#include <HID_Mouse.h>

-//================================================================================
-//================================================================================
-//  Mouse
-
-#define MOUSE_LEFT 1
-#define MOUSE_RIGHT 2
-#define MOUSE_MIDDLE 4
-#define MOUSE_ALL (MOUSE_LEFT | MOUSE_RIGHT | MOUSE_MIDDLE)
-
-class MouseBT_ {
-private:
-    uint8_t _buttons;
-    void buttons(uint8_t b);
+class MouseBT_ : public HID_Mouse {
 public:
    MouseBT_(void);
-    void begin(void);
+    void begin(const char *localName = nullptr, const char *hidName = nullptr);
    void end(void);
-    void click(uint8_t b = MOUSE_LEFT);
-    void move(int x, int y, signed char wheel = 0);
-    void press(uint8_t b = MOUSE_LEFT);   // press LEFT by default
-    void release(uint8_t b = MOUSE_LEFT); // release LEFT by default
-    bool isPressed(uint8_t b = MOUSE_LEFT); // check LEFT by default
+    virtual void move(int x, int y, signed char wheel = 0) override;
 };
 extern MouseBT_ MouseBT;

@@ -1,9 +0,0 @@
-name=PicoBluetoothHID
-version=1.0.0
-author=Earle F. Philhower, III <earlephilhower@yahoo.com>
-maintainer=Earle F. Philhower, III <earlephilhower@yahoo.com>
-sentence=Implements a HID device base class for PicoW Bluetooth Classic
-paragraph=Implements a HID device base class for PicoW Bluetooth Classic
-category=Device Control
-url=https://github.com/earlephilhower/arduino-pico
-architectures=rp2040
@@ -328,7 +328,9 @@ public:
                return false;
            }

-
+            if (!_pcb) {
+                return false;
+            }
            // force lwIP to send what can be sent
            tcp_output(_pcb);

@@ -522,6 +524,9 @@ protected:
            const auto remaining = _datalen - _written;
            size_t next_chunk_size;
            {
+                if (!_pcb) {
+                    return false;
+                }
                next_chunk_size = std::min((size_t)tcp_sndbuf(_pcb), remaining);
                // Potentially reduce transmit size if we are tight on memory, but only if it doesn't return a 0 chunk size
                if (next_chunk_size > (size_t)(1 << scale)) {
@@ -550,6 +555,9 @@ protected:
                flags |= TCP_WRITE_FLAG_COPY;
            }

+            if (!_pcb) {
+                return false;
+            }
            err_t err = tcp_write(_pcb, buf, next_chunk_size, flags);

            DEBUGV(":wrc %d %d %d\r\n", next_chunk_size, remaining, (int)err);
@@ -571,7 +579,7 @@ protected:
            }
        }

-        if (has_written) {
+        if (has_written && _pcb) {
            // lwIP's tcp_output doc: "Find out what we can send and send it"
            // *with respect to Nagle*
            // more info: https://lists.gnu.org/archive/html/lwip-users/2017-11/msg00134.html
@@ -3,7 +3,7 @@ version=1
 author=Earle F. Philhower, III
 maintainer=Earle F. Philhower, III <earlephilhower@yahoo.com>
 sentence=RP2040 Cyw43XX wifi driver
-paragraph=Driver for the raspberry Pi Pico W wireless chip, CYW43439, to integrate witrh arduino-pico
+paragraph=Driver for the Raspberry Pi Pico W wireless chip, CYW43439, to integrate with arduino-pico
 category=Communication
 url=https://github.com/earlephilhower/arduino-pico
 architectures=rp2040
@@ -68,10 +68,15 @@ bool CYW43::begin(const uint8_t* address, netif* netif) {

        // Not currently possible to hook up igmp_mac_filter and mld_mac_filter
        // TODO: implement igmp_mac_filter and mld_mac_filter
-#if LWIP_IPV6
-        // Implement cyw43_set_allmulti(_self, true) using exposed ioctl call
+        // Implement cyw43_set_allmulti(_self, true) using exposed ioctl call (may not be functional in SDK 1.5?)
        uint8_t allmulti_true[] = { 'a', 'l', 'l', 'm', 'u', 'l', 't', 'i', 0, 1, 0, 0, 0 };
        cyw43_ioctl(&cyw43_state, CYW43_IOCTL_SET_VAR, sizeof allmulti_true, allmulti_true, CYW43_ITF_STA);
+        // Add MDNS multicast MAC addresses manually, thanks Wikipedia!
+        uint8_t mdnsV4[] = {0x01, 0x00, 0x5E, 0x00, 0x00, 0xFB};
+        cyw43_wifi_update_multicast_filter(&cyw43_state, mdnsV4, true);
+#if LWIP_IPV6
+        uint8_t mdnsV6[] = {0x33, 0x33, 0x00, 0x00, 0x00, 0xFB};
+        cyw43_wifi_update_multicast_filter(&cyw43_state, mdnsV6, true);
 #endif

        if (_bssid[0] | _bssid[1] | _bssid[2] | _bssid[3] | _bssid[4] | _bssid[5]) {
@@ -1,6 +1,6 @@
 {
  "name": "framework-arduinopico",
-  "version": "1.30000.0",
+  "version": "1.30100.0",
  "description": "Arduino Wiring-based Framework (RPi Pico RP2040)",
  "keywords": [
    "framework",
@@ -32,6 +32,9 @@
                  {
                     "name": "Adafruit Feather RP2040 SCORPIO"
                  },
+                  {
+                     "name": "Adafruit Feather RP2040 DVI"
+                  },
                  {
                     "name": "Adafruit ItsyBitsy RP2040"
                  },
@@ -110,6 +113,9 @@
                  {
                     "name": "Melopero Shake RP2040"
                  },
+                  {
+                     "name": "Neko Systems BL2040 Mini"
+                  },
                  {
                     "name": "nullbits Bit-C PRO"
                  },
@@ -20,7 +20,7 @@
 # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification

 name=Raspberry Pi RP2040 Boards
-version=3.0.0
+version=3.1.0

 runtime.tools.pqt-gcc.path={runtime.platform.path}/system/arm-none-eabi
 runtime.tools.pqt-python3.path={runtime.platform.path}/system/python3
@@ -94,7 +94,7 @@ build.flags.libstdcpp=-lstdc++
 build.flags.exceptions=-fno-exceptions
 build.flags.stackprotect=
 build.libpico=libpico.a
-build.libpicow=libpicow-noipv6-nobtc-nobtle.a
+build.libpicow=libpicow-noipv6-nobtc-noble.a
 build.boot2=boot2_generic_03h_4_padded_checksum
 build.libpicowdefs=-DLWIP_IPV6=0 -DLWIP_IPV4=1
 build.wificc=-DWIFICC=CYW43_COUNTRY_WORLDWIDE
@@ -9,8 +9,9 @@ for dir in ./cores/rp2040 ./libraries/EEPROM ./libraries/I2S ./libraries/SingleF
           ./libraries/PicoOTA ./libraries/SDFS ./libraries/ArduinoOTA \
           ./libraries/Updater ./libraries/HTTPClient ./libraries/HTTPUpdate \
           ./libraries/WebServer ./libraries/HTTPUpdateServer ./libraries/DNSServer \
-           ./libraries/PicoBluetoothHID ./libraries/JoystickBT ./libraries/KeyboardBT \
-           ./libraries/MouseBT ./libraries/SerialBT ./libraries/PicoBluetoothBLEHID \
+           ./libraries/Joystick ./libraries/Keyboard ./libraries/Mouse \
+           ./libraries/JoystickBT ./libraries/KeyboardBT \
+           ./libraries/MouseBT ./libraries/SerialBT ./libraries/HID_Bluetooth \
           ./libraries/JoystickBLE ./libraries/KeyboardBLE ./libraries/MouseBLE ; do
    find $dir -type f \( -name "*.c" -o -name "*.h" -o -name "*.cpp" \) -a  \! -path '*api*' -exec astyle --suffix=none --options=./tests/astyle_core.conf \{\} \;
    find $dir -type f -name "*.ino" -exec astyle --suffix=none --options=./tests/astyle_examples.conf \{\} \;
@@ -0,0 +1,54 @@
+{
+  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x239A",
+        "usb_pid": "0x8127"
+      }
+    },
+    "core": "earlephilhower",
+    "cpu": "cortex-m0plus",
+    "extra_flags": "-D ARDUINO_ADAFRUIT_FEATHER_RP2040_DVI -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
+    "f_cpu": "133000000L",
+    "hwids": [
+      [
+        "0x2E8A",
+        "0x00C0"
+      ],
+      [
+        "0x239A",
+        "0x8127"
+      ]
+    ],
+    "mcu": "rp2040",
+    "variant": "adafruit_feather_dvi"
+  },
+  "debug": {
+    "jlink_device": "RP2040_M0_0",
+    "openocd_target": "rp2040.cfg",
+    "svd_path": "rp2040.svd"
+  },
+  "frameworks": [
+    "arduino"
+  ],
+  "name": "Feather RP2040 DVI",
+  "upload": {
+    "maximum_ram_size": 270336,
+    "maximum_size": 8388608,
+    "require_upload_port": true,
+    "native_usb": true,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": false,
+    "protocol": "picotool",
+    "protocols": [
+      "cmsis-dap",
+      "jlink",
+      "raspberrypi-swd",
+      "picotool",
+      "picoprobe"
+    ]
+  },
+  "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+  "vendor": "Adafruit"
+}
@@ -0,0 +1,54 @@
+{
+  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_generic_03h_2_padded_checksum.S",
+        "usb_vid": "0x2E8A",
+        "usb_pid": "0x000A"
+      }
+    },
+    "core": "earlephilhower",
+    "cpu": "cortex-m0plus",
+    "extra_flags": "-D ARDUINO_NEKOSYSTEMS_BL2040_MINI -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=500",
+    "f_cpu": "133000000L",
+    "hwids": [
+      [
+        "0x2E8A",
+        "0x00C0"
+      ],
+      [
+        "0x2E8A",
+        "0x000A"
+      ]
+    ],
+    "mcu": "rp2040",
+    "variant": "nekosystems_bl2040_mini"
+  },
+  "debug": {
+    "jlink_device": "RP2040_M0_0",
+    "openocd_target": "rp2040.cfg",
+    "svd_path": "rp2040.svd"
+  },
+  "frameworks": [
+    "arduino"
+  ],
+  "name": "BL2040 Mini",
+  "upload": {
+    "maximum_ram_size": 270336,
+    "maximum_size": 4194304,
+    "require_upload_port": true,
+    "native_usb": true,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": false,
+    "protocol": "picotool",
+    "protocols": [
+      "cmsis-dap",
+      "jlink",
+      "raspberrypi-swd",
+      "picotool",
+      "picoprobe"
+    ]
+  },
+  "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+  "vendor": "Neko Systems"
+}
@@ -75,6 +75,13 @@ def BuildBoot(name):
        print("%s.menu.boot2.%s=%s" % (name, l[1], l[0]))
        print("%s.menu.boot2.%s.build.boot2=%s" % (name, l[1], l[1]))

+# Abbreviated Boot Stage 2 menu for some W25Q-equipped Adafruit boards.
+# In extreme overclock situations, these may require QSPI /4 to work.
+def BuildBootW25Q(name):
+    for l in [ ("W25Q080 QSPI /2", "boot2_w25q080_2_padded_checksum"), ("W25Q080 QSPI /4", "boot2_w25q080_4_padded_checksum")]:
+        print("%s.menu.boot2.%s=%s" % (name, l[1], l[0]))
+        print("%s.menu.boot2.%s.build.boot2=%s" % (name, l[1], l[1]))
+
 def BuildUSBStack(name):
    print("%s.menu.usbstack.picosdk=Pico SDK" % (name))
    print('%s.menu.usbstack.picosdk.build.usbstack_flags=' % (name))
@@ -223,6 +230,8 @@ def MakeBoard(name, vendor_name, product_name, vid, pid, pwr, boarddefine, flash
    BuildIPBTStack(name)
    if name == "generic":
        BuildBoot(name)
+    elif name.startswith("adafruit") and "w25q080" in boot2:
+        BuildBootW25Q(name)
    BuildUploadMethodMenu(name)
    MakeBoardJSON(name, vendor_name, product_name, vid, pid, pwr, boarddefine, flashsizemb, boot2, extra)
    global pkgjson
@@ -329,6 +338,7 @@ MakeBoard("0xcb_helios", "0xCB", "Helios", "0x1209", "0xCB74", 500, "0XCB_HELIOS
 # Adafruit
 MakeBoard("adafruit_feather", "Adafruit", "Feather RP2040", "0x239a", "0x80f1", 250, "ADAFRUIT_FEATHER_RP2040", 8, "boot2_w25x10cl_4_padded_checksum")
 MakeBoard("adafruit_feather_scorpio", "Adafruit", "Feather RP2040 SCORPIO", "0x239a", "0x8121", 250, "ADAFRUIT_FEATHER_RP2040_SCORPIO", 8, "boot2_w25q080_2_padded_checksum")
+MakeBoard("adafruit_feather_dvi", "Adafruit", "Feather RP2040 DVI", "0x239a", "0x8127", 250, "ADAFRUIT_FEATHER_RP2040_DVI", 8, "boot2_w25q080_2_padded_checksum")
 MakeBoard("adafruit_itsybitsy", "Adafruit", "ItsyBitsy RP2040", "0x239a", "0x80fd", 250, "ADAFRUIT_ITSYBITSY_RP2040", 8, "boot2_w25q080_2_padded_checksum")
 MakeBoard("adafruit_qtpy", "Adafruit", "QT Py RP2040", "0x239a", "0x80f7", 250, "ADAFRUIT_QTPY_RP2040", 8, "boot2_w25q080_2_padded_checksum")
 MakeBoard("adafruit_stemmafriend", "Adafruit", "STEMMA Friend RP2040", "0x239a", "0x80e3", 250, "ADAFRUIT_STEMMAFRIEND_RP2040", 8, "boot2_w25q080_2_padded_checksum")
@@ -376,6 +386,9 @@ MakeBoard("ilabs_rpico32", "iLabs", "RPICO32", "0x2e8a", "0x1010", 250, "ILABS_2
 MakeBoard("melopero_cookie_rp2040", "Melopero", "Cookie RP2040", "0x2e8a", "0x1011", 250, "MELOPERO_COOKIE_RP2040", 8, "boot2_w25q080_2_padded_checksum")
 MakeBoard("melopero_shake_rp2040", "Melopero", "Shake RP2040", "0x2e8a", "0x1005", 250, "MELOPERO_SHAKE_RP2040", 16, "boot2_w25q080_2_padded_checksum")

+# Neko Systems
+MakeBoard("nekosystems_bl2040_mini", "Neko Systems", "BL2040 Mini", "0x2e8a", "0x000a", 500, "NEKOSYSTEMS_BL2040_MINI", 4, "boot2_generic_03h_2_padded_checksum")
+
 # nullbits
 MakeBoard("nullbits_bit_c_pro", "nullbits", "Bit-C PRO", "0x2e8a", "0x6e61", 500, "NULLBITS_BIT_C_PRO", 4, "boot2_w25x10cl_4_padded_checksum")

@@ -81,7 +81,18 @@ env.Replace(

 # pico support library depends on ipv6 enable/disable
 libpico = File(os.path.join(FRAMEWORK_DIR, "lib", "libpico.a"))
-if "PIO_FRAMEWORK_ARDUINO_ENABLE_IPV6" in flatten_cppdefines:
+if "PIO_FRAMEWORK_ARDUINO_ENABLE_BLUETOOTH" in flatten_cppdefines:
+    if "PIO_FRAMEWORK_ARDUINO_ENABLE_IPV6" in flatten_cppdefines:
+        libpicow = File(os.path.join(FRAMEWORK_DIR, "lib", "libpicow-ipv6-btc-ble.a"))
+    else:
+        libpicow = File(os.path.join(FRAMEWORK_DIR, "lib", "libpicow-noipv6-btc-ble.a"))
+    env.Append(
+        CPPDEFINES=[
+            ("ENABLE_CLASSIC", 1),
+            ("ENABLE_BLE", 1)
+        ]
+    )
+elif "PIO_FRAMEWORK_ARDUINO_ENABLE_IPV6" in flatten_cppdefines:
    libpicow = File(os.path.join(FRAMEWORK_DIR, "lib", "libpicow-ipv6-nobtc-noble.a"))
 else:
    libpicow = File(os.path.join(FRAMEWORK_DIR, "lib", "libpicow-noipv6-nobtc-noble.a"))
@@ -0,0 +1,42 @@
+#pragma once
+
+// Pin definitions taken from:
+//    https://learn.adafruit.com/assets/100337
+
+// LEDs
+#define PIN_LED        (13u)
+
+// NeoPixel
+#define PIN_NEOPIXEL   (4u)
+
+// Serial
+#define PIN_SERIAL1_TX (0u)
+#define PIN_SERIAL1_RX (1u)
+
+// Not pinned out
+#define PIN_SERIAL2_TX (31u)
+#define PIN_SERIAL2_RX (31u)
+
+// SPI
+#define PIN_SPI0_MISO  (8u)
+#define PIN_SPI0_MOSI  (15u)
+#define PIN_SPI0_SCK   (14u)
+#define PIN_SPI0_SS    (13u)
+
+// Not pinned out
+#define PIN_SPI1_MISO  (31u)
+#define PIN_SPI1_MOSI  (31u)
+#define PIN_SPI1_SCK   (31u)
+#define PIN_SPI1_SS    (31u)
+
+// Wire
+#define PIN_WIRE0_SDA  (2u)
+#define PIN_WIRE0_SCL  (3u)
+#define PIN_WIRE1_SDA  (31u)
+#define PIN_WIRE1_SCL  (31u)
+
+#define SERIAL_HOWMANY (2u)
+#define SPI_HOWMANY    (1u)
+#define WIRE_HOWMANY   (1u)
+
+#include "../generic/common.h"
@@ -30,10 +30,10 @@
 #define PIN_SPI1_SS    (31u)

 // Wire
-#define PIN_WIRE0_SDA  (2u)
-#define PIN_WIRE0_SCL  (3u)
-#define PIN_WIRE1_SDA  (31u)
-#define PIN_WIRE1_SCL  (31u)
+#define PIN_WIRE0_SDA (24u)
+#define PIN_WIRE0_SCL (25u)
+#define PIN_WIRE1_SDA (2u)
+#define PIN_WIRE1_SCL (3u)

 #define SERIAL_HOWMANY (2u)
 #define SPI_HOWMANY    (1u)
@@ -0,0 +1,69 @@
+#pragma once
+
+// MOTOR CONTROL SECTION:
+// SimpleFOC Flags
+#define SIMPLEFOC_PWM_HIGHSIDE_ACTIVE_HIGH true
+#define SIMPLEFOC_PWM_LOWSIDE_ACTIVE_HIGH false
+
+// Important Constants
+#define CURR_SENSE_RES  (0.001f)
+#define CURR_SENSE_GAIN (66.0f)
+
+// Power Stage Control Pins
+#define PIN_PWMH_A     (0u)
+#define PIN_PWML_A     (1u)
+#define PIN_PWMH_B     (2u)
+#define PIN_PWML_B     (3u)
+#define PIN_PWMH_C     (4u)
+#define PIN_PWML_C     (5u)
+
+// Hall-Effect Angle Sensor Pins
+#define PIN_HALL_RX    (16u)
+#define PIN_HALL_CS    (17u)
+#define PIN_HALL_SCK   (18u)
+
+// Current Sensing Pins
+#define PIN_IOUT_A     (26u)    // Analog Input
+#define PIN_IOUT_B     (27u)    // Analog Input
+
+// Power Supply Feedback Pins
+#define PIN_VBUS_DET   (7u)     // Digital Input
+#define PIN_VCC_SENSE  (28u)    // Analog Input
+
+
+// STANDARD SECTION:
+// LED
+#define PIN_LED        (6u)
+
+// Serial
+#define PIN_SERIAL1_TX (12u)
+#define PIN_SERIAL1_RX (13u)
+
+#define PIN_SERIAL2_TX (20u)
+#define PIN_SERIAL2_RX (21u)
+
+// NOTE: SPI0 is used by the on-board magnetic angle sensor,
+// do not change the pins assigned to this SPI object!
+// SPI
+#define PIN_SPI0_MISO  (16u)
+#define PIN_SPI0_MOSI  (19u)
+#define PIN_SPI0_SCK   (18u)
+#define PIN_SPI0_SS    (17u)
+
+#define PIN_SPI1_MISO  (8u)
+#define PIN_SPI1_MOSI  (11u)
+#define PIN_SPI1_SCK   (10u)
+#define PIN_SPI1_SS    (9u)
+
+// Wire
+#define PIN_WIRE0_SDA  (24u)
+#define PIN_WIRE0_SCL  (25u)
+
+#define PIN_WIRE1_SDA  (22u)
+#define PIN_WIRE1_SCL  (23u)
+
+#define SERIAL_HOWMANY (3u)
+#define SPI_HOWMANY    (2u)
+#define WIRE_HOWMANY   (2u)
+
+#include "../generic/common.h"
@@ -30,7 +30,7 @@
 #define PIN_LCD_RST     (12u)       
 #define PIN_LCD_BL      (25u)       
 // BAT_ADC                          
-#define PIN_BAT_ADC      (25u)      
+#define PIN_BAT_ADC      (29u)
 // IMU                              
 #define PIN_IMU_SDA      (6u)        
 #define PIN_IMU_SCL      (7u)
Author	SHA1	Message	Date
Earle F. Philhower, III	7851dc8cb7	Update version	2023-03-10 09:08:28 -08:00
Philipp Molitor	75c553c391	Fix pin assigment for Waveshare RP2040 1.28 LCD PIN_BAT_ADC (#1292 )	2023-03-10 04:31:33 -08:00
Earle F. Philhower, III	6bff270402	Manually add MDNS multicast Ethernet MACs to CYW43 (#1290 ) SDK 1.5 changed the behavior of the underlying CYW43 blob, and it seems to block MDNS multicast by default. Manually add back the Ethernet MACs used for MDNS multicast in IPV4 and IPV6. Fixes #1267	2023-03-09 14:15:14 -08:00
nanoparticle	72f1e53106	Add board definition for Neko Systems BL2040 Mini (#1258 )	2023-03-09 10:30:54 -08:00
Earle F. Philhower, III	e6c7b97b5e	Adjust LWIP intf to avoid hangs/crashes under load (#1286 ) It seems possible now for TCP connection _pcbs to disappear while being processed, due to the new async context configuration. This would cause LWIP to panic when a NULL pcb was passed in. Check for and avoid passing in null PCBs in the ClientContext. Undo special-casing of sys_check_timeouts wrapper AdvancedWebServer with heavy F5-refresh and #1274 test both pass. Fixes #1274	2023-03-08 11:48:23 -08:00
whimsee	54f9d3c414	Reassign I2C pins to correct buses (#1255 )	2023-03-05 14:56:53 -08:00
Tim Boldtandtimboldt	9e272733cf	Add instructions for making I2S input work with Adafruit microphone (#1272 ) Co-authored-by: timboldt <tim.boldt@gmail.com>	2023-03-05 14:24:31 -08:00
Earle F. Philhower, III	51afd3440f	Add Bluetooth to the PIO CI (#1269 )	2023-03-05 08:48:24 -08:00
Sanjay Govind	f67bc43584	Add Bluetooth support to Platform.io (#1259 )	2023-03-05 08:23:22 -08:00
Earle F. Philhower, III	79e1af7bde	Add Keyboard LED callback for USB and BT (not BLE) (#1265 ) BLE seems to require some kind of characteristic callback that is not yeet implemented here. USB and BT tested and examples updated.	2023-03-04 14:18:40 -08:00
Earle F. Philhower, III	173c44417c	Allow setting names for BT/BLE HID devices (#1260 )	2023-03-04 12:38:34 -08:00
Earle F. Philhower, III	7aa1c08d17	Use generic HID classes to minimize code duplic'n (#1254 ) Move the Joystick, Keyboard, and Mouse into a base class which handles the operation/input, and a subclass which will implement the reporting as a HID device via USB, Bluetooth Classic, or Bluetooth Low Energy (BLE). Reduce copies of library code and makes maintainability much better.	2023-03-03 11:12:09 -08:00
Rei Vilo	0be1d9c3ea	Fix picow default libname in platform.txt (#1250 )	2023-03-03 07:40:02 -08:00
Earle F. Philhower, III	305e194993	Add setBattery to BLE HID devices (#1246 )	2023-03-02 15:55:18 -08:00
Paint Your Dragon	719ab019a4	Add Adafruit Feather RP2040 DVI (#1245 ) Includes option for QSPI/4 flash access on specific Adafruit boards for use when overclocking.	2023-03-02 15:54:19 -08:00
Earle F. Philhower, III	e9df18f910	Update PicoBluetoothBLEHID.cpp	2023-03-02 08:18:02 -08:00