meshcore 2.2.28__tar.gz → 2.2.30__tar.gz

{meshcore-2.2.28 → meshcore-2.2.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshcore
-Version: 2.2.28
+Version: 2.2.30
 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-2.2.28 → meshcore-2.2.30}/pyproject.toml

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

{meshcore-2.2.28 → meshcore-2.2.30}/src/meshcore/commands/contact.py

@@ -120,7 +120,9 @@ class ContactCommands(CommandHandlerBase):
                     res = await self.send_device_query()
                     if not res is None and res.type != EventType.ERROR:
                         if "path_hash_mode" in res.payload:
-                            path_hash_size = res.payload["path_hash_mode"] + 1
+                            path_hash_mode = res.payload["path_hash_mode"]
+                        else:
+                            path_hash_mode = 0
             else:
                 if ":" in path: # remove as it has been specified in args
                     path = path.split(":")[0].replace(":","")
@@ -134,7 +136,7 @@ class ContactCommands(CommandHandlerBase):
             logger.debug(f"Setting {contact['adv_name']} path to {out_path_hex} with mode {out_path_hash_mode}")
 
             # reflect the change
-            contact["out_path_hash_mode"] = path_hash_mode
+            contact["out_path_hash_mode"] = out_path_hash_mode
             contact["out_path"] = out_path_hex
             contact["out_path_len"] = out_path_len
 
@@ -142,7 +144,7 @@ class ContactCommands(CommandHandlerBase):
         if out_path_len == -1: # path did not change and contact was flood
             out_path_len = 255 # we are signed
         else:
-            out_path_len = out_path_len | (path_hash_mode << 6)
+            out_path_len = out_path_len | (out_path_hash_mode << 6)
 
         if flags is None:
             flags = contact["flags"]
@@ -170,7 +172,7 @@ class ContactCommands(CommandHandlerBase):
         return await self.update_contact(contact)
 
     async def change_contact_path(self, contact, path, path_hash_mode=None) -> Event:
-        return await self.update_contact(contact, path, path_hash_mode)
+        return await self.update_contact(contact, path, path_hash_mode=path_hash_mode)
 
     async def change_contact_flags(self, contact, flags) -> Event:
         return await self.update_contact(contact, flags=flags)