work on python serial interface

arduino_code/onos_rf69_serial_transponder.pde

@@ -385,6 +385,17 @@ void loop()
     }
 
 
+
+
+    if (counter>serial_msg_lenght){  //prevent overflow
+      Serial.println(F("array_overflow---------------------------------"));
+      Serial.println(counter);
+      Serial.println(F("end"));
+      counter=0;
+      continue;     
+    }
+
+
     if (counter<2){
       counter=counter+1;
       continue;     

scripts_folder/Serial_connection_Handler.py

@@ -8,7 +8,7 @@
 import arduinoserial
 import os
 import time,string
-#from globalVar import *           # import parameter globalVar.py
+from globalVar import *           # import parameter globalVar.py
 
 exit=0
 
@@ -22,9 +22,9 @@ class Serial_connection_Handler():
   def __init__(self):
 
     self.status=self.connectToPort()
-
+    self.working=1
     i=0
-    while self.status ==0 :  #while port is not connected retry to connect
+    while (self.status ==0) :  #while port is not connected retry to connect
       self.status=self.connectToPort()
       if self.status==1:
         break
@@ -34,6 +34,12 @@ def __init__(self):
       if i>120:        #after 120 tries i increase the time between the tries
         time.sleep(60) 
 
+      if i >200:
+        if (searchForSerialCable!="null"):
+          print "error serial connection, no serial ports found"
+          self.working=0
+          return(-1)
+
 
 
 

scripts_folder/arduinoserial.py

@@ -154,7 +154,8 @@ def __init__(self, serialport, bps):
     self.incomingBuffer=''
     self.removeFromInBuffer=''
     try:
-      self.usb = open(self.port, 'rw')
+      self.usbR = open(self.port, 'rw')
+      self.usbW = open(self.port, 'w')
       self.status=1
     except:
       print "no device"+self.port+"found"
@@ -183,7 +184,7 @@ def read_data0(self):   # read  function
         print "timeout"  
         return(-1)  #timeout
       try:
-        byte = self.usb.read(1)
+        byte = self.usbR.read(1)
       except:
         byte=-1
         self.status=0
@@ -269,7 +270,7 @@ def read_data(self):   # thread  function
             if self.exit==1:
               break
             try:
-              byte = self.usb.read(1)
+              byte = self.usbR.read(1)
             except:
               byte=-1
               self.status=0
@@ -438,13 +439,14 @@ def write0(self, str):
 
   def write(self, data):
     print "i write:"+data
-    with open(self.port, 'w') as f:   #read the pin status
-      f.write(data+"\n")
+    #with open(self.port, 'w') as f:   #read the pin status
+    self.usbW.write(data+"\n")
     self.waitForData(10)
-   
+
     tmp=self.incomingBuffer
     self.removeFromInBuffer=tmp
 
+
     return(tmp)    
 
 
@@ -484,6 +486,8 @@ def close(self):
     print "class arduinoserial destroyed"
     try:
       os.close(self.fd)
+      os.close(self.usbW)     
+      os.close(self.usbR)     
     except:
       print "tried to close serial port"
 

scripts_folder/conf.py

@@ -37,7 +37,7 @@
 global scenarioDict
 
 
-router_hardware=hardwareModelDict[router_hardware_type]
+router_hardware=hardwareModelDict[router_hardware_type]   #router_hardware_type is in globalVar.py
 
 
 hardware_labels=hardwareModelDict.keys()

scripts_folder/globalVar.py

@@ -93,8 +93,8 @@
 hardwareModelDict={}
 
 #read_onos_sensor_enabled=1
-router_sn="RouterGL0000"
-router_hardware_type="RouterGL" #select the type of hardware
+router_sn="RouterGA0000"
+router_hardware_type="RouterGA" #select the type of hardware
 router_hardware_fw_version="5.14"
 gui_webserver_port=80
 service_webserver_port=81
@@ -1635,6 +1635,17 @@
 hardwareModelDict["RouterGL"]["pin_mode"]["digital_output"]={"button":[(18),(22)]}
 
 
+hardwareModelDict["RouterGA"]={"hwName":"RouterGA","max_pin":5,"hardware_type":"gl.inet_with_arduino2009","pin_mode":{},"timeout":180}
+hardwareModelDict["RouterGA"]["pin_mode"]["sr_relay"]={"socket":[(20,19)]}
+hardwareModelDict["RouterGA"]["pin_mode"]["digital_input"]={"d_sensor":[(21)]}
+hardwareModelDict["RouterGA"]["pin_mode"]["digital_output"]={"button":[(18),(22)]}
+
+hardwareModelDict["ProminiS"]={"hwName":"ProminiS","max_pin":13,"hardware_type":"arduino2009_serial","pin_mode":{},"timeout":180}
+hardwareModelDict["ProminiS"]["pin_mode"]["sr_relay"]={"socket":[(20,19)]}
+hardwareModelDict["ProminiS"]["pin_mode"]["digital_input"]={"d_sensor":[(21)]}
+hardwareModelDict["ProminiS"]["pin_mode"]["digital_output"]={"button":[(5),(6)]}
+
+
 hardwareModelDict["ProminiA"]={"hwName":"ProminiA","max_pin":18,"hardware_type":"arduino_promini","pin_mode":{},"timeout":"never"}
 hardwareModelDict["ProminiA"]["pin_mode"]["digital_input"]={"d_sensor":[(2),(3),(4)]}
 hardwareModelDict["ProminiA"]["pin_mode"]["digital_output"]={"button":[(6),(7),(8)]}
@@ -1895,5 +1906,8 @@ def getErrorTimeString():
   error_count=error_count+1 
   return(str(datetime.datetime.today().hour)+":"+str(datetime.datetime.today().minute)+"n:"+str(error_count) )
 
-
+def get_ip_address():
+    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    s.connect(("8.8.8.8", 80))
+    return s.getsockname()[0]
 

scripts_folder/router_handler.py

@@ -26,7 +26,7 @@
 
 from globalVar import *
 from node_query_handler import *
-
+import arduinoserial,Serial_connection_Handler
 
 
 # Note for raspberry users, the GPIO numbers that you program here refer to the pins
@@ -86,7 +86,11 @@ def __init__(self,hardwareModelDict,router_sn):
 
       if self.__hardware_type=="gl.inet_with_arduino2009":
         self.arduino_used=1
-        arduino=arduino_handler.ArduinoHandler()
+        self.bash_pin_enable=1
+
+
+      if self.__hardware_type=="pc_with_arduino2009":
+        self.arduino_used=1
         self.bash_pin_enable=1
 
 
@@ -97,6 +101,20 @@ def __init__(self,hardwareModelDict,router_sn):
         self.bash_pin_enable=0   #disable embedded pins because the harware hasn't got any
         print "no embedded IO pins founded , are you running onos on a pc?"
 
+
+      if self.arduino_used==1:
+        self.serial_communication=Serial_connection_Handler.Serial_connection_Handler()
+
+        if self.serial_communication.working==1:
+          print "serial communication working"
+          data=self.serial_communication.status.write('onos_d06v000s0001f001_#]')
+          data=self.serial_communication.status.write('onos_d06v001s0001f001_#]')          
+
+          #todo: read nodeFw from the serial arduino node..
+          priorityCmdQueue.put( {"cmd":"createNewNode","nodeSn":"ProminiS0001","nodeAdress":"1","nodeFw":"5.23"})  
+
+
+
       error_number=0   #count how many errors..
       if self.bash_pin_enable==1:
 
@@ -342,10 +360,12 @@ def composeChangeNodeOutputPinStatusQuery(self,pinNumbers,node_obj,objName,statu
 
 
 
-
+      if node_address=="1":#  arduino serial node
+        return(query)
 
       print "query to remote node:"+query
 
+
 
       queryToNodeQueue.put({"node_serial_number":node_serial_number,"address":address,"query":query,"objName":objName,"status_to_set":status_to_set,"user":user,"priority":priority,"mail_report_list":mail_report_list})
 
@@ -428,7 +448,6 @@ def outputWrite(self,node_serial_number,pinList,statusList,node_obj,objName,prev
           print "the router has the pin io enabled"
 
           i=0
-
           print "len pinlist="+str(len(pinList))
           while i <len(pinList) :
             pinNumber=pinList[i]
@@ -492,42 +511,60 @@ def outputWrite(self,node_serial_number,pinList,statusList,node_obj,objName,prev
 
 
       if ((str(node_address))=="1"): #a local arduino selected   not implemented yet 
-        print "i write to/from a remote node selected"
+        print "i write to serial arduino node"
         #self.makeChangeWebObjectStatusQuery(objName,statusToSet)   #banana to remove
-        if ((self.arduino_used==1)&(node_address=="1")):  #check if arduino is enabled correctly and is selected with 1
-          print "digital write used on arduino"
-          if len(pinList) >1: 
-            print "i have to set more than a pin at the same time"
-
-            packet_list=[]
-
-            i=0 
-            pinList=pinList.sort() #order the list by pin number
-            previus_section=-1
-            section=previus_section
-            while (i<len(pinList)):
-              section=node_obj.getNodeSectionStatusByPin(pinList[i])[0]
-              if(section!=previus_section):
-                previus_section=section
-                section_status=node_obj.getNodeSectionStatusByPin(pinList[i])[1]#get the section status 
-                packet_list.append(section,section_status)
-              i=i+1
-              #now inside  packet_list i have a tuple 
-              #where the first element is the pin byte section and the second the data is the status byte for that section
-            i=0
-            for a in packet_list:  #write to arduino all the registers
-              arduino.digitalWriteSection(node_address,a[0],a[1],objName,previous_status,statusToSet)
 
 
-          else: #only one pin to set           
-            arduino.digitalWrite(node_address,pinList[0],statusList[0],objName,previous_status,statusToSet)#write to arduino to set a pin        
+        if self.serial_communication.working!=1: 
+          print "error no serial cable"
+          errorQueue.put("error no serial cable")  
+          return(-1)
+
+        if (output_type=="sr_relay"):
+          if (len(pinList)==2):
+            query=self.composeChangeNodeOutputPinStatusQuery(pinList,node_obj,objName,statusList[0],node_serial_number,node_address,output_type,user,priority,mail_report_list)
+
+            data=self.serial_communication.status.write(query)
+            print data
+
+
+            return(1)
+          else:
+            print "error number of pins !=2"
+            errorQueue.put("error number of pins !=2" ) 
+            return(-1)
+
+        i=0 
+        while i <len(pinList) : 
+          #print "pinnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn"+str(i)
+          pinNumber=pinList[i]
+          tmp_status_to_set=statusList[i]
+          if (pinNumber not in node_obj.getUsedPins()):
+            print 'error the  pin value is out of range of node :'+remoteNodeHwModel+"pin_number="+str(pinNumber)
+            errorQueue.put('error the  pin value is out of range of node :'+remoteNodeHwModel+"pin_number="+str(pinNumber) )
+            print "status to set="+str(tmp_status_to_set)
+            errorQueue.put("status to set="+str(tmp_status_to_set) )
+            print str(pinNumber)
+            errorQueue.put(str(pinNumber))
+            return(-1)
+
+
+
+          query=self.composeChangeNodeOutputPinStatusQuery(pinNumber,node_obj,objName,tmp_status_to_set,node_serial_number,node_address,output_type,user,priority,mail_report_list)  
+
+          data=self.serial_communication.status.write(query)
+          print data
+
 
+          priorityCmdQueue.put( {"cmd":"setSts","webObjectName":objName,"status_to_set":statusToSetWebObject,"write_to_hw":0,"user":user,"priority":priority,"mail_report_list":mail_report_list })
+          return(1) 
 
+          print "received_data_from_serial:"+data
 
       else: #str(node_address))!="1" and !=0 --->    remote node selected
         print "i write to/from a remote node with address:"+str(node_address)
 
-        i=0
+
         print "len address="+str(len(node_address))
         print "len pinlist="+str(len(pinList))
 
@@ -540,8 +577,8 @@ def outputWrite(self,node_serial_number,pinList,statusList,node_obj,objName,prev
             print "error number of pins !=2"
             errorQueue.put("error number of pins !=2" ) 
             return(-1)
-
-        while i <len(pinList) :
+        i=0
+        while i <len(pinList) : 
           pinNumber=pinList[i]
           tmp_status_to_set=statusList[i]
           if (pinNumber not in node_obj.getUsedPins()):

scripts_folder/tester_serial.py

@@ -9,9 +9,9 @@
 for a in range (0,20):
   time.sleep(0.1)  
 #serial_communication.status.write0('dw131xxxxxxxxxxxxxxxxxxxxxx')
-  data=serial_communication.status.write('onos_d05v001s0001f000_#]')
+  data=serial_communication.status.write('onos_d05v001s0001f001_#]')
   time.sleep(0.5)  
-  data=serial_communication.status.write('onos_d05v000s0001f000_#]')
+  data=serial_communication.status.write('onos_d05v000s0001f001_#]')
 
 #data=serial_communication.status.read_data0()
   print(data)

scripts_folder/webserver.py

@@ -2709,6 +2709,7 @@ def do_GET(self):
 
 
             #from here to the end the login is required , the above part is for the onos node use.
+            current_username="nobody"
             if (login_required==1):
               current_username=getUserFromIp(self.client_address[0])
 
@@ -3610,8 +3611,8 @@ def do_GET(self):
 
         except Exception, e  :
             self.send_error(404,'File Not Found: %s' % self.path)
-            print "404,'File Not Found"+" e:"+str(e.args)
-            errorQueue.put("404,'File Not Found"+" e:"+str(e.args) ) 
+            print "error 404 File Not Found"+" e:"+str(e.args)
+            errorQueue.put("err 404 File Not Found"+" e:"+str(e.args) ) 
 
 
 
@@ -5561,7 +5562,7 @@ def nodeTcpServer():
       sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
   #    sock.setsockopt(socket.IPPROTO_TCP,socket.TCP_NODELAY, True) #disable_nagle_algorithm'):   #http://pydoc.net/Python/mrs-mapreduce/0.9/mrs.http/  https://aboutsimon.com/index.html%3Fp=85.html
 
-      server_address = (onos_center_internal_ip, service_webserver_port) #stored in globalVar.py
+      server_address = (get_ip_address(), service_webserver_port) #stored in globalVar.py
       print >>sys.stderr, 'starting up on %s port %s' % server_address
 
 
@@ -5736,7 +5737,7 @@ def main():
 
 
 
-        Serial_connection_Handler serial_communication
+
         w1 = threading.Thread(target=hardwareHandlerThread)
         w1.daemon = True  #make the thread a daemon thread
         w1.start()