Retain device nodeinfo during reset-nodedb (#2951)

* INA3221 bugfixes & refinement
Reorganized and refactored some INA3221 code
Added comments
Added missing shunt resistor value (100mΩ)
Added INA3221 Channel 1 to getINAVoltage() for device battery monitoring
	modified:   src/Power.cpp
	modified:   src/modules/Telemetry/PowerTelemetry.cpp
	modified:   src/modules/Telemetry/Sensor/INA3221Sensor.cpp
	modified:   src/modules/Telemetry/Sensor/INA3221Sensor.h
	modified:   src/power.h

* reset-nodedb retain device nodeinfo
	modified:   src/mesh/NodeDB.cpp

* reset-nodedb #2
	modified:   src/mesh/NodeDB.cpp

---------

Co-authored-by: Jonathan Bennett <jbennett@incomsystems.biz>

.github/pull_request_template.md

@@ -7,7 +7,7 @@
   is appreciated." This will allow other devs to potentially save you time by not accidentially duplicating work etc...
 - Please do not check in files that don't have real changes
 - Please do not reformat lines that you didn't have to change the code on
-- We recommend using the [Visual Studio Code](https://platformio.org/install/ide?install=vscode) editor along with the ['Trunk Check' extension](https://marketplace.visualstudio.com/items?itemName=trunk.io) (WSL2 is required on windows),
+- We recommend using the [Visual Studio Code](https://platformio.org/install/ide?install=vscode) editor along with the ['Trunk Check' extension](https://marketplace.visualstudio.com/items?itemName=trunk.io) (In beta for windows, WSL2 for the linux version),
   because it automatically follows our indentation rules and its auto reformatting will not cause spurious changes to lines.
 - If your PR fixes a bug, mention "fixes #bugnum" somewhere in your pull request description.
 - If your other co-developers have comments on your PR please tweak as needed.

.github/workflows/build_raspbian.yml

@@ -0,0 +1,45 @@
+name: Build Raspbian
+
+on: workflow_call
+
+permissions:
+  contents: write
+  packages: write
+
+jobs:
+  build-raspbian:
+    runs-on: [self-hosted, linux, ARM64]
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
+
+      - name: Upgrade python tools
+        shell: bash
+        run: |
+          python -m pip install --upgrade pip
+          pip install -U platformio adafruit-nrfutil
+          pip install -U meshtastic --pre
+
+      - name: Upgrade platformio
+        shell: bash
+        run: |
+          pio upgrade
+
+      - name: Build Raspbian
+        run: bin/build-native.sh
+
+      - name: Get release version string
+        run: echo "version=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
+        id: version
+
+      - name: Store binaries as an artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: firmware-raspbian-${{ steps.version.outputs.version }}.zip
+          path: |
+            release/meshtasticd_linux_arm64
+            bin/config-dist.yaml

.github/workflows/main_matrix.yml

@@ -103,7 +103,6 @@ jobs:
   build-nrf52:
     strategy:
       fail-fast: false
-      max-parallel: 2
       matrix:
         include:
           - board: rak4631
@@ -129,6 +128,15 @@ jobs:
     with:
       board: ${{ matrix.board }}
 
+  build-raspbian:
+    strategy:
+      fail-fast: false
+      max-parallel: 1
+    uses: ./.github/workflows/build_raspbian.yml
+
+  package-raspbian:
+    uses: ./.github/workflows/package_raspbian.yml
+
   build-native:
     runs-on: ubuntu-latest
     steps:
@@ -204,7 +212,15 @@ jobs:
   gather-artifacts:
     runs-on: ubuntu-latest
     needs:
-      [build-esp32, build-esp32-s3, build-nrf52, build-native, build-rpi2040]
+      [
+        build-esp32,
+        build-esp32-s3,
+        build-nrf52,
+        build-raspbian,
+        build-native,
+        build-rpi2040,
+        package-raspbian,
+      ]
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -216,12 +232,15 @@ jobs:
         with:
           path: ./
 
+      - name: Display structure of downloaded files
+        run: ls -R
+
       - name: Get release version string
         run: echo "version=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
         id: version
 
       - name: Move files up
-        run: mv -b -t ./ ./*tbeam-2*/littlefs*.bin ./*tbeam-2*/bleota.bin ./*tbeam-s3*/bleota-s3.bin ./**/firmware*.bin ./*t-echo*/Meshtastic_nRF52_factory_erase.uf2 ./**/firmware-*.uf2 ./**/firmware-*-ota.zip ./**/*.elf ./*native*/*device-*.sh ./*native*/*device-*.bat
+        run: mv -b -t ./ ./*tbeam-2*/littlefs*.bin ./*tbeam-2*/bleota.bin ./*tbeam-s3*/bleota-s3.bin ./**/firmware*.bin ./*t-echo*/Meshtastic_nRF52_factory_erase.uf2 ./**/firmware-*.uf2 ./**/firmware-*-ota.zip ./**/*.elf ./*native*/*device-*.sh ./*native*/*device-*.bat ./firmware-raspbian-*/release/meshtasticd_linux_arm64 ./firmware-raspbian-*/bin/config-dist.yaml
 
       - name: Repackage in single firmware zip
         uses: actions/upload-artifact@v3
@@ -233,6 +252,8 @@ jobs:
             ./firmware-*-ota.zip
             ./device-*.sh
             ./device-*.bat
+            ./meshtasticd_linux_arm64
+            ./config-dist.yaml
           retention-days: 90
 
       - uses: actions/download-artifact@v3
@@ -294,6 +315,13 @@ jobs:
           name: firmware-${{ steps.version.outputs.version }}
           path: ./output
 
+      - uses: actions/download-artifact@v3
+        with:
+          name: artifact-deb
+
+      - name: Display structure of downloaded files
+        run: ls -R
+
       - name: Device scripts permissions
         run: |
           chmod +x ./output/device-install.sh
@@ -347,6 +375,16 @@ jobs:
           asset_name: debug-elfs-${{ steps.version.outputs.version }}.zip
           asset_content_type: application/zip
 
+      - name: Add raspbian .deb
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./meshtasticd_${{ steps.version.outputs.version }}_arm64.deb
+          asset_name: meshtasticd_${{ steps.version.outputs.version }}_arm64.deb
+          asset_content_type: application/vnd.debian.binary-package
+
       - name: Bump version.properties
         run: >-
           bin/bump_version.py

.github/workflows/package_raspbian.yml

@@ -0,0 +1,60 @@
+name: Package Raspbian
+
+on: workflow_call
+
+permissions:
+  contents: write
+  packages: write
+
+jobs:
+  build-raspbian:
+    uses: ./.github/workflows/build_raspbian.yml
+
+  package-raspbian:
+    runs-on: ubuntu-latest
+    needs: build-raspbian
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
+
+      - name: Get release version string
+        run: echo "version=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
+        id: version
+
+      - name: Download artifacts
+        uses: actions/download-artifact@v3
+        with:
+          name: firmware-raspbian-${{ steps.version.outputs.version }}.zip
+
+      - name: Display structure of downloaded files
+        run: ls -R
+
+      - name: build .debpkg
+        run: |
+          mkdir -p .debpkg/usr/sbin
+          mkdir -p .debpkg/etc/meshtasticd
+          mkdir -p .debpkg/usr/lib/systemd/system/
+          cp release/meshtasticd_linux_arm64 .debpkg/usr/sbin/meshtasticd
+          cp bin/config-dist.yaml .debpkg/etc/meshtasticd/config.yaml
+          chmod +x .debpkg/usr/sbin/meshtasticd
+          cp bin/meshtasticd.service .debpkg/usr/lib/systemd/system/meshtasticd.service
+
+      - uses: jiro4989/build-deb-action@v3
+        with:
+          package: meshtasticd
+          package_root: .debpkg
+          maintainer: Jonathan Bennett
+          version: ${{ steps.version.outputs.version }} # refs/tags/v*.*.*
+          arch: arm64
+          depends: libyaml-cpp0.7
+          desc: Native Linux Meshtastic binary.
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: artifact-deb
+          path: |
+            ./*.deb

.trunk/.gitignore

@@ -2,7 +2,7 @@
 *logs
 *actions
 *notifications
+*tools
 plugins
 user_trunk.yaml
 user.yaml
-tools

.trunk/configs/.shellcheckrc

@@ -1,7 +1,10 @@
 enable=all
 source-path=SCRIPTDIR
 disable=SC2154
+disable=SC2248
+disable=SC2250
 
 # If you're having issues with shellcheck following source, disable the errors via:
 # disable=SC1090
 # disable=SC1091
+# 

.trunk/configs/.yamllint.yaml

@@ -3,7 +3,7 @@ rules:
     required: only-when-needed
     extra-allowed: ["{|}"]
   empty-values:
-    forbid-in-block-mappings: true
+    forbid-in-block-mappings: false
     forbid-in-flow-mappings: true
   key-duplicates: {}
   octal-values:

.trunk/trunk.yaml

@@ -1,53 +1,44 @@
 version: 0.1
 cli:
-  version: 1.13.0
+  version: 1.17.1
 plugins:
   sources:
     - id: trunk
-      ref: v1.1.1
+      ref: v1.2.6
       uri: https://github.com/trunk-io/plugins
 lint:
   enabled:
     - bandit@1.7.5
-    - checkov@2.4.1
+    - checkov@3.0.16
     - terrascan@1.18.3
-    - trivy@0.44.1
-    - trufflehog@3.48.0
+    - trivy@0.46.1
+    - trufflehog@3.62.1
     - taplo@0.8.1
-    - ruff@0.0.284
+    - ruff@0.1.3
     - yamllint@1.32.0
     - isort@5.12.0
-    - markdownlint@0.35.0
-    - oxipng@8.0.0
+    - markdownlint@0.37.0
+    - oxipng@9.0.0
     - svgo@3.0.2
-    - actionlint@1.6.25
+    - actionlint@1.6.26
     - flake8@6.1.0
     - hadolint@2.12.0
     - shfmt@3.6.0
     - shellcheck@0.9.0
-    - black@23.7.0
+    - black@23.9.1
     - git-diff-check
-    - gitleaks@8.17.0
+    - gitleaks@8.18.0
     - clang-format@16.0.3
-    - prettier@3.0.2
-  disabled:
-    - taplo@0.8.1
-    - shellcheck@0.9.0
-    - shfmt@3.6.0
-    - oxipng@8.0.0
-    - actionlint@1.6.22
-    - markdownlint@0.35.0
-    - hadolint@2.12.0
-    - svgo@3.0.2
+    - prettier@3.0.3
 runtimes:
   enabled:
     - python@3.10.8
-    - go@1.19.5
+    - go@1.21.0
     - node@18.12.1
 actions:
   disabled:
     - trunk-announce
-    - trunk-check-pre-push
-    - trunk-fmt-pre-commit
   enabled:
+    - trunk-fmt-pre-commit
+    - trunk-check-pre-push
     - trunk-upgrade-available

README.md

@@ -10,8 +10,8 @@
 
 This repository contains the device firmware for the Meshtastic project.
 
-**[Building Instructions](https://meshtastic.org/docs/development/firmware/build)**
-**[Flashing Instructions](https://meshtastic.org/docs/getting-started/flashing-firmware/)**
+- **[Building Instructions](https://meshtastic.org/docs/development/firmware/build)**
+- **[Flashing Instructions](https://meshtastic.org/docs/getting-started/flashing-firmware/)**
 
 ## Stats
 

bin/build-native.sh

@@ -2,8 +2,8 @@
 
 set -e
 
-VERSION=`bin/buildinfo.py long`
-SHORT_VERSION=`bin/buildinfo.py short`
+VERSION=$(bin/buildinfo.py long)
+SHORT_VERSION=$(bin/buildinfo.py short)
 
 OUTDIR=release/
 
@@ -13,11 +13,15 @@ mkdir -p $OUTDIR/
 rm -r $OUTDIR/* || true
 
 # Important to pull latest version of libs into all device flavors, otherwise some devices might be stale
-platformio pkg update 
+platformio pkg update
 
-pio run --environment native
-cp .pio/build/native/program $OUTDIR/meshtasticd_linux_amd64
+if command -v raspi-config &>/dev/null; then
+	pio run --environment raspbian
+	cp .pio/build/raspbian/program $OUTDIR/meshtasticd_linux_arm64
+else
+	pio run --environment native
+	cp .pio/build/native/program $OUTDIR/meshtasticd_linux_amd64
+fi
 
 cp bin/device-install.* $OUTDIR
 cp bin/device-update.* $OUTDIR
-

bin/config-dist.yaml

@@ -0,0 +1,21 @@
+# Define your devices here using Broadcom pin numbering
+# Uncomment the block that corresponds to your hardware
+---
+Lora:
+#  Module: sx1262  # Waveshare SX126X XXXM
+#  DIO2_AS_RF_SWITCH: true
+#  CS: 21
+#  IRQ: 16
+#  Busy: 20
+#  Reset: 18
+
+#  Module: sx1262  # Waveshare SX1302 LISTEN ONLY AT THIS TIME!
+#  CS: 7
+#  IRQ: 17
+#  Reset: 22
+
+#  Module: RF95  # Adafruit RFM9x
+#  Reset: 25
+#  CS: 7
+#  IRQ: 22
+#  Busy: 23

bin/meshtasticd.service

@@ -0,0 +1,9 @@
+[unit]
+description=Meshtastic Native Daemon
+
+[Service]
+Type=simple
+ExecStart=/usr/sbin/meshtasticd
+
+[Install]
+WantedBy=multi-user.target

bin/native-install.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+cp release/meshtasticd_linux_arm64 /usr/sbin/meshtasticd
+mkdir /etc/meshtasticd
+if [[ -f "/etc/meshtasticd/config.yaml" ]]; then
+	cp bin/config-dist.yaml /etc/meshtasticd/config-upgrade.yaml
+else
+	cp bin/config-dist.yaml /etc/meshtasticd/config.yaml
+fi
+cp bin/meshtasticd.service /usr/lib/systemd/system/meshtasticd.service

boards/tbeam-s3-core.json

@@ -15,7 +15,7 @@
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "flash_mode": "dio",
-    "hwids": [["0X303A", "0x1001"]],
+    "hwids": [["0x303A", "0x1001"]],
     "mcu": "esp32s3",
     "variant": "tbeam-s3-core"
   },

platformio.ini

@@ -26,6 +26,7 @@
 ;default_envs = meshtastic-dr-dev
 ;default_envs = m5stack-coreink
 ;default_envs = rak4631
+;default_envs = rak10701
 default_envs = wio-e5
 
 extra_configs =
@@ -113,6 +114,7 @@ lib_deps =
   https://github.com/boschsensortec/Bosch-BSEC2-Library#v1.5.2400
   boschsensortec/BME68x Sensor Library@^1.1.40407
   adafruit/Adafruit MCP9808 Library@^2.0.0
+  https://github.com/Tinyu-Zhao/INA3221@^0.0.1
   adafruit/Adafruit INA260 Library@^1.5.0
   adafruit/Adafruit INA219@^1.2.0
   adafruit/Adafruit SHTC3 Library@^1.0.0

src/DisplayFormatters.cpp

@@ -0,0 +1,34 @@
+#include "DisplayFormatters.h"
+
+const char *DisplayFormatters::getModemPresetDisplayName(meshtastic_Config_LoRaConfig_ModemPreset preset, bool useShortName)
+{
+    switch (preset) {
+    case meshtastic_Config_LoRaConfig_ModemPreset_SHORT_SLOW:
+        return useShortName ? "ShortS" : "ShortSlow";
+        break;
+    case meshtastic_Config_LoRaConfig_ModemPreset_SHORT_FAST:
+        return useShortName ? "ShortF" : "ShortFast";
+        break;
+    case meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_SLOW:
+        return useShortName ? "MedS" : "MediumSlow";
+        break;
+    case meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST:
+        return useShortName ? "MedF" : "MediumFast";
+        break;
+    case meshtastic_Config_LoRaConfig_ModemPreset_LONG_SLOW:
+        return useShortName ? "LongS" : "LongSlow";
+        break;
+    case meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST:
+        return useShortName ? "LongF" : "LongFast";
+        break;
+    case meshtastic_Config_LoRaConfig_ModemPreset_LONG_MODERATE:
+        return useShortName ? "LongM" : "LongMod";
+        break;
+    case meshtastic_Config_LoRaConfig_ModemPreset_VERY_LONG_SLOW:
+        return useShortName ? "VeryL" : "VLongSlow";
+        break;
+    default:
+        return useShortName ? "Custom" : "Invalid";
+        break;
+    }
+}

src/DisplayFormatters.h

@@ -0,0 +1,8 @@
+#pragma once
+#include "NodeDB.h"
+
+class DisplayFormatters
+{
+  public:
+    static const char *getModemPresetDisplayName(meshtastic_Config_LoRaConfig_ModemPreset preset, bool useShortName);
+};

src/Power.cpp

@@ -52,6 +52,7 @@ static const adc_atten_t atten = ADC_ATTENUATION;
 #if HAS_TELEMETRY && !defined(ARCH_PORTDUINO)
 INA260Sensor ina260Sensor;
 INA219Sensor ina219Sensor;
+INA3221Sensor ina3221Sensor;
 #endif
 
 #ifdef HAS_PMU
@@ -175,9 +176,21 @@ class AnalogBatteryLevel : public HasBatteryLevel
             uint32_t raw = 0;
 #ifdef ARCH_ESP32
 #ifndef BAT_MEASURE_ADC_UNIT // ADC1
+#ifdef ADC_CTRL
+            if (heltec_version == 5) {
+                pinMode(ADC_CTRL, OUTPUT);
+                digitalWrite(ADC_CTRL, HIGH);
+                delay(10);
+            }
+#endif
             for (int i = 0; i < BATTERY_SENSE_SAMPLES; i++) {
                 raw += adc1_get_raw(adc_channel);
             }
+#ifdef ADC_CTRL
+            if (heltec_version == 5) {
+                digitalWrite(ADC_CTRL, LOW);
+            }
+#endif
 #else  // ADC2
             int32_t adc_buf = 0;
             for (int i = 0; i < BATTERY_SENSE_SAMPLES; i++) {
@@ -269,10 +282,14 @@ class AnalogBatteryLevel : public HasBatteryLevel
 #if defined(HAS_TELEMETRY) && !defined(ARCH_PORTDUINO)
     uint16_t getINAVoltage()
     {
-        if (nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_INA219] == config.power.device_battery_ina_address) {
+        if (nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_INA219].first == config.power.device_battery_ina_address) {
             return ina219Sensor.getBusVoltageMv();
-        } else if (nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_INA260] == config.power.device_battery_ina_address) {
+        } else if (nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_INA260].first ==
+                   config.power.device_battery_ina_address) {
             return ina260Sensor.getBusVoltageMv();
+        } else if (nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_INA3221].first ==
+                   config.power.device_battery_ina_address) {
+            return ina3221Sensor.getBusVoltageMv();
         }
         return 0;
     }
@@ -282,11 +299,12 @@ class AnalogBatteryLevel : public HasBatteryLevel
         if (!config.power.device_battery_ina_address) {
             return false;
         }
-        if (nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_INA219] == config.power.device_battery_ina_address) {
+        if (nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_INA219].first == config.power.device_battery_ina_address) {
             if (!ina219Sensor.isInitialized())
                 return ina219Sensor.runOnce() > 0;
             return ina219Sensor.isRunning();
-        } else if (nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_INA260] == config.power.device_battery_ina_address) {
+        } else if (nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_INA260].first ==
+                   config.power.device_battery_ina_address) {
             if (!ina260Sensor.isInitialized())
                 return ina260Sensor.runOnce() > 0;
             return ina260Sensor.isRunning();

src/configuration.h

@@ -57,8 +57,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define REQUIRE_RADIO true // If true, we will fail to start if the radio is not found
 
 /// Convert a preprocessor name into a quoted string
-#define xstr(s) str(s)
-#define str(s) #s
+#define xstr(s) ystr(s)
+#define ystr(s) #s
 
 /// Convert a preprocessor name into a quoted string and if that string is empty use "unset"
 #define optstr(s) (xstr(s)[0] ? xstr(s) : "unset")
@@ -111,6 +111,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MCP9808_ADDR 0x18
 #define INA_ADDR 0x40
 #define INA_ADDR_ALTERNATE 0x41
+#define INA3221_ADDR 0x42
 #define QMC6310_ADDR 0x1C
 #define QMI8658_ADDR 0x6B
 #define QMC5883L_ADDR 0x1E
@@ -187,6 +188,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef HAS_TELEMETRY
 #define HAS_TELEMETRY 0
 #endif
+#ifndef HAS_SENSOR
+#define HAS_SENSOR 0
+#endif
 #ifndef HAS_RADIO
 #define HAS_RADIO 0
 #endif

src/detect/ScanI2C.h

@@ -25,6 +25,7 @@ class ScanI2C
         BMP_280,
         INA260,
         INA219,
+        INA3221,
         MCP9808,
         SHT31,
         SHTC3,

src/detect/ScanI2CTwoWire.cpp

@@ -251,7 +251,10 @@ void ScanI2CTwoWire::scanPort(I2CPort port)
                     type = INA219;
                 }
                 break;
-
+            case INA3221_ADDR:
+                LOG_INFO("INA3221 sensor found at address 0x%x\n", (uint8_t)addr.address);
+                type = INA3221;
+                break;
             case MCP9808_ADDR:
                 registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x07), 2);
                 if (registerValue == 0x0400) {

src/detect/ScanI2CTwoWire.h

@@ -18,6 +18,8 @@ class ScanI2CTwoWire : public ScanI2C
 
     ScanI2C::FoundDevice find(ScanI2C::DeviceType) const override;
 
+    TwoWire *fetchI2CBus(ScanI2C::DeviceAddress) const;
+
     bool exists(ScanI2C::DeviceType) const override;
 
     size_t countDevices() const override;
@@ -51,6 +53,4 @@ class ScanI2CTwoWire : public ScanI2C
     uint16_t getRegisterValue(const RegisterLocation &, ResponseWidth) const;
 
     DeviceType probeOLED(ScanI2C::DeviceAddress) const;
-
-    TwoWire *fetchI2CBus(ScanI2C::DeviceAddress) const;
 };

src/gps/GPS.cpp

@@ -8,6 +8,7 @@
 
 #ifdef ARCH_PORTDUINO
 #include "meshUtils.h"
+#include <ctime>
 #endif
 
 #ifndef GPS_RESET_MODE
@@ -16,6 +17,9 @@
 
 #if defined(NRF52840_XXAA) || defined(NRF52833_XXAA) || defined(ARCH_ESP32)
 HardwareSerial *GPS::_serial_gps = &Serial1;
+#elif defined(ARCH_RASPBERRY_PI)
+// need a translation layer to make _serial_gps work with pigpio https://abyz.me.uk/rpi/pigpio/cif.html#serOpen
+HardwareSerial *GPS::_serial_gps = NULL;
 #else
 HardwareSerial *GPS::_serial_gps = NULL;
 #endif
@@ -611,7 +615,7 @@ int32_t GPS::runOnce()
             return 2000; // Setup failed, re-run in two seconds
 
         // We have now loaded our saved preferences from flash
-        if (config.position.gps_enabled == false && config.position.fixed_position == false) {
+        if (config.position.gps_enabled == false) {
             return disable();
         }
         // ONCE we will factory reset the GPS for bug #327
@@ -703,8 +707,8 @@ int32_t GPS::runOnce()
     // If state has changed do a publish
     publishUpdate();
 
-    if (config.position.gps_enabled == false) // This should trigger if GPS is disabled but fixed_position is true
-        return disable();
+    if (config.position.fixed_position == true && hasValidLocation)
+        return disable(); // This should trigger when we have a fixed position, and get that first position
 
     // 9600bps is approx 1 byte per msec, so considering our buffer size we never need to wake more often than 200ms
     // if not awake we can run super infrquently (once every 5 secs?) to see if we need to wake.

src/graphics/Screen.cpp

@@ -24,6 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #if HAS_SCREEN
 #include <OLEDDisplay.h>
 
+#include "DisplayFormatters.h"
 #include "GPS.h"
 #include "MeshService.h"
 #include "NodeDB.h"
@@ -160,34 +161,9 @@ static void drawIconScreen(const char *upperMsg, OLEDDisplay *display, OLEDDispl
              xstr(APP_VERSION_SHORT)); // Note: we don't bother printing region or now, it makes the string too long
     display->drawString(x + SCREEN_WIDTH - display->getStringWidth(buf), y + 0, buf);
     screen->forceDisplay();
-
     // FIXME - draw serial # somewhere?
 }
 
-#ifdef ARCH_ESP32
-static void drawFrameResume(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
-{
-    uint16_t x_offset = display->width() / 2;
-    display->setTextAlignment(TEXT_ALIGN_CENTER);
-    display->setFont(FONT_MEDIUM);
-    display->drawString(x_offset + x, 26 + y, "Resuming...");
-}
-#endif
-
-static void drawBootScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
-{
-#ifdef ARCH_ESP32
-    if (wakeCause == ESP_SLEEP_WAKEUP_TIMER || wakeCause == ESP_SLEEP_WAKEUP_EXT1) {
-        drawFrameResume(display, state, x, y);
-    } else
-#endif
-    {
-        // Draw region in upper left
-        const char *region = myRegion ? myRegion->name : NULL;
-        drawIconScreen(region, display, state, x, y);
-    }
-}
-
 static void drawOEMIconScreen(const char *upperMsg, OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
 {
     // draw an xbm image.
@@ -237,6 +213,28 @@ static void drawOEMBootScreen(OLEDDisplay *display, OLEDDisplayUiState *state, i
     drawOEMIconScreen(region, display, state, x, y);
 }
 
+static void drawFrameText(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y, const char *message)
+{
+    uint16_t x_offset = display->width() / 2;
+    display->setTextAlignment(TEXT_ALIGN_CENTER);
+    display->setFont(FONT_MEDIUM);
+    display->drawString(x_offset + x, 26 + y, message);
+}
+
+static void drawBootScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
+{
+#ifdef ARCH_ESP32
+    if (wakeCause == ESP_SLEEP_WAKEUP_TIMER || wakeCause == ESP_SLEEP_WAKEUP_EXT1) {
+        drawFrameText(display, state, x, y, "Resuming...");
+    } else
+#endif
+    {
+        // Draw region in upper left
+        const char *region = myRegion ? myRegion->name : NULL;
+        drawIconScreen(region, display, state, x, y);
+    }
+}
+
 // Used on boot when a certificate is being created
 static void drawSSLScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
 {
@@ -337,22 +335,6 @@ static void drawFrameBluetooth(OLEDDisplay *display, OLEDDisplayUiState *state,
     display->drawString(x_offset + x, y_offset + y, deviceName);
 }
 
-static void drawFrameShutdown(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
-{
-    uint16_t x_offset = display->width() / 2;
-    display->setTextAlignment(TEXT_ALIGN_CENTER);
-    display->setFont(FONT_MEDIUM);
-    display->drawString(x_offset + x, 26 + y, "Shutting down...");
-}
-
-static void drawFrameReboot(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
-{
-    uint16_t x_offset = display->width() / 2;
-    display->setTextAlignment(TEXT_ALIGN_CENTER);
-    display->setFont(FONT_MEDIUM);
-    display->drawString(x_offset + x, 26 + y, "Rebooting...");
-}
-
 static void drawFrameFirmware(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
 {
     display->setTextAlignment(TEXT_ALIGN_CENTER);
@@ -923,20 +905,6 @@ static void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_
     drawColumns(display, x, y, fields);
 }
 
-// #ifdef RAK4630
-// Screen::Screen(uint8_t address, int sda, int scl) : OSThread("Screen"), cmdQueue(32), dispdev(address, sda, scl),
-// dispdev_oled(address, sda, scl), ui(&dispdev)
-// {
-//     address_found = address;
-//     cmdQueue.setReader(this);
-//     if (screen_found) {
-//         (void)dispdev;
-//         AutoOLEDWire dispdev = dispdev_oled;
-//         (void)ui;
-//         OLEDDisplayUi ui(&dispdev);
-//     }
-// }
-// #else
 Screen::Screen(ScanI2C::DeviceAddress address, meshtastic_Config_DisplayConfig_OledType screenType, OLEDDISPLAY_GEOMETRY geometry)
     : concurrency::OSThread("Screen"), address_found(address), model(screenType), geometry(geometry), cmdQueue(32),
       dispdev(address.address, -1, -1, geometry, (address.port == ScanI2C::I2CPort::WIRE1) ? HW_I2C::I2C_TWO : HW_I2C::I2C_ONE),
@@ -944,7 +912,7 @@ Screen::Screen(ScanI2C::DeviceAddress address, meshtastic_Config_DisplayConfig_O
 {
     cmdQueue.setReader(this);
 }
-// #endif
+
 /**
  * Prepare the display for the unit going to the lowest power mode possible.  Most screens will just
  * poweroff, but eink screens will show a "I'm sleeping" graphic, possibly with a QR code
@@ -1261,11 +1229,8 @@ void Screen::setWelcomeFrames()
 {
     if (address_found.address) {
         // LOG_DEBUG("showing Welcome frames\n");
-        ui.disableAllIndicators();
-
-        static FrameCallback welcomeFrames[] = {drawWelcomeScreen};
-        ui.setFrames(welcomeFrames, 1);
-        ui.update();
+        static FrameCallback frames[] = {drawWelcomeScreen};
+        setFrameImmediateDraw(frames);
     }
 }
 
@@ -1352,12 +1317,15 @@ void Screen::handleStartBluetoothPinScreen(uint32_t pin)
     LOG_DEBUG("showing bluetooth screen\n");
     showingNormalScreen = false;
 
-    static FrameCallback btFrames[] = {drawFrameBluetooth};
-
+    static FrameCallback frames[] = {drawFrameBluetooth};
     snprintf(btPIN, sizeof(btPIN), "%06u", pin);
+    setFrameImmediateDraw(frames);
+}
 
+void Screen::setFrameImmediateDraw(FrameCallback *drawFrames)
+{
     ui.disableAllIndicators();
-    ui.setFrames(btFrames, 1);
+    ui.setFrames(drawFrames, 1);
     setFastFramerate();
 }
 
@@ -1366,11 +1334,12 @@ void Screen::handleShutdownScreen()
     LOG_DEBUG("showing shutdown screen\n");
     showingNormalScreen = false;
 
-    static FrameCallback shutdownFrames[] = {drawFrameShutdown};
+    auto frame = [](OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y) -> void {
+        drawFrameText(display, state, x, y, "Shutting down...");
+    };
+    static FrameCallback frames[] = {frame};
 
-    ui.disableAllIndicators();
-    ui.setFrames(shutdownFrames, 1);
-    setFastFramerate();
+    setFrameImmediateDraw(frames);
 }
 
 void Screen::handleRebootScreen()
@@ -1378,11 +1347,11 @@ void Screen::handleRebootScreen()
     LOG_DEBUG("showing reboot screen\n");
     showingNormalScreen = false;
 
-    static FrameCallback rebootFrames[] = {drawFrameReboot};
-
-    ui.disableAllIndicators();
-    ui.setFrames(rebootFrames, 1);
-    setFastFramerate();
+    auto frame = [](OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y) -> void {
+        drawFrameText(display, state, x, y, "Rebooting...");
+    };
+    static FrameCallback frames[] = {frame};
+    setFrameImmediateDraw(frames);
 }
 
 void Screen::handleStartFirmwareUpdateScreen()
@@ -1390,11 +1359,8 @@ void Screen::handleStartFirmwareUpdateScreen()
     LOG_DEBUG("showing firmware screen\n");
     showingNormalScreen = false;
 
-    static FrameCallback btFrames[] = {drawFrameFirmware};
-
-    ui.disableAllIndicators();
-    ui.setFrames(btFrames, 1);
-    setFastFramerate();
+    static FrameCallback frames[] = {drawFrameFirmware};
+    setFrameImmediateDraw(frames);
 }
 
 void Screen::blink()
@@ -1655,65 +1621,8 @@ void DebugInfo::drawFrameWiFi(OLEDDisplay *display, OLEDDisplayUiState *state, i
     } else {
         // Codes:
         // https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/wifi.html#wi-fi-reason-code
-        if (getWifiDisconnectReason() == 2) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "Authentication Invalid");
-        } else if (getWifiDisconnectReason() == 3) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "De-authenticated");
-        } else if (getWifiDisconnectReason() == 4) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "Disassociated Expired");
-        } else if (getWifiDisconnectReason() == 5) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "AP - Too Many Clients");
-        } else if (getWifiDisconnectReason() == 6) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "NOT_AUTHED");
-        } else if (getWifiDisconnectReason() == 7) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "NOT_ASSOCED");
-        } else if (getWifiDisconnectReason() == 8) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "Disassociated");
-        } else if (getWifiDisconnectReason() == 9) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "ASSOC_NOT_AUTHED");
-        } else if (getWifiDisconnectReason() == 10) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "DISASSOC_PWRCAP_BAD");
-        } else if (getWifiDisconnectReason() == 11) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "DISASSOC_SUPCHAN_BAD");
-        } else if (getWifiDisconnectReason() == 13) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "IE_INVALID");
-        } else if (getWifiDisconnectReason() == 14) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "MIC_FAILURE");
-        } else if (getWifiDisconnectReason() == 15) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "AP Handshake Timeout");
-        } else if (getWifiDisconnectReason() == 16) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "GROUP_KEY_UPDATE_TIMEOUT");
-        } else if (getWifiDisconnectReason() == 17) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "IE_IN_4WAY_DIFFERS");
-        } else if (getWifiDisconnectReason() == 18) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "Invalid Group Cipher");
-        } else if (getWifiDisconnectReason() == 19) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "Invalid Pairwise Cipher");
-        } else if (getWifiDisconnectReason() == 20) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "AKMP_INVALID");
-        } else if (getWifiDisconnectReason() == 21) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "UNSUPP_RSN_IE_VERSION");
-        } else if (getWifiDisconnectReason() == 22) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "INVALID_RSN_IE_CAP");
-        } else if (getWifiDisconnectReason() == 23) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "802_1X_AUTH_FAILED");
-        } else if (getWifiDisconnectReason() == 24) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "CIPHER_SUITE_REJECTED");
-        } else if (getWifiDisconnectReason() == 200) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "BEACON_TIMEOUT");
-        } else if (getWifiDisconnectReason() == 201) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "AP Not Found");
-        } else if (getWifiDisconnectReason() == 202) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "AUTH_FAIL");
-        } else if (getWifiDisconnectReason() == 203) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "ASSOC_FAIL");
-        } else if (getWifiDisconnectReason() == 204) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "HANDSHAKE_TIMEOUT");
-        } else if (getWifiDisconnectReason() == 205) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "Connection Failed");
-        } else {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "Unknown Status");
-        }
+        display->drawString(x, y + FONT_HEIGHT_SMALL * 1,
+                            WiFi.disconnectReasonName(static_cast<wifi_err_reason_t>(getWifiDisconnectReason())));
     }
 
     display->drawString(x, y + FONT_HEIGHT_SMALL * 2, "SSID: " + String(wifiName));
@@ -1760,37 +1669,7 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
             display->drawString(x + 1, y, String("USB"));
     }
 
-    auto mode = "";
-
-    switch (config.lora.modem_preset) {
-    case meshtastic_Config_LoRaConfig_ModemPreset_SHORT_SLOW:
-        mode = "ShortS";
-        break;
-    case meshtastic_Config_LoRaConfig_ModemPreset_SHORT_FAST:
-        mode = "ShortF";
-        break;
-    case meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_SLOW:
-        mode = "MedS";
-        break;
-    case meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST:
-        mode = "MedF";
-        break;
-    case meshtastic_Config_LoRaConfig_ModemPreset_LONG_SLOW:
-        mode = "LongS";
-        break;
-    case meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST:
-        mode = "LongF";
-        break;
-    case meshtastic_Config_LoRaConfig_ModemPreset_LONG_MODERATE:
-        mode = "LongM";
-        break;
-    case meshtastic_Config_LoRaConfig_ModemPreset_VERY_LONG_SLOW:
-        mode = "VeryL";
-        break;
-    default:
-        mode = "Custom";
-        break;
-    }
+    auto mode = DisplayFormatters::getModemPresetDisplayName(config.lora.modem_preset, true);
 
     display->drawString(x + SCREEN_WIDTH - display->getStringWidth(mode), y, mode);
     if (config.display.heading_bold)
@@ -1857,23 +1736,6 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
     heartbeat = !heartbeat;
 #endif
 }
-// adjust Brightness cycle through 1 to 254 as long as attachDuringLongPress is true
-void Screen::adjustBrightness()
-{
-    if (!useDisplay)
-        return;
-
-    if (brightness == 254) {
-        brightness = 0;
-    } else {
-        brightness++;
-    }
-    int width = brightness / (254.00 / SCREEN_WIDTH);
-    dispdev.drawRect(0, 30, SCREEN_WIDTH, 4);
-    dispdev.fillRect(0, 31, width, 2);
-    dispdev.display();
-    dispdev.setBrightness(brightness);
-}
 
 int Screen::handleStatusUpdate(const meshtastic::Status *arg)
 {

src/graphics/Screen.h

@@ -19,7 +19,6 @@ class Screen
     void setup() {}
     void setOn(bool) {}
     void print(const char *) {}
-    void adjustBrightness() {}
     void doDeepSleep() {}
     void forceDisplay() {}
     void startBluetoothPinScreen(uint32_t pin) {}
@@ -161,7 +160,6 @@ class Screen : public concurrency::OSThread
     void showNextFrame() { enqueueCmd(ScreenCmd{.cmd = Cmd::SHOW_NEXT_FRAME}); }
 
     // Implementation to Adjust Brightness
-    void adjustBrightness();
     uint8_t brightness = BRIGHTNESS_DEFAULT;
 
     /// Starts showing the Bluetooth PIN screen.
@@ -363,6 +361,9 @@ class Screen : public concurrency::OSThread
     /// Try to start drawing ASAP
     void setFastFramerate();
 
+    // Sets frame up for immediate drawing
+    void setFrameImmediateDraw(FrameCallback *drawFrames);
+
     /// Called when debug screen is to be drawn, calls through to debugInfo.drawFrame.
     static void drawDebugInfoTrampoline(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y);
 
@@ -389,7 +390,7 @@ class Screen : public concurrency::OSThread
     SH1106Wire dispdev;
 #elif defined(USE_SSD1306)
     SSD1306Wire dispdev;
-#elif defined(ST7735_CS) || defined(ILI9341_DRIVER) || defined(ST7789_CS)
+#elif defined(ST7735_CS) || defined(ILI9341_DRIVER) || defined(ST7789_CS) || defined(RAK14014)
     TFTDisplay dispdev;
 #elif defined(USE_EINK)
     EInkDisplay dispdev;

src/graphics/TFTDisplay.cpp

@@ -1,4 +1,5 @@
 #include "configuration.h"
+#include "main.h"
 
 #ifndef TFT_BACKLIGHT_ON
 #define TFT_BACKLIGHT_ON HIGH
@@ -81,8 +82,16 @@ class LGFX : public lgfx::LGFX_Device
         {
             auto cfg = _light_instance.config(); // Gets a structure for backlight settings.
 
+#ifdef ST7735_BL_V03
+            if (heltec_version == 3) {
+                cfg.pin_bl = ST7735_BL_V03;
+            } else {
+                cfg.pin_bl = ST7735_BL_V05;
+            }
+#else
             cfg.pin_bl = ST7735_BL; // Pin number to which the backlight is connected
-            cfg.invert = true;      // true to invert the brightness of the backlight
+#endif
+            cfg.invert = true; // true to invert the brightness of the backlight
             // cfg.freq = 44100;    // PWM frequency of backlight
             // cfg.pwm_channel = 1; // PWM channel number to use
 
@@ -96,6 +105,10 @@ class LGFX : public lgfx::LGFX_Device
 
 static LGFX tft;
 
+#elif defined(RAK14014)
+#include <TFT_eSPI.h>
+TFT_eSPI tft = TFT_eSPI();
+
 #elif defined(ST7789_CS)
 #include <LovyanGFX.hpp> // Graphics and font library for ST7735 driver chip
 
@@ -318,7 +331,7 @@ static TFT_eSPI tft = TFT_eSPI(); // Invoke library, pins defined in User_Setup.
 
 #endif
 
-#if defined(ST7735_CS) || defined(ST7789_CS) || defined(ILI9341_DRIVER)
+#if defined(ST7735_CS) || defined(ST7789_CS) || defined(ILI9341_DRIVER) || defined(RAK14014)
 #include "SPILock.h"
 #include "TFTDisplay.h"
 #include <SPI.h>
@@ -364,25 +377,56 @@ void TFTDisplay::sendCommand(uint8_t com)
     // handle display on/off directly
     switch (com) {
     case DISPLAYON: {
+#if defined(ST7735_BACKLIGHT_EN_V03) && defined(TFT_BACKLIGHT_ON)
+        if (heltec_version == 3) {
+            digitalWrite(ST7735_BACKLIGHT_EN_V03, TFT_BACKLIGHT_ON);
+        } else {
+            digitalWrite(ST7735_BACKLIGHT_EN_V05, TFT_BACKLIGHT_ON);
+        }
+#endif
 #if defined(TFT_BL) && defined(TFT_BACKLIGHT_ON)
         digitalWrite(TFT_BL, TFT_BACKLIGHT_ON);
 #endif
+#ifdef VTFT_CTRL_V03
+        if (heltec_version == 3) {
+            digitalWrite(VTFT_CTRL_V03, LOW);
+        } else {
+            digitalWrite(VTFT_CTRL_V05, LOW);
+        }
+#endif
 #ifdef VTFT_CTRL
         digitalWrite(VTFT_CTRL, LOW);
 #endif
-#ifndef M5STACK
+
+#ifdef RAK14014
+#elif !defined(M5STACK)
         tft.setBrightness(128);
 #endif
         break;
     }
     case DISPLAYOFF: {
+#if defined(ST7735_BACKLIGHT_EN_V03) && defined(TFT_BACKLIGHT_ON)
+        if (heltec_version == 3) {
+            digitalWrite(ST7735_BACKLIGHT_EN_V03, !TFT_BACKLIGHT_ON);
+        } else {
+            digitalWrite(ST7735_BACKLIGHT_EN_V05, !TFT_BACKLIGHT_ON);
+        }
+#endif
 #if defined(TFT_BL) && defined(TFT_BACKLIGHT_ON)
         digitalWrite(TFT_BL, !TFT_BACKLIGHT_ON);
 #endif
+#ifdef VTFT_CTRL_V03
+        if (heltec_version == 3) {
+            digitalWrite(VTFT_CTRL_V03, HIGH);
+        } else {
+            digitalWrite(VTFT_CTRL_V05, HIGH);
+        }
+#endif
 #ifdef VTFT_CTRL
         digitalWrite(VTFT_CTRL, HIGH);
 #endif
-#ifndef M5STACK
+#ifdef RAK14014
+#elif !defined(M5STACK)
         tft.setBrightness(0);
 #endif
         break;
@@ -404,7 +448,8 @@ void TFTDisplay::flipScreenVertically()
 
 bool TFTDisplay::hasTouch(void)
 {
-#ifndef M5STACK
+#ifdef RAK14014
+#elif !defined(M5STACK)
     return tft.touch() != nullptr;
 #else
     return false;
@@ -413,7 +458,8 @@ bool TFTDisplay::hasTouch(void)
 
 bool TFTDisplay::getTouch(int16_t *x, int16_t *y)
 {
-#ifndef M5STACK
+#ifdef RAK14014
+#elif !defined(M5STACK)
     return tft.getTouch(x, y);
 #else
     return false;
@@ -434,11 +480,29 @@ bool TFTDisplay::connect()
 #ifdef TFT_BL
     digitalWrite(TFT_BL, TFT_BACKLIGHT_ON);
     pinMode(TFT_BL, OUTPUT);
+    // pinMode(PIN_3V3_EN, OUTPUT);
+    // digitalWrite(PIN_3V3_EN, HIGH);
+    LOG_INFO("Power to TFT Backlight\n");
+#endif
+
+#ifdef ST7735_BACKLIGHT_EN_V03
+    if (heltec_version == 3) {
+        digitalWrite(ST7735_BACKLIGHT_EN_V03, TFT_BACKLIGHT_ON);
+        pinMode(ST7735_BACKLIGHT_EN_V03, OUTPUT);
+    } else {
+        digitalWrite(ST7735_BACKLIGHT_EN_V05, TFT_BACKLIGHT_ON);
+        pinMode(ST7735_BACKLIGHT_EN_V05, OUTPUT);
+    }
 #endif
 
     tft.init();
+
 #if defined(M5STACK)
     tft.setRotation(0);
+#elif defined(RAK14014)
+    tft.setRotation(1);
+    tft.setSwapBytes(true);
+//    tft.fillScreen(TFT_BLACK);
 #elif defined(T_DECK) || defined(PICOMPUTER_S3)
     tft.setRotation(1); // T-Deck has the TFT in landscape
 #elif defined(T_WATCH_S3)
@@ -447,6 +511,7 @@ bool TFTDisplay::connect()
     tft.setRotation(3); // Orient horizontal and wide underneath the silkscreen name label
 #endif
     tft.fillScreen(TFT_BLACK);
+
     return true;
 }
 

src/main.cpp

@@ -29,6 +29,7 @@
 #include "target_specific.h"
 #include <Wire.h>
 #include <memory>
+#include <utility>
 // #include <driver/rtc_io.h>
 
 #include "mesh/eth/ethClient.h"
@@ -66,6 +67,14 @@ NRF52Bluetooth *nrf52Bluetooth;
 #include "platform/portduino/SimRadio.h"
 #endif
 
+#ifdef ARCH_RASPBERRY_PI
+#include "platform/portduino/PiHal.h"
+#include "platform/portduino/PortduinoGlue.h"
+#include <fstream>
+#include <iostream>
+#include <string>
+#endif
+
 #if HAS_BUTTON
 #include "ButtonThread.h"
 #endif
@@ -122,18 +131,37 @@ uint32_t serialSinceMsec;
 
 bool pmu_found;
 
-// Array map of sensor types (as array index) and i2c address as value we'll find in the i2c scan
-uint8_t nodeTelemetrySensorsMap[_meshtastic_TelemetrySensorType_MAX + 1] = {
-    0}; // one is enough, missing elements will be initialized to 0 anyway.
+// Array map of sensor types with i2c address and wire as we'll find in the i2c scan
+std::pair<uint8_t, TwoWire *> nodeTelemetrySensorsMap[_meshtastic_TelemetrySensorType_MAX + 1] = {};
 
 Router *router = NULL; // Users of router don't care what sort of subclass implements that API
 
+#ifdef ARCH_RASPBERRY_PI
+void getPiMacAddr(uint8_t *dmac)
+{
+    std::fstream macIdentity;
+    macIdentity.open("/sys/kernel/debug/bluetooth/hci0/identity", std::ios::in);
+    std::string macLine;
+    getline(macIdentity, macLine);
+    macIdentity.close();
+
+    dmac[0] = strtol(macLine.substr(0, 2).c_str(), NULL, 16);
+    dmac[1] = strtol(macLine.substr(3, 2).c_str(), NULL, 16);
+    dmac[2] = strtol(macLine.substr(6, 2).c_str(), NULL, 16);
+    dmac[3] = strtol(macLine.substr(9, 2).c_str(), NULL, 16);
+    dmac[4] = strtol(macLine.substr(12, 2).c_str(), NULL, 16);
+    dmac[5] = strtol(macLine.substr(15, 2).c_str(), NULL, 16);
+}
+#endif
+
 const char *getDeviceName()
 {
     uint8_t dmac[6];
-
+#ifdef ARCH_RASPBERRY_PI
+    getPiMacAddr(dmac);
+#else
     getMacAddr(dmac);
-
+#endif
     // Meshtastic_ab3c or Shortname_abcd
     static char name[20];
     snprintf(name, sizeof(name), "%02x%02x", dmac[4], dmac[5]);
@@ -146,6 +174,25 @@ const char *getDeviceName()
     return name;
 }
 
+#ifdef VEXT_ENABLE_V03
+
+#include <soc/rtc.h>
+
+static uint32_t calibrate_one(rtc_cal_sel_t cal_clk, const char *name)
+{
+    const uint32_t cal_count = 1000;
+    uint32_t cali_val;
+    for (int i = 0; i < 5; ++i) {
+        cali_val = rtc_clk_cal(cal_clk, cal_count);
+    }
+    return cali_val;
+}
+
+int heltec_version = 3;
+
+#define CALIBRATE_ONE(cali_clk) calibrate_one(cali_clk, #cali_clk)
+#endif
+
 static int32_t ledBlinker()
 {
     static bool ledOn;
@@ -216,11 +263,63 @@ void setup()
     digitalWrite(PIN_EINK_PWR_ON, HIGH);
 #endif
 
-#ifdef VEXT_ENABLE
+#ifdef ST7735_BL_V03 // Heltec Wireless Tracker PCB Change Detect/Hack
+
+    rtc_clk_32k_enable(true);
+    CALIBRATE_ONE(RTC_CAL_RTC_MUX);
+    if (CALIBRATE_ONE(RTC_CAL_32K_XTAL) != 0) {
+        rtc_clk_slow_freq_set(RTC_SLOW_FREQ_32K_XTAL);
+        CALIBRATE_ONE(RTC_CAL_RTC_MUX);
+        CALIBRATE_ONE(RTC_CAL_32K_XTAL);
+    }
+
+    if (rtc_clk_slow_freq_get() != RTC_SLOW_FREQ_32K_XTAL) {
+        heltec_version = 3;
+    } else {
+        heltec_version = 5;
+    }
+#endif
+
+#if defined(VEXT_ENABLE_V03)
+    if (heltec_version == 3) {
+        pinMode(VEXT_ENABLE_V03, OUTPUT);
+        digitalWrite(VEXT_ENABLE_V03, 0); // turn on the display power
+        LOG_DEBUG("HELTEC Detect Tracker V1.0\n");
+    } else {
+        pinMode(VEXT_ENABLE_V05, OUTPUT);
+        digitalWrite(VEXT_ENABLE_V05, 1); // turn on the display power
+        LOG_DEBUG("HELTEC Detect Tracker V1.1\n");
+    }
+#elif defined(VEXT_ENABLE)
     pinMode(VEXT_ENABLE, OUTPUT);
     digitalWrite(VEXT_ENABLE, 0); // turn on the display power
 #endif
 
+#if defined(VGNSS_CTRL_V03)
+    if (heltec_version == 3) {
+        pinMode(VGNSS_CTRL_V03, OUTPUT);
+        digitalWrite(VGNSS_CTRL_V03, LOW);
+    } else {
+        pinMode(VGNSS_CTRL_V05, OUTPUT);
+        digitalWrite(VGNSS_CTRL_V05, LOW);
+    }
+#endif
+
+#if defined(VTFT_CTRL_V03)
+    if (heltec_version == 3) {
+        pinMode(VTFT_CTRL_V03, OUTPUT);
+        digitalWrite(VTFT_CTRL_V03, LOW);
+    } else {
+        pinMode(VTFT_CTRL_V05, OUTPUT);
+        digitalWrite(VTFT_CTRL_V05, LOW);
+    }
+#endif
+
+#if defined(VGNSS_CTRL)
+    pinMode(VGNSS_CTRL, OUTPUT);
+    digitalWrite(VGNSS_CTRL, LOW);
+#endif
+
 #if defined(VTFT_CTRL)
     pinMode(VTFT_CTRL, OUTPUT);
     digitalWrite(VTFT_CTRL, LOW);
@@ -420,7 +519,8 @@ void setup()
     {                                                                                                                            \
         auto found = i2cScanner->find(SCANNER_T);                                                                                \
         if (found.type != ScanI2C::DeviceType::NONE) {                                                                           \
-            nodeTelemetrySensorsMap[PB_T] = found.address.address;                                                               \
+            nodeTelemetrySensorsMap[PB_T].first = found.address.address;                                                         \
+            nodeTelemetrySensorsMap[PB_T].second = i2cScanner->fetchI2CBus(found.address);                                       \
             LOG_DEBUG("found i2c sensor %s\n", STRING(PB_T));                                                                    \
         }                                                                                                                        \
     }
@@ -430,6 +530,7 @@ void setup()
     SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::BMP_280, meshtastic_TelemetrySensorType_BMP280)
     SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::INA260, meshtastic_TelemetrySensorType_INA260)
     SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::INA219, meshtastic_TelemetrySensorType_INA219)
+    SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::INA3221, meshtastic_TelemetrySensorType_INA3221)
     SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::MCP9808, meshtastic_TelemetrySensorType_MCP9808)
     SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::MCP9808, meshtastic_TelemetrySensorType_MCP9808)
     SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::SHT31, meshtastic_TelemetrySensorType_SHT31)
@@ -589,7 +690,37 @@ void setup()
     digitalWrite(SX126X_ANT_SW, 1);
 #endif
 
-#ifdef HW_SPI1_DEVICE
+#ifdef ARCH_RASPBERRY_PI
+    if (settingsMap[use_sx1262]) {
+        if (!rIf) {
+            PiHal *RadioLibHAL = new PiHal(1);
+            rIf = new SX1262Interface((LockingArduinoHal *)RadioLibHAL, settingsMap[cs], settingsMap[irq], settingsMap[reset],
+                                      settingsMap[busy]);
+            if (!rIf->init()) {
+                LOG_ERROR("Failed to find SX1262 radio\n");
+                delete rIf;
+                exit(EXIT_FAILURE);
+            } else {
+                LOG_INFO("SX1262 Radio init succeeded, using SX1262 radio\n");
+            }
+        }
+    } else if (settingsMap[use_rf95]) {
+        if (!rIf) {
+            PiHal *RadioLibHAL = new PiHal(1);
+            rIf = new RF95Interface((LockingArduinoHal *)RadioLibHAL, settingsMap[cs], settingsMap[irq], settingsMap[reset],
+                                    settingsMap[busy]);
+            if (!rIf->init()) {
+                LOG_ERROR("Failed to find RF95 radio\n");
+                delete rIf;
+                rIf = NULL;
+                exit(EXIT_FAILURE);
+            } else {
+                LOG_INFO("RF95 Radio init succeeded, using RF95 radio\n");
+            }
+        }
+    }
+
+#elif defined(HW_SPI1_DEVICE)
     LockingArduinoHal *RadioLibHAL = new LockingArduinoHal(SPI1, spiSettings);
 #else // HW_SPI1_DEVICE
     LockingArduinoHal *RadioLibHAL = new LockingArduinoHal(SPI, spiSettings);
@@ -635,7 +766,7 @@ void setup()
     }
 #endif
 
-#if defined(USE_SX1262)
+#if defined(USE_SX1262) && !defined(ARCH_RASPBERRY_PI)
     if (!rIf) {
         rIf = new SX1262Interface(RadioLibHAL, SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY);
         if (!rIf->init()) {

src/main.h

@@ -56,6 +56,7 @@ extern graphics::Screen *screen;
 
 // Return a human readable string of the form "Meshtastic_ab13"
 const char *getDeviceName();
+void getPiMacAddr(uint8_t *dmac);
 
 extern uint32_t timeLastPowered;
 
@@ -64,6 +65,8 @@ extern uint32_t shutdownAtMsec;
 
 extern uint32_t serialSinceMsec;
 
+extern int heltec_version;
+
 // If a thread does something that might need for it to be rescheduled ASAP it can set this flag
 // This will suppress the current delay and instead try to run ASAP.
 extern bool runASAP;

src/mesh/Channels.cpp

@@ -1,5 +1,6 @@
 #include "Channels.h"
 #include "CryptoEngine.h"
+#include "DisplayFormatters.h"
 #include "NodeDB.h"
 #include "configuration.h"
 
@@ -239,38 +240,9 @@ const char *Channels::getName(size_t chIndex)
     const char *channelName = channelSettings.name;
     if (!*channelName) { // emptystring
         // Per mesh.proto spec, if bandwidth is specified we must ignore modemPreset enum, we assume that in that case
-        // the app fucked up and forgot to set channelSettings.name
-
+        // the app effed up and forgot to set channelSettings.name
         if (config.lora.use_preset) {
-            switch (config.lora.modem_preset) {
-            case meshtastic_Config_LoRaConfig_ModemPreset_SHORT_SLOW:
-                channelName = "ShortSlow";
-                break;
-            case meshtastic_Config_LoRaConfig_ModemPreset_SHORT_FAST:
-                channelName = "ShortFast";
-                break;
-            case meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_SLOW:
-                channelName = "MediumSlow";
-                break;
-            case meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST:
-                channelName = "MediumFast";
-                break;
-            case meshtastic_Config_LoRaConfig_ModemPreset_LONG_SLOW:
-                channelName = "LongSlow";
-                break;
-            case meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST:
-                channelName = "LongFast";
-                break;
-            case meshtastic_Config_LoRaConfig_ModemPreset_LONG_MODERATE:
-                channelName = "LongMod";
-                break;
-            case meshtastic_Config_LoRaConfig_ModemPreset_VERY_LONG_SLOW:
-                channelName = "VLongSlow";
-                break;
-            default:
-                channelName = "Invalid";
-                break;
-            }
+            channelName = DisplayFormatters::getModemPresetDisplayName(config.lora.modem_preset, false);
         } else {
             channelName = "Custom";
         }

src/mesh/MeshService.cpp

@@ -267,14 +267,22 @@ void MeshService::sendNetworkPing(NodeNum dest, bool wantReplies)
 
 void MeshService::sendToPhone(meshtastic_MeshPacket *p)
 {
+    perhapsDecode(p);
+
     if (toPhoneQueue.numFree() == 0) {
-        LOG_WARN("ToPhone queue is full, discarding oldest\n");
-        meshtastic_MeshPacket *d = toPhoneQueue.dequeuePtr(0);
-        if (d)
-            releaseToPool(d);
+        if (p->decoded.portnum == meshtastic_PortNum_TEXT_MESSAGE_APP ||
+            p->decoded.portnum == meshtastic_PortNum_RANGE_TEST_APP) {
+            LOG_WARN("ToPhone queue is full, discarding oldest\n");
+            meshtastic_MeshPacket *d = toPhoneQueue.dequeuePtr(0);
+            if (d)
+                releaseToPool(d);
+        } else {
+            LOG_WARN("ToPhone queue is full, dropping packet.\n");
+            releaseToPool(p);
+            return;
+        }
     }
 
-    perhapsDecode(p);
     assert(toPhoneQueue.enqueue(p, 0));
     fromNum++;
 }
@@ -335,7 +343,7 @@ int MeshService::onGPSChanged(const meshtastic::GPSStatus *newStatus)
     // Used fixed position if configured regalrdless of GPS lock
     if (config.position.fixed_position) {
         LOG_WARN("Using fixed position\n");
-        pos = ConvertToPosition(node->position);
+        pos = TypeConversions::ConvertToPosition(node->position);
     }
 
     // Add a fresh timestamp

src/mesh/NodeDB.cpp

@@ -254,6 +254,8 @@ void NodeDB::installDefaultModuleConfig()
     strncpy(moduleConfig.mqtt.address, default_mqtt_address, sizeof(moduleConfig.mqtt.address));
     strncpy(moduleConfig.mqtt.username, default_mqtt_username, sizeof(moduleConfig.mqtt.username));
     strncpy(moduleConfig.mqtt.password, default_mqtt_password, sizeof(moduleConfig.mqtt.password));
+    strncpy(moduleConfig.mqtt.root, default_mqtt_root, sizeof(moduleConfig.mqtt.root));
+    moduleConfig.mqtt.encryption_enabled = true;
 
     moduleConfig.has_neighbor_info = true;
     moduleConfig.neighbor_info.enabled = false;
@@ -285,6 +287,15 @@ void NodeDB::installRoleDefaults(meshtastic_Config_DeviceConfig_Role role)
     } else if (role == meshtastic_Config_DeviceConfig_Role_SENSOR) {
         moduleConfig.telemetry.environment_measurement_enabled = true;
         moduleConfig.telemetry.environment_update_interval = 300;
+    } else if (role == meshtastic_Config_DeviceConfig_Role_TAK) {
+        config.device.node_info_broadcast_secs = ONE_DAY;
+        config.position.position_broadcast_smart_enabled = false;
+        config.position.position_broadcast_secs = ONE_DAY;
+        // Remove Altitude MSL from flags since CoTs use HAE (height above ellipsoid)
+        config.position.position_flags =
+            (meshtastic_Config_PositionConfig_PositionFlags_ALTITUDE | meshtastic_Config_PositionConfig_PositionFlags_SPEED |
+             meshtastic_Config_PositionConfig_PositionFlags_HEADING | meshtastic_Config_PositionConfig_PositionFlags_DOP);
+        moduleConfig.telemetry.device_update_interval = ONE_DAY;
     }
 }
 
@@ -305,13 +316,27 @@ void NodeDB::installDefaultChannels()
 
 void NodeDB::resetNodes()
 {
-    devicestate.node_db_lite_count = 0;
-    memset(devicestate.node_db_lite, 0, sizeof(devicestate.node_db_lite));
+    devicestate.node_db_lite_count = 1;
+    std::fill(&devicestate.node_db_lite[1], &devicestate.node_db_lite[MAX_NUM_NODES - 1], meshtastic_NodeInfoLite());
     saveDeviceStateToDisk();
     if (neighborInfoModule && moduleConfig.neighbor_info.enabled)
         neighborInfoModule->resetNeighbors();
 }
 
+void NodeDB::removeNodeByNum(uint nodeNum)
+{
+    int newPos = 0, removed = 0;
+    for (int i = 0; i < *numMeshNodes; i++) {
+        if (meshNodes[i].num != nodeNum)
+            meshNodes[newPos++] = meshNodes[i];
+        else
+            removed++;
+    }
+    *numMeshNodes -= removed;
+    LOG_DEBUG("NodeDB::removeNodeByNum purged %d entries. Saving changes...\n", removed);
+    saveDeviceStateToDisk();
+}
+
 void NodeDB::cleanupMeshDB()
 {
     int newPos = 0, removed = 0;
@@ -410,7 +435,11 @@ void NodeDB::init()
  */
 void NodeDB::pickNewNodeNum()
 {
+#ifdef ARCH_RASPBERRY_PI
+    getPiMacAddr(ourMacAddr); // Make sure ourMacAddr is set
+#else
     getMacAddr(ourMacAddr); // Make sure ourMacAddr is set
+#endif
 
     // Pick an initial nodenum based on the macaddr
     NodeNum nodeNum = (ourMacAddr[2] << 24) | (ourMacAddr[3] << 16) | (ourMacAddr[4] << 8) | ourMacAddr[5];
@@ -422,6 +451,7 @@ void NodeDB::pickNewNodeNum()
         LOG_WARN("NOTE! Our desired nodenum 0x%x is invalid or in use, so trying for 0x%x\n", nodeNum, candidate);
         nodeNum = candidate;
     }
+    LOG_WARN("Using nodenum 0x%x \n", nodeNum);
 
     myNodeInfo.my_node_num = nodeNum;
 }
@@ -687,8 +717,8 @@ void NodeDB::updatePosition(uint32_t nodeId, const meshtastic_Position &p, RxSou
         LOG_INFO("updatePosition LOCAL pos@%x, time=%u, latI=%d, lonI=%d, alt=%d\n", p.timestamp, p.time, p.latitude_i,
                  p.longitude_i, p.altitude);
 
-        info->position = ConvertToPositionLite(p);
-        localPosition = p;
+        setLocalPosition(p);
+        info->position = TypeConversions::ConvertToPositionLite(p);
     } else if ((p.time > 0) && !p.latitude_i && !p.longitude_i && !p.timestamp && !p.location_source) {
         // FIXME SPECIAL TIME SETTING PACKET FROM EUD TO RADIO
         // (stop-gap fix for issue #900)
@@ -706,7 +736,7 @@ void NodeDB::updatePosition(uint32_t nodeId, const meshtastic_Position &p, RxSou
         uint32_t tmp_time = info->position.time;
 
         // Next, update atomically
-        info->position = ConvertToPositionLite(p);
+        info->position = TypeConversions::ConvertToPositionLite(p);
 
         // Last, restore any fields that may have been overwritten
         if (!info->position.time)

src/mesh/NodeDB.h

@@ -111,7 +111,7 @@ class NodeDB
     /// Return the number of nodes we've heard from recently (within the last 2 hrs?)
     size_t getNumOnlineMeshNodes();
 
-    void initConfigIntervals(), initModuleConfigIntervals(), resetNodes();
+    void initConfigIntervals(), initModuleConfigIntervals(), resetNodes(), removeNodeByNum(uint nodeNum);
 
     bool factoryReset();
 
@@ -131,6 +131,13 @@ class NodeDB
     meshtastic_NodeInfoLite *getMeshNode(NodeNum n);
     size_t getNumMeshNodes() { return *numMeshNodes; }
 
+    void setLocalPosition(meshtastic_Position position)
+    {
+        LOG_DEBUG("Setting local position: latitude=%i, longitude=%i, time=%i\n", position.latitude_i, position.longitude_i,
+                  position.time);
+        localPosition = position;
+    }
+
   private:
     /// Find a node in our DB, create an empty NodeInfoLite if missing
     meshtastic_NodeInfoLite *getOrCreateMeshNode(NodeNum n);
@@ -197,6 +204,7 @@ extern NodeDB nodeDB;
 #define default_mqtt_address "mqtt.meshtastic.org"
 #define default_mqtt_username "meshdev"
 #define default_mqtt_password "large4cats"
+#define default_mqtt_root "msh"
 
 inline uint32_t getConfiguredOrDefaultMs(uint32_t configuredInterval)
 {

src/mesh/PacketHistory.h

@@ -3,8 +3,8 @@
 #include "Router.h"
 #include <unordered_set>
 
-/// We clear our old flood record five minute after we see the last of it
-#define FLOOD_EXPIRE_TIME (5 * 60 * 1000L)
+/// We clear our old flood record 10 minutes after we see the last of it
+#define FLOOD_EXPIRE_TIME (10 * 60 * 1000L)
 
 /**
  * A record of a recent message broadcast

src/mesh/PhoneAPI.cpp

@@ -294,6 +294,10 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
             fromRadioScratch.moduleConfig.which_payload_variant = meshtastic_ModuleConfig_detection_sensor_tag;
             fromRadioScratch.moduleConfig.payload_variant.detection_sensor = moduleConfig.detection_sensor;
             break;
+        case meshtastic_ModuleConfig_ambient_lighting_tag:
+            fromRadioScratch.moduleConfig.which_payload_variant = meshtastic_ModuleConfig_ambient_lighting_tag;
+            fromRadioScratch.moduleConfig.payload_variant.ambient_lighting = moduleConfig.ambient_lighting;
+            break;
         default:
             LOG_ERROR("Unknown module config type %d\n", config_state);
         }
@@ -405,7 +409,7 @@ bool PhoneAPI::available()
         if (nodeInfoForPhone.num == 0) {
             auto nextNode = nodeDB.readNextMeshNode(readIndex);
             if (nextNode) {
-                nodeInfoForPhone = ConvertToNodeInfo(nextNode);
+                nodeInfoForPhone = TypeConversions::ConvertToNodeInfo(nextNode);
             }
         }
         return true; // Always say we have something, because we might need to advance our state machine

src/mesh/RF95Interface.cpp

@@ -37,9 +37,6 @@ bool RF95Interface::init()
 {
     RadioLibInterface::init();
 
-    if (power == 0)
-        power = POWER_DEFAULT;
-
     if (power > MAX_POWER) // This chip has lower power limits than some
         power = MAX_POWER;
 

src/mesh/RadioInterface.cpp

@@ -384,27 +384,27 @@ void RadioInterface::applyModemConfig()
         switch (loraConfig.modem_preset) {
         case meshtastic_Config_LoRaConfig_ModemPreset_SHORT_FAST:
             bw = (myRegion->wideLora) ? 812.5 : 250;
-            cr = 8;
+            cr = 5;
             sf = 7;
             break;
         case meshtastic_Config_LoRaConfig_ModemPreset_SHORT_SLOW:
             bw = (myRegion->wideLora) ? 812.5 : 250;
-            cr = 8;
+            cr = 5;
             sf = 8;
             break;
         case meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST:
             bw = (myRegion->wideLora) ? 812.5 : 250;
-            cr = 8;
+            cr = 5;
             sf = 9;
             break;
         case meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_SLOW:
             bw = (myRegion->wideLora) ? 812.5 : 250;
-            cr = 8;
+            cr = 5;
             sf = 10;
             break;
         default: // Config_LoRaConfig_ModemPreset_LONG_FAST is default. Gracefully use this is preset is something illegal.
             bw = (myRegion->wideLora) ? 812.5 : 250;
-            cr = 8;
+            cr = 5;
             sf = 11;
             break;
         case meshtastic_Config_LoRaConfig_ModemPreset_LONG_MODERATE:
@@ -448,7 +448,9 @@ void RadioInterface::applyModemConfig()
         power = myRegion->powerLimit;
 
     if (power == 0)
-        power = 17; // Default to default power if we don't have a valid power
+        power = 17; // Default to this power level if we don't have a valid regional power limit (powerLimit of myRegion defaults
+                    // to 0, currently no region has an actual power limit of 0 [dBm] so we can assume regions which have this
+                    // variable set to 0 don't have a valid power limit)
 
     // Set final tx_power back onto config
     loraConfig.tx_power = (int8_t)power; // cppcheck-suppress assignmentAddressToInteger

src/mesh/RadioInterface.h

@@ -56,7 +56,7 @@ class RadioInterface
 
     float bw = 125;
     uint8_t sf = 9;
-    uint8_t cr = 7;
+    uint8_t cr = 5;
     /** Slottime is the minimum time to wait, consisting of:
       - CAD duration (maximum of SX126x and SX127x);
       - roundtrip air propagation time (assuming max. 30km between nodes);
@@ -223,4 +223,4 @@ class RadioInterface
 };
 
 /// Debug printing for packets
-void printPacket(const char *prefix, const meshtastic_MeshPacket *p);
+void printPacket(const char *prefix, const meshtastic_MeshPacket *p);

src/mesh/Router.cpp

@@ -249,29 +249,12 @@ ErrorCode Router::send(meshtastic_MeshPacket *p)
     if (p->which_payload_variant == meshtastic_MeshPacket_decoded_tag) {
         ChannelIndex chIndex = p->channel; // keep as a local because we are about to change it
 
-        bool shouldActuallyEncrypt = true;
-
         if (moduleConfig.mqtt.enabled) {
-            // check if we should send decrypted packets to mqtt
 
-            // truth table:
-            /* mqtt_server  mqtt_encryption_enabled should_encrypt
-             *    not set                        0              1
-             *    not set                        1              1
-             *        set                        0              0
-             *        set                        1              1
-             *
-             * => so we only decrypt mqtt if they have a custom mqtt server AND mqtt_encryption_enabled is FALSE
-             */
-
-            if (*moduleConfig.mqtt.address && !moduleConfig.mqtt.encryption_enabled) {
-                shouldActuallyEncrypt = false;
-            }
-
-            LOG_INFO("Should encrypt MQTT?: %d\n", shouldActuallyEncrypt);
+            LOG_INFO("Should encrypt MQTT?: %d\n", moduleConfig.mqtt.encryption_enabled);
 
             // the packet is currently in a decrypted state.  send it now if they want decrypted packets
-            if (mqtt && !shouldActuallyEncrypt)
+            if (mqtt && !moduleConfig.mqtt.encryption_enabled)
                 mqtt->onSend(*p, chIndex);
         }
 
@@ -284,7 +267,7 @@ ErrorCode Router::send(meshtastic_MeshPacket *p)
         if (moduleConfig.mqtt.enabled) {
             // the packet is now encrypted.
             // check if we should send encrypted packets to mqtt
-            if (mqtt && shouldActuallyEncrypt)
+            if (mqtt && moduleConfig.mqtt.encryption_enabled)
                 mqtt->onSend(*p, chIndex);
         }
     }

src/mesh/STM32WLE5JCInterface.cpp

@@ -20,9 +20,6 @@ bool STM32WLE5JCInterface::init()
 
     lora.setRfSwitchTable(rfswitch_pins, rfswitch_table);
 
-    if (power == 0)
-        power = STM32WLx_MAX_POWER;
-
     if (power > STM32WLx_MAX_POWER) // This chip has lower power limits than some
         power = STM32WLx_MAX_POWER;
 

src/mesh/SX126xInterface.cpp

@@ -2,6 +2,9 @@
 #include "configuration.h"
 #include "error.h"
 #include "mesh/NodeDB.h"
+#ifdef ARCH_RASPBERRY_PI
+#include "PortduinoGlue.h"
+#endif
 
 // Particular boards might define a different max power based on what their hardware can do, default to max power output if not
 // specified (may be dangerous if using external PA and SX126x power config forgotten)
@@ -43,6 +46,7 @@ template <typename T> bool SX126xInterface<T>::init()
     bool useRegulatorLDO = false; // Seems to depend on the connection to pin 9/DCC_SW - if an inductor DCDC?
 
     RadioLibInterface::init();
+
     if (power > SX126X_MAX_POWER) // Clamp power to maximum defined level
         power = SX126X_MAX_POWER;
 
@@ -73,6 +77,12 @@ template <typename T> bool SX126xInterface<T>::init()
 #ifdef SX126X_DIO2_AS_RF_SWITCH
     LOG_DEBUG("Setting DIO2 as RF switch\n");
     bool dio2AsRfSwitch = true;
+#elif defined(ARCH_RASPBERRY_PI)
+    bool dio2AsRfSwitch = false;
+    if (settingsMap[dio2_as_rf_switch]) {
+        LOG_DEBUG("Setting DIO2 as RF switch\n");
+        dio2AsRfSwitch = true;
+    }
 #else
     LOG_DEBUG("Setting DIO2 as not RF switch\n");
     bool dio2AsRfSwitch = false;
@@ -317,4 +327,4 @@ template <typename T> bool SX126xInterface<T>::sleep()
 #endif
 
     return true;
-}
+}

src/mesh/SX128xInterface.cpp

@@ -42,9 +42,6 @@ template <typename T> bool SX128xInterface<T>::init()
 
     RadioLibInterface::init();
 
-    if (power == 0)
-        power = SX128X_MAX_POWER;
-
     if (power > SX128X_MAX_POWER) // This chip has lower power limits than some
         power = SX128X_MAX_POWER;
 

src/mesh/TypeConversions.cpp

@@ -0,0 +1,55 @@
+#include "TypeConversions.h"
+#include "mesh/generated/meshtastic/deviceonly.pb.h"
+#include "mesh/generated/meshtastic/mesh.pb.h"
+
+meshtastic_NodeInfo TypeConversions::ConvertToNodeInfo(const meshtastic_NodeInfoLite *lite)
+{
+    meshtastic_NodeInfo info = meshtastic_NodeInfo_init_default;
+
+    info.num = lite->num;
+    info.snr = lite->snr;
+    info.last_heard = lite->last_heard;
+    info.channel = lite->channel;
+
+    if (lite->has_position) {
+        info.has_position = true;
+        info.position.latitude_i = lite->position.latitude_i;
+        info.position.longitude_i = lite->position.longitude_i;
+        info.position.altitude = lite->position.altitude;
+        info.position.location_source = lite->position.location_source;
+        info.position.time = lite->position.time;
+    }
+    if (lite->has_user) {
+        info.has_user = true;
+        info.user = lite->user;
+    }
+    if (lite->has_device_metrics) {
+        info.has_device_metrics = true;
+        info.device_metrics = lite->device_metrics;
+    }
+    return info;
+}
+
+meshtastic_PositionLite TypeConversions::ConvertToPositionLite(meshtastic_Position position)
+{
+    meshtastic_PositionLite lite = meshtastic_PositionLite_init_default;
+    lite.latitude_i = position.latitude_i;
+    lite.longitude_i = position.longitude_i;
+    lite.altitude = position.altitude;
+    lite.location_source = position.location_source;
+    lite.time = position.time;
+
+    return lite;
+}
+
+meshtastic_Position TypeConversions::ConvertToPosition(meshtastic_PositionLite lite)
+{
+    meshtastic_Position position = meshtastic_Position_init_default;
+    position.latitude_i = lite.latitude_i;
+    position.longitude_i = lite.longitude_i;
+    position.altitude = lite.altitude;
+    position.location_source = lite.location_source;
+    position.time = lite.time;
+
+    return position;
+}

src/mesh/TypeConversions.h

@@ -1,54 +1,13 @@
 #include "mesh/generated/meshtastic/deviceonly.pb.h"
 #include "mesh/generated/meshtastic/mesh.pb.h"
 
-inline static meshtastic_NodeInfo ConvertToNodeInfo(const meshtastic_NodeInfoLite *lite)
+#pragma once
+#include "NodeDB.h"
+
+class TypeConversions
 {
-    meshtastic_NodeInfo info = meshtastic_NodeInfo_init_default;
-
-    info.num = lite->num;
-    info.snr = lite->snr;
-    info.last_heard = lite->last_heard;
-    info.channel = lite->channel;
-
-    if (lite->has_position) {
-        info.has_position = true;
-        info.position.latitude_i = lite->position.latitude_i;
-        info.position.longitude_i = lite->position.longitude_i;
-        info.position.altitude = lite->position.altitude;
-        info.position.location_source = lite->position.location_source;
-        info.position.time = lite->position.time;
-    }
-    if (lite->has_user) {
-        info.has_user = true;
-        info.user = lite->user;
-    }
-    if (lite->has_device_metrics) {
-        info.has_device_metrics = true;
-        info.device_metrics = lite->device_metrics;
-    }
-    return info;
-}
-
-inline static meshtastic_PositionLite ConvertToPositionLite(meshtastic_Position position)
-{
-    meshtastic_PositionLite lite = meshtastic_PositionLite_init_default;
-    lite.latitude_i = position.latitude_i;
-    lite.longitude_i = position.longitude_i;
-    lite.altitude = position.altitude;
-    lite.location_source = position.location_source;
-    lite.time = position.time;
-
-    return lite;
-}
-
-inline static meshtastic_Position ConvertToPosition(meshtastic_PositionLite lite)
-{
-    meshtastic_Position position = meshtastic_Position_init_default;
-    position.latitude_i = lite.latitude_i;
-    position.longitude_i = lite.longitude_i;
-    position.altitude = lite.altitude;
-    position.location_source = lite.location_source;
-    position.time = lite.time;
-
-    return position;
-}
+  public:
+    static meshtastic_NodeInfo ConvertToNodeInfo(const meshtastic_NodeInfoLite *lite);
+    static meshtastic_PositionLite ConvertToPositionLite(meshtastic_Position position);
+    static meshtastic_Position ConvertToPosition(meshtastic_PositionLite lite);
+};

