Home Explore Help
Register Sign In
Jet
/
Electrical
Watch 1
Star 0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

update

guobin 5 days ago
parent
d677d0a448 4c94d88ab2
commit
8432113337
5 changed files with 33 additions and 17 deletions
Unified View Show Diff Stats
  1. 7 7
      TIN001/TIN001/TIN001/PMC.tsproj
  2. 7 7
      TIN001/TIN001/TIN001/PMC.tsproj.bak
  3. 5 1
      TIN001/TIN001/TIN001/PMC/PMC.tmc
  4. 9 1
      TIN001/TIN001/TIN001/_Boot/TwinCAT RT (x64)/CurrentConfig.xml
  5. 5 1
      TIN001/TIN001/TIN001/_Boot/TwinCAT RT (x64)/Plc/Port_851.cid

+ 7 - 7
TIN001/TIN001/TIN001/PMC.tsproj
View File 

@@ -12612,7 +12612,7 @@ External Setpoint Generation:
 
 						<DeviceData>0001058f92ea</DeviceData>
 
 						<DeviceData>0001058f92ea</DeviceData>
 
 					</Pnp>
 
 					</Pnp>
 
 				</AddressInfo>
 
 				</AddressInfo>
 
-				<Ethernet DeviceDesc="X001 (TwinCAT-Intel PCI Ethernet Adapter (Gigabit))" SwitchToNdis="true" Ports="8" VLanMode="2" TcpIpPort="-1" MaxSwitchPorts="20" MaxSwitchFrames="680" MaxSwitchMACs="300" VLanIds="0a0014001e00280032003c00460050005a0064006e00780082008c009600a000aa00b400be00c800d200dc00e600f000fa0004010e01180122012c01360140014a0154015e01680172017c01860190019a01a401ae01b801c201cc01d601e001ea01f401fe01080212021c02260230023a0244024e02580262026c0276028002">
 
+				<Ethernet DeviceDesc="X001 (TwinCAT-Intel PCI Ethernet Adapter (Gigabit))" SwitchToNdis="true" Ports="8" VLanMode="2" TcpIpPort="-1" MaxSwitchPorts="36" MaxSwitchFrames="980" MaxSwitchMACs="300" VLanIds="0a0014001e00280032003c00460050005a0064006e00780082008c009600a000aa00b400be00c800d200dc00e600f000fa0004010e01180122012c01360140014a0154015e01680172017c01860190019a01a401ae01b801c201cc01d601e001ea01f401fe01080212021c02260230023a0244024e02580262026c0276028002">
 
 					<Esl SyncSlaveProtocolPort="-1"/>
 
 					<Esl SyncSlaveProtocolPort="-1"/>
 
 				</Ethernet>
 
 				</Ethernet>
 
 			</Device>
 
 			</Device>
 
@@ -23922,8 +23922,8 @@ External Setpoint Generation:
 
 						<CoeProfile ProfileNo="132453259"/>
 
 						<CoeProfile ProfileNo="132453259"/>
 
 					</EtherCAT>
 
 					</EtherCAT>
 
 				</Box>
 
 				</Box>
 
-				<EtherCAT FreerunCycle="20" EnableVirtualSwitch="true" MaxSwitchPorts="13" MaxSwitchFrames="340">
 
-					<Redundancy Mode="2" AdapterReference="true" AdapterOID="#x03010032" IpAddress="#xa9fe05da" IpMask="#xa9fe05da" PreviousPort="16777368" Mac="0001058f92ea"/>
 
+				<EtherCAT FreerunCycle="20" EnableVirtualSwitch="true" MaxSwitchPorts="26" MaxSwitchFrames="540" MaxSwitchMACs="100">
 
+					<Redundancy Mode="2" AdapterReference="true" AdapterOID="#x03010032" PreviousPort="16777368" Mac="0001058f92ea"/>
 
 				</EtherCAT>
 
 				</EtherCAT>
 
 			</Device>
 
 			</Device>
 
 			<Device Id="7" DevType="111" DevFlags="#x0003" AmsPort="28679" AmsNetId="192.168.250.1.8.1" RemoteName="Device 7 (EtherCAT)" InfoImageId="10">
 
 			<Device Id="7" DevType="111" DevFlags="#x0003" AmsPort="28679" AmsNetId="192.168.250.1.8.1" RemoteName="Device 7 (EtherCAT)" InfoImageId="10">
 
@@ -30747,8 +30747,8 @@ External Setpoint Generation:
 
 						<CoeProfile ProfileNo="136319883"/>
 
 						<CoeProfile ProfileNo="136319883"/>
 
 					</EtherCAT>
 
 					</EtherCAT>
 
 				</Box>
 
 				</Box>
 
-				<EtherCAT FreerunCycle="20" EnableVirtualSwitch="true" MaxSwitchPorts="7" MaxSwitchFrames="220">
 
