no need to send RESOURCE_MANAGER

valab · valab · commit c01b4c34e85c · 2017-03-02T09:40:30.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,9 @@
 Tests/DCX81/dcx81_spi_test_with_dbmd6.py
 *.txt
+<<<<<<< HEAD
+=======
+*.bak
+Tests/DCX81/spi_read_fifo.cmm
+Tests/DCX81/spi2_slave.cmm
+>>>>>>> refs/remotes/origin/master
 *.xlsx
diff --git a/lab_equipment.py b/lab_equipment.py
@@ -17,14 +17,15 @@ def __init__(self):
 #Lab equipment classes:
 
 class Agillent34401A():
-    def __init__(self,address,resource_manager):
+    def __init__(self,address):
+        resource_manager = visa.ResourceManager()
         self.dev=resource_manager.open_resource(address)
         self.name=self.dev.query('*IDN?')[:-1]
         self.dev.timeout = 5000
         
     def close(self):
         self.dev.close()
-        write_to_log ('The connection with: %s is now closed' %(self.name))
+        #write_to_log ('The connection with: %s is now closed' %(self.name))
     
     def send_command(self, command):
     #Send a visa command to the device.
@@ -65,7 +66,8 @@ def meas(self,meas):
 
 
 class QL355TPPwrSply():
-    def __init__(self,address,resource_manager):
+    def __init__(self,address):
+        resource_manager = visa.ResourceManager()
         self.dev=resource_manager.open_resource(address)
         self.dev.clear()
         self.name=self.dev.query('*IDN?')[:-1]
@@ -95,15 +97,15 @@ def set_volt(self, channel, volt):
         self.dev.write("V%s %s" %(channel , volt))
         time.sleep(0.5)
         res = self.dev.query("V%s?" %(channel))[:-1]
-        write_to_log (res)
+        return res
         
     def set_current_lim(self, channel, current):
         #set the current limit of the specified channel
         channel = str(channel)
         self.dev.write("I%s %s" %(channel ,current))
         time.sleep(0.1)
         res = self.dev.query("I%s?" %(channel))[:-1]
-        write_to_log(res)
+        return res
         
     def channel_on(self, channel):
         #set ON the specified channel
@@ -122,36 +124,38 @@ def increment_voltage(self, channel, step_size):
         channel = str(channel)
         self.dev.write('DELTAV%s %s' %(channel ,step_size))
         self.dev.write('INCV%s' %(channel))
-        write_to_log("Channel %s was incremented by %sV" %(channel ,step_size))
-        self.dev.write('V%s?' %(channel))
-        write_to_log("Channel %s volatge is now %sV" %(channel ,self.dev.read()[3:]))
-        
+        #write_to_log("Channel %s was incremented by %sV" %(channel ,step_size))
+        res = self.dev.write('V%s?' %(channel))
+        #write_to_log("Channel %s volatge is now %sV" %(channel ,self.dev.read()[3:]))
+        return res
+
     def all_off(self):
         #set ALL channels OFF
         self.dev.write('OPALL 0')
-        write_to_log("All channels set OFF")
+        #write_to_log("All channels set OFF")
         
     def all_on(self):
         #set ALL channels ON
         self.dev.write('OPALL 1')
-        write_to_log("All channels set ON")
+        #write_to_log("All channels set ON")
 
     def read_current(self, channel):
         #reads the current flows right now through the channel
         self.dev.write('I%sO?' %(str(channel)))
         cur = self.dev.read()[:-1]
-        write_to_log("The current at channel %s is: %s" %(channel, cur))
+        #write_to_log("The current at channel %s is: %s" %(channel, cur))
         return cur
         
     def sense(self, channel, mode):
     #mode=0: local, mode=1: remote
         self.dev.write('SENSE%s %s' %(channel, mode))
         mod="local" if mode == '0' else "remote"
-        write_to_log("Activated %s sense on channel %s" %(mod, str(channel)))
+        #write_to_log("Activated %s sense on channel %s" %(mod, str(channel)))
                      
      
 class HP53131aFreqCounter():
-    def __init__(self,address,resource_manager):
+    def __init__(self,address):
+        resource_manager = visa.ResourceManager()
         self.dev=resource_manager.open_resource(address)
         self.name=self.dev.query('*IDN?')[:-1]
         self.dev.timeout = 5000
@@ -225,7 +229,8 @@ def meas(self, meas, channel="1"):
 
         
 class HP33120aWaveGen():
-    def __init__(self, address, resource_manager):
+    def __init__(self, address):
+        resource_manager = visa.ResourceManager()
         self.dev=resource_manager.open_resource(address)
         self.name=self.dev.query('*IDN?')[:-1]
         self.dev.timeout = 5000
@@ -246,7 +251,7 @@ def read_response(self, command):
     #Generate a waveform in single command.
     #Example: self.generate("SIN", 3000, 1.5, -1) generates a sine wave, 3KHz, 1.5Vpp, -1V offset.    
     def generate(self, wave, frequency, amplitude, offset):
-        self.dev.write("APPL:%s %s, %s, %s" %(wave, freqency, amplitude, offset))
+        self.dev.write("APPL:%s %s, %s, %s" %(wave, frequency, amplitude, offset))
     
     #Set specifiied shape : SINusoid|SQUare|TRIangle|RAMP|NOISe|DC|USER
     def set_shape(self, shape):
@@ -295,7 +300,8 @@ def get_offset(self):
     
 
 class KikusuiPLZ70UA():
-    def __init__(self, address, resource_manager):
+    def __init__(self, address):
+        resource_manager = visa.ResourceManager()
         self.dev=resource_manager.open_resource(address)
         self.name=self.dev.query('*IDN?')[:-1]
         self.dev.timeout = 5000
@@ -459,36 +465,53 @@ def __init__(self,address):
         self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         self.sock.connect((self.tcp_ip, self.port))
         self.sock.send("IDEN?\r\n")    #ask for device identity
-        self.name = self.sock.recv(23)
-        self.sock.recv(10)
+        self.name = self.read_line()
         self.sock.send("VRSN?\r\n")    #ask for software version
-        self.version = self.sock.recv(16)
-        self.sock.recv(5)
-        
+        self.version = self.read_line()
+
+
     #close connection with device
     def close(self):
         self.sock.close()
-    
+
+    #read line from socket
+    def read_line(self):
+        line = ""
+        while True:
+            c = self.sock.recv(64)
+            if c == "":
+                break
+            elif "\r" in c:
+                line += c.split("\r")[0]
+                break
+            else:
+                line += c
+        return line
+
     #before reading the device's answer:
     def clear_buffer(self):
-        self.sock.recv(10)
+        c = self.sock.recv(1)
+        while (c != ""):
+            c = self.sock.recv(16)
         time.sleep(0.1)
-        
+
+    #stop chamber from working
     def stop_chamber(self):
         err = "0"
         k = 0
-        while (err != "5" and k<10):  #5 means that Termotron received the stop command
+        while (err != "5" and k<3):  #5 means that Termotron received the stop command
             self.sock.send("STOP\r\n")  #send the STOP command
-            self.clear_buffer()
             self.sock.send("SCOD?\r\n")  #check if the command had been received
-            err = self.sock.recv(1)
-            
+            err = self.read_line()
+            k += 1
+
         if (k == 10): #5 means that Termotron received the stop command
             write_to_log("Error while sending STOP command to %s" %self.name)
             
     def run_chamber(self):
         self.sock.send("RUNM\r\n")
-         
+
+
     def set_temp(self, temp):
         if type(temp != str):
             temp = str(temp)
@@ -498,19 +521,23 @@ def set_temp(self, temp):
         
     #read the current temperature of the chamber.
     def read_temp(self):
-        self.clear_buffer()
         self.sock.send("PVAR1?\r\n") #read the deviation from the configured value
         time.sleep(0.1)
-        current_temp = float(self.sock.recv(4))
-        return current_temp
+        current_temp = self.read_line()
+        count = 0
+        while current_temp == '0' and count<3:
+            self.sock.send("PVAR1?\r\n")
+            current_temp = self.read_line()
+            count += 1
+        return float(current_temp)
 
 
     def wait_for_temp(self, temp):
         self.set_temp(temp)
         time.sleep(0.1)
-        current_temp = float(self.read_temp())
+        current_temp = self.read_temp()
         while (abs(current_temp) <= abs(temp*0.98) or abs(current_temp) >= abs(temp*1.02)):
             time.sleep(1)
-            current_temp = float(self.read_temp())
+            current_temp = self.read_temp()
         write_to_log("Temperature has reached the desirable value")
 
diff --git a/test1.py b/test1.py
@@ -38,9 +38,9 @@
 ########################
 ## Excel:
 
-# wb1, full_path = create_excel_file(DIR_NAME, LOG_NAME_EXCEL)
+# wb1, path = create_excel_file(DIR_NAME, LOG_NAME_EXCEL)
 # ws1 = wb1.create_sheet("new sheet is the new shit!")
-# ws1.cell(row=1,column=1).value="write something" 
+# ws1.cell(row=1,column=1).value="write something"
 # wb1.save(full_path)
 # wb=open_excel_file(full_path)
 # print wb.get_sheet_names()
@@ -49,7 +49,7 @@
 ########################
 ## Power Supply:
 
-# pwr_sply = QL355TPPwrSply(POWER_SUPLLY_ADDRESS, RESOURCE_MANAGER)
+# pwr_sply = QL355TPPwrSply(POWER_SUPLLY_ADDRESS)
 # print pwr_sply.name
 # pwr_sply.channel_on('1')
 # pwr_sply.set_volt(1,4.3)
@@ -62,7 +62,7 @@
 ########################
 ## Frequency counter:
 
-# freq_counter = HP53131aFreqCounter(FREQUENCY_COUNTER_ADDRESS, RESOURCE_MANAGER)
+# freq_counter = HP53131aFreqCounter(FREQUENCY_COUNTER_ADDRESS)
 # print freq_counter.name
 # freq_counter.meas("freqency")
 # a= freq_counter.meas("volt_min_peak")
@@ -72,7 +72,7 @@
 ########################
 ## Electronc load:
 
-# load = KikusuiPLZ70UA(ELECTRONIC_LOAD, RESOURCE_MANAGER)
+# load = KikusuiPLZ70UA(ELECTRONIC_LOAD_ADDRESS)
 # print load.name
 # load.reset()
 # load.load_on()
@@ -94,14 +94,31 @@
 # fridg.close()
 
 
-
 ########################
 ## Blue oven:
 
 # termotron = Termotron3800(TERMOTRON_TCP_IP)
 # termotron.stop_chamber()
 # termotron.set_temp(23)
+<<<<<<< HEAD
 # termotron.wait_for_temp(29)
 # print termotron.read_temp()
 # time.sleep(3)
-# termotron.stop_chamber()
+# termotron.stop_chamber()
+=======
+# termotron.wait_for_temp(22)
+# write_to_log(termotron.read_temp())
+# time.sleep(1)
+# termotron.stop_chamber()
+
+
+########################
+## DMM
+
+# dmm = Agillent34401A(DMM_ADDRESS)
+# dmm.meas("DCV")
+# dmm.meas("ACV")
+# dmm.meas("frequency")
+# dmm.close()
+
+>>>>>>> refs/remotes/origin/master
