PIN_GPS_EN power toggling (#2592)

* PIN_GPS_EN

* Remove extra digitalWrite

* GPS_POWER_TOGGLE macro enabled. Added WSLv3 too

* Update variant.h

* Update variant.h

* Fixed macro guard

.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/ISSUE_TEMPLATE/Bug Report.yml

@@ -32,6 +32,7 @@ body:
       options:
         - Not Applicable
         - T-Beam
+        - T-Beam S3
         - T-Beam 0.7
         - T-Lora v1
         - T-Lora v1.3
@@ -39,9 +40,12 @@ body:
         - T-Echo
         - Rak4631
         - Rak11200
+        - Rak11310
         - Heltec v1
         - Heltec v2
         - Heltec v2.1
+        - Heltec V3
+        - Raspberry Pi Pico (W)
         - Relay v1
         - Relay v2
         - DIY

.github/ISSUE_TEMPLATE/New Board.yml

@@ -28,7 +28,7 @@ body:
       description: What LoRa IC does the board have?
     validations:
       required: true
-      
+
   - type: input
     id: link
     attributes:

.github/actions/setup-base/action.yml

@@ -1,5 +1,5 @@
-name: 'Setup Build Base Composite Action'
-description: 'Base build actions for Meshtastic Platform IO steps'
+name: "Setup Build Base Composite Action"
+description: "Base build actions for Meshtastic Platform IO steps"
 
 runs:
   using: "composite"
@@ -10,7 +10,7 @@ runs:
         submodules: "recursive"
         ref: ${{github.event.pull_request.head.ref}}
         repository: ${{github.event.pull_request.head.repo.full_name}}
-    
+
     - name: Install cppcheck
       shell: bash
       run: |
@@ -38,4 +38,4 @@ runs:
     - name: Upgrade platformio
       shell: bash
       run: |
-        pio upgrade
+        pio upgrade

.github/pull_request_template.md

@@ -7,7 +7,8 @@
   is appreciated." This will allow other devs to potentially save you time by not accidentially duplicating work etc...
 - Please do not check in files that don't have real changes
 - Please do not reformat lines that you didn't have to change the code on
-- We recommend using the [Visual Studio Code](https://platformio.org/install/ide?install=vscode) editor and the 'clang-format' extension,
-  because automatically follows our indentation rules and it's auto reformatting will not cause spurious changes to lines.
+- We recommend using the [Visual Studio Code](https://platformio.org/install/ide?install=vscode) editor along with the ['Trunk Check' extension](https://marketplace.visualstudio.com/items?itemName=trunk.io) (WSL2 is required on windows),
+  because it automatically follows our indentation rules and its auto reformatting will not cause spurious changes to lines.
 - If your PR fixes a bug, mention "fixes #bugnum" somewhere in your pull request description.
 - If your other co-developers have comments on your PR please tweak as needed.
+- Please also enable "Allow edits by maintainers".

.github/workflows/build_esp32.yml

@@ -7,7 +7,7 @@ on:
         required: true
         type: string
 
-jobs: 
+jobs:
   build-esp32:
     runs-on: ubuntu-latest
     steps:
@@ -29,6 +29,13 @@ jobs:
           tar -xf build.tar -C data/static
           rm build.tar
 
+      - name: Remove debug flags for release
+        if: ${{ github.event_name == 'workflow_dispatch' }}
+        run: |
+          sed -i '/DDEBUG_HEAP/d' ./arch/esp32/esp32.ini
+          sed -i '/DDEBUG_HEAP/d' ./arch/esp32/esp32s2.ini
+          sed -i '/DDEBUG_HEAP/d' ./arch/esp32/esp32s3.ini
+
       - name: Build ESP32
         run: bin/build-esp32.sh ${{ inputs.board }}
 
@@ -39,7 +46,7 @@ jobs:
           file: "firmware.bin"
           target: "release/bleota.bin"
           token: ${{ secrets.GITHUB_TOKEN }}
-      
+
       - name: Get release version string
         shell: bash
         run: echo "version=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT

.github/workflows/build_esp32_s3.yml

@@ -0,0 +1,59 @@
+name: Build ESP32-S3
+
+on:
+  workflow_call:
+    inputs:
+      board:
+        required: true
+        type: string
+
+jobs:
+  build-esp32-s3:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Build base
+        id: base
+        uses: ./.github/actions/setup-base
+
+      - name: Pull web ui
+        uses: dsaltares/fetch-gh-release-asset@master
+        with:
+          repo: "meshtastic/web"
+          file: "build.tar"
+          target: "build.tar"
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Unpack web ui
+        run: |
+          tar -xf build.tar -C data/static
+          rm build.tar
+      - name: Remove debug flags for release
+        if: ${{ github.event_name == 'workflow_dispatch' }}
+        run: |
+          sed -i '/DDEBUG_HEAP/d' ./arch/esp32/esp32.ini
+          sed -i '/DDEBUG_HEAP/d' ./arch/esp32/esp32s2.ini
+          sed -i '/DDEBUG_HEAP/d' ./arch/esp32/esp32s3.ini
+      - name: Build ESP32
+        run: bin/build-esp32.sh ${{ inputs.board }}
+
+      - name: Pull OTA Firmware
+        uses: dsaltares/fetch-gh-release-asset@master
+        with:
+          repo: "meshtastic/firmware-ota"
+          file: "firmware-s3.bin"
+          target: "release/bleota-s3.bin"
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get release version string
+        shell: bash
+        run: echo "version=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
+        id: version
+
+      - name: Store binaries as an artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: firmware-${{ inputs.board }}-${{ steps.version.outputs.version }}.zip
+          path: |
+            release/*.bin
+            release/*.elf

.github/workflows/build_nrf52.yml

@@ -7,7 +7,7 @@ on:
         required: true
         type: string
 
-jobs: 
+jobs:
   build-nrf52:
     runs-on: ubuntu-latest
     steps:
@@ -30,4 +30,4 @@ jobs:
           path: |
             release/*.uf2
             release/*.elf
-            release/*.zip
+            release/*.zip

.github/workflows/build_rpi2040.yml

@@ -7,7 +7,7 @@ on:
         required: true
         type: string
 
-jobs: 
+jobs:
   build-rpi2040:
     runs-on: ubuntu-latest
     steps:
@@ -29,4 +29,4 @@ jobs:
           name: firmware-${{ inputs.board }}-${{ steps.version.outputs.version }}.zip
           path: |
             release/*.uf2
-            release/*.elf
+            release/*.elf

.github/workflows/main_matrix.yml

@@ -23,15 +23,17 @@ jobs:
       matrix:
         include:
           - board: rak11200
-          - board: tlora-v2-1-1.6
+          - board: tlora-v2-1-1_6
           - board: tbeam
-          - board: heltec-v2.1
+          - board: heltec-v2_1
           - board: meshtastic-diy-v1
           - board: rak4631
           - board: t-echo
           - board: station-g1
           - board: m5stack-coreink
           - board: tbeam-s3-core
+          - board: tlora-t3s3-v1
+          #- board: rak11310
 
     runs-on: ubuntu-latest
     steps:
@@ -40,6 +42,10 @@ jobs:
         id: base
         uses: ./.github/actions/setup-base
 
+      - name: Trunk Check
+        if: ${{ github.event_name != 'workflow_dispatch' }}
+        uses: trunk-io/trunk-action@v1
+
       - name: Check ${{ matrix.board }}
         run: bin/check-all.sh ${{ matrix.board }}
 
@@ -52,25 +58,37 @@ jobs:
           - board: tlora-v2
           - board: tlora-v1
           - board: tlora_v1_3
-          - board: tlora-v2-1-1.6
+          - board: tlora-v2-1-1_6
+          - board: tlora-v2-1-1_8
           - board: tbeam
           - board: heltec-v1
-          - board: heltec-v2.0
-          - board: heltec-v2.1
-          - board: heltec-v3
-          - board: heltec-wsl-v3
-          - board: tbeam0.7
+          - board: heltec-v2_0
+          - board: heltec-v2_1
+          - board: tbeam0_7
           - board: meshtastic-diy-v1
           - board: meshtastic-dr-dev
           - board: nano-g1
           - board: station-g1
           - board: m5stack-core
           - board: m5stack-coreink
-          - board: tbeam-s3-core
+          - board: nano-g1-explorer
     uses: ./.github/workflows/build_esp32.yml
     with:
       board: ${{ matrix.board }}
 
+  build-esp32-s3:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - board: heltec-v3
+          - board: heltec-wsl-v3
+          - board: tbeam-s3-core
+          - board: tlora-t3s3-v1
+    uses: ./.github/workflows/build_esp32_s3.yml
+    with:
+      board: ${{ matrix.board }}
+
   build-nrf52:
     strategy:
       fail-fast: false
@@ -79,6 +97,7 @@ jobs:
         include:
           - board: rak4631
           - board: rak4631_eink
+          - board: monteops_hw1
           - board: t-echo
           - board: pca10059_diy_eink
           - board: feather_diy
@@ -93,6 +112,7 @@ jobs:
       matrix:
         include:
           - board: pico
+          - board: rak11310
     uses: ./.github/workflows/build_rpi2040.yml
     with:
       board: ${{ matrix.board }}
@@ -106,14 +126,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
-        run: platformio run -e native
-      - name: Integration test
-        run: |
-          .pio/build/native/program &
-          sleep 20 # 5 seconds was not enough
-          echo "Simulator started, launching python test..."
-          python3 -c 'from meshtastic.test import testSimulator; testSimulator()'
+      #- name: Build for native
+      #  run: platformio run -e native
+      #- name: Integration test
+      # run: |
+      #.pio/build/native/program
+      #& sleep 20 # 5 seconds was not enough
+      #echo "Simulator started, launching python test..."
+      #python3 -c 'from meshtastic.test import testSimulator; testSimulator()'
 
       - name: Build Native
         run: bin/build-native.sh
@@ -129,27 +149,36 @@ jobs:
           path: |
             release/device-*.sh
             release/device-*.bat
-      
+
       - name: Docker login
-        if: ${{ github.event_name == 'workflow_dispatch' }}
+        if: ${{ github.event_name != 'pull_request_target' && github.event_name != 'pull_request' }}
         uses: docker/login-action@v2
-        with: 
+        with:
           username: meshtastic
           password: ${{ secrets.DOCKER_TOKEN }}
 
       - name: Docker setup
-        if: ${{ github.event_name == 'workflow_dispatch' }}
+        if: ${{ github.event_name != 'pull_request_target' && github.event_name != 'pull_request' }}
         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' && github.event_name != 'pull_request_target' && github.event_name != 'pull_request' }}
+        uses: docker/build-push-action@v3
         with:
           context: .
           file: ./Dockerfile
           push: true
           tags: meshtastic/device-simulator:latest
-      
+
   after-checks:
     runs-on: ubuntu-latest
     needs: [check]
@@ -162,7 +191,8 @@ jobs:
 
   gather-artifacts:
     runs-on: ubuntu-latest
-    needs: [build-esp32, build-nrf52, build-native, build-rpi2040]
+    needs:
+      [build-esp32, build-esp32-s3, build-nrf52, build-native, build-rpi2040]
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -179,7 +209,7 @@ jobs:
         id: version
 
       - name: Move files up
-        run: mv -b -t ./ ./*tbeam-2*/littlefs*.bin ./*tbeam-2*/bleota.bin ./**/firmware*.bin ./*t-echo*/Meshtastic_nRF52_factory_erase.uf2 ./**/firmware-*.uf2 ./**/firmware-*-ota.zip ./**/*.elf ./*native*/*device-*.sh ./*native*/*device-*.bat
+        run: mv -b -t ./ ./*tbeam-2*/littlefs*.bin ./*tbeam-2*/bleota.bin ./*tbeam-s3*/bleota-s3.bin ./**/firmware*.bin ./*t-echo*/Meshtastic_nRF52_factory_erase.uf2 ./**/firmware-*.uf2 ./**/firmware-*-ota.zip ./**/*.elf ./*native*/*device-*.sh ./*native*/*device-*.bat
 
       - name: Repackage in single firmware zip
         uses: actions/upload-artifact@v3

.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 }}

.github/workflows/sec_sast_flawfinder.yml

@@ -10,31 +10,31 @@ on:
 
 jobs:
   flawfinder:
-      runs-on: ubuntu-latest
-      name: Flawfinder
+    runs-on: ubuntu-latest
+    name: Flawfinder
 
-      steps:
-        # step 1
-        - name: clone application source code
-          uses: actions/checkout@v3
+    steps:
+      # step 1
+      - name: clone application source code
+        uses: actions/checkout@v3
 
-        # step 2
-        - name: flawfinder_scan
-          uses: david-a-wheeler/flawfinder@2.0.19
-          with:
-            arguments: '--sarif ./'
-            output: 'flawfinder_report.sarif'
+      # step 2
+      - name: flawfinder_scan
+        uses: david-a-wheeler/flawfinder@2.0.19
+        with:
+          arguments: "--sarif ./"
+          output: "flawfinder_report.sarif"
 
-        # step 3
-        - name: save report as pipeline artifact
-          uses: actions/upload-artifact@v3
-          with:
-            name: flawfinder_report.sarif
-            path: flawfinder_report.sarif
+      # step 3
+      - name: save report as pipeline artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: flawfinder_report.sarif
+          path: flawfinder_report.sarif
 
-        # step 4
-        - name: publish code scanning alerts
-          uses: github/codeql-action/upload-sarif@v2
-          with:
-            sarif_file: flawfinder_report.sarif
-            category: flawfinder
+      # step 4
+      - name: publish code scanning alerts
+        uses: github/codeql-action/upload-sarif@v2
+        with:
+          sarif_file: flawfinder_report.sarif
+          category: flawfinder

.github/workflows/sec_sast_semgrep_cron.yml

@@ -6,39 +6,37 @@ on:
     branches:
       - master
   schedule:
-    - cron:  '0 1 * * 6'
+    - cron: "0 1 * * 6"
 
 jobs:
-
   semgrep-full:
-      runs-on: ubuntu-latest
-      container:
-        image: returntocorp/semgrep
+    runs-on: ubuntu-latest
+    container:
+      image: returntocorp/semgrep
 
-      steps:
+    steps:
+      # step 1
+      - name: clone application source code
+        uses: actions/checkout@v3
 
-        # step 1
-        - name: clone application source code
-          uses: actions/checkout@v3
+      # step 2
+      - name: full scan
+        run: |
+          semgrep \
+            --sarif --output report.sarif \
+            --metrics=off \
+            --config="p/default"
 
-        # step 2
-        - name: full scan
-          run: |
-            semgrep \
-              --sarif --output report.sarif \
-              --metrics=off \
-              --config="p/default"
+      # step 3
+      - name: save report as pipeline artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: report.sarif
+          path: report.sarif
 
-        # step 3
-        - name: save report as pipeline artifact
-          uses: actions/upload-artifact@v3
-          with:
-            name: report.sarif
-            path: report.sarif
-
-        # step 4
-        - name: publish code scanning alerts
-          uses: github/codeql-action/upload-sarif@v2
-          with:
-            sarif_file: report.sarif
-            category: semgrep
+      # step 4
+      - name: publish code scanning alerts
+        uses: github/codeql-action/upload-sarif@v2
+        with:
+          sarif_file: report.sarif
+          category: semgrep

.github/workflows/sec_sast_semgrep_pull.yml

@@ -1,17 +1,14 @@
 ---
 name: Semgrep Differential Scan
-on:
-  pull_request
+on: pull_request
 
 jobs:
-
   semgrep-diff:
     runs-on: ubuntu-latest
     container:
       image: returntocorp/semgrep
 
     steps:
-
       # step 1
       - name: clone application source code
         uses: actions/checkout@v3

.github/workflows/update_protobufs.yml

@@ -17,9 +17,9 @@ jobs:
 
       - name: Download nanopb
         run: |
-          wget https://jpa.kapsi.fi/nanopb/download/nanopb-0.4.6-linux-x86.tar.gz
-          tar xvzf nanopb-0.4.6-linux-x86.tar.gz
-          mv nanopb-0.4.6-linux-x86 nanopb-0.4.6
+          wget https://jpa.kapsi.fi/nanopb/download/nanopb-0.4.7-linux-x86.tar.gz
+          tar xvzf nanopb-0.4.7-linux-x86.tar.gz
+          mv nanopb-0.4.7-linux-x86 nanopb-0.4.7
 
       - name: Re-generate protocol buffers
         run: |

.gitignore

@@ -29,3 +29,5 @@ __pycache__
 
 venv/
 release/
+.vscode/extensions.json
+/compile_commands.json

.trunk/.gitignore

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

.trunk/configs/.flake8

@@ -0,0 +1,3 @@
+# Autoformatter friendly flake8 config (all formatting rules disabled)
+[flake8]
+extend-ignore = D1, D2, E1, E2, E3, E501, W1, W2, W3, W5

.trunk/configs/.hadolint.yaml

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

.trunk/configs/.isort.cfg

@@ -0,0 +1,2 @@
+[settings]
+profile=black

.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/.yamllint.yaml

@@ -0,0 +1,10 @@
+rules:
+  quoted-strings:
+    required: only-when-needed
+    extra-allowed: ["{|}"]
+  empty-values:
+    forbid-in-block-mappings: true
+    forbid-in-flow-mappings: true
+  key-duplicates: {}
+  octal-values:
+    forbid-implicit-octal: true

.trunk/configs/ruff.toml

@@ -0,0 +1,5 @@
+# Generic, formatter-friendly config.
+select = ["B", "D3", "D4", "E", "F"]
+
+# Never enforce `E501` (line length violations). This should be handled by formatters.
+ignore = ["E501"]

.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,48 @@
+version: 0.1
+cli:
+  version: 1.9.1
+plugins:
+  sources:
+    - id: trunk
+      ref: v0.0.17
+      uri: https://github.com/trunk-io/plugins
+lint:
+  enabled:
+    - taplo@0.7.0
+    - ruff@0.0.265
+    - yamllint@1.31.0
+    - isort@5.12.0
+    - markdownlint@0.34.0
+    - oxipng@8.0.0
+    - svgo@3.0.2
+    - actionlint@1.6.24
+    - flake8@6.0.0
+    - hadolint@2.12.0
+    - shfmt@3.5.0
+    - shellcheck@0.9.0
+    - black@23.3.0
+    - git-diff-check
+    - gitleaks@8.16.3
+    - clang-format@14.0.0
+    - prettier@2.8.8
+  disabled:
+    - taplo@0.7.0
+    - shellcheck@0.9.0
+    - shfmt@3.5.0
+    - oxipng@8.0.0
+    - actionlint@1.6.22
+    - markdownlint@0.34.0
+    - hadolint@2.12.0
+    - svgo@3.0.2
+runtimes:
+  enabled:
+    - python@3.10.8
+    - go@1.19.5
+    - 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": {
-        "type_traits": "cpp",
-        "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,
-    }
-}
+  "editor.formatOnSave": true,
+  "editor.defaultFormatter": "trunk.io"
+}

.vscode/tasks.json

@@ -1,17 +1,15 @@
 {
-	"version": "2.0.0",
-	"tasks": [
-		{
-			"type": "PlatformIO",
-			"task": "Build",
-			"problemMatcher": [
-				"$platformio"
-			],
-			"group": {
-				"kind": "build",
-				"isDefault": true
-			},
-			"label": "PlatformIO: Build"
-		}
-	]
-}
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "type": "PlatformIO",
+      "task": "Build",
+      "problemMatcher": ["$platformio"],
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      },
+      "label": "PlatformIO: Build"
+    }
+  ]
+}

README.md

