Bläddra i källkod

update VPW MainIO content

chenkui 1 dag sedan
förälder
incheckning
587667fd0f

+ 22 - 22
PunkHPX8_RT/Config/Devices/ModuleIOCfg.xml

@@ -141,28 +141,28 @@
 		<IO Name="SRD2.WaterFlow" IOName="r_SRD2_WATER_FLOW"/>
 		<IO Name="SRD2.N2On" IOName="c_SRD2_N2_FLOW_ON"/>		
 	</Module>
-	<Module Name="VpwMain">
-		<IO Name="VpwMain.ChamberClosed" IOName="r_VPW_CHAMBER_CLOSED"/>
-		<IO Name="VpwMain.ChamberOpened" IOName="r_VPW_CHAMBER_OPENED"/>
-		<IO Name="VpwMain.ChamberClose" IOName="c_VPW_CHAMBER_CLOSE"/>
-		<IO Name="VpwMain.LeakDetected" IOName="r_VPW_LEAK_DETECT"/>
-		<IO Name="VpwMain.VacuumPumpPressure" IOName="r_VPW_VAC_PUMP_PRESSURE"/>
-		<IO Name="VpwMain.VacuumPumpPower" IOName="c_VPW_VACUUM_PUMP_POWER"/>
-		<IO Name="VpwMain.VacuumPumpEnable" IOName="c_VPW_VACUUM_PUMP_ENABLE"/>
-		<IO Name="VpwMain.VacuumPumpSpeedEnable" IOName="c_VPW_VACUUM_PUMP_SPEED_ENABLE"/>
-		<IO Name="VpwMain.VacuumPumpSpeed" IOName="c_VPW_VACUUM_PUMP_SPEED"/>
-		<IO Name="VpwMain.BoosterPumpSpeed" IOName="c_VPW_BOOSTER_PUMP_SPPED"/>
-		<IO Name="VpwMain.BoosterPumpEnable" IOName="c_VPW_BOOSTER_PUMP_ENABLE"/>
-		<IO Name="VpwMain.BoosterPumpStatus" IOName="r_VPW_BOOSTER_PUMP_STATUS"/>
-		<IO Name="VpwMain.DiwEnable" IOName="c_VPW_DIW_EABLE"/>
-		<IO Name="VpwMain.DiwProcess" IOName="c_VPW_DIW_PROCESS"/>
-		<IO Name="VpwMain.DiwDegas" IOName="c_VPW_DIW_DEGAS"/>
-		<IO Name="VpwMain.DiwTotalFlow" IOName="r_VPW_DIW_TOTAL_FLOW"/>
-		<IO Name="VpwMain.DiwPressure" IOName="r_VPW_DIW_PRESSURE"/>
-		<IO Name="VpwMain.DegasAdjust" IOName="c_VPW_DEGAS_ADJUST"/>
-		<IO Name="VpwMain.DegasPurge" IOName="c_VPW_DEGAS_PURGE"/>
-		<IO Name="VpwMain.DegasPumpEnable" IOName="c_VPW_DEGAS_PUMP_ENABLE"/>
-		<IO Name="VpwMain.DegasPumpPressure" IOName="r_VPW_DEGAS_PUMP_PRESSURE"/>
+	<Module Name="VPWMain1">
+		<IO Name="VPWMain1.ChamberClosed" IOName="r_VPW_CHAMBER_CLOSED"/>
+		<IO Name="VPWMain1.ChamberOpened" IOName="r_VPW_CHAMBER_OPENED"/>
+		<IO Name="VPWMain1.ChamberClose" IOName="c_VPW_CHAMBER_CLOSE"/>
+		<IO Name="VPWMain1.LeakDetected" IOName="r_VPW_LEAK_DETECT"/>
+		<IO Name="VPWMain1.VacuumPumpPressure" IOName="r_VPW_VAC_PUMP_PRESSURE"/>
+		<IO Name="VPWMain1.VacuumPumpPower" IOName="c_VPW_VACUUM_PUMP_POWER"/>
+		<IO Name="VPWMain1.VacuumPumpEnable" IOName="c_VPW_VACUUM_PUMP_ENABLE"/>
+		<IO Name="VPWMain1.VacuumPumpSpeedEnable" IOName="c_VPW_VACUUM_PUMP_SPEED_ENABLE"/>
+		<IO Name="VPWMain1.VacuumPumpSpeed" IOName="c_VPW_VACUUM_PUMP_SPEED"/>
+		<IO Name="VPWMain1.BoosterPumpSpeed" IOName="c_VPW_BOOSTER_PUMP_SPPED"/>
+		<IO Name="VPWMain1.BoosterPumpEnable" IOName="c_VPW_BOOSTER_PUMP_ENABLE"/>
+		<IO Name="VPWMain1.BoosterPumpStatus" IOName="r_VPW_BOOSTER_PUMP_STATUS"/>
+		<IO Name="VPWMain1.DiwEnable" IOName="c_VPW_DIW_EABLE"/>
+		<IO Name="VPWMain1.DiwProcess" IOName="c_VPW_DIW_PROCESS"/>
+		<IO Name="VPWMain1.DiwDegas" IOName="c_VPW_DIW_DEGAS"/>
+		<IO Name="VPWMain1.DiwTotalFlow" IOName="r_VPW_DIW_TOTAL_FLOW"/>
+		<IO Name="VPWMain1.DiwPressure" IOName="r_VPW_DIW_PRESSURE"/>
+		<IO Name="VPWMain1.DegasAdjust" IOName="c_VPW_DEGAS_ADJUST"/>
+		<IO Name="VPWMain1.DegasPurge" IOName="c_VPW_DEGAS_PURGE"/>
+		<IO Name="VPWMain1.DegasPumpEnable" IOName="c_VPW_DEGAS_PUMP_ENABLE"/>
+		<IO Name="VPWMain1.DegasPumpPressure" IOName="r_VPW_DEGAS_PUMP_PRESSURE"/>
 	</Module>
 	<Module Name="VPW1">
 		<IO Name="VPW1.DiwFlow" IOName="r_VPW_DIW_CELL_1_FLOW"/>

+ 1 - 2
PunkHPX8_RT/Devices/VpwMain/VpwMainDevice.cs

@@ -108,7 +108,6 @@ namespace PunkHPX8_RT.Devices.VpwMain
         private void SubscribeValueAction()
         {
             IoSubscribeUpdateVariable(CHAMBER_CLOSED);
-            IoSubscribeUpdateVariable(CHAMBER_CLOSED);
             IoSubscribeUpdateVariable(CHAMBER_OPENED);
             IoSubscribeUpdateVariable(BOOSTER_PUMP_STATUS);
             IoSubscribeUpdateVariable(BOOSTER_PUMP_SPEED);
@@ -134,7 +133,7 @@ namespace PunkHPX8_RT.Devices.VpwMain
         /// <param name="variable"></param>
         private void IoSubscribeUpdateVariable(string variable)
         {
-            _variableInitializeDic[variable] = false;
+             _variableInitializeDic[variable] = false;
             IOModuleManager.Instance.SubscribeModuleVariable(Module, variable, UpdateVariableValue);
         }
 

+ 1 - 1
PunkHPX8_Twincate/PunkHPX8.project.~u

@@ -1,4 +1,4 @@
 JET-CK
 DESKTOP-JCT1016
 4172
-638864364942150304
+638864370298267372