diff --git a/pyproject.toml b/pyproject.toml index b5f0441..cbf1ddd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "hatchling.build" [project] name = "meshcore" -version = "1.9.8" +version = "1.9.9" authors = [ { name="Florent de Lamotte", email="florent@frizoncorrea.fr" }, { name="Alex Wolden", email="awolden@gmail.com" }, diff --git a/src/meshcore/commands.py b/src/meshcore/commands.py index 39b55e6..93b76bc 100644 --- a/src/meshcore/commands.py +++ b/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}") diff --git a/src/meshcore/reader.py b/src/meshcore/reader.py index 11eb668..e4856fe 100644 --- a/src/meshcore/reader.py +++ b/src/meshcore/reader.py @@ -74,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