Update version.properties

* Update nimble version

* Back down a version

.devcontainer/Dockerfile

@@ -1,11 +0,0 @@
-# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.162.0/containers/ubuntu/.devcontainer/base.Dockerfile
-
-# [Choice] Ubuntu version: bionic, focal
-ARG VARIANT="focal"
-FROM mcr.microsoft.com/vscode/devcontainers/base:0-${VARIANT}
-
-# [Optional] Uncomment this section to install additional OS packages.
-RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-     && apt-get -y install python3-distutils python3-pip
-RUN pip3 install platformio meshtastic adafruit-nrfutil
-RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v3.15.8/protoc-3.15.8-linux-x86_64.zip -O /tmp/protoc.zip && cd /tmp && unzip protoc.zip && chmod a+x bin/protoc && cp bin/protoc /usr/local/bin

.devcontainer/devcontainer.json

@@ -1,32 +0,0 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.162.0/containers/ubuntu
-{
-	"name": "Ubuntu",
-	"build": {
-		"dockerfile": "Dockerfile",
-		// Update 'VARIANT' to pick an Ubuntu version: focal, bionic
-		"args": { "VARIANT": "focal" }
-	},
-
-	// Set *default* container specific settings.json values on container create.
-	"settings": { 
-		"terminal.integrated.shell.linux": "/bin/bash"
-	},
-
-	// Add the IDs of extensions you want installed when the container is created.
-	"extensions": [
-        "platformio.platformio-ide",
-        "xaver.clang-format"
-		],
-
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	// "forwardPorts": [],
-
-	// Use 'postCreateCommand' to run commands after the container is created.
-	// "postCreateCommand": "uname -a",
-
-	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
-	"remoteUser": "vscode",
-
-	"postCreateCommand": "git submodule update --init"
-}

.github/workflows/main.yml

@@ -1,146 +0,0 @@
-name: Continuous Integration (Legacy serial build)
-on:
-  # Triggers the workflow on push or pull request events but only for the master branch
-  workflow_dispatch:
-
-jobs:
-  ci-check:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-        with:
-          submodules: "recursive"
-          ref: ${{github.event.pull_request.head.ref}}
-          repository: ${{github.event.pull_request.head.repo.full_name}}
-
-      - name: Install cppcheck
-        run: |
-          sudo apt-get install -y cppcheck
-
-      - name: Setup Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.x
-
-      - name: Cache python libs
-        uses: actions/cache@v1
-        id: cache-pip # needed in if test
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip
-
-      - name: Upgrade python tools and install platformio
-        run: |
-          python -m pip install --upgrade pip
-          pip install -U platformio
-
-      - name: Upgrade platformio
-        run: |
-          pio upgrade
-
-      - name: Check everything
-        run: bin/check-all.sh
-
-  ci-build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-        with:
-          submodules: "recursive"
-          ref: ${{github.event.pull_request.head.ref}}
-          repository: ${{github.event.pull_request.head.repo.full_name}}
-
-      - name: Setup Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.x
-
-      - name: Cache python libs
-        uses: actions/cache@v1
-        id: cache-pip # needed in if test
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip
-
-      - name: Upgrade python tools
-        # We actually want to run this every time
-        # if: steps.cache-pip.outputs.cache-hit != 'true'
-        run: |
-          python -m pip install --upgrade pip
-          pip install -U platformio meshtastic adafruit-nrfutil
-
-      # - name: Cache platformio
-      #  uses: actions/cache@v1
-      #  id: cache-platformio # needed in if test
-      #  with:
-      #    path: ~/.platformio
-      #    key: ${{ runner.os }}-platformio
-
-      - name: Upgrade platformio
-        run: |
-          pio upgrade
-
-      - name: Pull web ui
-        uses: dsaltares/fetch-gh-release-asset@master
-        with:
-          repo: "meshtastic/meshtastic-web"
-          file: "build.tar"
-          target: "build.tar"
-          token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Unpack web ui
-        run: |
-          tar -xf build.tar -C data/static
-          rm build.tar
-
-      # We now run integration test before other build steps (to quickly see runtime failures)
-      - name: Build for native
-        run: platformio run -e native
-      - name: Integration test
-        run: |
-          .pio/build/native/program &
-          sleep 20 # 5 seconds was not enough
-          echo "Simulator started, launching python test..."
-          python3 -c 'from meshtastic.test import testSimulator; testSimulator()'
-
-      - name: Cat bin/build-all.sh
-        run: |
-          cat bin/build-all.sh
-
-      - name: Build everything
-        run: bin/build-all.sh
-
-      - name: Get release version string
-        run: echo "::set-output name=version::$(./bin/buildinfo.py long)"
-        id: version
-
-      - name: Store binaries as an artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: firmware-${{ steps.version.outputs.version }}.zip
-          path: release/archive/firmware-${{ steps.version.outputs.version }}.zip
-          retention-days: 90
-
-      - name: Store debugging elf files as an artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: debug-elfs
-          path: release/archive/elfs-*.zip
-          retention-days: 7
-
-      - name: Download firmware.zip
-        uses: actions/download-artifact@master
-        with:
-          name: firmware-${{ steps.version.outputs.version }}.zip
-          path: ./
-
-      - name: Pull request artifacts
-        if: ${{ github.event_name == 'pull_request_target' || github.event_name == 'pull_request' }}
-        uses: gavv/pull-request-artifacts@v1.0.0
-        with:
-          commit: ${{ (github.event.pull_request_target || github.event.pull_request).head.sha }}
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          artifacts-branch: artifacts
-          artifacts: ./firmware-${{ steps.version.outputs.version }}.zip

.github/workflows/main_matrix.yml

@@ -1,4 +1,4 @@
-name: Continuous Integration
+name: CI
 on:
   # # Triggers the workflow on push but only for the master branch
   push:
@@ -34,11 +34,14 @@ jobs:
           - board: heltec-v2.1
           - board: tbeam0.7
           - board: meshtastic-diy-v1
-          - board: rak4631_5005
-          - board: rak4631_19003
-          - board: rak4631_5005_eink
+          - board: rak4631
+          - board: rak4631_eink
           - board: t-echo
-
+          - board: nano-g1
+          - board: station-g1
+          - board: m5stack-core
+          - board: m5stack-coreink
+          
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -92,6 +95,10 @@ jobs:
           - board: heltec-v2.1
           - board: tbeam0.7
           - board: meshtastic-diy-v1
+          - board: nano-g1
+          - board: station-g1
+          - board: m5stack-core
+          - board: m5stack-coreink
 
     runs-on: ubuntu-latest
     steps:
@@ -117,7 +124,8 @@ jobs:
       - name: Upgrade python tools
         run: |
           python -m pip install --upgrade pip
-          pip install -U platformio meshtastic adafruit-nrfutil littlefs-python
+          pip install -U platformio adafruit-nrfutil littlefs-python
+          pip install -U --pre meshtastic
 
       - name: Upgrade platformio
         run: |
@@ -158,9 +166,8 @@ jobs:
       max-parallel: 2
       matrix:
         include:
-          - board: rak4631_5005
-          - board: rak4631_19003
-          - board: rak4631_5005_eink
+          - board: rak4631
+          - board: rak4631_eink
           - board: t-echo
           - board: pca10059_diy_eink
 
@@ -188,7 +195,8 @@ jobs:
       - name: Upgrade python tools
         run: |
           python -m pip install --upgrade pip
-          pip install -U platformio meshtastic adafruit-nrfutil
+          pip install -U platformio adafruit-nrfutil
+          pip install -U --pre meshtastic
 
       - name: Upgrade platformio
         run: |
@@ -235,7 +243,8 @@ jobs:
       - name: Upgrade python tools
         run: |
           python -m pip install --upgrade pip
-          pip install -U platformio meshtastic adafruit-nrfutil
+          pip install -U platformio adafruit-nrfutil
+          pip install -U --pre meshtastic
 
       - name: Upgrade platformio
         run: |

.github/workflows/update_protobufs.yml

@@ -13,13 +13,13 @@ jobs:
 
       - name: Update submodule
         run: |
-          git submodule update --remote proto
+          git submodule update --remote protobufs
 
       - name: Download nanopb
         run: |
-          wget https://jpa.kapsi.fi/nanopb/download/nanopb-0.4.5-linux-x86.tar.gz
-          tar xvzf nanopb-0.4.5-linux-x86.tar.gz
-          mv nanopb-0.4.5-linux-x86 nanopb-0.4.5
+          wget https://jpa.kapsi.fi/nanopb/download/nanopb-0.4.6-linux-x86.tar.gz
+          tar xvzf nanopb-0.4.6-linux-x86.tar.gz
+          mv nanopb-0.4.6-linux-x86 nanopb-0.4.6
 
       - name: Re-generate protocol buffers
         run: |
@@ -29,5 +29,5 @@ jobs:
         uses: peter-evans/create-pull-request@v3
         with:
           add-paths: |
-            proto
+            protobufs
             src/mesh

.gitmodules

@@ -1,9 +1,3 @@
-[submodule "proto"]
-	path = proto
+[submodule "protobufs"]
+	path = protobufs
 	url = https://github.com/meshtastic/Meshtastic-protobufs.git
-[submodule "sdk-nrfxlib"]
-	path = sdk-nrfxlib
-	url = https://github.com/nrfconnect/sdk-nrfxlib.git
-[submodule "design"]
-	path = design
-	url = https://github.com/meshtastic/meshtastic-design.git

.vscode/settings.json

@@ -51,7 +51,8 @@
         "iterator": "cpp",
         "shared_mutex": "cpp",
         "iostream": "cpp",
-        "esp_nimble_hci.h": "c"
+        "esp_nimble_hci.h": "c",
+        "map": "cpp"
     },
     "cSpell.words": [
         "Blox",
@@ -73,10 +74,5 @@
     "cmake.configureOnOpen": true,
     "protoc": {
         "compile_on_save": false,
-        "compile_all_path": "/home/kevinh/development/meshtastic/meshtastic-esp32/proto",
-        "options": [
-            "--java_out=/tmp",
-            "-I=/home/kevinh/development/meshtastic/meshtastic-esp32/proto"
-        ]
     }
 }

Dockerfile

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

README.md

