meshcore 1.9.8.dev5__tar.gz → 1.9.9__tar.gz

{meshcore-1.9.8.dev5 → meshcore-1.9.9}/PKG-INFO

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

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

{meshcore-1.9.8.dev5 → meshcore-1.9.9}/src/meshcore/commands.py

@@ -196,8 +196,8 @@ class CommandHandler:
                 + 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)
+    async def set_other_params(self, manual_add_contacts : bool, telemetry_mode_base : int, telemetry_mode_loc : int, telemetry_mode_env : int) :
+        telemetry_mode = (telemetry_mode_base & 0b11) | ((telemetry_mode_loc & 0b11) << 2) | ((telemetry_mode_env & 0b11) << 4)
         data = b"\x26" + manual_add_contacts.to_bytes(1) + telemetry_mode.to_bytes(1) 
         return await self.send(data, [EventType.OK, EventType.ERROR])
 
@@ -206,21 +206,32 @@ class CommandHandler:
         return await self.set_other_params( 
                     infos["manual_add_contacts"], 
                     telemetry_mode_base,
-                    infos["telemetry_mode_loc"])
+                    infos["telemetry_mode_loc"],
+                    infos["telemetry_mode_env"])
 
     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)
+                    telemetry_mode_loc,
+                    infos["telemetry_mode_env"])
+
+    async def set_telemetry_mode_env(self, telemetry_mode_env : int) :
+        infos = (await self.send_appstart()).payload
+        return await self.set_other_params(
+                    infos["manual_add_contacts"], 
+                    infos["telemetry_mode_base"],
+                    infos["telemetry_mode_loc"],
+                    telemetry_mode_env)
 
     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"])
+                    infos["telemetry_mode_loc"],
+                    infos["telemetry_mode_env"])
 
     async def set_devicepin(self, pin: int) -> Event:
         logger.debug(f"Setting device PIN to: {pin}")
@@ -262,17 +273,25 @@ class CommandHandler:
         logger.debug(f"Removing contact: {key_bytes.hex()}")
         data = b"\x0f" + key_bytes
         return await self.send(data, [EventType.OK, EventType.ERROR])
-        
-    async def change_contact_path (self, contact, path) -> Event:
-        out_path_hex = path
-        out_path_len = int(len(path) / 2)
+
+    async def update_contact (self, contact, path=None, flags=None) -> Event:
+        if path is None :
+            out_path_hex = contact["out_path"]
+            out_path_len = contact["out_path_len"]
+        else :
+            out_path_hex = path
+            out_path_len = int(len(path) / 2)
         out_path_hex = out_path_hex + (128-len(out_path_hex)) * "0" 
+
+        if flags is None :
+            flags = contact["flags"]
+
         adv_name_hex = contact["adv_name"].encode().hex()
         adv_name_hex = adv_name_hex + (64-len(adv_name_hex)) * "0"
         data = b"\x09" \
             + bytes.fromhex(contact["public_key"])\
             + contact["type"].to_bytes(1)\
-            + contact["flags"].to_bytes(1)\
+            + flags.to_bytes(1)\
             + out_path_len.to_bytes(1, 'little', signed=True)\
             + bytes.fromhex(out_path_hex)\
             + bytes.fromhex(adv_name_hex)\
@@ -280,6 +299,12 @@ class CommandHandler:
             + int(contact["adv_lat"]*1e6).to_bytes(4, 'little', signed=True)\
             + int(contact["adv_lon"]*1e6).to_bytes(4, 'little', signed=True)
         return await self.send(data, [EventType.OK, EventType.ERROR])
+        
+    async def change_contact_path (self, contact, path) -> Event:
+        return await self.update_contact(contact, path)
+
+    async def change_contact_flags (self, contact, flags) -> Event:
+        return await self.update_contact(contact, flags=flags)
 
     async def get_msg(self, timeout: Optional[float] = 1) -> Event:
         logger.debug("Requesting pending messages")

meshcore-1.9.9/src/meshcore/lpp_json_encoder.py

@@ -0,0 +1,56 @@
+from cayennelpp import LppFrame, LppData
+from cayennelpp.lpp_type import LppType
+
+# Format : type name "how to display value"
+#   display : None: (use lib default), []: only one value to display, ["field1", "field2" ...]: meaning of each field 
+my_lpp_types = {
+    0:      ('digital input', []),
+    1:      ('digital output', []),
+    2:      ('analog input', []),
+    3:      ('analog output', []),
+    100:    ('generic sensor', []),
+    101:    ('illuminance', []),
+    102:    ('presence', []),
+    103:    ('temperature', []),
+    104:    ('humidity', []),
+    113:    ('accelerometer', ["acc_x", "acc_y", "acc_z"]),
+    115:    ('barometer', []),
+    116:    ('voltage', []),
+    117:    ('current', []),
+    118:    ('frequency', []),
+    120:    ('percentage', []),
+    121:    ('altitude', []),
+    122:    ('load', []),
+    125:    ('concentration', []),
+    128:    ('power', []),
+    130:    ('distance', []),
+    131:    ('energy', []),
+    132:    ('direction', None),
+    133:    ('time', []),
+    134:    ('gyrometer', None),
+    135:    ('colour', ["red", "green", "blue"]),
+    136:    ('gps', ["latitude", "longitude", "altitude"]),
+    142:    ('switch', []),
+}
+
+def lpp_json_encoder (obj, types = my_lpp_types) :
+    """Encode LppType, LppData, and LppFrame to JSON."""
+    if isinstance(obj, LppFrame):
+        return obj.data
+    if isinstance(obj, LppType):
+        return my_lpp_types[obj.type][0]
+    if isinstance(obj, LppData):
+        d = {"channel" : obj.channel, "type" : obj.type}
+        if my_lpp_types[obj.type.type][1] is None :
+            d["value"] = obj.value
+        elif len(my_lpp_types[obj.type.type][1]) == 0 :
+            d["value"] = obj.value[0]
+        else :
+            val_dict = {}
+            i = 0
+            for t in my_lpp_types[obj.type.type][1] :
+                val_dict[t] = obj.value[i]
+                i = i + 1
+            d["value"] = val_dict
+        return d
+    raise TypeError(repr(obj) + " is not JSON serialized")

{meshcore-1.9.8.dev5 → meshcore-1.9.9}/src/meshcore/reader.py

@@ -2,10 +2,11 @@ import sys
 import logging
 import asyncio
 import json
-from cayennelpp import LppFrame, LppData, LppUtil
+from cayennelpp import LppFrame, LppData
 from typing import Any, Optional, Dict
 from .events import Event, EventType, EventDispatcher
 from .packets import PacketType
+from meshcore.lpp_json_encoder import lpp_json_encoder
 
 logger = logging.getLogger("meshcore")
 
@@ -73,6 +74,7 @@ class MessageReader:
             self_info["public_key"] = data[4:36].hex()
             self_info["adv_lat"] = int.from_bytes(data[36:40], byteorder='little', signed=True)/1e6
             self_info["adv_lon"] = int.from_bytes(data[40:44], byteorder='little', signed=True)/1e6
+            self_info["telemetry_mode_env"] = (data[46] >> 4) & 0b11
             self_info["telemetry_mode_loc"] = (data[46] >> 2) & 0b11
             self_info["telemetry_mode_base"] = (data[46]) & 0b11
             self_info["manual_add_contacts"] = data[47] > 0
@@ -408,7 +410,7 @@ class MessageReader:
                 data.append(lppdata)
                 i = i + len(lppdata)
 
-            lpp = json.loads(json.dumps(LppFrame(data), default=LppUtil.json_encode_type_str))
+            lpp = json.loads(json.dumps(LppFrame(data), default=lpp_json_encoder))
 
             res["lpp"] = lpp