@@ -1,7 +1,7 @@
 # Meshtastic Firmware
 
 ![GitHub release downloads](https://img.shields.io/github/downloads/meshtastic/firmware/total)
-[![CI](https://img.shields.io/github/workflow/status/meshtastic/firmware/CI?label=actions&logo=github&color=yellow)](https://github.com/meshtastic/firmware/actions/workflows/main_matrix.yml)
+[![CI](https://img.shields.io/github/actions/workflow/status/meshtastic/firmware/main_matrix.yml?branch=master&label=actions&logo=github&color=yellow)](https://github.com/meshtastic/firmware/actions/workflows/ci.yml)
 [![CLA assistant](https://cla-assistant.io/readme/badge/meshtastic/firmware)](https://cla-assistant.io/meshtastic/firmware)
 [![Fiscal Contributors](https://opencollective.com/meshtastic/tiers/badge.svg?label=Fiscal%20Contributors&color=deeppink)](https://opencollective.com/meshtastic/)
 [![Vercel](https://img.shields.io/static/v1?label=Powered%20by&message=Vercel&style=flat&logo=vercel&color=000000)](https://vercel.com?utm_source=meshtastic&utm_campaign=oss)

arch/esp32/esp32.ini

@@ -1,12 +1,15 @@
 ; Common settings for ESP targes, mixin with extends = esp32_base
 [esp32_base]
 extends = arduino_base
-platform = platformio/espressif32@^5.2.0
+platform = platformio/espressif32@^6.3.2
+
 build_src_filter = 
   ${arduino_base.build_src_filter} -<platform/nrf52/> -<platform/stm32wl> -<platform/rp2040> -<mesh/eth/>
+
 upload_speed = 921600
 debug_init_break = tbreak setup
 monitor_filters = esp32_exception_decoder
+
 board_build.filesystem = littlefs
 
 # Remove -DMYNEWT_VAL_BLE_HS_LOG_LVL=LOG_LEVEL_CRITICAL for low level BLE logging.
@@ -26,6 +29,7 @@ build_flags =
   -DCONFIG_NIMBLE_CPP_LOG_LEVEL=2
   -DCONFIG_BT_NIMBLE_MAX_CCCDS=20
   -DESP_OPENSSL_SUPPRESS_LEGACY_WARNING
+  ;-DDEBUG_HEAP
 
 lib_deps =
   ${arduino_base.lib_deps}
@@ -33,7 +37,9 @@ lib_deps =
   ${environmental_base.lib_deps}
   https://github.com/meshtastic/esp32_https_server.git#23665b3adc080a311dcbb586ed5941b5f94d6ea2
   h2zero/NimBLE-Arduino@^1.4.0
-   https://github.com/lewisxhe/XPowersLib.git#84b7373faea3118b6c37954d52f98b8a337148d6
+  jgromes/RadioLib@^6.1.0
+  https://github.com/lewisxhe/XPowersLib.git#84b7373faea3118b6c37954d52f98b8a337148d6
+  https://github.com/meshtastic/ESP32_Codec2.git#633326c78ac251c059ab3a8c430fcdf25b41672f
 
 lib_ignore = 
   segger_rtt
@@ -49,4 +55,4 @@ lib_ignore =
 
 ; customize the partition table
 ; http://docs.platformio.org/en/latest/platforms/espressif32.html#partition-tables
-board_build.partitions = partition-table.csv
+board_build.partitions = partition-table.csv

arch/esp32/esp32c3.ini

@@ -0,0 +1,5 @@
+[esp32c3_base]
+extends = esp32_base
+
+monitor_speed = 115200
+monitor_filters = esp32_c3_exception_decoder

arch/esp32/esp32s2.ini

@@ -0,0 +1,16 @@
+[esp32s2_base]
+extends = esp32_base
+
+build_src_filter = 
+  ${esp32_base.build_src_filter} -<nimble/>
+
+monitor_speed = 115200
+
+build_flags =
+  ${esp32_base.build_flags} 
+  -DHAS_BLUETOOTH=0
+  
+lib_ignore = 
+  ${esp32_base.lib_ignore} 
+  NimBLE-Arduino
+

arch/esp32/esp32s3.ini

@@ -1,45 +1,5 @@
 [esp32s3_base]
-extends = arduino_base
-platform = platformio/espressif32@^5.2.0
-build_src_filter = 
-  ${arduino_base.build_src_filter} -<platform/nrf52/> -<platform/stm32wl> -<platform/rp2040> -<mesh/eth/>
-upload_speed = 961200
+extends = esp32_base
+
 monitor_speed = 115200
-debug_init_break = tbreak setup
-monitor_filters = esp32_exception_decoder
-board_build.filesystem = littlefs
-
-# Remove -DMYNEWT_VAL_BLE_HS_LOG_LVL=LOG_LEVEL_CRITICAL for low level BLE logging.
-# See library directory for BLE logging possible values: .pio/libdeps/tbeam/NimBLE-Arduino/src/log_common/log_common.h
-# This overrides the BLE logging default of LOG_LEVEL_INFO (1) from: .pio/libdeps/tbeam/NimBLE-Arduino/src/esp_nimble_cfg.h
-build_flags =
-  ${arduino_base.build_flags} 
-  -Wall 
-  -Wextra 
-  -Isrc/platform/esp32 
-  -std=c++11 
-  -DLOG_LOCAL_LEVEL=ESP_LOG_DEBUG 
-  -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG 
-  -DMYNEWT_VAL_BLE_HS_LOG_LVL=LOG_LEVEL_CRITICAL
-  -DAXP_DEBUG_PORT=Serial 
-  -DCONFIG_BT_NIMBLE_ENABLED 
-  -DCONFIG_NIMBLE_CPP_LOG_LEVEL=2 
-  -DCONFIG_BT_NIMBLE_MAX_CCCDS=20
-  -DESP_OPENSSL_SUPPRESS_LEGACY_WARNING  
-  
-lib_deps =
-  ${arduino_base.lib_deps}
-  ${networking_base.lib_deps}
-  ${environmental_base.lib_deps}
-  https://github.com/meshtastic/esp32_https_server.git#23665b3adc080a311dcbb586ed5941b5f94d6ea2
-  h2zero/NimBLE-Arduino@^1.4.0
-  https://github.com/lewisxhe/XPowersLib.git#84b7373faea3118b6c37954d52f98b8a337148d6
-
-lib_ignore = 
-  segger_rtt
-  ESP32 BLE Arduino
-
-; customize the partition table
-; http://docs.platformio.org/en/latest/platforms/espressif32.html#partition-tables
-board_build.partitions = partition-table.csv
 

arch/nrf52/nrf52.ini

@@ -1,18 +1,19 @@
 [nrf52_base]
 ; Instead of the standard nordicnrf52 platform, we use our fork which has our added variant files
-platform = platformio/nordicnrf52@^9.4.0
-
+platform = platformio/nordicnrf52@^10.0.0
 extends = arduino_base
+
 build_type = debug ; I'm debugging with ICE a lot now
 build_flags = 
   ${arduino_base.build_flags} -Wno-unused-variable 
   -Isrc/platform/nrf52
+
 build_src_filter = 
-  ${arduino_base.build_src_filter} -<platform/esp32/> -<platform/stm32wl> -<nimble/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mqtt/> -<platform/rp2040> -<mesh/eth/>
+  ${arduino_base.build_src_filter} -<platform/esp32/> -<platform/stm32wl> -<nimble/> -<mesh/api/> -<mesh/http/> -<modules/esp32> -<platform/rp2040> -<mesh/eth/>
+
+lib_deps=
+  ${arduino_base.lib_deps}
+  jgromes/RadioLib@^6.1.0
+
 lib_ignore =
-  BluetoothOTA
-  
-; Note: By default no lora device is created for this build - it uses a simulated interface
-[env:feather_nrf52832]
-extends = nrf52_base
-board = adafruit_feather_nrf52832  
+  BluetoothOTA

arch/nrf52/nrf52832.ini

@@ -0,0 +1,7 @@
+[nrf52832_base]
+extends = nrf52_base
+
+build_flags = ${nrf52_base.build_flags} 
+
+lib_deps =
+  ${nrf52_base.lib_deps}

arch/nrf52/nrf52840.ini

@@ -1,14 +1,9 @@
 [nrf52840_base]
 extends = nrf52_base
+
 build_flags = ${nrf52_base.build_flags} 
+
 lib_deps =
-  ${arduino_base.lib_deps}
+  ${nrf52_base.lib_deps}
   ${environmental_base.lib_deps}
   https://github.com/Kongduino/Adafruit_nRFCrypto.git#e31a8825ea3300b163a0a3c1ddd5de34e10e1371
-
-; Note: By default no lora device is created for this build - it uses a simulated interface
-[env:nrf52840dk]
-extends = nrf52840_base
-board = nrf52840_dk
-
-

arch/portduino/portduino.ini

@@ -1,7 +1,8 @@
 ; The Portduino based sim environment on top of any host OS, all hardware will be simulated
 [portduino_base]
-platform = https://github.com/meshtastic/platform-native.git#096b3c3e9c5c8e19d4c3b6cd803fffef2a9be4c5
+platform = https://github.com/meshtastic/platform-native.git#489ff929dca0bb768256ba2de45f95815111490f
 framework = arduino
+
 build_src_filter = 
   ${env.build_src_filter} 
   -<platform/esp32/> 
@@ -12,10 +13,18 @@ build_src_filter =
   -<mesh/http/>
   -<mesh/eth/>
   -<modules/esp32>
-  -<modules/Telemetry>
+  -<modules/Telemetry/EnvironmentTelemetry.cpp>
+  -<modules/Telemetry/AirQualityTelemetry.cpp>
+  -<modules/Telemetry/Sensor>
   +<../variants/portduino>
+
 lib_deps =
   ${env.lib_deps}
   ${networking_base.lib_deps}
   rweather/Crypto@^0.4.0
-build_flags = ${arduino_base.build_flags} -Isrc/platform/portduino
+  jgromes/RadioLib@6.1.0
+
+build_flags =
+  ${arduino_base.build_flags}
+  -fPIC
+  -Isrc/platform/portduino

arch/rp2040/rp2040.ini

@@ -1,7 +1,9 @@
 ; Common settings for rp2040 Processor based targets
 [rp2040_base]
-platform = https://github.com/maxgerhardt/platform-raspberrypi.git#5ce1a228e7cae453f366deb8962252b9b7356bbc
+platform = https://github.com/maxgerhardt/platform-raspberrypi.git#0c33219f53faa035e188925ea1324f472e8b93d2
 extends = arduino_base
+platform_packages = framework-arduinopico@https://github.com/earlephilhower/arduino-pico.git#3.2.2
+
 board_build.core = earlephilhower
 board_build.filesystem_size = 0.5m
 build_flags = 
@@ -10,10 +12,13 @@ build_flags =
   -D__PLAT_RP2040__
 #  -D _POSIX_THREADS
 build_src_filter = 
-  ${arduino_base.build_src_filter} -<platform/esp32/> -<nimble/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mqtt/> -<platform/nrf52/> -<platform/stm32wl> -<mesh/eth/>
+  ${arduino_base.build_src_filter} -<platform/esp32/> -<nimble/> -<mesh/api/> -<mesh/http/> -<modules/esp32> -<platform/nrf52/> -<platform/stm32wl> -<mesh/eth/>
+
 lib_ignore =
   BluetoothOTA
+
 lib_deps =
   ${arduino_base.lib_deps}
   ${environmental_base.lib_deps}
-  https://github.com/kokke/tiny-AES-c.git#f06ac37fc31dfdaca2e0d9bec83f90d5663c319b
+  jgromes/RadioLib@^6.1.0
+  https://github.com/kokke/tiny-AES-c.git#f06ac37fc31dfdaca2e0d9bec83f90d5663c319b

arch/stm32/stm32wl5e.ini

@@ -1,18 +1,29 @@
 [stm32wl5e_base]
-platform = platformio/ststm32@^15.4.1
+platform_packages = platformio/framework-arduinoststm32 @ https://github.com/stm32duino/Arduino_Core_STM32.git#6e3f9910d0122e82a6c3438507dfac3d2fd80a39
+platform = ststm32
 board = generic_wl5e
 framework = arduino
+
 build_type = debug
+
 build_flags = 
   ${arduino_base.build_flags}
   -Isrc/platform/stm32wl -g
-  -DHAL_SUBGHZ_MODULE_ENABLED
-#  Arduino/PlatformIO framework-arduinoststm32 package does not presently have SUBGHZSPI support
-#  -DPIN_SPI_MOSI=PINSUBGHZSPIMOSI -DPIN_SPI_MISO=PINSUBGHZSPIMISO -DPIN_SPI_SCK=PINSUBGHZSPISCK
+  -DconfigUSE_CMSIS_RTOS_V2=1
+  -DVECT_TAB_OFFSET=0x08000000
+  
 build_src_filter = 
-  ${arduino_base.build_src_filter} -<platform/esp32/> -<nimble/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mesh/eth/> -<mqtt/> -<graphics> -<input> -<buzz> -<modules/Telemetry> -<platform/nrf52> -<platform/portduino> -<platform/rp2040>
+  ${arduino_base.build_src_filter} -<platform/esp32/> -<nimble/> -<mesh/api/> -<mesh/http/> -<modules/esp32> -<mesh/eth/> -<input> -<buzz> -<modules/Telemetry> -<platform/nrf52> -<platform/portduino> -<platform/rp2040>
+
+board_upload.offset_address = 0x08000000
+upload_protocol = stlink
+
 lib_deps =
   ${env.lib_deps}
+  jgromes/RadioLib@^6.1.0
   https://github.com/kokke/tiny-AES-c.git#f06ac37fc31dfdaca2e0d9bec83f90d5663c319b
-lib_ignore = 
-  mathertel/OneButton@^2.0.3
+  https://github.com/littlefs-project/littlefs.git#v2.5.1
+  https://github.com/stm32duino/STM32FreeRTOS.git#10.3.1
+
+lib_ignore =
+  https://github.com/mathertel/OneButton#2.1.0

bin/build-esp32.sh

@@ -34,7 +34,7 @@ SRCBIN=.pio/build/$1/firmware.bin
 cp $SRCBIN $OUTDIR/$basename-update.bin
 
 echo "Building Filesystem for ESP32 targets"
-pio run --environment tbeam -t buildfs
-cp .pio/build/tbeam/littlefs.bin $OUTDIR/littlefs-$VERSION.bin
+pio run --environment $1 -t buildfs
+cp .pio/build/$1/littlefs.bin $OUTDIR/littlefs-$VERSION.bin
 cp bin/device-install.* $OUTDIR
 cp bin/device-update.* $OUTDIR

bin/device-install.bat

@@ -30,7 +30,13 @@ IF EXIST %FILENAME% IF x%FILENAME:update=%==x%FILENAME% (
     echo Trying to flash update %FILENAME%, but first erasing and writing system information"
 	%PYTHON% -m esptool --baud 115200 erase_flash
 	%PYTHON% -m esptool --baud 115200 write_flash 0x00 %FILENAME%
-	%PYTHON% -m esptool --baud 115200 write_flash 0x260000 bleota.bin
+    
+    @REM Account for S3 board's different OTA partition
+    IF x%FILENAME:s3=%==x%FILENAME% IF x%FILENAME:v3=%==x%FILENAME% (
+        %PYTHON% -m esptool --baud 115200 write_flash 0x260000 bleota.bin
+	) else (
+        %PYTHON% -m esptool --baud 115200 write_flash 0x260000 bleota-s3.bin
+    )
     for %%f in (littlefs-*.bin) do (
         %PYTHON% -m esptool --baud 115200 write_flash 0x300000 %%f
     )

bin/device-install.sh

@@ -45,11 +45,16 @@ shift "$((OPTIND-1))"
     shift
 }
 
-if [ -f "${FILENAME}" ] && [[ "${FILENAME}" != *"update"* ]]; then
+if [ -f "${FILENAME}" ] && [ ! -z "${FILENAME##*"update"*}" ]; then
 	echo "Trying to flash ${FILENAME}, but first erasing and writing system information"
 	"$PYTHON" -m esptool  erase_flash
 	"$PYTHON" -m esptool  write_flash 0x00 ${FILENAME}
-    "$PYTHON" -m esptool  write_flash 0x260000 bleota.bin
+	# Account for S3 board's different OTA partition
+	if [ ! -z "${FILENAME##*"s3"*}" ] && [ ! -z "${FILENAME##*"-v3"*}" ]; then
+		"$PYTHON" -m esptool  write_flash 0x260000 bleota.bin
+	else
+	    "$PYTHON" -m esptool  write_flash 0x260000 bleota-s3.bin
+	fi
 	"$PYTHON" -m esptool  write_flash 0x300000 littlefs-*.bin
 
 else

bin/device-update.sh

@@ -43,7 +43,7 @@ shift "$((OPTIND-1))"
     shift
 }
 
-if [ -f "${FILENAME}" ] && [[ $FILENAME == *"update"* ]]; then
+if [ -f "${FILENAME}" ] && [ -z "${FILENAME##*"update"*}" ]; then
 	printf "Trying to flash update ${FILENAME}"
 	$PYTHON -m esptool --baud 115200 write_flash 0x10000 ${FILENAME}
 else

bin/generate_ci_matrix.py

@@ -0,0 +1,38 @@
+#!/usr/bin/env python
+
+"""Generate the CI matrix"""
+
+import configparser
+import json
+import os
+import sys
+
+rootdir = "variants/"
+
+options = sys.argv[1:]
+
+outlist = []
+
+if len(options) < 1:
+    print(json.dumps(outlist))
+    exit()
+
+for subdir, dirs, files in os.walk(rootdir):
+    for file in files:
+        if file == "platformio.ini":
+            config = configparser.ConfigParser()
+            config.read(subdir + "/" + file)
+            for c in config.sections():
+                if c.startswith("env:"):
+                    section = config[c].name[4:]
+                    if "extends" in config[config[c].name]:
+                        if config[config[c].name]["extends"] == options[0] + "_base":
+                            if "board_level" in config[config[c].name]:
+                                if (
+                                    config[config[c].name]["board_level"] == "extra"
+                                ) & ("extra" in options):
+                                    outlist.append(section)
+                            else:
+                                outlist.append(section)
+
+print(json.dumps(outlist))

bin/readprops.py

@@ -22,9 +22,9 @@ def readProps(prefsLoc):
         isDirty = subprocess.check_output(
             ['git', 'diff', 'HEAD']).decode("utf-8").strip()
         suffix = sha
-        if isDirty:
-            # short for 'dirty', we want to keep our verstrings source for protobuf reasons
-            suffix = sha + "-d"
+        # if isDirty:
+        #     # short for 'dirty', we want to keep our verstrings source for protobuf reasons
+        #     suffix = sha + "-d"
         verObj['long'] = "{}.{}.{}.{}".format(
             version["major"], version["minor"], version["build"], suffix)
     except:

bin/regen-protos.bat

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

bin/regen-protos.sh

@@ -2,13 +2,18 @@
 
 set -e
 
-echo "This script requires https://jpa.kapsi.fi/nanopb/download/ version 0.4.6 to be located in the"
+echo "This script requires https://jpa.kapsi.fi/nanopb/download/ version 0.4.7 to be located in the"
 echo "firmware root directory if the following step fails, you should download the correct"
-echo "prebuilt binaries for your computer into nanopb-0.4.6"
+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.6/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 --experimental_allow_proto3_optional
+
+# 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/bpi_picow_esp32_s3.json

@@ -0,0 +1,38 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "esp32s3_out.ld"
+    },
+    "core": "esp32",
+    "extra_flags": [
+      "-DARDUINO_USB_CDC_ON_BOOT=1",
+      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_RUNNING_CORE=1",
+      "-DARDUINO_EVENT_RUNNING_CORE=1",
+      "-DBOARD_HAS_PSRAM"
+    ],
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "dio",
+    "hwids": [["0x303A", "0x1001"]],
+    "mcu": "esp32s3",
+    "variant": "bpi_picow_esp32_s3"
+  },
+  "connectivity": ["wifi"],
+  "debug": {
+    "openocd_target": "esp32s3.cfg"
+  },
+  "frameworks": ["arduino", "espidf"],
+  "name": "BPI-PicoW-S3 (8 MB FLASH, 2 MB PSRAM)",
+  "upload": {
+    "flash_size": "8MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 8388608,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": true,
+    "require_upload_port": true,
+    "speed": 921600
+  },
+  "url": "https://wiki.banana-pi.org/BPI-PicoW-S3",
+  "vendor": "BPI"
+}

boards/eink0.1.json

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

boards/generic_wl5e.json

@@ -9,9 +9,7 @@
     "product_line": "STM32WLE5xx"
   },
   "debug": {
-    "default_tools": [
-      "stlink"
-    ],
+    "default_tools": ["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": [
-      "cmsis-dap"
-    ]
+    "protocols": ["cmsis-dap", "stlink"]
   },
   "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": [
-    "bluetooth"
-  ],
+  "connectivity": ["bluetooth"],
   "debug": {
     "jlink_device": "nRF52832_xxAA",
     "svd_path": "nrf52.svd"
   },
-  "frameworks": [
-    "arduino"
-  ],
+  "frameworks": ["arduino"],
   "name": "lora ISP4520",
   "upload": {
     "maximum_ram_size": 65536,
@@ -36,13 +32,8 @@
     "require_upload_port": true,
     "speed": 115200,
     "protocol": "nrfutil",
-    "protocols": [
-      "jlink",
-      "nrfjprog",
-      "nrfutil",
-      "stlink"
-    ]
+    "protocols": ["jlink", "nrfjprog", "nrfutil", "stlink"]
   },
   "url": "",
   "vendor": "PsiSoft"
-}
+}

boards/my-esp32s3-diy-oled.json

@@ -0,0 +1,41 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "esp32s3_out.ld",
+      "memory_type": "qio_opi"
+    },
+    "core": "esp32",
+    "extra_flags": [
+      "-DBOARD_HAS_PSRAM",
+      "-DARDUINO_USB_CDC_ON_BOOT=1",
+      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_RUNNING_CORE=1",
+      "-DARDUINO_EVENT_RUNNING_CORE=0"
+    ],
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "qio",
+    "hwids": [["0x303A", "0x1001"]],
+    "mcu": "esp32s3",
+    "variant": "my-esp32s3-diy-oled"
+  },
+  "connectivity": ["wifi"],
+  "debug": {
+    "default_tool": "esp-builtin",
+    "onboard_tools": ["esp-builtin"],
+    "openocd_target": "esp32s3.cfg"
+  },
+  "frameworks": ["arduino", "espidf"],
+  "name": "Clone ESP32-S3-DevKitC-1 v1.1 (16 MB FLASH, 8 MB PSRAM)",
+  "upload": {
+    "flash_size": "16MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 16777216,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": true,
+    "require_upload_port": true,
+    "speed": 921600
+  },
+  "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/hw-reference/esp32s3/user-guide-devkitc-1.html",
+  "vendor": "Espressif"
+}

boards/my_esp32s3_diy_eink.json

@@ -0,0 +1,41 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "esp32s3_out.ld",
+      "memory_type": "qio_opi"
+    },
+    "core": "esp32",
+    "extra_flags": [
+      "-DBOARD_HAS_PSRAM",
+      "-DARDUINO_USB_CDC_ON_BOOT=1",
+      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_RUNNING_CORE=1",
+      "-DARDUINO_EVENT_RUNNING_CORE=0"
+    ],
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "qio",
+    "hwids": [["0x303A", "0x1001"]],
+    "mcu": "esp32s3",
+    "variant": "my_esp32s3_diy_eink"
+  },
+  "connectivity": ["wifi"],
+  "debug": {
+    "default_tool": "esp-builtin",
+    "onboard_tools": ["esp-builtin"],
+    "openocd_target": "esp32s3.cfg"
+  },
+  "frameworks": ["arduino", "espidf"],
+  "name": "Clone ESP32-S3-DevKitC-1 v1.1 (16 MB FLASH, 8 MB PSRAM)",
+  "upload": {
+    "flash_size": "16MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 16777216,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": true,
+    "require_upload_port": true,
+    "speed": 921600
+  },
+  "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/hw-reference/esp32s3/user-guide-devkitc-1.html",
+  "vendor": "Espressif"
+}

boards/nordic_pca10059.json

