diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index e45fd5d93..d83d052b0 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -13,16 +13,13 @@
},
"customizations": {
"vscode": {
- "extensions": [
- "ms-vscode.cpptools",
- "platformio.platformio-ide",
- ]
+ "extensions": ["ms-vscode.cpptools", "platformio.platformio-ide"]
}
},
// Use 'forwardPorts' to make a list of ports inside the container available locally.
- "forwardPorts": [ 4403 ],
+ "forwardPorts": [4403],
// Run commands to prepare the container for use
- "postCreateCommand": ".devcontainer/setup.sh",
+ "postCreateCommand": ".devcontainer/setup.sh"
}
diff --git a/.devcontainer/setup.sh b/.devcontainer/setup.sh
index 866a4a417..0b2665f84 100755
--- a/.devcontainer/setup.sh
+++ b/.devcontainer/setup.sh
@@ -1,3 +1,3 @@
#!/usr/bin/env sh
-git submodule update --init
\ No newline at end of file
+git submodule update --init
diff --git a/.github/ISSUE_TEMPLATE/Bug Report.yml b/.github/ISSUE_TEMPLATE/Bug Report.yml
index b5ca0db40..f2d2f6507 100644
--- a/.github/ISSUE_TEMPLATE/Bug Report.yml
+++ b/.github/ISSUE_TEMPLATE/Bug Report.yml
@@ -49,10 +49,24 @@ body:
- Heltec V3
- Heltec Wireless Paper
- Heltec Wireless Tracker
+ - Heltec Mesh Node T114
+ - Heltec Vision Master E213
+ - Heltec Vision Master E290
+ - Heltec Vision Master T190
+ - Nano G1
+ - Nano G1 Explorer
+ - Nano G2 Ultra
- Raspberry Pi Pico (W)
- Relay v1
- Relay v2
- Seeed Wio Tracker 1110
+ - Seeed Card Tracker T1000-E
+ - Station G1
+ - Station G2
+ - unPhone
+ - CanaryOne
+ - Chatter
+ - Linux Native
- DIY
- Other
validations:
diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml
index b027a36cc..b50ccac26 100644
--- a/.github/ISSUE_TEMPLATE/feature.yml
+++ b/.github/ISSUE_TEMPLATE/feature.yml
@@ -18,6 +18,7 @@ body:
- ESP32
- RP2040
- Linux Native
+ - Cross-Platform
- other
validations:
required: true
diff --git a/.github/actions/build-variant/action.yml b/.github/actions/build-variant/action.yml
new file mode 100644
index 000000000..f9410eb03
--- /dev/null
+++ b/.github/actions/build-variant/action.yml
@@ -0,0 +1,90 @@
+name: Setup Build Variant Composite Action
+description: Variant build actions for Meshtastic Platform IO steps
+
+inputs:
+ board:
+ description: The board to build for
+ required: true
+ github_token:
+ description: GitHub token
+ required: true
+ build-script-path:
+ description: Path to the build script
+ required: true
+ remove-debug-flags:
+ description: A space separated list of files to remove debug flags from
+ required: false
+ default: ""
+ ota-firmware-source:
+ description: The OTA firmware file to pull
+ required: false
+ default: ""
+ ota-firmware-target:
+ description: The target path to store the OTA firmware file
+ required: false
+ default: ""
+ artifact-paths:
+ description: A newline separated list of paths to store as artifacts
+ required: false
+ default: ""
+ include-web-ui:
+ description: Include the web UI in the build
+ required: false
+ default: "false"
+
+runs:
+ using: composite
+ steps:
+ - name: Build base
+ id: base
+ uses: ./.github/actions/setup-base
+
+ - name: Pull web ui
+ if: inputs.include-web-ui == 'true'
+ uses: dsaltares/fetch-gh-release-asset@master
+ with:
+ repo: meshtastic/web
+ file: build.tar
+ target: build.tar
+ token: ${{ inputs.github_token }}
+
+ - name: Unpack web ui
+ if: inputs.include-web-ui == 'true'
+ shell: bash
+ run: |
+ tar -xf build.tar -C data/static
+ rm build.tar
+
+ - name: Remove debug flags for release
+ shell: bash
+ if: inputs.remove-debug-flags != ''
+ run: |
+ for INI_FILE in ${{ inputs.remove-debug-flags }}; do
+ sed -i '/DDEBUG_HEAP/d' ${INI_FILE}
+ done
+
+ - name: Build ${{ inputs.board }}
+ shell: bash
+ run: ${{ inputs.build-script-path }} ${{ inputs.board }}
+
+ - name: Pull OTA Firmware
+ if: inputs.ota-firmware-source != '' && inputs.ota-firmware-target != ''
+ uses: dsaltares/fetch-gh-release-asset@master
+ with:
+ repo: meshtastic/firmware-ota
+ file: ${{ inputs.ota-firmware-source }}
+ target: ${{ inputs.ota-firmware-target }}
+ token: ${{ inputs.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@v4
+ with:
+ name: firmware-${{ inputs.board }}-${{ steps.version.outputs.version }}.zip
+ overwrite: true
+ path: |
+ ${{ inputs.artifact-paths }}
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000..616c16ce2
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,26 @@
+version: 2
+updates:
+ - package-ecosystem: docker
+ directory: devcontainer
+ schedule:
+ interval: daily
+ time: "05:00" # trunk-ignore(yamllint/quoted-strings): required by dependabot syntax check
+ timezone: US/Pacific
+ - package-ecosystem: docker
+ directory: /
+ schedule:
+ interval: daily
+ time: "05:00" # trunk-ignore(yamllint/quoted-strings): required by dependabot syntax check
+ timezone: US/Pacific
+ - package-ecosystem: gitsubmodule
+ directory: /
+ schedule:
+ interval: daily
+ time: "05:00" # trunk-ignore(yamllint/quoted-strings): required by dependabot syntax check
+ timezone: US/Pacific
+ - package-ecosystem: github-actions
+ directory: /.github/workflows
+ schedule:
+ interval: daily
+ time: "05:00" # trunk-ignore(yamllint/quoted-strings): required by dependabot syntax check
+ timezone: US/Pacific
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 512dea311..6ccb4a105 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,9 +1,9 @@
+### ❌ (Please delete all these tips and replace them with your text) ❌
+
## Thank you for sending in a pull request, here's some tips to get started!
-(Please delete all these tips and replace with your text)
-
- Before starting on some new big chunk of code, it it is optional but highly recommended to open an issue first
- to say "hey, I think this idea X should be implemented and I'm starting work on it. My general plan is Y, any feedback
+ to say "Hey, I think this idea X should be implemented and I'm starting work on it. My general plan is Y, any feedback
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
@@ -12,3 +12,4 @@
- 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".
+- If your PR gets accepted you can request a "Contributor" role in the Meshtastic Discord
diff --git a/.github/workflows/build_esp32.yml b/.github/workflows/build_esp32.yml
index 4cbb4c7a4..041191d34 100644
--- a/.github/workflows/build_esp32.yml
+++ b/.github/workflows/build_esp32.yml
@@ -12,52 +12,22 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- - 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
- sed -i '/DDEBUG_HEAP/d' ./arch/esp32/esp32c3.ini
- name: Build ESP32
- run: bin/build-esp32.sh ${{ inputs.board }}
-
- - name: Pull OTA Firmware
- uses: dsaltares/fetch-gh-release-asset@master
+ id: build
+ uses: ./.github/actions/build-variant
with:
- repo: meshtastic/firmware-ota
- 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
- id: version
-
- - name: Store binaries as an artifact
- uses: actions/upload-artifact@v4
- with:
- name: firmware-${{ inputs.board }}-${{ steps.version.outputs.version }}.zip
- overwrite: true
- path: |
+ github_token: ${{ secrets.GITHUB_TOKEN }}
+ board: ${{ inputs.board }}
+ remove-debug-flags: >-
+ ./arch/esp32/esp32.ini
+ ./arch/esp32/esp32s2.ini
+ ./arch/esp32/esp32s3.ini
+ ./arch/esp32/esp32c3.ini
+ build-script-path: bin/build-esp32.sh
+ ota-firmware-source: firmware.bin
+ ota-firmware-target: release/bleota.bin
+ artifact-paths: |
release/*.bin
release/*.elf
+ include-web-ui: true
diff --git a/.github/workflows/build_esp32_c3.yml b/.github/workflows/build_esp32_c3.yml
index 07727d711..ddc2e2859 100644
--- a/.github/workflows/build_esp32_c3.yml
+++ b/.github/workflows/build_esp32_c3.yml
@@ -14,50 +14,21 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- - name: Build base
- id: base
- uses: ./.github/actions/setup-base
- - name: Pull web ui
- uses: dsaltares/fetch-gh-release-asset@master
+ - name: Build ESP32-C3
+ id: build
+ uses: ./.github/actions/build-variant
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
- sed -i '/DDEBUG_HEAP/d' ./arch/esp32/esp32c3.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-c3.bin
- target: release/bleota-c3.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@v4
- with:
- name: firmware-${{ inputs.board }}-${{ steps.version.outputs.version }}.zip
- overwrite: true
- path: |
+ github_token: ${{ secrets.GITHUB_TOKEN }}
+ board: ${{ inputs.board }}
+ remove-debug-flags: >-
+ ./arch/esp32/esp32.ini
+ ./arch/esp32/esp32s2.ini
+ ./arch/esp32/esp32s3.ini
+ ./arch/esp32/esp32c3.ini
+ build-script-path: bin/build-esp32.sh
+ ota-firmware-source: firmware-c3.bin
+ ota-firmware-target: release/bleota-c3.bin
+ artifact-paths: |
release/*.bin
release/*.elf
diff --git a/.github/workflows/build_esp32_c6.yml b/.github/workflows/build_esp32_c6.yml
new file mode 100644
index 000000000..3be813afa
--- /dev/null
+++ b/.github/workflows/build_esp32_c6.yml
@@ -0,0 +1,35 @@
+name: Build ESP32-C6
+
+on:
+ workflow_call:
+ inputs:
+ board:
+ required: true
+ type: string
+
+permissions: read-all
+
+jobs:
+ build-esp32-c6:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v4
+
+ - name: Build ESP32-C6
+ id: build
+ uses: ./.github/actions/build-variant
+ with:
+ github_token: ${{ secrets.GITHUB_TOKEN }}
+ board: ${{ inputs.board }}
+ remove-debug-flags: >-
+ ./arch/esp32/esp32.ini
+ ./arch/esp32/esp32s2.ini
+ ./arch/esp32/esp32s3.ini
+ ./arch/esp32/esp32c3.ini
+ ./arch/esp32/esp32c6.ini
+ build-script-path: bin/build-esp32.sh
+ ota-firmware-source: firmware-c3.bin
+ ota-firmware-target: release/bleota-c3.bin
+ artifact-paths: |
+ release/*.bin
+ release/*.elf
diff --git a/.github/workflows/build_esp32_s3.yml b/.github/workflows/build_esp32_s3.yml
index 10773833e..29857ef17 100644
--- a/.github/workflows/build_esp32_s3.yml
+++ b/.github/workflows/build_esp32_s3.yml
@@ -12,50 +12,22 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- - name: Build base
- id: base
- uses: ./.github/actions/setup-base
- - name: Pull web ui
- uses: dsaltares/fetch-gh-release-asset@master
+ - name: Build ESP32-S3
+ id: build
+ uses: ./.github/actions/build-variant
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
- sed -i '/DDEBUG_HEAP/d' ./arch/esp32/esp32c3.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@v4
- with:
- name: firmware-${{ inputs.board }}-${{ steps.version.outputs.version }}.zip
- overwrite: true
- path: |
+ github_token: ${{ secrets.GITHUB_TOKEN }}
+ board: ${{ inputs.board }}
+ remove-debug-flags: >-
+ ./arch/esp32/esp32.ini
+ ./arch/esp32/esp32s2.ini
+ ./arch/esp32/esp32s3.ini
+ ./arch/esp32/esp32c3.ini
+ build-script-path: bin/build-esp32.sh
+ ota-firmware-source: firmware-s3.bin
+ ota-firmware-target: release/bleota-s3.bin
+ artifact-paths: |
release/*.bin
release/*.elf
+ include-web-ui: true
diff --git a/.github/workflows/build_native.yml b/.github/workflows/build_native.yml
index 51bef0c13..1fb44a717 100644
--- a/.github/workflows/build_native.yml
+++ b/.github/workflows/build_native.yml
@@ -67,7 +67,7 @@ jobs:
- name: Docker build and push tagged versions
if: ${{ github.event_name == 'workflow_dispatch' }}
continue-on-error: true # FIXME: Failing docker login auth
- uses: docker/build-push-action@v5
+ uses: docker/build-push-action@v6
with:
context: .
file: ./Dockerfile
@@ -77,7 +77,7 @@ jobs:
- name: Docker build and push
if: ${{ github.ref == 'refs/heads/master' && github.event_name != 'pull_request_target' && github.event_name != 'pull_request' }}
continue-on-error: true # FIXME: Failing docker login auth
- uses: docker/build-push-action@v5
+ uses: docker/build-push-action@v6
with:
context: .
file: ./Dockerfile
diff --git a/.github/workflows/build_nrf52.yml b/.github/workflows/build_nrf52.yml
index ac509a096..606cb8a3e 100644
--- a/.github/workflows/build_nrf52.yml
+++ b/.github/workflows/build_nrf52.yml
@@ -12,23 +12,15 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- - name: Build base
- id: base
- uses: ./.github/actions/setup-base
- name: Build NRF52
- run: bin/build-nrf52.sh ${{ inputs.board }}
-
- - name: Get release version string
- run: echo "version=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
- id: version
-
- - name: Store binaries as an artifact
- uses: actions/upload-artifact@v4
+ id: build
+ uses: ./.github/actions/build-variant
with:
- name: firmware-${{ inputs.board }}-${{ steps.version.outputs.version }}.zip
- overwrite: true
- path: |
+ github_token: ${{ secrets.GITHUB_TOKEN }}
+ board: ${{ inputs.board }}
+ build-script-path: bin/build-nrf52.sh
+ artifact-paths: |
release/*.hex
release/*.uf2
release/*.elf
diff --git a/.github/workflows/build_rpi2040.yml b/.github/workflows/build_rpi2040.yml
index 6e258fe2a..b0508877d 100644
--- a/.github/workflows/build_rpi2040.yml
+++ b/.github/workflows/build_rpi2040.yml
@@ -12,22 +12,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- - name: Build base
- id: base
- uses: ./.github/actions/setup-base
- name: Build Raspberry Pi 2040
- run: ./bin/build-rpi2040.sh ${{ inputs.board }}
-
- - name: Get release version string
- run: echo "version=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
- id: version
-
- - name: Store binaries as an artifact
- uses: actions/upload-artifact@v4
+ id: build
+ uses: ./.github/actions/build-variant
with:
- name: firmware-${{ inputs.board }}-${{ steps.version.outputs.version }}.zip
- overwrite: true
- path: |
+ github_token: ${{ secrets.GITHUB_TOKEN }}
+ board: ${{ inputs.board }}
+ build-script-path: bin/build-rpi2040.sh
+ artifact-paths: |
release/*.uf2
release/*.elf
diff --git a/.github/workflows/build_stm32.yml b/.github/workflows/build_stm32.yml
index d13c52c8a..e78178db3 100644
--- a/.github/workflows/build_stm32.yml
+++ b/.github/workflows/build_stm32.yml
@@ -12,22 +12,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- - name: Build base
- id: base
- uses: ./.github/actions/setup-base
- - name: Build STM32
- run: bin/build-stm32.sh ${{ inputs.board }}
-
- - name: Get release version string
- run: echo "version=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
- id: version
-
- - name: Store binaries as an artifact
- uses: actions/upload-artifact@v4
+ - name: Build STM32WL
+ id: build
+ uses: ./.github/actions/build-variant
with:
- name: firmware-${{ inputs.board }}-${{ steps.version.outputs.version }}.zip
- overwrite: true
- path: |
+ github_token: ${{ secrets.GITHUB_TOKEN }}
+ board: ${{ inputs.board }}
+ build-script-path: bin/build-stm32.sh
+ artifact-paths: |
release/*.hex
release/*.bin
diff --git a/.github/workflows/main_matrix.yml b/.github/workflows/main_matrix.yml
index 36125f72f..68f7bb31c 100644
--- a/.github/workflows/main_matrix.yml
+++ b/.github/workflows/main_matrix.yml
@@ -1,4 +1,7 @@
name: CI
+concurrency:
+ group: ${{ github.head_ref || github.run_id }}
+ cancel-in-progress: true
#concurrency:
# group: ${{ github.ref }}
# cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
@@ -24,7 +27,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- arch: [esp32, esp32s3, esp32c3, nrf52840, rp2040, stm32, check]
+ arch: [esp32, esp32s3, esp32c3, esp32c6, nrf52840, rp2040, stm32, check]
runs-on: ubuntu-latest
steps:
- id: checkout
@@ -32,13 +35,18 @@ jobs:
name: Checkout base
- id: jsonStep
run: |
- TARGETS=$(./bin/generate_ci_matrix.py ${{matrix.arch}})
+ if [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
+ TARGETS=$(./bin/generate_ci_matrix.py ${{matrix.arch}})
+ else
+ TARGETS=$(./bin/generate_ci_matrix.py ${{matrix.arch}} quick)
+ fi
echo "$TARGETS"
echo "${{matrix.arch}}=$(jq -cn --argjson environments "$TARGETS" '{board: $environments}')" >> $GITHUB_OUTPUT
outputs:
esp32: ${{ steps.jsonStep.outputs.esp32 }}
esp32s3: ${{ steps.jsonStep.outputs.esp32s3 }}
esp32c3: ${{ steps.jsonStep.outputs.esp32c3 }}
+ esp32c6: ${{ steps.jsonStep.outputs.esp32c6 }}
nrf52840: ${{ steps.jsonStep.outputs.nrf52840 }}
rp2040: ${{ steps.jsonStep.outputs.rp2040 }}
stm32: ${{ steps.jsonStep.outputs.stm32 }}
@@ -51,6 +59,7 @@ jobs:
matrix: ${{ fromJson(needs.setup.outputs.check) }}
runs-on: ubuntu-latest
+ if: ${{ github.event_name != 'workflow_dispatch' }}
steps:
- uses: actions/checkout@v4
- name: Build base
@@ -86,6 +95,15 @@ jobs:
with:
board: ${{ matrix.board }}
+ build-esp32-c6:
+ needs: setup
+ strategy:
+ fail-fast: false
+ matrix: ${{ fromJson(needs.setup.outputs.esp32c6) }}
+ uses: ./.github/workflows/build_esp32_c6.yml
+ with:
+ board: ${{ matrix.board }}
+
build-nrf52:
needs: setup
strategy:
@@ -119,11 +137,12 @@ jobs:
package-raspbian-armv7l:
uses: ./.github/workflows/package_raspbian_armv7l.yml
- package-native:
- uses: ./.github/workflows/package_amd64.yml
+ # package-native:
+ # uses: ./.github/workflows/package_amd64.yml
after-checks:
runs-on: ubuntu-latest
+ if: ${{ github.event_name != 'workflow_dispatch' }}
needs: [check]
steps:
- name: Checkout code
@@ -137,17 +156,17 @@ jobs:
contents: write
pull-requests: write
runs-on: ubuntu-latest
- needs:
- [
+ needs: [
build-esp32,
build-esp32-s3,
build-esp32-c3,
+ build-esp32-c6,
build-nrf52,
build-rpi2040,
build-stm32,
package-raspbian,
package-raspbian-armv7l,
- package-native,
+ # package-native,
]
steps:
- name: Checkout code
@@ -216,22 +235,16 @@ jobs:
path: ./*.elf
retention-days: 30
- - name: Create request artifacts
- continue-on-error: true # FIXME: Why are we getting 502, but things still work?
- if: ${{ github.event_name == 'pull_request_target' || github.event_name == 'pull_request' }}
- uses: gavv/pull-request-artifacts@v2.1.0
+ - uses: PicoCentauri/comment-artifact@main
with:
- commit: ${{ (github.event.pull_request_target || github.event.pull_request).head.sha }}
- repo-token: ${{ secrets.GITHUB_TOKEN }}
- artifacts-token: ${{ secrets.ARTIFACTS_TOKEN }}
- artifacts-repo: meshtastic/artifacts
- artifacts-branch: device
- artifacts: ./firmware-${{ steps.version.outputs.version }}.zip
+ name: firmware-${{ steps.version.outputs.version }}
+ description: "Download firmware-${{ steps.version.outputs.version }}.zip. This artifact will be available for 90 days from creation"
+ github-token: ${{ secrets.GITHUB_TOKEN }}
release-artifacts:
runs-on: ubuntu-latest
if: ${{ github.event_name == 'workflow_dispatch' }}
- needs: [gather-artifacts, after-checks]
+ needs: [gather-artifacts]
steps:
- name: Checkout
uses: actions/checkout@v4
@@ -251,12 +264,6 @@ jobs:
merge-multiple: true
path: ./output
- - uses: actions/download-artifact@v4
- with:
- pattern: meshtasticd_${{ steps.version.outputs.version }}_*.deb
- merge-multiple: true
- path: ./output
-
- name: Display structure of downloaded files
run: ls -R
@@ -266,7 +273,7 @@ jobs:
chmod +x ./output/device-update.sh
- name: Zip firmware
- run: zip -j -9 -r ./firmware-${{ steps.version.outputs.version }}.zip ./output -x *.deb
+ run: zip -j -9 -r ./firmware-${{ steps.version.outputs.version }}.zip ./output -x meshtasticd_*
- uses: actions/download-artifact@v4
with:
@@ -314,6 +321,12 @@ jobs:
asset_name: debug-elfs-${{ steps.version.outputs.version }}.zip
asset_content_type: application/zip
+ - uses: actions/download-artifact@v4
+ with:
+ pattern: meshtasticd_${{ steps.version.outputs.version }}_*.deb
+ merge-multiple: true
+ path: ./output
+
- name: Add raspbian aarch64 .deb
uses: actions/upload-release-asset@v1
env:
@@ -334,22 +347,50 @@ jobs:
asset_name: meshtasticd_${{ steps.version.outputs.version }}_armhf.deb
asset_content_type: application/vnd.debian.binary-package
- - name: Add raspbian amd64 .deb
- uses: actions/upload-release-asset@v1
- env:
- GITHUB_TOKEN: ${{ github.token }}
- with:
- upload_url: ${{ steps.create_release.outputs.upload_url }}
- asset_path: ./output/meshtasticd_${{ steps.version.outputs.version }}_amd64.deb
- asset_name: meshtasticd_${{ steps.version.outputs.version }}_amd64.deb
- asset_content_type: application/vnd.debian.binary-package
+ # - name: Add raspbian amd64 .deb
+ # uses: actions/upload-release-asset@v1
+ # env:
+ # GITHUB_TOKEN: ${{ github.token }}
+ # with:
+ # upload_url: ${{ steps.create_release.outputs.upload_url }}
+ # asset_path: ./output/meshtasticd_${{ steps.version.outputs.version }}_amd64.deb
+ # asset_name: meshtasticd_${{ steps.version.outputs.version }}_amd64.deb
+ # asset_content_type: application/vnd.debian.binary-package
- name: Bump version.properties
run: >-
bin/bump_version.py
- name: Create version.properties pull request
- uses: peter-evans/create-pull-request@v6
+ uses: peter-evans/create-pull-request@v7
with:
+ title: Bump version.properties
add-paths: |
version.properties
+
+ - name: Checkout meshtastic/meshtastic.github.io
+ uses: actions/checkout@v4
+ with:
+ repository: meshtastic/meshtastic.github.io
+ token: ${{ secrets.ARTIFACTS_TOKEN }}
+ path: meshtastic.github.io
+
+ - name: Display structure of downloaded files
+ run: ls -R
+
+ - name: Extract firmware.zip
+ run: |
+ unzip ./firmware-${{ steps.version.outputs.version }}.zip -d meshtastic.github.io/firmware-${{ steps.version.outputs.version }}
+
+ - name: Display structure of downloaded files
+ run: ls -R
+
+ - name: Commit and push changes
+ run: |
+ cd meshtastic.github.io
+ find . -type f -name 'meshtasticd_*' -exec rm -f {} +
+ git config --global user.name "github-actions[bot]"
+ git config --global user.email "github-actions[bot]@users.noreply.github.com"
+ git add .
+ git commit -m "Add firmware version ${{ steps.version.outputs.version }}"
+ git push
diff --git a/.github/workflows/package_amd64.yml b/.github/workflows/package_amd64.yml
index ae7bf3242..0b5093f24 100644
--- a/.github/workflows/package_amd64.yml
+++ b/.github/workflows/package_amd64.yml
@@ -13,7 +13,7 @@ jobs:
uses: ./.github/workflows/build_native.yml
package-native:
- runs-on: ubuntu-latest
+ runs-on: ubuntu-22.04
needs: build-native
steps:
- name: Checkout code
diff --git a/.github/workflows/package_raspbian.yml b/.github/workflows/package_raspbian.yml
index 5471332c5..bcbda53e2 100644
--- a/.github/workflows/package_raspbian.yml
+++ b/.github/workflows/package_raspbian.yml
@@ -13,7 +13,7 @@ jobs:
uses: ./.github/workflows/build_raspbian.yml
package-raspbian:
- runs-on: ubuntu-latest
+ runs-on: ubuntu-22.04
needs: build-raspbian
steps:
- name: Checkout code
diff --git a/.github/workflows/package_raspbian_armv7l.yml b/.github/workflows/package_raspbian_armv7l.yml
index 5b9c9aa71..1308fe925 100644
--- a/.github/workflows/package_raspbian_armv7l.yml
+++ b/.github/workflows/package_raspbian_armv7l.yml
@@ -13,7 +13,7 @@ jobs:
uses: ./.github/workflows/build_raspbian_armv7l.yml
package-raspbian_armv7l:
- runs-on: ubuntu-latest
+ runs-on: ubuntu-22.04
needs: build-raspbian_armv7l
steps:
- name: Checkout code
diff --git a/.github/workflows/sec_sast_semgrep_cron.yml b/.github/workflows/sec_sast_semgrep_cron.yml
index 2a0361f5e..54bbbe6d2 100644
--- a/.github/workflows/sec_sast_semgrep_cron.yml
+++ b/.github/workflows/sec_sast_semgrep_cron.yml
@@ -12,7 +12,7 @@ jobs:
semgrep-full:
runs-on: ubuntu-latest
container:
- image: returntocorp/semgrep
+ image: semgrep/semgrep
steps:
# step 1
diff --git a/.github/workflows/sec_sast_semgrep_pull.yml b/.github/workflows/sec_sast_semgrep_pull.yml
index b6c288494..9013f1c74 100644
--- a/.github/workflows/sec_sast_semgrep_pull.yml
+++ b/.github/workflows/sec_sast_semgrep_pull.yml
@@ -4,9 +4,9 @@ on: pull_request
jobs:
semgrep-diff:
- runs-on: ubuntu-latest
+ runs-on: ubuntu-22.04
container:
- image: returntocorp/semgrep
+ image: semgrep/semgrep
steps:
# step 1
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f58b38ac9..241598fd0 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -57,35 +57,50 @@ jobs:
reporter: java-junit
hardware-tests:
- runs-on: ubuntu-latest
+ runs-on: test-runner
steps:
- name: Checkout code
uses: actions/checkout@v4
+ # - uses: actions/setup-python@v5
+ # with:
+ # python-version: '3.10'
+
+ # pipx install "setuptools<72"
- name: Upgrade python tools
shell: bash
run: |
- python -m pip install --upgrade pip
- pip install -U --no-build-isolation --no-cache-dir "setuptools<72"
- pip install -U platformio adafruit-nrfutil --no-build-isolation
- pip install -U poetry --no-build-isolation
- pip install -U meshtastic --pre --no-build-isolation
+ pipx install adafruit-nrfutil
+ pipx install poetry
+ pipx install meshtastic --pip-args=--pre
+
+ - name: Install PlatformIO from script
+ shell: bash
+ run: |
+ curl -fsSL -o get-platformio.py https://raw.githubusercontent.com/platformio/platformio-core-installer/master/get-platformio.py
+ python3 get-platformio.py
- name: Upgrade platformio
shell: bash
run: |
+ export PATH=$PATH:$HOME/.local/bin
pio upgrade
+ - name: Setup Node
+ uses: actions/setup-node@v4
+ with:
+ node-version: 18
+
- name: Setup pnpm
- uses: pnpm/action-setup@v2
+ uses: pnpm/action-setup@v4
with:
version: latest
- - name: Install Dependencies
- run: pnpm install
-
- - name: Setup devices
- run: pnpm run setup
-
- - name: Execute end to end tests on connected hardware
- run: pnpm run test
+ - name: Install dependencies, setup devices and run
+ shell: bash
+ run: |
+ git submodule update --init --recursive
+ cd meshtestic/
+ pnpm install
+ pnpm run setup
+ pnpm run test
diff --git a/.github/workflows/update_protobufs.yml b/.github/workflows/update_protobufs.yml
index 4402a280e..7ce767370 100644
--- a/.github/workflows/update_protobufs.yml
+++ b/.github/workflows/update_protobufs.yml
@@ -1,4 +1,4 @@
-name: "Update protobufs and regenerate classes"
+name: Update protobufs and regenerate classes
on: workflow_dispatch
jobs:
@@ -26,8 +26,9 @@ jobs:
./bin/regen-protos.sh
- name: Create pull request
- uses: peter-evans/create-pull-request@v6
+ uses: peter-evans/create-pull-request@v7
with:
+ title: Update protobufs and classes
add-paths: |
protobufs
src/mesh
diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
index b20a1ec95..79cd91af5 100644
--- a/.trunk/trunk.yaml
+++ b/.trunk/trunk.yaml
@@ -1,6 +1,6 @@
version: 0.1
cli:
- version: 1.22.3
+ version: 1.22.5
plugins:
sources:
- id: trunk
@@ -8,27 +8,27 @@ plugins:
uri: https://github.com/trunk-io/plugins
lint:
enabled:
- - trufflehog@3.81.9
+ - trufflehog@3.82.5
- yamllint@1.35.1
- - bandit@1.7.9
- - checkov@3.2.238
+ - bandit@1.7.10
+ - checkov@3.2.255
- terrascan@1.19.1
- - trivy@0.54.1
+ - trivy@0.55.2
#- trufflehog@3.63.2-rc0
- taplo@0.9.3
- - ruff@0.6.2
+ - ruff@0.6.7
- isort@5.13.2
- - markdownlint@0.41.0
+ - markdownlint@0.42.0
- oxipng@9.1.2
- svgo@3.3.2
- - actionlint@1.7.1
+ - actionlint@1.7.2
- flake8@7.1.1
- hadolint@2.12.0
- shfmt@3.6.0
- shellcheck@0.10.0
- black@24.8.0
- git-diff-check
- - gitleaks@8.18.4
+ - gitleaks@8.19.2
- clang-format@16.0.3
- prettier@3.3.3
ignore:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 000000000..f579a7fe0
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,47 @@
+# Contributing to Meshtastic Firmware
+
+We're excited that you're interested in contributing to the Meshtastic firmware! This document provides a high-level overview of how you can get involved.
+
+## Important First Steps
+
+Before you begin, please:
+
+1. **Read our documentation**: Our [official documentation](https://meshtastic.org/docs/) is a crucial resource. It contains essential information about the project.
+
+2. **Check out the firmware build guide**: For specific instructions on setting up your development environment and building the firmware, refer to our [Firmware Build Guide](https://meshtastic.org/docs/development/firmware/build/).
+
+3. Read our [Code of Conduct](https://meshtastic.org/docs/legal/conduct/)
+
+4. Join our [Discord community](https://discord.com/invite/ktMAKGBnBs) to connect with developers and other contributors to get help.
+
+## Getting Help and Discussing Ideas
+
+We encourage open communication and discussion before diving into code changes:
+
+1. **Use GitHub Discussions**: For new ideas, questions, or to discuss potential changes, start a conversation in our [GitHub Discussions](https://github.com/meshtastic/firmware/discussions) first. This helps us collaborate and avoid duplicate work.
+
+2. **Join our Discord**: For real-time chat and quick questions, join our [Discord server](https://discord.com/invite/ktMAKGBnBs). It's a great place to get help and connect with other developers and the community.
+
+3. **Reporting Issues**: If you've identified a bug, please use our bug report template when creating a new issue in the [issue tracker](https://github.com/meshtastic/firmware/issues). Ensure you've searched existing issues to avoid duplicates.
+
+## Making Contributions
+
+> [!IMPORTANT]
+> Before making any contributions, you must sign our Contributor License Agreement (CLA). You can do this by visiting https://cla-assistant.io/meshtastic/firmware. Be sure to use the GitHub account you will use to submit your contributions when signing.
+
+1. Fork the repository
+2. Create a new branch for your feature or bug fix
+3. Make your changes
+4. Test your changes thoroughly
+5. Create a pull request with a clear description, using the provided template, of your changes. Be sure to enable "Allow edits from maintainers".
+
+## Coding Standards
+
+To ensure consistent code formatting across the project:
+
+1. Install the [Trunk](https://marketplace.visualstudio.com/items?itemName=Trunk.io) extension for Visual Studio Code.
+2. Before submitting your changes, run `trunk fmt` to automatically format your code according to our standards.
+
+Adhering to these formatting guidelines helps maintain code consistency and makes the review process smoother.
+
+Thank you for contributing to Meshtastic!
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 000000000..fb4d9005a
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,12 @@
+# Security Policy
+
+## Supported Versions
+
+| Firmware Version | Supported |
+| ---------------- | ------------------ |
+| 2.5.x | :white_check_mark: |
+| <= 2.4.x | :x: |
+
+## Reporting a Vulnerability
+
+We support the private reporting of potential security vulnerabilities. Please go to the Security tab to file a report with a description of the potential vulnerability and reproduction scripts (preferred) or steps, and our developers will review.
diff --git a/arch/esp32/esp32.ini b/arch/esp32/esp32.ini
index 0dd6cbc1d..13360be78 100644
--- a/arch/esp32/esp32.ini
+++ b/arch/esp32/esp32.ini
@@ -5,7 +5,7 @@ custom_esp32_kind = esp32
platform = platformio/espressif32@6.7.0
build_src_filter =
- ${arduino_base.build_src_filter} - - - - -
+ ${arduino_base.build_src_filter} - - - - -
upload_speed = 921600
debug_init_break = tbreak setup
diff --git a/arch/esp32/esp32c6.ini b/arch/esp32/esp32c6.ini
new file mode 100644
index 000000000..3c2165642
--- /dev/null
+++ b/arch/esp32/esp32c6.ini
@@ -0,0 +1,40 @@
+[esp32c6_base]
+extends = esp32_base
+platform = https://github.com/Jason2866/platform-espressif32.git#22faa566df8c789000f8136cd8d0aca49617af55
+build_flags =
+ ${arduino_base.build_flags}
+ -Wall
+ -Wextra
+ -Isrc/platform/esp32
+ -std=c++11
+ -DESP_OPENSSL_SUPPRESS_LEGACY_WARNING
+ -DSERIAL_BUFFER_SIZE=4096
+ -DLIBPAX_ARDUINO
+ -DLIBPAX_WIFI
+ -DLIBPAX_BLE
+ -DMESHTASTIC_EXCLUDE_WEBSERVER
+ ;-DDEBUG_HEAP
+ ; TEMP
+ -DHAS_BLUETOOTH=0
+ -DMESHTASTIC_EXCLUDE_PAXCOUNTER
+ -DMESHTASTIC_EXCLUDE_BLUETOOTH
+
+lib_deps =
+ ${arduino_base.lib_deps}
+ ${networking_base.lib_deps}
+ ${environmental_base.lib_deps}
+ https://github.com/lewisxhe/XPowersLib.git#84b7373faea3118b6c37954d52f98b8a337148d6
+ https://github.com/meshtastic/ESP32_Codec2.git#633326c78ac251c059ab3a8c430fcdf25b41672f
+ rweather/Crypto@^0.4.0
+
+build_src_filter =
+ ${esp32_base.build_src_filter} -
+
+monitor_speed = 460800
+monitor_filters = esp32_c3_exception_decoder
+
+lib_ignore =
+ NonBlockingRTTTL
+ NimBLE-Arduino
+ libpax
+
\ No newline at end of file
diff --git a/arch/nrf52/nrf52.ini b/arch/nrf52/nrf52.ini
index 503da2aab..04880d540 100644
--- a/arch/nrf52/nrf52.ini
+++ b/arch/nrf52/nrf52.ini
@@ -16,7 +16,7 @@ build_flags =
-DLFS_NO_ASSERT ; Disable LFS assertions , see https://github.com/meshtastic/firmware/pull/3818
build_src_filter =
- ${arduino_base.build_src_filter} - - - - - - - - - -
+ ${arduino_base.build_src_filter} - - - - - - - - - -
lib_deps=
${arduino_base.lib_deps}
diff --git a/arch/portduino/portduino.ini b/arch/portduino/portduino.ini
index 482b1f9c5..30cc190d2 100644
--- a/arch/portduino/portduino.ini
+++ b/arch/portduino/portduino.ini
@@ -1,6 +1,6 @@
; 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#ad8112adf82ce1f5b917092cf32be07a077801a0
+platform = https://github.com/meshtastic/platform-native.git#6b3796d697481c8f6e3f4aa5c111bd9979f29e64
framework = arduino
build_src_filter =
@@ -9,7 +9,7 @@ build_src_filter =
-
-
-
- -
+ -
-
-
+
diff --git a/arch/rp2040/rp2040.ini b/arch/rp2xx0/rp2040.ini
similarity index 97%
rename from arch/rp2040/rp2040.ini
rename to arch/rp2xx0/rp2040.ini
index dd3a4d7ff..d3f27a676 100644
--- a/arch/rp2040/rp2040.ini
+++ b/arch/rp2xx0/rp2040.ini
@@ -8,7 +8,7 @@ board_build.core = earlephilhower
board_build.filesystem_size = 0.5m
build_flags =
${arduino_base.build_flags} -Wno-unused-variable
- -Isrc/platform/rp2040
+ -Isrc/platform/rp2xx0
-D__PLAT_RP2040__
# -D _POSIX_THREADS
build_src_filter =
diff --git a/arch/rp2xx0/rp2350.ini b/arch/rp2xx0/rp2350.ini
new file mode 100644
index 000000000..96ed0cb21
--- /dev/null
+++ b/arch/rp2xx0/rp2350.ini
@@ -0,0 +1,23 @@
+; Common settings for rp2040 Processor based targets
+[rp2350_base]
+platform = https://github.com/maxgerhardt/platform-raspberrypi.git#9e55f6db5c56b9867c69fe473f388beea4546672
+extends = arduino_base
+platform_packages = framework-arduinopico@https://github.com/earlephilhower/arduino-pico.git#a6ab6e1f95bc1428d667d55ea7173c0744acc03c ; 4.0.2+
+
+board_build.core = earlephilhower
+board_build.filesystem_size = 0.5m
+build_flags =
+ ${arduino_base.build_flags} -Wno-unused-variable
+ -Isrc/platform/rp2xx0
+ -D__PLAT_RP2040__
+# -D _POSIX_THREADS
+build_src_filter =
+ ${arduino_base.build_src_filter} - - - - - - - - -
+
+lib_ignore =
+ BluetoothOTA
+
+lib_deps =
+ ${arduino_base.lib_deps}
+ ${environmental_base.lib_deps}
+ rweather/Crypto
\ No newline at end of file
diff --git a/arch/stm32/stm32.ini b/arch/stm32/stm32.ini
index 050dbf7f0..4be290015 100644
--- a/arch/stm32/stm32.ini
+++ b/arch/stm32/stm32.ini
@@ -22,7 +22,7 @@ build_flags =
-fdata-sections
build_src_filter =
- ${arduino_base.build_src_filter} - - - - - - - - - - - - - -
+ ${arduino_base.build_src_filter} - - - - - - - - - - - - - -
board_upload.offset_address = 0x08000000
upload_protocol = stlink
diff --git a/bin/config-dist.yaml b/bin/config-dist.yaml
index 5590ed3b0..3a470b7bb 100644
--- a/bin/config-dist.yaml
+++ b/bin/config-dist.yaml
@@ -9,6 +9,7 @@ Lora:
# IRQ: 16
# Busy: 20
# Reset: 18
+# SX126X_ANT_SW: 6
# Module: sx1262 # Waveshare SX1302 LISTEN ONLY AT THIS TIME!
# CS: 7
@@ -153,4 +154,4 @@ Webserver:
General:
MaxNodes: 200
- MaxMessageQueue: 100
+ MaxMessageQueue: 100
\ No newline at end of file
diff --git a/bin/generate_ci_matrix.py b/bin/generate_ci_matrix.py
index 46398dd59..4d8759ecc 100755
--- a/bin/generate_ci_matrix.py
+++ b/bin/generate_ci_matrix.py
@@ -6,6 +6,7 @@ import configparser
import json
import os
import sys
+import random
rootdir = "variants/"
@@ -39,5 +40,7 @@ for subdir, dirs, files in os.walk(rootdir):
"check" in options
):
outlist.append(section)
-
-print(json.dumps(outlist))
+if ("quick" in options) & (len(outlist) > 3):
+ print(json.dumps(random.sample(outlist, 3)))
+else:
+ print(json.dumps(outlist))
diff --git a/boards/heltec_mesh_node_t114.json b/boards/heltec_mesh_node_t114.json
index 5c97d8c75..2bd306eb9 100644
--- a/boards/heltec_mesh_node_t114.json
+++ b/boards/heltec_mesh_node_t114.json
@@ -5,7 +5,7 @@
},
"core": "nRF5",
"cpu": "cortex-m4",
- "extra_flags": "-DARDUINO_NRF52840_PCA10056 -DNRF52840_XXAA",
+ "extra_flags": "-DHELTEC_T114 -DNRF52840_XXAA",
"f_cpu": "64000000L",
"hwids": [
["0x239A", "0x4405"],
diff --git a/boards/lora_isp4520.json b/boards/lora_isp4520.json
deleted file mode 100644
index 8125aa666..000000000
--- a/boards/lora_isp4520.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
- "build": {
- "arduino": {
- "ldscript": "nrf52832_s132_v6.ld"
- },
- "core": "nRF5",
- "cpu": "cortex-m4",
- "extra_flags": "-DNRF52832_XXAA -DNRF52",
- "f_cpu": "64000000L",
- "mcu": "nrf52832",
- "variant": "lora_isp4520",
- "bsp": {
- "name": "adafruit"
- },
- "softdevice": {
- "sd_flags": "-DS132",
- "sd_name": "s132",
- "sd_version": "6.1.1",
- "sd_fwid": "0x00B7"
- }
- },
- "connectivity": ["bluetooth"],
- "debug": {
- "jlink_device": "nRF52832_xxAA",
- "svd_path": "nrf52.svd",
- "openocd_target": "nrf52840-mdk-rs"
- },
- "frameworks": ["arduino"],
- "name": "lora ISP4520",
- "upload": {
- "maximum_ram_size": 65536,
- "maximum_size": 524288,
- "require_upload_port": true,
- "speed": 115200,
- "protocol": "nrfutil",
- "protocols": ["jlink", "nrfjprog", "nrfutil", "stlink"]
- },
- "url": "",
- "vendor": "PsiSoft"
-}
diff --git a/boards/me25ls01-4y10td.json b/boards/me25ls01-4y10td.json
index 46c526a7c..9e1d63265 100644
--- a/boards/me25ls01-4y10td.json
+++ b/boards/me25ls01-4y10td.json
@@ -5,7 +5,7 @@
},
"core": "nRF5",
"cpu": "cortex-m4",
- "extra_flags": "-DARDUINO_WIO_WM1110 -DNRF52840_XXAA",
+ "extra_flags": "-DME25LS01_4Y10TD -DNRF52840_XXAA",
"f_cpu": "64000000L",
"hwids": [
["0x239A", "0x8029"],
diff --git a/boards/ms24sf1.json b/boards/ms24sf1.json
index 4e28507da..8356e3012 100644
--- a/boards/ms24sf1.json
+++ b/boards/ms24sf1.json
@@ -5,7 +5,7 @@
},
"core": "nRF5",
"cpu": "cortex-m4",
- "extra_flags": "-DARDUINO_WIO_WM1110 -DNRF52840_XXAA",
+ "extra_flags": "-DMS24SF1 -DNRF52840_XXAA",
"f_cpu": "64000000L",
"hwids": [
["0x239A", "0x8029"],
diff --git a/boards/nordic_pca10059.json b/boards/nordic_pca10059.json
index b99e3c763..6540817a2 100644
--- a/boards/nordic_pca10059.json
+++ b/boards/nordic_pca10059.json
@@ -5,7 +5,7 @@
},
"core": "nRF5",
"cpu": "cortex-m4",
- "extra_flags": "-DARDUINO_NRF52840_FEATHER -DNRF52840_XXAA",
+ "extra_flags": "-DNORDIC_PCA10059 -DNRF52840_XXAA",
"f_cpu": "64000000L",
"hwids": [
["0x239A", "0x8029"],
diff --git a/boards/seeed-sensecap-indicator.json b/boards/seeed-sensecap-indicator.json
new file mode 100644
index 000000000..3fc57126f
--- /dev/null
+++ b/boards/seeed-sensecap-indicator.json
@@ -0,0 +1,42 @@
+{
+ "build": {
+ "arduino": {
+ "ldscript": "esp32s3_out.ld",
+ "partitions": "default_8MB.csv",
+ "memory_type": "qio_opi"
+ },
+ "core": "esp32",
+ "extra_flags": [
+ "-DBOARD_HAS_PSRAM",
+ "-DARDUINO_USB_CDC_ON_BOOT=0",
+ "-DARDUINO_USB_MODE=1",
+ "-DARDUINO_RUNNING_CORE=1",
+ "-DARDUINO_EVENT_RUNNING_CORE=1"
+ ],
+ "f_cpu": "240000000L",
+ "f_flash": "80000000L",
+ "flash_mode": "qio",
+ "hwids": [["0x1A86", "0x7523"]],
+ "mcu": "esp32s3",
+ "variant": "esp32s3r8"
+ },
+ "connectivity": ["wifi", "bluetooth", "lora"],
+ "debug": {
+ "default_tool": "esp-builtin",
+ "onboard_tools": ["esp-builtin"],
+ "openocd_target": "esp32s3.cfg"
+ },
+ "frameworks": ["arduino"],
+ "name": "Seeed Studio SenseCAP Indicator",
+ "upload": {
+ "flash_size": "8MB",
+ "maximum_ram_size": 327680,
+ "maximum_size": 8388608,
+ "require_upload_port": true,
+ "use_1200bps_touch": true,
+ "wait_for_upload_port": true,
+ "speed": 921600
+ },
+ "url": "https://www.seeedstudio.com/Indicator-for-Meshtastic.html",
+ "vendor": "Seeed Studio"
+}
diff --git a/boards/seeed-xiao-s3.json b/boards/seeed-xiao-s3.json
new file mode 100644
index 000000000..0b7b432a0
--- /dev/null
+++ b/boards/seeed-xiao-s3.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": [["0x2886", "0x0059"]],
+ "mcu": "esp32s3",
+ "variant": "seeed-xiao-s3"
+ },
+ "connectivity": ["wifi", "bluetooth", "lora"],
+ "debug": {
+ "default_tool": "esp-builtin",
+ "onboard_tools": ["esp-builtin"],
+ "openocd_target": "esp32s3.cfg"
+ },
+ "frameworks": ["arduino", "espidf"],
+ "name": "seeed-xiao-s3",
+ "upload": {
+ "flash_size": "8MB",
+ "maximum_ram_size": 8388608,
+ "maximum_size": 8388608,
+ "use_1200bps_touch": true,
+ "wait_for_upload_port": true,
+ "require_upload_port": true,
+ "speed": 921600
+ },
+ "url": "https://www.seeedstudio.com/XIAO-ESP32S3-Sense-p-5639.html",
+ "vendor": "Seeed Studio"
+}
diff --git a/meshtestic b/meshtestic
index 31ee3d90c..dcac7e567 160000
--- a/meshtestic
+++ b/meshtestic
@@ -1 +1 @@
-Subproject commit 31ee3d90c8bef61e835c3271be2c7cda8c4a5cc2
+Subproject commit dcac7e5673005f4d8a2b1f0f6e06877b689d7519
diff --git a/platformio.ini b/platformio.ini
index 6970792c5..7e62c8e98 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -81,14 +81,17 @@ build_flags = -Wno-missing-field-initializers
-DRADIOLIB_EXCLUDE_APRS
-DRADIOLIB_EXCLUDE_LORAWAN
-DMESHTASTIC_EXCLUDE_DROPZONE=1
+ -DMESHTASTIC_EXCLUDE_REMOTEHARDWARE=1
+ -DBUILD_EPOCH=$UNIX_TIME
;-D OLED_PL
monitor_speed = 115200
monitor_filters = direct
lib_deps =
-; jgromes/RadioLib@~6.6.0
- https://github.com/jgromes/RadioLib.git#3115fc2d6700a9aee05888791ac930a910f2628f
+ ;jgromes/RadioLib@~7.0.0
+ ;7.0.1pre needed for LR1121 support and SX127x CRC Bugfix
+ https://github.com/jgromes/RadioLib.git#38fc7a97a4c195b7c10aa94215a1c53ec18a56ef
https://github.com/meshtastic/esp8266-oled-ssd1306.git#e16cee124fe26490cb14880c679321ad8ac89c95 ; ESP8266_SSD1306
https://github.com/mathertel/OneButton@~2.6.1 ; OneButton library for non-blocking button debounce
https://github.com/meshtastic/arduino-fsm.git#7db3702bf0cfe97b783d6c72595e3f38e0b19159
@@ -137,6 +140,7 @@ lib_deps =
adafruit/Adafruit MCP9808 Library@^2.0.0
adafruit/Adafruit INA260 Library@^1.5.0
adafruit/Adafruit INA219@^1.2.0
+ adafruit/Adafruit MAX1704X@^1.0.3
adafruit/Adafruit SHTC3 Library@^1.0.0
adafruit/Adafruit LPS2X@^2.0.4
adafruit/Adafruit SHT31 Library@^2.2.2
@@ -149,16 +153,16 @@ lib_deps =
adafruit/Adafruit SHT4x Library@^1.0.4
adafruit/Adafruit TSL2591 Library@^1.4.5
sparkfun/SparkFun Qwiic Scale NAU7802 Arduino Library@^1.0.5
+ sparkfun/SparkFun 9DoF IMU Breakout - ICM 20948 - Arduino Library@^1.2.13
ClosedCube OPT3001@^1.1.2
emotibit/EmotiBit MLX90632@^1.0.8
dfrobot/DFRobot_RTU@^1.0.3
-
https://github.com/boschsensortec/Bosch-BSEC2-Library#v1.7.2502
boschsensortec/BME68x Sensor Library@^1.1.40407
https://github.com/KodinLanewave/INA3221@^1.0.0
- lewisxhe/SensorLib@^0.2.0
+ lewisxhe/SensorLib@0.2.0
mprograms/QMC5883LCompass@^1.2.0
-
- https://github.com/meshtastic/DFRobot_LarkWeatherStation#dee914270dc7cb3e43fbf034edd85a63a16a12ee
\ No newline at end of file
+ https://github.com/meshtastic/DFRobot_LarkWeatherStation#dee914270dc7cb3e43fbf034edd85a63a16a12ee
+ https://github.com/gjelsoe/STK8xxx-Accelerometer.git#v0.1.1
diff --git a/protobufs b/protobufs
index 5f7c91adb..83c78e26e 160000
--- a/protobufs
+++ b/protobufs
@@ -1 +1 @@
-Subproject commit 5f7c91adb97187e0cb2140de7057344d93444bd1
+Subproject commit 83c78e26e39031ae1c17ba5e50d0898842719c7f
diff --git a/src/AccelerometerThread.h b/src/AccelerometerThread.h
deleted file mode 100644
index c2910007e..000000000
--- a/src/AccelerometerThread.h
+++ /dev/null
@@ -1,297 +0,0 @@
-#pragma once
-#include "configuration.h"
-
-#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
-
-#include "PowerFSM.h"
-#include "concurrency/OSThread.h"
-#include "main.h"
-#include "power.h"
-
-#include
-#include
-#include
-#include
-#include
-#include
-#ifdef RAK_4631
-#include "Fusion/Fusion.h"
-#include "graphics/Screen.h"
-#include "graphics/ScreenFonts.h"
-#include
-#endif
-
-#define ACCELEROMETER_CHECK_INTERVAL_MS 100
-#define ACCELEROMETER_CLICK_THRESHOLD 40
-
-static inline int readRegister(uint8_t address, uint8_t reg, uint8_t *data, uint8_t len)
-{
- Wire.beginTransmission(address);
- Wire.write(reg);
- Wire.endTransmission();
- Wire.requestFrom((uint8_t)address, (uint8_t)len);
- uint8_t i = 0;
- while (Wire.available()) {
- data[i++] = Wire.read();
- }
- return 0; // Pass
-}
-
-static inline int writeRegister(uint8_t address, uint8_t reg, uint8_t *data, uint8_t len)
-{
- Wire.beginTransmission(address);
- Wire.write(reg);
- Wire.write(data, len);
- return (0 != Wire.endTransmission());
-}
-
-class AccelerometerThread : public concurrency::OSThread
-{
- public:
- explicit AccelerometerThread(ScanI2C::DeviceType type) : OSThread("AccelerometerThread")
- {
- if (accelerometer_found.port == ScanI2C::I2CPort::NO_I2C) {
- LOG_DEBUG("AccelerometerThread disabling due to no sensors found\n");
- disable();
- return;
- }
- acceleremoter_type = type;
-#ifndef RAK_4631
- 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;
- }
-#endif
- init();
- }
-
- void start()
- {
- init();
- setIntervalFromNow(0);
- };
-
- protected:
- int32_t runOnce() override
- {
- canSleep = true; // Assume we should not keep the board awake
-
- if (acceleremoter_type == ScanI2C::DeviceType::MPU6050 && mpu.getMotionInterruptStatus()) {
- wakeScreen();
- } else if (acceleremoter_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;
- }
- } else if (acceleremoter_type == ScanI2C::DeviceType::BMA423 && bmaSensor.readIrqStatus() != DEV_WIRE_NONE) {
- if (bmaSensor.isTilt() || bmaSensor.isDoubleTap()) {
- wakeScreen();
- return 500;
- }
-#ifdef RAK_4631
- } else if (acceleremoter_type == ScanI2C::DeviceType::BMX160) {
- sBmx160SensorData_t magAccel;
- sBmx160SensorData_t gAccel;
-
- /* Get a new sensor event */
- bmx160.getAllData(&magAccel, NULL, &gAccel);
-
- // expirimental calibrate routine. Limited to between 10 and 30 seconds after boot
- if (millis() > 12 * 1000 && millis() < 30 * 1000) {
- if (!showingScreen) {
- showingScreen = true;
- screen->startAlert((FrameCallback)drawFrameCalibration);
- }
- if (magAccel.x > highestX)
- highestX = magAccel.x;
- if (magAccel.x < lowestX)
- lowestX = magAccel.x;
- if (magAccel.y > highestY)
- highestY = magAccel.y;
- if (magAccel.y < lowestY)
- lowestY = magAccel.y;
- if (magAccel.z > highestZ)
- highestZ = magAccel.z;
- if (magAccel.z < lowestZ)
- lowestZ = magAccel.z;
- } else if (showingScreen && millis() >= 30 * 1000) {
- showingScreen = false;
- screen->endAlert();
- }
-
- int highestRealX = highestX - (highestX + lowestX) / 2;
-
- magAccel.x -= (highestX + lowestX) / 2;
- magAccel.y -= (highestY + lowestY) / 2;
- magAccel.z -= (highestZ + lowestZ) / 2;
- FusionVector ga, ma;
- ga.axis.x = -gAccel.x; // default location for the BMX160 is on the rear of the board
- ga.axis.y = -gAccel.y;
- ga.axis.z = gAccel.z;
- ma.axis.x = -magAccel.x;
- ma.axis.y = -magAccel.y;
- ma.axis.z = magAccel.z * 3;
-
- // If we're set to one of the inverted positions
- if (config.display.compass_orientation > meshtastic_Config_DisplayConfig_CompassOrientation_DEGREES_270) {
- ma = FusionAxesSwap(ma, FusionAxesAlignmentNXNYPZ);
- ga = FusionAxesSwap(ga, FusionAxesAlignmentNXNYPZ);
- }
-
- float heading = FusionCompassCalculateHeading(FusionConventionNed, ga, ma);
-
- switch (config.display.compass_orientation) {
- case meshtastic_Config_DisplayConfig_CompassOrientation_DEGREES_0_INVERTED:
- case meshtastic_Config_DisplayConfig_CompassOrientation_DEGREES_0:
- break;
- case meshtastic_Config_DisplayConfig_CompassOrientation_DEGREES_90:
- case meshtastic_Config_DisplayConfig_CompassOrientation_DEGREES_90_INVERTED:
- heading += 90;
- break;
- case meshtastic_Config_DisplayConfig_CompassOrientation_DEGREES_180:
- case meshtastic_Config_DisplayConfig_CompassOrientation_DEGREES_180_INVERTED:
- heading += 180;
- break;
- case meshtastic_Config_DisplayConfig_CompassOrientation_DEGREES_270:
- case meshtastic_Config_DisplayConfig_CompassOrientation_DEGREES_270_INVERTED:
- heading += 270;
- break;
- }
-
- screen->setHeading(heading);
-
-#endif
- } else if (acceleremoter_type == ScanI2C::DeviceType::LSM6DS3 && lsm.shake()) {
- wakeScreen();
- return 500;
- }
-
- return ACCELEROMETER_CHECK_INTERVAL_MS;
- }
-
- private:
- void init()
- {
- LOG_DEBUG("AccelerometerThread initializing\n");
-
- if (acceleremoter_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 (acceleremoter_type == ScanI2C::DeviceType::LIS3DH && lis.begin(accelerometer_found.address)) {
- LOG_DEBUG("LIS3DH initializing\n");
- lis.setRange(LIS3DH_RANGE_2_G);
- // Adjust threshold, higher numbers are less sensitive
- lis.setClick(config.device.double_tap_as_button_press ? 2 : 1, ACCELEROMETER_CLICK_THRESHOLD);
- } else if (acceleremoter_type == ScanI2C::DeviceType::BMA423 &&
- bmaSensor.begin(accelerometer_found.address, &readRegister, &writeRegister)) {
- LOG_DEBUG("BMA423 initializing\n");
- bmaSensor.configAccelerometer(bmaSensor.RANGE_2G, bmaSensor.ODR_100HZ, bmaSensor.BW_NORMAL_AVG4,
- bmaSensor.PERF_CONTINUOUS_MODE);
- bmaSensor.enableAccelerometer();
- bmaSensor.configInterrupt(BMA4_LEVEL_TRIGGER, BMA4_ACTIVE_HIGH, BMA4_PUSH_PULL, BMA4_OUTPUT_ENABLE,
- BMA4_INPUT_DISABLE);
-
-#ifdef BMA423_INT
- pinMode(BMA4XX_INT, INPUT);
- attachInterrupt(
- BMA4XX_INT,
- [] {
- // Set interrupt to set irq value to true
- BMA_IRQ = true;
- },
- RISING); // Select the interrupt mode according to the actual circuit
-#endif
-
-#ifdef T_WATCH_S3
- // Need to raise the wrist function, need to set the correct axis
- bmaSensor.setReampAxes(bmaSensor.REMAP_TOP_LAYER_RIGHT_CORNER);
-#else
- bmaSensor.setReampAxes(bmaSensor.REMAP_BOTTOM_LAYER_BOTTOM_LEFT_CORNER);
-#endif
- // bmaSensor.enableFeature(bmaSensor.FEATURE_STEP_CNTR, true);
- bmaSensor.enableFeature(bmaSensor.FEATURE_TILT, true);
- bmaSensor.enableFeature(bmaSensor.FEATURE_WAKEUP, true);
- // bmaSensor.resetPedometer();
-
- // Turn on feature interrupt
- bmaSensor.enablePedometerIRQ();
- bmaSensor.enableTiltIRQ();
- // It corresponds to isDoubleClick interrupt
- bmaSensor.enableWakeupIRQ();
-#ifdef RAK_4631
- } else if (acceleremoter_type == ScanI2C::DeviceType::BMX160 && bmx160.begin()) {
- bmx160.ODR_Config(BMX160_ACCEL_ODR_100HZ, BMX160_GYRO_ODR_100HZ); // set output data rate
-
-#endif
- } else if (acceleremoter_type == ScanI2C::DeviceType::LSM6DS3 && lsm.begin_I2C(accelerometer_found.address)) {
- LOG_DEBUG("LSM6DS3 initializing\n");
- // Default threshold of 2G, less sensitive options are 4, 8 or 16G
- lsm.setAccelRange(LSM6DS_ACCEL_RANGE_2_G);
-#ifndef LSM6DS3_WAKE_THRESH
-#define LSM6DS3_WAKE_THRESH 20
-#endif
- lsm.enableWakeup(config.display.wake_on_tap_or_motion, 1, LSM6DS3_WAKE_THRESH);
- // Duration is number of occurances needed to trigger, higher threshold is less sensitive
- }
- }
- 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 acceleremoter_type;
- Adafruit_MPU6050 mpu;
- Adafruit_LIS3DH lis;
- Adafruit_LSM6DS3TRC lsm;
- SensorBMA423 bmaSensor;
- bool BMA_IRQ = false;
-#ifdef RAK_4631
- bool showingScreen = false;
- RAK_BMX160 bmx160;
- float highestX = 0, lowestX = 0, highestY = 0, lowestY = 0, highestZ = 0, lowestZ = 0;
-
- static void drawFrameCalibration(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
- {
- int x_offset = display->width() / 2;
- int y_offset = display->height() <= 80 ? 0 : 32;
- display->setTextAlignment(TEXT_ALIGN_LEFT);
- display->setFont(FONT_MEDIUM);
- display->drawString(x, y, "Calibrating\nCompass");
- int16_t compassX = 0, compassY = 0;
- uint16_t compassDiam = graphics::Screen::getCompassDiam(display->getWidth(), display->getHeight());
-
- // coordinates for the center of the compass/circle
- if (config.display.displaymode == meshtastic_Config_DisplayConfig_DisplayMode_DEFAULT) {
- compassX = x + display->getWidth() - compassDiam / 2 - 5;
- compassY = y + display->getHeight() / 2;
- } else {
- compassX = x + display->getWidth() - compassDiam / 2 - 5;
- compassY = y + FONT_HEIGHT_SMALL + (display->getHeight() - FONT_HEIGHT_SMALL) / 2;
- }
- display->drawCircle(compassX, compassY, compassDiam / 2);
- screen->drawCompassNorth(display, compassX, compassY, screen->getHeading() * PI / 180);
- }
-#endif
-};
-
-#endif
\ No newline at end of file
diff --git a/src/DebugConfiguration.cpp b/src/DebugConfiguration.cpp
index 23b140daf..1c081ae29 100644
--- a/src/DebugConfiguration.cpp
+++ b/src/DebugConfiguration.cpp
@@ -97,12 +97,14 @@ Syslog &Syslog::logMask(uint8_t priMask)
void Syslog::enable()
{
+ this->_client->begin(this->_port);
this->_enabled = true;
}
void Syslog::disable()
{
this->_enabled = false;
+ this->_client->stop();
}
bool Syslog::isEnabled()
@@ -193,4 +195,4 @@ inline bool Syslog::_sendLog(uint16_t pri, const char *appName, const char *mess
return true;
}
-#endif
\ No newline at end of file
+#endif
diff --git a/src/FSCommon.cpp b/src/FSCommon.cpp
index d6a542808..24d3f477e 100644
--- a/src/FSCommon.cpp
+++ b/src/FSCommon.cpp
@@ -370,8 +370,8 @@ void setupSDCard()
}
uint64_t cardSize = SD.cardSize() / (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));
+ LOG_DEBUG("SD Card Size: %lu MB\n", (uint32_t)cardSize);
+ LOG_DEBUG("Total space: %lu MB\n", (uint32_t)(SD.totalBytes() / (1024 * 1024)));
+ LOG_DEBUG("Used space: %lu MB\n", (uint32_t)(SD.usedBytes() / (1024 * 1024)));
#endif
}
\ No newline at end of file
diff --git a/src/Power.cpp b/src/Power.cpp
index 61a6c987d..6ed937648 100644
--- a/src/Power.cpp
+++ b/src/Power.cpp
@@ -13,6 +13,7 @@
#include "power.h"
#include "NodeDB.h"
#include "PowerFSM.h"
+#include "Throttle.h"
#include "buzz/buzz.h"
#include "configuration.h"
#include "main.h"
@@ -30,6 +31,7 @@
#if HAS_WIFI
#include
#endif
+
#endif
#ifndef DELAY_FOREVER
@@ -75,6 +77,15 @@ INA219Sensor ina219Sensor;
INA3221Sensor ina3221Sensor;
#endif
+#if !MESHTASTIC_EXCLUDE_I2C && !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL)
+#include "modules/Telemetry/Sensor/MAX17048Sensor.h"
+#include
+extern std::pair nodeTelemetrySensorsMap[_meshtastic_TelemetrySensorType_MAX + 1];
+#if HAS_TELEMETRY && (!MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR || !MESHTASTIC_EXCLUDE_POWER_TELEMETRY)
+MAX17048Sensor max17048Sensor;
+#endif
+#endif
+
#if HAS_RAKPROT && !defined(ARCH_PORTDUINO)
RAK9154Sensor rak9154Sensor;
#endif
@@ -136,6 +147,8 @@ using namespace meshtastic;
*/
static HasBatteryLevel *batteryLevel; // Default to NULL for no battery level sensor
+#ifdef BATTERY_PIN
+
static void adcEnable()
{
#ifdef ADC_CTRL // enable adc voltage divider when we need to read
@@ -160,11 +173,14 @@ static void adcDisable()
#endif
}
+#endif
+
/**
* A simple battery level sensor that assumes the battery voltage is attached via a voltage-divider to an analog input
*/
class AnalogBatteryLevel : public HasBatteryLevel
{
+ public:
/**
* Battery state of charge, from 0 to 100 or -1 for unknown
*/
@@ -244,7 +260,7 @@ class AnalogBatteryLevel : public HasBatteryLevel
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) {
+ if (!Throttle::isWithinTimespanMs(last_read_time_ms, min_read_interval)) {
last_read_time_ms = millis();
uint32_t raw = 0;
@@ -551,7 +567,12 @@ bool Power::analogInit()
*/
bool Power::setup()
{
- bool found = axpChipInit() || analogInit();
+ // initialise one power sensor (only)
+ bool found = axpChipInit();
+ if (!found)
+ found = lipoInit();
+ if (!found)
+ found = analogInit();
#ifdef NRF_APM
found = true;
@@ -1042,4 +1063,82 @@ bool Power::axpChipInit()
#else
return false;
#endif
-}
\ No newline at end of file
+}
+
+#if !MESHTASTIC_EXCLUDE_I2C && !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL)
+
+/**
+ * Wrapper class for an I2C MAX17048 Lipo battery sensor.
+ */
+class LipoBatteryLevel : public HasBatteryLevel
+{
+ private:
+ MAX17048Singleton *max17048 = nullptr;
+
+ public:
+ /**
+ * Init the I2C MAX17048 Lipo battery level sensor
+ */
+ bool runOnce()
+ {
+ if (max17048 == nullptr) {
+ max17048 = MAX17048Singleton::GetInstance();
+ }
+
+ // try to start if the sensor has been detected
+ if (nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_MAX17048].first != 0) {
+ return max17048->runOnce(nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_MAX17048].second);
+ }
+ return false;
+ }
+
+ /**
+ * Battery state of charge, from 0 to 100 or -1 for unknown
+ */
+ virtual int getBatteryPercent() override { return max17048->getBusBatteryPercent(); }
+
+ /**
+ * The raw voltage of the battery in millivolts, or NAN if unknown
+ */
+ virtual uint16_t getBattVoltage() override { return max17048->getBusVoltageMv(); }
+
+ /**
+ * return true if there is a battery installed in this unit
+ */
+ virtual bool isBatteryConnect() override { return max17048->isBatteryConnected(); }
+
+ /**
+ * return true if there is an external power source detected
+ */
+ virtual bool isVbusIn() override { return max17048->isExternallyPowered(); }
+
+ /**
+ * return true if the battery is currently charging
+ */
+ virtual bool isCharging() override { return max17048->isBatteryCharging(); }
+};
+
+LipoBatteryLevel lipoLevel;
+
+/**
+ * Init the Lipo battery level sensor
+ */
+bool Power::lipoInit()
+{
+ bool result = lipoLevel.runOnce();
+ LOG_DEBUG("Power::lipoInit lipo sensor is %s\n", result ? "ready" : "not ready yet");
+ if (!result)
+ return false;
+ batteryLevel = &lipoLevel;
+ return true;
+}
+
+#else
+/**
+ * The Lipo battery level sensor is unavailable - default to AnalogBatteryLevel
+ */
+bool Power::lipoInit()
+{
+ return false;
+}
+#endif
\ No newline at end of file
diff --git a/src/SafeFile.h b/src/SafeFile.h
index 7088074cd..61361d312 100644
--- a/src/SafeFile.h
+++ b/src/SafeFile.h
@@ -24,7 +24,7 @@
class SafeFile : public Print
{
public:
- SafeFile(char const *filepath, bool fullAtomic = false);
+ explicit SafeFile(char const *filepath, bool fullAtomic = false);
virtual size_t write(uint8_t);
virtual size_t write(const uint8_t *buffer, size_t size);
diff --git a/src/SerialConsole.cpp b/src/SerialConsole.cpp
index b911e15da..fe6ccdefe 100644
--- a/src/SerialConsole.cpp
+++ b/src/SerialConsole.cpp
@@ -1,6 +1,8 @@
#include "SerialConsole.h"
+#include "Default.h"
#include "NodeDB.h"
#include "PowerFSM.h"
+#include "Throttle.h"
#include "configuration.h"
#include "time.h"
@@ -44,10 +46,11 @@ SerialConsole::SerialConsole() : StreamAPI(&Port), RedirectablePrint(&Port), con
Port.setRX(SERIAL2_RX);
#endif
Port.begin(SERIAL_BAUD);
-#if defined(ARCH_NRF52) || defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3) || defined(ARCH_RP2040)
+#if defined(ARCH_NRF52) || defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3) || defined(ARCH_RP2040) || \
+ defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32C6)
time_t timeout = millis();
while (!Port) {
- if ((millis() - timeout) < 5000) {
+ if (Throttle::isWithinTimespanMs(timeout, FIVE_SECONDS_MS)) {
delay(100);
} else {
break;
@@ -72,8 +75,7 @@ void SerialConsole::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()
{
- uint32_t now = millis();
- return (now - lastContactMsec) < SERIAL_CONNECTION_TIMEOUT;
+ return Throttle::isWithinTimespanMs(lastContactMsec, SERIAL_CONNECTION_TIMEOUT);
}
/**
@@ -120,4 +122,4 @@ void SerialConsole::log_to_serial(const char *logLevel, const char *format, va_l
emitLogRecord(ll, thread ? thread->ThreadName.c_str() : "", format, arg);
} else
RedirectablePrint::log_to_serial(logLevel, format, arg);
-}
+}
\ No newline at end of file
diff --git a/src/configuration.h b/src/configuration.h
index 7a6c1fe8a..5cc26e8d7 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -69,6 +69,9 @@ along with this program. If not, see .
#ifndef RTC_DATA_ATTR
#define RTC_DATA_ATTR
#endif
+#ifndef EXT_RAM_BSS_ATTR
+#define EXT_RAM_BSS_ATTR EXT_RAM_ATTR
+#endif
// -----------------------------------------------------------------------------
// Regulatory overrides
@@ -123,9 +126,11 @@ along with this program. If not, see .
#define INA_ADDR_ALTERNATE 0x41
#define INA_ADDR_WAVESHARE_UPS 0x43
#define INA3221_ADDR 0x42
+#define MAX1704X_ADDR 0x36
#define QMC6310_ADDR 0x1C
#define QMI8658_ADDR 0x6B
-#define QMC5883L_ADDR 0x1E
+#define QMC5883L_ADDR 0x0D
+#define HMC5883L_ADDR 0x1E
#define SHTC3_ADDR 0x70
#define LPS22HB_ADDR 0x5C
#define LPS22HB_ADDR_ALT 0x5D
@@ -145,10 +150,13 @@ along with this program. If not, see .
// ACCELEROMETER
// -----------------------------------------------------------------------------
#define MPU6050_ADDR 0x68
+#define STK8BXX_ADR 0x18
#define LIS3DH_ADR 0x18
#define BMA423_ADDR 0x19
#define LSM6DS3_ADDR 0x6A
#define BMX160_ADDR 0x69
+#define ICM20948_ADDR 0x69
+#define ICM20948_ADDR_ALT 0x68
// -----------------------------------------------------------------------------
// LED
@@ -163,6 +171,7 @@ along with this program. If not, see .
// -----------------------------------------------------------------------------
// IO Expander
// -----------------------------------------------------------------------------
+#define TCA9535_ADDR 0x20
#define TCA9555_ADDR 0x26
// -----------------------------------------------------------------------------
@@ -172,6 +181,11 @@ along with this program. If not, see .
#define GPS_THREAD_INTERVAL 200
#endif
+// -----------------------------------------------------------------------------
+// Touchscreen
+// -----------------------------------------------------------------------------
+#define FT6336U_ADDR 0x48
+
// convert 24-bit color to 16-bit (56K)
#define COLOR565(r, g, b) (((r & 0xF8) << 8) | ((g & 0xFC) << 3) | ((b & 0xF8) >> 3))
@@ -203,6 +217,16 @@ along with this program. If not, see .
#define MINIMUM_SAFE_FREE_HEAP 1500
#endif
+#ifndef WIRE_INTERFACES_COUNT
+// Officially an NRF52 macro
+// Repurposed cross-platform to identify devices using Wire1
+#if defined(I2C_SDA1) || defined(PIN_WIRE1_SDA)
+#define WIRE_INTERFACES_COUNT 2
+#elif HAS_WIRE
+#define WIRE_INTERFACES_COUNT 1
+#endif
+#endif
+
/* Step #3: mop up with disabled values for HAS_ options not handled by the above two */
#ifndef HAS_WIFI
@@ -325,4 +349,4 @@ along with this program. If not, see .
#endif
#include "DebugConfiguration.h"
-#include "RF95Configuration.h"
\ No newline at end of file
+#include "RF95Configuration.h"
diff --git a/src/detect/LoRaRadioType.h b/src/detect/LoRaRadioType.h
index 3975153b5..a059a3668 100644
--- a/src/detect/LoRaRadioType.h
+++ b/src/detect/LoRaRadioType.h
@@ -10,7 +10,8 @@ enum LoRaRadioType {
LLCC68_RADIO,
SX1280_RADIO,
LR1110_RADIO,
- LR1120_RADIO
+ LR1120_RADIO,
+ LR1121_RADIO
};
extern LoRaRadioType radioType;
\ No newline at end of file
diff --git a/src/detect/ScanI2C.cpp b/src/detect/ScanI2C.cpp
index b82ccc8d8..3daf6f191 100644
--- a/src/detect/ScanI2C.cpp
+++ b/src/detect/ScanI2C.cpp
@@ -37,8 +37,8 @@ ScanI2C::FoundDevice ScanI2C::firstKeyboard() const
ScanI2C::FoundDevice ScanI2C::firstAccelerometer() const
{
- ScanI2C::DeviceType types[] = {MPU6050, LIS3DH, BMA423, LSM6DS3, BMX160};
- return firstOfOrNONE(5, types);
+ ScanI2C::DeviceType types[] = {MPU6050, LIS3DH, BMA423, LSM6DS3, BMX160, STK8BAXX, ICM20948};
+ return firstOfOrNONE(7, types);
}
ScanI2C::FoundDevice ScanI2C::find(ScanI2C::DeviceType) const
diff --git a/src/detect/ScanI2C.h b/src/detect/ScanI2C.h
index 2d13dd1ea..5beb7a703 100644
--- a/src/detect/ScanI2C.h
+++ b/src/detect/ScanI2C.h
@@ -29,6 +29,7 @@ class ScanI2C
INA260,
INA219,
INA3221,
+ MAX17048,
MCP9808,
SHT31,
SHT4X,
@@ -37,12 +38,14 @@ class ScanI2C
QMC6310,
QMI8658,
QMC5883L,
+ HMC5883L,
PMSA0031,
MPU6050,
LIS3DH,
BMA423,
BQ24295,
LSM6DS3,
+ TCA9535,
TCA9555,
VEML7700,
RCWL9620,
@@ -53,7 +56,10 @@ class ScanI2C
AHT10,
BMX160,
DFROBOT_LARK,
- NAU7802
+ NAU7802,
+ FT6336U,
+ STK8BAXX,
+ ICM20948
} DeviceType;
// typedef uint8_t DeviceAddress;
@@ -64,8 +70,9 @@ class ScanI2C
} I2CPort;
typedef struct DeviceAddress {
- I2CPort port;
- uint8_t address;
+ // set default values for ADDRESS_NONE
+ I2CPort port = I2CPort::NO_I2C;
+ uint8_t address = 0;
explicit DeviceAddress(I2CPort port, uint8_t address);
DeviceAddress();
diff --git a/src/detect/ScanI2CTwoWire.cpp b/src/detect/ScanI2CTwoWire.cpp
index f02ece221..e6ed75645 100644
--- a/src/detect/ScanI2CTwoWire.cpp
+++ b/src/detect/ScanI2CTwoWire.cpp
@@ -162,13 +162,13 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
Melopero_RV3028 rtc;
#endif
-#ifdef I2C_SDA1
+#if WIRE_INTERFACES_COUNT == 2
if (port == I2CPort::WIRE1) {
i2cBus = &Wire1;
} else {
#endif
i2cBus = &Wire;
-#ifdef I2C_SDA1
+#if WIRE_INTERFACES_COUNT == 2
}
#endif
@@ -314,17 +314,33 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
}
break;
case MCP9808_ADDR:
- registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x07), 2);
- if (registerValue == 0x0400) {
- type = MCP9808;
- LOG_INFO("MCP9808 sensor found\n");
- } else {
- type = LIS3DH;
- LOG_INFO("LIS3DH accelerometer found\n");
+ // We need to check for STK8BAXX first, since register 0x07 is new data flag for the z-axis and can produce some
+ // weird result. and register 0x00 doesn't seems to be colliding with MCP9808 and LIS3DH chips.
+ {
+ // Check register 0x00 for 0x8700 response to ID STK8BA53 chip.
+ registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x00), 2);
+ if (registerValue == 0x8700) {
+ type = STK8BAXX;
+ LOG_INFO("STK8BAXX accelerometer found\n");
+ break;
+ }
+
+ // Check register 0x07 for 0x0400 response to ID MCP9808 chip.
+ registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x07), 2);
+ if (registerValue == 0x0400) {
+ type = MCP9808;
+ LOG_INFO("MCP9808 sensor found\n");
+ break;
+ }
+
+ // Check register 0x0F for 0x3300 response to ID LIS3DH chip.
+ registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x0F), 2);
+ if (registerValue == 0x3300 || registerValue == 0x3333) { // RAK4631 WisBlock has LIS3DH register at 0x3333
+ type = LIS3DH;
+ LOG_INFO("LIS3DH accelerometer found\n");
+ }
+ break;
}
-
- break;
-
case SHT31_4x_ADDR:
registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x89), 2);
if (registerValue == 0x11a2 || registerValue == 0x11da || registerValue == 0xe9c) {
@@ -366,18 +382,37 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
break;
SCAN_SIMPLE_CASE(QMC5883L_ADDR, QMC5883L, "QMC5883L Highrate 3-Axis magnetic sensor found\n")
-
+ SCAN_SIMPLE_CASE(HMC5883L_ADDR, HMC5883L, "HMC5883L 3-Axis digital compass found\n")
SCAN_SIMPLE_CASE(PMSA0031_ADDR, PMSA0031, "PMSA0031 air quality sensor found\n")
- SCAN_SIMPLE_CASE(MPU6050_ADDR, MPU6050, "MPU6050 accelerometer found\n");
- SCAN_SIMPLE_CASE(BMX160_ADDR, BMX160, "BMX160 accelerometer found\n");
SCAN_SIMPLE_CASE(BMA423_ADDR, BMA423, "BMA423 accelerometer found\n");
SCAN_SIMPLE_CASE(LSM6DS3_ADDR, LSM6DS3, "LSM6DS3 accelerometer found at address 0x%x\n", (uint8_t)addr.address);
+ SCAN_SIMPLE_CASE(TCA9535_ADDR, TCA9535, "TCA9535 I2C expander found\n");
SCAN_SIMPLE_CASE(TCA9555_ADDR, TCA9555, "TCA9555 I2C expander found\n");
SCAN_SIMPLE_CASE(VEML7700_ADDR, VEML7700, "VEML7700 light sensor found\n");
SCAN_SIMPLE_CASE(TSL25911_ADDR, TSL2591, "TSL2591 light sensor found\n");
SCAN_SIMPLE_CASE(OPT3001_ADDR, OPT3001, "OPT3001 light sensor found\n");
SCAN_SIMPLE_CASE(MLX90632_ADDR, MLX90632, "MLX90632 IR temp sensor found\n");
SCAN_SIMPLE_CASE(NAU7802_ADDR, NAU7802, "NAU7802 based scale found\n");
+ SCAN_SIMPLE_CASE(FT6336U_ADDR, FT6336U, "FT6336U touchscreen found\n");
+ SCAN_SIMPLE_CASE(MAX1704X_ADDR, MAX17048, "MAX17048 lipo fuel gauge found\n");
+
+ case ICM20948_ADDR: // same as BMX160_ADDR
+ case ICM20948_ADDR_ALT: // same as MPU6050_ADDR
+ registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x00), 1);
+ if (registerValue == 0xEA) {
+ type = ICM20948;
+ LOG_INFO("ICM20948 9-dof motion processor found\n");
+ break;
+ } else if (addr.address == BMX160_ADDR) {
+ type = BMX160;
+ LOG_INFO("BMX160 accelerometer found\n");
+ break;
+ } else {
+ type = MPU6050;
+ LOG_INFO("MPU6050 accelerometer found\n");
+ break;
+ }
+ break;
default:
LOG_INFO("Device found at address 0x%x was not able to be enumerated\n", addr.address);
@@ -404,7 +439,7 @@ TwoWire *ScanI2CTwoWire::fetchI2CBus(ScanI2C::DeviceAddress address) const
if (address.port == ScanI2C::I2CPort::WIRE) {
return &Wire;
} else {
-#ifdef I2C_SDA1
+#if WIRE_INTERFACES_COUNT == 2
return &Wire1;
#else
return &Wire;
@@ -416,4 +451,4 @@ size_t ScanI2CTwoWire::countDevices() const
{
return foundDevices.size();
}
-#endif
+#endif
\ No newline at end of file
diff --git a/src/gps/GPS.cpp b/src/gps/GPS.cpp
index 12ef34c52..b6d2776bc 100644
--- a/src/gps/GPS.cpp
+++ b/src/gps/GPS.cpp
@@ -6,6 +6,8 @@
#include "NodeDB.h"
#include "PowerMon.h"
#include "RTC.h"
+#include "Throttle.h"
+#include "meshUtils.h"
#include "main.h" // pmu_found
#include "sleep.h"
@@ -26,6 +28,8 @@
#if defined(NRF52840_XXAA) || defined(NRF52833_XXAA) || defined(ARCH_ESP32) || defined(ARCH_PORTDUINO)
HardwareSerial *GPS::_serial_gps = &Serial1;
+#elif defined(ARCH_RP2040)
+SerialUART *GPS::_serial_gps = &Serial1;
#else
HardwareSerial *GPS::_serial_gps = NULL;
#endif
@@ -58,7 +62,8 @@ const char *getGPSPowerStateString(GPSPowerState state)
case GPS_OFF:
return "OFF";
default:
- assert(false); // Unhandled enum value..
+ assert(false); // Unhandled enum value..
+ return "FALSE"; // to make new ESP-IDF happy
}
}
@@ -166,18 +171,21 @@ GPS_RESPONSE GPS::getACK(const char *message, uint32_t waitMillis)
b = _serial_gps->read();
#ifdef GPS_DEBUG
- LOG_DEBUG("%02X", (char *)buffer);
+ LOG_DEBUG("%c", (b >= 32 && b <= 126) ? b : '.');
#endif
buffer[bytesRead] = b;
bytesRead++;
if ((bytesRead == 767) || (b == '\r')) {
if (strnstr((char *)buffer, message, bytesRead) != nullptr) {
#ifdef GPS_DEBUG
- LOG_DEBUG("\r");
+ LOG_DEBUG("\r\nFound: %s\r\n", message); // Log the found message
#endif
return GNSS_RESPONSE_OK;
} else {
bytesRead = 0;
+#ifdef GPS_DEBUG
+ LOG_DEBUG("\r\n");
+#endif
}
}
}
@@ -201,7 +209,7 @@ GPS_RESPONSE GPS::getACKCas(uint8_t class_id, uint8_t msg_id, uint32_t waitMilli
// ACK-NACK| 0xBA | 0xCE | 0x04 | 0x00 | 0x05 | 0x00 | 0xXX | 0xXX | 0x00 | 0x00 | 0xXX | 0xXX | 0xXX | 0xXX |
// ACK-ACK | 0xBA | 0xCE | 0x04 | 0x00 | 0x05 | 0x01 | 0xXX | 0xXX | 0x00 | 0x00 | 0xXX | 0xXX | 0xXX | 0xXX |
- while (millis() - startTime < waitMillis) {
+ while (Throttle::isWithinTimespanMs(startTime, waitMillis)) {
if (_serial_gps->available()) {
buffer[bufferPos++] = _serial_gps->read();
@@ -270,7 +278,7 @@ GPS_RESPONSE GPS::getACK(uint8_t class_id, uint8_t msg_id, uint32_t waitMillis)
buf[9] += buf[8];
}
- while (millis() - startTime < waitMillis) {
+ while (Throttle::isWithinTimespanMs(startTime, waitMillis)) {
if (ack > 9) {
#ifdef GPS_DEBUG
LOG_DEBUG("\n");
@@ -325,9 +333,9 @@ int GPS::getACK(uint8_t *buffer, uint16_t size, uint8_t requestedClass, uint8_t
{
uint16_t ubxFrameCounter = 0;
uint32_t startTime = millis();
- uint16_t needRead;
+ uint16_t needRead = 0;
- while (millis() - startTime < waitMillis) {
+ while (Throttle::isWithinTimespanMs(startTime, waitMillis)) {
if (_serial_gps->available()) {
int c = _serial_gps->read();
switch (ubxFrameCounter) {
@@ -398,9 +406,9 @@ int GPS::getACK(uint8_t *buffer, uint16_t size, uint8_t requestedClass, uint8_t
bool GPS::setup()
{
- int msglen = 0;
if (!didSerialInit) {
+ int msglen = 0;
if (tx_gpio && gnssModel == GNSS_MODEL_UNKNOWN) {
// if GPS_BAUDRATE is specified in variant (i.e. not 9600), skip to the specified rate.
@@ -505,283 +513,110 @@ bool GPS::setup()
delay(250);
_serial_gps->write("$CFGMSG,6,1,0\r\n");
delay(250);
- } else if (gnssModel == GNSS_MODEL_AG3335) {
+ } else if (IS_ONE_OF(gnssModel, GNSS_MODEL_AG3335, GNSS_MODEL_AG3352)) {
- _serial_gps->write("$PAIR066,1,0,1,0,0,1*3B"); // Enable GPS+GALILEO+NAVIC
+ _serial_gps->write("$PAIR066,1,0,1,0,0,1*3B\r\n"); // Enable GPS+GALILEO+NAVIC
// Configure NMEA (sentences will output once per fix)
- _serial_gps->write("$PAIR062,0,0*3F"); // GGA ON
- _serial_gps->write("$PAIR062,1,0*3F"); // GLL OFF
- _serial_gps->write("$PAIR062,2,1*3D"); // GSA ON
- _serial_gps->write("$PAIR062,3,0*3D"); // GSV OFF
- _serial_gps->write("$PAIR062,4,0*3B"); // RMC ON
- _serial_gps->write("$PAIR062,5,0*3B"); // VTG OFF
- _serial_gps->write("$PAIR062,6,1*39"); // ZDA ON
+ _serial_gps->write("$PAIR062,0,1*3F\r\n"); // GGA ON
+ _serial_gps->write("$PAIR062,1,0*3F\r\n"); // GLL OFF
+ _serial_gps->write("$PAIR062,2,0*3C\r\n"); // GSA OFF
+ _serial_gps->write("$PAIR062,3,0*3D\r\n"); // GSV OFF
+ _serial_gps->write("$PAIR062,4,1*3B\r\n"); // RMC ON
+ _serial_gps->write("$PAIR062,5,0*3B\r\n"); // VTG OFF
+ _serial_gps->write("$PAIR062,6,0*38\r\n"); // ZDA ON
delay(250);
- _serial_gps->write("$PAIR513*3D"); // save configuration
+ _serial_gps->write("$PAIR513*3D\r\n"); // save configuration
+ } else if (gnssModel == GNSS_MODEL_UBLOX6) {
+ clearBuffer();
+ SEND_UBX_PACKET(0x06, 0x02, _message_DISABLE_TXT_INFO, "Unable to disable text info messages.\n", 500);
+ SEND_UBX_PACKET(0x06, 0x39, _message_JAM_6_7, "Unable to enable interference resistance.\n", 500);
+ SEND_UBX_PACKET(0x06, 0x23, _message_NAVX5, "Unable to configure NAVX5 settings.\n", 500);
- } else if (gnssModel == GNSS_MODEL_UBLOX) {
- // Configure GNSS system to GPS+SBAS+GLONASS (Module may restart after this command)
- // We need set it because by default it is GPS only, and we want to use GLONASS too
- // Also we need SBAS for better accuracy and extra features
- // ToDo: Dynamic configure GNSS systems depending of LoRa region
+ // Turn off unwanted NMEA messages, set update rate
+ SEND_UBX_PACKET(0x06, 0x08, _message_1HZ, "Unable to set GPS update rate.\n", 500);
+ SEND_UBX_PACKET(0x06, 0x01, _message_GLL, "Unable to disable NMEA GLL.\n", 500);
+ SEND_UBX_PACKET(0x06, 0x01, _message_GSA, "Unable to Enable NMEA GSA.\n", 500);
+ SEND_UBX_PACKET(0x06, 0x01, _message_GSV, "Unable to disable NMEA GSV.\n", 500);
+ SEND_UBX_PACKET(0x06, 0x01, _message_VTG, "Unable to disable NMEA VTG.\n", 500);
+ SEND_UBX_PACKET(0x06, 0x01, _message_RMC, "Unable to enable NMEA RMC.\n", 500);
+ SEND_UBX_PACKET(0x06, 0x01, _message_GGA, "Unable to enable NMEA GGA.\n", 500);
- if (strncmp(info.hwVersion, "000A0000", 8) != 0) {
- if (strncmp(info.hwVersion, "00040007", 8) != 0) {
- // The original ublox Neo-6 is GPS only and doesn't support the UBX-CFG-GNSS message
- // Max7 seems to only support GPS *or* GLONASS
- // Neo-7 is supposed to support GPS *and* GLONASS but NAKs the CFG-GNSS command to do it
- // So treat all the u-blox 7 series as GPS only
- // M8 can support 3 constallations at once so turn on GPS, GLONASS and Galileo (or BeiDou)
+ clearBuffer();
+ SEND_UBX_PACKET(0x06, 0x11, _message_CFG_RXM_ECO, "Unable to enable powersaving ECO mode for Neo-6.\n", 500);
+ SEND_UBX_PACKET(0x06, 0x3B, _message_CFG_PM2, "Unable to enable powersaving details for GPS.\n", 500);
+ SEND_UBX_PACKET(0x06, 0x01, _message_AID, "Unable to disable UBX-AID.\n", 500);
- if (strncmp(info.hwVersion, "00070000", 8) == 0) {
- LOG_DEBUG("Setting GPS+SBAS\n");
- msglen = makeUBXPacket(0x06, 0x3e, sizeof(_message_GNSS_7), _message_GNSS_7);
- _serial_gps->write(UBXscratch, msglen);
- } else {
- msglen = makeUBXPacket(0x06, 0x3e, sizeof(_message_GNSS_8), _message_GNSS_8);
- _serial_gps->write(UBXscratch, msglen);
- }
+ msglen = makeUBXPacket(0x06, 0x09, sizeof(_message_SAVE), _message_SAVE);
+ _serial_gps->write(UBXscratch, msglen);
+ if (getACK(0x06, 0x09, 2000) != GNSS_RESPONSE_OK) {
+ LOG_WARN("Unable to save GNSS module configuration.\n");
+ } else {
+ LOG_INFO("GNSS module configuration saved!\n");
+ }
+ } else if (IS_ONE_OF(gnssModel, GNSS_MODEL_UBLOX7, GNSS_MODEL_UBLOX8, GNSS_MODEL_UBLOX9)) {
+ if (gnssModel == GNSS_MODEL_UBLOX7) {
+ LOG_DEBUG("Setting GPS+SBAS\n");
+ msglen = makeUBXPacket(0x06, 0x3e, sizeof(_message_GNSS_7), _message_GNSS_7);
+ _serial_gps->write(UBXscratch, msglen);
+ } else { // 8,9
+ msglen = makeUBXPacket(0x06, 0x3e, sizeof(_message_GNSS_8), _message_GNSS_8);
+ _serial_gps->write(UBXscratch, msglen);
+ }
- if (getACK(0x06, 0x3e, 800) == GNSS_RESPONSE_NAK) {
- // It's not critical if the module doesn't acknowledge this configuration.
- LOG_INFO("Unable to reconfigure GNSS - defaults maintained. Is this module GPS-only?\n");
- } else {
- if (strncmp(info.hwVersion, "00070000", 8) == 0) {
- LOG_INFO("GNSS configured for GPS+SBAS. Pause for 0.75s before sending next command.\n");
- } else {
- LOG_INFO(
- "GNSS configured for GPS+SBAS+GLONASS+Galileo. Pause for 0.75s before sending next command.\n");
- }
- // Documentation say, we need wait atleast 0.5s after reconfiguration of GNSS module, before sending next
- // commands for the M8 it tends to be more... 1 sec should be enough ;>)
- delay(1000);
- }
+ if (getACK(0x06, 0x3e, 800) == GNSS_RESPONSE_NAK) {
+ // It's not critical if the module doesn't acknowledge this configuration.
+ LOG_INFO("Unable to reconfigure GNSS - defaults maintained. Is this module GPS-only?\n");
+ } else {
+ if (gnssModel == GNSS_MODEL_UBLOX7) {
+ LOG_INFO("GNSS configured for GPS+SBAS.\n");
+ } else { // 8,9
+ LOG_INFO("GNSS configured for GPS+SBAS+GLONASS+Galileo.\n");
}
- // Disable Text Info messages
- msglen = makeUBXPacket(0x06, 0x02, sizeof(_message_DISABLE_TXT_INFO), _message_DISABLE_TXT_INFO);
+ // Documentation say, we need wait atleast 0.5s after reconfiguration of GNSS module, before sending next
+ // commands for the M8 it tends to be more... 1 sec should be enough ;>)
+ delay(1000);
+ }
+
+ // Disable Text Info messages //6,7,8,9
+ clearBuffer();
+ SEND_UBX_PACKET(0x06, 0x02, _message_DISABLE_TXT_INFO, "Unable to disable text info messages.\n", 500);
+
+ if (gnssModel == GNSS_MODEL_UBLOX8) { // 8
clearBuffer();
- _serial_gps->write(UBXscratch, msglen);
- if (getACK(0x06, 0x02, 500) != GNSS_RESPONSE_OK) {
- LOG_WARN("Unable to disable text info messages.\n");
- }
- // ToDo add M10 tests for below
- if (strncmp(info.hwVersion, "00080000", 8) == 0) {
- msglen = makeUBXPacket(0x06, 0x39, sizeof(_message_JAM_8), _message_JAM_8);
+ SEND_UBX_PACKET(0x06, 0x39, _message_JAM_8, "Unable to enable interference resistance.\n", 500);
+
+ clearBuffer();
+ SEND_UBX_PACKET(0x06, 0x23, _message_NAVX5_8, "Unable to configure NAVX5_8 settings.\n", 500);
+ } else { // 6,7,9
+ SEND_UBX_PACKET(0x06, 0x39, _message_JAM_6_7, "Unable to enable interference resistance.\n", 500);
+ SEND_UBX_PACKET(0x06, 0x23, _message_NAVX5, "Unable to configure NAVX5 settings.\n", 500);
+ }
+ // Turn off unwanted NMEA messages, set update rate
+ SEND_UBX_PACKET(0x06, 0x08, _message_1HZ, "Unable to set GPS update rate.\n", 500);
+ SEND_UBX_PACKET(0x06, 0x01, _message_GLL, "Unable to disable NMEA GLL.\n", 500);
+ SEND_UBX_PACKET(0x06, 0x01, _message_GSA, "Unable to Enable NMEA GSA.\n", 500);
+ SEND_UBX_PACKET(0x06, 0x01, _message_GSV, "Unable to disable NMEA GSV.\n", 500);
+ SEND_UBX_PACKET(0x06, 0x01, _message_VTG, "Unable to disable NMEA VTG.\n", 500);
+ SEND_UBX_PACKET(0x06, 0x01, _message_RMC, "Unable to enable NMEA RMC.\n", 500);
+ SEND_UBX_PACKET(0x06, 0x01, _message_GGA, "Unable to enable NMEA GGA.\n", 500);
+
+ if (uBloxProtocolVersion >= 18) {
+ clearBuffer();
+ SEND_UBX_PACKET(0x06, 0x86, _message_PMS, "Unable to enable powersaving for GPS.\n", 500);
+ SEND_UBX_PACKET(0x06, 0x3B, _message_CFG_PM2, "Unable to enable powersaving details for GPS.\n", 500);
+
+ // For M8 we want to enable NMEA vserion 4.10 so we can see the additional sats.
+ if (gnssModel == GNSS_MODEL_UBLOX8) {
clearBuffer();
- _serial_gps->write(UBXscratch, msglen);
- if (getACK(0x06, 0x39, 500) != GNSS_RESPONSE_OK) {
- LOG_WARN("Unable to enable interference resistance.\n");
- }
-
- msglen = makeUBXPacket(0x06, 0x23, sizeof(_message_NAVX5_8), _message_NAVX5_8);
- clearBuffer();
- _serial_gps->write(UBXscratch, msglen);
- if (getACK(0x06, 0x23, 500) != GNSS_RESPONSE_OK) {
- LOG_WARN("Unable to configure NAVX5_8 settings.\n");
- }
- } else {
- msglen = makeUBXPacket(0x06, 0x39, sizeof(_message_JAM_6_7), _message_JAM_6_7);
- _serial_gps->write(UBXscratch, msglen);
- if (getACK(0x06, 0x39, 500) != GNSS_RESPONSE_OK) {
- LOG_WARN("Unable to enable interference resistance.\n");
- }
-
- msglen = makeUBXPacket(0x06, 0x23, sizeof(_message_NAVX5), _message_NAVX5);
- _serial_gps->write(UBXscratch, msglen);
- if (getACK(0x06, 0x23, 500) != GNSS_RESPONSE_OK) {
- LOG_WARN("Unable to configure NAVX5 settings.\n");
- }
- }
- // Turn off unwanted NMEA messages, set update rate
-
- msglen = makeUBXPacket(0x06, 0x08, sizeof(_message_1HZ), _message_1HZ);
- _serial_gps->write(UBXscratch, msglen);
- if (getACK(0x06, 0x08, 500) != GNSS_RESPONSE_OK) {
- LOG_WARN("Unable to set GPS update rate.\n");
- }
-
- msglen = makeUBXPacket(0x06, 0x01, sizeof(_message_GLL), _message_GLL);
- _serial_gps->write(UBXscratch, msglen);
- if (getACK(0x06, 0x01, 500) != GNSS_RESPONSE_OK) {
- LOG_WARN("Unable to disable NMEA GLL.\n");
- }
-
- msglen = makeUBXPacket(0x06, 0x01, sizeof(_message_GSA), _message_GSA);
- _serial_gps->write(UBXscratch, msglen);
- if (getACK(0x06, 0x01, 500) != GNSS_RESPONSE_OK) {
- LOG_WARN("Unable to Enable NMEA GSA.\n");
- }
-
- msglen = makeUBXPacket(0x06, 0x01, sizeof(_message_GSV), _message_GSV);
- _serial_gps->write(UBXscratch, msglen);
- if (getACK(0x06, 0x01, 500) != GNSS_RESPONSE_OK) {
- LOG_WARN("Unable to disable NMEA GSV.\n");
- }
-
- msglen = makeUBXPacket(0x06, 0x01, sizeof(_message_VTG), _message_VTG);
- _serial_gps->write(UBXscratch, msglen);
- if (getACK(0x06, 0x01, 500) != GNSS_RESPONSE_OK) {
- LOG_WARN("Unable to disable NMEA VTG.\n");
- }
-
- msglen = makeUBXPacket(0x06, 0x01, sizeof(_message_RMC), _message_RMC);
- _serial_gps->write(UBXscratch, msglen);
- if (getACK(0x06, 0x01, 500) != GNSS_RESPONSE_OK) {
- LOG_WARN("Unable to enable NMEA RMC.\n");
- }
-
- msglen = makeUBXPacket(0x06, 0x01, sizeof(_message_GGA), _message_GGA);
- _serial_gps->write(UBXscratch, msglen);
- if (getACK(0x06, 0x01, 500) != GNSS_RESPONSE_OK) {
- LOG_WARN("Unable to enable NMEA GGA.\n");
- }
-
- if (uBloxProtocolVersion >= 18) {
- msglen = makeUBXPacket(0x06, 0x86, sizeof(_message_PMS), _message_PMS);
- clearBuffer();
- _serial_gps->write(UBXscratch, msglen);
- if (getACK(0x06, 0x86, 500) != GNSS_RESPONSE_OK) {
- LOG_WARN("Unable to enable powersaving for GPS.\n");
- }
- msglen = makeUBXPacket(0x06, 0x3B, sizeof(_message_CFG_PM2), _message_CFG_PM2);
- _serial_gps->write(UBXscratch, msglen);
- if (getACK(0x06, 0x3B, 500) != GNSS_RESPONSE_OK) {
- LOG_WARN("Unable to enable powersaving details for GPS.\n");
- }
- // For M8 we want to enable NMEA vserion 4.10 so we can see the additional sats.
- if (strncmp(info.hwVersion, "00080000", 8) == 0) {
- msglen = makeUBXPacket(0x06, 0x17, sizeof(_message_NMEA), _message_NMEA);
- clearBuffer();
- _serial_gps->write(UBXscratch, msglen);
- if (getACK(0x06, 0x17, 500) != GNSS_RESPONSE_OK) {
- LOG_WARN("Unable to enable NMEA 4.10.\n");
- }
- }
- } else {
- if (strncmp(info.hwVersion, "00040007", 8) == 0) { // This PSM mode is only for Neo-6
- msglen = makeUBXPacket(0x06, 0x11, 0x2, _message_CFG_RXM_ECO);
- _serial_gps->write(UBXscratch, msglen);
- if (getACK(0x06, 0x11, 500) != GNSS_RESPONSE_OK) {
- LOG_WARN("Unable to enable powersaving ECO mode for Neo-6.\n");
- }
- msglen = makeUBXPacket(0x06, 0x3B, sizeof(_message_CFG_PM2), _message_CFG_PM2);
- _serial_gps->write(UBXscratch, msglen);
- if (getACK(0x06, 0x3B, 500) != GNSS_RESPONSE_OK) {
- LOG_WARN("Unable to enable powersaving details for GPS.\n");
- }
- msglen = makeUBXPacket(0x06, 0x01, sizeof(_message_AID), _message_AID);
- _serial_gps->write(UBXscratch, msglen);
- if (getACK(0x06, 0x01, 500) != GNSS_RESPONSE_OK) {
- LOG_WARN("Unable to disable UBX-AID.\n");
- }
- } else {
- msglen = makeUBXPacket(0x06, 0x11, 0x2, _message_CFG_RXM_PSM);
- _serial_gps->write(UBXscratch, msglen);
- if (getACK(0x06, 0x11, 500) != GNSS_RESPONSE_OK) {
- LOG_WARN("Unable to enable powersaving mode for GPS.\n");
- }
-
- msglen = makeUBXPacket(0x06, 0x3B, sizeof(_message_CFG_PM2), _message_CFG_PM2);
- _serial_gps->write(UBXscratch, msglen);
- if (getACK(0x06, 0x3B, 500) != GNSS_RESPONSE_OK) {
- LOG_WARN("Unable to enable powersaving details for GPS.\n");
- }
- }
+ SEND_UBX_PACKET(0x06, 0x17, _message_NMEA, "Unable to enable NMEA 4.10.\n", 500);
}
} else {
- // LOG_INFO("u-blox M10 hardware found.\n");
- delay(1000);
- // First disable all NMEA messages in RAM layer
- msglen = makeUBXPacket(0x06, 0x8A, sizeof(_message_VALSET_DISABLE_NMEA_RAM), _message_VALSET_DISABLE_NMEA_RAM);
- clearBuffer();
- _serial_gps->write(UBXscratch, msglen);
- if (getACK(0x06, 0x8A, 300) != GNSS_RESPONSE_OK) {
- LOG_WARN("Unable to disable NMEA messages for M10 GPS RAM.\n");
- }
- delay(250);
- // Next disable unwanted NMEA messages in BBR layer
- msglen = makeUBXPacket(0x06, 0x8A, sizeof(_message_VALSET_DISABLE_NMEA_BBR), _message_VALSET_DISABLE_NMEA_BBR);
- clearBuffer();
- _serial_gps->write(UBXscratch, msglen);
- if (getACK(0x06, 0x8A, 300) != GNSS_RESPONSE_OK) {
- LOG_WARN("Unable to disable NMEA messages for M10 GPS BBR.\n");
- }
- delay(250);
- // Disable Info txt messages in RAM layer
- msglen =
- makeUBXPacket(0x06, 0x8A, sizeof(_message_VALSET_DISABLE_TXT_INFO_RAM), _message_VALSET_DISABLE_TXT_INFO_RAM);
- clearBuffer();
- _serial_gps->write(UBXscratch, msglen);
- if (getACK(0x06, 0x8A, 300) != GNSS_RESPONSE_OK) {
- LOG_WARN("Unable to disable Info messages for M10 GPS RAM.\n");
- }
- delay(250);
- // Next disable Info txt messages in BBR layer
- msglen =
- makeUBXPacket(0x06, 0x8A, sizeof(_message_VALSET_DISABLE_TXT_INFO_BBR), _message_VALSET_DISABLE_TXT_INFO_BBR);
- clearBuffer();
- _serial_gps->write(UBXscratch, msglen);
- if (getACK(0x06, 0x8A, 300) != GNSS_RESPONSE_OK) {
- LOG_WARN("Unable to disable Info messages for M10 GPS BBR.\n");
- }
- // Do M10 configuration for Power Management.
-
- msglen = makeUBXPacket(0x06, 0x8A, sizeof(_message_VALSET_PM_RAM), _message_VALSET_PM_RAM);
- _serial_gps->write(UBXscratch, msglen);
- if (getACK(0x06, 0x8A, 300) != GNSS_RESPONSE_OK) {
- LOG_WARN("Unable to enable powersaving for M10 GPS RAM.\n");
- }
- msglen = makeUBXPacket(0x06, 0x8A, sizeof(_message_VALSET_PM_BBR), _message_VALSET_PM_BBR);
- _serial_gps->write(UBXscratch, msglen);
- if (getACK(0x06, 0x8A, 300) != GNSS_RESPONSE_OK) {
- LOG_WARN("Unable to enable powersaving for M10 GPS BBR.\n");
- }
-
- delay(250);
- msglen = makeUBXPacket(0x06, 0x8A, sizeof(_message_VALSET_ITFM_RAM), _message_VALSET_ITFM_RAM);
- _serial_gps->write(UBXscratch, msglen);
- if (getACK(0x06, 0x8A, 300) != GNSS_RESPONSE_OK) {
- LOG_WARN("Unable to enable Jamming detection M10 GPS RAM.\n");
- }
- msglen = makeUBXPacket(0x06, 0x8A, sizeof(_message_VALSET_ITFM_BBR), _message_VALSET_ITFM_BBR);
- _serial_gps->write(UBXscratch, msglen);
- if (getACK(0x06, 0x8A, 300) != GNSS_RESPONSE_OK) {
- LOG_WARN("Unable to enable Jamming detection M10 GPS BBR.\n");
- }
-
- // Here is where the init commands should go to do further M10 initialization.
- delay(250);
- msglen = makeUBXPacket(0x06, 0x8A, sizeof(_message_VALSET_DISABLE_SBAS_RAM), _message_VALSET_DISABLE_SBAS_RAM);
- _serial_gps->write(UBXscratch, msglen);
- if (getACK(0x06, 0x8A, 300) != GNSS_RESPONSE_OK) {
- LOG_WARN("Unable to disable SBAS M10 GPS RAM.\n");
- }
- delay(750); // will cause a receiver restart so wait a bit
- msglen = makeUBXPacket(0x06, 0x8A, sizeof(_message_VALSET_DISABLE_SBAS_BBR), _message_VALSET_DISABLE_SBAS_BBR);
- _serial_gps->write(UBXscratch, msglen);
- if (getACK(0x06, 0x8A, 300) != GNSS_RESPONSE_OK) {
- LOG_WARN("Unable to disable SBAS M10 GPS BBR.\n");
- }
- delay(750); // will cause a receiver restart so wait a bit
- // Done with initialization, Now enable wanted NMEA messages in BBR layer so they will survive a periodic sleep.
- msglen = makeUBXPacket(0x06, 0x8A, sizeof(_message_VALSET_ENABLE_NMEA_BBR), _message_VALSET_ENABLE_NMEA_BBR);
- _serial_gps->write(UBXscratch, msglen);
- if (getACK(0x06, 0x8A, 300) != GNSS_RESPONSE_OK) {
- LOG_WARN("Unable to enable messages for M10 GPS BBR.\n");
- }
- delay(250);
- // Next enable wanted NMEA messages in RAM layer
- msglen = makeUBXPacket(0x06, 0x8A, sizeof(_message_VALSET_ENABLE_NMEA_RAM), _message_VALSET_ENABLE_NMEA_RAM);
- _serial_gps->write(UBXscratch, msglen);
- if (getACK(0x06, 0x8A, 300) != GNSS_RESPONSE_OK) {
- LOG_WARN("Unable to enable messages for M10 GPS RAM.\n");
- }
- // As the M10 has no flash, the best we can do to preserve the config is to set it in RAM and BBR.
- // BBR will survive a restart, and power off for a while, but modules with small backup
- // batteries or super caps will not retain the config for a long power off time.
+ SEND_UBX_PACKET(0x06, 0x11, _message_CFG_RXM_PSM, "Unable to enable powersaving mode for GPS.\n", 500);
+ SEND_UBX_PACKET(0x06, 0x3B, _message_CFG_PM2, "Unable to enable powersaving details for GPS.\n", 500);
}
+
msglen = makeUBXPacket(0x06, 0x09, sizeof(_message_SAVE), _message_SAVE);
_serial_gps->write(UBXscratch, msglen);
if (getACK(0x06, 0x09, 2000) != GNSS_RESPONSE_OK) {
@@ -789,6 +624,55 @@ bool GPS::setup()
} else {
LOG_INFO("GNSS module configuration saved!\n");
}
+ } else if (gnssModel == GNSS_MODEL_UBLOX10) {
+ delay(1000);
+ clearBuffer();
+ SEND_UBX_PACKET(0x06, 0x8A, _message_VALSET_DISABLE_NMEA_RAM, "Unable to disable NMEA messages in M10 RAM.\n", 300);
+ delay(750);
+ clearBuffer();
+ SEND_UBX_PACKET(0x06, 0x8A, _message_VALSET_DISABLE_NMEA_BBR, "Unable to disable NMEA messages in M10 BBR.\n", 300);
+ delay(750);
+ clearBuffer();
+ SEND_UBX_PACKET(0x06, 0x8A, _message_VALSET_DISABLE_TXT_INFO_RAM,
+ "Unable to disable Info messages for M10 GPS RAM.\n", 300);
+ delay(750);
+ // Next disable Info txt messages in BBR layer
+ clearBuffer();
+ SEND_UBX_PACKET(0x06, 0x8A, _message_VALSET_DISABLE_TXT_INFO_BBR,
+ "Unable to disable Info messages for M10 GPS BBR.\n", 300);
+ delay(750);
+ // Do M10 configuration for Power Management.
+ SEND_UBX_PACKET(0x06, 0x8A, _message_VALSET_PM_RAM, "Unable to enable powersaving for M10 GPS RAM.\n", 300);
+ delay(750);
+ SEND_UBX_PACKET(0x06, 0x8A, _message_VALSET_PM_BBR, "Unable to enable powersaving for M10 GPS BBR.\n", 300);
+ delay(750);
+ SEND_UBX_PACKET(0x06, 0x8A, _message_VALSET_ITFM_RAM, "Unable to enable Jamming detection M10 GPS RAM.\n", 300);
+ delay(750);
+ SEND_UBX_PACKET(0x06, 0x8A, _message_VALSET_ITFM_BBR, "Unable to enable Jamming detection M10 GPS BBR.\n", 300);
+ delay(750);
+ // Here is where the init commands should go to do further M10 initialization.
+ SEND_UBX_PACKET(0x06, 0x8A, _message_VALSET_DISABLE_SBAS_RAM, "Unable to disable SBAS M10 GPS RAM.\n", 300);
+ delay(750); // will cause a receiver restart so wait a bit
+ SEND_UBX_PACKET(0x06, 0x8A, _message_VALSET_DISABLE_SBAS_BBR, "Unable to disable SBAS M10 GPS BBR.\n", 300);
+ delay(750); // will cause a receiver restart so wait a bit
+
+ // Done with initialization, Now enable wanted NMEA messages in BBR layer so they will survive a periodic sleep.
+ SEND_UBX_PACKET(0x06, 0x8A, _message_VALSET_ENABLE_NMEA_BBR, "Unable to enable messages for M10 GPS BBR.\n", 300);
+ delay(750);
+ // Next enable wanted NMEA messages in RAM layer
+ SEND_UBX_PACKET(0x06, 0x8A, _message_VALSET_ENABLE_NMEA_RAM, "Unable to enable messages for M10 GPS RAM.\n", 500);
+ delay(750);
+
+ // As the M10 has no flash, the best we can do to preserve the config is to set it in RAM and BBR.
+ // BBR will survive a restart, and power off for a while, but modules with small backup
+ // batteries or super caps will not retain the config for a long power off time.
+ msglen = makeUBXPacket(0x06, 0x09, sizeof(_message_SAVE_10), _message_SAVE_10);
+ _serial_gps->write(UBXscratch, msglen);
+ if (getACK(0x06, 0x09, 2000) != GNSS_RESPONSE_OK) {
+ LOG_WARN("Unable to save GNSS module configuration.\n");
+ } else {
+ LOG_INFO("GNSS module configuration saved!\n");
+ }
}
didSerialInit = true;
}
@@ -944,7 +828,7 @@ void GPS::setPowerPMU(bool on)
void GPS::setPowerUBLOX(bool on, uint32_t sleepMs)
{
// Abort: if not UBLOX hardware
- if (gnssModel != GNSS_MODEL_UBLOX)
+ if (!IS_ONE_OF(gnssModel, GNSS_MODEL_UBLOX6, GNSS_MODEL_UBLOX7, GNSS_MODEL_UBLOX8, GNSS_MODEL_UBLOX9, GNSS_MODEL_UBLOX10))
return;
// If waking
@@ -967,7 +851,7 @@ void GPS::setPowerUBLOX(bool on, uint32_t sleepMs)
}
// Determine hardware version
- if (strncmp(info.hwVersion, "000A0000", 8) != 0) {
+ if (gnssModel == GNSS_MODEL_UBLOX10) {
// Encode the sleep time in millis into the packet
for (int i = 0; i < 4; i++)
gps->_message_PMREQ[0 + i] = sleepMs >> (i * 8);
@@ -1019,33 +903,36 @@ void GPS::down()
LOG_DEBUG("%us until next search\n", sleepTime / 1000);
// If update interval less than 10 seconds, no attempt to sleep
- if (updateInterval <= 10 * 1000UL)
+ if (updateInterval <= 10 * 1000UL || sleepTime == 0)
setPowerState(GPS_IDLE);
else {
// Check whether the GPS hardware is capable of GPS_SOFTSLEEP
// If not, fallback to GPS_HARDSLEEP instead
bool softsleepSupported = false;
- if (gnssModel == GNSS_MODEL_UBLOX) // U-blox is supported via PMREQ
+ // U-blox is supported via PMREQ
+ if (IS_ONE_OF(gnssModel, GNSS_MODEL_UBLOX6, GNSS_MODEL_UBLOX7, GNSS_MODEL_UBLOX8, GNSS_MODEL_UBLOX9, GNSS_MODEL_UBLOX10))
softsleepSupported = true;
#ifdef PIN_GPS_STANDBY // L76B, L76K and clones have a standby pin
softsleepSupported = true;
#endif
- // How long does gps_update_interval need to be, for GPS_HARDSLEEP to become more efficient than GPS_SOFTSLEEP?
- // Heuristic equation. A compromise manually fitted to power observations from U-blox NEO-6M and M10050
- // https://www.desmos.com/calculator/6gvjghoumr
- // This is not particularly accurate, but probably an impromevement over a single, fixed threshold
- uint32_t hardsleepThreshold = (2750 * pow(predictedSearchDuration / 1000, 1.22));
- LOG_DEBUG("gps_update_interval >= %us needed to justify hardsleep\n", hardsleepThreshold / 1000);
-
- // If update interval too short: softsleep (if supported by hardware)
- if (softsleepSupported && updateInterval < hardsleepThreshold)
- setPowerState(GPS_SOFTSLEEP, sleepTime);
+ if (softsleepSupported) {
+ // How long does gps_update_interval need to be, for GPS_HARDSLEEP to become more efficient than GPS_SOFTSLEEP?
+ // Heuristic equation. A compromise manually fitted to power observations from U-blox NEO-6M and M10050
+ // https://www.desmos.com/calculator/6gvjghoumr
+ // This is not particularly accurate, but probably an impromevement over a single, fixed threshold
+ uint32_t hardsleepThreshold = (2750 * pow(predictedSearchDuration / 1000, 1.22));
+ LOG_DEBUG("gps_update_interval >= %us needed to justify hardsleep\n", hardsleepThreshold / 1000);
+ // If update interval too short: softsleep (if supported by hardware)
+ if (updateInterval < hardsleepThreshold) {
+ setPowerState(GPS_SOFTSLEEP, sleepTime);
+ return;
+ }
+ }
// If update interval long enough (or softsleep unsupported): hardsleep instead
- else
- setPowerState(GPS_HARDSLEEP, sleepTime);
+ setPowerState(GPS_HARDSLEEP, sleepTime);
}
}
@@ -1101,7 +988,9 @@ int32_t GPS::runOnce()
// if we have received valid NMEA claim we are connected
setConnected();
} else {
- if ((config.position.gps_mode == meshtastic_Config_PositionConfig_GpsMode_ENABLED) && (gnssModel == GNSS_MODEL_UBLOX)) {
+ if ((config.position.gps_mode == meshtastic_Config_PositionConfig_GpsMode_ENABLED) &&
+ IS_ONE_OF(gnssModel, GNSS_MODEL_UBLOX6, GNSS_MODEL_UBLOX7, GNSS_MODEL_UBLOX8, GNSS_MODEL_UBLOX9,
+ GNSS_MODEL_UBLOX10)) {
// reset the GPS on next bootup
if (devicestate.did_gps_reset && scheduling.elapsedSearchMs() > 60 * 1000UL && !hasFlow()) {
LOG_DEBUG("GPS is not communicating, trying factory reset on next bootup.\n");
@@ -1184,25 +1073,31 @@ int GPS::prepareDeepSleep(void *unused)
return 0;
}
+#define PROBE_SIMPLE(CHIP, TOWRITE, RESPONSE, DRIVER, TIMEOUT, ...) \
+ LOG_DEBUG("Trying " TOWRITE " (" CHIP ") ...\n"); \
+ clearBuffer(); \
+ _serial_gps->write(TOWRITE "\r\n"); \
+ if (getACK(RESPONSE, TIMEOUT) == GNSS_RESPONSE_OK) { \
+ LOG_INFO(CHIP " detected, using " #DRIVER " Module\n"); \
+ return DRIVER; \
+ }
+
GnssModel_t GPS::probe(int serialSpeed)
{
-#if defined(ARCH_NRF52) || defined(ARCH_PORTDUINO) || defined(ARCH_RP2040) || defined(ARCH_STM32WL)
+#if defined(ARCH_NRF52) || defined(ARCH_PORTDUINO) || defined(ARCH_STM32WL)
_serial_gps->end();
_serial_gps->begin(serialSpeed);
+#elif defined(ARCH_RP2040)
+ _serial_gps->end();
+ _serial_gps->setFIFOSize(256);
+ _serial_gps->begin(serialSpeed);
#else
if (_serial_gps->baudRate() != serialSpeed) {
LOG_DEBUG("Setting Baud to %i\n", serialSpeed);
_serial_gps->updateBaudRate(serialSpeed);
}
#endif
-#ifdef GNSS_AIROHA
- return GNSS_MODEL_AG3335;
-#endif
-#ifdef GPS_DEBUG
- for (int i = 0; i < 20; i++) {
- getACK("$GP", 200);
- }
-#endif
+
memset(&info, 0, sizeof(struct uBloxGnssModelInfo));
uint8_t buffer[768] = {0};
delay(100);
@@ -1211,70 +1106,29 @@ GnssModel_t GPS::probe(int serialSpeed)
_serial_gps->write("$PCAS03,0,0,0,0,0,0,0,0,0,0,,,0,0*02\r\n");
delay(20);
- // get version information from Unicore UFirebirdII Series
- // Works for: UC6580, UM620, UM621, UM670A, UM680A, or UM681A
- _serial_gps->write("$PDTINFO\r\n");
- delay(750);
- if (getACK("UC6580", 500) == GNSS_RESPONSE_OK) {
- LOG_INFO("UC6580 detected, using UC6580 Module\n");
- return GNSS_MODEL_UC6580;
- }
-
- clearBuffer();
- _serial_gps->write("$PDTINFO\r\n");
- delay(750);
- if (getACK("UM600", 500) == GNSS_RESPONSE_OK) {
- LOG_INFO("UM600 detected, using UC6580 Module\n");
- return GNSS_MODEL_UC6580;
- }
-
- // Get version information for ATGM336H
- clearBuffer();
- _serial_gps->write("$PCAS06,1*1A\r\n");
- if (getACK("$GPTXT,01,01,02,HW=ATGM336H", 500) == GNSS_RESPONSE_OK) {
- LOG_INFO("ATGM336H GNSS init succeeded, using ATGM336H Module\n");
- return GNSS_MODEL_ATGM336H;
- }
-
+ // Unicore UFirebirdII Series: UC6580, UM620, UM621, UM670A, UM680A, or UM681A
+ PROBE_SIMPLE("UC6580", "$PDTINFO", "UC6580", GNSS_MODEL_UC6580, 500);
+ PROBE_SIMPLE("UM600", "$PDTINFO", "UM600", GNSS_MODEL_UC6580, 500);
+ PROBE_SIMPLE("ATGM336H", "$PCAS06,1*1A", "$GPTXT,01,01,02,HW=ATGM336H", GNSS_MODEL_ATGM336H, 500);
/* ATGM332D series (-11(GPS), -21(BDS), -31(GPS+BDS), -51(GPS+GLONASS), -71-0(GPS+BDS+GLONASS))
based on AT6558 */
- clearBuffer();
- _serial_gps->write("$PCAS06,1*1A\r\n");
- if (getACK("$GPTXT,01,01,02,HW=ATGM332D", 500) == GNSS_RESPONSE_OK) {
- LOG_INFO("ATGM332D detected, using ATGM336H Module\n");
- return GNSS_MODEL_ATGM336H;
- }
+ PROBE_SIMPLE("ATGM332D", "$PCAS06,1*1A", "$GPTXT,01,01,02,HW=ATGM332D", GNSS_MODEL_ATGM336H, 500);
/* Airoha (Mediatek) AG3335A/M/S, A3352Q, Quectel L89 2.0, SimCom SIM65M */
- clearBuffer();
- _serial_gps->write("PAIR020*38\r\n");
- if (getACK("$PAIR020,AG3335", 500) == GNSS_RESPONSE_OK) {
- LOG_INFO("Aioha AG3335 detected, using AG3335 Module\n");
- return GNSS_MODEL_AG3335;
- }
- // Get version information for Airoha AG3335
- clearBuffer();
- _serial_gps->write("$PMTK605*31\r\n");
+ _serial_gps->write("$PAIR062,2,0*3C\r\n"); // GSA OFF to reduce volume
+ _serial_gps->write("$PAIR062,3,0*3D\r\n"); // GSV OFF to reduce volume
+ _serial_gps->write("$PAIR513*3D\r\n"); // save configuration
+ PROBE_SIMPLE("AG3335", "$PAIR021*39", "$PAIR021,AG3335", GNSS_MODEL_AG3335, 500);
+ PROBE_SIMPLE("AG3352", "$PAIR021*39", "$PAIR021,AG3352", GNSS_MODEL_AG3352, 500);
+ PROBE_SIMPLE("LC86", "$PQTMVERNO*58", "$PQTMVERNO,LC86", GNSS_MODEL_AG3352, 500);
- // Get version information
- clearBuffer();
- _serial_gps->write("$PCAS06,0*1B\r\n");
- if (getACK("$GPTXT,01,01,02,SW=", 500) == GNSS_RESPONSE_OK) {
- LOG_INFO("L76K GNSS init succeeded, using L76K GNSS Module\n");
- return GNSS_MODEL_MTK;
- }
+ PROBE_SIMPLE("L76K", "$PCAS06,0*1B", "$GPTXT,01,01,02,SW=", GNSS_MODEL_MTK, 500);
// Close all NMEA sentences, valid for L76B MTK platform (Waveshare Pico GPS)
_serial_gps->write("$PMTK514,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0*2E\r\n");
delay(20);
- // Get version information
- clearBuffer();
- _serial_gps->write("$PMTK605*31\r\n");
- if (getACK("Quectel-L76B", 500) == GNSS_RESPONSE_OK) {
- LOG_INFO("L76B GNSS init succeeded, using L76B GNSS Module\n");
- return GNSS_MODEL_MTK_L76B;
- }
+ PROBE_SIMPLE("L76B", "$PMTK605*31", "Quectel-L76B", GNSS_MODEL_MTK_L76B, 500);
uint8_t cfg_rate[] = {0xB5, 0x62, 0x06, 0x08, 0x00, 0x00, 0x00, 0x00};
UBXChecksum(cfg_rate, sizeof(cfg_rate));
@@ -1301,9 +1155,13 @@ GnssModel_t GPS::probe(int serialSpeed)
_serial_gps->write(_message_prt, sizeof(_message_prt));
delay(500);
serialSpeed = 9600;
-#if defined(ARCH_NRF52) || defined(ARCH_PORTDUINO) || defined(ARCH_RP2040) || defined(ARCH_STM32WL)
+#if defined(ARCH_NRF52) || defined(ARCH_PORTDUINO) || defined(ARCH_STM32WL)
_serial_gps->end();
_serial_gps->begin(serialSpeed);
+#elif defined(ARCH_RP2040)
+ _serial_gps->end();
+ _serial_gps->setFIFOSize(256);
+ _serial_gps->begin(serialSpeed);
#else
_serial_gps->updateBaudRate(serialSpeed);
#endif
@@ -1361,9 +1219,9 @@ GnssModel_t GPS::probe(int serialSpeed)
strncpy((char *)buffer, &(info.extension[i][4]), sizeof(buffer));
// LOG_DEBUG("GetModel:%s\n", (char *)buffer);
if (strlen((char *)buffer)) {
- LOG_INFO("UBlox GNSS probe succeeded, using UBlox %s GNSS Module\n", (char *)buffer);
+ LOG_INFO("%s detected, using GNSS_MODEL_UBLOX\n", (char *)buffer);
} else {
- LOG_INFO("UBlox GNSS probe succeeded, using UBlox GNSS Module\n");
+ LOG_INFO("Generic Ublox detected, using GNSS_MODEL_UBLOX\n");
}
} else if (!strncmp(info.extension[i], "PROTVER", 7)) {
char *ptr = nullptr;
@@ -1378,9 +1236,20 @@ GnssModel_t GPS::probe(int serialSpeed)
}
}
}
+ if (strncmp(info.hwVersion, "00040007", 8) == 0) {
+ return GNSS_MODEL_UBLOX6;
+ } else if (strncmp(info.hwVersion, "00070000", 8) == 0) {
+ return GNSS_MODEL_UBLOX7;
+ } else if (strncmp(info.hwVersion, "00080000", 8) == 0) {
+ return GNSS_MODEL_UBLOX8;
+ } else if (strncmp(info.hwVersion, "00190000", 8) == 0) {
+ return GNSS_MODEL_UBLOX9;
+ } else if (strncmp(info.hwVersion, "000A0000", 8) == 0) {
+ return GNSS_MODEL_UBLOX10;
+ }
}
- return GNSS_MODEL_UBLOX;
+ return GNSS_MODEL_UNKNOWN;
}
GPS *GPS::createGps()
@@ -1464,6 +1333,9 @@ GPS *GPS::createGps()
LOG_DEBUG("Using GPIO%d for GPS RX\n", new_gps->rx_gpio);
LOG_DEBUG("Using GPIO%d for GPS TX\n", new_gps->tx_gpio);
_serial_gps->begin(GPS_BAUDRATE, SERIAL_8N1, new_gps->rx_gpio, new_gps->tx_gpio);
+#elif defined(ARCH_RP2040)
+ _serial_gps->setFIFOSize(256);
+ _serial_gps->begin(GPS_BAUDRATE);
#else
_serial_gps->begin(GPS_BAUDRATE);
#endif
@@ -1551,16 +1423,15 @@ bool GPS::lookForTime()
#ifdef GNSS_AIROHA
uint8_t fix = reader.fixQuality();
- uint32_t now = millis();
if (fix > 0) {
if (lastFixStartMsec > 0) {
- if ((now - lastFixStartMsec) < GPS_FIX_HOLD_TIME) {
+ if (Throttle::isWithinTimespanMs(lastFixStartMsec, GPS_FIX_HOLD_TIME)) {
return false;
} else {
clearBuffer();
}
} else {
- lastFixStartMsec = now;
+ lastFixStartMsec = millis();
return false;
}
} else {
@@ -1575,7 +1446,7 @@ The Unix epoch (or Unix time or POSIX time or Unix timestamp) is the number of s
(midnight UTC/GMT), not counting leap seconds (in ISO 8601: 1970-01-01T00:00:00Z).
*/
struct tm t;
- t.tm_sec = ti.second();
+ t.tm_sec = ti.second() + round(ti.age() / 1000);
t.tm_min = ti.minute();
t.tm_hour = ti.hour();
t.tm_mday = d.day();
@@ -1583,8 +1454,8 @@ The Unix epoch (or Unix time or POSIX time or Unix timestamp) is the number of s
t.tm_year = d.year() - 1900;
t.tm_isdst = false;
if (t.tm_mon > -1) {
- LOG_DEBUG("NMEA GPS time %02d-%02d-%02d %02d:%02d:%02d\n", d.year(), d.month(), t.tm_mday, t.tm_hour, t.tm_min,
- t.tm_sec);
+ LOG_DEBUG("NMEA GPS time %02d-%02d-%02d %02d:%02d:%02d age %d\n", d.year(), d.month(), t.tm_mday, t.tm_hour, t.tm_min,
+ t.tm_sec, ti.age());
perhapsSetRTC(RTCQualityGPS, t);
return true;
} else
@@ -1604,16 +1475,15 @@ bool GPS::lookForLocation()
#ifdef GNSS_AIROHA
if ((config.position.gps_update_interval * 1000) >= (GPS_FIX_HOLD_TIME * 2)) {
uint8_t fix = reader.fixQuality();
- uint32_t now = millis();
if (fix > 0) {
if (lastFixStartMsec > 0) {
- if ((now - lastFixStartMsec) < GPS_FIX_HOLD_TIME) {
+ if (Throttle::isWithinTimespanMs(lastFixStartMsec, GPS_FIX_HOLD_TIME)) {
return false;
} else {
clearBuffer();
}
} else {
- lastFixStartMsec = now;
+ lastFixStartMsec = millis();
return false;
}
} else {
diff --git a/src/gps/GPS.h b/src/gps/GPS.h
index c0e9fb8b6..317d80544 100644
--- a/src/gps/GPS.h
+++ b/src/gps/GPS.h
@@ -26,11 +26,16 @@ struct uBloxGnssModelInfo {
typedef enum {
GNSS_MODEL_ATGM336H,
GNSS_MODEL_MTK,
- GNSS_MODEL_UBLOX,
+ GNSS_MODEL_UBLOX6,
+ GNSS_MODEL_UBLOX7,
+ GNSS_MODEL_UBLOX8,
+ GNSS_MODEL_UBLOX9,
+ GNSS_MODEL_UBLOX10,
GNSS_MODEL_UC6580,
GNSS_MODEL_UNKNOWN,
GNSS_MODEL_MTK_L76B,
- GNSS_MODEL_AG3335
+ GNSS_MODEL_AG3335,
+ GNSS_MODEL_AG3352
} GnssModel_t;
typedef enum {
@@ -101,7 +106,7 @@ class GPS : private concurrency::OSThread
public:
/** If !NULL we will use this serial port to construct our GPS */
-#if defined(RPI_PICO_WAVESHARE)
+#if defined(ARCH_RP2040)
static SerialUART *_serial_gps;
#else
static HardwareSerial *_serial_gps;
@@ -129,6 +134,7 @@ class GPS : private concurrency::OSThread
static const uint8_t _message_GGA[];
static const uint8_t _message_PMS[];
static const uint8_t _message_SAVE[];
+ static const uint8_t _message_SAVE_10[];
// VALSET Commands for M10
static const uint8_t _message_VALSET_PM[];
@@ -297,7 +303,6 @@ class GPS : private concurrency::OSThread
virtual int32_t runOnce() override;
// Get GNSS model
- String getNMEA();
GnssModel_t probe(int serialSpeed);
// delay counter to allow more sats before fixed position stops GPS thread
diff --git a/src/gps/RTC.cpp b/src/gps/RTC.cpp
index 070038672..d9ac56b74 100644
--- a/src/gps/RTC.cpp
+++ b/src/gps/RTC.cpp
@@ -2,6 +2,7 @@
#include "configuration.h"
#include "detect/ScanI2C.h"
#include "main.h"
+#include
#include
#include
@@ -29,7 +30,7 @@ void readFromRTC()
if (rtc_found.address == RV3028_RTC) {
uint32_t now = millis();
Melopero_RV3028 rtc;
-#ifdef I2C_SDA1
+#if WIRE_INTERFACES_COUNT == 2
rtc.initI2C(rtc_found.port == ScanI2C::I2CPort::WIRE1 ? Wire1 : Wire);
#else
rtc.initI2C();
@@ -43,7 +44,10 @@ void readFromRTC()
t.tm_sec = rtc.getSecond();
tv.tv_sec = gm_mktime(&t);
tv.tv_usec = 0;
- LOG_DEBUG("Read RTC time from RV3028 as %ld\n", tv.tv_sec);
+
+ uint32_t printableEpoch = tv.tv_sec; // Print lib only supports 32 bit but time_t can be 64 bit on some platforms
+ LOG_DEBUG("Read RTC time from RV3028 getTime as %02d-%02d-%02d %02d:%02d:%02d (%ld)\n", t.tm_year + 1900, t.tm_mon + 1,
+ t.tm_mday, t.tm_hour, t.tm_min, t.tm_sec, printableEpoch);
timeStartMsec = now;
zeroOffsetSecs = tv.tv_sec;
if (currentQuality == RTCQualityNone) {
@@ -55,7 +59,7 @@ void readFromRTC()
uint32_t now = millis();
PCF8563_Class rtc;
-#ifdef I2C_SDA1
+#if WIRE_INTERFACES_COUNT == 2
rtc.begin(rtc_found.port == ScanI2C::I2CPort::WIRE1 ? Wire1 : Wire);
#else
rtc.begin();
@@ -71,7 +75,10 @@ void readFromRTC()
t.tm_sec = tc.second;
tv.tv_sec = gm_mktime(&t);
tv.tv_usec = 0;
- LOG_DEBUG("Read RTC time from PCF8563 as %ld\n", tv.tv_sec);
+
+ uint32_t printableEpoch = tv.tv_sec; // Print lib only supports 32 bit but time_t can be 64 bit on some platforms
+ LOG_DEBUG("Read RTC time from PCF8563 getDateTime as %02d-%02d-%02d %02d:%02d:%02d (%ld)\n", t.tm_year + 1900,
+ t.tm_mon + 1, t.tm_mday, t.tm_hour, t.tm_min, t.tm_sec, printableEpoch);
timeStartMsec = now;
zeroOffsetSecs = tv.tv_sec;
if (currentQuality == RTCQualityNone) {
@@ -81,7 +88,8 @@ void readFromRTC()
#else
if (!gettimeofday(&tv, NULL)) {
uint32_t now = millis();
- LOG_DEBUG("Read RTC time as %ld\n", tv.tv_sec);
+ uint32_t printableEpoch = tv.tv_sec; // Print lib only supports 32 bit but time_t can be 64 bit on some platforms
+ LOG_DEBUG("Read RTC time as %ld\n", printableEpoch);
timeStartMsec = now;
zeroOffsetSecs = tv.tv_sec;
}
@@ -101,6 +109,13 @@ bool perhapsSetRTC(RTCQuality q, const struct timeval *tv, bool forceUpdate)
{
static uint32_t lastSetMsec = 0;
uint32_t now = millis();
+ uint32_t printableEpoch = tv->tv_sec; // Print lib only supports 32 bit but time_t can be 64 bit on some platforms
+#ifdef BUILD_EPOCH
+ if (tv->tv_sec < BUILD_EPOCH) {
+ LOG_WARN("Ignoring time (%ld) before build epoch (%ld)!\n", printableEpoch, BUILD_EPOCH);
+ return false;
+ }
+#endif
bool shouldSet;
if (forceUpdate) {
@@ -110,10 +125,13 @@ bool perhapsSetRTC(RTCQuality q, const struct timeval *tv, bool forceUpdate)
} else if (q > currentQuality) {
shouldSet = true;
LOG_DEBUG("Upgrading time to quality %s\n", RtcName(q));
- } else if (q >= RTCQualityNTP && (now - lastSetMsec) > (12 * 60 * 60 * 1000UL)) {
- // Every 12 hrs we will slam in a new GPS or Phone GPS / NTP time, to correct for local RTC clock drift
+ } else if (q == RTCQualityGPS) {
shouldSet = true;
- LOG_DEBUG("Reapplying external time to correct clock drift %ld secs\n", tv->tv_sec);
+ LOG_DEBUG("Reapplying GPS time: %ld secs\n", printableEpoch);
+ } else if (q == RTCQualityNTP && !Throttle::isWithinTimespanMs(lastSetMsec, (12 * 60 * 60 * 1000UL))) {
+ // Every 12 hrs we will slam in a new NTP or Phone GPS / NTP time, to correct for local RTC clock drift
+ shouldSet = true;
+ LOG_DEBUG("Reapplying external time to correct clock drift %ld secs\n", printableEpoch);
} else {
shouldSet = false;
LOG_DEBUG("Current RTC quality: %s. Ignoring time of RTC quality of %s\n", RtcName(currentQuality), RtcName(q));
@@ -133,29 +151,29 @@ bool perhapsSetRTC(RTCQuality q, const struct timeval *tv, bool forceUpdate)
#ifdef RV3028_RTC
if (rtc_found.address == RV3028_RTC) {
Melopero_RV3028 rtc;
-#ifdef I2C_SDA1
+#if WIRE_INTERFACES_COUNT == 2
rtc.initI2C(rtc_found.port == ScanI2C::I2CPort::WIRE1 ? Wire1 : Wire);
#else
rtc.initI2C();
#endif
tm *t = gmtime(&tv->tv_sec);
rtc.setTime(t->tm_year + 1900, t->tm_mon + 1, t->tm_wday, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec);
- LOG_DEBUG("RV3028_RTC setTime %02d-%02d-%02d %02d:%02d:%02d %ld\n", t->tm_year + 1900, t->tm_mon + 1, t->tm_mday,
- t->tm_hour, t->tm_min, t->tm_sec, tv->tv_sec);
+ LOG_DEBUG("RV3028_RTC setTime %02d-%02d-%02d %02d:%02d:%02d (%ld)\n", t->tm_year + 1900, t->tm_mon + 1, t->tm_mday,
+ t->tm_hour, t->tm_min, t->tm_sec, printableEpoch);
}
#elif defined(PCF8563_RTC)
if (rtc_found.address == PCF8563_RTC) {
PCF8563_Class rtc;
-#ifdef I2C_SDA1
+#if WIRE_INTERFACES_COUNT == 2
rtc.begin(rtc_found.port == ScanI2C::I2CPort::WIRE1 ? Wire1 : Wire);
#else
rtc.begin();
#endif
tm *t = gmtime(&tv->tv_sec);
rtc.setDateTime(t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec);
- LOG_DEBUG("PCF8563_RTC setDateTime %02d-%02d-%02d %02d:%02d:%02d %ld\n", t->tm_year + 1900, t->tm_mon + 1, t->tm_mday,
- t->tm_hour, t->tm_min, t->tm_sec, tv->tv_sec);
+ LOG_DEBUG("PCF8563_RTC setDateTime %02d-%02d-%02d %02d:%02d:%02d (%ld)\n", t->tm_year + 1900, t->tm_mon + 1,
+ t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec, printableEpoch);
}
#elif defined(ARCH_ESP32)
settimeofday(tv, NULL);
@@ -272,4 +290,4 @@ time_t gm_mktime(struct tm *tm)
#else
return mktime(tm);
#endif
-}
\ No newline at end of file
+}
diff --git a/src/gps/ubx.h b/src/gps/ubx.h
index 0852c331d..c73a7efb3 100644
--- a/src/gps/ubx.h
+++ b/src/gps/ubx.h
@@ -1,3 +1,10 @@
+#define SEND_UBX_PACKET(TYPE, ID, DATA, ERRMSG, TIMEOUT) \
+ msglen = makeUBXPacket(TYPE, ID, sizeof(DATA), DATA); \
+ _serial_gps->write(UBXscratch, msglen); \
+ if (getACK(TYPE, ID, TIMEOUT) != GNSS_RESPONSE_OK) { \
+ LOG_WARN(#ERRMSG); \
+ }
+
// Power Management
uint8_t GPS::_message_PMREQ[] PROGMEM = {
@@ -316,6 +323,13 @@ const uint8_t GPS::_message_SAVE[] = {
0x17 // deviceMask: BBR, Flash, EEPROM, and SPI Flash
};
+const uint8_t GPS::_message_SAVE_10[] = {
+ 0x00, 0x00, 0x00, 0x00, // clearMask: no sections cleared
+ 0xFF, 0xFF, 0x00, 0x00, // saveMask: save all sections
+ 0x00, 0x00, 0x00, 0x00, // loadMask: no sections loaded
+ 0x01 // deviceMask: only save to BBR
+};
+
// As the M10 has no flash, the best we can do to preserve the config is to set it in RAM and BBR.
// BBR will survive a restart, and power off for a while, but modules with small backup
// batteries or super caps will not retain the config for a long power off time.
@@ -335,36 +349,36 @@ const uint8_t GPS::_message_SAVE[] = {
// has details on low-power modes
/*
-CFG-PM2 has been replaced by many CFG-PM commands
-CFG-PMS has been removed
-
-CFG-PM-OPERATEMODE E1 (0 | 1 | 2) -> 1 (PSMOO), because sporadic position updates are required instead of continous tracking <10s
-(PSMCT) CFG-PM-POSUPDATEPERIOD U4 -> 0ms, no self-timed wakup because receiver power mode is controlled via "software standby
-mode" by legacy UBX-RXM-PMREQ request CFG-PM-ACQPERIOD U4 -> 0ms, because receiver power mode is controlled via "software standby
-mode" by legacy UBX-RXM-PMREQ request CFG-PM-ONTIME U4 -> 0ms, optional I guess CFG-PM-EXTINTBACKUP L -> 1, force receiver into
-BACKUP mode when EXTINT (should be connected to GPS_EN_PIN) pin is "low"
-
-This is required because the receiver never enters low power mode if microcontroller is in deep-sleep.
-Maybe the changing UART_RX levels trigger a wakeup but even with UBX-RXM-PMREQ[12] = 0x00 (all external wakeup sources disabled)
-the receivcer remains in aquisition state -> potentially a bug
-
-Workaround: Control the EXTINT pin by the GPS_EN_PIN signal
-
-As mentioned in the M10 operational issues down below, power save won't allow the use of BDS B1C.
-CFG-SIGNAL-BDS_B1C_ENA L -> 0
+OPERATEMODE E1 2 (0 | 1 | 2)
+POSUPDATEPERIOD U4 5
+ACQPERIOD U4 10
+GRIDOFFSET U4 0
+ONTIME U2 1
+MINACQTIME U1 0
+MAXACQTIME U1 0
+DONOTENTEROFF L 1
+WAITTIMEFIX L 1
+UPDATEEPH L 1
+EXTINTWAKE L 0 no ext ints
+EXTINTBACKUP L 0 no ext ints
+EXTINTINACTIVE L 0 no ext ints
+EXTINTACTIVITY U4 0 no ext ints
+LIMITPEAKCURRENT L 1
// Ram layer config message:
-// 01 01 00 00 01 00 D0 20 01 02 00 D0 40 00 00 00 00 03 00 D0 40 00 00 00 00 05 00 D0 30 00 00 0D 00 D0 10 01
+// b5 62 06 8a 26 00 00 01 00 00 01 00 d0 20 02 02 00 d0 40 05 00 00 00 05 00 d0 30 01 00 08 00 d0 10 01 09 00 d0 10 01 10 00 d0
+// 10 01 8b de
// BBR layer config message:
-// 01 02 00 00 01 00 D0 20 01 02 00 D0 40 00 00 00 00 03 00 D0 40 00 00 00 00 05 00 D0 30 00 00 0D 00 D0 10 01
+// b5 62 06 8a 26 00 00 02 00 00 01 00 d0 20 02 02 00 d0 40 05 00 00 00 05 00 d0 30 01 00 08 00 d0 10 01 09 00 d0 10 01 10 00 d0
+// 10 01 8c 03
*/
-const uint8_t GPS::_message_VALSET_PM_RAM[] = {0x01, 0x01, 0x00, 0x00, 0x0F, 0x00, 0x31, 0x10, 0x00, 0x01, 0x00, 0xD0, 0x20, 0x01,
- 0x02, 0x00, 0xD0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0xD0, 0x40, 0x00, 0x00,
- 0x00, 0x00, 0x05, 0x00, 0xD0, 0x30, 0x00, 0x00, 0x0D, 0x00, 0xD0, 0x10, 0x01};
-const uint8_t GPS::_message_VALSET_PM_BBR[] = {0x01, 0x02, 0x00, 0x00, 0x0F, 0x00, 0x31, 0x10, 0x00, 0x01, 0x00, 0xD0, 0x20, 0x01,
- 0x02, 0x00, 0xD0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0xD0, 0x40, 0x00, 0x00,
- 0x00, 0x00, 0x05, 0x00, 0xD0, 0x30, 0x00, 0x00, 0x0D, 0x00, 0xD0, 0x10, 0x01};
+const uint8_t GPS::_message_VALSET_PM_RAM[] = {0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0xd0, 0x20, 0x02, 0x02, 0x00, 0xd0, 0x40,
+ 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0xd0, 0x30, 0x01, 0x00, 0x08, 0x00, 0xd0,
+ 0x10, 0x01, 0x09, 0x00, 0xd0, 0x10, 0x01, 0x10, 0x00, 0xd0, 0x10, 0x01};
+const uint8_t GPS::_message_VALSET_PM_BBR[] = {0x00, 0x02, 0x00, 0x00, 0x01, 0x00, 0xd0, 0x20, 0x02, 0x02, 0x00, 0xd0, 0x40,
+ 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0xd0, 0x30, 0x01, 0x00, 0x08, 0x00, 0xd0,
+ 0x10, 0x01, 0x09, 0x00, 0xd0, 0x10, 0x01, 0x10, 0x00, 0xd0, 0x10, 0x01};
/*
CFG-ITFM replaced by 5 valset messages which can be combined into one for RAM and one for BBR
diff --git a/src/graphics/EInkDynamicDisplay.cpp b/src/graphics/EInkDynamicDisplay.cpp
index c31941a60..ca994b2c9 100644
--- a/src/graphics/EInkDynamicDisplay.cpp
+++ b/src/graphics/EInkDynamicDisplay.cpp
@@ -1,3 +1,4 @@
+#include "Throttle.h"
#include "configuration.h"
#if defined(USE_EINK) && defined(USE_EINK_DYNAMICDISPLAY)
@@ -231,15 +232,13 @@ void EInkDynamicDisplay::checkForPromotion()
// Is it too soon for another frame of this type?
void EInkDynamicDisplay::checkRateLimiting()
{
- uint32_t now = millis();
-
// Sanity check: millis() overflow - just let the update run..
- if (previousRunMs > now)
+ if (previousRunMs > millis())
return;
// Skip update: too soon for BACKGROUND
if (frameFlags == BACKGROUND) {
- if (now - previousRunMs < EINK_LIMIT_RATE_BACKGROUND_SEC * 1000) {
+ if (Throttle::isWithinTimespanMs(previousRunMs, EINK_LIMIT_RATE_BACKGROUND_SEC * 1000)) {
refresh = SKIPPED;
reason = EXCEEDED_RATELIMIT_FULL;
return;
@@ -252,7 +251,7 @@ void EInkDynamicDisplay::checkRateLimiting()
// Skip update: too soon for RESPONSIVE
if (frameFlags & RESPONSIVE) {
- if (now - previousRunMs < EINK_LIMIT_RATE_RESPONSIVE_SEC * 1000) {
+ if (Throttle::isWithinTimespanMs(previousRunMs, EINK_LIMIT_RATE_RESPONSIVE_SEC * 1000)) {
refresh = SKIPPED;
reason = EXCEEDED_RATELIMIT_FAST;
LOG_DEBUG("refresh=SKIPPED, reason=EXCEEDED_RATELIMIT_FAST, frameFlags=0x%x\n", frameFlags);
diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp
index 04fe73e44..4f6a5a45f 100644
--- a/src/graphics/Screen.cpp
+++ b/src/graphics/Screen.cpp
@@ -22,6 +22,7 @@ along with this program. If not, see .
#include "Screen.h"
#include "../userPrefs.h"
#include "PowerMon.h"
+#include "Throttle.h"
#include "configuration.h"
#if HAS_SCREEN
#include
@@ -47,6 +48,7 @@ along with this program. If not, see .
#include "modules/AdminModule.h"
#include "modules/ExternalNotificationModule.h"
#include "modules/TextMessageModule.h"
+#include "modules/WaypointModule.h"
#include "sleep.h"
#include "target_specific.h"
@@ -56,10 +58,11 @@ along with this program. If not, see .
#ifdef ARCH_ESP32
#include "esp_task_wdt.h"
-#include "modules/esp32/StoreForwardModule.h"
+#include "modules/StoreForwardModule.h"
#endif
#if ARCH_PORTDUINO
+#include "modules/StoreForwardModule.h"
#include "platform/portduino/PortduinoGlue.h"
#endif
@@ -117,6 +120,7 @@ static bool heartbeat = false;
#define SCREEN_HEIGHT display->getHeight()
#include "graphics/ScreenFonts.h"
+#include
#define getStringCenteredX(s) ((SCREEN_WIDTH - display->getStringWidth(s)) / 2)
@@ -1004,55 +1008,55 @@ static void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state
display->setColor(WHITE);
#ifndef EXCLUDE_EMOJI
- if (strcmp(reinterpret_cast(mp.decoded.payload.bytes), u8"\U0001F44D") == 0) {
+ if (strcmp(reinterpret_cast(mp.decoded.payload.bytes), "\U0001F44D") == 0) {
display->drawXbm(x + (SCREEN_WIDTH - thumbs_width) / 2,
y + (SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM - thumbs_height) / 2 + 2 + 5, thumbs_width, thumbs_height,
thumbup);
- } else if (strcmp(reinterpret_cast(mp.decoded.payload.bytes), u8"\U0001F44E") == 0) {
+ } else if (strcmp(reinterpret_cast(mp.decoded.payload.bytes), "\U0001F44E") == 0) {
display->drawXbm(x + (SCREEN_WIDTH - thumbs_width) / 2,
y + (SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM - thumbs_height) / 2 + 2 + 5, thumbs_width, thumbs_height,
thumbdown);
- } else if (strcmp(reinterpret_cast(mp.decoded.payload.bytes), u8"❓") == 0) {
+ } else if (strcmp(reinterpret_cast(mp.decoded.payload.bytes), "❓") == 0) {
display->drawXbm(x + (SCREEN_WIDTH - question_width) / 2,
y + (SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM - question_height) / 2 + 2 + 5, question_width, question_height,
question);
- } else if (strcmp(reinterpret_cast(mp.decoded.payload.bytes), u8"‼️") == 0) {
+ } else if (strcmp(reinterpret_cast(mp.decoded.payload.bytes), "‼️") == 0) {
display->drawXbm(x + (SCREEN_WIDTH - bang_width) / 2, y + (SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM - bang_height) / 2 + 2 + 5,
bang_width, bang_height, bang);
- } else if (strcmp(reinterpret_cast(mp.decoded.payload.bytes), u8"\U0001F4A9") == 0) {
+ } else if (strcmp(reinterpret_cast(mp.decoded.payload.bytes), "\U0001F4A9") == 0) {
display->drawXbm(x + (SCREEN_WIDTH - poo_width) / 2, y + (SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM - poo_height) / 2 + 2 + 5,
poo_width, poo_height, poo);
} else if (strcmp(reinterpret_cast(mp.decoded.payload.bytes), "\xf0\x9f\xa4\xa3") == 0) {
display->drawXbm(x + (SCREEN_WIDTH - haha_width) / 2, y + (SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM - haha_height) / 2 + 2 + 5,
haha_width, haha_height, haha);
- } else if (strcmp(reinterpret_cast(mp.decoded.payload.bytes), u8"\U0001F44B") == 0) {
+ } else if (strcmp(reinterpret_cast(mp.decoded.payload.bytes), "\U0001F44B") == 0) {
display->drawXbm(x + (SCREEN_WIDTH - wave_icon_width) / 2,
y + (SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM - wave_icon_height) / 2 + 2 + 5, wave_icon_width,
wave_icon_height, wave_icon);
- } else if (strcmp(reinterpret_cast(mp.decoded.payload.bytes), u8"\U0001F920") == 0) {
+ } else if (strcmp(reinterpret_cast(mp.decoded.payload.bytes), "\U0001F920") == 0) {
display->drawXbm(x + (SCREEN_WIDTH - cowboy_width) / 2,
y + (SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM - cowboy_height) / 2 + 2 + 5, cowboy_width, cowboy_height,
cowboy);
- } else if (strcmp(reinterpret_cast(mp.decoded.payload.bytes), u8"\U0001F42D") == 0) {
+ } else if (strcmp(reinterpret_cast(mp.decoded.payload.bytes), "\U0001F42D") == 0) {
display->drawXbm(x + (SCREEN_WIDTH - deadmau5_width) / 2,
y + (SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM - deadmau5_height) / 2 + 2 + 5, deadmau5_width, deadmau5_height,
deadmau5);
- } else if (strcmp(reinterpret_cast(mp.decoded.payload.bytes), u8"\xE2\x98\x80\xEF\xB8\x8F") == 0) {
+ } else if (strcmp(reinterpret_cast(mp.decoded.payload.bytes), "\xE2\x98\x80\xEF\xB8\x8F") == 0) {
display->drawXbm(x + (SCREEN_WIDTH - sun_width) / 2, y + (SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM - sun_height) / 2 + 2 + 5,
sun_width, sun_height, sun);
- } else if (strcmp(reinterpret_cast(mp.decoded.payload.bytes), u8"\u2614") == 0) {
+ } else if (strcmp(reinterpret_cast(mp.decoded.payload.bytes), "\u2614") == 0) {
display->drawXbm(x + (SCREEN_WIDTH - rain_width) / 2, y + (SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM - rain_height) / 2 + 2 + 10,
rain_width, rain_height, rain);
- } else if (strcmp(reinterpret_cast(mp.decoded.payload.bytes), u8"☁️") == 0) {
+ } else if (strcmp(reinterpret_cast(mp.decoded.payload.bytes), "☁️") == 0) {
display->drawXbm(x + (SCREEN_WIDTH - cloud_width) / 2,
y + (SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM - cloud_height) / 2 + 2 + 5, cloud_width, cloud_height, cloud);
- } else if (strcmp(reinterpret_cast(mp.decoded.payload.bytes), u8"🌫️") == 0) {
+ } else if (strcmp(reinterpret_cast(mp.decoded.payload.bytes), "🌫️") == 0) {
display->drawXbm(x + (SCREEN_WIDTH - fog_width) / 2, y + (SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM - fog_height) / 2 + 2 + 5,
fog_width, fog_height, fog);
- } else if (strcmp(reinterpret_cast(mp.decoded.payload.bytes), u8"\xf0\x9f\x98\x88") == 0) {
+ } else if (strcmp(reinterpret_cast(mp.decoded.payload.bytes), "\xf0\x9f\x98\x88") == 0) {
display->drawXbm(x + (SCREEN_WIDTH - devil_width) / 2,
y + (SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM - devil_height) / 2 + 2 + 5, devil_width, devil_height, devil);
- } else if (strcmp(reinterpret_cast(mp.decoded.payload.bytes), u8"♥️") == 0) {
+ } else if (strcmp(reinterpret_cast(mp.decoded.payload.bytes), "♥️") == 0) {
display->drawXbm(x + (SCREEN_WIDTH - heart_width) / 2,
y + (SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM - heart_height) / 2 + 2 + 5, heart_width, heart_height, heart);
} else {
@@ -1093,8 +1097,8 @@ static void drawNodes(OLEDDisplay *display, int16_t x, int16_t y, const NodeStat
{
char usersString[20];
snprintf(usersString, sizeof(usersString), "%d/%d", nodeStatus->getNumOnline(), nodeStatus->getNumTotal());
-#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS) || defined(USE_ST7789) || \
- defined(HX8357_CS)) && \
+#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) || defined(ST7789_CS) || \
+ defined(USE_ST7789) || defined(HX8357_CS)) && \
!defined(DISPLAY_FORCE_SMALL_FONTS)
display->drawFastImage(x, y + 3, 8, 8, imgUser);
#else
@@ -1285,8 +1289,8 @@ static int8_t prevFrame = -1;
// Draw the arrow pointing to a node's location
void Screen::drawNodeHeading(OLEDDisplay *display, int16_t compassX, int16_t compassY, uint16_t compassDiam, float headingRadian)
{
- Point tip(0.0f, 0.5f), tail(0.0f, -0.5f); // pointing up initially
- float arrowOffsetX = 0.2f, arrowOffsetY = 0.2f;
+ Point tip(0.0f, 0.5f), tail(0.0f, -0.35f); // pointing up initially
+ float arrowOffsetX = 0.14f, arrowOffsetY = 1.0f;
Point leftArrow(tip.x - arrowOffsetX, tip.y - arrowOffsetY), rightArrow(tip.x + arrowOffsetX, tip.y - arrowOffsetY);
Point *arrowPoints[] = {&tip, &tail, &leftArrow, &rightArrow};
@@ -1296,9 +1300,19 @@ void Screen::drawNodeHeading(OLEDDisplay *display, int16_t compassX, int16_t com
arrowPoints[i]->scale(compassDiam * 0.6);
arrowPoints[i]->translate(compassX, compassY);
}
+ /* Old arrow
display->drawLine(tip.x, tip.y, tail.x, tail.y);
display->drawLine(leftArrow.x, leftArrow.y, tip.x, tip.y);
display->drawLine(rightArrow.x, rightArrow.y, tip.x, tip.y);
+ display->drawLine(leftArrow.x, leftArrow.y, tail.x, tail.y);
+ display->drawLine(rightArrow.x, rightArrow.y, tail.x, tail.y);
+ */
+#ifdef USE_EINK
+ display->drawTriangle(tip.x, tip.y, rightArrow.x, rightArrow.y, tail.x, tail.y);
+#else
+ display->fillTriangle(tip.x, tip.y, rightArrow.x, rightArrow.y, tail.x, tail.y);
+#endif
+ display->drawTriangle(tip.x, tip.y, leftArrow.x, leftArrow.y, tail.x, tail.y);
}
// Get a string representation of the time passed since something happened
@@ -1336,22 +1350,27 @@ void Screen::drawCompassNorth(OLEDDisplay *display, int16_t compassX, int16_t co
// If north is supposed to be at the top of the compass we want rotation to be +0
if (config.display.compass_north_top)
myHeading = -0;
-
- Point N1(-0.04f, 0.65f), N2(0.04f, 0.65f);
+ /* N sign points currently not deleted*/
+ Point N1(-0.04f, 0.65f), N2(0.04f, 0.65f); // N sign points (N1-N4)
Point N3(-0.04f, 0.55f), N4(0.04f, 0.55f);
- Point *rosePoints[] = {&N1, &N2, &N3, &N4};
+ Point NC1(0.00f, 0.50f); // north circle center point
+ Point *rosePoints[] = {&N1, &N2, &N3, &N4, &NC1};
uint16_t compassDiam = Screen::getCompassDiam(SCREEN_WIDTH, SCREEN_HEIGHT);
- for (int i = 0; i < 4; i++) {
+ for (int i = 0; i < 5; i++) {
// North on compass will be negative of heading
rosePoints[i]->rotate(-myHeading);
rosePoints[i]->scale(compassDiam);
rosePoints[i]->translate(compassX, compassY);
}
+
+ /* changed the N sign to a small circle on the compass circle.
display->drawLine(N1.x, N1.y, N3.x, N3.y);
display->drawLine(N2.x, N2.y, N4.x, N4.y);
display->drawLine(N1.x, N1.y, N4.x, N4.y);
+ */
+ display->drawCircle(NC1.x, NC1.y, 4); // North sign circle, 4px radius is sufficient for all displays.
}
uint16_t Screen::getCompassDiam(uint32_t displayWidth, uint32_t displayHeight)
@@ -1515,7 +1534,8 @@ Screen::Screen(ScanI2C::DeviceAddress address, meshtastic_Config_DisplayConfig_O
#elif defined(USE_SSD1306)
dispdev = new SSD1306Wire(address.address, -1, -1, geometry,
(address.port == ScanI2C::I2CPort::WIRE1) ? HW_I2C::I2C_TWO : HW_I2C::I2C_ONE);
-#elif defined(ST7735_CS) || defined(ILI9341_DRIVER) || defined(ST7789_CS) || defined(RAK14014) || defined(HX8357_CS)
+#elif defined(ST7735_CS) || defined(ILI9341_DRIVER) || defined(ST7701_CS) || defined(ST7789_CS) || defined(RAK14014) || \
+ defined(HX8357_CS)
dispdev = new TFTDisplay(address.address, -1, -1, geometry,
(address.port == ScanI2C::I2CPort::WIRE1) ? HW_I2C::I2C_TWO : HW_I2C::I2C_ONE);
#elif defined(USE_EINK) && !defined(USE_EINK_DYNAMICDISPLAY)
@@ -1654,6 +1674,11 @@ void Screen::setup()
static_cast(dispdev)->setSubtype(7);
#endif
+#if defined(USE_ST7789) && defined(TFT_MESH)
+ // Heltec T114 and T190: honor a custom text color, if defined in variant.h
+ static_cast(dispdev)->setRGB(TFT_MESH);
+#endif
+
// Initialising the UI will init the display too.
ui->init();
@@ -1707,8 +1732,11 @@ void Screen::setup()
// Standard behaviour is to FLIP the screen (needed on T-Beam). If this config item is set, unflip it, and thereby logically
// flip it. If you have a headache now, you're welcome.
if (!config.display.flip_screen) {
-#if defined(ST7735_CS) || defined(ILI9341_DRIVER) || defined(ST7789_CS) || defined(RAK14014) || defined(HX8357_CS)
+#if defined(ST7701_CS) || defined(ST7735_CS) || defined(ILI9341_DRIVER) || defined(ST7701_CS) || defined(ST7789_CS) || \
+ defined(RAK14014) || defined(HX8357_CS)
static_cast(dispdev)->flipScreenVertically();
+#elif defined(USE_ST7789)
+ static_cast(dispdev)->flipScreenVertically();
#else
dispdev->flipScreenVertically();
#endif
@@ -1766,6 +1794,11 @@ void Screen::forceDisplay(bool forceUiUpdate)
#ifdef USE_EINK
// If requested, make sure queued commands are run, and UI has rendered a new frame
if (forceUiUpdate) {
+ // Force a display refresh, in addition to the UI update
+ // Changing the GPS status bar icon apparently doesn't register as a change in image
+ // (False negative of the image hashing algorithm used to skip identical frames)
+ EINK_ADD_FRAMEFLAG(dispdev, DEMAND_FAST);
+
// No delay between UI frame rendering
setFastFramerate();
@@ -1920,7 +1953,7 @@ int32_t Screen::runOnce()
if (showingNormalScreen) {
// standard screen loop handling here
if (config.display.auto_screen_carousel_secs > 0 &&
- (millis() - lastScreenTransition) > (config.display.auto_screen_carousel_secs * 1000)) {
+ !Throttle::isWithinTimespanMs(lastScreenTransition, config.display.auto_screen_carousel_secs * 1000)) {
// If an E-Ink display struggles with fast refresh, force carousel to use full refresh instead
// Carousel is potentially a major source of E-Ink display wear
@@ -2081,8 +2114,13 @@ void Screen::setFrames(FrameFocus focus)
// Check if the module being drawn has requested focus
// We will honor this request later, if setFrames was triggered by a UIFrameEvent
MeshModule *m = *i;
- if (m->isRequestingFocus())
+ if (m->isRequestingFocus()) {
fsi.positions.focusedModule = numframes;
+ }
+
+ // Identify the position of specific modules, if we need to know this later
+ if (m == waypointModule)
+ fsi.positions.waypoint = numframes;
numframes++;
}
@@ -2101,8 +2139,8 @@ void Screen::setFrames(FrameFocus focus)
#endif
// If we have a text message - show it next, unless it's a phone message and we aren't using any special modules
- fsi.positions.textMessage = numframes;
if (devicestate.has_rx_text_message && shouldDrawMessage(&devicestate.rx_text_message)) {
+ fsi.positions.textMessage = numframes;
normalFrames[numframes++] = drawTextMessageFrame;
}
@@ -2164,7 +2202,7 @@ void Screen::setFrames(FrameFocus focus)
case FOCUS_PRESERVE:
// If we can identify which type of frame "originalPosition" was, can move directly to it in the new frameset
- FramesetInfo &oldFsi = this->framesetInfo;
+ const FramesetInfo &oldFsi = this->framesetInfo;
if (originalPosition == oldFsi.positions.log)
ui->switchToFrame(fsi.positions.log);
else if (originalPosition == oldFsi.positions.settings)
@@ -2204,6 +2242,31 @@ void Screen::setFrameImmediateDraw(FrameCallback *drawFrames)
setFastFramerate();
}
+// Dismisses the currently displayed screen frame, if possible
+// Relevant for text message, waypoint, others in future?
+// Triggered with a CardKB keycombo
+void Screen::dismissCurrentFrame()
+{
+ uint8_t currentFrame = ui->getUiState()->currentFrame;
+ bool dismissed = false;
+
+ if (currentFrame == framesetInfo.positions.textMessage && devicestate.has_rx_text_message) {
+ LOG_INFO("Dismissing Text Message\n");
+ devicestate.has_rx_text_message = false;
+ dismissed = true;
+ }
+
+ else if (currentFrame == framesetInfo.positions.waypoint && devicestate.has_rx_waypoint) {
+ LOG_DEBUG("Dismissing Waypoint\n");
+ devicestate.has_rx_waypoint = false;
+ dismissed = true;
+ }
+
+ // If we did make changes to dismiss, we now need to regenerate the frameset
+ if (dismissed)
+ setFrames();
+}
+
void Screen::handleStartFirmwareUpdateScreen()
{
LOG_DEBUG("showing firmware screen\n");
@@ -2413,10 +2476,10 @@ void DebugInfo::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
// Draw our hardware ID to assist with bluetooth pairing. Either prefix with Info or S&F Logo
if (moduleConfig.store_forward.enabled) {
#ifdef ARCH_ESP32
- if (millis() - storeForwardModule->lastHeartbeat >
- (storeForwardModule->heartbeatInterval * 1200)) { // no heartbeat, overlap a bit
-#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS) || defined(USE_ST7789) || \
- defined(HX8357_CS)) && \
+ if (!Throttle::isWithinTimespanMs(storeForwardModule->lastHeartbeat,
+ (storeForwardModule->heartbeatInterval * 1200))) { // no heartbeat, overlap a bit
+#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) || defined(ST7789_CS) || \
+ defined(USE_ST7789) || defined(HX8357_CS)) && \
!defined(DISPLAY_FORCE_SMALL_FONTS)
display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(ourId), y + 3 + FONT_HEIGHT_SMALL, 12, 8,
imgQuestionL1);
@@ -2427,8 +2490,8 @@ void DebugInfo::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
imgQuestion);
#endif
} else {
-#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS) || defined(USE_ST7789) || \
- defined(HX8357_CS)) && \
+#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) || defined(ST7789_CS) || \
+ defined(USE_ST7789) || defined(HX8357_CS)) && \
!defined(DISPLAY_FORCE_SMALL_FONTS)
display->drawFastImage(x + SCREEN_WIDTH - 18 - display->getStringWidth(ourId), y + 3 + FONT_HEIGHT_SMALL, 16, 8,
imgSFL1);
@@ -2442,8 +2505,8 @@ void DebugInfo::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
#endif
} else {
// TODO: Raspberry Pi supports more than just the one screen size
-#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS) || defined(USE_ST7789) || \
- defined(HX8357_CS) || ARCH_PORTDUINO) && \
+#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) || defined(ST7789_CS) || \
+ defined(USE_ST7789) || defined(HX8357_CS) || ARCH_PORTDUINO) && \
!defined(DISPLAY_FORCE_SMALL_FONTS)
display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(ourId), y + 3 + FONT_HEIGHT_SMALL, 12, 8,
imgInfoL1);
@@ -2716,12 +2779,23 @@ int Screen::handleInputEvent(const InputEvent *event)
}
#endif
- if (showingNormalScreen && moduleFrames.size() == 0) {
- // LOG_DEBUG("Screen::handleInputEvent from %s\n", event->source);
- if (event->inputEvent == static_cast(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_LEFT)) {
- showPrevFrame();
- } else if (event->inputEvent == static_cast(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT)) {
- showNextFrame();
+ // Use left or right input from a keyboard to move between frames,
+ // so long as a mesh module isn't using these events for some other purpose
+ if (showingNormalScreen) {
+
+ // Ask any MeshModules if they're handling keyboard input right now
+ bool inputIntercepted = false;
+ for (MeshModule *module : moduleFrames) {
+ if (module->interceptingKeyboardInput())
+ inputIntercepted = true;
+ }
+
+ // If no modules are using the input, move between frames
+ if (!inputIntercepted) {
+ if (event->inputEvent == static_cast(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_LEFT))
+ showPrevFrame();
+ else if (event->inputEvent == static_cast(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT))
+ showNextFrame();
}
}
diff --git a/src/graphics/Screen.h b/src/graphics/Screen.h
index 021b11bda..b2e6e905b 100644
--- a/src/graphics/Screen.h
+++ b/src/graphics/Screen.h
@@ -454,6 +454,9 @@ class Screen : public concurrency::OSThread
void setWelcomeFrames();
+ // Dismiss the currently focussed frame, if possible (e.g. text message, waypoint)
+ void dismissCurrentFrame();
+
#ifdef USE_EINK
/// Draw an image to remain on E-Ink display after screen off
void setScreensaverFrames(FrameCallback einkScreensaver = NULL);
@@ -503,11 +506,14 @@ class Screen : public concurrency::OSThread
void handleStartFirmwareUpdateScreen();
// Info collected by setFrames method.
- // Index location of specific frames. Used to apply the FrameFocus parameter of setFrames
+ // Index location of specific frames.
+ // - Used to apply the FrameFocus parameter of setFrames
+ // - Used to dismiss the currently shown frame (txt; waypoint) by CardKB combo
struct FramesetInfo {
struct FramePositions {
uint8_t fault = 0;
uint8_t textMessage = 0;
+ uint8_t waypoint = 0;
uint8_t focusedModule = 0;
uint8_t log = 0;
uint8_t settings = 0;
diff --git a/src/graphics/ScreenFonts.h b/src/graphics/ScreenFonts.h
index 267f6e0a8..34c832635 100644
--- a/src/graphics/ScreenFonts.h
+++ b/src/graphics/ScreenFonts.h
@@ -12,8 +12,8 @@
#include "graphics/fonts/OLEDDisplayFontsUA.h"
#endif
-#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS) || defined(USE_ST7789) || \
- defined(HX8357_CS)) && \
+#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) || defined(ST7789_CS) || \
+ defined(USE_ST7789) || defined(HX8357_CS)) && \
!defined(DISPLAY_FORCE_SMALL_FONTS)
// The screen is bigger so use bigger fonts
#define FONT_SMALL ArialMT_Plain_16 // Height: 19
diff --git a/src/graphics/TFTDisplay.cpp b/src/graphics/TFTDisplay.cpp
index 2849dd9a9..c0326abec 100644
--- a/src/graphics/TFTDisplay.cpp
+++ b/src/graphics/TFTDisplay.cpp
@@ -500,10 +500,126 @@ class LGFX : public lgfx::LGFX_Device
static LGFX *tft = nullptr;
+#elif defined(ST7701_CS)
+#include // Graphics and font library for ST7701 driver chip
+#include
+#include
+
+class LGFX : public lgfx::LGFX_Device
+{
+ lgfx::Panel_ST7701 _panel_instance;
+ lgfx::Bus_RGB _bus_instance;
+ lgfx::Light_PWM _light_instance;
+ lgfx::Touch_FT5x06 _touch_instance;
+
+ public:
+ LGFX(void)
+ {
+ {
+ auto cfg = _panel_instance.config();
+ cfg.memory_width = 800;
+ cfg.memory_height = 480;
+ cfg.panel_width = TFT_WIDTH;
+ cfg.panel_height = TFT_HEIGHT;
+ cfg.offset_x = TFT_OFFSET_X;
+ cfg.offset_y = TFT_OFFSET_Y;
+ _panel_instance.config(cfg);
+ }
+
+ {
+ auto cfg = _panel_instance.config_detail();
+ cfg.pin_cs = ST7701_CS;
+ cfg.pin_sclk = ST7701_SCK;
+ cfg.pin_mosi = ST7701_SDA;
+ // cfg.use_psram = 1;
+ _panel_instance.config_detail(cfg);
+ }
+
+ {
+ auto cfg = _bus_instance.config();
+ cfg.panel = &_panel_instance;
+#ifdef SENSECAP_INDICATOR
+ cfg.pin_d0 = GPIO_NUM_15; // B0
+ cfg.pin_d1 = GPIO_NUM_14; // B1
+ cfg.pin_d2 = GPIO_NUM_13; // B2
+ cfg.pin_d3 = GPIO_NUM_12; // B3
+ cfg.pin_d4 = GPIO_NUM_11; // B4
+
+ cfg.pin_d5 = GPIO_NUM_10; // G0
+ cfg.pin_d6 = GPIO_NUM_9; // G1
+ cfg.pin_d7 = GPIO_NUM_8; // G2
+ cfg.pin_d8 = GPIO_NUM_7; // G3
+ cfg.pin_d9 = GPIO_NUM_6; // G4
+ cfg.pin_d10 = GPIO_NUM_5; // G5
+
+ cfg.pin_d11 = GPIO_NUM_4; // R0
+ cfg.pin_d12 = GPIO_NUM_3; // R1
+ cfg.pin_d13 = GPIO_NUM_2; // R2
+ cfg.pin_d14 = GPIO_NUM_1; // R3
+ cfg.pin_d15 = GPIO_NUM_0; // R4
+
+ cfg.pin_henable = GPIO_NUM_18;
+ cfg.pin_vsync = GPIO_NUM_17;
+ cfg.pin_hsync = GPIO_NUM_16;
+ cfg.pin_pclk = GPIO_NUM_21;
+ cfg.freq_write = 12000000;
+
+ cfg.hsync_polarity = 0;
+ cfg.hsync_front_porch = 10;
+ cfg.hsync_pulse_width = 8;
+ cfg.hsync_back_porch = 50;
+
+ cfg.vsync_polarity = 0;
+ cfg.vsync_front_porch = 10;
+ cfg.vsync_pulse_width = 8;
+ cfg.vsync_back_porch = 20;
+
+ cfg.pclk_active_neg = 0;
+ cfg.de_idle_high = 1;
+ cfg.pclk_idle_high = 0;
+#endif
+ _bus_instance.config(cfg);
+ }
+ _panel_instance.setBus(&_bus_instance);
+
+ {
+ auto cfg = _light_instance.config();
+ cfg.pin_bl = ST7701_BL;
+ _light_instance.config(cfg);
+ }
+ _panel_instance.light(&_light_instance);
+
+ {
+ auto cfg = _touch_instance.config();
+ cfg.pin_cs = -1;
+ cfg.x_min = 0;
+ cfg.x_max = 479;
+ cfg.y_min = 0;
+ cfg.y_max = 479;
+ cfg.pin_int = -1; // don't use SCREEN_TOUCH_INT;
+ cfg.pin_rst = SCREEN_TOUCH_RST;
+ cfg.bus_shared = true;
+ cfg.offset_rotation = TFT_OFFSET_ROTATION;
+
+ cfg.i2c_port = TOUCH_I2C_PORT;
+ cfg.i2c_addr = TOUCH_SLAVE_ADDRESS;
+ cfg.pin_sda = I2C_SDA;
+ cfg.pin_scl = I2C_SCL;
+ cfg.freq = 400000;
+ _touch_instance.config(cfg);
+ _panel_instance.setTouch(&_touch_instance);
+ }
+
+ setPanel(&_panel_instance);
+ }
+};
+
+static LGFX *tft = nullptr;
+
#endif
-#if defined(ST7735_CS) || defined(ST7789_CS) || defined(ILI9341_DRIVER) || defined(RAK14014) || defined(HX8357_CS) || \
- (ARCH_PORTDUINO && HAS_SCREEN != 0)
+#if defined(ST7701_CS) || defined(ST7735_CS) || defined(ST7789_CS) || defined(ILI9341_DRIVER) || defined(RAK14014) || \
+ defined(HX8357_CS) || (ARCH_PORTDUINO && HAS_SCREEN != 0)
#include "SPILock.h"
#include "TFTDisplay.h"
#include
@@ -709,7 +825,6 @@ bool TFTDisplay::connect()
#ifdef UNPHONE
unphone.backlight(true); // using unPhone library
- LOG_INFO("Power to TFT Backlight\n");
#endif
tft->init();
@@ -725,7 +840,7 @@ bool TFTDisplay::connect()
attachInterrupt(digitalPinToInterrupt(SCREEN_TOUCH_INT), rak14014_tpIntHandle, FALLING);
#elif defined(T_DECK) || defined(PICOMPUTER_S3) || defined(CHATTER_2)
tft->setRotation(1); // T-Deck has the TFT in landscape
-#elif defined(T_WATCH_S3)
+#elif defined(T_WATCH_S3) || defined(SENSECAP_INDICATOR)
tft->setRotation(2); // T-Watch S3 left-handed orientation
#else
tft->setRotation(3); // Orient horizontal and wide underneath the silkscreen name label
diff --git a/src/graphics/images.h b/src/graphics/images.h
index ab3767a89..7028f18e3 100644
--- a/src/graphics/images.h
+++ b/src/graphics/images.h
@@ -20,8 +20,8 @@ const uint8_t bluetoothConnectedIcon[36] PROGMEM = {0xfe, 0x01, 0xff, 0x03, 0x03
0xfe, 0x31, 0x00, 0x30, 0x30, 0x30, 0x30, 0x30, 0xf0, 0x3f, 0xe0, 0x1f};
#endif
-#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS) || defined(ST7789_CS) || defined(USE_ST7789) || \
- defined(HX8357_CS) || ARCH_PORTDUINO) && \
+#if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) || defined(ST7789_CS) || \
+ defined(USE_ST7789) || defined(HX8357_CS) || ARCH_PORTDUINO) && \
!defined(DISPLAY_FORCE_SMALL_FONTS)
const uint8_t imgQuestionL1[] PROGMEM = {0xff, 0x01, 0x01, 0x32, 0x7b, 0x49, 0x49, 0x6f, 0x26, 0x01, 0x01, 0xff};
const uint8_t imgQuestionL2[] PROGMEM = {0x0f, 0x08, 0x08, 0x08, 0x06, 0x0f, 0x0f, 0x06, 0x08, 0x08, 0x08, 0x0f};
diff --git a/src/input/ExpressLRSFiveWay.cpp b/src/input/ExpressLRSFiveWay.cpp
index c444800ba..af4433dae 100644
--- a/src/input/ExpressLRSFiveWay.cpp
+++ b/src/input/ExpressLRSFiveWay.cpp
@@ -1,5 +1,5 @@
-
#include "ExpressLRSFiveWay.h"
+#include "Throttle.h"
#ifdef INPUTBROKER_EXPRESSLRSFIVEWAY_TYPE
@@ -76,11 +76,10 @@ void ExpressLRSFiveWay::update(int *keyValue, bool *keyLongPressed)
*keyValue = NO_PRESS;
int newKey = readKey();
- uint32_t now = millis();
if (keyInProcess == NO_PRESS) {
// New key down
if (newKey != NO_PRESS) {
- keyDownStart = now;
+ keyDownStart = millis();
// DBGLN("down=%u", newKey);
}
} else {
@@ -88,7 +87,7 @@ void ExpressLRSFiveWay::update(int *keyValue, bool *keyLongPressed)
if (newKey == NO_PRESS) {
// DBGLN("up=%u", keyInProcess);
if (!isLongPressed) {
- if ((now - keyDownStart) > KEY_DEBOUNCE_MS) {
+ if (!Throttle::isWithinTimespanMs(keyDownStart, KEY_DEBOUNCE_MS)) {
*keyValue = keyInProcess;
*keyLongPressed = false;
}
@@ -101,7 +100,7 @@ void ExpressLRSFiveWay::update(int *keyValue, bool *keyLongPressed)
}
// else still pressing, waiting for long if not already signaled
else if (!isLongPressed) {
- if ((now - keyDownStart) > KEY_LONG_PRESS_MS) {
+ if (!Throttle::isWithinTimespanMs(keyDownStart, KEY_LONG_PRESS_MS)) {
*keyValue = keyInProcess;
*keyLongPressed = true;
isLongPressed = true;
diff --git a/src/input/InputBroker.h b/src/input/InputBroker.h
index 57c25af4b..17c621c8a 100644
--- a/src/input/InputBroker.h
+++ b/src/input/InputBroker.h
@@ -4,6 +4,21 @@
#define ANYKEY 0xFF
#define MATRIXKEY 0xFE
+#define INPUT_BROKER_MSG_BRIGHTNESS_UP 0x11
+#define INPUT_BROKER_MSG_BRIGHTNESS_DOWN 0x12
+#define INPUT_BROKER_MSG_REBOOT 0x90
+#define INPUT_BROKER_MSG_SHUTDOWN 0x9b
+#define INPUT_BROKER_MSG_GPS_TOGGLE 0x9e
+#define INPUT_BROKER_MSG_MUTE_TOGGLE 0xac
+#define INPUT_BROKER_MSG_SEND_PING 0xaf
+#define INPUT_BROKER_MSG_DISMISS_FRAME 0x8b
+#define INPUT_BROKER_MSG_LEFT 0xb4
+#define INPUT_BROKER_MSG_UP 0xb5
+#define INPUT_BROKER_MSG_DOWN 0xb6
+#define INPUT_BROKER_MSG_RIGHT 0xb7
+#define INPUT_BROKER_MSG_FN_SYMBOL_ON 0xf1
+#define INPUT_BROKER_MSG_FN_SYMBOL_OFF 0xf2
+
typedef struct _InputEvent {
const char *source;
char inputEvent;
diff --git a/src/input/LinuxInput.cpp b/src/input/LinuxInput.cpp
index 6194195ed..57a87b0ef 100644
--- a/src/input/LinuxInput.cpp
+++ b/src/input/LinuxInput.cpp
@@ -147,11 +147,11 @@ int32_t LinuxInput::runOnce()
case KEY_LEFT: // Left
e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_LEFT;
break;
- e.kbchar = 0xb4;
+ e.kbchar = INPUT_BROKER_MSG_LEFT;
case KEY_RIGHT: // Right
e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT;
break;
- e.kbchar = 0xb7;
+ e.kbchar = INPUT_BROKER_MSG_RIGHT;
case KEY_ENTER: // Enter
e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_SELECT;
break;
diff --git a/src/input/ScanAndSelect.cpp b/src/input/ScanAndSelect.cpp
index d693d768c..65ca7e332 100644
--- a/src/input/ScanAndSelect.cpp
+++ b/src/input/ScanAndSelect.cpp
@@ -6,6 +6,7 @@
#include "ScanAndSelect.h"
#include "modules/CannedMessageModule.h"
+#include
// Config
static const char name[] = "scanAndSelect"; // should match "allow input source" string
@@ -75,7 +76,7 @@ int32_t ScanAndSelectInput::runOnce()
else {
// Duration enough for long press
// Long press not yet fired (prevent repeat firing while held)
- if (!longPressFired && now - downSinceMs > durationLongMs) {
+ if (!longPressFired && Throttle::isWithinTimespanMs(downSinceMs, durationLongMs)) {
longPressFired = true;
longPress();
}
@@ -91,7 +92,7 @@ int32_t ScanAndSelectInput::runOnce()
// Long press event didn't already fire
if (held && !longPressFired) {
// Duration enough for short press
- if (now - downSinceMs > durationShortMs) {
+ if (!Throttle::isWithinTimespanMs(downSinceMs, durationShortMs)) {
shortPress();
}
}
diff --git a/src/input/SerialKeyboard.cpp b/src/input/SerialKeyboard.cpp
index fa3eb2528..4827e8995 100644
--- a/src/input/SerialKeyboard.cpp
+++ b/src/input/SerialKeyboard.cpp
@@ -1,5 +1,6 @@
#include "SerialKeyboard.h"
#include "configuration.h"
+#include
#ifdef INPUTBROKER_SERIAL_TYPE
#define CANNED_MESSAGE_MODULE_ENABLE 1 // in case it's not set in the variant file
@@ -73,7 +74,7 @@ int32_t SerialKeyboard::runOnce()
// Serial.print ("X");
// Serial.println (shiftRegister2, BIN);
- if (millis() - lastPressTime > 500) {
+ if (!Throttle::isWithinTimespanMs(lastPressTime, 500)) {
quickPress = 0;
}
@@ -87,7 +88,7 @@ int32_t SerialKeyboard::runOnce()
e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_UP;
} else if (!(shiftRegister2 & (1 << 2))) {
e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT;
- e.kbchar = 0xb7;
+ e.kbchar = INPUT_BROKER_MSG_RIGHT;
} else if (!(shiftRegister2 & (1 << 1))) {
e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_SELECT;
} else if (!(shiftRegister2 & (1 << 0))) {
diff --git a/src/input/cardKbI2cImpl.cpp b/src/input/cardKbI2cImpl.cpp
index 88554ed3b..fc3203406 100644
--- a/src/input/cardKbI2cImpl.cpp
+++ b/src/input/cardKbI2cImpl.cpp
@@ -13,14 +13,14 @@ void CardKbI2cImpl::init()
disable();
return;
}
-#ifndef ARCH_PORTDUINO
+#if !MESHTASTIC_EXCLUDE_I2C && !defined(ARCH_PORTDUINO)
if (cardkb_found.address == 0x00) {
LOG_DEBUG("Rescanning for I2C keyboard\n");
uint8_t i2caddr_scan[] = {CARDKB_ADDR, TDECK_KB_ADDR, BBQ10_KB_ADDR};
uint8_t i2caddr_asize = 3;
auto i2cScanner = std::unique_ptr(new ScanI2CTwoWire());
-#if defined(I2C_SDA1)
+#if WIRE_INTERFACES_COUNT == 2
i2cScanner->scanPort(ScanI2C::I2CPort::WIRE1, i2caddr_scan, i2caddr_asize);
#endif
i2cScanner->scanPort(ScanI2C::I2CPort::WIRE, i2caddr_scan, i2caddr_asize);
@@ -61,4 +61,4 @@ void CardKbI2cImpl::init()
}
#endif
inputBroker->registerSource(this);
-}
+}
\ No newline at end of file
diff --git a/src/input/kbI2cBase.cpp b/src/input/kbI2cBase.cpp
index 024b16b9e..4fbca76e5 100644
--- a/src/input/kbI2cBase.cpp
+++ b/src/input/kbI2cBase.cpp
@@ -33,7 +33,7 @@ int32_t KbI2cBase::runOnce()
if (!i2cBus) {
switch (cardkb_found.port) {
case ScanI2C::WIRE1:
-#ifdef I2C_SDA1
+#if WIRE_INTERFACES_COUNT == 2
LOG_DEBUG("Using I2C Bus 1 (the second one)\n");
i2cBus = &Wire1;
if (cardkb_found.address == BBQ10_KB_ADDR) {
@@ -94,7 +94,7 @@ int32_t KbI2cBase::runOnce()
case 'e': // sym e
if (is_sym) {
e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_UP;
- e.kbchar = 0xb5;
+ e.kbchar = INPUT_BROKER_MSG_UP;
is_sym = false; // reset sym state after second keypress
} else {
e.inputEvent = ANYKEY;
@@ -104,7 +104,7 @@ int32_t KbI2cBase::runOnce()
case 'x': // sym x
if (is_sym) {
e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_DOWN;
- e.kbchar = 0xb6;
+ e.kbchar = INPUT_BROKER_MSG_DOWN;
is_sym = false; // reset sym state after second keypress
} else {
e.inputEvent = ANYKEY;
@@ -134,8 +134,8 @@ int32_t KbI2cBase::runOnce()
case 0x13: // Code scanner says the SYM key is 0x13
is_sym = !is_sym;
e.inputEvent = ANYKEY;
- e.kbchar =
- is_sym ? 0xf1 : 0xf2; // send 0xf1 to tell CannedMessages to display that the modifier key is active
+ e.kbchar = is_sym ? INPUT_BROKER_MSG_FN_SYMBOL_ON // send 0xf1 to tell CannedMessages to display that
+ : INPUT_BROKER_MSG_FN_SYMBOL_OFF; // the modifier key is active
break;
case 0x0a: // apparently Enter on Q10 is a line feed instead of carriage return
e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_SELECT;
@@ -214,7 +214,7 @@ int32_t KbI2cBase::runOnce()
if (is_sym) {
is_sym = false;
e.inputEvent = ANYKEY;
- e.kbchar = 0xac; // mute notifications
+ e.kbchar = INPUT_BROKER_MSG_MUTE_TOGGLE; // mute notifications
} else {
e.inputEvent = ANYKEY;
e.kbchar = c;
@@ -224,7 +224,7 @@ int32_t KbI2cBase::runOnce()
if (is_sym) {
is_sym = false;
e.inputEvent = ANYKEY;
- e.kbchar = 0x11; // Increase Brightness code
+ e.kbchar = INPUT_BROKER_MSG_BRIGHTNESS_UP; // Increase Brightness code
} else {
e.inputEvent = ANYKEY;
e.kbchar = c;
@@ -234,7 +234,7 @@ int32_t KbI2cBase::runOnce()
if (is_sym) {
is_sym = false;
e.inputEvent = ANYKEY;
- e.kbchar = 0x12; // Decrease Brightness code
+ e.kbchar = INPUT_BROKER_MSG_BRIGHTNESS_DOWN; // Decrease Brightness code
} else {
e.inputEvent = ANYKEY;
e.kbchar = c;
@@ -244,7 +244,7 @@ int32_t KbI2cBase::runOnce()
if (is_sym) {
is_sym = false;
e.inputEvent = ANYKEY;
- e.kbchar = 0xaf; // (fn + space)
+ e.kbchar = INPUT_BROKER_MSG_SEND_PING; // (fn + space)
} else {
e.inputEvent = ANYKEY;
e.kbchar = c;
@@ -254,7 +254,7 @@ int32_t KbI2cBase::runOnce()
if (is_sym) {
is_sym = false;
e.inputEvent = ANYKEY;
- e.kbchar = 0x9e;
+ e.kbchar = INPUT_BROKER_MSG_GPS_TOGGLE;
} else {
e.inputEvent = ANYKEY;
e.kbchar = c;
@@ -269,32 +269,34 @@ int32_t KbI2cBase::runOnce()
break;
case 0xb5: // Up
e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_UP;
- e.kbchar = 0xb5;
+ e.kbchar = INPUT_BROKER_MSG_UP;
break;
case 0xb6: // Down
e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_DOWN;
- e.kbchar = 0xb6;
+ e.kbchar = INPUT_BROKER_MSG_DOWN;
break;
case 0xb4: // Left
e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_LEFT;
- e.kbchar = 0xb4;
+ e.kbchar = INPUT_BROKER_MSG_LEFT;
break;
case 0xb7: // Right
e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT;
- e.kbchar = 0xb7;
+ e.kbchar = INPUT_BROKER_MSG_RIGHT;
break;
case 0xc: // Modifier key: 0xc is alt+c (Other options could be: 0xea = shift+mic button or 0x4 shift+$(speaker))
// toggle moddifiers button.
is_sym = !is_sym;
e.inputEvent = ANYKEY;
- e.kbchar = is_sym ? 0xf1 : 0xf2; // send 0xf1 to tell CannedMessages to display that the modifier key is active
+ e.kbchar = is_sym ? INPUT_BROKER_MSG_FN_SYMBOL_ON // send 0xf1 to tell CannedMessages to display that the
+ : INPUT_BROKER_MSG_FN_SYMBOL_OFF; // modifier key is active
break;
- case 0x90: // fn+r
+ case 0x90: // fn+r INPUT_BROKER_MSG_REBOOT
case 0x91: // fn+t
- case 0x9b: // fn+s
- case 0xac: // fn+m
- case 0x9e: // fn+g
- case 0xaf: // fn+space
+ case 0x9b: // fn+s INPUT_BROKER_MSG_SHUTDOWN
+ case 0xac: // fn+m INPUT_BROKER_MSG_MUTE_TOGGLE
+ case 0x9e: // fn+g INPUT_BROKER_MSG_GPS_TOGGLE
+ case 0xaf: // fn+space INPUT_BROKER_MSG_SEND_PING
+ case 0x8b: // fn+del INPUT_BROKEN_MSG_DISMISS_FRAME
// just pass those unmodified
e.inputEvent = ANYKEY;
e.kbchar = c;
diff --git a/src/main.cpp b/src/main.cpp
index 46eca046f..405143dd6 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -11,16 +11,16 @@
#include "airtime.h"
#include "buzz.h"
-#include "error.h"
-#include "power.h"
-// #include "debug.h"
#include "FSCommon.h"
#include "Led.h"
#include "RTC.h"
#include "SPILock.h"
+#include "Throttle.h"
#include "concurrency/OSThread.h"
#include "concurrency/Periodic.h"
#include "detect/ScanI2C.h"
+#include "error.h"
+#include "power.h"
#if !MESHTASTIC_EXCLUDE_I2C
#include "detect/ScanI2CTwoWire.h"
@@ -32,13 +32,13 @@
#include "graphics/Screen.h"
#include "main.h"
#include "mesh/generated/meshtastic/config.pb.h"
+#include "meshUtils.h"
#include "modules/Modules.h"
#include "shutdown.h"
#include "sleep.h"
#include "target_specific.h"
#include
#include
-// #include
#ifdef ARCH_ESP32
#if !MESHTASTIC_EXCLUDE_WEBSERVER
@@ -72,6 +72,7 @@ NRF52Bluetooth *nrf52Bluetooth = nullptr;
#include "LLCC68Interface.h"
#include "LR1110Interface.h"
#include "LR1120Interface.h"
+#include "LR1121Interface.h"
#include "RF95Interface.h"
#include "SX1262Interface.h"
#include "SX1268Interface.h"
@@ -102,8 +103,8 @@ NRF52Bluetooth *nrf52Bluetooth = nullptr;
#include "AmbientLightingThread.h"
#include "PowerFSMThread.h"
-#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
-#include "AccelerometerThread.h"
+#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C
+#include "motion/AccelerometerThread.h"
AccelerometerThread *accelerometerThread = nullptr;
#endif
@@ -322,15 +323,19 @@ void setup()
#ifdef BUTTON_PIN
#ifdef ARCH_ESP32
- // If the button is connected to GPIO 12, don't enable the ability to use
- // meshtasticAdmin on the device.
- pinMode(config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN, INPUT);
-
+#if ESP_ARDUINO_VERSION_MAJOR >= 3
+#ifdef BUTTON_NEED_PULLUP
+ pinMode(config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN, INPUT_PULLUP);
+#else
+ pinMode(config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN, INPUT); // default to BUTTON_PIN
+#endif
+#else
+ pinMode(config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN, INPUT); // default to BUTTON_PIN
#ifdef BUTTON_NEED_PULLUP
gpio_pullup_en((gpio_num_t)(config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN));
delay(10);
#endif
-
+#endif
#endif
#endif
@@ -360,6 +365,8 @@ void setup()
Wire1.begin();
#elif defined(I2C_SDA1) && !defined(ARCH_RP2040)
Wire1.begin(I2C_SDA1, I2C_SCL1);
+#elif WIRE_INTERFACES_COUNT == 2
+ Wire1.begin();
#endif
#if defined(I2C_SDA) && defined(ARCH_RP2040)
@@ -390,7 +397,7 @@ void setup()
#endif
#ifdef AQ_SET_PIN
- // RAK-12039 set pin for Air quality sensor
+ // RAK-12039 set pin for Air quality sensor. Detectable on I2C after ~3 seconds, so we need to rescan later
pinMode(AQ_SET_PIN, OUTPUT);
digitalWrite(AQ_SET_PIN, HIGH);
#endif
@@ -427,6 +434,8 @@ void setup()
#elif defined(I2C_SDA1) && !defined(ARCH_RP2040)
Wire1.begin(I2C_SDA1, I2C_SCL1);
i2cScanner->scanPort(ScanI2C::I2CPort::WIRE1);
+#elif defined(NRF52840_XXAA) && (WIRE_INTERFACES_COUNT == 2)
+ i2cScanner->scanPort(ScanI2C::I2CPort::WIRE1);
#endif
#if defined(I2C_SDA) && defined(ARCH_RP2040)
@@ -555,6 +564,7 @@ void setup()
SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::INA260, meshtastic_TelemetrySensorType_INA260)
SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::INA219, meshtastic_TelemetrySensorType_INA219)
SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::INA3221, meshtastic_TelemetrySensorType_INA3221)
+ SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::MAX17048, meshtastic_TelemetrySensorType_MAX17048)
SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::MCP9808, meshtastic_TelemetrySensorType_MCP9808)
SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::MCP9808, meshtastic_TelemetrySensorType_MCP9808)
SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::SHT31, meshtastic_TelemetrySensorType_SHT31)
@@ -563,6 +573,7 @@ void setup()
SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::QMC6310, meshtastic_TelemetrySensorType_QMC6310)
SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::QMI8658, meshtastic_TelemetrySensorType_QMI8658)
SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::QMC5883L, meshtastic_TelemetrySensorType_QMC5883L)
+ SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::HMC5883L, meshtastic_TelemetrySensorType_QMC5883L)
SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::PMSA0031, meshtastic_TelemetrySensorType_PMSA003I)
SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::RCWL9620, meshtastic_TelemetrySensorType_RCWL9620)
SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::VEML7700, meshtastic_TelemetrySensorType_VEML7700)
@@ -572,6 +583,7 @@ void setup()
SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::SHT4X, meshtastic_TelemetrySensorType_SHT4X)
SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::AHT10, meshtastic_TelemetrySensorType_AHT10)
SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::DFROBOT_LARK, meshtastic_TelemetrySensorType_DFROBOT_LARK)
+ SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::ICM20948, meshtastic_TelemetrySensorType_ICM20948)
i2cScanner.reset();
#endif
@@ -589,6 +601,9 @@ void setup()
// Hello
printInfo();
+#ifdef BUILD_EPOCH
+ LOG_INFO("Build timestamp: %ld\n", BUILD_EPOCH);
+#endif
#ifdef ARCH_ESP32
esp32Setup();
@@ -620,7 +635,13 @@ void setup()
buttonThread = new ButtonThread();
#endif
- playStartMelody();
+ // only play start melody when role is not tracker or sensor
+ if (config.power.is_power_saving == true &&
+ IS_ONE_OF(config.device.role, meshtastic_Config_DeviceConfig_Role_TRACKER,
+ meshtastic_Config_DeviceConfig_Role_TAK_TRACKER, meshtastic_Config_DeviceConfig_Role_SENSOR))
+ LOG_DEBUG("Tracker/Sensor: Skipping start melody\n");
+ else
+ playStartMelody();
// fixed screen override?
if (config.display.oled != meshtastic_Config_DisplayConfig_OledType_OLED_AUTO)
@@ -636,10 +657,8 @@ void setup()
#endif
#if !MESHTASTIC_EXCLUDE_I2C
-#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL)
if (acc_info.type != ScanI2C::DeviceType::NONE) {
- config.display.wake_on_tap_or_motion = true;
- moduleConfig.external_notification.enabled = true;
accelerometerThread = new AccelerometerThread(acc_info.type);
}
#endif
@@ -750,8 +769,8 @@ void setup()
#if !MESHTASTIC_EXCLUDE_I2C
// Don't call screen setup until after nodedb is setup (because we need
// the current region name)
-#if defined(ST7735_CS) || defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7789_CS) || defined(HX8357_CS) || \
- defined(USE_ST7789)
+#if defined(ST7701_CS) || defined(ST7735_CS) || defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7789_CS) || \
+ defined(HX8357_CS) || defined(USE_ST7789)
screen->setup();
#elif defined(ARCH_PORTDUINO)
if (screen_found.port != ScanI2C::I2CPort::NO_I2C || settingsMap[displayPanel]) {
@@ -765,12 +784,6 @@ void setup()
screen->print("Started...\n");
-#ifdef SX126X_ANT_SW
- // make analog PA vs not PA switch on SX126x eval board work properly
- pinMode(SX126X_ANT_SW, OUTPUT);
- digitalWrite(SX126X_ANT_SW, 1);
-#endif
-
#ifdef PIN_PWR_DELAY_MS
// This may be required to give the peripherals time to power up.
delay(PIN_PWR_DELAY_MS);
@@ -876,7 +889,7 @@ void setup()
#endif
#if defined(RF95_IRQ)
- if (!rIf) {
+ if ((!rIf) && (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) {
rIf = new RF95Interface(RadioLibHAL, LORA_CS, RF95_IRQ, RF95_RESET, RF95_DIO1);
if (!rIf->init()) {
LOG_WARN("Failed to find RF95 radio\n");
@@ -890,7 +903,7 @@ void setup()
#endif
#if defined(USE_SX1262) && !defined(ARCH_PORTDUINO) && !defined(TCXO_OPTIONAL)
- if (!rIf) {
+ if ((!rIf) && (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) {
rIf = new SX1262Interface(RadioLibHAL, SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY);
if (!rIf->init()) {
LOG_WARN("Failed to find SX1262 radio\n");
@@ -904,7 +917,7 @@ void setup()
#endif
#if defined(USE_SX1262) && !defined(ARCH_PORTDUINO) && defined(TCXO_OPTIONAL)
- if (!rIf) {
+ if ((!rIf) && (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) {
// Try using the specified TCXO voltage
rIf = new SX1262Interface(RadioLibHAL, SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY);
if (!rIf->init()) {
@@ -920,7 +933,7 @@ void setup()
}
}
- if (!rIf) {
+ if ((!rIf) && (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) {
// If specified TCXO voltage fails, attempt to use DIO3 as a reference instea
rIf = new SX1262Interface(RadioLibHAL, SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY);
if (!rIf->init()) {
@@ -938,7 +951,7 @@ void setup()
#endif
#if defined(USE_SX1268)
- if (!rIf) {
+ if ((!rIf) && (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) {
rIf = new SX1268Interface(RadioLibHAL, SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY);
if (!rIf->init()) {
LOG_WARN("Failed to find SX1268 radio\n");
@@ -952,7 +965,7 @@ void setup()
#endif
#if defined(USE_LLCC68)
- if (!rIf) {
+ if ((!rIf) && (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) {
rIf = new LLCC68Interface(RadioLibHAL, SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY);
if (!rIf->init()) {
LOG_WARN("Failed to find LLCC68 radio\n");
@@ -966,27 +979,43 @@ void setup()
#endif
#if defined(USE_LR1110)
- if (!rIf) {
- rIf = new LR1110Interface(RadioLibHAL, LR1110_SPI_NSS_PIN, LR1110_IRQ_PIN, LR1110_NRESER_PIN, LR1110_BUSY_PIN);
+ if ((!rIf) && (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) {
+ rIf = new LR1110Interface(RadioLibHAL, LR1110_SPI_NSS_PIN, LR1110_IRQ_PIN, LR1110_NRESET_PIN, LR1110_BUSY_PIN);
if (!rIf->init()) {
LOG_WARN("Failed to find LR1110 radio\n");
delete rIf;
rIf = NULL;
} else {
LOG_INFO("LR1110 Radio init succeeded, using LR1110 radio\n");
+ radioType = LR1110_RADIO;
}
}
#endif
#if defined(USE_LR1120)
if (!rIf) {
- rIf = new LR1120Interface(RadioLibHAL, LR1120_SPI_NSS_PIN, LR1120_IRQ_PIN, LR1120_NRESER_PIN, LR1120_BUSY_PIN);
+ rIf = new LR1120Interface(RadioLibHAL, LR1120_SPI_NSS_PIN, LR1120_IRQ_PIN, LR1120_NRESET_PIN, LR1120_BUSY_PIN);
if (!rIf->init()) {
LOG_WARN("Failed to find LR1120 radio\n");
delete rIf;
rIf = NULL;
} else {
LOG_INFO("LR1120 Radio init succeeded, using LR1120 radio\n");
+ radioType = LR1120_RADIO;
+ }
+ }
+#endif
+
+#if defined(USE_LR1121)
+ if (!rIf) {
+ rIf = new LR1121Interface(RadioLibHAL, LR1121_SPI_NSS_PIN, LR1121_IRQ_PIN, LR1121_NRESET_PIN, LR1121_BUSY_PIN);
+ if (!rIf->init()) {
+ LOG_WARN("Failed to find LR1121 radio\n");
+ delete rIf;
+ rIf = NULL;
+ } else {
+ LOG_INFO("LR1121 Radio init succeeded, using LR1121 radio\n");
+ radioType = LR1121_RADIO;
}
}
#endif
@@ -1098,6 +1127,9 @@ extern meshtastic_DeviceMetadata getDeviceMetadata()
deviceMetadata.position_flags = config.position.position_flags;
deviceMetadata.hw_model = HW_VENDOR;
deviceMetadata.hasRemoteHardware = moduleConfig.remote_hardware.enabled;
+#if !(MESHTASTIC_EXCLUDE_PKI)
+ deviceMetadata.hasPKC = true;
+#endif
return deviceMetadata;
}
#ifndef PIO_UNIT_TESTING
@@ -1105,10 +1137,6 @@ void loop()
{
runASAP = false;
- // axpDebugOutput.loop();
-
- // heap_caps_check_integrity_all(true); // FIXME - disable this expensive check
-
#ifdef ARCH_ESP32
esp32Loop();
#endif
@@ -1117,33 +1145,21 @@ void loop()
#endif
powerCommandsCheck();
- // For debugging
- // if (rIf) ((RadioLibInterface *)rIf)->isActivelyReceiving();
-
#ifdef DEBUG_STACK
static uint32_t lastPrint = 0;
- if (millis() - lastPrint > 10 * 1000L) {
+ if (!Throttle::isWithinTimespanMs(lastPrint, 10 * 1000L)) {
lastPrint = millis();
meshtastic::printThreadInfo("main");
}
#endif
- // TODO: This should go into a thread handled by FreeRTOS.
- // handleWebResponse();
-
service->loop();
long delayMsec = mainController.runOrDelay();
- /* if (mainController.nextThread && delayMsec)
- LOG_DEBUG("Next %s in %ld\n", mainController.nextThread->ThreadName.c_str(),
- mainController.nextThread->tillRun(millis())); */
-
// We want to sleep as long as possible here - because it saves power
if (!runASAP && loopCanSleep()) {
- // if(delayMsec > 100) LOG_DEBUG("sleeping %ld\n", delayMsec);
mainDelay.delay(delayMsec);
}
- // if (didWake) LOG_DEBUG("wake!\n");
}
#endif
\ No newline at end of file
diff --git a/src/main.h b/src/main.h
index 52a3fff1f..5722f7cf0 100644
--- a/src/main.h
+++ b/src/main.h
@@ -56,8 +56,8 @@ extern AudioThread *audioThread;
// Global Screen singleton.
extern graphics::Screen *screen;
-#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
-#include "AccelerometerThread.h"
+#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C
+#include "motion/AccelerometerThread.h"
extern AccelerometerThread *accelerometerThread;
#endif
@@ -86,4 +86,4 @@ void nrf52Setup(), esp32Setup(), nrf52Loop(), esp32Loop(), rp2040Setup(), clearB
meshtastic_DeviceMetadata getDeviceMetadata();
// We default to 4MHz SPI, SPI mode 0
-extern SPISettings spiSettings;
+extern SPISettings spiSettings;
\ No newline at end of file
diff --git a/src/memGet.cpp b/src/memGet.cpp
index e982ef7ee..ef1102f1e 100644
--- a/src/memGet.cpp
+++ b/src/memGet.cpp
@@ -57,6 +57,8 @@ uint32_t MemGet::getFreePsram()
{
#ifdef ARCH_ESP32
return ESP.getFreePsram();
+#elif defined(ARCH_PORTDUINO)
+ return 4194252;
#else
return 0;
#endif
@@ -71,6 +73,8 @@ uint32_t MemGet::getPsramSize()
{
#ifdef ARCH_ESP32
return ESP.getPsramSize();
+#elif defined(ARCH_PORTDUINO)
+ return 4194252;
#else
return 0;
#endif
diff --git a/src/mesh/Channels.cpp b/src/mesh/Channels.cpp
index bba7571d2..47c013443 100644
--- a/src/mesh/Channels.cpp
+++ b/src/mesh/Channels.cpp
@@ -13,10 +13,6 @@
#include "mqtt/MQTT.h"
#endif
-/// 16 bytes of random PSK for our _public_ default channel that all devices power up on (AES128)
-static const uint8_t defaultpsk[] = {0xd4, 0xf1, 0xbb, 0x3a, 0x20, 0x29, 0x07, 0x59,
- 0xf0, 0xbc, 0xff, 0xab, 0xcf, 0x4e, 0x69, 0x01};
-
Channels channels;
const char *Channels::adminChannel = "admin";
diff --git a/src/mesh/Channels.h b/src/mesh/Channels.h
index 4f87cb309..e5a750f71 100644
--- a/src/mesh/Channels.h
+++ b/src/mesh/Channels.h
@@ -129,4 +129,12 @@ class Channels
};
/// Singleton channel table
-extern Channels channels;
\ No newline at end of file
+extern Channels channels;
+
+/// 16 bytes of random PSK for our _public_ default channel that all devices power up on (AES128)
+static const uint8_t defaultpsk[] = {0xd4, 0xf1, 0xbb, 0x3a, 0x20, 0x29, 0x07, 0x59,
+ 0xf0, 0xbc, 0xff, 0xab, 0xcf, 0x4e, 0x69, 0x01};
+
+static const uint8_t eventpsk[] = {0x38, 0x4b, 0xbc, 0xc0, 0x1d, 0xc0, 0x22, 0xd1, 0x81, 0xbf, 0x36,
+ 0xb8, 0x61, 0x21, 0xe1, 0xfb, 0x96, 0xb7, 0x2e, 0x55, 0xbf, 0x74,
+ 0x22, 0x7e, 0x9d, 0x6a, 0xfb, 0x48, 0xd6, 0x4c, 0xb1, 0xa1};
\ No newline at end of file
diff --git a/src/mesh/CryptoEngine.cpp b/src/mesh/CryptoEngine.cpp
index a5322a65a..535e11e9b 100644
--- a/src/mesh/CryptoEngine.cpp
+++ b/src/mesh/CryptoEngine.cpp
@@ -70,8 +70,9 @@ bool CryptoEngine::encryptCurve25519(uint32_t toNode, uint32_t fromNode, uint64_
long extraNonceTmp = random();
auth = bytesOut + numBytes;
extraNonce = (uint32_t *)(auth + 8);
- *extraNonce = extraNonceTmp;
- LOG_INFO("Random nonce value: %d\n", *extraNonce);
+ memcpy(extraNonce, &extraNonceTmp,
+ 4); // do not use dereference on potential non aligned pointers : *extraNonce = extraNonceTmp;
+ LOG_INFO("Random nonce value: %d\n", extraNonceTmp);
meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(toNode);
if (node->num < 1 || node->user.public_key.size == 0) {
LOG_DEBUG("Node %d or their public_key not found\n", toNode);
@@ -80,14 +81,15 @@ bool CryptoEngine::encryptCurve25519(uint32_t toNode, uint32_t fromNode, uint64_
if (!crypto->setDHKey(toNode)) {
return false;
}
- initNonce(fromNode, packetNum, *extraNonce);
+ initNonce(fromNode, packetNum, extraNonceTmp);
// Calculate the shared secret with the destination node and encrypt
printBytes("Attempting encrypt using nonce: ", nonce, 13);
- printBytes("Attempting encrypt using shared_key: ", shared_key, 32);
+ printBytes("Attempting encrypt using shared_key starting with: ", shared_key, 8);
aes_ccm_ae(shared_key, 32, nonce, 8, bytes, numBytes, nullptr, 0, bytesOut,
auth); // this can write up to 15 bytes longer than numbytes past bytesOut
- *extraNonce = extraNonceTmp;
+ memcpy(extraNonce, &extraNonceTmp,
+ 4); // do not use dereference on potential non aligned pointers : *extraNonce = extraNonceTmp;
return true;
}
@@ -99,11 +101,12 @@ bool CryptoEngine::encryptCurve25519(uint32_t toNode, uint32_t fromNode, uint64_
*/
bool CryptoEngine::decryptCurve25519(uint32_t fromNode, uint64_t packetNum, size_t numBytes, uint8_t *bytes, uint8_t *bytesOut)
{
- uint8_t *auth; // set to last 8 bytes of text?
- uint32_t *extraNonce;
+ uint8_t *auth; // set to last 8 bytes of text?
+ uint32_t extraNonce; // pointer was not really used
auth = bytes + numBytes - 12;
- extraNonce = (uint32_t *)(auth + 8);
- LOG_INFO("Random nonce value: %d\n", *extraNonce);
+#ifndef PIO_UNIT_TESTING
+ memcpy(&extraNonce, auth + 8, 4); // do not use dereference on potential non aligned pointers : (uint32_t *)(auth + 8);
+ LOG_INFO("Random nonce value: %d\n", extraNonce);
meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(fromNode);
if (node == nullptr || node->num < 1 || node->user.public_key.size == 0) {
@@ -115,9 +118,10 @@ bool CryptoEngine::decryptCurve25519(uint32_t fromNode, uint64_t packetNum, size
if (!crypto->setDHKey(fromNode)) {
return false;
}
- initNonce(fromNode, packetNum, *extraNonce);
+#endif
+ initNonce(fromNode, packetNum, extraNonce);
printBytes("Attempting decrypt using nonce: ", nonce, 13);
- printBytes("Attempting decrypt using shared_key: ", shared_key, 32);
+ printBytes("Attempting decrypt using shared_key starting with: ", shared_key, 8);
return aes_ccm_ad(shared_key, 32, nonce, 8, bytes, numBytes - 12, nullptr, 0, auth, bytesOut);
}
@@ -137,11 +141,12 @@ bool CryptoEngine::setDHKey(uint32_t nodeNum)
LOG_DEBUG("Node %d or their public_key not found\n", nodeNum);
return false;
}
-
+ printBytes("Generating DH with remote pubkey: ", node->user.public_key.bytes, 32);
+ printBytes("And local pubkey: ", config.security.public_key.bytes, 32);
if (!setDHPublicKey(node->user.public_key.bytes))
return false;
- printBytes("DH Output: ", shared_key, 32);
+ // printBytes("DH Output: ", shared_key, 32);
/**
* D.J. Bernstein reccomends hashing the shared key. We want to do this because there are
@@ -166,12 +171,12 @@ bool CryptoEngine::setDHKey(uint32_t nodeNum)
void CryptoEngine::hash(uint8_t *bytes, size_t numBytes)
{
SHA256 hash;
- size_t posn, len;
+ size_t posn;
uint8_t size = numBytes;
uint8_t inc = 16;
hash.reset();
for (posn = 0; posn < size; posn += inc) {
- len = size - posn;
+ size_t len = size - posn;
if (len > inc)
len = inc;
hash.update(bytes + posn, len);
diff --git a/src/mesh/Default.h b/src/mesh/Default.h
index bafa60898..5641b5d25 100644
--- a/src/mesh/Default.h
+++ b/src/mesh/Default.h
@@ -3,6 +3,8 @@
#include
#define ONE_DAY 24 * 60 * 60
#define ONE_MINUTE_MS 60 * 1000
+#define THIRTY_SECONDS_MS 30 * 1000
+#define FIVE_SECONDS_MS 5 * 1000
#define default_gps_update_interval IF_ROUTER(ONE_DAY, 2 * 60)
#define default_telemetry_broadcast_interval_secs IF_ROUTER(ONE_DAY / 2, 30 * 60)
diff --git a/src/mesh/InterfacesTemplates.cpp b/src/mesh/InterfacesTemplates.cpp
index f2cac8028..329f0b48e 100644
--- a/src/mesh/InterfacesTemplates.cpp
+++ b/src/mesh/InterfacesTemplates.cpp
@@ -14,6 +14,7 @@ template class SX126xInterface;
template class SX128xInterface;
template class LR11x0Interface;
template class LR11x0Interface;
+template class LR11x0Interface;
#ifdef ARCH_STM32WL
template class SX126xInterface;
#endif
diff --git a/src/mesh/LR1120Interface.cpp b/src/mesh/LR1120Interface.cpp
index 94f3568f7..07e9e508d 100644
--- a/src/mesh/LR1120Interface.cpp
+++ b/src/mesh/LR1120Interface.cpp
@@ -6,4 +6,9 @@ LR1120Interface::LR1120Interface(LockingArduinoHal *hal, RADIOLIB_PIN_TYPE cs, R
RADIOLIB_PIN_TYPE busy)
: LR11x0Interface(hal, cs, irq, rst, busy)
{
+}
+
+bool LR1120Interface::wideLora()
+{
+ return true;
}
\ No newline at end of file
diff --git a/src/mesh/LR1120Interface.h b/src/mesh/LR1120Interface.h
index fc59293ec..a03fa0b20 100644
--- a/src/mesh/LR1120Interface.h
+++ b/src/mesh/LR1120Interface.h
@@ -10,4 +10,5 @@ class LR1120Interface : public LR11x0Interface
public:
LR1120Interface(LockingArduinoHal *hal, RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst,
RADIOLIB_PIN_TYPE busy);
+ bool wideLora() override;
};
\ No newline at end of file
diff --git a/src/mesh/LR1121Interface.cpp b/src/mesh/LR1121Interface.cpp
new file mode 100644
index 000000000..0d6bba6ea
--- /dev/null
+++ b/src/mesh/LR1121Interface.cpp
@@ -0,0 +1,14 @@
+#include "LR1121Interface.h"
+#include "configuration.h"
+#include "error.h"
+
+LR1121Interface::LR1121Interface(LockingArduinoHal *hal, RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst,
+ RADIOLIB_PIN_TYPE busy)
+ : LR11x0Interface(hal, cs, irq, rst, busy)
+{
+}
+
+bool LR1121Interface::wideLora()
+{
+ return true;
+}
\ No newline at end of file
diff --git a/src/mesh/LR1121Interface.h b/src/mesh/LR1121Interface.h
new file mode 100644
index 000000000..32a6f9492
--- /dev/null
+++ b/src/mesh/LR1121Interface.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#include "LR11x0Interface.h"
+
+/**
+ * Our adapter for LR1121 wideband radios
+ */
+class LR1121Interface : public LR11x0Interface
+{
+ public:
+ LR1121Interface(LockingArduinoHal *hal, RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst,
+ RADIOLIB_PIN_TYPE busy);
+ bool wideLora() override;
+};
\ No newline at end of file
diff --git a/src/mesh/LR11x0Interface.cpp b/src/mesh/LR11x0Interface.cpp
index 8f0dc062e..f0f9119ea 100644
--- a/src/mesh/LR11x0Interface.cpp
+++ b/src/mesh/LR11x0Interface.cpp
@@ -1,15 +1,32 @@
#include "LR11x0Interface.h"
+#include "Throttle.h"
#include "configuration.h"
#include "error.h"
#include "mesh/NodeDB.h"
+#ifdef LR11X0_DIO_AS_RF_SWITCH
+#include "rfswitch.h"
+#else
+static const uint32_t rfswitch_dio_pins[] = {RADIOLIB_NC, RADIOLIB_NC, RADIOLIB_NC, RADIOLIB_NC, RADIOLIB_NC};
+static const Module::RfSwitchMode_t rfswitch_table[] = {
+ {LR11x0::MODE_STBY, {}}, {LR11x0::MODE_RX, {}}, {LR11x0::MODE_TX, {}}, {LR11x0::MODE_TX_HP, {}},
+ {LR11x0::MODE_TX_HF, {}}, {LR11x0::MODE_GNSS, {}}, {LR11x0::MODE_WIFI, {}}, END_OF_MODE_TABLE,
+};
+#endif
+
#ifdef ARCH_PORTDUINO
#include "PortduinoGlue.h"
#endif
// Particular boards might define a different max power based on what their hardware can do, default to max power output if not
// specified (may be dangerous if using external PA and LR11x0 power config forgotten)
-#ifndef LR11X0_MAX_POWER
-#define LR11X0_MAX_POWER 22
+#ifndef LR1110_MAX_POWER
+#define LR1110_MAX_POWER 22
+#endif
+
+// the 2.4G part maxes at 13dBm
+
+#ifndef LR1120_MAX_POWER
+#define LR1120_MAX_POWER 13
#endif
template
@@ -45,65 +62,28 @@ template bool LR11x0Interface::init()
RadioLibInterface::init();
- if (power > LR11X0_MAX_POWER) // Clamp power to maximum defined level
- power = LR11X0_MAX_POWER;
+ if (power > LR1110_MAX_POWER) // Clamp power to maximum defined level
+ power = LR1110_MAX_POWER;
+
+ if ((power > LR1120_MAX_POWER) &&
+ (config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) // clamp again if wide freq range
+ power = LR1120_MAX_POWER;
limitPower();
-#ifdef TRACKER_T1000_E // Tracker T1000E uses DIO5, DIO6, DIO7, DIO8 for RF switching
-
- static const uint32_t rfswitch_dio_pins[] = {RADIOLIB_LR11X0_DIO5, RADIOLIB_LR11X0_DIO6, RADIOLIB_LR11X0_DIO7,
- RADIOLIB_LR11X0_DIO8, RADIOLIB_NC};
-
- static const Module::RfSwitchMode_t rfswitch_table[] = {
- // mode DIO5 DIO6 DIO7 DIO8
- {LR11x0::MODE_STBY, {LOW, LOW, LOW, LOW}}, {LR11x0::MODE_RX, {HIGH, LOW, LOW, HIGH}},
- {LR11x0::MODE_TX, {HIGH, HIGH, LOW, HIGH}}, {LR11x0::MODE_TX_HP, {LOW, HIGH, LOW, HIGH}},
- {LR11x0::MODE_TX_HF, {LOW, LOW, LOW, LOW}}, {LR11x0::MODE_GNSS, {LOW, LOW, HIGH, LOW}},
- {LR11x0::MODE_WIFI, {LOW, LOW, LOW, LOW}}, END_OF_MODE_TABLE,
- };
-
-#else
-
- // set RF switch configuration for Wio WM1110
- // Wio WM1110 uses DIO5 and DIO6 for RF switching
-
- static const uint32_t rfswitch_dio_pins[] = {RADIOLIB_LR11X0_DIO5, RADIOLIB_LR11X0_DIO6, RADIOLIB_NC, RADIOLIB_NC,
- RADIOLIB_NC};
-
- static const Module::RfSwitchMode_t rfswitch_table[] = {
- // mode DIO5 DIO6
- {LR11x0::MODE_STBY, {LOW, LOW}}, {LR11x0::MODE_RX, {HIGH, LOW}},
- {LR11x0::MODE_TX, {HIGH, HIGH}}, {LR11x0::MODE_TX_HP, {LOW, HIGH}},
- {LR11x0::MODE_TX_HF, {LOW, LOW}}, {LR11x0::MODE_GNSS, {LOW, LOW}},
- {LR11x0::MODE_WIFI, {LOW, LOW}}, END_OF_MODE_TABLE,
- };
-
-#endif
-
-// We need to do this before begin() call
-#ifdef LR11X0_DIO_AS_RF_SWITCH
- LOG_DEBUG("Setting DIO RF switch\n");
- bool dioAsRfSwitch = true;
-#elif defined(ARCH_PORTDUINO)
- bool dioAsRfSwitch = false;
- if (settingsMap[dio2_as_rf_switch]) {
- LOG_DEBUG("Setting DIO RF switch\n");
- dioAsRfSwitch = true;
- }
-#else
- bool dioAsRfSwitch = false;
-#endif
-
- if (dioAsRfSwitch)
- lora.setRfSwitchTable(rfswitch_dio_pins, rfswitch_table);
-
int res = lora.begin(getFreq(), bw, sf, cr, syncWord, power, preambleLength, tcxoVoltage);
// \todo Display actual typename of the adapter, not just `LR11x0`
LOG_INFO("LR11x0 init result %d\n", res);
if (res == RADIOLIB_ERR_CHIP_NOT_FOUND)
return false;
+ LR11x0VersionInfo_t version;
+ res = lora.getVersionInfo(&version);
+ if (res == RADIOLIB_ERR_NONE)
+ LOG_DEBUG("LR11x0 Device %d, HW %d, FW %d.%d, WiFi %d.%d, GNSS %d.%d\n", version.device, version.hardware,
+ version.fwMajor, version.fwMinor, version.fwMajorWiFi, version.fwMinorWiFi, version.fwGNSS,
+ version.almanacGNSS);
+
LOG_INFO("Frequency set to %f\n", getFreq());
LOG_INFO("Bandwidth set to %f\n", bw);
LOG_INFO("Power output set to %d\n", power);
@@ -114,6 +94,23 @@ template bool LR11x0Interface::init()
// FIXME: May want to set depending on a definition, currently all LR1110 variant files use the DC-DC regulator option
if (res == RADIOLIB_ERR_NONE)
res = lora.setRegulatorDCDC();
+
+#ifdef LR11X0_DIO_AS_RF_SWITCH
+ bool dioAsRfSwitch = true;
+#elif defined(ARCH_PORTDUINO)
+ bool dioAsRfSwitch = false;
+ if (settingsMap[dio2_as_rf_switch]) {
+ dioAsRfSwitch = true;
+ }
+#else
+ bool dioAsRfSwitch = false;
+#endif
+
+ if (dioAsRfSwitch) {
+ lora.setRfSwitchTable(rfswitch_dio_pins, rfswitch_table);
+ LOG_DEBUG("Setting DIO RF switch\n", res);
+ }
+
if (res == RADIOLIB_ERR_NONE) {
if (config.lora.sx126x_rx_boosted_gain) { // the name is unfortunate but historically accurate
res = lora.setRxBoostedGainMode(true);
@@ -165,8 +162,10 @@ template bool LR11x0Interface::reconfigure()
if (err != RADIOLIB_ERR_NONE)
RECORD_CRITICALERROR(meshtastic_CriticalErrorCode_INVALID_RADIO_SETTING);
- if (power > LR11X0_MAX_POWER) // This chip has lower power limits than some
- power = LR11X0_MAX_POWER;
+ if (power > LR1110_MAX_POWER) // This chip has lower power limits than some
+ power = LR1110_MAX_POWER;
+ if ((power > LR1120_MAX_POWER) && (config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) // 2.4G power limit
+ power = LR1120_MAX_POWER;
err = lora.setOutputPower(power);
assert(err == RADIOLIB_ERR_NONE);
@@ -263,29 +262,8 @@ template bool LR11x0Interface::isActivelyReceiving()
{
// The IRQ status will be cleared when we start our read operation. Check if we've started a header, but haven't yet
// received and handled the interrupt for reading the packet/handling errors.
-
- uint16_t irq = lora.getIrqStatus();
- bool detected = (irq & (RADIOLIB_LR11X0_IRQ_SYNC_WORD_HEADER_VALID | RADIOLIB_LR11X0_IRQ_PREAMBLE_DETECTED));
- // Handle false detections
- if (detected) {
- uint32_t now = millis();
- if (!activeReceiveStart) {
- activeReceiveStart = now;
- } else if ((now - activeReceiveStart > 2 * preambleTimeMsec) && !(irq & RADIOLIB_LR11X0_IRQ_SYNC_WORD_HEADER_VALID)) {
- // The HEADER_VALID flag should be set by now if it was really a packet, so ignore PREAMBLE_DETECTED flag
- activeReceiveStart = 0;
- LOG_DEBUG("Ignore false preamble detection.\n");
- return false;
- } else if (now - activeReceiveStart > maxPacketTimeMsec) {
- // We should have gotten an RX_DONE IRQ by now if it was really a packet, so ignore HEADER_VALID flag
- activeReceiveStart = 0;
- LOG_DEBUG("Ignore false header detection.\n");
- return false;
- }
- }
-
- // if (detected) LOG_DEBUG("rx detected\n");
- return detected;
+ return receiveDetected(lora.getIrqStatus(), RADIOLIB_LR11X0_IRQ_SYNC_WORD_HEADER_VALID,
+ RADIOLIB_LR11X0_IRQ_PREAMBLE_DETECTED);
}
template bool LR11x0Interface::sleep()
diff --git a/src/mesh/LR11x0Interface.h b/src/mesh/LR11x0Interface.h
index 9272f43f0..5711b1f7f 100644
--- a/src/mesh/LR11x0Interface.h
+++ b/src/mesh/LR11x0Interface.h
@@ -65,7 +65,4 @@ template class LR11x0Interface : public RadioLibInterface
virtual void addReceiveMetadata(meshtastic_MeshPacket *mp) override;
virtual void setStandby() override;
-
- private:
- uint32_t activeReceiveStart = 0;
};
diff --git a/src/mesh/MeshModule.h b/src/mesh/MeshModule.h
index c341b301a..7929ba972 100644
--- a/src/mesh/MeshModule.h
+++ b/src/mesh/MeshModule.h
@@ -79,7 +79,8 @@ class MeshModule
meshtastic_AdminMessage *response);
#if HAS_SCREEN
virtual void drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y) { return; }
- virtual bool isRequestingFocus(); // Checked by screen, when regenerating frameset
+ virtual bool isRequestingFocus(); // Checked by screen, when regenerating frameset
+ virtual bool interceptingKeyboardInput() { return false; } // Can screen use keyboard for nav, or is module handling input?
#endif
protected:
const char *name;
diff --git a/src/mesh/MeshPacketQueue.cpp b/src/mesh/MeshPacketQueue.cpp
index 6581b1ce4..da49ecb61 100644
--- a/src/mesh/MeshPacketQueue.cpp
+++ b/src/mesh/MeshPacketQueue.cpp
@@ -1,4 +1,5 @@
#include "MeshPacketQueue.h"
+#include "NodeDB.h"
#include "configuration.h"
#include
@@ -16,13 +17,9 @@ bool CompareMeshPacketFunc(const meshtastic_MeshPacket *p1, const meshtastic_Mes
{
assert(p1 && p2);
auto p1p = getPriority(p1), p2p = getPriority(p2);
-
// If priorities differ, use that
- // for equal priorities, order by id (older packets have higher priority - this will briefly be wrong when IDs roll over but
- // no big deal)
- return (p1p != p2p)
- ? (p1p < p2p) // prefer bigger priorities
- : ((p1->id & ID_COUNTER_MASK) >= (p2->id & ID_COUNTER_MASK)); // Mask to counter portion, prefer smaller packet ids
+ // for equal priorities, prefer packets already on mesh.
+ return (p1p != p2p) ? (p1p > p2p) : (getFrom(p1) != nodeDB->getNodeNum() && getFrom(p2) == nodeDB->getNodeNum());
}
MeshPacketQueue::MeshPacketQueue(size_t _maxLen) : maxLen(_maxLen) {}
@@ -69,8 +66,9 @@ bool MeshPacketQueue::enqueue(meshtastic_MeshPacket *p)
return replaceLowerPriorityPacket(p);
}
- queue.push_back(p);
- std::push_heap(queue.begin(), queue.end(), &CompareMeshPacketFunc);
+ // Find the correct position using upper_bound to maintain a stable order
+ auto it = std::upper_bound(queue.begin(), queue.end(), p, CompareMeshPacketFunc);
+ queue.insert(it, p); // Insert packet at the found position
return true;
}
@@ -81,9 +79,7 @@ meshtastic_MeshPacket *MeshPacketQueue::dequeue()
}
auto *p = queue.front();
- std::pop_heap(queue.begin(), queue.end(), &CompareMeshPacketFunc);
- queue.pop_back();
-
+ queue.erase(queue.begin()); // Remove the highest-priority packet
return p;
}
@@ -104,7 +100,6 @@ meshtastic_MeshPacket *MeshPacketQueue::remove(NodeNum from, PacketId id)
auto p = (*it);
if (getFrom(p) == from && p->id == id) {
queue.erase(it);
- std::make_heap(queue.begin(), queue.end(), &CompareMeshPacketFunc);
return p;
}
}
@@ -115,28 +110,21 @@ meshtastic_MeshPacket *MeshPacketQueue::remove(NodeNum from, PacketId id)
/** Attempt to find and remove a packet from this queue. Returns the packet which was removed from the queue */
bool MeshPacketQueue::replaceLowerPriorityPacket(meshtastic_MeshPacket *p)
{
- std::sort_heap(queue.begin(), queue.end(), &CompareMeshPacketFunc); // sort ascending based on priority (0 -> 127)
- // find first packet which does not compare less (in priority) than parameter packet
- auto low = std::lower_bound(queue.begin(), queue.end(), p, &CompareMeshPacketFunc);
-
- if (low == queue.begin()) { // if already at start, there are no packets with lower priority
- return false;
+ if (queue.empty()) {
+ return false; // No packets to replace
+ }
+ // Check if the packet at the back has a lower priority than the new packet
+ auto &backPacket = queue.back();
+ if (backPacket->priority < p->priority) {
+ // Remove the back packet
+ packetPool.release(backPacket);
+ queue.pop_back();
+ // Insert the new packet in the correct order
+ enqueue(p);
+ return true;
}
- if (low == queue.end()) {
- // all priorities in the vector are smaller than the incoming packet. Replace the lowest priority (first) element
- low = queue.begin();
- } else {
- // 'low' iterator points to first packet which does not compare less than parameter
- --low; // iterate to lower priority packet
- }
-
- if (getPriority(p) > getPriority(*low)) {
- packetPool.release(*low); // deallocate and drop the packet we're replacing
- *low = p; // replace low-pri packet at this position with incoming packet with higher priority
- }
-
- std::make_heap(queue.begin(), queue.end(), &CompareMeshPacketFunc);
- return true;
+ // If the back packet's priority is not lower, no replacement occurs
+ return false;
}
\ No newline at end of file
diff --git a/src/mesh/MeshService.h b/src/mesh/MeshService.h
index ea1c4e345..b91fedada 100644
--- a/src/mesh/MeshService.h
+++ b/src/mesh/MeshService.h
@@ -13,9 +13,9 @@
#if defined(ARCH_PORTDUINO) && !HAS_RADIO
#include "../platform/portduino/SimRadio.h"
#endif
-#ifdef ARCH_ESP32
+#if defined(ARCH_ESP32) || defined(ARCH_PORTDUINO)
#if !MESHTASTIC_EXCLUDE_STOREFORWARD
-#include "modules/esp32/StoreForwardModule.h"
+#include "modules/StoreForwardModule.h"
#endif
#endif
@@ -92,6 +92,9 @@ class MeshService
/// Return the next MqttClientProxyMessage packet destined to the phone.
meshtastic_MqttClientProxyMessage *getMqttClientProxyMessageForPhone() { return toPhoneMqttProxyQueue.dequeuePtr(0); }
+ /// Return the next ClientNotification packet destined to the phone.
+ meshtastic_ClientNotification *getClientNotificationForPhone() { return toPhoneClientNotificationQueue.dequeuePtr(0); }
+
// search the queue for a request id and return the matching nodenum
NodeNum getNodenumFromRequestId(uint32_t request_id);
diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp
index fa3667f32..7760ae0e1 100644
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@@ -32,12 +32,13 @@
#if HAS_WIFI
#include "mesh/wifi/WiFiAPClient.h"
#endif
-#include "modules/esp32/StoreForwardModule.h"
+#include "modules/StoreForwardModule.h"
#include
#include
#endif
#ifdef ARCH_PORTDUINO
+#include "modules/StoreForwardModule.h"
#include "platform/portduino/PortduinoGlue.h"
#endif
@@ -49,7 +50,7 @@
NodeDB *nodeDB = nullptr;
// we have plenty of ram so statically alloc this tempbuf (for now)
-EXT_RAM_ATTR meshtastic_DeviceState devicestate;
+EXT_RAM_BSS_ATTR meshtastic_DeviceState devicestate;
meshtastic_MyNodeInfo &myNodeInfo = devicestate.my_node;
meshtastic_LocalConfig config;
meshtastic_LocalModuleConfig moduleConfig;
@@ -121,6 +122,8 @@ NodeDB::NodeDB()
owner.hw_model = HW_VENDOR;
// Ensure user (nodeinfo) role is set to whatever we're configured to
owner.role = config.device.role;
+ // Ensure macaddr is set to our macaddr as it will be copied in our info below
+ memcpy(owner.macaddr, ourMacAddr, sizeof(owner.macaddr));
// Include our owner in the node db under our nodenum
meshtastic_NodeInfoLite *info = getOrCreateMeshNode(getNodeNum());
@@ -243,7 +246,7 @@ bool NodeDB::factoryReset(bool eraseBleBonds)
#endif
// second, install default state (this will deal with the duplicate mac address issue)
installDefaultDeviceState();
- installDefaultConfig();
+ installDefaultConfig(!eraseBleBonds); // Also preserve the private key if we're not erasing BLE bonds
installDefaultModuleConfig();
installDefaultChannels();
// third, write everything to disk
@@ -266,8 +269,13 @@ bool NodeDB::factoryReset(bool eraseBleBonds)
return true;
}
-void NodeDB::installDefaultConfig()
+void NodeDB::installDefaultConfig(bool preserveKey = false)
{
+ uint8_t private_key_temp[32];
+ bool shouldPreserveKey = preserveKey && config.has_security && config.security.private_key.size > 0;
+ if (shouldPreserveKey) {
+ memcpy(private_key_temp, config.security.private_key.bytes, config.security.private_key.size);
+ }
LOG_INFO("Installing default LocalConfig\n");
memset(&config, 0, sizeof(meshtastic_LocalConfig));
config.version = DEVICESTATE_CUR_VER;
@@ -285,6 +293,7 @@ void NodeDB::installDefaultConfig()
config.lora.tx_enabled =
true; // FIXME: maybe false in the future, and setting region to enable it. (unset region forces it off)
config.lora.override_duty_cycle = false;
+ config.lora.config_ok_to_mqtt = false;
#ifdef CONFIG_LORA_REGION_USERPREFS
config.lora.region = CONFIG_LORA_REGION_USERPREFS;
#else
@@ -307,8 +316,14 @@ void NodeDB::installDefaultConfig()
#else
config.security.admin_key[0].size = 0;
#endif
+ if (shouldPreserveKey) {
+ config.security.private_key.size = 32;
+ memcpy(config.security.private_key.bytes, private_key_temp, config.security.private_key.size);
+ printBytes("Restored key", config.security.private_key.bytes, config.security.private_key.size);
+ } else {
+ config.security.private_key.size = 0;
+ }
config.security.public_key.size = 0;
- config.security.private_key.size = 0;
#ifdef PIN_GPS_EN
config.position.gps_en_gpio = PIN_GPS_EN;
#endif
@@ -362,6 +377,9 @@ void NodeDB::installDefaultConfig()
#ifdef DISPLAY_FLIP_SCREEN
config.display.flip_screen = true;
#endif
+#ifdef RAK4630
+ config.display.wake_on_tap_or_motion = true;
+#endif
#ifdef T_WATCH_S3
config.display.screen_on_secs = 30;
config.display.wake_on_tap_or_motion = true;
@@ -455,7 +473,7 @@ void NodeDB::installDefaultModuleConfig()
moduleConfig.has_detection_sensor = true;
moduleConfig.detection_sensor.enabled = false;
- moduleConfig.detection_sensor.detection_triggered_high = true;
+ moduleConfig.detection_sensor.detection_trigger_type = meshtastic_ModuleConfig_DetectionSensorConfig_TriggerType_LOGIC_HIGH;
moduleConfig.detection_sensor.minimum_broadcast_secs = 45;
moduleConfig.has_ambient_lighting = true;
@@ -637,10 +655,13 @@ void NodeDB::pickNewNodeNum()
}
meshtastic_NodeInfoLite *found;
- while ((nodeNum == NODENUM_BROADCAST || nodeNum < NUM_RESERVED) ||
- ((found = getMeshNode(nodeNum)) && memcmp(found->user.macaddr, ourMacAddr, sizeof(ourMacAddr)) != 0)) {
+ while (((found = getMeshNode(nodeNum)) && memcmp(found->user.macaddr, ourMacAddr, sizeof(ourMacAddr)) != 0) ||
+ (nodeNum == NODENUM_BROADCAST || nodeNum < NUM_RESERVED)) {
NodeNum candidate = random(NUM_RESERVED, LONG_MAX); // try a new random choice
- LOG_WARN("NOTE! Our desired nodenum 0x%x is invalid or in use, so trying for 0x%x\n", nodeNum, candidate);
+ if (found)
+ LOG_WARN("NOTE! Our desired nodenum 0x%x is invalid or in use, by MAC ending in 0x%02x%02x vs our 0x%02x%02x, so "
+ "trying for 0x%x\n",
+ nodeNum, found->user.macaddr[4], found->user.macaddr[5], ourMacAddr[4], ourMacAddr[5], candidate);
nodeNum = candidate;
}
LOG_DEBUG("Using nodenum 0x%x \n", nodeNum);
@@ -706,7 +727,7 @@ void NodeDB::loadFromDisk()
//} else {
if (devicestate.version < DEVICESTATE_MIN_VER) {
LOG_WARN("Devicestate %d is old, discarding\n", devicestate.version);
- factoryReset();
+ installDefaultDeviceState();
} else {
LOG_INFO("Loaded saved devicestate version %d, with nodecount: %d\n", devicestate.version,
devicestate.node_db_lite.size());
@@ -722,7 +743,7 @@ void NodeDB::loadFromDisk()
} else {
if (config.version < DEVICESTATE_MIN_VER) {
LOG_WARN("config %d is old, discarding\n", config.version);
- installDefaultConfig();
+ installDefaultConfig(true);
} else {
LOG_INFO("Loaded saved config version %d\n", config.version);
}
@@ -1035,7 +1056,7 @@ bool NodeDB::updateUser(uint32_t nodeId, meshtastic_User &p, uint8_t channelInde
if (p.public_key.size > 0) {
printBytes("Incoming Pubkey: ", p.public_key.bytes, 32);
if (info->user.public_key.size > 0) { // if we have a key for this user already, don't overwrite with a new one
- LOG_INFO("Public Key set for node, not updateing!\n");
+ LOG_INFO("Public Key set for node, not updating!\n");
// we copy the key into the incoming packet, to prevent overwrite
memcpy(p.public_key.bytes, info->user.public_key.bytes, 32);
} else {
@@ -1093,8 +1114,10 @@ void NodeDB::updateFrom(const meshtastic_MeshPacket &mp)
info->via_mqtt = mp.via_mqtt; // Store if we received this packet via MQTT
// If hopStart was set and there wasn't someone messing with the limit in the middle, add hopsAway
- if (mp.hop_start != 0 && mp.hop_limit <= mp.hop_start)
+ if (mp.hop_start != 0 && mp.hop_limit <= mp.hop_start) {
+ info->has_hops_away = true;
info->hops_away = mp.hop_start - mp.hop_limit;
+ }
}
}
diff --git a/src/mesh/NodeDB.h b/src/mesh/NodeDB.h
index a71f3e134..1be61759a 100644
--- a/src/mesh/NodeDB.h
+++ b/src/mesh/NodeDB.h
@@ -2,11 +2,13 @@
#include "Observer.h"
#include
+#include
#include
#include
#include "MeshTypes.h"
#include "NodeStatus.h"
+#include "configuration.h"
#include "mesh-pb-constants.h"
#include "mesh/generated/meshtastic/mesh.pb.h" // For CriticalErrorCode
@@ -182,7 +184,8 @@ class NodeDB
void cleanupMeshDB();
/// Reinit device state from scratch (not loading from disk)
- void installDefaultDeviceState(), installDefaultChannels(), installDefaultConfig(), installDefaultModuleConfig();
+ void installDefaultDeviceState(), installDefaultChannels(), installDefaultConfig(bool preserveKey),
+ installDefaultModuleConfig();
/// write to flash
/// @return true if the save was successful
diff --git a/src/mesh/PacketHistory.cpp b/src/mesh/PacketHistory.cpp
index 26a73a3fe..ed1c3c59c 100644
--- a/src/mesh/PacketHistory.cpp
+++ b/src/mesh/PacketHistory.cpp
@@ -5,6 +5,7 @@
#ifdef ARCH_PORTDUINO
#include "platform/portduino/PortduinoGlue.h"
#endif
+#include "Throttle.h"
PacketHistory::PacketHistory()
{
@@ -22,18 +23,17 @@ bool PacketHistory::wasSeenRecently(const meshtastic_MeshPacket *p, bool withUpd
return false; // Not a floodable message ID, so we don't care
}
- uint32_t now = millis();
-
PacketRecord r;
r.id = p->id;
r.sender = getFrom(p);
- r.rxTimeMsec = now;
+ r.rxTimeMsec = millis();
auto found = recentPackets.find(r);
bool seenRecently = (found != recentPackets.end()); // found not equal to .end() means packet was seen recently
- if (seenRecently && (now - found->rxTimeMsec) >= FLOOD_EXPIRE_TIME) { // Check whether found packet has already expired
- recentPackets.erase(found); // Erase and pretend packet has not been seen recently
+ if (seenRecently &&
+ !Throttle::isWithinTimespanMs(found->rxTimeMsec, FLOOD_EXPIRE_TIME)) { // Check whether found packet has already expired
+ recentPackets.erase(found); // Erase and pretend packet has not been seen recently
found = recentPackets.end();
seenRecently = false;
}
@@ -64,12 +64,10 @@ bool PacketHistory::wasSeenRecently(const meshtastic_MeshPacket *p, bool withUpd
*/
void PacketHistory::clearExpiredRecentPackets()
{
- uint32_t now = millis();
-
LOG_DEBUG("recentPackets size=%ld\n", recentPackets.size());
for (auto it = recentPackets.begin(); it != recentPackets.end();) {
- if ((now - it->rxTimeMsec) >= FLOOD_EXPIRE_TIME) {
+ if (!Throttle::isWithinTimespanMs(it->rxTimeMsec, FLOOD_EXPIRE_TIME)) {
it = recentPackets.erase(it); // erase returns iterator pointing to element immediately following the one erased
} else {
++it;
diff --git a/src/mesh/PhoneAPI.cpp b/src/mesh/PhoneAPI.cpp
index 30af9d7b0..ecc5effe9 100644
--- a/src/mesh/PhoneAPI.cpp
+++ b/src/mesh/PhoneAPI.cpp
@@ -8,6 +8,7 @@
#include "FSCommon.h"
#include "MeshService.h"
#include "NodeDB.h"
+#include "PacketHistory.h"
#include "PhoneAPI.h"
#include "PowerFSM.h"
#include "RadioInterface.h"
@@ -25,10 +26,13 @@
#if !MESHTASTIC_EXCLUDE_MQTT
#include "mqtt/MQTT.h"
#endif
+#include "Throttle.h"
+#include
PhoneAPI::PhoneAPI()
{
lastContactMsec = millis();
+ std::fill(std::begin(recentToRadioPacketIds), std::end(recentToRadioPacketIds), 0);
}
PhoneAPI::~PhoneAPI()
@@ -60,9 +64,11 @@ void PhoneAPI::handleStartConfig()
void PhoneAPI::close()
{
+ LOG_INFO("PhoneAPI::close()\n");
+
if (state != STATE_SEND_NOTHING) {
state = STATE_SEND_NOTHING;
-
+ resetReadIndex();
unobserve(&service->fromNumChanged);
#ifdef FSCom
unobserve(&xModem.packetReady);
@@ -70,8 +76,17 @@ void PhoneAPI::close()
releasePhonePacket(); // Don't leak phone packets on shutdown
releaseQueueStatusPhonePacket();
releaseMqttClientProxyPhonePacket();
-
+ releaseClientNotification();
onConnectionChanged(false);
+ fromRadioScratch = {};
+ toRadioScratch = {};
+ nodeInfoForPhone = {};
+ packetForPhone = NULL;
+ filesManifest.clear();
+ fromRadioNum = 0;
+ config_nonce = 0;
+ config_state = 0;
+ pauseBluetoothLogging = false;
}
}
@@ -96,8 +111,6 @@ bool PhoneAPI::handleToRadio(const uint8_t *buf, size_t bufLength)
powerFSM.trigger(EVENT_CONTACT_FROM_PHONE); // As long as the phone keeps talking to us, don't let the radio go to sleep
lastContactMsec = millis();
- // return (lastContactMsec != 0) &&
-
memset(&toRadioScratch, 0, sizeof(toRadioScratch));
if (pb_decode_from_bytes(buf, bufLength, &meshtastic_ToRadio_msg, &toRadioScratch)) {
switch (toRadioScratch.which_payload_variant) {
@@ -194,7 +207,7 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
auto us = nodeDB->readNextMeshNode(readIndex);
if (us) {
nodeInfoForPhone = TypeConversions::ConvertToNodeInfo(us);
- nodeInfoForPhone.hops_away = 0;
+ nodeInfoForPhone.has_hops_away = false;
nodeInfoForPhone.is_favorite = true;
fromRadioScratch.which_payload_variant = meshtastic_FromRadio_node_info_tag;
fromRadioScratch.node_info = nodeInfoForPhone;
@@ -403,6 +416,10 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
fromRadioScratch.which_payload_variant = meshtastic_FromRadio_xmodemPacket_tag;
fromRadioScratch.xmodemPacket = xmodemPacketForPhone;
xmodemPacketForPhone = meshtastic_XModem_init_zero;
+ } else if (clientNotification) {
+ fromRadioScratch.which_payload_variant = meshtastic_FromRadio_clientNotification_tag;
+ fromRadioScratch.clientNotification = *clientNotification;
+ releaseClientNotification();
} else if (packetForPhone) {
printPacket("phone downloaded packet", packetForPhone);
@@ -442,13 +459,6 @@ void PhoneAPI::sendConfigComplete()
pauseBluetoothLogging = false;
}
-void PhoneAPI::handleDisconnect()
-{
- filesManifest.clear();
- pauseBluetoothLogging = false;
- LOG_INFO("PhoneAPI disconnect\n");
-}
-
void PhoneAPI::releasePhonePacket()
{
if (packetForPhone) {
@@ -473,6 +483,14 @@ void PhoneAPI::releaseMqttClientProxyPhonePacket()
}
}
+void PhoneAPI::releaseClientNotification()
+{
+ if (clientNotification) {
+ service->releaseClientNotificationToPool(clientNotification);
+ clientNotification = NULL;
+ }
+}
+
/**
* Return true if we have data available to send to the phone
*/
@@ -507,7 +525,9 @@ bool PhoneAPI::available()
queueStatusPacketForPhone = service->getQueueStatusForPhone();
if (!mqttClientProxyMessageForPhone)
mqttClientProxyMessageForPhone = service->getMqttClientProxyMessageForPhone();
- bool hasPacket = !!queueStatusPacketForPhone || !!mqttClientProxyMessageForPhone;
+ if (!clientNotification)
+ clientNotification = service->getClientNotificationForPhone();
+ bool hasPacket = !!queueStatusPacketForPhone || !!mqttClientProxyMessageForPhone || !!clientNotification;
if (hasPacket)
return true;
@@ -541,14 +561,60 @@ bool PhoneAPI::available()
return false;
}
+void PhoneAPI::sendNotification(meshtastic_LogRecord_Level level, uint32_t replyId, const char *message)
+{
+ meshtastic_ClientNotification *cn = clientNotificationPool.allocZeroed();
+ cn->has_reply_id = true;
+ cn->reply_id = replyId;
+ cn->level = meshtastic_LogRecord_Level_WARNING;
+ cn->time = getValidTime(RTCQualityFromNet);
+ strncpy(cn->message, message, sizeof(cn->message));
+ service->sendClientNotification(cn);
+}
+
+bool PhoneAPI::wasSeenRecently(uint32_t id)
+{
+ for (int i = 0; i < 20; i++) {
+ if (recentToRadioPacketIds[i] == id) {
+ return true;
+ }
+ if (recentToRadioPacketIds[i] == 0) {
+ recentToRadioPacketIds[i] = id;
+ return false;
+ }
+ }
+ // If the array is full, shift all elements to the left and add the new id at the end
+ memmove(recentToRadioPacketIds, recentToRadioPacketIds + 1, (19) * sizeof(uint32_t));
+ recentToRadioPacketIds[19] = id;
+ return false;
+}
+
/**
* Handle a packet that the phone wants us to send. It is our responsibility to free the packet to the pool
*/
bool PhoneAPI::handleToRadioPacket(meshtastic_MeshPacket &p)
{
printPacket("PACKET FROM PHONE", &p);
- service->handleToRadio(p);
+ if (p.id > 0 && wasSeenRecently(p.id)) {
+ LOG_DEBUG("Ignoring packet from phone, already seen recently\n");
+ return false;
+ }
+
+ if (p.decoded.portnum == meshtastic_PortNum_TRACEROUTE_APP && lastPortNumToRadio[p.decoded.portnum] &&
+ Throttle::isWithinTimespanMs(lastPortNumToRadio[p.decoded.portnum], THIRTY_SECONDS_MS)) {
+ LOG_WARN("Rate limiting portnum %d\n", p.decoded.portnum);
+ sendNotification(meshtastic_LogRecord_Level_WARNING, p.id, "TraceRoute can only be sent once every 30 seconds");
+ return false;
+ } else if (p.decoded.portnum == meshtastic_PortNum_POSITION_APP && lastPortNumToRadio[p.decoded.portnum] &&
+ Throttle::isWithinTimespanMs(lastPortNumToRadio[p.decoded.portnum], FIVE_SECONDS_MS)) {
+ LOG_WARN("Rate limiting portnum %d\n", p.decoded.portnum);
+ // FIXME: Figure out why this continues to happen
+ // sendNotification(meshtastic_LogRecord_Level_WARNING, p.id, "Position can only be sent once every 5 seconds");
+ return false;
+ }
+ lastPortNumToRadio[p.decoded.portnum] = millis();
+ service->handleToRadio(p);
return true;
}
diff --git a/src/mesh/PhoneAPI.h b/src/mesh/PhoneAPI.h
index 5feb1c4bf..3247fee5c 100644
--- a/src/mesh/PhoneAPI.h
+++ b/src/mesh/PhoneAPI.h
@@ -2,8 +2,10 @@
#include "Observer.h"
#include "mesh-pb-constants.h"
+#include "meshtastic/portnums.pb.h"
#include
#include
+#include
#include
// Make sure that we never let our packets grow too large for one BLE packet
@@ -48,6 +50,10 @@ class PhoneAPI
uint8_t config_state = 0;
+ // Hashmap of timestamps for last time we received a packet on the API per portnum
+ std::unordered_map lastPortNumToRadio;
+ uint32_t recentToRadioPacketIds[20]; // Last 20 ToRadio MeshPacket IDs we have seen
+
/**
* Each packet sent to the phone has an incrementing count
*/
@@ -99,6 +105,11 @@ class PhoneAPI
*/
virtual bool handleToRadio(const uint8_t *buf, size_t len);
+ /**
+ * Send a (client)notification to the phone
+ */
+ virtual void sendNotification(meshtastic_LogRecord_Level level, uint32_t replyId, const char *message);
+
/**
* Get the next packet we want to send to the phone
*
@@ -137,11 +148,6 @@ class PhoneAPI
*/
virtual void onNowHasData(uint32_t fromRadioNum) {}
- /**
- * Subclasses can use this to find out when a client drops the link
- */
- virtual void handleDisconnect();
-
private:
void releasePhonePacket();
@@ -149,9 +155,13 @@ class PhoneAPI
void releaseMqttClientProxyPhonePacket();
+ void releaseClientNotification();
+
/// begin a new connection
void handleStartConfig();
+ bool wasSeenRecently(uint32_t packetId);
+
/**
* Handle a packet that the phone wants us to send. We can write to it but can not keep a reference to it
* @return true true if a packet was queued for sending
diff --git a/src/mesh/ProtobufModule.h b/src/mesh/ProtobufModule.h
index 3b438ebeb..e4d4e5c09 100644
--- a/src/mesh/ProtobufModule.h
+++ b/src/mesh/ProtobufModule.h
@@ -108,7 +108,7 @@ template class ProtobufModule : protected SinglePortModule
T *decoded = NULL;
if (mp.which_payload_variant == meshtastic_MeshPacket_decoded_tag && mp.decoded.portnum == ourPortNum) {
memset(&scratch, 0, sizeof(scratch));
- auto &p = mp.decoded;
+ const meshtastic_Data &p = mp.decoded;
if (pb_decode_from_bytes(p.payload.bytes, p.payload.size, fields, &scratch)) {
decoded = &scratch;
} else {
diff --git a/src/mesh/RadioInterface.cpp b/src/mesh/RadioInterface.cpp
index eacd49644..6fca67188 100644
--- a/src/mesh/RadioInterface.cpp
+++ b/src/mesh/RadioInterface.cpp
@@ -151,7 +151,7 @@ const RegionInfo regions[] = {
const RegionInfo *myRegion;
bool RadioInterface::uses_default_frequency_slot = true;
-static uint8_t bytes[MAX_RHPACKETLEN];
+static uint8_t bytes[MAX_LORA_PAYLOAD_LEN + 1];
void initRegion()
{
@@ -326,7 +326,7 @@ void printPacket(const char *prefix, const meshtastic_MeshPacket *p)
RadioInterface::RadioInterface()
{
- assert(sizeof(PacketHeader) == 16); // make sure the compiler did what we expected
+ assert(sizeof(PacketHeader) == MESHTASTIC_HEADER_LENGTH); // make sure the compiler did what we expected
}
bool RadioInterface::reconfigure()
@@ -420,7 +420,7 @@ void RadioInterface::applyModemConfig()
switch (loraConfig.modem_preset) {
case meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO:
- bw = (myRegion->wideLora) ? 812.5 : 500;
+ bw = (myRegion->wideLora) ? 1625.0 : 500;
cr = 5;
sf = 7;
break;
diff --git a/src/mesh/RadioInterface.h b/src/mesh/RadioInterface.h
index f1016e3d8..129861441 100644
--- a/src/mesh/RadioInterface.h
+++ b/src/mesh/RadioInterface.h
@@ -9,7 +9,9 @@
#define MAX_TX_QUEUE 16 // max number of packets which can be waiting for transmission
-#define MAX_RHPACKETLEN 256
+#define MAX_LORA_PAYLOAD_LEN 255 // max length of 255 per Semtech's datasheets on SX12xx
+#define MESHTASTIC_HEADER_LENGTH 16
+#define MESHTASTIC_PKC_OVERHEAD 12
#define PACKET_FLAGS_HOP_LIMIT_MASK 0x07
#define PACKET_FLAGS_WANT_ACK_MASK 0x08
@@ -89,7 +91,7 @@ class RadioInterface
/**
* A temporary buffer used for sending/receiving packets, sized to hold the biggest buffer we might need
* */
- uint8_t radiobuf[MAX_RHPACKETLEN];
+ uint8_t radiobuf[MAX_LORA_PAYLOAD_LEN + 1];
/**
* Enqueue a received packet for the registered receiver
diff --git a/src/mesh/RadioLibInterface.cpp b/src/mesh/RadioLibInterface.cpp
index f299ebff2..aee43676d 100644
--- a/src/mesh/RadioLibInterface.cpp
+++ b/src/mesh/RadioLibInterface.cpp
@@ -3,6 +3,7 @@
#include "NodeDB.h"
#include "PowerMon.h"
#include "SPILock.h"
+#include "Throttle.h"
#include "configuration.h"
#include "error.h"
#include "main.h"
@@ -41,7 +42,7 @@ void LockingArduinoHal::spiTransfer(uint8_t *out, size_t len, uint8_t *in)
uint32_t start = millis();
while (digitalRead(busy)) {
- if (millis() - start >= 2000) {
+ if (!Throttle::isWithinTimespanMs(start, 2000)) {
LOG_ERROR("GPIO mid-transfer timeout, is it connected?");
return;
}
@@ -114,7 +115,7 @@ bool RadioLibInterface::canSendImmediately()
}
// If we've been trying to send the same packet more than one minute and we haven't gotten a
// TX IRQ from the radio, the radio is probably broken.
- if (busyTx && (millis() - lastTxStart > 60000)) {
+ if (busyTx && !Throttle::isWithinTimespanMs(lastTxStart, 60000)) {
LOG_ERROR("Hardware Failure! busyTx for more than 60s\n");
RECORD_CRITICALERROR(meshtastic_CriticalErrorCode_TRANSMIT_FAILED);
// reboot in 5 seconds when this condition occurs.
@@ -128,6 +129,28 @@ bool RadioLibInterface::canSendImmediately()
return true;
}
+bool RadioLibInterface::receiveDetected(uint16_t irq, ulong syncWordHeaderValidFlag, ulong preambleDetectedFlag)
+{
+ bool detected = (irq & (syncWordHeaderValidFlag | preambleDetectedFlag));
+ // Handle false detections
+ if (detected) {
+ if (!activeReceiveStart) {
+ activeReceiveStart = millis();
+ } else if (!Throttle::isWithinTimespanMs(activeReceiveStart, 2 * preambleTimeMsec) && !(irq & syncWordHeaderValidFlag)) {
+ // The HEADER_VALID flag should be set by now if it was really a packet, so ignore PREAMBLE_DETECTED flag
+ activeReceiveStart = 0;
+ LOG_DEBUG("Ignore false preamble detection.\n");
+ return false;
+ } else if (!Throttle::isWithinTimespanMs(activeReceiveStart, maxPacketTimeMsec)) {
+ // We should have gotten an RX_DONE IRQ by now if it was really a packet, so ignore HEADER_VALID flag
+ activeReceiveStart = 0;
+ LOG_DEBUG("Ignore false header detection.\n");
+ return false;
+ }
+ }
+ return detected;
+}
+
/// Send a packet (possibly by enquing in a private fifo). This routine will
/// later free() the packet to pool. This routine is not allowed to stall because it is called from
/// bluetooth comms code. If the txmit queue is empty it might return an error
@@ -144,7 +167,7 @@ ErrorCode RadioLibInterface::send(meshtastic_MeshPacket *p)
}
} else {
- LOG_WARN("send - lora tx disable because RegionCode_Unset\n");
+ LOG_WARN("send - lora tx disabled because RegionCode_Unset\n");
packetPool.release(p);
return ERRNO_DISABLED;
}
@@ -356,6 +379,14 @@ void RadioLibInterface::handleReceiveInterrupt()
xmitMsec = getPacketTime(length);
+#ifndef DISABLE_WELCOME_UNSET
+ if (config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_UNSET) {
+ LOG_WARN("recv - lora rx disabled because RegionCode_Unset\n");
+ airTime->logAirtime(RX_ALL_LOG, xmitMsec);
+ return;
+ }
+#endif
+
int state = iface->readData(radiobuf, length);
if (state != RADIOLIB_ERR_NONE) {
LOG_ERROR("ignoring received packet due to error=%d\n", state);
diff --git a/src/mesh/RadioLibInterface.h b/src/mesh/RadioLibInterface.h
index edcbb394f..13bef851a 100644
--- a/src/mesh/RadioLibInterface.h
+++ b/src/mesh/RadioLibInterface.h
@@ -167,6 +167,10 @@ class RadioLibInterface : public RadioInterface, protected concurrency::Notified
meshtastic_QueueStatus getQueueStatus();
protected:
+ uint32_t activeReceiveStart = 0;
+
+ bool receiveDetected(uint16_t irq, ulong syncWordHeaderValidFlag, ulong preambleDetectedFlag);
+
/** Do any hardware setup needed on entry into send configuration for the radio.
* Subclasses can customize, but must also call this base method */
virtual void configHardwareForSend();
diff --git a/src/mesh/Router.cpp b/src/mesh/Router.cpp
index d8e578db1..f06f54165 100644
--- a/src/mesh/Router.cpp
+++ b/src/mesh/Router.cpp
@@ -36,8 +36,8 @@ static MemoryDynamic staticPool;
Allocator &packetPool = staticPool;
-static uint8_t bytes[MAX_RHPACKETLEN];
-static uint8_t ScratchEncrypted[MAX_RHPACKETLEN];
+static uint8_t bytes[MAX_LORA_PAYLOAD_LEN + 1] __attribute__ ((__aligned__));
+static uint8_t ScratchEncrypted[MAX_LORA_PAYLOAD_LEN + 1] __attribute__ ((__aligned__));
/**
* Constructor
@@ -185,9 +185,12 @@ ErrorCode Router::sendLocal(meshtastic_MeshPacket *p, RxSource src)
handleReceived(p, src);
}
- if (!p->channel) { // don't override if a channel was requested
- p->channel = nodeDB->getMeshNodeChannel(p->to);
- LOG_DEBUG("localSend to channel %d\n", p->channel);
+ if (!p->channel && !p->pki_encrypted) { // don't override if a channel was requested
+ meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(p->to);
+ if (node && node->user.public_key.size == 0) {
+ p->channel = node->channel;
+ LOG_DEBUG("localSend to channel %d\n", p->channel);
+ }
}
return send(p);
@@ -327,13 +330,13 @@ bool perhapsDecode(meshtastic_MeshPacket *p)
// Attempt PKI decryption first
if (p->channel == 0 && p->to == nodeDB->getNodeNum() && p->to > 0 && p->to != NODENUM_BROADCAST &&
nodeDB->getMeshNode(p->from) != nullptr && nodeDB->getMeshNode(p->from)->user.public_key.size > 0 &&
- nodeDB->getMeshNode(p->to)->user.public_key.size > 0 && rawSize > 12) {
+ nodeDB->getMeshNode(p->to)->user.public_key.size > 0 && rawSize > MESHTASTIC_PKC_OVERHEAD) {
LOG_DEBUG("Attempting PKI decryption\n");
if (crypto->decryptCurve25519(p->from, p->id, rawSize, ScratchEncrypted, bytes)) {
LOG_INFO("PKI Decryption worked!\n");
memset(&p->decoded, 0, sizeof(p->decoded));
- rawSize -= 12;
+ rawSize -= MESHTASTIC_PKC_OVERHEAD;
if (pb_decode_from_bytes(bytes, rawSize, &meshtastic_Data_msg, &p->decoded) &&
p->decoded.portnum != meshtastic_PortNum_UNKNOWN_APP) {
decrypted = true;
@@ -344,8 +347,11 @@ bool perhapsDecode(meshtastic_MeshPacket *p)
// memcpy(bytes, ScratchEncrypted, rawSize); // TODO: Rename the bytes buffers
// chIndex = 8;
} else {
+ LOG_ERROR("PKC Decrypted, but pb_decode failed!\n");
return false;
}
+ } else {
+ LOG_WARN("PKC decrypt attempted but failed!\n");
}
}
#endif
@@ -378,6 +384,8 @@ bool perhapsDecode(meshtastic_MeshPacket *p)
// parsing was successful
p->which_payload_variant = meshtastic_MeshPacket_decoded_tag; // change type to decoded
p->channel = chIndex; // change to store the index instead of the hash
+ if (p->decoded.has_bitfield)
+ p->decoded.want_response |= p->decoded.bitfield & BITFIELD_WANT_RESPONSE_MASK;
/* Not actually ever used.
// Decompress if needed. jm
@@ -424,6 +432,12 @@ meshtastic_Routing_Error perhapsEncode(meshtastic_MeshPacket *p)
// If the packet is not yet encrypted, do so now
if (p->which_payload_variant == meshtastic_MeshPacket_decoded_tag) {
+ if (p->from == nodeDB->getNodeNum()) {
+ p->decoded.has_bitfield = true;
+ p->decoded.bitfield |= (config.lora.config_ok_to_mqtt << BITFIELD_OK_TO_MQTT_SHIFT);
+ p->decoded.bitfield |= (p->decoded.want_response << BITFIELD_WANT_RESPONSE_SHIFT);
+ }
+
size_t numbytes = pb_encode_to_bytes(bytes, sizeof(bytes), &meshtastic_Data_msg, &p->decoded);
/* Not actually used, so save the cycles
@@ -461,7 +475,7 @@ meshtastic_Routing_Error perhapsEncode(meshtastic_MeshPacket *p)
}
} */
- if (numbytes > MAX_RHPACKETLEN)
+ if (numbytes + MESHTASTIC_HEADER_LENGTH > MAX_LORA_PAYLOAD_LEN)
return meshtastic_Routing_Error_TOO_LARGE;
// printBytes("plaintext", bytes, numbytes);
@@ -470,12 +484,22 @@ meshtastic_Routing_Error perhapsEncode(meshtastic_MeshPacket *p)
#if !(MESHTASTIC_EXCLUDE_PKI)
meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(p->to);
- if (!owner.is_licensed && config.security.private_key.size == 32 && p->to != NODENUM_BROADCAST && node != nullptr &&
- node->user.public_key.size > 0 && p->decoded.portnum != meshtastic_PortNum_TRACEROUTE_APP &&
- p->decoded.portnum != meshtastic_PortNum_NODEINFO_APP && p->decoded.portnum != meshtastic_PortNum_ROUTING_APP &&
- p->decoded.portnum != meshtastic_PortNum_POSITION_APP) {
+ // We may want to retool things so we can send a PKC packet when the client specifies a key and nodenum, even if the node
+ // is not in the local nodedb
+ if (
+ // Don't use PKC with Ham mode
+ !owner.is_licensed &&
+ // Don't use PKC if it's not explicitly requested and a non-primary channel is requested
+ !(p->pki_encrypted != true && p->channel > 0) &&
+ // Check for valid keys and single node destination
+ config.security.private_key.size == 32 && p->to != NODENUM_BROADCAST && node != nullptr &&
+ // Check for a known public key for the destination
+ (node->user.public_key.size == 32) &&
+ // Some portnums either make no sense to send with PKC
+ p->decoded.portnum != meshtastic_PortNum_TRACEROUTE_APP && p->decoded.portnum != meshtastic_PortNum_NODEINFO_APP &&
+ p->decoded.portnum != meshtastic_PortNum_ROUTING_APP && p->decoded.portnum != meshtastic_PortNum_POSITION_APP) {
LOG_DEBUG("Using PKI!\n");
- if (numbytes + 12 > MAX_RHPACKETLEN)
+ if (numbytes + MESHTASTIC_HEADER_LENGTH + MESHTASTIC_PKC_OVERHEAD > MAX_LORA_PAYLOAD_LEN)
return meshtastic_Routing_Error_TOO_LARGE;
if (p->pki_encrypted && !memfll(p->public_key.bytes, 0, 32) &&
memcmp(p->public_key.bytes, node->user.public_key.bytes, 32) != 0) {
@@ -484,7 +508,7 @@ meshtastic_Routing_Error perhapsEncode(meshtastic_MeshPacket *p)
return meshtastic_Routing_Error_PKI_FAILED;
}
crypto->encryptCurve25519(p->to, getFrom(p), p->id, numbytes, bytes, ScratchEncrypted);
- numbytes += 12;
+ numbytes += MESHTASTIC_PKC_OVERHEAD;
memcpy(p->encrypted.bytes, ScratchEncrypted, numbytes);
p->channel = 0;
p->pki_encrypted = true;
diff --git a/src/mesh/Router.h b/src/mesh/Router.h
index 98486745b..fd4b0ccf9 100644
--- a/src/mesh/Router.h
+++ b/src/mesh/Router.h
@@ -148,3 +148,8 @@ extern Router *router;
/// Generate a unique packet id
// FIXME, move this someplace better
PacketId generatePacketId();
+
+#define BITFIELD_WANT_RESPONSE_SHIFT 1
+#define BITFIELD_OK_TO_MQTT_SHIFT 0
+#define BITFIELD_WANT_RESPONSE_MASK (1 << BITFIELD_WANT_RESPONSE_SHIFT)
+#define BITFIELD_OK_TO_MQTT_MASK (1 << BITFIELD_OK_TO_MQTT_SHIFT)
\ No newline at end of file
diff --git a/src/mesh/SX126xInterface.cpp b/src/mesh/SX126xInterface.cpp
index fcb3e4edb..30024daf0 100644
--- a/src/mesh/SX126xInterface.cpp
+++ b/src/mesh/SX126xInterface.cpp
@@ -6,6 +6,8 @@
#include "PortduinoGlue.h"
#endif
+#include "Throttle.h"
+
// Particular boards might define a different max power based on what their hardware can do, default to max power output if not
// specified (may be dangerous if using external PA and SX126x power config forgotten)
#ifndef SX126X_MAX_POWER
@@ -25,15 +27,35 @@ SX126xInterface::SX126xInterface(LockingArduinoHal *hal, RADIOLIB_PIN_TYPE cs
/// \return true if initialisation succeeded.
template bool SX126xInterface::init()
{
-#ifdef SX126X_POWER_EN
- pinMode(SX126X_POWER_EN, OUTPUT);
+
+// Typically, the RF switch on SX126x boards is controlled by two signals, which are negations of each other (switched RFIO
+// paths). The negation is usually performed in hardware, or (suboptimal design) TXEN and RXEN are the two inputs to this style of
+// RF switch. On some boards, there is no hardware negation between CTRL and ¬CTRL, but CTRL is internally connected to DIO2, and
+// DIO2's switching is done by the SX126X itself, so the MCU can't control ¬CTRL at exactly the same time. One solution would be
+// to set ¬CTRL as SX126X_TXEN or SX126X_RXEN, but they may already be used for another purpose, such as controlling another
+// PA/LNA. Keeping ¬CTRL high seems to work, as long CTRL=1, ¬CTRL=1 has the opposite and stable RF path effect as CTRL=0 and
+// ¬CTRL=1, this depends on the RF switch, but it seems this usually works. Better hardware design, which is done most the time,
+// means this workaround is not necessary.
+#ifdef SX126X_ANT_SW // Perhaps add RADIOLIB_NC check, and beforehand define as such if it is undefined, but it is not commonly
+ // used and not part of the 'default' set of pin definitions.
+ digitalWrite(SX126X_ANT_SW, HIGH);
+ pinMode(SX126X_ANT_SW, OUTPUT);
+#endif
+
+#ifdef SX126X_POWER_EN // Perhaps add RADIOLIB_NC check, and beforehand define as such if it is undefined, but it is not commonly
+ // used and not part of the 'default' set of pin definitions.
digitalWrite(SX126X_POWER_EN, HIGH);
+ pinMode(SX126X_POWER_EN, OUTPUT);
#endif
#if ARCH_PORTDUINO
float tcxoVoltage = 0;
if (settingsMap[dio3_tcxo_voltage])
tcxoVoltage = 1.8;
+ if (settingsMap[sx126x_ant_sw] != RADIOLIB_NC) {
+ digitalWrite(settingsMap[sx126x_ant_sw], HIGH);
+ pinMode(settingsMap[sx126x_ant_sw], OUTPUT);
+ }
// FIXME: correct logic to default to not using TCXO if no voltage is specified for SX126X_DIO3_TCXO_VOLTAGE
#elif !defined(SX126X_DIO3_TCXO_VOLTAGE)
float tcxoVoltage =
@@ -81,21 +103,19 @@ template bool SX126xInterface::init()
LOG_DEBUG("Current limit set to %f\n", currentLimit);
LOG_DEBUG("Current limit set result %d\n", res);
-#ifdef SX126X_DIO2_AS_RF_SWITCH
- LOG_DEBUG("Setting DIO2 as RF switch\n");
- bool dio2AsRfSwitch = true;
-#elif defined(ARCH_PORTDUINO)
- bool dio2AsRfSwitch = false;
- if (settingsMap[dio2_as_rf_switch]) {
- LOG_DEBUG("Setting DIO2 as RF switch\n");
- dio2AsRfSwitch = true;
- }
-#else
- LOG_DEBUG("Setting DIO2 as not RF switch\n");
- bool dio2AsRfSwitch = false;
-#endif
if (res == RADIOLIB_ERR_NONE) {
+#ifdef SX126X_DIO2_AS_RF_SWITCH
+ bool dio2AsRfSwitch = true;
+#elif defined(ARCH_PORTDUINO)
+ bool dio2AsRfSwitch = false;
+ if (settingsMap[dio2_as_rf_switch]) {
+ dio2AsRfSwitch = true;
+ }
+#else
+ bool dio2AsRfSwitch = false;
+#endif
res = lora.setDio2AsRfSwitch(dio2AsRfSwitch);
+ LOG_DEBUG("Set DIO2 as %sRF switch, result: %d\n", dio2AsRfSwitch ? "" : "not ", res);
}
// If a pin isn't defined, we set it to RADIOLIB_NC, it is safe to always do external RF switching with RADIOLIB_NC as it has
@@ -298,29 +318,7 @@ template bool SX126xInterface::isActivelyReceiving()
{
// The IRQ status will be cleared when we start our read operation. Check if we've started a header, but haven't yet
// received and handled the interrupt for reading the packet/handling errors.
-
- uint16_t irq = lora.getIrqFlags();
- bool detected = (irq & (RADIOLIB_SX126X_IRQ_HEADER_VALID | RADIOLIB_SX126X_IRQ_PREAMBLE_DETECTED));
- // Handle false detections
- if (detected) {
- uint32_t now = millis();
- if (!activeReceiveStart) {
- activeReceiveStart = now;
- } else if ((now - activeReceiveStart > 2 * preambleTimeMsec) && !(irq & RADIOLIB_SX126X_IRQ_HEADER_VALID)) {
- // The HEADER_VALID flag should be set by now if it was really a packet, so ignore PREAMBLE_DETECTED flag
- activeReceiveStart = 0;
- LOG_DEBUG("Ignore false preamble detection.\n");
- return false;
- } else if (now - activeReceiveStart > maxPacketTimeMsec) {
- // We should have gotten an RX_DONE IRQ by now if it was really a packet, so ignore HEADER_VALID flag
- activeReceiveStart = 0;
- LOG_DEBUG("Ignore false header detection.\n");
- return false;
- }
- }
-
- // if (detected) LOG_DEBUG("rx detected\n");
- return detected;
+ return receiveDetected(lora.getIrqFlags(), RADIOLIB_SX126X_IRQ_HEADER_VALID, RADIOLIB_SX126X_IRQ_PREAMBLE_DETECTED);
}
template bool SX126xInterface::sleep()
@@ -343,4 +341,4 @@ template bool SX126xInterface::sleep()
#endif
return true;
-}
+}
\ No newline at end of file
diff --git a/src/mesh/SX126xInterface.h b/src/mesh/SX126xInterface.h
index b392cd3e4..c437080c4 100644
--- a/src/mesh/SX126xInterface.h
+++ b/src/mesh/SX126xInterface.h
@@ -67,7 +67,4 @@ template class SX126xInterface : public RadioLibInterface
virtual void addReceiveMetadata(meshtastic_MeshPacket *mp) override;
virtual void setStandby() override;
-
- private:
- uint32_t activeReceiveStart = 0;
};
diff --git a/src/mesh/SX128xInterface.cpp b/src/mesh/SX128xInterface.cpp
index 9ff9ac2d7..5c740099c 100644
--- a/src/mesh/SX128xInterface.cpp
+++ b/src/mesh/SX128xInterface.cpp
@@ -1,4 +1,5 @@
#include "SX128xInterface.h"
+#include "Throttle.h"
#include "configuration.h"
#include "error.h"
#include "mesh/NodeDB.h"
@@ -289,28 +290,7 @@ template bool SX128xInterface::isChannelActive()
/** Could we send right now (i.e. either not actively receiving or transmitting)? */
template bool SX128xInterface::isActivelyReceiving()
{
- uint16_t irq = lora.getIrqStatus();
- bool detected = (irq & (RADIOLIB_SX128X_IRQ_HEADER_VALID | RADIOLIB_SX128X_IRQ_PREAMBLE_DETECTED));
-
- // Handle false detections
- if (detected) {
- uint32_t now = millis();
- if (!activeReceiveStart) {
- activeReceiveStart = now;
- } else if ((now - activeReceiveStart > 2 * preambleTimeMsec) && !(irq & RADIOLIB_SX128X_IRQ_HEADER_VALID)) {
- // The HEADER_VALID flag should be set by now if it was really a packet, so ignore PREAMBLE_DETECTED flag
- activeReceiveStart = 0;
- LOG_DEBUG("Ignore false preamble detection.\n");
- return false;
- } else if (now - activeReceiveStart > maxPacketTimeMsec) {
- // We should have gotten an RX_DONE IRQ by now if it was really a packet, so ignore HEADER_VALID flag
- activeReceiveStart = 0;
- LOG_DEBUG("Ignore false header detection.\n");
- return false;
- }
- }
-
- return detected;
+ return receiveDetected(lora.getIrqStatus(), RADIOLIB_SX128X_IRQ_HEADER_VALID, RADIOLIB_SX128X_IRQ_PREAMBLE_DETECTED);
}
template bool SX128xInterface::sleep()
diff --git a/src/mesh/SX128xInterface.h b/src/mesh/SX128xInterface.h
index f7fd35b25..bba31dab4 100644
--- a/src/mesh/SX128xInterface.h
+++ b/src/mesh/SX128xInterface.h
@@ -67,7 +67,4 @@ template class SX128xInterface : public RadioLibInterface
virtual void addReceiveMetadata(meshtastic_MeshPacket *mp) override;
virtual void setStandby() override;
-
- private:
- uint32_t activeReceiveStart = 0;
};
diff --git a/src/mesh/StreamAPI.cpp b/src/mesh/StreamAPI.cpp
index 9f59aa971..c3d85ed33 100644
--- a/src/mesh/StreamAPI.cpp
+++ b/src/mesh/StreamAPI.cpp
@@ -1,6 +1,7 @@
#include "StreamAPI.h"
#include "PowerFSM.h"
#include "RTC.h"
+#include "Throttle.h"
#include "configuration.h"
#define START1 0x94
@@ -20,10 +21,9 @@ int32_t StreamAPI::runOncePart()
*/
int32_t StreamAPI::readStream()
{
- uint32_t now = millis();
if (!stream->available()) {
// Nothing available this time, if the computer has talked to us recently, poll often, otherwise let CPU sleep a long time
- bool recentRx = (now - lastRxMsec) < 2000;
+ bool recentRx = Throttle::isWithinTimespanMs(lastRxMsec, 2000);
return recentRx ? 5 : 250;
} else {
while (stream->available()) { // Currently we never want to block
@@ -71,7 +71,7 @@ int32_t StreamAPI::readStream()
}
// we had bytes available this time, so assume we might have them next time also
- lastRxMsec = now;
+ lastRxMsec = millis();
return 0;
}
}
diff --git a/src/mesh/Throttle.cpp b/src/mesh/Throttle.cpp
index d8f23f9dc..f278cc843 100644
--- a/src/mesh/Throttle.cpp
+++ b/src/mesh/Throttle.cpp
@@ -24,4 +24,12 @@ bool Throttle::execute(uint32_t *lastExecutionMs, uint32_t minumumIntervalMs, vo
onDefer();
}
return false;
+}
+
+/// @brief Check if the last execution time is within the interval
+/// @param lastExecutionMs The last execution time in milliseconds
+/// @param timeSpanMs The interval in milliseconds of the timespan
+bool Throttle::isWithinTimespanMs(uint32_t lastExecutionMs, uint32_t timeSpanMs)
+{
+ return (millis() - lastExecutionMs) < timeSpanMs;
}
\ No newline at end of file
diff --git a/src/mesh/Throttle.h b/src/mesh/Throttle.h
index 8115595a4..8b4bb5d30 100644
--- a/src/mesh/Throttle.h
+++ b/src/mesh/Throttle.h
@@ -6,4 +6,5 @@ class Throttle
{
public:
static bool execute(uint32_t *lastExecutionMs, uint32_t minumumIntervalMs, void (*func)(void), void (*onDefer)(void) = NULL);
+ static bool isWithinTimespanMs(uint32_t lastExecutionMs, uint32_t intervalMs);
};
\ No newline at end of file
diff --git a/src/mesh/TypeConversions.cpp b/src/mesh/TypeConversions.cpp
index 513728ca5..550f87021 100644
--- a/src/mesh/TypeConversions.cpp
+++ b/src/mesh/TypeConversions.cpp
@@ -11,9 +11,13 @@ meshtastic_NodeInfo TypeConversions::ConvertToNodeInfo(const meshtastic_NodeInfo
info.last_heard = lite->last_heard;
info.channel = lite->channel;
info.via_mqtt = lite->via_mqtt;
- info.hops_away = lite->hops_away;
info.is_favorite = lite->is_favorite;
+ if (lite->has_hops_away) {
+ info.has_hops_away = true;
+ info.hops_away = lite->hops_away;
+ }
+
if (lite->has_position) {
info.has_position = true;
if (lite->position.latitude_i != 0)
@@ -78,7 +82,7 @@ meshtastic_UserLite TypeConversions::ConvertToUserLite(meshtastic_User user)
lite.hw_model = user.hw_model;
lite.role = user.role;
lite.is_licensed = user.is_licensed;
- memccpy(lite.macaddr, user.macaddr, sizeof(user.macaddr), sizeof(lite.macaddr));
+ memcpy(lite.macaddr, user.macaddr, sizeof(lite.macaddr));
memcpy(lite.public_key.bytes, user.public_key.bytes, sizeof(lite.public_key.bytes));
lite.public_key.size = user.public_key.size;
return lite;
@@ -94,7 +98,7 @@ meshtastic_User TypeConversions::ConvertToUser(uint32_t nodeNum, meshtastic_User
user.hw_model = lite.hw_model;
user.role = lite.role;
user.is_licensed = lite.is_licensed;
- memccpy(user.macaddr, lite.macaddr, sizeof(lite.macaddr), sizeof(user.macaddr));
+ memcpy(user.macaddr, lite.macaddr, sizeof(user.macaddr));
memcpy(user.public_key.bytes, lite.public_key.bytes, sizeof(user.public_key.bytes));
user.public_key.size = lite.public_key.size;
diff --git a/src/mesh/TypedQueue.h b/src/mesh/TypedQueue.h
index c96edae8e..f7d016f10 100644
--- a/src/mesh/TypedQueue.h
+++ b/src/mesh/TypedQueue.h
@@ -14,7 +14,7 @@
*/
template class TypedQueue
{
- static_assert(std::is_pod::value, "T must be pod");
+ static_assert(std::is_standard_layout::value, "T must be standard layout");
QueueHandle_t h;
concurrency::OSThread *reader = NULL;
diff --git a/src/mesh/aes-ccm.cpp b/src/mesh/aes-ccm.cpp
index cd18ae6c5..b9af14fdb 100644
--- a/src/mesh/aes-ccm.cpp
+++ b/src/mesh/aes-ccm.cpp
@@ -95,7 +95,7 @@ static void aes_ccm_encr(size_t L, const uint8_t *in, size_t len, uint8_t *out,
*out++ ^= *in++;
}
}
-static void aes_ccm_encr_auth(size_t M, uint8_t *x, uint8_t *a, uint8_t *auth)
+static void aes_ccm_encr_auth(size_t M, const uint8_t *x, uint8_t *a, uint8_t *auth)
{
size_t i;
uint8_t tmp[AES_BLOCK_SIZE];
diff --git a/src/mesh/api/ServerAPI.cpp b/src/mesh/api/ServerAPI.cpp
index 140567ad2..42217428d 100644
--- a/src/mesh/api/ServerAPI.cpp
+++ b/src/mesh/api/ServerAPI.cpp
@@ -5,7 +5,7 @@
template
ServerAPI::ServerAPI(T &_client) : StreamAPI(&client), concurrency::OSThread("ServerAPI"), client(_client)
{
- LOG_INFO("Incoming wifi connection\n");
+ LOG_INFO("Incoming API connection\n");
}
template ServerAPI::~ServerAPI()
@@ -45,10 +45,28 @@ template void APIServerPort::init()
template int32_t APIServerPort::runOnce()
{
+#ifdef ARCH_ESP32
+#if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 0)
+ auto client = U::accept();
+#else
auto client = U::available();
+#endif
+#else
+ auto client = U::available();
+#endif
if (client) {
// Close any previous connection (see FIXME in header file)
if (openAPI) {
+#if RAK_4631
+ // RAK13800 Ethernet requests periodically take more time
+ // This backoff addresses most cases keeping max wait < 1s
+ // Reconnections are delayed by full wait time
+ if (waitTime < 400) {
+ waitTime *= 2;
+ LOG_INFO("Previous TCP connection still open, trying again in %dms\n", waitTime);
+ return waitTime;
+ }
+#endif
LOG_INFO("Force closing previous TCP connection\n");
delete openAPI;
}
@@ -56,5 +74,8 @@ template int32_t APIServerPort::runOnce()
openAPI = new T(client);
}
+#if RAK_4631
+ waitTime = 100;
+#endif
return 100; // only check occasionally for incoming connections
}
diff --git a/src/mesh/api/ServerAPI.h b/src/mesh/api/ServerAPI.h
index dd2a767c9..5b84fddd7 100644
--- a/src/mesh/api/ServerAPI.h
+++ b/src/mesh/api/ServerAPI.h
@@ -31,7 +31,7 @@ template class ServerAPI : public StreamAPI, private concurrency::OSTh
};
/**
- * Listens for incoming connections and does accepts and creates instances of WiFiServerAPI as needed
+ * Listens for incoming connections and does accepts and creates instances of ServerAPI as needed
*/
template class APIServerPort : public U, private concurrency::OSThread
{
@@ -41,6 +41,10 @@ template class APIServerPort : public U, private concurrency:
* delegate to the worker. Once coroutines are implemented we can relax this restriction.
*/
T *openAPI = NULL;
+#if RAK_4631
+ // Track wait time for RAK13800 Ethernet requests
+ int32_t waitTime = 100;
+#endif
public:
explicit APIServerPort(int port);
diff --git a/src/mesh/api/ethServerAPI.h b/src/mesh/api/ethServerAPI.h
index 59673a684..6f214c75a 100644
--- a/src/mesh/api/ethServerAPI.h
+++ b/src/mesh/api/ethServerAPI.h
@@ -14,7 +14,7 @@ class ethServerAPI : public ServerAPI
};
/**
- * Listens for incoming connections and does accepts and creates instances of WiFiServerAPI as needed
+ * Listens for incoming connections and does accepts and creates instances of EthernetServerAPI as needed
*/
class ethServerPort : public APIServerPort
{
diff --git a/src/mesh/compression/unishox2.cpp b/src/mesh/compression/unishox2.cpp
index 4e239d489..9fc012a76 100644
--- a/src/mesh/compression/unishox2.cpp
+++ b/src/mesh/compression/unishox2.cpp
@@ -339,7 +339,7 @@ int32_t readUTF8(const char *in, int len, int l, int *utf8len)
/// This is also used for Unicode strings \n
/// This is a crude implementation that is not optimized. Assuming only short strings \n
/// are encoded, this is not much of an issue.
-int matchOccurance(const char *in, int len, int l, char *out, int olen, int *ol, uint8_t *state, const uint8_t usx_hcodes[],
+int matchOccurance(const char *in, int len, int l, char *out, int olen, int *ol, const uint8_t *state, const uint8_t usx_hcodes[],
const uint8_t usx_hcode_lens[])
{
int j, k;
@@ -383,7 +383,7 @@ int matchOccurance(const char *in, int len, int l, char *out, int olen, int *ol,
/// This is also used for Unicode strings \n
/// This is a crude implementation that is not optimized. Assuming only short strings \n
/// are encoded, this is not much of an issue.
-int matchLine(const char *in, int len, int l, char *out, int olen, int *ol, struct us_lnk_lst *prev_lines, uint8_t *state,
+int matchLine(const char *in, int len, int l, char *out, int olen, int *ol, struct us_lnk_lst *prev_lines, const uint8_t *state,
const uint8_t usx_hcodes[], const uint8_t usx_hcode_lens[])
{
int last_ol = *ol;
diff --git a/src/mesh/eth/ethClient.cpp b/src/mesh/eth/ethClient.cpp
index 9f3bb8ab7..1c97f3bed 100644
--- a/src/mesh/eth/ethClient.cpp
+++ b/src/mesh/eth/ethClient.cpp
@@ -38,7 +38,7 @@ static int32_t reconnectETH()
Ethernet.maintain();
if (!ethStartupComplete) {
// Start web server
- LOG_INFO("... Starting network services\n");
+ LOG_INFO("Starting Ethernet network services\n");
#ifndef DISABLE_NTP
LOG_INFO("Starting NTP time client\n");
@@ -131,7 +131,8 @@ bool initEthernet()
status = Ethernet.begin(mac);
} else if (config.network.address_mode == meshtastic_Config_NetworkConfig_AddressMode_STATIC) {
LOG_INFO("starting Ethernet Static\n");
- Ethernet.begin(mac, config.network.ipv4_config.ip, config.network.ipv4_config.dns, config.network.ipv4_config.subnet);
+ Ethernet.begin(mac, config.network.ipv4_config.ip, config.network.ipv4_config.dns, config.network.ipv4_config.gateway,
+ config.network.ipv4_config.subnet);
status = 1;
} else {
LOG_INFO("Ethernet Disabled\n");
@@ -186,4 +187,4 @@ bool isEthernetAvailable()
}
}
-#endif
\ No newline at end of file
+#endif
diff --git a/src/mesh/generated/meshtastic/apponly.pb.h b/src/mesh/generated/meshtastic/apponly.pb.h
index f5bacea52..31211a91b 100644
--- a/src/mesh/generated/meshtastic/apponly.pb.h
+++ b/src/mesh/generated/meshtastic/apponly.pb.h
@@ -55,7 +55,7 @@ extern const pb_msgdesc_t meshtastic_ChannelSet_msg;
/* Maximum encoded size of messages (where known) */
#define MESHTASTIC_MESHTASTIC_APPONLY_PB_H_MAX_SIZE meshtastic_ChannelSet_size
-#define meshtastic_ChannelSet_size 676
+#define meshtastic_ChannelSet_size 679
#ifdef __cplusplus
} /* extern "C" */
diff --git a/src/mesh/generated/meshtastic/atak.pb.h b/src/mesh/generated/meshtastic/atak.pb.h
index 5fd18f963..50b57cd04 100644
--- a/src/mesh/generated/meshtastic/atak.pb.h
+++ b/src/mesh/generated/meshtastic/atak.pb.h
@@ -120,6 +120,7 @@ typedef struct _meshtastic_PLI {
uint16_t course;
} meshtastic_PLI;
+typedef PB_BYTES_ARRAY_T(220) meshtastic_TAKPacket_detail_t;
/* Packets for the official ATAK Plugin */
typedef struct _meshtastic_TAKPacket {
/* Are the payloads strings compressed for LoRA transport? */
@@ -139,6 +140,9 @@ typedef struct _meshtastic_TAKPacket {
meshtastic_PLI pli;
/* ATAK GeoChat message */
meshtastic_GeoChat chat;
+ /* Generic CoT detail XML
+ May be compressed / truncated by the sender */
+ meshtastic_TAKPacket_detail_t detail;
} payload_variant;
} meshtastic_TAKPacket;
@@ -199,6 +203,7 @@ extern "C" {
#define meshtastic_TAKPacket_status_tag 4
#define meshtastic_TAKPacket_pli_tag 5
#define meshtastic_TAKPacket_chat_tag 6
+#define meshtastic_TAKPacket_detail_tag 7
/* Struct field encoding specification for nanopb */
#define meshtastic_TAKPacket_FIELDLIST(X, a) \
@@ -207,7 +212,8 @@ X(a, STATIC, OPTIONAL, MESSAGE, contact, 2) \
X(a, STATIC, OPTIONAL, MESSAGE, group, 3) \
X(a, STATIC, OPTIONAL, MESSAGE, status, 4) \
X(a, STATIC, ONEOF, MESSAGE, (payload_variant,pli,payload_variant.pli), 5) \
-X(a, STATIC, ONEOF, MESSAGE, (payload_variant,chat,payload_variant.chat), 6)
+X(a, STATIC, ONEOF, MESSAGE, (payload_variant,chat,payload_variant.chat), 6) \
+X(a, STATIC, ONEOF, BYTES, (payload_variant,detail,payload_variant.detail), 7)
#define meshtastic_TAKPacket_CALLBACK NULL
#define meshtastic_TAKPacket_DEFAULT NULL
#define meshtastic_TAKPacket_contact_MSGTYPE meshtastic_Contact
diff --git a/src/mesh/generated/meshtastic/clientonly.pb.h b/src/mesh/generated/meshtastic/clientonly.pb.h
index dc323292a..5720c1c02 100644
--- a/src/mesh/generated/meshtastic/clientonly.pb.h
+++ b/src/mesh/generated/meshtastic/clientonly.pb.h
@@ -5,6 +5,7 @@
#define PB_MESHTASTIC_MESHTASTIC_CLIENTONLY_PB_H_INCLUDED
#include
#include "meshtastic/localonly.pb.h"
+#include "meshtastic/mesh.pb.h"
#if PB_PROTO_HEADER_VERSION != 40
#error Regenerate this file with the current version of nanopb generator.
@@ -28,6 +29,15 @@ typedef struct _meshtastic_DeviceProfile {
/* The ModuleConfig of the node */
bool has_module_config;
meshtastic_LocalModuleConfig module_config;
+ /* Fixed position data */
+ bool has_fixed_position;
+ meshtastic_Position fixed_position;
+ /* Ringtone for ExternalNotification */
+ bool has_ringtone;
+ char ringtone[231];
+ /* Predefined messages for CannedMessage */
+ bool has_canned_messages;
+ char canned_messages[201];
} meshtastic_DeviceProfile;
@@ -36,8 +46,8 @@ extern "C" {
#endif
/* Initializer values for message structs */
-#define meshtastic_DeviceProfile_init_default {false, "", false, "", {{NULL}, NULL}, false, meshtastic_LocalConfig_init_default, false, meshtastic_LocalModuleConfig_init_default}
-#define meshtastic_DeviceProfile_init_zero {false, "", false, "", {{NULL}, NULL}, false, meshtastic_LocalConfig_init_zero, false, meshtastic_LocalModuleConfig_init_zero}
+#define meshtastic_DeviceProfile_init_default {false, "", false, "", {{NULL}, NULL}, false, meshtastic_LocalConfig_init_default, false, meshtastic_LocalModuleConfig_init_default, false, meshtastic_Position_init_default, false, "", false, ""}
+#define meshtastic_DeviceProfile_init_zero {false, "", false, "", {{NULL}, NULL}, false, meshtastic_LocalConfig_init_zero, false, meshtastic_LocalModuleConfig_init_zero, false, meshtastic_Position_init_zero, false, "", false, ""}
/* Field tags (for use in manual encoding/decoding) */
#define meshtastic_DeviceProfile_long_name_tag 1
@@ -45,6 +55,9 @@ extern "C" {
#define meshtastic_DeviceProfile_channel_url_tag 3
#define meshtastic_DeviceProfile_config_tag 4
#define meshtastic_DeviceProfile_module_config_tag 5
+#define meshtastic_DeviceProfile_fixed_position_tag 6
+#define meshtastic_DeviceProfile_ringtone_tag 7
+#define meshtastic_DeviceProfile_canned_messages_tag 8
/* Struct field encoding specification for nanopb */
#define meshtastic_DeviceProfile_FIELDLIST(X, a) \
@@ -52,11 +65,15 @@ X(a, STATIC, OPTIONAL, STRING, long_name, 1) \
X(a, STATIC, OPTIONAL, STRING, short_name, 2) \
X(a, CALLBACK, OPTIONAL, STRING, channel_url, 3) \
X(a, STATIC, OPTIONAL, MESSAGE, config, 4) \
-X(a, STATIC, OPTIONAL, MESSAGE, module_config, 5)
+X(a, STATIC, OPTIONAL, MESSAGE, module_config, 5) \
+X(a, STATIC, OPTIONAL, MESSAGE, fixed_position, 6) \
+X(a, STATIC, OPTIONAL, STRING, ringtone, 7) \
+X(a, STATIC, OPTIONAL, STRING, canned_messages, 8)
#define meshtastic_DeviceProfile_CALLBACK pb_default_field_callback
#define meshtastic_DeviceProfile_DEFAULT NULL
#define meshtastic_DeviceProfile_config_MSGTYPE meshtastic_LocalConfig
#define meshtastic_DeviceProfile_module_config_MSGTYPE meshtastic_LocalModuleConfig
+#define meshtastic_DeviceProfile_fixed_position_MSGTYPE meshtastic_Position
extern const pb_msgdesc_t meshtastic_DeviceProfile_msg;
diff --git a/src/mesh/generated/meshtastic/config.pb.h b/src/mesh/generated/meshtastic/config.pb.h
index eb03ddc58..da2e43972 100644
--- a/src/mesh/generated/meshtastic/config.pb.h
+++ b/src/mesh/generated/meshtastic/config.pb.h
@@ -510,6 +510,8 @@ typedef struct _meshtastic_Config_LoRaConfig {
uint32_t ignore_incoming[3];
/* If true, the device will not process any packets received via LoRa that passed via MQTT anywhere on the path towards it. */
bool ignore_mqtt;
+ /* Sets the ok_to_mqtt bit on outgoing packets */
+ bool config_ok_to_mqtt;
} meshtastic_Config_LoRaConfig;
typedef struct _meshtastic_Config_BluetoothConfig {
@@ -533,7 +535,7 @@ typedef struct _meshtastic_Config_SecurityConfig {
meshtastic_Config_SecurityConfig_private_key_t private_key;
/* The public key authorized to send admin messages to this node. */
pb_size_t admin_key_count;
- meshtastic_Config_SecurityConfig_admin_key_t admin_key[1];
+ meshtastic_Config_SecurityConfig_admin_key_t admin_key[3];
/* If true, device is considered to be "managed" by a mesh administrator via admin messages
Device is managed by a mesh administrator. */
bool is_managed;
@@ -656,9 +658,9 @@ extern "C" {
#define meshtastic_Config_NetworkConfig_init_default {0, "", "", "", 0, _meshtastic_Config_NetworkConfig_AddressMode_MIN, false, meshtastic_Config_NetworkConfig_IpV4Config_init_default, ""}
#define meshtastic_Config_NetworkConfig_IpV4Config_init_default {0, 0, 0, 0}
#define meshtastic_Config_DisplayConfig_init_default {0, _meshtastic_Config_DisplayConfig_GpsCoordinateFormat_MIN, 0, 0, 0, _meshtastic_Config_DisplayConfig_DisplayUnits_MIN, _meshtastic_Config_DisplayConfig_OledType_MIN, _meshtastic_Config_DisplayConfig_DisplayMode_MIN, 0, 0, _meshtastic_Config_DisplayConfig_CompassOrientation_MIN}
-#define meshtastic_Config_LoRaConfig_init_default {0, _meshtastic_Config_LoRaConfig_ModemPreset_MIN, 0, 0, 0, 0, _meshtastic_Config_LoRaConfig_RegionCode_MIN, 0, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0}, 0}
+#define meshtastic_Config_LoRaConfig_init_default {0, _meshtastic_Config_LoRaConfig_ModemPreset_MIN, 0, 0, 0, 0, _meshtastic_Config_LoRaConfig_RegionCode_MIN, 0, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0}, 0, 0}
#define meshtastic_Config_BluetoothConfig_init_default {0, _meshtastic_Config_BluetoothConfig_PairingMode_MIN, 0}
-#define meshtastic_Config_SecurityConfig_init_default {{0, {0}}, {0, {0}}, 0, {{0, {0}}}, 0, 0, 0, 0}
+#define meshtastic_Config_SecurityConfig_init_default {{0, {0}}, {0, {0}}, 0, {{0, {0}}, {0, {0}}, {0, {0}}}, 0, 0, 0, 0}
#define meshtastic_Config_SessionkeyConfig_init_default {0}
#define meshtastic_Config_init_zero {0, {meshtastic_Config_DeviceConfig_init_zero}}
#define meshtastic_Config_DeviceConfig_init_zero {_meshtastic_Config_DeviceConfig_Role_MIN, 0, 0, 0, _meshtastic_Config_DeviceConfig_RebroadcastMode_MIN, 0, 0, 0, 0, "", 0}
@@ -667,9 +669,9 @@ extern "C" {
#define meshtastic_Config_NetworkConfig_init_zero {0, "", "", "", 0, _meshtastic_Config_NetworkConfig_AddressMode_MIN, false, meshtastic_Config_NetworkConfig_IpV4Config_init_zero, ""}
#define meshtastic_Config_NetworkConfig_IpV4Config_init_zero {0, 0, 0, 0}
#define meshtastic_Config_DisplayConfig_init_zero {0, _meshtastic_Config_DisplayConfig_GpsCoordinateFormat_MIN, 0, 0, 0, _meshtastic_Config_DisplayConfig_DisplayUnits_MIN, _meshtastic_Config_DisplayConfig_OledType_MIN, _meshtastic_Config_DisplayConfig_DisplayMode_MIN, 0, 0, _meshtastic_Config_DisplayConfig_CompassOrientation_MIN}
-#define meshtastic_Config_LoRaConfig_init_zero {0, _meshtastic_Config_LoRaConfig_ModemPreset_MIN, 0, 0, 0, 0, _meshtastic_Config_LoRaConfig_RegionCode_MIN, 0, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0}, 0}
+#define meshtastic_Config_LoRaConfig_init_zero {0, _meshtastic_Config_LoRaConfig_ModemPreset_MIN, 0, 0, 0, 0, _meshtastic_Config_LoRaConfig_RegionCode_MIN, 0, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0}, 0, 0}
#define meshtastic_Config_BluetoothConfig_init_zero {0, _meshtastic_Config_BluetoothConfig_PairingMode_MIN, 0}
-#define meshtastic_Config_SecurityConfig_init_zero {{0, {0}}, {0, {0}}, 0, {{0, {0}}}, 0, 0, 0, 0}
+#define meshtastic_Config_SecurityConfig_init_zero {{0, {0}}, {0, {0}}, 0, {{0, {0}}, {0, {0}}, {0, {0}}}, 0, 0, 0, 0}
#define meshtastic_Config_SessionkeyConfig_init_zero {0}
/* Field tags (for use in manual encoding/decoding) */
@@ -746,6 +748,7 @@ extern "C" {
#define meshtastic_Config_LoRaConfig_pa_fan_disabled_tag 15
#define meshtastic_Config_LoRaConfig_ignore_incoming_tag 103
#define meshtastic_Config_LoRaConfig_ignore_mqtt_tag 104
+#define meshtastic_Config_LoRaConfig_config_ok_to_mqtt_tag 105
#define meshtastic_Config_BluetoothConfig_enabled_tag 1
#define meshtastic_Config_BluetoothConfig_mode_tag 2
#define meshtastic_Config_BluetoothConfig_fixed_pin_tag 3
@@ -887,7 +890,8 @@ X(a, STATIC, SINGULAR, BOOL, sx126x_rx_boosted_gain, 13) \
X(a, STATIC, SINGULAR, FLOAT, override_frequency, 14) \
X(a, STATIC, SINGULAR, BOOL, pa_fan_disabled, 15) \
X(a, STATIC, REPEATED, UINT32, ignore_incoming, 103) \
-X(a, STATIC, SINGULAR, BOOL, ignore_mqtt, 104)
+X(a, STATIC, SINGULAR, BOOL, ignore_mqtt, 104) \
+X(a, STATIC, SINGULAR, BOOL, config_ok_to_mqtt, 105)
#define meshtastic_Config_LoRaConfig_CALLBACK NULL
#define meshtastic_Config_LoRaConfig_DEFAULT NULL
@@ -944,12 +948,12 @@ extern const pb_msgdesc_t meshtastic_Config_SessionkeyConfig_msg;
#define meshtastic_Config_BluetoothConfig_size 10
#define meshtastic_Config_DeviceConfig_size 98
#define meshtastic_Config_DisplayConfig_size 30
-#define meshtastic_Config_LoRaConfig_size 82
+#define meshtastic_Config_LoRaConfig_size 85
#define meshtastic_Config_NetworkConfig_IpV4Config_size 20
#define meshtastic_Config_NetworkConfig_size 196
#define meshtastic_Config_PositionConfig_size 62
#define meshtastic_Config_PowerConfig_size 52
-#define meshtastic_Config_SecurityConfig_size 111
+#define meshtastic_Config_SecurityConfig_size 178
#define meshtastic_Config_SessionkeyConfig_size 0
#define meshtastic_Config_size 199
diff --git a/src/mesh/generated/meshtastic/deviceonly.pb.h b/src/mesh/generated/meshtastic/deviceonly.pb.h
index 692402210..a905c4526 100644
--- a/src/mesh/generated/meshtastic/deviceonly.pb.h
+++ b/src/mesh/generated/meshtastic/deviceonly.pb.h
@@ -94,6 +94,7 @@ typedef struct _meshtastic_NodeInfoLite {
/* True if we witnessed the node over MQTT instead of LoRA transport */
bool via_mqtt;
/* Number of hops away from us this node is (0 if adjacent) */
+ bool has_hops_away;
uint8_t hops_away;
/* True if node is in our favorites list
Persists between NodeDB internal clean ups */
@@ -202,13 +203,13 @@ extern "C" {
/* Initializer values for message structs */
#define meshtastic_PositionLite_init_default {0, 0, 0, 0, _meshtastic_Position_LocSource_MIN}
#define meshtastic_UserLite_init_default {{0}, "", "", _meshtastic_HardwareModel_MIN, 0, _meshtastic_Config_DeviceConfig_Role_MIN, {0, {0}}}
-#define meshtastic_NodeInfoLite_init_default {0, false, meshtastic_UserLite_init_default, false, meshtastic_PositionLite_init_default, 0, 0, false, meshtastic_DeviceMetrics_init_default, 0, 0, 0, 0}
+#define meshtastic_NodeInfoLite_init_default {0, false, meshtastic_UserLite_init_default, false, meshtastic_PositionLite_init_default, 0, 0, false, meshtastic_DeviceMetrics_init_default, 0, 0, false, 0, 0}
#define meshtastic_DeviceState_init_default {false, meshtastic_MyNodeInfo_init_default, false, meshtastic_User_init_default, 0, {meshtastic_MeshPacket_init_default}, false, meshtastic_MeshPacket_init_default, 0, 0, 0, false, meshtastic_MeshPacket_init_default, 0, {meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default}, {0}}
#define meshtastic_ChannelFile_init_default {0, {meshtastic_Channel_init_default, meshtastic_Channel_init_default, meshtastic_Channel_init_default, meshtastic_Channel_init_default, meshtastic_Channel_init_default, meshtastic_Channel_init_default, meshtastic_Channel_init_default, meshtastic_Channel_init_default}, 0}
#define meshtastic_OEMStore_init_default {0, 0, {0, {0}}, _meshtastic_ScreenFonts_MIN, "", {0, {0}}, false, meshtastic_LocalConfig_init_default, false, meshtastic_LocalModuleConfig_init_default}
#define meshtastic_PositionLite_init_zero {0, 0, 0, 0, _meshtastic_Position_LocSource_MIN}
#define meshtastic_UserLite_init_zero {{0}, "", "", _meshtastic_HardwareModel_MIN, 0, _meshtastic_Config_DeviceConfig_Role_MIN, {0, {0}}}
-#define meshtastic_NodeInfoLite_init_zero {0, false, meshtastic_UserLite_init_zero, false, meshtastic_PositionLite_init_zero, 0, 0, false, meshtastic_DeviceMetrics_init_zero, 0, 0, 0, 0}
+#define meshtastic_NodeInfoLite_init_zero {0, false, meshtastic_UserLite_init_zero, false, meshtastic_PositionLite_init_zero, 0, 0, false, meshtastic_DeviceMetrics_init_zero, 0, 0, false, 0, 0}
#define meshtastic_DeviceState_init_zero {false, meshtastic_MyNodeInfo_init_zero, false, meshtastic_User_init_zero, 0, {meshtastic_MeshPacket_init_zero}, false, meshtastic_MeshPacket_init_zero, 0, 0, 0, false, meshtastic_MeshPacket_init_zero, 0, {meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero}, {0}}
#define meshtastic_ChannelFile_init_zero {0, {meshtastic_Channel_init_zero, meshtastic_Channel_init_zero, meshtastic_Channel_init_zero, meshtastic_Channel_init_zero, meshtastic_Channel_init_zero, meshtastic_Channel_init_zero, meshtastic_Channel_init_zero, meshtastic_Channel_init_zero}, 0}
#define meshtastic_OEMStore_init_zero {0, 0, {0, {0}}, _meshtastic_ScreenFonts_MIN, "", {0, {0}}, false, meshtastic_LocalConfig_init_zero, false, meshtastic_LocalModuleConfig_init_zero}
@@ -287,7 +288,7 @@ X(a, STATIC, SINGULAR, FIXED32, last_heard, 5) \
X(a, STATIC, OPTIONAL, MESSAGE, device_metrics, 6) \
X(a, STATIC, SINGULAR, UINT32, channel, 7) \
X(a, STATIC, SINGULAR, BOOL, via_mqtt, 8) \
-X(a, STATIC, SINGULAR, UINT32, hops_away, 9) \
+X(a, STATIC, OPTIONAL, UINT32, hops_away, 9) \
X(a, STATIC, SINGULAR, BOOL, is_favorite, 10)
#define meshtastic_NodeInfoLite_CALLBACK NULL
#define meshtastic_NodeInfoLite_DEFAULT NULL
@@ -358,7 +359,7 @@ extern const pb_msgdesc_t meshtastic_OEMStore_msg;
#define MESHTASTIC_MESHTASTIC_DEVICEONLY_PB_H_MAX_SIZE meshtastic_OEMStore_size
#define meshtastic_ChannelFile_size 718
#define meshtastic_NodeInfoLite_size 183
-#define meshtastic_OEMStore_size 3497
+#define meshtastic_OEMStore_size 3568
#define meshtastic_PositionLite_size 28
#define meshtastic_UserLite_size 96
diff --git a/src/mesh/generated/meshtastic/localonly.pb.h b/src/mesh/generated/meshtastic/localonly.pb.h
index 91a23dc4f..19600856f 100644
--- a/src/mesh/generated/meshtastic/localonly.pb.h
+++ b/src/mesh/generated/meshtastic/localonly.pb.h
@@ -186,8 +186,8 @@ extern const pb_msgdesc_t meshtastic_LocalModuleConfig_msg;
#define meshtastic_LocalModuleConfig_fields &meshtastic_LocalModuleConfig_msg
/* Maximum encoded size of messages (where known) */
-#define MESHTASTIC_MESHTASTIC_LOCALONLY_PB_H_MAX_SIZE meshtastic_LocalModuleConfig_size
-#define meshtastic_LocalConfig_size 664
+#define MESHTASTIC_MESHTASTIC_LOCALONLY_PB_H_MAX_SIZE meshtastic_LocalConfig_size
+#define meshtastic_LocalConfig_size 735
#define meshtastic_LocalModuleConfig_size 687
#ifdef __cplusplus
diff --git a/src/mesh/generated/meshtastic/mesh.pb.h b/src/mesh/generated/meshtastic/mesh.pb.h
index 9d7ff74a1..c04f4adb9 100644
--- a/src/mesh/generated/meshtastic/mesh.pb.h
+++ b/src/mesh/generated/meshtastic/mesh.pb.h
@@ -71,6 +71,8 @@ typedef enum _meshtastic_HardwareModel {
meshtastic_HardwareModel_RAK2560 = 22,
/* Heltec HRU-3601: https://heltec.org/project/hru-3601/ */
meshtastic_HardwareModel_HELTEC_HRU_3601 = 23,
+ /* Heltec Wireless Bridge */
+ meshtastic_HardwareModel_HELTEC_WIRELESS_BRIDGE = 24,
/* B&Q Consulting Station Edition G1: https://uniteng.com/wiki/doku.php?id=meshtastic:station */
meshtastic_HardwareModel_STATION_G1 = 25,
/* RAK11310 (RP2040 + SX1262) */
@@ -107,7 +109,7 @@ typedef enum _meshtastic_HardwareModel {
meshtastic_HardwareModel_NRF52840_PCA10059 = 40,
/* Custom Disaster Radio esp32 v3 device https://github.com/sudomesh/disaster-radio/tree/master/hardware/board_esp32_v3 */
meshtastic_HardwareModel_DR_DEV = 41,
- /* M5 esp32 based MCU modules with enclosure, TFT and LORA Shields. All Variants (Basic, Core, Fire, Core2, Paper) https://m5stack.com/ */
+ /* M5 esp32 based MCU modules with enclosure, TFT and LORA Shields. All Variants (Basic, Core, Fire, Core2, CoreS3, Paper) https://m5stack.com/ */
meshtastic_HardwareModel_M5STACK = 42,
/* New Heltec LoRA32 with ESP32-S3 CPU */
meshtastic_HardwareModel_HELTEC_V3 = 43,
@@ -196,9 +198,19 @@ typedef enum _meshtastic_HardwareModel {
https://www.adafruit.com/product/938
^^^ short A0 to switch to I2C address 0x3C */
meshtastic_HardwareModel_RP2040_FEATHER_RFM95 = 76,
- /* M5 esp32 based MCU modules with enclosure, TFT and LORA Shields. All Variants (Basic, Core, Fire, Core2, Paper) https://m5stack.com/ */
+ /* M5 esp32 based MCU modules with enclosure, TFT and LORA Shields. All Variants (Basic, Core, Fire, Core2, CoreS3, Paper) https://m5stack.com/ */
meshtastic_HardwareModel_M5STACK_COREBASIC = 77,
meshtastic_HardwareModel_M5STACK_CORE2 = 78,
+ /* Pico2 with Waveshare Hat, same as Pico */
+ meshtastic_HardwareModel_RPI_PICO2 = 79,
+ /* M5 esp32 based MCU modules with enclosure, TFT and LORA Shields. All Variants (Basic, Core, Fire, Core2, CoreS3, Paper) https://m5stack.com/ */
+ meshtastic_HardwareModel_M5STACK_CORES3 = 80,
+ /* Seeed XIAO S3 DK */
+ meshtastic_HardwareModel_SEEED_XIAO_S3 = 81,
+ /* Nordic nRF52840+Semtech SX1262 LoRa BLE Combo Module. nRF52840+SX1262 MS24SF1 */
+ meshtastic_HardwareModel_MS24SF1 = 82,
+ /* Lilygo TLora-C6 with the new ESP32-C6 MCU */
+ meshtastic_HardwareModel_TLORA_C6 = 83,
/* ------------------------------------------------------------------------------------------------------------------------------------------
Reserved ID For developing private Ports. These will show up in live traffic sparsely, so we can use a high number. Keep it within 8 bits.
------------------------------------------------------------------------------------------------------------------------------------------ */
@@ -316,7 +328,11 @@ typedef enum _meshtastic_Routing_Error {
/* The client specified a PKI transport, but the node was unable to send the packet using PKI (and did not send the message at all) */
meshtastic_Routing_Error_PKI_FAILED = 34,
/* The receiving node does not have a Public Key to decode with */
- meshtastic_Routing_Error_PKI_UNKNOWN_PUBKEY = 35
+ meshtastic_Routing_Error_PKI_UNKNOWN_PUBKEY = 35,
+ /* Admin packet otherwise checks out, but uses a bogus or expired session key */
+ meshtastic_Routing_Error_ADMIN_BAD_SESSION_KEY = 36,
+ /* Admin packet sent using PKC, but not from a public key on the admin key list */
+ meshtastic_Routing_Error_ADMIN_PUBLIC_KEY_UNAUTHORIZED = 37
} meshtastic_Routing_Error;
/* The priority of this message for sending.
@@ -580,6 +596,9 @@ typedef struct _meshtastic_Data {
/* Defaults to false. If true, then what is in the payload should be treated as an emoji like giving
a message a heart or poop emoji. */
uint32_t emoji;
+ /* Bitfield for extra flags. First use is to indicate that user approves the packet being uploaded to MQTT. */
+ bool has_bitfield;
+ uint8_t bitfield;
} meshtastic_Data;
/* Waypoint message, used to share arbitrary locations across the mesh */
@@ -738,6 +757,7 @@ typedef struct _meshtastic_NodeInfo {
/* True if we witnessed the node over MQTT instead of LoRA transport */
bool via_mqtt;
/* Number of hops away from us this node is (0 if adjacent) */
+ bool has_hops_away;
uint8_t hops_away;
/* True if node is in our favorites list
Persists between NodeDB internal clean ups */
@@ -868,6 +888,8 @@ typedef struct _meshtastic_DeviceMetadata {
meshtastic_HardwareModel hw_model;
/* Has Remote Hardware enabled */
bool hasRemoteHardware;
+ /* Has PKC capabilities */
+ bool hasPKC;
} meshtastic_DeviceMetadata;
/* Packets from the radio to the phone will appear on the fromRadio characteristic.
@@ -1023,8 +1045,8 @@ extern "C" {
#define _meshtastic_Position_AltSource_ARRAYSIZE ((meshtastic_Position_AltSource)(meshtastic_Position_AltSource_ALT_BAROMETRIC+1))
#define _meshtastic_Routing_Error_MIN meshtastic_Routing_Error_NONE
-#define _meshtastic_Routing_Error_MAX meshtastic_Routing_Error_PKI_UNKNOWN_PUBKEY
-#define _meshtastic_Routing_Error_ARRAYSIZE ((meshtastic_Routing_Error)(meshtastic_Routing_Error_PKI_UNKNOWN_PUBKEY+1))
+#define _meshtastic_Routing_Error_MAX meshtastic_Routing_Error_ADMIN_PUBLIC_KEY_UNAUTHORIZED
+#define _meshtastic_Routing_Error_ARRAYSIZE ((meshtastic_Routing_Error)(meshtastic_Routing_Error_ADMIN_PUBLIC_KEY_UNAUTHORIZED+1))
#define _meshtastic_MeshPacket_Priority_MIN meshtastic_MeshPacket_Priority_UNSET
#define _meshtastic_MeshPacket_Priority_MAX meshtastic_MeshPacket_Priority_MAX
@@ -1082,11 +1104,11 @@ extern "C" {
#define meshtastic_User_init_default {"", "", "", {0}, _meshtastic_HardwareModel_MIN, 0, _meshtastic_Config_DeviceConfig_Role_MIN, {0, {0}}}
#define meshtastic_RouteDiscovery_init_default {0, {0, 0, 0, 0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0, 0, 0, 0}}
#define meshtastic_Routing_init_default {0, {meshtastic_RouteDiscovery_init_default}}
-#define meshtastic_Data_init_default {_meshtastic_PortNum_MIN, {0, {0}}, 0, 0, 0, 0, 0, 0}
+#define meshtastic_Data_init_default {_meshtastic_PortNum_MIN, {0, {0}}, 0, 0, 0, 0, 0, 0, false, 0}
#define meshtastic_Waypoint_init_default {0, false, 0, false, 0, 0, 0, "", "", 0}
#define meshtastic_MqttClientProxyMessage_init_default {"", 0, {{0, {0}}}, 0}
#define meshtastic_MeshPacket_init_default {0, 0, 0, 0, {meshtastic_Data_init_default}, 0, 0, 0, 0, 0, _meshtastic_MeshPacket_Priority_MIN, 0, _meshtastic_MeshPacket_Delayed_MIN, 0, 0, {0, {0}}, 0}
-#define meshtastic_NodeInfo_init_default {0, false, meshtastic_User_init_default, false, meshtastic_Position_init_default, 0, 0, false, meshtastic_DeviceMetrics_init_default, 0, 0, 0, 0}
+#define meshtastic_NodeInfo_init_default {0, false, meshtastic_User_init_default, false, meshtastic_Position_init_default, 0, 0, false, meshtastic_DeviceMetrics_init_default, 0, 0, false, 0, 0}
#define meshtastic_MyNodeInfo_init_default {0, 0, 0}
#define meshtastic_LogRecord_init_default {"", 0, "", _meshtastic_LogRecord_Level_MIN}
#define meshtastic_QueueStatus_init_default {0, 0, 0, 0}
@@ -1097,7 +1119,7 @@ extern "C" {
#define meshtastic_Compressed_init_default {_meshtastic_PortNum_MIN, {0, {0}}}
#define meshtastic_NeighborInfo_init_default {0, 0, 0, 0, {meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default, meshtastic_Neighbor_init_default}}
#define meshtastic_Neighbor_init_default {0, 0, 0, 0}
-#define meshtastic_DeviceMetadata_init_default {"", 0, 0, 0, 0, 0, _meshtastic_Config_DeviceConfig_Role_MIN, 0, _meshtastic_HardwareModel_MIN, 0}
+#define meshtastic_DeviceMetadata_init_default {"", 0, 0, 0, 0, 0, _meshtastic_Config_DeviceConfig_Role_MIN, 0, _meshtastic_HardwareModel_MIN, 0, 0}
#define meshtastic_Heartbeat_init_default {0}
#define meshtastic_NodeRemoteHardwarePin_init_default {0, false, meshtastic_RemoteHardwarePin_init_default}
#define meshtastic_ChunkedPayload_init_default {0, 0, 0, {0, {0}}}
@@ -1107,11 +1129,11 @@ extern "C" {
#define meshtastic_User_init_zero {"", "", "", {0}, _meshtastic_HardwareModel_MIN, 0, _meshtastic_Config_DeviceConfig_Role_MIN, {0, {0}}}
#define meshtastic_RouteDiscovery_init_zero {0, {0, 0, 0, 0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0, 0, 0, 0}}
#define meshtastic_Routing_init_zero {0, {meshtastic_RouteDiscovery_init_zero}}
-#define meshtastic_Data_init_zero {_meshtastic_PortNum_MIN, {0, {0}}, 0, 0, 0, 0, 0, 0}
+#define meshtastic_Data_init_zero {_meshtastic_PortNum_MIN, {0, {0}}, 0, 0, 0, 0, 0, 0, false, 0}
#define meshtastic_Waypoint_init_zero {0, false, 0, false, 0, 0, 0, "", "", 0}
#define meshtastic_MqttClientProxyMessage_init_zero {"", 0, {{0, {0}}}, 0}
#define meshtastic_MeshPacket_init_zero {0, 0, 0, 0, {meshtastic_Data_init_zero}, 0, 0, 0, 0, 0, _meshtastic_MeshPacket_Priority_MIN, 0, _meshtastic_MeshPacket_Delayed_MIN, 0, 0, {0, {0}}, 0}
-#define meshtastic_NodeInfo_init_zero {0, false, meshtastic_User_init_zero, false, meshtastic_Position_init_zero, 0, 0, false, meshtastic_DeviceMetrics_init_zero, 0, 0, 0, 0}
+#define meshtastic_NodeInfo_init_zero {0, false, meshtastic_User_init_zero, false, meshtastic_Position_init_zero, 0, 0, false, meshtastic_DeviceMetrics_init_zero, 0, 0, false, 0, 0}
#define meshtastic_MyNodeInfo_init_zero {0, 0, 0}
#define meshtastic_LogRecord_init_zero {"", 0, "", _meshtastic_LogRecord_Level_MIN}
#define meshtastic_QueueStatus_init_zero {0, 0, 0, 0}
@@ -1122,7 +1144,7 @@ extern "C" {
#define meshtastic_Compressed_init_zero {_meshtastic_PortNum_MIN, {0, {0}}}
#define meshtastic_NeighborInfo_init_zero {0, 0, 0, 0, {meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero, meshtastic_Neighbor_init_zero}}
#define meshtastic_Neighbor_init_zero {0, 0, 0, 0}
-#define meshtastic_DeviceMetadata_init_zero {"", 0, 0, 0, 0, 0, _meshtastic_Config_DeviceConfig_Role_MIN, 0, _meshtastic_HardwareModel_MIN, 0}
+#define meshtastic_DeviceMetadata_init_zero {"", 0, 0, 0, 0, 0, _meshtastic_Config_DeviceConfig_Role_MIN, 0, _meshtastic_HardwareModel_MIN, 0, 0}
#define meshtastic_Heartbeat_init_zero {0}
#define meshtastic_NodeRemoteHardwarePin_init_zero {0, false, meshtastic_RemoteHardwarePin_init_zero}
#define meshtastic_ChunkedPayload_init_zero {0, 0, 0, {0, {0}}}
@@ -1176,6 +1198,7 @@ extern "C" {
#define meshtastic_Data_request_id_tag 6
#define meshtastic_Data_reply_id_tag 7
#define meshtastic_Data_emoji_tag 8
+#define meshtastic_Data_bitfield_tag 9
#define meshtastic_Waypoint_id_tag 1
#define meshtastic_Waypoint_latitude_i_tag 2
#define meshtastic_Waypoint_longitude_i_tag 3
@@ -1252,6 +1275,7 @@ extern "C" {
#define meshtastic_DeviceMetadata_position_flags_tag 8
#define meshtastic_DeviceMetadata_hw_model_tag 9
#define meshtastic_DeviceMetadata_hasRemoteHardware_tag 10
+#define meshtastic_DeviceMetadata_hasPKC_tag 11
#define meshtastic_FromRadio_id_tag 1
#define meshtastic_FromRadio_packet_tag 2
#define meshtastic_FromRadio_my_info_tag 3
@@ -1351,7 +1375,8 @@ X(a, STATIC, SINGULAR, FIXED32, dest, 4) \
X(a, STATIC, SINGULAR, FIXED32, source, 5) \
X(a, STATIC, SINGULAR, FIXED32, request_id, 6) \
X(a, STATIC, SINGULAR, FIXED32, reply_id, 7) \
-X(a, STATIC, SINGULAR, FIXED32, emoji, 8)
+X(a, STATIC, SINGULAR, FIXED32, emoji, 8) \
+X(a, STATIC, OPTIONAL, UINT32, bitfield, 9)
#define meshtastic_Data_CALLBACK NULL
#define meshtastic_Data_DEFAULT NULL
@@ -1406,7 +1431,7 @@ X(a, STATIC, SINGULAR, FIXED32, last_heard, 5) \
X(a, STATIC, OPTIONAL, MESSAGE, device_metrics, 6) \
X(a, STATIC, SINGULAR, UINT32, channel, 7) \
X(a, STATIC, SINGULAR, BOOL, via_mqtt, 8) \
-X(a, STATIC, SINGULAR, UINT32, hops_away, 9) \
+X(a, STATIC, OPTIONAL, UINT32, hops_away, 9) \
X(a, STATIC, SINGULAR, BOOL, is_favorite, 10)
#define meshtastic_NodeInfo_CALLBACK NULL
#define meshtastic_NodeInfo_DEFAULT NULL
@@ -1531,7 +1556,8 @@ X(a, STATIC, SINGULAR, BOOL, hasEthernet, 6) \
X(a, STATIC, SINGULAR, UENUM, role, 7) \
X(a, STATIC, SINGULAR, UINT32, position_flags, 8) \
X(a, STATIC, SINGULAR, UENUM, hw_model, 9) \
-X(a, STATIC, SINGULAR, BOOL, hasRemoteHardware, 10)
+X(a, STATIC, SINGULAR, BOOL, hasRemoteHardware, 10) \
+X(a, STATIC, SINGULAR, BOOL, hasPKC, 11)
#define meshtastic_DeviceMetadata_CALLBACK NULL
#define meshtastic_DeviceMetadata_DEFAULT NULL
@@ -1629,13 +1655,13 @@ extern const pb_msgdesc_t meshtastic_ChunkedPayloadResponse_msg;
#define meshtastic_ChunkedPayload_size 245
#define meshtastic_ClientNotification_size 415
#define meshtastic_Compressed_size 243
-#define meshtastic_Data_size 270
-#define meshtastic_DeviceMetadata_size 46
+#define meshtastic_Data_size 273
+#define meshtastic_DeviceMetadata_size 48
#define meshtastic_FileInfo_size 236
#define meshtastic_FromRadio_size 510
#define meshtastic_Heartbeat_size 0
#define meshtastic_LogRecord_size 426
-#define meshtastic_MeshPacket_size 364
+#define meshtastic_MeshPacket_size 367
#define meshtastic_MqttClientProxyMessage_size 501
#define meshtastic_MyNodeInfo_size 18
#define meshtastic_NeighborInfo_size 258
diff --git a/src/mesh/generated/meshtastic/module_config.pb.cpp b/src/mesh/generated/meshtastic/module_config.pb.cpp
index 88a771d5b..e1c33e2c1 100644
--- a/src/mesh/generated/meshtastic/module_config.pb.cpp
+++ b/src/mesh/generated/meshtastic/module_config.pb.cpp
@@ -60,3 +60,4 @@ PB_BIND(meshtastic_RemoteHardwarePin, meshtastic_RemoteHardwarePin, AUTO)
+
diff --git a/src/mesh/generated/meshtastic/module_config.pb.h b/src/mesh/generated/meshtastic/module_config.pb.h
index 2e1985660..d4b82c93b 100644
--- a/src/mesh/generated/meshtastic/module_config.pb.h
+++ b/src/mesh/generated/meshtastic/module_config.pb.h
@@ -19,6 +19,23 @@ typedef enum _meshtastic_RemoteHardwarePinType {
meshtastic_RemoteHardwarePinType_DIGITAL_WRITE = 2
} meshtastic_RemoteHardwarePinType;
+typedef enum _meshtastic_ModuleConfig_DetectionSensorConfig_TriggerType {
+ /* Event is triggered if pin is low */
+ meshtastic_ModuleConfig_DetectionSensorConfig_TriggerType_LOGIC_LOW = 0,
+ /* Event is triggered if pin is high */
+ meshtastic_ModuleConfig_DetectionSensorConfig_TriggerType_LOGIC_HIGH = 1,
+ /* Event is triggered when pin goes high to low */
+ meshtastic_ModuleConfig_DetectionSensorConfig_TriggerType_FALLING_EDGE = 2,
+ /* Event is triggered when pin goes low to high */
+ meshtastic_ModuleConfig_DetectionSensorConfig_TriggerType_RISING_EDGE = 3,
+ /* Event is triggered on every pin state change, low is considered to be
+ "active" */
+ meshtastic_ModuleConfig_DetectionSensorConfig_TriggerType_EITHER_EDGE_ACTIVE_LOW = 4,
+ /* Event is triggered on every pin state change, high is considered to be
+ "active" */
+ meshtastic_ModuleConfig_DetectionSensorConfig_TriggerType_EITHER_EDGE_ACTIVE_HIGH = 5
+} meshtastic_ModuleConfig_DetectionSensorConfig_TriggerType;
+
/* Baudrate for codec2 voice */
typedef enum _meshtastic_ModuleConfig_AudioConfig_Audio_Baud {
meshtastic_ModuleConfig_AudioConfig_Audio_Baud_CODEC2_DEFAULT = 0,
@@ -144,11 +161,13 @@ typedef struct _meshtastic_ModuleConfig_NeighborInfoConfig {
typedef struct _meshtastic_ModuleConfig_DetectionSensorConfig {
/* Whether the Module is enabled */
bool enabled;
- /* Interval in seconds of how often we can send a message to the mesh when a state change is detected */
+ /* Interval in seconds of how often we can send a message to the mesh when a
+ trigger event is detected */
uint32_t minimum_broadcast_secs;
- /* Interval in seconds of how often we should send a message to the mesh with the current state regardless of changes
- When set to 0, only state changes will be broadcasted
- Works as a sort of status heartbeat for peace of mind */
+ /* Interval in seconds of how often we should send a message to the mesh
+ with the current state regardless of trigger events When set to 0, only
+ trigger events will be broadcasted Works as a sort of status heartbeat
+ for peace of mind */
uint32_t state_broadcast_secs;
/* Send ASCII bell with alert message
Useful for triggering ext. notification on bell */
@@ -159,9 +178,8 @@ typedef struct _meshtastic_ModuleConfig_DetectionSensorConfig {
char name[20];
/* GPIO pin to monitor for state changes */
uint8_t monitor_pin;
- /* Whether or not the GPIO pin state detection is triggered on HIGH (1)
- Otherwise LOW (0) */
- bool detection_triggered_high;
+ /* The type of trigger event to be used */
+ meshtastic_ModuleConfig_DetectionSensorConfig_TriggerType detection_trigger_type;
/* Whether or not use INPUT_PULLUP mode for GPIO pin
Only applicable if the board uses pull-up resistors on the pin */
bool use_pullup;
@@ -427,6 +445,10 @@ extern "C" {
#define _meshtastic_RemoteHardwarePinType_MAX meshtastic_RemoteHardwarePinType_DIGITAL_WRITE
#define _meshtastic_RemoteHardwarePinType_ARRAYSIZE ((meshtastic_RemoteHardwarePinType)(meshtastic_RemoteHardwarePinType_DIGITAL_WRITE+1))
+#define _meshtastic_ModuleConfig_DetectionSensorConfig_TriggerType_MIN meshtastic_ModuleConfig_DetectionSensorConfig_TriggerType_LOGIC_LOW
+#define _meshtastic_ModuleConfig_DetectionSensorConfig_TriggerType_MAX meshtastic_ModuleConfig_DetectionSensorConfig_TriggerType_EITHER_EDGE_ACTIVE_HIGH
+#define _meshtastic_ModuleConfig_DetectionSensorConfig_TriggerType_ARRAYSIZE ((meshtastic_ModuleConfig_DetectionSensorConfig_TriggerType)(meshtastic_ModuleConfig_DetectionSensorConfig_TriggerType_EITHER_EDGE_ACTIVE_HIGH+1))
+
#define _meshtastic_ModuleConfig_AudioConfig_Audio_Baud_MIN meshtastic_ModuleConfig_AudioConfig_Audio_Baud_CODEC2_DEFAULT
#define _meshtastic_ModuleConfig_AudioConfig_Audio_Baud_MAX meshtastic_ModuleConfig_AudioConfig_Audio_Baud_CODEC2_700B
#define _meshtastic_ModuleConfig_AudioConfig_Audio_Baud_ARRAYSIZE ((meshtastic_ModuleConfig_AudioConfig_Audio_Baud)(meshtastic_ModuleConfig_AudioConfig_Audio_Baud_CODEC2_700B+1))
@@ -448,6 +470,7 @@ extern "C" {
+#define meshtastic_ModuleConfig_DetectionSensorConfig_detection_trigger_type_ENUMTYPE meshtastic_ModuleConfig_DetectionSensorConfig_TriggerType
#define meshtastic_ModuleConfig_AudioConfig_bitrate_ENUMTYPE meshtastic_ModuleConfig_AudioConfig_Audio_Baud
@@ -473,7 +496,7 @@ extern "C" {
#define meshtastic_ModuleConfig_MapReportSettings_init_default {0, 0}
#define meshtastic_ModuleConfig_RemoteHardwareConfig_init_default {0, 0, 0, {meshtastic_RemoteHardwarePin_init_default, meshtastic_RemoteHardwarePin_init_default, meshtastic_RemoteHardwarePin_init_default, meshtastic_RemoteHardwarePin_init_default}}
#define meshtastic_ModuleConfig_NeighborInfoConfig_init_default {0, 0}
-#define meshtastic_ModuleConfig_DetectionSensorConfig_init_default {0, 0, 0, 0, "", 0, 0, 0}
+#define meshtastic_ModuleConfig_DetectionSensorConfig_init_default {0, 0, 0, 0, "", 0, _meshtastic_ModuleConfig_DetectionSensorConfig_TriggerType_MIN, 0}
#define meshtastic_ModuleConfig_AudioConfig_init_default {0, 0, _meshtastic_ModuleConfig_AudioConfig_Audio_Baud_MIN, 0, 0, 0, 0}
#define meshtastic_ModuleConfig_PaxcounterConfig_init_default {0, 0, 0, 0}
#define meshtastic_ModuleConfig_SerialConfig_init_default {0, 0, 0, 0, _meshtastic_ModuleConfig_SerialConfig_Serial_Baud_MIN, 0, _meshtastic_ModuleConfig_SerialConfig_Serial_Mode_MIN, 0}
@@ -489,7 +512,7 @@ extern "C" {
#define meshtastic_ModuleConfig_MapReportSettings_init_zero {0, 0}
#define meshtastic_ModuleConfig_RemoteHardwareConfig_init_zero {0, 0, 0, {meshtastic_RemoteHardwarePin_init_zero, meshtastic_RemoteHardwarePin_init_zero, meshtastic_RemoteHardwarePin_init_zero, meshtastic_RemoteHardwarePin_init_zero}}
#define meshtastic_ModuleConfig_NeighborInfoConfig_init_zero {0, 0}
-#define meshtastic_ModuleConfig_DetectionSensorConfig_init_zero {0, 0, 0, 0, "", 0, 0, 0}
+#define meshtastic_ModuleConfig_DetectionSensorConfig_init_zero {0, 0, 0, 0, "", 0, _meshtastic_ModuleConfig_DetectionSensorConfig_TriggerType_MIN, 0}
#define meshtastic_ModuleConfig_AudioConfig_init_zero {0, 0, _meshtastic_ModuleConfig_AudioConfig_Audio_Baud_MIN, 0, 0, 0, 0}
#define meshtastic_ModuleConfig_PaxcounterConfig_init_zero {0, 0, 0, 0}
#define meshtastic_ModuleConfig_SerialConfig_init_zero {0, 0, 0, 0, _meshtastic_ModuleConfig_SerialConfig_Serial_Baud_MIN, 0, _meshtastic_ModuleConfig_SerialConfig_Serial_Mode_MIN, 0}
@@ -523,7 +546,7 @@ extern "C" {
#define meshtastic_ModuleConfig_DetectionSensorConfig_send_bell_tag 4
#define meshtastic_ModuleConfig_DetectionSensorConfig_name_tag 5
#define meshtastic_ModuleConfig_DetectionSensorConfig_monitor_pin_tag 6
-#define meshtastic_ModuleConfig_DetectionSensorConfig_detection_triggered_high_tag 7
+#define meshtastic_ModuleConfig_DetectionSensorConfig_detection_trigger_type_tag 7
#define meshtastic_ModuleConfig_DetectionSensorConfig_use_pullup_tag 8
#define meshtastic_ModuleConfig_AudioConfig_codec2_enabled_tag 1
#define meshtastic_ModuleConfig_AudioConfig_ptt_pin_tag 2
@@ -688,7 +711,7 @@ X(a, STATIC, SINGULAR, UINT32, state_broadcast_secs, 3) \
X(a, STATIC, SINGULAR, BOOL, send_bell, 4) \
X(a, STATIC, SINGULAR, STRING, name, 5) \
X(a, STATIC, SINGULAR, UINT32, monitor_pin, 6) \
-X(a, STATIC, SINGULAR, BOOL, detection_triggered_high, 7) \
+X(a, STATIC, SINGULAR, UENUM, detection_trigger_type, 7) \
X(a, STATIC, SINGULAR, BOOL, use_pullup, 8)
#define meshtastic_ModuleConfig_DetectionSensorConfig_CALLBACK NULL
#define meshtastic_ModuleConfig_DetectionSensorConfig_DEFAULT NULL
diff --git a/src/mesh/wifi/WiFiAPClient.cpp b/src/mesh/wifi/WiFiAPClient.cpp
index e733d1801..c835878d3 100644
--- a/src/mesh/wifi/WiFiAPClient.cpp
+++ b/src/mesh/wifi/WiFiAPClient.cpp
@@ -15,16 +15,15 @@
#include
#ifdef ARCH_ESP32
#if !MESHTASTIC_EXCLUDE_WEBSERVER
-#if !MESHTASTIC_EXCLUDE_WEBSERVER
#include "mesh/http/WebServer.h"
#endif
-#endif
#include
#include
static void WiFiEvent(WiFiEvent_t event);
#endif
#ifndef DISABLE_NTP
+#include "Throttle.h"
#include
#endif
@@ -58,7 +57,7 @@ static void onNetworkConnected()
{
if (!APStartupComplete) {
// Start web server
- LOG_INFO("Starting network services\n");
+ LOG_INFO("Starting WiFi network services\n");
#ifdef ARCH_ESP32
// start mdns
@@ -144,7 +143,7 @@ static int32_t reconnectWiFi()
}
#ifndef DISABLE_NTP
- if (WiFi.isConnected() && (((millis() - lastrun_ntp) > 43200000) || (lastrun_ntp == 0))) { // every 12 hours
+ if (WiFi.isConnected() && (!Throttle::isWithinTimespanMs(lastrun_ntp, 43200000) || (lastrun_ntp == 0))) { // every 12 hours
LOG_DEBUG("Updating NTP time from %s\n", config.network.ntp_server);
if (timeClient.update()) {
LOG_DEBUG("NTP Request Success - Setting RTCQualityNTP if needed\n");
@@ -311,7 +310,12 @@ static void WiFiEvent(WiFiEvent_t event)
onNetworkConnected();
break;
case ARDUINO_EVENT_WIFI_STA_GOT_IP6:
+#if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 0)
+ LOG_INFO("Obtained Local IP6 address: %s\n", WiFi.linkLocalIPv6().toString().c_str());
+ LOG_INFO("Obtained GlobalIP6 address: %s\n", WiFi.globalIPv6().toString().c_str());
+#else
LOG_INFO("Obtained IP6 address: %s\n", WiFi.localIPv6().toString().c_str());
+#endif
break;
case ARDUINO_EVENT_WIFI_STA_LOST_IP:
LOG_INFO("Lost IP address and IP address is reset to 0\n");
diff --git a/src/meshUtils.cpp b/src/meshUtils.cpp
index c6f2c69b4..e98a6f1ce 100644
--- a/src/meshUtils.cpp
+++ b/src/meshUtils.cpp
@@ -60,10 +60,16 @@ char *strnstr(const char *s, const char *find, size_t slen)
void printBytes(const char *label, const uint8_t *p, size_t numbytes)
{
- LOG_DEBUG("%s: ", label);
- for (size_t i = 0; i < numbytes; i++)
- LOG_DEBUG("%02x ", p[i]);
- LOG_DEBUG("\n");
+ int labelSize = strlen(label);
+ if (labelSize < 100 && numbytes < 64) {
+ char *messageBuffer = new char[labelSize + (numbytes * 3) + 2];
+ strncpy(messageBuffer, label, labelSize);
+ for (size_t i = 0; i < numbytes; i++)
+ snprintf(messageBuffer + labelSize + i * 3, 4, " %02x", p[i]);
+ strcpy(messageBuffer + labelSize + numbytes * 3, "\n");
+ LOG_DEBUG(messageBuffer);
+ delete[] messageBuffer;
+ }
}
bool memfll(const uint8_t *mem, uint8_t find, size_t numbytes)
@@ -73,4 +79,19 @@ bool memfll(const uint8_t *mem, uint8_t find, size_t numbytes)
return false;
}
return true;
+}
+
+bool isOneOf(int item, int count, ...)
+{
+ va_list args;
+ va_start(args, count);
+ bool found = false;
+ for (int i = 0; i < count; ++i) {
+ if (item == va_arg(args, int)) {
+ found = true;
+ break;
+ }
+ }
+ va_end(args);
+ return found;
}
\ No newline at end of file
diff --git a/src/meshUtils.h b/src/meshUtils.h
index ce063cb6a..aff3976f4 100644
--- a/src/meshUtils.h
+++ b/src/meshUtils.h
@@ -1,5 +1,8 @@
#pragma once
#include "DebugConfiguration.h"
+#include
+#include
+#include
#include
/// C++ v17+ clamp function, limits a given value to a range defined by lo and hi
@@ -17,4 +20,8 @@ char *strnstr(const char *s, const char *find, size_t slen);
void printBytes(const char *label, const uint8_t *p, size_t numbytes);
// is the memory region filled with a single character?
-bool memfll(const uint8_t *mem, uint8_t find, size_t numbytes);
\ No newline at end of file
+bool memfll(const uint8_t *mem, uint8_t find, size_t numbytes);
+
+bool isOneOf(int item, int count, ...);
+
+#define IS_ONE_OF(item, ...) isOneOf(item, sizeof((int[]){__VA_ARGS__}) / sizeof(int), __VA_ARGS__)
diff --git a/src/modules/AdminModule.cpp b/src/modules/AdminModule.cpp
index bfe3a9ba5..09311abda 100644
--- a/src/modules/AdminModule.cpp
+++ b/src/modules/AdminModule.cpp
@@ -34,8 +34,8 @@
#include "modules/PositionModule.h"
#endif
-#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
-#include "AccelerometerThread.h"
+#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C
+#include "motion/AccelerometerThread.h"
#endif
AdminModule *adminModule;
@@ -73,12 +73,38 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
meshtastic_Channel *ch = &channels.getByIndex(mp.channel);
// Could tighten this up further by tracking the last public_key we went an AdminMessage request to
// and only allowing responses from that remote.
- if (!((mp.from == 0 && !config.security.is_managed) || messageIsResponse(r) ||
- (strcasecmp(ch->settings.name, Channels::adminChannel) == 0 && config.security.admin_channel_enabled) ||
- (mp.pki_encrypted && memcmp(mp.public_key.bytes, config.security.admin_key[0].bytes, 32) == 0))) {
- LOG_INFO("Ignoring admin payload %i\n", r->which_payload_variant);
+ if (messageIsResponse(r)) {
+ LOG_DEBUG("Allowing admin response message\n");
+ } else if (mp.from == 0) {
+ if (config.security.is_managed) {
+ LOG_INFO("Ignoring local admin payload because is_managed.\n");
+ return handled;
+ }
+ } else if (strcasecmp(ch->settings.name, Channels::adminChannel) == 0) {
+ if (!config.security.admin_channel_enabled) {
+ LOG_INFO("Ignoring admin channel, as legacy admin is disabled.\n");
+ myReply = allocErrorResponse(meshtastic_Routing_Error_NOT_AUTHORIZED, &mp);
+ return handled;
+ }
+ } else if (mp.pki_encrypted) {
+ if ((config.security.admin_key[0].size == 32 &&
+ memcmp(mp.public_key.bytes, config.security.admin_key[0].bytes, 32) == 0) ||
+ (config.security.admin_key[1].size == 32 &&
+ memcmp(mp.public_key.bytes, config.security.admin_key[1].bytes, 32) == 0) ||
+ (config.security.admin_key[2].size == 32 &&
+ memcmp(mp.public_key.bytes, config.security.admin_key[2].bytes, 32) == 0)) {
+ LOG_INFO("PKC admin payload with authorized sender key.\n");
+ } else {
+ myReply = allocErrorResponse(meshtastic_Routing_Error_ADMIN_PUBLIC_KEY_UNAUTHORIZED, &mp);
+ LOG_INFO("Received PKC admin payload, but the sender public key does not match the admin authorized key!\n");
+ return handled;
+ }
+ } else {
+ LOG_INFO("Ignoring unauthorized admin payload %i\n", r->which_payload_variant);
+ myReply = allocErrorResponse(meshtastic_Routing_Error_NOT_AUTHORIZED, &mp);
return handled;
}
+
LOG_INFO("Handling admin payload %i\n", r->which_payload_variant);
// all of the get and set messages, including those for other modules, flow through here first.
@@ -86,6 +112,7 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
if (mp.from != 0 && !messageIsRequest(r) && !messageIsResponse(r)) {
if (!checkPassKey(r)) {
LOG_WARN("Admin message without session_key!\n");
+ myReply = allocErrorResponse(meshtastic_Routing_Error_ADMIN_BAD_SESSION_KEY, &mp);
return handled;
}
}
@@ -186,18 +213,22 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
break;
}
case meshtastic_AdminMessage_factory_reset_config_tag: {
+ disableBluetooth();
LOG_INFO("Initiating factory config reset\n");
nodeDB->factoryReset();
+ LOG_INFO("Factory config reset finished, rebooting soon.\n");
reboot(DEFAULT_REBOOT_SECONDS);
break;
}
case meshtastic_AdminMessage_factory_reset_device_tag: {
+ disableBluetooth();
LOG_INFO("Initiating full factory reset\n");
nodeDB->factoryReset(true);
reboot(DEFAULT_REBOOT_SECONDS);
break;
}
case meshtastic_AdminMessage_nodedb_reset_tag: {
+ disableBluetooth();
LOG_INFO("Initiating node-db reset\n");
nodeDB->resetNodes();
reboot(DEFAULT_REBOOT_SECONDS);
@@ -209,6 +240,7 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
break;
}
case meshtastic_AdminMessage_commit_edit_settings_tag: {
+ disableBluetooth();
LOG_INFO("Committing transaction for edited settings\n");
hasOpenEditTransaction = false;
saveChanges(SEGMENT_CONFIG | SEGMENT_MODULECONFIG | SEGMENT_DEVICESTATE | SEGMENT_CHANNELS);
@@ -252,34 +284,26 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
break;
}
case meshtastic_AdminMessage_set_fixed_position_tag: {
- if (fromOthers) {
- LOG_INFO("Ignoring set_fixed_position command from another node.\n");
- } else {
- LOG_INFO("Client is receiving a set_fixed_position command.\n");
- meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(nodeDB->getNodeNum());
- node->has_position = true;
- node->position = TypeConversions::ConvertToPositionLite(r->set_fixed_position);
- nodeDB->setLocalPosition(r->set_fixed_position);
- config.position.fixed_position = true;
- saveChanges(SEGMENT_DEVICESTATE | SEGMENT_CONFIG, false);
+ LOG_INFO("Client is receiving a set_fixed_position command.\n");
+ meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(nodeDB->getNodeNum());
+ node->has_position = true;
+ node->position = TypeConversions::ConvertToPositionLite(r->set_fixed_position);
+ nodeDB->setLocalPosition(r->set_fixed_position);
+ config.position.fixed_position = true;
+ saveChanges(SEGMENT_DEVICESTATE | SEGMENT_CONFIG, false);
#if !MESHTASTIC_EXCLUDE_GPS
- if (gps != nullptr)
- gps->enable();
- // Send our new fixed position to the mesh for good measure
- positionModule->sendOurPosition();
+ if (gps != nullptr)
+ gps->enable();
+ // Send our new fixed position to the mesh for good measure
+ positionModule->sendOurPosition();
#endif
- }
break;
}
case meshtastic_AdminMessage_remove_fixed_position_tag: {
- if (fromOthers) {
- LOG_INFO("Ignoring remove_fixed_position command from another node.\n");
- } else {
- LOG_INFO("Client is receiving a remove_fixed_position command.\n");
- nodeDB->clearLocalPosition();
- config.position.fixed_position = false;
- saveChanges(SEGMENT_DEVICESTATE | SEGMENT_CONFIG, false);
- }
+ LOG_INFO("Client is receiving a remove_fixed_position command.\n");
+ nodeDB->clearLocalPosition();
+ config.position.fixed_position = false;
+ saveChanges(SEGMENT_DEVICESTATE | SEGMENT_CONFIG, false);
break;
}
case meshtastic_AdminMessage_set_time_only_tag: {
@@ -406,7 +430,8 @@ void AdminModule::handleSetConfig(const meshtastic_Config &c)
LOG_INFO("Setting config: Device\n");
config.has_device = true;
#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
- if (config.device.double_tap_as_button_press == false && c.payload_variant.device.double_tap_as_button_press == true) {
+ if (config.device.double_tap_as_button_press == false && c.payload_variant.device.double_tap_as_button_press == true &&
+ accelerometerThread->enabled == false) {
accelerometerThread->start();
}
#endif
@@ -484,7 +509,8 @@ void AdminModule::handleSetConfig(const meshtastic_Config &c)
requiresReboot = false;
}
#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
- if (config.display.wake_on_tap_or_motion == false && c.payload_variant.display.wake_on_tap_or_motion == true) {
+ if (config.display.wake_on_tap_or_motion == false && c.payload_variant.display.wake_on_tap_or_motion == true &&
+ accelerometerThread->enabled == false) {
accelerometerThread->start();
}
#endif
@@ -557,12 +583,16 @@ void AdminModule::handleSetConfig(const meshtastic_Config &c)
break;
}
+ if (requiresReboot) {
+ disableBluetooth();
+ }
saveChanges(changes, requiresReboot);
}
void AdminModule::handleSetModuleConfig(const meshtastic_ModuleConfig &c)
{
+ disableBluetooth();
switch (c.which_payload_variant) {
case meshtastic_ModuleConfig_mqtt_tag:
LOG_INFO("Setting module config: MQTT\n");
@@ -634,7 +664,6 @@ void AdminModule::handleSetModuleConfig(const meshtastic_ModuleConfig &c)
moduleConfig.paxcounter = c.payload_variant.paxcounter;
break;
}
-
saveChanges(SEGMENT_MODULECONFIG);
}
@@ -997,7 +1026,7 @@ bool AdminModule::checkPassKey(meshtastic_AdminMessage *res)
memcmp(res->session_passkey.bytes, session_passkey, 8) == 0);
}
-bool AdminModule::messageIsResponse(meshtastic_AdminMessage *r)
+bool AdminModule::messageIsResponse(const meshtastic_AdminMessage *r)
{
if (r->which_payload_variant == meshtastic_AdminMessage_get_channel_response_tag ||
r->which_payload_variant == meshtastic_AdminMessage_get_owner_response_tag ||
@@ -1014,7 +1043,7 @@ bool AdminModule::messageIsResponse(meshtastic_AdminMessage *r)
return false;
}
-bool AdminModule::messageIsRequest(meshtastic_AdminMessage *r)
+bool AdminModule::messageIsRequest(const meshtastic_AdminMessage *r)
{
if (r->which_payload_variant == meshtastic_AdminMessage_get_channel_request_tag ||
r->which_payload_variant == meshtastic_AdminMessage_get_owner_request_tag ||
@@ -1029,3 +1058,16 @@ bool AdminModule::messageIsRequest(meshtastic_AdminMessage *r)
else
return false;
}
+
+void disableBluetooth()
+{
+#if HAS_BLUETOOTH
+#ifdef ARCH_ESP32
+ if (nimbleBluetooth)
+ nimbleBluetooth->deinit();
+#elif defined(ARCH_NRF52)
+ if (nrf52Bluetooth)
+ nrf52Bluetooth->shutdown();
+#endif
+#endif
+}
\ No newline at end of file
diff --git a/src/modules/AdminModule.h b/src/modules/AdminModule.h
index 61c54d1b1..d6c0a7343 100644
--- a/src/modules/AdminModule.h
+++ b/src/modules/AdminModule.h
@@ -55,8 +55,10 @@ class AdminModule : public ProtobufModule, public Obser
void setPassKey(meshtastic_AdminMessage *res);
bool checkPassKey(meshtastic_AdminMessage *res);
- bool messageIsResponse(meshtastic_AdminMessage *r);
- bool messageIsRequest(meshtastic_AdminMessage *r);
+ bool messageIsResponse(const meshtastic_AdminMessage *r);
+ bool messageIsRequest(const meshtastic_AdminMessage *r);
};
-extern AdminModule *adminModule;
\ No newline at end of file
+extern AdminModule *adminModule;
+
+void disableBluetooth();
\ No newline at end of file
diff --git a/src/modules/AtakPluginModule.cpp b/src/modules/AtakPluginModule.cpp
index 437a341db..72d069619 100644
--- a/src/modules/AtakPluginModule.cpp
+++ b/src/modules/AtakPluginModule.cpp
@@ -52,6 +52,10 @@ meshtastic_TAKPacket AtakPluginModule::cloneTAKPacketData(meshtastic_TAKPacket *
} else if (t->which_payload_variant == meshtastic_TAKPacket_chat_tag) {
clone.which_payload_variant = meshtastic_TAKPacket_chat_tag;
clone.payload_variant.chat = {0};
+ } else if (t->which_payload_variant == meshtastic_TAKPacket_detail_tag) {
+ clone.which_payload_variant = meshtastic_TAKPacket_detail_tag;
+ clone.payload_variant.detail.size = t->payload_variant.detail.size;
+ memcpy(clone.payload_variant.detail.bytes, t->payload_variant.detail.bytes, t->payload_variant.detail.size);
}
return clone;
diff --git a/src/modules/CannedMessageModule.cpp b/src/modules/CannedMessageModule.cpp
index 4df5a03fc..e38b7e063 100644
--- a/src/modules/CannedMessageModule.cpp
+++ b/src/modules/CannedMessageModule.cpp
@@ -27,6 +27,7 @@
#endif
#include "graphics/ScreenFonts.h"
+#include
// Remove Canned message screen if no action is taken for some milliseconds
#define INACTIVATE_AFTER_MS 20000
@@ -77,16 +78,16 @@ int CannedMessageModule::splitConfiguredMessages()
int messageIndex = 0;
int i = 0;
- String messages = cannedMessageModuleConfig.messages;
+ String canned_messages = cannedMessageModuleConfig.messages;
#if defined(T_WATCH_S3) || defined(RAK14014)
- String separator = messages.length() ? "|" : "";
+ String separator = canned_messages.length() ? "|" : "";
- messages = "[---- Free Text ----]" + separator + messages;
+ canned_messages = "[---- Free Text ----]" + separator + canned_messages;
#endif
// collect all the message parts
- strncpy(this->messageStore, messages.c_str(), sizeof(this->messageStore));
+ strncpy(this->messageStore, canned_messages.c_str(), sizeof(this->messageStore));
// The first message points to the beginning of the store.
this->messages[messageIndex++] = this->messageStore;
@@ -190,17 +191,17 @@ int CannedMessageModule::handleInputEvent(const InputEvent *event)
#if defined(T_WATCH_S3) || defined(RAK14014)
if (event->inputEvent == static_cast(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_LEFT)) {
- this->payload = 0xb4;
+ this->payload = INPUT_BROKER_MSG_LEFT;
} else if (event->inputEvent == static_cast(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT)) {
- this->payload = 0xb7;
+ this->payload = INPUT_BROKER_MSG_RIGHT;
}
#else
// tweak for left/right events generated via trackball/touch with empty kbchar
if (!event->kbchar) {
if (event->inputEvent == static_cast(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_LEFT)) {
- this->payload = 0xb4;
+ this->payload = INPUT_BROKER_MSG_LEFT;
} else if (event->inputEvent == static_cast(meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT)) {
- this->payload = 0xb7;
+ this->payload = INPUT_BROKER_MSG_RIGHT;
}
} else {
// pass the pressed key
@@ -222,26 +223,26 @@ int CannedMessageModule::handleInputEvent(const InputEvent *event)
// Run modifier key code below, (doesnt inturrupt typing or reset to start screen page)
switch (event->kbchar) {
- case 0x11: // make screen brighter
+ case INPUT_BROKER_MSG_BRIGHTNESS_UP: // make screen brighter
if (screen)
screen->increaseBrightness();
LOG_DEBUG("increasing Screen Brightness\n");
break;
- case 0x12: // make screen dimmer
+ case INPUT_BROKER_MSG_BRIGHTNESS_DOWN: // make screen dimmer
if (screen)
screen->decreaseBrightness();
LOG_DEBUG("Decreasing Screen Brightness\n");
break;
- case 0xf1: // draw modifier (function) symbal
+ case INPUT_BROKER_MSG_FN_SYMBOL_ON: // draw modifier (function) symbal
if (screen)
screen->setFunctionSymbal("Fn");
break;
- case 0xf2: // remove modifier (function) symbal
+ case INPUT_BROKER_MSG_FN_SYMBOL_OFF: // remove modifier (function) symbal
if (screen)
screen->removeFunctionSymbal("Fn");
break;
// mute (switch off/toggle) external notifications on fn+m
- case 0xac:
+ case INPUT_BROKER_MSG_MUTE_TOGGLE:
if (moduleConfig.external_notification.enabled == true) {
if (externalNotificationModule->getMute()) {
externalNotificationModule->setMute(false);
@@ -257,7 +258,7 @@ int CannedMessageModule::handleInputEvent(const InputEvent *event)
}
}
break;
- case 0x9e: // toggle GPS like triple press does
+ case INPUT_BROKER_MSG_GPS_TOGGLE: // toggle GPS like triple press does
#if !MESHTASTIC_EXCLUDE_GPS
if (gps != nullptr) {
gps->toggleGpsMode();
@@ -267,7 +268,7 @@ int CannedMessageModule::handleInputEvent(const InputEvent *event)
showTemporaryMessage("GPS Toggled");
#endif
break;
- case 0xaf: // fn+space send network ping like double press does
+ case INPUT_BROKER_MSG_SEND_PING: // fn+space send network ping like double press does
service->refreshLocalMeshNode();
if (service->trySendPosition(NODENUM_BROADCAST, true)) {
showTemporaryMessage("Position \nUpdate Sent");
@@ -275,6 +276,13 @@ int CannedMessageModule::handleInputEvent(const InputEvent *event)
showTemporaryMessage("Node Info \nUpdate Sent");
}
break;
+ case INPUT_BROKER_MSG_DISMISS_FRAME: // fn+del: dismiss screen frames like text or waypoint
+ // Avoid opening the canned message screen frame
+ // We're only handling the keypress here by convention, this has nothing to do with canned messages
+ this->runState = CANNED_MESSAGE_RUN_STATE_INACTIVE;
+ // Attempt to close whatever frame is currently shown on display
+ screen->dismissCurrentFrame();
+ return 0;
default:
// pass the pressed key
// LOG_DEBUG("Canned message ANYKEY (%x)\n", event->kbchar);
@@ -283,7 +291,7 @@ int CannedMessageModule::handleInputEvent(const InputEvent *event)
validEvent = true;
break;
}
- if (screen && (event->kbchar != 0xf1)) {
+ if (screen && (event->kbchar != INPUT_BROKER_MSG_FN_SYMBOL_ON)) {
screen->removeFunctionSymbal("Fn"); // remove modifier (function) symbal
}
}
@@ -422,7 +430,7 @@ int32_t CannedMessageModule::runOnce()
this->notifyObservers(&e);
} else if (((this->runState == CANNED_MESSAGE_RUN_STATE_ACTIVE) || (this->runState == CANNED_MESSAGE_RUN_STATE_FREETEXT)) &&
- ((millis() - this->lastTouchMillis) > INACTIVATE_AFTER_MS)) {
+ !Throttle::isWithinTimespanMs(this->lastTouchMillis, INACTIVATE_AFTER_MS)) {
// Reset module
e.action = UIFrameEvent::Action::REGENERATE_FRAMESET; // We want to change the list of frames shown on-screen
this->currentMessageIndex = -1;
@@ -505,7 +513,7 @@ int32_t CannedMessageModule::runOnce()
}
} else if (this->runState == CANNED_MESSAGE_RUN_STATE_FREETEXT || this->runState == CANNED_MESSAGE_RUN_STATE_ACTIVE) {
switch (this->payload) {
- case 0xb4: // left
+ case INPUT_BROKER_MSG_LEFT:
if (this->destSelect == CANNED_MESSAGE_DESTINATION_TYPE_NODE) {
size_t numMeshNodes = nodeDB->getNumMeshNodes();
if (this->dest == NODENUM_BROADCAST) {
@@ -540,7 +548,7 @@ int32_t CannedMessageModule::runOnce()
}
}
break;
- case 0xb7: // right
+ case INPUT_BROKER_MSG_RIGHT:
if (this->destSelect == CANNED_MESSAGE_DESTINATION_TYPE_NODE) {
size_t numMeshNodes = nodeDB->getNumMeshNodes();
if (this->dest == NODENUM_BROADCAST) {
@@ -602,19 +610,19 @@ int32_t CannedMessageModule::runOnce()
this->destSelect = CANNED_MESSAGE_DESTINATION_TYPE_NODE;
}
break;
- case 0xb4: // left
- case 0xb7: // right
+ case INPUT_BROKER_MSG_LEFT:
+ case INPUT_BROKER_MSG_RIGHT:
// already handled above
break;
// handle fn+s for shutdown
- case 0x9b:
+ case INPUT_BROKER_MSG_SHUTDOWN:
if (screen)
screen->startAlert("Shutting down...");
shutdownAtMsec = millis() + DEFAULT_SHUTDOWN_SECONDS * 1000;
runState = CANNED_MESSAGE_RUN_STATE_INACTIVE;
break;
// and fn+r for reboot
- case 0x90:
+ case INPUT_BROKER_MSG_REBOOT:
if (screen)
screen->startAlert("Rebooting...");
rebootAtMsec = millis() + DEFAULT_REBOOT_SECONDS * 1000;
@@ -934,6 +942,19 @@ void CannedMessageModule::drawEnterIcon(OLEDDisplay *display, int x, int y, floa
#endif
+// Indicate to screen class that module is handling keyboard input specially (at certain times)
+// This prevents the left & right keys being used for nav. between screen frames during text entry.
+bool CannedMessageModule::interceptingKeyboardInput()
+{
+ switch (runState) {
+ case CANNED_MESSAGE_RUN_STATE_DISABLED:
+ case CANNED_MESSAGE_RUN_STATE_INACTIVE:
+ return false;
+ default:
+ return true;
+ }
+}
+
void CannedMessageModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
{
char buffer[50];
diff --git a/src/modules/CannedMessageModule.h b/src/modules/CannedMessageModule.h
index 9e6af8890..e9dc2bda0 100644
--- a/src/modules/CannedMessageModule.h
+++ b/src/modules/CannedMessageModule.h
@@ -114,6 +114,7 @@ class CannedMessageModule : public SinglePortModule, public ObservableshouldDraw(); }
virtual Observable *getUIFrameObservable() override { return this; }
virtual void drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y) override;
+ virtual bool interceptingKeyboardInput() override;
virtual AdminMessageHandleResult handleAdminMessageForModule(const meshtastic_MeshPacket &mp,
meshtastic_AdminMessage *request,
meshtastic_AdminMessage *response) override;
@@ -223,4 +224,4 @@ class CannedMessageModule : public SinglePortModule, public Observable
DetectionSensorModule *detectionSensorModule;
#define GPIO_POLLING_INTERVAL 100
#define DELAYED_INTERVAL 1000
+typedef enum {
+ DetectionSensorVerdictDetected,
+ DetectionSensorVerdictSendState,
+ DetectionSensorVerdictNoop,
+} DetectionSensorTriggerVerdict;
+
+typedef DetectionSensorTriggerVerdict (*DetectionSensorTriggerHandler)(bool prev, bool current);
+
+static DetectionSensorTriggerVerdict detection_trigger_logic_level(bool prev, bool current)
+{
+ return current ? DetectionSensorVerdictDetected : DetectionSensorVerdictNoop;
+}
+
+static DetectionSensorTriggerVerdict detection_trigger_single_edge(bool prev, bool current)
+{
+ return (!prev && current) ? DetectionSensorVerdictDetected : DetectionSensorVerdictNoop;
+}
+
+static DetectionSensorTriggerVerdict detection_trigger_either_edge(bool prev, bool current)
+{
+ if (prev == current) {
+ return DetectionSensorVerdictNoop;
+ }
+ return current ? DetectionSensorVerdictDetected : DetectionSensorVerdictSendState;
+}
+
+const static DetectionSensorTriggerHandler handlers[_meshtastic_ModuleConfig_DetectionSensorConfig_TriggerType_MAX + 1] = {
+ [meshtastic_ModuleConfig_DetectionSensorConfig_TriggerType_LOGIC_LOW] = detection_trigger_logic_level,
+ [meshtastic_ModuleConfig_DetectionSensorConfig_TriggerType_LOGIC_HIGH] = detection_trigger_logic_level,
+ [meshtastic_ModuleConfig_DetectionSensorConfig_TriggerType_FALLING_EDGE] = detection_trigger_single_edge,
+ [meshtastic_ModuleConfig_DetectionSensorConfig_TriggerType_RISING_EDGE] = detection_trigger_single_edge,
+ [meshtastic_ModuleConfig_DetectionSensorConfig_TriggerType_EITHER_EDGE_ACTIVE_LOW] = detection_trigger_either_edge,
+ [meshtastic_ModuleConfig_DetectionSensorConfig_TriggerType_EITHER_EDGE_ACTIVE_HIGH] = detection_trigger_either_edge,
+};
+
int32_t DetectionSensorModule::runOnce()
{
/*
@@ -21,7 +57,8 @@ int32_t DetectionSensorModule::runOnce()
// moduleConfig.detection_sensor.monitor_pin = 21; // WisBlock RAK12013 Radar IO6
// moduleConfig.detection_sensor.minimum_broadcast_secs = 30;
// moduleConfig.detection_sensor.state_broadcast_secs = 120;
- // moduleConfig.detection_sensor.detection_triggered_high = true;
+ // moduleConfig.detection_sensor.detection_trigger_type =
+ // meshtastic_ModuleConfig_DetectionSensorConfig_TriggerType_LOGIC_HIGH;
// strcpy(moduleConfig.detection_sensor.name, "Motion");
if (moduleConfig.detection_sensor.enabled == false)
@@ -49,18 +86,31 @@ int32_t DetectionSensorModule::runOnce()
// LOG_DEBUG("Detection Sensor Module: Current pin state: %i\n", digitalRead(moduleConfig.detection_sensor.monitor_pin));
- if ((millis() - lastSentToMesh) >= Default::getConfiguredOrDefaultMs(moduleConfig.detection_sensor.minimum_broadcast_secs) &&
- hasDetectionEvent()) {
- sendDetectionMessage();
- return DELAYED_INTERVAL;
+ if (!Throttle::isWithinTimespanMs(lastSentToMesh,
+ Default::getConfiguredOrDefaultMs(moduleConfig.detection_sensor.minimum_broadcast_secs))) {
+ bool isDetected = hasDetectionEvent();
+ DetectionSensorTriggerVerdict verdict =
+ handlers[moduleConfig.detection_sensor.detection_trigger_type](wasDetected, isDetected);
+ wasDetected = isDetected;
+ switch (verdict) {
+ case DetectionSensorVerdictDetected:
+ sendDetectionMessage();
+ return DELAYED_INTERVAL;
+ case DetectionSensorVerdictSendState:
+ sendCurrentStateMessage(isDetected);
+ return DELAYED_INTERVAL;
+ case DetectionSensorVerdictNoop:
+ break;
+ }
}
// Even if we haven't detected an event, broadcast our current state to the mesh on the scheduled interval as a sort
// of heartbeat. We only do this if the minimum broadcast interval is greater than zero, otherwise we'll only broadcast state
// change detections.
- else if (moduleConfig.detection_sensor.state_broadcast_secs > 0 &&
- (millis() - lastSentToMesh) >= Default::getConfiguredOrDefaultMs(moduleConfig.detection_sensor.state_broadcast_secs,
- default_telemetry_broadcast_interval_secs)) {
- sendCurrentStateMessage();
+ if (moduleConfig.detection_sensor.state_broadcast_secs > 0 &&
+ !Throttle::isWithinTimespanMs(lastSentToMesh,
+ Default::getConfiguredOrDefaultMs(moduleConfig.detection_sensor.state_broadcast_secs,
+ default_telemetry_broadcast_interval_secs))) {
+ sendCurrentStateMessage(hasDetectionEvent());
return DELAYED_INTERVAL;
}
return GPIO_POLLING_INTERVAL;
@@ -86,10 +136,10 @@ void DetectionSensorModule::sendDetectionMessage()
delete[] message;
}
-void DetectionSensorModule::sendCurrentStateMessage()
+void DetectionSensorModule::sendCurrentStateMessage(bool state)
{
char *message = new char[40];
- sprintf(message, "%s state: %i", moduleConfig.detection_sensor.name, hasDetectionEvent());
+ sprintf(message, "%s state: %i", moduleConfig.detection_sensor.name, state);
meshtastic_MeshPacket *p = allocDataPacket();
p->want_ack = false;
@@ -105,5 +155,5 @@ bool DetectionSensorModule::hasDetectionEvent()
{
bool currentState = digitalRead(moduleConfig.detection_sensor.monitor_pin);
// LOG_DEBUG("Detection Sensor Module: Current state: %i\n", currentState);
- return moduleConfig.detection_sensor.detection_triggered_high ? currentState : !currentState;
+ return (moduleConfig.detection_sensor.detection_trigger_type & 1) ? currentState : !currentState;
}
\ No newline at end of file
diff --git a/src/modules/DetectionSensorModule.h b/src/modules/DetectionSensorModule.h
index ed6cddda5..b960c8744 100644
--- a/src/modules/DetectionSensorModule.h
+++ b/src/modules/DetectionSensorModule.h
@@ -15,8 +15,9 @@ class DetectionSensorModule : public SinglePortModule, private concurrency::OSTh
private:
bool firstTime = true;
uint32_t lastSentToMesh = 0;
+ bool wasDetected = false;
void sendDetectionMessage();
- void sendCurrentStateMessage();
+ void sendCurrentStateMessage(bool state);
bool hasDetectionEvent();
};
diff --git a/src/modules/ExternalNotificationModule.h b/src/modules/ExternalNotificationModule.h
index 08e72c35a..a5dff3651 100644
--- a/src/modules/ExternalNotificationModule.h
+++ b/src/modules/ExternalNotificationModule.h
@@ -3,7 +3,7 @@
#include "SinglePortModule.h"
#include "concurrency/OSThread.h"
#include "configuration.h"
-#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL)
+#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !defined(CONFIG_IDF_TARGET_ESP32C6)
#include
#else
// Noop class for portduino.
diff --git a/src/modules/Modules.cpp b/src/modules/Modules.cpp
index 9dd431848..c48e7b318 100644
--- a/src/modules/Modules.cpp
+++ b/src/modules/Modules.cpp
@@ -48,6 +48,9 @@
#endif
#if ARCH_PORTDUINO
#include "input/LinuxInputImpl.h"
+#if !MESHTASTIC_EXCLUDE_STOREFORWARD
+#include "modules/StoreForwardModule.h"
+#endif
#endif
#if HAS_TELEMETRY
#include "modules/Telemetry/DeviceTelemetry.h"
@@ -68,7 +71,7 @@
#include "modules/esp32/PaxcounterModule.h"
#endif
#if !MESHTASTIC_EXCLUDE_STOREFORWARD
-#include "modules/esp32/StoreForwardModule.h"
+#include "modules/StoreForwardModule.h"
#endif
#endif
#if defined(ARCH_ESP32) || defined(ARCH_NRF52) || defined(ARCH_RP2040)
diff --git a/src/modules/NeighborInfoModule.cpp b/src/modules/NeighborInfoModule.cpp
index 218fb8801..55ed46b5e 100644
--- a/src/modules/NeighborInfoModule.cpp
+++ b/src/modules/NeighborInfoModule.cpp
@@ -3,6 +3,7 @@
#include "MeshService.h"
#include "NodeDB.h"
#include "RTC.h"
+#include
NeighborInfoModule *neighborInfoModule;
@@ -83,11 +84,11 @@ uint32_t NeighborInfoModule::collectNeighborInfo(meshtastic_NeighborInfo *neighb
*/
void NeighborInfoModule::cleanUpNeighbors()
{
- uint32_t now = getTime();
NodeNum my_node_id = nodeDB->getNodeNum();
for (auto it = neighbors.rbegin(); it != neighbors.rend();) {
// We will remove a neighbor if we haven't heard from them in twice the broadcast interval
- if ((now - it->last_rx_time > it->node_broadcast_interval_secs * 2) && (it->node_id != my_node_id)) {
+ if (!Throttle::isWithinTimespanMs(it->last_rx_time, it->node_broadcast_interval_secs * 2) &&
+ (it->node_id != my_node_id)) {
LOG_DEBUG("Removing neighbor with node ID 0x%x\n", it->node_id);
it = std::vector::reverse_iterator(
neighbors.erase(std::next(it).base())); // Erase the element and update the iterator
diff --git a/src/modules/NodeInfoModule.cpp b/src/modules/NodeInfoModule.cpp
index cb047a4dc..41f008fb0 100644
--- a/src/modules/NodeInfoModule.cpp
+++ b/src/modules/NodeInfoModule.cpp
@@ -6,6 +6,7 @@
#include "Router.h"
#include "configuration.h"
#include "main.h"
+#include
NodeInfoModule *nodeInfoModule;
@@ -67,13 +68,12 @@ meshtastic_MeshPacket *NodeInfoModule::allocReply()
LOG_DEBUG("Skip sending NodeInfo due to > 40 percent channel util.\n");
return NULL;
}
- uint32_t now = millis();
// If we sent our NodeInfo less than 5 min. ago, don't send it again as it may be still underway.
- if (!shorterTimeout && lastSentToMesh && (now - lastSentToMesh) < (5 * 60 * 1000)) {
+ if (!shorterTimeout && lastSentToMesh && Throttle::isWithinTimespanMs(lastSentToMesh, 5 * 60 * 1000)) {
LOG_DEBUG("Skip sending NodeInfo since we just sent it less than 5 minutes ago.\n");
ignoreRequest = true; // Mark it as ignored for MeshModule
return NULL;
- } else if (shorterTimeout && lastSentToMesh && (now - lastSentToMesh) < (60 * 1000)) {
+ } else if (shorterTimeout && lastSentToMesh && Throttle::isWithinTimespanMs(lastSentToMesh, 60 * 1000)) {
LOG_DEBUG("Skip sending actively requested NodeInfo since we just sent it less than 60 seconds ago.\n");
ignoreRequest = true; // Mark it as ignored for MeshModule
return NULL;
@@ -82,7 +82,7 @@ meshtastic_MeshPacket *NodeInfoModule::allocReply()
meshtastic_User &u = owner;
LOG_INFO("sending owner %s/%s/%s\n", u.id, u.long_name, u.short_name);
- lastSentToMesh = now;
+ lastSentToMesh = millis();
return allocDataProtobuf(u);
}
}
diff --git a/src/modules/PositionModule.cpp b/src/modules/PositionModule.cpp
index 7c08835bc..f49a654af 100644
--- a/src/modules/PositionModule.cpp
+++ b/src/modules/PositionModule.cpp
@@ -12,6 +12,7 @@
#include "gps/GeoCoord.h"
#include "main.h"
#include "mesh/compression/unishox2.h"
+#include "meshUtils.h"
#include "meshtastic/atak.pb.h"
#include "sleep.h"
#include "target_specific.h"
@@ -145,8 +146,12 @@ void PositionModule::trySetRtc(meshtastic_Position p, bool isLocal, bool forceUp
bool PositionModule::hasQualityTimesource()
{
bool setFromPhoneOrNtpToday =
- lastSetFromPhoneNtpOrGps == 0 ? false : (millis() - lastSetFromPhoneNtpOrGps) <= (SEC_PER_DAY * 1000UL);
+ lastSetFromPhoneNtpOrGps == 0 ? false : Throttle::isWithinTimespanMs(lastSetFromPhoneNtpOrGps, SEC_PER_DAY * 1000UL);
+#if MESHTASTIC_EXCLUDE_GPS
+ bool hasGpsOrRtc = (rtc_found.address != ScanI2C::ADDRESS_NONE.address);
+#else
bool hasGpsOrRtc = (gps && gps->isConnected()) || (rtc_found.address != ScanI2C::ADDRESS_NONE.address);
+#endif
return hasGpsOrRtc || setFromPhoneOrNtpToday;
}
@@ -269,7 +274,7 @@ meshtastic_MeshPacket *PositionModule::allocAtakPli()
meshtastic_TAKPacket takPacket = {.is_compressed = true,
.has_contact = true,
- .contact = {0},
+ .contact = meshtastic_Contact_init_default,
.has_group = true,
.group = {meshtastic_MemberRole_TeamMember, meshtastic_Team_Cyan},
.has_status = true,
@@ -278,13 +283,13 @@ meshtastic_MeshPacket *PositionModule::allocAtakPli()
.battery = powerStatus->getBatteryChargePercent(),
},
.which_payload_variant = meshtastic_TAKPacket_pli_tag,
- {.pli = {
- .latitude_i = localPosition.latitude_i,
- .longitude_i = localPosition.longitude_i,
- .altitude = localPosition.altitude_hae,
- .speed = localPosition.ground_speed,
- .course = static_cast(localPosition.ground_track),
- }}};
+ .payload_variant = {.pli = {
+ .latitude_i = localPosition.latitude_i,
+ .longitude_i = localPosition.longitude_i,
+ .altitude = localPosition.altitude_hae,
+ .speed = localPosition.ground_speed,
+ .course = static_cast(localPosition.ground_track),
+ }}};
auto length = unishox2_compress_lines(owner.long_name, strlen(owner.long_name), takPacket.contact.device_callsign,
sizeof(takPacket.contact.device_callsign) - 1, USX_PSET_DFLT, NULL);
@@ -343,8 +348,8 @@ void PositionModule::sendOurPosition(NodeNum dest, bool wantReplies, uint8_t cha
service->sendToMesh(p, RX_SRC_LOCAL, true);
- if ((config.device.role == meshtastic_Config_DeviceConfig_Role_TRACKER ||
- config.device.role == meshtastic_Config_DeviceConfig_Role_TAK_TRACKER) &&
+ if (IS_ONE_OF(config.device.role, meshtastic_Config_DeviceConfig_Role_TRACKER,
+ meshtastic_Config_DeviceConfig_Role_TAK_TRACKER) &&
config.power.is_power_saving) {
LOG_DEBUG("Starting next execution in 5 seconds and then going to sleep.\n");
sleepOnNextExecution = true;
diff --git a/src/modules/PositionModule.h b/src/modules/PositionModule.h
index c4ef66501..41b86b795 100644
--- a/src/modules/PositionModule.h
+++ b/src/modules/PositionModule.h
@@ -63,7 +63,7 @@ class PositionModule : public ProtobufModule, private concu
bool hasQualityTimesource();
const uint32_t minimumTimeThreshold =
- Default::getConfiguredOrDefaultMsScaled(config.position.broadcast_smart_minimum_interval_secs, 30, numOnlineNodes);
+ Default::getConfiguredOrDefaultMs(config.position.broadcast_smart_minimum_interval_secs, 30);
};
struct SmartPosition {
diff --git a/src/modules/PowerStressModule.cpp b/src/modules/PowerStressModule.cpp
index 4c9f0df88..48159ba54 100644
--- a/src/modules/PowerStressModule.cpp
+++ b/src/modules/PowerStressModule.cpp
@@ -9,6 +9,7 @@
#include "main.h"
#include "sleep.h"
#include "target_specific.h"
+#include
extern void printInfo();
@@ -114,7 +115,7 @@ int32_t PowerStressModule::runOnce()
break;
case meshtastic_PowerStressMessage_Opcode_CPU_FULLON: {
uint32_t start_msec = millis();
- while ((millis() - start_msec) < (uint32_t)sleep_msec)
+ while (Throttle::isWithinTimespanMs(start_msec, sleep_msec))
; // Don't let CPU idle at all
sleep_msec = 0; // we already slept
break;
diff --git a/src/modules/RangeTestModule.cpp b/src/modules/RangeTestModule.cpp
index 8154a661e..c98f15d40 100644
--- a/src/modules/RangeTestModule.cpp
+++ b/src/modules/RangeTestModule.cpp
@@ -19,6 +19,7 @@
#include "configuration.h"
#include "gps/GeoCoord.h"
#include
+#include
RangeTestModule *rangeTestModule;
RangeTestModuleRadio *rangeTestModuleRadio;
@@ -79,7 +80,7 @@ int32_t RangeTestModule::runOnce()
}
// If we have been running for more than 8 hours, turn module back off
- if (millis() - started > 28800000) {
+ if (!Throttle::isWithinTimespanMs(started, 28800000)) {
LOG_INFO("Range Test Module - Disabling after 8 hours\n");
return disable();
} else {
@@ -114,7 +115,7 @@ void RangeTestModuleRadio::sendPayload(NodeNum dest, bool wantReplies)
packetSequence++;
- static char heartbeatString[MAX_RHPACKETLEN];
+ static char heartbeatString[MAX_LORA_PAYLOAD_LEN + 1];
snprintf(heartbeatString, sizeof(heartbeatString), "seq %u", packetSequence);
p->decoded.payload.size = strlen(heartbeatString); // You must specify how many bytes are in the reply
diff --git a/src/modules/RemoteHardwareModule.cpp b/src/modules/RemoteHardwareModule.cpp
index 6910005a8..43612e450 100644
--- a/src/modules/RemoteHardwareModule.cpp
+++ b/src/modules/RemoteHardwareModule.cpp
@@ -5,6 +5,7 @@
#include "Router.h"
#include "configuration.h"
#include "main.h"
+#include
#define NUM_GPIOS 64
@@ -14,26 +15,44 @@
// a max of one change per 30 seconds
#define WATCH_INTERVAL_MSEC (30 * 1000)
+// Tests for access to read from or write to a specified GPIO pin
+static bool pinAccessAllowed(uint64_t mask, uint8_t pin)
+{
+ // If undefined pin access is allowed, don't check the pin and just return true
+ if (moduleConfig.remote_hardware.allow_undefined_pin_access) {
+ return true;
+ }
+
+ // Test to see if the pin is in the list of allowed pins and return true if found
+ if (mask & (1ULL << pin)) {
+ return true;
+ }
+
+ return false;
+}
+
/// Set pin modes for every set bit in a mask
-static void pinModes(uint64_t mask, uint8_t mode)
+static void pinModes(uint64_t mask, uint8_t mode, uint64_t maskAvailable)
{
for (uint64_t i = 0; i < NUM_GPIOS; i++) {
if (mask & (1ULL << i)) {
- pinMode(i, mode);
+ if (pinAccessAllowed(maskAvailable, i)) {
+ pinMode(i, mode);
+ }
}
}
}
/// Read all the pins mentioned in a mask
-static uint64_t digitalReads(uint64_t mask)
+static uint64_t digitalReads(uint64_t mask, uint64_t maskAvailable)
{
uint64_t res = 0;
- pinModes(mask, INPUT_PULLUP);
+ pinModes(mask, INPUT_PULLUP, maskAvailable);
for (uint64_t i = 0; i < NUM_GPIOS; i++) {
uint64_t m = 1ULL << i;
- if (mask & m) {
+ if (mask & m && pinAccessAllowed(maskAvailable, i)) {
if (digitalRead(i)) {
res |= m;
}
@@ -47,6 +66,13 @@ RemoteHardwareModule::RemoteHardwareModule()
: ProtobufModule("remotehardware", meshtastic_PortNum_REMOTE_HARDWARE_APP, &meshtastic_HardwareMessage_msg),
concurrency::OSThread("RemoteHardwareModule")
{
+ // restrict to the gpio channel for rx
+ boundChannel = Channels::gpioChannel;
+
+ // Pull available pin allowlist from config and build a bitmask out of it for fast comparisons later
+ for (uint8_t i = 0; i < 4; i++) {
+ availablePins += 1ULL << moduleConfig.remote_hardware.available_pins[i].gpio_pin;
+ }
}
bool RemoteHardwareModule::handleReceivedProtobuf(const meshtastic_MeshPacket &req, meshtastic_HardwareMessage *pptr)
@@ -60,10 +86,10 @@ bool RemoteHardwareModule::handleReceivedProtobuf(const meshtastic_MeshPacket &r
// Print notification to LCD screen
screen->print("Write GPIOs\n");
- pinModes(p.gpio_mask, OUTPUT);
+ pinModes(p.gpio_mask, OUTPUT, availablePins);
for (uint8_t i = 0; i < NUM_GPIOS; i++) {
uint64_t mask = 1ULL << i;
- if (p.gpio_mask & mask) {
+ if (p.gpio_mask & mask && pinAccessAllowed(availablePins, i)) {
digitalWrite(i, (p.gpio_value & mask) ? 1 : 0);
}
}
@@ -76,7 +102,7 @@ bool RemoteHardwareModule::handleReceivedProtobuf(const meshtastic_MeshPacket &r
if (screen)
screen->print("Read GPIOs\n");
- uint64_t res = digitalReads(p.gpio_mask);
+ uint64_t res = digitalReads(p.gpio_mask, availablePins);
// Send the reply
meshtastic_HardwareMessage r = meshtastic_HardwareMessage_init_default;
@@ -116,11 +142,10 @@ bool RemoteHardwareModule::handleReceivedProtobuf(const meshtastic_MeshPacket &r
int32_t RemoteHardwareModule::runOnce()
{
if (moduleConfig.remote_hardware.enabled && watchGpios) {
- uint32_t now = millis();
- if (now - lastWatchMsec >= WATCH_INTERVAL_MSEC) {
- uint64_t curVal = digitalReads(watchGpios);
- lastWatchMsec = now;
+ if (!Throttle::isWithinTimespanMs(lastWatchMsec, WATCH_INTERVAL_MSEC)) {
+ uint64_t curVal = digitalReads(watchGpios, availablePins);
+ lastWatchMsec = millis();
if (curVal != previousWatch) {
previousWatch = curVal;
diff --git a/src/modules/RemoteHardwareModule.h b/src/modules/RemoteHardwareModule.h
index dd39f5b69..4dc31d405 100644
--- a/src/modules/RemoteHardwareModule.h
+++ b/src/modules/RemoteHardwareModule.h
@@ -17,6 +17,9 @@ class RemoteHardwareModule : public ProtobufModule,
/// The timestamp of our last watch event (we throttle watches to 1 change every 30 seconds)
uint32_t lastWatchMsec = 0;
+ /// A bitmask of GPIOs that are exposed to the mesh if undefined access is not enabled
+ uint64_t availablePins = 0;
+
public:
/** Constructor
* name is for debugging output
diff --git a/src/modules/SerialModule.cpp b/src/modules/SerialModule.cpp
index f0ba64f65..6d6a947bc 100644
--- a/src/modules/SerialModule.cpp
+++ b/src/modules/SerialModule.cpp
@@ -7,6 +7,7 @@
#include "Router.h"
#include "configuration.h"
#include
+#include
/*
SerialModule
@@ -62,6 +63,9 @@ SerialModuleRadio *serialModuleRadio;
#if defined(TTGO_T_ECHO) || defined(CANARYONE)
SerialModule::SerialModule() : StreamAPI(&Serial), concurrency::OSThread("SerialModule") {}
static Print *serialPrint = &Serial;
+#elif defined(CONFIG_IDF_TARGET_ESP32C6)
+SerialModule::SerialModule() : StreamAPI(&Serial1), concurrency::OSThread("SerialModule") {}
+static Print *serialPrint = &Serial1;
#else
SerialModule::SerialModule() : StreamAPI(&Serial2), concurrency::OSThread("SerialModule") {}
static Print *serialPrint = &Serial2;
@@ -97,8 +101,7 @@ SerialModuleRadio::SerialModuleRadio() : MeshModule("SerialModuleRadio")
*/
bool SerialModule::checkIsConnected()
{
- uint32_t now = millis();
- return (now - lastContactMsec) < SERIAL_CONNECTION_TIMEOUT;
+ return Throttle::isWithinTimespanMs(lastContactMsec, SERIAL_CONNECTION_TIMEOUT);
}
int32_t SerialModule::runOnce()
@@ -137,7 +140,16 @@ int32_t SerialModule::runOnce()
// Give it a chance to flush out 💩
delay(10);
}
-#ifdef ARCH_ESP32
+#if defined(CONFIG_IDF_TARGET_ESP32C6)
+ if (moduleConfig.serial.rxd && moduleConfig.serial.txd) {
+ Serial1.setRxBufferSize(RX_BUFFER);
+ Serial1.begin(baud, SERIAL_8N1, moduleConfig.serial.rxd, moduleConfig.serial.txd);
+ } else {
+ Serial.begin(baud);
+ Serial.setTimeout(moduleConfig.serial.timeout > 0 ? moduleConfig.serial.timeout : TIMEOUT);
+ }
+
+#elif defined(ARCH_ESP32)
if (moduleConfig.serial.rxd && moduleConfig.serial.txd) {
Serial2.setRxBufferSize(RX_BUFFER);
@@ -182,13 +194,13 @@ int32_t SerialModule::runOnce()
return runOncePart();
} else if ((moduleConfig.serial.mode == meshtastic_ModuleConfig_SerialConfig_Serial_Mode_NMEA) && HAS_GPS) {
// in NMEA mode send out GGA every 2 seconds, Don't read from Port
- if (millis() - lastNmeaTime > 2000) {
+ if (!Throttle::isWithinTimespanMs(lastNmeaTime, 2000)) {
lastNmeaTime = millis();
printGGA(outbuf, sizeof(outbuf), localPosition);
serialPrint->printf("%s", outbuf);
}
} else if ((moduleConfig.serial.mode == meshtastic_ModuleConfig_SerialConfig_Serial_Mode_CALTOPO) && HAS_GPS) {
- if (millis() - lastNmeaTime > 10000) {
+ if (!Throttle::isWithinTimespanMs(lastNmeaTime, 10000)) {
lastNmeaTime = millis();
uint32_t readIndex = 0;
const meshtastic_NodeInfoLite *tempNodeInfo = nodeDB->readNextMeshNode(readIndex);
@@ -205,8 +217,13 @@ int32_t SerialModule::runOnce()
processWXSerial();
} else {
+#if defined(CONFIG_IDF_TARGET_ESP32C6)
+ while (Serial1.available()) {
+ serialPayloadSize = Serial1.readBytes(serialBytes, meshtastic_Constants_DATA_PAYLOAD_LEN);
+#else
while (Serial2.available()) {
serialPayloadSize = Serial2.readBytes(serialBytes, meshtastic_Constants_DATA_PAYLOAD_LEN);
+#endif
serialModuleRadio->sendPayload();
}
}
@@ -392,7 +409,7 @@ uint32_t SerialModule::getBaudRate()
*/
void SerialModule::processWXSerial()
{
-#if !defined(TTGO_T_ECHO) && !defined(CANARYONE)
+#if !defined(TTGO_T_ECHO) && !defined(CANARYONE) && !defined(CONFIG_IDF_TARGET_ESP32C6)
static unsigned int lastAveraged = 0;
static unsigned int averageIntervalMillis = 300000; // 5 minutes hard coded.
static double dir_sum_sin = 0;
@@ -500,7 +517,7 @@ void SerialModule::processWXSerial()
LOG_INFO("WS85 : %i %.1fg%.1f %.1fv %.1fv\n", atoi(windDir), strtof(windVel, nullptr), strtof(windGust, nullptr),
batVoltageF, capVoltageF);
}
- if (gotwind && millis() - lastAveraged > averageIntervalMillis) {
+ if (gotwind && !Throttle::isWithinTimespanMs(lastAveraged, averageIntervalMillis)) {
// calulate averages and send to the mesh
float velAvg = 1.0 * velSum / velCount;
diff --git a/src/modules/esp32/StoreForwardModule.cpp b/src/modules/StoreForwardModule.cpp
similarity index 97%
rename from src/modules/esp32/StoreForwardModule.cpp
rename to src/modules/StoreForwardModule.cpp
index c696d342a..29fbd8d92 100644
--- a/src/modules/esp32/StoreForwardModule.cpp
+++ b/src/modules/StoreForwardModule.cpp
@@ -17,6 +17,7 @@
#include "NodeDB.h"
#include "RTC.h"
#include "Router.h"
+#include "Throttle.h"
#include "airtime.h"
#include "configuration.h"
#include "memGet.h"
@@ -29,9 +30,12 @@
StoreForwardModule *storeForwardModule;
+uint32_t lastHeartbeat = 0;
+uint32_t heartbeatInterval = 60; // Default to 60 seconds, adjust as needed
+
int32_t StoreForwardModule::runOnce()
{
-#ifdef ARCH_ESP32
+#if defined(ARCH_ESP32) || defined(ARCH_PORTDUINO)
if (moduleConfig.store_forward.enabled && is_server) {
// Send out the message queue.
if (this->busy) {
@@ -42,7 +46,7 @@ int32_t StoreForwardModule::runOnce()
this->busy = false;
}
}
- } else if (this->heartbeat && (millis() - lastHeartbeat > (heartbeatInterval * 1000)) &&
+ } else if (this->heartbeat && (!Throttle::isWithinTimespanMs(lastHeartbeat, heartbeatInterval * 1000)) &&
airTime->isTxAllowedChannelUtil(true)) {
lastHeartbeat = millis();
LOG_INFO("*** Sending heartbeat\n");
@@ -78,8 +82,12 @@ void StoreForwardModule::populatePSRAM()
uint32_t numberOfPackets =
(this->records ? this->records : (((memGet.getFreePsram() / 3) * 2) / sizeof(PacketHistoryStruct)));
this->records = numberOfPackets;
-
+#if defined(ARCH_ESP32)
this->packetHistory = static_cast(ps_calloc(numberOfPackets, sizeof(PacketHistoryStruct)));
+#elif defined(ARCH_PORTDUINO)
+ this->packetHistory = static_cast(calloc(numberOfPackets, sizeof(PacketHistoryStruct)));
+
+#endif
LOG_DEBUG("*** After PSRAM initialization: heap %d/%d PSRAM %d/%d\n", memGet.getFreeHeap(), memGet.getHeapSize(),
memGet.getFreePsram(), memGet.getPsramSize());
@@ -127,7 +135,7 @@ uint32_t StoreForwardModule::getNumAvailablePackets(NodeNum dest, uint32_t last_
{
uint32_t count = 0;
if (lastRequest.find(dest) == lastRequest.end()) {
- lastRequest[dest] = 0;
+ lastRequest.emplace(dest, 0);
}
for (uint32_t i = lastRequest[dest]; i < this->packetHistoryTotalCount; i++) {
if (this->packetHistory[i].time && (this->packetHistory[i].time > last_time)) {
@@ -372,7 +380,7 @@ void StoreForwardModule::statsSend(uint32_t to)
*/
ProcessMessage StoreForwardModule::handleReceived(const meshtastic_MeshPacket &mp)
{
-#ifdef ARCH_ESP32
+#if defined(ARCH_ESP32) || defined(ARCH_PORTDUINO)
if (moduleConfig.store_forward.enabled) {
if ((mp.decoded.portnum == meshtastic_PortNum_TEXT_MESSAGE_APP) && is_server) {
@@ -555,7 +563,7 @@ StoreForwardModule::StoreForwardModule()
ProtobufModule("StoreForward", meshtastic_PortNum_STORE_FORWARD_APP, &meshtastic_StoreAndForward_msg)
{
-#ifdef ARCH_ESP32
+#if defined(ARCH_ESP32) || defined(ARCH_PORTDUINO)
isPromiscuous = true; // Brown chicken brown cow
diff --git a/src/modules/esp32/StoreForwardModule.h b/src/modules/StoreForwardModule.h
similarity index 100%
rename from src/modules/esp32/StoreForwardModule.h
rename to src/modules/StoreForwardModule.h
diff --git a/src/modules/Telemetry/AirQualityTelemetry.cpp b/src/modules/Telemetry/AirQualityTelemetry.cpp
index d07296710..0b6be1b7e 100644
--- a/src/modules/Telemetry/AirQualityTelemetry.cpp
+++ b/src/modules/Telemetry/AirQualityTelemetry.cpp
@@ -10,11 +10,12 @@
#include "PowerFSM.h"
#include "RTC.h"
#include "Router.h"
+#include "detect/ScanI2CTwoWire.h"
#include "main.h"
+#include
int32_t AirQualityTelemetryModule::runOnce()
{
- int32_t result = INT32_MAX;
/*
Uncomment the preferences below if you want to use the module
without having to configure it from the PythonAPI or WebUI.
@@ -29,31 +30,45 @@ int32_t AirQualityTelemetryModule::runOnce()
if (firstTime) {
// This is the first time the OSThread library has called this function, so do some setup
- firstTime = 0;
+ firstTime = false;
if (moduleConfig.telemetry.air_quality_enabled) {
LOG_INFO("Air quality Telemetry: Initializing\n");
if (!aqi.begin_I2C()) {
- LOG_WARN("Could not establish i2c connection to AQI sensor\n");
+ LOG_WARN("Could not establish i2c connection to AQI sensor. Rescanning...\n");
+ // rescan for late arriving sensors. AQI Module starts about 10 seconds into the boot so this is plenty.
+ uint8_t i2caddr_scan[] = {PMSA0031_ADDR};
+ uint8_t i2caddr_asize = 1;
+ auto i2cScanner = std::unique_ptr(new ScanI2CTwoWire());
+#if defined(I2C_SDA1)
+ i2cScanner->scanPort(ScanI2C::I2CPort::WIRE1, i2caddr_scan, i2caddr_asize);
+#endif
+ i2cScanner->scanPort(ScanI2C::I2CPort::WIRE, i2caddr_scan, i2caddr_asize);
+ auto found = i2cScanner->find(ScanI2C::DeviceType::PMSA0031);
+ if (found.type != ScanI2C::DeviceType::NONE) {
+ nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_PMSA003I].first = found.address.address;
+ nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_PMSA003I].second =
+ i2cScanner->fetchI2CBus(found.address);
+ return 1000;
+ }
return disable();
}
return 1000;
}
- return result;
+ return disable();
} else {
// if we somehow got to a second run of this module with measurement disabled, then just wait forever
if (!moduleConfig.telemetry.air_quality_enabled)
- return result;
+ return disable();
- uint32_t now = millis();
if (((lastSentToMesh == 0) ||
- ((now - lastSentToMesh) >= Default::getConfiguredOrDefaultMsScaled(moduleConfig.telemetry.air_quality_interval,
- default_telemetry_broadcast_interval_secs,
- numOnlineNodes))) &&
+ !Throttle::isWithinTimespanMs(lastSentToMesh, Default::getConfiguredOrDefaultMsScaled(
+ moduleConfig.telemetry.air_quality_interval,
+ default_telemetry_broadcast_interval_secs, numOnlineNodes))) &&
airTime->isTxAllowedChannelUtil(config.device.role != meshtastic_Config_DeviceConfig_Role_SENSOR) &&
airTime->isTxAllowedAirUtil()) {
sendTelemetry();
- lastSentToMesh = now;
+ lastSentToMesh = millis();
} else if (service->isToPhoneQueueEmpty()) {
// Just send to phone when it's not our time to send to mesh yet
// Only send while queue is empty (phone assumed connected)
diff --git a/src/modules/Telemetry/AirQualityTelemetry.h b/src/modules/Telemetry/AirQualityTelemetry.h
index 23df6ac58..fb8edd07e 100644
--- a/src/modules/Telemetry/AirQualityTelemetry.h
+++ b/src/modules/Telemetry/AirQualityTelemetry.h
@@ -44,7 +44,7 @@ class AirQualityTelemetryModule : private concurrency::OSThread, public Protobuf
private:
Adafruit_PM25AQI aqi;
PM25_AQI_Data data = {0};
- bool firstTime = 1;
+ bool firstTime = true;
meshtastic_MeshPacket *lastMeasurementPacket;
uint32_t sendToPhoneIntervalMs = SECONDS_IN_MINUTE * 1000; // Send to phone every minute
uint32_t lastSentToMesh = 0;
diff --git a/src/modules/Telemetry/DeviceTelemetry.cpp b/src/modules/Telemetry/DeviceTelemetry.cpp
index f22685d43..dd5067784 100644
--- a/src/modules/Telemetry/DeviceTelemetry.cpp
+++ b/src/modules/Telemetry/DeviceTelemetry.cpp
@@ -11,14 +11,15 @@
#include "main.h"
#include
#include
+#include
#define MAGIC_USB_BATTERY_LEVEL 101
int32_t DeviceTelemetryModule::runOnce()
{
refreshUptime();
- bool isImpoliteRole = config.device.role == meshtastic_Config_DeviceConfig_Role_SENSOR ||
- config.device.role == meshtastic_Config_DeviceConfig_Role_ROUTER;
+ bool isImpoliteRole =
+ IS_ONE_OF(config.device.role, meshtastic_Config_DeviceConfig_Role_SENSOR, meshtastic_Config_DeviceConfig_Role_ROUTER);
if (((lastSentToMesh == 0) ||
((uptimeLastMs - lastSentToMesh) >=
Default::getConfiguredOrDefaultMsScaled(moduleConfig.telemetry.device_update_interval,
@@ -100,8 +101,9 @@ meshtastic_Telemetry DeviceTelemetryModule::getDeviceTelemetry()
#if ARCH_PORTDUINO
t.variant.device_metrics.battery_level = MAGIC_USB_BATTERY_LEVEL;
#else
- t.variant.device_metrics.battery_level =
- powerStatus->getIsCharging() ? MAGIC_USB_BATTERY_LEVEL : powerStatus->getBatteryChargePercent();
+ t.variant.device_metrics.battery_level = (!powerStatus->getHasBattery() || powerStatus->getIsCharging())
+ ? MAGIC_USB_BATTERY_LEVEL
+ : powerStatus->getBatteryChargePercent();
#endif
t.variant.device_metrics.channel_utilization = airTime->channelUtilizationPercent();
t.variant.device_metrics.voltage = powerStatus->getBatteryVoltageMv() / 1000.0;
@@ -123,7 +125,7 @@ void DeviceTelemetryModule::sendLocalStatsToPhone()
telemetry.variant.local_stats.num_total_nodes = nodeDB->getNumMeshNodes();
if (RadioLibInterface::instance) {
telemetry.variant.local_stats.num_packets_tx = RadioLibInterface::instance->txGood;
- telemetry.variant.local_stats.num_packets_rx = RadioLibInterface::instance->rxGood;
+ telemetry.variant.local_stats.num_packets_rx = RadioLibInterface::instance->rxGood + RadioLibInterface::instance->rxBad;
telemetry.variant.local_stats.num_packets_rx_bad = RadioLibInterface::instance->rxBad;
}
diff --git a/src/modules/Telemetry/EnvironmentTelemetry.cpp b/src/modules/Telemetry/EnvironmentTelemetry.cpp
index 31cb2f838..ac291c4ab 100644
--- a/src/modules/Telemetry/EnvironmentTelemetry.cpp
+++ b/src/modules/Telemetry/EnvironmentTelemetry.cpp
@@ -64,6 +64,7 @@ T1000xSensor t1000xSensor;
#define DISPLAY_RECEIVEID_MEASUREMENTS_ON_SCREEN true
#include "graphics/ScreenFonts.h"
+#include
int32_t EnvironmentTelemetryModule::runOnce()
{
@@ -82,7 +83,7 @@ int32_t EnvironmentTelemetryModule::runOnce()
*/
// moduleConfig.telemetry.environment_measurement_enabled = 1;
- // moduleConfig.telemetry.environment_screen_enabled = 1;
+ // moduleConfig.telemetry.environment_screen_enabled = 1;
// moduleConfig.telemetry.environment_update_interval = 15;
if (!(moduleConfig.telemetry.environment_measurement_enabled || moduleConfig.telemetry.environment_screen_enabled)) {
@@ -143,6 +144,8 @@ int32_t EnvironmentTelemetryModule::runOnce()
result = mlx90632Sensor.runOnce();
if (nau7802Sensor.hasSensor())
result = nau7802Sensor.runOnce();
+ if (max17048Sensor.hasSensor())
+ result = max17048Sensor.runOnce();
#endif
}
return result;
@@ -155,21 +158,20 @@ int32_t EnvironmentTelemetryModule::runOnce()
result = bme680Sensor.runTrigger();
}
- uint32_t now = millis();
if (((lastSentToMesh == 0) ||
- ((now - lastSentToMesh) >=
- Default::getConfiguredOrDefaultMsScaled(moduleConfig.telemetry.environment_update_interval,
- default_telemetry_broadcast_interval_secs, numOnlineNodes))) &&
+ !Throttle::isWithinTimespanMs(lastSentToMesh, Default::getConfiguredOrDefaultMsScaled(
+ moduleConfig.telemetry.environment_update_interval,
+ default_telemetry_broadcast_interval_secs, numOnlineNodes))) &&
airTime->isTxAllowedChannelUtil(config.device.role != meshtastic_Config_DeviceConfig_Role_SENSOR) &&
airTime->isTxAllowedAirUtil()) {
sendTelemetry();
- lastSentToMesh = now;
- } else if (((lastSentToPhone == 0) || ((now - lastSentToPhone) >= sendToPhoneIntervalMs)) &&
+ lastSentToMesh = millis();
+ } else if (((lastSentToPhone == 0) || !Throttle::isWithinTimespanMs(lastSentToPhone, sendToPhoneIntervalMs)) &&
(service->isToPhoneQueueEmpty())) {
// Just send to phone when it's not our time to send to mesh yet
// Only send while queue is empty (phone assumed connected)
sendTelemetry(NODENUM_BROADCAST, true);
- lastSentToPhone = now;
+ lastSentToPhone = millis();
}
}
return min(sendToPhoneIntervalMs, result);
@@ -214,7 +216,7 @@ void EnvironmentTelemetryModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiSt
uint32_t agoSecs = GetTimeSinceMeshPacket(lastMeasurementPacket);
const char *lastSender = getSenderShortName(*lastMeasurementPacket);
- auto &p = lastMeasurementPacket->decoded;
+ const meshtastic_Data &p = lastMeasurementPacket->decoded;
if (!pb_decode_from_bytes(p.payload.bytes, p.payload.size, &meshtastic_Telemetry_msg, &lastMeasurement)) {
display->drawString(x, y, "Measurement Error");
LOG_ERROR("Unable to decode last packet");
@@ -397,6 +399,10 @@ bool EnvironmentTelemetryModule::getEnvironmentTelemetry(meshtastic_Telemetry *m
m->variant.environment_metrics.relative_humidity = m_ahtx.variant.environment_metrics.relative_humidity;
}
}
+ if (max17048Sensor.hasSensor()) {
+ valid = valid && max17048Sensor.getMetrics(m);
+ hasSensor = true;
+ }
#endif
return valid && hasSensor;
@@ -587,6 +593,11 @@ AdminMessageHandleResult EnvironmentTelemetryModule::handleAdminMessageForModule
if (result != AdminMessageHandleResult::NOT_HANDLED)
return result;
}
+ if (max17048Sensor.hasSensor()) {
+ result = max17048Sensor.handleAdminMessage(mp, request, response);
+ if (result != AdminMessageHandleResult::NOT_HANDLED)
+ return result;
+ }
return result;
}
diff --git a/src/modules/Telemetry/PowerTelemetry.cpp b/src/modules/Telemetry/PowerTelemetry.cpp
index 318acf456..d31892042 100644
--- a/src/modules/Telemetry/PowerTelemetry.cpp
+++ b/src/modules/Telemetry/PowerTelemetry.cpp
@@ -19,6 +19,7 @@
#define DISPLAY_RECEIVEID_MEASUREMENTS_ON_SCREEN true
#include "graphics/ScreenFonts.h"
+#include
int32_t PowerTelemetryModule::runOnce()
{
@@ -59,6 +60,8 @@ int32_t PowerTelemetryModule::runOnce()
result = ina260Sensor.runOnce();
if (ina3221Sensor.hasSensor() && !ina3221Sensor.isInitialized())
result = ina3221Sensor.runOnce();
+ if (max17048Sensor.hasSensor() && !max17048Sensor.isInitialized())
+ result = max17048Sensor.runOnce();
}
return result;
#else
@@ -69,20 +72,19 @@ int32_t PowerTelemetryModule::runOnce()
if (!moduleConfig.telemetry.power_measurement_enabled)
return disable();
- uint32_t now = millis();
if (((lastSentToMesh == 0) ||
- ((now - lastSentToMesh) >= Default::getConfiguredOrDefaultMsScaled(moduleConfig.telemetry.power_update_interval,
- default_telemetry_broadcast_interval_secs,
- numOnlineNodes))) &&
+ !Throttle::isWithinTimespanMs(lastSentToMesh, Default::getConfiguredOrDefaultMsScaled(
+ moduleConfig.telemetry.power_update_interval,
+ default_telemetry_broadcast_interval_secs, numOnlineNodes))) &&
airTime->isTxAllowedAirUtil()) {
sendTelemetry();
- lastSentToMesh = now;
- } else if (((lastSentToPhone == 0) || ((now - lastSentToPhone) >= sendToPhoneIntervalMs)) &&
+ lastSentToMesh = millis();
+ } else if (((lastSentToPhone == 0) || !Throttle::isWithinTimespanMs(lastSentToPhone, sendToPhoneIntervalMs)) &&
(service->isToPhoneQueueEmpty())) {
// Just send to phone when it's not our time to send to mesh yet
// Only send while queue is empty (phone assumed connected)
sendTelemetry(NODENUM_BROADCAST, true);
- lastSentToPhone = now;
+ lastSentToPhone = millis();
}
}
return min(sendToPhoneIntervalMs, result);
@@ -120,7 +122,7 @@ void PowerTelemetryModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *s
uint32_t agoSecs = GetTimeyWimeySinceMeshPacket(lastMeasurementPacket);
const char *lastSender = getSenderShortName(*lastMeasurementPacket);
- auto &p = lastMeasurementPacket->decoded;
+ const meshtastic_Data &p = lastMeasurementPacket->decoded;
if (!pb_decode_from_bytes(p.payload.bytes, p.payload.size, &meshtastic_Telemetry_msg, &lastMeasurement)) {
display->setFont(FONT_SMALL);
display->drawString(x, y += _fontHeight(FONT_MEDIUM), "Measurement Error");
@@ -128,19 +130,23 @@ void PowerTelemetryModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *s
return;
}
+ // Display current and voltage based on ...power_metrics.has_[channel/voltage/current]... flags
display->setFont(FONT_SMALL);
- String last_temp = String(lastMeasurement.variant.environment_metrics.temperature, 0) + "°C";
display->drawString(x, y += _fontHeight(FONT_MEDIUM) - 2, "From: " + String(lastSender) + "(" + String(agoSecs) + "s)");
- if (lastMeasurement.variant.power_metrics.ch1_voltage != 0) {
+ if (lastMeasurement.variant.power_metrics.has_ch1_voltage || lastMeasurement.variant.power_metrics.has_ch1_current) {
display->drawString(x, y += _fontHeight(FONT_SMALL),
- "Ch 1 Volt/Cur: " + String(lastMeasurement.variant.power_metrics.ch1_voltage, 0) + "V / " +
- String(lastMeasurement.variant.power_metrics.ch1_current, 0) + "mA");
+ "Ch1 Volt: " + String(lastMeasurement.variant.power_metrics.ch1_voltage, 2) +
+ "V / Curr: " + String(lastMeasurement.variant.power_metrics.ch1_current, 0) + "mA");
+ }
+ if (lastMeasurement.variant.power_metrics.has_ch2_voltage || lastMeasurement.variant.power_metrics.has_ch2_current) {
display->drawString(x, y += _fontHeight(FONT_SMALL),
- "Ch 2 Volt/Cur: " + String(lastMeasurement.variant.power_metrics.ch2_voltage, 0) + "V / " +
- String(lastMeasurement.variant.power_metrics.ch2_current, 0) + "mA");
+ "Ch2 Volt: " + String(lastMeasurement.variant.power_metrics.ch2_voltage, 2) +
+ "V / Curr: " + String(lastMeasurement.variant.power_metrics.ch2_current, 0) + "mA");
+ }
+ if (lastMeasurement.variant.power_metrics.has_ch3_voltage || lastMeasurement.variant.power_metrics.has_ch3_current) {
display->drawString(x, y += _fontHeight(FONT_SMALL),
- "Ch 3 Volt/Cur: " + String(lastMeasurement.variant.power_metrics.ch3_voltage, 0) + "V / " +
- String(lastMeasurement.variant.power_metrics.ch3_current, 0) + "mA");
+ "Ch3 Volt: " + String(lastMeasurement.variant.power_metrics.ch3_voltage, 2) +
+ "V / Curr: " + String(lastMeasurement.variant.power_metrics.ch3_current, 0) + "mA");
}
}
@@ -150,8 +156,8 @@ bool PowerTelemetryModule::handleReceivedProtobuf(const meshtastic_MeshPacket &m
#ifdef DEBUG_PORT
const char *sender = getSenderShortName(mp);
- LOG_INFO("(Received from %s): ch1_voltage=%f, ch1_current=%f, ch2_voltage=%f, ch2_current=%f, "
- "ch3_voltage=%f, ch3_current=%f\n",
+ LOG_INFO("(Received from %s): ch1_voltage=%.1f, ch1_current=%.1f, ch2_voltage=%.1f, ch2_current=%.1f, "
+ "ch3_voltage=%.1f, ch3_current=%.1f\n",
sender, t->variant.power_metrics.ch1_voltage, t->variant.power_metrics.ch1_current,
t->variant.power_metrics.ch2_voltage, t->variant.power_metrics.ch2_current, t->variant.power_metrics.ch3_voltage,
t->variant.power_metrics.ch3_current);
@@ -172,12 +178,7 @@ bool PowerTelemetryModule::getPowerTelemetry(meshtastic_Telemetry *m)
m->time = getTime();
m->which_variant = meshtastic_Telemetry_power_metrics_tag;
- m->variant.power_metrics.ch1_voltage = 0;
- m->variant.power_metrics.ch1_current = 0;
- m->variant.power_metrics.ch2_voltage = 0;
- m->variant.power_metrics.ch2_current = 0;
- m->variant.power_metrics.ch3_voltage = 0;
- m->variant.power_metrics.ch3_current = 0;
+ m->variant.power_metrics = meshtastic_PowerMetrics_init_zero;
#if HAS_TELEMETRY && !defined(ARCH_PORTDUINO)
if (ina219Sensor.hasSensor())
valid = ina219Sensor.getMetrics(m);
@@ -185,6 +186,8 @@ bool PowerTelemetryModule::getPowerTelemetry(meshtastic_Telemetry *m)
valid = ina260Sensor.getMetrics(m);
if (ina3221Sensor.hasSensor())
valid = ina3221Sensor.getMetrics(m);
+ if (max17048Sensor.hasSensor())
+ valid = max17048Sensor.getMetrics(m);
#endif
return valid;
diff --git a/src/modules/Telemetry/Sensor/MAX17048Sensor.cpp b/src/modules/Telemetry/Sensor/MAX17048Sensor.cpp
new file mode 100644
index 000000000..a3890df43
--- /dev/null
+++ b/src/modules/Telemetry/Sensor/MAX17048Sensor.cpp
@@ -0,0 +1,176 @@
+#include "MAX17048Sensor.h"
+
+#if !MESHTASTIC_EXCLUDE_I2C && !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL)
+
+MAX17048Singleton *MAX17048Singleton::GetInstance()
+{
+ if (pinstance == nullptr) {
+ pinstance = new MAX17048Singleton();
+ }
+ return pinstance;
+}
+
+MAX17048Singleton::MAX17048Singleton() {}
+
+MAX17048Singleton::~MAX17048Singleton() {}
+
+MAX17048Singleton *MAX17048Singleton::pinstance{nullptr};
+
+bool MAX17048Singleton::runOnce(TwoWire *theWire)
+{
+ initialized = begin(theWire);
+ LOG_DEBUG("MAX17048Sensor::runOnce %s\n", initialized ? "began ok" : "begin failed");
+ return initialized;
+}
+
+bool MAX17048Singleton::isBatteryCharging()
+{
+ float volts = cellVoltage();
+ if (isnan(volts)) {
+ LOG_DEBUG("MAX17048Sensor::isBatteryCharging is not connected\n");
+ return 0;
+ }
+
+ MAX17048ChargeSample sample;
+ sample.chargeRate = chargeRate(); // charge/discharge rate in percent/hr
+ sample.cellPercent = cellPercent(); // state of charge in percent 0 to 100
+ chargeSamples.push(sample); // save a sample into a fifo buffer
+
+ // Keep the fifo buffer trimmed
+ while (chargeSamples.size() > MAX17048_CHARGING_SAMPLES)
+ chargeSamples.pop();
+
+ // Based on the past n samples, is the lipo charging, discharging or idle
+ if (chargeSamples.front().chargeRate > MAX17048_CHARGING_MINIMUM_RATE &&
+ chargeSamples.back().chargeRate > MAX17048_CHARGING_MINIMUM_RATE) {
+ if (chargeSamples.front().cellPercent > chargeSamples.back().cellPercent)
+ chargeState = MAX17048ChargeState::EXPORT;
+ else if (chargeSamples.front().cellPercent < chargeSamples.back().cellPercent)
+ chargeState = MAX17048ChargeState::IMPORT;
+ else
+ chargeState = MAX17048ChargeState::IDLE;
+ } else {
+ chargeState = MAX17048ChargeState::IDLE;
+ }
+
+ LOG_DEBUG("MAX17048Sensor::isBatteryCharging %s volts: %.3f soc: %.3f rate: %.3f\n", chargeLabels[chargeState], volts,
+ sample.cellPercent, sample.chargeRate);
+ return chargeState == MAX17048ChargeState::IMPORT;
+}
+
+uint16_t MAX17048Singleton::getBusVoltageMv()
+{
+ float volts = cellVoltage();
+ if (isnan(volts)) {
+ LOG_DEBUG("MAX17048Sensor::getBusVoltageMv is not connected\n");
+ return 0;
+ }
+ LOG_DEBUG("MAX17048Sensor::getBusVoltageMv %.3fmV\n", volts);
+ return (uint16_t)(volts * 1000.0f);
+}
+
+uint8_t MAX17048Singleton::getBusBatteryPercent()
+{
+ float soc = cellPercent();
+ LOG_DEBUG("MAX17048Sensor::getBusBatteryPercent %.1f%%\n", soc);
+ return clamp(static_cast(round(soc)), static_cast(0), static_cast(100));
+}
+
+uint16_t MAX17048Singleton::getTimeToGoSecs()
+{
+ float rate = chargeRate(); // charge/discharge rate in percent/hr
+ float soc = cellPercent(); // state of charge in percent 0 to 100
+ soc = clamp(soc, 0.0f, 100.0f); // clamp soc between 0 and 100%
+ float ttg = ((100.0f - soc) / rate) * 3600.0f; // calculate seconds to charge/discharge
+ LOG_DEBUG("MAX17048Sensor::getTimeToGoSecs %.0f seconds\n", ttg);
+ return (uint16_t)ttg;
+}
+
+bool MAX17048Singleton::isBatteryConnected()
+{
+ float volts = cellVoltage();
+ if (isnan(volts)) {
+ LOG_DEBUG("MAX17048Sensor::isBatteryConnected is not connected\n");
+ return false;
+ }
+
+ // if a valid voltage is returned, then battery must be connected
+ return true;
+}
+
+bool MAX17048Singleton::isExternallyPowered()
+{
+ float volts = cellVoltage();
+ if (isnan(volts)) {
+ // if the battery is not connected then there must be external power
+ LOG_DEBUG("MAX17048Sensor::isExternallyPowered battery is\n");
+ return true;
+ }
+ // if the bus voltage is over MAX17048_BUS_POWER_VOLTS, then the external power
+ // is assumed to be connected
+ LOG_DEBUG("MAX17048Sensor::isExternallyPowered %s connected\n", volts >= MAX17048_BUS_POWER_VOLTS ? "is" : "is not");
+ return volts >= MAX17048_BUS_POWER_VOLTS;
+}
+
+#if (HAS_TELEMETRY && (!MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR || !MESHTASTIC_EXCLUDE_POWER_TELEMETRY))
+
+MAX17048Sensor::MAX17048Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_MAX17048, "MAX17048") {}
+
+int32_t MAX17048Sensor::runOnce()
+{
+ if (isInitialized()) {
+ LOG_INFO("Init sensor: %s is already initialised\n", sensorName);
+ return true;
+ }
+
+ LOG_INFO("Init sensor: %s\n", sensorName);
+ if (!hasSensor()) {
+ return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS;
+ }
+
+ // Get a singleton instance and initialise the max17048
+ if (max17048 == nullptr) {
+ max17048 = MAX17048Singleton::GetInstance();
+ }
+ status = max17048->runOnce(nodeTelemetrySensorsMap[sensorType].second);
+ return initI2CSensor();
+}
+
+void MAX17048Sensor::setup() {}
+
+bool MAX17048Sensor::getMetrics(meshtastic_Telemetry *measurement)
+{
+ LOG_DEBUG("MAX17048Sensor::getMetrics id: %i\n", measurement->which_variant);
+
+ float volts = max17048->cellVoltage();
+ if (isnan(volts)) {
+ LOG_DEBUG("MAX17048Sensor::getMetrics battery is not connected\n");
+ return false;
+ }
+
+ float rate = max17048->chargeRate(); // charge/discharge rate in percent/hr
+ float soc = max17048->cellPercent(); // state of charge in percent 0 to 100
+ soc = clamp(soc, 0.0f, 100.0f); // clamp soc between 0 and 100%
+ float ttg = (100.0f - soc) / rate; // calculate hours to charge/discharge
+
+ LOG_DEBUG("MAX17048Sensor::getMetrics volts: %.3fV soc: %.1f%% ttg: %.1f hours\n", volts, soc, ttg);
+ if ((int)measurement->which_variant == meshtastic_Telemetry_power_metrics_tag) {
+ measurement->variant.power_metrics.has_ch1_voltage = true;
+ measurement->variant.power_metrics.ch1_voltage = volts;
+ } else if ((int)measurement->which_variant == meshtastic_Telemetry_device_metrics_tag) {
+ measurement->variant.device_metrics.has_battery_level = true;
+ measurement->variant.device_metrics.has_voltage = true;
+ measurement->variant.device_metrics.battery_level = static_cast(round(soc));
+ measurement->variant.device_metrics.voltage = volts;
+ }
+ return true;
+}
+
+uint16_t MAX17048Sensor::getBusVoltageMv()
+{
+ return max17048->getBusVoltageMv();
+};
+
+#endif
+
+#endif
\ No newline at end of file
diff --git a/src/modules/Telemetry/Sensor/MAX17048Sensor.h b/src/modules/Telemetry/Sensor/MAX17048Sensor.h
new file mode 100644
index 000000000..20dca324c
--- /dev/null
+++ b/src/modules/Telemetry/Sensor/MAX17048Sensor.h
@@ -0,0 +1,110 @@
+#pragma once
+
+#ifndef MAX17048_SENSOR_H
+#define MAX17048_SENSOR_H
+
+#include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_I2C && !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL)
+
+// Samples to store in a buffer to determine if the battery is charging or discharging
+#define MAX17048_CHARGING_SAMPLES 3
+
+// Threshold to determine if the battery is on charge, in percent/hour
+#define MAX17048_CHARGING_MINIMUM_RATE 1.0f
+
+// Threshold to determine if the board has bus power
+#define MAX17048_BUS_POWER_VOLTS 4.195f
+
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "TelemetrySensor.h"
+#include "VoltageSensor.h"
+
+#include "meshUtils.h"
+#include
+#include
+
+struct MAX17048ChargeSample {
+ float cellPercent;
+ float chargeRate;
+};
+
+enum MAX17048ChargeState { IDLE, EXPORT, IMPORT };
+
+// Singleton wrapper for the Adafruit_MAX17048 class
+class MAX17048Singleton : public Adafruit_MAX17048
+{
+ private:
+ static MAX17048Singleton *pinstance;
+ bool initialized = false;
+ std::queue chargeSamples;
+ MAX17048ChargeState chargeState = IDLE;
+ const String chargeLabels[3] = {F("idle"), F("export"), F("import")};
+
+ protected:
+ MAX17048Singleton();
+ ~MAX17048Singleton();
+
+ public:
+ // Create a singleton instance (not thread safe)
+ static MAX17048Singleton *GetInstance();
+
+ // Singletons should not be cloneable.
+ MAX17048Singleton(MAX17048Singleton &other) = delete;
+
+ // Singletons should not be assignable.
+ void operator=(const MAX17048Singleton &) = delete;
+
+ // Initialise the sensor (not thread safe)
+ virtual bool runOnce(TwoWire *theWire = &Wire);
+
+ // Get the current bus voltage
+ uint16_t getBusVoltageMv();
+
+ // Get the state of charge in percent 0 to 100
+ uint8_t getBusBatteryPercent();
+
+ // Calculate the seconds to charge/discharge
+ uint16_t getTimeToGoSecs();
+
+ // Returns true if the battery sensor has started
+ inline virtual bool isInitialised() { return initialized; };
+
+ // Returns true if the battery is currently on charge (not thread safe)
+ bool isBatteryCharging();
+
+ // Returns true if a battery is actually connected
+ bool isBatteryConnected();
+
+ // Returns true if there is bus or external power connected
+ bool isExternallyPowered();
+};
+
+#if (HAS_TELEMETRY && (!MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR || !MESHTASTIC_EXCLUDE_POWER_TELEMETRY))
+
+class MAX17048Sensor : public TelemetrySensor, VoltageSensor
+{
+ private:
+ MAX17048Singleton *max17048 = nullptr;
+
+ protected:
+ virtual void setup() override;
+
+ public:
+ MAX17048Sensor();
+
+ // Initialise the sensor
+ virtual int32_t runOnce() override;
+
+ // Get the current bus voltage and state of charge
+ virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
+
+ // Get the current bus voltage
+ virtual uint16_t getBusVoltageMv() override;
+};
+
+#endif
+
+#endif
+
+#endif
\ No newline at end of file
diff --git a/src/modules/Telemetry/Sensor/NAU7802Sensor.cpp b/src/modules/Telemetry/Sensor/NAU7802Sensor.cpp
index d7dcbd09f..59f310a24 100644
--- a/src/modules/Telemetry/Sensor/NAU7802Sensor.cpp
+++ b/src/modules/Telemetry/Sensor/NAU7802Sensor.cpp
@@ -7,6 +7,7 @@
#include "NAU7802Sensor.h"
#include "SafeFile.h"
#include "TelemetrySensor.h"
+#include
#include
#include
@@ -40,7 +41,7 @@ bool NAU7802Sensor::getMetrics(meshtastic_Telemetry *measurement)
uint32_t start = millis();
while (!nau7802.available()) {
delay(100);
- if (millis() - start > 1000) {
+ if (!Throttle::isWithinTimespanMs(start, 1000)) {
nau7802.powerDown();
return false;
}
diff --git a/src/modules/Telemetry/Sensor/T1000xSensor.cpp b/src/modules/Telemetry/Sensor/T1000xSensor.cpp
index 4079d8ae3..4772aeb9e 100644
--- a/src/modules/Telemetry/Sensor/T1000xSensor.cpp
+++ b/src/modules/Telemetry/Sensor/T1000xSensor.cpp
@@ -95,7 +95,7 @@ float T1000xSensor::getTemp()
Vout = ntc_vot;
Rt = (HEATER_NTC_RP * vcc_vot) / Vout - HEATER_NTC_RP;
- for (u8i = 0; u8i < 136; u8i++) {
+ for (u8i = 0; u8i < 135; u8i++) {
if (Rt >= ntc_res2[u8i]) {
break;
}
diff --git a/src/modules/TraceRouteModule.cpp b/src/modules/TraceRouteModule.cpp
index dd3d0b4f9..1f652dbf6 100644
--- a/src/modules/TraceRouteModule.cpp
+++ b/src/modules/TraceRouteModule.cpp
@@ -11,7 +11,7 @@ bool TraceRouteModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, m
void TraceRouteModule::alterReceivedProtobuf(meshtastic_MeshPacket &p, meshtastic_RouteDiscovery *r)
{
- auto &incoming = p.decoded;
+ const meshtastic_Data &incoming = p.decoded;
// Insert unknown hops if necessary
insertUnknownHops(p, r, !incoming.request_id);
@@ -53,7 +53,7 @@ void TraceRouteModule::insertUnknownHops(meshtastic_MeshPacket &p, meshtastic_Ro
uint8_t hopsTaken = p.hop_start - p.hop_limit;
int8_t diff = hopsTaken - *route_count;
for (uint8_t i = 0; i < diff; i++) {
- if (*route_count < sizeof(*route) / sizeof(route[0])) {
+ if (*route_count < ROUTE_SIZE) {
route[*route_count] = NODENUM_BROADCAST; // This will represent an unknown hop
*route_count += 1;
}
@@ -61,7 +61,7 @@ void TraceRouteModule::insertUnknownHops(meshtastic_MeshPacket &p, meshtastic_Ro
// Add unknown SNR values if necessary
diff = *route_count - *snr_count;
for (uint8_t i = 0; i < diff; i++) {
- if (*snr_count < sizeof(*snr_list) / sizeof(snr_list[0])) {
+ if (*snr_count < ROUTE_SIZE) {
snr_list[*snr_count] = INT8_MIN; // This will represent an unknown SNR
*snr_count += 1;
}
@@ -89,7 +89,7 @@ void TraceRouteModule::appendMyIDandSNR(meshtastic_RouteDiscovery *updated, floa
snr_list = updated->snr_back;
}
- if (*snr_count < sizeof(*snr_list) / sizeof(snr_list[0])) {
+ if (*snr_count < ROUTE_SIZE) {
snr_list[*snr_count] = (int8_t)(snr * 4); // Convert SNR to 1 byte
*snr_count += 1;
}
@@ -97,7 +97,7 @@ void TraceRouteModule::appendMyIDandSNR(meshtastic_RouteDiscovery *updated, floa
return;
// Length of route array can normally not be exceeded due to the max. hop_limit of 7
- if (*route_count < sizeof(*route) / sizeof(route[0])) {
+ if (*route_count < ROUTE_SIZE) {
route[*route_count] = myNodeInfo.my_node_num;
*route_count += 1;
} else {
diff --git a/src/modules/TraceRouteModule.h b/src/modules/TraceRouteModule.h
index fe69300de..afe2b3871 100644
--- a/src/modules/TraceRouteModule.h
+++ b/src/modules/TraceRouteModule.h
@@ -1,6 +1,8 @@
#pragma once
#include "ProtobufModule.h"
+#define ROUTE_SIZE sizeof(((meshtastic_RouteDiscovery *)0)->route) / sizeof(((meshtastic_RouteDiscovery *)0)->route[0])
+
/**
* A module that traces the route to a certain destination node
*/
diff --git a/src/modules/WaypointModule.cpp b/src/modules/WaypointModule.cpp
index e1974db73..a4611e780 100644
--- a/src/modules/WaypointModule.cpp
+++ b/src/modules/WaypointModule.cpp
@@ -89,7 +89,7 @@ void WaypointModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state,
display->fillRect(0 + x, 0 + y, x + display->getWidth(), y + FONT_HEIGHT_SMALL);
// Decode the waypoint
- meshtastic_MeshPacket &mp = devicestate.rx_waypoint;
+ const meshtastic_MeshPacket &mp = devicestate.rx_waypoint;
meshtastic_Waypoint wp;
memset(&wp, 0, sizeof(wp));
if (!pb_decode_from_bytes(mp.decoded.payload.bytes, mp.decoded.payload.size, &meshtastic_Waypoint_msg, &wp)) {
@@ -171,16 +171,16 @@ void WaypointModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state,
strncpy(distStr, "? km", sizeof(distStr));
}
+ // Draw compass circle
+ display->drawCircle(compassX, compassY, compassDiam / 2);
+
// Undo color-inversion, if set prior to drawing header
// Unsure of expected behavior? For now: copy drawNodeInfo
if (config.display.displaymode == meshtastic_Config_DisplayConfig_DisplayMode_INVERTED) {
display->setColor(BLACK);
}
- // Draw compass circle
- display->drawCircle(compassX, compassY, compassDiam / 2);
-
// Must be after distStr is populated
screen->drawColumns(display, x, y, fields);
}
-#endif
\ No newline at end of file
+#endif
diff --git a/src/motion/AccelerometerThread.h b/src/motion/AccelerometerThread.h
new file mode 100755
index 000000000..f9cbb49a1
--- /dev/null
+++ b/src/motion/AccelerometerThread.h
@@ -0,0 +1,149 @@
+#pragma once
+#ifndef _ACCELEROMETER_H_
+#define _ACCELEROMETER_H_
+
+#include "configuration.h"
+
+#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C
+
+#include "../concurrency/OSThread.h"
+#include "BMA423Sensor.h"
+#include "BMX160Sensor.h"
+#include "ICM20948Sensor.h"
+#include "LIS3DHSensor.h"
+#include "LSM6DS3Sensor.h"
+#include "MPU6050Sensor.h"
+#include "MotionSensor.h"
+#include "STK8XXXSensor.h"
+
+extern ScanI2C::DeviceAddress accelerometer_found;
+
+class AccelerometerThread : public concurrency::OSThread
+{
+ private:
+ MotionSensor *sensor = nullptr;
+ bool isInitialised = false;
+
+ public:
+ explicit AccelerometerThread(ScanI2C::FoundDevice foundDevice) : OSThread("AccelerometerThread")
+ {
+ device = foundDevice;
+ init();
+ }
+
+ explicit AccelerometerThread(ScanI2C::DeviceType type) : AccelerometerThread(ScanI2C::FoundDevice{type, accelerometer_found})
+ {
+ }
+
+ void start()
+ {
+ init();
+ setIntervalFromNow(0);
+ };
+
+ protected:
+ int32_t runOnce() override
+ {
+ // Assume we should not keep the board awake
+ canSleep = true;
+
+ if (isInitialised)
+ return sensor->runOnce();
+
+ return MOTION_SENSOR_CHECK_INTERVAL_MS;
+ }
+
+ private:
+ ScanI2C::FoundDevice device;
+
+ void init()
+ {
+ if (isInitialised)
+ return;
+
+ if (device.address.port == ScanI2C::I2CPort::NO_I2C || device.address.address == 0 || device.type == ScanI2C::NONE) {
+ LOG_DEBUG("AccelerometerThread disabling due to no sensors found\n");
+ disable();
+ return;
+ }
+
+#ifndef RAK_4631
+ 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;
+ }
+#endif
+
+ switch (device.type) {
+ case ScanI2C::DeviceType::BMA423:
+ sensor = new BMA423Sensor(device);
+ break;
+ case ScanI2C::DeviceType::MPU6050:
+ sensor = new MPU6050Sensor(device);
+ break;
+ case ScanI2C::DeviceType::BMX160:
+ sensor = new BMX160Sensor(device);
+ break;
+ case ScanI2C::DeviceType::LIS3DH:
+ sensor = new LIS3DHSensor(device);
+ break;
+ case ScanI2C::DeviceType::LSM6DS3:
+ sensor = new LSM6DS3Sensor(device);
+ break;
+ case ScanI2C::DeviceType::STK8BAXX:
+ sensor = new STK8XXXSensor(device);
+ break;
+ case ScanI2C::DeviceType::ICM20948:
+ sensor = new ICM20948Sensor(device);
+ break;
+ default:
+ disable();
+ return;
+ }
+
+ isInitialised = sensor->init();
+ if (!isInitialised) {
+ clean();
+ }
+ LOG_DEBUG("AccelerometerThread::init %s\n", isInitialised ? "ok" : "failed");
+ }
+
+ // Copy constructor (not implemented / included to avoid cppcheck warnings)
+ AccelerometerThread(const AccelerometerThread &other) : OSThread::OSThread("AccelerometerThread") { this->copy(other); }
+
+ // Destructor (included to avoid cppcheck warnings)
+ virtual ~AccelerometerThread() { clean(); }
+
+ // Copy assignment (not implemented / included to avoid cppcheck warnings)
+ AccelerometerThread &operator=(const AccelerometerThread &other)
+ {
+ this->copy(other);
+ return *this;
+ }
+
+ // Take a very shallow copy (does not copy OSThread state nor the sensor object)
+ // If for some reason this is ever used, make sure to call init() after any copy
+ void copy(const AccelerometerThread &other)
+ {
+ if (this != &other) {
+ clean();
+ this->device = ScanI2C::FoundDevice(other.device.type,
+ ScanI2C::DeviceAddress(other.device.address.port, other.device.address.address));
+ }
+ }
+
+ // Cleanup resources
+ void clean()
+ {
+ isInitialised = false;
+ if (sensor != nullptr) {
+ delete sensor;
+ sensor = nullptr;
+ }
+ }
+};
+
+#endif
+
+#endif
\ No newline at end of file
diff --git a/src/motion/BMA423Sensor.cpp b/src/motion/BMA423Sensor.cpp
new file mode 100755
index 000000000..ec07b7c40
--- /dev/null
+++ b/src/motion/BMA423Sensor.cpp
@@ -0,0 +1,62 @@
+#include "BMA423Sensor.h"
+
+#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C
+
+using namespace MotionSensorI2C;
+
+BMA423Sensor::BMA423Sensor(ScanI2C::FoundDevice foundDevice) : MotionSensor::MotionSensor(foundDevice) {}
+
+bool BMA423Sensor::init()
+{
+ if (sensor.begin(deviceAddress(), &MotionSensorI2C::readRegister, &MotionSensorI2C::writeRegister)) {
+ sensor.configAccelerometer(sensor.RANGE_2G, sensor.ODR_100HZ, sensor.BW_NORMAL_AVG4, sensor.PERF_CONTINUOUS_MODE);
+ sensor.enableAccelerometer();
+ sensor.configInterrupt(BMA4_LEVEL_TRIGGER, BMA4_ACTIVE_HIGH, BMA4_PUSH_PULL, BMA4_OUTPUT_ENABLE, BMA4_INPUT_DISABLE);
+
+#ifdef BMA423_INT
+ pinMode(BMA4XX_INT, INPUT);
+ attachInterrupt(
+ BMA4XX_INT,
+ [] {
+ // Set interrupt to set irq value to true
+ BMA_IRQ = true;
+ },
+ RISING); // Select the interrupt mode according to the actual circuit
+#endif
+
+#ifdef T_WATCH_S3
+ // Need to raise the wrist function, need to set the correct axis
+ sensor.setReampAxes(sensor.REMAP_TOP_LAYER_RIGHT_CORNER);
+#else
+ sensor.setReampAxes(sensor.REMAP_BOTTOM_LAYER_BOTTOM_LEFT_CORNER);
+#endif
+ // sensor.enableFeature(sensor.FEATURE_STEP_CNTR, true);
+ sensor.enableFeature(sensor.FEATURE_TILT, true);
+ sensor.enableFeature(sensor.FEATURE_WAKEUP, true);
+ // sensor.resetPedometer();
+
+ // Turn on feature interrupt
+ sensor.enablePedometerIRQ();
+ sensor.enableTiltIRQ();
+
+ // It corresponds to isDoubleClick interrupt
+ sensor.enableWakeupIRQ();
+ LOG_DEBUG("BMA423Sensor::init ok\n");
+ return true;
+ }
+ LOG_DEBUG("BMA423Sensor::init failed\n");
+ return false;
+}
+
+int32_t BMA423Sensor::runOnce()
+{
+ if (sensor.readIrqStatus() != DEV_WIRE_NONE) {
+ if (sensor.isTilt() || sensor.isDoubleTap()) {
+ wakeScreen();
+ return 500;
+ }
+ }
+ return MOTION_SENSOR_CHECK_INTERVAL_MS;
+}
+
+#endif
\ No newline at end of file
diff --git a/src/motion/BMA423Sensor.h b/src/motion/BMA423Sensor.h
new file mode 100755
index 000000000..0bc0ddf8c
--- /dev/null
+++ b/src/motion/BMA423Sensor.h
@@ -0,0 +1,26 @@
+#pragma once
+#ifndef _BMA423_SENSOR_H_
+#define _BMA423_SENSOR_H_
+
+#include "MotionSensor.h"
+
+#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C
+
+#include
+#include
+
+class BMA423Sensor : public MotionSensor
+{
+ private:
+ SensorBMA423 sensor;
+ volatile bool BMA_IRQ = false;
+
+ public:
+ explicit BMA423Sensor(ScanI2C::FoundDevice foundDevice);
+ virtual bool init() override;
+ virtual int32_t runOnce() override;
+};
+
+#endif
+
+#endif
\ No newline at end of file
diff --git a/src/motion/BMX160Sensor.cpp b/src/motion/BMX160Sensor.cpp
new file mode 100755
index 000000000..f18c4b586
--- /dev/null
+++ b/src/motion/BMX160Sensor.cpp
@@ -0,0 +1,100 @@
+#include "BMX160Sensor.h"
+
+#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C
+
+BMX160Sensor::BMX160Sensor(ScanI2C::FoundDevice foundDevice) : MotionSensor::MotionSensor(foundDevice) {}
+
+#ifdef RAK_4631
+
+// screen is defined in main.cpp
+extern graphics::Screen *screen;
+
+bool BMX160Sensor::init()
+{
+ if (sensor.begin()) {
+ // set output data rate
+ sensor.ODR_Config(BMX160_ACCEL_ODR_100HZ, BMX160_GYRO_ODR_100HZ);
+ LOG_DEBUG("BMX160Sensor::init ok\n");
+ return true;
+ }
+ LOG_DEBUG("BMX160Sensor::init failed\n");
+ return false;
+}
+
+int32_t BMX160Sensor::runOnce()
+{
+ sBmx160SensorData_t magAccel;
+ sBmx160SensorData_t gAccel;
+
+ /* Get a new sensor event */
+ sensor.getAllData(&magAccel, NULL, &gAccel);
+
+ // experimental calibrate routine. Limited to between 10 and 30 seconds after boot
+ if (millis() > 12 * 1000 && millis() < 30 * 1000) {
+ if (!showingScreen) {
+ showingScreen = true;
+ screen->startAlert((FrameCallback)drawFrameCalibration);
+ }
+ if (magAccel.x > highestX)
+ highestX = magAccel.x;
+ if (magAccel.x < lowestX)
+ lowestX = magAccel.x;
+ if (magAccel.y > highestY)
+ highestY = magAccel.y;
+ if (magAccel.y < lowestY)
+ lowestY = magAccel.y;
+ if (magAccel.z > highestZ)
+ highestZ = magAccel.z;
+ if (magAccel.z < lowestZ)
+ lowestZ = magAccel.z;
+ } else if (showingScreen && millis() >= 30 * 1000) {
+ showingScreen = false;
+ screen->endAlert();
+ }
+
+ int highestRealX = highestX - (highestX + lowestX) / 2;
+
+ magAccel.x -= (highestX + lowestX) / 2;
+ magAccel.y -= (highestY + lowestY) / 2;
+ magAccel.z -= (highestZ + lowestZ) / 2;
+ FusionVector ga, ma;
+ ga.axis.x = -gAccel.x; // default location for the BMX160 is on the rear of the board
+ ga.axis.y = -gAccel.y;
+ ga.axis.z = gAccel.z;
+ ma.axis.x = -magAccel.x;
+ ma.axis.y = -magAccel.y;
+ ma.axis.z = magAccel.z * 3;
+
+ // If we're set to one of the inverted positions
+ if (config.display.compass_orientation > meshtastic_Config_DisplayConfig_CompassOrientation_DEGREES_270) {
+ ma = FusionAxesSwap(ma, FusionAxesAlignmentNXNYPZ);
+ ga = FusionAxesSwap(ga, FusionAxesAlignmentNXNYPZ);
+ }
+
+ float heading = FusionCompassCalculateHeading(FusionConventionNed, ga, ma);
+
+ switch (config.display.compass_orientation) {
+ case meshtastic_Config_DisplayConfig_CompassOrientation_DEGREES_0_INVERTED:
+ case meshtastic_Config_DisplayConfig_CompassOrientation_DEGREES_0:
+ break;
+ case meshtastic_Config_DisplayConfig_CompassOrientation_DEGREES_90:
+ case meshtastic_Config_DisplayConfig_CompassOrientation_DEGREES_90_INVERTED:
+ heading += 90;
+ break;
+ case meshtastic_Config_DisplayConfig_CompassOrientation_DEGREES_180:
+ case meshtastic_Config_DisplayConfig_CompassOrientation_DEGREES_180_INVERTED:
+ heading += 180;
+ break;
+ case meshtastic_Config_DisplayConfig_CompassOrientation_DEGREES_270:
+ case meshtastic_Config_DisplayConfig_CompassOrientation_DEGREES_270_INVERTED:
+ heading += 270;
+ break;
+ }
+ screen->setHeading(heading);
+
+ return MOTION_SENSOR_CHECK_INTERVAL_MS;
+}
+
+#endif
+
+#endif
\ No newline at end of file
diff --git a/src/motion/BMX160Sensor.h b/src/motion/BMX160Sensor.h
new file mode 100755
index 000000000..26f477271
--- /dev/null
+++ b/src/motion/BMX160Sensor.h
@@ -0,0 +1,41 @@
+#pragma once
+
+#ifndef _BMX160_SENSOR_H_
+#define _BMX160_SENSOR_H_
+
+#include "MotionSensor.h"
+
+#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C
+
+#ifdef RAK_4631
+
+#include "Fusion/Fusion.h"
+#include
+
+class BMX160Sensor : public MotionSensor
+{
+ private:
+ RAK_BMX160 sensor;
+ bool showingScreen = false;
+ float highestX = 0, lowestX = 0, highestY = 0, lowestY = 0, highestZ = 0, lowestZ = 0;
+
+ public:
+ explicit BMX160Sensor(ScanI2C::FoundDevice foundDevice);
+ virtual bool init() override;
+ virtual int32_t runOnce() override;
+};
+
+#else
+
+// Stub
+class BMX160Sensor : public MotionSensor
+{
+ public:
+ explicit BMX160Sensor(ScanI2C::FoundDevice foundDevice);
+};
+
+#endif
+
+#endif
+
+#endif
\ No newline at end of file
diff --git a/src/motion/ICM20948Sensor.cpp b/src/motion/ICM20948Sensor.cpp
new file mode 100755
index 000000000..d16968e06
--- /dev/null
+++ b/src/motion/ICM20948Sensor.cpp
@@ -0,0 +1,186 @@
+#include "ICM20948Sensor.h"
+
+#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C
+
+// Flag when an interrupt has been detected
+volatile static bool ICM20948_IRQ = false;
+
+// Interrupt service routine
+void ICM20948SetInterrupt()
+{
+ ICM20948_IRQ = true;
+}
+
+ICM20948Sensor::ICM20948Sensor(ScanI2C::FoundDevice foundDevice) : MotionSensor::MotionSensor(foundDevice) {}
+
+bool ICM20948Sensor::init()
+{
+ // Initialise the sensor
+ sensor = ICM20948Singleton::GetInstance();
+ if (!sensor->init(device))
+ return false;
+
+ // Enable simple Wake on Motion
+ return sensor->setWakeOnMotion();
+}
+
+#ifdef ICM_20948_INT_PIN
+
+int32_t ICM20948Sensor::runOnce()
+{
+ // Wake on motion using hardware interrupts - this is the most efficient way to check for motion
+ if (ICM20948_IRQ) {
+ ICM20948_IRQ = false;
+ sensor->clearInterrupts();
+ wakeScreen();
+ }
+ return MOTION_SENSOR_CHECK_INTERVAL_MS;
+}
+
+#else
+
+int32_t ICM20948Sensor::runOnce()
+{
+ // Wake on motion using polling - this is not as efficient as using hardware interrupt pin (see above)
+ auto status = sensor->setBank(0);
+ if (sensor->status != ICM_20948_Stat_Ok) {
+ LOG_DEBUG("ICM20948Sensor::isWakeOnMotion failed to set bank - %s\n", sensor->statusString());
+ return MOTION_SENSOR_CHECK_INTERVAL_MS;
+ }
+
+ ICM_20948_INT_STATUS_t int_stat;
+ status = sensor->read(AGB0_REG_INT_STATUS, (uint8_t *)&int_stat, sizeof(ICM_20948_INT_STATUS_t));
+ if (status != ICM_20948_Stat_Ok) {
+ LOG_DEBUG("ICM20948Sensor::isWakeOnMotion failed to read interrupts - %s\n", sensor->statusString());
+ return MOTION_SENSOR_CHECK_INTERVAL_MS;
+ }
+
+ if (int_stat.WOM_INT != 0) {
+ // Wake up!
+ wakeScreen();
+ }
+ return MOTION_SENSOR_CHECK_INTERVAL_MS;
+}
+
+#endif
+
+// ----------------------------------------------------------------------
+// ICM20948Singleton
+// ----------------------------------------------------------------------
+
+// Get a singleton wrapper for an Sparkfun ICM_20948_I2C
+ICM20948Singleton *ICM20948Singleton::GetInstance()
+{
+ if (pinstance == nullptr) {
+ pinstance = new ICM20948Singleton();
+ }
+ return pinstance;
+}
+
+ICM20948Singleton::ICM20948Singleton() {}
+
+ICM20948Singleton::~ICM20948Singleton() {}
+
+ICM20948Singleton *ICM20948Singleton::pinstance{nullptr};
+
+// Initialise the ICM20948 Sensor
+bool ICM20948Singleton::init(ScanI2C::FoundDevice device)
+{
+#ifdef ICM_20948_DEBUG
+ // Set ICM_20948_DEBUG to enable helpful debug messages on Serial
+ enableDebugging();
+#endif
+
+// startup
+#ifdef Wire1
+ ICM_20948_Status_e status =
+ begin(device.address.port == ScanI2C::I2CPort::WIRE1 ? Wire1 : Wire, device.address.address == ICM20948_ADDR ? 1 : 0);
+#else
+ ICM_20948_Status_e status = begin(Wire, device.address.address == ICM20948_ADDR ? 1 : 0);
+#endif
+ if (status != ICM_20948_Stat_Ok) {
+ LOG_DEBUG("ICM20948Sensor::init begin - %s\n", statusString());
+ return false;
+ }
+
+ // SW reset to make sure the device starts in a known state
+ if (swReset() != ICM_20948_Stat_Ok) {
+ LOG_DEBUG("ICM20948Sensor::init reset - %s\n", statusString());
+ return false;
+ }
+ delay(200);
+
+ // Now wake the sensor up
+ if (sleep(false) != ICM_20948_Stat_Ok) {
+ LOG_DEBUG("ICM20948Sensor::init wake - %s\n", statusString());
+ return false;
+ }
+
+ if (lowPower(false) != ICM_20948_Stat_Ok) {
+ LOG_DEBUG("ICM20948Sensor::init high power - %s\n", statusString());
+ return false;
+ }
+
+#ifdef ICM_20948_INT_PIN
+
+ // Active low
+ cfgIntActiveLow(true);
+ LOG_DEBUG("ICM20948Sensor::init set cfgIntActiveLow - %s\n", statusString());
+
+ // Push-pull
+ cfgIntOpenDrain(false);
+ LOG_DEBUG("ICM20948Sensor::init set cfgIntOpenDrain - %s\n", statusString());
+
+ // If enabled, *ANY* read will clear the INT_STATUS register.
+ cfgIntAnyReadToClear(true);
+ LOG_DEBUG("ICM20948Sensor::init set cfgIntAnyReadToClear - %s\n", statusString());
+
+ // Latch the interrupt until cleared
+ cfgIntLatch(true);
+ LOG_DEBUG("ICM20948Sensor::init set cfgIntLatch - %s\n", statusString());
+
+ // Set up an interrupt pin with an internal pullup for active low
+ pinMode(ICM_20948_INT_PIN, INPUT_PULLUP);
+
+ // Set up an interrupt service routine
+ attachInterrupt(ICM_20948_INT_PIN, ICM20948SetInterrupt, FALLING);
+
+#endif
+ return true;
+}
+
+#ifdef ICM_20948_DMP_IS_ENABLED
+
+// Stub
+bool ICM20948Sensor::initDMP()
+{
+ return false;
+}
+
+#endif
+
+bool ICM20948Singleton::setWakeOnMotion()
+{
+ // Set WoM threshold in milli G's
+ auto status = WOMThreshold(ICM_20948_WOM_THRESHOLD);
+ if (status != ICM_20948_Stat_Ok)
+ return false;
+
+ // Enable WoM Logic mode 1 = Compare the current sample with the previous sample
+ status = WOMLogic(true, 1);
+ LOG_DEBUG("ICM20948Sensor::init set WOMLogic - %s\n", statusString());
+ if (status != ICM_20948_Stat_Ok)
+ return false;
+
+ // Enable interrupts on WakeOnMotion
+ status = intEnableWOM(true);
+ LOG_DEBUG("ICM20948Sensor::init set intEnableWOM - %s\n", statusString());
+ return status == ICM_20948_Stat_Ok;
+
+ // Clear any current interrupts
+ ICM20948_IRQ = false;
+ clearInterrupts();
+ return true;
+}
+
+#endif
\ No newline at end of file
diff --git a/src/motion/ICM20948Sensor.h b/src/motion/ICM20948Sensor.h
new file mode 100755
index 000000000..d5e246c8d
--- /dev/null
+++ b/src/motion/ICM20948Sensor.h
@@ -0,0 +1,96 @@
+#pragma once
+#ifndef _ICM_20948_SENSOR_H_
+#define _ICM_20948_SENSOR_H_
+
+#include "MotionSensor.h"
+
+#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C
+
+#include
+
+// Set the default gyro scale - dps250, dps500, dps1000, dps2000
+#ifndef ICM_20948_MPU_GYRO_SCALE
+#define ICM_20948_MPU_GYRO_SCALE dps250
+#endif
+
+// Set the default accelerometer scale - gpm2, gpm4, gpm8, gpm16
+#ifndef ICM_20948_MPU_ACCEL_SCALE
+#define ICM_20948_MPU_ACCEL_SCALE gpm2
+#endif
+
+// Define a threshold for Wake on Motion Sensing (0mg to 1020mg)
+#ifndef ICM_20948_WOM_THRESHOLD
+#define ICM_20948_WOM_THRESHOLD 16U
+#endif
+
+// Define a pin in variant.h to use interrupts to read the ICM-20948
+#ifndef ICM_20948_WOM_THRESHOLD
+#define ICM_20948_INT_PIN 255
+#endif
+
+// Uncomment this line to enable helpful debug messages on Serial
+// #define ICM_20948_DEBUG 1
+
+// Uncomment this line to enable the onboard digital motion processor (to be added in a future PR)
+// #define ICM_20948_DMP_IS_ENABLED 1
+
+// Check for a mandatory compiler flag to use the DMP (to be added in a future PR)
+#ifdef ICM_20948_DMP_IS_ENABLED
+#ifndef ICM_20948_USE_DMP
+#error To use the digital motion processor, please either set the compiler flag ICM_20948_USE_DMP or uncomment line 29 (#define ICM_20948_USE_DMP) in ICM_20948_C.h
+#endif
+#endif
+
+// The I2C address of the Accelerometer (if found) from main.cpp
+extern ScanI2C::DeviceAddress accelerometer_found;
+
+// Singleton wrapper for the Sparkfun ICM_20948_I2C class
+class ICM20948Singleton : public ICM_20948_I2C
+{
+ private:
+ static ICM20948Singleton *pinstance;
+
+ protected:
+ ICM20948Singleton();
+ ~ICM20948Singleton();
+
+ public:
+ // Create a singleton instance (not thread safe)
+ static ICM20948Singleton *GetInstance();
+
+ // Singletons should not be cloneable.
+ ICM20948Singleton(ICM20948Singleton &other) = delete;
+
+ // Singletons should not be assignable.
+ void operator=(const ICM20948Singleton &) = delete;
+
+ // Initialise the motion sensor singleton for normal operation
+ bool init(ScanI2C::FoundDevice device);
+
+ // Enable Wake on Motion interrupts (sensor must be initialised first)
+ bool setWakeOnMotion();
+
+#ifdef ICM_20948_DMP_IS_ENABLED
+ // Initialise the motion sensor singleton for digital motion processing
+ bool initDMP();
+#endif
+};
+
+class ICM20948Sensor : public MotionSensor
+{
+ private:
+ ICM20948Singleton *sensor = nullptr;
+
+ public:
+ explicit ICM20948Sensor(ScanI2C::FoundDevice foundDevice);
+
+ // Initialise the motion sensor
+ virtual bool init() override;
+
+ // Called each time our sensor gets a chance to run
+ virtual int32_t runOnce() override;
+};
+
+#endif
+
+#endif
\ No newline at end of file
diff --git a/src/motion/LIS3DHSensor.cpp b/src/motion/LIS3DHSensor.cpp
new file mode 100755
index 000000000..e2df60b1c
--- /dev/null
+++ b/src/motion/LIS3DHSensor.cpp
@@ -0,0 +1,36 @@
+#include "LIS3DHSensor.h"
+
+#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C
+
+LIS3DHSensor::LIS3DHSensor(ScanI2C::FoundDevice foundDevice) : MotionSensor::MotionSensor(foundDevice) {}
+
+bool LIS3DHSensor::init()
+{
+ if (sensor.begin(deviceAddress())) {
+ sensor.setRange(LIS3DH_RANGE_2_G);
+ // Adjust threshold, higher numbers are less sensitive
+ sensor.setClick(config.device.double_tap_as_button_press ? 2 : 1, MOTION_SENSOR_CHECK_INTERVAL_MS);
+ LOG_DEBUG("LIS3DHSensor::init ok\n");
+ return true;
+ }
+ LOG_DEBUG("LIS3DHSensor::init failed\n");
+ return false;
+}
+
+int32_t LIS3DHSensor::runOnce()
+{
+ if (sensor.getClick() > 0) {
+ uint8_t click = sensor.getClick();
+ if (!config.device.double_tap_as_button_press) {
+ wakeScreen();
+ }
+
+ if (config.device.double_tap_as_button_press && (click & 0x20)) {
+ buttonPress();
+ return 500;
+ }
+ }
+ return MOTION_SENSOR_CHECK_INTERVAL_MS;
+}
+
+#endif
\ No newline at end of file
diff --git a/src/motion/LIS3DHSensor.h b/src/motion/LIS3DHSensor.h
new file mode 100755
index 000000000..603d195a8
--- /dev/null
+++ b/src/motion/LIS3DHSensor.h
@@ -0,0 +1,24 @@
+#pragma once
+#ifndef _LIS3DH_SENSOR_H_
+#define _LIS3DH_SENSOR_H_
+
+#include "MotionSensor.h"
+
+#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C
+
+#include
+
+class LIS3DHSensor : public MotionSensor
+{
+ private:
+ Adafruit_LIS3DH sensor;
+
+ public:
+ explicit LIS3DHSensor(ScanI2C::FoundDevice foundDevice);
+ virtual bool init() override;
+ virtual int32_t runOnce() override;
+};
+
+#endif
+
+#endif
\ No newline at end of file
diff --git a/src/motion/LSM6DS3Sensor.cpp b/src/motion/LSM6DS3Sensor.cpp
new file mode 100755
index 000000000..64ef9a23b
--- /dev/null
+++ b/src/motion/LSM6DS3Sensor.cpp
@@ -0,0 +1,33 @@
+#include "LSM6DS3Sensor.h"
+
+#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C
+
+LSM6DS3Sensor::LSM6DS3Sensor(ScanI2C::FoundDevice foundDevice) : MotionSensor::MotionSensor(foundDevice) {}
+
+bool LSM6DS3Sensor::init()
+{
+ if (sensor.begin_I2C(deviceAddress())) {
+
+ // Default threshold of 2G, less sensitive options are 4, 8 or 16G
+ sensor.setAccelRange(LSM6DS_ACCEL_RANGE_2_G);
+
+ // Duration is number of occurances needed to trigger, higher threshold is less sensitive
+ sensor.enableWakeup(config.display.wake_on_tap_or_motion, 1, LSM6DS3_WAKE_THRESH);
+
+ LOG_DEBUG("LSM6DS3Sensor::init ok\n");
+ return true;
+ }
+ LOG_DEBUG("LSM6DS3Sensor::init failed\n");
+ return false;
+}
+
+int32_t LSM6DS3Sensor::runOnce()
+{
+ if (sensor.shake()) {
+ wakeScreen();
+ return 500;
+ }
+ return MOTION_SENSOR_CHECK_INTERVAL_MS;
+}
+
+#endif
\ No newline at end of file
diff --git a/src/motion/LSM6DS3Sensor.h b/src/motion/LSM6DS3Sensor.h
new file mode 100755
index 000000000..77069ef3c
--- /dev/null
+++ b/src/motion/LSM6DS3Sensor.h
@@ -0,0 +1,28 @@
+#pragma once
+#ifndef _LSM6DS3_SENSOR_H_
+#define _LSM6DS3_SENSOR_H_
+
+#include "MotionSensor.h"
+
+#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C
+
+#ifndef LSM6DS3_WAKE_THRESH
+#define LSM6DS3_WAKE_THRESH 20
+#endif
+
+#include
+
+class LSM6DS3Sensor : public MotionSensor
+{
+ private:
+ Adafruit_LSM6DS3TRC sensor;
+
+ public:
+ explicit LSM6DS3Sensor(ScanI2C::FoundDevice foundDevice);
+ virtual bool init() override;
+ virtual int32_t runOnce() override;
+};
+
+#endif
+
+#endif
\ No newline at end of file
diff --git a/src/motion/MPU6050Sensor.cpp b/src/motion/MPU6050Sensor.cpp
new file mode 100755
index 000000000..77aaca46d
--- /dev/null
+++ b/src/motion/MPU6050Sensor.cpp
@@ -0,0 +1,31 @@
+#include "MPU6050Sensor.h"
+
+#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C
+
+MPU6050Sensor::MPU6050Sensor(ScanI2C::FoundDevice foundDevice) : MotionSensor::MotionSensor(foundDevice) {}
+
+bool MPU6050Sensor::init()
+{
+ if (sensor.begin(deviceAddress())) {
+ // setup motion detection
+ sensor.setHighPassFilter(MPU6050_HIGHPASS_0_63_HZ);
+ sensor.setMotionDetectionThreshold(1);
+ sensor.setMotionDetectionDuration(20);
+ sensor.setInterruptPinLatch(true); // Keep it latched. Will turn off when reinitialized.
+ sensor.setInterruptPinPolarity(true);
+ LOG_DEBUG("MPU6050Sensor::init ok\n");
+ return true;
+ }
+ LOG_DEBUG("MPU6050Sensor::init failed\n");
+ return false;
+}
+
+int32_t MPU6050Sensor::runOnce()
+{
+ if (sensor.getMotionInterruptStatus()) {
+ wakeScreen();
+ }
+ return MOTION_SENSOR_CHECK_INTERVAL_MS;
+}
+
+#endif
\ No newline at end of file
diff --git a/src/motion/MPU6050Sensor.h b/src/motion/MPU6050Sensor.h
new file mode 100755
index 000000000..2e6eafecd
--- /dev/null
+++ b/src/motion/MPU6050Sensor.h
@@ -0,0 +1,24 @@
+#pragma once
+#ifndef _MPU6050_SENSOR_H_
+#define _MPU6050_SENSOR_H_
+
+#include "MotionSensor.h"
+
+#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C
+
+#include
+
+class MPU6050Sensor : public MotionSensor
+{
+ private:
+ Adafruit_MPU6050 sensor;
+
+ public:
+ explicit MPU6050Sensor(ScanI2C::FoundDevice foundDevice);
+ virtual bool init() override;
+ virtual int32_t runOnce() override;
+};
+
+#endif
+
+#endif
\ No newline at end of file
diff --git a/src/motion/MotionSensor.cpp b/src/motion/MotionSensor.cpp
new file mode 100755
index 000000000..20e396bba
--- /dev/null
+++ b/src/motion/MotionSensor.cpp
@@ -0,0 +1,79 @@
+#include "MotionSensor.h"
+
+#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C
+
+// screen is defined in main.cpp
+extern graphics::Screen *screen;
+
+MotionSensor::MotionSensor(ScanI2C::FoundDevice foundDevice)
+{
+ device.address.address = foundDevice.address.address;
+ device.address.port = foundDevice.address.port;
+ device.type = foundDevice.type;
+ LOG_DEBUG("MotionSensor::MotionSensor port: %s address: 0x%x type: %d\n",
+ devicePort() == ScanI2C::I2CPort::WIRE1 ? "Wire1" : "Wire", (uint8_t)deviceAddress(), deviceType());
+}
+
+ScanI2C::DeviceType MotionSensor::deviceType()
+{
+ return device.type;
+}
+
+uint8_t MotionSensor::deviceAddress()
+{
+ return device.address.address;
+}
+
+ScanI2C::I2CPort MotionSensor::devicePort()
+{
+ return device.address.port;
+}
+
+#ifdef RAK_4631
+void MotionSensor::drawFrameCalibration(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
+{
+ // int x_offset = display->width() / 2;
+ // int y_offset = display->height() <= 80 ? 0 : 32;
+ display->setTextAlignment(TEXT_ALIGN_LEFT);
+ display->setFont(FONT_MEDIUM);
+ display->drawString(x, y, "Calibrating\nCompass");
+ int16_t compassX = 0, compassY = 0;
+ uint16_t compassDiam = graphics::Screen::getCompassDiam(display->getWidth(), display->getHeight());
+
+ // coordinates for the center of the compass/circle
+ if (config.display.displaymode == meshtastic_Config_DisplayConfig_DisplayMode_DEFAULT) {
+ compassX = x + display->getWidth() - compassDiam / 2 - 5;
+ compassY = y + display->getHeight() / 2;
+ } else {
+ compassX = x + display->getWidth() - compassDiam / 2 - 5;
+ compassY = y + FONT_HEIGHT_SMALL + (display->getHeight() - FONT_HEIGHT_SMALL) / 2;
+ }
+ display->drawCircle(compassX, compassY, compassDiam / 2);
+ screen->drawCompassNorth(display, compassX, compassY, screen->getHeading() * PI / 180);
+}
+#endif
+
+#if !MESHTASTIC_EXCLUDE_POWER_FSM
+void MotionSensor::wakeScreen()
+{
+ if (powerFSM.getState() == &stateDARK) {
+ LOG_DEBUG("MotionSensor::wakeScreen detected\n");
+ powerFSM.trigger(EVENT_INPUT);
+ }
+}
+
+void MotionSensor::buttonPress()
+{
+ LOG_DEBUG("MotionSensor::buttonPress detected\n");
+ powerFSM.trigger(EVENT_PRESS);
+}
+
+#else
+
+void MotionSensor::wakeScreen() {}
+
+void MotionSensor::buttonPress() {}
+
+#endif
+
+#endif
\ No newline at end of file
diff --git a/src/motion/MotionSensor.h b/src/motion/MotionSensor.h
new file mode 100755
index 000000000..0f7f3479b
--- /dev/null
+++ b/src/motion/MotionSensor.h
@@ -0,0 +1,85 @@
+#pragma once
+#ifndef _MOTION_SENSOR_H_
+#define _MOTION_SENSOR_H_
+
+#define MOTION_SENSOR_CHECK_INTERVAL_MS 100
+#define MOTION_SENSOR_CLICK_THRESHOLD 40
+
+#include "../configuration.h"
+
+#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C
+
+#include "../PowerFSM.h"
+#include "../detect/ScanI2C.h"
+#include "../graphics/Screen.h"
+#include "../graphics/ScreenFonts.h"
+#include "../power.h"
+
+// Base class for motion processing
+class MotionSensor
+{
+ public:
+ explicit MotionSensor(ScanI2C::FoundDevice foundDevice);
+ virtual ~MotionSensor(){};
+
+ // Get the device type
+ ScanI2C::DeviceType deviceType();
+
+ // Get the device address
+ uint8_t deviceAddress();
+
+ // Get the device port
+ ScanI2C::I2CPort devicePort();
+
+ // Initialise the motion sensor
+ inline virtual bool init() { return false; };
+
+ // The method that will be called each time our sensor gets a chance to run
+ // Returns the desired period for next invocation (or RUN_SAME for no change)
+ // Refer to /src/concurrency/OSThread.h for more information
+ inline virtual int32_t runOnce() { return MOTION_SENSOR_CHECK_INTERVAL_MS; };
+
+ protected:
+ // Turn on the screen when a tap or motion is detected
+ virtual void wakeScreen();
+
+ // Register a button press when a double-tap is detected
+ virtual void buttonPress();
+
+#ifdef RAK_4631
+ // draw an OLED frame (currently only used by the RAK4631 BMX160 sensor)
+ static void drawFrameCalibration(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y);
+#endif
+
+ ScanI2C::FoundDevice device;
+};
+
+namespace MotionSensorI2C
+{
+
+static inline int readRegister(uint8_t address, uint8_t reg, uint8_t *data, uint8_t len)
+{
+ Wire.beginTransmission(address);
+ Wire.write(reg);
+ Wire.endTransmission();
+ Wire.requestFrom((uint8_t)address, (uint8_t)len);
+ uint8_t i = 0;
+ while (Wire.available()) {
+ data[i++] = Wire.read();
+ }
+ return 0; // Pass
+}
+
+static inline int writeRegister(uint8_t address, uint8_t reg, uint8_t *data, uint8_t len)
+{
+ Wire.beginTransmission(address);
+ Wire.write(reg);
+ Wire.write(data, len);
+ return (0 != Wire.endTransmission());
+}
+
+} // namespace MotionSensorI2C
+
+#endif
+
+#endif
\ No newline at end of file
diff --git a/src/motion/STK8XXXSensor.cpp b/src/motion/STK8XXXSensor.cpp
new file mode 100755
index 000000000..d4d69ef99
--- /dev/null
+++ b/src/motion/STK8XXXSensor.cpp
@@ -0,0 +1,40 @@
+#include "STK8XXXSensor.h"
+
+#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C
+
+STK8XXXSensor::STK8XXXSensor(ScanI2C::FoundDevice foundDevice) : MotionSensor::MotionSensor(foundDevice) {}
+
+#ifdef STK8XXX_INT
+
+volatile static bool STK_IRQ;
+
+bool STK8XXXSensor::init()
+{
+ if (sensor.STK8xxx_Initialization(STK8xxx_VAL_RANGE_2G)) {
+ STK_IRQ = false;
+ sensor.STK8xxx_Anymotion_init();
+ pinMode(STK8XXX_INT, INPUT_PULLUP);
+ attachInterrupt(
+ digitalPinToInterrupt(STK8XXX_INT), [] { STK_IRQ = true; }, RISING);
+
+ LOG_DEBUG("STK8XXXSensor::init ok\n");
+ return true;
+ }
+ LOG_DEBUG("STK8XXXSensor::init failed\n");
+ return false;
+}
+
+int32_t STK8XXXSensor::runOnce()
+{
+ if (STK_IRQ) {
+ STK_IRQ = false;
+ if (config.display.wake_on_tap_or_motion) {
+ wakeScreen();
+ }
+ }
+ return MOTION_SENSOR_CHECK_INTERVAL_MS;
+}
+
+#endif
+
+#endif
\ No newline at end of file
diff --git a/src/motion/STK8XXXSensor.h b/src/motion/STK8XXXSensor.h
new file mode 100755
index 000000000..190b916b4
--- /dev/null
+++ b/src/motion/STK8XXXSensor.h
@@ -0,0 +1,37 @@
+#pragma once
+#ifndef _STK8XXX_SENSOR_H_
+#define _STK8XXX_SENSOR_H_
+
+#include "MotionSensor.h"
+
+#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !MESHTASTIC_EXCLUDE_I2C
+
+#ifdef STK8XXX_INT
+
+#include
+
+class STK8XXXSensor : public MotionSensor
+{
+ private:
+ STK8xxx sensor;
+
+ public:
+ explicit STK8XXXSensor(ScanI2C::FoundDevice foundDevice);
+ virtual bool init() override;
+ virtual int32_t runOnce() override;
+};
+
+#else
+
+// Stub
+class STK8XXXSensor : public MotionSensor
+{
+ public:
+ explicit STK8XXXSensor(ScanI2C::FoundDevice foundDevice);
+};
+
+#endif
+
+#endif
+
+#endif
\ No newline at end of file
diff --git a/src/mqtt/MQTT.cpp b/src/mqtt/MQTT.cpp
index 797fc7dc3..8d08f97a6 100644
--- a/src/mqtt/MQTT.cpp
+++ b/src/mqtt/MQTT.cpp
@@ -21,6 +21,7 @@
#include "Default.h"
#include "serialization/JSON.h"
#include "serialization/MeshPacketSerializer.h"
+#include
#include
const int reconnectMax = 5;
@@ -31,6 +32,9 @@ static MemoryDynamic staticMqttPool;
Allocator &mqttPool = staticMqttPool;
+// FIXME - this size calculation is super sloppy, but it will go away once we dynamically alloc meshpackets
+static uint8_t bytes[meshtastic_MqttClientProxyMessage_size + 30]; // 12 for channel name and 16 for nodeid
+
void MQTT::mqttCallback(char *topic, byte *payload, unsigned int length)
{
mqtt->onReceive(topic, payload, length);
@@ -158,15 +162,30 @@ void MQTT::onReceive(char *topic, byte *payload, size_t length)
meshtastic_MeshPacket *p = packetPool.allocCopy(*e.packet);
p->via_mqtt = true; // Mark that the packet was received via MQTT
+ if (p->from == 0 || p->from == nodeDB->getNodeNum()) {
+ LOG_INFO("Ignoring downlink message we originally sent.\n");
+ packetPool.release(p);
+ return;
+ }
if (p->which_payload_variant == meshtastic_MeshPacket_decoded_tag) {
+ if (moduleConfig.mqtt.encryption_enabled) {
+ LOG_INFO("Ignoring decoded message on MQTT, encryption is enabled.\n");
+ packetPool.release(p);
+ return;
+ }
+ if (p->decoded.portnum == meshtastic_PortNum_ADMIN_APP) {
+ LOG_INFO("Ignoring decoded admin packet.\n");
+ packetPool.release(p);
+ return;
+ }
p->channel = ch.index;
}
// PKI messages get accepted even if we can't decrypt
if (router && p->which_payload_variant == meshtastic_MeshPacket_encrypted_tag &&
strcmp(e.channel_id, "PKI") == 0) {
- meshtastic_NodeInfoLite *tx = nodeDB->getMeshNode(getFrom(p));
- meshtastic_NodeInfoLite *rx = nodeDB->getMeshNode(p->to);
+ const meshtastic_NodeInfoLite *tx = nodeDB->getMeshNode(getFrom(p));
+ const meshtastic_NodeInfoLite *rx = nodeDB->getMeshNode(p->to);
// Only accept PKI messages to us, or if we have both the sender and receiver in our nodeDB, as then it's
// likely they discovered each other via a channel we have downlink enabled for
if (p->to == nodeDB->getNodeNum() || (tx && tx->has_user && rx && rx->has_user))
@@ -310,6 +329,7 @@ void MQTT::reconnect()
mqttPassword = moduleConfig.mqtt.password;
}
#if HAS_WIFI && !defined(ARCH_PORTDUINO)
+#if !defined(CONFIG_IDF_TARGET_ESP32C6) && !defined(RPI_PICO)
if (moduleConfig.mqtt.tls_enabled) {
// change default for encrypted to 8883
try {
@@ -325,6 +345,9 @@ void MQTT::reconnect()
LOG_INFO("Using non-TLS-encrypted session\n");
pubSub.setClient(mqttClient);
}
+#else
+ pubSub.setClient(mqttClient);
+#endif
#elif HAS_NETWORKING
pubSub.setClient(mqttClient);
#endif
@@ -466,9 +489,7 @@ void MQTT::publishQueuedMessages()
{
if (!mqttQueue.isEmpty()) {
LOG_DEBUG("Publishing enqueued MQTT message\n");
- // FIXME - this size calculation is super sloppy, but it will go away once we dynamically alloc meshpackets
meshtastic_ServiceEnvelope *env = mqttQueue.dequeuePtr(0);
- static uint8_t bytes[meshtastic_MeshPacket_size + 64];
size_t numBytes = pb_encode_to_bytes(bytes, sizeof(bytes), &meshtastic_ServiceEnvelope_msg, env);
std::string topic;
if (env->packet->pki_encrypted) {
@@ -514,19 +535,29 @@ void MQTT::onSend(const meshtastic_MeshPacket &mp, const meshtastic_MeshPacket &
return; // no channels have an uplink enabled
auto &ch = channels.getByIndex(chIndex);
- if (mp_decoded.which_payload_variant != meshtastic_MeshPacket_decoded_tag) {
- LOG_CRIT("MQTT::onSend(): mp_decoded isn't actually decoded\n");
- return;
- }
+ if (!mp.pki_encrypted) {
+ if (mp_decoded.which_payload_variant != meshtastic_MeshPacket_decoded_tag) {
+ LOG_CRIT("MQTT::onSend(): mp_decoded isn't actually decoded\n");
+ return;
+ }
- if (strcmp(moduleConfig.mqtt.address, default_mqtt_address) == 0 &&
- (mp_decoded.decoded.portnum == meshtastic_PortNum_RANGE_TEST_APP ||
- mp_decoded.decoded.portnum == meshtastic_PortNum_DETECTION_SENSOR_APP)) {
- LOG_DEBUG("MQTT onSend - Ignoring range test or detection sensor message on public mqtt\n");
- return;
- }
+ // check for the lowest bit of the data bitfield set false, and the use of one of the default keys.
+ if (mp_decoded.from != nodeDB->getNodeNum() && mp_decoded.decoded.has_bitfield &&
+ !(mp_decoded.decoded.bitfield & BITFIELD_OK_TO_MQTT_MASK) &&
+ (ch.settings.psk.size < 2 || (ch.settings.psk.size == 16 && memcmp(ch.settings.psk.bytes, defaultpsk, 16)) ||
+ (ch.settings.psk.size == 32 && memcmp(ch.settings.psk.bytes, eventpsk, 32)))) {
+ LOG_INFO("MQTT onSend - Not forwarding packet due to DontMqttMeBro flag\n");
+ return;
+ }
- if (ch.settings.uplink_enabled || mp.pki_encrypted) {
+ if (strcmp(moduleConfig.mqtt.address, default_mqtt_address) == 0 &&
+ (mp_decoded.decoded.portnum == meshtastic_PortNum_RANGE_TEST_APP ||
+ mp_decoded.decoded.portnum == meshtastic_PortNum_DETECTION_SENSOR_APP)) {
+ LOG_DEBUG("MQTT onSend - Ignoring range test or detection sensor message on public mqtt\n");
+ return;
+ }
+ }
+ if (mp.pki_encrypted || ch.settings.uplink_enabled) {
const char *channelId = mp.pki_encrypted ? "PKI" : channels.getGlobalId(chIndex);
meshtastic_ServiceEnvelope *env = mqttPool.allocZeroed();
@@ -537,14 +568,13 @@ void MQTT::onSend(const meshtastic_MeshPacket &mp, const meshtastic_MeshPacket &
if (moduleConfig.mqtt.encryption_enabled) {
env->packet = (meshtastic_MeshPacket *)∓
LOG_DEBUG("encrypted message\n");
- } else {
+ } else if (mp_decoded.which_payload_variant ==
+ meshtastic_MeshPacket_decoded_tag) { // Don't upload a still-encrypted PKI packet
env->packet = (meshtastic_MeshPacket *)&mp_decoded;
LOG_DEBUG("portnum %i message\n", env->packet->decoded.portnum);
}
if (moduleConfig.mqtt.proxy_to_client_enabled || this->isConnectedDirectly()) {
- // FIXME - this size calculation is super sloppy, but it will go away once we dynamically alloc meshpackets
- static uint8_t bytes[meshtastic_MeshPacket_size + 64];
size_t numBytes = pb_encode_to_bytes(bytes, sizeof(bytes), &meshtastic_ServiceEnvelope_msg, env);
std::string topic = cryptTopic + channelId + "/" + owner.id;
LOG_DEBUG("MQTT Publish %s, %u bytes\n", topic.c_str(), numBytes);
@@ -584,7 +614,7 @@ void MQTT::perhapsReportToMap()
if (!moduleConfig.mqtt.map_reporting_enabled || !(moduleConfig.mqtt.proxy_to_client_enabled || isConnectedDirectly()))
return;
- if (millis() - last_report_to_map < map_publish_interval_msecs) {
+ if (Throttle::isWithinTimespanMs(last_report_to_map, map_publish_interval_msecs)) {
return;
} else {
if (map_position_precision == 0 || (localPosition.latitude_i == 0 && localPosition.longitude_i == 0)) {
@@ -639,8 +669,6 @@ void MQTT::perhapsReportToMap()
&meshtastic_MapReport_msg, &mapReport);
se->packet = mp;
- // FIXME - this size calculation is super sloppy, but it will go away once we dynamically alloc meshpackets
- static uint8_t bytes[meshtastic_MeshPacket_size + 64];
size_t numBytes = pb_encode_to_bytes(bytes, sizeof(bytes), &meshtastic_ServiceEnvelope_msg, se);
LOG_INFO("MQTT Publish map report to %s\n", mapTopic.c_str());
diff --git a/src/mqtt/MQTT.h b/src/mqtt/MQTT.h
index ba0987783..c827e12ca 100644
--- a/src/mqtt/MQTT.h
+++ b/src/mqtt/MQTT.h
@@ -9,9 +9,11 @@
#if HAS_WIFI
#include
#if !defined(ARCH_PORTDUINO)
+#if defined(ESP_ARDUINO_VERSION_MAJOR) && ESP_ARDUINO_VERSION_MAJOR < 3
#include
#endif
#endif
+#endif
#if HAS_ETHERNET
#include
#endif
@@ -33,9 +35,11 @@ class MQTT : private concurrency::OSThread
#if HAS_WIFI
WiFiClient mqttClient;
#if !defined(ARCH_PORTDUINO)
+#if defined(ESP_ARDUINO_VERSION_MAJOR) && ESP_ARDUINO_VERSION_MAJOR < 3
WiFiClientSecure wifiSecureClient;
#endif
#endif
+#endif
#if HAS_ETHERNET
EthernetClient mqttClient;
#endif
diff --git a/src/nimble/NimbleBluetooth.cpp b/src/nimble/NimbleBluetooth.cpp
index d959553a4..eedfe1a71 100644
--- a/src/nimble/NimbleBluetooth.cpp
+++ b/src/nimble/NimbleBluetooth.cpp
@@ -44,6 +44,9 @@ static BluetoothPhoneAPI *bluetoothPhoneAPI;
* Subclasses can use this as a hook to provide custom notifications for their transport (i.e. bluetooth notifies)
*/
+// Last ToRadio value received from the phone
+static uint8_t lastToRadio[MAX_TO_FROM_RADIO_SIZE];
+
class NimbleBluetoothToRadioCallback : public NimBLECharacteristicCallbacks
{
virtual void onWrite(NimBLECharacteristic *pCharacteristic)
@@ -51,7 +54,13 @@ class NimbleBluetoothToRadioCallback : public NimBLECharacteristicCallbacks
LOG_INFO("To Radio onwrite\n");
auto val = pCharacteristic->getValue();
- bluetoothPhoneAPI->handleToRadio(val.data(), val.length());
+ if (memcmp(lastToRadio, val.data(), val.length()) != 0) {
+ LOG_DEBUG("New ToRadio packet\n");
+ memcpy(lastToRadio, val.data(), val.length());
+ bluetoothPhoneAPI->handleToRadio(val.data(), val.length());
+ } else {
+ LOG_DEBUG("Dropping duplicate ToRadio packet we just saw\n");
+ }
}
};
@@ -124,7 +133,14 @@ class NimbleBluetoothServerCallback : public NimBLEServerCallbacks
}
}
- virtual void onDisconnect(NimBLEServer *pServer, ble_gap_conn_desc *desc) { LOG_INFO("BLE disconnect\n"); }
+ virtual void onDisconnect(NimBLEServer *pServer, ble_gap_conn_desc *desc)
+ {
+ LOG_INFO("BLE disconnect\n");
+
+ if (bluetoothPhoneAPI) {
+ bluetoothPhoneAPI->close();
+ }
+ }
};
static NimbleBluetoothToRadioCallback *toRadioCallbacks;
diff --git a/src/platform/esp32/architecture.h b/src/platform/esp32/architecture.h
index f86b342ce..01f416629 100644
--- a/src/platform/esp32/architecture.h
+++ b/src/platform/esp32/architecture.h
@@ -76,6 +76,8 @@
#ifdef HELTEC_V2_1
#define HW_VENDOR meshtastic_HardwareModel_HELTEC_V2_1
#endif
+#elif defined(HELTEC_WIRELESS_BRIDGE)
+#define HW_VENDOR meshtastic_HardwareModel_HELTEC_WIRELESS_BRIDGE
#elif defined(ARDUINO_HELTEC_WIFI_LORA_32)
#define HW_VENDOR meshtastic_HardwareModel_HELTEC_V1
#elif defined(TLORA_V1)
@@ -88,6 +90,8 @@
#define HW_VENDOR meshtastic_HardwareModel_TLORA_V2_1_1P6
#elif defined(TLORA_V2_1_18)
#define HW_VENDOR meshtastic_HardwareModel_TLORA_V2_1_1P8
+#elif defined(TLORA_C6)
+#define HW_VENDOR meshtastic_HardwareModel_TLORA_C6
#elif defined(T_DECK)
#define HW_VENDOR meshtastic_HardwareModel_T_DECK
#elif defined(T_WATCH_S3)
@@ -166,6 +170,10 @@
#define HW_VENDOR meshtastic_HardwareModel_HELTEC_VISION_MASTER_E290
#elif defined(HELTEC_MESH_NODE_T114)
#define HW_VENDOR meshtastic_HardwareModel_HELTEC_MESH_NODE_T114
+#elif defined(SENSECAP_INDICATOR)
+#define HW_VENDOR meshtastic_HardwareModel_SENSECAP_INDICATOR
+#elif defined(SEEED_XIAO_S3)
+#define HW_VENDOR meshtastic_HardwareModel_SEEED_XIAO_S3
#endif
// -----------------------------------------------------------------------------
diff --git a/src/platform/esp32/main-esp32.cpp b/src/platform/esp32/main-esp32.cpp
index 1b997500a..f16accab6 100644
--- a/src/platform/esp32/main-esp32.cpp
+++ b/src/platform/esp32/main-esp32.cpp
@@ -13,6 +13,7 @@
#include "mesh/wifi/WiFiAPClient.h"
#endif
+#include "esp_mac.h"
#include "meshUtils.h"
#include "sleep.h"
#include "soc/rtc.h"
@@ -120,17 +121,24 @@ void esp32Setup()
uint32_t rebootCounter = preferences.getUInt("rebootCounter", 0);
rebootCounter++;
preferences.putUInt("rebootCounter", rebootCounter);
+ // store firmware version and hwrevision for access from OTA firmware
+ String fwrev = preferences.getString("firmwareVersion", "");
+ if (fwrev.compareTo(optstr(APP_VERSION)) != 0)
+ preferences.putString("firmwareVersion", optstr(APP_VERSION));
+ uint8_t hwven = preferences.getUInt("hwVendor", 0);
+ if (hwven != HW_VENDOR)
+ preferences.putUInt("hwVendor", HW_VENDOR);
preferences.end();
LOG_DEBUG("Number of Device Reboots: %d\n", rebootCounter);
#if !MESHTASTIC_EXCLUDE_BLUETOOTH
String BLEOTA = BleOta::getOtaAppVersion();
if (BLEOTA.isEmpty()) {
- LOG_DEBUG("No OTA firmware available\n");
+ LOG_INFO("No OTA firmware available\n");
} else {
- LOG_DEBUG("OTA firmware version %s\n", BLEOTA.c_str());
+ LOG_INFO("OTA firmware version %s\n", BLEOTA.c_str());
}
#else
- LOG_DEBUG("No OTA firmware available\n");
+ LOG_INFO("No OTA firmware available\n");
#endif
// enableModemSleep();
@@ -140,9 +148,16 @@ void esp32Setup()
// #define APP_WATCHDOG_SECS 45
#define APP_WATCHDOG_SECS 90
+#ifdef CONFIG_IDF_TARGET_ESP32C6
+ esp_task_wdt_config_t *wdt_config = (esp_task_wdt_config_t *)malloc(sizeof(esp_task_wdt_config_t));
+ wdt_config->timeout_ms = APP_WATCHDOG_SECS * 1000;
+ wdt_config->trigger_panic = true;
+ res = esp_task_wdt_init(wdt_config);
+ assert(res == ESP_OK);
+#else
res = esp_task_wdt_init(APP_WATCHDOG_SECS, true);
assert(res == ESP_OK);
-
+#endif
res = esp_task_wdt_add(NULL);
assert(res == ESP_OK);
@@ -216,7 +231,7 @@ void cpuDeepSleep(uint32_t msecToWake)
// to detect wake and in normal operation the external part drives them hard.
#ifdef BUTTON_PIN
// Only GPIOs which are have RTC functionality can be used in this bit map: 0,2,4,12-15,25-27,32-39.
-#if SOC_RTCIO_HOLD_SUPPORTED
+#if SOC_RTCIO_HOLD_SUPPORTED && SOC_PM_SUPPORT_EXT_WAKEUP
uint64_t gpioMask = (1ULL << (config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN));
#endif
diff --git a/src/platform/extra_variants/heltec_wireless_tracker/variant.cpp b/src/platform/extra_variants/heltec_wireless_tracker/variant.cpp
index 84264ef58..0a19a9c3b 100644
--- a/src/platform/extra_variants/heltec_wireless_tracker/variant.cpp
+++ b/src/platform/extra_variants/heltec_wireless_tracker/variant.cpp
@@ -10,10 +10,14 @@
void lateInitVariant()
{
// LOG_DEBUG("Heltec tracker initVariant\n");
-#ifdef VEXT_ENABLE
- GpioPin *hwEnable = new GpioHwPin(VEXT_ENABLE);
- GpioVirtPin *virtGpsEnable = gps ? gps->enablePin : new GpioVirtPin();
+#ifndef MESHTASTIC_EXCLUDE_GPS
+ GpioVirtPin *virtGpsEnable = gps ? gps->enablePin : new GpioVirtPin();
+#else
+ GpioVirtPin *virtGpsEnable = new GpioVirtPin();
+#endif
+
+#ifndef MESHTASTIC_EXCLUDE_SCREEN
// On this board we are actually using the backlightEnable signal to already be controlling a physical enable to the
// display controller. But we'd _ALSO_ like to have that signal drive a virtual GPIO. So nest it as needed.
GpioVirtPin *virtScreenEnable = new GpioVirtPin();
@@ -25,8 +29,11 @@ void lateInitVariant()
// Assume screen is initially powered
splitter->set(true);
}
+#endif
+#if defined(VEXT_ENABLE) && (!defined(MESHTASTIC_EXCLUDE_GPS) || !defined(MESHTASTIC_EXCLUDE_SCREEN))
// If either the GPS or the screen is on, turn on the external power regulator
+ GpioPin *hwEnable = new GpioHwPin(VEXT_ENABLE);
new GpioBinaryTransformer(virtGpsEnable, virtScreenEnable, hwEnable, GpioBinaryTransformer::Or);
#endif
}
diff --git a/src/platform/nrf52/BLEDfuScure.cpp b/src/platform/nrf52/BLEDfuScure.cpp
index 8f7a327c4..82cb8905a 100644
--- a/src/platform/nrf52/BLEDfuScure.cpp
+++ b/src/platform/nrf52/BLEDfuScure.cpp
@@ -48,11 +48,10 @@ extern "C" void bootloader_util_app_start(uint32_t start_addr);
static uint16_t crc16(const uint8_t *data_p, uint8_t length)
{
- uint8_t x;
uint16_t crc = 0xFFFF;
while (length--) {
- x = crc >> 8 ^ *data_p++;
+ uint8_t x = crc >> 8 ^ *data_p++;
x ^= x >> 4;
crc = (crc << 8) ^ ((uint16_t)(x << 12)) ^ ((uint16_t)(x << 5)) ^ ((uint16_t)x);
}
diff --git a/src/platform/nrf52/NRF52Bluetooth.cpp b/src/platform/nrf52/NRF52Bluetooth.cpp
index 1405ea4f3..fbc0728d7 100644
--- a/src/platform/nrf52/NRF52Bluetooth.cpp
+++ b/src/platform/nrf52/NRF52Bluetooth.cpp
@@ -55,7 +55,6 @@ static BluetoothPhoneAPI *bluetoothPhoneAPI;
void onConnect(uint16_t conn_handle)
{
-
// Get the reference to current connection
BLEConnection *connection = Bluefruit.Connection(conn_handle);
connectionHandle = conn_handle;
@@ -70,8 +69,10 @@ void onConnect(uint16_t conn_handle)
*/
void onDisconnect(uint16_t conn_handle, uint8_t reason)
{
- // FIXME - we currently assume only one active connection
LOG_INFO("BLE Disconnected, reason = 0x%x\n", reason);
+ if (bluetoothPhoneAPI) {
+ bluetoothPhoneAPI->close();
+ }
}
void onCccd(uint16_t conn_hdl, BLECharacteristic *chr, uint16_t cccd_value)
{
@@ -140,10 +141,19 @@ void onFromRadioAuthorize(uint16_t conn_hdl, BLECharacteristic *chr, ble_gatts_e
}
authorizeRead(conn_hdl);
}
+// Last ToRadio value received from the phone
+static uint8_t lastToRadio[MAX_TO_FROM_RADIO_SIZE];
+
void onToRadioWrite(uint16_t conn_hdl, BLECharacteristic *chr, uint8_t *data, uint16_t len)
{
LOG_INFO("toRadioWriteCb data %p, len %u\n", data, len);
- bluetoothPhoneAPI->handleToRadio(data, len);
+ if (memcmp(lastToRadio, data, len) != 0) {
+ LOG_DEBUG("New ToRadio packet\n");
+ memcpy(lastToRadio, data, len);
+ bluetoothPhoneAPI->handleToRadio(data, len);
+ } else {
+ LOG_DEBUG("Dropping duplicate ToRadio packet we just saw\n");
+ }
}
void setupMeshService(void)
diff --git a/src/platform/nrf52/architecture.h b/src/platform/nrf52/architecture.h
index 5a04dd6a7..b2b7b5a20 100644
--- a/src/platform/nrf52/architecture.h
+++ b/src/platform/nrf52/architecture.h
@@ -71,6 +71,8 @@
#define HW_VENDOR meshtastic_HardwareModel_MS24SF1
#elif defined(PRIVATE_HW) || defined(FEATHER_DIY)
#define HW_VENDOR meshtastic_HardwareModel_PRIVATE_HW
+#elif defined(HELTEC_T114)
+#define HW_VENDOR meshtastic_HardwareModel_HELTEC_MESH_NODE_T114
#else
#define HW_VENDOR meshtastic_HardwareModel_NRF52_UNKNOWN
#endif
diff --git a/src/platform/nrf52/main-nrf52.cpp b/src/platform/nrf52/main-nrf52.cpp
index b28640e65..4023a3cb9 100644
--- a/src/platform/nrf52/main-nrf52.cpp
+++ b/src/platform/nrf52/main-nrf52.cpp
@@ -12,6 +12,7 @@
#include "PowerMon.h"
#include "error.h"
#include "main.h"
+#include "meshUtils.h"
#ifdef BQ25703A_ADDR
#include "BQ25713.h"
@@ -157,6 +158,7 @@ void nrf52Loop()
#ifdef USE_SEMIHOSTING
#include
+#include
/**
* Note: this variable is in BSS and therfore false by default. But the gdbinit
@@ -261,10 +263,9 @@ void cpuDeepSleep(uint32_t msecToWake)
// Sleepy trackers or sensors can low power "sleep"
// Don't enter this if we're sleeping portMAX_DELAY, since that's a shutdown event
if (msecToWake != portMAX_DELAY &&
- (config.device.role == meshtastic_Config_DeviceConfig_Role_TRACKER ||
- config.device.role == meshtastic_Config_DeviceConfig_Role_TAK_TRACKER ||
- config.device.role == meshtastic_Config_DeviceConfig_Role_SENSOR) &&
- config.power.is_power_saving == true) {
+ (IS_ONE_OF(config.device.role, meshtastic_Config_DeviceConfig_Role_TRACKER,
+ meshtastic_Config_DeviceConfig_Role_TAK_TRACKER, meshtastic_Config_DeviceConfig_Role_SENSOR) &&
+ config.power.is_power_saving == true)) {
sd_power_mode_set(NRF_POWER_MODE_LOWPWR);
delay(msecToWake);
NVIC_SystemReset();
diff --git a/src/platform/portduino/PortduinoGlue.cpp b/src/platform/portduino/PortduinoGlue.cpp
index dc143c661..44f4d5227 100644
--- a/src/platform/portduino/PortduinoGlue.cpp
+++ b/src/platform/portduino/PortduinoGlue.cpp
@@ -80,6 +80,7 @@ void portduinoSetup()
irq,
busy,
reset,
+ sx126x_ant_sw,
txen,
rxen,
displayDC,
@@ -180,6 +181,7 @@ void portduinoSetup()
settingsMap[reset] = yamlConfig["Lora"]["Reset"].as(RADIOLIB_NC);
settingsMap[txen] = yamlConfig["Lora"]["TXen"].as(RADIOLIB_NC);
settingsMap[rxen] = yamlConfig["Lora"]["RXen"].as(RADIOLIB_NC);
+ settingsMap[sx126x_ant_sw] = yamlConfig["Lora"]["SX126X_ANT_SW"].as(RADIOLIB_NC);
settingsMap[gpiochip] = yamlConfig["Lora"]["gpiochip"].as(0);
settingsMap[ch341Quirk] = yamlConfig["Lora"]["ch341_quirk"].as(false);
settingsMap[spiSpeed] = yamlConfig["Lora"]["spiSpeed"].as(2000000);
@@ -305,6 +307,8 @@ void portduinoSetup()
gpioInit(max_GPIO + 1); // Done here so we can inform Portduino how many GPIOs we need.
// Need to bind all the configured GPIO pins so they're not simulated
+ // TODO: Can we do this in the for loop above?
+ // TODO: If one of these fails, we should log and terminate
if (settingsMap.count(cs) > 0 && settingsMap[cs] != RADIOLIB_NC) {
if (initGPIOPin(settingsMap[cs], gpioChipName) != ERRNO_OK) {
settingsMap[cs] = RADIOLIB_NC;
@@ -325,6 +329,11 @@ void portduinoSetup()
settingsMap[reset] = RADIOLIB_NC;
}
}
+ if (settingsMap.count(sx126x_ant_sw) > 0 && settingsMap[sx126x_ant_sw] != RADIOLIB_NC) {
+ if (initGPIOPin(settingsMap[sx126x_ant_sw], gpioChipName) != ERRNO_OK) {
+ settingsMap[sx126x_ant_sw] = RADIOLIB_NC;
+ }
+ }
if (settingsMap.count(user) > 0 && settingsMap[user] != RADIOLIB_NC) {
if (initGPIOPin(settingsMap[user], gpioChipName) != ERRNO_OK) {
settingsMap[user] = RADIOLIB_NC;
@@ -391,4 +400,4 @@ int initGPIOPin(int pinNum, const std::string gpioChipName)
#else
return ERRNO_OK;
#endif
-}
+}
\ No newline at end of file
diff --git a/src/platform/portduino/PortduinoGlue.h b/src/platform/portduino/PortduinoGlue.h
index 3fee1db40..59956cb59 100644
--- a/src/platform/portduino/PortduinoGlue.h
+++ b/src/platform/portduino/PortduinoGlue.h
@@ -8,6 +8,7 @@ enum configNames {
irq,
busy,
reset,
+ sx126x_ant_sw,
txen,
rxen,
dio2_as_rf_switch,
@@ -63,4 +64,4 @@ enum { level_error, level_warn, level_info, level_debug, level_trace };
extern std::map settingsMap;
extern std::map settingsStrings;
extern std::ofstream traceFile;
-int initGPIOPin(int pinNum, std::string gpioChipname);
+int initGPIOPin(int pinNum, std::string gpioChipname);
\ No newline at end of file
diff --git a/src/platform/rp2040/architecture.h b/src/platform/rp2xx0/architecture.h
similarity index 90%
rename from src/platform/rp2040/architecture.h
rename to src/platform/rp2xx0/architecture.h
index 3f75735d3..8c7dfc0cd 100644
--- a/src/platform/rp2040/architecture.h
+++ b/src/platform/rp2xx0/architecture.h
@@ -23,6 +23,8 @@
#if defined(RPI_PICO)
#define HW_VENDOR meshtastic_HardwareModel_RPI_PICO
+#elif defined(RPI_PICO2)
+#define HW_VENDOR meshtastic_HardwareModel_RPI_PICO2
#elif defined(RAK11310)
#define HW_VENDOR meshtastic_HardwareModel_RAK11310
#elif defined(SENSELORA_RP2040)
diff --git a/src/platform/rp2040/main-rp2040.cpp b/src/platform/rp2xx0/main-rp2xx0.cpp
similarity index 100%
rename from src/platform/rp2040/main-rp2040.cpp
rename to src/platform/rp2xx0/main-rp2xx0.cpp
diff --git a/src/power.h b/src/power.h
index a4307ee07..63335104b 100644
--- a/src/power.h
+++ b/src/power.h
@@ -5,6 +5,7 @@
#include "configuration.h"
#ifdef ARCH_ESP32
+// "legacy adc calibration driver is deprecated, please migrate to use esp_adc/adc_cali.h and esp_adc/adc_cali_scheme.h
#include
#include
#endif
@@ -48,6 +49,11 @@ extern INA219Sensor ina219Sensor;
extern INA3221Sensor ina3221Sensor;
#endif
+#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL)
+#include "modules/Telemetry/Sensor/MAX17048Sensor.h"
+extern MAX17048Sensor max17048Sensor;
+#endif
+
#if HAS_RAKPROT && !defined(ARCH_PORTDUINO)
#include "../variants/rak2560/RAK9154Sensor.h"
extern RAK9154Sensor rak9154Sensor;
@@ -82,6 +88,8 @@ class Power : private concurrency::OSThread
bool axpChipInit();
/// Setup a simple ADC input based battery sensor
bool analogInit();
+ /// Setup a Lipo battery level sensor
+ bool lipoInit();
private:
// open circuit voltage lookup table
diff --git a/src/serialization/JSON.cpp b/src/serialization/JSON.cpp
index e98bf47b9..42e615108 100644
--- a/src/serialization/JSON.cpp
+++ b/src/serialization/JSON.cpp
@@ -184,7 +184,7 @@ bool JSON::ExtractString(const char **data, std::string &str)
// End of the string?
else if (next_char == '"') {
(*data)++;
- str.reserve(); // Remove unused capacity
+ str.shrink_to_fit(); // Remove unused capacity
return true;
}
diff --git a/src/serialization/JSONValue.cpp b/src/serialization/JSONValue.cpp
index 51e0c1a3b..b2e9575bf 100644
--- a/src/serialization/JSONValue.cpp
+++ b/src/serialization/JSONValue.cpp
@@ -37,14 +37,14 @@
#define FREE_ARRAY(x) \
{ \
JSONArray::iterator iter; \
- for (iter = x.begin(); iter != x.end(); iter++) { \
+ for (iter = x.begin(); iter != x.end(); ++iter) { \
delete *iter; \
} \
}
#define FREE_OBJECT(x) \
{ \
JSONObject::iterator iter; \
- for (iter = x.begin(); iter != x.end(); iter++) { \
+ for (iter = x.begin(); iter != x.end(); ++iter) { \
delete (*iter).second; \
} \
}
@@ -430,7 +430,7 @@ JSONValue::JSONValue(const JSONValue &m_source)
JSONArray source_array = *m_source.array_value;
JSONArray::iterator iter;
array_value = new JSONArray();
- for (iter = source_array.begin(); iter != source_array.end(); iter++)
+ for (iter = source_array.begin(); iter != source_array.end(); ++iter)
array_value->push_back(new JSONValue(**iter));
break;
}
@@ -439,7 +439,7 @@ JSONValue::JSONValue(const JSONValue &m_source)
JSONObject source_object = *m_source.object_value;
object_value = new JSONObject();
JSONObject::iterator iter;
- for (iter = source_object.begin(); iter != source_object.end(); iter++) {
+ for (iter = source_object.begin(); iter != source_object.end(); ++iter) {
std::string name = (*iter).first;
(*object_value)[name] = new JSONValue(*((*iter).second));
}
@@ -462,12 +462,12 @@ JSONValue::~JSONValue()
{
if (type == JSONType_Array) {
JSONArray::iterator iter;
- for (iter = array_value->begin(); iter != array_value->end(); iter++)
+ for (iter = array_value->begin(); iter != array_value->end(); ++iter)
delete *iter;
delete array_value;
} else if (type == JSONType_Object) {
JSONObject::iterator iter;
- for (iter = object_value->begin(); iter != object_value->end(); iter++) {
+ for (iter = object_value->begin(); iter != object_value->end(); ++iter) {
delete (*iter).second;
}
delete object_value;
@@ -722,7 +722,7 @@ std::vector JSONValue::ObjectKeys() const
while (iter != object_value->end()) {
keys.push_back(iter->first);
- iter++;
+ ++iter;
}
}
@@ -865,7 +865,7 @@ std::string JSONValue::StringifyString(const std::string &str)
str_out += chr;
}
- iter++;
+ ++iter;
}
str_out += "\"";
diff --git a/src/serialization/JSONValue.h b/src/serialization/JSONValue.h
index 0380d324b..16d53e89f 100644
--- a/src/serialization/JSONValue.h
+++ b/src/serialization/JSONValue.h
@@ -40,15 +40,15 @@ class JSONValue
public:
JSONValue(/*NULL*/);
- JSONValue(const char *m_char_value);
- JSONValue(const std::string &m_string_value);
- JSONValue(bool m_bool_value);
- JSONValue(double m_number_value);
- JSONValue(int m_integer_value);
- JSONValue(unsigned int m_integer_value);
- JSONValue(const JSONArray &m_array_value);
- JSONValue(const JSONObject &m_object_value);
- JSONValue(const JSONValue &m_source);
+ explicit JSONValue(const char *m_char_value);
+ explicit JSONValue(const std::string &m_string_value);
+ explicit JSONValue(bool m_bool_value);
+ explicit JSONValue(double m_number_value);
+ explicit JSONValue(int m_integer_value);
+ explicit JSONValue(unsigned int m_integer_value);
+ explicit JSONValue(const JSONArray &m_array_value);
+ explicit JSONValue(const JSONObject &m_object_value);
+ explicit JSONValue(const JSONValue &m_source);
~JSONValue();
bool IsNull() const;
diff --git a/src/sleep.cpp b/src/sleep.cpp
index 27e81ce54..60f83f537 100644
--- a/src/sleep.cpp
+++ b/src/sleep.cpp
@@ -5,6 +5,7 @@
#endif
#include "ButtonThread.h"
+#include "Default.h"
#include "Led.h"
#include "MeshRadio.h"
#include "MeshService.h"
@@ -17,6 +18,7 @@
#include "target_specific.h"
#ifdef ARCH_ESP32
+// "esp_pm_config_esp32_t is deprecated, please include esp_pm.h and use esp_pm_config_t instead"
#include "esp32/pm.h"
#include "esp_pm.h"
#if HAS_WIFI
@@ -28,6 +30,7 @@
esp_sleep_source_t wakeCause; // the reason we booted this time
#endif
+#include "Throttle.h"
#ifndef INCLUDE_vTaskSuspend
#define INCLUDE_vTaskSuspend 0
@@ -168,7 +171,8 @@ static void waitEnterSleep(bool skipPreflight = false)
while (!doPreflightSleep()) {
delay(100); // Kinda yucky - wait until radio says say we can shutdown (finished in process sends/receives)
- if (millis() - now > 30 * 1000) { // If we wait too long just report an error and go to sleep
+ if (!Throttle::isWithinTimespanMs(now,
+ THIRTY_SECONDS_MS)) { // If we wait too long just report an error and go to sleep
RECORD_CRITICALERROR(meshtastic_CriticalErrorCode_SLEEP_ENTER_WAIT);
assert(0); // FIXME - for now we just restart, need to fix bug #167
break;
@@ -271,13 +275,6 @@ void doDeepSleep(uint32_t msecToWake, bool skipPreflight = false)
digitalWrite(LORA_CS, HIGH);
gpio_hold_en((gpio_num_t)LORA_CS);
}
-
-#if defined(I2C_SDA)
- Wire.end();
- pinMode(I2C_SDA, ANALOG);
- pinMode(I2C_SCL, ANALOG);
-#endif
-
#endif
#ifdef HAS_PMU
@@ -315,6 +312,14 @@ void doDeepSleep(uint32_t msecToWake, bool skipPreflight = false)
}
#endif
+#if defined(ARCH_ESP32) && defined(I2C_SDA)
+ // Added by https://github.com/meshtastic/firmware/pull/4418
+ // Possibly to support Heltec Capsule Sensor?
+ Wire.end();
+ pinMode(I2C_SDA, ANALOG);
+ pinMode(I2C_SCL, ANALOG);
+#endif
+
console->flush();
cpuDeepSleep(msecToWake);
}
@@ -446,12 +451,17 @@ esp_sleep_wakeup_cause_t doLightSleep(uint64_t sleepMsec) // FIXME, use a more r
*/
void enableModemSleep()
{
+#if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 0)
+ static esp_pm_config_t esp32_config; // filled with zeros because bss
+#else
static esp_pm_config_esp32_t esp32_config; // filled with zeros because bss
-
+#endif
#if CONFIG_IDF_TARGET_ESP32S3
esp32_config.max_freq_mhz = CONFIG_ESP32S3_DEFAULT_CPU_FREQ_MHZ;
#elif CONFIG_IDF_TARGET_ESP32S2
esp32_config.max_freq_mhz = CONFIG_ESP32S2_DEFAULT_CPU_FREQ_MHZ;
+#elif CONFIG_IDF_TARGET_ESP32C6
+ esp32_config.max_freq_mhz = CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ;
#elif CONFIG_IDF_TARGET_ESP32C3
esp32_config.max_freq_mhz = CONFIG_ESP32C3_DEFAULT_CPU_FREQ_MHZ;
#else
diff --git a/test/test_crypto/test_main.cpp b/test/test_crypto/test_main.cpp
index 129c88283..cbe366048 100644
--- a/test/test_crypto/test_main.cpp
+++ b/test/test_crypto/test_main.cpp
@@ -98,7 +98,44 @@ void test_DH25519(void)
HexToBytes(private_key, "18630f93598637c35da623a74559cf944374a559114c7937811041fc8605564a");
crypto->setDHPrivateKey(private_key);
TEST_ASSERT(!crypto->setDHPublicKey(public_key)); // Weak public key results in 0 shared key
+
+ HexToBytes(public_key, "f7e13a1a067d2f4e1061bf9936fde5be6b0c2494a8f809cbac7f290ef719e91c");
+ HexToBytes(private_key, "10300724f3bea134eb1575245ef26ff9b8ccd59849cd98ce1a59002fe1d5986c");
+ HexToBytes(expected_shared, "24becd5dfed9e9289ba2e15b82b0d54f8e9aacb72f5e4248c58d8d74b451ce76");
+ crypto->setDHPrivateKey(private_key);
+ TEST_ASSERT(crypto->setDHPublicKey(public_key));
+ crypto->hash(crypto->shared_key, 32);
+ TEST_ASSERT_EQUAL_MEMORY(expected_shared, crypto->shared_key, 32);
}
+
+void test_PKC_Decrypt(void)
+{
+ uint8_t private_key[32];
+ uint8_t public_key[32];
+ uint8_t expected_shared[32];
+ uint8_t expected_decrypted[32];
+ uint8_t radioBytes[128] __attribute__((__aligned__));
+ uint8_t decrypted[128] __attribute__((__aligned__));
+ uint8_t expected_nonce[16];
+
+ uint32_t fromNode;
+ HexToBytes(public_key, "db18fc50eea47f00251cb784819a3cf5fc361882597f589f0d7ff820e8064457");
+ HexToBytes(private_key, "a00330633e63522f8a4d81ec6d9d1e6617f6c8ffd3a4c698229537d44e522277");
+ HexToBytes(expected_shared, "777b1545c9d6f9a2");
+ HexToBytes(expected_decrypted, "08011204746573744800");
+ HexToBytes(radioBytes, "8c646d7a2909000062d6b2136b00000040df24abfcc30a17a3d9046726099e796a1c036a792b");
+ HexToBytes(expected_nonce, "62d6b213036a792b2909000000");
+ fromNode = 0x0929;
+ crypto->setDHPrivateKey(private_key);
+ TEST_ASSERT(crypto->setDHPublicKey(public_key));
+ crypto->hash(crypto->shared_key, 32);
+ crypto->decryptCurve25519(fromNode, 0x13b2d662, 22, radioBytes + 16, decrypted);
+ TEST_ASSERT_EQUAL_MEMORY(expected_shared, crypto->shared_key, 8);
+ TEST_ASSERT_EQUAL_MEMORY(expected_nonce, crypto->nonce, 13);
+
+ TEST_ASSERT_EQUAL_MEMORY(expected_decrypted, decrypted, 10);
+}
+
void test_AES_CTR(void)
{
uint8_t expected[32];
@@ -129,6 +166,7 @@ void setup()
{
// NOTE!!! Wait for >2 secs
// if board doesn't support software reset via Serial.DTR/RTS
+ delay(10);
delay(2000);
UNITY_BEGIN(); // IMPORTANT LINE!
@@ -136,6 +174,7 @@ void setup()
RUN_TEST(test_ECB_AES256);
RUN_TEST(test_DH25519);
RUN_TEST(test_AES_CTR);
+ RUN_TEST(test_PKC_Decrypt);
}
void loop()
diff --git a/variants/Dongle_nRF52840-pca10059-v1/platformio.ini b/variants/Dongle_nRF52840-pca10059-v1/platformio.ini
index c87f83d39..a98656e86 100644
--- a/variants/Dongle_nRF52840-pca10059-v1/platformio.ini
+++ b/variants/Dongle_nRF52840-pca10059-v1/platformio.ini
@@ -1,4 +1,5 @@
[env:pca10059_diy_eink]
+board_level = extra
extends = nrf52840_base
board = nordic_pca10059
build_flags = ${nrf52840_base.build_flags} -Ivariants/Dongle_nRF52840-pca10059-v1 -D NORDIC_PCA10059
diff --git a/variants/ME25LS01-4Y10TD/platformio.ini b/variants/ME25LS01-4Y10TD/platformio.ini
index 985919d2d..479a4e79c 100644
--- a/variants/ME25LS01-4Y10TD/platformio.ini
+++ b/variants/ME25LS01-4Y10TD/platformio.ini
@@ -3,7 +3,7 @@ extends = nrf52840_base
board = me25ls01-4y10td
board_level = extra
; platform = https://github.com/maxgerhardt/platform-nordicnrf52#cac6fcf943a41accd2aeb4f3659ae297a73f422e
-build_flags = ${nrf52840_base.build_flags} -Ivariants/ME25LS01-4Y10TD -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52 -DME25LS01_4Y10TD ;-DRADIOLIB_GODMODE
+build_flags = ${nrf52840_base.build_flags} -Ivariants/ME25LS01-4Y10TD -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52 -DME25LS01_4Y10TD
-L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
-DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
@@ -12,4 +12,4 @@ lib_deps =
${nrf52840_base.lib_deps}
; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
upload_protocol = nrfutil
-upload_port = /dev/ttyACM1
+upload_port = /dev/ttyACM1
\ No newline at end of file
diff --git a/variants/ME25LS01-4Y10TD/rfswitch.h b/variants/ME25LS01-4Y10TD/rfswitch.h
new file mode 100644
index 000000000..cda6364f5
--- /dev/null
+++ b/variants/ME25LS01-4Y10TD/rfswitch.h
@@ -0,0 +1,15 @@
+#include "RadioLib.h"
+#include "nrf.h"
+
+// set RF switch configuration for Wio WM1110
+// Wio WM1110 uses DIO5 and DIO6 for RF switching
+
+static const uint32_t rfswitch_dio_pins[] = {RADIOLIB_LR11X0_DIO5, RADIOLIB_LR11X0_DIO6, RADIOLIB_NC, RADIOLIB_NC, RADIOLIB_NC};
+
+static const Module::RfSwitchMode_t rfswitch_table[] = {
+ // mode DIO5 DIO6
+ {LR11x0::MODE_STBY, {LOW, LOW}}, {LR11x0::MODE_RX, {HIGH, LOW}},
+ {LR11x0::MODE_TX, {HIGH, HIGH}}, {LR11x0::MODE_TX_HP, {LOW, HIGH}},
+ {LR11x0::MODE_TX_HF, {LOW, LOW}}, {LR11x0::MODE_GNSS, {LOW, LOW}},
+ {LR11x0::MODE_WIFI, {LOW, LOW}}, END_OF_MODE_TABLE,
+};
diff --git a/variants/ME25LS01-4Y10TD/variant.h b/variants/ME25LS01-4Y10TD/variant.h
index 715de8ee6..e772069da 100644
--- a/variants/ME25LS01-4Y10TD/variant.h
+++ b/variants/ME25LS01-4Y10TD/variant.h
@@ -94,7 +94,7 @@ extern "C" {
#define USE_LR1110
#define LR1110_IRQ_PIN LORA_DIO1
-#define LR1110_NRESER_PIN LORA_RESET
+#define LR1110_NRESET_PIN LORA_RESET
#define LR1110_BUSY_PIN LORA_DIO2
#define LR1110_SPI_NSS_PIN LORA_CS
#define LR1110_SPI_SCK_PIN LORA_SCK
@@ -103,7 +103,6 @@ extern "C" {
#define LR11X0_DIO3_TCXO_VOLTAGE 1.6
#define LR11X0_DIO_AS_RF_SWITCH
-#define LR11X0_DIO_RF_SWITCH_CONFIG 0x0f, 0x0, 0x09, 0x0B, 0x0A, 0x0, 0x4, 0x0
#define HAS_GPS 0
diff --git a/variants/ME25LS01-4Y10TD_e-ink/platformio.ini b/variants/ME25LS01-4Y10TD_e-ink/platformio.ini
index 4e837abd8..f2e3a49e3 100644
--- a/variants/ME25LS01-4Y10TD_e-ink/platformio.ini
+++ b/variants/ME25LS01-4Y10TD_e-ink/platformio.ini
@@ -3,7 +3,7 @@ extends = nrf52840_base
board = me25ls01-4y10td
board_level = extra
; platform = https://github.com/maxgerhardt/platform-nordicnrf52#cac6fcf943a41accd2aeb4f3659ae297a73f422e
-build_flags = ${nrf52840_base.build_flags} -Ivariants/ME25LS01-4Y10TD_e-ink -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52 -DME25LS01_4Y10TD ;-DRADIOLIB_GODMODE
+build_flags = ${nrf52840_base.build_flags} -Ivariants/ME25LS01-4Y10TD_e-ink -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52 -DME25LS01_4Y10TD
-L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
-DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
-DEINK_DISPLAY_MODEL=GxEPD2_420_GDEY042T81
@@ -16,4 +16,4 @@ lib_deps =
zinggjm/GxEPD2@^1.5.8
; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
upload_protocol = nrfutil
-upload_port = /dev/ttyACM1
+upload_port = /dev/ttyACM1
\ No newline at end of file
diff --git a/variants/ME25LS01-4Y10TD_e-ink/rfswitch.h b/variants/ME25LS01-4Y10TD_e-ink/rfswitch.h
new file mode 100644
index 000000000..cda6364f5
--- /dev/null
+++ b/variants/ME25LS01-4Y10TD_e-ink/rfswitch.h
@@ -0,0 +1,15 @@
+#include "RadioLib.h"
+#include "nrf.h"
+
+// set RF switch configuration for Wio WM1110
+// Wio WM1110 uses DIO5 and DIO6 for RF switching
+
+static const uint32_t rfswitch_dio_pins[] = {RADIOLIB_LR11X0_DIO5, RADIOLIB_LR11X0_DIO6, RADIOLIB_NC, RADIOLIB_NC, RADIOLIB_NC};
+
+static const Module::RfSwitchMode_t rfswitch_table[] = {
+ // mode DIO5 DIO6
+ {LR11x0::MODE_STBY, {LOW, LOW}}, {LR11x0::MODE_RX, {HIGH, LOW}},
+ {LR11x0::MODE_TX, {HIGH, HIGH}}, {LR11x0::MODE_TX_HP, {LOW, HIGH}},
+ {LR11x0::MODE_TX_HF, {LOW, LOW}}, {LR11x0::MODE_GNSS, {LOW, LOW}},
+ {LR11x0::MODE_WIFI, {LOW, LOW}}, END_OF_MODE_TABLE,
+};
diff --git a/variants/ME25LS01-4Y10TD_e-ink/variant.h b/variants/ME25LS01-4Y10TD_e-ink/variant.h
index 60996d468..797394ce6 100644
--- a/variants/ME25LS01-4Y10TD_e-ink/variant.h
+++ b/variants/ME25LS01-4Y10TD_e-ink/variant.h
@@ -97,7 +97,7 @@ static const uint8_t MISO = PIN_SPI_MISO;
static const uint8_t SCK = PIN_SPI_SCK;
// EPD SPI
-#define PIN_SPI1_MISO (-1) // Not Used for EPD
+#define PIN_SPI1_MISO (32 + 2) // Not Used for EPD but needs to be defined
#define PIN_SPI1_MOSI (0 + 10) // EPD_MOSI P0.10
#define PIN_SPI1_SCK (0 + 9) // EPD_SCLK P0.09
@@ -117,7 +117,7 @@ static const uint8_t SCK = PIN_SPI_SCK;
#define USE_LR1110
#define LR1110_IRQ_PIN LORA_DIO1
-#define LR1110_NRESER_PIN LORA_RESET
+#define LR1110_NRESET_PIN LORA_RESET
#define LR1110_BUSY_PIN LORA_DIO2
#define LR1110_SPI_NSS_PIN LORA_CS
#define LR1110_SPI_SCK_PIN LORA_SCK
@@ -126,7 +126,6 @@ static const uint8_t SCK = PIN_SPI_SCK;
#define LR11X0_DIO3_TCXO_VOLTAGE 1.6
#define LR11X0_DIO_AS_RF_SWITCH
-#define LR11X0_DIO_RF_SWITCH_CONFIG 0x0f, 0x0, 0x09, 0x0B, 0x0A, 0x0, 0x4, 0x0
#define HAS_GPS 0
@@ -159,4 +158,4 @@ static const uint8_t SCK = PIN_SPI_SCK;
* Arduino objects - C++ only
*----------------------------------------------------------------------------*/
-#endif // _VARIANT_ME25LS01_4Y10TD__
+#endif // _VARIANT_ME25LS01_4Y10TD__
\ No newline at end of file
diff --git a/variants/MakePython_nRF52840_eink/variant.h b/variants/MakePython_nRF52840_eink/variant.h
index 16f803dd2..00c8dc199 100644
--- a/variants/MakePython_nRF52840_eink/variant.h
+++ b/variants/MakePython_nRF52840_eink/variant.h
@@ -25,8 +25,6 @@ extern "C" {
#define NUM_ANALOG_INPUTS (6)
#define NUM_ANALOG_OUTPUTS (0)
-#define RADIOLIB_GODMODE
-
// LEDs
#define PIN_LED1 (32 + 10) // LED P1.15
#define PIN_LED2 (-1) //
diff --git a/variants/MakePython_nRF52840_oled/variant.h b/variants/MakePython_nRF52840_oled/variant.h
index a2a5fa80a..28d941171 100644
--- a/variants/MakePython_nRF52840_oled/variant.h
+++ b/variants/MakePython_nRF52840_oled/variant.h
@@ -25,8 +25,6 @@ extern "C" {
#define NUM_ANALOG_INPUTS (6)
#define NUM_ANALOG_OUTPUTS (0)
-#define RADIOLIB_GODMODE
-
// LEDs
#define PIN_LED1 (32 + 10) // LED P1.15
#define PIN_LED2 (-1) //
diff --git a/variants/chatter2/variant.h b/variants/chatter2/variant.h
index b7f946970..5c27e2fb5 100644
--- a/variants/chatter2/variant.h
+++ b/variants/chatter2/variant.h
@@ -66,6 +66,7 @@
#define SCREEN_ROTATE
#define SCREEN_TRANSITION_FRAMERATE 5 // fps
#define DISPLAY_FORCE_SMALL_FONTS
+#define TFT_BACKLIGHT_ON LOW
// Battery
@@ -121,4 +122,4 @@
// cannot serve any extra function even if requested to LORA_DIO3 value is never used in src (as we are not using RF95), so no
// need to define, and DIO3_AS_TCXO_AT_1V8 is set so it cannot serve any extra function even if requested to (from 13.3.2.1
// DioxMask in SX1262 datasheet: Note that if DIO2 or DIO3 are used to control the RF Switch or the TCXO, the IRQ will not be
-// generated even if it is mapped to the pins.)
\ No newline at end of file
+// generated even if it is mapped to the pins.)
diff --git a/variants/diy/platformio.ini b/variants/diy/platformio.ini
index adc10de44..f3c22b7a8 100644
--- a/variants/diy/platformio.ini
+++ b/variants/diy/platformio.ini
@@ -7,7 +7,6 @@ build_flags =
${esp32_base.build_flags}
-D DIY_V1
-D EBYTE_E22
- -D OLED_RU
-I variants/diy/v1
; Meshtastic DIY v1.1 new schematic based on ESP32-WROOM-32 & SX1262/SX1268 modules
@@ -19,7 +18,6 @@ build_flags =
${esp32_base.build_flags}
-D DIY_V1
-D EBYTE_E22
- -D OLED_RU
-I variants/diy/v1_1
; Port to Disaster Radio's ESP32-v3 Dev Board
@@ -52,7 +50,6 @@ board_level = extra
build_flags = ${nrf52840_base.build_flags}
-I variants/diy/nrf52_promicro_diy_xtal
-D NRF52_PROMICRO_DIY
- -D OLED_RU
-L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
build_src_filter = ${nrf52_base.build_src_filter} +<../variants/diy/nrf52_promicro_diy_xtal>
lib_deps =
@@ -68,9 +65,26 @@ board_level = extra
build_flags = ${nrf52840_base.build_flags}
-I variants/diy/nrf52_promicro_diy_tcxo
-D NRF52_PROMICRO_DIY
- -D OLED_RU
-L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
build_src_filter = ${nrf52_base.build_src_filter} +<../variants/diy/nrf52_promicro_diy_tcxo>
lib_deps =
${nrf52840_base.lib_deps}
-debug_tool = jlink
\ No newline at end of file
+debug_tool = jlink
+
+; NanoVHF T-Energy-S3 + E22(0)-xxxM - DIY
+[env:t-energy-s3_e22]
+extends = esp32s3_base
+board = esp32-s3-devkitc-1
+board_level = extra
+board_upload.flash_size = 16MB ;Specify the FLASH capacity as 16MB
+board_build.arduino.memory_type = qio_opi ;Enable internal PSRAM
+build_unflags =
+ ${esp32s3_base.build_unflags}
+ -D ARDUINO_USB_MODE=1
+build_flags =
+ ${esp32s3_base.build_flags}
+ -D EBYTE_ESP32_S3
+ -D BOARD_HAS_PSRAM
+ -D ARDUINO_USB_MODE=0
+ -D ARDUINO_USB_CDC_ON_BOOT=1
+ -I variants/diy/t-energy-s3_e22
diff --git a/variants/diy/t-energy-s3_e22/variant.h b/variants/diy/t-energy-s3_e22/variant.h
new file mode 100644
index 000000000..6933d7715
--- /dev/null
+++ b/variants/diy/t-energy-s3_e22/variant.h
@@ -0,0 +1,46 @@
+// NanoVHF T-Energy-S3 + E22(0)-xxxM - DIY
+// https://github.com/NanoVHF/Meshtastic-DIY/tree/main/PCB/ESP-32-devkit_EBYTE-E22/Mesh-v1.06-TTGO-T18
+
+// Battery
+#define BATTERY_PIN 3
+#define ADC_MULTIPLIER 2.0
+#define ADC_CHANNEL ADC1_GPIO3_CHANNEL
+
+// Button on NanoVHF PCB
+#define BUTTON_PIN 39
+
+// I2C via connectors on NanoVHF PCB
+#define I2C_SCL 2
+#define I2C_SDA 42
+
+// Screen (disabled)
+#define HAS_SCREEN 0 // Assume no screen present by default to prevent crash...
+
+// GPS via T-Energy-S3 onboard connector
+#define HAS_GPS 1
+#define GPS_TX_PIN 43
+#define GPS_RX_PIN 44
+
+// LoRa
+#define USE_SX1262 // E22-900M30S, E22-900M22S, and E22-900MM22S (not E220!) use SX1262
+#define USE_SX1268 // E22-400M30S, E22-400M33S, E22-400M22S, and E22-400MM22S use SX1268
+
+#define SX126X_MAX_POWER 22 // SX126xInterface.cpp defaults to 22 if not defined, but here we define it for good practice
+#define SX126X_DIO3_TCXO_VOLTAGE 1.8 // E22 series TCXO reference voltage is 1.8V
+
+#define SX126X_CS 5 // EBYTE module's NSS pin // FIXME: rename to SX126X_SS
+#define SX126X_SCK 6 // EBYTE module's SCK pin
+#define SX126X_MOSI 13 // EBYTE module's MOSI pin
+#define SX126X_MISO 4 // EBYTE module's MISO pin
+#define SX126X_RESET 1 // EBYTE module's NRST pin
+#define SX126X_BUSY 48 // EBYTE module's BUSY pin
+#define SX126X_DIO1 47 // EBYTE module's DIO1 pin
+
+#define SX126X_TXEN 10 // Schematic connects EBYTE module's TXEN pin to MCU
+#define SX126X_RXEN 12 // Schematic connects EBYTE module's RXEN pin to MCU
+
+#define LORA_CS SX126X_CS // Compatibility with variant file configuration structure
+#define LORA_SCK SX126X_SCK // Compatibility with variant file configuration structure
+#define LORA_MOSI SX126X_MOSI // Compatibility with variant file configuration structure
+#define LORA_MISO SX126X_MISO // Compatibility with variant file configuration structure
+#define LORA_DIO1 SX126X_DIO1 // Compatibility with variant file configuration structure
diff --git a/variants/heltec_mesh_node_t114/platformio.ini b/variants/heltec_mesh_node_t114/platformio.ini
index 1009ecce5..1b06c7f5e 100644
--- a/variants/heltec_mesh_node_t114/platformio.ini
+++ b/variants/heltec_mesh_node_t114/platformio.ini
@@ -8,9 +8,10 @@ debug_tool = jlink
build_flags = ${nrf52840_base.build_flags} -Ivariants/heltec_mesh_node_t114
-L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
-DGPS_POWER_TOGGLE
+ -DHELTEC_T114
build_src_filter = ${nrf52_base.build_src_filter} +<../variants/heltec_mesh_node_t114>
lib_deps =
${nrf52840_base.lib_deps}
lewisxhe/PCF8563_Library@^1.0.1
- https://github.com/meshtastic/st7789#7181320e7ed05c7fb5fd2d32f14723bce6088b7b
\ No newline at end of file
+ https://github.com/meshtastic/st7789#bd33ea58ddfe4a5e4a66d53300ccbd38d66ac21f
\ No newline at end of file
diff --git a/variants/heltec_mesh_node_t114/variant.cpp b/variants/heltec_mesh_node_t114/variant.cpp
index cae079b74..85c9f4a72 100644
--- a/variants/heltec_mesh_node_t114/variant.cpp
+++ b/variants/heltec_mesh_node_t114/variant.cpp
@@ -32,13 +32,7 @@ const uint32_t g_ADigitalPinMap[] = {
void initVariant()
{
- // LED1 & LED2
+ // LED1
pinMode(PIN_LED1, OUTPUT);
ledOff(PIN_LED1);
-
- pinMode(PIN_LED2, OUTPUT);
- ledOff(PIN_LED2);
-
- pinMode(PIN_LED3, OUTPUT);
- ledOff(PIN_LED3);
}
diff --git a/variants/heltec_mesh_node_t114/variant.h b/variants/heltec_mesh_node_t114/variant.h
index e8c305990..2cea3ef2f 100644
--- a/variants/heltec_mesh_node_t114/variant.h
+++ b/variants/heltec_mesh_node_t114/variant.h
@@ -67,20 +67,17 @@ extern "C" {
#define NUM_ANALOG_OUTPUTS (0)
// LEDs
-#define PIN_LED1 (32 + 3) // 13 red (confirmed on 1.0 board)
-// Unused(by firmware) LEDs:
-#define PIN_LED2 (1 + 1) // 14 blue
-#define PIN_LED3 (1 + 11) // 15 green
-
-#define LED_RED PIN_LED3
-#define LED_BLUE PIN_LED1
-#define LED_GREEN PIN_LED2
-
-#define LED_BUILTIN LED_BLUE
-#define LED_CONN PIN_GREEN
-
+#define PIN_LED1 (32 + 3) // green (confirmed on 1.0 board)
+#define LED_BLUE PIN_LED1 // fake for bluefruit library
+#define LED_GREEN PIN_LED1
+#define LED_BUILTIN LED_GREEN
#define LED_STATE_ON 0 // State when LED is lit
+#define HAS_NEOPIXEL // Enable the use of neopixels
+#define NEOPIXEL_COUNT 2 // How many neopixels are connected
+#define NEOPIXEL_DATA 14 // gpio pin used to send data to the neopixels
+#define NEOPIXEL_TYPE (NEO_GRB + NEO_KHZ800) // type of neopixels in use
+
/*
* Buttons
*/
@@ -95,13 +92,22 @@ No longer populated on PCB
#define PIN_SERIAL2_TX (0 + 10)
// #define PIN_SERIAL2_EN (0 + 17)
-/**
- Wire Interfaces
- */
-#define WIRE_INTERFACES_COUNT 1
+/*
+ * I2C
+ */
-#define PIN_WIRE_SDA (26)
-#define PIN_WIRE_SCL (27)
+#define WIRE_INTERFACES_COUNT 2
+
+// I2C bus 0
+// Routed to footprint for PCF8563TS RTC
+// Not populated on T114 V1, maybe in future?
+#define PIN_WIRE_SDA (0 + 26) // P0.26
+#define PIN_WIRE_SCL (0 + 27) // P0.27
+
+// I2C bus 1
+// Available on header pins, for general use
+#define PIN_WIRE1_SDA (0 + 16) // P0.16
+#define PIN_WIRE1_SCL (0 + 13) // P0.13
// QSPI Pins
#define PIN_QSPI_SCK (32 + 14)
@@ -206,4 +212,4 @@ No longer populated on PCB
* Arduino objects - C++ only
*----------------------------------------------------------------------------*/
-#endif
\ No newline at end of file
+#endif
diff --git a/variants/heltec_vision_master_t190/platformio.ini b/variants/heltec_vision_master_t190/platformio.ini
index fd0001439..0c504d62b 100644
--- a/variants/heltec_vision_master_t190/platformio.ini
+++ b/variants/heltec_vision_master_t190/platformio.ini
@@ -9,5 +9,5 @@ build_flags =
lib_deps =
${esp32s3_base.lib_deps}
lewisxhe/PCF8563_Library@^1.0.1
- https://github.com/meshtastic/st7789#7181320e7ed05c7fb5fd2d32f14723bce6088b7b
+ https://github.com/meshtastic/st7789#bd33ea58ddfe4a5e4a66d53300ccbd38d66ac21f
upload_speed = 921600
\ No newline at end of file
diff --git a/variants/heltec_wireless_bridge/platformio.ini b/variants/heltec_wireless_bridge/platformio.ini
new file mode 100644
index 000000000..45c3aba74
--- /dev/null
+++ b/variants/heltec_wireless_bridge/platformio.ini
@@ -0,0 +1,6 @@
+[env:heltec-wireless-bridge]
+;build_type = debug ; to make it possible to step through our jtag debugger
+extends = esp32_base
+board = heltec_wifi_lora_32
+build_flags =
+ ${esp32_base.build_flags} -D HELTEC_WIRELESS_BRIDGE -I variants/heltec_wireless_bridge
\ No newline at end of file
diff --git a/variants/heltec_wireless_bridge/variant.h b/variants/heltec_wireless_bridge/variant.h
new file mode 100644
index 000000000..7c4f41660
--- /dev/null
+++ b/variants/heltec_wireless_bridge/variant.h
@@ -0,0 +1,29 @@
+// the default ESP32 Pin of 15 is the Oled SCL, set to 36 and 37 and works fine.
+// Tested on Neo6m module.
+#undef GPS_RX_PIN
+#undef GPS_TX_PIN
+#define GPS_RX_PIN 36
+#define GPS_TX_PIN 33
+
+#ifndef USE_JTAG // gpio15 is TDO for JTAG, so no I2C on this board while doing jtag
+#define I2C_SDA 4 // I2C pins for this board
+#define I2C_SCL 15
+#endif
+
+#define LED_PIN 25 // If defined we will blink this LED
+#define BUTTON_PIN 0 // If defined, this will be used for user button presses
+
+#define USE_RF95
+#define LORA_DIO0 26 // a No connect on the SX1262 module
+#ifndef USE_JTAG
+#define LORA_RESET 14
+#endif
+#define LORA_DIO1 35
+#define LORA_DIO2 34 // Not really used
+
+// ratio of voltage divider = 3.20 (R1=100k, R2=220k)
+#define ADC_MULTIPLIER 3.2
+
+#define BATTERY_PIN 13 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
+#define ADC_CHANNEL ADC2_GPIO13_CHANNEL
+#define BAT_MEASURE_ADC_UNIT 2
\ No newline at end of file
diff --git a/variants/lora_isp4520/platformio.ini b/variants/lora_isp4520/platformio.ini
deleted file mode 100644
index 9d6563515..000000000
--- a/variants/lora_isp4520/platformio.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-[env:lora_isp4520]
-extends = nrf52_base
-board = lora_isp4520
-board_level = extra
-
-# add our variants files to the include and src paths
-build_flags = ${nrf52_base.build_flags} -Ivariants/lora_isp4520
-
-# No screen and GPS on the board. We still need RTC.cpp for the RTC clock.
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/lora_isp4520> - - + +