diff --git a/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml b/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml index d280dbd..0a9f042 100644 --- a/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml +++ b/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml @@ -53,10 +53,11 @@ - - + + + + + @@ -134,4 +135,8 @@ + + + + \ No newline at end of file diff --git a/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml b/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml index 42032b9..eca950b 100644 --- a/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml +++ b/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml @@ -4,12 +4,13 @@ - + + - + @@ -31,15 +32,15 @@ - - + + - + - + @@ -49,13 +50,15 @@ - - + + + - + + @@ -128,6 +131,7 @@ + @@ -142,8 +146,11 @@ + + + @@ -326,6 +333,7 @@ + @@ -339,8 +347,11 @@ + + + diff --git a/App/SicSimulator/Config/DevicePM.xml b/App/SicSimulator/Config/DevicePM.xml index e0a658e..6298fdc 100644 --- a/App/SicSimulator/Config/DevicePM.xml +++ b/App/SicSimulator/Config/DevicePM.xml @@ -1,24 +1,14 @@  - + + + + diff --git a/App/SicSimulator/Config/_ioDefinePM.xml b/App/SicSimulator/Config/_ioDefinePM.xml index 5184125..e06e5e8 100644 --- a/App/SicSimulator/Config/_ioDefinePM.xml +++ b/App/SicSimulator/Config/_ioDefinePM.xml @@ -4,12 +4,13 @@ - + + - + @@ -31,15 +32,15 @@ - - + + - + - + @@ -49,13 +50,15 @@ - - + + + - + + @@ -128,6 +131,7 @@ + @@ -142,8 +146,11 @@ + + + @@ -281,15 +288,15 @@ - - - - - - - - - + + + + + + + + + @@ -326,6 +333,7 @@ + @@ -339,8 +347,11 @@ + + + diff --git a/App/SicUI/Models/PMs/PMOperationView.xaml b/App/SicUI/Models/PMs/PMOperationView.xaml index 320029a..789c989 100644 --- a/App/SicUI/Models/PMs/PMOperationView.xaml +++ b/App/SicUI/Models/PMs/PMOperationView.xaml @@ -17,7 +17,7 @@ xmlns:pm="clr-namespace:SicUI.Models.PMs" xmlns:system="clr-namespace:System;assembly=mscorlib" d:Background="#91b0cd" - d:DesignHeight="820" + d:DesignHeight="1000" d:DesignWidth="2560" lex:LocalizeDictionary.DesignCulture="." lex:ResxLocalizationProvider.DefaultAssembly="Sicentury.Localization" @@ -4868,8 +4868,8 @@ DeviceData); DATA.Subscribe($"{Module}.{Name}.DryPumpAlarm", () => DryPumpAlarm); - DATA.Subscribe($"{Module}.{Name}.PumpExhaustPress", () => PumpExhaustPress); + //DATA.Subscribe($"{Module}.{Name}.PumpExhaustPress", () => PumpExhaustPress); //DATA.Subscribe($"{Module}.{Name}.PumpCabExhaustDP", () => PumpCabExhaustDP); //DATA.Subscribe($"{Module}.{Name}.DryPumpFlow", () => DryPumpFlow); //DATA.Subscribe($"{Module}.{Name}.PumpForelineTemp", () => PumpForelineTemp);