From f4d73d1c2ed8b41c095919481ed99f413d4601ce Mon Sep 17 00:00:00 2001 From: Arnaud Watlet <arnaud.watlet@umons.ac.be> Date: Tue, 12 Dec 2023 12:02:44 +0100 Subject: [PATCH] Adds pwr_dps5005_fixed --- ohmpi/hardware_components/pwr_dps5005_fixed.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/ohmpi/hardware_components/pwr_dps5005_fixed.py b/ohmpi/hardware_components/pwr_dps5005_fixed.py index e73f2c23..1aba1ec7 100644 --- a/ohmpi/hardware_components/pwr_dps5005_fixed.py +++ b/ohmpi/hardware_components/pwr_dps5005_fixed.py @@ -30,13 +30,10 @@ class Pwr(Pwr_batt): super().__init__(**kwargs) if not subclass_init: self.exec_logger.event(f'{self.model}\tpwr_init\tbegin\t{datetime.datetime.utcnow()}') - assert isinstance(self.connection, Instrument) self._voltage = kwargs['voltage'] - self._current_max = kwargs['current_max'] - self.voltage_adjustable = False - self.current_adjustable = False self._current = np.nan - self._pwr_state = 'off' - self._pwr_latency = kwargs['pwr_latency'] + self._switch_pwr_on_zero = True + # self._state = 'on' if not subclass_init: self.exec_logger.event(f'{self.model}\tpwr_init\tend\t{datetime.datetime.utcnow()}') + -- GitLab