src/mesh/generated/meshtastic/admin.pb.h

@@ -145,6 +145,8 @@ typedef struct _meshtastic_AdminMessage {
         char set_canned_message_module_messages[201];
         /* Set the ringtone for ExternalNotification. */
         char set_ringtone_message[231];
+        /* Remove the node by the specified node-num from the NodeDB on the device */
+        uint32_t remove_by_nodenum;
         /* Begins an edit transaction for config, module config, owner, and channel settings changes
      This will delay the standard *implicit* save to the file system and subsequent reboot behavior until committed (commit_edit_settings) */
         bool begin_edit_settings;
@@ -226,6 +228,7 @@ extern "C" {
 #define meshtastic_AdminMessage_set_module_config_tag 35
 #define meshtastic_AdminMessage_set_canned_message_module_messages_tag 36
 #define meshtastic_AdminMessage_set_ringtone_message_tag 37
+#define meshtastic_AdminMessage_remove_by_nodenum_tag 38
 #define meshtastic_AdminMessage_begin_edit_settings_tag 64
 #define meshtastic_AdminMessage_commit_edit_settings_tag 65
 #define meshtastic_AdminMessage_reboot_ota_seconds_tag 95
@@ -262,6 +265,7 @@ X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,set_config,set_config),  34)
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,set_module_config,set_module_config),  35) \
 X(a, STATIC,   ONEOF,    STRING,   (payload_variant,set_canned_message_module_messages,set_canned_message_module_messages),  36) \
 X(a, STATIC,   ONEOF,    STRING,   (payload_variant,set_ringtone_message,set_ringtone_message),  37) \
