Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Egi testing #5

Merged
merged 15 commits into from
Feb 3, 2021
Merged

Egi testing #5

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
b4dd70c
Update egi.py
luke-iqt Jan 22, 2021
ac20e2c
Update flighttracker.py
luke-iqt Jan 22, 2021
b54010f
better logging for EGI
luke-iqt Jan 22, 2021
5bc2b8d
upgraded MQTT integration
luke-iqt Jan 22, 2021
80a2eba
Update adsb-mqtt.py
luke-iqt Jan 23, 2021
ec646a1
correcting error
luke-iqt Jan 23, 2021
8400f31
adds depends on to EGI
luke-iqt Jan 23, 2021
fd50f27
Update flighttracker.py
luke-iqt Jan 23, 2021
b3364f4
Update egi.py
luke-iqt Jan 23, 2021
5167de6
Update egi.py
luke-iqt Jan 23, 2021
05ad5b5
added registration
luke-iqt Jan 23, 2021
79ff5a8
silly spelling
luke-iqt Jan 23, 2021
357e402
Update to include USB GPS
mchadwick-iqt Feb 1, 2021
81c695e
Update to Docker-Compose.yml
mchadwick-iqt Feb 3, 2021
d286a80
Update EGI Code
mchadwick-iqt Feb 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
added registration
  • Loading branch information
@luke-iqt
luke-iqt committed Jan 23, 2021
commit 05ad5b5a7dadb455d5bd2c48fb9d5648086f9d8b
4 changes: 2 additions & 2 deletions adsb-mqtt/adsb-mqtt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,12 +429,12 @@ def run(self):
timeHeartbeat = 0
self.__mqtt_bridge = mqtt_wrapper.bridge(host = self.__mqtt_broker, port = self.__mqtt_port, client_id = "skyscan-adsb-mqtt-%s" % (ID)) # TOOD: , user_id = args.mqtt_user, password = args.mqtt_password)
#threading.Thread(target = self.__publish_thread, daemon = True).start()

self.__mqtt_bridge.publish("skyscan/registration", "skyscan-adsb-mqtt-"+ID+" Registration", 0, False)

while True:
if timeHeartbeat < time.mktime(time.gmtime()):
timeHeartbeat = time.mktime(time.gmtime()) + 10
self.__mqtt_bridge.publish("Heartbeat", "EGI-"+ID+" Heartbeat", 0, False)
self.__mqtt_bridge.publish("skyscan/heartbeat", "skyscan-adsb-mqtt-"+ID+" Heartbeat", 0, False)
if not self.dump1090Connect():
continue
for data in self.dump1090Read():
Expand Down
4 changes: 3 additions & 1 deletion axis-ptz/camera.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,14 +245,16 @@ def main():
client.connect(args.mqtt_host) #connect to broker
client.loop_start() #start the loop
client.subscribe(args.mqtt_topic+"/#")
client.publish("skyscan/registration", "skyscan-axis-ptz-camera-"+ID+" Registration", 0, False)

#############################################
## Main Loop ##
#############################################
timeHeartbeat = 0
while True:
if timeHeartbeat < time.mktime(time.gmtime()):
timeHeartbeat = time.mktime(time.gmtime()) + 10
client.publish("Heartbeat", "skyscan-axis-ptz-camera-"+ID+" Heartbeat", 0, False)
client.publish("skyscan/heartbeat", "skyscan-axis-ptz-camera-"+ID+" Heartbeat", 0, False)
time.sleep(0.1)


Expand Down
2 changes: 1 addition & 1 deletion egi/egi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def on_disconnect(client, userdata, rc):
clientLocal.connect(broker_address) #connect to broker
clientLocal.loop_start() #start the loop
#clientLocal.subscribe(local_topic+"/#") #config/#")
clientLocal.publish(local_topic+"/registration","EGI-"+ID+" Registration")
clientLocal.publish("skyscan/registration","EGI-"+ID+" Registration")

#############################################
## Main Loop ##
Expand Down
1 change: 1 addition & 0 deletions pan-tilt-pi/camera.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ def main():
client.connect(args.mqtt_host) #connect to broker
client.loop_start() #start the loop
client.subscribe(args.mqtt_topic+"/#")
client.publish("skyscan/registration", "pan-tilt-pi-camera-"+ID+" Registration", 0, False)
#############################################
## Main Loop ##
#############################################
Expand Down
3 changes: 2 additions & 1 deletion tracker/flighttracker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ def __publish_thread(self):
while True:
if timeHeartbeat < time.mktime(time.gmtime()):
timeHeartbeat = time.mktime(time.gmtime()) + 10
self.__client.publish("Heartbeat", "skyscan-tracker-" +ID+" Heartbeat", 0, False)
self.__client.publish("skyscan/heartbeat", "skyscan-tracker-" +ID+" Heartbeat", 0, False)
if not self.__tracking_icao24:
time.sleep(1)
else:
Expand Down Expand Up @@ -388,6 +388,7 @@ def run(self):
print("start MQTT")
self.__client.subscribe(self.__plane_topic)
self.__client.subscribe("skyscan/egi")
slef.__client.publish("skyscan/registration", "skyscan-tracker-"+ID+" Registration", 0, False)
print("subscribe mqtt")
threading.Thread(target = self.__publish_thread, daemon = True).start()

Expand Down