Merge pull request #2903 from liamcottle/ci/build-matrix

Refactor builds via GitHub Actions to be super fast

.github/actions/setup-build-environment/action.yml

@@ -25,5 +25,14 @@ runs:
     - name: Extract Version from Git Tag
       shell: bash
       run: |
-        GIT_TAG_NAME="${GITHUB_REF#refs/tags/}"
-        echo "GIT_TAG_VERSION=${GIT_TAG_NAME##*-}" >> $GITHUB_ENV
+        if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
+          # triggered by a tag push (e.g: refs/tags/companion-v1.2.3)
+          GIT_TAG_NAME="${GITHUB_REF#refs/tags/}"
+          VERSION_STRING="${GIT_TAG_NAME##*-}"
+        else
+          # triggered by a workflow dispatch (e.g: refs/heads/main)
+          # strip "refs/heads/" prefix and replace any remaining "/" with "-" to protect file paths
+          BRANCH_NAME="${GITHUB_REF#refs/heads/}"
+          VERSION_STRING=$(echo "$BRANCH_NAME" | tr '/' '-')
+        fi
+        echo "GIT_TAG_VERSION=${VERSION_STRING}" >> $GITHUB_ENV

.github/workflows/build-companion-firmwares.yml

@@ -10,33 +10,8 @@ on:
       - 'companion-*'
 
 jobs:
