Merge 2bc9d62aaf into 4139e079f4

unilabos/registry/devices/characterization_XRD.yaml

@@ -0,0 +1,20 @@
+# 电化学表征设备：电化学工作站、电池测试柜
+XRD_station.Aolong:
+  description: Aolong XRD_station test
+  class:
+    module: unilabos.devices.XRD.XRD_test:XRD_Aolong_AL_Y3500
+    type: python
+    status_types:
+      samplein_status: Bool
+      sampleout_status: Bool
+    action_value_mappings:
+      NMR_cmd:
+        type: SendCmd
+        goal:
+          #command: wf_name
+          params: command
+          #resource: resource
+        feedback:
+          status: status
+        result:
+          success: success

unilabos/registry/devices/characterization_chromatographic.yaml

@@ -0,0 +1,44 @@
+# 色谱表征设备
+hplc.agilent:
+  description: HPLC device
+  class:
+    module: unilabos.devices.hplc.AgilentHPLC:HPLCDriver
+    type: python
+    status_types:
+      device_status: String
+      could_run: Bool
+      driver_init_ok: Bool
+      is_running: Bool
+      finish_status: String
+      status_text: String
+    action_value_mappings:
+      execute_command_from_outer:
+        type: SendCmd
+        goal:
+          command: command
+        feedback: {}
+        result:
+          success: success
+  schema:
+    properties:
+      device_status:
+        type: string
+      could_run:
+        type: boolean
+      driver_init_ok:
+        type: boolean
+      is_running:
+        type: boolean
+      finish_status:
+        type: string
+      status_text:
+        type: string
+    required:
+    - device_status
+    - could_run
+    - driver_init_ok
+    - is_running
+    - finish_status
+    - status_text
+    additionalProperties: false
+    type: object

unilabos/registry/devices/characterization_electric.yaml

@@ -0,0 +1,19 @@
+# 电化学表征设备：电化学工作站、电池测试柜
+electrochem_station.DongHua:
+  description: Donghua electrochem_station
+  class:
+    module: unilabos.devices.electrochem.dh_7000:DH7000
+    type: python
+    status_types:
+      status: String
+    action_value_mappings:
+      dh_cmd:
+        type: WorkStationRun
+        goal:
+          wf_name: method
+          params: command
+          resource: resource
+        feedback:
+          status: status
+        result:
+          success: success

unilabos/registry/devices/characterization_optic.yaml

@@ -1,5 +1,5 @@
 # 光学表征设备：红外、紫外可见、拉曼等
-raman_home_made:
+raman.home_made:
   description: Raman spectroscopy device
   class:
     module: unilabos.devices.raman_uv.home_made_raman:RamanObj
@@ -22,46 +22,24 @@ raman_home_made:
     - status
     additionalProperties: false
     type: object
-hplc.agilent:
-  description: HPLC device
+
+raman.opsky_ATR30007:
+  description: Raman spectroscopy device
   class:
-    module: unilabos.devices.hplc.AgilentHPLC:HPLCDriver
+    module: unilabos.devices.raman_uv.opsky_raman:ATR30007
     type: python
     status_types:
-      device_status: String
-      could_run: Bool
-      driver_init_ok: Bool
-      is_running: Bool
-      finish_status: String
-      status_text: String
+      status: String
     action_value_mappings:
-      execute_command_from_outer:
-        type: SendCmd
+      start_Raman:
+        type: GetRaman
         goal:
-          command: command
-        feedback: {}
-        result:
-          success: success
-  schema:
-    properties:
-      device_status:
-        type: string
-      could_run:
-        type: boolean
-      driver_init_ok:
-        type: boolean
-      is_running:
-        type: boolean
-      finish_status:
-        type: string
-      status_text:
-        type: string
-    required:
-    - device_status
-    - could_run
-    - driver_init_ok
-    - is_running
-    - finish_status
-    - status_text
-    additionalProperties: false
-    type: object
+          integtime: IntegTime
+          ldpower: LdPower
+          ldwave: LdWave
+          ccdtemp: CCDTemp
+          filename: filename
+          saveroot: saveroot
+        feedback:
+          status: status
+        result: {}