Merge remote-tracking branch 'root/master' into pr-powermon

# Conflicts:
#	meshtastic/ble_interface.py
#	meshtastic/protobuf/mesh_pb2.py
#	meshtastic/protobuf/powermon_pb2.py
#	meshtastic/protobuf/powermon_pb2.pyi

Author: geeksville

meshtastic/__main__.py

@@ -1146,20 +1146,24 @@ def addConnectionArgs(parser: argparse.ArgumentParser) -> argparse.ArgumentParse
     outer = parser.add_argument_group('Connection', 'Optional arguments that specify how to connect to a Meshtastic device.')
     group = outer.add_mutually_exclusive_group()
     group.add_argument(
-        "--port",
-        help="The port of the device to connect to using serial, e.g. /dev/ttyUSB0.",
+        "--port", "--serial", "-s",
+        help="The port of the device to connect to using serial, e.g. /dev/ttyUSB0. (defaults to trying to detect a port)",
+        nargs="?",
+        const=None,
         default=None,
     )
 
     group.add_argument(
-        "--host",
-        help="The hostname or IP address of the device to connect to using TCP",
+        "--host", "--tcp", "-t",
+        help="Connect to a device using TCP, optionally passing hostname or IP address to use. (defaults to '%(const)s')",
+        nargs="?",
         default=None,
+        const="localhost"
     )
 
     group.add_argument(
-        "--ble",
-        help="Connect to a BLE device, optionally specifying a device name (defaults to 'any')",
+        "--ble", "-b",
+        help="Connect to a BLE device, optionally specifying a device name (defaults to '%(const)s')",
         nargs="?",
         default=None,
         const="any"
@@ -1483,16 +1487,6 @@ def initParser():
         "--reply", help="Reply to received messages", action="store_true"
     )
 
-    group.add_argument(
-        "--gpio-wrb", nargs=2, help="Set a particular GPIO # to 1 or 0", action="append"
-    )
-
-    group.add_argument("--gpio-rd", help="Read from a GPIO mask (ex: '0x10')")
-
-    group.add_argument(
-        "--gpio-watch", help="Start watching a GPIO mask for changes (ex: '0x10')"
-    )
-
     group.add_argument(
         "--no-time",
         help="Suppress sending the current time to the mesh",
@@ -1531,7 +1525,7 @@ def initParser():
         "--pos-fields",
         help="Specify fields to send when sending a position. Use no argument for a list of valid values. "
         "Can pass multiple values as a space separated list like "
-        "this: '--pos-fields POS_ALTITUDE POS_ALT_MSL'",
+        "this: '--pos-fields ALTITUDE HEADING SPEED'",
         nargs="*",
         action="store",
     )
@@ -1621,6 +1615,21 @@ def initParser():
         action="store_true",
     )
 
+    remoteHardwareArgs = parser.add_argument_group('Remote Hardware', 'Arguments related to the Remote Hardware module')
+
+    remoteHardwareArgs.add_argument(
+        "--gpio-wrb", nargs=2, help="Set a particular GPIO # to 1 or 0", action="append"
+    )
+
+    remoteHardwareArgs.add_argument(
+        "--gpio-rd", help="Read from a GPIO mask (ex: '0x10')"
+    )
+
+    remoteHardwareArgs.add_argument(
+        "--gpio-watch", help="Start watching a GPIO mask for changes (ex: '0x10')"
+    )
+
+
     have_tunnel = platform.system() == "Linux"
     if have_tunnel:
         tunnelArgs = parser.add_argument_group('Tunnel', 'Arguments related to establishing a tunnel device over the mesh.')

meshtastic/ble_interface.py

@@ -11,13 +11,19 @@
 from bleak import BleakClient, BleakScanner, BLEDevice
 from bleak.exc import BleakDBusError, BleakError
 
+import google.protobuf
+
 from meshtastic.mesh_interface import MeshInterface
 
