소스 검색

refactor and fix

micha 3 달 전
부모
커밋
e16365b987
2개의 변경된 파일26개의 추가작업 그리고 8개의 파일을 삭제
  1. 16 4
      tool/TK-Nodescanner.py
  2. 10 4
      tool/nodescan.py

+ 16 - 4
tool/TK-Nodescanner.py

@@ -21,9 +21,18 @@ title = "TK-ArtNet-Nodscaner"
 sys.stdout.write("\x1b]2;"+title+"\x07")
 
 node_list = []
-def load(event):
+def load(event=None):
     print()
     print("load()")
+    #time.sleep(1)
+
+    for n in node_list:
+        print("-",n)
+    print("+++++")
+
+    if len( li_nodes.curselection() ) < 1:
+        print("NO sel: li_nodes.curselection()")
+        return 0
     sel = int( li_nodes.curselection()[0] )
     print("li_nodes.get")
     try:
@@ -87,8 +96,8 @@ def poll(delay=1,ip=""):
     
     clear_entry_ip()
     clear_node()
-    time.sleep(delay)
-    time.sleep(0.5)
+    #time.sleep(delay)
+    #time.sleep(0.5)
     
 
     if not ip:
@@ -96,6 +105,8 @@ def poll(delay=1,ip=""):
 
     b_scan.insert("end", "ArtNetPoll -> "+str(ip)+"\n")
     nodescan.ArtNet_poll(ip)    
+    time.sleep(1)
+    load()
     #return 
     #try:
     #    nodescan.poll()
@@ -155,6 +166,7 @@ def __scan():
         old_tick = new_tick
         #print("node",nodes)
         if nodes:
+            print(len(nodes))
             li_node_scroll = li_nodes.yview()
             
             #clear_node()
@@ -758,7 +770,7 @@ def X():
         
         if z % 10 == 0:
             pass
-            print("----")
+            print("----#")
             #MSG["text"] = ""
             #MSG["bg"] = "grey"
             #pass#print("node count",len(nodes),rx.tick())

+ 10 - 4
tool/nodescan.py

@@ -251,11 +251,11 @@ class ArtNetNodes():
                         node["REFRESHSTAMP"] = time.time()
                         update_node = 1
                 update_node = 0
-            print("x-node:",update_node,add_node)                
+            #print("x-node:",update_node,add_node)                
             if not update_node: # ADD NEW NODE
                 node = add_node
                 if node:
-                    print("add_node",node)
+                    #print("add_node",node)
                     node["BOOT"] = BOOT
                     info = node["MAC"],node["IP"].ljust(16," "),[node["SwIn"],node["SwOut"],node["PortTypes"]]
                     
@@ -266,7 +266,11 @@ class ArtNetNodes():
                     self.__tick += 1
                     self.__nodes += [node]
                   
-            
+            for node in self.__nodes:
+                print("Node: ")
+                for k,v in node.items():
+                    print(" -",[k,v])
+                print("")
         finally:
             #print("release lock")
             self.__lock.release()
@@ -710,6 +714,7 @@ def node_cmd_recive():
 #send_node_cmd(ip=(255,255,255,255),ip2=(255,255,255,255),cmd="DMX OUT STORE")
 #exit()
 #   
+node_list2 = []
 if __name__ == "__main__":        
 
     thread.start_new_thread(node_cmd_recive, () )
@@ -724,7 +729,8 @@ if __name__ == "__main__":
         
         nodes = rx.get()
         #print(len(nodes))
-        
+        node_list2.extend(nodes)
+        print(node_list2)
         if z % 10 == 0:
             print()
             pass