Merge branch 'dev'

* ver bump to v1.4.3
* default SF now 11
2026-03-30 14:55:46 +00:00 · 2025-04-07 22:01:08 +10:00 · 2025-04-07 21:59:53 +10:00 · 2025-04-07 21:55:24 +10:00 · 2025-04-06 12:34:09 +10:00 · 2025-04-04 19:26:30 +11:00
63 changed files with 1422 additions and 294 deletions
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -1,13 +1,75 @@
-# MeshCore-FAQ
+**MeshCore-FAQ**<!-- omit from toc -->
 A list of frequently-asked questions and answers for MeshCore

 The current version of this MeshCore FAQ is at https://github.com/ripplebiz/MeshCore/blob/main/docs/faq.md.  
 This MeshCore FAQ is also mirrored at https://github.com/LitBomb/MeshCore-FAQ and might have newer updates if pull requests on Scott's MeshCore repo are not approved yet.

-author: https://github.com/LitBomb
+author: https://github.com/LitBomb<!-- omit from toc -->
 ---

-## Q: What is MeshCore?
+- [1. Introduction](#1-introduction)
+  - [1.1. Q: What is MeshCore?](#11-q-what-is-meshcore)
+  - [1.2. Q: What do you need to start using MeshCore?](#12-q-what-do-you-need-to-start-using-meshcore)
+    - [1.2.1. Hardware](#121-hardware)
+    - [1.2.2. Firmware](#122-firmware)
+    - [1.2.3. Companion Radio Firmware](#123-companion-radio-firmware)
+    - [1.2.4. Repeater](#124-repeater)
+    - [1.2.5. Room Server](#125-room-server)
+- [2. Initial Setup](#2-initial-setup)
+  - [2.1. Q: How many devices do I need to start using meshcore?](#21-q-how-many-devices-do-i-need-to-start-using-meshcore)
+  - [2.2. Q: Does MeshCore cost any money?](#22-q-does-meshcore-cost-any-money)
+  - [2.3. Q: What frequencies are supported by MeshCore?](#23-q-what-frequencies-are-supported-by-meshcore)
+  - [2.4. Q: What is an "advert" in MeshCore?](#24-q-what-is-an-advert-in-meshcore)
+  - [2.5. Q: Is there a hop limit?](#25-q-is-there-a-hop-limit)
+- [3. Server Administration](#3-server-administration)
+  - [3.1. Q: How do you configure a repeater or a room server?](#31-q-how-do-you-configure-a-repeater-or-a-room-server)
+  - [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)
+- [4. T-Deck Related](#4-t-deck-related)
+  - [4.1. Q: What are the steps to get a T-Deck into DFU (Device Firmware Update) mode?](#41-q-what-are-the-steps-to-get-a-t-deck-into-dfu-device-firmware-update-mode)
+  - [4.2. Q: Why is my T-Deck Plus not getting any satellite lock?](#42-q-why-is-my-t-deck-plus-not-getting-any-satellite-lock)
+  - [4.3. Q: Why is my OG (non-Plus) T-Deck not getting any satellite lock?](#43-q-why-is-my-og-non-plus-t-deck-not-getting-any-satellite-lock)
+  - [4.4. Q: What size of SD card does the T-Deck support?](#44-q-what-size-of-sd-card-does-the-t-deck-support)
+  - [4.5. Q: How do I get maps on T-Deck?](#45-q-how-do-i-get-maps-on-t-deck)
+  - [4.6. Q: Where do the map tiles go?](#46-q-where-do-the-map-tiles-go)
+  - [4.7. Q: How to unlock deeper map zoom and server management features on T-Deck?](#47-q-how-to-unlock-deeper-map-zoom-and-server-management-features-on-t-deck)
+  - [4.8. Q: How to decipher the diagnostics screen on T-Deck?](#48-q-how-to-decipher-the-diagnostics-screen-on-t-deck)
+  - [4.9. Q: The T-Deck sound is too loud?](#49-q-the-t-deck-sound-is-too-loud)
+  - [4.10. Q: Can you customize the sound?](#410-q-can-you-customize-the-sound)
+  - [4.11. Q: What is the 'Import from Clipboard' feature on the t-deck and is there a way to manually add nodes without having to receive adverts?](#411-q-what-is-the-import-from-clipboard-feature-on-the-t-deck-and-is-there-a-way-to-manually-add-nodes-without-having-to-receive-adverts)
+- [5. General](#5-general)
+  - [5.1. Q: What are BW, SF, and CR?](#51-q-what-are-bw-sf-and-cr)
+  - [5.2. Q: Do MeshCore clients repeat?](#52-q-do-meshcore-clients-repeat)
+  - [5.3. Q: What happens when a node learns a route via a mobile repeater, and that repeater is gone?](#53-q-what-happens-when-a-node-learns-a-route-via-a-mobile-repeater-and-that-repeater-is-gone)
+  - [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?](#54-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)
+  - [5.5. Q: Do public channels always flood? Do private channels always flood?](#55-q-do-public-channels-always-flood-do-private-channels-always-flood)
+  - [5.6. Q: what is the public key for the default public channel?](#56-q-what-is-the-public-key-for-the-default-public-channel)
+  - [5.7. Q: Is MeshCore open source?](#57-q-is-meshcore-open-source)
+  - [5.8. Q: How can I support MeshCore?](#58-q-how-can-i-support-meshcore)
+  - [5.9. Q: How do I build MeshCore firmware from source?](#59-q-how-do-i-build-meshcore-firmware-from-source)
+  - [5.10. Q: Are there other MeshCore related open source projects?](#510-q-are-there-other-meshcore-related-open-source-projects)
+  - [5.11. Q: Does MeshCore support ATAK](#511-q-does-meshcore-support-atak)
+  - [5.12. Q: How do I add a node to the MeshCore Map](#512-q-how-do-i-add-a-node-to-the-meshcore-map)
+  - [5.13. Q: Can I use a Raspberry Pi to update a MeshCore radio?](#513-q-can-i-use-a-raspberry-pi-to-update-a-meshcore-radio)
+  - [5.14. Q: Are there are projects built around MeshCore?](#514-q-are-there-are-projects-built-around-meshcore)
+    - [5.14.1. meshcoremqtt](#5141-meshcoremqtt)
+    - [5.14.2. MeshCore for Home Assistant](#5142-meshcore-for-home-assistant)
+    - [5.14.3. Python MeshCore](#5143-python-meshcore)
+    - [5.14.4. meshcore-cli](#5144-meshcore-cli)
+    - [5.14.5. meshcore.js](#5145-meshcorejs)
+- [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: 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.5. 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)
+- [7. Other Questions:](#7-other-questions)
+  - [7.1. Q: How to  Update repeater and room server firmware over the air?](#71-q-how-to--update-repeater-and-room-server-firmware-over-the-air)
+
+## 1. Introduction
+
+### 1.1. Q: What is MeshCore?

 **A:** MeshCore is free and open source
 * MeshCore is the routing and firmware etc, available on GitHub under MIT license
@@ -22,7 +84,7 @@ These features are completely optional and aren't needed for the core messaging

 Anyone is able to build anything they like on top of MeshCore without paying anything.

-## Q: What do you need to start using MeshCore?
+### 1.2. Q: What do you need to start using MeshCore?
 **A:** Everything you need for MeshCore is available at:
 Main web site: [https://meshcore.co.uk/](https://meshcore.co.uk/)
 Firmware Flasher: https://flasher.meshcore.co.uk/
@@ -34,15 +96,15 @@ Anyone is able to build anything they like on top of MeshCore without paying any

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

-### Hardware
+#### 1.2.1. Hardware
 To use MeshCore without using a phone as the client interface, you can run MeshCore on a T-Deck or T-Deck Plus. It is a complete off-grid secure communication solution.  

 MeshCore is also available on a variety of 868MHz and 915MHz LoRa devices. For example, RAK4631 devices (19003, 19007, 19026), Heltec V3, Xiao S3 WIO, Xiao C3, Heltec T114, Station G2, Seeed Studio T1000-E. More devices will be supported later.

-### Firmware
+#### 1.2.2. Firmware
 MeshCore has four firmware types that are not available on other LoRa systems. MeshCore has the following:

-#### Companion Radio Firmware
+#### 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**  
@@ -54,12 +116,12 @@ Companion radios are for connecting to the Android app or web app as a messenger
   <https://meshcore.liamcottle.net/#/>  
   <https://client.meshcore.co.uk/tabs/devices>

-#### Repeater
+#### 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.  

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

-#### Room Server
+#### 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. 

 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.  Contrast to channels, messages are either received  when it's sent, or not received and missed if the a room user is out of range.  You can think  of room servers like email servers where you can come back later and get your emails from your mail server 
@@ -74,9 +136,9 @@ A room server can also take on the repeater role.  To enable repeater role on a

 ---

-## Initial Setup
+## 2. Initial Setup

-### Q: How many devices do I need to start using meshcore?
+### 2.1. Q: How many devices do I need to start using meshcore?
 **A:** If you have one supported device, flash the BLE Companion firmware and use your device as a client.  You can connect to the device using the Android client via bluetooth (iOS client will be available later).  You can start communiating with other MeshCore users near you.

 If you have two supported devices, and there are not many MeshCore users near you, flash both of them to BLE Companion firmware so you can use your devices to communiate with your near-by friends and family.
@@ -91,7 +153,7 @@ The repeater and room server CLI reference is here: https://github.com/ripplebiz

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

-### Q: Does MeshCore cost any money?
+### 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.  

@@ -100,19 +162,23 @@ The native Android and iOS client uses the freemium model and is developed by Li
 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. 


-### Q: What frequencies are supported by MeshCore?
+### 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. 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

+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.  
+
+[Source]([https://](https://discord.com/channels/826570251612323860/1330643963501351004/1356540643853209641))
+
 the rest of the radio settings are the same for all frequencies:  
 - Spread Factor (SF): 10  
 - Coding Rate (CR): 5  
 - Bandwidth (BW): 250.00  

-### Q: What is an "advert" in MeshCore?
+### 2.4. Q: What is an "advert" in MeshCore?
 **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 it's node info.

@@ -125,7 +191,7 @@ MeshCore clients only advertise themselves when the user initiates it. A repeate

 `set advert.interval {minutes}`

-### Q: Is there a hop limit?
+### 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. 

@@ -133,30 +199,43 @@ MeshCore clients only advertise themselves when the user initiates it. A repeate
 ---


-## Server Administration
+## 3. Server Administration

-### Q: How do you configure a repeater or a room server?
-**A:** One of these servers can be administered with one of the options below:
+### 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.  
+
+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/bec28ff3-a7d6-4a1e-8602-cb6b290dd150)
+
+ 
 - 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
-	- this is necessary to set the server device's frequency if it doesn't match the frequency for your local region or country
- MeshCore smart device clients have the ability to remotely administer servers.
- A T-Deck running unlocked/registered MeshCore firmware. Remote server administration is enabled through registering your T-Deck with Ripple Radios. It is one of the ways to support MeshCore development. You can register your T-Deck at:  
-  <https://buymeacoffee.com/ripplebiz/e/249834>

-### Q: Do I need to set the location for a repeater?
+- Use a MeshCore smartphone clients  to remotely administer servers via LoRa.
+
+- A T-Deck running unlocked/registered MeshCore firmware. Remote server administration is enabled through registering your T-Deck with Ripple Radios. It is one of the ways to support MeshCore development. You can register your T-Deck at:
+
+<https://buymeacoffee.com/ripplebiz/e/249834>
+
+  
+
+### 3.2. Q: Do I need to set the location for a repeater?
 **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>`

 You can get the latitude and longitude from Google Maps by right-clicking the location you are at on the map.

-### Q: What is the password to administer a repeater or a room server?
+### 3.3. Q: What is the password to administer a repeater or a room server?
 **A:** The default admin password to a repeater and room server is `password`. Use the following command to change the admin password:

 `password {new-password}`


-### Q: What is the password to join a room server?
+### 3.4. Q: What is the password to join a room server?
 **A:** The default guest password to a room server is `hello`. Use the following command to change the guest password:

 `set guest.password {guest-password}`
@@ -164,9 +243,9 @@ You can get the latitude and longitude from Google Maps by right-clicking the lo

 ---

-## T-Deck Related
+## 4. T-Deck Related

-### Q: What are the steps to get a T-Deck into DFU (Device Firmware Update) mode?
+### 4.1. 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  
@@ -177,16 +256,20 @@ You can get the latitude and longitude from Google Maps by right-clicking the lo
 7. T-Deck in DFU mode now  
 8. At this point you can begin flashing using <https://flasher.meshcore.co.uk/>

-### Q: Why is my T-Deck Plus not getting any satellite lock?
+### 4.2. Q: Why is my T-Deck Plus not getting any satellite lock?
 **A:** For T-Deck Plus, the GPS baud rate should be set to **38400**. Also, a number of T-Deck Plus devices were found to have the GPS module installed upside down, with the GPS antenna facing down instead of up. If your T-Deck Plus still doesn't get any satellite lock after setting the baud rate to 38400, you might need to open up the device to check the GPS orientation.

-### Q: Why is my OG (non-Plus) T-Deck not getting any satellite lock?
+GPS on T-Deck is always enabled.  You can skip the "GPS clock sync" and the T-Deck will continue to try to get a GPS lock.  You can go to the `GPS Info` screen, you should see the `Sentences:` coutner increasing if the baud rate is correct.
+
+[Source]([https://](https://discord.com/channels/826570251612323860/1330643963501351004/1356609240302616689))
+
+### 4.3. Q: Why is my OG (non-Plus) T-Deck not getting any satellite lock?
 **A:** The OG (non-Plus) T-Deck doesn't come with a GPS. If you added a GPS to your OG T-Deck, please refer to the manual of your GPS to see what baud rate it requires. Alternatively, you can try to set the baud rate from 9600, 19200, etc., and up to 115200 to see which one works.

-### Q: What size of SD card does the T-Deck support?
+### 4.4. Q: What size of SD card does the T-Deck support?
 **A:** Users have had no issues using 16GB or 32GB SD cards. Format the SD card to **FAT32**.

-### Q: How do I get maps on T-Deck?
+### 4.5. 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)  
 - <https://buymeacoffee.com/ripplebiz/e/342542> (US)
@@ -200,28 +283,46 @@ There is also a modified script that adds additional error handling and parallel
 UK map tiles are available separately from Andy Kirby on his discord server:  
 <https://discord.com/channels/826570251612323860/1330643963501351004/1331346597367386224>

-### Q: Where do the map tiles go?
+### 4.6. 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.

-### Q: How to unlock deeper map zoom and server management features on T-Deck?
+### 4.7. 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.  
 Unlock page: <https://buymeacoffee.com/ripplebiz/e/249834>

+### 4.8. Q: How to decipher the diagnostics screen on T-Deck?

-### Q: The T-Deck sound is too loud?
-### Q: Can you customize the sound?
+**A: ** Space is tight on T-Deck's screen so the information is a bit cryptic.  Format is :
+`{hops} l:{packet-length}({payload-len}) t:{packet-type} snr:{n} rssi:{n}`
+
+See here for packet-type: [https://github.com/ripplebiz/MeshCore/blob/main/src/Packet.h#L19](https://github.com/ripplebiz/MeshCore/blob/main/src/Packet.h#L19 "https://github.com/ripplebiz/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_PATH 0x08 // returned path (prefixed with dest/src hashes, MAC) (enc data: path, extra)
+
+[Source](https://discord.com/channels/1343693475589263471/1343693475589263474/1350611321040932966)
+
+### 4.9. Q: The T-Deck sound is too loud?
+### 4.10. Q: Can you customize the sound?

 **A:** You can customise the sounds on the T-Deck, just by placing `.mp3` files onto the `root` dir of the SD card. `startup.mp3`, `alert.mp3` and `new-advert.mp3`

-### Q: What is the 'Import from Clipboard' feature on the t-deck and is there a way to manually add nodes without having to receive adverts?
+### 4.11. Q: What is the 'Import from Clipboard' feature on the t-deck and is there a way to manually add nodes without having to receive adverts?

 **A:** 'Import from Clipboard' is for importing a contact via a file named 'clipboard.txt' on the SD card. The opposite, is in the Identity screen, the 'Card to Clipboard' menu, which writes to 'clipboard.txt' so you can share yourself (call these 'biz cards', that start with "meshcore://...")

 ---

-## General
+## 5. General

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

 **A:** 

@@ -237,74 +338,201 @@ Lowering the spreading factor makes it more difficult for the gateway to receive
 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

-### Q: What happens when a node learns a route via a mobile repeater, and that repeater is gone?
+### 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.  
+
+### 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 reestablish 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?

-### Q: Is MeshCore open source?
+Routes are stored in sender's contact list.  When you send a message the first time, the message  first gets to your destination by flood routing,  When your destination node gets the message, it  sends back to the sender a delivery report with all repeaters that the original message went through. This delivery report is flood-routed back to you the sender and is a basis for future direct path. when you send the next message, the path will get embedded into the packet and be evaluated by repeaters. if the hop and address of the repeater matches, it will retransmit the message, otherwise it will not retransmit, hence minimizing utilization.
+
+[Source](https://discord.com/channels/826570251612323860/1330643963501351004/1351279141630119996)
+
+### 5.5. Q: Do public channels always flood? Do private channels always flood?
+
+**A:** Yes, group channels are A to B, so there is no defined path.  They have to flood.  Repeaters can however deny flood traffic up to some hop limit, with the `set flood.max` CLI command.  Admistrators of repeaters get to set the rules of their repeaters.
+
+[Source](https://discord.com/channels/1343693475589263471/1343693475589263474/1350023009527664672)
+
+
+### 5.6. Q: what is the public key for the default public channel?
+**A:** The smartphone app key is in hex:
+` 8b3387e9c5cdea6ac9e5edbaa115cd72`
+
+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/ripplebiz/MeshCore>  

-### Q: How can I support MeshCore?
+### 5.8. Q: How can I support MeshCore?
 **A:** Provide your honest feedback on GitHub and on AndyKirby's Discord server <http://discord.com/invite/H62Re4DCeD>. 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>.

 Support Liam Cottle's smartphone client development by unlocking the server administration wait gate with in-app purchase

 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)

-### Q: How do I build MeshCore firmware from source?
+### 5.9. Q: How do I build MeshCore firmware from source?
 **A:** See instructions here:  
-<https://discord.com/channels/826570251612323860/1330643963501351004/1342120825251299388>  
+https://discord.com/channels/826570251612323860/1330643963501351004/1341826372120608769
+
+Build instructions for MeshCore:
+
+For Windows, first install WSL and Python+pip via: https://plainenglish.io/blog/setting-up-python-on-windows-subsystem-for-linux-wsl-26510f1b2d80
+
+(Linux, Windows+WSL) In the terminal/shell:
+```
+sudo apt update
+sudo apt install libpython3-dev
+sudo apt install python3-venv
+```
+Mac: python3 should be already installed.
+
+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 
+cd MeshCore
+```
+open platformio.ini and in `[arduino_base]` edit the `LORA_FREQ=867.5`
+save, then run:
+```
+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*  
 <https://www.youtube.com/watch?v=WJvg6dt13hk> *(Link referenced in the Discord post)*

-### Q: Are there other MeshCore related open source projects?
+### 5.10. Q: Are there other MeshCore related open source projects?

 **A:** [Liam Cottle](https://liamcottle.net)'s MeshCore web client and MeshCore Javascript libary are open source under MIT license.

 Web client: https://github.com/liamcottle/meshcore-web
 Javascript: https://github.com/liamcottle/meshcore.js

-### Q: Does MeshCore support ATAK
+### 5.11. Q: Does MeshCore support ATAK
 **A:** ATAK is not currently on MeshCore's roadmap.

-### Q: How do I add a node to the [MeshCore Map]([url](https://meshcore.co.uk/map.html))
+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. 
+
+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:** From the smartphone app, connect to a BLE Companion radio
 - To add the BLE Companion radio your smartphone is connected to to the map, tap the `advert` icon, then tap `Advert (To Clipboard)`.  
 - To add a Repeater or Room Server to the map, tap the 3 dots next to the Repeater or Room Server you want to add to the map, then tap `Share (To Clipboard)`.  
 - Go to the [MeshCore Map web site]([url](https://meshcore.co.uk/map.html)), tap the plus sign on the lower right corner and paste in the meshcore://... blob, then tap `Add Node`
-    
+
+### 5.13. Q: Can I use a Raspberry Pi to update a MeshCore radio?
+** A:** Yes.
+You will need to install picocom on the pi.
+`sudo apt install picocom`
+
+Then run the following commands to setup the repeater.
+```
+picocom -b 115200 /dev/ttyUSB0 --imap lfcrlf
+set name your_repeater_name
+time epoch_time
+password your_unique_password
+set advert.interval 240
+advert
+```
+Note: If using a RAK the path will most likely be /dev/ttyACM0
+
+Epoch time comes from https://www.epochconverter.com/
+
+You can also flash the repeater using esptool.  You will need to install esptool with the following command...
+
+`pip install esptool --break-system-packages`
+
+Then to flash the firmware to Heltec, obtain the .bin file from https://flasher.meshcore.co.uk/ (download all firmware link)
+
+For Heltec:
+`esptool.py -p /dev/ttyUSB0 --chip esp32-s3 write_flash 0x00000 firmware.bin`
+
+If flashing a visual studio code build bin file, flash with the following offset:
+`esptool.py -p /dev/ttyUSB0 --chip esp32-s3 write_flash 0x10000 firmware.bin`
+
+For Pi
+Download the zip from the online flasher website and use the following command:
+
+Note: Requires adafruit-nrfutil command which can be installed as follows.
+`pip install adafruit-nrfutil --break-system-packages`
+
+```
+adafruit-nrfutil --verbose dfu serial --package t1000_e_bootloader-0.9.1-5-g488711a_s140_7.3.0.zip -p /dev/ttyACM0 -b 115200 --singlebank --touch 1200
+```
+
+[Source](https://discord.com/channels/826570251612323860/1330643963501351004/1342120825251299388)
+  
+### 5.14. Q: Are there are projects built around MeshCore?
+
+**A:** Yes.  See the following:
+
+#### 5.14.1. meshcoremqtt
+A python based 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
+A custom Home Assistant integration for MeshCore mesh radio nodes. It allows you to monitor and control MeshCore nodes via USB, BLE, or TCP connections.
+https://github.com/awolden/meshcore-ha
+
+#### 5.14.3. Python MeshCore
+Bindings to access your MeshCore companion radio nodes in python.
+https://github.com/fdlamotte/meshcore_py
+
+#### 5.14.4. meshcore-cli  
+CLI interface to MeshCore companion radio over BLE, TCP, or serial.  Uses Pyton MeshCore above.
+ https://github.com/fdlamotte/meshcore-cli
+
+#### 5.14.5. meshcore.js
+A Javascript library for interacting with a MeshCore device running the companion radio firmware
+https://github.com/liamcottle/meshcore.js
+
 ---

-## Troubleshooting
+## 6. Troubleshooting

-### Q: My client says another client or a repeater or a room server was last seen many, many days ago.
-### 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.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.  

 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.

-### Q: How to connect to a repeater via BLE (bluetooth)?
+### 6.3. Q: How to connect to a repeater via BLE (bluetooth)?
 **A:** You can't connect to a device running repeater firmware  via bluetooth.  Devices running the BLE companion firmware you can connect to it via bluetooth using the android app

-### Q: I can't connect via bluetooth, what is the bluetooth pairing code?
+### 6.4. Q: I can't connect via bluetooth, what is the bluetooth pairing code?

 **A:** the default bluetooth pairing code is `123456`

-### Q: My Heltec V3 keeps disconnecting from my smartphone.  It can't hold a solid Bluetooth connection.
+### 6.5. Q: My Heltec V3 keeps disconnecting from my smartphone.  It can't hold a solid Bluetooth connection.

 **A:** Heltec V3 has a very small coil antenna on its PCB for WiFi and Bluetooth connectivty.  It has a very short range, only a few feet.  It is possible to remove the coil antenna  and replace it with a 31mm wire.  The BT range is much improved with the modification.

 ---
-## Other Questions:
-### Q: How to  Update repeater and room server firmware over the air?
+## 7. Other Questions:
+### 7.1. Q: How to  Update repeater and room server firmware over the air?

 **A:** Only nRF-based RAK4631 and Heltec T114 OTA firmware update are verified using nRF smartphone app.  Lilygo T-Echo doesn't work currently.
 You can update repeater and room server firmware with a bluetooth connection between your smartphone and your LoRa radio using the nRF app.
@@ -313,7 +541,8 @@ You can update repeater and room server firmware with a bluetooth connection bet
 2. On the phone client, log on to the repeater as administrator (default password is `password`) to issue the `start ota`command to the repeater or room server to get the device into OTA DFU mode
   
 ![image](https://github.com/user-attachments/assets/889bb81b-7214-4a1c-955a-396b5a05d8ad)
-	1. `start ota` can be initiated from USB serial console on the web flasher page or a T-Deck
+
+1. `start ota` can be initiated from USB serial console on the web flasher page or a T-Deck
 4. On the smartphone, download and run the nRF app and scan for Bluetooth devices
 5. Connect to the repeater/room server node you want to update
 	1. nRF app is available on both Android and iOS
@@ -322,7 +551,8 @@ You can update repeater and room server firmware with a bluetooth connection bet

 **iOS continues here:**
 5. Once connected successfully, a `DFU` icon ![Pasted image 20250309173039](https://github.com/user-attachments/assets/af7a9f78-8739-4946-b734-02bade9c8e71)
- appears in the top right corner of the app![Pasted image 20250309171919](https://github.com/user-attachments/assets/08007ec8-4924-49c1-989f-ca2611e78793)
+ appears in the top right corner of the app
+ ![Pasted image 20250309171919](https://github.com/user-attachments/assets/08007ec8-4924-49c1-989f-ca2611e78793)

 6. Scroll down to change the `PRN(s)` number:

--- a/examples/companion_radio/main.cpp
+++ b/examples/companion_radio/main.cpp
@@ -7,9 +7,6 @@
  #include <SPIFFS.h>
 #endif

-#define RADIOLIB_STATIC_ONLY 1
-#include <RadioLib.h>
-#include <helpers/RadioLibWrappers.h>
 #include <helpers/ArduinoHelpers.h>
 #include <helpers/StaticPoolPacketManager.h>
 #include <helpers/SimpleMeshTables.h>
@@ -89,11 +86,11 @@ static uint32_t _atoi(const char* sp) {
 #define FIRMWARE_VER_CODE    3

 #ifndef FIRMWARE_BUILD_DATE
-  #define FIRMWARE_BUILD_DATE   "25 Mar 2025"
+  #define FIRMWARE_BUILD_DATE   "7 Apr 2025"
 #endif

 #ifndef FIRMWARE_VERSION
-  #define FIRMWARE_VERSION   "v1.4.1"
+  #define FIRMWARE_VERSION   "v1.4.3"
 #endif

 #define CMD_APP_START              1
@@ -197,7 +194,6 @@ struct NodePrefs {  // persisted to file

 class MyMesh : public BaseChatMesh {
  FILESYSTEM* _fs;
-  RADIO_CLASS* _phy;
  IdentityStore* _identity_store;
  NodePrefs _prefs;
  uint32_t pending_login;
@@ -229,9 +225,13 @@ class MyMesh : public BaseChatMesh {
  AckTableEntry  expected_ack_table[EXPECTED_ACK_TABLE_SIZE];  // circular table
  int next_ack_idx;

-  void loadMainIdentity(mesh::RNG& trng) {
+  void loadMainIdentity() {
    if (!_identity_store->load("_main", self_id)) {
-      self_id = mesh::LocalIdentity(&trng);  // create new random identity
+      self_id = radio_new_identity();  // create new random identity
+      int count = 0;
+      while (count < 10 && (self_id.pub_key[0] == 0x00 || self_id.pub_key[0] == 0xFF)) {  // reserved id hashes
+        self_id = radio_new_identity(); count++;
+      }
      saveMainIdentity(self_id);
    }
  }
@@ -488,7 +488,7 @@ protected:
  }

  void logRxRaw(float snr, float rssi, const uint8_t raw[], int len) override {
-    if (_serial->isConnected()) {
+    if (_serial->isConnected() && len+3 <= MAX_FRAME_SIZE) {
      int i = 0;
      out_frame[i++] = PUSH_CODE_LOG_RX_DATA;
      out_frame[i++] = (int8_t)(snr * 4);
@@ -709,8 +709,8 @@ protected:

 public:

-  MyMesh(RADIO_CLASS& phy, RadioLibWrapper& rw, mesh::RNG& rng, mesh::RTCClock& rtc, SimpleMeshTables& tables)
-     : BaseChatMesh(rw, *new ArduinoMillis(), rng, rtc, *new StaticPoolPacketManager(16), tables), _serial(NULL), _phy(&phy)
+  MyMesh(mesh::Radio& radio, mesh::RNG& rng, mesh::RTCClock& rtc, SimpleMeshTables& tables)
+     : BaseChatMesh(radio, *new ArduinoMillis(), rng, rtc, *new StaticPoolPacketManager(16), tables), _serial(NULL)
  {
    _iter_started = false;
    offline_queue_len = 0;
@@ -767,7 +767,7 @@ public:
    }
  }

-  void begin(FILESYSTEM& fs, mesh::RNG& trng, bool has_display) {
+  void begin(FILESYSTEM& fs, bool has_display) {
    _fs = &fs;

    BaseChatMesh::begin();
@@ -778,7 +778,7 @@ public:
    _identity_store = new IdentityStore(fs, "/identity");
  #endif

-    loadMainIdentity(trng);
+    loadMainIdentity();

    // load persisted prefs
    if (_fs->exists("/new_prefs")) {
@@ -793,7 +793,8 @@ public:
    if (_prefs.ble_pin == 0) {
    #ifdef HAS_UI
      if (has_display) {
-        _active_ble_pin = trng.nextInt(100000, 999999);  // random pin each session
+        StdRNG  rng;
+        _active_ble_pin = rng.nextInt(100000, 999999);  // random pin each session
      } else {
        _active_ble_pin = BLE_PIN_CODE;  // otherwise static pin
      }
@@ -814,11 +815,8 @@ public:
    addChannel("Public", PUBLIC_GROUP_PSK); // pre-configure Andy's public channel
    loadChannels();

-    _phy->setFrequency(_prefs.freq);
-    _phy->setSpreadingFactor(_prefs.sf);
-    _phy->setBandwidth(_prefs.bw);
-    _phy->setCodingRate(_prefs.cr);
-    _phy->setOutputPower(_prefs.tx_power_dbm);
+    radio_set_params(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
+    radio_set_tx_power(_prefs.tx_power_dbm);
  }

  const char* getNodeName() { return _prefs.node_name; }
@@ -1153,10 +1151,7 @@ public:
        _prefs.bw = (float)bw / 1000.0;
        savePrefs();

-        _phy->setFrequency(_prefs.freq);
-        _phy->setSpreadingFactor(_prefs.sf);
-        _phy->setBandwidth(_prefs.bw);
-        _phy->setCodingRate(_prefs.cr);
+        radio_set_params(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
        MESH_DEBUG_PRINTLN("OK: CMD_SET_RADIO_PARAMS: f=%d, bw=%d, sf=%d, cr=%d", freq, bw, (uint32_t)sf, (uint32_t)cr);

        writeOKFrame();
@@ -1170,7 +1165,7 @@ public:
      } else {
        _prefs.tx_power_dbm = cmd_frame[1];
        savePrefs();
-        _phy->setOutputPower(_prefs.tx_power_dbm);
+        radio_set_tx_power(_prefs.tx_power_dbm);
        writeOKFrame();
      }
    } else if (cmd_frame[0] == CMD_SET_TUNING_PARAMS) {
@@ -1413,6 +1408,10 @@ public:
  #elif defined(BLE_PIN_CODE)
    #include <helpers/esp32/SerialBLEInterface.h>
    SerialBLEInterface serial_interface;
+  #elif defined(SERIAL_RX)
+    #include <helpers/ArduinoSerialInterface.h>
+    ArduinoSerialInterface serial_interface;
+    HardwareSerial companion_serial(1);
  #else
    #include <helpers/ArduinoSerialInterface.h>
    ArduinoSerialInterface serial_interface;
@@ -1431,7 +1430,7 @@ public:

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

 void halt() {
  while (1) ;
@@ -1442,24 +1441,25 @@ void setup() {

  board.begin();

-  if (!radio_init()) { halt(); }
-
-  fast_rng.begin(radio.random(0x7FFFFFFF));
-
-  RadioNoiseListener trng(radio);
-
 #ifdef HAS_UI
  DisplayDriver* disp = NULL;
 #ifdef DISPLAY_CLASS
  if (display.begin()) {
    disp = &display;
+    disp->startFrame();
+    disp->print("Please wait...");
+    disp->endFrame();
  }
 #endif
 #endif

+  if (!radio_init()) { halt(); }
+
+  fast_rng.begin(radio_get_rng_seed());
+
 #if defined(NRF52_PLATFORM)
  InternalFS.begin();
-  the_mesh.begin(InternalFS, trng,
+  the_mesh.begin(InternalFS,
    #ifdef HAS_UI
        disp != NULL
    #else
@@ -1477,7 +1477,7 @@ void setup() {
  the_mesh.startInterface(serial_interface);
 #elif defined(ESP32)
  SPIFFS.begin(true);
-  the_mesh.begin(SPIFFS, trng,
+  the_mesh.begin(SPIFFS,
    #ifdef HAS_UI
        disp != NULL
    #else
@@ -1492,6 +1492,10 @@ void setup() {
  char dev_name[32+16];
  sprintf(dev_name, "%s%s", BLE_NAME_PREFIX, the_mesh.getNodeName());
  serial_interface.begin(dev_name, the_mesh.getBLEPin());
+#elif defined(SERIAL_RX)
+  companion_serial.setPins(SERIAL_RX, SERIAL_TX);
+  companion_serial.begin(115200);
+  serial_interface.begin(companion_serial);
 #else
  serial_interface.begin(Serial);
 #endif
--- a/examples/simple_repeater/main.cpp
+++ b/examples/simple_repeater/main.cpp
@@ -7,13 +7,10 @@
  #include <SPIFFS.h>
 #endif

-#define RADIOLIB_STATIC_ONLY 1
-#include <RadioLib.h>
 #include <helpers/ArduinoHelpers.h>
 #include <helpers/StaticPoolPacketManager.h>
 #include <helpers/SimpleMeshTables.h>
 #include <helpers/IdentityStore.h>
-#include <helpers/AutoDiscoverRTCClock.h>
 #include <helpers/AdvertDataHelpers.h>
 #include <helpers/TxtDataHelpers.h>
 #include <helpers/CommonCLI.h>
@@ -23,11 +20,11 @@
 /* ------------------------------ Config -------------------------------- */

 #ifndef FIRMWARE_BUILD_DATE
-  #define FIRMWARE_BUILD_DATE   "25 Mar 2025"
+  #define FIRMWARE_BUILD_DATE   "7 Apr 2025"
 #endif

 #ifndef FIRMWARE_VERSION
-  #define FIRMWARE_VERSION   "v1.4.1"
+  #define FIRMWARE_VERSION   "v1.4.3"
 #endif

 #ifndef LORA_FREQ
@@ -69,6 +66,8 @@
  static UITask ui_task(display);
 #endif

+#define FIRMWARE_ROLE "repeater"
+
 #define PACKET_LOG_FILE  "/packet_log"

 /* ------------------------------ Code -------------------------------- */
@@ -108,10 +107,7 @@ struct ClientInfo {
 #define CLI_REPLY_DELAY_MILLIS  1500

 class MyMesh : public mesh::Mesh, public CommonCLICallbacks {
-  RadioLibWrapper* my_radio;
  FILESYSTEM* _fs;
-  RADIO_CLASS* _phy;
-  mesh::MainBoard* _board;
  unsigned long next_local_advert, next_flood_advert;
  bool _logging;
  NodePrefs _prefs;
@@ -147,9 +143,9 @@ class MyMesh : public mesh::Mesh, public CommonCLICallbacks {
        stats.batt_milli_volts = board.getBattMilliVolts();
        stats.curr_tx_queue_len = _mgr->getOutboundCount();
        stats.curr_free_queue_len = _mgr->getFreeCount();
-        stats.last_rssi = (int16_t) my_radio->getLastRSSI();
-        stats.n_packets_recv = my_radio->getPacketsRecv();
-        stats.n_packets_sent = my_radio->getPacketsSent();
+        stats.last_rssi = (int16_t) radio_driver.getLastRSSI();
+        stats.n_packets_recv = radio_driver.getPacketsRecv();
+        stats.n_packets_sent = radio_driver.getPacketsSent();
        stats.total_air_time_secs = getTotalAirTime() / 1000;
        stats.total_up_time_secs = _ms->getMillis() / 1000;
        stats.n_sent_flood = getNumSentFlood();
@@ -157,7 +153,7 @@ class MyMesh : public mesh::Mesh, public CommonCLICallbacks {
        stats.n_recv_flood = getNumRecvFlood();
        stats.n_recv_direct = getNumRecvDirect();
        stats.n_full_events = getNumFullEvents();
-        stats.last_snr = (int16_t)(my_radio->getLastSNR() * 4);
+        stats.last_snr = (int16_t)(radio_driver.getLastSNR() * 4);
        stats.n_direct_dups = ((SimpleMeshTables *)getTables())->getNumDirectDups();
        stats.n_flood_dups = ((SimpleMeshTables *)getTables())->getNumFloodDups();

@@ -474,11 +470,10 @@ protected:
  }

 public:
-  MyMesh(RADIO_CLASS& phy, mesh::MainBoard& board, RadioLibWrapper& radio, mesh::MillisecondClock& ms, mesh::RNG& rng, mesh::RTCClock& rtc, SimpleMeshTables& tables)
+  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),
-        _phy(&phy), _board(&board), _cli(board, this, &_prefs, this)
+      _cli(board, this, &_prefs, this)
  {
-    my_radio = &radio;
    memset(known_clients, 0, sizeof(known_clients));
    next_local_advert = next_flood_advert = 0;
    _logging = false;
@@ -510,11 +505,8 @@ public:
    // load persisted prefs
    _cli.loadPrefs(_fs);

-    _phy->setFrequency(_prefs.freq);
-    _phy->setSpreadingFactor(_prefs.sf);
-    _phy->setBandwidth(_prefs.bw);
-    _phy->setCodingRate(_prefs.cr);
-    _phy->setOutputPower(_prefs.tx_power_dbm);
+    radio_set_params(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
+    radio_set_tx_power(_prefs.tx_power_dbm);

    updateAdvertTimer();
    updateFloodAdvertTimer();
@@ -522,6 +514,7 @@ public:

  const char* getFirmwareVer() override { return FIRMWARE_VERSION; }
  const char* getBuildDate() override { return FIRMWARE_BUILD_DATE; }
+  const char* getRole() override { return FIRMWARE_ROLE; }
  const char* getNodeName() { return _prefs.node_name; }

  void savePrefs() override {
@@ -582,7 +575,7 @@ public:
  }

  void setTxPower(uint8_t power_dbm) override {
-    _phy->setOutputPower(power_dbm);
+    radio_set_tx_power(power_dbm);
  }

  void loop() {
@@ -609,14 +602,7 @@ public:
 StdRNG fast_rng;
 SimpleMeshTables tables;

-#ifdef ESP32
-ESP32RTCClock fallback_clock;
-#else
-VolatileRTCClock fallback_clock;
-#endif
-AutoDiscoverRTCClock rtc_clock(fallback_clock);
-
-MyMesh the_mesh(radio, board, *new WRAPPER_CLASS(radio, board), *new ArduinoMillis(), fast_rng, rtc_clock, tables);
+MyMesh the_mesh(board, radio_driver, *new ArduinoMillis(), fast_rng, rtc_clock, tables);

 void halt() {
  while (1) ;
@@ -629,14 +615,18 @@ void setup() {
  delay(1000);

  board.begin();
-#ifdef ESP32
-  fallback_clock.begin();
+
+#ifdef DISPLAY_CLASS
+  if(display.begin()){
+    display.startFrame();
+    display.print("Please wait...");
+    display.endFrame();
+  }
 #endif
-  rtc_clock.begin(Wire);

  if (!radio_init()) { halt(); }

-  fast_rng.begin(radio.random(0x7FFFFFFF));
+  fast_rng.begin(radio_get_rng_seed());

  FILESYSTEM* fs;
 #if defined(NRF52_PLATFORM)
@@ -652,8 +642,11 @@ void setup() {
 #endif
  if (!store.load("_main", the_mesh.self_id)) {
    MESH_DEBUG_PRINTLN("Generating new keypair");
-    RadioNoiseListener rng(radio);
-    the_mesh.self_id = mesh::LocalIdentity(&rng);  // create new random identity
+    the_mesh.self_id = radio_new_identity();   // create new random identity
+    int count = 0;
+    while (count < 10 && (the_mesh.self_id.pub_key[0] == 0x00 || the_mesh.self_id.pub_key[0] == 0xFF)) {  // reserved id hashes
+      the_mesh.self_id = radio_new_identity(); count++;
+    }
    store.save("_main", the_mesh.self_id);
  }

@@ -665,7 +658,6 @@ void setup() {
  the_mesh.begin(fs);

 #ifdef DISPLAY_CLASS
-  display.begin();
  ui_task.begin(the_mesh.getNodeName(), FIRMWARE_BUILD_DATE);
 #endif

--- a/examples/simple_room_server/main.cpp
+++ b/examples/simple_room_server/main.cpp
@@ -7,13 +7,10 @@
  #include <SPIFFS.h>
 #endif

-#define RADIOLIB_STATIC_ONLY 1
-#include <RadioLib.h>
 #include <helpers/ArduinoHelpers.h>
 #include <helpers/StaticPoolPacketManager.h>
 #include <helpers/SimpleMeshTables.h>
 #include <helpers/IdentityStore.h>
-#include <helpers/AutoDiscoverRTCClock.h>
 #include <helpers/AdvertDataHelpers.h>
 #include <helpers/TxtDataHelpers.h>
 #include <helpers/CommonCLI.h>
@@ -23,11 +20,11 @@
 /* ------------------------------ Config -------------------------------- */

 #ifndef FIRMWARE_BUILD_DATE
-  #define FIRMWARE_BUILD_DATE   "25 Mar 2025"
+  #define FIRMWARE_BUILD_DATE   "7 Apr 2025"
 #endif

 #ifndef FIRMWARE_VERSION
-  #define FIRMWARE_VERSION   "v1.4.1"
+  #define FIRMWARE_VERSION   "v1.4.3"
 #endif

 #ifndef LORA_FREQ
@@ -65,7 +62,7 @@
 #endif

 #ifndef MAX_UNSYNCED_POSTS
-  #define MAX_UNSYNCED_POSTS    16
+  #define MAX_UNSYNCED_POSTS    32
 #endif

 #ifdef DISPLAY_CLASS
@@ -77,6 +74,10 @@
  static UITask ui_task(display);
 #endif

+#define FIRMWARE_ROLE "room_server"
+
+#define PACKET_LOG_FILE  "/packet_log"
+
 /* ------------------------------ Code -------------------------------- */

 enum RoomPermission {
@@ -110,7 +111,7 @@ struct PostInfo {

 #define REPLY_DELAY_MILLIS         1500
 #define PUSH_NOTIFY_DELAY_MILLIS   2000
-#define SYNC_PUSH_INTERVAL         2000
+#define SYNC_PUSH_INTERVAL         1200

 #define PUSH_ACK_TIMEOUT_FLOOD    12000
 #define PUSH_TIMEOUT_BASE          4000
@@ -141,11 +142,9 @@ struct ServerStats {
 };

 class MyMesh : public mesh::Mesh, public CommonCLICallbacks {
-  RadioLibWrapper* my_radio;
  FILESYSTEM* _fs;
-  RADIO_CLASS* _phy;
-  mesh::MainBoard* _board;
  unsigned long next_local_advert, next_flood_advert;
+  bool _logging;
  NodePrefs _prefs;
  CommonCLI _cli;
  uint8_t reply_data[MAX_PACKET_PAYLOAD];
@@ -257,6 +256,14 @@ class MyMesh : public mesh::Mesh, public CommonCLICallbacks {
   return createAdvert(self_id, app_data, app_data_len);
  }

+  File openAppend(const char* fname) {
+    #if defined(NRF52_PLATFORM)
+      return _fs->open(fname, FILE_O_WRITE);
+    #else
+      return _fs->open(fname, "a", true);
+    #endif
+    }
+
 protected:
  float getAirtimeBudgetFactor() const override {
    return _prefs.airtime_factor;
@@ -271,6 +278,55 @@ protected:
    #endif
  }

+  void logRx(mesh::Packet* pkt, int len, float score) override {
+    if (_logging) {
+      File f = openAppend(PACKET_LOG_FILE);
+      if (f) {
+        f.print(getLogDateTime());
+        f.printf(": RX, len=%d (type=%d, route=%s, payload_len=%d) SNR=%d RSSI=%d score=%d",
+          len, pkt->getPayloadType(), pkt->isRouteDirect() ? "D" : "F", pkt->payload_len,
+          (int)_radio->getLastSNR(), (int)_radio->getLastRSSI(), (int)(score*1000));
+
+        if (pkt->getPayloadType() == PAYLOAD_TYPE_PATH || pkt->getPayloadType() == PAYLOAD_TYPE_REQ
+          || pkt->getPayloadType() == PAYLOAD_TYPE_RESPONSE || pkt->getPayloadType() == PAYLOAD_TYPE_TXT_MSG) {
+          f.printf(" [%02X -> %02X]\n", (uint32_t)pkt->payload[1], (uint32_t)pkt->payload[0]);
+        } else {
+          f.printf("\n");
+        }
+        f.close();
+      }
+    }
+  }
+  void logTx(mesh::Packet* pkt, int len) override {
+    if (_logging) {
+      File f = openAppend(PACKET_LOG_FILE);
+      if (f) {
+        f.print(getLogDateTime());
+        f.printf(": TX, len=%d (type=%d, route=%s, payload_len=%d)",
+          len, pkt->getPayloadType(), pkt->isRouteDirect() ? "D" : "F", pkt->payload_len);
+
+        if (pkt->getPayloadType() == PAYLOAD_TYPE_PATH || pkt->getPayloadType() == PAYLOAD_TYPE_REQ
+          || pkt->getPayloadType() == PAYLOAD_TYPE_RESPONSE || pkt->getPayloadType() == PAYLOAD_TYPE_TXT_MSG) {
+          f.printf(" [%02X -> %02X]\n", (uint32_t)pkt->payload[1], (uint32_t)pkt->payload[0]);
+        } else {
+          f.printf("\n");
+        }
+        f.close();
+      }
+    }
+  }
+  void logTxFail(mesh::Packet* pkt, int len) override {
+    if (_logging) {
+      File f = openAppend(PACKET_LOG_FILE);
+      if (f) {
+        f.print(getLogDateTime());
+        f.printf(": TX FAIL!, len=%d (type=%d, route=%s, payload_len=%d)\n",
+          len, pkt->getPayloadType(), pkt->isRouteDirect() ? "D" : "F", pkt->payload_len);
+        f.close();
+      }
+    }
+  }
+
  int calcRxDelay(float score, uint32_t air_time) const override {
    if (_prefs.rx_delay_base <= 0.0f) return 0;
    return (int) ((pow(_prefs.rx_delay_base, 0.85f - score) - 1.0) * air_time);
@@ -524,9 +580,9 @@ protected:
          stats.batt_milli_volts = board.getBattMilliVolts();
          stats.curr_tx_queue_len = _mgr->getOutboundCount();
          stats.curr_free_queue_len = _mgr->getFreeCount();
-          stats.last_rssi = (int16_t) my_radio->getLastRSSI();
-          stats.n_packets_recv = my_radio->getPacketsRecv();
-          stats.n_packets_sent = my_radio->getPacketsSent();
+          stats.last_rssi = (int16_t) radio_driver.getLastRSSI();
+          stats.n_packets_recv = radio_driver.getPacketsRecv();
+          stats.n_packets_sent = radio_driver.getPacketsSent();
          stats.total_air_time_secs = getTotalAirTime() / 1000;
          stats.total_up_time_secs = _ms->getMillis() / 1000;
          stats.n_sent_flood = getNumSentFlood();
@@ -534,7 +590,7 @@ protected:
          stats.n_recv_flood = getNumRecvFlood();
          stats.n_recv_direct = getNumRecvDirect();
          stats.n_full_events = getNumFullEvents();
-          stats.last_snr = (int16_t)(my_radio->getLastSNR() * 4);
+          stats.last_snr = (int16_t)(radio_driver.getLastSNR() * 4);
          stats.n_direct_dups = ((SimpleMeshTables *)getTables())->getNumDirectDups();
          stats.n_flood_dups = ((SimpleMeshTables *)getTables())->getNumFloodDups();
          stats.n_posted = _num_posted;
@@ -544,7 +600,7 @@ protected:
          memcpy(reply_data, &now, 4);   // response packets always prefixed with timestamp
          memcpy(&reply_data[4], &stats, sizeof(stats));
          uint8_t reply_len = 4 + sizeof(stats);
-  
+
          if (packet->isRouteFlood()) {
            // let this sender know path TO here, so they can use sendDirect(), and ALSO encode the response
            mesh::Packet* path = createPathReturn(client->id, secret, packet->path, packet->path_len,
@@ -593,12 +649,12 @@ protected:
  }

 public:
-  MyMesh(RADIO_CLASS& phy, mesh::MainBoard& board, RadioLibWrapper& radio, mesh::MillisecondClock& ms, mesh::RNG& rng, mesh::RTCClock& rtc, mesh::MeshTables& tables)
+  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),
-        _phy(&phy), _board(&board), _cli(board, this, &_prefs, this)
+      _cli(board, this, &_prefs, this)
  {
-    my_radio = &radio;
    next_local_advert = next_flood_advert = 0;
+    _logging = false;

    // defaults
    memset(&_prefs, 0, sizeof(_prefs));
@@ -638,17 +694,16 @@ public:
    // load persisted prefs
    _cli.loadPrefs(_fs);

-    _phy->setFrequency(_prefs.freq);
-    _phy->setSpreadingFactor(_prefs.sf);
-    _phy->setBandwidth(_prefs.bw);
-    _phy->setCodingRate(_prefs.cr);
-    _phy->setOutputPower(_prefs.tx_power_dbm);
+    radio_set_params(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
+    radio_set_tx_power(_prefs.tx_power_dbm);

    updateAdvertTimer();
+    updateFloodAdvertTimer();
  }

  const char* getFirmwareVer() override { return FIRMWARE_VERSION; }
  const char* getBuildDate() override { return FIRMWARE_BUILD_DATE; }
+  const char* getRole() override { return FIRMWARE_ROLE; }
  const char* getNodeName() { return _prefs.node_name; }

  void savePrefs() override {
@@ -690,12 +745,26 @@ public:
    }
  }

-  void setLoggingOn(bool enable) override { /* no-op */ }
-  void eraseLogFile() override { /* no-op */ }
-  void dumpLogFile() override { /* no-op */ }
+  void setLoggingOn(bool enable) override { _logging = enable; }
+
+  void eraseLogFile() override {
+    _fs->remove(PACKET_LOG_FILE);
+  }
+
+  void dumpLogFile() override {
+    File f = _fs->open(PACKET_LOG_FILE);
+    if (f) {
+      while (f.available()) {
+        int c = f.read();
+        if (c < 0) break;
+        Serial.print((char)c);
+      }
+      f.close();
+    }
+  }

  void setTxPower(uint8_t power_dbm) override {
-    _phy->setOutputPower(power_dbm);
+    radio_set_tx_power(power_dbm);
  }

  void loop() {
@@ -713,6 +782,7 @@ public:
      }
      // check next Round-Robin client, and sync next new post
      auto client = &known_clients[next_client_idx];
+      bool did_push = false;
      if (client->pending_ack == 0 && client->last_activity != 0 && client->push_failures < 3) {  // not already waiting for ACK, AND not evicted, AND retries not max
        MESH_DEBUG_PRINTLN("loop - checking for client %02X", (uint32_t) client->id.pub_key[0]);
        for (int k = 0, idx = next_post_idx; k < MAX_UNSYNCED_POSTS; k++) {
@@ -720,6 +790,7 @@ public:
            && !posts[idx].author.matches(client->id)) {    // don't push posts to the author
            // push this post to Client, then wait for ACK
            pushPostToClient(client, posts[idx]);
+            did_push = true;
            MESH_DEBUG_PRINTLN("loop - pushed to client %02X: %s", (uint32_t) client->id.pub_key[0], posts[idx].text);
            break;
          }
@@ -730,7 +801,12 @@ public:
      }
      next_client_idx = (next_client_idx + 1) % num_clients;  // round robin polling for each client

-      next_push = futureMillis(SYNC_PUSH_INTERVAL);
+      if (did_push) {
+        next_push = futureMillis(SYNC_PUSH_INTERVAL);
+      } else {
+        // were no unsynced posts for curr client, so proccess next client much quicker! (in next loop())
+        next_push = futureMillis(SYNC_PUSH_INTERVAL / 8);
+      }
    }

    if (next_flood_advert && millisHasNowPassed(next_flood_advert)) {
@@ -756,15 +832,7 @@ public:

 StdRNG fast_rng;
 SimpleMeshTables tables;
-
-#ifdef ESP32
-ESP32RTCClock fallback_clock;
-#else
-VolatileRTCClock fallback_clock;
-#endif
-AutoDiscoverRTCClock rtc_clock(fallback_clock);
-
-MyMesh the_mesh(radio, board, *new WRAPPER_CLASS(radio, board), *new ArduinoMillis(), fast_rng, rtc_clock, tables);
+MyMesh the_mesh(board, radio_driver, *new ArduinoMillis(), fast_rng, rtc_clock, tables);

 void halt() {
  while (1) ;
@@ -777,14 +845,18 @@ void setup() {
  delay(1000);

  board.begin();
-#ifdef ESP32
-  fallback_clock.begin();
+
+#ifdef DISPLAY_CLASS
+  if(display.begin()){
+    display.startFrame();
+    display.print("Please wait...");
+    display.endFrame();
+  }
 #endif
-  rtc_clock.begin(Wire);

  if (!radio_init()) { halt(); }

-  fast_rng.begin(radio.random(0x7FFFFFFF));
+  fast_rng.begin(radio_get_rng_seed());

  FILESYSTEM* fs;
 #if defined(NRF52_PLATFORM)
@@ -799,8 +871,11 @@ void setup() {
  #error "need to define filesystem"
 #endif
  if (!store.load("_main", the_mesh.self_id)) {
-    RadioNoiseListener rng(radio);
-    the_mesh.self_id = mesh::LocalIdentity(&rng);  // create new random identity
+    the_mesh.self_id = radio_new_identity();   // create new random identity
+    int count = 0;
+    while (count < 10 && (the_mesh.self_id.pub_key[0] == 0x00 || the_mesh.self_id.pub_key[0] == 0xFF)) {  // reserved id hashes
+      the_mesh.self_id = radio_new_identity(); count++;
+    }
    store.save("_main", the_mesh.self_id);
  }

@@ -812,7 +887,6 @@ void setup() {
  the_mesh.begin(fs);

 #ifdef DISPLAY_CLASS
-  display.begin();
  ui_task.begin(the_mesh.getNodeName(), FIRMWARE_BUILD_DATE);
 #endif

--- a/examples/simple_secure_chat/main.cpp
+++ b/examples/simple_secure_chat/main.cpp
@@ -7,9 +7,6 @@
  #include <SPIFFS.h>
 #endif

-#define RADIOLIB_STATIC_ONLY 1
-#include <RadioLib.h>
-#include <helpers/RadioLibWrappers.h>
 #include <helpers/ArduinoHelpers.h>
 #include <helpers/StaticPoolPacketManager.h>
 #include <helpers/SimpleMeshTables.h>
@@ -193,6 +190,10 @@ protected:
    return 0;  // disable rxdelay
  }

+  bool allowPacketForward(const mesh::Packet* packet) override {
+    return true;
+  }
+
  void onDiscoveredContact(ContactInfo& contact, bool is_new) override {
    // TODO: if not in favs,  prompt to add as fav(?)

@@ -262,8 +263,7 @@ protected:
  }

 public:
-
-  MyMesh(RadioLibWrapper& radio, mesh::RNG& rng, mesh::RTCClock& rtc, SimpleMeshTables& tables)
+  MyMesh(mesh::Radio& radio, StdRNG& rng, mesh::RTCClock& rtc, SimpleMeshTables& tables)
     : BaseChatMesh(radio, *new ArduinoMillis(), rng, rtc, *new StaticPoolPacketManager(16), tables)
  {
    // defaults
@@ -291,7 +291,19 @@ public:
    IdentityStore store(fs, "/identity");
  #endif
    if (!store.load("_main", self_id, _prefs.node_name, sizeof(_prefs.node_name))) {  // legacy: node_name was from identity file
+      // Need way to get some entropy to seed RNG
+      Serial.println("Press ENTER to generate key:");
+      char c = 0;
+      while (c != '\n') {   // wait for ENTER to be pressed
+        if (Serial.available()) c = Serial.read();
+      }
+      ((StdRNG *)getRNG())->begin(millis());
+
      self_id = mesh::LocalIdentity(getRNG());  // create new random identity
+      int count = 0;
+      while (count < 10 && (self_id.pub_key[0] == 0x00 || self_id.pub_key[0] == 0xFF)) {  // reserved id hashes
+        self_id = mesh::LocalIdentity(getRNG()); count++;
+      }
      store.save("_main", self_id);
    }

@@ -325,6 +337,8 @@ public:
    Serial.println("===== MeshCore Chat Terminal =====");
    Serial.println();
    Serial.printf("WELCOME  %s\n", _prefs.node_name);
+    mesh::Utils::printHex(Serial, self_id.pub_key, PUB_KEY_SIZE);
+    Serial.println();
    Serial.println("   (enter 'help' for basic commands)");
    Serial.println();
  }
@@ -513,7 +527,7 @@ public:

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

 void halt() {
  while (1) ;
@@ -526,7 +540,7 @@ void setup() {

  if (!radio_init()) { halt(); }

-  fast_rng.begin(radio.random(0x7FFFFFFF));
+  fast_rng.begin(radio_get_rng_seed());

 #if defined(NRF52_PLATFORM)
  InternalFS.begin();
@@ -538,12 +552,8 @@ void setup() {
  #error "need to define filesystem"
 #endif

-  if (LORA_FREQ != the_mesh.getFreqPref()) {
-    radio.setFrequency(the_mesh.getFreqPref());
-  }
-  if (LORA_TX_POWER != the_mesh.getTxPowerPref()) {
-    radio.setOutputPower(the_mesh.getTxPowerPref());
-  }
+  radio_set_params(the_mesh.getFreqPref(), LORA_BW, LORA_SF, LORA_CR);
+  radio_set_tx_power(the_mesh.getTxPowerPref());

  the_mesh.showWelcome();

--- a/platformio.ini
+++ b/platformio.ini
@@ -23,9 +23,9 @@ lib_deps =
  adafruit/RTClib @ ^2.1.3
  melopero/Melopero RV3028 @ ^1.1.0
 build_flags = -w -DNDEBUG -DRADIOLIB_STATIC_ONLY=1 -DRADIOLIB_GODMODE=1
-  -D LORA_FREQ=867.5
+  -D LORA_FREQ=869.525
  -D LORA_BW=250
-  -D LORA_SF=10
+  -D LORA_SF=11
 build_src_filter =
  +<*.cpp>
  +<helpers/*.cpp>
--- a/src/Dispatcher.cpp
+++ b/src/Dispatcher.cpp
@@ -29,6 +29,9 @@ int Dispatcher::calcRxDelay(float score, uint32_t air_time) const {
 uint32_t Dispatcher::getCADFailRetryDelay() const {
  return 200;
 }
+uint32_t Dispatcher::getCADFailMaxDuration() const {
+  return 4000;   // 4 seconds
+}

 void Dispatcher::loop() {
  if (outbound) {  // waiting for outbound send to be completed
@@ -185,9 +188,20 @@ void Dispatcher::checkSend() {
  if (_mgr->getOutboundCount() == 0) return;  // nothing waiting to send
  if (!millisHasNowPassed(next_tx_time)) return;   // still in 'radio silence' phase (from airtime budget setting)
  if (_radio->isReceiving()) {   // LBT - check if radio is currently mid-receive, or if channel activity
-    next_tx_time = futureMillis(getCADFailRetryDelay());
-    return; 
+    if (cad_busy_start == 0) {
+      cad_busy_start = _ms->getMillis();   // record when CAD busy state started
+    }
+
+    if (_ms->getMillis() - cad_busy_start > getCADFailMaxDuration()) {
+      MESH_DEBUG_PRINTLN("%s Dispatcher::checkSend(): CAD busy max duration reached!", getLogDateTime());
+      // channel activity has gone on too long... (Radio might be in a bad state)
+      // force the pending transmit below...
+    } else {
+      next_tx_time = futureMillis(getCADFailRetryDelay());
+      return;
+    }
  }
+  cad_busy_start = 0;  // reset busy state

  outbound = _mgr->getNextOutbound(_ms->getMillis());
  if (outbound) {
--- a/src/Dispatcher.h
+++ b/src/Dispatcher.h
@@ -98,6 +98,7 @@ class Dispatcher {
  Packet* outbound;  // current outbound packet
  unsigned long outbound_expiry, outbound_start, total_air_time;
  unsigned long next_tx_time;
+  unsigned long cad_busy_start;
  uint32_t n_sent_flood, n_sent_direct;
  uint32_t n_recv_flood, n_recv_direct;
  uint32_t n_full_events;
@@ -113,6 +114,7 @@ protected:
    : _radio(&radio), _ms(&ms), _mgr(&mgr)
  {
    outbound = NULL; total_air_time = 0; next_tx_time = 0;
+    cad_busy_start = 0;
  }

  virtual DispatcherAction onRecvPacket(Packet* pkt) = 0;
@@ -127,6 +129,7 @@ protected:
  virtual float getAirtimeBudgetFactor() const;
  virtual int calcRxDelay(float score, uint32_t air_time) const;
  virtual uint32_t getCADFailRetryDelay() const;
+  virtual uint32_t getCADFailMaxDuration() const;

 public:
  void begin();
--- a/src/helpers/CommonCLI.cpp
+++ b/src/helpers/CommonCLI.cpp
@@ -198,6 +198,11 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
        sprintf(reply, "> %d", (uint32_t) _prefs->tx_power_dbm);
      } else if (memcmp(config, "freq", 4) == 0) {
        sprintf(reply, "> %s", StrHelper::ftoa(_prefs->freq));
+      } else if (memcmp(config, "public.key", 10) == 0) {
+        strcpy(reply, "> ");
+        mesh::Utils::toHex(&reply[2], _mesh->self_id.pub_key, PUB_KEY_SIZE);
+      } else if (memcmp(config, "role", 4) == 0) {
+        sprintf(reply, "> %s", _callbacks->getRole());
      } else {
        sprintf(reply, "??: %s", config);
      }
--- a/src/helpers/CommonCLI.h
+++ b/src/helpers/CommonCLI.h
@@ -31,6 +31,7 @@ public:
  virtual void savePrefs() = 0;
  virtual const char* getFirmwareVer() = 0;
  virtual const char* getBuildDate() = 0;
+  virtual const char* getRole() = 0;
  virtual bool formatFileSystem() = 0;
  virtual void sendSelfAdvertisement(int delay_millis) = 0;
  virtual void updateAdvertTimer() = 0;
@@ -56,7 +57,7 @@ class CommonCLI {
  void loadPrefsInt(FILESYSTEM* _fs, const char* filename);

 public:
-  CommonCLI(mesh::MainBoard& board, mesh::Mesh* mesh, NodePrefs* prefs, CommonCLICallbacks* callbacks) 
+  CommonCLI(mesh::MainBoard& board, mesh::Mesh* mesh, NodePrefs* prefs, CommonCLICallbacks* callbacks)
      : _board(&board), _mesh(mesh), _prefs(prefs), _callbacks(callbacks) { }

  void loadPrefs(FILESYSTEM* _fs);
--- a/src/helpers/CustomLLCC68.h
+++ b/src/helpers/CustomLLCC68.h
@@ -3,6 +3,7 @@
 #include <RadioLib.h>

 #define SX126X_IRQ_HEADER_VALID                     0b0000010000  //  4     4     valid LoRa header received
+#define SX126X_IRQ_PREAMBLE_DETECTED           0x04

 class CustomLLCC68 : public LLCC68 {
  public:
@@ -10,7 +11,7 @@ class CustomLLCC68 : public LLCC68 {

    bool isReceiving() {
      uint16_t irq = getIrqFlags();
-      bool hasPreamble = (irq & SX126X_IRQ_HEADER_VALID);
-      return hasPreamble;
+      bool detected = (irq & SX126X_IRQ_HEADER_VALID) || (irq & SX126X_IRQ_PREAMBLE_DETECTED);
+      return detected;
    }
 };
--- a/src/helpers/CustomLR1110.h
+++ b/src/helpers/CustomLR1110.h
@@ -11,7 +11,7 @@ class CustomLR1110 : public LR1110 {

    bool isReceiving() {
      uint16_t irq = getIrqStatus();
-      bool hasPreamble = ((irq & LR1110_IRQ_HEADER_VALID) && (irq & LR1110_IRQ_HAS_PREAMBLE));
-      return hasPreamble;
+      bool detected = ((irq & LR1110_IRQ_HEADER_VALID) || (irq & LR1110_IRQ_HAS_PREAMBLE));
+      return detected;
    }
 };
--- a/src/helpers/CustomSX1262.h
+++ b/src/helpers/CustomSX1262.h
@@ -3,6 +3,7 @@
 #include <RadioLib.h>

 #define SX126X_IRQ_HEADER_VALID                     0b0000010000  //  4     4     valid LoRa header received
+#define SX126X_IRQ_PREAMBLE_DETECTED           0x04

 class CustomSX1262 : public SX1262 {
  public:
@@ -10,7 +11,7 @@ class CustomSX1262 : public SX1262 {

    bool isReceiving() {
      uint16_t irq = getIrqFlags();
-      bool hasPreamble = (irq & SX126X_IRQ_HEADER_VALID);
-      return hasPreamble;
+      bool detected = (irq & SX126X_IRQ_HEADER_VALID) || (irq & SX126X_IRQ_PREAMBLE_DETECTED);
+      return detected;
    }
 };
--- a/src/helpers/CustomSX1268.h
+++ b/src/helpers/CustomSX1268.h
@@ -3,6 +3,7 @@
 #include <RadioLib.h>

 #define SX126X_IRQ_HEADER_VALID                     0b0000010000  //  4     4     valid LoRa header received
+#define SX126X_IRQ_PREAMBLE_DETECTED           0x04

 class CustomSX1268 : public SX1268 {
  public:
@@ -10,7 +11,7 @@ class CustomSX1268 : public SX1268 {

    bool isReceiving() {
      uint16_t irq = getIrqFlags();
-      bool hasPreamble = (irq & SX126X_IRQ_HEADER_VALID);
-      return hasPreamble;
+      bool detected = (irq & SX126X_IRQ_HEADER_VALID) || (irq & SX126X_IRQ_PREAMBLE_DETECTED);
+      return detected;
    }
 };
--- a/src/helpers/ESP32Board.h
+++ b/src/helpers/ESP32Board.h
@@ -34,7 +34,9 @@ public:
  #endif

  #if defined(PIN_BOARD_SDA) && defined(PIN_BOARD_SCL)
+   #if PIN_BOARD_SDA >= 0 && PIN_BOARD_SCL >= 0
    Wire.begin(PIN_BOARD_SDA, PIN_BOARD_SCL);
+   #endif
  #else
    Wire.begin();
  #endif
--- a/src/helpers/esp32/ESPNOWRadio.cpp
+++ b/src/helpers/esp32/ESPNOWRadio.cpp
@@ -0,0 +1,103 @@
+#include "ESPNOWRadio.h"
+#include <esp_now.h>
+#include <WiFi.h>
+#include <esp_wifi.h>
+
+static uint8_t broadcastAddress[] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
+static esp_now_peer_info_t peerInfo;
+static bool is_send_complete = false;
+static esp_err_t last_send_result;
+static uint8_t rx_buf[256];
+static uint8_t last_rx_len = 0;
+
+// callback when data is sent
+static void OnDataSent(const uint8_t *mac_addr, esp_now_send_status_t status) {
+  is_send_complete = true;
+  ESPNOW_DEBUG_PRINTLN("Send Status: %d", (int)status);
+}
+
+static void OnDataRecv(const uint8_t *mac, const uint8_t *data, int len) {
+  ESPNOW_DEBUG_PRINTLN("Recv: len = %d", len);
+  memcpy(rx_buf, data, len);
+  last_rx_len = len;
+}
+
+void ESPNOWRadio::begin() {
+  // Set device as a Wi-Fi Station
+  WiFi.mode(WIFI_STA);
+  // Long Range mode
+  esp_wifi_set_protocol(WIFI_IF_STA, WIFI_PROTOCOL_LR);
+
+  // Init ESP-NOW
+  if (esp_now_init() != ESP_OK) {
+    ESPNOW_DEBUG_PRINTLN("Error initializing ESP-NOW");
+    return;
+  }
+
+  esp_wifi_set_max_tx_power(80);  // should be 20dBm
+
+  esp_now_register_send_cb(OnDataSent);
+  esp_now_register_recv_cb(OnDataRecv);
+
+  // Register peer
+  memcpy(peerInfo.peer_addr, broadcastAddress, 6);
+  peerInfo.channel = 0;
+  peerInfo.encrypt = false;
+
+  // Add peer        
+  if (esp_now_add_peer(&peerInfo) == ESP_OK) {
+    ESPNOW_DEBUG_PRINTLN("init success");
+  } else {
+   // ESPNOW_DEBUG_PRINTLN("Failed to add peer");
+  }
+}
+
+void ESPNOWRadio::setTxPower(uint8_t dbm) {
+  esp_wifi_set_max_tx_power(dbm * 4);
+}
+
+uint32_t ESPNOWRadio::intID() {
+  uint8_t mac[8];
+  memset(mac, 0, sizeof(mac));
+  esp_efuse_mac_get_default(mac);
+  uint32_t n, m;
+  memcpy(&n, &mac[0], 4);
+  memcpy(&m, &mac[4], 4);
+  
+  return n + m;
+}
+
+void ESPNOWRadio::startSendRaw(const uint8_t* bytes, int len) {
+  // Send message via ESP-NOW
+  is_send_complete = false;
+  esp_err_t result = esp_now_send(broadcastAddress, bytes, len);
+  if (result == ESP_OK) {
+    ESPNOW_DEBUG_PRINTLN("Send success");
+  } else {
+    last_send_result = result;
+    is_send_complete = true;
+    ESPNOW_DEBUG_PRINTLN("Send failed: %d", result);
+  }
+}
+
+bool ESPNOWRadio::isSendComplete() {
+  return is_send_complete;
+}
+void ESPNOWRadio::onSendFinished() {
+}
+
+float ESPNOWRadio::getLastRSSI() const { return 0; }
+float ESPNOWRadio::getLastSNR() const { return 0; }
+
+int ESPNOWRadio::recvRaw(uint8_t* bytes, int sz) {
+  int len = last_rx_len;
+  if (last_rx_len > 0) {
+    memcpy(bytes, rx_buf, last_rx_len);
+    last_rx_len = 0;
+  }
+  return len;
+}
+
+uint32_t ESPNOWRadio::getEstAirtimeFor(int len_bytes) {
+  return 4;  // Fast AF
+}
--- a/src/helpers/esp32/ESPNOWRadio.h
+++ b/src/helpers/esp32/ESPNOWRadio.h
@@ -0,0 +1,36 @@
+#pragma once
+
+#include <Mesh.h>
+
+class ESPNOWRadio : public mesh::Radio {
+protected:
+  uint32_t n_recv, n_sent;
+
+public:
+  ESPNOWRadio() { n_recv = n_sent = 0; }
+
+  void begin() override;
+  int recvRaw(uint8_t* bytes, int sz) override;
+  uint32_t getEstAirtimeFor(int len_bytes) override;
+  void startSendRaw(const uint8_t* bytes, int len) override;
+  bool isSendComplete() override;
+  void onSendFinished() override;
+
+  uint32_t getPacketsRecv() const { return n_recv; }
+  uint32_t getPacketsSent() const { return n_sent; }
+  virtual float getLastRSSI() const override;
+  virtual float getLastSNR() const override;
+
+  float packetScore(float snr, int packet_len) override { return 0; }
+  uint32_t intID();
+  void setTxPower(uint8_t dbm);
+};
+
+#if ESPNOW_DEBUG_LOGGING && ARDUINO
+  #include <Arduino.h>
+  #define ESPNOW_DEBUG_PRINT(F, ...) Serial.printf("ESP-Now: " F, ##__VA_ARGS__)
+  #define ESPNOW_DEBUG_PRINTLN(F, ...) Serial.printf("ESP-Now: " F "\n", ##__VA_ARGS__)
+#else
+  #define ESPNOW_DEBUG_PRINT(...) {}
+  #define ESPNOW_DEBUG_PRINTLN(...) {}
+#endif
--- a/src/helpers/nrf52/PromicroBoard.cpp
+++ b/src/helpers/nrf52/PromicroBoard.cpp
@@ -1,12 +1,12 @@
 #include <Arduino.h>
-#include "faketecBoard.h"
+#include "PromicroBoard.h"

 #include <bluefruit.h>
 #include <Wire.h>

 static BLEDfu bledfu;

-void FaketecBoard::begin() {    
+void PromicroBoard::begin() {    
    // for future use, sub-classes SHOULD call this from their begin()
    startup_reason = BD_STARTUP_NORMAL;
    btn_prev_state = HIGH;
@@ -39,7 +39,7 @@ static void disconnect_callback(uint16_t conn_handle, uint8_t reason) {
    MESH_DEBUG_PRINTLN("BLE client disconnected");
 }

-bool FaketecBoard::startOTAUpdate(const char* id, char reply[]) {
+bool PromicroBoard::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()
@@ -50,7 +50,7 @@ bool FaketecBoard::startOTAUpdate(const char* id, char reply[]) {
  // 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("Faketec_OTA");
+  Bluefruit.setName("ProMicro_OTA");

  Bluefruit.Periph.setConnectCallback(connect_callback);
  Bluefruit.Periph.setDisconnectCallback(disconnect_callback);
--- a/src/helpers/nrf52/PromicroBoard.h
+++ b/src/helpers/nrf52/PromicroBoard.h
@@ -19,7 +19,7 @@
 #define  PIN_VBAT_READ 17
 #define  ADC_MULTIPLIER   (1.815f) // dependent on voltage divider resistors. TODO: more accurate battery tracking

-class FaketecBoard : public mesh::MainBoard {
+class PromicroBoard : public mesh::MainBoard {
 protected:
  uint8_t startup_reason;
  uint8_t btn_prev_state;
@@ -43,7 +43,7 @@ public:
  }

  const char* getManufacturerName() const override {
-    return "Faketec DIY";
+    return "ProMicro DIY";
  }

  int buttonStateChanged() {
--- a/src/helpers/ui/DisplayDriver.h
+++ b/src/helpers/ui/DisplayDriver.h
@@ -15,6 +15,7 @@ public:
  virtual bool isOn() = 0;
  virtual void turnOn() = 0;
  virtual void turnOff() = 0;
+  virtual void clear() = 0;
  virtual void startFrame(Color bkg = DARK) = 0;
  virtual void setTextSize(int sz) = 0;
  virtual void setColor(Color c) = 0;
--- a/src/helpers/ui/SSD1306Display.cpp
+++ b/src/helpers/ui/SSD1306Display.cpp
@@ -20,6 +20,11 @@ void SSD1306Display::turnOff() {
  _isOn = false;
 }

+void SSD1306Display::clear() {
+  display.clearDisplay();
+  display.display();
+}
+
 void SSD1306Display::startFrame(Color bkg) {
  display.clearDisplay();  // TODO: apply 'bkg'
  _color = SSD1306_WHITE;
--- a/src/helpers/ui/SSD1306Display.h
+++ b/src/helpers/ui/SSD1306Display.h
@@ -27,6 +27,7 @@ public:
  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;
--- a/variants/generic_espnow/platformio.ini
+++ b/variants/generic_espnow/platformio.ini
@@ -0,0 +1,82 @@
+
+; ----------- Generic ESP32-C3 ------------
+
+[Generic_ESPNOW]
+extends = esp32_base
+board = esp32-c3-devkitm-1
+;board = esp32-s3-devkitm-1
+build_flags =
+  ${esp32_base.build_flags}
+  -I variants/generic_espnow
+;  -D ESP32_CPU_FREQ=80
+  -D PIN_BOARD_SDA=-1
+  -D PIN_BOARD_SCL=-1
+;  -D P_LORA_TX_LED=8
+  -D PIN_USER_BTN=0
+;  -D ARDUINO_USB_MODE=1
+;  -D ARDUINO_USB_CDC_ON_BOOT=1
+;  -D ESPNOW_DEBUG_LOGGING=1
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
+build_src_filter = ${esp32_base.build_src_filter}
+  +<helpers/esp32/ESPNowRadio.cpp>
+  +<../variants/generic_espnow>
+
+[env:Generic_ESPNOW_terminal_chat]
+extends = Generic_ESPNOW
+build_flags =
+  ${Generic_ESPNOW.build_flags}
+  -D MAX_CONTACTS=100
+  -D MAX_GROUP_CHANNELS=1
+build_src_filter = ${Generic_ESPNOW.build_src_filter}
+  +<../examples/simple_secure_chat/main.cpp>
+lib_deps =
+  ${Generic_ESPNOW.lib_deps}
+  densaugeo/base64 @ ~1.4.0
+
+[env:Generic_ESPNOW_repeatr]
+extends = Generic_ESPNOW
+build_flags =
+  ${Generic_ESPNOW.build_flags}
+  -D ADVERT_NAME='"ESPNOW Repeater"'
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
+  -D ADMIN_PASSWORD='"password"'
+build_src_filter = ${Generic_ESPNOW.build_src_filter}
+  +<../examples/simple_repeater/main.cpp>
+lib_deps =
+  ${Generic_ESPNOW.lib_deps}
+  ${esp32_ota.lib_deps}
+  densaugeo/base64 @ ~1.4.0
+
+[env:Generic_ESPNOW_comp_radio_usb]
+extends = Generic_ESPNOW
+build_flags =
+  ${Generic_ESPNOW.build_flags}
+  -D MAX_CONTACTS=100
+  -D MAX_GROUP_CHANNELS=8
+;  -D ENABLE_PRIVATE_KEY_IMPORT=1
+;  -D ENABLE_PRIVATE_KEY_EXPORT=1
+; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
+; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
+; NOTE: DO NOT ENABLE -->  -D ESPNOW_DEBUG_LOGGING=1
+build_src_filter = ${Generic_ESPNOW.build_src_filter}
+  +<../examples/companion_radio/main.cpp>
+lib_deps =
+  ${Generic_ESPNOW.lib_deps}
+  densaugeo/base64 @ ~1.4.0
+
+[env:Generic_ESPNOW_room_svr]
+extends = Generic_ESPNOW
+build_flags =
+  ${Generic_ESPNOW.build_flags}
+  -D ADVERT_NAME='"Heltec Room"'
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
+  -D ADMIN_PASSWORD='"password"'
+  -D ROOM_PASSWORD='"hello"'
+build_src_filter = ${Generic_ESPNOW.build_src_filter}
+  +<../examples/simple_room_server/main.cpp>
+lib_deps =
+  ${Generic_ESPNOW.lib_deps}
+  ${esp32_ota.lib_deps}
--- a/variants/generic_espnow/target.cpp
+++ b/variants/generic_espnow/target.cpp
@@ -0,0 +1,33 @@
+#include <Arduino.h>
+#include "target.h"
+#include <helpers/ArduinoHelpers.h>
+
+ESP32Board board;
+
+ESPNOWRadio radio_driver;
+
+ESP32RTCClock rtc_clock;
+
+bool radio_init() {
+  rtc_clock.begin();
+
+  // NOTE: radio_driver.begin() is called by Dispatcher::begin(), so not needed here
+  return true;  // success
+}
+
+uint32_t radio_get_rng_seed() {
+  return millis() + radio_driver.intID();  // TODO: where to get some entropy?
+}
+
+void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
+  // no-op
+}
+
+void radio_set_tx_power(uint8_t dbm) {
+  radio_driver.setTxPower(dbm);
+}
+
+mesh::LocalIdentity radio_new_identity() {
+  StdRNG  rng;  // TODO: need stronger True-RNG here
+  return mesh::LocalIdentity(&rng);  // create new random identity
+}
--- a/variants/generic_espnow/target.h
+++ b/variants/generic_espnow/target.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#include <helpers/ESP32Board.h>
+#include <helpers/esp32/ESPNOWRadio.h>
+
+extern ESP32Board board;
+extern ESPNOWRadio radio_driver;
+extern ESP32RTCClock rtc_clock;
+
+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/heltec_v2/platformio.ini
+++ b/variants/heltec_v2/platformio.ini
@@ -25,8 +25,8 @@ build_flags =
  ${Heltec_lora32_v2.build_flags}
  -D DISPLAY_CLASS=SSD1306Display
  -D ADVERT_NAME='"Heltec Repeater"'
-  -D ADVERT_LAT=-37.0
-  -D ADVERT_LON=145.0
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
  -D ADMIN_PASSWORD='"password"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -43,8 +43,8 @@ build_flags =
  ${Heltec_lora32_v2.build_flags}
  -D DISPLAY_CLASS=SSD1306Display
  -D ADVERT_NAME='"Heltec Room"'
-  -D ADVERT_LAT=-37.0
-  -D ADVERT_LON=145.0
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
  -D ADMIN_PASSWORD='"password"'
  -D ROOM_PASSWORD='"hello"'
 ;  -D MESH_PACKET_LOGGING=1
--- a/variants/heltec_v2/target.cpp
+++ b/variants/heltec_v2/target.cpp
@@ -10,11 +10,19 @@ HeltecV2Board board;
  RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY);
 #endif

+WRAPPER_CLASS radio_driver(radio, board);
+
+ESP32RTCClock fallback_clock;
+AutoDiscoverRTCClock rtc_clock(fallback_clock);
+
 #ifndef LORA_CR
  #define LORA_CR      5
 #endif

 bool radio_init() {
+  fallback_clock.begin();
+  rtc_clock.begin(Wire);
+  
 #if defined(P_LORA_SCLK)
  spi.begin(P_LORA_SCLK, P_LORA_MISO, P_LORA_MOSI);
 #endif
@@ -29,3 +37,23 @@ bool radio_init() {
  
  return true;  // success
 }
+
+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/heltec_v2/target.h
+++ b/variants/heltec_v2/target.h
@@ -1,9 +1,18 @@
 #pragma once

+#define RADIOLIB_STATIC_ONLY 1
+#include <RadioLib.h>
+#include <helpers/RadioLibWrappers.h>
 #include <helpers/HeltecV2Board.h>
 #include <helpers/CustomSX1276Wrapper.h>
+#include <helpers/AutoDiscoverRTCClock.h>

 extern HeltecV2Board board;
-extern RADIO_CLASS radio;
+extern WRAPPER_CLASS radio_driver;
+extern AutoDiscoverRTCClock rtc_clock;

 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/heltec_v3/platformio.ini
+++ b/variants/heltec_v3/platformio.ini
@@ -28,8 +28,8 @@ build_flags =
  ${Heltec_lora32_v3.build_flags}
  -D DISPLAY_CLASS=SSD1306Display
  -D ADVERT_NAME='"Heltec Repeater"'
-  -D ADVERT_LAT=-37.0
-  -D ADVERT_LON=145.0
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
  -D ADMIN_PASSWORD='"password"'
  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -46,8 +46,8 @@ build_flags =
  ${Heltec_lora32_v3.build_flags}
  -D DISPLAY_CLASS=SSD1306Display
  -D ADVERT_NAME='"Heltec Room"'
-  -D ADVERT_LAT=-37.0
-  -D ADVERT_LON=145.0
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
  -D ADMIN_PASSWORD='"password"'
  -D ROOM_PASSWORD='"hello"'
 ;  -D MESH_PACKET_LOGGING=1
@@ -139,8 +139,8 @@ extends = Heltec_lora32_v3
 build_flags =
  ${Heltec_lora32_v3.build_flags}
  -D ADVERT_NAME='"Heltec Repeater"'
-  -D ADVERT_LAT=-37.0
-  -D ADVERT_LON=145.0
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
  -D ADMIN_PASSWORD='"password"'
  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -157,8 +157,8 @@ build_src_filter = ${Heltec_lora32_v3.build_src_filter}
 build_flags =
  ${Heltec_lora32_v3.build_flags}
  -D ADVERT_NAME='"Heltec Room"'
-  -D ADVERT_LAT=-37.0
-  -D ADVERT_LON=145.0
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
  -D ADMIN_PASSWORD='"password"'
  -D ROOM_PASSWORD='"hello"'
 ;  -D MESH_PACKET_LOGGING=1
--- a/variants/heltec_v3/target.cpp
+++ b/variants/heltec_v3/target.cpp
@@ -10,11 +10,19 @@ HeltecV3Board board;
  RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY);
 #endif

+WRAPPER_CLASS radio_driver(radio, board);
+
+ESP32RTCClock fallback_clock;
+AutoDiscoverRTCClock rtc_clock(fallback_clock);
+
 #ifndef LORA_CR
  #define LORA_CR      5
 #endif

 bool radio_init() {
+  fallback_clock.begin();
+  rtc_clock.begin(Wire);
+  
 #ifdef SX126X_DIO3_TCXO_VOLTAGE
  float tcxo = SX126X_DIO3_TCXO_VOLTAGE;
 #else
@@ -45,3 +53,23 @@ bool radio_init() {

  return true;  // success
 }
+
+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/heltec_v3/target.h
+++ b/variants/heltec_v3/target.h
@@ -1,9 +1,18 @@
 #pragma once

+#define RADIOLIB_STATIC_ONLY 1
+#include <RadioLib.h>
+#include <helpers/RadioLibWrappers.h>
 #include <helpers/HeltecV3Board.h>
 #include <helpers/CustomSX1262Wrapper.h>
+#include <helpers/AutoDiscoverRTCClock.h>

 extern HeltecV3Board board;
-extern RADIO_CLASS radio;
+extern WRAPPER_CLASS radio_driver;
+extern AutoDiscoverRTCClock rtc_clock;

 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/lilygo_t3s3/platformio.ini
+++ b/variants/lilygo_t3s3/platformio.ini
@@ -39,8 +39,8 @@ build_flags =
  ${LilyGo_T3S3_sx1262.build_flags}
  -D DISPLAY_CLASS=SSD1306Display
  -D ADVERT_NAME='"T3S3-1262 Repeater"'
-  -D ADVERT_LAT=-37.0
-  -D ADVERT_LON=145.0
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
  -D ADMIN_PASSWORD='"password"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -71,8 +71,8 @@ build_flags =
  ${LilyGo_T3S3_sx1262.build_flags}
  -D DISPLAY_CLASS=SSD1306Display
  -D ADVERT_NAME='"T3S3-1262 Room"'
-  -D ADVERT_LAT=-37.0
-  -D ADVERT_LON=145.0
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
  -D ADMIN_PASSWORD='"password"'
  -D ROOM_PASSWORD='"hello"'
 ;  -D MESH_PACKET_LOGGING=1
--- a/variants/lilygo_t3s3/target.cpp
+++ b/variants/lilygo_t3s3/target.cpp
@@ -10,11 +10,19 @@ ESP32Board board;
  RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY);
 #endif

+WRAPPER_CLASS radio_driver(radio, board);
+
+ESP32RTCClock fallback_clock;
+AutoDiscoverRTCClock rtc_clock(fallback_clock);
+
 #ifndef LORA_CR
  #define LORA_CR      5
 #endif

 bool radio_init() {
+  fallback_clock.begin();
+  rtc_clock.begin(Wire);
+  
 #ifdef SX126X_DIO3_TCXO_VOLTAGE
  float tcxo = SX126X_DIO3_TCXO_VOLTAGE;
 #else
@@ -45,3 +53,23 @@ bool radio_init() {

  return true;  // success
 }
+
+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/lilygo_t3s3/target.h
+++ b/variants/lilygo_t3s3/target.h
@@ -1,9 +1,18 @@
 #pragma once

+#define RADIOLIB_STATIC_ONLY 1
+#include <RadioLib.h>
+#include <helpers/RadioLibWrappers.h>
 #include <helpers/ESP32Board.h>
 #include <helpers/CustomSX1262Wrapper.h>
+#include <helpers/AutoDiscoverRTCClock.h>

 extern ESP32Board board;
-extern RADIO_CLASS radio;
+extern WRAPPER_CLASS radio_driver;
+extern AutoDiscoverRTCClock rtc_clock;

 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/lilygo_tbeam/platformio.ini
+++ b/variants/lilygo_tbeam/platformio.ini
@@ -43,4 +43,22 @@ build_src_filter = ${LilyGo_TBeam.build_src_filter}
  +<../examples/companion_radio>
 lib_deps =
  ${LilyGo_TBeam.lib_deps}
-  densaugeo/base64 @ ~1.4.0
+  densaugeo/base64 @ ~1.4.0
+
+[env:Tbeam_repeater]
+extends = LilyGo_TBeam
+build_flags =
+  ${LilyGo_TBeam.build_flags}
+  -D DISPLAY_CLASS=SSD1306Display
+  -D ADVERT_NAME='"Tbeam Repeater"'
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
+  -D ADMIN_PASSWORD='"password"'
+  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
+build_src_filter = ${LilyGo_TBeam.build_src_filter}
+  +<helpers/ui/*.cpp>
+  +<../examples/simple_repeater>
+lib_deps =
+  ${LilyGo_TBeam.lib_deps}
+  ${esp32_ota.lib_deps}
--- a/variants/lilygo_tbeam/target.cpp
+++ b/variants/lilygo_tbeam/target.cpp
@@ -5,16 +5,24 @@ TBeamBoard board;

 #if defined(P_LORA_SCLK)
  static SPIClass spi;
-  RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY, spi);
+  RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_0, P_LORA_RESET, P_LORA_DIO_1, spi);
 #else
-  RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY);
+  RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_0, P_LORA_RESET, P_LORA_DIO_1);
 #endif

+WRAPPER_CLASS radio_driver(radio, board);
+
+ESP32RTCClock fallback_clock;
+AutoDiscoverRTCClock rtc_clock(fallback_clock);
+
 #ifndef LORA_CR
  #define LORA_CR      5
 #endif

 bool radio_init() {
+  fallback_clock.begin();
+  rtc_clock.begin(Wire);
+  
 #if defined(P_LORA_SCLK)
  spi.begin(P_LORA_SCLK, P_LORA_MISO, P_LORA_MOSI);
 #endif
@@ -29,3 +37,23 @@ bool radio_init() {
  
  return true;  // success
 }
+
+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/lilygo_tbeam/target.h
+++ b/variants/lilygo_tbeam/target.h
@@ -1,9 +1,18 @@
 #pragma once

+#define RADIOLIB_STATIC_ONLY 1
+#include <RadioLib.h>
+#include <helpers/RadioLibWrappers.h>
 #include <helpers/TBeamBoard.h>
 #include <helpers/CustomSX1276Wrapper.h>
+#include <helpers/AutoDiscoverRTCClock.h>

 extern TBeamBoard board;
-extern RADIO_CLASS radio;
+extern WRAPPER_CLASS radio_driver;
+extern AutoDiscoverRTCClock rtc_clock;

 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/lilygo_tlora_v2_1/platformio.ini
+++ b/variants/lilygo_tlora_v2_1/platformio.ini
@@ -39,8 +39,8 @@ build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter}
 build_flags =
  ${LilyGo_TLora_V2_1_1_6.build_flags}
  -D ADVERT_NAME='"TLora-V2.1-1.6 Repeater"'
-  -D ADVERT_LAT=-37.0
-  -D ADVERT_LON=145.0
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
  -D ADMIN_PASSWORD='"password"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -109,8 +109,8 @@ build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter}
 build_flags =
  ${LilyGo_TLora_V2_1_1_6.build_flags}
  -D ADVERT_NAME='"TLora-V2.1-1.6 Room"'
-  -D ADVERT_LAT=-37.0
-  -D ADVERT_LON=145.0
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
  -D ADMIN_PASSWORD='"password"'
  -D ROOM_PASSWORD='"hello"'
 ;  -D MESH_PACKET_LOGGING=1
--- a/variants/lilygo_tlora_v2_1/target.cpp
+++ b/variants/lilygo_tlora_v2_1/target.cpp
@@ -6,11 +6,19 @@ LilyGoTLoraBoard board;
 static SPIClass spi;
 RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_0, P_LORA_RESET, P_LORA_DIO_1, spi);

+WRAPPER_CLASS radio_driver(radio, board);
+
+ESP32RTCClock fallback_clock;
+AutoDiscoverRTCClock rtc_clock(fallback_clock);
+
 #ifndef LORA_CR
  #define LORA_CR      5
 #endif

 bool radio_init() {
+  fallback_clock.begin();
+  rtc_clock.begin(Wire);
+  
  spi.begin(P_LORA_SCLK, P_LORA_MISO, P_LORA_MOSI);
  int status = radio.begin(LORA_FREQ, LORA_BW, LORA_SF, LORA_CR, RADIOLIB_SX126X_SYNC_WORD_PRIVATE, LORA_TX_POWER, 8);
  if (status != RADIOLIB_ERR_NONE) {
@@ -23,3 +31,23 @@ bool radio_init() {
  
  return true;  // success
 }
+
+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/lilygo_tlora_v2_1/target.h
+++ b/variants/lilygo_tlora_v2_1/target.h
@@ -1,9 +1,18 @@
 #pragma once

+#define RADIOLIB_STATIC_ONLY 1
+#include <RadioLib.h>
+#include <helpers/RadioLibWrappers.h>
 #include <helpers/LilyGoTLoraBoard.h>
 #include <helpers/CustomSX1276Wrapper.h>
+#include <helpers/AutoDiscoverRTCClock.h>

 extern LilyGoTLoraBoard board;
-extern RADIO_CLASS radio;
+extern WRAPPER_CLASS radio_driver;
+extern AutoDiscoverRTCClock rtc_clock;

 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/promicro/platformio.ini
+++ b/variants/promicro/platformio.ini
@@ -1,4 +1,4 @@
-[faketec]
+[Faketec]
 extends = nrf52840_base
 board = promicro_nrf52840
 build_flags = ${nrf52840_base.build_flags}
@@ -15,75 +15,75 @@ build_flags = ${nrf52840_base.build_flags}
  -D PIN_OLED_RESET=-1
  -D PIN_USER_BTN=6
 build_src_filter = ${nrf52840_base.build_src_filter}
-  +<helpers/nrf52/FaketecBoard.cpp>
+  +<helpers/nrf52/PromicroBoard.cpp>
  +<../variants/promicro>
 lib_deps=
  ${nrf52840_base.lib_deps}
 	adafruit/Adafruit SSD1306 @ ^2.5.13

 [env:Faketec_Repeater]
-extends = faketec
-build_src_filter = ${faketec.build_src_filter} +<../examples/simple_repeater> +<helpers/ui/*.cpp>
+extends = Faketec
+build_src_filter = ${Faketec.build_src_filter} +<../examples/simple_repeater> +<helpers/ui/*.cpp>
 build_flags =
-  ${faketec.build_flags}
+  ${Faketec.build_flags}
  -D ADVERT_NAME="\"Faketec Repeater\""
-  -D ADVERT_LAT=-37.0
-  -D ADVERT_LON=145.0
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
  -D ADMIN_PASSWORD="\"password\""
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 lib_deps =
-  ${faketec.lib_deps}
+  ${Faketec.lib_deps}
  adafruit/RTClib @ ^2.1.3

 [env:Faketec_room_server]
-extends = faketec
-build_src_filter = ${faketec.build_src_filter} +<../examples/simple_room_server> +<helpers/ui/*.cpp>
+extends = Faketec
+build_src_filter = ${Faketec.build_src_filter} +<../examples/simple_room_server> +<helpers/ui/*.cpp>
 build_flags =
-  ${faketec.build_flags}
+  ${Faketec.build_flags}
  -D ADVERT_NAME="\"Test Room\""
-  -D ADVERT_LAT=-37.0
-  -D ADVERT_LON=145.0
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
  -D ADMIN_PASSWORD="\"password\""
  -D ROOM_PASSWORD="\"hello\""
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 lib_deps =
-  ${faketec.lib_deps}
+  ${Faketec.lib_deps}
  adafruit/RTClib @ ^2.1.3

 [env:Faketec_terminal_chat]
-extends = faketec
+extends = Faketec
 build_flags =
-  ${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 = ${faketec.build_src_filter} +<../examples/simple_secure_chat/main.cpp>
+build_src_filter = ${Faketec.build_src_filter} +<../examples/simple_secure_chat/main.cpp>
 lib_deps =
-  ${faketec.lib_deps}
+  ${Faketec.lib_deps}
  densaugeo/base64 @ ~1.4.0
  adafruit/RTClib @ ^2.1.3

 [env:Faketec_companion_radio_usb]
-extends = faketec
+extends = Faketec
 build_flags =
-  ${faketec.build_flags}
+  ${Faketec.build_flags}
  -D MAX_CONTACTS=100
  -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 = ${faketec.build_src_filter} +<../examples/companion_radio>  +<../examples/companion_radio> +<helpers/ui/*.cpp>
+build_src_filter = ${Faketec.build_src_filter} +<../examples/companion_radio>  +<../examples/companion_radio> +<helpers/ui/*.cpp>
 lib_deps =
-  ${faketec.lib_deps}
+  ${Faketec.lib_deps}
  adafruit/RTClib @ ^2.1.3
  densaugeo/base64 @ ~1.4.0

 [env:Faketec_companion_radio_ble]
-extends = faketec
+extends = Faketec
 build_flags =
-  ${faketec.build_flags}
+  ${Faketec.build_flags}
  -D MAX_CONTACTS=100
  -D MAX_GROUP_CHANNELS=8
  -D BLE_PIN_CODE=123456
@@ -92,9 +92,9 @@ build_flags =
  -D ENABLE_PRIVATE_KEY_IMPORT=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-build_src_filter = ${faketec.build_src_filter} +<helpers/nrf52/SerialBLEInterface.cpp> +<../examples/companion_radio> +<helpers/ui/*.cpp>
+build_src_filter = ${Faketec.build_src_filter} +<helpers/nrf52/SerialBLEInterface.cpp> +<../examples/companion_radio> +<helpers/ui/*.cpp>
 lib_deps =
-  ${faketec.lib_deps}
+  ${Faketec.lib_deps}
  adafruit/RTClib @ ^2.1.3
  densaugeo/base64 @ ~1.4.0

@@ -103,14 +103,14 @@ extends = nrf52840_base
 board = promicro_nrf52840
 build_flags = ${nrf52840_base.build_flags}
  -I variants/promicro
-  -D FAKETEC
-  -D RADIO_CLASS=CustomLLCC68 
+  -D PROMICROLLCC68
+  -D RADIO_CLASS=CustomLLCC68
  -D WRAPPER_CLASS=CustomLLCC68Wrapper
  -D LORA_TX_POWER=22
  -D SX126X_CURRENT_LIMIT=130
  -D SX126X_RX_BOOSTED_GAIN=1
 build_src_filter = ${nrf52840_base.build_src_filter}
-  +<helpers/nrf52/FaketecBoard.cpp>
+  +<helpers/nrf52/PromicroBoard.cpp>
  +<../variants/promicro>

 [env:ProMicroLLCC68_Repeater]
--- a/variants/promicro/target.cpp
+++ b/variants/promicro/target.cpp
@@ -1,15 +1,23 @@
 #include <Arduino.h>
 #include "target.h"
+#include <helpers/ArduinoHelpers.h>

-FaketecBoard board;
+PromicroBoard 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);
+
 #ifndef LORA_CR
  #define LORA_CR      5
 #endif

 bool radio_init() {
+  rtc_clock.begin(Wire);
+  
 #ifdef SX126X_DIO3_TCXO_VOLTAGE
  float tcxo = SX126X_DIO3_TCXO_VOLTAGE;
 #else
@@ -18,6 +26,7 @@ bool radio_init() {

  SPI.setPins(P_LORA_MISO, P_LORA_SCLK, P_LORA_MOSI);
  SPI.begin();
+  radio.setRfSwitchPins(SX126X_RXEN, SX126X_TXEN);
  int status = radio.begin(LORA_FREQ, LORA_BW, LORA_SF, LORA_CR, RADIOLIB_SX126X_SYNC_WORD_PRIVATE, LORA_TX_POWER, 8, tcxo);
  if (status == RADIOLIB_ERR_SPI_CMD_FAILED || status == RADIOLIB_ERR_SPI_CMD_INVALID) {
    #define SX126X_DIO3_TCXO_VOLTAGE (0.0f);
@@ -44,3 +53,23 @@ bool radio_init() {

  return true;  // success
 }
+
+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/promicro/target.h
+++ b/variants/promicro/target.h
@@ -1,10 +1,19 @@
 #pragma once

-#include <helpers/nrf52/FaketecBoard.h>
+#define RADIOLIB_STATIC_ONLY 1
+#include <RadioLib.h>
+#include <helpers/RadioLibWrappers.h>
+#include <helpers/nrf52/PromicroBoard.h>
 #include <helpers/CustomSX1262Wrapper.h>
 #include <helpers/CustomLLCC68Wrapper.h>
+#include <helpers/AutoDiscoverRTCClock.h>

-extern FaketecBoard board;
-extern RADIO_CLASS radio;
+extern PromicroBoard board;
+extern WRAPPER_CLASS radio_driver;
+extern AutoDiscoverRTCClock rtc_clock;

 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/rak4631/platformio.ini
+++ b/variants/rak4631/platformio.ini
@@ -25,8 +25,8 @@ build_flags =
  ${rak4631.build_flags}
  -D DISPLAY_CLASS=SSD1306Display
  -D ADVERT_NAME='"RAK4631 Repeater"'
-  -D ADVERT_LAT=-37.0
-  -D ADVERT_LON=145.0
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
  -D ADMIN_PASSWORD='"password"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -40,8 +40,8 @@ build_flags =
  ${rak4631.build_flags}
  -D DISPLAY_CLASS=SSD1306Display
  -D ADVERT_NAME='"Test Room"'
-  -D ADVERT_LAT=-37.0
-  -D ADVERT_LON=145.0
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
  -D ADMIN_PASSWORD='"password"'
  -D ROOM_PASSWORD='"hello"'
 ;  -D MESH_PACKET_LOGGING=1
--- a/variants/rak4631/target.cpp
+++ b/variants/rak4631/target.cpp
@@ -1,15 +1,23 @@
 #include <Arduino.h>
 #include "target.h"
+#include <helpers/ArduinoHelpers.h>

 RAK4631Board 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);
+
 #ifndef LORA_CR
  #define LORA_CR      5
 #endif

 bool radio_init() {
+  rtc_clock.begin(Wire);
+  
 #ifdef SX126X_DIO3_TCXO_VOLTAGE
  float tcxo = SX126X_DIO3_TCXO_VOLTAGE;
 #else
@@ -39,3 +47,23 @@ bool radio_init() {

  return true;  // success
 }
+
+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/rak4631/target.h
+++ b/variants/rak4631/target.h
@@ -1,9 +1,18 @@
 #pragma once

+#define RADIOLIB_STATIC_ONLY 1
+#include <RadioLib.h>
+#include <helpers/RadioLibWrappers.h>
 #include <helpers/nrf52/RAK4631Board.h>
 #include <helpers/CustomSX1262Wrapper.h>
+#include <helpers/AutoDiscoverRTCClock.h>

 extern RAK4631Board board;
-extern RADIO_CLASS radio;
+extern WRAPPER_CLASS radio_driver;
+extern AutoDiscoverRTCClock rtc_clock;

 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/station_g2/platformio.ini
+++ b/variants/station_g2/platformio.ini
@@ -27,8 +27,8 @@ extends = Station_G2
 build_flags =
  ${Station_G2.build_flags}
  -D ADVERT_NAME='"Station G2 Repeater"'
-  -D ADVERT_LAT=-37.0
-  -D ADVERT_LON=145.0
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
  -D ADMIN_PASSWORD='"password"'
  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -45,8 +45,8 @@ build_src_filter = ${Station_G2.build_src_filter}
 build_flags =
  ${Station_G2.build_flags}
  -D ADVERT_NAME='"Station G2 Room"'
-  -D ADVERT_LAT=-37.0
-  -D ADVERT_LON=145.0
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
  -D ADMIN_PASSWORD='"password"'
  -D ROOM_PASSWORD='"hello"'
 ;  -D MESH_PACKET_LOGGING=1
--- a/variants/station_g2/target.cpp
+++ b/variants/station_g2/target.cpp
@@ -10,11 +10,19 @@ StationG2Board board;
  RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY);
 #endif

+WRAPPER_CLASS radio_driver(radio, board);
+
+ESP32RTCClock fallback_clock;
+AutoDiscoverRTCClock rtc_clock(fallback_clock);
+
 #ifndef LORA_CR
  #define LORA_CR      5
 #endif

 bool radio_init() {
+  fallback_clock.begin();
+  rtc_clock.begin(Wire);
+  
 #ifdef SX126X_DIO3_TCXO_VOLTAGE
  float tcxo = SX126X_DIO3_TCXO_VOLTAGE;
 #else
@@ -45,3 +53,23 @@ bool radio_init() {

  return true;  // success
 }
+
+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/station_g2/target.h
+++ b/variants/station_g2/target.h
@@ -1,9 +1,18 @@
 #pragma once

+#define RADIOLIB_STATIC_ONLY 1
+#include <RadioLib.h>
+#include <helpers/RadioLibWrappers.h>
 #include <helpers/StationG2Board.h>
 #include <helpers/CustomSX1262Wrapper.h>
+#include <helpers/AutoDiscoverRTCClock.h>

 extern StationG2Board board;
-extern RADIO_CLASS radio;
+extern WRAPPER_CLASS radio_driver;
+extern AutoDiscoverRTCClock rtc_clock;

 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/t1000-e/target.cpp
+++ b/variants/t1000-e/target.cpp
@@ -5,6 +5,10 @@ T1000eBoard 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 rtc_clock;
+
 #ifndef LORA_CR
  #define LORA_CR      5
 #endif
@@ -32,6 +36,8 @@ static const Module::RfSwitchMode_t rfswitch_table[] = {
 #endif

 bool radio_init() {
+  //rtc_clock.begin(Wire);
+  
 #ifdef LR11X0_DIO3_TCXO_VOLTAGE
  float tcxo = LR11X0_DIO3_TCXO_VOLTAGE;
 #else
@@ -58,3 +64,23 @@ bool radio_init() {

  return true;  // success
 }
+
+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/t1000-e/target.h
+++ b/variants/t1000-e/target.h
@@ -1,9 +1,18 @@
 #pragma once

+#define RADIOLIB_STATIC_ONLY 1
+#include <RadioLib.h>
+#include <helpers/RadioLibWrappers.h>
 #include <helpers/nrf52/T1000eBoard.h>
 #include <helpers/CustomLR1110Wrapper.h>
+#include <helpers/ArduinoHelpers.h>

 extern T1000eBoard board;
-extern RADIO_CLASS radio;
+extern WRAPPER_CLASS radio_driver;
+extern VolatileRTCClock rtc_clock;

 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/t114/platformio.ini
+++ b/variants/t114/platformio.ini
@@ -36,8 +36,8 @@ build_src_filter = ${Heltec_t114.build_src_filter}
 build_flags =
  ${Heltec_t114.build_flags}
  -D ADVERT_NAME='"Heltec_T114 Repeater"'
-  -D ADVERT_LAT=-37.0
-  -D ADVERT_LON=145.0
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
  -D ADMIN_PASSWORD='"password"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -49,8 +49,8 @@ build_src_filter = ${Heltec_t114.build_src_filter}
 build_flags =
  ${Heltec_t114.build_flags}
  -D ADVERT_NAME='"Heltec_T114 Room"'
-  -D ADVERT_LAT=-37.0
-  -D ADVERT_LON=145.0
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
  -D ADMIN_PASSWORD='"password"'
  -D ROOM_PASSWORD='"hello"'
 ;  -D MESH_PACKET_LOGGING=1
--- a/variants/t114/target.cpp
+++ b/variants/t114/target.cpp
@@ -1,15 +1,23 @@
 #include <Arduino.h>
 #include "target.h"
+#include <helpers/ArduinoHelpers.h>

 T114Board 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);
+
 #ifndef LORA_CR
  #define LORA_CR      5
 #endif

 bool radio_init() {
+  rtc_clock.begin(Wire);
+  
 #ifdef SX126X_DIO3_TCXO_VOLTAGE
  float tcxo = SX126X_DIO3_TCXO_VOLTAGE;
 #else
@@ -39,3 +47,23 @@ bool radio_init() {

  return true;  // success
 }
+
+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/t114/target.h
+++ b/variants/t114/target.h
@@ -1,9 +1,18 @@
 #pragma once

+#define RADIOLIB_STATIC_ONLY 1
+#include <RadioLib.h>
+#include <helpers/RadioLibWrappers.h>
 #include <helpers/nrf52/T114Board.h>
 #include <helpers/CustomSX1262Wrapper.h>
+#include <helpers/AutoDiscoverRTCClock.h>

 extern T114Board board;
-extern RADIO_CLASS radio;
+extern WRAPPER_CLASS radio_driver;
+extern AutoDiscoverRTCClock rtc_clock;

 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/techo/platformio.ini
+++ b/variants/techo/platformio.ini
@@ -34,8 +34,8 @@ build_src_filter = ${LilyGo_Techo.build_src_filter} +<../examples/simple_repeate
 build_flags =
  ${LilyGo_Techo.build_flags}
  -D ADVERT_NAME='"T-Echo Repeater"'
-  -D ADVERT_LAT=-37.0
-  -D ADVERT_LON=145.0
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
  -D ADMIN_PASSWORD='"password"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -46,8 +46,8 @@ build_src_filter = ${LilyGo_Techo.build_src_filter} +<../examples/simple_room_se
 build_flags =
  ${LilyGo_Techo.build_flags}
  -D ADVERT_NAME='"T-Echo Room"'
-  -D ADVERT_LAT=-37.0
-  -D ADVERT_LON=145.0
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
  -D ADMIN_PASSWORD='"password"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
--- a/variants/techo/target.cpp
+++ b/variants/techo/target.cpp
@@ -1,15 +1,23 @@
 #include <Arduino.h>
 #include "target.h"
+#include <helpers/ArduinoHelpers.h>

 TechoBoard 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);
+
 #ifndef LORA_CR
  #define LORA_CR      5
 #endif

 bool radio_init() {
+  rtc_clock.begin(Wire);
+  
 #ifdef SX126X_DIO3_TCXO_VOLTAGE
  float tcxo = SX126X_DIO3_TCXO_VOLTAGE;
 #else
@@ -39,3 +47,23 @@ bool radio_init() {

  return true;  // success
 }
+
+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/techo/target.h
+++ b/variants/techo/target.h
@@ -1,9 +1,18 @@
 #pragma once

+#define RADIOLIB_STATIC_ONLY 1
+#include <RadioLib.h>
+#include <helpers/RadioLibWrappers.h>
 #include <helpers/nrf52/TechoBoard.h>
 #include <helpers/CustomSX1262Wrapper.h>
+#include <helpers/AutoDiscoverRTCClock.h>

 extern TechoBoard board;
-extern RADIO_CLASS radio;
+extern WRAPPER_CLASS radio_driver;
+extern AutoDiscoverRTCClock rtc_clock;

 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/xiao_c3/platformio.ini
+++ b/variants/xiao_c3/platformio.ini
@@ -30,8 +30,8 @@ build_flags =
  -D SX126X_RX_BOOSTED_GAIN=1
  -D LORA_TX_POWER=22
  -D ADVERT_NAME='"Xiao Repeater"'
-  -D ADVERT_LAT=-37.0
-  -D ADVERT_LON=145.0
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
  -D ADMIN_PASSWORD='"password"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -49,8 +49,8 @@ build_flags =
  -D WRAPPER_CLASS=CustomSX1268Wrapper
  -D LORA_TX_POWER=22
  -D ADVERT_NAME='"Xiao Repeater"'
-  -D ADVERT_LAT=-37.0
-  -D ADVERT_LON=145.0
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
  -D ADMIN_PASSWORD='"password"'
 ; -D MESH_PACKET_LOGGING=1
 ; -D MESH_DEBUG=1
--- a/variants/xiao_c3/target.cpp
+++ b/variants/xiao_c3/target.cpp
@@ -10,11 +10,19 @@ XiaoC3Board board;
  RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY);
 #endif

+WRAPPER_CLASS radio_driver(radio, board);
+
+ESP32RTCClock fallback_clock;
+AutoDiscoverRTCClock rtc_clock(fallback_clock);
+
 #ifndef LORA_CR
  #define LORA_CR      5
 #endif

 bool radio_init() {
+  fallback_clock.begin();
+  rtc_clock.begin(Wire);
+  
 #ifdef SX126X_DIO3_TCXO_VOLTAGE
  float tcxo = SX126X_DIO3_TCXO_VOLTAGE;
 #else
@@ -45,3 +53,23 @@ bool radio_init() {

  return true;  // success
 }
+
+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/xiao_c3/target.h
+++ b/variants/xiao_c3/target.h
@@ -1,10 +1,19 @@
 #pragma once

+#define RADIOLIB_STATIC_ONLY 1
+#include <RadioLib.h>
+#include <helpers/RadioLibWrappers.h>
 #include <helpers/XiaoC3Board.h>
 #include <helpers/CustomSX1262Wrapper.h>
 #include <helpers/CustomSX1268Wrapper.h>
+#include <helpers/AutoDiscoverRTCClock.h>

 extern XiaoC3Board board;
-extern RADIO_CLASS radio;
+extern WRAPPER_CLASS radio_driver;
+extern AutoDiscoverRTCClock rtc_clock;

 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/xiao_s3_wio/platformio.ini
+++ b/variants/xiao_s3_wio/platformio.ini
@@ -30,8 +30,8 @@ build_src_filter = ${Xiao_S3_WIO.build_src_filter}
 build_flags =
  ${Xiao_S3_WIO.build_flags}
  -D ADVERT_NAME='"XiaoS3 Repeater"'
-  -D ADVERT_LAT=-37.0
-  -D ADVERT_LON=145.0
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
  -D ADMIN_PASSWORD='"password"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
@@ -46,8 +46,8 @@ build_src_filter = ${Xiao_S3_WIO.build_src_filter}
 build_flags =
  ${Xiao_S3_WIO.build_flags}
  -D ADVERT_NAME='"XiaoS3 Room"'
-  -D ADVERT_LAT=-37.0
-  -D ADVERT_LON=145.0
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
  -D ADMIN_PASSWORD='"password"'
  -D ROOM_PASSWORD='"hello"'
 ;  -D MESH_PACKET_LOGGING=1
@@ -88,3 +88,20 @@ build_src_filter = ${Xiao_S3_WIO.build_src_filter}
 lib_deps =
  ${Xiao_S3_WIO.lib_deps}
  densaugeo/base64 @ ~1.4.0
+
+[env:Xiao_S3_WIO_companion_radio_serial]
+extends = Xiao_S3_WIO
+build_flags =
+  ${Xiao_S3_WIO.build_flags}
+  -D MAX_CONTACTS=100
+  -D MAX_GROUP_CHANNELS=8
+  -D SERIAL_TX=D6
+  -D SERIAL_RX=D7
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
+build_src_filter = ${Xiao_S3_WIO.build_src_filter}
+  +<helpers/esp32/*.cpp>
+  +<../examples/companion_radio/main.cpp>
+lib_deps =
+  ${Xiao_S3_WIO.lib_deps}
+  densaugeo/base64 @ ~1.4.0
--- a/variants/xiao_s3_wio/target.cpp
+++ b/variants/xiao_s3_wio/target.cpp
@@ -10,11 +10,19 @@ ESP32Board board;
  RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY);
 #endif

+WRAPPER_CLASS radio_driver(radio, board);
+
+ESP32RTCClock fallback_clock;
+AutoDiscoverRTCClock rtc_clock(fallback_clock);
+
 #ifndef LORA_CR
  #define LORA_CR      5
 #endif

 bool radio_init() {
+  fallback_clock.begin();
+  rtc_clock.begin(Wire);
+  
 #ifdef SX126X_DIO3_TCXO_VOLTAGE
  float tcxo = SX126X_DIO3_TCXO_VOLTAGE;
 #else
@@ -45,3 +53,23 @@ bool radio_init() {

  return true;  // success
 }
+
+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/xiao_s3_wio/target.h
+++ b/variants/xiao_s3_wio/target.h
@@ -1,9 +1,18 @@
 #pragma once

+#define RADIOLIB_STATIC_ONLY 1
+#include <RadioLib.h>
+#include <helpers/RadioLibWrappers.h>
 #include <helpers/ESP32Board.h>
 #include <helpers/CustomSX1262Wrapper.h>
+#include <helpers/AutoDiscoverRTCClock.h>

 extern ESP32Board board;
-extern RADIO_CLASS radio;
+extern WRAPPER_CLASS radio_driver;
+extern AutoDiscoverRTCClock rtc_clock;

 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();
Author	SHA1	Message	Date
Scott Powell	b2b755c0fb	Merge branch 'dev'	2025-04-07 22:01:08 +10:00
Scott Powell	d7e6a361b5	* ver bump to v1.4.3	2025-04-07 21:59:53 +10:00
Scott Powell	396a7a24b1	* default SF now 11	2025-04-07 21:55:24 +10:00
Scott Powell	9498d2e824	* ID hash 0x00 and 0xFF now reserved for future.	2025-04-06 12:34:09 +10:00
ripplebiz	86a3f592b9	Merge pull request #172 from recrof/dev set repeater/room server Lat & Lon to 0.0 as default	2025-04-04 19:26:30 +11:00
ripplebiz	4d2380d168	Merge pull request #173 from oltaco/promicro-rfswitch FIX: Set RfSwitch pins properly.	2025-04-04 19:25:12 +11:00
taco	96faf423e3	FIX: Need to explicitly setRfSwitchPins to drive RXEN high when in receive mode.	2025-04-04 15:39:11 +11:00
recrof	04ad06b8be	set repeater/room server Lat & Lon to 0.0 as default	2025-04-03 14:59:20 +02:00
ripplebiz	259f4ec169	Merge pull request #171 from LitBomb/patch-9 Update faq.md	2025-04-02 19:15:33 +11:00
uncle lit	49d24283f7	Update faq.md Add table of content Add http://config.meshcore.dev for repeater and room server setup Add T-Deck GPS info screen sentences counter Add explanation who 869.525MHz is the chosen frequency for EU and UK and why 867.5MHz isn't good comparing to 869.525	2025-04-01 22:49:09 -07:00
ripplebiz	2bec0f1418	Merge pull request #167 from fdlamotte/xiao_s3_serial_onpins Allow the use companion radio on other serial interfaces	2025-04-02 00:02:46 +11:00
Florent de Lamotte	c762d88edd	Merge branch 'dev' into xiao_s3_serial_onpins	2025-04-01 11:33:00 +02:00
Florent de Lamotte	87f476354f	initial commit	2025-04-01 11:32:04 +02:00
ripplebiz	accd80db77	Merge pull request #165 from liamcottle/dev Show please wait message on boot	2025-04-01 14:42:59 +11:00
liamcottle	4d4a0ae4e3	init display before radio	2025-04-01 16:10:12 +13:00
liamcottle	7e583d7f98	show please wait message on room server boot	2025-04-01 16:04:06 +13:00
liamcottle	f93a5156bb	show please wait message on repeater boot	2025-04-01 16:00:09 +13:00
liamcottle	af070af554	show please wait message on companion boot	2025-04-01 15:50:24 +13:00
ripplebiz	ec320cb5a8	Merge pull request #164 from liamcottle/dev Fix Companion Display Noise	2025-04-01 13:02:57 +11:00
liamcottle	87443ad43f	clear display on init to avoid static	2025-04-01 14:46:48 +13:00
ripplebiz	0a62ab663f	Merge pull request #155 from oltaco/promicro-refactor ProMicro refactoring	2025-04-01 12:43:09 +11:00
ripplebiz	7d24c65c4e	Merge pull request #163 from LitBomb/patch-7 Update faq.md	2025-04-01 12:37:08 +11:00
uncle lit	5e553b1fc8	Update faq.md added the following to FAQ: public/private flood and repeater set flood.max CLI public key in hex and base64 How paths are created and reuse to minimize utilization T-Deck Diag explanation Update repeater with a Raspberry Pi clients don't repeat explanation other meshcore projects fix discord link to build instruction	2025-03-31 14:51:52 -07:00
Scott Powell	3a6b8fda93	* room server: faster sync of unread posts, MAX_UNSYNCED_POSTS now 32 (was 16)	2025-03-31 14:01:49 +11:00
ripplebiz	6e109779f3	Merge pull request #149 from jameshall9327/main TBeam: Added Repeater	2025-03-31 13:10:20 +11:00
Scott Powell	3a920986ca	* Tbeam fix: GPIO assignments wrong	2025-03-31 13:03:33 +11:00
Scott Powell	8740528d37	Merge commit '5493dbc12096f3f090cc48e70547a4491f5a06b1' into dev	2025-03-31 00:15:38 +11:00
ripplebiz	5493dbc120	Merge pull request #157 from fdlamotte/t1000e_clock Remove rtc auto-detect on t1000	2025-03-31 00:14:17 +11:00
Florent	2f6427ce21	Remove rtc auto-detect on t1000	2025-03-30 15:09:40 +02:00
Scott Powell	97b6a1874a	Merge branch 'dev'	2025-03-30 19:18:35 +11:00
ripplebiz	05fa1ba50e	Merge pull request #145 from recrof/main change new default freq to 869.525	2025-03-30 19:01:55 +11:00
Scott Powell	fc6aa0ed0f	* ver bump to v1.4.2	2025-03-30 18:56:21 +11:00
taco	b8f09531c4	fix: give ProMicroLLCC68 a different definition	2025-03-30 15:57:20 +11:00
taco	01e98caea7	Refactor: FaketecBoard to PromicroBoard	2025-03-30 15:52:25 +11:00
Scott Powell	75eabd5c66	* minor refactor	2025-03-30 14:47:52 +11:00
ripplebiz	2e5b4eb910	Merge pull request #154 from recrof/dev added new CommonCLI get commands: `get role` and `get public.key`	2025-03-30 14:40:49 +11:00
recrof	b77701ced0	added new CommonCLI get commands: get role and get public.key	2025-03-29 19:40:35 +01:00
Scott Powell	0d5c17f7ed	* ESP-Now: long range mode	2025-03-29 13:27:17 +11:00
Scott Powell	022b43ef3d	* isReceiving() now includes either preamble detect or header detect	2025-03-28 22:20:42 +11:00
Scott Powell	89bd6c3416	* Dispatcher: now impose a max time for CAD fail (ie. channel busy), defined by getCADFailMaxDuration(), default 4 seconds. (an sx126x bug _might_ be making radio->isReceiving() return true indefinitely)	2025-03-28 20:50:42 +11:00
Scott Powell	ba93867037	* companion: temp fix: logRxRaw() is blowing the MAX_FRAME_SIZE	2025-03-28 14:14:59 +11:00
James Hall	74e7af3f57	TBeam: Added Repeater	2025-03-27 09:21:29 -04:00
Scott Powell	c0cb57be5c	* refactor: rtc_clock now defined by variants/*/target modules	2025-03-27 21:28:06 +11:00
Scott Powell	2224bddcb5	* new ESPNOWRadio driver * refactored the examples//main.cpp modules, moving radio specifics to variants//target modules * new Generic_ESPNOW_* target envs	2025-03-27 19:34:16 +11:00
Scott Powell	9c165add61	Merge branch 'dev' into esp-now	2025-03-27 17:24:56 +11:00
Scott Powell	d5cc28b0c5	* room server: now support "log start/stop..."	2025-03-27 13:00:40 +11:00
recrof	8a248bb47d	change new default freq to 869.525	2025-03-26 18:06:20 +01:00
ripplebiz	32edc934fa	Merge pull request #144 from adrian-immel/Fix-Typo Fix build issue for FakeTec board	2025-03-26 16:22:01 +11:00
Adrian	7cab681697	Update FaketecBoard.cpp	2025-03-25 23:21:05 +01:00
Adrian	4d262e9e5d	Rename faketecBoard.h to FaketecBoard.h	2025-03-25 23:16:08 +01:00
Adrian	ee230ab2ca	Rename faketecBoard.cpp to FaketecBoard.cpp	2025-03-25 23:14:48 +01:00
Scott Powell	321a9425da	* experiment: enabling forwarding in terminal chat	2025-03-26 03:57:36 +11:00
Scott Powell	d32e641225	* fix for double radio.begin(). RNG seed from pressing ENTER	2025-03-25 17:40:36 +11:00
Scott Powell	1220c69aa9	* wifi power max	2025-03-25 15:13:07 +11:00
Scott Powell	8355543366	* more experiments	2025-03-25 01:26:46 +11:00
Scott Powell	7bd7bfb14a	* ESP-NOW experiment with terminal-chat	2025-03-24 21:16:00 +11:00