Update protos

Output  of --info "Nodes in mesh" to JSON Format - YOLO

.gitattributes

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

.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: Linting and Tests
+name: CI
 on:
   push:
     branches:
@@ -17,6 +17,7 @@ jobs:
           - "3.7"
           - "3.8"
           - "3.9"
+          - "3.10"
     steps:
       - uses: actions/checkout@v2
       - name: Install Python 3
@@ -34,21 +35,21 @@ jobs:
           which meshtastic
           meshtastic --version
       - name: Run pylint
-        run: pylint meshtastic
+        run: pylint meshtastic examples/ --ignore-patterns ".*_pb2.py$"
       - 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@v1
+        uses: codecov/codecov-action@v2
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          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:
@@ -58,6 +59,7 @@ jobs:
           - "3.7"
           - "3.8"
           - "3.9"
+          - "3.10"
     steps:
       - uses: actions/checkout@v2
       - name: Install Python 3

.github/workflows/cleanup_artifacts.yml

@@ -0,0 +1,20 @@
+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/publish_to_pypi.yml

@@ -1,35 +0,0 @@
-name: Publish PyPI
-
-on: workflow_dispatch
-
-jobs:
-  build-and-publish:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - 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:
-          username: __token__
-          password: ${{ secrets.PYPI_API_TOKEN }}

.github/workflows/release.yml

@@ -0,0 +1,193 @@
+name: Make Release
+on: workflow_dispatch
+
+jobs:
+  release_create:
+    runs-on: ubuntu-latest
+
+    outputs:
+      version: ${{ steps.get_version.outputs.version }}
+      upload_url: ${{ steps.create_release.outputs.upload_url }}
+      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@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:
+          ref: ${{ needs.release_create.outputs.new_sha }}
+
+      - name: Set up Python 3.9
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.9
+
+      - name: Build
+        run: |
+          pip install pyinstaller
+          pip install -r requirements.txt
+          pip install .
+          pyinstaller -F -n meshtastic --collect-all meshtastic meshtastic/__main__.py
+
+      - name: Add ubuntu 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_ubuntu
+          asset_content_type: application/zip
+
+      - name: Add readme.txt 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: standalone_readme.txt
+          asset_name: readme.txt
+          asset_content_type: text/plain
+
+  build-and-publish-windows:
+    runs-on: windows-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: Build
+        run: |
+          pip install pyinstaller
+          pip install -r requirements.txt
+          pip install .
+          pyinstaller -F -n meshtastic --collect-all meshtastic meshtastic/__main__.py
+
+      - name: Add windows 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.exe
+          asset_name: meshtastic_windows
+          asset_content_type: application/zip

.github/workflows/update_protobufs.yml

@@ -15,10 +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
+          tar xvzf nanopb-0.4.6-linux-x86.tar.gz
+          mv nanopb-0.4.6-linux-x86 nanopb-0.4.6
+
+      - name: Re-generate protocol buffers
+        run: |
+          ./bin/regen-protobufs.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 proto
+          git add protobufs
+          git add meshtastic
           git commit -m "Update protobuf submodule" && git push || echo "No changes to commit"

.gitignore

@@ -5,7 +5,7 @@ dist
 *.egg-info
 log_*
 .eggs
-nanopb-0.4.4
+nanopb-*
 .*swp
 .coverage
 *.py-E
@@ -14,3 +14,4 @@ venv/
 .DS_Store
 __pycache__
 examples/__pycache__
+meshtastic.spec

.gitmodules

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

.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,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
+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
 
 
 
@@ -23,8 +23,7 @@ ignore-patterns=mqtt_pb2.py,channel_pb2.py,environmental_measurement_pb2.py,admi
 # 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,no-self-use,pointless-string-statement,too-few-public-methods,consider-using-f-string,broad-except,no-else-return,unused-argument,global-statement,global-variable-not-assigned,too-many-boolean-expressions,no-else-raise,bare-except,c-extension-no-member
-
+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
 
 [BASIC]
 
@@ -41,7 +40,7 @@ bad-names=foo,bar,baz,toto,tutu,tata
 max-line-length=150
 
 # Maximum number of lines in a module
-max-module-lines=1200
+max-module-lines=1600
 
 
 

.trunk/.gitignore

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

.trunk/configs/.isort.cfg

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

.trunk/configs/.markdownlint.yaml

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

.trunk/configs/.shellcheckrc

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

.trunk/configs/.yamllint.yaml

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

.trunk/configs/ruff.toml

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

.trunk/trunk.yaml

