diff --git a/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml b/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml index 3520d62..43d26fc 100644 --- a/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml +++ b/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml @@ -1,94 +1,79 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml b/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml index 8526991..c90bcdd 100644 --- a/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml +++ b/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml @@ -318,7 +318,7 @@ - + @@ -339,7 +339,7 @@ - + @@ -386,8 +386,8 @@ - - + + diff --git a/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml b/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml index c20be7d..7514d67 100644 --- a/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml +++ b/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml @@ -318,7 +318,7 @@ - + @@ -386,8 +386,8 @@ - - + + diff --git a/App/SicSimulator/Config/DevicePM.xml b/App/SicSimulator/Config/DevicePM.xml index ccb20e4..6c77a9d 100644 --- a/App/SicSimulator/Config/DevicePM.xml +++ b/App/SicSimulator/Config/DevicePM.xml @@ -1,38 +1,38 @@  - + - + - - - - + --> + --> - + --> + --> + --> - - + --> + --> + --> + --> + --> + --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/App/SicSimulator/Config/_ioDefinePM.xml b/App/SicSimulator/Config/_ioDefinePM.xml index 8526991..c90bcdd 100644 --- a/App/SicSimulator/Config/_ioDefinePM.xml +++ b/App/SicSimulator/Config/_ioDefinePM.xml @@ -318,7 +318,7 @@ - + @@ -339,7 +339,7 @@ - + @@ -386,8 +386,8 @@ - - + + diff --git a/App/SicSimulator/Instances/SimulatorSystem.cs b/App/SicSimulator/Instances/SimulatorSystem.cs index 0356aaa..525b44d 100644 --- a/App/SicSimulator/Instances/SimulatorSystem.cs +++ b/App/SicSimulator/Instances/SimulatorSystem.cs @@ -36,7 +36,7 @@ namespace SicSimulator.Instances WcfServiceManager.Instance.Initialize(new Type[] { typeof(SimulatorAdsPlcService) }); - Singleton.Instance.Initialize(PathManager.GetCfgDir() + "DevicePM.xml", "GaN", ModuleName.PM1, "PM1"); + Singleton.Instance.Initialize(PathManager.GetCfgDir() + "DevicePM.xml", "Sic", ModuleName.PM1, "PM1"); //Singleton.Instance.Initialize(PathManager.GetCfgDir() + "DevicePM.xml", "GaN", ModuleName.PM2, "PM2"); //Singleton.Instance.Initialize(PathManager.GetCfgDir() + "DeviceTM.xml", "GaN", ModuleName.TM, "TM"); diff --git a/Framework/SimulatorCore/IoValves/SimulatorIoValve.cs b/Framework/SimulatorCore/IoValves/SimulatorIoValve.cs index d276aa8..9f2efa2 100644 --- a/Framework/SimulatorCore/IoValves/SimulatorIoValve.cs +++ b/Framework/SimulatorCore/IoValves/SimulatorIoValve.cs @@ -2,9 +2,11 @@ using Aitex.Core.RT.IOCore; using System; using System.Collections.Generic; +using System.Diagnostics; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Windows; using System.Xml; namespace MECF.Framework.Simulator.Core @@ -24,18 +26,29 @@ namespace MECF.Framework.Simulator.Core /// protected virtual void InitializeIValve(XmlElement node) { - XmlNodeList valveNodes = node.GetElementsByTagName("IoValve"); - foreach (XmlElement xmlElement in valveNodes) + string valveName = ""; + try { - string diName = xmlElement.GetAttribute("diOpen"); - string doName = xmlElement.GetAttribute("doOpen"); - if (!DI_DOList.ContainsKey(diName) && !DI_DOList.ContainsKey(doName)) - DI_DOList.Add(diName, doName); + XmlNodeList valveNodes = node.GetElementsByTagName("IoValve"); + foreach (XmlElement xmlElement in valveNodes) + { + string diName = xmlElement.GetAttribute("diOpen"); + string doName = xmlElement.GetAttribute("doOpen"); + valveName= diName; + if (!DI_DOList.ContainsKey(diName) && !DI_DOList.ContainsKey(doName)) + DI_DOList.Add(diName, doName); - var isDefaultOpen = xmlElement.GetAttribute("isDefaultOpen"); - if (!String.IsNullOrWhiteSpace(isDefaultOpen)) - IO.DO[$"{Module}.{doName}"].Value = Convert.ToBoolean(isDefaultOpen); + var isDefaultOpen = xmlElement.GetAttribute("isDefaultOpen"); + if (!String.IsNullOrWhiteSpace(isDefaultOpen)) + IO.DO[$"{Module}.{doName}"].Value = Convert.ToBoolean(isDefaultOpen); + } } + catch (Exception ex) + { + Debug.Assert(false, $"{DI_DOList.LastOrDefault().Value}--检查气动阀仿真配置"); + throw; + } + } protected override void HandleMonitor()