Merge branch 'DH_Raman' of https://github.com/h840473807/Uni-Lab-OS into DH_Raman

unilabos/devices/electrochem/dh_7000.py

@@ -498,7 +498,7 @@ class DH7000:
         print(f"数据已保存到 {save_root}")
 
     # === Core: a unified dh_cmd method that calls start_eis or start_lsv according to methods ===
-    def dh_cmd(self, command: str):
+    def dh_cmd(self, method: str, command: str, resource: dict):
         """
         Unified handler for different commands such as EIS / LSV / CV / CA.
         In the incoming command JSON, use the key "methods" to specify the measurement type: "eis", "lsv", etc.
@@ -516,7 +516,7 @@ class DH7000:
             print(f"命令参数: {cmd_dict}")
 
             # Extract measurement method, default to "EIS" if not specified
-            method = cmd_dict.pop("methods", "eis").lower()
+            # method = cmd_dict.pop("methods", "eis").lower()
             # Extract file save path (may not be provided)
             save_root = cmd_dict.get("save_root", r"D:\UniLab\results\test")
 

unilabos/devices/raman_uv/opsky_ATR30007.py

@@ -1,20 +1,18 @@
-import clr 
-import os
-import time
-import pandas as pd
 import json
-import shutil
-import sys
-import time
-from System import Environment
+import os
 
-# define class ATR30007 
+import clr
+import pandas as pd
+
+
+# define class ATR30007
 # this class is used to control the ATR30007 Raman workstation
 
 class ATR30007:
     def __init__(self, dll_path: str = r'D:\Raman_RS'):
         self.dll_path = dll_path
         self.machine = None
+        self.status = "Idle"
         self._load_dll()
 
     def _load_dll(self):
@@ -59,6 +57,7 @@ class ATR30007:
         SetC_flag = self.machine.SetCool(CCDTemp)
         print(f"SetC_flag:{SetC_flag}")
         #开始采集光谱
+        self.status = "Running"
         Spect = self.machine.AcquireSpectrum()
         #开始采集光谱谱图数据转换
         Spect_data =  list(Spect.get_Data())
@@ -70,6 +69,8 @@ class ATR30007:
         Spect_bLC = list(self.machine.BaseLineCorrect(Spect_data))
         #对数据进行boxcar 平滑
         Spect_StB = list(self.machine.SmoothBoxcar(Spect_bLC, 10))
+
+        self.status = "Idle"
         #关闭仪器
         OFF_flag = wrapper.CloseDevice()
         print(f"OFF_flag: {OFF_flag}")