supleed2/ELEC60013-ES-CW1
1
0
Fork 0
mirror of https://github.com/supleed2/ELEC60013-ES-CW1.git synced 2024-12-22 21:45:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Integration Complete

Browse source 
Seems to work, debug print statements removed
This commit is contained in:
Aadi Desai 2022-03-02 12:34:11 +00:00
parent 1272b78f69
commit 35f98a2e99
No known key found for this signature in database
GPG key ID: CFFFE425830EF4D9
3 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitignore vendored
View file

@ -152,4 +152,8 @@ cython_debug/
#.idea/ #.idea/
# VSCode # VSCode
.vscode/ .vscode/
# misc
OpenHaystack.app/
extract.txt

BIN
OpenHaystack.zip Normal file
View file

Binary file not shown.

21
main.py
View file

@ -1,5 +1,4 @@
import requests import requests, json, subprocess, re
import json
import paho.mqtt.client as mqtt import paho.mqtt.client as mqtt
def OpenHayStackLocation(): def OpenHayStackLocation():
@ -12,19 +11,31 @@ def on_connect(client, userdata, flags, rc):
def on_message(client, userdata, msg): def on_message(client, userdata, msg):
if msg.topic == "/data": if msg.topic == "/data":
loc_lat, loc_lon = None, None
try:
subprocess.run("./OpenHaystack.app/Contents/MacOS/OpenHaystack > extract.txt", capture_outout=True, shell=True, timeout=5)
except Exception as e:
pass
with open("extract.txt", "r") as output:
lines = output.readlines()
for line in reversed(lines):
if "FindMyLocationReport" in line:
loc_lat = re.findall("latitude: (-?[0-9]*\.[0-9]*)", line)[0]
loc_lon = re.findall("longitude: (-?[0-9]*\.[0-9]*)", line)[0]
break
subprocess.run("pkill OpenHaystack", shell=True)
data = json.loads(msg.payload) data = json.loads(msg.payload)
firebase_url = "https://leg-barkr.nw.r.appspot.com/readings/save" firebase_url = "https://leg-barkr.nw.r.appspot.com/readings/save"
firebase_headers = { firebase_headers = {
"Content-Type": "application/json", "Content-Type": "application/json",
"Device-ID": data["devID"] "Device-ID": data["devID"]
} }
loc_lat, loc_lon = OpenHayStackLocation()
firebase_data = { firebase_data = {
"air_temp": data["air_temp"], "air_temp": data["air_temp"],
"cumulative_steps_today": data["day_steps"], "cumulative_steps_today": data["day_steps"],
"humidity": data["hum_perc"], "humidity": data["hum_perc"],
"latitude": loc_lat, "latitude": float(loc_lat),
"longitude": loc_lon, "longitude": float(loc_lon),
"skin_temp": data['pet_temp'] "skin_temp": data['pet_temp']
} }
r = requests.post(url = firebase_url, json = firebase_data, params = None, headers = firebase_headers) # add any other necessary values in request r = requests.post(url = firebase_url, json = firebase_data, params = None, headers = firebase_headers) # add any other necessary values in request