From e8a2909173f96eb8916e892457aed1fc46a132e5 Mon Sep 17 00:00:00 2001 From: mkinney Date: Mon, 7 Mar 2022 21:25:42 -0800 Subject: [PATCH 01/19] Merge pull request #294 from mkinney/bug_when_ports_not_sorted fix when ports are not sorted --- examples/show_ports.py | 6 ++++++ meshtastic/tests/test_util.py | 19 +++++++++++++++++++ meshtastic/util.py | 1 + 3 files changed, 26 insertions(+) create mode 100644 examples/show_ports.py diff --git a/examples/show_ports.py b/examples/show_ports.py new file mode 100644 index 000000000..30c9cd975 --- /dev/null +++ b/examples/show_ports.py @@ -0,0 +1,6 @@ +"""Simple program to show serial ports. +""" + +from meshtastic.util import findPorts + +print(findPorts()) diff --git a/meshtastic/tests/test_util.py b/meshtastic/tests/test_util.py index 548efee56..b04fd924e 100644 --- a/meshtastic/tests/test_util.py +++ b/meshtastic/tests/test_util.py @@ -264,6 +264,22 @@ def __init__(self, device=None, vid=None): patch_comports.assert_called() +@pytest.mark.unitslow +@patch('serial.tools.list_ports.comports') +def test_findPorts_when_duplicate_found_and_duplicate_option_used_ports_reversed(patch_comports): + """Test findPorts()""" + class TempPort: + """ temp class for port""" + def __init__(self, device=None, vid=None): + self.device = device + self.vid = vid + fake1 = TempPort('/dev/cu.usbserial-1430', vid='fake1') + fake2 = TempPort('/dev/cu.wchusbserial1430', vid='fake2') + patch_comports.return_value = [fake2, fake1] + assert findPorts(eliminate_duplicates=True) == ['/dev/cu.wchusbserial1430'] + patch_comports.assert_called() + + @pytest.mark.unitslow @patch('serial.tools.list_ports.comports') def test_findPorts_when_duplicate_found_and_duplicate_option_not_used(patch_comports): @@ -315,8 +331,11 @@ def test_eliminate_duplicate_port(): assert eliminate_duplicate_port(['/dev/fake', '/dev/fake1']) == ['/dev/fake', '/dev/fake1'] assert eliminate_duplicate_port(['/dev/fake', '/dev/fake1', '/dev/fake2']) == ['/dev/fake', '/dev/fake1', '/dev/fake2'] assert eliminate_duplicate_port(['/dev/cu.usbserial-1430', '/dev/cu.wchusbserial1430']) == ['/dev/cu.wchusbserial1430'] + assert eliminate_duplicate_port(['/dev/cu.wchusbserial1430', '/dev/cu.usbserial-1430']) == ['/dev/cu.wchusbserial1430'] assert eliminate_duplicate_port(['/dev/cu.SLAB_USBtoUART', '/dev/cu.usbserial-0001']) == ['/dev/cu.usbserial-0001'] + assert eliminate_duplicate_port(['/dev/cu.usbserial-0001', '/dev/cu.SLAB_USBtoUART']) == ['/dev/cu.usbserial-0001'] assert eliminate_duplicate_port(['/dev/cu.usbmodem11301', '/dev/cu.wchusbserial11301']) == ['/dev/cu.wchusbserial11301'] + assert eliminate_duplicate_port(['/dev/cu.wchusbserial11301', '/dev/cu.usbmodem11301']) == ['/dev/cu.wchusbserial11301'] @patch('platform.version', return_value='10.0.22000.194') @patch('platform.release', return_value='10') diff --git a/meshtastic/util.py b/meshtastic/util.py index 19316210a..79cf36f5f 100644 --- a/meshtastic/util.py +++ b/meshtastic/util.py @@ -401,6 +401,7 @@ def eliminate_duplicate_port(ports): if len(ports) != 2: new_ports = ports else: + ports.sort() if 'usbserial' in ports[0] and 'wchusbserial' in ports[1]: first = ports[0].replace("usbserial-", "") second = ports[1].replace("wchusbserial", "") From 5590dbeb6f2859414ff6fdf773722b2153b1413c Mon Sep 17 00:00:00 2001 From: Mike Kinney Date: Mon, 7 Mar 2022 21:44:11 -0800 Subject: [PATCH 02/19] do not checkout the code again --- .github/workflows/release.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 77b0dd557..0b890e267 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -45,9 +45,6 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Checkout - uses: actions/checkout@v2 - - name: Set up Python 3.9 uses: actions/setup-python@v2 with: From e6999ba5ad9f276e39f39eac736e1ccc63f90092 Mon Sep 17 00:00:00 2001 From: Mike Kinney Date: Mon, 7 Mar 2022 21:59:46 -0800 Subject: [PATCH 03/19] keep sha ref and use it for subsequent checkouts --- .github/workflows/release.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0b890e267..f9b58802d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,6 +8,7 @@ jobs: outputs: version: ${{ steps.get_version.outputs.version }} upload_url: ${{ steps.create_release.outputs.upload_url }} + new_sha: ${{ steps.commit_updated.outputs.sha }} steps: @@ -19,12 +20,14 @@ jobs: 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 @@ -80,6 +83,8 @@ jobs: - name: Checkout uses: actions/checkout@v2 + with: + ref: ${{ needs.release_create.outputs.new_sha }} - name: Set up Python 3.9 uses: actions/setup-python@v2 @@ -125,6 +130,8 @@ jobs: - name: Checkout uses: actions/checkout@v2 + with: + ref: ${{ needs.release_create.outputs.new_sha }} - name: Set up Python 3.9 uses: actions/setup-python@v2 @@ -165,6 +172,8 @@ jobs: - name: Checkout uses: actions/checkout@v2 + with: + ref: ${{ needs.release_create.outputs.new_sha }} - name: Set up Python 3.9 uses: actions/setup-python@v2 From c01617652098de24e19e250495c65fbe7a97ad5a Mon Sep 17 00:00:00 2001 From: mkinney Date: Mon, 7 Mar 2022 22:16:03 -0800 Subject: [PATCH 04/19] Update release.yml --- .github/workflows/release.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f9b58802d..6d6d96ea0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,7 +27,7 @@ jobs: 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}' + git log -n 1 --pretty=format:"%H" | tail -n 1 | awk '{print "::set-output name=sha::"$0}' - name: Get version id: get_version @@ -82,7 +82,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: ref: ${{ needs.release_create.outputs.new_sha }} @@ -129,7 +129,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: ref: ${{ needs.release_create.outputs.new_sha }} @@ -171,7 +171,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: ref: ${{ needs.release_create.outputs.new_sha }} From 3912f5728a95d26cc3376f701facf1ad20053151 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 8 Mar 2022 06:40:00 +0000 Subject: [PATCH 05/19] bump version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index d64e9f27e..f6437905b 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ # This call to setup() does all the work setup( name="meshtastic", - version="1.2.88", + version="1.2.89", description="Python API & client shell for talking to Meshtastic devices", long_description=long_description, long_description_content_type="text/markdown", From 96e42ac3f29ff8f673fdab9339e2f845464ca2fd Mon Sep 17 00:00:00 2001 From: Mike Kinney Date: Tue, 8 Mar 2022 10:24:44 -0800 Subject: [PATCH 06/19] add duplicate check --- meshtastic/supported_device.py | 8 ++- meshtastic/tests/test_supported_device.py | 82 +++++++++++++++++++++++ meshtastic/tests/test_util.py | 3 + meshtastic/util.py | 1 + 4 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 meshtastic/tests/test_supported_device.py diff --git a/meshtastic/supported_device.py b/meshtastic/supported_device.py index 82c760e06..43a0b1cf2 100755 --- a/meshtastic/supported_device.py +++ b/meshtastic/supported_device.py @@ -6,6 +6,8 @@ import subprocess import re +import meshtastic.util + # 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 @@ -109,7 +111,7 @@ def get_devices_with_vendor_id(vid): sd.add(d) return sd -def active_ports_on_supported_devices(sds): +def active_ports_on_supported_devices(sds, eliminate_duplicates=False): """Return a set of active ports based on the supplied supported devices""" ports = set() baseports = set() @@ -170,6 +172,10 @@ def active_ports_on_supported_devices(sds): # add all ports for com_port in com_ports: ports.add(com_port) + if eliminate_duplicates: + ports = meshtastic.util.eliminate_duplicate_port(list(ports)) + ports.sort() + ports = set(ports) return ports diff --git a/meshtastic/tests/test_supported_device.py b/meshtastic/tests/test_supported_device.py new file mode 100644 index 000000000..18a6b1904 --- /dev/null +++ b/meshtastic/tests/test_supported_device.py @@ -0,0 +1,82 @@ +"""Meshtastic unit tests for supported_device.py""" + + +from unittest.mock import patch +import pytest + +from meshtastic.supported_device import active_ports_on_supported_devices, SupportedDevice + + +@pytest.mark.unit +@patch('platform.system', return_value='Linux') +def test_active_ports_on_supported_devices_empty(mock_platform): + """Test active_ports_on_supported_devices()""" + sds = set() + assert active_ports_on_supported_devices(sds) == set() + mock_platform.assert_called() + + +@pytest.mark.unit +@patch('subprocess.getstatusoutput') +@patch('platform.system', return_value='Linux') +def test_active_ports_on_supported_devices_linux(mock_platform, mock_sp): + """Test active_ports_on_supported_devices()""" + mock_sp.return_value = (None, 'crw-rw-rw- 1 root wheel 0x9000000 Feb 8 22:22 /dev/ttyUSBfake') + fake_device = SupportedDevice(name='a', for_firmware='heltec-v2.1', baseport_on_linux='ttyUSB') + fake_supported_devices = [fake_device] + assert active_ports_on_supported_devices(fake_supported_devices) == {'/dev/ttyUSBfake'} + mock_platform.assert_called() + mock_sp.assert_called() + + +@pytest.mark.unit +@patch('subprocess.getstatusoutput') +@patch('platform.system', return_value='Darwin') +def test_active_ports_on_supported_devices_mac(mock_platform, mock_sp): + """Test active_ports_on_supported_devices()""" + mock_sp.return_value = (None, 'crw-rw-rw- 1 root wheel 0x9000000 Feb 8 22:22 /dev/cu.usbserial-foo') + fake_device = SupportedDevice(name='a', for_firmware='heltec-v2.1', baseport_on_linux='cu.usbserial-') + fake_supported_devices = [fake_device] + assert active_ports_on_supported_devices(fake_supported_devices) == {'/dev/cu.usbserial-foo'} + mock_platform.assert_called() + mock_sp.assert_called() + + +@pytest.mark.unit +@patch('meshtastic.supported_device.detect_windows_port', return_value={'COM2'}) +@patch('platform.system', return_value='Windows') +def test_active_ports_on_supported_devices_win(mock_platform, mock_dwp): + """Test active_ports_on_supported_devices()""" + fake_device = SupportedDevice(name='a', for_firmware='heltec-v2.1') + fake_supported_devices = [fake_device] + assert active_ports_on_supported_devices(fake_supported_devices) == {'COM2'} + mock_platform.assert_called() + mock_dwp.assert_called() + + +@pytest.mark.unit +@patch('subprocess.getstatusoutput') +@patch('platform.system', return_value='Darwin') +def test_active_ports_on_supported_devices_mac_no_duplicates_check(mock_platform, mock_sp): + """Test active_ports_on_supported_devices()""" + mock_sp.return_value = (None, ('crw-rw-rw- 1 root wheel 0x9000005 Mar 8 10:05 /dev/cu.usbmodem53230051441\n' + 'crw-rw-rw- 1 root wheel 0x9000003 Mar 8 10:06 /dev/cu.wchusbserial53230051441')) + fake_device = SupportedDevice(name='a', for_firmware='tbeam', baseport_on_mac='cu.usbmodem') + fake_supported_devices = [fake_device] + assert active_ports_on_supported_devices(fake_supported_devices, False) == {'/dev/cu.usbmodem53230051441', '/dev/cu.wchusbserial53230051441'} + mock_platform.assert_called() + mock_sp.assert_called() + + +@pytest.mark.unit +@patch('subprocess.getstatusoutput') +@patch('platform.system', return_value='Darwin') +def test_active_ports_on_supported_devices_mac_duplicates_check(mock_platform, mock_sp): + """Test active_ports_on_supported_devices()""" + mock_sp.return_value = (None, ('crw-rw-rw- 1 root wheel 0x9000005 Mar 8 10:05 /dev/cu.usbmodem53230051441\n' + 'crw-rw-rw- 1 root wheel 0x9000003 Mar 8 10:06 /dev/cu.wchusbserial53230051441')) + fake_device = SupportedDevice(name='a', for_firmware='tbeam', baseport_on_mac='cu.usbmodem') + fake_supported_devices = [fake_device] + assert active_ports_on_supported_devices(fake_supported_devices, True) == {'/dev/cu.wchusbserial53230051441'} + mock_platform.assert_called() + mock_sp.assert_called() diff --git a/meshtastic/tests/test_util.py b/meshtastic/tests/test_util.py index 548efee56..c4159cf3d 100644 --- a/meshtastic/tests/test_util.py +++ b/meshtastic/tests/test_util.py @@ -317,6 +317,9 @@ def test_eliminate_duplicate_port(): assert eliminate_duplicate_port(['/dev/cu.usbserial-1430', '/dev/cu.wchusbserial1430']) == ['/dev/cu.wchusbserial1430'] assert eliminate_duplicate_port(['/dev/cu.SLAB_USBtoUART', '/dev/cu.usbserial-0001']) == ['/dev/cu.usbserial-0001'] assert eliminate_duplicate_port(['/dev/cu.usbmodem11301', '/dev/cu.wchusbserial11301']) == ['/dev/cu.wchusbserial11301'] + assert eliminate_duplicate_port(['/dev/cu.usbmodem53230051441', '/dev/cu.wchusbserial53230051441']) == ['/dev/cu.wchusbserial53230051441'] + assert eliminate_duplicate_port(['/dev/cu.wchusbserial53230051441', '/dev/cu.usbmodem53230051441']) == ['/dev/cu.wchusbserial53230051441'] + @patch('platform.version', return_value='10.0.22000.194') @patch('platform.release', return_value='10') diff --git a/meshtastic/util.py b/meshtastic/util.py index 19316210a..79cf36f5f 100644 --- a/meshtastic/util.py +++ b/meshtastic/util.py @@ -401,6 +401,7 @@ def eliminate_duplicate_port(ports): if len(ports) != 2: new_ports = ports else: + ports.sort() if 'usbserial' in ports[0] and 'wchusbserial' in ports[1]: first = ports[0].replace("usbserial-", "") second = ports[1].replace("wchusbserial", "") From 20c65974e9643bd15c83331899afe8eba0f57a70 Mon Sep 17 00:00:00 2001 From: Mike Kinney Date: Tue, 8 Mar 2022 10:34:46 -0800 Subject: [PATCH 07/19] refactor code to util --- .gitignore | 1 + examples/scan_for_devices.py | 3 +- meshtastic/supported_device.py | 113 ---------------------- meshtastic/tests/test_supported_device.py | 82 ---------------- meshtastic/tests/test_util.py | 79 ++++++++++++++- meshtastic/util.py | 112 ++++++++++++++++++++- 6 files changed, 191 insertions(+), 199 deletions(-) delete mode 100644 meshtastic/tests/test_supported_device.py diff --git a/.gitignore b/.gitignore index d3166984e..19cefb6f1 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ dist log_* .eggs nanopb-0.4.4 +nanopb-0.4.5 .*swp .coverage *.py-E diff --git a/examples/scan_for_devices.py b/examples/scan_for_devices.py index 9971a9311..8c4f021eb 100644 --- a/examples/scan_for_devices.py +++ b/examples/scan_for_devices.py @@ -3,8 +3,7 @@ """ import sys -from meshtastic.supported_device import get_unique_vendor_ids, active_ports_on_supported_devices -from meshtastic.util import detect_supported_devices +from meshtastic.util import detect_supported_devices, get_unique_vendor_ids, active_ports_on_supported_devices # simple arg check if len(sys.argv) != 1: diff --git a/meshtastic/supported_device.py b/meshtastic/supported_device.py index 43a0b1cf2..d3b36b2b1 100755 --- a/meshtastic/supported_device.py +++ b/meshtastic/supported_device.py @@ -2,12 +2,6 @@ It is used for auto detection as to which device might be connected. """ -import platform -import subprocess -import re - -import meshtastic.util - # 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 @@ -93,110 +87,3 @@ def __init__(self, name, version=None, for_firmware=None, device_class="esp32", heltec_v1, heltec_v2_0, heltec_v2_1, meshtastic_diy_v1, techo_1, rak4631_5005, rak4631_19003, rak11200] - - -def get_unique_vendor_ids(): - """Return a set of unique vendor ids""" - vids = set() - for d in supported_devices: - if d.usb_vendor_id_in_hex: - vids.add(d.usb_vendor_id_in_hex) - return vids - -def get_devices_with_vendor_id(vid): - """Return a set of unique devices with the vendor id""" - sd = set() - for d in supported_devices: - if d.usb_vendor_id_in_hex == vid: - sd.add(d) - return sd - -def active_ports_on_supported_devices(sds, eliminate_duplicates=False): - """Return a set of active ports based on the supplied supported devices""" - ports = set() - baseports = set() - system = platform.system() - - # figure out what possible base ports there are - for d in sds: - if system == "Linux": - baseports.add(d.baseport_on_linux) - elif system == "Darwin": - baseports.add(d.baseport_on_mac) - elif system == "Windows": - baseports.add(d.baseport_on_windows) - - for bp in baseports: - if system == "Linux": - # see if we have any devices (ignoring any stderr output) - command = f'ls -al /dev/{bp}* 2> /dev/null' - #print(f'command:{command}') - _, ls_output = subprocess.getstatusoutput(command) - #print(f'ls_output:{ls_output}') - # if we got output, there are ports - if len(ls_output) > 0: - #print('got output') - # for each line of output - lines = ls_output.split('\n') - #print(f'lines:{lines}') - for line in lines: - parts = line.split(' ') - #print(f'parts:{parts}') - port = parts[-1] - #print(f'port:{port}') - ports.add(port) - elif system == "Darwin": - # see if we have any devices (ignoring any stderr output) - command = f'ls -al /dev/{bp}* 2> /dev/null' - #print(f'command:{command}') - _, ls_output = subprocess.getstatusoutput(command) - #print(f'ls_output:{ls_output}') - # if we got output, there are ports - if len(ls_output) > 0: - #print('got output') - # for each line of output - lines = ls_output.split('\n') - #print(f'lines:{lines}') - for line in lines: - parts = line.split(' ') - #print(f'parts:{parts}') - port = parts[-1] - #print(f'port:{port}') - ports.add(port) - elif system == "Windows": - # for each device in supported devices found - for d in sds: - # find the port(s) - com_ports = detect_windows_port(d) - #print(f'com_ports:{com_ports}') - # add all ports - for com_port in com_ports: - ports.add(com_port) - if eliminate_duplicates: - ports = meshtastic.util.eliminate_duplicate_port(list(ports)) - ports.sort() - ports = set(ports) - return ports - - -def detect_windows_port(sd): - """detect if Windows port""" - ports = set() - - if sd: - system = platform.system() - - if system == "Windows": - command = ('powershell.exe "[Console]::OutputEncoding = [Text.UTF8Encoding]::UTF8;' - 'Get-PnpDevice -PresentOnly | Where-Object{ ($_.DeviceId -like ') - command += f"'*{sd.usb_vendor_id_in_hex.upper()}*'" - command += ')} | Format-List"' - - #print(f'command:{command}') - _, sp_output = subprocess.getstatusoutput(command) - #print(f'sp_output:{sp_output}') - p = re.compile(r'\(COM(.*)\)') - for x in p.findall(sp_output): - #print(f'x:{x}') - ports.add(f'COM{x}') - return ports diff --git a/meshtastic/tests/test_supported_device.py b/meshtastic/tests/test_supported_device.py deleted file mode 100644 index 18a6b1904..000000000 --- a/meshtastic/tests/test_supported_device.py +++ /dev/null @@ -1,82 +0,0 @@ -"""Meshtastic unit tests for supported_device.py""" - - -from unittest.mock import patch -import pytest - -from meshtastic.supported_device import active_ports_on_supported_devices, SupportedDevice - - -@pytest.mark.unit -@patch('platform.system', return_value='Linux') -def test_active_ports_on_supported_devices_empty(mock_platform): - """Test active_ports_on_supported_devices()""" - sds = set() - assert active_ports_on_supported_devices(sds) == set() - mock_platform.assert_called() - - -@pytest.mark.unit -@patch('subprocess.getstatusoutput') -@patch('platform.system', return_value='Linux') -def test_active_ports_on_supported_devices_linux(mock_platform, mock_sp): - """Test active_ports_on_supported_devices()""" - mock_sp.return_value = (None, 'crw-rw-rw- 1 root wheel 0x9000000 Feb 8 22:22 /dev/ttyUSBfake') - fake_device = SupportedDevice(name='a', for_firmware='heltec-v2.1', baseport_on_linux='ttyUSB') - fake_supported_devices = [fake_device] - assert active_ports_on_supported_devices(fake_supported_devices) == {'/dev/ttyUSBfake'} - mock_platform.assert_called() - mock_sp.assert_called() - - -@pytest.mark.unit -@patch('subprocess.getstatusoutput') -@patch('platform.system', return_value='Darwin') -def test_active_ports_on_supported_devices_mac(mock_platform, mock_sp): - """Test active_ports_on_supported_devices()""" - mock_sp.return_value = (None, 'crw-rw-rw- 1 root wheel 0x9000000 Feb 8 22:22 /dev/cu.usbserial-foo') - fake_device = SupportedDevice(name='a', for_firmware='heltec-v2.1', baseport_on_linux='cu.usbserial-') - fake_supported_devices = [fake_device] - assert active_ports_on_supported_devices(fake_supported_devices) == {'/dev/cu.usbserial-foo'} - mock_platform.assert_called() - mock_sp.assert_called() - - -@pytest.mark.unit -@patch('meshtastic.supported_device.detect_windows_port', return_value={'COM2'}) -@patch('platform.system', return_value='Windows') -def test_active_ports_on_supported_devices_win(mock_platform, mock_dwp): - """Test active_ports_on_supported_devices()""" - fake_device = SupportedDevice(name='a', for_firmware='heltec-v2.1') - fake_supported_devices = [fake_device] - assert active_ports_on_supported_devices(fake_supported_devices) == {'COM2'} - mock_platform.assert_called() - mock_dwp.assert_called() - - -@pytest.mark.unit -@patch('subprocess.getstatusoutput') -@patch('platform.system', return_value='Darwin') -def test_active_ports_on_supported_devices_mac_no_duplicates_check(mock_platform, mock_sp): - """Test active_ports_on_supported_devices()""" - mock_sp.return_value = (None, ('crw-rw-rw- 1 root wheel 0x9000005 Mar 8 10:05 /dev/cu.usbmodem53230051441\n' - 'crw-rw-rw- 1 root wheel 0x9000003 Mar 8 10:06 /dev/cu.wchusbserial53230051441')) - fake_device = SupportedDevice(name='a', for_firmware='tbeam', baseport_on_mac='cu.usbmodem') - fake_supported_devices = [fake_device] - assert active_ports_on_supported_devices(fake_supported_devices, False) == {'/dev/cu.usbmodem53230051441', '/dev/cu.wchusbserial53230051441'} - mock_platform.assert_called() - mock_sp.assert_called() - - -@pytest.mark.unit -@patch('subprocess.getstatusoutput') -@patch('platform.system', return_value='Darwin') -def test_active_ports_on_supported_devices_mac_duplicates_check(mock_platform, mock_sp): - """Test active_ports_on_supported_devices()""" - mock_sp.return_value = (None, ('crw-rw-rw- 1 root wheel 0x9000005 Mar 8 10:05 /dev/cu.usbmodem53230051441\n' - 'crw-rw-rw- 1 root wheel 0x9000003 Mar 8 10:06 /dev/cu.wchusbserial53230051441')) - fake_device = SupportedDevice(name='a', for_firmware='tbeam', baseport_on_mac='cu.usbmodem') - fake_supported_devices = [fake_device] - assert active_ports_on_supported_devices(fake_supported_devices, True) == {'/dev/cu.wchusbserial53230051441'} - mock_platform.assert_called() - mock_sp.assert_called() diff --git a/meshtastic/tests/test_util.py b/meshtastic/tests/test_util.py index c4159cf3d..08faebbc1 100644 --- a/meshtastic/tests/test_util.py +++ b/meshtastic/tests/test_util.py @@ -12,7 +12,9 @@ remove_keys_from_dict, Timeout, hexstr, ipstr, readnet_u16, findPorts, convert_mac_addr, snake_to_camel, camel_to_snake, eliminate_duplicate_port, - is_windows11) + is_windows11, active_ports_on_supported_devices) + +from meshtastic.supported_device import SupportedDevice @pytest.mark.unit @@ -361,3 +363,78 @@ def test_is_windows11_false_win8_1(patched_platform, patched_release): assert is_windows11() is False patched_platform.assert_called() patched_release.assert_called() + + +@pytest.mark.unit +@patch('platform.system', return_value='Linux') +def test_active_ports_on_supported_devices_empty(mock_platform): + """Test active_ports_on_supported_devices()""" + sds = set() + assert active_ports_on_supported_devices(sds) == set() + mock_platform.assert_called() + + +@pytest.mark.unit +@patch('subprocess.getstatusoutput') +@patch('platform.system', return_value='Linux') +def test_active_ports_on_supported_devices_linux(mock_platform, mock_sp): + """Test active_ports_on_supported_devices()""" + mock_sp.return_value = (None, 'crw-rw-rw- 1 root wheel 0x9000000 Feb 8 22:22 /dev/ttyUSBfake') + fake_device = SupportedDevice(name='a', for_firmware='heltec-v2.1', baseport_on_linux='ttyUSB') + fake_supported_devices = [fake_device] + assert active_ports_on_supported_devices(fake_supported_devices) == {'/dev/ttyUSBfake'} + mock_platform.assert_called() + mock_sp.assert_called() + + +@pytest.mark.unit +@patch('subprocess.getstatusoutput') +@patch('platform.system', return_value='Darwin') +def test_active_ports_on_supported_devices_mac(mock_platform, mock_sp): + """Test active_ports_on_supported_devices()""" + mock_sp.return_value = (None, 'crw-rw-rw- 1 root wheel 0x9000000 Feb 8 22:22 /dev/cu.usbserial-foo') + fake_device = SupportedDevice(name='a', for_firmware='heltec-v2.1', baseport_on_linux='cu.usbserial-') + fake_supported_devices = [fake_device] + assert active_ports_on_supported_devices(fake_supported_devices) == {'/dev/cu.usbserial-foo'} + mock_platform.assert_called() + mock_sp.assert_called() + + +@pytest.mark.unit +@patch('meshtastic.util.detect_windows_port', return_value={'COM2'}) +@patch('platform.system', return_value='Windows') +def test_active_ports_on_supported_devices_win(mock_platform, mock_dwp): + """Test active_ports_on_supported_devices()""" + fake_device = SupportedDevice(name='a', for_firmware='heltec-v2.1') + fake_supported_devices = [fake_device] + assert active_ports_on_supported_devices(fake_supported_devices) == {'COM2'} + mock_platform.assert_called() + mock_dwp.assert_called() + + +@pytest.mark.unit +@patch('subprocess.getstatusoutput') +@patch('platform.system', return_value='Darwin') +def test_active_ports_on_supported_devices_mac_no_duplicates_check(mock_platform, mock_sp): + """Test active_ports_on_supported_devices()""" + mock_sp.return_value = (None, ('crw-rw-rw- 1 root wheel 0x9000005 Mar 8 10:05 /dev/cu.usbmodem53230051441\n' + 'crw-rw-rw- 1 root wheel 0x9000003 Mar 8 10:06 /dev/cu.wchusbserial53230051441')) + fake_device = SupportedDevice(name='a', for_firmware='tbeam', baseport_on_mac='cu.usbmodem') + fake_supported_devices = [fake_device] + assert active_ports_on_supported_devices(fake_supported_devices, False) == {'/dev/cu.usbmodem53230051441', '/dev/cu.wchusbserial53230051441'} + mock_platform.assert_called() + mock_sp.assert_called() + + +@pytest.mark.unit +@patch('subprocess.getstatusoutput') +@patch('platform.system', return_value='Darwin') +def test_active_ports_on_supported_devices_mac_duplicates_check(mock_platform, mock_sp): + """Test active_ports_on_supported_devices()""" + mock_sp.return_value = (None, ('crw-rw-rw- 1 root wheel 0x9000005 Mar 8 10:05 /dev/cu.usbmodem53230051441\n' + 'crw-rw-rw- 1 root wheel 0x9000003 Mar 8 10:06 /dev/cu.wchusbserial53230051441')) + fake_device = SupportedDevice(name='a', for_firmware='tbeam', baseport_on_mac='cu.usbmodem') + fake_supported_devices = [fake_device] + assert active_ports_on_supported_devices(fake_supported_devices, True) == {'/dev/cu.wchusbserial53230051441'} + mock_platform.assert_called() + mock_sp.assert_called() diff --git a/meshtastic/util.py b/meshtastic/util.py index 79cf36f5f..f9f05e153 100644 --- a/meshtastic/util.py +++ b/meshtastic/util.py @@ -14,7 +14,8 @@ import serial import serial.tools.list_ports import pkg_resources -from meshtastic.supported_device import get_unique_vendor_ids, get_devices_with_vendor_id + +from meshtastic.supported_device import supported_devices """Some devices such as a seger jlink we never want to accidentally open""" blacklistVids = dict.fromkeys([0x1366]) @@ -433,3 +434,112 @@ def is_windows11(): except Exception as e: print(f'problem detecting win11 e:{e}') return is_win11 + + +def get_unique_vendor_ids(): + """Return a set of unique vendor ids""" + vids = set() + for d in supported_devices: + if d.usb_vendor_id_in_hex: + vids.add(d.usb_vendor_id_in_hex) + return vids + + +def get_devices_with_vendor_id(vid): + """Return a set of unique devices with the vendor id""" + sd = set() + for d in supported_devices: + if d.usb_vendor_id_in_hex == vid: + sd.add(d) + return sd + + +def active_ports_on_supported_devices(sds, eliminate_duplicates=False): + """Return a set of active ports based on the supplied supported devices""" + ports = set() + baseports = set() + system = platform.system() + + # figure out what possible base ports there are + for d in sds: + if system == "Linux": + baseports.add(d.baseport_on_linux) + elif system == "Darwin": + baseports.add(d.baseport_on_mac) + elif system == "Windows": + baseports.add(d.baseport_on_windows) + + for bp in baseports: + if system == "Linux": + # see if we have any devices (ignoring any stderr output) + command = f'ls -al /dev/{bp}* 2> /dev/null' + #print(f'command:{command}') + _, ls_output = subprocess.getstatusoutput(command) + #print(f'ls_output:{ls_output}') + # if we got output, there are ports + if len(ls_output) > 0: + #print('got output') + # for each line of output + lines = ls_output.split('\n') + #print(f'lines:{lines}') + for line in lines: + parts = line.split(' ') + #print(f'parts:{parts}') + port = parts[-1] + #print(f'port:{port}') + ports.add(port) + elif system == "Darwin": + # see if we have any devices (ignoring any stderr output) + command = f'ls -al /dev/{bp}* 2> /dev/null' + #print(f'command:{command}') + _, ls_output = subprocess.getstatusoutput(command) + #print(f'ls_output:{ls_output}') + # if we got output, there are ports + if len(ls_output) > 0: + #print('got output') + # for each line of output + lines = ls_output.split('\n') + #print(f'lines:{lines}') + for line in lines: + parts = line.split(' ') + #print(f'parts:{parts}') + port = parts[-1] + #print(f'port:{port}') + ports.add(port) + elif system == "Windows": + # for each device in supported devices found + for d in sds: + # find the port(s) + com_ports = detect_windows_port(d) + #print(f'com_ports:{com_ports}') + # add all ports + for com_port in com_ports: + ports.add(com_port) + if eliminate_duplicates: + ports = eliminate_duplicate_port(list(ports)) + ports.sort() + ports = set(ports) + return ports + + +def detect_windows_port(sd): + """detect if Windows port""" + ports = set() + + if sd: + system = platform.system() + + if system == "Windows": + command = ('powershell.exe "[Console]::OutputEncoding = [Text.UTF8Encoding]::UTF8;' + 'Get-PnpDevice -PresentOnly | Where-Object{ ($_.DeviceId -like ') + command += f"'*{sd.usb_vendor_id_in_hex.upper()}*'" + command += ')} | Format-List"' + + #print(f'command:{command}') + _, sp_output = subprocess.getstatusoutput(command) + #print(f'sp_output:{sp_output}') + p = re.compile(r'\(COM(.*)\)') + for x in p.findall(sp_output): + #print(f'x:{x}') + ports.add(f'COM{x}') + return ports From de03f8e1fbe57794bf4c9df8f8ceb779e132791b Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 8 Mar 2022 18:57:44 +0000 Subject: [PATCH 08/19] bump version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index f6437905b..c6e988023 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ # This call to setup() does all the work setup( name="meshtastic", - version="1.2.89", + version="1.2.90", description="Python API & client shell for talking to Meshtastic devices", long_description=long_description, long_description_content_type="text/markdown", From eb4f68fccccc004c7b709771ce1a4243a2e24efe Mon Sep 17 00:00:00 2001 From: Mike Kinney Date: Tue, 15 Mar 2022 19:25:04 -0700 Subject: [PATCH 09/19] fix some tlora entries --- meshtastic/supported_device.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meshtastic/supported_device.py b/meshtastic/supported_device.py index d3b36b2b1..b0becd44c 100755 --- a/meshtastic/supported_device.py +++ b/meshtastic/supported_device.py @@ -38,13 +38,13 @@ def __init__(self, name, version=None, for_firmware=None, device_class="esp32", 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_1 = SupportedDevice(name="T-Lora", version="1.1", for_firmware="tlora-v1", +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="10c4", usb_product_id_in_hex="ea60") 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_0 = SupportedDevice(name="T-Lora", version="2.0", for_firmware="tlora-v2-1", +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 = SupportedDevice(name="T-Lora", version="2.1", for_firmware="tlora-v2-1", @@ -83,7 +83,7 @@ def __init__(self, name, version=None, for_firmware=None, device_class="esp32", usb_vendor_id_in_hex="239a", usb_product_id_in_hex="8029") supported_devices = [tbeam_v0_7, tbeam_v1_1, tbeam_M8N, tbeam_M8N_SX1262, - tlora_v1_1, tlora_v1_3, tlora_v2_0, tlora_v2_1, tlora_v2_1_1_6, + tlora_v1, tlora_v1_3, tlora_v2, tlora_v2_1, tlora_v2_1_1_6, heltec_v1, heltec_v2_0, heltec_v2_1, meshtastic_diy_v1, techo_1, rak4631_5005, rak4631_19003, rak11200] From 95f5d77c47d2a5c95b7ba52d1b46c0d3db23be1a Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 16 Mar 2022 02:34:58 +0000 Subject: [PATCH 10/19] bump version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index c6e988023..274ebdf36 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ # This call to setup() does all the work setup( name="meshtastic", - version="1.2.90", + version="1.2.91", description="Python API & client shell for talking to Meshtastic devices", long_description=long_description, long_description_content_type="text/markdown", From 4dc3bea674d39f1a8aa88de23ce742e1d63e592c Mon Sep 17 00:00:00 2001 From: Mike Kinney Date: Tue, 15 Mar 2022 19:52:45 -0700 Subject: [PATCH 11/19] fix the vendor and product id for tlora v1 --- meshtastic/supported_device.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meshtastic/supported_device.py b/meshtastic/supported_device.py index b0becd44c..bd7b2aaca 100755 --- a/meshtastic/supported_device.py +++ b/meshtastic/supported_device.py @@ -40,7 +40,7 @@ def __init__(self, name, version=None, for_firmware=None, device_class="esp32", 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="10c4", usb_product_id_in_hex="ea60") + usb_vendor_id_in_hex="1a86", usb_product_id_in_hex="55d4") tlora_v1_3 = SupportedDevice(name="T-Lora", version="1.3", for_firmware="tlora-v1-3", baseport_on_linux="ttyUSB", baseport_on_mac="cu.usbserial", usb_vendor_id_in_hex="10c4", usb_product_id_in_hex="ea60") From a99397468fb057f0d7c9b8420fcd13a120794c05 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 16 Mar 2022 02:59:04 +0000 Subject: [PATCH 12/19] bump version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 274ebdf36..c8468ab2f 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ # This call to setup() does all the work setup( name="meshtastic", - version="1.2.91", + version="1.2.92", description="Python API & client shell for talking to Meshtastic devices", long_description=long_description, long_description_content_type="text/markdown", From 384ad456ae5b65919bb004c1622ec7d0fb8c3903 Mon Sep 17 00:00:00 2001 From: Mike Kinney Date: Mon, 21 Mar 2022 10:44:46 -0700 Subject: [PATCH 13/19] add wifi min length check --- meshtastic/__main__.py | 4 ++++ meshtastic/tests/test_main.py | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/meshtastic/__main__.py b/meshtastic/__main__.py index a4d704d1f..2b27df3f6 100644 --- a/meshtastic/__main__.py +++ b/meshtastic/__main__.py @@ -119,6 +119,10 @@ def setPref(attributes, name, valStr): val = meshtastic.util.fromStr(valStr) logging.debug(f'valStr:{valStr} val:{val}') + if snake_name == 'wifi_password' and len(valStr) < 8: + print(f"Warning: wifi_password must be 8 or more characters.") + return + enumType = field.enum_type # pylint: disable=C0123 if enumType and type(val) == str: diff --git a/meshtastic/tests/test_main.py b/meshtastic/tests/test_main.py index 58d172152..8298f5ee9 100644 --- a/meshtastic/tests/test_main.py +++ b/meshtastic/tests/test_main.py @@ -902,6 +902,27 @@ def test_main_set_valid_wifi_passwd(capsys): mo.assert_called() +@pytest.mark.unit +@pytest.mark.usefixtures("reset_globals") +def test_main_set_invalid_wifi_passwd(capsys): + """Test --set with an invalid value (password must be 8 or more characters)""" + sys.argv = ['', '--set', 'wifi_password', '1234567'] + Globals.getInstance().set_args(sys.argv) + + mocked_node = MagicMock(autospec=Node) + + iface = MagicMock(autospec=SerialInterface) + iface.getNode.return_value = mocked_node + + with patch('meshtastic.serial_interface.SerialInterface', return_value=iface) as mo: + main() + out, err = capsys.readouterr() + assert re.search(r'Connected to radio', out, re.MULTILINE) + assert not re.search(r'Set wifi_password to 1234567', out, re.MULTILINE) + assert re.search(r'Warning: wifi_password must be 8 or more characters.', out, re.MULTILINE) + assert err == '' + mo.assert_called() + @pytest.mark.unit @pytest.mark.usefixtures("reset_globals") def test_main_set_valid_camel_case(capsys): From 5761c89818392d5a705a2f7e920c59d972b5ff00 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 21 Mar 2022 17:49:55 +0000 Subject: [PATCH 14/19] bump version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index c8468ab2f..bd6a9fce0 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ # This call to setup() does all the work setup( name="meshtastic", - version="1.2.92", + version="1.2.93", description="Python API & client shell for talking to Meshtastic devices", long_description=long_description, long_description_content_type="text/markdown", From 60d75409507730e4f0623023e680121e1b81dbab Mon Sep 17 00:00:00 2001 From: Mike Kinney Date: Wed, 27 Apr 2022 11:29:05 -0700 Subject: [PATCH 15/19] add nano_g1 --- info/mac/nano_g1.txt | 30 +++++++++++ info/ubuntu/nano_g1.txt | 91 ++++++++++++++++++++++++++++++++++ info/windows/nano_g1.txt | 39 +++++++++++++++ meshtastic/supported_device.py | 7 ++- 4 files changed, 165 insertions(+), 2 deletions(-) create mode 100644 info/mac/nano_g1.txt create mode 100644 info/ubuntu/nano_g1.txt create mode 100644 info/windows/nano_g1.txt diff --git a/info/mac/nano_g1.txt b/info/mac/nano_g1.txt new file mode 100644 index 000000000..74b5e009f --- /dev/null +++ b/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 + + + + +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 diff --git a/info/ubuntu/nano_g1.txt b/info/ubuntu/nano_g1.txt new file mode 100644 index 000000000..a3f8d789f --- /dev/null +++ b/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 diff --git a/info/windows/nano_g1.txt b/info/windows/nano_g1.txt new file mode 100644 index 000000000..e072c68c5 --- /dev/null +++ b/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 : => + => diff --git a/meshtastic/supported_device.py b/meshtastic/supported_device.py index bd7b2aaca..0f0cfe955 100755 --- a/meshtastic/supported_device.py +++ b/meshtastic/supported_device.py @@ -81,9 +81,12 @@ def __init__(self, name, version=None, for_firmware=None, device_class="esp32", 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, tlora_v2_1_1_6, heltec_v1, heltec_v2_0, heltec_v2_1, - meshtastic_diy_v1, techo_1, rak4631_5005, rak4631_19003, - rak11200] + meshtastic_diy_v1, techo_1, rak4631_5005, rak4631_5005_epaper, rak4631_19003, + rak11200, nano_g1] From e2f38b640bc3779407615f3a4f5e7c4b451f5a25 Mon Sep 17 00:00:00 2001 From: Mike Kinney Date: Wed, 27 Apr 2022 11:32:14 -0700 Subject: [PATCH 16/19] remove epaper --- meshtastic/supported_device.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meshtastic/supported_device.py b/meshtastic/supported_device.py index 0f0cfe955..d7699e9f4 100755 --- a/meshtastic/supported_device.py +++ b/meshtastic/supported_device.py @@ -88,5 +88,5 @@ def __init__(self, name, version=None, for_firmware=None, device_class="esp32", supported_devices = [tbeam_v0_7, tbeam_v1_1, tbeam_M8N, tbeam_M8N_SX1262, tlora_v1, tlora_v1_3, tlora_v2, tlora_v2_1, 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, + meshtastic_diy_v1, techo_1, rak4631_5005, rak4631_19003, rak11200, nano_g1] From 5ac9867a91b2efda0a6e62e6d43eb7c1a597d642 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 27 Apr 2022 18:37:44 +0000 Subject: [PATCH 17/19] bump version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index bd6a9fce0..03e59a4bb 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ # This call to setup() does all the work setup( name="meshtastic", - version="1.2.93", + version="1.2.94", description="Python API & client shell for talking to Meshtastic devices", long_description=long_description, long_description_content_type="text/markdown", From 49ee6b5988310d0a1079bbf6a54e9a67a4779d7a Mon Sep 17 00:00:00 2001 From: Mike Kinney Date: Wed, 27 Apr 2022 12:00:37 -0700 Subject: [PATCH 18/19] update protobufs for 1.2 --- .gitmodules | 1 + meshtastic/admin_pb2.py | 315 +--- meshtastic/apponly_pb2.py | 54 +- meshtastic/cannedmessages_pb2.py | 73 +- meshtastic/channel_pb2.py | 250 +-- meshtastic/deviceonly_pb2.py | 224 +-- meshtastic/environmental_measurement_pb2.py | 87 +- meshtastic/mesh_pb2.py | 1671 +------------------ meshtastic/mqtt_pb2.py | 68 +- meshtastic/portnums_pb2.py | 103 +- meshtastic/radioconfig_pb2.py | 1092 +----------- meshtastic/remote_hardware_pb2.py | 110 +- meshtastic/storeforward_pb2.py | 329 +--- proto | 2 +- 14 files changed, 245 insertions(+), 4134 deletions(-) diff --git a/.gitmodules b/.gitmodules index ddc929e14..3b456741e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ [submodule "proto"] path = proto url = https://github.com/meshtastic/Meshtastic-protobufs.git + branch = 1.2-legacy diff --git a/meshtastic/admin_pb2.py b/meshtastic/admin_pb2.py index 227b63e02..ffbefad9f 100644 --- a/meshtastic/admin_pb2.py +++ b/meshtastic/admin_pb2.py @@ -1,8 +1,9 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: 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 @@ -16,313 +17,11 @@ from . import radioconfig_pb2 as radioconfig__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\nmesh.proto\x1a\x11radioconfig.proto\"\xa1\x08\n\x0c\x41\x64minMessage\x12!\n\tset_radio\x18\x01 \x01(\x0b\x32\x0c.RadioConfigH\x00\x12\x1a\n\tset_owner\x18\x02 \x01(\x0b\x32\x05.UserH\x00\x12\x1f\n\x0bset_channel\x18\x03 \x01(\x0b\x32\x08.ChannelH\x00\x12\x1b\n\x11get_radio_request\x18\x04 \x01(\x08H\x00\x12*\n\x12get_radio_response\x18\x05 \x01(\x0b\x32\x0c.RadioConfigH\x00\x12\x1d\n\x13get_channel_request\x18\x06 \x01(\rH\x00\x12(\n\x14get_channel_response\x18\x07 \x01(\x0b\x32\x08.ChannelH\x00\x12\x1b\n\x11get_owner_request\x18\x08 \x01(\x08H\x00\x12#\n\x12get_owner_response\x18\t \x01(\x0b\x32\x05.UserH\x00\x12\x1d\n\x13\x63onfirm_set_channel\x18 \x01(\x08H\x00\x12\x1b\n\x11\x63onfirm_set_radio\x18! \x01(\x08H\x00\x12\x18\n\x0e\x65xit_simulator\x18\" \x01(\x08H\x00\x12\x18\n\x0ereboot_seconds\x18# \x01(\x05H\x00\x12\x31\n\'get_canned_message_plugin_part1_request\x18$ \x01(\x08H\x00\x12\x32\n(get_canned_message_plugin_part1_response\x18% \x01(\tH\x00\x12\x31\n\'get_canned_message_plugin_part2_request\x18& \x01(\x08H\x00\x12\x32\n(get_canned_message_plugin_part2_response\x18\' \x01(\tH\x00\x12\x31\n\'get_canned_message_plugin_part3_request\x18( \x01(\x08H\x00\x12\x32\n(get_canned_message_plugin_part3_response\x18) \x01(\tH\x00\x12\x31\n\'get_canned_message_plugin_part4_request\x18* \x01(\x08H\x00\x12\x32\n(get_canned_message_plugin_part4_response\x18+ \x01(\tH\x00\x12)\n\x1fset_canned_message_plugin_part1\x18, \x01(\tH\x00\x12)\n\x1fset_canned_message_plugin_part2\x18- \x01(\tH\x00\x12)\n\x1fset_canned_message_plugin_part3\x18. \x01(\tH\x00\x12)\n\x1fset_canned_message_plugin_part4\x18/ \x01(\tH\x00\x12\x1a\n\x10shutdown_seconds\x18\x33 \x01(\x05H\x00\x42\t\n\x07variantBG\n\x13\x63om.geeksville.meshB\x0b\x41\x64minProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3' - , - dependencies=[channel__pb2.DESCRIPTOR,mesh__pb2.DESCRIPTOR,radioconfig__pb2.DESCRIPTOR,]) - - - +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0b\x61\x64min.proto\x1a\rchannel.proto\x1a\nmesh.proto\x1a\x11radioconfig.proto\"\xa1\x08\n\x0c\x41\x64minMessage\x12!\n\tset_radio\x18\x01 \x01(\x0b\x32\x0c.RadioConfigH\x00\x12\x1a\n\tset_owner\x18\x02 \x01(\x0b\x32\x05.UserH\x00\x12\x1f\n\x0bset_channel\x18\x03 \x01(\x0b\x32\x08.ChannelH\x00\x12\x1b\n\x11get_radio_request\x18\x04 \x01(\x08H\x00\x12*\n\x12get_radio_response\x18\x05 \x01(\x0b\x32\x0c.RadioConfigH\x00\x12\x1d\n\x13get_channel_request\x18\x06 \x01(\rH\x00\x12(\n\x14get_channel_response\x18\x07 \x01(\x0b\x32\x08.ChannelH\x00\x12\x1b\n\x11get_owner_request\x18\x08 \x01(\x08H\x00\x12#\n\x12get_owner_response\x18\t \x01(\x0b\x32\x05.UserH\x00\x12\x1d\n\x13\x63onfirm_set_channel\x18 \x01(\x08H\x00\x12\x1b\n\x11\x63onfirm_set_radio\x18! \x01(\x08H\x00\x12\x18\n\x0e\x65xit_simulator\x18\" \x01(\x08H\x00\x12\x18\n\x0ereboot_seconds\x18# \x01(\x05H\x00\x12\x31\n\'get_canned_message_plugin_part1_request\x18$ \x01(\x08H\x00\x12\x32\n(get_canned_message_plugin_part1_response\x18% \x01(\tH\x00\x12\x31\n\'get_canned_message_plugin_part2_request\x18& \x01(\x08H\x00\x12\x32\n(get_canned_message_plugin_part2_response\x18\' \x01(\tH\x00\x12\x31\n\'get_canned_message_plugin_part3_request\x18( \x01(\x08H\x00\x12\x32\n(get_canned_message_plugin_part3_response\x18) \x01(\tH\x00\x12\x31\n\'get_canned_message_plugin_part4_request\x18* \x01(\x08H\x00\x12\x32\n(get_canned_message_plugin_part4_response\x18+ \x01(\tH\x00\x12)\n\x1fset_canned_message_plugin_part1\x18, \x01(\tH\x00\x12)\n\x1fset_canned_message_plugin_part2\x18- \x01(\tH\x00\x12)\n\x1fset_canned_message_plugin_part3\x18. \x01(\tH\x00\x12)\n\x1fset_canned_message_plugin_part4\x18/ \x01(\tH\x00\x12\x1a\n\x10shutdown_seconds\x18\x33 \x01(\x05H\x00\x42\t\n\x07variantBG\n\x13\x63om.geeksville.meshB\x0b\x41\x64minProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3') -_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), - _descriptor.FieldDescriptor( - name='get_canned_message_plugin_part1_request', full_name='AdminMessage.get_canned_message_plugin_part1_request', index=13, - number=36, type=8, cpp_type=7, label=1, - has_default_value=False, default_value=False, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='get_canned_message_plugin_part1_response', full_name='AdminMessage.get_canned_message_plugin_part1_response', index=14, - number=37, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='get_canned_message_plugin_part2_request', full_name='AdminMessage.get_canned_message_plugin_part2_request', index=15, - number=38, type=8, cpp_type=7, label=1, - has_default_value=False, default_value=False, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='get_canned_message_plugin_part2_response', full_name='AdminMessage.get_canned_message_plugin_part2_response', index=16, - number=39, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='get_canned_message_plugin_part3_request', full_name='AdminMessage.get_canned_message_plugin_part3_request', index=17, - number=40, type=8, cpp_type=7, label=1, - has_default_value=False, default_value=False, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='get_canned_message_plugin_part3_response', full_name='AdminMessage.get_canned_message_plugin_part3_response', index=18, - number=41, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='get_canned_message_plugin_part4_request', full_name='AdminMessage.get_canned_message_plugin_part4_request', index=19, - number=42, type=8, cpp_type=7, label=1, - has_default_value=False, default_value=False, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='get_canned_message_plugin_part4_response', full_name='AdminMessage.get_canned_message_plugin_part4_response', index=20, - number=43, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='set_canned_message_plugin_part1', full_name='AdminMessage.set_canned_message_plugin_part1', index=21, - number=44, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='set_canned_message_plugin_part2', full_name='AdminMessage.set_canned_message_plugin_part2', index=22, - number=45, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='set_canned_message_plugin_part3', full_name='AdminMessage.set_canned_message_plugin_part3', index=23, - number=46, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='set_canned_message_plugin_part4', full_name='AdminMessage.set_canned_message_plugin_part4', index=24, - number=47, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='shutdown_seconds', full_name='AdminMessage.shutdown_seconds', index=25, - number=51, type=5, cpp_type=1, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - _descriptor.OneofDescriptor( - name='variant', full_name='AdminMessage.variant', - index=0, containing_type=None, fields=[]), - ], - serialized_start=62, - serialized_end=1119, -) -_ADMINMESSAGE.fields_by_name['set_radio'].message_type = radioconfig__pb2._RADIOCONFIG -_ADMINMESSAGE.fields_by_name['set_owner'].message_type = mesh__pb2._USER -_ADMINMESSAGE.fields_by_name['set_channel'].message_type = channel__pb2._CHANNEL -_ADMINMESSAGE.fields_by_name['get_radio_response'].message_type = radioconfig__pb2._RADIOCONFIG -_ADMINMESSAGE.fields_by_name['get_channel_response'].message_type = channel__pb2._CHANNEL -_ADMINMESSAGE.fields_by_name['get_owner_response'].message_type = mesh__pb2._USER -_ADMINMESSAGE.oneofs_by_name['variant'].fields.append( - _ADMINMESSAGE.fields_by_name['set_radio']) -_ADMINMESSAGE.fields_by_name['set_radio'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant'] -_ADMINMESSAGE.oneofs_by_name['variant'].fields.append( - _ADMINMESSAGE.fields_by_name['set_owner']) -_ADMINMESSAGE.fields_by_name['set_owner'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant'] -_ADMINMESSAGE.oneofs_by_name['variant'].fields.append( - _ADMINMESSAGE.fields_by_name['set_channel']) -_ADMINMESSAGE.fields_by_name['set_channel'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant'] -_ADMINMESSAGE.oneofs_by_name['variant'].fields.append( - _ADMINMESSAGE.fields_by_name['get_radio_request']) -_ADMINMESSAGE.fields_by_name['get_radio_request'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant'] -_ADMINMESSAGE.oneofs_by_name['variant'].fields.append( - _ADMINMESSAGE.fields_by_name['get_radio_response']) -_ADMINMESSAGE.fields_by_name['get_radio_response'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant'] -_ADMINMESSAGE.oneofs_by_name['variant'].fields.append( - _ADMINMESSAGE.fields_by_name['get_channel_request']) -_ADMINMESSAGE.fields_by_name['get_channel_request'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant'] -_ADMINMESSAGE.oneofs_by_name['variant'].fields.append( - _ADMINMESSAGE.fields_by_name['get_channel_response']) -_ADMINMESSAGE.fields_by_name['get_channel_response'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant'] -_ADMINMESSAGE.oneofs_by_name['variant'].fields.append( - _ADMINMESSAGE.fields_by_name['get_owner_request']) -_ADMINMESSAGE.fields_by_name['get_owner_request'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant'] -_ADMINMESSAGE.oneofs_by_name['variant'].fields.append( - _ADMINMESSAGE.fields_by_name['get_owner_response']) -_ADMINMESSAGE.fields_by_name['get_owner_response'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant'] -_ADMINMESSAGE.oneofs_by_name['variant'].fields.append( - _ADMINMESSAGE.fields_by_name['confirm_set_channel']) -_ADMINMESSAGE.fields_by_name['confirm_set_channel'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant'] -_ADMINMESSAGE.oneofs_by_name['variant'].fields.append( - _ADMINMESSAGE.fields_by_name['confirm_set_radio']) -_ADMINMESSAGE.fields_by_name['confirm_set_radio'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant'] -_ADMINMESSAGE.oneofs_by_name['variant'].fields.append( - _ADMINMESSAGE.fields_by_name['exit_simulator']) -_ADMINMESSAGE.fields_by_name['exit_simulator'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant'] -_ADMINMESSAGE.oneofs_by_name['variant'].fields.append( - _ADMINMESSAGE.fields_by_name['reboot_seconds']) -_ADMINMESSAGE.fields_by_name['reboot_seconds'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant'] -_ADMINMESSAGE.oneofs_by_name['variant'].fields.append( - _ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part1_request']) -_ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part1_request'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant'] -_ADMINMESSAGE.oneofs_by_name['variant'].fields.append( - _ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part1_response']) -_ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part1_response'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant'] -_ADMINMESSAGE.oneofs_by_name['variant'].fields.append( - _ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part2_request']) -_ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part2_request'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant'] -_ADMINMESSAGE.oneofs_by_name['variant'].fields.append( - _ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part2_response']) -_ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part2_response'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant'] -_ADMINMESSAGE.oneofs_by_name['variant'].fields.append( - _ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part3_request']) -_ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part3_request'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant'] -_ADMINMESSAGE.oneofs_by_name['variant'].fields.append( - _ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part3_response']) -_ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part3_response'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant'] -_ADMINMESSAGE.oneofs_by_name['variant'].fields.append( - _ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part4_request']) -_ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part4_request'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant'] -_ADMINMESSAGE.oneofs_by_name['variant'].fields.append( - _ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part4_response']) -_ADMINMESSAGE.fields_by_name['get_canned_message_plugin_part4_response'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant'] -_ADMINMESSAGE.oneofs_by_name['variant'].fields.append( - _ADMINMESSAGE.fields_by_name['set_canned_message_plugin_part1']) -_ADMINMESSAGE.fields_by_name['set_canned_message_plugin_part1'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant'] -_ADMINMESSAGE.oneofs_by_name['variant'].fields.append( - _ADMINMESSAGE.fields_by_name['set_canned_message_plugin_part2']) -_ADMINMESSAGE.fields_by_name['set_canned_message_plugin_part2'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant'] -_ADMINMESSAGE.oneofs_by_name['variant'].fields.append( - _ADMINMESSAGE.fields_by_name['set_canned_message_plugin_part3']) -_ADMINMESSAGE.fields_by_name['set_canned_message_plugin_part3'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant'] -_ADMINMESSAGE.oneofs_by_name['variant'].fields.append( - _ADMINMESSAGE.fields_by_name['set_canned_message_plugin_part4']) -_ADMINMESSAGE.fields_by_name['set_canned_message_plugin_part4'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant'] -_ADMINMESSAGE.oneofs_by_name['variant'].fields.append( - _ADMINMESSAGE.fields_by_name['shutdown_seconds']) -_ADMINMESSAGE.fields_by_name['shutdown_seconds'].containing_oneof = _ADMINMESSAGE.oneofs_by_name['variant'] -DESCRIPTOR.message_types_by_name['AdminMessage'] = _ADMINMESSAGE -_sym_db.RegisterFileDescriptor(DESCRIPTOR) +_ADMINMESSAGE = DESCRIPTOR.message_types_by_name['AdminMessage'] AdminMessage = _reflection.GeneratedProtocolMessageType('AdminMessage', (_message.Message,), { 'DESCRIPTOR' : _ADMINMESSAGE, '__module__' : 'admin_pb2' @@ -330,6 +29,10 @@ }) _sym_db.RegisterMessage(AdminMessage) +if _descriptor._USE_C_DESCRIPTORS == False: -DESCRIPTOR._options = None + DESCRIPTOR._options = None + DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\013AdminProtosH\003Z!github.com/meshtastic/gomeshproto' + _ADMINMESSAGE._serialized_start=62 + _ADMINMESSAGE._serialized_end=1119 # @@protoc_insertion_point(module_scope) diff --git a/meshtastic/apponly_pb2.py b/meshtastic/apponly_pb2.py index df6b84a77..4db9ec8ef 100644 --- a/meshtastic/apponly_pb2.py +++ b/meshtastic/apponly_pb2.py @@ -1,8 +1,9 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: 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 @@ -14,52 +15,11 @@ from . import channel_pb2 as channel__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\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') -_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' @@ -67,6 +27,10 @@ }) _sym_db.RegisterMessage(ChannelSet) +if _descriptor._USE_C_DESCRIPTORS == False: -DESCRIPTOR._options = None + DESCRIPTOR._options = None + DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\rAppOnlyProtosH\003Z!github.com/meshtastic/gomeshproto' + _CHANNELSET._serialized_start=32 + _CHANNELSET._serialized_end=80 # @@protoc_insertion_point(module_scope) diff --git a/meshtastic/cannedmessages_pb2.py b/meshtastic/cannedmessages_pb2.py index 43687abf0..b6f0a2ec1 100644 --- a/meshtastic/cannedmessages_pb2.py +++ b/meshtastic/cannedmessages_pb2.py @@ -1,8 +1,9 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: 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 @@ -13,71 +14,11 @@ -DESCRIPTOR = _descriptor.FileDescriptor( - name='cannedmessages.proto', - package='', - syntax='proto3', - serialized_options=b'\n\023com.geeksville.meshB\031CannedMessageConfigProtosH\003Z!github.com/meshtastic/gomeshproto', - serialized_pb=b'\n\x14\x63\x61nnedmessages.proto\"w\n\x19\x43\x61nnedMessagePluginConfig\x12\x15\n\rmessagesPart1\x18\x0b \x01(\t\x12\x15\n\rmessagesPart2\x18\x0c \x01(\t\x12\x15\n\rmessagesPart3\x18\r \x01(\t\x12\x15\n\rmessagesPart4\x18\x0e \x01(\tBU\n\x13\x63om.geeksville.meshB\x19\x43\x61nnedMessageConfigProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3' -) - - - +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x14\x63\x61nnedmessages.proto\"w\n\x19\x43\x61nnedMessagePluginConfig\x12\x15\n\rmessagesPart1\x18\x0b \x01(\t\x12\x15\n\rmessagesPart2\x18\x0c \x01(\t\x12\x15\n\rmessagesPart3\x18\r \x01(\t\x12\x15\n\rmessagesPart4\x18\x0e \x01(\tBU\n\x13\x63om.geeksville.meshB\x19\x43\x61nnedMessageConfigProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3') -_CANNEDMESSAGEPLUGINCONFIG = _descriptor.Descriptor( - name='CannedMessagePluginConfig', - full_name='CannedMessagePluginConfig', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='messagesPart1', full_name='CannedMessagePluginConfig.messagesPart1', index=0, - number=11, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='messagesPart2', full_name='CannedMessagePluginConfig.messagesPart2', index=1, - number=12, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='messagesPart3', full_name='CannedMessagePluginConfig.messagesPart3', index=2, - number=13, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='messagesPart4', full_name='CannedMessagePluginConfig.messagesPart4', index=3, - number=14, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=24, - serialized_end=143, -) -DESCRIPTOR.message_types_by_name['CannedMessagePluginConfig'] = _CANNEDMESSAGEPLUGINCONFIG -_sym_db.RegisterFileDescriptor(DESCRIPTOR) +_CANNEDMESSAGEPLUGINCONFIG = DESCRIPTOR.message_types_by_name['CannedMessagePluginConfig'] CannedMessagePluginConfig = _reflection.GeneratedProtocolMessageType('CannedMessagePluginConfig', (_message.Message,), { 'DESCRIPTOR' : _CANNEDMESSAGEPLUGINCONFIG, '__module__' : 'cannedmessages_pb2' @@ -85,6 +26,10 @@ }) _sym_db.RegisterMessage(CannedMessagePluginConfig) +if _descriptor._USE_C_DESCRIPTORS == False: -DESCRIPTOR._options = None + DESCRIPTOR._options = None + DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\031CannedMessageConfigProtosH\003Z!github.com/meshtastic/gomeshproto' + _CANNEDMESSAGEPLUGINCONFIG._serialized_start=24 + _CANNEDMESSAGEPLUGINCONFIG._serialized_end=143 # @@protoc_insertion_point(module_scope) diff --git a/meshtastic/channel_pb2.py b/meshtastic/channel_pb2.py index 599645d62..b83caefb1 100644 --- a/meshtastic/channel_pb2.py +++ b/meshtastic/channel_pb2.py @@ -1,8 +1,9 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: 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,237 +14,14 @@ -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' -) - - - -_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) +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(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') -_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'] +_CHANNELSETTINGS_MODEMCONFIG = _CHANNELSETTINGS.enum_types_by_name['ModemConfig'] +_CHANNEL_ROLE = _CHANNEL.enum_types_by_name['Role'] ChannelSettings = _reflection.GeneratedProtocolMessageType('ChannelSettings', (_message.Message,), { 'DESCRIPTOR' : _CHANNELSETTINGS, '__module__' : 'channel_pb2' @@ -258,6 +36,16 @@ }) _sym_db.RegisterMessage(Channel) - -DESCRIPTOR._options = None +if _descriptor._USE_C_DESCRIPTORS == False: + + DESCRIPTOR._options = None + DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\rChannelProtosH\003Z!github.com/meshtastic/gomeshproto' + _CHANNELSETTINGS._serialized_start=18 + _CHANNELSETTINGS._serialized_end=419 + _CHANNELSETTINGS_MODEMCONFIG._serialized_start=281 + _CHANNELSETTINGS_MODEMCONFIG._serialized_end=419 + _CHANNEL._serialized_start=422 + _CHANNEL._serialized_end=561 + _CHANNEL_ROLE._serialized_start=513 + _CHANNEL_ROLE._serialized_end=561 # @@protoc_insertion_point(module_scope) diff --git a/meshtastic/deviceonly_pb2.py b/meshtastic/deviceonly_pb2.py index 018b18737..9bb3fffab 100644 --- a/meshtastic/deviceonly_pb2.py +++ b/meshtastic/deviceonly_pb2.py @@ -1,8 +1,9 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: deviceonly.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 @@ -16,211 +17,14 @@ from . import radioconfig_pb2 as radioconfig__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,]) - - - - -_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, -) +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(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') -_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 = DESCRIPTOR.message_types_by_name['LegacyRadioConfig'] +_LEGACYRADIOCONFIG_LEGACYPREFERENCES = _LEGACYRADIOCONFIG.nested_types_by_name['LegacyPreferences'] +_DEVICESTATE = DESCRIPTOR.message_types_by_name['DeviceState'] +_CHANNELFILE = DESCRIPTOR.message_types_by_name['ChannelFile'] LegacyRadioConfig = _reflection.GeneratedProtocolMessageType('LegacyRadioConfig', (_message.Message,), { 'LegacyPreferences' : _reflection.GeneratedProtocolMessageType('LegacyPreferences', (_message.Message,), { @@ -250,6 +54,16 @@ }) _sym_db.RegisterMessage(ChannelFile) - -DESCRIPTOR._options = None +if _descriptor._USE_C_DESCRIPTORS == False: + + DESCRIPTOR._options = None + DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\nDeviceOnlyH\003Z!github.com/meshtastic/gomeshproto' + _LEGACYRADIOCONFIG._serialized_start=67 + _LEGACYRADIOCONFIG._serialized_end=195 + _LEGACYRADIOCONFIG_LEGACYPREFERENCES._serialized_start=147 + _LEGACYRADIOCONFIG_LEGACYPREFERENCES._serialized_end=195 + _DEVICESTATE._serialized_start=198 + _DEVICESTATE._serialized_end=469 + _CHANNELFILE._serialized_start=471 + _CHANNELFILE._serialized_end=512 # @@protoc_insertion_point(module_scope) diff --git a/meshtastic/environmental_measurement_pb2.py b/meshtastic/environmental_measurement_pb2.py index 1036d2d9c..21176546b 100644 --- a/meshtastic/environmental_measurement_pb2.py +++ b/meshtastic/environmental_measurement_pb2.py @@ -1,8 +1,9 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: environmental_measurement.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,85 +14,11 @@ -DESCRIPTOR = _descriptor.FileDescriptor( - name='environmental_measurement.proto', - package='', - syntax='proto3', - serialized_options=b'Z!github.com/meshtastic/gomeshproto', - serialized_pb=b'\n\x1f\x65nvironmental_measurement.proto\"\xa1\x01\n\x18\x45nvironmentalMeasurement\x12\x13\n\x0btemperature\x18\x01 \x01(\x02\x12\x19\n\x11relative_humidity\x18\x02 \x01(\x02\x12\x1b\n\x13\x62\x61rometric_pressure\x18\x03 \x01(\x02\x12\x16\n\x0egas_resistance\x18\x04 \x01(\x02\x12\x0f\n\x07voltage\x18\x05 \x01(\x02\x12\x0f\n\x07\x63urrent\x18\x06 \x01(\x02\x42#Z!github.com/meshtastic/gomeshprotob\x06proto3' -) - - - +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1f\x65nvironmental_measurement.proto\"\xa1\x01\n\x18\x45nvironmentalMeasurement\x12\x13\n\x0btemperature\x18\x01 \x01(\x02\x12\x19\n\x11relative_humidity\x18\x02 \x01(\x02\x12\x1b\n\x13\x62\x61rometric_pressure\x18\x03 \x01(\x02\x12\x16\n\x0egas_resistance\x18\x04 \x01(\x02\x12\x0f\n\x07voltage\x18\x05 \x01(\x02\x12\x0f\n\x07\x63urrent\x18\x06 \x01(\x02\x42#Z!github.com/meshtastic/gomeshprotob\x06proto3') -_ENVIRONMENTALMEASUREMENT = _descriptor.Descriptor( - name='EnvironmentalMeasurement', - full_name='EnvironmentalMeasurement', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='temperature', full_name='EnvironmentalMeasurement.temperature', index=0, - number=1, type=2, cpp_type=6, label=1, - has_default_value=False, default_value=float(0), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='relative_humidity', full_name='EnvironmentalMeasurement.relative_humidity', index=1, - number=2, type=2, cpp_type=6, label=1, - has_default_value=False, default_value=float(0), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='barometric_pressure', full_name='EnvironmentalMeasurement.barometric_pressure', index=2, - number=3, type=2, cpp_type=6, label=1, - has_default_value=False, default_value=float(0), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='gas_resistance', full_name='EnvironmentalMeasurement.gas_resistance', index=3, - number=4, type=2, cpp_type=6, label=1, - has_default_value=False, default_value=float(0), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='voltage', full_name='EnvironmentalMeasurement.voltage', index=4, - number=5, type=2, cpp_type=6, label=1, - has_default_value=False, default_value=float(0), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='current', full_name='EnvironmentalMeasurement.current', index=5, - number=6, type=2, cpp_type=6, label=1, - has_default_value=False, default_value=float(0), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=36, - serialized_end=197, -) -DESCRIPTOR.message_types_by_name['EnvironmentalMeasurement'] = _ENVIRONMENTALMEASUREMENT -_sym_db.RegisterFileDescriptor(DESCRIPTOR) +_ENVIRONMENTALMEASUREMENT = DESCRIPTOR.message_types_by_name['EnvironmentalMeasurement'] EnvironmentalMeasurement = _reflection.GeneratedProtocolMessageType('EnvironmentalMeasurement', (_message.Message,), { 'DESCRIPTOR' : _ENVIRONMENTALMEASUREMENT, '__module__' : 'environmental_measurement_pb2' @@ -99,6 +26,10 @@ }) _sym_db.RegisterMessage(EnvironmentalMeasurement) +if _descriptor._USE_C_DESCRIPTORS == False: -DESCRIPTOR._options = None + DESCRIPTOR._options = None + DESCRIPTOR._serialized_options = b'Z!github.com/meshtastic/gomeshproto' + _ENVIRONMENTALMEASUREMENT._serialized_start=36 + _ENVIRONMENTALMEASUREMENT._serialized_end=197 # @@protoc_insertion_point(module_scope) diff --git a/meshtastic/mesh_pb2.py b/meshtastic/mesh_pb2.py index 322ac6c48..256049c7f 100644 --- a/meshtastic/mesh_pb2.py +++ b/meshtastic/mesh_pb2.py @@ -1,9 +1,10 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: mesh.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 @@ -15,278 +16,15 @@ from . import portnums_pb2 as portnums__pb2 -DESCRIPTOR = _descriptor.FileDescriptor( - name='mesh.proto', - package='', - syntax='proto3', - serialized_options=b'\n\023com.geeksville.meshB\nMeshProtosH\003Z!github.com/meshtastic/gomeshproto', - serialized_pb=b'\n\nmesh.proto\x1a\x0eportnums.proto\"\x94\x06\n\x08Position\x12\x12\n\nlatitude_i\x18\x01 \x01(\x0f\x12\x13\n\x0blongitude_i\x18\x02 \x01(\x0f\x12\x10\n\x08\x61ltitude\x18\x03 \x01(\x05\x12\x15\n\rbattery_level\x18\x04 \x01(\x05\x12\x0c\n\x04time\x18\t \x01(\x07\x12,\n\x0flocation_source\x18\n \x01(\x0e\x32\x13.Position.LocSource\x12,\n\x0f\x61ltitude_source\x18\x0b \x01(\x0e\x32\x13.Position.AltSource\x12\x15\n\rpos_timestamp\x18\x0c \x01(\x07\x12\x17\n\x0fpos_time_millis\x18\r \x01(\x05\x12\x14\n\x0c\x61ltitude_hae\x18\x0e \x01(\x11\x12\x15\n\ralt_geoid_sep\x18\x0f \x01(\x11\x12\x0c\n\x04PDOP\x18\x10 \x01(\r\x12\x0c\n\x04HDOP\x18\x11 \x01(\r\x12\x0c\n\x04VDOP\x18\x12 \x01(\r\x12\x14\n\x0cgps_accuracy\x18\x13 \x01(\r\x12\x14\n\x0cground_speed\x18\x14 \x01(\r\x12\x14\n\x0cground_track\x18\x15 \x01(\r\x12\x13\n\x0b\x66ix_quality\x18\x16 \x01(\r\x12\x10\n\x08\x66ix_type\x18\x17 \x01(\r\x12\x14\n\x0csats_in_view\x18\x18 \x01(\r\x12\x11\n\tsensor_id\x18\x19 \x01(\r\x12\x17\n\x0fpos_next_update\x18( \x01(\r\x12\x16\n\x0epos_seq_number\x18) \x01(\r\"n\n\tLocSource\x12\x16\n\x12LOCSRC_UNSPECIFIED\x10\x00\x12\x17\n\x13LOCSRC_MANUAL_ENTRY\x10\x01\x12\x17\n\x13LOCSRC_GPS_INTERNAL\x10\x02\x12\x17\n\x13LOCSRC_GPS_EXTERNAL\x10\x03\"\x85\x01\n\tAltSource\x12\x16\n\x12\x41LTSRC_UNSPECIFIED\x10\x00\x12\x17\n\x13\x41LTSRC_MANUAL_ENTRY\x10\x01\x12\x17\n\x13\x41LTSRC_GPS_INTERNAL\x10\x02\x12\x17\n\x13\x41LTSRC_GPS_EXTERNAL\x10\x03\x12\x15\n\x11\x41LTSRC_BAROMETRIC\x10\x04J\x04\x08\x07\x10\x08J\x04\x08\x08\x10\t\"\xd7\x01\n\x04User\x12\n\n\x02id\x18\x01 \x01(\t\x12\x11\n\tlong_name\x18\x02 \x01(\t\x12\x12\n\nshort_name\x18\x03 \x01(\t\x12\x0f\n\x07macaddr\x18\x04 \x01(\x0c\x12 \n\x08hw_model\x18\x06 \x01(\x0e\x32\x0e.HardwareModel\x12\x13\n\x0bis_licensed\x18\x07 \x01(\x08\x12\x13\n\x04team\x18\x08 \x01(\x0e\x32\x05.Team\x12\x14\n\x0ctx_power_dbm\x18\n \x01(\r\x12\x14\n\x0c\x61nt_gain_dbi\x18\x0b \x01(\r\x12\x13\n\x0b\x61nt_azimuth\x18\x0c \x01(\r\"\x1f\n\x0eRouteDiscovery\x12\r\n\x05route\x18\x02 \x03(\x07\"\xc5\x02\n\x07Routing\x12(\n\rroute_request\x18\x01 \x01(\x0b\x32\x0f.RouteDiscoveryH\x00\x12&\n\x0broute_reply\x18\x02 \x01(\x0b\x32\x0f.RouteDiscoveryH\x00\x12&\n\x0c\x65rror_reason\x18\x03 \x01(\x0e\x32\x0e.Routing.ErrorH\x00\"\xb4\x01\n\x05\x45rror\x12\x08\n\x04NONE\x10\x00\x12\x0c\n\x08NO_ROUTE\x10\x01\x12\x0b\n\x07GOT_NAK\x10\x02\x12\x0b\n\x07TIMEOUT\x10\x03\x12\x10\n\x0cNO_INTERFACE\x10\x04\x12\x12\n\x0eMAX_RETRANSMIT\x10\x05\x12\x0e\n\nNO_CHANNEL\x10\x06\x12\r\n\tTOO_LARGE\x10\x07\x12\x0f\n\x0bNO_RESPONSE\x10\x08\x12\x0f\n\x0b\x42\x41\x44_REQUEST\x10 \x12\x12\n\x0eNOT_AUTHORIZED\x10!B\t\n\x07variant\"\xa1\x01\n\x04\x44\x61ta\x12\x19\n\x07portnum\x18\x01 \x01(\x0e\x32\x08.PortNum\x12\x0f\n\x07payload\x18\x02 \x01(\x0c\x12\x15\n\rwant_response\x18\x03 \x01(\x08\x12\x0c\n\x04\x64\x65st\x18\x04 \x01(\x07\x12\x0e\n\x06source\x18\x05 \x01(\x07\x12\x12\n\nrequest_id\x18\x06 \x01(\x07\x12\x10\n\x08reply_id\x18\x07 \x01(\x07\x12\x12\n\nis_tapback\x18\x08 \x01(\x08\"\xca\x03\n\nMeshPacket\x12\x0c\n\x04\x66rom\x18\x01 \x01(\x07\x12\n\n\x02to\x18\x02 \x01(\x07\x12\x0f\n\x07\x63hannel\x18\x03 \x01(\r\x12\x18\n\x07\x64\x65\x63oded\x18\x04 \x01(\x0b\x32\x05.DataH\x00\x12\x13\n\tencrypted\x18\x05 \x01(\x0cH\x00\x12\n\n\x02id\x18\x06 \x01(\x07\x12\x0f\n\x07rx_time\x18\x07 \x01(\x07\x12\x0e\n\x06rx_snr\x18\x08 \x01(\x02\x12\x11\n\thop_limit\x18\n \x01(\r\x12\x10\n\x08want_ack\x18\x0b \x01(\x08\x12&\n\x08priority\x18\x0c \x01(\x0e\x32\x14.MeshPacket.Priority\x12\x0f\n\x07rx_rssi\x18\r \x01(\x05\x12$\n\x07\x64\x65layed\x18\x0f \x01(\x0e\x32\x13.MeshPacket.Delayed\"[\n\x08Priority\x12\t\n\x05UNSET\x10\x00\x12\x07\n\x03MIN\x10\x01\x12\x0e\n\nBACKGROUND\x10\n\x12\x0b\n\x07\x44\x45\x46\x41ULT\x10@\x12\x0c\n\x08RELIABLE\x10\x46\x12\x07\n\x03\x41\x43K\x10x\x12\x07\n\x03MAX\x10\x7f\"B\n\x07\x44\x65layed\x12\x0c\n\x08NO_DELAY\x10\x00\x12\x15\n\x11\x44\x45LAYED_BROADCAST\x10\x01\x12\x12\n\x0e\x44\x45LAYED_DIRECT\x10\x02\x42\x10\n\x0epayloadVariant\"j\n\x08NodeInfo\x12\x0b\n\x03num\x18\x01 \x01(\r\x12\x13\n\x04user\x18\x02 \x01(\x0b\x32\x05.User\x12\x1b\n\x08position\x18\x03 \x01(\x0b\x32\t.Position\x12\x0b\n\x03snr\x18\x07 \x01(\x02\x12\x12\n\nlast_heard\x18\x04 \x01(\x07\"\xce\x03\n\nMyNodeInfo\x12\x13\n\x0bmy_node_num\x18\x01 \x01(\r\x12\x0f\n\x07has_gps\x18\x02 \x01(\x08\x12\x11\n\tnum_bands\x18\x03 \x01(\r\x12\x14\n\x0cmax_channels\x18\x0f \x01(\r\x12\x12\n\x06region\x18\x04 \x01(\tB\x02\x18\x01\x12\x1f\n\x13hw_model_deprecated\x18\x05 \x01(\tB\x02\x18\x01\x12\x18\n\x10\x66irmware_version\x18\x06 \x01(\t\x12&\n\nerror_code\x18\x07 \x01(\x0e\x32\x12.CriticalErrorCode\x12\x15\n\rerror_address\x18\x08 \x01(\r\x12\x13\n\x0b\x65rror_count\x18\t \x01(\r\x12\x14\n\x0creboot_count\x18\n \x01(\r\x12\x0f\n\x07\x62itrate\x18\x0b \x01(\x02\x12\x1c\n\x14message_timeout_msec\x18\r \x01(\r\x12\x17\n\x0fmin_app_version\x18\x0e \x01(\r\x12\x15\n\rair_period_tx\x18\x10 \x03(\r\x12\x15\n\rair_period_rx\x18\x11 \x03(\r\x12\x10\n\x08has_wifi\x18\x12 \x01(\x08\x12\x1b\n\x13\x63hannel_utilization\x18\x13 \x01(\x02\x12\x13\n\x0b\x61ir_util_tx\x18\x14 \x01(\x02\"\xb5\x01\n\tLogRecord\x12\x0f\n\x07message\x18\x01 \x01(\t\x12\x0c\n\x04time\x18\x02 \x01(\x07\x12\x0e\n\x06source\x18\x03 \x01(\t\x12\x1f\n\x05level\x18\x04 \x01(\x0e\x32\x10.LogRecord.Level\"X\n\x05Level\x12\t\n\x05UNSET\x10\x00\x12\x0c\n\x08\x43RITICAL\x10\x32\x12\t\n\x05\x45RROR\x10(\x12\x0b\n\x07WARNING\x10\x1e\x12\x08\n\x04INFO\x10\x14\x12\t\n\x05\x44\x45\x42UG\x10\n\x12\t\n\x05TRACE\x10\x05\"\xe9\x01\n\tFromRadio\x12\x0b\n\x03num\x18\x01 \x01(\r\x12\x1d\n\x06packet\x18\x0b \x01(\x0b\x32\x0b.MeshPacketH\x00\x12\x1e\n\x07my_info\x18\x03 \x01(\x0b\x32\x0b.MyNodeInfoH\x00\x12\x1e\n\tnode_info\x18\x04 \x01(\x0b\x32\t.NodeInfoH\x00\x12 \n\nlog_record\x18\x07 \x01(\x0b\x32\n.LogRecordH\x00\x12\x1c\n\x12\x63onfig_complete_id\x18\x08 \x01(\rH\x00\x12\x12\n\x08rebooted\x18\t \x01(\x08H\x00\x42\x10\n\x0epayloadVariantJ\x04\x08\x02\x10\x03J\x04\x08\x06\x10\x07\"\xe1\x01\n\x07ToRadio\x12\x1d\n\x06packet\x18\x02 \x01(\x0b\x32\x0b.MeshPacketH\x00\x12&\n\tpeer_info\x18\x03 \x01(\x0b\x32\x11.ToRadio.PeerInfoH\x00\x12\x18\n\x0ewant_config_id\x18\x64 \x01(\rH\x00\x12\x14\n\ndisconnect\x18h \x01(\x08H\x00\x1a\x35\n\x08PeerInfo\x12\x13\n\x0b\x61pp_version\x18\x01 \x01(\r\x12\x14\n\x0cmqtt_gateway\x18\x02 \x01(\x08\x42\x10\n\x0epayloadVariantJ\x04\x08\x01\x10\x02J\x04\x08\x65\x10\x66J\x04\x08\x66\x10gJ\x04\x08g\x10h*\xda\x02\n\rHardwareModel\x12\t\n\x05UNSET\x10\x00\x12\x0c\n\x08TLORA_V2\x10\x01\x12\x0c\n\x08TLORA_V1\x10\x02\x12\x12\n\x0eTLORA_V2_1_1p6\x10\x03\x12\t\n\x05TBEAM\x10\x04\x12\x0f\n\x0bHELTEC_V2_0\x10\x05\x12\x0c\n\x08TBEAM0p7\x10\x06\x12\n\n\x06T_ECHO\x10\x07\x12\x10\n\x0cTLORA_V1_1p3\x10\x08\x12\x0b\n\x07RAK4631\x10\t\x12\x0f\n\x0bHELTEC_V2_1\x10\n\x12\r\n\tHELTEC_V1\x10\x0b\x12\x11\n\rLORA_RELAY_V1\x10 \x12\x0e\n\nNRF52840DK\x10!\x12\x07\n\x03PPR\x10\"\x12\x0f\n\x0bGENIEBLOCKS\x10#\x12\x11\n\rNRF52_UNKNOWN\x10$\x12\r\n\tPORTDUINO\x10%\x12\x0f\n\x0b\x41NDROID_SIM\x10&\x12\n\n\x06\x44IY_V1\x10\'\x12\x0c\n\x08RAK11200\x10(\x12\x0f\n\nPRIVATE_HW\x10\xff\x01*\xb5\x01\n\x04Team\x12\t\n\x05\x43LEAR\x10\x00\x12\x08\n\x04\x43YAN\x10\x01\x12\t\n\x05WHITE\x10\x02\x12\n\n\x06YELLOW\x10\x03\x12\n\n\x06ORANGE\x10\x04\x12\x0b\n\x07MAGENTA\x10\x05\x12\x07\n\x03RED\x10\x06\x12\n\n\x06MAROON\x10\x07\x12\n\n\x06PURPLE\x10\x08\x12\r\n\tDARK_BLUE\x10\t\x12\x08\n\x04\x42LUE\x10\n\x12\x08\n\x04TEAL\x10\x0b\x12\t\n\x05GREEN\x10\x0c\x12\x0e\n\nDARK_GREEN\x10\r\x12\t\n\x05\x42ROWN\x10\x0e*.\n\tConstants\x12\n\n\x06Unused\x10\x00\x12\x15\n\x10\x44\x41TA_PAYLOAD_LEN\x10\xed\x01*\xe1\x01\n\x11\x43riticalErrorCode\x12\x08\n\x04None\x10\x00\x12\x0e\n\nTxWatchdog\x10\x01\x12\x12\n\x0eSleepEnterWait\x10\x02\x12\x0b\n\x07NoRadio\x10\x03\x12\x0f\n\x0bUnspecified\x10\x04\x12\x13\n\x0fUBloxInitFailed\x10\x05\x12\x0c\n\x08NoAXP192\x10\x06\x12\x17\n\x13InvalidRadioSetting\x10\x07\x12\x12\n\x0eTransmitFailed\x10\x08\x12\x0c\n\x08\x42rownout\x10\t\x12\x11\n\rSX1262Failure\x10\n\x12\x0f\n\x0bRadioSpiBug\x10\x0b\x42\x46\n\x13\x63om.geeksville.meshB\nMeshProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3' - , - dependencies=[portnums__pb2.DESCRIPTOR,]) - -_HARDWAREMODEL = _descriptor.EnumDescriptor( - name='HardwareModel', - full_name='HardwareModel', - filename=None, - file=DESCRIPTOR, - values=[ - _descriptor.EnumValueDescriptor( - name='UNSET', index=0, number=0, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='TLORA_V2', index=1, number=1, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='TLORA_V1', index=2, number=2, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='TLORA_V2_1_1p6', index=3, number=3, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='TBEAM', index=4, number=4, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='HELTEC_V2_0', index=5, number=5, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='TBEAM0p7', index=6, number=6, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='T_ECHO', index=7, number=7, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='TLORA_V1_1p3', index=8, number=8, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='RAK4631', index=9, number=9, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='HELTEC_V2_1', index=10, number=10, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='HELTEC_V1', index=11, number=11, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='LORA_RELAY_V1', index=12, number=32, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='NRF52840DK', index=13, number=33, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='PPR', index=14, number=34, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='GENIEBLOCKS', index=15, number=35, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='NRF52_UNKNOWN', index=16, number=36, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='PORTDUINO', index=17, number=37, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='ANDROID_SIM', index=18, number=38, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='DIY_V1', index=19, number=39, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='RAK11200', index=20, number=40, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='PRIVATE_HW', index=21, number=255, - serialized_options=None, - type=None), - ], - containing_type=None, - serialized_options=None, - serialized_start=3247, - serialized_end=3593, -) -_sym_db.RegisterEnumDescriptor(_HARDWAREMODEL) +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\nmesh.proto\x1a\x0eportnums.proto\"\x94\x06\n\x08Position\x12\x12\n\nlatitude_i\x18\x01 \x01(\x0f\x12\x13\n\x0blongitude_i\x18\x02 \x01(\x0f\x12\x10\n\x08\x61ltitude\x18\x03 \x01(\x05\x12\x15\n\rbattery_level\x18\x04 \x01(\x05\x12\x0c\n\x04time\x18\t \x01(\x07\x12,\n\x0flocation_source\x18\n \x01(\x0e\x32\x13.Position.LocSource\x12,\n\x0f\x61ltitude_source\x18\x0b \x01(\x0e\x32\x13.Position.AltSource\x12\x15\n\rpos_timestamp\x18\x0c \x01(\x07\x12\x17\n\x0fpos_time_millis\x18\r \x01(\x05\x12\x14\n\x0c\x61ltitude_hae\x18\x0e \x01(\x11\x12\x15\n\ralt_geoid_sep\x18\x0f \x01(\x11\x12\x0c\n\x04PDOP\x18\x10 \x01(\r\x12\x0c\n\x04HDOP\x18\x11 \x01(\r\x12\x0c\n\x04VDOP\x18\x12 \x01(\r\x12\x14\n\x0cgps_accuracy\x18\x13 \x01(\r\x12\x14\n\x0cground_speed\x18\x14 \x01(\r\x12\x14\n\x0cground_track\x18\x15 \x01(\r\x12\x13\n\x0b\x66ix_quality\x18\x16 \x01(\r\x12\x10\n\x08\x66ix_type\x18\x17 \x01(\r\x12\x14\n\x0csats_in_view\x18\x18 \x01(\r\x12\x11\n\tsensor_id\x18\x19 \x01(\r\x12\x17\n\x0fpos_next_update\x18( \x01(\r\x12\x16\n\x0epos_seq_number\x18) \x01(\r\"n\n\tLocSource\x12\x16\n\x12LOCSRC_UNSPECIFIED\x10\x00\x12\x17\n\x13LOCSRC_MANUAL_ENTRY\x10\x01\x12\x17\n\x13LOCSRC_GPS_INTERNAL\x10\x02\x12\x17\n\x13LOCSRC_GPS_EXTERNAL\x10\x03\"\x85\x01\n\tAltSource\x12\x16\n\x12\x41LTSRC_UNSPECIFIED\x10\x00\x12\x17\n\x13\x41LTSRC_MANUAL_ENTRY\x10\x01\x12\x17\n\x13\x41LTSRC_GPS_INTERNAL\x10\x02\x12\x17\n\x13\x41LTSRC_GPS_EXTERNAL\x10\x03\x12\x15\n\x11\x41LTSRC_BAROMETRIC\x10\x04J\x04\x08\x07\x10\x08J\x04\x08\x08\x10\t\"\xd7\x01\n\x04User\x12\n\n\x02id\x18\x01 \x01(\t\x12\x11\n\tlong_name\x18\x02 \x01(\t\x12\x12\n\nshort_name\x18\x03 \x01(\t\x12\x0f\n\x07macaddr\x18\x04 \x01(\x0c\x12 \n\x08hw_model\x18\x06 \x01(\x0e\x32\x0e.HardwareModel\x12\x13\n\x0bis_licensed\x18\x07 \x01(\x08\x12\x13\n\x04team\x18\x08 \x01(\x0e\x32\x05.Team\x12\x14\n\x0ctx_power_dbm\x18\n \x01(\r\x12\x14\n\x0c\x61nt_gain_dbi\x18\x0b \x01(\r\x12\x13\n\x0b\x61nt_azimuth\x18\x0c \x01(\r\"\x1f\n\x0eRouteDiscovery\x12\r\n\x05route\x18\x02 \x03(\x07\"\xc5\x02\n\x07Routing\x12(\n\rroute_request\x18\x01 \x01(\x0b\x32\x0f.RouteDiscoveryH\x00\x12&\n\x0broute_reply\x18\x02 \x01(\x0b\x32\x0f.RouteDiscoveryH\x00\x12&\n\x0c\x65rror_reason\x18\x03 \x01(\x0e\x32\x0e.Routing.ErrorH\x00\"\xb4\x01\n\x05\x45rror\x12\x08\n\x04NONE\x10\x00\x12\x0c\n\x08NO_ROUTE\x10\x01\x12\x0b\n\x07GOT_NAK\x10\x02\x12\x0b\n\x07TIMEOUT\x10\x03\x12\x10\n\x0cNO_INTERFACE\x10\x04\x12\x12\n\x0eMAX_RETRANSMIT\x10\x05\x12\x0e\n\nNO_CHANNEL\x10\x06\x12\r\n\tTOO_LARGE\x10\x07\x12\x0f\n\x0bNO_RESPONSE\x10\x08\x12\x0f\n\x0b\x42\x41\x44_REQUEST\x10 \x12\x12\n\x0eNOT_AUTHORIZED\x10!B\t\n\x07variant\"\xa1\x01\n\x04\x44\x61ta\x12\x19\n\x07portnum\x18\x01 \x01(\x0e\x32\x08.PortNum\x12\x0f\n\x07payload\x18\x02 \x01(\x0c\x12\x15\n\rwant_response\x18\x03 \x01(\x08\x12\x0c\n\x04\x64\x65st\x18\x04 \x01(\x07\x12\x0e\n\x06source\x18\x05 \x01(\x07\x12\x12\n\nrequest_id\x18\x06 \x01(\x07\x12\x10\n\x08reply_id\x18\x07 \x01(\x07\x12\x12\n\nis_tapback\x18\x08 \x01(\x08\"\xca\x03\n\nMeshPacket\x12\x0c\n\x04\x66rom\x18\x01 \x01(\x07\x12\n\n\x02to\x18\x02 \x01(\x07\x12\x0f\n\x07\x63hannel\x18\x03 \x01(\r\x12\x18\n\x07\x64\x65\x63oded\x18\x04 \x01(\x0b\x32\x05.DataH\x00\x12\x13\n\tencrypted\x18\x05 \x01(\x0cH\x00\x12\n\n\x02id\x18\x06 \x01(\x07\x12\x0f\n\x07rx_time\x18\x07 \x01(\x07\x12\x0e\n\x06rx_snr\x18\x08 \x01(\x02\x12\x11\n\thop_limit\x18\n \x01(\r\x12\x10\n\x08want_ack\x18\x0b \x01(\x08\x12&\n\x08priority\x18\x0c \x01(\x0e\x32\x14.MeshPacket.Priority\x12\x0f\n\x07rx_rssi\x18\r \x01(\x05\x12$\n\x07\x64\x65layed\x18\x0f \x01(\x0e\x32\x13.MeshPacket.Delayed\"[\n\x08Priority\x12\t\n\x05UNSET\x10\x00\x12\x07\n\x03MIN\x10\x01\x12\x0e\n\nBACKGROUND\x10\n\x12\x0b\n\x07\x44\x45\x46\x41ULT\x10@\x12\x0c\n\x08RELIABLE\x10\x46\x12\x07\n\x03\x41\x43K\x10x\x12\x07\n\x03MAX\x10\x7f\"B\n\x07\x44\x65layed\x12\x0c\n\x08NO_DELAY\x10\x00\x12\x15\n\x11\x44\x45LAYED_BROADCAST\x10\x01\x12\x12\n\x0e\x44\x45LAYED_DIRECT\x10\x02\x42\x10\n\x0epayloadVariant\"j\n\x08NodeInfo\x12\x0b\n\x03num\x18\x01 \x01(\r\x12\x13\n\x04user\x18\x02 \x01(\x0b\x32\x05.User\x12\x1b\n\x08position\x18\x03 \x01(\x0b\x32\t.Position\x12\x0b\n\x03snr\x18\x07 \x01(\x02\x12\x12\n\nlast_heard\x18\x04 \x01(\x07\"\xce\x03\n\nMyNodeInfo\x12\x13\n\x0bmy_node_num\x18\x01 \x01(\r\x12\x0f\n\x07has_gps\x18\x02 \x01(\x08\x12\x11\n\tnum_bands\x18\x03 \x01(\r\x12\x14\n\x0cmax_channels\x18\x0f \x01(\r\x12\x12\n\x06region\x18\x04 \x01(\tB\x02\x18\x01\x12\x1f\n\x13hw_model_deprecated\x18\x05 \x01(\tB\x02\x18\x01\x12\x18\n\x10\x66irmware_version\x18\x06 \x01(\t\x12&\n\nerror_code\x18\x07 \x01(\x0e\x32\x12.CriticalErrorCode\x12\x15\n\rerror_address\x18\x08 \x01(\r\x12\x13\n\x0b\x65rror_count\x18\t \x01(\r\x12\x14\n\x0creboot_count\x18\n \x01(\r\x12\x0f\n\x07\x62itrate\x18\x0b \x01(\x02\x12\x1c\n\x14message_timeout_msec\x18\r \x01(\r\x12\x17\n\x0fmin_app_version\x18\x0e \x01(\r\x12\x15\n\rair_period_tx\x18\x10 \x03(\r\x12\x15\n\rair_period_rx\x18\x11 \x03(\r\x12\x10\n\x08has_wifi\x18\x12 \x01(\x08\x12\x1b\n\x13\x63hannel_utilization\x18\x13 \x01(\x02\x12\x13\n\x0b\x61ir_util_tx\x18\x14 \x01(\x02\"\xb5\x01\n\tLogRecord\x12\x0f\n\x07message\x18\x01 \x01(\t\x12\x0c\n\x04time\x18\x02 \x01(\x07\x12\x0e\n\x06source\x18\x03 \x01(\t\x12\x1f\n\x05level\x18\x04 \x01(\x0e\x32\x10.LogRecord.Level\"X\n\x05Level\x12\t\n\x05UNSET\x10\x00\x12\x0c\n\x08\x43RITICAL\x10\x32\x12\t\n\x05\x45RROR\x10(\x12\x0b\n\x07WARNING\x10\x1e\x12\x08\n\x04INFO\x10\x14\x12\t\n\x05\x44\x45\x42UG\x10\n\x12\t\n\x05TRACE\x10\x05\"\xe9\x01\n\tFromRadio\x12\x0b\n\x03num\x18\x01 \x01(\r\x12\x1d\n\x06packet\x18\x0b \x01(\x0b\x32\x0b.MeshPacketH\x00\x12\x1e\n\x07my_info\x18\x03 \x01(\x0b\x32\x0b.MyNodeInfoH\x00\x12\x1e\n\tnode_info\x18\x04 \x01(\x0b\x32\t.NodeInfoH\x00\x12 \n\nlog_record\x18\x07 \x01(\x0b\x32\n.LogRecordH\x00\x12\x1c\n\x12\x63onfig_complete_id\x18\x08 \x01(\rH\x00\x12\x12\n\x08rebooted\x18\t \x01(\x08H\x00\x42\x10\n\x0epayloadVariantJ\x04\x08\x02\x10\x03J\x04\x08\x06\x10\x07\"\xe1\x01\n\x07ToRadio\x12\x1d\n\x06packet\x18\x02 \x01(\x0b\x32\x0b.MeshPacketH\x00\x12&\n\tpeer_info\x18\x03 \x01(\x0b\x32\x11.ToRadio.PeerInfoH\x00\x12\x18\n\x0ewant_config_id\x18\x64 \x01(\rH\x00\x12\x14\n\ndisconnect\x18h \x01(\x08H\x00\x1a\x35\n\x08PeerInfo\x12\x13\n\x0b\x61pp_version\x18\x01 \x01(\r\x12\x14\n\x0cmqtt_gateway\x18\x02 \x01(\x08\x42\x10\n\x0epayloadVariantJ\x04\x08\x01\x10\x02J\x04\x08\x65\x10\x66J\x04\x08\x66\x10gJ\x04\x08g\x10h*\xe7\x02\n\rHardwareModel\x12\t\n\x05UNSET\x10\x00\x12\x0c\n\x08TLORA_V2\x10\x01\x12\x0c\n\x08TLORA_V1\x10\x02\x12\x12\n\x0eTLORA_V2_1_1p6\x10\x03\x12\t\n\x05TBEAM\x10\x04\x12\x0f\n\x0bHELTEC_V2_0\x10\x05\x12\x0c\n\x08TBEAM0p7\x10\x06\x12\n\n\x06T_ECHO\x10\x07\x12\x10\n\x0cTLORA_V1_1p3\x10\x08\x12\x0b\n\x07RAK4631\x10\t\x12\x0f\n\x0bHELTEC_V2_1\x10\n\x12\r\n\tHELTEC_V1\x10\x0b\x12\x11\n\rLORA_RELAY_V1\x10 \x12\x0e\n\nNRF52840DK\x10!\x12\x07\n\x03PPR\x10\"\x12\x0f\n\x0bGENIEBLOCKS\x10#\x12\x11\n\rNRF52_UNKNOWN\x10$\x12\r\n\tPORTDUINO\x10%\x12\x0f\n\x0b\x41NDROID_SIM\x10&\x12\n\n\x06\x44IY_V1\x10\'\x12\x0c\n\x08RAK11200\x10(\x12\x0b\n\x07NANO_G1\x10)\x12\x0f\n\nPRIVATE_HW\x10\xff\x01*\xb5\x01\n\x04Team\x12\t\n\x05\x43LEAR\x10\x00\x12\x08\n\x04\x43YAN\x10\x01\x12\t\n\x05WHITE\x10\x02\x12\n\n\x06YELLOW\x10\x03\x12\n\n\x06ORANGE\x10\x04\x12\x0b\n\x07MAGENTA\x10\x05\x12\x07\n\x03RED\x10\x06\x12\n\n\x06MAROON\x10\x07\x12\n\n\x06PURPLE\x10\x08\x12\r\n\tDARK_BLUE\x10\t\x12\x08\n\x04\x42LUE\x10\n\x12\x08\n\x04TEAL\x10\x0b\x12\t\n\x05GREEN\x10\x0c\x12\x0e\n\nDARK_GREEN\x10\r\x12\t\n\x05\x42ROWN\x10\x0e*.\n\tConstants\x12\n\n\x06Unused\x10\x00\x12\x15\n\x10\x44\x41TA_PAYLOAD_LEN\x10\xed\x01*\xe1\x01\n\x11\x43riticalErrorCode\x12\x08\n\x04None\x10\x00\x12\x0e\n\nTxWatchdog\x10\x01\x12\x12\n\x0eSleepEnterWait\x10\x02\x12\x0b\n\x07NoRadio\x10\x03\x12\x0f\n\x0bUnspecified\x10\x04\x12\x13\n\x0fUBloxInitFailed\x10\x05\x12\x0c\n\x08NoAXP192\x10\x06\x12\x17\n\x13InvalidRadioSetting\x10\x07\x12\x12\n\x0eTransmitFailed\x10\x08\x12\x0c\n\x08\x42rownout\x10\t\x12\x11\n\rSX1262Failure\x10\n\x12\x0f\n\x0bRadioSpiBug\x10\x0b\x42\x46\n\x13\x63om.geeksville.meshB\nMeshProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3') +_HARDWAREMODEL = DESCRIPTOR.enum_types_by_name['HardwareModel'] HardwareModel = enum_type_wrapper.EnumTypeWrapper(_HARDWAREMODEL) -_TEAM = _descriptor.EnumDescriptor( - name='Team', - full_name='Team', - filename=None, - file=DESCRIPTOR, - values=[ - _descriptor.EnumValueDescriptor( - name='CLEAR', index=0, number=0, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='CYAN', index=1, number=1, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='WHITE', index=2, number=2, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='YELLOW', index=3, number=3, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='ORANGE', index=4, number=4, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='MAGENTA', index=5, number=5, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='RED', index=6, number=6, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='MAROON', index=7, number=7, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='PURPLE', index=8, number=8, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='DARK_BLUE', index=9, number=9, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='BLUE', index=10, number=10, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='TEAL', index=11, number=11, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='GREEN', index=12, number=12, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='DARK_GREEN', index=13, number=13, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='BROWN', index=14, number=14, - serialized_options=None, - type=None), - ], - containing_type=None, - serialized_options=None, - serialized_start=3596, - serialized_end=3777, -) -_sym_db.RegisterEnumDescriptor(_TEAM) - +_TEAM = DESCRIPTOR.enum_types_by_name['Team'] Team = enum_type_wrapper.EnumTypeWrapper(_TEAM) -_CONSTANTS = _descriptor.EnumDescriptor( - name='Constants', - full_name='Constants', - filename=None, - file=DESCRIPTOR, - values=[ - _descriptor.EnumValueDescriptor( - name='Unused', index=0, number=0, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='DATA_PAYLOAD_LEN', index=1, number=237, - serialized_options=None, - type=None), - ], - containing_type=None, - serialized_options=None, - serialized_start=3779, - serialized_end=3825, -) -_sym_db.RegisterEnumDescriptor(_CONSTANTS) - +_CONSTANTS = DESCRIPTOR.enum_types_by_name['Constants'] Constants = enum_type_wrapper.EnumTypeWrapper(_CONSTANTS) -_CRITICALERRORCODE = _descriptor.EnumDescriptor( - name='CriticalErrorCode', - full_name='CriticalErrorCode', - filename=None, - file=DESCRIPTOR, - values=[ - _descriptor.EnumValueDescriptor( - name='None', index=0, number=0, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='TxWatchdog', index=1, number=1, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='SleepEnterWait', index=2, number=2, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='NoRadio', index=3, number=3, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='Unspecified', index=4, number=4, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='UBloxInitFailed', index=5, number=5, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='NoAXP192', index=6, number=6, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='InvalidRadioSetting', index=7, number=7, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='TransmitFailed', index=8, number=8, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='Brownout', index=9, number=9, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='SX1262Failure', index=10, number=10, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='RadioSpiBug', index=11, number=11, - serialized_options=None, - type=None), - ], - containing_type=None, - serialized_options=None, - serialized_start=3828, - serialized_end=4053, -) -_sym_db.RegisterEnumDescriptor(_CRITICALERRORCODE) - +_CRITICALERRORCODE = DESCRIPTOR.enum_types_by_name['CriticalErrorCode'] CriticalErrorCode = enum_type_wrapper.EnumTypeWrapper(_CRITICALERRORCODE) UNSET = 0 TLORA_V2 = 1 @@ -309,6 +47,7 @@ ANDROID_SIM = 38 DIY_V1 = 39 RAK11200 = 40 +NANO_G1 = 41 PRIVATE_HW = 255 CLEAR = 0 CYAN = 1 @@ -341,1326 +80,24 @@ RadioSpiBug = 11 -_POSITION_LOCSOURCE = _descriptor.EnumDescriptor( - name='LocSource', - full_name='Position.LocSource', - filename=None, - file=DESCRIPTOR, - values=[ - _descriptor.EnumValueDescriptor( - name='LOCSRC_UNSPECIFIED', index=0, number=0, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='LOCSRC_MANUAL_ENTRY', index=1, number=1, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='LOCSRC_GPS_INTERNAL', index=2, number=2, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='LOCSRC_GPS_EXTERNAL', index=3, number=3, - serialized_options=None, - type=None), - ], - containing_type=None, - serialized_options=None, - serialized_start=561, - serialized_end=671, -) -_sym_db.RegisterEnumDescriptor(_POSITION_LOCSOURCE) - -_POSITION_ALTSOURCE = _descriptor.EnumDescriptor( - name='AltSource', - full_name='Position.AltSource', - filename=None, - file=DESCRIPTOR, - values=[ - _descriptor.EnumValueDescriptor( - name='ALTSRC_UNSPECIFIED', index=0, number=0, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='ALTSRC_MANUAL_ENTRY', index=1, number=1, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='ALTSRC_GPS_INTERNAL', index=2, number=2, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='ALTSRC_GPS_EXTERNAL', index=3, number=3, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='ALTSRC_BAROMETRIC', index=4, number=4, - serialized_options=None, - type=None), - ], - containing_type=None, - serialized_options=None, - serialized_start=674, - serialized_end=807, -) -_sym_db.RegisterEnumDescriptor(_POSITION_ALTSOURCE) - -_ROUTING_ERROR = _descriptor.EnumDescriptor( - name='Error', - full_name='Routing.Error', - filename=None, - file=DESCRIPTOR, - values=[ - _descriptor.EnumValueDescriptor( - name='NONE', index=0, number=0, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='NO_ROUTE', index=1, number=1, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='GOT_NAK', index=2, number=2, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='TIMEOUT', index=3, number=3, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='NO_INTERFACE', index=4, number=4, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='MAX_RETRANSMIT', index=5, number=5, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='NO_CHANNEL', index=6, number=6, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='TOO_LARGE', index=7, number=7, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='NO_RESPONSE', index=8, number=8, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='BAD_REQUEST', index=9, number=32, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='NOT_AUTHORIZED', index=10, number=33, - serialized_options=None, - type=None), - ], - containing_type=None, - serialized_options=None, - serialized_start=1207, - serialized_end=1387, -) -_sym_db.RegisterEnumDescriptor(_ROUTING_ERROR) - -_MESHPACKET_PRIORITY = _descriptor.EnumDescriptor( - name='Priority', - full_name='MeshPacket.Priority', - filename=None, - file=DESCRIPTOR, - values=[ - _descriptor.EnumValueDescriptor( - name='UNSET', index=0, number=0, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='MIN', index=1, number=1, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='BACKGROUND', index=2, number=10, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='DEFAULT', index=3, number=64, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='RELIABLE', index=4, number=70, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='ACK', index=5, number=120, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='MAX', index=6, number=127, - serialized_options=None, - type=None), - ], - containing_type=None, - serialized_options=None, - serialized_start=1846, - serialized_end=1937, -) -_sym_db.RegisterEnumDescriptor(_MESHPACKET_PRIORITY) - -_MESHPACKET_DELAYED = _descriptor.EnumDescriptor( - name='Delayed', - full_name='MeshPacket.Delayed', - filename=None, - file=DESCRIPTOR, - values=[ - _descriptor.EnumValueDescriptor( - name='NO_DELAY', index=0, number=0, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='DELAYED_BROADCAST', index=1, number=1, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='DELAYED_DIRECT', index=2, number=2, - serialized_options=None, - type=None), - ], - containing_type=None, - serialized_options=None, - serialized_start=1939, - serialized_end=2005, -) -_sym_db.RegisterEnumDescriptor(_MESHPACKET_DELAYED) - -_LOGRECORD_LEVEL = _descriptor.EnumDescriptor( - name='Level', - full_name='LogRecord.Level', - filename=None, - file=DESCRIPTOR, - values=[ - _descriptor.EnumValueDescriptor( - name='UNSET', index=0, number=0, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='CRITICAL', index=1, number=50, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='ERROR', index=2, number=40, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='WARNING', index=3, number=30, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='INFO', index=4, number=20, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='DEBUG', index=5, number=10, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='TRACE', index=6, number=5, - serialized_options=None, - type=None), - ], - containing_type=None, - serialized_options=None, - serialized_start=2692, - serialized_end=2780, -) -_sym_db.RegisterEnumDescriptor(_LOGRECORD_LEVEL) - - -_POSITION = _descriptor.Descriptor( - name='Position', - full_name='Position', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='latitude_i', full_name='Position.latitude_i', index=0, - number=1, type=15, 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='longitude_i', full_name='Position.longitude_i', index=1, - number=2, type=15, 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='altitude', full_name='Position.altitude', index=2, - number=3, 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='battery_level', full_name='Position.battery_level', index=3, - number=4, 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='time', full_name='Position.time', index=4, - number=9, 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='location_source', full_name='Position.location_source', index=5, - number=10, 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='altitude_source', full_name='Position.altitude_source', index=6, - number=11, 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='pos_timestamp', full_name='Position.pos_timestamp', index=7, - number=12, 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='pos_time_millis', full_name='Position.pos_time_millis', index=8, - number=13, 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='altitude_hae', full_name='Position.altitude_hae', index=9, - number=14, type=17, 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='alt_geoid_sep', full_name='Position.alt_geoid_sep', index=10, - number=15, type=17, 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='PDOP', full_name='Position.PDOP', index=11, - number=16, 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='HDOP', full_name='Position.HDOP', index=12, - number=17, 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='VDOP', full_name='Position.VDOP', index=13, - number=18, 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='gps_accuracy', full_name='Position.gps_accuracy', index=14, - number=19, 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='ground_speed', full_name='Position.ground_speed', index=15, - number=20, 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='ground_track', full_name='Position.ground_track', index=16, - number=21, 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='fix_quality', full_name='Position.fix_quality', index=17, - number=22, 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='fix_type', full_name='Position.fix_type', index=18, - number=23, 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='sats_in_view', full_name='Position.sats_in_view', index=19, - number=24, 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='sensor_id', full_name='Position.sensor_id', index=20, - number=25, 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='pos_next_update', full_name='Position.pos_next_update', index=21, - number=40, 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='pos_seq_number', full_name='Position.pos_seq_number', index=22, - number=41, 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=[ - _POSITION_LOCSOURCE, - _POSITION_ALTSOURCE, - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=31, - serialized_end=819, -) - - -_USER = _descriptor.Descriptor( - name='User', - full_name='User', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='id', full_name='User.id', index=0, - number=1, 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='long_name', full_name='User.long_name', 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='short_name', full_name='User.short_name', 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), - _descriptor.FieldDescriptor( - name='macaddr', full_name='User.macaddr', index=3, - 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='hw_model', full_name='User.hw_model', index=4, - number=6, 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='is_licensed', full_name='User.is_licensed', index=5, - 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='team', full_name='User.team', index=6, - number=8, 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='tx_power_dbm', full_name='User.tx_power_dbm', index=7, - number=10, 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='ant_gain_dbi', full_name='User.ant_gain_dbi', index=8, - number=11, 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='ant_azimuth', full_name='User.ant_azimuth', index=9, - number=12, 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=822, - serialized_end=1037, -) - - -_ROUTEDISCOVERY = _descriptor.Descriptor( - name='RouteDiscovery', - full_name='RouteDiscovery', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='route', full_name='RouteDiscovery.route', index=0, - number=2, type=7, cpp_type=3, 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=1039, - serialized_end=1070, -) - - -_ROUTING = _descriptor.Descriptor( - name='Routing', - full_name='Routing', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='route_request', full_name='Routing.route_request', 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='route_reply', full_name='Routing.route_reply', 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='error_reason', full_name='Routing.error_reason', 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=[ - _ROUTING_ERROR, - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - _descriptor.OneofDescriptor( - name='variant', full_name='Routing.variant', - index=0, containing_type=None, fields=[]), - ], - serialized_start=1073, - serialized_end=1398, -) - - -_DATA = _descriptor.Descriptor( - name='Data', - full_name='Data', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='portnum', full_name='Data.portnum', 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='payload', full_name='Data.payload', index=1, - number=2, 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='want_response', full_name='Data.want_response', index=2, - number=3, 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='dest', full_name='Data.dest', index=3, - number=4, 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='source', full_name='Data.source', index=4, - number=5, 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='request_id', full_name='Data.request_id', index=5, - number=6, 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='reply_id', full_name='Data.reply_id', index=6, - number=7, 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='is_tapback', full_name='Data.is_tapback', 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), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=1401, - serialized_end=1562, -) - - -_MESHPACKET = _descriptor.Descriptor( - name='MeshPacket', - full_name='MeshPacket', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='from', full_name='MeshPacket.from', index=0, - number=1, 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='to', full_name='MeshPacket.to', index=1, - number=2, 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='channel', full_name='MeshPacket.channel', 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='decoded', full_name='MeshPacket.decoded', 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), - _descriptor.FieldDescriptor( - name='encrypted', full_name='MeshPacket.encrypted', index=4, - number=5, 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='id', full_name='MeshPacket.id', index=5, - number=6, 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='rx_time', full_name='MeshPacket.rx_time', index=6, - number=7, 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='rx_snr', full_name='MeshPacket.rx_snr', index=7, - number=8, 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='hop_limit', full_name='MeshPacket.hop_limit', index=8, - number=10, 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='want_ack', full_name='MeshPacket.want_ack', index=9, - 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), - _descriptor.FieldDescriptor( - name='priority', full_name='MeshPacket.priority', index=10, - number=12, 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='rx_rssi', full_name='MeshPacket.rx_rssi', index=11, - number=13, 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='delayed', full_name='MeshPacket.delayed', index=12, - 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=[ - _MESHPACKET_PRIORITY, - _MESHPACKET_DELAYED, - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - _descriptor.OneofDescriptor( - name='payloadVariant', full_name='MeshPacket.payloadVariant', - index=0, containing_type=None, fields=[]), - ], - serialized_start=1565, - serialized_end=2023, -) - - -_NODEINFO = _descriptor.Descriptor( - name='NodeInfo', - full_name='NodeInfo', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='num', full_name='NodeInfo.num', 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='user', full_name='NodeInfo.user', 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='position', full_name='NodeInfo.position', 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='snr', full_name='NodeInfo.snr', index=3, - number=7, 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='last_heard', full_name='NodeInfo.last_heard', index=4, - number=4, 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), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=2025, - serialized_end=2131, -) - - -_MYNODEINFO = _descriptor.Descriptor( - name='MyNodeInfo', - full_name='MyNodeInfo', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='my_node_num', full_name='MyNodeInfo.my_node_num', 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='has_gps', full_name='MyNodeInfo.has_gps', index=1, - number=2, 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='num_bands', full_name='MyNodeInfo.num_bands', 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='max_channels', full_name='MyNodeInfo.max_channels', index=3, - number=15, 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='region', full_name='MyNodeInfo.region', index=4, - number=4, 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=b'\030\001', file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='hw_model_deprecated', full_name='MyNodeInfo.hw_model_deprecated', index=5, - 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=b'\030\001', file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='firmware_version', full_name='MyNodeInfo.firmware_version', index=6, - number=6, 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='error_code', full_name='MyNodeInfo.error_code', index=7, - number=7, 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='error_address', full_name='MyNodeInfo.error_address', index=8, - 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='error_count', full_name='MyNodeInfo.error_count', index=9, - 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='reboot_count', full_name='MyNodeInfo.reboot_count', index=10, - number=10, 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='bitrate', full_name='MyNodeInfo.bitrate', index=11, - number=11, 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='message_timeout_msec', full_name='MyNodeInfo.message_timeout_msec', index=12, - number=13, 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='min_app_version', full_name='MyNodeInfo.min_app_version', index=13, - number=14, 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='air_period_tx', full_name='MyNodeInfo.air_period_tx', index=14, - number=16, type=13, cpp_type=3, 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='air_period_rx', full_name='MyNodeInfo.air_period_rx', index=15, - number=17, type=13, cpp_type=3, 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='has_wifi', full_name='MyNodeInfo.has_wifi', index=16, - number=18, 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='channel_utilization', full_name='MyNodeInfo.channel_utilization', index=17, - number=19, 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='air_util_tx', full_name='MyNodeInfo.air_util_tx', index=18, - number=20, 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=2134, - serialized_end=2596, -) - - -_LOGRECORD = _descriptor.Descriptor( - name='LogRecord', - full_name='LogRecord', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='message', full_name='LogRecord.message', index=0, - number=1, 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='time', full_name='LogRecord.time', index=1, - number=2, 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='source', full_name='LogRecord.source', 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), - _descriptor.FieldDescriptor( - name='level', full_name='LogRecord.level', index=3, - number=4, 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=[ - _LOGRECORD_LEVEL, - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=2599, - serialized_end=2780, -) - - -_FROMRADIO = _descriptor.Descriptor( - name='FromRadio', - full_name='FromRadio', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='num', full_name='FromRadio.num', 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='packet', full_name='FromRadio.packet', index=1, - number=11, 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_info', full_name='FromRadio.my_info', 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_info', full_name='FromRadio.node_info', 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), - _descriptor.FieldDescriptor( - name='log_record', full_name='FromRadio.log_record', index=4, - 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='config_complete_id', full_name='FromRadio.config_complete_id', 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='rebooted', full_name='FromRadio.rebooted', index=6, - 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), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - _descriptor.OneofDescriptor( - name='payloadVariant', full_name='FromRadio.payloadVariant', - index=0, containing_type=None, fields=[]), - ], - serialized_start=2783, - serialized_end=3016, -) - - -_TORADIO_PEERINFO = _descriptor.Descriptor( - name='PeerInfo', - full_name='ToRadio.PeerInfo', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='app_version', full_name='ToRadio.PeerInfo.app_version', 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='mqtt_gateway', full_name='ToRadio.PeerInfo.mqtt_gateway', index=1, - number=2, 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=3149, - serialized_end=3202, -) - -_TORADIO = _descriptor.Descriptor( - name='ToRadio', - full_name='ToRadio', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='packet', full_name='ToRadio.packet', index=0, - 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='peer_info', full_name='ToRadio.peer_info', index=1, - 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='want_config_id', full_name='ToRadio.want_config_id', index=2, - number=100, 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='disconnect', full_name='ToRadio.disconnect', index=3, - number=104, 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=[_TORADIO_PEERINFO, ], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - _descriptor.OneofDescriptor( - name='payloadVariant', full_name='ToRadio.payloadVariant', - index=0, containing_type=None, fields=[]), - ], - serialized_start=3019, - serialized_end=3244, -) - -_POSITION.fields_by_name['location_source'].enum_type = _POSITION_LOCSOURCE -_POSITION.fields_by_name['altitude_source'].enum_type = _POSITION_ALTSOURCE -_POSITION_LOCSOURCE.containing_type = _POSITION -_POSITION_ALTSOURCE.containing_type = _POSITION -_USER.fields_by_name['hw_model'].enum_type = _HARDWAREMODEL -_USER.fields_by_name['team'].enum_type = _TEAM -_ROUTING.fields_by_name['route_request'].message_type = _ROUTEDISCOVERY -_ROUTING.fields_by_name['route_reply'].message_type = _ROUTEDISCOVERY -_ROUTING.fields_by_name['error_reason'].enum_type = _ROUTING_ERROR -_ROUTING_ERROR.containing_type = _ROUTING -_ROUTING.oneofs_by_name['variant'].fields.append( - _ROUTING.fields_by_name['route_request']) -_ROUTING.fields_by_name['route_request'].containing_oneof = _ROUTING.oneofs_by_name['variant'] -_ROUTING.oneofs_by_name['variant'].fields.append( - _ROUTING.fields_by_name['route_reply']) -_ROUTING.fields_by_name['route_reply'].containing_oneof = _ROUTING.oneofs_by_name['variant'] -_ROUTING.oneofs_by_name['variant'].fields.append( - _ROUTING.fields_by_name['error_reason']) -_ROUTING.fields_by_name['error_reason'].containing_oneof = _ROUTING.oneofs_by_name['variant'] -_DATA.fields_by_name['portnum'].enum_type = portnums__pb2._PORTNUM -_MESHPACKET.fields_by_name['decoded'].message_type = _DATA -_MESHPACKET.fields_by_name['priority'].enum_type = _MESHPACKET_PRIORITY -_MESHPACKET.fields_by_name['delayed'].enum_type = _MESHPACKET_DELAYED -_MESHPACKET_PRIORITY.containing_type = _MESHPACKET -_MESHPACKET_DELAYED.containing_type = _MESHPACKET -_MESHPACKET.oneofs_by_name['payloadVariant'].fields.append( - _MESHPACKET.fields_by_name['decoded']) -_MESHPACKET.fields_by_name['decoded'].containing_oneof = _MESHPACKET.oneofs_by_name['payloadVariant'] -_MESHPACKET.oneofs_by_name['payloadVariant'].fields.append( - _MESHPACKET.fields_by_name['encrypted']) -_MESHPACKET.fields_by_name['encrypted'].containing_oneof = _MESHPACKET.oneofs_by_name['payloadVariant'] -_NODEINFO.fields_by_name['user'].message_type = _USER -_NODEINFO.fields_by_name['position'].message_type = _POSITION -_MYNODEINFO.fields_by_name['error_code'].enum_type = _CRITICALERRORCODE -_LOGRECORD.fields_by_name['level'].enum_type = _LOGRECORD_LEVEL -_LOGRECORD_LEVEL.containing_type = _LOGRECORD -_FROMRADIO.fields_by_name['packet'].message_type = _MESHPACKET -_FROMRADIO.fields_by_name['my_info'].message_type = _MYNODEINFO -_FROMRADIO.fields_by_name['node_info'].message_type = _NODEINFO -_FROMRADIO.fields_by_name['log_record'].message_type = _LOGRECORD -_FROMRADIO.oneofs_by_name['payloadVariant'].fields.append( - _FROMRADIO.fields_by_name['packet']) -_FROMRADIO.fields_by_name['packet'].containing_oneof = _FROMRADIO.oneofs_by_name['payloadVariant'] -_FROMRADIO.oneofs_by_name['payloadVariant'].fields.append( - _FROMRADIO.fields_by_name['my_info']) -_FROMRADIO.fields_by_name['my_info'].containing_oneof = _FROMRADIO.oneofs_by_name['payloadVariant'] -_FROMRADIO.oneofs_by_name['payloadVariant'].fields.append( - _FROMRADIO.fields_by_name['node_info']) -_FROMRADIO.fields_by_name['node_info'].containing_oneof = _FROMRADIO.oneofs_by_name['payloadVariant'] -_FROMRADIO.oneofs_by_name['payloadVariant'].fields.append( - _FROMRADIO.fields_by_name['log_record']) -_FROMRADIO.fields_by_name['log_record'].containing_oneof = _FROMRADIO.oneofs_by_name['payloadVariant'] -_FROMRADIO.oneofs_by_name['payloadVariant'].fields.append( - _FROMRADIO.fields_by_name['config_complete_id']) -_FROMRADIO.fields_by_name['config_complete_id'].containing_oneof = _FROMRADIO.oneofs_by_name['payloadVariant'] -_FROMRADIO.oneofs_by_name['payloadVariant'].fields.append( - _FROMRADIO.fields_by_name['rebooted']) -_FROMRADIO.fields_by_name['rebooted'].containing_oneof = _FROMRADIO.oneofs_by_name['payloadVariant'] -_TORADIO_PEERINFO.containing_type = _TORADIO -_TORADIO.fields_by_name['packet'].message_type = _MESHPACKET -_TORADIO.fields_by_name['peer_info'].message_type = _TORADIO_PEERINFO -_TORADIO.oneofs_by_name['payloadVariant'].fields.append( - _TORADIO.fields_by_name['packet']) -_TORADIO.fields_by_name['packet'].containing_oneof = _TORADIO.oneofs_by_name['payloadVariant'] -_TORADIO.oneofs_by_name['payloadVariant'].fields.append( - _TORADIO.fields_by_name['peer_info']) -_TORADIO.fields_by_name['peer_info'].containing_oneof = _TORADIO.oneofs_by_name['payloadVariant'] -_TORADIO.oneofs_by_name['payloadVariant'].fields.append( - _TORADIO.fields_by_name['want_config_id']) -_TORADIO.fields_by_name['want_config_id'].containing_oneof = _TORADIO.oneofs_by_name['payloadVariant'] -_TORADIO.oneofs_by_name['payloadVariant'].fields.append( - _TORADIO.fields_by_name['disconnect']) -_TORADIO.fields_by_name['disconnect'].containing_oneof = _TORADIO.oneofs_by_name['payloadVariant'] -DESCRIPTOR.message_types_by_name['Position'] = _POSITION -DESCRIPTOR.message_types_by_name['User'] = _USER -DESCRIPTOR.message_types_by_name['RouteDiscovery'] = _ROUTEDISCOVERY -DESCRIPTOR.message_types_by_name['Routing'] = _ROUTING -DESCRIPTOR.message_types_by_name['Data'] = _DATA -DESCRIPTOR.message_types_by_name['MeshPacket'] = _MESHPACKET -DESCRIPTOR.message_types_by_name['NodeInfo'] = _NODEINFO -DESCRIPTOR.message_types_by_name['MyNodeInfo'] = _MYNODEINFO -DESCRIPTOR.message_types_by_name['LogRecord'] = _LOGRECORD -DESCRIPTOR.message_types_by_name['FromRadio'] = _FROMRADIO -DESCRIPTOR.message_types_by_name['ToRadio'] = _TORADIO -DESCRIPTOR.enum_types_by_name['HardwareModel'] = _HARDWAREMODEL -DESCRIPTOR.enum_types_by_name['Team'] = _TEAM -DESCRIPTOR.enum_types_by_name['Constants'] = _CONSTANTS -DESCRIPTOR.enum_types_by_name['CriticalErrorCode'] = _CRITICALERRORCODE -_sym_db.RegisterFileDescriptor(DESCRIPTOR) - +_POSITION = DESCRIPTOR.message_types_by_name['Position'] +_USER = DESCRIPTOR.message_types_by_name['User'] +_ROUTEDISCOVERY = DESCRIPTOR.message_types_by_name['RouteDiscovery'] +_ROUTING = DESCRIPTOR.message_types_by_name['Routing'] +_DATA = DESCRIPTOR.message_types_by_name['Data'] +_MESHPACKET = DESCRIPTOR.message_types_by_name['MeshPacket'] +_NODEINFO = DESCRIPTOR.message_types_by_name['NodeInfo'] +_MYNODEINFO = DESCRIPTOR.message_types_by_name['MyNodeInfo'] +_LOGRECORD = DESCRIPTOR.message_types_by_name['LogRecord'] +_FROMRADIO = DESCRIPTOR.message_types_by_name['FromRadio'] +_TORADIO = DESCRIPTOR.message_types_by_name['ToRadio'] +_TORADIO_PEERINFO = _TORADIO.nested_types_by_name['PeerInfo'] +_POSITION_LOCSOURCE = _POSITION.enum_types_by_name['LocSource'] +_POSITION_ALTSOURCE = _POSITION.enum_types_by_name['AltSource'] +_ROUTING_ERROR = _ROUTING.enum_types_by_name['Error'] +_MESHPACKET_PRIORITY = _MESHPACKET.enum_types_by_name['Priority'] +_MESHPACKET_DELAYED = _MESHPACKET.enum_types_by_name['Delayed'] +_LOGRECORD_LEVEL = _LOGRECORD.enum_types_by_name['Level'] Position = _reflection.GeneratedProtocolMessageType('Position', (_message.Message,), { 'DESCRIPTOR' : _POSITION, '__module__' : 'mesh_pb2' @@ -1746,8 +183,56 @@ _sym_db.RegisterMessage(ToRadio) _sym_db.RegisterMessage(ToRadio.PeerInfo) - -DESCRIPTOR._options = None -_MYNODEINFO.fields_by_name['region']._options = None -_MYNODEINFO.fields_by_name['hw_model_deprecated']._options = None +if _descriptor._USE_C_DESCRIPTORS == False: + + DESCRIPTOR._options = None + DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\nMeshProtosH\003Z!github.com/meshtastic/gomeshproto' + _MYNODEINFO.fields_by_name['region']._options = None + _MYNODEINFO.fields_by_name['region']._serialized_options = b'\030\001' + _MYNODEINFO.fields_by_name['hw_model_deprecated']._options = None + _MYNODEINFO.fields_by_name['hw_model_deprecated']._serialized_options = b'\030\001' + _HARDWAREMODEL._serialized_start=3247 + _HARDWAREMODEL._serialized_end=3606 + _TEAM._serialized_start=3609 + _TEAM._serialized_end=3790 + _CONSTANTS._serialized_start=3792 + _CONSTANTS._serialized_end=3838 + _CRITICALERRORCODE._serialized_start=3841 + _CRITICALERRORCODE._serialized_end=4066 + _POSITION._serialized_start=31 + _POSITION._serialized_end=819 + _POSITION_LOCSOURCE._serialized_start=561 + _POSITION_LOCSOURCE._serialized_end=671 + _POSITION_ALTSOURCE._serialized_start=674 + _POSITION_ALTSOURCE._serialized_end=807 + _USER._serialized_start=822 + _USER._serialized_end=1037 + _ROUTEDISCOVERY._serialized_start=1039 + _ROUTEDISCOVERY._serialized_end=1070 + _ROUTING._serialized_start=1073 + _ROUTING._serialized_end=1398 + _ROUTING_ERROR._serialized_start=1207 + _ROUTING_ERROR._serialized_end=1387 + _DATA._serialized_start=1401 + _DATA._serialized_end=1562 + _MESHPACKET._serialized_start=1565 + _MESHPACKET._serialized_end=2023 + _MESHPACKET_PRIORITY._serialized_start=1846 + _MESHPACKET_PRIORITY._serialized_end=1937 + _MESHPACKET_DELAYED._serialized_start=1939 + _MESHPACKET_DELAYED._serialized_end=2005 + _NODEINFO._serialized_start=2025 + _NODEINFO._serialized_end=2131 + _MYNODEINFO._serialized_start=2134 + _MYNODEINFO._serialized_end=2596 + _LOGRECORD._serialized_start=2599 + _LOGRECORD._serialized_end=2780 + _LOGRECORD_LEVEL._serialized_start=2692 + _LOGRECORD_LEVEL._serialized_end=2780 + _FROMRADIO._serialized_start=2783 + _FROMRADIO._serialized_end=3016 + _TORADIO._serialized_start=3019 + _TORADIO._serialized_end=3244 + _TORADIO_PEERINFO._serialized_start=3149 + _TORADIO_PEERINFO._serialized_end=3202 # @@protoc_insertion_point(module_scope) diff --git a/meshtastic/mqtt_pb2.py b/meshtastic/mqtt_pb2.py index d7701695e..6bfd9d2e8 100644 --- a/meshtastic/mqtt_pb2.py +++ b/meshtastic/mqtt_pb2.py @@ -1,8 +1,9 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: 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 @@ -14,66 +15,11 @@ from . import mesh_pb2 as 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\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') -_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' @@ -81,6 +27,10 @@ }) _sym_db.RegisterMessage(ServiceEnvelope) +if _descriptor._USE_C_DESCRIPTORS == False: -DESCRIPTOR._options = None + DESCRIPTOR._options = None + DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\nMQTTProtosH\003Z!github.com/meshtastic/gomeshproto' + _SERVICEENVELOPE._serialized_start=26 + _SERVICEENVELOPE._serialized_end=112 # @@protoc_insertion_point(module_scope) diff --git a/meshtastic/portnums_pb2.py b/meshtastic/portnums_pb2.py index 7c33c8ba4..5d181e5d2 100644 --- a/meshtastic/portnums_pb2.py +++ b/meshtastic/portnums_pb2.py @@ -1,9 +1,10 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: 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 @@ -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\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.enum_types_by_name['PortNum'] PortNum = enum_type_wrapper.EnumTypeWrapper(_PORTNUM) UNKNOWN_APP = 0 TEXT_MESSAGE_APP = 1 @@ -124,9 +38,10 @@ 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\010PortnumsH\003Z!github.com/meshtastic/gomeshproto' + _PORTNUM._serialized_start=19 + _PORTNUM._serialized_end=350 # @@protoc_insertion_point(module_scope) diff --git a/meshtastic/radioconfig_pb2.py b/meshtastic/radioconfig_pb2.py index cf5d929b5..49e1ad378 100644 --- a/meshtastic/radioconfig_pb2.py +++ b/meshtastic/radioconfig_pb2.py @@ -1,9 +1,10 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: radioconfig.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,354 +15,21 @@ -DESCRIPTOR = _descriptor.FileDescriptor( - name='radioconfig.proto', - package='', - syntax='proto3', - serialized_options=b'\n\023com.geeksville.meshB\021RadioConfigProtosH\003Z!github.com/meshtastic/gomeshproto', - serialized_pb=b'\n\x11radioconfig.proto\"\xd5\x18\n\x0bRadioConfig\x12\x31\n\x0bpreferences\x18\x01 \x01(\x0b\x32\x1c.RadioConfig.UserPreferences\x1a\x92\x18\n\x0fUserPreferences\x12\x1f\n\x17position_broadcast_secs\x18\x01 \x01(\r\x12 \n\x18position_broadcast_smart\x18\x11 \x01(\x08\x12\x1b\n\x13send_owner_interval\x18\x02 \x01(\r\x12\x1b\n\x13wait_bluetooth_secs\x18\x04 \x01(\r\x12\x16\n\x0escreen_on_secs\x18\x05 \x01(\r\x12\x1a\n\x12phone_timeout_secs\x18\x06 \x01(\r\x12\x1d\n\x15phone_sds_timeout_sec\x18\x07 \x01(\r\x12\x1d\n\x15mesh_sds_timeout_secs\x18\x08 \x01(\r\x12\x10\n\x08sds_secs\x18\t \x01(\r\x12\x0f\n\x07ls_secs\x18\n \x01(\r\x12\x15\n\rmin_wake_secs\x18\x0b \x01(\r\x12\x11\n\twifi_ssid\x18\x0c \x01(\t\x12\x15\n\rwifi_password\x18\r \x01(\t\x12\x14\n\x0cwifi_ap_mode\x18\x0e \x01(\x08\x12\x1b\n\x06region\x18\x0f \x01(\x0e\x32\x0b.RegionCode\x12&\n\x0e\x63harge_current\x18\x10 \x01(\x0e\x32\x0e.ChargeCurrent\x12\x11\n\tis_router\x18% \x01(\x08\x12\x14\n\x0cis_low_power\x18& \x01(\x08\x12\x16\n\x0e\x66ixed_position\x18\' \x01(\x08\x12\x17\n\x0fserial_disabled\x18( \x01(\x08\x12(\n\x0elocation_share\x18 \x01(\x0e\x32\x10.LocationSharing\x12$\n\rgps_operation\x18! \x01(\x0e\x32\r.GpsOperation\x12\x1b\n\x13gps_update_interval\x18\" \x01(\r\x12\x18\n\x10gps_attempt_time\x18$ \x01(\r\x12\x15\n\rgps_accept_2d\x18- \x01(\x08\x12\x13\n\x0bgps_max_dop\x18. \x01(\r\x12\x18\n\x10\x66requency_offset\x18) \x01(\x02\x12\x13\n\x0bmqtt_server\x18* \x01(\t\x12\x15\n\rmqtt_disabled\x18+ \x01(\x08\x12(\n\ngps_format\x18, \x01(\x0e\x32\x14.GpsCoordinateFormat\x12\x15\n\rfactory_reset\x18\x64 \x01(\x08\x12\x19\n\x11\x64\x65\x62ug_log_enabled\x18\x65 \x01(\x08\x12\x17\n\x0fignore_incoming\x18g \x03(\r\x12\x1c\n\x14serialplugin_enabled\x18x \x01(\x08\x12\x19\n\x11serialplugin_echo\x18y \x01(\x08\x12\x18\n\x10serialplugin_rxd\x18z \x01(\r\x12\x18\n\x10serialplugin_txd\x18{ \x01(\r\x12\x1c\n\x14serialplugin_timeout\x18| \x01(\r\x12\x19\n\x11serialplugin_mode\x18} \x01(\r\x12\'\n\x1f\x65xt_notification_plugin_enabled\x18~ \x01(\x08\x12)\n!ext_notification_plugin_output_ms\x18\x7f \x01(\r\x12\'\n\x1e\x65xt_notification_plugin_output\x18\x80\x01 \x01(\r\x12\'\n\x1e\x65xt_notification_plugin_active\x18\x81\x01 \x01(\x08\x12.\n%ext_notification_plugin_alert_message\x18\x82\x01 \x01(\x08\x12+\n\"ext_notification_plugin_alert_bell\x18\x83\x01 \x01(\x08\x12\"\n\x19range_test_plugin_enabled\x18\x84\x01 \x01(\x08\x12!\n\x18range_test_plugin_sender\x18\x85\x01 \x01(\r\x12\x1f\n\x16range_test_plugin_save\x18\x86\x01 \x01(\x08\x12%\n\x1cstore_forward_plugin_enabled\x18\x94\x01 \x01(\x08\x12\'\n\x1estore_forward_plugin_heartbeat\x18\x95\x01 \x01(\x08\x12%\n\x1cstore_forward_plugin_records\x18\x89\x01 \x01(\r\x12\x30\n\'store_forward_plugin_history_return_max\x18\x8a\x01 \x01(\r\x12\x33\n*store_forward_plugin_history_return_window\x18\x8b\x01 \x01(\r\x12=\n4environmental_measurement_plugin_measurement_enabled\x18\x8c\x01 \x01(\x08\x12\x38\n/environmental_measurement_plugin_screen_enabled\x18\x8d\x01 \x01(\x08\x12\x44\n;environmental_measurement_plugin_read_error_count_threshold\x18\x8e\x01 \x01(\r\x12\x39\n0environmental_measurement_plugin_update_interval\x18\x8f\x01 \x01(\r\x12;\n2environmental_measurement_plugin_recovery_interval\x18\x90\x01 \x01(\r\x12;\n2environmental_measurement_plugin_display_farenheit\x18\x91\x01 \x01(\x08\x12v\n,environmental_measurement_plugin_sensor_type\x18\x92\x01 \x01(\x0e\x32?.RadioConfig.UserPreferences.EnvironmentalMeasurementSensorType\x12\x34\n+environmental_measurement_plugin_sensor_pin\x18\x93\x01 \x01(\r\x12\x17\n\x0eposition_flags\x18\x96\x01 \x01(\r\x12\x1a\n\x11is_always_powered\x18\x97\x01 \x01(\x08\x12\"\n\x19\x61uto_screen_carousel_secs\x18\x98\x01 \x01(\r\x12\'\n\x1eon_battery_shutdown_after_secs\x18\x99\x01 \x01(\r\x12\x12\n\thop_limit\x18\x9a\x01 \x01(\r\x12\x16\n\rmqtt_username\x18\x9b\x01 \x01(\t\x12\x16\n\rmqtt_password\x18\x9c\x01 \x01(\t\x12\x1c\n\x13is_lora_tx_disabled\x18\x9d\x01 \x01(\x08\x12\x18\n\x0fis_power_saving\x18\x9e\x01 \x01(\x08\x12\x18\n\x0frotary1_enabled\x18\xa0\x01 \x01(\x08\x12\x16\n\rrotary1_pin_a\x18\xa1\x01 \x01(\r\x12\x16\n\rrotary1_pin_b\x18\xa2\x01 \x01(\r\x12\x1a\n\x11rotary1_pin_press\x18\xa3\x01 \x01(\r\x12*\n\x10rotary1_event_cw\x18\xa4\x01 \x01(\x0e\x32\x0f.InputEventChar\x12+\n\x11rotary1_event_ccw\x18\xa5\x01 \x01(\x0e\x32\x0f.InputEventChar\x12-\n\x13rotary1_event_press\x18\xa6\x01 \x01(\x0e\x32\x0f.InputEventChar\x12&\n\x1d\x63\x61nned_message_plugin_enabled\x18\xaa\x01 \x01(\x08\x12\x31\n(canned_message_plugin_allow_input_source\x18\xab\x01 \x01(\t\x12+\n\x1e\x63\x61nned_message_plugin_messages\x18\xac\x01 \x01(\tB\x02\x18\x01\x12(\n\x1f\x63\x61nned_message_plugin_send_bell\x18\xad\x01 \x01(\x08\x12 \n\x17mqtt_encryption_enabled\x18\xae\x01 \x01(\x08\x12 \n\x17\x61\x64\x63_multiplier_override\x18\xaf\x01 \x01(\x02\"\x8d\x01\n\"EnvironmentalMeasurementSensorType\x12\t\n\x05\x44HT11\x10\x00\x12\x0b\n\x07\x44S18B20\x10\x01\x12\t\n\x05\x44HT12\x10\x02\x12\t\n\x05\x44HT21\x10\x03\x12\t\n\x05\x44HT22\x10\x04\x12\n\n\x06\x42ME280\x10\x05\x12\n\n\x06\x42ME680\x10\x06\x12\x0b\n\x07MCP9808\x10\x07\x12\t\n\x05SHTC3\x10\x08J\x06\x08\x88\x01\x10\x89\x01*f\n\nRegionCode\x12\t\n\x05Unset\x10\x00\x12\x06\n\x02US\x10\x01\x12\t\n\x05\x45U433\x10\x02\x12\t\n\x05\x45U865\x10\x03\x12\x06\n\x02\x43N\x10\x04\x12\x06\n\x02JP\x10\x05\x12\x07\n\x03\x41NZ\x10\x06\x12\x06\n\x02KR\x10\x07\x12\x06\n\x02TW\x10\x08\x12\x06\n\x02RU\x10\t*\xd1\x01\n\rChargeCurrent\x12\x0b\n\x07MAUnset\x10\x00\x12\t\n\x05MA100\x10\x01\x12\t\n\x05MA190\x10\x02\x12\t\n\x05MA280\x10\x03\x12\t\n\x05MA360\x10\x04\x12\t\n\x05MA450\x10\x05\x12\t\n\x05MA550\x10\x06\x12\t\n\x05MA630\x10\x07\x12\t\n\x05MA700\x10\x08\x12\t\n\x05MA780\x10\t\x12\t\n\x05MA880\x10\n\x12\t\n\x05MA960\x10\x0b\x12\n\n\x06MA1000\x10\x0c\x12\n\n\x06MA1080\x10\r\x12\n\n\x06MA1160\x10\x0e\x12\n\n\x06MA1240\x10\x0f\x12\n\n\x06MA1320\x10\x10*j\n\x0cGpsOperation\x12\x0e\n\nGpsOpUnset\x10\x00\x12\x13\n\x0fGpsOpStationary\x10\x01\x12\x0f\n\x0bGpsOpMobile\x10\x02\x12\x11\n\rGpsOpTimeOnly\x10\x03\x12\x11\n\rGpsOpDisabled\x10\x04*\x83\x01\n\x13GpsCoordinateFormat\x12\x10\n\x0cGpsFormatDec\x10\x00\x12\x10\n\x0cGpsFormatDMS\x10\x01\x12\x10\n\x0cGpsFormatUTM\x10\x02\x12\x11\n\rGpsFormatMGRS\x10\x03\x12\x10\n\x0cGpsFormatOLC\x10\x04\x12\x11\n\rGpsFormatOSGR\x10\x05*@\n\x0fLocationSharing\x12\x0c\n\x08LocUnset\x10\x00\x12\x0e\n\nLocEnabled\x10\x01\x12\x0f\n\x0bLocDisabled\x10\x02*\xbc\x01\n\rPositionFlags\x12\x11\n\rPOS_UNDEFINED\x10\x00\x12\x10\n\x0cPOS_ALTITUDE\x10\x01\x12\x0f\n\x0bPOS_ALT_MSL\x10\x02\x12\x0f\n\x0bPOS_GEO_SEP\x10\x04\x12\x0b\n\x07POS_DOP\x10\x08\x12\r\n\tPOS_HVDOP\x10\x10\x12\x0f\n\x0bPOS_BATTERY\x10 \x12\x11\n\rPOS_SATINVIEW\x10@\x12\x10\n\x0bPOS_SEQ_NOS\x10\x80\x01\x12\x12\n\rPOS_TIMESTAMP\x10\x80\x02*\x83\x01\n\x0eInputEventChar\x12\x0c\n\x08KEY_NONE\x10\x00\x12\n\n\x06KEY_UP\x10\x11\x12\x0c\n\x08KEY_DOWN\x10\x12\x12\x0c\n\x08KEY_LEFT\x10\x13\x12\r\n\tKEY_RIGHT\x10\x14\x12\x0e\n\nKEY_SELECT\x10\n\x12\x0c\n\x08KEY_BACK\x10\x1b\x12\x0e\n\nKEY_CANCEL\x10\x18\x42M\n\x13\x63om.geeksville.meshB\x11RadioConfigProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3' -) - -_REGIONCODE = _descriptor.EnumDescriptor( - name='RegionCode', - full_name='RegionCode', - filename=None, - file=DESCRIPTOR, - values=[ - _descriptor.EnumValueDescriptor( - name='Unset', index=0, number=0, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='US', index=1, number=1, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='EU433', index=2, number=2, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='EU865', index=3, number=3, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='CN', index=4, number=4, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='JP', index=5, number=5, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='ANZ', index=6, number=6, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='KR', index=7, number=7, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='TW', index=8, number=8, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='RU', index=9, number=9, - serialized_options=None, - type=None), - ], - containing_type=None, - serialized_options=None, - serialized_start=3181, - serialized_end=3283, -) -_sym_db.RegisterEnumDescriptor(_REGIONCODE) +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x11radioconfig.proto\"\xd5\x18\n\x0bRadioConfig\x12\x31\n\x0bpreferences\x18\x01 \x01(\x0b\x32\x1c.RadioConfig.UserPreferences\x1a\x92\x18\n\x0fUserPreferences\x12\x1f\n\x17position_broadcast_secs\x18\x01 \x01(\r\x12 \n\x18position_broadcast_smart\x18\x11 \x01(\x08\x12\x1b\n\x13send_owner_interval\x18\x02 \x01(\r\x12\x1b\n\x13wait_bluetooth_secs\x18\x04 \x01(\r\x12\x16\n\x0escreen_on_secs\x18\x05 \x01(\r\x12\x1a\n\x12phone_timeout_secs\x18\x06 \x01(\r\x12\x1d\n\x15phone_sds_timeout_sec\x18\x07 \x01(\r\x12\x1d\n\x15mesh_sds_timeout_secs\x18\x08 \x01(\r\x12\x10\n\x08sds_secs\x18\t \x01(\r\x12\x0f\n\x07ls_secs\x18\n \x01(\r\x12\x15\n\rmin_wake_secs\x18\x0b \x01(\r\x12\x11\n\twifi_ssid\x18\x0c \x01(\t\x12\x15\n\rwifi_password\x18\r \x01(\t\x12\x14\n\x0cwifi_ap_mode\x18\x0e \x01(\x08\x12\x1b\n\x06region\x18\x0f \x01(\x0e\x32\x0b.RegionCode\x12&\n\x0e\x63harge_current\x18\x10 \x01(\x0e\x32\x0e.ChargeCurrent\x12\x11\n\tis_router\x18% \x01(\x08\x12\x14\n\x0cis_low_power\x18& \x01(\x08\x12\x16\n\x0e\x66ixed_position\x18\' \x01(\x08\x12\x17\n\x0fserial_disabled\x18( \x01(\x08\x12(\n\x0elocation_share\x18 \x01(\x0e\x32\x10.LocationSharing\x12$\n\rgps_operation\x18! \x01(\x0e\x32\r.GpsOperation\x12\x1b\n\x13gps_update_interval\x18\" \x01(\r\x12\x18\n\x10gps_attempt_time\x18$ \x01(\r\x12\x15\n\rgps_accept_2d\x18- \x01(\x08\x12\x13\n\x0bgps_max_dop\x18. \x01(\r\x12\x18\n\x10\x66requency_offset\x18) \x01(\x02\x12\x13\n\x0bmqtt_server\x18* \x01(\t\x12\x15\n\rmqtt_disabled\x18+ \x01(\x08\x12(\n\ngps_format\x18, \x01(\x0e\x32\x14.GpsCoordinateFormat\x12\x15\n\rfactory_reset\x18\x64 \x01(\x08\x12\x19\n\x11\x64\x65\x62ug_log_enabled\x18\x65 \x01(\x08\x12\x17\n\x0fignore_incoming\x18g \x03(\r\x12\x1c\n\x14serialplugin_enabled\x18x \x01(\x08\x12\x19\n\x11serialplugin_echo\x18y \x01(\x08\x12\x18\n\x10serialplugin_rxd\x18z \x01(\r\x12\x18\n\x10serialplugin_txd\x18{ \x01(\r\x12\x1c\n\x14serialplugin_timeout\x18| \x01(\r\x12\x19\n\x11serialplugin_mode\x18} \x01(\r\x12\'\n\x1f\x65xt_notification_plugin_enabled\x18~ \x01(\x08\x12)\n!ext_notification_plugin_output_ms\x18\x7f \x01(\r\x12\'\n\x1e\x65xt_notification_plugin_output\x18\x80\x01 \x01(\r\x12\'\n\x1e\x65xt_notification_plugin_active\x18\x81\x01 \x01(\x08\x12.\n%ext_notification_plugin_alert_message\x18\x82\x01 \x01(\x08\x12+\n\"ext_notification_plugin_alert_bell\x18\x83\x01 \x01(\x08\x12\"\n\x19range_test_plugin_enabled\x18\x84\x01 \x01(\x08\x12!\n\x18range_test_plugin_sender\x18\x85\x01 \x01(\r\x12\x1f\n\x16range_test_plugin_save\x18\x86\x01 \x01(\x08\x12%\n\x1cstore_forward_plugin_enabled\x18\x94\x01 \x01(\x08\x12\'\n\x1estore_forward_plugin_heartbeat\x18\x95\x01 \x01(\x08\x12%\n\x1cstore_forward_plugin_records\x18\x89\x01 \x01(\r\x12\x30\n\'store_forward_plugin_history_return_max\x18\x8a\x01 \x01(\r\x12\x33\n*store_forward_plugin_history_return_window\x18\x8b\x01 \x01(\r\x12=\n4environmental_measurement_plugin_measurement_enabled\x18\x8c\x01 \x01(\x08\x12\x38\n/environmental_measurement_plugin_screen_enabled\x18\x8d\x01 \x01(\x08\x12\x44\n;environmental_measurement_plugin_read_error_count_threshold\x18\x8e\x01 \x01(\r\x12\x39\n0environmental_measurement_plugin_update_interval\x18\x8f\x01 \x01(\r\x12;\n2environmental_measurement_plugin_recovery_interval\x18\x90\x01 \x01(\r\x12;\n2environmental_measurement_plugin_display_farenheit\x18\x91\x01 \x01(\x08\x12v\n,environmental_measurement_plugin_sensor_type\x18\x92\x01 \x01(\x0e\x32?.RadioConfig.UserPreferences.EnvironmentalMeasurementSensorType\x12\x34\n+environmental_measurement_plugin_sensor_pin\x18\x93\x01 \x01(\r\x12\x17\n\x0eposition_flags\x18\x96\x01 \x01(\r\x12\x1a\n\x11is_always_powered\x18\x97\x01 \x01(\x08\x12\"\n\x19\x61uto_screen_carousel_secs\x18\x98\x01 \x01(\r\x12\'\n\x1eon_battery_shutdown_after_secs\x18\x99\x01 \x01(\r\x12\x12\n\thop_limit\x18\x9a\x01 \x01(\r\x12\x16\n\rmqtt_username\x18\x9b\x01 \x01(\t\x12\x16\n\rmqtt_password\x18\x9c\x01 \x01(\t\x12\x1c\n\x13is_lora_tx_disabled\x18\x9d\x01 \x01(\x08\x12\x18\n\x0fis_power_saving\x18\x9e\x01 \x01(\x08\x12\x18\n\x0frotary1_enabled\x18\xa0\x01 \x01(\x08\x12\x16\n\rrotary1_pin_a\x18\xa1\x01 \x01(\r\x12\x16\n\rrotary1_pin_b\x18\xa2\x01 \x01(\r\x12\x1a\n\x11rotary1_pin_press\x18\xa3\x01 \x01(\r\x12*\n\x10rotary1_event_cw\x18\xa4\x01 \x01(\x0e\x32\x0f.InputEventChar\x12+\n\x11rotary1_event_ccw\x18\xa5\x01 \x01(\x0e\x32\x0f.InputEventChar\x12-\n\x13rotary1_event_press\x18\xa6\x01 \x01(\x0e\x32\x0f.InputEventChar\x12&\n\x1d\x63\x61nned_message_plugin_enabled\x18\xaa\x01 \x01(\x08\x12\x31\n(canned_message_plugin_allow_input_source\x18\xab\x01 \x01(\t\x12+\n\x1e\x63\x61nned_message_plugin_messages\x18\xac\x01 \x01(\tB\x02\x18\x01\x12(\n\x1f\x63\x61nned_message_plugin_send_bell\x18\xad\x01 \x01(\x08\x12 \n\x17mqtt_encryption_enabled\x18\xae\x01 \x01(\x08\x12 \n\x17\x61\x64\x63_multiplier_override\x18\xaf\x01 \x01(\x02\"\x8d\x01\n\"EnvironmentalMeasurementSensorType\x12\t\n\x05\x44HT11\x10\x00\x12\x0b\n\x07\x44S18B20\x10\x01\x12\t\n\x05\x44HT12\x10\x02\x12\t\n\x05\x44HT21\x10\x03\x12\t\n\x05\x44HT22\x10\x04\x12\n\n\x06\x42ME280\x10\x05\x12\n\n\x06\x42ME680\x10\x06\x12\x0b\n\x07MCP9808\x10\x07\x12\t\n\x05SHTC3\x10\x08J\x06\x08\x88\x01\x10\x89\x01*f\n\nRegionCode\x12\t\n\x05Unset\x10\x00\x12\x06\n\x02US\x10\x01\x12\t\n\x05\x45U433\x10\x02\x12\t\n\x05\x45U865\x10\x03\x12\x06\n\x02\x43N\x10\x04\x12\x06\n\x02JP\x10\x05\x12\x07\n\x03\x41NZ\x10\x06\x12\x06\n\x02KR\x10\x07\x12\x06\n\x02TW\x10\x08\x12\x06\n\x02RU\x10\t*\xd1\x01\n\rChargeCurrent\x12\x0b\n\x07MAUnset\x10\x00\x12\t\n\x05MA100\x10\x01\x12\t\n\x05MA190\x10\x02\x12\t\n\x05MA280\x10\x03\x12\t\n\x05MA360\x10\x04\x12\t\n\x05MA450\x10\x05\x12\t\n\x05MA550\x10\x06\x12\t\n\x05MA630\x10\x07\x12\t\n\x05MA700\x10\x08\x12\t\n\x05MA780\x10\t\x12\t\n\x05MA880\x10\n\x12\t\n\x05MA960\x10\x0b\x12\n\n\x06MA1000\x10\x0c\x12\n\n\x06MA1080\x10\r\x12\n\n\x06MA1160\x10\x0e\x12\n\n\x06MA1240\x10\x0f\x12\n\n\x06MA1320\x10\x10*j\n\x0cGpsOperation\x12\x0e\n\nGpsOpUnset\x10\x00\x12\x13\n\x0fGpsOpStationary\x10\x01\x12\x0f\n\x0bGpsOpMobile\x10\x02\x12\x11\n\rGpsOpTimeOnly\x10\x03\x12\x11\n\rGpsOpDisabled\x10\x04*\x83\x01\n\x13GpsCoordinateFormat\x12\x10\n\x0cGpsFormatDec\x10\x00\x12\x10\n\x0cGpsFormatDMS\x10\x01\x12\x10\n\x0cGpsFormatUTM\x10\x02\x12\x11\n\rGpsFormatMGRS\x10\x03\x12\x10\n\x0cGpsFormatOLC\x10\x04\x12\x11\n\rGpsFormatOSGR\x10\x05*@\n\x0fLocationSharing\x12\x0c\n\x08LocUnset\x10\x00\x12\x0e\n\nLocEnabled\x10\x01\x12\x0f\n\x0bLocDisabled\x10\x02*\xbc\x01\n\rPositionFlags\x12\x11\n\rPOS_UNDEFINED\x10\x00\x12\x10\n\x0cPOS_ALTITUDE\x10\x01\x12\x0f\n\x0bPOS_ALT_MSL\x10\x02\x12\x0f\n\x0bPOS_GEO_SEP\x10\x04\x12\x0b\n\x07POS_DOP\x10\x08\x12\r\n\tPOS_HVDOP\x10\x10\x12\x0f\n\x0bPOS_BATTERY\x10 \x12\x11\n\rPOS_SATINVIEW\x10@\x12\x10\n\x0bPOS_SEQ_NOS\x10\x80\x01\x12\x12\n\rPOS_TIMESTAMP\x10\x80\x02*\x83\x01\n\x0eInputEventChar\x12\x0c\n\x08KEY_NONE\x10\x00\x12\n\n\x06KEY_UP\x10\x11\x12\x0c\n\x08KEY_DOWN\x10\x12\x12\x0c\n\x08KEY_LEFT\x10\x13\x12\r\n\tKEY_RIGHT\x10\x14\x12\x0e\n\nKEY_SELECT\x10\n\x12\x0c\n\x08KEY_BACK\x10\x1b\x12\x0e\n\nKEY_CANCEL\x10\x18\x42M\n\x13\x63om.geeksville.meshB\x11RadioConfigProtosH\x03Z!github.com/meshtastic/gomeshprotob\x06proto3') +_REGIONCODE = DESCRIPTOR.enum_types_by_name['RegionCode'] RegionCode = enum_type_wrapper.EnumTypeWrapper(_REGIONCODE) -_CHARGECURRENT = _descriptor.EnumDescriptor( - name='ChargeCurrent', - full_name='ChargeCurrent', - filename=None, - file=DESCRIPTOR, - values=[ - _descriptor.EnumValueDescriptor( - name='MAUnset', index=0, number=0, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='MA100', index=1, number=1, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='MA190', index=2, number=2, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='MA280', index=3, number=3, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='MA360', index=4, number=4, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='MA450', index=5, number=5, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='MA550', index=6, number=6, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='MA630', index=7, number=7, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='MA700', index=8, number=8, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='MA780', index=9, number=9, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='MA880', index=10, number=10, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='MA960', index=11, number=11, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='MA1000', index=12, number=12, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='MA1080', index=13, number=13, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='MA1160', index=14, number=14, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='MA1240', index=15, number=15, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='MA1320', index=16, number=16, - serialized_options=None, - type=None), - ], - containing_type=None, - serialized_options=None, - serialized_start=3286, - serialized_end=3495, -) -_sym_db.RegisterEnumDescriptor(_CHARGECURRENT) - +_CHARGECURRENT = DESCRIPTOR.enum_types_by_name['ChargeCurrent'] ChargeCurrent = enum_type_wrapper.EnumTypeWrapper(_CHARGECURRENT) -_GPSOPERATION = _descriptor.EnumDescriptor( - name='GpsOperation', - full_name='GpsOperation', - filename=None, - file=DESCRIPTOR, - values=[ - _descriptor.EnumValueDescriptor( - name='GpsOpUnset', index=0, number=0, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='GpsOpStationary', index=1, number=1, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='GpsOpMobile', index=2, number=2, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='GpsOpTimeOnly', index=3, number=3, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='GpsOpDisabled', index=4, number=4, - serialized_options=None, - type=None), - ], - containing_type=None, - serialized_options=None, - serialized_start=3497, - serialized_end=3603, -) -_sym_db.RegisterEnumDescriptor(_GPSOPERATION) - +_GPSOPERATION = DESCRIPTOR.enum_types_by_name['GpsOperation'] GpsOperation = enum_type_wrapper.EnumTypeWrapper(_GPSOPERATION) -_GPSCOORDINATEFORMAT = _descriptor.EnumDescriptor( - name='GpsCoordinateFormat', - full_name='GpsCoordinateFormat', - filename=None, - file=DESCRIPTOR, - values=[ - _descriptor.EnumValueDescriptor( - name='GpsFormatDec', index=0, number=0, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='GpsFormatDMS', index=1, number=1, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='GpsFormatUTM', index=2, number=2, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='GpsFormatMGRS', index=3, number=3, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='GpsFormatOLC', index=4, number=4, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='GpsFormatOSGR', index=5, number=5, - serialized_options=None, - type=None), - ], - containing_type=None, - serialized_options=None, - serialized_start=3606, - serialized_end=3737, -) -_sym_db.RegisterEnumDescriptor(_GPSCOORDINATEFORMAT) - +_GPSCOORDINATEFORMAT = DESCRIPTOR.enum_types_by_name['GpsCoordinateFormat'] GpsCoordinateFormat = enum_type_wrapper.EnumTypeWrapper(_GPSCOORDINATEFORMAT) -_LOCATIONSHARING = _descriptor.EnumDescriptor( - name='LocationSharing', - full_name='LocationSharing', - filename=None, - file=DESCRIPTOR, - values=[ - _descriptor.EnumValueDescriptor( - name='LocUnset', index=0, number=0, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='LocEnabled', index=1, number=1, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='LocDisabled', index=2, number=2, - serialized_options=None, - type=None), - ], - containing_type=None, - serialized_options=None, - serialized_start=3739, - serialized_end=3803, -) -_sym_db.RegisterEnumDescriptor(_LOCATIONSHARING) - +_LOCATIONSHARING = DESCRIPTOR.enum_types_by_name['LocationSharing'] LocationSharing = enum_type_wrapper.EnumTypeWrapper(_LOCATIONSHARING) -_POSITIONFLAGS = _descriptor.EnumDescriptor( - name='PositionFlags', - full_name='PositionFlags', - filename=None, - file=DESCRIPTOR, - values=[ - _descriptor.EnumValueDescriptor( - name='POS_UNDEFINED', index=0, number=0, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='POS_ALTITUDE', index=1, number=1, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='POS_ALT_MSL', index=2, number=2, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='POS_GEO_SEP', index=3, number=4, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='POS_DOP', index=4, number=8, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='POS_HVDOP', index=5, number=16, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='POS_BATTERY', index=6, number=32, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='POS_SATINVIEW', index=7, number=64, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='POS_SEQ_NOS', index=8, number=128, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='POS_TIMESTAMP', index=9, number=256, - serialized_options=None, - type=None), - ], - containing_type=None, - serialized_options=None, - serialized_start=3806, - serialized_end=3994, -) -_sym_db.RegisterEnumDescriptor(_POSITIONFLAGS) - +_POSITIONFLAGS = DESCRIPTOR.enum_types_by_name['PositionFlags'] PositionFlags = enum_type_wrapper.EnumTypeWrapper(_POSITIONFLAGS) -_INPUTEVENTCHAR = _descriptor.EnumDescriptor( - name='InputEventChar', - full_name='InputEventChar', - filename=None, - file=DESCRIPTOR, - values=[ - _descriptor.EnumValueDescriptor( - name='KEY_NONE', index=0, number=0, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='KEY_UP', index=1, number=17, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='KEY_DOWN', index=2, number=18, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='KEY_LEFT', index=3, number=19, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='KEY_RIGHT', index=4, number=20, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='KEY_SELECT', index=5, number=10, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='KEY_BACK', index=6, number=27, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='KEY_CANCEL', index=7, number=24, - serialized_options=None, - type=None), - ], - containing_type=None, - serialized_options=None, - serialized_start=3997, - serialized_end=4128, -) -_sym_db.RegisterEnumDescriptor(_INPUTEVENTCHAR) - +_INPUTEVENTCHAR = DESCRIPTOR.enum_types_by_name['InputEventChar'] InputEventChar = enum_type_wrapper.EnumTypeWrapper(_INPUTEVENTCHAR) Unset = 0 US = 1 @@ -424,714 +92,9 @@ KEY_CANCEL = 24 -_RADIOCONFIG_USERPREFERENCES_ENVIRONMENTALMEASUREMENTSENSORTYPE = _descriptor.EnumDescriptor( - name='EnvironmentalMeasurementSensorType', - full_name='RadioConfig.UserPreferences.EnvironmentalMeasurementSensorType', - filename=None, - file=DESCRIPTOR, - values=[ - _descriptor.EnumValueDescriptor( - name='DHT11', index=0, number=0, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='DS18B20', index=1, number=1, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='DHT12', index=2, number=2, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='DHT21', index=3, number=3, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='DHT22', index=4, number=4, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='BME280', index=5, number=5, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='BME680', index=6, number=6, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='MCP9808', index=7, number=7, - serialized_options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='SHTC3', index=8, number=8, - serialized_options=None, - type=None), - ], - containing_type=None, - serialized_options=None, - serialized_start=3030, - serialized_end=3171, -) -_sym_db.RegisterEnumDescriptor(_RADIOCONFIG_USERPREFERENCES_ENVIRONMENTALMEASUREMENTSENSORTYPE) - - -_RADIOCONFIG_USERPREFERENCES = _descriptor.Descriptor( - name='UserPreferences', - full_name='RadioConfig.UserPreferences', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='position_broadcast_secs', full_name='RadioConfig.UserPreferences.position_broadcast_secs', 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='position_broadcast_smart', full_name='RadioConfig.UserPreferences.position_broadcast_smart', index=1, - 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), - _descriptor.FieldDescriptor( - name='send_owner_interval', full_name='RadioConfig.UserPreferences.send_owner_interval', index=2, - 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='wait_bluetooth_secs', full_name='RadioConfig.UserPreferences.wait_bluetooth_secs', 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='screen_on_secs', full_name='RadioConfig.UserPreferences.screen_on_secs', 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='phone_timeout_secs', full_name='RadioConfig.UserPreferences.phone_timeout_secs', 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='phone_sds_timeout_sec', full_name='RadioConfig.UserPreferences.phone_sds_timeout_sec', index=6, - 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='mesh_sds_timeout_secs', full_name='RadioConfig.UserPreferences.mesh_sds_timeout_secs', 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='sds_secs', full_name='RadioConfig.UserPreferences.sds_secs', 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), - _descriptor.FieldDescriptor( - name='ls_secs', full_name='RadioConfig.UserPreferences.ls_secs', index=9, - number=10, 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='min_wake_secs', full_name='RadioConfig.UserPreferences.min_wake_secs', index=10, - number=11, 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='wifi_ssid', full_name='RadioConfig.UserPreferences.wifi_ssid', index=11, - number=12, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='wifi_password', full_name='RadioConfig.UserPreferences.wifi_password', index=12, - number=13, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='wifi_ap_mode', full_name='RadioConfig.UserPreferences.wifi_ap_mode', index=13, - number=14, 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='region', full_name='RadioConfig.UserPreferences.region', index=14, - 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), - _descriptor.FieldDescriptor( - name='charge_current', full_name='RadioConfig.UserPreferences.charge_current', index=15, - number=16, 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='is_router', full_name='RadioConfig.UserPreferences.is_router', index=16, - number=37, 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='is_low_power', full_name='RadioConfig.UserPreferences.is_low_power', index=17, - number=38, type=8, cpp_type=7, label=1, - has_default_value=False, default_value=False, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='fixed_position', full_name='RadioConfig.UserPreferences.fixed_position', index=18, - number=39, 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='serial_disabled', full_name='RadioConfig.UserPreferences.serial_disabled', index=19, - number=40, type=8, cpp_type=7, label=1, - has_default_value=False, default_value=False, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='location_share', full_name='RadioConfig.UserPreferences.location_share', index=20, - number=32, 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='gps_operation', full_name='RadioConfig.UserPreferences.gps_operation', index=21, - number=33, 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='gps_update_interval', full_name='RadioConfig.UserPreferences.gps_update_interval', index=22, - number=34, 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='gps_attempt_time', full_name='RadioConfig.UserPreferences.gps_attempt_time', index=23, - number=36, 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='gps_accept_2d', full_name='RadioConfig.UserPreferences.gps_accept_2d', index=24, - number=45, 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='gps_max_dop', full_name='RadioConfig.UserPreferences.gps_max_dop', index=25, - number=46, 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='frequency_offset', full_name='RadioConfig.UserPreferences.frequency_offset', index=26, - number=41, 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='mqtt_server', full_name='RadioConfig.UserPreferences.mqtt_server', index=27, - number=42, 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='mqtt_disabled', full_name='RadioConfig.UserPreferences.mqtt_disabled', index=28, - number=43, 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='gps_format', full_name='RadioConfig.UserPreferences.gps_format', index=29, - number=44, 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='factory_reset', full_name='RadioConfig.UserPreferences.factory_reset', index=30, - number=100, 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='debug_log_enabled', full_name='RadioConfig.UserPreferences.debug_log_enabled', index=31, - number=101, 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='ignore_incoming', full_name='RadioConfig.UserPreferences.ignore_incoming', index=32, - number=103, type=13, cpp_type=3, 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='serialplugin_enabled', full_name='RadioConfig.UserPreferences.serialplugin_enabled', index=33, - number=120, 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='serialplugin_echo', full_name='RadioConfig.UserPreferences.serialplugin_echo', index=34, - number=121, 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='serialplugin_rxd', full_name='RadioConfig.UserPreferences.serialplugin_rxd', index=35, - number=122, 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='serialplugin_txd', full_name='RadioConfig.UserPreferences.serialplugin_txd', index=36, - number=123, 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='serialplugin_timeout', full_name='RadioConfig.UserPreferences.serialplugin_timeout', index=37, - number=124, 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='serialplugin_mode', full_name='RadioConfig.UserPreferences.serialplugin_mode', index=38, - number=125, 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='ext_notification_plugin_enabled', full_name='RadioConfig.UserPreferences.ext_notification_plugin_enabled', index=39, - number=126, 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='ext_notification_plugin_output_ms', full_name='RadioConfig.UserPreferences.ext_notification_plugin_output_ms', index=40, - number=127, 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='ext_notification_plugin_output', full_name='RadioConfig.UserPreferences.ext_notification_plugin_output', index=41, - number=128, 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='ext_notification_plugin_active', full_name='RadioConfig.UserPreferences.ext_notification_plugin_active', index=42, - number=129, 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='ext_notification_plugin_alert_message', full_name='RadioConfig.UserPreferences.ext_notification_plugin_alert_message', index=43, - number=130, 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='ext_notification_plugin_alert_bell', full_name='RadioConfig.UserPreferences.ext_notification_plugin_alert_bell', index=44, - number=131, 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='range_test_plugin_enabled', full_name='RadioConfig.UserPreferences.range_test_plugin_enabled', index=45, - number=132, 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='range_test_plugin_sender', full_name='RadioConfig.UserPreferences.range_test_plugin_sender', index=46, - number=133, 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='range_test_plugin_save', full_name='RadioConfig.UserPreferences.range_test_plugin_save', index=47, - number=134, 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='store_forward_plugin_enabled', full_name='RadioConfig.UserPreferences.store_forward_plugin_enabled', index=48, - number=148, 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='store_forward_plugin_heartbeat', full_name='RadioConfig.UserPreferences.store_forward_plugin_heartbeat', index=49, - number=149, 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='store_forward_plugin_records', full_name='RadioConfig.UserPreferences.store_forward_plugin_records', index=50, - number=137, 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='store_forward_plugin_history_return_max', full_name='RadioConfig.UserPreferences.store_forward_plugin_history_return_max', index=51, - number=138, 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='store_forward_plugin_history_return_window', full_name='RadioConfig.UserPreferences.store_forward_plugin_history_return_window', index=52, - number=139, 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='environmental_measurement_plugin_measurement_enabled', full_name='RadioConfig.UserPreferences.environmental_measurement_plugin_measurement_enabled', index=53, - number=140, 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='environmental_measurement_plugin_screen_enabled', full_name='RadioConfig.UserPreferences.environmental_measurement_plugin_screen_enabled', index=54, - number=141, 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='environmental_measurement_plugin_read_error_count_threshold', full_name='RadioConfig.UserPreferences.environmental_measurement_plugin_read_error_count_threshold', index=55, - number=142, 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='environmental_measurement_plugin_update_interval', full_name='RadioConfig.UserPreferences.environmental_measurement_plugin_update_interval', index=56, - number=143, 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='environmental_measurement_plugin_recovery_interval', full_name='RadioConfig.UserPreferences.environmental_measurement_plugin_recovery_interval', index=57, - number=144, 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='environmental_measurement_plugin_display_farenheit', full_name='RadioConfig.UserPreferences.environmental_measurement_plugin_display_farenheit', index=58, - number=145, 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='environmental_measurement_plugin_sensor_type', full_name='RadioConfig.UserPreferences.environmental_measurement_plugin_sensor_type', index=59, - number=146, 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='environmental_measurement_plugin_sensor_pin', full_name='RadioConfig.UserPreferences.environmental_measurement_plugin_sensor_pin', index=60, - number=147, 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='position_flags', full_name='RadioConfig.UserPreferences.position_flags', index=61, - number=150, 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='is_always_powered', full_name='RadioConfig.UserPreferences.is_always_powered', index=62, - number=151, 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='auto_screen_carousel_secs', full_name='RadioConfig.UserPreferences.auto_screen_carousel_secs', index=63, - number=152, 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='on_battery_shutdown_after_secs', full_name='RadioConfig.UserPreferences.on_battery_shutdown_after_secs', index=64, - number=153, 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='hop_limit', full_name='RadioConfig.UserPreferences.hop_limit', index=65, - number=154, 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='mqtt_username', full_name='RadioConfig.UserPreferences.mqtt_username', index=66, - number=155, 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='mqtt_password', full_name='RadioConfig.UserPreferences.mqtt_password', index=67, - number=156, 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='is_lora_tx_disabled', full_name='RadioConfig.UserPreferences.is_lora_tx_disabled', index=68, - number=157, 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='is_power_saving', full_name='RadioConfig.UserPreferences.is_power_saving', index=69, - number=158, 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='rotary1_enabled', full_name='RadioConfig.UserPreferences.rotary1_enabled', index=70, - number=160, 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='rotary1_pin_a', full_name='RadioConfig.UserPreferences.rotary1_pin_a', index=71, - number=161, 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='rotary1_pin_b', full_name='RadioConfig.UserPreferences.rotary1_pin_b', index=72, - number=162, 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='rotary1_pin_press', full_name='RadioConfig.UserPreferences.rotary1_pin_press', index=73, - number=163, 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='rotary1_event_cw', full_name='RadioConfig.UserPreferences.rotary1_event_cw', index=74, - number=164, 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='rotary1_event_ccw', full_name='RadioConfig.UserPreferences.rotary1_event_ccw', index=75, - number=165, 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='rotary1_event_press', full_name='RadioConfig.UserPreferences.rotary1_event_press', index=76, - number=166, 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='canned_message_plugin_enabled', full_name='RadioConfig.UserPreferences.canned_message_plugin_enabled', index=77, - number=170, 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='canned_message_plugin_allow_input_source', full_name='RadioConfig.UserPreferences.canned_message_plugin_allow_input_source', index=78, - number=171, 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='canned_message_plugin_messages', full_name='RadioConfig.UserPreferences.canned_message_plugin_messages', index=79, - number=172, 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=b'\030\001', file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='canned_message_plugin_send_bell', full_name='RadioConfig.UserPreferences.canned_message_plugin_send_bell', index=80, - number=173, 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='mqtt_encryption_enabled', full_name='RadioConfig.UserPreferences.mqtt_encryption_enabled', index=81, - number=174, 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='adc_multiplier_override', full_name='RadioConfig.UserPreferences.adc_multiplier_override', index=82, - number=175, 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=[ - _RADIOCONFIG_USERPREFERENCES_ENVIRONMENTALMEASUREMENTSENSORTYPE, - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=89, - serialized_end=3179, -) - -_RADIOCONFIG = _descriptor.Descriptor( - name='RadioConfig', - full_name='RadioConfig', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='preferences', full_name='RadioConfig.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=[_RADIOCONFIG_USERPREFERENCES, ], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=22, - serialized_end=3179, -) - -_RADIOCONFIG_USERPREFERENCES.fields_by_name['region'].enum_type = _REGIONCODE -_RADIOCONFIG_USERPREFERENCES.fields_by_name['charge_current'].enum_type = _CHARGECURRENT -_RADIOCONFIG_USERPREFERENCES.fields_by_name['location_share'].enum_type = _LOCATIONSHARING -_RADIOCONFIG_USERPREFERENCES.fields_by_name['gps_operation'].enum_type = _GPSOPERATION -_RADIOCONFIG_USERPREFERENCES.fields_by_name['gps_format'].enum_type = _GPSCOORDINATEFORMAT -_RADIOCONFIG_USERPREFERENCES.fields_by_name['environmental_measurement_plugin_sensor_type'].enum_type = _RADIOCONFIG_USERPREFERENCES_ENVIRONMENTALMEASUREMENTSENSORTYPE -_RADIOCONFIG_USERPREFERENCES.fields_by_name['rotary1_event_cw'].enum_type = _INPUTEVENTCHAR -_RADIOCONFIG_USERPREFERENCES.fields_by_name['rotary1_event_ccw'].enum_type = _INPUTEVENTCHAR -_RADIOCONFIG_USERPREFERENCES.fields_by_name['rotary1_event_press'].enum_type = _INPUTEVENTCHAR -_RADIOCONFIG_USERPREFERENCES.containing_type = _RADIOCONFIG -_RADIOCONFIG_USERPREFERENCES_ENVIRONMENTALMEASUREMENTSENSORTYPE.containing_type = _RADIOCONFIG_USERPREFERENCES -_RADIOCONFIG.fields_by_name['preferences'].message_type = _RADIOCONFIG_USERPREFERENCES -DESCRIPTOR.message_types_by_name['RadioConfig'] = _RADIOCONFIG -DESCRIPTOR.enum_types_by_name['RegionCode'] = _REGIONCODE -DESCRIPTOR.enum_types_by_name['ChargeCurrent'] = _CHARGECURRENT -DESCRIPTOR.enum_types_by_name['GpsOperation'] = _GPSOPERATION -DESCRIPTOR.enum_types_by_name['GpsCoordinateFormat'] = _GPSCOORDINATEFORMAT -DESCRIPTOR.enum_types_by_name['LocationSharing'] = _LOCATIONSHARING -DESCRIPTOR.enum_types_by_name['PositionFlags'] = _POSITIONFLAGS -DESCRIPTOR.enum_types_by_name['InputEventChar'] = _INPUTEVENTCHAR -_sym_db.RegisterFileDescriptor(DESCRIPTOR) - +_RADIOCONFIG = DESCRIPTOR.message_types_by_name['RadioConfig'] +_RADIOCONFIG_USERPREFERENCES = _RADIOCONFIG.nested_types_by_name['UserPreferences'] +_RADIOCONFIG_USERPREFERENCES_ENVIRONMENTALMEASUREMENTSENSORTYPE = _RADIOCONFIG_USERPREFERENCES.enum_types_by_name['EnvironmentalMeasurementSensorType'] RadioConfig = _reflection.GeneratedProtocolMessageType('RadioConfig', (_message.Message,), { 'UserPreferences' : _reflection.GeneratedProtocolMessageType('UserPreferences', (_message.Message,), { @@ -1147,7 +110,30 @@ _sym_db.RegisterMessage(RadioConfig) _sym_db.RegisterMessage(RadioConfig.UserPreferences) - -DESCRIPTOR._options = None -_RADIOCONFIG_USERPREFERENCES.fields_by_name['canned_message_plugin_messages']._options = None +if _descriptor._USE_C_DESCRIPTORS == False: + + DESCRIPTOR._options = None + DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\021RadioConfigProtosH\003Z!github.com/meshtastic/gomeshproto' + _RADIOCONFIG_USERPREFERENCES.fields_by_name['canned_message_plugin_messages']._options = None + _RADIOCONFIG_USERPREFERENCES.fields_by_name['canned_message_plugin_messages']._serialized_options = b'\030\001' + _REGIONCODE._serialized_start=3181 + _REGIONCODE._serialized_end=3283 + _CHARGECURRENT._serialized_start=3286 + _CHARGECURRENT._serialized_end=3495 + _GPSOPERATION._serialized_start=3497 + _GPSOPERATION._serialized_end=3603 + _GPSCOORDINATEFORMAT._serialized_start=3606 + _GPSCOORDINATEFORMAT._serialized_end=3737 + _LOCATIONSHARING._serialized_start=3739 + _LOCATIONSHARING._serialized_end=3803 + _POSITIONFLAGS._serialized_start=3806 + _POSITIONFLAGS._serialized_end=3994 + _INPUTEVENTCHAR._serialized_start=3997 + _INPUTEVENTCHAR._serialized_end=4128 + _RADIOCONFIG._serialized_start=22 + _RADIOCONFIG._serialized_end=3179 + _RADIOCONFIG_USERPREFERENCES._serialized_start=89 + _RADIOCONFIG_USERPREFERENCES._serialized_end=3179 + _RADIOCONFIG_USERPREFERENCES_ENVIRONMENTALMEASUREMENTSENSORTYPE._serialized_start=3030 + _RADIOCONFIG_USERPREFERENCES_ENVIRONMENTALMEASUREMENTSENSORTYPE._serialized_end=3171 # @@protoc_insertion_point(module_scope) diff --git a/meshtastic/remote_hardware_pb2.py b/meshtastic/remote_hardware_pb2.py index 17c41b47f..b46695b32 100644 --- a/meshtastic/remote_hardware_pb2.py +++ b/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 - +"""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,105 +14,12 @@ -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' -) - - - -_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) - +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(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') -_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' @@ -119,6 +27,12 @@ }) _sym_db.RegisterMessage(HardwareMessage) +if _descriptor._USE_C_DESCRIPTORS == False: -DESCRIPTOR._options = None + DESCRIPTOR._options = None + DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\016RemoteHardwareH\003Z!github.com/meshtastic/gomeshproto' + _HARDWAREMESSAGE._serialized_start=26 + _HARDWAREMESSAGE._serialized_end=228 + _HARDWAREMESSAGE_TYPE._serialized_start=120 + _HARDWAREMESSAGE_TYPE._serialized_end=228 # @@protoc_insertion_point(module_scope) diff --git a/meshtastic/storeforward_pb2.py b/meshtastic/storeforward_pb2.py index 5f781c0b2..a79461b29 100644 --- a/meshtastic/storeforward_pb2.py +++ b/meshtastic/storeforward_pb2.py @@ -1,8 +1,9 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: 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,313 +14,15 @@ -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' -) - - - -_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) - +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(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') -_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,), { @@ -351,6 +54,18 @@ _sym_db.RegisterMessage(StoreAndForward.History) _sym_db.RegisterMessage(StoreAndForward.Heartbeat) - -DESCRIPTOR._options = None +if _descriptor._USE_C_DESCRIPTORS == False: + + DESCRIPTOR._options = None + DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\025StoreAndForwardProtosH\003Z!github.com/meshtastic/gomeshproto' + _STOREANDFORWARD._serialized_start=23 + _STOREANDFORWARD._serialized_end=801 + _STOREANDFORWARD_STATISTICS._serialized_start=223 + _STOREANDFORWARD_STATISTICS._serialized_end=428 + _STOREANDFORWARD_HISTORY._serialized_start=430 + _STOREANDFORWARD_HISTORY._serialized_end=503 + _STOREANDFORWARD_HEARTBEAT._serialized_start=505 + _STOREANDFORWARD_HEARTBEAT._serialized_end=551 + _STOREANDFORWARD_REQUESTRESPONSE._serialized_start=554 + _STOREANDFORWARD_REQUESTRESPONSE._serialized_end=801 # @@protoc_insertion_point(module_scope) diff --git a/proto b/proto index 7c49bdad9..c851209e0 160000 --- a/proto +++ b/proto @@ -1 +1 @@ -Subproject commit 7c49bdad99f53332d17796188fc89fd5c29e0ce3 +Subproject commit c851209e0b504a73ea3d77366c904ad127ebdaee From f5af818cb9b989fbaff4752cd23d4df73588ba2c Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 27 Apr 2022 19:05:37 +0000 Subject: [PATCH 19/19] bump version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 03e59a4bb..1fd0de735 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ # This call to setup() does all the work setup( name="meshtastic", - version="1.2.94", + version="1.2.95", description="Python API & client shell for talking to Meshtastic devices", long_description=long_description, long_description_content_type="text/markdown",