meshcore-dev/meshcore-cli
1
0
Fork 0
mirror of https://github.com/meshcore-dev/meshcore-cli.git synced 2026-04-20 22:13:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

handle timeout=0

Browse source
This commit is contained in:
Florent de Lamotte 2025-07-19 21:28:51 +02:00
parent 5a09fe9197
commit 7560f04fa9
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/meshcore_cli/meshcore_cli.py
View file

@ -789,7 +789,7 @@ async def msg_ack (mc, contact, msg) :
return False
exp_ack = result.payload["expected_ack"].hex()
timeout = result.payload["suggested_timeout"] / 1000 * 1.2 if not "timeout" in contact else contact["timeout"]
timeout = result.payload["suggested_timeout"] / 1000 * 1.2 if not "timeout" in contact or contact['timeout']==0 else contact["timeout"]
res = await mc.wait_for_event(EventType.ACK, attribute_filters={"code": exp_ack}, timeout=timeout)
if res is None :
return False
@ -1385,7 +1385,7 @@ async def next_cmd(mc, cmds, json_output=False):
else:
print(f"Error while loging: {res}")
else: # should probably wait for the good ack
timeout = res.payload["suggested_timeout"]/800 if not "timeout" in contact else contact["timeout"]
timeout = res.payload["suggested_timeout"]/800 if not "timeout" in contact or contact['timeout']==0 else contact["timeout"]
res = await mc.wait_for_event(EventType.LOGIN_SUCCESS, timeout=timeout)
logger.debug(res)
if res is None:
@ -1429,7 +1429,7 @@ async def next_cmd(mc, cmds, json_output=False):
if res.type == EventType.ERROR:
print(f"Error while requesting status: {res}")
else :
timeout = res.payload["suggested_timeout"]/800 if not "timeout" in contact else contact["timeout"]
timeout = res.payload["suggested_timeout"]/800 if not "timeout" in contact or contact['timeout']==0 else contact["timeout"]
res = await mc.wait_for_event(EventType.STATUS_RESPONSE, timeout=timeout)
logger.debug(res)
if res is None:
@ -1449,7 +1449,7 @@ async def next_cmd(mc, cmds, json_output=False):
if res.type == EventType.ERROR:
print(f"Error while requesting telemetry")
else:
timeout = res.payload["suggested_timeout"]/800 if not "timeout" in contact else contact["timeout"]
timeout = res.payload["suggested_timeout"]/800 if not "timeout" in contact or contact['timeout']==0 else contact["timeout"]
res = await mc.wait_for_event(EventType.TELEMETRY_RESPONSE, timeout=timeout)
logger.debug(res)
if res is None: