فهرست منبع

1.添加道特发生器的配置!
2.添加检测程序是否存活如何如果未存活就重新启动!

lwk 7 ساعت پیش
والد
کامیت
f2a3277603
3فایلهای تغییر یافته به همراه780 افزوده شده و 0 حذف شده
  1. 0 0
      bin/DriverConfig/GEN_REMEDY_Static.xml
  2. 726 0
      bin/DriverDefine/Generator_REMEDY_Static.json
  3. 54 0
      bin/check_and_start_ccosprocgo.sh

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
bin/DriverConfig/GEN_REMEDY_Static.xml


+ 726 - 0
bin/DriverDefine/Generator_REMEDY_Static.json

@@ -0,0 +1,726 @@
+{
+    "Name": "Generator_REMEDY_Static",
+    "TypeName": "Generator",
+    "Modality": "DR",
+    "Version": "V3",
+    "Location": "",
+    "Manufacturer": "REMEDY",
+    "Model": "Static",
+    "SN": "1234",
+    "Driver": "CCOS/DRIVER/Generator/REMEDYST/Static",
+    "ParentId": "",
+    "Children": ["",""],
+    "Set": {
+        "GENERATORSYNCSTATE": "0",
+        "WORKSTATION": "0",
+        "EXAMMODE": "0",
+        "EXPMODE": "0",
+        "KV": "0",
+        "MA": "0",
+        "MS": "0",
+        "MAS": "0",
+        "FOCUS": "0",
+        "TECHMODE": "0",
+        "AECDENSITY": "0",
+        "AECFIELD": "0",
+        "AECFILM": "0",
+        "FrameRate": "0"
+    },
+    "Add": {
+        "ErrorList": {
+            "DescKey": "Example",
+            "ErrorCode": "0",
+            "ErrorMsg": "null"
+        }
+    },
+    "Del": {
+        "ErrorList": {
+            "DescKey": "Example",
+            "ErrorCode": "0",
+            "ErrorMsg": "null"
+        }
+    },
+    "Update": {
+        "connections": {
+            "Level": "Public",
+            "DescKey": "connections",
+            "Value": {
+                "type": "COM",
+                "port": {
+                    "Level": "Public",
+                    "Value": "/dev/ttyUSB0",
+                    "List": [ "/dev/ttyUSB0", "/dev/ttyUSB1", "/dev/ttyUSB2", "/dev/ttyUSB3", "/dev/ttyUSB4", "/dev/ttyUSB5", "/dev/ttyUSB6", "/dev/ttyUSB7", "/dev/ttyUSB8" ],
+                    "Type": "List"
+                },
+                "baudrate": {
+                    "Level": "Public",
+                    "Value": "19200",
+                    "List": [ "110", "300", "600", "1200", "2400",  "4800", "9600", "14400", "19200",  "38400", "56000", "57600", "115200", "128000" ],
+                    "Type": "List"
+                },
+                "bytesize": {
+                    "Level": "Public",
+                    "Value": "8",
+                    "List": [ "5", "6", "7", "8" ],
+                    "Type": "List"
+                },
+                "parity": "0",
+                "stopbits": {
+                    "Level": "Public",
+                    "Value": "0",
+                    "List": [ "0", "1", "2" ],
+                    "Type": "List"
+                }
+            }
+        },
+		"SupportSyncMode": {
+            "Level": "Public",
+            "DescKey": "SupportSyncMode",
+            "Value": {
+                "SingleRAD": {
+                    "HWS": "1",
+                    "FRE": "2"
+                },
+				"Gain": {
+                    "HWS": "1",
+                    "FRE": "2"
+                },
+				"Offset": {
+                    "HWS": "1",
+                    "FRE": "2"
+                },
+				"DDR": {
+                    "HWS": "1",
+                    "FRE": "2"
+                }
+            }
+        },
+        "FocusSmall": {
+            "Level": "ZSKK",
+            "DescKey": "FocusSmall",
+            "Value": "0.1"
+        },
+        "FocusLarge": {
+            "Level": "ZSKK",
+            "DescKey": "FocusLarge",
+            "Value": "0.3"
+        },
+        "logEnable": {
+            "Level": "Private",
+            "DescKey": "logEnable",
+            "Value": "1"
+        },
+        "loopEnable": {
+            "Level": "Private",
+            "DescKey": "loopEnable",
+            "Value": "1"
+        },
+        "loopTime": {
+            "Level": "Private",
+            "DescKey": "loopTime",
+            "Value": "2000"
+        },
+        "ReConnect": {
+            "Level": "Private",
+            "DescKey": "ReConnect",
+            "Value": "1"
+        },
+        "WSTable": {
+            "Level": "ZSKK",
+            "DescKey": "WSTable",
+            "Value": "1"
+        },
+        "WSWall": {
+            "Level": "ZSKK",
+            "DescKey": "WSWall",
+            "Value": "1"
+        },
+        "WSFree": {
+            "Level": "ZSKK",
+            "DescKey": "WSFree",
+            "Value": "1"
+        },
+        "WSTomo": {
+            "Level": "ZSKK",
+            "DescKey": "WSTomo",
+            "Value": "1"
+        },
+        "WSConventional": {
+            "Level": "ZSKK",
+            "DescKey": "WSConventional",
+            "Value": "1"
+        },
+        "SYNTable": {
+            "Level": "ZSKK",
+            "DescKey": "SYNTable",
+            "Value": "1"
+        },
+        "SYNWall": {
+            "Level": "ZSKK",
+            "DescKey": "SYNWall",
+            "Value": "1"
+        },
+        "SYNFree": {
+            "Level": "ZSKK",
+            "DescKey": "SYNFree",
+            "Value": "1"
+        },
+        "SYNTomo": {
+            "Level": "ZSKK",
+            "DescKey": "SYNTomo",
+            "Value": "1"
+        },
+        "SYNConventional": {
+            "Level": "ZSKK",
+            "DescKey": "SYNConventional",
+            "Value": "1"
+        },
+        "TubeAngle": {
+            "Level": "ZSKK",
+            "DescKey": "TubeAngle",
+            "Value": "0"
+        },
+        "TubeTargetMaterial": {
+            "Level": "ZSKK",
+            "DescKey": "TubeTargetMaterial",
+            "Value": "MO"
+        },
+        "R20Enable": {
+            "Level": "ZSKK",
+            "DescKey": "R20Enable",
+            "Value": "1"
+        },
+        "USEEACMD": {
+            "Level": "ZSKK",
+            "DescKey": "USEEACMD",
+            "Value": "0"
+        }
+    },
+    "Action": {
+        "RestoreConfig": {
+			"DescKey": "",
+			"Params": "",
+			"RetParam": ""
+		},
+        "ActiveSyncMode": {
+			"WSName": "Table",
+			"SyncMode": "HWS",
+			"SyncModeValue": "1"
+		},
+        "RESET": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "SetExpDisable": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "SetExpEnable": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "IncParam_KV": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "IncParam_KVL": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "DecParam_KV": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "DecParam_KVL": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "IncParam_MA": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "IncParam_MAL": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "DecParam_MA": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "DecParam_MAL": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "IncParam_MAS": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "IncParam_MASL": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "DecParam_MAS": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "DecParam_MASL": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "IncParam_MS": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "IncParam_MSL": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "DecParam_MS": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "DecParam_MSL": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "IncParam_AECDENSITY": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "DecParam_AECDENSITY": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "SetAPR": {
+            "DescKey": "",
+            "Params": {
+                "P0": {
+                    "KV": "20",
+                    "MA": "0.00",
+                    "MS": "0.00",
+                    "MAS": "0.50",
+                    "FOCUS": "1",
+                    "TECHMODE": "1",
+                    "FILTER": "0",
+                    "DOSE": "0.00",
+                    "AECDENSITY": "0",
+                    "AECFILM": "0",
+                    "AECFIELD": "0",
+                    "TUBELOAD": "0.00",
+                    "WORKSTATION": "0"
+                }
+            },
+            "RetParam": ""
+        },
+        "Query_HE": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "SetGeneratortoSyncStatus": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "SetTubeAngle": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "SetTubeTargetMaterial": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "SetValue_KV": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "SetValue_MA": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "SetValue_MS": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "SetValue_MAS": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "SetValue_TECHMODE": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "SetValue_FOCUS": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "SetValue_AECDENSITY": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "SetValue_AECFIELD": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "SetValue_AECFILM": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "SetValue_WORKSTATION": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "GetValue_POSTKV": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "GetValue_POSTMA": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "GetValue_POSTMS": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "GetValue_POSTMAS": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "SetExpMode": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "SetFrameRate": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "SetModality": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "SetEXAMMode": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        },
+        "SetCollimatorLight": {
+            "DescKey": "",
+            "Params": "",
+            "RetParam": ""
+        }
+    },
+    "Get": {
+        "SupportSyncMode": {
+            "Level": "Public",
+            "DescKey": "SupportSyncMode",
+            "Value": {
+                "SingleRAD": {
+                    "HWS": "1",
+                    "FRE": "2"
+                },
+				"Gain": {
+                    "HWS": "1",
+                    "FRE": "2"
+                },
+				"Offset": {
+                    "HWS": "1",
+                    "FRE": "2"
+                },
+				"DDR": {
+                    "HWS": "1",
+                    "FRE": "2"
+                }
+            }
+        },
+        "GENERATORSTATUS": {
+            "Level": "Public",
+            "DescKey": "GENERATORSTATUS",
+            "Value": "0"
+        },
+        "GENERATORSYNCSTATE": {
+            "Level": "Public",
+            "DescKey": "GENERATORSYNCSTATE",
+            "Value": "0"
+        },
+        "ErrorList": {
+            "Level": "Public",
+            "DescKey": "ErrorList",
+            "Value": ""
+        },
+        "TUBEHEAT": {
+            "Level": "Public",
+            "DescKey": "TUBEHEAT",
+            "Value": "0"
+        },
+        "TubeAngle": {
+            "Level": "Public",
+            "DescKey": "TubeAngle",
+            "Value": "0"
+        },
+        "FOCUSSIZE": {
+            "Level": "ZSKK",
+            "DescKey": "FOCUSSIZE",
+            "Value": "0.1"
+        },
+        "TubeTargetMaterial": {
+            "Level": "ZSKK",
+            "DescKey": "TubeTargetMaterial",
+            "Value": "MO"
+        },
+        "BatteryChargeState": {
+            "Level": "Public",
+            "DescKey": "BatteryChargeState",
+            "Value": "2"
+        },
+        "BatteryPowerState": {
+            "Level": "Public",
+            "DescKey": "BatteryPowerState",
+            "Value": "2"
+        },
+        "MaxPower": {
+            "Level": "Private",
+            "DescKey": "kV*mA",
+            "Value": "5"
+        },
+        "MaxHeatContent": {
+            "Level": "Private",
+            "DescKey": "kV*mAs",
+            "Value": "225"
+        },
+        "KV": {
+            "Level":"Public",
+            "DescKey" : "KV",
+            "Value" : "0.00",
+            "min": "40.00",
+            "max": "120.00"
+        },
+        "MA": {
+            "Level": "Public",
+            "DescKey": "MA",
+            "Value": "0.00",
+            "min": "10.00",
+            "max": "1000.00"
+        },
+        "MS": {
+            "Level": "Public",
+            "DescKey": "MS",
+            "Value": "0.00",
+            "min": "1.00",
+            "max": "10000.00"
+        },
+        "MAS": {
+            "Level": "Public",
+            "DescKey": "MAS",
+            "Value": "0.00",
+            "min": "0.10",
+            "max": "1000.00"
+        },
+        "FOCUS": {
+            "Level": "Public",
+            "DescKey": "FOCUS",
+            "Value": "1"
+        },
+        "WORKSTATION": {
+            "Level": "Public",
+            "DescKey": "WORKSTATION",
+            "Value": "1"
+        },
+        "AECDENSITY": {
+            "Level": "Public",
+            "DescKey": "AECDENSITY",
+            "Value": "0"
+        },
+        "AECFIELD": {
+            "Level": "Public",
+            "DescKey": "AECFIELD",
+            "Value": "0"
+        },
+        "AECFILM": {
+            "Level": "Public",
+            "DescKey": "AECFILM",
+            "Value": "0"
+        },
+        "TECHMODE": {
+            "Level": "Public",
+            "DescKey": "TECHMODE",
+            "Value": "3"
+        },
+        "FrameRate": {
+            "Level": "Public",
+            "DescKey": "FrameRate",
+            "Value": "0"
+        },
+        "EXAMMODE": {
+            "Level": "Public",
+            "DescKey": "EXAMMODE",
+            "Value": "MANUAL"
+        },
+        "EXPMODE": {
+            "Level": "Public",
+            "DescKey": "EXPMODE",
+            "Value": "Single"
+        },
+        "POSTKV": {
+            "Level": "Public",
+            "DescKey": "POSTKV",
+            "Value": "0.00"
+        },
+        "POSTMA": {
+            "Level": "Public",
+            "DescKey": "POSTMA",
+            "Value": "0.00"
+        },
+        "POSTMAS": {
+            "Level": "Public",
+            "DescKey": "POSTMAS",
+            "Value": "0.00"
+        },
+        "POSTMS": {
+            "Level": "Public",
+            "DescKey": "POSTMS",
+            "Value": "0.00"
+        },
+        "connections": {
+            "Level": "Public",
+            "DescKey": "connections",
+            "Value": {
+                "type": "COM",
+                "port": "/dev/ttyUSB0",
+                "baudrate": "19200",
+                "bytesize": "8",
+                "parity": "0",
+                "stopbits": "2"
+            }
+        },
+        "FocusSmall": {
+            "Level": "ZSKK",
+            "DescKey": "FocusSmall",
+            "Value": "0.1"
+        },
+        "FocusLarge": {
+            "Level": "ZSKK",
+            "DescKey": "FocusLarge",
+            "Value": "0.3"
+        },
+        "logEnable": {
+            "Level": "Private",
+            "DescKey": "logEnable",
+            "Value": "1"
+        },
+        "loopEnable": {
+            "Level": "Private",
+            "DescKey": "loopEnable",
+            "Value": "1"
+        },
+        "loopTime": {
+            "Level": "Private",
+            "DescKey": "loopTime",
+            "Value": "2000"
+        },
+        "ReConnect": {
+            "Level": "Private",
+            "DescKey": "ReConnect",
+            "Value": "1"
+        },
+        "WSTable": {
+            "Level": "ZSKK",
+            "DescKey": "WSTable",
+            "Value": "1"
+        },
+        "WSWall": {
+            "Level": "ZSKK",
+            "DescKey": "WSWall",
+            "Value": "1"
+        },
+        "WSFree": {
+            "Level": "ZSKK",
+            "DescKey": "WSFree",
+            "Value": "1"
+        },
+        "WSTomo": {
+            "Level": "ZSKK",
+            "DescKey": "WSTomo",
+            "Value": "1"
+        },
+        "WSConventional": {
+            "Level": "ZSKK",
+            "DescKey": "WSConventional",
+            "Value": "1"
+        },
+        "SYNTable": {
+            "Level": "ZSKK",
+            "DescKey": "SYNTable",
+            "Value": "1"
+        },
+        "SYNWall": {
+            "Level": "ZSKK",
+            "DescKey": "SYNWall",
+            "Value": "1"
+        },
+        "SYNFree": {
+            "Level": "ZSKK",
+            "DescKey": "SYNFree",
+            "Value": "1"
+        },
+        "SYNTomo": {
+            "Level": "ZSKK",
+            "DescKey": "SYNTomo",
+            "Value": "1"
+        },
+        "SYNConventional": {
+            "Level": "ZSKK",
+            "DescKey": "SYNConventional",
+            "Value": "1"
+        },
+        "R20Enable": {
+            "Level": "ZSKK",
+            "DescKey": "R20Enable",
+            "Value": "0"
+        },
+        "USEEACMD": {
+            "Level": "ZSKK",
+            "DescKey": "USEEACMD",
+            "Value": "0"
+        }
+    }
+}

+ 54 - 0
bin/check_and_start_ccosprocgo.sh

@@ -0,0 +1,54 @@
+#!/bin/bash
+
+# 初始设置环境变量
+export LD_LIBRARY_PATH="./PlatformModule:$LD_LIBRARY_PATH"
+
+# 检查目录和文件
+DRIVER_CONFIG_DIR="./DriverConfig"
+if [ ! -d "$DRIVER_CONFIG_DIR" ]; then
+    echo "错误:DriverConfig目录不存在"
+    exit 1
+fi
+
+if [ ! -x "./CcosProcGo" ]; then
+    echo "错误:未找到可执行文件CcosProcGo"
+    exit 1
+fi
+
+# 统计文件数量
+FILE_COUNT=$(find "$DRIVER_CONFIG_DIR" -maxdepth 1 -type f | wc -l)
+if [ "$FILE_COUNT" -eq 0 ]; then
+    echo "警告:DriverConfig目录中没有文件"
+    exit 0
+fi
+
+echo "发现 $FILE_COUNT 个配置文件,开始检测进程状态..."
+
+# 计数器
+STARTED_COUNT=0
+ALREADY_RUNNING_COUNT=0
+
+# 遍历所有配置文件
+while IFS= read -r -d '' FILE_PATH; do
+    FILE_NAME=$(basename "$FILE_PATH")
+
+    # 检查是否已经有对应的进程在运行
+    # 使用 pgrep 查找进程名包含 CcosProcGo 和配置文件名的进程
+    if pgrep -f "CcosProcGo $FILE_NAME" > /dev/null 2>&1; then
+        echo "✓ 进程已运行:$FILE_NAME"
+        ((ALREADY_RUNNING_COUNT++))
+    else
+        echo "✗ 进程未运行,正在启动:$FILE_NAME"
+        ./CcosProcGo "$FILE_NAME" > /dev/null 2>&1 &
+        ((STARTED_COUNT++))
+    fi
+done < <(find "$DRIVER_CONFIG_DIR" -maxdepth 1 -type f -print0)
+
+echo ""
+echo "========== 执行结果 =========="
+echo "已运行的进程数:$ALREADY_RUNNING_COUNT"
+echo "新启动的进程数:$STARTED_COUNT"
+echo "总配置文件数:$FILE_COUNT"
+echo "=============================="
+
+exit 0

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است