Update version.properties

add nano_g1

.github/workflows/main.yml

@@ -1,21 +1,11 @@
-name: Continuous Integration
+name: Continuous Integration (Legacy serial build)
 on:
   # Triggers the workflow on push or pull request events but only for the master branch
-  push:
+  workflow_dispatch:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  # setup:
-  # runs-on: ubuntu-latest
-  # steps:
   
-  # - name: Startup
+jobs:
-  #   run: echo "No action setup currently needed, skipping..."
 
-  ci-build:
+  ci-check:
-    # needs: setup
     runs-on: ubuntu-latest
     steps:
 
@@ -23,6 +13,12 @@ jobs:
       uses: actions/checkout@v2
       with:
         submodules: 'recursive'
+        ref: ${{github.event.pull_request.head.ref}}
+        repository: ${{github.event.pull_request.head.repo.full_name}}
+
+    - name: Install cppcheck
+      run: |
+        sudo apt-get install -y cppcheck
 
     - name: Setup Python
       uses: actions/setup-python@v2
@@ -36,9 +32,42 @@ jobs:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip
 
-    #- name: Install linux apt packages
+    - name: Upgrade python tools and install platformio
-    #  run: |
+      run: |
-    #    sudo apt-get install -y libgpiod-dev
+        python -m pip install --upgrade pip
+        pip install -U platformio
+
+    - name: Upgrade platformio
+      run: |
+        pio upgrade
+
+    - name: Check everything
+      run: bin/check-all.sh
+
+
+
+  ci-build:
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Checkout code
+      uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
+        ref: ${{github.event.pull_request.head.ref}}
+        repository: ${{github.event.pull_request.head.repo.full_name}}
+
+    - name: Setup Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.x
+
+    - name: Cache python libs
+      uses: actions/cache@v1
+      id: cache-pip # needed in if test
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip
 
     - name: Upgrade python tools
       # We actually want to run this every time
@@ -81,22 +110,23 @@ jobs:
         echo "Simulator started, launching python test..."
         python3 -c 'from meshtastic.test import testSimulator; testSimulator()'
 
-    # - name: Build for tbeam
+    - name: Cat bin/build-all.sh
-    #   run: platformio run -e tbeam
+      run: |
-    # - name: Build for heltec
+        cat bin/build-all.sh
-    #   run: platformio run -e heltec
-    # - name: Build for wisblock RAK4631
-    #   run: platformio run -e rak4631
 
     - name: Build everything
       run: bin/build-all.sh
 
+    - name: Get release version string
+      run: echo "::set-output name=version::$(./bin/buildinfo.py long)"
+      id: version
+
     - name: Store binaries as an artifact
       uses: actions/upload-artifact@v2
       with:
-        name: built
+        name: firmware-${{ steps.version.outputs.version }}.zip
-        path: release/archive/firmware-*.zip
+        path: release/archive/firmware-${{ steps.version.outputs.version }}.zip
-        retention-days: 30
+        retention-days: 90
 
     - name: Store debugging elf files as an artifact
       uses: actions/upload-artifact@v2
@@ -104,3 +134,18 @@ jobs:
         name: debug-elfs
         path: release/archive/elfs-*.zip
         retention-days: 7
+
+    - name: Download firmware.zip
+      uses: actions/download-artifact@master
+      with:
+        name: firmware-${{ steps.version.outputs.version }}.zip
+        path: ./
+
+    - name: Pull request artifacts
+      if: ${{ github.event_name == 'pull_request_target' || github.event_name == 'pull_request' }}
+      uses: gavv/pull-request-artifacts@v1.0.0
+      with:
+        commit: ${{ (github.event.pull_request_target || github.event.pull_request).head.sha }}
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        artifacts-branch: artifacts
+        artifacts: ./firmware-${{ steps.version.outputs.version }}.zip

.github/workflows/main_matrix.yml

@@ -0,0 +1,347 @@
+name: Continuous Integration PR Checks (1.2 Legacy)
+on:
+  # # Triggers the workflow on push but only for the master branch
+  push:
+    branches: [ 1.2-legacy ]
+    paths-ignore:
+      - '**.md'
+      - '**.yml'
+      - 'version.properties'
+      
+  # Note: This is different from "pull_request". Need to specify ref when doing checkouts.
+  pull_request_target:
+    branches: [ 1.2-legacy ]
+    paths-ignore:
+      - '**.md'
+      - '**.yml'
+
+  workflow_dispatch:
+
+jobs:
+
+  check:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - board: rak11200
+          - board: tlora-v2
+          - board: tlora-v1
+          - board: tlora_v1_3
+          - board: tlora-v2-1-1.6
+          - board: tbeam
+          - board: heltec-v1
+          - board: heltec-v2.0
+          - board: heltec-v2.1
+          - board: tbeam0.7
+          - board: meshtastic-diy-v1
+          - board: rak4631_5005
+          - board: rak4631_19003
+          - board: t-echo
+          - board: nano-g1
+  
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Checkout code
+      uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
+        ref: ${{github.event.pull_request.head.ref}}
+        repository: ${{github.event.pull_request.head.repo.full_name}}
+
+    - name: Install cppcheck
+      run: |
+        sudo apt-get install -y cppcheck
+
+    - name: Setup Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.x
+
+    - name: Cache python libs
+      uses: actions/cache@v1
+      id: cache-pip # needed in if test
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip
+
+    - name: Upgrade python tools and install platformio
+      run: |
+        python -m pip install --upgrade pip
+        pip install -U platformio
+
+    - name: Upgrade platformio
+      run: |
+        pio upgrade
+
+    - name: Check ${{ matrix.board }}
+      run: bin/check-all.sh ${{ matrix.board }}
+      
+  after-checks:
+    runs-on: ubuntu-latest
+    needs: [check]
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
+
+  build-esp32:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - board: rak11200
+          - board: tlora-v2
+          - board: tlora-v1
+          - board: tlora_v1_3
+          - board: tlora-v2-1-1.6
+          - board: tbeam
+          - board: heltec-v1
+          - board: heltec-v2.0
+          - board: heltec-v2.1
+          - board: tbeam0.7
+          - board: meshtastic-diy-v1
+          - board: nano-g1
+    
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Checkout code
+      uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
+        ref: ${{github.event.pull_request.head.ref}}
+        repository: ${{github.event.pull_request.head.repo.full_name}}
+
+    - name: Setup Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.x
+
+    - name: Cache python libs
+      uses: actions/cache@v1
+      id: cache-pip # needed in if test
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip
+
+    - name: Upgrade python tools
+      run: |
+        python -m pip install --upgrade pip
+        pip install -U platformio meshtastic adafruit-nrfutil
+
+    - name: Upgrade platformio
+      run: |
+        pio upgrade
+
+    - name: Pull web ui
+      uses: dsaltares/fetch-gh-release-asset@master
+      with:
+        repo: "meshtastic/meshtastic-web"
+        file: "build.tar"
+        target: "build.tar"
+        token: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Unpack web ui
+      run: |
+        tar -xf build.tar -C data/static
+        rm build.tar
+
+    - name: Build ESP32
+      run: bin/build-esp32.sh ${{ matrix.board }}
+
+    - name: Get release version string
+      run: echo "::set-output name=version::$(./bin/buildinfo.py long)"
+      id: version
+
+    - name: Store binaries as an artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: firmware-${{ matrix.board }}-${{ steps.version.outputs.version }}.zip
+        path: |
+          release/*.bin
+          release/*.elf
+        retention-days: 90
+
+  build-nrf52:
+    strategy:
+      fail-fast: false
+      matrix:
+        include: 
+          - board: rak4631_5005
+          - board: rak4631_19003
+          - board: t-echo
+    
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Checkout code
+      uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
+        ref: ${{github.event.pull_request.head.ref}}
+        repository: ${{github.event.pull_request.head.repo.full_name}}
+
+    - name: Setup Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.x
+
+    - name: Cache python libs
+      uses: actions/cache@v1
+      id: cache-pip # needed in if test
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip
+
+    - name: Upgrade python tools
+      run: |
+        python -m pip install --upgrade pip
+        pip install -U platformio meshtastic adafruit-nrfutil
+
+    - name: Upgrade platformio
+      run: |
+        pio upgrade
+
+    - name: Build NRF52
+      run: bin/build-nrf52.sh ${{ matrix.board }}
+
+    - name: Get release version string
+      run: echo "::set-output name=version::$(./bin/buildinfo.py long)"
+      id: version
+
+    - name: Store binaries as an artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: firmware-${{ matrix.board }}-${{ steps.version.outputs.version }}.zip
+        path: |
+          release/*.uf2
+          release/*.elf
+        retention-days: 90
+
+  build-native:
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Checkout code
+      uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
+        ref: ${{github.event.pull_request.head.ref}}
+        repository: ${{github.event.pull_request.head.repo.full_name}}
+
+    - name: Setup Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.x
+
+    - name: Cache python libs
+      uses: actions/cache@v1
+      id: cache-pip # needed in if test
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip
+
+    - name: Upgrade python tools
+      run: |
+        python -m pip install --upgrade pip
+        pip install -U platformio meshtastic adafruit-nrfutil
+
+    - name: Upgrade platformio
+      run: |
+        pio upgrade
+
+    # We now run integration test before other build steps (to quickly see runtime failures)
+    - name: Build for native
+      run: platformio run -e native
+    - name: Integration test
+      run: |
+        .pio/build/native/program &
+        sleep 20 # 5 seconds was not enough
+        echo "Simulator started, launching python test..."
+        python3 -c 'from meshtastic.test import testSimulator; testSimulator()'
+
+    - name: Build Native
+      run: bin/build-native.sh
+
+    - name: Get release version string
+      run: echo "::set-output name=version::$(./bin/buildinfo.py long)"
+      id: version
+
+    - name: Store binaries as an artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: firmware-native-${{ steps.version.outputs.version }}.zip
+        path: | 
+          release/meshtasticd_linux_amd64
+          release/device-*.sh
+          release/device-*.bat
+        retention-days: 90
+
+  gather-artifacts:
+    runs-on: ubuntu-latest
+    needs: [build-esp32, build-nrf52, build-native]
+    steps:
+
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
+
+      - uses: actions/download-artifact@v2
+        with:
+          path: ./
+
+      - name: Get release version string
+        run: echo "::set-output name=version::$(./bin/buildinfo.py long)"
+        id: version
+
+      - name: Move files up
+        run: mv -b -t ./ ./*tbeam-*/spiffs*.bin ./*tbeam-*/system-info.bin ./**/firmware*.bin ./**/*.uf2 ./**/*.elf ./**/meshtasticd_linux_amd64 ./*native*/*device-*.sh ./*native*/*device-*.bat
+
+      - name: Repackage in single firmware zip
+        uses: actions/upload-artifact@v2
+        with:
+          name: firmware-${{ steps.version.outputs.version }}
+          path: | 
+            ./*.bin
+            ./*.uf2
+            ./meshtasticd_linux_amd64
+            ./device-*.sh
+            ./device-*.bat
+          retention-days: 90
+
+      - uses: actions/download-artifact@v2
+        with:
+          name: firmware-${{ steps.version.outputs.version }}
+          path: ./output
+
+      # For diagnostics
+      - name: Show artifacts 
+        run: ls -lR
+
+      - name: Zip firmware
+        run: zip -j -r ./firmware-${{ steps.version.outputs.version }}.zip ./output
+
+      - name: Repackage in single elfs zip
+        uses: actions/upload-artifact@v2
+        with:
+          name: debug-elfs-${{ steps.version.outputs.version }}.zip
+          path: ./*.elf
+          retention-days: 90
+          
+      - name: Create request artifacts
+        if: ${{ github.event_name == 'pull_request_target' || github.event_name == 'pull_request' }}
+        uses: gavv/pull-request-artifacts@v1.0.0
+        with:
+          commit: ${{ (github.event.pull_request_target || github.event.pull_request).head.sha }}
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          artifacts-token: ${{ secrets.ARTIFACTS_TOKEN }}
+          artifacts-repo: meshtastic/artifacts
+          artifacts-branch: device
+          artifacts-dir: pr
+          artifacts: ./firmware-${{ steps.version.outputs.version }}.zip

.github/workflows/release.yml

@@ -1,13 +1,13 @@
 name: Make Release
 on:
   # Can optionally take parameters from the github UI, more info here https://github.blog/changelog/2020-07-06-github-actions-manual-triggers-with-workflow_dispatch/#:~:text=You%20can%20now%20create%20workflows,the%20workflow%20is%20run%20on.
-  # workflow_dispatch:
+  #workflow_dispatch:
   #  inputs:
 
   # Only want to run if version.properties is bumped in master
   push:
     branches:
-      - master
+      - 1.2-legacy
     paths:
     - 'version.properties'
 

.github/workflows/update_protobufs.yml

@@ -1,4 +1,4 @@
-name: "Update protobufs"
+name: "Update protobufs and regenerate classes"
 on: workflow_dispatch
 
 jobs:
@@ -11,14 +11,23 @@ jobs:
         with:
           submodules: true
 
-      - name: Update Submodule
+      - name: Update submodule
         run: |
-          git pull --recurse-submodules
+          git submodule update --remote proto
-          git submodule update --remote --recursive
+          
-      - name: Commit update
+      - name: Download nanopb
         run: |
-          git config --global user.name 'github-actions'
+          wget https://jpa.kapsi.fi/nanopb/download/nanopb-0.4.4-linux-x86.tar.gz
-          git config --global user.email 'bot@noreply.github.com'
+          tar xvzf nanopb-0.4.4-linux-x86.tar.gz
-          git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
+          mv nanopb-0.4.4-linux-x86 nanopb-0.4.4
-          git add proto
+          
-          git commit -m "Update protobuf submodule" && git push || echo "No changes to commit"
+      - name: Re-generate protocol buffers
+        run: |
+          ./bin/regen-protos.sh  
+          
+      - name: Create pull request
+        uses: peter-evans/create-pull-request@v3
+        with:
+          add-paths: |
+            proto
+            src/mesh

.gitignore

@@ -26,3 +26,6 @@ __pycache__
 *.swp
 *.swo
 *~
+
+venv/
+release/

.gitmodules

@@ -1,6 +1,7 @@
 [submodule "proto"]
 	path = proto
 	url = https://github.com/meshtastic/Meshtastic-protobufs.git
+	branch = 1.2-legacy
 [submodule "sdk-nrfxlib"]
 	path = sdk-nrfxlib
 	url = https://github.com/nrfconnect/sdk-nrfxlib.git

Dockerfile

@@ -0,0 +1,16 @@
+FROM ubuntu
+MAINTAINER Kevin Hester <kevinh@geeksville.com>
+
+RUN apt-get update
+RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y install wget python3 g++ zip python3-venv git vim
+RUN wget https://raw.githubusercontent.com/platformio/platformio-core-installer/master/get-platformio.py -O get-platformio.py; chmod +x get-platformio.py
+RUN python3 get-platformio.py
+RUN git clone https://github.com/meshtastic/Meshtastic-device.git
+RUN cd Meshtastic-device; git submodule update --init --recursive
+# only build the simulator
+RUN sed -i 's/^BOARDS_ESP32.*/BOARDS_ESP32=""/' Meshtastic-device/bin/build-all.sh
+RUN sed -i 's/^BOARDS_NRF52.*/BOARDS_NRF52=""/' Meshtastic-device/bin/build-all.sh
+RUN sed -i 's/echo "Building SPIFFS.*/exit/' Meshtastic-device/bin/build-all.sh
+RUN . ~/.platformio/penv/bin/activate; cd Meshtastic-device; ./bin/build-all.sh
+
+CMD ["/Meshtastic-device/release/latest/bins/universal/meshtasticd_linux_amd64"]

README.md