+X(a, STATIC,   ONEOF,    UINT32,   (payload_variant,remove_by_nodenum,remove_by_nodenum),  38) \
 X(a, STATIC,   ONEOF,    BOOL,     (payload_variant,begin_edit_settings,begin_edit_settings),  64) \
 X(a, STATIC,   ONEOF,    BOOL,     (payload_variant,commit_edit_settings,commit_edit_settings),  65) \
 X(a, STATIC,   ONEOF,    INT32,    (payload_variant,reboot_ota_seconds,reboot_ota_seconds),  95) \

src/mesh/generated/meshtastic/config.pb.h

@@ -38,7 +38,12 @@ typedef enum _meshtastic_Config_DeviceConfig_Role {
    Telemetry Mesh packets will be prioritized higher and sent more frequently by default.
    When used in conjunction with power.is_power_saving = true, nodes will wake up, 
    send environment telemetry, and then sleep for telemetry.environment_update_interval seconds. */
-    meshtastic_Config_DeviceConfig_Role_SENSOR = 6
+    meshtastic_Config_DeviceConfig_Role_SENSOR = 6,
+    /* TAK device role
+    Used for nodes dedicated for connection to an ATAK EUD.
+    Turns off many of the routine broadcasts to favor CoT packet stream
+    from the Meshtastic ATAK plugin -> IMeshService -> Node */
+    meshtastic_Config_DeviceConfig_Role_TAK = 7
 } meshtastic_Config_DeviceConfig_Role;
 
 /* Defines the device's behavior for how messages are rebroadcast */
