Merge branch 'master' into timestamp-in-recv-msgs

.gitattributes

@@ -0,0 +1,4 @@
+* text=auto eol=lf
+*.{cmd,[cC][mM][dD]} text eol=crlf
+*.{bat,[bB][aA][tT]} text eol=crlf
+*.{sh,[sS][hH]} text eol=lf

.github/workflows/main_matrix.yml

@@ -41,6 +41,9 @@ jobs:
         id: base
         uses: ./.github/actions/setup-base
 
+      - name: Trunk Check
+        uses: trunk-io/trunk-action@v1
+
       - name: Check ${{ matrix.board }}
         run: bin/check-all.sh ${{ matrix.board }}
 
@@ -109,14 +112,14 @@ jobs:
         uses: ./.github/actions/setup-base
 
       # We now run integration test before other build steps (to quickly see runtime failures)
-      - name: Build for native
+      #- name: Build for native
-        run: platformio run -e native
+      #  run: platformio run -e native
-      - name: Integration test
+      #- name: Integration test
-        run: |
+      # run: |
-          .pio/build/native/program &
+      #.pio/build/native/program
-          sleep 20 # 5 seconds was not enough
+      #& sleep 20 # 5 seconds was not enough
-          echo "Simulator started, launching python test..."
+      #echo "Simulator started, launching python test..."
-          python3 -c 'from meshtastic.test import testSimulator; testSimulator()'
+      #python3 -c 'from meshtastic.test import testSimulator; testSimulator()'
 
       - name: Build Native
         run: bin/build-native.sh
@@ -134,19 +137,26 @@ jobs:
             release/device-*.bat
 
       - name: Docker login
-        if: ${{ github.event_name == 'workflow_dispatch' }}
         uses: docker/login-action@v2
         with:
           username: meshtastic
           password: ${{ secrets.DOCKER_TOKEN }}
 
       - name: Docker setup
-        if: ${{ github.event_name == 'workflow_dispatch' }}
         uses: docker/setup-buildx-action@v2
 
-      - name: Docker build and push
+      - name: Docker build and push tagged versions
         if: ${{ github.event_name == 'workflow_dispatch' }}
         uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: meshtastic/device-simulator:${{ steps.version.outputs.version }}
+
+      - name: Docker build and push
+        if: github.ref == 'refs/heads/master'
+        uses: docker/build-push-action@v3
         with:
           context: .
           file: ./Dockerfile

.github/workflows/nightly.yml

@@ -0,0 +1,19 @@
+name: Nightly
+on:
+  schedule:
+    - cron: 0 8 * * 1-5
+  workflow_dispatch: {}
+
+jobs:
+  trunk_check:
+    name: Trunk Check Upload
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Trunk Check
+        uses: trunk-io/trunk-action@v1
+        with:
+          trunk-token: ${{ secrets.TRUNK_TOKEN }}

.trunk/.gitignore

@@ -0,0 +1,7 @@
+*out
+*logs
+*actions
+*notifications
+plugins
+user_trunk.yaml
+user.yaml

.trunk/configs/.hadolint.yaml

@@ -0,0 +1,4 @@
+# Following source doesn't work in most setups
+ignored:
+  - SC1090
+  - SC1091

.trunk/configs/.markdownlint.yaml

@@ -0,0 +1,10 @@
+# Autoformatter friendly markdownlint config (all formatting rules disabled)
+default: true
+blank_lines: false
+bullet: false
+html: false
+indentation: false
+line_length: false
+spaces: false
+url: false
+whitespace: false

.trunk/configs/.shellcheckrc

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

.trunk/configs/svgo.config.js

@@ -0,0 +1,14 @@
+module.exports = {
+  plugins: [
+    {
+      name: "preset-default",
+      params: {
+        overrides: {
+          removeViewBox: false, // https://github.com/svg/svgo/issues/1128
+          sortAttrs: true,
+          removeOffCanvasPaths: true,
+        },
+      },
+    },
+  ],
+};

.trunk/trunk.yaml

@@ -0,0 +1,33 @@
+version: 0.1
+cli:
+  version: 1.3.1
+plugins:
+  sources:
+    - id: trunk
+      ref: v0.0.8
+      uri: https://github.com/trunk-io/plugins
+lint:
+  enabled:
+    - git-diff-check
+    - gitleaks@8.15.2
+    - clang-format@14.0.0
+    - prettier@2.8.3
+  disabled:
+    - shellcheck@0.9.0
+    - shfmt@3.5.0
+    - oxipng@8.0.0
+    - actionlint@1.6.22
+    - markdownlint@0.33.0
+    - hadolint@2.12.0
+    - svgo@3.0.2
+runtimes:
+  enabled:
+    - go@1.18.3
+    - node@18.12.1
+actions:
+  disabled:
+    - trunk-announce
+    - trunk-check-pre-push
+    - trunk-fmt-pre-commit
+  enabled:
+    - trunk-upgrade-available

.vscode/extensions.json

@@ -2,10 +2,8 @@
     // See http://go.microsoft.com/fwlink/?LinkId=827846
     // for the documentation about the extensions.json format
     "recommendations": [
+        "ms-vscode.cpptools",
         "platformio.platformio-ide",
-        "xaver.clang-format"
+        "trunk.io"
     ],
-    "unwantedRecommendations": [
-        "ms-vscode.cpptools-extension-pack"
-    ]
 }

.vscode/settings.json

@@ -1,80 +1,4 @@
 {
-    "files.associations": {
+  "editor.formatOnSave": true,
-        "type_traits": "cpp",
+  "editor.defaultFormatter": "trunk.io"
-        "array": "cpp",
-        "*.tcc": "cpp",
-        "cctype": "cpp",
-        "clocale": "cpp",
-        "cmath": "cpp",
-        "cstdarg": "cpp",
-        "cstddef": "cpp",
-        "cstdint": "cpp",
-        "cstdio": "cpp",
-        "cstdlib": "cpp",
-        "cstring": "cpp",
-        "ctime": "cpp",
-        "cwchar": "cpp",
-        "cwctype": "cpp",
-        "deque": "cpp",
-        "unordered_map": "cpp",
-        "unordered_set": "cpp",
-        "vector": "cpp",
-        "exception": "cpp",
-        "algorithm": "cpp",
-        "functional": "cpp",
-        "system_error": "cpp",
-        "tuple": "cpp",
-        "fstream": "cpp",
-        "initializer_list": "cpp",
-        "iomanip": "cpp",
-        "iosfwd": "cpp",
-        "istream": "cpp",
-        "limits": "cpp",
-        "memory": "cpp",
-        "new": "cpp",
-        "ostream": "cpp",
-        "numeric": "cpp",
-        "sstream": "cpp",
-        "stdexcept": "cpp",
-        "streambuf": "cpp",
-        "cinttypes": "cpp",
-        "utility": "cpp",
-        "typeinfo": "cpp",
-        "string": "cpp",
-        "*.xbm": "cpp",
-        "list": "cpp",
-        "atomic": "cpp",
-        "memory_resource": "cpp",
-        "optional": "cpp",
-        "string_view": "cpp",
-        "cassert": "cpp",
-        "iterator": "cpp",
-        "shared_mutex": "cpp",
-        "iostream": "cpp",
-        "esp_nimble_hci.h": "c",
-        "map": "cpp",
-        "random": "cpp",
-        "*.tpp": "cpp"
-    },
-    "cSpell.words": [
-        "Blox",
-        "EINK",
-        "HFSR",
-        "Meshtastic",
-        "NEMAGPS",
-        "NMEAGPS",
-        "RDEF",
-        "Ublox",
-        "bkpt",
-        "cfsr",
-        "descs",
-        "ocrypto",
-        "protobufs",
-        "wifi"
-    ],
-    "C_Cpp.dimInactiveRegions": true,
-    "cmake.configureOnOpen": true,
-    "protoc": {
-        "compile_on_save": false,
-    }
 }

bin/regen-protos.bat

@@ -1 +1,5 @@
-cd protobufs && ..\nanopb-0.4.7\generator-bin\protoc.exe --nanopb_out=-v:..\src\mesh\generated -I=..\protobufs *.proto
+cd protobufs && ..\nanopb-0.4.7\generator-bin\protoc.exe --nanopb_out=-v:..\src\mesh\generated -I=..\protobufs ..\protobufs\meshtastic\*.proto
+
+@REM cd ../src/mesh/generated/meshtastic
+@REM sed -i 's/#include "meshtastic/#include "./g' *
+@REM sed -i 's/meshtastic_//g' *

bin/regen-protos.sh

@@ -8,7 +8,12 @@ echo "prebuilt binaries for your computer into nanopb-0.4.7"
 
 # the nanopb tool seems to require that the .options file be in the current directory!
 cd protobufs
-../nanopb-0.4.7/generator-bin/protoc --nanopb_out=-v:../src/mesh/generated -I=../protobufs *.proto
+../nanopb-0.4.7/generator-bin/protoc --nanopb_out=-v:../src/mesh/generated/ -I=../protobufs meshtastic/*.proto
+
+# cd ../src/mesh/generated/meshtastic
+# sed -i 's/#include "meshtastic/#include "./g' -- *
+
+# sed -i 's/meshtastic_//g' -- *
 
 #echo "Regenerating protobuf documentation - if you see an error message"
 #echo "you can ignore it unless doing a new protobuf release to github."

boards/eink0.1.json

@@ -7,12 +7,7 @@
     "cpu": "cortex-m4",
     "extra_flags": "-DARDUINO_NRF52840_TTGO_EINK -DNRF52840_XXAA",
     "f_cpu": "64000000L",
-    "hwids": [
+    "hwids": [["0x239A", "0x4405"]],
-      [
-        "0x239A",
-        "0x4405"
-      ]
-    ],
     "usb_product": "TTGO_eink",
     "mcu": "nrf52840",
     "variant": "eink0.1",
@@ -30,19 +25,13 @@
       "settings_addr": "0xFF000"
     }
   },
-  "connectivity": [
+  "connectivity": ["bluetooth"],
-    "bluetooth"
-  ],
   "debug": {
     "jlink_device": "nRF52840_xxAA",
-    "onboard_tools": [
+    "onboard_tools": ["jlink"],
-      "jlink"
-    ],
     "svd_path": "nrf52840.svd"
   },
-  "frameworks": [
+  "frameworks": ["arduino"],
-    "arduino"
-  ],
   "name": "TTGO eink (Adafruit BSP)",
   "upload": {
     "maximum_ram_size": 248832,
@@ -50,11 +39,7 @@
     "require_upload_port": true,
     "speed": 115200,
     "protocol": "jlink",
-    "protocols": [
+    "protocols": ["jlink", "nrfjprog", "stlink"]
-      "jlink",
-      "nrfjprog",
-      "stlink"
-    ]
   },
   "url": "FIXME",
   "vendor": "TTGO"

boards/generic_wl5e.json

@@ -9,9 +9,7 @@
     "product_line": "STM32WLE5xx"
   },
   "debug": {
-    "default_tools": [
+    "default_tools": ["stlink"],
-      "stlink"
-    ],
     "jlink_device": "STM32WLE5CC",
     "openocd_target": "stm32wlx",
     "svd_path": "STM32WLE5_CM4.svd"
@@ -22,9 +20,7 @@
     "maximum_ram_size": 65536,
     "maximum_size": 262144,
     "protocol": "cmsis-dap",
-    "protocols": [
+    "protocols": ["cmsis-dap"]
-      "cmsis-dap"
-    ]
   },
   "url": "https://www.st.com/en/microcontrollers-microprocessors/stm32wl-series.html",
   "vendor": "ST"

boards/lora_isp4520.json

@@ -19,16 +19,12 @@
       "sd_fwid": "0x00B7"
     }
   },
-  "connectivity": [
+  "connectivity": ["bluetooth"],
-    "bluetooth"
-  ],
   "debug": {
     "jlink_device": "nRF52832_xxAA",
     "svd_path": "nrf52.svd"
   },
-  "frameworks": [
+  "frameworks": ["arduino"],
-    "arduino"
-  ],
   "name": "lora ISP4520",
   "upload": {
     "maximum_ram_size": 65536,
@@ -36,12 +32,7 @@
     "require_upload_port": true,
     "speed": 115200,
     "protocol": "nrfutil",
-    "protocols": [
+    "protocols": ["jlink", "nrfjprog", "nrfutil", "stlink"]
-      "jlink",
-      "nrfjprog",
-      "nrfutil",
-      "stlink"
-    ]
   },
   "url": "",
   "vendor": "PsiSoft"

boards/nordic_pca10059.json

@@ -8,22 +8,10 @@
     "extra_flags": "-DARDUINO_NRF52840_FEATHER -DNRF52840_XXAA",
     "f_cpu": "64000000L",
     "hwids": [
-            [
+      ["0x239A", "0x8029"],
-                "0x239A",
+      ["0x239A", "0x0029"],
-                "0x8029"
+      ["0x239A", "0x002A"],
-            ],
+      ["0x239A", "0x802A"]
-            [
-                "0x239A",
-                "0x0029"
-            ],
-            [
-                "0x239A",
-                "0x002A"
-            ],
-            [
-                "0x239A",
-                "0x802A"
-            ]
     ],
     "usb_product": "PCA10059",
     "mcu": "nrf52840",
@@ -41,28 +29,19 @@
       "settings_addr": "0xFF000"
     }
   },
-    "connectivity": [
+  "connectivity": ["bluetooth"],
-        "bluetooth"
-    ],
   "debug": {
     "jlink_device": "nRF52840_xxAA",
     "svd_path": "nrf52840.svd"
   },
-    "frameworks": [
+  "frameworks": ["arduino"],
-        "arduino"
-    ],
   "name": "nRF52840 Dongle",
   "upload": {
     "maximum_ram_size": 248832,
     "maximum_size": 815104,
     "speed": 115200,
     "protocol": "nrfutil",
-        "protocols": [
+    "protocols": ["jlink", "nrfjprog", "nrfutil", "stlink"],
-            "jlink",
-            "nrfjprog",
-            "nrfutil",
-            "stlink"
-        ],
     "use_1200bps_touch": true,
     "require_upload_port": true,
     "wait_for_upload_port": true

boards/nrf52840_dk.json

@@ -44,4 +44,3 @@
   "url": "https://meshtastic.org/",
   "vendor": "Nordic Semi"
 }
-  

boards/t-echo.json

@@ -7,12 +7,7 @@
     "cpu": "cortex-m4",
     "extra_flags": "-DARDUINO_NRF52840_TTGO_EINK -DNRF52840_XXAA",
     "f_cpu": "64000000L",
-    "hwids": [
+    "hwids": [["0x239A", "0x4405"]],
-      [
-        "0x239A",
-        "0x4405"
-      ]
-    ],
     "usb_product": "TTGO_eink",
     "mcu": "nrf52840",
     "variant": "t-echo",
@@ -30,31 +25,20 @@
       "settings_addr": "0xFF000"
     }
   },
-  "connectivity": [
+  "connectivity": ["bluetooth"],
-    "bluetooth"
-  ],
   "debug": {
     "jlink_device": "nRF52840_xxAA",
-    "onboard_tools": [
+    "onboard_tools": ["jlink"],
-      "jlink"
-    ],
     "svd_path": "nrf52840.svd"
   },
-  "frameworks": [
+  "frameworks": ["arduino"],
-    "arduino"
-  ],
   "name": "TTGO eink (Adafruit BSP)",
   "upload": {
     "maximum_ram_size": 248832,
     "maximum_size": 815104,
     "speed": 115200,
     "protocol": "nrfutil",
-      "protocols": [
+    "protocols": ["jlink", "nrfjprog", "nrfutil", "stlink"],
-          "jlink",
-          "nrfjprog",
-          "nrfutil",
-          "stlink"
-      ],
     "use_1200bps_touch": true,
     "require_upload_port": true,
     "wait_for_upload_port": true

boards/tbeam-s3-core.json

@@ -15,24 +15,15 @@
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "flash_mode": "dio",
-    "hwids": [
+    "hwids": [["0X303A", "0x1001"]],
-      [
-        "0X303A",
-        "0x1001"
-      ]
-    ],
     "mcu": "esp32s3",
     "variant": "tbeam-s3-core"
   },
-  "connectivity": [
+  "connectivity": ["wifi"],
-    "wifi"
-  ],
   "debug": {
     "openocd_target": "esp32s3.cfg"
   },
-  "frameworks": [
+  "frameworks": ["arduino"],
-    "arduino"
-  ],
   "name": "LilyGo TBeam-S3-Core",
   "upload": {
     "flash_size": "8MB",

boards/tlora-t3s3-v1.json

@@ -14,25 +14,15 @@
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "flash_mode": "dio",
-    "hwids": [
+    "hwids": [["0X303A", "0x1001"]],
-      [
-        "0X303A",
-        "0x1001"
-      ]
-    ],
     "mcu": "esp32s3",
     "variant": "tlora-t3s3-v1"
   },
-  "connectivity": [
+  "connectivity": ["wifi"],
-    "wifi"
-  ],
   "debug": {
     "openocd_target": "esp32s3.cfg"
   },
-  "frameworks": [
+  "frameworks": ["arduino", "espidf"],
-    "arduino",
-    "espidf"
-  ],
   "name": "LilyGo TLora-T3S3-V1",
   "upload": {
     "flash_size": "4MB",

boards/wiscore_rak11200.json

@@ -11,26 +11,14 @@
     "mcu": "esp32",
     "variant": "WisCore_RAK11200_Board"
   },
-  "connectivity": [
+  "connectivity": ["wifi", "bluetooth", "ethernet", "can"],
-    "wifi",
+  "frameworks": ["arduino", "espidf"],
-    "bluetooth",
-    "ethernet",
-    "can"
-  ],
-  "frameworks": [
-    "arduino",
-    "espidf"
-  ],
   "name": "WisCore RAK11200 Board",
   "upload": {
     "flash_size": "4MB",
     "maximum_ram_size": 327680,
     "maximum_size": 4194304,
-    "protocols": [
+    "protocols": ["esptool", "espota", "ftdi"],
-      "esptool",
-      "espota",
-      "ftdi"
-    ],
     "require_upload_port": true,
     "speed": 460800
   },

boards/wiscore_rak4600.json

@@ -8,22 +8,10 @@
     "extra_flags": "-DNRF52832_XXAA -DNRF52",
     "f_cpu": "64000000L",
     "hwids": [
-      [
+      ["0x239A", "0x8029"],
-        "0x239A",
+      ["0x239A", "0x0029"],
-        "0x8029"
+      ["0x239A", "0x002A"],
-      ],
+      ["0x239A", "0x802A"]
-      [
-        "0x239A",
-        "0x0029"
-      ],
-      [
-        "0x239A",
-        "0x002A"
-      ],
-      [
-        "0x239A",
-        "0x802A"
-      ]
     ],
     "usb_product": "Feather nRF52832 Express",
     "mcu": "nrf52832",
@@ -41,17 +29,12 @@
       "variant": "nrf52_adafruit_feather"
     }
   },
-  "connectivity": [
+  "connectivity": ["bluetooth"],
-    "bluetooth"
-  ],
   "debug": {
     "jlink_device": "nRF52832_xxAA",
     "svd_path": "nrf52.svd"
   },
-  "frameworks": [
+  "frameworks": ["arduino", "zephyr"],
-    "arduino",
-    "zephyr"
-  ],
   "name": "Adafruit Bluefruit nRF52832 Feather",
   "upload": {
     "maximum_ram_size": 65536,
@@ -59,12 +42,7 @@
     "require_upload_port": true,
     "speed": 115200,
     "protocol": "nrfutil",
-    "protocols": [
+    "protocols": ["jlink", "nrfjprog", "nrfutil", "stlink"]
-      "jlink",
-      "nrfjprog",
-      "nrfutil",
-      "stlink"
-    ]
   },
   "url": "https://www.adafruit.com/product/3406",
   "vendor": "Adafruit"

boards/wiscore_rak4631.json

@@ -8,22 +8,10 @@
     "extra_flags": "-DARDUINO_NRF52840_FEATHER -DNRF52840_XXAA",
     "f_cpu": "64000000L",
     "hwids": [
-            [
+      ["0x239A", "0x8029"],
-                "0x239A",
+      ["0x239A", "0x0029"],
-                "0x8029"
+      ["0x239A", "0x002A"],
-            ],
+      ["0x239A", "0x802A"]
-            [
-                "0x239A",
-                "0x0029"
-            ],
-            [
-                "0x239A",
-                "0x002A"
-            ],
-            [
-                "0x239A",
-                "0x802A"
-            ]
     ],
     "usb_product": "WisCore RAK4631 Board",
     "mcu": "nrf52840",
@@ -41,28 +29,19 @@
       "settings_addr": "0xFF000"
     }
   },
-    "connectivity": [
+  "connectivity": ["bluetooth"],
-        "bluetooth"
-    ],
   "debug": {
     "jlink_device": "nRF52840_xxAA",
     "svd_path": "nrf52840.svd"
   },
-    "frameworks": [
+  "frameworks": ["arduino"],
-        "arduino"
-    ],
   "name": "WisCore RAK4631 Board",
   "upload": {
     "maximum_ram_size": 248832,
     "maximum_size": 815104,
     "speed": 115200,
     "protocol": "nrfutil",
-        "protocols": [
+    "protocols": ["jlink", "nrfjprog", "nrfutil", "stlink"],
-            "jlink",
-            "nrfjprog",
-            "nrfutil",
-            "stlink"
-        ],
     "use_1200bps_touch": true,
     "require_upload_port": true,
     "wait_for_upload_port": true

platformio.ini

@@ -39,7 +39,7 @@ extra_scripts = bin/platformio-custom.py
 ; The Radiolib stuff will speed up building considerably. Exclud all the stuff we dont need.
 build_flags = -Wno-missing-field-initializers
   -Wno-format 
-  -Isrc -Isrc/mesh -Isrc/gps -Isrc/buzz -Wl,-Map,.pio/build/output.map 
+  -Isrc -Isrc/mesh -Isrc/mesh/generated -Isrc/gps -Isrc/buzz -Wl,-Map,.pio/build/output.map 
   -DUSE_THREAD_NAMES
   -DTINYGPS_OPTION_NO_CUSTOM_FIELDS
   -DPB_ENABLE_MALLOC=1
@@ -58,7 +58,7 @@ build_flags = -Wno-missing-field-initializers
 monitor_speed = 115200
 
 lib_deps =
-  https://github.com/meshtastic/esp8266-oled-ssd1306.git#53580644255b48ebb7a737343c6b4e71c7e11cf2 ; ESP8266_SSD1306 
+  https://github.com/meshtastic/esp8266-oled-ssd1306.git#da1ede4dfcd91074283b029080759fd744120909 ; ESP8266_SSD1306 
   mathertel/OneButton@^2.0.3 ; OneButton library for non-blocking button debounce
   https://github.com/meshtastic/arduino-fsm.git#7db3702bf0cfe97b783d6c72595e3f38e0b19159
   https://github.com/meshtastic/TinyGPSPlus.git#127ad674ef85f0201cb68a065879653ed94792c4
@@ -66,7 +66,7 @@ lib_deps =
   nanopb/Nanopb@^0.4.6
   erriez/ErriezCRC32@^1.0.1
 ;  jgromes/RadioLib@^5.5.1
-  https://github.com/jgromes/RadioLib.git#395844922c5d88d5db0481a9c91479931172428d
+  https://github.com/jgromes/RadioLib.git#7a25b27c3183ffe3627c5c221243c378d8951da7
 
 ; Used for the code analysis in PIO Home / Inspect
 check_tool = cppcheck

src/BluetoothCommon.cpp

@@ -1,5 +1,5 @@
-#include "configuration.h"
 #include "BluetoothCommon.h"
+#include "configuration.h"
 
 // NRF52 wants these constants as byte arrays
 // Generated here https://yupana-engineering.com/online-uuid-to-c-array-converter - but in REVERSE BYTE ORDER

src/ButtonThread.h

@@ -115,8 +115,7 @@ class ButtonThread : public concurrency::OSThread
     {
         // LOG_DEBUG("press!\n");
 #ifdef BUTTON_PIN
-        if ((BUTTON_PIN != moduleConfig.canned_message.inputbroker_pin_press) ||
+        if ((BUTTON_PIN != moduleConfig.canned_message.inputbroker_pin_press) || !moduleConfig.canned_message.enabled) {
-            !moduleConfig.canned_message.enabled) {
             powerFSM.trigger(EVENT_PRESS);
         }
 #endif
@@ -163,13 +162,17 @@ class ButtonThread : public concurrency::OSThread
 #if defined(USE_EINK) && defined(PIN_EINK_EN)
         digitalWrite(PIN_EINK_EN, digitalRead(PIN_EINK_EN) == LOW);
 #endif
-    #if defined(GPS_POWER_TOGGLE)
+        screen->print("Sent ad-hoc ping\n");
-        if(config.position.gps_enabled)
+        service.refreshMyNodeInfo();
-        {
+        service.sendNetworkPing(NODENUM_BROADCAST, true);
-        LOG_DEBUG("Flag set to false for gps power\n");
     }
-        else 
+
+    static void userButtonMultiPressed()
     {
+#if defined(GPS_POWER_TOGGLE)
+        if (config.position.gps_enabled) {
+            LOG_DEBUG("Flag set to false for gps power\n");
+        } else {
             LOG_DEBUG("Flag set to true to restore power\n");
         }
         config.position.gps_enabled = !(config.position.gps_enabled);
@@ -177,13 +180,6 @@ class ButtonThread : public concurrency::OSThread
 #endif
     }
 
-    static void userButtonMultiPressed()
-    {
-        screen->print("Sent ad-hoc ping\n");
-        service.refreshMyNodeInfo();
-        service.sendNetworkPing(NODENUM_BROADCAST, true);
-    }
-
     static void userButtonPressedLongStart()
     {
         if (millis() > 30 * 1000) {

src/FSCommon.cpp

@@ -1,17 +1,15 @@
-#include "configuration.h"
 #include "FSCommon.h"
+#include "configuration.h"
 
 #ifdef HAS_SDCARD
-#include <SPI.h>
 #include <SD.h>
-
+#include <SPI.h>
 
 #ifdef SDCARD_USE_SPI1
 SPIClass SPI1(HSPI);
 #define SDHandler SPI1
 #endif
 
-
 #endif // HAS_SDCARD
 
 bool copyFile(const char *from, const char *to)
@@ -168,8 +166,7 @@ void rmDir(const char * dirname)
 void fsInit()
 {
 #ifdef FSCom
-    if (!FSBegin())
+    if (!FSBegin()) {
-    {
         LOG_ERROR("Filesystem mount Failed.\n");
         // assert(0); This auto-formats the partition, so no need to fail here.
     }
@@ -182,7 +179,6 @@ void fsInit()
 #endif
 }
 
-
 void setupSDCard()
 {
 #ifdef HAS_SDCARD
@@ -214,6 +210,3 @@ void setupSDCard()
     LOG_DEBUG("Used space: %llu MB\n", SD.usedBytes() / (1024 * 1024));
 #endif
 }
-
-
-

src/GPSStatus.h

@@ -22,13 +22,13 @@ class GPSStatus : public Status
 
     bool isPowerSaving = false; // Are we in power saving state
 
-    Position p = Position_init_default;
+    meshtastic_Position p = meshtastic_Position_init_default;
 
   public:
     GPSStatus() { statusType = STATUS_TYPE_GPS; }
 
     // preferred method
-    GPSStatus(bool hasLock, bool isConnected, bool isPowerSaving, const Position &pos) : Status()
+    GPSStatus(bool hasLock, bool isConnected, bool isPowerSaving, const meshtastic_Position &pos) : Status()
     {
         this->hasLock = hasLock;
         this->isConnected = isConnected;
@@ -55,7 +55,7 @@ class GPSStatus : public Status
 #ifdef GPS_EXTRAVERBOSE
             LOG_WARN("Using fixed latitude\n");
 #endif
-            NodeInfo *node = nodeDB.getNode(nodeDB.getNodeNum());
+            meshtastic_NodeInfo *node = nodeDB.getNode(nodeDB.getNodeNum());
             return node->position.latitude_i;
         } else {
             return p.latitude_i;
@@ -68,7 +68,7 @@ class GPSStatus : public Status
 #ifdef GPS_EXTRAVERBOSE
             LOG_WARN("Using fixed longitude\n");
 #endif
-            NodeInfo *node = nodeDB.getNode(nodeDB.getNodeNum());
+            meshtastic_NodeInfo *node = nodeDB.getNode(nodeDB.getNodeNum());
             return node->position.longitude_i;
         } else {
             return p.longitude_i;
@@ -81,29 +81,38 @@ class GPSStatus : public Status
 #ifdef GPS_EXTRAVERBOSE
             LOG_WARN("Using fixed altitude\n");
 #endif
-            NodeInfo *node = nodeDB.getNode(nodeDB.getNodeNum());
+            meshtastic_NodeInfo *node = nodeDB.getNode(nodeDB.getNodeNum());
             return node->position.altitude;
         } else {
             return p.altitude;
         }
     }
 
-    uint32_t getDOP() const { return p.PDOP; }
+    uint32_t getDOP() const
+    {
+        return p.PDOP;
+    }
 
-    uint32_t getHeading() const { return p.ground_track; }
+    uint32_t getHeading() const
+    {
+        return p.ground_track;
+    }
 
-    uint32_t getNumSatellites() const { return p.sats_in_view; }
+    uint32_t getNumSatellites() const
+    {
+        return p.sats_in_view;
+    }
 
     bool matches(const GPSStatus *newStatus) const
     {
 #ifdef GPS_EXTRAVERBOSE
         LOG_DEBUG("GPSStatus.match() new pos@%x to old pos@%x\n", newStatus->p.pos_timestamp, p.pos_timestamp);
 #endif
-        return (newStatus->hasLock != hasLock || newStatus->isConnected != isConnected || newStatus->isPowerSaving !=isPowerSaving ||
+        return (newStatus->hasLock != hasLock || newStatus->isConnected != isConnected ||
-                newStatus->p.latitude_i != p.latitude_i || newStatus->p.longitude_i != p.longitude_i ||
+                newStatus->isPowerSaving != isPowerSaving || newStatus->p.latitude_i != p.latitude_i ||
-                newStatus->p.altitude != p.altitude || newStatus->p.altitude_hae != p.altitude_hae ||
+                newStatus->p.longitude_i != p.longitude_i || newStatus->p.altitude != p.altitude ||
-                newStatus->p.PDOP != p.PDOP || newStatus->p.ground_track != p.ground_track ||
+                newStatus->p.altitude_hae != p.altitude_hae || newStatus->p.PDOP != p.PDOP ||
-                newStatus->p.ground_speed != p.ground_speed ||
+                newStatus->p.ground_track != p.ground_track || newStatus->p.ground_speed != p.ground_speed ||
                 newStatus->p.sats_in_view != p.sats_in_view);
     }
 

src/NodeStatus.h

@@ -1,16 +1,18 @@
 #pragma once
-#include <Arduino.h>
 #include "Status.h"
 #include "configuration.h"
+#include <Arduino.h>
 
-namespace meshtastic {
+namespace meshtastic
+{
 
 /// Describes the state of the NodeDB system.
 class NodeStatus : public Status
 {
 
   private:
-        CallbackObserver<NodeStatus, const NodeStatus *> statusObserver = CallbackObserver<NodeStatus, const NodeStatus *>(this, &NodeStatus::updateStatus);
+    CallbackObserver<NodeStatus, const NodeStatus *> statusObserver =
+        CallbackObserver<NodeStatus, const NodeStatus *>(this, &NodeStatus::updateStatus);
 
     uint8_t numOnline = 0;
     uint8_t numTotal = 0;
@@ -20,9 +22,7 @@ namespace meshtastic {
   public:
     bool forceUpdate = false;
 
-        NodeStatus() {
+    NodeStatus() { statusType = STATUS_TYPE_NODE; }
-            statusType = STATUS_TYPE_NODE;
-        }
     NodeStatus(uint8_t numOnline, uint8_t numTotal, bool forceUpdate = false) : Status()
     {
         this->forceUpdate = forceUpdate;
@@ -32,34 +32,20 @@ namespace meshtastic {
     NodeStatus(const NodeStatus &);
     NodeStatus &operator=(const NodeStatus &);
 
-        void observe(Observable<const NodeStatus *> *source)
+    void observe(Observable<const NodeStatus *> *source) { statusObserver.observe(source); }
-        {
-            statusObserver.observe(source);
-        }
 
-        uint8_t getNumOnline() const
+    uint8_t getNumOnline() const { return numOnline; }
-        { 
-            return numOnline; 
-        }
 
-        uint8_t getNumTotal() const
+    uint8_t getNumTotal() const { return numTotal; }
-        { 
-            return numTotal; 
-        }
 
-        uint8_t getLastNumTotal() const
+    uint8_t getLastNumTotal() const { return lastNumTotal; }
-        {
-            return lastNumTotal;
-        }
 
     bool matches(const NodeStatus *newStatus) const
     {
-            return (
+        return (newStatus->getNumOnline() != numOnline || newStatus->getNumTotal() != numTotal);
-                newStatus->getNumOnline() != numOnline ||
-                newStatus->getNumTotal() != numTotal
-            );
     }
-        int updateStatus(const NodeStatus *newStatus) {
+    int updateStatus(const NodeStatus *newStatus)
+    {
         // Only update the status if values have actually changed
         lastNumTotal = numTotal;
         bool isDirty;
@@ -75,9 +61,8 @@ namespace meshtastic {
         }
         return 0;
     }
-
 };
 
-}
+} // namespace meshtastic
 
 extern meshtastic::NodeStatus *nodeStatus;

src/OSTimer.cpp

@@ -1,5 +1,5 @@
-#include "configuration.h"
 #include "OSTimer.h"
+#include "configuration.h"
 
 /**
  * Schedule a callback to run.  The callback must _not_ block, though it is called from regular thread level (not ISR)

src/Observer.cpp

@@ -1,3 +1,2 @@
-#include "configuration.h"
 #include "Observer.h"
-
+#include "configuration.h"

src/Power.cpp

@@ -1,16 +1,16 @@
 #include "power.h"
 #include "NodeDB.h"
 #include "PowerFSM.h"
+#include "buzz/buzz.h"
 #include "configuration.h"
 #include "main.h"
 #include "sleep.h"
 #include "utils.h"
-#include "buzz/buzz.h"
 
 #ifdef HAS_PMU
-#include "XPowersLibInterface.hpp"
-#include "XPowersAXP2101.tpp"
 #include "XPowersAXP192.tpp"
+#include "XPowersAXP2101.tpp"
+#include "XPowersLibInterface.hpp"
 XPowersLibInterface *PMU = NULL;
 #else
 // Copy of the base class defined in axp20x.h.
@@ -108,15 +108,15 @@ class AnalogBatteryLevel : public HasBatteryLevel
 
 #ifdef BATTERY_PIN
         // Override variant or default ADC_MULTIPLIER if we have the override pref
-        float operativeAdcMultiplier = config.power.adc_multiplier_override > 0
+        float operativeAdcMultiplier =
-                                           ? config.power.adc_multiplier_override
+            config.power.adc_multiplier_override > 0 ? config.power.adc_multiplier_override : ADC_MULTIPLIER;
-                                           : ADC_MULTIPLIER;
         // Do not call analogRead() often.
         const uint32_t min_read_interval = 5000;
         if (millis() - last_read_time_ms > min_read_interval) {
             last_read_time_ms = millis();
 
-//Set the number of samples, it has an effect of increasing sensitivity, especially in complex electromagnetic environment.
+            // Set the number of samples, it has an effect of increasing sensitivity, especially in complex electromagnetic
+            // environment.
             uint32_t raw = 0;
             for (uint32_t i = 0; i < BATTERY_SENSE_SAMPLES; i++) {
                 raw += analogRead(BATTERY_PIN);
@@ -143,15 +143,24 @@ class AnalogBatteryLevel : public HasBatteryLevel
     /**
      * return true if there is a battery installed in this unit
      */
