Mirrors/meshcore_py
1
0
Fork 0
mirror of https://github.com/meshcore-dev/meshcore_py.git synced 2026-08-08 08:06:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

deal with set_flood_scope, now * means force_unscoped

Browse Source
This commit is contained in:
Florent
2026-07-27 09:47:29 -04:00
parent e1756555d6
commit c61f94bbfe
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/meshcore/commands/messaging.py
+15 -2
View File
@@ -330,14 +330,18 @@ class MessagingCommands(CommandHandlerBase):
data = bytes([0x19, len(path)]) + path + bytes(payload) data = bytes([0x19, len(path)]) + path + bytes(payload)
return await self.send(data, [EventType.OK, EventType.ERROR]) return await self.send(data, [EventType.OK, EventType.ERROR])
async def set_flood_scope(self, scope): async def set_flood_scope(self, scope, force_unscoped=False):
if scope is None: if scope is None:
logger.debug(f"Resetting scope") logger.debug(f"Resetting scope")
scope_key = b"\0"*16 scope_key = b"\0"*16
elif isinstance (scope, str): elif isinstance (scope, str):
if scope == "0" or scope == "None" or scope == "*" or scope == "": # disable if scope == "0" or scope == "None" or scope == "": # revert to default
logger.debug(f"Resetting scope") logger.debug(f"Resetting scope")
scope_key = b"\0"*16 scope_key = b"\0"*16
logger.debug("revert to default_scope")
elif scope == "*":
force_unscoped = True
logger.debug("forcing unscoped msgs")
else: else:
logger.debug(f"Setting scope from string {scope}") logger.debug(f"Setting scope from string {scope}")
if scope[0] != "#": # no hashtag as first char if scope[0] != "#": # no hashtag as first char
@@ -352,11 +356,20 @@ class MessagingCommands(CommandHandlerBase):
logger.debug(f"Setting scope to {scope_key.hex()}") logger.debug(f"Setting scope to {scope_key.hex()}")
cmd_data = bytearray([CommandType.SET_FLOOD_SCOPE.value]) cmd_data = bytearray([CommandType.SET_FLOOD_SCOPE.value])
if force_unscoped:
cmd_data.append(0x01)
else:
cmd_data.extend(b"\0") cmd_data.extend(b"\0")
cmd_data.extend(scope_key) cmd_data.extend(scope_key)
return await self.send(cmd_data, [EventType.OK, EventType.ERROR]) return await self.send(cmd_data, [EventType.OK, EventType.ERROR])
async def reset_flood_scope(self):
return await self.set_flood_scope(b"")
async def force_unscoped(self):
return await self.set_flood_scope(b"", force_unscoped=True)
async def set_default_flood_scope(self, scope): async def set_default_flood_scope(self, scope):
if scope is None: if scope is None:
logger.debug(f"Resetting default scope") logger.debug(f"Resetting default scope")