diff --git a/App/Modules/SicModules/Config/TM/DeviceModelSystem.xml b/App/Modules/SicModules/Config/TM/DeviceModelSystem.xml
index 16a9d70..098fe31 100644
--- a/App/Modules/SicModules/Config/TM/DeviceModelSystem.xml
+++ b/App/Modules/SicModules/Config/TM/DeviceModelSystem.xml
@@ -1,17 +1,159 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/App/Modules/SicModules/Config/TM/IODefinePlatform.xml b/App/Modules/SicModules/Config/TM/IODefinePlatform.xml
index c666ad6..88ac3cb 100644
--- a/App/Modules/SicModules/Config/TM/IODefinePlatform.xml
+++ b/App/Modules/SicModules/Config/TM/IODefinePlatform.xml
@@ -1,169 +1,216 @@
-
+
-
-
+
+
+
+
+
+
+
+
+
+
-
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -174,72 +221,67 @@
-
+
-
-
-
+
+
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
diff --git a/App/SicRT/Properties/AssemblyInfo.cs b/App/SicRT/Properties/AssemblyInfo.cs
index abc0cc8..6d1e8b0 100644
--- a/App/SicRT/Properties/AssemblyInfo.cs
+++ b/App/SicRT/Properties/AssemblyInfo.cs
@@ -51,7 +51,7 @@ using System.Windows;
// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
// 方法是按如下所示使用“*”: :
-[assembly: AssemblyVersion("1.1.7.60610")]
+[assembly: AssemblyVersion("1.1.0.60731")]
[assembly: AssemblyInformationalVersion("MoS2（无EFEM）")]
diff --git a/App/SicSimulator/Config/DeviceTM.xml b/App/SicSimulator/Config/DeviceTM.xml
index 321fb45..d0925c5 100644
--- a/App/SicSimulator/Config/DeviceTM.xml
+++ b/App/SicSimulator/Config/DeviceTM.xml
@@ -1,11 +1,11 @@
-
-
+
+
+ -->
+ -->
+ -->
-
+
-
-
-
-
-
\ No newline at end of file
diff --git a/App/SicSimulator/Config/IODefinePlatform.xml b/App/SicSimulator/Config/IODefinePlatform.xml
index 84e5979..88ac3cb 100644
--- a/App/SicSimulator/Config/IODefinePlatform.xml
+++ b/App/SicSimulator/Config/IODefinePlatform.xml
@@ -16,7 +16,7 @@
-
+
@@ -25,7 +25,7 @@
-
+
@@ -37,7 +37,6 @@
-
@@ -45,9 +44,6 @@
-
-
-
@@ -60,9 +56,6 @@
-
-
-
@@ -116,8 +109,8 @@
-
-
+
+
@@ -174,8 +167,8 @@
-
-
+
+
@@ -210,8 +203,6 @@
-
-
diff --git a/App/SicSimulator/Instances/SimulatorSystem.cs b/App/SicSimulator/Instances/SimulatorSystem.cs
index 525b44d..9c96963 100644
--- a/App/SicSimulator/Instances/SimulatorSystem.cs
+++ b/App/SicSimulator/Instances/SimulatorSystem.cs
@@ -37,8 +37,8 @@ namespace SicSimulator.Instances
WcfServiceManager.Instance.Initialize(new Type[] { typeof(SimulatorAdsPlcService) });
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");
+ //Singleton.Instance.Initialize(PathManager.GetCfgDir() + "DevicePM.xml", "Sic", ModuleName.PM2, "PM2");
+ Singleton.Instance.Initialize(PathManager.GetCfgDir() + "DeviceTM.xml", "Sic", ModuleName.TM, "TM");
_thread = new PeriodicJob(200, OnMonitor, nameof(SimulatorSystem), true);
}
diff --git a/App/SicUI/Models/Maintenances/TM/TMView.xaml b/App/SicUI/Models/Maintenances/TM/TMView.xaml
index 6666ced..f6d87ae 100644
--- a/App/SicUI/Models/Maintenances/TM/TMView.xaml
+++ b/App/SicUI/Models/Maintenances/TM/TMView.xaml
@@ -11,17 +11,16 @@
xmlns:deviceControl="clr-namespace:Aitex.Core.UI.DeviceControl;assembly=MECF.Framework.UI.Core"
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
xmlns:industrialcontrol="clr-namespace:MECF.Framework.UI.Client.IndustrialControl;assembly=MECF.Framework.UI.Client"
- xmlns:lex="http://wpflocalizeextension.codeplex.com"
xmlns:m2c4parts="clr-namespace:SicUI.Controls.M2C4Parts"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:unitControls="clr-namespace:MECF.Framework.UI.Client.Ctrlib.UnitControls;assembly=MECF.Framework.UI.Client"
- d:Background="#91b0cd"
+ xmlns:lex="http://wpflocalizeextension.codeplex.com"
d:DesignHeight="800"
d:DesignWidth="1920"
+ mc:Ignorable="d"
lex:LocalizeDictionary.DesignCulture="en"
lex:ResxLocalizationProvider.DefaultAssembly="Sicentury.Localization"
- lex:ResxLocalizationProvider.DefaultDictionary="lang_common"
- mc:Ignorable="d">
+ lex:ResxLocalizationProvider.DefaultDictionary="lang_common">
DimGray
LightGray
@@ -89,8 +88,8 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="0,0,0,1">
-
+
@@ -241,8 +240,8 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
-
+
@@ -650,8 +649,8 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
-
+
@@ -1600,8 +1599,8 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
-
+