keithley-tempcontrol 0.17.4__py3-none-any.whl → 0.18.1__py3-none-any.whl

egse/tempcontrol/keithley/daq6510_protocol.py

@@ -3,12 +3,13 @@ from pathlib import Path
 
 from egse.control import ControlServer
 from egse.device import DeviceTimeoutError
+from egse.hk import convert_hk_names, read_conversion_dict
 from egse.protocol import CommandProtocol
+from egse.log import logger
 from egse.settings import Settings
 from egse.setup import load_setup
 from egse.system import format_datetime
-from egse.tempcontrol.keithley.daq6510 import DAQ6510Controller
-from egse.tempcontrol.keithley.daq6510 import DAQ6510Interface
+from egse.tempcontrol.keithley.daq6510 import DAQ6510Controller, DAQ6510Interface
 from egse.tempcontrol.keithley.daq6510_dev import DAQ6510Command
 from egse.zmq_ser import bind_address
 
@@ -16,12 +17,10 @@ HERE = Path(__file__).parent
 
 COMMAND_SETTINGS = Settings.load(location=HERE, filename="daq6510.yaml")
 
-MODULE_LOGGER = logging.getLogger(__name__)
-
 
 class DAQ6510Protocol(CommandProtocol):
     def __init__(self, control_server: ControlServer):
-        """Initialisation of a new Protocol for DAQ6510 Management.
+        """Initialization of a new Protocol for DAQ6510 Management.
 
         Args:
             control_server: Control Server for which to send out status and monitoring information
@@ -34,13 +33,31 @@ class DAQ6510Protocol(CommandProtocol):
         try:
             self.daq.connect()
         except (ConnectionError, DeviceTimeoutError):
-            MODULE_LOGGER.warning("Couldn't establish a connection to the DAQ6510, check the log messages.")
+            logger.warning("Couldn't establish a connection to the DAQ6510, check the log messages.")
+
+        try:
+            self.hk_conversion_table = read_conversion_dict(
+                self.get_control_server().get_storage_mnemonic(), use_site=False
+            )
+        except Exception as exc:
+            logger.warning(f"Failed to read housekeeping conversion dictionary: {exc}")
+            self.hk_conversion_table = None
 
         self.load_commands(COMMAND_SETTINGS.Commands, DAQ6510Command, DAQ6510Interface)
         self.build_device_method_lookup_table(self.daq)
 
         setup = load_setup()
-        self.channels = setup.gse.DAQ6510.channels
+        self.channels = setup.gse.DAQ6510.channels  # type: ignore[attr-defined]
+
+    def get_device(self) -> DAQ6510Controller:
+        """
+        Returns the DAQ6510Controller device.
+
+        Returns:
+            The DAQ6510Controller device.
+        """
+
+        return self.daq
 
     def get_bind_address(self) -> str:
         """
@@ -76,6 +93,11 @@ class DAQ6510Protocol(CommandProtocol):
         hk_dict = dict()
         hk_dict["timestamp"] = format_datetime()
 
+        # logger.warning("DAQ6510Protocol.get_housekeeping() not implemented yet.")
+
+        if self.hk_conversion_table:
+            return convert_hk_names(hk_dict, self.hk_conversion_table)
+
         return hk_dict
 
     def quit(self) -> None:

egse/tempcontrol/keithley/daq6510_sim.py

@@ -96,10 +96,10 @@ COMMAND_PATTERNS_ACTIONS_RESPONSES = {
 
 
 def write(conn, response: str):
-    response = f"{response}{SEPARATOR_STR}".encode()
+    response_b = f"{response}{SEPARATOR_STR}".encode()
     if VERBOSE_DEBUG:
-        logger.debug(f"write: {response = }")
-    conn.sendall(response)
+        logger.debug(f"write: {response_b = }")
+    conn.sendall(response_b)
 
 
 # Keep a receive buffer per connection
@@ -217,7 +217,7 @@ def run_simulator():
                     return
             with conn:
                 logger.info(f"Accepted connection from {addr}")
-                write(conn, "This is PLATO DAQ6510 X.X.sim")
+                # write(conn, "This is PLATO DAQ6510 X.X.sim")  # The DAQ6510 doesn't send a string after connection
                 conn.settimeout(READ_TIMEOUT)
                 try:
                     while True:

keithley_tempcontrol/cgse_services.py

@@ -93,5 +93,37 @@ def stop_daq6510_sim():
     )
 
 
+@daq6510.command(name="start-mon")
+def start_daq6510_mon():
+    """Start the daq6510 monitoring service."""
+    rich.print("Starting monitoring service daq6510_mon")
+
+    out = redirect_output_to_log("daq6510_mon.start.log")
+
+    subprocess.Popen(
+        [sys.executable, "-m", "egse.tempcontrol.keithley.daq6510_mon", "start"],
+        stdout=out,
+        stderr=out,
+        stdin=subprocess.DEVNULL,
+        close_fds=True,
+    )
+
+
+@daq6510.command(name="stop-mon")
+def stop_daq6510_mon():
+    """Stop the daq6510 monitoring service."""
+    rich.print("Stopping monitoring service daq6510_mon")
+
+    out = redirect_output_to_log("daq6510_mon.stop.log")
+
+    subprocess.Popen(
+        [sys.executable, "-m", "egse.tempcontrol.keithley.daq6510_mon", "stop"],
+        stdout=out,
+        stderr=out,
+        stdin=subprocess.DEVNULL,
+        close_fds=True,
+    )
+
+
 if __name__ == "__main__":
     daq6510()

{keithley_tempcontrol-0.17.4.dist-info → keithley_tempcontrol-0.18.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: keithley-tempcontrol
-Version: 0.17.4
+Version: 0.18.1
 Summary: Keithley Temperature Control for CGSE
 Author: IvS KU Leuven
 Maintainer-email: Rik Huygen <rik.huygen@kuleuven.be>, Sara Regibo <sara.regibo@kuleuven.be>

keithley_tempcontrol-0.18.1.dist-info/RECORD

@@ -0,0 +1,18 @@
+egse/tempcontrol/keithley/__init__.py,sha256=IasaUltrExCB6CgWl_ZscX51ssVq3Fn_-9V_P-gtV9I,120
+egse/tempcontrol/keithley/daq6510.py,sha256=2ImQrL185T_hsG4Yvw5bqd5_FJ-gJnfAfgZxH-OG0yc,20629
+egse/tempcontrol/keithley/daq6510.yaml,sha256=dHHVNyUpOQpdrZpnxPbT6slsl-8Gbnhifj4Q8QOfOYg,4400
+egse/tempcontrol/keithley/daq6510_adev.py,sha256=wIE-vyDZK9OrT9fio-FWSKEzmTGNQCFh2meiLBinsmY,2586
+egse/tempcontrol/keithley/daq6510_amon.py,sha256=cUgA_ARcEMHzf-_41-c-13KVReAipFCBa6dwiZn-lYE,21330
+egse/tempcontrol/keithley/daq6510_cs.py,sha256=gfq0pnTlmVSrMPRnbYJLslNquFPpCO80Ynb0ZBC5YuU,8441
+egse/tempcontrol/keithley/daq6510_dev.py,sha256=3LMPxmlcuQ3nFy-XTOUnyDOGhWMHLEJGxj0wxK9OT-Q,5212
+egse/tempcontrol/keithley/daq6510_mon.py,sha256=a5a5ke9j2kjsWWnHhelHkzXP0EaO4MeuRNR7LcsSx6k,11113
+egse/tempcontrol/keithley/daq6510_protocol.py,sha256=xBAo7Rd_C4Ts-Tt21EtweEadXKnOtfs-GgnLtugSTsQ,3428
+egse/tempcontrol/keithley/daq6510_sim.py,sha256=Jstq00LcNzji8fVWMxmLpRExDC-Y8zeCJL1Gl5OcD_I,9979
+keithley_tempcontrol/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+keithley_tempcontrol/cgse_explore.py,sha256=y_FkFxJW0vdqGNp9yTU0ELBKxby74-ev3fTuf99Vl1s,400
+keithley_tempcontrol/cgse_services.py,sha256=LUk_Gk8RCzyRVzvmEkO0Dtz1dwfWpBN0VVCpRY9OFXg,3333
+keithley_tempcontrol/settings.yaml,sha256=wbrgSZQAdqFl6AxiLJIN36UsdiVHQCzdsgi7Hs7dv7o,1467
+keithley_tempcontrol-0.18.1.dist-info/METADATA,sha256=otqtIXT5UpVDLpa-jZ66j-B0TTxXbi2l4_hgoQNeSAc,962
+keithley_tempcontrol-0.18.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+keithley_tempcontrol-0.18.1.dist-info/entry_points.txt,sha256=eo5NMMjip3sejDbn3uZvm9kgZt_EYcepuhaCu_mixic,547
+keithley_tempcontrol-0.18.1.dist-info/RECORD,,

{keithley_tempcontrol-0.17.4.dist-info → keithley_tempcontrol-0.18.1.dist-info}/entry_points.txt

@@ -1,5 +1,6 @@
 [console_scripts]
 daq6510_cs = egse.tempcontrol.keithley.daq6510_cs:app
+daq6510_mon = egse.tempcontrol.keithley.daq6510_mon:app
 daq6510_sim = egse.tempcontrol.keithley.daq6510_sim:app
 
 [gui_scripts]

keithley_tempcontrol-0.17.4.dist-info/RECORD

@@ -1,17 +0,0 @@
-egse/tempcontrol/keithley/__init__.py,sha256=QMm0vy6OMqzWmJZ1K6IwKSOpgYeCmUdbcRhv75LH9ZY,130
-egse/tempcontrol/keithley/daq6510.py,sha256=pe12HIC2Yav5ZCGYecoQzhypYcCwecEaJpWZn-OHi8A,24867
-egse/tempcontrol/keithley/daq6510.yaml,sha256=dHHVNyUpOQpdrZpnxPbT6slsl-8Gbnhifj4Q8QOfOYg,4400
-egse/tempcontrol/keithley/daq6510_adev.py,sha256=Pp5U6a0FrUs1TFLqzvGQHhb3vfw6bhtAt4uX0OVRjBI,2263
-egse/tempcontrol/keithley/daq6510_cs.py,sha256=Ga7z8S6z0oTxL_qQP8FXPaNKlJ6o9RrsPFOXeIJ2TT4,7700
-egse/tempcontrol/keithley/daq6510_dev.py,sha256=EKFFDhP8-FdIPBPosc1DfzE3h4DQmNU1d0Fi7Yhx4I4,12906
-egse/tempcontrol/keithley/daq6510_mon.py,sha256=Xbn2U-l9uxPwNN1-aYW72oJodL2sx13suCiPPbDSti0,20932
-egse/tempcontrol/keithley/daq6510_protocol.py,sha256=v8FUrxEm7bnRzM_iQzW0mMCHTgAMZw4f2Ronl8fdKIE,2676
-egse/tempcontrol/keithley/daq6510_sim.py,sha256=Ys5jroT-2i-V_qCR0L6yOYM9CiktnNbB3LvVLGwaD8A,9917
-keithley_tempcontrol/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-keithley_tempcontrol/cgse_explore.py,sha256=y_FkFxJW0vdqGNp9yTU0ELBKxby74-ev3fTuf99Vl1s,400
-keithley_tempcontrol/cgse_services.py,sha256=tndviv2rvygkNSsGy1oA43VfFpyVkdB9If-9sVlLbK4,2466
-keithley_tempcontrol/settings.yaml,sha256=wbrgSZQAdqFl6AxiLJIN36UsdiVHQCzdsgi7Hs7dv7o,1467
-keithley_tempcontrol-0.17.4.dist-info/METADATA,sha256=D8Uz0pSzzRUVMpVz05Uhy-4l_u21GF-eryb17PkqhZs,962
-keithley_tempcontrol-0.17.4.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-keithley_tempcontrol-0.17.4.dist-info/entry_points.txt,sha256=_0j2BwcwPi4LlRrhvEWfp9GO9KT8WhCkJe2gFgMzOPs,491
-keithley_tempcontrol-0.17.4.dist-info/RECORD,,