@@ -1,72 +1,51 @@
 {
-    "build": {
-        "arduino": {
-            "ldscript": "nrf52840_s140_v6.ld"
-        },
-        "core": "nRF5",
-        "cpu": "cortex-m4",
-        "extra_flags": "-DARDUINO_NRF52840_FEATHER -DNRF52840_XXAA",
-        "f_cpu": "64000000L",
-        "hwids": [
-            [
-                "0x239A",
-                "0x8029"
-            ],
-            [
-                "0x239A",
-                "0x0029"
-            ],
-            [
-                "0x239A",
-                "0x002A"
-            ],
-            [
-                "0x239A",
-                "0x802A"
-            ]
-        ],
-        "usb_product": "PCA10059",
-        "mcu": "nrf52840",
-        "variant": "nRF52840 Dongle",
-        "bsp": {
-            "name": "adafruit"
-        },
-        "softdevice": {
-            "sd_flags": "-DS140",
-            "sd_name": "s140",
-            "sd_version": "6.1.1",
-            "sd_fwid": "0x00B6"
-        },
-        "bootloader": {
-            "settings_addr": "0xFF000"
-        }
+  "build": {
+    "arduino": {
+      "ldscript": "nrf52840_s140_v6.ld"
     },
-    "connectivity": [
-        "bluetooth"
+    "core": "nRF5",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DARDUINO_NRF52840_FEATHER -DNRF52840_XXAA",
+    "f_cpu": "64000000L",
+    "hwids": [
+      ["0x239A", "0x8029"],
+      ["0x239A", "0x0029"],
+      ["0x239A", "0x002A"],
+      ["0x239A", "0x802A"]
     ],
-    "debug": {
-        "jlink_device": "nRF52840_xxAA",
-        "svd_path": "nrf52840.svd"
+    "usb_product": "PCA10059",
+    "mcu": "nrf52840",
+    "variant": "nRF52840 Dongle",
+    "bsp": {
+      "name": "adafruit"
     },
-    "frameworks": [
-        "arduino"
-    ],
-    "name": "nRF52840 Dongle",
-    "upload": {
-        "maximum_ram_size": 248832,
-        "maximum_size": 815104,
-        "speed": 115200,
-        "protocol": "nrfutil",
-        "protocols": [
-            "jlink",
-            "nrfjprog",
-            "nrfutil",
-            "stlink"
-        ],
-        "use_1200bps_touch": true,
-        "require_upload_port": true,
-        "wait_for_upload_port": true
+    "softdevice": {
+      "sd_flags": "-DS140",
+      "sd_name": "s140",
+      "sd_version": "6.1.1",
+      "sd_fwid": "0x00B6"
     },
-    "url": "https://www.nordicsemi.com/Products/Development-hardware/nrf52840-dongle",
-    "vendor": "Nordic Semiconductor"
+    "bootloader": {
+      "settings_addr": "0xFF000"
+    }
+  },
+  "connectivity": ["bluetooth"],
+  "debug": {
+    "jlink_device": "nRF52840_xxAA",
+    "svd_path": "nrf52840.svd"
+  },
+  "frameworks": ["arduino"],
+  "name": "nRF52840 Dongle",
+  "upload": {
+    "maximum_ram_size": 248832,
+    "maximum_size": 815104,
+    "speed": 115200,
+    "protocol": "nrfutil",
+    "protocols": ["jlink", "nrfjprog", "nrfutil", "stlink"],
+    "use_1200bps_touch": true,
+    "require_upload_port": true,
+    "wait_for_upload_port": true
+  },
+  "url": "https://www.nordicsemi.com/Products/Development-hardware/nrf52840-dongle",
+  "vendor": "Nordic Semiconductor"
 }

boards/nrf52840_dk.json

@@ -1,47 +1,46 @@
 {
-    "build": {
-      "arduino": {
-        "ldscript": "nrf52840_s140_v6.ld"
-      },
-      "core": "nRF5",
-      "cpu": "cortex-m4",
-      "extra_flags": "-DARDUINO_NRF52840_PCA10056 -DNRF52840_XXAA",
-      "f_cpu": "64000000L",
-      "hwids": [["0x239A", "0x4404"]],
-      "usb_product": "nrf52840dk",
-      "mcu": "nrf52840",
-      "variant": "pca10056",
-      "variants_dir": "variants",
-      "bsp": {
-        "name": "adafruit"
-      },
-      "softdevice": {
-        "sd_flags": "-DS140",
-        "sd_name": "s140",
-        "sd_version": "6.1.1",
-        "sd_fwid": "0x00B6"
-      },
-      "bootloader": {
-        "settings_addr": "0xFF000"
-      }
+  "build": {
+    "arduino": {
+      "ldscript": "nrf52840_s140_v6.ld"
     },
-    "connectivity": ["bluetooth"],
-    "debug": {
-      "jlink_device": "nRF52840_xxAA",
-      "onboard_tools": ["jlink"],
-      "svd_path": "nrf52840.svd"
+    "core": "nRF5",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DARDUINO_NRF52840_PCA10056 -DNRF52840_XXAA",
+    "f_cpu": "64000000L",
+    "hwids": [["0x239A", "0x4404"]],
+    "usb_product": "nrf52840dk",
+    "mcu": "nrf52840",
+    "variant": "pca10056",
+    "variants_dir": "variants",
+    "bsp": {
+      "name": "adafruit"
     },
-    "frameworks": ["arduino"],
-    "name": "A modified NRF52840-DK devboard (Adafruit BSP)",
-    "upload": {
-      "maximum_ram_size": 248832,
-      "maximum_size": 815104,
-      "require_upload_port": true,
-      "speed": 115200,
-      "protocol": "jlink",
-      "protocols": ["jlink", "nrfjprog", "stlink"]
+    "softdevice": {
+      "sd_flags": "-DS140",
+      "sd_name": "s140",
+      "sd_version": "6.1.1",
+      "sd_fwid": "0x00B6"
     },
-    "url": "https://meshtastic.org/",
-    "vendor": "Nordic Semi"
-  }
-  
+    "bootloader": {
+      "settings_addr": "0xFF000"
+    }
+  },
+  "connectivity": ["bluetooth"],
+  "debug": {
+    "jlink_device": "nRF52840_xxAA",
+    "onboard_tools": ["jlink"],
+    "svd_path": "nrf52840.svd"
+  },
+  "frameworks": ["arduino"],
+  "name": "A modified NRF52840-DK devboard (Adafruit BSP)",
+  "upload": {
+    "maximum_ram_size": 248832,
+    "maximum_size": 815104,
+    "require_upload_port": true,
+    "speed": 115200,
+    "protocol": "jlink",
+    "protocols": ["jlink", "nrfjprog", "stlink"]
+  },
+  "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": [
-      [
-        "0x239A",
-        "0x4405"
-      ]
-    ],
+    "hwids": [["0x239A", "0x4405"]],
     "usb_product": "TTGO_eink",
     "mcu": "nrf52840",
     "variant": "t-echo",
@@ -30,35 +25,24 @@
       "settings_addr": "0xFF000"
     }
   },
-  "connectivity": [
-    "bluetooth"
-  ],
+  "connectivity": ["bluetooth"],
   "debug": {
     "jlink_device": "nRF52840_xxAA",
-    "onboard_tools": [
-      "jlink"
-    ],
+    "onboard_tools": ["jlink"],
     "svd_path": "nrf52840.svd"
   },
-  "frameworks": [
-    "arduino"
-  ],
+  "frameworks": ["arduino"],
   "name": "TTGO eink (Adafruit BSP)",
-    "upload": {
-      "maximum_ram_size": 248832,
-      "maximum_size": 815104,
-      "speed": 115200,
-      "protocol": "nrfutil",
-      "protocols": [
-          "jlink",
-          "nrfjprog",
-          "nrfutil",
-          "stlink"
-      ],
-      "use_1200bps_touch": true,
-      "require_upload_port": true,
-      "wait_for_upload_port": true
+  "upload": {
+    "maximum_ram_size": 248832,
+    "maximum_size": 815104,
+    "speed": 115200,
+    "protocol": "nrfutil",
+    "protocols": ["jlink", "nrfjprog", "nrfutil", "stlink"],
+    "use_1200bps_touch": true,
+    "require_upload_port": true,
+    "wait_for_upload_port": true
   },
   "url": "FIXME",
   "vendor": "TTGO"
-}
+}

boards/tbeam-s3-core.json

@@ -1,6 +1,6 @@
 {
   "build": {
-    "arduino":{
+    "arduino": {
       "ldscript": "esp32s3_out.ld"
     },
     "core": "esp32",
@@ -8,33 +8,22 @@
       "-DBOARD_HAS_PSRAM",
       "-DLILYGO_TBEAM_S3_CORE",
       "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_DFU_ON_BOOT=1",
-      "-DARDUINO_USB_MSC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=1",
+      "-DARDUINO_USB_MODE=0",
       "-DARDUINO_RUNNING_CORE=1",
       "-DARDUINO_EVENT_RUNNING_CORE=1"
     ],
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "flash_mode": "dio",
-    "hwids": [
-      [
-        "0X303A",
-        "0x1001"
-      ]
-    ],
+    "hwids": [["0X303A", "0x1001"]],
     "mcu": "esp32s3",
     "variant": "tbeam-s3-core"
   },
-  "connectivity": [
-    "wifi"
-  ],
+  "connectivity": ["wifi"],
   "debug": {
     "openocd_target": "esp32s3.cfg"
   },
-  "frameworks": [
-    "arduino"
-  ],
+  "frameworks": ["arduino"],
   "name": "LilyGo TBeam-S3-Core",
   "upload": {
     "flash_size": "8MB",

boards/tlora-t3s3-v1.json

@@ -0,0 +1,38 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "esp32s3_out.ld"
+    },
+    "core": "esp32",
+    "extra_flags": [
+      "-DLILYGO_T3S3_V1",
+      "-DARDUINO_USB_CDC_ON_BOOT=1",
+      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_RUNNING_CORE=1",
+      "-DARDUINO_EVENT_RUNNING_CORE=1",
+      "-DBOARD_HAS_PSRAM"
+    ],
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "dio",
+    "hwids": [["0x303A", "0x1001"]],
+    "mcu": "esp32s3",
+    "variant": "tlora-t3s3-v1"
+  },
+  "connectivity": ["wifi"],
+  "debug": {
+    "openocd_target": "esp32s3.cfg"
+  },
+  "frameworks": ["arduino", "espidf"],
+  "name": "LilyGo TLora-T3S3-V1",
+  "upload": {
+    "flash_size": "4MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
+    "wait_for_upload_port": true,
+    "require_upload_port": true,
+    "speed": 921600
+  },
+  "url": "http://www.lilygo.cn/",
+  "vendor": "LilyGo"
+}

boards/wiscore_rak11200.json

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

boards/wiscore_rak11300.json

@@ -0,0 +1,40 @@
+{
+  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x2E8A",
+        "usb_pid": "0x000A"
+      }
+    },
+    "core": "earlephilhower",
+    "cpu": "cortex-m0plus",
+    "extra_flags": "-DARDUINO_GENERIC_RP2040 -DRASPBERRY_PI_PICO -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
+    "f_cpu": "133000000L",
+    "hwids": [
+      ["0x2E8A", "0x00C0"],
+      ["0x2E8A", "0x000A"]
+    ],
+    "mcu": "rp2040",
+    "variant": "WisBlock_RAK11300_Board"
+  },
+  "debug": {
+    "jlink_device": "RP2040_M0_0",
+    "openocd_target": "rp2040.cfg",
+    "svd_path": "rp2040.svd"
+  },
+  "frameworks": ["arduino"],
+  "name": "WisBlock RAK11300",
+  "upload": {
+    "maximum_ram_size": 270336,
+    "maximum_size": 2097152,
+    "require_upload_port": true,
+    "native_usb": true,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": false,
+    "protocol": "picotool",
+    "protocols": ["cmsis-dap", "raspberrypi-swd", "picotool", "picoprobe"]
+  },
+  "url": "https://docs.rakwireless.com/",
+  "vendor": "RAKwireless"
+}

boards/wiscore_rak4600.json

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

boards/wiscore_rak4631.json

