From ea49062d80ea30ec96498fc1e5a9f744b49008d1 Mon Sep 17 00:00:00 2001 From: CPD Date: Mon, 10 Mar 2025 13:15:41 +0100 Subject: [PATCH] Add get_led_name method --- cpdctrl/led_control_device/base.py | 3 +++ cpdctrl/led_control_device/impl/thorlabs_dc2200.py | 10 +++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/cpdctrl/led_control_device/base.py b/cpdctrl/led_control_device/base.py index 85043ef..a33f777 100644 --- a/cpdctrl/led_control_device/base.py +++ b/cpdctrl/led_control_device/base.py @@ -44,6 +44,9 @@ class LedControlDevice(ABC): """ pass + def get_led_name(self) -> None|str: + return None + @abstractmethod def __str__(self): pass \ No newline at end of file diff --git a/cpdctrl/led_control_device/impl/thorlabs_dc2200.py b/cpdctrl/led_control_device/impl/thorlabs_dc2200.py index 27c943f..dd0b249 100644 --- a/cpdctrl/led_control_device/impl/thorlabs_dc2200.py +++ b/cpdctrl/led_control_device/impl/thorlabs_dc2200.py @@ -16,11 +16,12 @@ class DC2200(LedControlDevice): def __init__(self, instr: pyvisa.Resource): super().__init__() self.instr = instr + # led presence test + self.instr.write('OUTPut:TERMinal2:TEST:INITiate') + presence = self.instr.query('OUTPut:TERMinal2:TEST:STATus?') # Led name, format: # ",, < led_head_serial_no_string >, < fw_version_major_num >, < fw_version_minor_num >, < fw_version_subminor_num > " - self.name = instr.query('SYSTem:TERMinal2:HTYPe?') - # led presence test - self.instr.write('OUTPut[1]:TERMinal2:TEST:INITiate') + self.led_name = self.instr.query('SYSTem:TERMinal2:HTYPe?') # constant brightness self.instr.write('SOURCE1:MODE CB') # turn off @@ -46,5 +47,8 @@ class DC2200(LedControlDevice): instr = rm.open_resource(name) return DC2200(instr) + def get_led_name(self) -> None|str: + return self.led_name + def __str__(self): return "Thorlabs DC2200"