@@ -338,7 +343,7 @@ typedef struct _meshtastic_Config_NetworkConfig {
  acquire an address via DHCP */
     char wifi_ssid[33];
     /* If set, will be use to authenticate to the named wifi */
-    char wifi_psk[64];
+    char wifi_psk[65];
     /* NTP server to use if WiFi is conneced, defaults to `0.pool.ntp.org` */
     char ntp_server[33];
     /* Enable Ethernet */
@@ -474,8 +479,8 @@ extern "C" {
 
 /* Helper constants for enums */
 #define _meshtastic_Config_DeviceConfig_Role_MIN meshtastic_Config_DeviceConfig_Role_CLIENT
-#define _meshtastic_Config_DeviceConfig_Role_MAX meshtastic_Config_DeviceConfig_Role_SENSOR
-#define _meshtastic_Config_DeviceConfig_Role_ARRAYSIZE ((meshtastic_Config_DeviceConfig_Role)(meshtastic_Config_DeviceConfig_Role_SENSOR+1))
+#define _meshtastic_Config_DeviceConfig_Role_MAX meshtastic_Config_DeviceConfig_Role_TAK
+#define _meshtastic_Config_DeviceConfig_Role_ARRAYSIZE ((meshtastic_Config_DeviceConfig_Role)(meshtastic_Config_DeviceConfig_Role_TAK+1))
 
 #define _meshtastic_Config_DeviceConfig_RebroadcastMode_MIN meshtastic_Config_DeviceConfig_RebroadcastMode_ALL
 #define _meshtastic_Config_DeviceConfig_RebroadcastMode_MAX meshtastic_Config_DeviceConfig_RebroadcastMode_LOCAL_ONLY
@@ -785,10 +790,10 @@ extern const pb_msgdesc_t meshtastic_Config_BluetoothConfig_msg;
 #define meshtastic_Config_DisplayConfig_size     28
 #define meshtastic_Config_LoRaConfig_size        77
 #define meshtastic_Config_NetworkConfig_IpV4Config_size 20
-#define meshtastic_Config_NetworkConfig_size     195
+#define meshtastic_Config_NetworkConfig_size     196
 #define meshtastic_Config_PositionConfig_size    60
 #define meshtastic_Config_PowerConfig_size       40
-#define meshtastic_Config_size                   198
+#define meshtastic_Config_size                   199
 
 #ifdef __cplusplus
 } /* extern "C" */

src/mesh/generated/meshtastic/deviceonly.pb.h

@@ -316,7 +316,7 @@ extern const pb_msgdesc_t meshtastic_NodeRemoteHardwarePin_msg;
 #define meshtastic_DeviceState_size              16854
 #define meshtastic_NodeInfoLite_size             151
 #define meshtastic_NodeRemoteHardwarePin_size    29
-#define meshtastic_OEMStore_size                 3218
+#define meshtastic_OEMStore_size                 3231
 #define meshtastic_PositionLite_size             28
 
 #ifdef __cplusplus

src/mesh/generated/meshtastic/localonly.pb.h

@@ -174,8 +174,8 @@ extern const pb_msgdesc_t meshtastic_LocalModuleConfig_msg;
 #define meshtastic_LocalModuleConfig_fields &meshtastic_LocalModuleConfig_msg
 
 /* Maximum encoded size of messages (where known) */
-#define meshtastic_LocalConfig_size              463
-#define meshtastic_LocalModuleConfig_size        609
+#define meshtastic_LocalConfig_size              464
+#define meshtastic_LocalModuleConfig_size        621
 
 #ifdef __cplusplus
 } /* extern "C" */

src/mesh/generated/meshtastic/mesh.pb.h