-    virtual bool isBatteryConnect() override { return getBatteryPercent() != -1; }
+    virtual bool isBatteryConnect() override
+    {
+        return getBatteryPercent() != -1;
+    }
 
     /// If we see a battery voltage higher than physics allows - assume charger is pumping
     /// in power
-    virtual bool isVbusIn() override { return getBattVoltage() > chargingVolt; }
+    virtual bool isVbusIn() override
+    {
+        return getBattVoltage() > chargingVolt;
+    }
 
     /// Assume charging if we have a battery and external power is connected.
     /// we can't be smart enough to say 'full'?
-    virtual bool isCharging() override { return isBatteryConnect() && isVbusIn(); }
+    virtual bool isCharging() override
+    {
+        return isBatteryConnect() && isVbusIn();
+    }
 
   private:
     /// If we see a battery voltage higher than physics allows - assume charger is pumping
@@ -298,7 +307,8 @@ void Power::readPowerStatus()
                 }
             }
             LOG_DEBUG("\n");
-            LOG_DEBUG("Heap status: %d/%d bytes free (%d), running %d/%d threads\n", ESP.getFreeHeap(), ESP.getHeapSize(), ESP.getFreeHeap() - lastheap, running, concurrency::mainController.size(false));
+            LOG_DEBUG("Heap status: %d/%d bytes free (%d), running %d/%d threads\n", ESP.getFreeHeap(), ESP.getHeapSize(),
+                      ESP.getFreeHeap() - lastheap, running, concurrency::mainController.size(false));
             lastheap = ESP.getFreeHeap();
         }
 #endif
@@ -450,7 +460,6 @@ bool Power::axpChipInit()
         PMU->setPowerChannelVoltage(XPOWERS_LDO2, 3300);
         PMU->enablePowerOutput(XPOWERS_LDO2);
 
-
         // oled module power channel,
         // disable it will cause abnormal communication between boot and AXP power supply,
         // do not turn it off
@@ -458,12 +467,10 @@ bool Power::axpChipInit()
         // enable oled power
         PMU->enablePowerOutput(XPOWERS_DCDC1);
 
-
         // gnss module power channel -  now turned on in setGpsPower
         PMU->setPowerChannelVoltage(XPOWERS_LDO3, 3300);
         // PMU->enablePowerOutput(XPOWERS_LDO3);
 
-
         // protected oled power source
         PMU->setProtectedChannel(XPOWERS_DCDC1);
         // protected esp32 power source
@@ -537,7 +544,6 @@ bool Power::axpChipInit()
         PMU->setChargeTargetVoltage(XPOWERS_AXP2101_CHG_VOL_4V2);
     }
 
-
     PMU->clearIrqStatus();
 
     // TBeam1.1 /T-Beam S3-Core has no external TS detection,
@@ -550,40 +556,52 @@ bool Power::axpChipInit()
 
     LOG_DEBUG("=======================================================================\n");
     if (PMU->isChannelAvailable(XPOWERS_DCDC1)) {
-        LOG_DEBUG("DC1  : %s   Voltage:%u mV \n",  PMU->isPowerChannelEnable(XPOWERS_DCDC1)  ? "+" : "-",  PMU->getPowerChannelVoltage(XPOWERS_DCDC1));
+        LOG_DEBUG("DC1  : %s   Voltage:%u mV \n", PMU->isPowerChannelEnable(XPOWERS_DCDC1) ? "+" : "-",
+                  PMU->getPowerChannelVoltage(XPOWERS_DCDC1));
     }
     if (PMU->isChannelAvailable(XPOWERS_DCDC2)) {
-        LOG_DEBUG("DC2  : %s   Voltage:%u mV \n",  PMU->isPowerChannelEnable(XPOWERS_DCDC2)  ? "+" : "-",  PMU->getPowerChannelVoltage(XPOWERS_DCDC2));
+        LOG_DEBUG("DC2  : %s   Voltage:%u mV \n", PMU->isPowerChannelEnable(XPOWERS_DCDC2) ? "+" : "-",
+                  PMU->getPowerChannelVoltage(XPOWERS_DCDC2));
     }
     if (PMU->isChannelAvailable(XPOWERS_DCDC3)) {
-        LOG_DEBUG("DC3  : %s   Voltage:%u mV \n",  PMU->isPowerChannelEnable(XPOWERS_DCDC3)  ? "+" : "-",  PMU->getPowerChannelVoltage(XPOWERS_DCDC3));
+        LOG_DEBUG("DC3  : %s   Voltage:%u mV \n", PMU->isPowerChannelEnable(XPOWERS_DCDC3) ? "+" : "-",
+                  PMU->getPowerChannelVoltage(XPOWERS_DCDC3));
     }
     if (PMU->isChannelAvailable(XPOWERS_DCDC4)) {
-        LOG_DEBUG("DC4  : %s   Voltage:%u mV \n",  PMU->isPowerChannelEnable(XPOWERS_DCDC4)  ? "+" : "-",  PMU->getPowerChannelVoltage(XPOWERS_DCDC4));
+        LOG_DEBUG("DC4  : %s   Voltage:%u mV \n", PMU->isPowerChannelEnable(XPOWERS_DCDC4) ? "+" : "-",
+                  PMU->getPowerChannelVoltage(XPOWERS_DCDC4));
     }
     if (PMU->isChannelAvailable(XPOWERS_LDO2)) {
-        LOG_DEBUG("LDO2 : %s   Voltage:%u mV \n",  PMU->isPowerChannelEnable(XPOWERS_LDO2)   ? "+" : "-",  PMU->getPowerChannelVoltage(XPOWERS_LDO2));
+        LOG_DEBUG("LDO2 : %s   Voltage:%u mV \n", PMU->isPowerChannelEnable(XPOWERS_LDO2) ? "+" : "-",
+                  PMU->getPowerChannelVoltage(XPOWERS_LDO2));
     }
     if (PMU->isChannelAvailable(XPOWERS_LDO3)) {
-        LOG_DEBUG("LDO3 : %s   Voltage:%u mV \n",  PMU->isPowerChannelEnable(XPOWERS_LDO3)   ? "+" : "-",  PMU->getPowerChannelVoltage(XPOWERS_LDO3));
+        LOG_DEBUG("LDO3 : %s   Voltage:%u mV \n", PMU->isPowerChannelEnable(XPOWERS_LDO3) ? "+" : "-",
+                  PMU->getPowerChannelVoltage(XPOWERS_LDO3));
     }
     if (PMU->isChannelAvailable(XPOWERS_ALDO1)) {
-        LOG_DEBUG("ALDO1: %s   Voltage:%u mV \n",  PMU->isPowerChannelEnable(XPOWERS_ALDO1)  ? "+" : "-",  PMU->getPowerChannelVoltage(XPOWERS_ALDO1));
+        LOG_DEBUG("ALDO1: %s   Voltage:%u mV \n", PMU->isPowerChannelEnable(XPOWERS_ALDO1) ? "+" : "-",
+                  PMU->getPowerChannelVoltage(XPOWERS_ALDO1));
     }
     if (PMU->isChannelAvailable(XPOWERS_ALDO2)) {
-        LOG_DEBUG("ALDO2: %s   Voltage:%u mV \n",  PMU->isPowerChannelEnable(XPOWERS_ALDO2)  ? "+" : "-",  PMU->getPowerChannelVoltage(XPOWERS_ALDO2));
+        LOG_DEBUG("ALDO2: %s   Voltage:%u mV \n", PMU->isPowerChannelEnable(XPOWERS_ALDO2) ? "+" : "-",
+                  PMU->getPowerChannelVoltage(XPOWERS_ALDO2));
     }
     if (PMU->isChannelAvailable(XPOWERS_ALDO3)) {
-        LOG_DEBUG("ALDO3: %s   Voltage:%u mV \n",  PMU->isPowerChannelEnable(XPOWERS_ALDO3)  ? "+" : "-",  PMU->getPowerChannelVoltage(XPOWERS_ALDO3));
+        LOG_DEBUG("ALDO3: %s   Voltage:%u mV \n", PMU->isPowerChannelEnable(XPOWERS_ALDO3) ? "+" : "-",
+                  PMU->getPowerChannelVoltage(XPOWERS_ALDO3));
     }
     if (PMU->isChannelAvailable(XPOWERS_ALDO4)) {
-        LOG_DEBUG("ALDO4: %s   Voltage:%u mV \n",  PMU->isPowerChannelEnable(XPOWERS_ALDO4)  ? "+" : "-",  PMU->getPowerChannelVoltage(XPOWERS_ALDO4));
+        LOG_DEBUG("ALDO4: %s   Voltage:%u mV \n", PMU->isPowerChannelEnable(XPOWERS_ALDO4) ? "+" : "-",
+                  PMU->getPowerChannelVoltage(XPOWERS_ALDO4));
     }
     if (PMU->isChannelAvailable(XPOWERS_BLDO1)) {
-        LOG_DEBUG("BLDO1: %s   Voltage:%u mV \n",  PMU->isPowerChannelEnable(XPOWERS_BLDO1)  ? "+" : "-",  PMU->getPowerChannelVoltage(XPOWERS_BLDO1));
+        LOG_DEBUG("BLDO1: %s   Voltage:%u mV \n", PMU->isPowerChannelEnable(XPOWERS_BLDO1) ? "+" : "-",
+                  PMU->getPowerChannelVoltage(XPOWERS_BLDO1));
     }
     if (PMU->isChannelAvailable(XPOWERS_BLDO2)) {
-        LOG_DEBUG("BLDO2: %s   Voltage:%u mV \n",  PMU->isPowerChannelEnable(XPOWERS_BLDO2)  ? "+" : "-",  PMU->getPowerChannelVoltage(XPOWERS_BLDO2));
+        LOG_DEBUG("BLDO2: %s   Voltage:%u mV \n", PMU->isPowerChannelEnable(XPOWERS_BLDO2) ? "+" : "-",
+                  PMU->getPowerChannelVoltage(XPOWERS_BLDO2));
     }
     LOG_DEBUG("=======================================================================\n");
 
@@ -597,7 +615,6 @@ bool Power::axpChipInit()
     PMU->setSysPowerDownVoltage(2600);
 #endif
 
-
 #ifdef PMU_IRQ
     uint64_t pmuIrqMask = 0;
 

src/PowerFSM.cpp

@@ -16,7 +16,7 @@ static bool isPowered()
     return true;
 #endif
 
-    bool isRouter = (config.device.role == Config_DeviceConfig_Role_ROUTER ? 1 : 0);
+    bool isRouter = (config.device.role == meshtastic_Config_DeviceConfig_Role_ROUTER ? 1 : 0);
 
     // If we are not a router and we already have AC power go to POWER state after init, otherwise go to ON
     // We assume routers might be powered all the time, but from a low current (solar) source
@@ -199,7 +199,8 @@ static void onEnter()
 
     uint32_t now = millis();
 
-    if ((now - lastPingMs) > 30 * 1000) { // if more than a minute since our last press, ask node we are looking at to update their state
+    if ((now - lastPingMs) >
+        30 * 1000) { // if more than a minute since our last press, ask node we are looking at to update their state
         if (displayedNodeNum)
             service.sendNetworkPing(displayedNodeNum, true); // Refresh the currently displayed node
         lastPingMs = now;
@@ -237,7 +238,7 @@ Fsm powerFSM(&stateBOOT);
 
 void PowerFSM_setup()
 {
-    bool isRouter = (config.device.role == Config_DeviceConfig_Role_ROUTER ? 1 : 0);
+    bool isRouter = (config.device.role == meshtastic_Config_DeviceConfig_Role_ROUTER ? 1 : 0);
     bool hasPower = isPowered();
 
     LOG_INFO("PowerFSM init, USB power=%d\n", hasPower ? 1 : 0);
@@ -249,7 +250,8 @@ void PowerFSM_setup()
 
     // We need this transition, because we might not transition if we were waiting to enter light-sleep, because when we wake from
     // light sleep we _always_ transition to NB or dark and
-    powerFSM.add_transition(&stateLS, isRouter ? &stateNB : &stateDARK, EVENT_PACKET_FOR_PHONE, NULL, "Received packet, exiting light sleep");
+    powerFSM.add_transition(&stateLS, isRouter ? &stateNB : &stateDARK, EVENT_PACKET_FOR_PHONE, NULL,
+                            "Received packet, exiting light sleep");
     powerFSM.add_transition(&stateNB, &stateNB, EVENT_PACKET_FOR_PHONE, NULL, "Received packet, resetting win wake");
 
     // Handle press events - note: we ignore button presses when in API mode
@@ -258,7 +260,8 @@ void PowerFSM_setup()
     powerFSM.add_transition(&stateDARK, &stateON, EVENT_PRESS, NULL, "Press");
     powerFSM.add_transition(&statePOWER, &statePOWER, EVENT_PRESS, screenPress, "Press");
     powerFSM.add_transition(&stateON, &stateON, EVENT_PRESS, screenPress, "Press"); // reenter On to restart our timers
-    powerFSM.add_transition(&stateSERIAL, &stateSERIAL, EVENT_PRESS, screenPress, "Press"); // Allow button to work while in serial API
+    powerFSM.add_transition(&stateSERIAL, &stateSERIAL, EVENT_PRESS, screenPress,
+                            "Press"); // Allow button to work while in serial API
 
     // Handle critically low power battery by forcing deep sleep
     powerFSM.add_transition(&stateBOOT, &stateSDS, EVENT_LOW_BATTERY, NULL, "LowBat");
@@ -324,7 +327,9 @@ void PowerFSM_setup()
 
     powerFSM.add_transition(&stateDARK, &stateDARK, EVENT_CONTACT_FROM_PHONE, NULL, "Contact from phone");
 
-    powerFSM.add_timed_transition(&stateON, &stateDARK, getConfiguredOrDefaultMs(config.display.screen_on_secs, default_screen_on_secs), NULL, "Screen-on timeout");
+    powerFSM.add_timed_transition(&stateON, &stateDARK,
+                                  getConfiguredOrDefaultMs(config.display.screen_on_secs, default_screen_on_secs), NULL,
+                                  "Screen-on timeout");
 
 #ifdef ARCH_ESP32
     State *lowPowerState = &stateLS;
@@ -332,14 +337,18 @@ void PowerFSM_setup()
 
     // 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(&stateNB, &stateLS,
-        powerFSM.add_timed_transition(&stateDARK, &stateLS, getConfiguredOrDefaultMs(config.power.wait_bluetooth_secs, default_wait_bluetooth_secs), NULL, "Bluetooth timeout");
+                                      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");
     }
 
     if (config.power.sds_secs != UINT32_MAX)
-        powerFSM.add_timed_transition(lowPowerState, &stateSDS, getConfiguredOrDefaultMs(config.power.sds_secs), NULL, "mesh timeout");
+        powerFSM.add_timed_transition(lowPowerState, &stateSDS, getConfiguredOrDefaultMs(config.power.sds_secs), NULL,
+                                      "mesh timeout");
 #endif
 
-
     powerFSM.run_machine(); // run one interation of the state machine, so we run our on enter tasks for the initial DARK state
 }

src/PowerFSMThread.h

@@ -26,9 +26,10 @@ class PowerFSMThread : public OSThread
 
         if (powerStatus->getHasUSB()) {
             timeLastPowered = millis();
-        } else if (config.power.on_battery_shutdown_after_secs > 0 && 
+        } else if (config.power.on_battery_shutdown_after_secs > 0 && config.power.on_battery_shutdown_after_secs != UINT32_MAX &&
-            config.power.on_battery_shutdown_after_secs != UINT32_MAX && 
+                   millis() > (timeLastPowered +
-            millis() > (timeLastPowered + getConfiguredOrDefaultMs(config.power.on_battery_shutdown_after_secs))) { // shutdown after 30 minutes unpowered
+                               getConfiguredOrDefaultMs(
+                                   config.power.on_battery_shutdown_after_secs))) { // shutdown after 30 minutes unpowered
             powerFSM.trigger(EVENT_SHUTDOWN);
         }
 

src/RedirectablePrint.cpp

@@ -1,12 +1,12 @@
-#include "configuration.h"
 #include "RedirectablePrint.h"
-#include "RTC.h"
 #include "NodeDB.h"
+#include "RTC.h"
 #include "concurrency/OSThread.h"
+#include "configuration.h"
 #include <assert.h>
+#include <cstring>
 #include <sys/time.h>
 #include <time.h>
-#include <cstring>
 
 /**
  * A printer that doesn't go anywhere
@@ -42,7 +42,8 @@ size_t RedirectablePrint::vprintf(const char *format, va_list arg)
     size_t len = vsnprintf(printBuf, sizeof(printBuf), format, copy);
     va_end(copy);
 
-    // If the resulting string is longer than sizeof(printBuf)-1 characters, the remaining characters are still counted for the return value
+    // 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;
@@ -104,7 +105,8 @@ size_t RedirectablePrint::log(const char *logLevel, const char *format, ...)
     return r;
 }
 
-void RedirectablePrint::hexDump(const char *logLevel, unsigned char *buf, uint16_t len) {
+void RedirectablePrint::hexDump(const char *logLevel, unsigned char *buf, uint16_t len)
+{
     const char alphabet[17] = "0123456789abcdef";
     log(logLevel, "   +------------------------------------------------+ +----------------+\n");
     log(logLevel, "   |.0 .1 .2 .3 .4 .5 .6 .7 .8 .9 .a .b .c .d .e .f | |      ASCII     |\n");
@@ -119,12 +121,15 @@ void RedirectablePrint::hexDump(const char *logLevel, unsigned char *buf, uint16
                 s[ix++] = alphabet[(c >> 4) & 0x0F];
                 s[ix++] = alphabet[c & 0x0F];
                 ix++;
-        if (c > 31 && c < 128) s[iy++] = c;
+                if (c > 31 && c < 128)
-        else s[iy++] = '.';
+                    s[iy++] = c;
+                else
+                    s[iy++] = '.';
             }
         }
         uint8_t index = i / 16;
-    if (i < 256) log(logLevel, " ");
+        if (i < 256)
+            log(logLevel, " ");
         log(logLevel, "%02x", index);
         log(logLevel, ".");
         log(logLevel, s);

src/SPILock.cpp

@@ -1,5 +1,5 @@
-#include "configuration.h"
 #include "SPILock.h"
+#include "configuration.h"
 #include <Arduino.h>
 #include <assert.h>
 

src/SerialConsole.cpp

@@ -49,7 +49,8 @@ int32_t SerialConsole::runOnce()
     return runOncePart();
 }
 
-void SerialConsole::flush() {
+void SerialConsole::flush()
+{
     Port.flush();
 }
 

src/SerialConsole.h

@@ -29,7 +29,6 @@ class SerialConsole : public StreamAPI, public RedirectablePrint, private concur
     void flush();
 
   protected:
-
     /// Check the current underlying physical link to see if the client is currently connected
     virtual bool checkIsConnected() override;
 };

src/Status.h

@@ -8,7 +8,6 @@
 #define STATUS_TYPE_GPS 2
 #define STATUS_TYPE_NODE 3
 
-
 namespace meshtastic
 {
 
@@ -17,7 +16,8 @@ namespace meshtastic
 {
   protected:
     // Allows us to observe an Observable
-        CallbackObserver<Status, const Status *> statusObserver = CallbackObserver<Status, const Status *>(this, &Status::updateStatus);
+    CallbackObserver<Status, const Status *> statusObserver =
+        CallbackObserver<Status, const Status *>(this, &Status::updateStatus);
     bool initialized = false;
     // Workaround for no typeid support
     int statusType = 0;
@@ -29,9 +29,9 @@ namespace meshtastic
     // Enable polymorphism ?
     virtual ~Status() = default;
 
-        Status() {
+    Status()
-            if (!statusType)
     {
+        if (!statusType) {
             statusType = STATUS_TYPE_BASE;
         }
     }
@@ -41,32 +41,16 @@ namespace meshtastic
     Status &operator=(const Status &) = delete;
 
     // Start observing a source of data
-        void observe(Observable<const Status *> *source)
+    void observe(Observable<const Status *> *source) { statusObserver.observe(source); }
-        {
-            statusObserver.observe(source);
-        }
 
     // Determines whether or not existing data matches the data in another Status instance
-        bool matches(const Status *otherStatus) const 
+    bool matches(const Status *otherStatus) const { return true; }
-        {
-            return true;
-        }
 
-        bool isInitialized() const
+    bool isInitialized() const { return initialized; }
-        {
-            return initialized;
-        }
 
-        int getStatusType() const
+    int getStatusType() const { return statusType; }
-        {
-            return statusType;
-        }
 
     // Called when the Observable we're observing generates a new notification
-        int updateStatus(const Status *newStatus) 
+    int updateStatus(const Status *newStatus) { return 0; }
-        {
-            return 0;
-        }
-
-    };
 };
+}; // namespace meshtastic

src/airtime.cpp

@@ -34,11 +34,13 @@ uint8_t AirTime::currentPeriodIndex()
     return ((getSecondsSinceBoot() / SECONDS_PER_PERIOD) % PERIODS_TO_LOG);
 }
 
-uint8_t AirTime::getPeriodUtilMinute() {
+uint8_t AirTime::getPeriodUtilMinute()
+{
     return (getSecondsSinceBoot() / 10) % CHANNEL_UTILIZATION_PERIODS;
 }
 
-uint8_t AirTime::getPeriodUtilHour() {
+uint8_t AirTime::getPeriodUtilHour()
+{
     return (getSecondsSinceBoot() / 60) % MINUTES_IN_HOUR;
 }
 
@@ -128,14 +130,14 @@ bool AirTime::isTxAllowedChannelUtil(bool polite)
     }
 }
 
-
 bool AirTime::isTxAllowedAirUtil()
 {
     if (!config.lora.override_duty_cycle && myRegion->dutyCycle < 100) {
         if (utilizationTXPercent() < myRegion->dutyCycle * polite_duty_cycle_percent / 100) {
             return true;
         } else {
-            LOG_WARN("Tx air utilization is >%d percent. Skipping this opportunity to send.\n", myRegion->dutyCycle * polite_duty_cycle_percent / 100);
+            LOG_WARN("Tx air utilization is >%f percent. Skipping this opportunity to send.\n",
+                     myRegion->dutyCycle * polite_duty_cycle_percent / 100);
             return false;
         }
     }
@@ -155,9 +157,7 @@ uint8_t AirTime::getSilentMinutes(float txPercent, float dutyCycle)
     return MINUTES_IN_HOUR;
 }
 
-
+AirTime::AirTime() : concurrency::OSThread("AirTime"), airtimes({}) {}
-AirTime::AirTime() : concurrency::OSThread("AirTime"),airtimes({}) {
-}
 
 int32_t AirTime::runOnce()
 {

src/airtime.h

@@ -1,10 +1,10 @@
 #pragma once
 
+#include "MeshRadio.h"
 #include "concurrency/OSThread.h"
 #include "configuration.h"
 #include <Arduino.h>
 #include <functional>
-#include "MeshRadio.h"
 
 /*
   TX_LOG      - Time on air this device has transmitted
@@ -33,7 +33,6 @@
 #define MS_IN_MINUTE (SECONDS_IN_MINUTE * 1000)
 #define MS_IN_HOUR (MINUTES_IN_HOUR * SECONDS_IN_MINUTE * 1000)
 
-
 enum reportTypes { TX_LOG, RX_LOG, RX_ALL_LOG };
 
 void logAirtime(reportTypes reportType, uint32_t airtime_ms);

src/buzz/buzz.cpp

@@ -1,6 +1,6 @@
 #include "buzz.h"
-#include "configuration.h"
 #include "NodeDB.h"
+#include "configuration.h"
 
 #if !defined(ARCH_ESP32) && !defined(ARCH_RP2040) && !defined(ARCH_PORTDUINO)
 #include "Tone.h"
@@ -33,7 +33,8 @@ struct ToneDuration {
 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) {
+void playTones(const ToneDuration *tone_durations, int size)
+{
 #ifdef PIN_BUZZER
     if (!config.device.buzzer_gpio)
         config.device.buzzer_gpio = PIN_BUZZER;
@@ -48,22 +49,20 @@ void playTones(const ToneDuration *tone_durations, int size) {
     }
 }
 
-
+void playBeep()
-void playBeep() {
+{
     ToneDuration melody[] = {{NOTE_B3, DURATION_1_4}};
     playTones(melody, sizeof(melody) / sizeof(ToneDuration));
 }
 
-void playStartMelody() {
+void playStartMelody()
-  ToneDuration melody[] = {{NOTE_FS3, DURATION_1_8},
+{
-                           {NOTE_AS3, DURATION_1_8},
+    ToneDuration melody[] = {{NOTE_FS3, DURATION_1_8}, {NOTE_AS3, DURATION_1_8}, {NOTE_CS4, DURATION_1_4}};
-                           {NOTE_CS4, DURATION_1_4}};
     playTones(melody, sizeof(melody) / sizeof(ToneDuration));
 }
 
-void playShutdownMelody() {
+void playShutdownMelody()
-  ToneDuration melody[] = {{NOTE_CS4, DURATION_1_8},
+{
-                           {NOTE_AS3, DURATION_1_8},
+    ToneDuration melody[] = {{NOTE_CS4, DURATION_1_8}, {NOTE_AS3, DURATION_1_8}, {NOTE_FS3, DURATION_1_4}};
-                           {NOTE_FS3, DURATION_1_4}};
     playTones(melody, sizeof(melody) / sizeof(ToneDuration));
 }

src/concurrency/BinarySemaphoreFreeRTOS.cpp

@@ -1,5 +1,5 @@
-#include "configuration.h"
 #include "concurrency/BinarySemaphoreFreeRTOS.h"
+#include "configuration.h"
 #include <assert.h>
 
 #ifdef HAS_FREE_RTOS

src/concurrency/BinarySemaphorePosix.cpp

@@ -1,18 +1,14 @@
-#include "configuration.h"
 #include "concurrency/BinarySemaphorePosix.h"
+#include "configuration.h"
 
 #ifndef HAS_FREE_RTOS
 
 namespace concurrency
 {
 
-BinarySemaphorePosix::BinarySemaphorePosix()
+BinarySemaphorePosix::BinarySemaphorePosix() {}
-{
-}
 
-BinarySemaphorePosix::~BinarySemaphorePosix()
+BinarySemaphorePosix::~BinarySemaphorePosix() {}
-{
-}
 
 /**
  * Returns false if we timed out
@@ -23,13 +19,9 @@ bool BinarySemaphorePosix::take(uint32_t msec)
     return false;
 }
 
-void BinarySemaphorePosix::give()
+void BinarySemaphorePosix::give() {}
-{
-}
 
-IRAM_ATTR void BinarySemaphorePosix::giveFromISR(BaseType_t *pxHigherPriorityTaskWoken)
+IRAM_ATTR void BinarySemaphorePosix::giveFromISR(BaseType_t *pxHigherPriorityTaskWoken) {}
-{
-}
 
 } // namespace concurrency
 

src/concurrency/InterruptableDelay.cpp

@@ -1,5 +1,5 @@
-#include "configuration.h"
 #include "concurrency/InterruptableDelay.h"
+#include "configuration.h"
 
 namespace concurrency
 {

src/concurrency/InterruptableDelay.h

@@ -2,7 +2,6 @@
 
 #include "../freertosinc.h"
 
-
 #ifdef HAS_FREE_RTOS
 #include "concurrency/BinarySemaphoreFreeRTOS.h"
 #define BinarySemaphore BinarySemaphoreFreeRTOS

src/concurrency/Lock.cpp

@@ -1,5 +1,5 @@
-#include "configuration.h"
 #include "Lock.h"
+#include "configuration.h"
 #include <cassert>
 
 namespace concurrency

src/concurrency/LockGuard.cpp

@@ -1,7 +1,8 @@
-#include "configuration.h"
 #include "LockGuard.h"
+#include "configuration.h"
 
-namespace concurrency {
+namespace concurrency
+{
 
 LockGuard::LockGuard(Lock *lock) : lock(lock)
 {

src/concurrency/LockGuard.h

@@ -2,7 +2,8 @@
 
 #include "Lock.h"
 
-namespace concurrency {
+namespace concurrency
+{
 
 /**
  * @brief RAII lock guard

src/concurrency/NotifiedWorkerThread.cpp

@@ -1,5 +1,5 @@
-#include "configuration.h"
 #include "NotifiedWorkerThread.h"
+#include "configuration.h"
 #include "main.h"
 
 namespace concurrency
@@ -80,8 +80,6 @@ void NotifiedWorkerThread::checkNotification()
     }
 }
 
-
-
 int32_t NotifiedWorkerThread::runOnce()
 {
     enabled = false; // Only run once per notification

src/concurrency/NotifiedWorkerThread.h

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

src/concurrency/OSThread.cpp

@@ -1,5 +1,9 @@
-#include "configuration.h"
 #include "OSThread.h"
+#include "configuration.h"
+#ifdef HAS_SCREEN
+#include "graphics/Screen.h"
+#endif
+#include "main.h"
 #include <assert.h>
 
 namespace concurrency
@@ -79,12 +83,21 @@ void OSThread::run()
 #endif
     currentThread = this;
     auto newDelay = runOnce();
-#ifdef DEBUG_HEAP
+#ifdef ARCH_ESP32
     auto newHeap = ESP.getFreeHeap();
+    if (newHeap < 10000) {
+        LOG_DEBUG("\n\n====== heap too low [10000] -> reboot in 5s ======\n\n");
+#ifdef HAS_SCREEN
+        screen->startRebootScreen();
+#endif
+        rebootAtMsec = millis() + 5000;
+    }
+#ifdef DEBUG_HEAP
     if (newHeap < heap)
         LOG_DEBUG("------ Thread %s leaked heap %d -> %d (%d) ------\n", ThreadName.c_str(), heap, newHeap, newHeap - heap);
     if (heap < newHeap)
         LOG_DEBUG("++++++ Thread %s freed heap %d -> %d (%d) ++++++\n", ThreadName.c_str(), heap, newHeap, newHeap - heap);
+#endif
 #endif
 
     runned();

src/configuration.h

@@ -42,7 +42,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #error APP_VERSION must be set by the build environment
 #endif
 
-// FIXME: This is still needed by the Bluetooth Stack and needs to be replaced by something better. Remnant of the old versioning system.
+// FIXME: This is still needed by the Bluetooth Stack and needs to be replaced by something better. Remnant of the old versioning
+// system.
 #ifndef HW_VERSION
 #define HW_VERSION "1.0"
 #endif
@@ -175,8 +176,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define HAS_BLUETOOTH 0
 #endif
 
-#include "RF95Configuration.h"
 #include "DebugConfiguration.h"
+#include "RF95Configuration.h"
 
 #ifndef HW_VENDOR
 #error HW_VENDOR must be defined

src/detect/einkScan.h

@@ -7,41 +7,48 @@
 void d_writeCommand(uint8_t c)
 {
     SPI1.beginTransaction(SPISettings(4000000, MSBFIRST, SPI_MODE0));
-  if (PIN_EINK_DC >= 0) digitalWrite(PIN_EINK_DC, LOW);
+    if (PIN_EINK_DC >= 0)
-  if (PIN_EINK_CS >= 0) digitalWrite(PIN_EINK_CS, LOW);
+        digitalWrite(PIN_EINK_DC, LOW);
+    if (PIN_EINK_CS >= 0)
+        digitalWrite(PIN_EINK_CS, LOW);
     SPI1.transfer(c);
-  if (PIN_EINK_CS >= 0) digitalWrite(PIN_EINK_CS, HIGH);
+    if (PIN_EINK_CS >= 0)
-  if (PIN_EINK_DC >= 0) digitalWrite(PIN_EINK_DC, HIGH);
+        digitalWrite(PIN_EINK_CS, HIGH);
+    if (PIN_EINK_DC >= 0)
+        digitalWrite(PIN_EINK_DC, HIGH);
     SPI1.endTransaction();
 }
 
 void d_writeData(uint8_t d)
 {
     SPI1.beginTransaction(SPISettings(4000000, MSBFIRST, SPI_MODE0));
-  if (PIN_EINK_CS >= 0) digitalWrite(PIN_EINK_CS, LOW);
+    if (PIN_EINK_CS >= 0)
+        digitalWrite(PIN_EINK_CS, LOW);
     SPI1.transfer(d);
-  if (PIN_EINK_CS >= 0) digitalWrite(PIN_EINK_CS, HIGH);
+    if (PIN_EINK_CS >= 0)
+        digitalWrite(PIN_EINK_CS, HIGH);
     SPI1.endTransaction();
 }
 
 unsigned long d_waitWhileBusy(uint16_t busy_time)
 {
-  if (PIN_EINK_BUSY >= 0)
+    if (PIN_EINK_BUSY >= 0) {
-  {
         delay(1); // add some margin to become active
         unsigned long start = micros();
-    while (1)
+        while (1) {
-    {
+            if (digitalRead(PIN_EINK_BUSY) != HIGH)
-      if (digitalRead(PIN_EINK_BUSY) != HIGH) break;
+                break;
             delay(1);
-      if (digitalRead(PIN_EINK_BUSY) != HIGH) break;
+            if (digitalRead(PIN_EINK_BUSY) != HIGH)
-      if (micros() - start > 10000000) break;
+                break;
+            if (micros() - start > 10000000)
+                break;
         }
         unsigned long elapsed = micros() - start;
         (void)start;
         return elapsed;
-  }
+    } else
-  else return busy_time;
+        return busy_time;
 }
 
 void scanEInkDevice(void)

src/detect/i2cScan.h

@@ -1,7 +1,7 @@
 #include "../configuration.h"
 #include "../main.h"
+#include "mesh/generated/meshtastic/telemetry.pb.h"
 #include <Wire.h>
-#include "mesh/generated/telemetry.pb.h"
 
 // AXP192 and AXP2101 have the same device address, we just need to identify it in Power.cpp
 #ifndef XPOWERS_AXP192_AXP2101_ADDRESS
@@ -44,7 +44,8 @@ void printATECCInfo()
 #endif
 }
 
-uint16_t getRegisterValue(uint8_t address, uint8_t reg, uint8_t length) {
+uint16_t getRegisterValue(uint8_t address, uint8_t reg, uint8_t length)
+{
     uint16_t value = 0x00;
     Wire.beginTransmission(address);
     Wire.write(reg);
@@ -167,13 +168,13 @@ void scanI2Cdevice()
                 registerValue = getRegisterValue(addr, 0xD0, 1); // GET_ID
                 if (registerValue == 0x61) {
                     LOG_INFO("BME-680 sensor found at address 0x%x\n", (uint8_t)addr);
-                    nodeTelemetrySensorsMap[TelemetrySensorType_BME680] = addr;
+                    nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_BME680] = addr;
                 } else if (registerValue == 0x60) {
                     LOG_INFO("BME-280 sensor found at address 0x%x\n", (uint8_t)addr);
-                    nodeTelemetrySensorsMap[TelemetrySensorType_BME280] = addr;
+                    nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_BME280] = addr;
                 } else {
                     LOG_INFO("BMP-280 sensor found at address 0x%x\n", (uint8_t)addr);
-                    nodeTelemetrySensorsMap[TelemetrySensorType_BMP280] = addr;
+                    nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_BMP280] = addr;
                 }
             }
             if (addr == INA_ADDR || addr == INA_ADDR_ALTERNATE) {
@@ -181,41 +182,41 @@ void scanI2Cdevice()
                 LOG_DEBUG("Register MFG_UID: 0x%x\n", registerValue);
                 if (registerValue == 0x5449) {
                     LOG_INFO("INA260 sensor found at address 0x%x\n", (uint8_t)addr);
-                    nodeTelemetrySensorsMap[TelemetrySensorType_INA260] = addr;
+                    nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_INA260] = addr;
                 } else { // Assume INA219 if INA260 ID is not found
                     LOG_INFO("INA219 sensor found at address 0x%x\n", (uint8_t)addr);
-                    nodeTelemetrySensorsMap[TelemetrySensorType_INA219] = addr;
+                    nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_INA219] = addr;
                 }
             }
             if (addr == MCP9808_ADDR) {
-                nodeTelemetrySensorsMap[TelemetrySensorType_MCP9808] = addr;
+                nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_MCP9808] = addr;
                 LOG_INFO("MCP9808 sensor found\n");
             }
             if (addr == SHT31_ADDR) {
                 LOG_INFO("SHT31 sensor found\n");
-                nodeTelemetrySensorsMap[TelemetrySensorType_SHT31] = addr;
+                nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_SHT31] = addr;
             }
             if (addr == SHTC3_ADDR) {
                 LOG_INFO("SHTC3 sensor found\n");
-                nodeTelemetrySensorsMap[TelemetrySensorType_SHTC3] = addr;
+                nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_SHTC3] = addr;
             }
             if (addr == LPS22HB_ADDR || addr == LPS22HB_ADDR_ALT) {
                 LOG_INFO("LPS22HB sensor found\n");
-                nodeTelemetrySensorsMap[TelemetrySensorType_LPS22] = addr;
+                nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_LPS22] = addr;
             }
 
             // High rate sensors, will be processed internally
             if (addr == QMC6310_ADDR) {
                 LOG_INFO("QMC6310 Highrate 3-Axis magnetic sensor found\n");
-                nodeTelemetrySensorsMap[TelemetrySensorType_QMC6310] = addr;
+                nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_QMC6310] = addr;
             }
             if (addr == QMI8658_ADDR) {
                 LOG_INFO("QMI8658 Highrate 6-Axis inertial measurement sensor found\n");
-                nodeTelemetrySensorsMap[TelemetrySensorType_QMI8658] = addr;
+                nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_QMI8658] = addr;
             }
             if (addr == QMC5883L_ADDR) {
                 LOG_INFO("QMC5883L Highrate 3-Axis magnetic sensor found\n");
-                nodeTelemetrySensorsMap[TelemetrySensorType_QMC5883L] = addr;
+                nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_QMC5883L] = addr;
             }
         } else if (err == 4) {
             LOG_ERROR("Unknow error at address 0x%x\n", addr);

src/error.h

@@ -2,10 +2,11 @@
 
 #include <Arduino.h>
 
-#include "mesh/generated/mesh.pb.h" // For CriticalErrorCode
+#include "mesh/generated/meshtastic/mesh.pb.h" // For CriticalErrorCode
 
 /// A macro that include filename and line
 #define RECORD_CRITICALERROR(code) recordCriticalError(code, __LINE__, __FILE__)
 
 /// Record an error that should be reported via analytics
-void recordCriticalError(CriticalErrorCode code = CriticalErrorCode_UNSPECIFIED, uint32_t address = 0, const char *filename = NULL);
+void recordCriticalError(meshtastic_CriticalErrorCode code = meshtastic_CriticalErrorCode_UNSPECIFIED, uint32_t address = 0,
+                         const char *filename = NULL);

src/gps/GPS.cpp

@@ -21,7 +21,8 @@ GPS *gps;
 /// only init that port once.
 static bool didSerialInit;
 
-bool GPS::getACK(uint8_t c, uint8_t i) {
+bool GPS::getACK(uint8_t c, uint8_t i)
+{
     uint8_t b;
     uint8_t ack = 0;
     const uint8_t ackP[2] = {c, i};
@@ -50,8 +51,7 @@ bool GPS::getACK(uint8_t c, uint8_t i) {
             b = _serial_gps->read();
             if (b == buf[ack]) {
                 ack++;
-      }
+            } else {
-      else {
                 ack = 0;
             }
         }
@@ -178,8 +178,8 @@ if (!config.position.tx_gpio)
              * t-beam-s3-core uses the same L76K GNSS module as t-echo.
              * Unlike t-echo, L76K uses 9600 baud rate for communication by default.
              * */
-            // _serial_gps->begin(9600);    //The baud rate of 9600 has been initialized at the beginning of setupGPS, this line is the redundant part
+            // _serial_gps->begin(9600);    //The baud rate of 9600 has been initialized at the beginning of setupGPS, this line
-            // delay(250);
+            // is the redundant part delay(250);
 
             // Initialize the L76K Chip, use GPS + GLONASS
             _serial_gps->write("$PCAS04,5*1C\r\n");
@@ -210,7 +210,8 @@ if (!config.position.tx_gpio)
             // ublox-M10S can be compatible with UBLOX traditional protocol, so the following sentence settings are also valid
 
             // disable GGL
-            byte _message_GGL[] = {0xB5, 0x62, 0x06, 0x01, 0x08, 0x00, 0xF0, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x05, 0x3A};
+            byte _message_GGL[] = {0xB5, 0x62, 0x06, 0x01, 0x08, 0x00, 0xF0, 0x01,
+                                   0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x05, 0x3A};
             _serial_gps->write(_message_GGL, sizeof(_message_GGL));
             if (!getACK(0x06, 0x01)) {
                 LOG_WARN("Unable to disable NMEA GGL.\n");
@@ -218,7 +219,8 @@ if (!config.position.tx_gpio)
             }
 
             // disable GSA
-            byte _message_GSA[] = {0xB5, 0x62, 0x06, 0x01, 0x08, 0x00, 0xF0, 0x02, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x06, 0x41};
+            byte _message_GSA[] = {0xB5, 0x62, 0x06, 0x01, 0x08, 0x00, 0xF0, 0x02,
+                                   0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x06, 0x41};
             _serial_gps->write(_message_GSA, sizeof(_message_GSA));
             if (!getACK(0x06, 0x01)) {
                 LOG_WARN("Unable to disable NMEA GSA.\n");
@@ -226,7 +228,8 @@ if (!config.position.tx_gpio)
             }
 
             // disable GSV
-            byte _message_GSV[] = {0xB5, 0x62, 0x06, 0x01, 0x08, 0x00, 0xF0, 0x03, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x07, 0x48};
+            byte _message_GSV[] = {0xB5, 0x62, 0x06, 0x01, 0x08, 0x00, 0xF0, 0x03,
+                                   0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x07, 0x48};
             _serial_gps->write(_message_GSV, sizeof(_message_GSV));
             if (!getACK(0x06, 0x01)) {
                 LOG_WARN("Unable to disable NMEA GSV.\n");
@@ -234,7 +237,8 @@ if (!config.position.tx_gpio)
             }
 
             // disable VTG
-            byte _message_VTG[] = {0xB5, 0x62, 0x06, 0x01, 0x08, 0x00, 0xF0, 0x05, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x09, 0x56};
+            byte _message_VTG[] = {0xB5, 0x62, 0x06, 0x01, 0x08, 0x00, 0xF0, 0x05,
+                                   0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x09, 0x56};
             _serial_gps->write(_message_VTG, sizeof(_message_VTG));
             if (!getACK(0x06, 0x01)) {
                 LOG_WARN("Unable to disable NMEA VTG.\n");
@@ -242,7 +246,8 @@ if (!config.position.tx_gpio)
             }
 
             // enable RMC
-            byte _message_RMC[] = {0xB5, 0x62, 0x06, 0x01, 0x08, 0x00, 0xF0, 0x04, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x09, 0x54};
+            byte _message_RMC[] = {0xB5, 0x62, 0x06, 0x01, 0x08, 0x00, 0xF0, 0x04,
+                                   0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x09, 0x54};
             _serial_gps->write(_message_RMC, sizeof(_message_RMC));
             if (!getACK(0x06, 0x01)) {
                 LOG_WARN("Unable to enable NMEA RMC.\n");
@@ -250,7 +255,8 @@ if (!config.position.tx_gpio)
             }
 
             // enable GGA
-            byte _message_GGA[] = {0xB5, 0x62, 0x06, 0x01, 0x08, 0x00, 0xF0, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x05, 0x38};
+            byte _message_GGA[] = {0xB5, 0x62, 0x06, 0x01, 0x08, 0x00, 0xF0, 0x00,
+                                   0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x05, 0x38};
             _serial_gps->write(_message_GGA, sizeof(_message_GGA));
             if (!getACK(0x06, 0x01)) {
                 LOG_WARN("Unable to enable NMEA GGA.\n");
@@ -289,7 +295,8 @@ if(config.position.gps_enabled){
         notifyDeepSleepObserver.observe(&notifyDeepSleep);
         notifyGPSSleepObserver.observe(&notifyGPSSleep);
     }
-    if (config.position.gps_enabled==false) {
+
+    if (config.position.gps_enabled == false && config.position.fixed_position == false) {
         setAwake(false);
         doGPSpowersave(false);
     }
@@ -396,7 +403,8 @@ uint32_t GPS::getSleepTime() const
     uint32_t t = config.position.gps_update_interval;
     bool gps_enabled = config.position.gps_enabled;
 
-    if (!gps_enabled)
+    // We'll not need the GPS thread to wake up again after first acq. with fixed position.
+    if (!gps_enabled || config.position.fixed_position)
         t = UINT32_MAX; // Sleep forever now
 
     if (t == UINT32_MAX)
@@ -431,6 +439,7 @@ int32_t GPS::runOnce()
                 LOG_DEBUG("GPS is not communicating, trying factory reset on next bootup.\n");
                 devicestate.did_gps_reset = false;
                 nodeDB.saveDeviceStateToDisk();
+                disable(); // Stop the GPS thread as it can do nothing useful until next reboot.
             }
         }
     }
