awendt/pyrelacs
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[devices] spelling

Browse Source
This commit is contained in:
wendtalexander 2024-10-18 16:30:09 +02:00
parent 4864538213
commit 4e0a1f0ac5
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pyrelacs/devices/mccdaq.py
View File

@ -41,13 +41,16 @@ class MccDaq:
try:
self.daq_device.connect()
except uldaq.ul_exception.ULException:
self.disconnect_dac()
self.disconnect_daq()
self.connect_dac()
self.ai_device = self.daq_device.get_ai_device()
self.ao_device = self.daq_device.get_ao_device()
self.dio_device = self.daq_device.get_dio_device()
log.debug("Connected")
log.debug("Connected to MccDaq")
log.debug("Activating the Attenuator")
self.activate_attenuator()
def connect_dac(self):
"""
@ -194,7 +197,7 @@ class MccDaq:
except Exception as e:
print(f"{e}")
self.set_analog_to_zero()
self.disconnect_dac()
self.disconnect_daq()
return data_analog_output
@ -224,7 +227,7 @@ class MccDaq:
except Exception as e:
log.error("f{e}")
log.error("disconnection dac")
self.disconnect_dac()
self.disconnect_daq()
def digital_trigger(self, ch: int = 0) -> None:
"""
@ -281,7 +284,9 @@ class MccDaq:
bit = self.dio_device.d_bit_in(uldaq.DigitalPortType.AUXPORT, channel)
return bit
def disconnect_dac(self):
def disconnect_daq(self):
log.debug("Disconnecting DAQ")
self.deactivate_attenuator()
self.daq_device.disconnect()
self.daq_device.release()
@ -329,12 +334,12 @@ class MccDaq:
except uldaq.ul_exception.ULException:
log.debug("Operation timed out")
self.write_bit(channel=0, bit=0)
self.disconnect_dac()
self.disconnect_daq()
self.connect_dac()
self.set_analog_to_zero()
finally:
self.write_bit(channel=0, bit=0)
self.disconnect_dac()
self.disconnect_daq()
self.connect_dac()
self.set_analog_to_zero()