diff --git a/3.5.1 auto/amperemeter.py b/3.5.1 auto/amperemeter.py new file mode 100644 index 0000000..3626fbf --- /dev/null +++ b/3.5.1 auto/amperemeter.py @@ -0,0 +1,30 @@ +import serial + + +class B7_78(): + + def __init__(self, folder): + self.folder = folder + self.instr = serial.Serial( + self.folder, timeout=1, inter_byte_timeout=1) + self.instr.write(b'SYST:REM\n') + self.instr.write(b'SYST:REM\n') + + def getCurrentDC(self): + self.instr.write(b'MEAS:CURR:DC?\n') + return self.instr.read(100).decode().rstrip() + + def getVoltageDC(self): + self.instr.write(b'MEAS:VOLT:DC?\n') + return float(self.instr.read(100).decode().rstrip()) + + def getCurrentAC(self): + self.instr.write(b'MEAS:CURR:AC?\n') + return float(self.instr.read(100).decode().rstrip()) + + def getVoltageAC(self): + self.instr.write(b'MEAS:VOLT:AC?\n') + return float(self.instr.read(100).decode().rstrip()) + +# for i in range(5): +# print(B7_78('/dev/ttyUSB0').getCurrentDC()) diff --git a/PycharmProjects/3.5.1 auto/fitting.py b/3.5.1 auto/fitting.py similarity index 100% rename from PycharmProjects/3.5.1 auto/fitting.py rename to 3.5.1 auto/fitting.py diff --git a/PycharmProjects/3.5.1 auto/main.py b/3.5.1 auto/main.py similarity index 100% rename from PycharmProjects/3.5.1 auto/main.py rename to 3.5.1 auto/main.py diff --git a/PycharmProjects/3.5.1 auto/plots.py b/3.5.1 auto/plots.py similarity index 100% rename from PycharmProjects/3.5.1 auto/plots.py rename to 3.5.1 auto/plots.py diff --git a/PycharmProjects/3.5.1 auto/tmpplots/tmpplot1.jpg b/3.5.1 auto/tmpplots/tmpplot1.jpg similarity index 100% rename from PycharmProjects/3.5.1 auto/tmpplots/tmpplot1.jpg rename to 3.5.1 auto/tmpplots/tmpplot1.jpg diff --git a/PycharmProjects/3.5.1 auto/tmpplots/tmpplot3.jpg b/3.5.1 auto/tmpplots/tmpplot3.jpg similarity index 100% rename from PycharmProjects/3.5.1 auto/tmpplots/tmpplot3.jpg rename to 3.5.1 auto/tmpplots/tmpplot3.jpg diff --git a/PycharmProjects/3.5.1 auto/tmpplots/tmpplot4.jpg b/3.5.1 auto/tmpplots/tmpplot4.jpg similarity index 100% rename from PycharmProjects/3.5.1 auto/tmpplots/tmpplot4.jpg rename to 3.5.1 auto/tmpplots/tmpplot4.jpg diff --git a/PycharmProjects/3.5.1 auto/visual.py b/3.5.1 auto/visual.py similarity index 99% rename from PycharmProjects/3.5.1 auto/visual.py rename to 3.5.1 auto/visual.py index ddf4f39..4471691 100644 --- a/PycharmProjects/3.5.1 auto/visual.py +++ b/3.5.1 auto/visual.py @@ -372,7 +372,7 @@ class Part2(QtWidgets.QWidget): k_0.append(params[1]) A.append(params[2]) for i in range(len(plots.vol[3]) - 1): - mes = {'U_' + str(i+2) + ', В': plots.vol[3][i+1], 'I_' + str(i+2) + ', мкА': plots.cur[3][i+1]} + mes = {'U_' + str(i+2) + ', В': plots.vol[3][i + 1], 'I_' + str(i + 2) + ', мкА': plots.cur[3][i + 1]} data.update(mes) params = fitting.fit(plots.vol[3][i + 1], plots.cur[3][i + 1]) I_0.append(params[0]) diff --git a/3.5.1 auto/voltmeter.py b/3.5.1 auto/voltmeter.py new file mode 100644 index 0000000..cee063a --- /dev/null +++ b/3.5.1 auto/voltmeter.py @@ -0,0 +1,43 @@ +class AKIP(): + + def __init__(self, folder): + self.folder = folder + + def getVoltageDC(self): + self.instr = open(self.folder, 'w') + self.instr.write('MEAS:VOLT:DC?\n') + self.instr.flush() + self.instr = open(self.folder, 'r') + data = self.instr.readline() + self.instr.close() + return float(data) + + def getCurrentDC(self): + self.instr = open(self.folder, 'w') + self.instr.write('MEAS:AMP:DC?\n') + self.instr.flush() + self.instr = open(self.folder, 'r') + data = self.instr.readline() + self.instr.close() + return float(data) + + def getVoltageAC(self): + self.instr = open(self.folder, 'w') + self.instr.write('MEAS:VOLT:AC?\n') + self.instr.flush() + self.instr = open(self.folder, 'r') + data = self.instr.readline() + self.instr.close() + return float(data) + + def getCurrentAC(self): + self.instr = open(self.folder, 'w') + self.instr.write('MEAS:AMP:AC?\n') + self.instr.flush() + self.instr = open(self.folder, 'r') + data = self.instr.readline() + self.instr.close() + return float(data) + +# for i in range(5): +# print(AKIP('/dev/usbtmc0').getVoltageDC())