@@ -1,5 +1,8 @@
 # Meshtastic-device
 [![Open in Visual Studio Code](https://open.vscode.dev/badges/open-in-vscode.svg)](https://open.vscode.dev/meshtastic/Meshtastic-device)
+[![Continuous Integration](https://github.com/meshtastic/Meshtastic-device/actions/workflows/main.yml/badge.svg)](https://github.com/meshtastic/Meshtastic-device/actions/workflows/main.yml)
+![GitHub all releases](https://img.shields.io/github/downloads/meshtastic/meshtastic-device/total)
+
 ## This repository contains the device firmware used in the [Meshtastic](https://meshtastic.org) project.
 
 Update Instructions

bin/build-all.sh

@@ -5,7 +5,7 @@ set -e
 VERSION=`bin/buildinfo.py long`
 SHORT_VERSION=`bin/buildinfo.py short`
 
-BOARDS_ESP32="tlora-v2 tlora-v1 tlora_v1_3 tlora-v2-1-1.6 tbeam heltec-v1 heltec-v2.0 heltec-v2.1 tbeam0.7 meshtastic-diy-v1"
+BOARDS_ESP32="rak11200 tlora-v2 tlora-v1 tlora_v1_3 tlora-v2-1-1.6 tbeam heltec-v1 heltec-v2.0 heltec-v2.1 tbeam0.7 meshtastic-diy-v1 nano-g1"
 #BOARDS_ESP32=tbeam
 
 # FIXME note nrf52840dk build is for some reason only generating a BIN file but not a HEX file nrf52840dk-geeksville is fine
@@ -28,7 +28,7 @@ function do_build() {
 	BOARD=$1
 	isNrf=$3
 	
-    echo "Building for $BOARD with $PLATFORMIO_BUILD_FLAGS"
+    echo "Building for $BOARD ($isNrf) with $PLATFORMIO_BUILD_FLAGS"
     rm -f .pio/build/$BOARD/firmware.*
 
     # The shell vars the build tool expects to find
@@ -59,6 +59,7 @@ function do_boards() {
 	declare isNrf=$2
 	for board in $boards; do
 		# Build universal
+        echo "about to build $board $isNrf"
 		do_build $board "" "$isNrf" 
 	done
 }

bin/build-esp32.sh

@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+
+set -e
+
+VERSION=`bin/buildinfo.py long`
+SHORT_VERSION=`bin/buildinfo.py short`
+
+OUTDIR=release/
+
+rm -f $OUTDIR/firmware*
+rm -r $OUTDIR/* || true
+
+# Make sure our submodules are current
+git submodule update 
+
+# Important to pull latest version of libs into all device flavors, otherwise some devices might be stale
+platformio lib update 
+
+echo "Building for $1 with $PLATFORMIO_BUILD_FLAGS"
+rm -f .pio/build/$1/firmware.*
+
+# The shell vars the build tool expects to find
+export APP_VERSION=$VERSION
+
+# Are we building a universal/regionless rom?
+export HW_VERSION="1.0"
+basename=firmware-$1-$VERSION
+
+pio run --environment $1 # -v
+SRCELF=.pio/build/$1/firmware.elf
+cp $SRCELF $OUTDIR/$basename.elf
+
+echo "Copying ESP32 bin file"
+SRCBIN=.pio/build/$1/firmware.bin
+cp $SRCBIN $OUTDIR/$basename.bin
+
+echo "Building SPIFFS for ESP32 targets"
+pio run --environment tbeam -t buildfs
+cp .pio/build/tbeam/spiffs.bin $OUTDIR/spiffs-$VERSION.bin
+cp images/system-info.bin $OUTDIR/system-info.bin
+
+cp bin/device-install.* $OUTDIR
+cp bin/device-update.* $OUTDIR

bin/build-native.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+set -e
+
+VERSION=`bin/buildinfo.py long`
+SHORT_VERSION=`bin/buildinfo.py short`
+
+OUTDIR=release/
+
+rm -f $OUTDIR/firmware*
+
+mkdir -p $OUTDIR/
+rm -r $OUTDIR/* || true
+
+# Make sure our submodules are current
+git submodule update 
+
+# Important to pull latest version of libs into all device flavors, otherwise some devices might be stale
+platformio lib update 
+
+pio run --environment native
+cp .pio/build/native/program $OUTDIR/meshtasticd_linux_amd64
+
+cp bin/device-install.* $OUTDIR
+cp bin/device-update.* $OUTDIR
+

bin/build-nrf52.sh

@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+set -e
+
+VERSION=`bin/buildinfo.py long`
+SHORT_VERSION=`bin/buildinfo.py short`
+
+OUTDIR=release/
+
+rm -f $OUTDIR/firmware*
+rm -r $OUTDIR/* || true
+
+# Make sure our submodules are current
+git submodule update 
+
+# Important to pull latest version of libs into all device flavors, otherwise some devices might be stale
+platformio lib update 
+
+echo "Building for $1 with $PLATFORMIO_BUILD_FLAGS"
+rm -f .pio/build/$1/firmware.*
+
+# The shell vars the build tool expects to find
+export APP_VERSION=$VERSION
+
+export HW_VERSION="1.0"
+basename=firmware-$1-$VERSION
+
+pio run --environment $1 # -v
+SRCELF=.pio/build/$1/firmware.elf
+cp $SRCELF $OUTDIR/$basename.elf
+
+echo "Generating NRF52 uf2 file"
+SRCHEX=.pio/build/$1/firmware.hex
+bin/uf2conv.py $SRCHEX -c -o $OUTDIR/$basename.uf2 -f 0xADA52840
+
+cp bin/device-install.* $OUTDIR
+cp bin/device-update.* $OUTDIR

bin/check-all.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+# Note: This is a prototype for how we could add static code analysis to the CI.
+
+set -e
+
+VERSION=`bin/buildinfo.py long`
+
+# The shell vars the build tool expects to find
+export APP_VERSION=$VERSION
+
+if [[ $# -gt 0 ]]; then
+    # can override which environment by passing arg
+    BOARDS="$@"
+else
+    BOARDS="tlora-v2 tlora-v1 tlora_v1_3 tlora-v2-1-1.6 tbeam heltec-v1 heltec-v2.0 heltec-v2.1 tbeam0.7 meshtastic-diy-v1 rak4631_5005 rak4631_19003 rak11200 t-echo"
+fi
+
+echo "BOARDS:${BOARDS}"
+
+CHECK=""
+for BOARD in $BOARDS; do
+     CHECK="${CHECK} -e ${BOARD}"
+done
+
+pio check --flags "-DAPP_VERSION=${APP_VERSION} --suppressions-list=suppressions.txt" $CHECK --skip-packages --pattern="src/" --fail-on-defect=low --fail-on-defect=medium --fail-on-defect=high

bin/device-install.sh

@@ -11,7 +11,7 @@ Usage: $(basename $0) [-h] [-p ESPTOOL_PORT] [-P PYTHON] [-f FILENAME|FILENAME]
 Flash image file to device, but first erasing and writing system information"
 
     -h               Display this help and exit
-    -p ESPTOOL_PORT  Set the environment variable for ESPTOOL_PORT.  If not set, ESPTOOL iterates all ports (Dangerrous).
+    -p ESPTOOL_PORT  Set the environment variable for ESPTOOL_PORT.  If not set, ESPTOOL iterates all ports (Dangerous).
     -P PYTHON        Specify alternate python interpreter to use to invoke esptool. (Default: "$PYTHON")
     -f FILENAME      The .bin file to flash.  Custom to your device type and region.
 EOF
@@ -46,10 +46,10 @@ shift "$((OPTIND-1))"
 
 if [ -f "${FILENAME}" ]; then
 	echo "Trying to flash ${FILENAME}, but first erasing and writing system information"
-	$PYTHON -m esptool  erase_flash
+	"$PYTHON" -m esptool  erase_flash
-	$PYTHON -m esptool  write_flash 0x1000 system-info.bin
+	"$PYTHON" -m esptool  write_flash 0x1000 system-info.bin
-	$PYTHON -m esptool  write_flash 0x00390000 spiffs-*.bin
+	"$PYTHON" -m esptool  write_flash 0x00390000 spiffs-*.bin
-	$PYTHON -m esptool  write_flash 0x10000 ${FILENAME}
+	"$PYTHON" -m esptool  write_flash 0x10000 ${FILENAME}
 else
 	echo "Invalid file: ${FILENAME}"
 	show_help

boards/wiscore_rak11200.json

@@ -0,0 +1,39 @@
+{
+  "build": {
+    "arduino":{
+      "ldscript": "esp32_out.ld"
+    },
+    "core": "esp32",
+    "extra_flags": "-DARDUINO_ESP32_DEV",
+    "f_cpu": "240000000L",
+    "f_flash": "40000000L",
+    "flash_mode": "dio",
+    "mcu": "esp32",
+    "variant": "WisCore_RAK11200_Board"
+  },
+  "connectivity": [
+    "wifi",
+    "bluetooth",
+    "ethernet",
+    "can"
+  ],
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "WisCore RAK11200 Board",
+  "upload": {
+    "flash_size": "4MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
+    "protocols": [
+      "esptool",
+      "espota",
+      "ftdi"
+    ],
+    "require_upload_port": true,
+    "speed": 460800
+  },
+  "url": "https://www.rakwireless.com",
+  "vendor": "RAKwireless"
+}

docker.txt

@@ -0,0 +1,17 @@
+To build:
+  docker build -t meshtastic/device .
+
+To run:
+  docker run --rm -p 4403:4403 meshtastic/device
+or, to get a shell on the docker image:
+  docker run -it meshtastic/device bash
+
+To use python cli against it:
+  meshtastic --info --host localhost
+
+To stop:
+  # run this to get id
+  docker ps
+  # tip: you can just use the first few characters of the id in the next command
+  docker kill <id>
+

platformio.ini

@@ -11,19 +11,28 @@
 [platformio]
 default_envs = tbeam
 ;default_envs = tbeam0.7
-;default_envs = heltec-v2.0
 ;default_envs = heltec-v1
+;default_envs = heltec-v2.0
+;default_envs = heltec-v2.1
 ;default_envs = tlora-v1
 ;default_envs = tlora-v1
 ;default_envs = tlora_v1_3
 ;default_envs = tlora-v2
+;default_envs = tlora-v2-1-1.6
 ;default_envs = lora-relay-v1 # nrf board
 ;default_envs = t-echo
 ;default_envs = nrf52840dk-geeksville
 ;default_envs = native # lora-relay-v1 # nrf52840dk-geeksville # linux # or if you'd like to change the default to something like lora-relay-v1 put that here
-;default_envs = rak4631
+;default_envs = rak4631_5005
-;default_envs = rak4630
+;default_envs = rak4631_5005_eink
+;default_envs = rak4631_19003
+;default_envs = nano-g1
 ;default_envs = meshtastic-diy-v1
+;default_envs = meshtastic-diy-v1.1
+
+; board specific config can be moved to the respective 'variants' file.
+; See https://docs.platformio.org/en/latest/projectconf/section_platformio.html#extra-configs
+extra_configs = variants/*/platformio.ini
 
 [common]
 ; common is not currently used
@@ -70,8 +79,8 @@ debug_tool = jlink
 ;  monitor adapter_khz 10000
 
 lib_deps =
-  https://github.com/meshtastic/esp8266-oled-ssd1306.git#35d796226b853b0c0ff818b2f1aa3d35e7296a96 ; ESP8266_SSD1306 
+  https://github.com/meshtastic/esp8266-oled-ssd1306.git#d90231dedbb2f52bd7a32fb8ed8edec52cf4a8cb ; ESP8266_SSD1306 
-  https://github.com/meshtastic/OneButton.git#3bcba9492d01e2a8a86f46700ab16f96dd2cf1f5 ; OneButton library for non-blocking button debounce
+  mathertel/OneButton@^2.0.3 ; OneButton library for non-blocking button debounce
   1202 ; CRC32, explicitly needed because dependency is missing in the ble ota update lib
   https://github.com/meshtastic/arduino-fsm.git
   https://github.com/meshtastic/SparkFun_Ublox_Arduino_Library.git#31015a55e630a2df77d9d714669c621a5bf355ad
@@ -82,8 +91,12 @@ lib_deps =
   SPI
   https://github.com/geeksville/ArduinoThread.git#72921ac222eed6f526ba1682023cee290d9aa1b3
   PubSubClient
-  
+
-; Common settings for conventional (non Portduino) Ardino targets
+; Used for the code analysis in PIO Home / Inspect
+check_tool = cppcheck
+check_skip_packages = yes
+
+; Common settings for conventional (non Portduino) Arduino targets
 [arduino_base]
 
 framework = arduino
@@ -96,10 +109,21 @@ build_flags = ${env.build_flags} -Os
 
 src_filter = ${env.src_filter} -<portduino/>
 
+; Common libs for environmental measurements (not included in native / portduino)
+[environmental]
+lib_deps =
+  adafruit/DHT sensor library@^1.4.1
+  adafruit/Adafruit Unified Sensor@^1.1.4
+  paulstoffregen/OneWire@^2.3.5
+  robtillaart/DS18B20@^0.1.11
+  adafruit/Adafruit BME280 Library@^2.2.2
+  adafruit/Adafruit BME680 Library@^2.0.1
+  adafruit/Adafruit MCP9808 Library@^2.0.0
+  
 ; Common settings for ESP targes, mixin with extends = esp32_base
 [esp32_base]
 extends = arduino_base
-platform = espressif32
+platform = espressif32@3.5.0
 src_filter = 
   ${arduino_base.src_filter} -<nrf52/>
 upload_speed = 921600
@@ -114,12 +138,9 @@ build_flags =
   -DAXP_DEBUG_PORT=Serial
 lib_deps =
   ${arduino_base.lib_deps}
+  ${environmental.lib_deps}
   https://github.com/meshtastic/esp32_https_server.git
-  adafruit/DHT sensor library@^1.4.1
+  h2zero/NimBLE-Arduino@1.3.6
-  adafruit/Adafruit Unified Sensor@^1.1.4
-  paulstoffregen/OneWire@^2.3.5
-  robtillaart/DS18B20@^0.1.11
-  h2zero/NimBLE-Arduino@1.3.4
   tobozo/ESP32-targz@^1.1.4
   arduino-libraries/NTPClient#531eff39d9fbc831f3d03f706a161739203fbe2a
 
@@ -150,78 +171,6 @@ board_build.partitions = partition-table.csv
 
 ; -DLOG_LOCAL_LEVEL=ESP_LOG_DEBUG -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
 
-; The 1.0 release of the TBEAM board 
-[env:tbeam]
-extends = esp32_base
-board = ttgo-t-beam
-lib_deps =
-  ${esp32_base.lib_deps}
-build_flags = 
-  ${esp32_base.build_flags} -D TBEAM_V10
-
-; The original TBEAM board without the AXP power chip and a few other changes
-; Note: I've heard reports this didn't work.  Disabled until someone with a 0.7 can test and debug.
-[env:tbeam0.7]
-extends = esp32_base
-board = ttgo-t-beam
-build_flags = 
-  ${esp32_base.build_flags} -D TBEAM_V07
-
-[env:heltec-v1]
-;build_type = debug ; to make it possible to step through our jtag debugger 
-extends = esp32_base
-board = heltec_wifi_lora_32
-build_flags = 
-  ${esp32_base.build_flags} -D HELTEC_V1
-
-[env:heltec-v2.0]
-;build_type = debug ; to make it possible to step through our jtag debugger 
-extends = esp32_base
-board = heltec_wifi_lora_32_V2
-build_flags = 
-  ${esp32_base.build_flags} -D HELTEC_V2_0
-
-[env:heltec-v2.1]
-;build_type = debug ; to make it possible to step through our jtag debugger 
-extends = esp32_base
-board = heltec_wifi_lora_32_V2
-build_flags = 
-  ${esp32_base.build_flags} -D HELTEC_V2_1
-
-[env:tlora-v1]
-extends = esp32_base
-board = ttgo-lora32-v1
-build_flags = 
-  ${esp32_base.build_flags} -D TLORA_V1
-
-; note: the platformio definition for lora32-v2 seems stale, it is missing a pins_arduino.h file, therefore I don't think it works
-[env:tlora_v1_3]
-extends = esp32_base
-board = ttgo-lora32-v1
-build_flags = 
-  ${esp32_base.build_flags} -D TLORA_V1_3
-
-[env:tlora-v2]
-extends = esp32_base
-board = ttgo-lora32-v1
-build_flags = 
-  ${esp32_base.build_flags} -D TLORA_V2
-
-[env:tlora-v2-1-1.6]
-extends = esp32_base
-board = ttgo-lora32-v1
-build_flags = 
-  ${esp32_base.build_flags} -D TLORA_V2_1_16
-
-; Meshtastic DIY v1 by Nano VHF Schematic based on ESP32-WROOM-32 (38 pins) devkit & EBYTE E22 SX1262/SX1268 module
-[env:meshtastic-diy-v1]
-extends = esp32_base
-board = esp32doit-devkit-v1
-build_flags =
-  ${esp32_base.build_flags}
-  -D DIY_V1
-  -D EBYTE_E22
-
 ; The Heltec Cubecell plus 
 ; IMPORTANT NOTE: This target doesn't yet work and probably won't ever work.  I'm keeping it around for now.
 ; For more details see my post in the forum.
@@ -291,42 +240,17 @@ extends = nrf52_base
 build_flags = ${nrf52_base.build_flags} 
 lib_deps =
   ${arduino_base.lib_deps}
+  ${environmental.lib_deps}
   Adafruit nRFCrypto 
   # Adafruit TinyUSB Arduino
   # add Adafruit nRFCrypto platform IO automated scan is broken
 
-[env:lora_isp4520]
-extends = nrf52_base
-board = lora_isp4520
-
-# add our variants files to the include and src paths
-build_flags = ${nrf52_base.build_flags} -Ivariants/lora_isp4520
-
-# No screen and GPS on the board. We still need RTC.cpp for the RTC clock.
-src_filter = ${nrf52_base.src_filter} +<../variants/lora_isp4520> -<graphics> -<gps> +<gps/GPS.cpp> +<gps/RTC.cpp>
-lib_ignore = ${nrf52_base.lib_ignore} 
-  ESP8266_SSD1306
-  SparkFun Ublox Arduino Library
-  AXP202X_Library
-  TinyGPSPlus
-
-upload_protocol = jlink
-monitor_port = /dev/ttyUSB0
-
 ; The NRF52840-dk development board
 ; Note: By default no lora device is created for this build - it uses a simulated interface
 [env:nrf52840dk]
 extends = nrf52840_base
 board = nrf52840_dk
 
-; The NRF52840-dk development board, but @geeksville's board - which has a busted oscilliator 
-[env:nrf52840dk-geeksville]
-extends = nrf52840_base
-board = nrf52840_dk_modified
-# add our variants files to the include and src paths
-build_flags = ${nrf52_base.build_flags} -Ivariants/pca10056-rc-clock
-src_filter = ${nrf52_base.src_filter} +<../variants/pca10056-rc-clock>
-
 ; Note: By default no lora device is created for this build - it uses a simulated interface
 [env:feather_nrf52832]
 extends = nrf52_base
@@ -340,164 +264,3 @@ upload_protocol = jlink
 monitor_port = /dev/ttyUSB0
 ; this board's serial chip can only run at 115200, not faster
 monitor_speed = 115200 
-
-# For experimenting with RAM sizes
-# board_build.ldscript = linker/nrf52840_s140_sim832.ld
-
-; The very slick RAK wireless RAK 4631 / 4630 board
-[env:rak4631_5005]
-extends = nrf52840_base
-board = wiscore_rak4631
-# add our variants files to the include and src paths
-# define build flags for the TFT_eSPI library
-build_flags = ${nrf52840_base.build_flags} -Ivariants/WisCore_RAK4631_Board -D RAK_BASE_5005
-src_filter = ${nrf52_base.src_filter} +<../variants/WisCore_RAK4631_Board>
-debug_tool = jlink
-
-[env:rak4631_19003]
-extends = nrf52840_base
-board = wiscore_rak4631
-# add our variants files to the include and src paths
-# define build flags for the TFT_eSPI library
-build_flags = ${nrf52840_base.build_flags} -Ivariants/WisCore_RAK4631_Board -D RAK_BASE_19003
-src_filter = ${nrf52_base.src_filter} +<../variants/WisCore_RAK4631_Board>
-debug_tool = jlink
-; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
-;upload_protocol = jlink
-
-; Note, this board is not yet supported!  It will not work without futher development.
-; THIS IS UNTESTED (I don't have this board), but other developers can use it as a starting point
-[env:rak4600]
-extends = nrf52_base
-board = wiscore_rak4600
-# add our variants files to the include and src paths
-# define build flags for the TFT_eSPI library
-build_flags = ${nrf52_base.build_flags} -Ivariants/WisCore_RAK4600_Board
-src_filter = ${nrf52_base.src_filter} +<../variants/WisCore_RAK4600_Board>
-lib_deps = 
-  ${arduino_base.lib_deps}
-
-; The PPR board
-[env:ppr]
-extends = nrf52_base
-board = ppr
-lib_deps = 
-  ${arduino_base.lib_deps}
-  UC1701
-
-; The PPR board
-[env:ppr1]
-extends = nrf52_base
-board = ppr1
-build_flags = ${nrf52_base.build_flags} -Ivariants/ppr1
-src_filter = ${nrf52_base.src_filter} +<../variants/ppr1>
-lib_deps = 
-  ${arduino_base.lib_deps}
-
-; First prototype eink/nrf52840/sx1262 device
-[env:t-echo]
-extends = nrf52840_base
-board = t-echo
-debug_tool = jlink
-upload_protocol = jlink
-# add our variants files to the include and src paths
-# define build flags for the TFT_eSPI library - NOTE: WE NOT LONGER USE TFT_eSPI, it was for an earlier version of the TTGO eink screens
-# -DBUSY_PIN=3 -DRST_PIN=2 -DDC_PIN=28 -DCS_PIN=30
-# add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
-build_flags = ${nrf52840_base.build_flags} -Ivariants/t-echo 
-src_filter = ${nrf52_base.src_filter} +<../variants/t-echo>
-lib_deps = 
-  ${nrf52840_base.lib_deps}
-  https://github.com/geeksville/GxEPD2.git
-  adafruit/Adafruit BusIO
-;upload_protocol = fs
-
-; First prototype eink/nrf52840/sx1262 device (removed from build because didn't ship in quantity)
-;[env:eink0.1]
-;extends = nrf52840_base
-;board = eink0.1
-;# add our variants files to the include and src paths
-;# define build flags for the TFT_eSPI library
-;build_flags = ${nrf52_base.build_flags} -Ivariants/eink0.1
-;  -DBUSY_PIN=3 -DRST_PIN=2 -DDC_PIN=28 -DCS_PIN=30
-;src_filter = ${nrf52_base.src_filter} +<../variants/eink0.1>
-;lib_deps = 
-;  ${nrf52840_base.lib_deps}
-;  https://github.com/geeksville/EPD_Libraries.git
-;  TFT_eSPI
-
-; The https://github.com/BigCorvus/SX1262-LoRa-BLE-Relay board by @BigCorvus
-[env:lora-relay-v1]
-extends = nrf52840_base
-board = lora-relay-v1
-# add our variants files to the include and src paths
-# define build flags for the TFT_eSPI library
-build_flags = ${nrf52840_base.build_flags} -Ivariants/lora_relay_v1
-  -DUSER_SETUP_LOADED
-  -DTFT_WIDTH=80
-  -DTFT_HEIGHT=160
-  -DST7735_GREENTAB160x80
-  -DST7735_DRIVER
-  -DTFT_CS=ST7735_CS
-  -DTFT_DC=ST7735_RS
-  -DTFT_RST=ST7735_RESET
-  -DSPI_FREQUENCY=27000000
-src_filter = ${nrf52_base.src_filter} +<../variants/lora_relay_v1>
-lib_deps = 
-  ${nrf52840_base.lib_deps}
-  SparkFun BQ27441 LiPo Fuel Gauge Arduino Library
-  TFT_eSPI
-
-; The https://github.com/BigCorvus/LoRa-BLE-Relay-v2 board by @BigCorvus
-[env:lora-relay-v2]
-extends = nrf52840_base
-board = lora-relay-v2
-# add our variants files to the include and src paths
-# define build flags for the TFT_eSPI library
-build_flags = ${nrf52840_base.build_flags} -Ivariants/lora_relay_v2
-  -DUSER_SETUP_LOADED
-  -DTFT_WIDTH=80
-  -DTFT_HEIGHT=160
-  -DST7735_GREENTAB160x80
-  -DST7735_DRIVER
-  -DTFT_CS=ST7735_CS
-  -DTFT_DC=ST7735_RS
-  -DTFT_RST=ST7735_RESET
-  -DSPI_FREQUENCY=27000000
-  -DTFT_WR=ST7735_SDA
-  -DTFT_SCLK=ST7735_SCK
-src_filter = ${nrf52_base.src_filter} +<../variants/lora_relay_v2>
-lib_deps = 
-  ${nrf52840_base.lib_deps}
-  SparkFun BQ27441 LiPo Fuel Gauge Arduino Library
-  TFT_eSPI
-
-; The Portduino based sim environment on top of any host OS, all hardware will be simulated
-[env:native]
-platform = https://github.com/geeksville/platform-native.git 
-src_filter = ${env.src_filter} -<esp32/> -<nimble/> -<nrf52/> -<mesh/http/> -<plugins/esp32>
-build_flags = ${arduino_base.build_flags} -O0 
-framework = arduino
-board = cross_platform
-lib_deps =
-  ${arduino_base.lib_deps}
-  rweather/Crypto
-
-; The Portduino based sim environment on top of a linux OS and touching linux hardware devices
-[env:linux]
-platform = https://github.com/geeksville/platform-native.git 
-src_filter = ${env.src_filter} -<esp32/> -<nimble/> -<nrf52/> -<mesh/http/> -<plugins/esp32>
-build_flags = ${arduino_base.build_flags} -O0 -lgpiod 
-framework = arduino
-board = linux_hardware
-lib_deps =
-  ${arduino_base.lib_deps}
-  rweather/Crypto
-
-; The GenieBlocks LORA prototype board
-; note: @geeksville disabled because genieblocks_lora is not checked into the boards directory, please send in a PR to add it ;-)
-;[env:genieblocks_lora]
-;extends = esp32_base
-;board = genieblocks_lora
-;build_flags = 
-;  ${esp32_base.build_flags} -D GENIEBLOCKS

src/DebugConfiguration.h

@@ -0,0 +1,61 @@
+// DEBUG LED
+#ifndef LED_INVERTED
+#define LED_INVERTED 0 // define as 1 if LED is active low (on)
+#endif
+
+// -----------------------------------------------------------------------------
+// DEBUG
+// -----------------------------------------------------------------------------
+
+#ifdef CONSOLE_MAX_BAUD
+#define SERIAL_BAUD CONSOLE_MAX_BAUD
+#else
+#define SERIAL_BAUD 921600 // Serial debug baud rate
+#endif
+
+#include "SerialConsole.h"
+
+#define DEBUG_PORT (*console) // Serial debug port
+
+// What platforms should use SEGGER?
+#ifdef NRF52_SERIES
+
+// Always include the SEGGER code on NRF52 - because useful for debugging
+#include "SEGGER_RTT.h"
+
+// The channel we send stdout data to
+#define SEGGER_STDOUT_CH 0
+
+// Debug printing to segger console
+#define SEGGER_MSG(...) SEGGER_RTT_printf(SEGGER_STDOUT_CH, __VA_ARGS__)
+
+// If we are not on a NRF52840 (which has built in USB-ACM serial support) and we don't have serial pins hooked up, then we MUST
+// use SEGGER for debug output
+#if !defined(PIN_SERIAL_RX) && !defined(NRF52840_XXAA)
+// No serial ports on this board - ONLY use segger in memory console
+#define USE_SEGGER
+#endif
+
+#else
+#define SERIAL0_RX_GPIO 3 // Always GPIO3 on ESP32
+#endif
+
+#ifdef USE_SEGGER
+#define DEBUG_MSG(...) SEGGER_RTT_printf(0, __VA_ARGS__)
+#else
+#ifdef DEBUG_PORT
+#define DEBUG_MSG(...) DEBUG_PORT.logDebug(__VA_ARGS__)
+#else
+#define DEBUG_MSG(...)
+#endif
+#endif
+
+// -----------------------------------------------------------------------------
+// AXP192 (Rev1-specific options)
+// -----------------------------------------------------------------------------
+
+#define GPS_POWER_CTRL_CH 3
+#define LORA_POWER_CTRL_CH 2
+
+// Default Bluetooth PIN
+#define defaultBLEPin 123456

src/GPSStatus.h

@@ -42,7 +42,7 @@ class GPSStatus : public Status
     }
 
     // preferred method
-    GPSStatus(bool hasLock, bool isConnected, Position pos)
+    GPSStatus(bool hasLock, bool isConnected, const Position& pos)
         : Status()
     {
         this->hasLock = hasLock;
@@ -63,7 +63,9 @@ class GPSStatus : public Status
 
     int32_t getLatitude() const {
         if (radioConfig.preferences.fixed_position){
+#if GPS_EXTRAVERBOSE
             DEBUG_MSG("WARNING: Using fixed latitude\n");
+#endif
             NodeInfo *node = nodeDB.getNode(nodeDB.getNodeNum());
             return node->position.latitude_i;
         } else {
@@ -73,7 +75,9 @@ class GPSStatus : public Status
 
     int32_t getLongitude() const {
         if (radioConfig.preferences.fixed_position){
+#if GPS_EXTRAVERBOSE
             DEBUG_MSG("WARNING: Using fixed longitude\n");
+#endif
             NodeInfo *node = nodeDB.getNode(nodeDB.getNodeNum());
             return node->position.longitude_i;
         } else {
@@ -83,7 +87,9 @@ class GPSStatus : public Status
 
     int32_t getAltitude() const {
         if (radioConfig.preferences.fixed_position){
+#if GPS_EXTRAVERBOSE
             DEBUG_MSG("WARNING: Using fixed altitude\n");
+#endif
             NodeInfo *node = nodeDB.getNode(nodeDB.getNodeNum());
             return node->position.altitude;
         } else {
@@ -149,4 +155,4 @@ class GPSStatus : public Status
 
 } // namespace meshtastic
 
-extern meshtastic::GPSStatus *gpsStatus;
+extern meshtastic::GPSStatus *gpsStatus;

src/Observer.h

@@ -47,7 +47,7 @@ template <class Callback, class T> class CallbackObserver : public Observer<T>
     CallbackObserver(Callback *_objPtr, ObserverCallback _method) : objPtr(_objPtr), method(_method) {}
 
   protected:
-    virtual int onNotify(T arg) { return (objPtr->*method)(arg); }
+    virtual int onNotify(T arg) override { return (objPtr->*method)(arg); }
 };
 
 /**
@@ -104,4 +104,4 @@ template <class T> void Observer<T>::observe(Observable<T> *o)
 
     observed = o;
     o->addObserver(this);
-}
+}

src/Power.cpp

@@ -75,7 +75,7 @@ class AnalogBatteryLevel : public HasBatteryLevel
      *
      * FIXME - use a lipo lookup table, the current % full is super wrong
      */
-    virtual int getBattPercentage()
+    virtual int getBattPercentage() override
     {
         float v = getBattVoltage();
 
@@ -94,12 +94,16 @@ class AnalogBatteryLevel : public HasBatteryLevel
     /**
      * The raw voltage of the batteryin millivolts or NAN if unknown
      */
-    virtual float getBattVoltage()
+    virtual float getBattVoltage() override
     {
 
 #ifndef ADC_MULTIPLIER
 #define ADC_MULTIPLIER 2.0
 #endif 
+    // Override variant or default ADC_MULTIPLIER if we have the override pref
+    float operativeAdcMultiplier = radioConfig.preferences.adc_multiplier_override > 0 ?
+        radioConfig.preferences.adc_multiplier_override :
+        ADC_MULTIPLIER;
 
 #ifdef BATTERY_PIN
         // Do not call analogRead() often. 
@@ -109,7 +113,7 @@ class AnalogBatteryLevel : public HasBatteryLevel
             uint32_t raw = analogRead(BATTERY_PIN);
             float scaled;
             #ifndef VBAT_RAW_TO_SCALED
-            scaled = 1000.0 * ADC_MULTIPLIER * (AREF_VOLTAGE / 1024.0) * raw;
+            scaled = 1000.0 * operativeAdcMultiplier * (AREF_VOLTAGE / 1024.0) * raw;
             #else
             scaled = VBAT_RAW_TO_SCALED(raw); //defined in variant.h
             #endif
@@ -127,15 +131,15 @@ class AnalogBatteryLevel : public HasBatteryLevel
     /**
      * return true if there is a battery installed in this unit
      */
-    virtual bool isBatteryConnect() { return getBattPercentage() != -1; }
+    virtual bool isBatteryConnect() override { return getBattPercentage() != -1; }
 
     /// If we see a battery voltage higher than physics allows - assume charger is pumping
     /// in power
-    virtual bool isVBUSPlug() { return getBattVoltage() > chargingVolt; }
+    virtual bool isVBUSPlug() override { return getBattVoltage() > chargingVolt; }
 
     /// Assume charging if we have a battery and external power is connected.
     /// we can't be smart enough to say 'full'?
-    virtual bool isChargeing() { return isBatteryConnect() && isVBUSPlug(); }
+    virtual bool isChargeing() override { return isBatteryConnect() && isVBUSPlug(); }
 
   private:
     /// If we see a battery voltage higher than physics allows - assume charger is pumping
@@ -149,7 +153,10 @@ class AnalogBatteryLevel : public HasBatteryLevel
 
 AnalogBatteryLevel analogLevel;
 
-Power::Power() : OSThread("Power") {}
+Power::Power() : OSThread("Power") {
+    statusHandler = {};
+    low_voltage_counter = 0;
+}
 
 bool Power::analogInit()
 {
@@ -232,18 +239,18 @@ void Power::readPowerStatus()
         }
 
         // Notify any status instances that are observing us
-        const PowerStatus powerStatus =
+        const PowerStatus powerStatus2 =
             PowerStatus(hasBattery ? OptTrue : OptFalse, batteryLevel->isVBUSPlug() ? OptTrue : OptFalse,
                         batteryLevel->isChargeing() ? OptTrue : OptFalse, batteryVoltageMv, batteryChargePercent);
-        DEBUG_MSG("Battery: usbPower=%d, isCharging=%d, batMv=%d, batPct=%d\n", powerStatus.getHasUSB(),
+        DEBUG_MSG("Battery: usbPower=%d, isCharging=%d, batMv=%d, batPct=%d\n", powerStatus2.getHasUSB(),
-                  powerStatus.getIsCharging(), powerStatus.getBatteryVoltageMv(), powerStatus.getBatteryChargePercent());
+                  powerStatus2.getIsCharging(), powerStatus2.getBatteryVoltageMv(), powerStatus2.getBatteryChargePercent());
-        newStatus.notifyObservers(&powerStatus);
+        newStatus.notifyObservers(&powerStatus2);
 
 
         // If we have a battery at all and it is less than 10% full, force deep sleep if we have more than 3 low readings in a row
         // Supect fluctuating voltage on the RAK4631 to force it to deep sleep even if battery is at 85% after only a few days
         #ifdef NRF52_SERIES
-        if (powerStatus.getHasBattery() && !powerStatus.getHasUSB()){
+        if (powerStatus2.getHasBattery() && !powerStatus2.getHasUSB()){
             if (batteryLevel->getBattVoltage() < MIN_BAT_MILLIVOLTS){
                 low_voltage_counter++;
                 if (low_voltage_counter>3)
@@ -254,13 +261,13 @@ void Power::readPowerStatus()
         }
         #else
         // If we have a battery at all and it is less than 10% full, force deep sleep
-        if (powerStatus.getHasBattery() && !powerStatus.getHasUSB() && batteryLevel->getBattVoltage() < MIN_BAT_MILLIVOLTS)
+        if (powerStatus2.getHasBattery() && !powerStatus2.getHasUSB() && batteryLevel->getBattVoltage() < MIN_BAT_MILLIVOLTS)
             powerFSM.trigger(EVENT_LOW_BATTERY);
         #endif
     } else {
         // No power sensing on this board - tell everyone else we have no idea what is happening
-        const PowerStatus powerStatus = PowerStatus(OptUnknown, OptUnknown, OptUnknown, -1, -1);
+        const PowerStatus powerStatus3 = PowerStatus(OptUnknown, OptUnknown, OptUnknown, -1, -1);
-        newStatus.notifyObservers(&powerStatus);
+        newStatus.notifyObservers(&powerStatus3);
     }
 }
 

src/PowerFSM.cpp

@@ -63,7 +63,6 @@ static void lsIdle()
     // DEBUG_MSG("lsIdle begin ls_secs=%u\n", getPref_ls_secs());
 
 #ifndef NO_ESP32
-    esp_sleep_source_t wakeCause = ESP_SLEEP_WAKEUP_UNDEFINED;
 
     // Do we have more sleeping to do?
     if (secsSlept < getPref_ls_secs()) {
@@ -73,14 +72,14 @@ static void lsIdle()
         // If some other service would stall sleep, don't let sleep happen yet
         if (doPreflightSleep()) {
             setLed(false); // Never leave led on while in light sleep
-            wakeCause = doLightSleep(sleepTime * 1000LL);
+            esp_sleep_source_t wakeCause2 = doLightSleep(sleepTime * 1000LL);
 
-            switch (wakeCause) {
+            switch (wakeCause2) {
             case ESP_SLEEP_WAKEUP_TIMER:
                 // Normal case: timer expired, we should just go back to sleep ASAP
 
                 setLed(true);                // briefly turn on led
-                wakeCause = doLightSleep(1); // leave led on for 1ms
+                wakeCause2 = doLightSleep(1); // leave led on for 1ms
 
                 secsSlept += sleepTime;
                 // DEBUG_MSG("sleeping, flash led!\n");
@@ -94,7 +93,7 @@ static void lsIdle()
             default:
                 // We woke for some other reason (button press, device interrupt)
                 // uint64_t status = esp_sleep_get_ext1_wakeup_status();
-                DEBUG_MSG("wakeCause %d\n", wakeCause);
+                DEBUG_MSG("wakeCause2 %d\n", wakeCause2);
 
 #ifdef BUTTON_PIN
                 bool pressed = !digitalRead(BUTTON_PIN);
@@ -280,6 +279,12 @@ void PowerFSM_setup()
     powerFSM.add_transition(&stateON, &stateSHUTDOWN, EVENT_SHUTDOWN, NULL, "Shutdown");
     powerFSM.add_transition(&stateSERIAL, &stateSHUTDOWN, EVENT_SHUTDOWN, NULL, "Shutdown");
 
+    // Inputbroker
+    powerFSM.add_transition(&stateLS, &stateON, EVENT_INPUT, NULL, "Input Device");
+    powerFSM.add_transition(&stateNB, &stateON, EVENT_INPUT, NULL, "Input Device");
+    powerFSM.add_transition(&stateDARK, &stateON, EVENT_INPUT, NULL, "Input Device");
+    powerFSM.add_transition(&stateON, &stateON, EVENT_INPUT, NULL, "Input Device"); // restarts the sleep timer
+
     powerFSM.add_transition(&stateDARK, &stateON, EVENT_BLUETOOTH_PAIR, NULL, "Bluetooth pairing");
     powerFSM.add_transition(&stateON, &stateON, EVENT_BLUETOOTH_PAIR, NULL, "Bluetooth pairing");
 

src/PowerFSM.h

@@ -20,6 +20,7 @@
 #define EVENT_POWER_DISCONNECTED 14
 #define EVENT_FIRMWARE_UPDATE 15 // We just received a new firmware update packet from the phone
 #define EVENT_SHUTDOWN 16 //force a full shutdown now (not just sleep)
+#define EVENT_INPUT 17 // input broker wants something, we need to wake up and enable screen
 
 extern Fsm powerFSM;
 extern State statePOWER, stateSERIAL;

src/RF95Configuration.h

@@ -0,0 +1,7 @@
+// TODO refactor this out with better radio configuration system
+#ifdef USE_RF95
+#define RF95_RESET LORA_RESET
+#define RF95_IRQ LORA_DIO0  // on SX1262 version this is a no connect DIO0
+#define RF95_DIO1 LORA_DIO1 // Note: not really used for RF95
+#define RF95_DIO2 LORA_DIO2 // Note: not really used for RF95
+#endif

src/RedirectablePrint.h

@@ -22,7 +22,7 @@ class RedirectablePrint : public Print
     volatile bool inDebugPrint = false;
 
   public:
-    RedirectablePrint(Print *_dest) : dest(_dest) {}
+    explicit RedirectablePrint(Print *_dest) : dest(_dest) {}
 
     /**
      * Set a new destination
@@ -56,4 +56,4 @@ class NoopPrint : public Print
 /**
  * A printer that doesn't go anywhere
  */
-extern NoopPrint noopPrint;
+extern NoopPrint noopPrint;

src/SerialConsole.h

@@ -15,9 +15,9 @@ class SerialConsole : public StreamAPI, public RedirectablePrint
      * we override this to notice when we've received a protobuf over the serial stream.  Then we shunt off
      * debug serial output.
      */
-    virtual bool handleToRadio(const uint8_t *buf, size_t len);
+    virtual bool handleToRadio(const uint8_t *buf, size_t len) override;
 
-    virtual size_t write(uint8_t c)
+    virtual size_t write(uint8_t c) override
     {
         if (c == '\n') // prefix any newlines with carriage return
             RedirectablePrint::write('\r');
@@ -27,7 +27,7 @@ class SerialConsole : public StreamAPI, public RedirectablePrint
   protected:
 
     /// Check the current underlying physical link to see if the client is currently connected
-    virtual bool checkIsConnected();    
+    virtual bool checkIsConnected() override;
 };
 
 // A simple wrapper to allow non class aware code write to the console

src/airtime.cpp

@@ -2,21 +2,20 @@
 #include "NodeDB.h"
 #include "configuration.h"
 
-
+AirTime *airTime = NULL;
-AirTime *airTime;
 
 // Don't read out of this directly. Use the helper functions.
 
-
 void AirTime::logAirtime(reportTypes reportType, uint32_t airtime_ms)
 {
 
-    // TODO: Is the airtimes array still necessary? It's now in myNodeInfo anyway
-
     if (reportType == TX_LOG) {
         DEBUG_MSG("AirTime - Packet transmitted : %ums\n", airtime_ms);
         this->airtimes.periodTX[0] = this->airtimes.periodTX[0] + airtime_ms;
         myNodeInfo.air_period_tx[0] = myNodeInfo.air_period_tx[0] + airtime_ms;
+
+        this->utilizationTX[this->getPeriodUtilHour()] = this->utilizationTX[this->getPeriodUtilHour()] + airtime_ms;
+
     } else if (reportType == RX_LOG) {
         DEBUG_MSG("AirTime - Packet received : %ums\n", airtime_ms);
         this->airtimes.periodRX[0] = this->airtimes.periodRX[0] + airtime_ms;
@@ -26,8 +25,8 @@ void AirTime::logAirtime(reportTypes reportType, uint32_t airtime_ms)
         this->airtimes.periodRX_ALL[0] = this->airtimes.periodRX_ALL[0] + airtime_ms;
     }
 
-    uint8_t channelUtilPeriod = (getSecondsSinceBoot() / 10) % CHANNEL_UTILIZATION_PERIODS;
+    // Log all airtime type for channel utilization
-    this->channelUtilization[channelUtilPeriod] = channelUtilization[channelUtilPeriod] + airtime_ms;
+    this->channelUtilization[this->getPeriodUtilMinute()] = channelUtilization[this->getPeriodUtilMinute()] + airtime_ms;
 }
 
 uint8_t AirTime::currentPeriodIndex()
@@ -35,21 +34,29 @@ uint8_t AirTime::currentPeriodIndex()
     return ((getSecondsSinceBoot() / SECONDS_PER_PERIOD) % PERIODS_TO_LOG);
 }
 
+uint8_t AirTime::getPeriodUtilMinute() {
+    return (getSecondsSinceBoot() / 10) % CHANNEL_UTILIZATION_PERIODS;
+}
+
+uint8_t AirTime::getPeriodUtilHour() {
+    return (getSecondsSinceBoot() / 60) % MINUTES_IN_HOUR;
+}
+
 void AirTime::airtimeRotatePeriod()
 {
 
-    if (this->airtimes.lastPeriodIndex != currentPeriodIndex()) {
+    if (this->airtimes.lastPeriodIndex != this->currentPeriodIndex()) {
-        DEBUG_MSG("Rotating airtimes to a new period = %u\n", currentPeriodIndex());
+        DEBUG_MSG("Rotating airtimes to a new period = %u\n", this->currentPeriodIndex());
 
         for (int i = PERIODS_TO_LOG - 2; i >= 0; --i) {
             this->airtimes.periodTX[i + 1] = this->airtimes.periodTX[i];
             this->airtimes.periodRX[i + 1] = this->airtimes.periodRX[i];
             this->airtimes.periodRX_ALL[i + 1] = this->airtimes.periodRX_ALL[i];
 
-            myNodeInfo.air_period_tx[i + 1] = myNodeInfo.air_period_tx[i];
+            myNodeInfo.air_period_tx[i + 1] = this->airtimes.periodTX[i];
-            myNodeInfo.air_period_rx[i + 1] = myNodeInfo.air_period_rx[i];
+            myNodeInfo.air_period_rx[i + 1] = this->airtimes.periodRX[i];
         }
-        
+
         this->airtimes.periodTX[0] = 0;
         this->airtimes.periodRX[0] = 0;
         this->airtimes.periodRX_ALL[0] = 0;
@@ -57,7 +64,7 @@ void AirTime::airtimeRotatePeriod()
         myNodeInfo.air_period_tx[0] = 0;
         myNodeInfo.air_period_rx[0] = 0;
 
-        this->airtimes.lastPeriodIndex = currentPeriodIndex();
+        this->airtimes.lastPeriodIndex = this->currentPeriodIndex();
     }
 }
 
@@ -100,25 +107,53 @@ float AirTime::channelUtilizationPercent()
     return (float(sum) / float(CHANNEL_UTILIZATION_PERIODS * 10 * 1000)) * 100;
 }
 
-AirTime::AirTime() : concurrency::OSThread("AirTime") {}
+float AirTime::utilizationTXPercent()
+{
+    uint32_t sum = 0;
+    for (uint32_t i = 0; i < MINUTES_IN_HOUR; i++) {
+        sum += this->utilizationTX[i];
+    }
+
+    return (float(sum) / float(MS_IN_HOUR)) * 100;
+}
+
+AirTime::AirTime() : concurrency::OSThread("AirTime"),airtimes({}) {
+}
 
 int32_t AirTime::runOnce()
 {
     secSinceBoot++;
 
-    uint8_t utilPeriod = (getSecondsSinceBoot() / 10) % CHANNEL_UTILIZATION_PERIODS;
+    uint8_t utilPeriod = this->getPeriodUtilMinute();
+    uint8_t utilPeriodTX = this->getPeriodUtilHour();
 
     if (firstTime) {
-        airtimeRotatePeriod();
 
+        // Init utilizationTX window to all 0
+        for (uint32_t i = 0; i < MINUTES_IN_HOUR; i++) {
+            this->utilizationTX[i] = 0;
+        }
+
+        // Init channelUtilization window to all 0
         for (uint32_t i = 0; i < CHANNEL_UTILIZATION_PERIODS; i++) {
             this->channelUtilization[i] = 0;
         }
 
+        // Init airtime windows to all 0
+        for (int i = 0; i < PERIODS_TO_LOG; i++) {
+            this->airtimes.periodTX[i] = 0;
+            this->airtimes.periodRX[i] = 0;
+            this->airtimes.periodRX_ALL[i] = 0;
+
+            // myNodeInfo.air_period_tx[i] = 0;
+            // myNodeInfo.air_period_rx[i] = 0;
+        }
+
         firstTime = false;
         lastUtilPeriod = utilPeriod;
 
     } else {
+        this->airtimeRotatePeriod();
 
         // Reset the channelUtilization window when we roll over
         if (lastUtilPeriod != utilPeriod) {
@@ -127,9 +162,26 @@ int32_t AirTime::runOnce()
             this->channelUtilization[utilPeriod] = 0;
         }
 
+        if (lastUtilPeriodTX != utilPeriodTX) {
+            lastUtilPeriodTX = utilPeriodTX;
+
+            this->utilizationTX[utilPeriodTX] = 0;
+        }
+
         // Update channel_utilization every second.
         myNodeInfo.channel_utilization = airTime->channelUtilizationPercent();
-    }
 
+        // Update channel_utilization every second.
+        myNodeInfo.air_util_tx = airTime->utilizationTXPercent();
+    }
+/*
+    DEBUG_MSG("utilPeriodTX %d TX Airtime %3.2f%\n", utilPeriodTX, airTime->utilizationTXPercent());
+    for (uint32_t i = 0; i < MINUTES_IN_HOUR; i++) {
+        DEBUG_MSG(
+            "%d,", this->utilizationTX[i]
+            );
+    }
+    DEBUG_MSG("\n");
+*/
     return (1000 * 1);
-}
+}

src/airtime.h

@@ -27,6 +27,9 @@
 #define CHANNEL_UTILIZATION_PERIODS 6
 #define SECONDS_PER_PERIOD 3600
 #define PERIODS_TO_LOG 24
+#define MINUTES_IN_HOUR 60
+#define SECONDS_IN_MINUTE 60
+#define MS_IN_HOUR (MINUTES_IN_HOUR * SECONDS_IN_MINUTE * 1000)
 
 
 enum reportTypes { TX_LOG, RX_LOG, RX_ALL_LOG };
@@ -43,9 +46,12 @@ class AirTime : private concurrency::OSThread
 
     void logAirtime(reportTypes reportType, uint32_t airtime_ms);
     float channelUtilizationPercent();
-    uint32_t channelUtilization[CHANNEL_UTILIZATION_PERIODS];
+    float utilizationTXPercent();
+
+    float UtilizationPercentTX();
+    uint32_t channelUtilization[CHANNEL_UTILIZATION_PERIODS] = {0};
+    uint32_t utilizationTX[MINUTES_IN_HOUR] = {0};
 
-    uint8_t currentPeriodIndex();
     void airtimeRotatePeriod();
     uint8_t getPeriodsToLog();
     uint32_t getSecondsPerPeriod();
@@ -55,6 +61,7 @@ class AirTime : private concurrency::OSThread
   private:
     bool firstTime = true;
     uint8_t lastUtilPeriod = 0;
+    uint8_t lastUtilPeriodTX = 0;
     uint32_t secSinceBoot = 0;
 
     struct airtimeStruct {
@@ -64,8 +71,12 @@ class AirTime : private concurrency::OSThread
         uint8_t lastPeriodIndex;
     } airtimes;
 
+    uint8_t getPeriodUtilMinute();
+    uint8_t getPeriodUtilHour();
+    uint8_t currentPeriodIndex();
+
   protected:
     virtual int32_t runOnce() override;
 };
 
-extern AirTime *airTime;
+extern AirTime *airTime;

src/commands.h

@@ -13,4 +13,5 @@ enum class Cmd {
         STOP_BLUETOOTH_PIN_SCREEN,
         STOP_BOOT_SCREEN,
         PRINT,
+        START_SHUTDOWN_SCREEN,
 };

src/concurrency/BinarySemaphoreFreeRTOS.cpp

@@ -7,9 +7,8 @@
 namespace concurrency
 {
 
-BinarySemaphoreFreeRTOS::BinarySemaphoreFreeRTOS()
+BinarySemaphoreFreeRTOS::BinarySemaphoreFreeRTOS() : semaphore(xSemaphoreCreateBinary())
 {
-    semaphore = xSemaphoreCreateBinary();
     assert(semaphore);
 }
 
@@ -38,4 +37,4 @@ IRAM_ATTR void BinarySemaphoreFreeRTOS::giveFromISR(BaseType_t *pxHigherPriority
 
 } // namespace concurrency
 
-#endif
+#endif

src/concurrency/Lock.cpp

@@ -6,9 +6,8 @@ namespace concurrency
 {
 
 #ifdef HAS_FREE_RTOS
-Lock::Lock()
+Lock::Lock() : handle(xSemaphoreCreateBinary())
 {
-    handle = xSemaphoreCreateBinary();
     assert(handle);
     assert(xSemaphoreGive(handle));
 }

src/concurrency/LockGuard.h

@@ -10,7 +10,7 @@ namespace concurrency {
 class LockGuard
 {
   public:
-    LockGuard(Lock *lock);
+    explicit LockGuard(Lock *lock);
     ~LockGuard();
 
     LockGuard(const LockGuard &) = delete;

src/concurrency/NotifiedWorkerThread.h

@@ -39,7 +39,7 @@ class NotifiedWorkerThread : public OSThread
     virtual void onNotify(uint32_t notification) = 0;
 
     /// just calls checkNotification()
-    virtual int32_t runOnce();
+    virtual int32_t runOnce() override;
 
     /// Sometimes we might want to check notifications independently of when our thread was getting woken up (i.e. if we are about to change
     /// radio transmit/receive modes we want to handle any pending interrupts first).  You can call this method and if any notifications are currently

src/concurrency/Periodic.h

@@ -18,7 +18,7 @@ class Periodic : public OSThread
     Periodic(const char *name, int32_t (*_callback)()) : OSThread(name), callback(_callback) {}
 
   protected:
-    int32_t runOnce() { return callback(); }
+    int32_t runOnce() override { return callback(); }
 };
 
 } // namespace concurrency

src/configuration.h

@@ -45,10 +45,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // If we are using the JTAG port for debugging, some pins must be left free for that (and things like GPS have to be disabled)
 // we don't support jtag on the ttgo - access to gpio 12 is a PITA
-#ifdef ARDUINO_HELTEC_WIFI_LORA_32_V2
-//#define USE_JTAG
-#endif
-
 #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
@@ -88,18 +84,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BUTTON_PIN_TOUCH PIN_BUTTON_TOUCH
 #endif
 
-// FIXME, use variant.h defs for all of this!!! (even on the ESP32 targets)
-#elif defined(CubeCell_BoardPlus)
-
-//
-// Standard definitions for CubeCell targets
-//
-
-#define NO_ESP32 // Don't use ESP32 libs (mainly bluetooth)
-
-#define LED_PIN -1 // FIXME totally bogus
-#define BUTTON_PIN -1
-
 #else
 
 //
@@ -169,338 +153,59 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // This string must exactly match the case used in release file names or the android updater won't work
 #define HW_VENDOR HardwareModel_TBEAM
 
-// #define BUTTON_NEED_PULLUP // if set we need to turn on the internal CPU pullup during sleep
-
-#define I2C_SDA 21
-#define I2C_SCL 22
-
-#define BUTTON_PIN 38     // The middle button GPIO on the T-Beam
-//#define BUTTON_PIN_ALT 13 // Alternate GPIO for an external button if needed. Does anyone use this? It is not documented anywhere.
-#define EXT_NOTIFY_OUT 13 // Default pin to use for Ext Notify Plugin.
-
-#define LED_INVERTED 1
-#define LED_PIN 4 // Newer tbeams (1.1) have an extra led on GPIO4
-
-// TTGO uses a common pinout for their SX1262 vs RF95 modules - both can be enabled and we will probe at runtime for RF95 and if
-// not found then probe for SX1262
-#define USE_RF95
-#define USE_SX1262
-
-#define LORA_DIO0 26 // a No connect on the SX1262 module
-#define LORA_RESET 23
-#define LORA_DIO1 33 // SX1262 IRQ
-#define LORA_DIO2 32 // SX1262 BUSY
-#define LORA_DIO3    // Not connected on PCB, but internally on the TTGO SX1262, if DIO3 is high the TXCO is enabled
-
-#ifdef USE_SX1262
-#define SX126X_CS RF95_NSS // FIXME - we really should define LORA_CS instead
-#define SX126X_DIO1 LORA_DIO1
-#define SX126X_BUSY LORA_DIO2
-#define SX126X_RESET LORA_RESET
-#define SX126X_E22 // Not really an E22 but TTGO seems to be trying to clone that
-// Internally the TTGO module hooks the SX1262-DIO2 in to control the TX/RX switch (which is the default for the sx1262interface
-// code)
-#endif
-
-// Leave undefined to disable our PMU IRQ handler.  DO NOT ENABLE THIS because the pmuirq can cause sperious interrupts
-// and waking from light sleep
-// #define PMU_IRQ 35
-#define AXP192_SLAVE_ADDRESS 0x34
-
 #elif defined(TBEAM_V07)
 // This string must exactly match the case used in release file names or the android updater won't work
 #define HW_VENDOR HardwareModel_TBEAM0p7
 
-// #define BUTTON_NEED_PULLUP // if set we need to turn on the internal CPU pullup during sleep
-
-#define I2C_SDA 21
-#define I2C_SCL 22
-
-#define BUTTON_PIN 39
-#define BATTERY_PIN 35 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
-#define EXT_NOTIFY_OUT 13 // Default pin to use for Ext Notify Plugin.
-
-#define USE_RF95
-#define LORA_DIO0 26 // a No connect on the SX1262 module
-#define LORA_RESET 23
-#define LORA_DIO1 33 // Not really used
-#define LORA_DIO2 32 // Not really used
-
-// This board has different GPS pins than all other boards
-#undef GPS_RX_PIN
-#undef GPS_TX_PIN
-#define GPS_RX_PIN 12
-#define GPS_TX_PIN 15
-
 #elif defined(DIY_V1)
 // This string must exactly match the case used in release file names or the android updater won't work
 #define HW_VENDOR HardwareModel_DIY_V1
 
-// For OLED LCD
+#elif defined(RAK_11200)
-#define I2C_SDA 21
+// This string must exactly match the case used in release file names or the android updater won't work
-#define I2C_SCL 22
+#define HW_VENDOR HardwareModel_RAK11200
-
-// GPS
-#undef GPS_RX_PIN
-#define GPS_RX_PIN 15
-//#undef GPS_TX_PIN
-//#define GPS_TX_PIN 12 // not connected
-
-#define BUTTON_PIN 39 // The middle button GPIO on the T-Beam
-#define EXT_NOTIFY_OUT 12 // Overridden default pin to use for Ext Notify Plugin (#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
-
-#define RF95_SCK 5
-#define RF95_MISO 19
-#define RF95_MOSI 27
-#define RF95_NSS 18
-
-// supported modules list
-#define USE_SX1262
-#define USE_SX1268
-#define USE_LLCC68
-
-// common pinouts for SX126X modules
-#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 13
-
-#ifdef EBYTE_E22
-// Internally the TTGO module hooks the SX126x-DIO2 in to control the TX/RX switch
-// (which is the default for the sx1262interface code)
-#define SX126X_E22
-#endif
 
 #elif defined(ARDUINO_HELTEC_WIFI_LORA_32_V2)
 
-// the default ESP32 Pin of 15 is the Oled SCL, set to 36 and 37 and works fine.
-// Tested on Neo6m module.
-#undef GPS_RX_PIN
-#undef GPS_TX_PIN
-#define GPS_RX_PIN 36
-#define GPS_TX_PIN 37
-
-#ifndef USE_JTAG  // gpio15 is TDO for JTAG, so no I2C on this board while doing jtag
-#define I2C_SDA 4 // I2C pins for this board
-#define I2C_SCL 15
-#endif
-
-#define RESET_OLED 16 // If defined, this pin will be used to reset the display controller
-
-#define VEXT_ENABLE 21 // active low, powers the oled display and the lora antenna boost
-#define LED_PIN 25     // If defined we will blink this LED
-#define BUTTON_PIN 0   // If defined, this will be used for user button presses
-
-#define USE_RF95
-#define LORA_DIO0 26 // a No connect on the SX1262 module
-#ifndef USE_JTAG
-#define LORA_RESET 14
-#endif
-#define LORA_DIO1 35 // Not really used
-#define LORA_DIO2 34 // Not really used
-
-// ratio of voltage divider = 3.20 (R1=100k, R2=220k)
-#define ADC_MULTIPLIER 3.2
-
 #ifdef HELTEC_V2_0
 // This string must exactly match the case used in release file names or the android updater won't work
 #define HW_VENDOR HardwareModel_HELTEC_V2_0
 
-#define BATTERY_PIN 13 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
-
 #endif
 
 #ifdef HELTEC_V2_1
 // This string must exactly match the case used in release file names or the android updater won't work
 #define HW_VENDOR HardwareModel_HELTEC_V2_1
 
-#define BATTERY_PIN 37 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
-#define EXT_NOTIFY_OUT 13 // Default pin to use for Ext Notify Plugin.
-
 #endif
 
 #elif defined(ARDUINO_HELTEC_WIFI_LORA_32)
 
-// the default ESP32 Pin of 15 is the Oled SCL, set to 36 and 37 and works fine.
-// Tested on Neo6m module.
-#undef GPS_RX_PIN
-#undef GPS_TX_PIN
-#define GPS_RX_PIN 36
-#define GPS_TX_PIN 37
-
-#ifndef USE_JTAG  // gpio15 is TDO for JTAG, so no I2C on this board while doing jtag
-#define I2C_SDA 4 // I2C pins for this board
-#define I2C_SCL 15
-#endif
-
-#define RESET_OLED 16 // If defined, this pin will be used to reset the display controller
-
-#define LED_PIN 25     // If defined we will blink this LED
-#define BUTTON_PIN 0   // If defined, this will be used for user button presses
-
-#define USE_RF95
-#define LORA_DIO0 26 // a No connect on the SX1262 module
-#ifndef USE_JTAG
-#define LORA_RESET 14
-#endif
-#define LORA_DIO1 33 // Not really used
-#define LORA_DIO2 32 // Not really used
-
-// ratio of voltage divider = 3.20 (R1=100k, R2=220k)
-#define ADC_MULTIPLIER 3.2
-
-// This string must exactly match the case used in release file names or the android updater won't work
 #define HW_VENDOR HardwareModel_HELTEC_V1
 
-#define BATTERY_PIN 13 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
-
 #elif defined(TLORA_V1)
-// This string must exactly match the case used in release file names or the android updater won't work
+
 #define HW_VENDOR HardwareModel_TLORA_V1
-#undef GPS_RX_PIN
-#undef GPS_TX_PIN
-#define GPS_RX_PIN 36
-#define GPS_TX_PIN 37
-
-#define I2C_SDA 4 // I2C pins for this board
-#define I2C_SCL 15
-
-#define RESET_OLED 16 // If defined, this pin will be used to reset the display controller
-
-// #define VEXT_ENABLE 21 // active low, powers the oled display and the lora antenna boost
-#define LED_PIN 2     // If defined we will blink this LED
-#define BUTTON_PIN 0  // If defined, this will be used for user button presses
-#define BUTTON_NEED_PULLUP
-#define EXT_NOTIFY_OUT 13 // Default pin to use for Ext Notify Plugin.
-
-#define USE_RF95
-#define LORA_DIO0 26 // a No connect on the SX1262 module
-#define LORA_RESET 14
-#define LORA_DIO1 35 // Not really used
-#define LORA_DIO2 34 // Not really used
 
 #elif defined(TLORA_V2)
 // This string must exactly match the case used in release file names or the android updater won't work
 #define HW_VENDOR HardwareModel_TLORA_V2
 
-#undef GPS_RX_PIN
-#undef GPS_TX_PIN
-#define GPS_RX_PIN 36
-#define GPS_TX_PIN 13 // per @eugene
-
-#define BATTERY_PIN 35 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
-
-#define I2C_SDA 21 // I2C pins for this board
-#define I2C_SCL 22
-
-#define RESET_OLED 16 // If defined, this pin will be used to reset the display controller
-
-#define VEXT_ENABLE 21 // active low, powers the oled display and the lora antenna boost
-#define LED_PIN 25     // If defined we will blink this LED
-#define BUTTON_PIN                                                                                                               \
-    0 // If defined, this will be used for user button presses, if your board doesn't have a physical switch, you can wire one
-      // between this pin and ground
-#define BUTTON_NEED_PULLUP
-
-#define USE_RF95
-#define LORA_DIO0 26 // a No connect on the SX1262 module
-#define LORA_RESET 14
-#define LORA_DIO1 35 // Not really used
-#define LORA_DIO2 34 // Not really used
-
 #elif defined(TLORA_V1_3)
 // This string must exactly match the case used in release file names or the android updater won't work
 #define HW_VENDOR HardwareModel_TLORA_V1_1p3
 
-#undef GPS_RX_PIN
-#undef GPS_TX_PIN
-#define GPS_RX_PIN 36
-#define GPS_TX_PIN 13 // per @eugene
-
-#define BATTERY_PIN 35 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
-
-#define I2C_SDA 4 // I2C pins for this board
-#define I2C_SCL 15
-
-#define RESET_OLED 16 // If defined, this pin will be used to reset the display controller
-
-#define VEXT_ENABLE 21 // active low, powers the oled display and the lora antenna boost
-#define LED_PIN 25     // If defined we will blink this LED
-#define BUTTON_PIN 36
-#define BUTTON_NEED_PULLUP
-
-#define USE_RF95
-#define LORA_DIO0 26 // a No connect on the SX1262 module
-#define LORA_RESET 14
-#define LORA_DIO1 35 // Not really used
-#define LORA_DIO2 34 // Not really used
-
 #elif defined(TLORA_V2_1_16)
 // This string must exactly match the case used in release file names or the android updater won't work
 #define HW_VENDOR HardwareModel_TLORA_V2_1_1p6
 
-#undef GPS_RX_PIN
-#undef GPS_TX_PIN
-#define GPS_RX_PIN 15 // per @der_bear on the forum, 36 is incorrect for this board type and 15 is a better pick
-#define GPS_TX_PIN 13
-
-#define BATTERY_PIN 35 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
-
-#define I2C_SDA 21 // I2C pins for this board
-#define I2C_SCL 22
-
-#define RESET_OLED 16 // If defined, this pin will be used to reset the display controller
-
-#define VEXT_ENABLE 21 // active low, powers the oled display and the lora antenna boost
-#define LED_PIN 25     // If defined we will blink this LED
-#define BUTTON_PIN 12  // If defined, this will be used for user button presses,
-
-#define BUTTON_NEED_PULLUP
-
-#define USE_RF95
-#define LORA_DIO0 26 // a No connect on the SX1262 module
-#define LORA_RESET 14
-#define LORA_DIO1 35 // Not really used
-#define LORA_DIO2 34 // Not really used
-
 #elif defined(GENIEBLOCKS)
 // This string must exactly match the case used in release file names or the android updater won't work
 #define HW_VENDOR HardwareModel_GENIEBLOCKS
-#undef GPS_RX_PIN
-#undef GPS_TX_PIN
-#define GPS_RX_PIN 5
-#define GPS_TX_PIN 18
-#define GPS_RESET_N 10
-#define GPS_EXTINT 23 // On MAX-M8 module pin name is EXTINT. On L70 module pin name is STANDBY.
 
-#define BATTERY_PIN 39    // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
+#elif defined(PRIVATE_HW)
-#define BATTERY_EN_PIN 14 // Voltage voltage divider enable pin connected to mosfet
+// This string must exactly match the case used in release file names or the android updater won't work
-
+#define HW_VENDOR HardwareModel_PRIVATE_HW
-#define I2C_SDA 4 // I2C pins for this board
-#define I2C_SCL 2
-
-#define LED_PIN 12 // If defined we will blink this LED
-//#define BUTTON_PIN 36  // If defined, this will be used for user button presses (ToDo problem on that line on debug screen -->
-// Long press start!) #define BUTTON_NEED_PULLUP //GPIOs 34 to 39 are GPIs – input only pins. These pins don’t have internal
-// pull-ups or pull-down resistors.
-
-#define USE_RF95
-#define LORA_DIO0 38 // a No connect on the SX1262 module
-#define LORA_RESET 9
-
-#define RF95_SCK 22
-#define RF95_MISO 19
-#define RF95_MOSI 13
-#define RF95_NSS 21
 
 #endif
 
@@ -525,6 +230,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define HW_VENDOR HardwareModel_T_ECHO
 
+#elif defined(NANO_G1)
+
+#define HW_VENDOR HardwareModel_NANO_G1
+
 #elif NRF52_SERIES
 
 #define HW_VENDOR HardwareModel_NRF52_UNKNOWN
@@ -533,100 +242,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define HW_VENDOR HardwareModel_PORTDUINO
 
-#define USE_SIM_RADIO
-
-// Pine64 uses a common pinout for their SX1262 vs RF95 modules - both can be enabled and we will probe at runtime for RF95 and if
-// not found then probe for SX1262.  Currently the RF95 code is disabled because I think the RF95 module won't need to ship.
-// #define USE_RF95
-#define USE_SX1262
-
-// Fake SPI device selections
-#define RF95_SCK 5
-#define RF95_MISO 19
-#define RF95_MOSI 27
-#define RF95_NSS RADIOLIB_NC // the ch341f spi controller does CS for us
-
-#define LORA_DIO0 26 // a No connect on the SX1262 module
-#define LORA_RESET 14
-#define LORA_DIO1 33 // SX1262 IRQ, called DIO0 on pinelora schematic, pin 7 on ch341f "ack" - FIXME, enable hwints in linux
-#define LORA_DIO2 32 // SX1262 BUSY, actually connected to "DIO5" on pinelora schematic, pin 8 on ch341f "slct" 
-#define LORA_DIO3    // Not connected on PCB, but internally on the TTGO SX1262, if DIO3 is high the TXCO is enabled
-
-#ifdef USE_SX1262
-#define SX126X_CS 20 // CS0 on pinelora schematic, hooked to gpio D0 on ch341f
-#define SX126X_DIO1 LORA_DIO1
-#define SX126X_BUSY LORA_DIO2
-#define SX126X_RESET LORA_RESET
-// HOPE RFM90 does not have a TCXO therefore not SX126X_E22 
 #endif
 
-#endif
+#include "variant.h"
-
+#include "RF95Configuration.h"
-// DEBUG LED
+#include "DebugConfiguration.h"
-#ifndef LED_INVERTED
-#define LED_INVERTED 0 // define as 1 if LED is active low (on)
-#endif
-
-#ifdef USE_RF95
-#define RF95_RESET LORA_RESET
-#define RF95_IRQ LORA_DIO0  // on SX1262 version this is a no connect DIO0
-#define RF95_DIO1 LORA_DIO1 // Note: not really used for RF95
-#define RF95_DIO2 LORA_DIO2 // Note: not really used for RF95
-#endif
-
-// -----------------------------------------------------------------------------
-// DEBUG
-// -----------------------------------------------------------------------------
-
-#ifdef CONSOLE_MAX_BAUD
-#define SERIAL_BAUD CONSOLE_MAX_BAUD
-#else
-#define SERIAL_BAUD 921600 // Serial debug baud rate
-#endif
-
-#include "SerialConsole.h"
-
-#define DEBUG_PORT (*console) // Serial debug port
-
-// What platforms should use SEGGER?
-#ifdef NRF52_SERIES
-
-// Always include the SEGGER code on NRF52 - because useful for debugging
-#include "SEGGER_RTT.h"
-
-// The channel we send stdout data to
-#define SEGGER_STDOUT_CH 0
-
-// Debug printing to segger console
-#define SEGGER_MSG(...) SEGGER_RTT_printf(SEGGER_STDOUT_CH, __VA_ARGS__)
-
-// If we are not on a NRF52840 (which has built in USB-ACM serial support) and we don't have serial pins hooked up, then we MUST
-// use SEGGER for debug output
-#if !defined(PIN_SERIAL_RX) && !defined(NRF52840_XXAA)
-// No serial ports on this board - ONLY use segger in memory console
-#define USE_SEGGER
-#endif
-
-#else
-#define SERIAL0_RX_GPIO 3 // Always GPIO3 on ESP32
-#endif
-
-#ifdef USE_SEGGER
-#define DEBUG_MSG(...) SEGGER_RTT_printf(0, __VA_ARGS__)
-#else
-#ifdef DEBUG_PORT
-#define DEBUG_MSG(...) DEBUG_PORT.logDebug(__VA_ARGS__)
-#else
-#define DEBUG_MSG(...)
-#endif
-#endif
-
-// -----------------------------------------------------------------------------
-// AXP192 (Rev1-specific options)
-// -----------------------------------------------------------------------------
-
-#define GPS_POWER_CTRL_CH 3
-#define LORA_POWER_CTRL_CH 2
-
-// Default Bluetooth PIN
-#define defaultBLEPin 123456

src/esp32/BluetoothSoftwareUpdate.cpp

@@ -58,7 +58,7 @@ int update_size_callback(uint16_t conn_handle, uint16_t attr_handle, struct ble_
     return 0;
 }
 
-#define MAX_BLOCKSIZE 512
+#define MAX_BLOCKSIZE_FOR_BT 512
 
 /// Handle writes to data
 int update_data_callback(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_access_ctxt *ctxt, void *arg)
@@ -66,7 +66,7 @@ int update_data_callback(uint16_t conn_handle, uint16_t attr_handle, struct ble_
     concurrency::LockGuard g(updateLock);
 
     static uint8_t
-        data[MAX_BLOCKSIZE]; // we temporarily copy here because I'm worried that a fast sender might be able overwrite srcbuf
+        data[MAX_BLOCKSIZE_FOR_BT]; // we temporarily copy here because I'm worried that a fast sender might be able overwrite srcbuf
 
     uint16_t len = 0;
 

src/esp32/ESP32CryptoEngine.cpp

@@ -32,7 +32,7 @@ class ESP32CryptoEngine : public CryptoEngine
      * @param bytes a _static_ buffer that will remain valid for the life of this crypto instance (i.e. this class will cache the
      * provided pointer)
      */
-    virtual void setKey(const CryptoKey &k)
+    virtual void setKey(const CryptoKey &k) override
     {
         CryptoEngine::setKey(k);
 
@@ -47,7 +47,7 @@ class ESP32CryptoEngine : public CryptoEngine
      *
      * @param bytes is updated in place
      */
-    virtual void encrypt(uint32_t fromNode, uint64_t packetNum, size_t numBytes, uint8_t *bytes)
+    virtual void encrypt(uint32_t fromNode, uint64_t packetNum, size_t numBytes, uint8_t *bytes) override
     {
         if (key.length > 0) {
             uint8_t stream_block[16];
@@ -66,7 +66,7 @@ class ESP32CryptoEngine : public CryptoEngine
         }
     }
 
-    virtual void decrypt(uint32_t fromNode, uint64_t packetNum, size_t numBytes, uint8_t *bytes)
+    virtual void decrypt(uint32_t fromNode, uint64_t packetNum, size_t numBytes, uint8_t *bytes) override
     {
         // DEBUG_MSG("ESP32 decrypt!\n");
 

src/esp32/SimpleAllocator.h

@@ -14,9 +14,9 @@
  */
 class SimpleAllocator
 {
-    uint8_t bytes[POOL_SIZE];
+    uint8_t bytes[POOL_SIZE] = {};
 
-    uint32_t nextFree;
+    uint32_t nextFree = 0;
 
 public:
     SimpleAllocator();
@@ -37,6 +37,6 @@ void *operator new(size_t size, SimpleAllocator &p);
  */
 class AllocatorScope {
 public:
-    AllocatorScope(SimpleAllocator &a);
+    explicit AllocatorScope(SimpleAllocator &a);
     ~AllocatorScope();
 };

src/gps/Air530GPS.h

@@ -11,10 +11,10 @@ class Air530GPS : public NMEAGPS
 {
   protected:
     /// If possible force the GPS into sleep/low power mode
-    virtual void sleep();
+    virtual void sleep() override;
 
     /// wake the GPS into normal operation mode
-    virtual void wake();
+    virtual void wake() override;
 
   private:
     /// Send a NMEA cmd with checksum

src/gps/GPS.h

@@ -145,7 +145,7 @@ class GPS : private concurrency::OSThread
      */
     void publishUpdate();
 
-    virtual int32_t runOnce();
+    virtual int32_t runOnce() override;
 };
 
 // Creates an instance of the GPS class. 

src/gps/GeoCoord.cpp

@@ -171,7 +171,7 @@ void GeoCoord::latLongToMGRS(const double lat, const double lon, MGRS &mgrs) {
  * Based on: https://www.movable-type.co.uk/scripts/latlong-os-gridref.html
  */
 void GeoCoord::latLongToOSGR(const double lat, const double lon, OSGR &osgr) {
-    char letter[] = "ABCDEFGHJKLMNOPQRSTUVWXYZ"; // No 'I' in OSGR
+    const char letter[] = "ABCDEFGHJKLMNOPQRSTUVWXYZ"; // No 'I' in OSGR
     double a = 6377563.396; // Airy 1830 semi-major axis
     double b = 6356256.909; // Airy 1830 semi-minor axis
     double f0 = 0.9996012717; // National Grid point scale factor on the central meridian
@@ -419,12 +419,12 @@ float GeoCoord::rangeRadiansToMeters(double range_radians) {
 }
 
 // Find distance from point to passed in point
-int32_t GeoCoord::distanceTo(GeoCoord pointB) {
+int32_t GeoCoord::distanceTo(const GeoCoord& pointB) {
     return latLongToMeter(this->getLatitude() * 1e-7, this->getLongitude() * 1e-7, pointB.getLatitude() * 1e-7, pointB.getLongitude() * 1e-7);
 }
 
 // Find bearing from point to passed in point
-int32_t GeoCoord::bearingTo(GeoCoord pointB) {
+int32_t GeoCoord::bearingTo(const GeoCoord& pointB) {
     return bearing(this->getLatitude() * 1e-7, this->getLongitude() * 1e-7, pointB.getLatitude() * 1e-7, pointB.getLongitude() * 1e-7);
 }
 
@@ -447,4 +447,4 @@ std::shared_ptr<GeoCoord> GeoCoord::pointAtDistance(double bearing, double range
 
     return std::make_shared<GeoCoord>(double(lat), double(lon), this->getAltitude());
     
-}
+}

src/gps/GeoCoord.h

@@ -86,11 +86,11 @@ class GeoCoord {
         int32_t _longitude = 0;
         int32_t _altitude = 0;
 
-        DMS _dms;
+        DMS _dms = {};
-        UTM _utm;
+        UTM _utm = {};
-        MGRS _mgrs;
+        MGRS _mgrs = {};
-        OSGR _osgr;
+        OSGR _osgr = {};
-        OLC _olc;
+        OLC _olc = {};
 
         bool _dirty = true;
 
@@ -119,8 +119,8 @@ class GeoCoord {
         static float rangeMetersToRadians(double range_meters);
 
         // Point to point conversions
-        int32_t distanceTo(GeoCoord pointB);
+        int32_t distanceTo(const GeoCoord& pointB);
-        int32_t bearingTo(GeoCoord pointB);
+        int32_t bearingTo(const GeoCoord& pointB);
         std::shared_ptr<GeoCoord> pointAtDistance(double bearing, double range);
 
         // Lat lon alt getters

src/gps/NMEAGPS.h

@@ -23,14 +23,14 @@ class NMEAGPS : public GPS
 #endif
 
   public:
-    virtual bool setupGPS();
+    virtual bool setupGPS() override;
 
   protected:
     /** Subclasses should look for serial rx characters here and feed it to their GPS parser
      * 
      * Return true if we received a valid message from the GPS
     */
-    virtual bool whileIdle();
+    virtual bool whileIdle() override;
 
     /**
      * Perform any processing that should be done only while the GPS is awake and looking for a fix.
@@ -38,7 +38,7 @@ class NMEAGPS : public GPS
      *
      * @return true if we've acquired a time
      */
-    virtual bool lookForTime();
+    virtual bool lookForTime() override;
 
     /**
      * Perform any processing that should be done only while the GPS is awake and looking for a fix.
@@ -46,7 +46,7 @@ class NMEAGPS : public GPS
      *
      * @return true if we've acquired a new location
      */
-    virtual bool lookForLocation();
+    virtual bool lookForLocation() override;
 
-    virtual bool hasLock();
+    virtual bool hasLock() override;
 };

src/gps/UBloxGPS.h

@@ -22,22 +22,22 @@ class UBloxGPS : public GPS
      *
      * @return true for success
      */
-    bool factoryReset();
+    bool factoryReset() override;
 
   protected:
     /**
      * Returns true if we succeeded
      */
-    virtual bool setupGPS();
+    virtual bool setupGPS() override;
 
     /** Subclasses should look for serial rx characters here and feed it to their GPS parser
      *
      * Return true if we received a valid message from the GPS
      */
-    virtual bool whileIdle();
+    virtual bool whileIdle() override;
 
     /** Idle processing while GPS is looking for lock */
-    virtual void whileActive();
+    virtual void whileActive() override;
 
     /**
      * Perform any processing that should be done only while the GPS is awake and looking for a fix.
@@ -45,7 +45,7 @@ class UBloxGPS : public GPS
      *
      * @return true if we've acquired a time
      */
-    virtual bool lookForTime();
+    virtual bool lookForTime() override;
 
     /**
      * Perform any processing that should be done only while the GPS is awake and looking for a fix.
@@ -53,12 +53,12 @@ class UBloxGPS : public GPS
      *
      * @return true if we've acquired a new location
      */
-    virtual bool lookForLocation();
+    virtual bool lookForLocation() override;
-    virtual bool hasLock();
+    virtual bool hasLock() override;
 
     /// If possible force the GPS into sleep/low power mode
-    virtual void sleep();
+    virtual void sleep() override;
-    virtual void wake();
+    virtual void wake() override;
 
   private:
     /// Attempt to connect to our GPS, returns false if no gps is present

src/graphics/EInkDisplay2.h

@@ -25,7 +25,7 @@ class EInkDisplay : public OLEDDisplay
     EInkDisplay(uint8_t address, int sda, int scl);
 
     // Write the buffer to the display memory (for eink we only do this occasionally)
-    virtual void display(void);
+    virtual void display(void) override;
 
     /**
      * Force a display update if we haven't drawn within the specified msecLimit
@@ -36,13 +36,13 @@ class EInkDisplay : public OLEDDisplay
 
   protected:
     // the header size of the buffer used, e.g. for the SPI command header
-    virtual int getBufferOffset(void) { return 0; }
+    virtual int getBufferOffset(void) override { return 0; }
 
     // Send a command to the display (low level function)
-    virtual void sendCommand(uint8_t com);
+    virtual void sendCommand(uint8_t com) override;
 
     // Connect to the display
-    virtual bool connect();
+    virtual bool connect() override;
 };
 
 

src/graphics/Screen.cpp

@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "Screen.h"
-#include "fonts.h"
 #include "gps/GeoCoord.h"
 #include "gps/RTC.h"
 #include "graphics/images.h"
@@ -219,6 +218,14 @@ static void drawFrameBluetooth(OLEDDisplay *display, OLEDDisplayUiState *state,
     display->drawString(64 + x, 48 + y, buf);
 }
 
+static void drawFrameShutdown(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
+{
+    display->setTextAlignment(TEXT_ALIGN_CENTER);
+
+    display->setFont(FONT_MEDIUM);
+    display->drawString(64 + x, 26 + y, "Shutting down...");
+}
+
 static void drawFrameFirmware(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
 {
     display->setTextAlignment(TEXT_ALIGN_CENTER);
@@ -442,10 +449,10 @@ static void drawGPScoordinates(OLEDDisplay *display, int16_t x, int16_t y, const
             if (gpsFormat == GpsCoordinateFormat_GpsFormatDec) { // Decimal Degrees
                 sprintf(coordinateLine, "%f %f", geoCoord.getLatitude() * 1e-7, geoCoord.getLongitude() * 1e-7);
             } else if (gpsFormat == GpsCoordinateFormat_GpsFormatUTM) { // Universal Transverse Mercator
-                sprintf(coordinateLine, "%2i%1c %06i %07i", geoCoord.getUTMZone(), geoCoord.getUTMBand(),
+                sprintf(coordinateLine, "%2i%1c %06u %07u", geoCoord.getUTMZone(), geoCoord.getUTMBand(),
                         geoCoord.getUTMEasting(), geoCoord.getUTMNorthing());
             } else if (gpsFormat == GpsCoordinateFormat_GpsFormatMGRS) { // Military Grid Reference System
-                sprintf(coordinateLine, "%2i%1c %1c%1c %05i %05i", geoCoord.getMGRSZone(), geoCoord.getMGRSBand(),
+                sprintf(coordinateLine, "%2i%1c %1c%1c %05u %05u", geoCoord.getMGRSZone(), geoCoord.getMGRSBand(),
                         geoCoord.getMGRSEast100k(), geoCoord.getMGRSNorth100k(), geoCoord.getMGRSEasting(),
                         geoCoord.getMGRSNorthing());
             } else if (gpsFormat == GpsCoordinateFormat_GpsFormatOLC) { // Open Location Code
@@ -454,7 +461,7 @@ static void drawGPScoordinates(OLEDDisplay *display, int16_t x, int16_t y, const
                 if (geoCoord.getOSGRE100k() == 'I' || geoCoord.getOSGRN100k() == 'I') // OSGR is only valid around the UK region
                     sprintf(coordinateLine, "%s", "Out of Boundary");
                 else
-                    sprintf(coordinateLine, "%1c%1c %05i %05i", geoCoord.getOSGRE100k(), geoCoord.getOSGRN100k(),
+                    sprintf(coordinateLine, "%1c%1c %05u %05u", geoCoord.getOSGRE100k(), geoCoord.getOSGRN100k(),
                             geoCoord.getOSGREasting(), geoCoord.getOSGRNorthing());
             }
 
@@ -472,9 +479,9 @@ static void drawGPScoordinates(OLEDDisplay *display, int16_t x, int16_t y, const
         } else {
             char latLine[22];
             char lonLine[22];
-            sprintf(latLine, "%2i° %2i' %2.4f\" %1c", geoCoord.getDMSLatDeg(), geoCoord.getDMSLatMin(), geoCoord.getDMSLatSec(),
+            sprintf(latLine, "%2i° %2i' %2u\" %1c", geoCoord.getDMSLatDeg(), geoCoord.getDMSLatMin(), geoCoord.getDMSLatSec(),
                     geoCoord.getDMSLatCP());
-            sprintf(lonLine, "%3i° %2i' %2.4f\" %1c", geoCoord.getDMSLonDeg(), geoCoord.getDMSLonMin(), geoCoord.getDMSLonSec(),
+            sprintf(lonLine, "%3i° %2i' %2u\" %1c", geoCoord.getDMSLonDeg(), geoCoord.getDMSLonMin(), geoCoord.getDMSLonSec(),
                     geoCoord.getDMSLonCP());
             display->drawString(x + (SCREEN_WIDTH - (display->getStringWidth(latLine))) / 2, y - FONT_HEIGHT_SMALL * 1, latLine);
             display->drawString(x + (SCREEN_WIDTH - (display->getStringWidth(lonLine))) / 2, y, lonLine);
@@ -644,7 +651,6 @@ static void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_
 
     static char distStr[20];
     strcpy(distStr, "? km"); // might not have location data
-    float headingRadian;
     NodeInfo *ourNode = nodeDB.getNode(nodeDB.getNodeNum());
     const char *fields[] = {username, distStr, signalStr, lastStr, NULL};
 
@@ -672,7 +678,7 @@ static void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_
             // it.  currently we don't do this and instead draw north up only.
             float bearingToOther =
                 GeoCoord::bearing(DegD(p.latitude_i), DegD(p.longitude_i), DegD(op.latitude_i), DegD(op.longitude_i));
-            headingRadian = bearingToOther - myHeading;
+            float headingRadian = bearingToOther - myHeading;
             drawNodeHeading(display, compassX, compassY, headingRadian);
         }
     }
@@ -820,6 +826,9 @@ void Screen::setup()
     nodeStatusObserver.observe(&nodeStatus->onNewStatus);
     if (textMessagePlugin)
         textMessageObserver.observe(textMessagePlugin);
+
+    // Plugins can notify screen about refresh
+    MeshPlugin::observeUIEvents(&uiFrameEventObserver);
 }
 
 void Screen::forceDisplay()
@@ -878,6 +887,9 @@ int32_t Screen::runOnce()
             handlePrint(cmd.print_text);
             free(cmd.print_text);
             break;
+        case Cmd::START_SHUTDOWN_SCREEN:
+            handleShutdownScreen();
+            break;
         default:
             DEBUG_MSG("BUG: invalid cmd\n");
         }
@@ -930,20 +942,20 @@ int32_t Screen::runOnce()
 
 void Screen::drawDebugInfoTrampoline(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
 {
-    Screen *screen = reinterpret_cast<Screen *>(state->userData);
+    Screen *screen2 = reinterpret_cast<Screen *>(state->userData);
-    screen->debugInfo.drawFrame(display, state, x, y);
+    screen2->debugInfo.drawFrame(display, state, x, y);
 }
 
 void Screen::drawDebugInfoSettingsTrampoline(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
 {
-    Screen *screen = reinterpret_cast<Screen *>(state->userData);
+    Screen *screen2 = reinterpret_cast<Screen *>(state->userData);
-    screen->debugInfo.drawFrameSettings(display, state, x, y);
+    screen2->debugInfo.drawFrameSettings(display, state, x, y);
 }
 
 void Screen::drawDebugInfoWiFiTrampoline(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
 {
-    Screen *screen = reinterpret_cast<Screen *>(state->userData);
+    Screen *screen2 = reinterpret_cast<Screen *>(state->userData);
-    screen->debugInfo.drawFrameWiFi(display, state, x, y);
+    screen2->debugInfo.drawFrameWiFi(display, state, x, y);
 }
 
 /* show a message that the SSL cert is being built
@@ -1037,13 +1049,25 @@ void Screen::handleStartBluetoothPinScreen(uint32_t pin)
 
     static FrameCallback btFrames[] = {drawFrameBluetooth};
 
-    snprintf(btPIN, sizeof(btPIN), "%06lu", pin);
+    snprintf(btPIN, sizeof(btPIN), "%06u", pin);
 
     ui.disableAllIndicators();
     ui.setFrames(btFrames, 1);
     setFastFramerate();
 }
 
+void Screen::handleShutdownScreen()
+{
+    DEBUG_MSG("showing shutdown screen\n");
+    showingNormalScreen = false;
+
+    static FrameCallback shutdownFrames[] = {drawFrameShutdown};
+
+    ui.disableAllIndicators();
+    ui.setFrames(shutdownFrames, 1);
+    setFastFramerate();
+}
+
 void Screen::handleStartFirmwareUpdateScreen()
 {
     DEBUG_MSG("showing firmware screen\n");
@@ -1457,4 +1481,23 @@ int Screen::handleTextMessage(const MeshPacket *packet)
     return 0;
 }
 
+int Screen::handleUIFrameEvent(const UIFrameEvent *event)
+{
+    if (showingNormalScreen) {
+        if (event->frameChanged)
+        {
+            setFrames(); // Regen the list of screens (will show new text message)
+        }
+        else if (event->needRedraw)
+        {
+            setFastFramerate();
+            // TODO: We might also want switch to corresponding frame,
+            //       but we don't know the exact frame number.
+            //ui.switchToFrame(0);
+        }
+    }
+
+    return 0;
+}
+
 } // namespace graphics

src/graphics/Screen.h

@@ -40,6 +40,7 @@ class Screen
 #include "concurrency/OSThread.h"
 #include "power.h"
 #include <string>
+#include "mesh/MeshPlugin.h"
 
 // 0 to 255, though particular variants might define different defaults
 #ifndef BRIGHTNESS_DEFAULT
@@ -90,9 +91,11 @@ class Screen : public concurrency::OSThread
         CallbackObserver<Screen, const meshtastic::Status *>(this, &Screen::handleStatusUpdate);
     CallbackObserver<Screen, const MeshPacket *> textMessageObserver =
         CallbackObserver<Screen, const MeshPacket *>(this, &Screen::handleTextMessage);
+    CallbackObserver<Screen, const UIFrameEvent *> uiFrameEventObserver =
+        CallbackObserver<Screen, const UIFrameEvent *>(this, &Screen::handleUIFrameEvent);
 
   public:
-    Screen(uint8_t address, int sda = -1, int scl = -1);
+    explicit Screen(uint8_t address, int sda = -1, int scl = -1);
 
     Screen(const Screen &) = delete;
     Screen &operator=(const Screen &) = delete;
@@ -148,6 +151,12 @@ class Screen : public concurrency::OSThread
         enqueueCmd(cmd);
     }
 
+    void startShutdownScreen()
+    {
+        ScreenCmd cmd;
+        cmd.cmd = Cmd::START_SHUTDOWN_SCREEN;
+        enqueueCmd(cmd);
+    }
 
     /// Stops showing the bluetooth PIN screen.
     void stopBluetoothPinScreen() { enqueueCmd(ScreenCmd{.cmd = Cmd::STOP_BLUETOOTH_PIN_SCREEN}); }
@@ -218,6 +227,7 @@ class Screen : public concurrency::OSThread
 
     int handleStatusUpdate(const meshtastic::Status *arg);
     int handleTextMessage(const MeshPacket *arg);
+    int handleUIFrameEvent(const UIFrameEvent *arg);
 
     /// Used to force (super slow) eink displays to draw critical frames
     void forceDisplay();
@@ -258,7 +268,7 @@ class Screen : public concurrency::OSThread
     void handleStartBluetoothPinScreen(uint32_t pin);
     void handlePrint(const char *text);
     void handleStartFirmwareUpdateScreen();
-
+    void handleShutdownScreen();
     /// Rebuilds our list of frames (screens) to default ones.
     void setFrames();
 
@@ -303,4 +313,4 @@ class Screen : public concurrency::OSThread
 };
 
 } // namespace graphics
-#endif
+#endif

src/graphics/TFTDisplay.h

@@ -21,15 +21,15 @@ class TFTDisplay : public OLEDDisplay
     TFTDisplay(uint8_t address, int sda, int scl);
 
     // Write the buffer to the display memory
-    virtual void display(void);
+    virtual void display(void) override;
 
   protected:
     // the header size of the buffer used, e.g. for the SPI command header
-    virtual int getBufferOffset(void) { return 0; }
+    virtual int getBufferOffset(void) override { return 0; }
 
     // Send a command to the display (low level function)
-    virtual void sendCommand(uint8_t com);
+    virtual void sendCommand(uint8_t com) override;
 
     // Connect to the display
-    virtual bool connect();
+    virtual bool connect() override;
 };

src/graphics/fonts.h

@@ -1,425 +0,0 @@
-#pragma once
-
-const uint8_t Custom_ArialMT_Plain_10[] PROGMEM = {
-    0x0A, // Width: 10
-    0x0A, // Height: 10
-    0x20, // First Char: 32
-    0xE0, // Numbers of Chars: 224
-
-    // Jump Table:
-    0xFF, 0xFF, 0x00, 0x03, // 32:65535
-    0x00, 0x00, 0x04, 0x03, // 33:0
-    0x00, 0x04, 0x05, 0x04, // 34:4
-    0x00, 0x09, 0x09, 0x06, // 35:9
-    0x00, 0x12, 0x0A, 0x06, // 36:18
-    0x00, 0x1C, 0x10, 0x09, // 37:28
-    0x00, 0x2C, 0x0E, 0x07, // 38:44
-    0x00, 0x3A, 0x01, 0x02, // 39:58
-    0x00, 0x3B, 0x06, 0x03, // 40:59
-    0x00, 0x41, 0x06, 0x03, // 41:65
-    0x00, 0x47, 0x05, 0x04, // 42:71
-    0x00, 0x4C, 0x09, 0x06, // 43:76
-    0x00, 0x55, 0x04, 0x03, // 44:85
-    0x00, 0x59, 0x03, 0x03, // 45:89
-    0x00, 0x5C, 0x04, 0x03, // 46:92
-    0x00, 0x60, 0x05, 0x03, // 47:96
-    0x00, 0x65, 0x0A, 0x06, // 48:101
-    0x00, 0x6F, 0x08, 0x06, // 49:111
-    0x00, 0x77, 0x0A, 0x06, // 50:119
-    0x00, 0x81, 0x0A, 0x06, // 51:129
-    0x00, 0x8B, 0x0B, 0x06, // 52:139
-    0x00, 0x96, 0x0A, 0x06, // 53:150
-    0x00, 0xA0, 0x0A, 0x06, // 54:160
-    0x00, 0xAA, 0x09, 0x06, // 55:170
-    0x00, 0xB3, 0x0A, 0x06, // 56:179
-    0x00, 0xBD, 0x0A, 0x06, // 57:189
-    0x00, 0xC7, 0x04, 0x03, // 58:199
-    0x00, 0xCB, 0x04, 0x03, // 59:203
-    0x00, 0xCF, 0x0A, 0x06, // 60:207
-    0x00, 0xD9, 0x09, 0x06, // 61:217
-    0x00, 0xE2, 0x09, 0x06, // 62:226
-    0x00, 0xEB, 0x0B, 0x06, // 63:235
-    0x00, 0xF6, 0x14, 0x0A, // 64:246
-    0x01, 0x0A, 0x0E, 0x07, // 65:266
-    0x01, 0x18, 0x0C, 0x07, // 66:280
-    0x01, 0x24, 0x0C, 0x07, // 67:292
-    0x01, 0x30, 0x0B, 0x07, // 68:304
-    0x01, 0x3B, 0x0C, 0x07, // 69:315
-    0x01, 0x47, 0x09, 0x06, // 70:327
-    0x01, 0x50, 0x0D, 0x08, // 71:336
-    0x01, 0x5D, 0x0C, 0x07, // 72:349
-    0x01, 0x69, 0x04, 0x03, // 73:361
-    0x01, 0x6D, 0x08, 0x05, // 74:365
-    0x01, 0x75, 0x0E, 0x07, // 75:373
-    0x01, 0x83, 0x0C, 0x06, // 76:387
-    0x01, 0x8F, 0x10, 0x08, // 77:399
-    0x01, 0x9F, 0x0C, 0x07, // 78:415
-    0x01, 0xAB, 0x0E, 0x08, // 79:427
-    0x01, 0xB9, 0x0B, 0x07, // 80:441
-    0x01, 0xC4, 0x0E, 0x08, // 81:452
-    0x01, 0xD2, 0x0C, 0x07, // 82:466
-    0x01, 0xDE, 0x0C, 0x07, // 83:478
-    0x01, 0xEA, 0x0B, 0x06, // 84:490
-    0x01, 0xF5, 0x0C, 0x07, // 85:501
-    0x02, 0x01, 0x0D, 0x07, // 86:513
-    0x02, 0x0E, 0x11, 0x09, // 87:526
-    0x02, 0x1F, 0x0E, 0x07, // 88:543
-    0x02, 0x2D, 0x0D, 0x07, // 89:557
-    0x02, 0x3A, 0x0C, 0x06, // 90:570
-    0x02, 0x46, 0x06, 0x03, // 91:582
-    0x02, 0x4C, 0x06, 0x03, // 92:588
-    0x02, 0x52, 0x04, 0x03, // 93:594
-    0x02, 0x56, 0x09, 0x05, // 94:598
-    0x02, 0x5F, 0x0C, 0x06, // 95:607
-    0x02, 0x6B, 0x03, 0x03, // 96:619
-    0x02, 0x6E, 0x0A, 0x06, // 97:622
-    0x02, 0x78, 0x0A, 0x06, // 98:632
-    0x02, 0x82, 0x0A, 0x05, // 99:642
-    0x02, 0x8C, 0x0A, 0x06, // 100:652
-    0x02, 0x96, 0x0A, 0x06, // 101:662
-    0x02, 0xA0, 0x05, 0x03, // 102:672
-    0x02, 0xA5, 0x0A, 0x06, // 103:677
-    0x02, 0xAF, 0x0A, 0x06, // 104:687
-    0x02, 0xB9, 0x04, 0x02, // 105:697
-    0x02, 0xBD, 0x04, 0x02, // 106:701
-    0x02, 0xC1, 0x08, 0x05, // 107:705
-    0x02, 0xC9, 0x04, 0x02, // 108:713
-    0x02, 0xCD, 0x10, 0x08, // 109:717
-    0x02, 0xDD, 0x0A, 0x06, // 110:733
-    0x02, 0xE7, 0x0A, 0x06, // 111:743
-    0x02, 0xF1, 0x0A, 0x06, // 112:753
-    0x02, 0xFB, 0x0A, 0x06, // 113:763
-    0x03, 0x05, 0x05, 0x03, // 114:773
-    0x03, 0x0A, 0x08, 0x05, // 115:778
-    0x03, 0x12, 0x06, 0x03, // 116:786
-    0x03, 0x18, 0x0A, 0x06, // 117:792
-    0x03, 0x22, 0x09, 0x05, // 118:802
-    0x03, 0x2B, 0x0E, 0x07, // 119:811
-    0x03, 0x39, 0x0A, 0x05, // 120:825
-    0x03, 0x43, 0x09, 0x05, // 121:835
-    0x03, 0x4C, 0x0A, 0x05, // 122:844
-    0x03, 0x56, 0x06, 0x03, // 123:854
-    0x03, 0x5C, 0x04, 0x03, // 124:860
-    0x03, 0x60, 0x05, 0x03, // 125:864
-    0x03, 0x65, 0x09, 0x06, // 126:869
-    0xFF, 0xFF, 0x00, 0x00, // 127:65535
-    0xFF, 0xFF, 0x00, 0x0A, // 128:65535
-    0xFF, 0xFF, 0x00, 0x0A, // 129:65535
-    0xFF, 0xFF, 0x00, 0x0A, // 130:65535
-    0xFF, 0xFF, 0x00, 0x0A, // 131:65535
-    0xFF, 0xFF, 0x00, 0x0A, // 132:65535
-    0xFF, 0xFF, 0x00, 0x0A, // 133:65535
-    0xFF, 0xFF, 0x00, 0x0A, // 134:65535
-    0xFF, 0xFF, 0x00, 0x0A, // 135:65535
-    0xFF, 0xFF, 0x00, 0x0A, // 136:65535
-    0xFF, 0xFF, 0x00, 0x0A, // 137:65535
-    0xFF, 0xFF, 0x00, 0x0A, // 138:65535
-    0xFF, 0xFF, 0x00, 0x0A, // 139:65535
-    0xFF, 0xFF, 0x00, 0x0A, // 140:65535
-    0xFF, 0xFF, 0x00, 0x0A, // 141:65535
-    0xFF, 0xFF, 0x00, 0x0A, // 142:65535
-    0xFF, 0xFF, 0x00, 0x0A, // 143:65535
-    0xFF, 0xFF, 0x00, 0x0A, // 144:65535
-    0xFF, 0xFF, 0x00, 0x0A, // 145:65535
-    0xFF, 0xFF, 0x00, 0x0A, // 146:65535
-    0xFF, 0xFF, 0x00, 0x0A, // 147:65535
-    0xFF, 0xFF, 0x00, 0x0A, // 148:65535
-    0xFF, 0xFF, 0x00, 0x0A, // 149:65535
-    0xFF, 0xFF, 0x00, 0x0A, // 150:65535
-    0xFF, 0xFF, 0x00, 0x0A, // 151:65535
-    0xFF, 0xFF, 0x00, 0x0A, // 152:65535
-    0xFF, 0xFF, 0x00, 0x0A, // 153:65535
-    0xFF, 0xFF, 0x00, 0x0A, // 154:65535
-    0xFF, 0xFF, 0x00, 0x0A, // 155:65535
-    0xFF, 0xFF, 0x00, 0x0A, // 156:65535
-    0xFF, 0xFF, 0x00, 0x0A, // 157:65535
-    0xFF, 0xFF, 0x00, 0x0A, // 158:65535
-    0xFF, 0xFF, 0x00, 0x0A, // 159:65535
-    0xFF, 0xFF, 0x00, 0x03, // 160:65535
-    0x03, 0x6E, 0x04, 0x03, // 161:878
-    0x03, 0x72, 0x0A, 0x06, // 162:882
-    0x03, 0x7C, 0x0C, 0x06, // 163:892
-    0x03, 0x88, 0x0A, 0x06, // 164:904
-    0x03, 0x92, 0x0A, 0x06, // 165:914
-    0x03, 0x9C, 0x04, 0x03, // 166:924
-    0x03, 0xA0, 0x0A, 0x06, // 167:928
-    0x03, 0xAA, 0x05, 0x03, // 168:938
-    0x03, 0xAF, 0x0D, 0x07, // 169:943
-    0x03, 0xBC, 0x07, 0x04, // 170:956
-    0x03, 0xC3, 0x0A, 0x06, // 171:963
-    0x03, 0xCD, 0x09, 0x06, // 172:973
-    0x03, 0xD6, 0x03, 0x03, // 173:982
-    0x03, 0xD9, 0x0D, 0x07, // 174:985
-    0x03, 0xE6, 0x0B, 0x06, // 175:998
-    0x03, 0xF1, 0x07, 0x04, // 176:1009
-    0x03, 0xF8, 0x0A, 0x05, // 177:1016
-    0x04, 0x02, 0x05, 0x03, // 178:1026
-    0x04, 0x07, 0x05, 0x03, // 179:1031
-    0x04, 0x0C, 0x05, 0x03, // 180:1036
-    0x04, 0x11, 0x0A, 0x06, // 181:1041
-    0x04, 0x1B, 0x09, 0x05, // 182:1051
-    0x04, 0x24, 0x03, 0x03, // 183:1060
-    0x04, 0x27, 0x06, 0x03, // 184:1063
-    0x04, 0x2D, 0x05, 0x03, // 185:1069
-    0x04, 0x32, 0x07, 0x04, // 186:1074
-    0x04, 0x39, 0x0A, 0x06, // 187:1081
-    0x04, 0x43, 0x10, 0x08, // 188:1091
-    0x04, 0x53, 0x10, 0x08, // 189:1107
-    0x04, 0x63, 0x10, 0x08, // 190:1123
-    0x04, 0x73, 0x0A, 0x06, // 191:1139
-    0x04, 0x7D, 0x0E, 0x07, // 192:1149
-    0x04, 0x8B, 0x0E, 0x07, // 193:1163
-    0x04, 0x99, 0x0E, 0x07, // 194:1177
-    0x04, 0xA7, 0x0E, 0x07, // 195:1191
-    0x04, 0xB5, 0x0E, 0x07, // 196:1205
-    0x04, 0xC3, 0x0E, 0x07, // 197:1219
-    0x04, 0xD1, 0x12, 0x0A, // 198:1233
-    0x04, 0xE3, 0x0C, 0x07, // 199:1251
-    0x04, 0xEF, 0x0C, 0x07, // 200:1263
-    0x04, 0xFB, 0x0C, 0x07, // 201:1275
-    0x05, 0x07, 0x0C, 0x07, // 202:1287
-    0x05, 0x13, 0x0C, 0x07, // 203:1299
-    0x05, 0x1F, 0x05, 0x03, // 204:1311
-    0x05, 0x24, 0x04, 0x03, // 205:1316
-    0x05, 0x28, 0x04, 0x03, // 206:1320
-    0x05, 0x2C, 0x05, 0x03, // 207:1324
-    0x05, 0x31, 0x0B, 0x07, // 208:1329
-    0x05, 0x3C, 0x0C, 0x07, // 209:1340
-    0x05, 0x48, 0x0E, 0x08, // 210:1352
-    0x05, 0x56, 0x0E, 0x08, // 211:1366
-    0x05, 0x64, 0x0E, 0x08, // 212:1380
-    0x05, 0x72, 0x0E, 0x08, // 213:1394
-    0x05, 0x80, 0x0E, 0x08, // 214:1408
-    0x05, 0x8E, 0x0A, 0x06, // 215:1422
-    0x05, 0x98, 0x0D, 0x08, // 216:1432
-    0x05, 0xA5, 0x0C, 0x07, // 217:1445
-    0x05, 0xB1, 0x0C, 0x07, // 218:1457
-    0x05, 0xBD, 0x0C, 0x07, // 219:1469
-    0x05, 0xC9, 0x0C, 0x07, // 220:1481
-    0x05, 0xD5, 0x0D, 0x07, // 221:1493
-    0x05, 0xE2, 0x0B, 0x07, // 222:1506
-    0x05, 0xED, 0x0C, 0x06, // 223:1517
-    0x05, 0xF9, 0x0A, 0x06, // 224:1529
-    0x06, 0x03, 0x0A, 0x06, // 225:1539
-    0x06, 0x0D, 0x0A, 0x06, // 226:1549
-    0x06, 0x17, 0x0A, 0x06, // 227:1559
-    0x06, 0x21, 0x0A, 0x06, // 228:1569
-    0x06, 0x2B, 0x0A, 0x06, // 229:1579
-    0x06, 0x35, 0x10, 0x09, // 230:1589
-    0x06, 0x45, 0x0A, 0x05, // 231:1605
-    0x06, 0x4F, 0x0A, 0x06, // 232:1615
-    0x06, 0x59, 0x0A, 0x06, // 233:1625
-    0x06, 0x63, 0x0A, 0x06, // 234:1635
-    0x06, 0x6D, 0x0A, 0x06, // 235:1645
-    0x06, 0x77, 0x05, 0x03, // 236:1655
-    0x06, 0x7C, 0x04, 0x03, // 237:1660
-    0x06, 0x80, 0x05, 0x03, // 238:1664
-    0x06, 0x85, 0x05, 0x03, // 239:1669
-    0x06, 0x8A, 0x0A, 0x06, // 240:1674
-    0x06, 0x94, 0x0A, 0x06, // 241:1684
-    0x06, 0x9E, 0x0A, 0x06, // 242:1694
-    0x06, 0xA8, 0x0A, 0x06, // 243:1704
-    0x06, 0xB2, 0x0A, 0x06, // 244:1714
-    0x06, 0xBC, 0x0A, 0x06, // 245:1724
-    0x06, 0xC6, 0x0A, 0x06, // 246:1734
-    0x06, 0xD0, 0x09, 0x05, // 247:1744
-    0x06, 0xD9, 0x0A, 0x06, // 248:1753
-    0x06, 0xE3, 0x0A, 0x06, // 249:1763
-    0x06, 0xED, 0x0A, 0x06, // 250:1773
-    0x06, 0xF7, 0x0A, 0x06, // 251:1783
-    0x07, 0x01, 0x0A, 0x06, // 252:1793
-    0x07, 0x0B, 0x09, 0x05, // 253:1803
-    0x07, 0x14, 0x0A, 0x06, // 254:1812
-    0x07, 0x1E, 0x09, 0x05, // 255:1822
-
-    // Font Data:
-    0x00, 0x00, 0xF8, 0x02,                                                                                                 // 33
-    0x38, 0x00, 0x00, 0x00, 0x38,                                                                                           // 34
-    0xA0, 0x03, 0xE0, 0x00, 0xB8, 0x03, 0xE0, 0x00, 0xB8,                                                                   // 35
-    0x30, 0x01, 0x28, 0x02, 0xF8, 0x07, 0x48, 0x02, 0x90, 0x01,                                                             // 36
-    0x00, 0x00, 0x30, 0x00, 0x48, 0x00, 0x30, 0x03, 0xC0, 0x00, 0xB0, 0x01, 0x48, 0x02, 0x80, 0x01,                         // 37
-    0x80, 0x01, 0x50, 0x02, 0x68, 0x02, 0xA8, 0x02, 0x18, 0x01, 0x80, 0x03, 0x80, 0x02,                                     // 38
-    0x38,                                                                                                                   // 39
-    0xE0, 0x03, 0x10, 0x04, 0x08, 0x08,                                                                                     // 40
-    0x08, 0x08, 0x10, 0x04, 0xE0, 0x03,                                                                                     // 41
-    0x28, 0x00, 0x18, 0x00, 0x28,                                                                                           // 42
-    0x40, 0x00, 0x40, 0x00, 0xF0, 0x01, 0x40, 0x00, 0x40,                                                                   // 43
-    0x00, 0x00, 0x00, 0x06,                                                                                                 // 44
-    0x80, 0x00, 0x80,                                                                                                       // 45
-    0x00, 0x00, 0x00, 0x02,                                                                                                 // 46
-    0x00, 0x03, 0xE0, 0x00, 0x18,                                                                                           // 47
-    0xF0, 0x01, 0x08, 0x02, 0x08, 0x02, 0x08, 0x02, 0xF0, 0x01,                                                             // 48
-    0x00, 0x00, 0x20, 0x00, 0x10, 0x00, 0xF8, 0x03,                                                                         // 49
-    0x10, 0x02, 0x08, 0x03, 0x88, 0x02, 0x48, 0x02, 0x30, 0x02,                                                             // 50
-    0x10, 0x01, 0x08, 0x02, 0x48, 0x02, 0x48, 0x02, 0xB0, 0x01,                                                             // 51
-    0xC0, 0x00, 0xA0, 0x00, 0x90, 0x00, 0x88, 0x00, 0xF8, 0x03, 0x80,                                                       // 52
-    0x60, 0x01, 0x38, 0x02, 0x28, 0x02, 0x28, 0x02, 0xC8, 0x01,                                                             // 53
-    0xF0, 0x01, 0x28, 0x02, 0x28, 0x02, 0x28, 0x02, 0xD0, 0x01,                                                             // 54
-    0x08, 0x00, 0x08, 0x03, 0xC8, 0x00, 0x38, 0x00, 0x08,                                                                   // 55
-    0xB0, 0x01, 0x48, 0x02, 0x48, 0x02, 0x48, 0x02, 0xB0, 0x01,                                                             // 56
-    0x70, 0x01, 0x88, 0x02, 0x88, 0x02, 0x88, 0x02, 0xF0, 0x01,                                                             // 57
-    0x00, 0x00, 0x20, 0x02,                                                                                                 // 58
-    0x00, 0x00, 0x20, 0x06,                                                                                                 // 59
-    0x00, 0x00, 0x40, 0x00, 0xA0, 0x00, 0xA0, 0x00, 0x10, 0x01,                                                             // 60
-    0xA0, 0x00, 0xA0, 0x00, 0xA0, 0x00, 0xA0, 0x00, 0xA0,                                                                   // 61
-    0x00, 0x00, 0x10, 0x01, 0xA0, 0x00, 0xA0, 0x00, 0x40,                                                                   // 62
-    0x10, 0x00, 0x08, 0x00, 0x08, 0x00, 0xC8, 0x02, 0x48, 0x00, 0x30,                                                       // 63
-    0x00, 0x00, 0xC0, 0x03, 0x30, 0x04, 0xD0, 0x09, 0x28, 0x0A, 0x28, 0x0A, 0xC8, 0x0B, 0x68, 0x0A, 0x10, 0x05, 0xE0, 0x04, // 64
-    0x00, 0x02, 0xC0, 0x01, 0xB0, 0x00, 0x88, 0x00, 0xB0, 0x00, 0xC0, 0x01, 0x00, 0x02,                                     // 65
-    0x00, 0x00, 0xF8, 0x03, 0x48, 0x02, 0x48, 0x02, 0x48, 0x02, 0xF0, 0x01,                                                 // 66
-    0x00, 0x00, 0xF0, 0x01, 0x08, 0x02, 0x08, 0x02, 0x08, 0x02, 0x10, 0x01,                                                 // 67
-    0x00, 0x00, 0xF8, 0x03, 0x08, 0x02, 0x08, 0x02, 0x10, 0x01, 0xE0,                                                       // 68
-    0x00, 0x00, 0xF8, 0x03, 0x48, 0x02, 0x48, 0x02, 0x48, 0x02, 0x48, 0x02,                                                 // 69
-    0x00, 0x00, 0xF8, 0x03, 0x48, 0x00, 0x48, 0x00, 0x08,                                                                   // 70
-    0x00, 0x00, 0xE0, 0x00, 0x10, 0x01, 0x08, 0x02, 0x48, 0x02, 0x50, 0x01, 0xC0,                                           // 71
-    0x00, 0x00, 0xF8, 0x03, 0x40, 0x00, 0x40, 0x00, 0x40, 0x00, 0xF8, 0x03,                                                 // 72
-    0x00, 0x00, 0xF8, 0x03,                                                                                                 // 73
-    0x00, 0x03, 0x00, 0x02, 0x00, 0x02, 0xF8, 0x01,                                                                         // 74
-    0x00, 0x00, 0xF8, 0x03, 0x80, 0x00, 0x60, 0x00, 0x90, 0x00, 0x08, 0x01, 0x00, 0x02,                                     // 75
-    0x00, 0x00, 0xF8, 0x03, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02,                                                 // 76
-    0x00, 0x00, 0xF8, 0x03, 0x30, 0x00, 0xC0, 0x01, 0x00, 0x02, 0xC0, 0x01, 0x30, 0x00, 0xF8, 0x03,                         // 77
-    0x00, 0x00, 0xF8, 0x03, 0x30, 0x00, 0x40, 0x00, 0x80, 0x01, 0xF8, 0x03,                                                 // 78
-    0x00, 0x00, 0xF0, 0x01, 0x08, 0x02, 0x08, 0x02, 0x08, 0x02, 0x08, 0x02, 0xF0, 0x01,                                     // 79
-    0x00, 0x00, 0xF8, 0x03, 0x48, 0x00, 0x48, 0x00, 0x48, 0x00, 0x30,                                                       // 80
-    0x00, 0x00, 0xF0, 0x01, 0x08, 0x02, 0x08, 0x02, 0x08, 0x03, 0x08, 0x03, 0xF0, 0x02,                                     // 81
-    0x00, 0x00, 0xF8, 0x03, 0x48, 0x00, 0x48, 0x00, 0xC8, 0x00, 0x30, 0x03,                                                 // 82
-    0x00, 0x00, 0x30, 0x01, 0x48, 0x02, 0x48, 0x02, 0x48, 0x02, 0x90, 0x01,                                                 // 83
-    0x00, 0x00, 0x08, 0x00, 0x08, 0x00, 0xF8, 0x03, 0x08, 0x00, 0x08,                                                       // 84
-    0x00, 0x00, 0xF8, 0x01, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0xF8, 0x01,                                                 // 85
-    0x08, 0x00, 0x70, 0x00, 0x80, 0x01, 0x00, 0x02, 0x80, 0x01, 0x70, 0x00, 0x08,                                           // 86
-    0x18, 0x00, 0xE0, 0x01, 0x00, 0x02, 0xF0, 0x01, 0x08, 0x00, 0xF0, 0x01, 0x00, 0x02, 0xE0, 0x01, 0x18,                   // 87
-    0x00, 0x02, 0x08, 0x01, 0x90, 0x00, 0x60, 0x00, 0x90, 0x00, 0x08, 0x01, 0x00, 0x02,                                     // 88
-    0x08, 0x00, 0x10, 0x00, 0x20, 0x00, 0xC0, 0x03, 0x20, 0x00, 0x10, 0x00, 0x08,                                           // 89
-    0x08, 0x03, 0x88, 0x02, 0xC8, 0x02, 0x68, 0x02, 0x38, 0x02, 0x18, 0x02,                                                 // 90
-    0x00, 0x00, 0xF8, 0x0F, 0x08, 0x08,                                                                                     // 91
-    0x18, 0x00, 0xE0, 0x00, 0x00, 0x03,                                                                                     // 92
-    0x08, 0x08, 0xF8, 0x0F,                                                                                                 // 93
-    0x40, 0x00, 0x30, 0x00, 0x08, 0x00, 0x30, 0x00, 0x40,                                                                   // 94
-    0x00, 0x08, 0x00, 0x08, 0x00, 0x08, 0x00, 0x08, 0x00, 0x08, 0x00, 0x08,                                                 // 95
-    0x08, 0x00, 0x10,                                                                                                       // 96
-    0x00, 0x00, 0x00, 0x03, 0xA0, 0x02, 0xA0, 0x02, 0xE0, 0x03,                                                             // 97
-    0x00, 0x00, 0xF8, 0x03, 0x20, 0x02, 0x20, 0x02, 0xC0, 0x01,                                                             // 98
-    0x00, 0x00, 0xC0, 0x01, 0x20, 0x02, 0x20, 0x02, 0x40, 0x01,                                                             // 99
-    0x00, 0x00, 0xC0, 0x01, 0x20, 0x02, 0x20, 0x02, 0xF8, 0x03,                                                             // 100
-    0x00, 0x00, 0xC0, 0x01, 0xA0, 0x02, 0xA0, 0x02, 0xC0, 0x02,                                                             // 101
-    0x20, 0x00, 0xF0, 0x03, 0x28,                                                                                           // 102
-    0x00, 0x00, 0xC0, 0x05, 0x20, 0x0A, 0x20, 0x0A, 0xE0, 0x07,                                                             // 103
-    0x00, 0x00, 0xF8, 0x03, 0x20, 0x00, 0x20, 0x00, 0xC0, 0x03,                                                             // 104
-    0x00, 0x00, 0xE8, 0x03,                                                                                                 // 105
-    0x00, 0x08, 0xE8, 0x07,                                                                                                 // 106
-    0xF8, 0x03, 0x80, 0x00, 0xC0, 0x01, 0x20, 0x02,                                                                         // 107
-    0x00, 0x00, 0xF8, 0x03,                                                                                                 // 108
-    0x00, 0x00, 0xE0, 0x03, 0x20, 0x00, 0x20, 0x00, 0xE0, 0x03, 0x20, 0x00, 0x20, 0x00, 0xC0, 0x03,                         // 109
-    0x00, 0x00, 0xE0, 0x03, 0x20, 0x00, 0x20, 0x00, 0xC0, 0x03,                                                             // 110
-    0x00, 0x00, 0xC0, 0x01, 0x20, 0x02, 0x20, 0x02, 0xC0, 0x01,                                                             // 111
-    0x00, 0x00, 0xE0, 0x0F, 0x20, 0x02, 0x20, 0x02, 0xC0, 0x01,                                                             // 112
-    0x00, 0x00, 0xC0, 0x01, 0x20, 0x02, 0x20, 0x02, 0xE0, 0x0F,                                                             // 113
-    0x00, 0x00, 0xE0, 0x03, 0x20,                                                                                           // 114
-    0x40, 0x02, 0xA0, 0x02, 0xA0, 0x02, 0x20, 0x01,                                                                         // 115
-    0x20, 0x00, 0xF8, 0x03, 0x20, 0x02,                                                                                     // 116
-    0x00, 0x00, 0xE0, 0x01, 0x00, 0x02, 0x00, 0x02, 0xE0, 0x03,                                                             // 117
-    0x20, 0x00, 0xC0, 0x01, 0x00, 0x02, 0xC0, 0x01, 0x20,                                                                   // 118
-    0xE0, 0x01, 0x00, 0x02, 0xC0, 0x01, 0x20, 0x00, 0xC0, 0x01, 0x00, 0x02, 0xE0, 0x01,                                     // 119
-    0x20, 0x02, 0x40, 0x01, 0x80, 0x00, 0x40, 0x01, 0x20, 0x02,                                                             // 120
-    0x20, 0x00, 0xC0, 0x09, 0x00, 0x06, 0xC0, 0x01, 0x20,                                                                   // 121
-    0x20, 0x02, 0x20, 0x03, 0xA0, 0x02, 0x60, 0x02, 0x20, 0x02,                                                             // 122
-    0x80, 0x00, 0x78, 0x0F, 0x08, 0x08,                                                                                     // 123
-    0x00, 0x00, 0xF8, 0x0F,                                                                                                 // 124
-    0x08, 0x08, 0x78, 0x0F, 0x80,                                                                                           // 125
-    0xC0, 0x00, 0x40, 0x00, 0xC0, 0x00, 0x80, 0x00, 0xC0,                                                                   // 126
-    0x00, 0x00, 0xA0, 0x0F,                                                                                                 // 161
-    0x00, 0x00, 0xC0, 0x01, 0xA0, 0x0F, 0x78, 0x02, 0x40, 0x01,                                                             // 162
-    0x40, 0x02, 0x70, 0x03, 0xC8, 0x02, 0x48, 0x02, 0x08, 0x02, 0x10, 0x02,                                                 // 163
-    0x00, 0x00, 0xE0, 0x01, 0x20, 0x01, 0x20, 0x01, 0xE0, 0x01,                                                             // 164
-    0x48, 0x01, 0x70, 0x01, 0xC0, 0x03, 0x70, 0x01, 0x48, 0x01,                                                             // 165
-    0x00, 0x00, 0x38, 0x0F,                                                                                                 // 166
-    0xD0, 0x04, 0x28, 0x09, 0x48, 0x09, 0x48, 0x0A, 0x90, 0x05,                                                             // 167
-    0x08, 0x00, 0x00, 0x00, 0x08,                                                                                           // 168
-    0xE0, 0x00, 0x10, 0x01, 0x48, 0x02, 0xA8, 0x02, 0xA8, 0x02, 0x10, 0x01, 0xE0,                                           // 169
-    0x68, 0x00, 0x68, 0x00, 0x68, 0x00, 0x78,                                                                               // 170
-    0x00, 0x00, 0x80, 0x01, 0x40, 0x02, 0x80, 0x01, 0x40, 0x02,                                                             // 171
-    0x20, 0x00, 0x20, 0x00, 0x20, 0x00, 0x20, 0x00, 0xE0,                                                                   // 172
-    0x80, 0x00, 0x80,                                                                                                       // 173
-    0xE0, 0x00, 0x10, 0x01, 0xE8, 0x02, 0x68, 0x02, 0xC8, 0x02, 0x10, 0x01, 0xE0,                                           // 174
-    0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02,                                                       // 175
-    0x00, 0x00, 0x38, 0x00, 0x28, 0x00, 0x38,                                                                               // 176
-    0x40, 0x02, 0x40, 0x02, 0xF0, 0x03, 0x40, 0x02, 0x40, 0x02,                                                             // 177
-    0x48, 0x00, 0x68, 0x00, 0x58,                                                                                           // 178
-    0x48, 0x00, 0x58, 0x00, 0x68,                                                                                           // 179
-    0x00, 0x00, 0x10, 0x00, 0x08,                                                                                           // 180
-    0x00, 0x00, 0xE0, 0x0F, 0x00, 0x02, 0x00, 0x02, 0xE0, 0x03,                                                             // 181
-    0x70, 0x00, 0xF8, 0x0F, 0x08, 0x00, 0xF8, 0x0F, 0x08,                                                                   // 182
-    0x00, 0x00, 0x40,                                                                                                       // 183
-    0x00, 0x00, 0x00, 0x14, 0x00, 0x18,                                                                                     // 184
-    0x00, 0x00, 0x10, 0x00, 0x78,                                                                                           // 185
-    0x30, 0x00, 0x48, 0x00, 0x48, 0x00, 0x30,                                                                               // 186
-    0x00, 0x00, 0x40, 0x02, 0x80, 0x01, 0x40, 0x02, 0x80, 0x01,                                                             // 187
-    0x00, 0x00, 0x10, 0x02, 0x78, 0x01, 0xC0, 0x00, 0x20, 0x01, 0x90, 0x01, 0xC8, 0x03, 0x00, 0x01,                         // 188
-    0x00, 0x00, 0x10, 0x02, 0x78, 0x01, 0x80, 0x00, 0x60, 0x00, 0x50, 0x02, 0x48, 0x03, 0xC0, 0x02,                         // 189
-    0x48, 0x00, 0x58, 0x00, 0x68, 0x03, 0x80, 0x00, 0x60, 0x01, 0x90, 0x01, 0xC8, 0x03, 0x00, 0x01,                         // 190
-    0x00, 0x00, 0x00, 0x06, 0x00, 0x09, 0xA0, 0x09, 0x00, 0x04,                                                             // 191
-    0x00, 0x02, 0xC0, 0x01, 0xB0, 0x00, 0x89, 0x00, 0xB2, 0x00, 0xC0, 0x01, 0x00, 0x02,                                     // 192
-    0x00, 0x02, 0xC0, 0x01, 0xB0, 0x00, 0x8A, 0x00, 0xB1, 0x00, 0xC0, 0x01, 0x00, 0x02,                                     // 193
-    0x00, 0x02, 0xC0, 0x01, 0xB2, 0x00, 0x89, 0x00, 0xB2, 0x00, 0xC0, 0x01, 0x00, 0x02,                                     // 194
-    0x00, 0x02, 0xC2, 0x01, 0xB1, 0x00, 0x8A, 0x00, 0xB1, 0x00, 0xC0, 0x01, 0x00, 0x02,                                     // 195
-    0x00, 0x02, 0xC0, 0x01, 0xB2, 0x00, 0x88, 0x00, 0xB2, 0x00, 0xC0, 0x01, 0x00, 0x02,                                     // 196
-    0x00, 0x02, 0xC0, 0x01, 0xBE, 0x00, 0x8A, 0x00, 0xBE, 0x00, 0xC0, 0x01, 0x00, 0x02,                                     // 197
-    0x00, 0x03, 0xC0, 0x00, 0xE0, 0x00, 0x98, 0x00, 0x88, 0x00, 0xF8, 0x03, 0x48, 0x02, 0x48, 0x02, 0x48, 0x02,             // 198
-    0x00, 0x00, 0xF0, 0x01, 0x08, 0x02, 0x08, 0x16, 0x08, 0x1A, 0x10, 0x01,                                                 // 199
-    0x00, 0x00, 0xF8, 0x03, 0x49, 0x02, 0x4A, 0x02, 0x48, 0x02, 0x48, 0x02,                                                 // 200
-    0x00, 0x00, 0xF8, 0x03, 0x48, 0x02, 0x4A, 0x02, 0x49, 0x02, 0x48, 0x02,                                                 // 201
-    0x00, 0x00, 0xFA, 0x03, 0x49, 0x02, 0x4A, 0x02, 0x48, 0x02, 0x48, 0x02,                                                 // 202
-    0x00, 0x00, 0xF8, 0x03, 0x4A, 0x02, 0x48, 0x02, 0x4A, 0x02, 0x48, 0x02,                                                 // 203
-    0x00, 0x00, 0xF9, 0x03, 0x02,                                                                                           // 204
-    0x02, 0x00, 0xF9, 0x03,                                                                                                 // 205
-    0x01, 0x00, 0xFA, 0x03,                                                                                                 // 206
-    0x02, 0x00, 0xF8, 0x03, 0x02,                                                                                           // 207
-    0x40, 0x00, 0xF8, 0x03, 0x48, 0x02, 0x48, 0x02, 0x10, 0x01, 0xE0,                                                       // 208
-    0x00, 0x00, 0xFA, 0x03, 0x31, 0x00, 0x42, 0x00, 0x81, 0x01, 0xF8, 0x03,                                                 // 209
-    0x00, 0x00, 0xF0, 0x01, 0x08, 0x02, 0x09, 0x02, 0x0A, 0x02, 0x08, 0x02, 0xF0, 0x01,                                     // 210
-    0x00, 0x00, 0xF0, 0x01, 0x08, 0x02, 0x0A, 0x02, 0x09, 0x02, 0x08, 0x02, 0xF0, 0x01,                                     // 211
-    0x00, 0x00, 0xF0, 0x01, 0x08, 0x02, 0x0A, 0x02, 0x09, 0x02, 0x0A, 0x02, 0xF0, 0x01,                                     // 212
-    0x00, 0x00, 0xF0, 0x01, 0x0A, 0x02, 0x09, 0x02, 0x0A, 0x02, 0x09, 0x02, 0xF0, 0x01,                                     // 213
-    0x00, 0x00, 0xF0, 0x01, 0x0A, 0x02, 0x08, 0x02, 0x0A, 0x02, 0x08, 0x02, 0xF0, 0x01,                                     // 214
-    0x10, 0x01, 0xA0, 0x00, 0xE0, 0x00, 0xA0, 0x00, 0x10, 0x01,                                                             // 215
-    0x00, 0x00, 0xF0, 0x02, 0x08, 0x03, 0xC8, 0x02, 0x28, 0x02, 0x18, 0x03, 0xE8,                                           // 216
-    0x00, 0x00, 0xF8, 0x01, 0x01, 0x02, 0x02, 0x02, 0x00, 0x02, 0xF8, 0x01,                                                 // 217
-    0x00, 0x00, 0xF8, 0x01, 0x02, 0x02, 0x01, 0x02, 0x00, 0x02, 0xF8, 0x01,                                                 // 218
-    0x00, 0x00, 0xF8, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x02, 0xF8, 0x01,                                                 // 219
-    0x00, 0x00, 0xF8, 0x01, 0x02, 0x02, 0x00, 0x02, 0x02, 0x02, 0xF8, 0x01,                                                 // 220
-    0x08, 0x00, 0x10, 0x00, 0x20, 0x00, 0xC2, 0x03, 0x21, 0x00, 0x10, 0x00, 0x08,                                           // 221
-    0x00, 0x00, 0xF8, 0x03, 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, 0xE0,                                                       // 222
-    0x00, 0x00, 0xF0, 0x03, 0x08, 0x01, 0x48, 0x02, 0xB0, 0x02, 0x80, 0x01,                                                 // 223
-    0x00, 0x00, 0x00, 0x03, 0xA4, 0x02, 0xA8, 0x02, 0xE0, 0x03,                                                             // 224
-    0x00, 0x00, 0x00, 0x03, 0xA8, 0x02, 0xA4, 0x02, 0xE0, 0x03,                                                             // 225
-    0x00, 0x00, 0x00, 0x03, 0xA8, 0x02, 0xA4, 0x02, 0xE8, 0x03,                                                             // 226
-    0x00, 0x00, 0x08, 0x03, 0xA4, 0x02, 0xA8, 0x02, 0xE4, 0x03,                                                             // 227
-    0x00, 0x00, 0x00, 0x03, 0xA8, 0x02, 0xA0, 0x02, 0xE8, 0x03,                                                             // 228
-    0x00, 0x00, 0x00, 0x03, 0xAE, 0x02, 0xAA, 0x02, 0xEE, 0x03,                                                             // 229
-    0x00, 0x00, 0x40, 0x03, 0xA0, 0x02, 0xA0, 0x02, 0xC0, 0x01, 0xA0, 0x02, 0xA0, 0x02, 0xC0, 0x02,                         // 230
-    0x00, 0x00, 0xC0, 0x01, 0x20, 0x16, 0x20, 0x1A, 0x40, 0x01,                                                             // 231
-    0x00, 0x00, 0xC0, 0x01, 0xA4, 0x02, 0xA8, 0x02, 0xC0, 0x02,                                                             // 232
-    0x00, 0x00, 0xC0, 0x01, 0xA8, 0x02, 0xA4, 0x02, 0xC0, 0x02,                                                             // 233
-    0x00, 0x00, 0xC0, 0x01, 0xA8, 0x02, 0xA4, 0x02, 0xC8, 0x02,                                                             // 234
-    0x00, 0x00, 0xC0, 0x01, 0xA8, 0x02, 0xA0, 0x02, 0xC8, 0x02,                                                             // 235
-    0x00, 0x00, 0xE4, 0x03, 0x08,                                                                                           // 236
-    0x08, 0x00, 0xE4, 0x03,                                                                                                 // 237
-    0x08, 0x00, 0xE4, 0x03, 0x08,                                                                                           // 238
-    0x08, 0x00, 0xE0, 0x03, 0x08,                                                                                           // 239
-    0x00, 0x00, 0xC0, 0x01, 0x28, 0x02, 0x38, 0x02, 0xE0, 0x01,                                                             // 240
-    0x00, 0x00, 0xE8, 0x03, 0x24, 0x00, 0x28, 0x00, 0xC4, 0x03,                                                             // 241
-    0x00, 0x00, 0xC0, 0x01, 0x24, 0x02, 0x28, 0x02, 0xC0, 0x01,                                                             // 242
-    0x00, 0x00, 0xC0, 0x01, 0x28, 0x02, 0x24, 0x02, 0xC0, 0x01,                                                             // 243
-    0x00, 0x00, 0xC0, 0x01, 0x28, 0x02, 0x24, 0x02, 0xC8, 0x01,                                                             // 244
-    0x00, 0x00, 0xC8, 0x01, 0x24, 0x02, 0x28, 0x02, 0xC4, 0x01,                                                             // 245
-    0x00, 0x00, 0xC0, 0x01, 0x28, 0x02, 0x20, 0x02, 0xC8, 0x01,                                                             // 246
-    0x40, 0x00, 0x40, 0x00, 0x50, 0x01, 0x40, 0x00, 0x40,                                                                   // 247
-    0x00, 0x00, 0xC0, 0x02, 0xA0, 0x03, 0x60, 0x02, 0xA0, 0x01,                                                             // 248
-    0x00, 0x00, 0xE0, 0x01, 0x04, 0x02, 0x08, 0x02, 0xE0, 0x03,                                                             // 249
-    0x00, 0x00, 0xE0, 0x01, 0x08, 0x02, 0x04, 0x02, 0xE0, 0x03,                                                             // 250
-    0x00, 0x00, 0xE8, 0x01, 0x04, 0x02, 0x08, 0x02, 0xE0, 0x03,                                                             // 251
-    0x00, 0x00, 0xE0, 0x01, 0x08, 0x02, 0x00, 0x02, 0xE8, 0x03,                                                             // 252
-    0x20, 0x00, 0xC0, 0x09, 0x08, 0x06, 0xC4, 0x01, 0x20,                                                                   // 253
-    0x00, 0x00, 0xF8, 0x0F, 0x20, 0x02, 0x20, 0x02, 0xC0, 0x01,                                                             // 254
-    0x20, 0x00, 0xC8, 0x09, 0x00, 0x06, 0xC8, 0x01, 0x20                                                                    // 255
-};

src/input/InputBroker.cpp

@@ -0,0 +1,20 @@
+#include "InputBroker.h"
+#include "PowerFSM.h" // needed for event trigger
+
+InputBroker *inputBroker;
+
+InputBroker::InputBroker()
+{
+};
+
+void InputBroker::registerSource(Observable<const InputEvent *> *source)
+{
+    this->inputEventObserver.observe(source);
+}
+
+int InputBroker::handleInputEvent(const InputEvent *event)
+{
+  powerFSM.trigger(EVENT_INPUT);
+  this->notifyObservers(event);
+  return 0;
+}

src/input/InputBroker.h

@@ -0,0 +1,22 @@
+#pragma once
+#include "Observer.h"
+
+typedef struct _InputEvent {
+    const char* source;
+    char inputEvent;
+} InputEvent;
+class InputBroker :
+    public Observable<const InputEvent *>
+{
+    CallbackObserver<InputBroker, const InputEvent *> inputEventObserver =
+        CallbackObserver<InputBroker, const InputEvent *>(this, &InputBroker::handleInputEvent);
+
+  public:
+    InputBroker();
+    void registerSource(Observable<const InputEvent *> *source);
+
+  protected:
+    int handleInputEvent(const InputEvent *event);
+};
+
+extern InputBroker *inputBroker;

src/input/RotaryEncoderInterruptBase.cpp

@@ -0,0 +1,148 @@
+#include "configuration.h"
+#include "RotaryEncoderInterruptBase.h"
+
+RotaryEncoderInterruptBase::RotaryEncoderInterruptBase(
+    const char *name) :
+    concurrency::OSThread(name)
+{
+    this->_originName = name;
+}
+
+void RotaryEncoderInterruptBase::init(
+    uint8_t pinA, uint8_t pinB, uint8_t pinPress,
+    char eventCw, char eventCcw, char eventPressed,
+//    std::function<void(void)> onIntA, std::function<void(void)> onIntB, std::function<void(void)> onIntPress) :
+    void (*onIntA)(), void (*onIntB)(), void (*onIntPress)())
+{
+    this->_pinA = pinA;
+    this->_pinB = pinB;
+    this->_eventCw = eventCw;
+    this->_eventCcw = eventCcw;
+    this->_eventPressed = eventPressed;
+
+    pinMode(pinPress, INPUT_PULLUP);
+    pinMode(this->_pinA, INPUT_PULLUP);
+    pinMode(this->_pinB, INPUT_PULLUP);
+
+//    attachInterrupt(pinPress, onIntPress, RISING);
+    attachInterrupt(pinPress, onIntPress, RISING);
+    attachInterrupt(this->_pinA, onIntA, CHANGE);
+    attachInterrupt(this->_pinB, onIntB, CHANGE);
+
+    this->rotaryLevelA = digitalRead(this->_pinA);
+    this->rotaryLevelB = digitalRead(this->_pinB);
+    DEBUG_MSG("Rotary initialized (%d, %d, %d)\n",
+        this->_pinA, this->_pinB, pinPress);
+}
+
+
+int32_t RotaryEncoderInterruptBase::runOnce()
+{
+    InputEvent e;
+    e.inputEvent = InputEventChar_KEY_NONE;
+    e.source = this->_originName;
+
+    if (this->action == ROTARY_ACTION_PRESSED)
+    {
+        DEBUG_MSG("Rotary event Press\n");
+        e.inputEvent = this->_eventPressed;
+    }
+    else if (this->action == ROTARY_ACTION_CW)
+    {
+        DEBUG_MSG("Rotary event CW\n");
+        e.inputEvent = this->_eventCw;
+    }
+    else if (this->action == ROTARY_ACTION_CCW)
+    {
+        DEBUG_MSG("Rotary event CCW\n");
+        e.inputEvent = this->_eventCcw;
+    }
+
+    if (e.inputEvent != InputEventChar_KEY_NONE)
+    {
+        this->notifyObservers(&e);
+    }
+
+    this->action = ROTARY_ACTION_NONE;
+
+    return 30000; // TODO: technically this can be MAX_INT
+}
+
+
+void RotaryEncoderInterruptBase::intPressHandler()
+{
+    this->action = ROTARY_ACTION_PRESSED;
+    setIntervalFromNow(20); // TODO: this modifies a non-volatile variable!
+}
+
+void RotaryEncoderInterruptBase::intAHandler()
+{
+    // CW rotation (at least on most common rotary encoders)
+    int currentLevelA = digitalRead(this->_pinA);
+    if (this->rotaryLevelA == currentLevelA)
+    {
+        return;
+    }
+    this->rotaryLevelA = currentLevelA;
+    this->rotaryStateCCW = intHandler(
+        currentLevelA == HIGH,
+        this->rotaryLevelB,
+        ROTARY_ACTION_CCW,
+        this->rotaryStateCCW);
+}
+
+void RotaryEncoderInterruptBase::intBHandler()
+{
+    // CW rotation (at least on most common rotary encoders)
+    int currentLevelB = digitalRead(this->_pinB);
+    if (this->rotaryLevelB == currentLevelB)
+    {
+        return;
+    }
+    this->rotaryLevelB = currentLevelB;
+    this->rotaryStateCW = intHandler(
+        currentLevelB == HIGH,
+        this->rotaryLevelA,
+        ROTARY_ACTION_CW,
+        this->rotaryStateCW);
+}
+
+/**
+ * @brief Rotary action implementation.
+ *   We assume, the following pin setup:
+ *    A   --||
+ *    GND --||]======== 
+ *    B   --||
+ * 
+ * @return The new state for rotary pin.
+ */
+RotaryEncoderInterruptBaseStateType RotaryEncoderInterruptBase::intHandler(
+    bool actualPinRaising,
+    int otherPinLevel,
+    RotaryEncoderInterruptBaseActionType action,
+    RotaryEncoderInterruptBaseStateType state)
+{
+    RotaryEncoderInterruptBaseStateType newState =
+        state;
+    if (actualPinRaising && (otherPinLevel == LOW))
+    {
+        if (state == ROTARY_EVENT_CLEARED)
+        {
+            newState = ROTARY_EVENT_OCCURRED;
+            if ((this->action != ROTARY_ACTION_PRESSED)
+                && (this->action != action))
+            {
+                this->action = action;
+                DEBUG_MSG("Rotary action\n");
+            }
+        }
+    }
+    else if (!actualPinRaising && (otherPinLevel == HIGH))
+    {
+        // Logic to prevent bouncing.
+        newState = ROTARY_EVENT_CLEARED;
+    }
+    setIntervalFromNow(50); // TODO: this modifies a non-volatile variable!
+
+    return newState;
+}

src/input/RotaryEncoderInterruptBase.h

@@ -0,0 +1,57 @@
+#pragma once
+
+#include "SinglePortPlugin.h" // TODO: what header file to include?
+#include "InputBroker.h"
+
+enum RotaryEncoderInterruptBaseStateType
+{
+    ROTARY_EVENT_OCCURRED,
+    ROTARY_EVENT_CLEARED
+};
+
+enum RotaryEncoderInterruptBaseActionType
+{
+    ROTARY_ACTION_NONE,
+    ROTARY_ACTION_PRESSED,
+    ROTARY_ACTION_CW,
+    ROTARY_ACTION_CCW
+};
+
+class RotaryEncoderInterruptBase :
+    public Observable<const InputEvent *>,
+    private concurrency::OSThread
+{
+  public:
+    explicit RotaryEncoderInterruptBase(
+        const char *name);
+    void init(
+      uint8_t pinA, uint8_t pinB, uint8_t pinPress,
+      char eventCw, char eventCcw, char eventPressed,
+//        std::function<void(void)> onIntA, std::function<void(void)> onIntB, std::function<void(void)> onIntPress);
+        void (*onIntA)(), void (*onIntB)(), void (*onIntPress)());
+    void intPressHandler();
+    void intAHandler();
+    void intBHandler();
+
+  protected:
+    virtual int32_t runOnce() override;
+    RotaryEncoderInterruptBaseStateType intHandler(
+        bool actualPinRaising,
+        int otherPinLevel,
+        RotaryEncoderInterruptBaseActionType action,
+        RotaryEncoderInterruptBaseStateType state);
+
+    volatile RotaryEncoderInterruptBaseStateType rotaryStateCW = ROTARY_EVENT_CLEARED;
+    volatile RotaryEncoderInterruptBaseStateType rotaryStateCCW = ROTARY_EVENT_CLEARED;
+    volatile int rotaryLevelA = LOW;
+    volatile int rotaryLevelB = LOW;
+    volatile RotaryEncoderInterruptBaseActionType action = ROTARY_ACTION_NONE;
+
+  private:
+    uint8_t _pinA = 0;
+    uint8_t _pinB = 0;
+    char _eventCw = InputEventChar_KEY_NONE;
+    char _eventCcw = InputEventChar_KEY_NONE;
+    char _eventPressed = InputEventChar_KEY_NONE;
+    const char *_originName;
+};

src/input/RotaryEncoderInterruptImpl1.cpp

@@ -0,0 +1,51 @@
+#include "RotaryEncoderInterruptImpl1.h"
+#include "InputBroker.h"
+
+RotaryEncoderInterruptImpl1 *rotaryEncoderInterruptImpl1;
+
+RotaryEncoderInterruptImpl1::RotaryEncoderInterruptImpl1() :
+    RotaryEncoderInterruptBase(
+        "rotEnc1")
+{
+}
+
+void RotaryEncoderInterruptImpl1::init()
+{
+    if (!radioConfig.preferences.rotary1_enabled)
+    {
+        // Input device is disabled.
+        return;
+    }
+
+    uint8_t pinA = radioConfig.preferences.rotary1_pin_a;
+    uint8_t pinB = radioConfig.preferences.rotary1_pin_b;
+    uint8_t pinPress = radioConfig.preferences.rotary1_pin_press;
+    char eventCw =
+        static_cast<char>(radioConfig.preferences.rotary1_event_cw);
+    char eventCcw =
+        static_cast<char>(radioConfig.preferences.rotary1_event_ccw);
+    char eventPressed =
+        static_cast<char>(radioConfig.preferences.rotary1_event_press);
+
+    //radioConfig.preferences.ext_notification_plugin_output
+    RotaryEncoderInterruptBase::init(
+        pinA, pinB, pinPress,
+        eventCw, eventCcw, eventPressed,
+        RotaryEncoderInterruptImpl1::handleIntA,
+        RotaryEncoderInterruptImpl1::handleIntB,
+        RotaryEncoderInterruptImpl1::handleIntPressed);
+    inputBroker->registerSource(this);
+}
+
+void RotaryEncoderInterruptImpl1::handleIntA()
+{
+    rotaryEncoderInterruptImpl1->intAHandler();
+}
+void RotaryEncoderInterruptImpl1::handleIntB()
+{
+    rotaryEncoderInterruptImpl1->intBHandler();
+}
+void RotaryEncoderInterruptImpl1::handleIntPressed()
+{
+    rotaryEncoderInterruptImpl1->intPressHandler();
+}

src/input/RotaryEncoderInterruptImpl1.h

@@ -0,0 +1,22 @@
+#pragma once
+#include "RotaryEncoderInterruptBase.h"
+
+/**
+ * @brief The idea behind this class to have static methods for the event handlers.
+ *      Check attachInterrupt() at RotaryEncoderInteruptBase.cpp
+ *      Technically you can have as many rotary encoders hardver attached
+ *      to your device as you wish, but you always need to have separate event
+ *      handlers, thus you need to have a RotaryEncoderInterrupt implementation.
+ */
+class RotaryEncoderInterruptImpl1 :
+    public RotaryEncoderInterruptBase
+{
+  public:
+    RotaryEncoderInterruptImpl1();
+    void init();
+    static void handleIntA();
+    static void handleIntB();
+    static void handleIntPressed();
+};
+
+extern RotaryEncoderInterruptImpl1 *rotaryEncoderInterruptImpl1;

src/main.cpp

@@ -42,9 +42,6 @@
 #include "SX1268Interface.h"
 #include "LLCC68Interface.h"
 
-#ifdef NRF52_SERIES
-#include "variant.h"
-#endif
 
 using namespace concurrency;
 
@@ -144,7 +141,7 @@ class PowerFSMThread : public OSThread
     PowerFSMThread() : OSThread("PowerFSM") {}
 
   protected:
-    int32_t runOnce()
+    int32_t runOnce() override
     {
         powerFSM.run_machine();
 
@@ -245,7 +242,7 @@ class ButtonThread : public OSThread
 
   protected:
     /// If the button is pressed we suppress CPU sleep until release
-    int32_t runOnce()
+    int32_t runOnce() override
     {
         canSleep = true; // Assume we should not keep the board awake
 
@@ -298,13 +295,18 @@ class ButtonThread : public OSThread
     static void userButtonPressed()
     {
         // DEBUG_MSG("press!\n");
-        powerFSM.trigger(EVENT_PRESS);
+#ifdef BUTTON_PIN
+        if ((BUTTON_PIN != radioConfig.preferences.rotary1_pin_press) || !radioConfig.preferences.canned_message_plugin_enabled) {
+            powerFSM.trigger(EVENT_PRESS);
+        }
+#endif
     }
     static void userButtonPressedLong()
     {
         // DEBUG_MSG("Long press!\n");
+#ifndef NRF52_SERIES
         screen->adjustBrightness();
-
+#endif
         // If user button is held down for 5 seconds, shutdown the device.
         if (millis() - longPressTime > 5 * 1000) {
 #ifdef TBEAM_V10
@@ -316,6 +318,7 @@ class ButtonThread : public OSThread
             // Do actual shutdown when button released, otherwise the button release
             // may wake the board immediatedly.
             if (!shutdown_on_long_stop) {
+                screen->startShutdownScreen();
                 DEBUG_MSG("Shutdown from long press");
                 playBeep();
                 ledOff(PIN_LED1);
@@ -341,6 +344,9 @@ class ButtonThread : public OSThread
     {
 #ifndef NO_ESP32
         clearNVS();
+#endif
+#ifdef NRF52_SERIES
+        clearBonds();
 #endif
     }
 
@@ -357,6 +363,7 @@ class ButtonThread : public OSThread
         longPressTime = 0;
         if (shutdown_on_long_stop) {
             playShutdownMelody();
+            delay(3000);
             power->shutdown();
         }
     }
@@ -658,16 +665,16 @@ void setup()
 
     if (!rIf)
         RECORD_CRITICALERROR(CriticalErrorCode_NoRadio);
-    else
+    else{
         router->addInterface(rIf);
 
-    // Calculate and save the bit rate to myNodeInfo
+        // Calculate and save the bit rate to myNodeInfo
-    // TODO: This needs to be added what ever method changes the channel from the phone.
+        // TODO: This needs to be added what ever method changes the channel from the phone.
-    myNodeInfo.bitrate = (float(Constants_DATA_PAYLOAD_LEN) / 
+        myNodeInfo.bitrate = (float(Constants_DATA_PAYLOAD_LEN) /
-                    (float(rIf->getPacketTime(Constants_DATA_PAYLOAD_LEN)))
+                        (float(rIf->getPacketTime(Constants_DATA_PAYLOAD_LEN)))
-                    ) * 1000;
+                        ) * 1000;
-    DEBUG_MSG("myNodeInfo.bitrate = %f bytes / sec\n", myNodeInfo.bitrate);
+        DEBUG_MSG("myNodeInfo.bitrate = %f bytes / sec\n", myNodeInfo.bitrate);
-
+    }
 
     // This must be _after_ service.init because we need our preferences loaded from flash to have proper timeout values
     PowerFSM_setup(); // we will transition to ON in a couple of seconds, FIXME, only do this for cold boots, not waking from SDS
@@ -699,17 +706,44 @@ axpDebugOutput.setup();
 #endif
 
 uint32_t rebootAtMsec; // If not zero we will reboot at this time (used to reboot shortly after the update completes)
+uint32_t shutdownAtMsec; // If not zero we will shutdown at this time (used to shutdown from python or mobile client)
 
-void rebootCheck()
+void powerCommandsCheck()
 {
     if (rebootAtMsec && millis() > rebootAtMsec) {
 #ifndef NO_ESP32
         DEBUG_MSG("Rebooting for update\n");
         ESP.restart();
+#elif NRF52_SERIES
+    NVIC_SystemReset();
 #else
         DEBUG_MSG("FIXME implement reboot for this platform");
 #endif
     }
+
+#if NRF52_SERIES
+    if (shutdownAtMsec) {
+        screen->startShutdownScreen();
+        playBeep();
+        ledOff(PIN_LED1);
+        ledOff(PIN_LED2);
+    }
+#endif
+
+    if (shutdownAtMsec && millis() > shutdownAtMsec) {
+        DEBUG_MSG("Shutting down from admin command\n");
+#ifdef TBEAM_V10
+        if (axp192_found == true) {
+            setLed(false);
+            power->shutdown();
+        }
+#elif NRF52_SERIES
+        playShutdownMelody();
+        power->shutdown();
+#else
+        DEBUG_MSG("FIXME implement shutdown for this platform");
+#endif
+    }
 }
 
 // If a thread does something that might need for it to be rescheduled ASAP it can set this flag
@@ -730,7 +764,7 @@ void loop()
 #ifdef NRF52_SERIES
     nrf52Loop();
 #endif
-    rebootCheck();
+    powerCommandsCheck();
 
     // For debugging
     // if (rIf) ((RadioLibInterface *)rIf)->isActivelyReceiving();

src/main.h

@@ -21,9 +21,10 @@ extern graphics::Screen *screen;
 const char *getDeviceName();
 
 extern uint32_t rebootAtMsec;
+extern uint32_t shutdownAtMsec;
 
 // If a thread does something that might need for it to be rescheduled ASAP it can set this flag
 // This will supress the current delay and instead try to run ASAP.
 extern bool runASAP;
 
-void nrf52Setup(), esp32Setup(), nrf52Loop(), esp32Loop();
+void nrf52Setup(), esp32Setup(), nrf52Loop(), esp32Loop(), clearBonds();

src/memtest.cpp

@@ -247,7 +247,7 @@ static int mem_test(uint32_t *_start, size_t len, bool doRead = true, bool doWri
 {
     volatile uint32_t *addr;
     volatile uint32_t *start = (volatile uint32_t *)_start;
-    volatile uint32_t *end = start + len / sizeof(uint32_t);
+    const volatile uint32_t *end = start + len / sizeof(uint32_t);
     uint32_t pattern = 0;
     uint32_t val;
     uint32_t readback;
@@ -315,4 +315,4 @@ void doMemTest()
         assert(0); // FIXME report error better
 
     iter++;
-}
+}

src/mesh/Channels.cpp

@@ -102,7 +102,7 @@ void Channels::initDefaultChannel(ChannelIndex chIndex)
 CryptoKey Channels::getKey(ChannelIndex chIndex)
 {
     Channel &ch = getByIndex(chIndex);
-    ChannelSettings &channelSettings = ch.settings;
+    const ChannelSettings &channelSettings = ch.settings;
     assert(ch.has_settings);
 
     CryptoKey k;
@@ -206,7 +206,7 @@ void Channels::setChannel(const Channel &c)
 const char *Channels::getName(size_t chIndex)
 {
     // Convert the short "" representation for Default into a usable string
-    ChannelSettings &channelSettings = getByIndex(chIndex).settings;
+    const ChannelSettings &channelSettings = getByIndex(chIndex).settings;
     const char *channelName = channelSettings.name;
     if (!*channelName) { // emptystring
         // Per mesh.proto spec, if bandwidth is specified we must ignore modemConfig enum, we assume that in that case

src/mesh/Channels.h

@@ -26,9 +26,12 @@ class Channels
     ChannelIndex activeChannelIndex = 0;
 
     /// the precomputed hashes for each of our channels, or -1 for invalid
-    int16_t hashes[MAX_NUM_CHANNELS];
+    int16_t hashes[MAX_NUM_CHANNELS] = {};
 
   public:
+
+    Channels() {}
+
     /// Well known channel names
     static const char *adminChannel, *gpioChannel, *serialChannel;
 
@@ -134,4 +137,4 @@ class Channels
 };
 
 /// Singleton channel table
-extern Channels channels;
+extern Channels channels;

src/mesh/CryptoEngine.h

@@ -20,9 +20,9 @@ class CryptoEngine
 {
   protected:
     /** Our per packet nonce */
-    uint8_t nonce[16];
+    uint8_t nonce[16] = {0};
 
-    CryptoKey key;
+    CryptoKey key = {};
 
   public:
     virtual ~CryptoEngine() {}

src/mesh/DSRRouter.h

@@ -8,14 +8,14 @@ class DSRRouter : public ReliableRouter
      * Every (non duplicate) packet this node receives will be passed through this method.  This allows subclasses to
      * update routing tables etc... based on what we overhear (even for messages not destined to our node)
      */
-    virtual void sniffReceived(const MeshPacket *p, const Routing *c);
+    virtual void sniffReceived(const MeshPacket *p, const Routing *c) override;
 
     /**
      * Send a packet on a suitable interface.  This routine will
      * later free() the packet to pool.  This routine is not allowed to stall.
      * If the txmit queue is full it might return an error
      */
-    virtual ErrorCode send(MeshPacket *p);
+    virtual ErrorCode send(MeshPacket *p) override;
 
   private:
     /**
@@ -77,4 +77,4 @@ class DSRRouter : public ReliableRouter
      *  when the discovery is complete.
      */
     void startDiscovery(NodeNum dest);
-};
+};

src/mesh/FloodingRouter.h

@@ -41,7 +41,7 @@ class FloodingRouter : public Router, protected PacketHistory
      * later free() the packet to pool.  This routine is not allowed to stall.
      * If the txmit queue is full it might return an error
      */
-    virtual ErrorCode send(MeshPacket *p);
+    virtual ErrorCode send(MeshPacket *p) override;
 
   protected:
     /**
@@ -50,10 +50,10 @@ class FloodingRouter : public Router, protected PacketHistory
      * Called immedately on receiption, before any further processing.
      * @return true to abandon the packet
      */
-    virtual bool shouldFilterReceived(MeshPacket *p);
+    virtual bool shouldFilterReceived(MeshPacket *p) override;
 
     /**
      * Look for broadcasts we need to rebroadcast
      */
-    virtual void sniffReceived(const MeshPacket *p, const Routing *c);
+    virtual void sniffReceived(const MeshPacket *p, const Routing *c) override;
 };

src/mesh/MemoryPool.h

@@ -58,7 +58,7 @@ template <class T> class MemoryDynamic : public Allocator<T>
 {
   public:
     /// Return a buffer for use by others
-    virtual void release(T *p)
+    virtual void release(T *p) override
     {
         assert(p);
         free(p);
@@ -66,7 +66,7 @@ template <class T> class MemoryDynamic : public Allocator<T>
 
   protected:
     // Alloc some storage
-    virtual T *alloc(TickType_t maxWait)
+    virtual T *alloc(TickType_t maxWait) override
     {
         T *p = (T *)malloc(sizeof(T));
         assert(p);
@@ -87,7 +87,7 @@ template <class T> class MemoryPool : public Allocator<T>
     size_t maxElements;
 
   public:
-    MemoryPool(size_t _maxElements) : dead(_maxElements), maxElements(_maxElements)
+    explicit MemoryPool(size_t _maxElements) : dead(_maxElements), maxElements(_maxElements)
     {
         buf = new T[maxElements];
 
@@ -99,7 +99,7 @@ template <class T> class MemoryPool : public Allocator<T>
     ~MemoryPool() { delete[] buf; }
 
     /// Return a buffer for use by others
-    virtual void release(T *p)
+    void release(T *p)
     {
         assert(p >= buf &&
                (size_t)(p - buf) <

src/mesh/MeshPacketQueue.h

@@ -18,7 +18,7 @@ class MeshPacketQueue
     bool replaceLowerPriorityPacket(MeshPacket *mp);
 
   public:
-    MeshPacketQueue(size_t _maxLen);
+    explicit MeshPacketQueue(size_t _maxLen);
 
     /** enqueue a packet, return false if full */
     bool enqueue(MeshPacket *p);
@@ -30,4 +30,4 @@ class MeshPacketQueue
 
     /** Attempt to find and remove a packet from this queue.  Returns the packet which was removed from the queue */
     MeshPacket *remove(NodeNum from, PacketId id);
-};
+};

src/mesh/MeshPlugin.cpp

@@ -235,3 +235,18 @@ std::vector<MeshPlugin *> MeshPlugin::GetMeshPluginsWithUIFrames()
     }
     return pluginsWithUIFrames;
 }
+
+void MeshPlugin::observeUIEvents(
+    Observer<const UIFrameEvent *> *observer)
+{
+    std::vector<MeshPlugin *> pluginsWithUIFrames;
+    for (auto i = plugins->begin(); i != plugins->end(); ++i) {
+        auto &pi = **i;
+        Observable<const UIFrameEvent *> *observable =
+            pi.getUIFrameObservable();
+        if (observable != NULL) {
+            DEBUG_MSG("Plugin wants a UI Frame\n");
+            observer->observe(observable);
+        }
+    }
+}

src/mesh/MeshPlugin.h

@@ -21,6 +21,14 @@ enum class ProcessMessage
   STOP = 1,
 };
 
+/*
+ * This struct is used by Screen to figure out whether screen frame should be updated.
+ */
+typedef struct _UIFrameEvent {
+    bool frameChanged;
+    bool needRedraw;
+} UIFrameEvent;
+
 /** A baseclass for any mesh "plugin".
  *
  * A plugin allows you to add new features to meshtastic device code, without needing to know messaging details.
@@ -48,6 +56,7 @@ class MeshPlugin
     static void callPlugins(const MeshPacket &mp, RxSource src = RX_SRC_RADIO);
 
     static std::vector<MeshPlugin *> GetMeshPluginsWithUIFrames();
+    static void observeUIEvents(Observer<const UIFrameEvent *> *observer);
 #ifndef NO_SCREEN
     virtual void drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y) { return; }
 #endif
@@ -119,6 +128,7 @@ class MeshPlugin
      * @return true if you want to be alloced a UI screen frame
      */
     virtual bool wantUIFrame() { return false; }
+    virtual Observable<const UIFrameEvent *>* getUIFrameObservable() { return NULL; }
 
     MeshPacket *allocAckNak(Routing_Error err, NodeNum to, PacketId idFrom, ChannelIndex chIndex);
 
@@ -144,4 +154,4 @@ class MeshPlugin
 /** set the destination and packet parameters of packet p intended as a reply to a particular "to" packet
  * This ensures that if the request packet was sent reliably, the reply is sent that way as well.
  */
-void setReplyTo(MeshPacket *p, const MeshPacket &to);
+void setReplyTo(MeshPacket *p, const MeshPacket &to);

src/mesh/MeshService.cpp

@@ -71,17 +71,7 @@ int MeshService::handleFromRadio(const MeshPacket *mp)
     printPacket("Forwarding to phone", mp);
     nodeDB.updateFrom(*mp); // update our DB state based off sniffing every RX packet from the radio
 
-    fromNum++;
+    sendToPhone((MeshPacket *)mp);
-
-    if (toPhoneQueue.numFree() == 0) {
-        DEBUG_MSG("NOTE: tophone queue is full, discarding oldest\n");
-        MeshPacket *d = toPhoneQueue.dequeuePtr(0);
-        if (d)
-            releaseToPool(d);
-    }
-
-    MeshPacket *copied = packetPool.allocCopy(*mp);
-    assert(toPhoneQueue.enqueue(copied, 0)); // FIXME, instead of failing for full queue, delete the oldest mssages
 
     return 0;
 }
@@ -161,12 +151,16 @@ bool MeshService::cancelSending(PacketId id)
     return router->cancelSending(nodeDB.getNodeNum(), id);
 }
 
-void MeshService::sendToMesh(MeshPacket *p, RxSource src)
+void MeshService::sendToMesh(MeshPacket *p, RxSource src, bool ccToPhone)
 {
     nodeDB.updateFrom(*p); // update our local DB for this packet (because phone might have sent position packets etc...)
 
     // Note: We might return !OK if our fifo was full, at that point the only option we have is to drop it
     router->sendLocal(p, src);
+
+    if (ccToPhone) {
+        sendToPhone(p);
+    }
 }
 
 void MeshService::sendNetworkPing(NodeNum dest, bool wantReplies)
@@ -213,6 +207,20 @@ NodeInfo *MeshService::refreshMyNodeInfo()
     return node;
 }
 
+void MeshService::sendToPhone(MeshPacket *p) {
+    if (toPhoneQueue.numFree() == 0) {
+        DEBUG_MSG("NOTE: tophone queue is full, discarding oldest\n");
+        MeshPacket *d = toPhoneQueue.dequeuePtr(0);
+        if (d)
+            releaseToPool(d);
+    }
+
+    MeshPacket *copied = packetPool.allocCopy(*p);
+    perhapsDecode(copied);
+    assert(toPhoneQueue.enqueue(copied, 0)); // FIXME, instead of failing for full queue, delete the oldest mssages
+    fromNum++;
+}
+
 int MeshService::onGPSChanged(const meshtastic::GPSStatus *newStatus)
 {
     // Update our local node info with our position (even if we don't decide to update anyone else)

src/mesh/MeshService.h

@@ -75,7 +75,7 @@ class MeshService
     /// Send a packet into the mesh - note p must have been allocated from packetPool.  We will return it to that pool after
     /// sending. This is the ONLY function you should use for sending messages into the mesh, because it also updates the nodedb
     /// cache
-    void sendToMesh(MeshPacket *p, RxSource src = RX_SRC_LOCAL);
+    void sendToMesh(MeshPacket *p, RxSource src = RX_SRC_LOCAL, bool ccToPhone = false);
 
     /** Attempt to cancel a previously sent packet from this _local_ node.  Returns true if a packet was found we could cancel */
     bool cancelSending(PacketId id);
@@ -83,6 +83,9 @@ class MeshService
     /// Pull the latest power and time info into my nodeinfo
     NodeInfo *refreshMyNodeInfo();
 
+    /// Send a packet to the phone
+    void sendToPhone(MeshPacket *p);
+
   private:
     /// Called when our gps position has changed - updates nodedb and sends Location message out into the mesh
     /// returns 0 to allow futher processing

src/mesh/NodeDB.cpp

@@ -26,6 +26,11 @@
 #include <nvs_flash.h>
 #endif
 
+#ifdef NRF52_SERIES
+#include <bluefruit.h>
+#include <utility/bonding.h>
+#endif
+
 NodeDB nodeDB;
 
 // we have plenty of ram so statically alloc this tempbuf (for now)
@@ -90,6 +95,25 @@ bool NodeDB::resetRadioConfig()
 #ifndef NO_ESP32
         // This will erase what's in NVS including ssl keys, persistant variables and ble pairing
         nvs_flash_erase();
+#endif
+#ifdef NRF52_SERIES
+
+        // first, remove the "/prefs" (this removes most prefs)
+        FS.rmdir_r("/prefs");
+        // second, install default state (this will deal with the duplicate mac address issue)
+        installDefaultDeviceState();
+        // third, write to disk
+        saveToDisk();
+
+        Bluefruit.begin();
+
+        DEBUG_MSG("Clearing bluetooth bonds!\n");
+        bond_print_list(BLE_GAP_ROLE_PERIPH);
+        bond_print_list(BLE_GAP_ROLE_CENTRAL);
+
+        Bluefruit.Periph.clearBonds();
+        Bluefruit.Central.clearBonds();
+
 #endif
         didFactoryReset = true;
     }
@@ -407,8 +431,8 @@ void NodeDB::saveToDisk()
 #ifdef FS
         FS.mkdir("/prefs");
 #endif
-        bool okay = saveProto(preffile, DeviceState_size, sizeof(devicestate), DeviceState_fields, &devicestate);
+        saveProto(preffile, DeviceState_size, sizeof(devicestate), DeviceState_fields, &devicestate);
-        okay &= saveProto(radiofile, RadioConfig_size, sizeof(RadioConfig), RadioConfig_fields, &radioConfig);
+        saveProto(radiofile, RadioConfig_size, sizeof(RadioConfig), RadioConfig_fields, &radioConfig);
         saveChannelsToDisk();
 
         // remove any pre 1.2 pref files, turn on after 1.2 is in beta
@@ -459,6 +483,9 @@ size_t NodeDB::getNumOnlineNodes()
 void NodeDB::updatePosition(uint32_t nodeId, const Position &p, RxSource src)
 {
     NodeInfo *info = getOrCreateNode(nodeId);
+    if (!info) {
+        return;
+    }
 
     if (src == RX_SRC_LOCAL) {
         // Local packet, fully authoritative
@@ -502,6 +529,9 @@ void NodeDB::updatePosition(uint32_t nodeId, const Position &p, RxSource src)
 void NodeDB::updateUser(uint32_t nodeId, const User &p)
 {
     NodeInfo *info = getOrCreateNode(nodeId);
+    if (!info) {
+        return;
+    }
 
     DEBUG_MSG("old user %s/%s/%s\n", info->user.id, info->user.long_name, info->user.short_name);
 
@@ -531,6 +561,9 @@ void NodeDB::updateFrom(const MeshPacket &mp)
         DEBUG_MSG("Update DB node 0x%x, rx_time=%u\n", mp.from, mp.rx_time);
 
         NodeInfo *info = getOrCreateNode(getFrom(&mp));
+        if (!info) {
+            return;
+        }
 
         if (mp.rx_time) // if the packet has a valid timestamp use it to update our last_heard
             info->last_heard = mp.rx_time;
@@ -557,8 +590,12 @@ NodeInfo *NodeDB::getOrCreateNode(NodeNum n)
     NodeInfo *info = getNode(n);
 
     if (!info) {
+        if (*numNodes >= MAX_NUM_NODES) {
+            screen->print("error: node_db full!\n");
+            DEBUG_MSG("ERROR! could not create new node, node_db is full! (%d nodes)", *numNodes);
+            return NULL;
+        }
         // add the node
-        assert(*numNodes < MAX_NUM_NODES);
         info = &nodes[(*numNodes)++];
 
         // everything is missing except the nodenum

src/mesh/PhoneAPI.h

@@ -45,7 +45,7 @@ class PhoneAPI
     /// We temporarily keep the nodeInfo here between the call to available and getFromRadio
     const NodeInfo *nodeInfoForPhone = NULL;
 
-    ToRadio toRadioScratch; // this is a static scratch object, any data must be copied elsewhere before returning
+    ToRadio toRadioScratch = {0}; // this is a static scratch object, any data must be copied elsewhere before returning
 
     /// Use to ensure that clients don't get confused about old messages from the radio
     uint32_t config_nonce = 0;
@@ -86,7 +86,7 @@ class PhoneAPI
 
   protected:
     /// Our fromradio packet while it is being assembled
-    FromRadio fromRadioScratch;
+    FromRadio fromRadioScratch = {};
 
     /** the last msec we heard from the client on the other side of this link */
     uint32_t lastContactMsec = 0;
@@ -123,5 +123,5 @@ class PhoneAPI
     bool handleToRadioPacket(MeshPacket &p);
 
     /// If the mesh service tells us fromNum has changed, tell the phone
-    virtual int onNotify(uint32_t newValue);
+    virtual int onNotify(uint32_t newValue) override;
 };

src/mesh/PointerQueue.h

@@ -8,7 +8,7 @@
 template <class T> class PointerQueue : public TypedQueue<T *>
 {
   public:
-    PointerQueue(int maxElements) : TypedQueue<T *>(maxElements) {}
+    explicit PointerQueue(int maxElements) : TypedQueue<T *>(maxElements) {}
 
     // returns a ptr or null if the queue was empty
     T *dequeuePtr(TickType_t maxWait = portMAX_DELAY)

src/mesh/ProtobufPlugin.h

@@ -51,7 +51,7 @@ template <class T> class ProtobufPlugin : protected SinglePortPlugin
 
     @return ProcessMessage::STOP if you've guaranteed you've handled this message and no other handlers should be considered for it
     */
-    virtual ProcessMessage handleReceived(const MeshPacket &mp)
+    virtual ProcessMessage handleReceived(const MeshPacket &mp) override
     {
         // FIXME - we currently update position data in the DB only if the message was a broadcast or destined to us
         // it would be better to update even if the message was destined to others.

src/mesh/RF95Interface.h

@@ -9,31 +9,31 @@
  */
 class RF95Interface : public RadioLibInterface
 {
-    RadioLibRF95 *lora; // Either a RFM95 or RFM96 depending on what was stuffed on this board
+    RadioLibRF95 *lora = NULL; // Either a RFM95 or RFM96 depending on what was stuffed on this board
 
   public:
     RF95Interface(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, SPIClass &spi);
 
-    bool isIRQPending() { return lora->getPendingIRQ(); }
+    bool isIRQPending() override { return lora->getPendingIRQ(); }
 
     /// Initialise the Driver transport hardware and software.
     /// Make sure the Driver is properly configured before calling init().
     /// \return true if initialisation succeeded.
-    virtual bool init();
+    virtual bool init() override;
 
     /// Apply any radio provisioning changes
     /// Make sure the Driver is properly configured before calling init().
     /// \return true if initialisation succeeded.
-    virtual bool reconfigure();
+    virtual bool reconfigure() override;
 
     /// Prepare hardware for sleep.  Call this _only_ for deep sleep, not needed for light sleep.
-    virtual bool sleep();
+    virtual bool sleep() override;
 
   protected:
     /**
      * Glue functions called from ISR land
      */
-    virtual void disableInterrupt();
+    virtual void disableInterrupt() override;
 
     /**
      * Enable a particular ISR callback glue function
@@ -41,26 +41,26 @@ class RF95Interface : public RadioLibInterface
     virtual void enableInterrupt(void (*callback)()) { lora->setDio0Action(callback); }
 
     /** are we actively receiving a packet (only called during receiving state) */
-    virtual bool isActivelyReceiving();
+    virtual bool isActivelyReceiving() override;
 
     /**
      * Start waiting to receive a message
      */
-    virtual void startReceive();
+    virtual void startReceive() override;
 
     /**
      * Add SNR data to received messages
      */
-    virtual void addReceiveMetadata(MeshPacket *mp);
+    virtual void addReceiveMetadata(MeshPacket *mp) override;
 
-    virtual void setStandby();
+    virtual void setStandby() override;
 
     /**
      *  We override to turn on transmitter power as needed.
      */
-    virtual void configHardwareForSend();
+    virtual void configHardwareForSend() override;
 
   private:
     /** Some boards require GPIO control of tx vs rx paths */
     void setTransmitEnable(bool txon);
-};
+};

src/mesh/RadioInterface.h

@@ -205,8 +205,8 @@ class RadioInterface
 class SimRadio : public RadioInterface
 {
   public:
-    virtual ErrorCode send(MeshPacket *p);
+    virtual ErrorCode send(MeshPacket *p) override;
 };
 
 /// Debug printing for packets
-void printPacket(const char *prefix, const MeshPacket *p);
+void printPacket(const char *prefix, const MeshPacket *p);

src/mesh/RadioLibInterface.h

@@ -4,10 +4,6 @@
 #include "RadioInterface.h"
 #include "MeshPacketQueue.h"
 
-#ifdef CubeCell_BoardPlus
-#define RADIOLIB_SOFTWARE_SERIAL_UNSUPPORTED
-#endif
-
 #define RADIOLIB_EXCLUDE_HTTP
 #include <RadioLib.h>
 
@@ -58,7 +54,7 @@ class LockingModule : public Module
 
     \param numBytes Number of bytes to transfer.
     */
-    virtual void SPItransfer(uint8_t cmd, uint8_t reg, uint8_t *dataOut, uint8_t *dataIn, uint8_t numBytes);
+    virtual void SPItransfer(uint8_t cmd, uint8_t reg, uint8_t *dataOut, uint8_t *dataIn, uint8_t numBytes) override;
 };
 
 class RadioLibInterface : public RadioInterface, protected concurrency::NotifiedWorkerThread
@@ -99,7 +95,7 @@ class RadioLibInterface : public RadioInterface, protected concurrency::Notified
     PhysicalLayer *iface;
 
     /// are _trying_ to receive a packet currently (note - we might just be waiting for one)
-    bool isReceiving;
+    bool isReceiving = false;
 
   public:
     /** Our ISR code currently needs this to find our active instance
@@ -120,14 +116,14 @@ class RadioLibInterface : public RadioInterface, protected concurrency::Notified
     RadioLibInterface(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, RADIOLIB_PIN_TYPE busy, SPIClass &spi,
                       PhysicalLayer *iface = NULL);
 
-    virtual ErrorCode send(MeshPacket *p);
+    virtual ErrorCode send(MeshPacket *p) override;
 
     /**
      * Return true if we think the board can go to sleep (i.e. our tx queue is empty, we are not sending or receiving)
      *
      * This method must be used before putting the CPU into deep or light sleep.
      */
-    virtual bool canSleep();
+    virtual bool canSleep() override;
 
     /**
      * Start waiting to receive a message
@@ -142,7 +138,7 @@ class RadioLibInterface : public RadioInterface, protected concurrency::Notified
     virtual bool isActivelyReceiving() = 0;
 
     /** Attempt to cancel a previously sent packet.  Returns true if a packet was found we could cancel */
-    virtual bool cancelSending(NodeNum from, PacketId id);
+    virtual bool cancelSending(NodeNum from, PacketId id) override;
 
   private:
     /** if we have something waiting to send, start a short random timer so we can come check for collision before actually doing
@@ -157,7 +153,7 @@ class RadioLibInterface : public RadioInterface, protected concurrency::Notified
 
     static void timerCallback(void *p1, uint32_t p2);
 
-    virtual void onNotify(uint32_t notification);
+    virtual void onNotify(uint32_t notification) override;
 
     /** start an immediate transmit
      *  This method is virtual so subclasses can hook as needed, subclasses should not call directly
@@ -187,4 +183,4 @@ class RadioLibInterface : public RadioInterface, protected concurrency::Notified
     virtual void addReceiveMetadata(MeshPacket *mp) = 0;
 
     virtual void setStandby() = 0;
-};
+};

src/mesh/RadioLibRF95.h

@@ -16,7 +16,7 @@ class RadioLibRF95: public SX1278 {
 
       \param mod Instance of Module that will be used to communicate with the %LoRa chip.
     */
-    RadioLibRF95(Module* mod);
+    explicit RadioLibRF95(Module* mod);
 
     // basic methods
 

src/mesh/ReliableRouter.h

@@ -13,7 +13,7 @@ struct GlobalPacketId {
 
     bool operator==(const GlobalPacketId &p) const { return node == p.node && id == p.id; }
 
-    GlobalPacketId(const MeshPacket *p)
+    explicit GlobalPacketId(const MeshPacket *p)
     {
         node = getFrom(p);
         id = p->id;
@@ -33,10 +33,10 @@ struct PendingPacket {
     MeshPacket *packet;
 
     /** The next time we should try to retransmit this packet */
-    uint32_t nextTxMsec;
+    uint32_t nextTxMsec = 0;
 
     /** Starts at NUM_RETRANSMISSIONS -1(normally 3) and counts down.  Once zero it will be removed from the list */
-    uint8_t numRetransmissions;
+    uint8_t numRetransmissions = 0;
 
     /** True if we have started trying to find a route - for DSR usage
      * While trying to find a route we don't actually send the data packet.  We just leave it here pending until
@@ -45,7 +45,7 @@ struct PendingPacket {
     bool wantRoute = false;
 
     PendingPacket() {}
-    PendingPacket(MeshPacket *p);
+    explicit PendingPacket(MeshPacket *p);
 };
 
 class GlobalPacketIdHashFunction
@@ -74,10 +74,10 @@ class ReliableRouter : public FloodingRouter
      * later free() the packet to pool.  This routine is not allowed to stall.
      * If the txmit queue is full it might return an error
      */
-    virtual ErrorCode send(MeshPacket *p);
+    virtual ErrorCode send(MeshPacket *p) override;
 
     /** Do our retransmission handling */
-    virtual int32_t runOnce()
+    virtual int32_t runOnce() override
     {
         // Note: We must doRetransmissions FIRST, because it might queue up work for the base class runOnce implementation
         auto d = doRetransmissions();
@@ -91,7 +91,7 @@ class ReliableRouter : public FloodingRouter
     /**
      * Look for acks/naks or someone retransmitting us
      */
-    virtual void sniffReceived(const MeshPacket *p, const Routing *c);
+    virtual void sniffReceived(const MeshPacket *p, const Routing *c) override;
 
     /**
      * Try to find the pending packet record for this ID (or NULL if not found)
@@ -102,7 +102,7 @@ class ReliableRouter : public FloodingRouter
     /**
      * We hook this method so we can see packets before FloodingRouter says they should be discarded
      */
-    virtual bool shouldFilterReceived(MeshPacket *p);
+    virtual bool shouldFilterReceived(MeshPacket *p) override;
 
     /**
      * Add p to the list of packets to retransmit occasionally.  We will free it once we stop retransmitting.

src/mesh/Router.cpp

@@ -210,6 +210,33 @@ ErrorCode Router::send(MeshPacket *p)
     if (p->which_payloadVariant == MeshPacket_decoded_tag) {
         ChannelIndex chIndex = p->channel; // keep as a local because we are about to change it
 
+
+
+#if defined(HAS_WIFI) || defined(PORTDUINO)
+        //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
+         */ 
+
+        bool shouldActuallyEncrypt = true;
+        if (*radioConfig.preferences.mqtt_server && !radioConfig.preferences.mqtt_encryption_enabled) {
+            shouldActuallyEncrypt = false;
+        }
+        
+        DEBUG_MSG("Should encrypt MQTT?: %d\n", shouldActuallyEncrypt);
+
+        //the packet is currently in a decrypted state.  send it now if they want decrypted packets
+        if (mqtt && !shouldActuallyEncrypt)
+            mqtt->onSend(*p, chIndex);
+#endif
+
         auto encodeResult = perhapsEncode(p);
         if (encodeResult != Routing_Error_NONE) {
             abortSendAndNak(encodeResult, p);
@@ -217,7 +244,9 @@ ErrorCode Router::send(MeshPacket *p)
         }
 
 #if defined(HAS_WIFI) || defined(PORTDUINO)
-        if (mqtt)
+        //the packet is now encrypted.
+        //check if we should send encrypted packets to mqtt
+        if (mqtt && shouldActuallyEncrypt)
             mqtt->onSend(*p, chIndex);
 #endif
     }
@@ -247,7 +276,7 @@ bool perhapsDecode(MeshPacket *p)
     if (p->which_payloadVariant == MeshPacket_decoded_tag)
         return true; // If packet was already decoded just return
 
-    assert(p->which_payloadVariant == MeshPacket_encrypted_tag);
+    //assert(p->which_payloadVariant == MeshPacket_encrypted_tag);
 
     // Try to find a channel that works with this hash
     for (ChannelIndex chIndex = 0; chIndex < channels.getNumChannels(); chIndex++) {
@@ -368,4 +397,4 @@ void Router::perhapsHandleReceived(MeshPacket *p)
         handleReceived(p);
 
     packetPool.release(p);
-}
+}

src/mesh/Router.h

@@ -37,7 +37,7 @@ class Router : protected concurrency::OSThread
      * do idle processing
      * Mostly looking in our incoming rxPacket queue and calling handleReceived.
      */
-    virtual int32_t runOnce();
+    virtual int32_t runOnce() override;
 
     /**
      * Works like send, but if we are sending to the local node, we directly put the message in the receive queue.
@@ -143,4 +143,4 @@ extern Router *router;
 
 /// Generate a unique packet id
 // FIXME, move this someplace better
-PacketId generatePacketId();
+PacketId generatePacketId();

src/mesh/SX1268Interface.h

@@ -9,7 +9,7 @@ class SX1268Interface : public SX126xInterface<SX1268>
 {
   public:
     /// override frequency of the SX1268 module regardless of the region (use EU433 value)
-    virtual float getFreq() { return 433.175f; }
+    virtual float getFreq() override { return 433.175f; }
 
     SX1268Interface(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, RADIOLIB_PIN_TYPE busy, SPIClass &spi);
-};
+};

src/mesh/SX126xInterface.h

@@ -15,17 +15,17 @@ class SX126xInterface : public RadioLibInterface
     /// Initialise the Driver transport hardware and software.
     /// Make sure the Driver is properly configured before calling init().
     /// \return true if initialisation succeeded.
-    virtual bool init();
+    virtual bool init() override;
 
     /// Apply any radio provisioning changes
     /// Make sure the Driver is properly configured before calling init().
     /// \return true if initialisation succeeded.
-    virtual bool reconfigure();
+    virtual bool reconfigure() override;
 
     /// Prepare hardware for sleep.  Call this _only_ for deep sleep, not needed for light sleep.
-    virtual bool sleep();
+    virtual bool sleep() override;
 
-    bool isIRQPending() { return lora.getIrqStatus() != 0; }
+    bool isIRQPending() override { return lora.getIrqStatus() != 0; }
 
   protected:
 
@@ -39,7 +39,7 @@ class SX126xInterface : public RadioLibInterface
     /**
      * Glue functions called from ISR land
      */
-    virtual void disableInterrupt();
+    virtual void disableInterrupt() override;
 
     /**
      * Enable a particular ISR callback glue function
@@ -47,24 +47,24 @@ class SX126xInterface : public RadioLibInterface
     virtual void enableInterrupt(void (*callback)()) { lora.setDio1Action(callback); }
 
     /** are we actively receiving a packet (only called during receiving state) */
-    virtual bool isActivelyReceiving();
+    virtual bool isActivelyReceiving() override;
 
     /**
      * Start waiting to receive a message
      */
-    virtual void startReceive();
+    virtual void startReceive() override;
 
     /**
      *  We override to turn on transmitter power as needed.
      */
-    virtual void configHardwareForSend();
+    virtual void configHardwareForSend() override;
 
     /**
      * Add SNR data to received messages
      */
-    virtual void addReceiveMetadata(MeshPacket *mp);
+    virtual void addReceiveMetadata(MeshPacket *mp) override;
 
-    virtual void setStandby();
+    virtual void setStandby() override;
 
   private:
-};
+};

src/mesh/SinglePortPlugin.h

@@ -21,7 +21,7 @@ class SinglePortPlugin : public MeshPlugin
     /**
      * @return true if you want to receive the specified portnum
      */
-    virtual bool wantPacket(const MeshPacket *p) { return p->decoded.portnum == ourPortNum; }
+    virtual bool wantPacket(const MeshPacket *p) override { return p->decoded.portnum == ourPortNum; }
 
     /**
      * Return a mesh packet which has been preinited as a data packet with a particular port number.

src/mesh/StreamAPI.h

@@ -35,7 +35,7 @@ class StreamAPI : public PhoneAPI, protected concurrency::OSThread
      */
     Stream *stream;
 
-    uint8_t rxBuf[MAX_STREAM_BUF_SIZE];
+    uint8_t rxBuf[MAX_STREAM_BUF_SIZE] = {0};
     size_t rxPtr = 0;
 
     /// time of last rx, used, to slow down our polling if we haven't heard from anyone
@@ -48,7 +48,7 @@ class StreamAPI : public PhoneAPI, protected concurrency::OSThread
      * Currently we require frequent invocation from loop() to check for arrived serial packets and to send new packets to the
      * phone.
      */
-    virtual int32_t runOnce();
+    virtual int32_t runOnce() override;
 
   private:
     /**
@@ -67,10 +67,10 @@ class StreamAPI : public PhoneAPI, protected concurrency::OSThread
      */
     void emitRebooted();
 
-    virtual void onConnectionChanged(bool connected);
+    virtual void onConnectionChanged(bool connected) override;
 
     /// Check the current underlying physical link to see if the client is currently connected
-    virtual bool checkIsConnected() = 0;
+    virtual bool checkIsConnected() override = 0;
 
     /**
      * Send the current txBuffer over our stream
@@ -81,5 +81,5 @@ class StreamAPI : public PhoneAPI, protected concurrency::OSThread
     bool canWrite = true;
 
     /// Subclasses can use this scratch buffer if they wish
-    uint8_t txBuf[MAX_STREAM_BUF_SIZE];
+    uint8_t txBuf[MAX_STREAM_BUF_SIZE] = {0};
-};
+};

src/mesh/TypedQueue.h

@@ -19,9 +19,8 @@ template <class T> class TypedQueue
     concurrency::OSThread *reader = NULL;
 
   public:
-    TypedQueue(int maxElements)
+    explicit TypedQueue(int maxElements) : h(xQueueCreate(maxElements, sizeof(T)))
     {
-        h = xQueueCreate(maxElements, sizeof(T));
         assert(h);
     }
 

src/mesh/generated/admin.pb.h

@@ -29,6 +29,19 @@ typedef struct _AdminMessage {
         bool confirm_set_radio;
         bool exit_simulator;
         int32_t reboot_seconds;
+        bool get_canned_message_plugin_part1_request;
+        char get_canned_message_plugin_part1_response[201];
+        bool get_canned_message_plugin_part2_request;
+        char get_canned_message_plugin_part2_response[201];
+        bool get_canned_message_plugin_part3_request;
+        char get_canned_message_plugin_part3_response[201];
+        bool get_canned_message_plugin_part4_request;
+        char get_canned_message_plugin_part4_response[201];
+        char set_canned_message_plugin_part1[201];
+        char set_canned_message_plugin_part2[201];
+        char set_canned_message_plugin_part3[201];
+        char set_canned_message_plugin_part4[201];
+        int32_t shutdown_seconds;
     };
 } AdminMessage;
 
@@ -55,6 +68,19 @@ extern "C" {
 #define AdminMessage_confirm_set_radio_tag       33
 #define AdminMessage_exit_simulator_tag          34
 #define AdminMessage_reboot_seconds_tag          35
+#define AdminMessage_get_canned_message_plugin_part1_request_tag 36
+#define AdminMessage_get_canned_message_plugin_part1_response_tag 37
+#define AdminMessage_get_canned_message_plugin_part2_request_tag 38
+#define AdminMessage_get_canned_message_plugin_part2_response_tag 39
+#define AdminMessage_get_canned_message_plugin_part3_request_tag 40
+#define AdminMessage_get_canned_message_plugin_part3_response_tag 41
+#define AdminMessage_get_canned_message_plugin_part4_request_tag 42
+#define AdminMessage_get_canned_message_plugin_part4_response_tag 43
+#define AdminMessage_set_canned_message_plugin_part1_tag 44
+#define AdminMessage_set_canned_message_plugin_part2_tag 45
+#define AdminMessage_set_canned_message_plugin_part3_tag 46
+#define AdminMessage_set_canned_message_plugin_part4_tag 47
+#define AdminMessage_shutdown_seconds_tag        51
 
 /* Struct field encoding specification for nanopb */
 #define AdminMessage_FIELDLIST(X, a) \
@@ -70,7 +96,20 @@ X(a, STATIC,   ONEOF,    MESSAGE,  (variant,get_owner_response,get_owner_respons
 X(a, STATIC,   ONEOF,    BOOL,     (variant,confirm_set_channel,confirm_set_channel),  32) \
 X(a, STATIC,   ONEOF,    BOOL,     (variant,confirm_set_radio,confirm_set_radio),  33) \
 X(a, STATIC,   ONEOF,    BOOL,     (variant,exit_simulator,exit_simulator),  34) \
-X(a, STATIC,   ONEOF,    INT32,    (variant,reboot_seconds,reboot_seconds),  35)
+X(a, STATIC,   ONEOF,    INT32,    (variant,reboot_seconds,reboot_seconds),  35) \
+X(a, STATIC,   ONEOF,    BOOL,     (variant,get_canned_message_plugin_part1_request,get_canned_message_plugin_part1_request),  36) \
+X(a, STATIC,   ONEOF,    STRING,   (variant,get_canned_message_plugin_part1_response,get_canned_message_plugin_part1_response),  37) \
+X(a, STATIC,   ONEOF,    BOOL,     (variant,get_canned_message_plugin_part2_request,get_canned_message_plugin_part2_request),  38) \
+X(a, STATIC,   ONEOF,    STRING,   (variant,get_canned_message_plugin_part2_response,get_canned_message_plugin_part2_response),  39) \
+X(a, STATIC,   ONEOF,    BOOL,     (variant,get_canned_message_plugin_part3_request,get_canned_message_plugin_part3_request),  40) \
+X(a, STATIC,   ONEOF,    STRING,   (variant,get_canned_message_plugin_part3_response,get_canned_message_plugin_part3_response),  41) \
+X(a, STATIC,   ONEOF,    BOOL,     (variant,get_canned_message_plugin_part4_request,get_canned_message_plugin_part4_request),  42) \
+X(a, STATIC,   ONEOF,    STRING,   (variant,get_canned_message_plugin_part4_response,get_canned_message_plugin_part4_response),  43) \
+X(a, STATIC,   ONEOF,    STRING,   (variant,set_canned_message_plugin_part1,set_canned_message_plugin_part1),  44) \
+X(a, STATIC,   ONEOF,    STRING,   (variant,set_canned_message_plugin_part2,set_canned_message_plugin_part2),  45) \
+X(a, STATIC,   ONEOF,    STRING,   (variant,set_canned_message_plugin_part3,set_canned_message_plugin_part3),  46) \
+X(a, STATIC,   ONEOF,    STRING,   (variant,set_canned_message_plugin_part4,set_canned_message_plugin_part4),  47) \
+X(a, STATIC,   ONEOF,    INT32,    (variant,shutdown_seconds,shutdown_seconds),  51)
 #define AdminMessage_CALLBACK NULL
 #define AdminMessage_DEFAULT NULL
 #define AdminMessage_variant_set_radio_MSGTYPE RadioConfig
@@ -86,7 +125,7 @@ extern const pb_msgdesc_t AdminMessage_msg;
 #define AdminMessage_fields &AdminMessage_msg
 
 /* Maximum encoded size of messages (where known) */
-#define AdminMessage_size                        535
+#define AdminMessage_size                        804
 
 #ifdef __cplusplus
 } /* extern "C" */

src/mesh/generated/cannedmessages.pb.c

@@ -0,0 +1,12 @@
+/* Automatically generated nanopb constant definitions */
+/* Generated by nanopb-0.4.4 */
+
+#include "cannedmessages.pb.h"
+#if PB_PROTO_HEADER_VERSION != 40
+#error Regenerate this file with the current version of nanopb generator.
+#endif
+
+PB_BIND(CannedMessagePluginConfig, CannedMessagePluginConfig, 2)
+
+
+

src/mesh/generated/cannedmessages.pb.h

@@ -0,0 +1,56 @@
+/* Automatically generated nanopb header */
+/* Generated by nanopb-0.4.4 */
+
+#ifndef PB_CANNEDMESSAGES_PB_H_INCLUDED
+#define PB_CANNEDMESSAGES_PB_H_INCLUDED
+#include <pb.h>
+
+#if PB_PROTO_HEADER_VERSION != 40
+#error Regenerate this file with the current version of nanopb generator.
+#endif
+
+/* Struct definitions */
+typedef struct _CannedMessagePluginConfig {
+    char messagesPart1[201];
+    char messagesPart2[201];
+    char messagesPart3[201];
+    char messagesPart4[201];
+} CannedMessagePluginConfig;
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Initializer values for message structs */
+#define CannedMessagePluginConfig_init_default   {"", "", "", ""}
+#define CannedMessagePluginConfig_init_zero      {"", "", "", ""}
+
+/* Field tags (for use in manual encoding/decoding) */
+#define CannedMessagePluginConfig_messagesPart1_tag 11
+#define CannedMessagePluginConfig_messagesPart2_tag 12
+#define CannedMessagePluginConfig_messagesPart3_tag 13
+#define CannedMessagePluginConfig_messagesPart4_tag 14
+
+/* Struct field encoding specification for nanopb */
+#define CannedMessagePluginConfig_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, STRING,   messagesPart1,    11) \
+X(a, STATIC,   SINGULAR, STRING,   messagesPart2,    12) \
+X(a, STATIC,   SINGULAR, STRING,   messagesPart3,    13) \
+X(a, STATIC,   SINGULAR, STRING,   messagesPart4,    14)
+#define CannedMessagePluginConfig_CALLBACK NULL
+#define CannedMessagePluginConfig_DEFAULT NULL
+
+extern const pb_msgdesc_t CannedMessagePluginConfig_msg;
+
+/* Defines for backwards compatibility with code written before nanopb-0.4.0 */
+#define CannedMessagePluginConfig_fields &CannedMessagePluginConfig_msg
+
+/* Maximum encoded size of messages (where known) */
+#define CannedMessagePluginConfig_size           812
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif

src/mesh/generated/deviceonly.pb.h

@@ -125,7 +125,7 @@ extern const pb_msgdesc_t ChannelFile_msg;
 /* Maximum encoded size of messages (where known) */
 #define LegacyRadioConfig_size                   4
 #define LegacyRadioConfig_LegacyPreferences_size 2
-#define DeviceState_size                         9967
+#define DeviceState_size                         10002
 #define ChannelFile_size                         832
 
 #ifdef __cplusplus

src/mesh/generated/environmental_measurement.pb.h

@@ -14,6 +14,9 @@ typedef struct _EnvironmentalMeasurement {
     float temperature;
     float relative_humidity;
     float barometric_pressure;
+    float gas_resistance;
+    float voltage;
+    float current;
 } EnvironmentalMeasurement;
 
 
@@ -22,19 +25,25 @@ extern "C" {
 #endif
 
 /* Initializer values for message structs */
-#define EnvironmentalMeasurement_init_default    {0, 0, 0}
+#define EnvironmentalMeasurement_init_default    {0, 0, 0, 0, 0, 0}
-#define EnvironmentalMeasurement_init_zero       {0, 0, 0}
+#define EnvironmentalMeasurement_init_zero       {0, 0, 0, 0, 0, 0}
 
 /* Field tags (for use in manual encoding/decoding) */
 #define EnvironmentalMeasurement_temperature_tag 1
 #define EnvironmentalMeasurement_relative_humidity_tag 2
 #define EnvironmentalMeasurement_barometric_pressure_tag 3
+#define EnvironmentalMeasurement_gas_resistance_tag 4
+#define EnvironmentalMeasurement_voltage_tag     5
+#define EnvironmentalMeasurement_current_tag     6
 
 /* Struct field encoding specification for nanopb */
 #define EnvironmentalMeasurement_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, FLOAT,    temperature,       1) \
 X(a, STATIC,   SINGULAR, FLOAT,    relative_humidity,   2) \
-X(a, STATIC,   SINGULAR, FLOAT,    barometric_pressure,   3)
+X(a, STATIC,   SINGULAR, FLOAT,    barometric_pressure,   3) \
+X(a, STATIC,   SINGULAR, FLOAT,    gas_resistance,    4) \
+X(a, STATIC,   SINGULAR, FLOAT,    voltage,           5) \
+X(a, STATIC,   SINGULAR, FLOAT,    current,           6)
 #define EnvironmentalMeasurement_CALLBACK NULL
 #define EnvironmentalMeasurement_DEFAULT NULL
 
@@ -44,7 +53,7 @@ extern const pb_msgdesc_t EnvironmentalMeasurement_msg;
 #define EnvironmentalMeasurement_fields &EnvironmentalMeasurement_msg
 
 /* Maximum encoded size of messages (where known) */
-#define EnvironmentalMeasurement_size            15
+#define EnvironmentalMeasurement_size            30
 
 #ifdef __cplusplus
 } /* extern "C" */

src/mesh/generated/mesh.pb.h

@@ -31,7 +31,10 @@ typedef enum _HardwareModel {
     HardwareModel_NRF52_UNKNOWN = 36,
     HardwareModel_PORTDUINO = 37,
     HardwareModel_ANDROID_SIM = 38,
-    HardwareModel_DIY_V1 = 39
+    HardwareModel_DIY_V1 = 39,
+    HardwareModel_RAK11200 = 40,
+    HardwareModel_NANO_G1 = 41,
+    HardwareModel_PRIVATE_HW = 255
 } HardwareModel;
 
 typedef enum _Team {
@@ -136,6 +139,8 @@ typedef struct _Data {
     uint32_t dest;
     uint32_t source;
     uint32_t request_id;
+    uint32_t reply_id;
+    bool is_tapback;
 } Data;
 
 typedef struct _LogRecord {
@@ -166,6 +171,7 @@ typedef struct _MyNodeInfo {
     uint32_t air_period_rx[24];
     bool has_wifi;
     float channel_utilization;
+    float air_util_tx;
 } MyNodeInfo;
 
 typedef struct _Position {
@@ -235,8 +241,6 @@ typedef struct _MeshPacket {
     MeshPacket_Priority priority;
     int32_t rx_rssi;
     MeshPacket_Delayed delayed;
-    uint32_t reply_id;
-    bool is_tapback;
 } MeshPacket;
 
 typedef struct _NodeInfo {
@@ -284,8 +288,8 @@ typedef struct _ToRadio {
 
 /* Helper constants for enums */
 #define _HardwareModel_MIN HardwareModel_UNSET
-#define _HardwareModel_MAX HardwareModel_DIY_V1
+#define _HardwareModel_MAX HardwareModel_PRIVATE_HW
-#define _HardwareModel_ARRAYSIZE ((HardwareModel)(HardwareModel_DIY_V1+1))
+#define _HardwareModel_ARRAYSIZE ((HardwareModel)(HardwareModel_PRIVATE_HW+1))
 
 #define _Team_MIN Team_CLEAR
 #define _Team_MAX Team_BROWN
@@ -333,10 +337,10 @@ extern "C" {
 #define User_init_default                        {"", "", "", {0}, _HardwareModel_MIN, 0, _Team_MIN, 0, 0, 0}
 #define RouteDiscovery_init_default              {0, {0, 0, 0, 0, 0, 0, 0, 0}}
 #define Routing_init_default                     {0, {RouteDiscovery_init_default}}
-#define Data_init_default                        {_PortNum_MIN, {0, {0}}, 0, 0, 0, 0}
+#define Data_init_default                        {_PortNum_MIN, {0, {0}}, 0, 0, 0, 0, 0, 0}
-#define MeshPacket_init_default                  {0, 0, 0, 0, {Data_init_default}, 0, 0, 0, 0, 0, _MeshPacket_Priority_MIN, 0, _MeshPacket_Delayed_MIN, 0, 0}
+#define MeshPacket_init_default                  {0, 0, 0, 0, {Data_init_default}, 0, 0, 0, 0, 0, _MeshPacket_Priority_MIN, 0, _MeshPacket_Delayed_MIN}
 #define NodeInfo_init_default                    {0, false, User_init_default, false, Position_init_default, 0, 0}
-#define MyNodeInfo_init_default                  {0, 0, 0, "", "", "", _CriticalErrorCode_MIN, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 0, 0}
+#define MyNodeInfo_init_default                  {0, 0, 0, "", "", "", _CriticalErrorCode_MIN, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 0, 0, 0}
 #define LogRecord_init_default                   {"", 0, "", _LogRecord_Level_MIN}
 #define FromRadio_init_default                   {0, 0, {MyNodeInfo_init_default}}
 #define ToRadio_init_default                     {0, {MeshPacket_init_default}}
@@ -345,10 +349,10 @@ extern "C" {
 #define User_init_zero                           {"", "", "", {0}, _HardwareModel_MIN, 0, _Team_MIN, 0, 0, 0}
 #define RouteDiscovery_init_zero                 {0, {0, 0, 0, 0, 0, 0, 0, 0}}
 #define Routing_init_zero                        {0, {RouteDiscovery_init_zero}}
-#define Data_init_zero                           {_PortNum_MIN, {0, {0}}, 0, 0, 0, 0}
+#define Data_init_zero                           {_PortNum_MIN, {0, {0}}, 0, 0, 0, 0, 0, 0}
-#define MeshPacket_init_zero                     {0, 0, 0, 0, {Data_init_zero}, 0, 0, 0, 0, 0, _MeshPacket_Priority_MIN, 0, _MeshPacket_Delayed_MIN, 0, 0}
+#define MeshPacket_init_zero                     {0, 0, 0, 0, {Data_init_zero}, 0, 0, 0, 0, 0, _MeshPacket_Priority_MIN, 0, _MeshPacket_Delayed_MIN}
 #define NodeInfo_init_zero                       {0, false, User_init_zero, false, Position_init_zero, 0, 0}
-#define MyNodeInfo_init_zero                     {0, 0, 0, "", "", "", _CriticalErrorCode_MIN, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 0, 0}
+#define MyNodeInfo_init_zero                     {0, 0, 0, "", "", "", _CriticalErrorCode_MIN, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 0, 0, 0}
 #define LogRecord_init_zero                      {"", 0, "", _LogRecord_Level_MIN}
 #define FromRadio_init_zero                      {0, 0, {MyNodeInfo_init_zero}}
 #define ToRadio_init_zero                        {0, {MeshPacket_init_zero}}
@@ -361,6 +365,8 @@ extern "C" {
 #define Data_dest_tag                            4
 #define Data_source_tag                          5
 #define Data_request_id_tag                      6
+#define Data_reply_id_tag                        7
+#define Data_is_tapback_tag                      8
 #define LogRecord_message_tag                    1
 #define LogRecord_time_tag                       2
 #define LogRecord_source_tag                     3
@@ -383,6 +389,7 @@ extern "C" {
 #define MyNodeInfo_air_period_rx_tag             17
 #define MyNodeInfo_has_wifi_tag                  18
 #define MyNodeInfo_channel_utilization_tag       19
+#define MyNodeInfo_air_util_tx_tag               20
 #define Position_latitude_i_tag                  1
 #define Position_longitude_i_tag                 2
 #define Position_altitude_tag                    3
@@ -432,8 +439,6 @@ extern "C" {
 #define MeshPacket_priority_tag                  12
 #define MeshPacket_rx_rssi_tag                   13
 #define MeshPacket_delayed_tag                   15
-#define MeshPacket_reply_id_tag                  16
-#define MeshPacket_is_tapback_tag                17
 #define NodeInfo_num_tag                         1
 #define NodeInfo_user_tag                        2
 #define NodeInfo_position_tag                    3
@@ -516,7 +521,9 @@ X(a, STATIC,   SINGULAR, BYTES,    payload,           2) \
 X(a, STATIC,   SINGULAR, BOOL,     want_response,     3) \
 X(a, STATIC,   SINGULAR, FIXED32,  dest,              4) \
 X(a, STATIC,   SINGULAR, FIXED32,  source,            5) \
-X(a, STATIC,   SINGULAR, FIXED32,  request_id,        6)
+X(a, STATIC,   SINGULAR, FIXED32,  request_id,        6) \
+X(a, STATIC,   SINGULAR, FIXED32,  reply_id,          7) \
+X(a, STATIC,   SINGULAR, BOOL,     is_tapback,        8)
 #define Data_CALLBACK NULL
 #define Data_DEFAULT NULL
 
@@ -533,9 +540,7 @@ X(a, STATIC,   SINGULAR, UINT32,   hop_limit,        10) \
 X(a, STATIC,   SINGULAR, BOOL,     want_ack,         11) \
 X(a, STATIC,   SINGULAR, UENUM,    priority,         12) \
 X(a, STATIC,   SINGULAR, INT32,    rx_rssi,          13) \
-X(a, STATIC,   SINGULAR, UENUM,    delayed,          15) \
+X(a, STATIC,   SINGULAR, UENUM,    delayed,          15)
-X(a, STATIC,   SINGULAR, FIXED32,  reply_id,         16) \
-X(a, STATIC,   SINGULAR, BOOL,     is_tapback,       17)
 #define MeshPacket_CALLBACK NULL
 #define MeshPacket_DEFAULT NULL
 #define MeshPacket_payloadVariant_decoded_MSGTYPE Data
@@ -569,7 +574,8 @@ X(a, STATIC,   SINGULAR, UINT32,   max_channels,     15) \
 X(a, STATIC,   REPEATED, UINT32,   air_period_tx,    16) \
 X(a, STATIC,   REPEATED, UINT32,   air_period_rx,    17) \
 X(a, STATIC,   SINGULAR, BOOL,     has_wifi,         18) \
-X(a, STATIC,   SINGULAR, FLOAT,    channel_utilization,  19)
+X(a, STATIC,   SINGULAR, FLOAT,    channel_utilization,  19) \
+X(a, STATIC,   SINGULAR, FLOAT,    air_util_tx,      20)
 #define MyNodeInfo_CALLBACK NULL
 #define MyNodeInfo_DEFAULT NULL
 
@@ -641,16 +647,16 @@ extern const pb_msgdesc_t ToRadio_PeerInfo_msg;
 
 /* Maximum encoded size of messages (where known) */
 #define Position_size                            153
-#define User_size                                96
+#define User_size                                97
 #define RouteDiscovery_size                      40
 #define Routing_size                             42
-#define Data_size                                260
+#define Data_size                                267
-#define MeshPacket_size                          320
+#define MeshPacket_size                          318
-#define NodeInfo_size                            270
+#define NodeInfo_size                            271
-#define MyNodeInfo_size                          451
+#define MyNodeInfo_size                          457
 #define LogRecord_size                           81
-#define FromRadio_size                           460
+#define FromRadio_size                           466
-#define ToRadio_size                             323
+#define ToRadio_size                             321
 #define ToRadio_PeerInfo_size                    8
 
 #ifdef __cplusplus

src/mesh/generated/radioconfig.pb.c

@@ -20,3 +20,4 @@ PB_BIND(RadioConfig_UserPreferences, RadioConfig_UserPreferences, 2)
 
 
 
+

src/mesh/generated/radioconfig.pb.h

@@ -79,9 +79,27 @@ typedef enum _PositionFlags {
     PositionFlags_POS_TIMESTAMP = 256
 } PositionFlags;
 
+typedef enum _InputEventChar {
+    InputEventChar_KEY_NONE = 0,
+    InputEventChar_KEY_UP = 17,
+    InputEventChar_KEY_DOWN = 18,
+    InputEventChar_KEY_LEFT = 19,
+    InputEventChar_KEY_RIGHT = 20,
+    InputEventChar_KEY_SELECT = 10,
+    InputEventChar_KEY_BACK = 27,
+    InputEventChar_KEY_CANCEL = 24
+} InputEventChar;
+
 typedef enum _RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType {
     RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_DHT11 = 0,
-    RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_DS18B20 = 1
+    RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_DS18B20 = 1,
+    RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_DHT12 = 2,
+    RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_DHT21 = 3,
+    RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_DHT22 = 4,
+    RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_BME280 = 5,
+    RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_BME680 = 6,
+    RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_MCP9808 = 7,
+    RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_SHTC3 = 8
 } RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType;
 
 /* Struct definitions */
@@ -157,6 +175,19 @@ typedef struct _RadioConfig_UserPreferences {
     char mqtt_password[32];
     bool is_lora_tx_disabled;
     bool is_power_saving;
+    bool rotary1_enabled;
+    uint32_t rotary1_pin_a;
+    uint32_t rotary1_pin_b;
+    uint32_t rotary1_pin_press;
+    InputEventChar rotary1_event_cw;
+    InputEventChar rotary1_event_ccw;
+    InputEventChar rotary1_event_press;
+    bool canned_message_plugin_enabled;
+    char canned_message_plugin_allow_input_source[16];
+    char canned_message_plugin_messages[200];
+    bool canned_message_plugin_send_bell;
+    bool mqtt_encryption_enabled;
+    float adc_multiplier_override;
 } RadioConfig_UserPreferences;
 
 typedef struct _RadioConfig {
@@ -190,9 +221,13 @@ typedef struct _RadioConfig {
 #define _PositionFlags_MAX PositionFlags_POS_TIMESTAMP
 #define _PositionFlags_ARRAYSIZE ((PositionFlags)(PositionFlags_POS_TIMESTAMP+1))
 
+#define _InputEventChar_MIN InputEventChar_KEY_NONE
+#define _InputEventChar_MAX InputEventChar_KEY_BACK
+#define _InputEventChar_ARRAYSIZE ((InputEventChar)(InputEventChar_KEY_BACK+1))
+
 #define _RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_MIN RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_DHT11
-#define _RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_MAX RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_DS18B20
+#define _RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_MAX RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_SHTC3
-#define _RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_ARRAYSIZE ((RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType)(RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_DS18B20+1))
+#define _RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_ARRAYSIZE ((RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType)(RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_SHTC3+1))
 
 
 #ifdef __cplusplus
@@ -201,9 +236,9 @@ extern "C" {
 
 /* Initializer values for message structs */
 #define RadioConfig_init_default                 {false, RadioConfig_UserPreferences_init_default}
-#define RadioConfig_UserPreferences_init_default {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 0, _RegionCode_MIN, _ChargeCurrent_MIN, 0, _LocationSharing_MIN, _GpsOperation_MIN, 0, 0, 0, 0, 0, 0, 0, "", 0, _GpsCoordinateFormat_MIN, 0, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, _RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_MIN, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 0, 0}
+#define RadioConfig_UserPreferences_init_default {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 0, _RegionCode_MIN, _ChargeCurrent_MIN, 0, _LocationSharing_MIN, _GpsOperation_MIN, 0, 0, 0, 0, 0, 0, 0, "", 0, _GpsCoordinateFormat_MIN, 0, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, _RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_MIN, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 0, 0, 0, 0, 0, 0, _InputEventChar_MIN, _InputEventChar_MIN, _InputEventChar_MIN, 0, "", "", 0, 0, 0}
 #define RadioConfig_init_zero                    {false, RadioConfig_UserPreferences_init_zero}
-#define RadioConfig_UserPreferences_init_zero    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 0, _RegionCode_MIN, _ChargeCurrent_MIN, 0, _LocationSharing_MIN, _GpsOperation_MIN, 0, 0, 0, 0, 0, 0, 0, "", 0, _GpsCoordinateFormat_MIN, 0, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, _RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_MIN, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 0, 0}
+#define RadioConfig_UserPreferences_init_zero    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 0, _RegionCode_MIN, _ChargeCurrent_MIN, 0, _LocationSharing_MIN, _GpsOperation_MIN, 0, 0, 0, 0, 0, 0, 0, "", 0, _GpsCoordinateFormat_MIN, 0, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, _RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_MIN, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 0, 0, 0, 0, 0, 0, _InputEventChar_MIN, _InputEventChar_MIN, _InputEventChar_MIN, 0, "", "", 0, 0, 0}
 
 /* Field tags (for use in manual encoding/decoding) */
 #define RadioConfig_UserPreferences_position_broadcast_secs_tag 1
@@ -276,6 +311,19 @@ extern "C" {
 #define RadioConfig_UserPreferences_mqtt_password_tag 156
 #define RadioConfig_UserPreferences_is_lora_tx_disabled_tag 157
 #define RadioConfig_UserPreferences_is_power_saving_tag 158
+#define RadioConfig_UserPreferences_rotary1_enabled_tag 160
+#define RadioConfig_UserPreferences_rotary1_pin_a_tag 161
+#define RadioConfig_UserPreferences_rotary1_pin_b_tag 162
+#define RadioConfig_UserPreferences_rotary1_pin_press_tag 163
+#define RadioConfig_UserPreferences_rotary1_event_cw_tag 164
+#define RadioConfig_UserPreferences_rotary1_event_ccw_tag 165
+#define RadioConfig_UserPreferences_rotary1_event_press_tag 166
+#define RadioConfig_UserPreferences_canned_message_plugin_enabled_tag 170
+#define RadioConfig_UserPreferences_canned_message_plugin_allow_input_source_tag 171
+#define RadioConfig_UserPreferences_canned_message_plugin_messages_tag 172
+#define RadioConfig_UserPreferences_canned_message_plugin_send_bell_tag 173
+#define RadioConfig_UserPreferences_mqtt_encryption_enabled_tag 174
+#define RadioConfig_UserPreferences_adc_multiplier_override_tag 175
 #define RadioConfig_preferences_tag              1
 
 /* Struct field encoding specification for nanopb */
@@ -355,7 +403,20 @@ X(a, STATIC,   SINGULAR, UINT32,   hop_limit,       154) \
 X(a, STATIC,   SINGULAR, STRING,   mqtt_username,   155) \
 X(a, STATIC,   SINGULAR, STRING,   mqtt_password,   156) \
 X(a, STATIC,   SINGULAR, BOOL,     is_lora_tx_disabled, 157) \
-X(a, STATIC,   SINGULAR, BOOL,     is_power_saving, 158)
+X(a, STATIC,   SINGULAR, BOOL,     is_power_saving, 158) \
+X(a, STATIC,   SINGULAR, BOOL,     rotary1_enabled, 160) \
+X(a, STATIC,   SINGULAR, UINT32,   rotary1_pin_a,   161) \
+X(a, STATIC,   SINGULAR, UINT32,   rotary1_pin_b,   162) \
+X(a, STATIC,   SINGULAR, UINT32,   rotary1_pin_press, 163) \
+X(a, STATIC,   SINGULAR, UENUM,    rotary1_event_cw, 164) \
+X(a, STATIC,   SINGULAR, UENUM,    rotary1_event_ccw, 165) \
+X(a, STATIC,   SINGULAR, UENUM,    rotary1_event_press, 166) \
+X(a, STATIC,   SINGULAR, BOOL,     canned_message_plugin_enabled, 170) \
+X(a, STATIC,   SINGULAR, STRING,   canned_message_plugin_allow_input_source, 171) \
+X(a, STATIC,   SINGULAR, STRING,   canned_message_plugin_messages, 172) \
+X(a, STATIC,   SINGULAR, BOOL,     canned_message_plugin_send_bell, 173) \
+X(a, STATIC,   SINGULAR, BOOL,     mqtt_encryption_enabled, 174) \
+X(a, STATIC,   SINGULAR, FLOAT,    adc_multiplier_override, 175)
 #define RadioConfig_UserPreferences_CALLBACK NULL
 #define RadioConfig_UserPreferences_DEFAULT NULL
 
@@ -367,8 +428,8 @@ extern const pb_msgdesc_t RadioConfig_UserPreferences_msg;
 #define RadioConfig_UserPreferences_fields &RadioConfig_UserPreferences_msg
 
 /* Maximum encoded size of messages (where known) */
-#define RadioConfig_size                         532
+#define RadioConfig_size                         801
-#define RadioConfig_UserPreferences_size         529
+#define RadioConfig_UserPreferences_size         798
 
 #ifdef __cplusplus
 } /* extern "C" */

src/mesh/http/ContentHandler.cpp

@@ -624,6 +624,8 @@ void handleReport(HTTPRequest *req, HTTPResponse *res)
     }
 
     res->println("],");
+    res->printf("\"channel_utilization\": %3.2f%,\n", airTime->channelUtilizationPercent());
+    res->printf("\"utilization_tx\": %3.2f%,\n", airTime->utilizationTXPercent());
     res->printf("\"seconds_since_boot\": %u,\n", airTime->getSecondsSinceBoot());
     res->printf("\"seconds_per_period\": %u,\n", airTime->getSecondsPerPeriod());
     res->printf("\"periods_to_log\": %u\n", airTime->getPeriodsToLog());
@@ -661,7 +663,6 @@ void handleReport(HTTPRequest *req, HTTPResponse *res)
     res->println("},");
 
     res->println("\"device\": {");
-    res->printf("\"channel_utilization\": %3.2f%,\n", airTime->channelUtilizationPercent());
     res->printf("\"reboot_counter\": %d\n", myNodeInfo.reboot_count);
     res->println("},");
 
@@ -754,7 +755,7 @@ void handleUpdateSPIFFS(HTTPRequest *req, HTTPResponse *res)
         if (!TARUnpacker->tarStreamExpander(streamptr, streamSize, SPIFFS, "/static")) {
             res->printf("tarStreamExpander failed with return code #%d\n", TARUnpacker->tarGzGetError());
             Serial.printf("tarStreamExpander failed with return code #%d\n", TARUnpacker->tarGzGetError());
-
+            client->stop();
             return;
         } else {
             /*
@@ -772,6 +773,7 @@ void handleUpdateSPIFFS(HTTPRequest *req, HTTPResponse *res)
     } else {
         res->printf("Failed to establish http connection\n");
         Serial.println("Failed to establish http connection");
+        client->stop();
         return;
     }
 

src/mesh/http/ContentHandler.h

@@ -36,7 +36,7 @@ class HttpAPI : public PhoneAPI
   protected:
   
     /// Check the current underlying physical link to see if the client is currently connected
-    virtual bool checkIsConnected() { return true; } // FIXME, be smarter about this
+    virtual bool checkIsConnected() override { return true; } // FIXME, be smarter about this
 };
 
 

src/mesh/http/WebServer.cpp

@@ -130,8 +130,8 @@ static void taskCreateCert(void *parameter)
 
 void createSSLCert()
 {
-    bool runLoop = false;
     if (isWifiAvailable() && !isCertReady) {
+        bool runLoop = false;
 
         // Create a new process just to handle creating the cert.
         //   This is a workaround for Bug: https://github.com/fhessel/esp32_https_server/issues/48

src/mesh/http/WebServer.h

@@ -16,7 +16,7 @@ class WebServerThread : private concurrency::OSThread
     uint32_t requestRestart = 0;
 
   protected:
-    virtual int32_t runOnce();
+    virtual int32_t runOnce() override;
 };
 
 extern WebServerThread *webServerThread;

src/mesh/wifi/WiFiServerAPI.h

@@ -13,7 +13,7 @@ class WiFiServerAPI : public StreamAPI
     WiFiClient client;
 
   public:
-    WiFiServerAPI(WiFiClient &_client);
+    explicit WiFiServerAPI(WiFiClient &_client);
 
     virtual ~WiFiServerAPI();
 
@@ -23,12 +23,12 @@ class WiFiServerAPI : public StreamAPI
   protected:
     /// We override this method to prevent publishing EVENT_SERIAL_CONNECTED/DISCONNECTED for wifi links (we want the board to
     /// stay in the POWERED state to prevent disabling wifi)
-    virtual void onConnectionChanged(bool connected) {}
+    virtual void onConnectionChanged(bool connected) override {}
 
-    virtual int32_t runOnce(); // Check for dropped client connections
+    virtual int32_t runOnce() override; // Check for dropped client connections
 
     /// Check the current underlying physical link to see if the client is currently connected
-    virtual bool checkIsConnected();
+    virtual bool checkIsConnected() override;
 };
 
 /**
@@ -52,7 +52,7 @@ class WiFiServerPort : public WiFiServer, private concurrency::OSThread
     static void debugOut(char c);
     
   protected:
-    int32_t runOnce();
+    int32_t runOnce() override;
 };
 
 void initApiServer();

src/mqtt/MQTT.h

@@ -40,7 +40,7 @@ class MQTT : private concurrency::OSThread
     void reconnect();
     
   protected:
-    virtual int32_t runOnce();
+    virtual int32_t runOnce() override;
 
   private:
     /** return true if we have a channel that wants uplink/downlink