[TESTED] ouput, conections, fetch v

Control_Interface/controlInterface.py

@@ -17,31 +17,29 @@ class controlInterface:
         for ip in self.__listUsedIp:
             self.__listIp.remove(ip)
     
-    #create a NHR9410 object
-    def newNhr9410(self):
+    #create a NHR object 
+    def newNhr(self, nhr):
+        if(nhr == "9410"):
             new = NHR9410()
+        elif nhr == "9430":
+            new = NHR9430()
+        else:
+            return -1
         new.locateIp(self.__listIp)
         
         usedIp = new.getIp()
+        print("usedIP:" + str(usedIp))
         try:
             self.__listIp.remove(usedIp)
             self.__listUsedIp.append(usedIp)
+            if(nhr == "9410"):
                 self.__nhr9410.append(new)
-            print("herer")
-        except:
-            print("Any IP address matched")
-    
-    #create a NHR9430 object
-    def newNhr9430(self):
-        new = NHR9430()
-        usedIp = new.locateIp(self.__listIp)
-        #print(usedIp)
-        try:
-            self.__listIp.remove(usedIp)
-            self.__listUsedIp.append(usedIp)
+            elif nhr == "9430":
                 self.__nhr9430.append(new)
+            else:
+                return -1
         except:
-            print("Any IP adress matched")
+            print("Any IP address matched")
 
     def getNhr9410(self):
         return self.__nhr9410

NHR9400series/NHR9400.py

@@ -9,29 +9,33 @@ class NHR9400:
         self.__name = name
         self.__s = socket.socket(socket.AF_INET,socket.SOCK_STREAM)
         self.__s.settimeout(1)
+        self.__ip = ""
 
 ################################# Configurations ######################################################
     def locateIp(self, clients = []):
         for client in clients:
             try:
+
                 self.__s  = socket.socket(socket.AF_INET,socket.SOCK_STREAM)
-                self.__s.settimeout(1)
                 self.__s.connect((client, 5025))
                 self.__s.send("SYST:RWL\n".encode()) #Command to activate remote control and locking the touchscreen
                 self.__s.send("*IDN?\n".encode())
                 msg = self.__s.recv(1024)
                 recv = self.receiveString(msg)
-                if recv.find("NH Research," + self.__name) != -1: #if find this subtring 
-                    print("o cliente encontrado: " + client)
+                id = "NH Research," + str(self.__name)
+                if recv.find(id) != -1: #if find this subtring 
                     self.__ip = client
                     print(self.__ip)
                     print("Connection successfully")
                     break
                 else:
-                    print("Connection failed 1")
                     self.__s.close()
             except:
                 print("Connection failed 2")
+
+    def getIp(self):
+        return self.__ip
+
     #chose a mode with the instrument will run, check the manual to see all modes.
     def configMode(self, mode):
         if mode < 0 and mode > 16:
@@ -88,13 +92,7 @@ class NHR9400:
         self.checkErrors()
     #Function that receives messages back and transform it in a string
     def receiveString(self,recv):
-        print("fail6")
-        print("fail8")
-        recv = bytes(recv)
-        recv = recv.decode("UTF-8")
-        recv = recv.rstrip('\n')
-        recv = recv.rstrip('\x00')
-        print("sucess")
+        recv = refineOutput().byteToString(recv)
         return recv
 
     #Function that receives messages back and transform it in a float
@@ -112,8 +110,6 @@ class NHR9400:
         return self.receive()
 
     def close(self):
-        print(self.__ip)
-        self.__s.connect((self.__ip,5025))
         self.__s.send("SYST:LOC\n".encode())
         self.__s.close()
     # Controle do relé de saída do hardware (LIGAR OU DESLIGAR)
@@ -153,30 +149,39 @@ class NHR9400:
         self.__s.send(("SOUR:POW " + str(freq) + "\n").encode())
     #Fetch the average voltage of all channels
     def getVoltage(self):
-        value = self.__s.send("FETC:VOLT?\n".encode())
+        self.__s.send("FETC:VOLT?\n".encode())
+        value = self.__s.recv(1024)
         return self.receiveFloat(value)
     #fetch individual value of voltage of one channel
     def getVoltageA(self):
-        value = self.__s.send("FETC:VOLT:APHase?\n".encode())
+        self.__s.send("FETC:VOLT:APHase?\n".encode())
+        value = self.__s.recv(1024)
         return self.receiveFloat(value)
     def getVoltageB(self):
