1. 更新VCE模拟器扫片结果

2. TM与PMIO初始压力变更为VAC
3. 删除部分eap文件
4. Menu updata

Mars/EfemDualRT/EfemDualRT.csproj

@@ -198,10 +198,6 @@
       <Project>{7c395751-abe6-4b5b-8f3a-bda0fce08f6c}</Project>
       <Name>RTModuleLibrary</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\FrameworkLocal\SimulatorCore\SimulatorCore.csproj">
-      <Project>{ebe55e3f-6dce-47b9-ac61-54a8b9b3482a}</Project>
-      <Name>SimulatorCore</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\FrameworkLocal\UICore\UICore.csproj">
       <Project>{2c9e1df3-1aba-4972-be60-41dd9b3c47a7}</Project>
       <Name>UICore</Name>

Mars/EfemDualSimulator/Instances/SimulatorSystem.cs

@@ -22,6 +22,7 @@ namespace EfemDualSimulator.Instances
 
         private readonly float ATM_THRESHOLD = 750000;
         private readonly float ATM_PRESSURE = 760000;
+        private readonly float VAC_PRESSURE = 30;
         private readonly uint VAC_SW_PRESSURE = 30;
         private readonly uint PROCESS_GAUGE = 10000;
 
@@ -131,8 +132,8 @@ namespace EfemDualSimulator.Instances
 
             // pressure
             SetAiValue($"{mod}.AI_ForelinePressure", 5000);
-            SetAiValue($"{mod}.AI_ChamberPressure", ATM_PRESSURE);
-            SetAiValue($"{mod}.AI_ProcessPressure", PROCESS_GAUGE);
+            SetAiValue($"{mod}.AI_ChamberPressure", VAC_PRESSURE);
+            SetAiValue($"{mod}.AI_ProcessPressure", VAC_PRESSURE);
             //SetAiValue($"{mod}.AI_Throttle_Valve_State", 1);
             //IO.AI[$"{mod}.AI_Throttle_Valve_State"].Value = 1;
             IO.AI[$"{mod}.AI_ThrottleValveRealPosition"].Value = 10;
@@ -243,10 +244,10 @@ namespace EfemDualSimulator.Instances
             IO.DI[$"{mod}.DI_TM_V"].Value = true;
 
             SetAiValue($"{mod}.AI_MFC_Flow", 3000);
-            SetAiValue($"{mod}.AI_VCE_L_Vacuum_Gauge", 3000);
-            SetAiValue($"{mod}.AI_VCE_R_Vacuum_Gauge", 3000);
-            SetAiValue($"{mod}.AI_Pipeline_Vacuum_Gauge", 3000);
-            SetAiValue($"{mod}.AI_TM_Vacuum_Gauge", 3000);
+            SetAiValue($"{mod}.AI_VCE_L_Vacuum_Gauge", 20);
+            SetAiValue($"{mod}.AI_VCE_R_Vacuum_Gauge", 20);
+            SetAiValue($"{mod}.AI_Pipeline_Vacuum_Gauge", 20);
+            SetAiValue($"{mod}.AI_TM_Vacuum_Gauge", 20);
         }
         private bool OnMonitor()
         {
@@ -1077,6 +1078,13 @@ namespace EfemDualSimulator.Instances
             this.SimulateMFC(ModuleName.PMB, 4);
             this.SimulateMFC(ModuleName.PMB, 5);
             this.SimulateMFC(ModuleName.PMB, 6);
+
+            this.SimulateMFC(ModuleName.PMC, 1);
+            this.SimulateMFC(ModuleName.PMC, 2);
+            this.SimulateMFC(ModuleName.PMC, 3);
+            this.SimulateMFC(ModuleName.PMC, 4);
+            this.SimulateMFC(ModuleName.PMC, 5);
+            this.SimulateMFC(ModuleName.PMC, 6);
         }
 
         private Dictionary<string, float> _lastMfcSetPoint = new Dictionary<string, float>();

Mars/EfemDualSimulator/Views/Simu_HongHuVceView.xaml.cs

@@ -88,7 +88,7 @@ namespace EfemDualSimulator.Views
                         OnWriteMessage("_RDY" + EOF);
                         return;
                     case "00,R,MI,S":
-                        OnWriteMessage("00,X,MI,XXXXXXXXX?,XXXXXXXXXC,XXXXX?????,??????????,XXXXXXXXXX,XXXXXXXXXX,XXXXX?????,??????????" + EOF);
+                        OnWriteMessage("00,X,MI,XXXXXXXXXX,XXXXXXXXXX,XXXXX?????,??????????,XXXXXXXXXX,XXXXXXXXXX,XXXXX?????,??????????" + EOF);
                         //OnWriteMessage("00,X,MI,0000000000,0000000000,XXXXX?????,??????????" + EOF);
                         Thread.Sleep(2000);
                         OnWriteMessage("_RDY" + EOF);

