From 761c3baaf10889dc5c5571ad86cebcab11292493 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ebbe=20Ba=C3=9F?= Date: Sat, 17 Feb 2024 16:59:54 +0100 Subject: [PATCH] added mac address back again MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ebbe Baß --- server/app.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server/app.py b/server/app.py index 74336c8..14113e1 100644 --- a/server/app.py +++ b/server/app.py @@ -115,7 +115,7 @@ def mqtt_publisher(): artNet = Artnet.Artnet(BINDIP = artnetBindIp, DEBUG = True, SHORTNAME = "PiXelTubeMaster", LONGNAME = "PiXelTubeMaster", PORT = 6454) while True: cur = db.cursor() - cur.execute("SELECT universe, dmx_address FROM tubes") + cur.execute("SELECT mac_address, universe, dmx_address FROM tubes") TUBE_INDEX = cur.fetchall() cur.close() print(TUBE_INDEX) @@ -128,14 +128,14 @@ def mqtt_publisher(): dmxPacket = artNetPacket.data # Create MQTT topic based on the universe and channel if TUBE_INDEX is not None: - for row in TUBE_INDEX: - dmx_address = int(row[1]) - if artNetPacket.universe == int(row[0]): + for index_row in TUBE_INDEX: + dmx_address = int(index_row[2]) + if artNetPacket.universe == int(index_row[1]): #Define RGB values per pixel p1_g, p1_b, p1_r, p2_g, p2_b, p2_r, p3_g, p3_b, p3_r, p4_g, p4_b, p4_r, p5_g, p5_b, p5_r, p6_g, p6_b, p6_r = dmxPacket[dmx_address], dmxPacket[dmx_address+1], dmxPacket[dmx_address+2], dmxPacket[dmx_address+3], dmxPacket[dmx_address+4], dmxPacket[dmx_address+5], dmxPacket[dmx_address+6], dmxPacket[dmx_address+7], dmxPacket[dmx_address+8], dmxPacket[dmx_address+9], dmxPacket[dmx_address+10], dmxPacket[dmx_address+11], dmxPacket[dmx_address+12], dmxPacket[dmx_address+13], dmxPacket[dmx_address+14], dmxPacket[dmx_address+15], dmxPacket[dmx_address+16], dmxPacket[dmx_address+17] # Pixel topics - p1_topic = "tube-"+str(row[0])+"/pixel_colors" + p1_topic = "tube-"+str(index_row[0])+"/pixel_colors" # Publish pixel topic 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])]))