diff --git a/App/SicRT/Config/System.sccfg b/App/SicRT/Config/System.sccfg index dbebd54..d18ec2d 100644 --- a/App/SicRT/Config/System.sccfg +++ b/App/SicRT/Config/System.sccfg @@ -2196,6 +2196,22 @@ + + + + + + + + + + + + + + + + diff --git a/App/SicRT/Equipments/Systems/DeviceManager.cs b/App/SicRT/Equipments/Systems/DeviceManager.cs index 78c50db..c5c3970 100644 --- a/App/SicRT/Equipments/Systems/DeviceManager.cs +++ b/App/SicRT/Equipments/Systems/DeviceManager.cs @@ -3,6 +3,7 @@ using Aitex.Core.RT.SCCore; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Breakers.NSXCOM; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.UPS; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Temps; +using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.MachineVision.HikVision; namespace SicRT.Instances { @@ -79,6 +80,19 @@ namespace SicRT.Instances QueueDevice(EATONUPS2); } + //强制构造vm类,是否加载放入构造函数中 + var hikvm = new HikVisionMasterSDK("LoadLock", "HikVisionMaster", "HikVisionMaster", + SC.GetConfigItem("HikVisionMaster.EnableDevice").BoolValue); + hikvm.Initialize(); + QueueDevice(hikvm); + + if (SC.GetConfigItem("HikGigeCamera.EnableDevice").BoolValue) + { + var hikc = new HikGigeCamera("LoadLock", "HikGigeCamera", "HikGigeCamera"); + hikc.Initialize(); + QueueDevice(hikc); + } + //if (SC.GetConfigItem("AKunTemp.EnableDevice").BoolValue) //{ // var AkOptics = new AKunTemp("PM1", "AKunTemp");