ebbe.bass
/
PiXelTubes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added queue system for mem share between publisher and ti updater 

Signed-off-by: Ebbe Baß <ebbe.bass>
main
Ebbe Baß 2024-02-18 00:41:47 +01:00
parent 3a5ad1e6af
commit b2c8dc5d83
1 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
server/app.py
View File

@ -7,7 +7,7 @@ import os
from getmac import get_mac_address from getmac import get_mac_address
import time import time
import sys import sys
from multiprocessing import Process from multiprocessing import Process, Queue
import asyncio import asyncio
app = Flask(__name__) app = Flask(__name__)
@ -109,19 +109,13 @@ def connect_mqtt():
client.connect("localhost", 1883) client.connect("localhost", 1883)
return client return client
if __name__ == "__main__": def mqtt_publisher(data_queue):
flask_thread = Process(target=flask_api)
flask_thread.start()
# Create and start a thread for each universe # Create and start a thread for each universe
mqtt_client = connect_mqtt() mqtt_client = connect_mqtt()
artnetBindIp = get_eth0_ip() artnetBindIp = get_eth0_ip()
artNet = Artnet.Artnet(BINDIP = artnetBindIp, DEBUG = True, SHORTNAME = "PiXelTubeMaster", LONGNAME = "PiXelTubeMaster", PORT = 6454) artNet = Artnet.Artnet(BINDIP = artnetBindIp, DEBUG = True, SHORTNAME = "PiXelTubeMaster", LONGNAME = "PiXelTubeMaster", PORT = 6454)
while True: while True:
cur = db.cursor() tube_index = data_queue.get()
cur.execute("SELECT mac_address, universe, dmx_address FROM tubes")
TUBE_INDEX = cur.fetchall()
cur.close()
try: try:
# Gets whatever the last Art-Net packet we received is # Gets whatever the last Art-Net packet we received is
artNetPacket = artNet.readPacket() artNetPacket = artNet.readPacket()
@ -130,8 +124,8 @@ if __name__ == "__main__":
#Checks to see if the current packet is for the specified DMX Universe #Checks to see if the current packet is for the specified DMX Universe
dmxPacket = artNetPacket.data dmxPacket = artNetPacket.data
# Create MQTT topic based on the universe and channel # Create MQTT topic based on the universe and channel
if TUBE_INDEX is not None: if tube_index is not None:
for index_row in TUBE_INDEX: for index_row in tube_index:
if artNetPacket.universe == int(index_row[1]): if artNetPacket.universe == int(index_row[1]):
dmx_address = int(index_row[2]) dmx_address = int(index_row[2])
#Define RGB values per pixel #Define RGB values per pixel
@ -144,4 +138,24 @@ if __name__ == "__main__":
mqtt_client.publish(p1_topic, str([str([p1_r, p1_g, p1_b]), str([p2_r, p2_g, p2_b]), str([p3_r, p3_g, p3_b]), str([p4_r, p4_g, p4_b]), str([p5_r, p5_g, p5_b]), str([p6_r, p6_g, p6_b])])) mqtt_client.publish(p1_topic, str([str([p1_r, p1_g, p1_b]), str([p2_r, p2_g, p2_b]), str([p3_r, p3_g, p3_b]), str([p4_r, p4_g, p4_b]), str([p5_r, p5_g, p5_b]), str([p6_r, p6_g, p6_b])]))
except KeyboardInterrupt: except KeyboardInterrupt:
artNet.close() artNet.close()
sys.exit() sys.exit()
def tube_index_updater(data_queue):
try:
cur = db.cursor()
cur.execute("SELECT mac_address, universe, dmx_address FROM tubes")
tube_index = cur.fetchall()
cur.close()
data_queue.put(tube_index)
except Exception as e:
print(e)
if __name__ == "__main__":
data_queue = Queue()
ti_updater_thread = Process(target=tube_index_updater(), args=(data_queue, ))
ti_updater_thread.start()
publisher_thread = Process(target=mqtt_publisher, args=(data_queue, ))
publisher_thread.start()
flask_thread = Process(target=flask_api)
flask_thread.start()