* Regenerate keys with public key matching user defined first byte

* Add cli command to regenerate key pair
2025-10-26 20:11:30 +01:00 · 2025-10-25 13:20:04 +02:00
142 changed files with 681 additions and 5414 deletions
--- a/README.md
+++ b/README.md
@@ -97,10 +97,10 @@ Here are some general principals you should try to adhere to:

 There are a number of fairly major features in the pipeline, with no particular time-frames attached yet. In very rough chronological order:
 - [X] Companion radio: UI redesign
- [X] Repeater + Room Server: add ACL's (like Sensor Node has)
- [X] Standardise Bridge mode for repeaters
+- [ ] Repeater + Room Server: add ACL's (like Sensor Node has)
+- [ ] Standardise Bridge mode for repeaters
 - [ ] Repeater/Bridge: Standardise the Transport Codes for zoning/filtering
- [X] Core + Repeater: enhanced zero-hop neighbour discovery
+- [ ] Core + Repeater: enhanced zero-hop neighbour discovery
 - [ ] Core: round-trip manual path support
 - [ ] Companion + Apps: support for multiple sub-meshes (and 'off-grid' client repeat mode)
 - [ ] Core + Apps: support for LZW message compression
@@ -113,3 +113,12 @@ There are a number of fairly major features in the pipeline, with no particular
 - Report bugs and request features on the [GitHub Issues](https://github.com/ripplebiz/MeshCore/issues) page.
 - Find additional guides and components on [my site](https://buymeacoffee.com/ripplebiz).
 - Join [MeshCore Discord](https://discord.gg/BMwCtwHj5V) to chat with the developers and get help from the community.
+
+## RAK Wireless Board Support in PlatformIO
+
+Before building/flashing the RAK4631 targets in this project, there is, unfortunately, some patching you have to do to your platformIO packages to make it work. There is a guide here on the process:
+   [RAK Wireless: How to Perform Installation of Board Support Package in PlatformIO](https://learn.rakwireless.com/hc/en-us/articles/26687276346775-How-To-Perform-Installation-of-Board-Support-Package-in-PlatformIO)
+
+After building, you will need to convert the output firmware.hex file into a .uf2 file you can copy over to your RAK4631 device (after doing a full erase) by using the command `uf2conv.py -f 0xADA52840 -c firmware.hex` with the python script available from:
+   [GitHub: Microsoft - uf2](https://github.com/Microsoft/uf2/blob/master/utils/uf2conv.py)
+
--- a/boards/ESP32-S3-WROOM-1-N4.json
+++ b/boards/ESP32-S3-WROOM-1-N4.json
@@ -1,39 +0,0 @@
-{
-  "build": {
-    "arduino": {
-      "ldscript": "esp32s3_out.ld"
-    },
-    "core": "esp32",
-    "extra_flags": [
-      "-D ARDUINO_USB_CDC_ON_BOOT=0",
-      "-D ARDUINO_USB_MSC_ON_BOOT=0",
-      "-D ARDUINO_USB_DFU_ON_BOOT=0",
-      "-D ARDUINO_USB_MODE=0",
-      "-D ARDUINO_RUNNING_CORE=1",
-      "-D ARDUINO_EVENT_RUNNING_CORE=1"
-    ],
-    "f_cpu": "240000000L",
-    "f_flash": "80000000L",
-    "flash_mode": "qio",
-    "hwids": [["0x303A", "0x1001"]],
-    "mcu": "esp32s3",
-    "variant": "ESP32-S3-WROOM-1-N4"
-  },
-  "connectivity": ["wifi", "bluetooth"],
-  "debug": {
-    "default_tool": "esp-builtin",
-    "onboard_tools": ["esp-builtin"],
-    "openocd_target": "esp32s3.cfg"
-  },
-  "frameworks": ["arduino", "espidf"],
-  "name": "ESP32-S3-WROOM-1-N4 (4 MB Flash, No PSRAM)",
-  "upload": {
-    "flash_size": "4MB",
-    "maximum_ram_size": 524288,
-    "maximum_size": 4194304,
-    "require_upload_port": true,
-    "speed": 921600
-  },
-  "url": "https://www.espressif.com/sites/default/files/documentation/esp32-s3-wroom-1_wroom-1u_datasheet_en.pdf",
-  "vendor": "Espressif"
-}
--- a/boards/keepteen_lt1.json
+++ b/boards/keepteen_lt1.json
@@ -1,79 +0,0 @@
-{
-    "build": {
-      "arduino":{
-        "ldscript": "nrf52840_s140_v6.ld"
-      },
-      "core": "nRF5",
-      "cpu": "cortex-m4",
-      "extra_flags": "-DARDUINO_NRF52840_FEATHER -DNRF52840_XXAA",
-      "f_cpu": "64000000L",
-      "hwids": [
-        [
-          "0x239A",
-          "0x00B3"
-        ],
-        [
-          "0x239A",
-          "0x8029"
-        ],
-        [
-          "0x239A",
-          "0x0029"
-        ],
-        [
-          "0x239A",
-          "0x002A"
-        ],
-        [
-          "0x239A",
-          "0x802A"
-        ]
-      ],
-      "usb_product": "Keepteen LT1",
-      "mcu": "nrf52840",
-      "variant": "Keepteen LT1",
-      "variants_dir": "variants",
-      "bsp": {
-        "name": "adafruit"
-      },
-      "softdevice": {
-        "sd_flags": "-DS140",
-        "sd_name": "s140",
-        "sd_version": "6.1.1",
-        "sd_fwid": "0x00B6"
-      },
-      "bootloader": {
-        "settings_addr": "0xFF000"
-      }
-    },
-    "connectivity": [
-      "bluetooth"
-    ],
-    "debug": {
-      "jlink_device": "nRF52840_xxAA",
-      "svd_path": "nrf52840.svd",
-      "openocd_target": "nrf52.cfg"
-    },
-    "frameworks": [
-      "arduino",
-      "zephyr"
-    ],
-    "name": "Keepteen LT1",
-    "upload": {
-      "maximum_ram_size": 248832,
-      "maximum_size": 815104,
-      "speed": 115200,
-      "protocol": "nrfutil",
-      "protocols": [
-        "jlink",
-        "nrfjprog",
-        "nrfutil",
-        "stlink"
-      ],
-      "use_1200bps_touch": true,
-      "require_upload_port": true,
-      "wait_for_upload_port": true
-    },
-    "url": "http://www.keepteen.com/",
-    "vendor": "Keepteen"
-  }
--- a/build.sh
+++ b/build.sh
@@ -15,8 +15,8 @@ Commands:
  build-room-server-firmwares: Build all chat room server firmwares for all build targets.

 Examples:
-Build firmware for the "RAK_4631_repeater" device target
-$ sh build.sh build-firmware RAK_4631_repeater
+Build firmware for the "RAK_4631_Repeater" device target
+$ sh build.sh build-firmware RAK_4631_Repeater

 Build all firmwares for device targets containing the string "RAK_4631"
 $ sh build.sh build-matching-firmwares <build-match-spec>
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -26,10 +26,6 @@ author: https://github.com/LitBomb<!-- omit from toc -->
  - [3.2. Q: Do I need to set the location for a repeater?](#32-q-do-i-need-to-set-the-location-for-a-repeater)
  - [3.3. Q: What is the password to administer a repeater or a room server?](#33-q-what-is-the-password-to-administer-a-repeater-or-a-room-server)
  - [3.4. Q: What is the password to join a room server?](#34-q-what-is-the-password-to-join-a-room-server)
-  - [3.5. Q: Can I retrieve a repeater's private key or set a repeater's private key?](#35-q-can-i-retrieve-a-repeaters-private-key-or-set-a-repeaters-private-key)
-  - [3.6. Q: The first byte of my repeater's public key collides with an exisitng repeater on the mesh.  How do I get a new private key with a matching public key that has its first byte of my choosing?](#36-q-the-first-byte-of-my-repeaters-public-key-collides-with-an-exisitng-repeater-on-the-mesh--how-do-i-get-a-new-private-key-with-a-matching-public-key-that-has-its-first-byte-of-my-choosing)
-  - [3.7. Q: My repeater maybe suffering from deafness due to high power interference near my mesh's frequency, it is not hearing other in-range MeshCore radios.  what can I do?](#37-q-my-repeater-maybe-suffering-from-deafness-due-to-high-power-interference-near-my-meshs-frequency-it-is-not-hearing-other-in-range-meshcore-radios--what-can-i-do)
-  - [3.8 Q: How do I make my repeater an observer on the mesh](#38-q-how-do-i-make-my-repeater-an-observer-on-the-mesh)
 - [4. T-Deck Related](#4-t-deck-related)
  - [4.1. Q: Is there a user guide for T-Deck, T-Pager, T-Watch, or T-Display Pro?](#41-q-is-there-a-user-guide-for-t-deck-t-pager-t-watch-or-t-display-pro)
  - [4.2. Q: What are the steps to get a T-Deck into DFU (Device Firmware Update) mode?](#42-q-what-are-the-steps-to-get-a-t-deck-into-dfu-device-firmware-update-mode)
@@ -65,31 +61,22 @@ author: https://github.com/LitBomb<!-- omit from toc -->
    - [5.14.3. Python MeshCore](#5143-python-meshcore)
    - [5.14.4. meshcore-cli](#5144-meshcore-cli)
    - [5.14.5. meshcore.js](#5145-meshcorejs)
-    - [5.14.6. pyMC\_core](#5146-pymc_core)
-    - [5.14.7. MeshCore Packet Decoder](#5147-meshcore-packet-decoder)
-    - [5.14.8. meshcore-pi](#5148-meshcore-pi)
-    - [5.14.9. pyMC\_Repeater](#5149-pymc_repeater)
-  - [5.15. Q: Are there client applications for Windows or Mac?](#515-q-are-there-client-applications-for-windows-or-mac)
-  - [5.16. Q: Are there any resources that compare MeshCore to other LoRa systems?](#516-q-are-there-any-resources-that-compare-meshcore-to-other-lora-systems)
 - [6. Troubleshooting](#6-troubleshooting)
  - [6.1. Q: My client says another client or a repeater or a room server was last seen many, many days ago.](#61-q-my-client-says-another-client-or-a-repeater-or-a-room-server-was-last-seen-many-many-days-ago)
  - [6.2. Q: A repeater or a client or a room server I expect to see on my discover list (on T-Deck) or contact list (on a smart device client) are not listed.](#62-q-a-repeater-or-a-client-or-a-room-server-i-expect-to-see-on-my-discover-list-on-t-deck-or-contact-list-on-a-smart-device-client-are-not-listed)
  - [6.3. Q: How to connect to a repeater via BLE (Bluetooth)?](#63-q-how-to-connect-to-a-repeater-via-ble-bluetooth)
  - [6.4. Q: My companion isn't showing up over Bluetooth?](#64-q-my-companion-isnt-showing-up-over-bluetooth)
-  - [6.5. Q: I can't connect via Bluetooth, what is the Bluetooth pairing code?](#65-q-i-cant-connect-via-bluetooth-what-is-the-bluetooth-pairing-code)
-  - [6.6. Q: My Heltec V3 keeps disconnecting from my smartphone.  It can't hold a solid Bluetooth connection.](#66-q-my-heltec-v3-keeps-disconnecting-from-my-smartphone--it-cant-hold-a-solid-bluetooth-connection)
-  - [6.7. Q: My RAK/T1000-E/xiao\_nRF52 device seems to be corrupted, how do I wipe it clean to start fresh?](#67-q-my-rakt1000-exiao_nrf52-device-seems-to-be-corrupted-how-do-i-wipe-it-clean-to-start-fresh)
-  - [6.8. Q: WebFlasher fails on Linux with failed to open](#68-q-webflasher-fails-on-linux-with-failed-to-open)
+  - [6.5. Q: I can't connect via Bluetooth, what is the Bluetooth pairing code?](#64-q-i-cant-connect-via-bluetooth-what-is-the-bluetooth-pairing-code)
+  - [6.6. Q: My Heltec V3 keeps disconnecting from my smartphone.  It can't hold a solid Bluetooth connection.](#65-q-my-heltec-v3-keeps-disconnecting-from-my-smartphone--it-cant-hold-a-solid-bluetooth-connection)
+  - [6.7. Q: My RAK/T1000-E/xiao\_nRF52 device seems to be corrupted, how do I wipe it clean to start fresh?](#66-q-my-rakt1000-exiao_nrf52-device-seems-to-be-corrupted-how-do-i-wipe-it-clean-to-start-fresh)
+  - [6.8. Q: WebFlasher fails on Linux with failed to open](#67-q-webflasher-fails-on-linux-with-failed-to-open)
 - [7. Other Questions:](#7-other-questions)
  - [7.1. Q: How to update nRF (RAK, T114, Seed XIAO) repeater and room server firmware over the air using the new simpler DFU app?](#71-q-how-to-update-nrf-rak-t114-seed-xiao-repeater-and-room-server-firmware-over-the-air-using-the-new-simpler-dfu-app)
-    - [7.1.1 Q: Can I update Seeed Studio Wio Tracker L1 Pro using OTA?](#711-q-can-i-update-seeed-studio-wio-tracker-l1-pro-using-ota)
  - [7.2. Q: How to update ESP32-based devices over the air?](#72-q-how-to-update-esp32-based-devices-over-the-air)
  - [7.3. Q: Is there a way to lower the chance of a failed OTA device firmware update (DFU)?](#73-q-is-there-a-way-to-lower-the-chance-of-a-failed-ota-device-firmware-update-dfu)
  - [7.4. Q: are the MeshCore logo and font available?](#74-q-are-the-meshcore-logo-and-font-available)
  - [7.5. Q: What is the format of a contact or channel QR code?](#75-q-what-is-the-format-of-a-contact-or-channel-qr-code)
-  - [7.6. Q: How do I connect to the companion via WIFI, e.g. using a heltec v3?](#76-q-how-do-i-connect-to-the-companion-via-wifi-eg-using-a-heltec-v3)
-  - [7.7. Q: I have a Station G2, or a Heltec V4, or an Ikoka Stick, or a radio with a EByte E22-900M30S or a E22-900M33S module, what should their transmit power be set to?](#77-q-i-have-a-station-g2-or-a-heltec-v4-or-an-ikoka-stick-or-a-radio-with-a-ebyte-e22-900m30s-or-a-e22-900m33s-module-what-should-their-transmit-power-be-set-to)
- [| | High Output | 22 dBm | 28 dBm | |](#--high-output--22-dbm--28-dbm--)
+  - [7.6. Q: How do I connect to the companion via WIFI, e.g. using a heltec v3?](#76-q-how-do-i-connect-to-the-comnpanion-via-wifi-eg-using-a-heltec-v3)

 ## 1. Introduction

@@ -104,7 +91,7 @@ MeshCore is free and open source:
 * The T-Deck firmware is developed by Scott at Ripple Radios, the creator of MeshCore, is also free to flash on your devices and use


-Some more advanced, but optional features are available on T-Deck if you register your device for a key to unlock.  On the MeshCore smartphone clients for Android and iOS/iPadOS, you can unlock the wait timer for repeater and room server remote management over RF feature.
+Some more advanced, but optional features are available on T-Deck if you register your device for a key to unlock.  On the MeshCore smartphone clients for Android and iOS/iPadOS, you can unlock the wait timer for repeater and room server remote management over RF feature. 

 These features are completely optional and aren't needed for the core messaging experience. They're like super bonus features and to help the developers continue to work on these amazing features, they may charge a small fee for an unlock code to utilise the advanced features.

@@ -118,7 +105,7 @@ Anyone is able to build anything they like on top of MeshCore without paying any
 MeshCore Firmware GitHub: https://github.com/ripplebiz/MeshCore

 NOTE: Andy Kirby has a very useful [intro video](https://www.youtube.com/watch?v=t1qne8uJBAc) for beginners.
-
+ 

 You need LoRa hardware devices to run MeshCore firmware as clients or server (repeater and room server).

@@ -127,7 +114,7 @@ MeshCore is available on a variety of 433MHz, 868MHz and 915MHz LoRa devices. Fo

 For an up-to-date list of supported devices, please go to https://flasher.meshcore.co.uk/

-To use MeshCore without using a phone as the client interface, you can run MeshCore on a LiLygo's T-Deck, T-Deck Plus, T-Pager, T-Watch, or T-Display Pro. MeshCore Ultra firmware running on these devices are a complete off-grid secure communication solution.
+To use MeshCore without using a phone as the client interface, you can run MeshCore on a LiLygo's T-Deck, T-Deck Plus, T-Pager, T-Watch, or T-Display Pro. MeshCore Ultra firmware running on these devices are a complete off-grid secure communication solution.  

 #### 1.2.2. Firmware
 MeshCore has four firmware types that are not available on other LoRa systems. MeshCore has the following:
@@ -135,30 +122,30 @@ MeshCore has four firmware types that are not available on other LoRa systems. M
 #### 1.2.3. Companion Radio Firmware
 Companion radios are for connecting to the Android app or web app as a messenger client. There are two different companion radio firmware versions:

-1. **BLE Companion**
-   BLE Companion firmware runs on a supported LoRa device and connects to a smart device running the Android or iOS MeshCore client over BLE
+1. **BLE Companion**  
+   BLE Companion firmware runs on a supported LoRa device and connects to a smart device running the Android or iOS MeshCore client over BLE 
   <https://meshcore.co.uk/apps.html>

-2. **USB Serial Companion**
-   USB Serial Companion firmware runs on a supported LoRa device and connects to a smart device or a computer over USB Serial running the MeshCore web client
-   <https://meshcore.liamcottle.net/#/>
+2. **USB Serial Companion**  
+   USB Serial Companion firmware runs on a supported LoRa device and connects to a smart device or a computer over USB Serial running the MeshCore web client  
+   <https://meshcore.liamcottle.net/#/>  
   <https://client.meshcore.co.uk/tabs/devices>

 #### 1.2.4. Repeater
-Repeaters are used to extend the range of a MeshCore network. Repeater firmware runs on the same devices that run client firmware. A repeater's job is to forward MeshCore packets to the destination device. It does **not** forward or retransmit every packet it receives, unlike other LoRa mesh systems.
+Repeaters are used to extend the range of a MeshCore network. Repeater firmware runs on the same devices that run client firmware. A repeater's job is to forward MeshCore packets to the destination device. It does **not** forward or retransmit every packet it receives, unlike other LoRa mesh systems.  

 A repeater can be remotely administered using a T-Deck running the MeshCore firmware with remote administration features unlocked, or from a BLE Companion client connected to a smartphone running the MeshCore app.

 #### 1.2.5. Room Server
-A room server is a simple BBS server for sharing posts. T-Deck devices running MeshCore firmware or a BLE Companion client connected to a smartphone running the MeshCore app can connect to a room server.
+A room server is a simple BBS server for sharing posts. T-Deck devices running MeshCore firmware or a BLE Companion client connected to a smartphone running the MeshCore app can connect to a room server. 

 Room servers store message history on them and push the stored messages to users.  Room servers allow roaming users to come back later and retrieve message history.  With channels, messages are either received when it's sent, or not received and missed if the channel user is out of range.  Room servers are different and more like email servers where you can come back later and get your emails from your mail server.

-A room server can be remotely administered using a T-Deck running the MeshCore firmware with remote administration features unlocked, or from a BLE Companion client connected to a smartphone running the MeshCore app.
+A room server can be remotely administered using a T-Deck running the MeshCore firmware with remote administration features unlocked, or from a BLE Companion client connected to a smartphone running the MeshCore app.  

 When a client logs into a room server, the client will receive the previously 32 unseen messages.

-Although room server can also repeat with the command line command `set repeat on`, it is not recommended nor encouraged.  A room server with repeat set to `on` lacks the full set of repeater and remote administration features that are only available in the repeater firmware.
+Although room server can also repeat with the command line command `set repeat on`, it is not recommended nor encouraged.  A room server with repeat set to `on` lacks the full set of repeater and remote administration features that are only available in the repeater firmware.  

 The recommendation is to run repeater and room server on separate devices for the best experience.

@@ -181,32 +168,37 @@ After you flashed the latest firmware onto your repeater device, keep the device

 The repeater and room server CLI reference is here: https://github.com/meshcore-dev/MeshCore/wiki/Repeater-&-Room-Server-CLI-Reference

-If you have more supported devices, you can use your additional devices with the room server firmware.
+If you have more supported devices, you can use your additional devices with the room server firmware.  

 ### 2.2. Q: Does MeshCore cost any money?

-**A:** All radio firmware versions (e.g. for Heltec V3, RAK, T-1000E, etc) are free and open source developed by Scott at Ripple Radios.
+**A:** All radio firmware versions (e.g. for Heltec V3, RAK, T-1000E, etc) are free and open source developed by Scott at Ripple Radios.  

-The native Android and iOS client uses the freemium model and is developed by Liam Cottle, developer of meshtastic map at [meshtastic.liamcottle.net](https://meshtastic.liamcottle.net) on [GitHub](https://github.com/liamcottle/meshtastic-map) and [reticulum-meshchat on github](https://github.com/liamcottle/reticulum-meshchat).
+The native Android and iOS client uses the freemium model and is developed by Liam Cottle, developer of meshtastic map at [meshtastic.liamcottle.net](https://meshtastic.liamcottle.net) on [GitHub](https://github.com/liamcottle/meshtastic-map) and [reticulum-meshchat on github](https://github.com/liamcottle/reticulum-meshchat). 

-The T-Deck firmware is free to download and most features are available without cost.  To support the firmware developer, you can pay for a registration key to unlock your T-Deck for deeper map zoom and remote server administration over RF using the T-Deck.  You do not need to pay for the registration to use your T-Deck for direct messaging and connecting to repeaters and room servers.
+The T-Deck firmware is free to download and most features are available without cost.  To support the firmware developer, you can pay for a registration key to unlock your T-Deck for deeper map zoom and remote server administration over RF using the T-Deck.  You do not need to pay for the registration to use your T-Deck for direct messaging and connecting to repeaters and room servers. 


 ### 2.3. Q: What frequencies are supported by MeshCore?
-**A:** It supports the 868MHz range in the UK/EU and the 915MHz range in New Zealand, Australia, and the USA. Countries and regions in these two frequency ranges are also supported.
+**A:** It supports the 868MHz range in the UK/EU and the 915MHz range in New Zealand, Australia, and the USA. Countries and regions in these two frequency ranges are also supported. The firmware and client allow users to set their preferred frequency.  
+- Australia and New Zealand are on **915.8MHz**
+- UK and EU are on **869.525MHz**
+- Canada and USA are on **910.525MHz**
+- For other regions and countries, please check your local LoRa frequency

-Use the smartphone client or the repeater setup feature on there web flasher to set your radios' RF settings by choosing the preset for your regions.
+In UK and EU, 867.5MHz is not allowed to use 250kHz bandwidth and it only allows 2.5% duty cycle for clients.  869.525Mhz allows an airtime of 10%, 250KHz bandwidth, and a higher EIRP, therefore MeshCore nodes can send more often and with more power. That is why this frequency is chosen for UK and EU.  This is also why Meshtastic also uses this frequency.  

-Recently, as of October 2025, many regions have moved to the "narrow" setting, aka using BW62.5 and a lower SF number (instead of the original SF11).  For example, USA/Canada (Recommended) preset is 910.525MHz, SF7, BW62.5, CR5.
-
-After extensive testing, many regions have switched or about to switch over to BW62.5 and SF7, 8, or 9.  Narrower bandwidth setting and lower SF setting allow MeshCore's radio signals to fit between interference in the ISM band, provide for a lower noise floor, better SNR, and faster transmissions.
-
-If you have consensus from your community in your region to update your region's preset recommendation, please post your update request on  the [#meshcore-app](https://discord.com/channels/1343693475589263471/1391681655911088241) channel on the [MeshCore Discord server ](https://discord.gg/cYtQNYCCRK) to let Liam Cottle know.
+[Source](https://discord.com/channels/826570251612323860/1330643963501351004/1356540643853209641)

+the rest of the radio settings are the same for all frequencies:  
+- Spread Factor (SF): 11  
+- Coding Rate (CR): 5  
+- Bandwidth (BW): 250.00  

+(Originally MeshCore started with SF 10.  recently (as of late April 2025) the community has advocated SF 11 also a viable option for longer range but a little slower transmission. Currently there are MeshCore meshes with SF 10 and SF 11.  Liam Cottle's smartphone app's presets now recommend SF 10 for Australia and SF 11 for all other regions and countries.  EU and UK has SF 10 and SF 11 presets.  Work with your local meshers on deciding with SF number is best for your use cases.  In the future, there may be bridge nodes that can bridge SF 10 and SF 11 (or even different frequencies) traffic.)

 ### 2.4. Q: What is an "advert" in MeshCore?
-**A:**
+**A:** 
 Advert means to advertise yourself on the network. In Reticulum terms it would be to announce. In Meshtastic terms it would be the node sending its node info.

 MeshCore allows you to manually broadcast your name, position and public encryption key, which is also signed to prevent spoofing.  When you click the advert button, it broadcasts that data over LoRa.  MeshCore calls that an Advert. There's two ways to advert, "zero hop" and "flood".
@@ -222,7 +214,7 @@ As of Aug 20 2025, a pending PR on github will change the flood advert to 12 hou

 ### 2.5. Q: Is there a hop limit?

-**A:** Internally the firmware has maximum limit of 64 hops.  In real world settings it will be difficult to get close to the limit due to the environments and timing as packets travel further and further.  We want to hear how far your MeshCore conversations go.
+**A:** Internally the firmware has maximum limit of 64 hops.  In real world settings it will be difficult to get close to the limit due to the environments and timing as packets travel further and further.  We want to hear how far your MeshCore conversations go. 


 ---
@@ -232,14 +224,14 @@ As of Aug 20 2025, a pending PR on github will change the flood advert to 12 hou

 ### 3.1. Q: How do you configure a repeater or a room server?

-**A:** - When MeshCore is flashed onto a LoRa device is for the first time, it is necessary to set the server device's frequency to make it utilize the frequency that is legal in your country or region.
+**A:** - When MeshCore is flashed onto a LoRa device is for the first time, it is necessary to set the server device's frequency to make it utilize the frequency that is legal in your country or region.  

 Repeater or room server can be administered with one of the options below:
-
+  
 - After a repeater or room server firmware is flashed on to a LoRa device, go to <https://config.meshcore.dev> and use the web user interface to connect to the LoRa device via USB serial.  From there you can set the name of the server, its frequency and other related settings, location, passwords etc.

 ![image](https://github.com/user-attachments/assets/2a9d9894-e34d-4dbe-b57c-fc3c250a2d34)
-
+ 
 - Connect the server device using a USB cable to a computer running Chrome on https://flasher.meshcore.co.uk/, then use the `console` feature to connect to the device

 - Use a MeshCore smartphone clients  to remotely administer servers via LoRa.
@@ -248,10 +240,10 @@ Repeater or room server can be administered with one of the options below:

 <https://buymeacoffee.com/ripplebiz/e/249834>

-
+  

 ### 3.2. Q: Do I need to set the location for a repeater?
-**A:** While not required, with location set for a repeater it will show up on the MeshCore map in the future. Set location with the following command:
+**A:** With location set for a repeater, it can show up on a MeshCore map in the future. Set location with the following commands:

 `set lat <GPS Lat> set long <GPS Lon>`

@@ -268,34 +260,6 @@ You can get the latitude and longitude from Google Maps by right-clicking the lo

 `set guest.password {guest-password}`

-### 3.5. Q: Can I retrieve a repeater's private key or set a repeater's private key?
-
-**A:** You can issue these commands to get or set a repeater's private key using a USB serial connection.
-
-`get prv.key` to print a repeater's private key on the serial console
-`set prv.key <hex>` to set a repeater's private key on the serial console
-
-Reboot the repeater after `set prv.key <hex>` command for the new private key to take effect.
-
-### 3.6. Q: The first byte of my repeater's public key collides with an exisitng repeater on the mesh.  How do I get a new private key with a matching public key that has its first byte of my choosing?
-
-**A:** You can generate a new private key and specific the first byte of its public key here:  https://gessaman.com/mc-keygen/
-
-
-### 3.7. Q: My repeater maybe suffering from deafness due to high power interference near my mesh's frequency, it is not hearing other in-range MeshCore radios.  what can I do?
-
-**A:** This may be due to the SX1262 radio's auto gain control feature.  You can use this command to preiodically reset its AGC.  
-
-`set agc.reset.interval <number>`
-
-The `<number>` unit is in seconds and is incremented by 4.  `set agc.reset.interval 4` works well to cure deafness.  
-
-This is a very low cost operation.  AGC reset is done by simply setting `state = STATE_IDLE;` in function `RadioLibWrapper::resetAGC()` in `RadioLibWrappers.cpp`
-
-
-### 3.8 Q: How do I make my repeater an observer on the mesh
-
-**A:** The observer instruction is available here: https://analyzer.letsme.sh/observer/onboard

 ---

@@ -306,14 +270,14 @@ This is a very low cost operation.  AGC reset is done by simply setting `state =
 **A:** Yes, it is available on https://buymeacoffee.com/ripplebiz/ultra-v7-7-guide-meshcore-users

 ### 4.2. Q: What are the steps to get a T-Deck into DFU (Device Firmware Update) mode?
-**A:**
-1. Device off
-2. Connect USB cable to device
-3. Hold down trackball (keep holding)
-4. Turn on device
-5. Hear USB connection sound
-6. Release trackball
-7. T-Deck in DFU mode now
+**A:**  
+1. Device off  
+2. Connect USB cable to device  
+3. Hold down trackball (keep holding)  
+4. Turn on device  
+5. Hear USB connection sound  
+6. Release trackball  
+7. T-Deck in DFU mode now  
 8. At this point you can begin flashing using <https://flasher.meshcore.co.uk/>

 ### 4.3. Q: Why is my T-Deck Plus not getting any satellite lock?
@@ -330,12 +294,10 @@ GPS on T-Deck is always enabled.  You can skip the "GPS clock sync" and the T-De
 **A:** Users have had no issues using 16GB or 32GB SD cards. Format the SD card to **FAT32**.

 ### 4.6. Q: what is the public key for the default public channel?
-**A:**
-T-Deck uses the same key the smartphone apps use but in base64
+**A:** 
+T-Deck uses the same key the smartphone apps use but in base64 
 `izOH6cXN6mrJ5e26oRXNcg==`
-
-There is no `=` key on the T-Deck's hardware keyboard.  You can use the on-screen software keyboard to enter `=`.  Tap the text box to enable the on-screen software keyboard.
-The third character is the capital letter `O` (Oh), not zero `0`
+The third character is the capital letter 'O', not zero `0`

 The smartphone app key is in hex:
 ` 8b3387e9c5cdea6ac9e5edbaa115cd72`
@@ -343,24 +305,24 @@ The smartphone app key is in hex:
 [Source](https://discord.com/channels/826570251612323860/1330643963501351004/1354194409213792388)

 ### 4.7. Q: How do I get maps on T-Deck?
-**A:** You need map tiles. You can get pre-downloaded map tiles here (a good way to support development):
- <https://buymeacoffee.com/ripplebiz/e/342543> (Europe)
+**A:** You need map tiles. You can get pre-downloaded map tiles here (a good way to support development):  
+- <https://buymeacoffee.com/ripplebiz/e/342543> (Europe)  
 - <https://buymeacoffee.com/ripplebiz/e/342542> (US)

-Another way to download map tiles is to use this Python script to get the tiles in the areas you want:
-<https://github.com/fistulareffigy/MTD-Script>
+Another way to download map tiles is to use this Python script to get the tiles in the areas you want:  
+<https://github.com/fistulareffigy/MTD-Script>  

-There is also a modified script that adds additional error handling and parallel downloads:
-<https://discord.com/channels/826570251612323860/1330643963501351004/1338775811548905572>
+There is also a modified script that adds additional error handling and parallel downloads:  
+<https://discord.com/channels/826570251612323860/1330643963501351004/1338775811548905572>  

-UK map tiles are available separately from Andy Kirby on his discord server:
+UK map tiles are available separately from Andy Kirby on his discord server:  
 <https://discord.com/channels/826570251612323860/1330643963501351004/1331346597367386224>

 ### 4.8. Q: Where do the map tiles go?
 Once you have the tiles downloaded, copy the `\tiles` folder to the root of your T-Deck's SD card.

 ### 4.9. Q: How to unlock deeper map zoom and server management features on T-Deck?
-**A:** You can download, install, and use the T-Deck firmware for free, but it has some features (map zoom, server administration) that are enabled if you purchase an unlock code for \$10 per T-Deck device.
+**A:** You can download, install, and use the T-Deck firmware for free, but it has some features (map zoom, server administration) that are enabled if you purchase an unlock code for \$10 per T-Deck device.  
 Unlock page: <https://buymeacoffee.com/ripplebiz/e/249834>

 ### 4.10. Q: How to decipher the diagnostics screen on T-Deck?
@@ -368,17 +330,17 @@ Unlock page: <https://buymeacoffee.com/ripplebiz/e/249834>
 **A: ** Space is tight on T-Deck's screen, so the information is a bit cryptic.  The format is :
 `{hops} l:{packet-length}({payload-len}) t:{packet-type} snr:{n} rssi:{n}`

-See here for packet-type:
+See here for packet-type: 
 https://github.com/meshcore-dev/MeshCore/blob/main/src/Packet.h#L19
+ 

-
-    #define PAYLOAD_TYPE_REQ 0x00 // request (prefixed with dest/src hashes, MAC) (enc data: timestamp, blob)
-    #define PAYLOAD_TYPE_RESPONSE 0x01 // response to REQ or ANON_REQ (prefixed with dest/src hashes, MAC) (enc data: timestamp, blob)
-    #define PAYLOAD_TYPE_TXT_MSG 0x02 // a plain text message (prefixed with dest/src hashes, MAC) (enc data: timestamp, text)
-    #define PAYLOAD_TYPE_ACK 0x03 // a simple ack #define PAYLOAD_TYPE_ADVERT 0x04 // a node advertising its Identity
-    #define PAYLOAD_TYPE_GRP_TXT 0x05 // an (unverified) group text message (prefixed with channel hash, MAC) (enc data: timestamp, "name: msg")
-    #define PAYLOAD_TYPE_GRP_DATA 0x06 // an (unverified) group datagram (prefixed with channel hash, MAC) (enc data: timestamp, blob)
-    #define PAYLOAD_TYPE_ANON_REQ 0x07 // generic request (prefixed with dest_hash, ephemeral pub_key, MAC) (enc data: ...)
+    #define PAYLOAD_TYPE_REQ 0x00 // request (prefixed with dest/src hashes, MAC) (enc data: timestamp, blob) 
+    #define PAYLOAD_TYPE_RESPONSE 0x01 // response to REQ or ANON_REQ (prefixed with dest/src hashes, MAC) (enc data: timestamp, blob) 
+    #define PAYLOAD_TYPE_TXT_MSG 0x02 // a plain text message (prefixed with dest/src hashes, MAC) (enc data: timestamp, text) 
+    #define PAYLOAD_TYPE_ACK 0x03 // a simple ack #define PAYLOAD_TYPE_ADVERT 0x04 // a node advertising its Identity 
+    #define PAYLOAD_TYPE_GRP_TXT 0x05 // an (unverified) group text message (prefixed with channel hash, MAC) (enc data: timestamp, "name: msg") 
+    #define PAYLOAD_TYPE_GRP_DATA 0x06 // an (unverified) group datagram (prefixed with channel hash, MAC) (enc data: timestamp, blob) 
+    #define PAYLOAD_TYPE_ANON_REQ 0x07 // generic request (prefixed with dest_hash, ephemeral pub_key, MAC) (enc data: ...) 
    #define PAYLOAD_TYPE_PATH 0x08 // returned path (prefixed with dest/src hashes, MAC) (enc data: path, extra)

 [Source](https://discord.com/channels/1343693475589263471/1343693475589263474/1350611321040932966)
@@ -408,30 +370,14 @@ https://github.com/meshcore-dev/MeshCore/blob/main/src/Packet.h#L19

 ### 5.1. Q: What are BW, SF, and CR?

-**A:**
+**A:** 

 **BW is bandwidth** - width of frequency spectrum that is used for transmission

 **SF is spreading factor** - how much should the communication spread in time

-**CR is coding rate** - from: https://www.thethingsnetwork.org/docs/lorawan/fec-and-code-rate/
-
-TL;DR: default CR to 5 for good stable links.  If it is not a solid link and is intermittent, change to CR to 7 or 8.
-
-Forward Error Correction is a process of adding redundant bits to the data to be transmitted. During the transmission, data may get corrupted by interference (changes from 0 to 1 / 1 to 0). These error correction bits are used at the receivers for restoring corrupted bits.
-
-The Code Rate of a forward error correction expresses the proportion of bits in a data stream that actually carry useful information.
-
-There are 4 code rates used in LoRaWAN:
-
-4/5
-4/6
-5/7
-4/8
-
-For example, if the code rate is 5/7, for every 5 bits of useful information, the coder generates a total of 7 bits of data, of which 2 bits are redundant.
-
-Making the bandwidth 2x wider (from BW125 to BW250) allows you to send 2x more bytes in the same time. Making the spreading factor 1 step lower (from SF10 to SF9) allows you to send 2x more bytes in the same time.
+**CR is coding rate** - https://www.thethingsnetwork.org/docs/lorawan/fec-and-code-rate/
+Making the bandwidth 2x wider (from BW125 to BW250) allows you to send 2x more bytes in the same time. Making the spreading factor 1 step lower (from SF10 to SF9) allows you to send 2x more bytes in the same time. 

 Lowering the spreading factor makes it more difficult for the gateway to receive a transmission, as it will be more sensitive to noise. You could compare this to two people taking in a noisy place (a bar for example). If you’re far from each other, you have to talk slow (SF10), but if you’re close, you can talk faster (SF7)

@@ -439,14 +385,14 @@ So, it's balancing act between speed of the transmission and resistance to noise
 things network is mainly focused on LoRaWAN, but the LoRa low-level stuff still checks out for any LoRa project

 ### 5.2. Q: Do MeshCore clients repeat?
-**A:** No, MeshCore clients do not repeat.  This is the core of MeshCore's messaging-first design.  This is to avoid devices flooding the air ware and create endless collisions, so messages sent aren't received.
-In MeshCore, only repeaters and room server with `set repeat on` repeat.
+**A:** No, MeshCore clients do not repeat.  This is the core of MeshCore's messaging-first design.  This is to avoid devices flooding the air ware and create endless collisions, so messages sent aren't received.  
+In MeshCore, only repeaters and room server with `set repeat on` repeat.  

 ### 5.3. Q: What happens when a node learns a route via a mobile repeater, and that repeater is gone?

 **A:** If you used to reach a node through a repeater and the repeater is no longer reachable, the client will send the message using the existing (but now broken) known path, the message will fail after 3 retries, and the app will reset the path and send the message as flood on the last retry by default.  This can be turned off in settings.  If the destination is reachable directly or through another repeater, the new path will be used going forward.  Or you can set the path manually if you know a specific repeater to use to reach that destination.

-In the case if users are moving around frequently, and the paths are breaking, they just see the phone client retries and revert to flood to attempt to re-establish a path.
+In the case if users are moving around frequently, and the paths are breaking, they just see the phone client retries and revert to flood to attempt to re-establish a path. 

 ### 5.4. Q: How does a node discovery a path to its destination and then use it to send messages in the future, instead of flooding every message it sends like Meshtastic?

@@ -465,14 +411,14 @@ Routes are stored in sender's contact list.  When you send a message the first t
 **A:** The smartphone app key is in hex:
 ` 8b3387e9c5cdea6ac9e5edbaa115cd72`

-T-Deck uses the same key but in base64
+T-Deck uses the same key but in base64 
 `izOH6cXN6mrJ5e26oRXNcg==`
 The third character is the capital letter 'O', not zero `0`
 [Source](https://discord.com/channels/826570251612323860/1330643963501351004/1354194409213792388)

 ### 5.7. Q: Is MeshCore open source?
-**A:** Most of the firmware is freely available. Everything is open source except the T-Deck firmware and Liam's native mobile apps.
- Firmware repo: https://github.com/meshcore-dev/MeshCore
+**A:** Most of the firmware is freely available. Everything is open source except the T-Deck firmware and Liam's native mobile apps.  
+- Firmware repo: https://github.com/meshcore-dev/MeshCore  

 ### 5.8. Q: How can I support MeshCore?
 **A:** Provide your honest feedback on GitHub and on [MeshCore Discord server](https://discord.gg/BMwCtwHj5V). Spread the word of MeshCore to your friends and communities; help them get started with MeshCore. Support Scott's MeshCore development at <https://buymeacoffee.com/ripplebiz>.
@@ -482,7 +428,7 @@ Support Liam Cottle's smartphone client development by unlocking the server admi
 Support Rastislav Vysoky (recrof)'s flasher web site and the map web site development through [PayPal](https://www.paypal.com/donate/?business=DREHF5HM265ES&no_recurring=0&item_name=If+you+enjoy+my+work%2C+you+can+support+me+here%3A&currency_code=EUR) or [Revolut](https://revolut.me/recrof)

 ### 5.9. Q: How do I build MeshCore firmware from source?
-**A:** See instructions here:
+**A:** See instructions here:  
 https://discord.com/channels/826570251612323860/1330643963501351004/1341826372120608769

 Build instructions for MeshCore:
@@ -502,7 +448,7 @@ Then it should be the same for all platforms:
 python3 -m venv meshcore
 cd meshcore && source bin/activate
 pip install -U platformio
-git clone https://github.com/ripplebiz/MeshCore.git
+git clone https://github.com/ripplebiz/MeshCore.git 
 cd MeshCore
 ```
 open platformio.ini and in `[arduino_base]` edit the `LORA_FREQ=867.5`
@@ -512,8 +458,8 @@ pio run -e RAK_4631_Repeater
 ```
 then you'll find `firmware.zip` in `.pio/build/RAK_4631_Repeater`

-Andy also has a video on how to build using VS Code:
-*How to build and flash Meshcore repeater firmware | Heltec V3*
+Andy also has a video on how to build using VS Code:  
+*How to build and flash Meshcore repeater firmware | Heltec V3*  
 <https://www.youtube.com/watch?v=WJvg6dt13hk> *(Link referenced in the Discord post)*

 ### 5.10. Q: Are there other MeshCore related open source projects?
@@ -530,13 +476,13 @@ Meshcore would not be best suited to ATAK because MeshCore:
 clients do not repeat and therefore you would need a network of repeaters in place
 will not have a stable path where all clients are constantly moving between repeaters

-MeshCore clients would need to reset path constantly and flood traffic across the network which could lead to lots of collisions with something as chatty as ATAK.
+MeshCore clients would need to reset path constantly and flood traffic across the network which could lead to lots of collisions with something as chatty as ATAK. 

 This could change in the future if MeshCore develops a client firmware that repeats.
 [Source](https://discord.com/channels/826570251612323860/1330643963501351004/1354780032140054659)

 ### 5.12. Q: How do I add a node to the [MeshCore Map]([url](https://meshcore.co.uk/map.html))
-**A:**
+**A:** 

 To add a BLE Companion radio, connect to the BLE Companion radio from the MeshCore smartphone app.  In the app, tap the `3 dot` menu icon at the top right corner, then tap `Internet Map`.  Tap the `3 dot` menu icon again and choose `Add me to the Map`

@@ -555,7 +501,7 @@ For ESP-based devices (e.g. Heltec V3) you need:
 - Download firmware file from flasher.meshcore.co.uk
    - Go to the web site on a browser, find the section that has the firmware up need
    - Click the Download button, right click on the file you need, for example,
-        - `Heltec_V3_companion_radio_ble-v1.7.1-165fb33.bin`
+        - `Heltec_V3_companion_radio_ble-v1.7.1-165fb33.bin` 
            - Non-merged bin keeps the existing Bluetooth pairing database
        - `Heltec_v3_companion_radio_usb-v1.7.1-165fb33-merged.bin`
            - Merged bin overwrites everything including the bootloader, existing Bluetooth pairing database, but keeps configurations.
@@ -574,7 +520,7 @@ For ESP-based devices (e.g. Heltec V3) you need:
            - `esptool.py -p /dev/ttyUSB0 --chip esp32-s3 write_flash 0x10000 <non-merged_firmware>.bin`
        - For merged bin:
            - `esptool.py -p /dev/ttyUSB0 --chip esp32-s3 write_flash 0x00000 <merged_firmware>.bin`
-
+	


 **Instructions for nRF devices:**
@@ -595,25 +541,24 @@ For nRF devices (e.g. RAK, Heltec T114) you need the following:
        - `pip install adafruit-nrfutil --break-system-packages`
        - Use this command to flash the nRF device:
            - `adafruit-nrfutil --verbose dfu serial --package RAK_4631_companion_radio_usb-v1.7.1-165fb33.zip -p /dev/ttyACM0 -b 115200 --singlebank --touch 1200`
-
-
+		
+		
 To manage a repeater or room server connected to a Pi over USB serial using shell commands, you need to install `picocom`.  To install `picocom`, run the following command:
 - `sudo apt install picocom`

 To start managing your USB serial-connected device using picocom, use the following command:
    - `picocom -b 115200 /dev/ttyUSB0 --imap lfcrlf`

-From here, reference repeater and room server command line commands on MeshCore github wiki here:
+From here, reference repeater and room server command line commands on MeshCore github wiki here: 
    - https://github.com/meshcore-dev/MeshCore/wiki/Repeater-&-Room-Server-CLI-Reference

-
+  
 ### 5.14. Q: Are there are projects built around MeshCore?

 **A:** Yes.  See the following:

 #### 5.14.1. meshcoremqtt
-A Python script to send meshcore debug and packet capture data to MQTT for analysis.  Cisien's version is a fork of Andrew-a-g's and is being used to to collect data for https://map.w0z.is/messages and https://analyzer.letsme.sh/
-https://github.com/Cisien/meshcoretomqtt
+A Python script to send meshore debug and packet capture data to MQTT for analysis
 https://github.com/Andrew-a-g/meshcoretomqtt

 #### 5.14.2. MeshCore for Home Assistant
@@ -624,7 +569,7 @@ https://github.com/awolden/meshcore-ha
 Bindings to access your MeshCore companion radio nodes in python.
 https://github.com/fdlamotte/meshcore_py

-#### 5.14.4. meshcore-cli
+#### 5.14.4. meshcore-cli  
 CLI interface to MeshCore companion radio over BLE, TCP, or serial.  Uses Python MeshCore above.
 https://github.com/fdlamotte/meshcore-cli

@@ -632,49 +577,15 @@ CLI interface to MeshCore companion radio over BLE, TCP, or serial.  Uses Python
 A JavaScript library for interacting with a MeshCore device running the companion radio firmware
 https://github.com/liamcottle/meshcore.js

-#### 5.14.6. pyMC_core
-pyMC_Core is a Python port of MeshCore, designed for Raspberry Pi and similar hardware, it talks to LoRa modules over SPI.
-https://github.com/rightup/pyMC_core
-
-#### 5.14.7. MeshCore Packet Decoder
-A TypeScript library for decoding MeshCore mesh networking packets with full cryptographic support. Uses WebAssembly (WASM) for Ed25519 key derivation through the orlp/ed25519 library.  It powers the [MeshCore Packet Analyzer](https://analyzer.letsme.sh/packets).
-https://github.com/michaelhart/meshcore-decoder
-
-#### 5.14.8. meshcore-pi
-meshcore-pi is another Python port of MeshCore, designed for Raspberry Pi and similar hardware, it talks to LoRa modules over SPI or GPIO.
-https://github.com/brianwiddas/meshcore-pi
-
-#### 5.14.9. pyMC_Repeater
-pyMC_Repeater is a repeater daemon in Python built on top of the [`pymc_core`](#5146-pymc_core) library.
-https://github.com/rightup/pyMC_Repeater
-
-
-### 5.15. Q: Are there client applications for Windows or Mac?
-**A:** Yes, the same iOS and Android client is also available for Windows and Intel Mac (sorry, not available for ARM-based Mac yet).  You can find them together with the Android APK here:
-https://files.liamcottle.net/MeshCore
-
-Both the Windows and Intel Mac versions of the client app are fully unlocked and are free to use.
-
-### 5.16. Q: Are there any resources that compare MeshCore to other LoRa systems?
-
-**A:** Here is a list of MeshCore comparison resources:
-The Comms Channel on YouTube:
-https://www.youtube.com/watch?v=guDoKGs02Us
-MeshCore Advantages by MCarper:
-https://github.com/mikecarper/meshfirmware/blob/main/MeshCoreAdvantages.md
-Meshcore vs Meshtastic by austinmesh.org
-https://www.austinmesh.org/learn/meshcore-vs-meshtastic/
-
-
 ---

 ## 6. Troubleshooting

 ### 6.1. Q: My client says another client or a repeater or a room server was last seen many, many days ago.
 ### 6.2. Q: A repeater or a client or a room server I expect to see on my discover list (on T-Deck) or contact list (on a smart device client) are not listed.
-**A:**
- If your client is a T-Deck, it may not have its time set (no GPS installed, no GPS lock, or wrong GPS baud rate).
- If you are using the Android or iOS client, the other client, repeater, or room server may have the wrong time.
+**A:**  
+- If your client is a T-Deck, it may not have its time set (no GPS installed, no GPS lock, or wrong GPS baud rate).  
+- If you are using the Android or iOS client, the other client, repeater, or room server may have the wrong time.  

 You can get the epoch time on <https://www.epochconverter.com/> and use it to set your T-Deck clock. For a repeater and room server, the admin can use a T-Deck to remotely set their clock (clock sync), or use the `time` command in the USB serial console with the server device connected.

@@ -695,23 +606,23 @@ You can get the epoch time on <https://www.epochconverter.com/> and use it to se

 ### 6.7. Q: My RAK/T1000-E/xiao_nRF52 device seems to be corrupted, how do I wipe it clean to start fresh?

-**A:**
+**A:** 
 1. Connect USB-C cable to your device, per your device's instruction, get it to flash mode:
    - For RAK, click the reset button **TWICE**
    - For T1000-e, quickly disconnect and reconnect the magnetic side of the cable from the device **TWICE**
    - For Heltec T114, click the reset button **TWICE** (the bottom button)
    - For Xiao nRF52, click the reset button once.  If that doesn't work, quickly double click the reset button twice.  If that doesn't work, disconnection the board from your PC and reconnect again ([seeed studio wiki](https://wiki.seeedstudio.com/XIAO_BLE/#access-the-swd-pins-for-debugging-and-reflashing-bootloader))
 5. A new folder will appear on your computer's desktop
-6. Download the `flash_erase*.uf2` file for your device on flasher.meshcore.co.uk
+6. Download the `flash_erase*.uf2` file for your device on flasher.meshcore.co.uk 
    - RAK WisBlock and Heltec T114: `Flash_erase-nRF32_softdevice_v6.uf2`
    - Seeed Studio Xiao nRF52 WIO: `Flash_erase-nRF52_softdevice_v7.uf2`
 8. drag and drop the uf2 file for your device to the root of the new folder
 9. Wait for the copy to complete.  You might get an error dialog, you can ignore it
-10. Go to https://flasher.meshcore.co.uk/, click `Console` and select the serial port for your connected device
+10. Go to https://flasher.meshcore.co.uk/, click `Console` and select the serial port for your connected device 
 11. In the console, press enter.  Your flash should now be erased
 12. You may now flash the latest MeshCore firmware onto your device

-Separately, starting in firmware version 1.7.0, there is a CLI Rescue mode.  If your device has a user button (e.g. some RAK, T114), you can activate the rescue mode by hold down the user button of the device within 8 seconds of boot.  Then you can use the 'Console' on flasher.meshcore.co.uk
+Separately, starting in firmware version 1.7.0, there is a CLI Rescue mode.  If your device has a user button (e.g. some RAK, T114), you can activate the rescue mode by hold down the user button of the device within 8 seconds of boot.  Then you can use the 'Console' on flasher.meshcore.co.uk 

 ### 6.8. Q: WebFlasher fails on Linux with failed to open

@@ -734,20 +645,14 @@ Allow the browser user on it:
 4. Go to the Command Line tab, type `start ota` and hit enter.
 5. you should see `OK` to confirm the repeater device is now in OTA mode
 6. Run the DFU app,tab `Settings` on the top right corner
-7. Enable `Packets receipt notifications`, and change `Number of Packets` to 10 for RAK, 8 for T114.  8 also works for RAK.
+7. Enable `Packets receipt notifications`, and change `Number of Packets` to 10 for RAK, 8 for T114.  8 also works for RAK.  
 9. Select the firmware zip file you downloaded
 10. Select the device you want to update. If the device you want to update is not on the list, try enabling`OTA` on the device again
 11. If the device is not found, enable `Force Scanning` in the DFU app
 12. Tab the `Upload` to begin OTA update
-13. If it fails, try turning off and on Bluetooth on your phone.  If that doesn't work, try rebooting your phone.
+13. If it fails, try turning off and on Bluetooth on your phone.  If that doesn't work, try rebooting your phone.  
 14. Wait for the update to complete.  It can take a few minutes.

-#### 7.1.1 Q: Can I update Seeed Studio Wio Tracker L1 Pro using OTA?
-**A:**  You can flash this safer bootloader to the Wio Tracker L1 Pro
-https://github.com/oltaco/Adafruit_nRF52_Bootloader_OTAFIX
-
-After this bootloader is flashed onto the device, you can trigger over the air update using bluetooth by holding the button next to the D-Pad and then click the reset button.  The follow the same OTA update instructions above.  You can skip pass the `start ota` instruction and start the update using the DFU app.
-

 ### 7.2. Q: How to update ESP32-based devices over the air?

@@ -757,29 +662,25 @@ After this bootloader is flashed onto the device, you can trigger over the air u
 4. Go to the Command Line tab, type `start ota` and hit enter.
 5. you should see `OK` to confirm the repeater device is now in OTA mode
 6. The command `start ota` on an ESP32-based device starts a wifi hotspot named `MeshCore OTA`
-7. From your phone or computer connect to the 'MeshCore OTA' hotspot
+7. From your phone or computer connect to the 'MeshCore OTA' hotspot 
 8. From a browser, go to http://192.168.4.1/update and upload the non-merged bin from the flasher


 ### 7.3. Q: Is there a way to lower the chance of a failed OTA device firmware update (DFU)?

-**A:** Yes, developer `che aporeps` has an enhanced OTA DFU bootloader for nRF52 based devices.  With this bootloader, if it detects that the application firmware is invalid, it falls back to OTA DFU mode so you can attempt to flash again to recover.  This bootloader has other changes to make the OTA DFU process more fault tolerant.
+**A:** Yes, developer `che aporeps` has an enhanced OTA DFU bootloader for nRF52 based devices.  With this bootloader, if it detects that the application firmware is invalid, it falls back to OTA DFU mode so you can attempt to flash again to recover.  This bootloader has other changes to make the OTA DFU process more fault tolerant. 

 Refer to https://github.com/oltaco/Adafruit_nRF52_Bootloader_OTAFIX for the latest information.

 Currently, the following boards are supported:
- Heltec Automation Mesh Node T114 / HT-nRF5262
- Nologo ProMicro NRF52840 (aka SuperMini NRF52840)
- Seeed Studio SenseCAP Card Tracker T1000-E
- Seeed Studio Wio Tracker L1
+- Nologo ProMicro
 - Seeed Studio XIAO nRF52840 BLE
 - Seeed Studio XIAO nRF52840 BLE SENSE
- RAK 4631 (See note)
- RAK WisMesh Tag (new 28/11/2025)
+- RAK 4631

 ### 7.4. Q: are the MeshCore logo and font available?

-**A:** Yes, it is on the MeshCore github repo here:
+**A:** Yes, it is on the MeshCore github repo here: 
 https://github.com/meshcore-dev/MeshCore/tree/main/logo

 ### 7.5. Q: What is the format of a contact or channel QR code?
@@ -798,26 +699,8 @@ where `&type` is:
 `sensor = 4`

 ### 7.6. Q: How do I connect to the companion via WIFI, e.g. using a heltec v3?
- **A:**
+ **A:** 
 WiFi firmware requires you to compile it yourself, as you need to set the wifi ssid and password.
 Edit WIFI_SSID and WIFI_PWD in `./variants/heltec_v3/platformio.ini` and then flash it to your device.

-### 7.7. Q: I have a Station G2, or a Heltec V4, or an Ikoka Stick, or a radio with a EByte E22-900M30S or a E22-900M33S module, what should their transmit power be set to?
- **A:**
-For companion radios, you can set these radios' transmit power in the smartphone app.  For repeater and room server radios, you can set their transmit power using the command line command `set tx`.  You can get their current value using command line comand `get tx`
-
-
-> ### ⚠️ **WARNING: Set these values at your own risk. Incorrect power settings can permanently damage your radio hardware.**
-
-| Device / Model | Region / Description | In-App Setting (dBm) | Target Radio Output | Notes |
-| :--- | :--- | :--- | :--- | :--- |
-| **Station G2** <br> [Reference](https://wiki.uniteng.com/en/meshtastic/station-g2) | US915 Max Output | 19 dBm | 36.5 dBm (4.46W) | |
-| | US915 Recommended Max | 16 dBm | 35 dBm (3.16W) | 1dB compression point |
-| | EU868 Recommended Max | 15 dBm | 34.5 dBm (2.82W) | 1dB compression point |
-| | US915 1W Output | 10 dBm | 1W | |
-| | EU868 1W Output | 9 dBm | 1W | |
-| **Ikoka Stick E22-900M30S** | 1W Model | 19 dBm | 1W | **DO NOT EXCEED** (Risk of burn out) |
-| **Ikoka Stick E22-900M33S** | 2W Model | 9 dBm | 2W | **DO NOT EXCEED** (Risk of burn out) |
-| **Heltec V4** | Standard Output | 10 dBm | 22 dBm | |
-| | High Output | 22 dBm | 28 dBm | |
 ---
--- a/docs/packet_structure.md
+++ b/docs/packet_structure.md
@@ -44,10 +44,6 @@ bit 0 means the lowest bit (1s place)
 | `0x08` | `PAYLOAD_TYPE_PATH`       | Returned path.                                |
 | `0x09` | `PAYLOAD_TYPE_TRACE`      | trace a path, collecting SNI for each hop.    |
 | `0x0A` | `PAYLOAD_TYPE_MULTIPART`  | packet is part of a sequence of packets.      |
-| `0x0B` | `PAYLOAD_TYPE_CONTROL`    | control packet data (unencrypted)             |
-| `0x0C` | .                         | reserved                                      |
-| `0x0D` | .                         | reserved                                      |
-| `0x0E` | .                         | reserved                                      |
 | `0x0F` | `PAYLOAD_TYPE_RAW_CUSTOM` | Custom packet (raw bytes, custom encryption). |

 ## Payload Version Values
--- a/docs/payloads.md
+++ b/docs/payloads.md
@@ -11,7 +11,6 @@ Inside of each [meshcore packet](./packet_structure.md) is a payload, identified
 * Group text message (unverified).
 * Group datagram (unverified).
 * Multi-part packet
-* Control data packet
 * Custom packet (raw bytes, custom encryption).

 This document defines the structure of each of these payload types.
@@ -58,7 +57,7 @@ Appdata Flags

 # Acknowledgement

-An acknowledgement that a message was received. Note that for returned path messages, an acknowledgement can be sent in the "extra" payload (see [Returned Path](#returned-path)) instead of as a separate ackowledgement packet. CLI commands do not cause acknowledgement responses, neither discrete nor extra.
+An acknowledgement that a message was received. Note that for returned path messages, an acknowledgement will be sent in the "extra" payload (see [Returned Path](#returned-path)) and not as a discrete ackowledgement. CLI commands do not require an acknowledgement, neither discrete nor extra.

 | Field    | Size (bytes) | Description                                                |
 |----------|--------------|------------------------------------------------------------|
@@ -141,13 +140,13 @@ Request data about sensors on the node, including battery level.

 ## Plain text message

-| Field              | Size (bytes)    | Description                                                  |
-|--------------------|-----------------|--------------------------------------------------------------|
-| timestamp          | 4               | send time (unix timestamp)                                   |
-| txt_type + attempt | 1               | upper six bits are txt_type (see below), lower two bits are attempt number (0..3) |
-| message            | rest of payload | the message content, see next table                          |
+| Field           | Size (bytes)    | Description                                                  |
+|-----------------|-----------------|--------------------------------------------------------------|
+| timestamp       | 4               | send time (unix timestamp)                                   |
+| flags + attempt | 1               | upper six bits are flags (see below), lower two bits are attempt number (0..3) |
+| message         | rest of payload | the message content, see next table                          |

-txt_type
+Flags

 | Value  | Description               | Message content                                            |
 |--------|---------------------------|------------------------------------------------------------|
@@ -164,20 +163,13 @@ txt_type
 | cipher MAC       | 2               | MAC for encrypted data in next field      |
 | ciphertext       | rest of payload | encrypted message, see below for details  |

-## Room server login
+Plaintext message

 | Field          | Size (bytes)    | Description                                                                   |
 |----------------|-----------------|-------------------------------------------------------------------------------|
-| timestamp      | 4               | sender time (unix timestamp)                                                  |
-| sync timestamp | 4               | sender's "sync messages SINCE x" timestamp                                    |
-| password       | rest of message | password for room                                                             |
-
-## Repeater/Sensor login
-
-| Field          | Size (bytes)    | Description                                                                   |
-|----------------|-----------------|-------------------------------------------------------------------------------|
-| timestamp      | 4               | sender time (unix timestamp)                                                  |
-| password       | rest of message | password for repeater/sensor                                                  |
+| timestamp      | 4               | send time (unix timestamp)                                                    |
+| sync timestamp | 4               | NOTE: room server only! - sender's "sync messages SINCE x" timestamp |
+| password       | rest of message | password for repeater/room                                                    |

 # Group text message / datagram

@@ -190,32 +182,8 @@ txt_type
 The plaintext contained in the ciphertext matches the format described in [plain text message](#plain-text-message). Specifically, it consists of a four byte timestamp, a flags byte, and the message. The flags byte will generally be `0x00` because it is a "plain text message". The message will be of the form `<sender name>: <message body>` (eg., `user123: I'm on my way`).


-# Control data
-
-| Field        | Size (bytes)    | Description                                |
-|--------------|-----------------|--------------------------------------------|
-| flags        | 1               | upper 4 bits is sub_type                   |
-| data         | rest of payload | typically unencrypted data                 |
-
-## DISCOVER_REQ (sub_type)
-
-| Field        | Size (bytes)    | Description                                  |
-|--------------|-----------------|----------------------------------------------|
-| flags        | 1               | 0x8 (upper 4 bits), prefix_only (lowest bit) |
-| type_filter  | 1               | bit for each ADV_TYPE_*                      |
-| tag          | 4               | randomly generate by sender                  |
-| since        | 4               | (optional) epoch timestamp (0 by default)    |
-
-## DISCOVER_RESP (sub_type)
-
-| Field        | Size (bytes)    | Description                                |
-|--------------|-----------------|--------------------------------------------|
-| flags        | 1               | 0x9 (upper 4 bits), node_type (lower 4)    |
-| snr          | 1               | signed, SNR*4                              |
-| tag          | 4               | reflected back from DISCOVER_REQ           |
-| pubkey       | 8 or 32         | node's ID (or prefix)                      |
-
+TODO: describe what datagram looks like

 # Custom packet

-Custom packets have no defined format.
+Custom packets have no defined format.
--- a/docs/stats_binary_frames.md
+++ b/docs/stats_binary_frames.md
@@ -1,312 +0,0 @@
-# Stats Binary Frame Structures
-
-Binary frame structures for companion radio stats commands. All multi-byte integers use little-endian byte order.
-
-## Command Codes
-
-| Command | Code | Description |
-|---------|------|-------------|
-| `CMD_GET_STATS` | 56 | Get statistics (2-byte command: code + sub-type) |
-
-### Stats Sub-Types
-
-The `CMD_GET_STATS` command uses a 2-byte frame structure:
- **Byte 0:** `CMD_GET_STATS` (56)
- **Byte 1:** Stats sub-type:
-  - `STATS_TYPE_CORE` (0) - Get core device statistics
-  - `STATS_TYPE_RADIO` (1) - Get radio statistics
-  - `STATS_TYPE_PACKETS` (2) - Get packet statistics
-
-## Response Codes
-
-| Response | Code | Description |
-|----------|------|-------------|
-| `RESP_CODE_STATS` | 24 | Statistics response (2-byte response: code + sub-type) |
-
-### Stats Response Sub-Types
-
-The `RESP_CODE_STATS` response uses a 2-byte header structure:
- **Byte 0:** `RESP_CODE_STATS` (24)
- **Byte 1:** Stats sub-type (matches command sub-type):
-  - `STATS_TYPE_CORE` (0) - Core device statistics response
-  - `STATS_TYPE_RADIO` (1) - Radio statistics response
-  - `STATS_TYPE_PACKETS` (2) - Packet statistics response
-
---
-
-## RESP_CODE_STATS + STATS_TYPE_CORE (24, 0)
-
-**Total Frame Size:** 11 bytes
-
-| Offset | Size | Type | Field Name | Description | Range/Notes |
-|--------|------|------|------------|-------------|-------------|
-| 0 | 1 | uint8_t | response_code | Always `0x18` (24) | - |
-| 1 | 1 | uint8_t | stats_type | Always `0x00` (STATS_TYPE_CORE) | - |
-| 2 | 2 | uint16_t | battery_mv | Battery voltage in millivolts | 0 - 65,535 |
-| 4 | 4 | uint32_t | uptime_secs | Device uptime in seconds | 0 - 4,294,967,295 |
-| 8 | 2 | uint16_t | errors | Error flags bitmask | - |
-| 10 | 1 | uint8_t | queue_len | Outbound packet queue length | 0 - 255 |
-
-### Example Structure (C/C++)
-
-```c
-struct StatsCore {
-    uint8_t  response_code;  // 0x18
-    uint8_t  stats_type;     // 0x00 (STATS_TYPE_CORE)
-    uint16_t battery_mv;
-    uint32_t uptime_secs;
-    uint16_t errors;
-    uint8_t  queue_len;
-} __attribute__((packed));
-```
-
---
-
-## RESP_CODE_STATS + STATS_TYPE_RADIO (24, 1)
-
-**Total Frame Size:** 14 bytes
-
-| Offset | Size | Type | Field Name | Description | Range/Notes |
-|--------|------|------|------------|-------------|-------------|
-| 0 | 1 | uint8_t | response_code | Always `0x18` (24) | - |
-| 1 | 1 | uint8_t | stats_type | Always `0x01` (STATS_TYPE_RADIO) | - |
-| 2 | 2 | int16_t | noise_floor | Radio noise floor in dBm | -140 to +10 |
-| 4 | 1 | int8_t | last_rssi | Last received signal strength in dBm | -128 to +127 |
-| 5 | 1 | int8_t | last_snr | SNR scaled by 4 | Divide by 4.0 for dB |
-| 6 | 4 | uint32_t | tx_air_secs | Cumulative transmit airtime in seconds | 0 - 4,294,967,295 |
-| 10 | 4 | uint32_t | rx_air_secs | Cumulative receive airtime in seconds | 0 - 4,294,967,295 |
-
-### Example Structure (C/C++)
-
-```c
-struct StatsRadio {
-    uint8_t  response_code;  // 0x18
-    uint8_t  stats_type;     // 0x01 (STATS_TYPE_RADIO)
-    int16_t  noise_floor;
-    int8_t   last_rssi;
-    int8_t   last_snr;       // Divide by 4.0 to get actual SNR in dB
-    uint32_t tx_air_secs;
-    uint32_t rx_air_secs;
-} __attribute__((packed));
-```
-
---
-
-## RESP_CODE_STATS + STATS_TYPE_PACKETS (24, 2)
-
-**Total Frame Size:** 26 bytes
-
-| Offset | Size | Type | Field Name | Description | Range/Notes |
-|--------|------|------|------------|-------------|-------------|
-| 0 | 1 | uint8_t | response_code | Always `0x18` (24) | - |
-| 1 | 1 | uint8_t | stats_type | Always `0x02` (STATS_TYPE_PACKETS) | - |
-| 2 | 4 | uint32_t | recv | Total packets received | 0 - 4,294,967,295 |
-| 6 | 4 | uint32_t | sent | Total packets sent | 0 - 4,294,967,295 |
-| 10 | 4 | uint32_t | flood_tx | Packets sent via flood routing | 0 - 4,294,967,295 |
-| 14 | 4 | uint32_t | direct_tx | Packets sent via direct routing | 0 - 4,294,967,295 |
-| 18 | 4 | uint32_t | flood_rx | Packets received via flood routing | 0 - 4,294,967,295 |
-| 22 | 4 | uint32_t | direct_rx | Packets received via direct routing | 0 - 4,294,967,295 |
-
-### Notes
-
- Counters are cumulative from boot and may wrap.
- `recv = flood_rx + direct_rx`
- `sent = flood_tx + direct_tx`
-
-### Example Structure (C/C++)
-
-```c
-struct StatsPackets {
-    uint8_t  response_code;  // 0x18
-    uint8_t  stats_type;     // 0x02 (STATS_TYPE_PACKETS)
-    uint32_t recv;
-    uint32_t sent;
-    uint32_t flood_tx;
-    uint32_t direct_tx;
-    uint32_t flood_rx;
-    uint32_t direct_rx;
-} __attribute__((packed));
-```
-
---
-
-## Command Usage Example (Python)
-
-```python
-# Send CMD_GET_STATS command
-def send_get_stats_core(serial_interface):
-    """Send command to get core stats"""
-    cmd = bytes([56, 0])  # CMD_GET_STATS (56) + STATS_TYPE_CORE (0)
-    serial_interface.write(cmd)
-
-def send_get_stats_radio(serial_interface):
-    """Send command to get radio stats"""
-    cmd = bytes([56, 1])  # CMD_GET_STATS (56) + STATS_TYPE_RADIO (1)
-    serial_interface.write(cmd)
-
-def send_get_stats_packets(serial_interface):
-    """Send command to get packet stats"""
-    cmd = bytes([56, 2])  # CMD_GET_STATS (56) + STATS_TYPE_PACKETS (2)
-    serial_interface.write(cmd)
-```
-
---
-
-## Response Parsing Example (Python)
-
-```python
-import struct
-
-def parse_stats_core(frame):
-    """Parse RESP_CODE_STATS + STATS_TYPE_CORE frame (11 bytes)"""
-    response_code, stats_type, battery_mv, uptime_secs, errors, queue_len = \
-        struct.unpack('<B B H I H B', frame)
-    assert response_code == 24 and stats_type == 0, "Invalid response type"
-    return {
-        'battery_mv': battery_mv,
-        'uptime_secs': uptime_secs,
-        'errors': errors,
-        'queue_len': queue_len
-    }
-
-def parse_stats_radio(frame):
-    """Parse RESP_CODE_STATS + STATS_TYPE_RADIO frame (14 bytes)"""
-    response_code, stats_type, noise_floor, last_rssi, last_snr, tx_air_secs, rx_air_secs = \
-        struct.unpack('<B B h b b I I', frame)
-    assert response_code == 24 and stats_type == 1, "Invalid response type"
-    return {
-        'noise_floor': noise_floor,
-        'last_rssi': last_rssi,
-        'last_snr': last_snr / 4.0,  # Unscale SNR
-        'tx_air_secs': tx_air_secs,
-        'rx_air_secs': rx_air_secs
-    }
-
-def parse_stats_packets(frame):
-    """Parse RESP_CODE_STATS + STATS_TYPE_PACKETS frame (26 bytes)"""
-    response_code, stats_type, recv, sent, flood_tx, direct_tx, flood_rx, direct_rx = \
-        struct.unpack('<B B I I I I I I', frame)
-    assert response_code == 24 and stats_type == 2, "Invalid response type"
-    return {
-        'recv': recv,
-        'sent': sent,
-        'flood_tx': flood_tx,
-        'direct_tx': direct_tx,
-        'flood_rx': flood_rx,
-        'direct_rx': direct_rx
-    }
-```
-
---
-
-## Command Usage Example (JavaScript/TypeScript)
-
-```typescript
-// Send CMD_GET_STATS command
-const CMD_GET_STATS = 56;
-const STATS_TYPE_CORE = 0;
-const STATS_TYPE_RADIO = 1;
-const STATS_TYPE_PACKETS = 2;
-
-function sendGetStatsCore(serialInterface: SerialPort): void {
-    const cmd = new Uint8Array([CMD_GET_STATS, STATS_TYPE_CORE]);
-    serialInterface.write(cmd);
-}
-
-function sendGetStatsRadio(serialInterface: SerialPort): void {
-    const cmd = new Uint8Array([CMD_GET_STATS, STATS_TYPE_RADIO]);
-    serialInterface.write(cmd);
-}
-
-function sendGetStatsPackets(serialInterface: SerialPort): void {
-    const cmd = new Uint8Array([CMD_GET_STATS, STATS_TYPE_PACKETS]);
-    serialInterface.write(cmd);
-}
-```
-
---
-
-## Response Parsing Example (JavaScript/TypeScript)
-
-```typescript
-interface StatsCore {
-    battery_mv: number;
-    uptime_secs: number;
-    errors: number;
-    queue_len: number;
-}
-
-interface StatsRadio {
-    noise_floor: number;
-    last_rssi: number;
-    last_snr: number;
-    tx_air_secs: number;
-    rx_air_secs: number;
-}
-
-interface StatsPackets {
-    recv: number;
-    sent: number;
-    flood_tx: number;
-    direct_tx: number;
-    flood_rx: number;
-    direct_rx: number;
-}
-
-function parseStatsCore(buffer: ArrayBuffer): StatsCore {
-    const view = new DataView(buffer);
-    const response_code = view.getUint8(0);
-    const stats_type = view.getUint8(1);
-    if (response_code !== 24 || stats_type !== 0) {
-        throw new Error('Invalid response type');
-    }
-    return {
-        battery_mv: view.getUint16(2, true),
-        uptime_secs: view.getUint32(4, true),
-        errors: view.getUint16(8, true),
-        queue_len: view.getUint8(10)
-    };
-}
-
-function parseStatsRadio(buffer: ArrayBuffer): StatsRadio {
-    const view = new DataView(buffer);
-    const response_code = view.getUint8(0);
-    const stats_type = view.getUint8(1);
-    if (response_code !== 24 || stats_type !== 1) {
-        throw new Error('Invalid response type');
-    }
-    return {
-        noise_floor: view.getInt16(2, true),
-        last_rssi: view.getInt8(4),
-        last_snr: view.getInt8(5) / 4.0,  // Unscale SNR
-        tx_air_secs: view.getUint32(6, true),
-        rx_air_secs: view.getUint32(10, true)
-    };
-}
-
-function parseStatsPackets(buffer: ArrayBuffer): StatsPackets {
-    const view = new DataView(buffer);
-    const response_code = view.getUint8(0);
-    const stats_type = view.getUint8(1);
-    if (response_code !== 24 || stats_type !== 2) {
-        throw new Error('Invalid response type');
-    }
-    return {
-        recv: view.getUint32(2, true),
-        sent: view.getUint32(6, true),
-        flood_tx: view.getUint32(10, true),
-        direct_tx: view.getUint32(14, true),
-        flood_rx: view.getUint32(18, true),
-        direct_rx: view.getUint32(22, true)
-    };
-}
-```
-
---
-
-## Field Size Considerations
-
- Packet counters (uint32_t): May wrap after extended high-traffic operation.
- Time fields (uint32_t): Max ~136 years.
- SNR (int8_t, scaled by 4): Range -32 to +31.75 dB, 0.25 dB precision.
-
--- a/examples/companion_radio/DataStore.cpp
+++ b/examples/companion_radio/DataStore.cpp
@@ -197,7 +197,11 @@ void DataStore::loadPrefs(NodePrefs& prefs, double& node_lat, double& node_lon)
 }

 void DataStore::loadPrefsInt(const char *filename, NodePrefs& _prefs, double& node_lat, double& node_lon) {
-  File file = openRead(_fs, filename);
+#if defined(RP2040_PLATFORM)
+  File file = _fs->open(filename, "r");
+#else
+  File file = _fs->open(filename);
+#endif
  if (file) {
    uint8_t pad[8];

@@ -221,7 +225,6 @@ void DataStore::loadPrefsInt(const char *filename, NodePrefs& _prefs, double& no
    file.read((uint8_t *)&_prefs.multi_acks, sizeof(_prefs.multi_acks));                   // 77
    file.read(pad, 2);                                                                     // 78
    file.read((uint8_t *)&_prefs.ble_pin, sizeof(_prefs.ble_pin));                         // 80
-    file.read((uint8_t *)&_prefs.buzzer_quiet, sizeof(_prefs.buzzer_quiet));               // 84

    file.close();
  }
@@ -253,14 +256,22 @@ void DataStore::savePrefs(const NodePrefs& _prefs, double node_lat, double node_
    file.write((uint8_t *)&_prefs.multi_acks, sizeof(_prefs.multi_acks));                   // 77
    file.write(pad, 2);                                                                     // 78
    file.write((uint8_t *)&_prefs.ble_pin, sizeof(_prefs.ble_pin));                         // 80
-    file.write((uint8_t *)&_prefs.buzzer_quiet, sizeof(_prefs.buzzer_quiet));               // 84

    file.close();
  }
 }

 void DataStore::loadContacts(DataStoreHost* host) {
-File file = openRead(_getContactsChannelsFS(), "/contacts3");
+#if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)
+  if (_getContactsChannelsFS()->exists("/contacts3")) {
+    File file = _getContactsChannelsFS()->open("/contacts3");
+#elif defined(RP2040_PLATFORM)
+    if (_fs->exists("/contacts3")) {
+    File file = _fs->open("/contacts3", "r");
+#else
+    if (_fs->exists("/contacts3")) {
+      File file = _fs->open("/contacts3", "r", false);
+#endif
    if (file) {
      bool full = false;
      while (!full) {
@@ -288,6 +299,7 @@ File file = openRead(_getContactsChannelsFS(), "/contacts3");
      }
      file.close();
    }
+  }
 }

 void DataStore::saveContacts(DataStoreHost* host) {
@@ -320,7 +332,16 @@ void DataStore::saveContacts(DataStoreHost* host) {
 }

 void DataStore::loadChannels(DataStoreHost* host) {
-    File file = openRead(_getContactsChannelsFS(), "/channels2");
+#if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)
+  if (_getContactsChannelsFS()->exists("/channels2")) {
+    File file = _getContactsChannelsFS()->open("/channels2");
+#elif defined(RP2040_PLATFORM)
+  if (_fs->exists("/channels2")) {
+    File file = _fs->open("/channels2", "r");
+#else
+  if (_fs->exists("/channels2")) {
+    File file = _fs->open("/channels2", "r", false);
+#endif
    if (file) {
      bool full = false;
      uint8_t channel_idx = 0;
@@ -342,6 +363,7 @@ void DataStore::loadChannels(DataStoreHost* host) {
      }
      file.close();
    }
+  }
 }

 void DataStore::saveChannels(DataStoreHost* host) {
@@ -498,7 +520,7 @@ void DataStore::migrateToSecondaryFS() {
 }

 uint8_t DataStore::getBlobByKey(const uint8_t key[], int key_len, uint8_t dest_buf[]) {
-  File file = openRead(_getContactsChannelsFS(), "/adv_blobs");
+  File file = _getContactsChannelsFS()->open("/adv_blobs");
  uint8_t len = 0;  // 0 = not found
  if (file) {
    BlobRec tmp;
@@ -561,7 +583,11 @@ uint8_t DataStore::getBlobByKey(const uint8_t key[], int key_len, uint8_t dest_b
  sprintf(path, "/bl/%s", fname);

  if (_fs->exists(path)) {
-    File f = openRead(_fs, path);
+#if defined(RP2040_PLATFORM)
+    File f = _fs->open(path, "r");
+#else
+    File f = _fs->open(path);
+#endif
    if (f) {
      int len = f.read(dest_buf, 255); // currently MAX 255 byte blob len supported!!
      f.close();
--- a/examples/companion_radio/MyMesh.cpp
+++ b/examples/companion_radio/MyMesh.cpp
@@ -50,14 +50,6 @@
 #define CMD_SEND_BINARY_REQ           50
 #define CMD_FACTORY_RESET             51
 #define CMD_SEND_PATH_DISCOVERY_REQ   52
-#define CMD_SET_FLOOD_SCOPE           54   // v8+
-#define CMD_SEND_CONTROL_DATA         55   // v8+
-#define CMD_GET_STATS                 56   // v8+, second byte is stats type
-
-// Stats sub-types for CMD_GET_STATS
-#define STATS_TYPE_CORE               0
-#define STATS_TYPE_RADIO              1
-#define STATS_TYPE_PACKETS             2

 #define RESP_CODE_OK                  0
 #define RESP_CODE_ERR                 1
@@ -83,7 +75,6 @@
 #define RESP_CODE_CUSTOM_VARS         21
 #define RESP_CODE_ADVERT_PATH         22
 #define RESP_CODE_TUNING_PARAMS       23
-#define RESP_CODE_STATS               24   // v8+, second byte is stats type

 #define SEND_TIMEOUT_BASE_MILLIS        500
 #define FLOOD_SEND_TIMEOUT_FACTOR       16.0f
@@ -108,7 +99,6 @@
 #define PUSH_CODE_TELEMETRY_RESPONSE    0x8B
 #define PUSH_CODE_BINARY_RESPONSE       0x8C
 #define PUSH_CODE_PATH_DISCOVERY_RESPONSE 0x8D
-#define PUSH_CODE_CONTROL_DATA          0x8E   // v8+

 #define ERR_CODE_UNSUPPORTED_CMD        1
 #define ERR_CODE_NOT_FOUND              2
@@ -388,35 +378,6 @@ void MyMesh::queueMessage(const ContactInfo &from, uint8_t txt_type, mesh::Packe
 #endif
 }

-bool MyMesh::filterRecvFloodPacket(mesh::Packet* packet) {
-  // REVISIT: try to determine which Region (from transport_codes[1]) that Sender is indicating for replies/responses
-  //    if unknown, fallback to finding Region from transport_codes[0], the 'scope' used by Sender
-  return false;
-}
-
-void MyMesh::sendFloodScoped(const ContactInfo& recipient, mesh::Packet* pkt, uint32_t delay_millis) {
-  // TODO: dynamic send_scope, depending on recipient and current 'home' Region
-  if (send_scope.isNull()) {
-    sendFlood(pkt, delay_millis);
-  } else {
-    uint16_t codes[2];
-    codes[0] = send_scope.calcTransportCode(pkt);
-    codes[1] = 0;  // REVISIT: set to 'home' Region, for sender/return region?
-    sendFlood(pkt, codes, delay_millis);
-  }
-}
-void MyMesh::sendFloodScoped(const mesh::GroupChannel& channel, mesh::Packet* pkt, uint32_t delay_millis) {
-  // TODO: have per-channel send_scope
-  if (send_scope.isNull()) {
-    sendFlood(pkt, delay_millis);
-  } else {
-    uint16_t codes[2];
-    codes[0] = send_scope.calcTransportCode(pkt);
-    codes[1] = 0;  // REVISIT: set to 'home' Region, for sender/return region?
-    sendFlood(pkt, codes, delay_millis);
-  }
-}
-
 void MyMesh::onMessageRecv(const ContactInfo &from, mesh::Packet *pkt, uint32_t sender_timestamp,
                           const char *text) {
  markConnectionActive(from); // in case this is from a server, and we have a connection
@@ -635,26 +596,6 @@ bool MyMesh::onContactPathRecv(ContactInfo& contact, uint8_t* in_path, uint8_t i
  return BaseChatMesh::onContactPathRecv(contact, in_path, in_path_len, out_path, out_path_len, extra_type, extra, extra_len);
 }

-void MyMesh::onControlDataRecv(mesh::Packet *packet) {
-  if (packet->payload_len + 4 > sizeof(out_frame)) {
-    MESH_DEBUG_PRINTLN("onControlDataRecv(), payload_len too long: %d", packet->payload_len);
-    return;
-  }
-  int i = 0;
-  out_frame[i++] = PUSH_CODE_CONTROL_DATA;
-  out_frame[i++] = (int8_t)(_radio->getLastSNR() * 4);
-  out_frame[i++] = (int8_t)(_radio->getLastRSSI());
-  out_frame[i++] = packet->path_len;
-  memcpy(&out_frame[i], packet->payload, packet->payload_len);
-  i += packet->payload_len;
-
-  if (_serial->isConnected()) {
-    _serial->writeFrame(out_frame, i);
-  } else {
-    MESH_DEBUG_PRINTLN("onControlDataRecv(), data received while app offline");
-  }
-}
-
 void MyMesh::onRawDataRecv(mesh::Packet *packet) {
  if (packet->payload_len + 4 > sizeof(out_frame)) {
    MESH_DEBUG_PRINTLN("onRawDataRecv(), payload_len too long: %d", packet->payload_len);
@@ -677,11 +618,6 @@ void MyMesh::onRawDataRecv(mesh::Packet *packet) {

 void MyMesh::onTraceRecv(mesh::Packet *packet, uint32_t tag, uint32_t auth_code, uint8_t flags,
                         const uint8_t *path_snrs, const uint8_t *path_hashes, uint8_t path_len) {
-  uint8_t path_sz = flags & 0x03;  // NEW v1.11+
-  if (12 + path_len + (path_len >> path_sz) + 1 > sizeof(out_frame)) {
-    MESH_DEBUG_PRINTLN("onTraceRecv(), path_len is too long: %d", (uint32_t)path_len);
-    return;
-  }
  int i = 0;
  out_frame[i++] = PUSH_CODE_TRACE_DATA;
  out_frame[i++] = 0; // reserved
@@ -693,9 +629,8 @@ void MyMesh::onTraceRecv(mesh::Packet *packet, uint32_t tag, uint32_t auth_code,
  i += 4;
  memcpy(&out_frame[i], path_hashes, path_len);
  i += path_len;
-
-  memcpy(&out_frame[i], path_snrs, path_len >> path_sz);
-  i += path_len >> path_sz;
+  memcpy(&out_frame[i], path_snrs, path_len);
+  i += path_len;
  out_frame[i++] = (int8_t)(packet->getSNR() * 4); // extra/final SNR (to this node)

  if (_serial->isConnected()) {
@@ -728,7 +663,6 @@ MyMesh::MyMesh(mesh::Radio &radio, mesh::RNG &rng, mesh::RTCClock &rtc, SimpleMe
  sign_data = NULL;
  dirty_contacts_expiry = 0;
  memset(advert_paths, 0, sizeof(advert_paths));
-  memset(send_scope.key, 0, sizeof(send_scope.key));

  // defaults
  memset(&_prefs, 0, sizeof(_prefs));
@@ -772,8 +706,8 @@ void MyMesh::begin(bool has_display) {
  _prefs.rx_delay_base = constrain(_prefs.rx_delay_base, 0, 20.0f);
  _prefs.airtime_factor = constrain(_prefs.airtime_factor, 0, 9.0f);
  _prefs.freq = constrain(_prefs.freq, 400.0f, 2500.0f);
-  _prefs.bw = constrain(_prefs.bw, 7.8f, 500.0f);
-  _prefs.sf = constrain(_prefs.sf, 5, 12);
+  _prefs.bw = constrain(_prefs.bw, 62.5f, 500.0f);
+  _prefs.sf = constrain(_prefs.sf, 7, 12);
  _prefs.cr = constrain(_prefs.cr, 5, 8);
  _prefs.tx_power_dbm = constrain(_prefs.tx_power_dbm, 1, MAX_LORA_TX_POWER);

@@ -1141,7 +1075,7 @@ void MyMesh::handleCmdFrame(size_t len) {
    uint8_t sf = cmd_frame[i++];
    uint8_t cr = cmd_frame[i++];

-    if (freq >= 300000 && freq <= 2500000 && sf >= 5 && sf <= 12 && cr >= 5 && cr <= 8 && bw >= 7000 &&
+    if (freq >= 300000 && freq <= 2500000 && sf >= 7 && sf <= 12 && cr >= 5 && cr <= 8 && bw >= 7000 &&
        bw <= 500000) {
      _prefs.sf = sf;
      _prefs.cr = cr;
@@ -1459,31 +1393,25 @@ void MyMesh::handleCmdFrame(size_t len) {
    } else {
      writeErrFrame(ERR_CODE_BAD_STATE);
    }
-  } else if (cmd_frame[0] == CMD_SEND_TRACE_PATH && len > 10 && len - 10 < MAX_PACKET_PAYLOAD-5) {
-    uint8_t path_len = len - 10;
-    uint8_t flags = cmd_frame[9];
-    uint8_t path_sz = flags & 0x03;  // NEW v1.11+ 
-    if ((path_len >> path_sz) > MAX_PATH_SIZE || (path_len % (1 << path_sz)) != 0) { // make sure is multiple of path_sz
-      writeErrFrame(ERR_CODE_ILLEGAL_ARG);
+  } else if (cmd_frame[0] == CMD_SEND_TRACE_PATH && len > 10 && len - 10 < MAX_PATH_SIZE) {
+    uint32_t tag, auth;
+    memcpy(&tag, &cmd_frame[1], 4);
+    memcpy(&auth, &cmd_frame[5], 4);
+    auto pkt = createTrace(tag, auth, cmd_frame[9]);
+    if (pkt) {
+      uint8_t path_len = len - 10;
+      sendDirect(pkt, &cmd_frame[10], path_len);
+
+      uint32_t t = _radio->getEstAirtimeFor(pkt->payload_len + pkt->path_len + 2);
+      uint32_t est_timeout = calcDirectTimeoutMillisFor(t, path_len);
+
+      out_frame[0] = RESP_CODE_SENT;
+      out_frame[1] = 0;
+      memcpy(&out_frame[2], &tag, 4);
+      memcpy(&out_frame[6], &est_timeout, 4);
+      _serial->writeFrame(out_frame, 10);
    } else {
-      uint32_t tag, auth;
-      memcpy(&tag, &cmd_frame[1], 4);
-      memcpy(&auth, &cmd_frame[5], 4);
-      auto pkt = createTrace(tag, auth, flags);
-      if (pkt) {
-        sendDirect(pkt, &cmd_frame[10], path_len);
-
-        uint32_t t = _radio->getEstAirtimeFor(pkt->payload_len + pkt->path_len + 2);
-        uint32_t est_timeout = calcDirectTimeoutMillisFor(t, path_len);
-
-        out_frame[0] = RESP_CODE_SENT;
-        out_frame[1] = 0;
-        memcpy(&out_frame[2], &tag, 4);
-        memcpy(&out_frame[6], &est_timeout, 4);
-        _serial->writeFrame(out_frame, 10);
-      } else {
-        writeErrFrame(ERR_CODE_TABLE_FULL);
-      }
+      writeErrFrame(ERR_CODE_TABLE_FULL);
    }
  } else if (cmd_frame[0] == CMD_SET_DEVICE_PIN && len >= 5) {

@@ -1548,55 +1476,6 @@ void MyMesh::handleCmdFrame(size_t len) {
    } else {
      writeErrFrame(ERR_CODE_NOT_FOUND);
    }
-  } else if (cmd_frame[0] == CMD_GET_STATS && len >= 2) {
-    uint8_t stats_type = cmd_frame[1];
-    if (stats_type == STATS_TYPE_CORE) {
-      int i = 0;
-      out_frame[i++] = RESP_CODE_STATS;
-      out_frame[i++] = STATS_TYPE_CORE;
-      uint16_t battery_mv = board.getBattMilliVolts();
-      uint32_t uptime_secs = _ms->getMillis() / 1000;
-      uint8_t queue_len = (uint8_t)_mgr->getOutboundCount(0xFFFFFFFF);
-      memcpy(&out_frame[i], &battery_mv, 2); i += 2;
-      memcpy(&out_frame[i], &uptime_secs, 4); i += 4;
-      memcpy(&out_frame[i], &_err_flags, 2); i += 2;
-      out_frame[i++] = queue_len;
-      _serial->writeFrame(out_frame, i);
-    } else if (stats_type == STATS_TYPE_RADIO) {
-      int i = 0;
-      out_frame[i++] = RESP_CODE_STATS;
-      out_frame[i++] = STATS_TYPE_RADIO;
-      int16_t noise_floor = (int16_t)_radio->getNoiseFloor();
-      int8_t last_rssi = (int8_t)radio_driver.getLastRSSI();
-      int8_t last_snr = (int8_t)(radio_driver.getLastSNR() * 4); // scaled by 4 for 0.25 dB precision
-      uint32_t tx_air_secs = getTotalAirTime() / 1000;
-      uint32_t rx_air_secs = getReceiveAirTime() / 1000;
-      memcpy(&out_frame[i], &noise_floor, 2); i += 2;
-      out_frame[i++] = last_rssi;
-      out_frame[i++] = last_snr;
-      memcpy(&out_frame[i], &tx_air_secs, 4); i += 4;
-      memcpy(&out_frame[i], &rx_air_secs, 4); i += 4;
-      _serial->writeFrame(out_frame, i);
-    } else if (stats_type == STATS_TYPE_PACKETS) {
-      int i = 0;
-      out_frame[i++] = RESP_CODE_STATS;
-      out_frame[i++] = STATS_TYPE_PACKETS;
-      uint32_t recv = radio_driver.getPacketsRecv();
-      uint32_t sent = radio_driver.getPacketsSent();
-      uint32_t n_sent_flood = getNumSentFlood();
-      uint32_t n_sent_direct = getNumSentDirect();
-      uint32_t n_recv_flood = getNumRecvFlood();
-      uint32_t n_recv_direct = getNumRecvDirect();
-      memcpy(&out_frame[i], &recv, 4); i += 4;
-      memcpy(&out_frame[i], &sent, 4); i += 4;
-      memcpy(&out_frame[i], &n_sent_flood, 4); i += 4;
-      memcpy(&out_frame[i], &n_sent_direct, 4); i += 4;
-      memcpy(&out_frame[i], &n_recv_flood, 4); i += 4;
-      memcpy(&out_frame[i], &n_recv_direct, 4); i += 4;
-      _serial->writeFrame(out_frame, i);
-    } else {
-      writeErrFrame(ERR_CODE_ILLEGAL_ARG); // invalid stats sub-type
-    }
  } else if (cmd_frame[0] == CMD_FACTORY_RESET && memcmp(&cmd_frame[1], "reset", 5) == 0) {
    bool success = _store->formatFileSystem();
    if (success) {
@@ -1606,21 +1485,6 @@ void MyMesh::handleCmdFrame(size_t len) {
    } else {
      writeErrFrame(ERR_CODE_FILE_IO_ERROR);
    }
-  } else if (cmd_frame[0] == CMD_SET_FLOOD_SCOPE && len >= 2 && cmd_frame[1] == 0) {
-    if (len >= 2 + 16) {
-      memcpy(send_scope.key, &cmd_frame[2], sizeof(send_scope.key));  // set curr scope TransportKey
-    } else {
-      memset(send_scope.key, 0, sizeof(send_scope.key));  // set scope to null
-    }
-    writeOKFrame();
-  } else if (cmd_frame[0] == CMD_SEND_CONTROL_DATA && len >= 2 && (cmd_frame[1] & 0x80) != 0) {
-    auto resp = createControlData(&cmd_frame[1], len - 1);
-    if (resp) {
-      sendZeroHop(resp);
-      writeOKFrame();
-    } else {
-      writeErrFrame(ERR_CODE_TABLE_FULL);
-    }
  } else {
    writeErrFrame(ERR_CODE_UNSUPPORTED_CMD);
    MESH_DEBUG_PRINTLN("ERROR: unknown command: %02X", cmd_frame[0]);
--- a/examples/companion_radio/MyMesh.h
+++ b/examples/companion_radio/MyMesh.h
@@ -5,14 +5,14 @@
 #include "AbstractUITask.h"

 /*------------ Frame Protocol --------------*/
-#define FIRMWARE_VER_CODE 8
+#define FIRMWARE_VER_CODE 7

 #ifndef FIRMWARE_BUILD_DATE
-#define FIRMWARE_BUILD_DATE "30 Nov 2025"
+#define FIRMWARE_BUILD_DATE "2 Oct 2025"
 #endif

 #ifndef FIRMWARE_VERSION
-#define FIRMWARE_VERSION "v1.11.0"
+#define FIRMWARE_VERSION "v1.9.1"
 #endif

 #if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)
@@ -68,7 +68,6 @@
 #endif

 #include <helpers/BaseChatMesh.h>
-#include <helpers/TransportKeyStore.h>

 /* -------------------------------------------------------------------------------------- */

@@ -107,10 +106,6 @@ protected:
  int getInterferenceThreshold() const override;
  int calcRxDelay(float score, uint32_t air_time) const override;
  uint8_t getExtraAckTransmitCount() const override;
-  bool filterRecvFloodPacket(mesh::Packet* packet) override;
-
-  void sendFloodScoped(const ContactInfo& recipient, mesh::Packet* pkt, uint32_t delay_millis=0) override;
-  void sendFloodScoped(const mesh::GroupChannel& channel, mesh::Packet* pkt, uint32_t delay_millis=0) override;

  void logRxRaw(float snr, float rssi, const uint8_t raw[], int len) override;
  bool isAutoAddEnabled() const override;
@@ -133,7 +128,6 @@ protected:
  uint8_t onContactRequest(const ContactInfo &contact, uint32_t sender_timestamp, const uint8_t *data,
                           uint8_t len, uint8_t *reply) override;
  void onContactResponse(const ContactInfo &contact, const uint8_t *data, uint8_t len) override;
-  void onControlDataRecv(mesh::Packet *packet) override;
  void onRawDataRecv(mesh::Packet *packet) override;
  void onTraceRecv(mesh::Packet *packet, uint32_t tag, uint32_t auth_code, uint8_t flags,
                   const uint8_t *path_snrs, const uint8_t *path_hashes, uint8_t path_len) override;
@@ -152,9 +146,6 @@ protected:
    pending_login = pending_status = pending_telemetry = pending_discovery = pending_req = 0;
  }

-public:
-  void savePrefs() { _store->savePrefs(_prefs, sensors.node_lat, sensors.node_lon); }
-
 private:
  void writeOKFrame();
  void writeErrFrame(uint8_t err_code);
@@ -174,9 +165,11 @@ private:
  void checkSerialInterface();

  // helpers, short-cuts
+  void savePrefs() { _store->savePrefs(_prefs, sensors.node_lat, sensors.node_lon); }
  void saveChannels() { _store->saveChannels(this); }
  void saveContacts() { _store->saveContacts(this); }

+private:
  DataStore* _store;
  NodePrefs _prefs;
  uint32_t pending_login;
@@ -198,8 +191,6 @@ private:
  uint32_t sign_data_len;
  unsigned long dirty_contacts_expiry;

-  TransportKey send_scope;
-
  uint8_t cmd_frame[MAX_FRAME_SIZE + 1];
  uint8_t out_frame[MAX_FRAME_SIZE + 1];
  CayenneLPP telemetry;
--- a/examples/companion_radio/NodePrefs.h
+++ b/examples/companion_radio/NodePrefs.h
@@ -24,5 +24,4 @@ struct NodePrefs {  // persisted to file
  float rx_delay_base;
  uint32_t ble_pin;
  uint8_t  advert_loc_policy;
-  uint8_t  buzzer_quiet;
 };
--- a/examples/companion_radio/main.cpp
+++ b/examples/companion_radio/main.cpp
@@ -227,5 +227,4 @@ void loop() {
 #ifdef DISPLAY_CLASS
  ui_task.loop();
 #endif
-  rtc_clock.tick();
 }
--- a/examples/companion_radio/ui-new/UITask.cpp
+++ b/examples/companion_radio/ui-new/UITask.cpp
@@ -260,24 +260,13 @@ public:
 #if ENV_INCLUDE_GPS == 1
    } else if (_page == HomePage::GPS) {
      LocationProvider* nmea = sensors.getLocationProvider();
-      char buf[50];
      int y = 18;
-      bool gps_state = _task->getGPSState();
-#ifdef PIN_GPS_SWITCH
-      bool hw_gps_state = digitalRead(PIN_GPS_SWITCH);
-      if (gps_state != hw_gps_state) {
-        strcpy(buf, gps_state ? "gps off(hw)" : "gps off(sw)");
-      } else {
-        strcpy(buf, gps_state ? "gps on" : "gps off");
-      }
-#else
-      strcpy(buf, gps_state ? "gps on" : "gps off");
-#endif
-      display.drawTextLeftAlign(0, y, buf);
+      display.drawTextLeftAlign(0, y, _task->getGPSState() ? "gps on" : "gps off");
      if (nmea == NULL) {
        y = y + 12;
        display.drawTextLeftAlign(0, y, "Can't access GPS");
      } else {
+        char buf[50];
        strcpy(buf, nmea->isValid()?"fix":"no fix");
        display.drawTextRightAlign(display.width()-1, y, buf);
        y = y + 12;
@@ -543,7 +532,6 @@ void UITask::begin(DisplayDriver* display, SensorManager* sensors, NodePrefs* no

 #ifdef PIN_BUZZER
  buzzer.begin();
-  buzzer.quiet(_node_prefs->buzzer_quiet);
 #endif

 #ifdef PIN_VIBRATION
@@ -630,7 +618,7 @@ void UITask::userLedHandler() {
      led_state = 0;
      next_led_change = cur_time + LED_CYCLE_MILLIS - last_led_increment;
    }
-    digitalWrite(PIN_STATUS_LED, led_state == LED_STATE_ON);
+    digitalWrite(PIN_STATUS_LED, led_state);
  }
 #endif
 }
@@ -662,7 +650,6 @@ void UITask::shutdown(bool restart){
    _board->reboot();
  } else {
    _display->turnOff();
-    radio_driver.powerOff();
    _board->powerOff();
  }
 }
@@ -713,28 +700,21 @@ void UITask::loop() {
  }
 #endif
 #if defined(PIN_USER_BTN_ANA)
-  if (abs(millis() - _analogue_pin_read_millis) > 10) {
-    ev = analog_btn.check();
-    if (ev == BUTTON_EVENT_CLICK) {
-      c = checkDisplayOn(KEY_NEXT);
-    } else if (ev == BUTTON_EVENT_LONG_PRESS) {
-      c = handleLongPress(KEY_ENTER);
-    } else if (ev == BUTTON_EVENT_DOUBLE_CLICK) {
-      c = handleDoubleClick(KEY_PREV);
-    } else if (ev == BUTTON_EVENT_TRIPLE_CLICK) {
-      c = handleTripleClick(KEY_SELECT);
-    }
-    _analogue_pin_read_millis = millis();
+  ev = analog_btn.check();
+  if (ev == BUTTON_EVENT_CLICK) {
+    c = checkDisplayOn(KEY_NEXT);
+  } else if (ev == BUTTON_EVENT_LONG_PRESS) {
+    c = handleLongPress(KEY_ENTER);
+  } else if (ev == BUTTON_EVENT_DOUBLE_CLICK) {
+    c = handleDoubleClick(KEY_PREV);
+  } else if (ev == BUTTON_EVENT_TRIPLE_CLICK) {
+    c = handleTripleClick(KEY_SELECT);
  }
 #endif
-#if defined(BACKLIGHT_BTN)
+#if defined(DISP_BACKLIGHT) && defined(BACKLIGHT_BTN)
  if (millis() > next_backlight_btn_check) {
    bool touch_state = digitalRead(PIN_BUTTON2);
-#if defined(DISP_BACKLIGHT)
    digitalWrite(DISP_BACKLIGHT, !touch_state);
-#elif defined(EXP_PIN_BACKLIGHT)
-    expander.digitalWrite(EXP_PIN_BACKLIGHT, !touch_state);
-#endif
    next_backlight_btn_check = millis() + 300;
  }
 #endif
@@ -888,8 +868,6 @@ void UITask::toggleBuzzer() {
      buzzer.quiet(true);
      showAlert("Buzzer: OFF", 800);
    }
-    _node_prefs->buzzer_quiet = buzzer.isQuiet();
-    the_mesh.savePrefs();
    _next_refresh = 0;  // trigger refresh
  #endif
 }
--- a/examples/companion_radio/ui-new/UITask.h
+++ b/examples/companion_radio/ui-new/UITask.h
@@ -40,10 +40,6 @@ class UITask : public AbstractUITask {
  int last_led_increment = 0;
 #endif

-#ifdef PIN_USER_BTN_ANA
-  unsigned long _analogue_pin_read_millis = millis();
-#endif
-
  UIScreen* splash;
  UIScreen* home;
  UIScreen* msg_preview;
--- a/examples/companion_radio/ui-orig/UITask.cpp
+++ b/examples/companion_radio/ui-orig/UITask.cpp
@@ -56,7 +56,6 @@ void UITask::begin(DisplayDriver* display, SensorManager* sensors, NodePrefs* no

 #ifdef PIN_BUZZER
  buzzer.begin();
-  buzzer.quiet(_node_prefs->buzzer_quiet);
 #endif

  // Initialize digital button if available
@@ -270,7 +269,7 @@ void UITask::userLedHandler() {
      state = 0;
      next_change = cur_time + LED_CYCLE_MILLIS - last_increment;
    }
-    digitalWrite(PIN_STATUS_LED, state == LED_STATE_ON);
+    digitalWrite(PIN_STATUS_LED, state);
  }
 #endif
 }
@@ -293,12 +292,10 @@ void UITask::shutdown(bool restart){

  #endif // PIN_BUZZER

-  if (restart) {
+  if (restart)
    _board->reboot();
-  } else {
-    radio_driver.powerOff();
+  else
    _board->powerOff();
-  }
 }

 void UITask::loop() {
@@ -397,8 +394,6 @@ void UITask::handleButtonTriplePress() {
      buzzer.quiet(true);
      sprintf(_alert, "Buzzer: OFF");
    }
-    _node_prefs->buzzer_quiet = buzzer.isQuiet();
-    the_mesh.savePrefs();
    _need_refresh = true;
  #endif
 }
--- a/examples/simple_repeater/MyMesh.cpp
+++ b/examples/simple_repeater/MyMesh.cpp
@@ -82,7 +82,7 @@ void MyMesh::putNeighbour(const mesh::Identity &id, uint32_t timestamp, float sn
 #endif
 }

-uint8_t MyMesh::handleLoginReq(const mesh::Identity& sender, const uint8_t* secret, uint32_t sender_timestamp, const uint8_t* data, bool is_flood) {
+uint8_t MyMesh::handleLoginReq(const mesh::Identity& sender, const uint8_t* secret, uint32_t sender_timestamp, const uint8_t* data) {
  ClientInfo* client = NULL;
  if (data[0] == 0) {   // blank password, just check if sender is in ACL
    client = acl.getClient(sender.pub_key, PUB_KEY_SIZE);
@@ -123,10 +123,6 @@ uint8_t MyMesh::handleLoginReq(const mesh::Identity& sender, const uint8_t* secr
    }
  }

-  if (is_flood) {
-    client->out_path_len = -1;  // need to rediscover out_path
-  }
-
  uint32_t now = getRTCClock()->getCurrentTimeUnique();
  memcpy(reply_data, &now, 4);   // response packets always prefixed with timestamp
  reply_data[4] = RESP_SERVER_LOGIN_OK;
@@ -174,10 +170,7 @@ int MyMesh::handleRequest(ClientInfo *sender, uint32_t sender_timestamp, uint8_t
    telemetry.reset();
    telemetry.addVoltage(TELEM_CHANNEL_SELF, (float)board.getBattMilliVolts() / 1000.0f);
    // query other sensors -- target specific
-    if ((sender->permissions & PERM_ACL_ROLE_MASK) == PERM_ACL_GUEST) {
-      perm_mask = 0x00;  // just base telemetry allowed
-    }
-    sensors.querySensors(perm_mask, telemetry);
+    sensors.querySensors((sender->isAdmin() ? 0xFF : 0x00) & perm_mask, telemetry);

    uint8_t tlen = telemetry.getSize();
    memcpy(&reply_data[4], telemetry.getBuffer(), tlen);
@@ -313,10 +306,6 @@ File MyMesh::openAppend(const char *fname) {
 bool MyMesh::allowPacketForward(const mesh::Packet *packet) {
  if (_prefs.disable_fwd) return false;
  if (packet->isRouteFlood() && packet->path_len >= _prefs.flood_max) return false;
-  if (packet->isRouteFlood() && recv_pkt_region == NULL) {
-    MESH_DEBUG_PRINTLN("allowPacketForward: unknown transport code, or wildcard not allowed for FLOOD packet");
-    return false;
-  }
  return true;
 }

@@ -408,28 +397,11 @@ int MyMesh::calcRxDelay(float score, uint32_t air_time) const {

 uint32_t MyMesh::getRetransmitDelay(const mesh::Packet *packet) {
  uint32_t t = (_radio->getEstAirtimeFor(packet->path_len + packet->payload_len + 2) * _prefs.tx_delay_factor);
-  return getRNG()->nextInt(0, 5*t + 1);
+  return getRNG()->nextInt(0, 6) * t;
 }
 uint32_t MyMesh::getDirectRetransmitDelay(const mesh::Packet *packet) {
  uint32_t t = (_radio->getEstAirtimeFor(packet->path_len + packet->payload_len + 2) * _prefs.direct_tx_delay_factor);
-  return getRNG()->nextInt(0, 5*t + 1);
-}
-
-bool MyMesh::filterRecvFloodPacket(mesh::Packet* pkt) {
-  // just try to determine region for packet (apply later in allowPacketForward())
-  if (pkt->getRouteType() == ROUTE_TYPE_TRANSPORT_FLOOD) {
-    recv_pkt_region = region_map.findMatch(pkt, REGION_DENY_FLOOD);
-  } else if (pkt->getRouteType() == ROUTE_TYPE_FLOOD) {
-    if (region_map.getWildcard().flags & REGION_DENY_FLOOD) {
-      recv_pkt_region = NULL;
-    } else {
-      recv_pkt_region =  &region_map.getWildcard();
-    }
-  } else {
-    recv_pkt_region = NULL;
-  }
-  // do normal processing
-  return false;
+  return getRNG()->nextInt(0, 6) * t;
 }

 void MyMesh::onAnonDataRecv(mesh::Packet *packet, const uint8_t *secret, const mesh::Identity &sender,
@@ -440,14 +412,7 @@ void MyMesh::onAnonDataRecv(mesh::Packet *packet, const uint8_t *secret, const m
    memcpy(&timestamp, data, 4);

    data[len] = 0;  // ensure null terminator
-    uint8_t reply_len;
-    if (data[4] == 0 || data[4] >= ' ') {   // is password, ie. a login request
-      reply_len = handleLoginReq(sender, secret, timestamp, &data[4], packet->isRouteFlood());
-    //} else if (data[4] == ANON_REQ_TYPE_*) {   // future type codes
-      // TODO
-    } else {
-      reply_len = 0;  // unknown request type
-    }
+    uint8_t reply_len = handleLoginReq(sender, secret, timestamp, &data[4]);

    if (reply_len == 0) return;   // invalid request

@@ -483,19 +448,12 @@ void MyMesh::getPeerSharedSecret(uint8_t *dest_secret, int peer_idx) {
  }
 }

-static bool isShare(const mesh::Packet *packet) {
-  if (packet->hasTransportCodes()) {
-    return packet->transport_codes[0] == 0 && packet->transport_codes[1] == 0;  // codes { 0, 0 } means 'send to nowhere'
-  }
-  return false;
-}
-
 void MyMesh::onAdvertRecv(mesh::Packet *packet, const mesh::Identity &id, uint32_t timestamp,
                          const uint8_t *app_data, size_t app_data_len) {
  mesh::Mesh::onAdvertRecv(packet, id, timestamp, app_data, app_data_len); // chain to super impl

-  // if this a zero hop advert (and not via 'Share'), add it to neighbours
-  if (packet->path_len == 0 && !isShare(packet)) {
+  // if this a zero hop advert, add it to neighbours
+  if (packet->path_len == 0) {
    AdvertDataParser parser(app_data, app_data_len);
    if (parser.isValid() && parser.getType() == ADV_TYPE_REPEATER) { // just keep neigbouring Repeaters
      putNeighbour(id, timestamp, packet->getSNR());
@@ -545,7 +503,7 @@ void MyMesh::onPeerDataRecv(mesh::Packet *packet, uint8_t type, int sender_idx,
  } else if (type == PAYLOAD_TYPE_TXT_MSG && len > 5 && client->isAdmin()) { // a CLI command
    uint32_t sender_timestamp;
    memcpy(&sender_timestamp, data, 4); // timestamp (by sender's RTC clock - which could be wrong)
-    uint8_t flags = (data[4] >> 2);        // message attempt number, and other flags
+    uint flags = (data[4] >> 2);        // message attempt number, and other flags

    if (!(flags == TXT_TYPE_PLAIN || flags == TXT_TYPE_CLI_DATA)) {
      MESH_DEBUG_PRINTLN("onPeerDataRecv: unsupported text type received: flags=%02x", (uint32_t)flags);
@@ -625,43 +583,10 @@ bool MyMesh::onPeerPathRecv(mesh::Packet *packet, int sender_idx, const uint8_t
  return false;
 }

-#define CTL_TYPE_NODE_DISCOVER_REQ   0x80
-#define CTL_TYPE_NODE_DISCOVER_RESP  0x90
-
-void MyMesh::onControlDataRecv(mesh::Packet* packet) {
-  uint8_t type = packet->payload[0] & 0xF0;    // just test upper 4 bits
-  if (type == CTL_TYPE_NODE_DISCOVER_REQ && packet->payload_len >= 6 && discover_limiter.allow(rtc_clock.getCurrentTime())) {
-    int i = 1;
-    uint8_t  filter = packet->payload[i++];
-    uint32_t tag;
-    memcpy(&tag, &packet->payload[i], 4); i += 4;
-    uint32_t since;
-    if (packet->payload_len >= i+4) {   // optional since field
-      memcpy(&since, &packet->payload[i], 4); i += 4;
-    } else {
-      since = 0;
-    }
-
-    if ((filter & (1 << ADV_TYPE_REPEATER)) != 0 && _prefs.discovery_mod_timestamp >= since) {
-      bool prefix_only = packet->payload[0] & 1;
-      uint8_t data[6 + PUB_KEY_SIZE];
-      data[0] = CTL_TYPE_NODE_DISCOVER_RESP | ADV_TYPE_REPEATER;   // low 4-bits for node type
-      data[1] = packet->_snr;   // let sender know the inbound SNR ( x 4)
-      memcpy(&data[2], &tag, 4);     // include tag from request, for client to match to
-      memcpy(&data[6], self_id.pub_key, PUB_KEY_SIZE);
-      auto resp = createControlData(data, prefix_only ? 6 + 8 : 6 + PUB_KEY_SIZE);
-      if (resp) {
-        sendZeroHop(resp, getRetransmitDelay(resp)*4);  // apply random delay (widened x4), as multiple nodes can respond to this
-      }
-    }
-  }
-}
-
 MyMesh::MyMesh(mesh::MainBoard &board, mesh::Radio &radio, mesh::MillisecondClock &ms, mesh::RNG &rng,
               mesh::RTCClock &rtc, mesh::MeshTables &tables)
    : mesh::Mesh(radio, ms, rng, rtc, *new StaticPoolPacketManager(32), tables),
-      _cli(board, rtc, sensors, &_prefs, this), telemetry(MAX_PACKET_PAYLOAD - 4), region_map(key_store), temp_map(key_store),
-      discover_limiter(4, 120)  // max 4 every 2 minutes
+      _cli(board, rtc, sensors, &_prefs, this), telemetry(MAX_PACKET_PAYLOAD - 4)
 #if defined(WITH_RS232_BRIDGE)
      , bridge(&_prefs, WITH_RS232_BRIDGE, _mgr, &rtc)
 #endif
@@ -675,7 +600,6 @@ MyMesh::MyMesh(mesh::MainBoard &board, mesh::Radio &radio, mesh::MillisecondCloc
  dirty_contacts_expiry = 0;
  set_radio_at = revert_radio_at = 0;
  _logging = false;
-  region_load_active = false;

 #if MAX_NEIGHBOURS
  memset(neighbours, 0, sizeof(neighbours));
@@ -686,7 +610,6 @@ MyMesh::MyMesh(mesh::MainBoard &board, mesh::Radio &radio, mesh::MillisecondCloc
  _prefs.airtime_factor = 1.0;   // one half
  _prefs.rx_delay_base = 0.0f;   // turn off by default, was 10.0;
  _prefs.tx_delay_factor = 0.5f; // was 0.25f
-  _prefs.direct_tx_delay_factor = 0.2f; // was zero
  StrHelper::strncpy(_prefs.node_name, ADVERT_NAME, sizeof(_prefs.node_name));
  _prefs.node_lat = ADVERT_LAT;
  _prefs.node_lon = ADVERT_LON;
@@ -714,8 +637,6 @@ MyMesh::MyMesh(mesh::MainBoard &board, mesh::Radio &radio, mesh::MillisecondCloc
  _prefs.gps_enabled = 0;
  _prefs.gps_interval = 0;
  _prefs.advert_loc_policy = ADVERT_LOC_PREFS;
-
-  _prefs.adc_multiplier = 0.0f; // 0.0f means use default board multiplier
 }

 void MyMesh::begin(FILESYSTEM *fs) {
@@ -723,9 +644,8 @@ void MyMesh::begin(FILESYSTEM *fs) {
  _fs = fs;
  // load persisted prefs
  _cli.loadPrefs(_fs);
+
  acl.load(_fs);
-  // TODO: key_store.begin();
-  region_map.load(_fs);

 #if defined(WITH_BRIDGE)
  if (_prefs.bridge_enabled) {
@@ -739,8 +659,6 @@ void MyMesh::begin(FILESYSTEM *fs) {
  updateAdvertTimer();
  updateFloodAdvertTimer();

-  board.setAdcMultiplier(_prefs.adc_multiplier);
-
 #if ENV_INCLUDE_GPS == 1
  applyGpsPrefs();
 #endif
@@ -869,19 +787,6 @@ void MyMesh::removeNeighbor(const uint8_t *pubkey, int key_len) {
 #endif
 }

-void MyMesh::formatStatsReply(char *reply) {
-  StatsFormatHelper::formatCoreStats(reply, board, *_ms, _err_flags, _mgr);
-}
-
-void MyMesh::formatRadioStatsReply(char *reply) {
-  StatsFormatHelper::formatRadioStats(reply, _radio, radio_driver, getTotalAirTime(), getReceiveAirTime());
-}
-
-void MyMesh::formatPacketStatsReply(char *reply) {
-  StatsFormatHelper::formatPacketStats(reply, radio_driver, getNumSentFlood(), getNumSentDirect(), 
-                                       getNumRecvFlood(), getNumRecvDirect());
-}
-
 void MyMesh::saveIdentity(const mesh::LocalIdentity &new_id) {
  self_id = new_id;
 #if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)
@@ -902,42 +807,21 @@ void MyMesh::clearStats() {
  ((SimpleMeshTables *)getTables())->resetStats();
 }

-void MyMesh::handleCommand(uint32_t sender_timestamp, char *command, char *reply) {
-  if (region_load_active) {
-    if (StrHelper::isBlank(command)) {  // empty/blank line, signal to terminate 'load' operation
-      region_map = temp_map;  // copy over the temp instance as new current map
-      region_load_active = false;
-
-      sprintf(reply, "OK - loaded %d regions", region_map.getCount());
-    } else {
-      char *np = command;
-      while (*np == ' ') np++;   // skip indent
-      int indent = np - command;
-
-      char *ep = np;
-      while (RegionMap::is_name_char(*ep)) ep++;
-      if (*ep) { *ep++ = 0; }  // set null terminator for end of name
-
-      while (*ep && *ep != 'F') ep++;  // look for (optional) flags
-
-      if (indent > 0 && indent < 8 && strlen(np) > 0) {
-        auto parent = load_stack[indent - 1];
-        if (parent) {
-          auto old = region_map.findByName(np);
-          auto nw = temp_map.putRegion(np, parent->id, old ? old->id : 0);  // carry-over the current ID (if name already exists)
-          if (nw) {
-            nw->flags = old ? old->flags : (*ep == 'F' ? 0 : REGION_DENY_FLOOD);   // carry-over flags from curr
-
-            load_stack[indent] = nw;  // keep pointers to parent regions, to resolve parent_id's
-          }
-        }
-      }
-      reply[0] = 0;
+void MyMesh::regenerateKeys(uint8_t byte) { 
+  if (byte >0 && byte < 0xff){
+    MESH_DEBUG_PRINTLN("Generating new keypair");
+    mesh::LocalIdentity new_id = radio_new_identity();
+    
+    while (new_id.pub_key[0] != byte) {
+      new_id = radio_new_identity();
    }
-    return;
+    saveIdentity(new_id);
  }
+}

-  while (*command == ' ') command++; // skip leading spaces
+void MyMesh::handleCommand(uint32_t sender_timestamp, char *command, char *reply) {
+  while (*command == ' ')
+    command++; // skip leading spaces

  if (strlen(command) > 4 && command[2] == '|') { // optional prefix (for companion radio CLI)
    memcpy(reply, command, 3);                    // reflect the prefix back
@@ -979,88 +863,6 @@ void MyMesh::handleCommand(uint32_t sender_timestamp, char *command, char *reply
      Serial.printf("\n");
    }
    reply[0] = 0;
-  } else if (memcmp(command, "region", 6) == 0) {
-    reply[0] = 0;
-
-    const char* parts[4];
-    int n = mesh::Utils::parseTextParts(command, parts, 4, ' ');
-    if (n == 1 && sender_timestamp == 0) {
-      region_map.exportTo(Serial);
-    } else if (n >= 2 && strcmp(parts[1], "load") == 0) {
-      temp_map.resetFrom(region_map);   // rebuild regions in a temp instance
-      memset(load_stack, 0, sizeof(load_stack));
-      load_stack[0] = &temp_map.getWildcard();
-      region_load_active = true;
-    } else if (n >= 2 && strcmp(parts[1], "save") == 0) {
-      _prefs.discovery_mod_timestamp = rtc_clock.getCurrentTime();   // this node is now 'modified' (for discovery info)
-      savePrefs();
-      bool success = region_map.save(_fs);
-      strcpy(reply, success ? "OK" : "Err - save failed");
-    } else if (n >= 3 && strcmp(parts[1], "allowf") == 0) {
-      auto region = region_map.findByNamePrefix(parts[2]);
-      if (region) {
-        region->flags &= ~REGION_DENY_FLOOD;
-        strcpy(reply, "OK");
-      } else {
-        strcpy(reply, "Err - unknown region");
-      }
-    } else if (n >= 3 && strcmp(parts[1], "denyf") == 0) {
-      auto region = region_map.findByNamePrefix(parts[2]);
-      if (region) {
-        region->flags |= REGION_DENY_FLOOD;
-        strcpy(reply, "OK");
-      } else {
-        strcpy(reply, "Err - unknown region");
-      }
-    } else if (n >= 3 && strcmp(parts[1], "get") == 0) {
-      auto region = region_map.findByNamePrefix(parts[2]);
-      if (region) {
-        auto parent = region_map.findById(region->parent);
-        if (parent && parent->id != 0) {
-          sprintf(reply, " %s (%s) %s", region->name, parent->name, (region->flags & REGION_DENY_FLOOD) ? "" : "F");
-        } else {
-          sprintf(reply, " %s %s", region->name, (region->flags & REGION_DENY_FLOOD) ? "" : "F");
-        }
-      } else {
-        strcpy(reply, "Err - unknown region");
-      }
-    } else if (n >= 3 && strcmp(parts[1], "home") == 0) {
-      auto home = region_map.findByNamePrefix(parts[2]);
-      if (home) {
-        region_map.setHomeRegion(home);
-        sprintf(reply, " home is now %s", home->name);
-      } else {
-        strcpy(reply, "Err - unknown region");
-      }
-    } else if (n == 2 && strcmp(parts[1], "home") == 0) {
-      auto home = region_map.getHomeRegion();
-      sprintf(reply, " home is %s", home ? home->name : "*");
-    } else if (n >= 3 && strcmp(parts[1], "put") == 0) {
-      auto parent = n >= 4 ? region_map.findByNamePrefix(parts[3]) : &region_map.getWildcard();
-      if (parent == NULL) {
-        strcpy(reply, "Err - unknown parent");
-      } else {
-        auto region = region_map.putRegion(parts[2], parent->id);
-        if (region == NULL) {
-          strcpy(reply, "Err - unable to put");
-        } else {
-          strcpy(reply, "OK");
-        }
-      }
-    } else if (n >= 3 && strcmp(parts[1], "remove") == 0) {
-      auto region = region_map.findByName(parts[2]);
-      if (region) {
-        if (region_map.removeRegion(*region)) {
-          strcpy(reply, "OK");
-        } else {
-          strcpy(reply, "Err - not empty");
-        }
-      } else {
-        strcpy(reply, "Err - not found");
-      }
-    } else {
-      strcpy(reply, "Err - ??");
-    }
  } else{
    _cli.handleCommand(sender_timestamp, command, reply);  // common CLI commands
  }
--- a/examples/simple_repeater/MyMesh.h
+++ b/examples/simple_repeater/MyMesh.h
@@ -30,10 +30,7 @@
 #include <helpers/IdentityStore.h>
 #include <helpers/SimpleMeshTables.h>
 #include <helpers/StaticPoolPacketManager.h>
-#include <helpers/StatsFormatHelper.h>
 #include <helpers/TxtDataHelpers.h>
-#include <helpers/RegionMap.h>
-#include "RateLimiter.h"

 #ifdef WITH_BRIDGE
 extern AbstractBridge* bridge;
@@ -68,11 +65,11 @@ struct NeighbourInfo {
 };

 #ifndef FIRMWARE_BUILD_DATE
-  #define FIRMWARE_BUILD_DATE   "30 Nov 2025"
+  #define FIRMWARE_BUILD_DATE   "2 Oct 2025"
 #endif

 #ifndef FIRMWARE_VERSION
-  #define FIRMWARE_VERSION   "v1.11.0"
+  #define FIRMWARE_VERSION   "v1.9.1"
 #endif

 #define FIRMWARE_ROLE "repeater"
@@ -89,12 +86,6 @@ class MyMesh : public mesh::Mesh, public CommonCLICallbacks {
  CommonCLI _cli;
  uint8_t reply_data[MAX_PACKET_PAYLOAD];
  ClientACL  acl;
-  TransportKeyStore key_store;
-  RegionMap region_map, temp_map;
-  RegionEntry* load_stack[8];
-  RegionEntry* recv_pkt_region;
-  RateLimiter discover_limiter;
-  bool region_load_active;
  unsigned long dirty_contacts_expiry;
 #if MAX_NEIGHBOURS
  NeighbourInfo neighbours[MAX_NEIGHBOURS];
@@ -113,7 +104,7 @@ class MyMesh : public mesh::Mesh, public CommonCLICallbacks {
 #endif

  void putNeighbour(const mesh::Identity& id, uint32_t timestamp, float snr);
-  uint8_t handleLoginReq(const mesh::Identity& sender, const uint8_t* secret, uint32_t sender_timestamp, const uint8_t* data, bool is_flood);
+  uint8_t handleLoginReq(const mesh::Identity& sender, const uint8_t* secret, uint32_t sender_timestamp, const uint8_t* data);
  int handleRequest(ClientInfo* sender, uint32_t sender_timestamp, uint8_t* payload, size_t payload_len);
  mesh::Packet* createSelfAdvert();

@@ -148,19 +139,16 @@ protected:

 #if ENV_INCLUDE_GPS == 1
  void applyGpsPrefs() {
-    sensors.setSettingValue("gps", _prefs.gps_enabled?"1":"0");
+    sensors.setSettingByKey("gps", _prefs.gps_enabled?"1":"0");
  }
 #endif

-  bool filterRecvFloodPacket(mesh::Packet* pkt) override;
-
  void onAnonDataRecv(mesh::Packet* packet, const uint8_t* secret, const mesh::Identity& sender, uint8_t* data, size_t len) override;
  int searchPeersByHash(const uint8_t* hash) override;
  void getPeerSharedSecret(uint8_t* dest_secret, int peer_idx) override;
  void onAdvertRecv(mesh::Packet* packet, const mesh::Identity& id, uint32_t timestamp, const uint8_t* app_data, size_t app_data_len);
  void onPeerDataRecv(mesh::Packet* packet, uint8_t type, int sender_idx, const uint8_t* secret, uint8_t* data, size_t len) override;
  bool onPeerPathRecv(mesh::Packet* packet, int sender_idx, const uint8_t* secret, uint8_t* path, uint8_t path_len, uint8_t extra_type, uint8_t* extra, uint8_t extra_len) override;
-  void onControlDataRecv(mesh::Packet* packet) override;

 public:
  MyMesh(mesh::MainBoard& board, mesh::Radio& radio, mesh::MillisecondClock& ms, mesh::RNG& rng, mesh::RTCClock& rtc, mesh::MeshTables& tables);
@@ -195,14 +183,12 @@ public:
  void setTxPower(uint8_t power_dbm) override;
  void formatNeighborsReply(char *reply) override;
  void removeNeighbor(const uint8_t* pubkey, int key_len) override;
-  void formatStatsReply(char *reply) override;
-  void formatRadioStatsReply(char *reply) override;
-  void formatPacketStatsReply(char *reply) override;

  mesh::LocalIdentity& getSelfId() override { return self_id; }

  void saveIdentity(const mesh::LocalIdentity& new_id) override;
  void clearStats() override;
+  void regenerateKeys(uint8_t byte);  
  void handleCommand(uint32_t sender_timestamp, char* command, char* reply);
  void loop();

--- a/examples/simple_repeater/RateLimiter.h
+++ b/examples/simple_repeater/RateLimiter.h
@@ -1,23 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-
-class RateLimiter {
-  uint32_t _start_timestamp;
-  uint32_t _secs;
-  uint16_t _maximum, _count;
-
-public:
-  RateLimiter(uint16_t maximum, uint32_t secs): _maximum(maximum), _secs(secs), _start_timestamp(0), _count(0) { }
-
-  bool allow(uint32_t now) {
-    if (now < _start_timestamp + _secs) {
-      _count++;
-      if (_count > _maximum) return false;   // deny
-    } else {   // time window now expired
-      _start_timestamp = now;
-      _count = 1;
-    }
-    return true;
-  }
-};
--- a/examples/simple_repeater/main.cpp
+++ b/examples/simple_repeater/main.cpp
@@ -91,16 +91,14 @@ void loop() {
    if (c != '\n') {
      command[len++] = c;
      command[len] = 0;
-      Serial.print(c);
    }
-    if (c == '\r') break;
+    Serial.print(c);
  }
  if (len == sizeof(command)-1) {  // command buffer full
    command[sizeof(command)-1] = '\r';
  }

  if (len > 0 && command[len - 1] == '\r') {  // received complete line
-    Serial.print('\n');
    command[len - 1] = 0;  // replace newline with C string null terminator
    char reply[160];
    the_mesh.handleCommand(0, command, reply);  // NOTE: there is no sender_timestamp via serial!
@@ -116,5 +114,4 @@ void loop() {
 #ifdef DISPLAY_CLASS
  ui_task.loop();
 #endif
-  rtc_clock.tick();
 }
--- a/examples/simple_room_server/MyMesh.cpp
+++ b/examples/simple_room_server/MyMesh.cpp
@@ -165,10 +165,7 @@ int MyMesh::handleRequest(ClientInfo *sender, uint32_t sender_timestamp, uint8_t
    telemetry.reset();
    telemetry.addVoltage(TELEM_CHANNEL_SELF, (float)board.getBattMilliVolts() / 1000.0f);
    // query other sensors -- target specific
-    if ((sender->permissions & PERM_ACL_ROLE_MASK) == PERM_ACL_GUEST) {
-      perm_mask = 0x00;  // just base telemetry allowed
-    }
-    sensors.querySensors(perm_mask, telemetry);
+    sensors.querySensors((sender->isAdmin() ? 0xFF : 0x00) & perm_mask, telemetry);

    uint8_t tlen = telemetry.getSize();
    memcpy(&reply_data[4], telemetry.getBuffer(), tlen);
@@ -265,11 +262,11 @@ const char *MyMesh::getLogDateTime() {

 uint32_t MyMesh::getRetransmitDelay(const mesh::Packet *packet) {
  uint32_t t = (_radio->getEstAirtimeFor(packet->path_len + packet->payload_len + 2) * _prefs.tx_delay_factor);
-  return getRNG()->nextInt(0, 5*t + 1);
+  return getRNG()->nextInt(0, 6) * t;
 }
 uint32_t MyMesh::getDirectRetransmitDelay(const mesh::Packet *packet) {
  uint32_t t = (_radio->getEstAirtimeFor(packet->path_len + packet->payload_len + 2) * _prefs.direct_tx_delay_factor);
-  return getRNG()->nextInt(0, 5*t + 1);
+  return getRNG()->nextInt(0, 6) * t;
 }

 bool MyMesh::allowPacketForward(const mesh::Packet *packet) {
@@ -332,10 +329,6 @@ void MyMesh::onAnonDataRecv(mesh::Packet *packet, const uint8_t *secret, const m
      dirty_contacts_expiry = futureMillis(LAZY_CONTACTS_WRITE_DELAY);
    }

-    if (packet->isRouteFlood()) {
-      client->out_path_len = -1;  // need to rediscover out_path
-    }
-
    uint32_t now = getRTCClock()->getCurrentTimeUnique();
    memcpy(reply_data, &now, 4); // response packets always prefixed with timestamp
    // TODO: maybe reply with count of messages waiting to be synced for THIS client?
@@ -398,7 +391,7 @@ void MyMesh::onPeerDataRecv(mesh::Packet *packet, uint8_t type, int sender_idx,
  if (type == PAYLOAD_TYPE_TXT_MSG && len > 5) { // a CLI command or new Post
    uint32_t sender_timestamp;
    memcpy(&sender_timestamp, data, 4); // timestamp (by sender's RTC clock - which could be wrong)
-    uint8_t flags = (data[4] >> 2);        // message attempt number, and other flags
+    uint flags = (data[4] >> 2);        // message attempt number, and other flags

    if (!(flags == TXT_TYPE_PLAIN || flags == TXT_TYPE_CLI_DATA)) {
      MESH_DEBUG_PRINTLN("onPeerDataRecv: unsupported command flags received: flags=%02x", (uint32_t)flags);
@@ -600,7 +593,6 @@ MyMesh::MyMesh(mesh::MainBoard &board, mesh::Radio &radio, mesh::MillisecondCloc
  _prefs.airtime_factor = 1.0;   // one half
  _prefs.rx_delay_base = 0.0f;   // off by default, was 10.0
  _prefs.tx_delay_factor = 0.5f; // was 0.25f;
-  _prefs.direct_tx_delay_factor = 0.2f; // was zero
  StrHelper::strncpy(_prefs.node_name, ADVERT_NAME, sizeof(_prefs.node_name));
  _prefs.node_lat = ADVERT_LAT;
  _prefs.node_lon = ADVERT_LON;
@@ -645,8 +637,6 @@ void MyMesh::begin(FILESYSTEM *fs) {
  updateAdvertTimer();
  updateFloodAdvertTimer();

-  board.setAdcMultiplier(_prefs.adc_multiplier);
-
 #if ENV_INCLUDE_GPS == 1
  applyGpsPrefs();
 #endif
@@ -739,19 +729,6 @@ void MyMesh::clearStats() {
  ((SimpleMeshTables *)getTables())->resetStats();
 }

-void MyMesh::formatStatsReply(char *reply) {
-  StatsFormatHelper::formatCoreStats(reply, board, *_ms, _err_flags, _mgr);
-}
-
-void MyMesh::formatRadioStatsReply(char *reply) {
-  StatsFormatHelper::formatRadioStats(reply, _radio, radio_driver, getTotalAirTime(), getReceiveAirTime());
-}
-
-void MyMesh::formatPacketStatsReply(char *reply) {
-  StatsFormatHelper::formatPacketStats(reply, radio_driver, getNumSentFlood(), getNumSentDirect(), 
-                                       getNumRecvFlood(), getNumRecvDirect());
-}
-
 void MyMesh::handleCommand(uint32_t sender_timestamp, char *command, char *reply) {
  while (*command == ' ')
    command++; // skip leading spaces
@@ -815,7 +792,7 @@ void MyMesh::loop() {
      if (c->extra.room.pending_ack && millisHasNowPassed(c->extra.room.ack_timeout)) {
        c->extra.room.push_failures++;
        c->extra.room.pending_ack = 0; // reset  (TODO: keep prev expected_ack's in a list, incase they arrive LATER, after we retry)
-        MESH_DEBUG_PRINTLN("pending ACK timed out: push_failures: %d", (uint32_t)c->extra.room.push_failures);
+        MESH_DEBUG_PRINTLN("pending ACK timed out: push_failures: %d", (uint32_t)c->push_failures);
      }
    }
    // check next Round-Robin client, and sync next new post
--- a/examples/simple_room_server/MyMesh.h
+++ b/examples/simple_room_server/MyMesh.h
@@ -18,7 +18,6 @@
 #include <helpers/AdvertDataHelpers.h>
 #include <helpers/TxtDataHelpers.h>
 #include <helpers/CommonCLI.h>
-#include <helpers/StatsFormatHelper.h>
 #include <helpers/ClientACL.h>
 #include <RTClib.h>
 #include <target.h>
@@ -26,11 +25,11 @@
 /* ------------------------------ Config -------------------------------- */

 #ifndef FIRMWARE_BUILD_DATE
-  #define FIRMWARE_BUILD_DATE   "30 Nov 2025"
+  #define FIRMWARE_BUILD_DATE   "2 Oct 2025"
 #endif

 #ifndef FIRMWARE_VERSION
-  #define FIRMWARE_VERSION   "v1.11.0"
+  #define FIRMWARE_VERSION   "v1.9.1"
 #endif

 #ifndef LORA_FREQ
@@ -154,7 +153,7 @@ protected:

 #if ENV_INCLUDE_GPS == 1
  void applyGpsPrefs() {
-    sensors.setSettingValue("gps", _prefs.gps_enabled?"1":"0");
+    sensors.setSettingByKey("gps", _prefs.gps_enabled?"1":"0");
  }
 #endif

@@ -193,9 +192,6 @@ public:
  void formatNeighborsReply(char *reply) override {
    strcpy(reply, "not supported");
  }
-  void formatStatsReply(char *reply) override;
-  void formatRadioStatsReply(char *reply) override;
-  void formatPacketStatsReply(char *reply) override;

  mesh::LocalIdentity& getSelfId() override { return self_id; }

--- a/examples/simple_room_server/main.cpp
+++ b/examples/simple_room_server/main.cpp
@@ -110,5 +110,4 @@ void loop() {
 #ifdef DISPLAY_CLASS
  ui_task.loop();
 #endif
-  rtc_clock.tick();
 }
--- a/examples/simple_secure_chat/main.cpp
+++ b/examples/simple_secure_chat/main.cpp
@@ -548,7 +548,7 @@ public:

 StdRNG fast_rng;
 SimpleMeshTables tables;
-MyMesh the_mesh(radio_driver, fast_rng, rtc_clock, tables);
+MyMesh the_mesh(radio_driver, fast_rng, *new VolatileRTCClock(), tables); // TODO: test with 'rtc_clock' in target.cpp

 void halt() {
  while (1) ;
@@ -587,5 +587,4 @@ void setup() {

 void loop() {
  the_mesh.loop();
-  rtc_clock.tick();
 }
--- a/examples/simple_sensor/SensorMesh.cpp
+++ b/examples/simple_sensor/SensorMesh.cpp
@@ -326,7 +326,7 @@ int SensorMesh::getAGCResetInterval() const {
  return ((int)_prefs.agc_reset_interval) * 4000;   // milliseconds
 }

-uint8_t SensorMesh::handleLoginReq(const mesh::Identity& sender, const uint8_t* secret, uint32_t sender_timestamp, const uint8_t* data, bool is_flood) {
+uint8_t SensorMesh::handleLoginReq(const mesh::Identity& sender, const uint8_t* secret, uint32_t sender_timestamp, const uint8_t* data) {
  ClientInfo* client;
  if (data[0] == 0) {   // blank password, just check if sender is in ACL
    client = acl.getClient(sender.pub_key, PUB_KEY_SIZE);
@@ -359,10 +359,6 @@ uint8_t SensorMesh::handleLoginReq(const mesh::Identity& sender, const uint8_t*
    dirty_contacts_expiry = futureMillis(LAZY_CONTACTS_WRITE_DELAY);
  }

-  if (is_flood) {
-    client->out_path_len = -1;  // need to rediscover out_path
-  }
-
  uint32_t now = getRTCClock()->getCurrentTimeUnique();
  memcpy(reply_data, &now, 4);   // response packets always prefixed with timestamp
  reply_data[4] = RESP_SERVER_LOGIN_OK;
@@ -453,14 +449,7 @@ void SensorMesh::onAnonDataRecv(mesh::Packet* packet, const uint8_t* secret, con
    memcpy(&timestamp, data, 4);

    data[len] = 0;  // ensure null terminator
-    uint8_t reply_len;
-    if (data[4] == 0 || data[4] >= ' ') {   // is password, ie. a login request
-      reply_len = handleLoginReq(sender, secret, timestamp, &data[4], packet->isRouteFlood());
-    //} else if (data[4] == ANON_REQ_TYPE_*) {   // future type codes
-      // TODO
-    } else {
-      reply_len = 0;  // unknown request type
-    }
+    uint8_t reply_len = handleLoginReq(sender, secret, timestamp, &data[4]);

    if (reply_len == 0) return;   // invalid request

@@ -554,7 +543,7 @@ void SensorMesh::onPeerDataRecv(mesh::Packet* packet, uint8_t type, int sender_i
  } else if (type == PAYLOAD_TYPE_TXT_MSG && len > 5 && from->isAdmin()) {   // a CLI command
    uint32_t sender_timestamp;
    memcpy(&sender_timestamp, data, 4);  // timestamp (by sender's RTC clock - which could be wrong)
-    uint8_t flags = (data[4] >> 2);   // message attempt number, and other flags
+    uint flags = (data[4] >> 2);   // message attempt number, and other flags

    if (sender_timestamp > from->last_timestamp) {  // prevent replay attacks
      if (flags == TXT_TYPE_PLAIN) {
@@ -612,7 +601,7 @@ void SensorMesh::onPeerDataRecv(mesh::Packet* packet, uint8_t type, int sender_i
  }
 }

-bool SensorMesh::handleIncomingMsg(ClientInfo& from, uint32_t timestamp, uint8_t* data, uint8_t flags, size_t len) {
+bool SensorMesh::handleIncomingMsg(ClientInfo& from, uint32_t timestamp, uint8_t* data, uint flags, size_t len) {
  MESH_DEBUG_PRINT("handleIncomingMsg: unhandled msg from ");
  #ifdef MESH_DEBUG
  mesh::Utils::printHex(Serial, from.id.pub_key, PUB_KEY_SIZE);
@@ -621,39 +610,6 @@ bool SensorMesh::handleIncomingMsg(ClientInfo& from, uint32_t timestamp, uint8_t
  return false;
 }

-#define CTL_TYPE_NODE_DISCOVER_REQ   0x80
-#define CTL_TYPE_NODE_DISCOVER_RESP  0x90
-
-void SensorMesh::onControlDataRecv(mesh::Packet* packet) {
-  uint8_t type = packet->payload[0] & 0xF0;    // just test upper 4 bits
-  if (type == CTL_TYPE_NODE_DISCOVER_REQ && packet->payload_len >= 6) {
-    // TODO: apply rate limiting to these!
-    int i = 1;
-    uint8_t  filter = packet->payload[i++];
-    uint32_t tag;
-    memcpy(&tag, &packet->payload[i], 4); i += 4;
-    uint32_t since;
-    if (packet->payload_len >= i+4) {   // optional since field
-      memcpy(&since, &packet->payload[i], 4); i += 4;
-    } else {
-      since = 0;
-    }
-
-    if ((filter & (1 << ADV_TYPE_SENSOR)) != 0 && _prefs.discovery_mod_timestamp >= since) {
-      bool prefix_only = packet->payload[0] & 1;
-      uint8_t data[6 + PUB_KEY_SIZE];
-      data[0] = CTL_TYPE_NODE_DISCOVER_RESP | ADV_TYPE_SENSOR;   // low 4-bits for node type
-      data[1] = packet->_snr;   // let sender know the inbound SNR ( x 4)
-      memcpy(&data[2], &tag, 4);     // include tag from request, for client to match to
-      memcpy(&data[6], self_id.pub_key, PUB_KEY_SIZE);
-      auto resp = createControlData(data,  prefix_only ? 6 + 8 : 6 + PUB_KEY_SIZE);
-      if (resp) {
-        sendZeroHop(resp, getRetransmitDelay(resp)*4);  // apply random delay (widened x4), as multiple nodes can respond to this
-      }
-    }
-  }
-}
-
 bool SensorMesh::onPeerPathRecv(mesh::Packet* packet, int sender_idx, const uint8_t* secret, uint8_t* path, uint8_t path_len, uint8_t extra_type, uint8_t* extra, uint8_t extra_len) {
  int i = matching_peer_indexes[sender_idx];
  if (i < 0 || i >= acl.getNumClients()) {
@@ -708,7 +664,6 @@ SensorMesh::SensorMesh(mesh::MainBoard& board, mesh::Radio& radio, mesh::Millise
  _prefs.airtime_factor = 1.0;    // one half
  _prefs.rx_delay_base =   0.0f;  // turn off by default, was 10.0;
  _prefs.tx_delay_factor = 0.5f;   // was 0.25f
-  _prefs.direct_tx_delay_factor = 0.2f; // was zero
  StrHelper::strncpy(_prefs.node_name, ADVERT_NAME, sizeof(_prefs.node_name));
  _prefs.node_lat = ADVERT_LAT;
  _prefs.node_lon = ADVERT_LON;
@@ -744,8 +699,6 @@ void SensorMesh::begin(FILESYSTEM* fs) {
  updateAdvertTimer();
  updateFloodAdvertTimer();

-   board.setAdcMultiplier(_prefs.adc_multiplier);
-
 #if ENV_INCLUDE_GPS == 1
  applyGpsPrefs();
 #endif
@@ -816,19 +769,6 @@ void SensorMesh::setTxPower(uint8_t power_dbm) {
  radio_set_tx_power(power_dbm);
 }

-void SensorMesh::formatStatsReply(char *reply) {
-  StatsFormatHelper::formatCoreStats(reply, board, *_ms, _err_flags, _mgr);
-}
-
-void SensorMesh::formatRadioStatsReply(char *reply) {
-  StatsFormatHelper::formatRadioStats(reply, _radio, radio_driver, getTotalAirTime(), getReceiveAirTime());
-}
-
-void SensorMesh::formatPacketStatsReply(char *reply) {
-  StatsFormatHelper::formatPacketStats(reply, radio_driver, getNumSentFlood(), getNumSentDirect(), 
-                                       getNumRecvFlood(), getNumRecvDirect());
-}
-
 float SensorMesh::getTelemValue(uint8_t channel, uint8_t type) {
  auto buf = telemetry.getBuffer();
  uint8_t size = telemetry.getSize();
--- a/examples/simple_sensor/SensorMesh.h
+++ b/examples/simple_sensor/SensorMesh.h
@@ -20,7 +20,6 @@
 #include <helpers/AdvertDataHelpers.h>
 #include <helpers/TxtDataHelpers.h>
 #include <helpers/CommonCLI.h>
-#include <helpers/StatsFormatHelper.h>
 #include <helpers/ClientACL.h>
 #include <RTClib.h>
 #include <target.h>
@@ -33,11 +32,11 @@
 #define PERM_RECV_ALERTS_HI    (1 << 7)   // high priority alerts

 #ifndef FIRMWARE_BUILD_DATE
-  #define FIRMWARE_BUILD_DATE   "30 Nov 2025"
+  #define FIRMWARE_BUILD_DATE   "2 Oct 2025"
 #endif

 #ifndef FIRMWARE_VERSION
-  #define FIRMWARE_VERSION   "v1.11.0"
+  #define FIRMWARE_VERSION   "v1.9.1"
 #endif

 #define FIRMWARE_ROLE "sensor"
@@ -70,9 +69,6 @@ public:
  void formatNeighborsReply(char *reply) override {
    strcpy(reply, "not supported");
  }
-  void formatStatsReply(char *reply) override;
-  void formatRadioStatsReply(char *reply) override;
-  void formatPacketStatsReply(char *reply) override;
  mesh::LocalIdentity& getSelfId() override { return self_id; }
  void saveIdentity(const mesh::LocalIdentity& new_id) override;
  void clearStats() override { }
@@ -125,9 +121,8 @@ protected:
  void getPeerSharedSecret(uint8_t* dest_secret, int peer_idx) override;
  void onPeerDataRecv(mesh::Packet* packet, uint8_t type, int sender_idx, const uint8_t* secret, uint8_t* data, size_t len) override;
  bool onPeerPathRecv(mesh::Packet* packet, int sender_idx, const uint8_t* secret, uint8_t* path, uint8_t path_len, uint8_t extra_type, uint8_t* extra, uint8_t extra_len) override;
-  void onControlDataRecv(mesh::Packet* packet) override;
  void onAckRecv(mesh::Packet* packet, uint32_t ack_crc) override;
-  virtual bool handleIncomingMsg(ClientInfo& from, uint32_t timestamp, uint8_t* data, uint8_t flags, size_t len);
+  virtual bool handleIncomingMsg(ClientInfo& from, uint32_t timestamp, uint8_t* data, uint flags, size_t len);
  void sendAckTo(const ClientInfo& dest, uint32_t ack_hash);
 private:
  FILESYSTEM* _fs;
@@ -148,7 +143,7 @@ private:
  uint8_t pending_sf;
  uint8_t pending_cr;

-  uint8_t handleLoginReq(const mesh::Identity& sender, const uint8_t* secret, uint32_t sender_timestamp, const uint8_t* data, bool is_flood);
+  uint8_t handleLoginReq(const mesh::Identity& sender, const uint8_t* secret, uint32_t sender_timestamp, const uint8_t* data);
  uint8_t handleRequest(uint8_t perms, uint32_t sender_timestamp, uint8_t req_type, uint8_t* payload, size_t payload_len);
  mesh::Packet* createSelfAdvert();

@@ -156,7 +151,7 @@ private:

  #if ENV_INCLUDE_GPS == 1
  void applyGpsPrefs() {
-    sensors.setSettingValue("gps", _prefs.gps_enabled?"1":"0");
+    sensors.setSettingByKey("gps", _prefs.gps_enabled?"1":"0");
  }
 #endif
 };
--- a/examples/simple_sensor/main.cpp
+++ b/examples/simple_sensor/main.cpp
@@ -144,5 +144,4 @@ void loop() {
 #ifdef DISPLAY_CLASS
  ui_task.loop();
 #endif
-  rtc_clock.tick();
 }
--- a/library.json
+++ b/library.json
@@ -1,14 +1,14 @@
 {
    "name": "MeshCore",
-    "version" : "1.10.0",
+    "version" : "1.8.0",
    "dependencies": {
        "SPI": "*",
        "Wire": "*",
-        "jgromes/RadioLib": "^7.3.0",
+        "jgromes/RadioLib": "^7.1.2",
        "rweather/Crypto": "^0.4.0",
        "adafruit/RTClib": "^2.1.3",
        "melopero/Melopero RV3028": "^1.1.0",
-        "electroniccats/CayenneLPP": "1.6.1"
+        "electroniccats/CayenneLPP": "1.4.0"
    },
    "build": {
        "extraScript": "build_as_lib.py"
--- a/platformio.ini
+++ b/platformio.ini
@@ -67,7 +67,6 @@ lib_deps =
  file://arch/esp32/AsyncElegantOTA

 ; esp32c6 uses arduino framework 3.x
-; WARNING: experimental. pioarduino on esp32c6 needs work - it's not considered stable and has issues.
 [esp32c6_base]
 extends = esp32_base
 platform = https://github.com/pioarduino/platform-espressif32/releases/download/53.03.12/platform-espressif32.zip
@@ -129,7 +128,6 @@ build_flags =
  -D ENV_INCLUDE_MLX90614=1
  -D ENV_INCLUDE_VL53L0X=1
  -D ENV_INCLUDE_BME680=1
-  -D ENV_INCLUDE_BMP085=1
 lib_deps =
  adafruit/Adafruit INA3221 Library @ ^1.0.1
  adafruit/Adafruit INA219 @ ^1.2.3
@@ -145,4 +143,3 @@ lib_deps =
  adafruit/Adafruit_VL53L0X @ ^1.2.4
  stevemarple/MicroNMEA @ ^2.0.6
  adafruit/Adafruit BME680 Library @ ^2.0.4
-  adafruit/Adafruit BMP085 Library @ ^1.2.4
--- a/src/Identity.h
+++ b/src/Identity.h
@@ -23,9 +23,6 @@ public:
  bool isHashMatch(const uint8_t* hash) const {
    return memcmp(hash, pub_key, PATH_HASH_SIZE) == 0;
  }
-  bool isHashMatch(const uint8_t* hash, uint8_t len) const {
-    return memcmp(hash, pub_key, len) == 0;
-  }

  /**
   * \brief  Performs Ed25519 signature verification.
--- a/src/Mesh.cpp
+++ b/src/Mesh.cpp
@@ -52,15 +52,14 @@ DispatcherAction Mesh::onRecvPacket(Packet* pkt) {
      uint32_t auth_code;
      memcpy(&auth_code, &pkt->payload[i], 4); i += 4;
      uint8_t flags = pkt->payload[i++];
-      uint8_t path_sz = flags & 0x03;  // NEW v1.11+: lower 2 bits is path hash size

      uint8_t len = pkt->payload_len - i;
-      uint8_t offset = pkt->path_len << path_sz;
-      if (offset >= len) {   // TRACE has reached end of given path
+      if (pkt->path_len >= len) {   // TRACE has reached end of given path
        onTraceRecv(pkt, trace_tag, auth_code, flags, pkt->path, &pkt->payload[i], len);
-      } else if (self_id.isHashMatch(&pkt->payload[i + offset], 1 << path_sz) && allowPacketForward(pkt) && !_tables->hasSeen(pkt)) {
+      } else if (self_id.isHashMatch(&pkt->payload[i + pkt->path_len]) && allowPacketForward(pkt) && !_tables->hasSeen(pkt)) {
        // append SNR (Not hash!)
-        pkt->path[pkt->path_len++] = (int8_t) (pkt->getSNR()*4);
+        pkt->path[pkt->path_len] = (int8_t) (pkt->getSNR()*4);
+        pkt->path_len += PATH_HASH_SIZE;

        uint32_t d = getDirectRetransmitDelay(pkt);
        return ACTION_RETRANSMIT_DELAYED(5, d);  // schedule with priority 5 (for now), maybe make configurable?
@@ -69,14 +68,6 @@ DispatcherAction Mesh::onRecvPacket(Packet* pkt) {
    return ACTION_RELEASE;
  }

-  if (pkt->isRouteDirect() && pkt->getPayloadType() == PAYLOAD_TYPE_CONTROL && (pkt->payload[0] & 0x80) != 0) {
-    if (pkt->path_len == 0) {
-      onControlDataRecv(pkt);
-    }
-    // just zero-hop control packets allowed (for this subset of payloads)
-    return ACTION_RELEASE;
-  }
-
  if (pkt->isRouteDirect() && pkt->path_len >= PATH_HASH_SIZE) {
    if (self_id.isHashMatch(pkt->path) && allowPacketForward(pkt)) {
      if (pkt->getPayloadType() == PAYLOAD_TYPE_MULTIPART) {
@@ -99,8 +90,6 @@ DispatcherAction Mesh::onRecvPacket(Packet* pkt) {
    return ACTION_RELEASE;   // this node is NOT the next hop (OR this packet has already been forwarded), so discard.
  }

-  if (pkt->isRouteFlood() && filterRecvFloodPacket(pkt)) return ACTION_RELEASE;
-
  DispatcherAction action = ACTION_RELEASE;

  switch (pkt->getPayloadType()) {
@@ -212,9 +201,9 @@ DispatcherAction Mesh::onRecvPacket(Packet* pkt) {
      if (i + 2 >= pkt->payload_len) {
        MESH_DEBUG_PRINTLN("%s Mesh::onRecvPacket(): incomplete data packet", getLogDateTime());
      } else if (!_tables->hasSeen(pkt)) {
-        // scan channels DB, for all matching hashes of 'channel_hash' (max 4 matches supported ATM)
-        GroupChannel channels[4];
-        int num = searchChannelsByHash(&channel_hash, channels, 4);
+        // scan channels DB, for all matching hashes of 'channel_hash' (max 2 matches supported ATM)
+        GroupChannel channels[2];
+        int num = searchChannelsByHash(&channel_hash, channels, 2);
        // for each matching channel, try to decrypt data
        for (int j = 0; j < num; j++) {
          // decrypt, checking MAC is valid
@@ -598,22 +587,6 @@ Packet* Mesh::createTrace(uint32_t tag, uint32_t auth_code, uint8_t flags) {
  return packet;
 }

-Packet* Mesh::createControlData(const uint8_t* data, size_t len) {
-  if (len > sizeof(Packet::payload)) return NULL;  // invalid arg
-
-  Packet* packet = obtainNewPacket();
-  if (packet == NULL) {
-    MESH_DEBUG_PRINTLN("%s Mesh::createControlData(): error, packet pool empty", getLogDateTime());
-    return NULL;
-  }
-  packet->header = (PAYLOAD_TYPE_CONTROL << PH_TYPE_SHIFT);  // ROUTE_TYPE_* set later
-
-  memcpy(packet->payload, data, len);
-  packet->payload_len = len;
-
-  return packet;
-}
-
 void Mesh::sendFlood(Packet* packet, uint32_t delay_millis) {
  if (packet->getPayloadType() == PAYLOAD_TYPE_TRACE) {
    MESH_DEBUG_PRINTLN("%s Mesh::sendFlood(): TRACE type not suspported", getLogDateTime());
@@ -637,31 +610,6 @@ void Mesh::sendFlood(Packet* packet, uint32_t delay_millis) {
  sendPacket(packet, pri, delay_millis);
 }

-void Mesh::sendFlood(Packet* packet, uint16_t* transport_codes, uint32_t delay_millis) {
-  if (packet->getPayloadType() == PAYLOAD_TYPE_TRACE) {
-    MESH_DEBUG_PRINTLN("%s Mesh::sendFlood(): TRACE type not suspported", getLogDateTime());
-    return;
-  }
-
-  packet->header &= ~PH_ROUTE_MASK;
-  packet->header |= ROUTE_TYPE_TRANSPORT_FLOOD;
-  packet->transport_codes[0] = transport_codes[0];
-  packet->transport_codes[1] = transport_codes[1];
-  packet->path_len = 0;
-
-  _tables->hasSeen(packet); // mark this packet as already sent in case it is rebroadcast back to us
-
-  uint8_t pri;
-  if (packet->getPayloadType() == PAYLOAD_TYPE_PATH) {
-    pri = 2;
-  } else if (packet->getPayloadType() == PAYLOAD_TYPE_ADVERT) {
-    pri = 3;   // de-prioritie these
-  } else {
-    pri = 1;
-  }
-  sendPacket(packet, pri, delay_millis);
-}
-
 void Mesh::sendDirect(Packet* packet, const uint8_t* path, uint8_t path_len, uint32_t delay_millis) {
  packet->header &= ~PH_ROUTE_MASK;
  packet->header |= ROUTE_TYPE_DIRECT;
@@ -697,17 +645,4 @@ void Mesh::sendZeroHop(Packet* packet, uint32_t delay_millis) {
  sendPacket(packet, 0, delay_millis);
 }

-void Mesh::sendZeroHop(Packet* packet, uint16_t* transport_codes, uint32_t delay_millis) {
-  packet->header &= ~PH_ROUTE_MASK;
-  packet->header |= ROUTE_TYPE_TRANSPORT_DIRECT;
-  packet->transport_codes[0] = transport_codes[0];
-  packet->transport_codes[1] = transport_codes[1];
-
-  packet->path_len = 0;  // path_len of zero means Zero Hop
-
-  _tables->hasSeen(packet); // mark this packet as already sent in case it is rebroadcast back to us
-
-  sendPacket(packet, 0, delay_millis);
-}
-
 }
--- a/src/Mesh.h
+++ b/src/Mesh.h
@@ -43,12 +43,6 @@ protected:
   */
  DispatcherAction routeRecvPacket(Packet* packet);

-  /**
-   * \brief    Called _before_ the packet is dispatched to the on..Recv() methods.
-   * \returns  true, if given packet should be NOT be processed.
-   */
-  virtual bool filterRecvFloodPacket(Packet* packet) { return false; }
-
  /**
   * \brief  Check whether this packet should be forwarded (re-transmitted) or not.
   *     Is sub-classes responsibility to make sure given packet is only transmitted ONCE (by this node)
@@ -134,11 +128,6 @@ protected:
  */
  virtual void onPathRecv(Packet* packet, Identity& sender, uint8_t* path, uint8_t path_len, uint8_t extra_type, uint8_t* extra, uint8_t extra_len) { }

-  /**
-   * \brief  A control packet has been received.
-  */
-  virtual void onControlDataRecv(Packet* packet) { }
-
  /**
   * \brief  A packet with PAYLOAD_TYPE_RAW_CUSTOM has been received.
  */
@@ -191,19 +180,12 @@ public:
  Packet* createPathReturn(const Identity& dest, const uint8_t* secret, const uint8_t* path, uint8_t path_len, uint8_t extra_type, const uint8_t*extra, size_t extra_len);
  Packet* createRawData(const uint8_t* data, size_t len);
  Packet* createTrace(uint32_t tag, uint32_t auth_code, uint8_t flags = 0);
-  Packet* createControlData(const uint8_t* data, size_t len);

  /**
   * \brief  send a locally-generated Packet with flood routing
  */
  void sendFlood(Packet* packet, uint32_t delay_millis=0);

-  /**
-   * \brief  send a locally-generated Packet with flood routing
-   * \param transport_codes   array of 2 codes to attach to packet
-  */
-  void sendFlood(Packet* packet, uint16_t* transport_codes, uint32_t delay_millis=0);
-
  /**
   * \brief  send a locally-generated Packet with Direct routing
  */
@@ -214,12 +196,6 @@ public:
  */
  void sendZeroHop(Packet* packet, uint32_t delay_millis=0);

-  /**
-   * \brief  send a locally-generated Packet to just neigbor nodes (zero hops), with specific transort codes
-   * \param transport_codes   array of 2 codes to attach to packet
-  */
-  void sendZeroHop(Packet* packet, uint16_t* transport_codes, uint32_t delay_millis=0);
-
 };

 }
--- a/src/MeshCore.h
+++ b/src/MeshCore.h
@@ -42,8 +42,6 @@ namespace mesh {
 class MainBoard {
 public:
  virtual uint16_t getBattMilliVolts() = 0;
-  virtual bool setAdcMultiplier(float multiplier) { return false; };
-  virtual float getAdcMultiplier() const { return 0.0f; }
  virtual const char* getManufacturerName() const = 0;
  virtual void onBeforeTransmit() { }
  virtual void onAfterTransmit() { }
@@ -74,11 +72,6 @@ public:
  */
  virtual void setCurrentTime(uint32_t time) = 0;

-  /**
-   * override in classes that need to periodically update internal state
-   */
-  virtual void tick() { /* no op */}
-
  uint32_t getCurrentTimeUnique() {
    uint32_t t = getCurrentTime();
    if (t <= last_unique) {
--- a/src/Packet.h
+++ b/src/Packet.h
@@ -27,7 +27,6 @@ namespace mesh {
 #define PAYLOAD_TYPE_PATH        0x08    // returned path (prefixed with dest/src hashes, MAC) (enc data: path, extra)
 #define PAYLOAD_TYPE_TRACE       0x09    // trace a path, collecting SNI for each hop
 #define PAYLOAD_TYPE_MULTIPART   0x0A    // packet is one of a set of packets
-#define PAYLOAD_TYPE_CONTROL     0x0B    // a control/discovery packet
 //...
 #define PAYLOAD_TYPE_RAW_CUSTOM   0x0F    // custom packet as raw bytes, for applications with custom encryption, payloads, etc

--- a/src/helpers/ArduinoHelpers.h
+++ b/src/helpers/ArduinoHelpers.h
@@ -4,19 +4,11 @@
 #include <Arduino.h>

 class VolatileRTCClock : public mesh::RTCClock {
-  uint32_t base_time;
-  uint64_t accumulator;
-  unsigned long prev_millis;
+  long millis_offset;
 public:
-  VolatileRTCClock() { base_time = 1715770351; accumulator = 0; prev_millis = millis(); }   // 15 May 2024, 8:50pm
-  uint32_t getCurrentTime() override { return base_time + accumulator/1000; }
-  void setCurrentTime(uint32_t time) override { base_time = time; accumulator = 0; prev_millis = millis(); }
-
-  void tick() override {
-    unsigned long now = millis();
-    accumulator += (now - prev_millis);
-    prev_millis = now;
-  }
+  VolatileRTCClock() { millis_offset = 1715770351; } // 15 May 2024, 8:50pm
+  uint32_t getCurrentTime() override { return (millis()/1000 + millis_offset); }
+  void setCurrentTime(uint32_t time) override { millis_offset = time - millis()/1000; }
 };

 class ArduinoMillis : public mesh::MillisecondClock {
--- a/src/helpers/AutoDiscoverRTCClock.h
+++ b/src/helpers/AutoDiscoverRTCClock.h
@@ -14,8 +14,4 @@ public:
  void begin(TwoWire& wire);
  uint32_t getCurrentTime() override;
  void setCurrentTime(uint32_t time) override;
-
-  void tick() override {
-    _fallback->tick();   // is typically VolatileRTCClock, which now needs tick()
-  }
 };
--- a/src/helpers/BaseChatMesh.cpp
+++ b/src/helpers/BaseChatMesh.cpp
@@ -9,13 +9,6 @@
  #define TXT_ACK_DELAY     200
 #endif

-void BaseChatMesh::sendFloodScoped(const ContactInfo& recipient, mesh::Packet* pkt, uint32_t delay_millis) {
-  sendFlood(pkt, delay_millis);
-}
-void BaseChatMesh::sendFloodScoped(const mesh::GroupChannel& channel, mesh::Packet* pkt, uint32_t delay_millis) {
-  sendFlood(pkt, delay_millis);
-}
-
 mesh::Packet* BaseChatMesh::createSelfAdvert(const char* name) {
  uint8_t app_data[MAX_ADVERT_DATA_SIZE];
  uint8_t app_data_len;
@@ -41,7 +34,7 @@ mesh::Packet* BaseChatMesh::createSelfAdvert(const char* name, double lat, doubl
 void BaseChatMesh::sendAckTo(const ContactInfo& dest, uint32_t ack_hash) {
  if (dest.out_path_len < 0) {
    mesh::Packet* ack = createAck(ack_hash);
-    if (ack) sendFloodScoped(dest, ack, TXT_ACK_DELAY);
+    if (ack) sendFlood(ack, TXT_ACK_DELAY);
  } else {
    uint32_t d = TXT_ACK_DELAY;
    if (getExtraAckTransmitCount() > 0) {
@@ -75,16 +68,9 @@ void BaseChatMesh::onAdvertRecv(mesh::Packet* packet, const mesh::Identity& id,
  }

  // save a copy of raw advert packet (to support "Share..." function)
-  int plen;
-  {
-    uint8_t save = packet->header;
-    packet->header &= ~PH_ROUTE_MASK;
-    packet->header |= ROUTE_TYPE_FLOOD;   // make sure transport codes are NOT saved
-    plen = packet->writeTo(temp_buf);
-    packet->header = save;
-  }
+  int plen = packet->writeTo(temp_buf);
  putBlobByKey(id.pub_key, PUB_KEY_SIZE, temp_buf, plen);
-
+  
  bool is_new = false;
  if (from == NULL) {
    if (!isAutoAddEnabled()) {
@@ -166,7 +152,7 @@ void BaseChatMesh::onPeerDataRecv(mesh::Packet* packet, uint8_t type, int sender
  if (type == PAYLOAD_TYPE_TXT_MSG && len > 5) {
    uint32_t timestamp;
    memcpy(&timestamp, data, 4);  // timestamp (by sender's RTC clock - which could be wrong)
-    uint8_t flags = data[4] >> 2;   // message attempt number, and other flags
+    uint flags = data[4] >> 2;   // message attempt number, and other flags

    // len can be > original length, but 'text' will be padded with zeroes
    data[len] = 0; // need to make a C string again, with null terminator
@@ -182,7 +168,7 @@ void BaseChatMesh::onPeerDataRecv(mesh::Packet* packet, uint8_t type, int sender
        // let this sender know path TO here, so they can use sendDirect(), and ALSO encode the ACK
        mesh::Packet* path = createPathReturn(from.id, secret, packet->path, packet->path_len,
                                                PAYLOAD_TYPE_ACK, (uint8_t *) &ack_hash, 4);
-        if (path) sendFloodScoped(from, path, TXT_ACK_DELAY);
+        if (path) sendFlood(path, TXT_ACK_DELAY);
      } else {
        sendAckTo(from, ack_hash);
      }
@@ -193,7 +179,7 @@ void BaseChatMesh::onPeerDataRecv(mesh::Packet* packet, uint8_t type, int sender
      if (packet->isRouteFlood()) {
        // let this sender know path TO here, so they can use sendDirect() (NOTE: no ACK as extra)
        mesh::Packet* path = createPathReturn(from.id, secret, packet->path, packet->path_len, 0, NULL, 0);
-        if (path) sendFloodScoped(from, path);
+        if (path) sendFlood(path);
      }
    } else if (flags == TXT_TYPE_SIGNED_PLAIN) {
      if (timestamp > from.sync_since) {  // make sure 'sync_since' is up-to-date
@@ -209,7 +195,7 @@ void BaseChatMesh::onPeerDataRecv(mesh::Packet* packet, uint8_t type, int sender
        // let this sender know path TO here, so they can use sendDirect(), and ALSO encode the ACK
        mesh::Packet* path = createPathReturn(from.id, secret, packet->path, packet->path_len,
                                                PAYLOAD_TYPE_ACK, (uint8_t *) &ack_hash, 4);
-        if (path) sendFloodScoped(from, path, TXT_ACK_DELAY);
+        if (path) sendFlood(path, TXT_ACK_DELAY);
      } else {
        sendAckTo(from, ack_hash);
      }
@@ -225,14 +211,14 @@ void BaseChatMesh::onPeerDataRecv(mesh::Packet* packet, uint8_t type, int sender
        // let this sender know path TO here, so they can use sendDirect(), and ALSO encode the response
        mesh::Packet* path = createPathReturn(from.id, secret, packet->path, packet->path_len,
                                              PAYLOAD_TYPE_RESPONSE, temp_buf, reply_len);
-        if (path) sendFloodScoped(from, path, SERVER_RESPONSE_DELAY);
+        if (path) sendFlood(path, SERVER_RESPONSE_DELAY);
      } else {
        mesh::Packet* reply = createDatagram(PAYLOAD_TYPE_RESPONSE, from.id, secret, temp_buf, reply_len);
        if (reply) {
          if (from.out_path_len >= 0) {  // we have an out_path, so send DIRECT
            sendDirect(reply, from.out_path, from.out_path_len, SERVER_RESPONSE_DELAY);
          } else {
-            sendFloodScoped(from, reply, SERVER_RESPONSE_DELAY);
+            sendFlood(reply, SERVER_RESPONSE_DELAY);
          }
        }
      }
@@ -353,7 +339,7 @@ int  BaseChatMesh::sendMessage(const ContactInfo& recipient, uint32_t timestamp,

  int rc;
  if (recipient.out_path_len < 0) {
-    sendFloodScoped(recipient, pkt);
+    sendFlood(pkt);
    txt_send_timeout = futureMillis(est_timeout = calcFloodTimeoutMillisFor(t));
    rc = MSG_SEND_SENT_FLOOD;
  } else {
@@ -379,7 +365,7 @@ int  BaseChatMesh::sendCommandData(const ContactInfo& recipient, uint32_t timest
  uint32_t t = _radio->getEstAirtimeFor(pkt->getRawLength());
  int rc;
  if (recipient.out_path_len < 0) {
-    sendFloodScoped(recipient, pkt);
+    sendFlood(pkt);
    txt_send_timeout = futureMillis(est_timeout = calcFloodTimeoutMillisFor(t));
    rc = MSG_SEND_SENT_FLOOD;
  } else {
@@ -405,7 +391,7 @@ bool BaseChatMesh::sendGroupMessage(uint32_t timestamp, mesh::GroupChannel& chan

  auto pkt = createGroupDatagram(PAYLOAD_TYPE_GRP_TXT, channel, temp, 5 + prefix_len + text_len);
  if (pkt) {
-    sendFloodScoped(channel, pkt);
+    sendFlood(pkt);
    return true;
  }
  return false;
@@ -419,9 +405,7 @@ bool BaseChatMesh::shareContactZeroHop(const ContactInfo& contact) {
  if (packet == NULL) return false;  // no Packets available

  packet->readFrom(temp_buf, plen);  // restore Packet from 'blob'
-  uint16_t codes[2];
-  codes[0] = codes[1] = 0;   // { 0, 0 } means 'send this nowhere'
-  sendZeroHop(packet, codes);
+  sendZeroHop(packet);
  return true;  // success
 }

@@ -467,7 +451,7 @@ int BaseChatMesh::sendLogin(const ContactInfo& recipient, const char* password,
  if (pkt) {
    uint32_t t = _radio->getEstAirtimeFor(pkt->getRawLength());
    if (recipient.out_path_len < 0) {
-      sendFloodScoped(recipient, pkt);
+      sendFlood(pkt);
      est_timeout = calcFloodTimeoutMillisFor(t);
      return MSG_SEND_SENT_FLOOD;
    } else {
@@ -494,7 +478,7 @@ int  BaseChatMesh::sendRequest(const ContactInfo& recipient, const uint8_t* req_
  if (pkt) {
    uint32_t t = _radio->getEstAirtimeFor(pkt->getRawLength());
    if (recipient.out_path_len < 0) {
-      sendFloodScoped(recipient, pkt);
+      sendFlood(pkt);
      est_timeout = calcFloodTimeoutMillisFor(t);
      return MSG_SEND_SENT_FLOOD;
    } else {
@@ -521,7 +505,7 @@ int  BaseChatMesh::sendRequest(const ContactInfo& recipient, uint8_t req_type, u
  if (pkt) {
    uint32_t t = _radio->getEstAirtimeFor(pkt->getRawLength());
    if (recipient.out_path_len < 0) {
-      sendFloodScoped(recipient, pkt);
+      sendFlood(pkt);
      est_timeout = calcFloodTimeoutMillisFor(t);
      return MSG_SEND_SENT_FLOOD;
    } else {
--- a/src/helpers/BaseChatMesh.h
+++ b/src/helpers/BaseChatMesh.h
@@ -107,9 +107,6 @@ protected:
  virtual void onContactResponse(const ContactInfo& contact, const uint8_t* data, uint8_t len) = 0;
  virtual void handleReturnPathRetry(const ContactInfo& contact, const uint8_t* path, uint8_t path_len);

-  virtual void sendFloodScoped(const ContactInfo& recipient, mesh::Packet* pkt, uint32_t delay_millis=0);
-  virtual void sendFloodScoped(const mesh::GroupChannel& channel, mesh::Packet* pkt, uint32_t delay_millis=0);
-
  // storage concepts, for sub-classes to override/implement
  virtual int  getBlobByKey(const uint8_t key[], int key_len, uint8_t dest_buf[]) { return 0; }  // not implemented
  virtual bool putBlobByKey(const uint8_t key[], int key_len, const uint8_t src_buf[], int len) { return false; }
--- a/src/helpers/CommonCLI.cpp
+++ b/src/helpers/CommonCLI.cpp
@@ -69,9 +69,7 @@ void CommonCLI::loadPrefsInt(FILESYSTEM* fs, const char* filename) {
    file.read((uint8_t *)&_prefs->gps_enabled, sizeof(_prefs->gps_enabled));                       // 156
    file.read((uint8_t *)&_prefs->gps_interval, sizeof(_prefs->gps_interval));                     // 157
    file.read((uint8_t *)&_prefs->advert_loc_policy, sizeof (_prefs->advert_loc_policy));          // 161
-    file.read((uint8_t *)&_prefs->discovery_mod_timestamp, sizeof(_prefs->discovery_mod_timestamp)); // 162
-    file.read((uint8_t *)&_prefs->adc_multiplier, sizeof(_prefs->adc_multiplier)); // 166
-    // 170
+    // 162

    // sanitise bad pref values
    _prefs->rx_delay_base = constrain(_prefs->rx_delay_base, 0, 20.0f);
@@ -79,12 +77,11 @@ void CommonCLI::loadPrefsInt(FILESYSTEM* fs, const char* filename) {
    _prefs->direct_tx_delay_factor = constrain(_prefs->direct_tx_delay_factor, 0, 2.0f);
    _prefs->airtime_factor = constrain(_prefs->airtime_factor, 0, 9.0f);
    _prefs->freq = constrain(_prefs->freq, 400.0f, 2500.0f);
-    _prefs->bw = constrain(_prefs->bw, 7.8f, 500.0f);
-    _prefs->sf = constrain(_prefs->sf, 5, 12);
+    _prefs->bw = constrain(_prefs->bw, 62.5f, 500.0f);
+    _prefs->sf = constrain(_prefs->sf, 7, 12);
    _prefs->cr = constrain(_prefs->cr, 5, 8);
    _prefs->tx_power_dbm = constrain(_prefs->tx_power_dbm, 1, 30);
    _prefs->multi_acks = constrain(_prefs->multi_acks, 0, 1);
-    _prefs->adc_multiplier = constrain(_prefs->adc_multiplier, 0.0f, 10.0f);

    // sanitise bad bridge pref values
    _prefs->bridge_enabled = constrain(_prefs->bridge_enabled, 0, 1);
@@ -149,9 +146,7 @@ void CommonCLI::savePrefs(FILESYSTEM* fs) {
    file.write((uint8_t *)&_prefs->gps_enabled, sizeof(_prefs->gps_enabled));                       // 156
    file.write((uint8_t *)&_prefs->gps_interval, sizeof(_prefs->gps_interval));                     // 157
    file.write((uint8_t *)&_prefs->advert_loc_policy, sizeof(_prefs->advert_loc_policy));           // 161
-    file.write((uint8_t *)&_prefs->discovery_mod_timestamp, sizeof(_prefs->discovery_mod_timestamp)); // 162
-    file.write((uint8_t *)&_prefs->adc_multiplier, sizeof(_prefs->adc_multiplier));                 // 166
-    // 170
+    // 162

    file.close();
  }
@@ -231,12 +226,12 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
      strcpy(tmp, &command[10]);
      const char *parts[5];
      int num = mesh::Utils::parseTextParts(tmp, parts, 5);
-      float freq  = num > 0 ? strtof(parts[0], nullptr) : 0.0f;
-      float bw    = num > 1 ? strtof(parts[1], nullptr) : 0.0f;
+      float freq  = num > 0 ? atof(parts[0]) : 0.0f;
+      float bw    = num > 1 ? atof(parts[1]) : 0.0f;
      uint8_t sf  = num > 2 ? atoi(parts[2]) : 0;
      uint8_t cr  = num > 3 ? atoi(parts[3]) : 0;
      int temp_timeout_mins  = num > 4 ? atoi(parts[4]) : 0;
-      if (freq >= 300.0f && freq <= 2500.0f && sf >= 5 && sf <= 12 && cr >= 5 && cr <= 8 && bw >= 7.0f && bw <= 500.0f && temp_timeout_mins > 0) {
+      if (freq >= 300.0f && freq <= 2500.0f && sf >= 7 && sf <= 12 && cr >= 5 && cr <= 8 && bw >= 7.0f && bw <= 500.0f && temp_timeout_mins > 0) {
        _callbacks->applyTempRadioParams(freq, bw, sf, cr, temp_timeout_mins);
        sprintf(reply, "OK - temp params for %d mins", temp_timeout_mins);
      } else {
@@ -250,6 +245,29 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
    } else if (memcmp(command, "clear stats", 11) == 0) {
      _callbacks->clearStats();
      strcpy(reply, "(OK - stats reset)");
+    } else if (memcmp(command, "regeneratekeys ", 15) == 0) {
+      // Parse first hex digit
+      int value = 0;
+      if (command[15] >= '0' && command[15] <= '9')
+          value = (command[15] - '0') << 4;
+      else if (command[15] >= 'a' && command[15] <= 'f')
+          value = (command[15] - 'a' + 10) << 4;
+      else if (command[15] >= 'A' && command[15] <= 'F')
+          value = (command[15] - 'A' + 10) << 4;
+      // Parse second hex digit
+      if (command[16] >= '0' && command[16] <= '9')
+          value |= (command[16] - '0');
+      else if (command[16] >= 'a' && command[16] <= 'f')
+          value |= (command[16] - 'a' + 10);
+      else if (command[16] >= 'A' && command[16] <= 'F')
+          value |= (command[16] - 'A' + 10);
+      // regenerate key pair
+      MESH_DEBUG_PRINTLN("Generating new keypair");
+      if ((value > 0) && (value < 0xff)){
+        _callbacks->regenerateKeys(value);
+        _board->reboot();  // doesn't return
+      }
+      sprintf(reply, "> ERROR");
    /*
     * GET commands
     */
@@ -287,7 +305,7 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
      } else if (memcmp(config, "radio", 5) == 0) {
        char freq[16], bw[16];
        strcpy(freq, StrHelper::ftoa(_prefs->freq));
-        strcpy(bw, StrHelper::ftoa3(_prefs->bw));
+        strcpy(bw, StrHelper::ftoa(_prefs->bw));
        sprintf(reply, "> %s,%s,%d,%d", freq, bw, (uint32_t)_prefs->sf, (uint32_t)_prefs->cr);
      } else if (memcmp(config, "rxdelay", 7) == 0) {
        sprintf(reply, "> %s", StrHelper::ftoa(_prefs->rx_delay_base));
@@ -334,13 +352,6 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
      } else if (memcmp(config, "bridge.secret", 13) == 0) {
        sprintf(reply, "> %s", _prefs->bridge_secret);
 #endif
-      } else if (memcmp(config, "adc.multiplier", 14) == 0) {
-        float adc_mult = _board->getAdcMultiplier();
-        if (adc_mult == 0.0f) {
-          strcpy(reply, "Error: unsupported by this board");
-        } else {
-          sprintf(reply, "> %.3f", adc_mult);
-        }
      } else {
        sprintf(reply, "??: %s", config);
      }
@@ -417,11 +428,11 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
        strcpy(tmp, &config[6]);
        const char *parts[4];
        int num = mesh::Utils::parseTextParts(tmp, parts, 4);
-        float freq  = num > 0 ? strtof(parts[0], nullptr) : 0.0f;
-        float bw    = num > 1 ? strtof(parts[1], nullptr) : 0.0f;
+        float freq  = num > 0 ? atof(parts[0]) : 0.0f;
+        float bw    = num > 1 ? atof(parts[1]) : 0.0f;
        uint8_t sf  = num > 2 ? atoi(parts[2]) : 0;
        uint8_t cr  = num > 3 ? atoi(parts[3]) : 0;
-        if (freq >= 300.0f && freq <= 2500.0f && sf >= 5 && sf <= 12 && cr >= 5 && cr <= 8 && bw >= 7.0f && bw <= 500.0f) {
+        if (freq >= 300.0f && freq <= 2500.0f && sf >= 7 && sf <= 12 && cr >= 5 && cr <= 8 && bw >= 7.0f && bw <= 500.0f) {
          _prefs->sf = sf;
          _prefs->cr = cr;
          _prefs->freq = freq;
@@ -533,19 +544,6 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
        savePrefs();
        strcpy(reply, "OK");
 #endif
-      } else if (memcmp(config, "adc.multiplier ", 15) == 0) {
-        _prefs->adc_multiplier = atof(&config[15]);
-        if (_board->setAdcMultiplier(_prefs->adc_multiplier)) {
-          savePrefs();
-          if (_prefs->adc_multiplier == 0.0f) {
-            strcpy(reply, "OK - using default board multiplier");
-          } else {
-            sprintf(reply, "OK - multiplier set to %.3f", _prefs->adc_multiplier);
-          }
-        } else {
-          _prefs->adc_multiplier = 0.0f;
-          strcpy(reply, "Error: unsupported by this board");
-        };
      } else {
        sprintf(reply, "unknown config: %s", config);
      }
@@ -570,7 +568,7 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
      int num = mesh::Utils::parseTextParts(tmp, parts, 2, ' ');
      const char *key = (num > 0) ? parts[0] : "";
      const char *value = (num > 1) ? parts[1] : "null";
-      if (_sensors->setSettingValue(key, value)) {
+      if (_sensors->setSettingByKey(key, value)) {
        strcpy(reply, "ok");
      } else {
        strcpy(reply, "can't find custom var");
@@ -602,7 +600,7 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
      }
 #if ENV_INCLUDE_GPS == 1
    } else if (memcmp(command, "gps on", 6) == 0) {
-      if (_sensors->setSettingValue("gps", "1")) {
+      if (_sensors->setSettingByKey("gps", "1")) {
        _prefs->gps_enabled = 1;
        savePrefs();
        strcpy(reply, "ok");
@@ -610,7 +608,7 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
        strcpy(reply, "gps toggle not found");
      }
    } else if (memcmp(command, "gps off", 7) == 0) {
-      if (_sensors->setSettingValue("gps", "0")) {
+      if (_sensors->setSettingByKey("gps", "0")) {
        _prefs->gps_enabled = 0;
        savePrefs();
        strcpy(reply, "ok");
@@ -688,12 +686,6 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
    } else if (sender_timestamp == 0 && memcmp(command, "log", 3) == 0) {
      _callbacks->dumpLogFile();
      strcpy(reply, "   EOF");
-    } else if (sender_timestamp == 0 && memcmp(command, "stats-packets", 13) == 0 && (command[13] == 0 || command[13] == ' ')) {
-      _callbacks->formatPacketStatsReply(reply);
-    } else if (sender_timestamp == 0 && memcmp(command, "stats-radio", 11) == 0 && (command[11] == 0 || command[11] == ' ')) {
-      _callbacks->formatRadioStatsReply(reply);
-    } else if (sender_timestamp == 0 && memcmp(command, "stats-core", 10) == 0 && (command[10] == 0 || command[10] == ' ')) {
-      _callbacks->formatStatsReply(reply);
    } else {
      strcpy(reply, "Unknown command");
    }
--- a/src/helpers/CommonCLI.h
+++ b/src/helpers/CommonCLI.h
@@ -46,8 +46,6 @@ struct NodePrefs { // persisted to file
  uint8_t gps_enabled;
  uint32_t gps_interval; // in seconds
  uint8_t advert_loc_policy;
-  uint32_t discovery_mod_timestamp;
-  float adc_multiplier;
 };

 class CommonCLICallbacks {
@@ -68,12 +66,10 @@ public:
  virtual void removeNeighbor(const uint8_t* pubkey, int key_len) {
    // no op by default
  };
-  virtual void formatStatsReply(char *reply) = 0;
-  virtual void formatRadioStatsReply(char *reply) = 0;
-  virtual void formatPacketStatsReply(char *reply) = 0;
  virtual mesh::LocalIdentity& getSelfId() = 0;
  virtual void saveIdentity(const mesh::LocalIdentity& new_id) = 0;
  virtual void clearStats() = 0;
+  virtual void regenerateKeys(uint8_t byte) = 0; 
  virtual void applyTempRadioParams(float freq, float bw, uint8_t sf, uint8_t cr, int timeout_mins) = 0;

  virtual void setBridgeState(bool enable) {
--- a/src/helpers/RegionMap.cpp
+++ b/src/helpers/RegionMap.cpp
@@ -1,237 +0,0 @@
-#include "RegionMap.h"
-#include <helpers/TxtDataHelpers.h>
-#include <SHA256.h>
-
-RegionMap::RegionMap(TransportKeyStore& store) : _store(&store) {
-  next_id = 1; num_regions = 0; home_id = 0;
-  wildcard.id = wildcard.parent = 0;
-  wildcard.flags = 0;  // default behaviour, allow flood and direct
-  strcpy(wildcard.name, "*");
-}
-
-bool RegionMap::is_name_char(char c) {
-  return (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') || c == '-' || c == '.' || c == '_' || c == '#';
-}
-
-static File openWrite(FILESYSTEM* _fs, const char* filename) {
-  #if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)
-    _fs->remove(filename);
-    return _fs->open(filename, FILE_O_WRITE);
-  #elif defined(RP2040_PLATFORM)
-    return _fs->open(filename, "w");
-  #else
-    return _fs->open(filename, "w", true);
-  #endif
-}
-
-bool RegionMap::load(FILESYSTEM* _fs) {
-  if (_fs->exists("/regions2")) {
-  #if defined(RP2040_PLATFORM)
-    File file = _fs->open("/regions2", "r");
-  #else
-    File file = _fs->open("/regions2");
-  #endif
-
-    if (file) {
-      uint8_t pad[128];
-
-      num_regions = 0; next_id = 1; home_id = 0;
-
-      bool success = file.read(pad, 5) == 5;  // reserved header
-      success = success && file.read((uint8_t *) &home_id, sizeof(home_id)) == sizeof(home_id);
-      success = success && file.read((uint8_t *) &wildcard.flags, sizeof(wildcard.flags)) == sizeof(wildcard.flags);
-      success = success && file.read((uint8_t *) &next_id, sizeof(next_id)) == sizeof(next_id);
-
-      if (success) {
-        while (num_regions < MAX_REGION_ENTRIES) {
-          auto r = &regions[num_regions];
-
-          success = file.read((uint8_t *) &r->id, sizeof(r->id)) == sizeof(r->id);
-          success = success && file.read((uint8_t *) &r->parent, sizeof(r->parent)) == sizeof(r->parent);
-          success = success && file.read((uint8_t *) r->name, sizeof(r->name)) == sizeof(r->name);
-          success = success && file.read((uint8_t *) &r->flags, sizeof(r->flags)) == sizeof(r->flags);
-          success = success && file.read(pad, sizeof(pad)) == sizeof(pad);
-
-          if (!success) break; // EOF
-
-          if (r->id >= next_id) {    // make sure next_id is valid
-            next_id = r->id + 1;
-          }
-          num_regions++;
-        }
-      }
-      file.close();
-      return true;
-    }
-  }
-  return false;  // failed
-}
-
-bool RegionMap::save(FILESYSTEM* _fs) {
-  File file = openWrite(_fs, "/regions2");
-  if (file) {
-    uint8_t pad[128];
-    memset(pad, 0, sizeof(pad));
-
-    bool success = file.write(pad, 5) == 5;  // reserved header
-    success = success && file.write((uint8_t *) &home_id, sizeof(home_id)) == sizeof(home_id);
-    success = success && file.write((uint8_t *) &wildcard.flags, sizeof(wildcard.flags)) == sizeof(wildcard.flags);
-    success = success && file.write((uint8_t *) &next_id, sizeof(next_id)) == sizeof(next_id);
-
-    if (success) {
-      for (int i = 0; i < num_regions; i++) {
-        auto r = &regions[i];
-
-        success = file.write((uint8_t *) &r->id, sizeof(r->id)) == sizeof(r->id);
-        success = success && file.write((uint8_t *) &r->parent, sizeof(r->parent)) == sizeof(r->parent);
-        success = success && file.write((uint8_t *) r->name, sizeof(r->name)) == sizeof(r->name);
-        success = success && file.write((uint8_t *) &r->flags, sizeof(r->flags)) == sizeof(r->flags);
-        success = success && file.write(pad, sizeof(pad)) == sizeof(pad);
-        if (!success) break; // write failed
-      }
-    }
-    file.close();
-    return true;
-  }
-  return false;  // failed
-}
-
-RegionEntry* RegionMap::putRegion(const char* name, uint16_t parent_id, uint16_t id) {
-  const char* sp = name;  // check for illegal name chars
-  while (*sp) {
-    if (!is_name_char(*sp)) return NULL;   // error
-    sp++;
-  }
-
-  auto region = findByName(name);
-  if (region) {
-    if (region->id == parent_id) return NULL;   // ERROR: invalid parent!
-
-    region->parent = parent_id;   // re-parent / move this region in the hierarchy
-  } else {
-    if (id == 0 && num_regions >= MAX_REGION_ENTRIES) return NULL;  // full!
-
-    region = &regions[num_regions++];   // alloc new RegionEntry
-    region->flags = REGION_DENY_FLOOD;     // DENY by default
-    region->id = id == 0 ? next_id++ : id;
-    StrHelper::strncpy(region->name, name, sizeof(region->name));
-    region->parent = parent_id;
-  }
-  return region;
-}
-
-RegionEntry* RegionMap::findMatch(mesh::Packet* packet, uint8_t mask) {
-  for (int i = 0; i < num_regions; i++) {
-    auto region = &regions[i];
-    if ((region->flags & mask) == 0) {   // does region allow this? (per 'mask' param)
-      TransportKey keys[4];
-      int num;
-      if (region->name[0] == '#') {   // auto hashtag region
-        _store->getAutoKeyFor(region->id, region->name, keys[0]);
-        num = 1;
-      } else {
-        num = _store->loadKeysFor(region->id, keys, 4);
-      }
-      for (int j = 0; j < num; j++) {
-        uint16_t code = keys[j].calcTransportCode(packet);
-        if (packet->transport_codes[0] == code) {   // a match!!
-          return region;
-        }
-      }
-    }
-  }
-  return NULL;  // no matches
-}
-
-RegionEntry* RegionMap::findByName(const char* name) {
-  if (strcmp(name, "*") == 0) return &wildcard;
-
-  for (int i = 0; i < num_regions; i++) {
-    auto region = &regions[i];
-    if (strcmp(name, region->name) == 0) return region;
-  }
-  return NULL;  // not found
-}
-
-RegionEntry* RegionMap::findByNamePrefix(const char* prefix) {
-  if (strcmp(prefix, "*") == 0) return &wildcard;
-
-  RegionEntry* partial = NULL;
-  for (int i = 0; i < num_regions; i++) {
-    auto region = &regions[i];
-    if (strcmp(prefix, region->name) == 0) return region;  // is a complete match, preference this one
-    if (memcmp(prefix, region->name, strlen(prefix)) == 0) {
-      partial = region;
-    }
-  }
-  return partial;
-}
-
-RegionEntry* RegionMap::findById(uint16_t id) {
-  if (id == 0) return &wildcard;   // special root Region
-
-  for (int i = 0; i < num_regions; i++) {
-    auto region = &regions[i];
-    if (region->id == id) return region;
-  }
-  return NULL;  // not found
-}
-
-RegionEntry* RegionMap::getHomeRegion() {
-  return findById(home_id);
-}
-
-void RegionMap::setHomeRegion(const RegionEntry* home) {
-  home_id = home ? home->id : 0;
-}
-
-bool RegionMap::removeRegion(const RegionEntry& region) {
-  if (region.id == 0) return false;  // failed (cannot remove the wildcard Region)
-
-  int i;     // first check region has no child regions
-  for (i = 0; i < num_regions; i++) {
-    if (regions[i].parent == region.id) return false;   // failed (must remove child Regions first)
-  }
-
-  i = 0;
-  while (i < num_regions) {
-    if (region.id == regions[i].id) break;
-    i++;
-  }
-  if (i >= num_regions) return false;  // failed (not found)
-
-  num_regions--;    // remove from regions array
-  while (i < num_regions) {
-    regions[i] = regions[i + 1];
-    i++;
-  }
-  return true;  // success
-}
-
-bool RegionMap::clear() {
-  num_regions = 0;
-  return true;  // success
-}
-
-void RegionMap::printChildRegions(int indent, const RegionEntry* parent, Stream& out) const {
-  for (int i = 0; i < indent; i++) {
-    out.print(' ');
-  }
-
-  if (parent->flags & REGION_DENY_FLOOD) {
-    out.printf("%s%s\n", parent->name, parent->id == home_id ? "^" : "");
-  } else {
-    out.printf("%s%s F\n", parent->name, parent->id == home_id ? "^" : "");
-  }
-
-  for (int i = 0; i < num_regions; i++) {
-    auto r = &regions[i];
-    if (r->parent == parent->id) {
-      printChildRegions(indent + 1, r, out);
-    }
-  }
-}
-
-void RegionMap::exportTo(Stream& out) const {
-  printChildRegions(0, &wildcard, out);   // recursive
-}
--- a/src/helpers/RegionMap.h
+++ b/src/helpers/RegionMap.h
@@ -1,52 +0,0 @@
-#pragma once
-
-#include <Arduino.h>   // needed for PlatformIO
-#include <Packet.h>
-#include "TransportKeyStore.h"
-
-#ifndef MAX_REGION_ENTRIES
-  #define MAX_REGION_ENTRIES  32
-#endif
-
-#define REGION_DENY_FLOOD   0x01
-#define REGION_DENY_DIRECT  0x02   // reserved for future
-
-struct RegionEntry {
-  uint16_t id;
-  uint16_t parent;
-  uint8_t flags;
-  char name[31];
-};
-
-class RegionMap {
-  TransportKeyStore* _store;
-  uint16_t next_id, home_id;
-  uint16_t num_regions;
-  RegionEntry regions[MAX_REGION_ENTRIES];
-  RegionEntry wildcard;
-
-  void printChildRegions(int indent, const RegionEntry* parent, Stream& out) const;
-
-public:
-  RegionMap(TransportKeyStore& store);
-
-  static bool is_name_char(char c);
-
-  bool load(FILESYSTEM* _fs);
-  bool save(FILESYSTEM* _fs);
-
-  RegionEntry* putRegion(const char* name, uint16_t parent_id, uint16_t id = 0);
-  RegionEntry* findMatch(mesh::Packet* packet, uint8_t mask);
-  RegionEntry& getWildcard() { return wildcard; }
-  RegionEntry* findByName(const char* name);
-  RegionEntry* findByNamePrefix(const char* prefix);
-  RegionEntry* findById(uint16_t id);
-  RegionEntry* getHomeRegion();   // NOTE: can be NULL
-  void setHomeRegion(const RegionEntry* home);
-  bool removeRegion(const RegionEntry& region);
-  bool clear();
-  void resetFrom(const RegionMap& src) { num_regions = 0; next_id = src.next_id; }
-  int getCount() const { return num_regions; }
-
-  void exportTo(Stream& out) const;
-};
--- a/src/helpers/SensorManager.h
+++ b/src/helpers/SensorManager.h
@@ -34,4 +34,14 @@ public:
    }
    return NULL;
  }
+
+  bool setSettingByKey(const char* key, const char* value) {
+    int num = getNumSettings();
+    for (int i = 0; i < num; i++) {
+      if (strcmp(getSettingName(i), key) == 0) {
+        return setSettingValue(key, value);
+      }
+    }
+    return false;
+  }
 };
--- a/src/helpers/StatsFormatHelper.h
+++ b/src/helpers/StatsFormatHelper.h
@@ -1,54 +0,0 @@
-#pragma once
-
-#include "Mesh.h"
-
-class StatsFormatHelper {
-public:
-  static void formatCoreStats(char* reply, 
-                             mesh::MainBoard& board, 
-                             mesh::MillisecondClock& ms, 
-                             uint16_t err_flags,
-                             mesh::PacketManager* mgr) {
-    sprintf(reply, 
-      "{\"battery_mv\":%u,\"uptime_secs\":%u,\"errors\":%u,\"queue_len\":%u}",
-      board.getBattMilliVolts(),
-      ms.getMillis() / 1000,
-      err_flags,
-      mgr->getOutboundCount(0xFFFFFFFF)
-    );
-  }
-
-  template<typename RadioDriverType>
-  static void formatRadioStats(char* reply,
-                              mesh::Radio* radio,
-                              RadioDriverType& driver,
-                              uint32_t total_air_time_ms,
-                              uint32_t total_rx_air_time_ms) {
-    sprintf(reply, 
-      "{\"noise_floor\":%d,\"last_rssi\":%d,\"last_snr\":%.2f,\"tx_air_secs\":%u,\"rx_air_secs\":%u}",
-      (int16_t)radio->getNoiseFloor(),
-      (int16_t)driver.getLastRSSI(),
-      driver.getLastSNR(),
-      total_air_time_ms / 1000,
-      total_rx_air_time_ms / 1000
-    );
-  }
-
-  template<typename RadioDriverType>
-  static void formatPacketStats(char* reply,
-                               RadioDriverType& driver,
-                               uint32_t n_sent_flood,
-                               uint32_t n_sent_direct,
-                               uint32_t n_recv_flood,
-                               uint32_t n_recv_direct) {
-    sprintf(reply, 
-      "{\"recv\":%u,\"sent\":%u,\"flood_tx\":%u,\"direct_tx\":%u,\"flood_rx\":%u,\"direct_rx\":%u}",
-      driver.getPacketsRecv(),
-      driver.getPacketsSent(),
-      n_sent_flood,
-      n_sent_direct,
-      n_recv_flood,
-      n_recv_direct
-    );
-  }
-};
--- a/src/helpers/TransportKeyStore.cpp
+++ b/src/helpers/TransportKeyStore.cpp
@@ -1,92 +0,0 @@
-#include "TransportKeyStore.h"
-#include <SHA256.h>
-
-uint16_t TransportKey::calcTransportCode(const mesh::Packet* packet) const {
-  uint16_t code;
-  SHA256 sha;
-  sha.resetHMAC(key, sizeof(key));
-  uint8_t type = packet->getPayloadType();
-  sha.update(&type, 1);
-  sha.update(packet->payload, packet->payload_len);
-  sha.finalizeHMAC(key, sizeof(key), &code, 2);
-  if (code == 0) {     // reserve codes 0000 and FFFF
-    code++;
-  } else if (code == 0xFFFF) {
-    code--;
-  }
-  return code;
-}
-
-bool TransportKey::isNull() const {
-  for (int i = 0; i < sizeof(key); i++) {
-    if (key[i]) return false;
-  }
-  return true;  // key is all zeroes
-}
-
-void TransportKeyStore::putCache(uint16_t id, const TransportKey& key) {
-  if (num_cache < MAX_TKS_ENTRIES) {
-    cache_ids[num_cache] = id;
-    cache_keys[num_cache] = key;
-    num_cache++;
-  } else {
-    // TODO: evict oldest cache entry
-  }
-}
-
-void TransportKeyStore::getAutoKeyFor(uint16_t id, const char* name, TransportKey& dest) {
-  for (int i = 0; i < num_cache; i++) {  // first, check cache
-    if (cache_ids[i] == id) {   // cache hit!
-      dest = cache_keys[i];
-      return;
-    }
-  }
-  // calc key for publicly-known hashtag region name
-  SHA256 sha;
-  sha.update(name, strlen(name));
-  sha.finalize(&dest.key, sizeof(dest.key));
-
-  putCache(id, dest);
-}
-
-int TransportKeyStore::loadKeysFor(uint16_t id, TransportKey keys[], int max_num) {
-  int n = 0;
-  for (int i = 0; i < num_cache && n < max_num; i++) {  // first, check cache
-    if (cache_ids[i] == id) {
-      keys[n++] = cache_keys[i];
-    }
-  }
-  if (n > 0) return n;   // cache hit!
-
-  // TODO:  retrieve from difficult-to-copy keystore
-
-  // store in cache (if room)
-  for (int i = 0; i < n; i++) {
-    putCache(id, keys[i]);
-  }
-  return n;
-}
-
-bool TransportKeyStore::saveKeysFor(uint16_t id, const TransportKey keys[], int num) {
-  invalidateCache();
-
-  // TODO: update hardware keystore
-
-  return false;  // failed
-}
-
-bool TransportKeyStore::removeKeys(uint16_t id) {
-  invalidateCache();
-
-  // TODO: remove from hardware keystore
-
-  return false;  // failed
-}
-
-bool TransportKeyStore::clear() {
-  invalidateCache();
-
-  // TODO: clear hardware keystore
-
-  return false;  // failed
-}
--- a/src/helpers/TransportKeyStore.h
+++ b/src/helpers/TransportKeyStore.h
@@ -1,31 +0,0 @@
-#pragma once
-
-#include <Arduino.h>   // needed for PlatformIO
-#include <Packet.h>
-#include <helpers/IdentityStore.h>
-
-struct TransportKey {
-  uint8_t key[16];
-
-  uint16_t calcTransportCode(const mesh::Packet* packet) const;
-  bool isNull() const;
-};
-
-#define MAX_TKS_ENTRIES   16
-
-class TransportKeyStore {
-  uint16_t     cache_ids[MAX_TKS_ENTRIES];
-  TransportKey cache_keys[MAX_TKS_ENTRIES];
-  int num_cache;
-
-  void putCache(uint16_t id, const TransportKey& key);
-  void invalidateCache() { num_cache = 0; }
-
-public:
-  TransportKeyStore() { num_cache = 0; }
-  void getAutoKeyFor(uint16_t id, const char* name, TransportKey& dest);
-  int loadKeysFor(uint16_t id, TransportKey keys[], int max_num);
-  bool saveKeysFor(uint16_t id, const TransportKey keys[], int num);
-  bool removeKeys(uint16_t id);
-  bool clear();
-};
--- a/src/helpers/TxtDataHelpers.cpp
+++ b/src/helpers/TxtDataHelpers.cpp
@@ -19,13 +19,6 @@ void StrHelper::strzcpy(char* dest, const char* src, size_t buf_sz) {
  }
 }

-bool StrHelper::isBlank(const char* str) {
-  while (*str) {
-    if (*str++ != ' ') return false;
-  }
-  return true;
-}
-
 #include <Arduino.h>

 union int32_Float_t 
@@ -139,36 +132,3 @@ const char* StrHelper::ftoa(float f) {
  }
  return tmp;
 }
-
-const char* StrHelper::ftoa3(float f) {
-  static char s[16];
-  int v = (int)(f * 1000.0f + (f >= 0 ? 0.5f : -0.5f)); // rounded ×1000
-  int w = v / 1000;                                     // whole
-  int d = abs(v % 1000);                                // decimals
-  snprintf(s, sizeof(s), "%d.%03d", w, d);
-  for (int i = strlen(s) - 1; i > 0 && s[i] == '0'; i--)
-      s[i] = 0;
-  int L = strlen(s);
-  if (s[L - 1] == '.') s[L - 1] = 0;
-  return s;
-}
-
-uint32_t StrHelper::fromHex(const char* src) {
-  uint32_t n = 0;
-  while (*src) {
-    if (*src >= '0' && *src <= '9') {
-      n <<= 4;
-      n |= (*src - '0');
-    } else if (*src >= 'A' && *src <= 'F') {
-      n <<= 4;
-      n |= (*src - 'A' + 10);
-    } else if (*src >= 'a' && *src <= 'f') {
-      n <<= 4;
-      n |= (*src - 'a' + 10);
-    } else {
-      break;  // non-hex char encountered, stop parsing
-    }
-    src++;
-  }
-  return n;
-}
--- a/src/helpers/TxtDataHelpers.h
+++ b/src/helpers/TxtDataHelpers.h
@@ -12,7 +12,4 @@ public:
  static void strncpy(char* dest, const char* src, size_t buf_sz);
  static void strzcpy(char* dest, const char* src, size_t buf_sz);   // pads with trailing nulls
  static const char* ftoa(float f);
-  static const char* ftoa3(float f); //Converts float to string with 3 decimal places
-  static bool isBlank(const char* str);
-  static uint32_t fromHex(const char* src);
 };
--- a/src/helpers/bridges/RS232Bridge.cpp
+++ b/src/helpers/bridges/RS232Bridge.cpp
@@ -15,8 +15,6 @@ void RS232Bridge::begin() {

 #if defined(ESP32)
  ((HardwareSerial *)_serial)->setPins(WITH_RS232_BRIDGE_RX, WITH_RS232_BRIDGE_TX);
-#elif defined(RAK_4631) 
-  ((Uart *)_serial)->setPins(WITH_RS232_BRIDGE_RX, WITH_RS232_BRIDGE_TX);
 #elif defined(NRF52_PLATFORM)
  ((HardwareSerial *)_serial)->setPins(WITH_RS232_BRIDGE_RX, WITH_RS232_BRIDGE_TX);
 #elif defined(RP2040_PLATFORM)
--- a/src/helpers/radiolib/CustomLR1110.h
+++ b/src/helpers/radiolib/CustomLR1110.h
@@ -3,26 +3,137 @@
 #include <RadioLib.h>
 #include "MeshCore.h"

+#define LR1110_IRQ_HAS_PREAMBLE                     0b0000000100  //  4     4     valid LoRa header received
+#define LR1110_IRQ_HEADER_VALID                     0b0000010000  //  4     4     valid LoRa header received
+
 class CustomLR1110 : public LR1110 {
  public:
    CustomLR1110(Module *mod) : LR1110(mod) { }

+    uint8_t shiftCount = 0;
+
+    int16_t standby() override {
+      // tx resets the shift, standby is called on tx completion
+      // this might not actually be what resets it, but it seems to work
+      // more investigation needed
+      this->shiftCount = 0;
+      return LR1110::standby();
+    }
+
    size_t getPacketLength(bool update) override {
      size_t len = LR1110::getPacketLength(update);
-      if (len == 0 && getIrqStatus() & RADIOLIB_LR11X0_IRQ_HEADER_ERR) {
-        // we've just recieved a corrupted packet
-        // this may have triggered a bug causing subsequent packets to be shifted
-        // call standby() to return radio to known-good state
-        // recvRaw will call startReceive() to restart rx
-        MESH_DEBUG_PRINTLN("LR1110: got header err, calling standby()");
-        standby();
+      if (len == 0) {
+        uint32_t irq = getIrqStatus();
+        if (irq & RADIOLIB_LR11X0_IRQ_HEADER_ERR) {
+          MESH_DEBUG_PRINTLN("LR1110: got header err, assuming shift");
+          this->shiftCount += 4; // uint8 will loop around to 0 at 256, perfect as rx buffer is 256 bytes
+        } else {
+          MESH_DEBUG_PRINTLN("LR1110: got zero-length packet without header err irq");
+        }
      }
      return len;
    }
-    
+
+    int16_t readData(uint8_t *data, size_t len) override {
+      // check active modem
+      uint8_t modem = RADIOLIB_LR11X0_PACKET_TYPE_NONE;
+      int16_t state = getPacketType(&modem);
+      RADIOLIB_ASSERT(state);
+      if((modem != RADIOLIB_LR11X0_PACKET_TYPE_LORA) && 
+        (modem != RADIOLIB_LR11X0_PACKET_TYPE_GFSK)) {
+        return(RADIOLIB_ERR_WRONG_MODEM);
+      }
+
+      // check integrity CRC
+      uint32_t irq = getIrqStatus();
+      int16_t crcState = RADIOLIB_ERR_NONE;
+      // Report CRC mismatch when there's a payload CRC error, or a header error and no valid header (to avoid false alarm from previous packet)
+      if((irq & RADIOLIB_LR11X0_IRQ_CRC_ERR) || ((irq & RADIOLIB_LR11X0_IRQ_HEADER_ERR) && !(irq & RADIOLIB_LR11X0_IRQ_SYNC_WORD_HEADER_VALID))) {
+        crcState = RADIOLIB_ERR_CRC_MISMATCH;
+      }
+
+      // get packet length
+      // the offset is needed since LR11x0 seems to move the buffer base by 4 bytes on every packet
+      uint8_t offset = 0;
+      size_t length = LR1110::getPacketLength(true, &offset);
+      if((len != 0) && (len < length)) {
+        // user requested less data than we got, only return what was requested
+        length = len;
+      }
+
+      // read packet data
+      state = readBuffer8(data, length, (uint8_t)(offset + this->shiftCount));  // add shiftCount to offset - only change from radiolib
+      RADIOLIB_ASSERT(state);
+
+      // clear the Rx buffer
+      state = clearRxBuffer();
+      RADIOLIB_ASSERT(state);
+
+      // clear interrupt flags
+      state = clearIrqState(RADIOLIB_LR11X0_IRQ_ALL);
+
+      // check if CRC failed - this is done after reading data to give user the option to keep them
+      RADIOLIB_ASSERT(crcState);
+
+      return(state);
+    }
+
+    RadioLibTime_t getTimeOnAir(size_t len) override {
+  // calculate number of symbols
+  float N_symbol = 0;
+  if(this->codingRate <= RADIOLIB_LR11X0_LORA_CR_4_8_SHORT) {
+    // legacy coding rate - nice and simple
+    // get SF coefficients
+    float coeff1 = 0;
+    int16_t coeff2 = 0;
+    int16_t coeff3 = 0;
+    if(this->spreadingFactor < 7) {
+      // SF5, SF6
+      coeff1 = 6.25;
+      coeff2 = 4*this->spreadingFactor;
+      coeff3 = 4*this->spreadingFactor;
+    } else if(this->spreadingFactor < 11) {
+      // SF7. SF8, SF9, SF10
+      coeff1 = 4.25;
+      coeff2 = 4*this->spreadingFactor + 8;
+      coeff3 = 4*this->spreadingFactor;
+    } else {
+      // SF11, SF12
+      coeff1 = 4.25;
+      coeff2 = 4*this->spreadingFactor + 8;
+      coeff3 = 4*(this->spreadingFactor - 2);
+    }
+
+    // get CRC length
+    int16_t N_bitCRC = 16;
+    if(this->crcTypeLoRa == RADIOLIB_LR11X0_LORA_CRC_DISABLED) {
+      N_bitCRC = 0;
+    }
+
+    // get header length
+    int16_t N_symbolHeader = 20;
+    if(this->headerType == RADIOLIB_LR11X0_LORA_HEADER_IMPLICIT) {
+      N_symbolHeader = 0;
+    }
+
+    // calculate number of LoRa preamble symbols - NO! Lora preamble is already in symbols
+    // uint32_t N_symbolPreamble = (this->preambleLengthLoRa & 0x0F) * (uint32_t(1) << ((this->preambleLengthLoRa & 0xF0) >> 4));
+
+    // calculate the number of symbols - nope
+    // N_symbol = (float)N_symbolPreamble + coeff1 + 8.0f + ceilf((float)RADIOLIB_MAX((int16_t)(8 * len + N_bitCRC - coeff2 + N_symbolHeader), (int16_t)0) / (float)coeff3) * (float)(this->codingRate + 4);
+    // calculate the number of symbols - using only preamblelora because it's already in symbols
+    N_symbol = (float)preambleLengthLoRa + coeff1 + 8.0f + ceilf((float)RADIOLIB_MAX((int16_t)(8 * len + N_bitCRC - coeff2 + N_symbolHeader), (int16_t)0) / (float)coeff3) * (float)(this->codingRate + 4);
+  } else {
+    // long interleaving - not needed for this modem
+  }
+
+  // get time-on-air in us
+  return(((uint32_t(1) << this->spreadingFactor) / this->bandwidthKhz) * N_symbol * 1000.0f);
+}
+
    bool isReceiving() {
      uint16_t irq = getIrqStatus();
-      bool detected = ((irq & RADIOLIB_LR11X0_IRQ_SYNC_WORD_HEADER_VALID) || (irq & RADIOLIB_LR11X0_IRQ_PREAMBLE_DETECTED));
+      bool detected = ((irq & LR1110_IRQ_HEADER_VALID) || (irq & LR1110_IRQ_HAS_PREAMBLE));
      return detected;
    }
 };
--- a/src/helpers/radiolib/CustomSX1262Wrapper.h
+++ b/src/helpers/radiolib/CustomSX1262Wrapper.h
@@ -19,7 +19,4 @@ public:
    int sf = ((CustomSX1262 *)_radio)->spreadingFactor;
    return packetScoreInt(snr, sf, packet_len);
  }
-  virtual void powerOff() override {
-    ((CustomSX1262 *)_radio)->sleep(false);
-  }
 };
--- a/src/helpers/radiolib/RadioLibWrappers.h
+++ b/src/helpers/radiolib/RadioLibWrappers.h
@@ -21,7 +21,6 @@ public:
  RadioLibWrapper(PhysicalLayer& radio, mesh::MainBoard& board) : _radio(&radio), _board(&board) { n_recv = n_sent = 0; }

  void begin() override;
-  virtual void powerOff() { _radio->sleep(); }
  int recvRaw(uint8_t* bytes, int sz) override;
  uint32_t getEstAirtimeFor(int len_bytes) override;
  bool startSendRaw(const uint8_t* bytes, int len) override;
--- a/src/helpers/sensors/EnvironmentSensorManager.cpp
+++ b/src/helpers/sensors/EnvironmentSensorManager.cpp
@@ -15,12 +15,6 @@
 static Adafruit_BME680 BME680;
 #endif

-#ifdef ENV_INCLUDE_BMP085
-#define TELEM_BMP085_SEALEVELPRESSURE_HPA (1013.25)
-#include <Adafruit_BMP085.h>
-static Adafruit_BMP085 BMP085;
-#endif
-
 #if ENV_INCLUDE_AHTX0
 #define TELEM_AHTX_ADDRESS      0x38      // AHT10, AHT20 temperature and humidity sensor I2C address
 #include <Adafruit_AHTX0.h>
@@ -178,16 +172,6 @@ bool EnvironmentSensorManager::begin() {
  }
  #endif

-  #if ENV_INCLUDE_BME680
-  if (BME680.begin(TELEM_BME680_ADDRESS, TELEM_WIRE)) {
-    MESH_DEBUG_PRINTLN("Found BME680 at address: %02X", TELEM_BME680_ADDRESS);
-    BME680_initialized = true;
-  } else {
-    BME680_initialized = false;
-    MESH_DEBUG_PRINTLN("BME680 was not found at I2C address %02X", TELEM_BME680_ADDRESS);
-  }
-  #endif
-
  #if ENV_INCLUDE_BME280
  if (BME280.begin(TELEM_BME280_ADDRESS, TELEM_WIRE)) {
    MESH_DEBUG_PRINTLN("Found BME280 at address: %02X", TELEM_BME280_ADDRESS);
@@ -311,15 +295,13 @@ bool EnvironmentSensorManager::begin() {
  }
  #endif

-  #if ENV_INCLUDE_BMP085
-  // First argument is  MODE (aka oversampling)
-  // choose ULTRALOWPOWER
-  if (BMP085.begin(0, TELEM_WIRE)) {
-    MESH_DEBUG_PRINTLN("Found sensor BMP085");
-    BMP085_initialized = true;
+  #if ENV_INCLUDE_BME680
+  if (BME680.begin(TELEM_BME680_ADDRESS, TELEM_WIRE)) {
+    MESH_DEBUG_PRINTLN("Found BME680 at address: %02X", TELEM_BME680_ADDRESS);
+    BME680_initialized = true;
  } else {
-    BMP085_initialized = false;
-    MESH_DEBUG_PRINTLN("BMP085 was not found at I2C address %02X", 0x77);
+    BME680_initialized = false;
+    MESH_DEBUG_PRINTLN("BME680 was not found at I2C address %02X", TELEM_BME680_ADDRESS);
  }
  #endif

@@ -344,19 +326,6 @@ bool EnvironmentSensorManager::querySensors(uint8_t requester_permissions, Cayen
    }
    #endif

-    #if ENV_INCLUDE_BME680
-    if (BME680_initialized) {
-      if (BME680.performReading()) {
-        telemetry.addTemperature(TELEM_CHANNEL_SELF, BME680.temperature);
-        telemetry.addRelativeHumidity(TELEM_CHANNEL_SELF, BME680.humidity);
-        telemetry.addBarometricPressure(TELEM_CHANNEL_SELF, BME680.pressure / 100);
-        telemetry.addAltitude(TELEM_CHANNEL_SELF, 44330.0 * (1.0 - pow((BME680.pressure / 100) / TELEM_BME680_SEALEVELPRESSURE_HPA, 0.1903)));
-        telemetry.addAnalogInput(next_available_channel, BME680.gas_resistance);
-        next_available_channel++;
-      }
-    }
-    #endif
-
    #if ENV_INCLUDE_BME280
    if (BME280_initialized) {
      telemetry.addTemperature(TELEM_CHANNEL_SELF, BME280.readTemperature());
@@ -465,11 +434,16 @@ bool EnvironmentSensorManager::querySensors(uint8_t requester_permissions, Cayen
    }
    #endif

-    #if ENV_INCLUDE_BMP085
-    if (BMP085_initialized) {
-        telemetry.addTemperature(TELEM_CHANNEL_SELF, BMP085.readTemperature());
-        telemetry.addBarometricPressure(TELEM_CHANNEL_SELF, BMP085.readPressure() / 100);
-        telemetry.addAltitude(TELEM_CHANNEL_SELF, BMP085.readAltitude(TELEM_BMP085_SEALEVELPRESSURE_HPA * 100));
+    #if ENV_INCLUDE_BME680
+    if (BME680_initialized) {
+      if (BME680.performReading()) {
+        telemetry.addTemperature(TELEM_CHANNEL_SELF, BME680.temperature);
+        telemetry.addRelativeHumidity(TELEM_CHANNEL_SELF, BME680.humidity);
+        telemetry.addBarometricPressure(TELEM_CHANNEL_SELF, BME680.pressure / 100);
+        telemetry.addAltitude(TELEM_CHANNEL_SELF, 44330.0 * (1.0 - pow((BME680.pressure / 100) / TELEM_BME680_SEALEVELPRESSURE_HPA, 0.1903)));
+        telemetry.addAnalogInput(next_available_channel, BME680.gas_resistance);
+        next_available_channel++;
+      }
    }
    #endif

@@ -548,11 +522,7 @@ void EnvironmentSensorManager::initBasicGPS() {
  delay(1000);

  // We'll consider GPS detected if we see any data on Serial1
-#ifdef ENV_SKIP_GPS_DETECT
-  gps_detected = true;
-#else
  gps_detected = (Serial1.available() > 0);
-#endif

  if (gps_detected) {
    MESH_DEBUG_PRINTLN("GPS detected");
@@ -567,7 +537,7 @@ void EnvironmentSensorManager::initBasicGPS() {
  gps_active = false; //Set GPS visibility off until setting is changed
 }

-// gps code for rak might be moved to MicroNMEALoactionProvider
+// gps code for rak might be moved to MicroNMEALoactionProvider 
 // or make a new location provider ...
 #ifdef RAK_WISBLOCK_GPS
 void EnvironmentSensorManager::rakGPSInit(){
--- a/src/helpers/sensors/EnvironmentSensorManager.h
+++ b/src/helpers/sensors/EnvironmentSensorManager.h
@@ -21,7 +21,6 @@ protected:
  bool VL53L0X_initialized = false;
  bool SHT4X_initialized = false;
  bool BME680_initialized = false;
-  bool BMP085_initialized = false;

  bool gps_detected = false;
  bool gps_active = false;
--- a/src/helpers/ui/GxEPDDisplay.cpp
+++ b/src/helpers/ui/GxEPDDisplay.cpp
@@ -1,26 +1,13 @@

 #include "GxEPDDisplay.h"

-#ifdef EXP_PIN_BACKLIGHT
-  #include <PCA9557.h>
-  extern PCA9557 expander;
-#endif
-
 #ifndef DISPLAY_ROTATION
  #define DISPLAY_ROTATION 3
 #endif

-#ifdef ESP32
-  SPIClass SPI1 = SPIClass(FSPI);
-#endif
-
 bool GxEPDDisplay::begin() {
  display.epd2.selectSPI(SPI1, SPISettings(4000000, MSBFIRST, SPI_MODE0));
-#ifdef ESP32
-  SPI1.begin(PIN_DISPLAY_SCLK, PIN_DISPLAY_MISO, PIN_DISPLAY_MOSI, PIN_DISPLAY_CS);
-#else
  SPI1.begin();
-#endif
  display.init(115200, true, 2, false);
  display.setRotation(DISPLAY_ROTATION);
  setTextSize(1);  // Default to size 1
@@ -40,8 +27,6 @@ void GxEPDDisplay::turnOn() {
  if (!_init) begin();
 #if defined(DISP_BACKLIGHT) && !defined(BACKLIGHT_BTN)
  digitalWrite(DISP_BACKLIGHT, HIGH);
-#elif defined(EXP_PIN_BACKLIGHT) && !defined(BACKLIGHT_BTN)
-  expander.digitalWrite(EXP_PIN_BACKLIGHT, HIGH);
 #endif
  _isOn = true;
 }
@@ -49,8 +34,6 @@ void GxEPDDisplay::turnOn() {
 void GxEPDDisplay::turnOff() {
 #if defined(DISP_BACKLIGHT) && !defined(BACKLIGHT_BTN)
  digitalWrite(DISP_BACKLIGHT, LOW);
-#elif defined(EXP_PIN_BACKLIGHT) && !defined(BACKLIGHT_BTN)
-  expander.digitalWrite(EXP_PIN_BACKLIGHT, LOW);
 #endif
  _isOn = false;
 }
--- a/src/helpers/ui/LGFXDisplay.cpp
+++ b/src/helpers/ui/LGFXDisplay.cpp
@@ -1,125 +0,0 @@
-#include "LGFXDisplay.h"
-
-bool LGFXDisplay::begin() {
-  turnOn();
-  display->init();
-  display->setRotation(1);
-  display->setBrightness(64);
-  display->setColorDepth(8);
-  display->setTextColor(TFT_WHITE);
-
-  buffer.setColorDepth(8);
-  buffer.setPsram(true);
-  buffer.createSprite(width(), height());
-
-  return true;
-}
-
-void LGFXDisplay::turnOn() {
-//  display->wakeup();
-  if (!_isOn) {
-    display->wakeup();
-  }
-  _isOn = true;
-}
-
-void LGFXDisplay::turnOff() {
-  if (_isOn) {
-    display->sleep();
-  }
-  _isOn = false;
-}
-
-void LGFXDisplay::clear() {
-//  display->clearDisplay();
-  buffer.clearDisplay();
-}
-
-void LGFXDisplay::startFrame(Color bkg) {
-//  display->startWrite();
-//  display->getScanLine();
-  buffer.clearDisplay();
-  buffer.setTextColor(TFT_WHITE);
-}
-
-void LGFXDisplay::setTextSize(int sz) {
-  buffer.setTextSize(sz);
-}
-
-void LGFXDisplay::setColor(Color c) {
-  // _color = (c != 0) ? ILI9342_WHITE : ILI9342_BLACK;
-  switch (c) {
-    case DARK:
-      _color = TFT_BLACK;
-      break;
-    case LIGHT:
-      _color = TFT_WHITE;
-      break;
-    case RED:
-      _color = TFT_RED;
-      break;
-    case GREEN:
-      _color = TFT_GREEN;
-      break;
-    case BLUE:
-      _color = TFT_BLUE;
-      break;
-    case YELLOW:
-      _color = TFT_YELLOW;
-      break;
-    case ORANGE:
-      _color = TFT_ORANGE;
-      break;
-    default:
-      _color = TFT_WHITE;
-  }
-  buffer.setTextColor(_color);
-}
-
-void LGFXDisplay::setCursor(int x, int y) {
-  buffer.setCursor(x, y);
-}
-
-void LGFXDisplay::print(const char* str) {
-  buffer.println(str);
-//  Serial.println(str);
-}
-
-void LGFXDisplay::fillRect(int x, int y, int w, int h) {
-  buffer.fillRect(x, y, w, h, _color);
-}
-
-void LGFXDisplay::drawRect(int x, int y, int w, int h) {
-  buffer.drawRect(x, y, w, h, _color);
-}
-
-void LGFXDisplay::drawXbm(int x, int y, const uint8_t* bits, int w, int h) {
-  buffer.drawBitmap(x, y, bits, w, h, _color);
-}
-
-uint16_t LGFXDisplay::getTextWidth(const char* str) {
-  return buffer.textWidth(str);
-}
-
-void LGFXDisplay::endFrame() {
-  display->startWrite();
-  if (UI_ZOOM != 1) {
-    buffer.pushRotateZoom(display, display->width()/2, display->height()/2 , 0, UI_ZOOM, UI_ZOOM);
-  } else {
-    buffer.pushSprite(display, 0, 0);
-  }
-  display->endWrite();
-}
-
-bool LGFXDisplay::getTouch(int *x, int *y) {
-  lgfx::v1::touch_point_t point;
-  display->getTouch(&point);
-  if (UI_ZOOM != 1) {
-    *x = point.x / UI_ZOOM;
-    *y = point.y / UI_ZOOM;
-  } else {
-    *x = point.x;
-    *y = point.y;
-  }
-  return (*x >= 0) && (*y >= 0);
-}
--- a/src/helpers/ui/LGFXDisplay.h
+++ b/src/helpers/ui/LGFXDisplay.h
@@ -1,39 +0,0 @@
-#pragma once
-
-#include <helpers/ui/DisplayDriver.h>
-
-#define LGFX_USE_V1
-#include <LovyanGFX.hpp>
-
-#ifndef UI_ZOOM
-  #define UI_ZOOM 1
-#endif
-
-class LGFXDisplay : public DisplayDriver {
-protected:
-  LGFX_Device* display;
-  LGFX_Sprite buffer;
-
-  bool _isOn = false;
-  int _color = TFT_WHITE;
-
-public:
-  LGFXDisplay(int w, int h, LGFX_Device &disp)
-    : DisplayDriver(w/UI_ZOOM, h/UI_ZOOM), display(&disp) {}
-  bool begin();
-  bool isOn() override { return _isOn; }
-  void turnOn() override;
-  void turnOff() override;
-  void clear() override;
-  void startFrame(Color bkg = DARK) override;
-  void setTextSize(int sz) override;
-  void setColor(Color c) override;
-  void setCursor(int x, int y) override;
-  void print(const char* str) override;
-  void fillRect(int x, int y, int w, int h) override;
-  void drawRect(int x, int y, int w, int h) override;
-  void drawXbm(int x, int y, const uint8_t* bits, int w, int h) override;
-  uint16_t getTextWidth(const char* str) override;
-  void endFrame() override;
-  virtual bool getTouch(int *x, int *y);
-};
--- a/tools/maint/README.md
+++ b/tools/maint/README.md
@@ -1,56 +0,0 @@
-# Maintenance Tools
-
-This directory contains automation for managing our **Friendly Fork**. It allows us to integrate community-submitted Pull Requests from the upstream repository into our local development branches.
-
-## Why this exists
-
-In firmware development, critical bug fixes or hardware support often exist in the upstream "Pull Request" queue long before they are officially merged. This tool allows us to build an integrated firmware version that includes those necessary patches while remaining syncable with the official source.
-
-## Usage
-
-### 1. Prerequisites
-
-You must have the original repository added as a remote named `upstream`:
-
-```bash
-git remote add upstream https://github.com/meshcore-dev/MeshCore.git
-```
-
-### 2. Basic Commands
-
-**Apply specific patches:**
-To pull in PR #1338 and PR #1400 from the upstream project:
-
-```bash
-./tools/maint/apply_patches.sh 1338 1400
-
-```
-
-**Start over (Reset):**
-To wipe the integrated branch and reset it to match the official upstream `main` branch exactly:
-
-```bash
-./tools/maint/apply_patches.sh --reset
-
-```
-
-## Traceability
-
-Every time this script runs, it updates `patch_manifest.log`. This file tracks:
-
-* The date of the integration.
-* The base commit SHA we started from.
-* The specific commit SHA of every PR applied.
-
-**This log is essential for debugging firmware regressions.** If the hardware fails, check the manifest to identify which experimental patch might be the cause.
-
---
-
-### A Note on Merge Conflicts
-
-If a PR cannot be applied automatically, the script will abort the merge. You will need to:
-
-1. Manually merge the PR.
-2. Resolve the conflicts in your editor.
-3. Commit the result.
-4. Manually update the `patch_manifest.log`.
--- a/tools/maint/apply_patches.sh
+++ b/tools/maint/apply_patches.sh
@@ -1,65 +0,0 @@
-#!/bin/bash
-
-# Configuration
-UPSTREAM_REMOTE="upstream"
-BASE_BRANCH="main"        # Change to 'master' if that's what upstream uses
-TARGET_BRANCH="main-integrated"
-MANIFEST_FILE="tools/maint/patch_manifest.log"
-
-# Function to reset the branch
-reset_to_upstream() {
-    echo "Warning: This will wipe all local changes on $TARGET_BRANCH."
-    read -p "Are you sure you want to reset to $UPSTREAM_REMOTE/$BASE_BRANCH? (y/n) " -n 1 -r
-    echo
-    if [[ $REPLY =~ ^[Yy]$ ]]; then
-        git fetch "$UPSTREAM_REMOTE"
-        git checkout -B "$TARGET_BRANCH" "$UPSTREAM_REMOTE/$BASE_BRANCH"
-        echo "--- Reset to Upstream: $(date) ---" > "$MANIFEST_FILE"
-        echo "Base Commit: $(git rev-parse HEAD)" >> "$MANIFEST_FILE"
-        echo "Reset successful. Branch is now clean."
-    else
-        echo "Reset aborted."
-    fi
-}
-
-# Check for reset flag
-if [[ "$1" == "--reset" ]]; then
-    reset_to_upstream
-    exit 0
-fi
-
-# Standard PR application logic
-PR_IDS=("$@")
-if [ ${#PR_IDS[@]} -eq 0 ]; then
-    echo "Usage:"
-    echo "  Apply PRs: $0 <PR_ID1> <PR_ID2> ..."
-    echo "  Reset:     $0 --reset"
-    exit 1
-fi
-
-# Ensure target branch exists and is checked out
-git checkout -B "$TARGET_BRANCH"
-
-echo "--- Patch Session: $(date) ---" >> "$MANIFEST_FILE"
-
-for PR in "${PR_IDS[@]}"; do
-    echo "--------------------------------------"
-    echo "Fetching PR #$PR..."
-    
-    if git fetch "$UPSTREAM_REMOTE" "pull/$PR/head:PR_TEMP_FETCH"; then
-        if git merge PR_TEMP_FETCH --no-edit -m "Integrate upstream PR #$PR"; then
-            echo "Successfully integrated PR #$PR"
-            echo "PR #$PR SHA: $(git rev-parse PR_TEMP_FETCH)" >> "$MANIFEST_FILE"
-        else
-            echo "Conflict in PR #$PR. Aborting merge."
-            git merge --abort
-            exit 1
-        fi
-        git branch -D PR_TEMP_FETCH
-    else
-        echo "Error: PR #$PR not found."
-    fi
-done
-
-echo "--------------------------------------"
-echo "Done. See $MANIFEST_FILE for details."
--- a/variants/ebyte_eora_s3/platformio.ini
+++ b/variants/ebyte_eora_s3/platformio.ini
@@ -64,7 +64,7 @@ lib_deps =
 extends = Ebyte_EoRa-S3
 build_flags =
  ${Ebyte_EoRa-S3.build_flags}
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=300
  -D MAX_GROUP_CHANNELS=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -99,8 +99,8 @@ build_flags =
  ${Ebyte_EoRa-S3.build_flags}
  -I examples/companion_radio/ui-new
  -D DISPLAY_CLASS=SSD1306Display
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
+  -D MAX_CONTACTS=300
+  -D MAX_GROUP_CHANNELS=8
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
 build_src_filter = ${Ebyte_EoRa-S3.build_src_filter}
@@ -118,8 +118,8 @@ build_flags =
  ${Ebyte_EoRa-S3.build_flags}
  -I examples/companion_radio/ui-new
  -D DISPLAY_CLASS=SSD1306Display
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
+  -D MAX_CONTACTS=300
+  -D MAX_GROUP_CHANNELS=8
  -D BLE_PIN_CODE=123456
  -D BLE_DEBUG_LOGGING=1
  -D OFFLINE_QUEUE_SIZE=256
--- a/variants/generic_espnow/platformio.ini
+++ b/variants/generic_espnow/platformio.ini
@@ -26,7 +26,7 @@ build_src_filter = ${esp32_base.build_src_filter}
 extends = Generic_ESPNOW
 build_flags =
  ${Generic_ESPNOW.build_flags}
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=300
  -D MAX_GROUP_CHANNELS=1
 build_src_filter = ${Generic_ESPNOW.build_src_filter}
  +<../examples/simple_secure_chat/main.cpp>
@@ -54,7 +54,7 @@ lib_deps =
 extends = Generic_ESPNOW
 build_flags =
  ${Generic_ESPNOW.build_flags}
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=300
  -D MAX_GROUP_CHANNELS=8
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
--- a/variants/heltec_ct62/platformio.ini
+++ b/variants/heltec_ct62/platformio.ini
@@ -97,8 +97,8 @@ build_flags =
  ${Heltec_ct62.build_flags}
 ;  -D ARDUINO_USB_MODE=1
 ;  -D ARDUINO_USB_CDC_ON_BOOT=1
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
+  -D MAX_CONTACTS=300
+  -D MAX_GROUP_CHANNELS=8
  -D OFFLINE_QUEUE_SIZE=256
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -115,8 +115,8 @@ build_flags =
  ${Heltec_ct62.build_flags}
 ;  -D ARDUINO_USB_MODE=1
 ;  -D ARDUINO_USB_CDC_ON_BOOT=1
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
+  -D MAX_CONTACTS=300
+  -D MAX_GROUP_CHANNELS=8
  -D OFFLINE_QUEUE_SIZE=256
  -D BLE_PIN_CODE=123456
 ;  -D MESH_PACKET_LOGGING=1
--- a/variants/heltec_e213/platformio.ini
+++ b/variants/heltec_e213/platformio.ini
@@ -40,13 +40,13 @@ lib_deps =
  ${esp32_base.lib_deps}
  https://github.com/Quency-D/heltec-eink-modules/archive/563dd41fd850a1bc3039b8723da4f3a20fe1c800.zip

-[env:Heltec_E213_companion_radio_ble_]
+[env:Heltec_E213_companion_radio_ble]
 extends = Heltec_E213_base
 build_flags =
  ${Heltec_E213_base.build_flags}
  -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
+  -D MAX_CONTACTS=300
+  -D MAX_GROUP_CHANNELS=8
  -D DISPLAY_CLASS=E213Display
  -D BLE_PIN_CODE=123456   ; dynamic, random PIN
  -D BLE_DEBUG_LOGGING=1
@@ -60,13 +60,13 @@ lib_deps =
  ${Heltec_E213_base.lib_deps}
  densaugeo/base64 @ ~1.4.0

-[env:Heltec_E213_companion_radio_usb_]
+[env:Heltec_E213_companion_radio_usb]
 extends = Heltec_E213_base
 build_flags =
  ${Heltec_E213_base.build_flags}
  -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
+  -D MAX_CONTACTS=300
+  -D MAX_GROUP_CHANNELS=8
  -D DISPLAY_CLASS=E213Display
  -D OFFLINE_QUEUE_SIZE=256
 build_src_filter = ${Heltec_E213_base.build_src_filter}
@@ -78,7 +78,7 @@ lib_deps =
  ${Heltec_E213_base.lib_deps}
  densaugeo/base64 @ ~1.4.0

-[env:Heltec_E213_repeater_]
+[env:Heltec_E213_repeater]
 extends = Heltec_E213_base
 build_flags =
  ${Heltec_E213_base.build_flags}
@@ -95,7 +95,7 @@ lib_deps =
  ${Heltec_E213_base.lib_deps}
  ${esp32_ota.lib_deps}

-; [env:Heltec_E213_repeater_bridge_rs232_]
+; [env:Heltec_E213_repeater_bridge_rs232]
 ; extends = Heltec_E213_base
 ; build_flags =
 ;   ${Heltec_E213_base.build_flags}
@@ -119,7 +119,7 @@ lib_deps =
 ;   ${Heltec_E213_base.lib_deps}
 ;   ${esp32_ota.lib_deps}

-[env:Heltec_E213_repeater_bridge_espnow_]
+[env:Heltec_E213_repeater_bridge_espnow]
 extends = Heltec_E213_base
 build_flags =
  ${Heltec_E213_base.build_flags}
@@ -141,7 +141,7 @@ lib_deps =
  ${Heltec_E213_base.lib_deps}
  ${esp32_ota.lib_deps}

-[env:Heltec_E213_room_server_]
+[env:Heltec_E213_room_server]
 extends = Heltec_E213_base
 build_flags =
  ${Heltec_E213_base.build_flags}
--- a/variants/heltec_e290/platformio.ini
+++ b/variants/heltec_e290/platformio.ini
@@ -34,13 +34,13 @@ lib_deps =
  ${esp32_base.lib_deps}
  https://github.com/Quency-D/heltec-eink-modules/archive/563dd41fd850a1bc3039b8723da4f3a20fe1c800.zip

-[env:Heltec_E290_companion_ble_]
+[env:Heltec_E290_companion_radio_ble]
 extends = Heltec_E290_base
 build_flags =
  ${Heltec_E290_base.build_flags}
  -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
+  -D MAX_CONTACTS=300
+  -D MAX_GROUP_CHANNELS=8
  -D DISPLAY_CLASS=E290Display
  -D BLE_PIN_CODE=123456   ; dynamic, random PIN
  -D BLE_DEBUG_LOGGING=1
@@ -54,13 +54,13 @@ lib_deps =
  ${Heltec_E290_base.lib_deps}
  densaugeo/base64 @ ~1.4.0

-[env:Heltec_E290_companion_usb_]
+[env:Heltec_E290_companion_radio_usb]
 extends = Heltec_E290_base
 build_flags =
  ${Heltec_E290_base.build_flags}
  -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
+  -D MAX_CONTACTS=300
+  -D MAX_GROUP_CHANNELS=8
  -D DISPLAY_CLASS=E290Display
  -D BLE_PIN_CODE=123456   ; dynamic, random PIN
  -D BLE_DEBUG_LOGGING=1
@@ -74,7 +74,7 @@ lib_deps =
  ${Heltec_E290_base.lib_deps}
  densaugeo/base64 @ ~1.4.0

-[env:Heltec_E290_repeater_]
+[env:Heltec_E290_repeater]
 extends = Heltec_E290_base
 build_flags =
  ${Heltec_E290_base.build_flags}
@@ -91,7 +91,7 @@ lib_deps =
  ${Heltec_E290_base.lib_deps}
  ${esp32_ota.lib_deps}

-; [env:Heltec_E290_repeater_bridge_rs232_]
+; [env:Heltec_E290_repeater_bridge_rs232]
 ; extends = Heltec_E290_base
 ; build_flags =
 ;   ${Heltec_E290_base.build_flags}
@@ -115,7 +115,7 @@ lib_deps =
 ;   ${Heltec_E290_base.lib_deps}
 ;   ${esp32_ota.lib_deps}

-[env:Heltec_E290_repeater_bridge_espnow_]
+[env:Heltec_E290_repeater_bridge_espnow]
 extends = Heltec_E290_base
 build_flags =
  ${Heltec_E290_base.build_flags}
@@ -137,7 +137,7 @@ lib_deps =
  ${Heltec_E290_base.lib_deps}
  ${esp32_ota.lib_deps}

-[env:Heltec_E290_room_server_]
+[env:Heltec_E290_room_server]
 extends = Heltec_E290_base
 build_flags =
  ${Heltec_E290_base.build_flags}
--- a/variants/heltec_t114/T114Board.cpp
+++ b/variants/heltec_t114/T114Board.cpp
@@ -21,7 +21,6 @@ static void disconnect_callback(uint16_t conn_handle, uint8_t reason) {
 void T114Board::begin() {
  // for future use, sub-classes SHOULD call this from their begin()
  startup_reason = BD_STARTUP_NORMAL;
-  NRF_POWER->DCDCEN = 1;

  pinMode(PIN_VBAT_READ, INPUT);

--- a/variants/heltec_t114/T114Board.h
+++ b/variants/heltec_t114/T114Board.h
@@ -48,13 +48,6 @@ public:
  }

  void powerOff() override {
-    #ifdef LED_PIN
-    digitalWrite(LED_PIN, HIGH);
-    #endif
-    #if ENV_INCLUDE_GPS == 1
-    pinMode(GPS_EN, OUTPUT);
-    digitalWrite(GPS_EN, LOW);
-    #endif
    sd_power_system_off();
  }

--- a/variants/heltec_t114/platformio.ini
+++ b/variants/heltec_t114/platformio.ini
@@ -29,11 +29,6 @@ build_flags = ${nrf52_base.build_flags}
  -D SX126X_RX_BOOSTED_GAIN=1
  -D DISPLAY_CLASS=NullDisplayDriver
  -D ST7789
-  -D PIN_GPS_RX=39
-  -D PIN_GPS_TX=37
-  -D PIN_GPS_EN=21
-  -D PIN_GPS_RESET=38
-  -D PIN_GPS_RESET_ACTIVE=LOW
 build_src_filter = ${nrf52_base.build_src_filter}
  +<helpers/*.cpp>
  +<../variants/heltec_t114>
--- a/variants/heltec_t114/target.cpp
+++ b/variants/heltec_t114/target.cpp
@@ -11,7 +11,7 @@ WRAPPER_CLASS radio_driver(radio, board);

 VolatileRTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
-MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock);
+MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1);
 T114SensorManager sensors = T114SensorManager(nmea);

 #ifdef DISPLAY_CLASS
--- a/variants/heltec_t114/variant.h
+++ b/variants/heltec_t114/variant.h
@@ -117,8 +117,6 @@

 #define GPS_EN                  (21)
 #define GPS_RESET               (38)
-#define PIN_GPS_RX              (39)  // This is for bits going TOWARDS the GPS
-#define PIN_GPS_TX              (37)  // This is for bits going TOWARDS the CPU

 ////////////////////////////////////////////////////////////////////////////////
 // TFT
--- a/variants/heltec_t190/platformio.ini
+++ b/variants/heltec_t190/platformio.ini
@@ -47,13 +47,13 @@ lib_deps =
  ${esp32_base.lib_deps}
  adafruit/Adafruit GFX Library @ ^1.12.1

-[env:Heltec_T190_companion_radio_ble_]
+[env:Heltec_T190_companion_radio_ble]
 extends = Heltec_T190_base
 build_flags =
  ${Heltec_T190_base.build_flags}
  -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
+  -D MAX_CONTACTS=300
+  -D MAX_GROUP_CHANNELS=8
  -D BLE_PIN_CODE=123456   ; dynamic, random PIN
  -D BLE_DEBUG_LOGGING=1
  -D OFFLINE_QUEUE_SIZE=256
@@ -65,13 +65,13 @@ lib_deps =
  ${Heltec_T190_base.lib_deps}
  densaugeo/base64 @ ~1.4.0

-[env:Heltec_T190_companion_radio_usb_]
+[env:Heltec_T190_companion_radio_usb]
 extends = Heltec_T190_base
 build_flags =
  ${Heltec_T190_base.build_flags}
  -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
+  -D MAX_CONTACTS=300
+  -D MAX_GROUP_CHANNELS=8
  -D OFFLINE_QUEUE_SIZE=256
 build_src_filter = ${Heltec_T190_base.build_src_filter}
  +<helpers/esp32/*.cpp>
@@ -81,7 +81,7 @@ lib_deps =
  ${Heltec_T190_base.lib_deps}
  densaugeo/base64 @ ~1.4.0

-[env:Heltec_T190_repeater_]
+[env:Heltec_T190_repeater]
 extends = Heltec_T190_base
 build_flags =
  ${Heltec_T190_base.build_flags}
@@ -96,7 +96,7 @@ lib_deps =
  ${Heltec_T190_base.lib_deps}
  ${esp32_ota.lib_deps}

-; [env:Heltec_T190_repeater_bridge_rs232_]
+; [env:Heltec_T190_repeater_bridge_rs232]
 ; extends = Heltec_T190_base
 ; build_flags =
 ;   ${Heltec_T190_base.build_flags}
@@ -118,7 +118,7 @@ lib_deps =
 ;   ${Heltec_T190_base.lib_deps}
 ;   ${esp32_ota.lib_deps}

-[env:Heltec_T190_repeater_bridge_espnow_]
+[env:Heltec_T190_repeater_bridge_espnow]
 extends = Heltec_T190_base
 build_flags =
  ${Heltec_T190_base.build_flags}
@@ -138,7 +138,7 @@ lib_deps =
  ${Heltec_T190_base.lib_deps}
  ${esp32_ota.lib_deps}

-[env:Heltec_T190_room_server_]
+[env:Heltec_T190_room_server]
 extends = Heltec_T190_base
 build_flags =
  ${Heltec_T190_base.build_flags}
--- a/variants/heltec_tracker/platformio.ini
+++ b/variants/heltec_tracker/platformio.ini
@@ -6,14 +6,6 @@ build_flags =
  -I variants/heltec_tracker
  -D HELTEC_LORA_V3
  -D ARDUINO_USB_CDC_ON_BOOT=1      ; need for Serial
-  -D ESP32_CPU_FREQ=80
-  -D P_LORA_DIO_1=14
-  -D P_LORA_NSS=8
-  -D P_LORA_RESET=RADIOLIB_NC
-  -D P_LORA_BUSY=13
-  -D P_LORA_SCLK=9
-  -D P_LORA_MISO=11
-  -D P_LORA_MOSI=10
  -D RADIO_CLASS=CustomSX1262
  -D WRAPPER_CLASS=CustomSX1262Wrapper
  -D LORA_TX_POWER=22
@@ -51,8 +43,8 @@ build_flags =
  -I examples/companion_radio/ui-new
  -D DISPLAY_ROTATION=1
  -D DISPLAY_CLASS=ST7735Display
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
+  -D MAX_CONTACTS=300
+  -D MAX_GROUP_CHANNELS=8
  -D BLE_PIN_CODE=123456 ; HWT will use display for pin
  -D OFFLINE_QUEUE_SIZE=256
 ;  -D BLE_DEBUG_LOGGING=1
--- a/variants/heltec_tracker/target.h
+++ b/variants/heltec_tracker/target.h
@@ -3,7 +3,7 @@
 #define RADIOLIB_STATIC_ONLY 1
 #include <RadioLib.h>
 #include <helpers/radiolib/RadioLibWrappers.h>
-#include <../heltec_v3/HeltecV3Board.h>
+#include <helpers/HeltecV3Board.h>
 #include <helpers/radiolib/CustomSX1262Wrapper.h>
 #include <helpers/AutoDiscoverRTCClock.h>
 #include <helpers/SensorManager.h>
--- a/variants/heltec_tracker_v2/platformio.ini
+++ b/variants/heltec_tracker_v2/platformio.ini
@@ -120,7 +120,7 @@ lib_deps =
 extends = Heltec_tracker_v2
 build_flags =
  ${Heltec_tracker_v2.build_flags}
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=300
  -D MAX_GROUP_CHANNELS=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -135,8 +135,8 @@ extends = Heltec_tracker_v2
 build_flags =
  ${Heltec_tracker_v2.build_flags}
  -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
+  -D MAX_CONTACTS=300
+  -D MAX_GROUP_CHANNELS=8
  -D DISPLAY_CLASS=ST7735Display
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
@@ -154,8 +154,8 @@ extends = Heltec_tracker_v2
 build_flags =
  ${Heltec_tracker_v2.build_flags}
  -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
+  -D MAX_CONTACTS=300
+  -D MAX_GROUP_CHANNELS=8
  -D DISPLAY_CLASS=ST7735Display
  -D BLE_PIN_CODE=123456   ; dynamic, random PIN
  -D AUTO_SHUTDOWN_MILLIVOLTS=3400
@@ -179,8 +179,8 @@ extends = Heltec_tracker_v2
 build_flags =
  ${Heltec_tracker_v2.build_flags}
  -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
+  -D MAX_CONTACTS=300
+  -D MAX_GROUP_CHANNELS=8
  -D DISPLAY_CLASS=ST7735Display
  -D WIFI_DEBUG_LOGGING=1
  -D WIFI_SSID='"myssid"'
--- a/variants/heltec_v3/platformio.ini
+++ b/variants/heltec_v3/platformio.ini
@@ -125,7 +125,7 @@ lib_deps =
 extends = Heltec_lora32_v3
 build_flags =
  ${Heltec_lora32_v3.build_flags}
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=300
  -D MAX_GROUP_CHANNELS=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -140,8 +140,8 @@ extends = Heltec_lora32_v3
 build_flags =
  ${Heltec_lora32_v3.build_flags}
  -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
+  -D MAX_CONTACTS=300
+  -D MAX_GROUP_CHANNELS=8
  -D DISPLAY_CLASS=SSD1306Display
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
@@ -159,8 +159,8 @@ extends = Heltec_lora32_v3
 build_flags =
  ${Heltec_lora32_v3.build_flags}
  -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
+  -D MAX_CONTACTS=300
+  -D MAX_GROUP_CHANNELS=8
  -D DISPLAY_CLASS=SSD1306Display
  -D BLE_PIN_CODE=123456   ; dynamic, random PIN
  -D AUTO_SHUTDOWN_MILLIVOLTS=3400
@@ -183,8 +183,8 @@ extends = Heltec_lora32_v3
 build_flags =
  ${Heltec_lora32_v3.build_flags}
  -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
+  -D MAX_CONTACTS=300
+  -D MAX_GROUP_CHANNELS=8
  -D DISPLAY_CLASS=SSD1306Display
  -D WIFI_DEBUG_LOGGING=1
  -D WIFI_SSID='"myssid"'
@@ -304,8 +304,8 @@ lib_deps =
 extends = Heltec_lora32_v3
 build_flags =
  ${Heltec_lora32_v3.build_flags}
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
+  -D MAX_CONTACTS=300
+  -D MAX_GROUP_CHANNELS=8
  -D BLE_PIN_CODE=123456
  -D BLE_DEBUG_LOGGING=1
  -D OFFLINE_QUEUE_SIZE=256
@@ -323,7 +323,7 @@ extends = Heltec_lora32_v3
 build_flags =
  ${Heltec_lora32_v3.build_flags}
  -D MAX_CONTACTS=140
-  -D MAX_GROUP_CHANNELS=40
+  -D MAX_GROUP_CHANNELS=8
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
 build_src_filter = ${Heltec_lora32_v3.build_src_filter}
@@ -336,8 +336,8 @@ lib_deps =
 extends = Heltec_lora32_v3
 build_flags =
  ${Heltec_lora32_v3.build_flags}
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
+  -D MAX_CONTACTS=300
+  -D MAX_GROUP_CHANNELS=8
  -D WIFI_DEBUG_LOGGING=1
  -D WIFI_SSID='"myssid"'
  -D WIFI_PWD='"mypwd"'
--- a/variants/heltec_v4/platformio.ini
+++ b/variants/heltec_v4/platformio.ini
@@ -112,7 +112,7 @@ lib_deps =
 extends = Heltec_lora32_v4
 build_flags =
  ${Heltec_lora32_v4.build_flags}
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=300
  -D MAX_GROUP_CHANNELS=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -127,8 +127,8 @@ extends = Heltec_lora32_v4
 build_flags =
  ${Heltec_lora32_v4.build_flags}
  -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
+  -D MAX_CONTACTS=300
+  -D MAX_GROUP_CHANNELS=8
  -D DISPLAY_CLASS=SSD1306Display
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
@@ -146,8 +146,8 @@ extends = Heltec_lora32_v4
 build_flags =
  ${Heltec_lora32_v4.build_flags}
  -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
+  -D MAX_CONTACTS=300
+  -D MAX_GROUP_CHANNELS=8
  -D DISPLAY_CLASS=SSD1306Display
  -D BLE_PIN_CODE=123456   ; dynamic, random PIN
  -D AUTO_SHUTDOWN_MILLIVOLTS=3400
@@ -170,8 +170,8 @@ extends = Heltec_lora32_v4
 build_flags =
  ${Heltec_lora32_v4.build_flags}
  -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
+  -D MAX_CONTACTS=300
+  -D MAX_GROUP_CHANNELS=8
  -D DISPLAY_CLASS=SSD1306Display
  -D WIFI_DEBUG_LOGGING=1
  -D WIFI_SSID='"myssid"'
--- a/variants/heltec_wireless_paper/platformio.ini
+++ b/variants/heltec_wireless_paper/platformio.ini
@@ -5,20 +5,12 @@ build_flags =
  ${esp32_base.build_flags}
  -I variants/heltec_wireless_paper
  -D HELTEC_WIRELESS_PAPER
-  -D ARDUINO_USB_CDC_ON_BOOT=1      ; need for Serial
-  -D P_LORA_DIO_1=14
-  -D P_LORA_NSS=8
-  -D P_LORA_RESET=RADIOLIB_NC
-  -D P_LORA_BUSY=13
-  -D P_LORA_SCLK=9
-  -D P_LORA_MISO=11
-  -D P_LORA_MOSI=10
  -D RADIO_CLASS=CustomSX1262
  -D WRAPPER_CLASS=CustomSX1262Wrapper
  -D LORA_TX_POWER=22
  -D P_LORA_TX_LED=18
-  -D PIN_BOARD_SDA=17
-  -D PIN_BOARD_SCL=18
+  ; -D PIN_BOARD_SDA=17
+  ; -D PIN_BOARD_SCL=18
  -D PIN_USER_BTN=0
  -D PIN_VEXT_EN=45
  -D PIN_VBAT_READ=20
@@ -46,8 +38,8 @@ extends = Heltec_Wireless_Paper_base
 build_flags =
  ${Heltec_Wireless_Paper_base.build_flags}
  -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
+  -D MAX_CONTACTS=300
+  -D MAX_GROUP_CHANNELS=8
  -D DISPLAY_CLASS=E213Display
  -D BLE_PIN_CODE=123456   ; dynamic, random PIN
  -D BLE_DEBUG_LOGGING=1
--- a/variants/heltec_wireless_paper/target.h
+++ b/variants/heltec_wireless_paper/target.h
@@ -3,7 +3,7 @@
 #define RADIOLIB_STATIC_ONLY 1
 #include <RadioLib.h>
 #include <helpers/radiolib/RadioLibWrappers.h>
-#include <../heltec_v3/HeltecV3Board.h>
+#include <helpers/HeltecV3Board.h>
 #include <helpers/radiolib/CustomSX1262Wrapper.h>
 #include <helpers/AutoDiscoverRTCClock.h>
 #include <helpers/SensorManager.h>
--- a/variants/ikoka_handheld_nrf/IkokaNrf52Board.cpp
+++ b/variants/ikoka_handheld_nrf/IkokaNrf52Board.cpp
@@ -1,100 +0,0 @@
-#ifdef IKOKA_NRF52
-
-#include <Arduino.h>
-#include <Wire.h>
-#include <bluefruit.h>
-
-#include "IkokaNrf52Board.h"
-
-static BLEDfu bledfu;
-
-static void connect_callback(uint16_t conn_handle) {
-  (void)conn_handle;
-  MESH_DEBUG_PRINTLN("BLE client connected");
-}
-
-static void disconnect_callback(uint16_t conn_handle, uint8_t reason) {
-  (void)conn_handle;
-  (void)reason;
-
-  MESH_DEBUG_PRINTLN("BLE client disconnected");
-}
-
-void IkokaNrf52Board::begin() {
-  // for future use, sub-classes SHOULD call this from their begin()
-  startup_reason = BD_STARTUP_NORMAL;
-
-  // ensure we have pull ups on the screen i2c, this isn't always available
-  // in hardware and it should only be 20k ohms. Disable the pullups if we
-  // are using the rotated lcd breakout board
-  #if defined(DISPLAY_CLASS) && DISPLAY_ROTATION == 0
-    pinMode(PIN_WIRE_SDA, INPUT_PULLUP);
-    pinMode(PIN_WIRE_SCL, INPUT_PULLUP);
-  #endif
-
-  pinMode(PIN_VBAT, INPUT);
-  pinMode(VBAT_ENABLE, OUTPUT);
-  digitalWrite(VBAT_ENABLE, HIGH);
-
-  // required button pullup is handled as part of button initilization
-  // in target.cpp
-
-#if defined(PIN_WIRE_SDA) && defined(PIN_WIRE_SCL)
-  Wire.setPins(PIN_WIRE_SDA, PIN_WIRE_SCL);
-#endif
-
-  Wire.begin();
-
-#ifdef P_LORA_TX_LED
-  pinMode(P_LORA_TX_LED, OUTPUT);
-  digitalWrite(P_LORA_TX_LED, HIGH);
-#endif
-
-  delay(10); // give sx1262 some time to power up
-}
-
-bool IkokaNrf52Board::startOTAUpdate(const char *id, char reply[]) {
-  // Config the peripheral connection with maximum bandwidth
-  // more SRAM required by SoftDevice
-  // Note: All config***() function must be called before begin()
-  Bluefruit.configPrphBandwidth(BANDWIDTH_MAX);
-  Bluefruit.configPrphConn(92, BLE_GAP_EVENT_LENGTH_MIN, 16, 16);
-
-  Bluefruit.begin(1, 0);
-  // Set max power. Accepted values are: -40, -30, -20, -16, -12, -8, -4, 0, 4
-  Bluefruit.setTxPower(4);
-  // Set the BLE device name
-  Bluefruit.setName("XIAO_NRF52_OTA");
-
-  Bluefruit.Periph.setConnectCallback(connect_callback);
-  Bluefruit.Periph.setDisconnectCallback(disconnect_callback);
-
-  // To be consistent OTA DFU should be added first if it exists
-  bledfu.begin();
-
-  // Set up and start advertising
-  // Advertising packet
-  Bluefruit.Advertising.addFlags(BLE_GAP_ADV_FLAGS_LE_ONLY_GENERAL_DISC_MODE);
-  Bluefruit.Advertising.addTxPower();
-  Bluefruit.Advertising.addName();
-
-  /* Start Advertising
-    - Enable auto advertising if disconnected
-    - Interval:  fast mode = 20 ms, slow mode = 152.5 ms
-    - Timeout for fast mode is 30 seconds
-    - Start(timeout) with timeout = 0 will advertise forever (until connected)
-
-    For recommended advertising interval
-    https://developer.apple.com/library/content/qa/qa1931/_index.html
-  */
-  Bluefruit.Advertising.restartOnDisconnect(true);
-  Bluefruit.Advertising.setInterval(32, 244); // in unit of 0.625 ms
-  Bluefruit.Advertising.setFastTimeout(30);   // number of seconds in fast mode
-  Bluefruit.Advertising.start(0);             // 0 = Don't stop advertising after n seconds
-
-  strcpy(reply, "OK - started");
-
-  return true;
-}
-
-#endif
--- a/variants/ikoka_handheld_nrf/IkokaNrf52Board.h
+++ b/variants/ikoka_handheld_nrf/IkokaNrf52Board.h
@@ -1,52 +0,0 @@
-#pragma once
-
-#include <MeshCore.h>
-#include <Arduino.h>
-
-#ifdef IKOKA_NRF52
-
-class IkokaNrf52Board : public mesh::MainBoard {
-protected:
-  uint8_t startup_reason;
-
-public:
-  void begin();
-  uint8_t getStartupReason() const override { return startup_reason; }
-
-#if defined(P_LORA_TX_LED)
-  void onBeforeTransmit() override {
-    digitalWrite(P_LORA_TX_LED, LOW);   // turn TX LED on
-  }
-  void onAfterTransmit() override {
-    digitalWrite(P_LORA_TX_LED, HIGH);   // turn TX LED off
-  }
-#endif
-
-  uint16_t getBattMilliVolts() override {
-    // Please read befor going further ;)
-    // https://wiki.seeedstudio.com/XIAO_BLE#q3-what-are-the-considerations-when-using-xiao-nrf52840-sense-for-battery-charging
-
-    // We can't drive VBAT_ENABLE to HIGH as long
-    // as we don't know wether we are charging or not ...
-    // this is a 3mA loss (4/1500)
-    digitalWrite(VBAT_ENABLE, LOW);
-    int adcvalue = 0;
-    analogReadResolution(12);
-    analogReference(AR_INTERNAL_3_0);
-    delay(10);
-    adcvalue = analogRead(PIN_VBAT);
-    return (adcvalue * ADC_MULTIPLIER * AREF_VOLTAGE) / 4.096;
-  }
-
-  const char* getManufacturerName() const override {
-    return "Ikoka Handheld E22 30dBm (Xiao_nrf52)";
-  }
-
-  void reboot() override {
-    NVIC_SystemReset();
-  }
-
-  bool startOTAUpdate(const char* id, char reply[]) override;
-};
-
-#endif
--- a/variants/ikoka_handheld_nrf/platformio.ini
+++ b/variants/ikoka_handheld_nrf/platformio.ini
@@ -1,103 +0,0 @@
-[ikoka_nrf52]
-extends = Xiao_nrf52
-lib_deps = ${nrf52_base.lib_deps}
-  ${sensor_base.lib_deps}
-  densaugeo/base64 @ ~1.4.0  
-build_flags = ${nrf52_base.build_flags}
-  ${sensor_base.build_flags}
-  -I lib/nrf52/s140_nrf52_7.3.0_API/include
-  -I lib/nrf52/s140_nrf52_7.3.0_API/include/nrf52
-  -I variants/ikoka_handheld_nrf
-  -UENV_INCLUDE_GPS
-  -D IKOKA_NRF52
-  -D RADIO_CLASS=CustomSX1262
-  -D WRAPPER_CLASS=CustomSX1262Wrapper
-  -D P_LORA_TX_LED=11
-  -D P_LORA_DIO_1=D1
-  -D P_LORA_RESET=D2
-  -D P_LORA_BUSY=D3
-  -D P_LORA_NSS=D4
-  -D SX126X_RXEN=D5
-  -D SX126X_TXEN=RADIOLIB_NC
-  -D SX126X_DIO2_AS_RF_SWITCH=1
-  -D SX126X_DIO3_TCXO_VOLTAGE=1.8
-  -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
-build_src_filter = ${nrf52_base.build_src_filter}
-  +<../variants/ikoka_handheld_nrf>
-  +<helpers/sensors>
-
-# larger screen has a different driver, this is for the 0.96 inch
-[ikoka_nrf52_ssd1306_companion]
-lib_deps = ${ikoka_nrf52.lib_deps}
-  adafruit/Adafruit SSD1306 @ ^2.5.13
-build_flags = ${ikoka_nrf52.build_flags}
-  -D DISPLAY_CLASS=SSD1306Display
-  -D DISPLAY_ROTATION=0
-  -D PIN_WIRE_SCL=D6
-  -D PIN_WIRE_SDA=D7
-  -D PIN_USER_BTN=D0
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
-  -D OFFLINE_QUEUE_SIZE=256
-  -D QSPIFLASH=1
-  -I examples/companion_radio/ui-new
-build_src_filter = ${ikoka_nrf52.build_src_filter}
-  +<helpers/ui/SSD1306Display.cpp>
-  +<../examples/companion_radio/ui-new/UITask.cpp>
-  +<../examples/companion_radio/*.cpp>
-
-[env:ikoka_handheld_nrf_e22_30dbm_096_companion_radio_ble]
-extends = ikoka_nrf52
-build_flags = ${ikoka_nrf52_ssd1306_companion.build_flags}
-  -D BLE_PIN_CODE=123456
-  -D LORA_TX_POWER=20
-build_src_filter = ${ikoka_nrf52_ssd1306_companion.build_src_filter}
-  +<helpers/nrf52/SerialBLEInterface.cpp>
-
-[env:ikoka_handheld_nrf_e22_30dbm_096_rotated_companion_radio_ble]
-extends = ikoka_nrf52
-build_flags = ${ikoka_nrf52_ssd1306_companion.build_flags}
-  -D BLE_PIN_CODE=123456
-  -D LORA_TX_POWER=20
-  -D DISPLAY_ROTATION=2    
-build_src_filter = ${ikoka_nrf52_ssd1306_companion.build_src_filter}
-  +<helpers/nrf52/SerialBLEInterface.cpp>
-
-[env:ikoka_handheld_nrf_e22_30dbm_096_companion_radio_usb]
-extends = ikoka_nrf52
-build_flags = ${ikoka_nrf52_ssd1306_companion.build_flags}
-  -D LORA_TX_POWER=20
-build_src_filter = ${ikoka_nrf52_ssd1306_companion.build_src_filter}
-
-[env:ikoka_handheld_nrf_e22_30dbm_096_rotated_companion_radio_usb]
-extends = ikoka_nrf52
-build_flags = ${ikoka_nrf52_ssd1306_companion.build_flags}
-  -D LORA_TX_POWER=20
-  -D DISPLAY_ROTATION=2
-build_src_filter = ${ikoka_nrf52_ssd1306_companion.build_src_filter}
-
-[env:ikoka_handheld_nrf_e22_30dbm_repeater]
-extends = ikoka_nrf52
-build_flags =
-  ${ikoka_nrf52.build_flags}
-  -D ADVERT_NAME='"ikoka_handheld Repeater"'
-  -D ADVERT_LAT=0.0
-  -D ADVERT_LON=0.0
-  -D ADMIN_PASSWORD='"password"'
-  -D MAX_NEIGHBOURS=50
-  -D LORA_TX_POWER=20  
-build_src_filter = ${ikoka_nrf52.build_src_filter}
-  +<../examples/simple_repeater/*.cpp>
-
-[env:ikoka_handheld_nrf_e22_30dbm_room_server]
-extends = ikoka_nrf52
-build_flags =
-  ${ikoka_nrf52.build_flags}
-  -D ADVERT_NAME='"ikoka_handheld Room"'
-  -D ADVERT_LAT=0.0
-  -D ADVERT_LON=0.0
-  -D ADMIN_PASSWORD='"password"'
-  -D LORA_TX_POWER=20  
-build_src_filter = ${ikoka_nrf52.build_src_filter}
-  +<../examples/simple_room_server/*.cpp>
--- a/variants/ikoka_handheld_nrf/target.cpp
+++ b/variants/ikoka_handheld_nrf/target.cpp
@@ -1,46 +0,0 @@
-#include <Arduino.h>
-#include "target.h"
-#include <helpers/ArduinoHelpers.h>
-
-IkokaNrf52Board board;
-
-RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY, SPI);
-
-WRAPPER_CLASS radio_driver(radio, board);
-
-VolatileRTCClock fallback_clock;
-AutoDiscoverRTCClock rtc_clock(fallback_clock);
-
-EnvironmentSensorManager sensors;
-
-#ifdef DISPLAY_CLASS
-  DISPLAY_CLASS display;
-  MomentaryButton user_btn(PIN_USER_BTN, 1000, true, true);
-#endif
-
-
-bool radio_init() {
-  rtc_clock.begin(Wire);
-
-  return radio.std_init(&SPI);
-}
-
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(uint8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
-mesh::LocalIdentity radio_new_identity() {
-  RadioNoiseListener rng(radio);
-  return mesh::LocalIdentity(&rng); // create new random identity
-}
--- a/variants/ikoka_handheld_nrf/target.h
+++ b/variants/ikoka_handheld_nrf/target.h
@@ -1,29 +0,0 @@
-#pragma once
-
-#define RADIOLIB_STATIC_ONLY 1
-#include <RadioLib.h>
-#include <helpers/radiolib/RadioLibWrappers.h>
-#include <IkokaNrf52Board.h>
-#include <helpers/radiolib/CustomSX1262Wrapper.h>
-#include <helpers/AutoDiscoverRTCClock.h>
-#include <helpers/ArduinoHelpers.h>
-#include <helpers/sensors/EnvironmentSensorManager.h>
-
-#ifdef DISPLAY_CLASS
-  #include <helpers/ui/SSD1306Display.h>
-  #include <helpers/ui/MomentaryButton.h>
-  extern DISPLAY_CLASS display;
-  extern MomentaryButton user_btn;
-#endif
-
-
-extern IkokaNrf52Board board;
-extern WRAPPER_CLASS radio_driver;
-extern AutoDiscoverRTCClock rtc_clock;
-extern EnvironmentSensorManager sensors;
-
-bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(uint8_t dbm);
-mesh::LocalIdentity radio_new_identity();
--- a/variants/ikoka_handheld_nrf/variant.cpp
+++ b/variants/ikoka_handheld_nrf/variant.cpp
@@ -1,84 +0,0 @@
-#include "variant.h"
-
-#include "nrf.h"
-#include "wiring_constants.h"
-#include "wiring_digital.h"
-
-const uint32_t g_ADigitalPinMap[] = {
-  // D0 .. D10
-  2,  // D0  is P0.02 (A0)
-  3,  // D1  is P0.03 (A1)
-  28, // D2  is P0.28 (A2)
-  29, // D3  is P0.29 (A3)
-  4,  // D4  is P0.04 (A4,SDA)
-  5,  // D5  is P0.05 (A5,SCL)
-  43, // D6  is P1.11 (TX)
-  44, // D7  is P1.12 (RX)
-  45, // D8  is P1.13 (SCK)
-  46, // D9  is P1.14 (MISO)
-  47, // D10 is P1.15 (MOSI)
-
-  // LEDs
-  26, // D11 is P0.26 (LED RED)
-  6,  // D12 is P0.06 (LED BLUE)
-  30, // D13 is P0.30 (LED GREEN)
-  14, // D14 is P0.14 (READ_BAT)
-
-  // LSM6DS3TR
-  40, // D15 is P1.08 (6D_PWR)
-  27, // D16 is P0.27 (6D_I2C_SCL)
-  7,  // D17 is P0.07 (6D_I2C_SDA)
-  11, // D18 is P0.11 (6D_INT1)
-
-  // MIC
-  42, // D19 is P1.10 (MIC_PWR)
-  32, // D20 is P1.00 (PDM_CLK)
-  16, // D21 is P0.16 (PDM_DATA)
-
-  // BQ25100
-  13, // D22 is P0.13 (HICHG)
-  17, // D23 is P0.17 (~CHG)
-
-  //
-  21, // D24 is P0.21 (QSPI_SCK)
-  25, // D25 is P0.25 (QSPI_CSN)
-  20, // D26 is P0.20 (QSPI_SIO_0 DI)
-  24, // D27 is P0.24 (QSPI_SIO_1 DO)
-  22, // D28 is P0.22 (QSPI_SIO_2 WP)
-  23, // D29 is P0.23 (QSPI_SIO_3 HOLD)
-
-  // NFC
-  9,  // D30 is P0.09 (NFC1)
-  10, // D31 is P0.10 (NFC2)
-
-  // VBAT
-  31, // D32 is P0.31 (VBAT)
-};
-
-void initVariant() {
-  // Disable reading of the BAT voltage.
-  // https://wiki.seeedstudio.com/XIAO_BLE#q3-what-are-the-considerations-when-using-xiao-nrf52840-sense-for-battery-charging
-  pinMode(VBAT_ENABLE, OUTPUT);
-  // digitalWrite(VBAT_ENABLE, HIGH);
-  //  This was taken from Seeed github butis not coherent with the doc,
-  //  VBAT_ENABLE should be kept to LOW to protect P0.14, (1500/500)*(4.2-3.3)+3.3 = 3.9V > 3.6V
-  //  This induces a 3mA current in the resistors :( but it's better than burning the nrf
-  digitalWrite(VBAT_ENABLE, LOW);
-
-  // disable xiao charging current, the handheld uses a tp4056 to charge
-  // instead of the onboard xiao charging circuit. This charges at a max of
-  // 780ma instead of 100ma. In theory you could enable both, but in practice
-  // fire is scary.
-  pinMode(PIN_CHARGING_CURRENT, OUTPUT);
-  digitalWrite(PIN_CHARGING_CURRENT, HIGH);
-
-  pinMode(PIN_QSPI_CS, OUTPUT);
-  digitalWrite(PIN_QSPI_CS, HIGH);
-
-  pinMode(LED_RED, OUTPUT);
-  digitalWrite(LED_RED, HIGH);
-  pinMode(LED_GREEN, OUTPUT);
-  digitalWrite(LED_GREEN, HIGH);
-  pinMode(LED_BLUE, OUTPUT);
-  digitalWrite(LED_BLUE, HIGH);
-}
--- a/variants/ikoka_handheld_nrf/variant.h
+++ b/variants/ikoka_handheld_nrf/variant.h
@@ -1,148 +0,0 @@
-#ifndef _SEEED_XIAO_NRF52840_H_
-#define _SEEED_XIAO_NRF52840_H_
-
-/** Master clock frequency */
-#define VARIANT_MCK       (64000000ul)
-
-#define USE_LFXO      // Board uses 32khz crystal for LF
-//#define USE_LFRC    // Board uses RC for LF
-
-/*----------------------------------------------------------------------------
- *        Headers
- *----------------------------------------------------------------------------*/
-
-#include "WVariant.h"
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif // __cplusplus
-
-#define PINS_COUNT              (33)
-#define NUM_DIGITAL_PINS        (33)
-#define NUM_ANALOG_INPUTS       (8)
-#define NUM_ANALOG_OUTPUTS      (0)
-
-// LEDs
-#define PIN_LED                 (LED_RED)
-#define LED_PWR                 (PINS_COUNT)
-#define PIN_NEOPIXEL            (PINS_COUNT)
-#define NEOPIXEL_NUM            (0)
-
-#define LED_BUILTIN             (PIN_LED)
-
-#define LED_RED                 (11)
-#define LED_GREEN               (13)
-#define LED_BLUE                (12)
-
-#define LED_STATE_ON            (1)     // State when LED is litted
-
-// Buttons
-#define PIN_BUTTON1             (PINS_COUNT)
-
-// Digital PINs
-static const uint8_t D0  = 0 ;
-static const uint8_t D1  = 1 ;
-static const uint8_t D2  = 2 ;
-static const uint8_t D3  = 3 ;
-static const uint8_t D4  = 4 ;
-static const uint8_t D5  = 5 ;
-static const uint8_t D6  = 6 ;
-static const uint8_t D7  = 7 ;
-static const uint8_t D8  = 8 ;
-static const uint8_t D9  = 9 ;
-static const uint8_t D10 = 10;
-
-#define VBAT_ENABLE             (14)    // Output LOW to enable reading of the BAT voltage.
-                                        // https://wiki.seeedstudio.com/XIAO_BLE#q3-what-are-the-considerations-when-using-xiao-nrf52840-sense-for-battery-charging
-
-#define PIN_CHARGING_CURRENT    (22)    // Battery Charging current
-                                        // https://wiki.seedstudio.com/XIAO_BLE#battery-charging-current
-// Analog pins
-#define PIN_A0                  (0)
-#define PIN_A1                  (1)
-#define PIN_A2                  (2)
-#define PIN_A3                  (3)
-#define PIN_A4                  (4)
-#define PIN_A5                  (5)
-#define PIN_VBAT                (32)    // Read the BAT voltage.
-                                        // https://wiki.seeedstudio.com/XIAO_BLE#q3-what-are-the-considerations-when-using-xiao-nrf52840-sense-for-battery-charging
-
-#define BAT_NOT_CHARGING        (23)    // LOW when charging
-
-#define AREF_VOLTAGE            (3.0)
-#define ADC_MULTIPLIER          (3.0F) // 1M, 512k divider bridge
-
-static const uint8_t A0  = PIN_A0;
-static const uint8_t A1  = PIN_A1;
-static const uint8_t A2  = PIN_A2;
-static const uint8_t A3  = PIN_A3;
-static const uint8_t A4  = PIN_A4;
-static const uint8_t A5  = PIN_A5;
-
-#define ADC_RESOLUTION          (12)
-
-// Other pins
-#define PIN_NFC1                (30)
-#define PIN_NFC2                (31)
-
-// Serial interfaces
-#define PIN_SERIAL1_RX          (7)
-#define PIN_SERIAL1_TX          (6)
-
-// SPI Interfaces
-#define SPI_INTERFACES_COUNT    (2)
-
-#define PIN_SPI_MISO            (9)
-#define PIN_SPI_MOSI            (10)
-#define PIN_SPI_SCK             (8)
-
-#define PIN_SPI1_MISO           (25)
-#define PIN_SPI1_MOSI           (26)
-#define PIN_SPI1_SCK            (29)
-
-// Lora SPI is on SPI0
-#define  P_LORA_SCLK            PIN_SPI_SCK
-#define  P_LORA_MISO            PIN_SPI_MISO
-#define  P_LORA_MOSI            PIN_SPI_MOSI
-
-// Wire Interfaces
-#define WIRE_INTERFACES_COUNT   (1)
-
-#define PIN_WIRE_SDA            (6) // 4 and 5 are used for the sx1262 !
-#define PIN_WIRE_SCL            (7) // use WIRE1_SDA
-
-static const uint8_t SDA = (6);
-static const uint8_t SCL = (7);
-
-//#define PIN_WIRE1_SDA           (17)
-//#define PIN_WIRE1_SCL           (16)
-#define PIN_LSM6DS3TR_C_POWER   (15)
-#define PIN_LSM6DS3TR_C_INT1    (18)
-
-// PDM Interfaces
-#define PIN_PDM_PWR	            (19)
-#define PIN_PDM_CLK	            (20)
-#define PIN_PDM_DIN	            (21)
-
-// QSPI Pins
-#define PIN_QSPI_SCK            (24)
-#define PIN_QSPI_CS             (25)
-#define PIN_QSPI_IO0            (26)
-#define PIN_QSPI_IO1            (27)
-#define PIN_QSPI_IO2            (28)
-#define PIN_QSPI_IO3            (29)
-
-// On-board QSPI Flash
-#define EXTERNAL_FLASH_DEVICES  (P25Q16H)
-#define EXTERNAL_FLASH_USE_QSPI
-
-#ifdef __cplusplus
-}
-#endif
-
-/*----------------------------------------------------------------------------
- *        Arduino objects - C++ only
- *----------------------------------------------------------------------------*/
-
-#endif
--- a/variants/keepteen_lt1/KeepteenLT1Board.cpp
+++ b/variants/keepteen_lt1/KeepteenLT1Board.cpp
@@ -1,75 +0,0 @@
-#include <Arduino.h>
-#include "KeepteenLT1Board.h"
-
-#include <bluefruit.h>
-#include <Wire.h>
-
-static BLEDfu bledfu;
-
-void KeepteenLT1Board::begin() {    
-    // for future use, sub-classes SHOULD call this from their begin()
-    startup_reason = BD_STARTUP_NORMAL;
-    btn_prev_state = HIGH;
-  
-    pinMode(PIN_VBAT_READ, INPUT);
-
-    #if defined(PIN_BOARD_SDA) && defined(PIN_BOARD_SCL)
-      Wire.setPins(PIN_BOARD_SDA, PIN_BOARD_SCL);
-    #endif
-    
-    Wire.begin();
-}
-
-static void connect_callback(uint16_t conn_handle) {
-    (void)conn_handle;
-    MESH_DEBUG_PRINTLN("BLE client connected");
-}
-
-static void disconnect_callback(uint16_t conn_handle, uint8_t reason) {
-    (void)conn_handle;
-    (void)reason;
-    MESH_DEBUG_PRINTLN("BLE client disconnected");
-}
-
-bool KeepteenLT1Board::startOTAUpdate(const char* id, char reply[]) {
-  // Config the peripheral connection with maximum bandwidth
-  // more SRAM required by SoftDevice
-  // Note: All config***() function must be called before begin()
-  Bluefruit.configPrphBandwidth(BANDWIDTH_MAX);
-  Bluefruit.configPrphConn(92, BLE_GAP_EVENT_LENGTH_MIN, 16, 16);
-
-  Bluefruit.begin(1, 0);
-  // Set max power. Accepted values are: -40, -30, -20, -16, -12, -8, -4, 0, 4
-  Bluefruit.setTxPower(4);
-  // Set the BLE device name
-  Bluefruit.setName("KeepteenLT1_OTA");
-
-  Bluefruit.Periph.setConnectCallback(connect_callback);
-  Bluefruit.Periph.setDisconnectCallback(disconnect_callback);
-
-  // To be consistent OTA DFU should be added first if it exists
-  bledfu.begin();
-
-  // Set up and start advertising
-  // Advertising packet
-  Bluefruit.Advertising.addFlags(BLE_GAP_ADV_FLAGS_LE_ONLY_GENERAL_DISC_MODE);
-  Bluefruit.Advertising.addTxPower();
-  Bluefruit.Advertising.addName();
-
-  /* Start Advertising
-    - Enable auto advertising if disconnected
-    - Interval:  fast mode = 20 ms, slow mode = 152.5 ms
-    - Timeout for fast mode is 30 seconds
-    - Start(timeout) with timeout = 0 will advertise forever (until connected)
-
-    For recommended advertising interval
-    https://developer.apple.com/library/content/qa/qa1931/_index.html
-  */
-  Bluefruit.Advertising.restartOnDisconnect(true);
-  Bluefruit.Advertising.setInterval(32, 244); // in unit of 0.625 ms
-  Bluefruit.Advertising.setFastTimeout(30);   // number of seconds in fast mode
-  Bluefruit.Advertising.start(0);             // 0 = Don't stop advertising after n seconds
-
-  strcpy(reply, "OK - started");
-  return true;
-}
--- a/variants/keepteen_lt1/KeepteenLT1Board.h
+++ b/variants/keepteen_lt1/KeepteenLT1Board.h
@@ -1,51 +0,0 @@
-#pragma once
-
-#include <MeshCore.h>
-#include <Arduino.h>
-
-class KeepteenLT1Board : public mesh::MainBoard {
-protected:
-  uint8_t startup_reason;
-  uint8_t btn_prev_state;
-
-public:
-  void begin();
-
-  uint8_t getStartupReason() const override { return startup_reason; }
-
-  #define BATTERY_SAMPLES 8
-
-  uint16_t getBattMilliVolts() override {
-    analogReadResolution(12);
-
-    uint32_t raw = 0;
-    for (int i = 0; i < BATTERY_SAMPLES; i++) {
-      raw += analogRead(PIN_VBAT_READ);
-    }
-    raw = raw / BATTERY_SAMPLES;
-    return (ADC_MULTIPLIER * raw);
-  }
-
-  const char* getManufacturerName() const override {
-    return "Keepteen LT1";
-  }
-
-#if defined(P_LORA_TX_LED)
-  void onBeforeTransmit() override {
-    digitalWrite(P_LORA_TX_LED, HIGH);   // turn TX LED on
-  }
-  void onAfterTransmit() override {
-    digitalWrite(P_LORA_TX_LED, LOW);   // turn TX LED off
-  }
-#endif
-
-  void reboot() override {
-    NVIC_SystemReset();
-  }
-  
-  void powerOff() override {
-    sd_power_system_off();
-  }
-
-  bool startOTAUpdate(const char* id, char reply[]) override;
-};
--- a/variants/keepteen_lt1/platformio.ini
+++ b/variants/keepteen_lt1/platformio.ini
@@ -1,101 +0,0 @@
-[KeepteenLT1]
-extends = nrf52_base
-board = keepteen_lt1
-build_flags = ${nrf52_base.build_flags}
-  -I variants/keepteen_lt1
-  -D KEEPTEEN_LT1
-  -D RADIO_CLASS=CustomSX1262
-  -D WRAPPER_CLASS=CustomSX1262Wrapper
-  -D LORA_TX_POWER=22
-  -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
-  -D PIN_BOARD_SDA=34
-  -D PIN_BOARD_SCL=36
-  -D ENV_INCLUDE_GPS=1
-build_src_filter = ${nrf52_base.build_src_filter}
-  +<helpers/sensors>
-  +<../variants/keepteen_lt1>
-lib_deps= ${nrf52_base.lib_deps}
-	adafruit/Adafruit SSD1306 @ ^2.5.13
-  stevemarple/MicroNMEA @ ^2.0.6
-
-[env:KeepteenLT1_repeater]
-extends = KeepteenLT1
-build_src_filter = ${KeepteenLT1.build_src_filter}
-  +<../examples/simple_repeater>
-  +<helpers/ui/SSD1306Display.cpp>
-  +<helpers/ui/MomentaryButton.cpp>
-build_flags =
-  ${KeepteenLT1.build_flags}
-  -D ADVERT_NAME='"KeepteenLT1 Repeater"'
-  -D ADVERT_LAT=0.0
-  -D ADVERT_LON=0.0
-  -D ADMIN_PASSWORD='"password"'
-  -D MAX_NEIGHBOURS=50
-  -D DISPLAY_CLASS=SSD1306Display
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
-lib_deps = ${KeepteenLT1.lib_deps}
-  adafruit/RTClib @ ^2.1.3
-
-[env:KeepteenLT1_room_server]
-extends = KeepteenLT1
-build_src_filter = ${KeepteenLT1.build_src_filter}
-  +<../examples/simple_room_server>
-  +<helpers/ui/SSD1306Display.cpp>
-  +<helpers/ui/MomentaryButton.cpp>
-build_flags = ${KeepteenLT1.build_flags}
-  -D ADVERT_NAME='"KeepteenLT1 Room"'
-  -D ADVERT_LAT=0.0
-  -D ADVERT_LON=0.0
-  -D ADMIN_PASSWORD='"password"'
-  -D ROOM_PASSWORD='"hello"'
-  -D DISPLAY_CLASS=SSD1306Display
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
-lib_deps = ${KeepteenLT1.lib_deps}
-  adafruit/RTClib @ ^2.1.3
-
-[env:KeepteenLT1_companion_radio_usb]
-extends = KeepteenLT1
-board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld
-board_upload.maximum_size = 712704
-build_flags = ${KeepteenLT1.build_flags}
-  -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
-  -D DISPLAY_CLASS=SSD1306Display
-; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
-; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
-build_src_filter = ${KeepteenLT1.build_src_filter}
-  +<helpers/ui/SSD1306Display.cpp>
-  +<helpers/ui/MomentaryButton.cpp>
-  +<../examples/companion_radio/*.cpp>
-  +<../examples/companion_radio/ui-new/*.cpp>
-lib_deps = ${KeepteenLT1.lib_deps}
-  adafruit/RTClib @ ^2.1.3
-  densaugeo/base64 @ ~1.4.0
-
-[env:KeepteenLT1_companion_radio_ble]
-extends = KeepteenLT1
-board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld
-board_upload.maximum_size = 712704
-build_flags = ${KeepteenLT1.build_flags}
-  -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
-  -D BLE_PIN_CODE=123456
-  -D BLE_DEBUG_LOGGING=1
-  -D OFFLINE_QUEUE_SIZE=256
-  -D DISPLAY_CLASS=SSD1306Display
-;  -D MESH_PACKET_LOGGING=1
-  -D MESH_DEBUG=1
-build_src_filter = ${KeepteenLT1.build_src_filter}
-  +<helpers/nrf52/SerialBLEInterface.cpp>
-  +<helpers/ui/SSD1306Display.cpp>
-  +<helpers/ui/MomentaryButton.cpp>
-  +<../examples/companion_radio/*.cpp>
-  +<../examples/companion_radio/ui-new/*.cpp>
-lib_deps = ${KeepteenLT1.lib_deps}
-  adafruit/RTClib @ ^2.1.3
-  densaugeo/base64 @ ~1.4.0
--- a/variants/keepteen_lt1/target.cpp
+++ b/variants/keepteen_lt1/target.cpp
@@ -1,51 +0,0 @@
-#include <Arduino.h>
-#include "target.h"
-#include <helpers/ArduinoHelpers.h>
-
-KeepteenLT1Board board;
-
-RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY, SPI);
-
-WRAPPER_CLASS radio_driver(radio, board);
-
-VolatileRTCClock fallback_clock;
-AutoDiscoverRTCClock rtc_clock(fallback_clock);
-#if ENV_INCLUDE_GPS
-  #include <helpers/sensors/MicroNMEALocationProvider.h>
-  MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1);
-  EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea);
-#else
-  EnvironmentSensorManager sensors;
-#endif
-
-#ifdef DISPLAY_CLASS
-  DISPLAY_CLASS display;
-  MomentaryButton user_btn(PIN_USER_BTN, 1000, true, true);
-#endif
-
-bool radio_init() {
-  rtc_clock.begin(Wire);
-  
-  return radio.std_init(&SPI);
-}
-
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(uint8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
-mesh::LocalIdentity radio_new_identity() {
-  RadioNoiseListener rng(radio);
-  return mesh::LocalIdentity(&rng);  // create new random identity
-}
-
--- a/variants/keepteen_lt1/target.h
+++ b/variants/keepteen_lt1/target.h
@@ -1,30 +0,0 @@
-#pragma once
-
-#define RADIOLIB_STATIC_ONLY 1
-#include <RadioLib.h>
-#include <helpers/radiolib/RadioLibWrappers.h>
-#include <KeepteenLT1Board.h>
-#include <helpers/radiolib/CustomSX1262Wrapper.h>
-#include <helpers/AutoDiscoverRTCClock.h>
-#ifdef DISPLAY_CLASS
-  #include <helpers/ui/SSD1306Display.h>
-  #include <helpers/ui/MomentaryButton.h>
-#endif
-
-#include <helpers/sensors/EnvironmentSensorManager.h>
-
-extern KeepteenLT1Board board;
-extern WRAPPER_CLASS radio_driver;
-extern AutoDiscoverRTCClock rtc_clock;
-extern EnvironmentSensorManager sensors;
-
-#ifdef DISPLAY_CLASS
-  extern DISPLAY_CLASS display;
-  extern MomentaryButton user_btn;
-#endif
-
-bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(uint8_t dbm);
-mesh::LocalIdentity radio_new_identity();
--- a/variants/keepteen_lt1/variant.cpp
+++ b/variants/keepteen_lt1/variant.cpp
@@ -1,22 +0,0 @@
-#include "variant.h"
-#include "wiring_constants.h"
-#include "wiring_digital.h"
-
-const uint32_t g_ADigitalPinMap[] = {
-  0xff, 0xff, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
-  14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
-  27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
-  40, 41, 42, 43, 44, 45, 46, 47
-};
-
-void initVariant()
-{
-    // set LED pin as output and set it low for off
-    pinMode(PIN_LED, OUTPUT);
-    digitalWrite(PIN_LED, LOW);
-
-    // set INPUT_PULLUP for user button
-    pinMode(PIN_USER_BTN, INPUT_PULLUP);
-    
-}
-
--- a/variants/keepteen_lt1/variant.h
+++ b/variants/keepteen_lt1/variant.h
@@ -1,74 +0,0 @@
-#ifndef _KEEPTEEN_LT1_H_
-#define _KEEPTEEN_LT1_H_
-
-/** Master clock frequency */
-#define VARIANT_MCK             (64000000ul)
-#define USE_LFRC
-
-/*----------------------------------------------------------------------------
- *        Headers
- *----------------------------------------------------------------------------*/
-
-#include "WVariant.h"
-
-#define PINS_COUNT              (48)
-#define NUM_DIGITAL_PINS        (48)
-#define NUM_ANALOG_INPUTS       (1)
-#define NUM_ANALOG_OUTPUTS      (0)
-
-// LEDs
-#define PIN_LED                 (15) // Blue LED
-#define PIN_LED2                (13) // Maybe red power LED?
-#define LED_BLUE                (-1) // Disable annoying flashing caused by Bluefruit
-#define LED_BUILTIN             PIN_LED
-#define P_LORA_TX_LED           PIN_LED
-#define LED_STATE_ON            1
-
-// Buttons
-#define PIN_BUTTON1             (32) // Menu / User Button
-#define PIN_USER_BTN            PIN_BUTTON1
-
-// Analog pins
-#define PIN_VBAT_READ           (31)
-#define AREF_VOLTAGE            (3.6F)
-#define ADC_MULTIPLIER          (1.535F)
-#define ADC_RESOLUTION          (12)
-
-// Serial interfaces
-#define PIN_SERIAL1_RX          (22)
-#define PIN_SERIAL1_TX          (20)
-
-// SPI Interfaces
-#define SPI_INTERFACES_COUNT    (1)
-
-#define PIN_SPI_MISO            (2)
-#define PIN_SPI_MOSI            (38)
-#define PIN_SPI_SCK             (43)
-
-// Lora Pins
-#define  P_LORA_BUSY            (29)
-#define  P_LORA_MISO            PIN_SPI_MISO
-#define  P_LORA_MOSI            PIN_SPI_MOSI
-#define  P_LORA_NSS             (45)
-#define  P_LORA_SCLK            PIN_SPI_SCK
-#define  P_LORA_DIO_1           (10)
-#define  P_LORA_RESET           (9)
-#define  SX126X_RXEN            RADIOLIB_NC
-#define  SX126X_TXEN            RADIOLIB_NC
-#define  SX126X_DIO2_AS_RF_SWITCH true
-#define  SX126X_DIO3_TCXO_VOLTAGE (1.8f)
-
-// Wire Interfaces
-#define WIRE_INTERFACES_COUNT   (1)
-
-#define PIN_WIRE_SDA            (34)
-#define PIN_WIRE_SCL            (36)
-#define I2C_NO_RESCAN
-
-// GPS L76KB
-#define GPS_BAUDRATE            9600
-#define PIN_GPS_TX              PIN_SERIAL1_RX
-#define PIN_GPS_RX              PIN_SERIAL1_TX
-#define PIN_GPS_EN              (24)
-
-#endif // _KEEPTEEN_LT1_H_
--- a/variants/lilygo_t3s3/platformio.ini
+++ b/variants/lilygo_t3s3/platformio.ini
@@ -102,7 +102,7 @@ lib_deps =
 extends = LilyGo_T3S3_sx1262
 build_flags =
  ${LilyGo_T3S3_sx1262.build_flags}
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=300
  -D MAX_GROUP_CHANNELS=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -137,8 +137,8 @@ build_flags =
  ${LilyGo_T3S3_sx1262.build_flags}
  -I examples/companion_radio/ui-new
  -D DISPLAY_CLASS=SSD1306Display
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
+  -D MAX_CONTACTS=300
+  -D MAX_GROUP_CHANNELS=8
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
 build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter}
@@ -156,8 +156,8 @@ build_flags =
  ${LilyGo_T3S3_sx1262.build_flags}
  -I examples/companion_radio/ui-new
  -D DISPLAY_CLASS=SSD1306Display
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
+  -D MAX_CONTACTS=300
+  -D MAX_GROUP_CHANNELS=8
  -D BLE_PIN_CODE=123456
  -D BLE_DEBUG_LOGGING=1
  -D OFFLINE_QUEUE_SIZE=256
--- a/variants/lilygo_t3s3_sx1276/platformio.ini
+++ b/variants/lilygo_t3s3_sx1276/platformio.ini
@@ -100,7 +100,7 @@ lib_deps =
 extends = LilyGo_T3S3_sx1276
 build_flags =
  ${LilyGo_T3S3_sx1276.build_flags}
-  -D MAX_CONTACTS=350
+  -D MAX_CONTACTS=300
  -D MAX_GROUP_CHANNELS=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -136,8 +136,8 @@ build_flags =
  ${LilyGo_T3S3_sx1276.build_flags}
  -I examples/companion_radio/ui-new
  -D DISPLAY_CLASS=SSD1306Display
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
+  -D MAX_CONTACTS=300
+  -D MAX_GROUP_CHANNELS=8
  -D MESH_PACKET_LOGGING=1
  -D MESH_DEBUG=1
 build_src_filter = ${LilyGo_T3S3_sx1276.build_src_filter}
@@ -155,8 +155,8 @@ build_flags =
  ${LilyGo_T3S3_sx1276.build_flags}
  -I examples/companion_radio/ui-new
  -D DISPLAY_CLASS=SSD1306Display
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
+  -D MAX_CONTACTS=300
+  -D MAX_GROUP_CHANNELS=8
  -D BLE_PIN_CODE=123456
  -D BLE_DEBUG_LOGGING=1
  -D OFFLINE_QUEUE_SIZE=256
--- a/variants/lilygo_tbeam_supreme_SX1262/platformio.ini
+++ b/variants/lilygo_tbeam_supreme_SX1262/platformio.ini
@@ -116,8 +116,8 @@ extends = T_Beam_S3_Supreme_SX1262
 build_flags =
  ${T_Beam_S3_Supreme_SX1262.build_flags}
  -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
+  -D MAX_CONTACTS=300
+  -D MAX_GROUP_CHANNELS=8
  -D BLE_PIN_CODE=123456
  -D OFFLINE_QUEUE_SIZE=256
 ;  -D BLE_DEBUG_LOGGING=1
--- a/variants/lilygo_tlora_c6/platformio.ini
+++ b/variants/lilygo_tlora_c6/platformio.ini
@@ -30,7 +30,7 @@ build_flags =
 build_src_filter = ${esp32c6_base.build_src_filter}
  +<../variants/lilygo_tlora_c6>

-[env:LilyGo_Tlora_C6_repeater_]
+[env:LilyGo_Tlora_C6_repeater]
 extends = tlora_c6
 build_src_filter = ${tlora_c6.build_src_filter}
  +<../examples/simple_repeater/*.cpp>
@@ -47,7 +47,7 @@ lib_deps =
  ${tlora_c6.lib_deps}
 ;  ${esp32_ota.lib_deps}

-[env:LilyGo_Tlora_C6_room_server_]
+[env:LilyGo_Tlora_C6_room_server]
 extends = tlora_c6
 build_src_filter = ${tlora_c6.build_src_filter}
  +<../examples/simple_room_server>
@@ -64,11 +64,11 @@ lib_deps =
  ${tlora_c6.lib_deps}
 ;  ${esp32_ota.lib_deps}

-[env:LilyGo_Tlora_C6_companion_radio_ble_]
+[env:LilyGo_Tlora_C6_companion_radio_ble]
 extends = tlora_c6
 build_flags = ${tlora_c6.build_flags}
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
+  -D MAX_CONTACTS=300
+  -D MAX_GROUP_CHANNELS=8
  -D BLE_PIN_CODE=123456
  -D BLE_DEBUG_LOGGING=1
  -D OFFLINE_QUEUE_SIZE=256
--- a/variants/meshadventurer/platformio.ini
+++ b/variants/meshadventurer/platformio.ini
@@ -190,7 +190,7 @@ build_flags =
  -D WRAPPER_CLASS=CustomSX1262Wrapper
  -D LORA_TX_POWER=22
  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=40
+  -D MAX_GROUP_CHANNELS=8
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 lib_deps =
@@ -212,7 +212,7 @@ build_flags =
  -D WRAPPER_CLASS=CustomSX1262Wrapper
  -D LORA_TX_POWER=22
  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=40
+  -D MAX_GROUP_CHANNELS=8
  -D BLE_PIN_CODE=123456
  -D BLE_DEBUG_LOGGING=1
  -D OFFLINE_QUEUE_SIZE=256
@@ -275,7 +275,7 @@ build_flags =
  -D WRAPPER_CLASS=CustomSX1268Wrapper
  -D LORA_TX_POWER=22
  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=40
+  -D MAX_GROUP_CHANNELS=8
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 lib_deps =
@@ -297,7 +297,7 @@ build_flags =
  -D WRAPPER_CLASS=CustomSX1268Wrapper
  -D LORA_TX_POWER=22
  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=40
+  -D MAX_GROUP_CHANNELS=8
  -D BLE_PIN_CODE=123456
  -D BLE_DEBUG_LOGGING=1
  -D OFFLINE_QUEUE_SIZE=256
--- a/variants/promicro/PromicroBoard.h
+++ b/variants/promicro/PromicroBoard.h
@@ -23,7 +23,6 @@ class PromicroBoard : public mesh::MainBoard {
 protected:
  uint8_t startup_reason;
  uint8_t btn_prev_state;
-  float adc_mult = ADC_MULTIPLIER;

 public:
  void begin();
@@ -40,23 +39,7 @@ public:
      raw += analogRead(PIN_VBAT_READ);
    }
    raw = raw / BATTERY_SAMPLES;
-    return (adc_mult * raw);
-  }
-
-  bool setAdcMultiplier(float multiplier) override {
-    if (multiplier == 0.0f) {
-      adc_mult = ADC_MULTIPLIER;}
-    else {
-      adc_mult = multiplier;
-    }
-    return true;
-  }
-  float getAdcMultiplier() const override {
-    if (adc_mult == 0.0f) {
-      return ADC_MULTIPLIER;
-    } else {
-      return adc_mult;
-    }
+    return (ADC_MULTIPLIER * raw);
  }

  const char* getManufacturerName() const override {
--- a/variants/promicro/platformio.ini
+++ b/variants/promicro/platformio.ini
@@ -1,9 +1,9 @@
-[Promicro]
+[Faketec]
 extends = nrf52_base
 board = promicro_nrf52840
 build_flags = ${nrf52_base.build_flags}
  -I variants/promicro
-  -D PROMICRO
+  -D FAKETEC
  -D RADIO_CLASS=CustomSX1262
  -D WRAPPER_CLASS=CustomSX1262Wrapper
  -D LORA_TX_POWER=22
@@ -34,15 +34,15 @@ lib_deps= ${nrf52_base.lib_deps}
  adafruit/Adafruit BMP280 Library@^2.6.8
  stevemarple/MicroNMEA @ ^2.0.6

-[env:ProMicro_repeater]
-extends = Promicro
-build_src_filter = ${Promicro.build_src_filter}
+[env:Faketec_repeater]
+extends = Faketec
+build_src_filter = ${Faketec.build_src_filter}
  +<../examples/simple_repeater>
  +<helpers/ui/SSD1306Display.cpp>
  +<helpers/ui/MomentaryButton.cpp>
 build_flags =
-  ${Promicro.build_flags}
-  -D ADVERT_NAME='"ProMicro Repeater"'
+  ${Faketec.build_flags}
+  -D ADVERT_NAME='"Faketec Repeater"'
  -D ADVERT_LAT=0.0
  -D ADVERT_LON=0.0
  -D ADMIN_PASSWORD='"password"'
@@ -50,17 +50,17 @@ build_flags =
  -D DISPLAY_CLASS=SSD1306Display
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-lib_deps = ${Promicro.lib_deps}
+lib_deps = ${Faketec.lib_deps}
  adafruit/RTClib @ ^2.1.3

-[env:ProMicro_room_server]
-extends = Promicro
-build_src_filter = ${Promicro.build_src_filter}
+[env:Faketec_room_server]
+extends = Faketec
+build_src_filter = ${Faketec.build_src_filter}
  +<../examples/simple_room_server>
  +<helpers/ui/SSD1306Display.cpp>
  +<helpers/ui/MomentaryButton.cpp>
-build_flags = ${Promicro.build_flags}
-  -D ADVERT_NAME='"ProMicro Room"'
+build_flags = ${Faketec.build_flags}
+  -D ADVERT_NAME='"Faketec Room"'
  -D ADVERT_LAT=0.0
  -D ADVERT_LON=0.0
  -D ADMIN_PASSWORD='"password"'
@@ -68,47 +68,47 @@ build_flags = ${Promicro.build_flags}
  -D DISPLAY_CLASS=SSD1306Display
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-lib_deps = ${Promicro.lib_deps}
+lib_deps = ${Faketec.lib_deps}
  adafruit/RTClib @ ^2.1.3

-[env:ProMicro_terminal_chat]
-extends = Promicro
-build_flags = ${Promicro.build_flags}
+[env:Faketec_terminal_chat]
+extends = Faketec
+build_flags = ${Faketec.build_flags}
  -D MAX_CONTACTS=100
  -D MAX_GROUP_CHANNELS=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-build_src_filter = ${Promicro.build_src_filter}
+build_src_filter = ${Faketec.build_src_filter}
  +<../examples/simple_secure_chat/main.cpp>
-lib_deps = ${Promicro.lib_deps}
+lib_deps = ${Faketec.lib_deps}
  densaugeo/base64 @ ~1.4.0
  adafruit/RTClib @ ^2.1.3

-[env:ProMicro_companion_radio_usb]
-extends = Promicro
+[env:Faketec_companion_radio_usb]
+extends = Faketec
 board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld
 board_upload.maximum_size = 712704
-build_flags = ${Promicro.build_flags}
+build_flags = ${Faketec.build_flags}
  -I examples/companion_radio/ui-new
  -D MAX_CONTACTS=350
  -D MAX_GROUP_CHANNELS=40
  -D DISPLAY_CLASS=SSD1306Display
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
-build_src_filter = ${Promicro.build_src_filter}
+build_src_filter = ${Faketec.build_src_filter}
  +<helpers/ui/SSD1306Display.cpp>
  +<helpers/ui/MomentaryButton.cpp>
  +<../examples/companion_radio/*.cpp>
  +<../examples/companion_radio/ui-new/*.cpp>
-lib_deps = ${Promicro.lib_deps}
+lib_deps = ${Faketec.lib_deps}
  adafruit/RTClib @ ^2.1.3
  densaugeo/base64 @ ~1.4.0

-[env:ProMicro_companion_radio_ble]
-extends = Promicro
+[env:Faketec_companion_radio_ble]
+extends = Faketec
 board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld
 board_upload.maximum_size = 712704
-build_flags = ${Promicro.build_flags}
+build_flags = ${Faketec.build_flags}
  -I examples/companion_radio/ui-new
  -D MAX_CONTACTS=350
  -D MAX_GROUP_CHANNELS=40
@@ -118,30 +118,30 @@ build_flags = ${Promicro.build_flags}
  -D DISPLAY_CLASS=SSD1306Display
 ;  -D MESH_PACKET_LOGGING=1
  -D MESH_DEBUG=1
-build_src_filter = ${Promicro.build_src_filter}
+build_src_filter = ${Faketec.build_src_filter}
  +<helpers/nrf52/SerialBLEInterface.cpp>
  +<helpers/ui/SSD1306Display.cpp>
  +<helpers/ui/MomentaryButton.cpp>
  +<../examples/companion_radio/*.cpp>
  +<../examples/companion_radio/ui-new/*.cpp>
-lib_deps = ${Promicro.lib_deps}
+lib_deps = ${Faketec.lib_deps}
  adafruit/RTClib @ ^2.1.3
  densaugeo/base64 @ ~1.4.0

-[env:ProMicro_sensor]
-extends = Promicro
+[env:Faketec_sensor]
+extends = Faketec
 build_flags =
-  ${Promicro.build_flags}
-  -D ADVERT_NAME='"ProMicro Sensor"'
+  ${Faketec.build_flags}
+  -D ADVERT_NAME='"Faketec Sensor"'
  -D ADVERT_LAT=0.0
  -D ADVERT_LON=0.0
  -D ADMIN_PASSWORD='"password"'
  -D DISPLAY_CLASS=SSD1306Display
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-build_src_filter = ${Promicro.build_src_filter}
+build_src_filter = ${Faketec.build_src_filter}
  +<helpers/ui/SSD1306Display.cpp>
  +<helpers/ui/MomentaryButton.cpp>
  +<../examples/simple_sensor>
 lib_deps =
-  ${Promicro.lib_deps}
+  ${Faketec.lib_deps}
--- a/variants/rak4631/platformio.ini
+++ b/variants/rak4631/platformio.ini
@@ -9,8 +9,8 @@ build_flags = ${nrf52_base.build_flags}
  -D RAK_BOARD
  -D PIN_BOARD_SCL=14
  -D PIN_BOARD_SDA=13
-  -D PIN_GPS_TX=PIN_SERIAL1_RX
-  -D PIN_GPS_RX=PIN_SERIAL1_TX
+  -D PIN_GPS_TX=16
+  -D PIN_GPS_RX=15
  -D PIN_GPS_EN=-1
  -D PIN_OLED_RESET=-1
  -D RADIO_CLASS=CustomSX1262
@@ -45,51 +45,6 @@ build_src_filter = ${rak4631.build_src_filter}
  +<helpers/ui/SSD1306Display.cpp>
  +<../examples/simple_repeater>

-[env:RAK_4631_repeater_bridge_rs232_serial1]
-extends = rak4631
-build_flags =
-  ${rak4631.build_flags}
-  -D DISPLAY_CLASS=SSD1306Display
-  -D ADVERT_NAME='"RS232 Bridge"'
-  -D ADVERT_LAT=0.0
-  -D ADVERT_LON=0.0
-  -D ADMIN_PASSWORD='"password"'
-  -D MAX_NEIGHBOURS=50
-  -D WITH_RS232_BRIDGE=Serial1
-  -D WITH_RS232_BRIDGE_RX=PIN_SERIAL1_RX
-  -D WITH_RS232_BRIDGE_TX=PIN_SERIAL1_TX
-  -UENV_INCLUDE_GPS
-;  -D BRIDGE_DEBUG=1
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
-;  -D CORE_DEBUG_LEVEL=3
-build_src_filter = ${rak4631.build_src_filter}
-  +<helpers/ui/SSD1306Display.cpp>
-  +<helpers/bridges/RS232Bridge.cpp>
-  +<../examples/simple_repeater>
-
-[env:RAK_4631_repeater_bridge_rs232_serial2]
-extends = rak4631
-build_flags =
-  ${rak4631.build_flags}
-  -D DISPLAY_CLASS=SSD1306Display
-  -D ADVERT_NAME='"RS232 Bridge"'
-  -D ADVERT_LAT=0.0
-  -D ADVERT_LON=0.0
-  -D ADMIN_PASSWORD='"password"'
-  -D MAX_NEIGHBOURS=50
-  -D WITH_RS232_BRIDGE=Serial2
-  -D WITH_RS232_BRIDGE_RX=PIN_SERIAL2_RX
-  -D WITH_RS232_BRIDGE_TX=PIN_SERIAL2_TX
-;  -D BRIDGE_DEBUG=1
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
-;  -D CORE_DEBUG_LEVEL=3
-build_src_filter = ${rak4631.build_src_filter}
-  +<helpers/ui/SSD1306Display.cpp>
-  +<helpers/bridges/RS232Bridge.cpp>
-  +<../examples/simple_repeater>
-
 [env:RAK_4631_room_server]
 extends = rak4631
 build_flags =
--- a/variants/rak_wismesh_tag/RAKWismeshTagBoard.cpp
+++ b/variants/rak_wismesh_tag/RAKWismeshTagBoard.cpp
@@ -21,8 +21,6 @@ static void disconnect_callback(uint16_t conn_handle, uint8_t reason) {
 void RAKWismeshTagBoard::begin() {
  // for future use, sub-classes SHOULD call this from their begin()
  startup_reason = BD_STARTUP_NORMAL;
-  NRF_POWER->DCDCEN = 1;
-
  pinMode(PIN_VBAT_READ, INPUT);
  pinMode(PIN_USER_BTN, INPUT_PULLUP);

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Matthias Wientapper	82242052f9	* Regenerate keys with public key matching user defined first byte	2025-10-26 20:11:30 +01:00
Matthias Wientapper	178ebf7282	* Add cli command to regenerate key pair	2025-10-25 13:20:04 +02:00