From f253fddc41e7828ea3a51dbe0ff8473db0792ac5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ebbe=20Ba=C3=9F?= <ebbe.bass>
Date: Sun, 18 Feb 2024 17:54:11 +0100
Subject: [PATCH] test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Ebbe Baß <ebbe.bass>
---
 server/app.py | 33 +++++++++++----------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/server/app.py b/server/app.py
index 99b3469..29b70c0 100644
--- a/server/app.py
+++ b/server/app.py
@@ -7,8 +7,7 @@ import os
 from getmac import get_mac_address
 import time
 import sys
-from multiprocessing import Process, Pipe
-from ast import literal_eval
+from multiprocessing import Process
 
 app = Flask(__name__)
 
@@ -109,23 +108,18 @@ def connect_mqtt():
     client.connect("localhost", 1883)
     return client
 
-def mqtt_publisher():
-    # Create and start a thread for each universe
-    db = connect(
-        host=config['mysql']['host'],
-        user=config['mysql']['user'],
-        password=config['mysql']['password'],
-        database=config['mysql']['database'],
-    )
+if __name__ == "__main__":
+    flask_thread = Process(target=flask_api)
+    flask_thread.start()
 
-    db.autocommit(True)
+    # Create and start a thread for each universe
     mqtt_client = connect_mqtt()
     artnetBindIp = get_eth0_ip()
     artNet = Artnet.Artnet(BINDIP = artnetBindIp, DEBUG = True, SHORTNAME = "PiXelTubeMaster", LONGNAME = "PiXelTubeMaster", PORT = 6454)
     while True:
         cur = db.cursor()
         cur.execute("SELECT mac_address, universe, dmx_address FROM tubes")
-        tube_index = cur.fetchall()
+        TUBE_INDEX = cur.fetchall()
         cur.close()
         try:
             # Gets whatever the last Art-Net packet we received is
@@ -135,8 +129,10 @@ def mqtt_publisher():
                 #Checks to see if the current packet is for the specified DMX Universe
                 dmxPacket = artNetPacket.data
                 # Create MQTT topic based on the universe and channel
-                if tube_index is not None:
-                    for index_row in tube_index:
+                if TUBE_INDEX is not None:
+                    print(TUBE_INDEX)
+                    for index_row in TUBE_INDEX:
+                        print(index_row)
                         if artNetPacket.universe == int(index_row[1]):
                             dmx_address = int(index_row[2])
                             #Define RGB values per pixel
@@ -149,11 +145,4 @@ def mqtt_publisher():
                             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:
             artNet.close()
-            sys.exit()
-
-
-if __name__ == "__main__":
-    publisher_thread = Process(target=mqtt_publisher)
-    publisher_thread.start()
-    flask_thread = Process(target=flask_api)
-    flask_thread.start()
\ No newline at end of file
+            sys.exit()
\ No newline at end of file