adapt to ttnv3 and black

lgt92.py

@@ -25,16 +25,20 @@ VERSION = "v2.0"
 OT_TOPIC = "owntracks/tobru/dragino"
 OT_TID = "dragino"
 
+
 def on_connect_ttn(client, userdata, flags, rc):
     logging.info("connected to ttn %s - %s", SRC_MQTT_HOST, str(rc))
     client.subscribe("v3/+/devices/+/up")
 
+
 def on_connect_ot(client, userdata, flags, rc):
     logging.info("connected to ot %s - %s", DST_MQTT_HOST, str(rc))
 
+
 def on_publish_ot(client, userdata, rc):
     logging.info("published data to ot")
 
+
 def on_log(client, userdata, level, buf):
     logging_level = mqtt.LOGGING_LEVEL[level]
     logging.log(logging_level, buf)
@@ -43,16 +47,22 @@ def on_log(client, userdata, level, buf):
         # report to https://healthchecks.io to tell that the connection is alive
         requests.get(HC_PING_URL)
 
+
 # The callback for when a PUBLISH message is received from the server.
 def on_message_ttn(client, userdata, msg):
     data = json.loads(msg.payload)
-    logging.info("message from ttn received for %s - #%s", data["dev_id"], data["counter"])
+    logging.info(
+        "message from ttn received for %s", data["end_device_ids"]["device_id"]
+    )
 
     # retrieve info about gateway
-    gtw_id = data["metadata"]["gateways"][0]["gtw_id"]
+    gtw_id = data["rx_metadata"][0]["gateway_ids"]["gateway_id"]
     try:
-        gtw_info = requests.get("https://www.thethingsnetwork.org/gateway-data/gateway/"+gtw_id).json()
+        gtw_info = requests.get(
-        logging.info("received via gw %s, %s, owned by %s",
+            "https://www.thethingsnetwork.org/gateway-data/gateway/" + gtw_id
+        ).json()
+        logging.info(
+            "received via gw %s, %s, owned by %s",
             data["metadata"]["gateways"][0]["gtw_id"],
             gtw_info[gtw_id]["description"],
             gtw_info[gtw_id]["owner"],
@@ -61,38 +71,47 @@ def on_message_ttn(client, userdata, msg):
         logging.info("received via gw %s", gtw_id)
 
     # max is 4 volts, 3 volts is considered empty
-    batpercent = round((data["payload_fields"]["BatV"] - 3) * 100)
+    batpercent = round((data["uplink_message"]["decoded_payload"]["BatV"] - 3) * 100)
 
-    if data["payload_fields"]["ALARM_status"]:
+    if data["uplink_message"]["decoded_payload"]["ALARM_status"]:
         logging.info("Red button pushed!")
 
-    logging.info("Motion detection: %s", data["payload_fields"]["MD"])
+    logging.info(
-    logging.info("LED status for position: %s", data["payload_fields"]["LON"])
+        "Motion detection: %s", data["uplink_message"]["decoded_payload"]["MD"]
-    logging.info("Firmware version: %s", data["payload_fields"]["FW"])
+    )
+    logging.info(
+        "LED status for position: %s", data["uplink_message"]["decoded_payload"]["LON"]
+    )
+    logging.info(
+        "Firmware version: %s", data["uplink_message"]["decoded_payload"]["FW"]
+    )
 
     got_fix = False
-    if data["payload_fields"]["Latitude"] == 0:
+    if data["uplink_message"]["decoded_payload"]["Latitude"] == 0:
         logging.info("no GPS data (Latitude) present")
         # set GPS data to 0 for InfluxDB
-        data["payload_fields"]["Latitude"] = 0.0
+        data["uplink_message"]["decoded_payload"]["Latitude"] = 0.0
-        data["payload_fields"]["Longitude"] = 0.0
+        data["uplink_message"]["decoded_payload"]["Longitude"] = 0.0
     else:
-        logging.info("GPS data (Latitude) present: lat %s, lon %s",
+        logging.info(
-          data["payload_fields"]["Latitude"],
+            "GPS data (Latitude) present: lat %s, lon %s",
-          data["payload_fields"]["Longitude"]
+            data["uplink_message"]["decoded_payload"]["Latitude"],
+            data["uplink_message"]["decoded_payload"]["Longitude"],
         )
         got_fix = True
         # transform received data into OwnTracks format
-        ot_data = json.dumps({
+        ot_data = json.dumps(
+            {
                 "_type": "location",
-            "lat": data["payload_fields"]["Latitude"],
+                "lat": data["uplink_message"]["decoded_payload"]["Latitude"],
-            "lon": data["payload_fields"]["Longitude"],
+                "lon": data["uplink_message"]["decoded_payload"]["Longitude"],
                 "batt": batpercent,
                 "t": "p",
                 "tid": OT_TID,
                 "tst": int(datetime.timestamp(datetime.now())),
                 "conn": "m",
-        })
+            }
+        )
 
         # publish to owntracks
         logging.info("publishing data to owntracks via mqtt to topic %s", OT_TOPIC)
@@ -101,28 +120,35 @@ def on_message_ttn(client, userdata, msg):
     # write to influxdb
     logging.info("writing data to influxdb")
     influxdb.write_points(
-        [{
+        [
+            {
                 "measurement": "dragino",
                 "tags": {
                     "device": "lgt92",
                 },
                 "fields": {
-                "bat": float(data["payload_fields"]["BatV"]),
+                    "bat": float(data["uplink_message"]["decoded_payload"]["BatV"]),
-                "pitch": float(data["payload_fields"]["Pitch"]),
+                    "pitch": float(data["uplink_message"]["decoded_payload"]["Pitch"]),
-                "roll": float(data["payload_fields"]["Roll"]),
+                    "roll": float(data["uplink_message"]["decoded_payload"]["Roll"]),
-                "lat": float(data["payload_fields"]["Latitude"]),
+                    "lat": float(data["uplink_message"]["decoded_payload"]["Latitude"]),
-                "lon": float(data["payload_fields"]["Longitude"]),
+                    "lon": float(
-                "alarm": int(data["payload_fields"]["ALARM_status"]),
+                        data["uplink_message"]["decoded_payload"]["Longitude"]
+                    ),
+                    "alarm": int(
+                        data["uplink_message"]["decoded_payload"]["ALARM_status"]
+                    ),
                     "counter": data["counter"],
                     "airtime": data["metadata"]["airtime"],
                     "rssi": data["metadata"]["gateways"][0]["rssi"],
                     "fix": got_fix,
+                },
             }
-        }]
+        ]
     )
 
     logging.info("data processing done")
 
+
 def shutdown():
     logging.info("disconnecting from mqtt")
     client_ot.disconnect()
@@ -130,19 +156,21 @@ def shutdown():
     client_ttn.disconnect()
     client_ttn.loop_stop()
 
+
 def handleSIGTERM(signalNumber, frame):
     logging.info("got SIGTERM")
     shutdown()
     return
 
-if __name__ == '__main__':
+
+if __name__ == "__main__":
 
     signal.signal(signal.SIGTERM, handleSIGTERM)
 
     logging.basicConfig(
         level=logging.INFO,
-        format='%(asctime)s - %(message)s',
+        format="%(asctime)s - %(message)s",
-        datefmt='%Y-%m-%d %H:%M:%S %Z'
+        datefmt="%Y-%m-%d %H:%M:%S %Z",
     )
 
     logging.info("Starting ioteer lgt92. " + VERSION)
@@ -169,10 +197,12 @@ if __name__ == '__main__':
     client_ttn.connect(SRC_MQTT_HOST, 8883, 60)
 
     # Prepare MQTT for OwnTracks
-    ot_lwt = json.dumps({
+    ot_lwt = json.dumps(
+        {
             "_type": "lwt",
             "tst": int(datetime.timestamp(datetime.now())),
-    })
+        }
+    )
     client_ot = mqtt.Client()
     client_ot.enable_logger()
     client_ot.on_connect = on_connect_ot
@@ -190,4 +220,3 @@ if __name__ == '__main__':
     except KeyboardInterrupt:
         shutdown()
         logging.info("tschuess")
-