@@ -480,7 +489,7 @@ int32_t GPS::runOnce()
                 if (hasValidLocation) {
                     LOG_DEBUG("hasValidLocation FALLING EDGE (last read: %d)\n", gotLoc);
                 }
-                p = Position_init_default;
+                p = meshtastic_Position_init_default;
                 hasValidLocation = false;
             }
 
@@ -492,6 +501,14 @@ int32_t GPS::runOnce()
     // If state has changed do a publish
     publishUpdate();
 
+    if (!(fixeddelayCtr >= 20) && config.position.fixed_position && hasValidLocation) {
+        fixeddelayCtr++;
+        // LOG_DEBUG("Our delay counter is %d\n", fixeddelayCtr);
+        if (fixeddelayCtr >= 20) {
+            doGPSpowersave(false);
+            forceWake(false);
+        }
+    }
     // 9600bps is approx 1 byte per msec, so considering our buffer size we never need to wake more often than 200ms
     // if not awake we can run super infrquently (once every 5 secs?) to see if we need to wake.
     return isAwake ? GPS_THREAD_INTERVAL : 5000;
@@ -574,7 +591,6 @@ GnssModel_t GPS::probe()
         }
     }
 
-
     uint8_t cfg_rate[] = {0xB5, 0x62, 0x06, 0x08, 0x00, 0x00, 0x0E, 0x30};
     _serial_gps->write(cfg_rate, sizeof(cfg_rate));
     // Check that the returned response class and message ID are correct
@@ -662,8 +678,7 @@ GPS *createGps()
             new_gps->setup();
             return new_gps;
         }
