revise festo simulator config

CyberX8_RT/Config/Devices/FestoControllerCfg-Simulator.xml

@@ -1,5 +1,121 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FestoControllerConfig>
+	<FestoDeviceConfig Name="Festo1" IpAddress="127.0.0.1" Port="504" SendTimeout="2000" RecvTimeout="2000" DIStartAddress="45395" Channel="1">
+		<DO Name="c_METAL1_CIRCULATION"  Address="40003" Invert="false" Bit="0"/>
+		<DO Name="Festo.DO1"  Address="40003" Invert="false" Bit="1"/>
+		<DO Name="c_METAL2_CIRCULATION"  Address="40003" Invert="false" Bit="2"/>
+		<DO Name="Festo.DO3"  Address="40003" Invert="false" Bit="3"/>
+		<DO Name="Festo.DO4"  Address="40003" Invert="false" Bit="4"/>
+		<DO Name="Festo.DO5"  Address="40003" Invert="false" Bit="5"/>
+		<DO Name="Festo.DO6"  Address="40003" Invert="false" Bit="6"/>
+		<DO Name="Festo.DO7"  Address="40003" Invert="false" Bit="7"/>
+		<DO Name="Festo.DO8"  Address="40004" Invert="false" Bit="0"/>
+		<DO Name="Festo.DO9"  Address="40004" Invert="false" Bit="1"/>
+		<DO Name="c_QDRD1_DI_FILL" Address="40004" Invert="false" Bit="2"/>
+		<DO Name="c_QDRD1_DUMP" Address="40004" Invert="false" Bit="3"/>
+		<DO Name="c_RES1_DI_REPLEN" Address="40004" Invert="false" Bit="4"/>
+		<DO Name="c_QDRD2_DI_FILL" Address="40004" Invert="false" Bit="5"/>
+		<DO Name="c_QDRD2_DUMP" Address="40004" Invert="false" Bit="6"/>
+		<DO Name="c_RES2_DI_REPLEN" Address="40004" Invert="false" Bit="7"/>
+		<DO Name="c_QDRD3_DI_FILL" Address="40005" Invert="false" Bit="0"/>
+		<DO Name="c_QDRD3_DUMP" Address="40005" Invert="false" Bit="1"/>
+		<DO Name="c_RES3_DI_REPLEN" Address="40005" Invert="false" Bit="2"/>
+		<DO Name="c_PH2_FLOW_VALVE" Address="40005" Invert="false" Bit="3"/>
+		<DO Name="Festo.DO20" Address="40005" Invert="false" Bit="4"/>
+		<DO Name="Festo.DO21" Address="40005" Invert="false" Bit="5"/>
+		<DO Name="c_FILTER_PURGE_ENABLE" Address="40005" Invert="false" Bit="6"/>
+		<DO Name="c_SAMPLE_STATION_ENABLE" Address="40005" Invert="false" Bit="7"/>
+		<DO Name="c_QDRD1_WH_CLAMP" Address="40006" Invert="false" Bit="0"/>
+		<DO Name="Festo.DO25" Address="40006" Invert="false" Bit="1"/>
+		<DO Name="c_METAL1_WH_CLAMP" Address="40006" Invert="false" Bit="2"/>
+		<DO Name="Festo.DO27" Address="40006" Invert="false" Bit="3"/>
+		<DO Name="c_QDRD2_WH_CLAMP" Address="40006" Invert="false" Bit="4"/>
+		<DO Name="Festo.DO29" Address="40006" Invert="false" Bit="5"/>
+		<DO Name="c_METAL2_WH_CLAMP" Address="40006" Invert="false" Bit="6"/>
+		<DO Name="Festo.DO31" Address="40006" Invert="false" Bit="7"/>
+		<DO Name="c_QDRD3_WH_CLAMP" Address="40007" Invert="false" Bit="0"/>
+		<DO Name="Festo.DO33" Address="40007" Invert="false" Bit="1"/>
+		<DO Name="Festo.DO34" Address="40007" Invert="false" Bit="2"/>
+		<DO Name="Festo.DO35" Address="40007" Invert="false" Bit="3"/>
+		<DO Name="Festo.DO36" Address="40007" Invert="false" Bit="4"/>
+		<DO Name="Festo.DO37" Address="40007" Invert="false" Bit="5"/>
+		<DO Name="Festo.DO38" Address="40007" Invert="false" Bit="6"/>
+		<DO Name="Festo.DO39" Address="40007" Invert="false" Bit="7"/>
+		<DO Name="Festo.DO40" Address="40008" Invert="false" Bit="0"/>
+		<DO Name="Festo.DO41" Address="40008" Invert="false" Bit="1"/>
+		<DO Name="Festo.DO42" Address="40008" Invert="false" Bit="2"/>
+		<DO Name="Festo.DO43" Address="40008" Invert="false" Bit="3"/>
+		<DO Name="c_QDRD1_MDRAIN" Address="40008" Invert="false" Bit="4"/>
+		<DO Name="c_QDRD2_MDRAIN" Address="40008" Invert="false" Bit="5"/>
+		<DO Name="c_QDRD3_MDRAIN" Address="40008" Invert="false" Bit="6"/>
+		<DO Name="Festo.DO47" Address="40008" Invert="false" Bit="7"/>
+		<DO Name="Festo.DO48" Address="40009" Invert="false" Bit="0"/>
+		<DO Name="Festo.DO49" Address="40009" Invert="false" Bit="1"/>
+		<DO Name="Festo.DO50" Address="40009" Invert="false" Bit="2"/>
+		<DO Name="Festo.DO51" Address="40009" Invert="false" Bit="3"/>
+		<DO Name="Festo.DO52" Address="40009" Invert="false" Bit="4"/>
+		<DO Name="Festo.DO53" Address="40009" Invert="false" Bit="5"/>
+		<DO Name="Festo.DO54" Address="40009" Invert="false" Bit="6"/>
+		<DO Name="Festo.DO55" Address="40009" Invert="false" Bit="7"/>
+	</FestoDeviceConfig>
+	<FestoDeviceConfig Name="Festo2" IpAddress="127.0.0.1" Port="503" SendTimeout="2000" RecvTimeout="2000" DIStartAddress="45395" Channel="1">
+		<DO Name="c_QDRD4_DI_FILL"  Address="40003" Invert="false" Bit="0"/>
+		<DO Name="c_QDRD4_DUMP"  Address="40003" Invert="false" Bit="1"/>
+		<DO Name="Festo.DO2"  Address="40003" Invert="false" Bit="2"/>
+		<DO Name="Festo.DO3"  Address="40003" Invert="false" Bit="3"/>
+		<DO Name="Festo.DO4"  Address="40003" Invert="false" Bit="4"/>
+		<DO Name="Festo.DO5"  Address="40003" Invert="false" Bit="5"/>
+		<DO Name="c_RES4_DI_REPLEN"  Address="40003" Invert="false" Bit="6"/>
+		<DO Name="Festo.DO7"  Address="40003" Invert="false" Bit="7"/>
+		<DO Name="c_METAL3_CIRCULATION"  Address="40004" Invert="false" Bit="0"/>
+		<DO Name="Festo.DO9"  Address="40004" Invert="false" Bit="1"/>
+		<DO Name="c_METAL4_CIRCULATION" Address="40004" Invert="false" Bit="2"/>
+		<DO Name="Festo.DO11" Address="40004" Invert="false" Bit="3"/>
+		<DO Name="Festo.DO12" Address="40004" Invert="false" Bit="4"/>
+		<DO Name="Festo.DO13" Address="40004" Invert="false" Bit="5"/>
+		<DO Name="Festo.DO14" Address="40004" Invert="false" Bit="6"/>
+		<DO Name="Festo.DO15" Address="40004" Invert="false" Bit="7"/>
+		<DO Name="Festo.DO16" Address="40005" Invert="false" Bit="0"/>
+		<DO Name="Festo.DO17" Address="40005" Invert="false" Bit="1"/>
+		<DO Name="Festo.DO18" Address="40005" Invert="false" Bit="2"/>
+		<DO Name="Festo.DO19" Address="40005" Invert="false" Bit="3"/>
+		<DO Name="Festo.DO20" Address="40005" Invert="false" Bit="4"/>
+		<DO Name="c_PREWET_DI_FILL" Address="40005" Invert="false" Bit="5"/>
+		<DO Name="Festo.DO22" Address="40005" Invert="false" Bit="6"/>
+		<DO Name="c_DI_LOADER_ENABLE" Address="40005" Invert="false" Bit="7"/>
+		<DO Name="c_METAL3_WH_CLAMP" Address="40006" Invert="false" Bit="0"/>
+		<DO Name="Festo.DO25" Address="40006" Invert="false" Bit="1"/>
+		<DO Name="c_METAL4_WH_CLAMP" Address="40006" Invert="false" Bit="2"/>
+		<DO Name="Festo.DO27" Address="40006" Invert="false" Bit="3"/>
+		<DO Name="Festo.DO28" Address="40006" Invert="false" Bit="4"/>
+		<DO Name="Festo.DO29" Address="40006" Invert="false" Bit="5"/>
+		<DO Name="Festo.DO30" Address="40006" Invert="false" Bit="6"/>
+		<DO Name="Festo.DO31" Address="40006" Invert="false" Bit="7"/>
+		<DO Name="Festo.DO32" Address="40007" Invert="false" Bit="0"/>
+		<DO Name="Festo.DO33" Address="40007" Invert="false" Bit="1"/>
+		<DO Name="Festo.DO34" Address="40007" Invert="false" Bit="2"/>
+		<DO Name="Festo.DO35" Address="40007" Invert="false" Bit="3"/>
+		<DO Name="c_QDRD4_WH_CLAMP" Address="40007" Invert="false" Bit="4"/>
+		<DO Name="Festo.DO37" Address="40007" Invert="false" Bit="5"/>
+		<DO Name="Festo.DO38" Address="40007" Invert="false" Bit="6"/>
+		<DO Name="Festo.DO39" Address="40007" Invert="false" Bit="7"/>
+		<DO Name="Festo.DO40" Address="40008" Invert="false" Bit="0"/>
+		<DO Name="Festo.DO41" Address="40008" Invert="false" Bit="1"/>
+		<DO Name="Festo.DO42" Address="40008" Invert="false" Bit="2"/>
+		<DO Name="Festo.DO43" Address="40008" Invert="false" Bit="3"/>
+		<DO Name="c_QDRD4_MDRAIN" Address="40008" Invert="false" Bit="4"/>
+		<DO Name="Festo.DO45" Address="40008" Invert="false" Bit="5"/>
+		<DO Name="Festo.DO46" Address="40008" Invert="false" Bit="6"/>
+		<DO Name="Festo.DO47" Address="40008" Invert="false" Bit="7"/>
+		<DO Name="Festo.DO48" Address="40009" Invert="false" Bit="0"/>
+		<DO Name="Festo.DO49" Address="40009" Invert="false" Bit="1"/>
+		<DO Name="Festo.DO50" Address="40009" Invert="false" Bit="2"/>
+		<DO Name="Festo.DO51" Address="40009" Invert="false" Bit="3"/>
+		<DO Name="Festo.DO52" Address="40009" Invert="false" Bit="4"/>
+		<DO Name="Festo.DO53" Address="40009" Invert="false" Bit="5"/>
+		<DO Name="Festo.DO54" Address="40009" Invert="false" Bit="6"/>
+		<DO Name="Festo.DO55" Address="40009" Invert="false" Bit="7"/>
+	</FestoDeviceConfig>
 	<FestoDeviceConfig Name="Festo3" IpAddress="127.0.0.1" Port="502" SendTimeout="2000" RecvTimeout="2000" DIStartAddress="45395" Channel="1">
 		<DO Name="c_Transporter_Clamp"  Address="40003" Invert="false" Bit="0"/>
 		<DO Name="Festo.DO1" Address="40003" Invert="false" Bit="1"/>

