William/Reticulum
1
0
Fork 0
mirror of https://github.com/markqvist/Reticulum.git synced 2025-01-18 16:30:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle negative time in time formatters

Browse Source
This commit is contained in:
Mark Qvist 2025-01-14 12:45:17 +01:00
parent c6576d6504
commit 80dc567a53
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
RNS/__init__.py
View File

@ -241,6 +241,11 @@ def prettydistance(m, suffix="m"):
return "%.2f %s%s" % (num, last_unit, suffix) return "%.2f %s%s" % (num, last_unit, suffix)
def prettytime(time, verbose=False, compact=False): def prettytime(time, verbose=False, compact=False):
neg = False
if time < 0:
time = abs(time)
neg = True
days = int(time // (24 * 3600)) days = int(time // (24 * 3600))
time = time % (24 * 3600) time = time % (24 * 3600)
hours = int(time // 3600) hours = int(time // 3600)
@ -291,10 +296,17 @@ def prettytime(time, verbose=False, compact=False):
if tstr == "": if tstr == "":
return "0s" return "0s"
else: else:
if not neg:
return tstr return tstr
else:
return f"-{tstr}"
def prettyshorttime(time, verbose=False, compact=False): def prettyshorttime(time, verbose=False, compact=False):
neg = False
time = time*1e6 time = time*1e6
if time < 0:
time = abs(time)
neg = True
seconds = int(time // 1e6); time %= 1e6 seconds = int(time // 1e6); time %= 1e6
milliseconds = int(time // 1e3); time %= 1e3 milliseconds = int(time // 1e3); time %= 1e3
@ -338,7 +350,10 @@ def prettyshorttime(time, verbose=False, compact=False):
if tstr == "": if tstr == "":
return "0us" return "0us"
else: else:
if not neg:
return tstr return tstr
else:
return f"-{tstr}"
def phyparams(): def phyparams():
print("Required Physical Layer MTU : "+str(Reticulum.MTU)+" bytes") print("Required Physical Layer MTU : "+str(Reticulum.MTU)+" bytes")