-        value = self.__s.send("FETC:VOLT:BPHase?\n".encode())
+        self.__s.send("FETC:VOLT:BPHase?\n".encode())
+        value = self.__s.recv(1024)
         return self.receiveFloat(value)
     def getVoltageC(self):
-        value = self.__s.send("FETC:VOLT:CPHase?\n".encode())
+        self.__s.send("FETC:VOLT:CPHase?\n".encode())
+        value = self.__s.recv(1024)
         return self.receiveFloat(value)
         
     #Fetch the average power of all channels
     def getPower(self):
-        value = self.__s.send("FETC:POW?\n".encode())
+        self.__s.send("FETC:POW?\n".encode())
+        value = self.__s.recv(1024)
         return self.receiveFloat(value)
     #fetch individual value of Power of one channel
     def getPowerA(self):
-        value = self.__s.send("FETC:POW:APHase?\n".encode())
+        self.__s.send("FETC:POW:APHase?\n".encode())
+        value = self.__s.recv(1024)
         return self.receiveFloat(value)
     def getPowerB(self):
-        value = self.__s.send("FETC:POW:BPHase?\n".encode())
+        self.__s.send("FETC:POW:BPHase?\n".encode())
+        value = self.__s.recv(1024)
         return self.receiveFloat(value)
+        
     def getPowerC(self):
-        value = self.__s.send("FETC:POW:CPHase?\n".encode())
+        self.__s.send("FETC:POW:CPHase?\n".encode())
+        value = self.__s.recv(1024)
         return self.receiveFloat(value)

NHR9400series/NHR9410.py

@@ -3,12 +3,7 @@ from NHR9400series.NHR9400 import NHR9400
 class NHR9410(NHR9400):
 
     def __init__(self):
-        super().__init__("NHR9410")
-        self.__ip = ""
-    
-    def getIp(self):
-        return self.__ip
-
+        super().__init__("9410")
 
 
     

NHR9400series/NHR9430.py

@@ -3,8 +3,8 @@ from NHR9400series.NHR9400 import NHR9400
 class NHR9430(NHR9400):
 
     def __init__(self):
-        super().__init__("NHR9430")
-        self.__ip = ""
+        super().__init__("9430")
+        
 
     #Command sets the loading features <loading mode> for a 9430 AC output Query returns the loading features enabled on a 9430
     #Command is only accepted if the instrument is a 9430, with AC outputs mode, and in an OFF state Other models & modes: This command is invalid
@@ -64,8 +64,6 @@ class NHR9430(NHR9400):
         value = self.__s.send("FETC:CURR:CPHase?\n".encode())
         return self.receiveFloat(value)
     
-    def getIp(self):
-        return self.__ip
 
 
     

UtilitiesRei/refineOutput.py

 class refineOutput:
     
     def byteToFloat(self, recv):
+        print("recv:",recv)
+        recv = bytes(recv)
         recv = recv.decode("UTF-8")
-        recv = recv.rstrip("\n\x00")
+        recv = recv.rstrip('\n\x00')
+        
         return float(recv)
 
     def byteToString(self, recv):
-        print("fail8")
         recv = bytes(recv)
         recv = recv.decode("UTF-8")
-        recv = recv.rstrip('\n')
-        recv = recv.rstrip('\x00')
-        print("sucess")
+        recv = recv.rstrip('\n\x00')
         return recv
\ No newline at end of file

main.py

@@ -5,9 +5,10 @@ interface = controlInterface()
 
 interface.__init__()
 print(interface.getListIp())
-interface.newNhr9410()
-interface.newNhr9430()
-#interface.newNhr9430()
+interface.newNhr("9410")
+interface.newNhr("9430")
+interface.newNhr("9430")
+
 nhr10 = []
 nhr30 = []
 nhr10 = interface.getNhr9410()
@@ -17,7 +18,11 @@ print(nhr10)
 print(nhr30)
 
 for elem in nhr10:
-    print(elem.getIp())
+    print("nhr10 ip: ",elem.getIp())
+    print("voltage:",elem.getVoltage())
     elem.close()
+
 for elem in nhr30:
+    print("nhr30 ip: ",elem.getIp())
+    print("voltage:",elem.getVoltage())
     elem.close()
\ No newline at end of file