CyberX8_RT/Config/Devices/SMCCfg.xml

@@ -5,6 +5,7 @@
     <Device Name="TC1-1" Address="1"/>
     <Device Name="TC1-2" Address="2"/>
     <Device Name="TC1-3" Address="3"/>
+    <Device Name="TC1-4" Address="4"/>
   </SMCDeviceConfig>
   <SMCDeviceConfig Name ="TC2" Port="com13" BaudRate="2400" Parity="N" Data="8" StopBit="1">
     <Device Name="TC2-1" Address="1"/>

CyberX8_Simulator/Devices/WagoSocketSimulator.cs

@@ -456,7 +456,7 @@ namespace CyberX8_Simulator.Devices
             if (AINameIndexDic.ContainsKey("r_N2_1B_PRESSURE")) AIShorts[AINameIndexDic["r_N2_1B_PRESSURE"]] = 5400;
             if (AINameIndexDic.ContainsKey("r_N2_1A_PRESSURE")) AIShorts[AINameIndexDic["r_N2_1A_PRESSURE"]] = 8900;
             if (AINameIndexDic.ContainsKey("r_N2_2B_PRESSURE")) AIShorts[AINameIndexDic["r_N2_2B_PRESSURE"]] = 5400;
-            if (AINameIndexDic.ContainsKey("r_N2_2A_PRESSURE")) AIShorts[AINameIndexDic["r_N2_2A_PRESSURE"]] = 8900;
+            if (AINameIndexDic.ContainsKey("r_N2_2A_PRESSURE")) AIShorts[AINameIndexDic["r_N2_2A_PRESSURE"]] = 5400;
             if (AINameIndexDic.ContainsKey("r_SYSTEM_VACUUM")) AIShorts[AINameIndexDic["r_SYSTEM_VACUUM"]] = 3276;
             if (AINameIndexDic.ContainsKey("r_CDA_HIGH_PRESSURE")) AIShorts[AINameIndexDic["r_CDA_HIGH_PRESSURE"]] = 10000;
             if (AINameIndexDic.ContainsKey("r_CDA_LOW_PRESSURE")) AIShorts[AINameIndexDic["r_CDA_LOW_PRESSURE"]] = 10000;