From a29076dc8e719eba21c2346e37acebc1196d5fd0 Mon Sep 17 00:00:00 2001 From: iz1kga Date: Mon, 15 Feb 2021 14:41:55 +0100 Subject: [PATCH] unit & cosmetic --- meshtastic/__main__.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/meshtastic/__main__.py b/meshtastic/__main__.py index 212ad07..dc10406 100644 --- a/meshtastic/__main__.py +++ b/meshtastic/__main__.py @@ -136,8 +136,8 @@ def setRouter(interface, on): #Returns formatted value -def formatFloat(value, formatStr, default="N/A"): - return formatStr.format(value) if value else default +def formatFloat(value, formatStr="{:.2f}", unit="", default="N/A"): + return formatStr.format(value)+unit if value else default #Returns Last Heard Time in human readable format def getLH(ts, default="N/A"): @@ -155,13 +155,13 @@ def printNodes(nodes): for node in nodes: #aux var to get not defined keys LH= getLH(node['position'].get("time")) - lat=formatFloat(node['position'].get("latitude"), "{:.4f}", "N/A") - lon=formatFloat(node['position'].get("longitude"), "{:.4f}", "N/A") - alt=formatFloat(node['position'].get("altitude"), "{:.2f}", "N/A") - batt=formatFloat(node['position'].get("batteryLevel"), "{:.2f}", "N/A") - snr=formatFloat(node.get("snr"), "{:.2f}", "N/A") + lat=formatFloat(node['position'].get("latitude"), "{:.4f}", "°") + lon=formatFloat(node['position'].get("longitude"), "{:.4f}", "°") + alt=formatFloat(node['position'].get("altitude"), "{:.0f}", " m") + batt=formatFloat(node['position'].get("batteryLevel"), "{:.2f}", "%") + snr=formatFloat(node.get("snr"), "{:.2f}", " dB") tableData.append({"User":node['user']['longName'], - "Position":"Lat:"+lat+",Lon:"+lon+",Alt:"+alt, + "Position":"Lat:"+lat+", Lon:"+lon+", Alt:"+alt, "Battery":batt, "SNR":snr, "LastHeard":LH}) table.setData(tableData) table.displayTable()