+from .protobuf import (
+    mesh_pb2,
+)
 SERVICE_UUID = "6ba1b218-15a8-461f-9fa8-5dcae273eafd"
 TORADIO_UUID = "f75c76d2-129e-4dad-a1dd-7866124401e7"
 FROMRADIO_UUID = "2c55e69e-4993-11ed-b878-0242ac120002"
 FROMNUM_UUID = "ed9da18c-a800-4f66-a670-aa7547e34453"
-LOGRADIO_UUID = "6c6fd238-78fa-436b-aacf-15c5be1ef2e2"
+LEGACY_LOGRADIO_UUID = "6c6fd238-78fa-436b-aacf-15c5be1ef2e2"
+LOGRADIO_UUID = "5a3d6e49-06e6-4423-9944-e9de8cdf9547"
 
 
 class BLEInterface(MeshInterface):
@@ -55,7 +61,11 @@ def __init__(
             self.close()
             raise e
 
-        self.client.start_notify(LOGRADIO_UUID, self.log_radio_handler)
+        if self.client.has_characteristic(LEGACY_LOGRADIO_UUID):
+            self.client.start_notify(LEGACY_LOGRADIO_UUID, self.legacy_log_radio_handler)
+
+        if self.client.has_characteristic(LOGRADIO_UUID):
+            self.client.start_notify(LOGRADIO_UUID, self.log_radio_handler)
 
         logging.debug("Mesh configure starting")
         self._startConfig()
@@ -80,6 +90,16 @@ def from_num_handler(self, _, b):  # pylint: disable=C0116
         self.should_read = True
 
     async def log_radio_handler(self, _, b):  # pylint: disable=C0116
+        log_record = mesh_pb2.LogRecord()
+        try:
+            log_record.ParseFromString(bytes(b))
+        except google.protobuf.message.DecodeError:
+            return
+
+        message = f'[{log_record.source}] {log_record.message}' if log_record.source else log_record.message
+        self._handleLogLine(message)
+
+    async def legacy_log_radio_handler(self, _, b):  # pylint: disable=C0116
         log_radio = b.decode("utf-8").replace("\n", "")
         self._handleLogLine(log_radio)
 
@@ -238,6 +258,10 @@ def read_gatt_char(self, *args, **kwargs):  # pylint: disable=C0116
     def write_gatt_char(self, *args, **kwargs):  # pylint: disable=C0116
         self.async_await(self.bleak_client.write_gatt_char(*args, **kwargs))
 
+    def has_characteristic(self, specifier):
+        """Check if the connected node supports a specified characteristic."""
+        return bool(self.bleak_client.services.get_characteristic(specifier))
+
     def start_notify(self, *args, **kwargs):  # pylint: disable=C0116
         self.async_await(self.bleak_client.start_notify(*args, **kwargs))
 

meshtastic/mesh_interface.py

@@ -748,9 +748,8 @@ def _startHeartbeat(self):
 
         def callback():
             self.heartbeatTimer = None
-            prefs = self.localNode.localConfig
-            i = prefs.power.ls_secs / 2
-            logging.debug(f"Sending heartbeat, interval {i}")
+            i = 300
+            logging.debug(f"Sending heartbeat, interval {i} seconds")
             if i != 0:
                 self.heartbeatTimer = threading.Timer(i, callback)
                 self.heartbeatTimer.start()

meshtastic/protobuf/config_pb2.py

@@ -56,6 +56,7 @@ class Config(google.protobuf.message.Message):
             ROUTER_CLIENT: Config.DeviceConfig._Role.ValueType  # 3
             """
             Description: Combination of both ROUTER and CLIENT. Not for mobile devices.
+            Deprecated in v2.3.15 because improper usage is impacting public meshes: Use ROUTER or CLIENT instead.
             """
             REPEATER: Config.DeviceConfig._Role.ValueType  # 4
             """
@@ -131,6 +132,7 @@ class Config(google.protobuf.message.Message):
         ROUTER_CLIENT: Config.DeviceConfig.Role.ValueType  # 3
         """
         Description: Combination of both ROUTER and CLIENT. Not for mobile devices.
+        Deprecated in v2.3.15 because improper usage is impacting public meshes: Use ROUTER or CLIENT instead.
         """
         REPEATER: Config.DeviceConfig.Role.ValueType  # 4
         """