@@ -1,19 +1,19 @@
-# Meshtastic-device
-[![Open in Visual Studio Code](https://open.vscode.dev/badges/open-in-vscode.svg)](https://open.vscode.dev/meshtastic/Meshtastic-device)
-[![Continuous Integration](https://github.com/meshtastic/Meshtastic-device/actions/workflows/main.yml/badge.svg)](https://github.com/meshtastic/Meshtastic-device/actions/workflows/main.yml)
-![GitHub all releases](https://img.shields.io/github/downloads/meshtastic/meshtastic-device/total)
+# Meshtastic Firmware
+
+![GitHub release downloads](https://img.shields.io/github/downloads/meshtastic/meshtastic-device/total)
+[![CI](https://img.shields.io/github/workflow/status/meshtastic/Meshtastic-device/CI?label=actions&logo=github&color=yellow)](https://github.com/meshtastic/repo/actions/workflows/main_matrix.yml)
 [![CLA assistant](https://cla-assistant.io/readme/badge/meshtastic/Meshtastic-device)](https://cla-assistant.io/meshtastic/Meshtastic-device)
+[![Fiscal Contributors](https://opencollective.com/meshtastic/tiers/badge.svg?label=Fiscal%20Contributors&color=deeppink)](https://opencollective.com/meshtastic/)
+[![Vercel](https://img.shields.io/static/v1?label=Powered%20by&message=Vercel&style=flat&logo=vercel&color=000000)](https://vercel.com?utm_source=meshtastic&utm_campaign=oss)
 
-## This repository contains the device firmware used in the [Meshtastic](https://meshtastic.org) project.
+## Overview
 
-Update Instructions
+This repository contains the device firmware for the Meshtastic project.
 
-[Using Meshtastic Flasher](https://meshtastic.org/docs/getting-started/meshtastic-flasher)
 
-Manual Method
+**[Building Instructions](https://meshtastic.org/docs/developers/Firmware/build)**
+**[Flashing Instructions](https://meshtastic.org/docs/getting-started/flashing-firmware/)**
 
-[For ESP32 devices click here](https://meshtastic.org/docs/getting-started/flashing-esp32)
+## Stats
 
-[For nRF52 devices click here](https://meshtastic.org/docs/getting-started/flashing-nrf52)
-
-For developer information and specific building instructions, please see the [developer documentation](https://meshtastic.org/docs/developers)
+![Alt](https://repobeats.axiom.co/api/embed/99a2cf5622bb4807f9e8c3b86589f1133cce58a2.svg 'Repobeats analytics image')

bin/build-all.sh

@@ -5,11 +5,11 @@ set -e
 VERSION=`bin/buildinfo.py long`
 SHORT_VERSION=`bin/buildinfo.py short`
 
-BOARDS_ESP32="rak11200 tlora-v2 tlora-v1 tlora_v1_3 tlora-v2-1-1.6 tbeam heltec-v1 heltec-v2.0 heltec-v2.1 tbeam0.7 meshtastic-diy-v1"
+BOARDS_ESP32="rak11200 tlora-v2 tlora-v1 tlora_v1_3 tlora-v2-1-1.6 tbeam heltec-v1 heltec-v2.0 heltec-v2.1 tbeam0.7 meshtastic-diy-v1 nano-g1 station-g1 m5stack-core m5stack-coreink"
 #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_5005_eink rak4631_19003 t-echo pca10059_diy_eink"
+BOARDS_NRF52="rak4631 rak4631_eink t-echo pca10059_diy_eink"
 #BOARDS_NRF52=""
 
 OUTDIR=release/latest

bin/check-all.sh

@@ -13,7 +13,7 @@ if [[ $# -gt 0 ]]; then
     # can override which environment by passing arg
     BOARDS="$@"
 else
-    BOARDS="tlora-v2 tlora-v1 tlora_v1_3 tlora-v2-1-1.6 tbeam heltec-v1 heltec-v2.0 heltec-v2.1 tbeam0.7 meshtastic-diy-v1 rak4631_5005 rak4631_19003 rak11200 t-echo pca10059_diy_eink"
+    BOARDS="tlora-v2 tlora-v1 tlora_v1_3 tlora-v2-1-1.6 tbeam heltec-v1 heltec-v2.0 heltec-v2.1 tbeam0.7 meshtastic-diy-v1 rak4631 rak4631_eink rak11200 t-echo pca10059_diy_eink"
 fi
 
 echo "BOARDS:${BOARDS}"

bin/device-install.bat

@@ -28,12 +28,12 @@ IF "__%FILENAME%__" == "____" (
 )
 IF EXIST %FILENAME% (
     echo Trying to flash update %FILENAME%, but first erasing and writing system information"
-	%PYTHON% -m esptool --baud 921600 erase_flash
-	%PYTHON% -m esptool --baud 921600 write_flash 0x1000 system-info.bin
+	%PYTHON% -m esptool --baud 115200 erase_flash
+	%PYTHON% -m esptool --baud 115200 write_flash 0x1000 system-info.bin
     for %%f in (littlefs-*.bin) do (
-        %PYTHON% -m esptool --baud 921600 write_flash 0x00390000 %%f
+        %PYTHON% -m esptool --baud 115200 write_flash 0x00390000 %%f
     )
-	%PYTHON% -m esptool --baud 921600 write_flash 0x10000 %FILENAME%
+	%PYTHON% -m esptool --baud 115200 write_flash 0x10000 %FILENAME%
 ) else (
     echo "Invalid file: %FILENAME%"
 	goto HELP

bin/device-update.bat

@@ -28,9 +28,9 @@ IF "__%FILENAME%__" == "____" (
 )
 IF EXIST %FILENAME% (
     echo Trying to flash update %FILENAME%
-    %PYTHON% -m esptool --baud 921600 write_flash 0x10000 %FILENAME%
+    %PYTHON% -m esptool --baud 115200 write_flash 0x10000 %FILENAME%
     echo Erasing the otadata partition, which will turn off flash flippy-flop and force the first image to be used
-    %PYTHON% -m esptool --baud 921600 erase_region 0xe000 0x2000
+    %PYTHON% -m esptool --baud 115200 erase_region 0xe000 0x2000
 ) else (
     echo "Invalid file: %FILENAME%"
 	goto HELP

bin/device-update.sh

@@ -44,9 +44,9 @@ shift "$((OPTIND-1))"
 
 if [ -f "${FILENAME}" ]; then
 	echo "Trying to flash update ${FILENAME}."
-	$PYTHON -m esptool --baud 921600 write_flash 0x10000 ${FILENAME}
+	$PYTHON -m esptool --baud 115200 write_flash 0x10000 ${FILENAME}
 	echo "Erasing the otadata partition, which will turn off flash flippy-flop and force the first image to be used"
-	$PYTHON -m esptool --baud 921600 erase_region 0xe000 0x2000
+	$PYTHON -m esptool --baud 115200 erase_region 0xe000 0x2000
 else
 	echo "Invalid file: ${FILENAME}"
 	show_help

bin/platformio-custom.py

@@ -17,7 +17,7 @@ Import("projenv")
 
 prefsLoc = projenv["PROJECT_DIR"] + "/version.properties"
 verObj = readProps(prefsLoc)
-print("Using meshtastic platform-custom.py, firmare version " + verObj['long'])
+print("Using meshtastic platformio-custom.py, firmware version " + verObj['long'])
 # print("path is" + ','.join(sys.path))
 
 # General options that are passed to the C and C++ compilers

bin/read-system-info.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-esptool.py --baud 921600 read_flash 0x1000 0xf000 system-info.img
+esptool.py --baud 115200 read_flash 0x1000 0xf000 system-info.img

bin/readprops.py

@@ -32,6 +32,6 @@ def readProps(prefsLoc):
         # traceback.print_exc()
         verObj['long'] = verObj['short']
 
-    # print("firmare version " + verStr)
+    # print("firmware version " + verStr)
     return verObj
 # print("path is" + ','.join(sys.path))

bin/regen-protos.bat

@@ -1 +1 @@
-cd proto && ..\nanopb-0.4.5\generator-bin\protoc.exe --nanopb_out=-v:..\src\mesh\generated -I=..\proto *.proto
+cd protobufs && ..\nanopb-0.4.6\generator-bin\protoc.exe --nanopb_out=-v:..\src\mesh\generated -I=..\protobufs *.proto

bin/regen-protos.sh

@@ -2,13 +2,13 @@
 
 set -e
 
-echo "This script requires https://jpa.kapsi.fi/nanopb/download/ version 0.4.5 to be located in the"
+echo "This script requires https://jpa.kapsi.fi/nanopb/download/ version 0.4.6 to be located in the"
 echo "meshtastic-device root directory if the following step fails, you should download the correct"
-echo "prebuilt binaries for your computer into nanopb-0.4.5"
+echo "prebuilt binaries for your computer into nanopb-0.4.6"
 
 # the nanopb tool seems to require that the .options file be in the current directory!
-cd proto
-../nanopb-0.4.5/generator-bin/protoc --nanopb_out=-v:../src/mesh/generated -I=../proto *.proto
+cd protobufs
+../nanopb-0.4.6/generator-bin/protoc --nanopb_out=-v:../src/mesh/generated -I=../protobufs *.proto
 
 #echo "Regenerating protobuf documentation - if you see an error message"
 #echo "you can ignore it unless doing a new protobuf release to github."

boards/rak815.json

@@ -1,55 +0,0 @@
-{
-  "build": {
-    "arduino":{
-      "ldscript": "nrf52832_s132_v6.ld"
-    },
-    "core": "nRF5",
-    "cpu": "cortex-m4",
-    "extra_flags": "-DNRF52832_XXAA -DNRF52",
-    "f_cpu": "64000000L",
-    "hwids": [
-      [
-        "0x10c4",
-        "0xea60"
-      ]
-    ],
-    "usb_product": "RAK815",
-    "mcu": "nrf52832",
-    "variant": "rak815",
-    "bsp": {
-      "name": "adafruit"
-    },
-    "softdevice": {
-      "sd_flags": "-DS132",
-      "sd_name": "s132",
-      "sd_version": "6.1.1",
-      "sd_fwid": "0x00B7"
-    }
-  },
-  "connectivity": [
-    "bluetooth"
-  ],
-  "debug": {
-    "jlink_device": "nRF52832_xxAA",
-    "svd_path": "nrf52.svd"
-  },
-  "frameworks": [
-    "arduino"
-  ],
-  "name": "RAK RAK815",
-  "upload": {
-    "maximum_ram_size": 65536,
-    "maximum_size": 524288,
-    "require_upload_port": true,
-    "speed": 115200,
-    "protocol": "nrfutil",
-    "protocols": [
-      "jlink",
-      "nrfjprog",
-      "nrfutil",
-      "stlink"
-    ]
-  },
-  "url": "https://store.rakwireless.com/products/rak815-hybrid-location-tracker",
-  "vendor": "RAK"
-}

platformio.ini

@@ -16,13 +16,11 @@ default_envs = tbeam
 ;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_5005
-;default_envs = rak4631_5005_eink
-;default_envs = rak4631_19003
 ;default_envs = nano-g1
 ;default_envs = pca10059_diy_eink
 ;default_envs = meshtastic-diy-v1
 ;default_envs = meshtastic-diy-v1.1
+;default_envs = m5stack-coreink
 
 extra_configs = variants/*/platformio.ini
 
@@ -38,24 +36,20 @@ build_flags = -Wno-missing-field-initializers
   -Isrc -Isrc/mesh -Isrc/gps -Isrc/buzz -Wl,-Map,.pio/build/output.map 
   -DUSE_THREAD_NAMES
   -DTINYGPS_OPTION_NO_CUSTOM_FIELDS
+  -DPB_ENABLE_MALLOC=1
 
-monitor_speed = 921600
+monitor_speed = 115200
 
 lib_deps =
   https://github.com/meshtastic/esp8266-oled-ssd1306.git#53580644255b48ebb7a737343c6b4e71c7e11cf2 ; ESP8266_SSD1306 
   mathertel/OneButton@^2.0.3 ; OneButton library for non-blocking button debounce
   1202 ; CRC32, explicitly needed because dependency is missing in the ble ota update lib
   https://github.com/meshtastic/arduino-fsm.git
-  https://github.com/meshtastic/SparkFun_Ublox_Arduino_Library.git#31015a55e630a2df77d9d714669c621a5bf355ad
-  https://github.com/meshtastic/RadioLib.git#5582ac30578ff3f53f20630a00b2a8a4b8f92c74
   https://github.com/meshtastic/TinyGPSPlus.git
-  https://github.com/meshtastic/AXP202X_Library.git#8404abb6d4b486748636bc6ad72d2a47baaf5460
   Wire ; explicitly needed here because the AXP202 library forgets to add it
   SPI
-  https://github.com/geeksville/ArduinoThread.git#72921ac222eed6f526ba1682023cee290d9aa1b3
-  PubSubClient
+  https://github.com/meshtastic/ArduinoThread.git#72921ac222eed6f526ba1682023cee290d9aa1b3
   nanopb/Nanopb@^0.4.6
-  meshtastic/json11@^1.0.2
 
 ; Used for the code analysis in PIO Home / Inspect
 check_tool = cppcheck
@@ -66,29 +60,42 @@ check_skip_packages = yes
 framework = arduino
 lib_deps =
   ${env.lib_deps}
+  ; Portduino is using meshtastic fork for now
+  https://github.com/jgromes/RadioLib.git
+
 build_flags = ${env.build_flags} -Os 
 # -DRADIOLIB_GODMODE
-src_filter = ${env.src_filter} -<portduino/>
+build_src_filter = ${env.build_src_filter} -<portduino/>
 
-; Common libs for environmental measurements (not included in native / portduino)
-[environmental]
+; Common libs for communicating over TCP/IP networks such as MQTT 
+[networking_base]
 lib_deps =
-  adafruit/DHT sensor library@^1.4.1
+  PubSubClient
+  meshtastic/json11@^1.0.2
+
+; Common libs for environmental measurements in telemetry module 
+; (not included in native / portduino)
+[environmental_base]
+lib_deps =
+  adafruit/Adafruit BusIO@^1.11.4
   adafruit/Adafruit Unified Sensor@^1.1.4
   paulstoffregen/OneWire@^2.3.5
   robtillaart/DS18B20@^0.1.11
+  adafruit/Adafruit BMP280 Library@^2.6.3
   adafruit/Adafruit BME280 Library@^2.2.2
   adafruit/Adafruit BME680 Library@^2.0.1
   adafruit/Adafruit MCP9808 Library@^2.0.0
-
+  adafruit/Adafruit INA260 Library@^1.5.0
+  adafruit/Adafruit INA219@^1.2.0
 ; Common settings for ESP targes, mixin with extends = esp32_base
 [esp32_base]
 extends = arduino_base
-platform = espressif32
-src_filter = 
-  ${arduino_base.src_filter} -<nrf52/>
-upload_speed = 921600
+platform = espressif32@3.5.0
+build_src_filter = 
+  ${arduino_base.build_src_filter} -<nrf52/> -<stm32wl>
+upload_speed = 115200
 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
@@ -99,12 +106,14 @@ build_flags =
   -DAXP_DEBUG_PORT=Serial -DUSE_NEW_ESP32_BLUETOOTH
 lib_deps =
   ${arduino_base.lib_deps}
-  ${environmental.lib_deps}
+  ${networking_base.lib_deps}
+  ${environmental_base.lib_deps}
   https://github.com/meshtastic/esp32_https_server.git
-  h2zero/NimBLE-Arduino@1.3.7
-  tobozo/ESP32-targz@^1.1.4
+  h2zero/NimBLE-Arduino@1.3.8
   arduino-libraries/NTPClient@^3.1.0
   lorol/LittleFS_esp32@^1.0.6
+  https://github.com/meshtastic/AXP202X_Library.git#8404abb6d4b486748636bc6ad72d2a47baaf5460
+
 lib_ignore = 
   segger_rtt
   ESP32 BLE Arduino
@@ -133,10 +142,9 @@ build_type = debug ; I'm debugging with ICE a lot now
 ; note: liboberon provides the AES256 implementation for NRF52 (though not using the hardware acceleration of the NRF52840 - FIXME)
 build_flags = 
   ${arduino_base.build_flags} -Wno-unused-variable 
-  -Isrc/nrf52 
-  -Isdk-nrfxlib/crypto/nrf_oberon/include -Lsdk-nrfxlib/crypto/nrf_oberon/lib/cortex-m4/hard-float/ -lliboberon_3.0.7 
-src_filter = 
-  ${arduino_base.src_filter} -<esp32/> -<nimble/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mqtt/>
+  -Isrc/nrf52
+build_src_filter = 
+  ${arduino_base.build_src_filter} -<esp32/> -<stm32wl> -<nimble/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mqtt/>
 lib_ignore =
   BluetoothOTA
 
@@ -145,8 +153,8 @@ extends = nrf52_base
 build_flags = ${nrf52_base.build_flags} 
 lib_deps =
   ${arduino_base.lib_deps}
-  ${environmental.lib_deps}
-  Adafruit nRFCrypto
+  ${environmental_base.lib_deps}
+  https://github.com/Kongduino/Adafruit_nRFCrypto.git
 
 ; Note: By default no lora device is created for this build - it uses a simulated interface
 [env:nrf52840dk]
@@ -157,10 +165,3 @@ board = nrf52840_dk
 [env:feather_nrf52832]
 extends = nrf52_base
 board = adafruit_feather_nrf52832
-
-[env:rak815]
-extends = nrf52_base
-board = rak815
-debug_tool = jlink
-upload_protocol = jlink
-monitor_speed = 115200 

src/ButtonThread.h

@@ -1,13 +1,13 @@
-#include "configuration.h"
-#include "concurrency/OSThread.h"
 #include "PowerFSM.h"
 #include "RadioLibInterface.h"
+#include "buzz.h"
+#include "concurrency/OSThread.h"
+#include "configuration.h"
 #include "graphics/Screen.h"
 #include "power.h"
-#include "buzz.h"
 #include <OneButton.h>
 
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
 #include "nimble/BluetoothUtil.h"
 #endif
 
@@ -78,14 +78,9 @@ class ButtonThread : public concurrency::OSThread
 
 #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);
         wakeOnIrq(BUTTON_PIN_TOUCH, FALLING);
 #endif
-
     }
 
   protected:
@@ -114,16 +109,17 @@ class ButtonThread : public concurrency::OSThread
 
   private:
     static void touchPressed()
-    {        
+    {
         screen->forceDisplay();
-        DEBUG_MSG("touch press!\n");       
+        DEBUG_MSG("touch press!\n");
     }
-    
+
     static void userButtonPressed()
     {
         // DEBUG_MSG("press!\n");
 #ifdef BUTTON_PIN
-        if ((BUTTON_PIN != radioConfig.preferences.inputbroker_pin_press) || !radioConfig.preferences.canned_message_module_enabled) {
+        if ((BUTTON_PIN != moduleConfig.canned_message.inputbroker_pin_press) ||
+            !moduleConfig.canned_message.enabled) {
             powerFSM.trigger(EVENT_PRESS);
         }
 #endif
@@ -131,25 +127,32 @@ class ButtonThread : public concurrency::OSThread
     static void userButtonPressedLong()
     {
         // DEBUG_MSG("Long press!\n");
-#ifndef NRF52_SERIES
+#ifdef ARCH_ESP32
         screen->adjustBrightness();
 #endif
         // If user button is held down for 5 seconds, shutdown the device.
-        if (millis() - longPressTime > 5 * 1000) {
+        if ((millis() - longPressTime > 5 * 1000) && (longPressTime > 0)) {
 #ifdef TBEAM_V10
             if (axp192_found == true) {
                 setLed(false);
                 power->shutdown();
             }
-#elif NRF52_SERIES
+#elif defined(ARCH_NRF52)
             // Do actual shutdown when button released, otherwise the button release
             // may wake the board immediatedly.
-            if (!shutdown_on_long_stop) {
+            if ((!shutdown_on_long_stop) && (millis() > 30 * 1000)) {
                 screen->startShutdownScreen();
                 DEBUG_MSG("Shutdown from long press");
                 playBeep();
+#ifdef PIN_LED1
                 ledOff(PIN_LED1);
+#endif
+#ifdef PIN_LED2        
                 ledOff(PIN_LED2);
+#endif
+#ifdef PIN_LED3        
+                ledOff(PIN_LED3);
+#endif
                 shutdown_on_long_stop = true;
             }
 #endif
@@ -160,40 +163,43 @@ class ButtonThread : public concurrency::OSThread
 
     static void userButtonDoublePressed()
     {
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
         disablePin();
-#elif defined(HAS_EINK)
-        digitalWrite(PIN_EINK_EN,digitalRead(PIN_EINK_EN) == LOW);
+#elif defined(USE_EINK)
+        digitalWrite(PIN_EINK_EN, digitalRead(PIN_EINK_EN) == LOW);
 #endif
     }
 
     static void userButtonMultiPressed()
     {
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
         clearNVS();
 #endif
-#ifdef NRF52_SERIES
+#ifdef ARCH_NRF52
         clearBonds();
 #endif
     }
 
-
     static void userButtonPressedLongStart()
     {
-        DEBUG_MSG("Long press start!\n");
-        longPressTime = millis();
+        if (millis() > 30 * 1000) {
+            DEBUG_MSG("Long press start!\n");
+            longPressTime = millis();
+        }
     }
 
     static void userButtonPressedLongStop()
     {
-        DEBUG_MSG("Long press stop!\n");
-        longPressTime = 0;
-        if (shutdown_on_long_stop) {
-            playShutdownMelody();
-            delay(3000);
-            power->shutdown();
+        if (millis() > 30 * 1000) {
+            DEBUG_MSG("Long press stop!\n");
+            longPressTime = 0;
+            if (shutdown_on_long_stop) {
+                playShutdownMelody();
+                delay(3000);
+                power->shutdown();
+            }
         }
     }
 };
 
-}
+} // namespace concurrency

src/DebugConfiguration.h

@@ -10,36 +10,13 @@
 #ifdef CONSOLE_MAX_BAUD
 #define SERIAL_BAUD CONSOLE_MAX_BAUD
 #else
-#define SERIAL_BAUD 921600 // Serial debug baud rate
+#define SERIAL_BAUD 115200 // Serial debug baud rate
 #endif
 
 #include "SerialConsole.h"
 
 #define DEBUG_PORT (*console) // Serial debug port
 
-// What platforms should use SEGGER?
-#ifdef NRF52_SERIES
-
-// Always include the SEGGER code on NRF52 - because useful for debugging
-#include "SEGGER_RTT.h"
-
-// The channel we send stdout data to
-#define SEGGER_STDOUT_CH 0
-
-// Debug printing to segger console
-#define SEGGER_MSG(...) SEGGER_RTT_printf(SEGGER_STDOUT_CH, __VA_ARGS__)
-
-// If we are not on a NRF52840 (which has built in USB-ACM serial support) and we don't have serial pins hooked up, then we MUST
-// use SEGGER for debug output
-#if !defined(PIN_SERIAL_RX) && !defined(NRF52840_XXAA)
-// No serial ports on this board - ONLY use segger in memory console
-#define USE_SEGGER
-#endif
-
-#else
-#define SERIAL0_RX_GPIO 3 // Always GPIO3 on ESP32
-#endif
-
 #ifdef USE_SEGGER
 #define DEBUG_MSG(...) SEGGER_RTT_printf(0, __VA_ARGS__)
 #else

src/FSCommon.cpp

@@ -1,9 +1,49 @@
 #include "configuration.h"
 #include "FSCommon.h"
 
-void listDir(const char * dirname, uint8_t levels)
-#ifdef FSCom
+
+bool copyFile(const char* from, const char* to)
 {
+#ifdef FSCom
+    unsigned char cbuffer[16];
+   
+    File f1 = FSCom.open(from, FILE_O_READ);
+    if (!f1){
+        DEBUG_MSG("Failed to open file");
+        return false;
+    }
+
+    File f2 = FSCom.open(to, FILE_O_WRITE);
+    if (!f2) {
+        DEBUG_MSG("Failed to open file");
+        return false;
+    }
+   
+    while (f1.available() > 0) {
+        byte i = f1.read(cbuffer, 16);
+        f2.write(cbuffer, i);
+    }
+   
+    f2.close();
+    f1.close();
+    return true;
+#endif
+}
+
+bool renameFile(const char* pathFrom, const char* pathTo)
+{
+#ifdef FSCom
+    if (copyFile(pathFrom, pathTo) && FSCom.remove(pathFrom) ) {
+        return true;
+    } else{
+        return false;
+    }
+#endif
+}
+
+void listDir(const char * dirname, uint8_t levels)
+{
+#ifdef FSCom
     File root = FSCom.open(dirname);
     if(!root){
         return;
@@ -28,6 +68,46 @@ void listDir(const char * dirname, uint8_t levels)
 #endif
 }
 
+void rmDir(const char * dirname)
+{
+#ifdef FSCom
+    File file = FSCom.open(dirname);
+    if(!file){
+        return;
+    }
+    if(!file.isDirectory()){
+        file.close();
+        FSCom.remove(file.name());
+      //  DEBUG_MSG("Remove FILE  %s\n", file.name());
+        return;
+    }
+
+    file.rewindDirectory();
+    while (true) {
+        File entry = file.openNextFile();
+        if (!entry) {
+          break;
+        }
+        char dirpath[100];   // array to hold the result.
+        strcpy(dirpath, dirname); // copy string one into the result.
+        strcat(dirpath,"/"); // append string two to the result.
+        strcat(dirpath,entry.name()); // append string two to the result.
+        if(entry.isDirectory() && !String(entry.name()).endsWith(".")) {
+            entry.close();
+         //   DEBUG_MSG("Descend DIR  %s\n", dirpath);
+            rmDir(dirpath);
+        } else {
+            entry.close();
+         //   DEBUG_MSG("Remove FILE  %s\n", entry.name());
+            FSCom.remove(entry.name());
+        }
+    }
+    FSCom.rmdir(dirname);
+   // DEBUG_MSG("Remove DIR  %s\n", dirname);
+    file.close();
+#endif
+}
+
 void fsInit()
 {
 #ifdef FSCom

src/FSCommon.h

@@ -4,21 +4,25 @@
 
 // Cross platform filesystem API
 
-#ifdef PORTDUINO
+#if defined(ARCH_PORTDUINO)
 // Portduino version
 #include "PortduinoFS.h"
 #define FSCom PortduinoFS
 #define FSBegin() true
 #define FILE_O_WRITE "w"
 #define FILE_O_READ "r"
-#elif !defined(NO_ESP32)
+#endif
+
+#if defined(ARCH_ESP32)
 // ESP32 version
 #include "LITTLEFS.h"
 #define FSCom LITTLEFS
 #define FSBegin() FSCom.begin(true)
 #define FILE_O_WRITE "w"
 #define FILE_O_READ "r"
-#else
+#endif
+
+#if defined(ARCH_NRF52)
 // NRF52 version
 #include "InternalFileSystem.h"
 #define FSCom InternalFS
@@ -26,4 +30,7 @@
 using namespace Adafruit_LittleFS_Namespace;
 #endif
 
-void fsInit();
+void fsInit();
+bool renameFile(const char* pathFrom, const char* pathTo);
+void listDir(const char * dirname, uint8_t levels);
+void rmDir(const char * dirname);

src/GPSStatus.h

@@ -1,7 +1,7 @@
 #pragma once
+#include "NodeDB.h"
 #include "Status.h"
 #include "configuration.h"
-#include "NodeDB.h"
 #include <Arduino.h>
 
 extern NodeDB nodeDB;
@@ -17,8 +17,8 @@ class GPSStatus : public Status
     CallbackObserver<GPSStatus, const GPSStatus *> statusObserver =
         CallbackObserver<GPSStatus, const GPSStatus *>(this, &GPSStatus::updateStatus);
 
-    bool hasLock = false;                // default to false, until we complete our first read
-    bool isConnected = false;            // Do we have a GPS we are talking to
+    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;
 
@@ -42,8 +42,7 @@ class GPSStatus : public Status
     }
 
     // preferred method
-    GPSStatus(bool hasLock, bool isConnected, const Position& pos)
-        : Status()
+    GPSStatus(bool hasLock, bool isConnected, const Position &pos) : Status()
     {
         this->hasLock = hasLock;
         this->isConnected = isConnected;
@@ -61,9 +60,10 @@ class GPSStatus : public Status
 
     bool getIsConnected() const { return isConnected; }
 
-    int32_t getLatitude() const {
-        if (radioConfig.preferences.fixed_position){
-#if GPS_EXTRAVERBOSE
+    int32_t getLatitude() const
+    {
+        if (config.position.fixed_position) {
+#ifdef GPS_EXTRAVERBOSE
             DEBUG_MSG("WARNING: Using fixed latitude\n");
 #endif
             NodeInfo *node = nodeDB.getNode(nodeDB.getNodeNum());
@@ -73,9 +73,10 @@ class GPSStatus : public Status
         }
     }
 
-    int32_t getLongitude() const {
-        if (radioConfig.preferences.fixed_position){
-#if GPS_EXTRAVERBOSE
+    int32_t getLongitude() const
+    {
+        if (config.position.fixed_position) {
+#ifdef GPS_EXTRAVERBOSE
             DEBUG_MSG("WARNING: Using fixed longitude\n");
 #endif
             NodeInfo *node = nodeDB.getNode(nodeDB.getNodeNum());
@@ -85,9 +86,10 @@ class GPSStatus : public Status
         }
     }
 
-    int32_t getAltitude() const {
-        if (radioConfig.preferences.fixed_position){
-#if GPS_EXTRAVERBOSE
+    int32_t getAltitude() const
+    {
+        if (config.position.fixed_position) {
+#ifdef GPS_EXTRAVERBOSE
             DEBUG_MSG("WARNING: Using fixed altitude\n");
 #endif
             NodeInfo *node = nodeDB.getNode(nodeDB.getNodeNum());
@@ -105,18 +107,13 @@ class GPSStatus : public Status
 
     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);
+#ifdef 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 ||
+        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);
     }
 
@@ -125,8 +122,7 @@ class GPSStatus : public Status
         // 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)) {
+        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");
         }
@@ -140,11 +136,9 @@ class GPSStatus : public Status
         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);
+                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
                 DEBUG_MSG("No GPS lock\n");
             onNewStatus.notifyObservers(this);

src/OSTimer.cpp

@@ -15,7 +15,7 @@ bool scheduleOSCallback(PendableFunction callback, void *param1, uint32_t param2
     return xTimerPendFunctionCall(callback, param1, param2, pdMS_TO_TICKS(delayMsec));
 } */
 
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
 
 // Super skanky quick hack to use hardware timers of the ESP32
 static hw_timer_t *timer;

src/Power.cpp

@@ -1,10 +1,11 @@
-#include "configuration.h"
 #include "power.h"
 #include "NodeDB.h"
 #include "PowerFSM.h"
+#include "configuration.h"
 #include "main.h"
 #include "sleep.h"
 #include "utils.h"
+#include "buzz/buzz.h"
 
 #ifdef TBEAM_V10
 // FIXME. nasty hack cleanup how we load axp192
@@ -13,27 +14,28 @@
 
 AXP20X_Class axp;
 #else
-// Copy of the base class defined in axp20x.h. 
+// Copy of the base class defined in axp20x.h.
 // I'd rather not inlude axp20x.h as it brings Wire dependency.
-class HasBatteryLevel {
-public:
-  /**
-   * Battery state of charge, from 0 to 100 or -1 for unknown
-   */
-  virtual int getBattPercentage() { return -1; }
+class HasBatteryLevel
+{
+  public:
+    /**
+     * Battery state of charge, from 0 to 100 or -1 for unknown
+     */
+    virtual int getBattPercentage() { return -1; }
 
-  /**
-   * The raw voltage of the battery or NAN if unknown
-   */
-  virtual float getBattVoltage() { return NAN; }
+    /**
+     * The raw voltage of the battery or NAN if unknown
+     */
+    virtual float getBattVoltage() { return NAN; }
 
-  /**
-   * return true if there is a battery installed in this unit
-   */
-  virtual bool isBatteryConnect() { return false; }
+    /**
+     * return true if there is a battery installed in this unit
+     */
+    virtual bool isBatteryConnect() { return false; }
 
-  virtual bool isVBUSPlug() { return false; }
-  virtual bool isChargeing() { return false; }
+    virtual bool isVBUSPlug() { return false; }
+    virtual bool isChargeing() { return false; }
 };
 #endif
 
@@ -44,7 +46,7 @@ Power *power;
 using namespace meshtastic;
 
 #ifndef AREF_VOLTAGE
-#if defined(NRF52_SERIES)
+#if defined(ARCH_NRF52)
 /*
  * Internal Reference is +/-0.6V, with an adjustable gain of 1/6, 1/5, 1/4,
  * 1/3, 1/2 or 1, meaning 3.6, 3.0, 2.4, 1.8, 1.2 or 0.6V for the ADC levels.
@@ -82,7 +84,7 @@ class AnalogBatteryLevel : public HasBatteryLevel
         if (v < noBatVolt)
             return -1; // If voltage is super low assume no battery installed
 
-#ifndef NRF52_SERIES
+#ifdef ARCH_ESP32
         // This does not work on a RAK4631 with battery connected
         if (v > chargingVolt)
             return 0; // While charging we can't report % full on the battery
@@ -99,24 +101,35 @@ class AnalogBatteryLevel : public HasBatteryLevel
 
 #ifndef ADC_MULTIPLIER
 #define ADC_MULTIPLIER 2.0
-#endif 
-    // Override variant or default ADC_MULTIPLIER if we have the override pref
-    float operativeAdcMultiplier = radioConfig.preferences.adc_multiplier_override > 0 ?
-        radioConfig.preferences.adc_multiplier_override :
-        ADC_MULTIPLIER;
+#endif
 
 #ifdef BATTERY_PIN
-        // Do not call analogRead() often. 
+        // Override variant or default ADC_MULTIPLIER if we have the override pref
+        float operativeAdcMultiplier = config.power.adc_multiplier_override > 0
+                                           ? config.power.adc_multiplier_override
+                                           : ADC_MULTIPLIER;
+        // Do not call analogRead() often.
         const uint32_t min_read_interval = 5000;
         if (millis() - last_read_time_ms > min_read_interval) {
             last_read_time_ms = millis();
+
+#ifdef BATTERY_SENSE_SAMPLES
+//Set the number of samples, it has an effect of increasing sensitivity, especially in complex electromagnetic environment.
+            uint32_t raw = 0;
+            for(uint32_t i=0; i<BATTERY_SENSE_SAMPLES;i++){
+                raw += analogRead(BATTERY_PIN);
+            }
+            raw = raw/BATTERY_SENSE_SAMPLES;
+#else
             uint32_t raw = analogRead(BATTERY_PIN);
+#endif
+
             float scaled;
-            #ifndef VBAT_RAW_TO_SCALED
+#ifndef VBAT_RAW_TO_SCALED
             scaled = 1000.0 * operativeAdcMultiplier * (AREF_VOLTAGE / 1024.0) * raw;
-            #else
-            scaled = VBAT_RAW_TO_SCALED(raw); //defined in variant.h
-            #endif
+#else
+            scaled = VBAT_RAW_TO_SCALED(raw); // defined in variant.h
+#endif
             // DEBUG_MSG("battery gpio %d raw val=%u scaled=%u\n", BATTERY_PIN, raw, (uint32_t)(scaled));
             last_read_value = scaled;
             return scaled;
@@ -153,7 +166,8 @@ class AnalogBatteryLevel : public HasBatteryLevel
 
 AnalogBatteryLevel analogLevel;
 
-Power::Power() : OSThread("Power") {
+Power::Power() : OSThread("Power")
+{
     statusHandler = {};
     low_voltage_counter = 0;
 }
@@ -166,13 +180,13 @@ bool Power::analogInit()
     // disable any internal pullups
     pinMode(BATTERY_PIN, INPUT);
 
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
     // ESP32 needs special analog stuff
     adcAttachPin(BATTERY_PIN);
 #endif
-#ifdef NRF52_SERIES
+#ifdef ARCH_NRF52
 #ifdef VBAT_AR_INTERNAL
-     analogReference(VBAT_AR_INTERNAL);
+    analogReference(VBAT_AR_INTERNAL);
 #else
     analogReference(AR_INTERNAL); // 3.6V
 #endif
@@ -181,9 +195,10 @@ bool Power::analogInit()
 #ifndef BATTERY_SENSE_RESOLUTION_BITS
 #define BATTERY_SENSE_RESOLUTION_BITS 10
 #endif
-    
+
     // adcStart(BATTERY_PIN);
-    analogReadResolution(BATTERY_SENSE_RESOLUTION_BITS); // Default of 12 is not very linear. Recommended to use 10 or 11 depending on needed resolution.
+    analogReadResolution(BATTERY_SENSE_RESOLUTION_BITS); // Default of 12 is not very linear. Recommended to use 10 or 11
+                                                         // depending on needed resolution.
     batteryLevel = &analogLevel;
     return true;
 #else
@@ -208,8 +223,12 @@ void Power::shutdown()
 {
 #ifdef TBEAM_V10
     DEBUG_MSG("Shutting down\n");
+    axp.setChgLEDMode(AXP20X_LED_OFF);
     axp.shutdown();
-#elif NRF52_SERIES
+#elif defined(ARCH_NRF52)
+    playBeep();
+    ledOff(PIN_LED1);
+    ledOff(PIN_LED2);
     doDeepSleep(DELAY_FOREVER);
 #endif
 }
@@ -246,24 +265,23 @@ void Power::readPowerStatus()
                   powerStatus2.getIsCharging(), powerStatus2.getBatteryVoltageMv(), powerStatus2.getBatteryChargePercent());
         newStatus.notifyObservers(&powerStatus2);
 
-
-        // If we have a battery at all and it is less than 10% full, force deep sleep if we have more than 3 low readings in a row
-        // Supect fluctuating voltage on the RAK4631 to force it to deep sleep even if battery is at 85% after only a few days
-        #ifdef NRF52_SERIES
-        if (powerStatus2.getHasBattery() && !powerStatus2.getHasUSB()){
-            if (batteryLevel->getBattVoltage() < MIN_BAT_MILLIVOLTS){
+// 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 ARCH_NRF52
+        if (powerStatus2.getHasBattery() && !powerStatus2.getHasUSB()) {
+            if (batteryLevel->getBattVoltage() < MIN_BAT_MILLIVOLTS) {
                 low_voltage_counter++;
-                if (low_voltage_counter>3)
+                if (low_voltage_counter > 3)
                     powerFSM.trigger(EVENT_LOW_BATTERY);
             } else {
                 low_voltage_counter = 0;
             }
         }
-        #else
+#else
         // If we have a battery at all and it is less than 10% full, force deep sleep
         if (powerStatus2.getHasBattery() && !powerStatus2.getHasUSB() && batteryLevel->getBattVoltage() < MIN_BAT_MILLIVOLTS)
             powerFSM.trigger(EVENT_LOW_BATTERY);
-        #endif
+#endif
     } else {
         // No power sensing on this board - tell everyone else we have no idea what is happening
         const PowerStatus powerStatus3 = PowerStatus(OptUnknown, OptUnknown, OptUnknown, -1, -1);
@@ -355,40 +373,58 @@ bool Power::axp192Init()
             DEBUG_MSG("DCDC3: %s\n", axp.isDCDC3Enable() ? "ENABLE" : "DISABLE");
             DEBUG_MSG("Exten: %s\n", axp.isExtenEnable() ? "ENABLE" : "DISABLE");
 
-            if (radioConfig.preferences.charge_current == ChargeCurrent_MAUnset) {
+            switch (config.power.charge_current) {
+            case Config_PowerConfig_ChargeCurrent_MAUnset:
                 axp.setChargeControlCur(AXP1XX_CHARGE_CUR_450MA);
-            } else if (radioConfig.preferences.charge_current == ChargeCurrent_MA100) {
+                break;
+            case Config_PowerConfig_ChargeCurrent_MA100:
                 axp.setChargeControlCur(AXP1XX_CHARGE_CUR_100MA);
-            } else if (radioConfig.preferences.charge_current == ChargeCurrent_MA190) {
+                break;
+            case Config_PowerConfig_ChargeCurrent_MA190:
                 axp.setChargeControlCur(AXP1XX_CHARGE_CUR_190MA);
-            } else if (radioConfig.preferences.charge_current == ChargeCurrent_MA280) {
+                break;
+            case Config_PowerConfig_ChargeCurrent_MA280:
                 axp.setChargeControlCur(AXP1XX_CHARGE_CUR_280MA);
-            } else if (radioConfig.preferences.charge_current == ChargeCurrent_MA360) {
+                break;
+            case Config_PowerConfig_ChargeCurrent_MA360:
                 axp.setChargeControlCur(AXP1XX_CHARGE_CUR_360MA);
-            } else if (radioConfig.preferences.charge_current == ChargeCurrent_MA450) {
+                break;
+            case Config_PowerConfig_ChargeCurrent_MA450:
                 axp.setChargeControlCur(AXP1XX_CHARGE_CUR_450MA);
-            } else if (radioConfig.preferences.charge_current == ChargeCurrent_MA550) {
+                break;
+            case Config_PowerConfig_ChargeCurrent_MA550:
                 axp.setChargeControlCur(AXP1XX_CHARGE_CUR_550MA);
-            } else if (radioConfig.preferences.charge_current == ChargeCurrent_MA630) {
+                break;
+            case Config_PowerConfig_ChargeCurrent_MA630:
                 axp.setChargeControlCur(AXP1XX_CHARGE_CUR_630MA);
-            } else if (radioConfig.preferences.charge_current == ChargeCurrent_MA700) {
+                break;
+            case Config_PowerConfig_ChargeCurrent_MA700:
                 axp.setChargeControlCur(AXP1XX_CHARGE_CUR_700MA);
-            } else if (radioConfig.preferences.charge_current == ChargeCurrent_MA780) {
+                break;
+            case Config_PowerConfig_ChargeCurrent_MA780:
                 axp.setChargeControlCur(AXP1XX_CHARGE_CUR_780MA);
-            } else if (radioConfig.preferences.charge_current == ChargeCurrent_MA880) {
+                break;
+            case Config_PowerConfig_ChargeCurrent_MA880:
                 axp.setChargeControlCur(AXP1XX_CHARGE_CUR_880MA);
-            } else if (radioConfig.preferences.charge_current == ChargeCurrent_MA960) {
+                break;
+            case Config_PowerConfig_ChargeCurrent_MA960:
                 axp.setChargeControlCur(AXP1XX_CHARGE_CUR_960MA);
-            } else if (radioConfig.preferences.charge_current == ChargeCurrent_MA1000) {
+                break;
+            case Config_PowerConfig_ChargeCurrent_MA1000:
                 axp.setChargeControlCur(AXP1XX_CHARGE_CUR_1000MA);
-            } else if (radioConfig.preferences.charge_current == ChargeCurrent_MA1080) {
+                break;
+            case Config_PowerConfig_ChargeCurrent_MA1080:
                 axp.setChargeControlCur(AXP1XX_CHARGE_CUR_1080MA);
-            } else if (radioConfig.preferences.charge_current == ChargeCurrent_MA1160) {
+                break;
+            case Config_PowerConfig_ChargeCurrent_MA1160:
                 axp.setChargeControlCur(AXP1XX_CHARGE_CUR_1160MA);
-            } else if (radioConfig.preferences.charge_current == ChargeCurrent_MA1240) {
+                break;
+            case Config_PowerConfig_ChargeCurrent_MA1240:
                 axp.setChargeControlCur(AXP1XX_CHARGE_CUR_1240MA);
-            } else if (radioConfig.preferences.charge_current == ChargeCurrent_MA1320) {
+                break;
+            case Config_PowerConfig_ChargeCurrent_MA1320:
                 axp.setChargeControlCur(AXP1XX_CHARGE_CUR_1320MA);
+                break;
             }
 
 #if 0

src/PowerFSM.cpp

@@ -11,30 +11,30 @@
 /// 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) {
+    // Circumvent the battery sensing logic and assumes constant power if no battery pin or power mgmt IC
+    #if !defined(BATTERY_PIN) && !defined(AXP192_SLAVE_ADDRESS)
         return true;
-    }
+    #endif
 
-    bool isRouter = (radioConfig.preferences.role == Role_Router ? 1 : 0);
+    bool isRouter = (config.device.role == Config_DeviceConfig_Role_Router ? 1 : 0);
 
     // If we are not a router and we already have AC power go to POWER state after init, otherwise go to ON
     // We assume routers might be powered all the time, but from a low current (solar) source
-    bool isLowPower = radioConfig.preferences.is_low_power || isRouter;
+    bool isPowerSavingMode = config.power.is_power_saving || isRouter;
 
     /* To determine if we're externally powered, assumptions
         1) If we're powered up and there's no battery, we must be getting power externally. (because we'd be dead otherwise)
 
         2) If we detect USB power from the power management chip, we must be getting power externally.
     */
-    return !isLowPower && powerStatus && (!powerStatus->getHasBattery() || powerStatus->getHasUSB());
+    return !isPowerSavingMode && powerStatus && (!powerStatus->getHasBattery() || powerStatus->getHasUSB());
 }
 
 static void sdsEnter()
 {
     DEBUG_MSG("Enter state: SDS\n");
     // FIXME - make sure GPS and LORA radio are off first - because we want close to zero current draw
-    doDeepSleep(getPref_sds_secs() * 1000LL);
+    doDeepSleep(config.power.sds_secs ? config.power.sds_secs : default_sds_secs * 1000LL);
 }
 
 extern Power *power;
@@ -51,7 +51,8 @@ static uint32_t secsSlept;
 
 static void lsEnter()
 {
-    DEBUG_MSG("lsEnter begin, ls_secs=%u\n", getPref_ls_secs());
+    DEBUG_MSG("lsEnter begin, ls_secs=%u\n",
+              config.power.ls_secs ? config.power.ls_secs : default_ls_secs);
     screen->setOn(false);
     secsSlept = 0; // How long have we been sleeping this time
 
@@ -62,10 +63,10 @@ static void lsIdle()
 {
     // DEBUG_MSG("lsIdle begin ls_secs=%u\n", getPref_ls_secs());
 
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
 
     // Do we have more sleeping to do?
-    if (secsSlept < getPref_ls_secs()) {
+    if (secsSlept < config.power.ls_secs ? config.power.ls_secs : default_ls_secs * 1000) {
         // Briefly come out of sleep long enough to blink the led once every few seconds
         uint32_t sleepTime = 30;
 
@@ -78,7 +79,7 @@ static void lsIdle()
             case ESP_SLEEP_WAKEUP_TIMER:
                 // Normal case: timer expired, we should just go back to sleep ASAP
 
-                setLed(true);                // briefly turn on led
+                setLed(true);                 // briefly turn on led
                 wakeCause2 = doLightSleep(1); // leave led on for 1ms
 
                 secsSlept += sleepTime;
@@ -238,7 +239,7 @@ Fsm powerFSM(&stateBOOT);
 
 void PowerFSM_setup()
 {
-    bool isRouter = (radioConfig.preferences.role == Role_Router ? 1 : 0);
+    bool isRouter = (config.device.role == Config_DeviceConfig_Role_Router ? 1 : 0);
     bool hasPower = isPowered();
 
     DEBUG_MSG("PowerFSM init, USB power=%d\n", hasPower);
@@ -332,24 +333,32 @@ void PowerFSM_setup()
     powerFSM.add_transition(&stateDARK, &stateON, EVENT_FIRMWARE_UPDATE, NULL, "Got firmware update");
     powerFSM.add_transition(&stateON, &stateON, EVENT_FIRMWARE_UPDATE, NULL, "Got firmware update");
 
-    powerFSM.add_timed_transition(&stateON, &stateDARK, getPref_screen_on_secs() * 1000, NULL, "Screen-on timeout");
+    powerFSM.add_timed_transition(&stateON, &stateDARK,
+                                  config.display.screen_on_secs ? config.display.screen_on_secs
+                                                                               : 60 * 1000 * 10,
+                                  NULL, "Screen-on timeout");
 
     // On most boards we use light-sleep to be our main state, but on NRF52 we just stay in DARK
     State *lowPowerState = &stateLS;
 
     uint32_t meshSds = 0;
 
-#ifndef NRF52_SERIES
+#ifdef ARCH_ESP32
     // 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();
+    if (isRouter || config.power.is_power_saving) {
+        powerFSM.add_timed_transition(&stateNB, &stateLS,
+                                      config.power.min_wake_secs ? config.power.min_wake_secs
+                                                                                : default_min_wake_secs * 1000,
+                                      NULL, "Min wake timeout");
+        powerFSM.add_timed_transition(&stateDARK, &stateLS,
+                                      config.power.wait_bluetooth_secs
+                                          ? config.power.wait_bluetooth_secs
+                                          : default_wait_bluetooth_secs * 1000,
+                                      NULL, "Bluetooth timeout");
+        meshSds = config.power.mesh_sds_timeout_secs ? config.power.mesh_sds_timeout_secs
+                                                                    : default_mesh_sds_timeout_secs;
 
     } else {
 

src/PowerFSMThread.h

@@ -1,9 +1,9 @@
-#include "configuration.h"
-#include "concurrency/OSThread.h"
-#include "main.h"
-#include "PowerFSM.h"
-#include "power.h"
 #include "NodeDB.h"
+#include "PowerFSM.h"
+#include "concurrency/OSThread.h"
+#include "configuration.h"
+#include "main.h"
+#include "power.h"
 
 namespace concurrency
 {
@@ -26,13 +26,16 @@ class PowerFSMThread : public OSThread
 
         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
+        } else if (config.power.on_battery_shutdown_after_secs > 0 &&
+                   millis() >
+                       timeLastPowered +
+                           (1000 *
+                            config.power.on_battery_shutdown_after_secs)) { // shutdown after 30 minutes unpowered
             powerFSM.trigger(EVENT_SHUTDOWN);
         }
-        
+
         return 10;
     }
 };
 
-}
+} // namespace concurrency

src/RedirectablePrint.cpp

@@ -72,7 +72,7 @@ size_t RedirectablePrint::logDebug(const char *format, ...)
 
         // If we are the first message on a report, include the header
         if (!isContinuationMessage) {
-            uint32_t rtc_sec = getValidTime(RTCQuality::RTCQualityFromNet);
+            uint32_t rtc_sec = getValidTime(RTCQuality::RTCQualityDevice);
             if (rtc_sec > 0) {
                 long hms = rtc_sec % SEC_PER_DAY;
                 // hms += tz.tz_dsttime * SEC_PER_HOUR;

src/SerialConsole.cpp

@@ -1,9 +1,11 @@
-#include "configuration.h"
 #include "SerialConsole.h"
 #include "NodeDB.h"
 #include "PowerFSM.h"
+#include "configuration.h"
 
 #define Port Serial
+// Defaulting to the formerly removed phone_timeout_secs value of 15 minutes
+#define SERIAL_CONNECTION_TIMEOUT (15 * 60) * 1000UL
 
 SerialConsole *console;
 
@@ -28,7 +30,7 @@ SerialConsole::SerialConsole() : StreamAPI(&Port), RedirectablePrint(&Port)
                       // setDestination(&noopPrint); for testing, try turning off 'all' debug output and see what leaks
 
     Port.begin(SERIAL_BAUD);
-#ifdef NRF52_SERIES
+#ifdef ARCH_NRF52
     time_t timeout = millis();
     while (!Port) {
         if ((millis() - timeout) < 5000) {
@@ -41,11 +43,12 @@ SerialConsole::SerialConsole() : StreamAPI(&Port), RedirectablePrint(&Port)
     emitRebooted();
 }
 
+
 // For the serial port we can't really detect if any client is on the other side, so instead just look for recent messages
 bool SerialConsole::checkIsConnected()
 {
     uint32_t now = millis();
-    return (now - lastContactMsec) < getPref_phone_timeout_secs() * 1000UL;
+    return (now - lastContactMsec) < SERIAL_CONNECTION_TIMEOUT;
 }
 
 /**
@@ -55,10 +58,9 @@ bool SerialConsole::checkIsConnected()
 bool SerialConsole::handleToRadio(const uint8_t *buf, size_t len)
 {
     // Turn off debug serial printing once the API is activated, because other threads could print and corrupt packets
-    if (!radioConfig.preferences.debug_log_enabled)
+    if (!config.device.debug_log_enabled)
         setDestination(&noopPrint);
     canWrite = true;
 
     return StreamAPI::handleToRadio(buf, len);
 }
-

src/buzz/buzz.cpp

@@ -1,10 +1,6 @@
 #include "buzz.h"
 #include "configuration.h"
 
-#ifdef NRF52_SERIES
-#include "variant.h"
-#endif
-
 #ifndef PIN_BUZZER
 
 // Noop methods for boards w/o buzzer
@@ -12,8 +8,13 @@ void playBeep(){};
 void playStartMelody(){};
 void playShutdownMelody(){};
 
+#else
+#ifdef M5STACK
+#include "Speaker.h"
+TONE Tone;
 #else
 #include "Tone.h"
+#endif
 
 extern "C" void delay(uint32_t dwMs);
 
@@ -42,13 +43,26 @@ const int DURATION_1_4 = 250;  // 1/4 note
 void playTones(const ToneDuration *tone_durations, int size) {
   for (int i = 0; i < size; i++) {
     const auto &tone_duration = tone_durations[i];
+#ifdef M5STACK
+    Tone.tone(tone_duration.frequency_khz);
+    delay(tone_duration.duration_ms);
+    Tone.mute();
+#else
     tone(PIN_BUZZER, tone_duration.frequency_khz, tone_duration.duration_ms);
+#endif
     // to distinguish the notes, set a minimum time between them.
     delay(1.3 * tone_duration.duration_ms);
   }
 }
 
+#ifdef M5STACK
+void playBeep() {
+  ToneDuration melody[] = {{NOTE_B3, DURATION_1_4}};
+  playTones(melody, sizeof(melody) / sizeof(ToneDuration));
+}
+#else
 void playBeep() { tone(PIN_BUZZER, NOTE_B3, DURATION_1_4); }
+#endif
 
 void playStartMelody() {
   ToneDuration melody[] = {{NOTE_B3, DURATION_1_4},

src/configuration.h

@@ -25,6 +25,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #include <Arduino.h>
+
+#ifdef RV3028_RTC
+    #include "Melopero_RV3028.h"
+#endif
+#ifdef PCF8563_RTC
+    #include "pcf8563.h"
+#endif
+
 // -----------------------------------------------------------------------------
 // Version
 // -----------------------------------------------------------------------------
@@ -54,75 +62,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /// Convert a preprocessor name into a quoted string and if that string is empty use "unset"
 #define optstr(s) (xstr(s)[0] ? xstr(s) : "unset")
 
-#ifdef PORTDUINO
-
-#define NO_ESP32 // Don't use ESP32 libs (mainly bluetooth)
-
-#elif defined(NRF52_SERIES) // All of the NRF52 targets are configured using variant.h, so this section shouldn't need to be
-// board specific
-
-//
-// Standard definitions for NRF52 targets
-//
-
-#define NO_ESP32 // Don't use ESP32 libs (mainly bluetooth)
-
-// We bind to the GPS using variant.h instead for this platform (Serial1)
-
-#define LED_PIN PIN_LED1 // LED1 on nrf52840-DK
-
-// If the variant filed defines as standard button
-#ifdef PIN_BUTTON1
-#define BUTTON_PIN PIN_BUTTON1
+// Nop definition for these attributes that are specific to ESP32
+#ifndef EXT_RAM_ATTR
+    #define EXT_RAM_ATTR
 #endif
-
-#ifdef PIN_BUTTON2
-#define BUTTON_PIN_ALT PIN_BUTTON2
+#ifndef IRAM_ATTR
+    #define IRAM_ATTR
 #endif
-
-#ifdef PIN_BUTTON_TOUCH
-#define BUTTON_PIN_TOUCH PIN_BUTTON_TOUCH
-#endif
-
-#else
-
-//
-// Standard definitions for ESP32 targets
-//
-
-#define HAS_WIFI
-
-#define GPS_SERIAL_NUM 1
-#define GPS_RX_PIN 34
-#ifdef USE_JTAG
-#define GPS_TX_PIN -1
-#else
-#define GPS_TX_PIN 12
-#endif
-
-// -----------------------------------------------------------------------------
-// LoRa SPI
-// -----------------------------------------------------------------------------
-
-// NRF52 boards will define this in variant.h
-#ifndef RF95_SCK
-#define RF95_SCK 5
-#define RF95_MISO 19
-#define RF95_MOSI 27
-#define RF95_NSS 18
-#endif
-
-#endif
-
-//
-// Standard definitions for !ESP32 targets
-//
-
-#ifdef NO_ESP32
-// Nop definition for these attributes - not used on NRF52
-#define EXT_RAM_ATTR
-#define IRAM_ATTR
-#define RTC_DATA_ATTR
+#ifndef RTC_DATA_ATTR
+    #define RTC_DATA_ATTR
 #endif
 
 // -----------------------------------------------------------------------------
@@ -130,7 +78,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // -----------------------------------------------------------------------------
 
 // Disable use of the NTP library and related features
-//#define DISABLE_NTP
+// #define DISABLE_NTP
 
 // Disable the welcome screen and allow 
 #define DISABLE_WELCOME_UNSET
@@ -159,6 +107,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // The older M5 Faces I2C Keyboard
 #define FACESKB_ADDR 0x88
 
+// -----------------------------------------------------------------------------
+// SENSOR
+// -----------------------------------------------------------------------------
+#define BME_ADDR 0x76
+#define BME_ADDR_ALTERNATE 0x77
+#define MCP9808_ADDR 0x18
+#define INA_ADDR 0x40
+#define INA_ADDR_ALTERNATE 0x41
+
 // -----------------------------------------------------------------------------
 // GPS
 // -----------------------------------------------------------------------------
@@ -169,105 +126,43 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define GPS_THREAD_INTERVAL 100
 #endif
 
-#if defined(TBEAM_V10)
-// This string must exactly match the case used in release file names or the android updater won't work
-#define HW_VENDOR HardwareModel_TBEAM
-
-#elif defined(TBEAM_V07)
-// This string must exactly match the case used in release file names or the android updater won't work
-#define HW_VENDOR HardwareModel_TBEAM0p7
-
-#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
-
-#elif defined(RAK_11200)
-// This string must exactly match the case used in release file names or the android updater won't work
-#define HW_VENDOR HardwareModel_RAK11200
-
-#elif defined(ARDUINO_HELTEC_WIFI_LORA_32_V2)
-
-#ifdef HELTEC_V2_0
-// This string must exactly match the case used in release file names or the android updater won't work
-#define HW_VENDOR HardwareModel_HELTEC_V2_0
-
-#endif
-
-#ifdef HELTEC_V2_1
-// This string must exactly match the case used in release file names or the android updater won't work
-#define HW_VENDOR HardwareModel_HELTEC_V2_1
-
-#endif
-
-#elif defined(ARDUINO_HELTEC_WIFI_LORA_32)
-
-#define HW_VENDOR HardwareModel_HELTEC_V1
-
-#elif defined(TLORA_V1)
-
-#define HW_VENDOR HardwareModel_TLORA_V1
-
-#elif defined(TLORA_V2)
-// This string must exactly match the case used in release file names or the android updater won't work
-#define HW_VENDOR HardwareModel_TLORA_V2
-
-#elif defined(TLORA_V1_3)
-// This string must exactly match the case used in release file names or the android updater won't work
-#define HW_VENDOR HardwareModel_TLORA_V1_1p3
-
-#elif defined(TLORA_V2_1_16)
-// This string must exactly match the case used in release file names or the android updater won't work
-#define HW_VENDOR HardwareModel_TLORA_V2_1_1p6
-
-#elif defined(GENIEBLOCKS)
-// This string must exactly match the case used in release file names or the android updater won't work
-#define HW_VENDOR HardwareModel_GENIEBLOCKS
-
-#elif defined(PRIVATE_HW)
-// This string must exactly match the case used in release file names or the android updater won't work
-#define HW_VENDOR HardwareModel_PRIVATE_HW
-
-#endif
-
-#ifdef ARDUINO_NRF52840_PCA10056
-
-// This string must exactly match the case used in release file names or the android updater won't work
-#define HW_VENDOR HardwareModel_NRF52840DK
-
-// This board uses 0 to be mean LED on
-#undef LED_INVERTED
-#define LED_INVERTED 1
-
-#elif defined(ARDUINO_NRF52840_PPR)
-
-#define HW_VENDOR HardwareModel_PPR
-
-#elif defined(RAK4630)
-
-#define HW_VENDOR HardwareModel_RAK4631
-
-#elif defined(TTGO_T_ECHO)
-
-#define HW_VENDOR HardwareModel_T_ECHO
-
-#elif defined(NANO_G1)
-
-#define HW_VENDOR HardwareModel_NANO_G1
-
-#elif defined(NORDIC_PCA10059)
-
-#define HW_VENDOR HardwareModel_NRF52840_PCA10059
-
-#elif NRF52_SERIES
-
-#define HW_VENDOR HardwareModel_NRF52_UNKNOWN
-
-#elif PORTDUINO
-
-#define HW_VENDOR HardwareModel_PORTDUINO
-
-#endif
-
+/* Step #1: offer chance for variant-specific defines */
 #include "variant.h"
+
+/* Step #2: follow with defines common to the architecture; 
+   also enable HAS_ option not specifically disabled by variant.h */
+#include "architecture.h"
+
+/* Step #3: mop up with disabled values for HAS_ options not handled by the above two */
+
+#ifndef HAS_WIFI
+    #define HAS_WIFI 0
+#endif
+#ifndef HAS_SCREEN
+    #define HAS_SCREEN 0
+#endif
+#ifndef HAS_WIRE
+    #define HAS_WIRE 0
+#endif
+#ifndef HAS_GPS
+    #define HAS_GPS 0
+#endif
+#ifndef HAS_BUTTON
+    #define HAS_BUTTON 0
+#endif
+#ifndef HAS_TELEMETRY
+    #define HAS_TELEMETRY 0
+#endif
+#ifndef HAS_RADIO
+    #define HAS_RADIO 0
+#endif
+#ifndef HAS_RTC
+    #define HAS_RTC 0
+#endif
+
 #include "RF95Configuration.h"
 #include "DebugConfiguration.h"
+
+#ifndef HW_VENDOR
+    #error HW_VENDOR must be defined
+#endif

src/debug/einkScan.h

@@ -0,0 +1,60 @@
+#include "../configuration.h"
+
+#ifdef RAK4630
+#include "../main.h"
+#include <SPI.h>
+
+void d_writeCommand(uint8_t c)
+{
+  SPI1.beginTransaction(SPISettings(4000000, MSBFIRST, SPI_MODE0));
+  if (PIN_EINK_DC >= 0) digitalWrite(PIN_EINK_DC, LOW);
+  if (PIN_EINK_CS >= 0) digitalWrite(PIN_EINK_CS, LOW);
+  SPI1.transfer(c);
+  if (PIN_EINK_CS >= 0) digitalWrite(PIN_EINK_CS, HIGH);
+  if (PIN_EINK_DC >= 0) digitalWrite(PIN_EINK_DC, HIGH);
+  SPI1.endTransaction();
+}
+
+void d_writeData(uint8_t d)
+{
+  SPI1.beginTransaction(SPISettings(4000000, MSBFIRST, SPI_MODE0));
+  if (PIN_EINK_CS >= 0) digitalWrite(PIN_EINK_CS, LOW);
+  SPI1.transfer(d);
+  if (PIN_EINK_CS >= 0) digitalWrite(PIN_EINK_CS, HIGH);
+  SPI1.endTransaction();
+}
+
+unsigned long d_waitWhileBusy(uint16_t busy_time)
+{
+  if (PIN_EINK_BUSY >= 0)
+  {
+    delay(1); // add some margin to become active
+    unsigned long start = micros();
+    while (1)
+    {
+      if (digitalRead(PIN_EINK_BUSY) != HIGH) break;
+      delay(1);
+      if (digitalRead(PIN_EINK_BUSY) != HIGH) break;
+      if (micros() - start > 10000000) break;
+    }
+    unsigned long elapsed = micros() - start;
+    (void) start;
+    return elapsed;
+  }
+  else return busy_time;
+}
+
+void scanEInkDevice(void)
+{
+    SPI1.begin();
+    d_writeCommand(0x22);
+    d_writeData(0x83);
+    d_writeCommand(0x20);
+    eink_found = (d_waitWhileBusy(150) > 0) ? true : false;
+    if(eink_found)
+       DEBUG_MSG("EInk display found\n");
+    else
+       DEBUG_MSG("EInk display not found\n");
+    SPI1.end();
+}
+#endif

src/debug/i2cScan.h

@@ -1,32 +1,59 @@
 #include "../configuration.h"
 #include "../main.h"
 #include <Wire.h>
+#include "mesh/generated/telemetry.pb.h"
+
+#if HAS_WIRE
+uint16_t getRegisterValue(uint8_t address, uint8_t reg, uint8_t length) {
+    uint16_t value = 0x00;
+    Wire.beginTransmission(address);
+    Wire.write(reg);
+    Wire.endTransmission();
+    delay(20);
+    Wire.requestFrom(address, length);
+    DEBUG_MSG("Wire.available() = %d\n", Wire.available());
+    if (Wire.available() == 2) {
+        // Read MSB, then LSB
+        value = (uint16_t)Wire.read() << 8;  
+        value |= Wire.read();
+    } else if (Wire.available()) {
+        value = Wire.read();
+    }
+    return value;
+}
 
-#ifndef NO_WIRE
 uint8_t oled_probe(byte addr)
 {
     uint8_t r = 0;
+    uint8_t r_prev = 0;
+    uint8_t c = 0;
     uint8_t o_probe = 0;
-    Wire.beginTransmission(addr);
-    Wire.write(0x00);
-    Wire.endTransmission();
-    Wire.requestFrom((int)addr, 1);
-    if (Wire.available()) {
-        r = Wire.read();
-    }
-    r &= 0x0f;
-    if (r == 0x08 || r == 0x00) {
-        o_probe = 2; // SH1106
-    } else if ( r == 0x03 || r == 0x06 || r == 0x07) {
-        o_probe = 1; // SSD1306
-    }
-    DEBUG_MSG("0x%x subtype probed\n", r);
+    do {
+        r_prev = r;
+        Wire.beginTransmission(addr);
+        Wire.write(0x00);
+        Wire.endTransmission();
+        Wire.requestFrom((int)addr, 1);
+        if (Wire.available()) {
+            r = Wire.read();
+        }
+        r &= 0x0f;
+
+        if (r == 0x08 || r == 0x00) {
+            o_probe = 2; // SH1106
+        } else if ( r == 0x03 || r == 0x06 || r == 0x07) {
+            o_probe = 1; // SSD1306
+        }
+        c++;
+    } while ((r != r_prev) && (c < 4));
+    DEBUG_MSG("0x%x subtype probed in %i tries \n", r, c);
     return o_probe;
 }
 
 void scanI2Cdevice(void)
 {
     byte err, addr;
+    uint16_t registerValue = 0x00;
     int nDevices = 0;
     for (addr = 1; addr < 127; addr++) {
         Wire.beginTransmission(addr);
@@ -47,9 +74,33 @@ void scanI2Cdevice(void)
                     DEBUG_MSG("unknown display found\n");
                 }
             }
+#ifdef RV3028_RTC
+            if (addr == RV3028_RTC){
+                rtc_found = addr;
+                DEBUG_MSG("RV3028 RTC found\n");
+                Melopero_RV3028 rtc;
+                rtc.initI2C();
+                rtc.writeToRegister(0x35,0x07); // no Clkout
+                rtc.writeToRegister(0x37,0xB4);
+            }
+#endif
+#ifdef PCF8563_RTC
+            if (addr == PCF8563_RTC){
+                rtc_found = addr;
+                DEBUG_MSG("PCF8563 RTC found\n");
+            }
+#endif
             if (addr == CARDKB_ADDR) {
                 cardkb_found = addr;
-                DEBUG_MSG("m5 cardKB found\n");
+                // Do we have the RAK14006 instead?
+                registerValue = getRegisterValue(addr, 0x04, 1);
+                if (registerValue == 0x02) { // KEYPAD_VERSION
+                    DEBUG_MSG("RAK14004 found\n");
+                    kb_model = 0x02;
+                } else {
+                    DEBUG_MSG("m5 cardKB found\n");
+                    kb_model = 0x00;
+                }
             }
             if (addr == FACESKB_ADDR) {
                 faceskb_found = addr;
@@ -65,6 +116,34 @@ void scanI2Cdevice(void)
                 DEBUG_MSG("axp192 PMU found\n");
             }
 #endif
+        if (addr == BME_ADDR || addr == BME_ADDR_ALTERNATE) {
+            registerValue = getRegisterValue(addr, 0xD0, 1); // GET_ID
+            if (registerValue == 0x61) {
+                DEBUG_MSG("BME-680 sensor found at address 0x%x\n", (uint8_t)addr);
+                nodeTelemetrySensorsMap[TelemetrySensorType_BME680] = addr;
+            } else if (registerValue == 0x60) {
+                DEBUG_MSG("BME-280 sensor found at address 0x%x\n", (uint8_t)addr);
+                nodeTelemetrySensorsMap[TelemetrySensorType_BME280] = addr;
+            } else {
+                DEBUG_MSG("BMP-280 sensor found at address 0x%x\n", (uint8_t)addr);
+                nodeTelemetrySensorsMap[TelemetrySensorType_BMP280] = addr;
+            }
+        }
+        if (addr == INA_ADDR || addr == INA_ADDR_ALTERNATE) {
+            registerValue = getRegisterValue(addr, 0xFE, 2);
+            DEBUG_MSG("Register MFG_UID: 0x%x\n", registerValue);
+            if (registerValue == 0x5449) {
+                DEBUG_MSG("INA260 sensor found at address 0x%x\n", (uint8_t)addr);
+                nodeTelemetrySensorsMap[TelemetrySensorType_INA260] = addr;
+            } else { // Assume INA219 if INA260 ID is not found
+                DEBUG_MSG("INA219 sensor found at address 0x%x\n", (uint8_t)addr);
+                nodeTelemetrySensorsMap[TelemetrySensorType_INA219] = addr;
+            }
+        }
+        if (addr == MCP9808_ADDR) {
+            nodeTelemetrySensorsMap[TelemetrySensorType_MCP9808] = addr;
+            DEBUG_MSG("MCP9808 sensor found at address 0x%x\n", (uint8_t)addr);
+        }
         } else if (err == 4) {
             DEBUG_MSG("Unknow error at address 0x%x\n", addr);
         }
@@ -73,7 +152,7 @@ void scanI2Cdevice(void)
     if (nDevices == 0)
         DEBUG_MSG("No I2C devices found\n");
     else
-        DEBUG_MSG("done\n");
+        DEBUG_MSG("%i I2C devices found\n",nDevices);
 }
 #else
 void scanI2Cdevice(void) {}

src/esp32/ESP32Bluetooth.cpp

@@ -23,9 +23,6 @@
 // proccess at once
 // static uint8_t trBytes[_max(_max(_max(_max(ToRadio_size, RadioConfig_size), User_size), MyNodeInfo_size), FromRadio_size)];
 static uint8_t fromRadioBytes[FromRadio_size];
-static uint8_t toRadioBytes[ToRadio_size];
-
-static bool bleConnected;
 
 NimBLECharacteristic *FromNumCharacteristic;
 NimBLEServer *bleServer;

src/esp32/ESP32CryptoEngine.cpp

@@ -54,7 +54,7 @@ class ESP32CryptoEngine : public CryptoEngine
             static uint8_t scratch[MAX_BLOCKSIZE];
             size_t nc_off = 0;
 
-            // DEBUG_MSG("ESP32 crypt fr=%x, num=%x, numBytes=%d!\n", fromNode, (uint32_t) packetId, numBytes);
+            DEBUG_MSG("ESP32 crypt fr=%x, num=%x, numBytes=%d!\n", fromNode, (uint32_t) packetId, numBytes);
             initNonce(fromNode, packetId);
             assert(numBytes <= MAX_BLOCKSIZE);
             memcpy(scratch, bytes, numBytes);
@@ -68,8 +68,6 @@ class ESP32CryptoEngine : public CryptoEngine
 
     virtual void decrypt(uint32_t fromNode, uint64_t packetId, size_t numBytes, uint8_t *bytes) override
     {
-        // DEBUG_MSG("ESP32 decrypt!\n");
-
         // For CTR, the implementation is the same
         encrypt(fromNode, packetId, numBytes, bytes);
     }

src/esp32/architecture.h

@@ -0,0 +1,105 @@
+#pragma once
+
+#define ARCH_ESP32
+
+//
+// defaults for ESP32 architecture
+//
+
+#ifndef HAS_WIFI
+    #define HAS_WIFI 1
+#endif
+#ifndef HAS_SCREEN
+    #define HAS_SCREEN 1
+#endif
+#ifndef HAS_WIRE
+    #define HAS_WIRE 1
+#endif
+#ifndef HAS_GPS
+    #define HAS_GPS 1
+#endif
+#ifndef HAS_BUTTON
+    #define HAS_BUTTON 1
+#endif
+#ifndef HAS_TELEMETRY
+    #define HAS_TELEMETRY 1
+#endif
+#ifndef HAS_RADIO
+    #define HAS_RADIO 1
+#endif
+#ifndef HAS_RTC
+    #define HAS_RTC 1
+#endif
+
+//
+// set HW_VENDOR
+//
+
+// This string must exactly match the case used in release file names or the android updater won't work
+
+#if defined(TBEAM_V10)
+    #define HW_VENDOR HardwareModel_TBEAM
+#elif defined(TBEAM_V07)
+    #define HW_VENDOR HardwareModel_TBEAM0p7
+#elif defined(DIY_V1)
+    #define HW_VENDOR HardwareModel_DIY_V1
+#elif defined(RAK_11200)
+    #define HW_VENDOR HardwareModel_RAK11200
+#elif defined(ARDUINO_HELTEC_WIFI_LORA_32_V2)
+    #ifdef HELTEC_V2_0
+        #define HW_VENDOR HardwareModel_HELTEC_V2_0
+    #endif
+    #ifdef HELTEC_V2_1
+        #define HW_VENDOR HardwareModel_HELTEC_V2_1
+    #endif
+#elif defined(ARDUINO_HELTEC_WIFI_LORA_32)
+    #define HW_VENDOR HardwareModel_HELTEC_V1
+#elif defined(TLORA_V1)
+    #define HW_VENDOR HardwareModel_TLORA_V1
+#elif defined(TLORA_V2)
+    #define HW_VENDOR HardwareModel_TLORA_V2
+#elif defined(TLORA_V1_3)
+    #define HW_VENDOR HardwareModel_TLORA_V1_1p3
+#elif defined(TLORA_V2_1_16)
+    #define HW_VENDOR HardwareModel_TLORA_V2_1_1p6
+#elif defined(GENIEBLOCKS)
+    #define HW_VENDOR HardwareModel_GENIEBLOCKS
+#elif defined(PRIVATE_HW)
+    #define HW_VENDOR HardwareModel_PRIVATE_HW
+#elif defined(NANO_G1)
+    #define HW_VENDOR HardwareModel_NANO_G1
+#elif defined(M5STACK)
+    #define HW_VENDOR HardwareModel_M5STACK
+#elif defined(STATION_G1)
+    #define HW_VENDOR HardwareModel_STATION_G1
+#endif
+
+//
+// Standard definitions for ESP32 targets
+//
+
+#define GPS_SERIAL_NUM 1
+#ifndef GPS_RX_PIN
+#define GPS_RX_PIN 34
+#endif
+#ifndef GPS_TX_PIN
+#ifdef USE_JTAG
+#define GPS_TX_PIN -1
+#else
+#define GPS_TX_PIN 12
+#endif
+#endif
+
+// -----------------------------------------------------------------------------
+// LoRa SPI
+// -----------------------------------------------------------------------------
+
+// NRF52 boards will define this in variant.h
+#ifndef RF95_SCK
+#define RF95_SCK 5
+#define RF95_MISO 19
+#define RF95_MOSI 27
+#define RF95_NSS 18
+#endif
+
+#define SERIAL0_RX_GPIO 3 // Always GPIO3 on ESP32

src/gps/GPS.cpp

@@ -1,7 +1,7 @@
-#include "configuration.h"
 #include "GPS.h"
 #include "NodeDB.h"
 #include "RTC.h"
+#include "configuration.h"
 #include "sleep.h"
 #include <assert.h>
 
@@ -16,40 +16,75 @@ HardwareSerial *GPS::_serial_gps = &Serial1;
 HardwareSerial *GPS::_serial_gps = NULL;
 #endif
 
-#ifdef GPS_I2C_ADDRESS
-uint8_t GPS::i2cAddress = GPS_I2C_ADDRESS;
-#else
-uint8_t GPS::i2cAddress = 0;
-#endif
-
 GPS *gps;
 
 /// Multiple GPS instances might use the same serial port (in sequence), but we can
 /// only init that port once.
 static bool didSerialInit;
 
+bool GPS::getACK(uint8_t c, uint8_t i) {
+  uint8_t b;
+  uint8_t ack = 0;
+  const uint8_t ackP[2] = {c, i};
+  uint8_t buf[10] = {0xB5, 0x62, 0x05, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00};
+  unsigned long startTime = millis();
+
+  for (int j = 2; j < 6; j++) {
+    buf[8] += buf[j];
+    buf[9] += buf[8];
+  }
+
+  for (int j = 0; j < 2; j++) {
+    buf[6 + j] = ackP[j];
+    buf[8] += buf[6 + j];
+    buf[9] += buf[8];
+  }
+
+  while (1) {
+    if (ack > 9) {
+      return true;
+    }
+    if (millis() - startTime > 1000) {
+      return false;
+    }
+    if (_serial_gps->available()) {
+      b = _serial_gps->read();
+      if (b == buf[ack]) {
+        ack++;
+      }
+      else {
+        ack = 0;
+      }
+    }
+  }
+}
+
 bool GPS::setupGPS()
 {
     if (_serial_gps && !didSerialInit) {
         didSerialInit = true;
 
 // ESP32 has a special set of parameters vs other arduino ports
-#if defined(GPS_RX_PIN) && !defined(NO_ESP32)
+#if defined(GPS_RX_PIN) && defined(ARCH_ESP32)
         _serial_gps->begin(GPS_BAUDRATE, SERIAL_8N1, GPS_RX_PIN, GPS_TX_PIN);
 #else
         _serial_gps->begin(GPS_BAUDRATE);
 #endif
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
         _serial_gps->setRxBufferSize(2048); // the default is 256
 #endif
 #ifdef TTGO_T_ECHO
-        // Switch to 4800 baud, then close and reopen port
-        _serial_gps->write("$PCAS01,0*1C\r\n");
-        delay(250);
+        // Switch to 9600 baud, then close and reopen port
         _serial_gps->end();
         delay(250);
         _serial_gps->begin(4800);
         delay(250);
+        _serial_gps->write("$PCAS01,1*1D\r\n");
+        delay(250);
+        _serial_gps->end();
+        delay(250);
+        _serial_gps->begin(9600);
+        delay(250);
         // Initialize the L76K Chip, use GPS + GLONASS
         _serial_gps->write("$PCAS04,5*1C\r\n");
         delay(250);
@@ -59,7 +94,62 @@ bool GPS::setupGPS()
         // Switch to Vehicle Mode, since SoftRF enables Aviation < 2g
         _serial_gps->write("$PCAS11,3*1E\r\n");
         delay(250);
+#endif
+#ifdef GPS_UBLOX
+        delay(250);
+        // Set the UART port to output NMEA only
+        byte _message_nmea[] = {0xB5, 0x62, 0x06, 0x00, 0x14, 0x00, 0x01, 0x00, 0x00, 0x00, 0xC0, 0x08, 0x00, 0x00,
+                                0x80, 0x25, 0x00, 0x00, 0x07, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x91, 0xAF};
+        _serial_gps->write(_message_nmea, sizeof(_message_nmea));
+        if (!getACK(0x06, 0x00)) {
+            DEBUG_MSG("WARNING: Unable to enable NMEA Mode.\n");
+            return true;
+        }  
 
+        // disable GGL
+        byte _message_GGL[] = {0xB5, 0x62, 0x06, 0x01, 0x08, 0x00, 0xF0, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x05, 0x3A};
+        _serial_gps->write(_message_GGL, sizeof(_message_GGL));
+        if (!getACK(0x06, 0x01)) {
+            DEBUG_MSG("WARNING: Unable to disable NMEA GGL.\n");
+            return true;
+        }
+
+        // disable GSA
+        byte _message_GSA[] = {0xB5, 0x62, 0x06, 0x01, 0x08, 0x00, 0xF0, 0x02, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x06, 0x41};
+        _serial_gps->write(_message_GSA, sizeof(_message_GSA));
+        if (!getACK(0x06, 0x01)) {
+            DEBUG_MSG("WARNING: Unable to disable NMEA GSA.\n");
+            return true;
+        }
+
+        // disable GSV
+        byte _message_GSV[] = {0xB5, 0x62, 0x06, 0x01, 0x08, 0x00, 0xF0, 0x03, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x07, 0x48};
+        _serial_gps->write(_message_GSV, sizeof(_message_GSV));
+        if (!getACK(0x06, 0x01)) {
+            DEBUG_MSG("WARNING: Unable to disable NMEA GSV.\n");
+            return true;
+        }
+
+        // disable VTG
+        byte _message_VTG[] = {0xB5, 0x62, 0x06, 0x01, 0x08, 0x00, 0xF0, 0x05, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x09, 0x56};
+        _serial_gps->write(_message_VTG, sizeof(_message_VTG));
+        if (!getACK(0x06, 0x01)) {
+            DEBUG_MSG("WARNING: Unable to disable NMEA VTG.\n");
+            return true;
+        }
+
+        // enable RMC
+        byte _message_RMC[] = {0xB5, 0x62, 0x06, 0x01, 0x08, 0x00, 0xF0, 0x04, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x09, 0x54};
+        _serial_gps->write(_message_RMC, sizeof(_message_RMC));
+        if (!getACK(0x06, 0x01)) {
+            DEBUG_MSG("WARNING: Unable to enable NMEA RMC.\n");
+            return true;
+        }
+
+        // enable GGA
+        byte _message_GGA[] = {0xB5, 0x62, 0x06, 0x01, 0x08, 0x00, 0xF0, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x05, 0x38};
+        _serial_gps->write(_message_GGA, sizeof(_message_GGA));
+        if (!getACK(0x06, 0x01)) DEBUG_MSG("WARNING: Unable to enable NMEA GGA.\n");
 #endif
     }
 
@@ -99,7 +189,15 @@ GPS::~GPS()
     notifyDeepSleepObserver.unobserve(&notifyDeepSleep);
 }
 
-bool GPS::hasLock() { return hasValidLocation; }
+bool GPS::hasLock()
+{
+    return hasValidLocation;
+}
+
+bool GPS::hasFlow()
+{
+    return hasGPS;
+}
 
 // Allow defining the polarity of the WAKE output.  default is active high
 #ifndef GPS_WAKE_ACTIVE
@@ -169,14 +267,16 @@ void GPS::setAwake(bool on)
  */
 uint32_t GPS::getWakeTime() const
 {
-    uint32_t t = radioConfig.preferences.gps_attempt_time;
+    uint32_t t = config.position.gps_attempt_time;
 
     if (t == UINT32_MAX)
         return t; // already maxint
 
     if (t == 0)
-        t = (radioConfig.preferences.role == Role_Router) ? 5 * 60 : 15 * 60; // Allow up to 15 mins for each attempt (probably will be much
-                                                                  // less if we can find sats) or less if a router
+        t = (config.device.role == Config_DeviceConfig_Role_Router)
+                ? 5 * 60
+                : 15 * 60; // Allow up to 15 mins for each attempt (probably will be much
+                           // less if we can find sats) or less if a router
 
     t *= 1000; // msecs
 
@@ -187,18 +287,18 @@ uint32_t GPS::getWakeTime() const
  */
 uint32_t GPS::getSleepTime() const
 {
-    uint32_t t = radioConfig.preferences.gps_update_interval;
-    bool gps_disabled = radioConfig.preferences.gps_disabled;
-    bool loc_share_disabled = radioConfig.preferences.location_share_disabled;
+    uint32_t t = config.position.gps_update_interval;
+    bool gps_disabled = config.position.gps_disabled;
 
-    if (gps_disabled || loc_share_disabled)
+    if (gps_disabled)
         t = UINT32_MAX; // Sleep forever now
 
     if (t == UINT32_MAX)
         return t; // already maxint
 
-    if (t == 0)                                                        // default - unset in preferences
-        t = (radioConfig.preferences.role == Role_Router) ? 24 * 60 * 60 : 2 * 60; // 2 mins or once per day for routers
+    if (t == 0) // default - unset in preferences
+        t = (config.device.role == Config_DeviceConfig_Role_Router) ? 24 * 60 * 60
+                                                                                   : 2 * 60; // 2 mins or once per day for routers
 
     t *= 1000;
 
@@ -211,12 +311,10 @@ void GPS::publishUpdate()
         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 pos@%x:2, hasVal=%d, GPSlock=%d\n", p.pos_timestamp, hasValidLocation, hasLock());
 
         // Notify any status instances that are observing us
-        const meshtastic::GPSStatus status =
-            meshtastic::GPSStatus(hasValidLocation, isConnected(), p);
+        const meshtastic::GPSStatus status = meshtastic::GPSStatus(hasValidLocation, isConnected(), p);
         newStatus.notifyObservers(&status);
     }
 }
@@ -226,6 +324,15 @@ int32_t GPS::runOnce()
     if (whileIdle()) {
         // if we have received valid NMEA claim we are connected
         setConnected();
+    } else {
+#ifdef GPS_UBLOX        
+        // reset the GPS on next bootup
+        if(devicestate.did_gps_reset && (millis() > 60000) && !hasFlow()) {
+            DEBUG_MSG("GPS is not communicating, trying factory reset on next bootup.\n");
+            devicestate.did_gps_reset = false;
+            nodeDB.saveDeviceStateToDisk();
+        }
+#endif
     }
 
     // If we are overdue for an update, turn on the GPS and at least publish the current status
@@ -325,45 +432,25 @@ int GPS::prepareDeepSleep(void *unused)
     return 0;
 }
 
-#ifdef GPS_TX_PIN
-#include "UBloxGPS.h"
-#endif
-
-#ifndef NO_GPS
+#if HAS_GPS
 #include "NMEAGPS.h"
 #endif
 
 GPS *createGps()
 {
 
-#ifdef NO_GPS
+#if !HAS_GPS
     return nullptr;
 #else
-    if (!radioConfig.preferences.gps_disabled){
+    if (!config.position.gps_disabled) {
 #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
-        UBloxGPS *ublox = new UBloxGPS();
-
-        if (!ublox->setup()) {
-            DEBUG_MSG("ERROR: No UBLOX GPS found\n");
-            delete ublox;
-            ublox = NULL;
-        } else {
-            DEBUG_MSG("Using UBLOX Mode\n");
-            return ublox;
-        }
-#endif
-
         if (GPS::_serial_gps) {
             // Some boards might have only the TX line from the GPS connected, in that case, we can't configure it at all.  Just
             // assume NMEA at 9600 baud.
-            DEBUG_MSG("Using NMEA Mode\n");
             GPS *new_gps = new NMEAGPS();
             new_gps->setup();
             return new_gps;

src/gps/GPS.h

@@ -40,9 +40,6 @@ class GPS : private concurrency::OSThread
     /** If !NULL we will use this serial port to construct our GPS */
     static HardwareSerial *_serial_gps;
 
-    /** If !0 we will attempt to connect to the GPS over I2C */
-    static uint8_t i2cAddress;
-
     Position p = Position_init_default;
 
     GPS() : concurrency::OSThread("GPS") {}
@@ -60,6 +57,9 @@ class GPS : private concurrency::OSThread
     /// Returns true if we have acquired GPS lock.
     virtual bool hasLock();
 
+    /// Returns true if there's valid data flow with the chip.
+    virtual bool hasFlow();
+
     /// Return true if we are connected to a GPS
     bool isConnected() const { return hasGPS; }
 
@@ -138,6 +138,8 @@ class GPS : private concurrency::OSThread
      */
     uint32_t getSleepTime() const;
 
+    bool getACK(uint8_t c, uint8_t i);
+
     /**
      * Tell users we have new GPS readings
      */

src/gps/GeoCoord.cpp

@@ -379,7 +379,7 @@ float GeoCoord::latLongToMeter(double lat_a, double lng_a, double lat_b, double
  * 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
+ * @return Bearing from point 1 to point 2 in radians. A value of 0 means due
  * north.
  */
 float GeoCoord::bearing(double lat1, double lon1, double lat2, double lon2)

src/gps/NMEAGPS.cpp

@@ -17,6 +17,19 @@ static int32_t toDegInt(RawDegrees d)
     return r;
 }
 
+bool NMEAGPS::factoryReset()
+{
+#ifdef GPS_UBLOX
+    // Factory Reset
+    byte _message_reset[] = {0xB5, 0x62, 0x06, 0x09, 0x0D, 0x00, 0xFF,
+        0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0xFF, 0xFF, 0x00, 0x00, 0x17, 0x2B, 0x7E};
+    _serial_gps->write(_message_reset,sizeof(_message_reset));
+    delay(1000);
+#endif
+    return true;
+}
+
 bool NMEAGPS::setupGPS()
 {
     GPS::setupGPS();
@@ -64,11 +77,12 @@ The Unix epoch (or Unix time or POSIX time or Unix timestamp) is the number of s
         t.tm_mon = d.month() - 1;
         t.tm_year = d.year() - 1900;
         t.tm_isdst = false;
-        DEBUG_MSG("NMEA GPS time %d-%d-%d %d:%d:%d\n", d.year(), d.month(), t.tm_mday, t.tm_hour, t.tm_min, t.tm_sec);
-
-        perhapsSetRTC(RTCQualityGPS, t);
-
-        return true;
+        if (t.tm_mon > -1){
+            DEBUG_MSG("NMEA GPS time %02d-%02d-%02d %02d:%02d:%02d\n", d.year(), d.month(), t.tm_mday, t.tm_hour, t.tm_min, t.tm_sec);
+            perhapsSetRTC(RTCQualityGPS, t);
+            return true;
+        } else
+            return false;
     } else
         return false;
 }
@@ -128,8 +142,16 @@ bool NMEAGPS::lookForLocation()
     auto loc = reader.location.value();
 
     // Bail out EARLY to avoid overwriting previous good data (like #857)
-    if(toDegInt(loc.lat) == 0) {
-        DEBUG_MSG("Ignoring bogus NMEA position\n");
+    if (toDegInt(loc.lat) > 900000000) {
+#ifdef GPS_EXTRAVERBOSE        
+        DEBUG_MSG("Bail out EARLY on LAT %i\n",toDegInt(loc.lat));
+#endif
+        return false;
+    }
+    if (toDegInt(loc.lng) > 1800000000) {
+#ifdef GPS_EXTRAVERBOSE        
+        DEBUG_MSG("Bail out EARLY on LNG %i\n",toDegInt(loc.lng));
+#endif
         return false;
     }
 
@@ -213,6 +235,10 @@ bool NMEAGPS::hasLock()
     return false;
 }
 
+bool NMEAGPS::hasFlow()
+{
+    return reader.passedChecksum() > 0;
+}
 
 bool NMEAGPS::whileIdle()
 {

src/gps/NMEAGPS.h

@@ -25,6 +25,8 @@ class NMEAGPS : public GPS
   public:
     virtual bool setupGPS() override;
 
+    virtual bool factoryReset() override;
+
   protected:
     /** Subclasses should look for serial rx characters here and feed it to their GPS parser
      * 
@@ -49,4 +51,6 @@ class NMEAGPS : public GPS
     virtual bool lookForLocation() override;
 
     virtual bool hasLock() override;
+
+    virtual bool hasFlow() override;
 };

src/gps/RTC.cpp

@@ -1,5 +1,6 @@
 #include "RTC.h"
 #include "configuration.h"
+#include "main.h"
 #include <sys/time.h>
 #include <time.h>
 
@@ -18,14 +19,57 @@ static uint64_t zeroOffsetSecs; // GPS based time in secs since 1970 - only upda
 void readFromRTC()
 {
     struct timeval tv; /* btw settimeofday() is helpfull here too*/
-
+#ifdef RV3028_RTC
+    if(rtc_found == RV3028_RTC) {
+        uint32_t now = millis();
+        Melopero_RV3028 rtc;
+        rtc.initI2C();
+        tm t;
+        t.tm_year = rtc.getYear() - 1900;
+        t.tm_mon = rtc.getMonth() - 1;
+        t.tm_mday = rtc.getDate();
+        t.tm_hour = rtc.getHour();
+        t.tm_min = rtc.getMinute();
+        t.tm_sec = rtc.getSecond();
+        tv.tv_sec = mktime(&t);
+        tv.tv_usec = 0;
+        DEBUG_MSG("Read RTC time from RV3028 as %ld\n", tv.tv_sec);
+        timeStartMsec = now;
+        zeroOffsetSecs = tv.tv_sec;
+        if (currentQuality == RTCQualityNone) {
+            currentQuality = RTCQualityDevice;
+        }
+    }
+#elif defined(PCF8563_RTC)
+    if(rtc_found == PCF8563_RTC) {
+        uint32_t now = millis();
+        PCF8563_Class rtc;
+        rtc.begin();
+        auto tc = rtc.getDateTime();
+        tm t;
+        t.tm_year = tc.year;
+        t.tm_mon = tc.month;
+        t.tm_mday = tc.day;
+        t.tm_hour = tc.hour;
+        t.tm_min = tc.minute;
+        t.tm_sec = tc.second;
+        tv.tv_sec = mktime(&t);
+        tv.tv_usec = 0;
+        DEBUG_MSG("Read RTC time from PCF8563 as %ld\n", tv.tv_sec);
+        timeStartMsec = now;
+        zeroOffsetSecs = tv.tv_sec;
+        if (currentQuality == RTCQualityNone) {
+            currentQuality = RTCQualityDevice;
+        }
+    }
+#else 
     if (!gettimeofday(&tv, NULL)) {
         uint32_t now = millis();
-
-        DEBUG_MSG("Read RTC time as %ld (cur millis %u) quality=%d\n", tv.tv_sec, now, currentQuality);
+        DEBUG_MSG("Read RTC time as %ld\n", tv.tv_sec);
         timeStartMsec = now;
         zeroOffsetSecs = tv.tv_sec;
     }
+#endif
 }
 
 /// If we haven't yet set our RTC this boot, set it from a GPS derived time
@@ -55,12 +99,28 @@ bool perhapsSetRTC(RTCQuality q, const struct timeval *tv)
         zeroOffsetSecs = tv->tv_sec;
 
         // If this platform has a setable RTC, set it
-#ifndef NO_ESP32
+#ifdef RV3028_RTC
+        if(rtc_found == RV3028_RTC) {
+            Melopero_RV3028 rtc;
+            rtc.initI2C();
+            tm *t = localtime(&tv->tv_sec);
+            rtc.setTime(t->tm_year + 1900, t->tm_mon + 1, t->tm_wday, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec);
+            DEBUG_MSG("RV3028_RTC setTime %02d-%02d-%02d %02d:%02d:%02d %ld\n", t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec, tv->tv_sec);
+        }
+#elif defined(PCF8563_RTC)
+        if(rtc_found == PCF8563_RTC) {
+            PCF8563_Class rtc;
+            rtc.begin();
+            tm *t = localtime(&tv->tv_sec);
+            rtc.setDateTime(t->tm_year + 1900, t->tm_mon + 1, t->tm_wday, t->tm_hour, t->tm_min, t->tm_sec);
+            DEBUG_MSG("PCF8563_RTC setDateTime %02d-%02d-%02d %02d:%02d:%02d %ld\n", t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec, tv->tv_sec);
+        }
+#elif defined(ARCH_ESP32)
         settimeofday(tv, NULL);
 #endif
 
         // nrf52 doesn't have a readable RTC (yet - software not written)
-#if defined(PORTDUINO) || !defined(NO_ESP32)
+#ifdef HAS_RTC
         readFromRTC();
 #endif
 

src/gps/RTC.h

@@ -5,17 +5,21 @@
 #include <Arduino.h>
 
 enum RTCQuality {
+
     /// We haven't had our RTC set yet
     RTCQualityNone = 0,
 
+    /// We got time from an onboard peripheral after boot.
+    RTCQualityDevice = 1,
+
     /// Some other node gave us a time we can use
-    RTCQualityFromNet = 1,
+    RTCQualityFromNet = 2,
 
     /// Our time is based on NTP
-    RTCQualityNTP= 2,
+    RTCQualityNTP= 3,
 
     /// Our time is based on our own GPS
-    RTCQualityGPS = 3
+    RTCQualityGPS = 4
 };
 
 RTCQuality getRTCQuality();

src/gps/UBloxGPS.cpp

@@ -1,328 +0,0 @@
-#include "configuration.h"
-#include "UBloxGPS.h"
-#include "RTC.h"
-#include "error.h"
-#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()
-{
-    bool c = false;
-
-    if (_serial_gps)
-        c = ublox.begin(*_serial_gps);
-
-    if (!c && i2cAddress) {
-        extern bool neo6M; // Super skanky - if we are talking to the device i2c we assume it is a neo7 on a RAK815, which
-                           // supports the newer API
-        neo6M = true;
-
-        c = ublox.begin(Wire, i2cAddress);
-    }
-
-    if (c)
-        setConnected();
-
-    return c;
-}
-
-bool UBloxGPS::setupGPS()
-{
-    GPS::setupGPS();
-
-    // uncomment to see debug info
-    // ublox.enableDebugging(Serial);
-
-    // try a second time, the ublox lib serial parsing is buggy?
-    // see https://github.com/meshtastic/Meshtastic-device/issues/376
-    for (int i = 0; (i < 3) && !tryConnect(); i++)
-        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;
-    }
-}
-
-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;
-    }
-    if (i2cAddress) {
-        if (!ublox.setI2COutput(COM_TYPE_UBX, 1000))
-            return false;
-    }
-
-    if (!ublox.setNavigationFrequency(1, 1000)) // Produce 4x/sec to keep the amount of time we stall in getPVT low
-        return false;
-
-    // ok = ublox.setAutoPVT(false); // Not implemented on NEO-6M
-    // assert(ok);
-    // ok = ublox.setDynamicModel(DYN_MODEL_BIKE); // probably PEDESTRIAN but just in case assume bike speeds
-    // assert(ok);
-
-    // per https://github.com/meshtastic/Meshtastic-device/issues/376 powerSaveMode might not work with the marginal
-    // TTGO antennas
-    // if (!ublox.powerSaveMode(true, 2000)) // use power save mode, the default timeout (1100ms seems a bit too tight)
-    //     return false;
-
-    if (!ublox.saveConfiguration(3000))
-        return false;
-
-    return true;
-}
-
-/**
- * Reset our GPS back to factory settings
- *
- * @return true for success
- */
-bool UBloxGPS::factoryReset()
-{
-    bool ok = false;
-
-    // It is useful to force back into factory defaults (9600baud, NMEA to test the behavior of boards that don't have
-    // GPS_TX connected)
-    ublox.factoryReset();
-    delay(5000);
-    tryConnect(); // sets isConnected
-
-    // try a second time, the ublox lib serial parsing is buggy?
-    for (int i = 0; (i < 3) && !tryConnect(); i++)
-        delay(500);
-
-    DEBUG_MSG("GPS Factory reset success=%d\n", isConnected());
-    if (isConnected())
-        ok = setUBXMode();
-
-    return ok;
-}
-
-/** 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());  // 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()
-}
-
-/**
- * Perform any processing that should be done only while the GPS is awake and looking for a fix.
- * Override this method to check for new locations
- *
- * @return true if we've acquired a new location
- */
-bool UBloxGPS::lookForTime()
-{
-    if (ublox.moduleQueried.gpsSecond) {
-        /* Convert to unix time
-        The Unix epoch (or Unix time or POSIX time or Unix timestamp) is the number of seconds that have elapsed since January
-        1, 1970 (midnight UTC/GMT), not counting leap seconds (in ISO 8601: 1970-01-01T00:00:00Z).
-        */
-        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;
-        perhapsSetRTC(RTCQualityGPS, t);
-        return true;
-    }
-
-    return false;
-}
-
-/**
- * Perform any processing that should be done only while the GPS is awake and looking for a fix.
- * Override this method to check for new locations
- *
- * @return true if we've acquired a new location
- */
-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;
-    }
-
-    fixType = ublox.getFixType();
-#ifdef UBLOX_EXTRAVERBOSE
-    DEBUG_MSG("FixType=%d\n", fixType);
-#endif
-
-
-    // check if GPS has an acceptable lock
-    if (! hasLock()) {
-        ublox.flushPVT();  // reset ALL freshness flags
-        return false;
-    }
-
-    // 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;
-        }
-        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
-    return ublox.checkUblox(); // See if new data is available. Process bytes as they come in.
-}
-
-/// If possible force the GPS into sleep/low power mode
-/// 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);
-    }
-}
-
-void UBloxGPS::wake()
-{
-    if (radioConfig.preferences.gps_update_interval > UBLOX_POWEROFF_THRESHOLD) {
-        fixType = 0; // assume we have 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()
-    // Give time for the GPS to boot
-    // delay(200);
-}

src/gps/UBloxGPS.h

@@ -1,72 +0,0 @@
-#pragma once
-
-#include "GPS.h"
-#include "Observer.h"
-#include "SparkFun_Ublox_Arduino_Library.h"
-
-/**
- * A gps class that only reads from the GPS periodically (and FIXME - eventually keeps the gps powered down except when reading)
- *
- * When new data is available it will notify observers.
- */
-class UBloxGPS : public GPS
-{
-    SFE_UBLOX_GPS ublox;
-    uint8_t fixType = 0;
-
-  public:
-    UBloxGPS();
-
-    /**
-     * Reset our GPS back to factory settings
-     *
-     * @return true for success
-     */
-    bool factoryReset() override;
-
-  protected:
-    /**
-     * Returns true if we succeeded
-     */
-    virtual bool setupGPS() override;
-
-    /** Subclasses should look for serial rx characters here and feed it to their GPS parser
-     *
-     * Return true if we received a valid message from the GPS
-     */
-    virtual bool whileIdle() override;
-
-    /** Idle processing while GPS is looking for lock */
-    virtual void whileActive() override;
-
-    /**
-     * Perform any processing that should be done only while the GPS is awake and looking for a fix.
-     * Override this method to check for new locations
-     *
-     * @return true if we've acquired a time
-     */
-    virtual bool lookForTime() override;
-
-    /**
-     * Perform any processing that should be done only while the GPS is awake and looking for a fix.
-     * Override this method to check for new locations
-     *
-     * @return true if we've acquired a new location
-     */
-    virtual bool lookForLocation() override;
-    virtual bool hasLock() override;
-
-    /// If possible force the GPS into sleep/low power mode
-    virtual void sleep() override;
-    virtual void wake() override;
-
-  private:
-    /// Attempt to connect to our GPS, returns false if no gps is present
-    bool tryConnect();
-
-    /// Switch to our desired operating mode and save the settings to flash
-    /// returns true for success
-    bool setUBXMode();
-
-    uint16_t maxWait() const { return i2cAddress ? 300 : 0; /*If using i2c we must poll with wait */ }
-};

src/graphics/EInkDisplay2.cpp

@@ -1,6 +1,7 @@
 #include "configuration.h"
 
-#ifdef HAS_EINK
+#ifdef USE_EINK
+#include "main.h"
 #include "EInkDisplay2.h"
 #include "SPILock.h"
 #include <SPI.h>
@@ -30,6 +31,11 @@
 //4.2 inch 300x400 - GxEPD2_420_M01
 #define TECHO_DISPLAY_MODEL GxEPD2_420_M01
 
+#elif defined(M5_COREINK)
+//M5Stack CoreInk
+//1.54 inch 200x200 - GxEPD2_154_M09
+#define TECHO_DISPLAY_MODEL GxEPD2_154_M09
+
 #endif
 
 GxEPD2_BW<TECHO_DISPLAY_MODEL, TECHO_DISPLAY_MODEL::HEIGHT> *adafruitDisplay;
@@ -57,6 +63,12 @@ EInkDisplay::EInkDisplay(uint8_t address, int sda, int scl)
     //GxEPD2_420_M01
     setGeometry(GEOMETRY_RAWMODE, 300, 400);
     
+    #elif defined(M5_COREINK)
+    
+    //M5Stack_CoreInk 200x200
+    //1.54 inch 200x200 - GxEPD2_154_M09
+    setGeometry(GEOMETRY_RAWMODE, EPD_HEIGHT, EPD_WIDTH);
+
     #endif
     // setGeometry(GEOMETRY_RAWMODE, 128, 64); // old resolution
     // setGeometry(GEOMETRY_128_64); // We originally used this because I wasn't sure if rawmode worked - it does
@@ -107,7 +119,7 @@ bool EInkDisplay::forceDisplay(uint32_t msecLimit)
         // 4.2 inch 300x400 - GxEPD2_420_M01
         //adafruitDisplay->nextPage();
         
-        #elif defined(PCA10059)
+        #elif defined(PCA10059) || defined(M5_COREINK)
         adafruitDisplay->nextPage();
         #endif
         
@@ -171,18 +183,21 @@ bool EInkDisplay::connect()
 }
 #elif defined(RAK4630)
 {
-    auto lowLevel = new TECHO_DISPLAY_MODEL(PIN_EINK_CS, PIN_EINK_DC, PIN_EINK_RES, PIN_EINK_BUSY);
+    if (eink_found) {
+        auto lowLevel = new TECHO_DISPLAY_MODEL(PIN_EINK_CS, PIN_EINK_DC, PIN_EINK_RES, PIN_EINK_BUSY);
 
-    adafruitDisplay = new GxEPD2_BW<TECHO_DISPLAY_MODEL, TECHO_DISPLAY_MODEL::HEIGHT>(*lowLevel);
-    
-    adafruitDisplay->init(115200, true, 10, false, SPI1, SPISettings(4000000, MSBFIRST, SPI_MODE0));
+        adafruitDisplay = new GxEPD2_BW<TECHO_DISPLAY_MODEL, TECHO_DISPLAY_MODEL::HEIGHT>(*lowLevel);
+        
+        adafruitDisplay->init(115200, true, 10, false, SPI1, SPISettings(4000000, MSBFIRST, SPI_MODE0));
 
-    //RAK14000 2.13 inch b/w 250x122 does not support partial updates 
-    adafruitDisplay->setRotation(3);
-    //For 1.54, 2.9 and 4.2
-    //adafruitDisplay->setRotation(1);
-
-    adafruitDisplay->setPartialWindow(0, 0, displayWidth, displayHeight);       
+        //RAK14000 2.13 inch b/w 250x122 does not support partial updates 
+        adafruitDisplay->setRotation(3);
+        //For 1.54, 2.9 and 4.2
+        //adafruitDisplay->setRotation(1);
+        //adafruitDisplay->setPartialWindow(0, 0, displayWidth, displayHeight);
+    } else {
+        (void)adafruitDisplay;
+    }      
 }
 #elif defined(PCA10059)
 {
@@ -192,6 +207,12 @@ bool EInkDisplay::connect()
     adafruitDisplay->setRotation(3);
     adafruitDisplay->setPartialWindow(0, 0, displayWidth, displayHeight);
 }
+#elif defined(M5_COREINK)
+    auto lowLevel = new TECHO_DISPLAY_MODEL(PIN_EINK_CS, PIN_EINK_DC, PIN_EINK_RES, PIN_EINK_BUSY);
+    adafruitDisplay = new GxEPD2_BW<TECHO_DISPLAY_MODEL, TECHO_DISPLAY_MODEL::HEIGHT>(*lowLevel);
+    adafruitDisplay->init(115200, true, 40, false, SPI, SPISettings(4000000, MSBFIRST, SPI_MODE0));
+    adafruitDisplay->setRotation(0);
+    adafruitDisplay->setPartialWindow(0, 0, EPD_WIDTH, EPD_HEIGHT);
 #endif
    
     

src/graphics/Screen.cpp

@@ -20,6 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 #include "configuration.h"
+#if HAS_SCREEN
 #include <OLEDDisplay.h>
 
 #include "GPS.h"
@@ -32,18 +33,21 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "main.h"
 #include "mesh-pb-constants.h"
 #include "mesh/Channels.h"
+#include "mesh/generated/deviceonly.pb.h"
 #include "modules/TextMessageModule.h"
 #include "sleep.h"
 #include "target_specific.h"
 #include "utils.h"
 
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
 #include "esp_task_wdt.h"
 #include "mesh/http/WiFiAPClient.h"
 #endif
 
 using namespace meshtastic; /** @todo remove */
 
+extern bool loadProto(const char *filename, size_t protoSize, size_t objSize, const pb_msgdesc_t *fields, void *dest_struct);
+
 namespace graphics
 {
 
@@ -60,6 +64,11 @@ namespace graphics
 static FrameCallback normalFrames[MAX_NUM_NODES + NUM_EXTRA_FRAMES];
 static uint32_t targetFramerate = IDLE_FRAMERATE;
 static char btPIN[16] = "888888";
+    
+// This defines the layout of the compass.
+// If true, North with remain static at the top of the compass.
+// If false, your current heading is static at the top of the compass.
+bool compassNorthTop = false;
 
 // This image definition is here instead of images.h because it's modified dynamically by the drawBattery function
 uint8_t imgBattery[16] = {0xFF, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0xE7, 0x3C};
@@ -77,6 +86,10 @@ static char ourId[5];
 // GeoCoord object for the screen
 GeoCoord geoCoord;
 
+// OEM Config File
+static const char *oemConfigFile = "/prefs/oem.proto";
+OEMStore oemStore;
+
 #ifdef SHOW_REDRAWS
 static bool heartbeat = false;
 #endif
@@ -86,7 +99,7 @@ static uint16_t displayWidth, displayHeight;
 #define SCREEN_WIDTH displayWidth
 #define SCREEN_HEIGHT displayHeight
 
-#ifdef HAS_EINK
+#if defined(USE_EINK) || defined(ILI9341_DRIVER)
 // The screen is bigger so use bigger fonts
 #define FONT_SMALL ArialMT_Plain_16
 #define FONT_MEDIUM ArialMT_Plain_24
@@ -148,6 +161,55 @@ static void drawBootScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int1
     drawIconScreen(region, display, state, x, y);
 }
 
+static void drawOEMIconScreen(const char *upperMsg, OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
+{
+    // draw an xbm image.
+    // Please note that everything that should be transitioned
+    // needs to be drawn relative to x and y
+
+    // draw centered icon left to right and centered above the one line of app text
+    display->drawXbm(x + (SCREEN_WIDTH - oemStore.oem_icon_width) / 2,
+                     y + (SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM - oemStore.oem_icon_height) / 2 + 2, oemStore.oem_icon_width,
+                     oemStore.oem_icon_height, (const uint8_t *)oemStore.oem_icon_bits.bytes);
+
+    switch (oemStore.oem_font) {
+    case 0:
+        display->setFont(FONT_SMALL);
+        break;
+    case 2:
+        display->setFont(FONT_LARGE);
+        break;
+    default:
+        display->setFont(FONT_MEDIUM);
+        break;
+    }
+
+    display->setTextAlignment(TEXT_ALIGN_LEFT);
+    const char *title = oemStore.oem_text;
+    display->drawString(x + getStringCenteredX(title), y + SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM, title);
+    display->setFont(FONT_SMALL);
+
+    // Draw region in upper left
+    if (upperMsg)
+        display->drawString(x + 0, y + 0, upperMsg);
+
+    // Draw version in upper right
+    char buf[16];
+    snprintf(buf, sizeof(buf), "%s",
+             xstr(APP_VERSION_SHORT)); // Note: we don't bother printing region or now, it makes the string too long
+    display->drawString(x + SCREEN_WIDTH - display->getStringWidth(buf), y + 0, buf);
+    screen->forceDisplay();
+
+    // FIXME - draw serial # somewhere?
+}
+
+static void drawOEMBootScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
+{
+    // Draw region in upper left
+    const char *region = myRegion ? myRegion->name : NULL;
+    drawOEMIconScreen(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)
 {
@@ -155,7 +217,7 @@ static void drawSSLScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16
     display->setFont(FONT_SMALL);
     display->drawString(64 + x, y, "Creating SSL certificate");
 
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
     yield();
     esp_task_wdt_reset();
 #endif
@@ -172,25 +234,37 @@ static void drawSSLScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16
 static void drawWelcomeScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
 {
 
-    display->setFont(FONT_SMALL);
+    if ((millis() / 10000) % 2) {
+        display->setFont(FONT_SMALL);
 
-    display->setTextAlignment(TEXT_ALIGN_CENTER);
-    display->drawString(64 + x, y, "Meshtastic  :)");
+        display->setTextAlignment(TEXT_ALIGN_CENTER);
+        display->drawString(64 + x, y, "//\\ E S H T /\\ S T / C");
 
-    display->setTextAlignment(TEXT_ALIGN_LEFT);
+        display->setTextAlignment(TEXT_ALIGN_LEFT);
 
-    display->drawString(x, y + FONT_HEIGHT_SMALL * 2 - 3, "Set the region using the");
-    display->drawString(x, y + FONT_HEIGHT_SMALL * 3 - 3, "Meshtastic Android, iOS,");
-    display->drawString(x, y + FONT_HEIGHT_SMALL * 4 - 3, "Flasher or CLI client.");
+        display->drawString(x, y + FONT_HEIGHT_SMALL * 2 - 3, "Set the region using the");
+        display->drawString(x, y + FONT_HEIGHT_SMALL * 3 - 3, "Meshtastic Android, iOS,");
+        display->drawString(x, y + FONT_HEIGHT_SMALL * 4 - 3, "Flasher or CLI client.");
+    } else {
+        display->setFont(FONT_SMALL);
 
-#ifndef NO_ESP32
+        display->setTextAlignment(TEXT_ALIGN_CENTER);
+        display->drawString(64 + x, y, "//\\ E S H T /\\ S T / C");
+
+        display->setTextAlignment(TEXT_ALIGN_LEFT);
+
+        display->drawString(x, y + FONT_HEIGHT_SMALL * 2 - 3, "Visit meshtastic.org");
+        display->drawString(x, y + FONT_HEIGHT_SMALL * 3 - 3, "for more information.");
+        display->drawString(x, y + FONT_HEIGHT_SMALL * 4 - 3, "");
+    }
+
+#ifdef ARCH_ESP32
     yield();
     esp_task_wdt_reset();
 #endif
-
 }
 
-#ifdef HAS_EINK
+#ifdef USE_EINK
 /// Used on eink displays while in deep sleep
 static void drawSleepScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
 {
@@ -284,8 +358,8 @@ static void drawCriticalFaultFrame(OLEDDisplay *display, OLEDDisplayUiState *sta
 // Ignore messages orginating from phone (from the current node 0x0) unless range test or store and forward module are enabled
 static bool shouldDrawMessage(const MeshPacket *packet)
 {
-    return packet->from != 0 && !radioConfig.preferences.range_test_module_enabled &&
-           !radioConfig.preferences.store_forward_module_enabled;
+    return packet->from != 0 && !moduleConfig.range_test.enabled &&
+           !moduleConfig.store_forward.enabled;
 }
 
 /// Draw the last text message we received
@@ -399,7 +473,7 @@ 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) {
+    if (config.position.fixed_position) {
         // GPS coordinates are currently fixed
         display->drawString(x - 1, y - 2, "Fixed GPS");
         return;
@@ -438,10 +512,10 @@ 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() && !config.position.fixed_position) {
         // 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() && !config.position.fixed_position) {
         // displayLine = "No GPS Lock";
         // display->drawString(x + (SCREEN_WIDTH - (display->getStringWidth(displayLine))) / 2, y, displayLine);
     } else {
@@ -454,32 +528,32 @@ 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;
+    auto gpsFormat = config.display.gps_format;
     String displayLine = "";
 
-    if (!gps->getIsConnected() && !radioConfig.preferences.fixed_position) {
+    if (!gps->getIsConnected() && !config.position.fixed_position) {
         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() && !config.position.fixed_position) {
         displayLine = "No GPS Lock";
         display->drawString(x + (SCREEN_WIDTH - (display->getStringWidth(displayLine))) / 2, y, displayLine);
     } else {
 
-        if (gpsFormat != GpsCoordinateFormat_GpsFormatDMS) {
+        if (gpsFormat != Config_DisplayConfig_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
+            if (gpsFormat == Config_DisplayConfig_GpsCoordinateFormat_GpsFormatDec) { // Decimal Degrees
                 sprintf(coordinateLine, "%f %f", geoCoord.getLatitude() * 1e-7, geoCoord.getLongitude() * 1e-7);
-            } else if (gpsFormat == GpsCoordinateFormat_GpsFormatUTM) { // Universal Transverse Mercator
+            } else if (gpsFormat == Config_DisplayConfig_GpsCoordinateFormat_GpsFormatUTM) { // Universal Transverse Mercator
                 sprintf(coordinateLine, "%2i%1c %06u %07u", geoCoord.getUTMZone(), geoCoord.getUTMBand(),
                         geoCoord.getUTMEasting(), geoCoord.getUTMNorthing());
-            } else if (gpsFormat == GpsCoordinateFormat_GpsFormatMGRS) { // Military Grid Reference System
+            } else if (gpsFormat == Config_DisplayConfig_GpsCoordinateFormat_GpsFormatMGRS) { // Military Grid Reference System
                 sprintf(coordinateLine, "%2i%1c %1c%1c %05u %05u", geoCoord.getMGRSZone(), geoCoord.getMGRSBand(),
                         geoCoord.getMGRSEast100k(), geoCoord.getMGRSNorth100k(), geoCoord.getMGRSEasting(),
                         geoCoord.getMGRSNorthing());
-            } else if (gpsFormat == GpsCoordinateFormat_GpsFormatOLC) { // Open Location Code
+            } else if (gpsFormat == Config_DisplayConfig_GpsCoordinateFormat_GpsFormatOLC) { // Open Location Code
                 geoCoord.getOLCCode(coordinateLine);
-            } else if (gpsFormat == GpsCoordinateFormat_GpsFormatOSGR) {              // Ordnance Survey Grid Reference
+            } else if (gpsFormat == Config_DisplayConfig_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
@@ -488,7 +562,7 @@ static void drawGPScoordinates(OLEDDisplay *display, int16_t x, int16_t y, const
             }
 
             // If fixed position, display text "Fixed GPS" alternating with the coordinates.
-            if (radioConfig.preferences.fixed_position) {
+            if (config.position.fixed_position) {
                 if ((millis() / 10000) % 2) {
                     display->drawString(x + (SCREEN_WIDTH - (display->getStringWidth(coordinateLine))) / 2, y, coordinateLine);
                 } else {
@@ -526,7 +600,7 @@ class Point
     void rotate(float radian)
     {
         float cos = cosf(radian), sin = sinf(radian);
-        float rx = x * cos - y * sin, ry = x * sin + y * cos;
+        float rx = x * cos + y * sin, ry = -x * sin + y * cos;
 
         x = rx;
         y = ry;
@@ -540,8 +614,10 @@ class Point
 
     void scale(float f)
     {
+        //We use -f here to counter the flip that happens
+        //on the y axis when drawing and rotating on screen
         x *= f;
-        y *= f;
+        y *= -f;
     }
 };
 
@@ -613,16 +689,21 @@ static void drawNodeHeading(OLEDDisplay *display, int16_t compassX, int16_t comp
     drawLine(display, rightArrow, tip);
 }
 
-// Draw the compass heading
-static void drawCompassHeading(OLEDDisplay *display, int16_t compassX, int16_t compassY, float myHeading)
+// Draw north
+static void drawCompassNorth(OLEDDisplay *display, int16_t compassX, int16_t compassY, float myHeading)
 {
-    Point N1(-0.04f, -0.65f), N2(0.04f, -0.65f);
-    Point N3(-0.04f, -0.55f), N4(0.04f, -0.55f);
+    //If north is supposed to be at the top of the compass we want rotation to be +0
+    if(compassNorthTop)
+        myHeading = -0;
+    
+    Point N1(-0.04f, 0.65f), N2(0.04f, 0.65f);
+    Point N3(-0.04f, 0.55f), N4(0.04f, 0.55f);
     Point *rosePoints[] = {&N1, &N2, &N3, &N4};
 
     for (int i = 0; i < 4; i++) {
-        rosePoints[i]->rotate(myHeading);
-        rosePoints[i]->scale(-1 * COMPASS_DIAM);
+        // North on compass will be negative of heading
+        rosePoints[i]->rotate(-myHeading);
+        rosePoints[i]->scale(COMPASS_DIAM);
         rosePoints[i]->translate(compassX, compassY);
     }
     drawLine(display, N1, N3);
@@ -693,7 +774,7 @@ static void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_
     if (ourNode && hasPosition(ourNode)) {
         Position &op = ourNode->position;
         float myHeading = estimatedHeading(DegD(op.latitude_i), DegD(op.longitude_i));
-        drawCompassHeading(display, compassX, compassY, myHeading);
+        drawCompassNorth(display, compassX, compassY, myHeading);
 
         if (hasPosition(node)) {
             // display direction toward node
@@ -706,12 +787,13 @@ static void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_
             else
                 snprintf(distStr, sizeof(distStr), "%.1f km", d / 1000);
 
-            // 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 headingRadian = bearingToOther - myHeading;
-            drawNodeHeading(display, compassX, compassY, headingRadian);
+                GeoCoord::bearing(DegD(op.latitude_i), DegD(op.longitude_i), DegD(p.latitude_i), DegD(p.longitude_i));
+            // If the top of the compass is a static north then bearingToOther can be drawn on the compass directly
+            // If the top of the compass is not a static north we need adjust bearingToOther based on heading
+            if(!compassNorthTop)
+                bearingToOther -= myHeading;
+            drawNodeHeading(display, compassX, compassY, bearingToOther);
         }
     }
     if (!hasNodeHeading)
@@ -748,19 +830,33 @@ void _screen_header()
 }
 #endif
 
+// #ifdef RAK4630
+// Screen::Screen(uint8_t address, int sda, int scl) : OSThread("Screen"), cmdQueue(32), dispdev(address, sda, scl),
+// dispdev_oled(address, sda, scl), ui(&dispdev)
+// {
+//     address_found = address;
+//     cmdQueue.setReader(this);
+//     if (screen_found) {
+//         (void)dispdev;
+//         AutoOLEDWire dispdev = dispdev_oled;
+//         (void)ui;
+//         OLEDDisplayUi ui(&dispdev);
+//     }
+// }
+// #else
 Screen::Screen(uint8_t address, int sda, int scl) : OSThread("Screen"), cmdQueue(32), dispdev(address, sda, scl), ui(&dispdev)
 {
     address_found = address;
     cmdQueue.setReader(this);
 }
-
+// #endif
 /**
  * Prepare the display for the unit going to the lowest power mode possible.  Most screens will just
  * poweroff, but eink screens will show a "I'm sleeping" graphic, possibly with a QR code
  */
 void Screen::doDeepSleep()
 {
-#ifdef HAS_EINK
+#ifdef USE_EINK
     static FrameCallback sleepFrames[] = {drawSleepScreen};
     static const int sleepFrameCount = sizeof(sleepFrames) / sizeof(sleepFrames[0]);
     ui.setFrames(sleepFrames, sleepFrameCount);
@@ -801,8 +897,8 @@ void Screen::setup()
     dispdev.setDetected(screen_model);
 #endif
 
-    // I think this is not needed - redundant with ui.init
-    // dispdev.resetOrientation();
+    // Load OEM config from Proto file if existent
+    loadProto(oemConfigFile, OEMStore_size, sizeof(oemConfigFile), OEMStore_fields, &oemStore);
 
     // Initialising the UI will init the display too.
     ui.init();
@@ -852,9 +948,12 @@ void Screen::setup()
     handleSetOn(true);
 
     // On some ssd1306 clones, the first draw command is discarded, so draw it
-    // twice initially.
+    // twice initially. Skip this for EINK Displays to save a few seconds during boot
     ui.update();
+#ifndef USE_EINK
     ui.update();
+#endif
+    serialSinceMsec = millis();
 
     // Subscribe to status updates
     powerStatusObserver.observe(&powerStatus->onNewStatus);
@@ -870,7 +969,7 @@ void Screen::setup()
 void Screen::forceDisplay()
 {
     // Nasty hack to force epaper updates for 'key' frames.  FIXME, cleanup.
-#ifdef HAS_EINK
+#ifdef USE_EINK
     dispdev.forceDisplay();
 #endif
 }
@@ -885,7 +984,7 @@ int32_t Screen::runOnce()
         return RUN_SAME;
     }
 
-    // Show boot screen for first 3 seconds, then switch to normal operation.
+    // Show boot screen for first 5 seconds, then switch to normal operation.
     // serialSinceMsec adjusts for additional serial wait time during nRF52 bootup
     static bool showingBootScreen = true;
     if (showingBootScreen && (millis() > (5000 + serialSinceMsec))) {
@@ -894,8 +993,23 @@ int32_t Screen::runOnce()
         showingBootScreen = false;
     }
 
+    // If we have an OEM Boot screen, toggle after 2,5 seconds
+    if (strlen(oemStore.oem_text) > 0) {
+        static bool showingOEMBootScreen = true;
+        if (showingOEMBootScreen && (millis() > (2500 + serialSinceMsec))) {
+            DEBUG_MSG("Switch to OEM screen...\n");
+            // Change frames.
+            static FrameCallback bootOEMFrames[] = {drawOEMBootScreen};
+            static const int bootOEMFrameCount = sizeof(bootOEMFrames) / sizeof(bootOEMFrames[0]);
+            ui.setFrames(bootOEMFrames, bootOEMFrameCount);
+            ui.update();
+            ui.update();
+            showingOEMBootScreen = false;
+        }
+    }
+
 #ifndef DISABLE_WELCOME_UNSET
-    if (radioConfig.preferences.region == RegionCode_Unset) {
+    if (showingNormalScreen && config.lora.region == Config_LoRaConfig_RegionCode_Unset) {
         setWelcomeFrames();
     }
 #endif
@@ -956,7 +1070,7 @@ int32_t Screen::runOnce()
         DEBUG_MSG("Setting idle framerate\n");
         targetFramerate = IDLE_FRAMERATE;
 
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
         setCPUFast(false); // Turn up the CPU to improve screen animations
 #endif
 
@@ -968,8 +1082,8 @@ 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)) {
+        if (config.display.auto_screen_carousel_secs > 0 &&
+            (millis() - lastScreenTransition) > (config.display.auto_screen_carousel_secs * 1000)) {
             DEBUG_MSG("LastScreenTransition exceeded %ums transitioning to next frame\n", (millis() - lastScreenTransition));
             handleOnPress();
         }
@@ -1081,7 +1195,7 @@ void Screen::setFrames()
     // call a method on debugInfoScreen object (for more details)
     normalFrames[numframes++] = &Screen::drawDebugInfoSettingsTrampoline;
 
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
     if (isWifiAvailable()) {
         // call a method on debugInfoScreen object (for more details)
         normalFrames[numframes++] = &Screen::drawDebugInfoWiFiTrampoline;
@@ -1188,7 +1302,7 @@ void Screen::setFastFramerate()
     // We are about to start a transition so speed up fps
     targetFramerate = SCREEN_TRANSITION_FRAMERATE;
 
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
     setCPUFast(true); // Turn up the CPU to improve screen animations
 #endif
 
@@ -1243,9 +1357,9 @@ void DebugInfo::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
 // Jm
 void DebugInfo::drawFrameWiFi(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
 {
-#ifdef HAS_WIFI
-    const char *wifiName = radioConfig.preferences.wifi_ssid;
-    const char *wifiPsw = radioConfig.preferences.wifi_password;
+#if HAS_WIFI
+    const char *wifiName = config.wifi.ssid;
+    const char *wifiPsw = config.wifi.psk;
 
     displayedNodeNum = 0; // Not currently showing a node pane
 
@@ -1256,7 +1370,7 @@ void DebugInfo::drawFrameWiFi(OLEDDisplay *display, OLEDDisplayUiState *state, i
 
     if (isSoftAPForced()) {
         display->drawString(x, y, String("WiFi: Software AP (Admin)"));
-    } else if (radioConfig.preferences.wifi_ap_mode) {
+    } else if (config.wifi.ap_mode) {
         display->drawString(x, y, String("WiFi: Software AP"));
     } else if (WiFi.status() != WL_CONNECTED) {
         display->drawString(x, y, String("WiFi: Not Connected"));
@@ -1279,8 +1393,8 @@ void DebugInfo::drawFrameWiFi(OLEDDisplay *display, OLEDDisplayUiState *state, i
     - WL_NO_SHIELD: assigned when no WiFi shield is present;
 
     */
-    if (WiFi.status() == WL_CONNECTED || isSoftAPForced() || radioConfig.preferences.wifi_ap_mode) {
-        if (radioConfig.preferences.wifi_ap_mode || isSoftAPForced()) {
+    if (WiFi.status() == WL_CONNECTED || isSoftAPForced() || config.wifi.ap_mode) {
+        if (config.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
@@ -1372,7 +1486,7 @@ void DebugInfo::drawFrameWiFi(OLEDDisplay *display, OLEDDisplayUiState *state, i
         }
 
     } else {
-        if (radioConfig.preferences.wifi_ap_mode) {
+        if (config.wifi.ap_mode) {
             if ((millis() / 10000) % 2) {
                 display->drawString(x, y + FONT_HEIGHT_SMALL * 2, "SSID: " + String(wifiName));
             } else {
@@ -1419,22 +1533,31 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
 
     auto mode = "";
 
-    if (channels.getPrimary().modem_config == 0) {
-        mode = "VLongSlow";
-    } else if (channels.getPrimary().modem_config == 1) {
-        mode = "LongSlow";
-    } else if (channels.getPrimary().modem_config == 2) {
-        mode = "LongFast";
-    } else if (channels.getPrimary().modem_config == 3) {
-        mode = "MidSlow";
-    } else if (channels.getPrimary().modem_config == 4) {
-        mode = "MidFast";
-    } else if (channels.getPrimary().modem_config == 5) {
-        mode = "ShortSlow";
-    } else if (channels.getPrimary().modem_config == 6) {
-        mode = "ShortFast";
-    } else {
+    switch (config.lora.modem_preset) {
+    case Config_LoRaConfig_ModemPreset_ShortSlow:
+        mode = "ShortS";
+        break;
+    case Config_LoRaConfig_ModemPreset_ShortFast:
+        mode = "ShortF";
+        break;
+    case Config_LoRaConfig_ModemPreset_MedSlow:
+        mode = "MedS";
+        break;
+    case Config_LoRaConfig_ModemPreset_MedFast:
+        mode = "MedF";
+        break;
+    case Config_LoRaConfig_ModemPreset_LongSlow:
+        mode = "LongS";
+        break;
+    case Config_LoRaConfig_ModemPreset_LongFast:
+        mode = "LongF";
+        break;
+    case Config_LoRaConfig_ModemPreset_VLongSlow:
+        mode = "VeryL";
+        break;
+    default:
         mode = "Custom";
+        break;
     }
 
     display->drawString(x + SCREEN_WIDTH - display->getStringWidth(mode), y, mode);
@@ -1461,7 +1584,7 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
     else
         uptime += String(seconds) + "s ";
 
-    uint32_t rtc_sec = getValidTime(RTCQuality::RTCQualityFromNet);
+    uint32_t rtc_sec = getValidTime(RTCQuality::RTCQualityDevice);
     if (rtc_sec > 0) {
         long hms = rtc_sec % SEC_PER_DAY;
         // hms += tz.tz_dsttime * SEC_PER_HOUR;
@@ -1487,7 +1610,8 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
     display->drawString(x + SCREEN_WIDTH - display->getStringWidth(chUtil), y + FONT_HEIGHT_SMALL * 1, chUtil);
 
     // Line 3
-    if (radioConfig.preferences.gps_format != GpsCoordinateFormat_GpsFormatDMS) // if DMS then don't draw altitude
+    if (config.display.gps_format !=
+        Config_DisplayConfig_GpsCoordinateFormat_GpsFormatDMS) // if DMS then don't draw altitude
         drawGPSAltitude(display, x, y + FONT_HEIGHT_SMALL * 2, gpsStatus);
 
     // Line 4
@@ -1556,3 +1680,5 @@ int Screen::handleUIFrameEvent(const UIFrameEvent *event)
 }
 
 } // namespace graphics
+
+#endif // HAS_SCREEN

src/graphics/Screen.h

@@ -1,6 +1,9 @@
 #pragma once
 
-#ifdef NO_SCREEN
+#include "configuration.h"
+
+#if !HAS_SCREEN
+#include "power.h"
 namespace graphics
 {
 // Noop class for boards without screen.
@@ -15,6 +18,8 @@ class Screen
     void adjustBrightness(){}
     void doDeepSleep() {}
     void forceDisplay() {}
+    void startBluetoothPinScreen(uint32_t pin) {}
+    void stopBluetoothPinScreen() {}
 };
 }
 
@@ -27,6 +32,10 @@ class Screen
 
 #ifdef USE_ST7567
 #include <ST7567Wire.h>
+#elif defined(USE_SH1106)
+#include <SH1106Wire.h>
+#elif defined(USE_SSD1306)
+#include <SSD1306Wire.h>
 #else
 // the SH1106/SSD1306 variant is auto-detected
 #include <AutoOLEDWire.h>
@@ -297,11 +306,18 @@ class Screen : public concurrency::OSThread
     /// Holds state for debug information
     DebugInfo debugInfo;
 
-   /// Display device
-    /** FIXME cleanup display abstraction */
-#ifdef ST7735_CS
+    /// Display device
+
+// #ifdef RAK4630
+//     EInkDisplay dispdev;
+//     AutoOLEDWire dispdev_oled;
+#ifdef USE_SH1106
+    SH1106Wire dispdev;
+#elif defined(USE_SSD1306)
+    SSD1306Wire dispdev;
+#elif defined(ST7735_CS) || defined(ILI9341_DRIVER)
     TFTDisplay dispdev;
-#elif defined(HAS_EINK)
+#elif defined(USE_EINK)
     EInkDisplay dispdev;
 #elif defined(USE_ST7567)
     ST7567Wire dispdev;

src/graphics/TFTDisplay.cpp

@@ -1,6 +1,6 @@
 #include "configuration.h"
 
-#ifdef ST7735_CS
+#if defined(ST7735_CS) || defined(ILI9341_DRIVER)
 #include "SPILock.h"
 #include "TFTDisplay.h"
 #include <SPI.h>
@@ -10,7 +10,11 @@ static TFT_eSPI tft = TFT_eSPI(); // Invoke library, pins defined in User_Setup.
 
 TFTDisplay::TFTDisplay(uint8_t address, int sda, int scl)
 {
-    setGeometry(GEOMETRY_RAWMODE, 160, 80);
+#ifdef SCREEN_ROTATE
+    setGeometry(GEOMETRY_RAWMODE, TFT_HEIGHT, TFT_WIDTH);
+#else
+    setGeometry(GEOMETRY_RAWMODE, TFT_WIDTH, TFT_HEIGHT);
+#endif
 }
 
 // Write the buffer to the display memory
@@ -20,12 +24,10 @@ void TFTDisplay::display(void)
 
     // FIXME - only draw bits have changed (use backbuf similar to the other displays)
     // tft.drawBitmap(0, 0, buffer, 128, 64, TFT_YELLOW, TFT_BLACK);
-    for (uint8_t y = 0; y < displayHeight; y++) {
-        for (uint8_t x = 0; x < displayWidth; x++) {
-
+    for (uint16_t y = 0; y < displayHeight; y++) {
+        for (uint16_t x = 0; x < displayWidth; x++) {
             // get src pixel in the page based ordering the OLED lib uses FIXME, super inefficent
-            auto b = buffer[x + (y / 8) * displayWidth];
-            auto isset = b & (1 << (y & 7));
+            auto isset = buffer[x + (y / 8) * displayWidth] & (1 << (y & 7));
             tft.drawPixel(x, y, isset ? TFT_WHITE : TFT_BLACK);
         }
     }
@@ -38,21 +40,34 @@ void TFTDisplay::sendCommand(uint8_t com)
     // Drop all commands to device (we just update the buffer)
 }
 
+void TFTDisplay::setDetected(uint8_t detected)
+{
+    (void)detected;
+}
+
 // Connect to the display
 bool TFTDisplay::connect()
 {
+    concurrency::LockGuard g(spiLock);
     DEBUG_MSG("Doing TFT init\n");
 
+#ifdef TFT_BL
+    digitalWrite(TFT_BL, HIGH);
+    pinMode(TFT_BL, OUTPUT);
+#endif
+
 #ifdef ST7735_BACKLIGHT_EN
     digitalWrite(ST7735_BACKLIGHT_EN, HIGH);
     pinMode(ST7735_BACKLIGHT_EN, OUTPUT);
 #endif
-
     tft.init();
+#ifdef M5STACK
+    tft.setRotation(1); // M5Stack has the TFT in landscape
+#else
     tft.setRotation(3); // Orient horizontal and wide underneath the silkscreen name label
+#endif
     tft.fillScreen(TFT_BLACK);
     // tft.drawRect(0, 0, 40, 10, TFT_PURPLE); // wide rectangle in upper left
-
     return true;
 }
 

src/graphics/TFTDisplay.h

@@ -22,6 +22,12 @@ class TFTDisplay : public OLEDDisplay
 
     // Write the buffer to the display memory
     virtual void display(void) override;
+    
+    /**
+     * shim to make the abstraction happy
+     * 
+     */
+    void setDetected(uint8_t detected);
 
   protected:
     // the header size of the buffer used, e.g. for the SPI command header

src/input/RotaryEncoderInterruptBase.cpp

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

src/input/RotaryEncoderInterruptBase.h

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

src/input/RotaryEncoderInterruptImpl1.cpp

@@ -3,37 +3,26 @@
 
 RotaryEncoderInterruptImpl1 *rotaryEncoderInterruptImpl1;
 
-RotaryEncoderInterruptImpl1::RotaryEncoderInterruptImpl1() :
-    RotaryEncoderInterruptBase(
-        "rotEnc1")
-{
-}
+RotaryEncoderInterruptImpl1::RotaryEncoderInterruptImpl1() : RotaryEncoderInterruptBase("rotEnc1") {}
 
 void RotaryEncoderInterruptImpl1::init()
 {
-    if (!radioConfig.preferences.rotary1_enabled)
-    {
+    if (!moduleConfig.canned_message.rotary1_enabled) {
         // Input device is disabled.
         return;
     }
 
-    uint8_t pinA = radioConfig.preferences.inputbroker_pin_a;
-    uint8_t pinB = radioConfig.preferences.inputbroker_pin_b;
-    uint8_t pinPress = radioConfig.preferences.inputbroker_pin_press;
-    char eventCw =
-        static_cast<char>(radioConfig.preferences.inputbroker_event_cw);
-    char eventCcw =
-        static_cast<char>(radioConfig.preferences.inputbroker_event_ccw);
-    char eventPressed =
-        static_cast<char>(radioConfig.preferences.inputbroker_event_press);
+    uint8_t pinA = moduleConfig.canned_message.inputbroker_pin_a;
+    uint8_t pinB = moduleConfig.canned_message.inputbroker_pin_b;
+    uint8_t pinPress = moduleConfig.canned_message.inputbroker_pin_press;
+    char eventCw = static_cast<char>(moduleConfig.canned_message.inputbroker_event_cw);
+    char eventCcw = static_cast<char>(moduleConfig.canned_message.inputbroker_event_ccw);
+    char eventPressed = static_cast<char>(moduleConfig.canned_message.inputbroker_event_press);
 
-    //radioConfig.preferences.ext_notification_module_output
-    RotaryEncoderInterruptBase::init(
-        pinA, pinB, pinPress,
-        eventCw, eventCcw, eventPressed,
-        RotaryEncoderInterruptImpl1::handleIntA,
-        RotaryEncoderInterruptImpl1::handleIntB,
-        RotaryEncoderInterruptImpl1::handleIntPressed);
+    // moduleConfig.canned_message.ext_notification_module_output
+    RotaryEncoderInterruptBase::init(pinA, pinB, pinPress, eventCw, eventCcw, eventPressed,
+                                     RotaryEncoderInterruptImpl1::handleIntA, RotaryEncoderInterruptImpl1::handleIntB,
+                                     RotaryEncoderInterruptImpl1::handleIntPressed);
     inputBroker->registerSource(this);
 }
 

src/input/UpDownInterruptBase.h

@@ -1,18 +1,14 @@
 #pragma once
 
-#include "SinglePortModule.h" // TODO: what header file to include?
 #include "InputBroker.h"
+#include "SinglePortModule.h" // TODO: what header file to include?
 
-class UpDownInterruptBase :
-    public Observable<const InputEvent *>
+class UpDownInterruptBase : public Observable<const InputEvent *>
 {
   public:
-    explicit UpDownInterruptBase(
-        const char *name);
-    void init(
-      uint8_t pinDown, uint8_t pinUp, uint8_t pinPress,
-      char eventDown, char eventUp, char eventPressed,
-        void (*onIntDown)(), void (*onIntUp)(), void (*onIntPress)());
+    explicit UpDownInterruptBase(const char *name);
+    void init(uint8_t pinDown, uint8_t pinUp, uint8_t pinPress, char eventDown, char eventUp, char eventPressed,
+              void (*onIntDown)(), void (*onIntUp)(), void (*onIntPress)());
     void intPressHandler();
     void intDownHandler();
     void intUpHandler();
@@ -20,8 +16,8 @@ class UpDownInterruptBase :
   private:
     uint8_t _pinDown = 0;
     uint8_t _pinUp = 0;
-    char _eventDown = InputEventChar_KEY_NONE;
-    char _eventUp = InputEventChar_KEY_NONE;
-    char _eventPressed = InputEventChar_KEY_NONE;
+    char _eventDown = ModuleConfig_CannedMessageConfig_InputEventChar_KEY_NONE;
+    char _eventUp = ModuleConfig_CannedMessageConfig_InputEventChar_KEY_NONE;
+    char _eventPressed = ModuleConfig_CannedMessageConfig_InputEventChar_KEY_NONE;
     const char *_originName;
 };

src/input/UpDownInterruptImpl1.cpp

@@ -3,38 +3,26 @@
 
 UpDownInterruptImpl1 *upDownInterruptImpl1;
 
-UpDownInterruptImpl1::UpDownInterruptImpl1() :
-    UpDownInterruptBase(
-        "upDown1")
-{
-}
+UpDownInterruptImpl1::UpDownInterruptImpl1() : UpDownInterruptBase("upDown1") {}
 
 void UpDownInterruptImpl1::init()
 {
 
-    if (!radioConfig.preferences.updown1_enabled)
-    {
+    if (!moduleConfig.canned_message.updown1_enabled) {
         // Input device is disabled.
         return;
     }
 
-    uint8_t pinUp = radioConfig.preferences.inputbroker_pin_a;
-    uint8_t pinDown = radioConfig.preferences.inputbroker_pin_b;
-    uint8_t pinPress = radioConfig.preferences.inputbroker_pin_press;
+    uint8_t pinUp = moduleConfig.canned_message.inputbroker_pin_a;
+    uint8_t pinDown = moduleConfig.canned_message.inputbroker_pin_b;
+    uint8_t pinPress = moduleConfig.canned_message.inputbroker_pin_press;
 
-    char eventDown =
-        static_cast<char>(InputEventChar_KEY_DOWN);
-    char eventUp =
-        static_cast<char>(InputEventChar_KEY_UP);
-    char eventPressed =
-        static_cast<char>(InputEventChar_KEY_SELECT);
+    char eventDown = static_cast<char>(ModuleConfig_CannedMessageConfig_InputEventChar_KEY_DOWN);
+    char eventUp = static_cast<char>(ModuleConfig_CannedMessageConfig_InputEventChar_KEY_UP);
+    char eventPressed = static_cast<char>(ModuleConfig_CannedMessageConfig_InputEventChar_KEY_SELECT);
 
-    UpDownInterruptBase::init(
-        pinDown, pinUp, pinPress,
-        eventDown, eventUp, eventPressed,
-        UpDownInterruptImpl1::handleIntDown,
-        UpDownInterruptImpl1::handleIntUp,
-        UpDownInterruptImpl1::handleIntPressed);
+    UpDownInterruptBase::init(pinDown, pinUp, pinPress, eventDown, eventUp, eventPressed, UpDownInterruptImpl1::handleIntDown,
+                              UpDownInterruptImpl1::handleIntUp, UpDownInterruptImpl1::handleIntPressed);
     inputBroker->registerSource(this);
 }
 

src/input/kbI2cBase.cpp

@@ -1,5 +1,5 @@
-#include "configuration.h"
 #include "kbI2cBase.h"
+#include "configuration.h"
 #include <Wire.h>
 
 KbI2cBase::KbI2cBase(const char *name) : concurrency::OSThread(name)
@@ -10,40 +10,39 @@ KbI2cBase::KbI2cBase(const char *name) : concurrency::OSThread(name)
 int32_t KbI2cBase::runOnce()
 {
     InputEvent e;
-    e.inputEvent = InputEventChar_KEY_NONE;
+    e.inputEvent = ModuleConfig_CannedMessageConfig_InputEventChar_KEY_NONE;
     e.source = this->_originName;
 
     Wire.requestFrom(CARDKB_ADDR, 1);
-    
-    while(Wire.available()) {
+
+    while (Wire.available()) {
         char c = Wire.read();
-        switch(c) {
+        switch (c) {
         case 0x1b: // ESC
-            e.inputEvent = InputEventChar_KEY_CANCEL;
+            e.inputEvent = ModuleConfig_CannedMessageConfig_InputEventChar_KEY_CANCEL;
             break;
         case 0x08: // Back
-            e.inputEvent = InputEventChar_KEY_BACK;
+            e.inputEvent = ModuleConfig_CannedMessageConfig_InputEventChar_KEY_BACK;
             break;
         case 0xb5: // Up
-            e.inputEvent = InputEventChar_KEY_UP;
+            e.inputEvent = ModuleConfig_CannedMessageConfig_InputEventChar_KEY_UP;
             break;
         case 0xb6: // Down
-            e.inputEvent = InputEventChar_KEY_DOWN;
+            e.inputEvent = ModuleConfig_CannedMessageConfig_InputEventChar_KEY_DOWN;
             break;
         case 0xb4: // Left
-            e.inputEvent = InputEventChar_KEY_LEFT;
+            e.inputEvent = ModuleConfig_CannedMessageConfig_InputEventChar_KEY_LEFT;
             break;
         case 0xb7: // Right
-            e.inputEvent = InputEventChar_KEY_RIGHT;
+            e.inputEvent = ModuleConfig_CannedMessageConfig_InputEventChar_KEY_RIGHT;
             break;
         case 0x0d: // Enter
-            e.inputEvent = InputEventChar_KEY_SELECT;
+            e.inputEvent = ModuleConfig_CannedMessageConfig_InputEventChar_KEY_SELECT;
             break;
         }
     }
 
-    if (e.inputEvent != InputEventChar_KEY_NONE)
-    {
+    if (e.inputEvent != ModuleConfig_CannedMessageConfig_InputEventChar_KEY_NONE) {
         this->notifyObservers(&e);
     }
     return 500;

src/main.cpp

@@ -1,4 +1,3 @@
-#include "configuration.h"
 #include "GPS.h"
 #include "MeshRadio.h"
 #include "MeshService.h"
@@ -6,6 +5,7 @@
 #include "PowerFSM.h"
 #include "airtime.h"
 #include "buzz.h"
+#include "configuration.h"
 #include "error.h"
 #include "power.h"
 // #include "rom/rtc.h"
@@ -17,41 +17,44 @@
 #include "SPILock.h"
 #include "concurrency/OSThread.h"
 #include "concurrency/Periodic.h"
+#include "debug/axpDebug.h"
+#include "debug/einkScan.h"
+#include "debug/i2cScan.h"
 #include "graphics/Screen.h"
 #include "main.h"
 #include "modules/Modules.h"
-#include "sleep.h"
 #include "shutdown.h"
+#include "sleep.h"
 #include "target_specific.h"
-#include "debug/i2cScan.h"
-#include "debug/axpDebug.h"
 #include <Wire.h>
 // #include <driver/rtc_io.h>
 
 #include "mesh/http/WiFiAPClient.h"
 
-#ifndef NO_ESP32
-    #include "mesh/http/WebServer.h"
+#ifdef ARCH_ESP32
+#include "mesh/http/WebServer.h"
 
-    #ifdef USE_NEW_ESP32_BLUETOOTH
-        #include "esp32/ESP32Bluetooth.h"
-    #else
-        #include "nimble/BluetoothUtil.h"
-    #endif
+#ifdef USE_NEW_ESP32_BLUETOOTH
+#include "esp32/ESP32Bluetooth.h"
+#else
+#include "nimble/BluetoothUtil.h"
+#endif
 
 #endif
 
-#if defined(HAS_WIFI) || defined(PORTDUINO)
+#if HAS_WIFI
 #include "mesh/wifi/WiFiServerAPI.h"
 #include "mqtt/MQTT.h"
 #endif
 
+#include "LLCC68Interface.h"
 #include "RF95Interface.h"
 #include "SX1262Interface.h"
 #include "SX1268Interface.h"
-#include "LLCC68Interface.h"
 
+#if HAS_BUTTON
 #include "ButtonThread.h"
+#endif
 #include "PowerFSMThread.h"
 
 using namespace concurrency;
@@ -74,14 +77,24 @@ uint8_t screen_model;
 
 // The I2C address of the cardkb or RAK14004 (if found)
 uint8_t cardkb_found;
+// 0x02 for RAK14004 and 0x00 for cardkb
+uint8_t kb_model;
 
 // The I2C address of the Faces Keyboard (if found)
 uint8_t faceskb_found;
 
+// The I2C address of the RTC Module (if found)
+uint8_t rtc_found;
+
+bool eink_found = true;
+
 uint32_t serialSinceMsec;
 
 bool axp192_found;
 
+// Array map of sensor types (as array index) and i2c address as value we'll find in the i2c scan
+uint8_t nodeTelemetrySensorsMap[7] = { 0, 0, 0, 0, 0, 0, 0 };
+
 Router *router = NULL; // Users of router don't care what sort of subclass implements that API
 
 const char *getDeviceName()
@@ -90,9 +103,15 @@ const char *getDeviceName()
 
     getMacAddr(dmac);
 
-    // Meshtastic_ab3c
+    // Meshtastic_ab3c or Shortname_abcd
     static char name[20];
-    sprintf(name, "Meshtastic_%02x%02x", dmac[4], dmac[5]);
+    sprintf(name, "%02x%02x", dmac[4], dmac[5]);
+    // if the shortname exists and is NOT the new default of ab3c, use it for BLE name.
+    if ((owner.short_name != NULL) && (strcmp(owner.short_name, name) != 0)) {
+        sprintf(name, "%s_%02x%02x", owner.short_name, dmac[4], dmac[5]);
+    } else {
+        sprintf(name, "Meshtastic_%02x%02x", dmac[4], dmac[5]);
+    }
     return name;
 }
 
@@ -109,18 +128,23 @@ static int32_t ledBlinker()
 
 uint32_t timeLastPowered = 0;
 
+#if HAS_BUTTON
 bool ButtonThread::shutdown_on_long_stop = false;
+#endif
 
 static Periodic *ledPeriodic;
 static OSThread *powerFSMthread, *buttonThread;
+#if HAS_BUTTON
 uint32_t ButtonThread::longPressTime = 0;
+#endif
 
 RadioInterface *rIf = NULL;
 
 /**
  * Some platforms (nrf52) might provide an alterate version that supresses calling delay from sleep.
  */
-__attribute__ ((weak, noinline)) bool loopCanSleep() {
+__attribute__((weak, noinline)) bool loopCanSleep()
+{
     return true;
 }
 
@@ -139,17 +163,23 @@ void setup()
 #endif
 
 #ifdef DEBUG_PORT
-    if (!radioConfig.preferences.serial_disabled) {
+    if (!config.device.serial_disabled) {
         consoleInit(); // Set serial baud rate and init our mesh console
     }
 #endif
-    
+
     serialSinceMsec = millis();
 
     DEBUG_MSG("\n\n//\\ E S H T /\\ S T / C\n\n");
 
     initDeepSleep();
 
+    // Testing this fix für erratic T-Echo boot behaviour
+#if defined(TTGO_T_ECHO) && defined(PIN_EINK_PWR_ON)
+    pinMode(PIN_EINK_PWR_ON, OUTPUT);
+    digitalWrite(PIN_EINK_PWR_ON, HIGH);
+#endif
+
 #ifdef VEXT_ENABLE
     pinMode(VEXT_ENABLE, OUTPUT);
     digitalWrite(VEXT_ENABLE, 0); // turn on the display power
@@ -163,7 +193,7 @@ void setup()
     bool forceSoftAP = 0;
 
 #ifdef BUTTON_PIN
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
 
     // If the button is connected to GPIO 12, don't enable the ability to use
     // meshtasticAdmin on the device.
@@ -189,12 +219,12 @@ void setup()
 
     fsInit();
 
-    //router = new DSRRouter();
+    // router = new DSRRouter();
     router = new ReliableRouter();
 
 #ifdef I2C_SDA
     Wire.begin(I2C_SDA, I2C_SCL);
-#elif !defined(NO_WIRE)
+#elif HAS_WIRE
     Wire.begin();
 #endif
 
@@ -208,9 +238,14 @@ void setup()
 #endif
 
     scanI2Cdevice();
+#ifdef RAK4630
+    // scanEInkDevice();
+#endif
 
+#if HAS_BUTTON
     // Buttons & LED
     buttonThread = new ButtonThread();
+#endif
 
 #ifdef LED_PIN
     pinMode(LED_PIN, OUTPUT);
@@ -220,7 +255,7 @@ void setup()
     // Hello
     DEBUG_MSG("Meshtastic hwvendor=%d, swver=%s\n", HW_VENDOR, optstr(APP_VERSION));
 
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
     // Don't init display if we don't have one or we are waking headless due to a timer event
     if (wakeCause == ESP_SLEEP_WAKEUP_TIMER)
         screen_found = 0; // forget we even have the hardware
@@ -228,7 +263,7 @@ void setup()
     esp32Setup();
 #endif
 
-#ifdef NRF52_SERIES
+#ifdef ARCH_NRF52
     nrf52Setup();
 #endif
     playStartMelody();
@@ -244,7 +279,7 @@ void setup()
 
     // Init our SPI controller (must be before screen and lora)
     initSPI();
-#ifdef NO_ESP32
+#ifndef ARCH_ESP32
     SPI.begin();
 #else
     // ESP32
@@ -279,7 +314,7 @@ void setup()
 
         // Don't call screen setup until after nodedb is setup (because we need
         // the current region name)
-#if defined(ST7735_CS) || defined(HAS_EINK)
+#if defined(ST7735_CS) || defined(USE_EINK) || defined(ILI9341_DRIVER)
     screen->setup();
 #else
     if (screen_found)
@@ -292,6 +327,7 @@ void setup()
 
     // ONCE we will factory reset the GPS for bug #327
     if (gps && !devicestate.did_gps_reset) {
+        DEBUG_MSG("GPS FactoryReset requested\n");
         if (gps->factoryReset()) { // If we don't succeed try again next time
             devicestate.did_gps_reset = true;
             nodeDB.saveToDisk();
@@ -358,7 +394,7 @@ void setup()
     }
 #endif
 
-#ifdef USE_SIM_RADIO
+#if !HAS_RADIO
     if (!rIf) {
         rIf = new SimRadio;
         if (!rIf->init()) {
@@ -371,19 +407,19 @@ void setup()
     }
 #endif
 
-#if defined(PORTDUINO) || defined(HAS_WIFI)
+#if HAS_WIFI
     mqttInit();
 #endif
 
     // Initialize Wifi
     initWifi(forceSoftAP);
 
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
     // Start web server thread.
     webServerThread = new WebServerThread();
 #endif
 
-#ifdef PORTDUINO
+#ifdef ARCH_PORTDUINO
     initApiServer();
 #endif
 
@@ -392,14 +428,12 @@ void setup()
 
     if (!rIf)
         RECORD_CRITICALERROR(CriticalErrorCode_NoRadio);
-    else{
+    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;
+        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);
     }
 
@@ -411,7 +445,7 @@ void setup()
     setCPUFast(false); // 80MHz is fine for our slow peripherals
 }
 
-uint32_t rebootAtMsec; // If not zero we will reboot at this time (used to reboot shortly after the update completes)
+uint32_t rebootAtMsec;   // If not zero we will reboot at this time (used to reboot shortly after the update completes)
 uint32_t shutdownAtMsec; // If not zero we will shutdown at this time (used to shutdown from python or mobile client)
 
 // If a thread does something that might need for it to be rescheduled ASAP it can set this flag
@@ -426,10 +460,10 @@ void loop()
 
     // heap_caps_check_integrity_all(true); // FIXME - disable this expensive check
 
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
     esp32Loop();
 #endif
-#ifdef NRF52_SERIES
+#ifdef ARCH_NRF52
     nrf52Loop();
 #endif
     powerCommandsCheck();

src/main.h

@@ -1,19 +1,26 @@
 #pragma once
 
+#include <map>
 #include "GPSStatus.h"
 #include "NodeStatus.h"
 #include "PowerStatus.h"
 #include "graphics/Screen.h"
+#include "mesh/generated/telemetry.pb.h"
 
 extern uint8_t screen_found;
 extern uint8_t screen_model;
 extern uint8_t cardkb_found;
+extern uint8_t kb_model;
 extern uint8_t faceskb_found;
+extern uint8_t rtc_found;
 
+extern bool eink_found;
 extern bool axp192_found;
 extern bool isCharging;
 extern bool isUSBPowered;
 
+extern uint8_t nodeTelemetrySensorsMap[7];
+
 // Global Screen singleton.
 extern graphics::Screen *screen;
 // extern Observable<meshtastic::PowerStatus> newPowerStatus; //TODO: move this to main-esp32.cpp somehow or a helper class

src/mesh/Channels.cpp

@@ -1,7 +1,7 @@
-#include "configuration.h"
 #include "Channels.h"
 #include "CryptoEngine.h"
 #include "NodeDB.h"
+#include "configuration.h"
 
 #include <assert.h>
 
@@ -83,10 +83,11 @@ void Channels::initDefaultChannel(ChannelIndex chIndex)
 {
     Channel &ch = getByIndex(chIndex);
     ChannelSettings &channelSettings = ch.settings;
+    Config_LoRaConfig &loraConfig = config.lora;
 
-    channelSettings.modem_config = ChannelSettings_ModemConfig_LongFast; // Default to Long Range & Fast
+    loraConfig.modem_preset = Config_LoRaConfig_ModemPreset_LongFast; // Default to Long Range & Fast
 
-    channelSettings.tx_power = 0; // default
+    loraConfig.tx_power = 0; // default
     uint8_t defaultpskIndex = 1;
     channelSettings.psk.bytes[0] = defaultpskIndex;
     channelSettings.psk.size = 1;
@@ -206,33 +207,33 @@ const char *Channels::getName(size_t chIndex)
     const ChannelSettings &channelSettings = getByIndex(chIndex).settings;
     const char *channelName = channelSettings.name;
     if (!*channelName) { // emptystring
-        // Per mesh.proto spec, if bandwidth is specified we must ignore modemConfig enum, we assume that in that case
+        // Per mesh.proto spec, if bandwidth is specified we must ignore modemPreset enum, we assume that in that case
         // the app fucked up and forgot to set channelSettings.name
 
-        if (channelSettings.bandwidth != 0)
-            channelName = "Unset";
+        if (config.lora.bandwidth != 0)
+            channelName = "Custom";
         else
-            switch (channelSettings.modem_config) {
-            case ChannelSettings_ModemConfig_ShortSlow:
-                channelName = "ShortSlow";
+            switch (config.lora.modem_preset) {
+            case Config_LoRaConfig_ModemPreset_ShortSlow:
+                channelName = "ShortS";
                 break;
-            case ChannelSettings_ModemConfig_ShortFast:
-                channelName = "ShortFast";
+            case Config_LoRaConfig_ModemPreset_ShortFast:
+                channelName = "ShortF";
                 break;
-            case ChannelSettings_ModemConfig_MidSlow:
-                channelName = "MediumSlow";
+            case Config_LoRaConfig_ModemPreset_MedSlow:
+                channelName = "MedS";
                 break;
-            case ChannelSettings_ModemConfig_MidFast:
-                channelName = "MediumFast";
+            case Config_LoRaConfig_ModemPreset_MedFast:
+                channelName = "MedF";
                 break;
-            case ChannelSettings_ModemConfig_LongFast:
-                channelName = "LongFast";
+            case Config_LoRaConfig_ModemPreset_LongSlow:
+                channelName = "LongS";
                 break;
-            case ChannelSettings_ModemConfig_LongSlow:
-                channelName = "LongSlow";
+            case Config_LoRaConfig_ModemPreset_LongFast:
+                channelName = "LongF";
                 break;
-            case ChannelSettings_ModemConfig_VLongSlow:
-                channelName = "VLongSlow";
+            case Config_LoRaConfig_ModemPreset_VLongSlow:
+                channelName = "VeryL";
                 break;
             default:
                 channelName = "Invalid";

src/mesh/CryptoEngine.cpp

@@ -3,11 +3,7 @@
 
 void CryptoEngine::setKey(const CryptoKey &k)
 {
-    DEBUG_MSG("Installing AES%d key!\n", k.length * 8);
-    /* for(uint8_t i = 0; i < k.length; i++)
-        DEBUG_MSG("%02x ", k.bytes[i]);
-    DEBUG_MSG("\n"); */
-
+    DEBUG_MSG("Using AES%d key!\n", k.length * 8);
     key = k;
 }
 
@@ -36,6 +32,4 @@ void CryptoEngine::initNonce(uint32_t fromNode, uint64_t packetId)
     // use memcpy to avoid breaking strict-aliasing
     memcpy(nonce, &packetId, sizeof(uint64_t));
     memcpy(nonce + sizeof(uint64_t), &fromNode, sizeof(uint32_t));
-    //*((uint64_t *)&nonce[0]) = packetId;
-    //*((uint32_t *)&nonce[8]) = fromNode;
 }

src/mesh/FloodingRouter.cpp

@@ -29,10 +29,14 @@ bool FloodingRouter::shouldFilterReceived(MeshPacket *p)
 
 void FloodingRouter::sniffReceived(const MeshPacket *p, const Routing *c)
 {
-
-    if ((p->to == NODENUM_BROADCAST) && (p->hop_limit > 0) && (getFrom(p) != getNodeNum())) {
+    PacketId ackId = ((c && c->error_reason == Routing_Error_NONE) || !c) ? p->decoded.request_id : 0;
+    if (ackId && p->to != getNodeNum()) {
+        // do not flood direct message that is ACKed 
+        DEBUG_MSG("Receiving an ACK not for me, but don't need to rebroadcast this direct message anymore.\n");
+        Router::cancelSending(p->to, p->decoded.request_id);   // cancel rebroadcast for this DM
+    } else if ((p->to != getNodeNum()) && (p->hop_limit > 0) && (getFrom(p) != getNodeNum())) {
         if (p->id != 0) {
-            if (radioConfig.preferences.role != Role_ClientMute) {
+            if (config.device.role != Config_DeviceConfig_Role_ClientMute) {
                 MeshPacket *tosend = packetPool.allocCopy(*p); // keep a copy because we will be sending it
 
                 tosend->hop_limit--; // bump down the hop count

src/mesh/MeshModule.h

@@ -4,7 +4,7 @@
 #include "mesh/MeshTypes.h"
 #include <vector>
 
-#ifndef NO_SCREEN
+#if HAS_SCREEN
 #include <OLEDDisplay.h>
 #include <OLEDDisplayUi.h>
 #endif
@@ -72,7 +72,7 @@ class MeshModule
     static void observeUIEvents(Observer<const UIFrameEvent *> *observer);
     static AdminMessageHandleResult handleAdminMessageForAllPlugins(
         const MeshPacket &mp, AdminMessage *request, AdminMessage *response);
-#ifndef NO_SCREEN
+#if HAS_SCREEN
     virtual void drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y) { return; }
 #endif
   protected:

src/mesh/MeshPacketQueue.cpp

@@ -72,6 +72,16 @@ MeshPacket *MeshPacketQueue::dequeue()
     return p;
 }
 
+MeshPacket *MeshPacketQueue::getFront()
+{
+    if (empty()) {
+        return NULL;
+    }
+
+    auto *p = queue.front();
+    return p;
+}
+
 /** Attempt to find and remove a packet from this queue.  Returns a pointer to the removed packet, or NULL if not found */
 MeshPacket *MeshPacketQueue::remove(NodeNum from, PacketId id)
 {

src/mesh/MeshPacketQueue.h

@@ -28,6 +28,8 @@ class MeshPacketQueue
 
     MeshPacket *dequeue();
 
+    MeshPacket *getFront();
+
     /** Attempt to find and remove a packet from this queue.  Returns the packet which was removed from the queue */
     MeshPacket *remove(NodeNum from, PacketId id);
 };

src/mesh/MeshRadio.h

@@ -7,7 +7,7 @@
 
 // Map from old region names to new region enums
 struct RegionInfo {
-    RegionCode code;
+    Config_LoRaConfig_RegionCode code;
     float freqStart;
     float freqEnd;
     float dutyCycle;

src/mesh/MeshService.cpp

@@ -71,17 +71,7 @@ int MeshService::handleFromRadio(const MeshPacket *mp)
     printPacket("Forwarding to phone", mp);
     nodeDB.updateFrom(*mp); // update our DB state based off sniffing every RX packet from the radio
 
-    fromNum++;
-
-    if (toPhoneQueue.numFree() == 0) {
-        DEBUG_MSG("NOTE: tophone queue is full, discarding oldest\n");
-        MeshPacket *d = toPhoneQueue.dequeuePtr(0);
-        if (d)
-            releaseToPool(d);
-    }
-
-    MeshPacket *copied = packetPool.allocCopy(*mp);
-    assert(toPhoneQueue.enqueue(copied, 0)); // FIXME, instead of failing for full queue, delete the oldest mssages
+    sendToPhone((MeshPacket *)mp);
 
     return 0;
 }
@@ -161,12 +151,16 @@ bool MeshService::cancelSending(PacketId id)
     return router->cancelSending(nodeDB.getNodeNum(), id);
 }
 
-void MeshService::sendToMesh(MeshPacket *p, RxSource src)
+void MeshService::sendToMesh(MeshPacket *p, RxSource src, bool ccToPhone)
 {
     nodeDB.updateFrom(*p); // update our local DB for this packet (because phone might have sent position packets etc...)
 
     // Note: We might return !OK if our fifo was full, at that point the only option we have is to drop it
     router->sendLocal(p, src);
+
+    if (ccToPhone) {
+        sendToPhone(p);
+    }
 }
 
 void MeshService::sendNetworkPing(NodeNum dest, bool wantReplies)
@@ -187,6 +181,21 @@ void MeshService::sendNetworkPing(NodeNum dest, bool wantReplies)
     }
 }
 
+void MeshService::sendToPhone(MeshPacket *p)
+{
+    if (toPhoneQueue.numFree() == 0) {
+        DEBUG_MSG("NOTE: tophone queue is full, discarding oldest\n");
+        MeshPacket *d = toPhoneQueue.dequeuePtr(0);
+        if (d)
+            releaseToPool(d);
+    }
+
+    MeshPacket *copied = packetPool.allocCopy(*p);
+    perhapsDecode(copied);
+    assert(toPhoneQueue.enqueue(copied, 0)); // FIXME, instead of failing for full queue, delete the oldest mssages
+    fromNum++;
+}
+
 NodeInfo *MeshService::refreshMyNodeInfo()
 {
     NodeInfo *node = nodeDB.getNode(nodeDB.getNodeNum());
@@ -224,10 +233,10 @@ int MeshService::onGPSChanged(const meshtastic::GPSStatus *newStatus)
     } else {
         // The GPS has lost lock, if we are fixed position we should just keep using
         // the old position
-#if GPS_EXTRAVERBOSE
+#ifdef GPS_EXTRAVERBOSE
         DEBUG_MSG("onGPSchanged() - lost validLocation\n");
 #endif
-        if (radioConfig.preferences.fixed_position) {
+        if (config.position.fixed_position) {
             DEBUG_MSG("WARNING: Using fixed position\n");
             pos = node->position;
         }
@@ -239,8 +248,8 @@ int MeshService::onGPSChanged(const meshtastic::GPSStatus *newStatus)
     pos.time = getValidTime(RTCQualityGPS);
 
     // In debug logs, identify position by @timestamp:stage (stage 4 = nodeDB)
-    DEBUG_MSG("onGPSChanged() pos@%x, time=%u, lat=%d, lon=%d, alt=%d\n", 
-                pos.pos_timestamp, pos.time, pos.latitude_i, pos.longitude_i, pos.altitude);
+    DEBUG_MSG("onGPSChanged() pos@%x, time=%u, lat=%d, lon=%d, alt=%d\n", pos.pos_timestamp, pos.time, pos.latitude_i,
+              pos.longitude_i, pos.altitude);
 
     // Update our current position in the local DB
     nodeDB.updatePosition(nodeDB.getNodeNum(), pos, RX_SRC_LOCAL);

src/mesh/MeshService.h

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

src/mesh/NodeDB.cpp

@@ -17,14 +17,14 @@
 #include <pb_decode.h>
 #include <pb_encode.h>
 
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
 #include "mesh/http/WiFiAPClient.h"
 #include "modules/esp32/StoreForwardModule.h"
 #include <Preferences.h>
 #include <nvs_flash.h>
 #endif
 
-#ifdef NRF52_SERIES
+#ifdef ARCH_NRF52
 #include <bluefruit.h>
 #include <utility/bonding.h>
 #endif
@@ -34,7 +34,8 @@ NodeDB nodeDB;
 // we have plenty of ram so statically alloc this tempbuf (for now)
 EXT_RAM_ATTR DeviceState devicestate;
 MyNodeInfo &myNodeInfo = devicestate.my_node;
-RadioConfig radioConfig;
+LocalConfig config;
+LocalModuleConfig moduleConfig;
 ChannelFile channelFile;
 
 /** The current change # for radio settings.  Starts at 0 on boot and any time the radio settings
@@ -47,7 +48,7 @@ DeviceState versions used to be defined in the .proto file but really only this
 #define here.
 */
 
-#define DEVICESTATE_CUR_VER 11
+#define DEVICESTATE_CUR_VER 13
 #define DEVICESTATE_MIN_VER DEVICESTATE_CUR_VER
 
 // FIXME - move this somewhere else
@@ -86,27 +87,9 @@ bool NodeDB::resetRadioConfig()
 
     radioGeneration++;
 
-    radioConfig.has_preferences = true;
-    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
-#ifdef NRF52_SERIES
-        FSCom.rmdir_r("/prefs");
-
-        Bluefruit.begin();
-
-        DEBUG_MSG("Clearing bluetooth bonds!\n");
-        bond_print_list(BLE_GAP_ROLE_PERIPH);
-        bond_print_list(BLE_GAP_ROLE_CENTRAL);
-
-        Bluefruit.Periph.clearBonds();
-        Bluefruit.Central.clearBonds();
-#endif
-        didFactoryReset = true;
+    // radioConfig.has_preferences = true;
+    if (config.device.factory_reset) {
+       didFactoryReset = factoryReset();
     }
 
     if (channelFile.channels_count != MAX_NUM_CHANNELS) {
@@ -123,11 +106,11 @@ bool NodeDB::resetRadioConfig()
         DEBUG_MSG("***** DEVELOPMENT MODE - DO NOT RELEASE *****\n");
 
         // Sleep quite frequently to stress test the BLE comms, broadcast position every 6 mins
-        radioConfig.preferences.screen_on_secs = 10;
-        radioConfig.preferences.wait_bluetooth_secs = 10;
-        radioConfig.preferences.position_broadcast_secs = 6 * 60;
-        radioConfig.preferences.ls_secs = 60;
-        radioConfig.preferences.region = RegionCode_TW;
+        config.display.screen_on_secs = 10;
+        config.power.wait_bluetooth_secs = 10;
+        config.position.position_broadcast_secs = 6 * 60;
+        config.power.ls_secs = 60;
+        config.lora.region = Config_LoRaConfig_RegionCode_TW;
 
         // Enter super deep sleep soon and stay there not very long
         // radioConfig.preferences.mesh_sds_timeout_secs = 10;
@@ -140,30 +123,76 @@ bool NodeDB::resetRadioConfig()
     return didFactoryReset;
 }
 
-void NodeDB::installDefaultRadioConfig()
+bool NodeDB::factoryReset() 
 {
-    memset(&radioConfig, 0, sizeof(radioConfig));
-    radioConfig.has_preferences = true;
+    DEBUG_MSG("Performing factory reset!\n");
+    // first, remove the "/prefs" (this removes most prefs)
+    rmDir("/prefs");
+    // second, install default state (this will deal with the duplicate mac address issue)
+    installDefaultDeviceState();
+    // third, write to disk
+    saveToDisk();
+#ifdef ARCH_ESP32
+    // This will erase what's in NVS including ssl keys, persistant variables and ble pairing
+    nvs_flash_erase();
+#endif
+#ifdef ARCH_NRF52
+    Bluefruit.begin();
+    DEBUG_MSG("Clearing bluetooth bonds!\n");
+    bond_print_list(BLE_GAP_ROLE_PERIPH);
+    bond_print_list(BLE_GAP_ROLE_CENTRAL);
+    Bluefruit.Periph.clearBonds();
+    Bluefruit.Central.clearBonds();
+#endif
+    return true;
+}
+
+void NodeDB::installDefaultConfig()
+{
+    DEBUG_MSG("Installing default LocalConfig\n");
+    memset(&config, 0, sizeof(LocalConfig));
+    config.version = DEVICESTATE_CUR_VER;
+    config.has_device = true;
+    config.has_display = true;
+    config.has_lora = true;
+    config.has_position = true;
+    config.has_power = true;
+    config.has_wifi = true;
+
+    config.lora.region = Config_LoRaConfig_RegionCode_Unset;
+    config.lora.modem_preset = Config_LoRaConfig_ModemPreset_LongFast;
     resetRadioConfig();
+    strncpy(config.device.ntp_server, "0.pool.ntp.org", 32);
+    // for backward compat, default position flags are ALT+MSL
+    config.position.position_flags =
+        (Config_PositionConfig_PositionFlags_POS_ALTITUDE | Config_PositionConfig_PositionFlags_POS_ALT_MSL);
+}
 
-    // 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::installDefaultModuleConfig()
+{
+    DEBUG_MSG("Installing default ModuleConfig\n");
+    memset(&moduleConfig, 0, sizeof(ModuleConfig));
+    moduleConfig.version = DEVICESTATE_CUR_VER;
+    moduleConfig.has_mqtt = true;
+    moduleConfig.has_range_test = true;
+    moduleConfig.has_serial = true;
+    moduleConfig.has_store_forward = true;
+    moduleConfig.has_telemetry = true;
+    moduleConfig.has_external_notification = true;
+    moduleConfig.has_canned_message = true;
 }
 
 void NodeDB::installDefaultChannels()
 {
-    memset(&channelFile, 0, sizeof(channelFile));
+    DEBUG_MSG("Installing default ChannelFile\n");
+    memset(&channelFile, 0, sizeof(ChannelFile));
+    channelFile.version = DEVICESTATE_CUR_VER;
 }
 
 void NodeDB::installDefaultDeviceState()
 {
-    // We try to preserve the region setting because it will really bum users out if we discard it
-    String oldRegion = myNodeInfo.region;
-    RegionCode oldRegionCode = radioConfig.preferences.region;
-
-    memset(&devicestate, 0, sizeof(devicestate));
+    DEBUG_MSG("Installing default DeviceState\n");
+    memset(&devicestate, 0, sizeof(DeviceState));
 
     *numNodes = 0; // Forget node DB
 
@@ -184,38 +213,26 @@ void NodeDB::installDefaultDeviceState()
 
     // Set default owner name
     pickNewNodeNum(); // based on macaddr now
-    sprintf(owner.long_name, "Unknown %02x%02x", ourMacAddr[4], ourMacAddr[5]);
-    sprintf(owner.short_name, "?%02X", (unsigned)(myNodeInfo.my_node_num & 0xff));
+    sprintf(owner.long_name, "Meshtastic %02x%02x", ourMacAddr[4], ourMacAddr[5]);
+    sprintf(owner.short_name, "%02x%02x", ourMacAddr[4], ourMacAddr[5]);
 
     sprintf(owner.id, "!%08x", getNodeNum()); // Default node ID now based on nodenum
     memcpy(owner.macaddr, ourMacAddr, sizeof(owner.macaddr));
-
-    // Restore region if possible
-    if (oldRegionCode != RegionCode_Unset)
-        radioConfig.preferences.region = oldRegionCode;
-    if (oldRegion.length()) // If the old style region was set, try to keep it up-to-date
-        strcpy(myNodeInfo.region, oldRegion.c_str());
-
-    installDefaultChannels();
-    installDefaultRadioConfig();
 }
 
 void NodeDB::init()
 {
-    installDefaultDeviceState();
-
+    DEBUG_MSG("Initializing NodeDB\n");
     // saveToDisk();
     loadFromDisk();
-    // saveToDisk();
 
     myNodeInfo.max_channels = MAX_NUM_CHANNELS; // tell others the max # of channels we can understand
 
-    myNodeInfo.error_code =
-        CriticalErrorCode_None; // For the error code, only show values from this boot (discard value from flash)
+    myNodeInfo.error_code = CriticalErrorCode_None; // For the error code, only show values from this boot (discard value from flash)
     myNodeInfo.error_address = 0;
 
     // likewise - we always want the app requirements to come from the running appload
-    myNodeInfo.min_app_version = 20200; // format is Mmmss (where M is 1+the numeric major number. i.e. 20120 means 1.1.20
+    myNodeInfo.min_app_version = 20300; // format is Mmmss (where M is 1+the numeric major number. i.e. 20120 means 1.1.20
 
     // Note! We do this after loading saved settings, so that if somehow an invalid nodenum was stored in preferences we won't
     // keep using that nodenum forever. Crummy guess at our nodenum (but we will check against the nodedb to avoid conflicts)
@@ -231,7 +248,7 @@ void NodeDB::init()
 
     strncpy(myNodeInfo.firmware_version, optstr(APP_VERSION), sizeof(myNodeInfo.firmware_version));
 
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
     Preferences preferences;
     preferences.begin("meshtastic", false);
     myNodeInfo.reboot_count = preferences.getUInt("rebootCounter", 0);
@@ -239,14 +256,14 @@ void NodeDB::init()
     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.
-    */
+     *    the test isn't so simplistic.
+     */
     myNodeInfo.has_wifi = true;
 #endif
 
     resetRadioConfig(); // If bogus settings got saved, then fix them
-
-    DEBUG_MSG("region=%d, NODENUM=0x%x, dbsize=%d\n", radioConfig.preferences.region, myNodeInfo.my_node_num, *numNodes);
+    DEBUG_MSG("region=%d, NODENUM=0x%x, dbsize=%d\n", config.lora.region, myNodeInfo.my_node_num, *numNodes);
+    saveToDisk();
 }
 
 // We reserve a few nodenums for future use
@@ -276,28 +293,20 @@ void NodeDB::pickNewNodeNum()
     myNodeInfo.my_node_num = r;
 }
 
-static const char *preffileOld = "/db.proto";
-static const char *preffile = "/prefs/db.proto";
-static const char *radiofile = "/prefs/radio.proto";
-static const char *channelfile = "/prefs/channels.proto";
-// const char *preftmp = "/db.proto.tmp";
+static const char *prefFileName = "/prefs/db.proto";
+static const char *configFileName = "/prefs/config.proto";
+static const char *moduleConfigFileName = "/prefs/module.proto";
+static const char *channelFileName = "/prefs/channels.proto";
 
 /** Load a protobuf from a file, return true for success */
 bool loadProto(const char *filename, size_t protoSize, size_t objSize, const pb_msgdesc_t *fields, void *dest_struct)
 {
+    bool okay = false;
 #ifdef FSCom
     // static DeviceState scratch; We no longer read into a tempbuf because this structure is 15KB of valuable RAM
 
     auto f = FSCom.open(filename);
 
-    // FIXME, temporary hack until every node in the universe is 1.2 or later - look for prefs in the old location (so we can
-    // preserve region)
-    if (!f && filename == preffile) {
-        filename = preffileOld;
-        f = FSCom.open(filename);
-    }
-
-    bool okay = false;
     if (f) {
         DEBUG_MSG("Loading %s\n", filename);
         pb_istream_t stream = {&readcb, &f, protoSize};
@@ -324,35 +333,72 @@ bool loadProto(const char *filename, size_t protoSize, size_t objSize, const pb_
 void NodeDB::loadFromDisk()
 {
     // static DeviceState scratch; We no longer read into a tempbuf because this structure is 15KB of valuable RAM
-    if (!loadProto(preffile, DeviceState_size, sizeof(devicestate), DeviceState_fields, &devicestate)) {
+    if (!loadProto(prefFileName, DeviceState_size, sizeof(devicestate), DeviceState_fields, &devicestate)) {
         installDefaultDeviceState(); // Our in RAM copy might now be corrupt
     } else {
         if (devicestate.version < DEVICESTATE_MIN_VER) {
             DEBUG_MSG("Warn: devicestate %d is old, discarding\n", devicestate.version);
             installDefaultDeviceState();
+#ifdef ARCH_ESP32
+            // This will erase what's in NVS including ssl keys, persistant variables and ble pairing
+            nvs_flash_erase();
+#endif
+#ifdef ARCH_NRF52
+            Bluefruit.begin();
+            DEBUG_MSG("Clearing bluetooth bonds!\n");
+            bond_print_list(BLE_GAP_ROLE_PERIPH);
+            bond_print_list(BLE_GAP_ROLE_CENTRAL);
+            Bluefruit.Periph.clearBonds();
+            Bluefruit.Central.clearBonds();
+#endif
         } else {
-            DEBUG_MSG("Loaded saved preferences version %d\n", devicestate.version);
+            DEBUG_MSG("Loaded saved devicestate version %d\n", devicestate.version);
         }
     }
 
-    if (!loadProto(radiofile, RadioConfig_size, sizeof(RadioConfig), RadioConfig_fields, &radioConfig)) {
-        installDefaultRadioConfig(); // Our in RAM copy might now be corrupt
+    if (!loadProto(configFileName, LocalConfig_size, sizeof(LocalConfig), LocalConfig_fields, &config)) {
+        installDefaultConfig(); // Our in RAM copy might now be corrupt
+    } else {
+        if (config.version < DEVICESTATE_MIN_VER) {
+            DEBUG_MSG("Warn: config %d is old, discarding\n", config.version);
+            installDefaultConfig();
+        } else {
+            DEBUG_MSG("Loaded saved config version %d\n", config.version);
+        }
     }
 
-    if (!loadProto(channelfile, ChannelFile_size, sizeof(ChannelFile), ChannelFile_fields, &channelFile)) {
+    if (!loadProto(moduleConfigFileName, LocalModuleConfig_size, sizeof(LocalModuleConfig), LocalModuleConfig_fields, &moduleConfig)) {
+        installDefaultModuleConfig(); // Our in RAM copy might now be corrupt
+    } else {
+        if (moduleConfig.version < DEVICESTATE_MIN_VER) {
+            DEBUG_MSG("Warn: moduleConfig %d is old, discarding\n", moduleConfig.version);
+            installDefaultModuleConfig();
+        } else {
+            DEBUG_MSG("Loaded saved moduleConfig version %d\n", moduleConfig.version);
+        }
+    }
+
+    if (!loadProto(channelFileName, ChannelFile_size, sizeof(ChannelFile), ChannelFile_fields, &channelFile)) {
         installDefaultChannels(); // Our in RAM copy might now be corrupt
+    } else {
+        if (channelFile.version < DEVICESTATE_MIN_VER) {
+            DEBUG_MSG("Warn: channelFile %d is old, discarding\n", channelFile.version);
+            installDefaultChannels();
+        } else {
+            DEBUG_MSG("Loaded saved channelFile version %d\n", channelFile.version);
+        }
     }
 }
 
 /** Save a protobuf from a file, return true for success */
 bool saveProto(const char *filename, size_t protoSize, size_t objSize, const pb_msgdesc_t *fields, const void *dest_struct)
 {
+    bool okay = false;
 #ifdef FSCom
     // static DeviceState scratch; We no longer read into a tempbuf because this structure is 15KB of valuable RAM
     String filenameTmp = filename;
     filenameTmp += ".tmp";
     auto f = FSCom.open(filenameTmp.c_str(), FILE_O_WRITE);
-    bool okay = false;
     if (f) {
         DEBUG_MSG("Saving %s\n", filename);
         pb_ostream_t stream = {&writecb, &f, protoSize};
@@ -366,9 +412,9 @@ bool saveProto(const char *filename, size_t protoSize, size_t objSize, const pb_
         f.close();
 
         // brief window of risk here ;-)
-        if (!FSCom.remove(filename))
+        if (FSCom.exists(filename) && !FSCom.remove(filename))
             DEBUG_MSG("Warning: Can't remove old pref file\n");
-        if (!FSCom.rename(filenameTmp.c_str(), filename))
+        if (!renameFile(filenameTmp.c_str(), filename))
             DEBUG_MSG("Error: can't rename new pref file\n");
     } else {
         DEBUG_MSG("Can't write prefs\n");
@@ -385,7 +431,17 @@ void NodeDB::saveChannelsToDisk()
 #ifdef FSCom
         FSCom.mkdir("/prefs");
 #endif
-        saveProto(channelfile, ChannelFile_size, sizeof(ChannelFile), ChannelFile_fields, &channelFile);
+        saveProto(channelFileName, ChannelFile_size, sizeof(ChannelFile), ChannelFile_fields, &channelFile);
+    }
+}
+
+void NodeDB::saveDeviceStateToDisk() 
+{
+    if (!devicestate.no_save) {
+#ifdef FSCom
+        FSCom.mkdir("/prefs");
+#endif
+        saveProto(prefFileName, DeviceState_size, sizeof(devicestate), DeviceState_fields, &devicestate);
     }
 }
 
@@ -395,12 +451,27 @@ void NodeDB::saveToDisk()
 #ifdef FSCom
         FSCom.mkdir("/prefs");
 #endif
-        saveProto(preffile, DeviceState_size, sizeof(devicestate), DeviceState_fields, &devicestate);
-        saveProto(radiofile, RadioConfig_size, sizeof(RadioConfig), RadioConfig_fields, &radioConfig);
-        saveChannelsToDisk();
+        saveProto(prefFileName, DeviceState_size, sizeof(devicestate), DeviceState_fields, &devicestate);
 
-        // remove any pre 1.2 pref files, turn on after 1.2 is in beta
-        // if(okay) FSCom.remove(preffileOld);
+        // save all config segments
+        config.has_device = true;
+        config.has_display = true;
+        config.has_lora = true;
+        config.has_position = true;
+        config.has_power = true;
+        config.has_wifi = true;
+        saveProto(configFileName, LocalConfig_size, sizeof(LocalConfig), LocalConfig_fields, &config);
+
+        moduleConfig.has_canned_message = true;
+        moduleConfig.has_external_notification = true;
+        moduleConfig.has_mqtt = true;
+        moduleConfig.has_range_test = true;
+        moduleConfig.has_serial = true;
+        moduleConfig.has_store_forward = true;
+        moduleConfig.has_telemetry = true;
+        saveProto(moduleConfigFileName, LocalModuleConfig_size, sizeof(LocalModuleConfig), LocalModuleConfig_fields, &moduleConfig);
+
+        saveChannelsToDisk();
     } else {
         DEBUG_MSG("***** DEVELOPMENT MODE - DO NOT RELEASE - not saving to flash *****\n");
     }
@@ -426,7 +497,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 * 60 * 2) // 2 hrs to consider someone offline
 
 size_t NodeDB::getNumOnlineNodes()
 {
@@ -453,12 +524,11 @@ void NodeDB::updatePosition(uint32_t nodeId, const Position &p, RxSource src)
 
     if (src == RX_SRC_LOCAL) {
         // Local packet, fully authoritative
-        DEBUG_MSG("updatePosition LOCAL pos@%x, time=%u, latI=%d, lonI=%d, alt=%d\n",
-                p.pos_timestamp, p.time, p.latitude_i, p.longitude_i, p.altitude);
+        DEBUG_MSG("updatePosition LOCAL pos@%x, time=%u, latI=%d, lonI=%d, alt=%d\n", p.pos_timestamp, p.time, p.latitude_i,
+                  p.longitude_i, p.altitude);
         info->position = p;
 
-    } else if ((p.time > 0) && !p.latitude_i && !p.longitude_i && !p.pos_timestamp &&
-                !p.location_source) {
+    } 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);
@@ -470,8 +540,7 @@ void NodeDB::updatePosition(uint32_t nodeId, const Position &p, RxSource src)
         // 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);
+        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;
@@ -480,7 +549,7 @@ void NodeDB::updatePosition(uint32_t nodeId, const Position &p, RxSource src)
         info->position = p;
 
         // Last, restore any fields that may have been overwritten
-        if (! info->position.time)
+        if (!info->position.time)
             info->position.time = tmp_time;
     }
     info->has_position = true;
@@ -488,7 +557,6 @@ void NodeDB::updatePosition(uint32_t nodeId, const Position &p, RxSource src)
     notifyObservers(true); // Force an update whether or not our node counts have changed
 }
 
-
 /** Update telemetry info for this node based on received metrics
  *  We only care about device telemetry here
  */
@@ -600,7 +668,7 @@ void recordCriticalError(CriticalErrorCode code, uint32_t address, const char *f
     // Print error to screen and serial port
     String lcd = String("Critical error ") + code + "!\n";
     screen->print(lcd.c_str());
-    if(filename)
+    if (filename)
         DEBUG_MSG("NOTE! Recording critical error %d at %s:%lx\n", code, filename, address);
     else
         DEBUG_MSG("NOTE! Recording critical error %d, address=%lx\n", code, address);
@@ -611,7 +679,7 @@ void recordCriticalError(CriticalErrorCode code, uint32_t address, const char *f
     myNodeInfo.error_count++;
 
     // Currently portuino is mostly used for simulation.  Make sue the user notices something really bad happend
-#ifdef PORTDUINO
+#ifdef ARCH_PORTDUINO
     DEBUG_MSG("A critical failure occurred, portduino is exiting...");
     exit(2);
 #endif

src/mesh/NodeDB.h

@@ -11,7 +11,8 @@
 extern DeviceState devicestate;
 extern ChannelFile channelFile;
 extern MyNodeInfo &myNodeInfo;
-extern RadioConfig radioConfig;
+extern LocalConfig config;
+extern LocalModuleConfig moduleConfig;
 extern User &owner;
 
 /// Given a node, return how many seconds in the past (vs now) that we last heard from it
@@ -43,7 +44,7 @@ class NodeDB
     void init();
 
     /// write to flash
-    void saveToDisk(), saveChannelsToDisk();
+    void saveToDisk(), saveChannelsToDisk(), saveDeviceStateToDisk();
 
     /** Reinit radio config if needed, because either:
      * a) sometimes a buggy android app might send us bogus settings or
@@ -63,7 +64,7 @@ class NodeDB
 
     /** Update telemetry info for this node based on received metrics
      */
-    void updateTelemetry(uint32_t nodeId,  const Telemetry &t, RxSource src = RX_SRC_RADIO);
+    void updateTelemetry(uint32_t nodeId, const Telemetry &t, RxSource src = RX_SRC_RADIO);
 
     /** Update user info for this node based on received user data
      */
@@ -118,11 +119,14 @@ class NodeDB
         newStatus.notifyObservers(&status);
     }
 
+    bool factoryReset();
+
     /// read our db from flash
     void loadFromDisk();
 
     /// Reinit device state from scratch (not loading from disk)
-    void installDefaultDeviceState(), installDefaultRadioConfig(), installDefaultChannels();
+    void installDefaultDeviceState(), installDefaultChannels(), installDefaultConfig(),
+        installDefaultModuleConfig();
 };
 
 /**
@@ -136,7 +140,7 @@ extern NodeDB nodeDB;
 /*
   If is_router is set, we use a number of different default values
 
-        # FIXME - after tuning, move these params into the on-device defaults based on is_router and is_low_power
+        # FIXME - after tuning, move these params into the on-device defaults based on is_router and is_power_saving
 
         # prefs.position_broadcast_secs = FIXME possibly broadcast only once an hr
         prefs.wait_bluetooth_secs = 1  # Don't stay in bluetooth mode
@@ -146,11 +150,11 @@ extern NodeDB nodeDB;
         prefs.ls_secs = oneday
 
         prefs.position_broadcast_secs = 12 hours # send either position or owner every 12hrs
-        
+
         # get a new GPS position once per day
         prefs.gps_update_interval = oneday
 
-        prefs.is_low_power = True
+        prefs.is_power_saving = True
 
         # allow up to five minutes for each new GPS lock attempt
         prefs.gps_attempt_time = 300
@@ -159,33 +163,26 @@ extern NodeDB nodeDB;
 // Our delay functions check for this for times that should never expire
 #define NODE_DELAY_FOREVER 0xffffffff
 
-#define IF_ROUTER(routerVal, normalVal) ((radioConfig.preferences.role == Role_Router) ? (routerVal) : (normalVal))
+#define IF_ROUTER(routerVal, normalVal) ((config.device.role == Config_DeviceConfig_Role_Router) ? (routerVal) : (normalVal))
 
-#define PREF_GET(name, defaultVal)                                                                                               \
-    inline uint32_t getPref_##name() { return radioConfig.preferences.name ? radioConfig.preferences.name : (defaultVal); }
-
-PREF_GET(position_broadcast_secs, IF_ROUTER(12 * 60 * 60, 15 * 60))
-// Defaulting Telemetry to the same as position interval for now
-PREF_GET(telemetry_module_device_update_interval, IF_ROUTER(12 * 60 * 60, 15 * 60))
-PREF_GET(telemetry_module_environment_update_interval, IF_ROUTER(12 * 60 * 60, 15 * 60))
+#define default_broadcast_interval_secs IF_ROUTER(12 * 60 * 60, 15 * 60)
+#define default_wait_bluetooth_secs IF_ROUTER(1, 60)
+#define default_mesh_sds_timeout_secs IF_ROUTER(NODE_DELAY_FOREVER, 2 * 60 * 60)
+#define default_sds_secs 365 * 24 * 60 * 60
+#define default_ls_secs IF_ROUTER(24 * 60 * 60, 5 * 60)
+#define default_min_wake_secs 10
 
 
-// Each time we wake into the DARK state allow 1 minute to send and receive BLE packets to the phone
-PREF_GET(wait_bluetooth_secs, IF_ROUTER(1, 60))
+inline uint32_t getIntervalOrDefaultMs(uint32_t interval)
+{
+    if (interval > 0)
+        return interval * 1000;
+    return default_broadcast_interval_secs * 1000;
+}
 
-PREF_GET(screen_on_secs, 60)
-PREF_GET(mesh_sds_timeout_secs, IF_ROUTER(NODE_DELAY_FOREVER, 2 * 60 * 60))
-PREF_GET(sds_secs, 365 * 24 * 60 * 60)
-
-// We default to sleeping (with bluetooth off for 5 minutes at a time).  This seems to be a good tradeoff between
-// latency for the user sending messages and power savings because of not having to run (expensive) ESP32 bluetooth
-PREF_GET(ls_secs, IF_ROUTER(24 * 60 * 60, 5 * 60))
-
-PREF_GET(phone_timeout_secs, 15 * 60)
-PREF_GET(min_wake_secs, 10)
-
-/** The current change # for radio settings.  Starts at 0 on boot and any time the radio settings 
+/** The current change # for radio settings.  Starts at 0 on boot and any time the radio settings
  * might have changed is incremented.  Allows others to detect they might now be on a new channel.
  */
 extern uint32_t radioGeneration;
 
+#define Module_Config_size (ModuleConfig_CannedMessageConfig_size + ModuleConfig_ExternalNotificationConfig_size + ModuleConfig_MQTTConfig_size + ModuleConfig_RangeTestConfig_size + ModuleConfig_SerialConfig_size + ModuleConfig_StoreForwardConfig_size + ModuleConfig_TelemetryConfig_size + ModuleConfig_size)

src/mesh/PhoneAPI.cpp

@@ -112,7 +112,8 @@ bool PhoneAPI::handleToRadio(const uint8_t *buf, size_t bufLength)
  *
  * Our sending states progress in the following sequence (the client app ASSUMES THIS SEQUENCE, DO NOT CHANGE IT):
  *      STATE_SEND_MY_INFO, // send our my info record
-        STATE_SEND_RADIO,
+ *      STATE_SEND_GROUPS
+        STATE_SEND_CONFIG,
         STATE_SEND_NODEINFO, // states progress in this order as the device sends to to the client
         STATE_SEND_COMPLETE_ID,
         STATE_SEND_PACKETS // send packets or debug strings
@@ -140,11 +141,89 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
         myNodeInfo.has_gps = gps && gps->isConnected(); // Update with latest GPS connect info
         fromRadioScratch.which_payloadVariant = FromRadio_my_info_tag;
         fromRadioScratch.my_info = myNodeInfo;
-        state = STATE_SEND_NODEINFO;
+        state = STATE_SEND_CONFIG;
 
         service.refreshMyNodeInfo(); // Update my NodeInfo because the client will be asking for it soon.
         break;
 
+    case STATE_SEND_CONFIG:
+        fromRadioScratch.which_payloadVariant = FromRadio_config_tag;
+        switch (config_state) {
+            case Config_device_tag:
+                fromRadioScratch.config.which_payloadVariant = Config_device_tag;
+                fromRadioScratch.config.payloadVariant.device = config.device;
+                break;
+            case Config_position_tag:
+                fromRadioScratch.config.which_payloadVariant = Config_position_tag;
+                fromRadioScratch.config.payloadVariant.position = config.position;
+                break;
+            case Config_power_tag:
+                fromRadioScratch.config.which_payloadVariant = Config_power_tag;
+                fromRadioScratch.config.payloadVariant.power = config.power;
+                fromRadioScratch.config.payloadVariant.power.ls_secs = default_ls_secs;
+                break;
+            case Config_wifi_tag:
+                fromRadioScratch.config.which_payloadVariant = Config_wifi_tag;
+                fromRadioScratch.config.payloadVariant.wifi = config.wifi;
+                break;
+            case Config_display_tag:
+                fromRadioScratch.config.which_payloadVariant = Config_display_tag;
+                fromRadioScratch.config.payloadVariant.display = config.display;
+                break;
+            case Config_lora_tag:
+                fromRadioScratch.config.which_payloadVariant = Config_lora_tag;
+                fromRadioScratch.config.payloadVariant.lora = config.lora;
+                break;
+        }
+
+        // NOTE: The phone app needs to know the ls_secs value so it can properly expect sleep behavior.
+        // So even if we internally use 0 to represent 'use default' we still need to send the value we are
+        // using to the app (so that even old phone apps work with new device loads).
+        
+        config_state++;
+        // Advance when we have sent all of our config objects
+        if (config_state > Config_lora_tag) {
+            state = STATE_SEND_MODULECONFIG;
+            config_state = ModuleConfig_mqtt_tag;
+        }
+        break;
+
+    case STATE_SEND_MODULECONFIG:
+        fromRadioScratch.which_payloadVariant = FromRadio_moduleConfig_tag;
+        switch (config_state) {
+            case ModuleConfig_mqtt_tag:
+                fromRadioScratch.moduleConfig.which_payloadVariant = ModuleConfig_mqtt_tag;
+                fromRadioScratch.moduleConfig.payloadVariant.mqtt = moduleConfig.mqtt;
+                break;
+            case ModuleConfig_serial_tag:
+                fromRadioScratch.moduleConfig.which_payloadVariant = ModuleConfig_serial_tag;
+                fromRadioScratch.moduleConfig.payloadVariant.serial = moduleConfig.serial;
+                break;
+            case ModuleConfig_external_notification_tag:
+                fromRadioScratch.moduleConfig.which_payloadVariant = ModuleConfig_external_notification_tag;
+                fromRadioScratch.moduleConfig.payloadVariant.external_notification = moduleConfig.external_notification;
+                break;
+            case ModuleConfig_range_test_tag:
+                fromRadioScratch.moduleConfig.which_payloadVariant = ModuleConfig_range_test_tag;
+                fromRadioScratch.moduleConfig.payloadVariant.range_test = moduleConfig.range_test;
+                break;
+            case ModuleConfig_telemetry_tag:
+                fromRadioScratch.moduleConfig.which_payloadVariant = ModuleConfig_telemetry_tag;
+                fromRadioScratch.moduleConfig.payloadVariant.telemetry = moduleConfig.telemetry;
+                break;
+            case ModuleConfig_canned_message_tag:
+                fromRadioScratch.moduleConfig.which_payloadVariant = ModuleConfig_canned_message_tag;
+                fromRadioScratch.moduleConfig.payloadVariant.canned_message = moduleConfig.canned_message;
+                break;
+        }
+
+        config_state++;
+        // Advance when we have sent all of our ModuleConfig objects
+        if (config_state > ModuleConfig_canned_message_tag) {
+            state = STATE_SEND_NODEINFO;
+            config_state = Config_device_tag;
+        }
+        break;
     case STATE_SEND_NODEINFO: {
         const NodeInfo *info = nodeInfoForPhone;
         nodeInfoForPhone = NULL; // We just consumed a nodeinfo, will need a new one next time
@@ -220,6 +299,12 @@ bool PhoneAPI::available()
 
     case STATE_SEND_MY_INFO:
         return true;
+            
+    case STATE_SEND_CONFIG:
+        return true;        
+
+    case STATE_SEND_MODULECONFIG:
+        return true;
 
     case STATE_SEND_NODEINFO:
         if (!nodeInfoForPhone)
@@ -269,4 +354,4 @@ int PhoneAPI::onNotify(uint32_t newValue)
         DEBUG_MSG("(Client not yet interested in packets)\n");
 
     return 0;
-}
+}

src/mesh/PhoneAPI.h

@@ -20,13 +20,11 @@ class PhoneAPI
     : public Observer<uint32_t> // FIXME, we shouldn't be inheriting from Observer, instead use CallbackObserver as a member
 {
     enum State {
-        STATE_UNUSED,       // (no longer used) old default state - until Android apps are all updated, uses the old BLE API
-        STATE_SEND_NOTHING, // (Eventual) Initial state, don't send anything until the client starts asking for config
-                            // (disconnected)
+        STATE_SEND_NOTHING, // Initial state, don't send anything until the client starts asking for config
         STATE_SEND_MY_INFO, // send our my info record
-        STATE_SEND_GROUPS,
-        // STATE_SEND_RADIO, // in 1.2 we now send this as a regular mesh packet
-        // STATE_SEND_OWNER, no need to send Owner specially, it is just part of the nodedb
+        STATE_SEND_GROUPS, // new in 1.3?
+        STATE_SEND_CONFIG, // Replacement for the old Radioconfig
+        STATE_SEND_MODULECONFIG, // Send Module specific config
         STATE_SEND_NODEINFO, // states progress in this order as the device sends to to the client
         STATE_SEND_COMPLETE_ID,
         STATE_SEND_PACKETS // send packets or debug strings
@@ -34,6 +32,8 @@ class PhoneAPI
 
     State state = STATE_SEND_NOTHING;
 
+    int8_t config_state = Config_device_tag;
+
     /**
      * Each packet sent to the phone has an incrementing count
      */

src/mesh/ProtobufModule.h

@@ -48,6 +48,17 @@ template <class T> class ProtobufModule : protected SinglePortModule
         return p;
     }
 
+    /**
+     * Gets the short name from the sender of the mesh packet
+     * Returns "???" if unknown sender
+     */
+    const char *getSenderShortName(const MeshPacket &mp)
+    {
+        auto node = nodeDB.getNode(getFrom(&mp));
+        const char *sender = (node) ? node->user.short_name : "???";
+        return sender;
+    }
+
   private:
     /** Called to handle a particular incoming message
 
@@ -66,10 +77,13 @@ template <class T> class ProtobufModule : protected SinglePortModule
         T *decoded = NULL;
         if (mp.which_payloadVariant == MeshPacket_decoded_tag && mp.decoded.portnum == ourPortNum) {
             memset(&scratch, 0, sizeof(scratch));
-            if (pb_decode_from_bytes(p.payload.bytes, p.payload.size, fields, &scratch))
+            if (pb_decode_from_bytes(p.payload.bytes, p.payload.size, fields, &scratch)) {
                 decoded = &scratch;
-            else
+            } else {
                 DEBUG_MSG("Error decoding protobuf module!\n");
+                // if we can't decode it, nobody can process it!
+                return ProcessMessage::STOP;
+            }
         }
 
         return handleReceivedProtobuf(mp, decoded) ? ProcessMessage::STOP : ProcessMessage::CONTINUE;

src/mesh/RF95Interface.cpp

@@ -70,19 +70,23 @@ bool RF95Interface::init()
     int res = lora->begin(getFreq(), bw, sf, cr, syncWord, power, currentLimit, preambleLength);
     DEBUG_MSG("RF95 init result %d\n", res);
 
+    DEBUG_MSG("Frequency set to %f\n", getFreq());    
+    DEBUG_MSG("Bandwidth set to %f\n", bw);    
+    DEBUG_MSG("Power output set to %d\n", power);    
+
     // 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);
+    if (res == RADIOLIB_ERR_NONE)
+        res = lora->setCRC(RADIOLIB_SX126X_LORA_CRC_ON);
 
-    if (res == ERR_NONE)
+    if (res == RADIOLIB_ERR_NONE)
         startReceive(); // start receiving
 
-    return res == ERR_NONE;
+    return res == RADIOLIB_ERR_NONE;
 }
 
 void INTERRUPT_ATTR RF95Interface::disableInterrupt()
@@ -99,39 +103,39 @@ bool RF95Interface::reconfigure()
 
     // configure publicly accessible settings
     int err = lora->setSpreadingFactor(sf);
-    if (err != ERR_NONE)
+    if (err != RADIOLIB_ERR_NONE)
         RECORD_CRITICALERROR(CriticalErrorCode_InvalidRadioSetting);
 
     err = lora->setBandwidth(bw);
-    if (err != ERR_NONE)
+    if (err != RADIOLIB_ERR_NONE)
         RECORD_CRITICALERROR(CriticalErrorCode_InvalidRadioSetting);
 
     err = lora->setCodingRate(cr);
-    if (err != ERR_NONE)
+    if (err != RADIOLIB_ERR_NONE)
         RECORD_CRITICALERROR(CriticalErrorCode_InvalidRadioSetting);
 
     err = lora->setSyncWord(syncWord);
-    assert(err == ERR_NONE);
+    assert(err == RADIOLIB_ERR_NONE);
 
     err = lora->setCurrentLimit(currentLimit);
-    assert(err == ERR_NONE);
+    assert(err == RADIOLIB_ERR_NONE);
 
     err = lora->setPreambleLength(preambleLength);
-    assert(err == ERR_NONE);
+    assert(err == RADIOLIB_ERR_NONE);
 
     err = lora->setFrequency(getFreq());
-    if (err != ERR_NONE)
+    if (err != RADIOLIB_ERR_NONE)
         RECORD_CRITICALERROR(CriticalErrorCode_InvalidRadioSetting);
 
     if (power > MAX_POWER) // This chip has lower power limits than some
         power = MAX_POWER;
     err = lora->setOutputPower(power);
-    if (err != ERR_NONE)
+    if (err != RADIOLIB_ERR_NONE)
         RECORD_CRITICALERROR(CriticalErrorCode_InvalidRadioSetting);
 
     startReceive(); // restart receiving
 
-    return ERR_NONE;
+    return RADIOLIB_ERR_NONE;
 }
 
 /**
@@ -147,7 +151,7 @@ void RF95Interface::addReceiveMetadata(MeshPacket *mp)
 void RF95Interface::setStandby()
 {
     int err = lora->standby();
-    assert(err == ERR_NONE);
+    assert(err == RADIOLIB_ERR_NONE);
 
     isReceiving = false; // If we were receiving, not any more
     disableInterrupt();
@@ -168,7 +172,7 @@ void RF95Interface::startReceive()
     setTransmitEnable(false);
     setStandby();
     int err = lora->startReceive();
-    assert(err == ERR_NONE);
+    assert(err == RADIOLIB_ERR_NONE);
 
     isReceiving = true;
 
@@ -176,6 +180,24 @@ void RF95Interface::startReceive()
     enableInterrupt(isrRxLevel0);
 }
 
+bool RF95Interface::isChannelActive()
+{
+    // check if we can detect a LoRa preamble on the current channel
+    int16_t result;
+    setTransmitEnable(false);
+    setStandby();  // needed for smooth transition
+    result = lora->scanChannel();
+    
+    if (result == RADIOLIB_PREAMBLE_DETECTED) {
+        // DEBUG_MSG("Channel is busy!\n");
+        return true;
+    }
+    assert(result != RADIOLIB_ERR_WRONG_MODEM);
+    
+    // DEBUG_MSG("Channel is free!\n");
+    return false;
+}
+
 /** Could we send right now (i.e. either not actively receving or transmitting)? */
 bool RF95Interface::isActivelyReceiving()
 {

src/mesh/RF95Interface.h

@@ -13,8 +13,9 @@ class RF95Interface : public RadioLibInterface
 
   public:
     RF95Interface(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, SPIClass &spi);
-
-    bool isIRQPending() override { return lora->getPendingIRQ(); }
+    
+    //TODO: Verify that this irq flag works with RFM95 / SX1276 radios the way it used to
+    bool isIRQPending() override { return lora->getIRQFlags() & RADIOLIB_SX127X_MASK_IRQ_FLAG_VALID_HEADER; }
 
     /// Initialise the Driver transport hardware and software.
     /// Make sure the Driver is properly configured before calling init().
@@ -40,6 +41,9 @@ class RF95Interface : public RadioLibInterface
      */
     virtual void enableInterrupt(void (*callback)()) { lora->setDio0Action(callback); }
 
+    /** can we detect a LoRa preamble on the current channel? */
+    virtual bool isChannelActive() override;
+
     /** are we actively receiving a packet (only called during receiving state) */
     virtual bool isActivelyReceiving() override;
 

src/mesh/RadioInterface.cpp

@@ -13,7 +13,8 @@
 
 #define RDEF(name, freq_start, freq_end, duty_cycle, spacing, power_limit, audio_permitted, frequency_switching)                 \
     {                                                                                                                            \
-        RegionCode_##name, freq_start, freq_end, duty_cycle, spacing, power_limit, audio_permitted, frequency_switching, #name   \
+        Config_LoRaConfig_RegionCode_##name, freq_start, freq_end, duty_cycle, spacing, power_limit, audio_permitted,            \
+            frequency_switching, #name                                                                                           \
     }
 
 const RegionInfo regions[] = {
@@ -34,8 +35,15 @@ const RegionInfo regions[] = {
         https://www.legislation.gov.uk/uksi/1999/930/schedule/6/part/III/made/data.xht?view=snippet&wrap=true
 
         audio_permitted = false per regulation
+
+        Special Note:
+        The link above describes LoRaWAN's band plan, stating a power limit of 16 dBm. This is their own suggested specification,
+        we do not need to follow it. The European Union regulations clearly state that the power limit for this frequency range is 500 mW, or 27 dBm.
+        It also states that we can use interference avoidance and spectrum access techniques to avoid a duty cycle.
+        (Please refer to section 4.21 in the following document)
+        https://ec.europa.eu/growth/tools-databases/tris/index.cfm/ro/search/?trisaction=search.detail&year=2021&num=528&dLang=EN
      */
-    RDEF(EU868, 869.4f, 869.65f, 10, 0, 16, false, false),
+    RDEF(EU868, 869.4f, 869.65f, 10, 0, 27, false, false),
 
     /*
         https://lora-alliance.org/wp-content/uploads/2020/11/lorawan_regional_parameters_v1.0.3reva_0.pdf
@@ -76,15 +84,15 @@ const RegionInfo regions[] = {
      */
     RDEF(IN, 865.0f, 867.0f, 100, 0, 30, true, false),
 
-   /*
-        https://rrf.rsm.govt.nz/smart-web/smart/page/-smart/domain/licence/LicenceSummary.wdk?id=219752
-        https://iotalliance.org.nz/wp-content/uploads/sites/4/2019/05/IoT-Spectrum-in-NZ-Briefing-Paper.pdf
-     */
+    /*
+         https://rrf.rsm.govt.nz/smart-web/smart/page/-smart/domain/licence/LicenceSummary.wdk?id=219752
+         https://iotalliance.org.nz/wp-content/uploads/sites/4/2019/05/IoT-Spectrum-in-NZ-Briefing-Paper.pdf
+      */
     RDEF(NZ865, 864.0f, 868.0f, 100, 0, 0, true, false),
 
-     /*
-        https://lora-alliance.org/wp-content/uploads/2020/11/lorawan_regional_parameters_v1.0.3reva_0.pdf
-     */
+    /*
+       https://lora-alliance.org/wp-content/uploads/2020/11/lorawan_regional_parameters_v1.0.3reva_0.pdf
+    */
     RDEF(TH, 920.0f, 925.0f, 100, 0, 16, true, false),
 
     /*
@@ -99,10 +107,10 @@ const RegionInfo *myRegion;
 void initRegion()
 {
     const RegionInfo *r = regions;
-    for (; r->code != RegionCode_Unset && r->code != radioConfig.preferences.region; r++)
+    for (; r->code != Config_LoRaConfig_RegionCode_Unset && r->code != config.lora.region; r++)
         ;
     myRegion = r;
-    DEBUG_MSG("Wanted region %d, using %s\n", radioConfig.preferences.region, r->name);
+    DEBUG_MSG("Wanted region %d, using %s\n", config.lora.region, r->name);
 }
 
 /**
@@ -158,59 +166,53 @@ uint32_t RadioInterface::getPacketTime(MeshPacket *p)
 /** The delay to use for retransmitting dropped packets */
 uint32_t RadioInterface::getRetransmissionMsec(const MeshPacket *p)
 {
-    assert(shortPacketMsec); // Better be non zero
-
-    // was 20 and 22 secs respectively, but now with shortPacketMsec as 2269, this should give the same range
-    return random(9 * shortPacketMsec, 10 * shortPacketMsec);
+    assert(slotTimeMsec); // Better be non zero
+    static uint8_t bytes[MAX_RHPACKETLEN];
+    size_t numbytes = pb_encode_to_bytes(bytes, sizeof(bytes), Data_fields, &p->decoded);
+    uint32_t packetAirtime = getPacketTime(numbytes + sizeof(PacketHeader));
+    // Make sure enough time has elapsed for this packet to be sent and an ACK is received. 
+    // DEBUG_MSG("Waiting for flooding message with airtime %d and slotTime is %d\n", packetAirtime, slotTimeMsec);
+    float channelUtil = airTime->channelUtilizationPercent();
+    uint8_t CWsize = map(channelUtil, 0, 100, CWmin, CWmax);
+    // Assuming we pick max. of CWsize and there will be a receiver with SNR at half the range
+    return 2*packetAirtime + (pow(2, CWsize) + pow(2, int((CWmax+CWmin)/2))) * slotTimeMsec + PROCESSING_TIME_MSEC;
 }
 
-/** The delay to use when we want to send something but the ether is busy */
+/** The delay to use when we want to send something */
 uint32_t RadioInterface::getTxDelayMsec()
 {
-    /** At the low end we want to pick a delay large enough that anyone who just completed sending (some other node)
-     * has had enough time to switch their radio back into receive mode.
-     */
-    const uint32_t MIN_TX_WAIT_MSEC = 100;
-
-    /**
-     * At the high end, this value is used to spread node attempts across time so when they are replying to a packet
-     * they don't both check that the airwaves are clear at the same moment.  As long as they are off by some amount
-     * one of the two will be first to start transmitting and the other will see that.  I bet 500ms is more than enough
-     * to guarantee this.
-     */
-    // const uint32_t MAX_TX_WAIT_MSEC = 2000; // stress test would still fail occasionally with 1000
-
-    return random((MIN_TX_WAIT_MSEC), (MIN_TX_WAIT_MSEC + shortPacketMsec));
+    /** We wait a random multiple of 'slotTimes' (see definition in header file) in order to avoid collisions.
+    The pool to take a random multiple from is the contention window (CW), which size depends on the 
+    current channel utilization. */
+    float channelUtil = airTime->channelUtilizationPercent();
+    uint8_t CWsize = map(channelUtil, 0, 100, CWmin, CWmax);
+    // DEBUG_MSG("Current channel utilization is %f so setting CWsize to %d\n", channelUtil, CWsize);
+    return random(0, pow(2, CWsize)) * slotTimeMsec;
 }
 
-
-/** The delay to use when we want to send something but the ether is busy */
+/** The delay to use when we want to flood a message */
 uint32_t RadioInterface::getTxDelayMsecWeighted(float snr)
 {
-    /** At the low end we want to pick a delay large enough that anyone who just completed sending (some other node)
-     * has had enough time to switch their radio back into receive mode.
-     */
-    const uint32_t MIN_TX_WAIT_MSEC = 100;
-
     // The minimum value for a LoRa SNR
     const uint32_t SNR_MIN = -20;
 
     // The maximum value for a LoRa SNR
     const uint32_t SNR_MAX = 15;
 
-    //  high SNR = Long Delay
-    //  low SNR = Short Delay
+    //  high SNR = large CW size (Long Delay)
+    //  low SNR = small CW size (Short Delay)
     uint32_t delay = 0;
-
-    if (radioConfig.preferences.role == Role_Router || radioConfig.preferences.role == Role_RouterClient) {
-        delay = map(snr, SNR_MIN, SNR_MAX, MIN_TX_WAIT_MSEC, (MIN_TX_WAIT_MSEC + (shortPacketMsec / 2)));
+    uint8_t CWsize = map(snr, SNR_MIN, SNR_MAX, CWmin, CWmax);
+    // DEBUG_MSG("rx_snr of %f so setting CWsize to:%d\n", snr, CWsize);
+    if (config.device.role == Config_DeviceConfig_Role_Router ||
+        config.device.role == Config_DeviceConfig_Role_RouterClient) {
+        delay = random(0, 2*CWsize) * slotTimeMsec;
         DEBUG_MSG("rx_snr found in packet. As a router, setting tx delay:%d\n", delay);
     } else {
-        delay = map(snr, SNR_MIN, SNR_MAX, MIN_TX_WAIT_MSEC + (shortPacketMsec / 2), (MIN_TX_WAIT_MSEC + shortPacketMsec * 2));
+        delay = random(0, pow(2, CWsize)) * slotTimeMsec;
         DEBUG_MSG("rx_snr found in packet. Setting tx delay:%d\n", delay);
     }
 
-
     return delay;
 }
 
@@ -251,7 +253,7 @@ void printPacket(const char *prefix, const MeshPacket *p)
         DEBUG_MSG(" rxSNR=%g", p->rx_snr);
     }
     if (p->rx_rssi != 0) {
-        DEBUG_MSG(" rxSNR=%g", p->rx_rssi);
+        DEBUG_MSG(" rxRSSI=%g", p->rx_rssi);
     }
     if (p->priority != 0)
         DEBUG_MSG(" priority=%d", p->priority);
@@ -351,41 +353,41 @@ void RadioInterface::applyModemConfig()
 {
     // Set up default configuration
     // No Sync Words in LORA mode
-
+    Config_LoRaConfig &loraConfig = config.lora;
     auto channelSettings = channels.getPrimary();
-    if (channelSettings.spread_factor == 0) {
-        switch (channelSettings.modem_config) {
-        case ChannelSettings_ModemConfig_ShortFast:
+    if (loraConfig.spread_factor == 0) {
+        switch (loraConfig.modem_preset) {
+        case Config_LoRaConfig_ModemPreset_ShortFast:
             bw = 250;
             cr = 8;
             sf = 7;
             break;
-        case ChannelSettings_ModemConfig_ShortSlow:
+        case Config_LoRaConfig_ModemPreset_ShortSlow:
             bw = 250;
             cr = 8;
             sf = 8;
             break;
-        case ChannelSettings_ModemConfig_MidFast:
+        case Config_LoRaConfig_ModemPreset_MedFast:
             bw = 250;
             cr = 8;
             sf = 9;
             break;
-        case ChannelSettings_ModemConfig_MidSlow:
+        case Config_LoRaConfig_ModemPreset_MedSlow:
             bw = 250;
             cr = 8;
             sf = 10;
             break;
-        case ChannelSettings_ModemConfig_LongFast:
+        case Config_LoRaConfig_ModemPreset_LongFast:
             bw = 250;
             cr = 8;
             sf = 11;
             break;
-        case ChannelSettings_ModemConfig_LongSlow:
+        case Config_LoRaConfig_ModemPreset_LongSlow:
             bw = 125;
             cr = 8;
             sf = 12;
             break;
-        case ChannelSettings_ModemConfig_VLongSlow:
+        case Config_LoRaConfig_ModemPreset_VLongSlow:
             bw = 31.25;
             cr = 8;
             sf = 12;
@@ -394,9 +396,9 @@ void RadioInterface::applyModemConfig()
             assert(0); // Unknown enum
         }
     } else {
-        sf = channelSettings.spread_factor;
-        cr = channelSettings.coding_rate;
-        bw = channelSettings.bandwidth;
+        sf = loraConfig.spread_factor;
+        cr = loraConfig.coding_rate;
+        bw = loraConfig.bandwidth;
 
         if (bw == 31) // This parameter is not an integer
             bw = 31.25;
@@ -404,28 +406,37 @@ void RadioInterface::applyModemConfig()
             bw = 62.5;
     }
 
-    power = channelSettings.tx_power;
-    shortPacketMsec = getPacketTime(sizeof(PacketHeader));
+    power = loraConfig.tx_power;
     assert(myRegion); // Should have been found in init
 
+    if ((power == 0) || (power > myRegion->powerLimit))
+        power = myRegion->powerLimit;
+
+    if (power == 0)
+        power = 17; // Default to default power if we don't have a valid power
+    
     // Calculate the number of channels
     uint32_t numChannels = floor((myRegion->freqEnd - myRegion->freqStart) / (myRegion->spacing + (bw / 1000)));
 
     // 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) % numChannels;
-    float freq = myRegion->freqStart + ((((myRegion->freqEnd - myRegion->freqStart) / numChannels) / 2) * channel_num);
+
+    // Old frequency selection formula
+    // float freq = myRegion->freqStart + ((((myRegion->freqEnd - myRegion->freqStart) / numChannels) / 2) * channel_num);
+
+    // New frequency selection formula
+    float freq = myRegion->freqStart + (bw / 2000) + ( channel_num * (bw / 1000));
 
     saveChannelNum(channel_num);
-    saveFreq(freq);
+    saveFreq(freq + config.lora.frequency_offset);
 
-    DEBUG_MSG("Set radio: name=%s, config=%u, ch=%d, power=%d\n", channelName, channelSettings.modem_config, channel_num, power);
-    DEBUG_MSG("Radio myRegion->freqStart / myRegion->freqEnd: %f -> %f (%f mhz)\n", myRegion->freqStart, myRegion->freqEnd,
-              myRegion->freqEnd - myRegion->freqStart);
+    DEBUG_MSG("Set radio: region=%s, name=%s, config=%u, ch=%d, power=%d\n", myRegion->name, channelName, loraConfig.modem_preset, channel_num, power);
+    DEBUG_MSG("Radio myRegion->freqStart / myRegion->freqEnd: %f -> %f (%f mhz)\n", myRegion->freqStart, myRegion->freqEnd, myRegion->freqEnd - myRegion->freqStart);
     DEBUG_MSG("Radio myRegion->numChannels: %d\n", numChannels);
     DEBUG_MSG("Radio channel_num: %d\n", channel_num);
     DEBUG_MSG("Radio frequency: %f\n", getFreq());
-    DEBUG_MSG("Short packet time: %u msec\n", shortPacketMsec);
+    DEBUG_MSG("Slot time: %u msec\n", slotTimeMsec);
 }
 
 /**

src/mesh/RadioInterface.h

@@ -52,8 +52,6 @@ class RadioInterface
     CallbackObserver<RadioInterface, void *> notifyDeepSleepObserver =
         CallbackObserver<RadioInterface, void *>(this, &RadioInterface::notifyDeepSleepCb);
 
-    /// Number of msecs we expect our shortest actual packet to be over the wire (used in retry timeout calcs)
-    uint32_t shortPacketMsec;
 
   protected:
     bool disabled = false;
@@ -61,8 +59,16 @@ class RadioInterface
     float bw = 125;
     uint8_t sf = 9;
     uint8_t cr = 7;
-
+    /** Slottime is the minimum time to wait, consisting of: 
+      - CAD duration (maximum of SX126x and SX127x);  
+      - roundtrip air propagation time (assuming max. 30km between nodes); 
+      - Tx/Rx turnaround time (maximum of SX126x and SX127x);
+      - MAC processing time (measured on T-beam) */
+    uint32_t slotTimeMsec = 8.5 * pow(2, sf)/bw + 0.2 + 0.4 + 7;
     uint16_t preambleLength = 32; // 8 is default, but we use longer to increase the amount of sleep time when receiving
+    const uint32_t PROCESSING_TIME_MSEC = 4500;  // time to construct, process and construct a packet again (empirically determined)
+    const uint8_t CWmin = 2;  // minimum CWsize
+    const uint8_t CWmax = 8;  // maximum CWsize 
 
     MeshPacket *sendingPacket = NULL; // The packet we are currently sending
     uint32_t lastTxStart = 0L;
@@ -126,10 +132,10 @@ class RadioInterface
     /** The delay to use for retransmitting dropped packets */
     uint32_t getRetransmissionMsec(const MeshPacket *p);
 
-    /** The delay to use when we want to send something but the ether is busy */
+    /** The delay to use when we want to send something */
     uint32_t getTxDelayMsec();
 
-    /** The delay to use when we want to send something but the ether is busy. Use a weighted scale based on SNR */
+    /** The delay to use when we want to flood a message. Use a weighted scale based on SNR */
     uint32_t getTxDelayMsecWeighted(float snr);
 
 

src/mesh/RadioLibInterface.cpp

@@ -11,6 +11,8 @@
 // FIXME, we default to 4MHz SPI, SPI mode 0, check if the datasheet says it can really do that
 static SPISettings spiSettings(4000000, MSBFIRST, SPI_MODE0);
 
+#ifdef ARCH_PORTDUINO
+
 void LockingModule::SPItransfer(uint8_t cmd, uint8_t reg, uint8_t *dataOut, uint8_t *dataIn, uint8_t numBytes)
 {
     concurrency::LockGuard g(spiLock);
@@ -18,6 +20,24 @@ void LockingModule::SPItransfer(uint8_t cmd, uint8_t reg, uint8_t *dataOut, uint
     Module::SPItransfer(cmd, reg, dataOut, dataIn, numBytes);
 }
 
+#else
+
+void LockingModule::SPIbeginTransaction()
+{
+    spiLock->lock();
+
+    Module::SPIbeginTransaction();
+}
+
+void LockingModule::SPIendTransaction()
+{
+    spiLock->unlock();
+
+    Module::SPIendTransaction();
+}
+
+#endif
+
 RadioLibInterface::RadioLibInterface(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, RADIOLIB_PIN_TYPE busy,
                                      SPIClass &spi, PhysicalLayer *_iface)
     : NotifiedWorkerThread("RadioIf"), module(cs, irq, rst, busy, spi, spiSettings), iface(_iface)
@@ -25,7 +45,7 @@ RadioLibInterface::RadioLibInterface(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq
     instance = this;
 }
 
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
 // ESP32 doesn't use that flag
 #define YIELD_FROM_ISR(x) portYIELD_FROM_ISR()
 #else
@@ -76,7 +96,7 @@ bool RadioLibInterface::canSendImmediately()
         if (busyTx && (millis() - lastTxStart > 60000)) {
             DEBUG_MSG("Hardware Failure! busyTx for more than 60s\n");
             RECORD_CRITICALERROR(CriticalErrorCode_TransmitFailed);
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
             if (busyTx && (millis() - lastTxStart > 65000)) // After 5s more, reboot
                 ESP.restart();
 #endif
@@ -93,262 +113,291 @@ bool RadioLibInterface::canSendImmediately()
 /// bluetooth comms code.  If the txmit queue is empty it might return an error
 ErrorCode RadioLibInterface::send(MeshPacket *p)
 {
-    if (radioConfig.preferences.region != RegionCode_Unset) {
-        if (disabled || radioConfig.preferences.is_lora_tx_disabled) {
-            DEBUG_MSG("send - lora_tx_disabled\n");
-            packetPool.release(p);
-            return ERRNO_DISABLED;
-        }
 
-    } else {
-        DEBUG_MSG("send - lora_tx_disabled because RegionCode_Unset\n");
+#ifndef DISABLE_WELCOME_UNSET
+
+    if (config.lora.region != Config_LoRaConfig_RegionCode_Unset) {
+        if (disabled || config.lora.tx_disabled) {
+
+            if (config.lora.region != Config_LoRaConfig_RegionCode_Unset) {
+                if (disabled || config.lora.tx_disabled) {
+                    DEBUG_MSG("send - lora_tx_disabled\n");
+                    packetPool.release(p);
+                    return ERRNO_DISABLED;
+                }
+
+            } else {
+                DEBUG_MSG("send - lora_tx_disabled because RegionCode_Unset\n");
+                packetPool.release(p);
+                return ERRNO_DISABLED;
+            }
+        }
+    }
+
+#else
+
+    if (disabled || config.lora.tx_disabled) {
+        DEBUG_MSG("send - lora_tx_disabled\n");
         packetPool.release(p);
         return ERRNO_DISABLED;
     }
 
-    // Sometimes when testing it is useful to be able to never turn on the xmitter
+#endif
+
+        // Sometimes when testing it is useful to be able to never turn on the xmitter
 #ifndef LORA_DISABLE_SENDING
-    printPacket("enqueuing for send", p);
+        printPacket("enqueuing for send", p);
 
-    DEBUG_MSG("txGood=%d,rxGood=%d,rxBad=%d\n", txGood, rxGood, rxBad);
-    ErrorCode res = txQueue.enqueue(p) ? ERRNO_OK : ERRNO_UNKNOWN;
+        DEBUG_MSG("txGood=%d,rxGood=%d,rxBad=%d\n", txGood, rxGood, rxBad);
+        ErrorCode res = txQueue.enqueue(p) ? ERRNO_OK : ERRNO_UNKNOWN;
+
+        if (res != ERRNO_OK) { // we weren't able to queue it, so we must drop it to prevent leaks
+            packetPool.release(p);
+            return res;
+        }
+
+        // set (random) transmit delay to let others reconfigure their radio,
+        // to avoid collisions and implement timing-based flooding
+        // DEBUG_MSG("Set random delay before transmitting.\n");
+        setTransmitDelay();
 
-    if (res != ERRNO_OK) { // we weren't able to queue it, so we must drop it to prevent leaks
-        packetPool.release(p);
         return res;
-    }
-
-    // We want all sending/receiving to be done by our daemon thread, We use a delay here because this packet might have been sent
-    // in response to a packet we just received.  So we want to make sure the other side has had a chance to reconfigure its radio
-
-    /* We assume if rx_snr = 0 and rx_rssi = 0, the packet was not generated locally.
-     *   This assumption is valid because of the offset generated by the radio to account for the noise
-     *   floor.
-     */
-    if (p->rx_snr == 0 && p->rx_rssi == 0) {
-        startTransmitTimer(true);
-    } else {
-        // If there is a SNR, start a timer scaled based on that SNR.
-        DEBUG_MSG("rx_snr found. hop_limit:%d rx_snr:%f\n", p->hop_limit, p->rx_snr);
-        startTransmitTimerSNR(p->rx_snr);
-    }
-
-    return res;
 #else
     packetPool.release(p);
     return ERRNO_DISABLED;
 #endif
-}
+    }
 
-bool RadioLibInterface::canSleep()
-{
-    bool res = txQueue.empty();
-    if (!res) // only print debug messages if we are vetoing sleep
-        DEBUG_MSG("radio wait to sleep, txEmpty=%d\n", res);
+    bool RadioLibInterface::canSleep()
+    {
+        bool res = txQueue.empty();
+        if (!res) // only print debug messages if we are vetoing sleep
+            DEBUG_MSG("radio wait to sleep, txEmpty=%d\n", res);
 
-    return res;
-}
+        return res;
+    }
 
-/** Attempt to cancel a previously sent packet.  Returns true if a packet was found we could cancel */
-bool RadioLibInterface::cancelSending(NodeNum from, PacketId id)
-{
-    auto p = txQueue.remove(from, id);
-    if (p)
-        packetPool.release(p); // free the packet we just removed
+    /** Attempt to cancel a previously sent packet.  Returns true if a packet was found we could cancel */
+    bool RadioLibInterface::cancelSending(NodeNum from, PacketId id)
+    {
+        auto p = txQueue.remove(from, id);
+        if (p)
+            packetPool.release(p); // free the packet we just removed
 
-    bool result = (p != NULL);
-    DEBUG_MSG("cancelSending id=0x%x, removed=%d\n", id, result);
-    return result;
-}
+        bool result = (p != NULL);
+        DEBUG_MSG("cancelSending id=0x%x, removed=%d\n", id, result);
+        return result;
+    }
 
-/** radio helper thread callback.
+    /** radio helper thread callback.
+    We never immediately transmit after any operation (either Rx or Tx). Instead we should wait a random multiple of 
+    'slotTimes' (see definition in RadioInterface.h) taken from a contention window (CW) to lower the chance of collision. 
+    The CW size is determined by setTransmitDelay() and depends either on the current channel utilization or SNR in case 
+    of a flooding message. After this, we perform channel activity detection (CAD) and reset the transmit delay if it is
+    currently active. 
+    */
+    void RadioLibInterface::onNotify(uint32_t notification)
+    {
+        switch (notification) {
+        case ISR_TX:
+            handleTransmitInterrupt();
+            startReceive();
+            // DEBUG_MSG("tx complete - starting timer\n");
+            startTransmitTimer();
+            break;
+        case ISR_RX:
+            handleReceiveInterrupt();
+            startReceive();
+            // DEBUG_MSG("rx complete - starting timer\n");
+            startTransmitTimer();
+            break;
+        case TRANSMIT_DELAY_COMPLETED:
+            // DEBUG_MSG("delay done\n");
 
-We never immediately transmit after any operation (either rx or tx).  Instead we should start receiving and
-wait a random delay of 50 to 200 ms to make sure we are not stomping on someone else.  The 50ms delay at the beginning ensures all
-possible listeners have had time to finish processing the previous packet and now have their radio in RX state.  The up to 200ms
-random delay gives a chance for all possible senders to have high odds of detecting that someone else started transmitting first
-and then they will wait until that packet finishes.
+            // If we are not currently in receive mode, then restart the random delay (this can happen if the main thread
+            // has placed the unit into standby)  FIXME, how will this work if the chipset is in sleep mode?
+            if (!txQueue.empty()) {
+                if (!canSendImmediately()) {
+                    // DEBUG_MSG("Currently Rx/Tx-ing: set random delay\n");
+                    setTransmitDelay(); // currently Rx/Tx-ing: reset random delay
+                } else {
+                    if (isChannelActive()) { // check if there is currently a LoRa packet on the channel
+                        // DEBUG_MSG("Channel is active: set random delay\n");
+                        setTransmitDelay(); // reset random delay
+                    } else {
+                        // Send any outgoing packets we have ready
+                        MeshPacket *txp = txQueue.dequeue();
+                        assert(txp);
+                        startSend(txp);
 
-NOTE: the large flood rebroadcast delay might still be needed even with this approach.  Because we might not be able to hear other
-transmitters that we are potentially stomping on.  Requires further thought.
-
-FIXME, the MIN_TX_WAIT_MSEC and MAX_TX_WAIT_MSEC values should be tuned via logic analyzer later.
-*/
-void RadioLibInterface::onNotify(uint32_t notification)
-{
-    switch (notification) {
-    case ISR_TX:
-        handleTransmitInterrupt();
-        startReceive();
-        // DEBUG_MSG("tx complete - starting timer\n");
-        startTransmitTimer();
-        break;
-    case ISR_RX:
-        handleReceiveInterrupt();
-        startReceive();
-        // DEBUG_MSG("rx complete - starting timer\n");
-        startTransmitTimer();
-        break;
-    case TRANSMIT_DELAY_COMPLETED:
-        // DEBUG_MSG("delay done\n");
-
-        // If we are not currently in receive mode, then restart the timer and try again later (this can happen if the main thread
-        // has placed the unit into standby)  FIXME, how will this work if the chipset is in sleep mode?
-        if (!txQueue.empty()) {
-            if (!canSendImmediately()) {
-                startTransmitTimer(); // try again in a little while
+                        // Packet has been sent, count it toward our TX airtime utilization.
+                        uint32_t xmitMsec = getPacketTime(txp);
+                        airTime->logAirtime(TX_LOG, xmitMsec);
+                    }
+                }
             } else {
-                // Send any outgoing packets we have ready
-                MeshPacket *txp = txQueue.dequeue();
-                assert(txp);
-                startSend(txp);
-
-                // Packet has been sent, count it toward our TX airtime utilization.
-                uint32_t xmitMsec = getPacketTime(txp);
-                airTime->logAirtime(TX_LOG, xmitMsec);
+                // DEBUG_MSG("done with txqueue\n");
             }
-        } else {
-            // DEBUG_MSG("done with txqueue\n");
-        }
-        break;
-    default:
-        assert(0); // We expected to receive a valid notification from the ISR
-    }
-}
-
-void RadioLibInterface::startTransmitTimer(bool withDelay)
-{
-    // If we have work to do and the timer wasn't already scheduled, schedule it now
-    if (!txQueue.empty()) {
-        uint32_t delay = !withDelay ? 1 : getTxDelayMsec();
-        // DEBUG_MSG("xmit timer %d\n", delay);
-        notifyLater(delay, TRANSMIT_DELAY_COMPLETED, false); // This will implicitly enable
-    }
-}
-
-void RadioLibInterface::startTransmitTimerSNR(float snr)
-{
-    // If we have work to do and the timer wasn't already scheduled, schedule it now
-    if (!txQueue.empty()) {
-        uint32_t delay = getTxDelayMsecWeighted(snr);
-        // DEBUG_MSG("xmit timer %d\n", delay);
-        notifyLater(delay, TRANSMIT_DELAY_COMPLETED, false); // This will implicitly enable
-    }
-}
-
-void RadioLibInterface::handleTransmitInterrupt()
-{
-    // DEBUG_MSG("handling lora TX interrupt\n");
-    // This can be null if we forced the device to enter standby mode.  In that case
-    // ignore the transmit interrupt
-    if (sendingPacket)
-        completeSending();
-}
-
-void RadioLibInterface::completeSending()
-{
-    // We are careful to clear sending packet before calling printPacket because
-    // that can take a long time
-    auto p = sendingPacket;
-    sendingPacket = NULL;
-
-    if (p) {
-        txGood++;
-        printPacket("Completed sending", p);
-
-        // We are done sending that packet, release it
-        packetPool.release(p);
-        // DEBUG_MSG("Done with send\n");
-    }
-}
-
-void RadioLibInterface::handleReceiveInterrupt()
-{
-    uint32_t xmitMsec;
-    assert(isReceiving);
-    isReceiving = false;
-
-    // read the number of actually received bytes
-    size_t length = iface->getPacketLength();
-
-    xmitMsec = getPacketTime(length);
-
-    int state = iface->readData(radiobuf, length);
-    if (state != ERR_NONE) {
-        DEBUG_MSG("ignoring received packet due to error=%d\n", state);
-        rxBad++;
-
-        airTime->logAirtime(RX_ALL_LOG, xmitMsec);
-
-    } else {
-        // Skip the 4 headers that are at the beginning of the rxBuf
-        int32_t payloadLen = length - sizeof(PacketHeader);
-        const uint8_t *payload = radiobuf + sizeof(PacketHeader);
-
-        // check for short packets
-        if (payloadLen < 0) {
-            DEBUG_MSG("ignoring received packet too short\n");
-            rxBad++;
-            airTime->logAirtime(RX_ALL_LOG, xmitMsec);
-        } else {
-            const PacketHeader *h = (PacketHeader *)radiobuf;
-
-            rxGood++;
-
-            // Note: we deliver _all_ packets to our router (i.e. our interface is intentionally promiscuous).
-            // This allows the router and other apps on our node to sniff packets (usually routing) between other
-            // nodes.
-            MeshPacket *mp = packetPool.allocZeroed();
-
-            mp->from = h->from;
-            mp->to = h->to;
-            mp->id = h->id;
-            mp->channel = h->channel;
-            assert(HOP_MAX <= PACKET_FLAGS_HOP_MASK); // If hopmax changes, carefully check this code
-            mp->hop_limit = h->flags & PACKET_FLAGS_HOP_MASK;
-            mp->want_ack = !!(h->flags & PACKET_FLAGS_WANT_ACK_MASK);
-
-            addReceiveMetadata(mp);
-
-            mp->which_payloadVariant = MeshPacket_encrypted_tag; // Mark that the payload is still encrypted at this point
-            assert(((uint32_t)payloadLen) <= sizeof(mp->encrypted.bytes));
-            memcpy(mp->encrypted.bytes, payload, payloadLen);
-            mp->encrypted.size = payloadLen;
-
-            printPacket("Lora RX", mp);
-
-            // xmitMsec = getPacketTime(mp);
-            airTime->logAirtime(RX_LOG, xmitMsec);
-
-            deliverToReceiver(mp);
+            break;
+        default:
+            assert(0); // We expected to receive a valid notification from the ISR
         }
     }
-}
 
-/** start an immediate transmit */
-void RadioLibInterface::startSend(MeshPacket *txp)
-{
-    printPacket("Starting low level send", txp);
-    if (disabled || radioConfig.preferences.is_lora_tx_disabled) {
-        DEBUG_MSG("startSend is dropping tx packet because we are disabled\n");
-        packetPool.release(txp);
-    } else {
-        setStandby(); // Cancel any already in process receives
+    void RadioLibInterface::setTransmitDelay()
+    {
+        MeshPacket *p = txQueue.getFront();
+        // We want all sending/receiving to be done by our daemon thread.
+        // We use a delay here because this packet might have been sent in response to a packet we just received.
+        // So we want to make sure the other side has had a chance to reconfigure its radio.
 
-        configHardwareForSend(); // must be after setStandby
+        /* We assume if rx_snr = 0 and rx_rssi = 0, the packet was generated locally.
+         *   This assumption is valid because of the offset generated by the radio to account for the noise
+         *   floor.
+         */
+        if (p->rx_snr == 0 && p->rx_rssi == 0) {
+            startTransmitTimer(true);
+        } else {
+            // If there is a SNR, start a timer scaled based on that SNR.
+            DEBUG_MSG("rx_snr found. hop_limit:%d rx_snr:%f\n", p->hop_limit, p->rx_snr);
+            startTransmitTimerSNR(p->rx_snr);
+        }
+    }
 
-        size_t numbytes = beginSending(txp);
+    void RadioLibInterface::startTransmitTimer(bool withDelay)
+    {
+        // If we have work to do and the timer wasn't already scheduled, schedule it now
+        if (!txQueue.empty()) {
+            uint32_t delay = !withDelay ? 1 : getTxDelayMsec();
+            // DEBUG_MSG("xmit timer %d\n", delay);
+            notifyLater(delay, TRANSMIT_DELAY_COMPLETED, false); // This will implicitly enable
+        }
+    }
 
-        int res = iface->startTransmit(radiobuf, numbytes);
-        if (res != ERR_NONE) {
-            RECORD_CRITICALERROR(CriticalErrorCode_RadioSpiBug);
+    void RadioLibInterface::startTransmitTimerSNR(float snr)
+    {
+        // If we have work to do and the timer wasn't already scheduled, schedule it now
+        if (!txQueue.empty()) {
+            uint32_t delay = getTxDelayMsecWeighted(snr);
+            // DEBUG_MSG("xmit timer %d\n", delay);
+            notifyLater(delay, TRANSMIT_DELAY_COMPLETED, false); // This will implicitly enable
+        }
+    }
 
-            // This send failed, but make sure to 'complete' it properly
+    void RadioLibInterface::handleTransmitInterrupt()
+    {
+        // DEBUG_MSG("handling lora TX interrupt\n");
+        // This can be null if we forced the device to enter standby mode.  In that case
+        // ignore the transmit interrupt
+        if (sendingPacket)
             completeSending();
-            startReceive(); // Restart receive mode (because startTransmit failed to put us in xmit mode)
-        }
-
-        // Must be done AFTER, starting transmit, because startTransmit clears (possibly stale) interrupt pending register bits
-        enableInterrupt(isrTxLevel0);
     }
-}
+
+    void RadioLibInterface::completeSending()
+    {
+        // We are careful to clear sending packet before calling printPacket because
+        // that can take a long time
+        auto p = sendingPacket;
+        sendingPacket = NULL;
+
+        if (p) {
+            txGood++;
+            printPacket("Completed sending", p);
+
+            // We are done sending that packet, release it
+            packetPool.release(p);
+            // DEBUG_MSG("Done with send\n");
+        }
+    }
+
+    void RadioLibInterface::handleReceiveInterrupt()
+    {
+        uint32_t xmitMsec;
+        assert(isReceiving);
+        isReceiving = false;
+
+        // read the number of actually received bytes
+        size_t length = iface->getPacketLength();
+
+        xmitMsec = getPacketTime(length);
+
+        int state = iface->readData(radiobuf, length);
+        if (state != RADIOLIB_ERR_NONE) {
+            DEBUG_MSG("ignoring received packet due to error=%d\n", state);
+            rxBad++;
+
+            airTime->logAirtime(RX_ALL_LOG, xmitMsec);
+
+        } else {
+            // Skip the 4 headers that are at the beginning of the rxBuf
+            int32_t payloadLen = length - sizeof(PacketHeader);
+            const uint8_t *payload = radiobuf + sizeof(PacketHeader);
+
+            // check for short packets
+            if (payloadLen < 0) {
+                DEBUG_MSG("ignoring received packet too short\n");
+                rxBad++;
+                airTime->logAirtime(RX_ALL_LOG, xmitMsec);
+            } else {
+                const PacketHeader *h = (PacketHeader *)radiobuf;
+
+                rxGood++;
+
+                // Note: we deliver _all_ packets to our router (i.e. our interface is intentionally promiscuous).
+                // This allows the router and other apps on our node to sniff packets (usually routing) between other
+                // nodes.
+                MeshPacket *mp = packetPool.allocZeroed();
+
+                mp->from = h->from;
+                mp->to = h->to;
+                mp->id = h->id;
+                mp->channel = h->channel;
+                assert(HOP_MAX <= PACKET_FLAGS_HOP_MASK); // If hopmax changes, carefully check this code
+                mp->hop_limit = h->flags & PACKET_FLAGS_HOP_MASK;
+                mp->want_ack = !!(h->flags & PACKET_FLAGS_WANT_ACK_MASK);
+
+                addReceiveMetadata(mp);
+
+                mp->which_payloadVariant = MeshPacket_encrypted_tag; // Mark that the payload is still encrypted at this point
+                assert(((uint32_t)payloadLen) <= sizeof(mp->encrypted.bytes));
+                memcpy(mp->encrypted.bytes, payload, payloadLen);
+                mp->encrypted.size = payloadLen;
+
+                printPacket("Lora RX", mp);
+
+                // xmitMsec = getPacketTime(mp);
+                airTime->logAirtime(RX_LOG, xmitMsec);
+
+                deliverToReceiver(mp);
+            }
+        }
+    }
+
+    /** start an immediate transmit */
+    void RadioLibInterface::startSend(MeshPacket * txp)
+    {
+        printPacket("Starting low level send", txp);
+        if (disabled || config.lora.tx_disabled) {
+            DEBUG_MSG("startSend is dropping tx packet because we are disabled\n");
+            packetPool.release(txp);
+        } else {
+            setStandby(); // Cancel any already in process receives
+
+            configHardwareForSend(); // must be after setStandby
+
+            size_t numbytes = beginSending(txp);
+
+            int res = iface->startTransmit(radiobuf, numbytes);
+            if (res != RADIOLIB_ERR_NONE) {
+                RECORD_CRITICALERROR(CriticalErrorCode_RadioSpiBug);
+
+                // This send failed, but make sure to 'complete' it properly
+                completeSending();
+                startReceive(); // Restart receive mode (because startTransmit failed to put us in xmit mode)
+            }
+
+            // Must be done AFTER, starting transmit, because startTransmit clears (possibly stale) interrupt pending register
+            // bits
+            enableInterrupt(isrTxLevel0);
+        }
+    }

src/mesh/RadioLibInterface.h

@@ -40,21 +40,13 @@ class LockingModule : public Module
         : Module(cs, irq, rst, gpio, spi, spiSettings)
     {
     }
-
-    /*!
-    \brief SPI single transfer method.
-
-    \param cmd SPI access command (read/write/burst/...).
-
-    \param reg Address of SPI register to transfer to/from.
-
-    \param dataOut Data that will be transfered from master to slave.
-
-    \param dataIn Data that was transfered from slave to master.
-
-    \param numBytes Number of bytes to transfer.
-    */
-    virtual void SPItransfer(uint8_t cmd, uint8_t reg, uint8_t *dataOut, uint8_t *dataIn, uint8_t numBytes) override;
+    
+#ifdef ARCH_PORTDUINO
+    void SPItransfer(uint8_t cmd, uint8_t reg, uint8_t *dataOut, uint8_t *dataIn, uint8_t numBytes) override;
+#else
+    void SPIbeginTransaction() override;
+    void SPIendTransaction() override;
+#endif
 };
 
 class RadioLibInterface : public RadioInterface, protected concurrency::NotifiedWorkerThread
@@ -132,6 +124,9 @@ class RadioLibInterface : public RadioInterface, protected concurrency::Notified
      */
     virtual void startReceive() = 0;
 
+    /** can we detect a LoRa preamble on the current channel? */
+    virtual bool isChannelActive() = 0;
+
     /** are we actively receiving a packet (only called during receiving state)
      *  This method is only public to facilitate debugging.  Do not call.
      */
@@ -141,18 +136,14 @@ class RadioLibInterface : public RadioInterface, protected concurrency::Notified
     virtual bool cancelSending(NodeNum from, PacketId id) override;
 
   private:
-    /** if we have something waiting to send, start a short random timer so we can come check for collision before actually doing
-     * the transmit
-     *
-     * If the timer was already running, we just wait for that one to occur.
-     * */
+    /** if we have something waiting to send, start a short (random) timer so we can come check for collision before actually doing
+     * the transmit */
+    void setTransmitDelay();
+
+    /** random timer with certain min. and max. settings */
     void startTransmitTimer(bool withDelay = true);
 
-    /** if we have something waiting to send, start a short scaled timer based on SNR so we can come check for collision before actually doing
-     * the transmit
-     *
-     * If the timer was already running, we just wait for that one to occur.
-     * */
+    /** timer scaled to SNR of to be flooded packet */
     void startTransmitTimerSNR(float snr);
 
     void handleTransmitInterrupt();

src/mesh/RadioLibRF95.cpp

@@ -15,7 +15,7 @@ int16_t RadioLibRF95::begin(float freq, float bw, uint8_t sf, uint8_t cr, uint8_
 {
     // execute common part
     int16_t state = SX127x::begin(RF95_CHIP_VERSION, syncWord, preambleLength);
-    if (state != ERR_NONE)
+    if (state != RADIOLIB_ERR_NONE)
         state = SX127x::begin(RF95_ALT_VERSION, syncWord, preambleLength);
     RADIOLIB_ASSERT(state);
 
@@ -30,7 +30,7 @@ int16_t RadioLibRF95::begin(float freq, float bw, uint8_t sf, uint8_t cr, uint8_
     RADIOLIB_ASSERT(state);
 
 #ifdef RF95_TCXO
-    state = _mod->SPIsetRegValue(SX127X_REG_TCXO, 0x10 | _mod->SPIgetRegValue(SX127X_REG_TCXO));
+    state = _mod->SPIsetRegValue(RADIOLIB_SX127X_REG_TCXO, 0x10 | _mod->SPIgetRegValue(RADIOLIB_SX127X_REG_TCXO));
     RADIOLIB_ASSERT(state);
 #endif
 
@@ -72,7 +72,7 @@ int16_t RadioLibRF95::setFrequency(float freq)
 bool RadioLibRF95::isReceiving()
 {
     // 0x0b == Look for header info valid, signal synchronized or signal detected
-    uint8_t reg = readReg(SX127X_REG_MODEM_STAT);
+    uint8_t reg = readReg(RADIOLIB_SX127X_REG_MODEM_STAT);
     // Serial.printf("reg %x\n", reg);
     return (reg & (RH_RF95_MODEM_STATUS_SIGNAL_DETECTED | RH_RF95_MODEM_STATUS_SIGNAL_SYNCHRONIZED |
                    RH_RF95_MODEM_STATUS_HEADER_INFO_VALID)) != 0;

src/mesh/RadioLibRF95.h

@@ -43,7 +43,7 @@ class RadioLibRF95: public SX1278 {
 
       \returns \ref status_codes
     */
-    int16_t begin(float freq = 915.0, float bw = 125.0, uint8_t sf = 9, uint8_t cr = 7, uint8_t syncWord = SX127X_SYNC_WORD, int8_t power = 17, uint16_t preambleLength = 8, uint8_t gain = 0);
+    int16_t begin(float freq = 915.0, float bw = 125.0, uint8_t sf = 9, uint8_t cr = 7, uint8_t syncWord = RADIOLIB_SX127X_SYNC_WORD, int8_t power = 17, uint16_t preambleLength = 8, uint8_t gain = 0);
 
     // configuration methods
 

src/mesh/ReliableRouter.cpp

@@ -1,7 +1,7 @@
-#include "configuration.h"
 #include "ReliableRouter.h"
 #include "MeshModule.h"
 #include "MeshTypes.h"
+#include "configuration.h"
 #include "mesh-pb-constants.h"
 
 // ReliableRouter::ReliableRouter() {}
@@ -14,11 +14,11 @@ ErrorCode ReliableRouter::send(MeshPacket *p)
 {
     if (p->want_ack) {
         // If someone asks for acks on broadcast, we need the hop limit to be at least one, so that first node that receives our
-        // message will rebroadcast.  But asking for hop_limit 0 in that context means the client app has no preference on hop counts
-        // and we want this message to get through the whole mesh, so use the default.
-        if (p->to == NODENUM_BROADCAST && p->hop_limit == 0) {
-            if (radioConfig.preferences.hop_limit && radioConfig.preferences.hop_limit <= HOP_MAX) {
-                p->hop_limit = (radioConfig.preferences.hop_limit >= HOP_MAX) ? HOP_MAX : radioConfig.preferences.hop_limit;
+        // message will rebroadcast.  But asking for hop_limit 0 in that context means the client app has no preference on hop
+        // counts and we want this message to get through the whole mesh, so use the default.
+        if (p->hop_limit == 0) {
+            if (config.lora.hop_limit && config.lora.hop_limit <= HOP_MAX) {
+                p->hop_limit = (config.lora.hop_limit >= HOP_MAX) ? HOP_MAX : config.lora.hop_limit;
             } else {
                 p->hop_limit = HOP_RELIABLE;
             }
@@ -34,16 +34,16 @@ ErrorCode ReliableRouter::send(MeshPacket *p)
 bool ReliableRouter::shouldFilterReceived(MeshPacket *p)
 {
     // Note: do not use getFrom() here, because we want to ignore messages sent from phone
-    if (p->to == NODENUM_BROADCAST && p->from == getNodeNum()) {
+    if (p->from == getNodeNum()) {
         printPacket("Rx someone rebroadcasting for us", p);
 
         // We are seeing someone rebroadcast one of our broadcast attempts.
         // If this is the first time we saw this, cancel any retransmissions we have queued up and generate an internal ack for
         // the original sending process.
 
-        // FIXME - we might want to turn off this "optimization", it does save lots of airtime but it assumes that once we've heard one
-        // one adjacent node hear our packet that a) probably other adjacent nodes heard it and b) we can trust those nodes to reach
-        // our destination.  Both of which might be incorrect.
+        // FIXME - we might want to turn off this "optimization", it does save lots of airtime but it assumes that once we've
+        // heard one one adjacent node hear our packet that a) probably other adjacent nodes heard it and b) we can trust those
+        // nodes to reach our destination.  Both of which might be incorrect.
         auto key = GlobalPacketId(getFrom(p), p->id);
         auto old = findPendingPacket(key);
         if (old) {
@@ -53,8 +53,7 @@ bool ReliableRouter::shouldFilterReceived(MeshPacket *p)
             sendAckNak(Routing_Error_NONE, getFrom(p), p->id, old->packet->channel);
 
             stopRetransmission(key);
-        }
-        else {
+        } else {
             DEBUG_MSG("didn't find pending packet\n");
         }
     }
@@ -151,7 +150,7 @@ bool ReliableRouter::stopRetransmission(GlobalPacketId key)
     if (old) {
         auto numErased = pending.erase(key);
         assert(numErased == 1);
-        packetPool.release(old->packet);
+        cancelSending(getFrom(old->packet), old->packet->id);
         return true;
     } else
         return false;
@@ -232,4 +231,4 @@ void ReliableRouter::setNextTx(PendingPacket *pending)
     DEBUG_MSG("Setting next retransmission in %u msecs: ", d);
     printPacket("", pending->packet);
     setReceivedMessage(); // Run ASAP, so we can figure out our correct sleep time
-}
+}

src/mesh/Router.cpp

@@ -11,7 +11,7 @@ extern "C" {
 #include "mesh/compression/unishox2.h"
 }
 
-#if defined(HAS_WIFI) || defined(PORTDUINO)
+#if HAS_WIFI
 #include "mqtt/MQTT.h"
 #endif
 
@@ -118,8 +118,8 @@ MeshPacket *Router::allocForSending()
     p->which_payloadVariant = MeshPacket_decoded_tag; // Assume payload is decoded at start.
     p->from = nodeDB.getNodeNum();
     p->to = NODENUM_BROADCAST;
-    if (radioConfig.preferences.hop_limit && radioConfig.preferences.hop_limit <= HOP_MAX) {
-        p->hop_limit = (radioConfig.preferences.hop_limit >= HOP_MAX) ? HOP_MAX : radioConfig.preferences.hop_limit;
+    if (config.lora.hop_limit && config.lora.hop_limit <= HOP_MAX) {
+        p->hop_limit = (config.lora.hop_limit >= HOP_MAX) ? HOP_MAX : config.lora.hop_limit;
     } else {
         p->hop_limit = HOP_RELIABLE;
     }
@@ -213,7 +213,7 @@ ErrorCode Router::send(MeshPacket *p)
     if (p->which_payloadVariant == MeshPacket_decoded_tag) {
         ChannelIndex chIndex = p->channel; // keep as a local because we are about to change it
 
-#if defined(HAS_WIFI) || defined(PORTDUINO)
+#if HAS_WIFI
         // check if we should send decrypted packets to mqtt
 
         // truth table:
@@ -227,7 +227,7 @@ ErrorCode Router::send(MeshPacket *p)
          */
 
         bool shouldActuallyEncrypt = true;
-        if (*radioConfig.preferences.mqtt_server && !radioConfig.preferences.mqtt_encryption_enabled) {
+        if (*moduleConfig.mqtt.address && !moduleConfig.mqtt.encryption_enabled) {
             shouldActuallyEncrypt = false;
         }
 
@@ -244,7 +244,7 @@ ErrorCode Router::send(MeshPacket *p)
             return encodeResult; // FIXME - this isn't a valid ErrorCode
         }
 
-#if defined(HAS_WIFI) || defined(PORTDUINO)
+#if HAS_WIFI
         // the packet is now encrypted.
         // check if we should send encrypted packets to mqtt
         if (mqtt && shouldActuallyEncrypt)
@@ -274,6 +274,9 @@ void Router::sniffReceived(const MeshPacket *p, const Routing *c)
 
 bool perhapsDecode(MeshPacket *p)
 {
+
+    // DEBUG_MSG("\n\n** perhapsDecode payloadVariant - %d\n\n", p->which_payloadVariant);
+
     if (p->which_payloadVariant == MeshPacket_decoded_tag)
         return true; // If packet was already decoded just return
 
@@ -304,12 +307,32 @@ bool perhapsDecode(MeshPacket *p)
                 p->which_payloadVariant = MeshPacket_decoded_tag; // change type to decoded
                 p->channel = chIndex;                             // change to store the index instead of the hash
 
+                /*
+                if (p->decoded.portnum == PortNum_TEXT_MESSAGE_APP) {
+                    DEBUG_MSG("\n\n** TEXT_MESSAGE_APP\n");
+                } else if (p->decoded.portnum == PortNum_TEXT_MESSAGE_COMPRESSED_APP) {
+                    DEBUG_MSG("\n\n** PortNum_TEXT_MESSAGE_COMPRESSED_APP\n");
+                }
+                */
 
                 // Decompress if needed. jm
-                if (p->decoded.which_payloadVariant == Data_payload_compressed_tag) {
-                    // Decompress the file
-                }
+                if (p->decoded.portnum == PortNum_TEXT_MESSAGE_COMPRESSED_APP) {
+                    // Decompress the payload
+                    char compressed_in[Constants_DATA_PAYLOAD_LEN] = {};
+                    char decompressed_out[Constants_DATA_PAYLOAD_LEN] = {};
+                    int decompressed_len;
 
+                    memcpy(compressed_in, p->decoded.payload.bytes, p->decoded.payload.size);
+
+                    decompressed_len = unishox2_decompress_simple(compressed_in, p->decoded.payload.size, decompressed_out);
+
+                    // DEBUG_MSG("\n\n**\n\nDecompressed length - %d \n", decompressed_len);
+
+                    memcpy(p->decoded.payload.bytes, decompressed_out, decompressed_len);
+
+                    // Switch the port from PortNum_TEXT_MESSAGE_COMPRESSED_APP to PortNum_TEXT_MESSAGE_APP
+                    p->decoded.portnum = PortNum_TEXT_MESSAGE_APP;
+                }
 
                 printPacket("decoded message", p);
                 return true;
@@ -340,41 +363,29 @@ Routing_Error perhapsEncode(MeshPacket *p)
 
             char compressed_out[Constants_DATA_PAYLOAD_LEN] = {0};
 
-            int compressed_len = unishox2_compress_simple(original_payload, p->decoded.payload.size, compressed_out);
+            int compressed_len;
+            compressed_len = unishox2_compress_simple(original_payload, p->decoded.payload.size, compressed_out);
 
-            Serial.print("Original length - ");
-            Serial.println(p->decoded.payload.size);
-
-            Serial.print("Compressed length - ");
-            Serial.println(compressed_len);
-            // Serial.println(compressed_out);
+            DEBUG_MSG("Original length - %d \n", p->decoded.payload.size);
+            DEBUG_MSG("Compressed length - %d \n", compressed_len);
+            DEBUG_MSG("Original message - %s \n", p->decoded.payload.bytes);
 
             // If the compressed length is greater than or equal to the original size, don't use the compressed form
             if (compressed_len >= p->decoded.payload.size) {
 
-                DEBUG_MSG("Not compressing message. Not enough benefit from doing so.\n");
+                DEBUG_MSG("Not using compressing message.\n");
                 // Set the uncompressed payload varient anyway. Shouldn't hurt?
-                p->decoded.which_payloadVariant = Data_payload_tag;
+                // p->decoded.which_payloadVariant = Data_payload_tag;
 
                 // Otherwise we use the compressor
             } else {
-                DEBUG_MSG("Compressing message.\n");
+                DEBUG_MSG("Using compressed message.\n");
                 // Copy the compressed data into the meshpacket
-                //p->decoded.payload_compressed.size = compressed_len;
-                //memcpy(p->decoded.payload_compressed.bytes, compressed_out, compressed_len);
 
-                //p->decoded.which_payloadVariant = Data_payload_compressed_tag;
-            }
+                p->decoded.payload.size = compressed_len;
+                memcpy(p->decoded.payload.bytes, compressed_out, compressed_len);
 
-            if (1) {
-                char decompressed_out[Constants_DATA_PAYLOAD_LEN] = {};
-                int decompressed_len;
-
-                decompressed_len = unishox2_decompress_simple(compressed_out, compressed_len, decompressed_out);
-
-                Serial.print("Decompressed length - ");
-                Serial.println(decompressed_len);
-                Serial.println(decompressed_out);
+                p->decoded.portnum = PortNum_TEXT_MESSAGE_COMPRESSED_APP;
             }
         }
 
@@ -436,8 +447,8 @@ void Router::handleReceived(MeshPacket *p, RxSource src)
 
 void Router::perhapsHandleReceived(MeshPacket *p)
 {
-    assert(radioConfig.has_preferences);
-    bool ignore = is_in_repeated(radioConfig.preferences.ignore_incoming, p->from);
+    // assert(radioConfig.has_preferences);
+    bool ignore = is_in_repeated(config.lora.ignore_incoming, p->from);
 
     if (ignore)
         DEBUG_MSG("Ignoring incoming message, 0x%x is in our ignore list\n", p->from);

src/mesh/SX126xInterface.cpp

@@ -56,6 +56,10 @@ bool SX126xInterface<T>::init()
     // \todo Display actual typename of the adapter, not just `SX126x`
     DEBUG_MSG("SX126x init result %d\n", res);
 
+    DEBUG_MSG("Frequency set to %f\n", getFreq());    
+    DEBUG_MSG("Bandwidth set to %f\n", bw);    
+    DEBUG_MSG("Power output set to %d\n", power);    
+
     // current limit was removed from module' ctor
     // override default value (60 mA)
     res = lora.setCurrentLimit(currentLimit);
@@ -64,15 +68,15 @@ bool SX126xInterface<T>::init()
 
 #ifdef SX126X_TXEN
     // lora.begin sets Dio2 as RF switch control, which is not true if we are manually controlling RX and TX
-    if (res == ERR_NONE)
-        res = lora.setDio2AsRfSwitch(false);
+    if (res == RADIOLIB_ERR_NONE)
+        res = lora.setDio2AsRfSwitch(true);
 #endif
 
 #if 0
     // Read/write a register we are not using (only used for FSK mode) to test SPI comms
     uint8_t crcLSB = 0;
     int err = lora.readRegister(SX126X_REG_CRC_POLYNOMIAL_LSB, &crcLSB, 1);
-    if(err != ERR_NONE)
+    if(err != RADIOLIB_ERR_NONE)
         RECORD_CRITICALERROR(CriticalErrorCode_SX1262Failure);
 
     //if(crcLSB != 0x0f)
@@ -80,11 +84,11 @@ bool SX126xInterface<T>::init()
     
     crcLSB = 0x5a;
     err = lora.writeRegister(SX126X_REG_CRC_POLYNOMIAL_LSB, &crcLSB, 1);
-    if(err != ERR_NONE)
+    if(err != RADIOLIB_ERR_NONE)
         RECORD_CRITICALERROR(CriticalErrorCode_SX1262Failure);  
 
     err = lora.readRegister(SX126X_REG_CRC_POLYNOMIAL_LSB, &crcLSB, 1);
-    if(err != ERR_NONE)
+    if(err != RADIOLIB_ERR_NONE)
         RECORD_CRITICALERROR(CriticalErrorCode_SX1262Failure);
 
     if(crcLSB != 0x5a)
@@ -92,13 +96,13 @@ bool SX126xInterface<T>::init()
     // If we got this far register accesses (and therefore SPI comms) are good
 #endif
 
-    if (res == ERR_NONE)
-        res = lora.setCRC(SX126X_LORA_CRC_ON);
+    if (res == RADIOLIB_ERR_NONE)
+        res = lora.setCRC(RADIOLIB_SX126X_LORA_CRC_ON);
 
-    if (res == ERR_NONE)
+    if (res == RADIOLIB_ERR_NONE)
         startReceive(); // start receiving
 
-    return res == ERR_NONE;
+    return res == RADIOLIB_ERR_NONE;
 }
 
 template<typename T>
@@ -111,42 +115,43 @@ bool SX126xInterface<T>::reconfigure()
 
     // configure publicly accessible settings
     int err = lora.setSpreadingFactor(sf);
-    if (err != ERR_NONE)
+    if (err != RADIOLIB_ERR_NONE)
         RECORD_CRITICALERROR(CriticalErrorCode_InvalidRadioSetting);
 
     err = lora.setBandwidth(bw);
-    if (err != ERR_NONE)
+    if (err != RADIOLIB_ERR_NONE)
         RECORD_CRITICALERROR(CriticalErrorCode_InvalidRadioSetting);
 
     err = lora.setCodingRate(cr);
-    if (err != ERR_NONE)
+    if (err != RADIOLIB_ERR_NONE)
         RECORD_CRITICALERROR(CriticalErrorCode_InvalidRadioSetting);
 
     // Hmm - seems to lower SNR when the signal levels are high.  Leaving off for now...
-    err = lora.setRxGain(true);
-    assert(err == ERR_NONE);
+    // TODO: Confirm gain registers are okay now
+    // err = lora.setRxGain(true);
+    // assert(err == RADIOLIB_ERR_NONE);
 
     err = lora.setSyncWord(syncWord);
-    assert(err == ERR_NONE);
+    assert(err == RADIOLIB_ERR_NONE);
 
     err = lora.setCurrentLimit(currentLimit);
-    assert(err == ERR_NONE);
+    assert(err == RADIOLIB_ERR_NONE);
 
     err = lora.setPreambleLength(preambleLength);
-    assert(err == ERR_NONE);
+    assert(err == RADIOLIB_ERR_NONE);
 
     err = lora.setFrequency(getFreq());
-    if (err != ERR_NONE)
+    if (err != RADIOLIB_ERR_NONE)
         RECORD_CRITICALERROR(CriticalErrorCode_InvalidRadioSetting);
 
     if (power > 22) // This chip has lower power limits than some
         power = 22;
     err = lora.setOutputPower(power);
-    assert(err == ERR_NONE);
+    assert(err == RADIOLIB_ERR_NONE);
 
     startReceive(); // restart receiving
 
-    return ERR_NONE;
+    return RADIOLIB_ERR_NONE;
 }
 
 template<typename T>
@@ -161,7 +166,7 @@ void SX126xInterface<T>::setStandby()
     checkNotification(); // handle any pending interrupts before we force standby
     
     int err = lora.standby();
-    assert(err == ERR_NONE);
+    assert(err == RADIOLIB_ERR_NONE);
 
 #ifdef SX126X_RXEN // we have RXEN/TXEN control - turn off RX and TX power
     digitalWrite(SX126X_RXEN, LOW);
@@ -194,6 +199,9 @@ void SX126xInterface<T>::configHardwareForSend()
 #ifdef SX126X_TXEN // we have RXEN/TXEN control - turn on TX power / off RX power
     digitalWrite(SX126X_TXEN, HIGH);
 #endif
+#ifdef SX126X_RXEN
+    digitalWrite(SX126X_RXEN, LOW);
+#endif
 
     RadioLibInterface::configHardwareForSend();
 }
@@ -213,11 +221,14 @@ void SX126xInterface<T>::startReceive()
 #ifdef SX126X_RXEN // we have RXEN/TXEN control - turn on RX power / off TX power
     digitalWrite(SX126X_RXEN, HIGH);
 #endif
-
+#ifdef SX126X_TXEN
+    digitalWrite(SX126X_TXEN, LOW);
+#endif
+  
     // int err = lora.startReceive();
     int err = lora.startReceiveDutyCycleAuto(); // We use a 32 bit preamble so this should save some power by letting radio sit in
                                                 // standby mostly.
-    assert(err == ERR_NONE);
+    assert(err == RADIOLIB_ERR_NONE);
 
     isReceiving = true;
 
@@ -226,6 +237,23 @@ void SX126xInterface<T>::startReceive()
 #endif
 }
 
+/** Could we send right now (i.e. either not actively receving or transmitting)? */
+template<typename T>
+bool SX126xInterface<T>::isChannelActive()
+{
+    // check if we can detect a LoRa preamble on the current channel
+    int16_t result;
+
+    setStandby(); 
+    result = lora.scanChannel();
+    if (result == RADIOLIB_PREAMBLE_DETECTED) 
+        return true;
+    
+    assert(result != RADIOLIB_ERR_WRONG_MODEM);
+    
+    return false;
+}
+
 /** Could we send right now (i.e. either not actively receving or transmitting)? */
 template<typename T>
 bool SX126xInterface<T>::isActivelyReceiving()
@@ -236,7 +264,7 @@ bool SX126xInterface<T>::isActivelyReceiving()
     // never even get a valid header, so we don't want preamble to get set and stay set due to noise on the network.
 
     uint16_t irq = lora.getIrqStatus();
-    bool hasPreamble = (irq & SX126X_IRQ_HEADER_VALID);
+    bool hasPreamble = (irq & RADIOLIB_SX126X_IRQ_HEADER_VALID);
 
     // this is not correct - often always true - need to add an extra conditional
     // size_t bytesPending = lora.getPacketLength();
@@ -266,4 +294,4 @@ bool SX126xInterface<T>::sleep()
 #endif
 
     return true;
-}
+}

src/mesh/SX126xInterface.h

@@ -46,6 +46,9 @@ class SX126xInterface : public RadioLibInterface
      */
     virtual void enableInterrupt(void (*callback)()) { lora.setDio1Action(callback); }
 
+    /** can we detect a LoRa preamble on the current channel? */
+    virtual bool isChannelActive() override;
+
     /** are we actively receiving a packet (only called during receiving state) */
     virtual bool isActivelyReceiving() override;
 

src/mesh/compression/unishox2.c

@@ -129,9 +129,11 @@ void init_coder() {
   for (int i = 0; i < 3; i++) {
     for (int j = 0; j < 28; j++) {
       byte c = usx_sets[i][j];
-      usx_code_94[c - USX_OFFSET_94] = (i << 5) + j;
-      if (c >= 'a' && c <= 'z')
-        usx_code_94[c - USX_OFFSET_94 - ('a' - 'A')] = (i << 5) + j;
+      if (c > 32) {
+        usx_code_94[c - USX_OFFSET_94] = (i << 5) + j;
+        if (c >= 'a' && c <= 'z')
+          usx_code_94[c - USX_OFFSET_94 - ('a' - 'A')] = (i << 5) + j;
+      }
     }
   }
   is_inited = 1;
@@ -168,8 +170,8 @@ int append_bits(char *out, int olen, int ol, byte code, int clen) {
     code <<= blen;
     ol += blen;
     clen -= blen;
-    }
-    return ol;
+  }
+  return ol;
 }
 
 /// This is a safe call to append_bits() making sure it does not write past olen

src/mesh/generated/admin.pb.c

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

src/mesh/generated/admin.pb.h

@@ -1,73 +1,153 @@
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.4.5 */
+/* Generated by nanopb-0.4.6 */
 
 #ifndef PB_ADMIN_PB_H_INCLUDED
 #define PB_ADMIN_PB_H_INCLUDED
 #include <pb.h>
 #include "channel.pb.h"
+#include "config.pb.h"
 #include "mesh.pb.h"
-#include "radioconfig.pb.h"
+#include "module_config.pb.h"
 
 #if PB_PROTO_HEADER_VERSION != 40
 #error Regenerate this file with the current version of nanopb generator.
 #endif
 
+/* Enum definitions */
+typedef enum _AdminMessage_ConfigType { 
+    AdminMessage_ConfigType_DEVICE_CONFIG = 0, 
+    AdminMessage_ConfigType_POSITION_CONFIG = 1, 
+    AdminMessage_ConfigType_POWER_CONFIG = 2, 
+    AdminMessage_ConfigType_WIFI_CONFIG = 3, 
+    AdminMessage_ConfigType_DISPLAY_CONFIG = 4, 
+    AdminMessage_ConfigType_LORA_CONFIG = 5 
+} AdminMessage_ConfigType;
+
+typedef enum _AdminMessage_ModuleConfigType { 
+    AdminMessage_ModuleConfigType_MQTT_CONFIG = 0, 
+    AdminMessage_ModuleConfigType_SERIAL_CONFIG = 1, 
+    AdminMessage_ModuleConfigType_EXTNOTIF_CONFIG = 2, 
+    AdminMessage_ModuleConfigType_STOREFORWARD_CONFIG = 3, 
+    AdminMessage_ModuleConfigType_RANGETEST_CONFIG = 4, 
+    AdminMessage_ModuleConfigType_TELEMETRY_CONFIG = 5, 
+    AdminMessage_ModuleConfigType_CANNEDMSG_CONFIG = 6 
+} AdminMessage_ModuleConfigType;
+
 /* Struct definitions */
 /* This message is handled by the Admin module and is responsible for all settings/channel read/write operations.
  This message is used to do settings operations to both remote AND local nodes.
  (Prior to 1.2 these operations were done via special ToRadio operations) */
 typedef struct _AdminMessage { 
-    /* Set the radio provisioning for this node */
     pb_size_t which_variant;
     union {
-        RadioConfig set_radio;
+        /* Set the owner for this node */
         User set_owner;
+        /* Set channels (using the new API).
+     A special channel is the "primary channel".
+     The other records are secondary channels.
+     Note: only one channel can be marked as primary.
+     If the client sets a particular channel to be primary, the previous channel will be set to SECONDARY automatically. */
         Channel set_channel;
-        bool get_radio_request;
-        RadioConfig get_radio_response;
+        /* Send the specified channel in the response to this message
+     NOTE: This field is sent with the channel index + 1 (to ensure we never try to send 'zero' - which protobufs treats as not present) */
         uint32_t get_channel_request;
+        /* TODO: REPLACE */
         Channel get_channel_response;
+        /* Send the current owner data in the response to this message. */
         bool get_owner_request;
+        /* TODO: REPLACE */
         User get_owner_response;
+        /* Ask for the following config data to be sent */
+        AdminMessage_ConfigType get_config_request;
+        /* Send the current Config in the response to this message. */
+        Config get_config_response;
+        /* Set the current Config */
+        Config set_config;
+        /* Sent immediatly after a config change has been sent to ensure comms, if this is not recieved, the config will be reverted after 10 mins */
+        bool confirm_set_config;
+        /* Ask for the following config data to be sent */
+        AdminMessage_ModuleConfigType get_module_config_request;
+        /* Send the current Config in the response to this message. */
+        ModuleConfig get_module_config_response;
+        /* Set the current Config */
+        ModuleConfig set_module_config;
+        /* Sent immediatly after a config change has been sent to ensure comms, if this is not recieved, the config will be reverted after 10 mins */
+        bool confirm_set_module_config;
+        /* Setting channels/radio config remotely carries the risk that you might send an invalid config and the radio never talks to your mesh again.
+     Therefore if setting either of these properties remotely, you must send a confirm_xxx message within 10 minutes.
+     If you fail to do so, the radio will assume loss of comms and revert your changes.
+     These messages are optional when changing the local node. */
         bool confirm_set_channel;
+        /* TODO: REPLACE */
         bool confirm_set_radio;
+        /* This message is only supported for the simulator porduino build.
+     If received the simulator will exit successfully. */
         bool exit_simulator;
+        /* Tell the node to reboot in this many seconds (or <0 to cancel reboot) */
         int32_t reboot_seconds;
+        /* Get the Canned Message Module message part1 in the response to this message. */
         bool get_canned_message_module_part1_request;
+        /* TODO: REPLACE */
         char get_canned_message_module_part1_response[201];
+        /* Get the Canned Message Module message part2 in the response to this message. */
         bool get_canned_message_module_part2_request;
+        /* TODO: REPLACE */
         char get_canned_message_module_part2_response[201];
+        /* Get the Canned Message Module message part3 in the response to this message. */
         bool get_canned_message_module_part3_request;
+        /* TODO: REPLACE */
         char get_canned_message_module_part3_response[201];
+        /* Get the Canned Message Module message part4 in the response to this message. */
         bool get_canned_message_module_part4_request;
+        /* TODO: REPLACE */
         char get_canned_message_module_part4_response[201];
+        /* Set the canned message module part 1 text. */
         char set_canned_message_module_part1[201];
+        /* Set the canned message module part 2 text. */
         char set_canned_message_module_part2[201];
+        /* Set the canned message module part 3 text. */
         char set_canned_message_module_part3[201];
+        /* Set the canned message module part 4 text. */
         char set_canned_message_module_part4[201];
+        /* Tell the node to shutdown in this many seconds (or <0 to cancel shutdown) */
         int32_t shutdown_seconds;
-    }; 
+    };
 } AdminMessage;
 
 
+/* Helper constants for enums */
+#define _AdminMessage_ConfigType_MIN AdminMessage_ConfigType_DEVICE_CONFIG
+#define _AdminMessage_ConfigType_MAX AdminMessage_ConfigType_LORA_CONFIG
+#define _AdminMessage_ConfigType_ARRAYSIZE ((AdminMessage_ConfigType)(AdminMessage_ConfigType_LORA_CONFIG+1))
+
+#define _AdminMessage_ModuleConfigType_MIN AdminMessage_ModuleConfigType_MQTT_CONFIG
+#define _AdminMessage_ModuleConfigType_MAX AdminMessage_ModuleConfigType_CANNEDMSG_CONFIG
+#define _AdminMessage_ModuleConfigType_ARRAYSIZE ((AdminMessage_ModuleConfigType)(AdminMessage_ModuleConfigType_CANNEDMSG_CONFIG+1))
+
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /* Initializer values for message structs */
-#define AdminMessage_init_default                {0, {RadioConfig_init_default}}
-#define AdminMessage_init_zero                   {0, {RadioConfig_init_zero}}
+#define AdminMessage_init_default                {0, {User_init_default}}
+#define AdminMessage_init_zero                   {0, {User_init_zero}}
 
 /* Field tags (for use in manual encoding/decoding) */
-#define AdminMessage_set_radio_tag               1
 #define AdminMessage_set_owner_tag               2
 #define AdminMessage_set_channel_tag             3
-#define AdminMessage_get_radio_request_tag       4
-#define AdminMessage_get_radio_response_tag      5
 #define AdminMessage_get_channel_request_tag     6
 #define AdminMessage_get_channel_response_tag    7
 #define AdminMessage_get_owner_request_tag       8
 #define AdminMessage_get_owner_response_tag      9
+#define AdminMessage_get_config_request_tag      10
+#define AdminMessage_get_config_response_tag     11
+#define AdminMessage_set_config_tag              12
+#define AdminMessage_confirm_set_config_tag      13
+#define AdminMessage_get_module_config_request_tag 14
+#define AdminMessage_get_module_config_response_tag 15
+#define AdminMessage_set_module_config_tag       16
+#define AdminMessage_confirm_set_module_config_tag 17
 #define AdminMessage_confirm_set_channel_tag     32
 #define AdminMessage_confirm_set_radio_tag       33
 #define AdminMessage_exit_simulator_tag          34
@@ -88,15 +168,20 @@ extern "C" {
 
 /* Struct field encoding specification for nanopb */
 #define AdminMessage_FIELDLIST(X, a) \
-X(a, STATIC,   ONEOF,    MESSAGE,  (variant,set_radio,set_radio),   1) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (variant,set_owner,set_owner),   2) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (variant,set_channel,set_channel),   3) \
-X(a, STATIC,   ONEOF,    BOOL,     (variant,get_radio_request,get_radio_request),   4) \
-X(a, STATIC,   ONEOF,    MESSAGE,  (variant,get_radio_response,get_radio_response),   5) \
 X(a, STATIC,   ONEOF,    UINT32,   (variant,get_channel_request,get_channel_request),   6) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (variant,get_channel_response,get_channel_response),   7) \
 X(a, STATIC,   ONEOF,    BOOL,     (variant,get_owner_request,get_owner_request),   8) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (variant,get_owner_response,get_owner_response),   9) \
+X(a, STATIC,   ONEOF,    UENUM,    (variant,get_config_request,get_config_request),  10) \
+X(a, STATIC,   ONEOF,    MESSAGE,  (variant,get_config_response,get_config_response),  11) \
+X(a, STATIC,   ONEOF,    MESSAGE,  (variant,set_config,set_config),  12) \
+X(a, STATIC,   ONEOF,    BOOL,     (variant,confirm_set_config,confirm_set_config),  13) \
+X(a, STATIC,   ONEOF,    UENUM,    (variant,get_module_config_request,get_module_config_request),  14) \
+X(a, STATIC,   ONEOF,    MESSAGE,  (variant,get_module_config_response,get_module_config_response),  15) \
+X(a, STATIC,   ONEOF,    MESSAGE,  (variant,set_module_config,set_module_config),  16) \
+X(a, STATIC,   ONEOF,    BOOL,     (variant,confirm_set_module_config,confirm_set_module_config),  17) \
 X(a, STATIC,   ONEOF,    BOOL,     (variant,confirm_set_channel,confirm_set_channel),  32) \
 X(a, STATIC,   ONEOF,    BOOL,     (variant,confirm_set_radio,confirm_set_radio),  33) \
 X(a, STATIC,   ONEOF,    BOOL,     (variant,exit_simulator,exit_simulator),  34) \
@@ -116,12 +201,14 @@ X(a, STATIC,   ONEOF,    STRING,   (variant,set_canned_message_module_part4,set_
 X(a, STATIC,   ONEOF,    INT32,    (variant,shutdown_seconds,shutdown_seconds),  51)
 #define AdminMessage_CALLBACK NULL
 #define AdminMessage_DEFAULT NULL
-#define AdminMessage_variant_set_radio_MSGTYPE RadioConfig
 #define AdminMessage_variant_set_owner_MSGTYPE User
 #define AdminMessage_variant_set_channel_MSGTYPE Channel
-#define AdminMessage_variant_get_radio_response_MSGTYPE RadioConfig
 #define AdminMessage_variant_get_channel_response_MSGTYPE Channel
 #define AdminMessage_variant_get_owner_response_MSGTYPE User
+#define AdminMessage_variant_get_config_response_MSGTYPE Config
+#define AdminMessage_variant_set_config_MSGTYPE Config
+#define AdminMessage_variant_get_module_config_response_MSGTYPE ModuleConfig
+#define AdminMessage_variant_set_module_config_MSGTYPE ModuleConfig
 
 extern const pb_msgdesc_t AdminMessage_msg;
 
@@ -129,7 +216,7 @@ extern const pb_msgdesc_t AdminMessage_msg;
 #define AdminMessage_fields &AdminMessage_msg
 
 /* Maximum encoded size of messages (where known) */
-#define AdminMessage_size                        598
+#define AdminMessage_size                        204
 
 #ifdef __cplusplus
 } /* extern "C" */

src/mesh/generated/apponly.pb.c

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

src/mesh/generated/apponly.pb.h

@@ -1,10 +1,11 @@
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.4.5 */
+/* Generated by nanopb-0.4.6 */
 
 #ifndef PB_APPONLY_PB_H_INCLUDED
 #define PB_APPONLY_PB_H_INCLUDED
 #include <pb.h>
 #include "channel.pb.h"
+#include "config.pb.h"
 
 #if PB_PROTO_HEADER_VERSION != 40
 #error Regenerate this file with the current version of nanopb generator.
@@ -17,8 +18,12 @@
  No DISABLED channels are included.
  This abstraction is used only on the the 'app side' of the world (ie python, javascript and android etc) to show a group of Channels as a (long) URL */
 typedef struct _ChannelSet { 
-    /* TODO: REPLACE */
-    pb_callback_t settings; 
+    /* Channel list with settings */
+    pb_size_t settings_count;
+    ChannelSettings settings[8];
+    /* LoRa config */
+    bool has_lora_config;
+    Config_LoRaConfig lora_config;
 } ChannelSet;
 
 
@@ -27,18 +32,21 @@ extern "C" {
 #endif
 
 /* Initializer values for message structs */
-#define ChannelSet_init_default                  {{{NULL}, NULL}}
-#define ChannelSet_init_zero                     {{{NULL}, NULL}}
+#define ChannelSet_init_default                  {0, {ChannelSettings_init_default, ChannelSettings_init_default, ChannelSettings_init_default, ChannelSettings_init_default, ChannelSettings_init_default, ChannelSettings_init_default, ChannelSettings_init_default, ChannelSettings_init_default}, false, Config_LoRaConfig_init_default}
+#define ChannelSet_init_zero                     {0, {ChannelSettings_init_zero, ChannelSettings_init_zero, ChannelSettings_init_zero, ChannelSettings_init_zero, ChannelSettings_init_zero, ChannelSettings_init_zero, ChannelSettings_init_zero, ChannelSettings_init_zero}, false, Config_LoRaConfig_init_zero}
 
 /* Field tags (for use in manual encoding/decoding) */
 #define ChannelSet_settings_tag                  1
+#define ChannelSet_lora_config_tag               2
 
 /* Struct field encoding specification for nanopb */
 #define ChannelSet_FIELDLIST(X, a) \
-X(a, CALLBACK, REPEATED, MESSAGE,  settings,          1)
-#define ChannelSet_CALLBACK pb_default_field_callback
+X(a, STATIC,   REPEATED, MESSAGE,  settings,          1) \
+X(a, STATIC,   OPTIONAL, MESSAGE,  lora_config,       2)
+#define ChannelSet_CALLBACK NULL
 #define ChannelSet_DEFAULT NULL
 #define ChannelSet_settings_MSGTYPE ChannelSettings
+#define ChannelSet_lora_config_MSGTYPE Config_LoRaConfig
 
 extern const pb_msgdesc_t ChannelSet_msg;
 
@@ -46,7 +54,7 @@ extern const pb_msgdesc_t ChannelSet_msg;
 #define ChannelSet_fields &ChannelSet_msg
 
 /* Maximum encoded size of messages (where known) */
-/* ChannelSet_size depends on runtime parameters */
+#define ChannelSet_size                          573
 
 #ifdef __cplusplus
 } /* extern "C" */

src/mesh/generated/cannedmessages.pb.c

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.4.5 */
+/* Generated by nanopb-0.4.6 */
 
 #include "cannedmessages.pb.h"
 #if PB_PROTO_HEADER_VERSION != 40

src/mesh/generated/cannedmessages.pb.h

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.4.5 */
+/* Generated by nanopb-0.4.6 */
 
 #ifndef PB_CANNEDMESSAGES_PB_H_INCLUDED
 #define PB_CANNEDMESSAGES_PB_H_INCLUDED
@@ -13,13 +13,13 @@
 /* Canned message module configuration. */
 typedef struct _CannedMessageModuleConfig { 
     /* Predefined messages for canned message module separated by '|' characters. */
-    char messagesPart1[201]; 
+    char messagesPart1[201];
     /* TODO: REPLACE */
-    char messagesPart2[201]; 
+    char messagesPart2[201];
     /* TODO: REPLACE */
-    char messagesPart3[201]; 
+    char messagesPart3[201];
     /* TODO: REPLACE */
-    char messagesPart4[201]; 
+    char messagesPart4[201];
 } CannedMessageModuleConfig;
 
 

src/mesh/generated/channel.pb.c

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.4.5 */
+/* Generated by nanopb-0.4.6 */
 
 #include "channel.pb.h"
 #if PB_PROTO_HEADER_VERSION != 40
@@ -14,4 +14,3 @@ PB_BIND(Channel, Channel, AUTO)
 
 
 
-

src/mesh/generated/channel.pb.h

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.4.5 */
+/* Generated by nanopb-0.4.6 */
 
 #ifndef PB_CHANNEL_PB_H_INCLUDED
 #define PB_CHANNEL_PB_H_INCLUDED
@@ -10,16 +10,6 @@
 #endif
 
 /* Enum definitions */
-typedef enum _ChannelSettings_ModemConfig { 
-    ChannelSettings_ModemConfig_VLongSlow = 0, 
-    ChannelSettings_ModemConfig_LongSlow = 1, 
-    ChannelSettings_ModemConfig_LongFast = 2, 
-    ChannelSettings_ModemConfig_MidSlow = 3, 
-    ChannelSettings_ModemConfig_MidFast = 4, 
-    ChannelSettings_ModemConfig_ShortSlow = 5, 
-    ChannelSettings_ModemConfig_ShortFast = 6 
-} ChannelSettings_ModemConfig;
-
 typedef enum _Channel_Role { 
     Channel_Role_DISABLED = 0, 
     Channel_Role_PRIMARY = 1, 
@@ -48,28 +38,26 @@ typedef PB_BYTES_ARRAY_T(32) ChannelSettings_psk_t;
  FIXME: explain how apps use channels for security.
  explain how remote settings and remote gpio are managed as an example */
 typedef struct _ChannelSettings { 
-    /* If zero then, use default max legal continuous power (ie. something that won't
- burn out the radio hardware)
- In most cases you should use zero here.
- Units are in dBm. */
-    int8_t tx_power; 
-    /* Note: This is the 'old' mechanism for specifying channel parameters.
- Either modem_config or bandwidth/spreading/coding will be specified - NOT BOTH.
- As a heuristic: If bandwidth is specified, do not use modem_config.
- Because protobufs take ZERO space when the value is zero this works out nicely.
- This value is replaced by bandwidth/spread_factor/coding_rate.
- If you'd like to experiment with other options add them to MeshRadio.cpp in the device code. */
-    ChannelSettings_ModemConfig modem_config; 
-    /* Bandwidth in MHz
- Certain bandwidth numbers are 'special' and will be converted to the
- appropriate floating point value: 31 -> 31.25MHz */
-    ChannelSettings_psk_t psk; 
-    /* A number from 7 to 12.
- Indicates number of chirps per symbol as 1<<spread_factor. */
-    char name[12]; 
-    /* The denominator of the coding rate.
- ie for 4/8, the value is 8. 5/8 the value is 5. */
-    uint16_t bandwidth; 
+    /* A simple pre-shared key for now for crypto.
+ Must be either 0 bytes (no crypto), 16 bytes (AES128), or 32 bytes (AES256).
+ A special shorthand is used for 1 byte long psks.
+ These psks should be treated as only minimally secure,
+ because they are listed in this source code.
+ Those bytes are mapped using the following scheme:
+ `0` = No crypto
+ `1` = The special "default" channel key: {0xd4, 0xf1, 0xbb, 0x3a, 0x20, 0x29, 0x07, 0x59, 0xf0, 0xbc, 0xff, 0xab, 0xcf, 0x4e, 0x69, 0xbf}
+ `2` through 10 = The default channel key, except with 1 through 9 added to the last byte.
+ Shown to user as simple1 through 10 */
+    ChannelSettings_psk_t psk;
+    /* A SHORT name that will be packed into the URL.
+ Less than 12 bytes.
+ Something for end users to call the channel
+ If this is the empty string it is assumed that this channel
+ is the special (minimally secure) "Default"channel.
+ In user interfaces it should be rendered as a local language translation of "X".
+ For channel_num hashing empty string will be treated as "X".
+ Where "X" is selected based on the English words listed above for ModemPreset */
+    char name[12];
     /* NOTE: this field is _independent_ and unrelated to the concepts in channel.proto.
  this is controlling the actual hardware frequency the radio is transmitting on.
  In a perfect world we would have called it something else (band?) but I forgot to make this change during the big 1.2 renaming.
@@ -88,27 +76,7 @@ typedef struct _ChannelSettings {
      hash = ((hash << 5) + hash) + (unsigned char) c;
    return hash;
  } */
-    uint32_t spread_factor; 
-    /* A simple pre-shared key for now for crypto.
- Must be either 0 bytes (no crypto), 16 bytes (AES128), or 32 bytes (AES256).
- A special shorthand is used for 1 byte long psks.
- These psks should be treated as only minimally secure,
- because they are listed in this source code.
- Those bytes are mapped using the following scheme:
- `0` = No crypto
- `1` = The special "default" channel key: {0xd4, 0xf1, 0xbb, 0x3a, 0x20, 0x29, 0x07, 0x59, 0xf0, 0xbc, 0xff, 0xab, 0xcf, 0x4e, 0x69, 0xbf}
- `2` through 10 = The default channel key, except with 1 through 9 added to the last byte.
- Shown to user as simple1 through 10 */
-    uint8_t coding_rate; 
-    /* A SHORT name that will be packed into the URL.
- Less than 12 bytes.
- Something for end users to call the channel
- If this is the empty string it is assumed that this channel
- is the special (minimally secure) "Default"channel.
- In user interfaces it should be rendered as a local language translation of "X".
- For channel_num hashing empty string will be treated as "X".
- Where "X" is selected based on the English words listed above for ModemConfig */
-    uint8_t channel_num; 
+    uint8_t channel_num;
     /* Used to construct a globally unique channel ID.
  The full globally unique ID will be: "name.id" where ID is shown as base36.
  Assuming that the number of meshtastic users is below 20K (true for a long time)
@@ -120,11 +88,11 @@ typedef struct _ChannelSettings {
  Those channels do not have a numeric id included in the settings, but instead it is pulled from
  a table of well known IDs.
  (see Well Known Channels FIXME) */
-    uint32_t id; 
+    uint32_t id;
     /* If true, messages on the mesh will be sent to the *public* internet by any gateway ndoe */
-    bool uplink_enabled; 
+    bool uplink_enabled;
     /* If true, messages seen on the internet will be forwarded to the local mesh. */
-    bool downlink_enabled; 
+    bool downlink_enabled;
 } ChannelSettings;
 
 /* A pair of a channel number, mode and the (sharable) settings for that channel */
@@ -132,20 +100,16 @@ typedef struct _Channel {
     /* The index of this channel in the channel table (from 0 to MAX_NUM_CHANNELS-1)
  (Someday - not currently implemented) An index of -1 could be used to mean "set by name",
  in which case the target node will find and set the channel by settings.name. */
-    int8_t index; 
+    int8_t index;
     /* The new settings, or NULL to disable that channel */
     bool has_settings;
-    ChannelSettings settings; 
+    ChannelSettings settings;
     /* TODO: REPLACE */
-    Channel_Role role; 
+    Channel_Role role;
 } Channel;
 
 
 /* Helper constants for enums */
-#define _ChannelSettings_ModemConfig_MIN ChannelSettings_ModemConfig_VLongSlow
-#define _ChannelSettings_ModemConfig_MAX ChannelSettings_ModemConfig_ShortFast
-#define _ChannelSettings_ModemConfig_ARRAYSIZE ((ChannelSettings_ModemConfig)(ChannelSettings_ModemConfig_ShortFast+1))
-
 #define _Channel_Role_MIN Channel_Role_DISABLED
 #define _Channel_Role_MAX Channel_Role_SECONDARY
 #define _Channel_Role_ARRAYSIZE ((Channel_Role)(Channel_Role_SECONDARY+1))
@@ -156,19 +120,14 @@ extern "C" {
 #endif
 
 /* Initializer values for message structs */
-#define ChannelSettings_init_default             {0, _ChannelSettings_ModemConfig_MIN, {0, {0}}, "", 0, 0, 0, 0, 0, 0, 0}
+#define ChannelSettings_init_default             {{0, {0}}, "", 0, 0, 0, 0}
 #define Channel_init_default                     {0, false, ChannelSettings_init_default, _Channel_Role_MIN}
-#define ChannelSettings_init_zero                {0, _ChannelSettings_ModemConfig_MIN, {0, {0}}, "", 0, 0, 0, 0, 0, 0, 0}
+#define ChannelSettings_init_zero                {{0, {0}}, "", 0, 0, 0, 0}
 #define Channel_init_zero                        {0, false, ChannelSettings_init_zero, _Channel_Role_MIN}
 
 /* Field tags (for use in manual encoding/decoding) */
-#define ChannelSettings_tx_power_tag             1
-#define ChannelSettings_modem_config_tag         3
 #define ChannelSettings_psk_tag                  4
 #define ChannelSettings_name_tag                 5
-#define ChannelSettings_bandwidth_tag            6
-#define ChannelSettings_spread_factor_tag        7
-#define ChannelSettings_coding_rate_tag          8
 #define ChannelSettings_channel_num_tag          9
 #define ChannelSettings_id_tag                   10
 #define ChannelSettings_uplink_enabled_tag       16
@@ -179,13 +138,8 @@ extern "C" {
 
 /* Struct field encoding specification for nanopb */
 #define ChannelSettings_FIELDLIST(X, a) \
-X(a, STATIC,   SINGULAR, INT32,    tx_power,          1) \
-X(a, STATIC,   SINGULAR, UENUM,    modem_config,      3) \
 X(a, STATIC,   SINGULAR, BYTES,    psk,               4) \
 X(a, STATIC,   SINGULAR, STRING,   name,              5) \
-X(a, STATIC,   SINGULAR, UINT32,   bandwidth,         6) \
-X(a, STATIC,   SINGULAR, UINT32,   spread_factor,     7) \
-X(a, STATIC,   SINGULAR, UINT32,   coding_rate,       8) \
 X(a, STATIC,   SINGULAR, UINT32,   channel_num,       9) \
 X(a, STATIC,   SINGULAR, FIXED32,  id,               10) \
 X(a, STATIC,   SINGULAR, BOOL,     uplink_enabled,   16) \
@@ -209,8 +163,8 @@ extern const pb_msgdesc_t Channel_msg;
 #define Channel_fields &Channel_msg
 
 /* Maximum encoded size of messages (where known) */
-#define ChannelSettings_size                     87
-#define Channel_size                             102
+#define ChannelSettings_size                     61
+#define Channel_size                             76
 
 #ifdef __cplusplus
 } /* extern "C" */