minor changes

NHR9400series/NHR9400.py

@@ -182,26 +182,42 @@ class NHR9400():
         print("ok")
     #Functions that sets the limits voltage on one phase (A, B or C)
     def setVoltageA(self,voltage):
+        if voltage < 0:
+            return -1
         self.__s.send(("SOUR:VOLT:APH " + str(voltage) + "\n").encode())
 
     def setVoltageB(self,voltage):
+        if voltage < 0:
+            return -1
         self.__s.send(("SOUR:VOLT:BPHase " + str(voltage) + "\n").encode())
 
     def setVoltageC(self,voltage):
+        if voltage < 0:
+            return -1
         self.__s.send(("SOUR:VOLT:CPHase " + str(voltage) + "\n").encode())
 
     #Command establishes the True Power limit (W) as a positive value for the selected instrument.
     def setPower(self, pow):
+        if pow < 0:
+            return -1
         self.__s.send(("SOUR:POW: " + str(pow) + "\n").encode())
     #Individual command for one phase
     def setPowerA(self, pow):
+        if pow < 0:
+            return -1
         self.__s.send(("SOUR:POW:APHase " + str(pow) + "\n").encode())
     def setPowerB(self, pow):
+        if pow < 0:
+            return -1
         self.__s.send(("SOUR:POW:BPHase " + str(pow) + "\n").encode())
     def setPowerC(self, pow):
+        if pow < 0:
+            return -1
         self.__s.send(("SOUR:POW:CPHase " + str(pow) + "\n").encode())
     #Command establishes the operating frequency for the selected instrument.
     def setFreq(self, freq):
+        if freq < 0:
+            return -1
         self.__s.send(("SOUR:FREQ " + str(freq) + "\n").encode())
     #!!!! Doesnt work!!!!
     def getFreq(self):

NHR9400series/NHR9430.py

@@ -43,14 +43,21 @@ class NHR9430(NHR9400):
 
     #set the current of all phases ** Available only to NHR9430-12
     def setCurrent(self, current):
-        print(self.__s)
+        if current < 0:
+            return -1
         self.__s.send(("SOUR:CURR " + str(current) + "\n").encode())
     #Functions that sets the limite currents on one phase (A, B or C)
     def setCurrentA(self, current):
+        if current < 0:
+            return -1
         self.__s.send(("SOUR:CURR:APHase " + str(current) + "\n").encode())
     def setCurrentB(self, current):
+        if current < 0:
+            return -1
         self.__s.send(("SOUR:CURR:BPHase " + str(current) + "\n").encode())
     def setCurrentC(self, current):
+        if current < 0:
+            return -1
         self.__s.send(("SOUR:CURR:CPHase " + str(current) + "\n").encode())
 
     

main.py

@@ -2,44 +2,50 @@ import socket
 import time
 from Control_Interface.controlInterface import controlInterface
 
-interface = controlInterface()
-
-interface.__init__()
-print(interface.getListIp())
-interface.newNhr("9410")
-interface.newNhr("9430")
-#interface.newNhr("9430")
-
-nhr10 = []
-nhr30 = []
-nhr10 = interface.getNhr9410()
-nhr30 = interface.getNhr9430()
-
-
-for elem in nhr10:
-    print("nhr10 ip: ",elem.getIp())
-    
-    elem.setVoltage(220)
-    elem.setPower(5)
-    elem.start()
-    
-    print("voltage:",elem.getVoltage())
-    print("current:", elem.getCurrent())
-    print("Power:", elem.getPower())
-    print(elem.checkErrors())
-
-for elem in nhr30:
-    print("nhr30 ip: ",elem.getIp())
-    elem.setCurrent(30)
-    elem.start()
-    print("voltage:",elem.getVoltage())
-    print("current:", elem.getCurrent())
-    print("Power:", elem.getPower())
-
-
-time.sleep(20)
-
-for elem in nhr10:
-    elem.close()
-for elem in nhr30:
-    elem.close()
\ No newline at end of file
+
+
+def main():
+    interface = controlInterface()
+
+    interface.__init__()
+    print(interface.getListIp())
+    interface.newNhr("9410")
+    interface.newNhr("9430")
+    #interface.newNhr("9430")
+
+    nhr10 = []
+    nhr30 = []
+    nhr10 = interface.getNhr9410()
+    nhr30 = interface.getNhr9430()
+
+
+    for elem in nhr10:
+        print("nhr10 ip: ",elem.getIp())
+        
+        elem.setVoltage(220)
+        elem.setPower(5)
+        elem.start()
+        
+        print("voltage:",elem.getVoltage())
+        print("current:", elem.getCurrent())
+        print("Power:", elem.getPower())
+        print(elem.checkErrors())
+
+    for elem in nhr30:
+        print("nhr30 ip: ",elem.getIp())
+        elem.setCurrent(30)
+        elem.start()
+        print("voltage:",elem.getVoltage())
+        print("current:", elem.getCurrent())
+        print("Power:", elem.getPower())
+
+
+    time.sleep(20)
+
+    for elem in nhr10:
+        elem.close()
+    for elem in nhr30:
+        elem.close()
+
+if __name__ == '__main__':
+    main()