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

# Conflicts:
#	meshtastic/mesh_interface.py

Author: geeksville

.github/workflows/ci.yml

@@ -16,6 +16,7 @@ jobs:
           - "3.9"
           - "3.10"
           - "3.11"
+          - "3.12"
     steps:
       - uses: actions/checkout@v4
       - name: Install Python 3
@@ -58,6 +59,7 @@ jobs:
           - "3.9"
           - "3.10"
           - "3.11"
+          - "3.12"
     steps:
       - uses: actions/checkout@v4
       - name: Install Python 3

meshtastic/mesh_interface.py

@@ -371,13 +371,14 @@ def sendText(
     def sendData(
         self,
         data,
-        destinationId: Union[int, str] = BROADCAST_ADDR,
-        portNum: portnums_pb2.PortNum.ValueType = portnums_pb2.PortNum.PRIVATE_APP,
-        wantAck: bool = False,
-        wantResponse: bool = False,
-        onResponse: Optional[Callable[[dict], Any]] = None,
-        onResponseAckPermitted: bool = False,
-        channelIndex: int = 0,
+        destinationId: Union[int, str]=BROADCAST_ADDR,
+        portNum: portnums_pb2.PortNum.ValueType=portnums_pb2.PortNum.PRIVATE_APP,
+        wantAck: bool=False,
+        wantResponse: bool=False,
+        onResponse: Optional[Callable[[dict], Any]]=None,
+        onResponseAckPermitted: bool=False,
+        channelIndex: int=0,
+        hopLimit: Optional[int]=None,
     ):
         """Send a data packet to some other node
 
@@ -400,7 +401,8 @@ def sendData(
                     for regular ACKs (True) or just data responses & NAKs (False)
                     Note that if the onResponse callback is called 'onAckNak' this
                     will implicitly be true.
-            channelIndex - channel number to use
+            channelIndex -- channel number to use
+            hopLimit -- hop limit to use
 
         Returns the sent packet. The id field will be populated in this packet
         and can be used to track future message acks/naks.
@@ -431,10 +433,8 @@ def sendData(
 
         if onResponse is not None:
             logging.debug(f"Setting a response handler for requestId {meshPacket.id}")
-            self._addResponseHandler(
-                meshPacket.id, onResponse, ackPermitted=onResponseAckPermitted
-            )
-        p = self._sendPacket(meshPacket, destinationId, wantAck=wantAck)
+            self._addResponseHandler(meshPacket.id, onResponse, ackPermitted=onResponseAckPermitted)
+        p = self._sendPacket(meshPacket, destinationId, wantAck=wantAck, hopLimit=hopLimit)
         return p
 
     def sendPosition(
@@ -539,6 +539,7 @@ def sendTraceRoute(
             wantResponse=True,
             onResponse=self.onResponseTraceRoute,
             channelIndex=channelIndex,
+            hopLimit=hopLimit,
         )
         # extend timeout based on number of nodes, limit by configured hopLimit
         waitFactor = min(len(self.nodes) - 1 if self.nodes else 0, hopLimit)
@@ -645,8 +646,9 @@ def _addResponseHandler(
     def _sendPacket(
         self,
         meshPacket: mesh_pb2.MeshPacket,
-        destinationId: Union[int, str] = BROADCAST_ADDR,
-        wantAck: bool = False,
+        destinationId: Union[int,str]=BROADCAST_ADDR,
+        wantAck: bool=False,
+        hopLimit: Optional[int]=None
     ):
         """Send a MeshPacket to the specified node (or if unspecified, broadcast).
         You probably don't want this - use sendData instead.
@@ -688,9 +690,12 @@ def _sendPacket(
 
         meshPacket.to = nodeNum
         meshPacket.want_ack = wantAck
-        loraConfig = getattr(self.localNode.localConfig, "lora")
-        hopLimit = getattr(loraConfig, "hop_limit")
-        meshPacket.hop_limit = hopLimit
+
+        if hopLimit is not None:
+            meshPacket.hop_limit = hopLimit
+        else:
+            loraConfig = getattr(self.localNode.localConfig, "lora")
+            meshPacket.hop_limit = getattr(loraConfig, "hop_limit")
 
         # if the user hasn't set an ID for this packet (likely and recommended),
         # we should pick a new unique ID so the message can be tracked.

meshtastic/node.py

@@ -128,7 +128,7 @@ def requestConfig(self, configType):
             print("Requesting current config from remote node (this can take a while).")
 
         msgIndex = configType.index
-        if configType.containing_type.full_name in ("meshtastic.LocalConfig", "LocalConfig"):
+        if configType.containing_type.name == "LocalConfig":
             p = admin_pb2.AdminMessage()
             p.get_config_request = msgIndex
             self._sendAdmin(p, wantResponse=True, onResponse=onResponse)

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "meshtastic"
-version = "2.3.13"
+version = "2.3.14"
 description = "Python API & client shell for talking to Meshtastic devices"
 authors = ["Meshtastic Developers <contact@meshtastic.org>"]
 license = "GPL-3.0-only"