@@ -0,0 +1,39 @@
+version: 0.1
+cli:
+  version: 1.7.0
+plugins:
+  sources:
+    - id: trunk
+      ref: v0.0.14
+      uri: https://github.com/trunk-io/plugins
+lint:
+  ignore:
+    - linters: [ALL]
+      paths:
+        # Ignore generated files
+        - meshtastic/*_pb2.py
+  enabled:
+    - actionlint@1.6.23
+    - black@23.3.0
+    - git-diff-check
+    - gitleaks@8.16.2
+    - isort@5.12.0
+    - markdownlint@0.33.0
+    - prettier@2.8.7
+    - pylint@2.17.1
+    - ruff@0.0.260
+    - shellcheck@0.9.0
+    - shfmt@3.5.0
+    - yamllint@1.30.0
+runtimes:
+  enabled:
+    - go@1.19.5
+    - 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

@@ -42,7 +42,87 @@
       "request": "launch",
       "module": "meshtastic",
       "justMyCode": true,
-      "args": ["--debug" ]
+      "args": ["--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",
@@ -52,6 +132,15 @@
       "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",
@@ -92,7 +181,7 @@
       "module": "meshtastic",
       "justMyCode": true,
       "args": ["--debug", "--sendtext", "pytest"]
-    }
+    },
     {
       "name": "meshtastic showNodes",
       "type": "python",

Makefile

@@ -2,6 +2,14 @@
 test:
 	pytest -m unit
 
+# only run the smoke tests against the virtual device
+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 .
@@ -12,11 +20,17 @@ docs:
 
 # lint the codebase
 lint:
-	pylint meshtastic
+	pylint meshtastic examples
 
 # show the slowest unit tests
 slow:
-	pytest --durations=5
+	pytest -m unit --durations=5
+
+protobufs: FORCE
+	git submodule update --init --recursive
+	git pull --rebase
+	git submodule update --remote --merge
+	./bin/regen-protobufs.sh
 
 # run the coverage report and open results in a browser
 cov:

README.md

@@ -1,14 +1,23 @@
-# Meshtastic-python
+# 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/)
+[![Vercel](https://img.shields.io/static/v1?label=Powered%20by&message=Vercel&style=flat&logo=vercel&color=000000)](https://vercel.com?utm_source=meshtastic&utm_campaign=oss)
 
-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.
+## Overview
 
-Full documentation including examples [here](https://meshtastic.org/docs/software/python/python-installation).
+A Python client for use with Meshtastic 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.
 
-The library api is documented [here](https://meshtastic-python.vercel.app/meshtastic/index.html)
+**[Getting Started Guide](https://meshtastic.org/docs/software/python/cli/installation)**
 
+**[Documentation/API Reference](https://python.meshtastic.org/)**
 
-[![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)
+## Stats
+
+![Alt](https://repobeats.axiom.co/api/embed/c71ee8fc4a79690402e5d2807a41eec5e96d9039.svg "Repobeats analytics image")

TODO.md

@@ -34,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
-- radioConfig - getter/setter syntax: https://www.python-course.eu/python3_properties.php
+- localConfig - 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

@@ -0,0 +1,30 @@
+#!/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:
+    lines = f.readlines()
+
+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('"', "")
+            # 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]
+            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-protobufs.sh

@@ -0,0 +1,19 @@
+#!/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.6/generator-bin/protoc -I=protobufs --python_out ./ ./protobufs/meshtastic/*.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

@@ -1,15 +0,0 @@
-#!/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
-else
-  sed -i -E 's/^import.*_pb2/from . \0/' meshtastic/*.py
-fi
-  
-
-# 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

bin/show_version.py

@@ -0,0 +1,20 @@
+#!/usr/bin/env python
+"""Show the version number"""
+
+version_filename = "setup.py"
+
+lines = None
+
+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('"', "")
+        # get rid of the trailing comma
+        line2 = line2.replace(",", "")
+        # split on =
+        words = line2.split("=")
+        # Note: This format is for github actions
+        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

@@ -0,0 +1,16 @@
+# example config using camelCase keys
+owner: Bob TBeam
+ownerShort: BOB
+
+channelUrl: https://www.meshtastic.org/d/#CgUYAyIBAQ
+
+location:
+  lat: 35.88888
+  lon: -93.88888
+  alt: 304
+
+userPrefs:
+  region: 1
+  isAlwaysPowered: "true"
+  screenOnSecs: 31536000
+  waitBluetoothSecs: 31536000

example_config.yaml

@@ -1,15 +1,43 @@
+# example configuration file with snake_case keys
 owner: Bob TBeam
+owner_short: BOB
 
-channel_url: https://www.meshtastic.org/d/#CgUYAyIBAQ
+channel_url: https://www.meshtastic.org/e/#CgMSAQESCDgBQANIAVAe
 
 location:
   lat: 35.88888
   lon: -93.88888
   alt: 304
 
-user_prefs:
-  region: 1
-  is_always_powered: 'true'
-  send_owner_interval: 2
-  screen_on_secs: 31536000
-  wait_bluetooth_secs: 31536000
+config:
+  bluetooth:
+    enabled: true
+    fixedPin: 123456
+  device:
+    serialEnabled: true
+  display:
+    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

@@ -0,0 +1,21 @@
+"""Simple program to demo how to use meshtastic library.
+   To run: python examples/get_hw.py
+"""
+
+import sys
+
+import meshtastic
+import meshtastic.serial_interface
+
+# simple arg check
+if len(sys.argv) != 1:
+    print(f"usage: {sys.argv[0]}")
+    print("Print the hardware model for the local node.")
+    sys.exit(3)
+
+iface = meshtastic.serial_interface.SerialInterface()
+if iface.nodes:
+    for n in iface.nodes.values():
+        if n["num"] == iface.myInfo.my_node_num:
+            print(n["user"]["hwModel"])
+iface.close()

examples/hello_world_serial.py

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

examples/info_example.py

@@ -0,0 +1,23 @@
+"""Simple program to demo how to use meshtastic library.
+   To run: python examples/info.py
+"""
+
+import meshtastic
+import meshtastic.serial_interface
+
+iface = meshtastic.serial_interface.SerialInterface()
+
+# call showInfo() just to ensure values are populated
+# 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:
+            print(n["user"]["hwModel"])
+            break
+
+iface.close()

examples/pub_sub_example.py

@@ -3,6 +3,7 @@
 """
 
 import sys
+
 from pubsub import pub
 
 import meshtastic
@@ -13,10 +14,13 @@ if len(sys.argv) < 2:
     print(f"usage: {sys.argv[0]} host")
     sys.exit(1)
 
-def onConnection(interface, topic=pub.AUTO_TOPIC):
+
+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,6 +4,7 @@
 
 import sys
 import time
+
 from pubsub import pub
 
 import meshtastic
@@ -14,15 +15,18 @@ if len(sys.argv) < 2:
     print(f"usage: {sys.argv[0]} host")
     sys.exit(1)
 
-def onReceive(packet, interface):
+
+def onReceive(packet, interface):  # pylint: disable=unused-argument
     """called when a packet arrives"""
     print(f"Received: {packet}")
 
-def onConnection(interface, topic=pub.AUTO_TOPIC):
+
+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:
@@ -30,6 +34,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

@@ -0,0 +1,29 @@
+"""Program to scan for hardware
+   To run: python examples/scan_for_devices.py
+"""
+
+import sys
+
+from meshtastic.util import (
+    active_ports_on_supported_devices,
+    detect_supported_devices,
+    get_unique_vendor_ids,
+)
+
+# simple arg check
+if len(sys.argv) != 1:
+    print(f"usage: {sys.argv[0]}")
+    print("Detect which device we might have.")
+    sys.exit(3)
+
+vids = get_unique_vendor_ids()
+print(f"Searching for all devices with these vendor ids {vids}")
+
+sds = detect_supported_devices()
+if len(sds) > 0:
+    print("Detected possible devices:")
+for d in sds:
+    print(f" name:{d.name}{d.version} firmware:{d.for_firmware}")
+
+ports = active_ports_on_supported_devices(sds)
+print(f"ports:{ports}")

examples/set_owner.py

@@ -0,0 +1,21 @@
+"""Simple program to demo how to use meshtastic library.
+   To run: python examples/set_owner.py Bobby 333
+"""
+
+import sys
+
+import meshtastic
+import meshtastic.serial_interface
+
+# simple arg check
+if len(sys.argv) < 2:
+    print(f"usage: {sys.argv[0]} long_name [short_name]")
+    sys.exit(3)
+
+iface = meshtastic.serial_interface.SerialInterface()
+long_name = sys.argv[1]
+short_name = None
+if len(sys.argv) > 2:
+    short_name = sys.argv[2]
+iface.localNode.setOwner(long_name, short_name)
+iface.close()

examples/show_ports.py

@@ -0,0 +1,6 @@
+"""Simple program to show serial ports.
+"""
+
+from meshtastic.util import findPorts
+
+print(findPorts())

examples/tcp_gps_example.py

@@ -0,0 +1,14 @@
+"""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/heltec.txt

@@ -0,0 +1,20 @@
+ioreg -p IOUSB > /tmp/d
+
+>   | +-o CP2102 USB to UART Bridge Controller@14400000  <class AppleUSBDevice, id 0x10005c048, registered, matched, active, busy 0 (9 ms), retain 12>
+
+
+system_profiler SPUSBDataType > /tmp/b
+
+37a38,50
+>         CP2102 USB to UART Bridge Controller:
+>
+>           Product ID: 0xea60
+>           Vendor ID: 0x10c4  (Silicon Laboratories, Inc.)
+>           Version: 1.00
+>           Serial Number: 0001
+>           Speed: Up to 12 Mb/s
+>           Manufacturer: Silicon Labs
+>           Location ID: 0x14400000 / 53
+>           Current Available (mA): 500
+>           Current Required (mA): 100
+>           Extra Operating Current (mA): 0

info/mac/nano_g1.txt

@@ -0,0 +1,30 @@
+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/mac/rak11200.txt

@@ -0,0 +1,52 @@
+
+
+% ioreg -p IOUSB > /tmp/a
+# only a solid red light (pins GRND and BOOT0 jumpered)
+
+% ioreg -p IOUSB > /tmp/b
+# solid red light and solid green light
+
+% ioreg -p IOUSB > /tmp/c
+# nothing plugged in
+
+
+
+% diff /tmp/a /tmp/c
+13c13
+<   +-o AppleUSBXHCI Root Hub Simulation@14000000  <class AppleUSBRootHubDevice, id 0x100000589, registered, matched, active, busy 0 (15 ms), retain 11>
+---
+>   +-o AppleUSBXHCI Root Hub Simulation@14000000  <class AppleUSBRootHubDevice, id 0x100000589, registered, matched, active, busy 0 (15 ms), retain 10>
+18d17
+<     +-o USB Serial@14300000  <class AppleUSBDevice, id 0x100004ca4, registered, matched, active, busy 0 (10 ms), retain 12>
+
+
+% diff /tmp/b /tmp/c
+13c13
+<   +-o AppleUSBXHCI Root Hub Simulation@14000000  <class AppleUSBRootHubDevice, id 0x100000589, registered, matched, active, busy 0 (15 ms), retain 11>
+---
+>   +-o AppleUSBXHCI Root Hub Simulation@14000000  <class AppleUSBRootHubDevice, id 0x100000589, registered, matched, active, busy 0 (15 ms), retain 10>
+18d17
+<     +-o USB Serial@14300000  <class AppleUSBDevice, id 0x100004ce5, registered, matched, active, busy 0 (11 ms), retain 12>
+
+
+
+system_profiler SPUSBDataType > /tmp/d
+# red solid
+
+
+system_profiler SPUSBDataType > /tmp/e
+# nothing
+
+
+% diff /tmp/d /tmp/e
+38,48d37
+<         USB Serial:
+<
+<           Product ID: 0x7523
+<           Vendor ID: 0x1a86
+<           Version: 2.64
+<           Speed: Up to 12 Mb/s
+<           Location ID: 0x14300000 / 33
+<           Current Available (mA): 500
+<           Current Required (mA): 98
+<           Extra Operating Current (mA): 0

info/mac/rak4631_19003.txt

@@ -0,0 +1,68 @@
+
+
+>   | +-o WisCore RAK4631 Board@14400000  <class AppleUSBDevice, id 0x10005c158, registered, matched, active, busy 0 (18 ms), retain 14>
+
+
+/dev/cu.usbmodem14401
+
+% ls -al /dev/*modem*
+crw-rw-rw-  1 root  wheel  0x9000005 Jan 29 15:32 /dev/cu.usbmodem14401
+crw-rw-rw-  1 root  wheel  0x9000004 Jan 29 15:31 /dev/tty.usbmodem14401
+
+
+Note: On a Mac Air, output is:
+
+% system_profiler SPUSBDataType
+USB:
+    USB 3.1 Bus:
+      Host Controller Driver: AppleT8103USBXHCI
+    USB 3.1 Bus:
+      Host Controller Driver: AppleT8103USBXHCI
+        WisCore RAK4631 Board:
+          Product ID: 0x8029
+          Vendor ID: 0x239a
+          Version: 1.00
+          Serial Number: E6CF9502B1D410D8
+          Speed: Up to 12 Mb/s
+          Manufacturer: RAKwireless
+          Location ID: 0x01100000 / 2
+          Current Available (mA): 500
+          Current Required (mA): 100
+          Extra Operating Current (mA): 0
+
+However, in FTHR840BOOT mode, it shows this:
+
+% system_profiler SPUSBDataType
+USB:
+    USB 3.1 Bus:
+      Host Controller Driver: AppleT8103USBXHCI
+    USB 3.1 Bus:
+      Host Controller Driver: AppleT8103USBXHCI
+        Feather nRF52840 Express:
+          Product ID: 0x0029
+          Vendor ID: 0x239a
+          Version: 1.00
+          Serial Number: E6CF9502B1D410D8
+          Speed: Up to 12 Mb/s
+          Manufacturer: Adafruit Industries
+          Location ID: 0x01100000 / 1
+          Current Available (mA): 500
+          Current Required (mA): 100
+          Extra Operating Current (mA): 0
+          Media:
+            nRF UF2:
+              Capacity: 33.7 MB (33,690,112 bytes)
+              Removable Media: Yes
+              BSD Name: disk4
+              Logical Unit: 0
+              Partition Map Type: Unknown
+              S.M.A.R.T. status: Verified
+              USB Interface: 2
+
+
+$ cat /Volumes/FTHR840BOOT/INFO_UF2.TXT
+UF2 Bootloader 0.3.2-109-gd6b28e6-dirty lib/nrfx (v2.0.0) lib/tinyusb (0.6.0-272-g4e6aa0d8) lib/uf2 (heads/master)
+Model: Adafruit Feather nRF52840 Express
+Board-ID: nRF52840-Feather-revD
+SoftDevice: S140 version 6.1.1
+Date: Jun 16 2020

info/mac/rak4631_5005.txt

@@ -0,0 +1,18 @@
+
+no device plugged in
+% ioreg -p IOUSB > /tmp/a
+
+device plugged in, in "boot" mode
+% ioreg -p IOUSB > /tmp/b
+
+device plugged in, botted to Meshtastic firmware
+% ioreg -p IOUSB > /tmp/c
+
+(venv) sweet Meshtastic-python % diff /tmp/a /tmp/b (with most info removed)
+>   | +-o Feather nRF52840 Express@14400000  <class AppleUSBDevice, id 0x10005c0ff, registered, matched, active, busy 0 (22 ms), retain 16>
+
+diff /tmp/a /tmp/c (with most info removed)
+>   | +-o WisCore RAK4631 Board@14400000  <class AppleUSBDevice, id 0x10005c134, registered, matched, active, busy 0 (17 ms), retain 14>
+
+
+Meshtastic detected port on /dev/cu.usbmodem14401

info/mac/tbeam.txt

@@ -0,0 +1,21 @@
+
+meshtastic detected port: /dev/cu.usbmodem53230050571
+
+ioreg -p IOUSB > /tmp/c
+
+>   | +-o USB Single Serial@14400000  <class AppleUSBDevice, id 0x10005bff7, registered, matched, active, busy 0 (15 ms), retain 14>
+
+
+system_profiler SPUSBDataType > /tmp/a
+
+>         USB Single Serial:
+>
+>           Product ID: 0x55d4
+>           Vendor ID: 0x1a86
+>           Version: 4.43
+>           Serial Number: 5323005057
+>           Speed: Up to 12 Mb/s
+>           Location ID: 0x14400000 / 50
+>           Current Available (mA): 500
+>           Current Required (mA): 134
+>           Extra Operating Current (mA): 0

info/mac/techo.txt

@@ -0,0 +1,40 @@
+
+in boot mode:
+
+% mount
+<snip>
+/dev/disk122 on /Volumes/TECHOBOOT (msdos, local, nodev, nosuid, noowners)
+
+% ls -al /Volumes/TECHOBOOT
+total 3735
+drwxrwxrwx@ 1 bob         staff     2048 Feb  1 16:47 .
+drwxr-xr-x  5 root        wheel      160 Feb  1 16:47 ..
+drwxrwxrwx  1 bob         staff      512 Feb  1 16:47 .fseventsd
+-rwxrwxrwx  1 bob         staff  1908736 Oct 13 08:37 CURRENT.UF2
+-rwxrwxrwx  1 bob         staff      129 Oct 13 08:37 INDEX.HTM
+-rwxrwxrwx  1 bob         staff      237 Oct 13 08:37 INFO_UF2.TXT
+
+
+# nothing plugged in
+% ioreg -p IOUSB > /tmp/a
+# not boot mode
+% ioreg -p IOUSB > /tmp/b
+# bootmode
+% ioreg -p IOUSB > /tmp/c
+
+
+% diff /tmp/a /tmp/b
+<snip>
+>   | +-o TTGO_eink@14300000  <class AppleUSBDevice, id 0x100060fe4, registered, matched, active, busy 0 (18 ms), retain 14>
+
+% diff /tmp/a /tmp/c
+<snip>
+>   | +-o T-Echo v1@14300000  <class AppleUSBDevice, id 0x100061000, registered, matched, active, busy 0 (25 ms), retain 16>
+
+contents of: INFO_UF2.TXT
+
+UF2 Bootloader 0.6.1-2-g1224915 lib/nrfx (v2.0.0) lib/tinyusb (0.10.1-293-gaf8e5a90) lib/uf2 (remotes/origin/configupdate-9-gadbb8c7)
+Model: LilyGo T-Echo
+Board-ID: nRF52840-TEcho-v1
+SoftDevice: S140 version 6.1.1
+Date: Oct 13 2021

info/mac/tlora.txt

@@ -0,0 +1,16 @@
+diff of ioreg -p IOUSB
+
+>   | +-o USB Single Serial@14300000  <class AppleUSBDevice, id 0x10005bf0f, registered, matched, active, busy 0 (18 ms), retain 14>
+
+
+Diff of system_profiler SPUSBDataType
+<         USB Single Serial:
+<
+<           Product ID: 0x55d4
+<           Vendor ID: 0x1a86
+<           Version: 4.43
+<           Speed: Up to 12 Mb/s
+<           Location ID: 0x14300000 / 46
+<           Current Available (mA): 500
+<           Current Required (mA): 134
+<           Extra Operating Current (mA): 0

info/mac/tlora_2.1.6.txt

@@ -0,0 +1,85 @@
+lsusb
+
+Bus 001 Device 001: ID 0bda:2172 Realtek Semiconductor Corp. BillBoard Device  Serial: 00000000000000000
+Bus 000 Device 002: ID 2109:0817 VIA Labs, Inc. USB3.0 Hub  Serial: 000000000
+Bus 000 Device 003: ID 2109:0715 VIA Labs, Inc. VLI Product String  Serial: 000000075003
+Bus 000 Device 004: ID 0bda:0306 Realtek Semiconductor Corp. USB3.0-CRW  Serial: 60000719201300000
+Bus 000 Device 005: ID 2109:0817 VIA Labs, Inc. USB3.0 Hub  Serial: 000000000
+Bus 000 Device 001: ID 2109:2817 VIA Labs, Inc. USB2.0 Hub  Serial: 000000000
+Bus 000 Device 009: ID 1a86:55d4 1a86 USB Single Serial  Serial: 533C005215
+Bus 000 Device 006: ID 2109:2817 VIA Labs, Inc. USB2.0 Hub  Serial: 000000000
+Bus 000 Device 007: ID 2109:8817 VIA Labs, Inc. USB Billboard Device  Serial: 0000000000000001
+Bus 000 Device 008: ID 2109:8817 VIA Labs, Inc. USB Billboard Device  Serial: 0000000000000001
+Bus 002 Device 001: ID 1a40:0101 TERMINUS TECHNOLOGY INC. USB 2.0 Hub 
+Bus 002 Device 003: ID 0922:001f Dymo Corporation DYMO LabelWriter 4XL  Serial: 17032316350940
+Bus 002 Device 002: ID 046d:082d Logitech Inc. HD Pro Webcam C920  Serial: A21C905F
+Bus 000 Device 000: ID 0bda:2172 Realtek Semiconductor Corp. USB 3.1 Bus 
+Bus 000 Device 000: ID 2109:0817 VIA Labs, Inc. USB 3.1 Bus 
+Bus 000 Device 001: ID 1d6b:1100 Linux Foundation USB 3.0 Bus
+
+% lsusb -v (with parts snipped)
+
+        USB2.0 Hub             :
+
+          Product ID: 0x2817
+          Vendor ID: 0x2109  (VIA Labs, Inc.)
+          Version: 6.03
+          Serial Number: 000000000
+          Speed: Up to 480 Mb/s
+          Manufacturer: VIA Labs, Inc.
+          Location ID: 0x00100000 / 1
+          Current Available (mA): 500
+          Current Required (mA): 0
+          Extra Operating Current (mA): 0
+
+            USB Single Serial:
+
+              Product ID: 0x55d4
+              Vendor ID: 0x1a86
+              Version: 4.43
+              Serial Number: 533C005215
+              Speed: Up to 12 Mb/s
+              Location ID: 0x00140000 / 9
+              Current Available (mA): 500
+              Current Required (mA): 134
+              Extra Operating Current (mA): 0
+
+            USB2.0 Hub             :
+
+              Product ID: 0x2817
+              Vendor ID: 0x2109  (VIA Labs, Inc.)
+              Version: 6.03
+              Serial Number: 000000000
+              Speed: Up to 480 Mb/s
+              Manufacturer: VIA Labs, Inc.
+              Location ID: 0x00110000 / 6
+              Current Available (mA): 500
+              Current Required (mA): 0
+              Extra Operating Current (mA): 0
+
+                USB Billboard Device   :
+
+                  Product ID: 0x8817
+                  Vendor ID: 0x2109  (VIA Labs, Inc.)
+                  Version: 0.01
+                  Serial Number: 0000000000000001
+                  Speed: Up to 480 Mb/s
+                  Manufacturer: VIA Labs, Inc.
+                  Location ID: 0x00115000 / 7
+                  Current Available (mA): 500
+                  Current Required (mA): 100
+                  Extra Operating Current (mA): 0
+
+            USB Billboard Device   :
+
+              Product ID: 0x8817
+              Vendor ID: 0x2109  (VIA Labs, Inc.)
+              Version: 0.01
+              Serial Number: 0000000000000001
+              Speed: Up to 480 Mb/s
+              Manufacturer: VIA Labs, Inc.
+              Location ID: 0x00150000 / 8
+              Current Available (mA): 500
+              Current Required (mA): 100
+              Extra Operating Current (mA): 0
+

info/readme.txt

@@ -0,0 +1,3 @@
+Gathering OS-level info for devices.
+
+This info might be helpful for developers detecting info about devices.

info/ubuntu/diy.txt

@@ -0,0 +1,67 @@
+lsusb
+
+Bus 002 Device 001: ID 1d6b:0003 Linux Foundation 3.0 root hub
+Bus 001 Device 004: ID 10c4:ea60 Silicon Labs CP210x UART Bridge
+Bus 001 Device 003: ID 0bda:2838 Realtek Semiconductor Corp. RTL2838 DVB-T
+Bus 001 Device 002: ID 2109:3431 VIA Labs, Inc. Hub
+Bus 001 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub
+
+lsusb -d 10c4: -v
+
+Bus 001 Device 004: ID 10c4:ea60 Silicon Labs CP210x UART Bridge
+Couldn't open device, some information will be missing
+Device Descriptor:
+  bLength                18
+  bDescriptorType         1
+  bcdUSB               2.00
+  bDeviceClass            0 
+  bDeviceSubClass         0 
+  bDeviceProtocol         0 
+  bMaxPacketSize0        64
+  idVendor           0x10c4 Silicon Labs
+  idProduct          0xea60 CP210x UART Bridge
+  bcdDevice            1.00
+  iManufacturer           1 
+  iProduct                2 
+  iSerial                 3 
+  bNumConfigurations      1
+  Configuration Descriptor:
+    bLength                 9
+    bDescriptorType         2
+    wTotalLength       0x0020
+    bNumInterfaces          1
+    bConfigurationValue     1
+    iConfiguration          0 
+    bmAttributes         0x80
+      (Bus Powered)
+    MaxPower              100mA
+    Interface Descriptor:
+      bLength                 9
+      bDescriptorType         4
+      bInterfaceNumber        0
+      bAlternateSetting       0
+      bNumEndpoints           2
+      bInterfaceClass       255 Vendor Specific Class
+      bInterfaceSubClass      0 
+      bInterfaceProtocol      0 
+      iInterface              2 
+      Endpoint Descriptor:
+        bLength                 7
+        bDescriptorType         5
+        bEndpointAddress     0x01  EP 1 OUT
+        bmAttributes            2
+          Transfer Type            Bulk
+          Synch Type               None
+          Usage Type               Data
+        wMaxPacketSize     0x0040  1x 64 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/ubuntu/heltec_v2.txt

@@ -0,0 +1,85 @@
+Run on Ubuntu 20
+
+Command:
+lsusb -d 10c4: -v
+
+Output:
+Bus 001 Device 091: ID 10c4:ea60 Silicon Labs CP210x UART Bridge
+Device Descriptor:
+  bLength                18
+  bDescriptorType         1
+  bcdUSB               1.10
+  bDeviceClass            0 
+  bDeviceSubClass         0 
+  bDeviceProtocol         0 
+  bMaxPacketSize0        64
+  idVendor           0x10c4 Silicon Labs
+  idProduct          0xea60 CP210x UART Bridge
+  bcdDevice            1.00
+  iManufacturer           1 
+  iProduct                2 
+  iSerial                 3 
+  bNumConfigurations      1
+  Configuration Descriptor:
+    bLength                 9
+    bDescriptorType         2
+    wTotalLength       0x0020
+    bNumInterfaces          1
+    bConfigurationValue     1
+    iConfiguration          0 
+    bmAttributes         0x80
+      (Bus Powered)
+    MaxPower              100mA
+    Interface Descriptor:
+      bLength                 9
+      bDescriptorType         4
+      bInterfaceNumber        0
+      bAlternateSetting       0
+      bNumEndpoints           2
+      bInterfaceClass       255 Vendor Specific Class
+      bInterfaceSubClass      0 
+      bInterfaceProtocol      0 
+      iInterface              2 
+      Endpoint Descriptor:
+        bLength                 7
+        bDescriptorType         5
+        bEndpointAddress     0x81  EP 1 IN
+        bmAttributes            2
+          Transfer Type            Bulk
+          Synch Type               None
+          Usage Type               Data
+        wMaxPacketSize     0x0040  1x 64 bytes
+        bInterval               0
+      Endpoint Descriptor:
+        bLength                 7
+        bDescriptorType         5
+        bEndpointAddress     0x01  EP 1 OUT
+        bmAttributes            2
+          Transfer Type            Bulk
+          Synch Type               None
+          Usage Type               Data
+        wMaxPacketSize     0x0040  1x 64 bytes
+        bInterval               0
+
+
+Command:
+esptool.py chip_id
+
+Output:
+esptool.py v3.2
+Found 3 serial ports
+Serial port /dev/ttyUSB0
+Connecting....
+Detecting chip type... Unsupported detection protocol, switching and trying again...
+Connecting.....
+Detecting chip type... ESP32
+Chip is ESP32-D0WDQ6 (revision 1)
+Features: WiFi, BT, Dual Core, 240MHz, VRef calibration in efuse, Coding Scheme None
+Crystal is 40MHz
+MAC: 24:0a:c4:fc:be:f0
+Uploading stub...
+Running stub...
+Stub running...
+Warning: ESP32 has no Chip ID. Reading MAC instead.
+MAC: 24:0a:c4:fc:be:f0
+Hard resetting via RTS pin...

info/ubuntu/nano_g1.txt

@@ -0,0 +1,91 @@
+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/ubuntu/rak4631_19003.txt

@@ -0,0 +1,118 @@
+
+Note: Meshtastic firmware was installed when running these commands
+
+$ ls -al /dev/ttyACM*
+crw-rw---- 1 root dialout 166, 0 Jan 29 21:50 /dev/ttyACM0
+
+lsusb -d 239a: -v
+
+Bus 001 Device 097: ID 239a:8029
+Couldn't open device, some information will be missing
+Device Descriptor:
+  bLength                18
+  bDescriptorType         1
+  bcdUSB               2.00
+  bDeviceClass          239 Miscellaneous Device
+  bDeviceSubClass         2
+  bDeviceProtocol         1 Interface Association
+  bMaxPacketSize0        64
+  idVendor           0x239a
+  idProduct          0x8029
+  bcdDevice            1.00
+  iManufacturer           1
+  iProduct                2
+  iSerial                 3
+  bNumConfigurations      1
+  Configuration Descriptor:
+    bLength                 9
+    bDescriptorType         2
+    wTotalLength       0x004b
+    bNumInterfaces          2
+    bConfigurationValue     1
+    iConfiguration          0
+    bmAttributes         0xa0
+      (Bus Powered)
+      Remote Wakeup
+    MaxPower              100mA
+    Interface Association:
+      bLength                 8
+      bDescriptorType        11
+      bFirstInterface         0
+      bInterfaceCount         2
+      bFunctionClass          2 Communications
+      bFunctionSubClass       2 Abstract (modem)
+      bFunctionProtocol       0
+      iFunction               0
+    Interface Descriptor:
+      bLength                 9
+      bDescriptorType         4
+      bInterfaceNumber        0
+      bAlternateSetting       0
+      bNumEndpoints           1
+      bInterfaceClass         2 Communications
+      bInterfaceSubClass      2 Abstract (modem)
+      bInterfaceProtocol      0
+      iInterface              4
+      CDC Header:
+        bcdCDC               1.20
+      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     0x81  EP 1 IN
+        bmAttributes            3
+          Transfer Type            Interrupt
+          Synch Type               None
+          Usage Type               Data
+        wMaxPacketSize     0x0008  1x 8 bytes
+        bInterval              16
+    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     0x01  EP 1 OUT
+        bmAttributes            2
+          Transfer Type            Bulk
+          Synch Type               None
+          Usage Type               Data
+        wMaxPacketSize     0x0040  1x 64 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
+
+$ lsusb
+Bus 002 Device 005: ID 046d:c31c Logitech, Inc. Keyboard K120
+Bus 002 Device 002: ID 8087:8000 Intel Corp.
+Bus 002 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub
+Bus 001 Device 097: ID 239a:8029
+Bus 001 Device 002: ID 8087:8008 Intel Corp.
+Bus 001 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub
+Bus 004 Device 001: ID 1d6b:0003 Linux Foundation 3.0 root hub
+Bus 003 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub
+
+Note: esptool.py chip_id does not detect device

info/ubuntu/rak4631_5005.txt

@@ -0,0 +1,148 @@
+
+Note: Device has Meshtastic firmware installed.
+
+$ ls -al /dev/ttyACM*
+crw-rw---- 1 root dialout 166, 0 Jan 29 21:44 /dev/ttyACM0
+
+$ lsusb -d 239a: -v
+
+Bus 001 Device 098: ID 239a:0029
+Couldn't open device, some information will be missing
+Device Descriptor:
+  bLength                18
+  bDescriptorType         1
+  bcdUSB               2.00
+  bDeviceClass          239 Miscellaneous Device
+  bDeviceSubClass         2
+  bDeviceProtocol         1 Interface Association
+  bMaxPacketSize0        64
+  idVendor           0x239a
+  idProduct          0x0029
+  bcdDevice            1.00
+  iManufacturer           1
+  iProduct                2
+  iSerial                 3
+  bNumConfigurations      1
+  Configuration Descriptor:
+    bLength                 9
+    bDescriptorType         2
+    wTotalLength       0x0062
+    bNumInterfaces          3
+    bConfigurationValue     1
+    iConfiguration          0
+    bmAttributes         0xa0
+      (Bus Powered)
+      Remote Wakeup
+    MaxPower              100mA
+    Interface Association:
+      bLength                 8
+      bDescriptorType        11
+      bFirstInterface         0
+      bInterfaceCount         2
+      bFunctionClass          2 Communications
+      bFunctionSubClass       2 Abstract (modem)
+      bFunctionProtocol       0
+      iFunction               0
+    Interface Descriptor:
+      bLength                 9
+      bDescriptorType         4
+      bInterfaceNumber        0
+      bAlternateSetting       0
+      bNumEndpoints           1
+      bInterfaceClass         2 Communications
+      bInterfaceSubClass      2 Abstract (modem)
+      bInterfaceProtocol      0
+      iInterface              4
+      CDC Header:
+        bcdCDC               1.20
+      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     0x81  EP 1 IN
+        bmAttributes            3
+          Transfer Type            Interrupt
+          Synch Type               None
+          Usage Type               Data
+        wMaxPacketSize     0x0008  1x 8 bytes
+        bInterval              16
+    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     0x0040  1x 64 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
+    Interface Descriptor:
+      bLength                 9
+      bDescriptorType         4
+      bInterfaceNumber        2
+      bAlternateSetting       0
+      bNumEndpoints           2
+      bInterfaceClass         8 Mass Storage
+      bInterfaceSubClass      6 SCSI
+      bInterfaceProtocol     80 Bulk-Only
+      iInterface              5
+      Endpoint Descriptor:
+        bLength                 7
+        bDescriptorType         5
+        bEndpointAddress     0x03  EP 3 OUT
+        bmAttributes            2
+          Transfer Type            Bulk
+          Synch Type               None
+          Usage Type               Data
+        wMaxPacketSize     0x0040  1x 64 bytes
+        bInterval               0
+      Endpoint Descriptor:
+        bLength                 7
+        bDescriptorType         5
+        bEndpointAddress     0x83  EP 3 IN
+        bmAttributes            2
+          Transfer Type            Bulk
+          Synch Type               None
+          Usage Type               Data
+        wMaxPacketSize     0x0040  1x 64 bytes
+        bInterval               0
+
+$ lsusb
+Bus 002 Device 005: ID 046d:c31c Logitech, Inc. Keyboard K120
+Bus 002 Device 002: ID 8087:8000 Intel Corp.
+Bus 002 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub
+Bus 001 Device 098: ID 239a:0029
+Bus 001 Device 002: ID 8087:8008 Intel Corp.
+Bus 001 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub
+Bus 004 Device 001: ID 1d6b:0003 Linux Foundation 3.0 root hub
+Bus 003 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub
+
+Note: esptool.py chip_id does not detect device

info/ubuntu/readme.txt

@@ -0,0 +1 @@
+info run on ubuntu

info/ubuntu/tbeam.txt

@@ -0,0 +1,94 @@
+Run on Ubuntu 20
+
+Command:
+ lsusb -d 1a86: -v
+
+Output:
+Bus 001 Device 096: ID 1a86:55d4 QinHeng Electronics 
+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/ubuntu/techo.txt

@@ -0,0 +1,141 @@
+
+$ lsusb
+Bus 002 Device 005: ID 046d:c31c Logitech, Inc. Keyboard K120
+Bus 002 Device 002: ID 8087:8000 Intel Corp.
+Bus 002 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub
+Bus 001 Device 107: ID 239a:0029
+Bus 001 Device 002: ID 8087:8008 Intel Corp.
+Bus 001 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub
+Bus 004 Device 001: ID 1d6b:0003 Linux Foundation 3.0 root hub
+Bus 003 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub
+
+$ lsusb -d 239a: -v
+
+Bus 001 Device 107: ID 239a:0029
+Couldn't open device, some information will be missing
+Device Descriptor:
+  bLength                18
+  bDescriptorType         1
+  bcdUSB               2.00
+  bDeviceClass          239 Miscellaneous Device
+  bDeviceSubClass         2
+  bDeviceProtocol         1 Interface Association
+  bMaxPacketSize0        64
+  idVendor           0x239a
+  idProduct          0x0029
+  bcdDevice            1.00
+  iManufacturer           1
+  iProduct                2
+  iSerial                 3
+  bNumConfigurations      1
+  Configuration Descriptor:
+    bLength                 9
+    bDescriptorType         2
+    wTotalLength       0x0062
+    bNumInterfaces          3
+    bConfigurationValue     1
+    iConfiguration          0
+    bmAttributes         0xa0
+      (Bus Powered)
+      Remote Wakeup
+    MaxPower              100mA
+    Interface Association:
+      bLength                 8
+      bDescriptorType        11
+      bFirstInterface         0
+      bInterfaceCount         2
+      bFunctionClass          2 Communications
+      bFunctionSubClass       2 Abstract (modem)
+      bFunctionProtocol       0
+      iFunction               0
+    Interface Descriptor:
+      bLength                 9
+      bDescriptorType         4
+      bInterfaceNumber        0
+      bAlternateSetting       0
+      bNumEndpoints           1
+      bInterfaceClass         2 Communications
+      bInterfaceSubClass      2 Abstract (modem)
+      bInterfaceProtocol      0
+      iInterface              4
+      CDC Header:
+        bcdCDC               1.20
+      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     0x81  EP 1 IN
+        bmAttributes            3
+          Transfer Type            Interrupt
+          Synch Type               None
+          Usage Type               Data
+        wMaxPacketSize     0x0008  1x 8 bytes
+        bInterval              16
+    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     0x0040  1x 64 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
+    Interface Descriptor:
+      bLength                 9
+      bDescriptorType         4
+      bInterfaceNumber        2
+      bAlternateSetting       0
+      bNumEndpoints           2
+      bInterfaceClass         8 Mass Storage
+      bInterfaceSubClass      6 SCSI
+      bInterfaceProtocol     80 Bulk-Only
+      iInterface              5
+      Endpoint Descriptor:
+        bLength                 7
+        bDescriptorType         5
+        bEndpointAddress     0x03  EP 3 OUT
+        bmAttributes            2
+          Transfer Type            Bulk
+          Synch Type               None
+          Usage Type               Data
+        wMaxPacketSize     0x0040  1x 64 bytes
+        bInterval               0
+      Endpoint Descriptor:
+        bLength                 7
+        bDescriptorType         5
+        bEndpointAddress     0x83  EP 3 IN
+        bmAttributes            2
+          Transfer Type            Bulk
+          Synch Type               None
+          Usage Type               Data
+        wMaxPacketSize     0x0040  1x 64 bytes
+        bInterval               0

info/ubuntu/tlora.txt

@@ -0,0 +1,107 @@
+
+Run on Ubuntu 20
+
+Note: Device has Meshtastic firmware installed
+
+
+$ lsusb
+Bus 002 Device 005: ID 046d:c31c Logitech, Inc. Keyboard K120
+Bus 002 Device 002: ID 8087:8000 Intel Corp.
+Bus 002 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub
+Bus 001 Device 099: ID 1a86:55d4 QinHeng Electronics
+Bus 001 Device 002: ID 8087:8008 Intel Corp.
+Bus 001 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub
+Bus 004 Device 001: ID 1d6b:0003 Linux Foundation 3.0 root hub
+Bus 003 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub
+
+$ lsusb -d 1a86: -v
+
+Bus 001 Device 099: 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                 0
+  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/heltec.txt

@@ -0,0 +1,106 @@
+Run from Windows 10
+
+Might work... (nope)
+ Get-PnpDevice -Class 'USB' -PresentOnly | Format-List
+
+
+> Get-PnpDevice -PresentOnly | Format-List > b
+> Compare-Object (get-content a) (Get-Content b)
+
+InputObject                                                                                              SideIndicator
+-----------                                                                                              -------------
+Caption                     : CP2102 USB to UART Bridge Controller                                       <=
+Description                 : CP2102 USB to UART Bridge Controller                                       <=
+Name                        : CP2102 USB to UART Bridge Controller                                       <=
+Status                      : Error                                                                      <=
+ConfigManagerErrorCode      : CM_PROB_FAILED_INSTALL                                                     <=
+DeviceID                    : USB\VID_10C4&PID_EA60\0001                                                 <=
+PNPDeviceID                 : USB\VID_10C4&PID_EA60\0001                                                 <=
+CompatibleID                : {USB\Class_FF&SubClass_00&Prot_00, USB\Class_FF&SubClass_00, USB\Class_FF} <=
+HardwareID                  : {USB\VID_10C4&PID_EA60&REV_0100, USB\VID_10C4&PID_EA60}                    <=
+FriendlyName                : CP2102 USB to UART Bridge Controller                                       <=
+InstanceId                  : USB\VID_10C4&PID_EA60\0001                                                 <=
+Problem                     : CM_PROB_FAILED_INSTALL                                                     <=
+ClassGuid                   :                                                                            <=
+Manufacturer                :                                                                            <=
+PNPClass                    :                                                                            <=
+Class                       :                                                                            <=
+Service                     :                                                                            <=
+InstallDate                 :                                                                            <=
+Availability                :                                                                            <=
+ConfigManagerUserConfig     : False                                                                      <=
+CreationClassName           : Win32_PnPEntity                                                            <=
+ErrorCleared                :                                                                            <=
+ErrorDescription            :                                                                            <=
+LastErrorCode               :                                                                            <=
+PowerManagementCapabilities :                                                                            <=
+PowerManagementSupported    :                                                                            <=
+StatusInfo                  :                                                                            <=
+SystemCreationClassName     : Win32_ComputerSystem                                                       <=
+SystemName                  : DESKTOP-FRFQN8H                                                            <=
+Present                     : True                                                                       <=
+PSComputerName              :                                                                            <=
+ProblemDescription          :                                                                            <=
+                                                                                                         <=
+
+> Get-PnpDevice -DeviceID 'USB\VID_10C4&PID_EA60\0001'
+
+Status     Class           FriendlyName                                                                     InstanceId
+------     -----           ------------                                                                     ----------
+Error                      CP2102 USB to UART Bridge Controller                                             USB\VID_...
+
+
+> Get-PnpDevice -PresentOnly -DeviceID 'USB\VID_10C4&PID_EA60\0001'
+Get-PnpDevice : No matching Win32_PnPEntity objects found by CIM query for instances of the ROOT\cimv2\Win32_PnPEntity
+class on the  CIM server: SELECT * FROM Win32_PnPEntity  WHERE ((DeviceId LIKE 'USB\\VID[_]10C4&PID[_]EA60\\0001'))
+AND ((Present = TRUE)). Verify query parameters and retry.
+At line:1 char:1
++ Get-PnpDevice -PresentOnly -DeviceID 'USB\VID_10C4&PID_EA60\0001'
++ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    + CategoryInfo          : ObjectNotFound: (Win32_PnPEntity:String) [Get-PnpDevice], CimJobException
+    + FullyQualifiedErrorId : CmdletizationQuery_NotFound,Get-PnpDevice
+
+> Get-PnpDevice -PresentOnly -DeviceID 'USB\VID_10C4&PID_EA60\0001'
+
+Status     Class           FriendlyName                                                                     InstanceId
+------     -----           ------------                                                                     ----------
+Error                      CP2102 USB to UART Bridge Controller                                             USB\VID_...
+
+
+
+If need to install driver
+Get-PnpDevice -DeviceID 'USB\VID_10C4&PID_EA60\0001' | Format-List
+
+
+Caption                     : CP2102 USB to UART Bridge Controller
+Description                 : CP2102 USB to UART Bridge Controller
+InstallDate                 :
+Name                        : CP2102 USB to UART Bridge Controller
+Status                      : Error
+Availability                :
+ConfigManagerErrorCode      : CM_PROB_FAILED_INSTALL
+ConfigManagerUserConfig     : False
+CreationClassName           : Win32_PnPEntity
+DeviceID                    : USB\VID_10C4&PID_EA60\0001
+ErrorCleared                :
+ErrorDescription            :
+LastErrorCode               :
+PNPDeviceID                 : USB\VID_10C4&PID_EA60\0001
+PowerManagementCapabilities :
+PowerManagementSupported    :
+StatusInfo                  :
+SystemCreationClassName     : Win32_ComputerSystem
+SystemName                  : DESKTOP-FRFQN8H
+ClassGuid                   :
+CompatibleID                : {USB\Class_FF&SubClass_00&Prot_00, USB\Class_FF&SubClass_00, USB\Class_FF}
+HardwareID                  : {USB\VID_10C4&PID_EA60&REV_0100, USB\VID_10C4&PID_EA60}
+Manufacturer                :
+PNPClass                    :
+Present                     : True
+Service                     :
+PSComputerName              :
+Class                       :
+FriendlyName                : CP2102 USB to UART Bridge Controller
+InstanceId                  : USB\VID_10C4&PID_EA60\0001
+Problem                     : CM_PROB_FAILED_INSTALL
+ProblemDescription          :

info/windows/nano_g1.txt

@@ -0,0 +1,39 @@
+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          :                                                                            =>
+                                                                                                         =>

info/windows/rak4631_19003.txt

@@ -0,0 +1,78 @@
+Run from Windows 10
+
+> Get-PnpDevice -PresentOnly | Format-List >a
+> Get-PnpDevice -PresentOnly | Format-List >b
+> Compare-Object (get-content a) (Get-Content b)
+
+InputObject                                                                                                        Side
+                                                                                                                   Indi
+                                                                                                                   cato
+                                                                                                                   r
+-----------                                                                                                        ----
+Caption                     : USB Serial Device (COM4)                                                             =>
+Description                 : USB Serial Device                                                                    =>
+Name                        : USB Serial Device (COM4)                                                             =>
+DeviceID                    : USB\VID_239A&PID_8029&MI_00\6&E8876D1&0&0000                                         =>
+PNPDeviceID                 : USB\VID_239A&PID_8029&MI_00\6&E8876D1&0&0000                                         =>
+ClassGuid                   : {4d36e978-e325-11ce-bfc1-08002be10318}                                               =>
+CompatibleID                : {USB\Class_02&SubClass_02&Prot_00, USB\Class_02&SubClass_02, USB\Class_02}           =>
+HardwareID                  : {USB\VID_239A&PID_8029&REV_0100&MI_00, USB\VID_239A&PID_8029&MI_00}                  =>
+PNPClass                    : Ports                                                                                =>
+Service                     : usbser                                                                               =>
+Class                       : Ports                                                                                =>
+FriendlyName                : USB Serial Device (COM4)                                                             =>
+InstanceId                  : USB\VID_239A&PID_8029&MI_00\6&E8876D1&0&0000                                         =>
+Caption                     : USB Composite Device                                                                 =>
+Description                 : USB Composite Device                                                                 =>
+Name                        : USB Composite Device                                                                 =>
+DeviceID                    : USB\VID_239A&PID_8029\E6CF9502B1D410D8                                               =>
+PNPDeviceID                 : USB\VID_239A&PID_8029\E6CF9502B1D410D8                                               =>
+ClassGuid                   : {36fc9e60-c465-11cf-8056-444553540000}                                               =>
+CompatibleID                : {USB\DevClass_00&SubClass_00&Prot_00, USB\DevClass_00&SubClass_00, USB\DevClass_00,  =>
+                              USB\COMPOSITE}                                                                       =>
+HardwareID                  : {USB\VID_239A&PID_8029&REV_0100, USB\VID_239A&PID_8029}                              =>
+Manufacturer                : (Standard USB Host Controller)                                                       =>
+PNPClass                    : USB                                                                                  =>
+Service                     : usbccgp                                                                              =>
+Class                       : USB                                                                                  =>
+FriendlyName                : USB Composite Device                                                                 =>
+InstanceId                  : USB\VID_239A&PID_8029\E6CF9502B1D410D8                                               =>
+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          :                                                                                      =>
+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                                                                      =>
+Manufacturer                : Microsoft                                                                            =>
+Present                     : True                                                                                 =>
+PSComputerName              :                                                                                      =>
+Problem                     : CM_PROB_NONE                                                                         =>
+ProblemDescription          :                                                                                      =>
+                                                                                                                   =>
+                                                                                                                   =>

info/windows/rak4631_5005.txt

@@ -0,0 +1,254 @@
+Run from Windows 10
+
+> Get-PnpDevice -PresentOnly | Format-List >a
+> Get-PnpDevice -PresentOnly | Format-List >b
+> Compare-Object (get-content a) (Get-Content b)
+
+In "boot" mode:
+
+InputObject
+-----------
+Caption                     : FTHR840BOOT
+Description                 : nRF UF2
+Name                        : FTHR840BOOT
+DeviceID                    : SWD\WPDBUSENUM\_??_USBSTOR#DISK&VEN_ADAFRUIT&PROD_NRF_UF2&REV_1.0#7&27E1626&0&D121BD1C90B
+                              93EA2&0#{53F56307-B6BF-11D0-94F2-00A0C91EFB8B}
+PNPDeviceID                 : SWD\WPDBUSENUM\_??_USBSTOR#DISK&VEN_ADAFRUIT&PROD_NRF_UF2&REV_1.0#7&27E1626&0&D121BD1C90B
+                              93EA2&0#{53F56307-B6BF-11D0-94F2-00A0C91EFB8B}
+ClassGuid                   : {eec5ad98-8080-425f-922a-dabf3de3f69a}
+CompatibleID                : {wpdbusenum\fs, SWD\Generic}
+Manufacturer                : Adafruit
+PNPClass                    : WPD
+Service                     : WUDFWpdFs
+Class                       : WPD
+FriendlyName                : FTHR840BOOT
+InstanceId                  : SWD\WPDBUSENUM\_??_USBSTOR#DISK&VEN_ADAFRUIT&PROD_NRF_UF2&REV_1.0#7&27E1626&0&D121BD1C90B
+                              93EA2&0#{53F56307-B6BF-11D0-94F2-00A0C91EFB8B}
+DeviceID                    : STORAGE\VOLUME\_??_USBSTOR#DISK&VEN_ADAFRUIT&PROD_NRF_UF2&REV_1.0#7&27E1626&0&D121BD1C90B
+                              93EA2&0#{53F56307-B6BF-11D0-94F2-00A0C91EFB8B}
+PNPDeviceID                 : STORAGE\VOLUME\_??_USBSTOR#DISK&VEN_ADAFRUIT&PROD_NRF_UF2&REV_1.0#7&27E1626&0&D121BD1C90B
+                              93EA2&0#{53F56307-B6BF-11D0-94F2-00A0C91EFB8B}
+InstanceId                  : STORAGE\VOLUME\_??_USBSTOR#DISK&VEN_ADAFRUIT&PROD_NRF_UF2&REV_1.0#7&27E1626&0&D121BD1C90B
+                              93EA2&0#{53F56307-B6BF-11D0-94F2-00A0C91EFB8B}
+Caption                     : USB Mass Storage Device
+Description                 : USB Mass Storage Device
+Name                        : USB Mass Storage Device
+DeviceID                    : USB\VID_239A&PID_0029&MI_02\6&175793A&0&0002
+PNPDeviceID                 : USB\VID_239A&PID_0029&MI_02\6&175793A&0&0002
+CompatibleID                : {USB\Class_08&SubClass_06&Prot_50, USB\Class_08&SubClass_06, USB\Class_08}
+HardwareID                  : {USB\VID_239A&PID_0029&REV_0100&MI_02, USB\VID_239A&PID_0029&MI_02}
+Manufacturer                : Compatible USB storage device
+Service                     : USBSTOR
+FriendlyName                : USB Mass Storage Device
+InstanceId                  : USB\VID_239A&PID_0029&MI_02\6&175793A&0&0002
+Caption                     : USB Serial Device (COM5)
+Description                 : USB Serial Device
+Name                        : USB Serial Device (COM5)
+DeviceID                    : USB\VID_239A&PID_0029&MI_00\6&175793A&0&0000
+PNPDeviceID                 : USB\VID_239A&PID_0029&MI_00\6&175793A&0&0000
+ClassGuid                   : {4d36e978-e325-11ce-bfc1-08002be10318}
+CompatibleID                : {USB\Class_02&SubClass_02&Prot_00, USB\Class_02&SubClass_02, USB\Class_02}
+HardwareID                  : {USB\VID_239A&PID_0029&REV_0100&MI_00, USB\VID_239A&PID_0029&MI_00}
+PNPClass                    : Ports
+Service                     : usbser
+Class                       : Ports
+FriendlyName                : USB Serial Device (COM5)
+InstanceId                  : USB\VID_239A&PID_0029&MI_00\6&175793A&0&0000
+DeviceID                    : USB\VID_239A&PID_0029\D121BD1C90B93EA2
+PNPDeviceID                 : USB\VID_239A&PID_0029\D121BD1C90B93EA2
+ClassGuid                   : {36fc9e60-c465-11cf-8056-444553540000}
+HardwareID                  : {USB\VID_239A&PID_0029&REV_0100, USB\VID_239A&PID_0029}
+PNPClass                    : USB
+Class                       : USB
+InstanceId                  : USB\VID_239A&PID_0029\D121BD1C90B93EA2
+Caption                     : USB Composite Device
+Description                 : USB Composite Device
+Name                        : USB Composite Device
+ClassGuid                   : {36fc9e60-c465-11cf-8056-444553540000}
+CompatibleID                : {USB\DevClass_00&SubClass_00&Prot_00, USB\DevClass_00&SubClass_00, USB\DevClass_00,
+                              USB\COMPOSITE}
+Manufacturer                : (Standard USB Host Controller)
+PNPClass                    : USB
+Service                     : usbccgp
+Class                       : USB
+FriendlyName                : USB Composite Device
+Caption                     : Volume
+Description                 : Volume
+Name                        : Volume
+ClassGuid                   : {71a27cdd-812a-11d0-bec7-08002be2092f}
+HardwareID                  : {STORAGE\Volume}
+PNPClass                    : Volume
+Service                     : volume
+Class                       : Volume
+FriendlyName                : Volume
+HardwareID                  :
+Caption                     : Adafruit nRF UF2 USB Device
+Name                        : Adafruit nRF UF2 USB Device
+DeviceID                    : USBSTOR\DISK&VEN_ADAFRUIT&PROD_NRF_UF2&REV_1.0\7&27E1626&0&D121BD1C90B93EA2&0
+PNPDeviceID                 : USBSTOR\DISK&VEN_ADAFRUIT&PROD_NRF_UF2&REV_1.0\7&27E1626&0&D121BD1C90B93EA2&0
+CompatibleID                : {USBSTOR\Disk, USBSTOR\RAW, GenDisk}
+HardwareID                  : {USBSTOR\DiskAdafruitnRF_UF2_________1.0_, USBSTOR\DiskAdafruitnRF_UF2_________,
+                              USBSTOR\DiskAdafruit, USBSTOR\AdafruitnRF_UF2_________1...}
+FriendlyName                : Adafruit nRF UF2 USB Device
+InstanceId                  : USBSTOR\DISK&VEN_ADAFRUIT&PROD_NRF_UF2&REV_1.0\7&27E1626&0&D121BD1C90B93EA2&0
+Description                 : Disk drive
+ClassGuid                   : {4d36e967-e325-11ce-bfc1-08002be10318}
+Manufacturer                : (Standard disk drives)
+PNPClass                    : DiskDrive
+Service                     : disk
+Class                       : DiskDrive
+CompatibleID                :
+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          :
+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          :
+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          :
+
+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
+Manufacturer                : Microsoft
+Present                     : True
+PSComputerName              :
+Problem                     : CM_PROB_NONE
+ProblemDescription          :
+
+
+
+When you press the RST to load Meshtastic:
+
+> Get-PnpDevice -PresentOnly | Format-List >b
+> Compare-Object (get-content a) (Get-Content b)
+
+InputObject                                                                                                        Side
+                                                                                                                   Indi
+                                                                                                                   cato
+                                                                                                                   r
+-----------                                                                                                        ----
+DeviceID                    : USB\VID_239A&PID_8029\D121BD1C90B93EA2                                               =>
+PNPDeviceID                 : USB\VID_239A&PID_8029\D121BD1C90B93EA2                                               =>
+HardwareID                  : {USB\VID_239A&PID_8029&REV_0100, USB\VID_239A&PID_8029}                              =>
+InstanceId                  : USB\VID_239A&PID_8029\D121BD1C90B93EA2                                               =>
+Caption                     : USB Composite Device                                                                 =>
+Description                 : USB Composite Device                                                                 =>
+Name                        : USB Composite Device                                                                 =>
+ClassGuid                   : {36fc9e60-c465-11cf-8056-444553540000}                                               =>
+CompatibleID                : {USB\DevClass_00&SubClass_00&Prot_00, USB\DevClass_00&SubClass_00, USB\DevClass_00,  =>
+                              USB\COMPOSITE}                                                                       =>
+Manufacturer                : (Standard USB Host Controller)                                                       =>
+PNPClass                    : USB                                                                                  =>
+Service                     : usbccgp                                                                              =>
+Class                       : USB                                                                                  =>
+FriendlyName                : USB Composite Device                                                                 =>
+Caption                     : USB Serial Device (COM6)                                                             =>
+Description                 : USB Serial Device                                                                    =>
+Name                        : USB Serial Device (COM6)                                                             =>
+DeviceID                    : USB\VID_239A&PID_8029&MI_00\6&39B279E2&0&0000                                        =>
+PNPDeviceID                 : USB\VID_239A&PID_8029&MI_00\6&39B279E2&0&0000                                        =>
+ClassGuid                   : {4d36e978-e325-11ce-bfc1-08002be10318}                                               =>
+CompatibleID                : {USB\Class_02&SubClass_02&Prot_00, USB\Class_02&SubClass_02, USB\Class_02}           =>
+HardwareID                  : {USB\VID_239A&PID_8029&REV_0100&MI_00, USB\VID_239A&PID_8029&MI_00}                  =>
+PNPClass                    : Ports                                                                                =>
+Service                     : usbser                                                                               =>
+Class                       : Ports                                                                                =>
+FriendlyName                : USB Serial Device (COM6)                                                             =>
+InstanceId                  : USB\VID_239A&PID_8029&MI_00\6&39B279E2&0&0000                                        =>
+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          :                                                                                      =>
+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                                                                      =>
+Manufacturer                : Microsoft                                                                            =>
+Present                     : True                                                                                 =>
+PSComputerName              :                                                                                      =>
+Problem                     : CM_PROB_NONE                                                                         =>
+ProblemDescription          :                                                                                      =>
+                                                                                                                   =>
+

info/windows/tbeam.txt

@@ -0,0 +1,42 @@
+Run from Windows 10
+
+> 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 (COM7)                                          =>
+Description                 : USB-Enhanced-SERIAL CH9102                                                 =>
+Name                        : USB-Enhanced-SERIAL CH9102 (COM7)                                          =>
+DeviceID                    : USB\VID_1A86&PID_55D4\5323005057                                           =>
+PNPDeviceID                 : USB\VID_1A86&PID_55D4\5323005057                                           =>
+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 (COM7)                                          =>
+InstanceId                  : USB\VID_1A86&PID_55D4\5323005057                                           =>
+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          :                                                                            =>
+                                                                                                         =>
+

info/windows/techo.txt

@@ -0,0 +1,302 @@
+PS > Get-PnpDevice -PresentOnly | Format-List >a
+PS > Get-PnpDevice -PresentOnly | Format-List >b
+PS > Compare-Object (get-content a) (get-content b)
+
+
+Note: Not in boot mode
+
+InputObject                                                                                                        Side
+                                                                                                                   Indi
+                                                                                                                   cato
+                                                                                                                   r
+-----------                                                                                                        ----
+DeviceID                    : USB\VID_239A&PID_4405\D02012062C578951                                               =>
+PNPDeviceID                 : USB\VID_239A&PID_4405\D02012062C578951                                               =>
+HardwareID                  : {USB\VID_239A&PID_4405&REV_0100, USB\VID_239A&PID_4405}                              =>
+InstanceId                  : USB\VID_239A&PID_4405\D02012062C578951                                               =>
+Caption                     : USB Composite Device                                                                 =>
+Description                 : USB Composite Device                                                                 =>
+Name                        : USB Composite Device                                                                 =>
+ClassGuid                   : {36fc9e60-c465-11cf-8056-444553540000}                                               =>
+CompatibleID                : {USB\DevClass_00&SubClass_00&Prot_00, USB\DevClass_00&SubClass_00, USB\DevClass_00,  =>
+                              USB\COMPOSITE}                                                                       =>
+Manufacturer                : (Standard USB Host Controller)                                                       =>
+PNPClass                    : USB                                                                                  =>
+Service                     : usbccgp                                                                              =>
+Class                       : USB                                                                                  =>
+FriendlyName                : USB Composite Device                                                                 =>
+Caption                     : USB Serial Device (COM10)                                                            =>
+Description                 : USB Serial Device                                                                    =>
+Name                        : USB Serial Device (COM10)                                                            =>
+DeviceID                    : USB\VID_239A&PID_4405&MI_00\6&1B68A3E6&0&0000                                        =>
+PNPDeviceID                 : USB\VID_239A&PID_4405&MI_00\6&1B68A3E6&0&0000                                        =>
+ClassGuid                   : {4d36e978-e325-11ce-bfc1-08002be10318}                                               =>
+CompatibleID                : {USB\Class_02&SubClass_02&Prot_00, USB\Class_02&SubClass_02, USB\Class_02}           =>
+HardwareID                  : {USB\VID_239A&PID_4405&REV_0100&MI_00, USB\VID_239A&PID_4405&MI_00}                  =>
+PNPClass                    : Ports                                                                                =>
+Service                     : usbser                                                                               =>
+Class                       : Ports                                                                                =>
+FriendlyName                : USB Serial Device (COM10)                                                            =>
+InstanceId                  : USB\VID_239A&PID_4405&MI_00\6&1B68A3E6&0&0000                                        =>
+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          :                                                                                      =>
+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                                                                      =>
+Manufacturer                : Microsoft                                                                            =>
+Present                     : True                                                                                 =>
+PSComputerName              :                                                                                      =>
+Problem                     : CM_PROB_NONE                                                                         =>
+ProblemDescription          :                                                                                      =>
+                                                                                                                   =>
+
+in boot mode
+
+PS > Get-PnpDevice -PresentOnly | Format-List >c
+PS > Compare-Object (get-content a) (get-content c)
+
+InputObject
+-----------
+Caption                     : Adafruit nRF UF2 USB Device
+Name                        : Adafruit nRF UF2 USB Device
+DeviceID                    : USBSTOR\DISK&VEN_ADAFRUIT&PROD_NRF_UF2&REV_1.0\7&10304CB2&0&D02012062C578951&0
+PNPDeviceID                 : USBSTOR\DISK&VEN_ADAFRUIT&PROD_NRF_UF2&REV_1.0\7&10304CB2&0&D02012062C578951&0
+CompatibleID                : {USBSTOR\Disk, USBSTOR\RAW, GenDisk}
+HardwareID                  : {USBSTOR\DiskAdafruitnRF_UF2_________1.0_, USBSTOR\DiskAdafruitnRF_UF2_________,
+                              USBSTOR\DiskAdafruit, USBSTOR\AdafruitnRF_UF2_________1...}
+FriendlyName                : Adafruit nRF UF2 USB Device
+InstanceId                  : USBSTOR\DISK&VEN_ADAFRUIT&PROD_NRF_UF2&REV_1.0\7&10304CB2&0&D02012062C578951&0
+Caption                     : USB Mass Storage Device
+Description                 : USB Mass Storage Device
+Name                        : USB Mass Storage Device
+DeviceID                    : USB\VID_239A&PID_0029&MI_02\6&2AE8D65&0&0002
+PNPDeviceID                 : USB\VID_239A&PID_0029&MI_02\6&2AE8D65&0&0002
+CompatibleID                : {USB\Class_08&SubClass_06&Prot_50, USB\Class_08&SubClass_06, USB\Class_08}
+HardwareID                  : {USB\VID_239A&PID_0029&REV_0100&MI_02, USB\VID_239A&PID_0029&MI_02}
+Manufacturer                : Compatible USB storage device
+Service                     : USBSTOR
+FriendlyName                : USB Mass Storage Device
+InstanceId                  : USB\VID_239A&PID_0029&MI_02\6&2AE8D65&0&0002
+Caption                     : USB Serial Device (COM11)
+Description                 : USB Serial Device
+Name                        : USB Serial Device (COM11)
+DeviceID                    : USB\VID_239A&PID_0029&MI_00\6&2AE8D65&0&0000
+PNPDeviceID                 : USB\VID_239A&PID_0029&MI_00\6&2AE8D65&0&0000
+ClassGuid                   : {4d36e978-e325-11ce-bfc1-08002be10318}
+CompatibleID                : {USB\Class_02&SubClass_02&Prot_00, USB\Class_02&SubClass_02, USB\Class_02}
+HardwareID                  : {USB\VID_239A&PID_0029&REV_0100&MI_00, USB\VID_239A&PID_0029&MI_00}
+PNPClass                    : Ports
+Service                     : usbser
+Class                       : Ports
+FriendlyName                : USB Serial Device (COM11)
+InstanceId                  : USB\VID_239A&PID_0029&MI_00\6&2AE8D65&0&0000
+ClassGuid                   : {36fc9e60-c465-11cf-8056-444553540000}
+PNPClass                    : USB
+Class                       : USB
+Caption                     : USB Composite Device
+Description                 : USB Composite Device
+Name                        : USB Composite Device
+DeviceID                    : USB\VID_239A&PID_0029\D02012062C578951
+PNPDeviceID                 : USB\VID_239A&PID_0029\D02012062C578951
+ClassGuid                   : {36fc9e60-c465-11cf-8056-444553540000}
+CompatibleID                : {USB\DevClass_00&SubClass_00&Prot_00, USB\DevClass_00&SubClass_00, USB\DevClass_00,
+                              USB\COMPOSITE}
+HardwareID                  : {USB\VID_239A&PID_0029&REV_0100, USB\VID_239A&PID_0029}
+Manufacturer                : (Standard USB Host Controller)
+PNPClass                    : USB
+Service                     : usbccgp
+Class                       : USB
+FriendlyName                : USB Composite Device
+InstanceId                  : USB\VID_239A&PID_0029\D02012062C578951
+DeviceID                    : STORAGE\VOLUME\_??_USBSTOR#DISK&VEN_ADAFRUIT&PROD_NRF_UF2&REV_1.0#7&10304CB2&0&D02012062C
+                              578951&0#{53F56307-B6BF-11D0-94F2-00A0C91EFB8B}
+PNPDeviceID                 : STORAGE\VOLUME\_??_USBSTOR#DISK&VEN_ADAFRUIT&PROD_NRF_UF2&REV_1.0#7&10304CB2&0&D02012062C
+                              578951&0#{53F56307-B6BF-11D0-94F2-00A0C91EFB8B}
+InstanceId                  : STORAGE\VOLUME\_??_USBSTOR#DISK&VEN_ADAFRUIT&PROD_NRF_UF2&REV_1.0#7&10304CB2&0&D02012062C
+                              578951&0#{53F56307-B6BF-11D0-94F2-00A0C91EFB8B}
+Caption                     : Volume
+Description                 : Volume
+Name                        : Volume
+ClassGuid                   : {71a27cdd-812a-11d0-bec7-08002be2092f}
+HardwareID                  : {STORAGE\Volume}
+PNPClass                    : Volume
+Service                     : volume
+Class                       : Volume
+FriendlyName                : Volume
+Description                 : Disk drive
+ClassGuid                   : {4d36e967-e325-11ce-bfc1-08002be10318}
+Manufacturer                : (Standard disk drives)
+PNPClass                    : DiskDrive
+Service                     : disk
+Class                       : DiskDrive
+Caption                     : TECHOBOOT
+Description                 : nRF UF2
+Name                        : TECHOBOOT
+DeviceID                    : SWD\WPDBUSENUM\_??_USBSTOR#DISK&VEN_ADAFRUIT&PROD_NRF_UF2&REV_1.0#7&10304CB2&0&D02012062C
+                              578951&0#{53F56307-B6BF-11D0-94F2-00A0C91EFB8B}
+PNPDeviceID                 : SWD\WPDBUSENUM\_??_USBSTOR#DISK&VEN_ADAFRUIT&PROD_NRF_UF2&REV_1.0#7&10304CB2&0&D02012062C
+                              578951&0#{53F56307-B6BF-11D0-94F2-00A0C91EFB8B}
+ClassGuid                   : {eec5ad98-8080-425f-922a-dabf3de3f69a}
+CompatibleID                : {wpdbusenum\fs, SWD\Generic}
+HardwareID                  :
+Manufacturer                : Adafruit
+PNPClass                    : WPD
+Service                     : WUDFWpdFs
+Class                       : WPD
+FriendlyName                : TECHOBOOT
+InstanceId                  : SWD\WPDBUSENUM\_??_USBSTOR#DISK&VEN_ADAFRUIT&PROD_NRF_UF2&REV_1.0#7&10304CB2&0&D02012062C
+                              578951&0#{53F56307-B6BF-11D0-94F2-00A0C91EFB8B}
+CompatibleID                :
+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          :
+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          :
+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          :
+
+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
+Manufacturer                : Microsoft
+Present                     : True
+PSComputerName              :
+Problem                     : CM_PROB_NONE
+ProblemDescription          :
+
+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          :
+
+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
+Manufacturer                : Microsoft
+Present                     : True
+PSComputerName              :
+Problem                     : CM_PROB_NONE
+ProblemDescription          :
+
+
+
+
+
+PS > Get-Volume
+
+DriveLetter FriendlyName FileSystemType DriveType HealthStatus OperationalStatus SizeRemaining     Size
+----------- ------------ -------------- --------- ------------ ----------------- -------------     ----
+            Recovery     NTFS           Fixed     Healthy      OK                    301.99 MB   854 MB
+C                        NTFS           Fixed     Healthy      OK                      22.3 GB 56.67 GB
+D           TECHOBOOT    FAT            Removable Healthy      OK                     30.05 MB 31.88 MB
+

info/windows/tlora.txt

@@ -0,0 +1,41 @@
+Run from Windows 10
+
+PS > Get-PnpDevice -PresentOnly | Format-List > a
+PS > Get-PnpDevice -PresentOnly | Format-List > b
+PS > Compare-Object (get-content a) (Get-Content b)
+
+InputObject                                                                                              SideIndicator
+-----------                                                                                              -------------
+Caption                     : USB-Enhanced-SERIAL CH9102 (COM3)                                          <=
+Description                 : USB-Enhanced-SERIAL CH9102                                                 <=
+Name                        : USB-Enhanced-SERIAL CH9102 (COM3)                                          <=
+DeviceID                    : USB\VID_1A86&PID_55D4\5&27435A1F&0&1                                       <=
+PNPDeviceID                 : USB\VID_1A86&PID_55D4\5&27435A1F&0&1                                       <=
+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 (COM3)                                          <=
+InstanceId                  : USB\VID_1A86&PID_55D4\5&27435A1F&0&1                                       <=
+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          :                                                                            <=
+                                                                                                         <=

info/windows/tlora_v1.txt

@@ -0,0 +1,71 @@
+InputObject                                                                                              SideIn
+                                                                                                         dicato
+                                                                                                         r     
+-----------                                                                                              ------
+Caption                     : Silicon Labs CP210x USB to UART Bridge (COM5)                              =>    
+Description                 : Silicon Labs CP210x USB to UART Bridge                                     =>    
+Name                        : Silicon Labs CP210x USB to UART Bridge (COM5)                              =>    
+DeviceID                    : USB\VID_10C4&PID_EA60\0001                                                 =>    
+PNPDeviceID                 : USB\VID_10C4&PID_EA60\0001                                                 =>    
+HardwareID                  : {USB\VID_10C4&PID_EA60&REV_0100, USB\VID_10C4&PID_EA60}                    =>    
+Manufacturer                : Silicon Laboratories                                                       =>    
+Service                     : silabser                                                                   =>    
+FriendlyName                : Silicon Labs CP210x USB to UART Bridge (COM5)                              =>    
+InstanceId                  : USB\VID_10C4&PID_EA60\0001                                                 =>    
+CompatibleID                : {USB\Class_ff&SubClass_00&Prot_00, USB\Class_ff&SubClass_00, USB\Class_ff} =>    
+ClassGuid                   : {4d36e978-e325-11ce-bfc1-08002be10318}                                     =>    
+PNPClass                    : Ports                                                                      =>    
+Class                       : Ports                                                                      =>    
+InstallDate                 :                                                                            =>    
+Status                      : OK                                                                         =>    
+Availability                :                                                                            =>    
+ConfigManagerErrorCode      : CM_PROB_NONE                                                               =>    
+ConfigManagerUserConfig     : False                                                                      =>    
+CreationClassName           : Win32_PnPEntity                                                            =>    
+ErrorCleared                :                                                                            =>    
+ErrorDescription            :                                                                            =>    
+LastErrorCode               :                                                                            =>    
+PowerManagementCapabilities :                                                                            =>    
+PowerManagementSupported    :                                                                            =>    
+StatusInfo                  :                                                                            =>    
+SystemCreationClassName     : Win32_ComputerSystem                                                       =>    
+SystemName                  : MTI-ATPLT1                                                                 =>    
+Present                     : True                                                                       =>    
+PSComputerName              :                                                                            =>    
+Problem                     : CM_PROB_NONE                                                               =>    
+ProblemDescription          :                                                                            =>    
+Caption                     : Microsoft Serial Mouse                                                     =>    
+Description                 : Microsoft Serial Mouse                                                     =>    
+InstallDate                 :                                                                            =>    
+Name                        : Microsoft Serial Mouse                                                     =>    
+Status                      : Error                                                                      =>    
+Availability                :                                                                            =>    
+ConfigManagerErrorCode      : CM_PROB_FAILED_START                                                       =>    
+ConfigManagerUserConfig     : False                                                                      =>    
+CreationClassName           : Win32_PnPEntity                                                            =>    
+DeviceID                    : SILABENM\MOUSE\C&1EBF522&0&0000                                            =>    
+ErrorCleared                :                                                                            =>    
+ErrorDescription            :                                                                            =>    
+LastErrorCode               :                                                                            =>    
+PNPDeviceID                 : SILABENM\MOUSE\C&1EBF522&0&0000                                            =>    
+PowerManagementCapabilities :                                                                            =>    
+PowerManagementSupported    :                                                                            =>    
+StatusInfo                  :                                                                            =>    
+SystemCreationClassName     : Win32_ComputerSystem                                                       =>    
+SystemName                  : MTI-ATPLT1                                                                 =>    
+ClassGuid                   : {4d36e96f-e325-11ce-bfc1-08002be10318}                                     =>    
+CompatibleID                : {SERIAL_MOUSE}                                                             =>    
+HardwareID                  : {*PNP0F01}                                                                 =>    
+Manufacturer                : Microsoft                                                                  =>    
+PNPClass                    : Mouse                                                                      =>    
+Present                     : True                                                                       =>    
+Service                     : sermouse                                                                   =>    
+PSComputerName              :                                                                            =>    
+Class                       : Mouse                                                                      =>    
+FriendlyName                : Microsoft Serial Mouse                                                     =>    
+InstanceId                  : SILABENM\MOUSE\C&1EBF522&0&0000                                            =>    
+Problem                     : CM_PROB_FAILED_START                                                       =>    
+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/Meshtastic-python)
+Source code on [github](https://github.com/meshtastic/python)
 
 properties of SerialInterface:
 
-- radioConfig - Current radio configuration and device settings, if you write to this the new settings will be applied to
+- localConfig - 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,39 +62,48 @@ import os
 import platform
 import random
 import socket
-import sys
 import stat
+import sys
 import threading
-import traceback
 import time
+import traceback
 from datetime import datetime
 from typing import *
+
+import google.protobuf.json_format
 import serial
 import timeago
-import google.protobuf.json_format
-import pygatt
-from pubsub import pub
 from dotmap import DotMap
-from tabulate import tabulate
 from google.protobuf.json_format import MessageToJson
-from meshtastic.util import fixme, catchAndIgnore, stripnl, DeferredExecution, Timeout
+from pubsub import pub
+from tabulate import tabulate
+
+from meshtastic import (
+    admin_pb2,
+    apponly_pb2,
+    channel_pb2,
+    config_pb2,
+    mesh_pb2,
+    portnums_pb2,
+    remote_hardware_pb2,
+    telemetry_pb2,
+    util,
+)
 from meshtastic.node import Node
-from meshtastic import (mesh_pb2, portnums_pb2, apponly_pb2, admin_pb2,
-                        environmental_measurement_pb2, remote_hardware_pb2,
-                        channel_pb2, radioconfig_pb2, util)
+from meshtastic.util import DeferredExecution, Timeout, catchAndIgnore, fixme, stripnl
 
 # 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 shortend on the target"""
 
 BROADCAST_ADDR = "^all"
 """A special ID that means broadcast"""
 
-OUR_APP_VERSION = 20200
+OUR_APP_VERSION = 20300
 """The numeric buildnumber (shared with android apps) specifying the
    level of device code we are guaranteed to understand
 
@@ -106,6 +115,7 @@ 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
@@ -113,6 +123,7 @@ 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
@@ -129,6 +140,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}")
     try:
         asBytes = asDict["decoded"]["payload"]
         asDict["decoded"]["text"] = asBytes.decode("utf-8")
@@ -139,22 +151,30 @@ def _onTextReceive(iface, asDict):
 
 def _onPositionReceive(iface, asDict):
     """Special auto parsing for received messages"""
-    p = asDict["decoded"]["position"]
-    iface._fixupPosition(p)
-    # update node DB as needed
-    iface._getOrCreateByNum(asDict["from"])["position"] = p
+    logging.debug(f"in _onPositionReceive() asDict:{asDict}")
+    if "decoded" in asDict:
+        if "position" in asDict["decoded"] and "from" in asDict:
+            p = asDict["decoded"]["position"]
+            logging.debug(f"p:{p}")
+            p = iface._fixupPosition(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"""
-    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 uptodate in that table
-    iface.nodes[p["id"]] = n
-    _receiveInfoUpdate(iface, asDict)
+    logging.debug(f"in _onNodeInfoReceive() asDict:{asDict}")
+    if "decoded" 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 uptodate in that table
+            iface.nodes[p["id"]] = n
+            _receiveInfoUpdate(iface, asDict)
 
 
 def _receiveInfoUpdate(iface, asDict):
@@ -167,12 +187,25 @@ def _receiveInfoUpdate(iface, asDict):
 
 """Well known message payloads can register decoders for automatic protobuf parsing"""
 protocols = {
-    portnums_pb2.PortNum.TEXT_MESSAGE_APP: KnownProtocol("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.TEXT_MESSAGE_APP: KnownProtocol(
+        "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.ADMIN_APP: KnownProtocol("admin", admin_pb2.AdminMessage),
     portnums_pb2.PortNum.ROUTING_APP: KnownProtocol("routing", mesh_pb2.Routing),
-    portnums_pb2.PortNum.ENVIRONMENTAL_MEASUREMENT_APP: KnownProtocol("environmental", environmental_measurement_pb2.EnvironmentalMeasurement),
+    portnums_pb2.PortNum.TELEMETRY_APP: KnownProtocol(
+        "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
+    ),
 }

meshtastic/admin_pb2.py

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: admin.proto
-
+# source: meshtastic/admin.proto
+"""Generated protocol buffer code."""
 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
@@ -11,195 +12,45 @@ from google.protobuf import symbol_database as _symbol_database
 _sym_db = _symbol_database.Default()
 
 
-from . import channel_pb2 as channel__pb2
-from . import radioconfig_pb2 as radioconfig__pb2
-from . import mesh_pb2 as mesh__pb2
+from meshtastic import channel_pb2 as meshtastic_dot_channel__pb2
+from meshtastic import config_pb2 as meshtastic_dot_config__pb2
+from meshtastic import mesh_pb2 as meshtastic_dot_mesh__pb2
+from meshtastic import module_config_pb2 as meshtastic_dot_module__config__pb2
+from meshtastic import connection_status_pb2 as meshtastic_dot_connection__status__pb2
 
 
-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\x11radioconfig.proto\x1a\nmesh.proto\"\xbd\x03\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\x42\t\n\x07variantBG\n\x13\x63om.geeksville.meshB\x0b\x41\x64minProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3'
-  ,
-  dependencies=[channel__pb2.DESCRIPTOR,radioconfig__pb2.DESCRIPTOR,mesh__pb2.DESCRIPTOR,])
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x16meshtastic/admin.proto\x1a\x18meshtastic/channel.proto\x1a\x17meshtastic/config.proto\x1a\x15meshtastic/mesh.proto\x1a\x1emeshtastic/module_config.proto\x1a\"meshtastic/connection_status.proto\"\xd8\x0c\n\x0c\x41\x64minMessage\x12\x1d\n\x13get_channel_request\x18\x01 \x01(\rH\x00\x12(\n\x14get_channel_response\x18\x02 \x01(\x0b\x32\x08.ChannelH\x00\x12\x1b\n\x11get_owner_request\x18\x03 \x01(\x08H\x00\x12#\n\x12get_owner_response\x18\x04 \x01(\x0b\x32\x05.UserH\x00\x12\x36\n\x12get_config_request\x18\x05 \x01(\x0e\x32\x18.AdminMessage.ConfigTypeH\x00\x12&\n\x13get_config_response\x18\x06 \x01(\x0b\x32\x07.ConfigH\x00\x12\x43\n\x19get_module_config_request\x18\x07 \x01(\x0e\x32\x1e.AdminMessage.ModuleConfigTypeH\x00\x12\x33\n\x1aget_module_config_response\x18\x08 \x01(\x0b\x32\r.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\x37\n\x1cget_device_metadata_response\x18\r \x01(\x0b\x32\x0f.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\x12H\n%get_device_connection_status_response\x18\x11 \x01(\x0b\x32\x17.DeviceConnectionStatusH\x00\x12&\n\x0cset_ham_mode\x18\x12 \x01(\x0b\x32\x0e.HamParametersH\x00\x12\x1a\n\tset_owner\x18  \x01(\x0b\x32\x05.UserH\x00\x12\x1f\n\x0bset_channel\x18! \x01(\x0b\x32\x08.ChannelH\x00\x12\x1d\n\nset_config\x18\" \x01(\x0b\x32\x07.ConfigH\x00\x12*\n\x11set_module_config\x18# \x01(\x0b\x32\r.ModuleConfigH\x00\x12,\n\"set_canned_message_module_messages\x18$ \x01(\tH\x00\x12\x1e\n\x14set_ringtone_message\x18% \x01(\tH\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\"\xd3\x01\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\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(\tB`\n\x13\x63om.geeksville.meshB\x0b\x41\x64minProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
 
 
 
-
-_ADMINMESSAGE = _descriptor.Descriptor(
-  name='AdminMessage',
-  full_name='AdminMessage',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='set_radio', full_name='AdminMessage.set_radio', 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='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),
-  ],
-  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=507,
-)
-
-_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']
-DESCRIPTOR.message_types_by_name['AdminMessage'] = _ADMINMESSAGE
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-
+_ADMINMESSAGE = DESCRIPTOR.message_types_by_name['AdminMessage']
+_HAMPARAMETERS = DESCRIPTOR.message_types_by_name['HamParameters']
+_ADMINMESSAGE_CONFIGTYPE = _ADMINMESSAGE.enum_types_by_name['ConfigType']
+_ADMINMESSAGE_MODULECONFIGTYPE = _ADMINMESSAGE.enum_types_by_name['ModuleConfigType']
 AdminMessage = _reflection.GeneratedProtocolMessageType('AdminMessage', (_message.Message,), {
   'DESCRIPTOR' : _ADMINMESSAGE,
-  '__module__' : 'admin_pb2'
+  '__module__' : 'meshtastic.admin_pb2'
   # @@protoc_insertion_point(class_scope:AdminMessage)
   })
 _sym_db.RegisterMessage(AdminMessage)
 
+HamParameters = _reflection.GeneratedProtocolMessageType('HamParameters', (_message.Message,), {
+  'DESCRIPTOR' : _HAMPARAMETERS,
+  '__module__' : 'meshtastic.admin_pb2'
+  # @@protoc_insertion_point(class_scope:HamParameters)
+  })
+_sym_db.RegisterMessage(HamParameters)
 
-DESCRIPTOR._options = None
+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=169
+  _ADMINMESSAGE._serialized_end=1793
+  _ADMINMESSAGE_CONFIGTYPE._serialized_start=1411
+  _ADMINMESSAGE_CONFIGTYPE._serialized_end=1560
+  _ADMINMESSAGE_MODULECONFIGTYPE._serialized_start=1563
+  _ADMINMESSAGE_MODULECONFIGTYPE._serialized_end=1774
+  _HAMPARAMETERS._serialized_start=1795
+  _HAMPARAMETERS._serialized_end=1886
 # @@protoc_insertion_point(module_scope)

meshtastic/apponly_pb2.py

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: apponly.proto
-
+# source: meshtastic/apponly.proto
+"""Generated protocol buffer code."""
 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
@@ -11,62 +12,26 @@ from google.protobuf import symbol_database as _symbol_database
 _sym_db = _symbol_database.Default()
 
 
-from . import channel_pb2 as channel__pb2
+from meshtastic import channel_pb2 as meshtastic_dot_channel__pb2
+from meshtastic import config_pb2 as meshtastic_dot_config__pb2
 
 
-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,])
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x18meshtastic/apponly.proto\x1a\x18meshtastic/channel.proto\x1a\x17meshtastic/config.proto\"Y\n\nChannelSet\x12\"\n\x08settings\x18\x01 \x03(\x0b\x32\x10.ChannelSettings\x12\'\n\x0blora_config\x18\x02 \x01(\x0b\x32\x12.Config.LoRaConfigBb\n\x13\x63om.geeksville.meshB\rAppOnlyProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
 
 
 
-
-_CHANNELSET = _descriptor.Descriptor(
-  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 = DESCRIPTOR.message_types_by_name['ChannelSet']
 ChannelSet = _reflection.GeneratedProtocolMessageType('ChannelSet', (_message.Message,), {
   'DESCRIPTOR' : _CHANNELSET,
-  '__module__' : 'apponly_pb2'
+  '__module__' : 'meshtastic.apponly_pb2'
   # @@protoc_insertion_point(class_scope:ChannelSet)
   })
 _sym_db.RegisterMessage(ChannelSet)
 
+if _descriptor._USE_C_DESCRIPTORS == False:
 
-DESCRIPTOR._options = None
+  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=79
+  _CHANNELSET._serialized_end=168
 # @@protoc_insertion_point(module_scope)

meshtastic/ble_interface.py

@@ -1,10 +1,15 @@
 """Bluetooth interface
 """
 import logging
-import pygatt
-
+import platform
 
 from meshtastic.mesh_interface import MeshInterface
+from meshtastic.util import our_exit
+
+if platform.system() == "Linux":
+    # pylint: disable=E0401
+    import pygatt
+
 
 # Our standard BLE characteristics
 TORADIO_UUID = "f75c76d2-129e-4dad-a1dd-7866124401e7"
@@ -16,6 +21,8 @@ class BLEInterface(MeshInterface):
     """A not quite ready - FIXME - BLE interface to devices"""
 
     def __init__(self, address, noProto=False, debugOut=None):
+        if platform.system() != "Linux":
+            our_exit("Linux is the only platform with experimental BLE support.", 1)
         self.address = address
         if not noProto:
             self.adapter = pygatt.GATTToolBackend()  # BGAPIBackend()
@@ -31,7 +38,7 @@ class BLEInterface(MeshInterface):
 
         self._readFromRadio()  # read the initial responses
 
-        def handle_data(handle, data):
+        def handle_data(handle, data):  # pylint: disable=W0613
             self._handleFromRadio(data)
 
         if self.device:
@@ -39,7 +46,7 @@ class BLEInterface(MeshInterface):
 
     def _sendToRadioImpl(self, toRadio):
         """Send a ToRadio protobuf to the device"""
-        #logging.debug(f"Sending: {stripnl(toRadio)}")
+        # logging.debug(f"Sending: {stripnl(toRadio)}")
         b = toRadio.SerializeToString()
         self.device.char_write(TORADIO_UUID, b)
 

meshtastic/cannedmessages_pb2.py

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: meshtastic/cannedmessages.proto
+"""Generated protocol buffer code."""
+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()
+
+
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1fmeshtastic/cannedmessages.proto\"-\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')
+
+
+
+_CANNEDMESSAGEMODULECONFIG = DESCRIPTOR.message_types_by_name['CannedMessageModuleConfig']
+CannedMessageModuleConfig = _reflection.GeneratedProtocolMessageType('CannedMessageModuleConfig', (_message.Message,), {
+  'DESCRIPTOR' : _CANNEDMESSAGEMODULECONFIG,
+  '__module__' : 'meshtastic.cannedmessages_pb2'
+  # @@protoc_insertion_point(class_scope:CannedMessageModuleConfig)
+  })
+_sym_db.RegisterMessage(CannedMessageModuleConfig)
+
+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=35
+  _CANNEDMESSAGEMODULECONFIG._serialized_end=80
+# @@protoc_insertion_point(module_scope)

meshtastic/channel_pb2.py

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: channel.proto
-
+# source: meshtastic/channel.proto
+"""Generated protocol buffer code."""
 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
@@ -13,251 +14,37 @@ _sym_db = _symbol_database.Default()
 
 
 
-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'
-)
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x18meshtastic/channel.proto\"\x83\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\"\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\x42\x62\n\x13\x63om.geeksville.meshB\rChannelProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
 
 
 
-_CHANNELSETTINGS_MODEMCONFIG = _descriptor.EnumDescriptor(
-  name='ModemConfig',
-  full_name='ChannelSettings.ModemConfig',
-  filename=None,
-  file=DESCRIPTOR,
-  values=[
-    _descriptor.EnumValueDescriptor(
-      name='Bw125Cr45Sf128', index=0, number=0,
-      serialized_options=None,
-      type=None),
-    _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 = DESCRIPTOR.message_types_by_name['ChannelSettings']
+_CHANNEL = DESCRIPTOR.message_types_by_name['Channel']
+_CHANNEL_ROLE = _CHANNEL.enum_types_by_name['Role']
 ChannelSettings = _reflection.GeneratedProtocolMessageType('ChannelSettings', (_message.Message,), {
   'DESCRIPTOR' : _CHANNELSETTINGS,
-  '__module__' : 'channel_pb2'
+  '__module__' : 'meshtastic.channel_pb2'
   # @@protoc_insertion_point(class_scope:ChannelSettings)
   })
 _sym_db.RegisterMessage(ChannelSettings)
 
 Channel = _reflection.GeneratedProtocolMessageType('Channel', (_message.Message,), {
   'DESCRIPTOR' : _CHANNEL,
-  '__module__' : 'channel_pb2'
+  '__module__' : 'meshtastic.channel_pb2'
   # @@protoc_insertion_point(class_scope:Channel)
   })
 _sym_db.RegisterMessage(Channel)
 
+if _descriptor._USE_C_DESCRIPTORS == False:
 
-DESCRIPTOR._options = None
+  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.fields_by_name['channel_num']._options = None
+  _CHANNELSETTINGS.fields_by_name['channel_num']._serialized_options = b'\030\001'
+  _CHANNELSETTINGS._serialized_start=29
+  _CHANNELSETTINGS._serialized_end=160
+  _CHANNEL._serialized_start=163
+  _CHANNEL._serialized_end=302
+  _CHANNEL_ROLE._serialized_start=254
+  _CHANNEL_ROLE._serialized_end=302
 # @@protoc_insertion_point(module_scope)

meshtastic/connection_status_pb2.py

@@ -0,0 +1,85 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: meshtastic/connection_status.proto
+"""Generated protocol buffer code."""
+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()
+
+
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\"meshtastic/connection_status.proto\"\x85\x02\n\x16\x44\x65viceConnectionStatus\x12(\n\x04wifi\x18\x01 \x01(\x0b\x32\x15.WifiConnectionStatusH\x00\x88\x01\x01\x12\x30\n\x08\x65thernet\x18\x02 \x01(\x0b\x32\x19.EthernetConnectionStatusH\x01\x88\x01\x01\x12\x32\n\tbluetooth\x18\x03 \x01(\x0b\x32\x1a.BluetoothConnectionStatusH\x02\x88\x01\x01\x12,\n\x06serial\x18\x04 \x01(\x0b\x32\x17.SerialConnectionStatusH\x03\x88\x01\x01\x42\x07\n\x05_wifiB\x0b\n\t_ethernetB\x0c\n\n_bluetoothB\t\n\x07_serial\"\\\n\x14WifiConnectionStatus\x12(\n\x06status\x18\x01 \x01(\x0b\x32\x18.NetworkConnectionStatus\x12\x0c\n\x04ssid\x18\x02 \x01(\t\x12\x0c\n\x04rssi\x18\x03 \x01(\x05\"D\n\x18\x45thernetConnectionStatus\x12(\n\x06status\x18\x01 \x01(\x0b\x32\x18.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')
+
+
+
+_DEVICECONNECTIONSTATUS = DESCRIPTOR.message_types_by_name['DeviceConnectionStatus']
+_WIFICONNECTIONSTATUS = DESCRIPTOR.message_types_by_name['WifiConnectionStatus']
+_ETHERNETCONNECTIONSTATUS = DESCRIPTOR.message_types_by_name['EthernetConnectionStatus']
+_NETWORKCONNECTIONSTATUS = DESCRIPTOR.message_types_by_name['NetworkConnectionStatus']
+_BLUETOOTHCONNECTIONSTATUS = DESCRIPTOR.message_types_by_name['BluetoothConnectionStatus']
+_SERIALCONNECTIONSTATUS = DESCRIPTOR.message_types_by_name['SerialConnectionStatus']
+DeviceConnectionStatus = _reflection.GeneratedProtocolMessageType('DeviceConnectionStatus', (_message.Message,), {
+  'DESCRIPTOR' : _DEVICECONNECTIONSTATUS,
+  '__module__' : 'meshtastic.connection_status_pb2'
+  # @@protoc_insertion_point(class_scope:DeviceConnectionStatus)
+  })
+_sym_db.RegisterMessage(DeviceConnectionStatus)
+
+WifiConnectionStatus = _reflection.GeneratedProtocolMessageType('WifiConnectionStatus', (_message.Message,), {
+  'DESCRIPTOR' : _WIFICONNECTIONSTATUS,
+  '__module__' : 'meshtastic.connection_status_pb2'
+  # @@protoc_insertion_point(class_scope:WifiConnectionStatus)
+  })
+_sym_db.RegisterMessage(WifiConnectionStatus)
+
+EthernetConnectionStatus = _reflection.GeneratedProtocolMessageType('EthernetConnectionStatus', (_message.Message,), {
+  'DESCRIPTOR' : _ETHERNETCONNECTIONSTATUS,
+  '__module__' : 'meshtastic.connection_status_pb2'
+  # @@protoc_insertion_point(class_scope:EthernetConnectionStatus)
+  })
+_sym_db.RegisterMessage(EthernetConnectionStatus)
+
+NetworkConnectionStatus = _reflection.GeneratedProtocolMessageType('NetworkConnectionStatus', (_message.Message,), {
+  'DESCRIPTOR' : _NETWORKCONNECTIONSTATUS,
+  '__module__' : 'meshtastic.connection_status_pb2'
+  # @@protoc_insertion_point(class_scope:NetworkConnectionStatus)
+  })
+_sym_db.RegisterMessage(NetworkConnectionStatus)
+
+BluetoothConnectionStatus = _reflection.GeneratedProtocolMessageType('BluetoothConnectionStatus', (_message.Message,), {
+  'DESCRIPTOR' : _BLUETOOTHCONNECTIONSTATUS,
+  '__module__' : 'meshtastic.connection_status_pb2'
+  # @@protoc_insertion_point(class_scope:BluetoothConnectionStatus)
+  })
+_sym_db.RegisterMessage(BluetoothConnectionStatus)
+
+SerialConnectionStatus = _reflection.GeneratedProtocolMessageType('SerialConnectionStatus', (_message.Message,), {
+  'DESCRIPTOR' : _SERIALCONNECTIONSTATUS,
+  '__module__' : 'meshtastic.connection_status_pb2'
+  # @@protoc_insertion_point(class_scope:SerialConnectionStatus)
+  })
+_sym_db.RegisterMessage(SerialConnectionStatus)
+
+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=39
+  _DEVICECONNECTIONSTATUS._serialized_end=300
+  _WIFICONNECTIONSTATUS._serialized_start=302
+  _WIFICONNECTIONSTATUS._serialized_end=394
+  _ETHERNETCONNECTIONSTATUS._serialized_start=396
+  _ETHERNETCONNECTIONSTATUS._serialized_end=464
+  _NETWORKCONNECTIONSTATUS._serialized_start=466
+  _NETWORKCONNECTIONSTATUS._serialized_end=589
+  _BLUETOOTHCONNECTIONSTATUS._serialized_start=591
+  _BLUETOOTHCONNECTIONSTATUS._serialized_end=667
+  _SERIALCONNECTIONSTATUS._serialized_start=669
+  _SERIALCONNECTIONSTATUS._serialized_end=729
+# @@protoc_insertion_point(module_scope)

meshtastic/device_metadata_pb2.py

@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: meshtastic/device_metadata.proto
+"""Generated protocol buffer code."""
+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 meshtastic import mesh_pb2 as meshtastic_dot_mesh__pb2
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n meshtastic/device_metadata.proto\x1a\x17meshtastic/config.proto\x1a\x15meshtastic/mesh.proto\"\xfc\x01\n\x0e\x44\x65viceMetadata\x12\x18\n\x10\x66irmware_version\x18\x01 \x01(\t\x12\x1c\n\x14\x64\x65vice_state_version\x18\x02 \x01(\r\x12\x13\n\x0b\x63\x61nShutdown\x18\x03 \x01(\x08\x12\x0f\n\x07hasWifi\x18\x04 \x01(\x08\x12\x14\n\x0chasBluetooth\x18\x05 \x01(\x08\x12\x13\n\x0bhasEthernet\x18\x06 \x01(\x08\x12\'\n\x04role\x18\x07 \x01(\x0e\x32\x19.Config.DeviceConfig.Role\x12\x16\n\x0eposition_flags\x18\x08 \x01(\r\x12 \n\x08hw_model\x18\t \x01(\x0e\x32\x0e.HardwareModelBi\n\x13\x63om.geeksville.meshB\x14\x44\x65viceMetadataProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+
+
+
+_DEVICEMETADATA = DESCRIPTOR.message_types_by_name['DeviceMetadata']
+DeviceMetadata = _reflection.GeneratedProtocolMessageType('DeviceMetadata', (_message.Message,), {
+  'DESCRIPTOR' : _DEVICEMETADATA,
+  '__module__' : 'meshtastic.device_metadata_pb2'
+  # @@protoc_insertion_point(class_scope:DeviceMetadata)
+  })
+_sym_db.RegisterMessage(DeviceMetadata)
+
+if _descriptor._USE_C_DESCRIPTORS == False:
+
+  DESCRIPTOR._options = None
+  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\024DeviceMetadataProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+  _DEVICEMETADATA._serialized_start=85
+  _DEVICEMETADATA._serialized_end=337
+# @@protoc_insertion_point(module_scope)

meshtastic/deviceonly_pb2.py

@@ -1,8 +1,10 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: deviceonly.proto
-
+# source: meshtastic/deviceonly.proto
+"""Generated protocol buffer code."""
+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
@@ -11,245 +13,54 @@ from google.protobuf import symbol_database as _symbol_database
 _sym_db = _symbol_database.Default()
 
 
-from . import channel_pb2 as channel__pb2
-from . import mesh_pb2 as mesh__pb2
-from . import radioconfig_pb2 as radioconfig__pb2
+from meshtastic import channel_pb2 as meshtastic_dot_channel__pb2
+from meshtastic import localonly_pb2 as meshtastic_dot_localonly__pb2
+from meshtastic import mesh_pb2 as meshtastic_dot_mesh__pb2
 
 
-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,])
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1bmeshtastic/deviceonly.proto\x1a\x18meshtastic/channel.proto\x1a\x1ameshtastic/localonly.proto\x1a\x15meshtastic/mesh.proto\"\xe0\x01\n\x0b\x44\x65viceState\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(\x08\":\n\x0b\x43hannelFile\x12\x1a\n\x08\x63hannels\x18\x01 \x03(\x0b\x32\x08.Channel\x12\x0f\n\x07version\x18\x02 \x01(\r\"\xf6\x01\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\x1e\n\x08oem_font\x18\x04 \x01(\x0e\x32\x0c.ScreenFonts\x12\x10\n\x08oem_text\x18\x05 \x01(\t\x12\x13\n\x0boem_aes_key\x18\x06 \x01(\x0c\x12&\n\x10oem_local_config\x18\x07 \x01(\x0b\x32\x0c.LocalConfig\x12\x33\n\x17oem_local_module_config\x18\x08 \x01(\x0b\x32\x12.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\x42_\n\x13\x63om.geeksville.meshB\nDeviceOnlyZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+
+_SCREENFONTS = DESCRIPTOR.enum_types_by_name['ScreenFonts']
+ScreenFonts = enum_type_wrapper.EnumTypeWrapper(_SCREENFONTS)
+FONT_SMALL = 0
+FONT_MEDIUM = 1
+FONT_LARGE = 2
 
 
-
-
-_LEGACYRADIOCONFIG_LEGACYPREFERENCES = _descriptor.Descriptor(
-  name='LegacyPreferences',
-  full_name='LegacyRadioConfig.LegacyPreferences',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='region', full_name='LegacyRadioConfig.LegacyPreferences.region', index=0,
-      number=15, 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=[
-  ],
-  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 = DESCRIPTOR.message_types_by_name['DeviceState']
+_CHANNELFILE = DESCRIPTOR.message_types_by_name['ChannelFile']
+_OEMSTORE = DESCRIPTOR.message_types_by_name['OEMStore']
 DeviceState = _reflection.GeneratedProtocolMessageType('DeviceState', (_message.Message,), {
   'DESCRIPTOR' : _DEVICESTATE,
-  '__module__' : 'deviceonly_pb2'
+  '__module__' : 'meshtastic.deviceonly_pb2'
   # @@protoc_insertion_point(class_scope:DeviceState)
   })
 _sym_db.RegisterMessage(DeviceState)
 
 ChannelFile = _reflection.GeneratedProtocolMessageType('ChannelFile', (_message.Message,), {
   'DESCRIPTOR' : _CHANNELFILE,
-  '__module__' : 'deviceonly_pb2'
+  '__module__' : 'meshtastic.deviceonly_pb2'
   # @@protoc_insertion_point(class_scope:ChannelFile)
   })
 _sym_db.RegisterMessage(ChannelFile)
 
+OEMStore = _reflection.GeneratedProtocolMessageType('OEMStore', (_message.Message,), {
+  'DESCRIPTOR' : _OEMSTORE,
+  '__module__' : 'meshtastic.deviceonly_pb2'
+  # @@protoc_insertion_point(class_scope:OEMStore)
+  })
+_sym_db.RegisterMessage(OEMStore)
 
-DESCRIPTOR._options = None
+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'
+  _SCREENFONTS._serialized_start=644
+  _SCREENFONTS._serialized_end=706
+  _DEVICESTATE._serialized_start=109
+  _DEVICESTATE._serialized_end=333
+  _CHANNELFILE._serialized_start=335
+  _CHANNELFILE._serialized_end=393
+  _OEMSTORE._serialized_start=396
+  _OEMSTORE._serialized_end=642
 # @@protoc_insertion_point(module_scope)

meshtastic/environmental_measurement_pb2.py

@@ -1,83 +0,0 @@
-# -*- 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\"g\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\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),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  serialized_options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=35,
-  serialized_end=138,
-)
-
-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,8 +8,10 @@
 
 """
 
+
 class Globals:
     """Globals class is a Singleton."""
+
     __instance = None
 
     @staticmethod
@@ -27,19 +29,21 @@ class Globals:
             Globals.__instance = self
         self.args = None
         self.parser = None
-        self.target_node = None
         self.channel_index = None
         self.logfile = None
         self.tunnelInstance = None
+        # TODO: to migrate to camel_case for v1.3 change this value to True
+        self.camel_case = False
 
     def reset(self):
         """Reset all of our globals. If you add a member, add it to this method, too."""
         self.args = None
         self.parser = None
-        self.target_node = None
         self.channel_index = None
         self.logfile = None
         self.tunnelInstance = None
+        # TODO: to migrate to camel_case for v1.3 change this value to True
+        self.camel_case = False
 
     # setters
     def set_args(self, args):
@@ -50,10 +54,6 @@ class Globals:
         """Set the parser"""
         self.parser = parser
 
-    def set_target_node(self, target_node):
-        """Set the target_node"""
-        self.target_node = target_node
-
     def set_channel_index(self, channel_index):
         """Set the channel_index"""
         self.channel_index = channel_index
@@ -66,6 +66,10 @@ class Globals:
         """Set the tunnelInstance"""
         self.tunnelInstance = tunnelInstance
 
+    def set_camel_case(self):
+        """Force using camelCase for things like prefs/set/set"""
+        self.camel_case = True
+
     # getters
     def get_args(self):
         """Get args"""
@@ -75,10 +79,6 @@ class Globals:
         """Get parser"""
         return self.parser
 
-    def get_target_node(self):
-        """Get target_node"""
-        return self.target_node
-
     def get_channel_index(self):
         """Get channel_index"""
         return self.channel_index
@@ -90,3 +90,7 @@ class Globals:
     def get_tunnelInstance(self):
         """Get tunnelInstance"""
         return self.tunnelInstance
+
+    def get_camel_case(self):
+        """Get whether or not to use camelCase"""
+        return self.camel_case

meshtastic/localonly_pb2.py

@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: meshtastic/localonly.proto
+"""Generated protocol buffer code."""
+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 meshtastic import module_config_pb2 as meshtastic_dot_module__config__pb2
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1ameshtastic/localonly.proto\x1a\x17meshtastic/config.proto\x1a\x1emeshtastic/module_config.proto\"\xb0\x02\n\x0bLocalConfig\x12$\n\x06\x64\x65vice\x18\x01 \x01(\x0b\x32\x14.Config.DeviceConfig\x12(\n\x08position\x18\x02 \x01(\x0b\x32\x16.Config.PositionConfig\x12\"\n\x05power\x18\x03 \x01(\x0b\x32\x13.Config.PowerConfig\x12&\n\x07network\x18\x04 \x01(\x0b\x32\x15.Config.NetworkConfig\x12&\n\x07\x64isplay\x18\x05 \x01(\x0b\x32\x15.Config.DisplayConfig\x12 \n\x04lora\x18\x06 \x01(\x0b\x32\x12.Config.LoRaConfig\x12*\n\tbluetooth\x18\x07 \x01(\x0b\x32\x17.Config.BluetoothConfig\x12\x0f\n\x07version\x18\x08 \x01(\r\"\x81\x04\n\x11LocalModuleConfig\x12&\n\x04mqtt\x18\x01 \x01(\x0b\x32\x18.ModuleConfig.MQTTConfig\x12*\n\x06serial\x18\x02 \x01(\x0b\x32\x1a.ModuleConfig.SerialConfig\x12G\n\x15\x65xternal_notification\x18\x03 \x01(\x0b\x32(.ModuleConfig.ExternalNotificationConfig\x12\x37\n\rstore_forward\x18\x04 \x01(\x0b\x32 .ModuleConfig.StoreForwardConfig\x12\x31\n\nrange_test\x18\x05 \x01(\x0b\x32\x1d.ModuleConfig.RangeTestConfig\x12\x30\n\ttelemetry\x18\x06 \x01(\x0b\x32\x1d.ModuleConfig.TelemetryConfig\x12\x39\n\x0e\x63\x61nned_message\x18\x07 \x01(\x0b\x32!.ModuleConfig.CannedMessageConfig\x12(\n\x05\x61udio\x18\t \x01(\x0b\x32\x19.ModuleConfig.AudioConfig\x12;\n\x0fremote_hardware\x18\n \x01(\x0b\x32\".ModuleConfig.RemoteHardwareConfig\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')
+
+
+
+_LOCALCONFIG = DESCRIPTOR.message_types_by_name['LocalConfig']
+_LOCALMODULECONFIG = DESCRIPTOR.message_types_by_name['LocalModuleConfig']
+LocalConfig = _reflection.GeneratedProtocolMessageType('LocalConfig', (_message.Message,), {
+  'DESCRIPTOR' : _LOCALCONFIG,
+  '__module__' : 'meshtastic.localonly_pb2'
+  # @@protoc_insertion_point(class_scope:LocalConfig)
+  })
+_sym_db.RegisterMessage(LocalConfig)
+
+LocalModuleConfig = _reflection.GeneratedProtocolMessageType('LocalModuleConfig', (_message.Message,), {
+  'DESCRIPTOR' : _LOCALMODULECONFIG,
+  '__module__' : 'meshtastic.localonly_pb2'
+  # @@protoc_insertion_point(class_scope:LocalModuleConfig)
+  })
+_sym_db.RegisterMessage(LocalModuleConfig)
+
+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=88
+  _LOCALCONFIG._serialized_end=392
+  _LOCALMODULECONFIG._serialized_start=395
+  _LOCALMODULECONFIG._serialized_end=908
+# @@protoc_insertion_point(module_scope)

meshtastic/mesh_interface.py

@@ -1,25 +1,42 @@
 """Mesh Interface class
 """
-import sys
-import random
-import time
+
+import collections
 import logging
-from typing import AnyStr
+import random
+import sys
 import threading
+import time
+import json
 from datetime import datetime
-import timeago
-from tabulate import tabulate
+from typing import AnyStr
 
 import google.protobuf.json_format
-
-from pubsub import pub
+import timeago
 from google.protobuf.json_format import MessageToJson
-
+from pubsub import pub
+from tabulate import tabulate
 
 import meshtastic.node
-from meshtastic import portnums_pb2, mesh_pb2
-from meshtastic.util import stripnl, Timeout, our_exit, remove_keys_from_dict, convert_mac_addr
-from meshtastic.__init__ import LOCAL_ADDR, BROADCAST_NUM, BROADCAST_ADDR, ResponseHandler, publishingThread, OUR_APP_VERSION, protocols
+from meshtastic import mesh_pb2, portnums_pb2
+from meshtastic.__init__ import (
+    BROADCAST_ADDR,
+    BROADCAST_NUM,
+    LOCAL_ADDR,
+    OUR_APP_VERSION,
+    ResponseHandler,
+    protocols,
+    publishingThread,
+)
+from meshtastic.util import (
+    Acknowledgment,
+    Timeout,
+    convert_mac_addr,
+    our_exit,
+    remove_keys_from_dict,
+    stripnl,
+)
+
 
 class MeshInterface:
     """Interface class for meshtastic devices
@@ -45,16 +62,20 @@ class MeshInterface:
         self.localNode = meshtastic.node.Node(self, -1)  # We fixup nodenum later
         self.myInfo = None  # We don't have device info yet
         self.responseHandlers = {}  # A map from request ID to the handler
-        self.failure = None  # If we've encountered a fatal exception it will be kept here
+        self.failure = (
+            None  # If we've encountered a fatal exception it will be kept here
+        )
         self._timeout = Timeout()
+        self._acknowledgment = Acknowledgment()
         self.heartbeatTimer = None
         random.seed()  # FIXME, we should not clobber the random seedval here, instead tell user they must call it
-        self.currentPacketId = random.randint(0, 0xffffffff)
+        self.currentPacketId = random.randint(0, 0xFFFFFFFF)
         self.nodesByNum = None
         self.configId = None
-        self.defaultHopLimit = 3
-        self.gotResponse = False # used in gpio read
-        self.mask = None # used in gpio read and gpio watch
+        self.gotResponse = False  # used in gpio read
+        self.mask = None  # used in gpio read and gpio watch
+        self.queueStatus = None
+        self.queue = collections.OrderedDict()
 
     def close(self):
         """Shutdown this interface"""
@@ -68,114 +89,154 @@ class MeshInterface:
 
     def __exit__(self, exc_type, exc_value, traceback):
         if exc_type is not None and exc_value is not None:
-            logging.error(f'An exception of type {exc_type} with value {exc_value} has occurred')
+            logging.error(
+                f"An exception of type {exc_type} with value {exc_value} has occurred"
+            )
         if traceback is not None:
-            logging.error(f'Traceback: {traceback}')
+            logging.error(f"Traceback: {traceback}")
         self.close()
 
-    def showInfo(self, file=sys.stdout):
+    def showInfo(self, file=sys.stdout):  # pylint: disable=W0613
         """Show human readable summary about this object"""
         owner = f"Owner: {self.getLongName()} ({self.getShortName()})"
-        myinfo = ''
+        myinfo = ""
         if self.myInfo:
             myinfo = f"\nMy info: {stripnl(MessageToJson(self.myInfo))}"
-        mesh = "\nNodes in mesh:"
-        nodes = ""
+        mesh = "\n\nNodes in mesh: "
+        nodes = {}
         if self.nodes:
             for n in self.nodes.values():
                 # when the TBeam is first booted, it sometimes shows the raw data
                 # so, we will just remove any raw keys
-                keys_to_remove = ('raw', 'decoded', 'payload')
+                keys_to_remove = ("raw", "decoded", "payload")
                 n2 = remove_keys_from_dict(keys_to_remove, n)
 
                 # if we have 'macaddr', re-format it
-                if 'macaddr' in n2['user']:
-                    val = n2['user']['macaddr']
+                if "macaddr" in n2["user"]:
+                    val = n2["user"]["macaddr"]
                     # decode the base64 value
                     addr = convert_mac_addr(val)
-                    n2['user']['macaddr'] = addr
+                    n2["user"]["macaddr"] = addr
 
-                nodes = nodes + f"  {stripnl(n2)}"
-        infos = owner + myinfo + mesh + nodes
+                # use id as dictionary key for correct json format in list of nodes
+                nodeid = n2['user']['id']
+                n2['user'].pop('id')
+                nodes[nodeid] = n2
+        infos = owner + myinfo + mesh + json.dumps(nodes)
         print(infos)
         return infos
 
-    def showNodes(self, includeSelf=True, file=sys.stdout):
+    def showNodes(self, includeSelf=True, file=sys.stdout):  # pylint: disable=W0613
         """Show table summary of nodes in mesh"""
-        def formatFloat(value, precision=2, unit=''):
+
+        def formatFloat(value, precision=2, unit=""):
             """Format a float value with precsion."""
-            return f'{value:.{precision}f}{unit}' if value else None
+            return f"{value:.{precision}f}{unit}" if value else None
 
         def getLH(ts):
             """Format last heard"""
-            return datetime.fromtimestamp(ts).strftime('%Y-%m-%d %H:%M:%S') if ts else None
+            return (
+                datetime.fromtimestamp(ts).strftime("%Y-%m-%d %H:%M:%S") if ts else None
+            )
 
         def getTimeAgo(ts):
             """Format how long ago have we heard from this node (aka timeago)."""
-            return timeago.format(datetime.fromtimestamp(ts), datetime.now()) if ts else None
+            return (
+                timeago.format(datetime.fromtimestamp(ts), datetime.now())
+                if ts
+                else None
+            )
 
         rows = []
         if self.nodes:
-            logging.debug(f'self.nodes:{self.nodes}')
+            logging.debug(f"self.nodes:{self.nodes}")
             for node in self.nodes.values():
-                if not includeSelf and node['num'] == self.localNode.nodeNum:
+                if not includeSelf and node["num"] == self.localNode.nodeNum:
                     continue
 
                 row = {"N": 0}
 
-                user = node.get('user')
+                user = node.get("user")
                 if user:
-                    row.update({
-                        "User": user['longName'],
-                        "AKA":  user['shortName'],
-                        "ID":   user['id'],
-                    })
+                    row.update(
+                        {
+                            "User": user.get("longName", "N/A"),
+                            "AKA": user.get("shortName", "N/A"),
+                            "ID": user["id"],
+                        }
+                    )
 
-                pos = node.get('position')
+                pos = node.get("position")
                 if pos:
-                    row.update({
-                        "Latitude":  formatFloat(pos.get("latitude"),     4, "°"),
-                        "Longitude": formatFloat(pos.get("longitude"),    4, "°"),
-                        "Altitude":  formatFloat(pos.get("altitude"),     0, " m"),
-                        "Battery":   formatFloat(pos.get("batteryLevel"), 2, "%"),
-                    })
+                    row.update(
+                        {
+                            "Latitude": formatFloat(pos.get("latitude"), 4, "°"),
+                            "Longitude": formatFloat(pos.get("longitude"), 4, "°"),
+                            "Altitude": formatFloat(pos.get("altitude"), 0, " m"),
+                        }
+                    )
 
-                row.update({
-                    "SNR":       formatFloat(node.get("snr"), 2, " dB"),
-                    "LastHeard": getLH(node.get("lastHeard")),
-                    "Since":     getTimeAgo(node.get("lastHeard")),
-                })
+                metrics = node.get("deviceMetrics")
+                if metrics:
+                    batteryLevel = metrics.get("batteryLevel")
+                    if batteryLevel is not None:
+                        if batteryLevel == 0:
+                            batteryString = "Powered"
+                        else:
+                            batteryString = str(batteryLevel) + "%"
+                        row.update({"Battery": batteryString})
+                    row.update(
+                        {
+                            "Channel util.": formatFloat(
+                                metrics.get("channelUtilization"), 2, "%"
+                            ),
+                            "Tx air util.": formatFloat(
+                                metrics.get("airUtilTx"), 2, "%"
+                            ),
+                        }
+                    )
+
+                row.update(
+                    {
+                        "SNR": formatFloat(node.get("snr"), 2, " dB"),
+                        "LastHeard": getLH(node.get("lastHeard")),
+                        "Since": getTimeAgo(node.get("lastHeard")),
+                    }
+                )
 
                 rows.append(row)
 
-        rows.sort(key=lambda r: r.get('LastHeard') or '0000', reverse=True)
+        rows.sort(key=lambda r: r.get("LastHeard") or "0000", reverse=True)
         for i, row in enumerate(rows):
-            row['N'] = i+1
+            row["N"] = i + 1
 
-        table = tabulate(rows, headers='keys', missingval='N/A', tablefmt='fancy_grid')
+        table = tabulate(rows, headers="keys", missingval="N/A", tablefmt="fancy_grid")
         print(table)
         return table
 
-
-    def getNode(self, nodeId):
+    def getNode(self, nodeId, requestChannels=True):
         """Return a node object which contains device settings and channel info"""
-        if nodeId == LOCAL_ADDR:
+        if nodeId in (LOCAL_ADDR, BROADCAST_ADDR):
             return self.localNode
         else:
             n = meshtastic.node.Node(self, nodeId)
-            logging.debug("About to requestConfig")
-            n.requestConfig()
-            if not n.waitForConfig():
-                our_exit("Error: Timed out waiting for node config")
+            # Only request device settings and channel info when necessary
+            if requestChannels:
+                logging.debug("About to requestChannels")
+                n.requestChannels()
+                if not n.waitForConfig():
+                    our_exit("Error: Timed out waiting for channels")
             return n
 
-    def sendText(self, text: AnyStr,
-                 destinationId=BROADCAST_ADDR,
-                 wantAck=False,
-                 wantResponse=False,
-                 hopLimit=None,
-                 onResponse=None,
-                 channelIndex=0):
+    def sendText(
+        self,
+        text: AnyStr,
+        destinationId=BROADCAST_ADDR,
+        wantAck=False,
+        wantResponse=False,
+        onResponse=None,
+        channelIndex=0,
+    ):
         """Send a utf8 string to some other node, if the node has a display it
            will also be shown on the device.
 
@@ -195,23 +256,27 @@ class MeshInterface:
         Returns the sent packet. The id field will be populated in this packet
         and can be used to track future message acks/naks.
         """
-        if hopLimit is None:
-            hopLimit = self.defaultHopLimit
 
-        return self.sendData(text.encode("utf-8"), destinationId,
-                             portNum=portnums_pb2.PortNum.TEXT_MESSAGE_APP,
-                             wantAck=wantAck,
-                             wantResponse=wantResponse,
-                             hopLimit=hopLimit,
-                             onResponse=onResponse,
-                             channelIndex=channelIndex)
+        return self.sendData(
+            text.encode("utf-8"),
+            destinationId,
+            portNum=portnums_pb2.PortNum.TEXT_MESSAGE_APP,
+            wantAck=wantAck,
+            wantResponse=wantResponse,
+            onResponse=onResponse,
+            channelIndex=channelIndex,
+        )
 
-    def sendData(self, data, destinationId=BROADCAST_ADDR,
-                 portNum=portnums_pb2.PortNum.PRIVATE_APP, wantAck=False,
-                 wantResponse=False,
-                 hopLimit=None,
-                 onResponse=None,
-                 channelIndex=0):
+    def sendData(
+        self,
+        data,
+        destinationId=BROADCAST_ADDR,
+        portNum=portnums_pb2.PortNum.PRIVATE_APP,
+        wantAck=False,
+        wantResponse=False,
+        onResponse=None,
+        channelIndex=0,
+    ):
         """Send a data packet to some other node
 
         Keyword Arguments:
@@ -234,19 +299,21 @@ class MeshInterface:
         Returns the sent packet. The id field will be populated in this packet
         and can be used to track future message acks/naks.
         """
-        if hopLimit is None:
-            hopLimit = self.defaultHopLimit
 
         if getattr(data, "SerializeToString", None):
             logging.debug(f"Serializing protobuf as data: {stripnl(data)}")
             data = data.SerializeToString()
 
         logging.debug(f"len(data): {len(data)}")
-        logging.debug(f"mesh_pb2.Constants.DATA_PAYLOAD_LEN: {mesh_pb2.Constants.DATA_PAYLOAD_LEN}")
+        logging.debug(
+            f"mesh_pb2.Constants.DATA_PAYLOAD_LEN: {mesh_pb2.Constants.DATA_PAYLOAD_LEN}"
+        )
         if len(data) > mesh_pb2.Constants.DATA_PAYLOAD_LEN:
             raise Exception("Data payload too big")
 
-        if portNum == portnums_pb2.PortNum.UNKNOWN_APP:  # we are now more strict wrt port numbers
+        if (
+            portNum == portnums_pb2.PortNum.UNKNOWN_APP
+        ):  # we are now more strict wrt port numbers
             our_exit("Warning: A non-zero port number must be specified")
 
         meshPacket = mesh_pb2.MeshPacket()
@@ -254,15 +321,23 @@ class MeshInterface:
         meshPacket.decoded.payload = data
         meshPacket.decoded.portnum = portNum
         meshPacket.decoded.want_response = wantResponse
+        meshPacket.id = self._generatePacketId()
 
-        p = self._sendPacket(meshPacket, destinationId,
-                             wantAck=wantAck, hopLimit=hopLimit)
         if onResponse is not None:
-            self._addResponseHandler(p.id, onResponse)
+            self._addResponseHandler(meshPacket.id, onResponse)
+        p = self._sendPacket(meshPacket, destinationId, wantAck=wantAck)
         return p
 
-    def sendPosition(self, latitude=0.0, longitude=0.0, altitude=0, timeSec=0,
-                     destinationId=BROADCAST_ADDR, wantAck=False, wantResponse=False):
+    def sendPosition(
+        self,
+        latitude=0.0,
+        longitude=0.0,
+        altitude=0,
+        timeSec=0,
+        destinationId=BROADCAST_ADDR,
+        wantAck=False,
+        wantResponse=False,
+    ):
         """
         Send a position packet to some other node (normally a broadcast)
 
@@ -277,43 +352,72 @@ class MeshInterface:
         p = mesh_pb2.Position()
         if latitude != 0.0:
             p.latitude_i = int(latitude / 1e-7)
-            logging.debug(f'p.latitude_i:{p.latitude_i}')
+            logging.debug(f"p.latitude_i:{p.latitude_i}")
 
         if longitude != 0.0:
             p.longitude_i = int(longitude / 1e-7)
-            logging.debug(f'p.longitude_i:{p.longitude_i}')
+            logging.debug(f"p.longitude_i:{p.longitude_i}")
 
         if altitude != 0:
             p.altitude = int(altitude)
-            logging.debug(f'p.altitude:{p.altitude}')
+            logging.debug(f"p.altitude:{p.altitude}")
 
         if timeSec == 0:
             timeSec = time.time()  # returns unix timestamp in seconds
         p.time = int(timeSec)
-        logging.debug(f'p.time:{p.time}')
+        logging.debug(f"p.time:{p.time}")
 
-        return self.sendData(p, destinationId,
-                             portNum=portnums_pb2.PortNum.POSITION_APP,
-                             wantAck=wantAck,
-                             wantResponse=wantResponse)
+        return self.sendData(
+            p,
+            destinationId,
+            portNum=portnums_pb2.PortNum.POSITION_APP,
+            wantAck=wantAck,
+            wantResponse=wantResponse,
+        )
+
+    def sendTraceRoute(self, dest, hopLimit):
+        """Send the trace route"""
+        r = mesh_pb2.RouteDiscovery()
+        self.sendData(
+            r,
+            destinationId=dest,
+            portNum=portnums_pb2.PortNum.TRACEROUTE_APP,
+            wantResponse=True,
+            onResponse=self.onResponseTraceRoute,
+        )
+        # extend timeout based on number of nodes, limit by configured hopLimit
+        waitFactor = min(len(self.nodes) - 1, hopLimit)
+        self.waitForTraceRoute(waitFactor)
+
+    def onResponseTraceRoute(self, p):
+        """on response for trace route"""
+        routeDiscovery = mesh_pb2.RouteDiscovery()
+        routeDiscovery.ParseFromString(p["decoded"]["payload"])
+        asDict = google.protobuf.json_format.MessageToDict(routeDiscovery)
+
+        print("Route traced:")
+        routeStr = self._nodeNumToId(p["to"])
+        if "route" in asDict:
+            for nodeNum in asDict["route"]:
+                routeStr += " --> " + self._nodeNumToId(nodeNum)
+        routeStr += " --> " + self._nodeNumToId(p["from"])
+        print(routeStr)
+
+        self._acknowledgment.receivedTraceRoute = True
 
     def _addResponseHandler(self, requestId, callback):
         self.responseHandlers[requestId] = ResponseHandler(callback)
 
-    def _sendPacket(self, meshPacket,
-                    destinationId=BROADCAST_ADDR,
-                    wantAck=False, hopLimit=None):
+    def _sendPacket(self, meshPacket, destinationId=BROADCAST_ADDR, wantAck=False):
         """Send a MeshPacket to the specified node (or if unspecified, broadcast).
         You probably don't want this - use sendData instead.
 
         Returns the sent packet. The id field will be populated in this packet and
         can be used to track future message acks/naks.
         """
-        if hopLimit is None:
-            hopLimit = self.defaultHopLimit
 
         # We allow users to talk to the local node before we've completed the full connection flow...
-        if(self.myInfo is not None and destinationId != self.myInfo.my_node_num):
+        if self.myInfo is not None and destinationId != self.myInfo.my_node_num:
             self._waitConnected()
 
         toRadio = mesh_pb2.ToRadio()
@@ -338,12 +442,14 @@ class MeshInterface:
                 node = self.nodes.get(destinationId)
                 if not node:
                     our_exit(f"Warning: NodeId {destinationId} not found in DB")
-                nodeNum = node['num']
+                nodeNum = node["num"]
             else:
                 logging.warning("Warning: There were no self.nodes.")
 
         meshPacket.to = nodeNum
         meshPacket.want_ack = wantAck
+        loraConfig = getattr(self.localNode.localConfig, "lora")
+        hopLimit = getattr(loraConfig, "hop_limit")
         meshPacket.hop_limit = hopLimit
 
         # if the user hasn't set an ID for this packet (likely and recommended),
@@ -353,7 +459,9 @@ class MeshInterface:
 
         toRadio.packet.CopyFrom(meshPacket)
         if self.noProto:
-            logging.warning(f"Not sending packet because protocol use is disabled by noProto")
+            logging.warning(
+                f"Not sending packet because protocol use is disabled by noProto"
+            )
         else:
             logging.debug(f"Sending packet: {stripnl(meshPacket)}")
             self._sendToRadio(toRadio)
@@ -361,36 +469,51 @@ class MeshInterface:
 
     def waitForConfig(self):
         """Block until radio config is received. Returns True if config has been received."""
-        success = self._timeout.waitForSet(self, attrs=('myInfo', 'nodes')) and self.localNode.waitForConfig()
+        success = (
+            self._timeout.waitForSet(self, attrs=("myInfo", "nodes"))
+            and self.localNode.waitForConfig()
+        )
         if not success:
             raise Exception("Timed out waiting for interface config")
 
+    def waitForAckNak(self):
+        """Wait for the ack/nak"""
+        success = self._timeout.waitForAckNak(self._acknowledgment)
+        if not success:
+            raise Exception("Timed out waiting for an acknowledgment")
+
+    def waitForTraceRoute(self, waitFactor):
+        """Wait for trace route"""
+        success = self._timeout.waitForTraceRoute(waitFactor, self._acknowledgment)
+        if not success:
+            raise Exception("Timed out waiting for traceroute")
+
     def getMyNodeInfo(self):
         """Get info about my node."""
         if self.myInfo is None:
             return None
-        logging.debug(f'self.nodesByNum:{self.nodesByNum}')
+        logging.debug(f"self.nodesByNum:{self.nodesByNum}")
         return self.nodesByNum.get(self.myInfo.my_node_num)
 
     def getMyUser(self):
         """Get user"""
         nodeInfo = self.getMyNodeInfo()
         if nodeInfo is not None:
-            return nodeInfo.get('user')
+            return nodeInfo.get("user")
         return None
 
     def getLongName(self):
         """Get long name"""
         user = self.getMyUser()
         if user is not None:
-            return user.get('longName', None)
+            return user.get("longName", None)
         return None
 
     def getShortName(self):
         """Get short name"""
         user = self.getMyUser()
         if user is not None:
-            return user.get('shortName', None)
+            return user.get("shortName", None)
         return None
 
     def _waitConnected(self, timeout=15.0):
@@ -409,20 +532,23 @@ class MeshInterface:
         if self.currentPacketId is None:
             raise Exception("Not connected yet, can not generate packet")
         else:
-            self.currentPacketId = (self.currentPacketId + 1) & 0xffffffff
+            self.currentPacketId = (self.currentPacketId + 1) & 0xFFFFFFFF
             return self.currentPacketId
 
     def _disconnected(self):
         """Called by subclasses to tell clients this interface has disconnected"""
         self.isConnected.clear()
-        publishingThread.queueWork(lambda: pub.sendMessage("meshtastic.connection.lost", interface=self))
+        publishingThread.queueWork(
+            lambda: pub.sendMessage("meshtastic.connection.lost", interface=self)
+        )
 
     def _startHeartbeat(self):
         """We need to send a heartbeat message to the device every X seconds"""
+
         def callback():
             self.heartbeatTimer = None
-            prefs = self.localNode.radioConfig.preferences
-            i = prefs.phone_timeout_secs / 2
+            prefs = self.localNode.localConfig
+            i = prefs.power.ls_secs / 2
             logging.debug(f"Sending heartbeat, interval {i}")
             if i != 0:
                 self.heartbeatTimer = threading.Timer(i, callback)
@@ -433,15 +559,18 @@ class MeshInterface:
         callback()  # run our periodic callback now, it will make another timer if necessary
 
     def _connected(self):
-        """Called by this class to tell clients we are now fully connected to a node
-        """
+        """Called by this class to tell clients we are now fully connected to a node"""
         # (because I'm lazy) _connected might be called when remote Node
         # objects complete their config reads, don't generate redundant isConnected
         # for the local interface
         if not self.isConnected.is_set():
             self.isConnected.set()
             self._startHeartbeat()
-            publishingThread.queueWork(lambda: pub.sendMessage("meshtastic.connection.established", interface=self))
+            publishingThread.queueWork(
+                lambda: pub.sendMessage(
+                    "meshtastic.connection.established", interface=self
+                )
+            )
 
     def _startConfig(self):
         """Start device packets flowing"""
@@ -450,7 +579,7 @@ class MeshInterface:
         self.nodesByNum = {}  # nodes keyed by nodenum
 
         startConfig = mesh_pb2.ToRadio()
-        self.configId = random.randint(0, 0xffffffff)
+        self.configId = random.randint(0, 0xFFFFFFFF)
         startConfig.want_config_id = self.configId
         self._sendToRadio(startConfig)
 
@@ -460,13 +589,65 @@ class MeshInterface:
         m.disconnect = True
         self._sendToRadio(m)
 
+    def _queueHasFreeSpace(self):
+        # We never got queueStatus, maybe the firmware is old
+        if self.queueStatus is None:
+            return True
+        return self.queueStatus.free > 0
+
+    def _queueClaim(self):
+        if self.queueStatus is None:
+            return
+        self.queueStatus.free -= 1
+
     def _sendToRadio(self, toRadio):
         """Send a ToRadio protobuf to the device"""
         if self.noProto:
-            logging.warning(f"Not sending packet because protocol use is disabled by noProto")
+            logging.warning(
+                f"Not sending packet because protocol use is disabled by noProto"
+            )
         else:
-            #logging.debug(f"Sending toRadio: {stripnl(toRadio)}")
-            self._sendToRadioImpl(toRadio)
+            # logging.debug(f"Sending toRadio: {stripnl(toRadio)}")
+
+            if not toRadio.HasField("packet"):
+                # not a meshpacket -- send immediately, give queue a chance,
+                # this makes heartbeat trigger queue
+                self._sendToRadioImpl(toRadio)
+            else:
+                # meshpacket -- queue
+                self.queue[toRadio.packet.id] = toRadio
+
+            resentQueue = collections.OrderedDict()
+
+            while self.queue:
+                # logging.warn("queue: " + " ".join(f'{k:08x}' for k in self.queue))
+                while not self._queueHasFreeSpace():
+                    logging.debug("Waiting for free space in TX Queue")
+                    time.sleep(0.5)
+                try:
+                    toResend = self.queue.popitem(last=False)
+                except KeyError:
+                    break
+                packetId, packet = toResend
+                # logging.warn(f"packet: {packetId:08x} {packet}")
+                resentQueue[packetId] = packet
+                if packet is False:
+                    continue
+                self._queueClaim()
+                if packet != toRadio:
+                    logging.debug(f"Resending packet ID {packetId:08x} {packet}")
+                self._sendToRadioImpl(packet)
+
+            # logging.warn("resentQueue: " + " ".join(f'{k:08x}' for k in resentQueue))
+            for packetId, packet in resentQueue.items():
+                if (
+                    self.queue.pop(packetId, False) is False
+                ):  # Packet got acked under us
+                    logging.debug(f"packet {packetId:08x} got acked under us")
+                    continue
+                if packet:
+                    self.queue[packetId] = packet
+            # logging.warn("queue + resentQueue: " + " ".join(f'{k:08x}' for k in self.queue))
 
     def _sendToRadioImpl(self, toRadio):
         """Send a ToRadio protobuf to the device"""
@@ -477,7 +658,26 @@ class MeshInterface:
         Done with initial config messages, now send regular MeshPackets
         to ask for settings and channels
         """
-        self.localNode.requestConfig()
+        self.localNode.requestChannels()
+
+    def _handleQueueStatusFromRadio(self, queueStatus):
+        self.queueStatus = queueStatus
+        logging.debug(
+            f"TX QUEUE free {queueStatus.free} of {queueStatus.maxlen}, res = {queueStatus.res}, id = {queueStatus.mesh_packet_id:08x} "
+        )
+
+        if queueStatus.res:
+            return
+
+        # logging.warn("queue: " + " ".join(f'{k:08x}' for k in self.queue))
+        justQueued = self.queue.pop(queueStatus.mesh_packet_id, None)
+
+        if justQueued is None and queueStatus.mesh_packet_id != 0:
+            self.queue[queueStatus.mesh_packet_id] = False
+            logging.debug(
+                f"Reply for unexpected packet ID {queueStatus.mesh_packet_id:08x}"
+            )
+        # logging.warn("queue: " + " ".join(f'{k:08x}' for k in self.queue))
 
     def _handleFromRadio(self, fromRadioBytes):
         """
@@ -486,7 +686,9 @@ class MeshInterface:
         Called by subclasses."""
         fromRadio = mesh_pb2.FromRadio()
         fromRadio.ParseFromString(fromRadioBytes)
-        logging.debug(f"in mesh_interface.py _handleFromRadio() fromRadioBytes: {fromRadioBytes}")
+        logging.debug(
+            f"in mesh_interface.py _handleFromRadio() fromRadioBytes: {fromRadioBytes}"
+        )
         asDict = google.protobuf.json_format.MessageToDict(fromRadio)
         logging.debug(f"Received from radio: {fromRadio}")
         if fromRadio.HasField("my_info"):
@@ -497,13 +699,17 @@ class MeshInterface:
             failmsg = None
             # Check for app too old
             if self.myInfo.min_app_version > OUR_APP_VERSION:
-                failmsg = "This device needs a newer python client, run 'pip install --upgrade meshtastic'."\
-                          "For more information see https://tinyurl.com/5bjsxu32"
+                failmsg = (
+                    "This device needs a newer python client, run 'pip install --upgrade meshtastic'."
+                    "For more information see https://tinyurl.com/5bjsxu32"
+                )
 
             # check for firmware too old
             if self.myInfo.max_channels == 0:
-                failmsg = "This version of meshtastic-python requires device firmware version 1.2 or later. "\
-                          "For more information see https://tinyurl.com/5bjsxu32"
+                failmsg = (
+                    "This version of meshtastic-python requires device firmware version 1.2 or later. "
+                    "For more information see https://tinyurl.com/5bjsxu32"
+                )
 
             if failmsg:
                 self.failure = Exception(failmsg)
@@ -524,21 +730,77 @@ class MeshInterface:
             if "user" in node:  # Some nodes might not have user/ids assigned yet
                 if "id" in node["user"]:
                     self.nodes[node["user"]["id"]] = node
-            publishingThread.queueWork(lambda: pub.sendMessage("meshtastic.node.updated",
-                                                               node=node, interface=self))
+            publishingThread.queueWork(
+                lambda: pub.sendMessage(
+                    "meshtastic.node.updated", node=node, interface=self
+                )
+            )
         elif fromRadio.config_complete_id == self.configId:
             # we ignore the config_complete_id, it is unneeded for our
             # stream API fromRadio.config_complete_id
             logging.debug(f"Config complete ID {self.configId}")
             self._handleConfigComplete()
+
         elif fromRadio.HasField("packet"):
             self._handlePacketFromRadio(fromRadio.packet)
+
+        elif fromRadio.HasField("queueStatus"):
+            self._handleQueueStatusFromRadio(fromRadio.queueStatus)
+
         elif fromRadio.rebooted:
             # Tell clients the device went away.  Careful not to call the overridden
             # subclass version that closes the serial port
             MeshInterface._disconnected(self)
 
             self._startConfig()  # redownload the node db etc...
+
+        elif fromRadio.config or fromRadio.moduleConfig:
+            if fromRadio.config.HasField("device"):
+                self.localNode.localConfig.device.CopyFrom(fromRadio.config.device)
+            elif fromRadio.config.HasField("position"):
+                self.localNode.localConfig.position.CopyFrom(fromRadio.config.position)
+            elif fromRadio.config.HasField("power"):
+                self.localNode.localConfig.power.CopyFrom(fromRadio.config.power)
+            elif fromRadio.config.HasField("network"):
+                self.localNode.localConfig.network.CopyFrom(fromRadio.config.network)
+            elif fromRadio.config.HasField("display"):
+                self.localNode.localConfig.display.CopyFrom(fromRadio.config.display)
+            elif fromRadio.config.HasField("lora"):
+                self.localNode.localConfig.lora.CopyFrom(fromRadio.config.lora)
+            elif fromRadio.config.HasField("bluetooth"):
+                self.localNode.localConfig.bluetooth.CopyFrom(
+                    fromRadio.config.bluetooth
+                )
+
+            elif fromRadio.moduleConfig.HasField("mqtt"):
+                self.localNode.moduleConfig.mqtt.CopyFrom(fromRadio.moduleConfig.mqtt)
+            elif fromRadio.moduleConfig.HasField("serial"):
+                self.localNode.moduleConfig.serial.CopyFrom(
+                    fromRadio.moduleConfig.serial
+                )
+            elif fromRadio.moduleConfig.HasField("external_notification"):
+                self.localNode.moduleConfig.external_notification.CopyFrom(
+                    fromRadio.moduleConfig.external_notification
+                )
+            elif fromRadio.moduleConfig.HasField("range_test"):
+                self.localNode.moduleConfig.range_test.CopyFrom(
+                    fromRadio.moduleConfig.range_test
+                )
+            elif fromRadio.moduleConfig.HasField("telemetry"):
+                self.localNode.moduleConfig.telemetry.CopyFrom(
+                    fromRadio.moduleConfig.telemetry
+                )
+            elif fromRadio.moduleConfig.HasField("canned_message"):
+                self.localNode.moduleConfig.canned_message.CopyFrom(
+                    fromRadio.moduleConfig.canned_message
+                )
+            elif fromRadio.moduleConfig.HasField("audio"):
+                self.localNode.moduleConfig.audio.CopyFrom(fromRadio.moduleConfig.audio)
+            elif fromRadio.moduleConfig.HasField("remote_hardware"):
+                self.localNode.moduleConfig.remote_hardware.CopyFrom(
+                    fromRadio.moduleConfig.remote_hardware
+                )
+
         else:
             logging.debug("Unexpected FromRadio payload")
 
@@ -611,8 +873,12 @@ class MeshInterface:
         # from might be missing if the nodenum was zero.
         if not hack and "from" not in asDict:
             asDict["from"] = 0
-            logging.error(f"Device returned a packet we sent, ignoring: {stripnl(asDict)}")
-            print(f"Error: Device returned a packet we sent, ignoring: {stripnl(asDict)}")
+            logging.error(
+                f"Device returned a packet we sent, ignoring: {stripnl(asDict)}"
+            )
+            print(
+                f"Error: Device returned a packet we sent, ignoring: {stripnl(asDict)}"
+            )
             return
         if "to" not in asDict:
             asDict["to"] = 0
@@ -631,16 +897,18 @@ class MeshInterface:
         # asObj = DotMap(asDict)
         topic = "meshtastic.receive"  # Generic unknown packet type
 
-        decoded = asDict["decoded"]
-        # The default MessageToDict converts byte arrays into base64 strings.
-        # We don't want that - it messes up data payload.  So slam in the correct
-        # byte array.
-        decoded["payload"] = meshPacket.decoded.payload
+        decoded = None
+        if "decoded" in asDict:
+            decoded = asDict["decoded"]
+            # The default MessageToDict converts byte arrays into base64 strings.
+            # We don't want that - it messes up data payload.  So slam in the correct
+            # byte array.
+            decoded["payload"] = meshPacket.decoded.payload
 
         # UNKNOWN_APP is the default protobuf portnum value, and therefore if not
         # set it will not be populated at all to make API usage easier, set
         # it to prevent confusion
-        if "portnum" not in decoded:
+        if decoded and "portnum" not in decoded:
             new_portnum = portnums_pb2.PortNum.Name(portnums_pb2.PortNum.UNKNOWN_APP)
             decoded["portnum"] = new_portnum
             logging.warning(f"portnum was not in decoded. Setting to:{new_portnum}")
@@ -682,8 +950,10 @@ class MeshInterface:
                 # we keep the responseHandler in dict until we get a non ack
                 handler = self.responseHandlers.pop(requestId, None)
                 if handler is not None:
-                    handler.callback(asDict)
+                    if not isAck or (isAck and handler.__name__ == "onAckNak"):
+                        handler.callback(asDict)
 
         logging.debug(f"Publishing {topic}: packet={stripnl(asDict)} ")
-        publishingThread.queueWork(lambda: pub.sendMessage(
-            topic, packet=asDict, interface=self))
+        publishingThread.queueWork(
+            lambda: pub.sendMessage(topic, packet=asDict, interface=self)
+        )

meshtastic/mqtt_pb2.py

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: mqtt.proto
-
+# source: meshtastic/mqtt.proto
+"""Generated protocol buffer code."""
 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
@@ -11,76 +12,25 @@ from google.protobuf import symbol_database as _symbol_database
 _sym_db = _symbol_database.Default()
 
 
-from . import mesh_pb2 as mesh__pb2
+from meshtastic import mesh_pb2 as meshtastic_dot_mesh__pb2
 
 
-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,])
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x15meshtastic/mqtt.proto\x1a\x15meshtastic/mesh.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(\tB_\n\x13\x63om.geeksville.meshB\nMQTTProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
 
 
 
-
-_SERVICEENVELOPE = _descriptor.Descriptor(
-  name='ServiceEnvelope',
-  full_name='ServiceEnvelope',
-  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 = DESCRIPTOR.message_types_by_name['ServiceEnvelope']
 ServiceEnvelope = _reflection.GeneratedProtocolMessageType('ServiceEnvelope', (_message.Message,), {
   'DESCRIPTOR' : _SERVICEENVELOPE,
-  '__module__' : 'mqtt_pb2'
+  '__module__' : 'meshtastic.mqtt_pb2'
   # @@protoc_insertion_point(class_scope:ServiceEnvelope)
   })
 _sym_db.RegisterMessage(ServiceEnvelope)
 
+if _descriptor._USE_C_DESCRIPTORS == False:
 
-DESCRIPTOR._options = None
+  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=48
+  _SERVICEENVELOPE._serialized_end=134
 # @@protoc_insertion_point(module_scope)

meshtastic/node.py

@@ -1,42 +1,59 @@
 """Node class
 """
 
-import logging
 import base64
+import logging
+import time
+
 from google.protobuf.json_format import MessageToJson
-from meshtastic import portnums_pb2, apponly_pb2, admin_pb2, channel_pb2
-from meshtastic.util import pskToString, stripnl, Timeout, our_exit, fromPSK
-
 
+from meshtastic import admin_pb2, apponly_pb2, channel_pb2, localonly_pb2, portnums_pb2
+from meshtastic.util import (
+    Timeout,
+    camel_to_snake,
+    fromPSK,
+    our_exit,
+    pskToString,
+    stripnl,
+)
 
 
 class Node:
     """A model of a (local or remote) node in the mesh
 
-    Includes methods for radioConfig and channels
+    Includes methods for localConfig, moduleConfig and channels
     """
 
     def __init__(self, iface, nodeNum, noProto=False):
         """Constructor"""
         self.iface = iface
         self.nodeNum = nodeNum
-        self.radioConfig = None
+        self.localConfig = localonly_pb2.LocalConfig()
+        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.ringtonePart = None
+
+        self.gotResponse = None
 
     def showChannels(self):
         """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:
-                #print('c.settings.psk:', c.settings.psk)
+                # print('c.settings.psk:', c.settings.psk)
                 cStr = stripnl(MessageToJson(c.settings))
                 # only show if there is no psk (meaning disabled channel)
                 if c.settings.psk:
-                    print(f"  {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}")
@@ -46,19 +63,75 @@ class Node:
     def showInfo(self):
         """Show human readable description of our node"""
         prefs = ""
-        if self.radioConfig and self.radioConfig.preferences:
-            prefs = stripnl(MessageToJson(self.radioConfig.preferences))
+        if self.localConfig:
+            prefs = stripnl(MessageToJson(self.localConfig))
         print(f"Preferences: {prefs}\n")
+        prefs = ""
+        if self.moduleConfig:
+            prefs = stripnl(MessageToJson(self.moduleConfig))
+        print(f"Module preferences: {prefs}\n")
         self.showChannels()
 
-    def requestConfig(self):
-        """Send regular MeshPackets to ask for settings and channels."""
-        logging.debug(f"requestConfig for nodeNum:{self.nodeNum}")
-        self.radioConfig = None
+    def requestChannels(self):
+        """Send regular MeshPackets to ask channels."""
+        logging.debug(f"requestChannels for nodeNum:{self.nodeNum}")
         self.channels = None
         self.partialChannels = []  # We keep our channels in a temp array until finished
 
-        self._requestSettings()
+        self._requestChannel(0)
+
+    def onResponseRequestSettings(self, p):
+        """Handle the response packets for requesting settings _requestSettings()"""
+        logging.debug(f"onResponseRequestSetting() p:{p}")
+        if "routing" in p["decoded"]:
+            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):
+        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 == "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."""
@@ -66,34 +139,77 @@ class Node:
         print("Writing modified channels to device")
         self.writeChannel(0)
 
-    def waitForConfig(self):
+    def waitForConfig(self, attribute="channels"):
         """Block until radio config is received. Returns True if config has been received."""
-        return self._timeout.waitForSet(self, attrs=('radioConfig', 'channels'))
+        return self._timeout.waitForSet(self, attrs=("localConfig", attribute))
 
-    def writeConfig(self):
-        """Write the current (edited) radioConfig to the device"""
-        if self.radioConfig is None:
-            our_exit("Error: No RadioConfig has been read")
+    def writeConfig(self, config_name):
+        """Write the current (edited) localConfig to the device"""
+        if self.localConfig is None:
+            our_exit("Error: No localConfig has been read")
 
         p = admin_pb2.AdminMessage()
-        p.set_radio.CopyFrom(self.radioConfig)
 
-        self._sendAdmin(p)
-        logging.debug("Wrote config")
+        if config_name == "device":
+            p.set_config.device.CopyFrom(self.localConfig.device)
+        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
+            )
+        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
-            returns: None if there is no channel found
+        channelIndex: number, typically 0-7; based on max number channels
+        returns: None if there is no channel found
         """
         ch = None
         if self.channels and 0 <= channelIndex < len(self.channels):
@@ -103,7 +219,10 @@ class Node:
     def deleteChannel(self, channelIndex):
         """Delete the specifed channelIndex and shift other channels up"""
         ch = self.channels[channelIndex]
-        if ch.role not in (channel_pb2.Channel.Role.SECONDARY, channel_pb2.Channel.Role.DISABLED):
+        if ch.role not in (
+            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
@@ -127,7 +246,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
@@ -147,44 +266,33 @@ class Node:
         else:
             return 0
 
-    def setOwner(self, long_name=None, short_name=None, is_licensed=False, team=None):
+    def setOwner(self, long_name=None, short_name=None, is_licensed=False):
         """Set device owner name"""
         logging.debug(f"in setOwner nodeNum:{self.nodeNum}")
-        nChars = 3
-        minChars = 2
-        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()
 
+        nChars = 4
         if long_name is not None:
+            long_name = long_name.strip()
             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.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.team:{p.set_owner.team}')
-        return self._sendAdmin(p)
+        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.is_licensed:{p.set_owner.is_licensed}")
+        # 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 getURL(self, includeAll: bool = True):
         """The sharable URL that describes the current channel"""
@@ -192,18 +300,23 @@ class Node:
         channelSet = apponly_pb2.ChannelSet()
         if self.channels:
             for c in self.channels:
-                if c.role == channel_pb2.Channel.Role.PRIMARY or (includeAll and c.role == channel_pb2.Channel.Role.SECONDARY):
+                if c.role == channel_pb2.Channel.Role.PRIMARY or (
+                    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')
-        return f"https://www.meshtastic.org/d/#{s}".replace("=", "")
+        s = base64.urlsafe_b64encode(some_bytes).decode("ascii")
+        s = s.replace("=", "").replace("+", "-").replace("/", "_")
+        return f"https://meshtastic.org/e/#{s}"
 
     def setURL(self, url):
         """Set mesh network URL"""
-        if self.radioConfig is None:
-            our_exit("Warning: No RadioConfig has been read")
+        if self.localConfig is None:
+            our_exit("Warning: No Config has been read")
 
-        # URLs are of the form https://www.meshtastic.org/d/#{base64_channel_set}
+        # URLs are of the form https://meshtastic.org/d/#{base64_channel_set}
         # Split on '/#' to find the base64 encoded channel settings
         splitURL = url.split("/#")
         b64 = splitURL[-1]
@@ -213,68 +326,186 @@ 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 = channel_pb2.Channel.Role.PRIMARY if i == 0 else channel_pb2.Channel.Role.SECONDARY
+            ch.role = (
+                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 onResponseRequestSettings(self, p):
-        """Handle the response packet for requesting settings _requestSettings()"""
-        logging.debug(f'onResponseRequestSetting() p:{p}')
+    def onResponseRequestRingtone(self, p):
+        """Handle the response packet for requesting ringtone part 1"""
+        logging.debug(f"onResponseRequestRingtone() p:{p}")
         errorFound = False
-        if 'routing' in p["decoded"]:
+        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
+            if "decoded" in p:
+                if "admin" in p["decoded"]:
+                    if "raw" in p["decoded"]["admin"]:
+                        self.ringtonePart = p["decoded"]["admin"][
+                            "raw"
+                        ].get_ringtone_response
+                        logging.debug(f"self.ringtonePart:{self.ringtonePart}")
+                        self.gotResponse = True
 
+    def get_ringtone(self):
+        """Get the ringtone. Concatenate all pieces together and return a single string."""
+        logging.debug(f"in get_ringtone()")
+        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)
 
-    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
+            logging.debug(f"self.ringtone:{self.ringtone}")
 
-        # 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)")
+            self.ringtone = ""
+            if self.ringtonePart:
+                self.ringtone += self.ringtonePart
 
-        return self._sendAdmin(p, wantResponse=True, onResponse=self.onResponseRequestSettings)
+        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":
+                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.cannedPluginMessageMessages = p["decoded"]["admin"][
+                            "raw"
+                        ].get_canned_message_module_messages_response
+                        logging.debug(
+                            f"self.cannedPluginMessageMessages:{self.cannedPluginMessageMessages}"
+                        )
+                        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()")
+        if not self.cannedPluginMessage:
+            p1 = admin_pb2.AdminMessage()
+            p1.get_canned_message_module_messages_request = True
+            self.gotResponse = False
+            self._sendAdmin(
+                p1,
+                wantResponse=True,
+                onResponse=self.onResponseRequestCannedMessagePluginMessageMessages,
+            )
+            while self.gotResponse is False:
+                time.sleep(0.1)
+
+            logging.debug(
+                f"self.cannedPluginMessageMessages:{self.cannedPluginMessageMessages}"
+            )
+
+            self.cannedPluginMessage = ""
+            if self.cannedPluginMessageMessages:
+                self.cannedPluginMessage += self.cannedPluginMessageMessages
+
+        print(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."""
+
+        if len(message) > 200:
+            our_exit("Warning: The canned message must be less than 200 characters.")
+
+        # split into chunks
+        chunks = []
+        chunks_size = 200
+        for i in range(0, len(message), 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, 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
+
+            logging.debug(f"Setting canned message '{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 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)
 
@@ -284,7 +515,100 @@ class Node:
         p.reboot_seconds = secs
         logging.info(f"Telling node to reboot in {secs} seconds")
 
-        return self._sendAdmin(p)
+        # 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 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."""
+        p = admin_pb2.AdminMessage()
+        p.shutdown_seconds = secs
+        logging.info(f"Telling node to shutdown 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 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"""
@@ -308,10 +632,49 @@ class Node:
             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 foreward 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 foreward progress
@@ -323,7 +686,9 @@ class Node:
 
         # 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
+        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")
@@ -336,37 +701,70 @@ class Node:
         else:
             self._requestChannel(index + 1)
 
+    def onAckNak(self, p):
+        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(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)")
+            print(
+                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(p, wantResponse=True, onResponse=self.onResponseRequestChannel)
-
+        return self._sendAdmin(
+            p, wantResponse=True, onResponse=self.onResponseRequestChannel
+        )
 
     # pylint: disable=R1710
-    def _sendAdmin(self, p: admin_pb2.AdminMessage, wantResponse=False,
-                   onResponse=None, adminIndex=0):
+    def _sendAdmin(
+        self,
+        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(f"Not sending packet because protocol use is disabled by noProto")
+            logging.warning(
+                f"Not sending packet because protocol use is disabled by noProto"
+            )
         else:
-            if adminIndex == 0:  # unless a special channel index was used, we want to use the admin index
+            if (
+                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(p, self.nodeNum,
-                                       portNum=portnums_pb2.PortNum.ADMIN_APP,
-                                       wantAck=True,
-                                       wantResponse=wantResponse,
-                                       onResponse=onResponse,
-                                       channelIndex=adminIndex)
+            return self.iface.sendData(
+                p,
+                self.nodeNum,
+                portNum=portnums_pb2.PortNum.ADMIN_APP,
+                wantAck=False,
+                wantResponse=wantResponse,
+                onResponse=onResponse,
+                channelIndex=adminIndex,
+            )

meshtastic/portnums_pb2.py

@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: portnums.proto
-
+# source: meshtastic/portnums.proto
+"""Generated protocol buffer code."""
 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
@@ -14,96 +15,9 @@ _sym_db = _symbol_database.Default()
 
 
 
-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'
-)
-
-_PORTNUM = _descriptor.EnumDescriptor(
-  name='PortNum',
-  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 = _descriptor_pool.Default().AddSerializedFile(b'\n\x19meshtastic/portnums.proto*\xa4\x03\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\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\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\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')
 
+_PORTNUM = DESCRIPTOR.enum_types_by_name['PortNum']
 PortNum = enum_type_wrapper.EnumTypeWrapper(_PORTNUM)
 UNKNOWN_APP = 0
 TEXT_MESSAGE_APP = 1
@@ -112,21 +26,27 @@ POSITION_APP = 3
 NODEINFO_APP = 4
 ROUTING_APP = 5
 ADMIN_APP = 6
+TEXT_MESSAGE_COMPRESSED_APP = 7
+WAYPOINT_APP = 8
+AUDIO_APP = 9
 REPLY_APP = 32
 IP_TUNNEL_APP = 33
 SERIAL_APP = 64
 STORE_FORWARD_APP = 65
 RANGE_TEST_APP = 66
-ENVIRONMENTAL_MEASUREMENT_APP = 67
+TELEMETRY_APP = 67
 ZPS_APP = 68
+SIMULATOR_APP = 69
+TRACEROUTE_APP = 70
 PRIVATE_APP = 256
 ATAK_FORWARDER = 257
 MAX = 511
 
 
-DESCRIPTOR.enum_types_by_name['PortNum'] = _PORTNUM
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+if _descriptor._USE_C_DESCRIPTORS == False:
 
-
-DESCRIPTOR._options = None
+  DESCRIPTOR._options = None
+  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\010PortnumsZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+  _PORTNUM._serialized_start=30
+  _PORTNUM._serialized_end=450
 # @@protoc_insertion_point(module_scope)

meshtastic/remote_hardware.py

@@ -1,20 +1,32 @@
 """Remote hardware
 """
 import logging
+
 from pubsub import pub
+
 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"]
-    gpioValue = hw["gpioValue"]
-    #print(f'mask:{interface.mask}')
+    if "gpioValue" in hw:
+        gpioValue = hw["gpioValue"]
+    else:
+        if not "gpioMask" in hw:
+            # we did get a reply, but due to protobufs, 0 for numeric value is not sent
+            # see https://developers.google.com/protocol-buffers/docs/proto3#default
+            # so, we set it here
+            gpioValue = 0
+
+    # print(f'mask:{interface.mask}')
     value = int(gpioValue) & int(interface.mask)
-    print(f'Received RemoteHardware typ={hw["typ"]}, gpio_value={gpioValue} value={value}')
+    print(
+        f'Received RemoteHardware type={hw["type"]}, gpio_value={gpioValue} value={value}'
+    )
     interface.gotResponse = True
 
 
@@ -35,46 +47,55 @@ class RemoteHardwareClient:
         ch = iface.localNode.getChannelByName("gpio")
         if not ch:
             our_exit(
-                "Warning: No channel named 'gpio' was found.\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"\
-                "the other devices using the url from the device where the channel was added.")
+                "Warning: No channel named 'gpio' was found.\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"
+                "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(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,
-                                   wantResponse=wantResponse, onResponse=onResponse)
+            our_exit(
+                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,
+            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.typ = remote_hardware_pb2.HardwareMessage.Type.WRITE_GPIOS
+        r.type = 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.typ = remote_hardware_pb2.HardwareMessage.Type.READ_GPIOS
+        r.type = 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.typ = remote_hardware_pb2.HardwareMessage.Type.WATCH_GPIOS
+        r.type = 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,8 +1,9 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: remote_hardware.proto
-
+# source: meshtastic/remote_hardware.proto
+"""Generated protocol buffer code."""
 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
@@ -13,112 +14,25 @@ _sym_db = _symbol_database.Default()
 
 
 
-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'
-)
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n meshtastic/remote_hardware.proto\"\xcb\x01\n\x0fHardwareMessage\x12#\n\x04type\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\x42\x63\n\x13\x63om.geeksville.meshB\x0eRemoteHardwareZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
 
 
 
-_HARDWAREMESSAGE_TYPE = _descriptor.EnumDescriptor(
-  name='Type',
-  full_name='HardwareMessage.Type',
-  filename=None,
-  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 = DESCRIPTOR.message_types_by_name['HardwareMessage']
+_HARDWAREMESSAGE_TYPE = _HARDWAREMESSAGE.enum_types_by_name['Type']
 HardwareMessage = _reflection.GeneratedProtocolMessageType('HardwareMessage', (_message.Message,), {
   'DESCRIPTOR' : _HARDWAREMESSAGE,
-  '__module__' : 'remote_hardware_pb2'
+  '__module__' : 'meshtastic.remote_hardware_pb2'
   # @@protoc_insertion_point(class_scope:HardwareMessage)
   })
 _sym_db.RegisterMessage(HardwareMessage)
 
+if _descriptor._USE_C_DESCRIPTORS == False:
 
-DESCRIPTOR._options = None
+  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._serialized_start=37
+  _HARDWAREMESSAGE._serialized_end=240
+  _HARDWAREMESSAGE_TYPE._serialized_start=132
+  _HARDWAREMESSAGE_TYPE._serialized_end=240
 # @@protoc_insertion_point(module_scope)

meshtastic/rtttl_pb2.py

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: meshtastic/rtttl.proto
+"""Generated protocol buffer code."""
+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()
+
+
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x16meshtastic/rtttl.proto\"\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')
+
+
+
+_RTTTLCONFIG = DESCRIPTOR.message_types_by_name['RTTTLConfig']
+RTTTLConfig = _reflection.GeneratedProtocolMessageType('RTTTLConfig', (_message.Message,), {
+  'DESCRIPTOR' : _RTTTLCONFIG,
+  '__module__' : 'meshtastic.rtttl_pb2'
+  # @@protoc_insertion_point(class_scope:RTTTLConfig)
+  })
+_sym_db.RegisterMessage(RTTTLConfig)
+
+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=26
+  _RTTTLCONFIG._serialized_end=57
+# @@protoc_insertion_point(module_scope)

meshtastic/serial_interface.py

@@ -1,16 +1,18 @@
 """ Serial interface class
 """
 import logging
-import time
 import platform
+import time
+
 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"""
 
@@ -24,8 +26,10 @@ class SerialInterface(StreamInterface):
         """
         self.noProto = noProto
 
-        if devPath is None:
-            ports = meshtastic.util.findPorts()
+        self.devPath = devPath
+
+        if self.devPath is None:
+            ports = meshtastic.util.findPorts(True)
             logging.debug(f"ports:{ports}")
             if len(ports) == 0:
                 meshtastic.util.our_exit("Warning: No Meshtastic devices detected.")
@@ -34,34 +38,35 @@ class SerialInterface(StreamInterface):
                 message += f"  Ports detected:{ports}"
                 meshtastic.util.our_exit(message)
             else:
-                devPath = ports[0]
+                self.devPath = ports[0]
 
-        logging.debug(f"Connecting to {devPath}")
+        logging.debug(f"Connecting to {self.devPath}")
 
         # 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 not self.noProto:
-            if platform.system() != 'Windows':
-                with open(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(devPath, 921600, exclusive=True, timeout=0.5, write_timeout=0)
-        if not self.noProto:
-            self.stream.flush()
+        if platform.system() != "Windows":
+            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)
 
-        StreamInterface.__init__(self, debugOut=debugOut, noProto=noProto, connectNow=connectNow)
+        self.stream = serial.Serial(
+            self.devPath, 115200, exclusive=True, timeout=0.5, write_timeout=0
+        )
+        self.stream.flush()
+        time.sleep(0.1)
+
+        StreamInterface.__init__(
+            self, debugOut=debugOut, noProto=noProto, connectNow=connectNow
+        )
 
     def close(self):
         """Close a connection to the device"""
-        if not self.noProto:
-            self.stream.flush()
-            time.sleep(0.1)
-            self.stream.flush()
-            time.sleep(0.1)
+        self.stream.flush()
+        time.sleep(0.1)
+        self.stream.flush()
+        time.sleep(0.1)
         logging.debug("Closing Serial stream")
         StreamInterface.close(self)

meshtastic/storeforward_pb2.py

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: storeforward.proto
-
+# source: meshtastic/storeforward.proto
+"""Generated protocol buffer code."""
 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
@@ -13,337 +14,39 @@ _sym_db = _symbol_database.Default()
 
 
 
-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'
-)
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1dmeshtastic/storeforward.proto\"\xbe\x06\n\x0fStoreAndForward\x12,\n\x02rr\x18\x01 \x01(\x0e\x32 .StoreAndForward.RequestResponse\x12,\n\x05stats\x18\x02 \x01(\x0b\x32\x1b.StoreAndForward.StatisticsH\x00\x12+\n\x07history\x18\x03 \x01(\x0b\x32\x18.StoreAndForward.HistoryH\x00\x12/\n\theartbeat\x18\x04 \x01(\x0b\x32\x1a.StoreAndForward.HeartbeatH\x00\x12\x0f\n\x05\x65mpty\x18\x05 \x01(\x08H\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\"\x89\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\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')
 
 
 
-_STOREANDFORWARD_REQUESTRESPONSE = _descriptor.EnumDescriptor(
-  name='RequestResponse',
-  full_name='StoreAndForward.RequestResponse',
-  filename=None,
-  file=DESCRIPTOR,
-  values=[
-    _descriptor.EnumValueDescriptor(
-      name='UNSET', index=0, number=0,
-      serialized_options=None,
-      type=None),
-    _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 = DESCRIPTOR.message_types_by_name['StoreAndForward']
+_STOREANDFORWARD_STATISTICS = _STOREANDFORWARD.nested_types_by_name['Statistics']
+_STOREANDFORWARD_HISTORY = _STOREANDFORWARD.nested_types_by_name['History']
+_STOREANDFORWARD_HEARTBEAT = _STOREANDFORWARD.nested_types_by_name['Heartbeat']
+_STOREANDFORWARD_REQUESTRESPONSE = _STOREANDFORWARD.enum_types_by_name['RequestResponse']
 StoreAndForward = _reflection.GeneratedProtocolMessageType('StoreAndForward', (_message.Message,), {
 
   'Statistics' : _reflection.GeneratedProtocolMessageType('Statistics', (_message.Message,), {
     'DESCRIPTOR' : _STOREANDFORWARD_STATISTICS,
-    '__module__' : 'storeforward_pb2'
+    '__module__' : 'meshtastic.storeforward_pb2'
     # @@protoc_insertion_point(class_scope:StoreAndForward.Statistics)
     })
   ,
 
   'History' : _reflection.GeneratedProtocolMessageType('History', (_message.Message,), {
     'DESCRIPTOR' : _STOREANDFORWARD_HISTORY,
-    '__module__' : 'storeforward_pb2'
+    '__module__' : 'meshtastic.storeforward_pb2'
     # @@protoc_insertion_point(class_scope:StoreAndForward.History)
     })
   ,
 
   'Heartbeat' : _reflection.GeneratedProtocolMessageType('Heartbeat', (_message.Message,), {
     'DESCRIPTOR' : _STOREANDFORWARD_HEARTBEAT,
-    '__module__' : 'storeforward_pb2'
+    '__module__' : 'meshtastic.storeforward_pb2'
     # @@protoc_insertion_point(class_scope:StoreAndForward.Heartbeat)
     })
   ,
   'DESCRIPTOR' : _STOREANDFORWARD,
-  '__module__' : 'storeforward_pb2'
+  '__module__' : 'meshtastic.storeforward_pb2'
   # @@protoc_insertion_point(class_scope:StoreAndForward)
   })
 _sym_db.RegisterMessage(StoreAndForward)
@@ -351,6 +54,18 @@ _sym_db.RegisterMessage(StoreAndForward.Statistics)
 _sym_db.RegisterMessage(StoreAndForward.History)
 _sym_db.RegisterMessage(StoreAndForward.Heartbeat)
 
+if _descriptor._USE_C_DESCRIPTORS == False:
 
-DESCRIPTOR._options = None
+  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._serialized_start=34
+  _STOREANDFORWARD._serialized_end=864
+  _STOREANDFORWARD_STATISTICS._serialized_start=257
+  _STOREANDFORWARD_STATISTICS._serialized_end=462
+  _STOREANDFORWARD_HISTORY._serialized_start=464
+  _STOREANDFORWARD_HISTORY._serialized_end=537
+  _STOREANDFORWARD_HEARTBEAT._serialized_start=539
+  _STOREANDFORWARD_HEARTBEAT._serialized_end=585
+  _STOREANDFORWARD_REQUESTRESPONSE._serialized_start=588
+  _STOREANDFORWARD_REQUESTRESPONSE._serialized_end=853
 # @@protoc_insertion_point(module_scope)

meshtastic/stream_interface.py

@@ -4,15 +4,14 @@ import logging
 import threading
 import time
 import traceback
+
 import serial
 
-
 from meshtastic.mesh_interface import MeshInterface
-from meshtastic.util import stripnl
-
+from meshtastic.util import is_windows11, stripnl
 
 START1 = 0x94
-START2 = 0xc3
+START2 = 0xC3
 HEADER_LEN = 4
 MAX_TO_FROM_RADIO_SIZE = 512
 
@@ -32,12 +31,15 @@ class StreamInterface(MeshInterface):
             Exception: [description]
         """
 
-        if not hasattr(self, 'stream') and not noProto:
+        if not hasattr(self, "stream") and not noProto:
             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
 
+        self.is_windows11 = is_windows11()
+
         # FIXME, figure out why daemon=True causes reader thread to exit too early
         self._rxThread = threading.Thread(target=self.__reader, args=(), daemon=True)
 
@@ -62,8 +64,7 @@ class StreamInterface(MeshInterface):
         # because we want to ensure it is looking for START1)
         p = bytearray([START2] * 32)
         self._writeBytes(p)
-        if not self.noProto:
-            time.sleep(0.1)  # wait 100ms to give device time to start running
+        time.sleep(0.1)  # wait 100ms to give device time to start running
 
         self._rxThread.start()
 
@@ -89,8 +90,11 @@ class StreamInterface(MeshInterface):
         if self.stream:  # ignore writes when stream is closed
             self.stream.write(b)
             self.stream.flush()
-            # we sleep here to give the TBeam a chance to work
-            if not self.noProto:
+            # win11 might need a bit more time, too
+            if self.is_windows11:
+                time.sleep(1.0)
+            else:
+                # we sleep here to give the TBeam a chance to work
                 time.sleep(0.1)
 
     def _readBytes(self, length):
@@ -106,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])
-        logging.debug(f'sending header:{header} b:{b}')
+        header = bytes([START1, START2, (bufLen >> 8) & 0xFF, bufLen & 0xFF])
+        logging.debug(f"sending header:{header} b:{b}")
         self._writeBytes(header + b)
 
     def close(self):
@@ -122,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(f"read returned {b}")
+                # logging.debug("In reader loop")
+                # 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
@@ -146,38 +150,54 @@ 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 ptr == HEADER_LEN - 1:  # we _just_ finished reading the header, validate length
+                        if (
+                            ptr == HEADER_LEN - 1
+                        ):  # we _just_ finished reading the header, validate length
                             if packetlen > MAX_TO_FROM_RADIO_SIZE:
-                                self._rxBuf = empty  # length was out out bounds, restart
+                                self._rxBuf = (
+                                    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(f"Error while handling message from radio {ex}")
+                                logging.error(
+                                    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 not self._wantExit:  # We might intentionally get an exception during shutdown
-                logging.warning(f"Meshtastic serial port disconnected, disconnecting... {ex}")
+            if (
+                not self._wantExit
+            ):  # We might intentionally get an exception during shutdown
+                logging.warning(
+                    f"Meshtastic serial port disconnected, disconnecting... {ex}"
+                )
         except OSError as ex:
-            if not self._wantExit:  # We might intentionally get an exception during shutdown
-                logging.error(f"Unexpected OSError, terminating meshtastic reader... {ex}")
+            if (
+                not self._wantExit
+            ):  # We might intentionally get an exception during shutdown
+                logging.error(
+                    f"Unexpected OSError, terminating meshtastic reader... {ex}"
+                )
         except Exception as ex:
-            logging.error(f"Unexpected exception, terminating meshtastic reader... {ex}")
+            logging.error(
+                f"Unexpected exception, terminating meshtastic reader... {ex}"
+            )
         finally:
             logging.debug("reader is exiting")
             self._disconnected()

meshtastic/supported_device.py

@@ -0,0 +1,228 @@
+""" Supported Meshtastic Devices - This is a class and collection of Meshtastic devices.
+    It is used for auto detection as to which device might be connected.
+"""
+
+# 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:
+    """Devices supported on Meshtastic"""
+
+    def __init__(
+        self,
+        name,
+        version=None,
+        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"
+
+        # 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_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_mac = baseport_on_mac
+        self.baseport_on_windows = baseport_on_windows
+
+
+# supported devices
+tbeam_v0_7 = SupportedDevice(
+    name="T-Beam",
+    version="0.7",
+    for_firmware="tbeam0.7",
+    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(
+    name="T-Beam",
+    version="1.1",
+    for_firmware="tbeam",
+    baseport_on_linux="ttyACM",
+    baseport_on_mac="cu.usbmodem",
+    usb_vendor_id_in_hex="1a86",
+    usb_product_id_in_hex="55d4",
+)
+tbeam_M8N = SupportedDevice(
+    name="T-Beam",
+    version="M8N",
+    for_firmware="tbeam",
+    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(
+    name="T-Beam",
+    version="M8N_SX1262",
+    for_firmware="tbeam",
+    baseport_on_linux="ttyACM",
+    baseport_on_mac="cu.usbmodem",
+    usb_vendor_id_in_hex="1a86",
+    usb_product_id_in_hex="55d4",
+)
+tlora_v1 = SupportedDevice(
+    name="T-Lora",
+    version="1",
+    for_firmware="tlora-v1",
+    baseport_on_linux="ttyUSB",
+    baseport_on_mac="cu.usbserial",
+    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(
+    name="T-Echo",
+    version="1",
+    for_firmware="t-echo-1",
+    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 = 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(
+    name="RAK 4631 19003",
+    version="",
+    for_firmware="rak4631_19003",
+    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 = [
+    tbeam_v0_7,
+    tbeam_v1_1,
+    tbeam_M8N,
+    tbeam_M8N_SX1262,
+    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

@@ -6,11 +6,18 @@ from typing import AnyStr
 
 from meshtastic.stream_interface import StreamInterface
 
+
 class TCPInterface(StreamInterface):
     """Interface class for meshtastic devices over a TCP link"""
 
-    def __init__(self, hostname: AnyStr, debugOut=None, noProto=False,
-                 connectNow=True, portNumber=4403):
+    def __init__(
+        self,
+        hostname: AnyStr,
+        debugOut=None,
+        noProto=False,
+        connectNow=True,
+        portNumber=4403,
+    ):
         """Constructor, opens a connection to a specified IP address/hostname
 
         Keyword Arguments:
@@ -30,8 +37,15 @@ class TCPInterface(StreamInterface):
         else:
             self.socket = None
 
-        StreamInterface.__init__(self, debugOut=debugOut, noProto=noProto,
-                                 connectNow=connectNow)
+        StreamInterface.__init__(
+            self, debugOut=debugOut, noProto=noProto, connectNow=connectNow
+        )
+
+    def _socket_shutdown(self):
+        """Shutdown the socket.
+        Note: Broke out this line so the exception could be unit tested.
+        """
+        self.socket.shutdown(socket.SHUT_RDWR)
 
     def myConnect(self):
         """Connect to socket"""
@@ -48,7 +62,7 @@ class TCPInterface(StreamInterface):
         self._wantExit = True
         if not self.socket is None:
             try:
-                self.socket.shutdown(socket.SHUT_RDWR)
+                self._socket_shutdown()
             except:
                 pass  # Ignore errors in shutdown, because we might have a race with the server
             self.socket.close()

meshtastic/telemetry_pb2.py

@@ -0,0 +1,84 @@
+# -*- 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 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)
+
+_sym_db = _symbol_database.Default()
+
+
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1ameshtastic/telemetry.proto\"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\"\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\"\xb5\x01\n\tTelemetry\x12\x0c\n\x04time\x18\x01 \x01(\x07\x12(\n\x0e\x64\x65vice_metrics\x18\x02 \x01(\x0b\x32\x0e.DeviceMetricsH\x00\x12\x32\n\x13\x65nvironment_metrics\x18\x03 \x01(\x0b\x32\x13.EnvironmentMetricsH\x00\x12\x31\n\x13\x61ir_quality_metrics\x18\x04 \x01(\x0b\x32\x12.AirQualityMetricsH\x00\x42\t\n\x07variant*\xc7\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\rBd\n\x13\x63om.geeksville.meshB\x0fTelemetryProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+
+_TELEMETRYSENSORTYPE = DESCRIPTOR.enum_types_by_name['TelemetrySensorType']
+TelemetrySensorType = enum_type_wrapper.EnumTypeWrapper(_TELEMETRYSENSORTYPE)
+SENSOR_UNSET = 0
+BME280 = 1
+BME680 = 2
+MCP9808 = 3
+INA260 = 4
+INA219 = 5
+BMP280 = 6
+SHTC3 = 7
+LPS22 = 8
+QMC6310 = 9
+QMI8658 = 10
+QMC5883L = 11
+SHT31 = 12
+PMSA003I = 13
+
+
+_DEVICEMETRICS = DESCRIPTOR.message_types_by_name['DeviceMetrics']
+_ENVIRONMENTMETRICS = DESCRIPTOR.message_types_by_name['EnvironmentMetrics']
+_AIRQUALITYMETRICS = DESCRIPTOR.message_types_by_name['AirQualityMetrics']
+_TELEMETRY = DESCRIPTOR.message_types_by_name['Telemetry']
+DeviceMetrics = _reflection.GeneratedProtocolMessageType('DeviceMetrics', (_message.Message,), {
+  'DESCRIPTOR' : _DEVICEMETRICS,
+  '__module__' : 'meshtastic.telemetry_pb2'
+  # @@protoc_insertion_point(class_scope:DeviceMetrics)
+  })
+_sym_db.RegisterMessage(DeviceMetrics)
+
+EnvironmentMetrics = _reflection.GeneratedProtocolMessageType('EnvironmentMetrics', (_message.Message,), {
+  'DESCRIPTOR' : _ENVIRONMENTMETRICS,
+  '__module__' : 'meshtastic.telemetry_pb2'
+  # @@protoc_insertion_point(class_scope:EnvironmentMetrics)
+  })
+_sym_db.RegisterMessage(EnvironmentMetrics)
+
+AirQualityMetrics = _reflection.GeneratedProtocolMessageType('AirQualityMetrics', (_message.Message,), {
+  'DESCRIPTOR' : _AIRQUALITYMETRICS,
+  '__module__' : 'meshtastic.telemetry_pb2'
+  # @@protoc_insertion_point(class_scope:AirQualityMetrics)
+  })
+_sym_db.RegisterMessage(AirQualityMetrics)
+
+Telemetry = _reflection.GeneratedProtocolMessageType('Telemetry', (_message.Message,), {
+  'DESCRIPTOR' : _TELEMETRY,
+  '__module__' : 'meshtastic.telemetry_pb2'
+  # @@protoc_insertion_point(class_scope:Telemetry)
+  })
+_sym_db.RegisterMessage(Telemetry)
+
+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=802
+  _TELEMETRYSENSORTYPE._serialized_end=1001
+  _DEVICEMETRICS._serialized_start=30
+  _DEVICEMETRICS._serialized_end=135
+  _ENVIRONMENTMETRICS._serialized_start=138
+  _ENVIRONMENTMETRICS._serialized_end=293
+  _AIRQUALITYMETRICS._serialized_start=296
+  _AIRQUALITYMETRICS._serialized_end=615
+  _TELEMETRY._serialized_start=618
+  _TELEMETRY._serialized_end=799
+# @@protoc_insertion_point(module_scope)

meshtastic/test.py

@@ -2,17 +2,18 @@
    messages and report back if successful.
 """
 import logging
-import time
 import sys
+import time
 import traceback
+
 from dotmap import DotMap
 from pubsub import pub
+
 import meshtastic.util
 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
 
@@ -52,7 +53,9 @@ def subscribe():
     pub.subscribe(onNode, "meshtastic.node")
 
 
-def testSend(fromInterface, toInterface, isBroadcast=False, asBinary=False, wantAck=False):
+def testSend(
+    fromInterface, toInterface, isBroadcast=False, asBinary=False, wantAck=False
+):
     """
     Sends one test packet between two nodes and then returns success or failure
 
@@ -63,6 +66,7 @@ def testSend(fromInterface, toInterface, isBroadcast=False, asBinary=False, want
     Returns:
         boolean -- True for success
     """
+    # pylint: disable=W0603
     global receivedPackets
     receivedPackets = []
     fromNode = fromInterface.myInfo.my_node_num
@@ -72,18 +76,19 @@ def testSend(fromInterface, toInterface, isBroadcast=False, asBinary=False, want
     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((f"Binary {testNumber}").encode(
-            "utf-8"), toNode, wantAck=wantAck)
+        fromInterface.sendData(
+            (f"Binary {testNumber}").encode("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
 
@@ -94,20 +99,24 @@ def runTests(numTests=50, wantAck=False, maxFailures=0):
     numFail = 0
     numSuccess = 0
     for _ in range(numTests):
+        # pylint: disable=W0603
         global testNumber
         testNumber = testNumber + 1
         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)
 
@@ -137,7 +146,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):
@@ -146,15 +155,24 @@ def testAll(numTests=5):
     This is called from the cli with the "--test" option.
 
     """
-    ports = meshtastic.util.findPorts()
+    ports = meshtastic.util.findPorts(True)
     if len(ports) < 2:
-        meshtastic.util.our_exit("Warning: Must have at least two devices connected to USB.")
+        meshtastic.util.our_exit(
+            "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(map(lambda port: SerialInterface(
-        port, debugOut=openDebugLog(port), connectNow=True), ports))
+    interfaces = list(
+        map(
+            lambda port: SerialInterface(
+                port, debugOut=openDebugLog(port), connectNow=True
+            ),
+            ports,
+        )
+    )
 
     logging.info("Ports opened, starting test")
     result = testThread(numTests)

meshtastic/tests/conftest.py

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

meshtastic/tests/test_ble_interface.py

@@ -1,12 +1,17 @@
 """Meshtastic unit tests for ble_interface.py"""
 
 
+from unittest.mock import patch
+
 import pytest
 
 from ..ble_interface import BLEInterface
 
+
 @pytest.mark.unit
-def test_BLEInterface():
+@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 = BLEInterface("foo", debugOut=True, noProto=True)
     iface.close()
+    mock_platform.assert_called()

meshtastic/tests/test_examples.py

@@ -6,19 +6,24 @@ 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('source venv/bin/activate; python3 examples/hello_world_serial.py')
+    return_value, _ = subprocess.getstatusoutput(
+        "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('source venv/bin/activate; python3 examples/hello_world_serial.py hello')
+    return_value, _ = subprocess.getstatusoutput(
+        "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

@@ -0,0 +1,57 @@
+"""Meshtastic unit tests for __init__.py"""
+
+import logging
+import re
+from unittest.mock import MagicMock
+
+import pytest
+
+from meshtastic.__init__ import _onNodeInfoReceive, _onPositionReceive, _onTextReceive
+
+from ..globals import Globals
+from ..serial_interface import SerialInterface
+
+
+@pytest.mark.unit
+def test_init_onTextReceive_with_exception(caplog):
+    """Test _onTextReceive"""
+    args = MagicMock()
+    Globals.getInstance().set_args(args)
+    iface = MagicMock(autospec=SerialInterface)
+    packet = {}
+    with caplog.at_level(logging.DEBUG):
+        _onTextReceive(iface, packet)
+    assert re.search(r"in _onTextReceive", caplog.text, re.MULTILINE)
+    assert re.search(r"Malformatted", caplog.text, re.MULTILINE)
+
+
+@pytest.mark.unit
+def test_init_onPositionReceive(caplog):
+    """Test _onPositionReceive"""
+    args = MagicMock()
+    Globals.getInstance().set_args(args)
+    iface = MagicMock(autospec=SerialInterface)
+    packet = {"from": "foo", "decoded": {"position": {}}}
+    with caplog.at_level(logging.DEBUG):
+        _onPositionReceive(iface, packet)
+    assert re.search(r"in _onPositionReceive", caplog.text, re.MULTILINE)
+
+
+@pytest.mark.unit
+def test_init_onNodeInfoReceive(caplog, iface_with_nodes):
+    """Test _onNodeInfoReceive"""
+    args = MagicMock()
+    Globals.getInstance().set_args(args)
+    iface = iface_with_nodes
+    iface.myInfo.my_node_num = 2475227164
+    packet = {
+        "from": "foo",
+        "decoded": {
+            "user": {
+                "id": "bar",
+            },
+        },
+    }
+    with caplog.at_level(logging.DEBUG):
+        _onNodeInfoReceive(iface, packet)
+    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')
-    assert re.match(r'usage: meshtastic', out)
+    return_value, out = subprocess.getstatusoutput("meshtastic")
+    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')
-    assert re.match(r'usage: mesh-tunnel', out)
+    return_value, out = subprocess.getstatusoutput("mesh-tunnel")
+    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')
-    assert re.match(r'[0-9]+\.[0-9]+\.[0-9]', out)
+    return_value, out = subprocess.getstatusoutput("meshtastic --version")
+    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')
-    assert re.match(r'usage: meshtastic ', out)
+    return_value, out = subprocess.getstatusoutput("meshtastic --help")
+    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')
-    assert re.search(r'System', out)
-    assert re.search(r'Python', out)
+    return_value, out = subprocess.getstatusoutput("meshtastic --support")
+    assert re.search(r"System", out)
+    assert re.search(r"Python", out)
     assert return_value == 0