more robust gw info - log fix
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
This commit is contained in:
parent
dace837f70
commit
124b3b2d5e
18
lgt92.py
18
lgt92.py
|
@ -50,12 +50,15 @@ def on_message_ttn(client, userdata, msg):
|
||||||
|
|
||||||
# retrieve info about gateway
|
# retrieve info about gateway
|
||||||
gtw_id = data["metadata"]["gateways"][0]["gtw_id"]
|
gtw_id = data["metadata"]["gateways"][0]["gtw_id"]
|
||||||
gtw_info = requests.get("https://www.thethingsnetwork.org/gateway-data/gateway/"+gtw_id).json()
|
try:
|
||||||
logging.info("received via gw %s, %s, owned by %s",
|
gtw_info = requests.get("https://www.thethingsnetwork.org/gateway-data/gateway/"+gtw_id).json()
|
||||||
data["metadata"]["gateways"][0]["gtw_id"],
|
logging.info("received via gw %s, %s, owned by %s",
|
||||||
gtw_info[gtw_id]["description"],
|
data["metadata"]["gateways"][0]["gtw_id"],
|
||||||
gtw_info[gtw_id]["owner"],
|
gtw_info[gtw_id]["description"],
|
||||||
)
|
gtw_info[gtw_id]["owner"],
|
||||||
|
)
|
||||||
|
except:
|
||||||
|
logging.info("received via gw %s", gtw_id)
|
||||||
|
|
||||||
# max is 4 volts, 3 volts is considered empty
|
# max is 4 volts, 3 volts is considered empty
|
||||||
batpercent = round((data["payload_fields"]["batV"] - 3) * 100)
|
batpercent = round((data["payload_fields"]["batV"] - 3) * 100)
|
||||||
|
@ -63,7 +66,9 @@ def on_message_ttn(client, userdata, msg):
|
||||||
if data["payload_fields"]["alarm"]:
|
if data["payload_fields"]["alarm"]:
|
||||||
print("ALARM button pressed")
|
print("ALARM button pressed")
|
||||||
|
|
||||||
|
got_fix = False
|
||||||
if "latitude" in data["payload_fields"]:
|
if "latitude" in data["payload_fields"]:
|
||||||
|
got_fix = True
|
||||||
# transform received data into OwnTracks format
|
# transform received data into OwnTracks format
|
||||||
ot_data = json.dumps({
|
ot_data = json.dumps({
|
||||||
"_type": "location",
|
"_type": "location",
|
||||||
|
@ -103,6 +108,7 @@ def on_message_ttn(client, userdata, msg):
|
||||||
"counter": data["counter"],
|
"counter": data["counter"],
|
||||||
"airtime": data["metadata"]["airtime"],
|
"airtime": data["metadata"]["airtime"],
|
||||||
"rssi": data["metadata"]["gateways"][0]["rssi"],
|
"rssi": data["metadata"]["gateways"][0]["rssi"],
|
||||||
|
"fix": got_fix,
|
||||||
}
|
}
|
||||||
}]
|
}]
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue