Merge pull request #305 from mkinney/1.2-legacy

fix the vendor and product id for tlora v1

.gitattributes

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

.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: CI
+name: Linting and Tests
 on:
   push:
     branches:
@@ -13,10 +13,11 @@ jobs:
     strategy:
       matrix:
         python-version:
+          - "3.6"
+          - "3.7"
           - "3.8"
           - "3.9"
           - "3.10"
-          - "3.11"
     steps:
       - uses: actions/checkout@v2
       - name: Install Python 3
@@ -34,33 +35,31 @@ jobs:
           which meshtastic
           meshtastic --version
       - name: Run pylint
-        run: pylint meshtastic examples/ --ignore-patterns ".*_pb2.pyi?$"
+        run: pylint meshtastic examples/
-      - name: Check types with mypy
-        run: mypy meshtastic/
       - name: Run tests with pytest
         run: pytest --cov=meshtastic
       - name: Generate coverage report
         run: |
           pytest --cov=meshtastic --cov-report=xml
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v1
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          env_vars: OS, PYTHON
+          file: ./coverage.xml
-          files: ./coverage.xml
           flags: unittests
           name: codecov-umbrella
+          yml: ./codecov.yml
           fail_ci_if_error: true
-          verbose: true
   validate:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         python-version:
+          - "3.6"
+          - "3.7"
           - "3.8"
           - "3.9"
           - "3.10"
-          - "3.11"
     steps:
       - uses: actions/checkout@v2
       - name: Install Python 3

.github/workflows/cleanup_artifacts.yml

@@ -1,20 +0,0 @@
-name: Remove old artifacts
-
-on:
-  schedule:
-    # Every day at 1am
-    - cron: "0 1 * * *"
-
-  workflow_dispatch:
-
-jobs:
-  remove-old-artifacts:
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-
-    steps:
-      - name: Remove old artifacts
-        uses: c-hive/gha-remove-artifacts@v1
-        with:
-          age: "1 month"
-          skip-tags: true

.github/workflows/release.yml

@@ -11,119 +11,123 @@ jobs:
       new_sha: ${{ steps.commit_updated.outputs.sha }}
 
     steps:
+
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Bump version
+      run: >-
+        bin/bump_version.py
+
+    - name: Commit updated version.py
+      id: commit_updated
+      run: |
+        git config --global user.name 'github-actions'
+        git config --global user.email 'bot@noreply.github.com'
+        git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
+        git add setup.py
+        git commit -m "bump version" && git push || echo "No changes to commit"
+        git log -n 1 --pretty=format:"%H" | tail -n 1 | awk '{print "::set-output name=sha::"$0}'
+
+    - name: Get version
+      id: get_version
+      run: >-
+        bin/show_version.py
+
+    - name: Create GitHub release
+      uses: actions/create-release@v1
+      id: create_release
+
+      with:
+        draft: true
+        prerelease: true
+        release_name: Meshtastic Python ${{ steps.get_version.outputs.version }}
+        tag_name: ${{ steps.get_version.outputs.version }}
+        body: |
+          Autogenerated by github action, developer should edit as required before publishing...
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Set up Python 3.9
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.9
+
+    - name: Install pypa/build
+      run: >-
+        python -m
+        pip install
+        build
+        --user
+
+    - name: Build a binary wheel and a source tarball
+      run: >-
+        python -m
+        build
+        --sdist
+        --wheel
+        --outdir dist/
+        .
+
+    - name: Publish to PyPI
+      uses: pypa/gh-action-pypi-publish@master
+      with:
+        user: __token__
+        password: ${{ secrets.PYPI_API_TOKEN }}
+
+
+  build-and-publish-mac:
+    runs-on: macos-latest
+    needs: release_create
+    steps:
+
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
-
-      - name: Bump version
-        run: >-
-          bin/bump_version.py
-
-      - name: Commit updated version.py
-        id: commit_updated
-        run: |
-          git config --global user.name 'github-actions'
-          git config --global user.email 'bot@noreply.github.com'
-          git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
-          git add setup.py
-          git commit -m "bump version" && git push || echo "No changes to commit"
-          git log -n 1 --pretty=format:"%H" | tail -n 1 | awk '{print "::set-output name=sha::"$0}'
-
-      - name: Get version
-        id: get_version
-        run: >-
-          bin/show_version.py
-
-      - name: Create GitHub release
-        uses: actions/create-release@v1
-        id: create_release
-
         with:
-          draft: true
+          ref: ${{ needs.release_create.outputs.new_sha }}
-          prerelease: true
-          release_name: Meshtastic Python ${{ steps.get_version.outputs.version }}
-          tag_name: ${{ steps.get_version.outputs.version }}
-          body: |
-            Autogenerated by github action, developer should edit as required before publishing...
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up Python 3.9
         uses: actions/setup-python@v2
         with:
           python-version: 3.9
 
-      - name: Install pypa/build
+      - name: Setup code signing
-        run: >-
+        env:
-          python -m
+          MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
-          pip install
+          MACOS_CERTIFICATE_PWD: ${{ secrets.MACOS_CERTIFICATE_PWD }}
-          build
+          MACOS_KEYCHAIN_PASSWORD: ${{ secrets.MACOS_KEYCHAIN_PASSWORD }}
-          --user
+        run: |
+          echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
+          security create-keychain -p "$MACOS_KEYCHAIN_PASSWORD" meshtastic.keychain
+          security default-keychain -s meshtastic.keychain
+          security unlock-keychain -p "$MACOS_KEYCHAIN_PASSWORD" meshtastic.keychain
+          security import certificate.p12 -k meshtastic.keychain -P "$MACOS_CERTIFICATE_PWD" -T /usr/bin/codesign
+          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$MACOS_KEYCHAIN_PASSWORD" meshtastic.keychain
 
-      - name: Build a binary wheel and a source tarball
+      - name: Build
-        run: >-
+        env:
-          python -m
+          MACOS_SIGNING_IDENTITY: ${{ secrets.MACOS_SIGNING_IDENTITY }}
-          build
+        run: |
-          --sdist
+          pip install pyinstaller
-          --wheel
+          pip install -r requirements.txt
-          --outdir dist/
+          pip install .
-          .
+          pyinstaller -F -n meshtastic --collect-all meshtastic --codesign-identity "$MACOS_SIGNING_IDENTITY" meshtastic/__main__.py
 
-      - name: Publish to PyPI
+      - name: Add mac to release
-        uses: pypa/gh-action-pypi-publish@master
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          user: __token__
+          upload_url: ${{ needs.release_create.outputs.upload_url }}
-          password: ${{ secrets.PYPI_API_TOKEN }}
+          asset_path: dist/meshtastic
-
+          asset_name: meshtastic_mac
-  # build-and-publish-mac:
+          asset_content_type: application/zip
-  #   runs-on: macos-latest
-  #   needs: release_create
-  #   steps:
-  #     - name: Checkout
-  #       uses: actions/checkout@v3
-  #       with:
-  #         ref: ${{ needs.release_create.outputs.new_sha }}
-
-  #     - name: Set up Python 3.9
-  #       uses: actions/setup-python@v2
-  #       with:
-  #         python-version: 3.9
-
-  #     - name: Setup code signing
-  #       env:
-  #         MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
-  #         MACOS_CERTIFICATE_PWD: ${{ secrets.MACOS_CERTIFICATE_PWD }}
-  #         MACOS_KEYCHAIN_PASSWORD: ${{ secrets.MACOS_KEYCHAIN_PASSWORD }}
-  #       run: |
-  #         echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
-  #         security create-keychain -p "$MACOS_KEYCHAIN_PASSWORD" meshtastic.keychain
-  #         security default-keychain -s meshtastic.keychain
-  #         security unlock-keychain -p "$MACOS_KEYCHAIN_PASSWORD" meshtastic.keychain
-  #         security import certificate.p12 -k meshtastic.keychain -P "$MACOS_CERTIFICATE_PWD" -T /usr/bin/codesign
-  #         security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$MACOS_KEYCHAIN_PASSWORD" meshtastic.keychain
-
-  #     - name: Build
-  #       env:
-  #         MACOS_SIGNING_IDENTITY: ${{ secrets.MACOS_SIGNING_IDENTITY }}
-  #       run: |
-  #         pip install pyinstaller
-  #         pip install -r requirements.txt
-  #         pip install .
-  #         pyinstaller -F -n meshtastic --collect-all meshtastic --codesign-identity "$MACOS_SIGNING_IDENTITY" meshtastic/__main__.py
-
-  #     - name: Add mac to release
-  #       uses: actions/upload-release-asset@v1
-  #       env:
-  #         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  #       with:
-  #         upload_url: ${{ needs.release_create.outputs.upload_url }}
-  #         asset_path: dist/meshtastic
-  #         asset_name: meshtastic_mac
-  #         asset_content_type: application/zip
 
   build-and-publish-ubuntu:
     runs-on: ubuntu-latest
     needs: release_create
     steps:
+
       - name: Checkout
         uses: actions/checkout@v3
         with:
@@ -165,6 +169,7 @@ jobs:
     runs-on: windows-latest
     needs: release_create
     steps:
+
       - name: Checkout
         uses: actions/checkout@v3
         with:

.github/workflows/update_protobufs.yml

@@ -15,22 +15,22 @@ jobs:
         run: |
           git pull --recurse-submodules
           git submodule update --remote --recursive
-
+          
       - name: Download nanopb
         run: |
-          wget https://jpa.kapsi.fi/nanopb/download/nanopb-0.4.6-linux-x86.tar.gz
+          wget https://jpa.kapsi.fi/nanopb/download/nanopb-0.4.4-linux-x86.tar.gz
-          tar xvzf nanopb-0.4.6-linux-x86.tar.gz
+          tar xvzf nanopb-0.4.4-linux-x86.tar.gz
-          mv nanopb-0.4.6-linux-x86 nanopb-0.4.6
+          mv nanopb-0.4.4-linux-x86 nanopb-0.4.4
-
+          
       - name: Re-generate protocol buffers
         run: |
-          ./bin/regen-protobufs.sh
+          ./bin/regen-protos.sh  
-
+          
       - name: Commit update
         run: |
           git config --global user.name 'github-actions'
           git config --global user.email 'bot@noreply.github.com'
           git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
-          git add protobufs
+          git add proto
           git add meshtastic
           git commit -m "Update protobuf submodule" && git push || echo "No changes to commit"

.gitignore

@@ -5,7 +5,8 @@ dist
 *.egg-info
 log_*
 .eggs
-nanopb-*
+nanopb-0.4.4
+nanopb-0.4.5
 .*swp
 .coverage
 *.py-E

.gitmodules

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

.pylintrc

@@ -7,7 +7,7 @@
 
 # Add files or directories matching the regex patterns to the blacklist. The
 # regex matches against base names, not paths.
-ignore-patterns=mqtt_pb2.py,channel_pb2.py,telemetry_pb2.py,admin_pb2.py,config_pb2.py,deviceonly_pb2.py,apponly_pb2.py,remote_hardware_pb2.py,portnums_pb2.py,mesh_pb2.py,storeforward_pb2.py,cannedmessages_pb2.py,module_config_pb2.py,localonly_pb2.py,node.py,device_metadata_pb2.py,nanopb_pb2.py
+ignore-patterns=mqtt_pb2.py,channel_pb2.py,environmental_measurement_pb2.py,admin_pb2.py,radioconfig_pb2.py,deviceonly_pb2.py,apponly_pb2.py,remote_hardware_pb2.py,portnums_pb2.py,mesh_pb2.py,storeforward_pb2.py,cannedmessages_pb2.py
 
 
 
@@ -23,7 +23,8 @@ ignore-patterns=mqtt_pb2.py,channel_pb2.py,telemetry_pb2.py,admin_pb2.py,config_
 # no Warning level messages displayed, use"--disable=all --enable=classes
 # --disable=W"
 #
-disable=invalid-name,fixme,logging-fstring-interpolation,too-many-statements,too-many-branches,too-many-locals,no-member,f-string-without-interpolation,protected-access,pointless-string-statement,too-few-public-methods,broad-except,no-else-return,no-else-raise,bare-except,too-many-public-methods
+disable=invalid-name,fixme,logging-fstring-interpolation,too-many-statements,too-many-branches,too-many-locals,no-member,f-string-without-interpolation,protected-access,no-self-use,pointless-string-statement,too-few-public-methods,broad-except,no-else-return,no-else-raise,bare-except,too-many-public-methods
+
 
 [BASIC]
 
@@ -40,7 +41,7 @@ bad-names=foo,bar,baz,toto,tutu,tata
 max-line-length=150
 
 # Maximum number of lines in a module
-max-module-lines=1600
+max-module-lines=1400
 
 
 

.trunk/.gitignore

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

.trunk/configs/.isort.cfg

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

.trunk/configs/.markdownlint.yaml

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

.trunk/configs/.shellcheckrc

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

.trunk/configs/.yamllint.yaml

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

.trunk/configs/ruff.toml

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

.trunk/trunk.yaml

@@ -1,46 +0,0 @@
-version: 0.1
-cli:
-  version: 1.15.0
-plugins:
-  sources:
-    - id: trunk
-      ref: v1.2.2
-      uri: https://github.com/trunk-io/plugins
-lint:
-  disabled:
-    - bandit
-  ignore:
-    - linters: [ALL]
-      paths:
-        # Ignore generated files
-        - meshtastic/*_pb2.py
-  enabled:
-    - actionlint@1.6.25
-    - black@23.7.0
-    - checkov@2.4.9
-    - git-diff-check
-    - gitleaks@8.18.0
-    - isort@5.12.0
-    - markdownlint@0.36.0
-    - osv-scanner@1.3.6
-    - prettier@3.0.3
-    - pylint@2.17.5
-    - ruff@0.0.287
-    - shellcheck@0.9.0
-    - shfmt@3.6.0
-    - taplo@0.8.1
-    - trivy@0.44.1
-    - trufflehog@3.54.3
-    - yamllint@1.32.0
-runtimes:
-  enabled:
-    - go@1.21.0
-    - node@18.12.1
-    - python@3.10.8
-actions:
-  disabled:
-    - trunk-announce
-    - trunk-check-pre-push
-    - trunk-fmt-pre-commit
-  enabled:
-    - trunk-upgrade-available

.vscode/launch.json

@@ -10,7 +10,7 @@
       "request": "launch",
       "module": "meshtastic",
       "justMyCode": false,
-      "args": ["--debug", "--ble", "24:62:AB:DD:DF:3A"]
+      "args": ["--debug", "--ble", "--device", "24:62:AB:DD:DF:3A"]
     },
     {
       "name": "meshtastic admin",
@@ -42,95 +42,7 @@
       "request": "launch",
       "module": "meshtastic",
       "justMyCode": true,
-      "args": ["--debug"]
+      "args": ["--debug" ]
-    },
-    {
-      "name": "meshtastic listen",
-      "type": "python",
-      "request": "launch",
-      "module": "meshtastic",
-      "justMyCode": true,
-      "args": ["--listen", "--debug"]
-    },
-    {
-      "name": "meshtastic debug getPref",
-      "type": "python",
-      "request": "launch",
-      "module": "meshtastic",
-      "justMyCode": true,
-      "args": ["--debug", "--get", "power.is_power_saving"]
-    },
-    {
-      "name": "meshtastic debug getPref telemetry",
-      "type": "python",
-      "request": "launch",
-      "module": "meshtastic",
-      "justMyCode": true,
-      "args": ["--debug", "--get", "telemetry.environment_update_interval"]
-    },
-    {
-      "name": "meshtastic debug info",
-      "type": "python",
-      "request": "launch",
-      "module": "meshtastic",
-      "justMyCode": true,
-      "args": ["--debug", "--info"]
-    },
-    {
-      "name": "meshtastic debug set region",
-      "type": "python",
-      "request": "launch",
-      "module": "meshtastic",
-      "justMyCode": true,
-      "args": ["--debug", "--set", "lora.region", "TW"]
-    },
-    {
-      "name": "meshtastic debug set bluetooth fixed pin",
-      "type": "python",
-      "request": "launch",
-      "module": "meshtastic",
-      "justMyCode": true,
-      "args": ["--debug", "--set", "bluetooth.fixed_pin", "555555"]
-    },
-    {
-      "name": "meshtastic debug get bluetooth fixed pin",
-      "type": "python",
-      "request": "launch",
-      "module": "meshtastic",
-      "justMyCode": true,
-      "args": ["--debug", "--get", "bluetooth.fixed_pin"]
-    },
-    {
-      "name": "meshtastic debug setPref",
-      "type": "python",
-      "request": "launch",
-      "module": "meshtastic",
-      "justMyCode": true,
-      "args": ["--debug", "--set", "power.is_power_saving", "1"]
-    },
-    {
-      "name": "meshtastic debug setPref telemetry.environment_measurement_enabled",
-      "type": "python",
-      "request": "launch",
-      "module": "meshtastic",
-      "justMyCode": true,
-      "args": ["--debug", "--set", "telemetry.environment_measurement_enabled", "1"]
-    },
-    {
-      "name": "meshtastic debug setPref telemetry.environment_screen_enabled",
-      "type": "python",
-      "request": "launch",
-      "module": "meshtastic",
-      "justMyCode": true,
-      "args": ["--debug", "--set", "telemetry.environment_screen_enabled", "1"]
-    },
-    {
-      "name": "meshtastic debug setPref telemetry",
-      "type": "python",
-      "request": "launch",
-      "module": "meshtastic",
-      "justMyCode": true,
-      "args": ["--debug", "--set", "telemetry.environment_measurement_enabled", "1"]
     },
     {
       "name": "meshtastic setpref",
@@ -140,15 +52,6 @@
       "justMyCode": true,
       "args": ["--debug", "--setchan", "psk", ""]
     },
-    {
-      "name": "meshtastic --ch-set",
-      "type": "python",
-      "request": "launch",
-      "module": "meshtastic",
-      "justMyCode": true,
-      "args": ["--debug", "--ch-set", "channel_num", "0", "--ch-index", "0"]
-    },
-    
     {
       "name": "meshtastic seturl",
       "type": "python",
@@ -189,7 +92,7 @@
       "module": "meshtastic",
       "justMyCode": true,
       "args": ["--debug", "--sendtext", "pytest"]
-    },
+    }
     {
       "name": "meshtastic showNodes",
       "type": "python",

Makefile

@@ -6,10 +6,6 @@ test:
 virt:
 	pytest -m smokevirt
 
-# run the smoke1 test (after doing a factory reset and unplugging/replugging in device)
-smoke1:
-	pytest -m smoke1 -s -vv
-
 # local install
 install:
 	pip install .
@@ -26,11 +22,11 @@ lint:
 slow:
 	pytest -m unit --durations=5
 
-protobufs: FORCE
+proto: FORCE
 	git submodule update --init --recursive
 	git pull --rebase
 	git submodule update --remote --merge
-	./bin/regen-protobufs.sh
+	./bin/regen-protos.sh
 
 # run the coverage report and open results in a browser
 cov:

README.md

@@ -1,51 +1,15 @@
-# Meshtastic Python
+# Meshtastic-python
 
-[![codecov](https://codecov.io/gh/meshtastic/python/branch/master/graph/badge.svg?token=TIWPJL73KV)](https://codecov.io/gh/meshtastic/python)
+[![Open in Visual Studio Code](https://open.vscode.dev/badges/open-in-vscode.svg)](https://open.vscode.dev/meshtastic/Meshtastic-python)
+![Unit Tests](https://github.com/meshtastic/Meshtastic-python/actions/workflows/ci.yml/badge.svg)
+[![codecov](https://codecov.io/gh/meshtastic/Meshtastic-python/branch/master/graph/badge.svg?token=TIWPJL73KV)](https://codecov.io/gh/meshtastic/Meshtastic-python)
 ![PyPI - Downloads](https://img.shields.io/pypi/dm/meshtastic)
-[![CI](https://img.shields.io/github/actions/workflow/status/meshtastic/python/ci.yml?branch=master&label=actions&logo=github&color=yellow)](https://github.com/meshtastic/python/actions/workflows/ci.yml)
-[![CLA assistant](https://cla-assistant.io/readme/badge/meshtastic/python)](https://cla-assistant.io/meshtastic/python)
-[![Fiscal Contributors](https://opencollective.com/meshtastic/tiers/badge.svg?label=Fiscal%20Contributors&color=deeppink)](https://opencollective.com/meshtastic/)
 
-## Overview
+A python client for using [Meshtastic](https://www.meshtastic.org) devices. This small library (and example application) provides an easy API for sending and receiving messages over mesh radios. It also provides access to any of the operations/data available in the device user interface or the Android application. Events are delivered using a publish-subscribe model, and you can subscribe to only the message types you are interested in.
 
-A Python client for use with Meshtastic devices.
+Full documentation including examples [here](https://meshtastic.org/docs/software/python/python-installation).
-This small library (and example application) provides an easy API for sending and receiving messages over mesh radios.
-It also provides access to any of the operations/data available in the device user interface or the Android application.
-Events are delivered using a publish-subscribe model, and you can subscribe to only the message types you are interested in.
 
-**[Getting Started Guide](https://meshtastic.org/docs/software/python/cli/installation)**
+The library api is documented [here](https://meshtastic-python.vercel.app/meshtastic/index.html)
 
-(Documentation/API Reference is currently offline)
 
-## Call for Contributors
+[![Powered by Vercel](https://raw.githubusercontent.com/abumalick/powered-by-vercel/master/powered-by-vercel.svg)](https://vercel.com?utm_source=meshtastic&utm_campaign=oss)
-
-This library and CLI has gone without a consistent maintainer for a while, and there's many improvements that could be made. We're all volunteers here and help is extremely appreciated, whether in implementing your own needs or helping maintain the library and CLI in general.
-
-If you're interested in contributing but don't have specific things you'd like to work on, look at the roadmap below!
-
-## Roadmap
-
-This should always be considered a list in progress and flux -- inclusion doesn't guarantee implementation, and exclusion doesn't mean something's not wanted. GitHub issues are a great place to discuss ideas.
-
-* Types
-  * type annotations throughout the codebase
-  * mypy running in CI to type-check new code
-* async-friendliness
-* CLI completeness & consistency
-  * the CLI should support all features of the firmware
-  * there should be a consistent output format available for shell scripting
-* CLI input validation & documentation
-  * what arguments and options are compatible & incompatible with one another?
-  * can the options be restructured in a way that is more self-documenting?
-  * pubsub events should be documented clearly
-* helpers for third-party code
-  * it should be easy to write a script that supports similar options to the CLI so many tools support the same ways of connecting to nodes
-* interactive client
-* data storage & processing
-  * there should be a standardized way of recording packets for later use, debugging, etc.
-  * a sqlite database schema and tools for writing to it may be a good starting point
-  * enable maps, charts, visualizations
-
-## Stats
-
-![Alt](https://repobeats.axiom.co/api/embed/c71ee8fc4a79690402e5d2807a41eec5e96d9039.svg "Repobeats analytics image")

TODO.md

@@ -5,6 +5,7 @@ Basic functionality is complete now.
 ## Eventual tasks
 
 - Improve documentation on properties/fields
+- change back to Bleak for BLE support - now that they fixed https://github.com/hbldh/bleak/issues/139#event-3499535304
 - include more examples: textchat.py, replymessage.py all as one little demo
 
 - possibly use tk to make a multiwindow test console: https://stackoverflow.com/questions/12351786/how-to-redirect-print-statements-to-tkinter-text-widget
@@ -16,8 +17,11 @@ Basic functionality is complete now.
 
 ## Bluetooth support
 
-- ./bin/run.sh --ble-scan # To look for Meshtastic devices
+(Pre-alpha level feature - you probably don't want this one yet)
-- ./bin/run.sh --ble 24:62:AB:DD:DF:3A --info
+
+- This library supports connecting to Meshtastic devices over either USB (serial) or Bluetooth. Before connecting to the device you must [pair](https://docs.ubuntu.com/core/en/stacks/bluetooth/bluez/docs/reference/pairing/outbound.html) your PC with it.
+- We use the pip3 install "pygatt[GATTTOOL]"
+- ./bin/run.sh --debug --ble --device 24:62:AB:DD:DF:3A
 
 ## Done
 
@@ -30,7 +34,7 @@ Basic functionality is complete now.
 - DONE add fromId and toId to received messages dictionaries
 - make command line options for displaying/changing config
 - update nodedb as nodes change
-- localConfig - getter/setter syntax: https://www.python-course.eu/python3_properties.php
+- radioConfig - getter/setter syntax: https://www.python-course.eu/python3_properties.php
 - let user change radio params via commandline options
 - keep nodedb up-to-date based on received MeshPackets
 - handle radio reboots and redownload db when that happens. Look for a special FromRadio.rebooted packet

bin/bump_version.py

@@ -1,30 +1,25 @@
 #!/usr/bin/env python
 """Bump the version number"""
-import re
 
 version_filename = "setup.py"
 
 lines = None
 
-with open(version_filename, "r", encoding="utf-8") as f:
+with open(version_filename, 'r', encoding='utf-8') as f:
     lines = f.readlines()
 
-with open(version_filename, "w", encoding="utf-8") as f:
+with open(version_filename, 'w', encoding='utf-8') as f:
     for line in lines:
         if line.lstrip().startswith("version="):
             # get rid of quotes around the version
-            line = line.replace('"', "")
+            line = line.replace('"', '')
             # get rid of trailing comma
             line = line.replace(",", "")
             # split on '='
             words = line.split("=")
             # split the version into parts (by period)
             v = words[1].split(".")
-            build_num = re.findall(r"\d+", v[2])[0]
+            ver = f'{v[0]}.{v[1]}.{int(v[2]) + 1}'
-            new_build_num = str(int(build_num) + 1)
-            ver = f"{v[0]}.{v[1]}.{v[2].replace(build_num, new_build_num)}".replace(
-                "\n", ""
-            )
             f.write(f'    version="{ver}",\n')
         else:
             f.write(line)

bin/regen-docs.sh

@@ -1,4 +1,4 @@
 # Note: Docs are generated from this command below, albeit from Vercel.
-# The docs/ dir is not used and is no longer committed.
+# The docs/ dir is not used and is no longer commited.
 # see sachaw if you have questions
 pdoc3 --html -f --output-dir docs meshtastic

bin/regen-protobufs.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-
-#Uncomment to run hack
-#gsed -i 's/import "\//import ".\//g' ./protobufs/meshtastic/*
-#gsed -i 's/package meshtastic;//g' ./protobufs/meshtastic/*
-
-./nanopb-0.4.7/generator-bin/protoc -I=protobufs --python_out ./ --mypy_out ./ ./protobufs/meshtastic/*.proto
-./nanopb-0.4.7/generator-bin/protoc -I=protobufs --python_out ./meshtastic/ --mypy_out ./meshtastic/ ./protobufs/nanopb.proto
-
-# workaround for import bug in protoc https://github.com/protocolbuffers/protobuf/issues/1491#issuecomment-690618628
-
-if [[ $OSTYPE == 'darwin'* ]]; then
-	sed -i '' -E 's/^(import.*_pb2)/from . \1/' meshtastic/*.py
-	# automate the current workaround (may be related to Meshtastic-protobufs issue #27 https://github.com/meshtastic/protobufs/issues/27)
-	sed -i '' -E "s/^None = 0/globals()['None'] = 0/" meshtastic/mesh_pb2.py
-else
-	sed -i -e 's/^import.*_pb2/from . \0/' meshtastic/*.py
-	# automate the current workaround (may be related to Meshtastic-protobufs issue #27 https://github.com/meshtastic/protobufs/issues/27)
-	sed -i -e "s/^None = 0/globals()['None'] = 0/" meshtastic/mesh_pb2.py
-fi

bin/regen-protos.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+./nanopb-0.4.4/generator-bin/protoc -I=proto --python_out meshtastic `ls proto/*.proto`
+
+# workaround for import bug in protoc https://github.com/protocolbuffers/protobuf/issues/1491#issuecomment-690618628
+
+if [[ $OSTYPE == 'darwin'* ]]; then
+  sed -i '' -E 's/^(import.*_pb2)/from . \1/' meshtastic/*.py
+  # automate the current workaround (may be related to Meshtastic-protobufs issue #27 https://github.com/meshtastic/Meshtastic-protobufs/issues/27)
+  sed -i '' -E "s/^None = 0/globals()['None'] = 0/" meshtastic/mesh_pb2.py
+else
+  sed -i -e 's/^import.*_pb2/from . \0/' meshtastic/*.py
+  # automate the current workaround (may be related to Meshtastic-protobufs issue #27 https://github.com/meshtastic/Meshtastic-protobufs/issues/27)
+  sed -i -e "s/^None = 0/globals()['None'] = 0/" meshtastic/mesh_pb2.py
+fi

bin/show_version.py

@@ -5,16 +5,16 @@ version_filename = "setup.py"
 
 lines = None
 
-with open(version_filename, "r", encoding="utf-8") as f:
+with open(version_filename, 'r', encoding='utf-8') as f:
     lines = f.readlines()
 
 for line in lines:
     if line.lstrip().startswith("version="):
         # get rid of quotes around the version
-        line2 = line.replace('"', "")
+        line2 = line.replace('"', '')
         # get rid of the trailing comma
-        line2 = line2.replace(",", "")
+        line2 = line2.replace(',', '')
         # split on =
         words = line2.split("=")
         # Note: This format is for github actions
-        print(f"::set-output name=version::{words[1].strip()}")
+        print(f'::set-output name=version::{words[1].strip()}')

bin/test-release.sh

@@ -7,4 +7,4 @@ python3 setup.py sdist bdist_wheel
 python3 -m twine check dist/*
 # test the upload
 python3 -m twine upload --repository-url https://test.pypi.org/legacy/ dist/*
-echo "view the upload at https://test.pypi.org/ it it looks good upload for real"
+echo "view the upload at https://test.pypi.org/ it it looks good upload for real"

exampleConfig.yaml

@@ -11,6 +11,7 @@ location:
 
 userPrefs:
   region: 1
-  isAlwaysPowered: "true"
+  isAlwaysPowered: 'true'
+  sendOwnerInterval: 2
   screenOnSecs: 31536000
   waitBluetoothSecs: 31536000

example_config.yaml

@@ -2,42 +2,17 @@
 owner: Bob TBeam
 owner_short: BOB
 
-channel_url: https://www.meshtastic.org/e/#CgMSAQESCDgBQANIAVAe
+channel_url: https://www.meshtastic.org/d/#CgUYAyIBAQ
 
 location:
   lat: 35.88888
   lon: -93.88888
   alt: 304
 
-config:
+user_prefs:
-  bluetooth:
+  region: 1
-    enabled: true
+  is_always_powered: 'true'
-    fixedPin: 123456
+  send_owner_interval: 2
-  device:
+  screen_on_secs: 31536000
-    serialEnabled: true
+  wait_bluetooth_secs: 31536000
-  display:
+  location_share: 'LocEnabled'
-    screenOnSecs: 600
-  lora:
-    region: US
-    hopLimit: 3
-    txEnabled: true
-    txPower: 30
-  network:
-    ntpServer: 0.pool.ntp.org
-  position:
-    gpsAttemptTime: 900
-    gpsEnabled: true
-    gpsUpdateInterval: 120
-    positionBroadcastSecs: 900
-    positionBroadcastSmartEnabled: true
-    positionFlags: 3
-  power:
-    lsSecs: 300
-    meshSdsTimeoutSecs: 7200
-    minWakeSecs: 10
-    sdsSecs: 4294967295
-
-module_config:
-  telemetry:
-    deviceUpdateInterval: 900
-    environmentUpdateInterval: 900

examples/get_hw.py

@@ -3,7 +3,6 @@
 """
 
 import sys
-
 import meshtastic
 import meshtastic.serial_interface
 
@@ -16,6 +15,6 @@ if len(sys.argv) != 1:
 iface = meshtastic.serial_interface.SerialInterface()
 if iface.nodes:
     for n in iface.nodes.values():
-        if n["num"] == iface.myInfo.my_node_num:
+        if n['num'] == iface.myInfo.my_node_num:
-            print(n["user"]["hwModel"])
+            print(n['user']['hwModel'])
 iface.close()

examples/hello_world_serial.py

@@ -3,7 +3,6 @@
 """
 
 import sys
-
 import meshtastic
 import meshtastic.serial_interface
 

examples/info_example.py

@@ -8,13 +8,16 @@ import meshtastic.serial_interface
 iface = meshtastic.serial_interface.SerialInterface()
 
 # call showInfo() just to ensure values are populated
-# info = iface.showInfo()
+#info = iface.showInfo()
 
+if iface.myInfo:
+    #print(f'myInfo:{iface.myInfo}')
+    print(f'firmware_version:{iface.myInfo.firmware_version}')
 
 if iface.nodes:
     for n in iface.nodes.values():
-        if n["num"] == iface.myInfo.my_node_num:
+        if n['num'] == iface.myInfo.my_node_num:
-            print(n["user"]["hwModel"])
+            print(n['user']['hwModel'])
             break
 
 iface.close()

examples/pub_sub_example.py

@@ -3,7 +3,6 @@
 """
 
 import sys
-
 from pubsub import pub
 
 import meshtastic
@@ -14,13 +13,10 @@ if len(sys.argv) < 2:
     print(f"usage: {sys.argv[0]} host")
     sys.exit(1)
 
-
+def onConnection(interface, topic=pub.AUTO_TOPIC): # pylint: disable=unused-argument
-def onConnection(interface, topic=pub.AUTO_TOPIC):  # pylint: disable=unused-argument
     """This is called when we (re)connect to the radio."""
     print(interface.myInfo)
     interface.close()
-
-
 pub.subscribe(onConnection, "meshtastic.connection.established")
 
 try:

examples/pub_sub_example2.py

@@ -4,7 +4,6 @@
 
 import sys
 import time
-
 from pubsub import pub
 
 import meshtastic
@@ -15,18 +14,15 @@ if len(sys.argv) < 2:
     print(f"usage: {sys.argv[0]} host")
     sys.exit(1)
 
-
+def onReceive(packet, interface): # pylint: disable=unused-argument
-def onReceive(packet, interface):  # pylint: disable=unused-argument
     """called when a packet arrives"""
     print(f"Received: {packet}")
 
-
+def onConnection(interface, topic=pub.AUTO_TOPIC): # pylint: disable=unused-argument
-def onConnection(interface, topic=pub.AUTO_TOPIC):  # pylint: disable=unused-argument
     """called when we (re)connect to the radio"""
     # defaults to broadcast, specify a destination ID if you wish
     interface.sendText("hello mesh")
 
-
 pub.subscribe(onReceive, "meshtastic.receive")
 pub.subscribe(onConnection, "meshtastic.connection.established")
 try:
@@ -34,6 +30,6 @@ try:
     while True:
         time.sleep(1000)
     iface.close()
-except Exception as ex:
+except(Exception) as ex:
     print(f"Error: Could not connect to {sys.argv[1]} {ex}")
     sys.exit(1)

examples/scan_for_devices.py

@@ -3,12 +3,7 @@
 """
 
 import sys
-
+from meshtastic.util import detect_supported_devices, get_unique_vendor_ids, active_ports_on_supported_devices
-from meshtastic.util import (
-    active_ports_on_supported_devices,
-    detect_supported_devices,
-    get_unique_vendor_ids,
-)
 
 # simple arg check
 if len(sys.argv) != 1:
@@ -17,13 +12,13 @@ if len(sys.argv) != 1:
     sys.exit(3)
 
 vids = get_unique_vendor_ids()
-print(f"Searching for all devices with these vendor ids {vids}")
+print(f'Searching for all devices with these vendor ids {vids}')
 
 sds = detect_supported_devices()
 if len(sds) > 0:
-    print("Detected possible devices:")
+    print('Detected possible devices:')
 for d in sds:
-    print(f" name:{d.name}{d.version} firmware:{d.for_firmware}")
+    print(f' name:{d.name}{d.version} firmware:{d.for_firmware}')
 
 ports = active_ports_on_supported_devices(sds)
-print(f"ports:{ports}")
+print(f'ports:{ports}')

examples/set_owner.py

@@ -3,7 +3,6 @@
 """
 
 import sys
-
 import meshtastic
 import meshtastic.serial_interface
 

examples/tcp_gps_example.py

@@ -1,14 +0,0 @@
-"""Demonstration of how to look up a radio's location via its LAN connection.
-   Before running, connect your machine to the same WiFi network as the radio.
-"""
-
-import meshtastic
-import meshtastic.tcp_interface
-
-radio_hostname = "meshtastic.local"  # Can also be an IP
-iface = meshtastic.tcp_interface.TCPInterface(radio_hostname)
-my_node_num = iface.myInfo.my_node_num
-pos = iface.nodesByNum[my_node_num]["position"]
-print(pos)
-
-iface.close()

info/mac/nano_g1.txt

@@ -1,30 +0,0 @@
-meshtastic detected port: /dev/cu.wchusbserial53820208781
-
-ioreg -p IOUSB
-
-shows this:
-
-| +-o USB Single Serial@14300000  <class AppleUSBDevice, id 0x1000407a5, registered, matched, active, busy 0 (18 ms), retain 14>
-
-
-
-
-system_profiler SPUSBDataType > /tmp/a
-	with device plugged in
-
-system_profiler SPUSBDataType > /tmp/b
-	with device not plugged in
-
-diff /tmp/a /tmp/b
-
-<         USB Single Serial:
-<
-<           Product ID: 0x55d4
-<           Vendor ID: 0x1a86
-<           Version: 4.43
-<           Serial Number: 5382020878
-<           Speed: Up to 12 Mb/s
-<           Location ID: 0x14300000 / 63
-<           Current Available (mA): 500
-<           Current Required (mA): 134
-<           Extra Operating Current (mA): 0

info/ubuntu/nano_g1.txt

@@ -1,91 +0,0 @@
-lsusb -d 1a86: -v
-
-Bus 001 Device 013: ID 1a86:55d4 QinHeng Electronics
-Couldn't open device, some information will be missing
-Device Descriptor:
-  bLength                18
-  bDescriptorType         1
-  bcdUSB               1.10
-  bDeviceClass            2 Communications
-  bDeviceSubClass         0
-  bDeviceProtocol         0
-  bMaxPacketSize0         8
-  idVendor           0x1a86 QinHeng Electronics
-  idProduct          0x55d4
-  bcdDevice            4.43
-  iManufacturer           0
-  iProduct                2
-  iSerial                 3
-  bNumConfigurations      1
-  Configuration Descriptor:
-    bLength                 9
-    bDescriptorType         2
-    wTotalLength       0x0043
-    bNumInterfaces          2
-    bConfigurationValue     1
-    iConfiguration          0
-    bmAttributes         0xa0
-      (Bus Powered)
-      Remote Wakeup
-    MaxPower              134mA
-    Interface Descriptor:
-      bLength                 9
-      bDescriptorType         4
-      bInterfaceNumber        0
-      bAlternateSetting       0
-      bNumEndpoints           1
-      bInterfaceClass         2 Communications
-      bInterfaceSubClass      2 Abstract (modem)
-      bInterfaceProtocol      1 AT-commands (v.25ter)
-      iInterface              0
-      CDC Header:
-        bcdCDC               1.10
-      CDC Call Management:
-        bmCapabilities       0x00
-        bDataInterface          1
-      CDC ACM:
-        bmCapabilities       0x02
-          line coding and serial state
-      CDC Union:
-        bMasterInterface        0
-        bSlaveInterface         1
-      Endpoint Descriptor:
-        bLength                 7
-        bDescriptorType         5
-        bEndpointAddress     0x83  EP 3 IN
-        bmAttributes            3
-          Transfer Type            Interrupt
-          Synch Type               None
-          Usage Type               Data
-        wMaxPacketSize     0x0010  1x 16 bytes
-        bInterval               1
-    Interface Descriptor:
-      bLength                 9
-      bDescriptorType         4
-      bInterfaceNumber        1
-      bAlternateSetting       0
-      bNumEndpoints           2
-      bInterfaceClass        10 CDC Data
-      bInterfaceSubClass      0
-      bInterfaceProtocol      0
-      iInterface              0
-      Endpoint Descriptor:
-        bLength                 7
-        bDescriptorType         5
-        bEndpointAddress     0x02  EP 2 OUT
-        bmAttributes            2
-          Transfer Type            Bulk
-          Synch Type               None
-          Usage Type               Data
-        wMaxPacketSize     0x0020  1x 32 bytes
-        bInterval               0
-      Endpoint Descriptor:
-        bLength                 7
-        bDescriptorType         5
-        bEndpointAddress     0x82  EP 2 IN
-        bmAttributes            2
-          Transfer Type            Bulk
-          Synch Type               None
-          Usage Type               Data
-        wMaxPacketSize     0x0040  1x 64 bytes
-        bInterval               0

info/windows/nano_g1.txt

@@ -1,39 +0,0 @@
-Get-PnpDevice -PresentOnly | Format-List >a
-Get-PnpDevice -PresentOnly | Format-List >b
-Compare-Object (get-content a) (Get-Content b)
-
-InputObject                                                                                              SideIndicator
------------                                                                                              -------------
-Caption                     : USB-Enhanced-SERIAL CH9102 (COM9)                                          =>
-Description                 : USB-Enhanced-SERIAL CH9102                                                 =>
-Name                        : USB-Enhanced-SERIAL CH9102 (COM9)                                          =>
-DeviceID                    : USB\VID_1A86&PID_55D4\5382020745                                           =>
-PNPDeviceID                 : USB\VID_1A86&PID_55D4\5382020745                                           =>
-ClassGuid                   : {4d36e978-e325-11ce-bfc1-08002be10318}                                     =>
-CompatibleID                : {USB\Class_02&SubClass_02&Prot_01, USB\Class_02&SubClass_02, USB\Class_02} =>
-HardwareID                  : {USB\VID_1A86&PID_55D4&REV_0443, USB\VID_1A86&PID_55D4}                    =>
-Manufacturer                : wch.cn                                                                     =>
-PNPClass                    : Ports                                                                      =>
-Service                     : CH343SER_A64                                                               =>
-Class                       : Ports                                                                      =>
-FriendlyName                : USB-Enhanced-SERIAL CH9102 (COM9)                                          =>
-InstanceId                  : USB\VID_1A86&PID_55D4\5382020745                                           =>
-InstallDate                 :                                                                            =>
-Status                      : OK                                                                         =>
-Availability                :                                                                            =>
-ConfigManagerErrorCode      : CM_PROB_NONE                                                               =>
-ConfigManagerUserConfig     : False                                                                      =>
-CreationClassName           : Win32_PnPEntity                                                            =>
-ErrorCleared                :                                                                            =>
-ErrorDescription            :                                                                            =>
-LastErrorCode               :                                                                            =>
-PowerManagementCapabilities :                                                                            =>
-PowerManagementSupported    :                                                                            =>
-StatusInfo                  :                                                                            =>
-SystemCreationClassName     : Win32_ComputerSystem                                                       =>
-SystemName                  : DESKTOP-FRFQN8H                                                            =>
-Present                     : True                                                                       =>
-PSComputerName              :                                                                            =>
-Problem                     : CM_PROB_NONE                                                               =>
-ProblemDescription          :                                                                            =>
-                                                                                                         =>

meshtastic/__init__.py

@@ -3,11 +3,11 @@
 
 Primary class: SerialInterface
 Install with pip: "[pip3 install meshtastic](https://pypi.org/project/meshtastic/)"
-Source code on [github](https://github.com/meshtastic/python)
+Source code on [github](https://github.com/meshtastic/Meshtastic-python)
 
 properties of SerialInterface:
 
-- localConfig - Current radio configuration and device settings, if you write to this the new settings will be applied to
+- radioConfig - Current radio configuration and device settings, if you write to this the new settings will be applied to
 the device.
 - nodes - The database of received nodes.  Includes always up-to-date location and username information for each
 node in the mesh.  This is a read-only datastructure.
@@ -62,51 +62,39 @@ import os
 import platform
 import random
 import socket
-import stat
 import sys
+import stat
 import threading
-import time
 import traceback
+import time
 from datetime import datetime
 from typing import *
-
+import serial
+import timeago
 import google.protobuf.json_format
-import serial # type: ignore[import-untyped]
+from pubsub import pub
-import timeago # type: ignore[import-untyped]
+from dotmap import DotMap
-from dotmap import DotMap # type: ignore[import-untyped]
-from google.protobuf.json_format import MessageToJson
-from pubsub import pub # type: ignore[import-untyped]
 from tabulate import tabulate
-
+from google.protobuf.json_format import MessageToJson
-from meshtastic import (
+from meshtastic.util import fixme, catchAndIgnore, stripnl, DeferredExecution, Timeout
-    admin_pb2,
-    apponly_pb2,
-    channel_pb2,
-    config_pb2,
-    mesh_pb2,
-    mqtt_pb2,
-    paxcount_pb2,
-    portnums_pb2,
-    remote_hardware_pb2,
-    storeforward_pb2,
-    telemetry_pb2,
-    util,
-)
 from meshtastic.node import Node
-from meshtastic.util import DeferredExecution, Timeout, catchAndIgnore, fixme, stripnl
+from meshtastic import (mesh_pb2, portnums_pb2, apponly_pb2, admin_pb2,
+                        environmental_measurement_pb2, remote_hardware_pb2,
+                        channel_pb2, radioconfig_pb2, util)
+
 
 # Note: To follow PEP224, comments should be after the module variable.
 
 LOCAL_ADDR = "^local"
 """A special ID that means the local node"""
 
-BROADCAST_NUM = 0xFFFFFFFF
+BROADCAST_NUM = 0xffffffff
-"""if using 8 bit nodenums this will be shortened on the target"""
+"""if using 8 bit nodenums this will be shortend on the target"""
 
 BROADCAST_ADDR = "^all"
 """A special ID that means broadcast"""
 
-OUR_APP_VERSION = 20300
+OUR_APP_VERSION = 20200
 """The numeric buildnumber (shared with android apps) specifying the
    level of device code we are guaranteed to understand
 
@@ -118,7 +106,6 @@ publishingThread = DeferredExecution("publishing")
 
 class ResponseHandler(NamedTuple):
     """A pending response callback, waiting for a response to one of our messages"""
-
     # requestId: int - used only as a key
     callback: Callable
     # FIXME, add timestamp and age out old requests
@@ -126,13 +113,12 @@ class ResponseHandler(NamedTuple):
 
 class KnownProtocol(NamedTuple):
     """Used to automatically decode known protocol payloads"""
-
     name: str
     # portnum: int, now a key
     # If set, will be called to prase as a protocol buffer
-    protobufFactory: Optional[Callable] = None
+    protobufFactory: Callable = None
     # If set, invoked as onReceive(interface, packet)
-    onReceive: Optional[Callable] = None
+    onReceive: Callable = None
 
 
 def _onTextReceive(iface, asDict):
@@ -143,7 +129,7 @@ def _onTextReceive(iface, asDict):
     #
     # Usually btw this problem is caused by apps sending binary data but setting the payload type to
     # text.
-    logging.debug(f"in _onTextReceive() asDict:{asDict}")
+    logging.debug(f'in _onTextReceive() asDict:{asDict}')
     try:
         asBytes = asDict["decoded"]["payload"]
         asDict["decoded"]["text"] = asBytes.decode("utf-8")
@@ -154,28 +140,28 @@ def _onTextReceive(iface, asDict):
 
 def _onPositionReceive(iface, asDict):
     """Special auto parsing for received messages"""
-    logging.debug(f"in _onPositionReceive() asDict:{asDict}")
+    logging.debug(f'in _onPositionReceive() asDict:{asDict}')
-    if "decoded" in asDict:
+    if 'decoded' in asDict:
-        if "position" in asDict["decoded"] and "from" in asDict:
+        if 'position' in asDict['decoded'] and 'from' in asDict:
             p = asDict["decoded"]["position"]
-            logging.debug(f"p:{p}")
+            logging.debug(f'p:{p}')
             p = iface._fixupPosition(p)
-            logging.debug(f"after fixup p:{p}")
+            logging.debug(f'after fixup p:{p}')
             # update node DB as needed
             iface._getOrCreateByNum(asDict["from"])["position"] = p
 
 
 def _onNodeInfoReceive(iface, asDict):
     """Special auto parsing for received messages"""
-    logging.debug(f"in _onNodeInfoReceive() asDict:{asDict}")
+    logging.debug(f'in _onNodeInfoReceive() asDict:{asDict}')
-    if "decoded" in asDict:
+    if 'decoded' in asDict:
-        if "user" in asDict["decoded"] and "from" in asDict:
+        if 'user' in asDict['decoded'] and 'from' in asDict:
             p = asDict["decoded"]["user"]
             # decode user protobufs and update nodedb, provide decoded version as "position" in the published msg
             # update node DB as needed
             n = iface._getOrCreateByNum(asDict["from"])
             n["user"] = p
-            # We now have a node ID, make sure it is up-to-date in that table
+            # We now have a node ID, make sure it is uptodate in that table
             iface.nodes[p["id"]] = n
             _receiveInfoUpdate(iface, asDict)
 
@@ -190,37 +176,12 @@ def _receiveInfoUpdate(iface, asDict):
 
 """Well known message payloads can register decoders for automatic protobuf parsing"""
 protocols = {
-    portnums_pb2.PortNum.TEXT_MESSAGE_APP: KnownProtocol(
+    portnums_pb2.PortNum.TEXT_MESSAGE_APP: KnownProtocol("text", onReceive=_onTextReceive),
-        "text", onReceive=_onTextReceive
+    portnums_pb2.PortNum.POSITION_APP: KnownProtocol("position", mesh_pb2.Position, _onPositionReceive),
-    ),
+    portnums_pb2.PortNum.NODEINFO_APP: KnownProtocol("user", mesh_pb2.User, _onNodeInfoReceive),
-    portnums_pb2.PortNum.RANGE_TEST_APP: KnownProtocol(
-        "rangetest", onReceive=_onTextReceive
-    ),
-    portnums_pb2.PortNum.DETECTION_SENSOR_APP: KnownProtocol(
-        "detectionsensor", onReceive=_onTextReceive
-    ),
-
-    portnums_pb2.PortNum.POSITION_APP: KnownProtocol(
-        "position", mesh_pb2.Position, _onPositionReceive
-    ),
-    portnums_pb2.PortNum.NODEINFO_APP: KnownProtocol(
-        "user", mesh_pb2.User, _onNodeInfoReceive
-    ),
     portnums_pb2.PortNum.ADMIN_APP: KnownProtocol("admin", admin_pb2.AdminMessage),
     portnums_pb2.PortNum.ROUTING_APP: KnownProtocol("routing", mesh_pb2.Routing),
-    portnums_pb2.PortNum.TELEMETRY_APP: KnownProtocol(
+    portnums_pb2.PortNum.ENVIRONMENTAL_MEASUREMENT_APP: KnownProtocol("environmental", environmental_measurement_pb2.EnvironmentalMeasurement),
-        "telemetry", telemetry_pb2.Telemetry
-    ),
     portnums_pb2.PortNum.REMOTE_HARDWARE_APP: KnownProtocol(
-        "remotehw", remote_hardware_pb2.HardwareMessage
+        "remotehw", remote_hardware_pb2.HardwareMessage)
-    ),
-    portnums_pb2.PortNum.SIMULATOR_APP: KnownProtocol("simulator", mesh_pb2.Compressed),
-    portnums_pb2.PortNum.TRACEROUTE_APP: KnownProtocol(
-        "traceroute", mesh_pb2.RouteDiscovery
-    ),
-    portnums_pb2.PortNum.WAYPOINT_APP: KnownProtocol("waypoint", mesh_pb2.Waypoint),
-    portnums_pb2.PortNum.PAXCOUNTER_APP: KnownProtocol("paxcounter", paxcount_pb2.Paxcount),
-    portnums_pb2.PortNum.STORE_FORWARD_APP: KnownProtocol("storeforward", storeforward_pb2.StoreAndForward),
-    portnums_pb2.PortNum.NEIGHBORINFO_APP: KnownProtocol("neighborinfo", mesh_pb2.NeighborInfo),
-    portnums_pb2.PortNum.MAP_REPORT_APP: KnownProtocol("mapreport", mqtt_pb2.MapReport),
 }

meshtastic/admin_pb2.py

@@ -1,39 +1,335 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: meshtastic/admin.proto
+# source: admin.proto
-"""Generated protocol buffer code."""
+
-from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
-from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import message as _message
+from google.protobuf import reflection as _reflection
 from google.protobuf import symbol_database as _symbol_database
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
 
 
-from meshtastic import channel_pb2 as meshtastic_dot_channel__pb2
+from . import channel_pb2 as channel__pb2
-from meshtastic import config_pb2 as meshtastic_dot_config__pb2
+from . import mesh_pb2 as mesh__pb2
-from meshtastic import connection_status_pb2 as meshtastic_dot_connection__status__pb2
+from . import radioconfig_pb2 as radioconfig__pb2
-from meshtastic import mesh_pb2 as meshtastic_dot_mesh__pb2
-from meshtastic import module_config_pb2 as meshtastic_dot_module__config__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x16meshtastic/admin.proto\x12\nmeshtastic\x1a\x18meshtastic/channel.proto\x1a\x17meshtastic/config.proto\x1a\"meshtastic/connection_status.proto\x1a\x15meshtastic/mesh.proto\x1a\x1emeshtastic/module_config.proto\"\xce\x11\n\x0c\x41\x64minMessage\x12\x1d\n\x13get_channel_request\x18\x01 \x01(\rH\x00\x12\x33\n\x14get_channel_response\x18\x02 \x01(\x0b\x32\x13.meshtastic.ChannelH\x00\x12\x1b\n\x11get_owner_request\x18\x03 \x01(\x08H\x00\x12.\n\x12get_owner_response\x18\x04 \x01(\x0b\x32\x10.meshtastic.UserH\x00\x12\x41\n\x12get_config_request\x18\x05 \x01(\x0e\x32#.meshtastic.AdminMessage.ConfigTypeH\x00\x12\x31\n\x13get_config_response\x18\x06 \x01(\x0b\x32\x12.meshtastic.ConfigH\x00\x12N\n\x19get_module_config_request\x18\x07 \x01(\x0e\x32).meshtastic.AdminMessage.ModuleConfigTypeH\x00\x12>\n\x1aget_module_config_response\x18\x08 \x01(\x0b\x32\x18.meshtastic.ModuleConfigH\x00\x12\x34\n*get_canned_message_module_messages_request\x18\n \x01(\x08H\x00\x12\x35\n+get_canned_message_module_messages_response\x18\x0b \x01(\tH\x00\x12%\n\x1bget_device_metadata_request\x18\x0c \x01(\x08H\x00\x12\x42\n\x1cget_device_metadata_response\x18\r \x01(\x0b\x32\x1a.meshtastic.DeviceMetadataH\x00\x12\x1e\n\x14get_ringtone_request\x18\x0e \x01(\x08H\x00\x12\x1f\n\x15get_ringtone_response\x18\x0f \x01(\tH\x00\x12.\n$get_device_connection_status_request\x18\x10 \x01(\x08H\x00\x12S\n%get_device_connection_status_response\x18\x11 \x01(\x0b\x32\".meshtastic.DeviceConnectionStatusH\x00\x12\x31\n\x0cset_ham_mode\x18\x12 \x01(\x0b\x32\x19.meshtastic.HamParametersH\x00\x12/\n%get_node_remote_hardware_pins_request\x18\x13 \x01(\x08H\x00\x12\\\n&get_node_remote_hardware_pins_response\x18\x14 \x01(\x0b\x32*.meshtastic.NodeRemoteHardwarePinsResponseH\x00\x12 \n\x16\x65nter_dfu_mode_request\x18\x15 \x01(\x08H\x00\x12\x1d\n\x13\x64\x65lete_file_request\x18\x16 \x01(\tH\x00\x12%\n\tset_owner\x18  \x01(\x0b\x32\x10.meshtastic.UserH\x00\x12*\n\x0bset_channel\x18! \x01(\x0b\x32\x13.meshtastic.ChannelH\x00\x12(\n\nset_config\x18\" \x01(\x0b\x32\x12.meshtastic.ConfigH\x00\x12\x35\n\x11set_module_config\x18# \x01(\x0b\x32\x18.meshtastic.ModuleConfigH\x00\x12,\n\"set_canned_message_module_messages\x18$ \x01(\tH\x00\x12\x1e\n\x14set_ringtone_message\x18% \x01(\tH\x00\x12\x1b\n\x11remove_by_nodenum\x18& \x01(\rH\x00\x12\x1b\n\x11set_favorite_node\x18\' \x01(\rH\x00\x12\x1e\n\x14remove_favorite_node\x18( \x01(\rH\x00\x12\x32\n\x12set_fixed_position\x18) \x01(\x0b\x32\x14.meshtastic.PositionH\x00\x12\x1f\n\x15remove_fixed_position\x18* \x01(\x08H\x00\x12\x1d\n\x13\x62\x65gin_edit_settings\x18@ \x01(\x08H\x00\x12\x1e\n\x14\x63ommit_edit_settings\x18\x41 \x01(\x08H\x00\x12\x1c\n\x12reboot_ota_seconds\x18_ \x01(\x05H\x00\x12\x18\n\x0e\x65xit_simulator\x18` \x01(\x08H\x00\x12\x18\n\x0ereboot_seconds\x18\x61 \x01(\x05H\x00\x12\x1a\n\x10shutdown_seconds\x18\x62 \x01(\x05H\x00\x12\x17\n\rfactory_reset\x18\x63 \x01(\x05H\x00\x12\x16\n\x0cnodedb_reset\x18\x64 \x01(\x05H\x00\"\x95\x01\n\nConfigType\x12\x11\n\rDEVICE_CONFIG\x10\x00\x12\x13\n\x0fPOSITION_CONFIG\x10\x01\x12\x10\n\x0cPOWER_CONFIG\x10\x02\x12\x12\n\x0eNETWORK_CONFIG\x10\x03\x12\x12\n\x0e\x44ISPLAY_CONFIG\x10\x04\x12\x0f\n\x0bLORA_CONFIG\x10\x05\x12\x14\n\x10\x42LUETOOTH_CONFIG\x10\x06\"\xbb\x02\n\x10ModuleConfigType\x12\x0f\n\x0bMQTT_CONFIG\x10\x00\x12\x11\n\rSERIAL_CONFIG\x10\x01\x12\x13\n\x0f\x45XTNOTIF_CONFIG\x10\x02\x12\x17\n\x13STOREFORWARD_CONFIG\x10\x03\x12\x14\n\x10RANGETEST_CONFIG\x10\x04\x12\x14\n\x10TELEMETRY_CONFIG\x10\x05\x12\x14\n\x10\x43\x41NNEDMSG_CONFIG\x10\x06\x12\x10\n\x0c\x41UDIO_CONFIG\x10\x07\x12\x19\n\x15REMOTEHARDWARE_CONFIG\x10\x08\x12\x17\n\x13NEIGHBORINFO_CONFIG\x10\t\x12\x1a\n\x16\x41MBIENTLIGHTING_CONFIG\x10\n\x12\x1a\n\x16\x44\x45TECTIONSENSOR_CONFIG\x10\x0b\x12\x15\n\x11PAXCOUNTER_CONFIG\x10\x0c\x42\x11\n\x0fpayload_variant\"[\n\rHamParameters\x12\x11\n\tcall_sign\x18\x01 \x01(\t\x12\x10\n\x08tx_power\x18\x02 \x01(\x05\x12\x11\n\tfrequency\x18\x03 \x01(\x02\x12\x12\n\nshort_name\x18\x04 \x01(\t\"f\n\x1eNodeRemoteHardwarePinsResponse\x12\x44\n\x19node_remote_hardware_pins\x18\x01 \x03(\x0b\x32!.meshtastic.NodeRemoteHardwarePinB`\n\x13\x63om.geeksville.meshB\x0b\x41\x64minProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor.FileDescriptor(
+  name='admin.proto',
+  package='',
+  syntax='proto3',
+  serialized_options=b'\n\023com.geeksville.meshB\013AdminProtosH\003Z!github.com/meshtastic/gomeshproto',
+  serialized_pb=b'\n\x0b\x61\x64min.proto\x1a\rchannel.proto\x1a\nmesh.proto\x1a\x11radioconfig.proto\"\xa1\x08\n\x0c\x41\x64minMessage\x12!\n\tset_radio\x18\x01 \x01(\x0b\x32\x0c.RadioConfigH\x00\x12\x1a\n\tset_owner\x18\x02 \x01(\x0b\x32\x05.UserH\x00\x12\x1f\n\x0bset_channel\x18\x03 \x01(\x0b\x32\x08.ChannelH\x00\x12\x1b\n\x11get_radio_request\x18\x04 \x01(\x08H\x00\x12*\n\x12get_radio_response\x18\x05 \x01(\x0b\x32\x0c.RadioConfigH\x00\x12\x1d\n\x13get_channel_request\x18\x06 \x01(\rH\x00\x12(\n\x14get_channel_response\x18\x07 \x01(\x0b\x32\x08.ChannelH\x00\x12\x1b\n\x11get_owner_request\x18\x08 \x01(\x08H\x00\x12#\n\x12get_owner_response\x18\t \x01(\x0b\x32\x05.UserH\x00\x12\x1d\n\x13\x63onfirm_set_channel\x18  \x01(\x08H\x00\x12\x1b\n\x11\x63onfirm_set_radio\x18! \x01(\x08H\x00\x12\x18\n\x0e\x65xit_simulator\x18\" \x01(\x08H\x00\x12\x18\n\x0ereboot_seconds\x18# \x01(\x05H\x00\x12\x31\n\'get_canned_message_plugin_part1_request\x18$ \x01(\x08H\x00\x12\x32\n(get_canned_message_plugin_part1_response\x18% \x01(\tH\x00\x12\x31\n\'get_canned_message_plugin_part2_request\x18& \x01(\x08H\x00\x12\x32\n(get_canned_message_plugin_part2_response\x18\' \x01(\tH\x00\x12\x31\n\'get_canned_message_plugin_part3_request\x18( \x01(\x08H\x00\x12\x32\n(get_canned_message_plugin_part3_response\x18) \x01(\tH\x00\x12\x31\n\'get_canned_message_plugin_part4_request\x18* \x01(\x08H\x00\x12\x32\n(get_canned_message_plugin_part4_response\x18+ \x01(\tH\x00\x12)\n\x1fset_canned_message_plugin_part1\x18, \x01(\tH\x00\x12)\n\x1fset_canned_message_plugin_part2\x18- \x01(\tH\x00\x12)\n\x1fset_canned_message_plugin_part3\x18. \x01(\tH\x00\x12)\n\x1fset_canned_message_plugin_part4\x18/ \x01(\tH\x00\x12\x1a\n\x10shutdown_seconds\x18\x33 \x01(\x05H\x00\x42\t\n\x07variantBG\n\x13\x63om.geeksville.meshB\x0b\x41\x64minProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3'
+  ,
+  dependencies=[channel__pb2.DESCRIPTOR,mesh__pb2.DESCRIPTOR,radioconfig__pb2.DESCRIPTOR,])
 
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.admin_pb2', globals())
-if _descriptor._USE_C_DESCRIPTORS == False:
 
-  DESCRIPTOR._options = None
+
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\013AdminProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+
-  _ADMINMESSAGE._serialized_start=181
+_ADMINMESSAGE = _descriptor.Descriptor(
-  _ADMINMESSAGE._serialized_end=2435
+  name='AdminMessage',
-  _ADMINMESSAGE_CONFIGTYPE._serialized_start=1949
+  full_name='AdminMessage',
-  _ADMINMESSAGE_CONFIGTYPE._serialized_end=2098
+  filename=None,
-  _ADMINMESSAGE_MODULECONFIGTYPE._serialized_start=2101
+  file=DESCRIPTOR,
-  _ADMINMESSAGE_MODULECONFIGTYPE._serialized_end=2416
+  containing_type=None,
-  _HAMPARAMETERS._serialized_start=2437
+  fields=[
-  _HAMPARAMETERS._serialized_end=2528
+    _descriptor.FieldDescriptor(
-  _NODEREMOTEHARDWAREPINSRESPONSE._serialized_start=2530
+      name='set_radio', full_name='AdminMessage.set_radio', index=0,
-  _NODEREMOTEHARDWAREPINSRESPONSE._serialized_end=2632
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='set_owner', full_name='AdminMessage.set_owner', index=1,
+      number=2, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='set_channel', full_name='AdminMessage.set_channel', index=2,
+      number=3, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='get_radio_request', full_name='AdminMessage.get_radio_request', index=3,
+      number=4, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='get_radio_response', full_name='AdminMessage.get_radio_response', index=4,
+      number=5, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='get_channel_request', full_name='AdminMessage.get_channel_request', index=5,
+      number=6, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='get_channel_response', full_name='AdminMessage.get_channel_response', index=6,
+      number=7, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='get_owner_request', full_name='AdminMessage.get_owner_request', index=7,
+      number=8, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='get_owner_response', full_name='AdminMessage.get_owner_response', index=8,
+      number=9, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='confirm_set_channel', full_name='AdminMessage.confirm_set_channel', index=9,
+      number=32, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='confirm_set_radio', full_name='AdminMessage.confirm_set_radio', index=10,
+      number=33, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='exit_simulator', full_name='AdminMessage.exit_simulator', index=11,
+      number=34, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='reboot_seconds', full_name='AdminMessage.reboot_seconds', index=12,
+      number=35, type=5, cpp_type=1, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='get_canned_message_plugin_part1_request', full_name='AdminMessage.get_canned_message_plugin_part1_request', index=13,
+      number=36, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='get_canned_message_plugin_part1_response', full_name='AdminMessage.get_canned_message_plugin_part1_response', index=14,
+      number=37, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=b"".decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='get_canned_message_plugin_part2_request', full_name='AdminMessage.get_canned_message_plugin_part2_request', index=15,
+      number=38, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='get_canned_message_plugin_part2_response', full_name='AdminMessage.get_canned_message_plugin_part2_response', index=16,
+      number=39, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=b"".decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='get_canned_message_plugin_part3_request', full_name='AdminMessage.get_canned_message_plugin_part3_request', index=17,
+      number=40, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='get_canned_message_plugin_part3_response', full_name='AdminMessage.get_canned_message_plugin_part3_response', index=18,
+      number=41, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=b"".decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='get_canned_message_plugin_part4_request', full_name='AdminMessage.get_canned_message_plugin_part4_request', index=19,
+      number=42, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='get_canned_message_plugin_part4_response', full_name='AdminMessage.get_canned_message_plugin_part4_response', index=20,
+      number=43, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=b"".decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='set_canned_message_plugin_part1', full_name='AdminMessage.set_canned_message_plugin_part1', index=21,
+      number=44, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=b"".decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='set_canned_message_plugin_part2', full_name='AdminMessage.set_canned_message_plugin_part2', index=22,
+      number=45, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=b"".decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='set_canned_message_plugin_part3', full_name='AdminMessage.set_canned_message_plugin_part3', index=23,
+      number=46, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=b"".decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='set_canned_message_plugin_part4', full_name='AdminMessage.set_canned_message_plugin_part4', index=24,
+      number=47, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=b"".decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='shutdown_seconds', full_name='AdminMessage.shutdown_seconds', index=25,
+      number=51, type=5, cpp_type=1, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+    _descriptor.OneofDescriptor(
+      name='variant', full_name='AdminMessage.variant',
+      index=0, containing_type=None, fields=[]),
+  ],
+  serialized_start=62,
+  serialized_end=1119,
+)
+
+_ADMINMESSAGE.fields_by_name['set_radio'].message_type = radioconfig__pb2._RADIOCONFIG
+_ADMINMESSAGE.fields_by_name['set_owner'].message_type = mesh__pb2._USER
+_ADMINMESSAGE.fields_by_name['set_channel'].message_type = channel__pb2._CHANNEL
+_ADMINMESSAGE.fields_by_name['get_radio_response'].message_type = radioconfig__pb2._RADIOCONFIG
+_ADMINMESSAGE.fields_by_name['get_channel_response'].message_type = channel__pb2._CHANNEL
+_ADMINMESSAGE.fields_by_name['get_owner_response'].message_type = mesh__pb2._USER
+_ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
+  _ADMINMESSAGE.fields_by_name['set_radio'])
+_ADMINMESSAGE.fields_by_name['set_radio'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+_ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
+  _ADMINMESSAGE.fields_by_name['set_owner'])
+_ADMINMESSAGE.fields_by_name['set_owner'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+_ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
+  _ADMINMESSAGE.fields_by_name['set_channel'])
+_ADMINMESSAGE.fields_by_name['set_channel'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+_ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
+  _ADMINMESSAGE.fields_by_name['get_radio_request'])
+_ADMINMESSAGE.fields_by_name['get_radio_request'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+_ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
+  _ADMINMESSAGE.fields_by_name['get_radio_response'])
+_ADMINMESSAGE.fields_by_name['get_radio_response'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+_ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
+  _ADMINMESSAGE.fields_by_name['get_channel_request'])
+_ADMINMESSAGE.fields_by_name['get_channel_request'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+_ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
+  _ADMINMESSAGE.fields_by_name['get_channel_response'])
+_ADMINMESSAGE.fields_by_name['get_channel_response'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+_ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
+  _ADMINMESSAGE.fields_by_name['get_owner_request'])
+_ADMINMESSAGE.fields_by_name['get_owner_request'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+_ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
+  _ADMINMESSAGE.fields_by_name['get_owner_response'])
+_ADMINMESSAGE.fields_by_name['get_owner_response'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+_ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
+  _ADMINMESSAGE.fields_by_name['confirm_set_channel'])
+_ADMINMESSAGE.fields_by_name['confirm_set_channel'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+_ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
+  _ADMINMESSAGE.fields_by_name['confirm_set_radio'])
+_ADMINMESSAGE.fields_by_name['confirm_set_radio'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+_ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
+  _ADMINMESSAGE.fields_by_name['exit_simulator'])
+_ADMINMESSAGE.fields_by_name['exit_simulator'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+_ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
+  _ADMINMESSAGE.fields_by_name['reboot_seconds'])
+_ADMINMESSAGE.fields_by_name['reboot_seconds'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+_ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
+  _ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part1_request'])
+_ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part1_request'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+_ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
+  _ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part1_response'])
+_ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part1_response'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+_ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
+  _ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part2_request'])
+_ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part2_request'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+_ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
+  _ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part2_response'])
+_ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part2_response'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+_ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
+  _ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part3_request'])
+_ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part3_request'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+_ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
+  _ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part3_response'])
+_ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part3_response'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+_ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
+  _ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part4_request'])
+_ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part4_request'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+_ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
+  _ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part4_response'])
+_ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part4_response'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+_ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
+  _ADMINMESSAGE.fields_by_name['set_canned_message_plugin_part1'])
+_ADMINMESSAGE.fields_by_name['set_canned_message_plugin_part1'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+_ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
+  _ADMINMESSAGE.fields_by_name['set_canned_message_plugin_part2'])
+_ADMINMESSAGE.fields_by_name['set_canned_message_plugin_part2'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+_ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
+  _ADMINMESSAGE.fields_by_name['set_canned_message_plugin_part3'])
+_ADMINMESSAGE.fields_by_name['set_canned_message_plugin_part3'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+_ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
+  _ADMINMESSAGE.fields_by_name['set_canned_message_plugin_part4'])
+_ADMINMESSAGE.fields_by_name['set_canned_message_plugin_part4'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+_ADMINMESSAGE.oneofs_by_name['variant'].fields.append(
+  _ADMINMESSAGE.fields_by_name['shutdown_seconds'])
+_ADMINMESSAGE.fields_by_name['shutdown_seconds'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant']
+DESCRIPTOR.message_types_by_name['AdminMessage'] = _ADMINMESSAGE
+_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+
+AdminMessage = _reflection.GeneratedProtocolMessageType('AdminMessage', (_message.Message,), {
+  'DESCRIPTOR' : _ADMINMESSAGE,
+  '__module__' : 'admin_pb2'
+  # @@protoc_insertion_point(class_scope:AdminMessage)
+  })
+_sym_db.RegisterMessage(AdminMessage)
+
+
+DESCRIPTOR._options = None
 # @@protoc_insertion_point(module_scope)

meshtastic/admin_pb2.pyi

@@ -1,557 +0,0 @@
-"""
-@generated by mypy-protobuf.  Do not edit manually!
-isort:skip_file
-"""
-import builtins
-import collections.abc
-import google.protobuf.descriptor
-import google.protobuf.internal.containers
-import google.protobuf.internal.enum_type_wrapper
-import google.protobuf.message
-import meshtastic.channel_pb2
-import meshtastic.config_pb2
-import meshtastic.connection_status_pb2
-import meshtastic.mesh_pb2
-import meshtastic.module_config_pb2
-import sys
-import typing
-
-if sys.version_info >= (3, 10):
-    import typing as typing_extensions
-else:
-    import typing_extensions
-
-DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
-
-@typing_extensions.final
-class AdminMessage(google.protobuf.message.Message):
-    """
-    This message is handled by the Admin module and is responsible for all settings/channel read/write operations.
-    This message is used to do settings operations to both remote AND local nodes.
-    (Prior to 1.2 these operations were done via special ToRadio operations)
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    class _ConfigType:
-        ValueType = typing.NewType("ValueType", builtins.int)
-        V: typing_extensions.TypeAlias = ValueType
-
-    class _ConfigTypeEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[AdminMessage._ConfigType.ValueType], builtins.type):
-        DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
-        DEVICE_CONFIG: AdminMessage._ConfigType.ValueType  # 0
-        """
-        TODO: REPLACE
-        """
-        POSITION_CONFIG: AdminMessage._ConfigType.ValueType  # 1
-        """
-        TODO: REPLACE
-        """
-        POWER_CONFIG: AdminMessage._ConfigType.ValueType  # 2
-        """
-        TODO: REPLACE
-        """
-        NETWORK_CONFIG: AdminMessage._ConfigType.ValueType  # 3
-        """
-        TODO: REPLACE
-        """
-        DISPLAY_CONFIG: AdminMessage._ConfigType.ValueType  # 4
-        """
-        TODO: REPLACE
-        """
-        LORA_CONFIG: AdminMessage._ConfigType.ValueType  # 5
-        """
-        TODO: REPLACE
-        """
-        BLUETOOTH_CONFIG: AdminMessage._ConfigType.ValueType  # 6
-        """
-        TODO: REPLACE
-        """
-
-    class ConfigType(_ConfigType, metaclass=_ConfigTypeEnumTypeWrapper):
-        """
-        TODO: REPLACE
-        """
-
-    DEVICE_CONFIG: AdminMessage.ConfigType.ValueType  # 0
-    """
-    TODO: REPLACE
-    """
-    POSITION_CONFIG: AdminMessage.ConfigType.ValueType  # 1
-    """
-    TODO: REPLACE
-    """
-    POWER_CONFIG: AdminMessage.ConfigType.ValueType  # 2
-    """
-    TODO: REPLACE
-    """
-    NETWORK_CONFIG: AdminMessage.ConfigType.ValueType  # 3
-    """
-    TODO: REPLACE
-    """
-    DISPLAY_CONFIG: AdminMessage.ConfigType.ValueType  # 4
-    """
-    TODO: REPLACE
-    """
-    LORA_CONFIG: AdminMessage.ConfigType.ValueType  # 5
-    """
-    TODO: REPLACE
-    """
-    BLUETOOTH_CONFIG: AdminMessage.ConfigType.ValueType  # 6
-    """
-    TODO: REPLACE
-    """
-
-    class _ModuleConfigType:
-        ValueType = typing.NewType("ValueType", builtins.int)
-        V: typing_extensions.TypeAlias = ValueType
-
-    class _ModuleConfigTypeEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[AdminMessage._ModuleConfigType.ValueType], builtins.type):
-        DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
-        MQTT_CONFIG: AdminMessage._ModuleConfigType.ValueType  # 0
-        """
-        TODO: REPLACE
-        """
-        SERIAL_CONFIG: AdminMessage._ModuleConfigType.ValueType  # 1
-        """
-        TODO: REPLACE
-        """
-        EXTNOTIF_CONFIG: AdminMessage._ModuleConfigType.ValueType  # 2
-        """
-        TODO: REPLACE
-        """
-        STOREFORWARD_CONFIG: AdminMessage._ModuleConfigType.ValueType  # 3
-        """
-        TODO: REPLACE
-        """
-        RANGETEST_CONFIG: AdminMessage._ModuleConfigType.ValueType  # 4
-        """
-        TODO: REPLACE
-        """
-        TELEMETRY_CONFIG: AdminMessage._ModuleConfigType.ValueType  # 5
-        """
-        TODO: REPLACE
-        """
-        CANNEDMSG_CONFIG: AdminMessage._ModuleConfigType.ValueType  # 6
-        """
-        TODO: REPLACE
-        """
-        AUDIO_CONFIG: AdminMessage._ModuleConfigType.ValueType  # 7
-        """
-        TODO: REPLACE
-        """
-        REMOTEHARDWARE_CONFIG: AdminMessage._ModuleConfigType.ValueType  # 8
-        """
-        TODO: REPLACE
-        """
-        NEIGHBORINFO_CONFIG: AdminMessage._ModuleConfigType.ValueType  # 9
-        """
-        TODO: REPLACE
-        """
-        AMBIENTLIGHTING_CONFIG: AdminMessage._ModuleConfigType.ValueType  # 10
-        """
-        TODO: REPLACE
-        """
-        DETECTIONSENSOR_CONFIG: AdminMessage._ModuleConfigType.ValueType  # 11
-        """
-        TODO: REPLACE
-        """
-        PAXCOUNTER_CONFIG: AdminMessage._ModuleConfigType.ValueType  # 12
-        """
-        TODO: REPLACE
-        """
-
-    class ModuleConfigType(_ModuleConfigType, metaclass=_ModuleConfigTypeEnumTypeWrapper):
-        """
-        TODO: REPLACE
-        """
-
-    MQTT_CONFIG: AdminMessage.ModuleConfigType.ValueType  # 0
-    """
-    TODO: REPLACE
-    """
-    SERIAL_CONFIG: AdminMessage.ModuleConfigType.ValueType  # 1
-    """
-    TODO: REPLACE
-    """
-    EXTNOTIF_CONFIG: AdminMessage.ModuleConfigType.ValueType  # 2
-    """
-    TODO: REPLACE
-    """
-    STOREFORWARD_CONFIG: AdminMessage.ModuleConfigType.ValueType  # 3
-    """
-    TODO: REPLACE
-    """
-    RANGETEST_CONFIG: AdminMessage.ModuleConfigType.ValueType  # 4
-    """
-    TODO: REPLACE
-    """
-    TELEMETRY_CONFIG: AdminMessage.ModuleConfigType.ValueType  # 5
-    """
-    TODO: REPLACE
-    """
-    CANNEDMSG_CONFIG: AdminMessage.ModuleConfigType.ValueType  # 6
-    """
-    TODO: REPLACE
-    """
-    AUDIO_CONFIG: AdminMessage.ModuleConfigType.ValueType  # 7
-    """
-    TODO: REPLACE
-    """
-    REMOTEHARDWARE_CONFIG: AdminMessage.ModuleConfigType.ValueType  # 8
-    """
-    TODO: REPLACE
-    """
-    NEIGHBORINFO_CONFIG: AdminMessage.ModuleConfigType.ValueType  # 9
-    """
-    TODO: REPLACE
-    """
-    AMBIENTLIGHTING_CONFIG: AdminMessage.ModuleConfigType.ValueType  # 10
-    """
-    TODO: REPLACE
-    """
-    DETECTIONSENSOR_CONFIG: AdminMessage.ModuleConfigType.ValueType  # 11
-    """
-    TODO: REPLACE
-    """
-    PAXCOUNTER_CONFIG: AdminMessage.ModuleConfigType.ValueType  # 12
-    """
-    TODO: REPLACE
-    """
-
-    GET_CHANNEL_REQUEST_FIELD_NUMBER: builtins.int
-    GET_CHANNEL_RESPONSE_FIELD_NUMBER: builtins.int
-    GET_OWNER_REQUEST_FIELD_NUMBER: builtins.int
-    GET_OWNER_RESPONSE_FIELD_NUMBER: builtins.int
-    GET_CONFIG_REQUEST_FIELD_NUMBER: builtins.int
-    GET_CONFIG_RESPONSE_FIELD_NUMBER: builtins.int
-    GET_MODULE_CONFIG_REQUEST_FIELD_NUMBER: builtins.int
-    GET_MODULE_CONFIG_RESPONSE_FIELD_NUMBER: builtins.int
-    GET_CANNED_MESSAGE_MODULE_MESSAGES_REQUEST_FIELD_NUMBER: builtins.int
-    GET_CANNED_MESSAGE_MODULE_MESSAGES_RESPONSE_FIELD_NUMBER: builtins.int
-    GET_DEVICE_METADATA_REQUEST_FIELD_NUMBER: builtins.int
-    GET_DEVICE_METADATA_RESPONSE_FIELD_NUMBER: builtins.int
-    GET_RINGTONE_REQUEST_FIELD_NUMBER: builtins.int
-    GET_RINGTONE_RESPONSE_FIELD_NUMBER: builtins.int
-    GET_DEVICE_CONNECTION_STATUS_REQUEST_FIELD_NUMBER: builtins.int
-    GET_DEVICE_CONNECTION_STATUS_RESPONSE_FIELD_NUMBER: builtins.int
-    SET_HAM_MODE_FIELD_NUMBER: builtins.int
-    GET_NODE_REMOTE_HARDWARE_PINS_REQUEST_FIELD_NUMBER: builtins.int
-    GET_NODE_REMOTE_HARDWARE_PINS_RESPONSE_FIELD_NUMBER: builtins.int
-    ENTER_DFU_MODE_REQUEST_FIELD_NUMBER: builtins.int
-    DELETE_FILE_REQUEST_FIELD_NUMBER: builtins.int
-    SET_OWNER_FIELD_NUMBER: builtins.int
-    SET_CHANNEL_FIELD_NUMBER: builtins.int
-    SET_CONFIG_FIELD_NUMBER: builtins.int
-    SET_MODULE_CONFIG_FIELD_NUMBER: builtins.int
-    SET_CANNED_MESSAGE_MODULE_MESSAGES_FIELD_NUMBER: builtins.int
-    SET_RINGTONE_MESSAGE_FIELD_NUMBER: builtins.int
-    REMOVE_BY_NODENUM_FIELD_NUMBER: builtins.int
-    SET_FAVORITE_NODE_FIELD_NUMBER: builtins.int
-    REMOVE_FAVORITE_NODE_FIELD_NUMBER: builtins.int
-    SET_FIXED_POSITION_FIELD_NUMBER: builtins.int
-    REMOVE_FIXED_POSITION_FIELD_NUMBER: builtins.int
-    BEGIN_EDIT_SETTINGS_FIELD_NUMBER: builtins.int
-    COMMIT_EDIT_SETTINGS_FIELD_NUMBER: builtins.int
-    REBOOT_OTA_SECONDS_FIELD_NUMBER: builtins.int
-    EXIT_SIMULATOR_FIELD_NUMBER: builtins.int
-    REBOOT_SECONDS_FIELD_NUMBER: builtins.int
-    SHUTDOWN_SECONDS_FIELD_NUMBER: builtins.int
-    FACTORY_RESET_FIELD_NUMBER: builtins.int
-    NODEDB_RESET_FIELD_NUMBER: builtins.int
-    get_channel_request: builtins.int
-    """
-    Send the specified channel in the response to this message
-    NOTE: This field is sent with the channel index + 1 (to ensure we never try to send 'zero' - which protobufs treats as not present)
-    """
-    @property
-    def get_channel_response(self) -> meshtastic.channel_pb2.Channel:
-        """
-        TODO: REPLACE
-        """
-    get_owner_request: builtins.bool
-    """
-    Send the current owner data in the response to this message.
-    """
-    @property
-    def get_owner_response(self) -> meshtastic.mesh_pb2.User:
-        """
-        TODO: REPLACE
-        """
-    get_config_request: global___AdminMessage.ConfigType.ValueType
-    """
-    Ask for the following config data to be sent
-    """
-    @property
-    def get_config_response(self) -> meshtastic.config_pb2.Config:
-        """
-        Send the current Config in the response to this message.
-        """
-    get_module_config_request: global___AdminMessage.ModuleConfigType.ValueType
-    """
-    Ask for the following config data to be sent
-    """
-    @property
-    def get_module_config_response(self) -> meshtastic.module_config_pb2.ModuleConfig:
-        """
-        Send the current Config in the response to this message.
-        """
-    get_canned_message_module_messages_request: builtins.bool
-    """
-    Get the Canned Message Module messages in the response to this message.
-    """
-    get_canned_message_module_messages_response: builtins.str
-    """
-    Get the Canned Message Module messages in the response to this message.
-    """
-    get_device_metadata_request: builtins.bool
-    """
-    Request the node to send device metadata (firmware, protobuf version, etc)
-    """
-    @property
-    def get_device_metadata_response(self) -> meshtastic.mesh_pb2.DeviceMetadata:
-        """
-        Device metadata response
-        """
-    get_ringtone_request: builtins.bool
-    """
-    Get the Ringtone in the response to this message.
-    """
-    get_ringtone_response: builtins.str
-    """
-    Get the Ringtone in the response to this message.
-    """
-    get_device_connection_status_request: builtins.bool
-    """
-    Request the node to send it's connection status
-    """
-    @property
-    def get_device_connection_status_response(self) -> meshtastic.connection_status_pb2.DeviceConnectionStatus:
-        """
-        Device connection status response
-        """
-    @property
-    def set_ham_mode(self) -> global___HamParameters:
-        """
-        Setup a node for licensed amateur (ham) radio operation
-        """
-    get_node_remote_hardware_pins_request: builtins.bool
-    """
-    Get the mesh's nodes with their available gpio pins for RemoteHardware module use
-    """
-    @property
-    def get_node_remote_hardware_pins_response(self) -> global___NodeRemoteHardwarePinsResponse:
-        """
-        Respond with the mesh's nodes with their available gpio pins for RemoteHardware module use
-        """
-    enter_dfu_mode_request: builtins.bool
-    """
-    Enter (UF2) DFU mode
-    Only implemented on NRF52 currently
-    """
-    delete_file_request: builtins.str
-    """
-    Delete the file by the specified path from the device
-    """
-    @property
-    def set_owner(self) -> meshtastic.mesh_pb2.User:
-        """
-        Set the owner for this node
-        """
-    @property
-    def set_channel(self) -> meshtastic.channel_pb2.Channel:
-        """
-        Set channels (using the new API).
-        A special channel is the "primary channel".
-        The other records are secondary channels.
-        Note: only one channel can be marked as primary.
-        If the client sets a particular channel to be primary, the previous channel will be set to SECONDARY automatically.
-        """
-    @property
-    def set_config(self) -> meshtastic.config_pb2.Config:
-        """
-        Set the current Config
-        """
-    @property
-    def set_module_config(self) -> meshtastic.module_config_pb2.ModuleConfig:
-        """
-        Set the current Config
-        """
-    set_canned_message_module_messages: builtins.str
-    """
-    Set the Canned Message Module messages text.
-    """
-    set_ringtone_message: builtins.str
-    """
-    Set the ringtone for ExternalNotification.
-    """
-    remove_by_nodenum: builtins.int
-    """
-    Remove the node by the specified node-num from the NodeDB on the device
-    """
-    set_favorite_node: builtins.int
-    """
-    Set specified node-num to be favorited on the NodeDB on the device
-    """
-    remove_favorite_node: builtins.int
-    """
-    Set specified node-num to be un-favorited on the NodeDB on the device
-    """
-    @property
-    def set_fixed_position(self) -> meshtastic.mesh_pb2.Position:
-        """
-        Set fixed position data on the node and then set the position.fixed_position = true
-        """
-    remove_fixed_position: builtins.bool
-    """
-    Clear fixed position coordinates and then set position.fixed_position = false
-    """
-    begin_edit_settings: builtins.bool
-    """
-    Begins an edit transaction for config, module config, owner, and channel settings changes
-    This will delay the standard *implicit* save to the file system and subsequent reboot behavior until committed (commit_edit_settings)
-    """
-    commit_edit_settings: builtins.bool
-    """
-    Commits an open transaction for any edits made to config, module config, owner, and channel settings
-    """
-    reboot_ota_seconds: builtins.int
-    """
-    Tell the node to reboot into the OTA Firmware in this many seconds (or <0 to cancel reboot)
-    Only Implemented for ESP32 Devices. This needs to be issued to send a new main firmware via bluetooth.
-    """
-    exit_simulator: builtins.bool
-    """
-    This message is only supported for the simulator Portduino build.
-    If received the simulator will exit successfully.
-    """
-    reboot_seconds: builtins.int
-    """
-    Tell the node to reboot in this many seconds (or <0 to cancel reboot)
-    """
-    shutdown_seconds: builtins.int
-    """
-    Tell the node to shutdown in this many seconds (or <0 to cancel shutdown)
-    """
-    factory_reset: builtins.int
-    """
-    Tell the node to factory reset, all device settings will be returned to factory defaults.
-    """
-    nodedb_reset: builtins.int
-    """
-    Tell the node to reset the nodedb.
-    """
-    def __init__(
-        self,
-        *,
-        get_channel_request: builtins.int = ...,
-        get_channel_response: meshtastic.channel_pb2.Channel | None = ...,
-        get_owner_request: builtins.bool = ...,
-        get_owner_response: meshtastic.mesh_pb2.User | None = ...,
-        get_config_request: global___AdminMessage.ConfigType.ValueType = ...,
-        get_config_response: meshtastic.config_pb2.Config | None = ...,
-        get_module_config_request: global___AdminMessage.ModuleConfigType.ValueType = ...,
-        get_module_config_response: meshtastic.module_config_pb2.ModuleConfig | None = ...,
-        get_canned_message_module_messages_request: builtins.bool = ...,
-        get_canned_message_module_messages_response: builtins.str = ...,
-        get_device_metadata_request: builtins.bool = ...,
-        get_device_metadata_response: meshtastic.mesh_pb2.DeviceMetadata | None = ...,
-        get_ringtone_request: builtins.bool = ...,
-        get_ringtone_response: builtins.str = ...,
-        get_device_connection_status_request: builtins.bool = ...,
-        get_device_connection_status_response: meshtastic.connection_status_pb2.DeviceConnectionStatus | None = ...,
-        set_ham_mode: global___HamParameters | None = ...,
-        get_node_remote_hardware_pins_request: builtins.bool = ...,
-        get_node_remote_hardware_pins_response: global___NodeRemoteHardwarePinsResponse | None = ...,
-        enter_dfu_mode_request: builtins.bool = ...,
-        delete_file_request: builtins.str = ...,
-        set_owner: meshtastic.mesh_pb2.User | None = ...,
-        set_channel: meshtastic.channel_pb2.Channel | None = ...,
-        set_config: meshtastic.config_pb2.Config | None = ...,
-        set_module_config: meshtastic.module_config_pb2.ModuleConfig | None = ...,
-        set_canned_message_module_messages: builtins.str = ...,
-        set_ringtone_message: builtins.str = ...,
-        remove_by_nodenum: builtins.int = ...,
-        set_favorite_node: builtins.int = ...,
-        remove_favorite_node: builtins.int = ...,
-        set_fixed_position: meshtastic.mesh_pb2.Position | None = ...,
-        remove_fixed_position: builtins.bool = ...,
-        begin_edit_settings: builtins.bool = ...,
-        commit_edit_settings: builtins.bool = ...,
-        reboot_ota_seconds: builtins.int = ...,
-        exit_simulator: builtins.bool = ...,
-        reboot_seconds: builtins.int = ...,
-        shutdown_seconds: builtins.int = ...,
-        factory_reset: builtins.int = ...,
-        nodedb_reset: builtins.int = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing_extensions.Literal["begin_edit_settings", b"begin_edit_settings", "commit_edit_settings", b"commit_edit_settings", "delete_file_request", b"delete_file_request", "enter_dfu_mode_request", b"enter_dfu_mode_request", "exit_simulator", b"exit_simulator", "factory_reset", b"factory_reset", "get_canned_message_module_messages_request", b"get_canned_message_module_messages_request", "get_canned_message_module_messages_response", b"get_canned_message_module_messages_response", "get_channel_request", b"get_channel_request", "get_channel_response", b"get_channel_response", "get_config_request", b"get_config_request", "get_config_response", b"get_config_response", "get_device_connection_status_request", b"get_device_connection_status_request", "get_device_connection_status_response", b"get_device_connection_status_response", "get_device_metadata_request", b"get_device_metadata_request", "get_device_metadata_response", b"get_device_metadata_response", "get_module_config_request", b"get_module_config_request", "get_module_config_response", b"get_module_config_response", "get_node_remote_hardware_pins_request", b"get_node_remote_hardware_pins_request", "get_node_remote_hardware_pins_response", b"get_node_remote_hardware_pins_response", "get_owner_request", b"get_owner_request", "get_owner_response", b"get_owner_response", "get_ringtone_request", b"get_ringtone_request", "get_ringtone_response", b"get_ringtone_response", "nodedb_reset", b"nodedb_reset", "payload_variant", b"payload_variant", "reboot_ota_seconds", b"reboot_ota_seconds", "reboot_seconds", b"reboot_seconds", "remove_by_nodenum", b"remove_by_nodenum", "remove_favorite_node", b"remove_favorite_node", "remove_fixed_position", b"remove_fixed_position", "set_canned_message_module_messages", b"set_canned_message_module_messages", "set_channel", b"set_channel", "set_config", b"set_config", "set_favorite_node", b"set_favorite_node", "set_fixed_position", b"set_fixed_position", "set_ham_mode", b"set_ham_mode", "set_module_config", b"set_module_config", "set_owner", b"set_owner", "set_ringtone_message", b"set_ringtone_message", "shutdown_seconds", b"shutdown_seconds"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["begin_edit_settings", b"begin_edit_settings", "commit_edit_settings", b"commit_edit_settings", "delete_file_request", b"delete_file_request", "enter_dfu_mode_request", b"enter_dfu_mode_request", "exit_simulator", b"exit_simulator", "factory_reset", b"factory_reset", "get_canned_message_module_messages_request", b"get_canned_message_module_messages_request", "get_canned_message_module_messages_response", b"get_canned_message_module_messages_response", "get_channel_request", b"get_channel_request", "get_channel_response", b"get_channel_response", "get_config_request", b"get_config_request", "get_config_response", b"get_config_response", "get_device_connection_status_request", b"get_device_connection_status_request", "get_device_connection_status_response", b"get_device_connection_status_response", "get_device_metadata_request", b"get_device_metadata_request", "get_device_metadata_response", b"get_device_metadata_response", "get_module_config_request", b"get_module_config_request", "get_module_config_response", b"get_module_config_response", "get_node_remote_hardware_pins_request", b"get_node_remote_hardware_pins_request", "get_node_remote_hardware_pins_response", b"get_node_remote_hardware_pins_response", "get_owner_request", b"get_owner_request", "get_owner_response", b"get_owner_response", "get_ringtone_request", b"get_ringtone_request", "get_ringtone_response", b"get_ringtone_response", "nodedb_reset", b"nodedb_reset", "payload_variant", b"payload_variant", "reboot_ota_seconds", b"reboot_ota_seconds", "reboot_seconds", b"reboot_seconds", "remove_by_nodenum", b"remove_by_nodenum", "remove_favorite_node", b"remove_favorite_node", "remove_fixed_position", b"remove_fixed_position", "set_canned_message_module_messages", b"set_canned_message_module_messages", "set_channel", b"set_channel", "set_config", b"set_config", "set_favorite_node", b"set_favorite_node", "set_fixed_position", b"set_fixed_position", "set_ham_mode", b"set_ham_mode", "set_module_config", b"set_module_config", "set_owner", b"set_owner", "set_ringtone_message", b"set_ringtone_message", "shutdown_seconds", b"shutdown_seconds"]) -> None: ...
-    def WhichOneof(self, oneof_group: typing_extensions.Literal["payload_variant", b"payload_variant"]) -> typing_extensions.Literal["get_channel_request", "get_channel_response", "get_owner_request", "get_owner_response", "get_config_request", "get_config_response", "get_module_config_request", "get_module_config_response", "get_canned_message_module_messages_request", "get_canned_message_module_messages_response", "get_device_metadata_request", "get_device_metadata_response", "get_ringtone_request", "get_ringtone_response", "get_device_connection_status_request", "get_device_connection_status_response", "set_ham_mode", "get_node_remote_hardware_pins_request", "get_node_remote_hardware_pins_response", "enter_dfu_mode_request", "delete_file_request", "set_owner", "set_channel", "set_config", "set_module_config", "set_canned_message_module_messages", "set_ringtone_message", "remove_by_nodenum", "set_favorite_node", "remove_favorite_node", "set_fixed_position", "remove_fixed_position", "begin_edit_settings", "commit_edit_settings", "reboot_ota_seconds", "exit_simulator", "reboot_seconds", "shutdown_seconds", "factory_reset", "nodedb_reset"] | None: ...
-
-global___AdminMessage = AdminMessage
-
-@typing_extensions.final
-class HamParameters(google.protobuf.message.Message):
-    """
-    Parameters for setting up Meshtastic for ameteur radio usage
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    CALL_SIGN_FIELD_NUMBER: builtins.int
-    TX_POWER_FIELD_NUMBER: builtins.int
-    FREQUENCY_FIELD_NUMBER: builtins.int
-    SHORT_NAME_FIELD_NUMBER: builtins.int
-    call_sign: builtins.str
-    """
-    Amateur radio call sign, eg. KD2ABC
-    """
-    tx_power: builtins.int
-    """
-    Transmit power in dBm at the LoRA transceiver, not including any amplification
-    """
-    frequency: builtins.float
-    """
-    The selected frequency of LoRA operation
-    Please respect your local laws, regulations, and band plans.
-    Ensure your radio is capable of operating of the selected frequency before setting this.
-    """
-    short_name: builtins.str
-    """
-    Optional short name of user
-    """
-    def __init__(
-        self,
-        *,
-        call_sign: builtins.str = ...,
-        tx_power: builtins.int = ...,
-        frequency: builtins.float = ...,
-        short_name: builtins.str = ...,
-    ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["call_sign", b"call_sign", "frequency", b"frequency", "short_name", b"short_name", "tx_power", b"tx_power"]) -> None: ...
-
-global___HamParameters = HamParameters
-
-@typing_extensions.final
-class NodeRemoteHardwarePinsResponse(google.protobuf.message.Message):
-    """
-    Response envelope for node_remote_hardware_pins
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    NODE_REMOTE_HARDWARE_PINS_FIELD_NUMBER: builtins.int
-    @property
-    def node_remote_hardware_pins(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[meshtastic.mesh_pb2.NodeRemoteHardwarePin]:
-        """
-        Nodes and their respective remote hardware GPIO pins
-        """
-    def __init__(
-        self,
-        *,
-        node_remote_hardware_pins: collections.abc.Iterable[meshtastic.mesh_pb2.NodeRemoteHardwarePin] | None = ...,
-    ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["node_remote_hardware_pins", b"node_remote_hardware_pins"]) -> None: ...
-
-global___NodeRemoteHardwarePinsResponse = NodeRemoteHardwarePinsResponse

meshtastic/apponly_pb2.py

@@ -1,28 +1,72 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: meshtastic/apponly.proto
+# source: apponly.proto
-"""Generated protocol buffer code."""
+
-from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
-from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import message as _message
+from google.protobuf import reflection as _reflection
 from google.protobuf import symbol_database as _symbol_database
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
 
 
-from meshtastic import channel_pb2 as meshtastic_dot_channel__pb2
+from . import channel_pb2 as channel__pb2
-from meshtastic import config_pb2 as meshtastic_dot_config__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x18meshtastic/apponly.proto\x12\nmeshtastic\x1a\x18meshtastic/channel.proto\x1a\x17meshtastic/config.proto\"o\n\nChannelSet\x12-\n\x08settings\x18\x01 \x03(\x0b\x32\x1b.meshtastic.ChannelSettings\x12\x32\n\x0blora_config\x18\x02 \x01(\x0b\x32\x1d.meshtastic.Config.LoRaConfigBb\n\x13\x63om.geeksville.meshB\rAppOnlyProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor.FileDescriptor(
+  name='apponly.proto',
+  package='',
+  syntax='proto3',
+  serialized_options=b'\n\023com.geeksville.meshB\rAppOnlyProtosH\003Z!github.com/meshtastic/gomeshproto',
+  serialized_pb=b'\n\rapponly.proto\x1a\rchannel.proto\"0\n\nChannelSet\x12\"\n\x08settings\x18\x01 \x03(\x0b\x32\x10.ChannelSettingsBI\n\x13\x63om.geeksville.meshB\rAppOnlyProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3'
+  ,
+  dependencies=[channel__pb2.DESCRIPTOR,])
 
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.apponly_pb2', globals())
-if _descriptor._USE_C_DESCRIPTORS == False:
 
-  DESCRIPTOR._options = None
+
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\rAppOnlyProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+
-  _CHANNELSET._serialized_start=91
+_CHANNELSET = _descriptor.Descriptor(
-  _CHANNELSET._serialized_end=202
+  name='ChannelSet',
+  full_name='ChannelSet',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='settings', full_name='ChannelSet.settings', index=0,
+      number=1, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=32,
+  serialized_end=80,
+)
+
+_CHANNELSET.fields_by_name['settings'].message_type = channel__pb2._CHANNELSETTINGS
+DESCRIPTOR.message_types_by_name['ChannelSet'] = _CHANNELSET
+_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+
+ChannelSet = _reflection.GeneratedProtocolMessageType('ChannelSet', (_message.Message,), {
+  'DESCRIPTOR' : _CHANNELSET,
+  '__module__' : 'apponly_pb2'
+  # @@protoc_insertion_point(class_scope:ChannelSet)
+  })
+_sym_db.RegisterMessage(ChannelSet)
+
+
+DESCRIPTOR._options = None
 # @@protoc_insertion_point(module_scope)

meshtastic/apponly_pb2.pyi

@@ -1,54 +0,0 @@
-"""
-@generated by mypy-protobuf.  Do not edit manually!
-isort:skip_file
-"""
-import builtins
-import collections.abc
-import google.protobuf.descriptor
-import google.protobuf.internal.containers
-import google.protobuf.message
-import meshtastic.channel_pb2
-import meshtastic.config_pb2
-import sys
-
-if sys.version_info >= (3, 8):
-    import typing as typing_extensions
-else:
-    import typing_extensions
-
-DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
-
-@typing_extensions.final
-class ChannelSet(google.protobuf.message.Message):
-    """
-    This is the most compact possible representation for a set of channels.
-    It includes only one PRIMARY channel (which must be first) and
-    any SECONDARY channels.
-    No DISABLED channels are included.
-    This abstraction is used only on the the 'app side' of the world (ie python, javascript and android etc) to show a group of Channels as a (long) URL
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    SETTINGS_FIELD_NUMBER: builtins.int
-    LORA_CONFIG_FIELD_NUMBER: builtins.int
-    @property
-    def settings(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[meshtastic.channel_pb2.ChannelSettings]:
-        """
-        Channel list with settings
-        """
-    @property
-    def lora_config(self) -> meshtastic.config_pb2.Config.LoRaConfig:
-        """
-        LoRa config
-        """
-    def __init__(
-        self,
-        *,
-        settings: collections.abc.Iterable[meshtastic.channel_pb2.ChannelSettings] | None = ...,
-        lora_config: meshtastic.config_pb2.Config.LoRaConfig | None = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing_extensions.Literal["lora_config", b"lora_config"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["lora_config", b"lora_config", "settings", b"settings"]) -> None: ...
-
-global___ChannelSet = ChannelSet

meshtastic/atak_pb2.py

@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: meshtastic/atak.proto
-"""Generated protocol buffer code."""
-from google.protobuf.internal import builder as _builder
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import descriptor_pool as _descriptor_pool
-from google.protobuf import symbol_database as _symbol_database
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-
-
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x15meshtastic/atak.proto\x12\nmeshtastic\"\xe6\x01\n\tTAKPacket\x12\x15\n\ris_compressed\x18\x01 \x01(\x08\x12$\n\x07\x63ontact\x18\x02 \x01(\x0b\x32\x13.meshtastic.Contact\x12 \n\x05group\x18\x03 \x01(\x0b\x32\x11.meshtastic.Group\x12\"\n\x06status\x18\x04 \x01(\x0b\x32\x12.meshtastic.Status\x12\x1e\n\x03pli\x18\x05 \x01(\x0b\x32\x0f.meshtastic.PLIH\x00\x12#\n\x04\x63hat\x18\x06 \x01(\x0b\x32\x13.meshtastic.GeoChatH\x00\x42\x11\n\x0fpayload_variant\"2\n\x07GeoChat\x12\x0f\n\x07message\x18\x01 \x01(\t\x12\x0f\n\x02to\x18\x02 \x01(\tH\x00\x88\x01\x01\x42\x05\n\x03_to\"M\n\x05Group\x12$\n\x04role\x18\x01 \x01(\x0e\x32\x16.meshtastic.MemberRole\x12\x1e\n\x04team\x18\x02 \x01(\x0e\x32\x10.meshtastic.Team\"\x19\n\x06Status\x12\x0f\n\x07\x62\x61ttery\x18\x01 \x01(\r\"4\n\x07\x43ontact\x12\x10\n\x08\x63\x61llsign\x18\x01 \x01(\t\x12\x17\n\x0f\x64\x65vice_callsign\x18\x02 \x01(\t\"_\n\x03PLI\x12\x12\n\nlatitude_i\x18\x01 \x01(\x0f\x12\x13\n\x0blongitude_i\x18\x02 \x01(\x0f\x12\x10\n\x08\x61ltitude\x18\x03 \x01(\x05\x12\r\n\x05speed\x18\x04 \x01(\r\x12\x0e\n\x06\x63ourse\x18\x05 \x01(\r*\xc0\x01\n\x04Team\x12\x14\n\x10Unspecifed_Color\x10\x00\x12\t\n\x05White\x10\x01\x12\n\n\x06Yellow\x10\x02\x12\n\n\x06Orange\x10\x03\x12\x0b\n\x07Magenta\x10\x04\x12\x07\n\x03Red\x10\x05\x12\n\n\x06Maroon\x10\x06\x12\n\n\x06Purple\x10\x07\x12\r\n\tDark_Blue\x10\x08\x12\x08\n\x04\x42lue\x10\t\x12\x08\n\x04\x43yan\x10\n\x12\x08\n\x04Teal\x10\x0b\x12\t\n\x05Green\x10\x0c\x12\x0e\n\nDark_Green\x10\r\x12\t\n\x05\x42rown\x10\x0e*\x7f\n\nMemberRole\x12\x0e\n\nUnspecifed\x10\x00\x12\x0e\n\nTeamMember\x10\x01\x12\x0c\n\x08TeamLead\x10\x02\x12\x06\n\x02HQ\x10\x03\x12\n\n\x06Sniper\x10\x04\x12\t\n\x05Medic\x10\x05\x12\x13\n\x0f\x46orwardObserver\x10\x06\x12\x07\n\x03RTO\x10\x07\x12\x06\n\x02K9\x10\x08\x42_\n\x13\x63om.geeksville.meshB\nATAKProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
-
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.atak_pb2', globals())
-if _descriptor._USE_C_DESCRIPTORS == False:
-
-  DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\nATAKProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
-  _TEAM._serialized_start=580
-  _TEAM._serialized_end=772
-  _MEMBERROLE._serialized_start=774
-  _MEMBERROLE._serialized_end=901
-  _TAKPACKET._serialized_start=38
-  _TAKPACKET._serialized_end=268
-  _GEOCHAT._serialized_start=270
-  _GEOCHAT._serialized_end=320
-  _GROUP._serialized_start=322
-  _GROUP._serialized_end=399
-  _STATUS._serialized_start=401
-  _STATUS._serialized_end=426
-  _CONTACT._serialized_start=428
-  _CONTACT._serialized_end=480
-  _PLI._serialized_start=482
-  _PLI._serialized_end=577
-# @@protoc_insertion_point(module_scope)

meshtastic/atak_pb2.pyi

@@ -1,455 +0,0 @@
-"""
-@generated by mypy-protobuf.  Do not edit manually!
-isort:skip_file
-"""
-import builtins
-import google.protobuf.descriptor
-import google.protobuf.internal.enum_type_wrapper
-import google.protobuf.message
-import sys
-import typing
-
-if sys.version_info >= (3, 10):
-    import typing as typing_extensions
-else:
-    import typing_extensions
-
-DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
-
-class _Team:
-    ValueType = typing.NewType("ValueType", builtins.int)
-    V: typing_extensions.TypeAlias = ValueType
-
-class _TeamEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[_Team.ValueType], builtins.type):
-    DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
-    Unspecifed_Color: _Team.ValueType  # 0
-    """
-    Unspecifed
-    """
-    White: _Team.ValueType  # 1
-    """
-    White
-    """
-    Yellow: _Team.ValueType  # 2
-    """
-    Yellow
-    """
-    Orange: _Team.ValueType  # 3
-    """
-    Orange
-    """
-    Magenta: _Team.ValueType  # 4
-    """
-    Magenta
-    """
-    Red: _Team.ValueType  # 5
-    """
-    Red
-    """
-    Maroon: _Team.ValueType  # 6
-    """
-    Maroon
-    """
-    Purple: _Team.ValueType  # 7
-    """
-    Purple
-    """
-    Dark_Blue: _Team.ValueType  # 8
-    """
-    Dark Blue
-    """
-    Blue: _Team.ValueType  # 9
-    """
-    Blue
-    """
-    Cyan: _Team.ValueType  # 10
-    """
-    Cyan
-    """
-    Teal: _Team.ValueType  # 11
-    """
-    Teal
-    """
-    Green: _Team.ValueType  # 12
-    """
-    Green
-    """
-    Dark_Green: _Team.ValueType  # 13
-    """
-    Dark Green
-    """
-    Brown: _Team.ValueType  # 14
-    """
-    Brown
-    """
-
-class Team(_Team, metaclass=_TeamEnumTypeWrapper): ...
-
-Unspecifed_Color: Team.ValueType  # 0
-"""
-Unspecifed
-"""
-White: Team.ValueType  # 1
-"""
-White
-"""
-Yellow: Team.ValueType  # 2
-"""
-Yellow
-"""
-Orange: Team.ValueType  # 3
-"""
-Orange
-"""
-Magenta: Team.ValueType  # 4
-"""
-Magenta
-"""
-Red: Team.ValueType  # 5
-"""
-Red
-"""
-Maroon: Team.ValueType  # 6
-"""
-Maroon
-"""
-Purple: Team.ValueType  # 7
-"""
-Purple
-"""
-Dark_Blue: Team.ValueType  # 8
-"""
-Dark Blue
-"""
-Blue: Team.ValueType  # 9
-"""
-Blue
-"""
-Cyan: Team.ValueType  # 10
-"""
-Cyan
-"""
-Teal: Team.ValueType  # 11
-"""
-Teal
-"""
-Green: Team.ValueType  # 12
-"""
-Green
-"""
-Dark_Green: Team.ValueType  # 13
-"""
-Dark Green
-"""
-Brown: Team.ValueType  # 14
-"""
-Brown
-"""
-global___Team = Team
-
-class _MemberRole:
-    ValueType = typing.NewType("ValueType", builtins.int)
-    V: typing_extensions.TypeAlias = ValueType
-
-class _MemberRoleEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[_MemberRole.ValueType], builtins.type):
-    DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
-    Unspecifed: _MemberRole.ValueType  # 0
-    """
-    Unspecifed
-    """
-    TeamMember: _MemberRole.ValueType  # 1
-    """
-    Team Member
-    """
-    TeamLead: _MemberRole.ValueType  # 2
-    """
-    Team Lead
-    """
-    HQ: _MemberRole.ValueType  # 3
-    """
-    Headquarters
-    """
-    Sniper: _MemberRole.ValueType  # 4
-    """
-    Airsoft enthusiast
-    """
-    Medic: _MemberRole.ValueType  # 5
-    """
-    Medic
-    """
-    ForwardObserver: _MemberRole.ValueType  # 6
-    """
-    ForwardObserver
-    """
-    RTO: _MemberRole.ValueType  # 7
-    """
-    Radio Telephone Operator
-    """
-    K9: _MemberRole.ValueType  # 8
-    """
-    Doggo
-    """
-
-class MemberRole(_MemberRole, metaclass=_MemberRoleEnumTypeWrapper):
-    """
-    Role of the group member
-    """
-
-Unspecifed: MemberRole.ValueType  # 0
-"""
-Unspecifed
-"""
-TeamMember: MemberRole.ValueType  # 1
-"""
-Team Member
-"""
-TeamLead: MemberRole.ValueType  # 2
-"""
-Team Lead
-"""
-HQ: MemberRole.ValueType  # 3
-"""
-Headquarters
-"""
-Sniper: MemberRole.ValueType  # 4
-"""
-Airsoft enthusiast
-"""
-Medic: MemberRole.ValueType  # 5
-"""
-Medic
-"""
-ForwardObserver: MemberRole.ValueType  # 6
-"""
-ForwardObserver
-"""
-RTO: MemberRole.ValueType  # 7
-"""
-Radio Telephone Operator
-"""
-K9: MemberRole.ValueType  # 8
-"""
-Doggo
-"""
-global___MemberRole = MemberRole
-
-@typing_extensions.final
-class TAKPacket(google.protobuf.message.Message):
-    """
-    Packets for the official ATAK Plugin
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    IS_COMPRESSED_FIELD_NUMBER: builtins.int
-    CONTACT_FIELD_NUMBER: builtins.int
-    GROUP_FIELD_NUMBER: builtins.int
-    STATUS_FIELD_NUMBER: builtins.int
-    PLI_FIELD_NUMBER: builtins.int
-    CHAT_FIELD_NUMBER: builtins.int
-    is_compressed: builtins.bool
-    """
-    Are the payloads strings compressed for LoRA transport?
-    """
-    @property
-    def contact(self) -> global___Contact:
-        """
-        The contact / callsign for ATAK user
-        """
-    @property
-    def group(self) -> global___Group:
-        """
-        The group for ATAK user
-        """
-    @property
-    def status(self) -> global___Status:
-        """
-        The status of the ATAK EUD
-        """
-    @property
-    def pli(self) -> global___PLI:
-        """
-        TAK position report
-        """
-    @property
-    def chat(self) -> global___GeoChat:
-        """
-        ATAK GeoChat message
-        """
-    def __init__(
-        self,
-        *,
-        is_compressed: builtins.bool = ...,
-        contact: global___Contact | None = ...,
-        group: global___Group | None = ...,
-        status: global___Status | None = ...,
-        pli: global___PLI | None = ...,
-        chat: global___GeoChat | None = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing_extensions.Literal["chat", b"chat", "contact", b"contact", "group", b"group", "payload_variant", b"payload_variant", "pli", b"pli", "status", b"status"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["chat", b"chat", "contact", b"contact", "group", b"group", "is_compressed", b"is_compressed", "payload_variant", b"payload_variant", "pli", b"pli", "status", b"status"]) -> None: ...
-    def WhichOneof(self, oneof_group: typing_extensions.Literal["payload_variant", b"payload_variant"]) -> typing_extensions.Literal["pli", "chat"] | None: ...
-
-global___TAKPacket = TAKPacket
-
-@typing_extensions.final
-class GeoChat(google.protobuf.message.Message):
-    """
-    ATAK GeoChat message
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    MESSAGE_FIELD_NUMBER: builtins.int
-    TO_FIELD_NUMBER: builtins.int
-    message: builtins.str
-    """
-    The text message
-    """
-    to: builtins.str
-    """
-    Uid recipient of the message
-    """
-    def __init__(
-        self,
-        *,
-        message: builtins.str = ...,
-        to: builtins.str | None = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing_extensions.Literal["_to", b"_to", "to", b"to"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["_to", b"_to", "message", b"message", "to", b"to"]) -> None: ...
-    def WhichOneof(self, oneof_group: typing_extensions.Literal["_to", b"_to"]) -> typing_extensions.Literal["to"] | None: ...
-
-global___GeoChat = GeoChat
-
-@typing_extensions.final
-class Group(google.protobuf.message.Message):
-    """
-    ATAK Group
-    <__group role='Team Member' name='Cyan'/>
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    ROLE_FIELD_NUMBER: builtins.int
-    TEAM_FIELD_NUMBER: builtins.int
-    role: global___MemberRole.ValueType
-    """
-    Role of the group member
-    """
-    team: global___Team.ValueType
-    """
-    Team (color)
-    Default Cyan
-    """
-    def __init__(
-        self,
-        *,
-        role: global___MemberRole.ValueType = ...,
-        team: global___Team.ValueType = ...,
-    ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["role", b"role", "team", b"team"]) -> None: ...
-
-global___Group = Group
-
-@typing_extensions.final
-class Status(google.protobuf.message.Message):
-    """
-    ATAK EUD Status
-    <status battery='100' />
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    BATTERY_FIELD_NUMBER: builtins.int
-    battery: builtins.int
-    """
-    Battery level
-    """
-    def __init__(
-        self,
-        *,
-        battery: builtins.int = ...,
-    ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["battery", b"battery"]) -> None: ...
-
-global___Status = Status
-
-@typing_extensions.final
-class Contact(google.protobuf.message.Message):
-    """
-    ATAK Contact
-    <contact endpoint='0.0.0.0:4242:tcp' phone='+12345678' callsign='FALKE'/>
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    CALLSIGN_FIELD_NUMBER: builtins.int
-    DEVICE_CALLSIGN_FIELD_NUMBER: builtins.int
-    callsign: builtins.str
-    """
-    Callsign
-    """
-    device_callsign: builtins.str
-    """
-    Device callsign
-
-    IP address of endpoint in integer form (0.0.0.0 default)
-    """
-    def __init__(
-        self,
-        *,
-        callsign: builtins.str = ...,
-        device_callsign: builtins.str = ...,
-    ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["callsign", b"callsign", "device_callsign", b"device_callsign"]) -> None: ...
-
-global___Contact = Contact
-
-@typing_extensions.final
-class PLI(google.protobuf.message.Message):
-    """
-    Position Location Information from ATAK
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    LATITUDE_I_FIELD_NUMBER: builtins.int
-    LONGITUDE_I_FIELD_NUMBER: builtins.int
-    ALTITUDE_FIELD_NUMBER: builtins.int
-    SPEED_FIELD_NUMBER: builtins.int
-    COURSE_FIELD_NUMBER: builtins.int
-    latitude_i: builtins.int
-    """
-    The new preferred location encoding, multiply by 1e-7 to get degrees
-    in floating point
-    """
-    longitude_i: builtins.int
-    """
-    The new preferred location encoding, multiply by 1e-7 to get degrees
-    in floating point
-    """
-    altitude: builtins.int
-    """
-    Altitude (ATAK prefers HAE)
-    """
-    speed: builtins.int
-    """
-    Speed
-    """
-    course: builtins.int
-    """
-    Course in degrees
-    """
-    def __init__(
-        self,
-        *,
-        latitude_i: builtins.int = ...,
-        longitude_i: builtins.int = ...,
-        altitude: builtins.int = ...,
-        speed: builtins.int = ...,
-        course: builtins.int = ...,
-    ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["altitude", b"altitude", "course", b"course", "latitude_i", b"latitude_i", "longitude_i", b"longitude_i", "speed", b"speed"]) -> None: ...
-
-global___PLI = PLI

meshtastic/ble_interface.py

@@ -1,236 +1,67 @@
 """Bluetooth interface
 """
 import logging
-import time
+import platform
-import struct
-import asyncio
-from threading import Thread, Event
-from bleak import BleakScanner, BleakClient
 
 from meshtastic.mesh_interface import MeshInterface
 from meshtastic.util import our_exit
 
-SERVICE_UUID = "6ba1b218-15a8-461f-9fa8-5dcae273eafd"
+if platform.system() == 'Linux':
+    # pylint: disable=E0401
+    import pygatt
+
+
+
+# Our standard BLE characteristics
 TORADIO_UUID = "f75c76d2-129e-4dad-a1dd-7866124401e7"
-FROMRADIO_UUID = "2c55e69e-4993-11ed-b878-0242ac120002"
+FROMRADIO_UUID = "8ba2bcc2-ee02-4a55-a531-c525c5e454d5"
 FROMNUM_UUID = "ed9da18c-a800-4f66-a670-aa7547e34453"
 
 
 class BLEInterface(MeshInterface):
-    """MeshInterface using BLE to connect to devices"""
+    """A not quite ready - FIXME - BLE interface to devices"""
-    class BLEError(Exception):
-        """An exception class for BLE errors"""
-        def __init__(self, message):
-            self.message = message
-            super().__init__(self.message)
 
-    class BLEState(): # pylint: disable=C0115
+    def __init__(self, address, noProto=False, debugOut=None):
-        THREADS = False
+        if platform.system() != 'Linux':
-        BLE = False
+            our_exit("Linux is the only platform with experimental BLE support.", 1)
-        MESH = False
+        self.address = address
+        if not noProto:
+            self.adapter = pygatt.GATTToolBackend()  # BGAPIBackend()
+            self.adapter.start()
+            logging.debug(f"Connecting to {self.address}")
+            self.device = self.adapter.connect(address)
+        else:
+            self.adapter = None
+            self.device = None
+        logging.debug("Connected to device")
+        # fromradio = self.device.char_read(FROMRADIO_UUID)
+        MeshInterface.__init__(self, debugOut=debugOut, noProto=noProto)
 
+        self._readFromRadio()  # read the initial responses
 
-    def __init__(self, address, noProto = False, debugOut = None):
+        def handle_data(handle, data): # pylint: disable=W0613
-        self.state = BLEInterface.BLEState()
+            self._handleFromRadio(data)
 
-        if not address:
+        if self.device:
-            return
+            self.device.subscribe(FROMNUM_UUID, callback=handle_data)
-
-        self.should_read = False
-
-        logging.debug("Threads starting")
-        self._receiveThread = Thread(target = self._receiveFromRadioImpl)
-        self._receiveThread_started = Event()
-        self._receiveThread_stopped = Event()
-        self._receiveThread.start()
-        self._receiveThread_started.wait(1)
-        self.state.THREADS = True
-        logging.debug("Threads running")
-
-        try:
-            logging.debug(f"BLE connecting to: {address}")
-            self.client = self.connect(address)
-            self.state.BLE = True
-            logging.debug("BLE connected")
-        except BLEInterface.BLEError as e:
-            self.close()
-            our_exit(e.message, 1)
-            return
-
-        logging.debug("Mesh init starting")
-        MeshInterface.__init__(self, debugOut = debugOut, noProto = noProto)
-        self._startConfig()
-        if not self.noProto:
-            self._waitConnected(timeout = 60.0)
-            self.waitForConfig()
-        self.state.MESH = True
-        logging.debug("Mesh init finished")
-
-        logging.debug("Register FROMNUM notify callback")
-        self.client.start_notify(FROMNUM_UUID, self.from_num_handler)
-
-
-    async def from_num_handler(self, _, b): # pylint: disable=C0116
-        from_num = struct.unpack('<I', bytes(b))[0]
-        logging.debug(f"FROMNUM notify: {from_num}")
-        self.should_read = True
-
-
-    def scan(self):
-        "Scan for available BLE devices"
-        with BLEClient() as client:
-            return [
-                (x[0], x[1]) for x in (client.discover(
-                    return_adv = True,
-                    service_uuids = [ SERVICE_UUID ]
-                )).values()
-            ]
-
-
-    def find_device(self, address):
-        "Find a device by address"
-        meshtastic_devices = self.scan()
-
-        addressed_devices = list(filter(lambda x: address in (x[1].local_name, x[0].name), meshtastic_devices))
-        # If nothing is found try on the address
-        if len(addressed_devices) == 0:
-            addressed_devices = list(filter(
-                lambda x: BLEInterface._sanitize_address(address) == BLEInterface._sanitize_address(x[0].address),
-                meshtastic_devices))
-
-        if len(addressed_devices) == 0:
-            raise BLEInterface.BLEError(f"No Meshtastic BLE peripheral with identifier or address '{address}' found. Try --ble-scan to find it.")
-        if len(addressed_devices) > 1:
-            raise BLEInterface.BLEError(f"More than one Meshtastic BLE peripheral with identifier or address '{address}' found.")
-        return addressed_devices[0][0]
-
-    def _sanitize_address(address): # pylint: disable=E0213
-        "Standardize BLE address by removing extraneous characters and lowercasing"
-        return address \
-            .replace("-", "") \
-            .replace("_", "") \
-            .replace(":", "") \
-            .lower()
-
-    def connect(self, address):
-        "Connect to a device by address"
-        device = self.find_device(address)
-        client = BLEClient(device.address)
-        client.connect()
-        try:
-            client.pair()
-        except NotImplementedError:
-            # Some bluetooth backends do not require explicit pairing.
-            # See Bleak docs for details on this.
-            pass
-        return client
-
-
-    def _receiveFromRadioImpl(self):
-        self._receiveThread_started.set()
-        while self._receiveThread_started.is_set():
-            if self.should_read:
-                self.should_read = False
-                retries = 0
-                while True:
-                    b = bytes(self.client.read_gatt_char(FROMRADIO_UUID))
-                    if not b:
-                        if retries < 5:
-                            time.sleep(0.1)
-                            retries += 1
-                            continue
-                        break
-                    logging.debug(f"FROMRADIO read: {b.hex()}")
-                    self._handleFromRadio(b)
-            else:
-                time.sleep(0.1)
-        self._receiveThread_stopped.set()
 
     def _sendToRadioImpl(self, toRadio):
+        """Send a ToRadio protobuf to the device"""
+        #logging.debug(f"Sending: {stripnl(toRadio)}")
         b = toRadio.SerializeToString()
-        if b:
+        self.device.char_write(TORADIO_UUID, b)
-            logging.debug(f"TORADIO write: {b.hex()}")
-            self.client.write_gatt_char(TORADIO_UUID, b, response = True)
-            # Allow to propagate and then make sure we read
-            time.sleep(0.1)
-            self.should_read = True
-
 
     def close(self):
-        if self.state.MESH:
+        MeshInterface.close(self)
-            MeshInterface.close(self)
+        if self.adapter:
+            self.adapter.stop()
 
-        if self.state.THREADS:
+    def _readFromRadio(self):
-            self._receiveThread_started.clear()
+        if not self.noProto:
-            self._receiveThread_stopped.wait(5)
+            wasEmpty = False
-
+            while not wasEmpty:
-        if self.state.BLE:
+                if self.device:
-            self.client.disconnect()
+                    b = self.device.char_read(FROMRADIO_UUID)
-            self.client.close()
+                    wasEmpty = len(b) == 0
-
+                    if not wasEmpty:
-
+                        self._handleFromRadio(b)
-class BLEClient():
-    """Client for managing connection to a BLE device"""
-    def __init__(self, address = None, **kwargs):
-        self._eventThread = Thread(target = self._run_event_loop)
-        self._eventThread_started = Event()
-        self._eventThread_stopped = Event()
-        self._eventThread.start()
-        self._eventThread_started.wait(1)
-
-        if not address:
-            logging.debug("No address provided - only discover method will work.")
-            return
-
-        self.bleak_client = BleakClient(address, **kwargs)
-
-
-    def discover(self, **kwargs): # pylint: disable=C0116
-        return self.async_await(BleakScanner.discover(**kwargs))
-
-    def pair(self, **kwargs): # pylint: disable=C0116
-        return self.async_await(self.bleak_client.pair(**kwargs))
-
-    def connect(self, **kwargs): # pylint: disable=C0116
-        return self.async_await(self.bleak_client.connect(**kwargs))
-
-    def disconnect(self, **kwargs): # pylint: disable=C0116
-        self.async_await(self.bleak_client.disconnect(**kwargs))
-
-    def read_gatt_char(self, *args, **kwargs): # pylint: disable=C0116
-        return self.async_await(self.bleak_client.read_gatt_char(*args, **kwargs))
-
-    def write_gatt_char(self, *args, **kwargs): # pylint: disable=C0116
-        self.async_await(self.bleak_client.write_gatt_char(*args, **kwargs))
-
-    def start_notify(self, *args, **kwargs): # pylint: disable=C0116
-        self.async_await(self.bleak_client.start_notify(*args, **kwargs))
-
-    def close(self): # pylint: disable=C0116
-        self.async_run(self._stop_event_loop())
-        self._eventThread_stopped.wait(5)
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, _type, _value, _traceback):
-        self.close()
-
-    def async_await(self, coro, timeout = None): # pylint: disable=C0116
-        return self.async_run(coro).result(timeout)
-
-    def async_run(self, coro): # pylint: disable=C0116
-        return asyncio.run_coroutine_threadsafe(coro, self._eventLoop)
-
-    def _run_event_loop(self):
-        # I don't know if the event loop can be initialized in __init__ so silencing pylint
-        self._eventLoop = asyncio.new_event_loop() # pylint: disable=W0201
-        self._eventThread_started.set()
-        try:
-            self._eventLoop.run_forever()
-        finally:
-            self._eventLoop.close()
-        self._eventThread_stopped.set()
-
-    async def _stop_event_loop(self):
-        self._eventLoop.stop()

meshtastic/cannedmessages_pb2.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: meshtastic/cannedmessages.proto
+# source: cannedmessages.proto
-"""Generated protocol buffer code."""
+
-from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
-from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import message as _message
+from google.protobuf import reflection as _reflection
 from google.protobuf import symbol_database as _symbol_database
 # @@protoc_insertion_point(imports)
 
@@ -13,14 +13,78 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1fmeshtastic/cannedmessages.proto\x12\nmeshtastic\"-\n\x19\x43\x61nnedMessageModuleConfig\x12\x10\n\x08messages\x18\x01 \x01(\tBn\n\x13\x63om.geeksville.meshB\x19\x43\x61nnedMessageConfigProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor.FileDescriptor(
+  name='cannedmessages.proto',
+  package='',
+  syntax='proto3',
+  serialized_options=b'\n\023com.geeksville.meshB\031CannedMessageConfigProtosH\003Z!github.com/meshtastic/gomeshproto',
+  serialized_pb=b'\n\x14\x63\x61nnedmessages.proto\"w\n\x19\x43\x61nnedMessagePluginConfig\x12\x15\n\rmessagesPart1\x18\x0b \x01(\t\x12\x15\n\rmessagesPart2\x18\x0c \x01(\t\x12\x15\n\rmessagesPart3\x18\r \x01(\t\x12\x15\n\rmessagesPart4\x18\x0e \x01(\tBU\n\x13\x63om.geeksville.meshB\x19\x43\x61nnedMessageConfigProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3'
+)
 
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.cannedmessages_pb2', globals())
-if _descriptor._USE_C_DESCRIPTORS == False:
 
-  DESCRIPTOR._options = None
+
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\031CannedMessageConfigProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+
-  _CANNEDMESSAGEMODULECONFIG._serialized_start=47
+_CANNEDMESSAGEPLUGINCONFIG = _descriptor.Descriptor(
-  _CANNEDMESSAGEMODULECONFIG._serialized_end=92
+  name='CannedMessagePluginConfig',
+  full_name='CannedMessagePluginConfig',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='messagesPart1', full_name='CannedMessagePluginConfig.messagesPart1', index=0,
+      number=11, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=b"".decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='messagesPart2', full_name='CannedMessagePluginConfig.messagesPart2', index=1,
+      number=12, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=b"".decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='messagesPart3', full_name='CannedMessagePluginConfig.messagesPart3', index=2,
+      number=13, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=b"".decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='messagesPart4', full_name='CannedMessagePluginConfig.messagesPart4', index=3,
+      number=14, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=b"".decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=24,
+  serialized_end=143,
+)
+
+DESCRIPTOR.message_types_by_name['CannedMessagePluginConfig'] = _CANNEDMESSAGEPLUGINCONFIG
+_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+
+CannedMessagePluginConfig = _reflection.GeneratedProtocolMessageType('CannedMessagePluginConfig', (_message.Message,), {
+  'DESCRIPTOR' : _CANNEDMESSAGEPLUGINCONFIG,
+  '__module__' : 'cannedmessages_pb2'
+  # @@protoc_insertion_point(class_scope:CannedMessagePluginConfig)
+  })
+_sym_db.RegisterMessage(CannedMessagePluginConfig)
+
+
+DESCRIPTOR._options = None
 # @@protoc_insertion_point(module_scope)

meshtastic/cannedmessages_pb2.pyi

@@ -1,37 +0,0 @@
-"""
-@generated by mypy-protobuf.  Do not edit manually!
-isort:skip_file
-"""
-import builtins
-import google.protobuf.descriptor
-import google.protobuf.message
-import sys
-
-if sys.version_info >= (3, 8):
-    import typing as typing_extensions
-else:
-    import typing_extensions
-
-DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
-
-@typing_extensions.final
-class CannedMessageModuleConfig(google.protobuf.message.Message):
-    """
-    Canned message module configuration.
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    MESSAGES_FIELD_NUMBER: builtins.int
-    messages: builtins.str
-    """
-    Predefined messages for canned message module separated by '|' characters.
-    """
-    def __init__(
-        self,
-        *,
-        messages: builtins.str = ...,
-    ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["messages", b"messages"]) -> None: ...
-
-global___CannedMessageModuleConfig = CannedMessageModuleConfig

meshtastic/channel_pb2.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: meshtastic/channel.proto
+# source: channel.proto
-"""Generated protocol buffer code."""
+
-from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
-from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import message as _message
+from google.protobuf import reflection as _reflection
 from google.protobuf import symbol_database as _symbol_database
 # @@protoc_insertion_point(imports)
 
@@ -13,22 +13,251 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x18meshtastic/channel.proto\x12\nmeshtastic\"\xb8\x01\n\x0f\x43hannelSettings\x12\x17\n\x0b\x63hannel_num\x18\x01 \x01(\rB\x02\x18\x01\x12\x0b\n\x03psk\x18\x02 \x01(\x0c\x12\x0c\n\x04name\x18\x03 \x01(\t\x12\n\n\x02id\x18\x04 \x01(\x07\x12\x16\n\x0euplink_enabled\x18\x05 \x01(\x08\x12\x18\n\x10\x64ownlink_enabled\x18\x06 \x01(\x08\x12\x33\n\x0fmodule_settings\x18\x07 \x01(\x0b\x32\x1a.meshtastic.ModuleSettings\",\n\x0eModuleSettings\x12\x1a\n\x12position_precision\x18\x01 \x01(\r\"\xa1\x01\n\x07\x43hannel\x12\r\n\x05index\x18\x01 \x01(\x05\x12-\n\x08settings\x18\x02 \x01(\x0b\x32\x1b.meshtastic.ChannelSettings\x12&\n\x04role\x18\x03 \x01(\x0e\x32\x18.meshtastic.Channel.Role\"0\n\x04Role\x12\x0c\n\x08\x44ISABLED\x10\x00\x12\x0b\n\x07PRIMARY\x10\x01\x12\r\n\tSECONDARY\x10\x02\x42\x62\n\x13\x63om.geeksville.meshB\rChannelProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor.FileDescriptor(
+  name='channel.proto',
+  package='',
+  syntax='proto3',
+  serialized_options=b'\n\023com.geeksville.meshB\rChannelProtosH\003Z!github.com/meshtastic/gomeshproto',
+  serialized_pb=b'\n\rchannel.proto\"\x91\x03\n\x0f\x43hannelSettings\x12\x10\n\x08tx_power\x18\x01 \x01(\x05\x12\x32\n\x0cmodem_config\x18\x03 \x01(\x0e\x32\x1c.ChannelSettings.ModemConfig\x12\x11\n\tbandwidth\x18\x06 \x01(\r\x12\x15\n\rspread_factor\x18\x07 \x01(\r\x12\x13\n\x0b\x63oding_rate\x18\x08 \x01(\r\x12\x13\n\x0b\x63hannel_num\x18\t \x01(\r\x12\x0b\n\x03psk\x18\x04 \x01(\x0c\x12\x0c\n\x04name\x18\x05 \x01(\t\x12\n\n\x02id\x18\n \x01(\x07\x12\x16\n\x0euplink_enabled\x18\x10 \x01(\x08\x12\x18\n\x10\x64ownlink_enabled\x18\x11 \x01(\x08\"\x8a\x01\n\x0bModemConfig\x12\x12\n\x0e\x42w125Cr45Sf128\x10\x00\x12\x12\n\x0e\x42w500Cr45Sf128\x10\x01\x12\x14\n\x10\x42w31_25Cr48Sf512\x10\x02\x12\x13\n\x0f\x42w125Cr48Sf4096\x10\x03\x12\x13\n\x0f\x42w250Cr46Sf2048\x10\x04\x12\x13\n\x0f\x42w250Cr47Sf1024\x10\x05\"\x8b\x01\n\x07\x43hannel\x12\r\n\x05index\x18\x01 \x01(\x05\x12\"\n\x08settings\x18\x02 \x01(\x0b\x32\x10.ChannelSettings\x12\x1b\n\x04role\x18\x03 \x01(\x0e\x32\r.Channel.Role\"0\n\x04Role\x12\x0c\n\x08\x44ISABLED\x10\x00\x12\x0b\n\x07PRIMARY\x10\x01\x12\r\n\tSECONDARY\x10\x02\x42I\n\x13\x63om.geeksville.meshB\rChannelProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3'
+)
 
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.channel_pb2', globals())
-if _descriptor._USE_C_DESCRIPTORS == False:
 
-  DESCRIPTOR._options = None
+
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\rChannelProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+_CHANNELSETTINGS_MODEMCONFIG = _descriptor.EnumDescriptor(
-  _CHANNELSETTINGS.fields_by_name['channel_num']._options = None
+  name='ModemConfig',
-  _CHANNELSETTINGS.fields_by_name['channel_num']._serialized_options = b'\030\001'
+  full_name='ChannelSettings.ModemConfig',
-  _CHANNELSETTINGS._serialized_start=41
+  filename=None,
-  _CHANNELSETTINGS._serialized_end=225
+  file=DESCRIPTOR,
-  _MODULESETTINGS._serialized_start=227
+  values=[
-  _MODULESETTINGS._serialized_end=271
+    _descriptor.EnumValueDescriptor(
-  _CHANNEL._serialized_start=274
+      name='Bw125Cr45Sf128', index=0, number=0,
-  _CHANNEL._serialized_end=435
+      serialized_options=None,
-  _CHANNEL_ROLE._serialized_start=387
+      type=None),
-  _CHANNEL_ROLE._serialized_end=435
+    _descriptor.EnumValueDescriptor(
+      name='Bw500Cr45Sf128', index=1, number=1,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='Bw31_25Cr48Sf512', index=2, number=2,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='Bw125Cr48Sf4096', index=3, number=3,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='Bw250Cr46Sf2048', index=4, number=4,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='Bw250Cr47Sf1024', index=5, number=5,
+      serialized_options=None,
+      type=None),
+  ],
+  containing_type=None,
+  serialized_options=None,
+  serialized_start=281,
+  serialized_end=419,
+)
+_sym_db.RegisterEnumDescriptor(_CHANNELSETTINGS_MODEMCONFIG)
+
+_CHANNEL_ROLE = _descriptor.EnumDescriptor(
+  name='Role',
+  full_name='Channel.Role',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='DISABLED', index=0, number=0,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PRIMARY', index=1, number=1,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='SECONDARY', index=2, number=2,
+      serialized_options=None,
+      type=None),
+  ],
+  containing_type=None,
+  serialized_options=None,
+  serialized_start=513,
+  serialized_end=561,
+)
+_sym_db.RegisterEnumDescriptor(_CHANNEL_ROLE)
+
+
+_CHANNELSETTINGS = _descriptor.Descriptor(
+  name='ChannelSettings',
+  full_name='ChannelSettings',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='tx_power', full_name='ChannelSettings.tx_power', index=0,
+      number=1, type=5, cpp_type=1, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='modem_config', full_name='ChannelSettings.modem_config', index=1,
+      number=3, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='bandwidth', full_name='ChannelSettings.bandwidth', index=2,
+      number=6, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='spread_factor', full_name='ChannelSettings.spread_factor', index=3,
+      number=7, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='coding_rate', full_name='ChannelSettings.coding_rate', index=4,
+      number=8, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='channel_num', full_name='ChannelSettings.channel_num', index=5,
+      number=9, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='psk', full_name='ChannelSettings.psk', index=6,
+      number=4, type=12, cpp_type=9, label=1,
+      has_default_value=False, default_value=b"",
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='name', full_name='ChannelSettings.name', index=7,
+      number=5, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=b"".decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='id', full_name='ChannelSettings.id', index=8,
+      number=10, type=7, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='uplink_enabled', full_name='ChannelSettings.uplink_enabled', index=9,
+      number=16, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='downlink_enabled', full_name='ChannelSettings.downlink_enabled', index=10,
+      number=17, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+    _CHANNELSETTINGS_MODEMCONFIG,
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=18,
+  serialized_end=419,
+)
+
+
+_CHANNEL = _descriptor.Descriptor(
+  name='Channel',
+  full_name='Channel',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='index', full_name='Channel.index', index=0,
+      number=1, type=5, cpp_type=1, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='settings', full_name='Channel.settings', index=1,
+      number=2, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='role', full_name='Channel.role', index=2,
+      number=3, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+    _CHANNEL_ROLE,
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=422,
+  serialized_end=561,
+)
+
+_CHANNELSETTINGS.fields_by_name['modem_config'].enum_type = _CHANNELSETTINGS_MODEMCONFIG
+_CHANNELSETTINGS_MODEMCONFIG.containing_type = _CHANNELSETTINGS
+_CHANNEL.fields_by_name['settings'].message_type = _CHANNELSETTINGS
+_CHANNEL.fields_by_name['role'].enum_type = _CHANNEL_ROLE
+_CHANNEL_ROLE.containing_type = _CHANNEL
+DESCRIPTOR.message_types_by_name['ChannelSettings'] = _CHANNELSETTINGS
+DESCRIPTOR.message_types_by_name['Channel'] = _CHANNEL
+_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+
+ChannelSettings = _reflection.GeneratedProtocolMessageType('ChannelSettings', (_message.Message,), {
+  'DESCRIPTOR' : _CHANNELSETTINGS,
+  '__module__' : 'channel_pb2'
+  # @@protoc_insertion_point(class_scope:ChannelSettings)
+  })
+_sym_db.RegisterMessage(ChannelSettings)
+
+Channel = _reflection.GeneratedProtocolMessageType('Channel', (_message.Message,), {
+  'DESCRIPTOR' : _CHANNEL,
+  '__module__' : 'channel_pb2'
+  # @@protoc_insertion_point(class_scope:Channel)
+  })
+_sym_db.RegisterMessage(Channel)
+
+
+DESCRIPTOR._options = None
 # @@protoc_insertion_point(module_scope)

meshtastic/channel_pb2.pyi

@@ -1,224 +0,0 @@
-"""
-@generated by mypy-protobuf.  Do not edit manually!
-isort:skip_file
-"""
-import builtins
-import google.protobuf.descriptor
-import google.protobuf.internal.enum_type_wrapper
-import google.protobuf.message
-import sys
-import typing
-
-if sys.version_info >= (3, 10):
-    import typing as typing_extensions
-else:
-    import typing_extensions
-
-DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
-
-@typing_extensions.final
-class ChannelSettings(google.protobuf.message.Message):
-    """
-    This information can be encoded as a QRcode/url so that other users can configure
-    their radio to join the same channel.
-    A note about how channel names are shown to users: channelname-X
-    poundsymbol is a prefix used to indicate this is a channel name (idea from @professr).
-    Where X is a letter from A-Z (base 26) representing a hash of the PSK for this
-    channel - so that if the user changes anything about the channel (which does
-    force a new PSK) this letter will also change. Thus preventing user confusion if
-    two friends try to type in a channel name of "BobsChan" and then can't talk
-    because their PSKs will be different.
-    The PSK is hashed into this letter by "0x41 + [xor all bytes of the psk ] modulo 26"
-    This also allows the option of someday if people have the PSK off (zero), the
-    users COULD type in a channel name and be able to talk.
-    FIXME: Add description of multi-channel support and how primary vs secondary channels are used.
-    FIXME: explain how apps use channels for security.
-    explain how remote settings and remote gpio are managed as an example
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    CHANNEL_NUM_FIELD_NUMBER: builtins.int
-    PSK_FIELD_NUMBER: builtins.int
-    NAME_FIELD_NUMBER: builtins.int
-    ID_FIELD_NUMBER: builtins.int
-    UPLINK_ENABLED_FIELD_NUMBER: builtins.int
-    DOWNLINK_ENABLED_FIELD_NUMBER: builtins.int
-    MODULE_SETTINGS_FIELD_NUMBER: builtins.int
-    channel_num: builtins.int
-    """
-    Deprecated in favor of LoraConfig.channel_num
-    """
-    psk: builtins.bytes
-    """
-    A simple pre-shared key for now for crypto.
-    Must be either 0 bytes (no crypto), 16 bytes (AES128), or 32 bytes (AES256).
-    A special shorthand is used for 1 byte long psks.
-    These psks should be treated as only minimally secure,
-    because they are listed in this source code.
-    Those bytes are mapped using the following scheme:
-    `0` = No crypto
-    `1` = The special "default" channel key: {0xd4, 0xf1, 0xbb, 0x3a, 0x20, 0x29, 0x07, 0x59, 0xf0, 0xbc, 0xff, 0xab, 0xcf, 0x4e, 0x69, 0x01}
-    `2` through 10 = The default channel key, except with 1 through 9 added to the last byte.
-    Shown to user as simple1 through 10
-    """
-    name: builtins.str
-    """
-    A SHORT name that will be packed into the URL.
-    Less than 12 bytes.
-    Something for end users to call the channel
-    If this is the empty string it is assumed that this channel
-    is the special (minimally secure) "Default"channel.
-    In user interfaces it should be rendered as a local language translation of "X".
-    For channel_num hashing empty string will be treated as "X".
-    Where "X" is selected based on the English words listed above for ModemPreset
-    """
-    id: builtins.int
-    """
-    Used to construct a globally unique channel ID.
-    The full globally unique ID will be: "name.id" where ID is shown as base36.
-    Assuming that the number of meshtastic users is below 20K (true for a long time)
-    the chance of this 64 bit random number colliding with anyone else is super low.
-    And the penalty for collision is low as well, it just means that anyone trying to decrypt channel messages might need to
-    try multiple candidate channels.
-    Any time a non wire compatible change is made to a channel, this field should be regenerated.
-    There are a small number of 'special' globally known (and fairly) insecure standard channels.
-    Those channels do not have a numeric id included in the settings, but instead it is pulled from
-    a table of well known IDs.
-    (see Well Known Channels FIXME)
-    """
-    uplink_enabled: builtins.bool
-    """
-    If true, messages on the mesh will be sent to the *public* internet by any gateway ndoe
-    """
-    downlink_enabled: builtins.bool
-    """
-    If true, messages seen on the internet will be forwarded to the local mesh.
-    """
-    @property
-    def module_settings(self) -> global___ModuleSettings:
-        """
-        Per-channel module settings.
-        """
-    def __init__(
-        self,
-        *,
-        channel_num: builtins.int = ...,
-        psk: builtins.bytes = ...,
-        name: builtins.str = ...,
-        id: builtins.int = ...,
-        uplink_enabled: builtins.bool = ...,
-        downlink_enabled: builtins.bool = ...,
-        module_settings: global___ModuleSettings | None = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing_extensions.Literal["module_settings", b"module_settings"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["channel_num", b"channel_num", "downlink_enabled", b"downlink_enabled", "id", b"id", "module_settings", b"module_settings", "name", b"name", "psk", b"psk", "uplink_enabled", b"uplink_enabled"]) -> None: ...
-
-global___ChannelSettings = ChannelSettings
-
-@typing_extensions.final
-class ModuleSettings(google.protobuf.message.Message):
-    """
-    This message is specifically for modules to store per-channel configuration data.
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    POSITION_PRECISION_FIELD_NUMBER: builtins.int
-    position_precision: builtins.int
-    """
-    Bits of precision for the location sent in position packets.
-    """
-    def __init__(
-        self,
-        *,
-        position_precision: builtins.int = ...,
-    ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["position_precision", b"position_precision"]) -> None: ...
-
-global___ModuleSettings = ModuleSettings
-
-@typing_extensions.final
-class Channel(google.protobuf.message.Message):
-    """
-    A pair of a channel number, mode and the (sharable) settings for that channel
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    class _Role:
-        ValueType = typing.NewType("ValueType", builtins.int)
-        V: typing_extensions.TypeAlias = ValueType
-
-    class _RoleEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[Channel._Role.ValueType], builtins.type):
-        DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
-        DISABLED: Channel._Role.ValueType  # 0
-        """
-        This channel is not in use right now
-        """
-        PRIMARY: Channel._Role.ValueType  # 1
-        """
-        This channel is used to set the frequency for the radio - all other enabled channels must be SECONDARY
-        """
-        SECONDARY: Channel._Role.ValueType  # 2
-        """
-        Secondary channels are only used for encryption/decryption/authentication purposes.
-        Their radio settings (freq etc) are ignored, only psk is used.
-        """
-
-    class Role(_Role, metaclass=_RoleEnumTypeWrapper):
-        """
-        How this channel is being used (or not).
-        Note: this field is an enum to give us options for the future.
-        In particular, someday we might make a 'SCANNING' option.
-        SCANNING channels could have different frequencies and the radio would
-        occasionally check that freq to see if anything is being transmitted.
-        For devices that have multiple physical radios attached, we could keep multiple PRIMARY/SCANNING channels active at once to allow
-        cross band routing as needed.
-        If a device has only a single radio (the common case) only one channel can be PRIMARY at a time
-        (but any number of SECONDARY channels can't be sent received on that common frequency)
-        """
-
-    DISABLED: Channel.Role.ValueType  # 0
-    """
-    This channel is not in use right now
-    """
-    PRIMARY: Channel.Role.ValueType  # 1
-    """
-    This channel is used to set the frequency for the radio - all other enabled channels must be SECONDARY
-    """
-    SECONDARY: Channel.Role.ValueType  # 2
-    """
-    Secondary channels are only used for encryption/decryption/authentication purposes.
-    Their radio settings (freq etc) are ignored, only psk is used.
-    """
-
-    INDEX_FIELD_NUMBER: builtins.int
-    SETTINGS_FIELD_NUMBER: builtins.int
-    ROLE_FIELD_NUMBER: builtins.int
-    index: builtins.int
-    """
-    The index of this channel in the channel table (from 0 to MAX_NUM_CHANNELS-1)
-    (Someday - not currently implemented) An index of -1 could be used to mean "set by name",
-    in which case the target node will find and set the channel by settings.name.
-    """
-    @property
-    def settings(self) -> global___ChannelSettings:
-        """
-        The new settings, or NULL to disable that channel
-        """
-    role: global___Channel.Role.ValueType
-    """
-    TODO: REPLACE
-    """
-    def __init__(
-        self,
-        *,
-        index: builtins.int = ...,
-        settings: global___ChannelSettings | None = ...,
-        role: global___Channel.Role.ValueType = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing_extensions.Literal["settings", b"settings"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["index", b"index", "role", b"role", "settings", b"settings"]) -> None: ...
-
-global___Channel = Channel

meshtastic/clientonly_pb2.py

@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: meshtastic/clientonly.proto
-"""Generated protocol buffer code."""
-from google.protobuf.internal import builder as _builder
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import descriptor_pool as _descriptor_pool
-from google.protobuf import symbol_database as _symbol_database
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-from meshtastic import localonly_pb2 as meshtastic_dot_localonly__pb2
-
-
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1bmeshtastic/clientonly.proto\x12\nmeshtastic\x1a\x1ameshtastic/localonly.proto\"\x8d\x02\n\rDeviceProfile\x12\x16\n\tlong_name\x18\x01 \x01(\tH\x00\x88\x01\x01\x12\x17\n\nshort_name\x18\x02 \x01(\tH\x01\x88\x01\x01\x12\x18\n\x0b\x63hannel_url\x18\x03 \x01(\tH\x02\x88\x01\x01\x12,\n\x06\x63onfig\x18\x04 \x01(\x0b\x32\x17.meshtastic.LocalConfigH\x03\x88\x01\x01\x12\x39\n\rmodule_config\x18\x05 \x01(\x0b\x32\x1d.meshtastic.LocalModuleConfigH\x04\x88\x01\x01\x42\x0c\n\n_long_nameB\r\n\x0b_short_nameB\x0e\n\x0c_channel_urlB\t\n\x07_configB\x10\n\x0e_module_configBe\n\x13\x63om.geeksville.meshB\x10\x43lientOnlyProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
-
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.clientonly_pb2', globals())
-if _descriptor._USE_C_DESCRIPTORS == False:
-
-  DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\020ClientOnlyProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
-  _DEVICEPROFILE._serialized_start=72
-  _DEVICEPROFILE._serialized_end=341
-# @@protoc_insertion_point(module_scope)

meshtastic/clientonly_pb2.pyi

@@ -1,77 +0,0 @@
-"""
-@generated by mypy-protobuf.  Do not edit manually!
-isort:skip_file
-"""
-import builtins
-import google.protobuf.descriptor
-import google.protobuf.message
-import meshtastic.localonly_pb2
-import sys
-import typing
-
-if sys.version_info >= (3, 8):
-    import typing as typing_extensions
-else:
-    import typing_extensions
-
-DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
-
-@typing_extensions.final
-class DeviceProfile(google.protobuf.message.Message):
-    """
-    This abstraction is used to contain any configuration for provisioning a node on any client.
-    It is useful for importing and exporting configurations.
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    LONG_NAME_FIELD_NUMBER: builtins.int
-    SHORT_NAME_FIELD_NUMBER: builtins.int
-    CHANNEL_URL_FIELD_NUMBER: builtins.int
-    CONFIG_FIELD_NUMBER: builtins.int
-    MODULE_CONFIG_FIELD_NUMBER: builtins.int
-    long_name: builtins.str
-    """
-    Long name for the node
-    """
-    short_name: builtins.str
-    """
-    Short name of the node
-    """
-    channel_url: builtins.str
-    """
-    The url of the channels from our node
-    """
-    @property
-    def config(self) -> meshtastic.localonly_pb2.LocalConfig:
-        """
-        The Config of the node
-        """
-    @property
-    def module_config(self) -> meshtastic.localonly_pb2.LocalModuleConfig:
-        """
-        The ModuleConfig of the node
-        """
-    def __init__(
-        self,
-        *,
-        long_name: builtins.str | None = ...,
-        short_name: builtins.str | None = ...,
-        channel_url: builtins.str | None = ...,
-        config: meshtastic.localonly_pb2.LocalConfig | None = ...,
-        module_config: meshtastic.localonly_pb2.LocalModuleConfig | None = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing_extensions.Literal["_channel_url", b"_channel_url", "_config", b"_config", "_long_name", b"_long_name", "_module_config", b"_module_config", "_short_name", b"_short_name", "channel_url", b"channel_url", "config", b"config", "long_name", b"long_name", "module_config", b"module_config", "short_name", b"short_name"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["_channel_url", b"_channel_url", "_config", b"_config", "_long_name", b"_long_name", "_module_config", b"_module_config", "_short_name", b"_short_name", "channel_url", b"channel_url", "config", b"config", "long_name", b"long_name", "module_config", b"module_config", "short_name", b"short_name"]) -> None: ...
-    @typing.overload
-    def WhichOneof(self, oneof_group: typing_extensions.Literal["_channel_url", b"_channel_url"]) -> typing_extensions.Literal["channel_url"] | None: ...
-    @typing.overload
-    def WhichOneof(self, oneof_group: typing_extensions.Literal["_config", b"_config"]) -> typing_extensions.Literal["config"] | None: ...
-    @typing.overload
-    def WhichOneof(self, oneof_group: typing_extensions.Literal["_long_name", b"_long_name"]) -> typing_extensions.Literal["long_name"] | None: ...
-    @typing.overload
-    def WhichOneof(self, oneof_group: typing_extensions.Literal["_module_config", b"_module_config"]) -> typing_extensions.Literal["module_config"] | None: ...
-    @typing.overload
-    def WhichOneof(self, oneof_group: typing_extensions.Literal["_short_name", b"_short_name"]) -> typing_extensions.Literal["short_name"] | None: ...
-
-global___DeviceProfile = DeviceProfile

meshtastic/connection_status_pb2.py

@@ -1,36 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: meshtastic/connection_status.proto
-"""Generated protocol buffer code."""
-from google.protobuf.internal import builder as _builder
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import descriptor_pool as _descriptor_pool
-from google.protobuf import symbol_database as _symbol_database
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-
-
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\"meshtastic/connection_status.proto\x12\nmeshtastic\"\xb1\x02\n\x16\x44\x65viceConnectionStatus\x12\x33\n\x04wifi\x18\x01 \x01(\x0b\x32 .meshtastic.WifiConnectionStatusH\x00\x88\x01\x01\x12;\n\x08\x65thernet\x18\x02 \x01(\x0b\x32$.meshtastic.EthernetConnectionStatusH\x01\x88\x01\x01\x12=\n\tbluetooth\x18\x03 \x01(\x0b\x32%.meshtastic.BluetoothConnectionStatusH\x02\x88\x01\x01\x12\x37\n\x06serial\x18\x04 \x01(\x0b\x32\".meshtastic.SerialConnectionStatusH\x03\x88\x01\x01\x42\x07\n\x05_wifiB\x0b\n\t_ethernetB\x0c\n\n_bluetoothB\t\n\x07_serial\"g\n\x14WifiConnectionStatus\x12\x33\n\x06status\x18\x01 \x01(\x0b\x32#.meshtastic.NetworkConnectionStatus\x12\x0c\n\x04ssid\x18\x02 \x01(\t\x12\x0c\n\x04rssi\x18\x03 \x01(\x05\"O\n\x18\x45thernetConnectionStatus\x12\x33\n\x06status\x18\x01 \x01(\x0b\x32#.meshtastic.NetworkConnectionStatus\"{\n\x17NetworkConnectionStatus\x12\x12\n\nip_address\x18\x01 \x01(\x07\x12\x14\n\x0cis_connected\x18\x02 \x01(\x08\x12\x19\n\x11is_mqtt_connected\x18\x03 \x01(\x08\x12\x1b\n\x13is_syslog_connected\x18\x04 \x01(\x08\"L\n\x19\x42luetoothConnectionStatus\x12\x0b\n\x03pin\x18\x01 \x01(\r\x12\x0c\n\x04rssi\x18\x02 \x01(\x05\x12\x14\n\x0cis_connected\x18\x03 \x01(\x08\"<\n\x16SerialConnectionStatus\x12\x0c\n\x04\x62\x61ud\x18\x01 \x01(\r\x12\x14\n\x0cis_connected\x18\x02 \x01(\x08\x42\x65\n\x13\x63om.geeksville.meshB\x10\x43onnStatusProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
-
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.connection_status_pb2', globals())
-if _descriptor._USE_C_DESCRIPTORS == False:
-
-  DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\020ConnStatusProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
-  _DEVICECONNECTIONSTATUS._serialized_start=51
-  _DEVICECONNECTIONSTATUS._serialized_end=356
-  _WIFICONNECTIONSTATUS._serialized_start=358
-  _WIFICONNECTIONSTATUS._serialized_end=461
-  _ETHERNETCONNECTIONSTATUS._serialized_start=463
-  _ETHERNETCONNECTIONSTATUS._serialized_end=542
-  _NETWORKCONNECTIONSTATUS._serialized_start=544
-  _NETWORKCONNECTIONSTATUS._serialized_end=667
-  _BLUETOOTHCONNECTIONSTATUS._serialized_start=669
-  _BLUETOOTHCONNECTIONSTATUS._serialized_end=745
-  _SERIALCONNECTIONSTATUS._serialized_start=747
-  _SERIALCONNECTIONSTATUS._serialized_end=807
-# @@protoc_insertion_point(module_scope)

meshtastic/connection_status_pb2.pyi

@@ -1,227 +0,0 @@
-"""
-@generated by mypy-protobuf.  Do not edit manually!
-isort:skip_file
-"""
-import builtins
-import google.protobuf.descriptor
-import google.protobuf.message
-import sys
-import typing
-
-if sys.version_info >= (3, 8):
-    import typing as typing_extensions
-else:
-    import typing_extensions
-
-DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
-
-@typing_extensions.final
-class DeviceConnectionStatus(google.protobuf.message.Message):
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    WIFI_FIELD_NUMBER: builtins.int
-    ETHERNET_FIELD_NUMBER: builtins.int
-    BLUETOOTH_FIELD_NUMBER: builtins.int
-    SERIAL_FIELD_NUMBER: builtins.int
-    @property
-    def wifi(self) -> global___WifiConnectionStatus:
-        """
-        WiFi Status
-        """
-    @property
-    def ethernet(self) -> global___EthernetConnectionStatus:
-        """
-        WiFi Status
-        """
-    @property
-    def bluetooth(self) -> global___BluetoothConnectionStatus:
-        """
-        Bluetooth Status
-        """
-    @property
-    def serial(self) -> global___SerialConnectionStatus:
-        """
-        Serial Status
-        """
-    def __init__(
-        self,
-        *,
-        wifi: global___WifiConnectionStatus | None = ...,
-        ethernet: global___EthernetConnectionStatus | None = ...,
-        bluetooth: global___BluetoothConnectionStatus | None = ...,
-        serial: global___SerialConnectionStatus | None = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing_extensions.Literal["_bluetooth", b"_bluetooth", "_ethernet", b"_ethernet", "_serial", b"_serial", "_wifi", b"_wifi", "bluetooth", b"bluetooth", "ethernet", b"ethernet", "serial", b"serial", "wifi", b"wifi"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["_bluetooth", b"_bluetooth", "_ethernet", b"_ethernet", "_serial", b"_serial", "_wifi", b"_wifi", "bluetooth", b"bluetooth", "ethernet", b"ethernet", "serial", b"serial", "wifi", b"wifi"]) -> None: ...
-    @typing.overload
-    def WhichOneof(self, oneof_group: typing_extensions.Literal["_bluetooth", b"_bluetooth"]) -> typing_extensions.Literal["bluetooth"] | None: ...
-    @typing.overload
-    def WhichOneof(self, oneof_group: typing_extensions.Literal["_ethernet", b"_ethernet"]) -> typing_extensions.Literal["ethernet"] | None: ...
-    @typing.overload
-    def WhichOneof(self, oneof_group: typing_extensions.Literal["_serial", b"_serial"]) -> typing_extensions.Literal["serial"] | None: ...
-    @typing.overload
-    def WhichOneof(self, oneof_group: typing_extensions.Literal["_wifi", b"_wifi"]) -> typing_extensions.Literal["wifi"] | None: ...
-
-global___DeviceConnectionStatus = DeviceConnectionStatus
-
-@typing_extensions.final
-class WifiConnectionStatus(google.protobuf.message.Message):
-    """
-    WiFi connection status
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    STATUS_FIELD_NUMBER: builtins.int
-    SSID_FIELD_NUMBER: builtins.int
-    RSSI_FIELD_NUMBER: builtins.int
-    @property
-    def status(self) -> global___NetworkConnectionStatus:
-        """
-        Connection status
-        """
-    ssid: builtins.str
-    """
-    WiFi access point SSID
-    """
-    rssi: builtins.int
-    """
-    RSSI of wireless connection
-    """
-    def __init__(
-        self,
-        *,
-        status: global___NetworkConnectionStatus | None = ...,
-        ssid: builtins.str = ...,
-        rssi: builtins.int = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing_extensions.Literal["status", b"status"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["rssi", b"rssi", "ssid", b"ssid", "status", b"status"]) -> None: ...
-
-global___WifiConnectionStatus = WifiConnectionStatus
-
-@typing_extensions.final
-class EthernetConnectionStatus(google.protobuf.message.Message):
-    """
-    Ethernet connection status
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    STATUS_FIELD_NUMBER: builtins.int
-    @property
-    def status(self) -> global___NetworkConnectionStatus:
-        """
-        Connection status
-        """
-    def __init__(
-        self,
-        *,
-        status: global___NetworkConnectionStatus | None = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing_extensions.Literal["status", b"status"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["status", b"status"]) -> None: ...
-
-global___EthernetConnectionStatus = EthernetConnectionStatus
-
-@typing_extensions.final
-class NetworkConnectionStatus(google.protobuf.message.Message):
-    """
-    Ethernet or WiFi connection status
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    IP_ADDRESS_FIELD_NUMBER: builtins.int
-    IS_CONNECTED_FIELD_NUMBER: builtins.int
-    IS_MQTT_CONNECTED_FIELD_NUMBER: builtins.int
-    IS_SYSLOG_CONNECTED_FIELD_NUMBER: builtins.int
-    ip_address: builtins.int
-    """
-    IP address of device
-    """
-    is_connected: builtins.bool
-    """
-    Whether the device has an active connection or not
-    """
-    is_mqtt_connected: builtins.bool
-    """
-    Whether the device has an active connection to an MQTT broker or not
-    """
-    is_syslog_connected: builtins.bool
-    """
-    Whether the device is actively remote syslogging or not
-    """
-    def __init__(
-        self,
-        *,
-        ip_address: builtins.int = ...,
-        is_connected: builtins.bool = ...,
-        is_mqtt_connected: builtins.bool = ...,
-        is_syslog_connected: builtins.bool = ...,
-    ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["ip_address", b"ip_address", "is_connected", b"is_connected", "is_mqtt_connected", b"is_mqtt_connected", "is_syslog_connected", b"is_syslog_connected"]) -> None: ...
-
-global___NetworkConnectionStatus = NetworkConnectionStatus
-
-@typing_extensions.final
-class BluetoothConnectionStatus(google.protobuf.message.Message):
-    """
-    Bluetooth connection status
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    PIN_FIELD_NUMBER: builtins.int
-    RSSI_FIELD_NUMBER: builtins.int
-    IS_CONNECTED_FIELD_NUMBER: builtins.int
-    pin: builtins.int
-    """
-    The pairing PIN for bluetooth
-    """
-    rssi: builtins.int
-    """
-    RSSI of bluetooth connection
-    """
-    is_connected: builtins.bool
-    """
-    Whether the device has an active connection or not
-    """
-    def __init__(
-        self,
-        *,
-        pin: builtins.int = ...,
-        rssi: builtins.int = ...,
-        is_connected: builtins.bool = ...,
-    ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["is_connected", b"is_connected", "pin", b"pin", "rssi", b"rssi"]) -> None: ...
-
-global___BluetoothConnectionStatus = BluetoothConnectionStatus
-
-@typing_extensions.final
-class SerialConnectionStatus(google.protobuf.message.Message):
-    """
-    Serial connection status
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    BAUD_FIELD_NUMBER: builtins.int
-    IS_CONNECTED_FIELD_NUMBER: builtins.int
-    baud: builtins.int
-    """
-    Serial baud rate
-    """
-    is_connected: builtins.bool
-    """
-    Whether the device has an active connection or not
-    """
-    def __init__(
-        self,
-        *,
-        baud: builtins.int = ...,
-        is_connected: builtins.bool = ...,
-    ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["baud", b"baud", "is_connected", b"is_connected"]) -> None: ...
-
-global___SerialConnectionStatus = SerialConnectionStatus

meshtastic/deviceonly_pb2.py

@@ -1,46 +1,255 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: meshtastic/deviceonly.proto
+# source: deviceonly.proto
-"""Generated protocol buffer code."""
+
-from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
-from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import message as _message
+from google.protobuf import reflection as _reflection
 from google.protobuf import symbol_database as _symbol_database
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
 
 
-from meshtastic import channel_pb2 as meshtastic_dot_channel__pb2
+from . import channel_pb2 as channel__pb2
-from meshtastic import localonly_pb2 as meshtastic_dot_localonly__pb2
+from . import mesh_pb2 as mesh__pb2
-from meshtastic import mesh_pb2 as meshtastic_dot_mesh__pb2
+from . import radioconfig_pb2 as radioconfig__pb2
-from meshtastic import module_config_pb2 as meshtastic_dot_module__config__pb2
-from meshtastic import telemetry_pb2 as meshtastic_dot_telemetry__pb2
-from . import nanopb_pb2 as nanopb__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1bmeshtastic/deviceonly.proto\x12\nmeshtastic\x1a\x18meshtastic/channel.proto\x1a\x1ameshtastic/localonly.proto\x1a\x15meshtastic/mesh.proto\x1a\x1emeshtastic/module_config.proto\x1a\x1ameshtastic/telemetry.proto\x1a\x0cnanopb.proto\"\x90\x01\n\x0cPositionLite\x12\x12\n\nlatitude_i\x18\x01 \x01(\x0f\x12\x13\n\x0blongitude_i\x18\x02 \x01(\x0f\x12\x10\n\x08\x61ltitude\x18\x03 \x01(\x05\x12\x0c\n\x04time\x18\x04 \x01(\x07\x12\x37\n\x0flocation_source\x18\x05 \x01(\x0e\x32\x1e.meshtastic.Position.LocSource\"\x86\x02\n\x0cNodeInfoLite\x12\x0b\n\x03num\x18\x01 \x01(\r\x12\x1e\n\x04user\x18\x02 \x01(\x0b\x32\x10.meshtastic.User\x12*\n\x08position\x18\x03 \x01(\x0b\x32\x18.meshtastic.PositionLite\x12\x0b\n\x03snr\x18\x04 \x01(\x02\x12\x12\n\nlast_heard\x18\x05 \x01(\x07\x12\x31\n\x0e\x64\x65vice_metrics\x18\x06 \x01(\x0b\x32\x19.meshtastic.DeviceMetrics\x12\x0f\n\x07\x63hannel\x18\x07 \x01(\r\x12\x10\n\x08via_mqtt\x18\x08 \x01(\x08\x12\x11\n\thops_away\x18\t \x01(\r\x12\x13\n\x0bis_favorite\x18\n \x01(\x08\"\xc3\x03\n\x0b\x44\x65viceState\x12\'\n\x07my_node\x18\x02 \x01(\x0b\x32\x16.meshtastic.MyNodeInfo\x12\x1f\n\x05owner\x18\x03 \x01(\x0b\x32\x10.meshtastic.User\x12-\n\rreceive_queue\x18\x05 \x03(\x0b\x32\x16.meshtastic.MeshPacket\x12\x0f\n\x07version\x18\x08 \x01(\r\x12/\n\x0frx_text_message\x18\x07 \x01(\x0b\x32\x16.meshtastic.MeshPacket\x12\x13\n\x07no_save\x18\t \x01(\x08\x42\x02\x18\x01\x12\x15\n\rdid_gps_reset\x18\x0b \x01(\x08\x12+\n\x0brx_waypoint\x18\x0c \x01(\x0b\x32\x16.meshtastic.MeshPacket\x12\x44\n\x19node_remote_hardware_pins\x18\r \x03(\x0b\x32!.meshtastic.NodeRemoteHardwarePin\x12Z\n\x0cnode_db_lite\x18\x0e \x03(\x0b\x32\x18.meshtastic.NodeInfoLiteB*\x92?\'\x92\x01$std::vector<meshtastic_NodeInfoLite>\"E\n\x0b\x43hannelFile\x12%\n\x08\x63hannels\x18\x01 \x03(\x0b\x32\x13.meshtastic.Channel\x12\x0f\n\x07version\x18\x02 \x01(\r\"\x97\x02\n\x08OEMStore\x12\x16\n\x0eoem_icon_width\x18\x01 \x01(\r\x12\x17\n\x0foem_icon_height\x18\x02 \x01(\r\x12\x15\n\roem_icon_bits\x18\x03 \x01(\x0c\x12)\n\x08oem_font\x18\x04 \x01(\x0e\x32\x17.meshtastic.ScreenFonts\x12\x10\n\x08oem_text\x18\x05 \x01(\t\x12\x13\n\x0boem_aes_key\x18\x06 \x01(\x0c\x12\x31\n\x10oem_local_config\x18\x07 \x01(\x0b\x32\x17.meshtastic.LocalConfig\x12>\n\x17oem_local_module_config\x18\x08 \x01(\x0b\x32\x1d.meshtastic.LocalModuleConfig*>\n\x0bScreenFonts\x12\x0e\n\nFONT_SMALL\x10\x00\x12\x0f\n\x0b\x46ONT_MEDIUM\x10\x01\x12\x0e\n\nFONT_LARGE\x10\x02\x42m\n\x13\x63om.geeksville.meshB\nDeviceOnlyZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x92?\x0b\xc2\x01\x08<vector>b\x06proto3')
+DESCRIPTOR = _descriptor.FileDescriptor(
+  name='deviceonly.proto',
+  package='',
+  syntax='proto3',
+  serialized_options=b'\n\023com.geeksville.meshB\nDeviceOnlyH\003Z!github.com/meshtastic/gomeshproto',
+  serialized_pb=b'\n\x10\x64\x65viceonly.proto\x1a\rchannel.proto\x1a\nmesh.proto\x1a\x11radioconfig.proto\"\x80\x01\n\x11LegacyRadioConfig\x12\x39\n\x0bpreferences\x18\x01 \x01(\x0b\x32$.LegacyRadioConfig.LegacyPreferences\x1a\x30\n\x11LegacyPreferences\x12\x1b\n\x06region\x18\x0f \x01(\x0e\x32\x0b.RegionCode\"\x8f\x02\n\x0b\x44\x65viceState\x12\'\n\x0blegacyRadio\x18\x01 \x01(\x0b\x32\x12.LegacyRadioConfig\x12\x1c\n\x07my_node\x18\x02 \x01(\x0b\x32\x0b.MyNodeInfo\x12\x14\n\x05owner\x18\x03 \x01(\x0b\x32\x05.User\x12\x1a\n\x07node_db\x18\x04 \x03(\x0b\x32\t.NodeInfo\x12\"\n\rreceive_queue\x18\x05 \x03(\x0b\x32\x0b.MeshPacket\x12\x0f\n\x07version\x18\x08 \x01(\r\x12$\n\x0frx_text_message\x18\x07 \x01(\x0b\x32\x0b.MeshPacket\x12\x0f\n\x07no_save\x18\t \x01(\x08\x12\x15\n\rdid_gps_reset\x18\x0b \x01(\x08J\x04\x08\x0c\x10\r\")\n\x0b\x43hannelFile\x12\x1a\n\x08\x63hannels\x18\x01 \x03(\x0b\x32\x08.ChannelBF\n\x13\x63om.geeksville.meshB\nDeviceOnlyH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3'
+  ,
+  dependencies=[channel__pb2.DESCRIPTOR,mesh__pb2.DESCRIPTOR,radioconfig__pb2.DESCRIPTOR,])
 
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.deviceonly_pb2', globals())
-if _descriptor._USE_C_DESCRIPTORS == False:
 
-  DESCRIPTOR._options = None
+
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\nDeviceOnlyZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000\222?\013\302\001\010<vector>'
+
-  _DEVICESTATE.fields_by_name['no_save']._options = None
+_LEGACYRADIOCONFIG_LEGACYPREFERENCES = _descriptor.Descriptor(
-  _DEVICESTATE.fields_by_name['no_save']._serialized_options = b'\030\001'
+  name='LegacyPreferences',
-  _DEVICESTATE.fields_by_name['node_db_lite']._options = None
+  full_name='LegacyRadioConfig.LegacyPreferences',
-  _DEVICESTATE.fields_by_name['node_db_lite']._serialized_options = b'\222?\'\222\001$std::vector<meshtastic_NodeInfoLite>'
+  filename=None,
-  _SCREENFONTS._serialized_start=1413
+  file=DESCRIPTOR,
-  _SCREENFONTS._serialized_end=1475
+  containing_type=None,
-  _POSITIONLITE._serialized_start=195
+  fields=[
-  _POSITIONLITE._serialized_end=339
+    _descriptor.FieldDescriptor(
-  _NODEINFOLITE._serialized_start=342
+      name='region', full_name='LegacyRadioConfig.LegacyPreferences.region', index=0,
-  _NODEINFOLITE._serialized_end=604
+      number=15, type=14, cpp_type=8, label=1,
-  _DEVICESTATE._serialized_start=607
+      has_default_value=False, default_value=0,
-  _DEVICESTATE._serialized_end=1058
+      message_type=None, enum_type=None, containing_type=None,
-  _CHANNELFILE._serialized_start=1060
+      is_extension=False, extension_scope=None,
-  _CHANNELFILE._serialized_end=1129
+      serialized_options=None, file=DESCRIPTOR),
-  _OEMSTORE._serialized_start=1132
+  ],
-  _OEMSTORE._serialized_end=1411
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=147,
+  serialized_end=195,
+)
+
+_LEGACYRADIOCONFIG = _descriptor.Descriptor(
+  name='LegacyRadioConfig',
+  full_name='LegacyRadioConfig',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='preferences', full_name='LegacyRadioConfig.preferences', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+  ],
+  extensions=[
+  ],
+  nested_types=[_LEGACYRADIOCONFIG_LEGACYPREFERENCES, ],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=67,
+  serialized_end=195,
+)
+
+
+_DEVICESTATE = _descriptor.Descriptor(
+  name='DeviceState',
+  full_name='DeviceState',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='legacyRadio', full_name='DeviceState.legacyRadio', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='my_node', full_name='DeviceState.my_node', index=1,
+      number=2, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='owner', full_name='DeviceState.owner', index=2,
+      number=3, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='node_db', full_name='DeviceState.node_db', index=3,
+      number=4, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='receive_queue', full_name='DeviceState.receive_queue', index=4,
+      number=5, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='version', full_name='DeviceState.version', index=5,
+      number=8, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='rx_text_message', full_name='DeviceState.rx_text_message', index=6,
+      number=7, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='no_save', full_name='DeviceState.no_save', index=7,
+      number=9, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='did_gps_reset', full_name='DeviceState.did_gps_reset', index=8,
+      number=11, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=198,
+  serialized_end=469,
+)
+
+
+_CHANNELFILE = _descriptor.Descriptor(
+  name='ChannelFile',
+  full_name='ChannelFile',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='channels', full_name='ChannelFile.channels', index=0,
+      number=1, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=471,
+  serialized_end=512,
+)
+
+_LEGACYRADIOCONFIG_LEGACYPREFERENCES.fields_by_name['region'].enum_type = radioconfig__pb2._REGIONCODE
+_LEGACYRADIOCONFIG_LEGACYPREFERENCES.containing_type = _LEGACYRADIOCONFIG
+_LEGACYRADIOCONFIG.fields_by_name['preferences'].message_type = _LEGACYRADIOCONFIG_LEGACYPREFERENCES
+_DEVICESTATE.fields_by_name['legacyRadio'].message_type = _LEGACYRADIOCONFIG
+_DEVICESTATE.fields_by_name['my_node'].message_type = mesh__pb2._MYNODEINFO
+_DEVICESTATE.fields_by_name['owner'].message_type = mesh__pb2._USER
+_DEVICESTATE.fields_by_name['node_db'].message_type = mesh__pb2._NODEINFO
+_DEVICESTATE.fields_by_name['receive_queue'].message_type = mesh__pb2._MESHPACKET
+_DEVICESTATE.fields_by_name['rx_text_message'].message_type = mesh__pb2._MESHPACKET
+_CHANNELFILE.fields_by_name['channels'].message_type = channel__pb2._CHANNEL
+DESCRIPTOR.message_types_by_name['LegacyRadioConfig'] = _LEGACYRADIOCONFIG
+DESCRIPTOR.message_types_by_name['DeviceState'] = _DEVICESTATE
+DESCRIPTOR.message_types_by_name['ChannelFile'] = _CHANNELFILE
+_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+
+LegacyRadioConfig = _reflection.GeneratedProtocolMessageType('LegacyRadioConfig', (_message.Message,), {
+
+  'LegacyPreferences' : _reflection.GeneratedProtocolMessageType('LegacyPreferences', (_message.Message,), {
+    'DESCRIPTOR' : _LEGACYRADIOCONFIG_LEGACYPREFERENCES,
+    '__module__' : 'deviceonly_pb2'
+    # @@protoc_insertion_point(class_scope:LegacyRadioConfig.LegacyPreferences)
+    })
+  ,
+  'DESCRIPTOR' : _LEGACYRADIOCONFIG,
+  '__module__' : 'deviceonly_pb2'
+  # @@protoc_insertion_point(class_scope:LegacyRadioConfig)
+  })
+_sym_db.RegisterMessage(LegacyRadioConfig)
+_sym_db.RegisterMessage(LegacyRadioConfig.LegacyPreferences)
+
+DeviceState = _reflection.GeneratedProtocolMessageType('DeviceState', (_message.Message,), {
+  'DESCRIPTOR' : _DEVICESTATE,
+  '__module__' : 'deviceonly_pb2'
+  # @@protoc_insertion_point(class_scope:DeviceState)
+  })
+_sym_db.RegisterMessage(DeviceState)
+
+ChannelFile = _reflection.GeneratedProtocolMessageType('ChannelFile', (_message.Message,), {
+  'DESCRIPTOR' : _CHANNELFILE,
+  '__module__' : 'deviceonly_pb2'
+  # @@protoc_insertion_point(class_scope:ChannelFile)
+  })
+_sym_db.RegisterMessage(ChannelFile)
+
+
+DESCRIPTOR._options = None
 # @@protoc_insertion_point(module_scope)

meshtastic/deviceonly_pb2.pyi

@@ -1,386 +0,0 @@
-"""
-@generated by mypy-protobuf.  Do not edit manually!
-isort:skip_file
-"""
-import builtins
-import collections.abc
-import google.protobuf.descriptor
-import google.protobuf.internal.containers
-import google.protobuf.internal.enum_type_wrapper
-import google.protobuf.message
-import meshtastic.channel_pb2
-import meshtastic.localonly_pb2
-import meshtastic.mesh_pb2
-import meshtastic.telemetry_pb2
-import sys
-import typing
-
-if sys.version_info >= (3, 10):
-    import typing as typing_extensions
-else:
-    import typing_extensions
-
-DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
-
-class _ScreenFonts:
-    ValueType = typing.NewType("ValueType", builtins.int)
-    V: typing_extensions.TypeAlias = ValueType
-
-class _ScreenFontsEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[_ScreenFonts.ValueType], builtins.type):
-    DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
-    FONT_SMALL: _ScreenFonts.ValueType  # 0
-    """
-    TODO: REPLACE
-    """
-    FONT_MEDIUM: _ScreenFonts.ValueType  # 1
-    """
-    TODO: REPLACE
-    """
-    FONT_LARGE: _ScreenFonts.ValueType  # 2
-    """
-    TODO: REPLACE
-    """
-
-class ScreenFonts(_ScreenFonts, metaclass=_ScreenFontsEnumTypeWrapper):
-    """
-    Font sizes for the device screen
-    """
-
-FONT_SMALL: ScreenFonts.ValueType  # 0
-"""
-TODO: REPLACE
-"""
-FONT_MEDIUM: ScreenFonts.ValueType  # 1
-"""
-TODO: REPLACE
-"""
-FONT_LARGE: ScreenFonts.ValueType  # 2
-"""
-TODO: REPLACE
-"""
-global___ScreenFonts = ScreenFonts
-
-@typing_extensions.final
-class PositionLite(google.protobuf.message.Message):
-    """
-    Position with static location information only for NodeDBLite
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    LATITUDE_I_FIELD_NUMBER: builtins.int
-    LONGITUDE_I_FIELD_NUMBER: builtins.int
-    ALTITUDE_FIELD_NUMBER: builtins.int
-    TIME_FIELD_NUMBER: builtins.int
-    LOCATION_SOURCE_FIELD_NUMBER: builtins.int
-    latitude_i: builtins.int
-    """
-    The new preferred location encoding, multiply by 1e-7 to get degrees
-    in floating point
-    """
-    longitude_i: builtins.int
-    """
-    TODO: REPLACE
-    """
-    altitude: builtins.int
-    """
-    In meters above MSL (but see issue #359)
-    """
-    time: builtins.int
-    """
-    This is usually not sent over the mesh (to save space), but it is sent
-    from the phone so that the local device can set its RTC If it is sent over
-    the mesh (because there are devices on the mesh without GPS), it will only
-    be sent by devices which has a hardware GPS clock.
-    seconds since 1970
-    """
-    location_source: meshtastic.mesh_pb2.Position.LocSource.ValueType
-    """
-    TODO: REPLACE
-    """
-    def __init__(
-        self,
-        *,
-        latitude_i: builtins.int = ...,
-        longitude_i: builtins.int = ...,
-        altitude: builtins.int = ...,
-        time: builtins.int = ...,
-        location_source: meshtastic.mesh_pb2.Position.LocSource.ValueType = ...,
-    ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["altitude", b"altitude", "latitude_i", b"latitude_i", "location_source", b"location_source", "longitude_i", b"longitude_i", "time", b"time"]) -> None: ...
-
-global___PositionLite = PositionLite
-
-@typing_extensions.final
-class NodeInfoLite(google.protobuf.message.Message):
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    NUM_FIELD_NUMBER: builtins.int
-    USER_FIELD_NUMBER: builtins.int
-    POSITION_FIELD_NUMBER: builtins.int
-    SNR_FIELD_NUMBER: builtins.int
-    LAST_HEARD_FIELD_NUMBER: builtins.int
-    DEVICE_METRICS_FIELD_NUMBER: builtins.int
-    CHANNEL_FIELD_NUMBER: builtins.int
-    VIA_MQTT_FIELD_NUMBER: builtins.int
-    HOPS_AWAY_FIELD_NUMBER: builtins.int
-    IS_FAVORITE_FIELD_NUMBER: builtins.int
-    num: builtins.int
-    """
-    The node number
-    """
-    @property
-    def user(self) -> meshtastic.mesh_pb2.User:
-        """
-        The user info for this node
-        """
-    @property
-    def position(self) -> global___PositionLite:
-        """
-        This position data. Note: before 1.2.14 we would also store the last time we've heard from this node in position.time, that is no longer true.
-        Position.time now indicates the last time we received a POSITION from that node.
-        """
-    snr: builtins.float
-    """
-    Returns the Signal-to-noise ratio (SNR) of the last received message,
-    as measured by the receiver. Return SNR of the last received message in dB
-    """
-    last_heard: builtins.int
-    """
-    Set to indicate the last time we received a packet from this node
-    """
-    @property
-    def device_metrics(self) -> meshtastic.telemetry_pb2.DeviceMetrics:
-        """
-        The latest device metrics for the node.
-        """
-    channel: builtins.int
-    """
-    local channel index we heard that node on. Only populated if its not the default channel.
-    """
-    via_mqtt: builtins.bool
-    """
-    True if we witnessed the node over MQTT instead of LoRA transport
-    """
-    hops_away: builtins.int
-    """
-    Number of hops away from us this node is (0 if adjacent)
-    """
-    is_favorite: builtins.bool
-    """
-    True if node is in our favorites list
-    Persists between NodeDB internal clean ups
-    """
-    def __init__(
-        self,
-        *,
-        num: builtins.int = ...,
-        user: meshtastic.mesh_pb2.User | None = ...,
-        position: global___PositionLite | None = ...,
-        snr: builtins.float = ...,
-        last_heard: builtins.int = ...,
-        device_metrics: meshtastic.telemetry_pb2.DeviceMetrics | None = ...,
-        channel: builtins.int = ...,
-        via_mqtt: builtins.bool = ...,
-        hops_away: builtins.int = ...,
-        is_favorite: builtins.bool = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing_extensions.Literal["device_metrics", b"device_metrics", "position", b"position", "user", b"user"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["channel", b"channel", "device_metrics", b"device_metrics", "hops_away", b"hops_away", "is_favorite", b"is_favorite", "last_heard", b"last_heard", "num", b"num", "position", b"position", "snr", b"snr", "user", b"user", "via_mqtt", b"via_mqtt"]) -> None: ...
-
-global___NodeInfoLite = NodeInfoLite
-
-@typing_extensions.final
-class DeviceState(google.protobuf.message.Message):
-    """
-    This message is never sent over the wire, but it is used for serializing DB
-    state to flash in the device code
-    FIXME, since we write this each time we enter deep sleep (and have infinite
-    flash) it would be better to use some sort of append only data structure for
-    the receive queue and use the preferences store for the other stuff
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    MY_NODE_FIELD_NUMBER: builtins.int
-    OWNER_FIELD_NUMBER: builtins.int
-    RECEIVE_QUEUE_FIELD_NUMBER: builtins.int
-    VERSION_FIELD_NUMBER: builtins.int
-    RX_TEXT_MESSAGE_FIELD_NUMBER: builtins.int
-    NO_SAVE_FIELD_NUMBER: builtins.int
-    DID_GPS_RESET_FIELD_NUMBER: builtins.int
-    RX_WAYPOINT_FIELD_NUMBER: builtins.int
-    NODE_REMOTE_HARDWARE_PINS_FIELD_NUMBER: builtins.int
-    NODE_DB_LITE_FIELD_NUMBER: builtins.int
-    @property
-    def my_node(self) -> meshtastic.mesh_pb2.MyNodeInfo:
-        """
-        Read only settings/info about this node
-        """
-    @property
-    def owner(self) -> meshtastic.mesh_pb2.User:
-        """
-        My owner info
-        """
-    @property
-    def receive_queue(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[meshtastic.mesh_pb2.MeshPacket]:
-        """
-        Received packets saved for delivery to the phone
-        """
-    version: builtins.int
-    """
-    A version integer used to invalidate old save files when we make
-    incompatible changes This integer is set at build time and is private to
-    NodeDB.cpp in the device code.
-    """
-    @property
-    def rx_text_message(self) -> meshtastic.mesh_pb2.MeshPacket:
-        """
-        We keep the last received text message (only) stored in the device flash,
-        so we can show it on the screen.
-        Might be null
-        """
-    no_save: builtins.bool
-    """
-    Used only during development.
-    Indicates developer is testing and changes should never be saved to flash.
-    Deprecated in 2.3.1
-    """
-    did_gps_reset: builtins.bool
-    """
-    Some GPS receivers seem to have bogus settings from the factory, so we always do one factory reset.
-    """
-    @property
-    def rx_waypoint(self) -> meshtastic.mesh_pb2.MeshPacket:
-        """
-        We keep the last received waypoint stored in the device flash,
-        so we can show it on the screen.
-        Might be null
-        """
-    @property
-    def node_remote_hardware_pins(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[meshtastic.mesh_pb2.NodeRemoteHardwarePin]:
-        """
-        The mesh's nodes with their available gpio pins for RemoteHardware module
-        """
-    @property
-    def node_db_lite(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[global___NodeInfoLite]:
-        """
-        New lite version of NodeDB to decrease memory footprint
-        """
-    def __init__(
-        self,
-        *,
-        my_node: meshtastic.mesh_pb2.MyNodeInfo | None = ...,
-        owner: meshtastic.mesh_pb2.User | None = ...,
-        receive_queue: collections.abc.Iterable[meshtastic.mesh_pb2.MeshPacket] | None = ...,
-        version: builtins.int = ...,
-        rx_text_message: meshtastic.mesh_pb2.MeshPacket | None = ...,
-        no_save: builtins.bool = ...,
-        did_gps_reset: builtins.bool = ...,
-        rx_waypoint: meshtastic.mesh_pb2.MeshPacket | None = ...,
-        node_remote_hardware_pins: collections.abc.Iterable[meshtastic.mesh_pb2.NodeRemoteHardwarePin] | None = ...,
-        node_db_lite: collections.abc.Iterable[global___NodeInfoLite] | None = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing_extensions.Literal["my_node", b"my_node", "owner", b"owner", "rx_text_message", b"rx_text_message", "rx_waypoint", b"rx_waypoint"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["did_gps_reset", b"did_gps_reset", "my_node", b"my_node", "no_save", b"no_save", "node_db_lite", b"node_db_lite", "node_remote_hardware_pins", b"node_remote_hardware_pins", "owner", b"owner", "receive_queue", b"receive_queue", "rx_text_message", b"rx_text_message", "rx_waypoint", b"rx_waypoint", "version", b"version"]) -> None: ...
-
-global___DeviceState = DeviceState
-
-@typing_extensions.final
-class ChannelFile(google.protobuf.message.Message):
-    """
-    The on-disk saved channels
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    CHANNELS_FIELD_NUMBER: builtins.int
-    VERSION_FIELD_NUMBER: builtins.int
-    @property
-    def channels(self) -> google.protobuf.internal.containers.RepeatedCompositeFieldContainer[meshtastic.channel_pb2.Channel]:
-        """
-        The channels our node knows about
-        """
-    version: builtins.int
-    """
-    A version integer used to invalidate old save files when we make
-    incompatible changes This integer is set at build time and is private to
-    NodeDB.cpp in the device code.
-    """
-    def __init__(
-        self,
-        *,
-        channels: collections.abc.Iterable[meshtastic.channel_pb2.Channel] | None = ...,
-        version: builtins.int = ...,
-    ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["channels", b"channels", "version", b"version"]) -> None: ...
-
-global___ChannelFile = ChannelFile
-
-@typing_extensions.final
-class OEMStore(google.protobuf.message.Message):
-    """
-    This can be used for customizing the firmware distribution. If populated,
-    show a secondary bootup screen with custom logo and text for 2.5 seconds.
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    OEM_ICON_WIDTH_FIELD_NUMBER: builtins.int
-    OEM_ICON_HEIGHT_FIELD_NUMBER: builtins.int
-    OEM_ICON_BITS_FIELD_NUMBER: builtins.int
-    OEM_FONT_FIELD_NUMBER: builtins.int
-    OEM_TEXT_FIELD_NUMBER: builtins.int
-    OEM_AES_KEY_FIELD_NUMBER: builtins.int
-    OEM_LOCAL_CONFIG_FIELD_NUMBER: builtins.int
-    OEM_LOCAL_MODULE_CONFIG_FIELD_NUMBER: builtins.int
-    oem_icon_width: builtins.int
-    """
-    The Logo width in Px
-    """
-    oem_icon_height: builtins.int
-    """
-    The Logo height in Px
-    """
-    oem_icon_bits: builtins.bytes
-    """
-    The Logo in XBM bytechar format
-    """
-    oem_font: global___ScreenFonts.ValueType
-    """
-    Use this font for the OEM text.
-    """
-    oem_text: builtins.str
-    """
-    Use this font for the OEM text.
-    """
-    oem_aes_key: builtins.bytes
-    """
-    The default device encryption key, 16 or 32 byte
-    """
-    @property
-    def oem_local_config(self) -> meshtastic.localonly_pb2.LocalConfig:
-        """
-        A Preset LocalConfig to apply during factory reset
-        """
-    @property
-    def oem_local_module_config(self) -> meshtastic.localonly_pb2.LocalModuleConfig:
-        """
-        A Preset LocalModuleConfig to apply during factory reset
-        """
-    def __init__(
-        self,
-        *,
-        oem_icon_width: builtins.int = ...,
-        oem_icon_height: builtins.int = ...,
-        oem_icon_bits: builtins.bytes = ...,
-        oem_font: global___ScreenFonts.ValueType = ...,
-        oem_text: builtins.str = ...,
-        oem_aes_key: builtins.bytes = ...,
-        oem_local_config: meshtastic.localonly_pb2.LocalConfig | None = ...,
-        oem_local_module_config: meshtastic.localonly_pb2.LocalModuleConfig | None = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing_extensions.Literal["oem_local_config", b"oem_local_config", "oem_local_module_config", b"oem_local_module_config"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["oem_aes_key", b"oem_aes_key", "oem_font", b"oem_font", "oem_icon_bits", b"oem_icon_bits", "oem_icon_height", b"oem_icon_height", "oem_icon_width", b"oem_icon_width", "oem_local_config", b"oem_local_config", "oem_local_module_config", b"oem_local_module_config", "oem_text", b"oem_text"]) -> None: ...
-
-global___OEMStore = OEMStore

meshtastic/environmental_measurement_pb2.py

@@ -0,0 +1,104 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: environmental_measurement.proto
+
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from google.protobuf import reflection as _reflection
+from google.protobuf import symbol_database as _symbol_database
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+
+
+DESCRIPTOR = _descriptor.FileDescriptor(
+  name='environmental_measurement.proto',
+  package='',
+  syntax='proto3',
+  serialized_options=b'Z!github.com/meshtastic/gomeshproto',
+  serialized_pb=b'\n\x1f\x65nvironmental_measurement.proto\"\xa1\x01\n\x18\x45nvironmentalMeasurement\x12\x13\n\x0btemperature\x18\x01 \x01(\x02\x12\x19\n\x11relative_humidity\x18\x02 \x01(\x02\x12\x1b\n\x13\x62\x61rometric_pressure\x18\x03 \x01(\x02\x12\x16\n\x0egas_resistance\x18\x04 \x01(\x02\x12\x0f\n\x07voltage\x18\x05 \x01(\x02\x12\x0f\n\x07\x63urrent\x18\x06 \x01(\x02\x42#Z!github.com/meshtastic/gomeshprotob\x06proto3'
+)
+
+
+
+
+_ENVIRONMENTALMEASUREMENT = _descriptor.Descriptor(
+  name='EnvironmentalMeasurement',
+  full_name='EnvironmentalMeasurement',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='temperature', full_name='EnvironmentalMeasurement.temperature', index=0,
+      number=1, type=2, cpp_type=6, label=1,
+      has_default_value=False, default_value=float(0),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='relative_humidity', full_name='EnvironmentalMeasurement.relative_humidity', index=1,
+      number=2, type=2, cpp_type=6, label=1,
+      has_default_value=False, default_value=float(0),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='barometric_pressure', full_name='EnvironmentalMeasurement.barometric_pressure', index=2,
+      number=3, type=2, cpp_type=6, label=1,
+      has_default_value=False, default_value=float(0),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='gas_resistance', full_name='EnvironmentalMeasurement.gas_resistance', index=3,
+      number=4, type=2, cpp_type=6, label=1,
+      has_default_value=False, default_value=float(0),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='voltage', full_name='EnvironmentalMeasurement.voltage', index=4,
+      number=5, type=2, cpp_type=6, label=1,
+      has_default_value=False, default_value=float(0),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='current', full_name='EnvironmentalMeasurement.current', index=5,
+      number=6, type=2, cpp_type=6, label=1,
+      has_default_value=False, default_value=float(0),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=36,
+  serialized_end=197,
+)
+
+DESCRIPTOR.message_types_by_name['EnvironmentalMeasurement'] = _ENVIRONMENTALMEASUREMENT
+_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+
+EnvironmentalMeasurement = _reflection.GeneratedProtocolMessageType('EnvironmentalMeasurement', (_message.Message,), {
+  'DESCRIPTOR' : _ENVIRONMENTALMEASUREMENT,
+  '__module__' : 'environmental_measurement_pb2'
+  # @@protoc_insertion_point(class_scope:EnvironmentalMeasurement)
+  })
+_sym_db.RegisterMessage(EnvironmentalMeasurement)
+
+
+DESCRIPTOR._options = None
+# @@protoc_insertion_point(module_scope)

meshtastic/globals.py

@@ -8,10 +8,8 @@
 
 """
 
-
 class Globals:
     """Globals class is a Singleton."""
-
     __instance = None
 
     @staticmethod
@@ -24,7 +22,7 @@ class Globals:
     def __init__(self):
         """Constructor for the Globals CLass"""
         if Globals.__instance is not None:
-            raise Exception("This class is a singleton") # pylint: disable=W0719
+            raise Exception("This class is a singleton")
         else:
             Globals.__instance = self
         self.args = None

meshtastic/localonly_pb2.py

@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: meshtastic/localonly.proto
-"""Generated protocol buffer code."""
-from google.protobuf.internal import builder as _builder
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import descriptor_pool as _descriptor_pool
-from google.protobuf import symbol_database as _symbol_database
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-from meshtastic import config_pb2 as meshtastic_dot_config__pb2
-from meshtastic import module_config_pb2 as meshtastic_dot_module__config__pb2
-
-
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1ameshtastic/localonly.proto\x12\nmeshtastic\x1a\x17meshtastic/config.proto\x1a\x1emeshtastic/module_config.proto\"\xfd\x02\n\x0bLocalConfig\x12/\n\x06\x64\x65vice\x18\x01 \x01(\x0b\x32\x1f.meshtastic.Config.DeviceConfig\x12\x33\n\x08position\x18\x02 \x01(\x0b\x32!.meshtastic.Config.PositionConfig\x12-\n\x05power\x18\x03 \x01(\x0b\x32\x1e.meshtastic.Config.PowerConfig\x12\x31\n\x07network\x18\x04 \x01(\x0b\x32 .meshtastic.Config.NetworkConfig\x12\x31\n\x07\x64isplay\x18\x05 \x01(\x0b\x32 .meshtastic.Config.DisplayConfig\x12+\n\x04lora\x18\x06 \x01(\x0b\x32\x1d.meshtastic.Config.LoRaConfig\x12\x35\n\tbluetooth\x18\x07 \x01(\x0b\x32\".meshtastic.Config.BluetoothConfig\x12\x0f\n\x07version\x18\x08 \x01(\r\"\xfb\x06\n\x11LocalModuleConfig\x12\x31\n\x04mqtt\x18\x01 \x01(\x0b\x32#.meshtastic.ModuleConfig.MQTTConfig\x12\x35\n\x06serial\x18\x02 \x01(\x0b\x32%.meshtastic.ModuleConfig.SerialConfig\x12R\n\x15\x65xternal_notification\x18\x03 \x01(\x0b\x32\x33.meshtastic.ModuleConfig.ExternalNotificationConfig\x12\x42\n\rstore_forward\x18\x04 \x01(\x0b\x32+.meshtastic.ModuleConfig.StoreForwardConfig\x12<\n\nrange_test\x18\x05 \x01(\x0b\x32(.meshtastic.ModuleConfig.RangeTestConfig\x12;\n\ttelemetry\x18\x06 \x01(\x0b\x32(.meshtastic.ModuleConfig.TelemetryConfig\x12\x44\n\x0e\x63\x61nned_message\x18\x07 \x01(\x0b\x32,.meshtastic.ModuleConfig.CannedMessageConfig\x12\x33\n\x05\x61udio\x18\t \x01(\x0b\x32$.meshtastic.ModuleConfig.AudioConfig\x12\x46\n\x0fremote_hardware\x18\n \x01(\x0b\x32-.meshtastic.ModuleConfig.RemoteHardwareConfig\x12\x42\n\rneighbor_info\x18\x0b \x01(\x0b\x32+.meshtastic.ModuleConfig.NeighborInfoConfig\x12H\n\x10\x61mbient_lighting\x18\x0c \x01(\x0b\x32..meshtastic.ModuleConfig.AmbientLightingConfig\x12H\n\x10\x64\x65tection_sensor\x18\r \x01(\x0b\x32..meshtastic.ModuleConfig.DetectionSensorConfig\x12=\n\npaxcounter\x18\x0e \x01(\x0b\x32).meshtastic.ModuleConfig.PaxcounterConfig\x12\x0f\n\x07version\x18\x08 \x01(\rBd\n\x13\x63om.geeksville.meshB\x0fLocalOnlyProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
-
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.localonly_pb2', globals())
-if _descriptor._USE_C_DESCRIPTORS == False:
-
-  DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\017LocalOnlyProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
-  _LOCALCONFIG._serialized_start=100
-  _LOCALCONFIG._serialized_end=481
-  _LOCALMODULECONFIG._serialized_start=484
-  _LOCALMODULECONFIG._serialized_end=1375
-# @@protoc_insertion_point(module_scope)

meshtastic/localonly_pb2.pyi

@@ -1,204 +0,0 @@
-"""
-@generated by mypy-protobuf.  Do not edit manually!
-isort:skip_file
-"""
-import builtins
-import google.protobuf.descriptor
-import google.protobuf.message
-import meshtastic.config_pb2
-import meshtastic.module_config_pb2
-import sys
-
-if sys.version_info >= (3, 8):
-    import typing as typing_extensions
-else:
-    import typing_extensions
-
-DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
-
-@typing_extensions.final
-class LocalConfig(google.protobuf.message.Message):
-    """
-    Protobuf structures common to apponly.proto and deviceonly.proto
-    This is never sent over the wire, only for local use
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    DEVICE_FIELD_NUMBER: builtins.int
-    POSITION_FIELD_NUMBER: builtins.int
-    POWER_FIELD_NUMBER: builtins.int
-    NETWORK_FIELD_NUMBER: builtins.int
-    DISPLAY_FIELD_NUMBER: builtins.int
-    LORA_FIELD_NUMBER: builtins.int
-    BLUETOOTH_FIELD_NUMBER: builtins.int
-    VERSION_FIELD_NUMBER: builtins.int
-    @property
-    def device(self) -> meshtastic.config_pb2.Config.DeviceConfig:
-        """
-        The part of the config that is specific to the Device
-        """
-    @property
-    def position(self) -> meshtastic.config_pb2.Config.PositionConfig:
-        """
-        The part of the config that is specific to the GPS Position
-        """
-    @property
-    def power(self) -> meshtastic.config_pb2.Config.PowerConfig:
-        """
-        The part of the config that is specific to the Power settings
-        """
-    @property
-    def network(self) -> meshtastic.config_pb2.Config.NetworkConfig:
-        """
-        The part of the config that is specific to the Wifi Settings
-        """
-    @property
-    def display(self) -> meshtastic.config_pb2.Config.DisplayConfig:
-        """
-        The part of the config that is specific to the Display
-        """
-    @property
-    def lora(self) -> meshtastic.config_pb2.Config.LoRaConfig:
-        """
-        The part of the config that is specific to the Lora Radio
-        """
-    @property
-    def bluetooth(self) -> meshtastic.config_pb2.Config.BluetoothConfig:
-        """
-        The part of the config that is specific to the Bluetooth settings
-        """
-    version: builtins.int
-    """
-    A version integer used to invalidate old save files when we make
-    incompatible changes This integer is set at build time and is private to
-    NodeDB.cpp in the device code.
-    """
-    def __init__(
-        self,
-        *,
-        device: meshtastic.config_pb2.Config.DeviceConfig | None = ...,
-        position: meshtastic.config_pb2.Config.PositionConfig | None = ...,
-        power: meshtastic.config_pb2.Config.PowerConfig | None = ...,
-        network: meshtastic.config_pb2.Config.NetworkConfig | None = ...,
-        display: meshtastic.config_pb2.Config.DisplayConfig | None = ...,
-        lora: meshtastic.config_pb2.Config.LoRaConfig | None = ...,
-        bluetooth: meshtastic.config_pb2.Config.BluetoothConfig | None = ...,
-        version: builtins.int = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing_extensions.Literal["bluetooth", b"bluetooth", "device", b"device", "display", b"display", "lora", b"lora", "network", b"network", "position", b"position", "power", b"power"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["bluetooth", b"bluetooth", "device", b"device", "display", b"display", "lora", b"lora", "network", b"network", "position", b"position", "power", b"power", "version", b"version"]) -> None: ...
-
-global___LocalConfig = LocalConfig
-
-@typing_extensions.final
-class LocalModuleConfig(google.protobuf.message.Message):
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    MQTT_FIELD_NUMBER: builtins.int
-    SERIAL_FIELD_NUMBER: builtins.int
-    EXTERNAL_NOTIFICATION_FIELD_NUMBER: builtins.int
-    STORE_FORWARD_FIELD_NUMBER: builtins.int
-    RANGE_TEST_FIELD_NUMBER: builtins.int
-    TELEMETRY_FIELD_NUMBER: builtins.int
-    CANNED_MESSAGE_FIELD_NUMBER: builtins.int
-    AUDIO_FIELD_NUMBER: builtins.int
-    REMOTE_HARDWARE_FIELD_NUMBER: builtins.int
-    NEIGHBOR_INFO_FIELD_NUMBER: builtins.int
-    AMBIENT_LIGHTING_FIELD_NUMBER: builtins.int
-    DETECTION_SENSOR_FIELD_NUMBER: builtins.int
-    PAXCOUNTER_FIELD_NUMBER: builtins.int
-    VERSION_FIELD_NUMBER: builtins.int
-    @property
-    def mqtt(self) -> meshtastic.module_config_pb2.ModuleConfig.MQTTConfig:
-        """
-        The part of the config that is specific to the MQTT module
-        """
-    @property
-    def serial(self) -> meshtastic.module_config_pb2.ModuleConfig.SerialConfig:
-        """
-        The part of the config that is specific to the Serial module
-        """
-    @property
-    def external_notification(self) -> meshtastic.module_config_pb2.ModuleConfig.ExternalNotificationConfig:
-        """
-        The part of the config that is specific to the ExternalNotification module
-        """
-    @property
-    def store_forward(self) -> meshtastic.module_config_pb2.ModuleConfig.StoreForwardConfig:
-        """
-        The part of the config that is specific to the Store & Forward module
-        """
-    @property
-    def range_test(self) -> meshtastic.module_config_pb2.ModuleConfig.RangeTestConfig:
-        """
-        The part of the config that is specific to the RangeTest module
-        """
-    @property
-    def telemetry(self) -> meshtastic.module_config_pb2.ModuleConfig.TelemetryConfig:
-        """
-        The part of the config that is specific to the Telemetry module
-        """
-    @property
-    def canned_message(self) -> meshtastic.module_config_pb2.ModuleConfig.CannedMessageConfig:
-        """
-        The part of the config that is specific to the Canned Message module
-        """
-    @property
-    def audio(self) -> meshtastic.module_config_pb2.ModuleConfig.AudioConfig:
-        """
-        The part of the config that is specific to the Audio module
-        """
-    @property
-    def remote_hardware(self) -> meshtastic.module_config_pb2.ModuleConfig.RemoteHardwareConfig:
-        """
-        The part of the config that is specific to the Remote Hardware module
-        """
-    @property
-    def neighbor_info(self) -> meshtastic.module_config_pb2.ModuleConfig.NeighborInfoConfig:
-        """
-        The part of the config that is specific to the Neighbor Info module
-        """
-    @property
-    def ambient_lighting(self) -> meshtastic.module_config_pb2.ModuleConfig.AmbientLightingConfig:
-        """
-        The part of the config that is specific to the Ambient Lighting module
-        """
-    @property
-    def detection_sensor(self) -> meshtastic.module_config_pb2.ModuleConfig.DetectionSensorConfig:
-        """
-        The part of the config that is specific to the Detection Sensor module
-        """
-    @property
-    def paxcounter(self) -> meshtastic.module_config_pb2.ModuleConfig.PaxcounterConfig:
-        """
-        Paxcounter Config
-        """
-    version: builtins.int
-    """
-    A version integer used to invalidate old save files when we make
-    incompatible changes This integer is set at build time and is private to
-    NodeDB.cpp in the device code.
-    """
-    def __init__(
-        self,
-        *,
-        mqtt: meshtastic.module_config_pb2.ModuleConfig.MQTTConfig | None = ...,
-        serial: meshtastic.module_config_pb2.ModuleConfig.SerialConfig | None = ...,
-        external_notification: meshtastic.module_config_pb2.ModuleConfig.ExternalNotificationConfig | None = ...,
-        store_forward: meshtastic.module_config_pb2.ModuleConfig.StoreForwardConfig | None = ...,
-        range_test: meshtastic.module_config_pb2.ModuleConfig.RangeTestConfig | None = ...,
-        telemetry: meshtastic.module_config_pb2.ModuleConfig.TelemetryConfig | None = ...,
-        canned_message: meshtastic.module_config_pb2.ModuleConfig.CannedMessageConfig | None = ...,
-        audio: meshtastic.module_config_pb2.ModuleConfig.AudioConfig | None = ...,
-        remote_hardware: meshtastic.module_config_pb2.ModuleConfig.RemoteHardwareConfig | None = ...,
-        neighbor_info: meshtastic.module_config_pb2.ModuleConfig.NeighborInfoConfig | None = ...,
-        ambient_lighting: meshtastic.module_config_pb2.ModuleConfig.AmbientLightingConfig | None = ...,
-        detection_sensor: meshtastic.module_config_pb2.ModuleConfig.DetectionSensorConfig | None = ...,
-        paxcounter: meshtastic.module_config_pb2.ModuleConfig.PaxcounterConfig | None = ...,
-        version: builtins.int = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing_extensions.Literal["ambient_lighting", b"ambient_lighting", "audio", b"audio", "canned_message", b"canned_message", "detection_sensor", b"detection_sensor", "external_notification", b"external_notification", "mqtt", b"mqtt", "neighbor_info", b"neighbor_info", "paxcounter", b"paxcounter", "range_test", b"range_test", "remote_hardware", b"remote_hardware", "serial", b"serial", "store_forward", b"store_forward", "telemetry", b"telemetry"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["ambient_lighting", b"ambient_lighting", "audio", b"audio", "canned_message", b"canned_message", "detection_sensor", b"detection_sensor", "external_notification", b"external_notification", "mqtt", b"mqtt", "neighbor_info", b"neighbor_info", "paxcounter", b"paxcounter", "range_test", b"range_test", "remote_hardware", b"remote_hardware", "serial", b"serial", "store_forward", b"store_forward", "telemetry", b"telemetry", "version", b"version"]) -> None: ...
-
-global___LocalModuleConfig = LocalModuleConfig

meshtastic/mqtt_pb2.py

@@ -1,30 +1,86 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: meshtastic/mqtt.proto
+# source: mqtt.proto
-"""Generated protocol buffer code."""
+
-from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
-from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import message as _message
+from google.protobuf import reflection as _reflection
 from google.protobuf import symbol_database as _symbol_database
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
 
 
-from meshtastic import config_pb2 as meshtastic_dot_config__pb2
+from . import mesh_pb2 as mesh__pb2
-from meshtastic import mesh_pb2 as meshtastic_dot_mesh__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x15meshtastic/mqtt.proto\x12\nmeshtastic\x1a\x17meshtastic/config.proto\x1a\x15meshtastic/mesh.proto\"a\n\x0fServiceEnvelope\x12&\n\x06packet\x18\x01 \x01(\x0b\x32\x16.meshtastic.MeshPacket\x12\x12\n\nchannel_id\x18\x02 \x01(\t\x12\x12\n\ngateway_id\x18\x03 \x01(\t\"\xbc\x03\n\tMapReport\x12\x11\n\tlong_name\x18\x01 \x01(\t\x12\x12\n\nshort_name\x18\x02 \x01(\t\x12\x32\n\x04role\x18\x03 \x01(\x0e\x32$.meshtastic.Config.DeviceConfig.Role\x12+\n\x08hw_model\x18\x04 \x01(\x0e\x32\x19.meshtastic.HardwareModel\x12\x18\n\x10\x66irmware_version\x18\x05 \x01(\t\x12\x38\n\x06region\x18\x06 \x01(\x0e\x32(.meshtastic.Config.LoRaConfig.RegionCode\x12?\n\x0cmodem_preset\x18\x07 \x01(\x0e\x32).meshtastic.Config.LoRaConfig.ModemPreset\x12\x1b\n\x13has_default_channel\x18\x08 \x01(\x08\x12\x12\n\nlatitude_i\x18\t \x01(\x0f\x12\x13\n\x0blongitude_i\x18\n \x01(\x0f\x12\x10\n\x08\x61ltitude\x18\x0b \x01(\x05\x12\x1a\n\x12position_precision\x18\x0c \x01(\r\x12\x1e\n\x16num_online_local_nodes\x18\r \x01(\rB_\n\x13\x63om.geeksville.meshB\nMQTTProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor.FileDescriptor(
+  name='mqtt.proto',
+  package='',
+  syntax='proto3',
+  serialized_options=b'\n\023com.geeksville.meshB\nMQTTProtosH\003Z!github.com/meshtastic/gomeshproto',
+  serialized_pb=b'\n\nmqtt.proto\x1a\nmesh.proto\"V\n\x0fServiceEnvelope\x12\x1b\n\x06packet\x18\x01 \x01(\x0b\x32\x0b.MeshPacket\x12\x12\n\nchannel_id\x18\x02 \x01(\t\x12\x12\n\ngateway_id\x18\x03 \x01(\tBF\n\x13\x63om.geeksville.meshB\nMQTTProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3'
+  ,
+  dependencies=[mesh__pb2.DESCRIPTOR,])
 
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.mqtt_pb2', globals())
-if _descriptor._USE_C_DESCRIPTORS == False:
 
-  DESCRIPTOR._options = None
+
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\nMQTTProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+
-  _SERVICEENVELOPE._serialized_start=85
+_SERVICEENVELOPE = _descriptor.Descriptor(
-  _SERVICEENVELOPE._serialized_end=182
+  name='ServiceEnvelope',
-  _MAPREPORT._serialized_start=185
+  full_name='ServiceEnvelope',
-  _MAPREPORT._serialized_end=629
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='packet', full_name='ServiceEnvelope.packet', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='channel_id', full_name='ServiceEnvelope.channel_id', index=1,
+      number=2, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=b"".decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='gateway_id', full_name='ServiceEnvelope.gateway_id', index=2,
+      number=3, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=b"".decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=26,
+  serialized_end=112,
+)
+
+_SERVICEENVELOPE.fields_by_name['packet'].message_type = mesh__pb2._MESHPACKET
+DESCRIPTOR.message_types_by_name['ServiceEnvelope'] = _SERVICEENVELOPE
+_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+
+ServiceEnvelope = _reflection.GeneratedProtocolMessageType('ServiceEnvelope', (_message.Message,), {
+  'DESCRIPTOR' : _SERVICEENVELOPE,
+  '__module__' : 'mqtt_pb2'
+  # @@protoc_insertion_point(class_scope:ServiceEnvelope)
+  })
+_sym_db.RegisterMessage(ServiceEnvelope)
+
+
+DESCRIPTOR._options = None
 # @@protoc_insertion_point(module_scope)

meshtastic/mqtt_pb2.pyi

@@ -1,151 +0,0 @@
-"""
-@generated by mypy-protobuf.  Do not edit manually!
-isort:skip_file
-"""
-import builtins
-import google.protobuf.descriptor
-import google.protobuf.message
-import meshtastic.config_pb2
-import meshtastic.mesh_pb2
-import sys
-
-if sys.version_info >= (3, 8):
-    import typing as typing_extensions
-else:
-    import typing_extensions
-
-DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
-
-@typing_extensions.final
-class ServiceEnvelope(google.protobuf.message.Message):
-    """
-    This message wraps a MeshPacket with extra metadata about the sender and how it arrived.
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    PACKET_FIELD_NUMBER: builtins.int
-    CHANNEL_ID_FIELD_NUMBER: builtins.int
-    GATEWAY_ID_FIELD_NUMBER: builtins.int
-    @property
-    def packet(self) -> meshtastic.mesh_pb2.MeshPacket:
-        """
-        The (probably encrypted) packet
-        """
-    channel_id: builtins.str
-    """
-    The global channel ID it was sent on
-    """
-    gateway_id: builtins.str
-    """
-    The sending gateway node ID. Can we use this to authenticate/prevent fake
-    nodeid impersonation for senders? - i.e. use gateway/mesh id (which is authenticated) + local node id as
-    the globally trusted nodenum
-    """
-    def __init__(
-        self,
-        *,
-        packet: meshtastic.mesh_pb2.MeshPacket | None = ...,
-        channel_id: builtins.str = ...,
-        gateway_id: builtins.str = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing_extensions.Literal["packet", b"packet"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["channel_id", b"channel_id", "gateway_id", b"gateway_id", "packet", b"packet"]) -> None: ...
-
-global___ServiceEnvelope = ServiceEnvelope
-
-@typing_extensions.final
-class MapReport(google.protobuf.message.Message):
-    """
-    Information about a node intended to be reported unencrypted to a map using MQTT.
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    LONG_NAME_FIELD_NUMBER: builtins.int
-    SHORT_NAME_FIELD_NUMBER: builtins.int
-    ROLE_FIELD_NUMBER: builtins.int
-    HW_MODEL_FIELD_NUMBER: builtins.int
-    FIRMWARE_VERSION_FIELD_NUMBER: builtins.int
-    REGION_FIELD_NUMBER: builtins.int
-    MODEM_PRESET_FIELD_NUMBER: builtins.int
-    HAS_DEFAULT_CHANNEL_FIELD_NUMBER: builtins.int
-    LATITUDE_I_FIELD_NUMBER: builtins.int
-    LONGITUDE_I_FIELD_NUMBER: builtins.int
-    ALTITUDE_FIELD_NUMBER: builtins.int
-    POSITION_PRECISION_FIELD_NUMBER: builtins.int
-    NUM_ONLINE_LOCAL_NODES_FIELD_NUMBER: builtins.int
-    long_name: builtins.str
-    """
-    A full name for this user, i.e. "Kevin Hester"
-    """
-    short_name: builtins.str
-    """
-    A VERY short name, ideally two characters.
-    Suitable for a tiny OLED screen
-    """
-    role: meshtastic.config_pb2.Config.DeviceConfig.Role.ValueType
-    """
-    Role of the node that applies specific settings for a particular use-case
-    """
-    hw_model: meshtastic.mesh_pb2.HardwareModel.ValueType
-    """
-    Hardware model of the node, i.e. T-Beam, Heltec V3, etc...
-    """
-    firmware_version: builtins.str
-    """
-    Device firmware version string
-    """
-    region: meshtastic.config_pb2.Config.LoRaConfig.RegionCode.ValueType
-    """
-    The region code for the radio (US, CN, EU433, etc...)
-    """
-    modem_preset: meshtastic.config_pb2.Config.LoRaConfig.ModemPreset.ValueType
-    """
-    Modem preset used by the radio (LongFast, MediumSlow, etc...)
-    """
-    has_default_channel: builtins.bool
-    """
-    Whether the node has a channel with default PSK and name (LongFast, MediumSlow, etc...)
-    and it uses the default frequency slot given the region and modem preset.
-    """
-    latitude_i: builtins.int
-    """
-    Latitude: multiply by 1e-7 to get degrees in floating point
-    """
-    longitude_i: builtins.int
-    """
-    Longitude: multiply by 1e-7 to get degrees in floating point
-    """
-    altitude: builtins.int
-    """
-    Altitude in meters above MSL
-    """
-    position_precision: builtins.int
-    """
-    Indicates the bits of precision for latitude and longitude set by the sending node
-    """
-    num_online_local_nodes: builtins.int
-    """
-    Number of online nodes (heard in the last 2 hours) this node has in its list that were received locally (not via MQTT)
-    """
-    def __init__(
-        self,
-        *,
-        long_name: builtins.str = ...,
-        short_name: builtins.str = ...,
-        role: meshtastic.config_pb2.Config.DeviceConfig.Role.ValueType = ...,
-        hw_model: meshtastic.mesh_pb2.HardwareModel.ValueType = ...,
-        firmware_version: builtins.str = ...,
-        region: meshtastic.config_pb2.Config.LoRaConfig.RegionCode.ValueType = ...,
-        modem_preset: meshtastic.config_pb2.Config.LoRaConfig.ModemPreset.ValueType = ...,
-        has_default_channel: builtins.bool = ...,
-        latitude_i: builtins.int = ...,
-        longitude_i: builtins.int = ...,
-        altitude: builtins.int = ...,
-        position_precision: builtins.int = ...,
-        num_online_local_nodes: builtins.int = ...,
-    ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["altitude", b"altitude", "firmware_version", b"firmware_version", "has_default_channel", b"has_default_channel", "hw_model", b"hw_model", "latitude_i", b"latitude_i", "long_name", b"long_name", "longitude_i", b"longitude_i", "modem_preset", b"modem_preset", "num_online_local_nodes", b"num_online_local_nodes", "position_precision", b"position_precision", "region", b"region", "role", b"role", "short_name", b"short_name"]) -> None: ...
-
-global___MapReport = MapReport

meshtastic/nanopb_pb2.py

@@ -1,39 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: nanopb.proto
-"""Generated protocol buffer code."""
-from google.protobuf.internal import builder as _builder
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import descriptor_pool as _descriptor_pool
-from google.protobuf import symbol_database as _symbol_database
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-from google.protobuf import descriptor_pb2 as google_dot_protobuf_dot_descriptor__pb2
-
-
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0cnanopb.proto\x1a google/protobuf/descriptor.proto\"\xa4\x07\n\rNanoPBOptions\x12\x10\n\x08max_size\x18\x01 \x01(\x05\x12\x12\n\nmax_length\x18\x0e \x01(\x05\x12\x11\n\tmax_count\x18\x02 \x01(\x05\x12&\n\x08int_size\x18\x07 \x01(\x0e\x32\x08.IntSize:\nIS_DEFAULT\x12$\n\x04type\x18\x03 \x01(\x0e\x32\n.FieldType:\nFT_DEFAULT\x12\x18\n\nlong_names\x18\x04 \x01(\x08:\x04true\x12\x1c\n\rpacked_struct\x18\x05 \x01(\x08:\x05\x66\x61lse\x12\x1a\n\x0bpacked_enum\x18\n \x01(\x08:\x05\x66\x61lse\x12\x1b\n\x0cskip_message\x18\x06 \x01(\x08:\x05\x66\x61lse\x12\x18\n\tno_unions\x18\x08 \x01(\x08:\x05\x66\x61lse\x12\r\n\x05msgid\x18\t \x01(\r\x12\x1e\n\x0f\x61nonymous_oneof\x18\x0b \x01(\x08:\x05\x66\x61lse\x12\x15\n\x06proto3\x18\x0c \x01(\x08:\x05\x66\x61lse\x12#\n\x14proto3_singular_msgs\x18\x15 \x01(\x08:\x05\x66\x61lse\x12\x1d\n\x0e\x65num_to_string\x18\r \x01(\x08:\x05\x66\x61lse\x12\x1b\n\x0c\x66ixed_length\x18\x0f \x01(\x08:\x05\x66\x61lse\x12\x1a\n\x0b\x66ixed_count\x18\x10 \x01(\x08:\x05\x66\x61lse\x12\x1e\n\x0fsubmsg_callback\x18\x16 \x01(\x08:\x05\x66\x61lse\x12/\n\x0cmangle_names\x18\x11 \x01(\x0e\x32\x11.TypenameMangling:\x06M_NONE\x12(\n\x11\x63\x61llback_datatype\x18\x12 \x01(\t:\rpb_callback_t\x12\x34\n\x11\x63\x61llback_function\x18\x13 \x01(\t:\x19pb_default_field_callback\x12\x30\n\x0e\x64\x65scriptorsize\x18\x14 \x01(\x0e\x32\x0f.DescriptorSize:\x07\x44S_AUTO\x12\x1a\n\x0b\x64\x65\x66\x61ult_has\x18\x17 \x01(\x08:\x05\x66\x61lse\x12\x0f\n\x07include\x18\x18 \x03(\t\x12\x0f\n\x07\x65xclude\x18\x1a \x03(\t\x12\x0f\n\x07package\x18\x19 \x01(\t\x12\x41\n\rtype_override\x18\x1b \x01(\x0e\x32*.google.protobuf.FieldDescriptorProto.Type\x12\x19\n\x0bsort_by_tag\x18\x1c \x01(\x08:\x04true\x12.\n\rfallback_type\x18\x1d \x01(\x0e\x32\n.FieldType:\x0b\x46T_CALLBACK*i\n\tFieldType\x12\x0e\n\nFT_DEFAULT\x10\x00\x12\x0f\n\x0b\x46T_CALLBACK\x10\x01\x12\x0e\n\nFT_POINTER\x10\x04\x12\r\n\tFT_STATIC\x10\x02\x12\r\n\tFT_IGNORE\x10\x03\x12\r\n\tFT_INLINE\x10\x05*D\n\x07IntSize\x12\x0e\n\nIS_DEFAULT\x10\x00\x12\x08\n\x04IS_8\x10\x08\x12\t\n\x05IS_16\x10\x10\x12\t\n\x05IS_32\x10 \x12\t\n\x05IS_64\x10@*Z\n\x10TypenameMangling\x12\n\n\x06M_NONE\x10\x00\x12\x13\n\x0fM_STRIP_PACKAGE\x10\x01\x12\r\n\tM_FLATTEN\x10\x02\x12\x16\n\x12M_PACKAGE_INITIALS\x10\x03*E\n\x0e\x44\x65scriptorSize\x12\x0b\n\x07\x44S_AUTO\x10\x00\x12\x08\n\x04\x44S_1\x10\x01\x12\x08\n\x04\x44S_2\x10\x02\x12\x08\n\x04\x44S_4\x10\x04\x12\x08\n\x04\x44S_8\x10\x08:E\n\x0enanopb_fileopt\x12\x1c.google.protobuf.FileOptions\x18\xf2\x07 \x01(\x0b\x32\x0e.NanoPBOptions:G\n\rnanopb_msgopt\x12\x1f.google.protobuf.MessageOptions\x18\xf2\x07 \x01(\x0b\x32\x0e.NanoPBOptions:E\n\x0enanopb_enumopt\x12\x1c.google.protobuf.EnumOptions\x18\xf2\x07 \x01(\x0b\x32\x0e.NanoPBOptions:>\n\x06nanopb\x12\x1d.google.protobuf.FieldOptions\x18\xf2\x07 \x01(\x0b\x32\x0e.NanoPBOptionsB\x1a\n\x18\x66i.kapsi.koti.jpa.nanopb')
-
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'nanopb_pb2', globals())
-if _descriptor._USE_C_DESCRIPTORS == False:
-  google_dot_protobuf_dot_descriptor__pb2.FileOptions.RegisterExtension(nanopb_fileopt)
-  google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(nanopb_msgopt)
-  google_dot_protobuf_dot_descriptor__pb2.EnumOptions.RegisterExtension(nanopb_enumopt)
-  google_dot_protobuf_dot_descriptor__pb2.FieldOptions.RegisterExtension(nanopb)
-
-  DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\030fi.kapsi.koti.jpa.nanopb'
-  _FIELDTYPE._serialized_start=985
-  _FIELDTYPE._serialized_end=1090
-  _INTSIZE._serialized_start=1092
-  _INTSIZE._serialized_end=1160
-  _TYPENAMEMANGLING._serialized_start=1162
-  _TYPENAMEMANGLING._serialized_end=1252
-  _DESCRIPTORSIZE._serialized_start=1254
-  _DESCRIPTORSIZE._serialized_end=1323
-  _NANOPBOPTIONS._serialized_start=51
-  _NANOPBOPTIONS._serialized_end=983
-# @@protoc_insertion_point(module_scope)

meshtastic/nanopb_pb2.pyi

@@ -1,321 +0,0 @@
-"""
-@generated by mypy-protobuf.  Do not edit manually!
-isort:skip_file
-Custom options for defining:
-- Maximum size of string/bytes
-- Maximum number of elements in array
-
-These are used by nanopb to generate statically allocable structures
-for memory-limited environments.
-"""
-import builtins
-import collections.abc
-import google.protobuf.descriptor
-import google.protobuf.descriptor_pb2
-import google.protobuf.internal.containers
-import google.protobuf.internal.enum_type_wrapper
-import google.protobuf.internal.extension_dict
-import google.protobuf.message
-import sys
-import typing
-
-if sys.version_info >= (3, 10):
-    import typing as typing_extensions
-else:
-    import typing_extensions
-
-DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
-
-class _FieldType:
-    ValueType = typing.NewType("ValueType", builtins.int)
-    V: typing_extensions.TypeAlias = ValueType
-
-class _FieldTypeEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[_FieldType.ValueType], builtins.type):
-    DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
-    FT_DEFAULT: _FieldType.ValueType  # 0
-    """Automatically decide field type, generate static field if possible."""
-    FT_CALLBACK: _FieldType.ValueType  # 1
-    """Always generate a callback field."""
-    FT_POINTER: _FieldType.ValueType  # 4
-    """Always generate a dynamically allocated field."""
-    FT_STATIC: _FieldType.ValueType  # 2
-    """Generate a static field or raise an exception if not possible."""
-    FT_IGNORE: _FieldType.ValueType  # 3
-    """Ignore the field completely."""
-    FT_INLINE: _FieldType.ValueType  # 5
-    """Legacy option, use the separate 'fixed_length' option instead"""
-
-class FieldType(_FieldType, metaclass=_FieldTypeEnumTypeWrapper): ...
-
-FT_DEFAULT: FieldType.ValueType  # 0
-"""Automatically decide field type, generate static field if possible."""
-FT_CALLBACK: FieldType.ValueType  # 1
-"""Always generate a callback field."""
-FT_POINTER: FieldType.ValueType  # 4
-"""Always generate a dynamically allocated field."""
-FT_STATIC: FieldType.ValueType  # 2
-"""Generate a static field or raise an exception if not possible."""
-FT_IGNORE: FieldType.ValueType  # 3
-"""Ignore the field completely."""
-FT_INLINE: FieldType.ValueType  # 5
-"""Legacy option, use the separate 'fixed_length' option instead"""
-global___FieldType = FieldType
-
-class _IntSize:
-    ValueType = typing.NewType("ValueType", builtins.int)
-    V: typing_extensions.TypeAlias = ValueType
-
-class _IntSizeEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[_IntSize.ValueType], builtins.type):
-    DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
-    IS_DEFAULT: _IntSize.ValueType  # 0
-    """Default, 32/64bit based on type in .proto"""
-    IS_8: _IntSize.ValueType  # 8
-    IS_16: _IntSize.ValueType  # 16
-    IS_32: _IntSize.ValueType  # 32
-    IS_64: _IntSize.ValueType  # 64
-
-class IntSize(_IntSize, metaclass=_IntSizeEnumTypeWrapper): ...
-
-IS_DEFAULT: IntSize.ValueType  # 0
-"""Default, 32/64bit based on type in .proto"""
-IS_8: IntSize.ValueType  # 8
-IS_16: IntSize.ValueType  # 16
-IS_32: IntSize.ValueType  # 32
-IS_64: IntSize.ValueType  # 64
-global___IntSize = IntSize
-
-class _TypenameMangling:
-    ValueType = typing.NewType("ValueType", builtins.int)
-    V: typing_extensions.TypeAlias = ValueType
-
-class _TypenameManglingEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[_TypenameMangling.ValueType], builtins.type):
-    DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
-    M_NONE: _TypenameMangling.ValueType  # 0
-    """Default, no typename mangling"""
-    M_STRIP_PACKAGE: _TypenameMangling.ValueType  # 1
-    """Strip current package name"""
-    M_FLATTEN: _TypenameMangling.ValueType  # 2
-    """Only use last path component"""
-    M_PACKAGE_INITIALS: _TypenameMangling.ValueType  # 3
-    """Replace the package name by the initials"""
-
-class TypenameMangling(_TypenameMangling, metaclass=_TypenameManglingEnumTypeWrapper): ...
-
-M_NONE: TypenameMangling.ValueType  # 0
-"""Default, no typename mangling"""
-M_STRIP_PACKAGE: TypenameMangling.ValueType  # 1
-"""Strip current package name"""
-M_FLATTEN: TypenameMangling.ValueType  # 2
-"""Only use last path component"""
-M_PACKAGE_INITIALS: TypenameMangling.ValueType  # 3
-"""Replace the package name by the initials"""
-global___TypenameMangling = TypenameMangling
-
-class _DescriptorSize:
-    ValueType = typing.NewType("ValueType", builtins.int)
-    V: typing_extensions.TypeAlias = ValueType
-
-class _DescriptorSizeEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[_DescriptorSize.ValueType], builtins.type):
-    DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
-    DS_AUTO: _DescriptorSize.ValueType  # 0
-    """Select minimal size based on field type"""
-    DS_1: _DescriptorSize.ValueType  # 1
-    """1 word; up to 15 byte fields, no arrays"""
-    DS_2: _DescriptorSize.ValueType  # 2
-    """2 words; up to 4095 byte fields, 4095 entry arrays"""
-    DS_4: _DescriptorSize.ValueType  # 4
-    """4 words; up to 2^32-1 byte fields, 2^16-1 entry arrays"""
-    DS_8: _DescriptorSize.ValueType  # 8
-    """8 words; up to 2^32-1 entry arrays"""
-
-class DescriptorSize(_DescriptorSize, metaclass=_DescriptorSizeEnumTypeWrapper): ...
-
-DS_AUTO: DescriptorSize.ValueType  # 0
-"""Select minimal size based on field type"""
-DS_1: DescriptorSize.ValueType  # 1
-"""1 word; up to 15 byte fields, no arrays"""
-DS_2: DescriptorSize.ValueType  # 2
-"""2 words; up to 4095 byte fields, 4095 entry arrays"""
-DS_4: DescriptorSize.ValueType  # 4
-"""4 words; up to 2^32-1 byte fields, 2^16-1 entry arrays"""
-DS_8: DescriptorSize.ValueType  # 8
-"""8 words; up to 2^32-1 entry arrays"""
-global___DescriptorSize = DescriptorSize
-
-@typing_extensions.final
-class NanoPBOptions(google.protobuf.message.Message):
-    """This is the inner options message, which basically defines options for
-    a field. When it is used in message or file scope, it applies to all
-    fields.
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    MAX_SIZE_FIELD_NUMBER: builtins.int
-    MAX_LENGTH_FIELD_NUMBER: builtins.int
-    MAX_COUNT_FIELD_NUMBER: builtins.int
-    INT_SIZE_FIELD_NUMBER: builtins.int
-    TYPE_FIELD_NUMBER: builtins.int
-    LONG_NAMES_FIELD_NUMBER: builtins.int
-    PACKED_STRUCT_FIELD_NUMBER: builtins.int
-    PACKED_ENUM_FIELD_NUMBER: builtins.int
-    SKIP_MESSAGE_FIELD_NUMBER: builtins.int
-    NO_UNIONS_FIELD_NUMBER: builtins.int
-    MSGID_FIELD_NUMBER: builtins.int
-    ANONYMOUS_ONEOF_FIELD_NUMBER: builtins.int
-    PROTO3_FIELD_NUMBER: builtins.int
-    PROTO3_SINGULAR_MSGS_FIELD_NUMBER: builtins.int
-    ENUM_TO_STRING_FIELD_NUMBER: builtins.int
-    FIXED_LENGTH_FIELD_NUMBER: builtins.int
-    FIXED_COUNT_FIELD_NUMBER: builtins.int
-    SUBMSG_CALLBACK_FIELD_NUMBER: builtins.int
-    MANGLE_NAMES_FIELD_NUMBER: builtins.int
-    CALLBACK_DATATYPE_FIELD_NUMBER: builtins.int
-    CALLBACK_FUNCTION_FIELD_NUMBER: builtins.int
-    DESCRIPTORSIZE_FIELD_NUMBER: builtins.int
-    DEFAULT_HAS_FIELD_NUMBER: builtins.int
-    INCLUDE_FIELD_NUMBER: builtins.int
-    EXCLUDE_FIELD_NUMBER: builtins.int
-    PACKAGE_FIELD_NUMBER: builtins.int
-    TYPE_OVERRIDE_FIELD_NUMBER: builtins.int
-    SORT_BY_TAG_FIELD_NUMBER: builtins.int
-    FALLBACK_TYPE_FIELD_NUMBER: builtins.int
-    max_size: builtins.int
-    """Allocated size for 'bytes' and 'string' fields.
-    For string fields, this should include the space for null terminator.
-    """
-    max_length: builtins.int
-    """Maximum length for 'string' fields. Setting this is equivalent
-    to setting max_size to a value of length+1.
-    """
-    max_count: builtins.int
-    """Allocated number of entries in arrays ('repeated' fields)"""
-    int_size: global___IntSize.ValueType
-    """Size of integer fields. Can save some memory if you don't need
-    full 32 bits for the value.
-    """
-    type: global___FieldType.ValueType
-    """Force type of field (callback or static allocation)"""
-    long_names: builtins.bool
-    """Use long names for enums, i.e. EnumName_EnumValue."""
-    packed_struct: builtins.bool
-    """Add 'packed' attribute to generated structs.
-    Note: this cannot be used on CPUs that break on unaligned
-    accesses to variables.
-    """
-    packed_enum: builtins.bool
-    """Add 'packed' attribute to generated enums."""
-    skip_message: builtins.bool
-    """Skip this message"""
-    no_unions: builtins.bool
-    """Generate oneof fields as normal optional fields instead of union."""
-    msgid: builtins.int
-    """integer type tag for a message"""
-    anonymous_oneof: builtins.bool
-    """decode oneof as anonymous union"""
-    proto3: builtins.bool
-    """Proto3 singular field does not generate a "has_" flag"""
-    proto3_singular_msgs: builtins.bool
-    """Force proto3 messages to have no "has_" flag.
-    This was default behavior until nanopb-0.4.0.
-    """
-    enum_to_string: builtins.bool
-    """Generate an enum->string mapping function (can take up lots of space)."""
-    fixed_length: builtins.bool
-    """Generate bytes arrays with fixed length"""
-    fixed_count: builtins.bool
-    """Generate repeated field with fixed count"""
-    submsg_callback: builtins.bool
-    """Generate message-level callback that is called before decoding submessages.
-    This can be used to set callback fields for submsgs inside oneofs.
-    """
-    mangle_names: global___TypenameMangling.ValueType
-    """Shorten or remove package names from type names.
-    This option applies only on the file level.
-    """
-    callback_datatype: builtins.str
-    """Data type for storage associated with callback fields."""
-    callback_function: builtins.str
-    """Callback function used for encoding and decoding.
-    Prior to nanopb-0.4.0, the callback was specified in per-field pb_callback_t
-    structure. This is still supported, but does not work inside e.g. oneof or pointer
-    fields. Instead, a new method allows specifying a per-message callback that
-    will be called for all callback fields in a message type.
-    """
-    descriptorsize: global___DescriptorSize.ValueType
-    """Select the size of field descriptors. This option has to be defined
-    for the whole message, not per-field. Usually automatic selection is
-    ok, but if it results in compilation errors you can increase the field
-    size here.
-    """
-    default_has: builtins.bool
-    """Set default value for has_ fields."""
-    @property
-    def include(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[builtins.str]:
-        """Extra files to include in generated `.pb.h`"""
-    @property
-    def exclude(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[builtins.str]:
-        """Automatic includes to exclude from generated `.pb.h`
-        Same as nanopb_generator.py command line flag -x.
-        """
-    package: builtins.str
-    """Package name that applies only for nanopb."""
-    type_override: google.protobuf.descriptor_pb2.FieldDescriptorProto.Type.ValueType
-    """Override type of the field in generated C code. Only to be used with related field types"""
-    sort_by_tag: builtins.bool
-    """Due to historical reasons, nanopb orders fields in structs by their tag number
-    instead of the order in .proto. Set this to false to keep the .proto order.
-    The default value will probably change to false in nanopb-0.5.0.
-    """
-    fallback_type: global___FieldType.ValueType
-    """Set the FT_DEFAULT field conversion strategy.
-    A field that can become a static member of a c struct (e.g. int, bool, etc)
-    will be a a static field.
-    Fields with dynamic length are converted to either a pointer or a callback.
-    """
-    def __init__(
-        self,
-        *,
-        max_size: builtins.int | None = ...,
-        max_length: builtins.int | None = ...,
-        max_count: builtins.int | None = ...,
-        int_size: global___IntSize.ValueType | None = ...,
-        type: global___FieldType.ValueType | None = ...,
-        long_names: builtins.bool | None = ...,
-        packed_struct: builtins.bool | None = ...,
-        packed_enum: builtins.bool | None = ...,
-        skip_message: builtins.bool | None = ...,
-        no_unions: builtins.bool | None = ...,
-        msgid: builtins.int | None = ...,
-        anonymous_oneof: builtins.bool | None = ...,
-        proto3: builtins.bool | None = ...,
-        proto3_singular_msgs: builtins.bool | None = ...,
-        enum_to_string: builtins.bool | None = ...,
-        fixed_length: builtins.bool | None = ...,
-        fixed_count: builtins.bool | None = ...,
-        submsg_callback: builtins.bool | None = ...,
-        mangle_names: global___TypenameMangling.ValueType | None = ...,
-        callback_datatype: builtins.str | None = ...,
-        callback_function: builtins.str | None = ...,
-        descriptorsize: global___DescriptorSize.ValueType | None = ...,
-        default_has: builtins.bool | None = ...,
-        include: collections.abc.Iterable[builtins.str] | None = ...,
-        exclude: collections.abc.Iterable[builtins.str] | None = ...,
-        package: builtins.str | None = ...,
-        type_override: google.protobuf.descriptor_pb2.FieldDescriptorProto.Type.ValueType | None = ...,
-        sort_by_tag: builtins.bool | None = ...,
-        fallback_type: global___FieldType.ValueType | None = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing_extensions.Literal["anonymous_oneof", b"anonymous_oneof", "callback_datatype", b"callback_datatype", "callback_function", b"callback_function", "default_has", b"default_has", "descriptorsize", b"descriptorsize", "enum_to_string", b"enum_to_string", "fallback_type", b"fallback_type", "fixed_count", b"fixed_count", "fixed_length", b"fixed_length", "int_size", b"int_size", "long_names", b"long_names", "mangle_names", b"mangle_names", "max_count", b"max_count", "max_length", b"max_length", "max_size", b"max_size", "msgid", b"msgid", "no_unions", b"no_unions", "package", b"package", "packed_enum", b"packed_enum", "packed_struct", b"packed_struct", "proto3", b"proto3", "proto3_singular_msgs", b"proto3_singular_msgs", "skip_message", b"skip_message", "sort_by_tag", b"sort_by_tag", "submsg_callback", b"submsg_callback", "type", b"type", "type_override", b"type_override"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["anonymous_oneof", b"anonymous_oneof", "callback_datatype", b"callback_datatype", "callback_function", b"callback_function", "default_has", b"default_has", "descriptorsize", b"descriptorsize", "enum_to_string", b"enum_to_string", "exclude", b"exclude", "fallback_type", b"fallback_type", "fixed_count", b"fixed_count", "fixed_length", b"fixed_length", "include", b"include", "int_size", b"int_size", "long_names", b"long_names", "mangle_names", b"mangle_names", "max_count", b"max_count", "max_length", b"max_length", "max_size", b"max_size", "msgid", b"msgid", "no_unions", b"no_unions", "package", b"package", "packed_enum", b"packed_enum", "packed_struct", b"packed_struct", "proto3", b"proto3", "proto3_singular_msgs", b"proto3_singular_msgs", "skip_message", b"skip_message", "sort_by_tag", b"sort_by_tag", "submsg_callback", b"submsg_callback", "type", b"type", "type_override", b"type_override"]) -> None: ...
-
-global___NanoPBOptions = NanoPBOptions
-
-NANOPB_FILEOPT_FIELD_NUMBER: builtins.int
-NANOPB_MSGOPT_FIELD_NUMBER: builtins.int
-NANOPB_ENUMOPT_FIELD_NUMBER: builtins.int
-NANOPB_FIELD_NUMBER: builtins.int
-nanopb_fileopt: google.protobuf.internal.extension_dict._ExtensionFieldDescriptor[google.protobuf.descriptor_pb2.FileOptions, global___NanoPBOptions]
-nanopb_msgopt: google.protobuf.internal.extension_dict._ExtensionFieldDescriptor[google.protobuf.descriptor_pb2.MessageOptions, global___NanoPBOptions]
-nanopb_enumopt: google.protobuf.internal.extension_dict._ExtensionFieldDescriptor[google.protobuf.descriptor_pb2.EnumOptions, global___NanoPBOptions]
-nanopb: google.protobuf.internal.extension_dict._ExtensionFieldDescriptor[google.protobuf.descriptor_pb2.FieldOptions, global___NanoPBOptions]

meshtastic/node.py

@@ -1,42 +1,36 @@
 """Node class
 """
 
-import base64
 import logging
+import base64
 import time
-
+from google.protobuf.json_format import MessageToJson
-from meshtastic import admin_pb2, apponly_pb2, channel_pb2, localonly_pb2, portnums_pb2
+from meshtastic import portnums_pb2, apponly_pb2, admin_pb2, channel_pb2
-from meshtastic.util import (
+from meshtastic.util import pskToString, stripnl, Timeout, our_exit, fromPSK
-    Timeout,
-    camel_to_snake,
-    fromPSK,
-    our_exit,
-    pskToString,
-    stripnl,
-    message_to_json,
-)
 
 
 class Node:
     """A model of a (local or remote) node in the mesh
 
-    Includes methods for localConfig, moduleConfig and channels
+    Includes methods for radioConfig and channels
     """
 
     def __init__(self, iface, nodeNum, noProto=False):
         """Constructor"""
         self.iface = iface
         self.nodeNum = nodeNum
-        self.localConfig = localonly_pb2.LocalConfig()
+        self.radioConfig = None
-        self.moduleConfig = localonly_pb2.LocalModuleConfig()
         self.channels = None
         self._timeout = Timeout(maxSecs=300)
         self.partialChannels = None
         self.noProto = noProto
+
         self.cannedPluginMessage = None
-        self.cannedPluginMessageMessages = None
+
-        self.ringtone = None
+        self.cannedPluginMessagePart1 = None
-        self.ringtonePart = None
+        self.cannedPluginMessagePart2 = None
+        self.cannedPluginMessagePart3 = None
+        self.cannedPluginMessagePart4 = None
 
         self.gotResponse = None
 
@@ -44,14 +38,13 @@ class Node:
         """Show human readable description of our channels."""
         print("Channels:")
         if self.channels:
-            logging.debug(f"self.channels:{self.channels}")
+            logging.debug(f'self.channels:{self.channels}')
             for c in self.channels:
-                cStr = message_to_json(c.settings)
+                #print('c.settings.psk:', c.settings.psk)
-                # don't show disabled channels
+                cStr = stripnl(MessageToJson(c.settings))
-                if channel_pb2.Channel.Role.Name(c.role) != "DISABLED":
+                # only show if there is no psk (meaning disabled channel)
-                    print(
+                if c.settings.psk:
-                        f"  Index {c.index}: {channel_pb2.Channel.Role.Name(c.role)} psk={pskToString(c.settings.psk)} {cStr}"
+                    print(f"  {channel_pb2.Channel.Role.Name(c.role)} psk={pskToString(c.settings.psk)} {cStr}")
-                    )
         publicURL = self.getURL(includeAll=False)
         adminURL = self.getURL(includeAll=True)
         print(f"\nPrimary channel URL: {publicURL}")
@@ -61,76 +54,27 @@ class Node:
     def showInfo(self):
         """Show human readable description of our node"""
         prefs = ""
-        if self.localConfig:
+        if self.radioConfig and self.radioConfig.preferences:
-            prefs = message_to_json(self.localConfig)
+            prefs = stripnl(MessageToJson(self.radioConfig.preferences))
         print(f"Preferences: {prefs}\n")
-        prefs = ""
-        if self.moduleConfig:
-            prefs = message_to_json(self.moduleConfig)
-        print(f"Module preferences: {prefs}\n")
         self.showChannels()
 
-    def requestChannels(self):
+    def requestConfig(self):
-        """Send regular MeshPackets to ask channels."""
+        """Send regular MeshPackets to ask for settings and channels."""
-        logging.debug(f"requestChannels for nodeNum:{self.nodeNum}")
+        logging.debug(f"requestConfig for nodeNum:{self.nodeNum}")
+        self.radioConfig = None
         self.channels = None
         self.partialChannels = []  # We keep our channels in a temp array until finished
 
-        self._requestChannel(0)
+        # Note: We do not get the canned plugin message, unless get_canned_message() is called
+        self.cannedPluginMessage = None
 
-    def onResponseRequestSettings(self, p):
+        self.cannedPluginMessagePart1 = None
-        """Handle the response packets for requesting settings _requestSettings()"""
+        self.cannedPluginMessagePart2 = None
-        logging.debug(f"onResponseRequestSetting() p:{p}")
+        self.cannedPluginMessagePart3 = None
-        if "routing" in p["decoded"]:
+        self.cannedPluginMessagePart4 = None
-            if p["decoded"]["routing"]["errorReason"] != "NONE":
-                print(f'Error on response: {p["decoded"]["routing"]["errorReason"]}')
-                self.iface._acknowledgment.receivedNak = True
-        else:
-            self.iface._acknowledgment.receivedAck = True
-            print("")
-            adminMessage = p["decoded"]["admin"]
-            if "getConfigResponse" in adminMessage:
-                resp = adminMessage["getConfigResponse"]
-                field = list(resp.keys())[0]
-                config_type = self.localConfig.DESCRIPTOR.fields_by_name.get(
-                    camel_to_snake(field)
-                )
-                config_values = getattr(self.localConfig, config_type.name)
-            elif "getModuleConfigResponse" in adminMessage:
-                resp = adminMessage["getModuleConfigResponse"]
-                field = list(resp.keys())[0]
-                config_type = self.moduleConfig.DESCRIPTOR.fields_by_name.get(
-                    camel_to_snake(field)
-                )
-                config_values = getattr(self.moduleConfig, config_type.name)
-            else:
-                print(
-                    "Did not receive a valid response. Make sure to have a shared channel named 'admin'."
-                )
-                return
-            for key, value in resp[field].items():
-                setattr(config_values, camel_to_snake(key), value)
-            print(f"{str(camel_to_snake(field))}:\n{str(config_values)}")
 
-    def requestConfig(self, configType):
+        self._requestSettings()
-        """Request the config from the node via admin message"""
-        if self == self.iface.localNode:
-            onResponse = None
-        else:
-            onResponse = self.onResponseRequestSettings
-            print("Requesting current config from remote node (this can take a while).")
-
-        msgIndex = configType.index
-        if configType.containing_type.full_name in ("meshtastic.LocalConfig", "LocalConfig"):
-            p = admin_pb2.AdminMessage()
-            p.get_config_request = msgIndex
-            self._sendAdmin(p, wantResponse=True, onResponse=onResponse)
-        else:
-            p = admin_pb2.AdminMessage()
-            p.get_module_config_request = msgIndex
-            self._sendAdmin(p, wantResponse=True, onResponse=onResponse)
-        if onResponse:
-            self.iface.waitForAckNak()
 
     def turnOffEncryptionOnPrimaryChannel(self):
         """Turn off encryption on primary channel."""
@@ -138,85 +82,34 @@ class Node:
         print("Writing modified channels to device")
         self.writeChannel(0)
 
-    def waitForConfig(self, attribute="channels"):
+    def waitForConfig(self, attribute='channels'):
         """Block until radio config is received. Returns True if config has been received."""
-        return self._timeout.waitForSet(self, attrs=("localConfig", attribute))
+        return self._timeout.waitForSet(self, attrs=('radioConfig', attribute))
 
-    def writeConfig(self, config_name):
+    def writeConfig(self):
-        """Write the current (edited) localConfig to the device"""
+        """Write the current (edited) radioConfig to the device"""
-        if self.localConfig is None:
+        if self.radioConfig is None:
-            our_exit("Error: No localConfig has been read")
+            our_exit("Error: No RadioConfig has been read")
 
         p = admin_pb2.AdminMessage()
+        p.set_radio.CopyFrom(self.radioConfig)
 
-        if config_name == "device":
+        self._sendAdmin(p)
-            p.set_config.device.CopyFrom(self.localConfig.device)
+        logging.debug("Wrote config")
-        elif config_name == "position":
-            p.set_config.position.CopyFrom(self.localConfig.position)
-        elif config_name == "power":
-            p.set_config.power.CopyFrom(self.localConfig.power)
-        elif config_name == "network":
-            p.set_config.network.CopyFrom(self.localConfig.network)
-        elif config_name == "display":
-            p.set_config.display.CopyFrom(self.localConfig.display)
-        elif config_name == "lora":
-            p.set_config.lora.CopyFrom(self.localConfig.lora)
-        elif config_name == "bluetooth":
-            p.set_config.bluetooth.CopyFrom(self.localConfig.bluetooth)
-        elif config_name == "mqtt":
-            p.set_module_config.mqtt.CopyFrom(self.moduleConfig.mqtt)
-        elif config_name == "serial":
-            p.set_module_config.serial.CopyFrom(self.moduleConfig.serial)
-        elif config_name == "external_notification":
-            p.set_module_config.external_notification.CopyFrom(
-                self.moduleConfig.external_notification
-            )
-        elif config_name == "store_forward":
-            p.set_module_config.store_forward.CopyFrom(self.moduleConfig.store_forward)
-        elif config_name == "range_test":
-            p.set_module_config.range_test.CopyFrom(self.moduleConfig.range_test)
-        elif config_name == "telemetry":
-            p.set_module_config.telemetry.CopyFrom(self.moduleConfig.telemetry)
-        elif config_name == "canned_message":
-            p.set_module_config.canned_message.CopyFrom(
-                self.moduleConfig.canned_message
-            )
-        elif config_name == "audio":
-            p.set_module_config.audio.CopyFrom(self.moduleConfig.audio)
-        elif config_name == "remote_hardware":
-            p.set_module_config.remote_hardware.CopyFrom(
-                self.moduleConfig.remote_hardware
-            )
-        elif config_name == "neighbor_info":
-            p.set_module_config.neighbor_info.CopyFrom(self.moduleConfig.neighbor_info)
-        elif config_name == "detection_sensor":
-            p.set_module_config.detection_sensor.CopyFrom(self.moduleConfig.detection_sensor)
-        elif config_name == "ambient_lighting":
-            p.set_module_config.ambient_lighting.CopyFrom(self.moduleConfig.ambient_lighting)
-        elif config_name == "paxcounter":
-            p.set_module_config.paxcounter.CopyFrom(self.moduleConfig.paxcounter)
-        else:
-            our_exit(f"Error: No valid config with name {config_name}")
-
-        logging.debug(f"Wrote: {config_name}")
-        if self == self.iface.localNode:
-            onResponse = None
-        else:
-            onResponse = self.onAckNak
-        self._sendAdmin(p, onResponse=onResponse)
 
     def writeChannel(self, channelIndex, adminIndex=0):
         """Write the current (edited) channel to the device"""
 
         p = admin_pb2.AdminMessage()
         p.set_channel.CopyFrom(self.channels[channelIndex])
+
         self._sendAdmin(p, adminIndex=adminIndex)
         logging.debug(f"Wrote channel {channelIndex}")
 
     def getChannelByChannelIndex(self, channelIndex):
         """Get channel by channelIndex
-        channelIndex: number, typically 0-7; based on max number channels
+            channelIndex: number, typically 0-7; based on max number channels
-        returns: None if there is no channel found
+            returns: None if there is no channel found
         """
         ch = None
         if self.channels and 0 <= channelIndex < len(self.channels):
@@ -224,12 +117,9 @@ class Node:
         return ch
 
     def deleteChannel(self, channelIndex):
-        """Delete the specified channelIndex and shift other channels up"""
+        """Delete the specifed channelIndex and shift other channels up"""
         ch = self.channels[channelIndex]
-        if ch.role not in (
+        if ch.role not in (channel_pb2.Channel.Role.SECONDARY, channel_pb2.Channel.Role.DISABLED):
-            channel_pb2.Channel.Role.SECONDARY,
-            channel_pb2.Channel.Role.DISABLED,
-        ):
             our_exit("Warning: Only SECONDARY channels can be deleted")
 
         # we are careful here because if we move the "admin" channel the channelIndex we need to use
@@ -240,7 +130,7 @@ class Node:
         self._fixupChannels()  # expand back to 8 channels
 
         index = channelIndex
-        while index < 8:
+        while index < self.iface.myInfo.max_channels:
             self.writeChannel(index, adminIndex=adminIndex)
             index += 1
 
@@ -253,7 +143,7 @@ class Node:
 
     def getChannelByName(self, name):
         """Try to find the named channel or return None"""
-        for c in self.channels or []:
+        for c in (self.channels or []):
             if c.settings and c.settings.name == name:
                 return c
         return None
@@ -267,38 +157,50 @@ class Node:
 
     def _getAdminChannelIndex(self):
         """Return the channel number of the admin channel, or 0 if no reserved channel"""
-        for c in self.channels or []:
+        c = self.getChannelByName("admin")
-            if c.settings and c.settings.name.lower() == "admin":
+        if c:
-                return c.index
+            return c.index
-        return 0
+        else:
+            return 0
 
-    def setOwner(self, long_name=None, short_name=None, is_licensed=False):
+    def setOwner(self, long_name=None, short_name=None, is_licensed=False, team=None):
         """Set device owner name"""
         logging.debug(f"in setOwner nodeNum:{self.nodeNum}")
-        p = admin_pb2.AdminMessage()
+        nChars = 3
-
+        minChars = 2
-        nChars = 4
         if long_name is not None:
             long_name = long_name.strip()
+            if short_name is None:
+                words = long_name.split()
+                if len(long_name) <= nChars:
+                    short_name = long_name
+                elif len(words) >= minChars:
+                    short_name = ''.join(map(lambda word: word[0], words))
+                else:
+                    trans = str.maketrans(dict.fromkeys('aeiouAEIOU'))
+                    short_name = long_name[0] + long_name[1:].translate(trans)
+                    if len(short_name) < nChars:
+                        short_name = long_name[:nChars]
+
+        p = admin_pb2.AdminMessage()
+
+        if long_name is not None:
             p.set_owner.long_name = long_name
-            p.set_owner.is_licensed = is_licensed
         if short_name is not None:
             short_name = short_name.strip()
             if len(short_name) > nChars:
                 short_name = short_name[:nChars]
-                print(f"Maximum is 4 characters, truncated to {short_name}")
             p.set_owner.short_name = short_name
+            p.set_owner.is_licensed = is_licensed
+        if team is not None:
+            p.set_owner.team = team
 
         # Note: These debug lines are used in unit tests
-        logging.debug(f"p.set_owner.long_name:{p.set_owner.long_name}:")
+        logging.debug(f'p.set_owner.long_name:{p.set_owner.long_name}:')
-        logging.debug(f"p.set_owner.short_name:{p.set_owner.short_name}:")
+        logging.debug(f'p.set_owner.short_name:{p.set_owner.short_name}:')
-        logging.debug(f"p.set_owner.is_licensed:{p.set_owner.is_licensed}")
+        logging.debug(f'p.set_owner.is_licensed:{p.set_owner.is_licensed}')
-        # If sending to a remote node, wait for ACK/NAK
+        logging.debug(f'p.set_owner.team:{p.set_owner.team}')
-        if self == self.iface.localNode:
+        return self._sendAdmin(p)
-            onResponse = None
-        else:
-            onResponse = self.onAckNak
-        return self._sendAdmin(p, onResponse=onResponse)
 
     def getURL(self, includeAll: bool = True):
         """The sharable URL that describes the current channel"""
@@ -306,23 +208,18 @@ class Node:
         channelSet = apponly_pb2.ChannelSet()
         if self.channels:
             for c in self.channels:
-                if c.role == channel_pb2.Channel.Role.PRIMARY or (
+                if c.role == channel_pb2.Channel.Role.PRIMARY or (includeAll and c.role == channel_pb2.Channel.Role.SECONDARY):
-                    includeAll and c.role == channel_pb2.Channel.Role.SECONDARY
-                ):
                     channelSet.settings.append(c.settings)
-
-        channelSet.lora_config.CopyFrom(self.localConfig.lora)
         some_bytes = channelSet.SerializeToString()
-        s = base64.urlsafe_b64encode(some_bytes).decode("ascii")
+        s = base64.urlsafe_b64encode(some_bytes).decode('ascii')
-        s = s.replace("=", "").replace("+", "-").replace("/", "_")
+        return f"https://www.meshtastic.org/d/#{s}".replace("=", "")
-        return f"https://meshtastic.org/e/#{s}"
 
     def setURL(self, url):
         """Set mesh network URL"""
-        if self.localConfig is None:
+        if self.radioConfig is None:
-            our_exit("Warning: No Config has been read")
+            our_exit("Warning: No RadioConfig has been read")
 
-        # URLs are of the form https://meshtastic.org/d/#{base64_channel_set}
+        # URLs are of the form https://www.meshtastic.org/d/#{base64_channel_set}
         # Split on '/#' to find the base64 encoded channel settings
         splitURL = url.split("/#")
         b64 = splitURL[-1]
@@ -332,37 +229,66 @@ class Node:
         # per https://stackoverflow.com/a/9807138
         missing_padding = len(b64) % 4
         if missing_padding:
-            b64 += "=" * (4 - missing_padding)
+            b64 += '=' * (4 - missing_padding)
 
         decodedURL = base64.urlsafe_b64decode(b64)
         channelSet = apponly_pb2.ChannelSet()
         channelSet.ParseFromString(decodedURL)
 
+
         if len(channelSet.settings) == 0:
             our_exit("Warning: There were no settings.")
 
         i = 0
         for chs in channelSet.settings:
             ch = channel_pb2.Channel()
-            ch.role = (
+            ch.role = channel_pb2.Channel.Role.PRIMARY if i == 0 else channel_pb2.Channel.Role.SECONDARY
-                channel_pb2.Channel.Role.PRIMARY
-                if i == 0
-                else channel_pb2.Channel.Role.SECONDARY
-            )
             ch.index = i
             ch.settings.CopyFrom(chs)
             self.channels[ch.index] = ch
-            logging.debug(f"Channel i:{i} ch:{ch}")
+            logging.debug(f'Channel i:{i} ch:{ch}')
             self.writeChannel(ch.index)
             i = i + 1
 
-        p = admin_pb2.AdminMessage()
-        p.set_config.lora.CopyFrom(channelSet.lora_config)
-        self._sendAdmin(p)
 
-    def onResponseRequestRingtone(self, p):
+    def onResponseRequestSettings(self, p):
-        """Handle the response packet for requesting ringtone part 1"""
+        """Handle the response packet for requesting settings _requestSettings()"""
-        logging.debug(f"onResponseRequestRingtone() p:{p}")
+        logging.debug(f'onResponseRequestSetting() p:{p}')
+        errorFound = False
+        if "routing" in p["decoded"]:
+            if p["decoded"]["routing"]["errorReason"] != "NONE":
+                errorFound = True
+                print(f'Error on response: {p["decoded"]["routing"]["errorReason"]}')
+        if errorFound is False:
+            self.radioConfig = p["decoded"]["admin"]["raw"].get_radio_response
+            logging.debug(f'self.radioConfig:{self.radioConfig}')
+            logging.debug("Received radio config, now fetching channels...")
+            self._timeout.reset()  # We made foreward progress
+            self._requestChannel(0)  # now start fetching channels
+
+
+    def _requestSettings(self):
+        """Done with initial config messages, now send regular
+           MeshPackets to ask for settings."""
+        p = admin_pb2.AdminMessage()
+        p.get_radio_request = True
+
+        # TODO: should we check that localNode has an 'admin' channel?
+        # Show progress message for super slow operations
+        if self != self.iface.localNode:
+            print("Requesting preferences from remote node.")
+            print("Be sure:")
+            print(" 1. There is a SECONDARY channel named 'admin'.")
+            print(" 2. The '--seturl' was used to configure.")
+            print(" 3. All devices have the same modem config. (i.e., '--ch-longfast')")
+            print(" 4. All devices have been rebooted after all of the above. (optional, but recommended)")
+            print("Note: This could take a while (it requests remote channel configs, then writes config)")
+
+        return self._sendAdmin(p, wantResponse=True, onResponse=self.onResponseRequestSettings)
+
+    def onResponseRequestCannedMessagePluginMessagePart1(self, p):
+        """Handle the response packet for requesting canned message plugin message part 1"""
+        logging.debug(f'onResponseRequestCannedMessagePluginMessagePart1() p:{p}')
         errorFound = False
         if "routing" in p["decoded"]:
             if p["decoded"]["routing"]["errorReason"] != "NONE":
@@ -372,67 +298,13 @@ class Node:
             if "decoded" in p:
                 if "admin" in p["decoded"]:
                     if "raw" in p["decoded"]["admin"]:
-                        self.ringtonePart = p["decoded"]["admin"][
+                        self.cannedPluginMessagePart1 = p["decoded"]["admin"]["raw"].get_canned_message_plugin_part1_response
-                            "raw"
+                        logging.debug(f'self.cannedPluginMessagePart1:{self.cannedPluginMessagePart1}')
-                        ].get_ringtone_response
-                        logging.debug(f"self.ringtonePart:{self.ringtonePart}")
                         self.gotResponse = True
 
-    def get_ringtone(self):
+    def onResponseRequestCannedMessagePluginMessagePart2(self, p):
-        """Get the ringtone. Concatenate all pieces together and return a single string."""
+        """Handle the response packet for requesting canned message plugin message part 2"""
-        logging.debug(f"in get_ringtone()")
+        logging.debug(f'onResponseRequestCannedMessagePluginMessagePart2() p:{p}')
-        if not self.ringtone:
-            p1 = admin_pb2.AdminMessage()
-            p1.get_ringtone_request = True
-            self.gotResponse = False
-            self._sendAdmin(
-                p1, wantResponse=True, onResponse=self.onResponseRequestRingtone
-            )
-            while self.gotResponse is False:
-                time.sleep(0.1)
-
-            logging.debug(f"self.ringtone:{self.ringtone}")
-
-            self.ringtone = ""
-            if self.ringtonePart:
-                self.ringtone += self.ringtonePart
-
-        print(f"ringtone:{self.ringtone}")
-        logging.debug(f"ringtone:{self.ringtone}")
-        return self.ringtone
-
-    def set_ringtone(self, ringtone):
-        """Set the ringtone. The ringtone length must be less than 230 character."""
-
-        if len(ringtone) > 230:
-            our_exit("Warning: The ringtone must be less than 230 characters.")
-
-        # split into chunks
-        chunks = []
-        chunks_size = 230
-        for i in range(0, len(ringtone), chunks_size):
-            chunks.append(ringtone[i : i + chunks_size])
-
-        # for each chunk, send a message to set the values
-        # for i in range(0, len(chunks)):
-        for i, chunk in enumerate(chunks):
-            p = admin_pb2.AdminMessage()
-
-            # TODO: should be a way to improve this
-            if i == 0:
-                p.set_ringtone_message = chunk
-
-            logging.debug(f"Setting ringtone '{chunk}' part {i+1}")
-            # If sending to a remote node, wait for ACK/NAK
-            if self == self.iface.localNode:
-                onResponse = None
-            else:
-                onResponse = self.onAckNak
-            return self._sendAdmin(p, onResponse=onResponse)
-
-    def onResponseRequestCannedMessagePluginMessageMessages(self, p):
-        """Handle the response packet for requesting canned message plugin message part 1"""
-        logging.debug(f"onResponseRequestCannedMessagePluginMessageMessages() p:{p}")
         errorFound = False
         if "routing" in p["decoded"]:
             if p["decoded"]["routing"]["errorReason"] != "NONE":
@@ -442,76 +314,134 @@ class Node:
             if "decoded" in p:
                 if "admin" in p["decoded"]:
                     if "raw" in p["decoded"]["admin"]:
-                        self.cannedPluginMessageMessages = p["decoded"]["admin"][
+                        self.cannedPluginMessagePart2 = p["decoded"]["admin"]["raw"].get_canned_message_plugin_part2_response
-                            "raw"
+                        logging.debug(f'self.cannedPluginMessagePart2:{self.cannedPluginMessagePart2}')
-                        ].get_canned_message_module_messages_response
+                        self.gotResponse = True
-                        logging.debug(
+
-                            f"self.cannedPluginMessageMessages:{self.cannedPluginMessageMessages}"
+    def onResponseRequestCannedMessagePluginMessagePart3(self, p):
-                        )
+        """Handle the response packet for requesting canned message plugin message part 3"""
+        logging.debug(f'onResponseRequestCannedMessagePluginMessagePart3() p:{p}')
+        errorFound = False
+        if "routing" in p["decoded"]:
+            if p["decoded"]["routing"]["errorReason"] != "NONE":
+                errorFound = True
+                print(f'Error on response: {p["decoded"]["routing"]["errorReason"]}')
+        if errorFound is False:
+            if "decoded" in p:
+                if "admin" in p["decoded"]:
+                    if "raw" in p["decoded"]["admin"]:
+                        self.cannedPluginMessagePart3 = p["decoded"]["admin"]["raw"].get_canned_message_plugin_part3_response
+                        logging.debug(f'self.cannedPluginMessagePart3:{self.cannedPluginMessagePart3}')
+                        self.gotResponse = True
+
+    def onResponseRequestCannedMessagePluginMessagePart4(self, p):
+        """Handle the response packet for requesting canned message plugin message part 4"""
+        logging.debug(f'onResponseRequestCannedMessagePluginMessagePart4() p:{p}')
+        errorFound = False
+        if "routing" in p["decoded"]:
+            if p["decoded"]["routing"]["errorReason"] != "NONE":
+                errorFound = True
+                print(f'Error on response: {p["decoded"]["routing"]["errorReason"]}')
+        if errorFound is False:
+            if "decoded" in p:
+                if "admin" in p["decoded"]:
+                    if "raw" in p["decoded"]["admin"]:
+                        self.cannedPluginMessagePart4 = p["decoded"]["admin"]["raw"].get_canned_message_plugin_part4_response
+                        logging.debug(f'self.cannedPluginMessagePart4:{self.cannedPluginMessagePart4}')
                         self.gotResponse = True
 
     def get_canned_message(self):
         """Get the canned message string. Concatenate all pieces together and return a single string."""
-        logging.debug(f"in get_canned_message()")
+        logging.debug(f'in get_canned_message()')
         if not self.cannedPluginMessage:
+
             p1 = admin_pb2.AdminMessage()
-            p1.get_canned_message_module_messages_request = True
+            p1.get_canned_message_plugin_part1_request = True
             self.gotResponse = False
-            self._sendAdmin(
+            self._sendAdmin(p1, wantResponse=True, onResponse=self.onResponseRequestCannedMessagePluginMessagePart1)
-                p1,
-                wantResponse=True,
-                onResponse=self.onResponseRequestCannedMessagePluginMessageMessages,
-            )
             while self.gotResponse is False:
                 time.sleep(0.1)
 
-            logging.debug(
+            p2 = admin_pb2.AdminMessage()
-                f"self.cannedPluginMessageMessages:{self.cannedPluginMessageMessages}"
+            p2.get_canned_message_plugin_part2_request = True
-            )
+            self.gotResponse = False
+            self._sendAdmin(p2, wantResponse=True, onResponse=self.onResponseRequestCannedMessagePluginMessagePart2)
+            while self.gotResponse is False:
+                time.sleep(0.1)
+
+            p3 = admin_pb2.AdminMessage()
+            p3.get_canned_message_plugin_part3_request = True
+            self.gotResponse = False
+            self._sendAdmin(p3, wantResponse=True, onResponse=self.onResponseRequestCannedMessagePluginMessagePart3)
+            while self.gotResponse is False:
+                time.sleep(0.1)
+
+            p4 = admin_pb2.AdminMessage()
+            p4.get_canned_message_plugin_part4_request = True
+            self.gotResponse = False
+            self._sendAdmin(p4, wantResponse=True, onResponse=self.onResponseRequestCannedMessagePluginMessagePart4)
+            while self.gotResponse is False:
+                time.sleep(0.1)
+
+            # TODO: This feels wrong to have a sleep here. Is there a way to ensure that
+            # all requests are complete? Perhaps change to a while loop any parts are None... maybe?
+            time.sleep(3)
+
+            logging.debug(f'self.cannedPluginMessagePart1:{self.cannedPluginMessagePart1}')
+            logging.debug(f'self.cannedPluginMessagePart2:{self.cannedPluginMessagePart2}')
+            logging.debug(f'self.cannedPluginMessagePart3:{self.cannedPluginMessagePart3}')
+            logging.debug(f'self.cannedPluginMessagePart4:{self.cannedPluginMessagePart4}')
 
             self.cannedPluginMessage = ""
-            if self.cannedPluginMessageMessages:
+            if self.cannedPluginMessagePart1:
-                self.cannedPluginMessage += self.cannedPluginMessageMessages
+                self.cannedPluginMessage += self.cannedPluginMessagePart1
+            if self.cannedPluginMessagePart2:
+                self.cannedPluginMessage += self.cannedPluginMessagePart2
+            if self.cannedPluginMessagePart3:
+                self.cannedPluginMessage += self.cannedPluginMessagePart3
+            if self.cannedPluginMessagePart4:
+                self.cannedPluginMessage += self.cannedPluginMessagePart4
 
-        print(f"canned_plugin_message:{self.cannedPluginMessage}")
+        print(f'canned_plugin_message:{self.cannedPluginMessage}')
-        logging.debug(f"canned_plugin_message:{self.cannedPluginMessage}")
+        logging.debug(f'canned_plugin_message:{self.cannedPluginMessage}')
         return self.cannedPluginMessage
 
     def set_canned_message(self, message):
-        """Set the canned message. The canned messages length must be less than 200 character."""
+        """Set the canned message. Split into parts of 200 chars each."""
 
-        if len(message) > 200:
+        if len(message) > 800:
-            our_exit("Warning: The canned message must be less than 200 characters.")
+            our_exit("Warning: The canned message must be less than 800 characters.")
 
         # split into chunks
         chunks = []
         chunks_size = 200
         for i in range(0, len(message), chunks_size):
-            chunks.append(message[i : i + chunks_size])
+            chunks.append(message[i: i + chunks_size])
 
         # for each chunk, send a message to set the values
-        # for i in range(0, len(chunks)):
+        #for i in range(0, len(chunks)):
         for i, chunk in enumerate(chunks):
             p = admin_pb2.AdminMessage()
 
             # TODO: should be a way to improve this
             if i == 0:
-                p.set_canned_message_module_messages = chunk
+                p.set_canned_message_plugin_part1 = chunk
+            elif i == 1:
+                p.set_canned_message_plugin_part2 = chunk
+            elif i == 2:
+                p.set_canned_message_plugin_part3 = chunk
+            elif i == 3:
+                p.set_canned_message_plugin_part4 = chunk
 
             logging.debug(f"Setting canned message '{chunk}' part {i+1}")
-            # If sending to a remote node, wait for ACK/NAK
+            self._sendAdmin(p)
-            if self == self.iface.localNode:
-                onResponse = None
-            else:
-                onResponse = self.onAckNak
-            return self._sendAdmin(p, onResponse=onResponse)
 
     def exitSimulator(self):
         """Tell a simulator node to exit (this message
-        is ignored for other nodes)"""
+           is ignored for other nodes)"""
         p = admin_pb2.AdminMessage()
         p.exit_simulator = True
-        logging.debug("in exitSimulator()")
+        logging.debug('in exitSimulator()')
 
         return self._sendAdmin(p)
 
@@ -521,51 +451,7 @@ class Node:
         p.reboot_seconds = secs
         logging.info(f"Telling node to reboot in {secs} seconds")
 
-        # If sending to a remote node, wait for ACK/NAK
+        return self._sendAdmin(p)
-        if self == self.iface.localNode:
-            onResponse = None
-        else:
-            onResponse = self.onAckNak
-        return self._sendAdmin(p, onResponse=onResponse)
-
-    def beginSettingsTransaction(self):
-        """Tell the node to open a transaction to edit settings."""
-        p = admin_pb2.AdminMessage()
-        p.begin_edit_settings = True
-        logging.info(f"Telling open a transaction to edit settings")
-
-        # If sending to a remote node, wait for ACK/NAK
-        if self == self.iface.localNode:
-            onResponse = None
-        else:
-            onResponse = self.onAckNak
-        return self._sendAdmin(p, onResponse=onResponse)
-
-    def commitSettingsTransaction(self):
-        """Tell the node to commit the open transaction for editing settings."""
-        p = admin_pb2.AdminMessage()
-        p.commit_edit_settings = True
-        logging.info(f"Telling node to commit open transaction for editing settings")
-
-        # If sending to a remote node, wait for ACK/NAK
-        if self == self.iface.localNode:
-            onResponse = None
-        else:
-            onResponse = self.onAckNak
-        return self._sendAdmin(p, onResponse=onResponse)
-
-    def rebootOTA(self, secs: int = 10):
-        """Tell the node to reboot into factory firmware."""
-        p = admin_pb2.AdminMessage()
-        p.reboot_ota_seconds = secs
-        logging.info(f"Telling node to reboot to OTA in {secs} seconds")
-
-        # If sending to a remote node, wait for ACK/NAK
-        if self == self.iface.localNode:
-            onResponse = None
-        else:
-            onResponse = self.onAckNak
-        return self._sendAdmin(p, onResponse=onResponse)
 
     def shutdown(self, secs: int = 10):
         """Tell the node to shutdown."""
@@ -573,48 +459,7 @@ class Node:
         p.shutdown_seconds = secs
         logging.info(f"Telling node to shutdown in {secs} seconds")
 
-        # If sending to a remote node, wait for ACK/NAK
+        return self._sendAdmin(p)
-        if self == self.iface.localNode:
-            onResponse = None
-        else:
-            onResponse = self.onAckNak
-        return self._sendAdmin(p, onResponse=onResponse)
-
-    def getMetadata(self):
-        """Get the node's metadata."""
-        p = admin_pb2.AdminMessage()
-        p.get_device_metadata_request = True
-        logging.info(f"Requesting device metadata")
-
-        return self._sendAdmin(
-            p, wantResponse=True, onResponse=self.onRequestGetMetadata
-        )
-
-    def factoryReset(self):
-        """Tell the node to factory reset."""
-        p = admin_pb2.AdminMessage()
-        p.factory_reset = True
-        logging.info(f"Telling node to factory reset")
-
-        # If sending to a remote node, wait for ACK/NAK
-        if self == self.iface.localNode:
-            onResponse = None
-        else:
-            onResponse = self.onAckNak
-        return self._sendAdmin(p, onResponse=onResponse)
-
-    def resetNodeDb(self):
-        """Tell the node to reset its list of nodes."""
-        p = admin_pb2.AdminMessage()
-        p.nodedb_reset = True
-        logging.info(f"Telling node to reset the NodeDB")
-
-        # If sending to a remote node, wait for ACK/NAK
-        if self == self.iface.localNode:
-            onResponse = None
-        else:
-            onResponse = self.onAckNak
-        return self._sendAdmin(p, onResponse=onResponse)
 
     def _fixupChannels(self):
         """Fixup indexes and add disabled channels as needed"""
@@ -631,63 +476,31 @@ class Node:
 
         # Add extra disabled channels as needed
         index = len(self.channels)
-        while index < 8:
+        while index < self.iface.myInfo.max_channels:
             ch = channel_pb2.Channel()
             ch.role = channel_pb2.Channel.Role.DISABLED
             ch.index = index
             self.channels.append(ch)
             index += 1
 
-    def onRequestGetMetadata(self, p):
-        """Handle the response packet for requesting device metadata getMetadata()"""
-        logging.debug(f"onRequestGetMetadata() p:{p}")
-
-        if p["decoded"]["portnum"] == portnums_pb2.PortNum.Name(
-            portnums_pb2.PortNum.ROUTING_APP
-        ):
-            if p["decoded"]["routing"]["errorReason"] != "NONE":
-                logging.warning(
-                    f'Metadata request failed, error reason: {p["decoded"]["routing"]["errorReason"]}'
-                )
-                self._timeout.expireTime = time.time()  # Do not wait any longer
-                return  # Don't try to parse this routing message
-            logging.debug(f"Retrying metadata request.")
-            self.getMetadata()
-            return
-
-        c = p["decoded"]["admin"]["raw"].get_device_metadata_response
-        self._timeout.reset()  # We made forward progress
-        logging.debug(f"Received metadata {stripnl(c)}")
-        print(f"\nfirmware_version: {c.firmware_version}")
-        print(f"device_state_version: {c.device_state_version}")
 
     def onResponseRequestChannel(self, p):
         """Handle the response packet for requesting a channel _requestChannel()"""
-        logging.debug(f"onResponseRequestChannel() p:{p}")
+        logging.debug(f'onResponseRequestChannel() p:{p}')
-
-        if p["decoded"]["portnum"] == portnums_pb2.PortNum.Name(
-            portnums_pb2.PortNum.ROUTING_APP
-        ):
-            if p["decoded"]["routing"]["errorReason"] != "NONE":
-                logging.warning(
-                    f'Channel request failed, error reason: {p["decoded"]["routing"]["errorReason"]}'
-                )
-                self._timeout.expireTime = time.time()  # Do not wait any longer
-                return  # Don't try to parse this routing message
-            lastTried = 0
-            if len(self.partialChannels) > 0:
-                lastTried = self.partialChannels[-1].index
-            logging.debug(f"Retrying previous channel request.")
-            self._requestChannel(lastTried)
-            return
-
         c = p["decoded"]["admin"]["raw"].get_channel_response
         self.partialChannels.append(c)
-        self._timeout.reset()  # We made forward progress
+        self._timeout.reset()  # We made foreward progress
         logging.debug(f"Received channel {stripnl(c)}")
         index = c.index
 
-        if index >= 8 - 1:
+        # for stress testing, we can always download all channels
+        fastChannelDownload = True
+
+        # Once we see a response that has NO settings, assume
+        # we are at the end of channels and stop fetching
+        quitEarly = (c.role == channel_pb2.Channel.Role.DISABLED) and fastChannelDownload
+
+        if quitEarly or index >= self.iface.myInfo.max_channels - 1:
             logging.debug("Finished downloading channels")
 
             self.channels = self.partialChannels
@@ -698,71 +511,37 @@ class Node:
         else:
             self._requestChannel(index + 1)
 
-    def onAckNak(self, p):
-        """Informative handler for ACK/NAK responses"""
-        if p["decoded"]["routing"]["errorReason"] != "NONE":
-            print(
-                f'Received a NAK, error reason: {p["decoded"]["routing"]["errorReason"]}'
-            )
-            self.iface._acknowledgment.receivedNak = True
-        else:
-            if int(p["from"]) == self.iface.localNode.nodeNum:
-                print(
-                    f"Received an implicit ACK. Packet will likely arrive, but cannot be guaranteed."
-                )
-                self.iface._acknowledgment.receivedImplAck = True
-            else:
-                print(f"Received an ACK.")
-                self.iface._acknowledgment.receivedAck = True
-
     def _requestChannel(self, channelNum: int):
         """Done with initial config messages, now send regular
-        MeshPackets to ask for settings"""
+           MeshPackets to ask for settings"""
         p = admin_pb2.AdminMessage()
         p.get_channel_request = channelNum + 1
 
         # Show progress message for super slow operations
         if self != self.iface.localNode:
-            print(
+            print(f"Requesting channel {channelNum} info from remote node (this could take a while)")
-                f"Requesting channel {channelNum} info from remote node (this could take a while)"
+            logging.debug(f"Requesting channel {channelNum} info from remote node (this could take a while)")
-            )
-            logging.debug(
-                f"Requesting channel {channelNum} info from remote node (this could take a while)"
-            )
         else:
             logging.debug(f"Requesting channel {channelNum}")
 
-        return self._sendAdmin(
+        return self._sendAdmin(p, wantResponse=True, onResponse=self.onResponseRequestChannel)
-            p, wantResponse=True, onResponse=self.onResponseRequestChannel
+
-        )
 
     # pylint: disable=R1710
-    def _sendAdmin(
+    def _sendAdmin(self, p: admin_pb2.AdminMessage, wantResponse=False,
-        self,
+                   onResponse=None, adminIndex=0):
-        p: admin_pb2.AdminMessage,
-        wantResponse=True,
-        onResponse=None,
-        adminIndex=0,
-    ):
         """Send an admin message to the specified node (or the local node if destNodeNum is zero)"""
 
         if self.noProto:
-            logging.warning(
+            logging.warning(f"Not sending packet because protocol use is disabled by noProto")
-                f"Not sending packet because protocol use is disabled by noProto"
-            )
         else:
-            if (
+            if adminIndex == 0:  # unless a special channel index was used, we want to use the admin index
-                adminIndex == 0
-            ):  # unless a special channel index was used, we want to use the admin index
                 adminIndex = self.iface.localNode._getAdminChannelIndex()
-            logging.debug(f"adminIndex:{adminIndex}")
+            logging.debug(f'adminIndex:{adminIndex}')
 
-            return self.iface.sendData(
+            return self.iface.sendData(p, self.nodeNum,
-                p,
+                                       portNum=portnums_pb2.PortNum.ADMIN_APP,
-                self.nodeNum,
+                                       wantAck=True,
-                portNum=portnums_pb2.PortNum.ADMIN_APP,
+                                       wantResponse=wantResponse,
-                wantAck=False,
+                                       onResponse=onResponse,
-                wantResponse=wantResponse,
+                                       channelIndex=adminIndex)
-                onResponse=onResponse,
-                channelIndex=adminIndex,
-            )

meshtastic/paxcount_pb2.py

@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: meshtastic/paxcount.proto
-"""Generated protocol buffer code."""
-from google.protobuf.internal import builder as _builder
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import descriptor_pool as _descriptor_pool
-from google.protobuf import symbol_database as _symbol_database
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-
-
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x19meshtastic/paxcount.proto\x12\nmeshtastic\"5\n\x08Paxcount\x12\x0c\n\x04wifi\x18\x01 \x01(\r\x12\x0b\n\x03\x62le\x18\x02 \x01(\r\x12\x0e\n\x06uptime\x18\x03 \x01(\rBc\n\x13\x63om.geeksville.meshB\x0ePaxcountProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
-
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.paxcount_pb2', globals())
-if _descriptor._USE_C_DESCRIPTORS == False:
-
-  DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\016PaxcountProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
-  _PAXCOUNT._serialized_start=41
-  _PAXCOUNT._serialized_end=94
-# @@protoc_insertion_point(module_scope)

meshtastic/paxcount_pb2.pyi

@@ -1,49 +0,0 @@
-"""
-@generated by mypy-protobuf.  Do not edit manually!
-isort:skip_file
-"""
-import builtins
-import google.protobuf.descriptor
-import google.protobuf.message
-import sys
-
-if sys.version_info >= (3, 8):
-    import typing as typing_extensions
-else:
-    import typing_extensions
-
-DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
-
-@typing_extensions.final
-class Paxcount(google.protobuf.message.Message):
-    """
-    TODO: REPLACE
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    WIFI_FIELD_NUMBER: builtins.int
-    BLE_FIELD_NUMBER: builtins.int
-    UPTIME_FIELD_NUMBER: builtins.int
-    wifi: builtins.int
-    """
-    seen Wifi devices
-    """
-    ble: builtins.int
-    """
-    Seen BLE devices
-    """
-    uptime: builtins.int
-    """
-    Uptime in seconds
-    """
-    def __init__(
-        self,
-        *,
-        wifi: builtins.int = ...,
-        ble: builtins.int = ...,
-        uptime: builtins.int = ...,
-    ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["ble", b"ble", "uptime", b"uptime", "wifi", b"wifi"]) -> None: ...
-
-global___Paxcount = Paxcount

meshtastic/portnums_pb2.py

@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: meshtastic/portnums.proto
+# source: portnums.proto
-"""Generated protocol buffer code."""
+
-from google.protobuf.internal import builder as _builder
+from google.protobuf.internal import enum_type_wrapper
 from google.protobuf import descriptor as _descriptor
-from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import message as _message
+from google.protobuf import reflection as _reflection
 from google.protobuf import symbol_database as _symbol_database
 # @@protoc_insertion_point(imports)
 
@@ -13,14 +14,119 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x19meshtastic/portnums.proto\x12\nmeshtastic*\x8d\x04\n\x07PortNum\x12\x0f\n\x0bUNKNOWN_APP\x10\x00\x12\x14\n\x10TEXT_MESSAGE_APP\x10\x01\x12\x17\n\x13REMOTE_HARDWARE_APP\x10\x02\x12\x10\n\x0cPOSITION_APP\x10\x03\x12\x10\n\x0cNODEINFO_APP\x10\x04\x12\x0f\n\x0bROUTING_APP\x10\x05\x12\r\n\tADMIN_APP\x10\x06\x12\x1f\n\x1bTEXT_MESSAGE_COMPRESSED_APP\x10\x07\x12\x10\n\x0cWAYPOINT_APP\x10\x08\x12\r\n\tAUDIO_APP\x10\t\x12\x18\n\x14\x44\x45TECTION_SENSOR_APP\x10\n\x12\r\n\tREPLY_APP\x10 \x12\x11\n\rIP_TUNNEL_APP\x10!\x12\x12\n\x0ePAXCOUNTER_APP\x10\"\x12\x0e\n\nSERIAL_APP\x10@\x12\x15\n\x11STORE_FORWARD_APP\x10\x41\x12\x12\n\x0eRANGE_TEST_APP\x10\x42\x12\x11\n\rTELEMETRY_APP\x10\x43\x12\x0b\n\x07ZPS_APP\x10\x44\x12\x11\n\rSIMULATOR_APP\x10\x45\x12\x12\n\x0eTRACEROUTE_APP\x10\x46\x12\x14\n\x10NEIGHBORINFO_APP\x10G\x12\x0f\n\x0b\x41TAK_PLUGIN\x10H\x12\x12\n\x0eMAP_REPORT_APP\x10I\x12\x10\n\x0bPRIVATE_APP\x10\x80\x02\x12\x13\n\x0e\x41TAK_FORWARDER\x10\x81\x02\x12\x08\n\x03MAX\x10\xff\x03\x42]\n\x13\x63om.geeksville.meshB\x08PortnumsZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor.FileDescriptor(
+  name='portnums.proto',
+  package='',
+  syntax='proto3',
+  serialized_options=b'\n\023com.geeksville.meshB\010PortnumsH\003Z!github.com/meshtastic/gomeshproto',
+  serialized_pb=b'\n\x0eportnums.proto*\xcb\x02\n\x07PortNum\x12\x0f\n\x0bUNKNOWN_APP\x10\x00\x12\x14\n\x10TEXT_MESSAGE_APP\x10\x01\x12\x17\n\x13REMOTE_HARDWARE_APP\x10\x02\x12\x10\n\x0cPOSITION_APP\x10\x03\x12\x10\n\x0cNODEINFO_APP\x10\x04\x12\x0f\n\x0bROUTING_APP\x10\x05\x12\r\n\tADMIN_APP\x10\x06\x12\r\n\tREPLY_APP\x10 \x12\x11\n\rIP_TUNNEL_APP\x10!\x12\x0e\n\nSERIAL_APP\x10@\x12\x15\n\x11STORE_FORWARD_APP\x10\x41\x12\x12\n\x0eRANGE_TEST_APP\x10\x42\x12!\n\x1d\x45NVIRONMENTAL_MEASUREMENT_APP\x10\x43\x12\x0b\n\x07ZPS_APP\x10\x44\x12\x10\n\x0bPRIVATE_APP\x10\x80\x02\x12\x13\n\x0e\x41TAK_FORWARDER\x10\x81\x02\x12\x08\n\x03MAX\x10\xff\x03\x42\x44\n\x13\x63om.geeksville.meshB\x08PortnumsH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3'
+)
 
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
+_PORTNUM = _descriptor.EnumDescriptor(
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.portnums_pb2', globals())
+  name='PortNum',
-if _descriptor._USE_C_DESCRIPTORS == False:
+  full_name='PortNum',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='UNKNOWN_APP', index=0, number=0,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='TEXT_MESSAGE_APP', index=1, number=1,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='REMOTE_HARDWARE_APP', index=2, number=2,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='POSITION_APP', index=3, number=3,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='NODEINFO_APP', index=4, number=4,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ROUTING_APP', index=5, number=5,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ADMIN_APP', index=6, number=6,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='REPLY_APP', index=7, number=32,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='IP_TUNNEL_APP', index=8, number=33,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='SERIAL_APP', index=9, number=64,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='STORE_FORWARD_APP', index=10, number=65,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='RANGE_TEST_APP', index=11, number=66,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ENVIRONMENTAL_MEASUREMENT_APP', index=12, number=67,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ZPS_APP', index=13, number=68,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='PRIVATE_APP', index=14, number=256,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ATAK_FORWARDER', index=15, number=257,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='MAX', index=16, number=511,
+      serialized_options=None,
+      type=None),
+  ],
+  containing_type=None,
+  serialized_options=None,
+  serialized_start=19,
+  serialized_end=350,
+)
+_sym_db.RegisterEnumDescriptor(_PORTNUM)
 
-  DESCRIPTOR._options = None
+PortNum = enum_type_wrapper.EnumTypeWrapper(_PORTNUM)
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\010PortnumsZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+UNKNOWN_APP = 0
-  _PORTNUM._serialized_start=42
+TEXT_MESSAGE_APP = 1
-  _PORTNUM._serialized_end=567
+REMOTE_HARDWARE_APP = 2
+POSITION_APP = 3
+NODEINFO_APP = 4
+ROUTING_APP = 5
+ADMIN_APP = 6
+REPLY_APP = 32
+IP_TUNNEL_APP = 33
+SERIAL_APP = 64
+STORE_FORWARD_APP = 65
+RANGE_TEST_APP = 66
+ENVIRONMENTAL_MEASUREMENT_APP = 67
+ZPS_APP = 68
+PRIVATE_APP = 256
+ATAK_FORWARDER = 257
+MAX = 511
+
+
+DESCRIPTOR.enum_types_by_name['PortNum'] = _PORTNUM
+_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+
+
+DESCRIPTOR._options = None
 # @@protoc_insertion_point(module_scope)

meshtastic/portnums_pb2.pyi

@@ -1,369 +0,0 @@
-"""
-@generated by mypy-protobuf.  Do not edit manually!
-isort:skip_file
-"""
-import builtins
-import google.protobuf.descriptor
-import google.protobuf.internal.enum_type_wrapper
-import sys
-import typing
-
-if sys.version_info >= (3, 10):
-    import typing as typing_extensions
-else:
-    import typing_extensions
-
-DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
-
-class _PortNum:
-    ValueType = typing.NewType("ValueType", builtins.int)
-    V: typing_extensions.TypeAlias = ValueType
-
-class _PortNumEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[_PortNum.ValueType], builtins.type):
-    DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
-    UNKNOWN_APP: _PortNum.ValueType  # 0
-    """
-    Deprecated: do not use in new code (formerly called OPAQUE)
-    A message sent from a device outside of the mesh, in a form the mesh does not understand
-    NOTE: This must be 0, because it is documented in IMeshService.aidl to be so
-    ENCODING: binary undefined
-    """
-    TEXT_MESSAGE_APP: _PortNum.ValueType  # 1
-    """
-    A simple UTF-8 text message, which even the little micros in the mesh
-    can understand and show on their screen eventually in some circumstances
-    even signal might send messages in this form (see below)
-    ENCODING: UTF-8 Plaintext (?)
-    """
-    REMOTE_HARDWARE_APP: _PortNum.ValueType  # 2
-    """
-    Reserved for built-in GPIO/example app.
-    See remote_hardware.proto/HardwareMessage for details on the message sent/received to this port number
-    ENCODING: Protobuf
-    """
-    POSITION_APP: _PortNum.ValueType  # 3
-    """
-    The built-in position messaging app.
-    Payload is a Position message.
-    ENCODING: Protobuf
-    """
-    NODEINFO_APP: _PortNum.ValueType  # 4
-    """
-    The built-in user info app.
-    Payload is a User message.
-    ENCODING: Protobuf
-    """
-    ROUTING_APP: _PortNum.ValueType  # 5
-    """
-    Protocol control packets for mesh protocol use.
-    Payload is a Routing message.
-    ENCODING: Protobuf
-    """
-    ADMIN_APP: _PortNum.ValueType  # 6
-    """
-    Admin control packets.
-    Payload is a AdminMessage message.
-    ENCODING: Protobuf
-    """
-    TEXT_MESSAGE_COMPRESSED_APP: _PortNum.ValueType  # 7
-    """
-    Compressed TEXT_MESSAGE payloads.
-    ENCODING: UTF-8 Plaintext (?) with Unishox2 Compression
-    NOTE: The Device Firmware converts a TEXT_MESSAGE_APP to TEXT_MESSAGE_COMPRESSED_APP if the compressed
-    payload is shorter. There's no need for app developers to do this themselves. Also the firmware will decompress
-    any incoming TEXT_MESSAGE_COMPRESSED_APP payload and convert to TEXT_MESSAGE_APP.
-    """
-    WAYPOINT_APP: _PortNum.ValueType  # 8
-    """
-    Waypoint payloads.
-    Payload is a Waypoint message.
-    ENCODING: Protobuf
-    """
-    AUDIO_APP: _PortNum.ValueType  # 9
-    """
-    Audio Payloads.
-    Encapsulated codec2 packets. On 2.4 GHZ Bandwidths only for now
-    ENCODING: codec2 audio frames
-    NOTE: audio frames contain a 3 byte header (0xc0 0xde 0xc2) and a one byte marker for the decompressed bitrate.
-    This marker comes from the 'moduleConfig.audio.bitrate' enum minus one.
-    """
-    DETECTION_SENSOR_APP: _PortNum.ValueType  # 10
-    """
-    Same as Text Message but originating from Detection Sensor Module.
-    NOTE: This portnum traffic is not sent to the public MQTT starting at firmware version 2.2.9
-    """
-    REPLY_APP: _PortNum.ValueType  # 32
-    """
-    Provides a 'ping' service that replies to any packet it receives.
-    Also serves as a small example module.
-    ENCODING: ASCII Plaintext
-    """
-    IP_TUNNEL_APP: _PortNum.ValueType  # 33
-    """
-    Used for the python IP tunnel feature
-    ENCODING: IP Packet. Handled by the python API, firmware ignores this one and pases on.
-    """
-    PAXCOUNTER_APP: _PortNum.ValueType  # 34
-    """
-    Paxcounter lib included in the firmware
-    ENCODING: protobuf
-    """
-    SERIAL_APP: _PortNum.ValueType  # 64
-    """
-    Provides a hardware serial interface to send and receive from the Meshtastic network.
-    Connect to the RX/TX pins of a device with 38400 8N1. Packets received from the Meshtastic
-    network is forwarded to the RX pin while sending a packet to TX will go out to the Mesh network.
-    Maximum packet size of 240 bytes.
-    Module is disabled by default can be turned on by setting SERIAL_MODULE_ENABLED = 1 in SerialPlugh.cpp.
-    ENCODING: binary undefined
-    """
-    STORE_FORWARD_APP: _PortNum.ValueType  # 65
-    """
-    STORE_FORWARD_APP (Work in Progress)
-    Maintained by Jm Casler (MC Hamster) : jm@casler.org
-    ENCODING: Protobuf
-    """
-    RANGE_TEST_APP: _PortNum.ValueType  # 66
-    """
-    Optional port for messages for the range test module.
-    ENCODING: ASCII Plaintext
-    NOTE: This portnum traffic is not sent to the public MQTT starting at firmware version 2.2.9
-    """
-    TELEMETRY_APP: _PortNum.ValueType  # 67
-    """
-    Provides a format to send and receive telemetry data from the Meshtastic network.
-    Maintained by Charles Crossan (crossan007) : crossan007@gmail.com
-    ENCODING: Protobuf
-    """
-    ZPS_APP: _PortNum.ValueType  # 68
-    """
-    Experimental tools for estimating node position without a GPS
-    Maintained by Github user a-f-G-U-C (a Meshtastic contributor)
-    Project files at https://github.com/a-f-G-U-C/Meshtastic-ZPS
-    ENCODING: arrays of int64 fields
-    """
-    SIMULATOR_APP: _PortNum.ValueType  # 69
-    """
-    Used to let multiple instances of Linux native applications communicate
-    as if they did using their LoRa chip.
-    Maintained by GitHub user GUVWAF.
-    Project files at https://github.com/GUVWAF/Meshtasticator
-    ENCODING: Protobuf (?)
-    """
-    TRACEROUTE_APP: _PortNum.ValueType  # 70
-    """
-    Provides a traceroute functionality to show the route a packet towards
-    a certain destination would take on the mesh.
-    ENCODING: Protobuf
-    """
-    NEIGHBORINFO_APP: _PortNum.ValueType  # 71
-    """
-    Aggregates edge info for the network by sending out a list of each node's neighbors
-    ENCODING: Protobuf
-    """
-    ATAK_PLUGIN: _PortNum.ValueType  # 72
-    """
-    ATAK Plugin
-    Portnum for payloads from the official Meshtastic ATAK plugin
-    """
-    MAP_REPORT_APP: _PortNum.ValueType  # 73
-    """
-    Provides unencrypted information about a node for consumption by a map via MQTT
-    """
-    PRIVATE_APP: _PortNum.ValueType  # 256
-    """
-    Private applications should use portnums >= 256.
-    To simplify initial development and testing you can use "PRIVATE_APP"
-    in your code without needing to rebuild protobuf files (via [regen-protos.sh](https://github.com/meshtastic/firmware/blob/master/bin/regen-protos.sh))
-    """
-    ATAK_FORWARDER: _PortNum.ValueType  # 257
-    """
-    ATAK Forwarder Module https://github.com/paulmandal/atak-forwarder
-    ENCODING: libcotshrink
-    """
-    MAX: _PortNum.ValueType  # 511
-    """
-    Currently we limit port nums to no higher than this value
-    """
-
-class PortNum(_PortNum, metaclass=_PortNumEnumTypeWrapper):
-    """
-    For any new 'apps' that run on the device or via sister apps on phones/PCs they should pick and use a
-    unique 'portnum' for their application.
-    If you are making a new app using meshtastic, please send in a pull request to add your 'portnum' to this
-    master table.
-    PortNums should be assigned in the following range:
-    0-63   Core Meshtastic use, do not use for third party apps
-    64-127 Registered 3rd party apps, send in a pull request that adds a new entry to portnums.proto to  register your application
-    256-511 Use one of these portnums for your private applications that you don't want to register publically
-    All other values are reserved.
-    Note: This was formerly a Type enum named 'typ' with the same id #
-    We have change to this 'portnum' based scheme for specifying app handlers for particular payloads.
-    This change is backwards compatible by treating the legacy OPAQUE/CLEAR_TEXT values identically.
-    """
-
-UNKNOWN_APP: PortNum.ValueType  # 0
-"""
-Deprecated: do not use in new code (formerly called OPAQUE)
-A message sent from a device outside of the mesh, in a form the mesh does not understand
-NOTE: This must be 0, because it is documented in IMeshService.aidl to be so
-ENCODING: binary undefined
-"""
-TEXT_MESSAGE_APP: PortNum.ValueType  # 1
-"""
-A simple UTF-8 text message, which even the little micros in the mesh
-can understand and show on their screen eventually in some circumstances
-even signal might send messages in this form (see below)
-ENCODING: UTF-8 Plaintext (?)
-"""
-REMOTE_HARDWARE_APP: PortNum.ValueType  # 2
-"""
-Reserved for built-in GPIO/example app.
-See remote_hardware.proto/HardwareMessage for details on the message sent/received to this port number
-ENCODING: Protobuf
-"""
-POSITION_APP: PortNum.ValueType  # 3
-"""
-The built-in position messaging app.
-Payload is a Position message.
-ENCODING: Protobuf
-"""
-NODEINFO_APP: PortNum.ValueType  # 4
-"""
-The built-in user info app.
-Payload is a User message.
-ENCODING: Protobuf
-"""
-ROUTING_APP: PortNum.ValueType  # 5
-"""
-Protocol control packets for mesh protocol use.
-Payload is a Routing message.
-ENCODING: Protobuf
-"""
-ADMIN_APP: PortNum.ValueType  # 6
-"""
-Admin control packets.
-Payload is a AdminMessage message.
-ENCODING: Protobuf
-"""
-TEXT_MESSAGE_COMPRESSED_APP: PortNum.ValueType  # 7
-"""
-Compressed TEXT_MESSAGE payloads.
-ENCODING: UTF-8 Plaintext (?) with Unishox2 Compression
-NOTE: The Device Firmware converts a TEXT_MESSAGE_APP to TEXT_MESSAGE_COMPRESSED_APP if the compressed
-payload is shorter. There's no need for app developers to do this themselves. Also the firmware will decompress
-any incoming TEXT_MESSAGE_COMPRESSED_APP payload and convert to TEXT_MESSAGE_APP.
-"""
-WAYPOINT_APP: PortNum.ValueType  # 8
-"""
-Waypoint payloads.
-Payload is a Waypoint message.
-ENCODING: Protobuf
-"""
-AUDIO_APP: PortNum.ValueType  # 9
-"""
-Audio Payloads.
-Encapsulated codec2 packets. On 2.4 GHZ Bandwidths only for now
-ENCODING: codec2 audio frames
-NOTE: audio frames contain a 3 byte header (0xc0 0xde 0xc2) and a one byte marker for the decompressed bitrate.
-This marker comes from the 'moduleConfig.audio.bitrate' enum minus one.
-"""
-DETECTION_SENSOR_APP: PortNum.ValueType  # 10
-"""
-Same as Text Message but originating from Detection Sensor Module.
-NOTE: This portnum traffic is not sent to the public MQTT starting at firmware version 2.2.9
-"""
-REPLY_APP: PortNum.ValueType  # 32
-"""
-Provides a 'ping' service that replies to any packet it receives.
-Also serves as a small example module.
-ENCODING: ASCII Plaintext
-"""
-IP_TUNNEL_APP: PortNum.ValueType  # 33
-"""
-Used for the python IP tunnel feature
-ENCODING: IP Packet. Handled by the python API, firmware ignores this one and pases on.
-"""
-PAXCOUNTER_APP: PortNum.ValueType  # 34
-"""
-Paxcounter lib included in the firmware
-ENCODING: protobuf
-"""
-SERIAL_APP: PortNum.ValueType  # 64
-"""
-Provides a hardware serial interface to send and receive from the Meshtastic network.
-Connect to the RX/TX pins of a device with 38400 8N1. Packets received from the Meshtastic
-network is forwarded to the RX pin while sending a packet to TX will go out to the Mesh network.
-Maximum packet size of 240 bytes.
-Module is disabled by default can be turned on by setting SERIAL_MODULE_ENABLED = 1 in SerialPlugh.cpp.
-ENCODING: binary undefined
-"""
-STORE_FORWARD_APP: PortNum.ValueType  # 65
-"""
-STORE_FORWARD_APP (Work in Progress)
-Maintained by Jm Casler (MC Hamster) : jm@casler.org
-ENCODING: Protobuf
-"""
-RANGE_TEST_APP: PortNum.ValueType  # 66
-"""
-Optional port for messages for the range test module.
-ENCODING: ASCII Plaintext
-NOTE: This portnum traffic is not sent to the public MQTT starting at firmware version 2.2.9
-"""
-TELEMETRY_APP: PortNum.ValueType  # 67
-"""
-Provides a format to send and receive telemetry data from the Meshtastic network.
-Maintained by Charles Crossan (crossan007) : crossan007@gmail.com
-ENCODING: Protobuf
-"""
-ZPS_APP: PortNum.ValueType  # 68
-"""
-Experimental tools for estimating node position without a GPS
-Maintained by Github user a-f-G-U-C (a Meshtastic contributor)
-Project files at https://github.com/a-f-G-U-C/Meshtastic-ZPS
-ENCODING: arrays of int64 fields
-"""
-SIMULATOR_APP: PortNum.ValueType  # 69
-"""
-Used to let multiple instances of Linux native applications communicate
-as if they did using their LoRa chip.
-Maintained by GitHub user GUVWAF.
-Project files at https://github.com/GUVWAF/Meshtasticator
-ENCODING: Protobuf (?)
-"""
-TRACEROUTE_APP: PortNum.ValueType  # 70
-"""
-Provides a traceroute functionality to show the route a packet towards
-a certain destination would take on the mesh.
-ENCODING: Protobuf
-"""
-NEIGHBORINFO_APP: PortNum.ValueType  # 71
-"""
-Aggregates edge info for the network by sending out a list of each node's neighbors
-ENCODING: Protobuf
-"""
-ATAK_PLUGIN: PortNum.ValueType  # 72
-"""
-ATAK Plugin
-Portnum for payloads from the official Meshtastic ATAK plugin
-"""
-MAP_REPORT_APP: PortNum.ValueType  # 73
-"""
-Provides unencrypted information about a node for consumption by a map via MQTT
-"""
-PRIVATE_APP: PortNum.ValueType  # 256
-"""
-Private applications should use portnums >= 256.
-To simplify initial development and testing you can use "PRIVATE_APP"
-in your code without needing to rebuild protobuf files (via [regen-protos.sh](https://github.com/meshtastic/firmware/blob/master/bin/regen-protos.sh))
-"""
-ATAK_FORWARDER: PortNum.ValueType  # 257
-"""
-ATAK Forwarder Module https://github.com/paulmandal/atak-forwarder
-ENCODING: libcotshrink
-"""
-MAX: PortNum.ValueType  # 511
-"""
-Currently we limit port nums to no higher than this value
-"""
-global___PortNum = PortNum

meshtastic/remote_hardware.py

@@ -1,15 +1,14 @@
 """Remote hardware
 """
 import logging
-
+from pubsub import pub
-from pubsub import pub # type: ignore[import-untyped]
-
 from meshtastic import portnums_pb2, remote_hardware_pb2
 from meshtastic.util import our_exit
 
 
 def onGPIOreceive(packet, interface):
-    """Callback for received GPIO responses"""
+    """Callback for received GPIO responses
+    """
     logging.debug(f"packet:{packet} interface:{interface}")
     gpioValue = 0
     hw = packet["decoded"]["remotehw"]
@@ -22,11 +21,9 @@ def onGPIOreceive(packet, interface):
             # so, we set it here
             gpioValue = 0
 
-    # print(f'mask:{interface.mask}')
+    #print(f'mask:{interface.mask}')
     value = int(gpioValue) & int(interface.mask)
-    print(
+    print(f'Received RemoteHardware typ={hw["typ"]}, gpio_value={gpioValue} value={value}')
-        f'Received RemoteHardware type={hw["type"]}, gpio_value={gpioValue} value={value}'
-    )
     interface.gotResponse = True
 
 
@@ -47,55 +44,46 @@ class RemoteHardwareClient:
         ch = iface.localNode.getChannelByName("gpio")
         if not ch:
             our_exit(
-                "Warning: No channel named 'gpio' was found.\n"
+                "Warning: No channel named 'gpio' was found.\n"\
-                "On the sending and receive nodes create a channel named 'gpio'.\n"
+                "On the sending and receive nodes create a channel named 'gpio'.\n"\
-                "For example, run '--ch-add gpio' on one device, then '--seturl' on\n"
+                "For example, run '--ch-add gpio' on one device, then '--seturl' on\n"\
-                "the other devices using the url from the device where the channel was added."
+                "the other devices using the url from the device where the channel was added.")
-            )
         self.channelIndex = ch.index
 
         pub.subscribe(onGPIOreceive, "meshtastic.receive.remotehw")
 
     def _sendHardware(self, nodeid, r, wantResponse=False, onResponse=None):
         if not nodeid:
-            our_exit(
+            our_exit(r"Warning: Must use a destination node ID for this operation (use --dest \!xxxxxxxxx)")
-                r"Warning: Must use a destination node ID for this operation (use --dest \!xxxxxxxxx)"
+        return self.iface.sendData(r, nodeid, portnums_pb2.REMOTE_HARDWARE_APP,
-            )
+                                   wantAck=True, channelIndex=self.channelIndex,
-        return self.iface.sendData(
+                                   wantResponse=wantResponse, onResponse=onResponse)
-            r,
-            nodeid,
-            portnums_pb2.REMOTE_HARDWARE_APP,
-            wantAck=True,
-            channelIndex=self.channelIndex,
-            wantResponse=wantResponse,
-            onResponse=onResponse,
-        )
 
     def writeGPIOs(self, nodeid, mask, vals):
         """
         Write the specified vals bits to the device GPIOs.  Only bits in mask that
         are 1 will be changed
         """
-        logging.debug(f"writeGPIOs nodeid:{nodeid} mask:{mask} vals:{vals}")
+        logging.debug(f'writeGPIOs nodeid:{nodeid} mask:{mask} vals:{vals}')
         r = remote_hardware_pb2.HardwareMessage()
-        r.type = remote_hardware_pb2.HardwareMessage.Type.WRITE_GPIOS
+        r.typ = remote_hardware_pb2.HardwareMessage.Type.WRITE_GPIOS
         r.gpio_mask = mask
         r.gpio_value = vals
         return self._sendHardware(nodeid, r)
 
-    def readGPIOs(self, nodeid, mask, onResponse=None):
+    def readGPIOs(self, nodeid, mask, onResponse = None):
         """Read the specified bits from GPIO inputs on the device"""
-        logging.debug(f"readGPIOs nodeid:{nodeid} mask:{mask}")
+        logging.debug(f'readGPIOs nodeid:{nodeid} mask:{mask}')
         r = remote_hardware_pb2.HardwareMessage()
-        r.type = remote_hardware_pb2.HardwareMessage.Type.READ_GPIOS
+        r.typ = remote_hardware_pb2.HardwareMessage.Type.READ_GPIOS
         r.gpio_mask = mask
         return self._sendHardware(nodeid, r, wantResponse=True, onResponse=onResponse)
 
     def watchGPIOs(self, nodeid, mask):
         """Watch the specified bits from GPIO inputs on the device for changes"""
-        logging.debug(f"watchGPIOs nodeid:{nodeid} mask:{mask}")
+        logging.debug(f'watchGPIOs nodeid:{nodeid} mask:{mask}')
         r = remote_hardware_pb2.HardwareMessage()
-        r.type = remote_hardware_pb2.HardwareMessage.Type.WATCH_GPIOS
+        r.typ = remote_hardware_pb2.HardwareMessage.Type.WATCH_GPIOS
         r.gpio_mask = mask
         self.iface.mask = mask
         return self._sendHardware(nodeid, r)

meshtastic/remote_hardware_pb2.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: meshtastic/remote_hardware.proto
+# source: remote_hardware.proto
-"""Generated protocol buffer code."""
+
-from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
-from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import message as _message
+from google.protobuf import reflection as _reflection
 from google.protobuf import symbol_database as _symbol_database
 # @@protoc_insertion_point(imports)
 
@@ -13,16 +13,112 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n meshtastic/remote_hardware.proto\x12\nmeshtastic\"\xd6\x01\n\x0fHardwareMessage\x12.\n\x04type\x18\x01 \x01(\x0e\x32 .meshtastic.HardwareMessage.Type\x12\x11\n\tgpio_mask\x18\x02 \x01(\x04\x12\x12\n\ngpio_value\x18\x03 \x01(\x04\"l\n\x04Type\x12\t\n\x05UNSET\x10\x00\x12\x0f\n\x0bWRITE_GPIOS\x10\x01\x12\x0f\n\x0bWATCH_GPIOS\x10\x02\x12\x11\n\rGPIOS_CHANGED\x10\x03\x12\x0e\n\nREAD_GPIOS\x10\x04\x12\x14\n\x10READ_GPIOS_REPLY\x10\x05\x42\x63\n\x13\x63om.geeksville.meshB\x0eRemoteHardwareZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor.FileDescriptor(
+  name='remote_hardware.proto',
+  package='',
+  syntax='proto3',
+  serialized_options=b'\n\023com.geeksville.meshB\016RemoteHardwareH\003Z!github.com/meshtastic/gomeshproto',
+  serialized_pb=b'\n\x15remote_hardware.proto\"\xca\x01\n\x0fHardwareMessage\x12\"\n\x03typ\x18\x01 \x01(\x0e\x32\x15.HardwareMessage.Type\x12\x11\n\tgpio_mask\x18\x02 \x01(\x04\x12\x12\n\ngpio_value\x18\x03 \x01(\x04\"l\n\x04Type\x12\t\n\x05UNSET\x10\x00\x12\x0f\n\x0bWRITE_GPIOS\x10\x01\x12\x0f\n\x0bWATCH_GPIOS\x10\x02\x12\x11\n\rGPIOS_CHANGED\x10\x03\x12\x0e\n\nREAD_GPIOS\x10\x04\x12\x14\n\x10READ_GPIOS_REPLY\x10\x05\x42J\n\x13\x63om.geeksville.meshB\x0eRemoteHardwareH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3'
+)
 
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.remote_hardware_pb2', globals())
-if _descriptor._USE_C_DESCRIPTORS == False:
 
-  DESCRIPTOR._options = None
+
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\016RemoteHardwareZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+_HARDWAREMESSAGE_TYPE = _descriptor.EnumDescriptor(
-  _HARDWAREMESSAGE._serialized_start=49
+  name='Type',
-  _HARDWAREMESSAGE._serialized_end=263
+  full_name='HardwareMessage.Type',
-  _HARDWAREMESSAGE_TYPE._serialized_start=155
+  filename=None,
-  _HARDWAREMESSAGE_TYPE._serialized_end=263
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='UNSET', index=0, number=0,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='WRITE_GPIOS', index=1, number=1,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='WATCH_GPIOS', index=2, number=2,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='GPIOS_CHANGED', index=3, number=3,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='READ_GPIOS', index=4, number=4,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='READ_GPIOS_REPLY', index=5, number=5,
+      serialized_options=None,
+      type=None),
+  ],
+  containing_type=None,
+  serialized_options=None,
+  serialized_start=120,
+  serialized_end=228,
+)
+_sym_db.RegisterEnumDescriptor(_HARDWAREMESSAGE_TYPE)
+
+
+_HARDWAREMESSAGE = _descriptor.Descriptor(
+  name='HardwareMessage',
+  full_name='HardwareMessage',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='typ', full_name='HardwareMessage.typ', index=0,
+      number=1, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='gpio_mask', full_name='HardwareMessage.gpio_mask', index=1,
+      number=2, type=4, cpp_type=4, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='gpio_value', full_name='HardwareMessage.gpio_value', index=2,
+      number=3, type=4, cpp_type=4, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+    _HARDWAREMESSAGE_TYPE,
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=26,
+  serialized_end=228,
+)
+
+_HARDWAREMESSAGE.fields_by_name['typ'].enum_type = _HARDWAREMESSAGE_TYPE
+_HARDWAREMESSAGE_TYPE.containing_type = _HARDWAREMESSAGE
+DESCRIPTOR.message_types_by_name['HardwareMessage'] = _HARDWAREMESSAGE
+_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+
+HardwareMessage = _reflection.GeneratedProtocolMessageType('HardwareMessage', (_message.Message,), {
+  'DESCRIPTOR' : _HARDWAREMESSAGE,
+  '__module__' : 'remote_hardware_pb2'
+  # @@protoc_insertion_point(class_scope:HardwareMessage)
+  })
+_sym_db.RegisterMessage(HardwareMessage)
+
+
+DESCRIPTOR._options = None
 # @@protoc_insertion_point(module_scope)

meshtastic/remote_hardware_pb2.pyi

@@ -1,125 +0,0 @@
-"""
-@generated by mypy-protobuf.  Do not edit manually!
-isort:skip_file
-"""
-import builtins
-import google.protobuf.descriptor
-import google.protobuf.internal.enum_type_wrapper
-import google.protobuf.message
-import sys
-import typing
-
-if sys.version_info >= (3, 10):
-    import typing as typing_extensions
-else:
-    import typing_extensions
-
-DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
-
-@typing_extensions.final
-class HardwareMessage(google.protobuf.message.Message):
-    """
-    An example app to show off the module system. This message is used for
-    REMOTE_HARDWARE_APP PortNums.
-    Also provides easy remote access to any GPIO.
-    In the future other remote hardware operations can be added based on user interest
-    (i.e. serial output, spi/i2c input/output).
-    FIXME - currently this feature is turned on by default which is dangerous
-    because no security yet (beyond the channel mechanism).
-    It should be off by default and then protected based on some TBD mechanism
-    (a special channel once multichannel support is included?)
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    class _Type:
-        ValueType = typing.NewType("ValueType", builtins.int)
-        V: typing_extensions.TypeAlias = ValueType
-
-    class _TypeEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[HardwareMessage._Type.ValueType], builtins.type):
-        DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
-        UNSET: HardwareMessage._Type.ValueType  # 0
-        """
-        Unset/unused
-        """
-        WRITE_GPIOS: HardwareMessage._Type.ValueType  # 1
-        """
-        Set gpio gpios based on gpio_mask/gpio_value
-        """
-        WATCH_GPIOS: HardwareMessage._Type.ValueType  # 2
-        """
-        We are now interested in watching the gpio_mask gpios.
-        If the selected gpios change, please broadcast GPIOS_CHANGED.
-        Will implicitly change the gpios requested to be INPUT gpios.
-        """
-        GPIOS_CHANGED: HardwareMessage._Type.ValueType  # 3
-        """
-        The gpios listed in gpio_mask have changed, the new values are listed in gpio_value
-        """
-        READ_GPIOS: HardwareMessage._Type.ValueType  # 4
-        """
-        Read the gpios specified in gpio_mask, send back a READ_GPIOS_REPLY reply with gpio_value populated
-        """
-        READ_GPIOS_REPLY: HardwareMessage._Type.ValueType  # 5
-        """
-        A reply to READ_GPIOS. gpio_mask and gpio_value will be populated
-        """
-
-    class Type(_Type, metaclass=_TypeEnumTypeWrapper):
-        """
-        TODO: REPLACE
-        """
-
-    UNSET: HardwareMessage.Type.ValueType  # 0
-    """
-    Unset/unused
-    """
-    WRITE_GPIOS: HardwareMessage.Type.ValueType  # 1
-    """
-    Set gpio gpios based on gpio_mask/gpio_value
-    """
-    WATCH_GPIOS: HardwareMessage.Type.ValueType  # 2
-    """
-    We are now interested in watching the gpio_mask gpios.
-    If the selected gpios change, please broadcast GPIOS_CHANGED.
-    Will implicitly change the gpios requested to be INPUT gpios.
-    """
-    GPIOS_CHANGED: HardwareMessage.Type.ValueType  # 3
-    """
-    The gpios listed in gpio_mask have changed, the new values are listed in gpio_value
-    """
-    READ_GPIOS: HardwareMessage.Type.ValueType  # 4
-    """
-    Read the gpios specified in gpio_mask, send back a READ_GPIOS_REPLY reply with gpio_value populated
-    """
-    READ_GPIOS_REPLY: HardwareMessage.Type.ValueType  # 5
-    """
-    A reply to READ_GPIOS. gpio_mask and gpio_value will be populated
-    """
-
-    TYPE_FIELD_NUMBER: builtins.int
-    GPIO_MASK_FIELD_NUMBER: builtins.int
-    GPIO_VALUE_FIELD_NUMBER: builtins.int
-    type: global___HardwareMessage.Type.ValueType
-    """
-    What type of HardwareMessage is this?
-    """
-    gpio_mask: builtins.int
-    """
-    What gpios are we changing. Not used for all MessageTypes, see MessageType for details
-    """
-    gpio_value: builtins.int
-    """
-    For gpios that were listed in gpio_mask as valid, what are the signal levels for those gpios.
-    Not used for all MessageTypes, see MessageType for details
-    """
-    def __init__(
-        self,
-        *,
-        type: global___HardwareMessage.Type.ValueType = ...,
-        gpio_mask: builtins.int = ...,
-        gpio_value: builtins.int = ...,
-    ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["gpio_mask", b"gpio_mask", "gpio_value", b"gpio_value", "type", b"type"]) -> None: ...
-
-global___HardwareMessage = HardwareMessage

meshtastic/rtttl_pb2.py

@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: meshtastic/rtttl.proto
-"""Generated protocol buffer code."""
-from google.protobuf.internal import builder as _builder
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import descriptor_pool as _descriptor_pool
-from google.protobuf import symbol_database as _symbol_database
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-
-
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x16meshtastic/rtttl.proto\x12\nmeshtastic\"\x1f\n\x0bRTTTLConfig\x12\x10\n\x08ringtone\x18\x01 \x01(\tBf\n\x13\x63om.geeksville.meshB\x11RTTTLConfigProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
-
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.rtttl_pb2', globals())
-if _descriptor._USE_C_DESCRIPTORS == False:
-
-  DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\021RTTTLConfigProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
-  _RTTTLCONFIG._serialized_start=38
-  _RTTTLCONFIG._serialized_end=69
-# @@protoc_insertion_point(module_scope)

meshtastic/rtttl_pb2.pyi

@@ -1,37 +0,0 @@
-"""
-@generated by mypy-protobuf.  Do not edit manually!
-isort:skip_file
-"""
-import builtins
-import google.protobuf.descriptor
-import google.protobuf.message
-import sys
-
-if sys.version_info >= (3, 8):
-    import typing as typing_extensions
-else:
-    import typing_extensions
-
-DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
-
-@typing_extensions.final
-class RTTTLConfig(google.protobuf.message.Message):
-    """
-    Canned message module configuration.
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    RINGTONE_FIELD_NUMBER: builtins.int
-    ringtone: builtins.str
-    """
-    Ringtone for PWM Buzzer in RTTTL Format.
-    """
-    def __init__(
-        self,
-        *,
-        ringtone: builtins.str = ...,
-    ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["ringtone", b"ringtone"]) -> None: ...
-
-global___RTTTLConfig = RTTTLConfig

meshtastic/serial_interface.py

@@ -1,18 +1,16 @@
 """ Serial interface class
 """
 import logging
-import platform
 import time
-
+import platform
-import serial # type: ignore[import-untyped]
+import serial
 
 import meshtastic.util
 from meshtastic.stream_interface import StreamInterface
 
-if platform.system() != "Windows":
+if platform.system() != 'Windows':
     import termios
 
-
 class SerialInterface(StreamInterface):
     """Interface class for meshtastic devices over a serial link"""
 
@@ -32,8 +30,7 @@ class SerialInterface(StreamInterface):
             ports = meshtastic.util.findPorts(True)
             logging.debug(f"ports:{ports}")
             if len(ports) == 0:
-                print("No Serial Meshtastic device detected, attempting TCP connection on localhost.")
+                meshtastic.util.our_exit("Warning: No Meshtastic devices detected.")
-                return
             elif len(ports) > 1:
                 message = "Warning: Multiple serial ports were detected so one serial port must be specified with the '--port'.\n"
                 message += f"  Ports detected:{ports}"
@@ -45,23 +42,19 @@ class SerialInterface(StreamInterface):
 
         # first we need to set the HUPCL so the device will not reboot based on RTS and/or DTR
         # see https://github.com/pyserial/pyserial/issues/124
-        if platform.system() != "Windows":
+        if platform.system() != 'Windows':
-            with open(self.devPath, encoding="utf8") as f:
+            with open(self.devPath, encoding='utf8') as f:
                 attrs = termios.tcgetattr(f)
                 attrs[2] = attrs[2] & ~termios.HUPCL
                 termios.tcsetattr(f, termios.TCSAFLUSH, attrs)
                 f.close()
             time.sleep(0.1)
 
-        self.stream = serial.Serial(
+        self.stream = serial.Serial(self.devPath, 921600, exclusive=True, timeout=0.5, write_timeout=0)
-            self.devPath, 115200, exclusive=True, timeout=0.5, write_timeout=0
-        )
         self.stream.flush()
         time.sleep(0.1)
 
-        StreamInterface.__init__(
+        StreamInterface.__init__(self, debugOut=debugOut, noProto=noProto, connectNow=connectNow)
-            self, debugOut=debugOut, noProto=noProto, connectNow=connectNow
-        )
 
     def close(self):
         """Close a connection to the device"""

meshtastic/storeforward_pb2.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: meshtastic/storeforward.proto
+# source: storeforward.proto
-"""Generated protocol buffer code."""
+
-from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
-from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import message as _message
+from google.protobuf import reflection as _reflection
 from google.protobuf import symbol_database as _symbol_database
 # @@protoc_insertion_point(imports)
 
@@ -13,22 +13,344 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1dmeshtastic/storeforward.proto\x12\nmeshtastic\"\x9c\x07\n\x0fStoreAndForward\x12\x37\n\x02rr\x18\x01 \x01(\x0e\x32+.meshtastic.StoreAndForward.RequestResponse\x12\x37\n\x05stats\x18\x02 \x01(\x0b\x32&.meshtastic.StoreAndForward.StatisticsH\x00\x12\x36\n\x07history\x18\x03 \x01(\x0b\x32#.meshtastic.StoreAndForward.HistoryH\x00\x12:\n\theartbeat\x18\x04 \x01(\x0b\x32%.meshtastic.StoreAndForward.HeartbeatH\x00\x12\x0e\n\x04text\x18\x05 \x01(\x0cH\x00\x1a\xcd\x01\n\nStatistics\x12\x16\n\x0emessages_total\x18\x01 \x01(\r\x12\x16\n\x0emessages_saved\x18\x02 \x01(\r\x12\x14\n\x0cmessages_max\x18\x03 \x01(\r\x12\x0f\n\x07up_time\x18\x04 \x01(\r\x12\x10\n\x08requests\x18\x05 \x01(\r\x12\x18\n\x10requests_history\x18\x06 \x01(\r\x12\x11\n\theartbeat\x18\x07 \x01(\x08\x12\x12\n\nreturn_max\x18\x08 \x01(\r\x12\x15\n\rreturn_window\x18\t \x01(\r\x1aI\n\x07History\x12\x18\n\x10history_messages\x18\x01 \x01(\r\x12\x0e\n\x06window\x18\x02 \x01(\r\x12\x14\n\x0clast_request\x18\x03 \x01(\r\x1a.\n\tHeartbeat\x12\x0e\n\x06period\x18\x01 \x01(\r\x12\x11\n\tsecondary\x18\x02 \x01(\r\"\xbc\x02\n\x0fRequestResponse\x12\t\n\x05UNSET\x10\x00\x12\x10\n\x0cROUTER_ERROR\x10\x01\x12\x14\n\x10ROUTER_HEARTBEAT\x10\x02\x12\x0f\n\x0bROUTER_PING\x10\x03\x12\x0f\n\x0bROUTER_PONG\x10\x04\x12\x0f\n\x0bROUTER_BUSY\x10\x05\x12\x12\n\x0eROUTER_HISTORY\x10\x06\x12\x10\n\x0cROUTER_STATS\x10\x07\x12\x16\n\x12ROUTER_TEXT_DIRECT\x10\x08\x12\x19\n\x15ROUTER_TEXT_BROADCAST\x10\t\x12\x10\n\x0c\x43LIENT_ERROR\x10@\x12\x12\n\x0e\x43LIENT_HISTORY\x10\x41\x12\x10\n\x0c\x43LIENT_STATS\x10\x42\x12\x0f\n\x0b\x43LIENT_PING\x10\x43\x12\x0f\n\x0b\x43LIENT_PONG\x10\x44\x12\x10\n\x0c\x43LIENT_ABORT\x10jB\t\n\x07variantBj\n\x13\x63om.geeksville.meshB\x15StoreAndForwardProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor.FileDescriptor(
+  name='storeforward.proto',
+  package='',
+  syntax='proto3',
+  serialized_options=b'\n\023com.geeksville.meshB\025StoreAndForwardProtosH\003Z!github.com/meshtastic/gomeshproto',
+  serialized_pb=b'\n\x12storeforward.proto\"\x8a\x06\n\x0fStoreAndForward\x12,\n\x02rr\x18\x01 \x01(\x0e\x32 .StoreAndForward.RequestResponse\x12*\n\x05stats\x18\x02 \x01(\x0b\x32\x1b.StoreAndForward.Statistics\x12)\n\x07history\x18\x03 \x01(\x0b\x32\x18.StoreAndForward.History\x12-\n\theartbeat\x18\x04 \x01(\x0b\x32\x1a.StoreAndForward.Heartbeat\x1a\xcd\x01\n\nStatistics\x12\x16\n\x0emessages_total\x18\x01 \x01(\r\x12\x16\n\x0emessages_saved\x18\x02 \x01(\r\x12\x14\n\x0cmessages_max\x18\x03 \x01(\r\x12\x0f\n\x07up_time\x18\x04 \x01(\r\x12\x10\n\x08requests\x18\x05 \x01(\r\x12\x18\n\x10requests_history\x18\x06 \x01(\r\x12\x11\n\theartbeat\x18\x07 \x01(\x08\x12\x12\n\nreturn_max\x18\x08 \x01(\r\x12\x15\n\rreturn_window\x18\t \x01(\r\x1aI\n\x07History\x12\x18\n\x10history_messages\x18\x01 \x01(\r\x12\x0e\n\x06window\x18\x02 \x01(\r\x12\x14\n\x0clast_request\x18\x03 \x01(\r\x1a.\n\tHeartbeat\x12\x0e\n\x06period\x18\x01 \x01(\r\x12\x11\n\tsecondary\x18\x02 \x01(\r\"\xf7\x01\n\x0fRequestResponse\x12\t\n\x05UNSET\x10\x00\x12\x10\n\x0cROUTER_ERROR\x10\x01\x12\x14\n\x10ROUTER_HEARTBEAT\x10\x02\x12\x0f\n\x0bROUTER_PING\x10\x03\x12\x0f\n\x0bROUTER_PONG\x10\x04\x12\x0f\n\x0bROUTER_BUSY\x10\x05\x12\x12\n\x0eROUTER_HISTORY\x10\x06\x12\x10\n\x0c\x43LIENT_ERROR\x10\x65\x12\x12\n\x0e\x43LIENT_HISTORY\x10\x66\x12\x10\n\x0c\x43LIENT_STATS\x10g\x12\x0f\n\x0b\x43LIENT_PING\x10h\x12\x0f\n\x0b\x43LIENT_PONG\x10i\x12\x10\n\x0c\x43LIENT_ABORT\x10jBQ\n\x13\x63om.geeksville.meshB\x15StoreAndForwardProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3'
+)
 
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.storeforward_pb2', globals())
-if _descriptor._USE_C_DESCRIPTORS == False:
 
-  DESCRIPTOR._options = None
+
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\025StoreAndForwardProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+_STOREANDFORWARD_REQUESTRESPONSE = _descriptor.EnumDescriptor(
-  _STOREANDFORWARD._serialized_start=46
+  name='RequestResponse',
-  _STOREANDFORWARD._serialized_end=970
+  full_name='StoreAndForward.RequestResponse',
-  _STOREANDFORWARD_STATISTICS._serialized_start=312
+  filename=None,
-  _STOREANDFORWARD_STATISTICS._serialized_end=517
+  file=DESCRIPTOR,
-  _STOREANDFORWARD_HISTORY._serialized_start=519
+  values=[
-  _STOREANDFORWARD_HISTORY._serialized_end=592
+    _descriptor.EnumValueDescriptor(
-  _STOREANDFORWARD_HEARTBEAT._serialized_start=594
+      name='UNSET', index=0, number=0,
-  _STOREANDFORWARD_HEARTBEAT._serialized_end=640
+      serialized_options=None,
-  _STOREANDFORWARD_REQUESTRESPONSE._serialized_start=643
+      type=None),
-  _STOREANDFORWARD_REQUESTRESPONSE._serialized_end=959
+    _descriptor.EnumValueDescriptor(
+      name='ROUTER_ERROR', index=1, number=1,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ROUTER_HEARTBEAT', index=2, number=2,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ROUTER_PING', index=3, number=3,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ROUTER_PONG', index=4, number=4,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ROUTER_BUSY', index=5, number=5,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='ROUTER_HISTORY', index=6, number=6,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='CLIENT_ERROR', index=7, number=101,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='CLIENT_HISTORY', index=8, number=102,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='CLIENT_STATS', index=9, number=103,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='CLIENT_PING', index=10, number=104,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='CLIENT_PONG', index=11, number=105,
+      serialized_options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='CLIENT_ABORT', index=12, number=106,
+      serialized_options=None,
+      type=None),
+  ],
+  containing_type=None,
+  serialized_options=None,
+  serialized_start=554,
+  serialized_end=801,
+)
+_sym_db.RegisterEnumDescriptor(_STOREANDFORWARD_REQUESTRESPONSE)
+
+
+_STOREANDFORWARD_STATISTICS = _descriptor.Descriptor(
+  name='Statistics',
+  full_name='StoreAndForward.Statistics',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='messages_total', full_name='StoreAndForward.Statistics.messages_total', index=0,
+      number=1, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='messages_saved', full_name='StoreAndForward.Statistics.messages_saved', index=1,
+      number=2, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='messages_max', full_name='StoreAndForward.Statistics.messages_max', index=2,
+      number=3, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='up_time', full_name='StoreAndForward.Statistics.up_time', index=3,
+      number=4, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='requests', full_name='StoreAndForward.Statistics.requests', index=4,
+      number=5, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='requests_history', full_name='StoreAndForward.Statistics.requests_history', index=5,
+      number=6, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='heartbeat', full_name='StoreAndForward.Statistics.heartbeat', index=6,
+      number=7, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='return_max', full_name='StoreAndForward.Statistics.return_max', index=7,
+      number=8, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='return_window', full_name='StoreAndForward.Statistics.return_window', index=8,
+      number=9, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=223,
+  serialized_end=428,
+)
+
+_STOREANDFORWARD_HISTORY = _descriptor.Descriptor(
+  name='History',
+  full_name='StoreAndForward.History',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='history_messages', full_name='StoreAndForward.History.history_messages', index=0,
+      number=1, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='window', full_name='StoreAndForward.History.window', index=1,
+      number=2, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='last_request', full_name='StoreAndForward.History.last_request', index=2,
+      number=3, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=430,
+  serialized_end=503,
+)
+
+_STOREANDFORWARD_HEARTBEAT = _descriptor.Descriptor(
+  name='Heartbeat',
+  full_name='StoreAndForward.Heartbeat',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='period', full_name='StoreAndForward.Heartbeat.period', index=0,
+      number=1, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='secondary', full_name='StoreAndForward.Heartbeat.secondary', index=1,
+      number=2, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=505,
+  serialized_end=551,
+)
+
+_STOREANDFORWARD = _descriptor.Descriptor(
+  name='StoreAndForward',
+  full_name='StoreAndForward',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='rr', full_name='StoreAndForward.rr', index=0,
+      number=1, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='stats', full_name='StoreAndForward.stats', index=1,
+      number=2, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='history', full_name='StoreAndForward.history', index=2,
+      number=3, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='heartbeat', full_name='StoreAndForward.heartbeat', index=3,
+      number=4, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR),
+  ],
+  extensions=[
+  ],
+  nested_types=[_STOREANDFORWARD_STATISTICS, _STOREANDFORWARD_HISTORY, _STOREANDFORWARD_HEARTBEAT, ],
+  enum_types=[
+    _STOREANDFORWARD_REQUESTRESPONSE,
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=23,
+  serialized_end=801,
+)
+
+_STOREANDFORWARD_STATISTICS.containing_type = _STOREANDFORWARD
+_STOREANDFORWARD_HISTORY.containing_type = _STOREANDFORWARD
+_STOREANDFORWARD_HEARTBEAT.containing_type = _STOREANDFORWARD
+_STOREANDFORWARD.fields_by_name['rr'].enum_type = _STOREANDFORWARD_REQUESTRESPONSE
+_STOREANDFORWARD.fields_by_name['stats'].message_type = _STOREANDFORWARD_STATISTICS
+_STOREANDFORWARD.fields_by_name['history'].message_type = _STOREANDFORWARD_HISTORY
+_STOREANDFORWARD.fields_by_name['heartbeat'].message_type = _STOREANDFORWARD_HEARTBEAT
+_STOREANDFORWARD_REQUESTRESPONSE.containing_type = _STOREANDFORWARD
+DESCRIPTOR.message_types_by_name['StoreAndForward'] = _STOREANDFORWARD
+_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+
+StoreAndForward = _reflection.GeneratedProtocolMessageType('StoreAndForward', (_message.Message,), {
+
+  'Statistics' : _reflection.GeneratedProtocolMessageType('Statistics', (_message.Message,), {
+    'DESCRIPTOR' : _STOREANDFORWARD_STATISTICS,
+    '__module__' : 'storeforward_pb2'
+    # @@protoc_insertion_point(class_scope:StoreAndForward.Statistics)
+    })
+  ,
+
+  'History' : _reflection.GeneratedProtocolMessageType('History', (_message.Message,), {
+    'DESCRIPTOR' : _STOREANDFORWARD_HISTORY,
+    '__module__' : 'storeforward_pb2'
+    # @@protoc_insertion_point(class_scope:StoreAndForward.History)
+    })
+  ,
+
+  'Heartbeat' : _reflection.GeneratedProtocolMessageType('Heartbeat', (_message.Message,), {
+    'DESCRIPTOR' : _STOREANDFORWARD_HEARTBEAT,
+    '__module__' : 'storeforward_pb2'
+    # @@protoc_insertion_point(class_scope:StoreAndForward.Heartbeat)
+    })
+  ,
+  'DESCRIPTOR' : _STOREANDFORWARD,
+  '__module__' : 'storeforward_pb2'
+  # @@protoc_insertion_point(class_scope:StoreAndForward)
+  })
+_sym_db.RegisterMessage(StoreAndForward)
+_sym_db.RegisterMessage(StoreAndForward.Statistics)
+_sym_db.RegisterMessage(StoreAndForward.History)
+_sym_db.RegisterMessage(StoreAndForward.Heartbeat)
+
+
+DESCRIPTOR._options = None
 # @@protoc_insertion_point(module_scope)

meshtastic/storeforward_pb2.pyi

@@ -1,341 +0,0 @@
-"""
-@generated by mypy-protobuf.  Do not edit manually!
-isort:skip_file
-"""
-import builtins
-import google.protobuf.descriptor
-import google.protobuf.internal.enum_type_wrapper
-import google.protobuf.message
-import sys
-import typing
-
-if sys.version_info >= (3, 10):
-    import typing as typing_extensions
-else:
-    import typing_extensions
-
-DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
-
-@typing_extensions.final
-class StoreAndForward(google.protobuf.message.Message):
-    """
-    TODO: REPLACE
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    class _RequestResponse:
-        ValueType = typing.NewType("ValueType", builtins.int)
-        V: typing_extensions.TypeAlias = ValueType
-
-    class _RequestResponseEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[StoreAndForward._RequestResponse.ValueType], builtins.type):
-        DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
-        UNSET: StoreAndForward._RequestResponse.ValueType  # 0
-        """
-        Unset/unused
-        """
-        ROUTER_ERROR: StoreAndForward._RequestResponse.ValueType  # 1
-        """
-        Router is an in error state.
-        """
-        ROUTER_HEARTBEAT: StoreAndForward._RequestResponse.ValueType  # 2
-        """
-        Router heartbeat
-        """
-        ROUTER_PING: StoreAndForward._RequestResponse.ValueType  # 3
-        """
-        Router has requested the client respond. This can work as a
-        "are you there" message.
-        """
-        ROUTER_PONG: StoreAndForward._RequestResponse.ValueType  # 4
-        """
-        The response to a "Ping"
-        """
-        ROUTER_BUSY: StoreAndForward._RequestResponse.ValueType  # 5
-        """
-        Router is currently busy. Please try again later.
-        """
-        ROUTER_HISTORY: StoreAndForward._RequestResponse.ValueType  # 6
-        """
-        Router is responding to a request for history.
-        """
-        ROUTER_STATS: StoreAndForward._RequestResponse.ValueType  # 7
-        """
-        Router is responding to a request for stats.
-        """
-        ROUTER_TEXT_DIRECT: StoreAndForward._RequestResponse.ValueType  # 8
-        """
-        Router sends a text message from its history that was a direct message.
-        """
-        ROUTER_TEXT_BROADCAST: StoreAndForward._RequestResponse.ValueType  # 9
-        """
-        Router sends a text message from its history that was a broadcast.
-        """
-        CLIENT_ERROR: StoreAndForward._RequestResponse.ValueType  # 64
-        """
-        Client is an in error state.
-        """
-        CLIENT_HISTORY: StoreAndForward._RequestResponse.ValueType  # 65
-        """
-        Client has requested a replay from the router.
-        """
-        CLIENT_STATS: StoreAndForward._RequestResponse.ValueType  # 66
-        """
-        Client has requested stats from the router.
-        """
-        CLIENT_PING: StoreAndForward._RequestResponse.ValueType  # 67
-        """
-        Client has requested the router respond. This can work as a
-        "are you there" message.
-        """
-        CLIENT_PONG: StoreAndForward._RequestResponse.ValueType  # 68
-        """
-        The response to a "Ping"
-        """
-        CLIENT_ABORT: StoreAndForward._RequestResponse.ValueType  # 106
-        """
-        Client has requested that the router abort processing the client's request
-        """
-
-    class RequestResponse(_RequestResponse, metaclass=_RequestResponseEnumTypeWrapper):
-        """
-        001 - 063 = From Router
-        064 - 127 = From Client
-        """
-
-    UNSET: StoreAndForward.RequestResponse.ValueType  # 0
-    """
-    Unset/unused
-    """
-    ROUTER_ERROR: StoreAndForward.RequestResponse.ValueType  # 1
-    """
-    Router is an in error state.
-    """
-    ROUTER_HEARTBEAT: StoreAndForward.RequestResponse.ValueType  # 2
-    """
-    Router heartbeat
-    """
-    ROUTER_PING: StoreAndForward.RequestResponse.ValueType  # 3
-    """
-    Router has requested the client respond. This can work as a
-    "are you there" message.
-    """
-    ROUTER_PONG: StoreAndForward.RequestResponse.ValueType  # 4
-    """
-    The response to a "Ping"
-    """
-    ROUTER_BUSY: StoreAndForward.RequestResponse.ValueType  # 5
-    """
-    Router is currently busy. Please try again later.
-    """
-    ROUTER_HISTORY: StoreAndForward.RequestResponse.ValueType  # 6
-    """
-    Router is responding to a request for history.
-    """
-    ROUTER_STATS: StoreAndForward.RequestResponse.ValueType  # 7
-    """
-    Router is responding to a request for stats.
-    """
-    ROUTER_TEXT_DIRECT: StoreAndForward.RequestResponse.ValueType  # 8
-    """
-    Router sends a text message from its history that was a direct message.
-    """
-    ROUTER_TEXT_BROADCAST: StoreAndForward.RequestResponse.ValueType  # 9
-    """
-    Router sends a text message from its history that was a broadcast.
-    """
-    CLIENT_ERROR: StoreAndForward.RequestResponse.ValueType  # 64
-    """
-    Client is an in error state.
-    """
-    CLIENT_HISTORY: StoreAndForward.RequestResponse.ValueType  # 65
-    """
-    Client has requested a replay from the router.
-    """
-    CLIENT_STATS: StoreAndForward.RequestResponse.ValueType  # 66
-    """
-    Client has requested stats from the router.
-    """
-    CLIENT_PING: StoreAndForward.RequestResponse.ValueType  # 67
-    """
-    Client has requested the router respond. This can work as a
-    "are you there" message.
-    """
-    CLIENT_PONG: StoreAndForward.RequestResponse.ValueType  # 68
-    """
-    The response to a "Ping"
-    """
-    CLIENT_ABORT: StoreAndForward.RequestResponse.ValueType  # 106
-    """
-    Client has requested that the router abort processing the client's request
-    """
-
-    @typing_extensions.final
-    class Statistics(google.protobuf.message.Message):
-        """
-        TODO: REPLACE
-        """
-
-        DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-        MESSAGES_TOTAL_FIELD_NUMBER: builtins.int
-        MESSAGES_SAVED_FIELD_NUMBER: builtins.int
-        MESSAGES_MAX_FIELD_NUMBER: builtins.int
-        UP_TIME_FIELD_NUMBER: builtins.int
-        REQUESTS_FIELD_NUMBER: builtins.int
-        REQUESTS_HISTORY_FIELD_NUMBER: builtins.int
-        HEARTBEAT_FIELD_NUMBER: builtins.int
-        RETURN_MAX_FIELD_NUMBER: builtins.int
-        RETURN_WINDOW_FIELD_NUMBER: builtins.int
-        messages_total: builtins.int
-        """
-        Number of messages we have ever seen
-        """
-        messages_saved: builtins.int
-        """
-        Number of messages we have currently saved our history.
-        """
-        messages_max: builtins.int
-        """
-        Maximum number of messages we will save
-        """
-        up_time: builtins.int
-        """
-        Router uptime in seconds
-        """
-        requests: builtins.int
-        """
-        Number of times any client sent a request to the S&F.
-        """
-        requests_history: builtins.int
-        """
-        Number of times the history was requested.
-        """
-        heartbeat: builtins.bool
-        """
-        Is the heartbeat enabled on the server?
-        """
-        return_max: builtins.int
-        """
-        Maximum number of messages the server will return.
-        """
-        return_window: builtins.int
-        """
-        Maximum history window in minutes the server will return messages from.
-        """
-        def __init__(
-            self,
-            *,
-            messages_total: builtins.int = ...,
-            messages_saved: builtins.int = ...,
-            messages_max: builtins.int = ...,
-            up_time: builtins.int = ...,
-            requests: builtins.int = ...,
-            requests_history: builtins.int = ...,
-            heartbeat: builtins.bool = ...,
-            return_max: builtins.int = ...,
-            return_window: builtins.int = ...,
-        ) -> None: ...
-        def ClearField(self, field_name: typing_extensions.Literal["heartbeat", b"heartbeat", "messages_max", b"messages_max", "messages_saved", b"messages_saved", "messages_total", b"messages_total", "requests", b"requests", "requests_history", b"requests_history", "return_max", b"return_max", "return_window", b"return_window", "up_time", b"up_time"]) -> None: ...
-
-    @typing_extensions.final
-    class History(google.protobuf.message.Message):
-        """
-        TODO: REPLACE
-        """
-
-        DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-        HISTORY_MESSAGES_FIELD_NUMBER: builtins.int
-        WINDOW_FIELD_NUMBER: builtins.int
-        LAST_REQUEST_FIELD_NUMBER: builtins.int
-        history_messages: builtins.int
-        """
-        Number of that will be sent to the client
-        """
-        window: builtins.int
-        """
-        The window of messages that was used to filter the history client requested
-        """
-        last_request: builtins.int
-        """
-        Index in the packet history of the last message sent in a previous request to the server.
-        Will be sent to the client before sending the history and can be set in a subsequent request to avoid getting packets the server already sent to the client.
-        """
-        def __init__(
-            self,
-            *,
-            history_messages: builtins.int = ...,
-            window: builtins.int = ...,
-            last_request: builtins.int = ...,
-        ) -> None: ...
-        def ClearField(self, field_name: typing_extensions.Literal["history_messages", b"history_messages", "last_request", b"last_request", "window", b"window"]) -> None: ...
-
-    @typing_extensions.final
-    class Heartbeat(google.protobuf.message.Message):
-        """
-        TODO: REPLACE
-        """
-
-        DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-        PERIOD_FIELD_NUMBER: builtins.int
-        SECONDARY_FIELD_NUMBER: builtins.int
-        period: builtins.int
-        """
-        Period in seconds that the heartbeat is sent out that will be sent to the client
-        """
-        secondary: builtins.int
-        """
-        If set, this is not the primary Store & Forward router on the mesh
-        """
-        def __init__(
-            self,
-            *,
-            period: builtins.int = ...,
-            secondary: builtins.int = ...,
-        ) -> None: ...
-        def ClearField(self, field_name: typing_extensions.Literal["period", b"period", "secondary", b"secondary"]) -> None: ...
-
-    RR_FIELD_NUMBER: builtins.int
-    STATS_FIELD_NUMBER: builtins.int
-    HISTORY_FIELD_NUMBER: builtins.int
-    HEARTBEAT_FIELD_NUMBER: builtins.int
-    TEXT_FIELD_NUMBER: builtins.int
-    rr: global___StoreAndForward.RequestResponse.ValueType
-    """
-    TODO: REPLACE
-    """
-    @property
-    def stats(self) -> global___StoreAndForward.Statistics:
-        """
-        TODO: REPLACE
-        """
-    @property
-    def history(self) -> global___StoreAndForward.History:
-        """
-        TODO: REPLACE
-        """
-    @property
-    def heartbeat(self) -> global___StoreAndForward.Heartbeat:
-        """
-        TODO: REPLACE
-        """
-    text: builtins.bytes
-    """
-    Text from history message.
-    """
-    def __init__(
-        self,
-        *,
-        rr: global___StoreAndForward.RequestResponse.ValueType = ...,
-        stats: global___StoreAndForward.Statistics | None = ...,
-        history: global___StoreAndForward.History | None = ...,
-        heartbeat: global___StoreAndForward.Heartbeat | None = ...,
-        text: builtins.bytes = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing_extensions.Literal["heartbeat", b"heartbeat", "history", b"history", "stats", b"stats", "text", b"text", "variant", b"variant"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["heartbeat", b"heartbeat", "history", b"history", "rr", b"rr", "stats", b"stats", "text", b"text", "variant", b"variant"]) -> None: ...
-    def WhichOneof(self, oneof_group: typing_extensions.Literal["variant", b"variant"]) -> typing_extensions.Literal["stats", "history", "heartbeat", "text"] | None: ...
-
-global___StoreAndForward = StoreAndForward

meshtastic/stream_interface.py

@@ -4,14 +4,15 @@ import logging
 import threading
 import time
 import traceback
+import serial
 
-import serial # type: ignore[import-untyped]
 
 from meshtastic.mesh_interface import MeshInterface
-from meshtastic.util import is_windows11, stripnl
+from meshtastic.util import stripnl, is_windows11
+
 
 START1 = 0x94
-START2 = 0xC3
+START2 = 0xc3
 HEADER_LEN = 4
 MAX_TO_FROM_RADIO_SIZE = 512
 
@@ -31,10 +32,9 @@ class StreamInterface(MeshInterface):
             Exception: [description]
         """
 
-        if not hasattr(self, "stream") and not noProto:
+        if not hasattr(self, 'stream') and not noProto:
-            raise Exception( # pylint: disable=W0719
+            raise Exception(
-                "StreamInterface is now abstract (to update existing code create SerialInterface instead)"
+                "StreamInterface is now abstract (to update existing code create SerialInterface instead)")
-            )
         self._rxBuf = bytes()  # empty
         self._wantExit = False
 
@@ -60,7 +60,7 @@ class StreamInterface(MeshInterface):
 
         # Send some bogus UART characters to force a sleeping device to wake, and
         # if the reading statemachine was parsing a bad packet make sure
-        # we write enough start bytes to force it to resync (we don't use START1
+        # we write enought start bytes to force it to resync (we don't use START1
         # because we want to ensure it is looking for START1)
         p = bytearray([START2] * 32)
         self._writeBytes(p)
@@ -110,8 +110,8 @@ class StreamInterface(MeshInterface):
         b = toRadio.SerializeToString()
         bufLen = len(b)
         # We convert into a string, because the TCP code doesn't work with byte arrays
-        header = bytes([START1, START2, (bufLen >> 8) & 0xFF, bufLen & 0xFF])
+        header = bytes([START1, START2, (bufLen >> 8) & 0xff,  bufLen & 0xff])
-        logging.debug(f"sending header:{header} b:{b}")
+        logging.debug(f'sending header:{header} b:{b}')
         self._writeBytes(header + b)
 
     def close(self):
@@ -126,18 +126,18 @@ class StreamInterface(MeshInterface):
 
     def __reader(self):
         """The reader thread that reads bytes from our stream"""
-        logging.debug("in __reader()")
+        logging.debug('in __reader()')
         empty = bytes()
 
         try:
             while not self._wantExit:
-                # logging.debug("reading character")
+                logging.debug("reading character")
                 b = self._readBytes(1)
-                # logging.debug("In reader loop")
+                logging.debug("In reader loop")
-                # logging.debug(f"read returned {b}")
+                #logging.debug(f"read returned {b}")
                 if len(b) > 0:
                     c = b[0]
-                    # logging.debug(f'c:{c}')
+                    #logging.debug(f'c:{c}')
                     ptr = len(self._rxBuf)
 
                     # Assume we want to append this byte, fixme use bytearray instead
@@ -150,54 +150,38 @@ class StreamInterface(MeshInterface):
                                 try:
                                     self.debugOut.write(b.decode("utf-8"))
                                 except:
-                                    self.debugOut.write("?")
+                                    self.debugOut.write('?')
 
                     elif ptr == 1:  # looking for START2
                         if c != START2:
                             self._rxBuf = empty  # failed to find start2
                     elif ptr >= HEADER_LEN - 1:  # we've at least got a header
-                        # logging.debug('at least we received a header')
+                        #logging.debug('at least we received a header')
                         # big endian length follows header
                         packetlen = (self._rxBuf[2] << 8) + self._rxBuf[3]
 
-                        if (
+                        if ptr == HEADER_LEN - 1:  # we _just_ finished reading the header, validate length
-                            ptr == HEADER_LEN - 1
-                        ):  # we _just_ finished reading the header, validate length
                             if packetlen > MAX_TO_FROM_RADIO_SIZE:
-                                self._rxBuf = (
+                                self._rxBuf = empty  # length was out out bounds, restart
-                                    empty  # length was out out bounds, restart
-                                )
 
                         if len(self._rxBuf) != 0 and ptr + 1 >= packetlen + HEADER_LEN:
                             try:
                                 self._handleFromRadio(self._rxBuf[HEADER_LEN:])
                             except Exception as ex:
-                                logging.error(
+                                logging.error(f"Error while handling message from radio {ex}")
-                                    f"Error while handling message from radio {ex}"
-                                )
                                 traceback.print_exc()
                             self._rxBuf = empty
                 else:
                     # logging.debug(f"timeout")
                     pass
         except serial.SerialException as ex:
-            if (
+            if not self._wantExit:  # We might intentionally get an exception during shutdown
-                not self._wantExit
+                logging.warning(f"Meshtastic serial port disconnected, disconnecting... {ex}")
-            ):  # We might intentionally get an exception during shutdown
-                logging.warning(
-                    f"Meshtastic serial port disconnected, disconnecting... {ex}"
-                )
         except OSError as ex:
-            if (
+            if not self._wantExit:  # We might intentionally get an exception during shutdown
-                not self._wantExit
+                logging.error(f"Unexpected OSError, terminating meshtastic reader... {ex}")
-            ):  # We might intentionally get an exception during shutdown
-                logging.error(
-                    f"Unexpected OSError, terminating meshtastic reader... {ex}"
-                )
         except Exception as ex:
-            logging.error(
+            logging.error(f"Unexpected exception, terminating meshtastic reader... {ex}")
-                f"Unexpected exception, terminating meshtastic reader... {ex}"
-            )
         finally:
             logging.debug("reader is exiting")
             self._disconnected()

meshtastic/supported_device.py

@@ -5,224 +5,85 @@
 # Goal is to detect which device and port to use from the supported devices
 # without installing any libraries that are not currently in the python meshtastic library
 
-
+class SupportedDevice():
-class SupportedDevice:
     """Devices supported on Meshtastic"""
 
-    def __init__(
+    def __init__(self, name, version=None, for_firmware=None, device_class="esp32",
-        self,
+                 baseport_on_linux=None, baseport_on_mac=None, baseport_on_windows="COM",
-        name,
+                 usb_vendor_id_in_hex=None, usb_product_id_in_hex=None):
-        version=None,
+        """ constructor """
-        for_firmware=None,
-        device_class="esp32",
-        baseport_on_linux=None,
-        baseport_on_mac=None,
-        baseport_on_windows="COM",
-        usb_vendor_id_in_hex=None,
-        usb_product_id_in_hex=None,
-    ):
-        """constructor"""
         self.name = name
         self.version = version
         self.for_firmware = for_firmware
-        self.device_class = device_class  # could be "nrf52"
+        self.device_class = device_class # could be "nrf52"
 
         # when you run "lsusb -d xxxx:" in linux
-        self.usb_vendor_id_in_hex = usb_vendor_id_in_hex  # store in lower case
+        self.usb_vendor_id_in_hex = usb_vendor_id_in_hex # store in lower case
-        self.usb_product_id_in_hex = usb_product_id_in_hex  # store in lower case
+        self.usb_product_id_in_hex = usb_product_id_in_hex # store in lower case
 
-        self.baseport_on_linux = baseport_on_linux  # ex: ttyUSB or ttyACM
+        self.baseport_on_linux = baseport_on_linux # ex: ttyUSB or ttyACM
         self.baseport_on_mac = baseport_on_mac
         self.baseport_on_windows = baseport_on_windows
 
-
 # supported devices
-tbeam_v0_7 = SupportedDevice(
+tbeam_v0_7 = SupportedDevice(name="T-Beam", version="0.7", for_firmware="tbeam0.7",
-    name="T-Beam",
+                             baseport_on_linux="ttyACM", baseport_on_mac="cu.usbmodem",
-    version="0.7",
+                             usb_vendor_id_in_hex="1a86", usb_product_id_in_hex="55d4")
-    for_firmware="tbeam0.7",
+tbeam_v1_1 = SupportedDevice(name="T-Beam", version="1.1", for_firmware="tbeam",
-    baseport_on_linux="ttyACM",
+                             baseport_on_linux="ttyACM", baseport_on_mac="cu.usbmodem",
-    baseport_on_mac="cu.usbmodem",
+                             usb_vendor_id_in_hex="1a86", usb_product_id_in_hex="55d4")
-    usb_vendor_id_in_hex="1a86",
+tbeam_M8N = SupportedDevice(name="T-Beam", version="M8N", for_firmware="tbeam",
-    usb_product_id_in_hex="55d4",
+                            baseport_on_linux="ttyACM", baseport_on_mac="cu.usbmodem",
-)
+                            usb_vendor_id_in_hex="1a86", usb_product_id_in_hex="55d4")
-tbeam_v1_1 = SupportedDevice(
+tbeam_M8N_SX1262 = SupportedDevice(name="T-Beam", version="M8N_SX1262", for_firmware="tbeam",
-    name="T-Beam",
+                                   baseport_on_linux="ttyACM", baseport_on_mac="cu.usbmodem",
-    version="1.1",
+                                   usb_vendor_id_in_hex="1a86", usb_product_id_in_hex="55d4")
-    for_firmware="tbeam",
+tlora_v1 = SupportedDevice(name="T-Lora", version="1", for_firmware="tlora-v1",
-    baseport_on_linux="ttyACM",
+                             baseport_on_linux="ttyUSB", baseport_on_mac="cu.usbserial",
-    baseport_on_mac="cu.usbmodem",
+                             usb_vendor_id_in_hex="1a86", usb_product_id_in_hex="55d4")
-    usb_vendor_id_in_hex="1a86",
+tlora_v1_3 = SupportedDevice(name="T-Lora", version="1.3", for_firmware="tlora-v1-3",
-    usb_product_id_in_hex="55d4",
+                             baseport_on_linux="ttyUSB", baseport_on_mac="cu.usbserial",
-)
+                             usb_vendor_id_in_hex="10c4", usb_product_id_in_hex="ea60")
-tbeam_M8N = SupportedDevice(
+tlora_v2 = SupportedDevice(name="T-Lora", version="2", for_firmware="tlora-v2",
-    name="T-Beam",
+                             baseport_on_linux="ttyACM", baseport_on_mac="cu.usbmodem",
-    version="M8N",
+                             usb_vendor_id_in_hex="1a86", usb_product_id_in_hex="55d4")
-    for_firmware="tbeam",
+tlora_v2_1 = SupportedDevice(name="T-Lora", version="2.1", for_firmware="tlora-v2-1",
-    baseport_on_linux="ttyACM",
+                             baseport_on_linux="ttyACM", baseport_on_mac="cu.usbmodem",
-    baseport_on_mac="cu.usbmodem",
+                             usb_vendor_id_in_hex="1a86", usb_product_id_in_hex="55d4")
-    usb_vendor_id_in_hex="1a86",
+tlora_v2_1_1_6 = SupportedDevice(name="T-Lora", version="2.1-1.6", for_firmware="tlora-v2-1-1.6",
-    usb_product_id_in_hex="55d4",
+                             baseport_on_linux="ttyACM", baseport_on_mac="cu.usbmodem",
-)
+                             usb_vendor_id_in_hex="1a86", usb_product_id_in_hex="55d4")
-tbeam_M8N_SX1262 = SupportedDevice(
+heltec_v1 = SupportedDevice(name="Heltec", version="1", for_firmware="heltec-v1",
-    name="T-Beam",
+                            baseport_on_linux="ttyUSB", baseport_on_mac="cu.usbserial-",
-    version="M8N_SX1262",
+                            usb_vendor_id_in_hex="10c4", usb_product_id_in_hex="ea60")
-    for_firmware="tbeam",
+heltec_v2_0 = SupportedDevice(name="Heltec", version="2.0", for_firmware="heltec-v2.0",
-    baseport_on_linux="ttyACM",
+                              baseport_on_linux="ttyUSB", baseport_on_mac="cu.usbserial-",
-    baseport_on_mac="cu.usbmodem",
+                              usb_vendor_id_in_hex="10c4", usb_product_id_in_hex="ea60")
-    usb_vendor_id_in_hex="1a86",
+heltec_v2_1 = SupportedDevice(name="Heltec", version="2.1", for_firmware="heltec-v2.1",
-    usb_product_id_in_hex="55d4",
+                              baseport_on_linux="ttyUSB", baseport_on_mac="cu.usbserial-",
-)
+                              usb_vendor_id_in_hex="10c4", usb_product_id_in_hex="ea60")
-tlora_v1 = SupportedDevice(
+rak11200 = SupportedDevice(name="RAK 11200", version="", for_firmware="rak11200",
-    name="T-Lora",
+                              baseport_on_linux="ttyUSB", baseport_on_mac="cu.usbserial-",
-    version="1",
+                              usb_vendor_id_in_hex="1a86", usb_product_id_in_hex="7523")
-    for_firmware="tlora-v1",
+meshtastic_diy_v1 = SupportedDevice(name="Meshtastic DIY", version="1", for_firmware="meshtastic-diy-v1",
-    baseport_on_linux="ttyUSB",
+                              baseport_on_linux="ttyUSB", baseport_on_mac="cu.usbserial-",
-    baseport_on_mac="cu.usbserial",
+                              usb_vendor_id_in_hex="10c4", usb_product_id_in_hex="ea60")
-    usb_vendor_id_in_hex="1a86",
-    usb_product_id_in_hex="55d4",
-)
-tlora_v1_3 = SupportedDevice(
-    name="T-Lora",
-    version="1.3",
-    for_firmware="tlora-v1-3",
-    baseport_on_linux="ttyUSB",
-    baseport_on_mac="cu.usbserial",
-    usb_vendor_id_in_hex="10c4",
-    usb_product_id_in_hex="ea60",
-)
-tlora_v2 = SupportedDevice(
-    name="T-Lora",
-    version="2",
-    for_firmware="tlora-v2",
-    baseport_on_linux="ttyACM",
-    baseport_on_mac="cu.usbmodem",
-    usb_vendor_id_in_hex="1a86",
-    usb_product_id_in_hex="55d4",
-)
-tlora_v2_1_1_6 = SupportedDevice(
-    name="T-Lora",
-    version="2.1-1.6",
-    for_firmware="tlora-v2-1-1.6",
-    baseport_on_linux="ttyACM",
-    baseport_on_mac="cu.usbmodem",
-    usb_vendor_id_in_hex="1a86",
-    usb_product_id_in_hex="55d4",
-)
-heltec_v1 = SupportedDevice(
-    name="Heltec",
-    version="1",
-    for_firmware="heltec-v1",
-    baseport_on_linux="ttyUSB",
-    baseport_on_mac="cu.usbserial-",
-    usb_vendor_id_in_hex="10c4",
-    usb_product_id_in_hex="ea60",
-)
-heltec_v2_0 = SupportedDevice(
-    name="Heltec",
-    version="2.0",
-    for_firmware="heltec-v2.0",
-    baseport_on_linux="ttyUSB",
-    baseport_on_mac="cu.usbserial-",
-    usb_vendor_id_in_hex="10c4",
-    usb_product_id_in_hex="ea60",
-)
-heltec_v2_1 = SupportedDevice(
-    name="Heltec",
-    version="2.1",
-    for_firmware="heltec-v2.1",
-    baseport_on_linux="ttyUSB",
-    baseport_on_mac="cu.usbserial-",
-    usb_vendor_id_in_hex="10c4",
-    usb_product_id_in_hex="ea60",
-)
-rak11200 = SupportedDevice(
-    name="RAK 11200",
-    version="",
-    for_firmware="rak11200",
-    baseport_on_linux="ttyUSB",
-    baseport_on_mac="cu.usbserial-",
-    usb_vendor_id_in_hex="1a86",
-    usb_product_id_in_hex="7523",
-)
-meshtastic_diy_v1 = SupportedDevice(
-    name="Meshtastic DIY",
-    version="1",
-    for_firmware="meshtastic-diy-v1",
-    baseport_on_linux="ttyUSB",
-    baseport_on_mac="cu.usbserial-",
-    usb_vendor_id_in_hex="10c4",
-    usb_product_id_in_hex="ea60",
-)
 # Note: The T-Echo reports product id in boot mode
-techo_1 = SupportedDevice(
+techo_1 = SupportedDevice(name="T-Echo", version="1", for_firmware="t-echo-1", device_class="nrf52",
-    name="T-Echo",
+                              baseport_on_linux="ttyACM", baseport_on_mac="cu.usbmodem",
-    version="1",
+                              usb_vendor_id_in_hex="239a", usb_product_id_in_hex="0029")
-    for_firmware="t-echo-1",
+rak4631_5005 = SupportedDevice(name="RAK 4631 5005", version="", for_firmware="rak4631_5005",
-    device_class="nrf52",
+                               device_class="nrf52",
-    baseport_on_linux="ttyACM",
+                               baseport_on_linux="ttyACM", baseport_on_mac="cu.usbmodem",
-    baseport_on_mac="cu.usbmodem",
+                               usb_vendor_id_in_hex="239a", usb_product_id_in_hex="0029")
-    usb_vendor_id_in_hex="239a",
-    usb_product_id_in_hex="0029",
-)
-rak4631_5005 = SupportedDevice(
-    name="RAK 4631 5005",
-    version="",
-    for_firmware="rak4631_5005",
-    device_class="nrf52",
-    baseport_on_linux="ttyACM",
-    baseport_on_mac="cu.usbmodem",
-    usb_vendor_id_in_hex="239a",
-    usb_product_id_in_hex="0029",
-)
-rak4631_5005_epaper = SupportedDevice(
-    name="RAK 4631 5005 14000 epaper",
-    version="",
-    for_firmware="rak4631_5005_epaper",
-    device_class="nrf52",
-    baseport_on_linux="ttyACM",
-    baseport_on_mac="cu.usbmodem",
-    usb_vendor_id_in_hex="239a",
-    usb_product_id_in_hex="0029",
-)
 # Note: The 19003 reports same product id as 5005 in boot mode
-rak4631_19003 = SupportedDevice(
+rak4631_19003 = SupportedDevice(name="RAK 4631 19003", version="", for_firmware="rak4631_19003",
-    name="RAK 4631 19003",
+                                device_class="nrf52",
-    version="",
+                                baseport_on_linux="ttyACM", baseport_on_mac="cu.usbmodem",
-    for_firmware="rak4631_19003",
+                                usb_vendor_id_in_hex="239a", usb_product_id_in_hex="8029")
-    device_class="nrf52",
-    baseport_on_linux="ttyACM",
-    baseport_on_mac="cu.usbmodem",
-    usb_vendor_id_in_hex="239a",
-    usb_product_id_in_hex="8029",
-)
-nano_g1 = SupportedDevice(
-    name="Nano G1",
-    version="",
-    for_firmware="nano-g1",
-    baseport_on_linux="ttyACM",
-    baseport_on_mac="cu.usbmodem",
-    usb_vendor_id_in_hex="1a86",
-    usb_product_id_in_hex="55d4",
-)
 
-supported_devices = [
+supported_devices = [tbeam_v0_7, tbeam_v1_1, tbeam_M8N, tbeam_M8N_SX1262,
-    tbeam_v0_7,
+                     tlora_v1, tlora_v1_3, tlora_v2, tlora_v2_1, tlora_v2_1_1_6,
-    tbeam_v1_1,
+                     heltec_v1, heltec_v2_0, heltec_v2_1,
-    tbeam_M8N,
+                     meshtastic_diy_v1, techo_1, rak4631_5005, rak4631_19003,
-    tbeam_M8N_SX1262,
+                     rak11200]
-    tlora_v1,
-    tlora_v1_3,
-    tlora_v2,
-    tlora_v2_1_1_6,
-    heltec_v1,
-    heltec_v2_0,
-    heltec_v2_1,
-    meshtastic_diy_v1,
-    techo_1,
-    rak4631_5005,
-    rak4631_5005_epaper,
-    rak4631_19003,
-    rak11200,
-    nano_g1,
-]

meshtastic/tcp_interface.py

@@ -2,22 +2,15 @@
 """
 import logging
 import socket
-from typing import Optional
+from typing import AnyStr
 
 from meshtastic.stream_interface import StreamInterface
 
-
 class TCPInterface(StreamInterface):
     """Interface class for meshtastic devices over a TCP link"""
 
-    def __init__(
+    def __init__(self, hostname: AnyStr, debugOut=None, noProto=False,
-        self,
+                 connectNow=True, portNumber=4403):
-        hostname: str,
-        debugOut=None,
-        noProto=False,
-        connectNow=True,
-        portNumber=4403,
-    ):
         """Constructor, opens a connection to a specified IP address/hostname
 
         Keyword Arguments:
@@ -30,20 +23,19 @@ class TCPInterface(StreamInterface):
         self.portNumber = portNumber
 
         if connectNow:
-            logging.debug(f"Connecting to {hostname}") # type: ignore[str-bytes-safe]
+            logging.debug(f"Connecting to {hostname}")
             server_address = (hostname, portNumber)
             sock = socket.create_connection(server_address)
-            self.socket: Optional[socket.socket] = sock
+            self.socket = sock
         else:
             self.socket = None
 
-        StreamInterface.__init__(
+        StreamInterface.__init__(self, debugOut=debugOut, noProto=noProto,
-            self, debugOut=debugOut, noProto=noProto, connectNow=connectNow
+                                 connectNow=connectNow)
-        )
 
     def _socket_shutdown(self):
         """Shutdown the socket.
-        Note: Broke out this line so the exception could be unit tested.
+           Note: Broke out this line so the exception could be unit tested.
         """
         self.socket.shutdown(socket.SHUT_RDWR)
 

meshtastic/telemetry_pb2.py

@@ -1,36 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: meshtastic/telemetry.proto
-"""Generated protocol buffer code."""
-from google.protobuf.internal import builder as _builder
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import descriptor_pool as _descriptor_pool
-from google.protobuf import symbol_database as _symbol_database
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-
-
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1ameshtastic/telemetry.proto\x12\nmeshtastic\"i\n\rDeviceMetrics\x12\x15\n\rbattery_level\x18\x01 \x01(\r\x12\x0f\n\x07voltage\x18\x02 \x01(\x02\x12\x1b\n\x13\x63hannel_utilization\x18\x03 \x01(\x02\x12\x13\n\x0b\x61ir_util_tx\x18\x04 \x01(\x02\"\x9b\x01\n\x12\x45nvironmentMetrics\x12\x13\n\x0btemperature\x18\x01 \x01(\x02\x12\x19\n\x11relative_humidity\x18\x02 \x01(\x02\x12\x1b\n\x13\x62\x61rometric_pressure\x18\x03 \x01(\x02\x12\x16\n\x0egas_resistance\x18\x04 \x01(\x02\x12\x0f\n\x07voltage\x18\x05 \x01(\x02\x12\x0f\n\x07\x63urrent\x18\x06 \x01(\x02\"\x8c\x01\n\x0cPowerMetrics\x12\x13\n\x0b\x63h1_voltage\x18\x01 \x01(\x02\x12\x13\n\x0b\x63h1_current\x18\x02 \x01(\x02\x12\x13\n\x0b\x63h2_voltage\x18\x03 \x01(\x02\x12\x13\n\x0b\x63h2_current\x18\x04 \x01(\x02\x12\x13\n\x0b\x63h3_voltage\x18\x05 \x01(\x02\x12\x13\n\x0b\x63h3_current\x18\x06 \x01(\x02\"\xbf\x02\n\x11\x41irQualityMetrics\x12\x15\n\rpm10_standard\x18\x01 \x01(\r\x12\x15\n\rpm25_standard\x18\x02 \x01(\r\x12\x16\n\x0epm100_standard\x18\x03 \x01(\r\x12\x1a\n\x12pm10_environmental\x18\x04 \x01(\r\x12\x1a\n\x12pm25_environmental\x18\x05 \x01(\r\x12\x1b\n\x13pm100_environmental\x18\x06 \x01(\r\x12\x16\n\x0eparticles_03um\x18\x07 \x01(\r\x12\x16\n\x0eparticles_05um\x18\x08 \x01(\r\x12\x16\n\x0eparticles_10um\x18\t \x01(\r\x12\x16\n\x0eparticles_25um\x18\n \x01(\r\x12\x16\n\x0eparticles_50um\x18\x0b \x01(\r\x12\x17\n\x0fparticles_100um\x18\x0c \x01(\r\"\x89\x02\n\tTelemetry\x12\x0c\n\x04time\x18\x01 \x01(\x07\x12\x33\n\x0e\x64\x65vice_metrics\x18\x02 \x01(\x0b\x32\x19.meshtastic.DeviceMetricsH\x00\x12=\n\x13\x65nvironment_metrics\x18\x03 \x01(\x0b\x32\x1e.meshtastic.EnvironmentMetricsH\x00\x12<\n\x13\x61ir_quality_metrics\x18\x04 \x01(\x0b\x32\x1d.meshtastic.AirQualityMetricsH\x00\x12\x31\n\rpower_metrics\x18\x05 \x01(\x0b\x32\x18.meshtastic.PowerMetricsH\x00\x42\t\n\x07variant*\xe0\x01\n\x13TelemetrySensorType\x12\x10\n\x0cSENSOR_UNSET\x10\x00\x12\n\n\x06\x42ME280\x10\x01\x12\n\n\x06\x42ME680\x10\x02\x12\x0b\n\x07MCP9808\x10\x03\x12\n\n\x06INA260\x10\x04\x12\n\n\x06INA219\x10\x05\x12\n\n\x06\x42MP280\x10\x06\x12\t\n\x05SHTC3\x10\x07\x12\t\n\x05LPS22\x10\x08\x12\x0b\n\x07QMC6310\x10\t\x12\x0b\n\x07QMI8658\x10\n\x12\x0c\n\x08QMC5883L\x10\x0b\x12\t\n\x05SHT31\x10\x0c\x12\x0c\n\x08PMSA003I\x10\r\x12\x0b\n\x07INA3221\x10\x0e\x12\n\n\x06\x42MP085\x10\x0f\x42\x64\n\x13\x63om.geeksville.meshB\x0fTelemetryProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
-
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.telemetry_pb2', globals())
-if _descriptor._USE_C_DESCRIPTORS == False:
-
-  DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\017TelemetryProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
-  _TELEMETRYSENSORTYPE._serialized_start=1041
-  _TELEMETRYSENSORTYPE._serialized_end=1265
-  _DEVICEMETRICS._serialized_start=42
-  _DEVICEMETRICS._serialized_end=147
-  _ENVIRONMENTMETRICS._serialized_start=150
-  _ENVIRONMENTMETRICS._serialized_end=305
-  _POWERMETRICS._serialized_start=308
-  _POWERMETRICS._serialized_end=448
-  _AIRQUALITYMETRICS._serialized_start=451
-  _AIRQUALITYMETRICS._serialized_end=770
-  _TELEMETRY._serialized_start=773
-  _TELEMETRY._serialized_end=1038
-# @@protoc_insertion_point(module_scope)

meshtastic/telemetry_pb2.pyi

@@ -1,443 +0,0 @@
-"""
-@generated by mypy-protobuf.  Do not edit manually!
-isort:skip_file
-"""
-import builtins
-import google.protobuf.descriptor
-import google.protobuf.internal.enum_type_wrapper
-import google.protobuf.message
-import sys
-import typing
-
-if sys.version_info >= (3, 10):
-    import typing as typing_extensions
-else:
-    import typing_extensions
-
-DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
-
-class _TelemetrySensorType:
-    ValueType = typing.NewType("ValueType", builtins.int)
-    V: typing_extensions.TypeAlias = ValueType
-
-class _TelemetrySensorTypeEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[_TelemetrySensorType.ValueType], builtins.type):
-    DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
-    SENSOR_UNSET: _TelemetrySensorType.ValueType  # 0
-    """
-    No external telemetry sensor explicitly set
-    """
-    BME280: _TelemetrySensorType.ValueType  # 1
-    """
-    High accuracy temperature, pressure, humidity
-    """
-    BME680: _TelemetrySensorType.ValueType  # 2
-    """
-    High accuracy temperature, pressure, humidity, and air resistance
-    """
-    MCP9808: _TelemetrySensorType.ValueType  # 3
-    """
-    Very high accuracy temperature
-    """
-    INA260: _TelemetrySensorType.ValueType  # 4
-    """
-    Moderate accuracy current and voltage
-    """
-    INA219: _TelemetrySensorType.ValueType  # 5
-    """
-    Moderate accuracy current and voltage
-    """
-    BMP280: _TelemetrySensorType.ValueType  # 6
-    """
-    High accuracy temperature and pressure
-    """
-    SHTC3: _TelemetrySensorType.ValueType  # 7
-    """
-    High accuracy temperature and humidity
-    """
-    LPS22: _TelemetrySensorType.ValueType  # 8
-    """
-    High accuracy pressure
-    """
-    QMC6310: _TelemetrySensorType.ValueType  # 9
-    """
-    3-Axis magnetic sensor
-    """
-    QMI8658: _TelemetrySensorType.ValueType  # 10
-    """
-    6-Axis inertial measurement sensor
-    """
-    QMC5883L: _TelemetrySensorType.ValueType  # 11
-    """
-    3-Axis magnetic sensor
-    """
-    SHT31: _TelemetrySensorType.ValueType  # 12
-    """
-    High accuracy temperature and humidity
-    """
-    PMSA003I: _TelemetrySensorType.ValueType  # 13
-    """
-    PM2.5 air quality sensor
-    """
-    INA3221: _TelemetrySensorType.ValueType  # 14
-    """
-    INA3221 3 Channel Voltage / Current Sensor
-    """
-    BMP085: _TelemetrySensorType.ValueType  # 15
-    """
-    BMP085/BMP180 High accuracy temperature and pressure (older Version of BMP280)
-    """
-
-class TelemetrySensorType(_TelemetrySensorType, metaclass=_TelemetrySensorTypeEnumTypeWrapper):
-    """
-    Supported I2C Sensors for telemetry in Meshtastic
-    """
-
-SENSOR_UNSET: TelemetrySensorType.ValueType  # 0
-"""
-No external telemetry sensor explicitly set
-"""
-BME280: TelemetrySensorType.ValueType  # 1
-"""
-High accuracy temperature, pressure, humidity
-"""
-BME680: TelemetrySensorType.ValueType  # 2
-"""
-High accuracy temperature, pressure, humidity, and air resistance
-"""
-MCP9808: TelemetrySensorType.ValueType  # 3
-"""
-Very high accuracy temperature
-"""
-INA260: TelemetrySensorType.ValueType  # 4
-"""
-Moderate accuracy current and voltage
-"""
-INA219: TelemetrySensorType.ValueType  # 5
-"""
-Moderate accuracy current and voltage
-"""
-BMP280: TelemetrySensorType.ValueType  # 6
-"""
-High accuracy temperature and pressure
-"""
-SHTC3: TelemetrySensorType.ValueType  # 7
-"""
-High accuracy temperature and humidity
-"""
-LPS22: TelemetrySensorType.ValueType  # 8
-"""
-High accuracy pressure
-"""
-QMC6310: TelemetrySensorType.ValueType  # 9
-"""
-3-Axis magnetic sensor
-"""
-QMI8658: TelemetrySensorType.ValueType  # 10
-"""
-6-Axis inertial measurement sensor
-"""
-QMC5883L: TelemetrySensorType.ValueType  # 11
-"""
-3-Axis magnetic sensor
-"""
-SHT31: TelemetrySensorType.ValueType  # 12
-"""
-High accuracy temperature and humidity
-"""
-PMSA003I: TelemetrySensorType.ValueType  # 13
-"""
-PM2.5 air quality sensor
-"""
-INA3221: TelemetrySensorType.ValueType  # 14
-"""
-INA3221 3 Channel Voltage / Current Sensor
-"""
-BMP085: TelemetrySensorType.ValueType  # 15
-"""
-BMP085/BMP180 High accuracy temperature and pressure (older Version of BMP280)
-"""
-global___TelemetrySensorType = TelemetrySensorType
-
-@typing_extensions.final
-class DeviceMetrics(google.protobuf.message.Message):
-    """
-    Key native device metrics such as battery level
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    BATTERY_LEVEL_FIELD_NUMBER: builtins.int
-    VOLTAGE_FIELD_NUMBER: builtins.int
-    CHANNEL_UTILIZATION_FIELD_NUMBER: builtins.int
-    AIR_UTIL_TX_FIELD_NUMBER: builtins.int
-    battery_level: builtins.int
-    """
-    0-100 (>100 means powered)
-    """
-    voltage: builtins.float
-    """
-    Voltage measured
-    """
-    channel_utilization: builtins.float
-    """
-    Utilization for the current channel, including well formed TX, RX and malformed RX (aka noise).
-    """
-    air_util_tx: builtins.float
-    """
-    Percent of airtime for transmission used within the last hour.
-    """
-    def __init__(
-        self,
-        *,
-        battery_level: builtins.int = ...,
-        voltage: builtins.float = ...,
-        channel_utilization: builtins.float = ...,
-        air_util_tx: builtins.float = ...,
-    ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["air_util_tx", b"air_util_tx", "battery_level", b"battery_level", "channel_utilization", b"channel_utilization", "voltage", b"voltage"]) -> None: ...
-
-global___DeviceMetrics = DeviceMetrics
-
-@typing_extensions.final
-class EnvironmentMetrics(google.protobuf.message.Message):
-    """
-    Weather station or other environmental metrics
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    TEMPERATURE_FIELD_NUMBER: builtins.int
-    RELATIVE_HUMIDITY_FIELD_NUMBER: builtins.int
-    BAROMETRIC_PRESSURE_FIELD_NUMBER: builtins.int
-    GAS_RESISTANCE_FIELD_NUMBER: builtins.int
-    VOLTAGE_FIELD_NUMBER: builtins.int
-    CURRENT_FIELD_NUMBER: builtins.int
-    temperature: builtins.float
-    """
-    Temperature measured
-    """
-    relative_humidity: builtins.float
-    """
-    Relative humidity percent measured
-    """
-    barometric_pressure: builtins.float
-    """
-    Barometric pressure in hPA measured
-    """
-    gas_resistance: builtins.float
-    """
-    Gas resistance in MOhm measured
-    """
-    voltage: builtins.float
-    """
-    Voltage measured (To be depreciated in favor of PowerMetrics in Meshtastic 3.x)
-    """
-    current: builtins.float
-    """
-    Current measured (To be depreciated in favor of PowerMetrics in Meshtastic 3.x)
-    """
-    def __init__(
-        self,
-        *,
-        temperature: builtins.float = ...,
-        relative_humidity: builtins.float = ...,
-        barometric_pressure: builtins.float = ...,
-        gas_resistance: builtins.float = ...,
-        voltage: builtins.float = ...,
-        current: builtins.float = ...,
-    ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["barometric_pressure", b"barometric_pressure", "current", b"current", "gas_resistance", b"gas_resistance", "relative_humidity", b"relative_humidity", "temperature", b"temperature", "voltage", b"voltage"]) -> None: ...
-
-global___EnvironmentMetrics = EnvironmentMetrics
-
-@typing_extensions.final
-class PowerMetrics(google.protobuf.message.Message):
-    """
-    Power Metrics (voltage / current / etc)
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    CH1_VOLTAGE_FIELD_NUMBER: builtins.int
-    CH1_CURRENT_FIELD_NUMBER: builtins.int
-    CH2_VOLTAGE_FIELD_NUMBER: builtins.int
-    CH2_CURRENT_FIELD_NUMBER: builtins.int
-    CH3_VOLTAGE_FIELD_NUMBER: builtins.int
-    CH3_CURRENT_FIELD_NUMBER: builtins.int
-    ch1_voltage: builtins.float
-    """
-    Voltage (Ch1)
-    """
-    ch1_current: builtins.float
-    """
-    Current (Ch1)
-    """
-    ch2_voltage: builtins.float
-    """
-    Voltage (Ch2)
-    """
-    ch2_current: builtins.float
-    """
-    Current (Ch2)
-    """
-    ch3_voltage: builtins.float
-    """
-    Voltage (Ch3)
-    """
-    ch3_current: builtins.float
-    """
-    Current (Ch3)
-    """
-    def __init__(
-        self,
-        *,
-        ch1_voltage: builtins.float = ...,
-        ch1_current: builtins.float = ...,
-        ch2_voltage: builtins.float = ...,
-        ch2_current: builtins.float = ...,
-        ch3_voltage: builtins.float = ...,
-        ch3_current: builtins.float = ...,
-    ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["ch1_current", b"ch1_current", "ch1_voltage", b"ch1_voltage", "ch2_current", b"ch2_current", "ch2_voltage", b"ch2_voltage", "ch3_current", b"ch3_current", "ch3_voltage", b"ch3_voltage"]) -> None: ...
-
-global___PowerMetrics = PowerMetrics
-
-@typing_extensions.final
-class AirQualityMetrics(google.protobuf.message.Message):
-    """
-    Air quality metrics
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    PM10_STANDARD_FIELD_NUMBER: builtins.int
-    PM25_STANDARD_FIELD_NUMBER: builtins.int
-    PM100_STANDARD_FIELD_NUMBER: builtins.int
-    PM10_ENVIRONMENTAL_FIELD_NUMBER: builtins.int
-    PM25_ENVIRONMENTAL_FIELD_NUMBER: builtins.int
-    PM100_ENVIRONMENTAL_FIELD_NUMBER: builtins.int
-    PARTICLES_03UM_FIELD_NUMBER: builtins.int
-    PARTICLES_05UM_FIELD_NUMBER: builtins.int
-    PARTICLES_10UM_FIELD_NUMBER: builtins.int
-    PARTICLES_25UM_FIELD_NUMBER: builtins.int
-    PARTICLES_50UM_FIELD_NUMBER: builtins.int
-    PARTICLES_100UM_FIELD_NUMBER: builtins.int
-    pm10_standard: builtins.int
-    """
-    Concentration Units Standard PM1.0
-    """
-    pm25_standard: builtins.int
-    """
-    Concentration Units Standard PM2.5
-    """
-    pm100_standard: builtins.int
-    """
-    Concentration Units Standard PM10.0
-    """
-    pm10_environmental: builtins.int
-    """
-    Concentration Units Environmental PM1.0
-    """
-    pm25_environmental: builtins.int
-    """
-    Concentration Units Environmental PM2.5
-    """
-    pm100_environmental: builtins.int
-    """
-    Concentration Units Environmental PM10.0
-    """
-    particles_03um: builtins.int
-    """
-    0.3um Particle Count
-    """
-    particles_05um: builtins.int
-    """
-    0.5um Particle Count
-    """
-    particles_10um: builtins.int
-    """
-    1.0um Particle Count
-    """
-    particles_25um: builtins.int
-    """
-    2.5um Particle Count
-    """
-    particles_50um: builtins.int
-    """
-    5.0um Particle Count
-    """
-    particles_100um: builtins.int
-    """
-    10.0um Particle Count
-    """
-    def __init__(
-        self,
-        *,
-        pm10_standard: builtins.int = ...,
-        pm25_standard: builtins.int = ...,
-        pm100_standard: builtins.int = ...,
-        pm10_environmental: builtins.int = ...,
-        pm25_environmental: builtins.int = ...,
-        pm100_environmental: builtins.int = ...,
-        particles_03um: builtins.int = ...,
-        particles_05um: builtins.int = ...,
-        particles_10um: builtins.int = ...,
-        particles_25um: builtins.int = ...,
-        particles_50um: builtins.int = ...,
-        particles_100um: builtins.int = ...,
-    ) -> None: ...
-    def ClearField(self, field_name: typing_extensions.Literal["particles_03um", b"particles_03um", "particles_05um", b"particles_05um", "particles_100um", b"particles_100um", "particles_10um", b"particles_10um", "particles_25um", b"particles_25um", "particles_50um", b"particles_50um", "pm100_environmental", b"pm100_environmental", "pm100_standard", b"pm100_standard", "pm10_environmental", b"pm10_environmental", "pm10_standard", b"pm10_standard", "pm25_environmental", b"pm25_environmental", "pm25_standard", b"pm25_standard"]) -> None: ...
-
-global___AirQualityMetrics = AirQualityMetrics
-
-@typing_extensions.final
-class Telemetry(google.protobuf.message.Message):
-    """
-    Types of Measurements the telemetry module is equipped to handle
-    """
-
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    TIME_FIELD_NUMBER: builtins.int
-    DEVICE_METRICS_FIELD_NUMBER: builtins.int
-    ENVIRONMENT_METRICS_FIELD_NUMBER: builtins.int
-    AIR_QUALITY_METRICS_FIELD_NUMBER: builtins.int
-    POWER_METRICS_FIELD_NUMBER: builtins.int
-    time: builtins.int
-    """
-    Seconds since 1970 - or 0 for unknown/unset
-    """
-    @property
-    def device_metrics(self) -> global___DeviceMetrics:
-        """
-        Key native device metrics such as battery level
-        """
-    @property
-    def environment_metrics(self) -> global___EnvironmentMetrics:
-        """
-        Weather station or other environmental metrics
-        """
-    @property
-    def air_quality_metrics(self) -> global___AirQualityMetrics:
-        """
-        Air quality metrics
-        """
-    @property
-    def power_metrics(self) -> global___PowerMetrics:
-        """
-        Power Metrics
-        """
-    def __init__(
-        self,
-        *,
-        time: builtins.int = ...,
-        device_metrics: global___DeviceMetrics | None = ...,
-        environment_metrics: global___EnvironmentMetrics | None = ...,
-        air_quality_metrics: global___AirQualityMetrics | None = ...,
-        power_metrics: global___PowerMetrics | None = ...,
-    ) -> None: ...
-    def HasField(self, field_name: typing_extensions.Literal["air_quality_metrics", b"air_quality_metrics", "device_metrics", b"device_metrics", "environment_metrics", b"environment_metrics", "power_metrics", b"power_metrics", "variant", b"variant"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["air_quality_metrics", b"air_quality_metrics", "device_metrics", b"device_metrics", "environment_metrics", b"environment_metrics", "power_metrics", b"power_metrics", "time", b"time", "variant", b"variant"]) -> None: ...
-    def WhichOneof(self, oneof_group: typing_extensions.Literal["variant", b"variant"]) -> typing_extensions.Literal["device_metrics", "environment_metrics", "air_quality_metrics", "power_metrics"] | None: ...
-
-global___Telemetry = Telemetry

meshtastic/test.py

@@ -2,18 +2,17 @@
    messages and report back if successful.
 """
 import logging
-import sys
 import time
+import sys
 import traceback
-
+from dotmap import DotMap
-from dotmap import DotMap # type: ignore[import-untyped]
+from pubsub import pub
-from pubsub import pub # type: ignore[import-untyped]
-
 import meshtastic.util
-from meshtastic import BROADCAST_NUM
+from meshtastic.__init__ import BROADCAST_NUM
 from meshtastic.serial_interface import SerialInterface
 from meshtastic.tcp_interface import TCPInterface
 
+
 """The interfaces we are using for our tests"""
 interfaces = None
 
@@ -53,9 +52,7 @@ def subscribe():
     pub.subscribe(onNode, "meshtastic.node")
 
 
-def testSend(
+def testSend(fromInterface, toInterface, isBroadcast=False, asBinary=False, wantAck=False):
-    fromInterface, toInterface, isBroadcast=False, asBinary=False, wantAck=False
-):
     """
     Sends one test packet between two nodes and then returns success or failure
 
@@ -76,19 +73,19 @@ def testSend(
     else:
         toNode = toInterface.myInfo.my_node_num
 
-    logging.debug(f"Sending test wantAck={wantAck} packet from {fromNode} to {toNode}")
+    logging.debug(
+        f"Sending test wantAck={wantAck} packet from {fromNode} to {toNode}")
     # pylint: disable=W0603
     global sendingInterface
     sendingInterface = fromInterface
     if not asBinary:
         fromInterface.sendText(f"Test {testNumber}", toNode, wantAck=wantAck)
     else:
-        fromInterface.sendData(
+        fromInterface.sendData((f"Binary {testNumber}").encode(
-            (f"Binary {testNumber}").encode("utf-8"), toNode, wantAck=wantAck
+            "utf-8"), toNode, wantAck=wantAck)
-        )
     for _ in range(60):  # max of 60 secs before we timeout
         time.sleep(1)
-        if len(receivedPackets) >= 1:
+        if  len(receivedPackets) >= 1:
             return True
     return False  # Failed to send
 
@@ -105,18 +102,15 @@ def runTests(numTests=50, wantAck=False, maxFailures=0):
         isBroadcast = True
         # asBinary=(i % 2 == 0)
         success = testSend(
-            interfaces[0], interfaces[1], isBroadcast, asBinary=False, wantAck=wantAck
+            interfaces[0], interfaces[1], isBroadcast, asBinary=False, wantAck=wantAck)
-        )
         if not success:
             numFail = numFail + 1
             logging.error(
-                f"Test {testNumber} failed, expected packet not received ({numFail} failures so far)"
+                f"Test {testNumber} failed, expected packet not received ({numFail} failures so far)")
-            )
         else:
             numSuccess = numSuccess + 1
             logging.info(
-                f"Test {testNumber} succeeded {numSuccess} successes {numFail} failures so far"
+                f"Test {testNumber} succeeded {numSuccess} successes {numFail} failures so far")
-            )
 
         time.sleep(1)
 
@@ -146,7 +140,7 @@ def openDebugLog(portName):
     """Open the debug log file"""
     debugname = "log" + portName.replace("/", "_")
     logging.info(f"Writing serial debugging to {debugname}")
-    return open(debugname, "w+", buffering=1, encoding="utf8")
+    return open(debugname, 'w+', buffering=1, encoding='utf8')
 
 
 def testAll(numTests=5):
@@ -157,22 +151,14 @@ def testAll(numTests=5):
     """
     ports = meshtastic.util.findPorts(True)
     if len(ports) < 2:
-        meshtastic.util.our_exit(
+        meshtastic.util.our_exit("Warning: Must have at least two devices connected to USB.")
-            "Warning: Must have at least two devices connected to USB."
-        )
 
     pub.subscribe(onConnection, "meshtastic.connection")
     pub.subscribe(onReceive, "meshtastic.receive")
     # pylint: disable=W0603
     global interfaces
-    interfaces = list(
+    interfaces = list(map(lambda port: SerialInterface(
-        map(
+        port, debugOut=openDebugLog(port), connectNow=True), ports))
-            lambda port: SerialInterface(
-                port, debugOut=openDebugLog(port), connectNow=True
-            ),
-            ports,
-        )
-    )
 
     logging.info("Ports opened, starting test")
     result = testThread(numTests)

meshtastic/tests/conftest.py

@@ -1,12 +1,11 @@
 """Common pytest code (place for fixtures)."""
 
 import argparse
-from unittest.mock import MagicMock
 
+from unittest.mock import MagicMock
 import pytest
 
 from meshtastic.__main__ import Globals
-
 from ..mesh_interface import MeshInterface
 
 
@@ -14,7 +13,7 @@ from ..mesh_interface import MeshInterface
 def reset_globals():
     """Fixture to reset globals."""
     parser = None
-    parser = argparse.ArgumentParser(add_help=False)
+    parser = argparse.ArgumentParser()
     Globals.getInstance().reset()
     Globals.getInstance().set_parser(parser)
 
@@ -23,34 +22,36 @@ def reset_globals():
 def iface_with_nodes():
     """Fixture to setup some nodes."""
     nodesById = {
-        "!9388f81c": {
+            '!9388f81c': {
-            "num": 2475227164,
+                'num': 2475227164,
-            "user": {
+                'user': {
-                "id": "!9388f81c",
+                    'id': '!9388f81c',
-                "longName": "Unknown f81c",
+                    'longName': 'Unknown f81c',
-                "shortName": "?1C",
+                    'shortName': '?1C',
-                "macaddr": "RBeTiPgc",
+                    'macaddr': 'RBeTiPgc',
-                "hwModel": "TBEAM",
+                    'hwModel': 'TBEAM'
-            },
+                    },
-            "position": {},
+                'position': {},
-            "lastHeard": 1640204888,
+                'lastHeard': 1640204888
-        }
+                }
-    }
+            }
 
     nodesByNum = {
-        2475227164: {
+            2475227164: {
-            "num": 2475227164,
+                'num': 2475227164,
-            "user": {
+                'user': {
-                "id": "!9388f81c",
+                    'id': '!9388f81c',
-                "longName": "Unknown f81c",
+                    'longName': 'Unknown f81c',
-                "shortName": "?1C",
+                    'shortName': '?1C',
-                "macaddr": "RBeTiPgc",
+                    'macaddr': 'RBeTiPgc',
-                "hwModel": "TBEAM",
+                    'hwModel': 'TBEAM'
-            },
+                    },
-            "position": {"time": 1640206266},
+                'position': {
-            "lastHeard": 1640206266,
+                    'time': 1640206266
-        }
+                    },
-    }
+                'lastHeard': 1640206266
+                }
+            }
     iface = MeshInterface(noProto=True)
     iface.nodes = nodesById
     iface.nodesByNum = nodesByNum

meshtastic/tests/test_ble_interface.py

@@ -0,0 +1,15 @@
+"""Meshtastic unit tests for ble_interface.py"""
+
+
+from unittest.mock import patch
+import pytest
+
+from ..ble_interface import BLEInterface
+
+@pytest.mark.unit
+@patch('platform.system', return_value='Linux')
+def test_BLEInterface(mock_platform):
+    """Test that we can instantiate a BLEInterface"""
+    iface = BLEInterface('foo', debugOut=True, noProto=True)
+    iface.close()
+    mock_platform.assert_called()

meshtastic/tests/test_examples.py

@@ -6,24 +6,19 @@ import subprocess
 
 import pytest
 
-
 @pytest.mark.examples
 def test_examples_hello_world_serial_no_arg():
     """Test hello_world_serial without any args"""
-    return_value, _ = subprocess.getstatusoutput(
+    return_value, _ = subprocess.getstatusoutput('source venv/bin/activate; python3 examples/hello_world_serial.py')
-        "source venv/bin/activate; python3 examples/hello_world_serial.py"
-    )
     assert return_value == 3
 
 
 @pytest.mark.examples
 def test_examples_hello_world_serial_with_arg(capsys):
     """Test hello_world_serial with arg"""
-    return_value, _ = subprocess.getstatusoutput(
+    return_value, _ = subprocess.getstatusoutput('source venv/bin/activate; python3 examples/hello_world_serial.py hello')
-        "source venv/bin/activate; python3 examples/hello_world_serial.py hello"
-    )
     assert return_value == 1
     _, err = capsys.readouterr()
-    assert err == ""
+    assert err == ''
     # TODO: Why does this not work?
     # assert out == 'Warning: No Meshtastic devices detected.'

meshtastic/tests/test_init.py

@@ -1,15 +1,14 @@
 """Meshtastic unit tests for __init__.py"""
 
-import logging
 import re
-from unittest.mock import MagicMock
+import logging
 
+from unittest.mock import MagicMock
 import pytest
 
-from meshtastic import _onNodeInfoReceive, _onPositionReceive, _onTextReceive
+from meshtastic.__init__ import _onTextReceive, _onPositionReceive, _onNodeInfoReceive
-
-from ..globals import Globals
 from ..serial_interface import SerialInterface
+from ..globals import Globals
 
 
 @pytest.mark.unit
@@ -21,8 +20,8 @@ def test_init_onTextReceive_with_exception(caplog):
     packet = {}
     with caplog.at_level(logging.DEBUG):
         _onTextReceive(iface, packet)
-    assert re.search(r"in _onTextReceive", caplog.text, re.MULTILINE)
+    assert re.search(r'in _onTextReceive', caplog.text, re.MULTILINE)
-    assert re.search(r"Malformatted", caplog.text, re.MULTILINE)
+    assert re.search(r'Malformatted', caplog.text, re.MULTILINE)
 
 
 @pytest.mark.unit
@@ -31,10 +30,15 @@ def test_init_onPositionReceive(caplog):
     args = MagicMock()
     Globals.getInstance().set_args(args)
     iface = MagicMock(autospec=SerialInterface)
-    packet = {"from": "foo", "decoded": {"position": {}}}
+    packet = {
+            'from': 'foo',
+            'decoded': {
+                'position': {}
+                }
+            }
     with caplog.at_level(logging.DEBUG):
         _onPositionReceive(iface, packet)
-    assert re.search(r"in _onPositionReceive", caplog.text, re.MULTILINE)
+    assert re.search(r'in _onPositionReceive', caplog.text, re.MULTILINE)
 
 
 @pytest.mark.unit
@@ -45,13 +49,13 @@ def test_init_onNodeInfoReceive(caplog, iface_with_nodes):
     iface = iface_with_nodes
     iface.myInfo.my_node_num = 2475227164
     packet = {
-        "from": "foo",
+            'from': 'foo',
-        "decoded": {
+            'decoded': {
-            "user": {
+                'user': {
-                "id": "bar",
+                    'id': 'bar',
-            },
+                    },
-        },
+                }
-    }
+            }
     with caplog.at_level(logging.DEBUG):
         _onNodeInfoReceive(iface, packet)
-    assert re.search(r"in _onNodeInfoReceive", caplog.text, re.MULTILINE)
+    assert re.search(r'in _onNodeInfoReceive', caplog.text, re.MULTILINE)

meshtastic/tests/test_int.py

@@ -8,39 +8,39 @@ import pytest
 @pytest.mark.int
 def test_int_meshtastic_no_args():
     """Test meshtastic without any args"""
-    return_value, out = subprocess.getstatusoutput("meshtastic")
+    return_value, out = subprocess.getstatusoutput('meshtastic')
-    assert re.match(r"usage: meshtastic", out)
+    assert re.match(r'usage: meshtastic', out)
     assert return_value == 1
 
 
 @pytest.mark.int
 def test_int_mesh_tunnel_no_args():
     """Test mesh-tunnel without any args"""
-    return_value, out = subprocess.getstatusoutput("mesh-tunnel")
+    return_value, out = subprocess.getstatusoutput('mesh-tunnel')
-    assert re.match(r"usage: mesh-tunnel", out)
+    assert re.match(r'usage: mesh-tunnel', out)
     assert return_value == 1
 
 
 @pytest.mark.int
 def test_int_version():
     """Test '--version'."""
-    return_value, out = subprocess.getstatusoutput("meshtastic --version")
+    return_value, out = subprocess.getstatusoutput('meshtastic --version')
-    assert re.match(r"[0-9]+\.[0-9]+\.[0-9]", out)
+    assert re.match(r'[0-9]+\.[0-9]+\.[0-9]', out)
     assert return_value == 0
 
 
 @pytest.mark.int
 def test_int_help():
     """Test '--help'."""
-    return_value, out = subprocess.getstatusoutput("meshtastic --help")
+    return_value, out = subprocess.getstatusoutput('meshtastic --help')
-    assert re.match(r"usage: meshtastic ", out)
+    assert re.match(r'usage: meshtastic ', out)
     assert return_value == 0
 
 
 @pytest.mark.int
 def test_int_support():
     """Test '--support'."""
-    return_value, out = subprocess.getstatusoutput("meshtastic --support")
+    return_value, out = subprocess.getstatusoutput('meshtastic --support')
-    assert re.search(r"System", out)
+    assert re.search(r'System', out)
-    assert re.search(r"Python", out)
+    assert re.search(r'Python', out)
     assert return_value == 0

meshtastic/tests/test_mesh_interface.py

@@ -1,17 +1,16 @@
 """Meshtastic unit tests for mesh_interface.py"""
 
-import logging
 import re
-from unittest.mock import MagicMock, patch
+import logging
 
+from unittest.mock import patch, MagicMock
 import pytest
 
-from .. import mesh_pb2, BROADCAST_ADDR, LOCAL_ADDR
 from ..mesh_interface import MeshInterface
 from ..node import Node
-
+from .. import mesh_pb2
-# TODO
+from ..__init__ import LOCAL_ADDR, BROADCAST_ADDR
-# from ..config import Config
+from ..radioconfig_pb2 import RadioConfig
 from ..util import Timeout
 
 
@@ -20,23 +19,24 @@ from ..util import Timeout
 def test_MeshInterface(capsys):
     """Test that we can instantiate a MeshInterface"""
     iface = MeshInterface(noProto=True)
+    anode = Node('foo', 'bar')
 
     nodes = {
-        "!9388f81c": {
+        '!9388f81c': {
-            "num": 2475227164,
+            'num': 2475227164,
-            "user": {
+            'user': {
-                "id": "!9388f81c",
+                'id': '!9388f81c',
-                "longName": "Unknown f81c",
+                'longName': 'Unknown f81c',
-                "shortName": "?1C",
+                'shortName': '?1C',
-                "macaddr": "RBeTiPgc",
+                'macaddr': 'RBeTiPgc',
-                "hwModel": "TBEAM",
+                'hwModel': 'TBEAM'
             },
-            "position": {},
+            'position': {},
-            "lastHeard": 1640204888,
+            'lastHeard': 1640204888
         }
     }
 
-    iface.nodesByNum = {2475227164: nodes["!9388f81c"]}
+    iface.nodesByNum = {1: anode }
     iface.nodes = nodes
 
     myInfo = MagicMock()
@@ -45,15 +45,15 @@ def test_MeshInterface(capsys):
     iface.showInfo()
     iface.localNode.showInfo()
     iface.showNodes()
-    iface.sendText("hello")
+    iface.sendText('hello')
     iface.close()
     out, err = capsys.readouterr()
-    assert re.search(r"Owner: None \(None\)", out, re.MULTILINE)
+    assert re.search(r'Owner: None \(None\)', out, re.MULTILINE)
-    assert re.search(r"Nodes", out, re.MULTILINE)
+    assert re.search(r'Nodes', out, re.MULTILINE)
-    assert re.search(r"Preferences", out, re.MULTILINE)
+    assert re.search(r'Preferences', out, re.MULTILINE)
-    assert re.search(r"Channels", out, re.MULTILINE)
+    assert re.search(r'Channels', out, re.MULTILINE)
-    assert re.search(r"Primary channel URL", out, re.MULTILINE)
+    assert re.search(r'Primary channel URL', out, re.MULTILINE)
-    assert err == ""
+    assert err == ''
 
 
 @pytest.mark.unit
@@ -64,7 +64,7 @@ def test_getMyUser(iface_with_nodes):
     iface.myInfo.my_node_num = 2475227164
     myuser = iface.getMyUser()
     assert myuser is not None
-    assert myuser["id"] == "!9388f81c"
+    assert myuser["id"] == '!9388f81c'
 
 
 @pytest.mark.unit
@@ -74,7 +74,7 @@ def test_getLongName(iface_with_nodes):
     iface = iface_with_nodes
     iface.myInfo.my_node_num = 2475227164
     mylongname = iface.getLongName()
-    assert mylongname == "Unknown f81c"
+    assert mylongname == 'Unknown f81c'
 
 
 @pytest.mark.unit
@@ -84,7 +84,7 @@ def test_getShortName(iface_with_nodes):
     iface = iface_with_nodes
     iface.myInfo.my_node_num = 2475227164
     myshortname = iface.getShortName()
-    assert myshortname == "?1C"
+    assert myshortname == '?1C'
 
 
 @pytest.mark.unit
@@ -95,24 +95,24 @@ def test_handlePacketFromRadio_no_from(capsys):
     meshPacket = mesh_pb2.MeshPacket()
     iface._handlePacketFromRadio(meshPacket)
     out, err = capsys.readouterr()
-    assert re.search(r"Device returned a packet we sent, ignoring", out, re.MULTILINE)
+    assert re.search(r'Device returned a packet we sent, ignoring', out, re.MULTILINE)
-    assert err == ""
+    assert err == ''
 
 
 @pytest.mark.unit
 @pytest.mark.usefixtures("reset_globals")
 def test_handlePacketFromRadio_with_a_portnum(caplog):
     """Test _handlePacketFromRadio with a portnum
-    Since we have an attribute called 'from', we cannot simply 'set' it.
+       Since we have an attribute called 'from', we cannot simply 'set' it.
-    Had to implement a hack just to be able to test some code.
+       Had to implement a hack just to be able to test some code.
     """
     iface = MeshInterface(noProto=True)
     meshPacket = mesh_pb2.MeshPacket()
-    meshPacket.decoded.payload = b""
+    meshPacket.decoded.payload = b''
     meshPacket.decoded.portnum = 1
     with caplog.at_level(logging.WARNING):
         iface._handlePacketFromRadio(meshPacket, hack=True)
-    assert re.search(r"Not populating fromId", caplog.text, re.MULTILINE)
+    assert re.search(r'Not populating fromId', caplog.text, re.MULTILINE)
 
 
 @pytest.mark.unit
@@ -121,10 +121,10 @@ def test_handlePacketFromRadio_no_portnum(caplog):
     """Test _handlePacketFromRadio without a portnum"""
     iface = MeshInterface(noProto=True)
     meshPacket = mesh_pb2.MeshPacket()
-    meshPacket.decoded.payload = b""
+    meshPacket.decoded.payload = b''
     with caplog.at_level(logging.WARNING):
         iface._handlePacketFromRadio(meshPacket, hack=True)
-    assert re.search(r"Not populating fromId", caplog.text, re.MULTILINE)
+    assert re.search(r'Not populating fromId', caplog.text, re.MULTILINE)
 
 
 @pytest.mark.unit
@@ -143,10 +143,10 @@ def test_getNode_not_local(caplog):
     iface = MeshInterface(noProto=True)
     anode = MagicMock(autospec=Node)
     with caplog.at_level(logging.DEBUG):
-        with patch("meshtastic.node.Node", return_value=anode):
+        with patch('meshtastic.node.Node', return_value=anode):
-            another_node = iface.getNode("bar2")
+            another_node = iface.getNode('bar2')
             assert another_node != iface.localNode
-    assert re.search(r"About to requestChannels", caplog.text, re.MULTILINE)
+    assert re.search(r'About to requestConfig', caplog.text, re.MULTILINE)
 
 
 @pytest.mark.unit
@@ -156,14 +156,14 @@ def test_getNode_not_local_timeout(capsys):
     iface = MeshInterface(noProto=True)
     anode = MagicMock(autospec=Node)
     anode.waitForConfig.return_value = False
-    with patch("meshtastic.node.Node", return_value=anode):
+    with patch('meshtastic.node.Node', return_value=anode):
         with pytest.raises(SystemExit) as pytest_wrapped_e:
-            iface.getNode("bar2")
+            iface.getNode('bar2')
         assert pytest_wrapped_e.type == SystemExit
         assert pytest_wrapped_e.value.code == 1
         out, err = capsys.readouterr()
-        assert re.match(r"Error: Timed out waiting for channels", out)
+        assert re.match(r'Error: Timed out waiting for node config', out)
-        assert err == ""
+        assert err == ''
 
 
 @pytest.mark.unit
@@ -174,37 +174,35 @@ def test_sendPosition(caplog):
     with caplog.at_level(logging.DEBUG):
         iface.sendPosition()
     iface.close()
-    assert re.search(r"p.time:", caplog.text, re.MULTILINE)
+    assert re.search(r'p.time:', caplog.text, re.MULTILINE)
 
 
-# TODO
+@pytest.mark.unit
-# @pytest.mark.unit
+@pytest.mark.usefixtures("reset_globals")
-# @pytest.mark.usefixtures("reset_globals")
+def test_close_with_heartbeatTimer(caplog):
-# def test_close_with_heartbeatTimer(caplog):
+    """Test close() with heartbeatTimer"""
-#    """Test close() with heartbeatTimer"""
+    iface = MeshInterface(noProto=True)
-#    iface = MeshInterface(noProto=True)
+    anode = Node('foo', 'bar')
-#    anode = Node('foo', 'bar')
+    radioConfig = RadioConfig()
-#    aconfig = Config()
+    radioConfig.preferences.phone_timeout_secs = 10
-#    aonfig.preferences.phone_timeout_secs = 10
+    anode.radioConfig = radioConfig
-#    anode.config = aconfig
+    iface.localNode = anode
-#    iface.localNode = anode
+    assert iface.heartbeatTimer is None
-#    assert iface.heartbeatTimer is None
+    with caplog.at_level(logging.DEBUG):
-#    with caplog.at_level(logging.DEBUG):
+        iface._startHeartbeat()
-#        iface._startHeartbeat()
+        assert iface.heartbeatTimer is not None
-#        assert iface.heartbeatTimer is not None
+        iface.close()
-#        iface.close()
 
 
-# TODO
+@pytest.mark.unit
-# @pytest.mark.unit
+@pytest.mark.usefixtures("reset_globals")
-# @pytest.mark.usefixtures("reset_globals")
+def test_handleFromRadio_empty_payload(caplog):
-# def test_handleFromRadio_empty_payload(caplog):
+    """Test _handleFromRadio"""
-#    """Test _handleFromRadio"""
+    iface = MeshInterface(noProto=True)
-#    iface = MeshInterface(noProto=True)
+    with caplog.at_level(logging.DEBUG):
-#    with caplog.at_level(logging.DEBUG):
+        iface._handleFromRadio(b'')
-#        iface._handleFromRadio(b'')
+    iface.close()
-#    iface.close()
+    assert re.search(r'Unexpected FromRadio payload', caplog.text, re.MULTILINE)
-#    assert re.search(r'Unexpected FromRadio payload', caplog.text, re.MULTILINE)
 
 
 @pytest.mark.unit
@@ -215,21 +213,22 @@ def test_handleFromRadio_with_my_info(caplog):
     # It "translates" to this:
     # my_info {
     #  my_node_num: 682584012
+    #  num_bands: 13
     #  firmware_version: "1.2.49.5354c49"
     #  reboot_count: 13
     #  bitrate: 17.088470458984375
     #  message_timeout_msec: 300000
     #  min_app_version: 20200
     #  max_channels: 8
-    #  has_wifi: true
     # }
-    from_radio_bytes = b"\x1a,\x08\xcc\xcf\xbd\xc5\x02\x18\r2\x0e1.2.49.5354c49P\r]0\xb5\x88Ah\xe0\xa7\x12p\xe8\x9d\x01x\x08\x90\x01\x01"
+    from_radio_bytes = b'\x1a,\x08\xcc\xcf\xbd\xc5\x02\x18\r2\x0e1.2.49.5354c49P\r]0\xb5\x88Ah\xe0\xa7\x12p\xe8\x9d\x01x\x08\x90\x01\x01'
     iface = MeshInterface(noProto=True)
     with caplog.at_level(logging.DEBUG):
         iface._handleFromRadio(from_radio_bytes)
     iface.close()
-    assert re.search(r"Received from radio: my_info {", caplog.text, re.MULTILINE)
+    assert re.search(r'Received myinfo', caplog.text, re.MULTILINE)
-    assert re.search(r"my_node_num: 682584012", caplog.text, re.MULTILINE)
+    assert re.search(r'num_bands: 13', caplog.text, re.MULTILINE)
+    assert re.search(r'max_channels: 8', caplog.text, re.MULTILINE)
 
 
 @pytest.mark.unit
@@ -256,15 +255,16 @@ def test_handleFromRadio_with_node_info(caplog, capsys):
     with caplog.at_level(logging.DEBUG):
         iface._startConfig()
         iface._handleFromRadio(from_radio_bytes)
-        assert re.search(r"Received from radio: node_info {", caplog.text, re.MULTILINE)
+        assert re.search(r'Received nodeinfo', caplog.text, re.MULTILINE)
-        assert re.search(r"682584012", caplog.text, re.MULTILINE)
+        assert re.search(r'682584012', caplog.text, re.MULTILINE)
+        assert re.search(r'HELTEC_V2_1', caplog.text, re.MULTILINE)
         # validate some of showNodes() output
         iface.showNodes()
         out, err = capsys.readouterr()
-        assert re.search(r" 1 ", out, re.MULTILINE)
+        assert re.search(r' 1 ', out, re.MULTILINE)
-        assert re.search(r"│ Unknown 67cc │ ", out, re.MULTILINE)
+        assert re.search(r'│ Unknown 67cc │ ', out, re.MULTILINE)
-        assert re.search(r"│\s+!28af67cc\s+│\s+67cc\s+|", out, re.MULTILINE)
+        assert re.search(r'│ !28af67cc │ N/A   │ N/A         │ N/A', out, re.MULTILINE)
-        assert err == ""
+        assert err == ''
         iface.close()
 
 
@@ -279,16 +279,16 @@ def test_handleFromRadio_with_node_info_tbeam1(caplog, capsys):
     with caplog.at_level(logging.DEBUG):
         iface._startConfig()
         iface._handleFromRadio(from_radio_bytes)
-        assert re.search(r"Received nodeinfo", caplog.text, re.MULTILINE)
+        assert re.search(r'Received nodeinfo', caplog.text, re.MULTILINE)
-        assert re.search(r"TBeam 1", caplog.text, re.MULTILINE)
+        assert re.search(r'TBeam 1', caplog.text, re.MULTILINE)
-        assert re.search(r"2127707136", caplog.text, re.MULTILINE)
+        assert re.search(r'2127707136', caplog.text, re.MULTILINE)
         # validate some of showNodes() output
         iface.showNodes()
         out, err = capsys.readouterr()
-        assert re.search(r" 1 ", out, re.MULTILINE)
+        assert re.search(r' 1 ', out, re.MULTILINE)
-        assert re.search(r"│ TBeam 1 │ ", out, re.MULTILINE)
+        assert re.search(r'│ TBeam 1 │ ', out, re.MULTILINE)
-        assert re.search(r"│ !7ed23c00 │", out, re.MULTILINE)
+        assert re.search(r'│ !7ed23c00 │', out, re.MULTILINE)
-        assert err == ""
+        assert err == ''
         iface.close()
 
 
@@ -310,8 +310,8 @@ def test_MeshInterface_sendToRadioImpl(caplog):
     """Test _sendToRadioImp()"""
     iface = MeshInterface(noProto=True)
     with caplog.at_level(logging.DEBUG):
-        iface._sendToRadioImpl("foo")
+        iface._sendToRadioImpl('foo')
-    assert re.search(r"Subclass must provide toradio", caplog.text, re.MULTILINE)
+    assert re.search(r'Subclass must provide toradio', caplog.text, re.MULTILINE)
     iface.close()
 
 
@@ -321,8 +321,8 @@ def test_MeshInterface_sendToRadio_no_proto(caplog):
     """Test sendToRadio()"""
     iface = MeshInterface()
     with caplog.at_level(logging.DEBUG):
-        iface._sendToRadioImpl("foo")
+        iface._sendToRadioImpl('foo')
-    assert re.search(r"Subclass must provide toradio", caplog.text, re.MULTILINE)
+    assert re.search(r'Subclass must provide toradio', caplog.text, re.MULTILINE)
     iface.close()
 
 
@@ -331,23 +331,23 @@ def test_MeshInterface_sendToRadio_no_proto(caplog):
 def test_sendData_too_long(caplog):
     """Test when data payload is too big"""
     iface = MeshInterface(noProto=True)
-    some_large_text = b"This is a long text that will be too long for send text."
+    some_large_text = b'This is a long text that will be too long for send text.'
-    some_large_text += b"This is a long text that will be too long for send text."
+    some_large_text += b'This is a long text that will be too long for send text.'
-    some_large_text += b"This is a long text that will be too long for send text."
+    some_large_text += b'This is a long text that will be too long for send text.'
-    some_large_text += b"This is a long text that will be too long for send text."
+    some_large_text += b'This is a long text that will be too long for send text.'
-    some_large_text += b"This is a long text that will be too long for send text."
+    some_large_text += b'This is a long text that will be too long for send text.'
-    some_large_text += b"This is a long text that will be too long for send text."
+    some_large_text += b'This is a long text that will be too long for send text.'
-    some_large_text += b"This is a long text that will be too long for send text."
+    some_large_text += b'This is a long text that will be too long for send text.'
-    some_large_text += b"This is a long text that will be too long for send text."
+    some_large_text += b'This is a long text that will be too long for send text.'
-    some_large_text += b"This is a long text that will be too long for send text."
+    some_large_text += b'This is a long text that will be too long for send text.'
-    some_large_text += b"This is a long text that will be too long for send text."
+    some_large_text += b'This is a long text that will be too long for send text.'
-    some_large_text += b"This is a long text that will be too long for send text."
+    some_large_text += b'This is a long text that will be too long for send text.'
-    some_large_text += b"This is a long text that will be too long for send text."
+    some_large_text += b'This is a long text that will be too long for send text.'
     with caplog.at_level(logging.DEBUG):
-        with pytest.raises(MeshInterface.MeshInterfaceError) as pytest_wrapped_e:
+        with pytest.raises(Exception) as pytest_wrapped_e:
             iface.sendData(some_large_text)
-            assert re.search("Data payload too big", caplog.text, re.MULTILINE)
+            assert re.search('Data payload too big', caplog.text, re.MULTILINE)
-        assert pytest_wrapped_e.type == MeshInterface.MeshInterfaceError
+        assert pytest_wrapped_e.type == Exception
     iface.close()
 
 
@@ -357,10 +357,10 @@ def test_sendData_unknown_app(capsys):
     """Test sendData when unknown app"""
     iface = MeshInterface(noProto=True)
     with pytest.raises(SystemExit) as pytest_wrapped_e:
-        iface.sendData(b"hello", portNum=0)
+        iface.sendData(b'hello', portNum=0)
     out, err = capsys.readouterr()
-    assert re.search(r"Warning: A non-zero port number", out, re.MULTILINE)
+    assert re.search(r'Warning: A non-zero port number', out, re.MULTILINE)
-    assert err == ""
+    assert err == ''
     assert pytest_wrapped_e.type == SystemExit
     assert pytest_wrapped_e.value.code == 1
 
@@ -372,9 +372,9 @@ def test_sendPosition_with_a_position(caplog):
     iface = MeshInterface(noProto=True)
     with caplog.at_level(logging.DEBUG):
         iface.sendPosition(latitude=40.8, longitude=-111.86, altitude=201)
-        assert re.search(r"p.latitude_i:408", caplog.text, re.MULTILINE)
+        assert re.search(r'p.latitude_i:408', caplog.text, re.MULTILINE)
-        assert re.search(r"p.longitude_i:-11186", caplog.text, re.MULTILINE)
+        assert re.search(r'p.longitude_i:-11186', caplog.text, re.MULTILINE)
-        assert re.search(r"p.altitude:201", caplog.text, re.MULTILINE)
+        assert re.search(r'p.altitude:201', caplog.text, re.MULTILINE)
 
 
 @pytest.mark.unit
@@ -383,10 +383,10 @@ def test_sendPacket_with_no_destination(capsys):
     """Test _sendPacket()"""
     iface = MeshInterface(noProto=True)
     with pytest.raises(SystemExit) as pytest_wrapped_e:
-        iface._sendPacket(b"", destinationId=None)
+        iface._sendPacket(b'', destinationId=None)
     out, err = capsys.readouterr()
-    assert re.search(r"Warning: destinationId must not be None", out, re.MULTILINE)
+    assert re.search(r'Warning: destinationId must not be None', out, re.MULTILINE)
-    assert err == ""
+    assert err == ''
     assert pytest_wrapped_e.type == SystemExit
     assert pytest_wrapped_e.value.code == 1
 
@@ -399,7 +399,7 @@ def test_sendPacket_with_destination_as_int(caplog):
     with caplog.at_level(logging.DEBUG):
         meshPacket = mesh_pb2.MeshPacket()
         iface._sendPacket(meshPacket, destinationId=123)
-        assert re.search(r"Not sending packet", caplog.text, re.MULTILINE)
+        assert re.search(r'Not sending packet', caplog.text, re.MULTILINE)
 
 
 @pytest.mark.unit
@@ -409,8 +409,8 @@ def test_sendPacket_with_destination_starting_with_a_bang(caplog):
     iface = MeshInterface(noProto=True)
     with caplog.at_level(logging.DEBUG):
         meshPacket = mesh_pb2.MeshPacket()
-        iface._sendPacket(meshPacket, destinationId="!1234")
+        iface._sendPacket(meshPacket, destinationId='!1234')
-        assert re.search(r"Not sending packet", caplog.text, re.MULTILINE)
+        assert re.search(r'Not sending packet', caplog.text, re.MULTILINE)
 
 
 @pytest.mark.unit
@@ -421,7 +421,7 @@ def test_sendPacket_with_destination_as_BROADCAST_ADDR(caplog):
     with caplog.at_level(logging.DEBUG):
         meshPacket = mesh_pb2.MeshPacket()
         iface._sendPacket(meshPacket, destinationId=BROADCAST_ADDR)
-        assert re.search(r"Not sending packet", caplog.text, re.MULTILINE)
+        assert re.search(r'Not sending packet', caplog.text, re.MULTILINE)
 
 
 @pytest.mark.unit
@@ -433,8 +433,8 @@ def test_sendPacket_with_destination_as_LOCAL_ADDR_no_myInfo(capsys):
         meshPacket = mesh_pb2.MeshPacket()
         iface._sendPacket(meshPacket, destinationId=LOCAL_ADDR)
     out, err = capsys.readouterr()
-    assert re.search(r"Warning: No myInfo", out, re.MULTILINE)
+    assert re.search(r'Warning: No myInfo', out, re.MULTILINE)
-    assert err == ""
+    assert err == ''
     assert pytest_wrapped_e.type == SystemExit
     assert pytest_wrapped_e.value.code == 1
 
@@ -450,7 +450,7 @@ def test_sendPacket_with_destination_as_LOCAL_ADDR_with_myInfo(caplog):
     with caplog.at_level(logging.DEBUG):
         meshPacket = mesh_pb2.MeshPacket()
         iface._sendPacket(meshPacket, destinationId=LOCAL_ADDR)
-        assert re.search(r"Not sending packet", caplog.text, re.MULTILINE)
+        assert re.search(r'Not sending packet', caplog.text, re.MULTILINE)
 
 
 @pytest.mark.unit
@@ -460,12 +460,12 @@ def test_sendPacket_with_destination_is_blank_with_nodes(capsys, iface_with_node
     iface = iface_with_nodes
     meshPacket = mesh_pb2.MeshPacket()
     with pytest.raises(SystemExit) as pytest_wrapped_e:
-        iface._sendPacket(meshPacket, destinationId="")
+        iface._sendPacket(meshPacket, destinationId='')
     assert pytest_wrapped_e.type == SystemExit
     assert pytest_wrapped_e.value.code == 1
     out, err = capsys.readouterr()
-    assert re.match(r"Warning: NodeId  not found in DB", out, re.MULTILINE)
+    assert re.match(r'Warning: NodeId  not found in DB', out, re.MULTILINE)
-    assert err == ""
+    assert err == ''
 
 
 @pytest.mark.unit
@@ -476,8 +476,8 @@ def test_sendPacket_with_destination_is_blank_without_nodes(caplog, iface_with_n
     iface.nodes = None
     meshPacket = mesh_pb2.MeshPacket()
     with caplog.at_level(logging.WARNING):
-        iface._sendPacket(meshPacket, destinationId="")
+        iface._sendPacket(meshPacket, destinationId='')
-    assert re.search(r"Warning: There were no self.nodes.", caplog.text, re.MULTILINE)
+    assert re.search(r'Warning: There were no self.nodes.', caplog.text, re.MULTILINE)
 
 
 @pytest.mark.unit
@@ -486,7 +486,7 @@ def test_getMyNodeInfo():
     """Test getMyNodeInfo()"""
     iface = MeshInterface(noProto=True)
     anode = iface.getNode(LOCAL_ADDR)
-    iface.nodesByNum = {1: anode}
+    iface.nodesByNum = {1: anode }
     assert iface.nodesByNum.get(1) == anode
     myInfo = MagicMock()
     iface.myInfo = myInfo
@@ -503,14 +503,12 @@ def test_generatePacketId(capsys):
     # not sure when this condition would ever happen... but we can simulate it
     iface.currentPacketId = None
     assert iface.currentPacketId is None
-    with pytest.raises(MeshInterface.MeshInterfaceError) as pytest_wrapped_e:
+    with pytest.raises(Exception) as pytest_wrapped_e:
         iface._generatePacketId()
         out, err = capsys.readouterr()
-        assert re.search(
+        assert re.search(r'Not connected yet, can not generate packet', out, re.MULTILINE)
-            r"Not connected yet, can not generate packet", out, re.MULTILINE
+        assert err == ''
-        )
+    assert pytest_wrapped_e.type == Exception
-        assert err == ""
-    assert pytest_wrapped_e.type == MeshInterface.MeshInterfaceError
 
 
 @pytest.mark.unit
@@ -540,12 +538,10 @@ def test_fixupPosition():
     iface = MeshInterface(noProto=True)
     pos = {"latitudeI": 1010000000, "longitudeI": 1020000000}
     newpos = iface._fixupPosition(pos)
-    assert newpos == {
+    assert newpos == {"latitude": 101.0,
-        "latitude": 101.0,
+                      "latitudeI": 1010000000,
-        "latitudeI": 1010000000,
+                      "longitude": 102.0,
-        "longitude": 102.0,
+                      "longitudeI": 1020000000}
-        "longitudeI": 1020000000,
-    }
 
 
 @pytest.mark.unit
@@ -555,7 +551,7 @@ def test_nodeNumToId(iface_with_nodes):
     iface = iface_with_nodes
     iface.myInfo.my_node_num = 2475227164
     someid = iface._nodeNumToId(2475227164)
-    assert someid == "!9388f81c"
+    assert someid == '!9388f81c'
 
 
 @pytest.mark.unit
@@ -574,8 +570,8 @@ def test_nodeNumToId_to_all(iface_with_nodes):
     """Test _nodeNumToId()"""
     iface = iface_with_nodes
     iface.myInfo.my_node_num = 2475227164
-    someid = iface._nodeNumToId(0xFFFFFFFF)
+    someid = iface._nodeNumToId(0xffffffff)
-    assert someid == "^all"
+    assert someid == '^all'
 
 
 @pytest.mark.unit
@@ -585,7 +581,7 @@ def test_getOrCreateByNum_minimal(iface_with_nodes):
     iface = iface_with_nodes
     iface.myInfo.my_node_num = 2475227164
     tmp = iface._getOrCreateByNum(123)
-    assert tmp == {"num": 123}
+    assert tmp == {'num': 123}
 
 
 @pytest.mark.unit
@@ -594,9 +590,9 @@ def test_getOrCreateByNum_not_found(iface_with_nodes):
     """Test _getOrCreateByNum()"""
     iface = iface_with_nodes
     iface.myInfo.my_node_num = 2475227164
-    with pytest.raises(MeshInterface.MeshInterfaceError) as pytest_wrapped_e:
+    with pytest.raises(Exception) as pytest_wrapped_e:
-        iface._getOrCreateByNum(0xFFFFFFFF)
+        iface._getOrCreateByNum(0xffffffff)
-    assert pytest_wrapped_e.type == MeshInterface.MeshInterfaceError
+    assert pytest_wrapped_e.type == Exception
 
 
 @pytest.mark.unit
@@ -606,15 +602,14 @@ def test_getOrCreateByNum(iface_with_nodes):
     iface = iface_with_nodes
     iface.myInfo.my_node_num = 2475227164
     tmp = iface._getOrCreateByNum(2475227164)
-    assert tmp["num"] == 2475227164
+    assert tmp['num'] == 2475227164
 
 
-# TODO
+@pytest.mark.unit
-# @pytest.mark.unit
+def test_enter():
-# def test_enter():
+    """Test __enter__()"""
-#    """Test __enter__()"""
+    iface = MeshInterface(noProto=True)
-#    iface = MeshInterface(noProto=True)
+    assert iface == iface.__enter__()
-#    assert iface == iface.__enter__()
 
 
 @pytest.mark.unit
@@ -622,13 +617,9 @@ def test_exit_with_exception(caplog):
     """Test __exit__()"""
     iface = MeshInterface(noProto=True)
     with caplog.at_level(logging.ERROR):
-        iface.__exit__("foo", "bar", "baz")
+        iface.__exit__('foo', 'bar', 'baz')
-        assert re.search(
+        assert re.search(r'An exception of type foo with value bar has occurred', caplog.text, re.MULTILINE)
-            r"An exception of type foo with value bar has occurred",
+        assert re.search(r'Traceback: baz', caplog.text, re.MULTILINE)
-            caplog.text,
-            re.MULTILINE,
-        )
-        assert re.search(r"Traceback: baz", caplog.text, re.MULTILINE)
 
 
 @pytest.mark.unit
@@ -648,36 +639,34 @@ def test_waitForConfig(capsys):
     iface = MeshInterface(noProto=True)
     # override how long to wait
     iface._timeout = Timeout(0.01)
-    with pytest.raises(MeshInterface.MeshInterfaceError) as pytest_wrapped_e:
+    with pytest.raises(Exception) as pytest_wrapped_e:
         iface.waitForConfig()
-        assert pytest_wrapped_e.type == MeshInterface.MeshInterfaceError
+        assert pytest_wrapped_e.type == Exception
         out, err = capsys.readouterr()
-        assert re.search(
+        assert re.search(r'Exception: Timed out waiting for interface config', err, re.MULTILINE)
-            r"Exception: Timed out waiting for interface config", err, re.MULTILINE
+        assert out == ''
-        )
-        assert out == ""
 
 
 @pytest.mark.unit
 def test_waitConnected_raises_an_exception(capsys):
     """Test waitConnected()"""
     iface = MeshInterface(noProto=True)
-    with pytest.raises(MeshInterface.MeshInterfaceError) as pytest_wrapped_e:
+    with pytest.raises(Exception) as pytest_wrapped_e:
-        iface.failure = MeshInterface.MeshInterfaceError("warn about something")
+        iface.failure = "warn about something"
         iface._waitConnected(0.01)
-        assert pytest_wrapped_e.type == MeshInterface.MeshInterfaceError
+        assert pytest_wrapped_e.type == Exception
         out, err = capsys.readouterr()
-        assert re.search(r"warn about something", err, re.MULTILINE)
+        assert re.search(r'warn about something', err, re.MULTILINE)
-        assert out == ""
+        assert out == ''
 
 
 @pytest.mark.unit
 def test_waitConnected_isConnected_timeout(capsys):
     """Test waitConnected()"""
-    with pytest.raises(MeshInterface.MeshInterfaceError) as pytest_wrapped_e:
+    with pytest.raises(Exception) as pytest_wrapped_e:
         iface = MeshInterface()
         iface._waitConnected(0.01)
-        assert pytest_wrapped_e.type == MeshInterface.MeshInterfaceError
+        assert pytest_wrapped_e.type == Exception
         out, err = capsys.readouterr()
-        assert re.search(r"warn about something", err, re.MULTILINE)
+        assert re.search(r'warn about something', err, re.MULTILINE)
-        assert out == ""
+        assert out == ''