@@ -113,6 +113,8 @@ typedef enum _meshtastic_HardwareModel {
     meshtastic_HardwareModel_PICOMPUTER_S3 = 52,
     /* Heltec HT-CT62 with ESP32-C3 CPU and SX1262 LoRa */
     meshtastic_HardwareModel_HELTEC_HT62 = 53,
+    /* EBYTE SPI LoRa module and ESP32-S3 */
+    meshtastic_HardwareModel_EBYTE_ESP32_S3 = 54,
     /* ------------------------------------------------------------------------------------------------------------------------------------------
  Reserved ID For developing private Ports. These will show up in live traffic sparsely, so we can use a high number. Keep it within 8 bits.
  ------------------------------------------------------------------------------------------------------------------------------------------ */

src/mesh/generated/meshtastic/module_config.pb.h

@@ -232,6 +232,9 @@ typedef struct _meshtastic_ModuleConfig_ExternalNotificationConfig {
  Default is 0 which means don't repeat at all. 60 would mean blink
  and/or beep for 60 seconds */
     uint16_t nag_timeout;
+    /* When true, enables devices with native I2S audio output to use the RTTTL over speaker like a buzzer
+ T-Watch S3 and T-Deck for example have this capability */
+    bool use_i2s_as_buzzer;
 } meshtastic_ModuleConfig_ExternalNotificationConfig;
 
 /* Store and Forward Module Config */
@@ -278,6 +281,15 @@ typedef struct _meshtastic_ModuleConfig_TelemetryConfig {
     /* Interval in seconds of how often we should try to send our
  air quality metrics to the mesh */
     uint32_t air_quality_interval;
+    /* Interval in seconds of how often we should try to send our
+ air quality metrics to the mesh */
+    bool power_measurement_enabled;
+    /* Interval in seconds of how often we should try to send our
+ air quality metrics to the mesh */
+    uint32_t power_update_interval;
+    /* Interval in seconds of how often we should try to send our
+ air quality metrics to the mesh */
+    bool power_screen_enabled;
 } meshtastic_ModuleConfig_TelemetryConfig;
 
 /* TODO: REPLACE */
@@ -431,10 +443,10 @@ extern "C" {
 #define meshtastic_ModuleConfig_DetectionSensorConfig_init_default {0, 0, 0, 0, "", 0, 0, 0}
 #define meshtastic_ModuleConfig_AudioConfig_init_default {0, 0, _meshtastic_ModuleConfig_AudioConfig_Audio_Baud_MIN, 0, 0, 0, 0}
 #define meshtastic_ModuleConfig_SerialConfig_init_default {0, 0, 0, 0, _meshtastic_ModuleConfig_SerialConfig_Serial_Baud_MIN, 0, _meshtastic_ModuleConfig_SerialConfig_Serial_Mode_MIN, 0}
-#define meshtastic_ModuleConfig_ExternalNotificationConfig_init_default {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+#define meshtastic_ModuleConfig_ExternalNotificationConfig_init_default {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 #define meshtastic_ModuleConfig_StoreForwardConfig_init_default {0, 0, 0, 0, 0}
 #define meshtastic_ModuleConfig_RangeTestConfig_init_default {0, 0, 0}
-#define meshtastic_ModuleConfig_TelemetryConfig_init_default {0, 0, 0, 0, 0, 0, 0}
+#define meshtastic_ModuleConfig_TelemetryConfig_init_default {0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 #define meshtastic_ModuleConfig_CannedMessageConfig_init_default {0, 0, 0, 0, _meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_MIN, _meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_MIN, _meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_MIN, 0, 0, "", 0}
 #define meshtastic_ModuleConfig_AmbientLightingConfig_init_default {0, 0, 0, 0, 0}
 #define meshtastic_RemoteHardwarePin_init_default {0, "", _meshtastic_RemoteHardwarePinType_MIN}
@@ -445,10 +457,10 @@ extern "C" {
 #define meshtastic_ModuleConfig_DetectionSensorConfig_init_zero {0, 0, 0, 0, "", 0, 0, 0}
 #define meshtastic_ModuleConfig_AudioConfig_init_zero {0, 0, _meshtastic_ModuleConfig_AudioConfig_Audio_Baud_MIN, 0, 0, 0, 0}
 #define meshtastic_ModuleConfig_SerialConfig_init_zero {0, 0, 0, 0, _meshtastic_ModuleConfig_SerialConfig_Serial_Baud_MIN, 0, _meshtastic_ModuleConfig_SerialConfig_Serial_Mode_MIN, 0}
-#define meshtastic_ModuleConfig_ExternalNotificationConfig_init_zero {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+#define meshtastic_ModuleConfig_ExternalNotificationConfig_init_zero {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 #define meshtastic_ModuleConfig_StoreForwardConfig_init_zero {0, 0, 0, 0, 0}
 #define meshtastic_ModuleConfig_RangeTestConfig_init_zero {0, 0, 0}
-#define meshtastic_ModuleConfig_TelemetryConfig_init_zero {0, 0, 0, 0, 0, 0, 0}
+#define meshtastic_ModuleConfig_TelemetryConfig_init_zero {0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 #define meshtastic_ModuleConfig_CannedMessageConfig_init_zero {0, 0, 0, 0, _meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_MIN, _meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_MIN, _meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_MIN, 0, 0, "", 0}
 #define meshtastic_ModuleConfig_AmbientLightingConfig_init_zero {0, 0, 0, 0, 0}
 #define meshtastic_RemoteHardwarePin_init_zero   {0, "", _meshtastic_RemoteHardwarePinType_MIN}
@@ -502,6 +514,7 @@ extern "C" {
 #define meshtastic_ModuleConfig_ExternalNotificationConfig_alert_bell_vibra_tag 12
 #define meshtastic_ModuleConfig_ExternalNotificationConfig_alert_bell_buzzer_tag 13
 #define meshtastic_ModuleConfig_ExternalNotificationConfig_nag_timeout_tag 14
+#define meshtastic_ModuleConfig_ExternalNotificationConfig_use_i2s_as_buzzer_tag 15
 #define meshtastic_ModuleConfig_StoreForwardConfig_enabled_tag 1
 #define meshtastic_ModuleConfig_StoreForwardConfig_heartbeat_tag 2
 #define meshtastic_ModuleConfig_StoreForwardConfig_records_tag 3
@@ -517,6 +530,9 @@ extern "C" {
 #define meshtastic_ModuleConfig_TelemetryConfig_environment_display_fahrenheit_tag 5
 #define meshtastic_ModuleConfig_TelemetryConfig_air_quality_enabled_tag 6
 #define meshtastic_ModuleConfig_TelemetryConfig_air_quality_interval_tag 7
+#define meshtastic_ModuleConfig_TelemetryConfig_power_measurement_enabled_tag 8
+#define meshtastic_ModuleConfig_TelemetryConfig_power_update_interval_tag 9
+#define meshtastic_ModuleConfig_TelemetryConfig_power_screen_enabled_tag 10
 #define meshtastic_ModuleConfig_CannedMessageConfig_rotary1_enabled_tag 1
 #define meshtastic_ModuleConfig_CannedMessageConfig_inputbroker_pin_a_tag 2
 #define meshtastic_ModuleConfig_CannedMessageConfig_inputbroker_pin_b_tag 3
@@ -657,7 +673,8 @@ X(a, STATIC,   SINGULAR, BOOL,     alert_message_vibra,  10) \
 X(a, STATIC,   SINGULAR, BOOL,     alert_message_buzzer,  11) \
 X(a, STATIC,   SINGULAR, BOOL,     alert_bell_vibra,  12) \
 X(a, STATIC,   SINGULAR, BOOL,     alert_bell_buzzer,  13) \
-X(a, STATIC,   SINGULAR, UINT32,   nag_timeout,      14)
+X(a, STATIC,   SINGULAR, UINT32,   nag_timeout,      14) \
+X(a, STATIC,   SINGULAR, BOOL,     use_i2s_as_buzzer,  15)
 #define meshtastic_ModuleConfig_ExternalNotificationConfig_CALLBACK NULL
 #define meshtastic_ModuleConfig_ExternalNotificationConfig_DEFAULT NULL
 
@@ -684,7 +701,10 @@ X(a, STATIC,   SINGULAR, BOOL,     environment_measurement_enabled,   3) \
 X(a, STATIC,   SINGULAR, BOOL,     environment_screen_enabled,   4) \
 X(a, STATIC,   SINGULAR, BOOL,     environment_display_fahrenheit,   5) \
 X(a, STATIC,   SINGULAR, BOOL,     air_quality_enabled,   6) \
-X(a, STATIC,   SINGULAR, UINT32,   air_quality_interval,   7)
+X(a, STATIC,   SINGULAR, UINT32,   air_quality_interval,   7) \
+X(a, STATIC,   SINGULAR, BOOL,     power_measurement_enabled,   8) \
+X(a, STATIC,   SINGULAR, UINT32,   power_update_interval,   9) \
+X(a, STATIC,   SINGULAR, BOOL,     power_screen_enabled,  10)
 #define meshtastic_ModuleConfig_TelemetryConfig_CALLBACK NULL
 #define meshtastic_ModuleConfig_TelemetryConfig_DEFAULT NULL
 
@@ -755,14 +775,14 @@ extern const pb_msgdesc_t meshtastic_RemoteHardwarePin_msg;
 #define meshtastic_ModuleConfig_AudioConfig_size 19
 #define meshtastic_ModuleConfig_CannedMessageConfig_size 49
 #define meshtastic_ModuleConfig_DetectionSensorConfig_size 44
-#define meshtastic_ModuleConfig_ExternalNotificationConfig_size 40
+#define meshtastic_ModuleConfig_ExternalNotificationConfig_size 42
 #define meshtastic_ModuleConfig_MQTTConfig_size  222
 #define meshtastic_ModuleConfig_NeighborInfoConfig_size 8
 #define meshtastic_ModuleConfig_RangeTestConfig_size 10
 #define meshtastic_ModuleConfig_RemoteHardwareConfig_size 96
 #define meshtastic_ModuleConfig_SerialConfig_size 28
 #define meshtastic_ModuleConfig_StoreForwardConfig_size 22
-#define meshtastic_ModuleConfig_TelemetryConfig_size 26
+#define meshtastic_ModuleConfig_TelemetryConfig_size 36
 #define meshtastic_ModuleConfig_size             225
 #define meshtastic_RemoteHardwarePin_size        21
 

src/mesh/generated/meshtastic/telemetry.pb.c

@@ -12,6 +12,9 @@ PB_BIND(meshtastic_DeviceMetrics, meshtastic_DeviceMetrics, AUTO)
 PB_BIND(meshtastic_EnvironmentMetrics, meshtastic_EnvironmentMetrics, AUTO)
 
 
+PB_BIND(meshtastic_PowerMetrics, meshtastic_PowerMetrics, AUTO)
+
+
 PB_BIND(meshtastic_AirQualityMetrics, meshtastic_AirQualityMetrics, AUTO)
 
 

src/mesh/generated/meshtastic/telemetry.pb.h

@@ -39,7 +39,9 @@ typedef enum _meshtastic_TelemetrySensorType {
     /* High accuracy temperature and humidity */
     meshtastic_TelemetrySensorType_SHT31 = 12,
     /* PM2.5 air quality sensor */
-    meshtastic_TelemetrySensorType_PMSA003I = 13
+    meshtastic_TelemetrySensorType_PMSA003I = 13,
+    /* INA3221 3 Channel Voltage / Current Sensor */
+    meshtastic_TelemetrySensorType_INA3221 = 14
 } meshtastic_TelemetrySensorType;
 
 /* Struct definitions */
@@ -65,12 +67,28 @@ typedef struct _meshtastic_EnvironmentMetrics {
     float barometric_pressure;
     /* Gas resistance in MOhm measured */
     float gas_resistance;
-    /* Voltage measured */
+    /* Voltage measured (To be depreciated in favor of PowerMetrics in Meshtastic 3.x) */
     float voltage;
-    /* Current measured */
+    /* Current measured (To be depreciated in favor of PowerMetrics in Meshtastic 3.x) */
     float current;
 } meshtastic_EnvironmentMetrics;
 
+/* Power Metrics (voltage / current / etc) */
+typedef struct _meshtastic_PowerMetrics {
+    /* Voltage (Ch1) */
+    float ch1_voltage;
+    /* Current (Ch1) */
+    float ch1_current;
+    /* Voltage (Ch2) */
+    float ch2_voltage;
+    /* Current (Ch2) */
+    float ch2_current;
+    /* Voltage (Ch3) */
+    float ch3_voltage;
+    /* Current (Ch3) */
+    float ch3_current;
+} meshtastic_PowerMetrics;
+
 /* Air quality metrics */
 typedef struct _meshtastic_AirQualityMetrics {
     /* Concentration Units Standard PM1.0 */
@@ -111,6 +129,8 @@ typedef struct _meshtastic_Telemetry {
         meshtastic_EnvironmentMetrics environment_metrics;
         /* Air quality metrics */
         meshtastic_AirQualityMetrics air_quality_metrics;
+        /* Power Metrics */
+        meshtastic_PowerMetrics power_metrics;
     } variant;
 } meshtastic_Telemetry;
 
@@ -121,8 +141,9 @@ extern "C" {
 
 /* Helper constants for enums */
 #define _meshtastic_TelemetrySensorType_MIN meshtastic_TelemetrySensorType_SENSOR_UNSET
-#define _meshtastic_TelemetrySensorType_MAX meshtastic_TelemetrySensorType_PMSA003I
-#define _meshtastic_TelemetrySensorType_ARRAYSIZE ((meshtastic_TelemetrySensorType)(meshtastic_TelemetrySensorType_PMSA003I+1))
+#define _meshtastic_TelemetrySensorType_MAX meshtastic_TelemetrySensorType_INA3221
+#define _meshtastic_TelemetrySensorType_ARRAYSIZE ((meshtastic_TelemetrySensorType)(meshtastic_TelemetrySensorType_INA3221+1))
+
 
 
 
@@ -132,10 +153,12 @@ extern "C" {
 /* Initializer values for message structs */
 #define meshtastic_DeviceMetrics_init_default    {0, 0, 0, 0}
 #define meshtastic_EnvironmentMetrics_init_default {0, 0, 0, 0, 0, 0}
+#define meshtastic_PowerMetrics_init_default     {0, 0, 0, 0, 0, 0}
 #define meshtastic_AirQualityMetrics_init_default {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 #define meshtastic_Telemetry_init_default        {0, 0, {meshtastic_DeviceMetrics_init_default}}
 #define meshtastic_DeviceMetrics_init_zero       {0, 0, 0, 0}
 #define meshtastic_EnvironmentMetrics_init_zero  {0, 0, 0, 0, 0, 0}
+#define meshtastic_PowerMetrics_init_zero        {0, 0, 0, 0, 0, 0}
 #define meshtastic_AirQualityMetrics_init_zero   {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 #define meshtastic_Telemetry_init_zero           {0, 0, {meshtastic_DeviceMetrics_init_zero}}
 
@@ -150,6 +173,12 @@ extern "C" {
 #define meshtastic_EnvironmentMetrics_gas_resistance_tag 4
 #define meshtastic_EnvironmentMetrics_voltage_tag 5
 #define meshtastic_EnvironmentMetrics_current_tag 6
+#define meshtastic_PowerMetrics_ch1_voltage_tag  1
+#define meshtastic_PowerMetrics_ch1_current_tag  2
+#define meshtastic_PowerMetrics_ch2_voltage_tag  3
+#define meshtastic_PowerMetrics_ch2_current_tag  4
+#define meshtastic_PowerMetrics_ch3_voltage_tag  5
+#define meshtastic_PowerMetrics_ch3_current_tag  6
 #define meshtastic_AirQualityMetrics_pm10_standard_tag 1
 #define meshtastic_AirQualityMetrics_pm25_standard_tag 2
 #define meshtastic_AirQualityMetrics_pm100_standard_tag 3
@@ -166,6 +195,7 @@ extern "C" {
 #define meshtastic_Telemetry_device_metrics_tag  2
 #define meshtastic_Telemetry_environment_metrics_tag 3
 #define meshtastic_Telemetry_air_quality_metrics_tag 4
+#define meshtastic_Telemetry_power_metrics_tag   5
 
 /* Struct field encoding specification for nanopb */
 #define meshtastic_DeviceMetrics_FIELDLIST(X, a) \
@@ -186,6 +216,16 @@ X(a, STATIC,   SINGULAR, FLOAT,    current,           6)
 #define meshtastic_EnvironmentMetrics_CALLBACK NULL
 #define meshtastic_EnvironmentMetrics_DEFAULT NULL
 
+#define meshtastic_PowerMetrics_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, FLOAT,    ch1_voltage,       1) \
+X(a, STATIC,   SINGULAR, FLOAT,    ch1_current,       2) \
+X(a, STATIC,   SINGULAR, FLOAT,    ch2_voltage,       3) \
+X(a, STATIC,   SINGULAR, FLOAT,    ch2_current,       4) \
+X(a, STATIC,   SINGULAR, FLOAT,    ch3_voltage,       5) \
+X(a, STATIC,   SINGULAR, FLOAT,    ch3_current,       6)
+#define meshtastic_PowerMetrics_CALLBACK NULL
+#define meshtastic_PowerMetrics_DEFAULT NULL
+
 #define meshtastic_AirQualityMetrics_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, UINT32,   pm10_standard,     1) \
 X(a, STATIC,   SINGULAR, UINT32,   pm25_standard,     2) \
@@ -206,21 +246,25 @@ X(a, STATIC,   SINGULAR, UINT32,   particles_100um,  12)
 X(a, STATIC,   SINGULAR, FIXED32,  time,              1) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (variant,device_metrics,variant.device_metrics),   2) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (variant,environment_metrics,variant.environment_metrics),   3) \
-X(a, STATIC,   ONEOF,    MESSAGE,  (variant,air_quality_metrics,variant.air_quality_metrics),   4)
+X(a, STATIC,   ONEOF,    MESSAGE,  (variant,air_quality_metrics,variant.air_quality_metrics),   4) \
+X(a, STATIC,   ONEOF,    MESSAGE,  (variant,power_metrics,variant.power_metrics),   5)
 #define meshtastic_Telemetry_CALLBACK NULL
 #define meshtastic_Telemetry_DEFAULT NULL
 #define meshtastic_Telemetry_variant_device_metrics_MSGTYPE meshtastic_DeviceMetrics
 #define meshtastic_Telemetry_variant_environment_metrics_MSGTYPE meshtastic_EnvironmentMetrics
 #define meshtastic_Telemetry_variant_air_quality_metrics_MSGTYPE meshtastic_AirQualityMetrics
+#define meshtastic_Telemetry_variant_power_metrics_MSGTYPE meshtastic_PowerMetrics
 
 extern const pb_msgdesc_t meshtastic_DeviceMetrics_msg;
 extern const pb_msgdesc_t meshtastic_EnvironmentMetrics_msg;
+extern const pb_msgdesc_t meshtastic_PowerMetrics_msg;
 extern const pb_msgdesc_t meshtastic_AirQualityMetrics_msg;
 extern const pb_msgdesc_t meshtastic_Telemetry_msg;
 
 /* Defines for backwards compatibility with code written before nanopb-0.4.0 */
 #define meshtastic_DeviceMetrics_fields &meshtastic_DeviceMetrics_msg
 #define meshtastic_EnvironmentMetrics_fields &meshtastic_EnvironmentMetrics_msg
+#define meshtastic_PowerMetrics_fields &meshtastic_PowerMetrics_msg
 #define meshtastic_AirQualityMetrics_fields &meshtastic_AirQualityMetrics_msg
 #define meshtastic_Telemetry_fields &meshtastic_Telemetry_msg
 
@@ -228,6 +272,7 @@ extern const pb_msgdesc_t meshtastic_Telemetry_msg;
 #define meshtastic_AirQualityMetrics_size        72
 #define meshtastic_DeviceMetrics_size            21
 #define meshtastic_EnvironmentMetrics_size       30
+#define meshtastic_PowerMetrics_size             30
 #define meshtastic_Telemetry_size                79
 
 #ifdef __cplusplus

src/mesh/http/ContentHandler.cpp

@@ -144,8 +144,8 @@ void handleAPIv1FromRadio(HTTPRequest *req, HTTPResponse *res)
 
     /*
         For documentation, see:
-            https://meshtastic.org/docs/developers/device/http-api
-            https://meshtastic.org/docs/developers/device/device-api
+            https://meshtastic.org/docs/development/device/http-api
+            https://meshtastic.org/docs/development/device/client-api
     */
 
     // Get access to the parameters
@@ -194,8 +194,8 @@ void handleAPIv1ToRadio(HTTPRequest *req, HTTPResponse *res)
 
     /*
         For documentation, see:
-            https://meshtastic.org/docs/developers/device/http-api
-            https://meshtastic.org/docs/developers/device/device-api
+            https://meshtastic.org/docs/development/device/http-api
+            https://meshtastic.org/docs/development/device/client-api
     */
 
     res->setHeader("Content-Type", "application/x-protobuf");

src/modules/AdminModule.cpp

@@ -182,6 +182,12 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
         }
         break;
     }
+    case meshtastic_AdminMessage_remove_by_nodenum_tag: {
+        LOG_INFO("Client is receiving a remove_nodenum command.\n");
+        nodeDB.removeNodeByNum(r->remove_by_nodenum);
+        reboot(DEFAULT_REBOOT_SECONDS);
+        break;
+    }
 #ifdef ARCH_PORTDUINO
     case meshtastic_AdminMessage_exit_simulator_tag:
         LOG_INFO("Exiting simulator\n");
@@ -378,6 +384,11 @@ void AdminModule::handleSetModuleConfig(const meshtastic_ModuleConfig &c)
         moduleConfig.has_detection_sensor = true;
         moduleConfig.detection_sensor = c.payload_variant.detection_sensor;
         break;
+    case meshtastic_ModuleConfig_ambient_lighting_tag:
+        LOG_INFO("Setting module config: Ambient Lighting\n");
+        moduleConfig.has_ambient_lighting = true;
+        moduleConfig.ambient_lighting = c.payload_variant.ambient_lighting;
+        break;
     }
 
     saveChanges(SEGMENT_MODULECONFIG);
@@ -523,6 +534,11 @@ void AdminModule::handleGetModuleConfig(const meshtastic_MeshPacket &req, const
             res.get_module_config_response.which_payload_variant = meshtastic_ModuleConfig_detection_sensor_tag;
             res.get_module_config_response.payload_variant.detection_sensor = moduleConfig.detection_sensor;
             break;
+        case meshtastic_AdminMessage_ModuleConfigType_AMBIENTLIGHTING_CONFIG:
+            LOG_INFO("Getting module config: Ambient Lighting\n");
+            res.get_module_config_response.which_payload_variant = meshtastic_ModuleConfig_ambient_lighting_tag;
+            res.get_module_config_response.payload_variant.ambient_lighting = moduleConfig.ambient_lighting;
+            break;
         }
 
         // NOTE: The phone app needs to know the ls_secsvalue so it can properly expect sleep behavior.
@@ -676,7 +692,7 @@ void AdminModule::handleSetHamMode(const meshtastic_HamParameters &p)
     channels.onConfigChanged();
 
     service.reloadOwner(false);
-    service.reloadConfig(SEGMENT_CONFIG | SEGMENT_DEVICESTATE | SEGMENT_CHANNELS);
+    saveChanges(SEGMENT_CONFIG | SEGMENT_DEVICESTATE | SEGMENT_CHANNELS);
 }
 
 AdminModule::AdminModule() : ProtobufModule("Admin", meshtastic_PortNum_ADMIN_APP, &meshtastic_AdminMessage_msg)

src/modules/DetectionSensorModule.cpp

@@ -28,6 +28,12 @@ int32_t DetectionSensorModule::runOnce()
         return disable();
 
     if (firstTime) {
+
+#ifdef DETECTION_SENSOR_EN
+        pinMode(DETECTION_SENSOR_EN, OUTPUT);
+        digitalWrite(DETECTION_SENSOR_EN, HIGH);
+#endif
+
         // This is the first time the OSThread library has called this function, so do some setup
         firstTime = false;
         if (moduleConfig.detection_sensor.monitor_pin > 0) {

src/modules/ExternalNotificationModule.cpp

@@ -8,7 +8,7 @@
  * handle the module's behavior.
  *
  * Documentation:
- * https://meshtastic.org/docs/settings/moduleconfig/external-notification
+ * https://meshtastic.org/docs/configuration/module/external-notification
  *
  * @author Jm Casler & Meshtastic Team
  * @date [Insert Date]
@@ -31,6 +31,10 @@
 uint8_t red = 0;
 uint8_t green = 0;
 uint8_t blue = 0;
+uint8_t colorState = 1;
+uint8_t brightnessIndex = 0;
+uint8_t brightnessValues[] = {0, 10, 20, 30, 50, 90, 160, 170}; // blue gets multiplied by 1.5
+bool ascending = true;
 #endif
 
 #ifndef PIN_BUZZER
@@ -39,7 +43,7 @@ uint8_t blue = 0;
 
 /*
     Documentation:
-        https://meshtastic.org/docs/settings/moduleconfig/external-notification
+        https://meshtastic.org/docs/configuration/module/external-notification
 */
 
 // Default configurations
@@ -100,11 +104,26 @@ int32_t ExternalNotificationModule::runOnce()
             }
 #ifdef HAS_NCP5623
             if (rgb_found.type == ScanI2C::NCP5623) {
-                green = (green + 50) % 255;
-                red = abs(red - green) % 255;
-                blue = abs(blue / red) % 255;
-
+                red = (colorState & 4) ? brightnessValues[brightnessIndex] : 0;          // Red enabled on colorState = 4,5,6,7
+                green = (colorState & 2) ? brightnessValues[brightnessIndex] : 0;        // Green enabled on colorState = 2,3,6,7
+                blue = (colorState & 1) ? (brightnessValues[brightnessIndex] * 1.5) : 0; // Blue enabled on colorState = 1,3,5,7
                 rgb.setColor(red, green, blue);
+
+                if (ascending) { // fade in
+                    brightnessIndex++;
+                    if (brightnessIndex == (sizeof(brightnessValues) - 1)) {
+                        ascending = false;
+                    }
+                } else {
+                    brightnessIndex--; // fade out
+                }
+                if (brightnessIndex == 0) {
+                    ascending = true;
+                    colorState++; // next color
+                    if (colorState > 7) {
+                        colorState = 1;
+                    }
+                }
             }
 #endif
 

src/modules/Modules.cpp

@@ -24,6 +24,9 @@
 #include "modules/Telemetry/AirQualityTelemetry.h"
 #include "modules/Telemetry/EnvironmentTelemetry.h"
 #endif
+#if HAS_TELEMETRY && !defined(ARCH_PORTDUINO)
+#include "modules/Telemetry/PowerTelemetry.h"
+#endif
 #ifdef ARCH_ESP32
 #include "modules/esp32/AudioModule.h"
 #include "modules/esp32/StoreForwardModule.h"
@@ -88,10 +91,13 @@ void setupModules()
 #endif
 #if HAS_SENSOR
         new EnvironmentTelemetryModule();
-        if (nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_PMSA003I] > 0) {
+        if (nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_PMSA003I].first > 0) {
             new AirQualityTelemetryModule();
         }
 #endif
+#if HAS_TELEMETRY && !defined(ARCH_PORTDUINO)
+        new PowerTelemetryModule();
+#endif
 #if (defined(ARCH_ESP32) || defined(ARCH_NRF52) || defined(ARCH_RP2040)) && !defined(CONFIG_IDF_TARGET_ESP32S2) &&               \
     !defined(CONFIG_IDF_TARGET_ESP32C3)
         new SerialModule();

src/modules/PositionModule.cpp

@@ -33,6 +33,9 @@ void PositionModule::clearPosition()
     meshtastic_NodeInfoLite *node = nodeDB.getMeshNode(nodeDB.getNodeNum());
     node->position.latitude_i = 0;
     node->position.longitude_i = 0;
+    node->position.altitude = 0;
+    node->position.time = 0;
+    nodeDB.setLocalPosition(meshtastic_Position_init_default);
 }
 
 bool PositionModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_Position *pptr)
@@ -44,10 +47,11 @@ bool PositionModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, mes
 
     // FIXME this can in fact happen with packets sent from EUD (src=RX_SRC_USER)
     // to set fixed location, EUD-GPS location or just the time (see also issue #900)
+    bool isLocal = false;
     if (nodeDB.getNodeNum() == getFrom(&mp)) {
         LOG_DEBUG("Incoming update from MYSELF\n");
-        // LOG_DEBUG("Ignored an incoming update from MYSELF\n");
-        // return false;
+        isLocal = true;
+        nodeDB.setLocalPosition(p);
     }
 
     // Log packet size and data fields
@@ -64,7 +68,8 @@ bool PositionModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, mes
         tv.tv_sec = secs;
         tv.tv_usec = 0;
 
-        perhapsSetRTC(RTCQualityFromNet, &tv);
+        // Set from phone RTC Quality to RTCQualityNTP since it should be approximately so
+        perhapsSetRTC(isLocal ? RTCQualityNTP : RTCQualityFromNet, &tv);
     }
 
     nodeDB.updatePosition(getFrom(&mp), p);