-					<Redundancy Mode="2" AdapterReference="true" AdapterOID="#x03010034" IpAddress="#xa9fe05da" IpMask="#xa9fe05da" PreviousPort="16777280" Mac="0001058f92ea"/>
 
+				<EtherCAT FreerunCycle="20" EnableVirtualSwitch="true" MaxSwitchPorts="10" MaxSwitchFrames="320" MaxSwitchMACs="100">
 
+					<Redundancy Mode="2" AdapterReference="true" AdapterOID="#x03010034" PreviousPort="16777280" Mac="0001058f92ea"/>
 
 				</EtherCAT>
 
 				</EtherCAT>
 
 			</Device>
 
 			</Device>
 
 			<Device Id="8" DevType="111" DevFlags="#x0003" AmsPort="28680" AmsNetId="192.168.250.1.9.1" RemoteName="Device 8 (EtherCAT)" InfoImageId="12">
 
 			<Device Id="8" DevType="111" DevFlags="#x0003" AmsPort="28680" AmsNetId="192.168.250.1.9.1" RemoteName="Device 8 (EtherCAT)" InfoImageId="12">
 
@@ -37178,8 +37178,8 @@ Bit1: Value smaller than Limit2]]></Comment>
 
 						</Pdo>
 
 						</Pdo>
 
 					</EtherCAT>
 
 					</EtherCAT>
 
 				</Box>
 
 				</Box>
 
-				<EtherCAT FreerunCycle="10" DcSyncMode="3" EnableVirtualSwitch="true" MaxSwitchPorts="2" MaxSwitchFrames="120">
 
-					<Redundancy Mode="2" AdapterReference="true" AdapterOID="#x03010036" IpAddress="#xa9fe05da" IpMask="#xa9fe05da" PreviousPort="16777337" Mac="0001058f92ea"/>
 
+				<EtherCAT FreerunCycle="10" DcSyncMode="3" EnableVirtualSwitch="true" MaxSwitchPorts="2" MaxSwitchFrames="120" MaxSwitchMACs="100">
 
+					<Redundancy Mode="2" AdapterReference="true" AdapterOID="#x03010036" PreviousPort="16777337" Mac="0001058f92ea"/>
 
 				</EtherCAT>
 
 				</EtherCAT>
 
 			</Device>
 
 			</Device>
 
 		</Io>
 
 		</Io>

+ 7 - 7
TIN001/TIN001/TIN001/PMC.tsproj.bak
View File 

@@ -12611,7 +12611,7 @@ External Setpoint Generation:
 
 						<DeviceData>0001058f92ea</DeviceData>
 
 						<DeviceData>0001058f92ea</DeviceData>
 
 					</Pnp>
 
 					</Pnp>
 
 				</AddressInfo>
 
 				</AddressInfo>
 
-				<Ethernet DeviceDesc="X001 (TwinCAT-Intel PCI Ethernet Adapter (Gigabit))" SwitchToNdis="true" Ports="8" VLanMode="2" TcpIpPort="-1" MaxSwitchPorts="20" MaxSwitchFrames="680" MaxSwitchMACs="300" VLanIds="0a0014001e00280032003c00460050005a0064006e00780082008c009600a000aa00b400be00c800d200dc00e600f000fa0004010e01180122012c01360140014a0154015e01680172017c01860190019a01a401ae01b801c201cc01d601e001ea01f401fe01080212021c02260230023a0244024e02580262026c0276028002">
 
+				<Ethernet DeviceDesc="X001 (TwinCAT-Intel PCI Ethernet Adapter (Gigabit))" SwitchToNdis="true" Ports="8" VLanMode="2" TcpIpPort="-1" MaxSwitchPorts="36" MaxSwitchFrames="980" MaxSwitchMACs="300" VLanIds="0a0014001e00280032003c00460050005a0064006e00780082008c009600a000aa00b400be00c800d200dc00e600f000fa0004010e01180122012c01360140014a0154015e01680172017c01860190019a01a401ae01b801c201cc01d601e001ea01f401fe01080212021c02260230023a0244024e02580262026c0276028002">
 
 					<Esl SyncSlaveProtocolPort="-1"/>
 
 					<Esl SyncSlaveProtocolPort="-1"/>
 
 				</Ethernet>
 
 				</Ethernet>
 
 			</Device>
 
 			</Device>
 
@@ -23921,8 +23921,8 @@ External Setpoint Generation:
 
 						<CoeProfile ProfileNo="132453259"/>
 
 						<CoeProfile ProfileNo="132453259"/>
 
 					</EtherCAT>
 
 					</EtherCAT>
 
 				</Box>
 
 				</Box>
 
-				<EtherCAT FreerunCycle="20" EnableVirtualSwitch="true" MaxSwitchPorts="13" MaxSwitchFrames="340">
 
