diff --git a/server/app.py b/server/app.py index 57f4a0a..30c66ad 100644 --- a/server/app.py +++ b/server/app.py @@ -113,8 +113,6 @@ def start_mqtt_publishers(): mqtt_client = connect_mqtt() artnetBindIp = get_eth0_ip() artNet = Artnet.Artnet(BINDIP = artnetBindIp, DEBUG = True, SHORTNAME = "PiXelTubeMaster", LONGNAME = "PiXelTubeMaster", PORT = 6454) - tuple_ip = (str(get_eth0_ip()), 6454) - artNet.art_pol_reply(tuple_ip) try: while True: try: diff --git a/server/exampleReceiver.py b/server/exampleReceiver.py index 78fcf44..3d46867 100644 --- a/server/exampleReceiver.py +++ b/server/exampleReceiver.py @@ -3,40 +3,21 @@ import sys import python_artnet as Artnet import os -def get_eth0_ip(): - try: - # Get the IP address of the eth0 interface - eth0_ip = str(os.system("ip -4 -o addr show eth0 | awk '{print $4}' | cut -d '/' -f 1 ")) - return eth0_ip - except (KeyError, IndexError, OSError) as e: - print(f"Error getting eth0 IP: {e}") - exit +artnet = Artnet.Artnet() -### ArtNet Config ### -artnetBindIp = get_eth0_ip() -### Art-Net Setup ### -# Sets debug in Art-Net module. -# Creates Artnet socket on the selected IP and Port -artNet = Artnet.Artnet(BINDIP = artnetBindIp, DEBUG = False, SHORTNAME = "PiXelTubeMaster", LONGNAME = "PiXelTubeMaster", PORT = 6454) -tuple_ip = (str(get_eth0_ip()), 6454) -# artNet.art_pol_reply(tuple_ip) while True: try: - # Gets whatever the last Art-Net packet we received is - artNetPacket = artNet.readPacket() - # Make sure we actually *have* a packet + + artNetPacket = artnet.readPacket() if artNetPacket is not None and artNetPacket.data is not None: if artNetPacket.universe == 0: - print("YES") + print("Universe was the specified universe: "+str(artNetPacket.universe)) else: - print("Universe: "+str(artNetPacket.universe)) - # Stores the packet data array - # dmxPacket = artNetPacket.data - + print("Universe was not the specified: "+str(artNetPacket.universe)) + else: + print("Packet was none") except KeyboardInterrupt: + artnet.close() break - -# Close the various connections cleanly so nothing explodes :) -artNet.close() -sys.exit() \ No newline at end of file + time.sleep(0.01) \ No newline at end of file