@@ -94,8 +99,9 @@ meshtastic_MeshPacket *PositionModule::allocReply()
 
     // Populate a Position struct with ONLY the requested fields
     meshtastic_Position p = meshtastic_Position_init_default; //   Start with an empty structure
+    // if localPosition is totally empty, put our last saved position (lite) in there
     if (localPosition.latitude_i == 0 && localPosition.longitude_i == 0) {
-        localPosition = ConvertToPosition(node->position);
+        nodeDB.setLocalPosition(TypeConversions::ConvertToPosition(node->position));
     }
     localPosition.seq_number++;
 
@@ -178,12 +184,14 @@ void PositionModule::sendOurPosition(NodeNum dest, bool wantReplies, uint8_t cha
     service.sendToMesh(p, RX_SRC_LOCAL, true);
 
     if (config.device.role == meshtastic_Config_DeviceConfig_Role_TRACKER && config.power.is_power_saving) {
-        LOG_DEBUG("Starting next execution in 3 seconds and then going to sleep.\n");
+        LOG_DEBUG("Starting next execution in 5 seconds and then going to sleep.\n");
         sleepOnNextExecution = true;
-        setIntervalFromNow(3000);
+        setIntervalFromNow(5000);
     }
 }
 
+#define RUNONCE_INTERVAL 5000;
+
 int32_t PositionModule::runOnce()
 {
     if (sleepOnNextExecution == true) {
@@ -199,60 +207,58 @@ int32_t PositionModule::runOnce()
     uint32_t now = millis();
     uint32_t intervalMs = getConfiguredOrDefaultMs(config.position.position_broadcast_secs, default_broadcast_interval_secs);
     uint32_t msSinceLastSend = now - lastGpsSend;
+    // Only send packets if the channel util. is less than 25% utilized or we're a tracker with less than 40% utilized.
+    if (!airTime->isTxAllowedChannelUtil(config.device.role != meshtastic_Config_DeviceConfig_Role_TRACKER)) {
+        return RUNONCE_INTERVAL;
+    }
 
     if (lastGpsSend == 0 || msSinceLastSend >= intervalMs) {
-        // Only send packets if the channel is less than 40% utilized.
-        if (airTime->isTxAllowedChannelUtil(config.device.role != meshtastic_Config_DeviceConfig_Role_TRACKER)) {
-            if (hasValidPosition(node)) {
-                lastGpsSend = now;
+        if (hasValidPosition(node)) {
+            lastGpsSend = now;
 
-                lastGpsLatitude = node->position.latitude_i;
-                lastGpsLongitude = node->position.longitude_i;
+            lastGpsLatitude = node->position.latitude_i;
+            lastGpsLongitude = node->position.longitude_i;
 
-                // If we changed channels, ask everyone else for their latest info
+            // If we changed channels, ask everyone else for their latest info
+            bool requestReplies = currentGeneration != radioGeneration;
+            currentGeneration = radioGeneration;
+
+            LOG_INFO("Sending pos@%x:6 to mesh (wantReplies=%d)\n", localPosition.timestamp, requestReplies);
+            sendOurPosition(NODENUM_BROADCAST, requestReplies);
+        }
+    } else if (config.position.position_broadcast_smart_enabled) {
+        const meshtastic_NodeInfoLite *node2 = service.refreshLocalMeshNode(); // should guarantee there is now a position
+
+        if (hasValidPosition(node2)) {
+            // The minimum time (in seconds) that would pass before we are able to send a new position packet.
+            const uint32_t minimumTimeThreshold =
+                getConfiguredOrDefaultMs(config.position.broadcast_smart_minimum_interval_secs, 30);
+
+            auto smartPosition = getDistanceTraveledSinceLastSend(node->position);
+
+            if (smartPosition.hasTraveledOverThreshold && msSinceLastSend >= minimumTimeThreshold) {
                 bool requestReplies = currentGeneration != radioGeneration;
                 currentGeneration = radioGeneration;
 
-                LOG_INFO("Sending pos@%x:6 to mesh (wantReplies=%d)\n", localPosition.timestamp, requestReplies);
+                LOG_INFO("Sending smart pos@%x:6 to mesh (distanceTraveled=%fm, minDistanceThreshold=%im, timeElapsed=%ims, "
+                         "minTimeInterval=%ims)\n",
+                         localPosition.timestamp, smartPosition.distanceTraveled, smartPosition.distanceThreshold,
+                         msSinceLastSend, minimumTimeThreshold);
                 sendOurPosition(NODENUM_BROADCAST, requestReplies);
-            }
-        }
-    } else if (config.position.position_broadcast_smart_enabled) {
-        // Only send packets if the channel is less than 25% utilized or we're a tracker.
-        if (airTime->isTxAllowedChannelUtil(config.device.role != meshtastic_Config_DeviceConfig_Role_TRACKER)) {
-            const meshtastic_NodeInfoLite *node2 = service.refreshLocalMeshNode(); // should guarantee there is now a position
 
-            if (hasValidPosition(node2)) {
-                // The minimum time (in seconds) that would pass before we are able to send a new position packet.
-                const uint32_t minimumTimeThreshold =
-                    getConfiguredOrDefaultMs(config.position.broadcast_smart_minimum_interval_secs, 30);
+                // Set the current coords as our last ones, after we've compared distance with current and decided to send
+                lastGpsLatitude = node->position.latitude_i;
+                lastGpsLongitude = node->position.longitude_i;
 
-                auto smartPosition = getDistanceTraveledSinceLastSend(node->position);
-
-                if (smartPosition.hasTraveledOverThreshold && msSinceLastSend >= minimumTimeThreshold) {
-                    bool requestReplies = currentGeneration != radioGeneration;
-                    currentGeneration = radioGeneration;
-
-                    LOG_INFO("Sending smart pos@%x:6 to mesh (distanceTraveled=%fm, minDistanceThreshold=%im, timeElapsed=%ims, "
-                             "minTimeInterval=%ims)\n",
-                             localPosition.timestamp, smartPosition.distanceTraveled, smartPosition.distanceThreshold,
-                             msSinceLastSend, minimumTimeThreshold);
-                    sendOurPosition(NODENUM_BROADCAST, requestReplies);
-
-                    // Set the current coords as our last ones, after we've compared distance with current and decided to send
-                    lastGpsLatitude = node->position.latitude_i;
-                    lastGpsLongitude = node->position.longitude_i;
-
-                    /* Update lastGpsSend to now. This means if the device is stationary, then
-                       getPref_position_broadcast_secs will still apply.
-                    */
-                    lastGpsSend = now;
-                }
+                /* Update lastGpsSend to now. This means if the device is stationary, then
+                    getPref_position_broadcast_secs will still apply.
+                */
+                lastGpsSend = now;
             }
         }
     }
 
-    return 5000; // to save power only wake for our callback occasionally
+    return RUNONCE_INTERVAL; // to save power only wake for our callback occasionally
 }
 
 struct SmartPosition PositionModule::getDistanceTraveledSinceLastSend(meshtastic_PositionLite currentPosition)
@@ -264,6 +270,23 @@ struct SmartPosition PositionModule::getDistanceTraveledSinceLastSend(meshtastic
     float distanceTraveledSinceLastSend = GeoCoord::latLongToMeter(
         lastGpsLatitude * 1e-7, lastGpsLongitude * 1e-7, currentPosition.latitude_i * 1e-7, currentPosition.longitude_i * 1e-7);
 
+#ifdef GPS_EXTRAVERBOSE
+    LOG_DEBUG("--------LAST POSITION------------------------------------\n");
+    LOG_DEBUG("lastGpsLatitude=%i, lastGpsLatitude=%i\n", lastGpsLatitude, lastGpsLongitude);
+
+    LOG_DEBUG("--------CURRENT POSITION---------------------------------\n");
+    LOG_DEBUG("currentPosition.latitude_i=%i, currentPosition.longitude_i=%i\n", lastGpsLatitude, lastGpsLongitude);
+
+    LOG_DEBUG("--------SMART POSITION-----------------------------------\n");
+    LOG_DEBUG("hasTraveledOverThreshold=%i, distanceTraveled=%d, distanceThreshold=% u\n",
+              abs(distanceTraveledSinceLastSend) >= distanceTravelThreshold, abs(distanceTraveledSinceLastSend),
+              distanceTravelThreshold);
+
+    if (abs(distanceTraveledSinceLastSend) >= distanceTravelThreshold) {
+        LOG_DEBUG("\n\n\nSMART SEEEEEEEEENDING\n\n\n");
+    }
+#endif
+
     return SmartPosition{.distanceTraveled = abs(distanceTraveledSinceLastSend),
                          .distanceThreshold = distanceTravelThreshold,
                          .hasTraveledOverThreshold = abs(distanceTraveledSinceLastSend) >= distanceTravelThreshold};

src/modules/Telemetry/EnvironmentTelemetry.cpp

@@ -8,6 +8,8 @@
 #include "configuration.h"
 #include "main.h"
 #include "power.h"
+#include "sleep.h"
+#include "target_specific.h"
 #include <OLEDDisplay.h>
 #include <OLEDDisplayUi.h>
 
@@ -51,6 +53,13 @@ SHT31Sensor sht31Sensor;
 
 int32_t EnvironmentTelemetryModule::runOnce()
 {
+    if (sleepOnNextExecution == true) {
+        sleepOnNextExecution = false;
+        uint32_t nightyNightMs = getConfiguredOrDefaultMs(moduleConfig.telemetry.environment_update_interval);
+        LOG_DEBUG("Sleeping for %ims, then awaking to send metrics again.\n", nightyNightMs);
+        doDeepSleep(nightyNightMs, true);
+    }
+
     uint32_t result = UINT32_MAX;
     /*
         Uncomment the preferences below if you want to use the module
@@ -266,6 +275,12 @@ bool EnvironmentTelemetryModule::sendTelemetry(NodeNum dest, bool phoneOnly)
         } else {
             LOG_INFO("Sending packet to mesh\n");
             service.sendToMesh(p, RX_SRC_LOCAL, true);
+
+            if (config.device.role == meshtastic_Config_DeviceConfig_Role_SENSOR && config.power.is_power_saving) {
+                LOG_DEBUG("Starting next execution in 5 seconds and then going to sleep.\n");
+                sleepOnNextExecution = true;
+                setIntervalFromNow(5000);
+            }
         }
     }
     return valid;

src/modules/Telemetry/PowerTelemetry.cpp

@@ -0,0 +1,235 @@
+#include "PowerTelemetry.h"
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "MeshService.h"
+#include "NodeDB.h"
+#include "PowerFSM.h"
+#include "RTC.h"
+#include "Router.h"
+#include "configuration.h"
+#include "main.h"
+#include "power.h"
+#include "sleep.h"
+#include "target_specific.h"
+
+#define FAILED_STATE_SENSOR_READ_MULTIPLIER 10
+#define DISPLAY_RECEIVEID_MEASUREMENTS_ON_SCREEN true
+
+#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS)) &&                                \
+    !defined(DISPLAY_FORCE_SMALL_FONTS)
+
+// The screen is bigger so use bigger fonts
+#define FONT_SMALL ArialMT_Plain_16
+#define FONT_MEDIUM ArialMT_Plain_24
+#define FONT_LARGE ArialMT_Plain_24
+#else
+#define FONT_SMALL ArialMT_Plain_10
+#define FONT_MEDIUM ArialMT_Plain_16
+#define FONT_LARGE ArialMT_Plain_24
+#endif
+
+#define fontHeight(font) ((font)[1] + 1) // height is position 1
+
+#define FONT_HEIGHT_SMALL fontHeight(FONT_SMALL)
+#define FONT_HEIGHT_MEDIUM fontHeight(FONT_MEDIUM)
+
+int32_t PowerTelemetryModule::runOnce()
+{
+    if (sleepOnNextExecution == true) {
+        sleepOnNextExecution = false;
+        uint32_t nightyNightMs = getConfiguredOrDefaultMs(moduleConfig.telemetry.power_update_interval);
+        LOG_DEBUG("Sleeping for %ims, then awaking to send metrics again.\n", nightyNightMs);
+        doDeepSleep(nightyNightMs, true);
+    }
+
+    uint32_t result = UINT32_MAX;
+    /*
+        Uncomment the preferences below if you want to use the module
+        without having to configure it from the PythonAPI or WebUI.
+    */
+
+    // moduleConfig.telemetry.power_measurement_enabled = 1;
+    // moduleConfig.telemetry.power_screen_enabled = 1;
+    // moduleConfig.telemetry.power_update_interval = 45;
+
+    if (!(moduleConfig.telemetry.power_measurement_enabled)) {
+        // If this module is not enabled, and the user doesn't want the display screen don't waste any OSThread time on it
+        return disable();
+    }
+
+    if (firstTime) {
+        // This is the first time the OSThread library has called this function, so do some setup
+        firstTime = 0;
+#if HAS_TELEMETRY && !defined(ARCH_PORTDUINO)
+        if (moduleConfig.telemetry.power_measurement_enabled) {
+            LOG_INFO("Power Telemetry: Initializing\n");
+            // it's possible to have this module enabled, only for displaying values on the screen.
+            // therefore, we should only enable the sensor loop if measurement is also enabled
+            if (ina219Sensor.hasSensor() && !ina219Sensor.isInitialized())
+                result = ina219Sensor.runOnce();
+            if (ina260Sensor.hasSensor() && !ina260Sensor.isInitialized())
+                result = ina260Sensor.runOnce();
+            if (ina3221Sensor.hasSensor() && !ina3221Sensor.isInitialized())
+                result = ina3221Sensor.runOnce();
+        }
+        return result;
+#else
+        return disable();
+#endif
+    } else {
+        // if we somehow got to a second run of this module with measurement disabled, then just wait forever
+        if (!moduleConfig.telemetry.power_measurement_enabled)
+            return disable();
+
+        uint32_t now = millis();
+        if (((lastSentToMesh == 0) ||
+             ((now - lastSentToMesh) >= getConfiguredOrDefaultMs(moduleConfig.telemetry.power_update_interval))) &&
+            airTime->isTxAllowedAirUtil()) {
+            sendTelemetry();
+            lastSentToMesh = now;
+        } else if (((lastSentToPhone == 0) || ((now - lastSentToPhone) >= sendToPhoneIntervalMs)) &&
+                   (service.isToPhoneQueueEmpty())) {
+            // Just send to phone when it's not our time to send to mesh yet
+            // Only send while queue is empty (phone assumed connected)
+            sendTelemetry(NODENUM_BROADCAST, true);
+            lastSentToPhone = now;
+        }
+    }
+    return min(sendToPhoneIntervalMs, result);
+}
+bool PowerTelemetryModule::wantUIFrame()
+{
+    return moduleConfig.telemetry.power_screen_enabled;
+}
+
+uint32_t GetTimeyWimeySinceMeshPacket(const meshtastic_MeshPacket *mp)
+{
+    uint32_t now = getTime();
+
+    uint32_t last_seen = mp->rx_time;
+    int delta = (int)(now - last_seen);
+    if (delta < 0) // our clock must be slightly off still - not set from GPS yet
+        delta = 0;
+
+    return delta;
+}
+
+void PowerTelemetryModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
+{
+    display->setTextAlignment(TEXT_ALIGN_LEFT);
+    display->setFont(FONT_MEDIUM);
+    display->drawString(x, y, "Power Telemetry");
+    if (lastMeasurementPacket == nullptr) {
+        display->setFont(FONT_SMALL);
+        display->drawString(x, y += fontHeight(FONT_MEDIUM), "No measurement");
+        return;
+    }
+
+    meshtastic_Telemetry lastMeasurement;
+
+    uint32_t agoSecs = GetTimeyWimeySinceMeshPacket(lastMeasurementPacket);
+    const char *lastSender = getSenderShortName(*lastMeasurementPacket);
+
+    auto &p = lastMeasurementPacket->decoded;
+    if (!pb_decode_from_bytes(p.payload.bytes, p.payload.size, &meshtastic_Telemetry_msg, &lastMeasurement)) {
+        display->setFont(FONT_SMALL);
+        display->drawString(x, y += fontHeight(FONT_MEDIUM), "Measurement Error");
+        LOG_ERROR("Unable to decode last packet");
+        return;
+    }
+
+    display->setFont(FONT_SMALL);
+    String last_temp = String(lastMeasurement.variant.environment_metrics.temperature, 0) + "°C";
+    display->drawString(x, y += fontHeight(FONT_MEDIUM) - 2, "From: " + String(lastSender) + "(" + String(agoSecs) + "s)");
+    if (lastMeasurement.variant.power_metrics.ch1_voltage != 0) {
+        display->drawString(x, y += fontHeight(FONT_SMALL),
+                            "Ch 1 Volt/Cur: " + String(lastMeasurement.variant.power_metrics.ch1_voltage, 0) + "V / " +
+                                String(lastMeasurement.variant.power_metrics.ch1_current, 0) + "mA");
+        display->drawString(x, y += fontHeight(FONT_SMALL),
+                            "Ch 2 Volt/Cur: " + String(lastMeasurement.variant.power_metrics.ch2_voltage, 0) + "V / " +
+                                String(lastMeasurement.variant.power_metrics.ch2_current, 0) + "mA");
+        display->drawString(x, y += fontHeight(FONT_SMALL),
+                            "Ch 3 Volt/Cur: " + String(lastMeasurement.variant.power_metrics.ch3_voltage, 0) + "V / " +
+                                String(lastMeasurement.variant.power_metrics.ch3_current, 0) + "mA");
+    }
+}
+
+bool PowerTelemetryModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_Telemetry *t)
+{
+    if (t->which_variant == meshtastic_Telemetry_power_metrics_tag) {
+#ifdef DEBUG_PORT
+        const char *sender = getSenderShortName(mp);
+
+        LOG_INFO("(Received from %s): ch1_voltage=%f, ch1_current=%f, ch2_voltage=%f, ch2_current=%f, "
+                 "ch3_voltage=%f, ch3_current=%f\n",
+                 sender, t->variant.power_metrics.ch1_voltage, t->variant.power_metrics.ch1_current,
+                 t->variant.power_metrics.ch2_voltage, t->variant.power_metrics.ch2_current, t->variant.power_metrics.ch3_voltage,
+                 t->variant.power_metrics.ch3_current);
+#endif
+        // release previous packet before occupying a new spot
+        if (lastMeasurementPacket != nullptr)
+            packetPool.release(lastMeasurementPacket);
+
+        lastMeasurementPacket = packetPool.allocCopy(mp);
+    }
+
+    return false; // Let others look at this message also if they want
+}
+
+bool PowerTelemetryModule::sendTelemetry(NodeNum dest, bool phoneOnly)
+{
+    meshtastic_Telemetry m;
+    bool valid = false;
+    m.time = getTime();
+    m.which_variant = meshtastic_Telemetry_power_metrics_tag;
+
+    m.variant.power_metrics.ch1_voltage = 0;
+    m.variant.power_metrics.ch1_current = 0;
+    m.variant.power_metrics.ch2_voltage = 0;
+    m.variant.power_metrics.ch2_current = 0;
+    m.variant.power_metrics.ch3_voltage = 0;
+    m.variant.power_metrics.ch3_current = 0;
+#if HAS_TELEMETRY && !defined(ARCH_PORTDUINO)
+    if (ina219Sensor.hasSensor())
+        valid = ina219Sensor.getMetrics(&m);
+    if (ina260Sensor.hasSensor())
+        valid = ina260Sensor.getMetrics(&m);
+    if (ina3221Sensor.hasSensor())
+        valid = ina3221Sensor.getMetrics(&m);
+#endif
+
+    if (valid) {
+        LOG_INFO("(Sending): ch1_voltage=%f, ch1_current=%f, ch2_voltage=%f, ch2_current=%f, "
+                 "ch3_voltage=%f, ch3_current=%f\n",
+                 m.variant.power_metrics.ch1_voltage, m.variant.power_metrics.ch1_current, m.variant.power_metrics.ch2_voltage,
+                 m.variant.power_metrics.ch2_current, m.variant.power_metrics.ch3_voltage, m.variant.power_metrics.ch3_current);
+
+        sensor_read_error_count = 0;
+
+        meshtastic_MeshPacket *p = allocDataProtobuf(m);
+        p->to = dest;
+        p->decoded.want_response = false;
+        if (config.device.role == meshtastic_Config_DeviceConfig_Role_SENSOR)
+            p->priority = meshtastic_MeshPacket_Priority_RELIABLE;
+        else
+            p->priority = meshtastic_MeshPacket_Priority_MIN;
+        // release previous packet before occupying a new spot
+        if (lastMeasurementPacket != nullptr)
+            packetPool.release(lastMeasurementPacket);
+
+        lastMeasurementPacket = packetPool.allocCopy(*p);
+        if (phoneOnly) {
+            LOG_INFO("Sending packet to phone\n");
+            service.sendToPhone(p);
+        } else {
+            LOG_INFO("Sending packet to mesh\n");
+            service.sendToMesh(p, RX_SRC_LOCAL, true);
+
+            if (config.device.role == meshtastic_Config_DeviceConfig_Role_SENSOR && config.power.is_power_saving) {
+                LOG_DEBUG("Starting next execution in 5 seconds and then going to sleep.\n");
+                sleepOnNextExecution = true;
+                setIntervalFromNow(5000);
+            }
+        }
+    }
+    return valid;
+}

src/modules/Telemetry/PowerTelemetry.h

@@ -0,0 +1,43 @@
+#pragma once
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "NodeDB.h"
+#include "ProtobufModule.h"
+#include <OLEDDisplay.h>
+#include <OLEDDisplayUi.h>
+
+class PowerTelemetryModule : private concurrency::OSThread, public ProtobufModule<meshtastic_Telemetry>
+{
+  public:
+    PowerTelemetryModule()
+        : concurrency::OSThread("PowerTelemetryModule"),
+          ProtobufModule("PowerTelemetry", meshtastic_PortNum_TELEMETRY_APP, &meshtastic_Telemetry_msg)
+    {
+        lastMeasurementPacket = nullptr;
+        setIntervalFromNow(10 * 1000);
+    }
+    virtual bool wantUIFrame() override;
+#if !HAS_SCREEN
+    void drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y);
+#else
+    virtual void drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y) override;
+#endif
+
+  protected:
+    /** Called to handle a particular incoming message
+    @return true if you've guaranteed you've handled this message and no other handlers should be considered for it
+    */
+    virtual bool handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_Telemetry *p) override;
+    virtual int32_t runOnce() override;
+    /**
+     * Send our Telemetry into the mesh
+     */
+    bool sendTelemetry(NodeNum dest = NODENUM_BROADCAST, bool wantReplies = false);
+
+  private:
+    bool firstTime = 1;
+    meshtastic_MeshPacket *lastMeasurementPacket;
+    uint32_t sendToPhoneIntervalMs = SECONDS_IN_MINUTE * 1000; // Send to phone every minute
+    uint32_t lastSentToMesh = 0;
+    uint32_t lastSentToPhone = 0;
+    uint32_t sensor_read_error_count = 0;
+};

