meshcore 1.9.8.dev2__tar.gz → 1.9.8.dev3__tar.gz

{meshcore-1.9.8.dev2 → meshcore-1.9.8.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshcore
-Version: 1.9.8.dev2
+Version: 1.9.8.dev3
 Summary: Base classes for communicating with meshcore companion radios
 Project-URL: Homepage, https://github.com/fdlamotte/meshcore_py
 Project-URL: Issues, https://github.com/fdlamotte/meshcore_py/issues

{meshcore-1.9.8.dev2 → meshcore-1.9.8.dev3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "meshcore"
-version = "1.9.8.dev2"
+version = "1.9.8.dev3"
 authors = [
   { name="Florent de Lamotte", email="florent@frizoncorrea.fr" },
   { name="Alex Wolden", email="awolden@gmail.com" },

{meshcore-1.9.8.dev2 → meshcore-1.9.8.dev3}/src/meshcore/commands.py

@@ -195,7 +195,33 @@ class CommandHandler:
                 + int(af).to_bytes(4, 'little')\
                 + int(0).to_bytes(1, 'little')\
                 + int(0).to_bytes(1, 'little'), [EventType.OK, EventType.ERROR])
-                
+
+    async def set_other_params(self, manual_add_contacts : bool, telemetry_mode_base : int, telemetry_mode_loc : int) :
+        telemetry_mode = (telemetry_mode_base & 0b11) | ((telemetry_mode_loc & 0b11) << 2)
+        data = b"\x26" + manual_add_contacts.to_bytes(1) + telemetry_mode.to_bytes(1) 
+        return await self.send(data, [EventType.OK, EventType.ERROR])
+
+    async def set_telemetry_mode_base(self, telemetry_mode_base : int) :
+        infos = (await self.send_appstart()).payload
+        return await self.set_other_params( 
+                    infos["manual_add_contacts"], 
+                    telemetry_mode_base,
+                    infos["telemetry_mode_loc"])
+
+    async def set_telemetry_mode_loc(self, telemetry_mode_loc : int) :
+        infos = (await self.send_appstart()).payload
+        return await self.set_other_params(
+                    infos["manual_add_contacts"], 
+                    infos["telemetry_mode_base"],
+                    telemetry_mode_loc)
+
+    async def set_manual_add_contacts(self, manual_add_contacts:bool) :
+        infos = (await self.send_appstart()).payload
+        return await self.set_other_params( 
+                    manual_add_contacts, 
+                    infos["telemetry_mode_base"],
+                    infos["telemetry_mode_loc"])
+
     async def set_devicepin(self, pin: int) -> Event:
         logger.debug(f"Setting device PIN to: {pin}")
         return await self.send(b"\x25" \
@@ -306,15 +332,9 @@ class CommandHandler:
         data = b"\x03\x00" + chan.to_bytes(1, 'little') + timestamp + msg.encode("utf-8")
         return await self.send(data, [EventType.OK, EventType.ERROR])
         
-    async def send_other_params(self, manual_add_contacts : bool, telemetry_mode_base : bool, telemetry_mode_loc : bool) :
-        telemetry_mode = (telemetry_mode_base & 0b11) | ((telemetry_mode_loc & 0b11) << 2)
-        data = b"\x26" + manual_add_contacts.to_bytes(1) + telemetry_mode.to_bytes(1) 
-        return await self.send(data, [EventType.OK, EventType.ERROR])
-
     async def send_telemetry_req(self, dst: DestinationType) -> Event :
         dst_bytes = _validate_destination(dst, prefix_length=32)
         logger.debug(f"Asking telemetry to {dst_bytes.hex()}")
-
         data = b"\x27\x00\x00\x00" + dst_bytes
         return await self.send(data, [EventType.MSG_SENT, EventType.ERROR])
 

{meshcore-1.9.8.dev2 → meshcore-1.9.8.dev3}/src/meshcore/reader.py

@@ -382,7 +382,6 @@ class MessageReader:
 
             res["pubkey_pre"] = data[2:8].hex()
             buf = data[8:]
-            res["data"] = buf.hex()
 
             """Parse a given byte string and return as a LppFrame object."""
             i = 0