-					<Redundancy Mode="2" AdapterReference="true" AdapterOID="#x03010032" IpAddress="#xa9fe05da" IpMask="#xa9fe05da" PreviousPort="16777368" Mac="0001058f92ea"/>
 
+				<EtherCAT FreerunCycle="20" EnableVirtualSwitch="true" MaxSwitchPorts="26" MaxSwitchFrames="540" MaxSwitchMACs="100">
 
+					<Redundancy Mode="2" AdapterReference="true" AdapterOID="#x03010032" PreviousPort="16777368" Mac="0001058f92ea"/>
 
 				</EtherCAT>
 
 				</EtherCAT>
 
 			</Device>
 
 			</Device>
 
 			<Device Id="7" DevType="111" DevFlags="#x0003" AmsPort="28679" AmsNetId="192.168.250.1.8.1" RemoteName="Device 7 (EtherCAT)" InfoImageId="10">
 
 			<Device Id="7" DevType="111" DevFlags="#x0003" AmsPort="28679" AmsNetId="192.168.250.1.8.1" RemoteName="Device 7 (EtherCAT)" InfoImageId="10">
 
@@ -30746,8 +30746,8 @@ External Setpoint Generation:
 
 						<CoeProfile ProfileNo="136319883"/>
 
 						<CoeProfile ProfileNo="136319883"/>
 
 					</EtherCAT>
 
 					</EtherCAT>
 
 				</Box>
 
 				</Box>
 
-				<EtherCAT FreerunCycle="20" EnableVirtualSwitch="true" MaxSwitchPorts="7" MaxSwitchFrames="220">
 
-					<Redundancy Mode="2" AdapterReference="true" AdapterOID="#x03010034" IpAddress="#xa9fe05da" IpMask="#xa9fe05da" PreviousPort="16777280" Mac="0001058f92ea"/>
 
+				<EtherCAT FreerunCycle="20" EnableVirtualSwitch="true" MaxSwitchPorts="10" MaxSwitchFrames="320" MaxSwitchMACs="100">
 
+					<Redundancy Mode="2" AdapterReference="true" AdapterOID="#x03010034" PreviousPort="16777280" Mac="0001058f92ea"/>
 
 				</EtherCAT>
 
 				</EtherCAT>
 
 			</Device>
 
 			</Device>
 
 			<Device Id="8" DevType="111" DevFlags="#x0003" AmsPort="28680" AmsNetId="192.168.250.1.9.1" RemoteName="Device 8 (EtherCAT)" InfoImageId="12">
 
 			<Device Id="8" DevType="111" DevFlags="#x0003" AmsPort="28680" AmsNetId="192.168.250.1.9.1" RemoteName="Device 8 (EtherCAT)" InfoImageId="12">
 
@@ -37177,8 +37177,8 @@ Bit1: Value smaller than Limit2]]></Comment>
 
 						</Pdo>
 
 						</Pdo>
 
 					</EtherCAT>
 
 					</EtherCAT>
 
 				</Box>
 
 				</Box>
 
-				<EtherCAT FreerunCycle="10" DcSyncMode="3" EnableVirtualSwitch="true" MaxSwitchPorts="2" MaxSwitchFrames="120">
 
-					<Redundancy Mode="2" AdapterReference="true" AdapterOID="#x03010036" IpAddress="#xa9fe05da" IpMask="#xa9fe05da" PreviousPort="16777337" Mac="0001058f92ea"/>
 
+				<EtherCAT FreerunCycle="10" DcSyncMode="3" EnableVirtualSwitch="true" MaxSwitchPorts="2" MaxSwitchFrames="120" MaxSwitchMACs="100">
 
+					<Redundancy Mode="2" AdapterReference="true" AdapterOID="#x03010036" PreviousPort="16777337" Mac="0001058f92ea"/>
 
 				</EtherCAT>
 
 				</EtherCAT>
 
 			</Device>
 
 			</Device>
 
 		</Io>
 
 		</Io>

File diff suppressed because it is too large
+ 5 - 1
TIN001/TIN001/TIN001/PMC/PMC.tmc


File diff suppressed because it is too large
+ 9 - 1
TIN001/TIN001/TIN001/_Boot/TwinCAT RT (x64)/CurrentConfig.xml


+ 5 - 1
TIN001/TIN001/TIN001/_Boot/TwinCAT RT (x64)/Plc/Port_851.cid
View File 

@@ -1 +1,5 @@
 
-¾-A¦ê7!åô™º
 
+<<<<<<< HEAD
 
+¾-A¦ê7!åô™º
 
+=======
 
+>ò|­;Ð-¬?Šdzî§
 
+>>>>>>> 4c94d88ab20b3575735c25c6de1d38bfe62a867b