* ver bump: 1.3.0

* missing param
Merge branch 'main' into dev
2026-03-30 19:15:49 +00:00 · 2025-03-13 13:46:01 +11:00 · 2025-03-13 13:32:46 +11:00 · 2025-03-11 20:09:59 +11:00 · 2025-03-11 20:06:28 +11:00 · 2025-03-11 09:11:14 +01:00
27 changed files with 950 additions and 331 deletions
--- a/README.md
+++ b/README.md
@@ -25,10 +25,11 @@ MeshCore provides the ability to create wireless mesh networks, similar to Mesht

 ## 🚀 How to Get Started

-Flash the Firmware: Download the pre-built firmware binary for Heltec V3 and flash it using Adafruit ESPTool.
-Install [PlatformIO](https://docs.platformio.org) in Visual Studio Code (optional for developers who want to modify the firmware).
+Andy Kirby has published a very useful [intro video](https://www.youtube.com/watch?v=t1qne8uJBAc) which explains the steps for beginners.
+
+For developers, install [PlatformIO](https://docs.platformio.org) in Visual Studio Code.
 Download & Open the MeshCore repository.
-Select a Sample Application: Choose from chat, ping, repeater, or admin test tools.
+Select a Sample Application: Choose from chat, repeater, other example app.
 Monitor & Communicate using the Serial Monitor (e.g., Serial USB Terminal on Android).

 📁 Included Example Applications
@@ -36,8 +37,6 @@ Monitor & Communicate using the Serial Monitor (e.g., Serial USB Terminal on And
 * 📡 Simple Repeater: Extends network coverage by relaying messages.
 * 📡 Companion Radio: For use with an external chat app, over BLE or USB.
 * 📡 Room Server: A simple BBS server for shared Posts.
-* 📡 Ping Client, Ping Server & Client: Basic client/server example.
-* 📡 Test Admin: Monitors and manages repeaters remotely.

 ## 🛠 Hardware Compatibility

@@ -49,6 +48,9 @@ MeshCore is designed for use with:
 * LilyGo T3S3
 * Heltec T114
 * Station G2
+* Sensecap T1000e
+* Heltec V2
+* LilyGo TLora32 v1.6

 ## 📜 License
 MeshCore is open-source software released under the MIT License. You are free to use, modify, and distribute it for personal and commercial projects.
--- a/boards/station-g2.json
+++ b/boards/station-g2.json
@@ -0,0 +1,43 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "esp32s3_out.ld",
+      "memory_type": "qio_opi"
+    },
+    "core": "esp32",
+    "extra_flags": [
+      "-DBOARD_HAS_PSRAM",
+      "-DARDUINO_USB_CDC_ON_BOOT=1",
+      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_RUNNING_CORE=1",
+      "-DARDUINO_EVENT_RUNNING_CORE=0"
+    ],
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "qio",
+    "hwids": [["0x303A", "0x1001"]],
+    "mcu": "esp32s3",
+    "variant": "esp32s3"
+  },
+  "connectivity": [
+    "wifi"
+  ],
+  "debug": {
+    "default_tool": "esp-builtin",
+    "onboard_tools": ["esp-builtin"],
+    "openocd_target": "esp32s3.cfg"
+  },
+  "frameworks": ["arduino", "espidf"],
+  "name": "BQ Station G2",
+  "upload": {
+    "flash_size": "16MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 16777216,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": true,
+    "require_upload_port": true,
+    "speed": 921600
+  },
+  "url": "https://wiki.uniteng.com/en/meshtastic/station-g2",
+  "vendor": "BQ Consulting"
+}
--- a/boards/t-echo.json
+++ b/boards/t-echo.json
@@ -1,62 +1,62 @@
 {
-	"build": {
-	  "arduino": {
-		"ldscript": "nrf52840_s140_v6.ld"
-	  },
-	  "core": "nRF5",
-	  "cpu": "cortex-m4",
-	  "extra_flags": "-DARDUINO_NRF52840_PCA10056 -DNRF52840_XXAA",
-	  "f_cpu": "64000000L",
-	  "hwids": [
-		[
-		  "0x239A",
-		  "0x8029"
-		]
-	  ],
-	  "usb_product": "NRF52 DK",
-	  "mcu": "nrf52840",
-	  "variant": "pca10056",
-	  "bsp": {
-		"name": "adafruit"
-	  },
-	  "softdevice": {
-		"sd_flags": "-DS140",
-		"sd_name": "s140",
-		"sd_version": "6.1.1",
-		"sd_fwid": "0x00B6"
-	  },
-	  "bootloader": {
-		"settings_addr": "0xFF000"
-	  }
-	},
-	"connectivity": [
-	  "bluetooth"
-	],
-	"debug": {
-	  "jlink_device": "nRF52840_xxAA",
-	  "onboard_tools": [
-		"jlink"
-	  ],
-	  "svd_path": "nrf52840.svd"
-	},
-	"frameworks": [
-	  "arduino"
-	],
-	"name": "LilyGo T-ECHO",
-	"upload": {
-	  "maximum_ram_size": 248832,
-	  "maximum_size": 815104,
-	  "require_upload_port": true,
-	  "speed": 115200,
-	  "protocol": "jlink",
-	  "protocols": [
-		"jlink",
-		"nrfjprog",
-		"stlink",
-		"cmsis-dap",
-		"blackmagic"
-	  ]
-	},
-	"url": "https://os.mbed.com/platforms/Nordic-nRF52840-DK/",
-	"vendor": "Nordic"
+  "build": {
+    "arduino": {
+    "ldscript": "nrf52840_s140_v6.ld"
+    },
+    "core": "nRF5",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DARDUINO_NRF52840_PCA10056 -DNRF52840_XXAA",
+    "f_cpu": "64000000L",
+    "hwids": [
+    [
+      "0x239A",
+      "0x8029"
+    ]
+    ],
+    "usb_product": "NRF52 DK",
+    "mcu": "nrf52840",
+    "variant": "pca10056",
+    "bsp": {
+    "name": "adafruit"
+    },
+    "softdevice": {
+    "sd_flags": "-DS140",
+    "sd_name": "s140",
+    "sd_version": "6.1.1",
+    "sd_fwid": "0x00B6"
+    },
+    "bootloader": {
+    "settings_addr": "0xFF000"
+    }
+  },
+  "connectivity": [
+    "bluetooth"
+  ],
+  "debug": {
+    "jlink_device": "nRF52840_xxAA",
+    "onboard_tools": [
+    "jlink"
+    ],
+    "svd_path": "nrf52840.svd"
+  },
+  "frameworks": [
+    "arduino"
+  ],
+  "name": "LilyGo T-ECHO",
+  "upload": {
+    "maximum_ram_size": 248832,
+    "maximum_size": 815104,
+    "require_upload_port": true,
+    "speed": 115200,
+    "protocol": "jlink",
+    "protocols": [
+    "jlink",
+    "nrfjprog",
+    "stlink",
+    "cmsis-dap",
+    "blackmagic"
+    ]
+  },
+  "url": "https://os.mbed.com/platforms/Nordic-nRF52840-DK/",
+  "vendor": "Nordic"
  }
--- a/boards/t3_s3_v1_x.json
+++ b/boards/t3_s3_v1_x.json
@@ -1,45 +1,45 @@
 {
-    "build": {
-        "arduino": {
-            "ldscript": "esp32s3_out.ld",
-            "partitions": "default.csv",
-            "memory_type": "qio_qspi"
-        },
-        "core": "esp32",
-        "extra_flags": [
-            "-DARDUINO_LILYGO_T3_S3_V1_X",
-            "-DBOARD_HAS_PSRAM",
-            "-DARDUINO_USB_CDC_ON_BOOT=1",
-            "-DARDUINO_RUNNING_CORE=1",
-            "-DARDUINO_EVENT_RUNNING_CORE=1",
-            "-DARDUINO_USB_MODE=1"
-        ],
-        "f_cpu": "240000000L",
-        "f_flash": "80000000L",
-        "flash_mode": "qio",
-        "mcu": "esp32s3",
-        "variant": "esp32s3"
+  "build": {
+    "arduino": {
+      "ldscript": "esp32s3_out.ld",
+      "partitions": "default.csv",
+      "memory_type": "qio_qspi"
    },
-    "connectivity": [
-        "wifi"
+    "core": "esp32",
+    "extra_flags": [
+      "-DARDUINO_LILYGO_T3_S3_V1_X",
+      "-DBOARD_HAS_PSRAM",
+      "-DARDUINO_USB_CDC_ON_BOOT=1",
+      "-DARDUINO_RUNNING_CORE=1",
+      "-DARDUINO_EVENT_RUNNING_CORE=1",
+      "-DARDUINO_USB_MODE=1"
    ],
-    "debug": {
-        "openocd_target": "esp32s3.cfg"
-    },
-    "frameworks": [
-        "arduino",
-        "espidf"
-    ],
-    "name": "LilyGo T3-S3 Radio",
-    "upload": {
-        "flash_size": "4MB",
-        "maximum_ram_size": 327680,
-        "maximum_size": 4194304,
-        "use_1200bps_touch": true,
-        "wait_for_upload_port": true,
-        "require_upload_port": true,
-        "speed": 460800
-    },
-    "url": "https://www.lilygo.cc",
-    "vendor": "LilyGo"
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "qio",
+    "mcu": "esp32s3",
+    "variant": "esp32s3"
+  },
+  "connectivity": [
+    "wifi"
+  ],
+  "debug": {
+    "openocd_target": "esp32s3.cfg"
+  },
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "LilyGo T3-S3 Radio",
+  "upload": {
+    "flash_size": "4MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": true,
+    "require_upload_port": true,
+    "speed": 460800
+  },
+  "url": "https://www.lilygo.cc",
+  "vendor": "LilyGo"
 }
--- a/build.sh
+++ b/build.sh
@@ -57,8 +57,8 @@ build_firmware() {
    pio run -t mergebin -e $1
  fi

-  # build .uf2 for RAK_4631 and t1000e
-  if [[ $1 == *"RAK_4631"* || $1 == *"t1000e"* ]]; then
+  # build .uf2 for nrf52 boards
+  if [[ $1 == *"RAK_4631"* || $1 == *"t1000e"* || $1 == *"t114"* || $1 == *"T-Echo"* ]]; then
    python bin/uf2conv/uf2conv.py .pio/build/$1/firmware.hex -c -o .pio/build/$1/firmware.uf2 -f 0xADA52840
  fi

--- a/docs/faq.md
+++ b/docs/faq.md
@@ -1,6 +1,9 @@
 # MeshCore-FAQ
 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
 ---

@@ -25,6 +28,8 @@ Anyone is able to build anything they like on top of MeshCore without paying any
 Firmware Flasher: https://flasher.meshcore.co.uk/
 Phone Client Applications: https://meshcore.co.uk/apps.html
 MeshCore Fimrware Github: https://github.com/ripplebiz/MeshCore
+
+ NOTE: Andy Kirby has a very useful [intro video](https://www.youtube.com/watch?v=t1qne8uJBAc) for beginners.
 

 You need LoRa hardware devices to run MeshCore firmware as clients or server (repeater and room server).
@@ -94,7 +99,7 @@ The T-Deck firmware is free to download and most features are available without
 - Australia and New Zealand are using **915.8MHz**
 - UK and EU are gravitating toward **867.5MHz**
 - There are discussions on discord for UK to move to 869.525MHz (https://discord.com/channels/826570251612323860/1330643963501351004/1342554454498742374)
- USA is gravitating toward **910.525MHz**
+- Canada and USA is on **910.525MHz**

 the rest of the radio settings are the same for all frequencies:  
 - Spread Factor (SF): 10  
@@ -126,11 +131,11 @@ MeshCore clients only advertise themselves when the user initiates it. A repeate

 ### 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:
- Connect the server device through a USB serial connection to a computer running Chrome on this site:  
-  <https://googlechromelabs.github.io/serial-terminal/>
+- 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>
- MeshCore smart device clients may have the ability to remotely administer servers in the future.

 ### 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:
@@ -231,7 +236,11 @@ things network is mainly focused on LoRaWAN, but the LoRa low-level stuff still
 - Firmware repo: <https://github.com/ripplebiz/MeshCore>  

 ### 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 MeshCore development at <https://buymeacoffee.com/ripplebiz>.
+**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?
 **A:** See instructions here:  
@@ -250,6 +259,12 @@ Javascript: https://github.com/liamcottle/meshcore.js

 ### 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))
+**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`
    
 ---

@@ -274,6 +289,74 @@ You can get the epoch time on <https://www.epochconverter.com/> and use it to se

 **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?
+
+**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.
+
+1. Download the ZIP file for the specific node from the web flasher to your smartphone
+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
+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
+
+**Android continues after the iOS section:**
+
+**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)
+
+6. Scroll down to change the `PRN(s)` number:
+
+![Pasted image 20250309190158](https://github.com/user-attachments/assets/11f69cdd-12f3-4696-a6fc-14a78c85fe32)
+
+- For the T114, change the number of packets `(PRN(s)` to 8
+- For RAK, it can be 10, but it also works on 8.
+
+7. Click the `DFU` icon ![Pasted image 20250309173039](https://github.com/user-attachments/assets/af7a9f78-8739-4946-b734-02bade9c8e71), select the type of file to upload (choose ZIP), then select the ZIP file that was downloaded earlier  from the web flasher
+8. The upload process will start now. If everything goes well, the node resets and is flashed successfully.
+![Pasted image 20250309190342](https://github.com/user-attachments/assets/a60e25d0-33b8-46cf-af90-20a7d8ac2adb)
+
+
+
+**Android steps continues below:**
+1. on the top left corner of the nRF Connect app on Android, tap the 3-bar hamburger menu, then `Settings`, then `nRF5 DFU Options`
+
+![Android nRF Hamberger](https://github.com/user-attachments/assets/ea6dfeef-9367-4830-bd70-1441d517c706)
+
+![Android nRF Settings](https://github.com/user-attachments/assets/c63726bf-cecd-4987-be68-afb6358c7190)
+
+![Android nRF DFU Options](https://github.com/user-attachments/assets/b20e872f-5122-41d9-90df-0215cff5fbc9)
+
+2. Change `Number of packets` to `10` for RAK, `8` for Heltec T114
+
+![Android nRF Number of Packets](https://github.com/user-attachments/assets/c092adaf-4cb3-460b-b7ef-8d7f450d602b)
+
+3. Go back to the main screen
+4. Your LoRa device should already ben in DFU mode from previous steps
+5. tap `SCANNER` and then `SCAN` to find the device you want to update, tap `CONNECT`
+
+![Android nRF Scanner Scan Connect](https://github.com/user-attachments/assets/37218717-f167-48b6-a6ca-93d132ef77ca)
+
+6. On the top left corner of the nRF Connect app, tap the `DFU` icon next to the three dots
+
+![Android nRF DFU](https://github.com/user-attachments/assets/1ec3b818-bf0c-461f-8fdf-37c41a63cafa)
+
+7. Choose `Distribution packet (ZIP)` and then `OK`
+
+![Android nRF Distribution Packet (ZIP)](https://github.com/user-attachments/assets/e65f5616-9793-44f5-95c0-a3eb15aa7152)
+
+8. Choose the firmware file in ZIP formate that you downloaded earlier from the MeshCore web flasher, update will start as soon as you tap the file
+
+![Android nRF FW Updating](https://github.com/user-attachments/assets/0814d123-85ce-4c87-90a7-e1a25dc71900)
+
+9. When the update process is done, the device will disconnect from nRF app and the LoRa device is updated
+

 ---
    
--- a/examples/companion_radio/main.cpp
+++ b/examples/companion_radio/main.cpp
@@ -46,6 +46,10 @@
  #define OFFLINE_QUEUE_SIZE  16
 #endif

+#ifndef BLE_NAME_PREFIX
+  #define BLE_NAME_PREFIX  "MeshCore-"
+#endif
+
 #include <helpers/BaseChatMesh.h>

 #define SEND_TIMEOUT_BASE_MILLIS          500
@@ -120,11 +124,11 @@ static uint32_t _atoi(const char* sp) {
 #define FIRMWARE_VER_CODE    2

 #ifndef FIRMWARE_BUILD_DATE
-  #define FIRMWARE_BUILD_DATE   "7 Mar 2025"
+  #define FIRMWARE_BUILD_DATE   "13 Mar 2025"
 #endif

 #ifndef FIRMWARE_VERSION
-  #define FIRMWARE_VERSION   "v1.2.0"
+  #define FIRMWARE_VERSION   "v1.3.0"
 #endif

 #define CMD_APP_START              1
@@ -157,6 +161,8 @@ static uint32_t _atoi(const char* sp) {
 #define CMD_HAS_CONNECTION        28
 #define CMD_LOGOUT                29   // 'Disconnect'
 #define CMD_GET_CONTACT_BY_KEY    30
+#define CMD_GET_CHANNEL           31
+#define CMD_SET_CHANNEL           32

 #define RESP_CODE_OK                0
 #define RESP_CODE_ERR               1
@@ -174,6 +180,8 @@ static uint32_t _atoi(const char* sp) {
 #define RESP_CODE_DEVICE_INFO      13   // a reply to CMD_DEVICE_QEURY
 #define RESP_CODE_PRIVATE_KEY      14   // a reply to CMD_EXPORT_PRIVATE_KEY
 #define RESP_CODE_DISABLED         15
+//  ... _V3 stuff in here
+#define RESP_CODE_CHANNEL_INFO     18   // a reply to CMD_GET_CHANNEL

 // these are _pushed_ to client app at any time
 #define PUSH_CODE_ADVERT            0x80
@@ -184,6 +192,7 @@ static uint32_t _atoi(const char* sp) {
 #define PUSH_CODE_LOGIN_SUCCESS     0x85
 #define PUSH_CODE_LOGIN_FAIL        0x86
 #define PUSH_CODE_STATUS_RESPONSE   0x87
+#define PUSH_CODE_LOG_RX_DATA       0x88

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

@@ -211,7 +220,6 @@ class MyMesh : public BaseChatMesh {
  uint32_t expected_ack_crc;  // TODO: keep table of expected ACKs
  uint32_t pending_login;
  uint32_t pending_status;
-  mesh::GroupChannel* _public;
  BaseSerialInterface* _serial;
  unsigned long last_msg_sent;
  ContactsIterator _iter;
@@ -306,6 +314,58 @@ class MyMesh : public BaseChatMesh {
    }
  }

+  void loadChannels() {
+    if (_fs->exists("/channels2")) {
+      File file = _fs->open("/channels2");
+      if (file) {
+        bool full = false;
+        uint8_t channel_idx = 0;
+        while (!full) {
+          ChannelDetails ch;
+          uint8_t unused[4];
+
+          bool success = (file.read(unused, 4) == 4);
+          success = success && (file.read((uint8_t *) ch.name, 32) == 32);
+          success = success && (file.read((uint8_t *) ch.channel.secret, 32) == 32);
+
+          if (!success) break;  // EOF
+
+          if (setChannel(channel_idx, ch)) {
+            channel_idx++;
+          } else {
+            full = true;
+          }
+        }
+        file.close();
+      }
+    }
+  }
+
+  void saveChannels() {
+  #if defined(NRF52_PLATFORM)
+    File file = _fs->open("/channels2", FILE_O_WRITE);
+    if (file) { file.seek(0); file.truncate(); }
+  #else
+    File file = _fs->open("/channels2", "w", true);
+  #endif
+    if (file) {
+      uint8_t channel_idx = 0;
+      ChannelDetails ch;
+      uint8_t unused[4];
+      memset(unused, 0, 4);
+    
+      while (getChannel(channel_idx, ch)) {
+        bool success = (file.write(unused, 4) == 4);
+        success = success && (file.write((uint8_t *) ch.name, 32) == 32);
+        success = success && (file.write((uint8_t *) ch.channel.secret, 32) == 32);
+    
+        if (!success) break;  // write failed
+        channel_idx++;
+      }
+      file.close();
+    }
+  }
+    
  int  getBlobByKey(const uint8_t key[], int key_len, uint8_t dest_buf[]) override {
    char path[64];
    char fname[18];
@@ -435,6 +495,18 @@ protected:
    return (int) ((pow(_prefs.rx_delay_base, 0.85f - score) - 1.0) * air_time);
  }

+  void logRxRaw(float snr, float rssi, const uint8_t raw[], int len) override {
+    if (_serial->isConnected()) {
+      int i = 0;
+      out_frame[i++] = PUSH_CODE_LOG_RX_DATA;
+      out_frame[i++] = (int8_t)(snr * 4);
+      out_frame[i++] = (int8_t)(rssi);
+      memcpy(&out_frame[i], raw, len); i += len;
+
+      _serial->writeFrame(out_frame, i);
+    }
+  }
+
  void onDiscoveredContact(ContactInfo& contact, bool is_new) override {
    if (_serial->isConnected()) {
      out_frame[0] = PUSH_CODE_ADVERT;
@@ -519,7 +591,7 @@ protected:
  void onChannelMessageRecv(const mesh::GroupChannel& channel, int in_path_len, uint32_t timestamp, const char *text) override {
    int i = 0;
    out_frame[i++] = RESP_CODE_CHANNEL_MSG_RECV;
-    out_frame[i++] = 0;  // FUTURE: channel_idx (will just be 'public' for now)
+    out_frame[i++] = findChannelIdx(channel);
    out_frame[i++] = in_path_len < 0 ? 0xFF : in_path_len;
    out_frame[i++] = TXT_TYPE_PLAIN;
    memcpy(&out_frame[i], &timestamp, 4); i += 4;
@@ -696,7 +768,8 @@ public:
    _fs->mkdir("/bl");

    loadContacts();
-    _public = addChannel(PUBLIC_GROUP_PSK); // pre-configure Andy's public channel
+    addChannel("Public", PUBLIC_GROUP_PSK); // pre-configure Andy's public channel
+    loadChannels();

    _phy->setFrequency(_prefs.freq);
    _phy->setSpreadingFactor(_prefs.sf);
@@ -752,7 +825,9 @@ public:
      int i = 0;
      out_frame[i++] = RESP_CODE_DEVICE_INFO;
      out_frame[i++] = FIRMWARE_VER_CODE;
-      memset(&out_frame[i], 0, 6); i += 6;  // reserved
+      out_frame[i++] = MAX_CONTACTS / 2;        // v3+
+      out_frame[i++] = MAX_GROUP_CHANNELS;      // v3+
+      memset(&out_frame[i], 0, 4); i += 4;  // reserved
      memset(&out_frame[i], 0, 12);
      strcpy((char *) &out_frame[i], FIRMWARE_BUILD_DATE); i += 12;
      StrHelper::strzcpy((char *) &out_frame[i], board.getManufacturerName(), 40); i += 40;
@@ -827,12 +902,14 @@ public:
    } else if (cmd_frame[0] == CMD_SEND_CHANNEL_TXT_MSG) {  // send GroupChannel msg
      int i = 1;
      uint8_t txt_type = cmd_frame[i++];  // should be TXT_TYPE_PLAIN
-      uint8_t channel_idx = cmd_frame[i++];   // reserved future
+      uint8_t channel_idx = cmd_frame[i++];
      uint32_t msg_timestamp;
      memcpy(&msg_timestamp, &cmd_frame[i], 4); i += 4;
      const char *text = (char *) &cmd_frame[i];

-      if (txt_type == TXT_TYPE_PLAIN && sendGroupMessage(msg_timestamp, *_public, _prefs.node_name, text, len - i)) {   // hard-coded to 'public' channel for now
+      ChannelDetails channel;
+      bool success = getChannel(channel_idx, channel);
+      if (success && txt_type == TXT_TYPE_PLAIN && sendGroupMessage(msg_timestamp, channel.channel, _prefs.node_name, text, len - i)) {
        writeOKFrame();
      } else {
        writeErrFrame();
@@ -1144,6 +1221,33 @@ public:
      uint8_t* pub_key = &cmd_frame[1];
      stopConnection(pub_key);
      writeOKFrame();
+    } else if (cmd_frame[0] == CMD_GET_CHANNEL && len >= 2) {
+      uint8_t channel_idx = cmd_frame[1];
+      ChannelDetails channel;
+      if (getChannel(channel_idx, channel)) {
+        int i = 0;
+        out_frame[i++] = RESP_CODE_CHANNEL_INFO;
+        out_frame[i++] = channel_idx;
+        strcpy((char *)&out_frame[i], channel.name); i += 32;
+        memcpy(&out_frame[i], channel.channel.secret, 16); i += 16;   // NOTE: only 128-bit supported
+        _serial->writeFrame(out_frame, i);
+      } else {
+        writeErrFrame();
+      }
+    } else if (cmd_frame[0] == CMD_SET_CHANNEL && len >= 2+32+32) {
+      writeErrFrame();  // not supported (yet)
+    } else if (cmd_frame[0] == CMD_SET_CHANNEL && len >= 2+32+16) {
+      uint8_t channel_idx = cmd_frame[1];
+      ChannelDetails channel;
+      StrHelper::strncpy(channel.name, (char *) &cmd_frame[2], 32);
+      memset(channel.channel.secret, 0, sizeof(channel.channel.secret));
+      memcpy(channel.channel.secret, &cmd_frame[2+32], 16);   // NOTE: only 128-bit supported
+      if (setChannel(channel_idx, channel)) {
+        saveChannels();
+        writeOKFrame();
+      } else {
+        writeErrFrame();
+      }
    } else {
      writeErrFrame();
      MESH_DEBUG_PRINTLN("ERROR: unknown command: %02X", cmd_frame[0]);
@@ -1252,15 +1356,17 @@ void setup() {
    halt();
  }

-  radio.setCRC(0);
+  radio.setCRC(1);

 #ifdef SX126X_CURRENT_LIMIT
  radio.setCurrentLimit(SX126X_CURRENT_LIMIT);
 #endif
-
 #ifdef SX126X_DIO2_AS_RF_SWITCH
  radio.setDio2AsRfSwitch(SX126X_DIO2_AS_RF_SWITCH);
 #endif
+#ifdef SX126X_RX_BOOSTED_GAIN
+  radio.setRxBoostedGainMode(SX126X_RX_BOOSTED_GAIN);
+#endif

  fast_rng.begin(radio.random(0x7FFFFFFF));

@@ -1271,8 +1377,8 @@ void setup() {
  the_mesh.begin(InternalFS, trng);

 #ifdef BLE_PIN_CODE
-  char dev_name[32+10];
-  sprintf(dev_name, "MeshCore-%s", the_mesh.getNodeName());
+  char dev_name[32+16];
+  sprintf(dev_name, "%s%s", BLE_NAME_PREFIX, the_mesh.getNodeName());
  serial_interface.begin(dev_name, the_mesh.getBLEPin());
 #else
  pinMode(WB_IO2, OUTPUT);
@@ -1287,8 +1393,8 @@ void setup() {
  WiFi.begin(WIFI_SSID, WIFI_PWD);
  serial_interface.begin(TCP_PORT);
 #elif defined(BLE_PIN_CODE)
-  char dev_name[32+10];
-  sprintf(dev_name, "MeshCore-%s", the_mesh.getNodeName());
+  char dev_name[32+16];
+  sprintf(dev_name, "%s%s", BLE_NAME_PREFIX, the_mesh.getNodeName());
  serial_interface.begin(dev_name, the_mesh.getBLEPin());
 #else
  serial_interface.begin(Serial);
--- a/examples/simple_repeater/main.cpp
+++ b/examples/simple_repeater/main.cpp
@@ -22,11 +22,11 @@
 /* ------------------------------ Config -------------------------------- */

 #ifndef FIRMWARE_BUILD_DATE
-  #define FIRMWARE_BUILD_DATE   "7 Mar 2025"
+  #define FIRMWARE_BUILD_DATE   "13 Mar 2025"
 #endif

 #ifndef FIRMWARE_VERSION
-  #define FIRMWARE_VERSION   "v1.2.0"
+  #define FIRMWARE_VERSION   "v1.3.0"
 #endif

 #ifndef LORA_FREQ
@@ -76,10 +76,14 @@
  #include <helpers/ESP32Board.h>
  #include <helpers/CustomSX1262Wrapper.h>
  static ESP32Board board;
-  #elif defined(LILYGO_TLORA)
+#elif defined(LILYGO_TLORA)
  #include <helpers/LilyGoTLoraBoard.h>
  #include <helpers/CustomSX1276Wrapper.h>
  static LilyGoTLoraBoard board;
+#elif defined(STATION_G2)
+  #include <helpers/StationG2Board.h>
+  #include <helpers/CustomSX1262Wrapper.h>
+  static StationG2Board board;
 #elif defined(RAK_4631)
  #include <helpers/nrf52/RAK4631Board.h>
  #include <helpers/CustomSX1262Wrapper.h>
@@ -231,7 +235,9 @@ protected:
  }

  bool allowPacketForward(const mesh::Packet* packet) override {
-    return !_prefs.disable_fwd;
+    if (_prefs.disable_fwd) return false;
+    if (packet->isRouteFlood() && packet->path_len >= _prefs.flood_max) return false;
+    return true;
  }

  const char* getLogDateTime() override {
@@ -242,6 +248,15 @@ protected:
    return tmp;
  }

+  void logRxRaw(float snr, float rssi, const uint8_t raw[], int len) override {
+  #if MESH_PACKET_LOGGING
+    Serial.print(getLogDateTime());
+    Serial.print(" RAW: ");
+    mesh::Utils::printHex(Serial, raw, len);
+    Serial.println();
+  #endif
+  }
+
  void logRx(mesh::Packet* pkt, int len, float score) override {
    if (_logging) {
      File f = openAppend(PACKET_LOG_FILE);
@@ -523,6 +538,7 @@ public:
    _prefs.cr = LORA_CR;
    _prefs.tx_power_dbm = LORA_TX_POWER;
    _prefs.advert_interval = 1;  // default to 2 minutes for NEW installs
+    _prefs.flood_max = 64;
  }

  CommonCLI* getCLI() { return &_cli; }
@@ -676,15 +692,17 @@ void setup() {
    halt();
  }

-  radio.setCRC(0);
+  radio.setCRC(1);

 #ifdef SX126X_CURRENT_LIMIT
  radio.setCurrentLimit(SX126X_CURRENT_LIMIT);
 #endif
-
 #ifdef SX126X_DIO2_AS_RF_SWITCH
  radio.setDio2AsRfSwitch(SX126X_DIO2_AS_RF_SWITCH);
 #endif
+#ifdef SX126X_RX_BOOSTED_GAIN
+  radio.setRxBoostedGainMode(SX126X_RX_BOOSTED_GAIN);
+#endif

  fast_rng.begin(radio.random(0x7FFFFFFF));

--- a/examples/simple_room_server/main.cpp
+++ b/examples/simple_room_server/main.cpp
@@ -22,11 +22,11 @@
 /* ------------------------------ Config -------------------------------- */

 #ifndef FIRMWARE_BUILD_DATE
-  #define FIRMWARE_BUILD_DATE   "7 Mar 2025"
+  #define FIRMWARE_BUILD_DATE   "13 Mar 2025"
 #endif

 #ifndef FIRMWARE_VERSION
-  #define FIRMWARE_VERSION   "v1.2.0"
+  #define FIRMWARE_VERSION   "v1.3.0"
 #endif

 #ifndef LORA_FREQ
@@ -59,7 +59,7 @@
  #define  ADMIN_PASSWORD  "password"
 #endif

-#ifndef MAX_CLIENTS 
+#ifndef MAX_CLIENTS
 #define MAX_CLIENTS           32
 #endif

@@ -84,10 +84,22 @@
  #include <helpers/LilyGoTLoraBoard.h>
  #include <helpers/CustomSX1276Wrapper.h>
  static LilyGoTLoraBoard board;
+#elif defined(STATION_G2)
+  #include <helpers/StationG2Board.h>
+  #include <helpers/CustomSX1262Wrapper.h>
+  static StationG2Board board;
 #elif defined(RAK_4631)
  #include <helpers/nrf52/RAK4631Board.h>
  #include <helpers/CustomSX1262Wrapper.h>
  static RAK4631Board board;
+#elif defined(HELTEC_T114)
+  #include <helpers/nrf52/T114Board.h>
+  #include <helpers/CustomSX1262Wrapper.h>
+  static T114Board board;
+#elif defined(LILYGO_TECHO)
+  #include <helpers/nrf52/TechoBoard.h>
+  #include <helpers/CustomSX1262Wrapper.h>
+  static TechoBoard board;
 #else
  #error "need to provide a 'board' object"
 #endif
@@ -260,12 +272,21 @@ protected:
    return _prefs.airtime_factor;
  }

+  void logRxRaw(float snr, float rssi, const uint8_t raw[], int len) override {
+    #if MESH_PACKET_LOGGING
+      Serial.print(getLogDateTime());
+      Serial.print(" RAW: ");
+      mesh::Utils::printHex(Serial, raw, len);
+      Serial.println();
+    #endif
+  }
+
  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);
  }

-  const char* getLogDateTime() override { 
+  const char* getLogDateTime() override {
    static char tmp[32];
    uint32_t now = getRTCClock()->getCurrentTime();
    DateTime dt = DateTime(now);
@@ -283,7 +304,9 @@ protected:
  }

  bool allowPacketForward(const mesh::Packet* packet) override {
-    return !_prefs.disable_fwd;
+    if (_prefs.disable_fwd) return false;
+    if (packet->isRouteFlood() && packet->path_len >= _prefs.flood_max) return false;
+    return true;
  }

  void onAnonDataRecv(mesh::Packet* packet, uint8_t type, const mesh::Identity& sender, uint8_t* data, size_t len) override {
@@ -470,7 +493,7 @@ protected:
        } else {
          memcpy(&data[5], &forceSince, 4);  // make sure there are zeroes in payload (for ack_hash calc below)
        }
-        if (forceSince > 0) { 
+        if (forceSince > 0) {
          client->sync_since = forceSince;    // force-update the 'sync since'
        }

@@ -525,7 +548,7 @@ protected:

 public:
  MyMesh(RADIO_CLASS& phy, mesh::MainBoard& board, RadioLibWrapper& radio, mesh::MillisecondClock& ms, mesh::RNG& rng, mesh::RTCClock& rtc, mesh::MeshTables& tables)
-     : mesh::Mesh(radio, ms, rng, rtc, *new StaticPoolPacketManager(32), tables), 
+     : mesh::Mesh(radio, ms, rng, rtc, *new StaticPoolPacketManager(32), tables),
        _phy(&phy), _board(&board), _cli(board, this, &_prefs, this)
  {
    my_radio = &radio;
@@ -547,6 +570,7 @@ public:
    _prefs.tx_power_dbm = LORA_TX_POWER;
    _prefs.disable_fwd = 1;
    _prefs.advert_interval = 1;  // default to 2 minutes for NEW installs
+    _prefs.flood_max = 64;
  #ifdef ROOM_PASSWORD
    StrHelper::strncpy(_prefs.guest_password, ROOM_PASSWORD, sizeof(_prefs.guest_password));
  #endif
@@ -593,7 +617,7 @@ public:
      return false;
    #endif
  }
-    
+
  void sendSelfAdvertisement(int delay_millis) override {
    mesh::Packet* pkt = createSelfAdvert();
    if (pkt) {
@@ -688,7 +712,7 @@ SimpleMeshTables tables;
 #ifdef ESP32
 ESP32RTCClock fallback_clock;
 #else
-VolatileRTCClock fallback_clock; 
+VolatileRTCClock fallback_clock;
 #endif
 AutoDiscoverRTCClock rtc_clock(fallback_clock);

@@ -730,15 +754,17 @@ void setup() {
    halt();
  }

-  radio.setCRC(0);
+  radio.setCRC(1);

 #ifdef SX126X_CURRENT_LIMIT
  radio.setCurrentLimit(SX126X_CURRENT_LIMIT);
 #endif
-
 #ifdef SX126X_DIO2_AS_RF_SWITCH
  radio.setDio2AsRfSwitch(SX126X_DIO2_AS_RF_SWITCH);
 #endif
+#ifdef SX126X_RX_BOOSTED_GAIN
+  radio.setRxBoostedGainMode(SX126X_RX_BOOSTED_GAIN);
+#endif

  fast_rng.begin(radio.random(0x7FFFFFFF));

@@ -780,7 +806,7 @@ void loop() {
  int len = strlen(command);
  while (Serial.available() && len < sizeof(command)-1) {
    char c = Serial.read();
-    if (c != '\n') { 
+    if (c != '\n') {
      command[len++] = c;
      command[len] = 0;
    }
--- a/examples/simple_secure_chat/main.cpp
+++ b/examples/simple_secure_chat/main.cpp
@@ -107,7 +107,7 @@ class MyMesh : public BaseChatMesh, ContactVisitor {
  FILESYSTEM* _fs;
  NodePrefs _prefs;
  uint32_t expected_ack_crc;
-  mesh::GroupChannel* _public;
+  ChannelDetails* _public;
  unsigned long last_msg_sent;
  ContactInfo* curr_recipient;
  char command[512+10];
@@ -337,7 +337,7 @@ public:
    }

    loadContacts();
-    _public = addChannel(PUBLIC_GROUP_PSK); // pre-configure Andy's public channel
+    _public = addChannel("Public", PUBLIC_GROUP_PSK); // pre-configure Andy's public channel
  }

  void savePrefs() {
@@ -405,7 +405,7 @@ public:
      temp[5 + MAX_TEXT_LEN] = 0;  // truncate if too long

      int len = strlen((char *) &temp[5]);
-      auto pkt = createGroupDatagram(PAYLOAD_TYPE_GRP_TXT, *_public, temp, 5 + len);
+      auto pkt = createGroupDatagram(PAYLOAD_TYPE_GRP_TXT, _public->channel, temp, 5 + len);
      if (pkt) {
        sendFlood(pkt);
        Serial.println("   Sent.");
@@ -585,7 +585,7 @@ void setup() {
    halt();
  }

-  radio.setCRC(0);
+  radio.setCRC(1);

 #ifdef SX126X_CURRENT_LIMIT
  radio.setCurrentLimit(SX126X_CURRENT_LIMIT);
--- a/platformio.ini
+++ b/platformio.ini
@@ -14,7 +14,7 @@ monitor_speed = 115200
 lib_deps =
  SPI
  Wire
-  jgromes/RadioLib @ ^6.3.0
+  jgromes/RadioLib @ ^7.1.2
  rweather/Crypto @ ^0.4.0
  adafruit/RTClib @ ^2.1.3
  melopero/Melopero RV3028 @ ^1.1.0
@@ -22,13 +22,17 @@ build_flags = -w -DNDEBUG -DRADIOLIB_STATIC_ONLY=1 -DRADIOLIB_GODMODE=1
  -D LORA_FREQ=867.5
  -D LORA_BW=250
  -D LORA_SF=10
-build_src_filter = +<*.cpp> +<helpers/*.cpp>
+build_src_filter =
+  +<*.cpp>
+  +<helpers/*.cpp>

 [esp32_base]
 extends = arduino_base
 platform = espressif32
 monitor_filters = esp32_exception_decoder
 extra_scripts = merge-bin.py
+build_flags = ${arduino_base.build_flags}
+;  -D ESP32_CPU_FREQ=80          ; change it to your need
 build_src_filter = ${arduino_base.build_src_filter}

 ; ================
@@ -48,13 +52,14 @@ build_src_filter = ${esp32_base.build_src_filter}
 extends = Heltec_lora32_v2
 build_flags =
  ${Heltec_lora32_v2.build_flags}
-  -D ADVERT_NAME="\"Heltec Repeater\""
+  -D ADVERT_NAME='"Heltec Repeater"'
  -D ADVERT_LAT=-37.0
  -D ADVERT_LON=145.0
-  -D ADMIN_PASSWORD="\"password\""
+  -D ADMIN_PASSWORD='"password"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-build_src_filter = ${Heltec_lora32_v2.build_src_filter} +<../examples/simple_repeater/main.cpp>
+build_src_filter = ${Heltec_lora32_v2.build_src_filter}
+  +<../examples/simple_repeater/main.cpp>

 [env:Heltec_v2_terminal_chat]
 extends = Heltec_lora32_v2
@@ -64,7 +69,8 @@ build_flags =
  -D MAX_GROUP_CHANNELS=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-build_src_filter = ${Heltec_lora32_v2.build_src_filter} +<../examples/simple_secure_chat/main.cpp>
+build_src_filter = ${Heltec_lora32_v2.build_src_filter}
+  +<../examples/simple_secure_chat/main.cpp>
 lib_deps =
  ${Heltec_lora32_v2.lib_deps}
  densaugeo/base64 @ ~1.4.0
@@ -74,10 +80,12 @@ extends = Heltec_lora32_v2
 build_flags =
  ${Heltec_lora32_v2.build_flags}
  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=1
+  -D MAX_GROUP_CHANNELS=8
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
-build_src_filter = ${Heltec_lora32_v2.build_src_filter} +<helpers/esp32/*.cpp> +<../examples/companion_radio/main.cpp>
+build_src_filter = ${Heltec_lora32_v2.build_src_filter}
+  +<helpers/esp32/*.cpp>
+  +<../examples/companion_radio/main.cpp>
 lib_deps =
  ${Heltec_lora32_v2.lib_deps}
  densaugeo/base64 @ ~1.4.0
@@ -87,19 +95,20 @@ extends = Heltec_lora32_v2
 build_flags =
  ${Heltec_lora32_v2.build_flags}
  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=1
+  -D MAX_GROUP_CHANNELS=8
  -D BLE_PIN_CODE=123456
  -D BLE_DEBUG_LOGGING=1
 ;  -D ENABLE_PRIVATE_KEY_IMPORT=1
 ;  -D ENABLE_PRIVATE_KEY_EXPORT=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-build_src_filter = ${Heltec_lora32_v2.build_src_filter} +<helpers/esp32/*.cpp> +<../examples/companion_radio/main.cpp>
+build_src_filter = ${Heltec_lora32_v2.build_src_filter}
+  +<helpers/esp32/*.cpp>
+  +<../examples/companion_radio/main.cpp>
 lib_deps =
  ${Heltec_lora32_v2.lib_deps}
  densaugeo/base64 @ ~1.4.0

-
 ; ================
 [Heltec_lora32_v3]
 extends = esp32_base
@@ -117,6 +126,7 @@ build_flags =
  -D SX126X_DIO2_AS_RF_SWITCH=true
  -D SX126X_DIO3_TCXO_VOLTAGE=1.8
  -D SX126X_CURRENT_LIMIT=130.0f  ; for best TX power!
+  -D SX126X_RX_BOOSTED_GAIN=1
 build_src_filter = ${esp32_base.build_src_filter}
 lib_deps =
  ${esp32_base.lib_deps}
@@ -127,25 +137,29 @@ extends = Heltec_lora32_v3
 build_flags =
  ${Heltec_lora32_v3.build_flags}
  -D DISPLAY_CLASS=SSD1306Display
-  -D ADVERT_NAME="\"Heltec Repeater\""
+  -D ADVERT_NAME='"Heltec Repeater"'
  -D ADVERT_LAT=-37.0
  -D ADVERT_LON=145.0
-  -D ADMIN_PASSWORD="\"password\""
+  -D ADMIN_PASSWORD='"password"'
  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-build_src_filter = ${Heltec_lora32_v3.build_src_filter} +<helpers/ui/*.cpp> +<../examples/simple_repeater>
+build_src_filter = ${Heltec_lora32_v3.build_src_filter}
+  +<helpers/ui/*.cpp>
+  +<../examples/simple_repeater>

 [env:Heltec_v3_room_server]
 extends = Heltec_lora32_v3
-build_src_filter = ${Heltec_lora32_v3.build_src_filter} +<helpers/ui/*.cpp> +<../examples/simple_room_server>
+build_src_filter = ${Heltec_lora32_v3.build_src_filter}
+  +<helpers/ui/*.cpp>
+  +<../examples/simple_room_server>
 build_flags =
  ${Heltec_lora32_v3.build_flags}
  -D DISPLAY_CLASS=SSD1306Display
-  -D ADVERT_NAME="\"Heltec Room\""
+  -D ADVERT_NAME='"Heltec Room"'
  -D ADVERT_LAT=-37.0
  -D ADVERT_LON=145.0
-  -D ADMIN_PASSWORD="\"password\""
-  -D ROOM_PASSWORD="\"hello\""
+  -D ADMIN_PASSWORD='"password"'
+  -D ROOM_PASSWORD='"hello"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1

@@ -157,7 +171,8 @@ build_flags =
  -D MAX_GROUP_CHANNELS=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-build_src_filter = ${Heltec_lora32_v3.build_src_filter} +<../examples/simple_secure_chat/main.cpp>
+build_src_filter = ${Heltec_lora32_v3.build_src_filter}
+  +<../examples/simple_secure_chat/main.cpp>
 lib_deps =
  ${Heltec_lora32_v3.lib_deps}
  densaugeo/base64 @ ~1.4.0
@@ -167,13 +182,15 @@ extends = Heltec_lora32_v3
 build_flags =
  ${Heltec_lora32_v3.build_flags}
  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=1
+  -D MAX_GROUP_CHANNELS=8
  -D DISPLAY_CLASS=SSD1306Display
 ;  -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
-build_src_filter = ${Heltec_lora32_v3.build_src_filter} +<helpers/ui/*.cpp> +<../examples/companion_radio>
+build_src_filter = ${Heltec_lora32_v3.build_src_filter}
+  +<helpers/ui/*.cpp>
+  +<../examples/companion_radio>
 lib_deps =
  ${Heltec_lora32_v3.lib_deps}
  densaugeo/base64 @ ~1.4.0
@@ -183,7 +200,7 @@ extends = Heltec_lora32_v3
 build_flags =
  ${Heltec_lora32_v3.build_flags}
  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=1
+  -D MAX_GROUP_CHANNELS=8
  -D DISPLAY_CLASS=SSD1306Display
  -D BLE_PIN_CODE=0   ; dynamic, random PIN
  -D BLE_DEBUG_LOGGING=1
@@ -191,24 +208,10 @@ build_flags =
 ;  -D ENABLE_PRIVATE_KEY_EXPORT=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-build_src_filter = ${Heltec_lora32_v3.build_src_filter} +<helpers/ui/*.cpp> +<helpers/esp32/*.cpp> +<../examples/companion_radio>
-lib_deps =
-  ${Heltec_lora32_v3.lib_deps}
-  densaugeo/base64 @ ~1.4.0
-
-[env:Heltec_WSL3_companion_radio_ble]
-extends = Heltec_lora32_v3
-build_flags =
-  ${Heltec_lora32_v3.build_flags}
-  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=1
-  -D BLE_PIN_CODE=123456
-  -D BLE_DEBUG_LOGGING=1
-;  -D ENABLE_PRIVATE_KEY_IMPORT=1
-;  -D ENABLE_PRIVATE_KEY_EXPORT=1
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
-build_src_filter = ${Heltec_lora32_v3.build_src_filter} +<helpers/esp32/*.cpp> +<../examples/companion_radio>
+build_src_filter = ${Heltec_lora32_v3.build_src_filter}
+  +<helpers/ui/*.cpp>
+  +<helpers/esp32/*.cpp>
+  +<../examples/companion_radio>
 lib_deps =
  ${Heltec_lora32_v3.lib_deps}
  densaugeo/base64 @ ~1.4.0
@@ -218,16 +221,65 @@ extends = Heltec_lora32_v3
 build_flags =
  ${Heltec_lora32_v3.build_flags}
  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=1
+  -D MAX_GROUP_CHANNELS=8
  -D DISPLAY_CLASS=SSD1306Display
  -D WIFI_DEBUG_LOGGING=1
-  -D WIFI_SSID="\"myssid\""
-  -D WIFI_PWD="\"mypwd\""
+  -D WIFI_SSID='"myssid"'
+  -D WIFI_PWD='"mypwd"'
 ;  -D ENABLE_PRIVATE_KEY_IMPORT=1
 ;  -D ENABLE_PRIVATE_KEY_EXPORT=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-build_src_filter = ${Heltec_lora32_v3.build_src_filter} +<helpers/ui/*.cpp> +<helpers/esp32/*.cpp> +<../examples/companion_radio>
+build_src_filter = ${Heltec_lora32_v3.build_src_filter}
+  +<helpers/ui/*.cpp>
+  +<helpers/esp32/*.cpp>
+  +<../examples/companion_radio>
+lib_deps =
+  ${Heltec_lora32_v3.lib_deps}
+  densaugeo/base64 @ ~1.4.0
+
+[env:Heltec_WSL3_repeater]
+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 ADMIN_PASSWORD='"password"'
+  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
+build_src_filter = ${Heltec_lora32_v3.build_src_filter}
+  +<../examples/simple_repeater>
+
+[env:Heltec_WSL3_room_server]
+extends = Heltec_lora32_v3
+build_src_filter = ${Heltec_lora32_v3.build_src_filter}
+  +<../examples/simple_room_server>
+build_flags =
+  ${Heltec_lora32_v3.build_flags}
+  -D ADVERT_NAME='"Heltec Room"'
+  -D ADVERT_LAT=-37.0
+  -D ADVERT_LON=145.0
+  -D ADMIN_PASSWORD='"password"'
+  -D ROOM_PASSWORD='"hello"'
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
+
+[env:Heltec_WSL3_companion_radio_ble]
+extends = Heltec_lora32_v3
+build_flags =
+  ${Heltec_lora32_v3.build_flags}
+  -D MAX_CONTACTS=100
+  -D MAX_GROUP_CHANNELS=8
+  -D BLE_PIN_CODE=123456
+  -D BLE_DEBUG_LOGGING=1
+;  -D ENABLE_PRIVATE_KEY_IMPORT=1
+;  -D ENABLE_PRIVATE_KEY_EXPORT=1
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
+build_src_filter = ${Heltec_lora32_v3.build_src_filter}
+  +<helpers/esp32/*.cpp>
+  +<../examples/companion_radio>
 lib_deps =
  ${Heltec_lora32_v3.lib_deps}
  densaugeo/base64 @ ~1.4.0
@@ -253,31 +305,34 @@ build_flags =

 [env:Xiao_C3_Repeater_sx1262]
 extends = Xiao_esp32_C3
-build_src_filter = ${Xiao_esp32_C3.build_src_filter} +<../examples/simple_repeater/main.cpp>
+build_src_filter = ${Xiao_esp32_C3.build_src_filter}
+  +<../examples/simple_repeater/main.cpp>
 build_flags =
  ${Xiao_esp32_C3.build_flags}
  -D RADIO_CLASS=CustomSX1262
  -D WRAPPER_CLASS=CustomSX1262Wrapper
+  -D SX126X_RX_BOOSTED_GAIN=1
  -D LORA_TX_POWER=22
-  -D ADVERT_NAME="\"Xiao Repeater\""
+  -D ADVERT_NAME='"Xiao Repeater"'
  -D ADVERT_LAT=-37.0
  -D ADVERT_LON=145.0
-  -D ADMIN_PASSWORD="\"password\""
+  -D ADMIN_PASSWORD='"password"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1

 [env:Xiao_C3_Repeater_sx1268]
 extends = Xiao_esp32_C3
-build_src_filter = ${Xiao_esp32_C3.build_src_filter} +<../examples/simple_repeater/main.cpp>
+build_src_filter = ${Xiao_esp32_C3.build_src_filter}
+  +<../examples/simple_repeater/main.cpp>
 build_flags =
  ${Xiao_esp32_C3.build_flags}
  -D RADIO_CLASS=CustomSX1268
  -D WRAPPER_CLASS=CustomSX1268Wrapper
  -D LORA_TX_POWER=22
-  -D ADVERT_NAME="\"Xiao Repeater\""
+  -D ADVERT_NAME='"Xiao Repeater"'
  -D ADVERT_LAT=-37.0
  -D ADVERT_LON=145.0
-  -D ADMIN_PASSWORD="\"password\""
+  -D ADMIN_PASSWORD='"password"'
 ; -D MESH_PACKET_LOGGING=1
 ; -D MESH_DEBUG=1

@@ -302,16 +357,18 @@ build_flags = ${esp32_base.build_flags}
  -D RADIO_CLASS=CustomSX1262
  -D WRAPPER_CLASS=CustomSX1262Wrapper
  -D LORA_TX_POWER=22
+  -D SX126X_RX_BOOSTED_GAIN=1

 [env:Xiao_S3_WIO_Repeater]
 extends = Xiao_S3_WIO
-build_src_filter = ${Xiao_S3_WIO.build_src_filter} +<../examples/simple_repeater/main.cpp>
+build_src_filter = ${Xiao_S3_WIO.build_src_filter}
+  +<../examples/simple_repeater/main.cpp>
 build_flags =
  ${Xiao_S3_WIO.build_flags}
-  -D ADVERT_NAME="\"XiaoS3 Repeater\""
+  -D ADVERT_NAME='"XiaoS3 Repeater"'
  -D ADVERT_LAT=-37.0
  -D ADVERT_LON=145.0
-  -D ADMIN_PASSWORD="\"password\""
+  -D ADMIN_PASSWORD='"password"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1

@@ -320,10 +377,11 @@ extends = Xiao_S3_WIO
 build_flags =
  ${Xiao_S3_WIO.build_flags}
  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=1
+  -D MAX_GROUP_CHANNELS=8
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-build_src_filter = ${Xiao_S3_WIO.build_src_filter} +<../examples/simple_secure_chat/main.cpp>
+build_src_filter = ${Xiao_S3_WIO.build_src_filter}
+  +<../examples/simple_secure_chat/main.cpp>
 lib_deps =
  ${Xiao_S3_WIO.lib_deps}
  densaugeo/base64 @ ~1.4.0
@@ -333,14 +391,16 @@ extends = Xiao_S3_WIO
 build_flags =
  ${Xiao_S3_WIO.build_flags}
  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=1
+  -D MAX_GROUP_CHANNELS=8
  -D BLE_PIN_CODE=123456
 ;  -D BLE_DEBUG_LOGGING=1
 ;  -D ENABLE_PRIVATE_KEY_IMPORT=1
 ;  -D ENABLE_PRIVATE_KEY_EXPORT=1
 ;  -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>
+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
@@ -365,10 +425,98 @@ build_flags =
  -D P_LORA_MOSI=27     ; SPI MOSI
  -D P_LORA_TX_LED=2    ; LED pin for TX indication
  -D PIN_VBAT_READ=35   ; Battery voltage reading (analog pin)
+  -D PIN_USER_BTN=0
  -D RADIO_CLASS=CustomSX1276
  -D ARDUINO_LOOP_STACK_SIZE=16384
+  -D DISPLAY_CLASS=SSD1306Display
  -D WRAPPER_CLASS=CustomSX1276Wrapper
  -D LORA_TX_POWER=20
+lib_deps =
+  ${esp32_base.lib_deps}
+  adafruit/Adafruit SSD1306 @ ^2.5.13
+
+; === LILYGO T-LoRa V2.1-1.6 with SX1276 environments ===
+[env:LilyGo_TLora_V2_1_1_6_Repeater]
+extends = LilyGo_TLora_V2_1_1_6
+build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter}
+  +<helpers/ui/*.cpp>
+  +<../examples/simple_repeater>
+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 ADMIN_PASSWORD='"password"'
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
+;  -D CORE_DEBUG_LEVEL=3
+
+[env:LilyGo_TLora_V2_1_1_6_terminal_chat]
+extends = LilyGo_TLora_V2_1_1_6
+build_flags =
+  ${LilyGo_TLora_V2_1_1_6.build_flags}
+  -D MAX_CONTACTS=100
+  -D MAX_GROUP_CHANNELS=8
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
+build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter}
+  +<helpers/ui/*.cpp>
+  +<../examples/simple_repeater>
+lib_deps =
+  ${LilyGo_TLora_V2_1_1_6.lib_deps}
+  densaugeo/base64 @ ~1.4.0
+
+[env:LilyGo_TLora_V2_1_1_6_companion_radio_usb]
+extends = LilyGo_TLora_V2_1_1_6
+build_flags =
+  ${LilyGo_TLora_V2_1_1_6.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
+build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter}
+  +<helpers/ui/*.cpp>
+  +<../examples/companion_radio>
+lib_deps =
+  ${LilyGo_TLora_V2_1_1_6.lib_deps}
+  densaugeo/base64 @ ~1.4.0
+
+[env:LilyGo_TLora_V2_1_1_6_companion_radio_ble]
+extends = LilyGo_TLora_V2_1_1_6
+build_flags =
+  ${LilyGo_TLora_V2_1_1_6.build_flags}
+  -D MAX_CONTACTS=100
+  -D MAX_GROUP_CHANNELS=8
+  -D BLE_PIN_CODE=123456
+;  -D BLE_DEBUG_LOGGING=1
+;  -D ENABLE_PRIVATE_KEY_IMPORT=1
+;  -D ENABLE_PRIVATE_KEY_EXPORT=1
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
+build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter}
+  +<helpers/esp32/*.cpp>
+  +<helpers/ui/*.cpp>
+  +<../examples/companion_radio>
+lib_deps =
+  ${LilyGo_TLora_V2_1_1_6.lib_deps}
+  densaugeo/base64 @ ~1.4.0
+
+[env:LilyGo_TLora_V2_1_1_6_room_server]
+extends = LilyGo_TLora_V2_1_1_6
+build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter}
+  +<helpers/ui/*.cpp>
+  +<../examples/simple_room_server>
+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 ADMIN_PASSWORD='"password"'
+  -D ROOM_PASSWORD='"hello"'
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1

 ; =============
 [LilyGo_T3S3_sx1262]
@@ -391,90 +539,19 @@ build_flags = ${esp32_base.build_flags}
  -D RADIO_CLASS=CustomSX1262
  -D WRAPPER_CLASS=CustomSX1262Wrapper
  -D LORA_TX_POWER=22
-
-
-; === LILYGO T-LoRa V2.1-1.6 with SX1276 environments ===
-[env:LilyGo_TLora_V2_1_1_6_Repeater]
-extends = LilyGo_TLora_V2_1_1_6
-build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter} +<../examples/simple_repeater/main.cpp>
-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 ADMIN_PASSWORD="\"password\""
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
-;  -D CORE_DEBUG_LEVEL=3
-
-[env:LilyGo_TLora_V2_1_1_6_terminal_chat]
-extends = LilyGo_TLora_V2_1_1_6
-build_flags =
-  ${LilyGo_TLora_V2_1_1_6.build_flags}
-  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=1
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
-build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter} +<../examples/simple_secure_chat/main.cpp>
-lib_deps =
-  ${LilyGo_TLora_V2_1_1_6.lib_deps}
-  densaugeo/base64 @ ~1.4.0
-
-[env:LilyGo_TLora_V2_1_1_6_companion_radio_usb]
-extends = LilyGo_TLora_V2_1_1_6
-build_flags =
-  ${LilyGo_TLora_V2_1_1_6.build_flags}
-  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=1
-;  -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
-build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter} +<../examples/companion_radio/main.cpp>
-lib_deps =
-  ${LilyGo_TLora_V2_1_1_6.lib_deps}
-  densaugeo/base64 @ ~1.4.0
-
-[env:LilyGo_TLora_V2_1_1_6_companion_radio_ble]
-extends = LilyGo_TLora_V2_1_1_6
-build_flags =
-  ${LilyGo_TLora_V2_1_1_6.build_flags}
-  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=1
-  -D BLE_PIN_CODE=123456
-;  -D BLE_DEBUG_LOGGING=1
-;  -D ENABLE_PRIVATE_KEY_IMPORT=1
-;  -D ENABLE_PRIVATE_KEY_EXPORT=1
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
-build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter} +<helpers/esp32/*.cpp> +<../examples/companion_radio/main.cpp>
-lib_deps =
-  ${LilyGo_TLora_V2_1_1_6.lib_deps}
-  densaugeo/base64 @ ~1.4.0
-
-[env:LilyGo_TLora_V2_1_1_6_room_server]
-extends = LilyGo_TLora_V2_1_1_6
-build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter} +<../examples/simple_room_server/main.cpp>
-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 ADMIN_PASSWORD="\"password\""
-  -D ROOM_PASSWORD="\"hello\""
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
+  -D SX126X_RX_BOOSTED_GAIN=1

 ; === LilyGo T3S3 with SX1262 environments ===
 [env:LilyGo_T3S3_sx1262_Repeater]
 extends = LilyGo_T3S3_sx1262
-build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter} +<../examples/simple_repeater/main.cpp>
+build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter}
+  +<../examples/simple_repeater/main.cpp>
 build_flags =
  ${LilyGo_T3S3_sx1262.build_flags}
-  -D ADVERT_NAME="\"T3S3-1262 Repeater\""
+  -D ADVERT_NAME='"T3S3-1262 Repeater"'
  -D ADVERT_LAT=-37.0
  -D ADVERT_LON=145.0
-  -D ADMIN_PASSWORD="\"password\""
+  -D ADMIN_PASSWORD='"password"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1

@@ -486,7 +563,8 @@ build_flags =
  -D MAX_GROUP_CHANNELS=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter} +<../examples/simple_secure_chat/main.cpp>
+build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter}
+  +<../examples/simple_secure_chat/main.cpp>
 lib_deps =
  ${LilyGo_T3S3_sx1262.lib_deps}
  densaugeo/base64 @ ~1.4.0
@@ -496,12 +574,13 @@ extends = LilyGo_T3S3_sx1262
 build_flags =
  ${LilyGo_T3S3_sx1262.build_flags}
  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=1
+  -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
-build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter} +<../examples/companion_radio/main.cpp>
+build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter}
+  +<../examples/companion_radio/main.cpp>
 lib_deps =
  ${LilyGo_T3S3_sx1262.lib_deps}
  densaugeo/base64 @ ~1.4.0
@@ -511,18 +590,69 @@ extends = LilyGo_T3S3_sx1262
 build_flags =
  ${LilyGo_T3S3_sx1262.build_flags}
  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=1
+  -D MAX_GROUP_CHANNELS=8
  -D BLE_PIN_CODE=123456
  -D BLE_DEBUG_LOGGING=1
 ;  -D ENABLE_PRIVATE_KEY_IMPORT=1
 ;  -D ENABLE_PRIVATE_KEY_EXPORT=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter} +<helpers/esp32/*.cpp> +<../examples/companion_radio/main.cpp>
+build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter}
+  +<helpers/esp32/*.cpp>
+  +<../examples/companion_radio/main.cpp>
 lib_deps =
  ${LilyGo_T3S3_sx1262.lib_deps}
  densaugeo/base64 @ ~1.4.0

+[Station_G2]
+extends = esp32_base
+board = station-g2
+build_flags =
+  ${esp32_base.build_flags}
+  -D STATION_G2
+  -D RADIO_CLASS=CustomSX1262
+  -D WRAPPER_CLASS=CustomSX1262Wrapper
+  -D LORA_TX_POWER=7
+;  -D P_LORA_TX_LED=35
+;  -D PIN_BOARD_SDA=5
+;  -D PIN_BOARD_SCL=6
+  -D PIN_USER_BTN=0
+  -D SX126X_DIO2_AS_RF_SWITCH=true
+  -D SX126X_DIO3_TCXO_VOLTAGE=1.8
+  -D SX126X_CURRENT_LIMIT=130.0f  ; for best TX power!
+;  -D SX126X_RX_BOOSTED_GAIN=1 - DO NOT ENABLE THIS!
+;  https://wiki.uniteng.com/en/meshtastic/station-g2#impact-of-lora-node-dense-areashigh-noise-environments-on-rf-performance
+
+build_src_filter = ${esp32_base.build_src_filter}
+lib_deps =
+  ${esp32_base.lib_deps}
+
+[env:Station_G2_repeater]
+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 ADMIN_PASSWORD='"password"'
+  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
+build_src_filter = ${Station_G2.build_src_filter}
+  +<../examples/simple_repeater>
+
+[env:Station_G2_room_server]
+extends = Station_G2
+build_src_filter = ${Station_G2.build_src_filter}
+  +<../examples/simple_room_server>
+build_flags =
+  ${Station_G2.build_flags}
+  -D ADVERT_NAME='"Station G2 Room"'
+  -D ADVERT_LAT=-37.0
+  -D ADVERT_LON=145.0
+  -D ADMIN_PASSWORD='"password"'
+  -D ROOM_PASSWORD='"hello"'
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1

 ; ----------------- NRF52 ---------------------
 [nrf52_base]
@@ -544,36 +674,40 @@ extends = nrf52840_base
 platform = https://github.com/maxgerhardt/platform-nordicnrf52.git#rak
 board = wiscore_rak4631
 board_check = true
-build_src_filter = ${nrf52840_base.build_src_filter}  +<helpers/nrf52/*.cpp>
+build_src_filter = ${nrf52840_base.build_src_filter}
+  +<helpers/nrf52/*.cpp>
 build_flags = ${nrf52840_base.build_flags}
  -D RAK_4631
  -D RADIO_CLASS=CustomSX1262
  -D WRAPPER_CLASS=CustomSX1262Wrapper
  -D LORA_TX_POWER=22
  -D SX126X_CURRENT_LIMIT=130
+  -D SX126X_RX_BOOSTED_GAIN=1

 [env:RAK_4631_Repeater]
 extends = rak4631
-build_src_filter = ${rak4631.build_src_filter} +<../examples/simple_repeater/main.cpp>
+build_src_filter = ${rak4631.build_src_filter}
+  +<../examples/simple_repeater/main.cpp>
 build_flags =
  ${rak4631.build_flags}
-  -D ADVERT_NAME="\"RAK4631 Repeater\""
+  -D ADVERT_NAME='"RAK4631 Repeater"'
  -D ADVERT_LAT=-37.0
  -D ADVERT_LON=145.0
-  -D ADMIN_PASSWORD="\"password\""
+  -D ADMIN_PASSWORD='"password"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1

 [env:RAK_4631_room_server]
 extends = rak4631
-build_src_filter = ${rak4631.build_src_filter} +<../examples/simple_room_server/main.cpp>
+build_src_filter = ${rak4631.build_src_filter}
+  +<../examples/simple_room_server/main.cpp>
 build_flags =
  ${rak4631.build_flags}
-  -D ADVERT_NAME="\"Test Room\""
+  -D ADVERT_NAME='"Test Room"'
  -D ADVERT_LAT=-37.0
  -D ADVERT_LON=145.0
-  -D ADMIN_PASSWORD="\"password\""
-  -D ROOM_PASSWORD="\"hello\""
+  -D ADMIN_PASSWORD='"password"'
+  -D ROOM_PASSWORD='"hello"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1

@@ -585,7 +719,8 @@ build_flags =
  -D MAX_GROUP_CHANNELS=1
  -D MESH_PACKET_LOGGING=1
  -D MESH_DEBUG=1
-build_src_filter = ${rak4631.build_src_filter} +<../examples/simple_secure_chat/main.cpp>
+build_src_filter = ${rak4631.build_src_filter}
+  +<../examples/simple_secure_chat/main.cpp>
 lib_deps =
  ${rak4631.lib_deps}
  densaugeo/base64 @ ~1.4.0
@@ -595,12 +730,13 @@ extends = rak4631
 build_flags =
  ${rak4631.build_flags}
  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=1
+  -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
-build_src_filter = ${rak4631.build_src_filter} +<../examples/companion_radio/main.cpp>
+build_src_filter = ${rak4631.build_src_filter}
+  +<../examples/companion_radio/main.cpp>
 lib_deps =
  ${rak4631.lib_deps}
  densaugeo/base64 @ ~1.4.0
@@ -610,14 +746,16 @@ extends = rak4631
 build_flags =
  ${rak4631.build_flags}
  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=1
+  -D MAX_GROUP_CHANNELS=8
  -D BLE_PIN_CODE=123456
  -D BLE_DEBUG_LOGGING=1
 ;  -D ENABLE_PRIVATE_KEY_IMPORT=1
 ;  -D ENABLE_PRIVATE_KEY_EXPORT=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-build_src_filter = ${rak4631.build_src_filter} +<helpers/nrf52/*.cpp> +<../examples/companion_radio/main.cpp>
+build_src_filter = ${rak4631.build_src_filter}
+  +<helpers/nrf52/*.cpp>
+  +<../examples/companion_radio/main.cpp>
 lib_deps =
  ${rak4631.lib_deps}
  densaugeo/base64 @ ~1.4.0
@@ -648,6 +786,7 @@ build_flags = ${nrf52840_t1000e.build_flags}
  -D PIN_USER_BTN=6
  -D RADIO_CLASS=CustomLR1110
  -D WRAPPER_CLASS=CustomLR1110Wrapper
+  -D MAX_LORA_TX_POWER=22
 build_src_filter = ${nrf52840_t1000e.build_src_filter}
  +<helpers/*.cpp>
  +<helpers/nrf52/T1000eBoard.cpp>
@@ -659,7 +798,7 @@ upload_protocol = nrfutil
 extends = t1000-e
 build_flags = ${t1000-e.build_flags}
  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=1
+  -D MAX_GROUP_CHANNELS=8
  -D BLE_PIN_CODE=123456
  -D BLE_DEBUG_LOGGING=1
  -D MESH_PACKET_LOGGING=1
@@ -688,10 +827,12 @@ board_build.ldscript = boards/nrf52840_s140_v6.ld
 build_flags = ${nrf52840_t114.build_flags}
  -Ivariants/t114
  -DHELTEC_T114
+  -D P_LORA_TX_LED=35
  -D RADIO_CLASS=CustomSX1262
  -D WRAPPER_CLASS=CustomSX1262Wrapper
  -D LORA_TX_POWER=22
  -D SX126X_CURRENT_LIMIT=130
+  -D SX126X_RX_BOOSTED_GAIN=1
 build_src_filter = ${nrf52840_t114.build_src_filter}
  +<helpers/*.cpp>
  +<helpers/nrf52/T114Board.cpp>
@@ -701,13 +842,28 @@ upload_protocol = nrfutil

 [env:Heltec_t114_repeater]
 extends = Heltec_t114
-build_src_filter = ${Heltec_t114.build_src_filter} +<../examples/simple_repeater/main.cpp>
+build_src_filter = ${Heltec_t114.build_src_filter}
+  +<../examples/simple_repeater/main.cpp>
 build_flags =
  ${Heltec_t114.build_flags}
-  -D ADVERT_NAME="\"Heltec_T114 Repeater\""
+  -D ADVERT_NAME='"Heltec_T114 Repeater"'
  -D ADVERT_LAT=-37.0
  -D ADVERT_LON=145.0
-  -D ADMIN_PASSWORD="\"password\""
+  -D ADMIN_PASSWORD='"password"'
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
+
+[env:Heltec_t114_room_server]
+extends = Heltec_t114
+build_src_filter = ${Heltec_t114.build_src_filter}
+  +<../examples/simple_room_server>
+build_flags =
+  ${Heltec_t114.build_flags}
+  -D ADVERT_NAME='"Heltec_T114 Room"'
+  -D ADVERT_LAT=-37.0
+  -D ADVERT_LON=145.0
+  -D ADMIN_PASSWORD='"password"'
+  -D ROOM_PASSWORD='"hello"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1

@@ -716,14 +872,16 @@ extends = Heltec_t114
 build_flags =
  ${Heltec_t114.build_flags}
  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=1
+  -D MAX_GROUP_CHANNELS=8
  -D BLE_PIN_CODE=123456
  -D BLE_DEBUG_LOGGING=1
 ;  -D ENABLE_PRIVATE_KEY_IMPORT=1
 ;  -D ENABLE_PRIVATE_KEY_EXPORT=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-build_src_filter = ${Heltec_t114.build_src_filter} +<helpers/nrf52/*.cpp> +<../examples/companion_radio/main.cpp>
+build_src_filter = ${Heltec_t114.build_src_filter}
+  +<helpers/nrf52/*.cpp>
+  +<../examples/companion_radio/main.cpp>
 lib_deps =
  ${Heltec_t114.lib_deps}
  densaugeo/base64 @ ~1.4.0
@@ -750,6 +908,7 @@ build_flags = ${nrf52840_techo.build_flags}
  -D WRAPPER_CLASS=CustomSX1262Wrapper
  -D LORA_TX_POWER=22
  -D SX126X_CURRENT_LIMIT=130
+  -D SX126X_RX_BOOSTED_GAIN=1
 build_src_filter = ${nrf52840_techo.build_src_filter}
  +<helpers/*.cpp>
  +<helpers/nrf52/TechoBoard.cpp>
@@ -762,10 +921,22 @@ extends = LilyGo_Techo
 build_src_filter = ${LilyGo_Techo.build_src_filter} +<../examples/simple_repeater/main.cpp>
 build_flags =
  ${LilyGo_Techo.build_flags}
-  -D ADVERT_NAME="\"T-Echo Repeater\""
+  -D ADVERT_NAME='"T-Echo Repeater"'
  -D ADVERT_LAT=-37.0
  -D ADVERT_LON=145.0
-  -D ADMIN_PASSWORD="\"password\""
+  -D ADMIN_PASSWORD='"password"'
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
+
+[env:LilyGo_T-Echo_room_server]
+extends = LilyGo_Techo
+build_src_filter = ${LilyGo_Techo.build_src_filter} +<../examples/simple_room_server/main.cpp>
+build_flags =
+  ${LilyGo_Techo.build_flags}
+  -D ADVERT_NAME='"T-Echo Room"'
+  -D ADVERT_LAT=-37.0
+  -D ADVERT_LON=145.0
+  -D ADMIN_PASSWORD='"password"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1

@@ -774,14 +945,16 @@ extends = LilyGo_Techo
 build_flags =
  ${LilyGo_Techo.build_flags}
  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=1
+  -D MAX_GROUP_CHANNELS=8
  -D BLE_PIN_CODE=123456
  -D BLE_DEBUG_LOGGING=1
 ;  -D ENABLE_PRIVATE_KEY_IMPORT=1
 ;  -D ENABLE_PRIVATE_KEY_EXPORT=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-build_src_filter = ${LilyGo_Techo.build_src_filter} +<helpers/nrf52/*.cpp> +<../examples/companion_radio/main.cpp>
+build_src_filter = ${LilyGo_Techo.build_src_filter}
+  +<helpers/nrf52/*.cpp>
+  +<../examples/companion_radio/main.cpp>
 lib_deps =
  ${LilyGo_Techo.lib_deps}
  densaugeo/base64 @ ~1.4.0
--- a/src/Dispatcher.cpp
+++ b/src/Dispatcher.cpp
@@ -78,9 +78,11 @@ void Dispatcher::checkRecv() {
  float score;
  uint32_t air_time;
  {
-    uint8_t raw[MAX_TRANS_UNIT];
+    uint8_t raw[MAX_TRANS_UNIT+1];
    int len = _radio->recvRaw(raw, MAX_TRANS_UNIT);
    if (len > 0) {
+      logRxRaw(_radio->getLastSNR(), _radio->getLastRSSI(), raw, len);
+
      pkt = _mgr->allocNew();
      if (pkt == NULL) {
        MESH_DEBUG_PRINTLN("%s Dispatcher::checkRecv(): WARNING: received data, no unused packets available!", getLogDateTime());
@@ -106,10 +108,16 @@ void Dispatcher::checkRecv() {
          memcpy(pkt->path, &raw[i], pkt->path_len); i += pkt->path_len;

          pkt->payload_len = len - i;  // payload is remainder
-          memcpy(pkt->payload, &raw[i], pkt->payload_len);
+          if (pkt->payload_len > sizeof(pkt->payload)) {
+            MESH_DEBUG_PRINTLN("%s Dispatcher::checkRecv(): packet payload too big, payload_len=%d", getLogDateTime(), (uint32_t)pkt->payload_len);
+            _mgr->free(pkt);  // put back into pool
+            pkt = NULL;  
+          } else {
+            memcpy(pkt->payload, &raw[i], pkt->payload_len);

-          score = _radio->packetScore(_radio->getLastSNR(), len);
-          air_time = _radio->getEstAirtimeFor(len);
+            score = _radio->packetScore(_radio->getLastSNR(), len);
+            air_time = _radio->getEstAirtimeFor(len);
+          }
        }
      }
    } else {
@@ -122,6 +130,12 @@ void Dispatcher::checkRecv() {
    Serial.printf(": RX, len=%d (type=%d, route=%s, payload_len=%d) SNR=%d RSSI=%d score=%d", 
            2 + pkt->path_len + pkt->payload_len, pkt->getPayloadType(), pkt->isRouteDirect() ? "D" : "F", pkt->payload_len,
            (int)_radio->getLastSNR(), (int)_radio->getLastRSSI(), (int)(score*1000));
+
+    static uint8_t packet_hash[MAX_HASH_SIZE];
+    pkt->calculatePacketHash(packet_hash);
+    Serial.print(" hash=");
+    mesh::Utils::printHex(Serial, packet_hash, MAX_HASH_SIZE);
+
    if (pkt->getPayloadType() == PAYLOAD_TYPE_PATH || pkt->getPayloadType() == PAYLOAD_TYPE_REQ
        || pkt->getPayloadType() == PAYLOAD_TYPE_RESPONSE || pkt->getPayloadType() == PAYLOAD_TYPE_TXT_MSG) {
      Serial.printf(" [%02X -> %02X]\n", (uint32_t)pkt->payload[1], (uint32_t)pkt->payload[0]);
--- a/src/Dispatcher.h
+++ b/src/Dispatcher.h
@@ -117,6 +117,8 @@ protected:

  virtual DispatcherAction onRecvPacket(Packet* pkt) = 0;

+  virtual void logRxRaw(float snr, float rssi, const uint8_t raw[], int len) { }   // custom hook
+
  virtual void logRx(Packet* packet, int len, float score) { }   // hooks for custom logging
  virtual void logTx(Packet* packet, int len) { }
  virtual void logTxFail(Packet* packet, int len) { }
--- a/src/helpers/BaseChatMesh.cpp
+++ b/src/helpers/BaseChatMesh.cpp
@@ -203,9 +203,9 @@ void BaseChatMesh::onAckRecv(mesh::Packet* packet, uint32_t ack_crc) {
 #ifdef MAX_GROUP_CHANNELS
 int BaseChatMesh::searchChannelsByHash(const uint8_t* hash, mesh::GroupChannel dest[], int max_matches) {
  int n = 0;
-  for (int i = 0; i < num_channels && n < max_matches; i++) {
-    if (channels[i].hash[0] == hash[0]) {
-      dest[n++] = channels[i];
+  for (int i = 0; i < MAX_GROUP_CHANNELS && n < max_matches; i++) {
+    if (channels[i].channel.hash[0] == hash[0]) {
+      dest[n++] = channels[i].channel;
    }
  }
  return n;
@@ -588,24 +588,61 @@ bool BaseChatMesh::removeContact(ContactInfo& contact) {
 #ifdef MAX_GROUP_CHANNELS
 #include <base64.hpp>

-mesh::GroupChannel* BaseChatMesh::addChannel(const char* psk_base64) {
+ChannelDetails* BaseChatMesh::addChannel(const char* name, const char* psk_base64) {
  if (num_channels < MAX_GROUP_CHANNELS) {
    auto dest = &channels[num_channels];

-    memset(dest->secret, 0, sizeof(dest->secret));
-    int len = decode_base64((unsigned char *) psk_base64, strlen(psk_base64), dest->secret);
+    memset(dest->channel.secret, 0, sizeof(dest->channel.secret));
+    int len = decode_base64((unsigned char *) psk_base64, strlen(psk_base64), dest->channel.secret);
    if (len == 32 || len == 16) {
-      mesh::Utils::sha256(dest->hash, sizeof(dest->hash), dest->secret, len);
+      mesh::Utils::sha256(dest->channel.hash, sizeof(dest->channel.hash), dest->channel.secret, len);
+      StrHelper::strncpy(dest->name, name, sizeof(dest->name));
      num_channels++;
      return dest;
    }
  }
  return NULL;
 }
+bool BaseChatMesh::getChannel(int idx, ChannelDetails& dest) {
+  if (idx >= 0 && idx < MAX_GROUP_CHANNELS) {
+    dest = channels[idx];
+    return true;
+  }
+  return false;
+}
+bool BaseChatMesh::setChannel(int idx, const ChannelDetails& src) {
+  static uint8_t zeroes[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 };
+
+  if (idx >= 0 && idx < MAX_GROUP_CHANNELS) {
+    channels[idx] = src;
+    if (memcmp(&src.channel.secret[16], zeroes, 16) == 0) {
+      mesh::Utils::sha256(channels[idx].channel.hash, sizeof(channels[idx].channel.hash), src.channel.secret, 16);  // 128-bit key
+    } else {
+      mesh::Utils::sha256(channels[idx].channel.hash, sizeof(channels[idx].channel.hash), src.channel.secret, 32);  // 256-bit key
+    }
+    return true;
+  }
+  return false;
+}
+int BaseChatMesh::findChannelIdx(const mesh::GroupChannel& ch) {
+  for (int i = 0; i < MAX_GROUP_CHANNELS; i++) {
+    if (memcmp(ch.secret, channels[i].channel.secret, sizeof(ch.secret)) == 0) return i;
+  }
+  return -1;  // not found
+}
 #else
-mesh::GroupChannel* BaseChatMesh::addChannel(const char* psk_base64) {
+ChannelDetails* BaseChatMesh::addChannel(const char* name, const char* psk_base64) {
  return NULL;  // not supported
 }
+bool BaseChatMesh::getChannel(int idx, ChannelDetails& dest) {
+  return false;
+}
+bool BaseChatMesh::setChannel(int idx, const ChannelDetails& src) {
+  return false;
+}
+int BaseChatMesh::findChannelIdx(const mesh::GroupChannel& ch) {
+  return -1;  // not found
+}
 #endif

 ContactsIterator BaseChatMesh::startContactsIterator() {
--- a/src/helpers/BaseChatMesh.h
+++ b/src/helpers/BaseChatMesh.h
@@ -61,6 +61,11 @@ struct ConnectionInfo {
  uint32_t expected_ack;
 };

+struct ChannelDetails {
+  mesh::GroupChannel channel;
+  char name[32];
+};
+
 /**
 *  \brief  abstract Mesh class for common 'chat' client
 */
@@ -74,8 +79,8 @@ class BaseChatMesh : public mesh::Mesh {
  int matching_peer_indexes[MAX_SEARCH_RESULTS];
  unsigned long txt_send_timeout;
 #ifdef MAX_GROUP_CHANNELS
-  mesh::GroupChannel channels[MAX_GROUP_CHANNELS];
-  int num_channels;
+  ChannelDetails channels[MAX_GROUP_CHANNELS];
+  int num_channels;  // only for addChannel()
 #endif
  mesh::Packet* _pendingLoopback;
  uint8_t temp_buf[MAX_TRANS_UNIT];
@@ -89,6 +94,7 @@ protected:
  { 
    num_contacts = 0;
  #ifdef MAX_GROUP_CHANNELS
+    memset(channels, 0, sizeof(channels));
    num_channels = 0;
  #endif
    txt_send_timeout = 0;
@@ -151,7 +157,10 @@ public:
  bool  addContact(const ContactInfo& contact);
  int getNumContacts() const { return num_contacts; }
  ContactsIterator startContactsIterator();
-  mesh::GroupChannel* addChannel(const char* psk_base64);
+  ChannelDetails* addChannel(const char* name, const char* psk_base64);
+  bool getChannel(int idx, ChannelDetails& dest);
+  bool setChannel(int idx, const ChannelDetails& src);
+  int findChannelIdx(const mesh::GroupChannel& ch);

  void loop();
 };
--- a/src/helpers/CommonCLI.cpp
+++ b/src/helpers/CommonCLI.cpp
@@ -41,6 +41,7 @@ void CommonCLI::loadPrefs(FILESYSTEM* fs) {
      file.read((uint8_t *) &_prefs->reserved2, sizeof(_prefs->reserved2));  // 115
      file.read((uint8_t *) &_prefs->bw, sizeof(_prefs->bw));  // 116
      file.read(pad, 4);   // 120
+      file.read((uint8_t *) &_prefs->flood_max, sizeof(_prefs->flood_max));   // 124

      // sanitise bad pref values
      _prefs->rx_delay_base = constrain(_prefs->rx_delay_base, 0, 20.0f);
@@ -91,6 +92,7 @@ void CommonCLI::savePrefs(FILESYSTEM* fs) {
    file.write((uint8_t *) &_prefs->reserved2, sizeof(_prefs->reserved2));  // 115
    file.write((uint8_t *) &_prefs->bw, sizeof(_prefs->bw));  // 116
    file.write(pad, 4);   // 120
+    file.write((uint8_t *) &_prefs->flood_max, sizeof(_prefs->flood_max));   // 124

    file.close();
  }
@@ -176,6 +178,8 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
        sprintf(reply, "> %s", StrHelper::ftoa(_prefs->rx_delay_base));
      } else if (memcmp(config, "txdelay", 7) == 0) {
        sprintf(reply, "> %s", StrHelper::ftoa(_prefs->tx_delay_factor));
+      } else if (memcmp(config, "flood.max", 9) == 0) {
+        sprintf(reply, "> %d", (uint32_t)_prefs->flood_max);
      } else if (memcmp(config, "direct.txdelay", 14) == 0) {
        sprintf(reply, "> %s", StrHelper::ftoa(_prefs->direct_tx_delay_factor));
      } else if (memcmp(config, "tx", 2) == 0 && (config[2] == 0 || config[2] == ' ')) {
@@ -262,6 +266,15 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
        } else {
          strcpy(reply, "Error, cannot be negative");
        }
+      } else if (memcmp(config, "flood.max ", 10) == 0) {
+        uint8_t m = atoi(&config[10]);
+        if (m <= 64) {
+          _prefs->flood_max = m;
+          savePrefs();
+          strcpy(reply, "OK");
+        } else {
+          strcpy(reply, "Error, max 64");
+        }
      } else if (memcmp(config, "direct.txdelay ", 15) == 0) {
        float f = atof(&config[15]);
        if (f >= 0) {
--- a/src/helpers/CommonCLI.h
+++ b/src/helpers/CommonCLI.h
@@ -23,6 +23,7 @@ struct NodePrefs {  // persisted to file
    uint8_t reserved1;
    uint8_t reserved2;
    float bw;
+    uint8_t flood_max;
 };

 class CommonCLICallbacks {
--- a/src/helpers/CustomSX1262.h
+++ b/src/helpers/CustomSX1262.h
@@ -9,7 +9,7 @@ class CustomSX1262 : public SX1262 {
    CustomSX1262(Module *mod) : SX1262(mod) { }

    bool isReceiving() {
-      uint16_t irq = getIrqStatus();
+      uint16_t irq = getIrqFlags();
      bool hasPreamble = (irq & SX126X_IRQ_HEADER_VALID);
      return hasPreamble;
    }
--- a/src/helpers/CustomSX1268.h
+++ b/src/helpers/CustomSX1268.h
@@ -9,7 +9,7 @@ class CustomSX1268 : public SX1268 {
    CustomSX1268(Module *mod) : SX1268(mod) { }

    bool isReceiving() {
-      uint16_t irq = getIrqStatus();
+      uint16_t irq = getIrqFlags();
      bool hasPreamble = (irq & SX126X_IRQ_HEADER_VALID);
      return hasPreamble;
    }
--- a/src/helpers/ESP32Board.h
+++ b/src/helpers/ESP32Board.h
@@ -17,6 +17,10 @@ public:
    // for future use, sub-classes SHOULD call this from their begin()
    startup_reason = BD_STARTUP_NORMAL;

+  #ifdef ESP32_CPU_FREQ
+    setCpuFrequencyMhz(ESP32_CPU_FREQ);
+  #endif
+
  #ifdef PIN_VBAT_READ
    // battery read support
    pinMode(PIN_VBAT_READ, INPUT);
--- a/src/helpers/HeltecV3Board.h
+++ b/src/helpers/HeltecV3Board.h
@@ -29,7 +29,8 @@ public:
    ESP32Board::begin();

    pinMode(PIN_ADC_CTRL, OUTPUT);
-    //pinMode(PIN_VEXT_EN, OUTPUT);
+    pinMode(PIN_VEXT_EN, OUTPUT);
+    digitalWrite(PIN_VEXT_EN, LOW);  // for V3.2 boards

    esp_reset_reason_t reason = esp_reset_reason();
    if (reason == ESP_RST_DEEPSLEEP) {
--- a/src/helpers/RadioLibWrappers.cpp
+++ b/src/helpers/RadioLibWrappers.cpp
@@ -52,10 +52,11 @@ int RadioLibWrapper::recvRaw(uint8_t* bytes, int sz) {
      int err = _radio->readData(bytes, len);
      if (err != RADIOLIB_ERR_NONE) {
        MESH_DEBUG_PRINTLN("RadioLibWrapper: error: readData(%d)", err);
+        len = 0;
      } else {
      //  Serial.print("  readData() -> "); Serial.println(len);
+        n_recv++;
      }
-      n_recv++;
    }
    state = STATE_IDLE;   // need another startReceive()
    return len;
--- a/src/helpers/StationG2Board.h
+++ b/src/helpers/StationG2Board.h
@@ -0,0 +1,69 @@
+#pragma once
+
+#include <Arduino.h>
+
+// LoRa radio module pins for Station G2
+#define  P_LORA_DIO_1   48
+#define  P_LORA_NSS     11
+#define  P_LORA_RESET   21
+#define  P_LORA_BUSY    47
+#define  P_LORA_SCLK    12
+#define  P_LORA_MISO    14
+#define  P_LORA_MOSI    13
+
+// built-ins
+//#define  PIN_LED_BUILTIN 35
+//#define  PIN_VEXT_EN     36
+
+#include "ESP32Board.h"
+
+#include <driver/rtc_io.h>
+
+class StationG2Board : public ESP32Board {
+public:
+  void begin() {
+    ESP32Board::begin();
+
+    esp_reset_reason_t reason = esp_reset_reason();
+    if (reason == ESP_RST_DEEPSLEEP) {
+      long wakeup_source = esp_sleep_get_ext1_wakeup_status();
+      if (wakeup_source & (1 << P_LORA_DIO_1)) {  // received a LoRa packet (while in deep sleep)
+        startup_reason = BD_STARTUP_RX_PACKET;
+      }
+
+      rtc_gpio_hold_dis((gpio_num_t)P_LORA_NSS);
+      rtc_gpio_deinit((gpio_num_t)P_LORA_DIO_1);
+    }
+  }
+
+  void enterDeepSleep(uint32_t secs, int pin_wake_btn = -1) {
+    esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH, ESP_PD_OPTION_ON);
+
+    // Make sure the DIO1 and NSS GPIOs are hold on required levels during deep sleep
+    rtc_gpio_set_direction((gpio_num_t)P_LORA_DIO_1, RTC_GPIO_MODE_INPUT_ONLY);
+    rtc_gpio_pulldown_en((gpio_num_t)P_LORA_DIO_1);
+
+    rtc_gpio_hold_en((gpio_num_t)P_LORA_NSS);
+
+    if (pin_wake_btn < 0) {
+      esp_sleep_enable_ext1_wakeup( (1L << P_LORA_DIO_1), ESP_EXT1_WAKEUP_ANY_HIGH);  // wake up on: recv LoRa packet
+    } else {
+      esp_sleep_enable_ext1_wakeup( (1L << P_LORA_DIO_1) | (1L << pin_wake_btn), ESP_EXT1_WAKEUP_ANY_HIGH);  // wake up on: recv LoRa packet OR wake btn
+    }
+
+    if (secs > 0) {
+      esp_sleep_enable_timer_wakeup(secs * 1000000);
+    }
+
+    // Finally set ESP32 into sleep
+    esp_deep_sleep_start();   // CPU halts here and never returns!
+  }
+
+  uint16_t getBattMilliVolts() override {
+    return 0;
+  }
+
+  const char* getManufacturerName() const override {
+    return "Station G2";
+  }
+};
--- a/src/helpers/nrf52/T1000eBoard.h
+++ b/src/helpers/nrf52/T1000eBoard.h
@@ -31,8 +31,13 @@ public:

  uint16_t getBattMilliVolts() override {
  #ifdef BATTERY_PIN
+    analogReference(AR_INTERNAL_3_0);
    analogReadResolution(12);
    float volts = (analogRead(BATTERY_PIN) * ADC_MULTIPLIER * AREF_VOLTAGE) / 4096;
+
+    analogReference(AR_DEFAULT);  // put back to default
+    analogReadResolution(10);
+
    return volts * 1000;
  #else
    return 0;
--- a/src/helpers/nrf52/T114Board.cpp
+++ b/src/helpers/nrf52/T114Board.cpp
@@ -32,6 +32,11 @@ void T114Board::begin() {
  Wire.begin();
 #endif

+#ifdef P_LORA_TX_LED
+  pinMode(P_LORA_TX_LED, OUTPUT);
+  digitalWrite(P_LORA_TX_LED, HIGH);
+#endif
+
  pinMode(SX126X_POWER_EN, OUTPUT);
  digitalWrite(SX126X_POWER_EN, HIGH);
  delay(10);   // give sx1262 some time to power up
--- a/src/helpers/nrf52/T114Board.h
+++ b/src/helpers/nrf52/T114Board.h
@@ -28,6 +28,15 @@ public:
  void begin();
  uint8_t getStartupReason() const override { return startup_reason; }

+#if defined(P_LORA_TX_LED)
+  void onBeforeTransmit() override {
+    digitalWrite(P_LORA_TX_LED, LOW);   // turn TX LED on
+  }
+  void onAfterTransmit() override {
+    digitalWrite(P_LORA_TX_LED, HIGH);   // turn TX LED off
+  }
+#endif
+
  #define BATTERY_SAMPLES 8

  uint16_t getBattMilliVolts() override {
--- a/variants/t114/variant.cpp
+++ b/variants/t114/variant.cpp
@@ -11,6 +11,4 @@ const uint32_t g_ADigitalPinMap[] = {

 void initVariant()
 {
-  pinMode(LED_BUILTIN, OUTPUT);
-  ledOff(LED_BUILTIN);
 }
Author	SHA1	Message	Date
Scott Powell	658094f654	* ver bump: 1.3.0	2025-03-13 13:46:01 +11:00
Scott Powell	38b9834261	* missing param	2025-03-13 13:32:46 +11:00
Scott Powell	04d85c687f	Merge branch 'main' into dev	2025-03-11 20:09:59 +11:00
ripplebiz	9180e5c65f	Merge pull request #83 from fdlamotte/configure-cpu-frequency-at-build-time-for-esp32 Add an ESP32_CPU_FREQ build flag to lower freq	2025-03-11 20:06:28 +11:00
Florent de Lamotte	4a0f4f4b68	set cpu freq in ESP32Board.h	2025-03-11 09:11:14 +01:00
fdlamotte	d367f7d7bb	Merge branch 'ripplebiz:main' into configure-cpu-frequency-at-build-time-for-esp32	2025-03-11 09:01:45 +01:00
Scott Powell	b94fed4e4e	* companion: channel names	2025-03-11 17:58:12 +11:00
Scott Powell	adf9b24867	* companion: channels now persisted. RESP_CODE_DEVICE_INFO now includes MAX_CONTACTS (div 2) and MAX_GROUP_CHANNELS	2025-03-11 15:31:38 +11:00
Scott Powell	8c68dbb6e9	* Companion: new CMD_GET_CHANNEL, CMD_SET_CHANNEL	2025-03-11 14:50:40 +11:00
Scott Powell	f9b2428dcd	* BLE_NAME_PREFIX refactor	2025-03-11 13:25:48 +11:00
Scott Powell	8d12cfc9af	Merge branch 'main' into dev	2025-03-11 13:20:52 +11:00
Scott Powell	4175be87ab	Merge branch 'main' into dev	2025-03-11 13:19:13 +11:00
ripplebiz	7d572cf4e8	Merge pull request #74 from ddmunhoz/add-bool-meshcore-prefix add: BLE_NAME_PREFIX flag	2025-03-11 13:02:54 +11:00
ripplebiz	877bef5408	Merge pull request #85 from recrof/dev Enabled sx1262 boosted RX gain for all supported radios + platformio.ini: Made quoted -D flags more readable	2025-03-11 12:54:44 +11:00
ripplebiz	6fe5f9bed4	Merge pull request #71 from fdlamotte/t1000e_txpower tx_power can be raised to 22dBm on LR1110	2025-03-11 12:43:26 +11:00
ripplebiz	ce55182752	Merge pull request #88 from LitBomb/patch-4 Update faq.md	2025-03-11 12:40:30 +11:00
uncle lit	648cdf6945	Update faq.md update Canada to use USA frequency add guide to add nodes to map add guide to do OTA firmware update for nRF devices update donation links general text cleanup	2025-03-10 11:52:39 -07:00
Scott Powell	5c72969e2c	* repeater & room server: new CLI config "flood.max"	2025-03-10 23:28:19 +11:00
recrof	20198c9dbf	Merge branch 'dev' of github.com:recrof/MeshCore into dev	2025-03-09 23:07:36 +01:00
recrof	de3f11d16c	- Enabled sx1262 boosted RX gain for all supported radios - Made quoted -D flags more readable	2025-03-09 22:57:31 +01:00
Florent	a706d90598	Add an ESP32_CPU_FREQ build flag to lower freq	2025-03-09 15:49:35 +01:00
ripplebiz	676ba6d066	Merge pull request #81 from recrof/dev roles: t-echo, t114: +room_server; WSL3: +room_server, +repeater	2025-03-10 00:22:33 +11:00
Scott Powell	2cb742b100	ver bump to 1.2.2	2025-03-09 23:46:03 +11:00
Scott Powell	291b98cd56	updating RadioLib to ver 7.1.2	2025-03-09 23:44:34 +11:00
Scott Powell	a259d27cfe	* trying setCRC(1)	2025-03-09 22:15:58 +11:00
Scott Powell	3778c0a8ff	* repeater and room server: MESH_PACKET_LOGGING, now dumps RAW: rx packet contents * Dispatcher: MESH_PACKET_LOGGING, added " hash={packet-hash}"	2025-03-09 20:36:49 +11:00
Rastislav Vysoky	a16393e2d7	Merge branch 'ripplebiz:dev' into dev	2025-03-09 07:16:50 +01:00
Scott Powell	f77a6944f9	* PUSH_CODE_LOG_RX_DATA: is now just: {snr*4},{rssi},{raw-lora-packet}	2025-03-09 17:04:22 +11:00
Scott Powell	8f609524bd	* companion: added new PUSH_CODE_LOG_RX_DATA (0x88) for inspecting all received packets	2025-03-09 15:41:32 +11:00
Scott Powell	c49e6ac37b	Merge branch 'main' into dev # Conflicts: # platformio.ini	2025-03-09 14:56:39 +11:00
ripplebiz	6771b0e837	Merge pull request #78 from awolden/awolden/enable-SSD13060-lilygo-tlora Enable SSD1306 display class for LilyGo_TLora_V2_1_1_6	2025-03-09 14:43:54 +11:00
Scott Powell	9b5a294695	* T1000e battery measure fix	2025-03-08 20:18:15 +11:00
Rastislav Vysoky	9844296643	Merge branch 'ripplebiz:dev' into dev	2025-03-08 10:05:27 +01:00
Scott Powell	5acfe52417	* new build option: SX126X_RX_BOOSTED_GAIN	2025-03-08 19:59:07 +11:00
Scott Powell	2889867c4c	* Dispatcher: added guard for packet payload size too large	2025-03-08 19:38:36 +11:00
Rastislav Vysoky	b1a5badf98	added room server roles to t114 and t-echo; added repeater and room server roles to WSL3; unified json intendations in /boards	2025-03-08 09:15:51 +01:00
ripplebiz	115deda8e8	Merge pull request #70 from recrof/dev added new board: Station G2; fix: added t114 and t-echo boards to uf2conv release workflow	2025-03-08 15:10:49 +11:00
Scott Powell	87d4285cf1	* doc updates	2025-03-08 13:40:39 +11:00
Alex Wolden	37652459a1	Enable SSD1306 display class for LilyGo_TLora_V2_1_1_6	2025-03-07 14:30:11 -08:00
Diego Munhoz	a5fb3acc9b	add: BLE_NAME_PREFIX flag	2025-03-07 11:41:53 -06:00
Rastislav Vysoky	acac20dc89	Added basic support for Station G2	2025-03-07 15:34:00 +01:00
Florent de Lamotte	708065a0ba	tx_power can be raised to 22dBm on LR1110	2025-03-07 13:52:47 +01:00
Rastislav Vysoky	ae7bf7eae2	Merge branch 'ripplebiz:dev' into dev	2025-03-07 13:42:56 +01:00
Rastislav Vysoky	477f2e1d81	fix: added t114 and t-echo boards to uf2conv release workflow	2025-03-07 13:17:46 +01:00
Scott Powell	808d3933c1	Version bump to v1.2.1	2025-03-07 22:01:30 +11:00
Scott Powell	ae8fb5d9b1	* Heltec v3.2 VEXT fix * Heltec T114 LED fix, (now flashes with LoRa TX)	2025-03-07 21:37:05 +11:00