@@ -1,72 +1,51 @@
 {
-    "build": {
-        "arduino": {
-            "ldscript": "nrf52840_s140_v6.ld"
-        },
-        "core": "nRF5",
-        "cpu": "cortex-m4",
-        "extra_flags": "-DARDUINO_NRF52840_FEATHER -DNRF52840_XXAA",
-        "f_cpu": "64000000L",
-        "hwids": [
-            [
-                "0x239A",
-                "0x8029"
-            ],
-            [
-                "0x239A",
-                "0x0029"
-            ],
-            [
-                "0x239A",
-                "0x002A"
-            ],
-            [
-                "0x239A",
-                "0x802A"
-            ]
-        ],
-        "usb_product": "WisCore RAK4631 Board",
-        "mcu": "nrf52840",
-        "variant": "WisCore_RAK4631_Board",
-        "bsp": {
-            "name": "adafruit"
-        },
-        "softdevice": {
-            "sd_flags": "-DS140",
-            "sd_name": "s140",
-            "sd_version": "6.1.1",
-            "sd_fwid": "0x00B6"
-        },
-        "bootloader": {
-            "settings_addr": "0xFF000"
-        }
+  "build": {
+    "arduino": {
+      "ldscript": "nrf52840_s140_v6.ld"
     },
-    "connectivity": [
-        "bluetooth"
+    "core": "nRF5",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DARDUINO_NRF52840_FEATHER -DNRF52840_XXAA",
+    "f_cpu": "64000000L",
+    "hwids": [
+      ["0x239A", "0x8029"],
+      ["0x239A", "0x0029"],
+      ["0x239A", "0x002A"],
+      ["0x239A", "0x802A"]
     ],
-    "debug": {
-        "jlink_device": "nRF52840_xxAA",
-        "svd_path": "nrf52840.svd"
+    "usb_product": "WisCore RAK4631 Board",
+    "mcu": "nrf52840",
+    "variant": "WisCore_RAK4631_Board",
+    "bsp": {
+      "name": "adafruit"
     },
-    "frameworks": [
-        "arduino"
-    ],
-    "name": "WisCore RAK4631 Board",
-    "upload": {
-        "maximum_ram_size": 248832,
-        "maximum_size": 815104,
-        "speed": 115200,
-        "protocol": "nrfutil",
-        "protocols": [
-            "jlink",
-            "nrfjprog",
-            "nrfutil",
-            "stlink"
-        ],
-        "use_1200bps_touch": true,
-        "require_upload_port": true,
-        "wait_for_upload_port": true
+    "softdevice": {
+      "sd_flags": "-DS140",
+      "sd_name": "s140",
+      "sd_version": "6.1.1",
+      "sd_fwid": "0x00B6"
     },
-    "url": "https://www.rakwireless.com",
-    "vendor": "RAKwireless"
-}
+    "bootloader": {
+      "settings_addr": "0xFF000"
+    }
+  },
+  "connectivity": ["bluetooth"],
+  "debug": {
+    "jlink_device": "nRF52840_xxAA",
+    "svd_path": "nrf52840.svd"
+  },
+  "frameworks": ["arduino"],
+  "name": "WisCore RAK4631 Board",
+  "upload": {
+    "maximum_ram_size": 248832,
+    "maximum_size": 815104,
+    "speed": 115200,
+    "protocol": "nrfutil",
+    "protocols": ["jlink", "nrfjprog", "nrfutil", "stlink"],
+    "use_1200bps_touch": true,
+    "require_upload_port": true,
+    "wait_for_upload_port": true
+  },
+  "url": "https://www.rakwireless.com",
+  "vendor": "RAKwireless"
+}

docker-compose.yml

@@ -8,6 +8,6 @@ services:
       replicas: 4
     networks:
       - mesh
-    
+
 networks:
-  mesh:
+  mesh:

monitor/filter_c3_exception_decoder.py

@@ -0,0 +1,155 @@
+# Copyright (c) 2014-present PlatformIO <contact@platformio.org>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import os
+import re
+import subprocess
+import sys
+
+from platformio.project.exception import PlatformioException
+from platformio.public import (
+    DeviceMonitorFilterBase,
+    load_build_metadata,
+)
+
+# By design, __init__ is called inside miniterm and we can't pass context to it.
+# pylint: disable=attribute-defined-outside-init
+
+IS_WINDOWS = sys.platform.startswith("win")
+
+
+class Esp32C3ExceptionDecoder(DeviceMonitorFilterBase):
+    NAME = "esp32_c3_exception_decoder"
+
+    PCADDR_PATTERN = re.compile(r'0x4[0-9a-f]{7}', re.IGNORECASE)
+
+    def __call__(self):
+        self.buffer = ""
+        self.pcaddr_re = self.PCADDR_PATTERN
+
+        self.firmware_path = None
+        self.addr2line_path = None
+        self.enabled = self.setup_paths()
+
+        if self.config.get("env:" + self.environment, "build_type") != "debug":
+            print(
+                """
+Please build project in debug configuration to get more details about an exception.
+See https://docs.platformio.org/page/projectconf/build_configurations.html
+
+"""
+            )
+
+        return self
+
+    def setup_paths(self):
+        self.project_dir = os.path.abspath(self.project_dir)
+        try:
+            data = load_build_metadata(self.project_dir, self.environment)
+            self.firmware_path = data["prog_path"]
+            if not os.path.isfile(self.firmware_path):
+                sys.stderr.write(
+                    "%s: disabling, firmware at %s does not exist, rebuild the project?\n"
+                    % (self.__class__.__name__, self.firmware_path)
+                )
+                return False
+
+            if self.addr2line_path is None:
+                cc_path = data.get("cc_path", "")
+                if "-gcc" in cc_path:
+                    self.addr2line_path = cc_path.replace("-gcc", "-addr2line")
+                else:
+                    sys.stderr.write(
+                        "%s: disabling, failed to find addr2line.\n"
+                        % self.__class__.__name__
+                    )
+                    return False
+                
+            if not os.path.isfile(self.addr2line_path):
+                sys.stderr.write(
+                    "%s: disabling, addr2line at %s does not exist\n"
+                    % (self.__class__.__name__, self.addr2line_path)
+                )
+                return False
+                
+            return True
+        except PlatformioException as e:
+            sys.stderr.write(
+                "%s: disabling, exception while looking for addr2line: %s\n"
+                % (self.__class__.__name__, e)
+            )
+            return False
+
+    def rx(self, text):
+        if not self.enabled:
+            return text
+
+        last = 0
+        while True:
+            idx = text.find("\n", last)
+            if idx == -1:
+                if len(self.buffer) < 4096:
+                    self.buffer += text[last:]
+                break
+
+            line = text[last:idx]
+            if self.buffer:
+                line = self.buffer + line
+                self.buffer = ""
+            last = idx + 1
+
+            # Output each trace on a separate line below ours
+            # Logic identical to https://github.com/espressif/esp-idf/blob/master/tools/idf_monitor_base/logger.py#L131
+            for m in re.finditer(self.pcaddr_re, line):
+                if m is None:
+                    continue
+
+                trace = self.get_backtrace(m)
+                if len(trace) != "":
+                    text = text[: last] + trace + text[last :]
+                    last += len(trace)
+
+        return text
+
+    def get_backtrace(self, match):
+        trace = "\n"
+        enc = "mbcs" if IS_WINDOWS else "utf-8"
+        args = [self.addr2line_path, u"-fipC", u"-e", self.firmware_path]
+        try:
+            addr = match.group()
+            output = (
+                subprocess.check_output(args + [addr])
+                .decode(enc)
+                .strip()
+            )
+            output = output.replace(
+                "\n", "\n     "
+            )  # newlines happen with inlined methods
+            output = self.strip_project_dir(output)
+            # Output the trace in yellow color so that it is easier to spot
+            trace += "\033[33m=> %s: %s\033[0m\n" % (addr, output)
+        except subprocess.CalledProcessError as e:
+            sys.stderr.write(
+                "%s: failed to call %s: %s\n"
+                % (self.__class__.__name__, self.addr2line_path, e)
+            )
+        return trace
+
+    def strip_project_dir(self, trace):
+        while True:
+            idx = trace.find(self.project_dir)
+            if idx == -1:
+                break
+            trace = trace[:idx] + trace[idx + len(self.project_dir) + 1 :]
+        return trace

platformio.ini

@@ -7,13 +7,13 @@
 ;default_envs = tbeam-s3-core
 ;default_envs = tbeam0.7
 ;default_envs = heltec-v1
-;default_envs = heltec-v2.0
-;default_envs = heltec-v2.1
-;default_envs = tlora-v1
+;default_envs = heltec-v2_0
+;default_envs = heltec-v2_1
 ;default_envs = tlora-v1
 ;default_envs = tlora_v1_3
 ;default_envs = tlora-v2
-;default_envs = tlora-v2-1-1.6
+;default_envs = tlora-v2-1-1_6
+;default_envs = tlora-t3s3-v1
 ;default_envs = lora-relay-v1 # nrf board
 ;default_envs = t-echo
 ;default_envs = nrf52840dk-geeksville
@@ -21,17 +21,18 @@
 ;default_envs = nano-g1
 ;default_envs = pca10059_diy_eink
 ;default_envs = meshtastic-diy-v1
-;default_envs = meshtastic-diy-v1.1
+;default_envs = meshtastic-diy-v1_1
 ;default_envs = meshtastic-dr-dev
 ;default_envs = m5stack-coreink
 ;default_envs = rak4631
+default_envs = wio-e5
 
 extra_configs =
   arch/*/*.ini
   variants/*/platformio.ini
 
 [env]
-extra_scripts = bin/platformio-custom.py 
+extra_scripts = bin/platformio-custom.py
 
 ; note: we add src to our include search path so that lmic_project_config can override
 ; note: TINYGPS_OPTION_NO_CUSTOM_FIELDS is VERY important.  We don't use custom fields and somewhere in that pile
@@ -39,8 +40,8 @@ extra_scripts = bin/platformio-custom.py
 ; FIXME: fix lib/BluetoothOTA dependency back on src/ so we can remove -Isrc
 ; 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 
+  -Wno-format
+  -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
@@ -55,18 +56,23 @@ build_flags = -Wno-missing-field-initializers
   -DRADIOLIB_EXCLUDE_MORSE
   -DRADIOLIB_EXCLUDE_RTTY
   -DRADIOLIB_EXCLUDE_SSTV
+  -DRADIOLIB_EXCLUDE_AX25
+  -DRADIOLIB_EXCLUDE_DIRECT_RECEIVE
+  -DRADIOLIB_EXCLUDE_BELL
+  -DRADIOLIB_EXCLUDE_PAGER
+  -DRADIOLIB_EXCLUDE_FSK4
+  -DRADIOLIB_EXCLUDE_APRS
 
 monitor_speed = 115200
 
 lib_deps =
-  https://github.com/meshtastic/esp8266-oled-ssd1306.git#53580644255b48ebb7a737343c6b4e71c7e11cf2 ; ESP8266_SSD1306 
-  mathertel/OneButton@^2.0.3 ; OneButton library for non-blocking button debounce
+  https://github.com/meshtastic/esp8266-oled-ssd1306.git#b38094e03dfa964fbc0e799bc374e91a605c1223 ; ESP8266_SSD1306
+  https://github.com/mathertel/OneButton#2.1.0 ; OneButton library for non-blocking button debounce
   https://github.com/meshtastic/arduino-fsm.git#7db3702bf0cfe97b783d6c72595e3f38e0b19159
   https://github.com/meshtastic/TinyGPSPlus.git#127ad674ef85f0201cb68a065879653ed94792c4
   https://github.com/meshtastic/ArduinoThread.git#72921ac222eed6f526ba1682023cee290d9aa1b3
-  nanopb/Nanopb@^0.4.6
+  nanopb/Nanopb@^0.4.7
   erriez/ErriezCRC32@^1.0.1
-  jgromes/RadioLib@^5.5.0
 
 ; Used for the code analysis in PIO Home / Inspect
 check_tool = cppcheck
@@ -82,28 +88,35 @@ framework = arduino
 lib_deps =
   ${env.lib_deps}
   mprograms/QMC5883LCompass@^1.1.1
-  https://github.com/meshtastic/SparkFun_ATECCX08a_Arduino_Library.git#52b5282639d08a8cbd4b748363089eed6102dc76
+  end2endzone/NonBlockingRTTTL@^1.3.0
+  https://github.com/meshtastic/SparkFun_ATECCX08a_Arduino_Library.git#5cf62b36c6f30bc72a07bdb2c11fc9a22d1e31da
 
 build_flags = ${env.build_flags} -Os -DRADIOLIB_SPI_PARANOID=0
 build_src_filter = ${env.build_src_filter} -<platform/portduino/>
 
-; Common libs for communicating over TCP/IP networks such as MQTT 
+; Common libs for communicating over TCP/IP networks such as MQTT
 [networking_base]
 lib_deps =
   knolleary/PubSubClient@^2.8
   arduino-libraries/NTPClient@^3.1.0
+  arcao/Syslog@^2.0.0
 
-; Common libs for environmental measurements in telemetry module 
+; Common libs for environmental measurements in telemetry module
 ; (not included in native / portduino)
 [environmental_base]
 lib_deps =
   adafruit/Adafruit BusIO@^1.11.4
-  adafruit/Adafruit Unified Sensor@^1.1.4
+  adafruit/Adafruit Unified Sensor@^1.1.9
   adafruit/Adafruit BMP280 Library@^2.6.6
   adafruit/Adafruit BME280 Library@^2.2.2
-  adafruit/Adafruit BME680 Library@^2.0.1
+  https://github.com/boschsensortec/Bosch-BSEC2-Library#v1.5.2400
+  boschsensortec/BME68x Sensor Library@^1.1.40407
   adafruit/Adafruit MCP9808 Library@^2.0.0
   adafruit/Adafruit INA260 Library@^1.5.0
   adafruit/Adafruit INA219@^1.2.0
   adafruit/Adafruit SHTC3 Library@^1.0.0
-  adafruit/Adafruit LPS2X@^2.0.4
+  adafruit/Adafruit LPS2X@^2.0.4
+  adafruit/Adafruit SHT31 Library@^2.2.0
+  adafruit/Adafruit PM25 AQI Sensor@^1.0.6
+  adafruit/Adafruit MPU6050@^2.2.4
+  adafruit/Adafruit LIS3DH@^1.2.4

src/AccelerometerThread.h

@@ -0,0 +1,92 @@
+#include "PowerFSM.h"
+#include "concurrency/OSThread.h"
+#include "configuration.h"
+#include "main.h"
+#include "power.h"
+
+#include <Adafruit_LIS3DH.h>
+#include <Adafruit_MPU6050.h>
+
+#define ACCELEROMETER_CHECK_INTERVAL_MS 100
+#define ACCELEROMETER_CLICK_THRESHOLD 40
+
+namespace concurrency
+{
+class AccelerometerThread : public concurrency::OSThread
+{
+  public:
+    AccelerometerThread(ScanI2C::DeviceType type = ScanI2C::DeviceType::NONE) : OSThread("AccelerometerThread")
+    {
+        if (accelerometer_found.port == ScanI2C::I2CPort::NO_I2C) {
+            LOG_DEBUG("AccelerometerThread disabling due to no sensors found\n");
+            disable();
+            return;
+        }
+
+        if (!config.display.wake_on_tap_or_motion && !config.device.double_tap_as_button_press) {
+            LOG_DEBUG("AccelerometerThread disabling due to no interested configurations\n");
+            disable();
+            return;
+        }
+
+        accleremoter_type = type;
+        LOG_DEBUG("AccelerometerThread initializing\n");
+
+        if (accleremoter_type == ScanI2C::DeviceType::MPU6050 && mpu.begin(accelerometer_found.address)) {
+            LOG_DEBUG("MPU6050 initializing\n");
+            // setup motion detection
+            mpu.setHighPassFilter(MPU6050_HIGHPASS_0_63_HZ);
+            mpu.setMotionDetectionThreshold(1);
+            mpu.setMotionDetectionDuration(20);
+            mpu.setInterruptPinLatch(true); // Keep it latched.  Will turn off when reinitialized.
+            mpu.setInterruptPinPolarity(true);
+        } else if (accleremoter_type == ScanI2C::DeviceType::LIS3DH && lis.begin(accelerometer_found.address)) {
+            LOG_DEBUG("LIS3DH initializing\n");
+            lis.setRange(LIS3DH_RANGE_2_G);
+            // Adjust threshhold, higher numbers are less sensitive
+            lis.setClick(config.device.double_tap_as_button_press ? 2 : 1, ACCELEROMETER_CLICK_THRESHOLD);
+        }
+    }
+
+  protected:
+    int32_t runOnce() override
+    {
+        canSleep = true; // Assume we should not keep the board awake
+
+        if (accleremoter_type == ScanI2C::DeviceType::MPU6050 && mpu.getMotionInterruptStatus()) {
+            wakeScreen();
+        } else if (accleremoter_type == ScanI2C::DeviceType::LIS3DH && lis.getClick() > 0) {
+            uint8_t click = lis.getClick();
+            if (!config.device.double_tap_as_button_press) {
+                wakeScreen();
+            }
+
+            if (config.device.double_tap_as_button_press && (click & 0x20)) {
+                buttonPress();
+                return 500;
+            }
+        }
+        return ACCELEROMETER_CHECK_INTERVAL_MS;
+    }
+
+  private:
+    void wakeScreen()
+    {
+        if (powerFSM.getState() == &stateDARK) {
+            LOG_INFO("Tap or motion detected. Turning on screen\n");
+            powerFSM.trigger(EVENT_INPUT);
+        }
+    }
+
+    void buttonPress()
+    {
+        LOG_DEBUG("Double-tap detected. Firing button press\n");
+        powerFSM.trigger(EVENT_PRESS);
+    }
+
+    ScanI2C::DeviceType accleremoter_type;
+    Adafruit_MPU6050 mpu;
+    Adafruit_LIS3DH lis;
+};
+
+} // namespace concurrency

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/BluetoothCommon.h

@@ -17,4 +17,14 @@
 extern const uint8_t MESH_SERVICE_UUID_16[], TORADIO_UUID_16[16u], FROMRADIO_UUID_16[], FROMNUM_UUID_16[];
 
 /// Given a level between 0-100, update the BLE attribute
-void updateBatteryLevel(uint8_t level);
+void updateBatteryLevel(uint8_t level);
+
+class BluetoothApi
+{
+  public:
+    virtual void setup();
+    virtual void shutdown();
+    virtual void clearBonds();
+    virtual bool isConnected();
+    virtual int getRssi() = 0;
+};

src/ButtonThread.h

@@ -45,18 +45,19 @@ class ButtonThread : public concurrency::OSThread
     ButtonThread() : OSThread("Button")
     {
 #ifdef BUTTON_PIN
-        userButton = OneButton(BUTTON_PIN, true, true);
+        userButton = OneButton(config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN, true, true);
 #ifdef INPUT_PULLUP_SENSE
         // Some platforms (nrf52) have a SENSE variant which allows wake from sleep - override what OneButton did
-        pinMode(BUTTON_PIN, INPUT_PULLUP_SENSE);
+        pinMode(config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN, INPUT_PULLUP_SENSE);
 #endif
         userButton.attachClick(userButtonPressed);
+        userButton.setClickMs(300);
         userButton.attachDuringLongPress(userButtonPressedLong);
         userButton.attachDoubleClick(userButtonDoublePressed);
         userButton.attachMultiClick(userButtonMultiPressed);
         userButton.attachLongPressStart(userButtonPressedLongStart);
         userButton.attachLongPressStop(userButtonPressedLongStop);
-        wakeOnIrq(BUTTON_PIN, FALLING);
+        wakeOnIrq(config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN, FALLING);
 #endif
 #ifdef BUTTON_PIN_ALT
         userButtonAlt = OneButton(BUTTON_PIN_ALT, true, true);
@@ -97,8 +98,8 @@ class ButtonThread : public concurrency::OSThread
         userButtonTouch.tick();
         canSleep &= userButtonTouch.isIdle();
 #endif
-        // if (!canSleep) DEBUG_MSG("Supressing sleep!\n");
-        // else DEBUG_MSG("sleep ok\n");
+        // if (!canSleep) LOG_DEBUG("Supressing sleep!\n");
+        // else LOG_DEBUG("sleep ok\n");
 
         return 5;
     }
@@ -107,14 +108,15 @@ class ButtonThread : public concurrency::OSThread
     static void touchPressed()
     {
         screen->forceDisplay();
-        DEBUG_MSG("touch press!\n");
+        LOG_DEBUG("touch press!\n");
     }
 
     static void userButtonPressed()
     {
-        // DEBUG_MSG("press!\n");
+        // LOG_DEBUG("press!\n");
 #ifdef BUTTON_PIN
-        if ((BUTTON_PIN != moduleConfig.canned_message.inputbroker_pin_press) ||
+        if (((config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN) !=
+             moduleConfig.canned_message.inputbroker_pin_press) ||
             !moduleConfig.canned_message.enabled) {
             powerFSM.trigger(EVENT_PRESS);
         }
@@ -122,38 +124,30 @@ class ButtonThread : public concurrency::OSThread
     }
     static void userButtonPressedLong()
     {
-        // DEBUG_MSG("Long press!\n");
-#ifdef ARCH_ESP32
-        screen->adjustBrightness();
-#endif
+        // LOG_DEBUG("Long press!\n");
         // If user button is held down for 5 seconds, shutdown the device.
-        if ((millis() - longPressTime > 5 * 1000) && (longPressTime > 0)) {
-#ifdef HAS_PMU
-            if (pmu_found == true) {
-                setLed(false);
-                power->shutdown();
-            }
-#elif defined(ARCH_NRF52)
+        if ((millis() - longPressTime > 5000) && (longPressTime > 0)) {
+#if defined(ARCH_NRF52) || defined(ARCH_ESP32)
             // Do actual shutdown when button released, otherwise the button release
             // may wake the board immediatedly.
             if ((!shutdown_on_long_stop) && (millis() > 30 * 1000)) {
                 screen->startShutdownScreen();
-                DEBUG_MSG("Shutdown from long press");
+                LOG_INFO("Shutdown from long press");
                 playBeep();
 #ifdef PIN_LED1
                 ledOff(PIN_LED1);
 #endif
-#ifdef PIN_LED2        
+#ifdef PIN_LED2
                 ledOff(PIN_LED2);
 #endif
-#ifdef PIN_LED3        
+#ifdef PIN_LED3
                 ledOff(PIN_LED3);
 #endif
                 shutdown_on_long_stop = true;
             }
 #endif
         } else {
-            // DEBUG_MSG("Long press %u\n", (millis() - longPressTime));
+            // LOG_DEBUG("Long press %u\n", (millis() - longPressTime));
         }
     }
 
@@ -162,19 +156,28 @@ class ButtonThread : public concurrency::OSThread
 #if defined(USE_EINK) && defined(PIN_EINK_EN)
         digitalWrite(PIN_EINK_EN, digitalRead(PIN_EINK_EN) == LOW);
 #endif
+        screen->print("Sent ad-hoc ping\n");
+        service.refreshLocalMeshNode();
+        service.sendNetworkPing(NODENUM_BROADCAST, true);
     }
 
     static void userButtonMultiPressed()
     {
-        screen->print("Sent ad-hoc ping\n");
-        service.refreshMyNodeInfo();
-        service.sendNetworkPing(NODENUM_BROADCAST, true);
+#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);
+        doGPSpowersave(config.position.gps_enabled);
+#endif
     }
 
     static void userButtonPressedLongStart()
     {
         if (millis() > 30 * 1000) {
-            DEBUG_MSG("Long press start!\n");
+            LOG_DEBUG("Long press start!\n");
             longPressTime = millis();
         }
     }
@@ -182,7 +185,7 @@ class ButtonThread : public concurrency::OSThread
     static void userButtonPressedLongStop()
     {
         if (millis() > 30 * 1000) {
-            DEBUG_MSG("Long press stop!\n");
+            LOG_DEBUG("Long press stop!\n");
             longPressTime = 0;
             if (shutdown_on_long_stop) {
                 playShutdownMelody();
@@ -193,4 +196,4 @@ class ButtonThread : public concurrency::OSThread
     }
 };
 
-} // namespace concurrency
+} // namespace concurrency

src/DebugConfiguration.cpp

@@ -0,0 +1,172 @@
+/* based on https://github.com/arcao/Syslog
+
+MIT License
+
+Copyright (c) 2016 Martin Sloup
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.*/
+
+#include "configuration.h"
+
+#include "DebugConfiguration.h"
+
+#if HAS_WIFI || HAS_ETHERNET
+
+Syslog::Syslog(UDP &client)
+{
+    this->_client = &client;
+    this->_server = NULL;
+    this->_port = 0;
+    this->_deviceHostname = SYSLOG_NILVALUE;
+    this->_appName = SYSLOG_NILVALUE;
+    this->_priDefault = LOGLEVEL_KERN;
+}
+
+Syslog &Syslog::server(const char *server, uint16_t port)
+{
+    if (this->_ip.fromString(server)) {
+        this->_server = NULL;
+    } else {
+        this->_server = server;
+    }
+    this->_port = port;
+    return *this;
+}
+
+Syslog &Syslog::server(IPAddress ip, uint16_t port)
+{
+    this->_ip = ip;
+    this->_server = NULL;
+    this->_port = port;
+    return *this;
+}
+
+Syslog &Syslog::deviceHostname(const char *deviceHostname)
+{
+    this->_deviceHostname = (deviceHostname == NULL) ? SYSLOG_NILVALUE : deviceHostname;
+    return *this;
+}
+
+Syslog &Syslog::appName(const char *appName)
+{
+    this->_appName = (appName == NULL) ? SYSLOG_NILVALUE : appName;
+    return *this;
+}
+
+Syslog &Syslog::defaultPriority(uint16_t pri)
+{
+    this->_priDefault = pri;
+    return *this;
+}
+
+Syslog &Syslog::logMask(uint8_t priMask)
+{
+    this->_priMask = priMask;
+    return *this;
+}
+
+void Syslog::enable()
+{
+    this->_enabled = true;
+}
+
+void Syslog::disable()
+{
+    this->_enabled = false;
+}
+
+bool Syslog::isEnabled()
+{
+    return this->_enabled;
+}
+
+bool Syslog::vlogf(uint16_t pri, const char *fmt, va_list args)
+{
+    return this->vlogf(pri, this->_appName, fmt, args);
+}
+
+bool Syslog::vlogf(uint16_t pri, const char *appName, const char *fmt, va_list args)
+{
+    char *message;
+    size_t initialLen;
+    size_t len;
+    bool result;
+
+    initialLen = strlen(fmt);
+
+    message = new char[initialLen + 1];
+
+    len = vsnprintf(message, initialLen + 1, fmt, args);
+    if (len > initialLen) {
+        delete[] message;
+        message = new char[len + 1];
+
+        vsnprintf(message, len + 1, fmt, args);
+    }
+
+    result = this->_sendLog(pri, appName, message);
+
+    delete[] message;
+    return result;
+}
+
+inline bool Syslog::_sendLog(uint16_t pri, const char *appName, const char *message)
+{
+    int result;
+
+    if (!this->_enabled)
+        return false;
+
+    if ((this->_server == NULL && this->_ip == INADDR_NONE) || this->_port == 0)
+        return false;
+
+    // Check priority against priMask values.
+    if ((LOG_MASK(LOG_PRI(pri)) & this->_priMask) == 0)
+        return true;
+
+    // Set default facility if none specified.
+    if ((pri & LOG_FACMASK) == 0)
+        pri = LOG_MAKEPRI(LOG_FAC(this->_priDefault), pri);
+
+    if (this->_server != NULL) {
+        result = this->_client->beginPacket(this->_server, this->_port);
+    } else {
+        result = this->_client->beginPacket(this->_ip, this->_port);
+    }
+
+    if (result != 1)
+        return false;
+
+    this->_client->print('<');
+    this->_client->print(pri);
+    this->_client->print(F(">1 - "));
+    this->_client->print(this->_deviceHostname);
+    this->_client->print(' ');
+    this->_client->print(appName);
+    this->_client->print(F(" - - - \xEF\xBB\xBF"));
+    this->_client->print(F("["));
+    this->_client->print(int(millis() / 1000));
+    this->_client->print(F("]: "));
+    this->_client->print(message);
+    this->_client->endPacket();
+
+    return true;
+}
+
+#endif

src/DebugConfiguration.h

@@ -1,3 +1,6 @@
+#ifndef SYSLOG_H
+#define SYSLOG_H
+
 // DEBUG LED
 #ifndef LED_INVERTED
 #define LED_INVERTED 0 // define as 1 if LED is active low (on)
@@ -13,20 +16,89 @@
 #define SERIAL_BAUD 115200 // Serial debug baud rate
 #endif
 
+#define MESHTASTIC_LOG_LEVEL_DEBUG "DEBUG"
+#define MESHTASTIC_LOG_LEVEL_INFO "INFO "
+#define MESHTASTIC_LOG_LEVEL_WARN "WARN "
+#define MESHTASTIC_LOG_LEVEL_ERROR "ERROR"
+#define MESHTASTIC_LOG_LEVEL_CRIT "CRIT "
+#define MESHTASTIC_LOG_LEVEL_TRACE "TRACE"
+
 #include "SerialConsole.h"
 
 #define DEBUG_PORT (*console) // Serial debug port
 
 #ifdef USE_SEGGER
-#define DEBUG_MSG(...) SEGGER_RTT_printf(0, __VA_ARGS__)
+#define DEBUG_PORT
+#define LOG_DEBUG(...) SEGGER_RTT_printf(0, __VA_ARGS__)
+#define LOG_INFO(...) SEGGER_RTT_printf(0, __VA_ARGS__)
+#define LOG_WARN(...) SEGGER_RTT_printf(0, __VA_ARGS__)
+#define LOG_ERROR(...) SEGGER_RTT_printf(0, __VA_ARGS__)
+#define LOG_CRIT(...) SEGGER_RTT_printf(0, __VA_ARGS__)
+#define LOG_TRACE(...) SEGGER_RTT_printf(0, __VA_ARGS__)
 #else
 #ifdef DEBUG_PORT
-#define DEBUG_MSG(...) DEBUG_PORT.logDebug(__VA_ARGS__)
+#define LOG_DEBUG(...) DEBUG_PORT.log(MESHTASTIC_LOG_LEVEL_DEBUG, __VA_ARGS__)
+#define LOG_INFO(...) DEBUG_PORT.log(MESHTASTIC_LOG_LEVEL_INFO, __VA_ARGS__)
+#define LOG_WARN(...) DEBUG_PORT.log(MESHTASTIC_LOG_LEVEL_WARN, __VA_ARGS__)
+#define LOG_ERROR(...) DEBUG_PORT.log(MESHTASTIC_LOG_LEVEL_ERROR, __VA_ARGS__)
+#define LOG_CRIT(...) DEBUG_PORT.log(MESHTASTIC_LOG_LEVEL_CRIT, __VA_ARGS__)
+#define LOG_TRACE(...) DEBUG_PORT.log(MESHTASTIC_LOG_LEVEL_TRACE, __VA_ARGS__)
 #else
-#define DEBUG_MSG(...)
+#define LOG_DEBUG(...)
+#define LOG_INFO(...)
+#define LOG_WARN(...)
+#define LOG_ERROR(...)
+#define LOG_CRIT(...)
+#define LOG_TRACE(...)
 #endif
 #endif
 
+#define SYSLOG_NILVALUE "-"
+
+#define SYSLOG_CRIT 2  /* critical conditions */
+#define SYSLOG_ERR 3   /* error conditions */
+#define SYSLOG_WARN 4  /* warning conditions */
+#define SYSLOG_INFO 6  /* informational */
+#define SYSLOG_DEBUG 7 /* debug-level messages */
+// trace does not go out to syslog (yet?)
+
+#define LOG_PRIMASK 0x07 /* mask to extract priority part (internal) */
+                         /* extract priority */
+#define LOG_PRI(p) ((p)&LOG_PRIMASK)
+#define LOG_MAKEPRI(fac, pri) (((fac) << 3) | (pri))
+
+/* facility codes */
+#define LOGLEVEL_KERN (0 << 3)      /* kernel messages */
+#define LOGLEVEL_USER (1 << 3)      /* random user-level messages */
+#define LOGLEVEL_MAIL (2 << 3)      /* mail system */
+#define LOGLEVEL_DAEMON (3 << 3)    /* system daemons */
+#define LOGLEVEL_AUTH (4 << 3)      /* security/authorization messages */
+#define LOGLEVEL_SYSLOG (5 << 3)    /* messages generated internally by syslogd */
+#define LOGLEVEL_LPR (6 << 3)       /* line printer subsystem */
+#define LOGLEVEL_NEWS (7 << 3)      /* network news subsystem */
+#define LOGLEVEL_UUCP (8 << 3)      /* UUCP subsystem */
+#define LOGLEVEL_CRON (9 << 3)      /* clock daemon */
+#define LOGLEVEL_AUTHPRIV (10 << 3) /* security/authorization messages (private) */
+#define LOGLEVEL_FTP (11 << 3)      /* ftp daemon */
+
+/* other codes through 15 reserved for system use */
+#define LOGLEVEL_LOCAL0 (16 << 3) /* reserved for local use */
+#define LOGLEVEL_LOCAL1 (17 << 3) /* reserved for local use */
+#define LOGLEVEL_LOCAL2 (18 << 3) /* reserved for local use */
+#define LOGLEVEL_LOCAL3 (19 << 3) /* reserved for local use */
+#define LOGLEVEL_LOCAL4 (20 << 3) /* reserved for local use */
+#define LOGLEVEL_LOCAL5 (21 << 3) /* reserved for local use */
+#define LOGLEVEL_LOCAL6 (22 << 3) /* reserved for local use */
+#define LOGLEVEL_LOCAL7 (23 << 3) /* reserved for local use */
+
+#define LOG_NFACILITIES 24 /* current number of facilities */
+#define LOG_FACMASK 0x03f8 /* mask to extract facility part */
+                           /* facility of pri */
+#define LOG_FAC(p) (((p)&LOG_FACMASK) >> 3)
+
+#define LOG_MASK(pri) (1 << (pri))             /* mask for one priority */
+#define LOG_UPTO(pri) ((1 << ((pri) + 1)) - 1) /* all priorities through pri */
+
 // -----------------------------------------------------------------------------
 // AXP192 (Rev1-specific options)
 // -----------------------------------------------------------------------------
@@ -36,3 +108,50 @@
 
 // Default Bluetooth PIN
 #define defaultBLEPin 123456
+
+#if HAS_ETHERNET
+#include <RAK13800_W5100S.h>
+#endif // HAS_ETHERNET
+
+#if HAS_WIFI
+#include <WiFi.h>
+#endif // HAS_WIFI
+
+#if HAS_WIFI || HAS_ETHERNET
+
+class Syslog
+{
+  private:
+    UDP *_client;
+    IPAddress _ip;
+    const char *_server;
+    uint16_t _port;
+    const char *_deviceHostname;
+    const char *_appName;
+    uint16_t _priDefault;
+    uint8_t _priMask = 0xff;
+    bool _enabled = false;
+
+    bool _sendLog(uint16_t pri, const char *appName, const char *message);
+
+  public:
+    explicit Syslog(UDP &client);
+
+    Syslog &server(const char *server, uint16_t port);
+    Syslog &server(IPAddress ip, uint16_t port);
+    Syslog &deviceHostname(const char *deviceHostname);
+    Syslog &appName(const char *appName);
+    Syslog &defaultPriority(uint16_t pri = LOGLEVEL_KERN);
+    Syslog &logMask(uint8_t priMask);
+
+    void enable();
+    void disable();
+    bool isEnabled();
+
+    bool vlogf(uint16_t pri, const char *fmt, va_list args) __attribute__((format(printf, 3, 0)));
+    bool vlogf(uint16_t pri, const char *appName, const char *fmt, va_list args) __attribute__((format(printf, 3, 0)));
+};
+
+#endif // HAS_ETHERNET || HAS_WIFI
+
+#endif // SYSLOG_H

src/FSCommon.cpp

@@ -1,147 +1,146 @@
-#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  
+#ifdef SDCARD_USE_SPI1
 SPIClass SPI1(HSPI);
 #define SDHandler SPI1
 #endif
 
+#endif // HAS_SDCARD
 
-#endif  //HAS_SDCARD
-
-bool copyFile(const char* from, const char* to)
+bool copyFile(const char *from, const char *to)
 {
 #ifdef FSCom
     unsigned char cbuffer[16];
-   
+
     File f1 = FSCom.open(from, FILE_O_READ);
-    if (!f1){
-        DEBUG_MSG("Failed to open source file %s\n", from);
+    if (!f1) {
+        LOG_ERROR("Failed to open source file %s\n", from);
         return false;
     }
 
     File f2 = FSCom.open(to, FILE_O_WRITE);
     if (!f2) {
-        DEBUG_MSG("Failed to open destination file %s\n", to);
+        LOG_ERROR("Failed to open destination file %s\n", to);
         return false;
     }
-   
+
     while (f1.available() > 0) {
         byte i = f1.read(cbuffer, 16);
         f2.write(cbuffer, i);
     }
-   
+
+    f2.flush();
     f2.close();
     f1.close();
     return true;
 #endif
 }
 
-bool renameFile(const char* pathFrom, const char* pathTo)
+bool renameFile(const char *pathFrom, const char *pathTo)
 {
 #ifdef FSCom
 #ifdef ARCH_ESP32
     // rename was fixed for ESP32 IDF LittleFS in April
     return FSCom.rename(pathFrom, pathTo);
 #else
-    if (copyFile(pathFrom, pathTo) && FSCom.remove(pathFrom) ) {
+    if (copyFile(pathFrom, pathTo) && FSCom.remove(pathFrom)) {
         return true;
-    } else{
+    } else {
         return false;
     }
 #endif
 #endif
 }
 
-void listDir(const char * dirname, uint8_t levels, boolean del = false)
+void listDir(const char *dirname, uint8_t levels, bool del = false)
 {
 #ifdef FSCom
 #if (defined(ARCH_ESP32) || defined(ARCH_RP2040) || defined(ARCH_PORTDUINO))
     char buffer[255];
 #endif
     File root = FSCom.open(dirname, FILE_O_READ);
-    if(!root){
+    if (!root) {
         return;
     }
-    if(!root.isDirectory()){
+    if (!root.isDirectory()) {
         return;
     }
 
     File file = root.openNextFile();
-    while(file){
-        if(file.isDirectory() && !String(file.name()).endsWith(".")) {
-            if(levels){
+    while (file) {
+        if (file.isDirectory() && !String(file.name()).endsWith(".")) {
+            if (levels) {
 #ifdef ARCH_ESP32
-                listDir(file.path(), levels -1, del);
-                if(del) { 
-                    DEBUG_MSG("Removing %s\n", file.path());
-                    strcpy(buffer, file.path());
+                listDir(file.path(), levels - 1, del);
+                if (del) {
+                    LOG_DEBUG("Removing %s\n", file.path());
+                    strncpy(buffer, file.path(), sizeof(buffer));
                     file.close();
                     FSCom.rmdir(buffer);
                 } else {
                     file.close();
                 }
 #elif (defined(ARCH_RP2040) || defined(ARCH_PORTDUINO))
-                listDir(file.name(), levels -1, del);
-                if(del) { 
-                    DEBUG_MSG("Removing %s\n", file.name());
-                    strcpy(buffer, file.name());
+                listDir(file.name(), levels - 1, del);
+                if (del) {
+                    LOG_DEBUG("Removing %s\n", file.name());
+                    strncpy(buffer, file.name(), sizeof(buffer));
                     file.close();
                     FSCom.rmdir(buffer);
                 } else {
                     file.close();
-                }                
+                }
 #else
-                listDir(file.name(), levels -1, del);
+                listDir(file.name(), levels - 1, del);
                 file.close();
 #endif
             }
         } else {
 #ifdef ARCH_ESP32
-            if(del) {
-                DEBUG_MSG("Deleting %s\n", file.path());
-                strcpy(buffer, file.path());
+            if (del) {
+                LOG_DEBUG("Deleting %s\n", file.path());
+                strncpy(buffer, file.path(), sizeof(buffer));
                 file.close();
                 FSCom.remove(buffer);
             } else {
-            DEBUG_MSG(" %s (%i Bytes)\n", file.path(), file.size());
+                LOG_DEBUG(" %s (%i Bytes)\n", file.path(), file.size());
                 file.close();
             }
 #elif (defined(ARCH_RP2040) || defined(ARCH_PORTDUINO))
-            if(del) {
-                DEBUG_MSG("Deleting %s\n", file.name());
-                strcpy(buffer, file.name());
+            if (del) {
+                LOG_DEBUG("Deleting %s\n", file.name());
+                strncpy(buffer, file.name(), sizeof(buffer));
                 file.close();
                 FSCom.remove(buffer);
             } else {
-                DEBUG_MSG(" %s (%i Bytes)\n", file.name(), file.size());
+                LOG_DEBUG(" %s (%i Bytes)\n", file.name(), file.size());
                 file.close();
             }
 #else
-            DEBUG_MSG(" %s (%i Bytes)\n", file.name(), file.size());
+            LOG_DEBUG(" %s (%i Bytes)\n", file.name(), file.size());
             file.close();
-#endif            
+#endif
         }
         file = root.openNextFile();
     }
-#ifdef ARCH_ESP32    
-    if(del) { 
-        DEBUG_MSG("Removing %s\n", root.path());
-        strcpy(buffer, root.path());
+#ifdef ARCH_ESP32
+    if (del) {
+        LOG_DEBUG("Removing %s\n", root.path());
+        strncpy(buffer, root.path(), sizeof(buffer));
         root.close();
         FSCom.rmdir(buffer);
     } else {
         root.close();
     }
 #elif (defined(ARCH_RP2040) || defined(ARCH_PORTDUINO))
-    if(del) { 
-        DEBUG_MSG("Removing %s\n", root.name());
-        strcpy(buffer, root.name());
+    if (del) {
+        LOG_DEBUG("Removing %s\n", root.name());
+        strncpy(buffer, root.name(), sizeof(buffer));
         root.close();
         FSCom.rmdir(buffer);
     } else {
@@ -153,7 +152,7 @@ void listDir(const char * dirname, uint8_t levels, boolean del = false)
 #endif
 }
 
-void rmDir(const char * dirname)
+void rmDir(const char *dirname)
 {
 #ifdef FSCom
 #if (defined(ARCH_ESP32) || defined(ARCH_RP2040) || defined(ARCH_PORTDUINO))
@@ -168,52 +167,47 @@ void rmDir(const char * dirname)
 void fsInit()
 {
 #ifdef FSCom
-    if (!FSBegin())
-    {
-        DEBUG_MSG("ERROR filesystem mount Failed. Formatting...\n");
-        assert(0); // FIXME - report failure to phone
+    if (!FSBegin()) {
+        LOG_ERROR("Filesystem mount Failed.\n");
+        // assert(0); This auto-formats the partition, so no need to fail here.
     }
 #ifdef ARCH_ESP32
-    DEBUG_MSG("Filesystem files (%d/%d Bytes):\n", FSCom.usedBytes(), FSCom.totalBytes());
+    LOG_DEBUG("Filesystem files (%d/%d Bytes):\n", FSCom.usedBytes(), FSCom.totalBytes());
 #else
-    DEBUG_MSG("Filesystem files:\n");
+    LOG_DEBUG("Filesystem files:\n");
 #endif
     listDir("/", 10);
 #endif
 }
 
-
 void setupSDCard()
 {
 #ifdef HAS_SDCARD
     SDHandler.begin(SPI_SCK, SPI_MISO, SPI_MOSI);
 
     if (!SD.begin(SDCARD_CS, SDHandler)) {
-        DEBUG_MSG("No SD_MMC card detected\n");
-        return ;
+        LOG_DEBUG("No SD_MMC card detected\n");
+        return;
     }
     uint8_t cardType = SD.cardType();
     if (cardType == CARD_NONE) {
-        DEBUG_MSG("No SD_MMC card attached\n");
-        return ;
+        LOG_DEBUG("No SD_MMC card attached\n");
+        return;
     }
-    DEBUG_MSG("SD_MMC Card Type: ");
+    LOG_DEBUG("SD_MMC Card Type: ");
     if (cardType == CARD_MMC) {
-        DEBUG_MSG("MMC\n");
+        LOG_DEBUG("MMC\n");
     } else if (cardType == CARD_SD) {
-        DEBUG_MSG("SDSC\n");
+        LOG_DEBUG("SDSC\n");
     } else if (cardType == CARD_SDHC) {
-        DEBUG_MSG("SDHC\n");
+        LOG_DEBUG("SDHC\n");
     } else {
-        DEBUG_MSG("UNKNOWN\n");
+        LOG_DEBUG("UNKNOWN\n");
     }
 
     uint64_t cardSize = SD.cardSize() / (1024 * 1024);
-    DEBUG_MSG("SD Card Size: %lluMB\n", cardSize);
-    DEBUG_MSG("Total space: %llu MB\n", SD.totalBytes() / (1024 * 1024));
-    DEBUG_MSG("Used space: %llu MB\n", SD.usedBytes() / (1024 * 1024));
+    LOG_DEBUG("SD Card Size: %lluMB\n", cardSize);
+    LOG_DEBUG("Total space: %llu MB\n", SD.totalBytes() / (1024 * 1024));
+    LOG_DEBUG("Used space: %llu MB\n", SD.usedBytes() / (1024 * 1024));
 #endif
 }
-
-
-

src/FSCommon.h

@@ -13,11 +13,18 @@
 #define FILE_O_READ "r"
 #endif
 
+#if defined(ARCH_STM32WL)
+#include "platform/stm32wl/InternalFileSystem.h" // STM32WL version
+#define FSCom InternalFS
+#define FSBegin() FSCom.begin()
+using namespace LittleFS_Namespace;
+#endif
+
 #if defined(ARCH_RP2040)
 // RP2040
 #include "LittleFS.h"
 #define FSCom LittleFS
-#define FSBegin() FSCom.begin()
+#define FSBegin() FSCom.begin() // set autoformat
 #define FILE_O_WRITE "w"
 #define FILE_O_READ "r"
 #endif
@@ -26,7 +33,7 @@
 // ESP32 version
 #include "LittleFS.h"
 #define FSCom LittleFS
-#define FSBegin() FSCom.begin(true)
+#define FSBegin() FSCom.begin(true) // format on failure
 #define FILE_O_WRITE "w"
 #define FILE_O_READ "r"
 #endif
@@ -35,13 +42,13 @@
 // NRF52 version
 #include "InternalFileSystem.h"
 #define FSCom InternalFS
-#define FSBegin() FSCom.begin()
+#define FSBegin() FSCom.begin() // InternalFS formats on failure
 using namespace Adafruit_LittleFS_Namespace;
 #endif
 
 void fsInit();
-bool copyFile(const char* from, const char* to);
-bool renameFile(const char* pathFrom, const char* pathTo);
-void listDir(const char * dirname, uint8_t levels, boolean del);
-void rmDir(const char * dirname);
+bool copyFile(const char *from, const char *to);
+bool renameFile(const char *pathFrom, const char *pathTo);
+void listDir(const char *dirname, uint8_t levels, bool del);
+void rmDir(const char *dirname);
 void setupSDCard();

src/GPSStatus.h

@@ -20,16 +20,19 @@ class GPSStatus : public Status
     bool hasLock = false;     // default to false, until we complete our first read
     bool isConnected = false; // Do we have a GPS we are talking to
 
-    Position p = Position_init_default;
+    bool isPowerSaving = false; // Are we in power saving state
+
+    meshtastic_Position p = meshtastic_Position_init_default;
 
   public:
     GPSStatus() { statusType = STATUS_TYPE_GPS; }
 
     // preferred method
-    GPSStatus(bool hasLock, bool isConnected, const Position &pos) : Status()
+    GPSStatus(bool hasLock, bool isConnected, bool isPowerSaving, const meshtastic_Position &pos) : Status()
     {
         this->hasLock = hasLock;
         this->isConnected = isConnected;
+        this->isPowerSaving = isPowerSaving;
 
         // all-in-one struct copy
         this->p = pos;
@@ -44,13 +47,15 @@ class GPSStatus : public Status
 
     bool getIsConnected() const { return isConnected; }
 
+    bool getIsPowerSaving() const { return isPowerSaving; }
+
     int32_t getLatitude() const
     {
         if (config.position.fixed_position) {
 #ifdef GPS_EXTRAVERBOSE
-            DEBUG_MSG("WARNING: Using fixed latitude\n");
+            LOG_WARN("Using fixed latitude\n");
 #endif
-            NodeInfo *node = nodeDB.getNode(nodeDB.getNodeNum());
+            meshtastic_NodeInfoLite *node = nodeDB.getMeshNode(nodeDB.getNodeNum());
             return node->position.latitude_i;
         } else {
             return p.latitude_i;
@@ -61,9 +66,9 @@ class GPSStatus : public Status
     {
         if (config.position.fixed_position) {
 #ifdef GPS_EXTRAVERBOSE
-            DEBUG_MSG("WARNING: Using fixed longitude\n");
+            LOG_WARN("Using fixed longitude\n");
 #endif
-            NodeInfo *node = nodeDB.getNode(nodeDB.getNodeNum());
+            meshtastic_NodeInfoLite *node = nodeDB.getMeshNode(nodeDB.getNodeNum());
             return node->position.longitude_i;
         } else {
             return p.longitude_i;
@@ -74,31 +79,40 @@ class GPSStatus : public Status
     {
         if (config.position.fixed_position) {
 #ifdef GPS_EXTRAVERBOSE
-            DEBUG_MSG("WARNING: Using fixed altitude\n");
+            LOG_WARN("Using fixed altitude\n");
 #endif
-            NodeInfo *node = nodeDB.getNode(nodeDB.getNodeNum());
+            meshtastic_NodeInfoLite *node = nodeDB.getMeshNode(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
-        DEBUG_MSG("GPSStatus.match() new pos@%x to old pos@%x\n", newStatus->p.pos_timestamp, p.pos_timestamp);
+        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->p.latitude_i != p.latitude_i || newStatus->p.longitude_i != p.longitude_i ||
-                newStatus->p.altitude != p.altitude || newStatus->p.altitude_hae != p.altitude_hae ||
-                newStatus->p.PDOP != p.PDOP || newStatus->p.ground_track != p.ground_track ||
-                newStatus->p.ground_speed != p.ground_speed ||
+                newStatus->isPowerSaving != isPowerSaving || newStatus->p.latitude_i != p.latitude_i ||
+                newStatus->p.longitude_i != p.longitude_i || newStatus->p.altitude != p.altitude ||
+                newStatus->p.altitude_hae != p.altitude_hae || newStatus->p.PDOP != p.PDOP ||
+                newStatus->p.ground_track != p.ground_track || newStatus->p.ground_speed != p.ground_speed ||
                 newStatus->p.sats_in_view != p.sats_in_view);
     }
 
@@ -109,7 +123,7 @@ class GPSStatus : public Status
 
         if (isDirty && p.timestamp && (newStatus->p.timestamp == p.timestamp)) {
             // We can NEVER be in two locations at the same time! (also PR #886)
-            DEBUG_MSG("BUG!! positional timestamp unchanged from prev solution\n");
+            LOG_ERROR("BUG: Positional timestamp unchanged from prev solution\n");
         }
 
         initialized = true;
@@ -121,11 +135,12 @@ class GPSStatus : public Status
         if (isDirty) {
             if (hasLock) {
                 // In debug logs, identify position by @timestamp:stage (stage 3 = notify)
-                DEBUG_MSG("New GPS pos@%x:3 lat=%f, lon=%f, alt=%d, pdop=%.2f, track=%.2f, speed=%.2f, sats=%d\n", p.timestamp,
+                LOG_DEBUG("New GPS pos@%x:3 lat=%f, lon=%f, alt=%d, pdop=%.2f, track=%.2f, speed=%.2f, sats=%d\n", p.timestamp,
                           p.latitude_i * 1e-7, p.longitude_i * 1e-7, p.altitude, p.PDOP * 1e-2, p.ground_track * 1e-5,
                           p.ground_speed * 1e-2, p.sats_in_view);
-            } else
-                DEBUG_MSG("No GPS lock\n");
+            } else {
+                LOG_DEBUG("No GPS lock\n");
+            }
             onNewStatus.notifyObservers(this);
         }
         return 0;
@@ -134,4 +149,4 @@ class GPSStatus : public Status
 
 } // namespace meshtastic
 
-extern meshtastic::GPSStatus *gpsStatus;
+extern meshtastic::GPSStatus *gpsStatus;

src/NodeStatus.h

@@ -1,83 +1,68 @@
 #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
+/// Describes the state of the NodeDB system.
+class NodeStatus : public Status
+{
+
+  private:
+    CallbackObserver<NodeStatus, const NodeStatus *> statusObserver =
+        CallbackObserver<NodeStatus, const NodeStatus *>(this, &NodeStatus::updateStatus);
+
+    uint8_t numOnline = 0;
+    uint8_t numTotal = 0;
+
+    uint8_t lastNumTotal = 0;
+
+  public:
+    bool forceUpdate = false;
+
+    NodeStatus() { statusType = STATUS_TYPE_NODE; }
+    NodeStatus(uint8_t numOnline, uint8_t numTotal, bool forceUpdate = false) : Status()
     {
+        this->forceUpdate = forceUpdate;
+        this->numOnline = numOnline;
+        this->numTotal = numTotal;
+    }
+    NodeStatus(const NodeStatus &);
+    NodeStatus &operator=(const NodeStatus &);
 
-       private:
-        CallbackObserver<NodeStatus, const NodeStatus *> statusObserver = CallbackObserver<NodeStatus, const NodeStatus *>(this, &NodeStatus::updateStatus);
+    void observe(Observable<const NodeStatus *> *source) { statusObserver.observe(source); }
 
-        uint8_t numOnline = 0;
-        uint8_t numTotal = 0;
+    uint8_t getNumOnline() const { return numOnline; }
 
-        uint8_t lastNumTotal = 0;
+    uint8_t getNumTotal() const { return numTotal; }
 
-       public:
-        bool forceUpdate = false;
+    uint8_t getLastNumTotal() const { return lastNumTotal; }
 
-        NodeStatus() {
-            statusType = STATUS_TYPE_NODE;
-        }
-        NodeStatus( uint8_t numOnline, uint8_t numTotal, bool forceUpdate = false ) : Status()
+    bool matches(const NodeStatus *newStatus) const
+    {
+        return (newStatus->getNumOnline() != numOnline || newStatus->getNumTotal() != numTotal);
+    }
+    int updateStatus(const NodeStatus *newStatus)
+    {
+        // Only update the status if values have actually changed
+        lastNumTotal = numTotal;
+        bool isDirty;
         {
-            this->forceUpdate = forceUpdate;
-            this->numOnline = numOnline;
-            this->numTotal = numTotal;
+            isDirty = matches(newStatus);
+            initialized = true;
+            numOnline = newStatus->getNumOnline();
+            numTotal = newStatus->getNumTotal();
         }
-        NodeStatus(const NodeStatus &);
-        NodeStatus &operator=(const NodeStatus &);
-
-        void observe(Observable<const NodeStatus *> *source)
-        {
-            statusObserver.observe(source);
+        if (isDirty || newStatus->forceUpdate) {
+            LOG_DEBUG("Node status update: %d online, %d total\n", numOnline, numTotal);
+            onNewStatus.notifyObservers(this);
         }
+        return 0;
+    }
+};
 
-        uint8_t getNumOnline() const
-        { 
-            return numOnline; 
-        }
-
-        uint8_t getNumTotal() const
-        { 
-            return numTotal; 
-        }
-
-        uint8_t getLastNumTotal() const
-        {
-            return lastNumTotal;
-        }
-
-        bool matches(const NodeStatus *newStatus) const
-        {
-            return (
-                newStatus->getNumOnline() != numOnline ||
-                newStatus->getNumTotal() != numTotal
-            );
-        }
-        int updateStatus(const NodeStatus *newStatus) {
-            // Only update the status if values have actually changed
-            lastNumTotal = numTotal;
-            bool isDirty;
-            {
-                isDirty = matches(newStatus);
-                initialized = true; 
-                numOnline = newStatus->getNumOnline();
-                numTotal = newStatus->getNumTotal();
-            }
-            if(isDirty || newStatus->forceUpdate) {
-                DEBUG_MSG("Node status update: %d online, %d total\n", numOnline, numTotal);            
-                onNewStatus.notifyObservers(this);
-            }
-            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/Observer.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <Arduino.h>
-#include <assert.h>
 #include <list>
 
 template <class T> class Observable;
@@ -11,7 +10,7 @@ template <class T> class Observable;
  */
 template <class T> class Observer
 {
-  std::list<Observable<T> *> observed;
+    std::list<Observable<T> *> observed;
 
   public:
     virtual ~Observer();
@@ -88,7 +87,7 @@ template <class T> class Observable
 template <class T> Observer<T>::~Observer()
 {
     for (typename std::list<Observable<T> *>::const_iterator iterator = observed.begin(); iterator != observed.end();
-        ++iterator) {
+         ++iterator) {
         (*iterator)->removeObserver(this);
     }
     observed.clear();

src/Power.cpp

@@ -1,18 +1,54 @@
 #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 DEBUG_HEAP_MQTT
+#include "mqtt/MQTT.h"
+#include "target_specific.h"
+#include <WiFi.h>
+#endif
+
+#ifndef DELAY_FOREVER
+#define DELAY_FOREVER portMAX_DELAY
+#endif
+
+#if defined(BATTERY_PIN) && defined(ARCH_ESP32)
+
+#ifndef BAT_MEASURE_ADC_UNIT // ADC1 is default
+static const adc1_channel_t adc_channel = ADC_CHANNEL;
+static const adc_unit_t unit = ADC_UNIT_1;
+#else // ADC2
+static const adc2_channel_t adc_channel = ADC_CHANNEL;
+static const adc_unit_t unit = ADC_UNIT_2;
+RTC_NOINIT_ATTR uint64_t RTC_reg_b;
+
+#endif // BAT_MEASURE_ADC_UNIT
+
+esp_adc_cal_characteristics_t *adc_characs = (esp_adc_cal_characteristics_t *)calloc(1, sizeof(esp_adc_cal_characteristics_t));
+#ifndef ADC_ATTENUATION
+static const adc_atten_t atten = ADC_ATTEN_DB_11;
+#else
+static const adc_atten_t atten = ADC_ATTENUATION;
+#endif
+#endif // BATTERY_PIN && ARCH_ESP32
+
+#if HAS_TELEMETRY && !defined(ARCH_PORTDUINO)
+INA260Sensor ina260Sensor;
+INA219Sensor ina219Sensor;
+#endif
 
 #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.
 // I'd rather not inlude axp20x.h as it brings Wire dependency.
 class HasBatteryLevel
@@ -98,38 +134,68 @@ class AnalogBatteryLevel : public HasBatteryLevel
     virtual uint16_t getBattVoltage() override
     {
 
+#if defined(HAS_TELEMETRY) && !defined(ARCH_PORTDUINO) && !defined(HAS_PMU)
+        if (hasINA()) {
+            LOG_DEBUG("Using INA on I2C addr 0x%x for device battery voltage\n", config.power.device_battery_ina_address);
+            return getINAVoltage();
+        }
+#endif
+
 #ifndef ADC_MULTIPLIER
 #define ADC_MULTIPLIER 2.0
 #endif
 
+#ifndef BATTERY_SENSE_SAMPLES
+#define BATTERY_SENSE_SAMPLES 30
+#endif
+
 #ifdef BATTERY_PIN
         // Override variant or default ADC_MULTIPLIER if we have the override pref
-        float operativeAdcMultiplier = config.power.adc_multiplier_override > 0
-                                           ? config.power.adc_multiplier_override
-                                           : ADC_MULTIPLIER;
+        float operativeAdcMultiplier =
+            config.power.adc_multiplier_override > 0 ? config.power.adc_multiplier_override : ADC_MULTIPLIER;
         // Do not call analogRead() often.
         const uint32_t min_read_interval = 5000;
         if (millis() - last_read_time_ms > min_read_interval) {
             last_read_time_ms = millis();
 
-#ifdef BATTERY_SENSE_SAMPLES
-//Set the number of samples, it has an effect of increasing sensitivity, especially in complex electromagnetic environment.
+            // 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++){
+#ifdef ARCH_ESP32
+#ifndef BAT_MEASURE_ADC_UNIT // ADC1
+            for (int i = 0; i < BATTERY_SENSE_SAMPLES; i++) {
+                raw += adc1_get_raw(adc_channel);
+            }
+#else  // ADC2
+            int32_t adc_buf = 0;
+            for (int i = 0; i < BATTERY_SENSE_SAMPLES; i++) {
+                // ADC2 wifi bug workaround, see
+                // https://github.com/espressif/arduino-esp32/issues/102
+                WRITE_PERI_REG(SENS_SAR_READ_CTRL2_REG, RTC_reg_b);
+                SET_PERI_REG_MASK(SENS_SAR_READ_CTRL2_REG, SENS_SAR2_DATA_INV);
+                adc2_get_raw(adc_channel, ADC_WIDTH_BIT_12, &adc_buf);
+                raw += adc_buf;
+            }
+#endif // BAT_MEASURE_ADC_UNIT
+#else  // !ARCH_ESP32
+            for (uint32_t i = 0; i < BATTERY_SENSE_SAMPLES; i++) {
                 raw += analogRead(BATTERY_PIN);
             }
-            raw = raw/BATTERY_SENSE_SAMPLES;
-#else
-            uint32_t raw = analogRead(BATTERY_PIN);
 #endif
-
+            raw = raw / BATTERY_SENSE_SAMPLES;
             float scaled;
+#ifdef ARCH_ESP32
+            scaled = esp_adc_cal_raw_to_voltage(raw, adc_characs);
+            scaled *= operativeAdcMultiplier;
+#else
 #ifndef VBAT_RAW_TO_SCALED
             scaled = 1000.0 * operativeAdcMultiplier * (AREF_VOLTAGE / 1024.0) * raw;
 #else
             scaled = VBAT_RAW_TO_SCALED(raw); // defined in variant.h
-#endif
-            // DEBUG_MSG("battery gpio %d raw val=%u scaled=%u\n", BATTERY_PIN, raw, (uint32_t)(scaled));
+#endif // VBAT RAW TO SCALED
+#endif // ARCH_ESP32
+       // LOG_DEBUG("battery gpio %d raw val=%u scaled=%u\n", BATTERY_PIN, raw, (uint32_t)(scaled));
+
             last_read_value = scaled;
             return scaled;
         } else {
@@ -137,21 +203,40 @@ class AnalogBatteryLevel : public HasBatteryLevel
         }
 #else
         return 0;
-#endif
+#endif // BATTERY_PIN
     }
 
     /**
      * 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; }
+    /// On some boards we don't have the power management chip (like AXPxxxx)
+    /// so we use EXT_PWR_DETECT GPIO pin to detect external power source
+    virtual bool isVbusIn() override
+    {
+#ifdef EXT_PWR_DETECT
+        // if external powered that pin will be pulled up
+        if (digitalRead(EXT_PWR_DETECT) == HIGH) {
+            return true;
+        }
+        // if it's not HIGH - check the battery
+#endif
+
+        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
@@ -159,21 +244,50 @@ class AnalogBatteryLevel : public HasBatteryLevel
 
 #ifndef BAT_FULLVOLT
 #define BAT_FULLVOLT 4200
-#endif 
+#endif
 #ifndef BAT_EMPTYVOLT
 #define BAT_EMPTYVOLT 3270
-#endif 
+#endif
 #ifndef BAT_CHARGINGVOLT
 #define BAT_CHARGINGVOLT 4210
-#endif 
+#endif
 #ifndef BAT_NOBATVOLT
 #define BAT_NOBATVOLT 2230
-#endif 
+#endif
 
     /// For heltecs with no battery connected, the measured voltage is 2204, so raising to 2230 from 2100
     const float fullVolt = BAT_FULLVOLT, emptyVolt = BAT_EMPTYVOLT, chargingVolt = BAT_CHARGINGVOLT, noBatVolt = BAT_NOBATVOLT;
     float last_read_value = 0.0;
     uint32_t last_read_time_ms = 0;
+
+#if defined(HAS_TELEMETRY) && !defined(ARCH_PORTDUINO)
+    uint16_t getINAVoltage()
+    {
+        if (nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_INA219] == config.power.device_battery_ina_address) {
+            return ina219Sensor.getBusVoltageMv();
+        } else if (nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_INA260] == config.power.device_battery_ina_address) {
+            return ina260Sensor.getBusVoltageMv();
+        }
+        return 0;
+    }
+
+    bool hasINA()
+    {
+        if (!config.power.device_battery_ina_address) {
+            return false;
+        }
+        if (nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_INA219] == config.power.device_battery_ina_address) {
+            if (!ina219Sensor.isInitialized())
+                return ina219Sensor.runOnce() > 0;
+            return ina219Sensor.isRunning();
+        } else if (nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_INA260] == config.power.device_battery_ina_address) {
+            if (!ina260Sensor.isInitialized())
+                return ina260Sensor.runOnce() > 0;
+            return ina260Sensor.isRunning();
+        }
+        return false;
+    }
+#endif
 };
 
 AnalogBatteryLevel analogLevel;
@@ -182,35 +296,69 @@ Power::Power() : OSThread("Power")
 {
     statusHandler = {};
     low_voltage_counter = 0;
+#ifdef DEBUG_HEAP
+    lastheap = memGet.getFreeHeap();
+#endif
 }
 
 bool Power::analogInit()
 {
+#ifdef EXT_PWR_DETECT
+    pinMode(EXT_PWR_DETECT, INPUT);
+#endif
+
 #ifdef BATTERY_PIN
-    DEBUG_MSG("Using analog input %d for battery level\n", BATTERY_PIN);
+    LOG_DEBUG("Using analog input %d for battery level\n", BATTERY_PIN);
 
     // disable any internal pullups
     pinMode(BATTERY_PIN, INPUT);
 
-#ifdef ARCH_ESP32
-    // ESP32 needs special analog stuff
-    adcAttachPin(BATTERY_PIN);
+#ifndef BATTERY_SENSE_RESOLUTION_BITS
+#define BATTERY_SENSE_RESOLUTION_BITS 10
 #endif
+
+#ifdef ARCH_ESP32 // ESP32 needs special analog stuff
+
+#ifndef ADC_WIDTH // max resolution by default
+    static const adc_bits_width_t width = ADC_WIDTH_BIT_12;
+#else
+    static const adc_bits_width_t width = ADC_WIDTH;
+#endif
+#ifndef BAT_MEASURE_ADC_UNIT // ADC1
+    adc1_config_width(width);
+    adc1_config_channel_atten(adc_channel, atten);
+#else // ADC2
+    adc2_config_channel_atten(adc_channel, atten);
+    // ADC2 wifi bug workaround
+    RTC_reg_b = READ_PERI_REG(SENS_SAR_READ_CTRL2_REG);
+#endif
+    // calibrate ADC
+    esp_adc_cal_value_t val_type = esp_adc_cal_characterize(unit, atten, width, DEFAULT_VREF, adc_characs);
+    // show ADC characterization base
+    if (val_type == ESP_ADC_CAL_VAL_EFUSE_TP) {
+        LOG_INFO("ADCmod: ADC characterization based on Two Point values stored in eFuse\n");
+    } else if (val_type == ESP_ADC_CAL_VAL_EFUSE_VREF) {
+        LOG_INFO("ADCmod: ADC characterization based on reference voltage stored in eFuse\n");
+    } else {
+        LOG_INFO("ADCmod: ADC characterization based on default reference voltage\n");
+    }
+#if defined(HELTEC_V3) || defined(HELTEC_WSL_V3)
+    pinMode(37, OUTPUT); // needed for P channel mosfet to work
+    digitalWrite(37, LOW);
+#endif
+#endif // ARCH_ESP32
+
 #ifdef ARCH_NRF52
 #ifdef VBAT_AR_INTERNAL
     analogReference(VBAT_AR_INTERNAL);
 #else
     analogReference(AR_INTERNAL); // 3.6V
 #endif
-#endif
-
-#ifndef BATTERY_SENSE_RESOLUTION_BITS
-#define BATTERY_SENSE_RESOLUTION_BITS 10
-#endif
-
-    // adcStart(BATTERY_PIN);
     analogReadResolution(BATTERY_SENSE_RESOLUTION_BITS); // Default of 12 is not very linear. Recommended to use 10 or 11
                                                          // depending on needed resolution.
+
+#endif // ARCH_NRF52
+
     batteryLevel = &analogLevel;
     return true;
 #else
@@ -235,19 +383,26 @@ void Power::shutdown()
 {
     screen->setOn(false);
 #if defined(USE_EINK) && defined(PIN_EINK_EN)
-    digitalWrite(PIN_EINK_EN, LOW); //power off backlight first
+    digitalWrite(PIN_EINK_EN, LOW); // power off backlight first
 #endif
 
+    LOG_INFO("Shutting down\n");
+
 #ifdef HAS_PMU
-    DEBUG_MSG("Shutting down\n");
-    if(PMU) {
+    if (pmu_found == true) {
         PMU->setChargingLedMode(XPOWERS_CHG_LED_OFF);
         PMU->shutdown();
     }
-#elif defined(ARCH_NRF52)
-    playBeep();
+#elif defined(ARCH_NRF52) || defined(ARCH_ESP32)
+#ifdef PIN_LED1
     ledOff(PIN_LED1);
+#endif
+#ifdef PIN_LED2
     ledOff(PIN_LED2);
+#endif
+#ifdef PIN_LED3
+    ledOff(PIN_LED2);
+#endif
     doDeepSleep(DELAY_FOREVER);
 #endif
 }
@@ -259,7 +414,7 @@ void Power::readPowerStatus()
 {
     if (batteryLevel) {
         bool hasBattery = batteryLevel->isBatteryConnect();
-        int batteryVoltageMv = 0;
+        uint32_t batteryVoltageMv = 0;
         int8_t batteryChargePercent = 0;
         if (hasBattery) {
             batteryVoltageMv = batteryLevel->getBattVoltage();
@@ -280,27 +435,67 @@ void Power::readPowerStatus()
         const PowerStatus powerStatus2 =
             PowerStatus(hasBattery ? OptTrue : OptFalse, batteryLevel->isVbusIn() ? OptTrue : OptFalse,
                         batteryLevel->isCharging() ? OptTrue : OptFalse, batteryVoltageMv, batteryChargePercent);
-        DEBUG_MSG("Battery: usbPower=%d, isCharging=%d, batMv=%d, batPct=%d\n", powerStatus2.getHasUSB(),
+        LOG_DEBUG("Battery: usbPower=%d, isCharging=%d, batMv=%d, batPct=%d\n", powerStatus2.getHasUSB(),
                   powerStatus2.getIsCharging(), powerStatus2.getBatteryVoltageMv(), powerStatus2.getBatteryChargePercent());
         newStatus.notifyObservers(&powerStatus2);
+#ifdef DEBUG_HEAP
+        if (lastheap != memGet.getFreeHeap()) {
+            LOG_DEBUG("Threads running:");
+            int running = 0;
+            for (int i = 0; i < MAX_THREADS; i++) {
+                auto thread = concurrency::mainController.get(i);
+                if ((thread != nullptr) && (thread->enabled)) {
+                    LOG_DEBUG(" %s", thread->ThreadName.c_str());
+                    running++;
+                }
+            }
+            LOG_DEBUG("\n");
+            LOG_DEBUG("Heap status: %d/%d bytes free (%d), running %d/%d threads\n", memGet.getFreeHeap(), memGet.getHeapSize(),
+                      memGet.getFreeHeap() - lastheap, running, concurrency::mainController.size(false));
+            lastheap = memGet.getFreeHeap();
+        }
+#ifdef DEBUG_HEAP_MQTT
+        if (mqtt) {
+            // send MQTT-Packet with Heap-Size
+            uint8_t dmac[6];
+            getMacAddr(dmac); // Get our hardware ID
+            char mac[18];
+            sprintf(mac, "!%02x%02x%02x%02x", dmac[2], dmac[3], dmac[4], dmac[5]);
 
-// If we have a battery at all and it is less than 10% full, force deep sleep if we have more than 3 low readings in a row
-// Supect fluctuating voltage on the RAK4631 to force it to deep sleep even if battery is at 85% after only a few days
-#ifdef ARCH_NRF52
+            auto newHeap = memGet.getFreeHeap();
+            std::string heapTopic =
+                (*moduleConfig.mqtt.root ? moduleConfig.mqtt.root : "msh") + std::string("/2/heap/") + std::string(mac);
+            std::string heapString = std::to_string(newHeap);
+            mqtt->pubSub.publish(heapTopic.c_str(), heapString.c_str(), false);
+            auto wifiRSSI = WiFi.RSSI();
+            std::string wifiTopic =
+                (*moduleConfig.mqtt.root ? moduleConfig.mqtt.root : "msh") + std::string("/2/wifi/") + std::string(mac);
+            std::string wifiString = std::to_string(wifiRSSI);
+            mqtt->pubSub.publish(wifiTopic.c_str(), wifiString.c_str(), false);
+        }
+#endif
+
+#endif
+
+        // If we have a battery at all and it is less than 10% full, force deep sleep if we have more than 10 low readings in
+        // a row
         if (powerStatus2.getHasBattery() && !powerStatus2.getHasUSB()) {
             if (batteryLevel->getBattVoltage() < MIN_BAT_MILLIVOLTS) {
                 low_voltage_counter++;
-                if (low_voltage_counter > 3)
+                LOG_DEBUG("Low voltage counter: %d/10\n", low_voltage_counter);
+                if (low_voltage_counter > 10) {
+#ifdef ARCH_NRF52
+                    // We can't trigger deep sleep on NRF52, it's freezing the board
+                    LOG_DEBUG("Low voltage detected, but not triggering deep sleep\n");
+#else
+                    LOG_INFO("Low voltage detected, triggering deep sleep\n");
                     powerFSM.trigger(EVENT_LOW_BATTERY);
+#endif
+                }
             } else {
                 low_voltage_counter = 0;
             }
         }
-#else
-        // If we have a battery at all and it is less than 10% full, force deep sleep
-        if (powerStatus2.getHasBattery() && !powerStatus2.getHasUSB() && batteryLevel->getBattVoltage() < MIN_BAT_MILLIVOLTS)
-            powerFSM.trigger(EVENT_LOW_BATTERY);
-#endif
     } else {
         // No power sensing on this board - tell everyone else we have no idea what is happening
         const PowerStatus powerStatus3 = PowerStatus(OptUnknown, OptUnknown, OptUnknown, -1, -1);
@@ -315,17 +510,17 @@ int32_t Power::runOnce()
 #ifdef HAS_PMU
     // WE no longer use the IRQ line to wake the CPU (due to false wakes from sleep), but we do poll
     // the IRQ status by reading the registers over I2C
-    if(PMU) {
+    if (PMU) {
 
         PMU->getIrqStatus();
 
-        if(PMU->isVbusRemoveIrq()){
-            DEBUG_MSG("USB unplugged\n");
+        if (PMU->isVbusRemoveIrq()) {
+            LOG_INFO("USB unplugged\n");
             powerFSM.trigger(EVENT_POWER_DISCONNECTED);
         }
 
         if (PMU->isVbusInsertIrq()) {
-            DEBUG_MSG("USB plugged In\n");
+            LOG_INFO("USB plugged In\n");
             powerFSM.trigger(EVENT_POWER_CONNECTED);
         }
 
@@ -333,20 +528,20 @@ int32_t Power::runOnce()
         Other things we could check if we cared...
 
         if (PMU->isBatChagerStartIrq()) {
-            DEBUG_MSG("Battery start charging\n");
+            LOG_DEBUG("Battery start charging\n");
         }
         if (PMU->isBatChagerDoneIrq()) {
-            DEBUG_MSG("Battery fully charged\n");
+            LOG_DEBUG("Battery fully charged\n");
         }
         if (PMU->isBatInsertIrq()) {
-            DEBUG_MSG("Battery inserted\n");
+            LOG_DEBUG("Battery inserted\n");
         }
         if (PMU->isBatRemoveIrq()) {
-            DEBUG_MSG("Battery removed\n");
+            LOG_DEBUG("Battery removed\n");
         }
         */
         if (PMU->isPekeyLongPressIrq()) {
-            DEBUG_MSG("PEK long button press\n");
+            LOG_DEBUG("PEK long button press\n");
             screen->setOn(false);
         }
 
@@ -361,58 +556,58 @@ int32_t Power::runOnce()
  * Init the power manager chip
  *
  * axp192 power
-    DCDC1 0.7-3.5V @ 1200mA max -> OLED // If you turn this off you'll lose comms to the axp192 because the OLED and the axp192
- share the same i2c bus, instead use ssd1306 sleep mode DCDC2 -> unused DCDC3 0.7-3.5V @ 700mA max -> ESP32 (keep this on!) LDO1
- 30mA -> charges GPS backup battery // charges the tiny J13 battery by the GPS to power the GPS ram (for a couple of days), can
- not be turned off LDO2 200mA -> LORA LDO3 200mA -> GPS
- * 
+    DCDC1 0.7-3.5V @ 1200mA max -> OLED // If you turn this off you'll lose comms to the axp192 because the OLED and the
+ axp192 share the same i2c bus, instead use ssd1306 sleep mode DCDC2 -> unused DCDC3 0.7-3.5V @ 700mA max -> ESP32 (keep this
+ on!) LDO1 30mA -> charges GPS backup battery // charges the tiny J13 battery by the GPS to power the GPS ram (for a couple of
+ days), can not be turned off LDO2 200mA -> LORA LDO3 200mA -> GPS
+ *
  */
 bool Power::axpChipInit()
 {
 
 #ifdef HAS_PMU
 
-        TwoWire * w = NULL;
+    TwoWire *w = NULL;
 
     // Use macro to distinguish which wire is used by PMU
 #ifdef PMU_USE_WIRE1
-        w = &Wire1;
+    w = &Wire1;
 #else
-        w = &Wire;
+    w = &Wire;
 #endif
 
     /**
-     * It is not necessary to specify the wire pin, 
+     * It is not necessary to specify the wire pin,
      * just input the wire, because the wire has been initialized in main.cpp
      */
     if (!PMU) {
         PMU = new XPowersAXP2101(*w);
         if (!PMU->init()) {
-            DEBUG_MSG("Warning: Failed to find AXP2101 power management\n");
+            LOG_WARN("Failed to find AXP2101 power management\n");
             delete PMU;
             PMU = NULL;
         } else {
-            DEBUG_MSG("AXP2101 PMU init succeeded, using AXP2101 PMU\n");
+            LOG_INFO("AXP2101 PMU init succeeded, using AXP2101 PMU\n");
         }
     }
 
     if (!PMU) {
         PMU = new XPowersAXP192(*w);
         if (!PMU->init()) {
-            DEBUG_MSG("Warning: Failed to find AXP192 power management\n");
+            LOG_WARN("Failed to find AXP192 power management\n");
             delete PMU;
             PMU = NULL;
         } else {
-            DEBUG_MSG("AXP192 PMU init succeeded, using AXP192 PMU\n");
+            LOG_INFO("AXP192 PMU init succeeded, using AXP192 PMU\n");
         }
     }
 
     if (!PMU) {
-                /*
-        * In XPowersLib, if the XPowersAXPxxx object is released, Wire.end() will be called at the same time. 
-        * In order not to affect other devices, if the initialization of the PMU fails, Wire needs to be re-initialized once, 
-        * if there are multiple devices sharing the bus.
-        * * */
+        /*
+         * In XPowersLib, if the XPowersAXPxxx object is released, Wire.end() will be called at the same time.
+         * In order not to affect other devices, if the initialization of the PMU fails, Wire needs to be re-initialized once,
+         * if there are multiple devices sharing the bus.
+         * * */
 #ifndef PMU_USE_WIRE1
         w->begin(I2C_SDA, I2C_SCL);
 #endif
@@ -422,97 +617,129 @@ bool Power::axpChipInit()
     batteryLevel = PMU;
 
     if (PMU->getChipModel() == XPOWERS_AXP192) {
-        
+
         // lora radio power channel
         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, 
+        // disable it will cause abnormal communication between boot and AXP power supply,
         // do not turn it off
         PMU->setPowerChannelVoltage(XPOWERS_DCDC1, 3300);
         // 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
+        // protected oled power source
         PMU->setProtectedChannel(XPOWERS_DCDC1);
-        //protected esp32 power source
+        // protected esp32 power source
         PMU->setProtectedChannel(XPOWERS_DCDC3);
 
-        //disable not use channel
+        // disable not use channel
         PMU->disablePowerOutput(XPOWERS_DCDC2);
 
-        //disable all axp chip interrupt
+        // disable all axp chip interrupt
         PMU->disableIRQ(XPOWERS_AXP192_ALL_IRQ);
 
         // Set constant current charging current
         PMU->setChargerConstantCurr(XPOWERS_AXP192_CHG_CUR_450MA);
 
+        // Set up the charging voltage
+        PMU->setChargeTargetVoltage(XPOWERS_AXP192_CHG_VOL_4V2);
     } else if (PMU->getChipModel() == XPOWERS_AXP2101) {
 
-        // t-beam s3 core 
+        /*The alternative version of T-Beam 1.1 differs from T-Beam V1.1 in that it uses an AXP2101 power chip*/
+        if (HW_VENDOR == meshtastic_HardwareModel_TBEAM) {
+            // Unuse power channel
+            PMU->disablePowerOutput(XPOWERS_DCDC2);
+            PMU->disablePowerOutput(XPOWERS_DCDC3);
+            PMU->disablePowerOutput(XPOWERS_DCDC4);
+            PMU->disablePowerOutput(XPOWERS_DCDC5);
+            PMU->disablePowerOutput(XPOWERS_ALDO1);
+            PMU->disablePowerOutput(XPOWERS_ALDO4);
+            PMU->disablePowerOutput(XPOWERS_BLDO1);
+            PMU->disablePowerOutput(XPOWERS_BLDO2);
+            PMU->disablePowerOutput(XPOWERS_DLDO1);
+            PMU->disablePowerOutput(XPOWERS_DLDO2);
 
-        /**
-         * gnss module power channel 
-         * The default ALDO4 is off, you need to turn on the GNSS power first, otherwise it will be invalid during initialization
-         */
-        PMU->setPowerChannelVoltage(XPOWERS_ALDO4, 3300);
-        PMU->enablePowerOutput(XPOWERS_ALDO4);
+            // GNSS RTC PowerVDD 3300mV
+            PMU->setPowerChannelVoltage(XPOWERS_VBACKUP, 3300);
+            PMU->enablePowerOutput(XPOWERS_VBACKUP);
 
-        // lora radio power channel
-        PMU->setPowerChannelVoltage(XPOWERS_ALDO3, 3300);
-        PMU->enablePowerOutput(XPOWERS_ALDO3);
+            // ESP32 VDD 3300mV
+            //  ! No need to set, automatically open , Don't close it
+            //  PMU->setPowerChannelVoltage(XPOWERS_DCDC1, 3300);
+            //  PMU->setProtectedChannel(XPOWERS_DCDC1);
 
-        // m.2 interface 
-        PMU->setPowerChannelVoltage(XPOWERS_DCDC3, 3300);
-        PMU->enablePowerOutput(XPOWERS_DCDC3);
+            // LoRa VDD 3300mV
+            PMU->setPowerChannelVoltage(XPOWERS_ALDO2, 3300);
+            PMU->enablePowerOutput(XPOWERS_ALDO2);
 
-        /**
-        * ALDO2 cannot be turned off. 
-        * It is a necessary condition for sensor communication. 
-        * It must be turned on to properly access the sensor and screen
-        * It is also responsible for the power supply of PCF8563
-        */
-        PMU->setPowerChannelVoltage(XPOWERS_ALDO2, 3300);
-        PMU->enablePowerOutput(XPOWERS_ALDO2);
+            // GNSS VDD 3300mV
+            PMU->setPowerChannelVoltage(XPOWERS_ALDO3, 3300);
+            PMU->enablePowerOutput(XPOWERS_ALDO3);
+        } else if (HW_VENDOR == meshtastic_HardwareModel_LILYGO_TBEAM_S3_CORE) {
+            // t-beam s3 core
+            /**
+             * gnss module power channel
+             * The default ALDO4 is off, you need to turn on the GNSS power first, otherwise it will be invalid during
+             * initialization
+             */
+            PMU->setPowerChannelVoltage(XPOWERS_ALDO4, 3300);
+            PMU->enablePowerOutput(XPOWERS_ALDO4);
 
-        // 6-axis , magnetometer ,bme280 , oled screen power channel 
-        PMU->setPowerChannelVoltage(XPOWERS_ALDO1, 3300);
-        PMU->enablePowerOutput(XPOWERS_ALDO1);
+            // lora radio power channel
+            PMU->setPowerChannelVoltage(XPOWERS_ALDO3, 3300);
+            PMU->enablePowerOutput(XPOWERS_ALDO3);
 
-        // sdcard power channle 
-        PMU->setPowerChannelVoltage(XPOWERS_BLDO1, 3300);
-        PMU->enablePowerOutput(XPOWERS_BLDO1);
-        
-        // PMU->setPowerChannelVoltage(XPOWERS_DCDC4, 3300);
-        // PMU->enablePowerOutput(XPOWERS_DCDC4);
+            // m.2 interface
+            PMU->setPowerChannelVoltage(XPOWERS_DCDC3, 3300);
+            PMU->enablePowerOutput(XPOWERS_DCDC3);
 
-        //not use channel
-        PMU->disablePowerOutput(XPOWERS_DCDC2); //not elicited
-        PMU->disablePowerOutput(XPOWERS_DCDC5); //not elicited
-        PMU->disablePowerOutput(XPOWERS_DLDO1); //Invalid power channel, it does not exist
-        PMU->disablePowerOutput(XPOWERS_DLDO2); //Invalid power channel, it does not exist
-        PMU->disablePowerOutput(XPOWERS_VBACKUP);
+            /**
+             * ALDO2 cannot be turned off.
+             * It is a necessary condition for sensor communication.
+             * It must be turned on to properly access the sensor and screen
+             * It is also responsible for the power supply of PCF8563
+             */
+            PMU->setPowerChannelVoltage(XPOWERS_ALDO2, 3300);
+            PMU->enablePowerOutput(XPOWERS_ALDO2);
 
-        //disable all axp chip interrupt
+            // 6-axis , magnetometer ,bme280 , oled screen power channel
+            PMU->setPowerChannelVoltage(XPOWERS_ALDO1, 3300);
+            PMU->enablePowerOutput(XPOWERS_ALDO1);
+
+            // sdcard power channle
+            PMU->setPowerChannelVoltage(XPOWERS_BLDO1, 3300);
+            PMU->enablePowerOutput(XPOWERS_BLDO1);
+
+            // PMU->setPowerChannelVoltage(XPOWERS_DCDC4, 3300);
+            // PMU->enablePowerOutput(XPOWERS_DCDC4);
+
+            // not use channel
+            PMU->disablePowerOutput(XPOWERS_DCDC2); // not elicited
+            PMU->disablePowerOutput(XPOWERS_DCDC5); // not elicited
+            PMU->disablePowerOutput(XPOWERS_DLDO1); // Invalid power channel, it does not exist
+            PMU->disablePowerOutput(XPOWERS_DLDO2); // Invalid power channel, it does not exist
+            PMU->disablePowerOutput(XPOWERS_VBACKUP);
+        }
+
+        // disable all axp chip interrupt
         PMU->disableIRQ(XPOWERS_AXP2101_ALL_IRQ);
 
-        //Set the constant current charging current of AXP2101, temporarily use 500mA by default
+        // Set the constant current charging current of AXP2101, temporarily use 500mA by default
         PMU->setChargerConstantCurr(XPOWERS_AXP2101_CHG_CUR_500MA);
 
+        // Set up the charging voltage
+        PMU->setChargeTargetVoltage(XPOWERS_AXP2101_CHG_VOL_4V2);
     }
-    
 
     PMU->clearIrqStatus();
 
-    // TBeam1.1 /T-Beam S3-Core has no external TS detection, 
+    // TBeam1.1 /T-Beam S3-Core has no external TS detection,
     // it needs to be disabled, otherwise it will cause abnormal charging
     PMU->disableTSPinMeasure();
 
@@ -520,78 +747,90 @@ bool Power::axpChipInit()
     PMU->enableVbusVoltageMeasure();
     PMU->enableBattVoltageMeasure();
 
-    DEBUG_MSG("=======================================================================\n");
+    LOG_DEBUG("=======================================================================\n");
     if (PMU->isChannelAvailable(XPOWERS_DCDC1)) {
-        DEBUG_MSG("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)) {
-        DEBUG_MSG("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)) {
-        DEBUG_MSG("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)) {
-        DEBUG_MSG("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)) {
-        DEBUG_MSG("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)) {
-        DEBUG_MSG("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)) {
-        DEBUG_MSG("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)) {
-        DEBUG_MSG("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)) {
-        DEBUG_MSG("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)) {
-        DEBUG_MSG("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)) {
-        DEBUG_MSG("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)) {
-        DEBUG_MSG("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));
     }
-    DEBUG_MSG("=======================================================================\n");
-
-
-    //Set up the charging voltage, AXP2101/AXP192 4.2V gear is the same
-    // XPOWERS_AXP192_CHG_VOL_4V2 = XPOWERS_AXP2101_CHG_VOL_4V2
-    PMU->setChargeTargetVoltage(XPOWERS_AXP192_CHG_VOL_4V2);
+    LOG_DEBUG("=======================================================================\n");
 
+// We can safely ignore this approach for most (or all) boards because MCU turned off
+// earlier than battery discharged to 2.6V.
+//
+// Unfortanly for now we can't use this killswitch for RAK4630-based boards because they have a bug with
+// battery voltage measurement. Probably it sometimes drops to low values.
+#ifndef RAK4630
     // Set PMU shutdown voltage at 2.6V to maximize battery utilization
     PMU->setSysPowerDownVoltage(2600);
-
-
+#endif
 
 #ifdef PMU_IRQ
-        uint64_t pmuIrqMask = 0;
+    uint64_t pmuIrqMask = 0;
 
-        if (PMU->getChipModel() == XPOWERS_AXP192) {
-            pmuIrqMask = XPOWERS_AXP192_VBUS_INSERT_IRQ | XPOWERS_AXP192_BAT_INSERT_IRQ | XPOWERS_AXP192_PKEY_SHORT_IRQ;
-        } else if (PMU->getChipModel() == XPOWERS_AXP2101) {
-            pmuIrqMask = XPOWERS_AXP2101_VBUS_INSERT_IRQ | XPOWERS_AXP2101_BAT_INSERT_IRQ | XPOWERS_AXP2101_PKEY_SHORT_IRQ;
-        }
+    if (PMU->getChipModel() == XPOWERS_AXP192) {
+        pmuIrqMask = XPOWERS_AXP192_VBUS_INSERT_IRQ | XPOWERS_AXP192_BAT_INSERT_IRQ | XPOWERS_AXP192_PKEY_SHORT_IRQ;
+    } else if (PMU->getChipModel() == XPOWERS_AXP2101) {
+        pmuIrqMask = XPOWERS_AXP2101_VBUS_INSERT_IRQ | XPOWERS_AXP2101_BAT_INSERT_IRQ | XPOWERS_AXP2101_PKEY_SHORT_IRQ;
+    }
 
-        pinMode(PMU_IRQ, INPUT);
-        attachInterrupt(
-            PMU_IRQ, [] { pmu_irq = true; }, FALLING);
+    pinMode(PMU_IRQ, INPUT);
+    attachInterrupt(
+        PMU_IRQ, [] { pmu_irq = true; }, FALLING);
 
-        // we do not look for AXPXXX_CHARGING_FINISHED_IRQ & AXPXXX_CHARGING_IRQ because it occurs repeatedly while there is
-        // no battery also it could cause inadvertent waking from light sleep just because the battery filled
-        // we don't look for AXPXXX_BATT_REMOVED_IRQ because it occurs repeatedly while no battery installed
-        // we don't look at AXPXXX_VBUS_REMOVED_IRQ because we don't have anything hooked to vbus
-        PMU->enableIRQ(pmuIrqMask);
+    // we do not look for AXPXXX_CHARGING_FINISHED_IRQ & AXPXXX_CHARGING_IRQ because it occurs repeatedly while there is
+    // no battery also it could cause inadvertent waking from light sleep just because the battery filled
+    // we don't look for AXPXXX_BATT_REMOVED_IRQ because it occurs repeatedly while no battery installed
+    // we don't look at AXPXXX_VBUS_REMOVED_IRQ because we don't have anything hooked to vbus
+    PMU->enableIRQ(pmuIrqMask);
 
-        PMU->clearIrqStatus();
+    PMU->clearIrqStatus();
 #endif /*PMU_IRQ*/
 
-            readPowerStatus();
+    readPowerStatus();
 
     pmu_found = true;
 
@@ -600,4 +839,4 @@ bool Power::axpChipInit()
 #else
     return false;
 #endif
-}
+}

src/PowerFSM.cpp

@@ -11,12 +11,12 @@
 /// Should we behave as if we have AC power now?
 static bool isPowered()
 {
-    // Circumvent the battery sensing logic and assumes constant power if no battery pin or power mgmt IC
-    #if !defined(BATTERY_PIN) && !defined(HAS_AXP192) && !defined(HAS_AXP2101)
-        return true;
-    #endif
+// Circumvent the battery sensing logic and assumes constant power if no battery pin or power mgmt IC
+#if !defined(BATTERY_PIN) && !defined(HAS_AXP192) && !defined(HAS_AXP2101)
+    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
@@ -26,22 +26,25 @@ static bool isPowered()
         1) If we're powered up and there's no battery, we must be getting power externally. (because we'd be dead otherwise)
 
         2) If we detect USB power from the power management chip, we must be getting power externally.
+
+        3) On some boards we don't have the power management chip (like AXPxxxx) so we use EXT_PWR_DETECT GPIO pin to detect
+       external power source (see `isVbusIn()` in `Power.cpp`)
     */
     return !isPowerSavingMode && powerStatus && (!powerStatus->getHasBattery() || powerStatus->getHasUSB());
 }
 
 static void sdsEnter()
 {
-    DEBUG_MSG("Enter state: SDS\n");
+    LOG_DEBUG("Enter state: SDS\n");
     // FIXME - make sure GPS and LORA radio are off first - because we want close to zero current draw
-    doDeepSleep(config.power.sds_secs * 1000);
+    doDeepSleep(getConfiguredOrDefaultMs(config.power.sds_secs));
 }
 
 extern Power *power;
 
 static void shutdownEnter()
 {
-    DEBUG_MSG("Enter state: SHUTDOWN\n");
+    LOG_DEBUG("Enter state: SHUTDOWN\n");
     power->shutdown();
 }
 
@@ -51,26 +54,26 @@ static uint32_t secsSlept;
 
 static void lsEnter()
 {
-    DEBUG_MSG("lsEnter begin, ls_secs=%u\n", config.power.ls_secs);
+    LOG_INFO("lsEnter begin, ls_secs=%u\n", config.power.ls_secs);
     screen->setOn(false);
     secsSlept = 0; // How long have we been sleeping this time
 
-    // DEBUG_MSG("lsEnter end\n");
+    // LOG_INFO("lsEnter end\n");
 }
 
 static void lsIdle()
 {
-    // DEBUG_MSG("lsIdle begin ls_secs=%u\n", getPref_ls_secs());
+    // LOG_INFO("lsIdle begin ls_secs=%u\n", getPref_ls_secs());
 
 #ifdef ARCH_ESP32
 
     // Do we have more sleeping to do?
     if (secsSlept < config.power.ls_secs) {
-        // Briefly come out of sleep long enough to blink the led once every few seconds
-        uint32_t sleepTime = 30;
-
         // If some other service would stall sleep, don't let sleep happen yet
         if (doPreflightSleep()) {
+            // Briefly come out of sleep long enough to blink the led once every few seconds
+            uint32_t sleepTime = 30;
+
             setLed(false); // Never leave led on while in light sleep
             esp_sleep_source_t wakeCause2 = doLightSleep(sleepTime * 1000LL);
 
@@ -78,11 +81,11 @@ static void lsIdle()
             case ESP_SLEEP_WAKEUP_TIMER:
                 // Normal case: timer expired, we should just go back to sleep ASAP
 
-                setLed(true);                 // briefly turn on led
-                wakeCause2 = doLightSleep(1); // leave led on for 1ms
+                setLed(true);                   // briefly turn on led
+                wakeCause2 = doLightSleep(100); // leave led on for 1ms
 
                 secsSlept += sleepTime;
-                // DEBUG_MSG("sleeping, flash led!\n");
+                // LOG_INFO("sleeping, flash led!\n");
                 break;
 
             case ESP_SLEEP_WAKEUP_UART:
@@ -93,15 +96,14 @@ static void lsIdle()
             default:
                 // We woke for some other reason (button press, device interrupt)
                 // uint64_t status = esp_sleep_get_ext1_wakeup_status();
-                DEBUG_MSG("wakeCause2 %d\n", wakeCause2);
+                LOG_INFO("wakeCause2 %d\n", wakeCause2);
 
 #ifdef BUTTON_PIN
-                bool pressed = !digitalRead(BUTTON_PIN);
+                bool pressed = !digitalRead(config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN);
 #else
                 bool pressed = false;
 #endif
-                if (pressed) // If we woke because of press, instead generate a PRESS event.
-                {
+                if (pressed) { // If we woke because of press, instead generate a PRESS event.
                     powerFSM.trigger(EVENT_PRESS);
                 } else {
                     // Otherwise let the NB state handle the IRQ (and that state will handle stuff like IRQs etc)
@@ -117,7 +119,7 @@ static void lsIdle()
     } else {
         // Time to stop sleeping!
         setLed(false);
-        DEBUG_MSG("reached ls_secs, servicing loop()\n");
+        LOG_INFO("Reached ls_secs, servicing loop()\n");
         powerFSM.trigger(EVENT_WAKE_TIMER);
     }
 #endif
@@ -125,7 +127,7 @@ static void lsIdle()
 
 static void lsExit()
 {
-    DEBUG_MSG("Exit state: LS\n");
+    LOG_INFO("Exit state: LS\n");
     // setGPSPower(true); // restore GPS power
     if (gps)
         gps->forceWake(true);
@@ -133,7 +135,7 @@ static void lsExit()
 
 static void nbEnter()
 {
-    DEBUG_MSG("Enter state: NB\n");
+    LOG_DEBUG("Enter state: NB\n");
     screen->setOn(false);
     setBluetoothEnable(false);
 
@@ -148,7 +150,7 @@ static void darkEnter()
 
 static void serialEnter()
 {
-    DEBUG_MSG("Enter state: SERIAL\n");
+    LOG_DEBUG("Enter state: SERIAL\n");
     setBluetoothEnable(false);
     screen->setOn(true);
     screen->print("Serial connected\n");
@@ -161,15 +163,19 @@ static void serialExit()
 
 static void powerEnter()
 {
-    DEBUG_MSG("Enter state: POWER\n");
+    LOG_DEBUG("Enter state: POWER\n");
     if (!isPowered()) {
         // If we got here, we are in the wrong state - we should be in powered, let that state ahndle things
-        DEBUG_MSG("Loss of power in Powered\n");
+        LOG_INFO("Loss of power in Powered\n");
         powerFSM.trigger(EVENT_POWER_DISCONNECTED);
     } else {
         screen->setOn(true);
         setBluetoothEnable(true);
-        screen->print("Powered...\n");
+        // within enter() the function getState() returns the state we came from
+        if (strcmp(powerFSM.getState()->name, "BOOT") != 0 && strcmp(powerFSM.getState()->name, "POWER") != 0 &&
+            strcmp(powerFSM.getState()->name, "DARK") != 0) {
+            screen->print("Powered...\n");
+        }
     }
 }
 
@@ -177,7 +183,7 @@ static void powerIdle()
 {
     if (!isPowered()) {
         // If we got here, we are in the wrong state
-        DEBUG_MSG("Loss of power in Powered\n");
+        LOG_INFO("Loss of power in Powered\n");
         powerFSM.trigger(EVENT_POWER_DISCONNECTED);
     }
 }
@@ -186,24 +192,15 @@ static void powerExit()
 {
     screen->setOn(true);
     setBluetoothEnable(true);
-    screen->print("Unpowered...\n");
+    if (!isPowered())
+        screen->print("Unpowered...\n");
 }
 
 static void onEnter()
 {
-    DEBUG_MSG("Enter state: ON\n");
+    LOG_DEBUG("Enter state: ON\n");
     screen->setOn(true);
     setBluetoothEnable(true);
-
-    static uint32_t lastPingMs;
-
-    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 (displayedNodeNum)
-            service.sendNetworkPing(displayedNodeNum, true); // Refresh the currently displayed node
-        lastPingMs = now;
-    }
 }
 
 static void onIdle()
@@ -221,7 +218,7 @@ static void screenPress()
 
 static void bootEnter()
 {
-    DEBUG_MSG("Enter state: BOOT\n");
+    LOG_DEBUG("Enter state: BOOT\n");
 }
 
 State stateSHUTDOWN(shutdownEnter, NULL, NULL, "SHUTDOWN");
@@ -237,10 +234,10 @@ 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();
 
-    DEBUG_MSG("PowerFSM init, USB power=%d\n", hasPower ? 1 : 0);
+    LOG_INFO("PowerFSM init, USB power=%d\n", hasPower ? 1 : 0);
     powerFSM.add_timed_transition(&stateBOOT, hasPower ? &statePOWER : &stateON, 3 * 1000, NULL, "boot timeout");
 
     // wake timer expired or a packet arrived
@@ -249,16 +246,18 @@ 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
     powerFSM.add_transition(&stateLS, &stateON, EVENT_PRESS, NULL, "Press");
     powerFSM.add_transition(&stateNB, &stateON, EVENT_PRESS, NULL, "Press");
-    powerFSM.add_transition(&stateDARK, &stateON, EVENT_PRESS, NULL, "Press");
+    powerFSM.add_transition(&stateDARK, isPowered() ? &statePOWER : &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");
@@ -296,10 +295,10 @@ void PowerFSM_setup()
         powerFSM.add_transition(&stateON, &stateON, EVENT_NODEDB_UPDATED, NULL, "NodeDB update");
 
         // Show the received text message
-        powerFSM.add_transition(&stateLS, &stateON, EVENT_RECEIVED_TEXT_MSG, NULL, "Received text");
-        powerFSM.add_transition(&stateNB, &stateON, EVENT_RECEIVED_TEXT_MSG, NULL, "Received text");
-        powerFSM.add_transition(&stateDARK, &stateON, EVENT_RECEIVED_TEXT_MSG, NULL, "Received text");
-        powerFSM.add_transition(&stateON, &stateON, EVENT_RECEIVED_TEXT_MSG, NULL, "Received text"); // restarts the sleep timer
+        powerFSM.add_transition(&stateLS, &stateON, EVENT_RECEIVED_MSG, NULL, "Received text");
+        powerFSM.add_transition(&stateNB, &stateON, EVENT_RECEIVED_MSG, NULL, "Received text");
+        powerFSM.add_transition(&stateDARK, &stateON, EVENT_RECEIVED_MSG, NULL, "Received text");
+        powerFSM.add_transition(&stateON, &stateON, EVENT_RECEIVED_MSG, NULL, "Received text"); // restarts the sleep timer
     }
 
     // If we are not in statePOWER but get a serial connection, suppress sleep (and keep the screen on) while connected
@@ -324,31 +323,34 @@ void PowerFSM_setup()
 
     powerFSM.add_transition(&stateDARK, &stateDARK, EVENT_CONTACT_FROM_PHONE, NULL, "Contact from phone");
 
-    // each time we get a new update packet make sure we are staying in the ON state so the screen stays awake (also we don't
-    // shutdown bluetooth if is_router)
-    powerFSM.add_transition(&stateDARK, &stateON, EVENT_FIRMWARE_UPDATE, NULL, "Got firmware update");
-    powerFSM.add_transition(&stateON, &stateON, EVENT_FIRMWARE_UPDATE, NULL, "Got firmware update");
-
-    powerFSM.add_timed_transition(&stateON, &stateDARK, getConfiguredOrDefaultMs(config.display.screen_on_secs, default_screen_on_secs), NULL, "Screen-on timeout");
-
-    // On most boards we use light-sleep to be our main state, but on NRF52 we just stay in DARK
-    State *lowPowerState = &stateLS;
+    powerFSM.add_timed_transition(&stateON, &stateDARK,
+                                  getConfiguredOrDefaultMs(config.display.screen_on_secs, default_screen_on_secs), NULL,
+                                  "Screen-on timeout");
+    powerFSM.add_timed_transition(&statePOWER, &stateDARK,
+                                  getConfiguredOrDefaultMs(config.display.screen_on_secs, default_screen_on_secs), NULL,
+                                  "Screen-on timeout");
+    powerFSM.add_timed_transition(&stateDARK, &stateDARK,
+                                  getConfiguredOrDefaultMs(config.display.screen_on_secs, default_screen_on_secs), NULL,
+                                  "Screen-on timeout");
 
 #ifdef ARCH_ESP32
+    State *lowPowerState = &stateLS;
     // We never enter light-sleep or NB states on NRF52 (because the CPU uses so little power normally)
 
     // See: https://github.com/meshtastic/firmware/issues/1071
     if (isRouter || config.power.is_power_saving) {
-        powerFSM.add_timed_transition(&stateNB, &stateLS, getConfiguredOrDefaultMs(config.power.min_wake_secs, default_min_wake_secs), NULL, "Min wake timeout");
-        powerFSM.add_timed_transition(&stateDARK, &stateLS, getConfiguredOrDefaultMs(config.power.wait_bluetooth_secs, default_wait_bluetooth_secs), NULL, "Bluetooth timeout");
-    } 
-
-#elif defined (ARCH_NRF52)
-    lowPowerState = &stateDARK;
-#endif
+        powerFSM.add_timed_transition(&stateNB, &stateLS,
+                                      getConfiguredOrDefaultMs(config.power.min_wake_secs, default_min_wake_secs), NULL,
+                                      "Min wake timeout");
+        powerFSM.add_timed_transition(&stateDARK, &stateLS,
+                                      getConfiguredOrDefaultMs(config.power.wait_bluetooth_secs, default_wait_bluetooth_secs),
+                                      NULL, "Bluetooth timeout");
+    }
 
     if (config.power.sds_secs != UINT32_MAX)
-        powerFSM.add_timed_transition(lowPowerState, &stateSDS, config.power.sds_secs * 1000, 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/PowerFSM.h

@@ -8,7 +8,7 @@
 #define EVENT_WAKE_TIMER 2
 // #define EVENT_RECEIVED_PACKET 3
 #define EVENT_PACKET_FOR_PHONE 4
-#define EVENT_RECEIVED_TEXT_MSG 5
+#define EVENT_RECEIVED_MSG 5
 // #define EVENT_BOOT 6 // now done with a timed transition
 #define EVENT_BLUETOOTH_PAIR 7
 #define EVENT_NODEDB_UPDATED 8     // NodeDB has a big enough change that we think you should turn on the screen
@@ -19,10 +19,10 @@
 #define EVENT_POWER_CONNECTED 13
 #define EVENT_POWER_DISCONNECTED 14
 #define EVENT_FIRMWARE_UPDATE 15 // We just received a new firmware update packet from the phone
-#define EVENT_SHUTDOWN 16 //force a full shutdown now (not just sleep)
-#define EVENT_INPUT 17 // input broker wants something, we need to wake up and enable screen
+#define EVENT_SHUTDOWN 16        // force a full shutdown now (not just sleep)
+#define EVENT_INPUT 17           // input broker wants something, we need to wake up and enable screen
 
 extern Fsm powerFSM;
-extern State statePOWER, stateSERIAL;
+extern State stateON, statePOWER, stateSERIAL, stateDARK;
 
 void PowerFSM_setup();

src/PowerFSMThread.h

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

src/PowerStatus.h

@@ -82,7 +82,7 @@ class PowerStatus : public Status
             isCharging = newStatus->isCharging;
         }
         if (isDirty) {
-            // DEBUG_MSG("Battery %dmV %d%%\n", batteryVoltageMv, batteryChargePercent);
+            // LOG_DEBUG("Battery %dmV %d%%\n", batteryVoltageMv, batteryChargePercent);
             onNewStatus.notifyObservers(this);
         }
         return 0;

src/RF95Configuration.h

@@ -2,6 +2,6 @@
 #ifdef USE_RF95
 #define RF95_RESET LORA_RESET
 #define RF95_IRQ LORA_DIO0  // on SX1262 version this is a no connect DIO0
-#define RF95_DIO1 LORA_DIO1 // Note: not really used for RF95
+#define RF95_DIO1 LORA_DIO1 // Note: not really used for RF95, but used for pure SX127x
 #define RF95_DIO2 LORA_DIO2 // Note: not really used for RF95
 #endif

src/RedirectablePrint.cpp

@@ -1,19 +1,24 @@
-#include "configuration.h"
 #include "RedirectablePrint.h"
-#include "RTC.h"
 #include "NodeDB.h"
+#include "RTC.h"
 #include "concurrency/OSThread.h"
-// #include "wifi/WiFiServerAPI.h"
+#include "configuration.h"
 #include <assert.h>
+#include <cstring>
+#include <memory>
+#include <stdexcept>
 #include <sys/time.h>
 #include <time.h>
-#include <cstring>
 
 /**
  * A printer that doesn't go anywhere
  */
 NoopPrint noopPrint;
 
+#if HAS_WIFI || HAS_ETHERNET
+extern Syslog syslog;
+#endif
+
 void RedirectablePrint::setDestination(Print *_dest)
 {
     assert(_dest);
@@ -27,10 +32,6 @@ size_t RedirectablePrint::write(uint8_t c)
     SEGGER_RTT_PutChar(SEGGER_STDOUT_CH, c);
 #endif
 
-    // FIXME - clean this up, the whole relationship of this class to SerialConsole to TCP/bluetooth debug log output is kinda messed up.  But for now, just have this hack to
-    // optionally send chars to TCP also
-    //WiFiServerPort::debugOut(c);
-
     if (!config.has_lora || config.device.serial_enabled)
         dest->write(c);
 
@@ -47,7 +48,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;
@@ -58,8 +60,11 @@ size_t RedirectablePrint::vprintf(const char *format, va_list arg)
     return len;
 }
 
-size_t RedirectablePrint::logDebug(const char *format, ...)
+size_t RedirectablePrint::log(const char *logLevel, const char *format, ...)
 {
+    if (moduleConfig.serial.override_console_serial_port && strcmp(logLevel, "DEBUG") == 0) {
+        return 0;
+    }
     size_t r = 0;
 
     if (!inDebugPrint) {
@@ -86,9 +91,9 @@ size_t RedirectablePrint::logDebug(const char *format, ...)
                 int min = (hms % SEC_PER_HOUR) / SEC_PER_MIN;
                 int sec = (hms % SEC_PER_HOUR) % SEC_PER_MIN; // or hms % SEC_PER_MIN
 
-                r += printf("%02d:%02d:%02d %u ", hour, min, sec, millis() / 1000);
+                r += printf("%s | %02d:%02d:%02d %u ", logLevel, hour, min, sec, millis() / 1000);
             } else
-                r += printf("??:??:?? %u ", millis() / 1000);
+                r += printf("%s | ??:??:?? %u ", logLevel, millis() / 1000);
 
             auto thread = concurrency::OSThread::currentThread;
             if (thread) {
@@ -99,8 +104,40 @@ size_t RedirectablePrint::logDebug(const char *format, ...)
                 print("] ");
             }
         }
-
         r += vprintf(format, arg);
+
+#if (HAS_WIFI || HAS_ETHERNET) && !defined(ARCH_PORTDUINO)
+        // if syslog is in use, collect the log messages and send them to syslog
+        if (syslog.isEnabled()) {
+            int ll = 0;
+            switch (logLevel[0]) {
+            case 'D':
+                ll = SYSLOG_DEBUG;
+                break;
+            case 'I':
+                ll = SYSLOG_INFO;
+                break;
+            case 'W':
+                ll = SYSLOG_WARN;
+                break;
+            case 'E':
+                ll = SYSLOG_ERR;
+                break;
+            case 'C':
+                ll = SYSLOG_CRIT;
+                break;
+            default:
+                ll = 0;
+            }
+            auto thread = concurrency::OSThread::currentThread;
+            if (thread) {
+                syslog.vlogf(ll, thread->ThreadName.c_str(), format, arg);
+            } else {
+                syslog.vlogf(ll, format, arg);
+            }
+        }
+#endif
+
         va_end(arg);
 
         isContinuationMessage = !hasNewline;
@@ -109,3 +146,54 @@ size_t RedirectablePrint::logDebug(const char *format, ...)
 
     return r;
 }
+
+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");
+    for (uint16_t i = 0; i < len; i += 16) {
+        if (i % 128 == 0)
+            log(logLevel, "   +------------------------------------------------+ +----------------+\n");
+        char s[] = "|                                                | |                |\n";
+        uint8_t ix = 1, iy = 52;
+        for (uint8_t j = 0; j < 16; j++) {
+            if (i + j < len) {
+                uint8_t c = buf[i + j];
+                s[ix++] = alphabet[(c >> 4) & 0x0F];
+                s[ix++] = alphabet[c & 0x0F];
+                ix++;
+                if (c > 31 && c < 128)
+                    s[iy++] = c;
+                else
+                    s[iy++] = '.';
+            }
+        }
+        uint8_t index = i / 16;
+        if (i < 256)
+            log(logLevel, " ");
+        log(logLevel, "%02x", index);
+        log(logLevel, ".");
+        log(logLevel, s);
+    }
+    log(logLevel, "   +------------------------------------------------+ +----------------+\n");
+}
+
+std::string RedirectablePrint::mt_sprintf(const std::string fmt_str, ...)
+{
+    int n = ((int)fmt_str.size()) * 2; /* Reserve two times as much as the length of the fmt_str */
+    std::unique_ptr<char[]> formatted;
+    va_list ap;
+    while (1) {
+        formatted.reset(new char[n]); /* Wrap the plain char array into the unique_ptr */
+        strcpy(&formatted[0], fmt_str.c_str());
+        va_start(ap, fmt_str);
+        int final_n = vsnprintf(&formatted[0], n, fmt_str.c_str(), ap);
+        va_end(ap);
+        if (final_n < 0 || final_n >= n)
+            n += abs(final_n - n + 1);
+        else
+            break;
+    }
+    return std::string(formatted.get());
+}

src/RedirectablePrint.h

@@ -2,6 +2,7 @@
 
 #include <Print.h>
 #include <stdarg.h>
+#include <string>
 
 /**
  * A Printable that can be switched to squirt its bytes to a different sink.
@@ -29,18 +30,19 @@ class RedirectablePrint : public Print
 
     /**
      * Debug logging print message
-     * 
+     *
      * If the provide format string ends with a newline we assume it is the final print of a single
      * log message.  Otherwise we assume more prints will come before the log message ends.  This
      * allows you to call logDebug a few times to build up a single log message line if you wish.
-     * 
-     * FIXME, eventually add log levels (INFO, WARN, ERROR) and subsystems.  Move into 
-     * a different class.
      */
-    size_t logDebug(const char * format, ...)  __attribute__ ((format (printf, 2, 3)));
+    size_t log(const char *logLevel, const char *format, ...) __attribute__((format(printf, 3, 4)));
 
     /** like printf but va_list based */
     size_t vprintf(const char *format, va_list arg);
+
+    void hexDump(const char *logLevel, unsigned char *buf, uint16_t len);
+
+    std::string mt_sprintf(const std::string fmt_str, ...);
 };
 
 class NoopPrint : public Print

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

@@ -20,12 +20,10 @@ void consolePrintf(const char *format, ...)
     va_start(arg, format);
     console->vprintf(format, arg);
     va_end(arg);
-#ifdef ARCH_ESP32
     console->flush();
-#endif
 }
 
-SerialConsole::SerialConsole() : StreamAPI(&Port), RedirectablePrint(&Port)
+SerialConsole::SerialConsole() : StreamAPI(&Port), RedirectablePrint(&Port), concurrency::OSThread("SerialConsole")
 {
     assert(!console);
     console = this;
@@ -33,7 +31,7 @@ SerialConsole::SerialConsole() : StreamAPI(&Port), RedirectablePrint(&Port)
                       // setDestination(&noopPrint); for testing, try turning off 'all' debug output and see what leaks
 
     Port.begin(SERIAL_BAUD);
-#ifdef ARCH_NRF52
+#if defined(ARCH_NRF52) || defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3) || defined(ARCH_RP2040)
     time_t timeout = millis();
     while (!Port) {
         if ((millis() - timeout) < 5000) {
@@ -46,6 +44,15 @@ SerialConsole::SerialConsole() : StreamAPI(&Port), RedirectablePrint(&Port)
     emitRebooted();
 }
 
+int32_t SerialConsole::runOnce()
+{
+    return runOncePart();
+}
+
+void SerialConsole::flush()
+{
+    Port.flush();
+}
 
 // For the serial port we can't really detect if any client is on the other side, so instead just look for recent messages
 bool SerialConsole::checkIsConnected()
@@ -68,7 +75,7 @@ bool SerialConsole::handleToRadio(const uint8_t *buf, size_t len)
         canWrite = true;
 
         return StreamAPI::handleToRadio(buf, len);
-    }else{
+    } else {
         return false;
     }
 }

src/SerialConsole.h

@@ -6,7 +6,7 @@
  * Provides both debug printing and, if the client starts sending protobufs to us, switches to send/receive protobufs
  * (and starts dropping debug printing - FIXME, eventually those prints should be encapsulated in protobufs).
  */
-class SerialConsole : public StreamAPI, public RedirectablePrint
+class SerialConsole : public StreamAPI, public RedirectablePrint, private concurrency::OSThread
 {
   public:
     SerialConsole();
@@ -24,8 +24,11 @@ class SerialConsole : public StreamAPI, public RedirectablePrint
         return RedirectablePrint::write(c);
     }
 
-  protected:
+    virtual int32_t runOnce() override;
 
+    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,65 +8,49 @@
 #define STATUS_TYPE_GPS 2
 #define STATUS_TYPE_NODE 3
 
-
 namespace meshtastic
 {
 
-    // A base class for observable status
-    class Status
+// A base class for observable status
+class Status
+{
+  protected:
+    // Allows us to observe an Observable
+    CallbackObserver<Status, const Status *> statusObserver =
+        CallbackObserver<Status, const Status *>(this, &Status::updateStatus);
+    bool initialized = false;
+    // Workaround for no typeid support
+    int statusType = 0;
+
+  public:
+    // Allows us to generate observable events
+    Observable<const Status *> onNewStatus;
+
+    // Enable polymorphism ?
+    virtual ~Status() = default;
+
+    Status()
     {
-       protected:
-        // Allows us to observe an Observable
-        CallbackObserver<Status, const Status *> statusObserver = CallbackObserver<Status, const Status *>(this, &Status::updateStatus);
-        bool initialized = false;
-        // Workaround for no typeid support
-        int statusType = 0;
-
-       public:
-        // Allows us to generate observable events
-        Observable<const Status *> onNewStatus;
-
-        // Enable polymorphism ?
-        virtual ~Status() = default;
-        
-        Status() {
-            if (!statusType)
-            {
-                statusType = STATUS_TYPE_BASE;
-            }
+        if (!statusType) {
+            statusType = STATUS_TYPE_BASE;
         }
+    }
 
-        // Prevent object copy/move
-        Status(const Status &) = delete;
-        Status &operator=(const Status &) = delete;
+    // Prevent object copy/move
+    Status(const Status &) = delete;
+    Status &operator=(const Status &) = delete;
 
-        // Start observing a source of data
-        void observe(Observable<const Status *> *source)
-        {
-            statusObserver.observe(source);
-        }
+    // Start observing a source of data
+    void observe(Observable<const Status *> *source) { statusObserver.observe(source); }
 
-        // Determines whether or not existing data matches the data in another Status instance
-        bool matches(const Status *otherStatus) const 
-        {
-            return true;
-        }
+    // Determines whether or not existing data matches the data in another Status instance
+    bool matches(const Status *otherStatus) const { return true; }
 
-        bool isInitialized() const
-        {
-            return initialized;
-        }
+    bool isInitialized() const { return initialized; }
 
-        int getStatusType() const
-        {
-            return statusType;
-        }
+    int getStatusType() const { return statusType; }
 
-        // Called when the Observable we're observing generates a new notification
-        int updateStatus(const Status *newStatus) 
-        {
-            return 0;
-        }
-
-    };
+    // Called when the Observable we're observing generates a new notification
+    int updateStatus(const Status *newStatus) { return 0; }
 };
+}; // namespace meshtastic

src/airtime.cpp

@@ -6,22 +6,24 @@ AirTime *airTime = NULL;
 
 // Don't read out of this directly. Use the helper functions.
 
+uint32_t air_period_tx[PERIODS_TO_LOG];
+uint32_t air_period_rx[PERIODS_TO_LOG];
+
 void AirTime::logAirtime(reportTypes reportType, uint32_t airtime_ms)
 {
 
     if (reportType == TX_LOG) {
-        DEBUG_MSG("AirTime - Packet transmitted : %ums\n", airtime_ms);
+        LOG_DEBUG("AirTime - Packet transmitted : %ums\n", airtime_ms);
         this->airtimes.periodTX[0] = this->airtimes.periodTX[0] + airtime_ms;
-        myNodeInfo.air_period_tx[0] = myNodeInfo.air_period_tx[0] + airtime_ms;
+        air_period_tx[0] = air_period_tx[0] + airtime_ms;
 
         this->utilizationTX[this->getPeriodUtilHour()] = this->utilizationTX[this->getPeriodUtilHour()] + airtime_ms;
-
     } else if (reportType == RX_LOG) {
-        DEBUG_MSG("AirTime - Packet received : %ums\n", airtime_ms);
+        LOG_DEBUG("AirTime - Packet received : %ums\n", airtime_ms);
         this->airtimes.periodRX[0] = this->airtimes.periodRX[0] + airtime_ms;
-        myNodeInfo.air_period_rx[0] = myNodeInfo.air_period_rx[0] + airtime_ms;
+        air_period_rx[0] = air_period_rx[0] + airtime_ms;
     } else if (reportType == RX_ALL_LOG) {
-        DEBUG_MSG("AirTime - Packet received (noise?) : %ums\n", airtime_ms);
+        LOG_DEBUG("AirTime - Packet received (noise?) : %ums\n", airtime_ms);
         this->airtimes.periodRX_ALL[0] = this->airtimes.periodRX_ALL[0] + airtime_ms;
     }
 
@@ -34,11 +36,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;
 }
 
@@ -46,23 +50,23 @@ void AirTime::airtimeRotatePeriod()
 {
 
     if (this->airtimes.lastPeriodIndex != this->currentPeriodIndex()) {
-        DEBUG_MSG("Rotating airtimes to a new period = %u\n", this->currentPeriodIndex());
+        LOG_DEBUG("Rotating airtimes to a new period = %u\n", this->currentPeriodIndex());
 
         for (int i = PERIODS_TO_LOG - 2; i >= 0; --i) {
             this->airtimes.periodTX[i + 1] = this->airtimes.periodTX[i];
             this->airtimes.periodRX[i + 1] = this->airtimes.periodRX[i];
             this->airtimes.periodRX_ALL[i + 1] = this->airtimes.periodRX_ALL[i];
 
-            myNodeInfo.air_period_tx[i + 1] = this->airtimes.periodTX[i];
-            myNodeInfo.air_period_rx[i + 1] = this->airtimes.periodRX[i];
+            air_period_tx[i + 1] = this->airtimes.periodTX[i];
+            air_period_rx[i + 1] = this->airtimes.periodRX[i];
         }
 
         this->airtimes.periodTX[0] = 0;
         this->airtimes.periodRX[0] = 0;
         this->airtimes.periodRX_ALL[0] = 0;
 
-        myNodeInfo.air_period_tx[0] = 0;
-        myNodeInfo.air_period_rx[0] = 0;
+        air_period_tx[0] = 0;
+        air_period_rx[0] = 0;
 
         this->airtimes.lastPeriodIndex = this->currentPeriodIndex();
     }
@@ -101,7 +105,7 @@ float AirTime::channelUtilizationPercent()
     uint32_t sum = 0;
     for (uint32_t i = 0; i < CHANNEL_UTILIZATION_PERIODS; i++) {
         sum += this->channelUtilization[i];
-        // DEBUG_MSG("ChanUtilArray %u %u\n", i, this->channelUtilization[i]);
+        // LOG_DEBUG("ChanUtilArray %u %u\n", i, this->channelUtilization[i]);
     }
 
     return (float(sum) / float(CHANNEL_UTILIZATION_PERIODS * 10 * 1000)) * 100;
@@ -117,9 +121,46 @@ float AirTime::utilizationTXPercent()
     return (float(sum) / float(MS_IN_HOUR)) * 100;
 }
 
-AirTime::AirTime() : concurrency::OSThread("AirTime"),airtimes({}) {
+bool AirTime::isTxAllowedChannelUtil(bool polite)
+{
+    uint8_t percentage = (polite ? polite_channel_util_percent : max_channel_util_percent);
+    if (channelUtilizationPercent() < percentage) {
+        return true;
+    } else {
+        LOG_WARN("Channel utilization is >%d percent. Skipping this opportunity to send.\n", percentage);
+        return false;
+    }
 }
 
+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 >%f percent. Skipping this opportunity to send.\n",
+                     myRegion->dutyCycle * polite_duty_cycle_percent / 100);
+            return false;
+        }
+    }
+    return true;
+}
+
+// Get the amount of minutes we have to be silent before we can send again
+uint8_t AirTime::getSilentMinutes(float txPercent, float dutyCycle)
+{
+    float newTxPercent = txPercent;
+    for (int8_t i = MINUTES_IN_HOUR - 1; i >= 0; --i) {
+        newTxPercent -= ((float)this->utilizationTX[i] / (MS_IN_MINUTE * MINUTES_IN_HOUR / 100));
+        if (newTxPercent < dutyCycle)
+            return MINUTES_IN_HOUR - 1 - i;
+    }
+
+    return MINUTES_IN_HOUR;
+}
+
+AirTime::AirTime() : concurrency::OSThread("AirTime"), airtimes({}) {}
+
 int32_t AirTime::runOnce()
 {
     secSinceBoot++;
@@ -140,18 +181,17 @@ int32_t AirTime::runOnce()
         }
 
         // Init airtime windows to all 0
-        for (int i = 0; i < myNodeInfo.air_period_rx_count; i++) {
+        for (int i = 0; i < PERIODS_TO_LOG; i++) {
             this->airtimes.periodTX[i] = 0;
             this->airtimes.periodRX[i] = 0;
             this->airtimes.periodRX_ALL[i] = 0;
 
-            // myNodeInfo.air_period_tx[i] = 0;
-            // myNodeInfo.air_period_rx[i] = 0;
+            // air_period_tx[i] = 0;
+            // air_period_rx[i] = 0;
         }
 
         firstTime = false;
         lastUtilPeriod = utilPeriod;
-
     } else {
         this->airtimeRotatePeriod();
 
@@ -167,21 +207,15 @@ int32_t AirTime::runOnce()
 
             this->utilizationTX[utilPeriodTX] = 0;
         }
-
-        // Update channel_utilization every second.
-        myNodeInfo.channel_utilization = airTime->channelUtilizationPercent();
-
-        // Update channel_utilization every second.
-        myNodeInfo.air_util_tx = airTime->utilizationTXPercent();
     }
-/*
-    DEBUG_MSG("utilPeriodTX %d TX Airtime %3.2f%\n", utilPeriodTX, airTime->utilizationTXPercent());
-    for (uint32_t i = 0; i < MINUTES_IN_HOUR; i++) {
-        DEBUG_MSG(
-            "%d,", this->utilizationTX[i]
-            );
-    }
-    DEBUG_MSG("\n");
-*/
+    /*
+        LOG_DEBUG("utilPeriodTX %d TX Airtime %3.2f%\n", utilPeriodTX, airTime->utilizationTXPercent());
+        for (uint32_t i = 0; i < MINUTES_IN_HOUR; i++) {
+            LOG_DEBUG(
+                "%d,", this->utilizationTX[i]
+                );
+        }
+        LOG_DEBUG("\n");
+    */
     return (1000 * 1);
-}
+}

src/airtime.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include "MeshRadio.h"
 #include "concurrency/OSThread.h"
 #include "configuration.h"
 #include <Arduino.h>
@@ -29,9 +30,9 @@
 #define PERIODS_TO_LOG 8
 #define MINUTES_IN_HOUR 60
 #define SECONDS_IN_MINUTE 60
+#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);
@@ -57,12 +58,18 @@ class AirTime : private concurrency::OSThread
     uint32_t getSecondsPerPeriod();
     uint32_t getSecondsSinceBoot();
     uint32_t *airtimeReport(reportTypes reportType);
+    uint8_t getSilentMinutes(float txPercent, float dutyCycle);
+    bool isTxAllowedChannelUtil(bool polite = false);
+    bool isTxAllowedAirUtil();
 
   private:
     bool firstTime = true;
     uint8_t lastUtilPeriod = 0;
     uint8_t lastUtilPeriodTX = 0;
     uint32_t secSinceBoot = 0;
+    uint8_t max_channel_util_percent = 40;
+    uint8_t polite_channel_util_percent = 25;
+    uint8_t polite_duty_cycle_percent = 50; // half of Duty Cycle allowance is ok for metadata
 
     struct airtimeStruct {
         uint32_t periodTX[PERIODS_TO_LOG];     // AirTime transmitted

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"
@@ -11,8 +11,8 @@ extern "C" void delay(uint32_t dwMs);
 #endif
 
 struct ToneDuration {
-  int frequency_khz;
-  int duration_ms;
+    int frequency_khz;
+    int duration_ms;
 };
 
 // Some common frequencies.
@@ -30,40 +30,39 @@ struct ToneDuration {
 #define NOTE_B3 247
 #define NOTE_CS4 277
 
-const int DURATION_1_8 = 125;  // 1/8 note
-const int DURATION_1_4 = 250;  // 1/4 note
+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;
+    if (!config.device.buzzer_gpio)
+        config.device.buzzer_gpio = PIN_BUZZER;
 #endif
-  if (config.device.buzzer_gpio) {
-    for (int i = 0; i < size; i++) {
-      const auto &tone_duration = tone_durations[i];
-      tone(config.device.buzzer_gpio, tone_duration.frequency_khz, tone_duration.duration_ms);
-      // to distinguish the notes, set a minimum time between them.
-      delay(1.3 * tone_duration.duration_ms);
+    if (config.device.buzzer_gpio) {
+        for (int i = 0; i < size; i++) {
+            const auto &tone_duration = tone_durations[i];
+            tone(config.device.buzzer_gpio, tone_duration.frequency_khz, tone_duration.duration_ms);
+            // to distinguish the notes, set a minimum time between them.
+            delay(1.3 * tone_duration.duration_ms);
+        }
     }
-  }
 }
 
-
-void playBeep() {
-  ToneDuration melody[] = {{NOTE_B3, DURATION_1_4}};
-  playTones(melody, sizeof(melody) / sizeof(ToneDuration));
+void playBeep()
+{
+    ToneDuration melody[] = {{NOTE_B3, DURATION_1_4}};
+    playTones(melody, sizeof(melody) / sizeof(ToneDuration));
 }
 
-void playStartMelody() {
-  ToneDuration melody[] = {{NOTE_FS3, DURATION_1_8},
-                           {NOTE_AS3, DURATION_1_8},
-                           {NOTE_CS4, DURATION_1_4}};
-  playTones(melody, sizeof(melody) / sizeof(ToneDuration));
+void playStartMelody()
+{
+    ToneDuration melody[] = {{NOTE_FS3, DURATION_1_8}, {NOTE_AS3, DURATION_1_8}, {NOTE_CS4, DURATION_1_4}};
+    playTones(melody, sizeof(melody) / sizeof(ToneDuration));
 }
 
-void playShutdownMelody() {
-  ToneDuration melody[] = {{NOTE_CS4, DURATION_1_8},
-                           {NOTE_AS3, DURATION_1_8},
-                           {NOTE_FS3, DURATION_1_4}};
-  playTones(melody, sizeof(melody) / sizeof(ToneDuration));
+void playShutdownMelody()
+{
+    ToneDuration melody[] = {{NOTE_CS4, DURATION_1_8}, {NOTE_AS3, DURATION_1_8}, {NOTE_FS3, DURATION_1_4}};
+    playTones(melody, sizeof(melody) / sizeof(ToneDuration));
 }

src/commands.h

@@ -4,15 +4,15 @@
  */
 
 enum class Cmd {
-        INVALID,
-        SET_ON,
-        SET_OFF,
-        ON_PRESS,
-        START_BLUETOOTH_PIN_SCREEN,
-        START_FIRMWARE_UPDATE_SCREEN,
-        STOP_BLUETOOTH_PIN_SCREEN,
-        STOP_BOOT_SCREEN,
-        PRINT,
-        START_SHUTDOWN_SCREEN,
-        START_REBOOT_SCREEN,
+    INVALID,
+    SET_ON,
+    SET_OFF,
+    ON_PRESS,
+    START_BLUETOOTH_PIN_SCREEN,
+    START_FIRMWARE_UPDATE_SCREEN,
+    STOP_BLUETOOTH_PIN_SCREEN,
+    STOP_BOOT_SCREEN,
+    PRINT,
+    START_SHUTDOWN_SCREEN,
+    START_REBOOT_SCREEN,
 };

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
 {
@@ -13,12 +13,12 @@ InterruptableDelay::~InterruptableDelay() {}
  */
 bool InterruptableDelay::delay(uint32_t msec)
 {
-    // DEBUG_MSG("delay %u ", msec);
+    // LOG_DEBUG("delay %u ", msec);
 
     // sem take will return false if we timed out (i.e. were not interrupted)
     bool r = semaphore.take(msec);
 
-    // DEBUG_MSG("interrupt=%d\n", r);
+    // LOG_DEBUG("interrupt=%d\n", r);
     return !r;
 }