-
-  build:
-    runs-on: ubuntu-latest
-    steps:
-
-      - name: Clone Repo
-        uses: actions/checkout@v6
-
-      - name: Setup Build Environment
-        uses: ./.github/actions/setup-build-environment
-
-      - name: Build Firmwares
-        env:
-          FIRMWARE_VERSION: ${{ env.GIT_TAG_VERSION }}
-        run: /usr/bin/env bash build.sh build-companion-firmwares
-
-      - name: Upload Workflow Artifacts
-        uses: actions/upload-artifact@v7
-        with:
-          name: companion-firmwares
-          path: out
-
-      - name: Create Release
-        uses: softprops/action-gh-release@v3
-        if: startsWith(github.ref, 'refs/tags/')
-        with:
-          name: Companion Firmware ${{ env.GIT_TAG_VERSION }}
-          body: ""
-          draft: true
-          files: out/*
+  build-companion-firmwares:
+    uses: ./.github/workflows/firmware-builder.yml
+    with:
+      firmware_type: 'companion'
+      release_title_prefix: 'Companion Firmware'

.github/workflows/build-repeater-firmwares.yml

@@ -10,33 +10,8 @@ on:
       - 'repeater-*'
 
 jobs:
-
-  build:
-    runs-on: ubuntu-latest
-    steps:
-
-      - name: Clone Repo
-        uses: actions/checkout@v6
-
-      - name: Setup Build Environment
-        uses: ./.github/actions/setup-build-environment
-
-      - name: Build Firmwares
-        env:
-          FIRMWARE_VERSION: ${{ env.GIT_TAG_VERSION }}
-        run: /usr/bin/env bash build.sh build-repeater-firmwares
-
-      - name: Upload Workflow Artifacts
-        uses: actions/upload-artifact@v7
-        with:
-          name: repeater-firmwares
-          path: out
-
-      - name: Create Release
-        uses: softprops/action-gh-release@v3
-        if: startsWith(github.ref, 'refs/tags/')
-        with:
-          name: Repeater Firmware ${{ env.GIT_TAG_VERSION }}
-          body: ""
-          draft: true
-          files: out/*
+  build-repeater-firmwares:
+    uses: ./.github/workflows/firmware-builder.yml
+    with:
+      firmware_type: 'repeater'
+      release_title_prefix: 'Repeater Firmware'

.github/workflows/build-room-server-firmwares.yml

@@ -10,33 +10,8 @@ on:
       - 'room-server-*'
 
 jobs:
-
-  build:
-    runs-on: ubuntu-latest
-    steps:
-
-      - name: Clone Repo
-        uses: actions/checkout@v6
-
-      - name: Setup Build Environment
-        uses: ./.github/actions/setup-build-environment
-
-      - name: Build Firmwares
-        env:
-          FIRMWARE_VERSION: ${{ env.GIT_TAG_VERSION }}
-        run: /usr/bin/env bash build.sh build-room-server-firmwares
-
-      - name: Upload Workflow Artifacts
-        uses: actions/upload-artifact@v7
-        with:
-          name: room-server-firmwares
-          path: out
-
-      - name: Create Release
-        uses: softprops/action-gh-release@v3
-        if: startsWith(github.ref, 'refs/tags/')
-        with:
-          name: Room Server Firmware ${{ env.GIT_TAG_VERSION }}
-          body: ""
-          draft: true
-          files: out/*
+  build-room-server-firmwares:
+    uses: ./.github/workflows/firmware-builder.yml
+    with:
+      firmware_type: 'room-server'
+      release_title_prefix: 'Room Server Firmware'

.github/workflows/firmware-builder.yml

@@ -0,0 +1,90 @@
+name: Firmware Builder
+
+on:
+  workflow_call:
+    inputs:
+      firmware_type:
+        required: true
+        type: string
+      release_title_prefix:
+        required: true
+        type: string
+
+jobs:
+
+  generate-build-matrix:
+    runs-on: ubuntu-latest
+    outputs:
+      targets: ${{ steps.get-build-targets.outputs.targets }}
+    steps:
+
+      - name: Clone Repo
+        uses: actions/checkout@v6
+
+      - name: Setup Build Environment
+        uses: ./.github/actions/setup-build-environment
+
+      - name: Get Build Targets
+        id: get-build-targets
+        run: |
+          # get list of firmwares to build
+          TARGET_LIST=$(/usr/bin/env bash build.sh get-${{ inputs.firmware_type }}-firmwares-to-build)
+          
+          # convert targets separated by new line into a json array string
+          JSON_ARRAY=$(echo "$TARGET_LIST" | jq -R -s -c 'split("\n") | map(select(length > 0))')
+          
+          # use json array as targets result
+          echo "targets=$JSON_ARRAY" >> $GITHUB_OUTPUT
+
+  build:
+    needs: generate-build-matrix
+    runs-on: ubuntu-latest
+    continue-on-error: true # don't fail entire build if one board fails to build
+    strategy:
+      matrix:
+        target: ${{ fromJson(needs.generate-build-matrix.outputs.targets) }}
+      fail-fast: false # don't cancel other builds if one board fails to build
+    steps:
+
+      - name: Clone Repo
+        uses: actions/checkout@v6
+
+      - name: Setup Build Environment
+        uses: ./.github/actions/setup-build-environment
+
+      - name: Build Firmware
+        env:
+          FIRMWARE_VERSION: ${{ env.GIT_TAG_VERSION }}
+        run: /usr/bin/env bash build.sh build-firmware ${{ matrix.target }}
+
+      - name: Upload Workflow Artifacts
+        uses: actions/upload-artifact@v7
+        with:
+          name: "${{ matrix.target }}"
+          path: out
+
+  create-release:
+    needs: build
+    runs-on: ubuntu-latest
+    if: startsWith(github.ref, 'refs/tags/') # only create release for tagged builds
+    steps:
+
+      - name: Clone Repo
+        uses: actions/checkout@v6
+
+      - name: Setup Build Environment
+        uses: ./.github/actions/setup-build-environment
+
+      - name: Download All Artifacts
+        uses: actions/download-artifact@v8
+        with:
+          merge-multiple: true
+          path: out
+
+      - name: Create Release
+        uses: softprops/action-gh-release@v3
+        with:
+          name: "${{ inputs.release_title_prefix }} ${{ env.GIT_TAG_VERSION }}"
+          body: ""
+          draft: true
+          files: out/*

.github/workflows/stale-bot.yml

@@ -0,0 +1,32 @@
+name: 'Run Stale Bot'
+on:
+  schedule:
+    - cron: '30 1 * * *' # daily at 1:30am
+  workflow_dispatch: {}
+
+permissions:
+  actions: write
+  issues: write
+  pull-requests: write
+
+jobs:
+  close-issues:
+    # only run on main repo, not forks
+    if: github.repository == 'meshcore-dev/MeshCore'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Close Stale Issues
+        uses: actions/stale@v10
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          # auto close issues
+          days-before-issue-stale: 60
+          days-before-issue-close: 7
+          exempt-issue-labels: "keep-open"
+          stale-issue-label: "stale"
+          stale-issue-message: "This issue is stale because it has been open for 60 days with no activity. Remove the stale label or add a comment if this issue is still relevant, otherwise this issue will automatically close in 7 days."
+          close-issue-message: "This issue was closed because it has been inactive for 7 days since being marked as stale."
+          # don't auto close prs
+          days-before-pr-stale: -1
+          days-before-pr-close: -1
+          

.vscode/extensions.json

@@ -0,0 +1,9 @@
+{
+    "recommendations": [
+        "pioarduino.pioarduino-ide",
+        "platformio.platformio-ide"
+    ],
+    "unwantedRecommendations": [
+        "ms-vscode.cpptools-extension-pack"
+    ]
+}

SECURITY.md

@@ -0,0 +1,57 @@
+# Security Policy
+
+## Supported Versions
+
+Security fixes are applied to the latest release only. We do not backport
+fixes to older versions.
+
+| Version | Supported |
+|---------|-----------|
+| 1.15+ | ✅ |
+| <1.15 | ❌ |
+
+## Reporting a Vulnerability
+
+**Please do not report security vulnerabilities through public GitHub issues.**
+
+Use GitHub's private vulnerability reporting instead:
+1. Go to the **Security** tab of this repository
+2. Click **Report a vulnerability**
+3. Fill in the details and submit
+
+### What to include
+
+A useful report tells us:
+- Which component or file is affected
+- What an attacker can do (impact) and under what conditions
+- A minimal reproduction case or proof-of-concept if you have one
+- Whether you believe it is remotely exploitable
+
+You do not need a working exploit to report. An incomplete report is better
+than no report.
+
+## What to expect
+
+This is a volunteer-maintained open-source project. We will do our best to
+respond in a reasonable timeframe, but cannot commit to specific deadlines.
+
+We ask that you give us a fair opportunity to investigate and address the
+issue before any public disclosure. If you have not heard back after
+**90 days**, feel free to follow up or proceed with disclosure at your
+discretion.
+
+## Scope
+
+In scope:
+- Remote code execution, memory corruption, or denial-of-service via crafted
+  radio packets
+- Authentication or encryption bypasses
+- Vulnerabilities in the packet routing or path handling logic
+
+Out of scope:
+- Physical access attacks (e.g., JTAG, UART extraction of keys)
+- Regulatory compliance (duty cycle, frequency restrictions)
+- Jamming or other physical-layer radio interference
+- Issues in third-party libraries (RadioLib, Crypto, etc.) — report those
+  upstream
+- "Best practice" suggestions without a demonstrated attack path

boards/heltec_tower_v2.json

@@ -1,61 +0,0 @@
-{
-  "build": {
-    "arduino": {
-      "ldscript": "nrf52840_s140_v6.ld"
-    },
-    "core": "nRF5",
-    "cpu": "cortex-m4",
-    "extra_flags": "-DNRF52840_XXAA",
-    "f_cpu": "64000000L",
-    "hwids": [
-      ["0x239A","0x4405"],
-      ["0x239A","0x0029"],
-      ["0x239A","0x002A"],
-      ["0x239A","0x0071"]
-    ],
-    "usb_product": "HT-n5262",
-    "mcu": "nrf52840",
-    "variant": "heltec_tower_v2",
-    "bsp": {
-      "name": "adafruit"
-    },
-    "softdevice": {
-      "sd_flags": "-DS140",
-      "sd_name": "s140",
-      "sd_version": "6.1.1",
-      "sd_fwid": "0x00B6"
-    },
-    "bootloader": {
-      "settings_addr": "0xFF000"
-    }
-  },
-  "connectivity": [
-    "bluetooth"
-  ],
-  "debug": {
-    "jlink_device": "nRF52840_xxAA",
-    "svd_path": "nrf52840.svd",
-    "openocd_target": "nrf52.cfg"
-  },
-  "frameworks": [
-    "arduino"
-  ],
-  "name": "Heltec Tower V2 Board",
-  "upload": {
-    "maximum_ram_size": 235520,
-    "maximum_size": 815104,
-    "speed": 115200,
-    "protocol": "nrfutil",
-    "protocols": [
-      "jlink",
-      "nrfjprog",
-      "nrfutil",
-      "stlink"
-    ],
-    "use_1200bps_touch": true,
-    "require_upload_port": true,
-    "wait_for_upload_port": true
-  },
-  "url": "https://heltec.org/",
-  "vendor": "Heltec"
-}

build.sh

@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+# exit when any command fails
+set -e
+
 global_usage() {
   cat - <<EOF
 Usage:
@@ -275,4 +278,11 @@ elif [[ $1 == "build-repeater-firmwares" ]]; then
   build_repeater_firmwares
 elif [[ $1 == "build-room-server-firmwares" ]]; then
   build_room_server_firmwares
+elif [[ $1 == "get-companion-firmwares-to-build" ]]; then
+  get_pio_envs_ending_with_string "_companion_radio_usb"
+  get_pio_envs_ending_with_string "_companion_radio_ble"
+elif [[ $1 == "get-repeater-firmwares-to-build" ]]; then
+  get_pio_envs_ending_with_string "_repeater"
+elif [[ $1 == "get-room-server-firmwares-to-build" ]]; then
+  get_pio_envs_ending_with_string "_room_server"
 fi

default.nix

@@ -1,12 +1,11 @@
-{pkgs ? import <nixpkgs> {}}: let
+{ pkgs ? import <nixpkgs> {} }:
+let
 in
   pkgs.mkShell {
     buildInputs = [
       pkgs.platformio
       pkgs.python3
-      pkgs.gcc
-      pkgs.gtest
       # optional: needed as a programmer i.e. for esp32
       pkgs.avrdude
     ];
-  }
+}

docs/cli_commands.md

@@ -28,12 +28,25 @@ This document provides an overview of CLI commands that can be sent to MeshCore
 **Usage:** 
 - `reboot`
 
+**Note:** No reply is sent.
+
+---
+
+### Power-off the node
+**Usage:**
+- `poweroff`, or
+- `shutdown`
+
+**Note:** No reply is sent.
+
 ---
 
 ### Reset the clock and reboot
 **Usage:**
 - `clkreboot`
 
+**Note:** No reply is sent.
+
 ---
 
 ### Sync the clock with the remote device
@@ -263,20 +276,6 @@ This document provides an overview of CLI commands that can be sent to MeshCore
 
 ---
 
-#### View or change the LoRa FEM receive-path gain state on supported boards
-**Usage:**
-- `get radio.fem.rxgain`
-- `set radio.fem.rxgain <state>`
-
-**Parameters:**
-- `state`: `on`|`off`
-
-**Notes:**
-- This controls the external LoRa FEM receive-path LNA where the board supports it.
-- This is separate from `radio.rxgain`, which controls the radio chip receive gain mode.
-
----
-
 ### System
 
 #### View or change this node's name
@@ -578,20 +577,6 @@ This document provides an overview of CLI commands that can be sent to MeshCore
 
 ---
 
-#### Enable or disable hardware Channel Activity Detection (CAD)
-**Usage:**
-- `get cad`
-- `set cad <on|off>`
-
-**Description:** When enabled, the radio performs a hardware Channel Activity Detection scan before transmitting and defers if the channel is busy. Runs independently of `int.thresh` — either, both, or none may be active.
-
-**Parameters:**
-- `on|off`: Enable or disable hardware CAD
-
-**Default:** `off`
-
----
-
 #### View or change the AGC Reset Interval
 **Usage:**
 - `get agc.reset.interval`
@@ -660,10 +645,21 @@ This document provides an overview of CLI commands that can be sent to MeshCore
 **Parameters:**
 - `value`: Maximum flood hop count (0-64) for a packet without a scope (no region set)
 
-**Default:** `0xFF` - indicates it hasn't been set, will track flood.max until it is.
+**Default:** `64` - (`0xFF` indicates it hasn't been set, will track flood.max until it is.)
 
 **Note:** An alternative to `region denyf *`, setting `flood.max.unscoped` to a lower value such as `3` would allow for local unscoped messages to propagate, while preventing noisy neighbors from flooding a local region.
 
+---
+
+#### Limit the number of hops for an advert flood message
+**Usage:**
+- `get flood.max.advert`
+- `set flood.max.advert <value>`
+
+**Parameters:**
+- `value`: Maximum flood hop count (0-64) for an advert packet
+
+**Default:** `8`
 
 ---
 

docs/number_allocations.md

@@ -17,7 +17,6 @@ Once you have a working app/project, you need to be able to demonstrate it exist
 | 0000 - 00FF     | -reserved for internal use- |                                                                   |
 | 0100            | MeshCore Open               | zsylvester@monitormx.com — https://github.com/zjs81/meshcore-open |
 | 0110 - 011F     | Ripple                      | ripple_biz@protonmail.com — https://buymeacoffee.com/ripplebiz    |
-| 0120            | MCO Advanced                | most.original.address@gmail.com — https://hdden.ru/MCOa/          |
 | FF00 - FFFF     | -reserved for testing/dev-  |                                                                   |
 
 (add rows, inside the range 0100 - FEFF for custom apps)

docs/qr_codes.md

@@ -12,8 +12,10 @@ meshcore://channel/add?name=Public&secret=8b3387e9c5cdea6ac9e5edbaa115cd72
 
 **Parameters**:
 
-- `name`: Channel name (URL-encoded if needed)
+- `name`: Channel name (URL-encoded)
 - `secret`: 16-byte secret represented as 32 hex characters
+- `region_scope`: Region Scope (optional, URL-encoded if provided)
+    - Supported by MeshCore App v1.47.0+
 
 ## Add Contact
 

examples/companion_radio/DataStore.cpp

@@ -545,7 +545,7 @@ bool DataStore::putBlobByKey(const uint8_t key[], int key_len, const uint8_t src
     uint32_t pos = 0, found_pos = 0;
     uint32_t min_timestamp = 0xFFFFFFFF;
 
-    // search for matching key OR evict by oldest timestamp
+    // search for matching key OR evict by oldest timestmap
     BlobRec tmp;
     file.seek(0);
     while (file.read((uint8_t *) &tmp, sizeof(tmp)) == sizeof(tmp)) {

examples/companion_radio/MyMesh.cpp

@@ -261,9 +261,6 @@ float MyMesh::getAirtimeBudgetFactor() const {
 int MyMesh::getInterferenceThreshold() const {
   return 0; // disabled for now, until currentRSSI() problem is resolved
 }
-bool MyMesh::getCADEnabled() const {
-  return true; // hardware CAD before TX (no CLI toggle on companion; enabled by default)
-}
 
 int MyMesh::calcRxDelay(float score, uint32_t air_time) const {
   if (_prefs.rx_delay_base <= 0.0f) return 0;
@@ -857,7 +854,7 @@ void MyMesh::onSendTimeout() {}
 
 MyMesh::MyMesh(mesh::Radio &radio, mesh::RNG &rng, mesh::RTCClock &rtc, SimpleMeshTables &tables, DataStore& store, AbstractUITask* ui)
     : BaseChatMesh(radio, *new ArduinoMillis(), rng, rtc, *new StaticPoolPacketManager(16), tables),
-      _serial(NULL), telemetry(MAX_PACKET_PAYLOAD - 4), _store(&store), _ui(ui), _iter(0) {
+      _serial(NULL), telemetry(MAX_PACKET_PAYLOAD - 4), _store(&store), _ui(ui) {
   _iter_started = false;
   _cli_rescue = false;
   offline_queue_len = 0;
@@ -1545,7 +1542,6 @@ void MyMesh::handleCmdFrame(size_t len) {
       memcpy(anon.id.pub_key, pub_key, PUB_KEY_SIZE);
       anon.out_path_len = 0;   // default to zero-hop direct
       anon.type = ADV_TYPE_NONE;  // unknown
-      anon.lastmod = getRTCClock()->getCurrentTime();
 
       if (addContact(anon)) recipient = &anon;
     }
@@ -1985,7 +1981,6 @@ void MyMesh::handleCmdFrame(size_t len) {
         sendPacket(pkt, priority, 0);
         writeOKFrame();
       } else {
-        releasePacket(pkt);
         writeErrFrame(ERR_CODE_ILLEGAL_ARG);
       }
     } else {
@@ -2191,7 +2186,15 @@ void MyMesh::checkSerialInterface() {
              && !_serial->isWriteBusy() // don't spam the Serial Interface too quickly!
   ) {
     ContactInfo contact;
-    if (_iter.hasNext(this, contact)) {
+    bool found = false;
+    while (_iter.hasNext(this, contact)) {
+      if (contact.type != ADV_TYPE_NONE) {
+        found = true;
+        break;
+      }
+    }
+
+    if (found) {
       if (contact.lastmod > _iter_filter_since) { // apply the 'since' filter
         writeContactRespFrame(RESP_CODE_CONTACT, contact);
         if (contact.lastmod > _most_recent_lastmod) {

examples/companion_radio/MyMesh.h

@@ -105,7 +105,6 @@ public:
 protected:
   float getAirtimeBudgetFactor() const override;
   int getInterferenceThreshold() const override;
-  bool getCADEnabled() const override;
   int calcRxDelay(float score, uint32_t air_time) const override;
   uint32_t getRetransmitDelay(const mesh::Packet *packet) override;
   uint32_t getDirectRetransmitDelay(const mesh::Packet *packet) override;

examples/simple_repeater/MyMesh.cpp

@@ -549,7 +549,8 @@ uint32_t MyMesh::getDirectRetransmitDelay(const mesh::Packet *packet) {
   return getRNG()->nextInt(0, 5*t + 1);
 }
 
-mesh::DispatcherAction MyMesh::onRecvPacket(mesh::Packet* pkt) {
+bool MyMesh::filterRecvFloodPacket(mesh::Packet* pkt) {
+  // just try to determine region for packet (apply later in allowPacketForward())
   if (pkt->getRouteType() == ROUTE_TYPE_TRANSPORT_FLOOD) {
     recv_pkt_region = region_map.findMatch(pkt, REGION_DENY_FLOOD);
   } else if (pkt->getRouteType() == ROUTE_TYPE_FLOOD) {
@@ -561,7 +562,8 @@ mesh::DispatcherAction MyMesh::onRecvPacket(mesh::Packet* pkt) {
   } else {
     recv_pkt_region = NULL;
   }
-  return Mesh::onRecvPacket(pkt);
+  // do normal processing
+  return false;
 }
 
 void MyMesh::onAnonDataRecv(mesh::Packet *packet, const uint8_t *secret, const mesh::Identity &sender,
@@ -865,7 +867,6 @@ MyMesh::MyMesh(mesh::MainBoard &board, mesh::Radio &radio, mesh::MillisecondCloc
   set_radio_at = revert_radio_at = 0;
   _logging = false;
   region_load_active = false;
-  recv_pkt_region = NULL;
 
 #if MAX_NEIGHBOURS
   memset(neighbours, 0, sizeof(neighbours));
@@ -892,7 +893,6 @@ MyMesh::MyMesh(mesh::MainBoard &board, mesh::Radio &radio, mesh::MillisecondCloc
   _prefs.flood_max_unscoped = 64;
   _prefs.flood_max_advert = 8;
   _prefs.interference_threshold = 0; // disabled
-  _prefs.cad_enabled = 0;            // hardware CAD before TX (off by default; 'set cad on')
 
   // bridge defaults
   _prefs.bridge_enabled = 1;    // enabled
@@ -917,7 +917,6 @@ MyMesh::MyMesh(mesh::MainBoard &board, mesh::Radio &radio, mesh::MillisecondCloc
   _prefs.rx_boosted_gain = 1; // enabled by default;
 #endif
 #endif
-  _prefs.radio_fem_rxgain = 1;
 
   pending_discover_tag = 0;
   pending_discover_until = 0;
@@ -966,7 +965,6 @@ void MyMesh::begin(FILESYSTEM *fs) {
   radio_driver.setRxBoostedGainMode(_prefs.rx_boosted_gain);
   MESH_DEBUG_PRINTLN("RX Boosted Gain Mode: %s",
                      radio_driver.getRxBoostedGainMode() ? "Enabled" : "Disabled");
-  board.setLoRaFemLnaEnabled(_prefs.radio_fem_rxgain);
 
   updateAdvertTimer();
   updateFloodAdvertTimer();
@@ -1061,9 +1059,11 @@ void MyMesh::setTxPower(int8_t power_dbm) {
   radio_driver.setTxPower(power_dbm);
 }
 
-bool MyMesh::setRxBoostedGain(bool enable) {
-  return radio_driver.setRxBoostedGainMode(enable);
+#if defined(USE_SX1262) || defined(USE_SX1268)
+void MyMesh::setRxBoostedGain(bool enable) {
+  radio_driver.setRxBoostedGainMode(enable);
 }
+#endif
 
 void MyMesh::formatNeighborsReply(char *reply) {
   char *dp = reply;

examples/simple_repeater/MyMesh.h

@@ -150,9 +150,6 @@ protected:
   int getInterferenceThreshold() const override {
     return _prefs.interference_threshold;
   }
-  bool getCADEnabled() const override {
-    return _prefs.cad_enabled;
-  }
   int getAGCResetInterval() const override {
     return ((int)_prefs.agc_reset_interval) * 4000;   // milliseconds
   }
@@ -166,7 +163,7 @@ protected:
   }
 #endif
 
-  mesh::DispatcherAction onRecvPacket(mesh::Packet* pkt) override;
+  bool filterRecvFloodPacket(mesh::Packet* pkt) override;
 
   void onAnonDataRecv(mesh::Packet* packet, const uint8_t* secret, const mesh::Identity& sender, uint8_t* data, size_t len) override;
   int searchPeersByHash(const uint8_t* hash) override;
@@ -252,6 +249,7 @@ public:
   // To check if there is pending work
   bool hasPendingWork() const;
 
-  bool setRxBoostedGain(bool enable) override;
-
+#if defined(USE_SX1262) || defined(USE_SX1268)
+  void setRxBoostedGain(bool enable) override;
+#endif
 };

examples/simple_repeater/UITask.cpp

@@ -41,8 +41,7 @@ void UITask::begin(NodePrefs* node_prefs, const char* build_date, const char* fi
   }
 
   // v1.2.3 (1 Jan 2025)
-  snprintf(_version_info, sizeof(_version_info), "%s (%s)", version, build_date);
-  free(version);
+  sprintf(_version_info, "%s (%s)", version, build_date);
 }
 
 void UITask::renderCurrScreen() {

examples/simple_room_server/MyMesh.cpp

@@ -290,7 +290,8 @@ bool MyMesh::allowPacketForward(const mesh::Packet *packet) {
   return true;
 }
 
-mesh::DispatcherAction MyMesh::onRecvPacket(mesh::Packet* pkt) {
+bool MyMesh::filterRecvFloodPacket(mesh::Packet* pkt) {
+  // just try to determine region for packet (apply later in allowPacketForward())
   if (pkt->getRouteType() == ROUTE_TYPE_TRANSPORT_FLOOD) {
     recv_pkt_region = region_map.findMatch(pkt, REGION_DENY_FLOOD);
   } else if (pkt->getRouteType() == ROUTE_TYPE_FLOOD) {
@@ -302,7 +303,8 @@ mesh::DispatcherAction MyMesh::onRecvPacket(mesh::Packet* pkt) {
   } else {
     recv_pkt_region = NULL;
   }
-  return Mesh::onRecvPacket(pkt);
+  // do normal processing
+  return false;
 }
 
 void MyMesh::onAnonDataRecv(mesh::Packet *packet, const uint8_t *secret, const mesh::Identity &sender,
@@ -625,7 +627,6 @@ MyMesh::MyMesh(mesh::MainBoard &board, mesh::Radio &radio, mesh::MillisecondCloc
   _logging = false;
   region_load_active = false;
   set_radio_at = revert_radio_at = 0;
-  recv_pkt_region = NULL;
 
   // defaults
   memset(&_prefs, 0, sizeof(_prefs));
@@ -649,7 +650,6 @@ MyMesh::MyMesh(mesh::MainBoard &board, mesh::Radio &radio, mesh::MillisecondCloc
   _prefs.flood_max_unscoped = 64;
   _prefs.flood_max_advert = 8;
   _prefs.interference_threshold = 0; // disabled
-  _prefs.cad_enabled = 0;            // hardware CAD before TX (off by default; 'set cad on')
 #ifdef ROOM_PASSWORD
   StrHelper::strncpy(_prefs.guest_password, ROOM_PASSWORD, sizeof(_prefs.guest_password));
 #endif
@@ -658,7 +658,6 @@ MyMesh::MyMesh(mesh::MainBoard &board, mesh::Radio &radio, mesh::MillisecondCloc
   _prefs.gps_enabled = 0;
   _prefs.gps_interval = 0;
   _prefs.advert_loc_policy = ADVERT_LOC_PREFS;
-  _prefs.radio_fem_rxgain = 1;
 
   next_post_idx = 0;
   next_client_idx = 0;
@@ -700,7 +699,6 @@ void MyMesh::begin(FILESYSTEM *fs) {
 
   radio_driver.setParams(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
   radio_driver.setTxPower(_prefs.tx_power_dbm);
-  board.setLoRaFemLnaEnabled(_prefs.radio_fem_rxgain);
 
   updateAdvertTimer();
   updateFloodAdvertTimer();

examples/simple_room_server/MyMesh.h

@@ -144,9 +144,6 @@ protected:
   int getInterferenceThreshold() const override {
     return _prefs.interference_threshold;
   }
-  bool getCADEnabled() const override {
-    return _prefs.cad_enabled;
-  }
   int getAGCResetInterval() const override {
     return ((int)_prefs.agc_reset_interval) * 4000;   // milliseconds
   }
@@ -154,7 +151,7 @@ protected:
     return _prefs.multi_acks;
   }
 
-  mesh::DispatcherAction onRecvPacket(mesh::Packet* pkt) override;
+  bool filterRecvFloodPacket(mesh::Packet* pkt) override;
 
   bool allowPacketForward(const mesh::Packet* packet) override;
   void onAnonDataRecv(mesh::Packet* packet, const uint8_t* secret, const mesh::Identity& sender, uint8_t* data, size_t len) override;

examples/simple_room_server/UITask.cpp

@@ -41,8 +41,7 @@ void UITask::begin(NodePrefs* node_prefs, const char* build_date, const char* fi
   }
 
   // v1.2.3 (1 Jan 2025)
-  snprintf(_version_info, sizeof(_version_info), "%s (%s)", version, build_date);
-  free(version);
+  sprintf(_version_info, "%s (%s)", version, build_date);
 }
 
 void UITask::renderCurrScreen() {

examples/simple_secure_chat/main.cpp

@@ -135,7 +135,7 @@ class MyMesh : public BaseChatMesh, ContactVisitor {
     File file = _fs->open("/contacts", "w", true);
 #endif
     if (file) {
-      ContactsIterator iter = startContactsIterator();
+      ContactsIterator iter;
       ContactInfo c;
       uint8_t unused = 0;
       uint32_t reserved = 0;

examples/simple_sensor/SensorMesh.cpp

@@ -323,9 +323,6 @@ uint32_t SensorMesh::getDirectRetransmitDelay(const mesh::Packet* packet) {
 int SensorMesh::getInterferenceThreshold() const {
   return _prefs.interference_threshold;
 }
-bool SensorMesh::getCADEnabled() const {
-  return _prefs.cad_enabled;
-}
 int SensorMesh::getAGCResetInterval() const {
   return ((int)_prefs.agc_reset_interval) * 4000;   // milliseconds
 }
@@ -729,13 +726,11 @@ SensorMesh::SensorMesh(mesh::MainBoard& board, mesh::Radio& radio, mesh::Millise
   _prefs.disable_fwd = true;
   _prefs.flood_max = 64;
   _prefs.interference_threshold = 0;  // disabled
-  _prefs.cad_enabled = 0;             // hardware CAD before TX (off by default; 'set cad on')
 
   // GPS defaults
   _prefs.gps_enabled = 0;
   _prefs.gps_interval = 0;
   _prefs.advert_loc_policy = ADVERT_LOC_PREFS;
-  _prefs.radio_fem_rxgain = 1;
 
   memset(default_scope.key, 0, sizeof(default_scope.key));
 }
@@ -771,7 +766,6 @@ void SensorMesh::begin(FILESYSTEM* fs) {
 
   radio_driver.setParams(_prefs.freq, _prefs.bw, _prefs.sf, _prefs.cr);
   radio_driver.setTxPower(_prefs.tx_power_dbm);
-  board.setLoRaFemLnaEnabled(_prefs.radio_fem_rxgain);
 
   updateAdvertTimer();
   updateFloodAdvertTimer();

examples/simple_sensor/SensorMesh.h

@@ -120,7 +120,6 @@ protected:
   uint32_t getRetransmitDelay(const mesh::Packet* packet) override;
   uint32_t getDirectRetransmitDelay(const mesh::Packet* packet) override;
   int getInterferenceThreshold() const override;
-  bool getCADEnabled() const override;
   int getAGCResetInterval() const override;
   void onAnonDataRecv(mesh::Packet* packet, const uint8_t* secret, const mesh::Identity& sender, uint8_t* data, size_t len) override;
   int searchPeersByHash(const uint8_t* hash) override;

examples/simple_sensor/UITask.cpp

@@ -41,8 +41,7 @@ void UITask::begin(NodePrefs* node_prefs, const char* build_date, const char* fi
   }
 
   // v1.2.3 (1 Jan 2025)
-  snprintf(_version_info, sizeof(_version_info), "%s (%s)", version, build_date);
-  free(version);
+  sprintf(_version_info, "%s (%s)", version, build_date);
 }
 
 void UITask::renderCurrScreen() {

platformio.ini

@@ -157,7 +157,6 @@ lib_deps =
 
 [env:native]
 platform = native
-test_framework = googletest
 build_flags = -std=c++17
   -I src
   -I test/mocks
@@ -165,6 +164,5 @@ test_build_src = yes
 build_src_filter =
   -<*>
   +<../src/Utils.cpp>
-  +<../src/Packet.cpp>
 lib_deps =
   google/googletest @ 1.17.0

src/Dispatcher.cpp

@@ -66,7 +66,6 @@ uint32_t Dispatcher::getCADFailMaxDuration() const {
 void Dispatcher::loop() {
   if (millisHasNowPassed(next_floor_calib_time)) {
     _radio->triggerNoiseFloorCalibrate(getInterferenceThreshold());
-    _radio->setCADEnabled(getCADEnabled());
     next_floor_calib_time = futureMillis(NOISE_FLOOR_CALIB_INTERVAL);
   }
   _radio->loop();

src/Dispatcher.h

@@ -65,8 +65,6 @@ public:
 
   virtual void triggerNoiseFloorCalibrate(int threshold) { }
 
-  virtual void setCADEnabled(bool enable) { }
-
   virtual void resetAGC() { }
 
   virtual bool isInRecvMode() const = 0;
@@ -168,7 +166,6 @@ protected:
   virtual uint32_t getCADFailRetryDelay() const;
   virtual uint32_t getCADFailMaxDuration() const;
   virtual int getInterferenceThreshold() const { return 0; }    // disabled by default
-  virtual bool getCADEnabled() const { return false; }    // hardware CAD disabled by default
   virtual int getAGCResetInterval() const { return 0; }    // disabled by default
   virtual unsigned long getDutyCycleWindowMs() const { return 3600000; }
 

src/Mesh.cpp

@@ -55,8 +55,7 @@ DispatcherAction Mesh::onRecvPacket(Packet* pkt) {
       uint16_t offset = (uint16_t)pkt->path_len << path_sz;
       if (offset >= len) {   // TRACE has reached end of given path
         onTraceRecv(pkt, trace_tag, auth_code, flags, pkt->path, &pkt->payload[i], len);
-      } else if (self_id.isHashMatch(&pkt->payload[i + offset], 1 << path_sz) && allowPacketForward(pkt) && !_tables->wasSeen(pkt)) {
-        _tables->markSeen(pkt);
+      } else if (self_id.isHashMatch(&pkt->payload[i + offset], 1 << path_sz) && allowPacketForward(pkt) && !_tables->hasSeen(pkt)) {
         // append SNR (Not hash!)
         pkt->path[pkt->path_len++] = (int8_t) (pkt->getSNR()*4);
 
@@ -90,16 +89,14 @@ DispatcherAction Mesh::onRecvPacket(Packet* pkt) {
       if (pkt->getPayloadType() == PAYLOAD_TYPE_MULTIPART) {
         return forwardMultipartDirect(pkt);
       } else if (pkt->getPayloadType() == PAYLOAD_TYPE_ACK) {
-        if (!_tables->wasSeen(pkt)) {  // don't retransmit!
-          _tables->markSeen(pkt);
+        if (!_tables->hasSeen(pkt)) {  // don't retransmit!
           removeSelfFromPath(pkt);
           routeDirectRecvAcks(pkt, 0);
         }
         return ACTION_RELEASE;
       }
 
-      if (!_tables->wasSeen(pkt)) {
-        _tables->markSeen(pkt);
+      if (!_tables->hasSeen(pkt)) {
         removeSelfFromPath(pkt);
 
         uint32_t d = getDirectRetransmitDelay(pkt);
@@ -120,8 +117,7 @@ DispatcherAction Mesh::onRecvPacket(Packet* pkt) {
       memcpy(&ack_crc, &pkt->payload[i], 4); i += 4;
       if (i > pkt->payload_len) {
         MESH_DEBUG_PRINTLN("%s Mesh::onRecvPacket(): incomplete ACK packet", getLogDateTime());
-      } else if (!_tables->wasSeen(pkt)) {
-        _tables->markSeen(pkt);
+      } else if (!_tables->hasSeen(pkt)) {
         onAckRecv(pkt, ack_crc);
         action = routeRecvPacket(pkt);
       }
@@ -138,8 +134,7 @@ DispatcherAction Mesh::onRecvPacket(Packet* pkt) {
       uint8_t* macAndData = &pkt->payload[i];   // MAC + encrypted data 
       if (i + CIPHER_MAC_SIZE >= pkt->payload_len) {
         MESH_DEBUG_PRINTLN("%s Mesh::onRecvPacket(): incomplete data packet", getLogDateTime());
-      } else if (!_tables->wasSeen(pkt)) {
-        _tables->markSeen(pkt);
+      } else if (!_tables->hasSeen(pkt)) {
         // NOTE: this is a 'first packet wins' impl. When receiving from multiple paths, the first to arrive wins.
         //       For flood mode, the path may not be the 'best' in terms of hops.
         // FUTURE: could send back multiple paths, using createPathReturn(), and let sender choose which to use(?)
@@ -160,10 +155,6 @@ DispatcherAction Mesh::onRecvPacket(Packet* pkt) {
               if (pkt->getPayloadType() == PAYLOAD_TYPE_PATH) {
                 int k = 0;
                 uint8_t path_len = data[k++];
-                if (!Packet::isValidPathLen(path_len)) {
-                  MESH_DEBUG_PRINTLN("%s PAYLOAD_TYPE_PATH, bad path_len: %u", getLogDateTime(), (uint32_t)path_len);
-                  break;   // reject bad encoding
-                }
                 uint8_t hash_size = (path_len >> 6) + 1;
                 uint8_t hash_count = path_len & 63;
                 uint8_t* path = &data[k]; k += hash_size*hash_count;
@@ -202,8 +193,7 @@ DispatcherAction Mesh::onRecvPacket(Packet* pkt) {
       uint8_t* macAndData = &pkt->payload[i];   // MAC + encrypted data 
       if (i + 2 >= pkt->payload_len) {
         MESH_DEBUG_PRINTLN("%s Mesh::onRecvPacket(): incomplete data packet", getLogDateTime());
-      } else if (!_tables->wasSeen(pkt)) {
-        _tables->markSeen(pkt);
+      } else if (!_tables->hasSeen(pkt)) {
         if (self_id.isHashMatch(&dest_hash)) {
           Identity sender(sender_pub_key);
 
@@ -230,8 +220,7 @@ DispatcherAction Mesh::onRecvPacket(Packet* pkt) {
       uint8_t* macAndData = &pkt->payload[i];   // MAC + encrypted data 
       if (i + 2 >= pkt->payload_len) {
         MESH_DEBUG_PRINTLN("%s Mesh::onRecvPacket(): incomplete data packet", getLogDateTime());
-      } else if (!_tables->wasSeen(pkt)) {
-        _tables->markSeen(pkt);
+      } else if (!_tables->hasSeen(pkt)) {
         // scan channels DB, for all matching hashes of 'channel_hash' (max 4 matches supported ATM)
         GroupChannel channels[4];
         int num = searchChannelsByHash(&channel_hash, channels, 4);
@@ -262,8 +251,7 @@ DispatcherAction Mesh::onRecvPacket(Packet* pkt) {
         MESH_DEBUG_PRINTLN("%s Mesh::onRecvPacket(): incomplete advertisement packet", getLogDateTime());
       } else if (self_id.matches(id.pub_key)) {
         MESH_DEBUG_PRINTLN("%s Mesh::onRecvPacket(): receiving SELF advert packet", getLogDateTime());
-      } else if (!_tables->wasSeen(pkt)) {
-        _tables->markSeen(pkt);
+      } else if (!_tables->hasSeen(pkt)) {
         uint8_t* app_data = &pkt->payload[i];
         int app_data_len = pkt->payload_len - i;
         if (app_data_len > MAX_ADVERT_DATA_SIZE) { app_data_len = MAX_ADVERT_DATA_SIZE; }
@@ -290,8 +278,7 @@ DispatcherAction Mesh::onRecvPacket(Packet* pkt) {
       break;
     }
     case PAYLOAD_TYPE_RAW_CUSTOM: {
-      if (pkt->isRouteDirect() && !_tables->wasSeen(pkt)) {
-        _tables->markSeen(pkt);
+      if (pkt->isRouteDirect() && !_tables->hasSeen(pkt)) {
         onRawDataRecv(pkt);
         //action = routeRecvPacket(pkt);    don't flood route these (yet)
       }
@@ -309,8 +296,7 @@ DispatcherAction Mesh::onRecvPacket(Packet* pkt) {
           tmp.payload_len = pkt->payload_len - 1;
           memcpy(tmp.payload, &pkt->payload[1], tmp.payload_len);
 
-          if (!_tables->wasSeen(&tmp)) {
-            _tables->markSeen(&tmp);
+          if (!_tables->hasSeen(&tmp)) {
             uint32_t ack_crc;
             memcpy(&ack_crc, tmp.payload, 4);
 
@@ -367,8 +353,7 @@ DispatcherAction Mesh::forwardMultipartDirect(Packet* pkt) {
     tmp.payload_len = pkt->payload_len - 1;
     memcpy(tmp.payload, &pkt->payload[1], tmp.payload_len);
 
-    if (!_tables->wasSeen(&tmp)) {   // don't retransmit!
-      _tables->markSeen(&tmp);
+    if (!_tables->hasSeen(&tmp)) {   // don't retransmit!
       removeSelfFromPath(&tmp);
       routeDirectRecvAcks(&tmp, ((uint32_t)remaining + 1) * 300);  // expect multipart ACKs 300ms apart (x2)
     }
@@ -648,7 +633,7 @@ void Mesh::sendFlood(Packet* packet, uint32_t delay_millis, uint8_t path_hash_si
   packet->header |= ROUTE_TYPE_FLOOD;
   packet->setPathHashSizeAndCount(path_hash_size, 0);
 
-  _tables->markSeen(packet); // mark this packet as already sent in case it is rebroadcast back to us
+  _tables->hasSeen(packet); // mark this packet as already sent in case it is rebroadcast back to us
 
   uint8_t pri;
   if (packet->getPayloadType() == PAYLOAD_TYPE_PATH) {
@@ -677,7 +662,7 @@ void Mesh::sendFlood(Packet* packet, uint16_t* transport_codes, uint32_t delay_m
   packet->transport_codes[1] = transport_codes[1];
   packet->setPathHashSizeAndCount(path_hash_size, 0);
 
-  _tables->markSeen(packet); // mark this packet as already sent in case it is rebroadcast back to us
+  _tables->hasSeen(packet); // mark this packet as already sent in case it is rebroadcast back to us
 
   uint8_t pri;
   if (packet->getPayloadType() == PAYLOAD_TYPE_PATH) {
@@ -710,7 +695,7 @@ void Mesh::sendDirect(Packet* packet, const uint8_t* path, uint8_t path_len, uin
       pri = 0;
     }
   }
-  _tables->markSeen(packet); // mark this packet as already sent in case it is rebroadcast back to us
+  _tables->hasSeen(packet); // mark this packet as already sent in case it is rebroadcast back to us
   sendPacket(packet, pri, delay_millis);
 }
 
@@ -720,7 +705,7 @@ void Mesh::sendZeroHop(Packet* packet, uint32_t delay_millis) {
 
   packet->path_len = 0;  // path_len of zero means Zero Hop
 
-  _tables->markSeen(packet); // mark this packet as already sent in case it is rebroadcast back to us
+  _tables->hasSeen(packet); // mark this packet as already sent in case it is rebroadcast back to us
 
   sendPacket(packet, 0, delay_millis);
 }
@@ -733,7 +718,7 @@ void Mesh::sendZeroHop(Packet* packet, uint16_t* transport_codes, uint32_t delay
 
   packet->path_len = 0;  // path_len of zero means Zero Hop
 
-  _tables->markSeen(packet); // mark this packet as already sent in case it is rebroadcast back to us
+  _tables->hasSeen(packet); // mark this packet as already sent in case it is rebroadcast back to us
 
   sendPacket(packet, 0, delay_millis);
 }

src/Mesh.h

@@ -15,9 +15,8 @@ public:
 */
 class MeshTables {
 public:
-  virtual bool wasSeen(const Packet* packet) = 0;
-  virtual void markSeen(const Packet* packet) = 0;
-  virtual void clear(const Packet* packet) = 0;    // remove this packet hash from table
+  virtual bool hasSeen(const Packet* packet) = 0;
+  virtual void clear(const Packet* packet) = 0;   // remove this packet hash from table
 };
 
 /**
@@ -101,7 +100,7 @@ protected:
    * \param  auth_code   a code to authenticate the packet
    * \param  flags       zero for now
    * \param  path_snrs   single byte SNR*4 for each hop in the path
-   * \param  path_hashes hashes of each repeater in the path
+   * \param  path_hashes hashes if each repeater in the path
    * \param  path_len    length of the path_snrs[] and path_hashes[] arrays
   */
   virtual void onTraceRecv(Packet* packet, uint32_t tag, uint32_t auth_code, uint8_t flags, const uint8_t* path_snrs, const uint8_t* path_hashes, uint8_t path_len) { }

