todo update

2026-01-15 22:37:35 +00:00 · 2021-08-28 13:46:28 -07:00
169 changed files with 1912 additions and 4095 deletions
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -58,19 +58,6 @@ jobs:
      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
-
    # We now run integration test before other build steps (to quickly see runtime failures)
    - name: Build for native
      run: platformio run -e native
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,12 +4,12 @@ on:
  # workflow_dispatch:
  #  inputs:

-  # Only want to run if version.properties is bumped in master
+  # Only want to be run if a new tag starting with v is pushed.
  push:
    branches:
-      - master
-    paths:
-    - 'version.properties'
+      - "!*"
+    tags:
+      - "v1*"

 jobs:
  release-build:
@@ -21,15 +21,19 @@ jobs:
      with:
        submodules: 'recursive'

+    # get github branch and tag names as ${{ steps.branch_name.outputs.SOURCE_TAG }}
+    - name: Branch name
+      id: branch_name
+      run: |
+        echo ::set-output name=SOURCE_NAME::${GITHUB_REF#refs/*/}
+        echo ::set-output name=SOURCE_BRANCH::${GITHUB_REF#refs/heads/}
+        echo ::set-output name=SOURCE_TAG::${GITHUB_REF#refs/tags/}
+
    - name: Setup Python
      uses: actions/setup-python@v2
      with:
        python-version: 3.x
-        
-    # Will be available in steps.version.outputs.version	
-    - name: Get release version string
-      run: echo "::set-output name=version::$(./bin/buildinfo.py long)"
-      id: version
+
    # Note: we don't use caches on release builds because we don't want to accidentally not have a virgin build machine

    - name: Upgrade python tools
@@ -43,18 +47,10 @@ jobs:
      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
+    # Will be available in steps.version.outputs.version
+    - name: Get version string
+      run: echo "::set-output name=version::$(./bin/buildinfo.py long)"
+      id: version

    - name: Build everything
      run: bin/build-all.sh
@@ -66,7 +62,8 @@ jobs:
        draft: true
        prerelease: true
        release_name: ${{ steps.version.outputs.version }} alpha
-        tag_name: v${{ steps.version.outputs.version }}
+        tag_name: ${{ steps.branch_name.outputs.SOURCE_TAG }}
+        # was ${{ github.ref }}
        body: |
          Autogenerated by github action, developer should edit as required before publishing...
      env:
@@ -90,4 +87,4 @@ jobs:
        upload_url: ${{ steps.create_release.outputs.upload_url }}
        asset_path: release/archive/elfs-${{ steps.version.outputs.version }}.zip
        asset_name: debug-elfs-${{ steps.version.outputs.version }}.zip
-        asset_content_type: application/zip
+        asset_content_type: application/zip        
--- a/.github/workflows/update_protobufs.yml
+++ b/.github/workflows/update_protobufs.yml
@@ -1,24 +0,0 @@
-name: "Update protobufs"
-on: workflow_dispatch
-
-jobs:
-  update-protobufs:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-        with:
-          submodules: true
-
-      - name: Update Submodule
-        run: |
-          git pull --recurse-submodules
-          git submodule update --remote --recursive
-      - name: Commit update
-        run: |
-          git config --global user.name 'github-actions'
-          git config --global user.email 'bot@noreply.github.com'
-          git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
-          git add proto
-          git commit -m "Update protobuf submodule" && git push || echo "No changes to commit"
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,7 @@ main/credentials.h
 !.vscode/extensions.json
 *.code-workspace

-.idea
+.idea/workspace.xml

 .DS_Store
 Thumbs.db
@@ -23,6 +23,3 @@ flash.uf2
 cmake-build*
 __pycache__

-*.swp
-*.swo
-*~
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,50 +0,0 @@
-image: python:latest
-
-variables:
-  # make sure GitLab check out submodules
-  GIT_SUBMODULE_STRATEGY: recursive
-
-stages:
-  - buildall
-  - upload
-
-build:
-  stage: buildall
-
-  before_script:
-    # we need zip later for packaging
-    - "apt update;apt -y install zip"
-    - "pip install -U platformio"
-
-  script:
-    # clean up residues from previous run
-    - rm -rf release
-    - bin/build-all.sh
-
-  # This is for my local environment, if your runners are tagged differently, modify or remove  
-  tags:
-    - dockerized
-
-  # The files which are to be made available in GitLab
-  artifacts:
-    paths:
-      - release/archive/firmware*.zip
-
-
-upload:
-  image: curlimages/curl:latest
-
-  stage: upload
-
-  script:
-    - |
-      PACKAGE_REGISTRY_URL="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${CI_PROJECT_NAME}/master"
-      cd release/archive
-      for f in *.zip; do
-      curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file ${f} ${PACKAGE_REGISTRY_URL}/${f}
-      done
-      echo 'Package uploaded!'
-      
-  # This is for my local environment, if your runners are tagged differently, modify or remove
-  tags:
-    - dockerized  
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,7 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <clangFormatSettings>
+      <option name="ENABLED" value="true" />
+    </clangFormatSettings>
+  </code_scheme>
+</component>
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
--- a/.idea/meshtastic-esp32.iml
+++ b/.idea/meshtastic-esp32.iml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module classpath="CMake" type="CPP_MODULE" version="4" />
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CMakeWorkspace" PROJECT_DIR="$PROJECT_DIR$" />
+</project>
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/meshtastic-esp32.iml" filepath="$PROJECT_DIR$/.idea/meshtastic-esp32.iml" />
+    </modules>
+  </component>
+</project>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/design" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/proto" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/sdk-nrfxlib" vcs="Git" />
+  </component>
+</project>
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -50,8 +50,7 @@
        "cassert": "cpp",
        "iterator": "cpp",
        "shared_mutex": "cpp",
-        "iostream": "cpp",
-        "esp_nimble_hci.h": "c"
+        "iostream": "cpp"
    },
    "cSpell.words": [
        "Blox",
--- a/README.md
+++ b/README.md
@@ -2,10 +2,4 @@
 [![Open in Visual Studio Code](https://open.vscode.dev/badges/open-in-vscode.svg)](https://open.vscode.dev/meshtastic/Meshtastic-device)
 ## This repository contains the device firmware used in the [Meshtastic](https://meshtastic.org) project.

-Update Instructions
-
-[For ESP32 devices click here](https://meshtastic.org/docs/getting-started/flashing-esp32)
-
-[For nRF52 devices click here](https://meshtastic.org/docs/getting-started/flashing-nrf52)
-
 For developer information and specific building instructions, please see the [developer doccumentation](https://meshtastic.org/docs/developers)
--- a/bin/build-all.sh
+++ b/bin/build-all.sh
@@ -1,15 +1,15 @@
-#!/usr/bin/env bash
+#!/bin/bash

 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="tlora-v2 tlora-v1 tlora_v1_3 tlora-v2-1-1.6 tbeam heltec-v2.0 heltec-v2.1 tbeam0.7"
 #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
-BOARDS_NRF52="rak4631_5005 rak4631_19003 t-echo"
+BOARDS_NRF52="rak4631 t-echo"
 #BOARDS_NRF52=""

 OUTDIR=release/latest
--- a/bin/build-nightly.sh
+++ b/bin/build-nightly.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+source ~/.bashrc
+
+# Meshtastic Nightly Build Script.
+#  McHamster (jm@casler.org)
+#
+# This is the script that is used for the nightly build server.
+#
+# It's probably not useful for most people, but you may want to run your own
+#   nightly builds.
+#
+# The last line of ~/.bashrc contains an inclusion of platformio in the path.
+#   Without this, the build script won't run from the crontab:
+#
+#    export PATH="$HOME/.platformio/penv/bin:$PATH" 
+#
+# The crontab contains:
+#  0 2 * * * cd ~/meshtastic/github/meshtastic && source "~/.bashrc"; ./build-nightly.sh > ~/cronout.txt 2> ~/cronout.txt
+
+cd Meshtastic-device
+
+git pull
+
+bin/build-all.sh
+
+date_stamp=$(date +'%Y-%m-%d')
+
+cd ..
+
+# TODO: Archive the same binaries used by the build-all script.
+#zip -r meshtastic_device_nightly_${date_stamp} Meshtastic-device/release/latest/bins
+cp Meshtastic-device/release/archive/`ls -t ./Meshtastic-device/release/archive/| head -1` meshtastic_device_nightly_${date_stamp}.zip
+
+# Copy the file to the webserver
+scp meshtastic_device_nightly_${date_stamp}.zip jm@10.11.12.20:/volume1/web/meshtastic/nightly_builds/
+
+# Delete the local copy
+rm meshtastic_device_nightly_${date_stamp}.zip
--- a/bin/device-install.sh
+++ b/bin/device-install.sh
@@ -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  write_flash 0x1000 system-info.bin
-	$PYTHON -m esptool  write_flash 0x00390000 spiffs-*.bin
-	$PYTHON -m esptool  write_flash 0x10000 ${FILENAME}
+	$PYTHON -m esptool --baud 921600 erase_flash
+	$PYTHON -m esptool --baud 921600 write_flash 0x1000 system-info.bin
+	$PYTHON -m esptool --baud 921600 write_flash 0x00390000 spiffs-*.bin
+	$PYTHON -m esptool --baud 921600 write_flash 0x10000 ${FILENAME}
 else
 	echo "Invalid file: ${FILENAME}"
 	show_help
--- a/bin/dump-ram-users.sh
+++ b/bin/dump-ram-users.sh
@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 arm-none-eabi-readelf -s -e .pio/build/nrf52dk/firmware.elf | head -80

 nm -CSr --size-sort .pio/build/nrf52dk/firmware.elf  | grep '^200'
--- a/bin/gen-images.sh
+++ b/bin/gen-images.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+

 set -e 

--- a/bin/genpartitions.py
+++ b/bin/genpartitions.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/python2

 # This is a layout for 4MB of flash
 # Name,   Type, SubType, Offset,  Size, Flags
@@ -38,4 +38,4 @@ app0,     app,  ota_0,   , 0x{app:x},
 app1,     app,  ota_1,   , 0x{app:x},
 spiffs,   data, spiffs,  , 0x{spi:x} """.format(**locals())

-print(table)
+print(table)
--- a/bin/install-bootloader.sh
+++ b/bin/install-bootloader.sh
@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 # You probably don't want to use this script, it programs a custom bootloader build onto a nrf52 board

 set -e 
--- a/bin/install-eink.sh
+++ b/bin/install-eink.sh
@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 # You probably don't want to use this script, it programs a custom bootloader build onto a nrf52 board

 set -e 
--- a/bin/mqtt-listen.sh
+++ b/bin/mqtt-listen.sh
@@ -1,4 +1,3 @@
-#!/usr/bin/env bash

 mosquitto_sub -h mqtt.meshtastic.org -v -t \$SYS/\# -t msh/+/stat/\# -t msh/+/json/\#
 # mosquitto_sub -h test.mosquitto.org -v -t mesh/\# -F "%j"
--- a/bin/mqtt-send-status.sh
+++ b/bin/mqtt-send-status.sh
@@ -1,3 +1 @@
-#!/usr/bin/env bash
-
 mosquitto_pub -h mqtt.meshtastic.org -u meshdev -P large4cats -t msh/1/stat/FakeNode -m online -d
--- a/bin/native-gdbserver.sh
+++ b/bin/native-gdbserver.sh
@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 set -e
 pio run --environment native
 gdbserver --once localhost:2345 .pio/build/native/program "$@"
--- a/bin/native-run.sh
+++ b/bin/native-run.sh
@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 set -e
 pio run --environment native
 .pio/build/native/program "$@"
--- a/bin/nrf52-console.sh
+++ b/bin/nrf52-console.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+

 # JLinkRTTViewer
-JLinkRTTClient
+JLinkRTTClient
--- a/bin/nrf52832-gdbserver.sh
+++ b/bin/nrf52832-gdbserver.sh
@@ -1,3 +1,3 @@
-#!/usr/bin/env bash
+

 JLinkGDBServerCLExe -if SWD -select USB -port 2331 -device NRF52832_XXAA
--- a/bin/nrf52833-gdbserver.sh
+++ b/bin/nrf52833-gdbserver.sh
@@ -1,3 +1,3 @@
-#!/usr/bin/env bash
+

 JLinkGDBServerCLExe -if SWD -select USB -port 2331 -device NRF52833_XXAA
--- a/bin/nrf52840-gdbserver.sh
+++ b/bin/nrf52840-gdbserver.sh
@@ -1,3 +1,3 @@
-#!/usr/bin/env bash
+

 JLinkGDBServerCLExe -if SWD -select USB -port 2331 -device NRF52840_XXAA -SuppressInfoUpdateFW -DisableAutoUpdateFW -rtos GDBServer/RTOSPlugin_FreeRTOS
--- a/bin/program-1.0-tbeam.sh
+++ b/bin/program-1.0-tbeam.sh
@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 esptool.py --baud 921600 write_flash 0x10000 release/archive/old/firmware-tbeam-EU865-1.0.0.bin
 echo "Erasing the otadata partition, which will turn off flash flippy-flop and force the first image to be used"
 esptool.py --baud 921600 erase_region 0xe000 0x2000
--- a/bin/program-1.1-tbeam.sh
+++ b/bin/program-1.1-tbeam.sh
@@ -1,3 +1 @@
-#!/usr/bin/env bash
-
 esptool.py --baud 921600 write_flash 0x10000 release/archive/old/firmware-tbeam-1.1.50.bin
--- a/bin/program-release-heltec.sh
+++ b/bin/program-release-heltec.sh
@@ -1,4 +1,3 @@
-#!/usr/bin/env bash

 set -e

--- a/bin/program-release-tbeam.sh
+++ b/bin/program-release-tbeam.sh
@@ -1,4 +1,3 @@
-#!/usr/bin/env bash

 set -e

--- a/bin/program-release-universal.sh
+++ b/bin/program-release-universal.sh
@@ -1,4 +1,3 @@
-#!/usr/bin/env bash

 set -e

--- a/bin/promote-release.sh
+++ b/bin/promote-release.sh
@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 set -e 

 echo "This script is only for developers who are publishing new builds on github.  Most users don't need it"
@@ -8,10 +6,6 @@ VERSION=`bin/buildinfo.py long`

 # Must have a V prefix to trigger github
 git tag "v${VERSION}"
-
-# Commented out per https://github.com/meshtastic/Meshtastic-device/issues/947
-#git push root "v${VERSION}" # push the tag
-
-git push origin "v${VERSION}" # push the tag
+git push root "v${VERSION}" # push the tag

 echo "Tag ${VERSION} pushed to github, github actions should now be building the draft release.  If it seems good, click to publish it"
--- a/bin/qspi-flash-test.sh
+++ b/bin/qspi-flash-test.sh
@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 # You probably don't need this - it is a basic test of the serial flash on the TTGO eink board

 nrfjprog --qspiini nrf52/ttgo_eink_qpsi.ini --qspieraseall
--- a/bin/read-system-info.sh
+++ b/bin/read-system-info.sh
@@ -1,3 +1 @@
-#!/usr/bin/env bash
-
 esptool.py --baud 921600 read_flash 0x1000 0xf000 system-info.img
--- a/bin/regen-protos.bat
+++ b/bin/regen-protos.bat
@@ -1 +0,0 @@
-cd proto && ..\nanopb-0.4.4\generator-bin\protoc.exe --nanopb_out=-v:..\src\mesh\generated -I=..\proto *.proto
--- a/bin/regen-protos.sh
+++ b/bin/regen-protos.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash

 set -e

@@ -12,4 +12,4 @@ cd proto

 #echo "Regenerating protobuf documentation - if you see an error message"
 #echo "you can ignore it unless doing a new protobuf release to github."
-#bin/regen-docs.sh
+#bin/regen-docs.sh
--- a/bin/run-0-monitor.sh
+++ b/bin/run-0-monitor.sh
@@ -1,3 +1 @@
-#!/usr/bin/env bash
-
 pio run --upload-port /dev/ttyUSB0 -t upload -t monitor
--- a/bin/run-1-monitor.sh
+++ b/bin/run-1-monitor.sh
@@ -1,3 +1 @@
-#!/usr/bin/env bash
-
 pio run --upload-port /dev/ttyUSB1 -t upload -t monitor
--- a/bin/run-both-monitor.sh
+++ b/bin/run-both-monitor.sh
@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 set -e 

 echo uploading to usb1
--- a/bin/run-both.sh
+++ b/bin/run-both.sh
@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 set -e 

 TARG=tbeam
--- a/bin/run-openocd.sh
+++ b/bin/run-openocd.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+

 # /home/kevinh/.platformio/packages/tool-openocd-esp32/bin/openocd -s /home/kevinh/.platformio/packages/tool-openocd-esp32 -c gdb_port pipe; tcl_port disabled; telnet_port disabled -s /home/kevinh/.platformio/packages/tool-openocd-esp32/share/openocd/scripts -f interface/jlink.cfg -f board/esp-wroom-32.cfg
 /home/kevinh/.platformio/packages/tool-openocd-esp32/bin/openocd -s /home/kevinh/.platformio/packages/tool-openocd-esp32 -s /home/kevinh/.platformio/packages/tool-openocd-esp32/share/openocd/scripts -f interface/jlink.cfg -f ./lora32-openocd.cfg
--- a/bin/start-terminal0.sh
+++ b/bin/start-terminal0.sh
@@ -1,3 +1 @@
-#!/usr/bin/env bash
-
 pio device monitor -b 921600
--- a/bin/start-terminal1.sh
+++ b/bin/start-terminal1.sh
@@ -1,3 +1 @@
-#!/usr/bin/env bash
-
 pio device monitor -p /dev/ttyUSB1 -b 921600
--- a/bin/test-simulator.sh
+++ b/bin/test-simulator.sh
@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 set -e

 echo "Starting simulator"
--- a/bin/uf2-convert.bat
+++ b/bin/uf2-convert.bat
@@ -1,2 +0,0 @@
-@echo off
-if [%1]==[] (echo "Please specify a platformio NRF target (i.e. rak4631) as the first argument.") else (python3 .\bin\uf2conv.py .\.pio\build\%1\firmware.hex -c -o .\.pio\build\%1\firmware.uf2 -f 0xADA52840)
--- a/bin/upload-to-bootloader.sh
+++ b/bin/upload-to-bootloader.sh
@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 set -e

 echo "building for t-echo"
--- a/bin/upload-to-rak4631.sh
+++ b/bin/upload-to-rak4631.sh
@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 set -e

 echo "Converting to uf2 for NRF52 Adafruit bootloader"
--- a/bin/upload-usb1.sh
+++ b/bin/upload-usb1.sh
@@ -1,3 +1 @@
-#!/usr/bin/env bash
-
 pio run --upload-port /dev/ttyUSB1 -t upload
--- a/bin/view-map.sh
+++ b/bin/view-map.sh
@@ -1,4 +1,2 @@
-#!/usr/bin/env bash
-
 echo using amap tool to display memory map
 amap .pio/build/output.map
--- a/boards/nrf52840_dk_modified.json
+++ b/boards/nrf52840_dk_modified.json
@@ -16,9 +16,9 @@
      "name": "adafruit"
    },
    "softdevice": {
-      "sd_flags": "-DS140",
-      "sd_name": "s140",
-      "sd_version": "6.1.1",
+      "sd_flags": "-DS113",
+      "sd_name": "s113",
+      "sd_version": "7.2.0",
      "sd_fwid": "0x00B6"
    },
    "bootloader": {
--- a/data/static/.gitkeep
+++ b/data/static/.gitkeep
--- a/data/static/index.html
+++ b/data/static/index.html
@@ -0,0 +1 @@
+not yet supported - soon will be included in build
--- a/deprecated/icon-18dp.png
+++ b/deprecated/icon-18dp.png
--- a/deprecated/icon-24px.svg
+++ b/deprecated/icon-24px.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 5c-3.87 0-7 3.13-7 7h2c0-2.76 2.24-5 5-5s5 2.24 5 5h2c0-3.87-3.13-7-7-7zm1 9.29c.88-.39 1.5-1.26 1.5-2.29 0-1.38-1.12-2.5-2.5-2.5S9.5 10.62 9.5 12c0 1.02.62 1.9 1.5 2.29v3.3L7.59 21 9 22.41l3-3 3 3L16.41 21 13 17.59v-3.3zM12 1C5.93 1 1 5.93 1 12h2c0-4.97 4.03-9 9-9s9 4.03 9 9h2c0-6.07-4.93-11-11-11z"/></svg>
--- a/deprecated/icon.png
+++ b/deprecated/icon.png
--- a/geeksville-private/TODO.md
+++ b/geeksville-private/TODO.md
@@ -325,7 +325,7 @@ Items after the first final candidate release.
 - add "store and forward" support for messages, or move to the DB sync model. This would allow messages to be eventually delivered even if nodes are out of contact at the moment.
 - use variable length Strings in protobufs (instead of current fixed buffers). This would save lots of RAM
 - use BLEDevice::setPower to lower our BLE transmit power - extra range doesn't help us, it costs amps and it increases snoopability
- make a Ham build: just a new frequency list, a bool to say 'never do encryption' and use the callsign as that node's unique id. -from Girts
+- make a HAM build: just a new frequency list, a bool to say 'never do encryption' and use hte callsign as that node's unique id. -from Girts
 - don't forward redundant pings or ping responses to the phone, it just wastes phone battery
 - don't send location packets if we haven't moved significantly
 - scrub default radio config settings for bandwidth/range/speed
--- a/geeksville-private/bl602.md
+++ b/geeksville-private/bl602.md
@@ -20,6 +20,4 @@ make

 * todo run hello world on hardware (check for bl604 vs bl602 first)
 * build/run in the crummy arduino environment
-* build in platformio
-
-https://lupyuen.github.io/articles/lorawan2
+* build in platformio
--- a/geeksville-private/windows-build-instructions.md
+++ b/geeksville-private/windows-build-instructions.md
@@ -0,0 +1,7 @@
+
+
+* install python
+* install git (including git-bash)
+* install platformio
+* install vscode
+* install https://sourceforge.net/projects/mingw-w64/ (for windows gcc/g++) - you'll need to add the bin directory to your PATH
--- a/platformio.ini
+++ b/platformio.ini
@@ -9,21 +9,18 @@
 ; https://docs.platformio.org/page/projectconf.html

 [platformio]
-default_envs = tbeam
+;default_envs = tbeam
 ;default_envs = tbeam0.7
 ;default_envs = heltec-v2.0
-;default_envs = heltec-v1
-;default_envs = tlora-v1
 ;default_envs = tlora-v1
 ;default_envs = tlora_v1_3
 ;default_envs = tlora-v2
 ;default_envs = lora-relay-v1 # nrf board
-;default_envs = t-echo
+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 = rak4630
-;default_envs = meshtastic-diy-v1

 [common]
 ; common is not currently used
@@ -71,11 +68,11 @@ debug_tool = jlink

 lib_deps =
  https://github.com/meshtastic/esp8266-oled-ssd1306.git#35d796226b853b0c0ff818b2f1aa3d35e7296a96 ; ESP8266_SSD1306 
-  https://github.com/meshtastic/OneButton.git#3bcba9492d01e2a8a86f46700ab16f96dd2cf1f5 ; OneButton library for non-blocking button debounce
+  https://github.com/geeksville/OneButton.git ; 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
-  https://github.com/meshtastic/RadioLib.git#5582ac30578ff3f53f20630a00b2a8a4b8f92c74
+  https://github.com/meshtastic/RadioLib.git#80ed10d689a0568782c5bd152906b0f97d2bce93
  https://github.com/meshtastic/TinyGPSPlus.git#f0f47067ef2f67c856475933188251c1ef615e79
  https://github.com/meshtastic/AXP202X_Library.git#8404abb6d4b486748636bc6ad72d2a47baaf5460
  Wire ; explicitly needed here because the AXP202 library forgets to add it
@@ -104,36 +101,23 @@ src_filter =
  ${arduino_base.src_filter} -<nrf52/>
 upload_speed = 921600
 debug_init_break = tbreak setup
-
-# Remove -DMYNEWT_VAL_BLE_HS_LOG_LVL=LOG_LEVEL_CRITICAL for low level BLE logging.
-# See library directory for BLE logging possible values: .pio/libdeps/tbeam/NimBLE-Arduino/src/log_common/log_common.h
-# This overrides the BLE logging default of LOG_LEVEL_INFO (1) from: .pio/libdeps/tbeam/NimBLE-Arduino/src/esp_nimble_cfg.h
 build_flags =
  ${arduino_base.build_flags} -Wall -Wextra -Isrc/esp32 -Isrc/esp32-mfix-esp32-psram-cache-issue -lnimble -std=c++11 
-  -DLOG_LOCAL_LEVEL=ESP_LOG_DEBUG -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG -DMYNEWT_VAL_BLE_HS_LOG_LVL=LOG_LEVEL_CRITICAL
+  -DLOG_LOCAL_LEVEL=ESP_LOG_DEBUG -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
  -DAXP_DEBUG_PORT=Serial
 lib_deps =
  ${arduino_base.lib_deps}
  https://github.com/meshtastic/esp32_https_server.git
  adafruit/DHT sensor library@^1.4.1
  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
-
 # Hmm - this doesn't work yet
 # board_build.ldscript = linker/esp32.extram.bss.ld
-lib_ignore = 
-  segger_rtt
-  ESP32 BLE Arduino
-
+lib_ignore = segger_rtt
 platform_packages =
    framework-arduinoespressif32@https://github.com/meshtastic/arduino-esp32.git#4cde0f5d412d2695184f32e8a47e9bea57b45276

 ; leave this commented out to avoid breaking Windows
-;upload_port = /dev/ttyUSB0
+upload_port = /dev/ttyUSB0
 ;monitor_port = /dev/ttyUSB0

 ;upload_port = /dev/cu.SLAB_USBtoUART
@@ -167,13 +151,6 @@ 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
@@ -213,15 +190,6 @@ 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.
@@ -345,21 +313,12 @@ monitor_speed = 115200
 # board_build.ldscript = linker/nrf52840_s140_sim832.ld

 ; The very slick RAK wireless RAK 4631 / 4630 board
-[env:rak4631_5005]
+[env:rak4631]
 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
+build_flags = ${nrf52840_base.build_flags} -Ivariants/WisCore_RAK4631_Board
 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)
--- a/2
+++ b/2
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -0,0 +1 @@
+main.ino.cpp
--- a/src/GPSStatus.h
+++ b/src/GPSStatus.h
@@ -1,11 +1,8 @@
 #pragma once
 #include "Status.h"
 #include "configuration.h"
-#include "NodeDB.h"
 #include <Arduino.h>

-extern NodeDB nodeDB;
-
 namespace meshtastic
 {

@@ -19,39 +16,28 @@ class GPSStatus : public Status

    bool hasLock = false;                // default to false, until we complete our first read
    bool isConnected = false;            // Do we have a GPS we are talking to
-
-    Position p = Position_init_default;
+    int32_t latitude = 0, longitude = 0; // as an int mult by 1e-7 to get value as double
+    int32_t altitude = 0;
+    uint32_t dop = 0; // Diminution of position; PDOP where possible (UBlox), HDOP otherwise (TinyGPS) in 10^2 units (needs
+                      // scaling before use)
+    uint32_t heading = 0;
+    uint32_t numSatellites = 0;

  public:
    GPSStatus() { statusType = STATUS_TYPE_GPS; }
-
-    // proposed for deprecation
    GPSStatus(bool hasLock, bool isConnected, int32_t latitude, int32_t longitude, int32_t altitude, uint32_t dop,
              uint32_t heading, uint32_t numSatellites)
        : Status()
    {
        this->hasLock = hasLock;
        this->isConnected = isConnected;
-
-        this->p.latitude_i = latitude;
-        this->p.longitude_i = longitude;
-        this->p.altitude = altitude;
-        this->p.PDOP = dop;
-        this->p.ground_track = heading;
-        this->p.sats_in_view = numSatellites;
+        this->latitude = latitude;
+        this->longitude = longitude;
+        this->altitude = altitude;
+        this->dop = dop;
+        this->heading = heading;
+        this->numSatellites = numSatellites;
    }
-
-    // preferred method
-    GPSStatus(bool hasLock, bool isConnected, Position pos)
-        : Status()
-    {
-        this->hasLock = hasLock;
-        this->isConnected = isConnected;
-
-        // all-in-one struct copy
-        this->p = pos;
-    }
-
    GPSStatus(const GPSStatus &);
    GPSStatus &operator=(const GPSStatus &);

@@ -61,85 +47,45 @@ class GPSStatus : public Status

    bool getIsConnected() const { return isConnected; }

-    int32_t getLatitude() const {
-        if (radioConfig.preferences.fixed_position){
-            DEBUG_MSG("WARNING: Using fixed latitude\n");
-            NodeInfo *node = nodeDB.getNode(nodeDB.getNodeNum());
-            return node->position.latitude_i;
-        } else {
-            return p.latitude_i;
-        }
-    }
+    int32_t getLatitude() const { return latitude; }

-    int32_t getLongitude() const {
-        if (radioConfig.preferences.fixed_position){
-            DEBUG_MSG("WARNING: Using fixed longitude\n");
-            NodeInfo *node = nodeDB.getNode(nodeDB.getNodeNum());
-            return node->position.longitude_i;
-        } else {
-            return p.longitude_i;
-        }
-    }
+    int32_t getLongitude() const { return longitude; }

-    int32_t getAltitude() const {
-        if (radioConfig.preferences.fixed_position){
-            DEBUG_MSG("WARNING: Using fixed altitude\n");
-            NodeInfo *node = nodeDB.getNode(nodeDB.getNodeNum());
-            return node->position.altitude;
-        } else {
-            return p.altitude;
-        }
-    }
+    int32_t getAltitude() const { return altitude; }

-    uint32_t getDOP() const { return p.PDOP; }
+    uint32_t getDOP() const { return dop; }

-    uint32_t getHeading() const { return p.ground_track; }
+    uint32_t getHeading() const { return heading; }

-    uint32_t getNumSatellites() const { return p.sats_in_view; }
+    uint32_t getNumSatellites() const { return numSatellites; }

    bool matches(const GPSStatus *newStatus) const
    {
-#if GPS_EXTRAVERBOSE
-        DEBUG_MSG("GPSStatus.match() new pos@%x to old pos@%x\n",
-                    newStatus->p.pos_timestamp, p.pos_timestamp);
-#endif
-        return (newStatus->hasLock != hasLock ||
-                newStatus->isConnected != isConnected ||
-                newStatus->p.latitude_i != p.latitude_i ||
-                newStatus->p.longitude_i != p.longitude_i ||
-                newStatus->p.altitude != p.altitude ||
-                newStatus->p.altitude_hae != p.altitude_hae ||
-                newStatus->p.PDOP != p.PDOP ||
-                newStatus->p.ground_track != p.ground_track ||
-                newStatus->p.sats_in_view != p.sats_in_view);
+        return (newStatus->hasLock != hasLock || newStatus->isConnected != isConnected || newStatus->latitude != latitude ||
+                newStatus->longitude != longitude || newStatus->altitude != altitude || newStatus->dop != dop ||
+                newStatus->heading != heading || newStatus->numSatellites != numSatellites);
    }
-
    int updateStatus(const GPSStatus *newStatus)
    {
        // Only update the status if values have actually changed
-        bool isDirty = matches(newStatus);
-
-        if (isDirty && p.pos_timestamp && 
-            (newStatus->p.pos_timestamp == p.pos_timestamp)) {
-            // We can NEVER be in two locations at the same time! (also PR #886)
-            DEBUG_MSG("BUG!! positional timestamp unchanged from prev solution\n");
+        bool isDirty;
+        {
+            isDirty = matches(newStatus);
+            initialized = true;
+            hasLock = newStatus->hasLock;
+            isConnected = newStatus->isConnected;
+            latitude = newStatus->latitude;
+            longitude = newStatus->longitude;
+            altitude = newStatus->altitude;
+            dop = newStatus->dop;
+            heading = newStatus->heading;
+            numSatellites = newStatus->numSatellites;
        }
-
-        initialized = true;
-        hasLock = newStatus->hasLock;
-        isConnected = newStatus->isConnected;
-
-        p = newStatus->p;
-
        if (isDirty) {
-            if (hasLock) {
-                // In debug logs, identify position by @timestamp:stage (stage 3 = notify)
-                DEBUG_MSG("New GPS pos@%x:3 lat=%f, lon=%f, alt=%d, pdop=%.2f, track=%.2f, sats=%d\n", 
-                            p.pos_timestamp,
-                            p.latitude_i * 1e-7, p.longitude_i * 1e-7,
-                            p.altitude, p.PDOP * 1e-2, p.ground_track * 1e-5, 
-                            p.sats_in_view);
-            } else
+            if (hasLock)
+                DEBUG_MSG("New GPS pos lat=%f, lon=%f, alt=%d, pdop=%f, heading=%f, sats=%d\n", latitude * 1e-7, longitude * 1e-7,
+                          altitude, dop * 1e-2, heading * 1e-5, numSatellites);
+            else
                DEBUG_MSG("No GPS lock\n");
            onNewStatus.notifyObservers(this);
        }
--- a/src/Power.cpp
+++ b/src/Power.cpp
@@ -192,7 +192,6 @@ bool Power::setup()
        found = analogInit();
    }
    enabled = found;
-    low_voltage_counter = 0;

    return found;
 }
@@ -239,24 +238,9 @@ void Power::readPowerStatus()
                  powerStatus.getIsCharging(), powerStatus.getBatteryVoltageMv(), powerStatus.getBatteryChargePercent());
        newStatus.notifyObservers(&powerStatus);

-
-        // 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 (batteryLevel->getBattVoltage() < MIN_BAT_MILLIVOLTS){
-                low_voltage_counter++;
-                if (low_voltage_counter>3)
-                    powerFSM.trigger(EVENT_LOW_BATTERY);
-            } else {
-                low_voltage_counter = 0;
-            }
-        }
-        #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)
            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);
--- a/src/PowerFSM.cpp
+++ b/src/PowerFSM.cpp
@@ -1,8 +1,8 @@
+#include "configuration.h"
 #include "PowerFSM.h"
 #include "GPS.h"
 #include "MeshService.h"
 #include "NodeDB.h"
-#include "configuration.h"
 #include "graphics/Screen.h"
 #include "main.h"
 #include "sleep.h"
@@ -11,11 +11,6 @@
 /// Should we behave as if we have AC power now?
 static bool isPowered()
 {
-    // Completely circumvents the battery / power sensing logic and assumes constant power source
-    if (radioConfig.preferences.is_always_powered) {
-        return true;
-    }
-
    bool isRouter = radioConfig.preferences.is_router;

    // If we are not a router and we already have AC power go to POWER state after init, otherwise go to ON
@@ -37,14 +32,6 @@ static void sdsEnter()
    doDeepSleep(getPref_sds_secs() * 1000LL);
 }

-extern Power *power;
-
-static void shutdownEnter()
-{
-    DEBUG_MSG("Enter state: SHUTDOWN\n");
-    power->shutdown();
-}
-
 #include "error.h"

 static uint32_t secsSlept;
@@ -221,12 +208,10 @@ static void screenPress()
    screen->onPress();
 }

-static void bootEnter()
-{
+static void bootEnter() {
    DEBUG_MSG("Enter state: BOOT\n");
 }

-State stateSHUTDOWN(shutdownEnter, NULL, NULL, "SHUTDOWN");
 State stateSDS(sdsEnter, NULL, NULL, "SDS");
 State stateLS(lsEnter, lsIdle, lsExit, "LS");
 State stateNB(nbEnter, NULL, NULL, "NB");
@@ -249,10 +234,8 @@ void PowerFSM_setup()
    // if we are a router node, we go to NB (no need for bluetooth) otherwise we go to DARK (so we can send message to phone)
    powerFSM.add_transition(&stateLS, isRouter ? &stateNB : &stateDARK, EVENT_WAKE_TIMER, NULL, "Wake timer");

-    // We need this transition, because we might not transition if we were waiting to enter light-sleep, because when we wake from
-    // light sleep we _always_ transition to NB or dark and
-    powerFSM.add_transition(&stateLS, isRouter ? &stateNB : &stateDARK, EVENT_PACKET_FOR_PHONE, NULL,
-                            "Received packet, exiting light sleep");
+    // We need this transition, because we might not transition if we were waiting to enter light-sleep, because when we wake from light sleep we _always_ transition to NB or dark and
+    powerFSM.add_transition(&stateLS, isRouter ? &stateNB : &stateDARK, EVENT_PACKET_FOR_PHONE, NULL, "Received packet, exiting light sleep");
    powerFSM.add_transition(&stateNB, &stateNB, EVENT_PACKET_FOR_PHONE, NULL, "Received packet, resetting win wake");

    // Handle press events - note: we ignore button presses when in API mode
@@ -272,14 +255,6 @@ void PowerFSM_setup()
    powerFSM.add_transition(&stateON, &stateSDS, EVENT_LOW_BATTERY, NULL, "LowBat");
    powerFSM.add_transition(&stateSERIAL, &stateSDS, EVENT_LOW_BATTERY, NULL, "LowBat");

-    // Handle being told to power off
-    powerFSM.add_transition(&stateBOOT, &stateSHUTDOWN, EVENT_SHUTDOWN, NULL, "Shutdown");
-    powerFSM.add_transition(&stateLS, &stateSHUTDOWN, EVENT_SHUTDOWN, NULL, "Shutdown");
-    powerFSM.add_transition(&stateNB, &stateSHUTDOWN, EVENT_SHUTDOWN, NULL, "Shutdown");
-    powerFSM.add_transition(&stateDARK, &stateSHUTDOWN, EVENT_SHUTDOWN, NULL, "Shutdown");
-    powerFSM.add_transition(&stateON, &stateSHUTDOWN, EVENT_SHUTDOWN, NULL, "Shutdown");
-    powerFSM.add_transition(&stateSERIAL, &stateSHUTDOWN, EVENT_SHUTDOWN, NULL, "Shutdown");
-
    powerFSM.add_transition(&stateDARK, &stateON, EVENT_BLUETOOTH_PAIR, NULL, "Bluetooth pairing");
    powerFSM.add_transition(&stateON, &stateON, EVENT_BLUETOOTH_PAIR, NULL, "Bluetooth pairing");

@@ -337,23 +312,15 @@ void PowerFSM_setup()
 #ifndef NRF52_SERIES
    // We never enter light-sleep or NB states on NRF52 (because the CPU uses so little power normally)

-    // See: https://github.com/meshtastic/Meshtastic-device/issues/1071
-    if (isRouter || radioConfig.preferences.is_power_saving) {
-
-        // I don't think this transition is correct, turning off for now - @geeksville
-        // powerFSM.add_timed_transition(&stateDARK, &stateNB, getPref_phone_timeout_secs() * 1000, NULL, "Phone timeout");
-        powerFSM.add_timed_transition(&stateNB, &stateLS, getPref_min_wake_secs() * 1000, NULL, "Min wake timeout");
-        powerFSM.add_timed_transition(&stateDARK, &stateLS, getPref_wait_bluetooth_secs() * 1000, NULL, "Bluetooth timeout");
-        meshSds = getPref_mesh_sds_timeout_secs();
-
-    } else {
-
-        meshSds = UINT32_MAX;
-    }
+    // I don't think this transition is correct, turning off for now - @geeksville
+    // powerFSM.add_timed_transition(&stateDARK, &stateNB, getPref_phone_timeout_secs() * 1000, NULL, "Phone timeout");

+    powerFSM.add_timed_transition(&stateNB, &stateLS, getPref_min_wake_secs() * 1000, NULL, "Min wake timeout");
+    powerFSM.add_timed_transition(&stateDARK, &stateLS, getPref_wait_bluetooth_secs() * 1000, NULL, "Bluetooth timeout");
+    meshSds = getPref_mesh_sds_timeout_secs();
 #else
    lowPowerState = &stateDARK;
-    meshSds = UINT32_MAX; // Workaround for now: Don't go into deep sleep on the RAK4631
+    meshSds = UINT32_MAX; //Workaround for now: Don't go into deep sleep on the RAK4631
 #endif

    if (meshSds != UINT32_MAX)
--- a/src/PowerFSM.h
+++ b/src/PowerFSM.h
@@ -19,7 +19,6 @@
 #define EVENT_POWER_CONNECTED 13
 #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)

 extern Fsm powerFSM;
 extern State statePOWER, stateSERIAL;
--- a/src/airtime.cpp
+++ b/src/airtime.cpp
@@ -1,135 +1,107 @@
-#include "airtime.h"
-#include "NodeDB.h"
 #include "configuration.h"
+#include "airtime.h"

+#define periodsToLog 48

 AirTime *airTime;

-// Don't read out of this directly. Use the helper functions.
+uint32_t secondsPerPeriod = 3600;
+uint32_t lastMillis = 0;
+uint32_t secSinceBoot = 0;

+// AirTime at;
+
+// Don't read out of this directly. Use the helper functions.
+struct airtimeStruct {
+    uint32_t periodTX[periodsToLog];     // AirTime transmitted
+    uint32_t periodRX[periodsToLog];     // AirTime received and repeated (Only valid mesh packets)
+    uint32_t periodRX_ALL[periodsToLog]; // AirTime received regardless of valid mesh packet. Could include noise.
+    uint8_t lastPeriodIndex;
+} airtimes;

 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;
+        airtimes.periodTX[0] = airtimes.periodTX[0] + 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;
-        myNodeInfo.air_period_rx[0] = myNodeInfo.air_period_rx[0] + airtime_ms;
+        airtimes.periodRX[0] = airtimes.periodRX[0] + airtime_ms;
    } else if (reportType == RX_ALL_LOG) {
        DEBUG_MSG("AirTime - Packet received (noise?) : %ums\n", airtime_ms);
-        this->airtimes.periodRX_ALL[0] = this->airtimes.periodRX_ALL[0] + airtime_ms;
+        airtimes.periodRX_ALL[0] = airtimes.periodRX_ALL[0] + airtime_ms;
+    } else {
+        DEBUG_MSG("AirTime - Unknown report time. This should never happen!!\n");
    }
-
-    uint8_t channelUtilPeriod = (getSecondsSinceBoot() / 10) % CHANNEL_UTILIZATION_PERIODS;
-    this->channelUtilization[channelUtilPeriod] = channelUtilization[channelUtilPeriod] + airtime_ms;
 }

-uint8_t AirTime::currentPeriodIndex()
+uint8_t currentPeriodIndex()
 {
-    return ((getSecondsSinceBoot() / SECONDS_PER_PERIOD) % PERIODS_TO_LOG);
+    return ((getSecondsSinceBoot() / secondsPerPeriod) % periodsToLog);
 }

-void AirTime::airtimeRotatePeriod()
+void airtimeRotatePeriod()
 {

-    if (this->airtimes.lastPeriodIndex != currentPeriodIndex()) {
+    if (airtimes.lastPeriodIndex != currentPeriodIndex()) {
        DEBUG_MSG("Rotating airtimes to a new period = %u\n", 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_rx[i + 1] = myNodeInfo.air_period_rx[i];
+        for (int i = periodsToLog - 2; i >= 0; --i) {
+            airtimes.periodTX[i + 1] = airtimes.periodTX[i];
+            airtimes.periodRX[i + 1] = airtimes.periodRX[i];
+            airtimes.periodRX_ALL[i + 1] = airtimes.periodRX_ALL[i];
        }
-        
-        this->airtimes.periodTX[0] = 0;
-        this->airtimes.periodRX[0] = 0;
-        this->airtimes.periodRX_ALL[0] = 0;
+        airtimes.periodTX[0] = 0;
+        airtimes.periodRX[0] = 0;
+        airtimes.periodRX_ALL[0] = 0;

-        myNodeInfo.air_period_tx[0] = 0;
-        myNodeInfo.air_period_rx[0] = 0;
-
-        this->airtimes.lastPeriodIndex = currentPeriodIndex();
+        airtimes.lastPeriodIndex = currentPeriodIndex();
    }
 }

-uint32_t *AirTime::airtimeReport(reportTypes reportType)
+uint32_t *airtimeReport(reportTypes reportType)
 {

    if (reportType == TX_LOG) {
-        return this->airtimes.periodTX;
+        return airtimes.periodTX;
    } else if (reportType == RX_LOG) {
-        return this->airtimes.periodRX;
+        return airtimes.periodRX;
    } else if (reportType == RX_ALL_LOG) {
-        return this->airtimes.periodRX_ALL;
+        return airtimes.periodRX_ALL;
    }
    return 0;
 }

-uint8_t AirTime::getPeriodsToLog()
+uint8_t getPeriodsToLog()
 {
-    return PERIODS_TO_LOG;
+    return periodsToLog;
 }

-uint32_t AirTime::getSecondsPerPeriod()
+uint32_t getSecondsPerPeriod()
 {
-    return SECONDS_PER_PERIOD;
+    return secondsPerPeriod;
 }

-uint32_t AirTime::getSecondsSinceBoot()
+uint32_t getSecondsSinceBoot()
 {
-    return this->secSinceBoot;
-}
-
-float AirTime::channelUtilizationPercent()
-{
-    uint32_t sum = 0;
-    for (uint32_t i = 0; i < CHANNEL_UTILIZATION_PERIODS; i++) {
-        sum += this->channelUtilization[i];
-        // DEBUG_MSG("ChanUtilArray %u %u\n", i, this->channelUtilization[i]);
-    }
-
-    return (float(sum) / float(CHANNEL_UTILIZATION_PERIODS * 10 * 1000)) * 100;
+    return secSinceBoot;
 }

 AirTime::AirTime() : concurrency::OSThread("AirTime") {}

 int32_t AirTime::runOnce()
 {
+    //DEBUG_MSG("AirTime::runOnce()\n");
+
+    airtimeRotatePeriod();
    secSinceBoot++;

-    uint8_t utilPeriod = (getSecondsSinceBoot() / 10) % CHANNEL_UTILIZATION_PERIODS;
-
-    if (firstTime) {
-        airtimeRotatePeriod();
-
-        for (uint32_t i = 0; i < CHANNEL_UTILIZATION_PERIODS; i++) {
-            this->channelUtilization[i] = 0;
-        }
-
-        firstTime = false;
-        lastUtilPeriod = utilPeriod;
-
-    } else {
-
-        // Reset the channelUtilization window when we roll over
-        if (lastUtilPeriod != utilPeriod) {
-            lastUtilPeriod = utilPeriod;
-
-            this->channelUtilization[utilPeriod] = 0;
-        }
-
-        // Update channel_utilization every second.
-        myNodeInfo.channel_utilization = airTime->channelUtilizationPercent();
-    }
+    /*
+        This actually doesn't need to be run once per second but we currently use it for the
+        secSinceBoot counter.

+        If we have a better counter of how long the device has been online (and not millis())
+        then we can change this to something less frequent. Maybe once ever 5 seconds?
+    */
    return (1000 * 1);
 }
--- a/src/airtime.h
+++ b/src/airtime.h
@@ -23,18 +23,21 @@

  RX_ALL_LOG - RX_LOG = Other lora radios on our frequency channel.
 */
-
-#define CHANNEL_UTILIZATION_PERIODS 6
-#define SECONDS_PER_PERIOD 3600
-#define PERIODS_TO_LOG 24
-
-
 enum reportTypes { TX_LOG, RX_LOG, RX_ALL_LOG };

 void logAirtime(reportTypes reportType, uint32_t airtime_ms);

+void airtimeRotatePeriod();
+
+uint8_t currentPeriodIndex();
+uint8_t getPeriodsToLog();
+
+uint32_t getSecondsSinceBoot();
+
 uint32_t *airtimeReport(reportTypes reportType);

+uint32_t getSecondsPerPeriod();
+
 class AirTime : private concurrency::OSThread
 {

@@ -42,27 +45,6 @@ class AirTime : private concurrency::OSThread
    AirTime();

    void logAirtime(reportTypes reportType, uint32_t airtime_ms);
-    float channelUtilizationPercent();
-    uint32_t channelUtilization[CHANNEL_UTILIZATION_PERIODS];
-
-    uint8_t currentPeriodIndex();
-    void airtimeRotatePeriod();
-    uint8_t getPeriodsToLog();
-    uint32_t getSecondsPerPeriod();
-    uint32_t getSecondsSinceBoot();
-    uint32_t *airtimeReport(reportTypes reportType);
-
-  private:
-    bool firstTime = true;
-    uint8_t lastUtilPeriod = 0;
-    uint32_t secSinceBoot = 0;
-
-    struct airtimeStruct {
-        uint32_t periodTX[PERIODS_TO_LOG];     // AirTime transmitted
-        uint32_t periodRX[PERIODS_TO_LOG];     // AirTime received and repeated (Only valid mesh packets)
-        uint32_t periodRX_ALL[PERIODS_TO_LOG]; // AirTime received regardless of valid mesh packet. Could include noise.
-        uint8_t lastPeriodIndex;
-    } airtimes;

  protected:
    virtual int32_t runOnce() override;
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -84,10 +84,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BUTTON_PIN_ALT PIN_BUTTON2
 #endif

-#ifdef PIN_BUTTON_TOUCH
-#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)

@@ -175,8 +171,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #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 BUTTON_PIN_ALT 13 // Alternate GPIO for an external button if needed

 #define LED_INVERTED 1
 #define LED_PIN 4 // Newer tbeams (1.1) have an extra led on GPIO4
@@ -193,11 +188,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #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
+#define SX1262_CS RF95_NSS // FIXME - we really should define LORA_CS instead
+#define SX1262_DIO1 LORA_DIO1
+#define SX1262_BUSY LORA_DIO2
+#define SX1262_RESET LORA_RESET
+#define SX1262_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
@@ -218,7 +213,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #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
@@ -232,54 +226,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #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
-#define I2C_SDA 21
-#define I2C_SCL 22
-
-// 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.
@@ -324,45 +270,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #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
@@ -380,7 +290,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #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
@@ -553,11 +462,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #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 
+#define SX1262_CS 20 // CS0 on pinelora schematic, hooked to gpio D0 on ch341f
+#define SX1262_DIO1 LORA_DIO1
+#define SX1262_BUSY LORA_DIO2
+#define SX1262_RESET LORA_RESET
+// HOPE RFM90 does not have a TCXO therefore not SX1262_E22 
 #endif

 #endif
--- a/src/esp32/main-esp32.cpp
+++ b/src/esp32/main-esp32.cpp
@@ -43,8 +43,8 @@ void esp32Setup()
    nvs_stats_t nvs_stats;
    auto res = nvs_get_stats(NULL, &nvs_stats);
    assert(res == ESP_OK);
-    DEBUG_MSG("NVS: UsedEntries %d, FreeEntries %d, AllEntries %d, NameSpaces %d\n", nvs_stats.used_entries, nvs_stats.free_entries,
-              nvs_stats.total_entries, nvs_stats.namespace_count);
+    DEBUG_MSG("NVS: UsedEntries %d, FreeEntries %d, AllEntries %d\n", nvs_stats.used_entries, nvs_stats.free_entries,
+              nvs_stats.total_entries);

    DEBUG_MSG("Setup Preferences in Flash Storage\n");

--- a/src/gps/GPS.cpp
+++ b/src/gps/GPS.cpp
@@ -80,8 +80,6 @@ GPS::~GPS()
    notifyDeepSleepObserver.unobserve();
 }

-bool GPS::hasLock() { return hasValidLocation; }
-
 // Allow defining the polarity of the WAKE output.  default is active high
 #ifndef GPS_WAKE_ACTIVE
 #define GPS_WAKE_ACTIVE 1
@@ -202,13 +200,11 @@ void GPS::publishUpdate()
    if (shouldPublish) {
        shouldPublish = false;

-        // In debug logs, identify position by @timestamp:stage (stage 2 = publish)
-        DEBUG_MSG("publishing pos@%x:2, hasVal=%d, GPSlock=%d\n", 
-                    p.pos_timestamp, hasValidLocation, hasLock());
+        DEBUG_MSG("publishing GPS lock=%d\n", hasLock());

        // Notify any status instances that are observing us
        const meshtastic::GPSStatus status =
-            meshtastic::GPSStatus(hasValidLocation, isConnected(), p);
+            meshtastic::GPSStatus(hasLock(), isConnected(), latitude, longitude, altitude, dop, heading, numSatellites);
        newStatus.notifyObservers(&status);
    }
 }
@@ -246,7 +242,6 @@ int32_t GPS::runOnce()

        bool gotLoc = lookForLocation();
        if (gotLoc && !hasValidLocation) { // declare that we have location ASAP
-            DEBUG_MSG("hasValidLocation RISING EDGE\n");
            hasValidLocation = true;
            shouldPublish = true;
        }
@@ -263,10 +258,6 @@ int32_t GPS::runOnce()

            if (tooLong) {
                // we didn't get a location during this ack window, therefore declare loss of lock
-                if (hasValidLocation) {
-                    DEBUG_MSG("hasValidLocation FALLING EDGE (last read: %d)\n", gotLoc);
-                }
-                p = Position_init_default;
                hasValidLocation = false;
            }

@@ -334,11 +325,6 @@ GPS *createGps()
 #ifdef NO_GPS
    return nullptr;
 #else
-#ifdef GPS_ALTITUDE_HAE
-    DEBUG_MSG("Using HAE altitude model\n");
-#else
-    DEBUG_MSG("Using MSL altitude model\n");
-#endif
 // If we don't have bidirectional comms, we can't even try talking to UBLOX
 #ifdef GPS_TX_PIN
    // Init GPS - first try ublox
--- a/src/gps/GPS.h
+++ b/src/gps/GPS.h
@@ -17,10 +17,6 @@ class GPS : private concurrency::OSThread
  private:
    uint32_t lastWakeStartMsec = 0, lastSleepStartMsec = 0, lastWhileActiveMsec = 0;

-    /**
-     * hasValidLocation - indicates that the position variables contain a complete
-     *   GPS location, valid and fresh (< gps_update_interval + gps_attempt_time)
-     */
    bool hasValidLocation = false; // default to false, until we complete our first read

    bool isAwake = false; // true if we want a location right now
@@ -43,7 +39,11 @@ class GPS : private concurrency::OSThread
    /** If !0 we will attempt to connect to the GPS over I2C */
    static uint8_t i2cAddress;

-    Position p = Position_init_default;
+    int32_t latitude = 0, longitude = 0; // as an int mult by 1e-7 to get value as double
+    int32_t altitude = 0;
+    uint32_t dop = 0;     // Diminution of position; PDOP where possible (UBlox), HDOP otherwise (TinyGPS) in 10^2 units (needs
+                          // scaling before use)
+    uint32_t heading = 0; // Heading of motion, in degrees * 10^-5

    GPS() : concurrency::OSThread("GPS") {}

@@ -57,8 +57,8 @@ class GPS : private concurrency::OSThread
     */
    virtual bool setup();

-    /// Returns true if we have acquired GPS lock.
-    virtual bool hasLock();
+    /// Returns ture if we have acquired GPS lock.
+    bool hasLock() const { return hasValidLocation; }

    /// Return true if we are connected to a GPS
    bool isConnected() const { return hasGPS; }
--- a/src/gps/GeoCoord.cpp
+++ b/src/gps/GeoCoord.cpp
@@ -1,450 +0,0 @@
-#include "GeoCoord.h"
-
-GeoCoord::GeoCoord() {
-    _dirty = true;
-}
-
-GeoCoord::GeoCoord (int32_t lat, int32_t lon, int32_t alt) : _latitude(lat), _longitude(lon), _altitude(alt) {
-    GeoCoord::setCoords();
-}
-
-GeoCoord::GeoCoord (float lat, float lon, int32_t alt) : _altitude(alt) {
-    // Change decimial reprsentation to int32_t. I.e., 12.345 becomes 123450000
-    _latitude = int32_t(lat * 1e+7);
-    _longitude = int32_t(lon * 1e+7);
-    GeoCoord::setCoords();
-}
-
-GeoCoord::GeoCoord(double lat, double lon, int32_t alt): _altitude(alt) {
-    // Change decimial reprsentation to int32_t. I.e., 12.345 becomes 123450000
-    _latitude = int32_t(lat * 1e+7);
-    _longitude = int32_t(lon * 1e+7);
-    GeoCoord::setCoords();
-}
-
-// Initialize all the coordinate systems
-void GeoCoord::setCoords() {
-    double lat = _latitude * 1e-7;
-    double lon = _longitude * 1e-7;
-    GeoCoord::latLongToDMS(lat, lon, _dms);
-    GeoCoord::latLongToUTM(lat, lon, _utm);
-    GeoCoord::latLongToMGRS(lat, lon, _mgrs);
-    GeoCoord::latLongToOSGR(lat, lon, _osgr);
-    GeoCoord::latLongToOLC(lat, lon, _olc);
-    _dirty = false;
-}
-
-void GeoCoord::updateCoords(int32_t lat, int32_t lon, int32_t alt) {
-    // If marked dirty or new coordiantes
-    if(_dirty || _latitude != lat || _longitude != lon || _altitude != alt) {
-        _dirty = true;
-        _latitude = lat;
-        _longitude = lon;
-        _altitude = alt;
-        setCoords();
-    }
-}
-
-void GeoCoord::updateCoords(const double lat, const double lon, const int32_t alt) {
-    int32_t iLat = lat * 1e+7;
-    int32_t iLon = lon * 1e+7;
-    // If marked dirty or new coordiantes
-    if(_dirty ||  _latitude != iLat || _longitude != iLon || _altitude != alt) {
-        _dirty = true;
-        _latitude = iLat;
-        _longitude = iLon;
-        _altitude = alt;
-        setCoords();
-    }
-    
-}
-
-void GeoCoord::updateCoords(const float lat, const float lon, const int32_t alt) {
-    int32_t iLat = lat * 1e+7;
-    int32_t iLon = lon * 1e+7;
-    // If marked dirty or new coordiantes
-    if(_dirty || _latitude != iLat || _longitude != iLon || _altitude != alt) {
-        _dirty = true;
-        _latitude = iLat;
-        _longitude = iLon;
-        _altitude = alt;
-        setCoords();
-    }
-}
-
-/**
- * Converts lat long coordinates from decimal degrees to degrees minutes seconds format. 
- * DD°MM'SS"C DDD°MM'SS"C
- */
-void GeoCoord::latLongToDMS(const double lat, const double lon, DMS &dms) {    
-    if (lat < 0) dms.latCP = 'S';
-    else dms.latCP = 'N';
-
-    double latDeg = lat;
-
-    if (lat < 0)
-        latDeg = latDeg * -1;
-
-    dms.latDeg = floor(latDeg);
-    double latMin = (latDeg - dms.latDeg) * 60;
-    dms.latMin = floor(latMin);
-    dms.latSec = (latMin - dms.latMin) * 60;
-
-    if (lon < 0) dms.lonCP = 'W';
-    else dms.lonCP = 'E';
-
-    double lonDeg = lon;
-
-    if (lon < 0)
-        lonDeg = lonDeg * -1;
-
-    dms.lonDeg = floor(lonDeg);
-    double lonMin = (lonDeg - dms.lonDeg) * 60;
-    dms.lonMin = floor(lonMin);
-    dms.lonSec = (lonMin - dms.lonMin) * 60;
-}
-
-/**
- * Converts lat long coordinates to UTM.
- * based on this: https://github.com/walvok/LatLonToUTM/blob/master/latlon_utm.ino
- */
-void GeoCoord::latLongToUTM(const double lat, const double lon, UTM &utm) {
-
-    const std::string latBands = "CDEFGHJKLMNPQRSTUVWXX";
-    utm.zone = int((lon + 180)/6 + 1);
-    utm.band = latBands[int(lat/8 + 10)];
-    double a = 6378137; // WGS84 - equatorial radius
-    double k0 = 0.9996; // UTM point scale on the central meridian
-    double eccSquared = 0.00669438;   // eccentricity squared
-    double lonTemp = (lon + 180) - int((lon + 180)/360) * 360 - 180; //Make sure the longitude is between -180.00 .. 179.9
-    double latRad = toRadians(lat);
-    double lonRad = toRadians(lonTemp);
-
-    // Special Zones for Norway and Svalbard
-    if( lat >= 56.0 && lat < 64.0 && lonTemp >= 3.0 && lonTemp < 12.0 ) // Norway
-        utm.zone = 32;
-    if( lat >= 72.0 && lat < 84.0 ) { // Svalbard
-        if     ( lonTemp >= 0.0  && lonTemp <  9.0 ) utm.zone = 31;
-        else if( lonTemp >= 9.0  && lonTemp < 21.0 ) utm.zone = 33;
-        else if( lonTemp >= 21.0 && lonTemp < 33.0 ) utm.zone = 35;
-        else if( lonTemp >= 33.0 && lonTemp < 42.0 ) utm.zone = 37;
-    }
-    
-    double lonOrigin = (utm.zone - 1)*6 - 180 + 3;  // puts origin in middle of zone
-    double lonOriginRad = toRadians(lonOrigin);
-    double eccPrimeSquared = (eccSquared)/(1 - eccSquared);
-    double N = a/sqrt(1 - eccSquared*sin(latRad)*sin(latRad));
-    double T = tan(latRad)*tan(latRad);
-    double C = eccPrimeSquared*cos(latRad)*cos(latRad);
-    double A = cos(latRad)*(lonRad - lonOriginRad);
-    double M = a*((1 - eccSquared/4 - 3*eccSquared*eccSquared/64 - 5*eccSquared*eccSquared*eccSquared/256)*latRad 
-        - (3*eccSquared/8 + 3*eccSquared*eccSquared/32 + 45*eccSquared*eccSquared*eccSquared/1024)*sin(2*latRad)
-        + (15*eccSquared*eccSquared/256 + 45*eccSquared*eccSquared*eccSquared/1024)*sin(4*latRad) 
-        - (35*eccSquared*eccSquared*eccSquared/3072)*sin(6*latRad));
-    utm.easting = (double)(k0*N*(A+(1-T+C)*pow(A, 3)/6 + (5-18*T+T*T+72*C-58*eccPrimeSquared)*A*A*A*A*A/120) 
-        + 500000.0);
-    utm.northing = (double)(k0*(M+N*tan(latRad)*(A*A/2+(5-T+9*C+4*C*C)*A*A*A*A/24
-        + (61-58*T+T*T+600*C-330*eccPrimeSquared)*A*A*A*A*A*A/720)));
-            
-    if(lat < 0)
-        utm.northing += 10000000.0; //10000000 meter offset for southern hemisphere
-}
-
-// Converts lat long coordinates to an MGRS.
-void GeoCoord::latLongToMGRS(const double lat, const double lon, MGRS &mgrs) {
-    const std::string e100kLetters[3] = { "ABCDEFGH", "JKLMNPQR", "STUVWXYZ" };
-    const std::string n100kLetters[2] = { "ABCDEFGHJKLMNPQRSTUV", "FGHJKLMNPQRSTUVABCDE" };
-    UTM utm;
-    latLongToUTM(lat, lon, utm);
-    mgrs.zone = utm.zone;
-    mgrs.band = utm.band;
-    double col = floor(utm.easting / 100000);
-    mgrs.east100k = e100kLetters[(mgrs.zone - 1) % 3][col - 1];
-    double row = (int32_t)floor(utm.northing / 100000.0) % 20;
-    mgrs.north100k = n100kLetters[(mgrs.zone-1)%2][row];
-    mgrs.easting = (int32_t)utm.easting % 100000;
-    mgrs.northing = (int32_t)utm.northing % 100000;
-}
-
-/**
- * Converts lat long coordinates to Ordnance Survey Grid Reference (UK National Grid Ref).
- * 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
-    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
-    double phi0 = toRadians(49); 
-    double lambda0 = toRadians(-2);
-    double n0 = -100000;
-    double e0 = 400000;
-    double e2 = 1 - (b*b)/(a*a); // eccentricity squared
-    double n = (a - b)/(a + b);
-    
-    double osgb_Latitude;
-    double osgb_Longitude;
-    convertWGS84ToOSGB36(lat, lon, osgb_Latitude, osgb_Longitude);
-    double phi = osgb_Latitude; // already in radians
-    double lambda = osgb_Longitude; // already in radians
-    double v = a * f0 / sqrt(1 - e2 * sin(phi) * sin(phi));
-    double rho = a * f0 * (1 - e2) / pow(1 - e2 * sin(phi) * sin(phi), 1.5);
-    double eta2 = v / rho - 1;
-    double mA = (1 + n + (5/4)*n*n + (5/4)*n*n*n) * (phi - phi0);
-    double mB = (3*n + 3*n*n + (21/8)*n*n*n) * sin(phi - phi0) * cos(phi + phi0);
-    // loss of precision in mC & mD due to floating point rounding can cause innaccuracy of northing by a few meters
-    double mC = (15/8*n*n + 15/8*n*n*n) * sin(2*(phi - phi0)) * cos(2*(phi + phi0));
-    double mD = (35/24)*n*n*n * sin(3*(phi - phi0)) * cos(3*(phi + phi0));
-    double m = b*f0*(mA - mB + mC - mD);
-
-    double cos3Phi = cos(phi)*cos(phi)*cos(phi);
-    double cos5Phi = cos3Phi*cos(phi)*cos(phi);
-    double tan2Phi = tan(phi)*tan(phi);
-    double tan4Phi = tan2Phi*tan2Phi;
-    double I = m + n0;
-    double II = (v/2)*sin(phi)*cos(phi);
-    double III = (v/24)*sin(phi)*cos3Phi*(5 - tan2Phi + 9*eta2);
-    double IIIA = (v/720)*sin(phi)*cos5Phi*(61 - 58*tan2Phi + tan4Phi);
-    double IV = v*cos(phi);
-    double V = (v/6)*cos3Phi*(v/rho - tan2Phi);
-    double VI = (v/120)*cos5Phi*(5 - 18*tan2Phi + tan4Phi + 14*eta2 - 58*tan2Phi*eta2);
-
-    double deltaLambda = lambda - lambda0;
-    double deltaLambda2 = deltaLambda*deltaLambda;
-    double northing = I + II*deltaLambda2 + III*deltaLambda2*deltaLambda2 + IIIA*deltaLambda2*deltaLambda2*deltaLambda2;
-    double easting = e0 + IV*deltaLambda + V*deltaLambda2*deltaLambda + VI*deltaLambda2*deltaLambda2*deltaLambda;
-
-    if (easting < 0 || easting > 700000 || northing < 0 || northing > 1300000) // Check if out of boundaries
-        osgr = { 'I', 'I', 0, 0 };
-    else {
-        uint32_t e100k = floor(easting / 100000);
-        uint32_t n100k = floor(northing / 100000);
-        int8_t l1 = (19 - n100k) - (19 - n100k) % 5 + floor((e100k + 10) / 5);
-        int8_t l2 = (19 - n100k) * 5 % 25 + e100k % 5;
-        osgr.e100k = letter[l1];
-        osgr.n100k = letter[l2];
-        osgr.easting = floor((int)easting % 100000);
-        osgr.northing = floor((int)northing % 100000);
-    }
-}
-
-/**
- * Converts lat long coordinates to Open Location Code.
- * Based on: https://github.com/google/open-location-code/blob/main/c/src/olc.c
- */
-void GeoCoord::latLongToOLC(double lat, double lon, OLC &olc) {
-    char tempCode[] = "1234567890abc";
-    const char kAlphabet[] = "23456789CFGHJMPQRVWX";
-    double latitude;
-    double longitude = lon;
-    double latitude_degrees = std::min(90.0, std::max(-90.0, lat));
-
-    if (latitude_degrees < 90) // Check latitude less than lat max
-        latitude = latitude_degrees;
-    else {
-        double precision;
-        if (OLC_CODE_LEN <= 10)
-            precision = pow_neg(20, floor((OLC_CODE_LEN / -2) + 2));
-        else
-            precision = pow_neg(20, -3) / pow(5, OLC_CODE_LEN - 10);
-        latitude = latitude_degrees - precision / 2;
-    }
-    while (longitude < -180) // Normalize longitude
-        longitude += 360;
-    while (longitude >= 180)
-        longitude -= 360;
-    int64_t lat_val = 90 * 2.5e7;
-    int64_t lng_val = 180 * 8.192e6;
-    lat_val += latitude * 2.5e7;
-    lng_val += longitude * 8.192e6;
-    size_t pos = OLC_CODE_LEN;
-    
-    if (OLC_CODE_LEN > 10) { // Compute grid part of code if needed
-        for (size_t i = 0; i < 5; i++) {
-            int lat_digit = lat_val % 5;
-            int lng_digit = lng_val % 4;
-            int ndx = lat_digit * 4 + lng_digit;
-            tempCode[pos--] = kAlphabet[ndx];
-            lat_val /= 5;
-            lng_val /= 4;
-        }
-    } else {
-        lat_val /= pow(5, 5);
-        lng_val /= pow(4, 5);
-    }
-    
-    pos = 10;
-    
-    for (size_t i = 0; i < 5; i++) { // Compute pair section of code
-        int lat_ndx = lat_val % 20;
-        int lng_ndx = lng_val % 20;
-        tempCode[pos--] = kAlphabet[lng_ndx];
-        tempCode[pos--] = kAlphabet[lat_ndx];
-        lat_val /= 20;
-        lng_val /= 20;
-
-        if (i == 0)
-            tempCode[pos--] = '+';
-    }
-    
-    if (OLC_CODE_LEN < 9) { // Add padding if needed
-        for (size_t i = OLC_CODE_LEN; i < 9; i++)
-            tempCode[i] = '0';
-        tempCode[9] = '+';
-    }
-
-    size_t char_count = OLC_CODE_LEN;
-    if (10 > char_count) {
-        char_count = 10;
-    }
-    for (size_t i = 0; i < char_count; i++) {
-        olc.code[i] = tempCode[i];
-    }
-    olc.code[char_count] = '\0';    
-}
-
-// Converts the coordinate in WGS84 datum to the OSGB36 datum.
-void GeoCoord::convertWGS84ToOSGB36(const double lat, const double lon, double &osgb_Latitude, double &osgb_Longitude) {
-    // Convert lat long to cartesian
-    double phi = toRadians(lat);
-    double lambda = toRadians(lon);
-    double h = 0.0; // No OSTN height data used, some loss of accuracy (up to 5m)
-    double wgsA = 6378137; // WGS84 datum semi major axis
-    double wgsF = 1 / 298.257223563; // WGS84 datum flattening
-    double ecc = 2*wgsF - wgsF*wgsF;
-    double vee = wgsA / sqrt(1 - ecc * pow(sin(phi), 2));
-    double wgsX = (vee + h) * cos(phi) * cos(lambda);
-    double wgsY = (vee + h) * cos(phi) * sin(lambda);
-    double wgsZ = ((1 - ecc) * vee + h) * sin(phi);
-
-    // 7-parameter Helmert transform
-    double tx = -446.448; // x shift in meters
-    double ty = 125.157; // y shift in meters
-    double tz = -542.060; // z shift in meters
-    double s = 20.4894/1e6 + 1; // scale normalized parts per million to (s + 1)
-    double rx = toRadians(-0.1502/3600); // x rotation normalize arcseconds to radians
-    double ry = toRadians(-0.2470/3600); // y rotation normalize arcseconds to radians
-    double rz = toRadians(-0.8421/3600); // z rotation normalize arcseconds to radians
-    double osgbX = tx + wgsX*s - wgsY*rz + wgsZ*ry; 
-    double osgbY = ty + wgsX*rz + wgsY*s - wgsZ*rx;
-    double osgbZ = tz - wgsX*ry + wgsY*rx + wgsZ*s;
-
-    // Convert cartesian to lat long
-    double airyA = 6377563.396; // Airy1830 datum semi major axis
-    double airyB = 6356256.909; // Airy1830 datum semi minor axis
-    double airyF = 1/ 299.3249646; // Airy1830 datum flattening
-    double airyEcc = 2*airyF - airyF*airyF;
-    double airyEcc2 = airyEcc / (1 - airyEcc);
-    double p = sqrt(osgbX*osgbX + osgbY*osgbY);
-    double R = sqrt(p*p + osgbZ*osgbZ);
-    double tanBeta = (airyB*osgbZ) / (airyA*p) * (1 + airyEcc2*airyB/R);
-    double sinBeta = tanBeta / sqrt(1 + tanBeta*tanBeta);
-    double cosBeta = sinBeta / tanBeta;
-    osgb_Latitude = atan2(osgbZ + airyEcc2*airyB*sinBeta*sinBeta*sinBeta, p - airyEcc*airyA*cosBeta*cosBeta*cosBeta); // leave in radians
-    osgb_Longitude = atan2(osgbY, osgbX); // leave in radians
-    //osgb height = p*cos(osgb.latitude) + osgbZ*sin(osgb.latitude) - 
-            //(airyA*airyA/(airyA / sqrt(1 - airyEcc*sin(osgb.latitude)*sin(osgb.latitude)))); // Not used, no OSTN data
-}
-
-/// Ported from my old java code, returns distance in meters along the globe
-/// surface (by magic?)
-float GeoCoord::latLongToMeter(double lat_a, double lng_a, double lat_b, double lng_b)
-{
-    double pk = (180 / 3.14169);
-    double a1 = lat_a / pk;
-    double a2 = lng_a / pk;
-    double b1 = lat_b / pk;
-    double b2 = lng_b / pk;
-    double cos_b1 = cos(b1);
-    double cos_a1 = cos(a1);
-    double t1 = cos_a1 * cos(a2) * cos_b1 * cos(b2);
-    double t2 = cos_a1 * sin(a2) * cos_b1 * sin(b2);
-    double t3 = sin(a1) * sin(b1);
-    double tt = acos(t1 + t2 + t3);
-    if (std::isnan(tt))
-        tt = 0.0; // Must have been the same point?
-
-    return (float)(6366000 * tt);
-}
-
-/**
- * Computes the bearing in degrees between two points on Earth.  Ported from my
- * old Gaggle android app.
- *
- * @param lat1
- * Latitude of the first point
- * @param lon1
- * Longitude of the first point
- * @param lat2
- * Latitude of the second point
- * @param lon2
- * Longitude of the second point
- * @return Bearing between the two points in radians. A value of 0 means due
- * north.
- */
-float GeoCoord::bearing(double lat1, double lon1, double lat2, double lon2)
-{
-    double lat1Rad = toRadians(lat1);
-    double lat2Rad = toRadians(lat2);
-    double deltaLonRad = toRadians(lon2 - lon1);
-    double y = sin(deltaLonRad) * cos(lat2Rad);
-    double x = cos(lat1Rad) * sin(lat2Rad) - (sin(lat1Rad) * cos(lat2Rad) * cos(deltaLonRad));
-    return atan2(y, x);
-}
-
-/**
- * Ported from http://www.edwilliams.org/avform147.htm#Intro
- * @brief Convert from meters to range in radians on a great circle
- * @param range_meters
- * The range in meters
- * @return range in radians on a great circle 
- */
-float GeoCoord::rangeMetersToRadians(double range_meters) {
-    // 1 nm is 1852 meters
-    double distance_nm = range_meters * 1852;
-    return (PI / (180 * 60)) *distance_nm;
-}
-
-/**
- * Ported from http://www.edwilliams.org/avform147.htm#Intro
- * @brief Convert from radians to range in meters on a great circle
- * @param range_radians
- * The range in radians
- * @return Range in meters on a great circle 
- */
-float GeoCoord::rangeRadiansToMeters(double range_radians) {
-    double distance_nm = ((180 * 60) / PI) * range_radians;
-    // 1 meter is 0.000539957 nm
-    return distance_nm * 0.000539957;
-}
-
-// Find distance from point to passed in point
-int32_t GeoCoord::distanceTo(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) {
-    return bearing(this->getLatitude() * 1e-7, this->getLongitude() * 1e-7, pointB.getLatitude() * 1e-7, pointB.getLongitude() * 1e-7);
-}
-
-/**
- * Create a new point bassed on the passed in poin
- * Ported from http://www.edwilliams.org/avform147.htm#LL
- * @param bearing
- * The bearing in raidans
- * @param range_meters
- * range in meters
- * @return GeoCoord object of point at bearing and range from initial point
-*/ 
-std::shared_ptr<GeoCoord> GeoCoord::pointAtDistance(double bearing, double range_meters) {
-    double range_radians = rangeMetersToRadians(range_meters);
-    double lat1 = this->getLatitude() * 1e-7;
-    double lon1 = this->getLongitude() * 1e-7;
-    double lat = asin(sin(lat1) * cos(range_radians) + cos(lat1) * sin(range_radians) * cos(bearing));
-    double dlon = atan2(sin(bearing) * sin(range_radians) * cos(lat1), cos(range_radians) - sin(lat1) * sin(lat));
-    double lon = fmod(lon1 - dlon + PI, 2 * PI) - PI;
-
-    return std::make_shared<GeoCoord>(double(lat), double(lon), this->getAltitude());
-    
-}
--- a/src/gps/GeoCoord.h
+++ b/src/gps/GeoCoord.h
@@ -1,164 +0,0 @@
-#pragma once
-
-#include <algorithm>
-#include <string>
-#include <cstring>
-#include <cstdint>
-#include <math.h>
-#include <stdint.h>
-#include <stdexcept>
-#include <memory>
-
-#define PI 3.1415926535897932384626433832795
-#define OLC_CODE_LEN 11
-
-// Helper functions
-// Raises a number to an exponent, handling negative exponents.
-static inline double pow_neg(double base, double exponent) {
-  if (exponent == 0) {
-    return 1;
-  } else if (exponent > 0) {
-    return pow(base, exponent);
-  }
-  return 1 / pow(base, -exponent);
-}
-
-static inline double toRadians(double deg)
-{
-    return deg * PI / 180;
-}
-
-static inline double toDegrees(double r)
-{
-    return r * 180 / PI;
-}
-
-// GeoCoord structs/classes
-// A struct to hold the data for a DMS coordinate.
-struct DMS
-{
-    uint8_t latDeg;
-    uint8_t latMin;
-    uint32_t latSec;
-    char latCP;
-    uint8_t lonDeg;
-    uint8_t lonMin;
-    uint32_t lonSec;
-    char lonCP;
-};
-
-// A struct to hold the data for a UTM coordinate, this is also used when creating an MGRS coordinate.
-struct UTM 
-{
-    uint8_t zone;
-    char band;
-    uint32_t easting;
-    uint32_t northing;
-};
-
-// A struct to hold the data for a MGRS coordinate.
-struct MGRS
-{
-    uint8_t zone;
-    char band;
-    char east100k;
-    char north100k;
-    uint32_t easting;
-    uint32_t northing;
-};
-
-// A struct to hold the data for a OSGR coordiante
-struct OSGR {
-    char e100k;
-    char n100k;
-    uint32_t easting;
-    uint32_t northing;
-};
-
-// A struct to hold the data for a OLC coordinate
-struct OLC {
-    char code[OLC_CODE_LEN + 1]; // +1 for null termination
-};
-
-class GeoCoord {
-    private:
-        int32_t _latitude = 0;
-        int32_t _longitude = 0;
-        int32_t _altitude = 0;
-
-        DMS _dms;
-        UTM _utm;
-        MGRS _mgrs;
-        OSGR _osgr;
-        OLC _olc;
-
-        bool _dirty = true;
-
-        void setCoords();
-
-    public:
-        GeoCoord();
-        GeoCoord(int32_t lat, int32_t lon, int32_t alt);
-        GeoCoord(double lat, double lon, int32_t alt);
-        GeoCoord(float lat, float lon, int32_t alt);
-
-        void updateCoords(const int32_t lat, const int32_t lon, const int32_t alt);
-        void updateCoords(const double lat, const double lon, const int32_t alt);
-        void updateCoords(const float lat, const float lon, const int32_t alt);
-
-        // Conversions
-        static void latLongToDMS(const double lat, const double lon, DMS &dms);
-        static void latLongToUTM(const double lat, const double lon, UTM &utm);
-        static void latLongToMGRS(const double lat, const double lon, MGRS &mgrs);
-        static void latLongToOSGR(const double lat, const double lon, OSGR &osgr);
-        static void latLongToOLC(const double lat, const double lon, OLC &olc);
-        static void convertWGS84ToOSGB36(const double lat, const double lon, double &osgb_Latitude, double &osgb_Longitude);
-        static float latLongToMeter(double lat_a, double lng_a, double lat_b, double lng_b);
-        static float bearing(double lat1, double lon1, double lat2, double lon2);
-        static float rangeRadiansToMeters(double range_radians);
-        static float rangeMetersToRadians(double range_meters);
-
-        // Point to point conversions
-        int32_t distanceTo(GeoCoord pointB);
-        int32_t bearingTo(GeoCoord pointB);
-        std::shared_ptr<GeoCoord> pointAtDistance(double bearing, double range);
-
-        // Lat lon alt getters
-        int32_t getLatitude() const { return _latitude; }
-        int32_t getLongitude() const { return _longitude; }
-        int32_t getAltitude() const { return _altitude; }
-
-        // DMS getters
-        uint8_t getDMSLatDeg() const { return _dms.latDeg; }
-        uint8_t getDMSLatMin() const { return _dms.latMin; }
-        uint32_t getDMSLatSec() const { return _dms.latSec; }
-        char getDMSLatCP() const { return _dms.latCP; }
-        uint8_t getDMSLonDeg() const { return _dms.lonDeg; }
-        uint8_t getDMSLonMin() const { return _dms.lonMin; }
-        uint32_t getDMSLonSec() const { return _dms.lonSec; }
-        char getDMSLonCP() const { return _dms.lonCP; }
-
-        // UTM getters
-        uint8_t getUTMZone() const { return _utm.zone; }
-        char getUTMBand() const { return _utm.band; }
-        uint32_t getUTMEasting() const { return _utm.easting; }
-        uint32_t getUTMNorthing() const { return _utm.northing; }
-
-        // MGRS getters
-        uint8_t getMGRSZone() const { return _mgrs.zone; }
-        char getMGRSBand() const { return _mgrs.band; }
-        char getMGRSEast100k() const { return _mgrs.east100k; }
-        char getMGRSNorth100k() const { return _mgrs.north100k; }
-        uint32_t getMGRSEasting() const { return _mgrs.easting; }
-        uint32_t getMGRSNorthing() const { return _mgrs.northing; }
-
-        // OSGR getters
-        char getOSGRE100k() const { return _osgr.e100k; }
-        char getOSGRN100k() const { return _osgr.n100k; }
-        uint32_t getOSGREasting() const { return _osgr.easting; }
-        uint32_t getOSGRNorthing() const { return _osgr.northing; }
-
-        // OLC getter
-        void getOLCCode(char* code) { strncpy(code, _olc.code, OLC_CODE_LEN + 1); } // +1 for null termination
-};
-
--- a/src/gps/NMEAGPS.cpp
+++ b/src/gps/NMEAGPS.cpp
@@ -2,12 +2,6 @@
 #include "NMEAGPS.h"
 #include "RTC.h"

-#include <TinyGPS++.h>
-
-// GPS solutions older than this will be rejected - see TinyGPSDatum::age()
-#define GPS_SOL_EXPIRY_MS 300   // in millis
-#define NMEA_MSG_GXGSA "GNGSA"  // GSA message (GPGSA, GNGSA etc)
-
 static int32_t toDegInt(RawDegrees d)
 {
    int32_t degMult = 10000000; // 1e7
@@ -27,17 +21,6 @@ bool NMEAGPS::setupGPS()
    pinMode(PIN_GPS_PPS, INPUT);
 #endif

-// Currently disabled per issue #525 (TinyGPS++ crash bug)
-// when fixed upstream, can be un-disabled to enable 3D FixType and PDOP
-#ifndef TINYGPS_OPTION_NO_CUSTOM_FIELDS
-    // see NMEAGPS.h
-    gsafixtype.begin(reader, NMEA_MSG_GXGSA, 2);
-    gsapdop.begin(reader, NMEA_MSG_GXGSA, 15);
-    DEBUG_MSG("Using " NMEA_MSG_GXGSA " for 3DFIX and PDOP\n");
-#else
-    DEBUG_MSG("GxGSA NOT available\n");
-#endif
-
    return true;
 }

@@ -65,7 +48,7 @@ The Unix epoch (or Unix time or POSIX time or Unix timestamp) is the number of s
        t.tm_year = d.year() - 1900;
        t.tm_isdst = false;
        DEBUG_MSG("NMEA GPS time %d\n", t.tm_sec);
-
+        
        perhapsSetRTC(RTCQualityGPS, t);

        return true;
@@ -81,140 +64,47 @@ The Unix epoch (or Unix time or POSIX time or Unix timestamp) is the number of s
 */
 bool NMEAGPS::lookForLocation()
 {
-    // By default, TinyGPS++ does not parse GPGSA lines, which give us 
-    //   the 2D/3D fixType (see NMEAGPS.h)
-    // At a minimum, use the fixQuality indicator in GPGGA (FIXME?)
-    fixQual = reader.fixQuality();
+    bool foundLocation = false;

-#ifndef TINYGPS_OPTION_NO_CUSTOM_FIELDS
-    fixType = atoi(gsafixtype.value());  // will set to zero if no data
-    DEBUG_MSG("FIX QUAL=%d, TYPE=%d\n", fixQual, fixType);
-#endif
+    // uint8_t fixtype = reader.fixQuality();
+    // hasValidLocation = ((fixtype >= 1) && (fixtype <= 5));

-    // check if GPS has an acceptable lock
-    if (! hasLock())
-        return false;
-
-#ifdef GPS_EXTRAVERBOSE
-    DEBUG_MSG("AGE: LOC=%d FIX=%d DATE=%d TIME=%d\n", 
-                reader.location.age(), 
-#ifndef TINYGPS_OPTION_NO_CUSTOM_FIELDS
-                gsafixtype.age(),
-#else
-                0,
-#endif
-                reader.date.age(), reader.time.age());
-#endif  // GPS_EXTRAVERBOSE
-
-    // check if a complete GPS solution set is available for reading
-    //   tinyGPSDatum::age() also includes isValid() test
-    // FIXME
-    if (! ((reader.location.age() < GPS_SOL_EXPIRY_MS) &&
-#ifndef TINYGPS_OPTION_NO_CUSTOM_FIELDS
-            (gsafixtype.age() < GPS_SOL_EXPIRY_MS) &&
-#endif
-            (reader.time.age() < GPS_SOL_EXPIRY_MS) &&
-            (reader.date.age() < GPS_SOL_EXPIRY_MS)))
-    {
-        DEBUG_MSG("SOME data is TOO OLD\n");
-        return false;
-    }
-
-    // Is this a new point or are we re-reading the previous one?
-    if (! reader.location.isUpdated())
-        return false;
-
-    // We know the solution is fresh and valid, so just read the data
-    auto loc = reader.location.value();
-
-    // Some GPSes (Air530) seem to send a zero longitude when the current fix is bogus
-    // Bail out EARLY to avoid overwriting previous good data (like #857)
-    if(toDegInt(loc.lat) == 0) {
-        DEBUG_MSG("Ignoring bogus NMEA position\n");
-        return false;
-    }
-
-    p.location_source = Position_LocSource_LOCSRC_GPS_INTERNAL;
-
-    // Dilution of precision (an accuracy metric) is reported in 10^2 units, so we need to scale down when we use it
-#ifndef TINYGPS_OPTION_NO_CUSTOM_FIELDS
-    p.HDOP = reader.hdop.value();
-    p.PDOP = TinyGPSPlus::parseDecimal(gsapdop.value());
-    DEBUG_MSG("PDOP=%d, HDOP=%d\n", dop, reader.hdop.value());
-#else
-    // FIXME! naive PDOP emulation (assumes VDOP==HDOP)
-    // correct formula is PDOP = SQRT(HDOP^2 + VDOP^2)
-    p.HDOP = reader.hdop.value();
-    p.PDOP = 1.41 * reader.hdop.value();
-#endif
-
-    // Discard incomplete or erroneous readings
-    if (reader.hdop.value() == 0)
-        return false;
-
-    p.latitude_i = toDegInt(loc.lat);
-    p.longitude_i = toDegInt(loc.lng);
-
-    p.alt_geoid_sep = reader.geoidHeight.meters();
-    p.altitude_hae = reader.altitude.meters() + p.alt_geoid_sep;
-    p.altitude = reader.altitude.meters();
-
-    p.fix_quality = fixQual;
-#ifndef TINYGPS_OPTION_NO_CUSTOM_FIELDS
-    p.fix_type = fixType;
-#endif
-
-    // positional timestamp
-    struct tm t;
-    t.tm_sec = reader.time.second();
-    t.tm_min = reader.time.minute();
-    t.tm_hour = reader.time.hour();
-    t.tm_mday = reader.date.day();
-    t.tm_mon = reader.date.month() - 1;
-    t.tm_year = reader.date.year() - 1900;
-    t.tm_isdst = false;
-    p.pos_timestamp = mktime(&t);
-
-    // Nice to have, if available
    if (reader.satellites.isUpdated()) {
-        p.sats_in_view = reader.satellites.value();
+        setNumSatellites(reader.satellites.value());
    }

-    if (reader.course.isUpdated() && reader.course.isValid()) {
-        if (reader.course.value() < 36000) {  // sanity check
-            p.ground_track = reader.course.value() * 1e3; // Scale the heading (in degrees * 10^-2) to match the expected degrees * 10^-5
-        } else {
-            DEBUG_MSG("BOGUS course.value() REJECTED: %d\n",
-                        reader.course.value());
+    // Diminution of precision (an accuracy metric) is reported in 10^2 units, so we need to scale down when we use it
+    if (reader.hdop.isUpdated()) {
+        dop = reader.hdop.value();
+    }
+    if (reader.course.isUpdated()) {
+        heading = reader.course.value() * 1e3; // Scale the heading (in degrees * 10^-2) to match the expected degrees * 10^-5
+    }
+
+    if (reader.altitude.isUpdated())
+        altitude = reader.altitude.meters();
+
+    if (reader.location.isUpdated()) {
+
+        auto loc = reader.location.value();
+        latitude = toDegInt(loc.lat);
+        longitude = toDegInt(loc.lng);
+
+        // Some GPSes (Air530) seem to send a zero longitude when the current fix is bogus
+        if(longitude == 0)
+            DEBUG_MSG("Ignoring bogus NMEA position\n");
+        else {
+            foundLocation = true;
+
+            // expect gps pos lat=37.520825, lon=-122.309162, alt=158
+            DEBUG_MSG("new NMEA GPS pos lat=%f, lon=%f, alt=%d, hdop=%g, heading=%f\n", latitude * 1e-7, longitude * 1e-7, altitude,
+                    dop * 1e-2, heading * 1e-5);
        }
    }

-/*
-    // REDUNDANT?
-    // expect gps pos lat=37.520825, lon=-122.309162, alt=158
-    DEBUG_MSG("new NMEA GPS pos lat=%f, lon=%f, alt=%d, dop=%g, heading=%f\n",
-              latitude * 1e-7, longitude * 1e-7, altitude, dop * 1e-2,
-              heading * 1e-5);
-*/
-    return true;
+    return foundLocation;
 }

-
-bool NMEAGPS::hasLock()
-{
-    // Using GPGGA fix quality indicator
-    if (fixQual >= 1 && fixQual <= 5) {
-#ifndef TINYGPS_OPTION_NO_CUSTOM_FIELDS
-        // Use GPGSA fix type 2D/3D (better) if available
-        if (fixType == 3 || fixType == 0)  // zero means "no data received"
-#endif
-            return true;
-    }
-
-    return false;
-}
-
-
 bool NMEAGPS::whileIdle()
 {
    bool isValid = false;
--- a/src/gps/NMEAGPS.h
+++ b/src/gps/NMEAGPS.h
@@ -12,15 +12,6 @@
 class NMEAGPS : public GPS
 {
    TinyGPSPlus reader;
-    uint8_t fixQual = 0;  // fix quality from GPGGA
-
-#ifndef TINYGPS_OPTION_NO_CUSTOM_FIELDS
-    // (20210908) TinyGps++ can only read the GPGSA "FIX TYPE" field
-    // via optional feature "custom fields", currently disabled (bug #525)
-    TinyGPSCustom gsafixtype;  // custom extract fix type from GPGSA
-    TinyGPSCustom gsapdop;     // custom extract PDOP from GPGSA
-    uint8_t fixType = 0;  // fix type from GPGSA
-#endif

  public:
    virtual bool setupGPS();
@@ -47,6 +38,4 @@ class NMEAGPS : public GPS
     * @return true if we've acquired a new location
     */
    virtual bool lookForLocation();
-
-    virtual bool hasLock();
 };
--- a/src/gps/RTC.h
+++ b/src/gps/RTC.h
@@ -11,11 +11,8 @@ enum RTCQuality {
    /// Some other node gave us a time we can use
    RTCQualityFromNet = 1,

-    /// Our time is based on NTP
-    RTCQualityNTP= 2,
-
    /// Our time is based on our own GPS
-    RTCQualityGPS = 3
+    RTCQualityGPS = 2
 };

 RTCQuality getRTCQuality();
--- a/src/gps/UBloxGPS.cpp
+++ b/src/gps/UBloxGPS.cpp
@@ -5,15 +5,6 @@
 #include "sleep.h"
 #include <assert.h>

-// if gps_update_interval below this value, do not powercycle the GPS
-#define UBLOX_POWEROFF_THRESHOLD 90
-
-#define PDOP_INVALID 9999
-
-// #define UBX_MODE_NMEA
-
-extern RadioConfig radioConfig;
-
 UBloxGPS::UBloxGPS() {}

 bool UBloxGPS::tryConnect()
@@ -50,22 +41,12 @@ bool UBloxGPS::setupGPS()
        delay(500);

    if (isConnected()) {
-#ifdef UBX_MODE_NMEA
-        DEBUG_MSG("Connected to UBLOX GPS, downgrading to NMEA mode\n");
-        DEBUG_MSG("- GPS errors below are related and safe to ignore\n");
-#else
        DEBUG_MSG("Connected to UBLOX GPS successfully\n");
-#endif

        if (!setUBXMode())
            RECORD_CRITICALERROR(CriticalErrorCode_UBloxInitFailed); // Don't halt the boot if saving the config fails, but do report the bug

-#ifdef UBX_MODE_NMEA
-        return false;
-#else
        return true;
-#endif
-
    } else {
        return false;
    }
@@ -73,17 +54,6 @@ bool UBloxGPS::setupGPS()

 bool UBloxGPS::setUBXMode()
 {
-#ifdef UBX_MODE_NMEA
-    if (_serial_gps) {
-        ublox.setUART1Output(COM_TYPE_NMEA, 1000);
-    }
-    if (i2cAddress) {
-        ublox.setI2COutput(COM_TYPE_NMEA, 1000);
-    }
-
-    return false;  // pretend initialization failed to force NMEA mode
-#endif
-
    if (_serial_gps) {
        if (!ublox.setUART1Output(COM_TYPE_UBX, 1000)) // Use native API
            return false;
@@ -141,17 +111,19 @@ bool UBloxGPS::factoryReset()
 /** Idle processing while GPS is looking for lock */
 void UBloxGPS::whileActive()
 {
-    ublox.flushPVT();  // reset ALL freshness flags first
    ublox.getT(maxWait()); // ask for new time data - hopefully ready when we come back

    // Ask for a new position fix - hopefully it will have results ready by next time
    // the order here is important, because we only check for has latitude when reading
+    ublox.getSIV(maxWait());
+    ublox.getPDOP(maxWait());
+    ublox.getP(maxWait());

-    //ublox.getSIV(maxWait());  // redundant with getPDOP below
-    ublox.getPDOP(maxWait());  // will trigger getSOL on NEO6, getP on others
-    ublox.getP(maxWait());     // will trigger getPosLLH on NEO6, getP on others
-
-    // the fixType flag will be checked and updated in lookForLocation()
+    // Update fixtype
+    if (ublox.moduleQueried.fixType) {
+        fixType = ublox.getFixType(0);
+        // DEBUG_MSG("GPS fix type %d, numSats %d\n", fixType, numSatellites);
+    }
 }

 /**
@@ -192,110 +164,33 @@ bool UBloxGPS::lookForLocation()
 {
    bool foundLocation = false;

-    // check if a complete GPS solution set is available for reading
-    // (some of these, like lat/lon are redundant and can be removed)
-    if ( ! (ublox.moduleQueried.fixType &&
-            ublox.moduleQueried.latitude && 
-            ublox.moduleQueried.longitude &&
-            ublox.moduleQueried.altitude &&
-            ublox.moduleQueried.pDOP &&
-            ublox.moduleQueried.SIV &&
-            ublox.moduleQueried.gpsDay)) 
-    {
-        // Not ready? No problem! We'll try again later.
-        return false;
-    }
+    if (ublox.moduleQueried.SIV)
+        setNumSatellites(ublox.getSIV(0));

-    fixType = ublox.getFixType();
-#ifdef UBLOX_EXTRAVERBOSE
-    DEBUG_MSG("FixType=%d\n", fixType);
-#endif
+    if (ublox.moduleQueried.pDOP)
+        dop = ublox.getPDOP(0); // PDOP (an accuracy metric) is reported in 10^2 units so we have to scale down when we use it

+    // we only notify if position has changed due to a new fix
+    if ((fixType >= 3 && fixType <= 4)) {
+        if (ublox.moduleQueried.latitude) // rd fixes only
+        {
+            latitude = ublox.getLatitude(0);
+            longitude = ublox.getLongitude(0);
+            altitude = ublox.getAltitudeMSL(0) / 1000; // in mm convert to meters

-    // check if GPS has an acceptable lock
-    if (! hasLock()) {
-        ublox.flushPVT();  // reset ALL freshness flags
-        return false;
-    }
+            // Note: heading is only currently implmented in the ublox for the 8m chipset - therefore
+            // don't read it here - it will generate an ignored getPVT command on the 6ms
+            // heading = ublox.getHeading(0);

-    // read lat/lon/alt/dop data into temporary variables to avoid
-    // overwriting global variables with potentially invalid data
-    int32_t tmp_dop = ublox.getPDOP(0); // PDOP (an accuracy metric) is reported in 10^2 units so we have to scale down when we use it
-    int32_t tmp_lat = ublox.getLatitude(0);
-    int32_t tmp_lon = ublox.getLongitude(0);
-    int32_t tmp_alt_msl = ublox.getAltitudeMSL(0);
-    int32_t tmp_alt_hae = ublox.getAltitude(0);
-    int32_t max_dop = PDOP_INVALID;
-    if (radioConfig.preferences.gps_max_dop)
-        max_dop = radioConfig.preferences.gps_max_dop * 100;  // scaling
-
-    // Note: heading is only currently implmented in the ublox for the 8m chipset - therefore
-    // don't read it here - it will generate an ignored getPVT command on the 6ms
-    // heading = ublox.getHeading(0);
-
-    // read positional timestamp
-    struct tm t;
-    t.tm_sec = ublox.getSecond(0);
-    t.tm_min = ublox.getMinute(0);
-    t.tm_hour = ublox.getHour(0);
-    t.tm_mday = ublox.getDay(0);
-    t.tm_mon = ublox.getMonth(0) - 1;
-    t.tm_year = ublox.getYear(0) - 1900;
-    t.tm_isdst = false;
-
-    time_t tmp_ts = mktime(&t);
-
-    // FIXME - can opportunistically attempt to set RTC from GPS timestamp?
-
-    // bogus lat lon is reported as 0 or 0 (can be bogus just for one)
-    // Also: apparently when the GPS is initially reporting lock it can output a bogus latitude > 90 deg!
-    // FIXME - NULL ISLAND is a real location on Earth!
-    foundLocation = (tmp_lat != 0) && (tmp_lon != 0) && 
-                    (tmp_lat <= 900000000) && (tmp_lat >= -900000000) &&
-                    (tmp_dop < max_dop);
-
-    // only if entire dataset is valid, update globals from temp vars
-    if (foundLocation) {
-        p.location_source = Position_LocSource_LOCSRC_GPS_INTERNAL;
-        p.longitude_i = tmp_lon;
-        p.latitude_i = tmp_lat;
-        if (fixType > 2) {
-            // if fix is 2d, ignore altitude data
-            p.altitude = tmp_alt_msl / 1000;
-            p.altitude_hae = tmp_alt_hae / 1000;
-            p.alt_geoid_sep = (tmp_alt_hae - tmp_alt_msl) / 1000;
-        } else {
-#ifdef GPS_EXTRAVERBOSE
-            DEBUG_MSG("no altitude data (fixType=%d)\n", fixType);
-#endif
-            // clean up old values in case it's a 3d-2d fix transition
-            p.altitude = p.altitude_hae = p.alt_geoid_sep = 0;
+            // bogus lat lon is reported as 0 or 0 (can be bogus just for one)
+            // Also: apparently when the GPS is initially reporting lock it can output a bogus latitude > 90 deg!
+            foundLocation = (latitude != 0) && (longitude != 0) && (latitude <= 900000000 && latitude >= -900000000);
        }
-        p.pos_timestamp = tmp_ts;
-        p.PDOP = tmp_dop;
-        p.fix_type = fixType;
-        p.sats_in_view = ublox.getSIV(0);
-        // In debug logs, identify position by @timestamp:stage (stage 1 = birth)
-        DEBUG_MSG("lookForLocation() new pos@%x:1\n", tmp_ts);
-    } else {
-        // INVALID solution - should never happen
-        DEBUG_MSG("Invalid location lat/lon/hae/dop %d/%d/%d/%d - discarded\n",
-                tmp_lat, tmp_lon, tmp_alt_hae, tmp_dop);
    }

-    ublox.flushPVT();  // reset ALL freshness flags at the end
-
    return foundLocation;
 }

-bool UBloxGPS::hasLock()
-{
-    if (radioConfig.preferences.gps_accept_2d)
-        return (fixType >= 2 && fixType <= 4);
-    else
-        return (fixType >= 3 && fixType <= 4);
-}
-
 bool UBloxGPS::whileIdle()
 {
    // if using i2c or serial look too see if any chars are ready
@@ -306,20 +201,15 @@ bool UBloxGPS::whileIdle()
 /// Note: ublox doesn't need a wake method, because as soon as we send chars to the GPS it will wake up
 void UBloxGPS::sleep()
 {
-    if (radioConfig.preferences.gps_update_interval > UBLOX_POWEROFF_THRESHOLD) {
-        // Tell GPS to power down until we send it characters on serial port (we leave vcc connected)
-        ublox.powerOff();
-        // setGPSPower(false);
-    }
+    // Tell GPS to power down until we send it characters on serial port (we leave vcc connected)
+    ublox.powerOff();
+    // setGPSPower(false);
 }

 void UBloxGPS::wake()
 {
-    if (radioConfig.preferences.gps_update_interval > UBLOX_POWEROFF_THRESHOLD) {
-        fixType = 0; // assume we have no fix yet
-    }
+    fixType = 0; // assume we hace no fix yet

-    // this is idempotent
    setGPSPower(true);

    // Note: no delay needed because now we leave gps power on always and instead use ublox.powerOff()
--- a/src/gps/UBloxGPS.h
+++ b/src/gps/UBloxGPS.h
@@ -54,7 +54,6 @@ class UBloxGPS : public GPS
     * @return true if we've acquired a new location
     */
    virtual bool lookForLocation();
-    virtual bool hasLock();

    /// If possible force the GPS into sleep/low power mode
    virtual void sleep();
--- a/src/graphics/Screen.cpp
+++ b/src/graphics/Screen.cpp
@@ -27,19 +27,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "NodeDB.h"
 #include "Screen.h"
 #include "fonts.h"
-#include "gps/GeoCoord.h"
 #include "gps/RTC.h"
 #include "graphics/images.h"
 #include "main.h"
 #include "mesh-pb-constants.h"
 #include "mesh/Channels.h"
 #include "plugins/TextMessagePlugin.h"
-#include "sleep.h"
 #include "target_specific.h"
 #include "utils.h"

 #ifndef NO_ESP32
-#include "esp_task_wdt.h"
 #include "mesh/http/WiFiAPClient.h"
 #endif

@@ -75,9 +72,6 @@ std::vector<MeshPlugin *> pluginFrames;
 // Stores the last 4 of our hardware ID, to make finding the device for pairing easier
 static char ourId[5];

-// GeoCoord object for the screen
-GeoCoord geoCoord;
-
 #ifdef SHOW_REDRAWS
 static bool heartbeat = false;
 #endif
@@ -149,26 +143,6 @@ static void drawBootScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int1
    drawIconScreen(region, display, state, x, y);
 }

-// Used on boot when a certificate is being created
-static void drawSSLScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
-{
-    display->setTextAlignment(TEXT_ALIGN_CENTER);
-    display->setFont(FONT_SMALL);
-    display->drawString(64 + x, y, "Creating SSL certificate");
-
-#ifndef NO_ESP32
-    yield();
-    esp_task_wdt_reset();
-#endif
-
-    display->setFont(FONT_SMALL);
-    if ((millis() / 1000) % 2) {
-        display->drawString(64 + x, FONT_HEIGHT_SMALL + y + 2, "Please wait . . .");
-    } else {
-        display->drawString(64 + x, FONT_HEIGHT_SMALL + y + 2, "Please wait . .  ");
-    }
-}
-
 #ifdef HAS_EINK
 /// Used on eink displays while in deep sleep
 static void drawSleepScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
@@ -226,11 +200,7 @@ static void drawFrameFirmware(OLEDDisplay *display, OLEDDisplayUiState *state, i
    display->drawString(64 + x, y, "Updating");

    display->setFont(FONT_SMALL);
-    if ((millis() / 1000) % 2) {
-        display->drawString(64 + x, FONT_HEIGHT_SMALL + y + 2, "Please wait . . .");
-    } else {
-        display->drawString(64 + x, FONT_HEIGHT_SMALL + y + 2, "Please wait . .  ");
-    }
+    display->drawString(64 + x, FONT_HEIGHT_SMALL + y + 2, "Please wait...");

    // display->setFont(FONT_LARGE);
    // display->drawString(64 + x, 26 + y, btPIN);
@@ -252,13 +222,6 @@ static void drawCriticalFaultFrame(OLEDDisplay *display, OLEDDisplayUiState *sta
    display->drawString(0 + x, FONT_HEIGHT_MEDIUM + y, "For help, please post on\nmeshtastic.discourse.group");
 }

-// Ignore messages orginating from phone (from the current node 0x0) unless range test or store and forward plugin are enabled
-static bool shouldDrawMessage(const MeshPacket *packet)
-{
-    return packet->from != 0 && !radioConfig.preferences.range_test_plugin_enabled &&
-           !radioConfig.preferences.store_forward_plugin_enabled;
-}
-
 /// Draw the last text message we received
 static void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
 {
@@ -370,11 +333,6 @@ static void drawNodes(OLEDDisplay *display, int16_t x, int16_t y, NodeStatus *no
 // Draw GPS status summary
 static void drawGPS(OLEDDisplay *display, int16_t x, int16_t y, const GPSStatus *gps)
 {
-    if (radioConfig.preferences.fixed_position) {
-        // GPS coordinates are currently fixed
-        display->drawString(x - 1, y - 2, "Fixed GPS");
-        return;
-    }
    if (!gps->getIsConnected()) {
        display->drawString(x, y - 2, "No GPS");
        return;
@@ -409,15 +367,15 @@ static void drawGPS(OLEDDisplay *display, int16_t x, int16_t y, const GPSStatus
 static void drawGPSAltitude(OLEDDisplay *display, int16_t x, int16_t y, const GPSStatus *gps)
 {
    String displayLine = "";
-    if (!gps->getIsConnected() && !radioConfig.preferences.fixed_position) {
+    if (!gps->getIsConnected()) {
        // displayLine = "No GPS Module";
        // display->drawString(x + (SCREEN_WIDTH - (display->getStringWidth(displayLine))) / 2, y, displayLine);
-    } else if (!gps->getHasLock() && !radioConfig.preferences.fixed_position) {
+    } else if (!gps->getHasLock()) {
        // displayLine = "No GPS Lock";
        // display->drawString(x + (SCREEN_WIDTH - (display->getStringWidth(displayLine))) / 2, y, displayLine);
    } else {
-        geoCoord.updateCoords(int32_t(gps->getLatitude()), int32_t(gps->getLongitude()), int32_t(gps->getAltitude()));
-        displayLine = "Altitude: " + String(geoCoord.getAltitude()) + "m";
+
+        displayLine = "Altitude: " + String(gps->getAltitude()) + "m";
        display->drawString(x + (SCREEN_WIDTH - (display->getStringWidth(displayLine))) / 2, y, displayLine);
    }
 }
@@ -425,63 +383,76 @@ static void drawGPSAltitude(OLEDDisplay *display, int16_t x, int16_t y, const GP
 // Draw GPS status coordinates
 static void drawGPScoordinates(OLEDDisplay *display, int16_t x, int16_t y, const GPSStatus *gps)
 {
-    auto gpsFormat = radioConfig.preferences.gps_format;
    String displayLine = "";
-
-    if (!gps->getIsConnected() && !radioConfig.preferences.fixed_position) {
+    if (!gps->getIsConnected()) {
        displayLine = "No GPS Module";
        display->drawString(x + (SCREEN_WIDTH - (display->getStringWidth(displayLine))) / 2, y, displayLine);
-    } else if (!gps->getHasLock() && !radioConfig.preferences.fixed_position) {
+    } else if (!gps->getHasLock()) {
        displayLine = "No GPS Lock";
        display->drawString(x + (SCREEN_WIDTH - (display->getStringWidth(displayLine))) / 2, y, displayLine);
    } else {
-
-        if (gpsFormat != GpsCoordinateFormat_GpsFormatDMS) {
-            char coordinateLine[22];
-            geoCoord.updateCoords(int32_t(gps->getLatitude()), int32_t(gps->getLongitude()), int32_t(gps->getAltitude()));
-            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(),
-                        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(),
-                        geoCoord.getMGRSEast100k(), geoCoord.getMGRSNorth100k(), geoCoord.getMGRSEasting(),
-                        geoCoord.getMGRSNorthing());
-            } else if (gpsFormat == GpsCoordinateFormat_GpsFormatOLC) { // Open Location Code
-                geoCoord.getOLCCode(coordinateLine);
-            } else if (gpsFormat == GpsCoordinateFormat_GpsFormatOSGR) {              // Ordnance Survey Grid Reference
-                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(),
-                            geoCoord.getOSGREasting(), geoCoord.getOSGRNorthing());
-            }
-
-            // If fixed position, display text "Fixed GPS" alternating with the coordinates.
-            if (radioConfig.preferences.fixed_position) {
-                if ((millis() / 10000) % 2) {
-                    display->drawString(x + (SCREEN_WIDTH - (display->getStringWidth(coordinateLine))) / 2, y, coordinateLine);
-                } else {
-                    display->drawString(x + (SCREEN_WIDTH - (display->getStringWidth("Fixed GPS"))) / 2, y, "Fixed GPS");
-                }
-            } else {
-                display->drawString(x + (SCREEN_WIDTH - (display->getStringWidth(coordinateLine))) / 2, y, coordinateLine);
-            }
-
-        } else {
-            char latLine[22];
-            char lonLine[22];
-            sprintf(latLine, "%2i° %2i' %2.4f\" %1c", geoCoord.getDMSLatDeg(), geoCoord.getDMSLatMin(), geoCoord.getDMSLatSec(),
-                    geoCoord.getDMSLatCP());
-            sprintf(lonLine, "%3i° %2i' %2.4f\" %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);
-        }
+        char coordinateLine[22];
+        sprintf(coordinateLine, "%f %f", gps->getLatitude() * 1e-7, gps->getLongitude() * 1e-7);
+        display->drawString(x + (SCREEN_WIDTH - (display->getStringWidth(coordinateLine))) / 2, y, coordinateLine);
    }
 }

+/// Ported from my old java code, returns distance in meters along the globe
+/// surface (by magic?)
+static float latLongToMeter(double lat_a, double lng_a, double lat_b, double lng_b)
+{
+    double pk = (180 / 3.14169);
+    double a1 = lat_a / pk;
+    double a2 = lng_a / pk;
+    double b1 = lat_b / pk;
+    double b2 = lng_b / pk;
+    double cos_b1 = cos(b1);
+    double cos_a1 = cos(a1);
+    double t1 = cos_a1 * cos(a2) * cos_b1 * cos(b2);
+    double t2 = cos_a1 * sin(a2) * cos_b1 * sin(b2);
+    double t3 = sin(a1) * sin(b1);
+    double tt = acos(t1 + t2 + t3);
+    if (isnan(tt))
+        tt = 0.0; // Must have been the same point?
+
+    return (float)(6366000 * tt);
+}
+
+static inline double toRadians(double deg)
+{
+    return deg * PI / 180;
+}
+
+static inline double toDegrees(double r)
+{
+    return r * 180 / PI;
+}
+
+/**
+ * Computes the bearing in degrees between two points on Earth.  Ported from my
+ * old Gaggle android app.
+ *
+ * @param lat1
+ * Latitude of the first point
+ * @param lon1
+ * Longitude of the first point
+ * @param lat2
+ * Latitude of the second point
+ * @param lon2
+ * Longitude of the second point
+ * @return Bearing between the two points in radians. A value of 0 means due
+ * north.
+ */
+static float bearing(double lat1, double lon1, double lat2, double lon2)
+{
+    double lat1Rad = toRadians(lat1);
+    double lat2Rad = toRadians(lat2);
+    double deltaLonRad = toRadians(lon2 - lon1);
+    double y = sin(deltaLonRad) * cos(lat2Rad);
+    double x = cos(lat1Rad) * sin(lat2Rad) - (sin(lat1Rad) * cos(lat2Rad) * cos(deltaLonRad));
+    return atan2(y, x);
+}
+
 namespace
 {

@@ -542,11 +513,11 @@ static float estimatedHeading(double lat, double lon)
        return b;
    }

-    float d = GeoCoord::latLongToMeter(oldLat, oldLon, lat, lon);
+    float d = latLongToMeter(oldLat, oldLon, lat, lon);
    if (d < 10) // haven't moved enough, just keep current bearing
        return b;

-    b = GeoCoord::bearing(oldLat, oldLon, lat, lon);
+    b = bearing(oldLat, oldLon, lat, lon);
    oldLat = lat;
    oldLon = lon;

@@ -619,6 +590,11 @@ static void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_
            n = nodeDB.getNodeByIndex(nodeIndex);
        }
        displayedNodeNum = n->num;
+
+        // We just changed to a new node screen, ask that node for updated state if it's older than 2 minutes
+        if (sinceLastSeen(n) > 120) {
+            service.sendNetworkPing(displayedNodeNum, true);
+        }
    }

    NodeInfo *node = nodeDB.getNodeByIndex(nodeIndex);
@@ -661,8 +637,7 @@ static void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_
            // display direction toward node
            hasNodeHeading = true;
            Position &p = node->position;
-            float d =
-                GeoCoord::latLongToMeter(DegD(p.latitude_i), DegD(p.longitude_i), DegD(op.latitude_i), DegD(op.longitude_i));
+            float d = latLongToMeter(DegD(p.latitude_i), DegD(p.longitude_i), DegD(op.latitude_i), DegD(op.longitude_i));
            if (d < 2000)
                snprintf(distStr, sizeof(distStr), "%.0f m", d);
            else
@@ -670,8 +645,7 @@ static void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_

            // FIXME, also keep the guess at the operators heading and add/substract
            // 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));
+            float bearingToOther = bearing(DegD(p.latitude_i), DegD(p.longitude_i), DegD(op.latitude_i), DegD(op.longitude_i));
            headingRadian = bearingToOther - myHeading;
            drawNodeHeading(display, compassX, compassY, headingRadian);
        }
@@ -712,7 +686,6 @@ void _screen_header()

 Screen::Screen(uint8_t address, int sda, int scl) : OSThread("Screen"), cmdQueue(32), dispdev(address, sda, scl), ui(&dispdev)
 {
-    address_found = address;
    cmdQueue.setReader(this);
 }

@@ -830,8 +803,6 @@ void Screen::forceDisplay()
 #endif
 }

-static uint32_t lastScreenTransition;
-
 int32_t Screen::runOnce()
 {
    // If we don't have a screen, don't ever spend any CPU for us.
@@ -900,11 +871,6 @@ int32_t Screen::runOnce()
        // oldFrameState = ui.getUiState()->frameState;
        DEBUG_MSG("Setting idle framerate\n");
        targetFramerate = IDLE_FRAMERATE;
-
-#ifndef NO_ESP32
-        setCPUFast(false); // Turn up the CPU to improve screen animations
-#endif
-
        ui.setTargetFPS(targetFramerate);
        forceDisplay();
    }
@@ -913,11 +879,6 @@ int32_t Screen::runOnce()
    // standard screen switching is stopped.
    if (showingNormalScreen) {
        // standard screen loop handling here
-        if (radioConfig.preferences.auto_screen_carousel_secs > 0 &&
-            (millis() - lastScreenTransition) > (radioConfig.preferences.auto_screen_carousel_secs * 1000)) {
-            DEBUG_MSG("LastScreenTransition exceeded %ums transitioning to next frame\n", (millis() - lastScreenTransition));
-            handleOnPress();
-        }
    }

    // DEBUG_MSG("want fps %d, fixed=%d\n", targetFramerate,
@@ -946,18 +907,6 @@ void Screen::drawDebugInfoWiFiTrampoline(OLEDDisplay *display, OLEDDisplayUiStat
    screen->debugInfo.drawFrameWiFi(display, state, x, y);
 }

-/* show a message that the SSL cert is being built
- * it is expected that this will be used during the boot phase */
-void Screen::setSSLFrames()
-{
-    if (address_found) {
-        // DEBUG_MSG("showing SSL frames\n");
-        static FrameCallback sslFrames[] = {drawSSLScreen};
-        ui.setFrames(sslFrames, 1);
-        ui.update();
-    }
-}
-
 // restore our regular frame list
 void Screen::setFrames()
 {
@@ -992,10 +941,9 @@ void Screen::setFrames()
    if (myNodeInfo.error_code)
        normalFrames[numframes++] = drawCriticalFaultFrame;

-    // If we have a text message - show it next, unless it's a phone message and we aren't using any special plugins
-    if (devicestate.has_rx_text_message && shouldDrawMessage(&devicestate.rx_text_message)) {
+    // If we have a text message - show it next
+    if (devicestate.has_rx_text_message)
        normalFrames[numframes++] = drawTextMessageFrame;
-    }

    // then all the nodes
    // We only show a few nodes in our scrolling list - because meshes with many nodes would have too many screens
@@ -1090,8 +1038,7 @@ void Screen::handleOnPress()
    // If we are in a transition, the press must have bounced, drop it.
    if (ui.getUiState()->frameState == FIXED) {
        ui.nextFrame();
-        DEBUG_MSG("Setting LastScreenTransition\n");
-        lastScreenTransition = millis();
+
        setFastFramerate();
    }
 }
@@ -1106,11 +1053,6 @@ void Screen::setFastFramerate()

    // We are about to start a transition so speed up fps
    targetFramerate = SCREEN_TRANSITION_FRAMERATE;
-
-#ifndef NO_ESP32
-    setCPUFast(true); // Turn up the CPU to improve screen animations
-#endif
-
    ui.setTargetFPS(targetFramerate);
    setInterval(0); // redraw ASAP
    runASAP = true;
@@ -1202,7 +1144,7 @@ void DebugInfo::drawFrameWiFi(OLEDDisplay *display, OLEDDisplayUiState *state, i
        if (radioConfig.preferences.wifi_ap_mode || isSoftAPForced()) {
            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "IP: " + String(WiFi.softAPIP().toString().c_str()));

-            // Number of connections to the AP. Default max for the esp32 is 4
+            // Number of connections to the AP. Default mmax for the esp32 is 4
            display->drawString(x + SCREEN_WIDTH - display->getStringWidth("(" + String(WiFi.softAPgetStationNum()) + "/4)"),
                                y + FONT_HEIGHT_SMALL * 1, "(" + String(WiFi.softAPgetStationNum()) + "/4)");
        } else {
@@ -1336,24 +1278,7 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
        display->drawString(x, y, String("USB"));
    }

-    auto mode = "";
-
-    if (channels.getPrimary().modem_config == 0) {
-        mode = "ShrtSlow";
-    } else if (channels.getPrimary().modem_config == 1) {
-        mode = "ShrtFast";
-    } else if (channels.getPrimary().modem_config == 2) {
-        mode = "LngFast";
-    } else if (channels.getPrimary().modem_config == 3) {
-        mode = "LngSlow";
-    } else if (channels.getPrimary().modem_config == 4) {
-        mode = "MedSlow";
-    } else if (channels.getPrimary().modem_config == 5) {
-        mode = "MedFast";
-    } else {
-        mode = "Custom";
-    }
-
+    auto mode = "Mode " + String(channels.getPrimary().modem_config);
    display->drawString(x + SCREEN_WIDTH - display->getStringWidth(mode), y, mode);

    // Line 2
@@ -1398,15 +1323,14 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat

    display->drawString(x, y + FONT_HEIGHT_SMALL * 1, uptime);

-    // Display Channel Utilization
-    char chUtil[13];
-    sprintf(chUtil, "ChUtil %2.0f%%", airTime->channelUtilizationPercent());
-    display->drawString(x + SCREEN_WIDTH - display->getStringWidth(chUtil),
-                        y + FONT_HEIGHT_SMALL * 1, chUtil);
+#ifndef NO_ESP32
+    // Show CPU Frequency.
+    display->drawString(x + SCREEN_WIDTH - display->getStringWidth("CPU " + String(getCpuFrequencyMhz()) + "MHz"),
+                        y + FONT_HEIGHT_SMALL * 1, "CPU " + String(getCpuFrequencyMhz()) + "MHz");
+#endif

    // Line 3
-    if (radioConfig.preferences.gps_format != GpsCoordinateFormat_GpsFormatDMS) // if DMS then don't draw altitude
-        drawGPSAltitude(display, x, y + FONT_HEIGHT_SMALL * 2, gpsStatus);
+    drawGPSAltitude(display, x, y + FONT_HEIGHT_SMALL * 2, gpsStatus);

    // Line 4
    drawGPScoordinates(display, x, y + FONT_HEIGHT_SMALL * 3, gpsStatus);
@@ -1448,7 +1372,7 @@ int Screen::handleStatusUpdate(const meshtastic::Status *arg)
    return 0;
 }

-int Screen::handleTextMessage(const MeshPacket *packet)
+int Screen::handleTextMessage(const MeshPacket *arg)
 {
    if (showingNormalScreen) {
        setFrames(); // Regen the list of screens (will show new text message)
--- a/src/graphics/Screen.h
+++ b/src/graphics/Screen.h
@@ -97,8 +97,6 @@ class Screen : public concurrency::OSThread
    Screen(const Screen &) = delete;
    Screen &operator=(const Screen &) = delete;

-    uint8_t address_found;
-
    /// Initializes the UI, turns on the display, starts showing boot screen.
    //
    // Not thread safe - must be called before any other methods are called.
@@ -222,9 +220,6 @@ class Screen : public concurrency::OSThread
    /// Used to force (super slow) eink displays to draw critical frames
    void forceDisplay();

-    /// Draws our SSL cert screen during boot (called from WebServer)
-    void setSSLFrames();
-
  protected:
    /// Updates the UI.
    //
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -39,8 +39,6 @@

 #include "RF95Interface.h"
 #include "SX1262Interface.h"
-#include "SX1268Interface.h"
-#include "LLCC68Interface.h"

 #ifdef NRF52_SERIES
 #include "variant.h"
@@ -134,8 +132,6 @@ static int32_t ledBlinker()
    return powerStatus->getIsCharging() ? 1000 : (ledOn ? 1 : 1000);
 }

-uint32_t timeLastPowered = 0;
-
 /// Wrapper to convert our powerFSM stuff into a 'thread'
 class PowerFSMThread : public OSThread
 {
@@ -153,13 +149,6 @@ class PowerFSMThread : public OSThread
        auto state = powerFSM.getState();
        canSleep = (state != &statePOWER) && (state != &stateSERIAL);

-        if (powerStatus->getHasUSB()) {
-            timeLastPowered = millis();
-        } else if (radioConfig.preferences.on_battery_shutdown_after_secs > 0 && 
-                    millis() > timeLastPowered + (1000 * radioConfig.preferences.on_battery_shutdown_after_secs)) { //shutdown after 30 minutes unpowered
-            powerFSM.trigger(EVENT_SHUTDOWN);
-        }
-        
        return 10;
    }
 };
@@ -187,9 +176,6 @@ class ButtonThread : public OSThread
 #endif
 #ifdef BUTTON_PIN_ALT
    OneButton userButtonAlt;
-#endif
-#ifdef BUTTON_PIN_TOUCH
-    OneButton userButtonTouch;
 #endif
    static bool shutdown_on_long_stop;

@@ -208,7 +194,6 @@ class ButtonThread : public OSThread
        userButton.attachClick(userButtonPressed);
        userButton.attachDuringLongPress(userButtonPressedLong);
        userButton.attachDoubleClick(userButtonDoublePressed);
-        userButton.attachMultiClick(userButtonMultiPressed);
        userButton.attachLongPressStart(userButtonPressedLongStart);
        userButton.attachLongPressStop(userButtonPressedLongStop);
        wakeOnIrq(BUTTON_PIN, FALLING);
@@ -226,21 +211,6 @@ class ButtonThread : public OSThread
        userButtonAlt.attachLongPressStop(userButtonPressedLongStop);
        wakeOnIrq(BUTTON_PIN_ALT, FALLING);
 #endif
-
-#ifdef BUTTON_PIN_TOUCH
-        userButtonTouch = OneButton(BUTTON_PIN_TOUCH, true, true);
-#ifdef INPUT_PULLUP_SENSE
-        // Some platforms (nrf52) have a SENSE variant which allows wake from sleep - override what OneButton did
-        pinMode(BUTTON_PIN_TOUCH, INPUT_PULLUP_SENSE);
-#endif
-        userButtonTouch.attachClick(touchPressed);
-        userButtonTouch.attachDuringLongPress(touchPressedLong);
-        userButtonTouch.attachDoubleClick(touchDoublePressed);
-        userButtonTouch.attachLongPressStart(touchPressedLongStart);
-        userButtonTouch.attachLongPressStop(touchPressedLongStop);
-        wakeOnIrq(BUTTON_PIN_TOUCH, FALLING);
-#endif
-
    }

  protected:
@@ -256,10 +226,6 @@ class ButtonThread : public OSThread
 #ifdef BUTTON_PIN_ALT
        userButtonAlt.tick();
        canSleep &= userButtonAlt.isIdle();
-#endif
-#ifdef BUTTON_PIN_TOUCH
-        userButtonTouch.tick();
-        canSleep &= userButtonTouch.isIdle();
 #endif
        // if (!canSleep) DEBUG_MSG("Supressing sleep!\n");
        // else DEBUG_MSG("sleep ok\n");
@@ -268,33 +234,6 @@ class ButtonThread : public OSThread
    }

  private:
-    static void touchPressed()
-    {        
-        screen->forceDisplay();
-        DEBUG_MSG("touch press!\n");       
-    }
-    static void touchDoublePressed()
-    {
-        DEBUG_MSG("touch double press!\n");       
-    }
-    static void touchPressedLong()
-    {
-        DEBUG_MSG("touch press long!\n");       
-    }
-    static void touchDoublePressedLong()
-    {
-        DEBUG_MSG("touch double pressed!\n");       
-    }
-    static void touchPressedLongStart()
-    {        
-        DEBUG_MSG("touch long press start!\n");       
-    }
-    static void touchPressedLongStop()
-    {       
-        DEBUG_MSG("touch long press stop!\n");       
-    }
-
-
    static void userButtonPressed()
    {
        // DEBUG_MSG("press!\n");
@@ -332,19 +271,9 @@ class ButtonThread : public OSThread
    {
 #ifndef NO_ESP32
        disablePin();
-#elif defined(HAS_EINK)
-        digitalWrite(PIN_EINK_EN,digitalRead(PIN_EINK_EN) == LOW);
 #endif
    }

-    static void userButtonMultiPressed()
-    {
-#ifndef NO_ESP32
-        clearNVS();
-#endif
-    }
-
-
    static void userButtonPressedLongStart()
    {
        DEBUG_MSG("Long press start!\n");
@@ -397,8 +326,6 @@ void setup()
    }
 #endif

-    DEBUG_MSG("\n\n//\\ E S H T /\\ S T / C\n\n");
-
    initDeepSleep();

 #ifdef VEXT_ENABLE
@@ -564,10 +491,10 @@ void setup()
        }
    }

-#ifdef SX126X_ANT_SW
-    // make analog PA vs not PA switch on SX126x eval board work properly
-    pinMode(SX126X_ANT_SW, OUTPUT);
-    digitalWrite(SX126X_ANT_SW, 1);
+#ifdef SX1262_ANT_SW
+    // make analog PA vs not PA switch on SX1262 eval board work properly
+    pinMode(SX1262_ANT_SW, OUTPUT);
+    digitalWrite(SX1262_ANT_SW, 1);
 #endif

    // radio init MUST BE AFTER service.init, so we have our radio config settings (from nodedb init)
@@ -585,9 +512,9 @@ void setup()
    }
 #endif

-#if defined(USE_SX1262)
+#if defined(SX1262_CS)
    if (!rIf) {
-        rIf = new SX1262Interface(SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY, SPI);
+        rIf = new SX1262Interface(SX1262_CS, SX1262_DIO1, SX1262_RESET, SX1262_BUSY, SPI);
        if (!rIf->init()) {
            DEBUG_MSG("Warning: Failed to find SX1262 radio\n");
            delete rIf;
@@ -598,32 +525,6 @@ void setup()
    }
 #endif

-#if defined(USE_SX1268)
-    if (!rIf) {
-        rIf = new SX1268Interface(SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY, SPI);
-        if (!rIf->init()) {
-            DEBUG_MSG("Warning: Failed to find SX1268 radio\n");
-            delete rIf;
-            rIf = NULL;
-        } else {
-            DEBUG_MSG("SX1268 Radio init succeeded, using SX1268 radio\n");
-        }
-    }
-#endif
-
-#if defined(USE_LLCC68)
-    if (!rIf) {
-        rIf = new LLCC68Interface(SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY, SPI);
-        if (!rIf->init()) {
-            DEBUG_MSG("Warning: Failed to find LLCC68 radio\n");
-            delete rIf;
-            rIf = NULL;
-        } else {
-            DEBUG_MSG("LLCC68 Radio init succeeded, using LLCC68 radio\n");
-        }
-    }
-#endif
-
 #ifdef USE_SIM_RADIO
    if (!rIf) {
        rIf = new SimRadio;
@@ -661,14 +562,6 @@ void setup()
    else
        router->addInterface(rIf);

-    // Calculate and save the bit rate to myNodeInfo
-    // TODO: This needs to be added what ever method changes the channel from the phone.
-    myNodeInfo.bitrate = (float(Constants_DATA_PAYLOAD_LEN) / 
-                    (float(rIf->getPacketTime(Constants_DATA_PAYLOAD_LEN)))
-                    ) * 1000;
-    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
    powerFSMthread = new PowerFSMThread();
--- a/src/mesh/Channels.cpp
+++ b/src/mesh/Channels.cpp
@@ -217,23 +217,17 @@ const char *Channels::getName(size_t chIndex)
        else
            switch (channelSettings.modem_config) {
            case ChannelSettings_ModemConfig_Bw125Cr45Sf128:
-                channelName = "ShortSlow";
+                channelName = "Medium";
                break;
            case ChannelSettings_ModemConfig_Bw500Cr45Sf128:
                channelName = "ShortFast";
                break;
            case ChannelSettings_ModemConfig_Bw31_25Cr48Sf512:
-                channelName = "LongFast";
+                channelName = "LongAlt";
                break;
            case ChannelSettings_ModemConfig_Bw125Cr48Sf4096:
                channelName = "LongSlow";
                break;
-            case ChannelSettings_ModemConfig_Bw250Cr46Sf2048:
-                channelName = "MediumSlow";
-                break;
-            case ChannelSettings_ModemConfig_Bw250Cr47Sf1024:
-                channelName = "MediumFast";
-                break;
            default:
                channelName = "Invalid";
                break;
--- a/src/mesh/FloodingRouter.cpp
+++ b/src/mesh/FloodingRouter.cpp
@@ -17,7 +17,7 @@ ErrorCode FloodingRouter::send(MeshPacket *p)
    return Router::send(p);
 }

-bool FloodingRouter::shouldFilterReceived(MeshPacket *p)
+bool FloodingRouter::shouldFilterReceived(const MeshPacket *p)
 {
    if (wasSeenRecently(p)) { // Note: this will also add a recent packet record
        printPacket("Ignoring incoming msg, because we've already seen it", p);
--- a/src/mesh/FloodingRouter.h
+++ b/src/mesh/FloodingRouter.h
@@ -50,7 +50,7 @@ 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(const MeshPacket *p);

    /**
     * Look for broadcasts we need to rebroadcast
--- a/src/mesh/InterfacesTemplates.cpp
+++ b/src/mesh/InterfacesTemplates.cpp
@@ -1,7 +0,0 @@
-#include "SX126xInterface.h"
-#include "SX126xInterface.cpp"
-
-// We need this declaration for proper linking in derived classes
-template class SX126xInterface<SX1262>;
-template class SX126xInterface<SX1268>;
-template class SX126xInterface<LLCC68>;
--- a/src/mesh/LLCC68Interface.cpp
+++ b/src/mesh/LLCC68Interface.cpp
@@ -1,9 +0,0 @@
-#include "configuration.h"
-#include "LLCC68Interface.h"
-#include "error.h"
-
-LLCC68Interface::LLCC68Interface(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, RADIOLIB_PIN_TYPE busy,
-                                 SPIClass &spi)
-    : SX126xInterface(cs, irq, rst, busy, spi)
-{
-}
--- a/src/mesh/LLCC68Interface.h
+++ b/src/mesh/LLCC68Interface.h
@@ -1,17 +0,0 @@
-#pragma once
-
-#include "SX126xInterface.h"
-
-/**
- * Our adapter for LLCC68 radios
- * https://www.semtech.com/products/wireless-rf/lora-core/llcc68
- * ⚠️⚠️⚠️
- * Be aware that LLCC68 does not support Spreading Factor 12 (SF12) and will not work on the default "Long Slow" channel.
- * You must change the channel if you get `Critical Error #3` with this module.
- * ⚠️⚠️⚠️
- */
-class LLCC68Interface : public SX126xInterface<LLCC68>
-{
-  public:
-    LLCC68Interface(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, RADIOLIB_PIN_TYPE busy, SPIClass &spi);
-};
--- a/src/mesh/MeshPlugin.cpp
+++ b/src/mesh/MeshPlugin.cpp
@@ -66,7 +66,7 @@ MeshPacket *MeshPlugin::allocErrorResponse(Routing_Error err, const MeshPacket *
    return r;
 }

-void MeshPlugin::callPlugins(const MeshPacket &mp, RxSource src)
+void MeshPlugin::callPlugins(const MeshPacket &mp)
 {
    // DEBUG_MSG("In call plugins\n");
    bool pluginFound = false;
@@ -79,7 +79,6 @@ void MeshPlugin::callPlugins(const MeshPacket &mp, RxSource src)
    // Was this message directed to us specifically?  Will be false if we are sniffing someone elses packets
    auto ourNodeNum = nodeDB.getNodeNum();
    bool toUs = mp.to == NODENUM_BROADCAST || mp.to == ourNodeNum;
-
    for (auto i = plugins->begin(); i != plugins->end(); ++i) {
        auto &pi = **i;

@@ -88,15 +87,10 @@ void MeshPlugin::callPlugins(const MeshPacket &mp, RxSource src)
        /// We only call plugins that are interested in the packet (and the message is destined to us or we are promiscious)
        bool wantsPacket = (isDecoded || pi.encryptedOk) && (pi.isPromiscuous || toUs) && pi.wantPacket(&mp);

-        if ((src == RX_SRC_LOCAL) && !(pi.loopbackOk)) {
-            // new case, monitor separately for now, then FIXME merge above
-            wantsPacket = false;
-        }
-
        assert(!pi.myReply); // If it is !null it means we have a bug, because it should have been sent the previous time

        if (wantsPacket) {
-            DEBUG_MSG("Plugin '%s' wantsPacket=%d\n", pi.name, wantsPacket);
+            DEBUG_MSG("Plugin %s wantsPacket=%d\n", pi.name, wantsPacket);

            pluginFound = true;

@@ -109,10 +103,7 @@ void MeshPlugin::callPlugins(const MeshPacket &mp, RxSource src)
            /// Also: if a packet comes in on the local PC interface, we don't check for bound channels, because it is TRUSTED and it needs to
            /// to be able to fetch the initial admin packets without yet knowing any channels.

-            bool rxChannelOk = !pi.boundChannel || (mp.from == 0) ||
-                !ch ||
-                strlen(ch->settings.name) > 0 ||
-                strcmp(ch->settings.name, pi.boundChannel);
+            bool rxChannelOk = !pi.boundChannel || (mp.from == 0) || (ch && (strcmp(ch->settings.name, pi.boundChannel) == 0));

            if (!rxChannelOk) {
                // no one should have already replied!
@@ -125,7 +116,7 @@ void MeshPlugin::callPlugins(const MeshPacket &mp, RxSource src)
                    printPacket("packet on wrong channel, but can't respond", &mp);
            } else {

-                ProcessMessage handled = pi.handleReceived(mp);
+                bool handled = pi.handleReceived(mp);

                // Possibly send replies (but only if the message was directed to us specifically, i.e. not for promiscious
                // sniffing) also: we only let the one plugin send a reply, once that happens, remaining plugins are not
@@ -137,9 +128,9 @@ void MeshPlugin::callPlugins(const MeshPacket &mp, RxSource src)
                // any other node.
                if (mp.decoded.want_response && toUs && (getFrom(&mp) != ourNodeNum || mp.to == ourNodeNum) && !currentReply) {
                    pi.sendResponse(mp);
-                    DEBUG_MSG("Plugin '%s' sent a response\n", pi.name);
+                    DEBUG_MSG("Plugin %s sent a response\n", pi.name);
                } else {
-                    DEBUG_MSG("Plugin '%s' considered\n", pi.name);
+                    DEBUG_MSG("Plugin %s considered\n", pi.name);
                }

                // If the requester didn't ask for a response we might need to discard unused replies to prevent memory leaks
@@ -149,8 +140,8 @@ void MeshPlugin::callPlugins(const MeshPacket &mp, RxSource src)
                    pi.myReply = NULL;
                }

-                if (handled == ProcessMessage::STOP) {
-                    DEBUG_MSG("Plugin '%s' handled and skipped other processing\n", pi.name);
+                if (handled) {
+                    DEBUG_MSG("Plugin %s handled and skipped other processing\n", pi.name);
                    break;
                }
            }
@@ -178,9 +169,7 @@ void MeshPlugin::callPlugins(const MeshPacket &mp, RxSource src)
    }

    if (!pluginFound)
-        DEBUG_MSG("No plugins interested in portnum=%d, src=%s\n",
-                    mp.decoded.portnum, 
-                    (src == RX_SRC_LOCAL) ? "LOCAL":"REMOTE");
+        DEBUG_MSG("No plugins interested in portnum=%d\n", mp.decoded.portnum);
 }

 MeshPacket *MeshPlugin::allocReply()
--- a/src/mesh/MeshPlugin.h
+++ b/src/mesh/MeshPlugin.h
@@ -9,18 +9,6 @@
 #include <OLEDDisplayUi.h>
 #endif

-/** handleReceived return enumeration
- * 
- * Use ProcessMessage::CONTINUE to allows other modules to process a message.
- * 
- * Use ProcessMessage::STOP to stop further message processing.
- */
-enum class ProcessMessage
-{
-  CONTINUE = 0,
-  STOP = 1,
-};
-
 /** A baseclass for any mesh "plugin".
 *
 * A plugin allows you to add new features to meshtastic device code, without needing to know messaging details.
@@ -45,7 +33,7 @@ class MeshPlugin

    /** For use only by MeshService
     */
-    static void callPlugins(const MeshPacket &mp, RxSource src = RX_SRC_RADIO);
+    static void callPlugins(const MeshPacket &mp);

    static std::vector<MeshPlugin *> GetMeshPluginsWithUIFrames();
 #ifndef NO_SCREEN
@@ -60,10 +48,6 @@ class MeshPlugin
    */
    bool isPromiscuous = false;

-    /** Also receive a copy of LOCALLY GENERATED messages - most plugins should leave
-     *  this setting disabled - see issue #877 */
-    bool loopbackOk = false;
-
    /** Most plugins only understand decrypted packets.  For plugins that also want to see encrypted packets, they should set this
     * flag */
    bool encryptedOk = false;
@@ -103,9 +87,9 @@ class MeshPlugin

    /** Called to handle a particular incoming message

-    @return ProcessMessage::STOP if you've guaranteed you've handled this message and no other handlers should be considered for it
+    @return true if you've guaranteed you've handled this message and no other handlers should be considered for it
    */
-    virtual ProcessMessage handleReceived(const MeshPacket &mp) { return ProcessMessage::CONTINUE; }
+    virtual bool handleReceived(const MeshPacket &mp) { return false; }

    /** Messages can be received that have the want_response bit set.  If set, this callback will be invoked
     * so that subclasses can (optionally) send a response back to the original sender.
--- a/src/mesh/MeshService.cpp
+++ b/src/mesh/MeshService.cpp
@@ -112,11 +112,7 @@ bool MeshService::reloadConfig()
 /// The owner User record just got updated, update our node DB and broadcast the info into the mesh
 void MeshService::reloadOwner()
 {
-    // DEBUG_MSG("reloadOwner()\n");
-    // update our local data directly
-    nodeDB.updateUser(nodeDB.getNodeNum(), owner);
    assert(nodeInfoPlugin);
-    // update everyone else
    if (nodeInfoPlugin)
        nodeInfoPlugin->sendOurNodeInfo();
    nodeDB.saveToDisk();
@@ -144,7 +140,7 @@ void MeshService::handleToRadio(MeshPacket &p)

    // Send the packet into the mesh

-    sendToMesh(packetPool.allocCopy(p), RX_SRC_USER);
+    sendToMesh(packetPool.allocCopy(p));

    bool loopback = false; // if true send any packet the phone sends back itself (for testing)
    if (loopback) {
@@ -161,12 +157,12 @@ bool MeshService::cancelSending(PacketId id)
    return router->cancelSending(nodeDB.getNodeNum(), id);
 }

-void MeshService::sendToMesh(MeshPacket *p, RxSource src)
+void MeshService::sendToMesh(MeshPacket *p)
 {
    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);
+    router->sendLocal(p);
 }

 void MeshService::sendNetworkPing(NodeNum dest, bool wantReplies)
@@ -213,39 +209,34 @@ NodeInfo *MeshService::refreshMyNodeInfo()
    return node;
 }

-int MeshService::onGPSChanged(const meshtastic::GPSStatus *newStatus)
+int MeshService::onGPSChanged(const meshtastic::GPSStatus *unused)
 {
    // Update our local node info with our position (even if we don't decide to update anyone else)
    NodeInfo *node = refreshMyNodeInfo();
-    Position pos = Position_init_default;
+    Position pos = node->position;

-    if (newStatus->getHasLock()) {
-        // load data from GPS object, will add timestamp + battery further down
-        pos = gps->p;
+    if (gps->hasLock()) {
+        if (gps->altitude != 0)
+            pos.altitude = gps->altitude;
+        pos.latitude_i = gps->latitude;
+        pos.longitude_i = gps->longitude;
    } else {
        // The GPS has lost lock, if we are fixed position we should just keep using
        // the old position
-#if GPS_EXTRAVERBOSE
-        DEBUG_MSG("onGPSchanged() - lost validLocation\n");
-#endif
        if (radioConfig.preferences.fixed_position) {
            DEBUG_MSG("WARNING: Using fixed position\n");
-            pos = node->position;
+        } else {
+            // throw away old position
+            pos.latitude_i = 0;
+            pos.longitude_i = 0;
+            pos.altitude = 0;
        }
    }

-    // Finally add a fresh timestamp and battery level reading
-    // I KNOW this is redundant with refreshMyNodeInfo() above, but these are
-    //   inexpensive nonblocking calls and can be refactored in due course
-    pos.time = getValidTime(RTCQualityGPS);
-    pos.battery_level = powerStatus->getBatteryChargePercent();
-
-    // In debug logs, identify position by @timestamp:stage (stage 4 = nodeDB)
-    DEBUG_MSG("onGPSChanged() pos@%x:4, time=%u, lat=%d, bat=%d\n", 
-                pos.pos_timestamp, pos.time, pos.latitude_i, pos.battery_level);
+    DEBUG_MSG("got gps notify time=%u, lat=%d, bat=%d\n", pos.time, pos.latitude_i, pos.battery_level);

    // Update our current position in the local DB
-    nodeDB.updatePosition(nodeDB.getNodeNum(), pos, RX_SRC_LOCAL);
+    nodeDB.updatePosition(nodeDB.getNodeNum(), pos);

    return 0;
 }
--- a/src/mesh/MeshService.h
+++ b/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);

    /** 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);
--- a/src/mesh/MeshTypes.h
+++ b/src/mesh/MeshTypes.h
@@ -15,15 +15,6 @@ typedef uint32_t PacketId; // A packet sequence number
 #define ERRNO_UNKNOWN 32  // pick something that doesn't conflict with RH_ROUTER_ERROR_UNABLE_TO_DELIVER
 #define ERRNO_DISABLED 34 // the itnerface is disabled

-/*
- * Source of a received message
- */
-enum RxSource {
-    RX_SRC_LOCAL,  // message was generated locally
-    RX_SRC_RADIO,   // message was received from radio mesh
-    RX_SRC_USER    // message was received from end-user device
-};
-
 /**
 * the max number of hops a message can pass through, used as the default max for hop_limit in MeshPacket.
 *
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@@ -23,7 +23,6 @@
 #include "mesh/http/WiFiAPClient.h"
 #include "plugins/esp32/StoreForwardPlugin.h"
 #include <Preferences.h>
-#include <nvs_flash.h>
 #endif

 NodeDB nodeDB;
@@ -87,10 +86,6 @@ bool NodeDB::resetRadioConfig()
    if (radioConfig.preferences.factory_reset) {
        DEBUG_MSG("Performing factory reset!\n");
        installDefaultDeviceState();
-#ifndef NO_ESP32
-        // This will erase what's in NVS including ssl keys, persistant variables and ble pairing
-        nvs_flash_erase();
-#endif
        didFactoryReset = true;
    }

@@ -130,11 +125,6 @@ void NodeDB::installDefaultRadioConfig()
    memset(&radioConfig, 0, sizeof(radioConfig));
    radioConfig.has_preferences = true;
    resetRadioConfig();
-
-    // for backward compat, default position flags are BAT+ALT+MSL (0x23 = 35)
-    radioConfig.preferences.position_flags = (PositionFlags_POS_BATTERY |
-        PositionFlags_POS_ALTITUDE | PositionFlags_POS_ALT_MSL);
-
 }

 void NodeDB::installDefaultChannels()
@@ -250,10 +240,6 @@ void NodeDB::init()
    preferences.end();
    DEBUG_MSG("Number of Device Reboots: %d\n", myNodeInfo.reboot_count);

-    /* The ESP32 has a wifi radio. This will need to be modified at some point so
-    *    the test isn't so simplistic.
-    */
-    myNodeInfo.has_wifi = true;
 #endif

    resetRadioConfig(); // If bogus settings got saved, then fix them
@@ -438,7 +424,7 @@ uint32_t sinceLastSeen(const NodeInfo *n)
    return delta;
 }

-#define NUM_ONLINE_SECS (60 & 60 * 2) // 2 hrs to consider someone offline
+#define NUM_ONLINE_SECS (60 * 2) // 2 hrs to consider someone offline

 size_t NodeDB::getNumOnlineNodes()
 {
@@ -456,42 +442,25 @@ size_t NodeDB::getNumOnlineNodes()

 /** Update position info for this node based on received position data
 */
-void NodeDB::updatePosition(uint32_t nodeId, const Position &p, RxSource src)
+void NodeDB::updatePosition(uint32_t nodeId, const Position &p)
 {
    NodeInfo *info = getOrCreateNode(nodeId);

-    if (src == RX_SRC_LOCAL) {
-        // Local packet, fully authoritative
-        DEBUG_MSG("updatePosition LOCAL pos@%x:5, time=%u, latI=%d, lonI=%d\n", 
-                p.pos_timestamp, p.time, p.latitude_i, p.longitude_i);
-        info->position = p;
+    DEBUG_MSG("DB update position node=0x%x time=%u, latI=%d, lonI=%d\n", nodeId, p.time, p.latitude_i, p.longitude_i);

-    } else if ((p.time > 0) && !p.latitude_i && !p.longitude_i && !p.pos_timestamp && 
-                !p.location_source) {
-        // FIXME SPECIAL TIME SETTING PACKET FROM EUD TO RADIO
-        // (stop-gap fix for issue #900)
-        DEBUG_MSG("updatePosition SPECIAL time setting time=%u\n", p.time);
+    // Be careful to only update fields that have been set by the sender
+    // A lot of position reports don't have time populated.  In that case, be careful to not blow away the time we
+    // recorded based on the packet rxTime
+    if (p.time)
        info->position.time = p.time;
-
-    } else {
-        // Be careful to only update fields that have been set by the REMOTE sender
-        // A lot of position reports don't have time populated.  In that case, be careful to not blow away the time we
-        // recorded based on the packet rxTime
-        //
-        // FIXME perhaps handle RX_SRC_USER separately?
-        DEBUG_MSG("updatePosition REMOTE node=0x%x time=%u, latI=%d, lonI=%d\n", 
-                nodeId, p.time, p.latitude_i, p.longitude_i);
-
-        // First, back up fields that we want to protect from overwrite
-        uint32_t tmp_time = info->position.time;
-
-        // Next, update atomically
-        info->position = p;
-
-        // Last, restore any fields that may have been overwritten
-        if (! info->position.time)
-            info->position.time = tmp_time;
+    if (p.battery_level)
+        info->position.battery_level = p.battery_level;
+    if (p.latitude_i || p.longitude_i) {
+        info->position.latitude_i = p.latitude_i;
+        info->position.longitude_i = p.longitude_i;
    }
+    if (p.altitude)
+        info->position.altitude = p.altitude;
    info->has_position = true;
    updateGUIforNode = info;
    notifyObservers(true); // Force an update whether or not our node counts have changed
--- a/src/mesh/NodeDB.h
+++ b/src/mesh/NodeDB.h
@@ -59,7 +59,7 @@ class NodeDB

    /** Update position info for this node based on received position data
     */
-    void updatePosition(uint32_t nodeId, const Position &p, RxSource src = RX_SRC_RADIO);
+    void updatePosition(uint32_t nodeId, const Position &p);

    /** Update user info for this node based on received user data
     */
--- a/src/mesh/ProtobufPlugin.h
+++ b/src/mesh/ProtobufPlugin.h
@@ -49,9 +49,9 @@ template <class T> class ProtobufPlugin : protected SinglePortPlugin
  private:
    /** Called to handle a particular incoming message

-    @return ProcessMessage::STOP if you've guaranteed you've handled this message and no other handlers should be considered for it
+    @return true 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 bool handleReceived(const MeshPacket &mp)
    {
        // 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.
@@ -70,6 +70,6 @@ template <class T> class ProtobufPlugin : protected SinglePortPlugin
                DEBUG_MSG("Error decoding protobuf plugin!\n");
        }

-        return handleReceivedProtobuf(mp, decoded) ? ProcessMessage::STOP : ProcessMessage::CONTINUE;
+        return handleReceivedProtobuf(mp, decoded);
    }
 };
--- a/src/mesh/RF95Interface.cpp
+++ b/src/mesh/RF95Interface.cpp
@@ -67,15 +67,9 @@ bool RF95Interface::init()
 #endif
    setTransmitEnable(false);

-    int res = lora->begin(getFreq(), bw, sf, cr, syncWord, power, currentLimit, preambleLength);
+    int res = lora->begin(freq, bw, sf, cr, syncWord, power, currentLimit, preambleLength);
    DEBUG_MSG("RF95 init result %d\n", res);

-    // current limit was removed from module' ctor
-    // override default value (60 mA)
-    res = lora->setCurrentLimit(currentLimit);
-    DEBUG_MSG("Current limit set to %f\n", currentLimit);
-    DEBUG_MSG("Current limit set result %d\n", res);
-
    if (res == ERR_NONE)
        res = lora->setCRC(SX126X_LORA_CRC_ON);

@@ -119,7 +113,7 @@ bool RF95Interface::reconfigure()
    err = lora->setPreambleLength(preambleLength);
    assert(err == ERR_NONE);

-    err = lora->setFrequency(getFreq());
+    err = lora->setFrequency(freq);
    if (err != ERR_NONE)
        RECORD_CRITICALERROR(CriticalErrorCode_InvalidRadioSetting);

--- a/src/mesh/RadioInterface.cpp
+++ b/src/mesh/RadioInterface.cpp
@@ -297,16 +297,6 @@ void RadioInterface::applyModemConfig()
            cr = 8;
            sf = 12;
            break;
-        case ChannelSettings_ModemConfig_Bw250Cr46Sf2048:
-            bw = 250;
-            cr = 6;
-            sf = 11;
-            break;
-        case ChannelSettings_ModemConfig_Bw250Cr47Sf1024:
-            bw = 250;
-            cr = 7;
-            sf = 10;
-            break;
        default:
            assert(0); // Unknown enum
        }
@@ -317,8 +307,6 @@ void RadioInterface::applyModemConfig()

        if (bw == 31) // This parameter is not an integer
            bw = 31.25;
-        if (bw == 62) // Fix for 62.5Khz bandwidth
-            bw = 62.5;
    }

    power = channelSettings.tx_power;
@@ -330,18 +318,18 @@ void RadioInterface::applyModemConfig()
    // If user has manually specified a channel num, then use that, otherwise generate one by hashing the name
    const char *channelName = channels.getName(channels.getPrimaryIndex());
    int channel_num = channelSettings.channel_num ? channelSettings.channel_num - 1 : hash(channelName) % myRegion->numChannels;
-    float freq = myRegion->freq + radioConfig.preferences.frequency_offset + myRegion->spacing * channel_num;
-
-    saveChannelNum(channel_num);
-    saveFreq(freq);
+    freq = myRegion->freq + radioConfig.preferences.frequency_offset + myRegion->spacing * channel_num;

    DEBUG_MSG("Set radio: name=%s, config=%u, ch=%d, power=%d\n", channelName, channelSettings.modem_config, channel_num, power);
    DEBUG_MSG("Radio myRegion->freq: %f\n", myRegion->freq);
    DEBUG_MSG("Radio myRegion->spacing: %f\n", myRegion->spacing);
    DEBUG_MSG("Radio myRegion->numChannels: %d\n", myRegion->numChannels);
    DEBUG_MSG("Radio channel_num: %d\n", channel_num);
-    DEBUG_MSG("Radio frequency: %f\n", getFreq()); // the frequency could be overridden in RadioInterface::getFreq() for some modules
+    DEBUG_MSG("Radio frequency: %f\n", freq);
    DEBUG_MSG("Short packet time: %u msec\n", shortPacketMsec);
+
+    saveChannelNum(channel_num);
+    saveFreq(freq);
 }

 /**
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`cd proto && ..\nanopb-0.4.4\generator-bin\protoc.exe --nanopb_out=-v:..\src\mesh\generated -I=..\proto *.proto`
				`@@ -0,0 +1 @@`
				`not yet supported - soon will be included in build`
				`@@ -0,0 +1 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 5c-3.87 0-7 3.13-7 7h2c0-2.76 2.24-5 5-5s5 2.24 5 5h2c0-3.87-3.13-7-7-7zm1 9.29c.88-.39 1.5-1.26 1.5-2.29 0-1.38-1.12-2.5-2.5-2.5S9.5 10.62 9.5 12c0 1.02.62 1.9 1.5 2.29v3.3L7.59 21 9 22.41l3-3 3 3L16.41 21 13 17.59v-3.3zM12 1C5.93 1 1 5.93 1 12h2c0-4.97 4.03-9 9-9s9 4.03 9 9h2c0-6.07-4.93-11-11-11z"/></svg>`