-    }
+    } else {
-    else{
         GPS *new_gps = new NMEAGPS();
         new_gps->setup();
         return new_gps;

src/gps/GPS.h

@@ -4,7 +4,6 @@
 #include "Observer.h"
 #include "concurrency/OSThread.h"
 
-
 struct uBloxGnssModelInfo {
     char swVersion[30];
     char hwVersion[10];
@@ -55,7 +54,7 @@ class GPS : private concurrency::OSThread
     /** If !NULL we will use this serial port to construct our GPS */
     static HardwareSerial *_serial_gps;
 
-    Position p = Position_init_default;
+    meshtastic_Position p = meshtastic_Position_init_default;
 
     GPS() : concurrency::OSThread("GPS") {}
 
@@ -169,6 +168,9 @@ class GPS : private concurrency::OSThread
 
     int getAck(uint8_t *buffer, uint16_t size, uint8_t requestedClass, uint8_t requestedID);
 
+    // delay counter to allow more sats before fixed position stops GPS thread
+    uint8_t fixeddelayCtr = 0;
+
   protected:
     GnssModel_t gnssModel = GNSS_MODEL_UNKONW;
 };

src/gps/GeoCoord.cpp

@@ -1,21 +1,25 @@
 #include "GeoCoord.h"
 
-GeoCoord::GeoCoord() {
+GeoCoord::GeoCoord()
+{
     _dirty = true;
 }
 
-GeoCoord::GeoCoord (int32_t lat, int32_t lon, int32_t alt) : _latitude(lat), _longitude(lon), _altitude(alt) {
+GeoCoord::GeoCoord(int32_t lat, int32_t lon, int32_t alt) : _latitude(lat), _longitude(lon), _altitude(alt)
+{
     GeoCoord::setCoords();
 }
 
-GeoCoord::GeoCoord (float lat, float lon, int32_t alt) : _altitude(alt) {
+GeoCoord::GeoCoord(float lat, float lon, int32_t alt) : _altitude(alt)
+{
     // Change decimial reprsentation to int32_t. I.e., 12.345 becomes 123450000
     _latitude = int32_t(lat * 1e+7);
     _longitude = int32_t(lon * 1e+7);
     GeoCoord::setCoords();
 }
 
-GeoCoord::GeoCoord(double lat, double lon, int32_t alt): _altitude(alt) {
+GeoCoord::GeoCoord(double lat, double lon, int32_t alt) : _altitude(alt)
+{
     // Change decimial reprsentation to int32_t. I.e., 12.345 becomes 123450000
     _latitude = int32_t(lat * 1e+7);
     _longitude = int32_t(lon * 1e+7);
@@ -23,7 +27,8 @@ GeoCoord::GeoCoord(double lat, double lon, int32_t alt): _altitude(alt) {
 }
 
 // Initialize all the coordinate systems
-void GeoCoord::setCoords() {
+void GeoCoord::setCoords()
+{
     double lat = _latitude * 1e-7;
     double lon = _longitude * 1e-7;
     GeoCoord::latLongToDMS(lat, lon, _dms);
@@ -34,7 +39,8 @@ void GeoCoord::setCoords() {
     _dirty = false;
 }
 
-void GeoCoord::updateCoords(int32_t lat, int32_t lon, int32_t alt) {
+void GeoCoord::updateCoords(int32_t lat, int32_t lon, int32_t alt)
+{
     // If marked dirty or new coordiantes
     if (_dirty || _latitude != lat || _longitude != lon || _altitude != alt) {
         _dirty = true;
@@ -45,7 +51,8 @@ void GeoCoord::updateCoords(int32_t lat, int32_t lon, int32_t alt) {
     }
 }
 
-void GeoCoord::updateCoords(const double lat, const double lon, const int32_t alt) {
+void GeoCoord::updateCoords(const double lat, const double lon, const int32_t alt)
+{
     int32_t iLat = lat * 1e+7;
     int32_t iLon = lon * 1e+7;
     // If marked dirty or new coordiantes
@@ -56,10 +63,10 @@ void GeoCoord::updateCoords(const double lat, const double lon, const int32_t al
         _altitude = alt;
         setCoords();
     }
-    
 }
 
-void GeoCoord::updateCoords(const float lat, const float lon, const int32_t alt) {
+void GeoCoord::updateCoords(const float lat, const float lon, const int32_t alt)
+{
     int32_t iLat = lat * 1e+7;
     int32_t iLon = lon * 1e+7;
     // If marked dirty or new coordiantes
@@ -76,9 +83,12 @@ void GeoCoord::updateCoords(const float lat, const float lon, const int32_t alt)
  * Converts lat long coordinates from decimal degrees to degrees minutes seconds format.
  * DD°MM'SS"C DDD°MM'SS"C
  */
-void GeoCoord::latLongToDMS(const double lat, const double lon, DMS &dms) {    
+void GeoCoord::latLongToDMS(const double lat, const double lon, DMS &dms)
-    if (lat < 0) dms.latCP = 'S';
+{
-    else dms.latCP = 'N';
+    if (lat < 0)
+        dms.latCP = 'S';
+    else
+        dms.latCP = 'N';
 
     double latDeg = lat;
 
@@ -90,8 +100,10 @@ void GeoCoord::latLongToDMS(const double lat, const double lon, DMS &dms) {
     dms.latMin = floor(latMin);
     dms.latSec = (latMin - dms.latMin) * 60;
 
-    if (lon < 0) dms.lonCP = 'W';
+    if (lon < 0)
-    else dms.lonCP = 'E';
+        dms.lonCP = 'W';
+    else
+        dms.lonCP = 'E';
 
     double lonDeg = lon;
 
@@ -108,7 +120,8 @@ void GeoCoord::latLongToDMS(const double lat, const double lon, DMS &dms) {
  * Converts lat long coordinates to UTM.
  * based on this: https://github.com/walvok/LatLonToUTM/blob/master/latlon_utm.ino
  */
-void GeoCoord::latLongToUTM(const double lat, const double lon, UTM &utm) {
+void GeoCoord::latLongToUTM(const double lat, const double lon, UTM &utm)
+{
 
     const std::string latBands = "CDEFGHJKLMNPQRSTUVWXX";
     utm.zone = int((lon + 180) / 6 + 1);
@@ -124,10 +137,14 @@ void GeoCoord::latLongToUTM(const double lat, const double lon, UTM &utm) {
     if (lat >= 56.0 && lat < 64.0 && lonTemp >= 3.0 && lonTemp < 12.0) // Norway
         utm.zone = 32;
     if (lat >= 72.0 && lat < 84.0) { // Svalbard
-        if     ( lonTemp >= 0.0  && lonTemp <  9.0 ) utm.zone = 31;
+        if (lonTemp >= 0.0 && lonTemp < 9.0)
-        else if( lonTemp >= 9.0  && lonTemp < 21.0 ) utm.zone = 33;
+            utm.zone = 31;
-        else if( lonTemp >= 21.0 && lonTemp < 33.0 ) utm.zone = 35;
+        else if (lonTemp >= 9.0 && lonTemp < 21.0)
-        else if( lonTemp >= 33.0 && lonTemp < 42.0 ) utm.zone = 37;
+            utm.zone = 33;
+        else if (lonTemp >= 21.0 && lonTemp < 33.0)
+            utm.zone = 35;
+        else if (lonTemp >= 33.0 && lonTemp < 42.0)
+            utm.zone = 37;
     }
 
     double lonOrigin = (utm.zone - 1) * 6 - 180 + 3; // puts origin in middle of zone
@@ -137,21 +154,28 @@ void GeoCoord::latLongToUTM(const double lat, const double lon, UTM &utm) {
     double T = tan(latRad) * tan(latRad);
     double C = eccPrimeSquared * cos(latRad) * cos(latRad);
     double A = cos(latRad) * (lonRad - lonOriginRad);
-    double M = a*((1 - eccSquared/4 - 3*eccSquared*eccSquared/64 - 5*eccSquared*eccSquared*eccSquared/256)*latRad 
+    double M =
-        - (3*eccSquared/8 + 3*eccSquared*eccSquared/32 + 45*eccSquared*eccSquared*eccSquared/1024)*sin(2*latRad)
+        a * ((1 - eccSquared / 4 - 3 * eccSquared * eccSquared / 64 - 5 * eccSquared * eccSquared * eccSquared / 256) * latRad -
-        + (15*eccSquared*eccSquared/256 + 45*eccSquared*eccSquared*eccSquared/1024)*sin(4*latRad) 
+             (3 * eccSquared / 8 + 3 * eccSquared * eccSquared / 32 + 45 * eccSquared * eccSquared * eccSquared / 1024) *
-        - (35*eccSquared*eccSquared*eccSquared/3072)*sin(6*latRad));
+                 sin(2 * latRad) +
-    utm.easting = (double)(k0*N*(A+(1-T+C)*pow(A, 3)/6 + (5-18*T+T*T+72*C-58*eccPrimeSquared)*A*A*A*A*A/120) 
+             (15 * eccSquared * eccSquared / 256 + 45 * eccSquared * eccSquared * eccSquared / 1024) * sin(4 * latRad) -
-        + 500000.0);
+             (35 * eccSquared * eccSquared * eccSquared / 3072) * sin(6 * latRad));
-    utm.northing = (double)(k0*(M+N*tan(latRad)*(A*A/2+(5-T+9*C+4*C*C)*A*A*A*A/24
+    utm.easting = (double)(k0 * N *
-        + (61-58*T+T*T+600*C-330*eccPrimeSquared)*A*A*A*A*A*A/720)));
+                               (A + (1 - T + C) * pow(A, 3) / 6 +
+                                (5 - 18 * T + T * T + 72 * C - 58 * eccPrimeSquared) * A * A * A * A * A / 120) +
+                           500000.0);
+    utm.northing =
+        (double)(k0 * (M + N * tan(latRad) *
+                               (A * A / 2 + (5 - T + 9 * C + 4 * C * C) * A * A * A * A / 24 +
+                                (61 - 58 * T + T * T + 600 * C - 330 * eccPrimeSquared) * A * A * A * A * A * A / 720)));
 
     if (lat < 0)
         utm.northing += 10000000.0; // 10000000 meter offset for southern hemisphere
 }
 
 // Converts lat long coordinates to an MGRS.
-void GeoCoord::latLongToMGRS(const double lat, const double lon, MGRS &mgrs) {
+void GeoCoord::latLongToMGRS(const double lat, const double lon, MGRS &mgrs)
+{
     const std::string e100kLetters[3] = {"ABCDEFGH", "JKLMNPQR", "STUVWXYZ"};
     const std::string n100kLetters[2] = {"ABCDEFGHJKLMNPQRSTUV", "FGHJKLMNPQRSTUVABCDE"};
     UTM utm;
@@ -170,7 +194,8 @@ void GeoCoord::latLongToMGRS(const double lat, const double lon, MGRS &mgrs) {
  * Converts lat long coordinates to Ordnance Survey Grid Reference (UK National Grid Ref).
  * Based on: https://www.movable-type.co.uk/scripts/latlong-os-gridref.html
  */
-void GeoCoord::latLongToOSGR(const double lat, const double lon, OSGR &osgr) {
+void GeoCoord::latLongToOSGR(const double lat, const double lon, OSGR &osgr)
+{
     const char letter[] = "ABCDEFGHJKLMNOPQRSTUVWXYZ"; // No 'I' in OSGR
     double a = 6377563.396;                            // Airy 1830 semi-major axis
     double b = 6356256.909;                            // Airy 1830 semi-minor axis
@@ -211,7 +236,8 @@ void GeoCoord::latLongToOSGR(const double lat, const double lon, OSGR &osgr) {
 
     double deltaLambda = lambda - lambda0;
     double deltaLambda2 = deltaLambda * deltaLambda;
-    double northing = I + II*deltaLambda2 + III*deltaLambda2*deltaLambda2 + IIIA*deltaLambda2*deltaLambda2*deltaLambda2;
+    double northing =
+        I + II * deltaLambda2 + III * deltaLambda2 * deltaLambda2 + IIIA * deltaLambda2 * deltaLambda2 * deltaLambda2;
     double easting = e0 + IV * deltaLambda + V * deltaLambda2 * deltaLambda + VI * deltaLambda2 * deltaLambda2 * deltaLambda;
 
     if (easting < 0 || easting > 700000 || northing < 0 || northing > 1300000) // Check if out of boundaries
@@ -232,7 +258,8 @@ void GeoCoord::latLongToOSGR(const double lat, const double lon, OSGR &osgr) {
  * Converts lat long coordinates to Open Location Code.
  * Based on: https://github.com/google/open-location-code/blob/main/c/src/olc.c
  */
-void GeoCoord::latLongToOLC(double lat, double lon, OLC &olc) {
+void GeoCoord::latLongToOLC(double lat, double lon, OLC &olc)
+{
     char tempCode[] = "1234567890abc";
     const char kAlphabet[] = "23456789CFGHJMPQRVWX";
     double latitude;
@@ -304,7 +331,8 @@ void GeoCoord::latLongToOLC(double lat, double lon, OLC &olc) {
 }
 
 // Converts the coordinate in WGS84 datum to the OSGB36 datum.
-void GeoCoord::convertWGS84ToOSGB36(const double lat, const double lon, double &osgb_Latitude, double &osgb_Longitude) {
+void GeoCoord::convertWGS84ToOSGB36(const double lat, const double lon, double &osgb_Latitude, double &osgb_Longitude)
+{
     // Convert lat long to cartesian
     double phi = toRadians(lat);
     double lambda = toRadians(lon);
@@ -340,7 +368,8 @@ void GeoCoord::convertWGS84ToOSGB36(const double lat, const double lon, double &
     double tanBeta = (airyB * osgbZ) / (airyA * p) * (1 + airyEcc2 * airyB / R);
     double sinBeta = tanBeta / sqrt(1 + tanBeta * tanBeta);
     double cosBeta = sinBeta / tanBeta;
-    osgb_Latitude = atan2(osgbZ + airyEcc2*airyB*sinBeta*sinBeta*sinBeta, p - airyEcc*airyA*cosBeta*cosBeta*cosBeta); // leave in radians
+    osgb_Latitude = atan2(osgbZ + airyEcc2 * airyB * sinBeta * sinBeta * sinBeta,
+                          p - airyEcc * airyA * cosBeta * cosBeta * cosBeta); // leave in radians
     osgb_Longitude = atan2(osgbY, osgbX);                                     // leave in radians
     // osgb height = p*cos(osgb.latitude) + osgbZ*sin(osgb.latitude) -
     //(airyA*airyA/(airyA / sqrt(1 - airyEcc*sin(osgb.latitude)*sin(osgb.latitude)))); // Not used, no OSTN data
@@ -399,7 +428,8 @@ float GeoCoord::bearing(double lat1, double lon1, double lat2, double lon2)
  * The range in meters
  * @return range in radians on a great circle
  */
-float GeoCoord::rangeMetersToRadians(double range_meters) {
+float GeoCoord::rangeMetersToRadians(double range_meters)
+{
     // 1 nm is 1852 meters
     double distance_nm = range_meters * 1852;
     return (PI / (180 * 60)) * distance_nm;
@@ -412,20 +442,25 @@ float GeoCoord::rangeMetersToRadians(double range_meters) {
  * The range in radians
  * @return Range in meters on a great circle
  */
-float GeoCoord::rangeRadiansToMeters(double range_radians) {
+float GeoCoord::rangeRadiansToMeters(double range_radians)
+{
     double distance_nm = ((180 * 60) / PI) * range_radians;
     // 1 meter is 0.000539957 nm
     return distance_nm * 0.000539957;
 }
 
 // Find distance from point to passed in point
-int32_t GeoCoord::distanceTo(const GeoCoord& pointB) {
+int32_t GeoCoord::distanceTo(const GeoCoord &pointB)
-    return latLongToMeter(this->getLatitude() * 1e-7, this->getLongitude() * 1e-7, pointB.getLatitude() * 1e-7, pointB.getLongitude() * 1e-7);
+{
+    return latLongToMeter(this->getLatitude() * 1e-7, this->getLongitude() * 1e-7, pointB.getLatitude() * 1e-7,
+                          pointB.getLongitude() * 1e-7);
 }
 
 // Find bearing from point to passed in point
-int32_t GeoCoord::bearingTo(const GeoCoord& pointB) {
+int32_t GeoCoord::bearingTo(const GeoCoord &pointB)
-    return bearing(this->getLatitude() * 1e-7, this->getLongitude() * 1e-7, pointB.getLatitude() * 1e-7, pointB.getLongitude() * 1e-7);
+{
+    return bearing(this->getLatitude() * 1e-7, this->getLongitude() * 1e-7, pointB.getLatitude() * 1e-7,
+                   pointB.getLongitude() * 1e-7);
 }
 
 /**
@@ -437,7 +472,8 @@ int32_t GeoCoord::bearingTo(const GeoCoord& pointB) {
  * range in meters
  * @return GeoCoord object of point at bearing and range from initial point
  */
-std::shared_ptr<GeoCoord> GeoCoord::pointAtDistance(double bearing, double range_meters) {
+std::shared_ptr<GeoCoord> GeoCoord::pointAtDistance(double bearing, double range_meters)
+{
     double range_radians = rangeMetersToRadians(range_meters);
     double lat1 = this->getLatitude() * 1e-7;
     double lon1 = this->getLongitude() * 1e-7;
@@ -446,5 +482,4 @@ std::shared_ptr<GeoCoord> GeoCoord::pointAtDistance(double bearing, double range
     double lon = fmod(lon1 - dlon + PI, 2 * PI) - PI;
 
     return std::make_shared<GeoCoord>(double(lat), double(lon), this->getAltitude());
-    
 }

src/gps/GeoCoord.h

@@ -1,20 +1,21 @@
 #pragma once
 
 #include <algorithm>
-#include <string>
-#include <cstring>
 #include <cstdint>
+#include <cstring>
 #include <math.h>
-#include <stdint.h>
-#include <stdexcept>
 #include <memory>
+#include <stdexcept>
+#include <stdint.h>
+#include <string>
 
 #define PI 3.1415926535897932384626433832795
 #define OLC_CODE_LEN 11
 
 // Helper functions
 // Raises a number to an exponent, handling negative exponents.
-static inline double pow_neg(double base, double exponent) {
+static inline double pow_neg(double base, double exponent)
+{
     if (exponent == 0) {
         return 1;
     } else if (exponent > 0) {
@@ -35,8 +36,7 @@ static inline double toDegrees(double r)
 
 // GeoCoord structs/classes
 // A struct to hold the data for a DMS coordinate.
-struct DMS
+struct DMS {
-{
     uint8_t latDeg;
     uint8_t latMin;
     uint32_t latSec;
@@ -48,8 +48,7 @@ struct DMS
 };
 
 // A struct to hold the data for a UTM coordinate, this is also used when creating an MGRS coordinate.
-struct UTM 
+struct UTM {
-{
     uint8_t zone;
     char band;
     uint32_t easting;
@@ -57,8 +56,7 @@ struct UTM
 };
 
 // A struct to hold the data for a MGRS coordinate.
-struct MGRS
+struct MGRS {
-{
     uint8_t zone;
     char band;
     char east100k;
@@ -80,7 +78,8 @@ struct OLC {
     char code[OLC_CODE_LEN + 1]; // +1 for null termination
 };
 
-class GeoCoord {
+class GeoCoord
+{
   private:
     int32_t _latitude = 0;
     int32_t _longitude = 0;
@@ -161,4 +160,3 @@ class GeoCoord {
     // OLC getter
     void getOLCCode(char *code) { strncpy(code, _olc.code, OLC_CODE_LEN + 1); } // +1 for null termination
 };
-

src/gps/NMEAGPS.cpp

@@ -1,6 +1,6 @@
-#include "configuration.h"
 #include "NMEAGPS.h"
 #include "RTC.h"
+#include "configuration.h"
 
 #include <TinyGPS++.h>
 
@@ -29,9 +29,8 @@ bool NMEAGPS::factoryReset()
 
     // send the UBLOX Factory Reset Command regardless of detect state, something is very wrong, just assume it's UBLOX.
     // Factory Reset
-    byte _message_reset[] = {0xB5, 0x62, 0x06, 0x09, 0x0D, 0x00, 0xFF,
+    byte _message_reset[] = {0xB5, 0x62, 0x06, 0x09, 0x0D, 0x00, 0xFF, 0xFB, 0x00, 0x00, 0x00,
-        0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                             0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x17, 0x2B, 0x7E};
-        0xFF, 0xFF, 0x00, 0x00, 0x17, 0x2B, 0x7E};
     _serial_gps->write(_message_reset, sizeof(_message_reset));
     delay(1000);
     return true;
@@ -85,7 +84,8 @@ The Unix epoch (or Unix time or POSIX time or Unix timestamp) is the number of s
         t.tm_year = d.year() - 1900;
         t.tm_isdst = false;
         if (t.tm_mon > -1) {
-            LOG_DEBUG("NMEA GPS time %02d-%02d-%02d %02d:%02d:%02d\n", d.year(), d.month(), t.tm_mday, t.tm_hour, t.tm_min, t.tm_sec);
+            LOG_DEBUG("NMEA GPS time %02d-%02d-%02d %02d:%02d:%02d\n", d.year(), d.month(), t.tm_mday, t.tm_hour, t.tm_min,
+                      t.tm_sec);
             perhapsSetRTC(RTCQualityGPS, t);
             return true;
         } else
@@ -117,8 +117,7 @@ bool NMEAGPS::lookForLocation()
         return false;
 
 #ifdef GPS_EXTRAVERBOSE
-    LOG_DEBUG("AGE: LOC=%d FIX=%d DATE=%d TIME=%d\n", 
+    LOG_DEBUG("AGE: LOC=%d FIX=%d DATE=%d TIME=%d\n", reader.location.age(),
-                reader.location.age(), 
 #ifndef TINYGPS_OPTION_NO_CUSTOM_FIELDS
               gsafixtype.age(),
 #else
@@ -134,9 +133,7 @@ bool NMEAGPS::lookForLocation()
 #ifndef TINYGPS_OPTION_NO_CUSTOM_FIELDS
           (gsafixtype.age() < GPS_SOL_EXPIRY_MS) &&
 #endif
-            (reader.time.age() < GPS_SOL_EXPIRY_MS) &&
+          (reader.time.age() < GPS_SOL_EXPIRY_MS) && (reader.date.age() < GPS_SOL_EXPIRY_MS))) {
-            (reader.date.age() < GPS_SOL_EXPIRY_MS)))
-    {
         LOG_WARN("SOME data is TOO OLD: LOC %u, TIME %u, DATE %u\n", reader.location.age(), reader.time.age(), reader.date.age());
         return false;
     }
@@ -162,7 +159,7 @@ bool NMEAGPS::lookForLocation()
         return false;
     }
 
-    p.location_source = Position_LocSource_LOC_INTERNAL;
+    p.location_source = meshtastic_Position_LocSource_LOC_INTERNAL;
 
     // Dilution of precision (an accuracy metric) is reported in 10^2 units, so we need to scale down when we use it
 #ifndef TINYGPS_OPTION_NO_CUSTOM_FIELDS
@@ -210,10 +207,10 @@ bool NMEAGPS::lookForLocation()
 
     if (reader.course.isUpdated() && reader.course.isValid()) {
         if (reader.course.value() < 36000) { // sanity check
-            p.ground_track = reader.course.value() * 1e3; // Scale the heading (in degrees * 10^-2) to match the expected degrees * 10^-5
+            p.ground_track =
+                reader.course.value() * 1e3; // Scale the heading (in degrees * 10^-2) to match the expected degrees * 10^-5
         } else {
-            LOG_WARN("BOGUS course.value() REJECTED: %d\n",
+            LOG_WARN("BOGUS course.value() REJECTED: %d\n", reader.course.value());
-                        reader.course.value());
         }
     }
 
@@ -224,7 +221,6 @@ bool NMEAGPS::lookForLocation()
     return true;
 }
 
-
 bool NMEAGPS::hasLock()
 {
     // Using GPGGA fix quality indicator

src/gps/NMEAWPL.cpp

@@ -16,17 +16,13 @@
  * -------------------------------------------
  */
 
-uint32_t printWPL(char *buf, size_t bufsz, const Position &pos, const char *name)
+uint32_t printWPL(char *buf, size_t bufsz, const meshtastic_Position &pos, const char *name)
 {
     GeoCoord geoCoord(pos.latitude_i, pos.longitude_i, pos.altitude);
-    uint32_t len = snprintf(buf, bufsz, "$GNWPL,%02d%07.4f,%c,%03d%07.4f,%c,%s",
+    uint32_t len = snprintf(buf, bufsz, "$GNWPL,%02d%07.4f,%c,%03d%07.4f,%c,%s", geoCoord.getDMSLatDeg(),
-        geoCoord.getDMSLatDeg(),
+                            (abs(geoCoord.getLatitude()) - geoCoord.getDMSLatDeg() * 1e+7) * 6e-6, geoCoord.getDMSLatCP(),
-        (abs(geoCoord.getLatitude()) - geoCoord.getDMSLatDeg() * 1e+7) * 6e-6,
+                            geoCoord.getDMSLonDeg(), (abs(geoCoord.getLongitude()) - geoCoord.getDMSLonDeg() * 1e+7) * 6e-6,
-        geoCoord.getDMSLatCP(),
+                            geoCoord.getDMSLonCP(), name);
-        geoCoord.getDMSLonDeg(),
-        (abs(geoCoord.getLongitude()) - geoCoord.getDMSLonDeg() * 1e+7) * 6e-6,
-        geoCoord.getDMSLonCP(),
-        name);
     uint32_t chk = 0;
     for (uint32_t i = 1; i < len; i++) {
         chk ^= buf[i];
@@ -51,35 +47,21 @@ uint32_t printWPL(char *buf, size_t bufsz, const Position &pos, const char *name
  *  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
+ * 11 Geoidal separation, the difference between the WGS-84 earth ellipsoid and mean-sea-level (geoid), "-" means mean-sea-level
- * 12 Units of geoidal separation, meters
+ * below ellipsoid 12 Units of geoidal separation, meters 13 Age of differential GPS data, time in seconds since last SC104 type 1
- * 13 Age of differential GPS data, time in seconds since last SC104 type 1 or 9 update, null field when DGPS is not used
+ * or 9 update, null field when DGPS is not used 14 Differential reference station ID, 0000-1023 15 Checksum
- * 14 Differential reference station ID, 0000-1023
- * 15 Checksum
  * -------------------------------------------
  */
 
-uint32_t printGGA(char *buf, size_t bufsz, const Position &pos)
+uint32_t printGGA(char *buf, size_t bufsz, const meshtastic_Position &pos)
 {
     GeoCoord geoCoord(pos.latitude_i, pos.longitude_i, pos.altitude);
-    uint32_t len = snprintf(buf, bufsz, "$GNGGA,%06u.%03u,%02d%07.4f,%c,%03d%07.4f,%c,%u,%02u,%04u,%04d,%c,%04d,%c,%d,%04d",
+    uint32_t len =
-        pos.time / 1000,
+        snprintf(buf, bufsz, "$GNGGA,%06u.%03u,%02d%07.4f,%c,%03d%07.4f,%c,%u,%02u,%04u,%04d,%c,%04d,%c,%d,%04d", pos.time / 1000,
-        pos.time % 1000,
+                 pos.time % 1000, geoCoord.getDMSLatDeg(), (abs(geoCoord.getLatitude()) - geoCoord.getDMSLatDeg() * 1e+7) * 6e-6,
-        geoCoord.getDMSLatDeg(),
+                 geoCoord.getDMSLatCP(), geoCoord.getDMSLonDeg(),
-        (abs(geoCoord.getLatitude()) - geoCoord.getDMSLatDeg() * 1e+7) * 6e-6,
+                 (abs(geoCoord.getLongitude()) - geoCoord.getDMSLonDeg() * 1e+7) * 6e-6, geoCoord.getDMSLonCP(), pos.fix_type,
-        geoCoord.getDMSLatCP(),
+                 pos.sats_in_view, pos.HDOP, geoCoord.getAltitude(), 'M', pos.altitude_geoidal_separation, 'M', 0, 0);
-        geoCoord.getDMSLonDeg(),
-        (abs(geoCoord.getLongitude()) - geoCoord.getDMSLonDeg() * 1e+7) * 6e-6,
-        geoCoord.getDMSLonCP(),
-        pos.fix_type,
-        pos.sats_in_view,
-        pos.HDOP,
-        geoCoord.getAltitude(),
-        'M',
-        pos.altitude_geoidal_separation,
-        'M',
-        0,
-        0);
 
     uint32_t chk = 0;
     for (uint32_t i = 1; i < len; i++) {

src/gps/NMEAWPL.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <Arduino.h>
 #include "main.h"
+#include <Arduino.h>
 
-uint32_t printWPL(char *buf, size_t bufsz, const Position &pos, const char *name);
+uint32_t printWPL(char *buf, size_t bufsz, const meshtastic_Position &pos, const char *name);
-uint32_t printGGA(char *buf, size_t bufsz, const Position &pos);
+uint32_t printGGA(char *buf, size_t bufsz, const meshtastic_Position &pos);

src/gps/RTC.cpp

@@ -91,8 +91,7 @@ bool perhapsSetRTC(RTCQuality q, const struct timeval *tv)
         // Every 12 hrs we will slam in a new GPS time, to correct for local RTC clock drift
         shouldSet = true;
         LOG_DEBUG("Reapplying external time to correct clock drift %ld secs\n", tv->tv_sec);
-    }
+    } else
-    else
         shouldSet = false;
 
     if (shouldSet) {
@@ -109,7 +108,8 @@ bool perhapsSetRTC(RTCQuality q, const struct timeval *tv)
             rtc.initI2C();
             tm *t = localtime(&tv->tv_sec);
             rtc.setTime(t->tm_year + 1900, t->tm_mon + 1, t->tm_wday, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec);
-            LOG_DEBUG("RV3028_RTC setTime %02d-%02d-%02d %02d:%02d:%02d %ld\n", t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec, tv->tv_sec);
+            LOG_DEBUG("RV3028_RTC setTime %02d-%02d-%02d %02d:%02d:%02d %ld\n", t->tm_year + 1900, t->tm_mon + 1, t->tm_mday,
+                      t->tm_hour, t->tm_min, t->tm_sec, tv->tv_sec);
         }
 #elif defined(PCF8563_RTC)
         if (rtc_found == PCF8563_RTC) {
@@ -121,7 +121,8 @@ bool perhapsSetRTC(RTCQuality q, const struct timeval *tv)
 #endif
             tm *t = localtime(&tv->tv_sec);
             rtc.setDateTime(t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec);
-            LOG_DEBUG("PCF8563_RTC setDateTime %02d-%02d-%02d %02d:%02d:%02d %ld\n", t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec, tv->tv_sec);
+            LOG_DEBUG("PCF8563_RTC setDateTime %02d-%02d-%02d %02d:%02d:%02d %ld\n", t->tm_year + 1900, t->tm_mon + 1, t->tm_mday,
+                      t->tm_hour, t->tm_min, t->tm_sec, tv->tv_sec);
         }
 #elif defined(ARCH_ESP32)
         settimeofday(tv, NULL);

src/graphics/EInkDisplay2.cpp

@@ -1,11 +1,11 @@
 #include "configuration.h"
 
 #ifdef USE_EINK
-#include "main.h"
 #include "EInkDisplay2.h"
-#include "SPILock.h"
-#include <SPI.h>
 #include "GxEPD2_BW.h"
+#include "SPILock.h"
+#include "main.h"
+#include <SPI.h>
 
 #define COLORED GxEPD_BLACK
 #define UNCOLORED GxEPD_WHITE
@@ -14,7 +14,8 @@
 #define TECHO_DISPLAY_MODEL GxEPD2_154_D67
 #elif defined(RAK4630)
 
-//GxEPD2_213_BN - RAK14000 2.13 inch b/w 250x122 - changed from GxEPD2_213_B74 - which was not going to give partial update support
+// 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
@@ -40,7 +41,7 @@
 
 GxEPD2_BW<TECHO_DISPLAY_MODEL, TECHO_DISPLAY_MODEL::HEIGHT> *adafruitDisplay;
 
-EInkDisplay::EInkDisplay(uint8_t address, int sda, int scl)
+EInkDisplay::EInkDisplay(uint8_t address, int sda, int scl, uint8_t screen_model)
 {
 #if defined(TTGO_T_ECHO)
     setGeometry(GEOMETRY_RAWMODE, TECHO_DISPLAY_MODEL::WIDTH, TECHO_DISPLAY_MODEL::HEIGHT);
@@ -175,7 +176,6 @@ bool EInkDisplay::connect()
     pinMode(PIN_EINK_EN, OUTPUT);
 #endif
 
-    
 #if defined(TTGO_T_ECHO)
     {
         auto lowLevel = new TECHO_DISPLAY_MODEL(PIN_EINK_CS, PIN_EINK_DC, PIN_EINK_RES, PIN_EINK_BUSY, SPI1);
@@ -218,7 +218,6 @@ bool EInkDisplay::connect()
     adafruitDisplay->setPartialWindow(0, 0, EPD_WIDTH, EPD_HEIGHT);
 #endif
 
-    
     // adafruitDisplay->setFullWindow();
     // adafruitDisplay->fillScreen(UNCOLORED);
     // adafruitDisplay->drawCircle(100, 100, 20, COLORED);

src/graphics/EInkDisplay2.h

@@ -22,7 +22,7 @@ class EInkDisplay : public OLEDDisplay
     /* constructor
     FIXME - the parameters are not used, just a temporary hack to keep working like the old displays
     */
-    EInkDisplay(uint8_t address, int sda, int scl);
+    EInkDisplay(uint8_t address, int sda, int scl, uint8_t screen_model);
 
     // Write the buffer to the display memory (for eink we only do this occasionally)
     virtual void display(void) override;
@@ -50,5 +50,3 @@ class EInkDisplay : public OLEDDisplay
     // Connect to the display
     virtual bool connect() override;
 };
-
-

src/graphics/Screen.cpp

@@ -33,9 +33,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "main.h"
 #include "mesh-pb-constants.h"
 #include "mesh/Channels.h"
-#include "mesh/generated/deviceonly.pb.h"
+#include "mesh/generated/meshtastic/deviceonly.pb.h"
-#include "modules/TextMessageModule.h"
 #include "modules/ExternalNotificationModule.h"
+#include "modules/TextMessageModule.h"
 #include "sleep.h"
 #include "target_specific.h"
 #include "utils.h"
@@ -118,7 +118,6 @@ static uint16_t displayWidth, displayHeight;
 
 #define getStringCenteredX(s) ((SCREEN_WIDTH - display->getStringWidth(s)) / 2)
 
-
 /**
  * Draw the icon with extra info printed around the corners
  */
@@ -332,7 +331,8 @@ static void drawFrameFirmware(OLEDDisplay *display, OLEDDisplayUiState *state, i
 
     display->setFont(FONT_SMALL);
     display->setTextAlignment(TEXT_ALIGN_LEFT);
-    display->drawStringMaxWidth(0 + x, 2 + y + FONT_HEIGHT_SMALL *2, x + display->getWidth(), "Please be patient and do not power off.");
+    display->drawStringMaxWidth(0 + x, 2 + y + FONT_HEIGHT_SMALL * 2, x + display->getWidth(),
+                                "Please be patient and do not power off.");
 }
 
 /// Draw the last text message we received
@@ -352,10 +352,9 @@ static void drawCriticalFaultFrame(OLEDDisplay *display, OLEDDisplayUiState *sta
 }
 
 // Ignore messages orginating from phone (from the current node 0x0) unless range test or store and forward module are enabled
-static bool shouldDrawMessage(const MeshPacket *packet)
+static bool shouldDrawMessage(const meshtastic_MeshPacket *packet)
 {
-    return packet->from != 0 && !moduleConfig.range_test.enabled &&
+    return packet->from != 0 && !moduleConfig.range_test.enabled && !moduleConfig.store_forward.enabled;
-           !moduleConfig.store_forward.enabled;
 }
 
 /// Draw the last text message we received
@@ -366,8 +365,8 @@ static void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state
     // the max length of this buffer is much longer than we can possibly print
     static char tempBuf[237];
 
-    MeshPacket &mp = devicestate.rx_text_message;
+    meshtastic_MeshPacket &mp = devicestate.rx_text_message;
-    NodeInfo *node = nodeDB.getNode(getFrom(&mp));
+    meshtastic_NodeInfo *node = nodeDB.getNode(getFrom(&mp));
     // LOG_DEBUG("drawing text message from 0x%x: %s\n", mp.from,
     // mp.decoded.variant.data.decoded.bytes);
 
@@ -376,7 +375,7 @@ static void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state
     // be wrapped. Currently only spaces and "-" are allowed for wrapping
     display->setTextAlignment(TEXT_ALIGN_LEFT);
     display->setFont(FONT_SMALL);
-    if (config.display.displaymode == Config_DisplayConfig_DisplayMode_INVERTED) {
+    if (config.display.displaymode == meshtastic_Config_DisplayConfig_DisplayMode_INVERTED) {
         display->fillRect(0 + x, 0 + y, x + display->getWidth(), y + FONT_HEIGHT_SMALL);
         display->setColor(BLACK);
     }
@@ -562,7 +561,7 @@ static void drawGPSAltitude(OLEDDisplay *display, int16_t x, int16_t y, const GP
     } else {
         geoCoord.updateCoords(int32_t(gps->getLatitude()), int32_t(gps->getLongitude()), int32_t(gps->getAltitude()));
         displayLine = "Altitude: " + String(geoCoord.getAltitude()) + "m";
-        if (config.display.units == Config_DisplayConfig_DisplayUnits_IMPERIAL)
+        if (config.display.units == meshtastic_Config_DisplayConfig_DisplayUnits_IMPERIAL)
             displayLine = "Altitude: " + String(geoCoord.getAltitude() * METERS_TO_FEET) + "ft";
         display->drawString(x + (SCREEN_WIDTH - (display->getStringWidth(displayLine))) / 2, y, displayLine);
     }
@@ -584,25 +583,26 @@ static void drawGPScoordinates(OLEDDisplay *display, int16_t x, int16_t y, const
 
         geoCoord.updateCoords(int32_t(gps->getLatitude()), int32_t(gps->getLongitude()), int32_t(gps->getAltitude()));
 
-        if (gpsFormat != Config_DisplayConfig_GpsCoordinateFormat_DMS) {
+        if (gpsFormat != meshtastic_Config_DisplayConfig_GpsCoordinateFormat_DMS) {
             char coordinateLine[22];
-            if (gpsFormat == Config_DisplayConfig_GpsCoordinateFormat_DEC) { // Decimal Degrees
+            if (gpsFormat == meshtastic_Config_DisplayConfig_GpsCoordinateFormat_DEC) { // Decimal Degrees
-                snprintf(coordinateLine, sizeof(coordinateLine), "%f %f", geoCoord.getLatitude() * 1e-7, geoCoord.getLongitude() * 1e-7);
+                snprintf(coordinateLine, sizeof(coordinateLine), "%f %f", geoCoord.getLatitude() * 1e-7,
-            } else if (gpsFormat == Config_DisplayConfig_GpsCoordinateFormat_UTM) { // Universal Transverse Mercator
+                         geoCoord.getLongitude() * 1e-7);
+            } else if (gpsFormat == meshtastic_Config_DisplayConfig_GpsCoordinateFormat_UTM) { // Universal Transverse Mercator
                 snprintf(coordinateLine, sizeof(coordinateLine), "%2i%1c %06u %07u", geoCoord.getUTMZone(), geoCoord.getUTMBand(),
                          geoCoord.getUTMEasting(), geoCoord.getUTMNorthing());
-            } else if (gpsFormat == Config_DisplayConfig_GpsCoordinateFormat_MGRS) { // Military Grid Reference System
+            } else if (gpsFormat == meshtastic_Config_DisplayConfig_GpsCoordinateFormat_MGRS) { // Military Grid Reference System
-                snprintf(coordinateLine, sizeof(coordinateLine), "%2i%1c %1c%1c %05u %05u", geoCoord.getMGRSZone(), geoCoord.getMGRSBand(),
+                snprintf(coordinateLine, sizeof(coordinateLine), "%2i%1c %1c%1c %05u %05u", geoCoord.getMGRSZone(),
-                        geoCoord.getMGRSEast100k(), geoCoord.getMGRSNorth100k(), geoCoord.getMGRSEasting(),
+                         geoCoord.getMGRSBand(), geoCoord.getMGRSEast100k(), geoCoord.getMGRSNorth100k(),
-                        geoCoord.getMGRSNorthing());
+                         geoCoord.getMGRSEasting(), geoCoord.getMGRSNorthing());
-            } else if (gpsFormat == Config_DisplayConfig_GpsCoordinateFormat_OLC) { // Open Location Code
+            } else if (gpsFormat == meshtastic_Config_DisplayConfig_GpsCoordinateFormat_OLC) { // Open Location Code
                 geoCoord.getOLCCode(coordinateLine);
-            } else if (gpsFormat == Config_DisplayConfig_GpsCoordinateFormat_OSGR) { // Ordnance Survey Grid Reference
+            } else if (gpsFormat == meshtastic_Config_DisplayConfig_GpsCoordinateFormat_OSGR) { // Ordnance Survey Grid Reference
                 if (geoCoord.getOSGRE100k() == 'I' || geoCoord.getOSGRN100k() == 'I') // OSGR is only valid around the UK region
                     snprintf(coordinateLine, sizeof(coordinateLine), "%s", "Out of Boundary");
                 else
-                    snprintf(coordinateLine, sizeof(coordinateLine), "%1c%1c %05u %05u", geoCoord.getOSGRE100k(), geoCoord.getOSGRN100k(),
+                    snprintf(coordinateLine, sizeof(coordinateLine), "%1c%1c %05u %05u", geoCoord.getOSGRE100k(),
-                            geoCoord.getOSGREasting(), geoCoord.getOSGRNorthing());
+                             geoCoord.getOSGRN100k(), geoCoord.getOSGREasting(), geoCoord.getOSGRNorthing());
             }
 
             // If fixed position, display text "Fixed GPS" alternating with the coordinates.
@@ -619,10 +619,10 @@ static void drawGPScoordinates(OLEDDisplay *display, int16_t x, int16_t y, const
         } else {
             char latLine[22];
             char lonLine[22];
-            snprintf(latLine, sizeof(latLine), "%2i° %2i' %2u\" %1c", geoCoord.getDMSLatDeg(), geoCoord.getDMSLatMin(), geoCoord.getDMSLatSec(),
+            snprintf(latLine, sizeof(latLine), "%2i° %2i' %2u\" %1c", geoCoord.getDMSLatDeg(), geoCoord.getDMSLatMin(),
-                    geoCoord.getDMSLatCP());
+                     geoCoord.getDMSLatSec(), geoCoord.getDMSLatCP());
-            snprintf(lonLine, sizeof(lonLine), "%3i° %2i' %2u\" %1c", geoCoord.getDMSLonDeg(), geoCoord.getDMSLonMin(), geoCoord.getDMSLonSec(),
+            snprintf(lonLine, sizeof(lonLine), "%3i° %2i' %2u\" %1c", geoCoord.getDMSLonDeg(), geoCoord.getDMSLonMin(),
-                    geoCoord.getDMSLonCP());
+                     geoCoord.getDMSLonSec(), geoCoord.getDMSLonCP());
             display->drawString(x + (SCREEN_WIDTH - (display->getStringWidth(latLine))) / 2, y - FONT_HEIGHT_SMALL * 1, latLine);
             display->drawString(x + (SCREEN_WIDTH - (display->getStringWidth(lonLine))) / 2, y, lonLine);
         }
@@ -704,7 +704,7 @@ static float estimatedHeading(double lat, double lon)
 
 /// Sometimes we will have Position objects that only have a time, so check for
 /// valid lat/lon
-static bool hasPosition(NodeInfo *n)
+static bool hasPosition(meshtastic_NodeInfo *n)
 {
     return n->has_position && (n->position.latitude_i != 0 || n->position.longitude_i != 0);
 }
@@ -714,7 +714,7 @@ static uint16_t getCompassDiam(OLEDDisplay *display)
     uint16_t diam = 0;
     uint16_t offset = 0;
 
-    if (config.display.displaymode != Config_DisplayConfig_DisplayMode_DEFAULT)
+    if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_DEFAULT)
         offset = FONT_HEIGHT_SMALL;
 
     // get the smaller of the 2 dimensions and subtract 20
@@ -791,7 +791,7 @@ static void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_
         prevFrame = state->currentFrame;
 
         nodeIndex = (nodeIndex + 1) % nodeDB.getNumNodes();
-        NodeInfo *n = nodeDB.getNodeByIndex(nodeIndex);
+        meshtastic_NodeInfo *n = nodeDB.getNodeByIndex(nodeIndex);
         if (n->num == nodeDB.getNodeNum()) {
             // Don't show our node, just skip to next
             nodeIndex = (nodeIndex + 1) % nodeDB.getNumNodes();
@@ -800,14 +800,14 @@ static void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_
         displayedNodeNum = n->num;
     }
 
-    NodeInfo *node = nodeDB.getNodeByIndex(nodeIndex);
+    meshtastic_NodeInfo *node = nodeDB.getNodeByIndex(nodeIndex);
 
     display->setFont(FONT_SMALL);
 
     // The coordinates define the left starting point of the text
     display->setTextAlignment(TEXT_ALIGN_LEFT);
 
-    if (config.display.displaymode == Config_DisplayConfig_DisplayMode_INVERTED) {
+    if (config.display.displaymode == meshtastic_Config_DisplayConfig_DisplayMode_INVERTED) {
         display->fillRect(0 + x, 0 + y, x + display->getWidth(), y + FONT_HEIGHT_SMALL);
     }
 
@@ -837,12 +837,12 @@ static void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_
 
     static char distStr[20];
     strncpy(distStr, "? km", sizeof(distStr)); // might not have location data
-    NodeInfo *ourNode = nodeDB.getNode(nodeDB.getNodeNum());
+    meshtastic_NodeInfo *ourNode = nodeDB.getNode(nodeDB.getNodeNum());
     const char *fields[] = {username, distStr, signalStr, lastStr, NULL};
     int16_t compassX = 0, compassY = 0;
 
     // coordinates for the center of the compass/circle
-    if (config.display.displaymode == Config_DisplayConfig_DisplayMode_DEFAULT) {
+    if (config.display.displaymode == meshtastic_Config_DisplayConfig_DisplayMode_DEFAULT) {
         compassX = x + SCREEN_WIDTH - getCompassDiam(display) / 2 - 5;
         compassY = y + SCREEN_HEIGHT / 2;
     } else {
@@ -852,18 +852,18 @@ static void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_
     bool hasNodeHeading = false;
 
     if (ourNode && hasPosition(ourNode)) {
-        Position &op = ourNode->position;
+        meshtastic_Position &op = ourNode->position;
         float myHeading = estimatedHeading(DegD(op.latitude_i), DegD(op.longitude_i));
         drawCompassNorth(display, compassX, compassY, myHeading);
 
         if (hasPosition(node)) {
             // display direction toward node
             hasNodeHeading = true;
-            Position &p = node->position;
+            meshtastic_Position &p = node->position;
             float d =
                 GeoCoord::latLongToMeter(DegD(p.latitude_i), DegD(p.longitude_i), DegD(op.latitude_i), DegD(op.longitude_i));
 
-            if (config.display.units == Config_DisplayConfig_DisplayUnits_IMPERIAL) {
+            if (config.display.units == meshtastic_Config_DisplayConfig_DisplayUnits_IMPERIAL) {
                 if (d < (2 * MILES_TO_FEET))
                     snprintf(distStr, sizeof(distStr), "%.0f ft", d * METERS_TO_FEET);
                 else
@@ -892,7 +892,7 @@ static void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_
     }
     display->drawCircle(compassX, compassY, getCompassDiam(display) / 2);
 
-    if (config.display.displaymode == Config_DisplayConfig_DisplayMode_INVERTED) {
+    if (config.display.displaymode == meshtastic_Config_DisplayConfig_DisplayMode_INVERTED) {
         display->setColor(BLACK);
     }
     // Must be after distStr is populated
@@ -913,7 +913,11 @@ static void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_
 //     }
 // }
 // #else
-Screen::Screen(uint8_t address, int sda, int scl) : OSThread("Screen"), cmdQueue(32), dispdev(address, sda, scl), ui(&dispdev)
+Screen::Screen(uint8_t address, int sda, int scl)
+    : OSThread("Screen"), cmdQueue(32),
+      dispdev(address, sda, scl,
+              screen_model == meshtastic_Config_DisplayConfig_OledType_OLED_SH1107 ? GEOMETRY_128_128 : GEOMETRY_128_64),
+      ui(&dispdev)
 {
     address_found = address;
     cmdQueue.setReader(this);
@@ -963,6 +967,8 @@ void Screen::setup()
     useDisplay = true;
 
 #ifdef AutoOLEDWire_h
+    if (screen_model == meshtastic_Config_DisplayConfig_OledType_OLED_SH1107)
+        screen_model = meshtastic_Config_DisplayConfig_OledType_OLED_SH1106;
     dispdev.setDetected(screen_model);
 #endif
 
@@ -1005,8 +1011,8 @@ void Screen::setup()
 #ifdef SCREEN_MIRROR
     dispdev.mirrorScreen();
 #else
-    // Standard behaviour is to FLIP the screen (needed on T-Beam). If this config item is set, unflip it, and thereby logically flip it.
+    // Standard behaviour is to FLIP the screen (needed on T-Beam). If this config item is set, unflip it, and thereby logically
-    // If you have a headache now, you're welcome.
+    // flip it. If you have a headache now, you're welcome.
     if (!config.display.flip_screen) {
         dispdev.flipScreenVertically();
     }
@@ -1084,7 +1090,7 @@ int32_t Screen::runOnce()
     }
 
 #ifndef DISABLE_WELCOME_UNSET
-    if (showingNormalScreen && config.lora.region == Config_LoRaConfig_RegionCode_UNSET) {
+    if (showingNormalScreen && config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_UNSET) {
         setWelcomeFrames();
     }
 #endif
@@ -1404,7 +1410,7 @@ void DebugInfo::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
     // The coordinates define the left starting point of the text
     display->setTextAlignment(TEXT_ALIGN_LEFT);
 
-    if (config.display.displaymode == Config_DisplayConfig_DisplayMode_INVERTED) {
+    if (config.display.displaymode == meshtastic_Config_DisplayConfig_DisplayMode_INVERTED) {
         display->fillRect(0 + x, 0 + y, x + display->getWidth(), y + FONT_HEIGHT_SMALL);
         display->setColor(BLACK);
     }
@@ -1418,20 +1424,20 @@ void DebugInfo::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
 
     // Display power status
     if (powerStatus->getHasBattery()) {
-        if (config.display.displaymode == Config_DisplayConfig_DisplayMode_DEFAULT) {
+        if (config.display.displaymode == meshtastic_Config_DisplayConfig_DisplayMode_DEFAULT) {
             drawBattery(display, x, y + 2, imgBattery, powerStatus);
         } else {
             drawBattery(display, x + 1, y + 3, imgBattery, powerStatus);
         }
     } else if (powerStatus->knowsUSB()) {
-        if (config.display.displaymode == Config_DisplayConfig_DisplayMode_DEFAULT) {
+        if (config.display.displaymode == meshtastic_Config_DisplayConfig_DisplayMode_DEFAULT) {
             display->drawFastImage(x, y + 2, 16, 8, powerStatus->getHasUSB() ? imgUSB : imgPower);
         } else {
             display->drawFastImage(x + 1, y + 3, 16, 8, powerStatus->getHasUSB() ? imgUSB : imgPower);
         }
     }
     // Display nodes status
-    if (config.display.displaymode == Config_DisplayConfig_DisplayMode_DEFAULT) {
+    if (config.display.displaymode == meshtastic_Config_DisplayConfig_DisplayMode_DEFAULT) {
         drawNodes(display, x + (SCREEN_WIDTH * 0.25), y + 2, nodeStatus);
     } else {
         drawNodes(display, x + (SCREEN_WIDTH * 0.25), y + 3, nodeStatus);
@@ -1444,7 +1450,7 @@ void DebugInfo::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
 #endif
         drawGPSpowerstat(display, x, yPos, gpsStatus);
     } else {
-        if (config.display.displaymode == Config_DisplayConfig_DisplayMode_DEFAULT) {
+        if (config.display.displaymode == meshtastic_Config_DisplayConfig_DisplayMode_DEFAULT) {
             drawGPS(display, x + (SCREEN_WIDTH * 0.63), y + 2, gpsStatus);
         } else {
             drawGPS(display, x + (SCREEN_WIDTH * 0.63), y + 3, gpsStatus);
@@ -1457,26 +1463,35 @@ void DebugInfo::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
     // Draw our hardware ID to assist with bluetooth pairing. Either prefix with Info or S&F Logo
     if (moduleConfig.store_forward.enabled) {
 #ifdef ARCH_ESP32
-        if (millis() - storeForwardModule->lastHeartbeat > (storeForwardModule->heartbeatInterval * 1200)) { //no heartbeat, overlap a bit
+        if (millis() - storeForwardModule->lastHeartbeat >
+            (storeForwardModule->heartbeatInterval * 1200)) { // no heartbeat, overlap a bit
 #if defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS)
-            display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(ourId), y + 3 + FONT_HEIGHT_SMALL, 12, 8, imgQuestionL1);
+            display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(ourId), y + 3 + FONT_HEIGHT_SMALL, 12, 8,
-            display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(ourId), y + 11 + FONT_HEIGHT_SMALL, 12, 8, imgQuestionL2);
+                                   imgQuestionL1);
+            display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(ourId), y + 11 + FONT_HEIGHT_SMALL, 12, 8,
+                                   imgQuestionL2);
 #else
-            display->drawFastImage(x + SCREEN_WIDTH - 10 - display->getStringWidth(ourId), y + 2 + FONT_HEIGHT_SMALL, 8, 8, imgQuestion);
+            display->drawFastImage(x + SCREEN_WIDTH - 10 - display->getStringWidth(ourId), y + 2 + FONT_HEIGHT_SMALL, 8, 8,
+                                   imgQuestion);
 #endif
         } else {
 #if defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS)
-            display->drawFastImage(x + SCREEN_WIDTH - 18 - display->getStringWidth(ourId), y + 3 + FONT_HEIGHT_SMALL, 16, 8, imgSFL1);
+            display->drawFastImage(x + SCREEN_WIDTH - 18 - display->getStringWidth(ourId), y + 3 + FONT_HEIGHT_SMALL, 16, 8,
-            display->drawFastImage(x + SCREEN_WIDTH - 18 - display->getStringWidth(ourId), y + 11 + FONT_HEIGHT_SMALL, 16, 8, imgSFL2);
+                                   imgSFL1);
+            display->drawFastImage(x + SCREEN_WIDTH - 18 - display->getStringWidth(ourId), y + 11 + FONT_HEIGHT_SMALL, 16, 8,
+                                   imgSFL2);
 #else
-            display->drawFastImage(x + SCREEN_WIDTH - 13 - display->getStringWidth(ourId), y + 2 + FONT_HEIGHT_SMALL, 11, 8, imgSF);
+            display->drawFastImage(x + SCREEN_WIDTH - 13 - display->getStringWidth(ourId), y + 2 + FONT_HEIGHT_SMALL, 11, 8,
+                                   imgSF);
 #endif
         }
 #endif
     } else {
 #if defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS)
-        display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(ourId), y + 3 + FONT_HEIGHT_SMALL, 12, 8, imgInfoL1);
+        display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(ourId), y + 3 + FONT_HEIGHT_SMALL, 12, 8,
-        display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(ourId), y + 11 + FONT_HEIGHT_SMALL, 12, 8, imgInfoL2);
+                               imgInfoL1);
+        display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(ourId), y + 11 + FONT_HEIGHT_SMALL, 12, 8,
+                               imgInfoL2);
 #else
         display->drawFastImage(x + SCREEN_WIDTH - 10 - display->getStringWidth(ourId), y + 2 + FONT_HEIGHT_SMALL, 8, 8, imgInfo);
 #endif
@@ -1508,7 +1523,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 (config.display.displaymode == Config_DisplayConfig_DisplayMode_INVERTED) {
+    if (config.display.displaymode == meshtastic_Config_DisplayConfig_DisplayMode_INVERTED) {
         display->fillRect(0 + x, 0 + y, x + display->getWidth(), y + FONT_HEIGHT_SMALL);
         display->setColor(BLACK);
     }
@@ -1640,7 +1655,7 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
     // The coordinates define the left starting point of the text
     display->setTextAlignment(TEXT_ALIGN_LEFT);
 
-    if (config.display.displaymode == Config_DisplayConfig_DisplayMode_INVERTED) {
+    if (config.display.displaymode == meshtastic_Config_DisplayConfig_DisplayMode_INVERTED) {
         display->fillRect(0 + x, 0 + y, x + display->getWidth(), y + FONT_HEIGHT_SMALL);
         display->setColor(BLACK);
     }
@@ -1667,25 +1682,25 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
     auto mode = "";
 
     switch (config.lora.modem_preset) {
-    case Config_LoRaConfig_ModemPreset_SHORT_SLOW:
+    case meshtastic_Config_LoRaConfig_ModemPreset_SHORT_SLOW:
         mode = "ShortS";
         break;
-    case Config_LoRaConfig_ModemPreset_SHORT_FAST:
+    case meshtastic_Config_LoRaConfig_ModemPreset_SHORT_FAST:
         mode = "ShortF";
         break;
-    case Config_LoRaConfig_ModemPreset_MEDIUM_SLOW:
+    case meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_SLOW:
         mode = "MedS";
         break;
-    case Config_LoRaConfig_ModemPreset_MEDIUM_FAST:
+    case meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST:
         mode = "MedF";
         break;
-    case Config_LoRaConfig_ModemPreset_LONG_SLOW:
+    case meshtastic_Config_LoRaConfig_ModemPreset_LONG_SLOW:
         mode = "LongS";
         break;
-    case Config_LoRaConfig_ModemPreset_LONG_FAST:
+    case meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST:
         mode = "LongF";
         break;
-    case Config_LoRaConfig_ModemPreset_VERY_LONG_SLOW:
+    case meshtastic_Config_LoRaConfig_ModemPreset_VERY_LONG_SLOW:
         mode = "VeryL";
         break;
     default:
@@ -1748,7 +1763,7 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
     if (config.position.gps_enabled) {
         // Line 3
         if (config.display.gps_format !=
-        Config_DisplayConfig_GpsCoordinateFormat_DMS) // if DMS then don't draw altitude
+            meshtastic_Config_DisplayConfig_GpsCoordinateFormat_DMS) // if DMS then don't draw altitude
             drawGPSAltitude(display, x, y + FONT_HEIGHT_SMALL * 2, gpsStatus);
 
         // Line 4
@@ -1796,7 +1811,7 @@ int Screen::handleStatusUpdate(const meshtastic::Status *arg)
     return 0;
 }
 
-int Screen::handleTextMessage(const MeshPacket *packet)
+int Screen::handleTextMessage(const meshtastic_MeshPacket *packet)
 {
     if (showingNormalScreen) {
         setFrames(); // Regen the list of screens (will show new text message)

src/graphics/Screen.h

@@ -23,7 +23,7 @@ class Screen
     void startRebootScreen() {}
     void startFirmwareUpdateScreen() {}
 };
-}
+} // namespace graphics
 
 #else
 #include <cstring>
@@ -34,7 +34,7 @@ class Screen
 
 #ifdef USE_ST7567
 #include <ST7567Wire.h>
-#elif defined(USE_SH1106)
+#elif defined(USE_SH1106) || defined(USE_SH1107)
 #include <SH1106Wire.h>
 #elif defined(USE_SSD1306)
 #include <SSD1306Wire.h>
@@ -49,9 +49,9 @@ class Screen
 #include "commands.h"
 #include "concurrency/LockGuard.h"
 #include "concurrency/OSThread.h"
+#include "mesh/MeshModule.h"
 #include "power.h"
 #include <string>
-#include "mesh/MeshModule.h"
 
 // 0 to 255, though particular variants might define different defaults
 #ifndef BRIGHTNESS_DEFAULT
@@ -110,8 +110,8 @@ class Screen : public concurrency::OSThread
         CallbackObserver<Screen, const meshtastic::Status *>(this, &Screen::handleStatusUpdate);
     CallbackObserver<Screen, const meshtastic::Status *> nodeStatusObserver =
         CallbackObserver<Screen, const meshtastic::Status *>(this, &Screen::handleStatusUpdate);
-    CallbackObserver<Screen, const MeshPacket *> textMessageObserver =
+    CallbackObserver<Screen, const meshtastic_MeshPacket *> textMessageObserver =
-        CallbackObserver<Screen, const MeshPacket *>(this, &Screen::handleTextMessage);
+        CallbackObserver<Screen, const meshtastic_MeshPacket *>(this, &Screen::handleTextMessage);
     CallbackObserver<Screen, const UIFrameEvent *> uiFrameEventObserver =
         CallbackObserver<Screen, const UIFrameEvent *>(this, &Screen::handleUIFrameEvent);
 
@@ -132,7 +132,8 @@ 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});
     }
@@ -232,18 +233,22 @@ class Screen : public concurrency::OSThread
             return (uint8_t)(ch | 0xC0);
         }
         // map UTF-8 cyrillic chars to it Windows-1251 (CP-1251) ASCII codes
-            // note: in this case we must use compatible font - provided ArialMT_Plain_10/16/24 by 'ThingPulse/esp8266-oled-ssd1306' library
+        // note: in this case we must use compatible font - provided ArialMT_Plain_10/16/24 by 'ThingPulse/esp8266-oled-ssd1306'
-            // have empty chars for non-latin ASCII symbols
+        // library have empty chars for non-latin ASCII symbols
         case 0xD0: {
             SKIPREST = false;
-                if (ch == 129) return (uint8_t)(168); // Ё
+            if (ch == 129)
-                if (ch > 143 && ch < 192) return (uint8_t)(ch + 48);
+                return (uint8_t)(168); // Ё
+            if (ch > 143 && ch < 192)
+                return (uint8_t)(ch + 48);
             break;
         }
         case 0xD1: {
             SKIPREST = false;
-                if (ch == 145) return (uint8_t)(184); // ё
+            if (ch == 145)
-                if (ch > 127 && ch < 144) return (uint8_t)(ch + 112);
+                return (uint8_t)(184); // ё
+            if (ch > 127 && ch < 144)
+                return (uint8_t)(ch + 112);
             break;
         }
         }
@@ -268,7 +273,7 @@ class Screen : public concurrency::OSThread
     DebugInfo *debug_info() { return &debugInfo; }
 
     int handleStatusUpdate(const meshtastic::Status *arg);
-    int handleTextMessage(const MeshPacket *arg);
+    int handleTextMessage(const meshtastic_MeshPacket *arg);
     int handleUIFrameEvent(const UIFrameEvent *arg);
 
     /// Used to force (super slow) eink displays to draw critical frames
@@ -342,10 +347,7 @@ class Screen : public concurrency::OSThread
 
     /// Display device
 
-// #ifdef RAK4630
+#if defined(USE_SH1106) || defined(USE_SH1107)
-//     EInkDisplay dispdev;
-//     AutoOLEDWire dispdev_oled;
-#ifdef USE_SH1106
     SH1106Wire dispdev;
 #elif defined(USE_SSD1306)
     SSD1306Wire dispdev;

src/graphics/TFTDisplay.cpp

@@ -8,7 +8,7 @@
 
 static TFT_eSPI tft = TFT_eSPI(); // Invoke library, pins defined in User_Setup.h
 
-TFTDisplay::TFTDisplay(uint8_t address, int sda, int scl)
+TFTDisplay::TFTDisplay(uint8_t address, int sda, int scl, uint8_t screen_model)
 {
 #ifdef SCREEN_ROTATE
     setGeometry(GEOMETRY_RAWMODE, TFT_HEIGHT, TFT_WIDTH);

src/graphics/TFTDisplay.h

@@ -18,7 +18,7 @@ class TFTDisplay : public OLEDDisplay
     /* constructor
     FIXME - the parameters are not used, just a temporary hack to keep working like the old displays
     */
-    TFTDisplay(uint8_t address, int sda, int scl);
+    TFTDisplay(uint8_t address, int sda, int scl, uint8_t screen_model);
 
     // Write the buffer to the display memory
     virtual void display(void) override;

src/graphics/images.h

@@ -8,7 +8,8 @@ const uint8_t SATELLITE_IMAGE[] PROGMEM = {0x00, 0x08, 0x00, 0x1C, 0x00, 0x0E, 0
 
 const uint8_t imgSatellite[] PROGMEM = {0x70, 0x71, 0x22, 0xFA, 0xFA, 0x22, 0x71, 0x70};
 const uint8_t imgUSB[] PROGMEM = {0x60, 0x60, 0x30, 0x18, 0x18, 0x18, 0x24, 0x42, 0x42, 0x42, 0x42, 0x7E, 0x24, 0x24, 0x24, 0x3C};
-const uint8_t imgPower[] PROGMEM =         { 0x40, 0x40, 0x40, 0x58, 0x48, 0x08, 0x08, 0x08, 0x1C, 0x22, 0x22, 0x41, 0x7F, 0x22, 0x22, 0x22 };
+const uint8_t imgPower[] PROGMEM = {0x40, 0x40, 0x40, 0x58, 0x48, 0x08, 0x08, 0x08,
+                                    0x1C, 0x22, 0x22, 0x41, 0x7F, 0x22, 0x22, 0x22};
 const uint8_t imgUser[] PROGMEM = {0x3C, 0x42, 0x99, 0xA5, 0xA5, 0x99, 0x42, 0x3C};
 const uint8_t imgPositionEmpty[] PROGMEM = {0x20, 0x30, 0x28, 0x24, 0x42, 0xFF};
 const uint8_t imgPositionSolid[] PROGMEM = {0x20, 0x30, 0x38, 0x3C, 0x7E, 0xFF};
@@ -18,8 +19,10 @@ const uint8_t imgQuestionL1[] PROGMEM =        { 0xff, 0x01, 0x01, 0x32, 0x7b, 0
 const uint8_t imgQuestionL2[] PROGMEM = {0x0f, 0x08, 0x08, 0x08, 0x06, 0x0f, 0x0f, 0x06, 0x08, 0x08, 0x08, 0x0f};
 const uint8_t imgInfoL1[] PROGMEM = {0xff, 0x01, 0x01, 0x01, 0x1e, 0x7f, 0x1e, 0x01, 0x01, 0x01, 0x01, 0xff};
 const uint8_t imgInfoL2[] PROGMEM = {0x0f, 0x08, 0x08, 0x08, 0x06, 0x0f, 0x0f, 0x06, 0x08, 0x08, 0x08, 0x0f};
-const uint8_t imgSFL1[] PROGMEM =          { 0xb6, 0x8f, 0x19, 0x11, 0x31, 0xe3, 0xc2, 0x01, 0x01, 0xf9, 0xf9, 0x89, 0x89, 0x89, 0x09, 0xeb};
+const uint8_t imgSFL1[] PROGMEM = {0xb6, 0x8f, 0x19, 0x11, 0x31, 0xe3, 0xc2, 0x01,
-const uint8_t imgSFL2[] PROGMEM =          { 0x0e, 0x09, 0x09, 0x09, 0x09, 0x09, 0x08, 0x08, 0x00, 0x0f, 0x0f, 0x00, 0x08, 0x08, 0x08, 0x0f};
+                                   0x01, 0xf9, 0xf9, 0x89, 0x89, 0x89, 0x09, 0xeb};
+const uint8_t imgSFL2[] PROGMEM = {0x0e, 0x09, 0x09, 0x09, 0x09, 0x09, 0x08, 0x08,
+                                   0x00, 0x0f, 0x0f, 0x00, 0x08, 0x08, 0x08, 0x0f};
 #else
 const uint8_t imgInfo[] PROGMEM = {0xff, 0x81, 0x00, 0xfb, 0xfb, 0x00, 0x81, 0xff};
 const uint8_t imgQuestion[] PROGMEM = {0xbf, 0x41, 0xc0, 0x8b, 0xdb, 0x70, 0xa1, 0xdf};

src/input/InputBroker.cpp

@@ -3,9 +3,7 @@
 
 InputBroker *inputBroker;
 
-InputBroker::InputBroker()
+InputBroker::InputBroker(){};
-{
-};
 
 void InputBroker::registerSource(Observable<const InputEvent *> *source)
 {

src/input/InputBroker.h

@@ -9,8 +9,7 @@ typedef struct _InputEvent {
     char inputEvent;
     char kbchar;
 } InputEvent;
-class InputBroker :
+class InputBroker : public Observable<const InputEvent *>
-    public Observable<const InputEvent *>
 {
     CallbackObserver<InputBroker, const InputEvent *> inputEventObserver =
         CallbackObserver<InputBroker, const InputEvent *>(this, &InputBroker::handleInputEvent);

src/input/RotaryEncoderInterruptBase.cpp

@@ -34,7 +34,7 @@ void RotaryEncoderInterruptBase::init(
 int32_t RotaryEncoderInterruptBase::runOnce()
 {
     InputEvent e;
-    e.inputEvent = ModuleConfig_CannedMessageConfig_InputEventChar_NONE;
+    e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE;
     e.source = this->_originName;
 
     if (this->action == ROTARY_ACTION_PRESSED) {
@@ -48,7 +48,7 @@ int32_t RotaryEncoderInterruptBase::runOnce()
         e.inputEvent = this->_eventCcw;
     }
 
-    if (e.inputEvent != ModuleConfig_CannedMessageConfig_InputEventChar_NONE) {
+    if (e.inputEvent != meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE) {
         this->notifyObservers(&e);
     }
 

src/input/RotaryEncoderInterruptBase.h

@@ -33,8 +33,8 @@ class RotaryEncoderInterruptBase : public Observable<const InputEvent *>, public
   private:
     uint8_t _pinA = 0;
     uint8_t _pinB = 0;
-    char _eventCw = ModuleConfig_CannedMessageConfig_InputEventChar_NONE;
+    char _eventCw = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE;
-    char _eventCcw = ModuleConfig_CannedMessageConfig_InputEventChar_NONE;
+    char _eventCcw = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE;
-    char _eventPressed = ModuleConfig_CannedMessageConfig_InputEventChar_NONE;
+    char _eventPressed = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE;
     const char *_originName;
 };

src/input/RotaryEncoderInterruptImpl1.h

@@ -8,8 +8,7 @@
  *      to your device as you wish, but you always need to have separate event
  *      handlers, thus you need to have a RotaryEncoderInterrupt implementation.
  */
-class RotaryEncoderInterruptImpl1 :
+class RotaryEncoderInterruptImpl1 : public RotaryEncoderInterruptBase
-    public RotaryEncoderInterruptBase
 {
   public:
     RotaryEncoderInterruptImpl1();

src/input/UpDownInterruptBase.cpp

@@ -1,15 +1,12 @@
-#include "configuration.h"
 #include "UpDownInterruptBase.h"
+#include "configuration.h"
 
-UpDownInterruptBase::UpDownInterruptBase(
+UpDownInterruptBase::UpDownInterruptBase(const char *name)
-    const char *name)
 {
     this->_originName = name;
 }
 
-void UpDownInterruptBase::init(
+void UpDownInterruptBase::init(uint8_t pinDown, uint8_t pinUp, uint8_t pinPress, char eventDown, char eventUp, char eventPressed,
-    uint8_t pinDown, uint8_t pinUp, uint8_t pinPress,
-    char eventDown, char eventUp, char eventPressed,
                                void (*onIntDown)(), void (*onIntUp)(), void (*onIntPress)())
 {
     this->_pinDown = pinDown;
@@ -26,8 +23,7 @@ void UpDownInterruptBase::init(
     attachInterrupt(this->_pinDown, onIntDown, RISING);
     attachInterrupt(this->_pinUp, onIntUp, RISING);
 
-    LOG_DEBUG("GPIO initialized (%d, %d, %d)\n",
+    LOG_DEBUG("GPIO initialized (%d, %d, %d)\n", this->_pinDown, this->_pinUp, pinPress);
-        this->_pinDown, this->_pinUp, pinPress);
 }
 
 void UpDownInterruptBase::intPressHandler()

src/input/UpDownInterruptBase.h

@@ -16,8 +16,8 @@ class UpDownInterruptBase : public Observable<const InputEvent *>
   private:
     uint8_t _pinDown = 0;
     uint8_t _pinUp = 0;
-    char _eventDown = ModuleConfig_CannedMessageConfig_InputEventChar_NONE;
+    char _eventDown = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE;
-    char _eventUp = ModuleConfig_CannedMessageConfig_InputEventChar_NONE;
+    char _eventUp = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE;
-    char _eventPressed = ModuleConfig_CannedMessageConfig_InputEventChar_NONE;
+    char _eventPressed = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE;
     const char *_originName;
 };

src/input/UpDownInterruptImpl1.cpp

@@ -17,9 +17,9 @@ void UpDownInterruptImpl1::init()
     uint8_t pinDown = moduleConfig.canned_message.inputbroker_pin_b;
     uint8_t pinPress = moduleConfig.canned_message.inputbroker_pin_press;
 
-    char eventDown = static_cast<char>(ModuleConfig_CannedMessageConfig_InputEventChar_DOWN);
+    char eventDown = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_DOWN);
-    char eventUp = static_cast<char>(ModuleConfig_CannedMessageConfig_InputEventChar_UP);
+    char eventUp = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_UP);
-    char eventPressed = static_cast<char>(ModuleConfig_CannedMessageConfig_InputEventChar_SELECT);
+    char eventPressed = static_cast<char>(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_SELECT);
 
     UpDownInterruptBase::init(pinDown, pinUp, pinPress, eventDown, eventUp, eventPressed, UpDownInterruptImpl1::handleIntDown,
                               UpDownInterruptImpl1::handleIntUp, UpDownInterruptImpl1::handleIntPressed);

src/input/UpDownInterruptImpl1.h

@@ -1,8 +1,7 @@
 #pragma once
 #include "UpDownInterruptBase.h"
 
-class UpDownInterruptImpl1 :
+class UpDownInterruptImpl1 : public UpDownInterruptBase
-    public UpDownInterruptBase
 {
   public:
     UpDownInterruptImpl1();

src/input/cardKbI2cImpl.cpp

@@ -3,15 +3,11 @@
 
 CardKbI2cImpl *cardKbI2cImpl;
 
-CardKbI2cImpl::CardKbI2cImpl() :
+CardKbI2cImpl::CardKbI2cImpl() : KbI2cBase("cardKB") {}
-    KbI2cBase("cardKB")
-{
-}
 
 void CardKbI2cImpl::init()
 {
-    if (cardkb_found != CARDKB_ADDR)
+    if (cardkb_found != CARDKB_ADDR) {
-    {
         disable();
         return;
     }

src/input/cardKbI2cImpl.h

@@ -9,8 +9,7 @@
  *      to your device as you wish, but you always need to have separate event
  *      handlers, thus you need to have a RotaryEncoderInterrupt implementation.
  */
-class CardKbI2cImpl :
+class CardKbI2cImpl : public KbI2cBase
-    public KbI2cBase
 {
   public:
     CardKbI2cImpl();

src/input/kbI2cBase.cpp

@@ -70,35 +70,35 @@ int32_t KbI2cBase::runOnce()
         while (Wire.available()) {
             char c = Wire.read();
             InputEvent e;
-            e.inputEvent = ModuleConfig_CannedMessageConfig_InputEventChar_NONE;
+            e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE;
             e.source = this->_originName;
             switch (c) {
             case 0x1b: // ESC
-                e.inputEvent = ModuleConfig_CannedMessageConfig_InputEventChar_CANCEL;
+                e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_CANCEL;
                 break;
             case 0x08: // Back
-                e.inputEvent = ModuleConfig_CannedMessageConfig_InputEventChar_BACK;
+                e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_BACK;
                 e.kbchar = c;
                 break;
             case 0xb5: // Up
-                e.inputEvent = ModuleConfig_CannedMessageConfig_InputEventChar_UP;
+                e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_UP;
                 break;
             case 0xb6: // Down
-                e.inputEvent = ModuleConfig_CannedMessageConfig_InputEventChar_DOWN;
+                e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_DOWN;
                 break;
             case 0xb4: // Left
-                e.inputEvent = ModuleConfig_CannedMessageConfig_InputEventChar_LEFT;
+                e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_LEFT;
                 e.kbchar = c;
                 break;
             case 0xb7: // Right
-                e.inputEvent = ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT;
+                e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT;
                 e.kbchar = c;
                 break;
             case 0x0d: // Enter
-                e.inputEvent = ModuleConfig_CannedMessageConfig_InputEventChar_SELECT;
+                e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_SELECT;
                 break;
             case 0x00: // nopress
-                e.inputEvent = ModuleConfig_CannedMessageConfig_InputEventChar_NONE;
+                e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE;
                 break;
             default: // all other keys
                 e.inputEvent = ANYKEY;
@@ -106,7 +106,7 @@ int32_t KbI2cBase::runOnce()
                 break;
             }
 
-            if (e.inputEvent != ModuleConfig_CannedMessageConfig_InputEventChar_NONE) {
+            if (e.inputEvent != meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE) {
                 this->notifyObservers(&e);
             }
         }

src/input/kbI2cBase.h

@@ -1,11 +1,9 @@
 #pragma once
 
-#include "SinglePortModule.h" // TODO: what header file to include?
 #include "InputBroker.h"
+#include "SinglePortModule.h" // TODO: what header file to include?
 
-class KbI2cBase :
+class KbI2cBase : public Observable<const InputEvent *>, public concurrency::OSThread
-    public Observable<const InputEvent *>,
-    public concurrency::OSThread
 {
   public:
     explicit KbI2cBase(const char *name);

src/main.cpp

@@ -3,12 +3,12 @@
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "PowerFSM.h"
+#include "ReliableRouter.h"
 #include "airtime.h"
 #include "buzz.h"
 #include "configuration.h"
 #include "error.h"
 #include "power.h"
-#include "ReliableRouter.h"
 // #include "debug.h"
 #include "FSCommon.h"
 #include "RTC.h"
@@ -27,8 +27,8 @@
 #include <Wire.h>
 // #include <driver/rtc_io.h>
 
-#include "mesh/http/WiFiAPClient.h"
 #include "mesh/eth/ethClient.h"
+#include "mesh/http/WiFiAPClient.h"
 
 #ifdef ARCH_ESP32
 #include "mesh/http/WebServer.h"
@@ -87,7 +87,7 @@ uint8_t rtc_found;
 
 // Keystore Chips
 uint8_t keystore_found;
-#ifndef ARCH_PORTDUINO
+#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL)
 ATECCX08A atecc;
 #endif
 
@@ -98,7 +98,8 @@ 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_MAX + 1] = { 0 }; // one is enough, missing elements will be initialized to 0 anyway.
+uint8_t nodeTelemetrySensorsMap[_meshtastic_TelemetrySensorType_MAX + 1] = {
+    0}; // one is enough, missing elements will be initialized to 0 anyway.
 
 Router *router = NULL; // Users of router don't care what sort of subclass implements that API
 
@@ -249,7 +250,6 @@ void setup()
     powerStatus->observe(&power->newStatus);
     power->setup(); // Must be after status handler is installed, so that handler gets notified of the initial configuration
 
-
 #ifdef LILYGO_TBEAM_S3_CORE
     // In T-Beam-S3-core, the I2C device cannot be scanned before power initialization, otherwise the device will be stuck
     // PCF8563 RTC in tbeam-s3 uses Wire1 to share I2C bus
@@ -302,9 +302,13 @@ void setup()
     playStartMelody();
 
     // fixed screen override?
-    if (config.display.oled != Config_DisplayConfig_OledType_OLED_AUTO)
+    if (config.display.oled != meshtastic_Config_DisplayConfig_OledType_OLED_AUTO)
         screen_model = config.display.oled;
 
+#if defined(USE_SH1107)
+    screen_model = Config_DisplayConfig_OledType_OLED_SH1107; // set dimension of 128x128
+#endif
+
     // Init our SPI controller (must be before screen and lora)
     initSPI();
 #ifndef ARCH_ESP32
@@ -337,7 +341,7 @@ void setup()
     // Do this after service.init (because that clears error_code)
 #ifdef HAS_PMU
     if (!pmu_found)
-        RECORD_CRITICALERROR(CriticalErrorCode_NO_AXP192); // Record a hardware fault for missing hardware
+        RECORD_CRITICALERROR(meshtastic_CriticalErrorCode_NO_AXP192); // Record a hardware fault for missing hardware
 #endif
 
         // Don't call screen setup until after nodedb is setup (because we need
@@ -450,9 +454,9 @@ void setup()
 
     // check if the radio chip matches the selected region
 
-if((config.lora.region == Config_LoRaConfig_RegionCode_LORA_24) && (!rIf->wideLora())){
+    if ((config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_LORA_24) && (!rIf->wideLora())) {
         LOG_WARN("Radio chip does not support 2.4GHz LoRa. Reverting to unset.\n");
-    config.lora.region = Config_LoRaConfig_RegionCode_UNSET;
+        config.lora.region = meshtastic_Config_LoRaConfig_RegionCode_UNSET;
         nodeDB.saveToDisk(SEGMENT_CONFIG);
         if (!rIf->reconfigure()) {
             LOG_WARN("Reconfigure failed, rebooting\n");
@@ -486,13 +490,15 @@ if((config.lora.region == Config_LoRaConfig_RegionCode_LORA_24) && (!rIf->wideLo
     airTime = new AirTime();
 
     if (!rIf)
-        RECORD_CRITICALERROR(CriticalErrorCode_NO_RADIO);
+        RECORD_CRITICALERROR(meshtastic_CriticalErrorCode_NO_RADIO);
     else {
         router->addInterface(rIf);
 
         // Calculate and save the bit rate to myNodeInfo
         // TODO: This needs to be added what ever method changes the channel from the phone.
-        myNodeInfo.bitrate = (float(Constants_DATA_PAYLOAD_LEN) / (float(rIf->getPacketTime(Constants_DATA_PAYLOAD_LEN)))) * 1000;
+        myNodeInfo.bitrate =
+            (float(meshtastic_Constants_DATA_PAYLOAD_LEN) / (float(rIf->getPacketTime(meshtastic_Constants_DATA_PAYLOAD_LEN)))) *
+            1000;
         LOG_DEBUG("myNodeInfo.bitrate = %f bytes / sec\n", myNodeInfo.bitrate);
     }
 

src/main.h

@@ -1,11 +1,11 @@
 #pragma once
 
-#include <map>
 #include "GPSStatus.h"
 #include "NodeStatus.h"
 #include "PowerStatus.h"
 #include "graphics/Screen.h"
-#include "mesh/generated/telemetry.pb.h"
+#include "mesh/generated/meshtastic/telemetry.pb.h"
+#include <map>
 #if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL)
 #include <SparkFun_ATECCX08a_Arduino_Library.h>
 #endif
@@ -26,7 +26,7 @@ extern bool isUSBPowered;
 extern ATECCX08A atecc;
 #endif
 
-extern uint8_t nodeTelemetrySensorsMap[_TelemetrySensorType_MAX + 1];
+extern uint8_t nodeTelemetrySensorsMap[_meshtastic_TelemetrySensorType_MAX + 1];
 
 extern int TCPPort; // set by Portduino
 

src/mesh/Channels.cpp

@@ -45,23 +45,23 @@ int16_t Channels::generateHash(ChannelIndex channelNum)
 /**
  * Validate a channel, fixing any errors as needed
  */
-Channel &Channels::fixupChannel(ChannelIndex chIndex)
+meshtastic_Channel &Channels::fixupChannel(ChannelIndex chIndex)
 {
-    Channel &ch = getByIndex(chIndex);
+    meshtastic_Channel &ch = getByIndex(chIndex);
 
     ch.index = chIndex; // Preinit the index so it be ready to share with the phone (we'll never change it later)
 
     if (!ch.has_settings) {
         // No settings! Must disable and skip
-        ch.role = Channel_Role_DISABLED;
+        ch.role = meshtastic_Channel_Role_DISABLED;
         memset(&ch.settings, 0, sizeof(ch.settings));
         ch.has_settings = true;
     } else {
-        ChannelSettings &channelSettings = ch.settings;
+        meshtastic_ChannelSettings &meshtastic_channelSettings = ch.settings;
 
         // Convert the old string "Default" to our new short representation
-        if (strcmp(channelSettings.name, "Default") == 0)
+        if (strcmp(meshtastic_channelSettings.name, "Default") == 0)
-            *channelSettings.name = '\0';
+            *meshtastic_channelSettings.name = '\0';
     }
 
     hashes[chIndex] = generateHash(chIndex);
@@ -74,11 +74,11 @@ Channel &Channels::fixupChannel(ChannelIndex chIndex)
  */
 void Channels::initDefaultChannel(ChannelIndex chIndex)
 {
-    Channel &ch = getByIndex(chIndex);
+    meshtastic_Channel &ch = getByIndex(chIndex);
-    ChannelSettings &channelSettings = ch.settings;
+    meshtastic_ChannelSettings &channelSettings = ch.settings;
-    Config_LoRaConfig &loraConfig = config.lora;
+    meshtastic_Config_LoRaConfig &loraConfig = config.lora;
 
-    loraConfig.modem_preset = Config_LoRaConfig_ModemPreset_LONG_FAST; // Default to Long Range & Fast
+    loraConfig.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST; // Default to Long Range & Fast
     loraConfig.use_preset = true;
     loraConfig.tx_power = 0; // default
     uint8_t defaultpskIndex = 1;
@@ -87,25 +87,25 @@ void Channels::initDefaultChannel(ChannelIndex chIndex)
     strncpy(channelSettings.name, "", sizeof(channelSettings.name));
 
     ch.has_settings = true;
-    ch.role = Channel_Role_PRIMARY;
+    ch.role = meshtastic_Channel_Role_PRIMARY;
 }
 
 CryptoKey Channels::getKey(ChannelIndex chIndex)
 {
-    Channel &ch = getByIndex(chIndex);
+    meshtastic_Channel &ch = getByIndex(chIndex);
-    const ChannelSettings &channelSettings = ch.settings;
+    const meshtastic_ChannelSettings &channelSettings = ch.settings;
     assert(ch.has_settings);
 
     CryptoKey k;
     memset(k.bytes, 0, sizeof(k.bytes)); // In case the user provided a short key, we want to pad the rest with zeros
 
-    if (ch.role == Channel_Role_DISABLED) {
+    if (ch.role == meshtastic_Channel_Role_DISABLED) {
         k.length = -1; // invalid
     } else {
         memcpy(k.bytes, channelSettings.psk.bytes, channelSettings.psk.size);
         k.length = channelSettings.psk.size;
         if (k.length == 0) {
-            if (ch.role == Channel_Role_SECONDARY) {
+            if (ch.role == meshtastic_Channel_Role_SECONDARY) {
                 LOG_DEBUG("Unset PSK for secondary channel %s. using primary key\n", ch.settings.name);
                 k = getKey(primaryIndex);
             } else
@@ -182,24 +182,24 @@ void Channels::onConfigChanged()
 {
     // Make sure the phone hasn't mucked anything up
     for (int i = 0; i < channelFile.channels_count; i++) {
-        Channel &ch = fixupChannel(i);
+        meshtastic_Channel &ch = fixupChannel(i);
 
-        if (ch.role == Channel_Role_PRIMARY)
+        if (ch.role == meshtastic_Channel_Role_PRIMARY)
             primaryIndex = i;
     }
 }
 
-Channel &Channels::getByIndex(ChannelIndex chIndex)
+meshtastic_Channel &Channels::getByIndex(ChannelIndex chIndex)
 {
     // remove this assert cause malformed packets can make our firmware reboot here.
     if (chIndex < channelFile.channels_count) { // This should be equal to MAX_NUM_CHANNELS
-        Channel *ch = channelFile.channels + chIndex;
+        meshtastic_Channel *ch = channelFile.channels + chIndex;
         return *ch;
     } else {
         LOG_ERROR("Invalid channel index %d > %d, malformed packet received?\n", chIndex, channelFile.channels_count);
 
-        static Channel *ch = (Channel *)malloc(sizeof(Channel));
+        static meshtastic_Channel *ch = (meshtastic_Channel *)malloc(sizeof(meshtastic_Channel));
-        memset(ch, 0, sizeof(Channel));
+        memset(ch, 0, sizeof(meshtastic_Channel));
         // ch.index -1 means we don't know the channel locally and need to look it up by settings.name
         // not sure this is handled right everywhere
         ch->index = -1;
@@ -207,7 +207,7 @@ Channel &Channels::getByIndex(ChannelIndex chIndex)
     }
 }
 
-Channel &Channels::getByName(const char* chName)
+meshtastic_Channel &Channels::getByName(const char *chName)
 {
     for (ChannelIndex i = 0; i < getNumChannels(); i++) {
         if (strcasecmp(getGlobalId(i), chName) == 0) {
@@ -218,15 +218,15 @@ Channel &Channels::getByName(const char* chName)
     return getByIndex(getPrimaryIndex());
 }
 
-void Channels::setChannel(const Channel &c)
+void Channels::setChannel(const meshtastic_Channel &c)
 {
-    Channel &old = getByIndex(c.index);
+    meshtastic_Channel &old = getByIndex(c.index);
 
     // if this is the new primary, demote any existing roles
-    if (c.role == Channel_Role_PRIMARY)
+    if (c.role == meshtastic_Channel_Role_PRIMARY)
         for (int i = 0; i < getNumChannels(); i++)
-            if (channelFile.channels[i].role == Channel_Role_PRIMARY)
+            if (channelFile.channels[i].role == meshtastic_Channel_Role_PRIMARY)
-                channelFile.channels[i].role = Channel_Role_SECONDARY;
+                channelFile.channels[i].role = meshtastic_Channel_Role_SECONDARY;
 
     old = c; // slam in the new settings/role
 }
@@ -234,7 +234,7 @@ void Channels::setChannel(const Channel &c)
 const char *Channels::getName(size_t chIndex)
 {
     // Convert the short "" representation for Default into a usable string
-    const ChannelSettings &channelSettings = getByIndex(chIndex).settings;
+    const meshtastic_ChannelSettings &channelSettings = getByIndex(chIndex).settings;
     const char *channelName = channelSettings.name;
     if (!*channelName) { // emptystring
         // Per mesh.proto spec, if bandwidth is specified we must ignore modemPreset enum, we assume that in that case
@@ -242,33 +242,32 @@ const char *Channels::getName(size_t chIndex)
 
         if (config.lora.use_preset) {
             switch (config.lora.modem_preset) {
-            case Config_LoRaConfig_ModemPreset_SHORT_SLOW:
+            case meshtastic_Config_LoRaConfig_ModemPreset_SHORT_SLOW:
                 channelName = "ShortSlow";
                 break;
-            case Config_LoRaConfig_ModemPreset_SHORT_FAST:
+            case meshtastic_Config_LoRaConfig_ModemPreset_SHORT_FAST:
                 channelName = "ShortFast";
                 break;
-            case Config_LoRaConfig_ModemPreset_MEDIUM_SLOW:
+            case meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_SLOW:
                 channelName = "MediumSlow";
                 break;
-            case Config_LoRaConfig_ModemPreset_MEDIUM_FAST:
+            case meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST:
                 channelName = "MediumFast";
                 break;
-            case Config_LoRaConfig_ModemPreset_LONG_SLOW:
+            case meshtastic_Config_LoRaConfig_ModemPreset_LONG_SLOW:
                 channelName = "LongSlow";
                 break;
-            case Config_LoRaConfig_ModemPreset_LONG_FAST:
+            case meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST:
                 channelName = "LongFast";
                 break;
-            case Config_LoRaConfig_ModemPreset_VERY_LONG_SLOW:
+            case meshtastic_Config_LoRaConfig_ModemPreset_VERY_LONG_SLOW:
                 channelName = "VLongSlow";
                 break;
             default:
                 channelName = "Invalid";
                 break;
             }
-        }
+        } else {
-        else {
             channelName = "Custom";
         }
     }

src/mesh/Channels.h

@@ -29,24 +29,23 @@ class Channels
     int16_t hashes[MAX_NUM_CHANNELS] = {};
 
   public:
-
     Channels() {}
 
     /// Well known channel names
     static const char *adminChannel, *gpioChannel, *serialChannel;
 
-    const ChannelSettings &getPrimary() { return getByIndex(getPrimaryIndex()).settings; }
+    const meshtastic_ChannelSettings &getPrimary() { return getByIndex(getPrimaryIndex()).settings; }
 
     /** Return the Channel for a specified index */
-    Channel &getByIndex(ChannelIndex chIndex);
+    meshtastic_Channel &getByIndex(ChannelIndex chIndex);
 
     /** Return the Channel for a specified name, return primary if not found. */
-    Channel &getByName(const char* chName);
+    meshtastic_Channel &getByName(const char *chName);
 
     /** Using the index inside the channel, update the specified channel's settings and role.  If this channel is being promoted
      * to be primary, force all other channels to be secondary.
      */
-    void setChannel(const Channel &c);
+    void setChannel(const meshtastic_Channel &c);
 
     /** Return a human friendly name for this channel (and expand any short strings as needed)
      */
@@ -125,7 +124,7 @@ class Channels
     /**
      * Validate a channel, fixing any errors as needed
      */
-    Channel &fixupChannel(ChannelIndex chIndex);
+    meshtastic_Channel &fixupChannel(ChannelIndex chIndex);
 
     /**
      * Write a default channel to the specified channel index

src/mesh/CryptoEngine.cpp

@@ -1,5 +1,5 @@
-#include "configuration.h"
 #include "CryptoEngine.h"
+#include "configuration.h"
 
 void CryptoEngine::setKey(const CryptoKey &k)
 {

src/mesh/FloodingRouter.cpp

@@ -9,7 +9,7 @@ FloodingRouter::FloodingRouter() {}
  * later free() the packet to pool.  This routine is not allowed to stall.
  * If the txmit queue is full it might return an error
  */
-ErrorCode FloodingRouter::send(MeshPacket *p)
+ErrorCode FloodingRouter::send(meshtastic_MeshPacket *p)
 {
     // Add any messages _we_ send to the seen message list (so we will ignore all retransmissions we see)
     wasSeenRecently(p); // FIXME, move this to a sniffSent method
@@ -17,7 +17,7 @@ ErrorCode FloodingRouter::send(MeshPacket *p)
     return Router::send(p);
 }
 
-bool FloodingRouter::shouldFilterReceived(const MeshPacket *p)
+bool FloodingRouter::shouldFilterReceived(const meshtastic_MeshPacket *p)
 {
     if (wasSeenRecently(p)) { // Note: this will also add a recent packet record
         printPacket("Ignoring incoming msg, because we've already seen it", p);
@@ -27,9 +27,10 @@ bool FloodingRouter::shouldFilterReceived(const MeshPacket *p)
     return Router::shouldFilterReceived(p);
 }
 
-void FloodingRouter::sniffReceived(const MeshPacket *p, const Routing *c)
+void FloodingRouter::sniffReceived(const meshtastic_MeshPacket *p, const meshtastic_Routing *c)
 {
-    bool isAck = ((c && c->error_reason == Routing_Error_NONE)); // consider only ROUTING_APP message without error as ACK
+    bool isAck =
+        ((c && c->error_reason == meshtastic_Routing_Error_NONE)); // consider only ROUTING_APP message without error as ACK
     if (isAck && p->to != getNodeNum()) {
         // do not flood direct message that is ACKed
         LOG_DEBUG("Receiving an ACK not for me, but don't need to rebroadcast this direct message anymore.\n");
@@ -37,13 +38,13 @@ void FloodingRouter::sniffReceived(const MeshPacket *p, const Routing *c)
     }
     if ((p->to != getNodeNum()) && (p->hop_limit > 0) && (getFrom(p) != getNodeNum())) {
         if (p->id != 0) {
-            if (config.device.role != Config_DeviceConfig_Role_CLIENT_MUTE) {
+            if (config.device.role != meshtastic_Config_DeviceConfig_Role_CLIENT_MUTE) {
-                MeshPacket *tosend = packetPool.allocCopy(*p); // keep a copy because we will be sending it
+                meshtastic_MeshPacket *tosend = packetPool.allocCopy(*p); // keep a copy because we will be sending it
 
                 tosend->hop_limit--; // bump down the hop count
 
                 // If it is a traceRoute request, update the route that it went via me
-                if (p->which_payload_variant == MeshPacket_decoded_tag && traceRouteModule->wantPacket(p)) {
+                if (p->which_payload_variant == meshtastic_MeshPacket_decoded_tag && traceRouteModule->wantPacket(p)) {
                     traceRouteModule->updateRoute(tosend);
                 }
 

src/mesh/FloodingRouter.h

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

src/mesh/InterfacesTemplates.cpp

@@ -1,9 +1,9 @@
-#include "SX126xInterface.h"
 #include "SX126xInterface.cpp"
-#include "SX128xInterface.h"
+#include "SX126xInterface.h"
 #include "SX128xInterface.cpp"
-#include "api/ServerAPI.h"
+#include "SX128xInterface.h"
 #include "api/ServerAPI.cpp"
+#include "api/ServerAPI.h"
 
 // We need this declaration for proper linking in derived classes
 template class SX126xInterface<SX1262>;

src/mesh/LLCC68Interface.cpp

@@ -1,5 +1,5 @@
-#include "configuration.h"
 #include "LLCC68Interface.h"
+#include "configuration.h"
 #include "error.h"
 
 LLCC68Interface::LLCC68Interface(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, RADIOLIB_PIN_TYPE busy,

src/mesh/MeshModule.cpp

@@ -1,20 +1,20 @@
-#include "configuration.h"
 #include "MeshModule.h"
 #include "Channels.h"
 #include "MeshService.h"
 #include "NodeDB.h"
+#include "configuration.h"
 #include "modules/RoutingModule.h"
 #include <assert.h>
 
 std::vector<MeshModule *> *MeshModule::modules;
 
-const MeshPacket *MeshModule::currentRequest;
+const meshtastic_MeshPacket *MeshModule::currentRequest;
 
 /**
  * If any of the current chain of modules has already sent a reply, it will be here.  This is useful to allow
  * the RoutingPlugin to avoid sending redundant acks
  */
-MeshPacket *MeshModule::currentReply;
+meshtastic_MeshPacket *MeshModule::currentReply;
 
 MeshModule::MeshModule(const char *_name) : name(_name)
 {
@@ -32,21 +32,22 @@ MeshModule::~MeshModule()
     assert(0); // FIXME - remove from list of modules once someone needs this feature
 }
 
-MeshPacket *MeshModule::allocAckNak(Routing_Error err, NodeNum to, PacketId idFrom, ChannelIndex chIndex)
+meshtastic_MeshPacket *MeshModule::allocAckNak(meshtastic_Routing_Error err, NodeNum to, PacketId idFrom, ChannelIndex chIndex)
 {
-    Routing c = Routing_init_default;
+    meshtastic_Routing c = meshtastic_Routing_init_default;
 
     c.error_reason = err;
-    c.which_variant = Routing_error_reason_tag;
+    c.which_variant = meshtastic_Routing_error_reason_tag;
 
     // Now that we have moded sendAckNak up one level into the class heirarchy we can no longer assume we are a RoutingPlugin
     // So we manually call pb_encode_to_bytes and specify routing port number
     // auto p = allocDataProtobuf(c);
-    MeshPacket *p = router->allocForSending();
+    meshtastic_MeshPacket *p = router->allocForSending();
-    p->decoded.portnum = PortNum_ROUTING_APP;
+    p->decoded.portnum = meshtastic_PortNum_ROUTING_APP;
-    p->decoded.payload.size = pb_encode_to_bytes(p->decoded.payload.bytes, sizeof(p->decoded.payload.bytes), &Routing_msg, &c);
+    p->decoded.payload.size =
+        pb_encode_to_bytes(p->decoded.payload.bytes, sizeof(p->decoded.payload.bytes), &meshtastic_Routing_msg, &c);
 
-    p->priority = MeshPacket_Priority_ACK;
+    p->priority = meshtastic_MeshPacket_Priority_ACK;
 
     p->hop_limit = config.lora.hop_limit; // Flood ACK back to original sender
     p->to = to;
@@ -57,7 +58,7 @@ MeshPacket *MeshModule::allocAckNak(Routing_Error err, NodeNum to, PacketId idFr
     return p;
 }
 
-MeshPacket *MeshModule::allocErrorResponse(Routing_Error err, const MeshPacket *p)
+meshtastic_MeshPacket *MeshModule::allocErrorResponse(meshtastic_Routing_Error err, const meshtastic_MeshPacket *p)
 {
     auto r = allocAckNak(err, getFrom(p), p->id, p->channel);
 
@@ -66,13 +67,13 @@ MeshPacket *MeshModule::allocErrorResponse(Routing_Error err, const MeshPacket *
     return r;
 }
 
-void MeshModule::callPlugins(const MeshPacket &mp, RxSource src)
+void MeshModule::callPlugins(const meshtastic_MeshPacket &mp, RxSource src)
 {
     // LOG_DEBUG("In call modules\n");
     bool moduleFound = false;
 
     // We now allow **encrypted** packets to pass through the modules
-    bool isDecoded = mp.which_payload_variant == MeshPacket_decoded_tag;
+    bool isDecoded = mp.which_payload_variant == meshtastic_MeshPacket_decoded_tag;
 
     currentReply = NULL; // No reply yet
 
@@ -101,13 +102,13 @@ void MeshModule::callPlugins(const MeshPacket &mp, RxSource src)
             moduleFound = true;
 
             /// received channel (or NULL if not decoded)
-            Channel *ch = isDecoded ? &channels.getByIndex(mp.channel) : NULL;
+            meshtastic_Channel *ch = isDecoded ? &channels.getByIndex(mp.channel) : NULL;
 
             /// Is the channel this packet arrived on acceptable? (security check)
             /// Note: we can't know channel names for encrypted packets, so those are NEVER sent to boundChannel modules
 
-            /// Also: if a packet comes in on the local PC interface, we don't check for bound channels, because it is TRUSTED and it needs to
+            /// Also: if a packet comes in on the local PC interface, we don't check for bound channels, because it is TRUSTED and
-            /// to be able to fetch the initial admin packets without yet knowing any channels.
+            /// it needs to to be able to fetch the initial admin packets without yet knowing any channels.
 
             bool rxChannelOk = !pi.boundChannel || (mp.from == 0) || (strcasecmp(ch->settings.name, pi.boundChannel) == 0);
 
@@ -117,7 +118,7 @@ void MeshModule::callPlugins(const MeshPacket &mp, RxSource src)
 
                 if (mp.decoded.want_response) {
                     printPacket("packet on wrong channel, returning error", &mp);
-                    currentReply = pi.allocErrorResponse(Routing_Error_NOT_AUTHORIZED, &mp);
+                    currentReply = pi.allocErrorResponse(meshtastic_Routing_Error_NOT_AUTHORIZED, &mp);
                 } else
                     printPacket("packet on wrong channel, but can't respond", &mp);
             } else {
@@ -170,17 +171,16 @@ void MeshModule::callPlugins(const MeshPacket &mp, RxSource src)
             // SECURITY NOTE! I considered sending back a different error code if we didn't find the psk (i.e. !isDecoded)
             // but opted NOT TO.  Because it is not a good idea to let remote nodes 'probe' to find out which PSKs were "good" vs
             // bad.
-            routingModule->sendAckNak(Routing_Error_NO_RESPONSE, getFrom(&mp), mp.id, mp.channel);
+            routingModule->sendAckNak(meshtastic_Routing_Error_NO_RESPONSE, getFrom(&mp), mp.id, mp.channel);
         }
     }
 
     if (!moduleFound)
-        LOG_DEBUG("No modules interested in portnum=%d, src=%s\n",
+        LOG_DEBUG("No modules interested in portnum=%d, src=%s\n", mp.decoded.portnum,
-                    mp.decoded.portnum,
                   (src == RX_SRC_LOCAL) ? "LOCAL" : "REMOTE");
 }
 
-MeshPacket *MeshModule::allocReply()
+meshtastic_MeshPacket *MeshModule::allocReply()
 {
     auto r = myReply;
     myReply = NULL; // Only use each reply once
@@ -191,7 +191,7 @@ MeshPacket *MeshModule::allocReply()
  * so that subclasses can (optionally) send a response back to the original sender.  Implementing this method
  * is optional
  */
-void MeshModule::sendResponse(const MeshPacket &req)
+void MeshModule::sendResponse(const meshtastic_MeshPacket &req)
 {
     auto r = allocReply();
     if (r) {
@@ -206,16 +206,16 @@ void MeshModule::sendResponse(const MeshPacket &req)
 /** set the destination and packet parameters of packet p intended as a reply to a particular "to" packet
  * This ensures that if the request packet was sent reliably, the reply is sent that way as well.
  */
-void setReplyTo(MeshPacket *p, const MeshPacket &to)
+void setReplyTo(meshtastic_MeshPacket *p, const meshtastic_MeshPacket &to)
 {
-    assert(p->which_payload_variant == MeshPacket_decoded_tag); // Should already be set by now
+    assert(p->which_payload_variant == meshtastic_MeshPacket_decoded_tag); // Should already be set by now
     p->to = getFrom(&to);    // Make sure that if we are sending to the local node, we use our local node addr, not 0
     p->channel = to.channel; // Use the same channel that the request came in on
 
     // No need for an ack if we are just delivering locally (it just generates an ignored ack)
     p->want_ack = (to.from != 0) ? to.want_ack : false;
-    if (p->priority == MeshPacket_Priority_UNSET)
+    if (p->priority == meshtastic_MeshPacket_Priority_UNSET)
-        p->priority = MeshPacket_Priority_RELIABLE;
+        p->priority = meshtastic_MeshPacket_Priority_RELIABLE;
     p->decoded.request_id = to.id;
 }
 
@@ -235,14 +235,12 @@ std::vector<MeshModule *> MeshModule::GetMeshModulesWithUIFrames()
     return modulesWithUIFrames;
 }
 
-void MeshModule::observeUIEvents(
+void MeshModule::observeUIEvents(Observer<const UIFrameEvent *> *observer)
-    Observer<const UIFrameEvent *> *observer)
 {
     if (modules) {
         for (auto i = modules->begin(); i != modules->end(); ++i) {
             auto &pi = **i;
-            Observable<const UIFrameEvent *> *observable =
+            Observable<const UIFrameEvent *> *observable = pi.getUIFrameObservable();
-                pi.getUIFrameObservable();
             if (observable != NULL) {
                 LOG_DEBUG("Module wants a UI Frame\n");
                 observer->observe(observable);
@@ -251,24 +249,20 @@ void MeshModule::observeUIEvents(
     }
 }
 
-AdminMessageHandleResult MeshModule::handleAdminMessageForAllPlugins(const MeshPacket &mp, AdminMessage *request, AdminMessage *response)
+AdminMessageHandleResult MeshModule::handleAdminMessageForAllPlugins(const meshtastic_MeshPacket &mp,
+                                                                     meshtastic_AdminMessage *request,
+                                                                     meshtastic_AdminMessage *response)
 {
     AdminMessageHandleResult handled = AdminMessageHandleResult::NOT_HANDLED;
     if (modules) {
         for (auto i = modules->begin(); i != modules->end(); ++i) {
             auto &pi = **i;
             AdminMessageHandleResult h = pi.handleAdminMessageForModule(mp, request, response);
-            if (h == AdminMessageHandleResult::HANDLED_WITH_RESPONSE)
+            if (h == AdminMessageHandleResult::HANDLED_WITH_RESPONSE) {
-            {
                 // In case we have a response it always has priority.
-                LOG_DEBUG("Reply prepared by module '%s' of variant: %d\n",
+                LOG_DEBUG("Reply prepared by module '%s' of variant: %d\n", pi.name, response->which_payload_variant);
-                    pi.name,
-                    response->which_payload_variant);
                 handled = h;
-            }
+            } else if ((handled != AdminMessageHandleResult::HANDLED_WITH_RESPONSE) && (h == AdminMessageHandleResult::HANDLED)) {
-            else if ((handled != AdminMessageHandleResult::HANDLED_WITH_RESPONSE) &&
-                (h == AdminMessageHandleResult::HANDLED))
-            {
                 // In case the message is handled it should be populated, but will not overwrite
                 //   a result with response.
                 handled = h;

src/mesh/MeshModule.h

@@ -15,8 +15,7 @@
  *
  * Use ProcessMessage::STOP to stop further message processing.
  */
-enum class ProcessMessage
+enum class ProcessMessage {
-{
     CONTINUE = 0,
     STOP = 1,
 };
@@ -27,8 +26,7 @@ enum class ProcessMessage
  * If response is also prepared for the request, then HANDLED_WITH_RESPONSE
  * should be returned.
  */
-enum class AdminMessageHandleResult
+enum class AdminMessageHandleResult {
-{
     NOT_HANDLED = 0,
     HANDLED = 1,
     HANDLED_WITH_RESPONSE = 2,
@@ -66,14 +64,18 @@ class MeshModule
 
     /** For use only by MeshService
      */
-    static void callPlugins(const MeshPacket &mp, RxSource src = RX_SRC_RADIO);
+    static void callPlugins(const meshtastic_MeshPacket &mp, RxSource src = RX_SRC_RADIO);
 
     static std::vector<MeshModule *> GetMeshModulesWithUIFrames();
     static void observeUIEvents(Observer<const UIFrameEvent *> *observer);
-    static AdminMessageHandleResult handleAdminMessageForAllPlugins(
+    static AdminMessageHandleResult handleAdminMessageForAllPlugins(const meshtastic_MeshPacket &mp,
-        const MeshPacket &mp, AdminMessage *request, AdminMessage *response);
+                                                                    meshtastic_AdminMessage *request,
+                                                                    meshtastic_AdminMessage *response);
 #if HAS_SCREEN
-    virtual void drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y) { return; }
+    virtual void drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
+    {
+        return;
+    }
 #endif
   protected:
     const char *name;
@@ -107,12 +109,12 @@ class MeshModule
      * Note: this can be static because we are guaranteed to be processing only one
      * plumodulegin at a time.
      */
-    static const MeshPacket *currentRequest;
+    static const meshtastic_MeshPacket *currentRequest;
 
     /**
      * If your handler wants to send a response, simply set currentReply and it will be sent at the end of response handling.
      */
-    MeshPacket *myReply = NULL;
+    meshtastic_MeshPacket *myReply = NULL;
 
     /**
      * Initialize your module.  This setup function is called once after all hardware and mesh protocol layers have
@@ -123,13 +125,17 @@ class MeshModule
     /**
      * @return true if you want to receive the specified portnum
      */
-    virtual bool wantPacket(const MeshPacket *p) = 0;
+    virtual bool wantPacket(const meshtastic_MeshPacket *p) = 0;
 
     /** Called to handle a particular incoming message
 
-    @return ProcessMessage::STOP if you've guaranteed you've handled this message and no other handlers should be considered for it
+    @return ProcessMessage::STOP if you've guaranteed you've handled this message and no other handlers should be considered for
+    it
     */
-    virtual ProcessMessage handleReceived(const MeshPacket &mp) { return ProcessMessage::CONTINUE; }
+    virtual ProcessMessage handleReceived(const meshtastic_MeshPacket &mp)
+    {
+        return ProcessMessage::CONTINUE;
+    }
 
     /** Messages can be received that have the want_response bit set.  If set, this callback will be invoked
      * so that subclasses can (optionally) send a response back to the original sender.
@@ -137,18 +143,24 @@ class MeshModule
      * Note: most implementers don't need to override this, instead: If while handling a request you have a reply, just set
      * the protected reply field in this instance.
      * */
-    virtual MeshPacket *allocReply();
+    virtual meshtastic_MeshPacket *allocReply();
 
     /***
      * @return true if you want to be alloced a UI screen frame
      */
-    virtual bool wantUIFrame() { return false; }
+    virtual bool wantUIFrame()
-    virtual Observable<const UIFrameEvent *>* getUIFrameObservable() { return NULL; }
+    {
+        return false;
+    }
+    virtual Observable<const UIFrameEvent *> *getUIFrameObservable()
+    {
+        return NULL;
+    }
 
-    MeshPacket *allocAckNak(Routing_Error err, NodeNum to, PacketId idFrom, ChannelIndex chIndex);
+    meshtastic_MeshPacket *allocAckNak(meshtastic_Routing_Error err, NodeNum to, PacketId idFrom, ChannelIndex chIndex);
 
     /// Send an error response for the specified packet.
-    MeshPacket *allocErrorResponse(Routing_Error err, const MeshPacket *p);
+    meshtastic_MeshPacket *allocErrorResponse(meshtastic_Routing_Error err, const meshtastic_MeshPacket *p);
 
     /**
      * @brief An admin message arrived to AdminModule. Module was asked whether it want to handle the request.
@@ -160,15 +172,19 @@ class MeshModule
      *   HANDLED if message was handled
      *   HANDLED_WITH_RESPONSE if a response is also prepared and to be sent.
      */
-    virtual AdminMessageHandleResult handleAdminMessageForModule(
+    virtual AdminMessageHandleResult handleAdminMessageForModule(const meshtastic_MeshPacket &mp,
-        const MeshPacket &mp, AdminMessage *request, AdminMessage *response) { return AdminMessageHandleResult::NOT_HANDLED; };
+                                                                 meshtastic_AdminMessage *request,
+                                                                 meshtastic_AdminMessage *response)
+    {
+        return AdminMessageHandleResult::NOT_HANDLED;
+    };
 
   private:
     /**
      * If any of the current chain of modules has already sent a reply, it will be here.  This is useful to allow
      * the RoutingModule to avoid sending redundant acks
      */
-    static MeshPacket *currentReply;
+    static meshtastic_MeshPacket *currentReply;
 
     friend class ReliableRouter;
 
@@ -176,10 +192,10 @@ class MeshModule
      * so that subclasses can (optionally) send a response back to the original sender.  This method calls allocReply()
      * to generate the reply message, and if !NULL that message will be delivered to whoever sent req
      */
-    void sendResponse(const MeshPacket &req);
+    void sendResponse(const meshtastic_MeshPacket &req);
 };
 
 /** set the destination and packet parameters of packet p intended as a reply to a particular "to" packet
  * This ensures that if the request packet was sent reliably, the reply is sent that way as well.
  */
-void setReplyTo(MeshPacket *p, const MeshPacket &to);
+void setReplyTo(meshtastic_MeshPacket *p, const meshtastic_MeshPacket &to);

src/mesh/MeshPacketQueue.cpp

@@ -1,18 +1,18 @@
-#include "configuration.h"
 #include "MeshPacketQueue.h"
+#include "configuration.h"
 #include <assert.h>
 
 #include <algorithm>
 
 /// @return the priority of the specified packet
-inline uint32_t getPriority(const MeshPacket *p)
+inline uint32_t getPriority(const meshtastic_MeshPacket *p)
 {
     auto pri = p->priority;
     return pri;
 }
 
 /// @return "true" if "p1" is ordered before "p2"
-bool CompareMeshPacketFunc(const MeshPacket *p1, const MeshPacket *p2)
+bool CompareMeshPacketFunc(const meshtastic_MeshPacket *p1, const meshtastic_MeshPacket *p2)
 {
     assert(p1 && p2);
     auto p1p = getPriority(p1), p2p = getPriority(p2);
@@ -26,27 +26,29 @@ bool CompareMeshPacketFunc(const MeshPacket *p1, const MeshPacket *p2)
 
 MeshPacketQueue::MeshPacketQueue(size_t _maxLen) : maxLen(_maxLen) {}
 
-bool MeshPacketQueue::empty() {
+bool MeshPacketQueue::empty()
+{
     return queue.empty();
 }
 
 /**
  * Some clients might not properly set priority, therefore we fix it here.
  */
-void fixPriority(MeshPacket *p)
+void fixPriority(meshtastic_MeshPacket *p)
 {
     // We might receive acks from other nodes (and since generated remotely, they won't have priority assigned.  Check for that
     // and fix it
-    if (p->priority == MeshPacket_Priority_UNSET) {
+    if (p->priority == meshtastic_MeshPacket_Priority_UNSET) {
         // if acks give high priority
         // if a reliable message give a bit higher default priority
-        p->priority = (p->decoded.portnum == PortNum_ROUTING_APP) ? MeshPacket_Priority_ACK :
+        p->priority = (p->decoded.portnum == meshtastic_PortNum_ROUTING_APP)
-                          (p->want_ack ? MeshPacket_Priority_RELIABLE : MeshPacket_Priority_DEFAULT);
+                          ? meshtastic_MeshPacket_Priority_ACK
+                          : (p->want_ack ? meshtastic_MeshPacket_Priority_RELIABLE : meshtastic_MeshPacket_Priority_DEFAULT);
     }
 }
 
 /** enqueue a packet, return false if full */
-bool MeshPacketQueue::enqueue(MeshPacket *p)
+bool MeshPacketQueue::enqueue(meshtastic_MeshPacket *p)
 {
     fixPriority(p);
 
@@ -60,7 +62,7 @@ bool MeshPacketQueue::enqueue(MeshPacket *p)
     return true;
 }
 
-MeshPacket *MeshPacketQueue::dequeue()
+meshtastic_MeshPacket *MeshPacketQueue::dequeue()
 {
     if (empty()) {
         return NULL;
@@ -73,7 +75,7 @@ MeshPacket *MeshPacketQueue::dequeue()
     return p;
 }
 
-MeshPacket *MeshPacketQueue::getFront()
+meshtastic_MeshPacket *MeshPacketQueue::getFront()
 {
     if (empty()) {
         return NULL;
@@ -84,7 +86,7 @@ MeshPacket *MeshPacketQueue::getFront()
 }
 
 /** Attempt to find and remove a packet from this queue.  Returns a pointer to the removed packet, or NULL if not found */
-MeshPacket *MeshPacketQueue::remove(NodeNum from, PacketId id)
+meshtastic_MeshPacket *MeshPacketQueue::remove(NodeNum from, PacketId id)
 {
     for (auto it = queue.begin(); it != queue.end(); it++) {
         auto p = (*it);
@@ -99,7 +101,8 @@ MeshPacket *MeshPacketQueue::remove(NodeNum from, PacketId id)
 }
 
 /** Attempt to find and remove a packet from this queue.  Returns the packet which was removed from the queue */
-bool MeshPacketQueue::replaceLowerPriorityPacket(MeshPacket *p) {
+bool MeshPacketQueue::replaceLowerPriorityPacket(meshtastic_MeshPacket *p)
+{
     std::sort_heap(queue.begin(), queue.end(), &CompareMeshPacketFunc); // sort ascending based on priority (0 -> 127)
 
     // find first packet which does not compare less (in priority) than parameter packet

src/mesh/MeshPacketQueue.h

@@ -4,23 +4,23 @@
 
 #include <queue>
 
-
 /**
  * A priority queue of packets
  */
 class MeshPacketQueue
 {
     size_t maxLen;
-    std::vector<MeshPacket *> queue;
+    std::vector<meshtastic_MeshPacket *> queue;
 
-    /** Replace a lower priority package in the queue with 'mp' (provided there are lower pri packages). Return true if replaced. */
+    /** Replace a lower priority package in the queue with 'mp' (provided there are lower pri packages). Return true if replaced.
-    bool replaceLowerPriorityPacket(MeshPacket *mp);
+     */
+    bool replaceLowerPriorityPacket(meshtastic_MeshPacket *mp);
 
   public:
     explicit MeshPacketQueue(size_t _maxLen);
 
     /** enqueue a packet, return false if full */
-    bool enqueue(MeshPacket *p);
+    bool enqueue(meshtastic_MeshPacket *p);
 
     /** return true if the queue is empty */
     bool empty();
@@ -31,10 +31,10 @@ class MeshPacketQueue
     /** return total size of the Queue */
     size_t getMaxLen() { return maxLen; }
 
-    MeshPacket *dequeue();
+    meshtastic_MeshPacket *dequeue();
 
-    MeshPacket *getFront();
+    meshtastic_MeshPacket *getFront();
 
     /** Attempt to find and remove a packet from this queue.  Returns the packet which was removed from the queue */
-    MeshPacket *remove(NodeNum from, PacketId id);
+    meshtastic_MeshPacket *remove(NodeNum from, PacketId id);
 };