diff --git a/rak2171.py b/rak2171.py index a99b741..bf493fe 100644 --- a/rak2171.py +++ b/rak2171.py @@ -55,7 +55,7 @@ def push_msg(msg, device_id): def check_batt(batt, device_id): - msg = f"Batterie von {device_id} ist unter 20%" + msg = f"Batterie von {device_id} ist unter 20%: {batt}%" if batt <= 20 and batt >= 1: logging.info(msg) push_msg(msg=msg, device_id=device_id) @@ -72,11 +72,12 @@ def on_message_ttn(client, userdata, msg): ) # retrieve info about gateway - # gtw_id = data["uplink_message"]["rx_metadata"][0]["gateway_ids"]["gateway_id"] - # for gtw in data["uplink_message"]["rx_metadata"]: - # pprint(gtw) - # gtw_id += data["uplink_message"]["rx_metadata"][gtw]["gateway_ids"]["gateway_id"] - # logging.info("received via gw %s", gtw_id) + gtw_id = [] + for gtw in data["uplink_message"]["rx_metadata"]: + gtw_id.append(gtw["gateway_ids"]["gateway_id"]) + + gws = ",".join(gtw_id) + logging.info(f"received via ttn gateway: {gws}") # the decoded data fix = data["uplink_message"]["decoded_payload"].get("fix", 0) @@ -120,9 +121,9 @@ def on_message_ttn(client, userdata, msg): logging.info("publishing data to traccar") traccar_url = f"{DST_TRACCAR_URL}/?id={device_id}&lat={latitude}&lon={longitude}×tamp={timestamp}&accuracy={accuracy}&batt={battery}" requests.get(traccar_url) - elif sos == 0: - logging.info("got payload with a sos") - push_msg(msg=f"Knopf 5 mal gedrückt - deaktiviert", device_id=device_id) + # elif sos == 0: + # logging.info("got payload with a sos") + # push_msg(msg=f"Knopf 5 mal gedrückt - deaktiviert", device_id=device_id) elif sos == 1: logging.info("got payload with a sos") push_msg(msg=f"Knopf 5 mal gedrückt - aktiviert", device_id=device_id)