Update protobuf ref

2.0 (To be merged Nov 1) (#1870 )
* 2.0 * Catch the right version of the common files
2026-10-14 15:31:31 +10:00 · 2022-10-31 08:09:22 -05:00 · 2022-10-31 07:51:44 -05:00 · 2022-10-31 20:09:37 +11:00 · 2022-10-31 18:54:47 +10:00 · 2022-10-31 18:47:10 +10:00
120 changed files with 2283 additions and 818 deletions
@@ -33,6 +33,7 @@ jobs:
          - board: heltec-v2.1
          - board: tbeam0.7
          - board: meshtastic-diy-v1
+          - board: meshtastic-dr-dev
          - board: rak4631
          - board: rak4631_eink
          - board: t-echo
@@ -42,7 +43,7 @@ jobs:
          - board: m5stack-coreink
          - board: tbeam-s3-core
        # - board: pico
-          
+
    runs-on: ubuntu-latest
    steps:
      - name: Checkout code
@@ -57,12 +58,12 @@ jobs:
          sudo apt-get install -y cppcheck

      - name: Setup Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
        with:
          python-version: 3.x

      - name: Cache python libs
-        uses: actions/cache@v1
+        uses: actions/cache@v3
        id: cache-pip # needed in if test
        with:
          path: ~/.cache/pip
@@ -96,6 +97,7 @@ jobs:
          - board: heltec-v2.1
          - board: tbeam0.7
          - board: meshtastic-diy-v1
+          - board: meshtastic-dr-dev
          - board: nano-g1
          - board: station-g1
          - board: m5stack-core
@@ -112,12 +114,12 @@ jobs:
          repository: ${{github.event.pull_request.head.repo.full_name}}

      - name: Setup Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
        with:
          python-version: 3.x

      - name: Cache python libs
-        uses: actions/cache@v1
+        uses: actions/cache@v3
        id: cache-pip # needed in if test
        with:
          path: ~/.cache/pip
@@ -131,11 +133,11 @@ jobs:
      - name: Upgrade platformio
        run: |
          pio upgrade
-          
+
      - name: Pull web ui
        uses: dsaltares/fetch-gh-release-asset@master
        with:
-          repo: "meshtastic/meshtastic-web"
+          repo: "meshtastic/web"
          file: "build.tar"
          target: "build.tar"
          token: ${{ secrets.GITHUB_TOKEN }}
@@ -147,7 +149,7 @@ jobs:

      - name: Build ESP32
        run: bin/build-esp32.sh ${{ matrix.board }}
-         
+
      - name: Pull OTA Firmware
        uses: dsaltares/fetch-gh-release-asset@master
        with:
@@ -155,13 +157,13 @@ jobs:
          file: "firmware.bin"
          target: "release/bleota.bin"
          token: ${{ secrets.GITHUB_TOKEN }}
-          
+
      - name: Get release version string
-        run: echo "::set-output name=version::$(./bin/buildinfo.py long)"
+        run: echo "version=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
        id: version

      - name: Store binaries as an artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
        with:
          name: firmware-${{ matrix.board }}-${{ steps.version.outputs.version }}.zip
          path: |
@@ -190,12 +192,12 @@ jobs:
          repository: ${{github.event.pull_request.head.repo.full_name}}

      - name: Setup Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
        with:
          python-version: 3.x

      - name: Cache python libs
-        uses: actions/cache@v1
+        uses: actions/cache@v3
        id: cache-pip # needed in if test
        with:
          path: ~/.cache/pip
@@ -214,16 +216,17 @@ jobs:
        run: bin/build-nrf52.sh ${{ matrix.board }}

      - name: Get release version string
-        run: echo "::set-output name=version::$(./bin/buildinfo.py long)"
+        run: echo "version=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
        id: version

      - name: Store binaries as an artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
        with:
          name: firmware-${{ matrix.board }}-${{ steps.version.outputs.version }}.zip
          path: |
            release/*.uf2
            release/*.elf
+            release/*.zip
          retention-days: 90

  build-rpi2040:
@@ -244,12 +247,12 @@ jobs:
          repository: ${{github.event.pull_request.head.repo.full_name}}

      - name: Setup Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
        with:
          python-version: 3.x

      - name: Cache python libs
-        uses: actions/cache@v1
+        uses: actions/cache@v3
        id: cache-pip # needed in if test
        with:
          path: ~/.cache/pip
@@ -268,11 +271,11 @@ jobs:
        run: ./bin/build-rpi2040.sh ${{ matrix.board }}

      - name: Get release version string
-        run: echo "::set-output name=version::$(./bin/buildinfo.py long)"
+        run: echo "version=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
        id: version

      - name: Store binaries as an artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
        with:
          name: firmware-${{ matrix.board }}-${{ steps.version.outputs.version }}.zip
          path: |
@@ -291,12 +294,12 @@ jobs:
          repository: ${{github.event.pull_request.head.repo.full_name}}

      - name: Setup Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
        with:
          python-version: 3.x

      - name: Cache python libs
-        uses: actions/cache@v1
+        uses: actions/cache@v3
        id: cache-pip # needed in if test
        with:
          path: ~/.cache/pip
@@ -326,11 +329,11 @@ jobs:
        run: bin/build-native.sh

      - name: Get release version string
-        run: echo "::set-output name=version::$(./bin/buildinfo.py long)"
+        run: echo "version=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
        id: version

      - name: Store binaries as an artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
        with:
          name: firmware-native-${{ steps.version.outputs.version }}.zip
          path: |
@@ -359,30 +362,31 @@ jobs:
          ref: ${{github.event.pull_request.head.ref}}
          repository: ${{github.event.pull_request.head.repo.full_name}}

-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
        with:
          path: ./

      - name: Get release version string
-        run: echo "::set-output name=version::$(./bin/buildinfo.py long)"
+        run: echo "version=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
        id: version

      - name: Move files up
-        run: mv -b -t ./ ./*tbeam-1*/littlefs*.bin ./*tbeam-1*/bleota.bin ./**/firmware*.bin ./*t-echo*/Meshtastic_nRF52_factory_erase.uf2 ./**/firmware-*.uf2 ./**/*.elf ./**/meshtasticd_linux_amd64 ./*native*/*device-*.sh ./*native*/*device-*.bat
+        run: mv -b -t ./ ./*tbeam-2*/littlefs*.bin ./*tbeam-2*/bleota.bin ./**/firmware*.bin ./*t-echo*/Meshtastic_nRF52_factory_erase.uf2 ./**/firmware-*.uf2 ./**/firmware-*-ota.zip ./**/*.elf ./**/meshtasticd_linux_amd64 ./*native*/*device-*.sh ./*native*/*device-*.bat

      - name: Repackage in single firmware zip
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
        with:
          name: firmware-${{ steps.version.outputs.version }}
          path: |
            ./*.bin
            ./*.uf2
+            ./firmware-*-ota.zip
            ./meshtasticd_linux_amd64
            ./device-*.sh
            ./device-*.bat
          retention-days: 90

-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
        with:
          name: firmware-${{ steps.version.outputs.version }}
          path: ./output
@@ -390,7 +394,7 @@ jobs:
      # For diagnostics
      - name: Show artifacts
        run: ls -lR
-        
+
      - name: Device scripts permissions
        run: |
          chmod +x ./output/device-install.sh
@@ -400,7 +404,7 @@ jobs:
        run: zip -j -r ./firmware-${{ steps.version.outputs.version }}.zip ./output

      - name: Repackage in single elfs zip
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
        with:
          name: debug-elfs-${{ steps.version.outputs.version }}.zip
          path: ./*.elf
@@ -424,22 +428,22 @@ jobs:
    needs: [gather-artifacts, after-checks]
    steps:
      - name: Checkout
-        uses: actions/checkout@v2
-          
+        uses: actions/checkout@v3
+
      - name: Setup Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
        with:
          python-version: 3.x

      - name: Get release version string
-        run: echo "::set-output name=version::$(./bin/buildinfo.py long)"
+        run: echo "version=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
        id: version

-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
        with:
          name: firmware-${{ steps.version.outputs.version }}
          path: ./output
-      
+
      - name: Device scripts permissions
        run: |
          chmod +x ./output/device-install.sh
@@ -448,11 +452,11 @@ jobs:
      - name: Zip firmware
        run: zip -j -r ./firmware-${{ steps.version.outputs.version }}.zip ./output

-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
        with:
          name: debug-elfs-${{ steps.version.outputs.version }}.zip
          path: ./elfs
-      
+
      - name: Zip Elfs
        run: zip -j -r ./debug-elfs-${{ steps.version.outputs.version }}.zip ./elfs

@@ -466,7 +470,7 @@ jobs:
        with:
          draft: true
          prerelease: true
-          release_name: Meshtastic Device ${{ steps.version.outputs.version }} alpha - Public Preview
+          release_name: Meshtastic Device ${{ steps.version.outputs.version }} Alpha
          tag_name: v${{ steps.version.outputs.version }}
          body: |
            Autogenerated by github action, developer should edit as required before publishing...
@@ -496,10 +500,9 @@ jobs:
      - name: Bump version.properties
        run: >-
          bin/bump_version.py
-          
+
      - name: Create version.properties pull request
        uses: peter-evans/create-pull-request@v3
        with:
          add-paths: |
            version.properties
-
@@ -1,3 +1,3 @@
 [submodule "protobufs"]
 	path = protobufs
-	url = https://github.com/meshtastic/Meshtastic-protobufs.git
+	url = https://github.com/meshtastic/protobufs.git
@@ -1,8 +1,8 @@
 # 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)
+![GitHub release downloads](https://img.shields.io/github/downloads/meshtastic/firmware/total)
+[![CI](https://img.shields.io/github/workflow/status/meshtastic/firmware/CI?label=actions&logo=github&color=yellow)](https://github.com/meshtastic/firmware/actions/workflows/main_matrix.yml)
+[![CLA assistant](https://cla-assistant.io/readme/badge/meshtastic/firmware)](https://cla-assistant.io/meshtastic/firmware)
 [![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)

@@ -10,10 +10,9 @@

 This repository contains the device firmware for the Meshtastic project.

-
 **[Building Instructions](https://meshtastic.org/docs/developers/Firmware/build)**
 **[Flashing Instructions](https://meshtastic.org/docs/getting-started/flashing-firmware/)**

 ## Stats

-![Alt](https://repobeats.axiom.co/api/embed/99a2cf5622bb4807f9e8c3b86589f1133cce58a2.svg 'Repobeats analytics image')
+![Alt](https://repobeats.axiom.co/api/embed/a92f097d9197ae853e780ec53d7d126e545629ab.svg "Repobeats analytics image")
@@ -1,9 +1,9 @@
 ; Common settings for ESP targes, mixin with extends = esp32_base
 [esp32_base]
 extends = arduino_base
-platform = espressif32@^5.2.0
+platform = platformio/espressif32@^5.2.0
 build_src_filter = 
-  ${arduino_base.build_src_filter} -<platform/nrf52/> -<platform/stm32wl> -<platform/rp2040>
+  ${arduino_base.build_src_filter} -<platform/nrf52/> -<platform/stm32wl> -<platform/rp2040> -<mesh/eth/>
 upload_speed = 921600
 debug_init_break = tbreak setup
 monitor_filters = esp32_exception_decoder
@@ -33,8 +33,7 @@ lib_deps =
  ${environmental_base.lib_deps}
  https://github.com/meshtastic/esp32_https_server.git#657509856ce97e9dddeffb89a559f544faefd5cd
  h2zero/NimBLE-Arduino@^1.4.0
-  arduino-libraries/NTPClient@^3.1.0
-  https://github.com/lewisxhe/XPowersLib.git#84b7373faea3118b6c37954d52f98b8a337148d6
+   https://github.com/lewisxhe/XPowersLib.git#84b7373faea3118b6c37954d52f98b8a337148d6

 lib_ignore = 
  segger_rtt
@@ -1,8 +1,8 @@
 [esp32s3_base]
 extends = arduino_base
-platform = espressif32@^5.2.0
+platform = platformio/espressif32@^5.2.0
 build_src_filter = 
-  ${arduino_base.build_src_filter} -<platform/nrf52/> -<platform/stm32wl> -<platform/rp2040>
+  ${arduino_base.build_src_filter} -<platform/nrf52/> -<platform/stm32wl> -<platform/rp2040> -<mesh/eth/>
 upload_speed = 961200
 monitor_speed = 115200
 debug_init_break = tbreak setup
@@ -33,7 +33,6 @@ lib_deps =
  ${environmental_base.lib_deps}
  https://github.com/meshtastic/esp32_https_server.git#657509856ce97e9dddeffb89a559f544faefd5cd
  h2zero/NimBLE-Arduino@^1.4.0
-  arduino-libraries/NTPClient@^3.1.0
  https://github.com/lewisxhe/XPowersLib.git#84b7373faea3118b6c37954d52f98b8a337148d6

 lib_ignore = 
@@ -1,16 +1,14 @@
 [nrf52_base]
 ; Instead of the standard nordicnrf52 platform, we use our fork which has our added variant files
-; platform = nordicnrf52 ;pending https://github.com/platformio/builder-framework-arduino-nrf5/pull/7
-platform = https://github.com/meshtastic/platform-nordicnrf52.git#merge
+platform = platformio/nordicnrf52@^9.4.0

 extends = arduino_base
 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/platform/nrf52
 build_src_filter = 
-  ${arduino_base.build_src_filter} -<platform/esp32/> -<platform/stm32wl> -<nimble/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mqtt/> -<platform/rp2040>
+  ${arduino_base.build_src_filter} -<platform/esp32/> -<platform/stm32wl> -<nimble/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mqtt/> -<platform/rp2040> -<mesh/eth/>
 lib_ignore =
  BluetoothOTA
  
@@ -4,7 +4,7 @@ build_flags = ${nrf52_base.build_flags}
 lib_deps =
  ${arduino_base.lib_deps}
  ${environmental_base.lib_deps}
-  https://github.com/Kongduino/Adafruit_nRFCrypto.git#20fc7fdaf086bd70e901c007dd23c6e8856aec25
+  https://github.com/Kongduino/Adafruit_nRFCrypto.git#e31a8825ea3300b163a0a3c1ddd5de34e10e1371

 ; Note: By default no lora device is created for this build - it uses a simulated interface
 [env:nrf52840dk]
@@ -7,7 +7,8 @@ build_src_filter =
  -<platform/nrf52/> 
  -<platform/stm32wl/> 
  -<platform/rp2040>
-  -<mesh/http/> 
+  -<mesh/http/>
+  -<mesh/eth/>
  -<modules/esp32>
  -<modules/Telemetry>
  +<../variants/portduino>
@@ -1,6 +1,6 @@
 ; Common settings for rp2040 Processor based targets
 [rp2040_base]
-platform = https://github.com/maxgerhardt/platform-raspberrypi.git
+platform = https://github.com/maxgerhardt/platform-raspberrypi.git#5ce1a228e7cae453f366deb8962252b9b7356bbc
 extends = arduino_base
 board_build.core = earlephilhower
 board_build.filesystem_size = 0.5m
@@ -10,7 +10,7 @@ build_flags =
  -D__PLAT_RP2040__
 #  -D _POSIX_THREADS
 build_src_filter = 
-  ${arduino_base.build_src_filter} -<platform/esp32/> -<nimble/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mqtt/> -<platform/nrf52/> -<platform/stm32wl>
+  ${arduino_base.build_src_filter} -<platform/esp32/> -<nimble/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mqtt/> -<platform/nrf52/> -<platform/stm32wl> -<mesh/eth/>
 lib_ignore =
  BluetoothOTA
 lib_deps =
@@ -1,5 +1,5 @@
 [stm32wl5e_base]
-platform = ststm32
+platform = platformio/ststm32@^15.4.1
 board = generic_wl5e
 framework = arduino
 build_type = debug
@@ -10,7 +10,7 @@ build_flags =
 #  Arduino/PlatformIO framework-arduinoststm32 package does not presently have SUBGHZSPI support
 #  -DPIN_SPI_MOSI=PINSUBGHZSPIMOSI -DPIN_SPI_MISO=PINSUBGHZSPIMISO -DPIN_SPI_SCK=PINSUBGHZSPISCK
 build_src_filter = 
-  ${arduino_base.build_src_filter} -<platform/esp32/> -<nimble/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mqtt/> -<graphics> -<input> -<buzz> -<modules/Telemetry> -<platform/nrf52> -<platform/portduino> -<platform/rp2040>
+  ${arduino_base.build_src_filter} -<platform/esp32/> -<nimble/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mesh/eth/> -<mqtt/> -<graphics> -<input> -<buzz> -<modules/Telemetry> -<platform/nrf52> -<platform/portduino> -<platform/rp2040>
 lib_deps =
  ${env.lib_deps}
  https://github.com/kokke/tiny-AES-c.git#f06ac37fc31dfdaca2e0d9bec83f90d5663c319b
@@ -26,7 +26,9 @@ basename=firmware-$1-$VERSION

 pio run --environment $1 # -v
 SRCELF=.pio/build/$1/firmware.elf
+DFUPKG=.pio/build/$1/firmware.zip
 cp $SRCELF $OUTDIR/$basename.elf
+cp $DFUPKG $OUTDIR/$basename-ota.zip

 echo "Generating NRF52 uf2 file"
 SRCHEX=.pio/build/$1/firmware.hex
@@ -9,9 +9,6 @@ VERSION=`bin/buildinfo.py long`
 # Must have a V prefix to trigger github
 git tag "v${VERSION}"

-# Commented out per https://github.com/meshtastic/Meshtastic-device/issues/947
-#git push root "v${VERSION}" # push the tag
-
 git push origin "v${VERSION}" # push the tag

 echo "Tag ${VERSION} pushed to github, github actions should now be building the draft release.  If it seems good, click to publish it"
@@ -3,7 +3,7 @@
 set -e

 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 "firmware root directory if the following step fails, you should download the correct"
 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!
@@ -2,7 +2,8 @@
 ; https://docs.platformio.org/page/projectconf.html

 [platformio]
-default_envs = tbeam
+;default_envs = tbeam
+;default_envs = pico
 ;default_envs = tbeam-s3-core
 ;default_envs = tbeam0.7
 ;default_envs = heltec-v1
@@ -21,6 +22,7 @@ default_envs = tbeam
 ;default_envs = pca10059_diy_eink
 ;default_envs = meshtastic-diy-v1
 ;default_envs = meshtastic-diy-v1.1
+;default_envs = meshtastic-dr-dev
 ;default_envs = m5stack-coreink
 ;default_envs = rak4631

@@ -56,6 +58,9 @@ lib_deps =
 ; Used for the code analysis in PIO Home / Inspect
 check_tool = cppcheck
 check_skip_packages = yes
+check_flags =
+  --common-flag
+  cppcheck: --enable=--inline-suppr

 ; Common settings for conventional (non Portduino) Arduino targets
 [arduino_base]
@@ -64,6 +69,7 @@ lib_deps =
  ${env.lib_deps}
  ; Portduino is using meshtastic fork for now
  jgromes/RadioLib@5.4.1
+  https://github.com/meshtastic/SparkFun_ATECCX08a_Arduino_Library.git#52b5282639d08a8cbd4b748363089eed6102dc76

 build_flags = ${env.build_flags} -Os 
  -DRADIOLIB_SPI_PARANOID=0
@@ -74,6 +80,7 @@ build_src_filter = ${env.build_src_filter} -<platform/portduino/>
 [networking_base]
 lib_deps =
  knolleary/PubSubClient@^2.8
+  arduino-libraries/NTPClient@^3.1.0
  meshtastic/json11@^1.0.2

 ; Common libs for environmental measurements in telemetry module 
@@ -88,4 +95,5 @@ lib_deps =
  adafruit/Adafruit MCP9808 Library@^2.0.0
  adafruit/Adafruit INA260 Library@^1.5.0
  adafruit/Adafruit INA219@^1.2.0
-
+  adafruit/Adafruit SHTC3 Library@^1.0.0
+  adafruit/Adafruit LPS2X@^2.0.4
@@ -7,7 +7,7 @@ const uint8_t MESH_SERVICE_UUID_16[16u] = {0xfd, 0xea, 0x73, 0xe2, 0xca, 0x5d, 0
                                           0x1f, 0x46, 0xa8, 0x15, 0x18, 0xb2, 0xa1, 0x6b};
 const uint8_t TORADIO_UUID_16[16u] = {0xe7, 0x01, 0x44, 0x12, 0x66, 0x78, 0xdd, 0xa1,
                                      0xad, 0x4d, 0x9e, 0x12, 0xd2, 0x76, 0x5c, 0xf7};
-const uint8_t FROMRADIO_UUID_16[16u] = {0xd5, 0x54, 0xe4, 0xc5, 0x25, 0xc5, 0x31, 0xa5,
-                                        0x55, 0x4a, 0x02, 0xee, 0xc2, 0xbc, 0xa2, 0x8b};
+const uint8_t FROMRADIO_UUID_16[16u] = {0x02, 0x00, 0x12, 0xac, 0x42, 0x02, 0x78, 0xb8,
+                                        0xed, 0x11, 0x93, 0x49, 0x9e, 0xe6, 0x55, 0x2c};
 const uint8_t FROMNUM_UUID_16[16u] = {0x53, 0x44, 0xe3, 0x47, 0x75, 0xaa, 0x70, 0xa6,
                                      0x66, 0x4f, 0x00, 0xa8, 0x8c, 0xa1, 0x9d, 0xed};
@@ -9,7 +9,7 @@
 #define MESH_SERVICE_UUID "6ba1b218-15a8-461f-9fa8-5dcae273eafd"

 #define TORADIO_UUID "f75c76d2-129e-4dad-a1dd-7866124401e7"
-#define FROMRADIO_UUID "8ba2bcc2-ee02-4a55-a531-c525c5e454d5"
+#define FROMRADIO_UUID "2c55e69e-4993-11ed-b878-0242ac120002"
 #define FROMNUM_UUID "ed9da18c-a800-4f66-a670-aa7547e34453"

 // NRF52 wants these constants as byte arrays
@@ -159,21 +159,16 @@ class ButtonThread : public concurrency::OSThread

    static void userButtonDoublePressed()
    {
-#ifdef ARCH_ESP32
-        disablePin();
-#elif defined(USE_EINK)
+#if defined(USE_EINK) && defined(PIN_EINK_EN)
        digitalWrite(PIN_EINK_EN, digitalRead(PIN_EINK_EN) == LOW);
 #endif
    }

    static void userButtonMultiPressed()
    {
-#ifdef ARCH_ESP32
-        clearNVS();
-#endif
-#ifdef ARCH_NRF52
-        clearBonds();
-#endif
+        screen->print("Sent ad-hoc ping\n");
+        service.refreshMyNodeInfo();
+        service.sendNetworkPing(NODENUM_BROADCAST, true);
    }

    static void userButtonPressedLongStart()
@@ -233,11 +233,14 @@ bool Power::setup()

 void Power::shutdown()
 {
-
+    screen->setOn(false);
+#if defined(USE_EINK) && defined(PIN_EINK_EN)
+    digitalWrite(PIN_EINK_EN, LOW); //power off backlight first
+#endif

 #ifdef HAS_PMU
    DEBUG_MSG("Shutting down\n");
-    if(PMU){
+    if(PMU) {
        PMU->setChargingLedMode(XPOWERS_CHG_LED_OFF);
        PMU->shutdown();
    }
@@ -312,7 +315,7 @@ int32_t Power::runOnce()
 #ifdef HAS_PMU
    // WE no longer use the IRQ line to wake the CPU (due to false wakes from sleep), but we do poll
    // the IRQ status by reading the registers over I2C
-    if(PMU){
+    if(PMU) {

        PMU->getIrqStatus();

@@ -341,10 +344,11 @@ int32_t Power::runOnce()
        if (PMU->isBatRemoveIrq()) {
            DEBUG_MSG("Battery removed\n");
        }
-        if (PMU->isPekeyShortPressIrq()) {
-            DEBUG_MSG("PEK short button press\n");
-        }
        */
+        if (PMU->isPekeyLongPressIrq()) {
+            DEBUG_MSG("PEK long button press\n");
+            screen->setOn(false);
+        }

        PMU->clearIrqStatus();
    }
@@ -368,8 +372,21 @@ bool Power::axpChipInit()

 #ifdef HAS_PMU

+        TwoWire * w = NULL;
+
+    // Use macro to distinguish which wire is used by PMU
+#ifdef PMU_USE_WIRE1
+        w = &Wire1;
+#else
+        w = &Wire;
+#endif
+
+    /**
+     * It is not necessary to specify the wire pin, 
+     * just input the wire, because the wire has been initialized in main.cpp
+     */
    if (!PMU) {
-        PMU = new XPowersAXP2101(Wire, I2C_SDA, I2C_SCL);
+        PMU = new XPowersAXP2101(*w);
        if (!PMU->init()) {
            DEBUG_MSG("Warning: Failed to find AXP2101 power management\n");
            delete PMU;
@@ -380,7 +397,7 @@ bool Power::axpChipInit()
    }

    if (!PMU) {
-        PMU = new XPowersAXP192(Wire, I2C_SDA, I2C_SCL);
+        PMU = new XPowersAXP192(*w);
        if (!PMU->init()) {
            DEBUG_MSG("Warning: Failed to find AXP192 power management\n");
            delete PMU;
@@ -396,7 +413,9 @@ bool Power::axpChipInit()
        * In order not to affect other devices, if the initialization of the PMU fails, Wire needs to be re-initialized once, 
        * if there are multiple devices sharing the bus.
        * * */
-        Wire.begin(I2C_SDA, I2C_SCL);
+#ifndef PMU_USE_WIRE1
+        w->begin(I2C_SDA, I2C_SCL);
+#endif
        return false;
    }

@@ -436,7 +455,6 @@ bool Power::axpChipInit()
        // Set constant current charging current
        PMU->setChargerConstantCurr(XPOWERS_AXP192_CHG_CUR_450MA);

-    
    } else if (PMU->getChipModel() == XPOWERS_AXP2101) {

        // t-beam s3 core 
@@ -456,6 +474,23 @@ bool Power::axpChipInit()
        PMU->setPowerChannelVoltage(XPOWERS_DCDC3, 3300);
        PMU->enablePowerOutput(XPOWERS_DCDC3);

+        /**
+        * ALDO2 cannot be turned off. 
+        * It is a necessary condition for sensor communication. 
+        * It must be turned on to properly access the sensor and screen
+        * It is also responsible for the power supply of PCF8563
+        */
+        PMU->setPowerChannelVoltage(XPOWERS_ALDO2, 3300);
+        PMU->enablePowerOutput(XPOWERS_ALDO2);
+
+        // 6-axis , magnetometer ,bme280 , oled screen power channel 
+        PMU->setPowerChannelVoltage(XPOWERS_ALDO1, 3300);
+        PMU->enablePowerOutput(XPOWERS_ALDO1);
+
+        // sdcard power channle 
+        PMU->setPowerChannelVoltage(XPOWERS_BLDO1, 3300);
+        PMU->enablePowerOutput(XPOWERS_BLDO1);
+        
        // PMU->setPowerChannelVoltage(XPOWERS_DCDC4, 3300);
        // PMU->enablePowerOutput(XPOWERS_DCDC4);

@@ -337,7 +337,7 @@ void PowerFSM_setup()
 #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
+    // See: https://github.com/meshtastic/firmware/issues/1071
    if (isRouter || config.power.is_power_saving) {
        powerFSM.add_timed_transition(&stateNB, &stateLS, getConfiguredOrDefaultMs(config.power.min_wake_secs, default_min_wake_secs), NULL, "Min wake timeout");
        powerFSM.add_timed_transition(&stateDARK, &stateLS, getConfiguredOrDefaultMs(config.power.wait_bluetooth_secs, default_wait_bluetooth_secs), NULL, "Bluetooth timeout");
@@ -44,10 +44,15 @@ size_t RedirectablePrint::vprintf(const char *format, va_list arg)
    static char printBuf[160];

    va_copy(copy, arg);
-    int len = vsnprintf(printBuf, sizeof(printBuf), format, copy);
+    size_t len = vsnprintf(printBuf, sizeof(printBuf), format, copy);
    va_end(copy);

-    if (len < 0) return 0;
+    // If the resulting string is longer than sizeof(printBuf)-1 characters, the remaining characters are still counted for the return value
+
+    if (len > sizeof(printBuf) - 1) {
+        len = sizeof(printBuf) - 1;
+        printBuf[sizeof(printBuf) - 2] = '\n';
+    }

    len = Print::write(printBuf, len);
    return len;
@@ -103,4 +108,4 @@ size_t RedirectablePrint::logDebug(const char *format, ...)
    }

    return r;
-}
+}
@@ -1,5 +1,6 @@
 #include "buzz.h"
 #include "configuration.h"
+#include "NodeDB.h"

 #ifndef PIN_BUZZER

@@ -36,22 +37,25 @@ struct ToneDuration {
 #define NOTE_A3 220
 #define NOTE_AS3 233
 #define NOTE_B3 247
+#define NOTE_CS4 277

 const int DURATION_1_8 = 125;  // 1/8 note
 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];
+  if (config.network.eth_enabled != true) {
+    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();
+      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);
+      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);
+      // to distinguish the notes, set a minimum time between them.
+      delay(1.3 * tone_duration.duration_ms);
+    }
  }
 }

@@ -65,16 +69,17 @@ void playBeep() { tone(PIN_BUZZER, NOTE_B3, DURATION_1_4); }
 #endif

 void playStartMelody() {
-  ToneDuration melody[] = {{NOTE_B3, DURATION_1_4},
-                           {NOTE_B3, DURATION_1_8},
-                           {NOTE_B3, DURATION_1_8}};
+  ToneDuration melody[] = {{NOTE_FS3, DURATION_1_8},
+                           {NOTE_AS3, DURATION_1_8},
+                           {NOTE_CS4, DURATION_1_4}};
  playTones(melody, sizeof(melody) / sizeof(ToneDuration));
 }

+
 void playShutdownMelody() {
-  ToneDuration melody[] = {{NOTE_B3, DURATION_1_4},
-                           {NOTE_G3, DURATION_1_8},
-                           {NOTE_D3, DURATION_1_8}};
+  ToneDuration melody[] = {{NOTE_CS4, DURATION_1_8},
+                           {NOTE_AS3, DURATION_1_8},
+                           {NOTE_FS3, DURATION_1_4}};
  playTones(melody, sizeof(melody) / sizeof(ToneDuration));
 }
 #endif
@@ -108,6 +108,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MCP9808_ADDR 0x18
 #define INA_ADDR 0x40
 #define INA_ADDR_ALTERNATE 0x41
+#define QMC6310_ADDR 0x1C
+#define QMI8658_ADDR 0x6B
+#define SHTC3_ADDR 0x70
+#define LPS22HB_ADDR 0x5C
+#define LPS22HB_ADDR_ALT 0x5D
+
+// -----------------------------------------------------------------------------
+// Security
+// -----------------------------------------------------------------------------
+
+#define ATECC608B_ADDR 0x35

 // -----------------------------------------------------------------------------
 // GPS
@@ -131,6 +142,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef HAS_WIFI
    #define HAS_WIFI 0
 #endif
+#ifndef HAS_ETHERNET
+    #define HAS_ETHERNET 0
+#endif
 #ifndef HAS_SCREEN
    #define HAS_SCREEN 0
 #endif
@@ -152,6 +166,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef HAS_RTC
    #define HAS_RTC 0
 #endif
+#ifndef HAS_CPU_SHUTDOWN
+    #define HAS_CPU_SHUTDOWN 0
+#endif
+#ifndef HAS_BLUETOOTH
+    #define HAS_BLUETOOTH 0
+#endif

 #include "RF95Configuration.h"
 #include "DebugConfiguration.h"
@@ -9,6 +9,41 @@
 #endif

 #if HAS_WIRE
+
+void printATECCInfo()
+{
+#ifndef ARCH_PORTDUINO
+    atecc.readConfigZone(false);
+
+    DEBUG_MSG("ATECC608B Serial Number: ");
+    for (int i = 0 ; i < 9 ; i++) {
+        DEBUG_MSG("%02x",atecc.serialNumber[i]);
+    }
+
+    DEBUG_MSG(", Rev Number: ");
+    for (int i = 0 ; i < 4 ; i++) {
+        DEBUG_MSG("%02x",atecc.revisionNumber[i]);
+    }
+    DEBUG_MSG("\n");
+
+    DEBUG_MSG("ATECC608B Config %s",atecc.configLockStatus ? "Locked" : "Unlocked");
+    DEBUG_MSG(", Data %s",atecc.dataOTPLockStatus ? "Locked" : "Unlocked");
+    DEBUG_MSG(", Slot 0 %s\n",atecc.slot0LockStatus ? "Locked" : "Unlocked");
+
+    if (atecc.configLockStatus && atecc.dataOTPLockStatus && atecc.slot0LockStatus) {
+        if (atecc.generatePublicKey() == false) {
+            DEBUG_MSG("ATECC608B Error generating public key\n");
+        } else {
+            DEBUG_MSG("ATECC608B Public Key: ");
+            for (int i = 0 ; i < 64 ; i++) {
+                DEBUG_MSG("%02x",atecc.publicKey64Bytes[i]);
+            }
+            DEBUG_MSG("\n");
+        }
+    }
+#endif
+}
+
 uint16_t getRegisterValue(uint8_t address, uint8_t reg, uint8_t length) {
    uint16_t value = 0x00;
    Wire.beginTransmission(address);
@@ -79,6 +114,17 @@ void scanI2Cdevice(void)
                    DEBUG_MSG("unknown display found\n");
                }
            }
+#ifndef ARCH_PORTDUINO
+            if (addr == ATECC608B_ADDR){
+                keystore_found = addr;
+                if (atecc.begin(keystore_found) == true) {
+                    DEBUG_MSG("ATECC608B initialized\n");
+                } else {
+                    DEBUG_MSG("ATECC608B initialization failed\n");
+                }
+                printATECCInfo();
+            }
+#endif
 #ifdef RV3028_RTC
            if (addr == RV3028_RTC){
                rtc_found = addr;
@@ -145,6 +191,22 @@ void scanI2Cdevice(void)
            nodeTelemetrySensorsMap[TelemetrySensorType_MCP9808] = addr;
            DEBUG_MSG("MCP9808 sensor found at address 0x%x\n", (uint8_t)addr);
        }
+        if (addr == QMC6310_ADDR) {
+            DEBUG_MSG("QMC6310 3-Axis magnetic sensor found at address 0x%x\n", (uint8_t)addr);
+            nodeTelemetrySensorsMap[TelemetrySensorType_QMC6310] = addr;
+        }
+        if (addr == QMI8658_ADDR) {
+            DEBUG_MSG("QMI8658 6-Axis inertial measurement sensor found at address 0x%x\n", (uint8_t)addr);
+            nodeTelemetrySensorsMap[TelemetrySensorType_QMI8658] = addr;
+        }
+        if (addr == SHTC3_ADDR) {
+            DEBUG_MSG("SHTC3 sensor found at address 0x%x\n", (uint8_t)addr);
+            nodeTelemetrySensorsMap[TelemetrySensorType_SHTC3] = addr;
+        }
+        if (addr == LPS22HB_ADDR || addr == LPS22HB_ADDR_ALT) {
+            DEBUG_MSG("LPS22HB sensor found at address 0x%x\n", (uint8_t)addr);
+            nodeTelemetrySensorsMap[TelemetrySensorType_LPS22] = addr;
+        }
        } else if (err == 4) {
            DEBUG_MSG("Unknow error at address 0x%x\n", addr);
        }
@@ -0,0 +1,76 @@
+#include "NMEAWPL.h"
+
+/* -------------------------------------------
+ *        1       2 3        4 5    6
+ *        |       | |        | |    |
+ * $--WPL,llll.ll,a,yyyyy.yy,a,c--c*hh<CR><LF>
+ *
+ * Field Number:
+ * 1 Latitude
+ * 2 N or S (North or South)
+ * 3 Longitude
+ * 4 E or W (East or West)
+ * 5 Waypoint name
+ * 6 Checksum
+ * -------------------------------------------
+ */
+
+uint printWPL(char *buf, const Position &pos, const char *name)
+{
+    uint len = sprintf(buf, "$GNWPL,%07.2f,%c,%08.2f,%c,%s", pos.latitude_i * 1e-5, pos.latitude_i < 0 ? 'S' : 'N', pos.longitude_i * 1e-5, pos.longitude_i < 0 ? 'W' : 'E', name);
+    uint chk = 0;
+    for (uint i = 1; i < len; i++) {
+        chk ^= buf[i];
+    }
+    len += sprintf(buf + len, "*%02X\r\n", chk);
+    return len;
+}
+
+/* -------------------------------------------
+ *        1         2       3 4       5 6 7  8   9  10 11 12 13  14   15
+ *        |         |       | |       | | |  |   |   | |   | |   |    |
+ * $--GGA,hhmmss.ss,ddmm.mm,a,ddmm.mm,a,x,xx,x.x,x.x,M,x.x,M,x.x,xxxx*hh<CR><LF>
+ *
+ * Field Number:
+ *  1 UTC of this position report, hh is hours, mm is minutes, ss.ss is seconds.
+ *  2 Latitude
+ *  3 N or S (North or South)
+ *  4 Longitude
+ *  5 E or W (East or West)
+ *  6 GPS Quality Indicator (non null)
+ *  7 Number of satellites in use, 00 - 12
+ *  8 Horizontal Dilution of precision (meters)
+ *  9 Antenna Altitude above/below mean-sea-level (geoid) (in meters)
+ * 10 Units of antenna altitude, meters
+ * 11 Geoidal separation, the difference between the WGS-84 earth ellipsoid and mean-sea-level (geoid), "-" means mean-sea-level below ellipsoid
+ * 12 Units of geoidal separation, meters
+ * 13 Age of differential GPS data, time in seconds since last SC104 type 1 or 9 update, null field when DGPS is not used
+ * 14 Differential reference station ID, 0000-1023
+ * 15 Checksum
+ * -------------------------------------------
+ */
+
+uint printGGA(char *buf, const Position &pos)
+{
+    uint len = sprintf(buf, "$GNGGA,%06u.%03u,%07.2f,%c,%08.2f,%c,%u,%02u,%04u,%04d,%c,%04d,%c,%d,%04d",
+        pos.time / 1000,
+        pos.time % 1000,
+        pos.latitude_i * 1e-5, pos.latitude_i < 0 ? 'S' : 'N',
+        pos.longitude_i * 1e-5, pos.longitude_i < 0 ? 'W' : 'E',
+        pos.fix_type,
+        pos.sats_in_view,
+        pos.HDOP,
+        pos.altitude,
+        'M',
+        pos.altitude_geoidal_separation,
+        'M',
+        0,
+        0);
+
+    uint chk = 0;
+    for (uint i = 1; i < len; i++) {
+        chk ^= buf[i];
+    }
+    len += sprintf(buf + len, "*%02X\r\n", chk);
+    return len;
+}
@@ -0,0 +1,7 @@
+#pragma once
+
+#include <Arduino.h>
+#include "main.h"
+
+uint printWPL(char *buf, const Position &pos, const char *name);
+uint printGGA(char *buf, const Position &pos);
@@ -16,7 +16,7 @@ enum RTCQuality {
    RTCQualityFromNet = 2,

    /// Our time is based on NTP
-    RTCQualityNTP= 3,
+    RTCQualityNTP = 3,

    /// Our time is based on our own GPS
    RTCQualityGPS = 4
@@ -14,8 +14,8 @@
 #define TECHO_DISPLAY_MODEL GxEPD2_154_D67
 #elif defined(RAK4630)

-//GxEPD2_213_B74 - RAK14000 2.13 inch b/w 250x128 
-#define TECHO_DISPLAY_MODEL GxEPD2_213_B74
+//GxEPD2_213_BN - RAK14000 2.13 inch b/w 250x122 - changed from GxEPD2_213_B74 - which was not going to give partial update support
+#define TECHO_DISPLAY_MODEL GxEPD2_213_BN

 //4.2 inch 300x400 - GxEPD2_420_M01
 //#define TECHO_DISPLAY_MODEL GxEPD2_420_M01
@@ -46,9 +46,9 @@ EInkDisplay::EInkDisplay(uint8_t address, int sda, int scl)
    setGeometry(GEOMETRY_RAWMODE, TECHO_DISPLAY_MODEL::WIDTH, TECHO_DISPLAY_MODEL::HEIGHT);
    #elif defined(RAK4630)
    
-    //GxEPD2_213_B74 - RAK14000 2.13 inch b/w 250x128 
+    //GxEPD2_213_BN - RAK14000 2.13 inch b/w 250x122 
    setGeometry(GEOMETRY_RAWMODE, 250, 122);
-    
+
    //GxEPD2_420_M01
    //setGeometry(GEOMETRY_RAWMODE, 300, 400);

@@ -110,14 +110,17 @@ bool EInkDisplay::forceDisplay(uint32_t msecLimit)
        adafruitDisplay->display(false); // FIXME, use partial update mode
        #elif defined(RAK4630)
        
-        //RAK14000 2.13 inch b/w 250x122 does not support partial updates
-        adafruitDisplay->display(false); // FIXME, use partial update mode
+        //RAK14000 2.13 inch b/w 250x122 actually now does support partial updates
+        
+        //Full update mode (slow)
+        //adafruitDisplay->display(false); // FIXME, use partial update mode
        
        //Only enable for e-Paper with support for partial updates and comment out above adafruitDisplay->display(false); 
        // 1.54 inch 200x200 - GxEPD2_154_M09
+        // 2.13 inch 250x122 - GxEPD2_213_BN
        // 2.9 inch 296x128 - GxEPD2_290_T5D
        // 4.2 inch 300x400 - GxEPD2_420_M01
-        //adafruitDisplay->nextPage();
+        adafruitDisplay->nextPage();
        
        #elif defined(PCA10059) || defined(M5_COREINK)
        adafruitDisplay->nextPage();
@@ -190,11 +193,11 @@ bool EInkDisplay::connect()
        
        adafruitDisplay->init(115200, true, 10, false, SPI1, SPISettings(4000000, MSBFIRST, SPI_MODE0));

-        //RAK14000 2.13 inch b/w 250x122 does not support partial updates 
+        //RAK14000 2.13 inch b/w 250x122 does actually now support partial updates 
        adafruitDisplay->setRotation(3);
-        //For 1.54, 2.9 and 4.2
+        //Partial update support for  1.54, 2.13 RAK14000 b/w , 2.9 and 4.2
        //adafruitDisplay->setRotation(1);
-        //adafruitDisplay->setPartialWindow(0, 0, displayWidth, displayHeight);
+        adafruitDisplay->setPartialWindow(0, 0, displayWidth, displayHeight);
    } else {
        (void)adafruitDisplay;
    }      
@@ -57,7 +57,6 @@ namespace graphics

 // This means the *visible* area (sh1106 can address 132, but shows 128 for example)
 #define IDLE_FRAMERATE 1 // in fps
-#define COMPASS_DIAM 44

 // DEBUG
 #define NUM_EXTRA_FRAMES 3 // text message and debug frame
@@ -85,10 +84,6 @@ static char ourId[5];
 // GeoCoord object for the screen
 GeoCoord geoCoord;

-// OEM Config File
-static const char *oemConfigFile = "/oem/oem.proto";
-OEMStore oemStore;
-
 #ifdef SHOW_REDRAWS
 static bool heartbeat = false;
 #endif
@@ -98,7 +93,7 @@ static uint16_t displayWidth, displayHeight;
 #define SCREEN_WIDTH displayWidth
 #define SCREEN_HEIGHT displayHeight

-#if defined(USE_EINK) || defined(ILI9341_DRIVER)
+#if defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS)
 // The screen is bigger so use bigger fonts
 #define FONT_SMALL ArialMT_Plain_16
 #define FONT_MEDIUM ArialMT_Plain_24
@@ -669,6 +664,26 @@ static bool hasPosition(NodeInfo *n)
    return n->has_position && (n->position.latitude_i != 0 || n->position.longitude_i != 0);
 }

+static uint16_t getCompassDiam(OLEDDisplay *display)
+{
+    uint16_t diam = 0;
+    // get the smaller of the 2 dimensions and subtract 20
+    if(display->getWidth() > display->getHeight()) {
+        diam = display->getHeight();
+        // if 2/3 of the other size would be smaller, use that
+        if (diam > (display->getWidth() * 2 / 3)) {
+            diam = display->getWidth() * 2 / 3;
+        }
+    } else {
+        diam = display->getWidth();
+        if (diam > (display->getHeight() * 2 / 3)) {
+            diam = display->getHeight() * 2 / 3;
+        }
+    }
+    
+    return diam - 20;
+};
+
 /// We will skip one node - the one for us, so we just blindly loop over all
 /// nodes
 static size_t nodeIndex;