Mars/EfemDualUI/Config/Menu.xml

@@ -15,14 +15,9 @@
 
 	</menuItem>
 
-	<menuItem id="platform" resKey="Platform">
- 
-		<!--<menuItem id="efem" resKey="EFEM" viewmodel="EfemDualUI.Views.Platforms.EFEMs.EFEMViewModel,EfemDualUI" />-->
-
-		<!--<menuItem id="Mainframe" resKey="TM" viewmodel="EfemDualUI.Views.Platforms.Mainframes.MainframeViewModel,EfemDualUI" />-->
-		<!--<menuItem id="ioMainframe" resKey="IO" System="System.io" viewmodel="MECF.Framework.UI.Client.CenterViews.Maitenances.IO3.IO3ViewModel,MECF.Framework.UI.Client" />-->
-    <menuItem id="ioTM" resKey="TMIO" System="TM.io" viewmodel="MECF.Framework.UI.Client.CenterViews.Maitenances.IO3.IO3ViewModel,MECF.Framework.UI.Client" />
+	<menuItem id="platform" resKey="TMOpertion">
     <menuItem id="tmview" resKey="TMView" System="TM" viewmodel="EfemDualUI.Views.Platforms.TMs.TMViewModel,EfemDualUI" />
+    <menuItem id="ioTM" resKey="TMIO" System="TM.io" viewmodel="MECF.Framework.UI.Client.CenterViews.Maitenances.IO3.IO3ViewModel,MECF.Framework.UI.Client" />
 	<menuItem id="tmtransfer" resKey="TMTransferView" System="TM" viewmodel="EfemDualUI.Views.Platforms.TMs.TMTransferViewModel,EfemDualUI" />
 
 	</menuItem>
@@ -59,7 +54,6 @@
 		<menuItem id="LeakCheckPMA" resKey="LeakCheck" System="PMA"  viewmodel="EfemDualUI.Views.PMs.LeakCheckViewModel,EfemDualUI" />
 		<menuItem id="OESPMA" resKey="OES" System="PMA"  viewmodel="EfemDualUI.Views.PMs.OESViewModel,EfemDualUI" />
     <menuItem id="EPDPMA" resKey="EPD" System="PMA"  viewmodel="EfemDualUI.Views.PMs.EPDViewModel,EfemDualUI" />
-    <!--<menuItem id="calibrationPMA" resKey="RF Calibration" System="PMA" viewmodel="MECF.Framework.UI.Client.CenterViews.Maitenances.CalibrationTable.CalibrationTableViewModel,MECF.Framework.UI.Client" />-->
     <menuItem id="calibrationPMA" resKey="RF Calibration" System="PMA" viewmodel="EfemDualUI.Views.PMs.RFCalibrationViewModel,EfemDualUI" />
 		<menuItem id="verificationPMA" resKey="MFC Calibration" System="PMA" viewmodel="EfemDualUI.Views.PMs.MFCVerificationViewModel,EfemDualUI" />
 		<menuItem id="pidPMA" resKey="PID" System="IO.PMA" viewmodel="EfemDualUI.Views.PMs.PMPIDViewModel,EfemDualUI" />
@@ -76,7 +70,6 @@
 		<menuItem id="LeakCheckPMB" resKey="LeakCheck" System="PMB"  viewmodel="EfemDualUI.Views.PMs.LeakCheckViewModel,EfemDualUI" />
 		<menuItem id="OESPMB" resKey="OES" System="PMB"  viewmodel="EfemDualUI.Views.PMs.OESViewModel,EfemDualUI" />
     <menuItem id="EPDPMB" resKey="EPD" System="PMB"  viewmodel="EfemDualUI.Views.PMs.EPDViewModel,EfemDualUI" />
-    <!--<menuItem id="calibrationPMB" resKey="RF Calibration" System="PMB" viewmodel="MECF.Framework.UI.Client.CenterViews.Maitenances.CalibrationTable.CalibrationTableViewModel,MECF.Framework.UI.Client" />-->
     <menuItem id="calibrationPMB" resKey="RF Calibration" System="PMB" viewmodel="EfemDualUI.Views.PMs.RFCalibrationViewModel,EfemDualUI"  />
 		<menuItem id="verificationPMB" resKey="MFC Calibration" System="PMB" viewmodel="EfemDualUI.Views.PMs.MFCVerificationViewModel,EfemDualUI" />
 		<menuItem id="pidPMB" resKey="PID" System="IO.PMB" viewmodel="EfemDualUI.Views.PMs.PMPIDViewModel,EfemDualUI" />
@@ -92,7 +85,6 @@
     <menuItem id="LeakCheckPMC" resKey="LeakCheck" System="PMC"  viewmodel="EfemDualUI.Views.PMs.LeakCheckViewModel,EfemDualUI" />
     <menuItem id="OESPMC" resKey="OES" System="PMC"  viewmodel="EfemDualUI.Views.PMs.OESViewModel,EfemDualUI" />
     <menuItem id="EPDPMC" resKey="EPD" System="PMC"  viewmodel="EfemDualUI.Views.PMs.EPDViewModel,EfemDualUI" />
-    <!--<menuItem id="calibrationPMC" resKey="RF Calibration" System="PMC" viewmodel="MECF.Framework.UI.Client.CenterViews.Maitenances.CalibrationTable.CalibrationTableViewModel,MECF.Framework.UI.Client" />-->
     <menuItem id="calibrationPMC" resKey="RF Calibration" System="PMC" viewmodel="EfemDualUI.Views.PMs.RFCalibrationViewModel,EfemDualUI"  />
     <menuItem id="verificationPMC" resKey="MFC Calibration" System="PMC" viewmodel="EfemDualUI.Views.PMs.MFCVerificationViewModel,EfemDualUI" />
     <menuItem id="pidPMC" resKey="PID" System="IO.PMC" viewmodel="EfemDualUI.Views.PMs.PMPIDViewModel,EfemDualUI" />

Mars/EfemDualUI/Views/Platforms/TMs/TMTransferViewModel.cs

@@ -1,4 +1,5 @@
-using Aitex.Core.UI.MVVM;
+using Aitex.Core.Common.DeviceData;
+using Aitex.Core.UI.MVVM;
 using Aitex.Core.Util;
 using Aitex.Sorter.Common;
 using Caliburn.Micro;
@@ -342,12 +343,12 @@ namespace EfemDualUI.Views.Platforms.TMs
             set { m_RetractSoltSelectedIndex = value; }
         }
 
-        public bool VCEAInDoorIsOpen => (bool)QueryDataClient.Instance.Service.GetData("TM.LeftVCESlitDoorOpen");
-        public bool VCE1InDoor1IsOpen => VCEAInDoorIsOpen;
-        public bool VCE1InDoor2IsOpen => VCEAInDoorIsOpen;
-        public bool VCEBInDoorIsOpen => (bool)QueryDataClient.Instance.Service.GetData("TM.RightVCESlitDoorOpen");
-        public bool VCE2InDoor1IsOpen => VCEBInDoorIsOpen;
-        public bool VCE2InDoor2IsOpen => VCEBInDoorIsOpen;
+
+        public bool VCE1InDoor1IsOpen => LeftVCELSlitDoor.OpenFeedback;
+        public bool VCE1InDoor2IsOpen => LeftVCERSlitDoor.OpenFeedback;
+        public bool VCE2InDoor1IsOpen => RightVCELSlitDoor.OpenFeedback;
+        public bool VCE2InDoor2IsOpen => RightVCERSlitDoor.OpenFeedback;
+
         [Subscription("VCEA.LeftDoorIsClosed")]
         public bool VCEAOutDoor1IsClose { get; set; }
         [Subscription("VCEA.RightDoorIsClosed")]
@@ -357,12 +358,15 @@ namespace EfemDualUI.Views.Platforms.TMs
         public bool VCEBOutDoor1IsClose { get; set; }
         [Subscription("VCEB.RightDoorIsClose")]
         public bool VCEBOutDoor2IsClose { get; set; }
-
-        public bool VCEAOutDoor1IsOpen => !VCEAOutDoor1IsClose;
-        public bool VCEAOutDoor2IsOpen => !VCEAOutDoor2IsClose;
-        public bool VCEBOutDoor1IsOpen => !VCEBOutDoor1IsClose;
-        public bool VCEBOutDoor2IsOpen => !VCEBOutDoor2IsClose;
-
+        
+        [Subscription("TM.LeftVCELSlitDoor.DeviceData")]
+        public AITCylinderData LeftVCELSlitDoor { get; set; }
+        [Subscription("TM.LeftVCERSlitDoor.DeviceData")]
+        public AITCylinderData LeftVCERSlitDoor { get; set; }
+        [Subscription("TM.RightVCELSlitDoor.DeviceData")]
+        public AITCylinderData RightVCELSlitDoor { get; set; }
+        [Subscription("TM.RightVCERSlitDoor.DeviceData")]
+        public AITCylinderData RightVCERSlitDoor { get; set; }
         [Subscription("TM.LeftPMASlitDoorOpen")]
         public bool PMASlitValveOpenFeedback1 { get; set; }
         [Subscription("TM.RightPMASlitDoorOpen")]