src/MeshCore.h

@@ -64,9 +64,6 @@ public:
   virtual uint8_t getStartupReason() const = 0;
   virtual bool getBootloaderVersion(char* version, size_t max_len) { return false; }
   virtual bool startOTAUpdate(const char* id, char reply[]) { return false; }   // not supported
-  virtual bool setLoRaFemLnaEnabled(bool enable) { return false; }
-  virtual bool canControlLoRaFemLna() const { return false; }
-  virtual bool isLoRaFemLnaEnabled() const { return false; }
 
   // Power management interface (boards with power management override these)
   virtual bool isExternalPowered() { return false; }

src/Packet.h

@@ -25,7 +25,7 @@ namespace mesh {
 #define PAYLOAD_TYPE_GRP_DATA    0x06    // an (unverified) group datagram (prefixed with channel hash, MAC) (enc data: data_type(uint16), data_len, 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)
-#define PAYLOAD_TYPE_TRACE       0x09    // trace a path, collecting SNR for each hop
+#define PAYLOAD_TYPE_TRACE       0x09    // trace a path, collecting SNI for each hop
 #define PAYLOAD_TYPE_MULTIPART   0x0A    // packet is one of a set of packets
 #define PAYLOAD_TYPE_CONTROL     0x0B    // a control/discovery packet
 //...

src/helpers/BaseChatMesh.cpp

@@ -68,36 +68,29 @@ void BaseChatMesh::bootstrapRTCfromContacts() {
 }
 
 ContactInfo* BaseChatMesh::allocateContactSlot(bool transient_only) {
-  int oldest_idx = -1;
-  uint32_t oldest_lastmod = 0xFFFFFFFF;
-  if (transient_only) {
-    // only allocate from first N
-    for (int i = 0; i < MAX_ANON_CONTACTS; i++) {
-      if (contacts[i].type == ADV_TYPE_NONE && contacts[i].lastmod < oldest_lastmod) {
-        oldest_lastmod = contacts[i].lastmod;
-        oldest_idx = i;
-      }
-    }
-    if (oldest_idx >= 0) {
-      // NOTE: do NOT call onContactOverwrite()
-      return &contacts[oldest_idx];
-    }
-  } else {
-    if (num_contacts < MAX_ANON_CONTACTS+MAX_CONTACTS) {
-      return &contacts[num_contacts++];
-    } else if (shouldOverwriteWhenFull()) {
-      // Find oldest non-favourite contact by oldest lastmod timestamp
-      for (int i = MAX_ANON_CONTACTS; i < num_contacts; i++) {
+  if (num_contacts < MAX_CONTACTS) {
+    return &contacts[num_contacts++];
+  } else if (transient_only || shouldOverwriteWhenFull()) {
+    // Find oldest non-favourite contact by oldest lastmod timestamp
+    int oldest_idx = -1;
+    uint32_t oldest_lastmod = 0xFFFFFFFF;
+    for (int i = 0; i < num_contacts; i++) {
+      if (transient_only) {
+        if (contacts[i].type == ADV_TYPE_NONE && contacts[i].lastmod < oldest_lastmod) {
+          oldest_lastmod = contacts[i].lastmod;
+          oldest_idx = i;
+        }
+      } else {
         bool is_favourite = (contacts[i].flags & 0x01) != 0;
-        if (!is_favourite && contacts[i].lastmod < oldest_lastmod) {
+        if (!is_favourite && contacts[i].lastmod < oldest_lastmod && contacts[i].type != ADV_TYPE_NONE) {
           oldest_lastmod = contacts[i].lastmod;
           oldest_idx = i;
         }
       }
-      if (oldest_idx >= 0) {
-        onContactOverwrite(contacts[oldest_idx].id.pub_key);
-        return &contacts[oldest_idx];
-      }
+    }
+    if (oldest_idx >= 0) {
+      onContactOverwrite(contacts[oldest_idx].id.pub_key);
+      return &contacts[oldest_idx];
     }
   }
   return NULL; // no space, no overwrite or all contacts are all favourites
@@ -146,11 +139,6 @@ void BaseChatMesh::onAdvertRecv(mesh::Packet* packet, const mesh::Identity& id,
     packet->header = save;
   }
 
-  if (from && from->type == ADV_TYPE_NONE) {   // already in contacts, but from a temporary ANON_REQ ?
-    memset(from, 0, sizeof(*from));  // clear the anon/temp slot
-    from = NULL;  // do normal 'add' flow
-  }
-
   bool is_new = false; // true = not in contacts[], false = exists in contacts[]
   if (from == NULL) {
     if (!shouldAutoAddContactType(parser.getType())) {
@@ -942,11 +930,11 @@ bool BaseChatMesh::getContactByIdx(uint32_t idx, ContactInfo& contact) {
 }
 
 ContactsIterator BaseChatMesh::startContactsIterator() {
-  return ContactsIterator(MAX_ANON_CONTACTS);   // start at offset, skip the anon entries
+  return ContactsIterator();
 }
 
 bool ContactsIterator::hasNext(const BaseChatMesh* mesh, ContactInfo& dest) {
-  if (next_idx >= mesh->getTotalContactSlots()) return false;
+  if (next_idx >= mesh->getNumContacts()) return false;
 
   dest = mesh->contacts[next_idx++];
   return true;

src/helpers/BaseChatMesh.h

@@ -28,9 +28,8 @@ public:
 class BaseChatMesh;
 
 class ContactsIterator {
-  int next_idx;
+  int next_idx = 0;
 public:
-  ContactsIterator(int start) { next_idx = start; }
   bool hasNext(const BaseChatMesh* mesh, ContactInfo& dest);
 };
 
@@ -80,9 +79,8 @@ class BaseChatMesh : public mesh::Mesh {
 protected:
   BaseChatMesh(mesh::Radio& radio, mesh::MillisecondClock& ms, mesh::RNG& rng, mesh::RTCClock& rtc, mesh::PacketManager& mgr, mesh::MeshTables& tables)
       : mesh::Mesh(radio, ms, rng, rtc, mgr, tables)
-  {
-    resetContacts();
-
+  { 
+    num_contacts = 0;
   #ifdef MAX_GROUP_CHANNELS
     memset(channels, 0, sizeof(channels));
     num_channels = 0;
@@ -93,11 +91,7 @@ protected:
   }
 
   void bootstrapRTCfromContacts();
-
-  void resetContacts() {
-    memset(contacts, 0, sizeof(contacts[0])*MAX_ANON_CONTACTS);   // set all to have type = ADV_TYPE_NONE(0)
-    num_contacts = MAX_ANON_CONTACTS;  // seed the first contacts for anon requests
-  }
+  void resetContacts() { num_contacts = 0; }
   void populateContactFromAdvert(ContactInfo& ci, const mesh::Identity& id, const AdvertDataParser& parser, uint32_t timestamp);
   ContactInfo* allocateContactSlot(bool transient_only=false); // helper to find slot for new contact
 
@@ -172,8 +166,7 @@ public:
   ContactInfo* lookupContactByPubKey(const uint8_t* pub_key, int prefix_len);
   bool  removeContact(ContactInfo& contact);
   bool  addContact(const ContactInfo& contact);
-  int getTotalContactSlots() const { return num_contacts; }
-  int getNumContacts() const { return num_contacts - MAX_ANON_CONTACTS; }  // don't include the reserved slots at start
+  int getNumContacts() const { return num_contacts; }
   bool getContactByIdx(uint32_t idx, ContactInfo& contact);
   ContactsIterator startContactsIterator();
   ChannelDetails* addChannel(const char* name, const char* psk_base64);

src/helpers/CommonCLI.cpp

@@ -88,12 +88,10 @@ void CommonCLI::loadPrefsInt(FILESYSTEM* fs, const char* filename) {
     file.read((uint8_t *)&_prefs->discovery_mod_timestamp, sizeof(_prefs->discovery_mod_timestamp)); // 162
     file.read((uint8_t *)&_prefs->adc_multiplier, sizeof(_prefs->adc_multiplier));                 // 166
     file.read((uint8_t *)_prefs->owner_info, sizeof(_prefs->owner_info));                          // 170
-    file.read((uint8_t *)&_prefs->rx_boosted_gain, sizeof(_prefs->rx_boosted_gain));               // 290
-    file.read((uint8_t *)&_prefs->flood_max_unscoped, sizeof(_prefs->flood_max_unscoped));         // 291
-    file.read((uint8_t *)&_prefs->flood_max_advert, sizeof(_prefs->flood_max_advert));             // 292
-    file.read((uint8_t *)&_prefs->radio_fem_rxgain, sizeof(_prefs->radio_fem_rxgain));             // 293
-    file.read((uint8_t *)&_prefs->cad_enabled, sizeof(_prefs->cad_enabled));                       // 294
-    // next: 295
+    file.read((uint8_t *)&_prefs->rx_boosted_gain, sizeof(_prefs->rx_boosted_gain));              // 290
+    file.read((uint8_t *)&_prefs->flood_max_unscoped, sizeof(_prefs->flood_max_unscoped));   // 291
+    file.read((uint8_t *)&_prefs->flood_max_advert, sizeof(_prefs->flood_max_advert));       // 292
+    // next: 293
 
     // sanitise bad pref values
     _prefs->rx_delay_base = constrain(_prefs->rx_delay_base, 0, 20.0f);
@@ -123,8 +121,6 @@ void CommonCLI::loadPrefsInt(FILESYSTEM* fs, const char* filename) {
 
     // sanitise settings
     _prefs->rx_boosted_gain = constrain(_prefs->rx_boosted_gain, 0, 1); // boolean
-    _prefs->radio_fem_rxgain = constrain(_prefs->radio_fem_rxgain, 0, 1); // boolean
-    _prefs->cad_enabled = constrain(_prefs->cad_enabled, 0, 1); // boolean
 
     file.close();
   }
@@ -185,12 +181,10 @@ void CommonCLI::savePrefs(FILESYSTEM* fs) {
     file.write((uint8_t *)&_prefs->discovery_mod_timestamp, sizeof(_prefs->discovery_mod_timestamp)); // 162
     file.write((uint8_t *)&_prefs->adc_multiplier, sizeof(_prefs->adc_multiplier));                 // 166
     file.write((uint8_t *)_prefs->owner_info, sizeof(_prefs->owner_info));                          // 170
-    file.write((uint8_t *)&_prefs->rx_boosted_gain, sizeof(_prefs->rx_boosted_gain));               // 290
-    file.write((uint8_t *)&_prefs->flood_max_unscoped, sizeof(_prefs->flood_max_unscoped));         // 291
-    file.write((uint8_t *)&_prefs->flood_max_advert, sizeof(_prefs->flood_max_advert));             // 292
-    file.write((uint8_t *)&_prefs->radio_fem_rxgain, sizeof(_prefs->radio_fem_rxgain));             // 293
-    file.write((uint8_t *)&_prefs->cad_enabled, sizeof(_prefs->cad_enabled));                       // 294
-    // next: 295
+    file.write((uint8_t *)&_prefs->rx_boosted_gain, sizeof(_prefs->rx_boosted_gain));              // 290
+    file.write((uint8_t *)&_prefs->flood_max_unscoped, sizeof(_prefs->flood_max_unscoped));   // 291
+    file.write((uint8_t *)&_prefs->flood_max_advert, sizeof(_prefs->flood_max_advert));       // 292
+    // next: 293
 
     file.close();
   }
@@ -506,10 +500,6 @@ void CommonCLI::handleSetCmd(uint32_t sender_timestamp, char* command, char* rep
     _prefs->interference_threshold = atoi(&config[11]);
     savePrefs();
     strcpy(reply, "OK");
-  } else if (memcmp(config, "cad ", 4) == 0) {
-    _prefs->cad_enabled = memcmp(&config[4], "on", 2) == 0;
-    savePrefs();
-    strcpy(reply, "OK");
   } else if (memcmp(config, "agc.reset.interval ", 19) == 0) {
     _prefs->agc_reset_interval = atoi(&config[19]) / 4;
     savePrefs();
@@ -571,37 +561,13 @@ void CommonCLI::handleSetCmd(uint32_t sender_timestamp, char* command, char* rep
     _prefs->disable_fwd = memcmp(&config[7], "off", 3) == 0;
     savePrefs();
     strcpy(reply, _prefs->disable_fwd ? "OK - repeat is now OFF" : "OK - repeat is now ON");
+#if defined(USE_SX1262) || defined(USE_SX1268) || defined(USE_LR1110)
   } else if (memcmp(config, "radio.rxgain ", 13) == 0) {
-    bool enabled = memcmp(&config[13], "on", 2) == 0;
-    _prefs->rx_boosted_gain = enabled;
+    _prefs->rx_boosted_gain = memcmp(&config[13], "on", 2) == 0;
+    strcpy(reply, "OK");
     savePrefs();
-    if (_callbacks->setRxBoostedGain(enabled)) {
-      strcpy(reply, "OK");
-    } else {
-      strcpy(reply, "Error: unsupported");
-    }
-  } else if (memcmp(config, "radio.fem.rxgain ", 17) == 0) {
-    if (!_board->canControlLoRaFemLna()) {
-      strcpy(reply, "Error: unsupported");
-    } else if (memcmp(&config[17], "on", 2) == 0) {
-      if (_board->setLoRaFemLnaEnabled(true)) {
-        _prefs->radio_fem_rxgain = 1;
-        savePrefs();
-        strcpy(reply, "OK - LoRa FEM RX gain on");
-      } else {
-        strcpy(reply, "Error: failed to apply LoRa FEM RX gain");
-      }
-    } else if (memcmp(&config[17], "off", 3) == 0) {
-      if (_board->setLoRaFemLnaEnabled(false)) {
-        _prefs->radio_fem_rxgain = 0;
-        savePrefs();
-        strcpy(reply, "OK - LoRa FEM RX gain off");
-      } else {
-        strcpy(reply, "Error: failed to apply LoRa FEM RX gain");
-      }
-    } else {
-      strcpy(reply, "Error: state must be on or off");
-    }
+    _callbacks->setRxBoostedGain(_prefs->rx_boosted_gain);
+#endif
   } else if (memcmp(config, "radio ", 6) == 0) {
     strcpy(tmp, &config[6]);
     const char *parts[4];
@@ -791,7 +757,7 @@ void CommonCLI::handleSetCmd(uint32_t sender_timestamp, char* command, char* rep
       }
     } else {
       _prefs->adc_multiplier = 0.0f;
-      strcpy(reply, "Error: unsupported");
+      strcpy(reply, "Error: unsupported by this board");
     };
   } else {
     strcpy(reply, "unknown config: ");
@@ -810,8 +776,6 @@ void CommonCLI::handleGetCmd(uint32_t sender_timestamp, char* command, char* rep
     sprintf(reply, "> %s", StrHelper::ftoa(_prefs->airtime_factor));
   } else if (memcmp(config, "int.thresh", 10) == 0) {
     sprintf(reply, "> %d", (uint32_t) _prefs->interference_threshold);
-  } else if (memcmp(config, "cad", 3) == 0) {
-    sprintf(reply, "> %s", _prefs->cad_enabled ? "on" : "off");
   } else if (memcmp(config, "agc.reset.interval", 18) == 0) {
     sprintf(reply, "> %d", ((uint32_t) _prefs->agc_reset_interval) * 4);
   } else if (memcmp(config, "multi.acks", 10) == 0) {
@@ -837,14 +801,10 @@ void CommonCLI::handleGetCmd(uint32_t sender_timestamp, char* command, char* rep
     sprintf(reply, "> %s", StrHelper::ftoa(_prefs->node_lat));
   } else if (memcmp(config, "lon", 3) == 0) {
     sprintf(reply, "> %s", StrHelper::ftoa(_prefs->node_lon));
+#if defined(USE_SX1262) || defined(USE_SX1268) || defined(USE_LR1110)
   } else if (memcmp(config, "radio.rxgain", 12) == 0) {
     sprintf(reply, "> %s", _prefs->rx_boosted_gain ? "on" : "off");
-  } else if (memcmp(config, "radio.fem.rxgain", 16) == 0) {
-    if (!_board->canControlLoRaFemLna()) {
-      strcpy(reply, "Error: unsupported");
-    } else {
-      sprintf(reply, "> %s", _board->isLoRaFemLnaEnabled() ? "on" : "off");
-    }
+#endif
   } else if (memcmp(config, "radio", 5) == 0) {
     char freq[16], bw[16];
     strcpy(freq, StrHelper::ftoa(_prefs->freq));
@@ -930,12 +890,12 @@ void CommonCLI::handleGetCmd(uint32_t sender_timestamp, char* command, char* rep
           strcpy(reply, "> unknown");
       }
   #else
-      strcpy(reply, "Error: unsupported");
+      strcpy(reply, "ERROR: unsupported");
   #endif
   } else if (memcmp(config, "adc.multiplier", 14) == 0) {
     float adc_mult = _board->getAdcMultiplier();
     if (adc_mult == 0.0f) {
-      strcpy(reply, "Error: unsupported");
+      strcpy(reply, "Error: unsupported by this board");
     } else {
       sprintf(reply, "> %.3f", adc_mult);
     }
@@ -953,9 +913,13 @@ void CommonCLI::handleGetCmd(uint32_t sender_timestamp, char* command, char* rep
     strcpy(reply, "ERROR: Power management not supported");
 #endif
   } else if (memcmp(config, "pwrmgt.bootreason", 17) == 0) {
+#ifdef NRF52_POWER_MANAGEMENT
     sprintf(reply, "> Reset: %s; Shutdown: %s",
       _board->getResetReasonString(_board->getResetReason()),
       _board->getShutdownReasonString(_board->getShutdownReason()));
+#else
+    strcpy(reply, "ERROR: Power management not supported");
+#endif
   } else if (memcmp(config, "pwrmgt.bootmv", 13) == 0) {
 #ifdef NRF52_POWER_MANAGEMENT
     sprintf(reply, "> %u mV", _board->getBootVoltage());

src/helpers/CommonCLI.h

@@ -61,10 +61,8 @@ struct NodePrefs { // persisted to file
   float adc_multiplier;
   char owner_info[120];
   uint8_t rx_boosted_gain; // power settings
-  uint8_t radio_fem_rxgain; // LoRa FEM RX gain setting
   uint8_t path_hash_mode;   // which path mode to use when sending
   uint8_t loop_detect;
-  uint8_t cad_enabled;      // hardware Channel Activity Detection before TX (boolean)
 };
 
 class CommonCLICallbacks {
@@ -111,8 +109,8 @@ public:
     // no op by default
   };
 
-  virtual bool setRxBoostedGain(bool enable) {
-    return false; // CommonCLI reports unsupported if not overridden by wrapper
+  virtual void setRxBoostedGain(bool enable) {
+    // no op by default
   };
 };
 

src/helpers/ESP32Board.h

@@ -155,42 +155,6 @@ public:
   void setInhibitSleep(bool inhibit) {
     inhibit_sleep = inhibit;
   }
-
-  uint32_t getResetReason() const override {
-    return esp_reset_reason();
-  }
-
-  // https://docs.espressif.com/projects/esp-idf/en/v4.4.7/esp32/api-reference/system/system.html
-  const char* getResetReasonString(uint32_t reason) {
-    switch (reason) {
-      case ESP_RST_UNKNOWN:
-        return "Unknown or first boot";
-      case ESP_RST_POWERON:
-        return "Power-on reset";
-      case ESP_RST_EXT:
-        return "External reset";
-      case ESP_RST_SW:
-        return "Software reset";
-      case ESP_RST_PANIC:
-        return "Panic / exception reset";
-      case ESP_RST_INT_WDT:
-        return "Interrupt watchdog reset";
-      case ESP_RST_TASK_WDT:
-        return "Task watchdog reset";
-      case ESP_RST_WDT:
-        return "Other watchdog reset";
-      case ESP_RST_DEEPSLEEP:
-        return "Wake from deep sleep";
-      case ESP_RST_BROWNOUT:
-        return "Brownout (low voltage)";
-      case ESP_RST_SDIO:
-        return "SDIO reset";
-      default:
-        static char buf[40];
-        snprintf(buf, sizeof(buf), "Unknown reset reason (%d)", reason);
-        return buf;
-    }
-  }
 };
 
 class ESP32RTCClock : public mesh::RTCClock {

src/helpers/RegionMap.cpp

@@ -139,7 +139,7 @@ bool RegionMap::save(FILESYSTEM* _fs, const char* path) {
       }
     }
     file.close();
-    return success;
+    return true;
   }
   return false;  // failed
 }

src/helpers/SimpleMeshTables.h

@@ -31,29 +31,25 @@ public:
   }
 #endif
 
-  bool wasSeen(const mesh::Packet* packet) override {
+  bool hasSeen(const mesh::Packet* packet) override {
     uint8_t hash[MAX_HASH_SIZE];
     packet->calculatePacketHash(hash);
 
     const uint8_t* sp = _hashes;
     for (int i = 0; i < MAX_PACKET_HASHES; i++, sp += MAX_HASH_SIZE) {
-      if (memcmp(hash, sp, MAX_HASH_SIZE) == 0) {
+      if (memcmp(hash, sp, MAX_HASH_SIZE) == 0) { 
         if (packet->isRouteDirect()) {
-          _direct_dups++;
+          _direct_dups++;   // keep some stats
         } else {
           _flood_dups++;
         }
         return true;
       }
     }
-    return false;
-  }
 
-  void markSeen(const mesh::Packet* packet) override {
-    uint8_t hash[MAX_HASH_SIZE];
-    packet->calculatePacketHash(hash);
-    memcpy(&_hashes[_next_idx * MAX_HASH_SIZE], hash, MAX_HASH_SIZE);
-    _next_idx = (_next_idx + 1) % MAX_PACKET_HASHES;
+    memcpy(&_hashes[_next_idx*MAX_HASH_SIZE], hash, MAX_HASH_SIZE);
+    _next_idx = (_next_idx + 1) % MAX_PACKET_HASHES;  // cyclic table
+    return false;
   }
 
   void clear(const mesh::Packet* packet) override {

src/helpers/bridges/BridgeBase.cpp

@@ -39,8 +39,7 @@ void BridgeBase::handleReceivedPacket(mesh::Packet *packet) {
     return;
   }
 
-  if (!_seen_packets.wasSeen(packet)) {
-    _seen_packets.markSeen(packet);
+  if (!_seen_packets.hasSeen(packet)) {
     // bridge_delay provides a buffer to prevent immediate processing conflicts in the mesh network.
     _mgr->queueInbound(packet, millis() + _prefs->bridge_delay);
   } else {

src/helpers/bridges/BridgeBase.h

@@ -110,7 +110,7 @@ protected:
    * @brief Common packet handling for received packets
    *
    * Implements the standard pattern used by all bridges:
-   * - Check if packet was seen before using _seen_packets.wasSeen()
+   * - Check if packet was seen before using _seen_packets.hasSeen()
    * - Queue packet for mesh processing if not seen before
    * - Free packet if already seen to prevent duplicates
    *

src/helpers/bridges/ESPNowBridge.cpp

@@ -32,7 +32,7 @@ void ESPNowBridge::begin() {
   // Initialize WiFi in station mode
   WiFi.mode(WIFI_STA);
   
-  // Set Wi-Fi channel
+  // Set wifi channel
   if (esp_wifi_set_channel(_prefs->bridge_channel, WIFI_SECOND_CHAN_NONE) != ESP_OK) {
     BRIDGE_DEBUG_PRINTLN("Error setting WIFI channel to %d\n", _prefs->bridge_channel);
     return;
@@ -167,8 +167,7 @@ void ESPNowBridge::sendPacket(mesh::Packet *packet) {
     return;
   }
 
-  if (!_seen_packets.wasSeen(packet)) {
-    _seen_packets.markSeen(packet);
+  if (!_seen_packets.hasSeen(packet)) {
     // Create a temporary buffer just for size calculation and reuse for actual writing
     uint8_t sizingBuffer[MAX_PAYLOAD_SIZE];
     uint16_t meshPacketLen = packet->writeTo(sizingBuffer);

src/helpers/bridges/RS232Bridge.cpp

@@ -115,8 +115,7 @@ void RS232Bridge::sendPacket(mesh::Packet *packet) {
     return;
   }
 
-  if (!_seen_packets.wasSeen(packet)) {
-    _seen_packets.markSeen(packet);
+  if (!_seen_packets.hasSeen(packet)) {
 
     uint8_t buffer[MAX_SERIAL_PACKET_SIZE];
     uint16_t len = packet->writeTo(buffer + 4);

src/helpers/esp32/ESPNOWRadio.h

@@ -38,7 +38,7 @@ public:
    * These two functions do nothing for ESP-NOW, but are needed for the
    * Radio interface.
    */
-  virtual bool setRxBoostedGainMode(bool) { }
+  virtual void setRxBoostedGainMode(bool) { }
   virtual bool getRxBoostedGainMode() const { return false; }
 
   uint32_t intID();

src/helpers/radiolib/CustomLLCC68Wrapper.h

@@ -33,8 +33,8 @@ public:
 
   void doResetAGC() override { sx126xResetAGC((SX126x *)_radio); }
 
-  bool setRxBoostedGainMode(bool en) override {
-    return ((CustomLLCC68 *)_radio)->setRxBoostedGainMode(en) == RADIOLIB_ERR_NONE;
+  void setRxBoostedGainMode(bool en) override {
+    ((CustomLLCC68 *)_radio)->setRxBoostedGainMode(en);
   }
   bool getRxBoostedGainMode() const override {
     return ((CustomLLCC68 *)_radio)->getRxBoostedGainMode();

src/helpers/radiolib/CustomLR1110Wrapper.h

@@ -26,11 +26,6 @@ public:
     return rssi;
   }
 
-  uint32_t getEstAirtimeFor(int len_bytes) override {
-    auto airtime = RadioLibWrapper::getEstAirtimeFor(len_bytes);
-    return airtime < 200 ? 200 : airtime;   // at least 200 millis
-  }
-
   void onSendFinished() override {
     RadioLibWrapper::onSendFinished();
     _radio->setPreambleLength(preambleLengthForSF(getSpreadingFactor())); // overcomes weird issues with small and big pkts
@@ -41,8 +36,8 @@ public:
 
   uint8_t getSpreadingFactor() const override { return ((CustomLR1110 *)_radio)->getSpreadingFactor(); }
   
-  bool setRxBoostedGainMode(bool en) override {
-    return ((CustomLR1110 *)_radio)->setRxBoostedGainMode(en) == RADIOLIB_ERR_NONE;
+  void setRxBoostedGainMode(bool en) override {
+    ((CustomLR1110 *)_radio)->setRxBoostedGainMode(en);
   }
   bool getRxBoostedGainMode() const override {
     return ((CustomLR1110 *)_radio)->getRxBoostedGainMode();

src/helpers/radiolib/CustomSX1262.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <RadioLib.h>
-#include "MeshCore.h"
 
 #define SX126X_IRQ_HEADER_VALID                0b0000010000  //  4     4     valid LoRa header received
 #define SX126X_IRQ_PREAMBLE_DETECTED           0x04
@@ -28,14 +27,6 @@ class CustomSX1262 : public SX1262 {
       uint8_t cr = 5;
   #endif
 
-  #ifdef SX126X_USE_REGULATOR_LDO
-      constexpr bool useRegulatorLDO = SX126X_USE_REGULATOR_LDO;
-  #else
-      constexpr bool useRegulatorLDO = false;
-  #endif
-
-      MESH_DEBUG_PRINTLN("SX1262 regulator requested: %s", useRegulatorLDO ? "LDO" : "DC-DC");
-
   #if defined(P_LORA_SCLK)
     #ifdef NRF52_PLATFORM
       if (spi) { spi->setPins(P_LORA_MISO, P_LORA_SCLK, P_LORA_MOSI); spi->begin(); }
@@ -51,12 +42,11 @@ class CustomSX1262 : public SX1262 {
       if (spi) spi->begin(P_LORA_SCLK, P_LORA_MISO, P_LORA_MOSI);
     #endif
   #endif
-      int status = begin(LORA_FREQ, LORA_BW, LORA_SF, cr, RADIOLIB_SX126X_SYNC_WORD_PRIVATE, LORA_TX_POWER, 16, tcxo, useRegulatorLDO);
+      int status = begin(LORA_FREQ, LORA_BW, LORA_SF, cr, RADIOLIB_SX126X_SYNC_WORD_PRIVATE, LORA_TX_POWER, 16, tcxo);
       // if radio init fails with -707/-706, try again with tcxo voltage set to 0.0f
       if (status == RADIOLIB_ERR_SPI_CMD_FAILED || status == RADIOLIB_ERR_SPI_CMD_INVALID) {
-        MESH_DEBUG_PRINTLN("SX1262 init failed with error %d, retrying with TCXO at 0.0V", status);
         tcxo = 0.0f;
-        status = begin(LORA_FREQ, LORA_BW, LORA_SF, cr, RADIOLIB_SX126X_SYNC_WORD_PRIVATE, LORA_TX_POWER, 16, tcxo, useRegulatorLDO);
+        status = begin(LORA_FREQ, LORA_BW, LORA_SF, cr, RADIOLIB_SX126X_SYNC_WORD_PRIVATE, LORA_TX_POWER, 16, tcxo);
       }
       if (status != RADIOLIB_ERR_NONE) {
         Serial.print("ERROR: radio init failed: ");
@@ -93,8 +83,6 @@ class CustomSX1262 : public SX1262 {
     writeRegister(0x8B5, &r_data, 1);
   #endif
 
-      MESH_DEBUG_PRINTLN("SX1262 status=0x%02X device_errors=0x%04X", getStatus(), getDeviceErrors());
-
       return true;  // success
     }
 

src/helpers/radiolib/CustomSX1262Wrapper.h

@@ -40,8 +40,8 @@ public:
 
   void doResetAGC() override { sx126xResetAGC((SX126x *)_radio); }
 
-  bool setRxBoostedGainMode(bool en) override {
-    return ((CustomSX1262 *)_radio)->setRxBoostedGainMode(en) == RADIOLIB_ERR_NONE;
+  void setRxBoostedGainMode(bool en) override {
+    ((CustomSX1262 *)_radio)->setRxBoostedGainMode(en);
   }
   bool getRxBoostedGainMode() const override {
     return ((CustomSX1262 *)_radio)->getRxBoostedGainMode();

src/helpers/radiolib/CustomSX1268Wrapper.h

@@ -37,8 +37,8 @@ public:
 
   void doResetAGC() override { sx126xResetAGC((SX126x *)_radio); }
 
-  bool setRxBoostedGainMode(bool en) override {
-    return ((CustomSX1268 *)_radio)->setRxBoostedGainMode(en) == RADIOLIB_ERR_NONE;
+  void setRxBoostedGainMode(bool en) override {
+    ((CustomSX1268 *)_radio)->setRxBoostedGainMode(en);
   }
   bool getRxBoostedGainMode() const override {
     return ((CustomSX1268 *)_radio)->getRxBoostedGainMode();

src/helpers/radiolib/RadioLibWrappers.cpp

@@ -36,7 +36,6 @@ void RadioLibWrapper::begin() {
 
   _noise_floor = 0;
   _threshold = 0;
-  _cad_enabled = false;
 
   // start average out some samples
   _num_floor_samples = 0;
@@ -179,26 +178,10 @@ void RadioLibWrapper::onSendFinished() {
   state = STATE_IDLE;
 }
 
-int16_t RadioLibWrapper::performChannelScan() {
-  return _radio->scanChannel();
-}
-
 bool RadioLibWrapper::isChannelActive() {
-  // int.thresh: RSSI-based interference detection (relative to noise floor)
-  if (_threshold != 0 && getCurrentRSSI() > _noise_floor + _threshold) return true;
-
-  // cad: hardware channel activity detection
-  if (_cad_enabled) {
-    int16_t result = performChannelScan();
-    // scanChannel() triggers DIO interrupt (CAD done) which sets STATE_INT_READY
-    // via setFlag() ISR. Clear it before restarting RX so recvRaw() doesn't
-    // try to read a non-existent packet and count a spurious recv error.
-    state = STATE_IDLE;
-    startRecv();
-    if (result != RADIOLIB_CHANNEL_FREE) return true;
-  }
-
-  return false;
+  return _threshold == 0 
+          ? false    // interference check is disabled
+          : getCurrentRSSI() > _noise_floor + _threshold;
 }
 
 float RadioLibWrapper::getLastRSSI() const {

src/helpers/radiolib/RadioLibWrappers.h

@@ -9,7 +9,6 @@ protected:
   mesh::MainBoard* _board;
   uint32_t n_recv, n_sent, n_recv_errors;
   int16_t _noise_floor, _threshold;
-  bool _cad_enabled;
   uint16_t _num_floor_samples;
   int32_t _floor_sample_sum;
   uint8_t _preamble_sf;
@@ -33,7 +32,7 @@ public:
   bool isInRecvMode() const override;
   bool isChannelActive();
 
-  bool isReceiving() override {
+  bool isReceiving() override { 
     if (isReceivingPacket()) return true;
 
     return isChannelActive();
@@ -47,11 +46,9 @@ public:
   virtual uint8_t getSpreadingFactor() const { return LORA_SF; }
   static uint16_t preambleLengthForSF(uint8_t sf) { return sf <= 8 ? 32 : 16; }
   void updatePreamble(uint8_t sf) { _preamble_sf = sf; _radio->setPreambleLength(preambleLengthForSF(sf)); }
-  virtual int16_t performChannelScan();
 
   int getNoiseFloor() const override { return _noise_floor; }
   void triggerNoiseFloorCalibrate(int threshold) override;
-  void setCADEnabled(bool enable) override { _cad_enabled = enable; }
   void resetAGC() override;
 
   void loop() override;
@@ -66,7 +63,7 @@ public:
 
   float packetScore(float snr, int packet_len) override { return packetScoreInt(snr, 10, packet_len); }  // assume sf=10
 
-  virtual bool setRxBoostedGainMode(bool) { return false; }
+  virtual void setRxBoostedGainMode(bool) { }
   virtual bool getRxBoostedGainMode() const { return false; }
 };
 

src/helpers/sensors/LPPDataHelpers.h

@@ -142,7 +142,7 @@ public:
       case LPP_GPS:
         _pos += 9; break;
       case LPP_POLYLINE:
-        _pos += 8; break;  // TODO: this is MINIMUM
+        _pos += 8; break;  // TODO: this is MINIMIUM
       case LPP_GYROMETER:
       case LPP_ACCELEROMETER:
         _pos += 6; break;

src/helpers/stm32/InternalFileSystem.cpp

@@ -37,7 +37,7 @@ static int _internal_flash_read(const struct lfs_config *c, lfs_block_t block, l
 }    
 
 // Program a region in a block. The block must have previously
-// been erased. Negative error codes are propagated to the user.
+// been erased. Negative error codes are propogated to the user.
 // May return LFS_ERR_CORRUPT if the block should be considered bad.
 static int _internal_flash_prog(const struct lfs_config *c, lfs_block_t block, lfs_off_t off, const void *buffer, lfs_size_t size)
 {    
@@ -62,7 +62,7 @@ static int _internal_flash_prog(const struct lfs_config *c, lfs_block_t block, l
 
 // Erase a block. A block must be erased before being programmed.
 // The state of an erased block is undefined. Negative error codes
-// are propagated to the user.
+// are propogated to the user.
 // May return LFS_ERR_CORRUPT if the block should be considered bad.
 static int _internal_flash_erase(const struct lfs_config *c, lfs_block_t block)
 {   
@@ -87,7 +87,7 @@ static int _internal_flash_erase(const struct lfs_config *c, lfs_block_t block)
 }   
 
 // Sync the state of the underlying block device. Negative error codes
-// are propagated to the user.
+// are propogated to the user.
 static int _internal_flash_sync(const struct lfs_config *c)
 {    
     return LFS_ERR_OK; // don't need sync

src/helpers/ui/OLEDDisplay.cpp

@@ -1166,7 +1166,7 @@ char DefaultFontTableLookup(const uint8_t ch) {
 	uint8_t last = LASTCHAR;   // get last char
 	LASTCHAR = ch;
 
-	switch (last) {    // conversion depending on first UTF8-character
+	switch (last) {    // conversion depnding on first UTF8-character
 		case 0xC2: return (uint8_t) ch;
 		case 0xC3: return (uint8_t) (ch | 0xC0);
 		case 0x82: if (ch == 0xAC) return (uint8_t) 0x80;    // special case Euro-symbol

src/helpers/ui/ST7735Display.cpp

@@ -1,400 +1,12 @@
 #include "ST7735Display.h"
 
-//#include <Fonts/GFXFF/FreeSans9pt7b.h>
-
-// Optimised ST7735 display driver, derived from Adafruit_ST7735 library.
-
-#define ST_CMD_DELAY 0x80 // special signifier for command lists
-
-#define ST77XX_NOP 0x00
-#define ST77XX_SWRESET 0x01
-#define ST77XX_RDDID 0x04
-#define ST77XX_RDDST 0x09
-
-#define ST77XX_SLPIN 0x10
-#define ST77XX_SLPOUT 0x11
-#define ST77XX_PTLON 0x12
-#define ST77XX_NORON 0x13
-
-#define ST77XX_INVOFF 0x20
-#define ST77XX_INVON 0x21
-#define ST77XX_DISPOFF 0x28
-#define ST77XX_DISPON 0x29
-#define ST77XX_CASET 0x2A
-#define ST77XX_RASET 0x2B
-#define ST77XX_RAMWR 0x2C
-#define ST77XX_RAMRD 0x2E
-
-#define ST77XX_PTLAR 0x30
-#define ST77XX_TEOFF 0x34
-#define ST77XX_TEON 0x35
-#define ST77XX_MADCTL 0x36
-#define ST77XX_COLMOD 0x3A
-
-#define ST77XX_MADCTL_MY 0x80
-#define ST77XX_MADCTL_MX 0x40
-#define ST77XX_MADCTL_MV 0x20
-#define ST77XX_MADCTL_ML 0x10
-#define ST77XX_MADCTL_RGB 0x00
-
-#define ST77XX_RDID1 0xDA
-#define ST77XX_RDID2 0xDB
-#define ST77XX_RDID3 0xDC
-#define ST77XX_RDID4 0xDD
-
-// Some ready-made 16-bit ('565') color settings:
-#define ST77XX_BLACK 0x0000
-#define ST77XX_WHITE 0xFFFF
-#define ST77XX_RED 0xF800
-#define ST77XX_GREEN 0x07E0
-#define ST77XX_BLUE 0x001F
-#define ST77XX_CYAN 0x07FF
-#define ST77XX_MAGENTA 0xF81F
-#define ST77XX_YELLOW 0xFFE0
-#define ST77XX_ORANGE 0xFC00
-
-
-// some flags for initR() :(
-#define INITR_GREENTAB 0x00
-#define INITR_REDTAB 0x01
-#define INITR_BLACKTAB 0x02
-#define INITR_18GREENTAB INITR_GREENTAB
-#define INITR_18REDTAB INITR_REDTAB
-#define INITR_18BLACKTAB INITR_BLACKTAB
-#define INITR_144GREENTAB 0x01
-#define INITR_MINI160x80 0x04
-#define INITR_HALLOWING 0x05
-#define INITR_MINI160x80_PLUGIN 0x06
-
-// Some register settings
-#define ST7735_MADCTL_BGR 0x08
-#define ST7735_MADCTL_MH 0x04
-
-#define ST7735_FRMCTR1 0xB1
-#define ST7735_FRMCTR2 0xB2
-#define ST7735_FRMCTR3 0xB3
-#define ST7735_INVCTR 0xB4
-#define ST7735_DISSET5 0xB6
-
-#define ST7735_PWCTR1 0xC0
-#define ST7735_PWCTR2 0xC1
-#define ST7735_PWCTR3 0xC2
-#define ST7735_PWCTR4 0xC3
-#define ST7735_PWCTR5 0xC4
-#define ST7735_VMCTR1 0xC5
-
-#define ST7735_PWCTR6 0xFC
-
-#define ST7735_GMCTRP1 0xE0
-#define ST7735_GMCTRN1 0xE1
-
-// Some ready-made 16-bit ('565') color settings:
-#define ST7735_BLACK ST77XX_BLACK
-#define ST7735_WHITE ST77XX_WHITE
-#define ST7735_RED ST77XX_RED
-#define ST7735_GREEN ST77XX_GREEN
-#define ST7735_BLUE ST77XX_BLUE
-#define ST7735_CYAN ST77XX_CYAN
-#define ST7735_MAGENTA ST77XX_MAGENTA
-#define ST7735_YELLOW ST77XX_YELLOW
-#define ST7735_ORANGE ST77XX_ORANGE
-
-static TFT_eSPI lcd = TFT_eSPI(160, 80);
-static uint32_t curr_color;
-
-#define  _spi   (&SPI1)
-
-SPISettings  _spiSettings = SPISettings(40000000, MSBFIRST, SPI_MODE0);
-
-// clang-format off
-static const uint8_t PROGMEM
-  Bcmd[] = {                        // Init commands for 7735B screens
-    18,                             // 18 commands in list:
-    ST77XX_SWRESET,   ST_CMD_DELAY, //  1: Software reset, no args, w/delay
-      50,                           //     50 ms delay
-    ST77XX_SLPOUT,    ST_CMD_DELAY, //  2: Out of sleep mode, no args, w/delay
-      255,                          //     255 = max (500 ms) delay
-    ST77XX_COLMOD,  1+ST_CMD_DELAY, //  3: Set color mode, 1 arg + delay:
-      0x05,                         //     16-bit color
-      10,                           //     10 ms delay
-    ST7735_FRMCTR1, 3+ST_CMD_DELAY, //  4: Frame rate control, 3 args + delay:
-      0x00,                         //     fastest refresh
-      0x06,                         //     6 lines front porch
-      0x03,                         //     3 lines back porch
-      10,                           //     10 ms delay
-    ST77XX_MADCTL,  1,              //  5: Mem access ctl (directions), 1 arg:
-      0x08,                         //     Row/col addr, bottom-top refresh
-    ST7735_DISSET5, 2,              //  6: Display settings #5, 2 args:
-      0x15,                         //     1 clk cycle nonoverlap, 2 cycle gate
-                                    //     rise, 3 cycle osc equalize
-      0x02,                         //     Fix on VTL
-    ST7735_INVCTR,  1,              //  7: Display inversion control, 1 arg:
-      0x0,                          //     Line inversion
-    ST7735_PWCTR1,  2+ST_CMD_DELAY, //  8: Power control, 2 args + delay:
-      0x02,                         //     GVDD = 4.7V
-      0x70,                         //     1.0uA
-      10,                           //     10 ms delay
-    ST7735_PWCTR2,  1,              //  9: Power control, 1 arg, no delay:
-      0x05,                         //     VGH = 14.7V, VGL = -7.35V
-    ST7735_PWCTR3,  2,              // 10: Power control, 2 args, no delay:
-      0x01,                         //     Opamp current small
-      0x02,                         //     Boost frequency
-    ST7735_VMCTR1,  2+ST_CMD_DELAY, // 11: Power control, 2 args + delay:
-      0x3C,                         //     VCOMH = 4V
-      0x38,                         //     VCOML = -1.1V
-      10,                           //     10 ms delay
-    ST7735_PWCTR6,  2,              // 12: Power control, 2 args, no delay:
-      0x11, 0x15,
-    ST7735_GMCTRP1,16,              // 13: Gamma Adjustments (pos. polarity), 16 args + delay:
-      0x09, 0x16, 0x09, 0x20,       //     (Not entirely necessary, but provides
-      0x21, 0x1B, 0x13, 0x19,       //      accurate colors)
-      0x17, 0x15, 0x1E, 0x2B,
-      0x04, 0x05, 0x02, 0x0E,
-    ST7735_GMCTRN1,16+ST_CMD_DELAY, // 14: Gamma Adjustments (neg. polarity), 16 args + delay:
-      0x0B, 0x14, 0x08, 0x1E,       //     (Not entirely necessary, but provides
-      0x22, 0x1D, 0x18, 0x1E,       //      accurate colors)
-      0x1B, 0x1A, 0x24, 0x2B,
-      0x06, 0x06, 0x02, 0x0F,
-      10,                           //     10 ms delay
-    ST77XX_CASET,   4,              // 15: Column addr set, 4 args, no delay:
-      0x00, 0x02,                   //     XSTART = 2
-      0x00, 0x81,                   //     XEND = 129
-    ST77XX_RASET,   4,              // 16: Row addr set, 4 args, no delay:
-      0x00, 0x02,                   //     XSTART = 1
-      0x00, 0x81,                   //     XEND = 160
-    ST77XX_NORON,     ST_CMD_DELAY, // 17: Normal display on, no args, w/delay
-      10,                           //     10 ms delay
-    ST77XX_DISPON,    ST_CMD_DELAY, // 18: Main screen turn on, no args, delay
-      255 },                        //     255 = max (500 ms) delay
-
-  Rcmd1[] = {                       // 7735R init, part 1 (red or green tab)
-    14,                             // 14 commands in list:
-    /*ST77XX_SWRESET,   ST_CMD_DELAY, //  1: Software reset, 0 args, w/delay
-      150,  */                        //     150 ms delay
-    ST77XX_SLPOUT,    ST_CMD_DELAY, //  2: Out of sleep mode, 0 args, w/delay
-      120,                          //     120 ms delay
-    ST7735_FRMCTR1, 3,              //  3: Framerate ctrl - normal mode, 3 arg:
-      0x01, 0x2C, 0x2D,             //     Rate = fosc/(1x2+40) * (LINE+2C+2D)
-    ST7735_FRMCTR2, 3,              //  4: Framerate ctrl - idle mode, 3 args:
-      0x01, 0x2C, 0x2D,             //     Rate = fosc/(1x2+40) * (LINE+2C+2D)
-    ST7735_FRMCTR3, 6,              //  5: Framerate - partial mode, 6 args:
-      0x01, 0x2C, 0x2D,             //     Dot inversion mode
-      0x01, 0x2C, 0x2D,             //     Line inversion mode
-    ST7735_INVCTR,  1,              //  6: Display inversion ctrl, 1 arg:
-      0x07,                         //     No inversion
-    ST7735_PWCTR1,  3,              //  7: Power control, 3 args, no delay:
-      0xA2,
-      0x02,                         //     -4.6V
-      0x84,                         //     AUTO mode
-    ST7735_PWCTR2,  1,              //  8: Power control, 1 arg, no delay:
-      0xC5,                         //     VGH25=2.4C VGSEL=-10 VGH=3 * AVDD
-    ST7735_PWCTR3,  2,              //  9: Power control, 2 args, no delay:
-      0x0A,                         //     Opamp current small
-      0x00,                         //     Boost frequency
-    ST7735_PWCTR4,  2,              // 10: Power control, 2 args, no delay:
-      0x8A,                         //     BCLK/2,
-      0x2A,                         //     opamp current small & medium low
-    ST7735_PWCTR5,  2,              // 11: Power control, 2 args, no delay:
-      0x8A, 0xEE,
-    ST7735_VMCTR1,  1,              // 12: Power control, 1 arg, no delay:
-      0x0E,
-    ST77XX_INVOFF,  0,              // 13: Don't invert display, no args
-    ST77XX_MADCTL,  1,              // 14: Mem access ctl (directions), 1 arg:
-      0xC8,                         //     row/col addr, bottom-top refresh
-    ST77XX_COLMOD,  1,              // 15: set color mode, 1 arg, no delay:
-      0x05 },                       //     16-bit color
-
-  Rcmd2green[] = {                  // 7735R init, part 2 (green tab only)
-    2,                              //  2 commands in list:
-    ST77XX_CASET,   4,              //  1: Column addr set, 4 args, no delay:
-      0x00, 0x02,                   //     XSTART = 0
-      0x00, 0x7F+0x02,              //     XEND = 127
-    ST77XX_RASET,   4,              //  2: Row addr set, 4 args, no delay:
-      0x00, 0x01,                   //     XSTART = 0
-      0x00, 0x9F+0x01 },            //     XEND = 159
-
-  Rcmd2red[] = {                    // 7735R init, part 2 (red tab only)
-    2,                              //  2 commands in list:
-    ST77XX_CASET,   4,              //  1: Column addr set, 4 args, no delay:
-      0x00, 0x00,                   //     XSTART = 0
-      0x00, 0x7F,                   //     XEND = 127
-    ST77XX_RASET,   4,              //  2: Row addr set, 4 args, no delay:
-      0x00, 0x00,                   //     XSTART = 0
-      0x00, 0x9F },                 //     XEND = 159
-
-  Rcmd2green144[] = {               // 7735R init, part 2 (green 1.44 tab)
-    2,                              //  2 commands in list:
-    ST77XX_CASET,   4,              //  1: Column addr set, 4 args, no delay:
-      0x00, 0x00,                   //     XSTART = 0
-      0x00, 0x7F,                   //     XEND = 127
-    ST77XX_RASET,   4,              //  2: Row addr set, 4 args, no delay:
-      0x00, 0x00,                   //     XSTART = 0
-      0x00, 0x7F },                 //     XEND = 127
-
-  Rcmd2green160x80[] = {            // 7735R init, part 2 (mini 160x80)
-    2,                              //  2 commands in list:
-    ST77XX_CASET,   4,              //  1: Column addr set, 4 args, no delay:
-      0x00, 0x00,                   //     XSTART = 0
-      0x00, 0x4F,                   //     XEND = 79
-    ST77XX_RASET,   4,              //  2: Row addr set, 4 args, no delay:
-      0x00, 0x00,                   //     XSTART = 0
-      0x00, 0x9F },                 //     XEND = 159
-
-  Rcmd2green160x80plugin[] = {      // 7735R init, part 2 (mini 160x80 with plugin FPC)
-    3,                              //  3 commands in list:
-    ST77XX_INVON,  0,              //   1: Display is inverted
-    ST77XX_CASET,   4,              //  2: Column addr set, 4 args, no delay:
-      0x00, 0x00,                   //     XSTART = 0
-      0x00, 0x4F,                   //     XEND = 79
-    ST77XX_RASET,   4,              //  3: Row addr set, 4 args, no delay:
-      0x00, 0x00,                   //     XSTART = 0
-      0x00, 0x9F },                 //     XEND = 159
-
-  Rcmd3[] = {                       // 7735R init, part 3 (red or green tab)
-    2,                              //  2 commands in list:
-    ST7735_GMCTRP1, 16      ,       //  1: Gamma Adjustments (pos. polarity), 16 args + delay:
-      0x02, 0x1c, 0x07, 0x12,       //     (Not entirely necessary, but provides
-      0x37, 0x32, 0x29, 0x2d,       //      accurate colors)
-      0x29, 0x25, 0x2B, 0x39,
-      0x00, 0x01, 0x03, 0x10,
-    ST7735_GMCTRN1, 16      ,       //  2: Gamma Adjustments (neg. polarity), 16 args + delay:
-      0x03, 0x1d, 0x07, 0x06,       //     (Not entirely necessary, but provides
-      0x2E, 0x2C, 0x29, 0x2D,       //      accurate colors)
-      0x2E, 0x2E, 0x37, 0x3F,
-      0x00, 0x00, 0x02, 0x10 };                        //     100 ms delay
-
-static int16_t _xstart = 0;          ///< Internal framebuffer X offset
-static int16_t _ystart = 0;          ///< Internal framebuffer Y offset
-static uint8_t _colstart = 0;   ///< Some displays need this changed to offset
-static uint8_t _rowstart = 0;       ///< Some displays need this changed to offset
-static uint8_t rotation = 0;
-static int16_t _width = 0;       ///< Display width as modified by current rotation
-static int16_t _height = 0;      ///< Display height as modified by current rotation
-
-static void set_CS(uint8_t level) {
-  //if (_cs != (uint8_t) -1) {
-    digitalWrite(PIN_TFT_CS, level);
-  //}
-}
-static void sendCommand(uint8_t com) {
-    set_CS(HIGH);
-    digitalWrite(PIN_TFT_DC, LOW);
-    set_CS(LOW);
-    _spi->beginTransaction(_spiSettings);
-    _spi->transfer(com);
-    _spi->endTransaction();
-    set_CS(HIGH);
-    digitalWrite(PIN_TFT_DC, HIGH);
-}
-    
-static void WriteData(uint8_t data) {
-    digitalWrite(PIN_TFT_CS, LOW);
-    _spi->beginTransaction(_spiSettings);
-    _spi->transfer(data);
-    _spi->endTransaction();
-    digitalWrite(PIN_TFT_CS, HIGH);
-}
-static void SPI_WRITE32(uint32_t l) {
-    _spi->transfer(l >> 24);
-    _spi->transfer(l >> 16);
-    _spi->transfer(l >> 8);
-    _spi->transfer(l);
-}
-static void writeCommand(uint8_t cmd) {
-    digitalWrite(PIN_TFT_DC, LOW);
-    _spi->transfer(cmd);
-    digitalWrite(PIN_TFT_DC, HIGH);
-}
-
-static void displayInit(const uint8_t *addr) {
-  uint8_t numCommands, cmd, numArgs;
-  uint16_t ms;
-
-  numCommands = pgm_read_byte(addr++); // Number of commands to follow
-  while (numCommands--) {              // For each command...
-    cmd = pgm_read_byte(addr++);       // Read command
-    numArgs = pgm_read_byte(addr++);   // Number of args to follow
-    ms = numArgs & ST_CMD_DELAY;       // If hibit set, delay follows args
-    numArgs &= ~ST_CMD_DELAY;          // Mask out delay bit
-    sendCommand(cmd);
-    for (int k = 0; k < numArgs; k++) {
-      WriteData(addr[k]);
-    }
-    addr += numArgs;
-
-    if (ms) {
-      ms = pgm_read_byte(addr++); // Read post-command delay time (ms)
-      if (ms == 255)
-        ms = 500; // If 255, delay for 500 ms
-      delay(ms);
-    }
-  }
-}
-
-static void setRotation(uint8_t m) {
-  uint8_t madctl = 0;
-
-  rotation = m & 3; // can't be higher than 3
-
-  switch (rotation) {
-  case 0:
-    madctl = ST77XX_MADCTL_MX | ST77XX_MADCTL_MY | ST7735_MADCTL_BGR;
-
-    _height = 160;
-    _width = 80;
-    _xstart = _colstart;
-    _ystart = _rowstart;
-    break;
-  case 1:
-    madctl = ST77XX_MADCTL_MY | ST77XX_MADCTL_MV | ST7735_MADCTL_BGR;
-
-    _width = 160;
-    _height = 80;
-    _ystart = _colstart;
-    _xstart = _rowstart;
-    break;
-  case 2:
-    madctl = ST7735_MADCTL_BGR;
-
-    _height = 160;
-    _width = 80;
-    _xstart = _colstart;
-    _ystart = _rowstart;
-    break;
-  case 3:
-    madctl = ST77XX_MADCTL_MX | ST77XX_MADCTL_MV | ST7735_MADCTL_BGR;
-
-    _width = 160;
-    _height = 80;
-    _ystart = _colstart;
-    _xstart = _rowstart;
-    break;
-  }
-
-  sendCommand(ST77XX_MADCTL);
-  WriteData(madctl);
-}
-
-static void setAddrWindow(uint16_t x, uint16_t y, uint16_t w, uint16_t h) {
-  x += _xstart;
-  y += _ystart;
-  uint32_t xa = ((uint32_t)x << 16) | (x + w - 1);
-  uint32_t ya = ((uint32_t)y << 16) | (y + h - 1);
-
-  writeCommand(ST77XX_CASET); // Column addr set
-  SPI_WRITE32(xa);
-
-  writeCommand(ST77XX_RASET); // Row addr set
-  SPI_WRITE32(ya);
-
-  writeCommand(ST77XX_RAMWR); // write to RAM
-}
+#ifndef DISPLAY_ROTATION
+  #define DISPLAY_ROTATION 2
+#endif
 
 #define SCALE_X  1.25f     // 160 / 128
 #define SCALE_Y  1.25f      // 80 / 64
 
-static TFT_eSprite *sprite = NULL;
-
 bool ST7735Display::i2c_probe(TwoWire& wire, uint8_t addr) {
   return true;
 /*
@@ -404,103 +16,53 @@ bool ST7735Display::i2c_probe(TwoWire& wire, uint8_t addr) {
 */
 }
 
-#ifndef PIN_TFT_LEDA_CTL_ACTIVE
-  #define PIN_TFT_LEDA_CTL_ACTIVE  HIGH
-#endif
-
 bool ST7735Display::begin() {
-  if (!sprite) {
-    // alloc offscreen canvas
-    sprite = new TFT_eSprite(&lcd);
-    if (sprite) {
-      if (sprite->createSprite(160, 80)) {
-        sprite->fillScreen(ST77XX_BLACK);
-        sprite->setTextColor(curr_color = ST77XX_WHITE);
-      } else {
-        Serial.printf("ST7735Display: failed to alloc canvas pixels");
-      }
-    } else {
-      Serial.printf("ST7735Display: failed to alloc canvas");
-    }
-  }
-  
   if (!_isOn) {
     if (_peripher_power) _peripher_power->claim();
 
-    delay(100); // TEMP!!
-    pinMode(PIN_TFT_RST, OUTPUT);
-    pinMode(PIN_TFT_CS, OUTPUT);
-    pinMode(PIN_TFT_DC, OUTPUT);
     pinMode(PIN_TFT_LEDA_CTL, OUTPUT);
-
-#ifdef ESP_PLATFORM
-    _spi->begin(_clk,_miso,_mosi,-1);
+#if defined(PIN_TFT_LEDA_CTL_ACTIVE)
+    digitalWrite(PIN_TFT_LEDA_CTL, PIN_TFT_LEDA_CTL_ACTIVE);
 #else
-    _spi->begin(); 
+    digitalWrite(PIN_TFT_LEDA_CTL, HIGH); 
 #endif
-    _spi->setClockDivider(SPI_CLOCK_DIV2);
+    digitalWrite(PIN_TFT_RST, HIGH);
 
-    _height = 80;
-    _width = 160;
-    _colstart = 24;
-    _rowstart = 0;
-
-    _resetAndInit();
-    
-    sendCommand(ST77XX_DISPON);
+#if defined(HELTEC_T1)
+    display.initR(INITR_MINI160x80);
+    display.setRotation(DISPLAY_ROTATION);
+#elif defined(HELTEC_TRACKER_V2) || defined(HELTEC_T096)
+    display.initR(INITR_MINI160x80);
+    display.setRotation(DISPLAY_ROTATION);
+    uint8_t madctl = ST77XX_MADCTL_MY | ST77XX_MADCTL_MV |ST7735_MADCTL_BGR;//Adjust color to BGR
+    display.sendCommand(ST77XX_MADCTL, &madctl, 1);
+#else
+    display.initR(INITR_MINI160x80_PLUGIN);
+    display.setRotation(DISPLAY_ROTATION);
+#endif
+    display.setSPISpeed(40000000);
+    display.fillScreen(ST77XX_BLACK);
+    display.setTextColor(ST77XX_WHITE);
+    display.setTextSize(2); 
+    display.cp437(true);         // Use full 256 char 'Code Page 437' font
     
     _isOn = true;
   }
   return true;
 }
 
-void ST7735Display::_resetAndInit() {
-    // Pulse Reset low for 10ms
-    digitalWrite(PIN_TFT_RST, HIGH);
-    delay(2);
-    digitalWrite(PIN_TFT_RST, LOW);
-    delay(10);
-    digitalWrite(PIN_TFT_RST, HIGH);
-    delay(2);
-
-    // run init commands
-    displayInit(Rcmd1);
-#if defined(HELTEC_TRACKER_V2) || defined(HELTEC_T096)
-    displayInit(Rcmd2green160x80);
-    //uint8_t madctl = ST77XX_MADCTL_MY | ST77XX_MADCTL_MV |ST7735_MADCTL_BGR;//Adjust color to BGR
-    //display.sendCommand(ST77XX_MADCTL, &madctl, 1);
-#endif
-    displayInit(Rcmd3);
-    setRotation(DISPLAY_ROTATION);
-    
-    // clear the buffer before display on
-    sprite->fillScreen(ST77XX_BLACK);
-    endFrame();
-    
-    // turn on backlight
-    digitalWrite(PIN_TFT_LEDA_CTL, PIN_TFT_LEDA_CTL_ACTIVE);
-
-}
-
 void ST7735Display::turnOn() {
-  if (!_isOn) {
-    if (_peripher_power) _peripher_power->claim();
-    _resetAndInit();
-    sendCommand(ST77XX_DISPON);
-
-    // Now turn on the backlight
-    // digitalWrite(PIN_TFT_LEDA_CTL, PIN_TFT_LEDA_CTL_ACTIVE);
-    _isOn = true;
-  }
+  ST7735Display::begin();
 }
 
 void ST7735Display::turnOff() {
   if (_isOn) {
-    sendCommand(ST77XX_DISPOFF);
-
-    //digitalWrite(PIN_TFT_RST, LOW);
-    // Now turn off the backlight
+    digitalWrite(PIN_TFT_RST, LOW);
+#if defined(PIN_TFT_LEDA_CTL_ACTIVE)
     digitalWrite(PIN_TFT_LEDA_CTL, !PIN_TFT_LEDA_CTL_ACTIVE);
+#else
+    digitalWrite(PIN_TFT_LEDA_CTL, LOW); 
+#endif
     _isOn = false;
 
     if (_peripher_power) _peripher_power->release();
@@ -508,90 +70,78 @@ void ST7735Display::turnOff() {
 }
 
 void ST7735Display::clear() {
-  sprite->fillScreen(ST77XX_BLACK);
+  //Serial.println("DBG: display.Clear");
+  display.fillScreen(ST77XX_BLACK);
 }
 
 void ST7735Display::startFrame(Color bkg) {
-  sprite->fillScreen(ST77XX_BLACK);
-  sprite->setTextColor(curr_color = ST77XX_WHITE);
-  sprite->setFreeFont();
-  sprite->setTextSize(1);      // This one affects size of Please wait... message
-  //sprite->cp437(true);         // Use full 256 char 'Code Page 437' font
+  display.fillScreen(0x00);
+  display.setTextColor(ST77XX_WHITE);
+  display.setTextSize(1);      // This one affects size of Please wait... message
+  display.cp437(true);         // Use full 256 char 'Code Page 437' font
 }
 
 void ST7735Display::setTextSize(int sz) {
-  sprite->setTextSize(sz);
+  display.setTextSize(sz);
 }
 
 void ST7735Display::setColor(Color c) {
   switch (c) {
     case DisplayDriver::DARK :
-      curr_color = ST77XX_BLACK;
+      _color = ST77XX_BLACK;
       break;
     case DisplayDriver::LIGHT : 
-      curr_color = ST77XX_WHITE;
+      _color = ST77XX_WHITE;
       break;
     case DisplayDriver::RED : 
-      curr_color = ST77XX_RED;
+      _color = ST77XX_RED;
       break;
     case DisplayDriver::GREEN : 
-      curr_color = ST77XX_GREEN;
+      _color = ST77XX_GREEN;
       break;
     case DisplayDriver::BLUE : 
-      curr_color = ST77XX_BLUE;
+      _color = ST77XX_BLUE;
       break;
     case DisplayDriver::YELLOW : 
-      curr_color = ST77XX_YELLOW;
+      _color = ST77XX_YELLOW;
       break;
     case DisplayDriver::ORANGE : 
-      curr_color = ST77XX_ORANGE;
+      _color = ST77XX_ORANGE;
       break;
     default:
-      curr_color = ST77XX_WHITE;
+      _color = ST77XX_WHITE;
       break;
   }
-  sprite->setTextColor(curr_color);
+  display.setTextColor(_color);
 }
 
 void ST7735Display::setCursor(int x, int y) {
-  sprite->setCursor(x*SCALE_X, y*SCALE_Y);
+  display.setCursor(x*SCALE_X, y*SCALE_Y);
 }
 
 void ST7735Display::print(const char* str) {
-  sprite->print(str);
+  display.print(str);
 }
 
 void ST7735Display::fillRect(int x, int y, int w, int h) {
-  sprite->fillRect(x*SCALE_X, y*SCALE_Y, w*SCALE_X, h*SCALE_Y, curr_color);
+  display.fillRect(x*SCALE_X, y*SCALE_Y, w*SCALE_X, h*SCALE_Y, _color);
 }
 
 void ST7735Display::drawRect(int x, int y, int w, int h) {
-  sprite->drawRect(x*SCALE_X, y*SCALE_Y, w*SCALE_X, h*SCALE_Y, curr_color);
+  display.drawRect(x*SCALE_X, y*SCALE_Y, w*SCALE_X, h*SCALE_Y, _color);
 }
 
 void ST7735Display::drawXbm(int x, int y, const uint8_t* bits, int w, int h) {
-  sprite->drawBitmap(x*SCALE_X, y*SCALE_Y, bits, w, h, curr_color);
+  display.drawBitmap(x*SCALE_X, y*SCALE_Y, bits, w, h, _color);
 }
 
 uint16_t ST7735Display::getTextWidth(const char* str) {
-  return sprite->textWidth(str) / SCALE_X;
+  int16_t x1, y1;
+  uint16_t w, h;
+  display.getTextBounds(str, 0, 0, &x1, &y1, &w, &h);
+  return w / SCALE_X;
 }
 
 void ST7735Display::endFrame() {
-  // blit the canvas buffer to LCD
-  set_CS(LOW);
-  _spi->beginTransaction(_spiSettings);
-  uint16_t x, y;
-  uint16_t* pixels = (uint16_t *) ((TFT_eSprite *) sprite)->getPointer();
-  for (y = 0; y < 80; y++, pixels += 160) {
-    setAddrWindow(0, y, 160, 1);
-#ifdef ESP_PLATFORM
-    _spi->transferBytes((uint8_t *)pixels, NULL, 2 * 160);
-#else
-    _spi->transfer(pixels, NULL, 2 * 160);
-#endif
-  }
-
-  _spi->endTransaction();
-  set_CS(HIGH);
+  // display.display();
 }

src/helpers/ui/ST7735Display.h

@@ -3,25 +3,28 @@
 #include "DisplayDriver.h"
 #include <Wire.h>
 #include <SPI.h>
-#include "TFT_eSPI.h"
+#include <Adafruit_GFX.h>
+#include <Adafruit_ST7735.h>
 #include <helpers/RefCountedDigitalPin.h>
 
 class ST7735Display : public DisplayDriver {
+  Adafruit_ST7735 display;
   bool _isOn;
+  uint16_t _color;
   RefCountedDigitalPin* _peripher_power;
 
   bool i2c_probe(TwoWire& wire, uint8_t addr);
 public:
 #ifdef USE_PIN_TFT
   ST7735Display(RefCountedDigitalPin* peripher_power=NULL) : DisplayDriver(128, 64), 
-    //  display(PIN_TFT_CS, PIN_TFT_DC, PIN_TFT_SDA, PIN_TFT_SCL, PIN_TFT_RST),
+      display(PIN_TFT_CS, PIN_TFT_DC, PIN_TFT_SDA, PIN_TFT_SCL, PIN_TFT_RST),
       _peripher_power(peripher_power)
   {
     _isOn = false;
   }
 #else
   ST7735Display(RefCountedDigitalPin* peripher_power=NULL) : DisplayDriver(128, 64),
-    //  display(&SPI1, PIN_TFT_CS, PIN_TFT_DC, PIN_TFT_RST),
+      display(&SPI1, PIN_TFT_CS, PIN_TFT_DC, PIN_TFT_RST),
       _peripher_power(peripher_power)
   {
     _isOn = false;
@@ -43,7 +46,4 @@ public:
   void drawXbm(int x, int y, const uint8_t* bits, int w, int h) override;
   uint16_t getTextWidth(const char* str) override;
   void endFrame() override;
-
-protected:
-  void _resetAndInit();
 };

test/mocks/SHA256.h

@@ -3,33 +3,12 @@
 #include <stdint.h>
 #include <stddef.h>
 
-// Mock SHA256 for native testing — deterministic but not cryptographic.
-// finalize() writes real (non-garbage) output so calculatePacketHash() produces
-// distinguishable results for packets with different payloads.
-#include <string.h>
-
+// Mock SHA256 class for testing
+// Provides minimal interface to allow Utils.cpp to compile
 class SHA256 {
-  uint8_t _state[32];
-  size_t _len;
 public:
-  SHA256() : _len(0) { memset(_state, 0, sizeof(_state)); }
-
-  void update(const void* data, size_t len) {
-    const uint8_t* bytes = static_cast<const uint8_t*>(data);
-    for (size_t i = 0; i < len; i++) {
-      uint8_t b = bytes[i];
-      _state[_len % 32] ^= b;
-      _state[(_len + 1) % 32] += (uint8_t)((b >> 1) | (b << 7));
-      _len++;
-    }
-  }
-
-  void finalize(uint8_t* hash, size_t hashLen) {
-    for (size_t i = 0; i < hashLen; i++) {
-      hash[i] = _state[i % 32];
-    }
-  }
-
+  void update(const uint8_t* data, size_t len) {}
+  void finalize(uint8_t* hash, size_t hashLen) {}
   void resetHMAC(const uint8_t* key, size_t keyLen) {}
   void finalizeHMAC(const uint8_t* key, size_t keyLen, uint8_t* hash, size_t hashLen) {}
 };

test/test_mesh_tables/test_simple_mesh_tables.cpp

@@ -1,103 +0,0 @@
-#include <gtest/gtest.h>
-#include "helpers/SimpleMeshTables.h"
-
-using namespace mesh;
-
-// Build a packet that calculatePacketHash() distinguishes by payload content.
-// header selects ROUTE_TYPE_FLOOD so isRouteDirect() returns false.
-static Packet makeFloodPacket(uint8_t seed) {
-    Packet p;
-    p.header = ROUTE_TYPE_FLOOD | (PAYLOAD_TYPE_ACK << PH_TYPE_SHIFT);
-    p.payload[0] = seed;
-    p.payload_len = 1;
-    p.path_len = 0;
-    return p;
-}
-
-static Packet makeDirectPacket(uint8_t seed) {
-    Packet p;
-    p.header = ROUTE_TYPE_DIRECT | (PAYLOAD_TYPE_ACK << PH_TYPE_SHIFT);
-    p.payload[0] = seed;
-    p.payload_len = 1;
-    p.path_len = 0;
-    return p;
-}
-
-// ── wasSeen: pure query ───────────────────────────────────────────────────────
-
-TEST(SimpleMeshTables, WasSeen_ReturnsFalseForUnseen) {
-    SimpleMeshTables t;
-    Packet p = makeFloodPacket(0x01);
-    EXPECT_FALSE(t.wasSeen(&p));
-}
-
-// wasSeen shouldn't change state
-TEST(SimpleMeshTables, WasSeen_IsPureQuery_DoesNotInsert) {
-    SimpleMeshTables t;
-    Packet p = makeFloodPacket(0x01);
-    EXPECT_FALSE(t.wasSeen(&p));
-    EXPECT_FALSE(t.wasSeen(&p));
-}
-
-// ── markSeen + wasSeen ───────────────────────────────────────────────────────
-
-TEST(SimpleMeshTables, MarkSeen_MakesWasSeenReturnTrue) {
-    SimpleMeshTables t;
-    Packet p = makeFloodPacket(0x01);
-    t.markSeen(&p);
-    EXPECT_TRUE(t.wasSeen(&p));
-}
-
-TEST(SimpleMeshTables, MarkSeen_DoesNotAffectOtherPackets) {
-    SimpleMeshTables t;
-    Packet p1 = makeFloodPacket(0x01);
-    Packet p2 = makeFloodPacket(0x02);
-    t.markSeen(&p1);
-    EXPECT_FALSE(t.wasSeen(&p2));
-}
-
-// Canonical pattern used at every onRecvPacket call site:
-//   if (!wasSeen(pkt)) { markSeen(pkt); process(pkt); }
-TEST(SimpleMeshTables, QueryThenMark_WorksCorrectly) {
-    SimpleMeshTables t;
-    Packet p = makeFloodPacket(0x01);
-    EXPECT_FALSE(t.wasSeen(&p));
-    t.markSeen(&p);
-    EXPECT_TRUE(t.wasSeen(&p));
-}
-
-// ── dup stats ────────────────────────────────────────────────────────────────
-
-TEST(SimpleMeshTables, WasSeen_IncrementsFloodDupStat) {
-    SimpleMeshTables t;
-    Packet p = makeFloodPacket(0x01);
-    t.markSeen(&p);
-    t.wasSeen(&p);
-    EXPECT_EQ(1u, t.getNumFloodDups());
-    EXPECT_EQ(0u, t.getNumDirectDups());
-}
-
-TEST(SimpleMeshTables, WasSeen_IncrementsDirectDupStat) {
-    SimpleMeshTables t;
-    Packet p = makeDirectPacket(0x01);
-    t.markSeen(&p);
-    t.wasSeen(&p);
-    EXPECT_EQ(0u, t.getNumFloodDups());
-    EXPECT_EQ(1u, t.getNumDirectDups());
-}
-
-// ── clear ────────────────────────────────────────────────────────────────────
-
-TEST(SimpleMeshTables, Clear_RemovesSeenPacket) {
-    SimpleMeshTables t;
-    Packet p = makeFloodPacket(0x01);
-    t.markSeen(&p);
-    ASSERT_TRUE(t.wasSeen(&p));
-    t.clear(&p);
-    EXPECT_FALSE(t.wasSeen(&p));
-}
-
-int main(int argc, char** argv) {
-    ::testing::InitGoogleTest(&argc, argv);
-    return RUN_ALL_TESTS();
-}

variants/heltec_mesh_solar/platformio.ini

@@ -1,6 +1,7 @@
 [Heltec_mesh_solar]
 extends = nrf52_base
 board = heltec_mesh_solar
+platform_packages = framework-arduinoadafruitnrf52
 board_build.ldscript = boards/nrf52840_s140_v6.ld
 build_flags =  ${nrf52_base.build_flags}
   -I src/helpers/nrf52

variants/heltec_t096/LoRaFEMControl.h

@@ -12,9 +12,8 @@ class LoRaFEMControl
     void setRxModeEnable(void);
     void setRxModeEnableWhenMCUSleep(void);
     void setLNAEnable(bool enabled);
-    bool isLnaCanControl(void) const { return lna_can_control; }
+    bool isLnaCanControl(void) { return lna_can_control; }
     void setLnaCanControl(bool can_control) { lna_can_control = can_control; }
-    bool isLNAEnabled(void) const { return lna_enabled; }
 
   private:
     bool lna_enabled = false;

variants/heltec_t096/T096Board.cpp

@@ -123,22 +123,4 @@ void T096Board::powerOff() {
 
 const char* T096Board::getManufacturerName() const {
   return "Heltec T096";
-}
-
-bool T096Board::setLoRaFemLnaEnabled(bool enable) {
-  if (!loRaFEMControl.isLnaCanControl()) {
-    return false;
-  }
-
-  loRaFEMControl.setLNAEnable(enable);
-  loRaFEMControl.setRxModeEnable();
-  return true;
-}
-
-bool T096Board::canControlLoRaFemLna() const {
-  return loRaFEMControl.isLnaCanControl();
-}
-
-bool T096Board::isLoRaFemLnaEnabled() const {
-  return loRaFEMControl.isLNAEnabled();
-}
+}

variants/heltec_t096/T096Board.h

@@ -25,7 +25,4 @@ public:
   uint16_t getBattMilliVolts() override;
   const char* getManufacturerName() const override ;
   void powerOff() override;
-  bool setLoRaFemLnaEnabled(bool enable) override;
-  bool canControlLoRaFemLna() const override;
-  bool isLoRaFemLnaEnabled() const override;
 };

variants/heltec_t096/platformio.ini

@@ -51,7 +51,7 @@ build_src_filter = ${nrf52_base.build_src_filter}
 lib_deps =
   ${nrf52_base.lib_deps}
   ${sensor_base.lib_deps}
-  bodmer/TFT_eSPI @ ^2.4.31
+  adafruit/Adafruit ST7735 and ST7789 Library @ ^1.11.0
 debug_tool = jlink
 upload_protocol = nrfutil
 

variants/heltec_t114/target.cpp

@@ -22,7 +22,7 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock);
 
 #if ENV_INCLUDE_GPS
 #include <helpers/sensors/MicroNMEALocationProvider.h>
-MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock);
+MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1);
 EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea);
 #else
 EnvironmentSensorManager sensors;

variants/heltec_tower_v2/HeltecTowerV2Board.cpp

@@ -1,103 +0,0 @@
-#include "HeltecTowerV2Board.h"
-
-#include <Arduino.h>
-#include <Wire.h>
-
-extern void variant_shutdown();
-
-#ifdef NRF52_POWER_MANAGEMENT
-const PowerMgtConfig power_config = {
-  .lpcomp_ain_channel = PWRMGT_LPCOMP_AIN,
-  .lpcomp_refsel = PWRMGT_LPCOMP_REFSEL,
-  .voltage_bootlock = PWRMGT_VOLTAGE_BOOTLOCK
-};
-
-void HeltecTowerV2Board::initiateShutdown(uint8_t reason) {
-  pinMode(PIN_GPS_EN, OUTPUT);
-  digitalWrite(PIN_GPS_EN, !PIN_GPS_EN_ACTIVE);
-  pinMode(PIN_GPS_STANDBY, OUTPUT);
-  digitalWrite(PIN_GPS_STANDBY, LOW);
-  pinMode(PIN_GPS_RESET, OUTPUT);
-  digitalWrite(PIN_GPS_RESET, GPS_RESET_MODE);
-  loRaFEMControl.setSleepModeEnable();
-
-  bool enable_lpcomp = (reason == SHUTDOWN_REASON_LOW_VOLTAGE ||
-                        reason == SHUTDOWN_REASON_BOOT_PROTECT);
-  pinMode(PIN_BAT_CTL, OUTPUT);
-  digitalWrite(PIN_BAT_CTL, enable_lpcomp ? HIGH : LOW);
-
-  if (enable_lpcomp) {
-    configureVoltageWake(power_config.lpcomp_ain_channel, power_config.lpcomp_refsel);
-  }
-
-  variant_shutdown();
-  enterSystemOff(reason);
-}
-#endif
-
-void HeltecTowerV2Board::begin() {
-  NRF52Board::begin();
-
-  pinMode(P_LORA_TX_LED, OUTPUT);
-  digitalWrite(P_LORA_TX_LED, !LED_STATE_ON);
-
-  pinMode(PIN_BAT_CTL, OUTPUT);
-  digitalWrite(PIN_BAT_CTL, LOW);
-
-#ifdef NRF52_POWER_MANAGEMENT
-  checkBootVoltage(&power_config);
-#endif
-
-  Wire.setPins(PIN_BOARD_SDA, PIN_BOARD_SCL);
-  Wire.begin();
-
-  pinMode(PIN_GPS_EN, OUTPUT);
-  digitalWrite(PIN_GPS_EN, !PIN_GPS_EN_ACTIVE);
-  pinMode(PIN_GPS_RESET, OUTPUT);
-  digitalWrite(PIN_GPS_RESET, GPS_RESET_MODE);
-  pinMode(PIN_GPS_STANDBY, OUTPUT);
-  digitalWrite(PIN_GPS_STANDBY, HIGH);
-  loRaFEMControl.init();
-}
-
-void HeltecTowerV2Board::onBeforeTransmit() {
-  digitalWrite(P_LORA_TX_LED, LED_STATE_ON);
-  loRaFEMControl.setTxModeEnable();
-}
-
-void HeltecTowerV2Board::onAfterTransmit() {
-  digitalWrite(P_LORA_TX_LED, !LED_STATE_ON);
-  loRaFEMControl.setRxModeEnable();
-}
-
-uint16_t HeltecTowerV2Board::getBattMilliVolts() {
-  analogReadResolution(12);
-  analogReference(VBAT_AR_INTERNAL);
-  pinMode(PIN_VBAT_READ, INPUT);
-  pinMode(PIN_BAT_CTL, OUTPUT);
-  digitalWrite(PIN_BAT_CTL, HIGH);
-
-  delay(10);
-  int adcvalue = analogRead(PIN_VBAT_READ);
-  digitalWrite(PIN_BAT_CTL, LOW);
-
-  return (uint16_t)((float)adcvalue * MV_LSB * ADC_MULTIPLIER);
-}
-
-const char* HeltecTowerV2Board::getManufacturerName() const {
-  return "Heltec Tower V2";
-}
-
-void HeltecTowerV2Board::powerOff() {
-  pinMode(PIN_GPS_EN, OUTPUT);
-  digitalWrite(PIN_GPS_EN, !PIN_GPS_EN_ACTIVE);
-  pinMode(PIN_GPS_STANDBY, OUTPUT);
-  digitalWrite(PIN_GPS_STANDBY, LOW);
-  pinMode(PIN_GPS_RESET, OUTPUT);
-  digitalWrite(PIN_GPS_RESET, GPS_RESET_MODE);
-  loRaFEMControl.setSleepModeEnable();
-  pinMode(PIN_BAT_CTL, OUTPUT);
-  digitalWrite(PIN_BAT_CTL, LOW);
-  variant_shutdown();
-  sd_power_system_off();
-}

variants/heltec_tower_v2/HeltecTowerV2Board.h

@@ -1,24 +0,0 @@
-#pragma once
-
-#include <Arduino.h>
-#include <MeshCore.h>
-#include <helpers/NRF52Board.h>
-#include "LoRaFEMControl.h"
-
-class HeltecTowerV2Board : public NRF52BoardDCDC {
-protected:
-#ifdef NRF52_POWER_MANAGEMENT
-  void initiateShutdown(uint8_t reason) override;
-#endif
-
-public:
-  LoRaFEMControl loRaFEMControl;
-
-  HeltecTowerV2Board() : NRF52Board("TOWER_V2_OTA") {}
-  void begin();
-  void onBeforeTransmit() override;
-  void onAfterTransmit() override;
-  uint16_t getBattMilliVolts() override;
-  const char* getManufacturerName() const override;
-  void powerOff() override;
-};

variants/heltec_tower_v2/LoRaFEMControl.cpp

@@ -1,40 +0,0 @@
-#include "LoRaFEMControl.h"
-
-#include <Arduino.h>
-#include "variant.h"
-
-static void enableFEMPower() {
-  bool wasOff = digitalRead(LORA_KCT8103L_EN) != HIGH;
-  digitalWrite(LORA_KCT8103L_EN, HIGH);
-  if (wasOff) {
-    delay(5);
-  }
-}
-
-void LoRaFEMControl::init() {
-  pinMode(LORA_KCT8103L_EN, OUTPUT);
-  digitalWrite(LORA_KCT8103L_EN, HIGH);
-  delay(1);
-  pinMode(LORA_KCT8103L_TX_RX, OUTPUT);
-  digitalWrite(LORA_KCT8103L_TX_RX, LOW);
-}
-
-void LoRaFEMControl::setSleepModeEnable() {
-  pinMode(LORA_KCT8103L_EN, OUTPUT);
-  digitalWrite(LORA_KCT8103L_EN, LOW);
-}
-
-void LoRaFEMControl::setTxModeEnable() {
-  enableFEMPower();
-  digitalWrite(LORA_KCT8103L_TX_RX, HIGH);
-}
-
-void LoRaFEMControl::setRxModeEnable() {
-  enableFEMPower();
-  digitalWrite(LORA_KCT8103L_TX_RX, LOW);
-}
-
-void LoRaFEMControl::setRxModeEnableWhenMCUSleep() {
-  enableFEMPower();
-  digitalWrite(LORA_KCT8103L_TX_RX, LOW);
-}

variants/heltec_tower_v2/LoRaFEMControl.h

@@ -1,13 +0,0 @@
-#pragma once
-
-class LoRaFEMControl {
-public:
-  LoRaFEMControl() {}
-  virtual ~LoRaFEMControl() {}
-
-  void init();
-  void setSleepModeEnable();
-  void setTxModeEnable();
-  void setRxModeEnable();
-  void setRxModeEnableWhenMCUSleep();
-};

variants/heltec_tower_v2/platformio.ini

@@ -1,104 +0,0 @@
-[Heltec_tower_v2]
-extends = nrf52_base
-board = heltec_tower_v2
-board_build.ldscript = boards/nrf52840_s140_v6.ld
-build_flags = ${nrf52_base.build_flags}
-  -D ENV_INCLUDE_GPS=1
-  -I lib/nrf52/s140_nrf52_6.1.1_API/include
-  -I lib/nrf52/s140_nrf52_6.1.1_API/include/nrf52
-  -I variants/heltec_tower_v2
-  -D HELTEC_TOWER_V2
-  -D NRF52_POWER_MANAGEMENT
-  -D RADIO_CLASS=CustomSX1262
-  -D WRAPPER_CLASS=CustomSX1262Wrapper
-  -D LORA_TX_POWER=12
-  -D MAX_LORA_TX_POWER=22 ; Max SX1262 output -> ~29dBm at antenna
-  -D SX126X_CURRENT_LIMIT=140
-  -D SX126X_RX_BOOSTED_GAIN=1
-build_src_filter = ${nrf52_base.build_src_filter}
-  +<helpers/*.cpp>
-  +<helpers/sensors>
-  +<../variants/heltec_tower_v2>
-lib_deps =
-  ${nrf52_base.lib_deps}
-  stevemarple/MicroNMEA @ ^2.0.6
-debug_tool = jlink
-upload_protocol = nrfutil
-
-[env:Heltec_tower_v2_repeater]
-extends = Heltec_tower_v2
-build_src_filter = ${Heltec_tower_v2.build_src_filter}
-  +<../examples/simple_repeater>
-build_flags =
-  ${Heltec_tower_v2.build_flags}
-  -D ADVERT_NAME='"Heltec_Tower_V2 Repeater"'
-  -D ADVERT_LAT=0.0
-  -D ADVERT_LON=0.0
-  -D ADMIN_PASSWORD='"password"'
-  -D MAX_NEIGHBOURS=50
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
-
-[env:Heltec_tower_v2_room_server]
-extends = Heltec_tower_v2
-build_src_filter = ${Heltec_tower_v2.build_src_filter}
-  +<../examples/simple_room_server>
-build_flags =
-  ${Heltec_tower_v2.build_flags}
-  -D ADVERT_NAME='"Heltec_Tower_V2 Room"'
-  -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
-
-[env:Heltec_tower_v2_companion_radio_ble]
-extends = Heltec_tower_v2
-board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld
-board_upload.maximum_size = 712704
-build_flags =
-  ${Heltec_tower_v2.build_flags}
-  -I examples/companion_radio/ui-new
-  -D DISPLAY_CLASS=NullDisplayDriver
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
-  -D BLE_PIN_CODE=123456
-;  -D BLE_DEBUG_LOGGING=1
-  -D OFFLINE_QUEUE_SIZE=256
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
-build_src_filter = ${Heltec_tower_v2.build_src_filter}
-  +<helpers/nrf52/SerialBLEInterface.cpp>
-  +<../examples/companion_radio/*.cpp>
-  +<../examples/companion_radio/ui-new/*.cpp>
-lib_deps =
-  ${Heltec_tower_v2.lib_deps}
-  densaugeo/base64 @ ~1.4.0
-
-[env:Heltec_tower_v2_companion_radio_usb]
-extends = Heltec_tower_v2
-board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld
-board_upload.maximum_size = 712704
-build_flags =
-  ${Heltec_tower_v2.build_flags}
-  -I examples/companion_radio/ui-new
-  -D DISPLAY_CLASS=NullDisplayDriver
-  -D MAX_CONTACTS=350
-  -D MAX_GROUP_CHANNELS=40
-;  -D BLE_PIN_CODE=123456
-;  -D BLE_DEBUG_LOGGING=1
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
-build_src_filter = ${Heltec_tower_v2.build_src_filter}
-  +<helpers/nrf52/*.cpp>
-  +<../examples/companion_radio/*.cpp>
-  +<../examples/companion_radio/ui-new/*.cpp>
-lib_deps =
-  ${Heltec_tower_v2.lib_deps}
-  densaugeo/base64 @ ~1.4.0
-
-[env:Heltec_tower_v2_kiss_modem]
-extends = Heltec_tower_v2
-build_src_filter = ${Heltec_tower_v2.build_src_filter}
-  +<../examples/kiss_modem/>

variants/heltec_tower_v2/target.cpp

@@ -1,31 +0,0 @@
-#include "target.h"
-
-#include <Arduino.h>
-#include <helpers/ArduinoHelpers.h>
-#include <helpers/sensors/MicroNMEALocationProvider.h>
-
-HeltecTowerV2Board 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);
-MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock);
-EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea);
-
-#ifdef DISPLAY_CLASS
-DISPLAY_CLASS display;
-MomentaryButton user_btn(PIN_USER_BTN, 1000, true);
-#endif
-
-bool radio_init() {
-  rtc_clock.begin(Wire);
-  return radio.std_init(&SPI);
-}
-
-mesh::LocalIdentity radio_new_identity() {
-  RadioNoiseListener rng(radio);
-  return mesh::LocalIdentity(&rng);
-}

variants/heltec_tower_v2/target.h

@@ -1,28 +0,0 @@
-#pragma once
-
-#define RADIOLIB_STATIC_ONLY 1
-#include <RadioLib.h>
-#include <HeltecTowerV2Board.h>
-#include <helpers/AutoDiscoverRTCClock.h>
-#include <helpers/radiolib/CustomSX1262Wrapper.h>
-#include <helpers/radiolib/RadioLibWrappers.h>
-#include <helpers/sensors/EnvironmentSensorManager.h>
-#include <helpers/sensors/LocationProvider.h>
-
-#ifdef DISPLAY_CLASS
-#include <helpers/ui/MomentaryButton.h>
-#include "helpers/ui/NullDisplayDriver.h"
-#endif
-
-extern HeltecTowerV2Board board;
-extern WRAPPER_CLASS radio_driver;
-extern AutoDiscoverRTCClock rtc_clock;
-extern EnvironmentSensorManager sensors;
-
-#ifdef DISPLAY_CLASS
-extern DISPLAY_CLASS display;
-extern MomentaryButton user_btn;
-#endif
-
-bool radio_init();
-mesh::LocalIdentity radio_new_identity();

variants/heltec_tower_v2/variant.cpp

@@ -1,42 +0,0 @@
-#include "variant.h"
-
-#include "Arduino.h"
-#include "nrf.h"
-#include "wiring_constants.h"
-#include "wiring_digital.h"
-
-const uint32_t g_ADigitalPinMap[] = {
-  0xff, 0xff, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
-  14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
-  27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
-  40, 41, 42, 43, 44, 45, 46, 47
-};
-
-void initVariant()
-{
-
-}
-
-void variant_shutdown()
-{
-  nrf_gpio_cfg_default(PIN_GPS_EN);
-  nrf_gpio_cfg_default(PIN_GPS_PPS);
-  nrf_gpio_cfg_default(PIN_GPS_RESET);
-  nrf_gpio_cfg_default(PIN_GPS_STANDBY);
-  nrf_gpio_cfg_default(GPS_RX_PIN);
-  nrf_gpio_cfg_default(GPS_TX_PIN);
-  pinMode(LORA_KCT8103L_EN, OUTPUT);
-  digitalWrite(LORA_KCT8103L_EN, LOW);
-  nrf_gpio_cfg_default(LORA_KCT8103L_TX_RX);
-  nrf_gpio_cfg_default(RF_PA_DETECT_PIN);
-  nrf_gpio_cfg_default(SX126X_CS);
-  nrf_gpio_cfg_default(SX126X_DIO1);
-  nrf_gpio_cfg_default(SX126X_BUSY);
-  nrf_gpio_cfg_default(SX126X_RESET);
-  nrf_gpio_cfg_default(PIN_SPI_MISO);
-  nrf_gpio_cfg_default(PIN_SPI_MOSI);
-  nrf_gpio_cfg_default(PIN_SPI_SCK);
-  nrf_gpio_cfg_default(PIN_LED);
-  detachInterrupt(PIN_GPS_PPS);
-  detachInterrupt(PIN_BUTTON1);
-}

variants/heltec_tower_v2/variant.h

@@ -1,108 +0,0 @@
-#pragma once
-
-#include "WVariant.h"
-
-#define USE_LFXO
-#define VARIANT_MCK (64000000ul)
-
-#define PINS_COUNT        (48)
-#define NUM_DIGITAL_PINS  (48)
-#define NUM_ANALOG_INPUTS (1)
-#define NUM_ANALOG_OUTPUTS (0)
-
-#define WIRE_INTERFACES_COUNT (1)
-#define PIN_WIRE_SDA (0 + 30)
-#define PIN_WIRE_SCL (0 + 5)
-#define PIN_BOARD_SDA PIN_WIRE_SDA
-#define PIN_BOARD_SCL PIN_WIRE_SCL
-
-#define SPI_INTERFACES_COUNT (1)
-#define PIN_SPI_MISO (0 + 23)
-#define PIN_SPI_MOSI (0 + 22)
-#define PIN_SPI_SCK  (0 + 19)
-#define PIN_SPI_NSS  LORA_CS
-
-#define LED_BUILTIN (32 + 15)
-#define PIN_LED     LED_BUILTIN
-#define LED_RED     (-1)
-#define LED_GREEN   (-1)
-#define LED_BLUE    (-1)
-#define LED_PIN     (-1)
-#define P_LORA_TX_LED LED_BUILTIN
-#define LED_STATE_ON LOW
-
-#define PIN_BUTTON1  (32 + 10)
-#define BUTTON_PIN   PIN_BUTTON1
-#define PIN_USER_BTN BUTTON_PIN
-
-#define USE_SX1262
-#define SX126X_CS    (0 + 24)
-#define LORA_CS      SX126X_CS
-#define SX126X_DIO1  (0 + 20)
-#define SX126X_BUSY  (0 + 17)
-#define SX126X_RESET (0 + 25)
-#define SX126X_DIO2_AS_RF_SWITCH
-#define SX126X_DIO3_TCXO_VOLTAGE 1.8
-
-#define P_LORA_NSS   LORA_CS
-#define P_LORA_DIO_1 SX126X_DIO1
-#define P_LORA_BUSY  SX126X_BUSY
-#define P_LORA_RESET SX126X_RESET
-#define P_LORA_MISO  PIN_SPI_MISO
-#define P_LORA_MOSI  PIN_SPI_MOSI
-#define P_LORA_SCLK  PIN_SPI_SCK
-
-#define USE_KCT8103L_PA_ONLY
-#define LORA_KCT8103L_EN      (0 + 15)
-#define LORA_KCT8103L_TX_RX   (0 + 16)
-#define LORA_PA_POWER         LORA_KCT8103L_EN
-#define RF_PA_DETECT_PIN      (0 + 13)
-#define RF_PA_HIGH_POWER_VALUE HIGH
-
-#define GPS_L76K
-#define GPS_RESET_MODE LOW
-#define PIN_GPS_RESET (32 + 6)
-#define PIN_GPS_RESET_ACTIVE GPS_RESET_MODE
-#define PIN_GPS_EN (0 + 7)
-#define PIN_GPS_EN_ACTIVE LOW
-#define GPS_EN_ACTIVE PIN_GPS_EN_ACTIVE
-#define PIN_GPS_STANDBY (32 + 2)
-#define PIN_GPS_PPS (32 + 4)
-#define GPS_BAUD_RATE 9600
-
-// Upstream names are from the GPS perspective. MeshCore's PIN_GPS_TX is the
-// CPU RX pin because EnvironmentSensorManager passes it as Serial1 RX.
-#define GPS_TX_PIN (32 + 7)
-#define GPS_RX_PIN (32 + 5)
-#define PIN_GPS_TX GPS_RX_PIN
-#define PIN_GPS_RX GPS_TX_PIN
-
-#define PIN_SERIAL1_RX PIN_GPS_TX
-#define PIN_SERIAL1_TX PIN_GPS_RX
-#define PIN_SERIAL2_RX (-1)
-#define PIN_SERIAL2_TX (-1)
-
-#define HAS_HARDWARE_WATCHDOG
-#define HARDWARE_WATCHDOG_DONE (0 + 9)
-#define HARDWARE_WATCHDOG_WAKE (0 + 10)
-#define HARDWARE_WATCHDOG_TIMEOUT_MS (8 * 60 * 1000)
-
-#define SERIAL_PRINT_PORT 0
-
-#define PIN_BAT_CTL (0 + 21)
-#define ADC_CTRL PIN_BAT_CTL
-#define ADC_CTRL_ENABLED HIGH
-#define BATTERY_PIN (0 + 4)
-#define PIN_VBAT_READ BATTERY_PIN
-#define ADC_RESOLUTION 14
-#define BATTERY_SENSE_RESOLUTION_BITS 12
-#define BATTERY_SENSE_RESOLUTION 4096.0
-#define AREF_VOLTAGE 3.0
-#define VBAT_AR_INTERNAL AR_INTERNAL_3_0
-#define ADC_MULTIPLIER (4.916F)
-#define MV_LSB (3000.0F / 4096.0F)
-
-#define NRF52_POWER_MANAGEMENT
-#define PWRMGT_VOLTAGE_BOOTLOCK 3100
-#define PWRMGT_LPCOMP_AIN 2
-#define PWRMGT_LPCOMP_REFSEL 1

variants/heltec_tracker_v2/HeltecTrackerV2Board.cpp

@@ -82,21 +82,3 @@ void HeltecTrackerV2Board::begin() {
   const char* HeltecTrackerV2Board::getManufacturerName() const {
     return "Heltec Tracker V2";
   }
-
-  bool HeltecTrackerV2Board::setLoRaFemLnaEnabled(bool enable) {
-    if (!loRaFEMControl.isLnaCanControl()) {
-      return false;
-    }
-
-    loRaFEMControl.setLNAEnable(enable);
-    loRaFEMControl.setRxModeEnable();
-    return true;
-  }
-
-  bool HeltecTrackerV2Board::canControlLoRaFemLna() const {
-    return loRaFEMControl.isLnaCanControl();
-  }
-
-  bool HeltecTrackerV2Board::isLoRaFemLnaEnabled() const {
-    return loRaFEMControl.isLNAEnabled();
-  }

variants/heltec_tracker_v2/HeltecTrackerV2Board.h

@@ -21,8 +21,5 @@ public:
   void powerOff() override;
   uint16_t getBattMilliVolts() override;
   const char* getManufacturerName() const override ;
-  bool setLoRaFemLnaEnabled(bool enable) override;
-  bool canControlLoRaFemLna() const override;
-  bool isLoRaFemLnaEnabled() const override;
 
 };

variants/heltec_tracker_v2/LoRaFEMControl.h

@@ -12,9 +12,8 @@ class LoRaFEMControl
     void setRxModeEnable(void);
     void setRxModeEnableWhenMCUSleep(void);
     void setLNAEnable(bool enabled);
-    bool isLnaCanControl(void) const { return lna_can_control; }
+    bool isLnaCanControl(void) { return lna_can_control; }
     void setLnaCanControl(bool can_control) { lna_can_control = can_control; }
-    bool isLNAEnabled(void) const { return lna_enabled; }
 
   private:
     bool lna_enabled = false;

variants/heltec_v4/HeltecV4Board.cpp

@@ -83,21 +83,3 @@ void HeltecV4Board::begin() {
     return loRaFEMControl.getFEMType() == KCT8103L_PA ? "Heltec V4.3 OLED" : "Heltec V4 OLED";
 #endif
   }
-
-  bool HeltecV4Board::setLoRaFemLnaEnabled(bool enable) {
-    if (!loRaFEMControl.isLnaCanControl()) {
-      return false;
-    }
-
-    loRaFEMControl.setLNAEnable(enable);
-    loRaFEMControl.setRxModeEnable();
-    return true;
-  }
-
-  bool HeltecV4Board::canControlLoRaFemLna() const {
-    return loRaFEMControl.isLnaCanControl();
-  }
-
-  bool HeltecV4Board::isLoRaFemLnaEnabled() const {
-    return loRaFEMControl.isLNAEnabled();
-  }

variants/heltec_v4/HeltecV4Board.h

@@ -25,9 +25,6 @@ public:
   void onAfterTransmit(void) override;
   void enterDeepSleep(uint32_t secs, int pin_wake_btn = -1);
   void powerOff() override;
-  bool setLoRaFemLnaEnabled(bool enable) override;
-  bool canControlLoRaFemLna() const override;
-  bool isLoRaFemLnaEnabled() const override;
   uint16_t getBattMilliVolts() override;
   bool setAdcMultiplier(float multiplier) override {
     if (multiplier == 0.0f) {

variants/heltec_v4/LoRaFEMControl.h

@@ -18,9 +18,8 @@ class LoRaFEMControl
     void setRxModeEnable(void);
     void setRxModeEnableWhenMCUSleep(void);
     void setLNAEnable(bool enabled);
-    bool isLnaCanControl(void) const { return lna_can_control; }
+    bool isLnaCanControl(void) { return lna_can_control; }
     void setLnaCanControl(bool can_control) { lna_can_control = can_control; }
-    bool isLNAEnabled(void) const { return lna_enabled; }
     LoRaFEMType getFEMType(void) const { return fem_type; }
   private:
     LoRaFEMType fem_type=OTHER_FEM_TYPES;

variants/mesh_pocket/platformio.ini

@@ -1,6 +1,7 @@
 [Mesh_pocket]
 extends = nrf52_base
 board = heltec_mesh_pocket
+platform_packages = framework-arduinoadafruitnrf52
 board_build.ldscript = boards/nrf52840_s140_v6.ld
 build_flags =  ${nrf52_base.build_flags}
   -I src/helpers/nrf52
@@ -31,6 +32,7 @@ lib_deps =
   stevemarple/MicroNMEA @ ^2.0.6
   zinggjm/GxEPD2 @ 1.6.2
   bakercp/CRC32 @ ^2.0.0
+
 debug_tool = jlink
 upload_protocol = nrfutil
 
@@ -38,6 +40,7 @@ upload_protocol = nrfutil
 extends = Mesh_pocket
 build_src_filter = ${Mesh_pocket.build_src_filter}
   +<../examples/simple_repeater>
+
 build_flags =
   ${Mesh_pocket.build_flags}
   -D ADVERT_NAME='"Heltec_Mesh_Pocket Repeater"'

variants/nibble_screen_connect/platformio.ini

@@ -34,7 +34,7 @@ lib_deps =
   adafruit/Adafruit SSD1306 @ ^2.5.13
   adafruit/Adafruit NeoPixel @ ^1.12.3
 
-[env:nibble_screen_connect_repeater_]
+[env:nibble_screen_connect_repeater]
 extends = nibble_screen_connect_base
 build_flags =
   ${nibble_screen_connect_base.build_flags}
@@ -51,7 +51,7 @@ lib_deps =
   ${nibble_screen_connect_base.lib_deps}
   ${esp32_ota.lib_deps}
 
-[env:nibble_screen_connect_repeater_bridge_espnow_]
+[env:nibble_screen_connect_repeater_bridge_espnow]
 extends = nibble_screen_connect_base
 build_flags =
   ${nibble_screen_connect_base.build_flags}
@@ -70,7 +70,7 @@ lib_deps =
   ${nibble_screen_connect_base.lib_deps}
   ${esp32_ota.lib_deps}
 
-[env:nibble_screen_connect_terminal_chat_]
+[env:nibble_screen_connect_terminal_chat]
 extends = nibble_screen_connect_base
 build_flags =
   ${nibble_screen_connect_base.build_flags}
@@ -82,7 +82,7 @@ lib_deps =
   ${nibble_screen_connect_base.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
-[env:nibble_screen_connect_room_server_]
+[env:nibble_screen_connect_room_server]
 extends = nibble_screen_connect_base
 build_flags =
   ${nibble_screen_connect_base.build_flags}
@@ -99,7 +99,7 @@ lib_deps =
   ${nibble_screen_connect_base.lib_deps}
   ${esp32_ota.lib_deps}
 
-[env:nibble_screen_connect_companion_radio_usb_]
+[env:nibble_screen_connect_companion_radio_usb]
 extends = nibble_screen_connect_base
 build_flags =
   ${nibble_screen_connect_base.build_flags}
@@ -116,7 +116,7 @@ lib_deps =
   ${nibble_screen_connect_base.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
-[env:nibble_screen_connect_companion_radio_ble_]
+[env:nibble_screen_connect_companion_radio_ble]
 extends = nibble_screen_connect_base
 build_flags =
   ${nibble_screen_connect_base.build_flags}
@@ -137,7 +137,7 @@ lib_deps =
   ${nibble_screen_connect_base.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
-[env:nibble_screen_connect_companion_radio_wifi_]
+[env:nibble_screen_connect_companion_radio_wifi]
 extends = nibble_screen_connect_base
 build_flags =
   ${nibble_screen_connect_base.build_flags}
@@ -160,7 +160,7 @@ lib_deps =
   densaugeo/base64 @ ~1.4.0
 
 
-[env:nibble_screen_connect_kiss_modem_]
+[env:nibble_screen_connect_kiss_modem]
 extends = nibble_screen_connect_base
 build_src_filter = ${nibble_screen_connect_base.build_src_filter}
   +<../examples/kiss_modem/>

variants/nibble_zero_connect/platformio.ini

@@ -1,158 +0,0 @@
-[nibble_zero_connect_base]
-extends = esp32_base
-board = esp32-s3-zero
-build_flags =
-  ${esp32_base.build_flags}
-  -I variants/nibble_zero_connect
-  -D NIBBLE_ZERO_CONNECT
-  -D P_LORA_DIO_1=4
-  -D P_LORA_NSS=10
-  -D P_LORA_RESET=6
-  -D P_LORA_BUSY=5
-  -D P_LORA_SCLK=12
-  -D P_LORA_MISO=13
-  -D P_LORA_MOSI=11
-  -D PIN_USER_BTN=1
-  -D PIN_BOARD_SDA=8
-  -D PIN_BOARD_SCL=7
-  -D PIN_STATUS_LED=39
-  -D P_LORA_TX_LED=39
-  -D DISPLAY_ROTATION=0
-  -D SX126X_DIO2_AS_RF_SWITCH=true
-  -D SX126X_DIO3_TCXO_VOLTAGE=1.8
-  -D SX126X_CURRENT_LIMIT=140
-  -D RADIO_CLASS=CustomSX1262
-  -D WRAPPER_CLASS=CustomSX1262Wrapper
-  -D LORA_TX_POWER=22
-  -D SX126X_RX_BOOSTED_GAIN=1
-build_src_filter = ${esp32_base.build_src_filter}
-  +<../variants/nibble_zero_connect>
-lib_deps =
-  ${esp32_base.lib_deps}
-  adafruit/Adafruit SSD1306 @ ^2.5.13
-
-[env:nibble_zero_connect_repeater_]
-extends = nibble_zero_connect_base
-build_flags =
-  ${nibble_zero_connect_base.build_flags}
-  -D DISPLAY_CLASS=SSD1306Display
-  -D ADVERT_NAME='"Nibble Repeater"'
-  -D ADVERT_LAT=0.0
-  -D ADVERT_LON=0.0
-  -D ADMIN_PASSWORD='"password"'
-  -D MAX_NEIGHBOURS=50
-build_src_filter = ${nibble_zero_connect_base.build_src_filter}
-  +<helpers/ui/SSD1306Display.cpp>
-  +<../examples/simple_repeater>
-lib_deps =
-  ${nibble_zero_connect_base.lib_deps}
-  ${esp32_ota.lib_deps}
-
-[env:nibble_zero_connect_repeater_bridge_espnow_]
-extends = nibble_zero_connect_base
-build_flags =
-  ${nibble_zero_connect_base.build_flags}
-  -D DISPLAY_CLASS=SSD1306Display
-  -D ADVERT_NAME='"ESPNow Bridge"'
-  -D ADVERT_LAT=0.0
-  -D ADVERT_LON=0.0
-  -D ADMIN_PASSWORD='"password"'
-  -D MAX_NEIGHBOURS=50
-  -D WITH_ESPNOW_BRIDGE=1
-build_src_filter = ${nibble_zero_connect_base.build_src_filter}
-  +<helpers/bridges/ESPNowBridge.cpp>
-  +<helpers/ui/SSD1306Display.cpp>
-  +<../examples/simple_repeater>
-lib_deps =
-  ${nibble_zero_connect_base.lib_deps}
-  ${esp32_ota.lib_deps}
-
-[env:nibble_zero_connect_terminal_chat_]
-extends = nibble_zero_connect_base
-build_flags =
-  ${nibble_zero_connect_base.build_flags}
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=1
-build_src_filter = ${nibble_zero_connect_base.build_src_filter}
-  +<../examples/simple_secure_chat/main.cpp>
-lib_deps =
-  ${nibble_zero_connect_base.lib_deps}
-  densaugeo/base64 @ ~1.4.0
-
-[env:nibble_zero_connect_room_server_]
-extends = nibble_zero_connect_base
-build_flags =
-  ${nibble_zero_connect_base.build_flags}
-  -D DISPLAY_CLASS=SSD1306Display
-  -D ADVERT_NAME='"Nibble Room"'
-  -D ADVERT_LAT=0.0
-  -D ADVERT_LON=0.0
-  -D ADMIN_PASSWORD='"password"'
-  -D ROOM_PASSWORD='"hello"'
-build_src_filter = ${nibble_zero_connect_base.build_src_filter}
-  +<helpers/ui/SSD1306Display.cpp>
-  +<../examples/simple_room_server>
-lib_deps =
-  ${nibble_zero_connect_base.lib_deps}
-  ${esp32_ota.lib_deps}
-
-[env:nibble_zero_connect_companion_radio_usb_]
-extends = nibble_zero_connect_base
-build_flags =
-  ${nibble_zero_connect_base.build_flags}
-  -I examples/companion_radio/ui-new
-  -D DISPLAY_CLASS=SSD1306Display
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
-build_src_filter = ${nibble_zero_connect_base.build_src_filter}
-  +<helpers/ui/SSD1306Display.cpp>
-  +<helpers/ui/MomentaryButton.cpp>
-  +<../examples/companion_radio/*.cpp>
-  +<../examples/companion_radio/ui-new/*.cpp>
-lib_deps =
-  ${nibble_zero_connect_base.lib_deps}
-  densaugeo/base64 @ ~1.4.0
-
-[env:nibble_zero_connect_companion_radio_ble_]
-extends = nibble_zero_connect_base
-build_flags =
-  ${nibble_zero_connect_base.build_flags}
-  -I examples/companion_radio/ui-new
-  -D DISPLAY_CLASS=SSD1306Display
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
-  -D BLE_PIN_CODE=123456
-  -D BLE_DEBUG_LOGGING=1
-  -D OFFLINE_QUEUE_SIZE=256
-build_src_filter = ${nibble_zero_connect_base.build_src_filter}
-  +<helpers/esp32/*.cpp>
-  +<helpers/ui/SSD1306Display.cpp>
-  +<helpers/ui/MomentaryButton.cpp>
-  +<../examples/companion_radio/*.cpp>
-  +<../examples/companion_radio/ui-new/*.cpp>
-lib_deps =
-  ${nibble_zero_connect_base.lib_deps}
-  densaugeo/base64 @ ~1.4.0
-
-[env:nibble_zero_connect_companion_radio_wifi_]
-extends = nibble_zero_connect_base
-build_flags =
-  ${nibble_zero_connect_base.build_flags}
-  -I examples/companion_radio/ui-new
-  -D DISPLAY_CLASS=SSD1306Display
-  -D MAX_CONTACTS=300
-  -D MAX_GROUP_CHANNELS=8
-  -D WIFI_DEBUG_LOGGING=1
-  -D WIFI_SSID='"myssid"'
-  -D WIFI_PWD='"mypwd"'
-build_src_filter = ${nibble_zero_connect_base.build_src_filter}
-  +<helpers/ui/SSD1306Display.cpp>
-  +<helpers/ui/MomentaryButton.cpp>
-  +<helpers/esp32/*.cpp>
-  +<../examples/companion_radio/*.cpp>
-  +<../examples/companion_radio/ui-new/*.cpp>
-lib_deps =
-  ${nibble_zero_connect_base.lib_deps}
-  densaugeo/base64 @ ~1.4.0
-
-

variants/nibble_zero_connect/target.cpp

@@ -1,35 +0,0 @@
-#include <Arduino.h>
-#include "target.h"
-
-ESP32Board board;
-
-static SPIClass spi;
-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);
-
-ESP32RTCClock fallback_clock;
-AutoDiscoverRTCClock rtc_clock(fallback_clock);
-SensorManager sensors;
-
-#ifdef DISPLAY_CLASS
-  DISPLAY_CLASS display;
-  MomentaryButton user_btn(PIN_USER_BTN, 1000, true);
-#endif
-
-#ifndef LORA_CR
-  #define LORA_CR      5
-#endif
-
-bool radio_init() {
-  fallback_clock.begin();
-  rtc_clock.begin(Wire);
-  
-  return radio.std_init(&spi);
-}
-
-mesh::LocalIdentity radio_new_identity() {
-  RadioNoiseListener rng(radio);
-  return mesh::LocalIdentity(&rng);
-}
-
-

variants/nibble_zero_connect/target.h

@@ -1,28 +0,0 @@
-#pragma once
-
-#define RADIOLIB_STATIC_ONLY 1
-#include <RadioLib.h>
-#include <helpers/radiolib/RadioLibWrappers.h>
-#include <helpers/ESP32Board.h>
-#include <helpers/radiolib/CustomSX1262Wrapper.h>
-#include <helpers/AutoDiscoverRTCClock.h>
-#include <helpers/SensorManager.h>
-#ifdef DISPLAY_CLASS
-  #include <helpers/ui/SSD1306Display.h>
-  #include <helpers/ui/MomentaryButton.h>
-#endif
-
-extern ESP32Board board;
-extern WRAPPER_CLASS radio_driver;
-extern AutoDiscoverRTCClock rtc_clock;
-extern SensorManager sensors;
-
-#ifdef DISPLAY_CLASS
-  extern DISPLAY_CLASS display;
-  extern MomentaryButton user_btn;
-#endif
-
-bool radio_init();
-mesh::LocalIdentity radio_new_identity();
-
-

variants/xiao_c6/platformio.ini

@@ -1,7 +1,6 @@
 [Xiao_C6]
 extends = esp32c6_base
 board = esp32-c6-devkitm-1
-board_build.flash_mode = dio
 board_build.partitions = min_spiffs.csv ; get around 4mb flash limit
 build_flags =
   ${esp32c6_base.build_flags}