@@ -685,7 +700,7 @@ static void drawNodeHeading(OLEDDisplay *display, int16_t compassX, int16_t comp

    for (int i = 0; i < 4; i++) {
        arrowPoints[i]->rotate(headingRadian);
-        arrowPoints[i]->scale(COMPASS_DIAM * 0.6);
+        arrowPoints[i]->scale(getCompassDiam(display) * 0.6);
        arrowPoints[i]->translate(compassX, compassY);
    }
    drawLine(display, tip, tail);
@@ -707,7 +722,7 @@ static void drawCompassNorth(OLEDDisplay *display, int16_t compassX, int16_t com
    for (int i = 0; i < 4; i++) {
        // North on compass will be negative of heading
        rosePoints[i]->rotate(-myHeading);
-        rosePoints[i]->scale(COMPASS_DIAM);
+        rosePoints[i]->scale(getCompassDiam(display));
        rosePoints[i]->translate(compassX, compassY);
    }
    drawLine(display, N1, N3);
@@ -772,7 +787,7 @@ static void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_
    const char *fields[] = {username, distStr, signalStr, lastStr, NULL};

    // coordinates for the center of the compass/circle
-    int16_t compassX = x + SCREEN_WIDTH - COMPASS_DIAM / 2 - 5, compassY = y + SCREEN_HEIGHT / 2;
+    int16_t compassX = x + SCREEN_WIDTH - getCompassDiam(display) / 2 - 5, compassY = y + SCREEN_HEIGHT / 2;
    bool hasNodeHeading = false;

    if (ourNode && hasPosition(ourNode)) {
@@ -813,7 +828,7 @@ static void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_
        // Debug info for gps lock errors
        // DEBUG_MSG("ourNode %d, ourPos %d, theirPos %d\n", !!ourNode, ourNode && hasPosition(ourNode), hasPosition(node));
        display->drawString(compassX - FONT_HEIGHT_SMALL / 4, compassY - FONT_HEIGHT_SMALL / 2, "?");
-    display->drawCircle(compassX, compassY, COMPASS_DIAM / 2);
+    display->drawCircle(compassX, compassY, getCompassDiam(display) / 2);

    // Must be after distStr is populated
    drawColumns(display, x, y, fields);
@@ -909,9 +924,6 @@ void Screen::setup()
    dispdev.setDetected(screen_model);
 #endif

-    // 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();

@@ -1378,7 +1390,6 @@ void DebugInfo::drawFrameWiFi(OLEDDisplay *display, OLEDDisplayUiState *state, i
 {
 #if HAS_WIFI
    const char *wifiName = config.network.wifi_ssid;
-    const char *wifiPsw = config.network.wifi_psk;

    displayedNodeNum = 0; // Not currently showing a node pane

@@ -1387,11 +1398,7 @@ void DebugInfo::drawFrameWiFi(OLEDDisplay *display, OLEDDisplayUiState *state, i
    // The coordinates define the left starting point of the text
    display->setTextAlignment(TEXT_ALIGN_LEFT);

-    if (isSoftAPForced()) {
-        display->drawString(x, y, String("WiFi: Software AP (Admin)"));
-    } else if (config.network.wifi_mode == Config_NetworkConfig_WiFiMode_ACCESS_POINT || config.network.wifi_mode == Config_NetworkConfig_WiFiMode_ACCESS_POINT_HIDDEN) {
-        display->drawString(x, y, String("WiFi: Software AP"));
-    } else if (WiFi.status() != WL_CONNECTED) {
+    if (WiFi.status() != WL_CONNECTED) {
        display->drawString(x, y, String("WiFi: Not Connected"));
    } else {
        display->drawString(x, y, String("WiFi: Connected"));
@@ -1412,25 +1419,14 @@ void DebugInfo::drawFrameWiFi(OLEDDisplay *display, OLEDDisplayUiState *state, i
    - WL_NO_SHIELD: assigned when no WiFi shield is present;

    */
-    if (WiFi.status() == WL_CONNECTED || isSoftAPForced() || config.network.wifi_mode == Config_NetworkConfig_WiFiMode_ACCESS_POINT || config.network.wifi_mode == Config_NetworkConfig_WiFiMode_ACCESS_POINT_HIDDEN) {
-        if (config.network.wifi_mode == Config_NetworkConfig_WiFiMode_ACCESS_POINT || config.network.wifi_mode == Config_NetworkConfig_WiFiMode_ACCESS_POINT_HIDDEN || 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
-            display->drawString(x + SCREEN_WIDTH - display->getStringWidth("(" + String(WiFi.softAPgetStationNum()) + "/4)"),
-                                y + FONT_HEIGHT_SMALL * 1, "(" + String(WiFi.softAPgetStationNum()) + "/4)");
-        } else {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "IP: " + String(WiFi.localIP().toString().c_str()));
-        }
-
+    if (WiFi.status() == WL_CONNECTED) {
+        display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "IP: " + String(WiFi.localIP().toString().c_str()));
    } else if (WiFi.status() == WL_NO_SSID_AVAIL) {
        display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "SSID Not Found");
    } else if (WiFi.status() == WL_CONNECTION_LOST) {
        display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "Connection Lost");
    } else if (WiFi.status() == WL_CONNECT_FAILED) {
        display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "Connection Failed");
-        //} else if (WiFi.status() == WL_DISCONNECTED) {
-        //    display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "Disconnected");
    } else if (WiFi.status() == WL_IDLE_STATUS) {
        display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "Idle ... Reconnecting");
    } else {
@@ -1497,24 +1493,8 @@ void DebugInfo::drawFrameWiFi(OLEDDisplay *display, OLEDDisplayUiState *state, i
        }
    }

-    if (isSoftAPForced()) {
-        if ((millis() / 10000) % 2) {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 2, "SSID: meshtasticAdmin");
-        } else {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 2, "PWD: 12345678");
-        }
+    display->drawString(x, y + FONT_HEIGHT_SMALL * 2, "SSID: " + String(wifiName));

-    } else {
-        if (config.network.wifi_mode== Config_NetworkConfig_WiFiMode_ACCESS_POINT || config.network.wifi_mode == Config_NetworkConfig_WiFiMode_ACCESS_POINT_HIDDEN) {
-            if ((millis() / 10000) % 2) {
-                display->drawString(x, y + FONT_HEIGHT_SMALL * 2, "SSID: " + String(wifiName));
-            } else {
-                display->drawString(x, y + FONT_HEIGHT_SMALL * 2, "PWD: " + String(wifiPsw));
-            }
-        } else {
-            display->drawString(x, y + FONT_HEIGHT_SMALL * 2, "SSID: " + String(wifiName));
-        }
-    }
    display->drawString(x, y + FONT_HEIGHT_SMALL * 3, "http://meshtastic.local");

    /* Display a heartbeat pixel that blinks every time the frame is redrawn */
@@ -131,8 +131,7 @@ class Screen : public concurrency::OSThread
    void setOn(bool on)
    {
        if (!on)
-            handleSetOn(
-                false); // We handle off commands immediately, because they might be called because the CPU is shutting down
+            handleSetOn(false); // We handle off commands immediately, because they might be called because the CPU is shutting down
        else
            enqueueCmd(ScreenCmd{.cmd = on ? Cmd::SET_ON : Cmd::SET_OFF});
    }
@@ -17,7 +17,7 @@ uint8_t read_from_14004(uint8_t reg, uint8_t *data, uint8_t length)
  Wire.write(reg);
  Wire.endTransmission();    // stop transmitting
  delay(20);
-  Wire.requestFrom(CARDKB_ADDR, length);
+  Wire.requestFrom(CARDKB_ADDR, (int)length);
  int i = 0;
  while ( Wire.available() ) // slave may send less than requested
  {
@@ -30,6 +30,7 @@
 // #include <driver/rtc_io.h>

 #include "mesh/http/WiFiAPClient.h"
+#include "mesh/eth/ethClient.h"

 #ifdef ARCH_ESP32
 #include "mesh/http/WebServer.h"
@@ -41,10 +42,16 @@
 #include "mqtt/MQTT.h"
 #endif

+#if HAS_ETHERNET
+#include "mesh/eth/ethServerAPI.h"
+#include "mqtt/MQTT.h"
+#endif
+
 #include "LLCC68Interface.h"
 #include "RF95Interface.h"
 #include "SX1262Interface.h"
 #include "SX1268Interface.h"
+#include "SX1281Interface.h"
 #if !HAS_RADIO && defined(ARCH_PORTDUINO)
 #include "platform/portduino/SimRadio.h"
 #endif
@@ -80,6 +87,14 @@ uint8_t kb_model;
 // The I2C address of the RTC Module (if found)
 uint8_t rtc_found;

+bool rIf_wide_lora = false;
+
+// Keystore Chips
+uint8_t keystore_found;
+#ifndef ARCH_PORTDUINO
+ATECCX08A atecc;
+#endif
+
 bool eink_found = true;

 uint32_t serialSinceMsec;
@@ -87,7 +102,7 @@ uint32_t serialSinceMsec;
 bool pmu_found;

 // Array map of sensor types (as array index) and i2c address as value we'll find in the i2c scan
-uint8_t nodeTelemetrySensorsMap[TelemetrySensorType_LPS22+1] = { 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+uint8_t nodeTelemetrySensorsMap[TelemetrySensorType_QMI8658+1] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };

 Router *router = NULL; // Users of router don't care what sort of subclass implements that API

@@ -182,8 +197,6 @@ void setup()
    digitalWrite(RESET_OLED, 1);
 #endif

-    bool forceSoftAP = 0;
-
 #ifdef BUTTON_PIN
 #ifdef ARCH_ESP32

@@ -196,12 +209,6 @@ void setup()
    delay(10);
 #endif

-    // BUTTON_PIN is pulled high by a 12k resistor.
-    if (!digitalRead(BUTTON_PIN)) {
-        forceSoftAP = 1;
-        DEBUG_MSG("Setting forceSoftAP = 1\n");
-    }
-
 #endif
 #endif

@@ -214,6 +221,10 @@ void setup()
    // router = new DSRRouter();
    router = new ReliableRouter();

+#ifdef I2C_SDA1
+    Wire1.begin(I2C_SDA1, I2C_SCL1);
+#endif
+
 #ifdef I2C_SDA
    Wire.begin(I2C_SDA, I2C_SCL);
 #elif HAS_WIRE
@@ -229,6 +240,13 @@ void setup()
    delay(1);
 #endif

+#ifdef RAK4630
+    // We need to enable 3.3V periphery in order to scan it
+    pinMode(PIN_3V3_EN, OUTPUT);
+    digitalWrite(PIN_3V3_EN, 1);
+#endif
+
+    // We need to scan here to decide if we have a screen for nodeDB.init()
    scanI2Cdevice();
 #ifdef RAK4630
    // scanEInkDevice();
@@ -258,17 +276,24 @@ void setup()
 #ifdef ARCH_NRF52
    nrf52Setup();
 #endif
-    playStartMelody();
    // We do this as early as possible because this loads preferences from flash
    // but we need to do this after main cpu iniot (esp32setup), because we need the random seed set
    nodeDB.init();

+    playStartMelody();
+
    // Currently only the tbeam has a PMU
    power = new Power();
    power->setStatusHandler(powerStatus);
    powerStatus->observe(&power->newStatus);
    power->setup(); // Must be after status handler is installed, so that handler gets notified of the initial configuration

+    /*
+    * Repeat the scanning for I2C devices after power initialization or look for 'latecomers'. 
+    * Boards with an PMU need to be powered on to correctly scan to the device address, such as t-beam-s3-core
+    */
+    scanI2Cdevice();
+    
    // Init our SPI controller (must be before screen and lora)
    initSPI();
 #ifndef ARCH_ESP32
@@ -347,6 +372,20 @@ void setup()
    }
 #endif

+#if defined(USE_SX1281) && !defined(ARCH_PORTDUINO)
+    if (!rIf) {
+        rIf = new SX1281Interface(SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY, SPI);
+        if (!rIf->init()) {
+            DEBUG_MSG("Warning: Failed to find SX1281 radio\n");
+            delete rIf;
+            rIf = NULL;
+        } else {
+            DEBUG_MSG("SX1281 Radio init succeeded, using SX1281 radio\n");
+            rIf_wide_lora = true;
+        }
+    }
+#endif
+
 #if defined(USE_SX1262)
    if (!rIf) {
        rIf = new SX1262Interface(SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY, SPI);
@@ -399,12 +438,17 @@ void setup()
    }
 #endif

-#if HAS_WIFI
+#if HAS_WIFI || HAS_ETHERNET
    mqttInit();
 #endif

+#ifndef ARCH_PORTDUINO
    // Initialize Wifi
-    initWifi(forceSoftAP);
+    initWifi();
+
+    // Initialize Ethernet
+    initEthernet();
+#endif

 #ifdef ARCH_ESP32
    // Start web server thread.
@@ -6,19 +6,28 @@
 #include "PowerStatus.h"
 #include "graphics/Screen.h"
 #include "mesh/generated/telemetry.pb.h"
+#ifndef ARCH_PORTDUINO
+#include <SparkFun_ATECCX08a_Arduino_Library.h>
+#endif

 extern uint8_t screen_found;
 extern uint8_t screen_model;
 extern uint8_t cardkb_found;
 extern uint8_t kb_model;
 extern uint8_t rtc_found;
+extern uint8_t keystore_found;

+extern bool rIf_wide_lora;
 extern bool eink_found;
 extern bool pmu_found;
 extern bool isCharging;
 extern bool isUSBPowered;

-extern uint8_t nodeTelemetrySensorsMap[TelemetrySensorType_LPS22+1];
+#ifndef ARCH_PORTDUINO
+extern ATECCX08A atecc;
+#endif
+
+extern uint8_t nodeTelemetrySensorsMap[TelemetrySensorType_QMI8658+1];

 extern int TCPPort; // set by Portduino

@@ -62,13 +62,6 @@ Channel &Channels::fixupChannel(ChannelIndex chIndex)
        // Convert the old string "Default" to our new short representation
        if (strcmp(channelSettings.name, "Default") == 0)
            *channelSettings.name = '\0';
-
-        /* Convert any old usage of the defaultpsk into our new short representation.
-        if (channelSettings.psk.size == sizeof(defaultpsk) &&
-            memcmp(channelSettings.psk.bytes, defaultpsk, sizeof(defaultpsk)) == 0) {
-            *channelSettings.psk.bytes = 1;
-            channelSettings.psk.size = 1;
-        } */
    }

    hashes[chIndex] = generateHash(chIndex);
@@ -86,7 +79,7 @@ void Channels::initDefaultChannel(ChannelIndex chIndex)
    Config_LoRaConfig &loraConfig = config.lora;

    loraConfig.modem_preset = Config_LoRaConfig_ModemPreset_LONG_FAST; // Default to Long Range & Fast
-
+    loraConfig.use_preset = true;
    loraConfig.tx_power = 0; // default
    uint8_t defaultpskIndex = 1;
    channelSettings.psk.bytes[0] = defaultpskIndex;
@@ -124,7 +117,22 @@ CryptoKey Channels::getKey(ChannelIndex chIndex)
            DEBUG_MSG("Expanding short PSK #%d\n", pskIndex);
            if (pskIndex == 0)
                k.length = 0; // Turn off encryption
-            else {
+            else if (oemStore.oem_aes_key.size > 1) {
+                // Use the OEM key
+                DEBUG_MSG("Using OEM Key with %d bytes\n", oemStore.oem_aes_key.size);
+                memcpy(k.bytes, oemStore.oem_aes_key.bytes , oemStore.oem_aes_key.size);
+                k.length = oemStore.oem_aes_key.size;
+                // Bump up the last byte of PSK as needed
+                uint8_t *last = k.bytes + oemStore.oem_aes_key.size - 1;
+                *last = *last + pskIndex - 1; // index of 1 means no change vs defaultPSK
+                if (k.length < 16) {
+                    DEBUG_MSG("Warning: OEM provided a too short AES128 key - padding\n");
+                    k.length = 16;
+                } else if (k.length < 32 && k.length != 16) {
+                    DEBUG_MSG("Warning: OEM provided a too short AES256 key - padding\n");
+                    k.length = 32;
+                }
+            } else {
                memcpy(k.bytes, defaultpsk, sizeof(defaultpsk));
                k.length = sizeof(defaultpsk);
                // Bump up the last byte of PSK as needed
@@ -210,9 +218,7 @@ const char *Channels::getName(size_t chIndex)
        // 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 (config.lora.bandwidth != 0)
-            channelName = "Custom";
-        else
+        if (config.lora.use_preset) {
            switch (config.lora.modem_preset) {
            case Config_LoRaConfig_ModemPreset_SHORT_SLOW:
                channelName = "ShortSlow";
@@ -239,6 +245,10 @@ const char *Channels::getName(size_t chIndex)
                channelName = "Invalid";
                break;
            }
+        }
+        else {
+            channelName = "Custom";
+        }
    }

    return channelName;
@@ -257,7 +267,7 @@ their nodes
 *
 * This function will also need to be implemented in GUI apps that talk to the radio.
 *
-* https://github.com/meshtastic/Meshtastic-device/issues/269
+* https://github.com/meshtastic/firmware/issues/269
 */
 const char *Channels::getPrimaryName()
 {
@@ -74,7 +74,7 @@ class Channels
     *
     * This function will also need to be implemented in GUI apps that talk to the radio.
     *
-     * https://github.com/meshtastic/Meshtastic-device/issues/269
+     * https://github.com/meshtastic/firmware/issues/269
    */
    const char *getPrimaryName();

@@ -1,7 +1,13 @@
 #include "SX126xInterface.h"
 #include "SX126xInterface.cpp"
+#include "SX128xInterface.h"
+#include "SX128xInterface.cpp"

 // We need this declaration for proper linking in derived classes
 template class SX126xInterface<SX1262>;
 template class SX126xInterface<SX1268>;
-template class SX126xInterface<LLCC68>;
+template class SX126xInterface<LLCC68>;
+
+#if !defined(ARCH_PORTDUINO)
+template class SX128xInterface<SX1281>;
+#endif
@@ -112,7 +112,7 @@ void MeshModule::callPlugins(const MeshPacket &mp, RxSource src)
            bool rxChannelOk = !pi.boundChannel || (mp.from == 0) ||
                !ch ||
                strlen(ch->settings.name) > 0 ||
-                (strcmp(ch->settings.name, pi.boundChannel) == 0);
+                (strcasecmp(ch->settings.name, pi.boundChannel) == 0);

            if (!rxChannelOk) {
                // no one should have already replied!
@@ -15,6 +15,7 @@ struct RegionInfo {
    uint8_t powerLimit; // Or zero for not set
    bool audioPermitted;
    bool freqSwitching;
+    bool wideLora;
    const char *name; // EU433 etc
 };

@@ -283,3 +283,8 @@ int MeshService::onGPSChanged(const meshtastic::GPSStatus *newStatus)

    return 0;
 }
+
+bool MeshService::isToPhoneQueueEmpty() 
+{
+    return toPhoneQueue.isEmpty();
+}
@@ -89,6 +89,8 @@ class MeshService
      /// Send a packet to the phone
    void sendToPhone(MeshPacket *p);

+    bool isToPhoneQueueEmpty();
+
  private:
    /// Called when our gps position has changed - updates nodedb and sends Location message out into the mesh
    /// returns 0 to allow futher processing
@@ -38,6 +38,7 @@ MyNodeInfo &myNodeInfo = devicestate.my_node;
 LocalConfig config;
 LocalModuleConfig moduleConfig;
 ChannelFile channelFile;
+OEMStore oemStore;

 /** 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.
@@ -129,6 +130,8 @@ bool NodeDB::factoryReset()
    // second, install default state (this will deal with the duplicate mac address issue)
    installDefaultDeviceState();
    installDefaultConfig();
+    installDefaultModuleConfig();
+    installDefaultChannels();
    // third, write everything to disk
    saveToDisk();
 #ifdef ARCH_ESP32
@@ -354,6 +357,8 @@ 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";
+static const char *oemConfigFile = "/oem/oem.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)
@@ -433,6 +438,9 @@ void NodeDB::loadFromDisk()
            DEBUG_MSG("Loaded saved channelFile version %d\n", channelFile.version);
        }
    }
+
+    if (loadProto(oemConfigFile, OEMStore_size, sizeof(OEMStore), OEMStore_fields, &oemStore))
+        DEBUG_MSG("Loaded OEMStore\n");
 }

 /** Save a protobuf from a file, return true for success */
@@ -699,11 +707,23 @@ NodeInfo *NodeDB::getOrCreateNode(NodeNum n)

    if (!info) {
        if (*numNodes >= MAX_NUM_NODES) {
-            screen->print("error: node_db full!\n");
-            DEBUG_MSG("ERROR! could not create new node, node_db is full! (%d nodes)", *numNodes);
-            return NULL;
+            screen->print("warning: node_db full! erasing oldest entry\n");
+            // look for oldest node and erase it
+            uint32_t oldest = UINT32_MAX;
+            int oldestIndex = -1;
+            for (int i = 0; i < *numNodes; i++) {
+                if (nodes[i].last_heard < oldest) {
+                    oldest = nodes[i].last_heard;
+                    oldestIndex = i;
+                }
+            }
+            // Shove the remaining nodes down the chain
+            for (int i = oldestIndex; i < *numNodes - 1; i++) {
+                nodes[i] = nodes[i + 1];
+            }
+            (*numNodes)--;
        }
-        // add the node
+        // add the node at the end
        info = &nodes[(*numNodes)++];

        // everything is missing except the nodenum
@@ -18,7 +18,7 @@ DeviceState versions used to be defined in the .proto file but really only this
 #define SEGMENT_DEVICESTATE 4
 #define SEGMENT_CHANNELS 8

-#define DEVICESTATE_CUR_VER 19
+#define DEVICESTATE_CUR_VER 20
 #define DEVICESTATE_MIN_VER DEVICESTATE_CUR_VER

 extern DeviceState devicestate;
@@ -26,6 +26,7 @@ extern ChannelFile channelFile;
 extern MyNodeInfo &myNodeInfo;
 extern LocalConfig config;
 extern LocalModuleConfig moduleConfig;
+extern OEMStore oemStore;
 extern User &owner;

 /// Given a node, return how many seconds in the past (vs now) that we last heard from it
@@ -79,17 +79,17 @@ bool PhoneAPI::handleToRadio(const uint8_t *buf, size_t bufLength)
    memset(&toRadioScratch, 0, sizeof(toRadioScratch));
    if (pb_decode_from_bytes(buf, bufLength, ToRadio_fields, &toRadioScratch)) {
        switch (toRadioScratch.which_payload_variant) {
-            case ToRadio_packet_tag:
-                return handleToRadioPacket(toRadioScratch.packet);
-            case ToRadio_want_config_id_tag:
-                config_nonce = toRadioScratch.want_config_id;
-                DEBUG_MSG("Client wants config, nonce=%u\n", config_nonce);
-                handleStartConfig();
-                break;
-            case ToRadio_disconnect_tag:
-                DEBUG_MSG("Disconnecting from phone\n");
-                close();
-                break;
+        case ToRadio_packet_tag:
+            return handleToRadioPacket(toRadioScratch.packet);
+        case ToRadio_want_config_id_tag:
+            config_nonce = toRadioScratch.want_config_id;
+            DEBUG_MSG("Client wants config, nonce=%u\n", config_nonce);
+            handleStartConfig();
+            break;
+        case ToRadio_disconnect_tag:
+            DEBUG_MSG("Disconnecting from phone\n");
+            close();
+            break;
        default:
            // Ignore nop messages
            // DEBUG_MSG("Error: unexpected ToRadio variant\n");
@@ -109,8 +109,10 @@ 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_CHANNELS
 *      STATE_SEND_NODEINFO, // states progress in this order as the device sends to the client
        STATE_SEND_CONFIG,
+        STATE_SEND_MODULE_CONFIG,
        STATE_SEND_COMPLETE_ID,
        STATE_SEND_PACKETS // send packets or debug strings
 */
@@ -128,7 +130,7 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
    case STATE_SEND_NOTHING:
        DEBUG_MSG("getFromRadio=STATE_SEND_NOTHING\n");
        break;
-        
+
    case STATE_SEND_MY_INFO:
        DEBUG_MSG("getFromRadio=STATE_SEND_MY_INFO\n");
        // If the user has specified they don't want our node to share its location, make sure to tell the phone
@@ -154,51 +156,63 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
            // Stay in current state until done sending nodeinfos
        } else {
            DEBUG_MSG("Done sending nodeinfos\n");
-            state = STATE_SEND_CONFIG;
+            state = STATE_SEND_CHANNELS;
            // Go ahead and send that ID right now
            return getFromRadio(buf);
        }
        break;
    }

+    case STATE_SEND_CHANNELS:
+        DEBUG_MSG("getFromRadio=STATE_SEND_CHANNELS\n");
+        fromRadioScratch.which_payload_variant = FromRadio_channel_tag;
+        fromRadioScratch.channel = channels.getByIndex(config_state);
+        config_state++;
+        // Advance when we have sent all of our Channels
+        if (config_state >= MAX_NUM_CHANNELS) {
+            state = STATE_SEND_CONFIG;
+            config_state = Config_device_tag;
+        }
+        break;
+
    case STATE_SEND_CONFIG:
        DEBUG_MSG("getFromRadio=STATE_SEND_CONFIG\n");
        fromRadioScratch.which_payload_variant = FromRadio_config_tag;
        switch (config_state) {
-            case Config_device_tag:
-                fromRadioScratch.config.which_payload_variant = Config_device_tag;
-                fromRadioScratch.config.payload_variant.device = config.device;
-                break;
-            case Config_position_tag:
-                fromRadioScratch.config.which_payload_variant = Config_position_tag;
-                fromRadioScratch.config.payload_variant.position = config.position;
-                break;
-            case Config_power_tag:
-                fromRadioScratch.config.which_payload_variant = Config_power_tag;
-                fromRadioScratch.config.payload_variant.power = config.power;
-                fromRadioScratch.config.payload_variant.power.ls_secs = default_ls_secs;
-                break;
-            case Config_network_tag:
-                fromRadioScratch.config.which_payload_variant = Config_network_tag;
-                fromRadioScratch.config.payload_variant.network = config.network;
-                break;
-            case Config_display_tag:
-                fromRadioScratch.config.which_payload_variant = Config_display_tag;
-                fromRadioScratch.config.payload_variant.display = config.display;
-                break;
-            case Config_lora_tag:
-                fromRadioScratch.config.which_payload_variant = Config_lora_tag;
-                fromRadioScratch.config.payload_variant.lora = config.lora;
-                break;
-            case Config_bluetooth_tag:
-                fromRadioScratch.config.which_payload_variant = Config_bluetooth_tag;
-                fromRadioScratch.config.payload_variant.bluetooth = config.bluetooth;
-                break;
+        case Config_device_tag:
+            fromRadioScratch.config.which_payload_variant = Config_device_tag;
+            fromRadioScratch.config.payload_variant.device = config.device;
+            break;
+        case Config_position_tag:
+            fromRadioScratch.config.which_payload_variant = Config_position_tag;
+            fromRadioScratch.config.payload_variant.position = config.position;
+            break;
+        case Config_power_tag:
+            fromRadioScratch.config.which_payload_variant = Config_power_tag;
+            fromRadioScratch.config.payload_variant.power = config.power;
+            fromRadioScratch.config.payload_variant.power.ls_secs = default_ls_secs;
+            break;
+        case Config_network_tag:
+            fromRadioScratch.config.which_payload_variant = Config_network_tag;
+            fromRadioScratch.config.payload_variant.network = config.network;
+            break;
+        case Config_display_tag:
+            fromRadioScratch.config.which_payload_variant = Config_display_tag;
+            fromRadioScratch.config.payload_variant.display = config.display;
+            break;
+        case Config_lora_tag:
+            fromRadioScratch.config.which_payload_variant = Config_lora_tag;
+            fromRadioScratch.config.payload_variant.lora = config.lora;
+            break;
+        case Config_bluetooth_tag:
+            fromRadioScratch.config.which_payload_variant = Config_bluetooth_tag;
+            fromRadioScratch.config.payload_variant.bluetooth = config.bluetooth;
+            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_bluetooth_tag) {
@@ -211,37 +225,37 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
        DEBUG_MSG("getFromRadio=STATE_SEND_MODULECONFIG\n");
        fromRadioScratch.which_payload_variant = FromRadio_moduleConfig_tag;
        switch (config_state) {
-            case ModuleConfig_mqtt_tag:
-                fromRadioScratch.moduleConfig.which_payload_variant = ModuleConfig_mqtt_tag;
-                fromRadioScratch.moduleConfig.payload_variant.mqtt = moduleConfig.mqtt;
-                break;
-            case ModuleConfig_serial_tag:
-                fromRadioScratch.moduleConfig.which_payload_variant = ModuleConfig_serial_tag;
-                fromRadioScratch.moduleConfig.payload_variant.serial = moduleConfig.serial;
-                break;
-            case ModuleConfig_external_notification_tag:
-                fromRadioScratch.moduleConfig.which_payload_variant = ModuleConfig_external_notification_tag;
-                fromRadioScratch.moduleConfig.payload_variant.external_notification = moduleConfig.external_notification;
-                break;
-            case ModuleConfig_range_test_tag:
-                fromRadioScratch.moduleConfig.which_payload_variant = ModuleConfig_range_test_tag;
-                fromRadioScratch.moduleConfig.payload_variant.range_test = moduleConfig.range_test;
-                break;
-            case ModuleConfig_telemetry_tag:
-                fromRadioScratch.moduleConfig.which_payload_variant = ModuleConfig_telemetry_tag;
-                fromRadioScratch.moduleConfig.payload_variant.telemetry = moduleConfig.telemetry;
-                break;
-            case ModuleConfig_canned_message_tag:
-                fromRadioScratch.moduleConfig.which_payload_variant = ModuleConfig_canned_message_tag;
-                fromRadioScratch.moduleConfig.payload_variant.canned_message = moduleConfig.canned_message;
-                break;
+        case ModuleConfig_mqtt_tag:
+            fromRadioScratch.moduleConfig.which_payload_variant = ModuleConfig_mqtt_tag;
+            fromRadioScratch.moduleConfig.payload_variant.mqtt = moduleConfig.mqtt;
+            break;
+        case ModuleConfig_serial_tag:
+            fromRadioScratch.moduleConfig.which_payload_variant = ModuleConfig_serial_tag;
+            fromRadioScratch.moduleConfig.payload_variant.serial = moduleConfig.serial;
+            break;
+        case ModuleConfig_external_notification_tag:
+            fromRadioScratch.moduleConfig.which_payload_variant = ModuleConfig_external_notification_tag;
+            fromRadioScratch.moduleConfig.payload_variant.external_notification = moduleConfig.external_notification;
+            break;
+        case ModuleConfig_range_test_tag:
+            fromRadioScratch.moduleConfig.which_payload_variant = ModuleConfig_range_test_tag;
+            fromRadioScratch.moduleConfig.payload_variant.range_test = moduleConfig.range_test;
+            break;
+        case ModuleConfig_telemetry_tag:
+            fromRadioScratch.moduleConfig.which_payload_variant = ModuleConfig_telemetry_tag;
+            fromRadioScratch.moduleConfig.payload_variant.telemetry = moduleConfig.telemetry;
+            break;
+        case ModuleConfig_canned_message_tag:
+            fromRadioScratch.moduleConfig.which_payload_variant = ModuleConfig_canned_message_tag;
+            fromRadioScratch.moduleConfig.payload_variant.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_COMPLETE_ID;
-            config_state = Config_device_tag;
+            config_state = 0;
        }
        break;

@@ -274,7 +288,8 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
    if (fromRadioScratch.which_payload_variant != 0) {
        // Encapsulate as a FromRadio packet
        size_t numbytes = pb_encode_to_bytes(buf, FromRadio_size, FromRadio_fields, &fromRadioScratch);
-        // DEBUG_MSG("encoding toPhone packet to phone variant=%d, %d bytes\n", fromRadioScratch.which_payloadVariant, numbytes);
+
+        DEBUG_MSG("encoding toPhone packet to phone variant=%d, %d bytes\n", fromRadioScratch.which_payload_variant, numbytes);
        return numbytes;
    }

@@ -282,7 +297,7 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
    return 0;
 }

-void PhoneAPI::handleDisconnect() 
+void PhoneAPI::handleDisconnect()
 {
    DEBUG_MSG("PhoneAPI disconnect\n");
 }
@@ -301,26 +316,25 @@ void PhoneAPI::releasePhonePacket()
 bool PhoneAPI::available()
 {
    switch (state) {
-        case STATE_SEND_NOTHING:
-            return false;
-        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)
-                nodeInfoForPhone = nodeDB.readNextInfo();
-            return true; // Always say we have something, because we might need to advance our state machine
-        case STATE_SEND_COMPLETE_ID:
-            return true;
-        case STATE_SEND_PACKETS: {
-            if (!packetForPhone)
-                packetForPhone = service.getForPhone();
-            bool hasPacket = !!packetForPhone;
-            // DEBUG_MSG("available hasPacket=%d\n", hasPacket);
-            return hasPacket;
+    case STATE_SEND_NOTHING:
+        return false;
+    case STATE_SEND_MY_INFO:
+    case STATE_SEND_CHANNELS:
+    case STATE_SEND_CONFIG:
+    case STATE_SEND_MODULECONFIG:
+    case STATE_SEND_COMPLETE_ID:
+        return true;
+    case STATE_SEND_NODEINFO:
+        if (!nodeInfoForPhone)
+            nodeInfoForPhone = nodeDB.readNextInfo();
+        return true; // Always say we have something, because we might need to advance our state machine
+
+    case STATE_SEND_PACKETS: {
+        if (!packetForPhone)
+            packetForPhone = service.getForPhone();
+        bool hasPacket = !!packetForPhone;
+        // DEBUG_MSG("available hasPacket=%d\n", hasPacket);
+        return hasPacket;
    }
    default:
        assert(0); // unexpected state - FIXME, make an error code and reboot
@@ -16,13 +16,13 @@
 * Eventually there should be once instance of this class for each live connection (because it has a bit of state
 * for that connection)
 */
-class PhoneAPI
-    : public Observer<uint32_t> // FIXME, we shouldn't be inheriting from Observer, instead use CallbackObserver as a member
+class PhoneAPI : public Observer<uint32_t> // FIXME, we shouldn't be inheriting from Observer, instead use CallbackObserver as a member
 {
    enum State {
        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_NODEINFO, // states progress in this order as the device sends to to the client
+        STATE_SEND_CHANNELS, // Send all channels
        STATE_SEND_CONFIG, // Replacement for the old Radioconfig
        STATE_SEND_MODULECONFIG, // Send Module specific config
        STATE_SEND_COMPLETE_ID,
@@ -31,7 +31,7 @@ class PhoneAPI

    State state = STATE_SEND_NOTHING;

-    int8_t config_state = Config_device_tag;
+    uint8_t config_state = 0;

    /**
     * Each packet sent to the phone has an incrementing count
@@ -6,15 +6,16 @@
 #include "Router.h"
 #include "assert.h"
 #include "configuration.h"
+#include "main.h"
 #include "sleep.h"
 #include <assert.h>
 #include <pb_decode.h>
 #include <pb_encode.h>

-#define RDEF(name, freq_start, freq_end, duty_cycle, spacing, power_limit, audio_permitted, frequency_switching)                 \
+#define RDEF(name, freq_start, freq_end, duty_cycle, spacing, power_limit, audio_permitted, frequency_switching, wide_lora)                 \
    {                                                                                                                            \
        Config_LoRaConfig_RegionCode_##name, freq_start, freq_end, duty_cycle, spacing, power_limit, audio_permitted,            \
-            frequency_switching, #name                                                                                           \
+            frequency_switching, wide_lora, #name                                                                                           \
    }

 const RegionInfo regions[] = {
@@ -22,12 +23,12 @@ const RegionInfo regions[] = {
        https://link.springer.com/content/pdf/bbm%3A978-1-4842-4357-2%2F1.pdf
        https://www.thethingsnetwork.org/docs/lorawan/regional-parameters/
    */
-    RDEF(US, 902.0f, 928.0f, 100, 0, 30, true, false),
+    RDEF(US, 902.0f, 928.0f, 100, 0, 30, true, false, false),

    /*
        https://lora-alliance.org/wp-content/uploads/2020/11/lorawan_regional_parameters_v1.0.3reva_0.pdf
     */
-    RDEF(EU_433, 433.0f, 434.0f, 10, 0, 12, true, false),
+    RDEF(EU_433, 433.0f, 434.0f, 10, 0, 12, true, false, false),

    /*
        https://www.thethingsnetwork.org/docs/lorawan/duty-cycle/
@@ -43,23 +44,23 @@ const RegionInfo regions[] = {
        (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(EU_868, 869.4f, 869.65f, 10, 0, 27, false, false),
+    RDEF(EU_868, 869.4f, 869.65f, 10, 0, 27, false, false, false),

    /*
        https://lora-alliance.org/wp-content/uploads/2020/11/lorawan_regional_parameters_v1.0.3reva_0.pdf
     */
-    RDEF(CN, 470.0f, 510.0f, 100, 0, 19, true, false),
+    RDEF(CN, 470.0f, 510.0f, 100, 0, 19, true, false, false),

    /*
        https://lora-alliance.org/wp-content/uploads/2020/11/lorawan_regional_parameters_v1.0.3reva_0.pdf
     */
-    RDEF(JP, 920.8f, 927.8f, 100, 0, 16, true, false),
+    RDEF(JP, 920.8f, 927.8f, 100, 0, 16, true, false, false),

    /*
        https://www.iot.org.au/wp/wp-content/uploads/2016/12/IoTSpectrumFactSheet.pdf
        https://iotalliance.org.nz/wp-content/uploads/sites/4/2019/05/IoT-Spectrum-in-NZ-Briefing-Paper.pdf
     */
-    RDEF(ANZ, 915.0f, 928.0f, 100, 0, 30, true, false),
+    RDEF(ANZ, 915.0f, 928.0f, 100, 0, 30, true, false, false),

    /*
        https://digital.gov.ru/uploaded/files/prilozhenie-12-k-reshenyu-gkrch-18-46-03-1.pdf
@@ -67,38 +68,44 @@ const RegionInfo regions[] = {
        Note:
            - We do LBT, so 100% is allowed.
     */
-    RDEF(RU, 868.7f, 869.2f, 100, 0, 20, true, false),
+    RDEF(RU, 868.7f, 869.2f, 100, 0, 20, true, false, false),

    /*
        ???
     */
-    RDEF(KR, 920.0f, 923.0f, 100, 0, 0, true, false),
+    RDEF(KR, 920.0f, 923.0f, 100, 0, 0, true, false, false),

    /*
        ???
     */
-    RDEF(TW, 920.0f, 925.0f, 100, 0, 0, true, false),
+    RDEF(TW, 920.0f, 925.0f, 100, 0, 0, true, false, false),

    /*
        https://lora-alliance.org/wp-content/uploads/2020/11/lorawan_regional_parameters_v1.0.3reva_0.pdf
     */
-    RDEF(IN, 865.0f, 867.0f, 100, 0, 30, true, false),
+    RDEF(IN, 865.0f, 867.0f, 100, 0, 30, true, false, 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
      */
-    RDEF(NZ_865, 864.0f, 868.0f, 100, 0, 0, true, false),
+    RDEF(NZ_865, 864.0f, 868.0f, 100, 0, 0, true, false, false),

    /*
       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),
+    RDEF(TH, 920.0f, 925.0f, 100, 0, 16, true, false, false),
+
+    /*
+       2.4 GHZ WLAN Band equivalent. Only for SX128x chips.
+    */
+
+    RDEF(LORA_24, 2400.0f, 2483.5f, 100, 0, 10, true, false, true),

    /*
        This needs to be last. Same as US.
    */
-    RDEF(UNSET, 902.0f, 928.0f, 100, 0, 30, true, false)
+    RDEF(UNSET, 902.0f, 928.0f, 100, 0, 30, true, false, false)

 };

@@ -354,40 +361,41 @@ void RadioInterface::applyModemConfig()
    // Set up default configuration
    // No Sync Words in LORA mode
    Config_LoRaConfig &loraConfig = config.lora;
-    if (loraConfig.spread_factor == 0) {
+    if (loraConfig.use_preset) {
+
        switch (loraConfig.modem_preset) {
        case Config_LoRaConfig_ModemPreset_SHORT_FAST:
-            bw = 250;
+            bw = (myRegion->wideLora && rIf_wide_lora) ? 800 : 250;
            cr = 8;
            sf = 7;
            break;
        case Config_LoRaConfig_ModemPreset_SHORT_SLOW:
-            bw = 250;
+            bw = (myRegion->wideLora && rIf_wide_lora) ? 800 : 250;
            cr = 8;
            sf = 8;
            break;
        case Config_LoRaConfig_ModemPreset_MEDIUM_FAST:
-            bw = 250;
+            bw = (myRegion->wideLora && rIf_wide_lora) ? 800 : 250;
            cr = 8;
            sf = 9;
            break;
        case Config_LoRaConfig_ModemPreset_MEDIUM_SLOW:
-            bw = 250;
+            bw = (myRegion->wideLora && rIf_wide_lora) ? 800 : 250;
            cr = 8;
            sf = 10;
            break;
        case Config_LoRaConfig_ModemPreset_LONG_FAST:
-            bw = 250;
+            bw = (myRegion->wideLora && rIf_wide_lora) ? 800 : 250;
            cr = 8;
            sf = 11;
            break;
        case Config_LoRaConfig_ModemPreset_LONG_SLOW:
-            bw = 125;
+            bw = (myRegion->wideLora && rIf_wide_lora) ? 400 : 125;
            cr = 8;
            sf = 12;
            break;
        case Config_LoRaConfig_ModemPreset_VERY_LONG_SLOW:
-            bw = 31.25;
+            bw = (myRegion->wideLora && rIf_wide_lora) ? 200 : 31.25;
            cr = 8;
            sf = 12;
            break;
@@ -415,14 +423,14 @@ void RadioInterface::applyModemConfig()
        power = 17; // Default to default power if we don't have a valid power

    // Set final tx_power back onto config
-    loraConfig.tx_power = power;
+    loraConfig.tx_power = (int8_t)power; // cppcheck-suppress assignmentAddressToInteger
    
    // 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 = loraConfig.channel_num ? loraConfig.channel_num - 1 : hash(channelName) % numChannels;
+    int channel_num = (loraConfig.channel_num ? loraConfig.channel_num - 1 : hash(channelName)) % numChannels;

    // Old frequency selection formula
    // float freq = myRegion->freqStart + ((((myRegion->freqEnd - myRegion->freqStart) / numChannels) / 2) * channel_num);
@@ -58,12 +58,12 @@ bool ReliableRouter::shouldFilterReceived(MeshPacket *p)
     * this way if an ACK is dropped and a packet is resent we'll ACK the resent packet
     * make sure wasSeenRecently _doesn't_ update
     * finding the channel requires decoding the packet. */
-    if (p->want_ack && (p->to == getNodeNum()) && wasSeenRecently(p, false)) {
+    if (p->want_ack && (p->to == getNodeNum()) && wasSeenRecently(p, false) && !MeshModule::currentReply) {
        if (perhapsDecode(p)) {
            sendAckNak(Routing_Error_NONE, getFrom(p), p->id, p->channel);
            DEBUG_MSG("acking a repeated want_ack packet\n");
        }
-    } else if (wasSeenRecently(p, false) && p->hop_limit == HOP_RELIABLE) {
+    } else if (wasSeenRecently(p, false) && p->hop_limit == HOP_RELIABLE && !MeshModule::currentReply && p->to != nodeDB.getNodeNum()) {
        // retransmission on broadcast has hop_limit still equal to HOP_RELIABLE
        DEBUG_MSG("Resending implicit ack for a repeated floodmsg\n");
        MeshPacket *tosend = packetPool.allocCopy(*p);
@@ -94,7 +94,7 @@ void ReliableRouter::sniffReceived(const MeshPacket *p, const Routing *c)
                            // - not DSR routing)
        if (p->want_ack) {
            if (MeshModule::currentReply)
-                DEBUG_MSG("Someone else has replied to this message, no need for a 2nd ack\n");
+                DEBUG_MSG("Some other module has replied to this message, no need for a 2nd ack\n");
            else
                sendAckNak(Routing_Error_NONE, getFrom(p), p->id, p->channel);
        }
@@ -0,0 +1,13 @@
+#include "configuration.h"
+#include "SX1281Interface.h"
+#include "error.h"
+
+#if !defined(ARCH_PORTDUINO)
+
+SX1281Interface::SX1281Interface(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, RADIOLIB_PIN_TYPE busy,
+                                 SPIClass &spi)
+    : SX128xInterface(cs, irq, rst, busy, spi)
+{
+}
+
+#endif
@@ -0,0 +1,17 @@
+#pragma once
+
+#include "SX128xInterface.h"
+
+/**
+ * Our adapter for SX1281 radios
+ */
+
+#if !defined(ARCH_PORTDUINO)
+
+class SX1281Interface : public SX128xInterface<SX1281>
+{
+  public:
+    SX1281Interface(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, RADIOLIB_PIN_TYPE busy, SPIClass &spi);
+};
+
+#endif
@@ -0,0 +1,247 @@
+#include "configuration.h"
+#include "SX128xInterface.h"
+#include "error.h"
+
+#if !defined(ARCH_PORTDUINO)
+
+// Particular boards might define a different max power based on what their hardware can do
+#ifndef SX128X_MAX_POWER
+#define SX128X_MAX_POWER 22
+#endif
+
+template<typename T>
+SX128xInterface<T>::SX128xInterface(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, RADIOLIB_PIN_TYPE busy,
+                                 SPIClass &spi)
+    : RadioLibInterface(cs, irq, rst, busy, spi, &lora), lora(&module)
+{
+}
+
+/// Initialise the Driver transport hardware and software.
+/// Make sure the Driver is properly configured before calling init().
+/// \return true if initialisation succeeded.
+template<typename T>
+bool SX128xInterface<T>::init()
+{
+#ifdef SX128X_POWER_EN
+    digitalWrite(SX128X_POWER_EN, HIGH);
+    pinMode(SX128X_POWER_EN, OUTPUT);
+#endif
+
+#ifdef SX128X_RXEN                  // set not rx or tx mode
+    digitalWrite(SX128X_RXEN, LOW); // Set low before becoming an output
+    pinMode(SX128X_RXEN, OUTPUT);
+#endif
+#ifdef SX128X_TXEN
+    digitalWrite(SX128X_TXEN, LOW);
+    pinMode(SX128X_TXEN, OUTPUT);
+#endif
+
+    RadioLibInterface::init();
+
+    if (power == 0)
+        power = SX128X_MAX_POWER;
+
+    if (power > SX128X_MAX_POWER) // This chip has lower power limits than some
+        power = SX128X_MAX_POWER;
+
+    limitPower();
+
+    int res = lora.begin(getFreq(), bw, sf, cr, syncWord, power, preambleLength);
+    // \todo Display actual typename of the adapter, not just `SX128x`
+    DEBUG_MSG("SX128x 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);    
+
+#ifdef SX128X_TXEN
+    // lora.begin sets Dio2 as RF switch control, which is not true if we are manually controlling RX and TX
+    if (res == RADIOLIB_ERR_NONE)
+        res = lora.setDio2AsRfSwitch(true);
+#endif
+
+    if (res == RADIOLIB_ERR_NONE)
+        res = lora.setCRC(RADIOLIB_SX128X_LORA_CRC_ON);
+
+    if (res == RADIOLIB_ERR_NONE)
+        startReceive(); // start receiving
+
+    return res == RADIOLIB_ERR_NONE;
+}
+
+template<typename T>
+bool SX128xInterface<T>::reconfigure()
+{
+    RadioLibInterface::reconfigure();
+
+    // set mode to standby
+    setStandby();
+
+    // configure publicly accessible settings
+    int err = lora.setSpreadingFactor(sf);
+    if (err != RADIOLIB_ERR_NONE)
+        RECORD_CRITICALERROR(CriticalErrorCode_INVALID_RADIO_SETTING);
+
+    err = lora.setBandwidth(bw);
+    if (err != RADIOLIB_ERR_NONE)
+        RECORD_CRITICALERROR(CriticalErrorCode_INVALID_RADIO_SETTING);
+
+    err = lora.setCodingRate(cr);
+    if (err != RADIOLIB_ERR_NONE)
+        RECORD_CRITICALERROR(CriticalErrorCode_INVALID_RADIO_SETTING);
+
+    // Hmm - seems to lower SNR when the signal levels are high.  Leaving off for now...
+    // TODO: Confirm gain registers are okay now
+    // err = lora.setRxGain(true);
+    // assert(err == RADIOLIB_ERR_NONE);
+
+    err = lora.setSyncWord(syncWord);
+    assert(err == RADIOLIB_ERR_NONE);
+
+    err = lora.setPreambleLength(preambleLength);
+    assert(err == RADIOLIB_ERR_NONE);
+
+    err = lora.setFrequency(getFreq());
+    if (err != RADIOLIB_ERR_NONE)
+        RECORD_CRITICALERROR(CriticalErrorCode_INVALID_RADIO_SETTING);
+
+    if (power > 22) // This chip has lower power limits than some
+        power = 22;
+    err = lora.setOutputPower(power);
+    assert(err == RADIOLIB_ERR_NONE);
+
+    startReceive(); // restart receiving
+
+    return RADIOLIB_ERR_NONE;
+}
+
+template<typename T>
+void INTERRUPT_ATTR SX128xInterface<T>::disableInterrupt()
+{
+    lora.clearDio1Action();
+}
+
+template<typename T>
+void SX128xInterface<T>::setStandby()
+{
+    checkNotification(); // handle any pending interrupts before we force standby
+    
+    int err = lora.standby();
+    assert(err == RADIOLIB_ERR_NONE);
+
+#ifdef SX128X_RXEN // we have RXEN/TXEN control - turn off RX and TX power
+    digitalWrite(SX128X_RXEN, LOW);
+#endif
+#ifdef SX128X_TXEN
+    digitalWrite(SX128X_TXEN, LOW);
+#endif
+
+    isReceiving = false; // If we were receiving, not any more
+    disableInterrupt();
+    completeSending(); // If we were sending, not anymore
+}
+
+/**
+ * Add SNR data to received messages
+ */
+template<typename T>
+void SX128xInterface<T>::addReceiveMetadata(MeshPacket *mp)
+{
+    // DEBUG_MSG("PacketStatus %x\n", lora.getPacketStatus());
+    mp->rx_snr = lora.getSNR();
+    mp->rx_rssi = lround(lora.getRSSI());
+}
+
+/** We override to turn on transmitter power as needed.
+ */
+template<typename T>
+void SX128xInterface<T>::configHardwareForSend()
+{
+#ifdef SX128X_TXEN // we have RXEN/TXEN control - turn on TX power / off RX power
+    digitalWrite(SX128X_TXEN, HIGH);
+#endif
+#ifdef SX128X_RXEN
+    digitalWrite(SX128X_RXEN, LOW);
+#endif
+
+    RadioLibInterface::configHardwareForSend();
+}
+
+// For power draw measurements, helpful to force radio to stay sleeping
+// #define SLEEP_ONLY
+
+template<typename T>
+void SX128xInterface<T>::startReceive()
+{
+#ifdef SLEEP_ONLY
+    sleep();
+#else
+
+    setStandby();
+
+#ifdef SX128X_RXEN // we have RXEN/TXEN control - turn on RX power / off TX power
+    digitalWrite(SX128X_RXEN, HIGH);
+#endif
+#ifdef SX128X_TXEN
+    digitalWrite(SX128X_TXEN, LOW);
+#endif
+  
+    int err = lora.startReceive();
+
+    assert(err == RADIOLIB_ERR_NONE);
+
+    isReceiving = true;
+
+    // Must be done AFTER, starting transmit, because startTransmit clears (possibly stale) interrupt pending register bits
+    enableInterrupt(isrRxLevel0);
+#endif
+}
+
+/** Could we send right now (i.e. either not actively receving or transmitting)? */
+template<typename T>
+bool SX128xInterface<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 SX128xInterface<T>::isActivelyReceiving()
+{
+    return isChannelActive();
+}
+
+template<typename T>
+bool SX128xInterface<T>::sleep()
+{
+    // Not keeping config is busted - next time nrf52 board boots lora sending fails  tcxo related? - see datasheet
+    // \todo Display actual typename of the adapter, not just `SX128x`
+    DEBUG_MSG("SX128x entering sleep mode (FIXME, don't keep config)\n");
+    setStandby(); // Stop any pending operations
+
+    // turn off TCXO if it was powered
+    // FIXME - this isn't correct
+    // lora.setTCXO(0);
+
+    // put chipset into sleep mode (we've already disabled interrupts by now)
+    bool keepConfig = true;
+    lora.sleep(keepConfig); // Note: we do not keep the config, full reinit will be needed
+
+#ifdef SX128X_POWER_EN
+    digitalWrite(SX128X_POWER_EN, LOW);
+#endif
+
+    return true;
+}
+
+#endif
@@ -0,0 +1,75 @@
+#pragma once
+
+#if !defined(ARCH_PORTDUINO)
+
+#include "RadioLibInterface.h"
+
+/**
+ * \brief Adapter for SX128x radio family. Implements common logic for child classes.
+ * \tparam T RadioLib module type for SX128x: SX1281.
+ */
+template<class T>
+class SX128xInterface : public RadioLibInterface
+{
+  public:
+    SX128xInterface(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, RADIOLIB_PIN_TYPE busy, SPIClass &spi);
+
+    /// Initialise the Driver transport hardware and software.
+    /// Make sure the Driver is properly configured before calling init().
+    /// \return true if initialisation succeeded.
+    virtual bool init() override;
+
+    /// Apply any radio provisioning changes
+    /// Make sure the Driver is properly configured before calling init().
+    /// \return true if initialisation succeeded.
+    virtual bool reconfigure() override;
+
+    /// Prepare hardware for sleep.  Call this _only_ for deep sleep, not needed for light sleep.
+    virtual bool sleep() override;
+
+  protected:
+
+    float currentLimit = 140; // Higher OCP limit for SX128x PA
+
+    /**
+     * Specific module instance 
+     */
+    T lora;
+
+    /**
+     * Glue functions called from ISR land
+     */
+    virtual void disableInterrupt() override;
+
+    /**
+     * Enable a particular ISR callback glue function
+     */
+    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;
+
+    /**
+     * Start waiting to receive a message
+     */
+    virtual void startReceive() override;
+
+    /**
+     *  We override to turn on transmitter power as needed.
+     */
+    virtual void configHardwareForSend() override;
+
+    /**
+     * Add SNR data to received messages
+     */
+    virtual void addReceiveMetadata(MeshPacket *mp) override;
+
+    virtual void setStandby() override;
+
+  private:
+};
+
+#endif
@@ -18,6 +18,9 @@ class SinglePortModule : public MeshModule
    SinglePortModule(const char *_name, PortNum _ourPortNum) : MeshModule(_name), ourPortNum(_ourPortNum) {}

  protected:
+    uint32_t max_channel_util_percent = 40;
+    uint32_t polite_channel_util_percent = 25;
+
    /**
     * @return true if you want to receive the specified portnum
     */
@@ -0,0 +1,148 @@
+#include "mesh/eth/ethClient.h"
+#include "NodeDB.h"
+#include "RTC.h"
+#include "concurrency/Periodic.h"
+#include <SPI.h>
+#include <RAK13800_W5100S.h>
+#include "target_specific.h"
+#include "mesh/eth/ethServerAPI.h"
+#include "mqtt/MQTT.h"
+
+#ifndef DISABLE_NTP
+#include <NTPClient.h>
+
+// NTP
+EthernetUDP ntpUDP;
+NTPClient timeClient(ntpUDP, config.network.ntp_server);
+uint32_t ntp_renew = 0;
+#endif
+
+bool ethStartupComplete = 0;
+
+using namespace concurrency;
+
+static Periodic *ethEvent;
+
+static int32_t reconnectETH()
+{
+    if (config.network.eth_enabled) {
+        Ethernet.maintain();
+        if (!ethStartupComplete) {
+            // Start web server
+            DEBUG_MSG("... Starting network services\n");
+
+#ifndef DISABLE_NTP
+            DEBUG_MSG("Starting NTP time client\n");
+            timeClient.begin();
+            timeClient.setUpdateInterval(60 * 60); // Update once an hour
+#endif            
+            // initWebServer();
+            initApiServer();
+
+            ethStartupComplete = true;
+        }
+
+        // FIXME this is kinda yucky, instead we should just have an observable for 'wifireconnected'
+        if (mqtt && !mqtt->connected()) {
+            mqtt->reconnect();
+        }
+    }
+
+#ifndef DISABLE_NTP
+    if (isEthernetAvailable() && (ntp_renew < millis())) {
+	    
+        DEBUG_MSG("Updating NTP time from %s\n", config.network.ntp_server);
+        if (timeClient.update()) {
+            DEBUG_MSG("NTP Request Success - Setting RTCQualityNTP if needed\n");
+
+            struct timeval tv;
+            tv.tv_sec = timeClient.getEpochTime();
+            tv.tv_usec = 0;
+
+            perhapsSetRTC(RTCQualityNTP, &tv);
+
+            ntp_renew = millis() + 43200 * 1000; // success, refresh every 12 hours
+
+        } else {
+            DEBUG_MSG("NTP Update failed\n");
+            ntp_renew = millis() + 300 * 1000; // failure, retry every 5 minutes
+        }
+    }
+#endif
+
+    return 5000; // every 5 seconds
+}
+
+// Startup Ethernet
+bool initEthernet()
+{
+    if (config.network.eth_enabled) {
+
+#ifdef PIN_ETHERNET_RESET
+        pinMode(PIN_ETHERNET_RESET, OUTPUT);
+        digitalWrite(PIN_ETHERNET_RESET, LOW);  // Reset Time.
+        delay(100);
+        digitalWrite(PIN_ETHERNET_RESET, HIGH);  // Reset Time.
+#endif
+
+        Ethernet.init( ETH_SPI_PORT, PIN_ETHERNET_SS );
+
+        uint8_t mac[6];
+
+        int status = 0;
+
+        //        createSSLCert();
+
+        getMacAddr(mac); // FIXME use the BLE MAC for now...
+
+        if (config.network.eth_mode == Config_NetworkConfig_EthMode_DHCP) {
+            DEBUG_MSG("starting Ethernet DHCP\n");
+            status = Ethernet.begin(mac);
+        } else if (config.network.eth_mode == Config_NetworkConfig_EthMode_STATIC) {
+            DEBUG_MSG("starting Ethernet Static\n");
+            Ethernet.begin(mac, config.network.ipv4_config.ip, config.network.ipv4_config.dns, config.network.ipv4_config.subnet);
+        } else {
+            DEBUG_MSG("Ethernet Disabled\n");
+            return false;
+        }
+
+        if (status == 0) {
+            if (Ethernet.hardwareStatus() == EthernetNoHardware) {
+                DEBUG_MSG("Ethernet shield was not found.\n");
+                return false;
+            } else if (Ethernet.linkStatus() == LinkOFF) {
+                DEBUG_MSG("Ethernet cable is not connected.\n");
+                return false;
+            } else{
+                DEBUG_MSG("Unknown Ethernet error.\n");
+                return false;
+            }
+        } else {
+            DEBUG_MSG("Local IP %u.%u.%u.%u\n",Ethernet.localIP()[0], Ethernet.localIP()[1], Ethernet.localIP()[2], Ethernet.localIP()[3]);
+            DEBUG_MSG("Subnet Mask %u.%u.%u.%u\n",Ethernet.subnetMask()[0], Ethernet.subnetMask()[1], Ethernet.subnetMask()[2], Ethernet.subnetMask()[3]);
+            DEBUG_MSG("Gateway IP %u.%u.%u.%u\n",Ethernet.gatewayIP()[0], Ethernet.gatewayIP()[1], Ethernet.gatewayIP()[2], Ethernet.gatewayIP()[3]);
+            DEBUG_MSG("DNS Server IP %u.%u.%u.%u\n",Ethernet.dnsServerIP()[0], Ethernet.dnsServerIP()[1], Ethernet.dnsServerIP()[2], Ethernet.dnsServerIP()[3]);
+        }
+
+        ethEvent = new Periodic("ethConnect", reconnectETH);
+
+        return true;
+
+    } else {
+        DEBUG_MSG("Not using Ethernet\n");
+        return false;
+    }
+}
+
+bool isEthernetAvailable() {
+
+    if (!config.network.eth_enabled) {
+        return false;
+    } else if (Ethernet.hardwareStatus() == EthernetNoHardware) {
+        return false;
+    } else if (Ethernet.linkStatus() == LinkOFF) {
+        return false;
+    } else {
+        return true;
+    }
+}
@@ -0,0 +1,8 @@
+#pragma once
+
+#include "configuration.h"
+#include <Arduino.h>
+#include <functional>
+
+bool initEthernet();
+bool isEthernetAvailable();
@@ -0,0 +1,82 @@
+#include "ethServerAPI.h"
+#include "configuration.h"
+#include <Arduino.h>
+
+static ethServerPort *apiPort;
+
+void initApiServer(int port)
+{
+    // Start API server on port 4403
+    if (!apiPort) {
+        apiPort = new ethServerPort(port);
+        DEBUG_MSG("API server listening on TCP port %d\n", port);
+        apiPort->init();
+    }
+}
+
+ethServerAPI::ethServerAPI(EthernetClient &_client) : StreamAPI(&client), client(_client)
+{
+    DEBUG_MSG("Incoming ethernet connection\n");
+}
+
+ethServerAPI::~ethServerAPI()
+{
+    client.stop();
+
+    // FIXME - delete this if the client dropps the connection!
+}
+
+/// override close to also shutdown the TCP link
+void ethServerAPI::close()
+{
+    client.stop(); // drop tcp connection
+    StreamAPI::close();
+}
+
+/// Check the current underlying physical link to see if the client is currently connected
+bool ethServerAPI::checkIsConnected()
+{
+    return client.connected();
+}
+
+int32_t ethServerAPI::runOnce()
+{
+    if (client.connected()) {
+        return StreamAPI::runOnce();
+    } else {
+        DEBUG_MSG("Client dropped connection, suspending API service\n");
+        enabled = false; // we no longer need to run
+        return 0;
+    }
+}
+
+/// If an api server is running, we try to spit out debug 'serial' characters there
+void ethServerPort::debugOut(char c)
+{
+    if (apiPort && apiPort->openAPI)
+        apiPort->openAPI->debugOut(c);
+}
+
+
+ethServerPort::ethServerPort(int port) : EthernetServer(port), concurrency::OSThread("ApiServer") {}
+
+void ethServerPort::init()
+{
+    begin();
+}
+
+int32_t ethServerPort::runOnce()
+{
+    auto client = available();
+    if (client) {
+        // Close any previous connection (see FIXME in header file)
+        if (openAPI) {
+            DEBUG_MSG("Force closing previous TCP connection\n");
+            delete openAPI;
+        }
+
+        openAPI = new ethServerAPI(client);
+    }
+
+    return 100; // only check occasionally for incoming connections
+}
@@ -0,0 +1,58 @@
+#pragma once
+
+#include "StreamAPI.h"
+#include <RAK13800_W5100S.h>
+
+/**
+ * Provides both debug printing and, if the client starts sending protobufs to us, switches to send/receive protobufs
+ * (and starts dropping debug printing - FIXME, eventually those prints should be encapsulated in protobufs).
+ */
+class ethServerAPI : public StreamAPI
+{
+  private:
+    EthernetClient client;
+
+  public:
+    explicit ethServerAPI(EthernetClient &_client);
+
+    virtual ~ethServerAPI();
+
+    /// override close to also shutdown the TCP link
+    virtual void close();
+
+  protected:
+    /// We override this method to prevent publishing EVENT_SERIAL_CONNECTED/DISCONNECTED for wifi links (we want the board to
+    /// stay in the POWERED state to prevent disabling wifi)
+    virtual void onConnectionChanged(bool connected) override {}
+
+    virtual int32_t runOnce() override; // Check for dropped client connections
+
+    /// Check the current underlying physical link to see if the client is currently connected
+    virtual bool checkIsConnected() override;
+};
+
+/**
+ * Listens for incoming connections and does accepts and creates instances of WiFiServerAPI as needed
+ */
+class ethServerPort : public EthernetServer, private concurrency::OSThread
+{
+    /** The currently open port
+     *
+     * FIXME: We currently only allow one open TCP connection at a time, because we depend on the loop() call in this class to
+     * delegate to the worker.  Once coroutines are implemented we can relax this restriction.
+     */
+    ethServerAPI *openAPI = NULL;
+
+  public:
+    explicit ethServerPort(int port);
+
+    void init();
+
+    /// If an api server is running, we try to spit out debug 'serial' characters there
+    static void debugOut(char c);
+    
+  protected:
+    int32_t runOnce() override;
+};
+
+void initApiServer(int port=4403);
@@ -59,14 +59,12 @@ typedef struct _AdminMessage {
        AdminMessage_ModuleConfigType get_module_config_request;
        /* Send the current Config in the response to this message. */
        ModuleConfig get_module_config_response;
-        /* Send all channels in the response to this message */
-        bool get_all_channel_request;
        /* Get the Canned Message Module messages in the response to this message. */
        bool get_canned_message_module_messages_request;
        /* Get the Canned Message Module messages in the response to this message. */
        char get_canned_message_module_messages_response[201];
        /* Request the node to send device metadata (firmware, protobuf version, etc) */
-        uint32_t get_device_metadata_request;
+        bool get_device_metadata_request;
        /* Device metadata response */
        DeviceMetadata get_device_metadata_response;
        /* Set the owner for this node */
@@ -94,6 +92,9 @@ typedef struct _AdminMessage {
        bool confirm_set_channel;
        /* TODO: REPLACE */
        bool confirm_set_radio;
+        /* Tell the node to reboot into the OTA Firmware in this many seconds (or <0 to cancel reboot)
+     Only Implemented for ESP32 Devices. This needs to be issued to send a new main firmware via bluetooth. */
+        int32_t reboot_ota_seconds;
        /* This message is only supported for the simulator porduino build.
     If received the simulator will exit successfully. */
        bool exit_simulator;
@@ -136,7 +137,6 @@ extern "C" {
 #define AdminMessage_get_config_response_tag     6
 #define AdminMessage_get_module_config_request_tag 7
 #define AdminMessage_get_module_config_response_tag 8
-#define AdminMessage_get_all_channel_request_tag 9
 #define AdminMessage_get_canned_message_module_messages_request_tag 10
 #define AdminMessage_get_canned_message_module_messages_response_tag 11
 #define AdminMessage_get_device_metadata_request_tag 12
@@ -150,6 +150,7 @@ extern "C" {
 #define AdminMessage_confirm_set_module_config_tag 65
 #define AdminMessage_confirm_set_channel_tag     66
 #define AdminMessage_confirm_set_radio_tag       67
+#define AdminMessage_reboot_ota_seconds_tag      95
 #define AdminMessage_exit_simulator_tag          96
 #define AdminMessage_reboot_seconds_tag          97
 #define AdminMessage_shutdown_seconds_tag        98
@@ -166,10 +167,9 @@ X(a, STATIC,   ONEOF,    UENUM,    (payload_variant,get_config_request,get_confi
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,get_config_response,get_config_response),   6) \
 X(a, STATIC,   ONEOF,    UENUM,    (payload_variant,get_module_config_request,get_module_config_request),   7) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,get_module_config_response,get_module_config_response),   8) \
-X(a, STATIC,   ONEOF,    BOOL,     (payload_variant,get_all_channel_request,get_all_channel_request),   9) \
 X(a, STATIC,   ONEOF,    BOOL,     (payload_variant,get_canned_message_module_messages_request,get_canned_message_module_messages_request),  10) \
 X(a, STATIC,   ONEOF,    STRING,   (payload_variant,get_canned_message_module_messages_response,get_canned_message_module_messages_response),  11) \
-X(a, STATIC,   ONEOF,    UINT32,   (payload_variant,get_device_metadata_request,get_device_metadata_request),  12) \
+X(a, STATIC,   ONEOF,    BOOL,     (payload_variant,get_device_metadata_request,get_device_metadata_request),  12) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,get_device_metadata_response,get_device_metadata_response),  13) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,set_owner,set_owner),  32) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,set_channel,set_channel),  33) \
@@ -180,6 +180,7 @@ X(a, STATIC,   ONEOF,    BOOL,     (payload_variant,confirm_set_config,confirm_s
 X(a, STATIC,   ONEOF,    BOOL,     (payload_variant,confirm_set_module_config,confirm_set_module_config),  65) \
 X(a, STATIC,   ONEOF,    BOOL,     (payload_variant,confirm_set_channel,confirm_set_channel),  66) \
 X(a, STATIC,   ONEOF,    BOOL,     (payload_variant,confirm_set_radio,confirm_set_radio),  67) \
+X(a, STATIC,   ONEOF,    INT32,    (payload_variant,reboot_ota_seconds,reboot_ota_seconds),  95) \
 X(a, STATIC,   ONEOF,    BOOL,     (payload_variant,exit_simulator,exit_simulator),  96) \
 X(a, STATIC,   ONEOF,    INT32,    (payload_variant,reboot_seconds,reboot_seconds),  97) \
 X(a, STATIC,   ONEOF,    INT32,    (payload_variant,shutdown_seconds,shutdown_seconds),  98) \
@@ -54,7 +54,7 @@ extern const pb_msgdesc_t ChannelSet_msg;
 #define ChannelSet_fields &ChannelSet_msg

 /* Maximum encoded size of messages (where known) */
-#define ChannelSet_size                          581
+#define ChannelSet_size                          582

 #ifdef __cplusplus
 } /* extern "C" */
@@ -21,6 +21,9 @@ PB_BIND(Config_PowerConfig, Config_PowerConfig, AUTO)
 PB_BIND(Config_NetworkConfig, Config_NetworkConfig, AUTO)


+PB_BIND(Config_NetworkConfig_IpV4Config, Config_NetworkConfig_IpV4Config, AUTO)
+
+
 PB_BIND(Config_DisplayConfig, Config_DisplayConfig, AUTO)


@@ -39,3 +42,4 @@ PB_BIND(Config_BluetoothConfig, Config_BluetoothConfig, AUTO)



+
@@ -37,6 +37,11 @@ typedef enum _Config_NetworkConfig_WiFiMode {
    Config_NetworkConfig_WiFiMode_ACCESS_POINT_HIDDEN = 2 
 } Config_NetworkConfig_WiFiMode;

+typedef enum _Config_NetworkConfig_EthMode { 
+    Config_NetworkConfig_EthMode_DHCP = 0, 
+    Config_NetworkConfig_EthMode_STATIC = 1 
+} Config_NetworkConfig_EthMode;
+
 typedef enum _Config_DisplayConfig_GpsCoordinateFormat { 
    Config_DisplayConfig_GpsCoordinateFormat_DEC = 0, 
    Config_DisplayConfig_GpsCoordinateFormat_DMS = 1, 
@@ -64,7 +69,8 @@ typedef enum _Config_LoRaConfig_RegionCode {
    Config_LoRaConfig_RegionCode_RU = 9, 
    Config_LoRaConfig_RegionCode_IN = 10, 
    Config_LoRaConfig_RegionCode_NZ_865 = 11, 
-    Config_LoRaConfig_RegionCode_TH = 12 
+    Config_LoRaConfig_RegionCode_TH = 12, 
+    Config_LoRaConfig_RegionCode_LORA_24 = 13 
 } Config_LoRaConfig_RegionCode;

 typedef enum _Config_LoRaConfig_ModemPreset { 
@@ -116,18 +122,17 @@ typedef struct _Config_LoRaConfig {
    uint32_t hop_limit;
    bool tx_enabled;
    int8_t tx_power;
-    uint8_t channel_num;
+    uint16_t channel_num;
    pb_size_t ignore_incoming_count;
    uint32_t ignore_incoming[3];
 } Config_LoRaConfig;

-typedef struct _Config_NetworkConfig { 
-    bool wifi_enabled;
-    Config_NetworkConfig_WiFiMode wifi_mode;
-    char wifi_ssid[33];
-    char wifi_psk[64];
-    char ntp_server[33];
-} Config_NetworkConfig;
+typedef struct _Config_NetworkConfig_IpV4Config { 
+    uint32_t ip;
+    uint32_t gateway;
+    uint32_t subnet;
+    uint32_t dns;
+} Config_NetworkConfig_IpV4Config;

 typedef struct _Config_PositionConfig { 
    uint32_t position_broadcast_secs;
@@ -150,6 +155,17 @@ typedef struct _Config_PowerConfig {
    uint32_t min_wake_secs;
 } Config_PowerConfig;

+typedef struct _Config_NetworkConfig { 
+    bool wifi_enabled;
+    char wifi_ssid[33];
+    char wifi_psk[64];
+    char ntp_server[33];
+    bool eth_enabled;
+    Config_NetworkConfig_EthMode eth_mode;
+    bool has_ipv4_config;
+    Config_NetworkConfig_IpV4Config ipv4_config;
+} Config_NetworkConfig;
+
 typedef struct _Config { 
    pb_size_t which_payload_variant;
    union {
@@ -177,6 +193,10 @@ typedef struct _Config {
 #define _Config_NetworkConfig_WiFiMode_MAX Config_NetworkConfig_WiFiMode_ACCESS_POINT_HIDDEN
 #define _Config_NetworkConfig_WiFiMode_ARRAYSIZE ((Config_NetworkConfig_WiFiMode)(Config_NetworkConfig_WiFiMode_ACCESS_POINT_HIDDEN+1))

+#define _Config_NetworkConfig_EthMode_MIN Config_NetworkConfig_EthMode_DHCP
+#define _Config_NetworkConfig_EthMode_MAX Config_NetworkConfig_EthMode_STATIC
+#define _Config_NetworkConfig_EthMode_ARRAYSIZE ((Config_NetworkConfig_EthMode)(Config_NetworkConfig_EthMode_STATIC+1))
+
 #define _Config_DisplayConfig_GpsCoordinateFormat_MIN Config_DisplayConfig_GpsCoordinateFormat_DEC
 #define _Config_DisplayConfig_GpsCoordinateFormat_MAX Config_DisplayConfig_GpsCoordinateFormat_OSGR
 #define _Config_DisplayConfig_GpsCoordinateFormat_ARRAYSIZE ((Config_DisplayConfig_GpsCoordinateFormat)(Config_DisplayConfig_GpsCoordinateFormat_OSGR+1))
@@ -186,8 +206,8 @@ typedef struct _Config {
 #define _Config_DisplayConfig_DisplayUnits_ARRAYSIZE ((Config_DisplayConfig_DisplayUnits)(Config_DisplayConfig_DisplayUnits_IMPERIAL+1))

 #define _Config_LoRaConfig_RegionCode_MIN Config_LoRaConfig_RegionCode_UNSET
-#define _Config_LoRaConfig_RegionCode_MAX Config_LoRaConfig_RegionCode_TH
-#define _Config_LoRaConfig_RegionCode_ARRAYSIZE ((Config_LoRaConfig_RegionCode)(Config_LoRaConfig_RegionCode_TH+1))
+#define _Config_LoRaConfig_RegionCode_MAX Config_LoRaConfig_RegionCode_LORA_24
+#define _Config_LoRaConfig_RegionCode_ARRAYSIZE ((Config_LoRaConfig_RegionCode)(Config_LoRaConfig_RegionCode_LORA_24+1))

 #define _Config_LoRaConfig_ModemPreset_MIN Config_LoRaConfig_ModemPreset_LONG_FAST
 #define _Config_LoRaConfig_ModemPreset_MAX Config_LoRaConfig_ModemPreset_SHORT_FAST
@@ -207,7 +227,8 @@ extern "C" {
 #define Config_DeviceConfig_init_default         {_Config_DeviceConfig_Role_MIN, 0, 0}
 #define Config_PositionConfig_init_default       {0, 0, 0, 0, 0, 0, 0}
 #define Config_PowerConfig_init_default          {0, 0, 0, 0, 0, 0, 0, 0}
-#define Config_NetworkConfig_init_default        {0, _Config_NetworkConfig_WiFiMode_MIN, "", "", ""}
+#define Config_NetworkConfig_init_default        {0, "", "", "", 0, _Config_NetworkConfig_EthMode_MIN, false, Config_NetworkConfig_IpV4Config_init_default}
+#define Config_NetworkConfig_IpV4Config_init_default {0, 0, 0, 0}
 #define Config_DisplayConfig_init_default        {0, _Config_DisplayConfig_GpsCoordinateFormat_MIN, 0, 0, 0, _Config_DisplayConfig_DisplayUnits_MIN}
 #define Config_LoRaConfig_init_default           {0, _Config_LoRaConfig_ModemPreset_MIN, 0, 0, 0, 0, _Config_LoRaConfig_RegionCode_MIN, 0, 0, 0, 0, 0, {0, 0, 0}}
 #define Config_BluetoothConfig_init_default      {0, _Config_BluetoothConfig_PairingMode_MIN, 0}
@@ -215,7 +236,8 @@ extern "C" {
 #define Config_DeviceConfig_init_zero            {_Config_DeviceConfig_Role_MIN, 0, 0}
 #define Config_PositionConfig_init_zero          {0, 0, 0, 0, 0, 0, 0}
 #define Config_PowerConfig_init_zero             {0, 0, 0, 0, 0, 0, 0, 0}
-#define Config_NetworkConfig_init_zero           {0, _Config_NetworkConfig_WiFiMode_MIN, "", "", ""}
+#define Config_NetworkConfig_init_zero           {0, "", "", "", 0, _Config_NetworkConfig_EthMode_MIN, false, Config_NetworkConfig_IpV4Config_init_zero}
+#define Config_NetworkConfig_IpV4Config_init_zero {0, 0, 0, 0}
 #define Config_DisplayConfig_init_zero           {0, _Config_DisplayConfig_GpsCoordinateFormat_MIN, 0, 0, 0, _Config_DisplayConfig_DisplayUnits_MIN}
 #define Config_LoRaConfig_init_zero              {0, _Config_LoRaConfig_ModemPreset_MIN, 0, 0, 0, 0, _Config_LoRaConfig_RegionCode_MIN, 0, 0, 0, 0, 0, {0, 0, 0}}
 #define Config_BluetoothConfig_init_zero         {0, _Config_BluetoothConfig_PairingMode_MIN, 0}
@@ -245,11 +267,10 @@ extern "C" {
 #define Config_LoRaConfig_tx_power_tag           10
 #define Config_LoRaConfig_channel_num_tag        11
 #define Config_LoRaConfig_ignore_incoming_tag    103
-#define Config_NetworkConfig_wifi_enabled_tag    1
-#define Config_NetworkConfig_wifi_mode_tag       2
-#define Config_NetworkConfig_wifi_ssid_tag       3
-#define Config_NetworkConfig_wifi_psk_tag        4
-#define Config_NetworkConfig_ntp_server_tag      5
+#define Config_NetworkConfig_IpV4Config_ip_tag   1
+#define Config_NetworkConfig_IpV4Config_gateway_tag 2
+#define Config_NetworkConfig_IpV4Config_subnet_tag 3
+#define Config_NetworkConfig_IpV4Config_dns_tag  4
 #define Config_PositionConfig_position_broadcast_secs_tag 1
 #define Config_PositionConfig_position_broadcast_smart_enabled_tag 2
 #define Config_PositionConfig_fixed_position_tag 3
@@ -265,6 +286,13 @@ extern "C" {
 #define Config_PowerConfig_sds_secs_tag          6
 #define Config_PowerConfig_ls_secs_tag           7
 #define Config_PowerConfig_min_wake_secs_tag     8
+#define Config_NetworkConfig_wifi_enabled_tag    1
+#define Config_NetworkConfig_wifi_ssid_tag       3
+#define Config_NetworkConfig_wifi_psk_tag        4
+#define Config_NetworkConfig_ntp_server_tag      5
+#define Config_NetworkConfig_eth_enabled_tag     6
+#define Config_NetworkConfig_eth_mode_tag        7
+#define Config_NetworkConfig_ipv4_config_tag     8
 #define Config_device_tag                        1
 #define Config_position_tag                      2
 #define Config_power_tag                         3
@@ -324,12 +352,23 @@ X(a, STATIC,   SINGULAR, UINT32,   min_wake_secs,     8)

 #define Config_NetworkConfig_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, BOOL,     wifi_enabled,      1) \
-X(a, STATIC,   SINGULAR, UENUM,    wifi_mode,         2) \
 X(a, STATIC,   SINGULAR, STRING,   wifi_ssid,         3) \
 X(a, STATIC,   SINGULAR, STRING,   wifi_psk,          4) \
-X(a, STATIC,   SINGULAR, STRING,   ntp_server,        5)
+X(a, STATIC,   SINGULAR, STRING,   ntp_server,        5) \
+X(a, STATIC,   SINGULAR, BOOL,     eth_enabled,       6) \
+X(a, STATIC,   SINGULAR, UENUM,    eth_mode,          7) \
+X(a, STATIC,   OPTIONAL, MESSAGE,  ipv4_config,       8)
 #define Config_NetworkConfig_CALLBACK NULL
 #define Config_NetworkConfig_DEFAULT NULL
+#define Config_NetworkConfig_ipv4_config_MSGTYPE Config_NetworkConfig_IpV4Config
+
+#define Config_NetworkConfig_IpV4Config_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, FIXED32,  ip,                1) \
+X(a, STATIC,   SINGULAR, FIXED32,  gateway,           2) \
+X(a, STATIC,   SINGULAR, FIXED32,  subnet,            3) \
+X(a, STATIC,   SINGULAR, FIXED32,  dns,               4)
+#define Config_NetworkConfig_IpV4Config_CALLBACK NULL
+#define Config_NetworkConfig_IpV4Config_DEFAULT NULL

 #define Config_DisplayConfig_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, UINT32,   screen_on_secs,    1) \
@@ -369,6 +408,7 @@ extern const pb_msgdesc_t Config_DeviceConfig_msg;
 extern const pb_msgdesc_t Config_PositionConfig_msg;
 extern const pb_msgdesc_t Config_PowerConfig_msg;
 extern const pb_msgdesc_t Config_NetworkConfig_msg;
+extern const pb_msgdesc_t Config_NetworkConfig_IpV4Config_msg;
 extern const pb_msgdesc_t Config_DisplayConfig_msg;
 extern const pb_msgdesc_t Config_LoRaConfig_msg;
 extern const pb_msgdesc_t Config_BluetoothConfig_msg;
@@ -379,6 +419,7 @@ extern const pb_msgdesc_t Config_BluetoothConfig_msg;
 #define Config_PositionConfig_fields &Config_PositionConfig_msg
 #define Config_PowerConfig_fields &Config_PowerConfig_msg
 #define Config_NetworkConfig_fields &Config_NetworkConfig_msg
+#define Config_NetworkConfig_IpV4Config_fields &Config_NetworkConfig_IpV4Config_msg
 #define Config_DisplayConfig_fields &Config_DisplayConfig_msg
 #define Config_LoRaConfig_fields &Config_LoRaConfig_msg
 #define Config_BluetoothConfig_fields &Config_BluetoothConfig_msg
@@ -387,11 +428,12 @@ extern const pb_msgdesc_t Config_BluetoothConfig_msg;
 #define Config_BluetoothConfig_size              10
 #define Config_DeviceConfig_size                 6
 #define Config_DisplayConfig_size                20
-#define Config_LoRaConfig_size                   67
-#define Config_NetworkConfig_size                137
+#define Config_LoRaConfig_size                   68
+#define Config_NetworkConfig_IpV4Config_size     20
+#define Config_NetworkConfig_size                161
 #define Config_PositionConfig_size               30
 #define Config_PowerConfig_size                  43
-#define Config_size                              140
+#define Config_size                              164

 #ifdef __cplusplus
 } /* extern "C" */
@@ -16,6 +16,14 @@ typedef struct _DeviceMetadata {
    char firmware_version[18];
    /* Device state version */
    uint32_t device_state_version;
+    /* Indicates whether the device can shutdown CPU natively or via power management chip */
+    bool canShutdown;
+    /* Indicates that the device has native wifi capability */
+    bool hasWifi;
+    /* Indicates that the device has native bluetooth capability */
+    bool hasBluetooth;
+    /* Indicates that the device has an ethernet peripheral */
+    bool hasEthernet;
 } DeviceMetadata;


@@ -24,17 +32,25 @@ extern "C" {
 #endif

 /* Initializer values for message structs */
-#define DeviceMetadata_init_default              {"", 0}
-#define DeviceMetadata_init_zero                 {"", 0}
+#define DeviceMetadata_init_default              {"", 0, 0, 0, 0, 0}
+#define DeviceMetadata_init_zero                 {"", 0, 0, 0, 0, 0}

 /* Field tags (for use in manual encoding/decoding) */
 #define DeviceMetadata_firmware_version_tag      1
 #define DeviceMetadata_device_state_version_tag  2
+#define DeviceMetadata_canShutdown_tag           3
+#define DeviceMetadata_hasWifi_tag               4
+#define DeviceMetadata_hasBluetooth_tag          5
+#define DeviceMetadata_hasEthernet_tag           6

 /* Struct field encoding specification for nanopb */
 #define DeviceMetadata_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, STRING,   firmware_version,   1) \
-X(a, STATIC,   SINGULAR, UINT32,   device_state_version,   2)
+X(a, STATIC,   SINGULAR, UINT32,   device_state_version,   2) \
+X(a, STATIC,   SINGULAR, BOOL,     canShutdown,       3) \
+X(a, STATIC,   SINGULAR, BOOL,     hasWifi,           4) \
+X(a, STATIC,   SINGULAR, BOOL,     hasBluetooth,      5) \
+X(a, STATIC,   SINGULAR, BOOL,     hasEthernet,       6)
 #define DeviceMetadata_CALLBACK NULL
 #define DeviceMetadata_DEFAULT NULL

@@ -44,7 +60,7 @@ extern const pb_msgdesc_t DeviceMetadata_msg;
 #define DeviceMetadata_fields &DeviceMetadata_msg

 /* Maximum encoded size of messages (where known) */
-#define DeviceMetadata_size                      25
+#define DeviceMetadata_size                      33

 #ifdef __cplusplus
 } /* extern "C" */
@@ -69,6 +69,7 @@ typedef struct _DeviceState {
 } DeviceState;

 typedef PB_BYTES_ARRAY_T(2048) OEMStore_oem_icon_bits_t;
+typedef PB_BYTES_ARRAY_T(32) OEMStore_oem_aes_key_t;
 /* This can be used for customizing the firmware distribution. If populated,
 show a secondary bootup screen with cuatom logo and text for 2.5 seconds. */
 typedef struct _OEMStore { 
@@ -82,6 +83,8 @@ typedef struct _OEMStore {
    ScreenFonts oem_font;
    /* Use this font for the OEM text. */
    char oem_text[40];
+    /* The default device encryption key, 16 or 32 byte */
+    OEMStore_oem_aes_key_t oem_aes_key;
 } OEMStore;


@@ -98,10 +101,10 @@ extern "C" {
 /* Initializer values for message structs */
 #define DeviceState_init_default                 {false, MyNodeInfo_init_default, false, User_init_default, 0, {NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default}, 0, {MeshPacket_init_default}, false, MeshPacket_init_default, 0, 0, 0}
 #define ChannelFile_init_default                 {0, {Channel_init_default, Channel_init_default, Channel_init_default, Channel_init_default, Channel_init_default, Channel_init_default, Channel_init_default, Channel_init_default}, 0}
-#define OEMStore_init_default                    {0, 0, {0, {0}}, _ScreenFonts_MIN, ""}
+#define OEMStore_init_default                    {0, 0, {0, {0}}, _ScreenFonts_MIN, "", {0, {0}}}
 #define DeviceState_init_zero                    {false, MyNodeInfo_init_zero, false, User_init_zero, 0, {NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero}, 0, {MeshPacket_init_zero}, false, MeshPacket_init_zero, 0, 0, 0}
 #define ChannelFile_init_zero                    {0, {Channel_init_zero, Channel_init_zero, Channel_init_zero, Channel_init_zero, Channel_init_zero, Channel_init_zero, Channel_init_zero, Channel_init_zero}, 0}
-#define OEMStore_init_zero                       {0, 0, {0, {0}}, _ScreenFonts_MIN, ""}
+#define OEMStore_init_zero                       {0, 0, {0, {0}}, _ScreenFonts_MIN, "", {0, {0}}}

 /* Field tags (for use in manual encoding/decoding) */
 #define ChannelFile_channels_tag                 1
@@ -119,6 +122,7 @@ extern "C" {
 #define OEMStore_oem_icon_bits_tag               3
 #define OEMStore_oem_font_tag                    4
 #define OEMStore_oem_text_tag                    5
+#define OEMStore_oem_aes_key_tag                 6

 /* Struct field encoding specification for nanopb */
 #define DeviceState_FIELDLIST(X, a) \
@@ -150,7 +154,8 @@ X(a, STATIC,   SINGULAR, UINT32,   oem_icon_width,    1) \
 X(a, STATIC,   SINGULAR, UINT32,   oem_icon_height,   2) \
 X(a, STATIC,   SINGULAR, BYTES,    oem_icon_bits,     3) \
 X(a, STATIC,   SINGULAR, UENUM,    oem_font,          4) \
-X(a, STATIC,   SINGULAR, STRING,   oem_text,          5)
+X(a, STATIC,   SINGULAR, STRING,   oem_text,          5) \
+X(a, STATIC,   SINGULAR, BYTES,    oem_aes_key,       6)
 #define OEMStore_CALLBACK NULL
 #define OEMStore_DEFAULT NULL

@@ -166,7 +171,7 @@ extern const pb_msgdesc_t OEMStore_msg;
 /* Maximum encoded size of messages (where known) */
 #define ChannelFile_size                         638
 #define DeviceState_size                         21800
-#define OEMStore_size                            2106
+#define OEMStore_size                            2140

 #ifdef __cplusplus
 } /* extern "C" */
@@ -144,7 +144,7 @@ extern const pb_msgdesc_t LocalModuleConfig_msg;
 #define LocalModuleConfig_fields &LocalModuleConfig_msg

 /* Maximum encoded size of messages (where known) */
-#define LocalConfig_size                         334
+#define LocalConfig_size                         359
 #define LocalModuleConfig_size                   270

 #ifdef __cplusplus
@@ -42,9 +42,6 @@ PB_BIND(FromRadio, FromRadio, 2)
 PB_BIND(ToRadio, ToRadio, 2)


-PB_BIND(ToRadio_PeerInfo, ToRadio_PeerInfo, AUTO)
-
-
 PB_BIND(Compressed, Compressed, AUTO)


@@ -4,6 +4,7 @@
 #ifndef PB_MESH_PB_H_INCLUDED
 #define PB_MESH_PB_H_INCLUDED
 #include <pb.h>
+#include "channel.pb.h"
 #include "config.pb.h"
 #include "module_config.pb.h"
 #include "portnums.pb.h"
@@ -242,8 +243,11 @@ typedef enum _LogRecord_Level {

 /* Struct definitions */
 typedef PB_BYTES_ARRAY_T(237) Compressed_data_t;
+/* Compressed message payload */
 typedef struct _Compressed { 
+    /* PortNum to determine the how to handle the compressed payload. */
    PortNum portnum;
+    /* Compressed data. */
    Compressed_data_t data;
 } Compressed;

@@ -351,7 +355,7 @@ typedef struct _MyNodeInfo {

 /* a gps position */
 typedef struct _Position { 
-    /* The new preferred location encoding, divide by 1e-7 to get degrees
+    /* The new preferred location encoding, multiply by 1e-7 to get degrees
 in floating point */
    int32_t latitude_i;
    /* TODO: REPLACE */
@@ -424,14 +428,6 @@ typedef struct _RouteDiscovery {
    uint32_t route[8];
 } RouteDiscovery;

-/* Compressed message payload */
-typedef struct _ToRadio_PeerInfo { 
-    /* PortNum to determine the how to handle the compressed payload. */
-    uint32_t app_version;
-    /* Compressed data. */
-    bool mqtt_gateway;
-} ToRadio_PeerInfo;
-
 /* Broadcast when a newly powered mesh node wants to find a node num it can use
 Sent from the phone over bluetooth to set the user id for the owner of this node.
 Also sent from nodes to each other when a new node signs on (so all clients can have this info)
@@ -652,6 +648,8 @@ typedef struct _FromRadio {
        bool rebooted;
        /* Include module config */
        ModuleConfig moduleConfig;
+        /* One packet is sent for each channel */
+        Channel channel;
    };
 } FromRadio;

@@ -662,9 +660,6 @@ typedef struct _ToRadio {
    union {
        /* Send this packet on the mesh */
        MeshPacket packet;
-        /* Information about the peer, sent after the phone sneds want_config_id.
-     Old clients do not send this, which is fine. */
-        ToRadio_PeerInfo peer_info;
        /* Phone wants radio to send full node db to the phone, This is
     typically the first packet sent to the radio when the phone gets a
     bluetooth connection. The radio will respond by sending back a
@@ -737,7 +732,6 @@ extern "C" {
 #define LogRecord_init_default                   {"", 0, "", _LogRecord_Level_MIN}
 #define FromRadio_init_default                   {0, 0, {MeshPacket_init_default}}
 #define ToRadio_init_default                     {0, {MeshPacket_init_default}}
-#define ToRadio_PeerInfo_init_default            {0, 0}
 #define Compressed_init_default                  {_PortNum_MIN, {0, {0}}}
 #define Position_init_zero                       {0, 0, 0, 0, _Position_LocSource_MIN, _Position_AltSource_MIN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 #define User_init_zero                           {"", "", "", {0}, _HardwareModel_MIN, 0}
@@ -751,7 +745,6 @@ extern "C" {
 #define LogRecord_init_zero                      {"", 0, "", _LogRecord_Level_MIN}
 #define FromRadio_init_zero                      {0, 0, {MeshPacket_init_zero}}
 #define ToRadio_init_zero                        {0, {MeshPacket_init_zero}}
-#define ToRadio_PeerInfo_init_zero               {0, 0}
 #define Compressed_init_zero                     {_PortNum_MIN, {0, {0}}}

 /* Field tags (for use in manual encoding/decoding) */
@@ -808,8 +801,6 @@ extern "C" {
 #define Position_next_update_tag                 21
 #define Position_seq_number_tag                  22
 #define RouteDiscovery_route_tag                 1
-#define ToRadio_PeerInfo_app_version_tag         1
-#define ToRadio_PeerInfo_mqtt_gateway_tag        2
 #define User_id_tag                              1
 #define User_long_name_tag                       2
 #define User_short_name_tag                      3
@@ -854,8 +845,8 @@ extern "C" {
 #define FromRadio_config_complete_id_tag         7
 #define FromRadio_rebooted_tag                   8
 #define FromRadio_moduleConfig_tag               9
+#define FromRadio_channel_tag                    10
 #define ToRadio_packet_tag                       1
-#define ToRadio_peer_info_tag                    2
 #define ToRadio_want_config_id_tag               3
 #define ToRadio_disconnect_tag                   4

@@ -1001,7 +992,8 @@ X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,config,config),   5) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,log_record,log_record),   6) \
 X(a, STATIC,   ONEOF,    UINT32,   (payload_variant,config_complete_id,config_complete_id),   7) \
 X(a, STATIC,   ONEOF,    BOOL,     (payload_variant,rebooted,rebooted),   8) \
-X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,moduleConfig,moduleConfig),   9)
+X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,moduleConfig,moduleConfig),   9) \
+X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,channel,channel),  10)
 #define FromRadio_CALLBACK NULL
 #define FromRadio_DEFAULT NULL
 #define FromRadio_payload_variant_packet_MSGTYPE MeshPacket
@@ -1010,22 +1002,15 @@ X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,moduleConfig,moduleConfig),
 #define FromRadio_payload_variant_config_MSGTYPE Config
 #define FromRadio_payload_variant_log_record_MSGTYPE LogRecord
 #define FromRadio_payload_variant_moduleConfig_MSGTYPE ModuleConfig
+#define FromRadio_payload_variant_channel_MSGTYPE Channel

 #define ToRadio_FIELDLIST(X, a) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,packet,packet),   1) \
-X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,peer_info,peer_info),   2) \
 X(a, STATIC,   ONEOF,    UINT32,   (payload_variant,want_config_id,want_config_id),   3) \
 X(a, STATIC,   ONEOF,    BOOL,     (payload_variant,disconnect,disconnect),   4)
 #define ToRadio_CALLBACK NULL
 #define ToRadio_DEFAULT NULL
 #define ToRadio_payload_variant_packet_MSGTYPE MeshPacket
-#define ToRadio_payload_variant_peer_info_MSGTYPE ToRadio_PeerInfo
-
-#define ToRadio_PeerInfo_FIELDLIST(X, a) \
-X(a, STATIC,   SINGULAR, UINT32,   app_version,       1) \
-X(a, STATIC,   SINGULAR, BOOL,     mqtt_gateway,      2)
-#define ToRadio_PeerInfo_CALLBACK NULL
-#define ToRadio_PeerInfo_DEFAULT NULL

 #define Compressed_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, UENUM,    portnum,           1) \
@@ -1045,7 +1030,6 @@ extern const pb_msgdesc_t MyNodeInfo_msg;
 extern const pb_msgdesc_t LogRecord_msg;
 extern const pb_msgdesc_t FromRadio_msg;
 extern const pb_msgdesc_t ToRadio_msg;
-extern const pb_msgdesc_t ToRadio_PeerInfo_msg;
 extern const pb_msgdesc_t Compressed_msg;

 /* Defines for backwards compatibility with code written before nanopb-0.4.0 */
@@ -1061,7 +1045,6 @@ extern const pb_msgdesc_t Compressed_msg;
 #define LogRecord_fields &LogRecord_msg
 #define FromRadio_fields &FromRadio_msg
 #define ToRadio_fields &ToRadio_msg
-#define ToRadio_PeerInfo_fields &ToRadio_PeerInfo_msg
 #define Compressed_fields &Compressed_msg

 /* Maximum encoded size of messages (where known) */
@@ -1075,7 +1058,6 @@ extern const pb_msgdesc_t Compressed_msg;
 #define Position_size                            137
 #define RouteDiscovery_size                      40
 #define Routing_size                             42
-#define ToRadio_PeerInfo_size                    8
 #define ToRadio_size                             324
 #define User_size                                77
 #define Waypoint_size                            156
@@ -33,7 +33,8 @@ typedef enum _ModuleConfig_SerialConfig_Serial_Mode {
    ModuleConfig_SerialConfig_Serial_Mode_DEFAULT = 0, 
    ModuleConfig_SerialConfig_Serial_Mode_SIMPLE = 1, 
    ModuleConfig_SerialConfig_Serial_Mode_PROTO = 2, 
-    ModuleConfig_SerialConfig_Serial_Mode_TEXTMSG = 3 
+    ModuleConfig_SerialConfig_Serial_Mode_TEXTMSG = 3, 
+    ModuleConfig_SerialConfig_Serial_Mode_NMEA = 4 
 } ModuleConfig_SerialConfig_Serial_Mode;

 typedef enum _ModuleConfig_CannedMessageConfig_InputEventChar { 
@@ -140,8 +141,8 @@ typedef struct _ModuleConfig {
 #define _ModuleConfig_SerialConfig_Serial_Baud_ARRAYSIZE ((ModuleConfig_SerialConfig_Serial_Baud)(ModuleConfig_SerialConfig_Serial_Baud_BAUD_921600+1))

 #define _ModuleConfig_SerialConfig_Serial_Mode_MIN ModuleConfig_SerialConfig_Serial_Mode_DEFAULT
-#define _ModuleConfig_SerialConfig_Serial_Mode_MAX ModuleConfig_SerialConfig_Serial_Mode_TEXTMSG
-#define _ModuleConfig_SerialConfig_Serial_Mode_ARRAYSIZE ((ModuleConfig_SerialConfig_Serial_Mode)(ModuleConfig_SerialConfig_Serial_Mode_TEXTMSG+1))
+#define _ModuleConfig_SerialConfig_Serial_Mode_MAX ModuleConfig_SerialConfig_Serial_Mode_NMEA
+#define _ModuleConfig_SerialConfig_Serial_Mode_ARRAYSIZE ((ModuleConfig_SerialConfig_Serial_Mode)(ModuleConfig_SerialConfig_Serial_Mode_NMEA+1))

 #define _ModuleConfig_CannedMessageConfig_InputEventChar_MIN ModuleConfig_CannedMessageConfig_InputEventChar_NONE
 #define _ModuleConfig_CannedMessageConfig_InputEventChar_MAX ModuleConfig_CannedMessageConfig_InputEventChar_BACK
@@ -81,7 +81,7 @@ typedef enum _PortNum {
    PortNum_SIMULATOR_APP = 69, 
    /* Private applications should use portnums >= 256.
 To simplify initial development and testing you can use "PRIVATE_APP"
- in your code without needing to rebuild protobuf files (via [regen-protos.sh](https://github.com/meshtastic/Meshtastic-device/blob/master/bin/regen-protos.sh)) */
+ in your code without needing to rebuild protobuf files (via [regen-protos.sh](https://github.com/meshtastic/firmware/blob/master/bin/regen-protos.sh)) */
    PortNum_PRIVATE_APP = 256, 
    /* ATAK Forwarder Module https://github.com/paulmandal/atak-forwarder */
    PortNum_ATAK_FORWARDER = 257, 
@@ -29,7 +29,11 @@ typedef enum _TelemetrySensorType {
    /* High accuracy temperature and humidity */
    TelemetrySensorType_SHTC3 = 7, 
    /* High accuracy pressure */
-    TelemetrySensorType_LPS22 = 8 
+    TelemetrySensorType_LPS22 = 8, 
+    /* 3-Axis magnetic sensor */
+    TelemetrySensorType_QMC6310 = 9, 
+    /* 6-Axis inertial measurement sensor */
+    TelemetrySensorType_QMI8658 = 10 
 } TelemetrySensorType;

 /* Struct definitions */
@@ -81,8 +85,8 @@ typedef struct _Telemetry {

 /* Helper constants for enums */
 #define _TelemetrySensorType_MIN TelemetrySensorType_SENSOR_UNSET
-#define _TelemetrySensorType_MAX TelemetrySensorType_LPS22
-#define _TelemetrySensorType_ARRAYSIZE ((TelemetrySensorType)(TelemetrySensorType_LPS22+1))
+#define _TelemetrySensorType_MAX TelemetrySensorType_QMI8658
+#define _TelemetrySensorType_ARRAYSIZE ((TelemetrySensorType)(TelemetrySensorType_QMI8658+1))


 #ifdef __cplusplus
@@ -58,8 +58,6 @@ char contentTypes[][2][32] = {{".txt", "text/plain"},     {".html", "text/html"}
                              {".css", "text/css"},       {".ico", "image/vnd.microsoft.icon"},
                              {".svg", "image/svg+xml"},  {"", ""}};

-// const char *tarURL = "https://www.casler.org/temp/meshtastic-web.tar";
-// const char *tarURL = "https://api-production-871d.up.railway.app/mirror/webui";
 // const char *certificate = NULL; // change this as needed, leave as is for no TLS check (yolo security)

 // Our API to handle messages to and from the radio.
@@ -75,12 +73,12 @@ void registerHandlers(HTTPServer *insecureServer, HTTPSServer *secureServer)
    ResourceNode *nodeAPIv1ToRadio = new ResourceNode("/api/v1/toradio", "PUT", &handleAPIv1ToRadio);
    ResourceNode *nodeAPIv1FromRadio = new ResourceNode("/api/v1/fromradio", "GET", &handleAPIv1FromRadio);

-    ResourceNode *nodeHotspotApple = new ResourceNode("/hotspot-detect.html", "GET", &handleHotspot);
-    ResourceNode *nodeHotspotAndroid = new ResourceNode("/generate_204", "GET", &handleHotspot);
+    //    ResourceNode *nodeHotspotApple = new ResourceNode("/hotspot-detect.html", "GET", &handleHotspot);
+    //    ResourceNode *nodeHotspotAndroid = new ResourceNode("/generate_204", "GET", &handleHotspot);

    ResourceNode *nodeAdmin = new ResourceNode("/admin", "GET", &handleAdmin);
-    ResourceNode *nodeAdminSettings = new ResourceNode("/admin/settings", "GET", &handleAdminSettings);
-    ResourceNode *nodeAdminSettingsApply = new ResourceNode("/admin/settings/apply", "POST", &handleAdminSettingsApply);
+    //    ResourceNode *nodeAdminSettings = new ResourceNode("/admin/settings", "GET", &handleAdminSettings);
+    //    ResourceNode *nodeAdminSettingsApply = new ResourceNode("/admin/settings/apply", "POST", &handleAdminSettingsApply);
    //    ResourceNode *nodeAdminFs = new ResourceNode("/admin/fs", "GET", &handleFs);
    //    ResourceNode *nodeUpdateFs = new ResourceNode("/admin/fs/update", "POST", &handleUpdateFs);
    //    ResourceNode *nodeDeleteFs = new ResourceNode("/admin/fs/delete", "GET", &handleDeleteFsContent);
@@ -100,8 +98,8 @@ void registerHandlers(HTTPServer *insecureServer, HTTPSServer *secureServer)
    secureServer->registerNode(nodeAPIv1ToRadioOptions);
    secureServer->registerNode(nodeAPIv1ToRadio);
    secureServer->registerNode(nodeAPIv1FromRadio);
-    secureServer->registerNode(nodeHotspotApple);
-    secureServer->registerNode(nodeHotspotAndroid);
+    //    secureServer->registerNode(nodeHotspotApple);
+    //    secureServer->registerNode(nodeHotspotAndroid);
    secureServer->registerNode(nodeRestart);
    secureServer->registerNode(nodeFormUpload);
    secureServer->registerNode(nodeJsonScanNetworks);
@@ -113,16 +111,16 @@ void registerHandlers(HTTPServer *insecureServer, HTTPSServer *secureServer)
    //    secureServer->registerNode(nodeDeleteFs);
    secureServer->registerNode(nodeAdmin);
    //    secureServer->registerNode(nodeAdminFs);
-    secureServer->registerNode(nodeAdminSettings);
-    secureServer->registerNode(nodeAdminSettingsApply);
+    //    secureServer->registerNode(nodeAdminSettings);
+    //    secureServer->registerNode(nodeAdminSettingsApply);
    secureServer->registerNode(nodeRoot); // This has to be last

    // Insecure nodes
    insecureServer->registerNode(nodeAPIv1ToRadioOptions);
    insecureServer->registerNode(nodeAPIv1ToRadio);
    insecureServer->registerNode(nodeAPIv1FromRadio);
-    insecureServer->registerNode(nodeHotspotApple);
-    insecureServer->registerNode(nodeHotspotAndroid);
+    //    insecureServer->registerNode(nodeHotspotApple);
+    //    insecureServer->registerNode(nodeHotspotAndroid);
    insecureServer->registerNode(nodeRestart);
    insecureServer->registerNode(nodeFormUpload);
    insecureServer->registerNode(nodeJsonScanNetworks);
@@ -134,8 +132,8 @@ void registerHandlers(HTTPServer *insecureServer, HTTPSServer *secureServer)
    //    insecureServer->registerNode(nodeDeleteFs);
    insecureServer->registerNode(nodeAdmin);
    //    insecureServer->registerNode(nodeAdminFs);
-    insecureServer->registerNode(nodeAdminSettings);
-    insecureServer->registerNode(nodeAdminSettingsApply);
+    //    insecureServer->registerNode(nodeAdminSettings);
+    //    insecureServer->registerNode(nodeAdminSettingsApply);
    insecureServer->registerNode(nodeRoot); // This has to be last
 }

@@ -160,7 +158,7 @@ void handleAPIv1FromRadio(HTTPRequest *req, HTTPResponse *res)
    res->setHeader("Content-Type", "application/x-protobuf");
    res->setHeader("Access-Control-Allow-Origin", "*");
    res->setHeader("Access-Control-Allow-Methods", "GET");
-    res->setHeader("X-Protobuf-Schema", "https://raw.githubusercontent.com/meshtastic/Meshtastic-protobufs/master/mesh.proto");
+    res->setHeader("X-Protobuf-Schema", "https://raw.githubusercontent.com/meshtastic/protobufs/master/mesh.proto");

    uint8_t txBuf[MAX_STREAM_BUF_SIZE];
    uint32_t len = 1;
@@ -204,7 +202,7 @@ void handleAPIv1ToRadio(HTTPRequest *req, HTTPResponse *res)
    res->setHeader("Access-Control-Allow-Headers", "Content-Type");
    res->setHeader("Access-Control-Allow-Origin", "*");
    res->setHeader("Access-Control-Allow-Methods", "PUT, OPTIONS");
-    res->setHeader("X-Protobuf-Schema", "https://raw.githubusercontent.com/meshtastic/Meshtastic-protobufs/master/mesh.proto");
+    res->setHeader("X-Protobuf-Schema", "https://raw.githubusercontent.com/meshtastic/protobufs/master/mesh.proto");

    if (req->getMethod() == "OPTIONS") {
        res->setStatusCode(204); // Success with no content
@@ -251,7 +249,7 @@ void htmlDeleteDir(const char *dirname)
 std::vector<std::map<char *, char *>> *htmlListDir(std::vector<std::map<char *, char *>> *fileList, const char *dirname,
                                                   uint8_t levels)
 {
-    File root = FSCom.open(dirname);
+    File root = FSCom.open(dirname, FILE_O_READ);
    if (!root) {
        return NULL;
    }
@@ -264,14 +262,27 @@ std::vector<std::map<char *, char *>> *htmlListDir(std::vector<std::map<char *,
    while (file) {
        if (file.isDirectory() && !String(file.name()).endsWith(".")) {
            if (levels) {
+#ifdef ARCH_ESP32
+                htmlListDir(fileList, file.path(), levels - 1);
+#else
                htmlListDir(fileList, file.name(), levels - 1);
+#endif
+                file.close();
            }
        } else {
            std::map<char *, char *> thisFileMap;
            thisFileMap[strdup("size")] = strdup(String(file.size()).c_str());
+#ifdef ARCH_ESP32
+            thisFileMap[strdup("name")] = strdup(String(file.path()).substring(1).c_str());
+#else
            thisFileMap[strdup("name")] = strdup(String(file.name()).substring(1).c_str());
+#endif
            if (String(file.name()).substring(1).endsWith(".gz")) {
+#ifdef ARCH_ESP32
+                String modifiedFile = String(file.path()).substring(1);
+#else
                String modifiedFile = String(file.name()).substring(1);
+#endif
                modifiedFile.remove((modifiedFile.length() - 3), 3);
                thisFileMap[strdup("nameModified")] = strdup(modifiedFile.c_str());
            }
@@ -291,7 +302,7 @@ void handleFsBrowseStatic(HTTPRequest *req, HTTPResponse *res)
    res->setHeader("Access-Control-Allow-Methods", "GET");

    using namespace json11;
-    auto fileList = htmlListDir(new std::vector<std::map<char *, char *>>(), "/", 10);
+    auto fileList = htmlListDir(new std::vector<std::map<char *, char *>>(), "/static", 10);

    // create json output structure
    Json filesystemObj = Json::object{
@@ -607,12 +618,8 @@ void handleReport(HTTPRequest *req, HTTPResponse *res)
    };

    // data->wifi
-    String ipStr;
-    if (config.network.wifi_mode == Config_NetworkConfig_WiFiMode_ACCESS_POINT || config.network.wifi_mode == Config_NetworkConfig_WiFiMode_ACCESS_POINT_HIDDEN || isSoftAPForced()) {
-        ipStr = String(WiFi.softAPIP().toString());
-    } else {
-        ipStr = String(WiFi.localIP().toString());
-    }
+    String ipStr = String(WiFi.localIP().toString());
+
    Json jsonObjWifi = Json::object{{"rssi", String(WiFi.RSSI())}, {"ip", ipStr.c_str()}};

    // data->memory
@@ -694,8 +701,8 @@ void handleAdmin(HTTPRequest *req, HTTPResponse *res)
    res->setHeader("Access-Control-Allow-Methods", "GET");

    res->println("<h1>Meshtastic</h1>\n");
-    res->println("<a href=/admin/settings>Settings</a><br>\n");
-    res->println("<a href=/admin/fs>Manage Web Content</a><br>\n");
+    //    res->println("<a href=/admin/settings>Settings</a><br>\n");
+    //    res->println("<a href=/admin/fs>Manage Web Content</a><br>\n");
    res->println("<a href=/json/report>Device Report</a><br>\n");
 }

@@ -55,10 +55,6 @@ static void handleWebResponse()
    if (isWifiAvailable()) {

        if (isWebServerReady) {
-            // We're going to handle the DNS responder here so it
-            // will be ignored by the NRF boards.
-            handleDNSResponse();
-
            if (secureServer)
                secureServer->loop();
            insecureServer->loop();
@@ -8,7 +8,6 @@
 #include "mesh/wifi/WiFiServerAPI.h"
 #include "mqtt/MQTT.h"
 #include "target_specific.h"
-#include <DNSServer.h>
 #include <ESPmDNS.h>
 #include <esp_wifi.h>
 #include <WiFi.h>
@@ -22,9 +21,6 @@ using namespace concurrency;

 static void WiFiEvent(WiFiEvent_t event);

-// DNS Server for the Captive Portal
-DNSServer dnsServer;
-
 // NTP
 WiFiUDP ntpUDP;

@@ -37,46 +33,29 @@ uint8_t wifiDisconnectReason = 0;
 // Stores our hostname
 char ourHost[16];

-bool forcedSoftAP = 0;
-
 bool APStartupComplete = 0;

 static bool needReconnect = true; // If we create our reconnector, run it once at the beginning

-// FIXME, veto light sleep if we have a TCP server running
-#if 0
-class WifiSleepObserver : public Observer<uint32_t> {
-protected:
-
-    /// Return 0 if sleep is okay
-    virtual int onNotify(uint32_t newValue) {
-
-    }
-};
-
-static WifiSleepObserver wifiSleepObserver;
-//preflightSleepObserver.observe(&preflightSleep);
-#endif
-
 static int32_t reconnectWiFi()
 {
    const char *wifiName = config.network.wifi_ssid;
    const char *wifiPsw = config.network.wifi_psk;

    if (config.network.wifi_enabled && needReconnect && !WiFi.isConnected()) {
-        // if (radioConfig.has_preferences && needReconnect && !WiFi.isConnected()) {
-
+        
        if (!*wifiPsw) // Treat empty password as no password
            wifiPsw = NULL;

        if (*wifiName) {
            needReconnect = false;

+            // Make sure we clear old connection credentials
+            WiFi.disconnect(false, true);
+
            DEBUG_MSG("... Reconnecting to WiFi access point\n");
            WiFi.mode(WIFI_MODE_STA);
            WiFi.begin(wifiName, wifiPsw);
-
-            // Starting timeClient;
        }
    }

@@ -103,16 +82,10 @@ static int32_t reconnectWiFi()

 static Periodic *wifiReconnect;

-bool isSoftAPForced()
-{
-    return forcedSoftAP;
-}
-
 bool isWifiAvailable()
 {

-    if (config.network.wifi_enabled && ((config.network.wifi_ssid[0]) || forcedSoftAP)) {
-
+    if (config.network.wifi_enabled && (config.network.wifi_ssid[0])) {
        return true;
    } else {
        return false;
@@ -176,100 +149,48 @@ static void onNetworkConnected()
 }

 // Startup WiFi
-bool initWifi(bool forceSoftAP)
+bool initWifi()
 {
-    forcedSoftAP = forceSoftAP;
+    if (config.network.wifi_enabled && config.network.wifi_ssid[0]) {

-    if (config.network.wifi_enabled && ((config.network.wifi_ssid[0]) || forceSoftAP)) {
-        // if ((radioConfig.has_preferences && config.wifi.ssid[0]) || forceSoftAP) {
        const char *wifiName = config.network.wifi_ssid;
        const char *wifiPsw = config.network.wifi_psk;

-        if (forceSoftAP) {
-            DEBUG_MSG("WiFi ... Forced AP Mode\n");
-        } else if (config.network.wifi_mode == Config_NetworkConfig_WiFiMode_ACCESS_POINT) {
-            DEBUG_MSG("WiFi ... AP Mode\n");
-        } else if (config.network.wifi_mode == Config_NetworkConfig_WiFiMode_ACCESS_POINT_HIDDEN) {
-            DEBUG_MSG("WiFi ... Hidden AP Mode\n");
-        } else if (config.network.wifi_mode == Config_NetworkConfig_WiFiMode_CLIENT) {
-            DEBUG_MSG("WiFi ... Client Mode\n");
-        } else {
-            DEBUG_MSG("WiFi ... WiFi Disabled\n");
-        }
-
        createSSLCert();

        if (!*wifiPsw) // Treat empty password as no password
            wifiPsw = NULL;

-        if (*wifiName || forceSoftAP) {
-            if (config.network.wifi_mode == Config_NetworkConfig_WiFiMode_ACCESS_POINT || config.network.wifi_mode == Config_NetworkConfig_WiFiMode_ACCESS_POINT_HIDDEN || forceSoftAP) {
+        if (*wifiName) {
+            uint8_t dmac[6];
+            getMacAddr(dmac);
+            sprintf(ourHost, "Meshtastic-%02x%02x", dmac[4], dmac[5]);

-                IPAddress apIP(192, 168, 42, 1);
-                WiFi.onEvent(WiFiEvent);
-                WiFi.mode(WIFI_AP);
+            WiFi.mode(WIFI_MODE_STA);
+            WiFi.setHostname(ourHost);
+            WiFi.onEvent(WiFiEvent);

-                if (forcedSoftAP) {
-                    const char *softAPssid = "meshtasticAdmin";
-                    const char *softAPpasswd = "12345678";
-                    int ok = WiFi.softAP(softAPssid, softAPpasswd);
-                    DEBUG_MSG("Starting (Forced) WIFI AP: ssid=%s, ok=%d\n", softAPssid, ok);
+            // This is needed to improve performance.
+            esp_wifi_set_ps(WIFI_PS_NONE); // Disable radio power saving

-                } else {
+            WiFi.onEvent(
+                [](WiFiEvent_t event, WiFiEventInfo_t info) {
+                    Serial.print("\nWiFi lost connection. Reason: ");
+                    Serial.println(info.wifi_sta_disconnected.reason);

-                    // If AP is configured to be hidden hidden
-                    if (config.network.wifi_mode == Config_NetworkConfig_WiFiMode_ACCESS_POINT_HIDDEN) {
+                    /*
+                        If we are disconnected from the AP for some reason,
+                        save the error code.

-                        // The configurations on softAP are from the espresif library
-                        int ok = WiFi.softAP(wifiName, wifiPsw, 1, 1, 4);
-                        DEBUG_MSG("Starting hidden WIFI AP: ssid=%s, ok=%d\n", wifiName, ok);
-                    } else {
-                        int ok = WiFi.softAP(wifiName, wifiPsw);
-                        DEBUG_MSG("Starting WIFI AP: ssid=%s, ok=%d\n", wifiName, ok);
-                    }
-                    int ok = WiFi.softAP(wifiName, wifiPsw);
-                    DEBUG_MSG("Starting WIFI AP: ssid=%s, ok=%d\n", wifiName, ok);
-                }
+                        For a reference to the codes:
+                            https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/wifi.html#wi-fi-reason-code
+                    */
+                    wifiDisconnectReason = info.wifi_sta_disconnected.reason;
+                },
+                WiFiEvent_t::ARDUINO_EVENT_WIFI_STA_DISCONNECTED);

-                WiFi.softAPConfig(apIP, apIP, IPAddress(255, 255, 255, 0));
-                DEBUG_MSG("MY IP AP ADDRESS: %s\n", WiFi.softAPIP().toString().c_str());
-
-                // This is needed to improve performance.
-                esp_wifi_set_ps(WIFI_PS_NONE); // Disable radio power saving
-
-                dnsServer.start(53, "*", apIP);
-
-            } else {
-                uint8_t dmac[6];
-                getMacAddr(dmac);
-                sprintf(ourHost, "Meshtastic-%02x%02x", dmac[4], dmac[5]);
-
-                WiFi.mode(WIFI_MODE_STA);
-                WiFi.setHostname(ourHost);
-                WiFi.onEvent(WiFiEvent);
-
-                // This is needed to improve performance.
-                esp_wifi_set_ps(WIFI_PS_NONE); // Disable radio power saving
-
-                WiFi.onEvent(
-                    [](WiFiEvent_t event, WiFiEventInfo_t info) {
-                        Serial.print("\nWiFi lost connection. Reason: ");
-                        Serial.println(info.wifi_sta_disconnected.reason);
-
-                        /*
-                           If we are disconnected from the AP for some reason,
-                           save the error code.
-
-                           For a reference to the codes:
-                             https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/wifi.html#wi-fi-reason-code
-                        */
-                        wifiDisconnectReason = info.wifi_sta_disconnected.reason;
-                    },
-                    WiFiEvent_t::ARDUINO_EVENT_WIFI_STA_DISCONNECTED);
-
-                DEBUG_MSG("JOINING WIFI soon: ssid=%s\n", wifiName);
-                wifiReconnect = new Periodic("WifiConnect", reconnectWiFi);
-            }
+            DEBUG_MSG("JOINING WIFI soon: ssid=%s\n", wifiName);
+            wifiReconnect = new Periodic("WifiConnect", reconnectWiFi);
        }
        return true;
    } else {
@@ -371,13 +292,6 @@ static void WiFiEvent(WiFiEvent_t event)
    }
 }

-void handleDNSResponse()
-{
-    if (config.network.wifi_mode == Config_NetworkConfig_WiFiMode_ACCESS_POINT || config.network.wifi_mode == Config_NetworkConfig_WiFiMode_ACCESS_POINT_HIDDEN || isSoftAPForced()) {
-        dnsServer.processNextRequest();
-    }
-}
-
 uint8_t getWifiDisconnectReason()
 {
    return wifiDisconnectReason;
@@ -5,19 +5,14 @@
 #include <functional>

 #ifdef ARCH_ESP32
-#include <DNSServer.h>
 #include <WiFi.h>
 #endif

 /// @return true if wifi is now in use
-bool initWifi(bool forceSoftAP);
+bool initWifi();

 void deinitWifi();

 bool isWifiAvailable();

-void handleDNSResponse();
-
-bool isSoftAPForced();
-
 uint8_t getWifiDisconnectReason();
@@ -2,6 +2,9 @@
 #include "Channels.h"
 #include "MeshService.h"
 #include "NodeDB.h"
+#ifdef ARCH_ESP32
+#include "BleOta.h"
+#endif
 #include "Router.h"
 #include "configuration.h"
 #include "main.h"
@@ -98,8 +101,21 @@ bool AdminModule::handleReceivedProtobuf(const MeshPacket &mp, AdminMessage *r)
     * Other
     */
    case AdminMessage_reboot_seconds_tag: {
-        int32_t s = r->reboot_seconds;
-        DEBUG_MSG("Rebooting in %d seconds\n", s);
+        reboot(r->reboot_seconds);
+        break;
+    }
+    case AdminMessage_reboot_ota_seconds_tag: {
+        int32_t s = r->reboot_ota_seconds;
+#ifdef ARCH_ESP32        
+        if (BleOta::getOtaAppVersion().isEmpty()) {
+            DEBUG_MSG("No OTA firmware available, scheduling regular reboot in %d seconds\n", s);
+        }else{
+            BleOta::switchToOtaApp();
+            DEBUG_MSG("Rebooting to OTA in %d seconds\n", s);
+        }
+#else
+        DEBUG_MSG("Not on ESP32, scheduling regular reboot in %d seconds\n", s);
+#endif
        rebootAtMsec = (s < 0) ? 0 : (millis() + s * 1000);
        break;
    }
@@ -117,13 +133,13 @@ bool AdminModule::handleReceivedProtobuf(const MeshPacket &mp, AdminMessage *r)
    case AdminMessage_factory_reset_tag: {
        DEBUG_MSG("Initiating factory reset\n");
        nodeDB.factoryReset();
-        rebootAtMsec = millis() + (5 * 1000);
+        reboot(5);
        break;
    }
    case AdminMessage_nodedb_reset_tag: {
        DEBUG_MSG("Initiating node-db reset\n");
        nodeDB.resetNodes();
-        rebootAtMsec = millis() + (5 * 1000);
+        reboot(5);
        break;
    }
 #ifdef ARCH_PORTDUINO
@@ -178,14 +194,12 @@ void AdminModule::handleSetOwner(const User &o)
    if (changed) { // If nothing really changed, don't broadcast on the network or write to flash
        service.reloadOwner();
        DEBUG_MSG("Rebooting due to owner changes\n");
-        screen->startRebootScreen();
-        rebootAtMsec = millis() + (5 * 1000);
+        reboot(5);
    }
 }

 void AdminModule::handleSetConfig(const Config &c)
 {
-    bool requiresReboot = false;
    bool isRouter = (config.device.role == Config_DeviceConfig_Role_ROUTER);
    bool isRegionUnset = (config.lora.region == Config_LoRaConfig_RegionCode_UNSET);

@@ -200,12 +214,13 @@ void AdminModule::handleSetConfig(const Config &c)
                nodeDB.initConfigIntervals();
                nodeDB.initModuleConfigIntervals();
            }
-            requiresReboot = true;
            break;
        case Config_position_tag:
            DEBUG_MSG("Setting config: Position\n");
            config.has_position = true;
            config.position = c.payload_variant.position;
+            // Save nodedb as well in case we got a fixed position packet
+            nodeDB.saveToDisk(SEGMENT_DEVICESTATE);
            break;
        case Config_power_tag:
            DEBUG_MSG("Setting config: Power\n");
@@ -216,7 +231,6 @@ void AdminModule::handleSetConfig(const Config &c)
            DEBUG_MSG("Setting config: WiFi\n");
            config.has_network = true;
            config.network = c.payload_variant.network;
-            requiresReboot = true;
            break;
        case Config_display_tag:
            DEBUG_MSG("Setting config: Display\n");
@@ -231,23 +245,16 @@ void AdminModule::handleSetConfig(const Config &c)
                config.lora.region > Config_LoRaConfig_RegionCode_UNSET) {
                config.lora.tx_enabled = true;
            }
-            requiresReboot = true;
            break;
        case Config_bluetooth_tag:
            DEBUG_MSG("Setting config: Bluetooth\n");
            config.has_bluetooth = true;
            config.bluetooth = c.payload_variant.bluetooth;
-            requiresReboot = true;
            break;
    }

    service.reloadConfig(SEGMENT_CONFIG);
-    // Reboot 5 seconds after a config that requires rebooting is set
-    if (requiresReboot) {
-        DEBUG_MSG("Rebooting due to config changes\n");
-        screen->startRebootScreen();
-        rebootAtMsec = millis() + (5 * 1000);
-    }
+    reboot(5);
 }

 void AdminModule::handleSetModuleConfig(const ModuleConfig &c)
@@ -289,8 +296,9 @@ void AdminModule::handleSetModuleConfig(const ModuleConfig &c)
            moduleConfig.canned_message = c.payload_variant.canned_message;
            break;
    }
-
+    
    service.reloadConfig(SEGMENT_MODULECONFIG);
+    reboot(5);
 }

 void AdminModule::handleSetChannel(const Channel &cc)
@@ -433,6 +441,10 @@ void AdminModule::handleGetDeviceMetadata(const MeshPacket &req) {
    DeviceMetadata deviceMetadata;
    strncpy(deviceMetadata.firmware_version, myNodeInfo.firmware_version, 18);
    deviceMetadata.device_state_version = DEVICESTATE_CUR_VER;
+    deviceMetadata.canShutdown = pmu_found || HAS_CPU_SHUTDOWN;
+    deviceMetadata.hasBluetooth = HAS_BLUETOOTH;
+    deviceMetadata.hasWifi = HAS_WIFI;
+    deviceMetadata.hasEthernet = HAS_ETHERNET;

    r.get_device_metadata_response = deviceMetadata;
    r.which_payload_variant = AdminMessage_get_device_metadata_response_tag;
@@ -450,6 +462,13 @@ void AdminModule::handleGetChannel(const MeshPacket &req, uint32_t channelIndex)
    }
 }

+void AdminModule::reboot(int32_t seconds) 
+{
+    DEBUG_MSG("Rebooting in %d seconds\n", seconds);
+    screen->startRebootScreen();
+    rebootAtMsec = (seconds < 0) ? 0 : (millis() + seconds * 1000);
+}
+
 AdminModule::AdminModule() : ProtobufModule("Admin", PortNum_ADMIN_APP, AdminMessage_fields)
 {
    // restrict to the admin channel for rx
@@ -37,6 +37,7 @@ class AdminModule : public ProtobufModule<AdminMessage>
    void handleSetConfig(const Config &c);
    void handleSetModuleConfig(const ModuleConfig &c);
    void handleSetChannel();
+    void reboot(int32_t seconds);
 };

 extern AdminModule *adminModule;
@@ -2,6 +2,7 @@
 #if HAS_SCREEN
 #include "CannedMessageModule.h"
 #include "FSCommon.h"
+#include "NodeDB.h"
 #include "MeshService.h"
 #include "PowerFSM.h" // neede for button bypass
 #include "mesh/generated/cannedmessages.pb.h"
@@ -10,7 +11,7 @@
 #include "graphics/fonts/OLEDDisplayFontsRU.h"
 #endif

-#if defined(USE_EINK) || defined(ILI9341_DRIVER)
+#if defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS)
 // The screen is bigger so use bigger fonts
 #define FONT_SMALL ArialMT_Plain_16
 #define FONT_MEDIUM ArialMT_Plain_24
@@ -202,7 +203,7 @@ void CannedMessageModule::sendText(NodeNum dest, const char *message, bool wantR
        p->decoded.payload.size++;
    }

-    DEBUG_MSG("Sending message id=%d, msg=%.*s\n", p->id, p->decoded.payload.size, p->decoded.payload.bytes);
+    DEBUG_MSG("Sending message id=%d, dest=%x, msg=%.*s\n", p->id, p->to, p->decoded.payload.size, p->decoded.payload.bytes);

    service.sendToMesh(p);
 }
@@ -222,25 +223,26 @@ int32_t CannedMessageModule::runOnce()
        this->currentMessageIndex = -1;
        this->freetext = ""; // clear freetext
        this->cursor = 0;
+        this->destSelect = false;
        this->notifyObservers(&e);
-    } else if (((this->runState == CANNED_MESSAGE_RUN_STATE_ACTIVE) || (this->runState == CANNED_MESSAGE_RUN_STATE_FREETEXT)) && (millis() - this->lastTouchMillis) > INACTIVATE_AFTER_MS) {
+    } else if (((this->runState == CANNED_MESSAGE_RUN_STATE_ACTIVE) || (this->runState == CANNED_MESSAGE_RUN_STATE_FREETEXT)) && ((millis() - this->lastTouchMillis) > INACTIVATE_AFTER_MS)) {
        // Reset module
        DEBUG_MSG("Reset due to lack of activity.\n");
        e.frameChanged = true;
        this->currentMessageIndex = -1;
        this->freetext = ""; // clear freetext
        this->cursor = 0;
+        this->destSelect = false;
        this->runState = CANNED_MESSAGE_RUN_STATE_INACTIVE;
        this->notifyObservers(&e);
    } else if (this->runState == CANNED_MESSAGE_RUN_STATE_ACTION_SELECT) {
        if (this->payload == CANNED_MESSAGE_RUN_STATE_FREETEXT) {
            if (this->freetext.length() > 0) {
-                sendText(NODENUM_BROADCAST, this->freetext.c_str(), true);
+                sendText(this->dest, this->freetext.c_str(), true);
                this->runState = CANNED_MESSAGE_RUN_STATE_SENDING_ACTIVE;
            } else {
                DEBUG_MSG("Reset message is empty.\n");
                this->runState = CANNED_MESSAGE_RUN_STATE_INACTIVE;
-                e.frameChanged = true;
            }
        } else {
            if ((this->messagesCount > this->currentMessageIndex) && (strlen(this->messages[this->currentMessageIndex]) > 0)) {
@@ -249,12 +251,13 @@ int32_t CannedMessageModule::runOnce()
            } else {
                DEBUG_MSG("Reset message is empty.\n");
                this->runState = CANNED_MESSAGE_RUN_STATE_INACTIVE;
-                e.frameChanged = true;
            }
        }
+        e.frameChanged = true;
        this->currentMessageIndex = -1;
        this->freetext = ""; // clear freetext
        this->cursor = 0;
+        this->destSelect = false;
        this->notifyObservers(&e);
        return 2000;
     } else if ((this->runState != CANNED_MESSAGE_RUN_STATE_FREETEXT) && (this->currentMessageIndex == -1)) {
@@ -263,31 +266,69 @@ int32_t CannedMessageModule::runOnce()
        e.frameChanged = true;
        this->runState = CANNED_MESSAGE_RUN_STATE_ACTIVE;
    } else if (this->runState == CANNED_MESSAGE_RUN_STATE_ACTION_UP) {
-        this->currentMessageIndex = getPrevIndex();
-        this->freetext = ""; // clear freetext
-        this->cursor = 0;
-        this->runState = CANNED_MESSAGE_RUN_STATE_ACTIVE;
-        DEBUG_MSG("MOVE UP (%d):%s\n", this->currentMessageIndex, this->getCurrentMessage());
+        if (this->messagesCount > 0) {
+            this->currentMessageIndex = getPrevIndex();
+            this->freetext = ""; // clear freetext
+            this->cursor = 0;
+            this->destSelect = false;
+            this->runState = CANNED_MESSAGE_RUN_STATE_ACTIVE;
+            DEBUG_MSG("MOVE UP (%d):%s\n", this->currentMessageIndex, this->getCurrentMessage());
+        }
    } else if (this->runState == CANNED_MESSAGE_RUN_STATE_ACTION_DOWN) {
-        this->currentMessageIndex = this->getNextIndex();
-        this->freetext = ""; // clear freetext
-        this->cursor = 0;
-        this->runState = CANNED_MESSAGE_RUN_STATE_ACTIVE;
-        DEBUG_MSG("MOVE DOWN (%d):%s\n", this->currentMessageIndex, this->getCurrentMessage());
+        if (this->messagesCount > 0) {
+            this->currentMessageIndex = this->getNextIndex();
+            this->freetext = ""; // clear freetext
+            this->cursor = 0;
+            this->destSelect = false;
+            this->runState = CANNED_MESSAGE_RUN_STATE_ACTIVE;
+            DEBUG_MSG("MOVE DOWN (%d):%s\n", this->currentMessageIndex, this->getCurrentMessage());
+        }
    } else if (this->runState == CANNED_MESSAGE_RUN_STATE_FREETEXT) {
        e.frameChanged = true;
        switch (this->payload) {
            case 0xb4: // left
-                if (this->cursor > 0) {
-                    this->cursor--;
+                if (this->destSelect){
+                    size_t numNodes = nodeDB.getNumNodes();
+                    if(this->dest == NODENUM_BROADCAST) {
+                        this->dest = nodeDB.getNodeNum();
+                    }
+                    for (unsigned int i = 0; i < numNodes; i++) {
+                        if (nodeDB.getNodeByIndex(i)->num == this->dest) {
+                            this->dest = (i > 0) ? nodeDB.getNodeByIndex(i-1)->num : nodeDB.getNodeByIndex(numNodes-1)->num;
+                            break;
+                        }
+                    }
+                    if(this->dest == nodeDB.getNodeNum()) {
+                        this->dest = NODENUM_BROADCAST;
+                    }
+                }else{
+                    if (this->cursor > 0) {
+                        this->cursor--;
+                    }
                }
                break;
            case 0xb7: // right
-                if (this->cursor < this->freetext.length()) {
-                    this->cursor++;
+                if (this->destSelect){
+                    size_t numNodes = nodeDB.getNumNodes();
+                    if(this->dest == NODENUM_BROADCAST) {
+                        this->dest = nodeDB.getNodeNum();
+                    }
+                    for (unsigned int i = 0; i < numNodes; i++) {
+                        if (nodeDB.getNodeByIndex(i)->num == this->dest) {
+                            this->dest = (i < numNodes-1) ? nodeDB.getNodeByIndex(i+1)->num : nodeDB.getNodeByIndex(0)->num;
+                            break;
+                        }
+                    }
+                    if(this->dest == nodeDB.getNodeNum()) {
+                        this->dest = NODENUM_BROADCAST;
+                    }
+                }else{
+                    if (this->cursor < this->freetext.length()) {
+                        this->cursor++;
+                    }
                }
                break;
-            case 8: // backspace
+            case 0x08: // backspace
                if (this->freetext.length() > 0) {
                    if(this->cursor == this->freetext.length()) {
                        this->freetext = this->freetext.substring(0, this->freetext.length() - 1);
@@ -297,6 +338,13 @@ int32_t CannedMessageModule::runOnce()
                    this->cursor--;
                }
                break;
+            case 0x09: // tab
+                if(this->destSelect) {
+                    this->destSelect = false;
+                } else {
+                    this->destSelect = true;
+                }
+                break;
            default:
                if(this->cursor == this->freetext.length()) {
                    this->freetext += this->payload;
@@ -339,6 +387,19 @@ const char *CannedMessageModule::getNextMessage()
 {
    return this->messages[this->getNextIndex()];
 }
+const char* CannedMessageModule::getNodeName(NodeNum node) {
+    if (node == NODENUM_BROADCAST){
+        return "Broadcast";
+    }else{
+        NodeInfo *info = nodeDB.getNode(node);
+        if(info != NULL) {
+            return info->user.long_name;
+        }else{
+            return "Unknown";
+        }
+    }
+}
+
 bool CannedMessageModule::shouldDraw()
 {
    if (!moduleConfig.canned_message.enabled) {
@@ -369,6 +430,8 @@ void CannedMessageModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *st
 {
    displayedNodeNum = 0; // Not currently showing a node pane

+    char buffer[50];
+
    if (cannedMessageModule->runState == CANNED_MESSAGE_RUN_STATE_SENDING_ACTIVE) {
        display->setTextAlignment(TEXT_ALIGN_CENTER);
        display->setFont(FONT_MEDIUM);
@@ -379,21 +442,29 @@ void CannedMessageModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *st
        display->drawString(10 + x, 0 + y + FONT_HEIGHT_SMALL, "Canned Message\nModule disabled.");
    }else if (cannedMessageModule->runState == CANNED_MESSAGE_RUN_STATE_FREETEXT) {
        display->setTextAlignment(TEXT_ALIGN_LEFT);
-        display->setFont(FONT_MEDIUM);
-        display->drawString(0 + x, 0 + y, "To: Broadcast");
+        display->setFont(FONT_SMALL);
+        if (this->destSelect) {
+            display->fillRect(0 + x, 0 + y, x + display->getWidth(), y + FONT_HEIGHT_SMALL);
+            display->setColor(BLACK);
+        }
+        display->drawStringf(0 + x, 0 + y, buffer, "To: %s", cannedMessageModule->getNodeName(this->dest));
        // used chars right aligned
-        char buffer[9];
        sprintf(buffer, "%d left", Constants_DATA_PAYLOAD_LEN - this->freetext.length());
        display->drawString(x + display->getWidth() - display->getStringWidth(buffer), y + 0, buffer);
-        display->drawString(0 + x, 0 + y + FONT_HEIGHT_MEDIUM, cannedMessageModule->drawWithCursor(cannedMessageModule->freetext, cannedMessageModule->cursor));
+        display->setColor(WHITE);
+        display->drawStringMaxWidth(0 + x, 0 + y + FONT_HEIGHT_SMALL, x + display->getWidth(), cannedMessageModule->drawWithCursor(cannedMessageModule->freetext, cannedMessageModule->cursor));
    } else {
-        display->setTextAlignment(TEXT_ALIGN_LEFT);
-        display->setFont(FONT_SMALL);
-        display->drawString(0 + x, 0 + y, cannedMessageModule->getPrevMessage());
-        display->setFont(FONT_MEDIUM);
-        display->drawString(0 + x, 0 + y + FONT_HEIGHT_SMALL, cannedMessageModule->getCurrentMessage());
-        display->setFont(FONT_SMALL);
-        display->drawString(0 + x, 0 + y + FONT_HEIGHT_MEDIUM, cannedMessageModule->getNextMessage());
+        if (this->messagesCount > 0) {
+            display->setTextAlignment(TEXT_ALIGN_LEFT);
+            display->setFont(FONT_SMALL);
+            display->drawStringf(0 + x, 0 + y, buffer, "To: %s", cannedMessageModule->getNodeName(this->dest));
+            display->drawString(0 + x, 0 + y + FONT_HEIGHT_SMALL, cannedMessageModule->getPrevMessage());
+            display->fillRect(0 + x, 0 + y + FONT_HEIGHT_SMALL * 2, x + display->getWidth(), y + FONT_HEIGHT_SMALL);
+            display->setColor(BLACK);
+            display->drawString(0 + x, 0 + y + FONT_HEIGHT_SMALL * 2, cannedMessageModule->getCurrentMessage());
+            display->setColor(WHITE);
+            display->drawString(0 + x, 0 + y + FONT_HEIGHT_SMALL * 3, cannedMessageModule->getNextMessage());
+        }
    }
 }

@@ -9,7 +9,6 @@ enum cannedMessageModuleRunState
    CANNED_MESSAGE_RUN_STATE_INACTIVE,
    CANNED_MESSAGE_RUN_STATE_ACTIVE,
    CANNED_MESSAGE_RUN_STATE_FREETEXT,
-    CANNED_MESSAGE_RUN_STATE_MATRIX,
    CANNED_MESSAGE_RUN_STATE_SENDING_ACTIVE,
    CANNED_MESSAGE_RUN_STATE_ACTION_SELECT,
    CANNED_MESSAGE_RUN_STATE_ACTION_UP,
@@ -36,6 +35,7 @@ class CannedMessageModule :
    const char* getCurrentMessage();
    const char* getPrevMessage();
    const char* getNextMessage();
+    const char* getNodeName(NodeNum node);
    bool shouldDraw();
    void eventUp();
    void eventDown();
@@ -74,9 +74,11 @@ class CannedMessageModule :

    int currentMessageIndex = -1;
    cannedMessageModuleRunState runState = CANNED_MESSAGE_RUN_STATE_INACTIVE;
-    char payload;
+    char payload = 0x00;
    unsigned int cursor = 0;
    String freetext = "";  // Text Buffer for Freetext Editor
+    bool destSelect = false; // Freetext Editor Mode
+    NodeNum dest = NODENUM_BROADCAST;

    char messageStore[CANNED_MESSAGE_MODULE_MESSAGES_SIZE+1];
    char *messages[CANNED_MESSAGE_MODULE_MESSAGE_MAX_COUNT];
@@ -85,4 +87,4 @@ class CannedMessageModule :
 };

 extern CannedMessageModule *cannedMessageModule;
-#endif
+#endif
@@ -3,18 +3,23 @@
 #include "NodeDB.h"
 #include "RTC.h"
 #include "Router.h"
+#include "buzz/buzz.h"
 #include "configuration.h"
 #include <Arduino.h>

+#ifndef PIN_BUZZER
+#define PIN_BUZZER false
+#endif
+
 //#include <assert.h>

 /*

    Documentation:
-        https://github.com/meshtastic/Meshtastic-device/blob/master/docs/software/modules/ExternalNotificationModule.md
+        https://github.com/meshtastic/firmware/blob/master/docs/software/modules/ExternalNotificationModule.md

    This module supports:
-        https://github.com/meshtastic/Meshtastic-device/issues/654
+        https://github.com/meshtastic/firmware/issues/654


    Quick reference:
@@ -44,7 +49,11 @@
 */

 // Default configurations
+#ifdef EXT_NOTIFY_OUT
 #define EXT_NOTIFICATION_MODULE_OUTPUT EXT_NOTIFY_OUT
+#else
+#define EXT_NOTIFICATION_MODULE_OUTPUT 0
+#endif
 #define EXT_NOTIFICATION_MODULE_OUTPUT_MS 1000

 #define ASCII_BELL 0x07
@@ -75,7 +84,9 @@ int32_t ExternalNotificationModule::runOnce()
                                    : EXT_NOTIFICATION_MODULE_OUTPUT_MS) <
            millis()) {
            DEBUG_MSG("Turning off external notification\n");
-            setExternalOff();
+            if (output != PIN_BUZZER) {
+                setExternalOff();
+            }
        }
    }

@@ -84,27 +95,19 @@ int32_t ExternalNotificationModule::runOnce()

 void ExternalNotificationModule::setExternalOn()
 {
-#ifdef EXT_NOTIFY_OUT
    externalCurrentState = 1;
    externalTurnedOn = millis();

-    digitalWrite((moduleConfig.external_notification.output
-                      ? moduleConfig.external_notification.output
-                      : EXT_NOTIFICATION_MODULE_OUTPUT),
+    digitalWrite(output,
                 (moduleConfig.external_notification.active ? true : false));
-#endif
 }

 void ExternalNotificationModule::setExternalOff()
 {
-#ifdef EXT_NOTIFY_OUT
    externalCurrentState = 0;

-    digitalWrite((moduleConfig.external_notification.output
-                      ? moduleConfig.external_notification.output
-                      : EXT_NOTIFICATION_MODULE_OUTPUT),
+    digitalWrite(output,
                 (moduleConfig.external_notification.active ? false : true));
-#endif
 }

 // --------
@@ -116,8 +119,6 @@ ExternalNotificationModule::ExternalNotificationModule()
    // restrict to the admin channel for rx
    boundChannel = Channels::gpioChannel;

-#ifdef EXT_NOTIFY_OUT
-
    /*
        Uncomment the preferences below if you want to use the module
        without having to configure it from the PythonAPI or WebUI.
@@ -135,25 +136,27 @@ ExternalNotificationModule::ExternalNotificationModule()

        DEBUG_MSG("Initializing External Notification Module\n");

-        // Set the direction of a pin
-        pinMode((moduleConfig.external_notification.output
-                     ? moduleConfig.external_notification.output
-                     : EXT_NOTIFICATION_MODULE_OUTPUT),
-                OUTPUT);
+        output = moduleConfig.external_notification.output
+                        ? moduleConfig.external_notification.output
+                        : EXT_NOTIFICATION_MODULE_OUTPUT;

-        // Turn off the pin
-        setExternalOff();
+        if (output != PIN_BUZZER) {
+            // Set the direction of a pin
+            DEBUG_MSG("Using Pin %i in digital mode\n", output);
+            pinMode(output, OUTPUT);
+            // Turn off the pin
+            setExternalOff();
+        } else{
+            DEBUG_MSG("Using Pin %i in PWM mode\n", output);
+        }
    } else {
        DEBUG_MSG("External Notification Module Disabled\n");
        enabled = false;
    }
-#endif
 }

 ProcessMessage ExternalNotificationModule::handleReceived(const MeshPacket &mp)
 {
-#ifdef EXT_NOTIFY_OUT
-
    if (moduleConfig.external_notification.enabled) {

        if (getFrom(&mp) != nodeDB.getNodeNum()) {
@@ -165,21 +168,28 @@ ProcessMessage ExternalNotificationModule::handleReceived(const MeshPacket &mp)
                DEBUG_MSG("externalNotificationModule - Notification Bell\n");
                for (int i = 0; i < p.payload.size; i++) {
                    if (p.payload.bytes[i] == ASCII_BELL) {
-                        setExternalOn();
+                        if (output != PIN_BUZZER) {
+                            setExternalOn();
+                        } else {
+                            playBeep();
+                        }
                    }
                }
            }

            if (moduleConfig.external_notification.alert_message) {
                DEBUG_MSG("externalNotificationModule - Notification Module\n");
-                setExternalOn();
+                if (output != PIN_BUZZER) {
+                    setExternalOn();
+                } else {
+                    playBeep();
+                }
            }
        }

    } else {
        DEBUG_MSG("External Notification Module Disabled\n");
    }
-#endif

    return ProcessMessage::CONTINUE; // Let others look at this message also if they want
 }
@@ -12,6 +12,8 @@
 */
 class ExternalNotificationModule : public SinglePortModule, private concurrency::OSThread
 {
+  uint32_t output = 0;
+
  public:
    ExternalNotificationModule();

@@ -60,13 +60,15 @@ void setupModules()
    new DeviceTelemetryModule();
    new EnvironmentTelemetryModule();
 #endif
+#if (defined(ARCH_ESP32) || defined(ARCH_NRF52)) && !defined(TTGO_T_ECHO)
+    new SerialModule();
+#endif
 #ifdef ARCH_ESP32
    // Only run on an esp32 based device.

    /*
        Maintained by MC Hamster (Jm Casler) jm@casler.org
    */
-    new SerialModule();
    new ExternalNotificationModule();

    storeForwardModule = new StoreForwardModule();
@@ -108,7 +108,7 @@ MeshPacket *PositionModule::allocReply()
    // Strip out any time information before sending packets to other nodes - to keep the wire size small (and because other
    // nodes shouldn't trust it anyways) Note: we allow a device with a local GPS to include the time, so that gpsless
    // devices can get time.
-    if (getRTCQuality() < RTCQualityGPS) {
+    if (getRTCQuality() < RTCQualityDevice) {
        DEBUG_MSG("Stripping time %u from position send\n", p.time);
        p.time = 0;
    } else
@@ -144,7 +144,7 @@ int32_t PositionModule::runOnce()
    if (lastGpsSend == 0 || (now - lastGpsSend) >= intervalMs) {

        // Only send packets if the channel is less than 40% utilized.
-        if (airTime->channelUtilizationPercent() < 40) {
+        if (airTime->channelUtilizationPercent() < max_channel_util_percent) {
            if (node->has_position && (node->position.latitude_i != 0 || node->position.longitude_i != 0)) {
                lastGpsSend = now;

@@ -165,7 +165,7 @@ int32_t PositionModule::runOnce()
    } else if (config.position.position_broadcast_smart_enabled) {

        // Only send packets if the channel is less than 25% utilized.
-        if (airTime->channelUtilizationPercent() < 25) {
+        if (airTime->channelUtilizationPercent() < polite_channel_util_percent) {

            NodeInfo *node2 = service.refreshMyNodeInfo(); // should guarantee there is now a position

@@ -2,6 +2,7 @@
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "RTC.h"
+#include "NMEAWPL.h"
 #include "Router.h"
 #include "configuration.h"
 #include <Arduino.h>
@@ -40,7 +41,7 @@
    KNOWN PROBLEMS
        * Until the module is initilized by the startup sequence, the TX pin is in a floating
          state. Device connected to that pin may see this as "noise".
-        * Will not work on NRF and the Linux device targets.
+        * Will not work on T-Echo and the Linux device targets.


 */
@@ -62,16 +63,19 @@ char serialStringChar[Constants_DATA_PAYLOAD_LEN];

 SerialModuleRadio::SerialModuleRadio() : MeshModule("SerialModuleRadio")
 {
-    // restrict to the admin channel for rx
-    boundChannel = Channels::serialChannel;

    switch (moduleConfig.serial.mode)
    {
        case ModuleConfig_SerialConfig_Serial_Mode_TEXTMSG:
            ourPortNum = PortNum_TEXT_MESSAGE_APP;
            break;
+        case ModuleConfig_SerialConfig_Serial_Mode_NMEA:
+            ourPortNum = PortNum_POSITION_APP;
+            break;
        default:
            ourPortNum = PortNum_SERIAL_APP;
+            // restrict to the serial channel for rx
+            boundChannel = Channels::serialChannel;
            break;
    }
 }
@@ -175,15 +179,25 @@ int32_t SerialModule::runOnce()
            firstTime = 0;

        } else {
-            String serialString;

-            while (Serial2.available()) {
-                serialString = Serial2.readString();
-                serialString.toCharArray(serialStringChar, Constants_DATA_PAYLOAD_LEN);
+            // in NMEA mode send out GGA every 2 seconds, Don't read from Port
+            if (moduleConfig.serial.mode == ModuleConfig_SerialConfig_Serial_Mode_NMEA) {
+                if (millis() - lastNmeaTime > 2000) {
+                    lastNmeaTime = millis();
+                    printGGA(outbuf, nodeDB.getNode(myNodeInfo.my_node_num)->position);
+                    Serial2.printf("%s", outbuf);
+                }
+            } else {
+                String serialString;

-                serialModuleRadio->sendPayload();
+                while (Serial2.available()) {
+                    serialString = Serial2.readString();
+                    serialString.toCharArray(serialStringChar, Constants_DATA_PAYLOAD_LEN);

-                DEBUG_MSG("Received: %s\n", serialStringChar);
+                    serialModuleRadio->sendPayload();
+
+                    DEBUG_MSG("Received: %s\n", serialStringChar);
+                }
            }
        }

@@ -191,7 +205,7 @@ int32_t SerialModule::runOnce()
    } else {
        DEBUG_MSG("Serial Module Disabled\n");

-        return (INT32_MAX);
+        return INT32_MAX;
    }
 #else
    return INT32_MAX;
@@ -255,6 +269,19 @@ ProcessMessage SerialModuleRadio::handleReceived(const MeshPacket &mp)

            } else if (moduleConfig.serial.mode == ModuleConfig_SerialConfig_Serial_Mode_PROTO) {
                // TODO this needs to be implemented
+            } else if (moduleConfig.serial.mode == ModuleConfig_SerialConfig_Serial_Mode_NMEA) {
+                // Decode the Payload some more
+                Position scratch;
+                Position *decoded = NULL;
+                if (mp.which_payload_variant == MeshPacket_decoded_tag && mp.decoded.portnum == ourPortNum) {
+                    memset(&scratch, 0, sizeof(scratch));
+                    if (pb_decode_from_bytes(p.payload.bytes, p.payload.size, Position_fields, &scratch)) {
+                        decoded = &scratch;
+                    }
+                    // send position packet as WPL to the serial port
+                    printWPL(outbuf, *decoded, nodeDB.getNode(getFrom(&mp))->user.long_name);
+                    Serial2.printf("%s", outbuf);
+                }
            }
        }

@@ -11,6 +11,8 @@
 class SerialModule : private concurrency::OSThread
 {
    bool firstTime = 1;
+    unsigned long lastNmeaTime = millis();
+    char outbuf[90] = "";

  public:
    SerialModule();
@@ -28,6 +30,7 @@ extern SerialModule *serialModule;
 class SerialModuleRadio : public MeshModule
 {
    uint32_t lastRxID = 0;
+    char outbuf[90] = "";

  public:
    SerialModuleRadio();
@@ -9,19 +9,23 @@
 #include "main.h"
 #include <OLEDDisplay.h>
 #include <OLEDDisplayUi.h>
+#include "MeshService.h"

 int32_t DeviceTelemetryModule::runOnce()
 {
 #ifndef ARCH_PORTDUINO
-    if (firstTime) {
-        // This is the first time the OSThread library has called this function, so do some setup
-        firstTime = 0;
-        DEBUG_MSG("Device Telemetry: Initializing\n");
+    uint32_t now = millis();
+    if ((lastSentToMesh == 0 || 
+        (now - lastSentToMesh) >= getConfiguredOrDefaultMs(moduleConfig.telemetry.device_update_interval)) &&
+        airTime->channelUtilizationPercent() < max_channel_util_percent) {
+        sendTelemetry();
+        lastSentToMesh = now;
+    } else if (service.isToPhoneQueueEmpty()) {
+        // Just send to phone when it's not our time to send to mesh yet
+        // Only send while queue is empty (phone assumed connected)
+        sendTelemetry(NODENUM_BROADCAST, true);
    }
-    sendOurTelemetry();
-    // OSThread library.  Multiply the preference value by 1000 to convert seconds to miliseconds
-
-    return getConfiguredOrDefaultMs(moduleConfig.telemetry.device_update_interval);
+    return sendToPhoneIntervalMs;
 #endif
 }

@@ -29,14 +33,13 @@ bool DeviceTelemetryModule::handleReceivedProtobuf(const MeshPacket &mp, Telemet
 {
    if (t->which_variant == Telemetry_device_metrics_tag) {
        const char *sender = getSenderShortName(mp);
-
-        DEBUG_MSG("-----------------------------------------\n");
-        DEBUG_MSG("Device Telemetry: Received data from %s\n", sender);
-        DEBUG_MSG("Telemetry->time: %i\n", t->time);
-        DEBUG_MSG("Telemetry->air_util_tx: %f\n", t->variant.device_metrics.air_util_tx);
-        DEBUG_MSG("Telemetry->battery_level: %i\n", t->variant.device_metrics.battery_level);
-        DEBUG_MSG("Telemetry->channel_utilization: %f\n", t->variant.device_metrics.channel_utilization);
-        DEBUG_MSG("Telemetry->voltage: %f\n", t->variant.device_metrics.voltage);
+    
+        DEBUG_MSG("(Received from %s): air_util_tx=%f, channel_utilization=%f, battery_level=%i, voltage=%f\n",
+            sender,
+            t->variant.device_metrics.air_util_tx,
+            t->variant.device_metrics.channel_utilization,
+            t->variant.device_metrics.battery_level,
+            t->variant.device_metrics.voltage);

        lastMeasurementPacket = packetPool.allocCopy(mp);

@@ -45,7 +48,7 @@ bool DeviceTelemetryModule::handleReceivedProtobuf(const MeshPacket &mp, Telemet
    return false; // Let others look at this message also if they want
 }

-bool DeviceTelemetryModule::sendOurTelemetry(NodeNum dest, bool wantReplies)
+bool DeviceTelemetryModule::sendTelemetry(NodeNum dest, bool phoneOnly)
 {
    Telemetry t;

@@ -57,22 +60,25 @@ bool DeviceTelemetryModule::sendOurTelemetry(NodeNum dest, bool wantReplies)
    t.variant.device_metrics.channel_utilization = myNodeInfo.channel_utilization;
    t.variant.device_metrics.voltage = powerStatus->getBatteryVoltageMv() / 1000.0;

-    DEBUG_MSG("-----------------------------------------\n");
-    DEBUG_MSG("Device Telemetry: Read data\n");
-
-    DEBUG_MSG("Telemetry->time: %i\n", t.time);
-    DEBUG_MSG("Telemetry->air_util_tx: %f\n", t.variant.device_metrics.air_util_tx);
-    DEBUG_MSG("Telemetry->battery_level: %i\n", t.variant.device_metrics.battery_level);
-    DEBUG_MSG("Telemetry->channel_utilization: %f\n", t.variant.device_metrics.channel_utilization);
-    DEBUG_MSG("Telemetry->voltage: %f\n", t.variant.device_metrics.voltage);
+    DEBUG_MSG("(Sending): air_util_tx=%f, channel_utilization=%f, battery_level=%i, voltage=%f\n", 
+        t.variant.device_metrics.air_util_tx,
+        t.variant.device_metrics.channel_utilization,
+        t.variant.device_metrics.battery_level,
+        t.variant.device_metrics.voltage);

    MeshPacket *p = allocDataProtobuf(t);
    p->to = dest;
-    p->decoded.want_response = wantReplies;
+    p->decoded.want_response = false;
+    p->priority = MeshPacket_Priority_MIN;

    lastMeasurementPacket = packetPool.allocCopy(*p);
-    DEBUG_MSG("Device Telemetry: Sending packet to mesh\n");
-    service.sendToMesh(p, RX_SRC_LOCAL, true);
    nodeDB.updateTelemetry(nodeDB.getNodeNum(), t, RX_SRC_LOCAL);
+    if (phoneOnly) {
+        DEBUG_MSG("Sending packet to phone\n");
+        service.sendToPhone(p);
+    } else {
+        DEBUG_MSG("Sending packet to mesh\n");
+        service.sendToMesh(p, RX_SRC_LOCAL, true);
+    }
    return true;
 }
@@ -11,7 +11,8 @@ class DeviceTelemetryModule : private concurrency::OSThread, public ProtobufModu
    DeviceTelemetryModule()
        : concurrency::OSThread("DeviceTelemetryModule"), ProtobufModule("DeviceTelemetry", PortNum_TELEMETRY_APP, &Telemetry_msg)
    {
-        lastMeasurementPacket = nullptr;
+      lastMeasurementPacket = nullptr;
+      setIntervalFromNow(10 * 1000);
    }
    virtual bool wantUIFrame() { return false; }

@@ -24,9 +25,10 @@ class DeviceTelemetryModule : private concurrency::OSThread, public ProtobufModu
    /**
     * Send our Telemetry into the mesh
     */
-    bool sendOurTelemetry(NodeNum dest = NODENUM_BROADCAST, bool wantReplies = false);
+    bool sendTelemetry(NodeNum dest = NODENUM_BROADCAST, bool phoneOnly = false);

  private:
-    bool firstTime = 1;
+    uint32_t sendToPhoneIntervalMs = SECONDS_IN_MINUTE * 1000; // Send to phone every minute
+    uint32_t lastSentToMesh = 0;
    const MeshPacket *lastMeasurementPacket;
 };
@@ -9,6 +9,7 @@
 #include "main.h"
 #include <OLEDDisplay.h>
 #include <OLEDDisplayUi.h>
+#include "MeshService.h"

 // Sensors
 #include "Sensor/BMP280Sensor.h"
@@ -17,6 +18,8 @@
 #include "Sensor/MCP9808Sensor.h"
 #include "Sensor/INA260Sensor.h"
 #include "Sensor/INA219Sensor.h"
+#include "Sensor/SHTC3Sensor.h"
+#include "Sensor/LPS22HBSensor.h"

 BMP280Sensor bmp280Sensor;
 BME280Sensor bme280Sensor;
@@ -24,6 +27,8 @@ BME680Sensor bme680Sensor;
 MCP9808Sensor mcp9808Sensor;
 INA260Sensor ina260Sensor;
 INA219Sensor ina219Sensor;
+SHTC3Sensor shtc3Sensor;
+LPS22HBSensor lps22hbSensor;

 #define FAILED_STATE_SENSOR_READ_MULTIPLIER 10
 #define DISPLAY_RECEIVEID_MEASUREMENTS_ON_SCREEN true
@@ -83,21 +88,31 @@ int32_t EnvironmentTelemetryModule::runOnce()
                result = ina260Sensor.runOnce();
            if (ina219Sensor.hasSensor())
                result = ina219Sensor.runOnce();
+            if (shtc3Sensor.hasSensor())
+                result = shtc3Sensor.runOnce();
+            if (lps22hbSensor.hasSensor()) {
+                result = lps22hbSensor.runOnce();
+            }
        }
        return result;
    } else {
        // if we somehow got to a second run of this module with measurement disabled, then just wait forever
        if (!moduleConfig.telemetry.environment_measurement_enabled)
            return result;
-        // this is not the first time OSThread library has called this function
-        // so just do what we intend to do on the interval
-        if (!sendOurTelemetry()) {
-            // if we failed to read the sensor, then try again
-            // as soon as we can according to the maximum polling frequency
-            return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS;
+
+        uint32_t now = millis();
+        if ((lastSentToMesh == 0 || 
+            (now - lastSentToMesh) >= getConfiguredOrDefaultMs(moduleConfig.telemetry.environment_update_interval)) && 
+            airTime->channelUtilizationPercent() < max_channel_util_percent) {
+            sendTelemetry();
+            lastSentToMesh = now;
+        } else if (service.isToPhoneQueueEmpty()) {
+            // Just send to phone when it's not our time to send to mesh yet
+            // Only send while queue is empty (phone assumed connected)
+            sendTelemetry(NODENUM_BROADCAST, true);
        }
    }
-    return getConfiguredOrDefaultMs(moduleConfig.telemetry.environment_update_interval);
+    return sendToPhoneIntervalMs;
 #endif
 }

@@ -143,7 +158,7 @@ void EnvironmentTelemetryModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiSt
    if (!pb_decode_from_bytes(p.payload.bytes, p.payload.size, Telemetry_fields, &lastMeasurement)) {
        display->setFont(FONT_SMALL);
        display->drawString(x, y += fontHeight(FONT_MEDIUM), "Measurement Error");
-        DEBUG_MSG("Environment Telemetry: unable to decode last packet");
+        DEBUG_MSG("Unable to decode last packet");
        return;
    }

@@ -168,15 +183,14 @@ bool EnvironmentTelemetryModule::handleReceivedProtobuf(const MeshPacket &mp, Te
    if (t->which_variant == Telemetry_environment_metrics_tag) {
        const char *sender = getSenderShortName(mp);

-        DEBUG_MSG("-----------------------------------------\n");
-        DEBUG_MSG("Environment Telemetry: Received data from %s\n", sender);
-        DEBUG_MSG("Telemetry->time: %i\n", t->time);
-        DEBUG_MSG("Telemetry->barometric_pressure: %f\n", t->variant.environment_metrics.barometric_pressure);
-        DEBUG_MSG("Telemetry->current: %f\n", t->variant.environment_metrics.current);
-        DEBUG_MSG("Telemetry->gas_resistance: %f\n", t->variant.environment_metrics.gas_resistance);
-        DEBUG_MSG("Telemetry->relative_humidity: %f\n", t->variant.environment_metrics.relative_humidity);
-        DEBUG_MSG("Telemetry->temperature: %f\n", t->variant.environment_metrics.temperature);
-        DEBUG_MSG("Telemetry->voltage: %f\n", t->variant.environment_metrics.voltage);
+        DEBUG_MSG("(Received from %s): barometric_pressure=%f, current=%f, gas_resistance=%f, relative_humidity=%f, temperature=%f, voltage=%f\n",
+            sender,
+            t->variant.environment_metrics.barometric_pressure,
+            t->variant.environment_metrics.current,
+            t->variant.environment_metrics.gas_resistance,
+            t->variant.environment_metrics.relative_humidity,
+            t->variant.environment_metrics.temperature,
+            t->variant.environment_metrics.voltage);

        lastMeasurementPacket = packetPool.allocCopy(mp);
    }
@@ -184,7 +198,7 @@ bool EnvironmentTelemetryModule::handleReceivedProtobuf(const MeshPacket &mp, Te
    return false; // Let others look at this message also if they want
 }

-bool EnvironmentTelemetryModule::sendOurTelemetry(NodeNum dest, bool wantReplies)
+bool EnvironmentTelemetryModule::sendTelemetry(NodeNum dest, bool phoneOnly)
 {
    Telemetry m;
    m.time = getTime();
@@ -197,9 +211,10 @@ bool EnvironmentTelemetryModule::sendOurTelemetry(NodeNum dest, bool wantReplies
    m.variant.environment_metrics.temperature = 0;
    m.variant.environment_metrics.voltage = 0;

-    DEBUG_MSG("-----------------------------------------\n");
-    DEBUG_MSG("Environment Telemetry: Read data\n");
-
+    if (lps22hbSensor.hasSensor())
+        lps22hbSensor.getMetrics(&m);
+    if (shtc3Sensor.hasSensor())
+        shtc3Sensor.getMetrics(&m);
    if (bmp280Sensor.hasSensor())
        bmp280Sensor.getMetrics(&m);
    if (bme280Sensor.hasSensor())
@@ -213,22 +228,28 @@ bool EnvironmentTelemetryModule::sendOurTelemetry(NodeNum dest, bool wantReplies
    if (ina260Sensor.hasSensor())
        ina260Sensor.getMetrics(&m);

-    DEBUG_MSG("Telemetry->time: %i\n", m.time);
-    DEBUG_MSG("Telemetry->barometric_pressure: %f\n", m.variant.environment_metrics.barometric_pressure);
-    DEBUG_MSG("Telemetry->current: %f\n", m.variant.environment_metrics.current);
-    DEBUG_MSG("Telemetry->gas_resistance: %f\n", m.variant.environment_metrics.gas_resistance);
-    DEBUG_MSG("Telemetry->relative_humidity: %f\n", m.variant.environment_metrics.relative_humidity);
-    DEBUG_MSG("Telemetry->temperature: %f\n", m.variant.environment_metrics.temperature);
-    DEBUG_MSG("Telemetry->voltage: %f\n", m.variant.environment_metrics.voltage);
+   DEBUG_MSG("(Sending): barometric_pressure=%f, current=%f, gas_resistance=%f, relative_humidity=%f, temperature=%f, voltage=%f\n",
+        m.variant.environment_metrics.barometric_pressure,
+        m.variant.environment_metrics.current,
+        m.variant.environment_metrics.gas_resistance,
+        m.variant.environment_metrics.relative_humidity,
+        m.variant.environment_metrics.temperature,
+        m.variant.environment_metrics.voltage);

    sensor_read_error_count = 0;

    MeshPacket *p = allocDataProtobuf(m);
    p->to = dest;
-    p->decoded.want_response = wantReplies;
+    p->decoded.want_response = false;
+    p->priority = MeshPacket_Priority_MIN;

    lastMeasurementPacket = packetPool.allocCopy(*p);
-    DEBUG_MSG("Environment Telemetry: Sending packet to mesh");
-    service.sendToMesh(p, RX_SRC_LOCAL, true);
+    if (phoneOnly) {
+        DEBUG_MSG("Sending packet to phone\n");
+        service.sendToPhone(p);
+    } else {
+        DEBUG_MSG("Sending packet to mesh\n");
+        service.sendToMesh(p, RX_SRC_LOCAL, true);
+    }
    return true;
 }
@@ -12,7 +12,8 @@ class EnvironmentTelemetryModule : private concurrency::OSThread, public Protobu
        : concurrency::OSThread("EnvironmentTelemetryModule"),
          ProtobufModule("EnvironmentTelemetry", PortNum_TELEMETRY_APP, &Telemetry_msg)
    {
-        lastMeasurementPacket = nullptr;
+      lastMeasurementPacket = nullptr;
+      setIntervalFromNow(10 * 1000);
    }
    virtual bool wantUIFrame() override;
 #if !HAS_SCREEN
@@ -30,11 +31,13 @@ class EnvironmentTelemetryModule : private concurrency::OSThread, public Protobu
    /**
     * Send our Telemetry into the mesh
     */
-    bool sendOurTelemetry(NodeNum dest = NODENUM_BROADCAST, bool wantReplies = false);
+    bool sendTelemetry(NodeNum dest = NODENUM_BROADCAST, bool wantReplies = false);

  private:
    float CelsiusToFahrenheit(float c);
    bool firstTime = 1;
    const MeshPacket *lastMeasurementPacket;
+    uint32_t sendToPhoneIntervalMs = SECONDS_IN_MINUTE * 1000; // Send to phone every minute
+    uint32_t lastSentToMesh = 0;
    uint32_t sensor_read_error_count = 0;
 };
@@ -0,0 +1,36 @@
+#include "../mesh/generated/telemetry.pb.h"
+#include "configuration.h"
+#include "TelemetrySensor.h"
+#include "LPS22HBSensor.h"
+#include <Adafruit_LPS2X.h>
+#include <Adafruit_Sensor.h>
+
+LPS22HBSensor::LPS22HBSensor() : 
+    TelemetrySensor(TelemetrySensorType_LPS22, "LPS22HB") 
+{
+}
+
+int32_t LPS22HBSensor::runOnce() {
+    DEBUG_MSG("Init sensor: %s\n", sensorName);
+    if (!hasSensor()) {
+        return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS;
+    }
+    status = lps22hb.begin_I2C(nodeTelemetrySensorsMap[sensorType]);
+    return initI2CSensor();
+}
+
+void LPS22HBSensor::setup() 
+{
+    lps22hb.setDataRate(LPS22_RATE_10_HZ);
+}
+
+bool LPS22HBSensor::getMetrics(Telemetry *measurement) {
+    sensors_event_t temp;
+    sensors_event_t pressure;
+    lps22hb.getEvent(&pressure, &temp);
+
+    measurement->variant.environment_metrics.temperature = temp.temperature;
+    measurement->variant.environment_metrics.barometric_pressure = pressure.pressure;
+
+    return true;
+}    
@@ -0,0 +1,17 @@
+#include "../mesh/generated/telemetry.pb.h"
+#include "TelemetrySensor.h"
+#include <Adafruit_LPS2X.h>
+#include <Adafruit_Sensor.h>
+
+class LPS22HBSensor : virtual public TelemetrySensor {
+private:
+    Adafruit_LPS22 lps22hb;
+
+protected:
+    virtual void setup() override;
+    
+public:
+    LPS22HBSensor();
+    virtual int32_t runOnce() override;
+    virtual bool getMetrics(Telemetry *measurement) override;
+};    
@@ -0,0 +1,34 @@
+#include "../mesh/generated/telemetry.pb.h"
+#include "configuration.h"
+#include "TelemetrySensor.h"
+#include "SHTC3Sensor.h"
+#include <Adafruit_SHTC3.h>
+
+SHTC3Sensor::SHTC3Sensor() : 
+    TelemetrySensor(TelemetrySensorType_SHTC3, "SHTC3") 
+{
+}
+
+int32_t SHTC3Sensor::runOnce() {
+    DEBUG_MSG("Init sensor: %s\n", sensorName);
+    if (!hasSensor()) {
+        return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS;
+    }
+    status = shtc3.begin(); 
+    return initI2CSensor();
+}
+
+void SHTC3Sensor::setup() 
+{
+    // Set up oversampling and filter initialization
+}
+
+bool SHTC3Sensor::getMetrics(Telemetry *measurement) {
+    sensors_event_t humidity, temp;
+    shtc3.getEvent(&humidity, &temp);
+
+    measurement->variant.environment_metrics.temperature = temp.temperature;
+    measurement->variant.environment_metrics.relative_humidity = humidity.relative_humidity;
+
+    return true;
+}    
@@ -0,0 +1,16 @@
+#include "../mesh/generated/telemetry.pb.h"
+#include "TelemetrySensor.h"
+#include <Adafruit_SHTC3.h>
+
+class SHTC3Sensor : virtual public TelemetrySensor {
+private:
+    Adafruit_SHTC3 shtc3 = Adafruit_SHTC3();
+
+protected:
+    virtual void setup() override;
+    
+public:
+    SHTC3Sensor();
+    virtual int32_t runOnce() override;
+    virtual bool getMetrics(Telemetry *measurement) override;
+};    
@@ -27,7 +27,7 @@ int32_t StoreForwardModule::runOnce()
            if (this->busy) {

                // Only send packets if the channel is less than 25% utilized.
-                if (airTime->channelUtilizationPercent() < 25) {
+                if (airTime->channelUtilizationPercent() < polite_channel_util_percent) {

                    // DEBUG_MSG("--- --- --- In busy loop 1 %d\n", this->packetHistoryTXQueue_index);
                    storeForwardModule->sendPayload(this->busyTo, this->packetHistoryTXQueue_index);
@@ -8,15 +8,17 @@
 #include "mesh/generated/mqtt.pb.h"
 #include "mesh/generated/telemetry.pb.h"
 #include "sleep.h"
+#if HAS_WIFI
 #include <WiFi.h>
+#endif
 #include <assert.h>
 #include <json11.hpp>

 MQTT *mqtt;

-String statusTopic = "msh/1/stat/";
-String cryptTopic = "msh/1/c/";   // msh/1/c/CHANNELID/NODEID
-String jsonTopic = "msh/1/json/"; // msh/1/json/CHANNELID/NODEID
+String statusTopic = "msh/2/stat/";
+String cryptTopic = "msh/2/c/";   // msh/2/c/CHANNELID/NODEID
+String jsonTopic = "msh/2/json/"; // msh/2/json/CHANNELID/NODEID

 void MQTT::mqttCallback(char *topic, byte *payload, unsigned int length)
 {
@@ -27,8 +29,9 @@ void MQTT::onPublish(char *topic, byte *payload, unsigned int length)
 {
    // parsing ServiceEnvelope
    ServiceEnvelope e = ServiceEnvelope_init_default;
-    if (!pb_decode_from_bytes(payload, length, ServiceEnvelope_fields, &e) && moduleConfig.mqtt.json_enabled) {
-        // check if this is a json payload message
+
+    if (moduleConfig.mqtt.json_enabled && (strncmp(topic, jsonTopic.c_str(), jsonTopic.length()) == 0)) {
+        // check if this is a json payload message by comparing the topic start
        using namespace json11;
        char payloadStr[length + 1];
        memcpy(payloadStr, payload, length);
@@ -36,36 +39,37 @@ void MQTT::onPublish(char *topic, byte *payload, unsigned int length)
        std::string err;
        auto json = Json::parse(payloadStr, err);
        if (err.empty()) {
-            DEBUG_MSG("Received json payload on MQTT, parsing..\n");
+            DEBUG_MSG("JSON Received on MQTT, parsing..\n");
            // check if it is a valid envelope
-            if (json.object_items().count("sender") != 0 && json.object_items().count("payload") != 0) {
+            if (json.object_items().count("sender") != 0 && json.object_items().count("payload") != 0 && json["type"].string_value().compare("sendtext") == 0) {
                // this is a valid envelope
                if (json["sender"].string_value().compare(owner.id) != 0) {
                    std::string jsonPayloadStr = json["payload"].dump();
-                    DEBUG_MSG("Received json payload %s, length %u\n", jsonPayloadStr.c_str(), jsonPayloadStr.length());
-                    // FIXME Not sure we need to be doing this
+                    DEBUG_MSG("JSON payload %s, length %u\n", jsonPayloadStr.c_str(), jsonPayloadStr.length());
+
                    // construct protobuf data packet using TEXT_MESSAGE, send it to the mesh
-                    // MeshPacket *p = router->allocForSending();
-                    // p->decoded.portnum = PortNum_TEXT_MESSAGE_APP;
-                    // if (jsonPayloadStr.length() <= sizeof(p->decoded.payload.bytes)) {
-                    //     memcpy(p->decoded.payload.bytes, jsonPayloadStr.c_str(), jsonPayloadStr.length());
-                    //     p->decoded.payload.size = jsonPayloadStr.length();
-                    //     MeshPacket *packet = packetPool.allocCopy(*p);
-                    //     service.sendToMesh(packet, RX_SRC_LOCAL);
-                    // } else {
-                    //     DEBUG_MSG("Received MQTT json payload too long, dropping\n");
-                    // }
+                    MeshPacket *p = router->allocForSending();
+                    p->decoded.portnum = PortNum_TEXT_MESSAGE_APP;
+                    if (jsonPayloadStr.length() <= sizeof(p->decoded.payload.bytes)) {
+                        memcpy(p->decoded.payload.bytes, jsonPayloadStr.c_str(), jsonPayloadStr.length());
+                        p->decoded.payload.size = jsonPayloadStr.length();
+                        MeshPacket *packet = packetPool.allocCopy(*p);
+                        service.sendToMesh(packet, RX_SRC_LOCAL);
+                    } else {
+                        DEBUG_MSG("Received MQTT json payload too long, dropping\n");
+                    }
                } else {
-                    DEBUG_MSG("Ignoring downlink message we originally sent.\n");
+                    DEBUG_MSG("JSON Ignoring downlink message we originally sent.\n");
                }
            } else {
-                DEBUG_MSG("Received json payload on MQTT but not a valid envelope\n");
+                DEBUG_MSG("JSON Received payload on MQTT but not a valid envelope\n");
            }
        } else {
            // no json, this is an invalid payload
            DEBUG_MSG("Invalid MQTT service envelope, topic %s, len %u!\n", topic, length);
        }
    } else {
+        pb_decode_from_bytes(payload, length, ServiceEnvelope_fields, &e);
        if (strcmp(e.gateway_id, owner.id) == 0)
            DEBUG_MSG("Ignoring downlink message we originally sent.\n");
        else {
@@ -103,6 +107,11 @@ MQTT::MQTT() : concurrency::OSThread("mqtt"), pubSub(mqttClient)
    // preflightSleepObserver.observe(&preflightSleep);
 }

+bool MQTT::connected()
+{
+    return pubSub.connected();
+}
+
 void MQTT::reconnect()
 {
    if (wantsLink()) {
@@ -187,7 +196,13 @@ bool MQTT::wantsLink() const
        }
    }

+#if HAS_WIFI
    return hasChannel && WiFi.isConnected();
+#endif
+#if HAS_ETHERNET
+    return hasChannel && (Ethernet.linkStatus() == LinkON);
+#endif
+    return false;
 }

 int32_t MQTT::runOnce()
@@ -243,7 +258,7 @@ void MQTT::onSend(const MeshPacket &mp, ChannelIndex chIndex)
            auto jsonString = this->downstreamPacketToJson((MeshPacket *)&mp);
            if (jsonString.length() != 0) {
                String topicJson = jsonTopic + channelId + "/" + owner.id;
-                DEBUG_MSG("publish json message to %s, %u bytes: %s\n", topicJson.c_str(), jsonString.length(), jsonString.c_str());
+                DEBUG_MSG("JSON publish message to %s, %u bytes: %s\n", topicJson.c_str(), jsonString.length(), jsonString.c_str());
                pubSub.publish(topicJson.c_str(), jsonString.c_str(), false);
            }
        }
@@ -251,7 +266,7 @@ void MQTT::onSend(const MeshPacket &mp, ChannelIndex chIndex)
 }

 // converts a downstream packet into a json message
-String MQTT::downstreamPacketToJson(MeshPacket *mp)
+std::string MQTT::downstreamPacketToJson(MeshPacket *mp)
 {
    using namespace json11;

@@ -279,7 +294,7 @@ String MQTT::downstreamPacketToJson(MeshPacket *mp)
            // if it isn't, then we need to create a json object
            // with the string as the value
            DEBUG_MSG("text message payload is of type plaintext\n");
-            msgPayload = Json::object({{"text", payloadStr}});
+            msgPayload = Json::object{{"text", payloadStr}};
        }
        break;
    }
@@ -344,9 +359,9 @@ String MQTT::downstreamPacketToJson(MeshPacket *mp)
                msgPayload = Json::object{
                    {"time", (int)decoded->time},
                    {"pos_timestamp", (int)decoded->timestamp},
-                    {"latitude_i", decoded->latitude_i}, 
-                    {"longitude_i", decoded->longitude_i}, 
-                    {"altitude", decoded->altitude}
+                    {"latitude_i", (int)decoded->latitude_i}, 
+                    {"longitude_i", (int)decoded->longitude_i}, 
+                    {"altitude", (int)decoded->altitude}
                };
            } else {
                DEBUG_MSG("Error decoding protobuf for position message!\n");
@@ -369,8 +384,8 @@ String MQTT::downstreamPacketToJson(MeshPacket *mp)
                    {"description", decoded->description},
                    {"expire", (int)decoded->expire},
                    {"locked", decoded->locked},
-                    {"latitude_i", decoded->latitude_i}, 
-                    {"longitude_i", decoded->longitude_i}, 
+                    {"latitude_i", (int)decoded->latitude_i}, 
+                    {"longitude_i", (int)decoded->longitude_i}, 
                };
            } else {
                DEBUG_MSG("Error decoding protobuf for position message!\n");
@@ -396,8 +411,8 @@ String MQTT::downstreamPacketToJson(MeshPacket *mp)
    };

    // serialize and return it
-    static std::string jsonStr = jsonObj.dump();
+    std::string jsonStr = jsonObj.dump();
    DEBUG_MSG("serialized json message: %s\n", jsonStr.c_str());

-    return jsonStr.c_str();
+    return jsonStr;
 }
@@ -5,7 +5,12 @@
 #include "concurrency/OSThread.h"
 #include "mesh/Channels.h"
 #include <PubSubClient.h>
+#if HAS_WIFI
 #include <WiFiClient.h>
+#endif
+#if HAS_ETHERNET
+#include <EthernetClient.h>
+#endif

 /**
 * Our wrapper/singleton for sending/receiving MQTT "udp" packets.  This object isolates the MQTT protocol implementation from
@@ -16,7 +21,12 @@ class MQTT : private concurrency::OSThread
    // supposedly the current version is busted:
    // http://www.iotsharing.com/2017/08/how-to-use-esp32-mqtts-with-mqtts-mosquitto-broker-tls-ssl.html
    // WiFiClientSecure wifiClient;
+#if HAS_WIFI
    WiFiClient mqttClient;
+#endif
+#if HAS_ETHERNET
+    EthernetClient mqttClient;
+#endif
    PubSubClient pubSub;

    // instead we supress sleep from our runOnce() callback
@@ -38,6 +48,8 @@ class MQTT : private concurrency::OSThread
    /** Attempt to connect to server if necessary
     */
    void reconnect();
+
+    bool connected();
    
  protected:
    virtual int32_t runOnce() override;
@@ -58,7 +70,7 @@ class MQTT : private concurrency::OSThread
    void onPublish(char *topic, byte *payload, unsigned int length);

    /// Called when a new publish arrives from the MQTT server
-    String downstreamPacketToJson(MeshPacket *mp);
+    std::string downstreamPacketToJson(MeshPacket *mp);

    /// Return 0 if sleep is okay, veto sleep if we are connected to pubsub server
    // int preflightSleepCb(void *unused = NULL) { return pubSub.connected() ? 1 : 0; }    
@@ -0,0 +1,27 @@
+#include "configuration.h"
+
+#if (HAS_WIFI == 0)
+
+bool initWifi() {
+    return false;
+}
+
+void deinitWifi() {}
+
+bool isWifiAvailable() {
+    return false;
+}
+
+#endif
+
+#if (HAS_ETHERNET == 0)
+
+bool initEthernet() {
+    return false;
+}
+
+bool isEthernetAvailable() {
+    return false;
+}
+
+#endif
@@ -12,7 +12,6 @@ NimBLECharacteristic *fromNumCharacteristic;
 NimBLEServer *bleServer;

 static bool passkeyShowing;
-static uint32_t doublepressed;

 class BluetoothPhoneAPI : public PhoneAPI
 {
@@ -71,12 +70,8 @@ class NimbleBluetoothServerCallback : public NimBLEServerCallbacks
 {
    virtual uint32_t onPassKeyRequest() {
        uint32_t passkey = config.bluetooth.fixed_pin;
-
-        if (doublepressed > 0 && (doublepressed + (30 * 1000)) > millis()) {
-            DEBUG_MSG("User has set BLE pairing mode to fixed-pin\n");
-            config.bluetooth.mode = Config_BluetoothConfig_PairingMode_FIXED_PIN;
-            nodeDB.saveToDisk(SEGMENT_CONFIG);
-        } else if (config.bluetooth.mode == Config_BluetoothConfig_PairingMode_RANDOM_PIN) {
+        
+        if (config.bluetooth.mode == Config_BluetoothConfig_PairingMode_RANDOM_PIN) {
            DEBUG_MSG("Using random passkey\n");
            // This is the passkey to be entered on peer - we pick a number >100,000 to ensure 6 digits
            passkey = random(100000, 999999); 
@@ -202,24 +197,3 @@ void clearNVS()
    ESP.restart();
 #endif
 }
-
-void disablePin() 
-{
-    DEBUG_MSG("User Override, disabling bluetooth pin requirement\n");
-    // keep track of when it was pressed, so we know it was within X seconds
-
-    // Flash the LED
-    setLed(true);
-    delay(100);
-    setLed(false);
-    delay(100);
-    setLed(true);
-    delay(100);
-    setLed(false);
-    delay(100);
-    setLed(true);
-    delay(100);
-    setLed(false);
-
-    doublepressed = millis();
-}
@@ -15,4 +15,3 @@ class NimbleBluetooth

 void setBluetoothEnable(bool on);
 void clearNVS();
-void disablePin();
@@ -0,0 +1,43 @@
+#include "Arduino.h"
+#include "BleOta.h"
+#include <esp_ota_ops.h>
+
+static const String MESHTASTIC_OTA_APP_PROJECT_NAME("Meshtastic-OTA");
+
+const esp_partition_t* BleOta::findEspOtaAppPartition() {
+  const esp_partition_t *part = esp_partition_find_first(ESP_PARTITION_TYPE_APP, ESP_PARTITION_SUBTYPE_APP_OTA_0, nullptr);
+
+  esp_app_desc_t app_desc;
+  esp_err_t ret = ESP_ERROR_CHECK_WITHOUT_ABORT(esp_ota_get_partition_description(part, &app_desc));
+
+  if (ret != ESP_OK || MESHTASTIC_OTA_APP_PROJECT_NAME != app_desc.project_name) {
+    part = esp_partition_find_first(ESP_PARTITION_TYPE_APP, ESP_PARTITION_SUBTYPE_APP_OTA_1, nullptr);
+    ret = ESP_ERROR_CHECK_WITHOUT_ABORT(esp_ota_get_partition_description(part, &app_desc));
+  }
+
+  if (ret == ESP_OK && MESHTASTIC_OTA_APP_PROJECT_NAME == app_desc.project_name) {
+    return part;
+  } else {
+    return nullptr;
+  }
+}
+
+String BleOta::getOtaAppVersion() {
+  const esp_partition_t *part = findEspOtaAppPartition();
+  esp_app_desc_t app_desc;
+  esp_err_t ret = ESP_ERROR_CHECK_WITHOUT_ABORT(esp_ota_get_partition_description(part, &app_desc));
+  String version;
+  if (ret == ESP_OK) {
+    version = app_desc.version;
+  }
+  return version;
+}
+
+bool BleOta::switchToOtaApp() {
+  bool success = false;
+  const esp_partition_t *part = findEspOtaAppPartition();
+  if (part) {
+    success = (ESP_ERROR_CHECK_WITHOUT_ABORT(esp_ota_set_boot_partition(part)) == ESP_OK);
+  }
+  return success;
+}
@@ -0,0 +1,18 @@
+#ifndef BLEOTA_H
+#define BLEOTA_H
+
+#include <functional>
+
+class BleOta {
+  public:
+    explicit BleOta() {};
+
+    static String getOtaAppVersion();
+    static bool switchToOtaApp();
+
+  private:
+    String mUserAgent;
+    static const esp_partition_t *findEspOtaAppPartition();
+};
+
+#endif //BLEOTA_H
@@ -80,6 +80,8 @@
    #define HW_VENDOR HardwareModel_M5STACK
 #elif defined(STATION_G1)
    #define HW_VENDOR HardwareModel_STATION_G1
+#elif defined(DR_DEV)
+    #define HW_VENDOR HardwareModel_DR_DEV
 #endif

 //
@@ -4,6 +4,7 @@
 #include "main.h"

 #include "nimble/NimbleBluetooth.h"
+#include "BleOta.h"
 #include "mesh/http/WiFiAPClient.h"

 #include "sleep.h"
@@ -63,6 +64,12 @@ void esp32Setup()
    preferences.putUInt("rebootCounter", rebootCounter);
    preferences.end();
    DEBUG_MSG("Number of Device Reboots: %d\n", rebootCounter);
+    String BLEOTA=BleOta::getOtaAppVersion();
+    if (BLEOTA.isEmpty()) {
+        DEBUG_MSG("No OTA firmware available\n");
+    }else{
+        DEBUG_MSG("OTA firmware version %s\n", BLEOTA);
+    }

    // enableModemSleep();

@@ -244,6 +244,9 @@ void NRF52Bluetooth::setup()
    Bluefruit.Periph.setConnectCallback(onConnect);
    Bluefruit.Periph.setDisconnectCallback(onDisconnect);

+    bledfu.setPermission(SECMODE_ENC_WITH_MITM, SECMODE_ENC_WITH_MITM);
+    bledfu.begin(); // Install the DFU helper
+    
    // Configure and Start the Device Information Service
    DEBUG_MSG("Configuring the Device Information Service\n");
    bledis.setModel(optstr(HW_VERSION));
@@ -254,7 +257,7 @@ void NRF52Bluetooth::setup()
    DEBUG_MSG("Configuring the Battery Service\n");
    blebas.begin();
    blebas.write(0); // Unknown battery level for now
-    bledfu.begin(); // Install the DFU helper
+

    // Setup the Heart Rate Monitor service using
    // BLEService and BLECharacteristic classes
--- a/Show More
+++ b/Show More