add global config for start_ASP.sh

ArtNetProcessor.py

@@ -767,7 +767,7 @@ class Socket():
         if not self.__poll:
             try:
                 self.__data, self.__addr = self.sock.recvfrom(self.__port)
-
+                
 
                 data, addr = (self.__data,self.__addr)
                 self.host = addr[0]
@@ -781,6 +781,9 @@ class Socket():
                     pass#print( "======E09823" , e)
                 univ = self.head[6]/255 # /512  # * 512
                 self.univ = int(univ)
+                opcode=artnet_get_opcode(head)
+                #if "2.0.0.11" not in addr:
+                #    print("PKG3",addr,"univ:",self.univ, opcode,len(rawdmx))
 
                 if self.host.startswith("127."): #allways recive localhost on port 
                     self.__poll = 1
@@ -820,7 +823,7 @@ class Socket():
             self.__poll = 0
 
             data, addr = (self.__data,self.__addr)
-            #print( self.univ,self.head)
+            #print("PKG", self.univ,self.head)
 
             self.dmx  = unpack_art_dmx(data)
 
@@ -844,7 +847,9 @@ class ArtNetNode():
        "Art-Net™ Designed by and Copyright Artistic Licence Holdings Ltd"
        https://art-net.org.uk/
     """
+
     def __init__(self, to="10.10.10.255",univ=7,port=6454):
+        print("\n"+self.__doc__+"\n")
         try: 
             univ = int(univ)
         except:
@@ -933,6 +938,21 @@ def artnet_test():
     artnet = ArtNetNode()
     artnet._tes_frame()
 
+def artnet_get_opcode(head):
+    #print([head]) #[9:10])
+    opcode=0x0000
+    name ="unkown"
+    try:
+        opcode=hex(struct.unpack('<h', head[8:10])[0])
+    except:
+        print("opcode error",[head])
+    if opcode == '0x5000':
+        name = "ArtDMX"
+    elif opcode == '0x2000':
+        name = "ArtPoll"
+    elif opcode == '0x2100':
+        name = "ArtPollReplay"
+    return (name,opcode)
 # ============================================================   
 # helper =====================================================   
 # ============================================================   

netns/exec

@@ -23,6 +23,10 @@ parser.add_option("--id",  dest="id",
 
 parser.add_option("--cmd", dest="cmd",
                   help="cmd to execute in network-namespace")
+
+parser.add_option("--noexit",
+                  action='store_true')
+
 (options, args) = parser.parse_args()
 print("option",options)
 #print( dir(parser))
@@ -41,6 +45,10 @@ print(cmd)
 cmd2=cmd.format(user=username,id=options.id,cmd=options.cmd)
 print(cmd2)
 os.system(cmd2)
-os.system("reset")
-os.system("echo 'reset ok'")
+
+if options.noexit:
+    pass
+else:
+    os.system("reset")
+    os.system("echo 'reset ok'")
 

start_ASP.sh

@@ -3,4 +3,28 @@ echo "sleep 5"
 path="/opt/LibreLight"
 netns=$(ip netns identify $$)
 
-python3 $path/ASP/ArtNetProcessor.py --recive 10. --sendto 2.255.255.255 netns=$netns
+ARTNET_INPUT_NET="10."
+ARTNET_NODE_NET="2.255.255.255"
+
+CONFIG="$HOME/LibreLight/ASP.conf"
+if [ -f $CONFIG ] ; then
+    echo ""
+    echo "READ CONFIG FILE: $CONFIG"
+    KEY="ARTNET_NODE_NET="
+    X=$(grep "^$KEY" $CONFIG | cut -d "=" -f 2 | tail -n1)
+    if [ "x" != "x$X" ] ; then 
+        echo "-- OK $KEY $X"
+        ARTNET_NODE_NET="$X"
+    fi
+
+    KEY="ARTNET_INPUT_NET="
+    X=$(grep "^$KEY" $CONFIG | cut -d "=" -f 2 | tail -n1)
+    if [ "x" != "x$X" ] ; then 
+        echo "-- OK $KEY $X"
+        ARTNET_INPUT_NET="$X"
+    fi
+    echo "CONFIG OK: $CONFIG"
+    echo ""
+fi
+
+python3 $path/ASP/ArtNetProcessor.py --recive $ARTNET_INPUT_NET --sendto $ARTNET_NODE_NET netns=$netns