src/modules/Telemetry/Sensor/BME280Sensor.cpp

@@ -13,7 +13,7 @@ int32_t BME280Sensor::runOnce()
     if (!hasSensor()) {
         return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS;
     }
-    status = bme280.begin(nodeTelemetrySensorsMap[sensorType]);
+    status = bme280.begin(nodeTelemetrySensorsMap[sensorType].first, nodeTelemetrySensorsMap[sensorType].second);
 
     bme280.setSampling(Adafruit_BME280::MODE_FORCED,
                        Adafruit_BME280::SAMPLING_X1, // Temp. oversampling

src/modules/Telemetry/Sensor/BME280Sensor.h

@@ -2,7 +2,7 @@
 #include "TelemetrySensor.h"
 #include <Adafruit_BME280.h>
 
-class BME280Sensor : virtual public TelemetrySensor
+class BME280Sensor : public TelemetrySensor
 {
   private:
     Adafruit_BME280 bme280;

src/modules/Telemetry/Sensor/BME680Sensor.cpp

@@ -20,7 +20,7 @@ int32_t BME680Sensor::runOnce()
     if (!hasSensor()) {
         return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS;
     }
-    if (!bme680.begin(nodeTelemetrySensorsMap[sensorType], Wire))
+    if (!bme680.begin(nodeTelemetrySensorsMap[sensorType].first, *nodeTelemetrySensorsMap[sensorType].second))
         checkStatus("begin");
 
     if (bme680.status == BSEC_OK) {

src/modules/Telemetry/Sensor/BME680Sensor.h

@@ -6,7 +6,7 @@
 
 #include "bme680_iaq_33v_3s_4d/bsec_iaq.h"
 
-class BME680Sensor : virtual public TelemetrySensor
+class BME680Sensor : public TelemetrySensor
 {
   private:
     Bsec2 bme680;

src/modules/Telemetry/Sensor/BMP280Sensor.cpp

@@ -13,7 +13,8 @@ int32_t BMP280Sensor::runOnce()
     if (!hasSensor()) {
         return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS;
     }
-    status = bmp280.begin(nodeTelemetrySensorsMap[sensorType]);
+    bmp280 = Adafruit_BMP280(nodeTelemetrySensorsMap[sensorType].second);
+    status = bmp280.begin(nodeTelemetrySensorsMap[sensorType].first);
 
     bmp280.setSampling(Adafruit_BMP280::MODE_FORCED,
                        Adafruit_BMP280::SAMPLING_X1, // Temp. oversampling

src/modules/Telemetry/Sensor/BMP280Sensor.h

@@ -2,7 +2,7 @@
 #include "TelemetrySensor.h"
 #include <Adafruit_BMP280.h>
 
-class BMP280Sensor : virtual public TelemetrySensor
+class BMP280Sensor : public TelemetrySensor
 {
   private:
     Adafruit_BMP280 bmp280;

src/modules/Telemetry/Sensor/INA219Sensor.cpp

@@ -13,8 +13,8 @@ int32_t INA219Sensor::runOnce()
         return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS;
     }
     if (!ina219.success()) {
-        ina219 = Adafruit_INA219(nodeTelemetrySensorsMap[sensorType]);
-        status = ina219.begin();
+        ina219 = Adafruit_INA219(nodeTelemetrySensorsMap[sensorType].first);
+        status = ina219.begin(nodeTelemetrySensorsMap[sensorType].second);
     } else {
         status = ina219.success();
     }

src/modules/Telemetry/Sensor/INA219Sensor.h

@@ -3,7 +3,7 @@
 #include "VoltageSensor.h"
 #include <Adafruit_INA219.h>
 
-class INA219Sensor : virtual public TelemetrySensor, VoltageSensor
+class INA219Sensor : public TelemetrySensor, VoltageSensor
 {
   private:
     Adafruit_INA219 ina219;

src/modules/Telemetry/Sensor/INA260Sensor.cpp

@@ -14,7 +14,7 @@ int32_t INA260Sensor::runOnce()
     }
 
     if (!status) {
-        status = ina260.begin(nodeTelemetrySensorsMap[sensorType]);
+        status = ina260.begin(nodeTelemetrySensorsMap[sensorType].first, nodeTelemetrySensorsMap[sensorType].second);
     }
     return initI2CSensor();
 }

src/modules/Telemetry/Sensor/INA260Sensor.h

@@ -3,7 +3,7 @@
 #include "VoltageSensor.h"
 #include <Adafruit_INA260.h>
 
-class INA260Sensor : virtual public TelemetrySensor, VoltageSensor
+class INA260Sensor : public TelemetrySensor, VoltageSensor
 {
   private:
     Adafruit_INA260 ina260 = Adafruit_INA260();

src/modules/Telemetry/Sensor/INA3221Sensor.cpp

@@ -0,0 +1,44 @@
+#include "INA3221Sensor.h"
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "TelemetrySensor.h"
+#include "configuration.h"
+#include <INA3221.h>
+
+INA3221Sensor::INA3221Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_INA3221, "INA3221"){};
+
+int32_t INA3221Sensor::runOnce()
+{
+    LOG_INFO("Init sensor: %s\n", sensorName);
+    if (!hasSensor()) {
+        return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS;
+    }
+    if (!status) {
+        ina3221.setAddr(INA3221_ADDR42_SDA); // i2c address 0x42
+        ina3221.begin();
+        ina3221.setShuntRes(100, 100, 100); // 0.1 Ohm shunt resistors
+        status = true;
+    } else {
+        status = true;
+    }
+    return initI2CSensor();
+};
+
+void INA3221Sensor::setup() {}
+
+bool INA3221Sensor::getMetrics(meshtastic_Telemetry *measurement)
+{
+    measurement->variant.environment_metrics.voltage = ina3221.getVoltage(INA3221_CH1);
+    measurement->variant.environment_metrics.current = ina3221.getCurrent(INA3221_CH1);
+    measurement->variant.power_metrics.ch1_voltage = ina3221.getVoltage(INA3221_CH1);
+    measurement->variant.power_metrics.ch1_current = ina3221.getCurrent(INA3221_CH1);
+    measurement->variant.power_metrics.ch2_voltage = ina3221.getVoltage(INA3221_CH2);
+    measurement->variant.power_metrics.ch2_current = ina3221.getCurrent(INA3221_CH2);
+    measurement->variant.power_metrics.ch3_voltage = ina3221.getVoltage(INA3221_CH3);
+    measurement->variant.power_metrics.ch3_current = ina3221.getCurrent(INA3221_CH3);
+    return true;
+}
+
+uint16_t INA3221Sensor::getBusVoltageMv()
+{
+    return lround(ina3221.getVoltage(INA3221_CH1) * 1000);
+}

src/modules/Telemetry/Sensor/INA3221Sensor.h

@@ -0,0 +1,19 @@
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "TelemetrySensor.h"
+#include "VoltageSensor.h"
+#include <INA3221.h>
+
+class INA3221Sensor : public TelemetrySensor, VoltageSensor
+{
+  private:
+    INA3221 ina3221 = INA3221(INA3221_ADDR42_SDA);
+
+  protected:
+    void setup() override;
+
+  public:
+    INA3221Sensor();
+    int32_t runOnce() override;
+    bool getMetrics(meshtastic_Telemetry *measurement) override;
+    virtual uint16_t getBusVoltageMv() override;
+};

src/modules/Telemetry/Sensor/LPS22HBSensor.cpp

@@ -13,7 +13,7 @@ int32_t LPS22HBSensor::runOnce()
     if (!hasSensor()) {
         return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS;
     }
-    status = lps22hb.begin_I2C(nodeTelemetrySensorsMap[sensorType]);
+    status = lps22hb.begin_I2C(nodeTelemetrySensorsMap[sensorType].first, nodeTelemetrySensorsMap[sensorType].second);
     return initI2CSensor();
 }
 

src/modules/Telemetry/Sensor/LPS22HBSensor.h

@@ -3,7 +3,7 @@
 #include <Adafruit_LPS2X.h>
 #include <Adafruit_Sensor.h>
 
-class LPS22HBSensor : virtual public TelemetrySensor
+class LPS22HBSensor : public TelemetrySensor
 {
   private:
     Adafruit_LPS22 lps22hb;

src/modules/Telemetry/Sensor/MCP9808Sensor.cpp

@@ -12,7 +12,7 @@ int32_t MCP9808Sensor::runOnce()
     if (!hasSensor()) {
         return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS;
     }
-    status = mcp9808.begin(nodeTelemetrySensorsMap[sensorType]);
+    status = mcp9808.begin(nodeTelemetrySensorsMap[sensorType].first, nodeTelemetrySensorsMap[sensorType].second);
     return initI2CSensor();
 }
 

src/modules/Telemetry/Sensor/MCP9808Sensor.h

@@ -2,7 +2,7 @@
 #include "TelemetrySensor.h"
 #include <Adafruit_MCP9808.h>
 
-class MCP9808Sensor : virtual public TelemetrySensor
+class MCP9808Sensor : public TelemetrySensor
 {
   private:
     Adafruit_MCP9808 mcp9808;

src/modules/Telemetry/Sensor/SHT31Sensor.h

@@ -2,7 +2,7 @@
 #include "TelemetrySensor.h"
 #include <Adafruit_SHT31.h>
 
-class SHT31Sensor : virtual public TelemetrySensor
+class SHT31Sensor : public TelemetrySensor
 {
   private:
     Adafruit_SHT31 sht31 = Adafruit_SHT31();

src/modules/Telemetry/Sensor/SHTC3Sensor.h

@@ -2,7 +2,7 @@
 #include "TelemetrySensor.h"
 #include <Adafruit_SHTC3.h>
 
-class SHTC3Sensor : virtual public TelemetrySensor
+class SHTC3Sensor : public TelemetrySensor
 {
   private:
     Adafruit_SHTC3 shtc3 = Adafruit_SHTC3();

src/modules/Telemetry/Sensor/TelemetrySensor.h

@@ -1,9 +1,12 @@
 #pragma once
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "NodeDB.h"
+#include <utility>
+
+class TwoWire;
 
 #define DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS 1000
-extern uint8_t nodeTelemetrySensorsMap[_meshtastic_TelemetrySensorType_MAX + 1];
+extern std::pair<uint8_t, TwoWire *> nodeTelemetrySensorsMap[_meshtastic_TelemetrySensorType_MAX + 1];
 
 class TelemetrySensor
 {
@@ -16,7 +19,7 @@ class TelemetrySensor
     }
 
     const char *sensorName;
-    meshtastic_TelemetrySensorType sensorType;
+    meshtastic_TelemetrySensorType sensorType = meshtastic_TelemetrySensorType_SENSOR_UNSET;
     unsigned status;
     bool initialized = false;
 
@@ -24,9 +27,9 @@ class TelemetrySensor
     {
         if (!status) {
             LOG_WARN("Could not connect to detected %s sensor.\n Removing from nodeTelemetrySensorsMap.\n", sensorName);
-            nodeTelemetrySensorsMap[sensorType] = 0;
+            nodeTelemetrySensorsMap[sensorType].first = 0;
         } else {
-            LOG_INFO("Opened %s sensor on default i2c bus\n", sensorName);
+            LOG_INFO("Opened %s sensor on i2c bus\n", sensorName);
             setup();
         }
         initialized = true;
@@ -35,7 +38,7 @@ class TelemetrySensor
     virtual void setup();
 
   public:
-    bool hasSensor() { return sensorType < sizeof(nodeTelemetrySensorsMap) && nodeTelemetrySensorsMap[sensorType] > 0; }
+    bool hasSensor() { return nodeTelemetrySensorsMap[sensorType].first > 0; }
 
     virtual int32_t runOnce() = 0;
     virtual bool isInitialized() { return initialized; }

src/mqtt/MQTT.cpp

@@ -133,10 +133,16 @@ void MQTT::onReceive(char *topic, byte *payload, size_t length)
             if (strcmp(e.gateway_id, owner.id) == 0)
                 LOG_INFO("Ignoring downlink message we originally sent.\n");
             else {
-                if (e.packet) {
+                // Find channel by channel_id and check downlink_enabled
+                meshtastic_Channel ch = channels.getByName(e.channel_id);
+                if (strcmp(e.channel_id, channels.getGlobalId(ch.index)) == 0 && e.packet && ch.settings.downlink_enabled) {
                     LOG_INFO("Received MQTT topic %s, len=%u\n", topic, length);
                     meshtastic_MeshPacket *p = packetPool.allocCopy(*e.packet);
 
+                    if (p->which_payload_variant == meshtastic_MeshPacket_decoded_tag) {
+                        p->channel = ch.index;
+                    }
+
                     // ignore messages sent by us or if we don't have the channel key
                     if (router && p->from != nodeDB.getNodeNum() && perhapsDecode(p))
                         router->enqueueReceivedMessage(p);
@@ -559,6 +565,13 @@ std::string MQTT::meshPacketToJson(meshtastic_MeshPacket *mp)
                     msgPayload["gas_resistance"] = new JSONValue(decoded->variant.environment_metrics.gas_resistance);
                     msgPayload["voltage"] = new JSONValue(decoded->variant.environment_metrics.voltage);
                     msgPayload["current"] = new JSONValue(decoded->variant.environment_metrics.current);
+                } else if (decoded->which_variant == meshtastic_Telemetry_power_metrics_tag) {
+                    msgPayload["voltage_ch1"] = new JSONValue(decoded->variant.power_metrics.ch1_voltage);
+                    msgPayload["current_ch1"] = new JSONValue(decoded->variant.power_metrics.ch1_current);
+                    msgPayload["voltage_ch2"] = new JSONValue(decoded->variant.power_metrics.ch2_voltage);
+                    msgPayload["current_ch2"] = new JSONValue(decoded->variant.power_metrics.ch2_current);
+                    msgPayload["voltage_ch3"] = new JSONValue(decoded->variant.power_metrics.ch3_voltage);
+                    msgPayload["current_ch3"] = new JSONValue(decoded->variant.power_metrics.ch3_current);
                 }
                 jsonObj["payload"] = new JSONValue(msgPayload);
             } else {
@@ -686,6 +699,10 @@ std::string MQTT::meshPacketToJson(meshtastic_MeshPacket *mp)
     jsonObj["channel"] = new JSONValue((uint)mp->channel);
     jsonObj["type"] = new JSONValue(msgType.c_str());
     jsonObj["sender"] = new JSONValue(owner.id);
+    if (mp->rx_rssi != 0)
+        jsonObj["rssi"] = new JSONValue((int)mp->rx_rssi);
+    if (mp->rx_snr != 0)
+        jsonObj["snr"] = new JSONValue((float)mp->rx_snr);
 
     // serialize and write it to the stream
     JSONValue *value = new JSONValue(jsonObj);

src/platform/nrf52/architecture.h

@@ -46,6 +46,8 @@
 #define HW_VENDOR meshtastic_HardwareModel_RAK4631
 #elif defined(TTGO_T_ECHO)
 #define HW_VENDOR meshtastic_HardwareModel_T_ECHO
+#elif defined(NANO_G2_ULTRA)
+#define HW_VENDOR meshtastic_HardwareModel_NANO_G2_ULTRA
 #elif defined(NORDIC_PCA10059)
 #define HW_VENDOR meshtastic_HardwareModel_NRF52840_PCA10059
 #elif defined(PRIVATE_HW) || defined(FEATHER_DIY)

src/platform/nrf52/main-nrf52.cpp

@@ -180,15 +180,19 @@ void cpuDeepSleep(uint32_t msecToWake)
     digitalWrite(AQ_SET_PIN, LOW);
 #endif
 #endif
-    // FIXME, use system off mode with ram retention for key state?
-    // FIXME, use non-init RAM per
-    // https://devzone.nordicsemi.com/f/nordic-q-a/48919/ram-retention-settings-with-softdevice-enabled
-
-    if (config.device.role == meshtastic_Config_DeviceConfig_Role_TRACKER && config.power.is_power_saving == true) {
+    // Sleepy trackers or sensors can low power "sleep"
+    // Don't enter this if we're sleeping portMAX_DELAY, since that's a shutdown event
+    if (msecToWake != portMAX_DELAY &&
+        (config.device.role == meshtastic_Config_DeviceConfig_Role_TRACKER ||
+         config.device.role == meshtastic_Config_DeviceConfig_Role_SENSOR) &&
+        config.power.is_power_saving == true) {
         sd_power_mode_set(NRF_POWER_MODE_LOWPWR);
         delay(msecToWake);
         NVIC_SystemReset();
     } else {
+        // FIXME, use system off mode with ram retention for key state?
+        // FIXME, use non-init RAM per
+        // https://devzone.nordicsemi.com/f/nordic-q-a/48919/ram-retention-settings-with-softdevice-enabled
         auto ok = sd_power_system_off();
         if (ok != NRF_SUCCESS) {
             LOG_ERROR("FIXME: Ignoring soft device (EasyDMA pending?) and forcing system-off!\n");

src/platform/portduino/PiHal.h

@@ -0,0 +1,155 @@
+#ifndef PI_HAL_H
+#define PI_HAL_H
+
+// include RadioLib
+#include <RadioLib.h>
+
+// include the library for Raspberry GPIO pins
+#include "pigpio.h"
+
+// create a new Raspberry Pi hardware abstraction layer
+// using the pigpio library
+// the HAL must inherit from the base RadioLibHal class
+// and implement all of its virtual methods
+class PiHal : public RadioLibHal
+{
+  public:
+    // default constructor - initializes the base HAL and any needed private members
+    PiHal(uint8_t spiChannel, uint32_t spiSpeed = 2000000)
+        : RadioLibHal(PI_INPUT, PI_OUTPUT, PI_LOW, PI_HIGH, RISING_EDGE, FALLING_EDGE), _spiChannel(spiChannel),
+          _spiSpeed(spiSpeed)
+    {
+    }
+
+    void init() override
+    {
+        // first initialise pigpio library
+        gpioInitialise();
+
+        // now the SPI
+        spiBegin();
+
+        // Waveshare LoRaWAN Hat also needs pin 18 to be pulled high to enable the radio
+        // gpioSetMode(18, PI_OUTPUT);
+        // gpioWrite(18, PI_HIGH);
+    }
+
+    void term() override
+    {
+        // stop the SPI
+        spiEnd();
+
+        // pull the enable pin low
+        // gpioSetMode(18, PI_OUTPUT);
+        // gpioWrite(18, PI_LOW);
+
+        // finally, stop the pigpio library
+        gpioTerminate();
+    }
+
+    // GPIO-related methods (pinMode, digitalWrite etc.) should check
+    // RADIOLIB_NC as an alias for non-connected pins
+    void pinMode(uint32_t pin, uint32_t mode) override
+    {
+        if (pin == RADIOLIB_NC) {
+            return;
+        }
+
+        gpioSetMode(pin, mode);
+    }
+
+    void digitalWrite(uint32_t pin, uint32_t value) override
+    {
+        if (pin == RADIOLIB_NC) {
+            return;
+        }
+
+        gpioWrite(pin, value);
+    }
+
+    uint32_t digitalRead(uint32_t pin) override
+    {
+        if (pin == RADIOLIB_NC) {
+            return (0);
+        }
+
+        return (gpioRead(pin));
+    }
+
+    void attachInterrupt(uint32_t interruptNum, void (*interruptCb)(void), uint32_t mode) override
+    {
+        if (interruptNum == RADIOLIB_NC) {
+            return;
+        }
+        if (gpioRead(interruptNum) == 1) {
+            interruptCb();
+        } else {
+            gpioSetAlertFunc(interruptNum, (gpioISRFunc_t)interruptCb);
+        }
+    }
+
+    void detachInterrupt(uint32_t interruptNum) override
+    {
+        if (interruptNum == RADIOLIB_NC) {
+            return;
+        }
+
+        gpioSetAlertFunc(interruptNum, NULL);
+    }
+
+    void delay(unsigned long ms) override { gpioDelay(ms * 1000); }
+
+    void delayMicroseconds(unsigned long us) override { gpioDelay(us); }
+
+    unsigned long millis() override { return (gpioTick() / 1000); }
+
+    unsigned long micros() override { return (gpioTick()); }
+
+    long pulseIn(uint32_t pin, uint32_t state, unsigned long timeout) override
+    {
+        if (pin == RADIOLIB_NC) {
+            return (0);
+        }
+
+        this->pinMode(pin, PI_INPUT);
+        uint32_t start = this->micros();
+        uint32_t curtick = this->micros();
+
+        while (this->digitalRead(pin) == state) {
+            if ((this->micros() - curtick) > timeout) {
+                return (0);
+            }
+        }
+
+        return (this->micros() - start);
+    }
+
+    void spiBegin()
+    {
+        if (_spiHandle < 0) {
+            _spiHandle = spiOpen(_spiChannel, _spiSpeed, 0);
+        }
+    }
+
+    void spiBeginTransaction() {}
+
+    void spiTransfer(uint8_t *out, size_t len, uint8_t *in) { spiXfer(_spiHandle, (char *)out, (char *)in, len); }
+
+    void spiEndTransaction() {}
+
+    void spiEnd()
+    {
+        if (_spiHandle >= 0) {
+            spiClose(_spiHandle);
+            _spiHandle = -1;
+        }
+    }
+
+  private:
+    // the HAL can contain any additional private members
+    const unsigned int _spiSpeed;
+    const uint8_t _spiChannel;
+    int _spiHandle = -1;
+};
+
+#endif

src/platform/portduino/PortduinoGlue.cpp

@@ -7,10 +7,22 @@
 
 #include <Utility.h>
 #include <assert.h>
+
+#ifdef ARCH_RASPBERRY_PI
+#include "PortduinoGlue.h"
+#include "pigpio.h"
+#include "yaml-cpp/yaml.h"
+#include <iostream>
+#include <map>
+#include <unistd.h>
+
+std::map<int, int> settingsMap;
+
+#else
 #include <linux/gpio/LinuxGPIOPin.h>
+#endif
 
 // FIXME - move setBluetoothEnable into a HALPlatform class
-
 void setBluetoothEnable(bool on)
 {
     // not needed
@@ -22,7 +34,7 @@ void cpuDeepSleep(uint32_t msecs)
 }
 
 void updateBatteryLevel(uint8_t level) NOT_IMPLEMENTED("updateBatteryLevel");
-
+#ifndef ARCH_RASPBERRY_PI
 /** a simulated pin for busted IRQ hardware
  * Porduino helper class to do this i2c based polling:
  */
@@ -49,7 +61,7 @@ class PolledIrqPin : public GPIOPin
 };
 
 static GPIOPin *loraIrq;
-
+#endif
 int TCPPort = 4403;
 
 static error_t parse_opt(int key, char *arg, struct argp_state *state)
@@ -88,7 +100,57 @@ void portduinoSetup()
 {
     printf("Setting up Meshtastic on Portduino...\n");
 
-#ifdef PORTDUINO_LINUX_HARDWARE
+#ifdef ARCH_RASPBERRY_PI
+    YAML::Node yamlConfig;
+
+    if (access("config.yaml", R_OK) == 0) {
+        try {
+            yamlConfig = YAML::LoadFile("config.yaml");
+        } catch (YAML::Exception e) {
+            std::cout << "*** Exception " << e.what() << std::endl;
+            exit(EXIT_FAILURE);
+        }
+    } else if (access("/etc/meshtasticd/config.yaml", R_OK) == 0) {
+        try {
+            yamlConfig = YAML::LoadFile("/etc/meshtasticd/config.yaml");
+        } catch (YAML::Exception e) {
+            std::cout << "*** Exception " << e.what() << std::endl;
+            exit(EXIT_FAILURE);
+        }
+    } else {
+        std::cout << "No 'config.yaml' found, exiting." << std::endl;
+        exit(EXIT_FAILURE);
+    }
+
+    try {
+        if (yamlConfig["Lora"]) {
+            settingsMap[use_sx1262] = false;
+            settingsMap[use_rf95] = false;
+
+            if (yamlConfig["Lora"]["Module"] && yamlConfig["Lora"]["Module"].as<std::string>("") == "sx1262") {
+                settingsMap[use_sx1262] = true;
+            } else if (yamlConfig["Lora"]["Module"] && yamlConfig["Lora"]["Module"].as<std::string>("") == "RF95") {
+                settingsMap[use_rf95] = true;
+            }
+            settingsMap[dio2_as_rf_switch] = yamlConfig["Lora"]["DIO2_AS_RF_SWITCH"].as<bool>(false);
+            settingsMap[cs] = yamlConfig["Lora"]["CS"].as<int>(RADIOLIB_NC);
+            settingsMap[irq] = yamlConfig["Lora"]["IRQ"].as<int>(RADIOLIB_NC);
+            settingsMap[busy] = yamlConfig["Lora"]["Busy"].as<int>(RADIOLIB_NC);
+            settingsMap[reset] = yamlConfig["Lora"]["Reset"].as<int>(RADIOLIB_NC);
+        }
+
+    } catch (YAML::Exception e) {
+        std::cout << "*** Exception " << e.what() << std::endl;
+        exit(EXIT_FAILURE);
+    }
+    if (access("/sys/kernel/debug/bluetooth/hci0/identity", R_OK) != 0) {
+        std::cout << "Cannot read Bluetooth MAC Address. Please run as root" << std::endl;
+        exit(EXIT_FAILURE);
+    }
+    return;
+#endif
+
+#ifdef defined(PORTDUINO_LINUX_HARDWARE)
     SPI.begin(); // We need to create SPI
     bool usePineLora = !spiChip->isSimulated();
     if (usePineLora) {
@@ -112,7 +174,7 @@ void portduinoSetup()
         gpioBind(loraCs);
     } else
 #endif
-
+#ifndef ARCH_RASPBERRY_PI
     {
         // Set the random seed equal to TCPPort to have a different seed per instance
         randomSeed(TCPPort);
@@ -129,7 +191,7 @@ void portduinoSetup()
         gpioBind(new SimGPIOPin(SX126X_RESET, "fakeLoraReset"));
         gpioBind(new SimGPIOPin(LORA_DIO1, "fakeLoraIrq"));
     }
-
     // gpioBind((new SimGPIOPin(LORA_RESET, "LORA_RESET")));
     // gpioBind((new SimGPIOPin(RF95_NSS, "RF95_NSS"))->setSilent());
-}
+#endif
+}

src/platform/portduino/PortduinoGlue.h

@@ -0,0 +1,9 @@
+#pragma once
+#ifdef ARCH_RASPBERRY_PI
+#include <map>
+
+extern std::map<int, int> settingsMap;
+
+enum { use_sx1262, cs, irq, busy, reset, dio2_as_rf_switch, use_rf95 };
+
+#endif

src/power.h

@@ -25,8 +25,10 @@ extern RTC_NOINIT_ATTR uint64_t RTC_reg_b;
 #if HAS_TELEMETRY && !defined(ARCH_PORTDUINO)
 #include "modules/Telemetry/Sensor/INA219Sensor.h"
 #include "modules/Telemetry/Sensor/INA260Sensor.h"
+#include "modules/Telemetry/Sensor/INA3221Sensor.h"
 extern INA260Sensor ina260Sensor;
 extern INA219Sensor ina219Sensor;
+extern INA3221Sensor ina3221Sensor;
 #endif
 
 class Power : private concurrency::OSThread

src/shutdown.h

@@ -14,6 +14,8 @@ void powerCommandsCheck()
         NVIC_SystemReset();
 #elif defined(ARCH_RP2040)
         rp2040.reboot();
+#elif defined(ARCH_RASPBERRY_PI)
+        exit(EXIT_SUCCESS);
 #else
         rebootAtMsec = -1;
         LOG_WARN("FIXME implement reboot for this platform. Note that some settings require a restart to be applied.\n");

src/sleep.cpp

@@ -202,7 +202,13 @@ void doDeepSleep(uint32_t msecToWake, bool skipPreflight = false)
     digitalWrite(RESET_OLED, 1); // put the display in reset before killing its power
 #endif
 
-#ifdef VEXT_ENABLE
+#if defined(VEXT_ENABLE_V03)
+    if (heltec_version == 3) {
+        digitalWrite(VEXT_ENABLE_V03, 1); // turn off the display power
+    } else {
+        digitalWrite(VEXT_ENABLE_V05, 0); // turn off the display power
+    }
+#elif defined(VEXT_ENABLE)
     digitalWrite(VEXT_ENABLE, 1); // turn off the display power
 #endif
 

variants/MakePython_nRF52840_eink/platformio.ini

@@ -11,4 +11,4 @@ lib_deps =
   https://github.com/meshtastic/ESP32_Codec2.git#633326c78ac251c059ab3a8c430fcdf25b41672f
   zinggjm/GxEPD2@^1.4.9
 debug_tool = jlink
-upload_port = /dev/ttyACM4
+;upload_port = /dev/ttyACM4

variants/betafpv_2400_tx_micro/platformio.ini

@@ -11,7 +11,7 @@ build_flags =
   -I variants/betafpv_2400_tx_micro
 board_build.f_cpu = 240000000L
 upload_protocol = esptool
-upload_port = /dev/ttyUSB0
+;upload_port = /dev/ttyUSB0
 upload_speed = 460800
 lib_deps =
   ${esp32_base.lib_deps}

variants/betafpv_900_tx_nano/platformio.ini

@@ -10,7 +10,7 @@ build_flags =
   -I variants/betafpv_900_tx_nano
 board_build.f_cpu = 240000000L
 upload_protocol = esptool
-upload_port = /dev/ttyUSB0
+;upload_port = /dev/ttyUSB0
 upload_speed = 460800
 lib_deps =
   ${esp32_base.lib_deps}

variants/bpi_picow_esp32_s3/platformio.ini

@@ -6,7 +6,7 @@ board_level = extra
 ;upload_protocol = esp-builtin
 ;Normal method
 upload_protocol = esptool
-upload_port = /dev/ttyACM2
+;upload_port = /dev/ttyACM2
 lib_deps =
   ${esp32_base.lib_deps}
   caveman99/ESP32 Codec2@^1.0.1

variants/diy/hydra/variant.h

@@ -2,13 +2,11 @@
 #define I2C_SDA 21
 #define I2C_SCL 22
 
-// GPS
-#undef GPS_RX_PIN
-#undef GPS_TX_PIN
-#define GPS_RX_PIN 12
+// For GPS, 'undef's not needed
 #define GPS_TX_PIN 15
-#define GPS_UBLOX
+#define GPS_RX_PIN 12
 #define PIN_GPS_EN 4
+#define GPS_POWER_TOGGLE // Moved definition from platformio.ini to here
 
 #define BUTTON_PIN 39  // The middle button GPIO on the T-Beam
 #define BATTERY_PIN 35 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
@@ -18,28 +16,25 @@
 #define EXT_NOTIFY_OUT 12   // Overridden default pin to use for Ext Notify Module (#975).
 #define LED_PIN 2           // add status LED (compatible with core-pcb and DIY targets)
 
-#define LORA_DIO0 26  // a No connect on the SX1262/SX1268 module
-#define LORA_RESET 23 // RST for SX1276, and for SX1262/SX1268
-#define LORA_DIO1 33  // IRQ for SX1262/SX1268
-#define LORA_DIO2 32  // BUSY for SX1262/SX1268
-#define LORA_DIO3     // Not connected on PCB, but internally on the TTGO SX1262/SX1268, if DIO3 is high the TXCO is enabled
+// Radio
+#define USE_SX1262 // E22-900M30S uses SX1262
+#define SX126X_MAX_POWER                                                                                                         \
+    22 // Outputting 22dBm from SX1262 results in ~30dBm E22-900M30S output (module only uses last stage of the YP2233W PA)
+#define SX126X_DIO3_TCXO_VOLTAGE 1.8 // E22 series TCXO reference voltage is 1.8V
 
-#define RF95_SCK 5
-#define RF95_MISO 19
-#define RF95_MOSI 27
-#define RF95_NSS 18
+#define SX126X_CS 18    // EBYTE module's NSS pin
+#define SX126X_SCK 5    // EBYTE module's SCK pin
+#define SX126X_MOSI 27  // EBYTE module's MOSI pin
+#define SX126X_MISO 19  // EBYTE module's MISO pin
+#define SX126X_RESET 23 // EBYTE module's NRST pin
+#define SX126X_BUSY 32  // EBYTE module's BUSY pin
+#define SX126X_DIO1 33  // EBYTE module's DIO1 pin
 
-#define USE_SX1262
+#define SX126X_TXEN 13 // Schematic connects EBYTE module's TXEN pin to MCU
+#define SX126X_RXEN 14 // Schematic connects EBYTE module's RXEN pin to MCU
 
-#define SX126X_CS 18 // NSS for SX126X
-#define SX126X_DIO1 LORA_DIO1
-#define SX126X_BUSY LORA_DIO2
-#define SX126X_RESET LORA_RESET
-#define SX126X_RXEN 14
-#define SX126X_TXEN RADIOLIB_NC
-#define SX126X_DIO2_AS_RF_SWITCH
-
-// Set lora.tx_power to 13 for Hydra or other E22 900M30S target due to PA
-#define SX126X_MAX_POWER 13
-
-#define SX126X_DIO3_TCXO_VOLTAGE 1.8
+#define RF95_NSS SX126X_CS    // Compatibility with variant file configuration structure
+#define RF95_SCK SX126X_SCK   // Compatibility with variant file configuration structure
+#define RF95_MOSI SX126X_MOSI // Compatibility with variant file configuration structure
+#define RF95_MISO SX126X_MISO // Compatibility with variant file configuration structure
+#define LORA_DIO1 SX126X_DIO1 // Compatibility with variant file configuration structure

variants/diy/platformio.ini

@@ -43,6 +43,4 @@ board_level = extra
 build_flags =
   ${esp32_base.build_flags}
   -D DIY_V1
-  -D EBYTE_E22
-  -D GPS_POWER_TOGGLE
   -I variants/diy/hydra

variants/heltec_esp32c3/platformio.ini

@@ -8,5 +8,5 @@ build_flags =
   -I variants/heltec_esp32c3
 monitor_speed = 115200
 upload_protocol = esptool
-upload_port = /dev/ttyUSB0
-upload_speed = 921600
+;upload_port = /dev/ttyUSB0
+upload_speed = 921600

variants/heltec_wireless_tracker/variant.h

@@ -9,9 +9,11 @@
 #define ST7735_RESET 39
 #define ST7735_MISO -1
 #define ST7735_BUSY -1
-#define ST7735_BL 45
+#define ST7735_BL_V03 45
+#define ST7735_BL_V05 21 /* V1.1 PCB marking */
 #define ST7735_SPI_HOST SPI3_HOST
-#define ST7735_BACKLIGHT_EN 45
+#define ST7735_BACKLIGHT_EN_V03 45
+#define ST7735_BACKLIGHT_EN_V05 21
 #define SPI_FREQUENCY 40000000
 #define SPI_READ_FREQUENCY 16000000
 #define SCREEN_ROTATE
@@ -19,17 +21,20 @@
 #define TFT_WIDTH 80
 #define TFT_OFFSET_X 26
 #define TFT_OFFSET_Y 0
-#define VTFT_CTRL 46                  // Heltec Tracker needs this pulled low for TFT
+#define VTFT_CTRL_V03 46 // Heltec Tracker needs this pulled low for TFT
+#define VTFT_CTRL_V05 -1
 #define SCREEN_TRANSITION_FRAMERATE 1 // fps
 #define DISPLAY_FORCE_SMALL_FONTS
 
-#define VEXT_ENABLE Vext // active low, powers the oled display and the lora antenna boost
+#define VEXT_ENABLE_V03 Vext // active low, powers the oled display and the lora antenna boost
+#define VEXT_ENABLE_V05 3    // active HIGH, powers the oled display
 #define BUTTON_PIN 0
 
 #define BATTERY_PIN 1 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
 #define ADC_CHANNEL ADC1_GPIO1_CHANNEL
 #define ADC_ATTENUATION ADC_ATTEN_DB_2_5 // lower dB for high resistance voltage divider
 #define ADC_MULTIPLIER 4.9
+#define ADC_CTRL 2 // active HIGH, powers the voltage divider. Only on 1.1
 
 #undef GPS_RX_PIN
 #undef GPS_TX_PIN
@@ -37,9 +42,12 @@
 #define GPS_TX_PIN 34
 #define PIN_GPS_RESET 35
 #define PIN_GPS_PPS 36
-#define VGNSS_CTRL 37 // Heltec Tracker needs this pulled low for GPS
-#define PIN_GPS_EN VGNSS_CTRL
+
+#define VGNSS_CTRL_V03 37 // Heltec Tracker needs this pulled low for GPS
+#define VGNSS_CTRL_V05 -1 // Heltec Tracker needs this pulled low for GPS
+#define PIN_GPS_EN VGNSS_CTRL_V03
 #define GPS_EN_ACTIVE LOW
+
 #define GPS_RESET_MODE LOW
 #define GPS_UC6580
 

variants/heltec_wsl_v3/variant.h

@@ -8,8 +8,6 @@
 #define VEXT_ENABLE Vext // active low, powers the oled display and the lora antenna boost
 #define BUTTON_PIN 0
 
-#define PIN_GPS_EN 46 // GPS power enable pin
-
 #define BATTERY_PIN 1 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
 #define ADC_CHANNEL ADC1_GPIO1_CHANNEL
 #define ADC_ATTENUATION ADC_ATTEN_DB_2_5 // lower dB for high resistance voltage divider

variants/m5stack-stamp-c3/platformio.ini

@@ -8,5 +8,5 @@ build_flags =
   -I variants/m5stack-stamp-c3
 monitor_speed = 115200
 upload_protocol = esptool
-upload_port = /dev/ttyACM2
+;upload_port = /dev/ttyACM2
 upload_speed = 921600

variants/m5stack_coreink/platformio.ini

@@ -23,4 +23,4 @@ lib_ignore =
 monitor_filters = esp32_exception_decoder
 board_build.f_cpu = 240000000L
 upload_protocol = esptool
-upload_port = /dev/ttyACM0
+;upload_port = /dev/ttyACM0