luosheng/Modbus.Net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Critial Bug Fix in Connector. Samples Bug Fix.

Browse Source
This commit is contained in:
luosheng
2023-02-15 16:18:57 +08:00
parent b880acff6d
commit af928c5932
313 changed files with 84 additions and 524 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Modbus.Net/Modbus.Net.Modbus/ModbusMachine.cs
View File

@@ -44,7 +44,7 @@ namespace Modbus.Net.Modbus
public ModbusMachine(TKey id, ModbusType connectionType, string connectionString,
IEnumerable<AddressUnit<TUnitKey>> getAddresses, byte slaveAddress, byte masterAddress,
Endian endian = Endian.BigEndianLsb)
: this(id, connectionType, connectionString, getAddresses, false, slaveAddress, masterAddress, endian)
: this(id, connectionType, connectionString, getAddresses, true, slaveAddress, masterAddress, endian)
{
}
}
@@ -89,7 +89,7 @@ namespace Modbus.Net.Modbus
public ModbusMachine(string id, ModbusType connectionType, string connectionString,
IEnumerable<AddressUnit> getAddresses, byte slaveAddress, byte masterAddress,
Endian endian = Endian.BigEndianLsb)
: this(id, connectionType, connectionString, getAddresses, false, slaveAddress, masterAddress, endian)
: this(id, connectionType, connectionString, getAddresses, true, slaveAddress, masterAddress, endian)
{
}
}

4
Modbus.Net/Modbus.Net.Siemens/SiemensMachine.cs
View File

@@ -46,7 +46,7 @@ namespace Modbus.Net.Siemens
/// <param name="dst">PLC模块位，0到7，仅200使用，其它型号不要填写</param>
public SiemensMachine(TKey id, SiemensType connectionType, string connectionString, SiemensMachineModel model,
IEnumerable<AddressUnit<TUnitKey>> getAddresses, byte slaveAddress, byte masterAddress, byte src = 1, byte dst = 0)
: this(id, connectionType, connectionString, model, getAddresses, false, slaveAddress, masterAddress, src, dst)
: this(id, connectionType, connectionString, model, getAddresses, true, slaveAddress, masterAddress, src, dst)
{
}
}
@@ -93,7 +93,7 @@ namespace Modbus.Net.Siemens
/// <param name="dst">PLC模块位，0到7，仅200使用，其它型号不要填写</param>
public SiemensMachine(string id, SiemensType connectionType, string connectionString, SiemensMachineModel model,
IEnumerable<AddressUnit> getAddresses, byte slaveAddress, byte masterAddress, byte src = 1, byte dst = 0)
: this(id, connectionType, connectionString, model, getAddresses, false, slaveAddress, masterAddress, src, dst)
: this(id, connectionType, connectionString, model, getAddresses, true, slaveAddress, masterAddress, src, dst)
{
}
}

25
Modbus.Net/Modbus.Net/Connector/TcpConnector.cs
View File

@@ -87,20 +87,16 @@ namespace Modbus.Net
/// <param name="disposing"></param>
protected virtual void Dispose(bool disposing)
{
if (!m_disposed)
if (disposing)
{
if (disposing)
{
// Release managed resources
}
// Release unmanaged resources
if (_socketClient != null)
{
CloseClientSocket();
_socketClient = null;
Log.Debug("Tcp client {ConnectionToken} Disposed", ConnectionToken);
}
m_disposed = true;
// Release managed resources
}
// Release unmanaged resources
if (_socketClient != null)
{
CloseClientSocket();
_socketClient = null;
Log.Debug("Tcp client {ConnectionToken} Disposed", ConnectionToken);
}
}
@@ -312,9 +308,8 @@ namespace Modbus.Net
{
if (_socketClient.Connected)
{
_socketClient.GetStream().Dispose();
_socketClient.Close();
}
_socketClient?.Close();
}
}
catch (Exception ex)

24
Modbus.Net/Modbus.Net/Connector/UdpConnector.cs
View File

@@ -28,8 +28,6 @@ namespace Modbus.Net
private UdpClient _socketClient;
private bool m_disposed;
private Task _receiveThread;
private bool _taskCancel = false;
@@ -74,20 +72,16 @@ namespace Modbus.Net
/// <param name="disposing"></param>
protected virtual void Dispose(bool disposing)
{
if (!m_disposed)
if (disposing)
{
if (disposing)
{
// Release managed resources
}
// Release unmanaged resources
if (_socketClient != null)
{
CloseClientSocket();
_socketClient = null;
Log.Debug("Udp client {ConnectionToken} Disposed", ConnectionToken);
}
m_disposed = true;
// Release managed resources
}
// Release unmanaged resources
if (_socketClient != null)
{
CloseClientSocket();
_socketClient = null;
Log.Debug("Udp client {ConnectionToken} Disposed", ConnectionToken);
}
}

BIN
Samples/Automation Projects/Automation/CrossLamp.backup/2016-10-29.032516.651/2016-10-29.032516.651.zip
View File

Binary file not shown.

BIN
Samples/Automation Projects/Automation/CrossLamp.backup/2016-10-29.053103.200/2016-10-29.053103.200.zip
View File

Binary file not shown.

0
Samples/Automation Projects/Automation/TaskManager/AdditionalFiles/PLCM/plcmArchive.pma → Samples/Automation Projects/Automation/CrossLamp/AdditionalFiles/PLCM/plcmArchive.pma15_0
View File

5
Samples/Automation Projects/Automation/CrossLamp/CrossLamp.ap13 → Samples/Automation Projects/Automation/CrossLamp/CrossLamp.ap18
View File

File diff suppressed because one or more lines are too long

BIN
Samples/Automation Projects/Automation/CrossLamp/IM/SPL/options Normal file
View File

Binary file not shown.

BIN
Samples/Automation Projects/Automation/CrossLamp/IM/SearchIndex/_0.cfs Normal file
View File

Binary file not shown.

BIN
Samples/Automation Projects/Automation/CrossLamp/IM/SearchIndex/_0_1.del Normal file
View File

Binary file not shown.

BIN
Samples/Automation Projects/Automation/CrossLamp/IM/SearchIndex/_1.cfs Normal file
View File

Binary file not shown.

BIN
Samples/Automation Projects/Automation/CrossLamp/IM/SearchIndex/_1_1.del Normal file
View File

Binary file not shown.

BIN
Samples/Automation Projects/Automation/CrossLamp/IM/SearchIndex/_2.cfs Normal file
View File

Binary file not shown.

BIN
Samples/Automation Projects/Automation/CrossLamp/IM/SearchIndex/_2_1.del Normal file
View File

Binary file not shown.

BIN
Samples/Automation Projects/Automation/CrossLamp/IM/SearchIndex/_3.cfs Normal file
View File

Binary file not shown.

BIN
Samples/Automation Projects/Automation/CrossLamp/IM/SearchIndex/segments.gen Normal file
View File

Binary file not shown.

BIN
Samples/Automation Projects/Automation/CrossLamp/IM/SearchIndex/segments_8 Normal file
View File

Binary file not shown.

BIN
Samples/Automation Projects/Automation/CrossLamp/System/PEData.idx
View File

Binary file not shown.

BIN
Samples/Automation Projects/Automation/CrossLamp/System/PEData.plf
View File

Binary file not shown.

26
Samples/Automation Projects/Automation/CrossLamp/System/PEData/Meta/ChangeListConsumer/HmiBase.xml
View File

@@ -1,26 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ClMetaConsumer xmlns="http://www.siemens.com/Automation/2004/04/ObjectFrame/ClMetaConsumer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:schemaLocation="http://www.siemens.com/Automation/2004/04/ObjectFrame/ClMetaConsumer Automation-ObjectFrame-ChangeList-Consumer-v1.0.xsd">
<Package name="HmiBase" version="2.0.0.0">
<TargetCompiler name="Siemens.Simatic.Hmi.Es2rt" version="2.0.0.0">
<ConsumedObject name="Siemens.Automation.DomainModel.SystemTextRangeListData" filter="False" resolveTextualReference="False" />
<ConsumedObject name="Siemens.Automation.DomainModel.UserTextRangeListData" filter="False" resolveTextualReference="False" />
<ConsumedObject name="Siemens.Simatic.AlarmServices.ObjectFrame.Private.SimpleControllerAlarmData" filter="False" resolveTextualReference="False" />
<ConsumedObject name="Siemens.Simatic.Hmi.Utah.Common.Base.HmiBaseBL" filter="False" resolveTextualReference="False">
<Interface name="Siemens.Automation.ObjectFrame.ICoreAttributes">
<IncludeProperty name="Author" />
<IncludeProperty name="Comment" />
<IncludeProperty name="Name" />
</Interface>
</ConsumedObject>
<ConsumedObject name="Siemens.Simatic.Hmi.Utah.Globalization.HmiTextData" filter="False" resolveTextualReference="False">
<Interface name="Siemens.Automation.ObjectFrame.ICoreAttributes">
<IncludeProperty name="Author" />
<IncludeProperty name="Comment" />
<IncludeProperty name="Name" />
</Interface>
</ConsumedObject>
<ConsumedObject name="Siemens.Simatic.SystemDiagnosis.Model.ComponentTextlistData" filter="False" resolveTextualReference="False" />
<ConsumedObject name="Siemens.Simatic.SystemDiagnosis.Model.ErrorTextlistProxyData" filter="False" resolveTextualReference="False" />
</TargetCompiler>
</Package>
</ClMetaConsumer>

26
Samples/Automation Projects/Automation/CrossLamp/System/PEData/Meta/ChangeListConsumer/Iecpl.xml
View File

@@ -1,26 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ClMetaConsumer xmlns="http://www.siemens.com/Automation/2004/04/ObjectFrame/ClMetaConsumer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:schemaLocation="http://www.siemens.com/Automation/2004/04/ObjectFrame/ClMetaConsumer Automation-ObjectFrame-ChangeList-Consumer-v1.0.xsd">
<Package name="HmiBase" version="2.0.0.0">
<TargetCompiler name="Siemens.Simatic.Hmi.Es2rt" version="2.0.0.0">
<ConsumedObject name="Siemens.Automation.DomainModel.SystemTextRangeListData" filter="False" resolveTextualReference="False" />
<ConsumedObject name="Siemens.Automation.DomainModel.UserTextRangeListData" filter="False" resolveTextualReference="False" />
<ConsumedObject name="Siemens.Simatic.AlarmServices.ObjectFrame.Private.SimpleControllerAlarmData" filter="False" resolveTextualReference="False" />
<ConsumedObject name="Siemens.Simatic.Hmi.Utah.Common.Base.HmiBaseBL" filter="False" resolveTextualReference="False">
<Interface name="Siemens.Automation.ObjectFrame.ICoreAttributes">
<IncludeProperty name="Author" />
<IncludeProperty name="Comment" />
<IncludeProperty name="Name" />
</Interface>
</ConsumedObject>
<ConsumedObject name="Siemens.Simatic.Hmi.Utah.Globalization.HmiTextData" filter="False" resolveTextualReference="False">
<Interface name="Siemens.Automation.ObjectFrame.ICoreAttributes">
<IncludeProperty name="Author" />
<IncludeProperty name="Comment" />
<IncludeProperty name="Name" />
</Interface>
</ConsumedObject>
<ConsumedObject name="Siemens.Simatic.SystemDiagnosis.Model.ComponentTextlistData" filter="False" resolveTextualReference="False" />
<ConsumedObject name="Siemens.Simatic.SystemDiagnosis.Model.ErrorTextlistProxyData" filter="False" resolveTextualReference="False" />
</TargetCompiler>
</Package>
</ClMetaConsumer>

26
Samples/Automation Projects/Automation/CrossLamp/System/PEData/Meta/ChangeListConsumer/Siemens.Simatic.Lang.IPI.Target.xml
View File

@@ -1,26 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ClMetaConsumer xmlns="http://www.siemens.com/Automation/2004/04/ObjectFrame/ClMetaConsumer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:schemaLocation="http://www.siemens.com/Automation/2004/04/ObjectFrame/ClMetaConsumer Automation-ObjectFrame-ChangeList-Consumer-v1.0.xsd">
<Package name="HmiBase" version="2.0.0.0">
<TargetCompiler name="Siemens.Simatic.Hmi.Es2rt" version="2.0.0.0">
<ConsumedObject name="Siemens.Automation.DomainModel.SystemTextRangeListData" filter="False" resolveTextualReference="False" />
<ConsumedObject name="Siemens.Automation.DomainModel.UserTextRangeListData" filter="False" resolveTextualReference="False" />
<ConsumedObject name="Siemens.Simatic.AlarmServices.ObjectFrame.Private.SimpleControllerAlarmData" filter="False" resolveTextualReference="False" />
<ConsumedObject name="Siemens.Simatic.Hmi.Utah.Common.Base.HmiBaseBL" filter="False" resolveTextualReference="False">
<Interface name="Siemens.Automation.ObjectFrame.ICoreAttributes">
<IncludeProperty name="Author" />
<IncludeProperty name="Comment" />
<IncludeProperty name="Name" />
</Interface>
</ConsumedObject>
<ConsumedObject name="Siemens.Simatic.Hmi.Utah.Globalization.HmiTextData" filter="False" resolveTextualReference="False">
<Interface name="Siemens.Automation.ObjectFrame.ICoreAttributes">
<IncludeProperty name="Author" />
<IncludeProperty name="Comment" />
<IncludeProperty name="Name" />
</Interface>
</ConsumedObject>
<ConsumedObject name="Siemens.Simatic.SystemDiagnosis.Model.ComponentTextlistData" filter="False" resolveTextualReference="False" />
<ConsumedObject name="Siemens.Simatic.SystemDiagnosis.Model.ErrorTextlistProxyData" filter="False" resolveTextualReference="False" />
</TargetCompiler>
</Package>
</ClMetaConsumer>

32
Samples/Automation Projects/Automation/CrossLamp/System/PEData/Meta/ChangeListProvider/Siemens.Automation.DomainModel.xml
View File

@@ -1,32 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ClMetaProvider xmlns="http://www.siemens.com/Automation/2004/04/ObjectFrame/ClMetaProvider" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:schemaLocation="http://www.siemens.com/Automation/2004/04/ObjectFrame/ClMetaProvider Automation-ObjectFrame-ChangeList-Provider-v1.0.xsd">
<Package name="Siemens.Automation.DomainModel" version="1.1.0.0">
<ProviderObject name="Siemens.Automation.DomainModel.ReferenceTagData">
<Interface name="IBlTag">
<TrackedObject name="Siemens.Automation.DomainModel.ControllerRootTagBaseData">
<TrackedRelation name="ReferencedByRefTagAsRoot">
<Property name="CompileTime">
<TrackedAttribute name="Siemens.Automation.DomainServices.CommonTypeSystem.IStructureRoot.CompileTime" />
</Property>
<Property name="IsValid">
<TrackedAttribute name="Siemens.Automation.DomainServices.CommonTypeSystem.IStructureRoot.IsValid" />
</Property>
</TrackedRelation>
</TrackedObject>
<TrackedObject name="Siemens.Automation.DomainModel.EAMTZTagData">
<TrackedRelation name="ReferencedByRefTag">
<Property name="DataTypeName">
<TrackedAttribute name="Siemens.Automation.DomainServices.CommonTypeSystem.IStructureItem.DisplayTypeName" />
</Property>
<Property name="LogicalAddress">
<TrackedAttribute name="Siemens.Automation.DomainModel.ITagAddress.LogicalAddress" />
</Property>
<Property name="Name">
<TrackedAttribute name="Siemens.Automation.ObjectFrame.ICoreAttributes.Name" />
</Property>
</TrackedRelation>
</TrackedObject>
</Interface>
</ProviderObject>
</Package>
</ClMetaProvider>

BIN
Samples/Automation Projects/Automation/CrossLamp/Vci/Vci.db Normal file
View File

Binary file not shown.

BIN
Samples/Automation Projects/Automation/CrossLamp/XRef/XRef.db Normal file
View File

Binary file not shown.

BIN
Samples/Automation Projects/Automation/TaskManager.backup/2016-10-31.012647.315/2016-10-31.012647.315.zip
View File

Binary file not shown.

BIN
Samples/Automation Projects/Automation/TaskManager.backup/2016-10-31.015515.387/2016-10-31.015515.387.zip
View File

Binary file not shown.

BIN
Samples/Automation Projects/Automation/TaskManager/System/PEData.idx
View File

Binary file not shown.

BIN
Samples/Automation Projects/Automation/TaskManager/System/PEData.plf
View File

Binary file not shown.

26
Samples/Automation Projects/Automation/TaskManager/System/PEData/Meta/ChangeListConsumer/HmiBase.xml
View File

@@ -1,26 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ClMetaConsumer xmlns="http://www.siemens.com/Automation/2004/04/ObjectFrame/ClMetaConsumer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:schemaLocation="http://www.siemens.com/Automation/2004/04/ObjectFrame/ClMetaConsumer Automation-ObjectFrame-ChangeList-Consumer-v1.0.xsd">
<Package name="HmiBase" version="2.0.0.0">
<TargetCompiler name="Siemens.Simatic.Hmi.Es2rt" version="2.0.0.0">
<ConsumedObject name="Siemens.Automation.DomainModel.SystemTextRangeListData" filter="False" resolveTextualReference="False" />
<ConsumedObject name="Siemens.Automation.DomainModel.UserTextRangeListData" filter="False" resolveTextualReference="False" />
<ConsumedObject name="Siemens.Simatic.AlarmServices.ObjectFrame.Private.SimpleControllerAlarmData" filter="False" resolveTextualReference="False" />
<ConsumedObject name="Siemens.Simatic.Hmi.Utah.Common.Base.HmiBaseBL" filter="False" resolveTextualReference="False">
<Interface name="Siemens.Automation.ObjectFrame.ICoreAttributes">
<IncludeProperty name="Author" />
<IncludeProperty name="Comment" />
<IncludeProperty name="Name" />
</Interface>
</ConsumedObject>
<ConsumedObject name="Siemens.Simatic.Hmi.Utah.Globalization.HmiTextData" filter="False" resolveTextualReference="False">
<Interface name="Siemens.Automation.ObjectFrame.ICoreAttributes">
<IncludeProperty name="Author" />
<IncludeProperty name="Comment" />
<IncludeProperty name="Name" />
</Interface>
</ConsumedObject>
<ConsumedObject name="Siemens.Simatic.SystemDiagnosis.Model.ComponentTextlistData" filter="False" resolveTextualReference="False" />
<ConsumedObject name="Siemens.Simatic.SystemDiagnosis.Model.ErrorTextlistProxyData" filter="False" resolveTextualReference="False" />
</TargetCompiler>
</Package>
</ClMetaConsumer>

26
Samples/Automation Projects/Automation/TaskManager/System/PEData/Meta/ChangeListConsumer/Iecpl.xml
View File

@@ -1,26 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ClMetaConsumer xmlns="http://www.siemens.com/Automation/2004/04/ObjectFrame/ClMetaConsumer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:schemaLocation="http://www.siemens.com/Automation/2004/04/ObjectFrame/ClMetaConsumer Automation-ObjectFrame-ChangeList-Consumer-v1.0.xsd">
<Package name="HmiBase" version="2.0.0.0">
<TargetCompiler name="Siemens.Simatic.Hmi.Es2rt" version="2.0.0.0">
<ConsumedObject name="Siemens.Automation.DomainModel.SystemTextRangeListData" filter="False" resolveTextualReference="False" />
<ConsumedObject name="Siemens.Automation.DomainModel.UserTextRangeListData" filter="False" resolveTextualReference="False" />
<ConsumedObject name="Siemens.Simatic.AlarmServices.ObjectFrame.Private.SimpleControllerAlarmData" filter="False" resolveTextualReference="False" />
<ConsumedObject name="Siemens.Simatic.Hmi.Utah.Common.Base.HmiBaseBL" filter="False" resolveTextualReference="False">
<Interface name="Siemens.Automation.ObjectFrame.ICoreAttributes">
<IncludeProperty name="Author" />
<IncludeProperty name="Comment" />
<IncludeProperty name="Name" />
</Interface>
</ConsumedObject>
<ConsumedObject name="Siemens.Simatic.Hmi.Utah.Globalization.HmiTextData" filter="False" resolveTextualReference="False">
<Interface name="Siemens.Automation.ObjectFrame.ICoreAttributes">
<IncludeProperty name="Author" />
<IncludeProperty name="Comment" />
<IncludeProperty name="Name" />
</Interface>
</ConsumedObject>
<ConsumedObject name="Siemens.Simatic.SystemDiagnosis.Model.ComponentTextlistData" filter="False" resolveTextualReference="False" />
<ConsumedObject name="Siemens.Simatic.SystemDiagnosis.Model.ErrorTextlistProxyData" filter="False" resolveTextualReference="False" />
</TargetCompiler>
</Package>
</ClMetaConsumer>

26
Samples/Automation Projects/Automation/TaskManager/System/PEData/Meta/ChangeListConsumer/Siemens.Simatic.Lang.IPI.Target.xml
View File

@@ -1,26 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ClMetaConsumer xmlns="http://www.siemens.com/Automation/2004/04/ObjectFrame/ClMetaConsumer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:schemaLocation="http://www.siemens.com/Automation/2004/04/ObjectFrame/ClMetaConsumer Automation-ObjectFrame-ChangeList-Consumer-v1.0.xsd">
<Package name="HmiBase" version="2.0.0.0">
<TargetCompiler name="Siemens.Simatic.Hmi.Es2rt" version="2.0.0.0">
<ConsumedObject name="Siemens.Automation.DomainModel.SystemTextRangeListData" filter="False" resolveTextualReference="False" />
<ConsumedObject name="Siemens.Automation.DomainModel.UserTextRangeListData" filter="False" resolveTextualReference="False" />
<ConsumedObject name="Siemens.Simatic.AlarmServices.ObjectFrame.Private.SimpleControllerAlarmData" filter="False" resolveTextualReference="False" />
<ConsumedObject name="Siemens.Simatic.Hmi.Utah.Common.Base.HmiBaseBL" filter="False" resolveTextualReference="False">
<Interface name="Siemens.Automation.ObjectFrame.ICoreAttributes">
<IncludeProperty name="Author" />
<IncludeProperty name="Comment" />
<IncludeProperty name="Name" />
</Interface>
</ConsumedObject>
<ConsumedObject name="Siemens.Simatic.Hmi.Utah.Globalization.HmiTextData" filter="False" resolveTextualReference="False">
<Interface name="Siemens.Automation.ObjectFrame.ICoreAttributes">
<IncludeProperty name="Author" />
<IncludeProperty name="Comment" />
<IncludeProperty name="Name" />
</Interface>
</ConsumedObject>
<ConsumedObject name="Siemens.Simatic.SystemDiagnosis.Model.ComponentTextlistData" filter="False" resolveTextualReference="False" />
<ConsumedObject name="Siemens.Simatic.SystemDiagnosis.Model.ErrorTextlistProxyData" filter="False" resolveTextualReference="False" />
</TargetCompiler>
</Package>
</ClMetaConsumer>

32
Samples/Automation Projects/Automation/TaskManager/System/PEData/Meta/ChangeListProvider/Siemens.Automation.DomainModel.xml
View File

@@ -1,32 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ClMetaProvider xmlns="http://www.siemens.com/Automation/2004/04/ObjectFrame/ClMetaProvider" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:schemaLocation="http://www.siemens.com/Automation/2004/04/ObjectFrame/ClMetaProvider Automation-ObjectFrame-ChangeList-Provider-v1.0.xsd">
<Package name="Siemens.Automation.DomainModel" version="1.1.0.0">
<ProviderObject name="Siemens.Automation.DomainModel.ReferenceTagData">
<Interface name="IBlTag">
<TrackedObject name="Siemens.Automation.DomainModel.ControllerRootTagBaseData">
<TrackedRelation name="ReferencedByRefTagAsRoot">
<Property name="CompileTime">
<TrackedAttribute name="Siemens.Automation.DomainServices.CommonTypeSystem.IStructureRoot.CompileTime" />
</Property>
<Property name="IsValid">
<TrackedAttribute name="Siemens.Automation.DomainServices.CommonTypeSystem.IStructureRoot.IsValid" />
</Property>
</TrackedRelation>
</TrackedObject>
<TrackedObject name="Siemens.Automation.DomainModel.EAMTZTagData">
<TrackedRelation name="ReferencedByRefTag">
<Property name="DataTypeName">
<TrackedAttribute name="Siemens.Automation.DomainServices.CommonTypeSystem.IStructureItem.DisplayTypeName" />
</Property>
<Property name="LogicalAddress">
<TrackedAttribute name="Siemens.Automation.DomainModel.ITagAddress.LogicalAddress" />
</Property>
<Property name="Name">
<TrackedAttribute name="Siemens.Automation.ObjectFrame.ICoreAttributes.Name" />
</Property>
</TrackedRelation>
</TrackedObject>
</Interface>
</ProviderObject>
</Package>
</ClMetaProvider>

4
Samples/Automation Projects/Automation/TaskManager/TaskManager.ap13
View File

File diff suppressed because one or more lines are too long

BIN
Samples/Automation Projects/Automation/TripleAdd.backup/2016-10-29.052827.070/2016-10-29.052827.070.zip
View File

Binary file not shown.

BIN
Samples/Automation Projects/Automation/TripleAdd.backup/2016-10-31.072854.749/2016-10-31.072854.749.zip
View File

Binary file not shown.

BIN
Samples/Automation Projects/Automation/TripleAdd.backup/2016-10-31.113155.245/2016-10-31.113155.245.zip
View File

Binary file not shown.

0
Samples/Automation Projects/Simulation/CrossLamp.Simulation/AdditionalFiles/PLCM/plcmArchive.pma → Samples/Automation Projects/Automation/TripleAdd/AdditionalFiles/PLCM/plcmArchive.pma15_0
View File

BIN
Samples/Automation Projects/Automation/TripleAdd/IM/SPL/options Normal file
View File

Binary file not shown.

BIN
Samples/Automation Projects/Automation/TripleAdd/IM/SearchIndex/_0.cfs Normal file
View File

Binary file not shown.

BIN
Samples/Automation Projects/Automation/TripleAdd/IM/SearchIndex/_0_2.del Normal file
View File

Binary file not shown.

BIN
Samples/Automation Projects/Automation/TripleAdd/IM/SearchIndex/_1.cfs Normal file
View File

Binary file not shown.

BIN
Samples/Automation Projects/Automation/TripleAdd/IM/SearchIndex/_2.cfs Normal file
View File

Binary file not shown.

BIN
Samples/Automation Projects/Automation/TripleAdd/IM/SearchIndex/_2_1.del Normal file
View File

Binary file not shown.

BIN
Samples/Automation Projects/Automation/TripleAdd/IM/SearchIndex/_3.cfs Normal file
View File

Binary file not shown.

BIN
Samples/Automation Projects/Automation/TripleAdd/IM/SearchIndex/segments.gen Normal file
View File

Binary file not shown.

BIN
Samples/Automation Projects/Automation/TripleAdd/IM/SearchIndex/segments_6 Normal file
View File

Binary file not shown.

BIN
Samples/Automation Projects/Automation/TripleAdd/System/PEData.idx
View File

Binary file not shown.

BIN
Samples/Automation Projects/Automation/TripleAdd/System/PEData.plf
View File

Binary file not shown.

26
Samples/Automation Projects/Automation/TripleAdd/System/PEData/Meta/ChangeListConsumer/HmiBase.xml
View File

@@ -1,26 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ClMetaConsumer xmlns="http://www.siemens.com/Automation/2004/04/ObjectFrame/ClMetaConsumer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:schemaLocation="http://www.siemens.com/Automation/2004/04/ObjectFrame/ClMetaConsumer Automation-ObjectFrame-ChangeList-Consumer-v1.0.xsd">
<Package name="HmiBase" version="2.0.0.0">
<TargetCompiler name="Siemens.Simatic.Hmi.Es2rt" version="2.0.0.0">
<ConsumedObject name="Siemens.Automation.DomainModel.SystemTextRangeListData" filter="False" resolveTextualReference="False" />
<ConsumedObject name="Siemens.Automation.DomainModel.UserTextRangeListData" filter="False" resolveTextualReference="False" />
<ConsumedObject name="Siemens.Simatic.AlarmServices.ObjectFrame.Private.SimpleControllerAlarmData" filter="False" resolveTextualReference="False" />
<ConsumedObject name="Siemens.Simatic.Hmi.Utah.Common.Base.HmiBaseBL" filter="False" resolveTextualReference="False">
<Interface name="Siemens.Automation.ObjectFrame.ICoreAttributes">
<IncludeProperty name="Author" />
<IncludeProperty name="Comment" />
<IncludeProperty name="Name" />
</Interface>
</ConsumedObject>
<ConsumedObject name="Siemens.Simatic.Hmi.Utah.Globalization.HmiTextData" filter="False" resolveTextualReference="False">
<Interface name="Siemens.Automation.ObjectFrame.ICoreAttributes">
<IncludeProperty name="Author" />
<IncludeProperty name="Comment" />
<IncludeProperty name="Name" />
</Interface>
</ConsumedObject>
<ConsumedObject name="Siemens.Simatic.SystemDiagnosis.Model.ComponentTextlistData" filter="False" resolveTextualReference="False" />
<ConsumedObject name="Siemens.Simatic.SystemDiagnosis.Model.ErrorTextlistProxyData" filter="False" resolveTextualReference="False" />
</TargetCompiler>
</Package>
</ClMetaConsumer>

26
Samples/Automation Projects/Automation/TripleAdd/System/PEData/Meta/ChangeListConsumer/Iecpl.xml
View File

@@ -1,26 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ClMetaConsumer xmlns="http://www.siemens.com/Automation/2004/04/ObjectFrame/ClMetaConsumer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:schemaLocation="http://www.siemens.com/Automation/2004/04/ObjectFrame/ClMetaConsumer Automation-ObjectFrame-ChangeList-Consumer-v1.0.xsd">
<Package name="HmiBase" version="2.0.0.0">
<TargetCompiler name="Siemens.Simatic.Hmi.Es2rt" version="2.0.0.0">
<ConsumedObject name="Siemens.Automation.DomainModel.SystemTextRangeListData" filter="False" resolveTextualReference="False" />
<ConsumedObject name="Siemens.Automation.DomainModel.UserTextRangeListData" filter="False" resolveTextualReference="False" />
<ConsumedObject name="Siemens.Simatic.AlarmServices.ObjectFrame.Private.SimpleControllerAlarmData" filter="False" resolveTextualReference="False" />
<ConsumedObject name="Siemens.Simatic.Hmi.Utah.Common.Base.HmiBaseBL" filter="False" resolveTextualReference="False">
<Interface name="Siemens.Automation.ObjectFrame.ICoreAttributes">
<IncludeProperty name="Author" />
<IncludeProperty name="Comment" />
<IncludeProperty name="Name" />
</Interface>
</ConsumedObject>
<ConsumedObject name="Siemens.Simatic.Hmi.Utah.Globalization.HmiTextData" filter="False" resolveTextualReference="False">
<Interface name="Siemens.Automation.ObjectFrame.ICoreAttributes">
<IncludeProperty name="Author" />
<IncludeProperty name="Comment" />
<IncludeProperty name="Name" />
</Interface>
</ConsumedObject>
<ConsumedObject name="Siemens.Simatic.SystemDiagnosis.Model.ComponentTextlistData" filter="False" resolveTextualReference="False" />
<ConsumedObject name="Siemens.Simatic.SystemDiagnosis.Model.ErrorTextlistProxyData" filter="False" resolveTextualReference="False" />
</TargetCompiler>
</Package>
</ClMetaConsumer>

26
Samples/Automation Projects/Automation/TripleAdd/System/PEData/Meta/ChangeListConsumer/Siemens.Simatic.Lang.IPI.Target.xml
View File

@@ -1,26 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ClMetaConsumer xmlns="http://www.siemens.com/Automation/2004/04/ObjectFrame/ClMetaConsumer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:schemaLocation="http://www.siemens.com/Automation/2004/04/ObjectFrame/ClMetaConsumer Automation-ObjectFrame-ChangeList-Consumer-v1.0.xsd">
<Package name="HmiBase" version="2.0.0.0">
<TargetCompiler name="Siemens.Simatic.Hmi.Es2rt" version="2.0.0.0">
<ConsumedObject name="Siemens.Automation.DomainModel.SystemTextRangeListData" filter="False" resolveTextualReference="False" />
<ConsumedObject name="Siemens.Automation.DomainModel.UserTextRangeListData" filter="False" resolveTextualReference="False" />
<ConsumedObject name="Siemens.Simatic.AlarmServices.ObjectFrame.Private.SimpleControllerAlarmData" filter="False" resolveTextualReference="False" />
<ConsumedObject name="Siemens.Simatic.Hmi.Utah.Common.Base.HmiBaseBL" filter="False" resolveTextualReference="False">
<Interface name="Siemens.Automation.ObjectFrame.ICoreAttributes">
<IncludeProperty name="Author" />
<IncludeProperty name="Comment" />
<IncludeProperty name="Name" />
</Interface>
</ConsumedObject>
<ConsumedObject name="Siemens.Simatic.Hmi.Utah.Globalization.HmiTextData" filter="False" resolveTextualReference="False">
<Interface name="Siemens.Automation.ObjectFrame.ICoreAttributes">
<IncludeProperty name="Author" />
<IncludeProperty name="Comment" />
<IncludeProperty name="Name" />
</Interface>
</ConsumedObject>
<ConsumedObject name="Siemens.Simatic.SystemDiagnosis.Model.ComponentTextlistData" filter="False" resolveTextualReference="False" />
<ConsumedObject name="Siemens.Simatic.SystemDiagnosis.Model.ErrorTextlistProxyData" filter="False" resolveTextualReference="False" />
</TargetCompiler>
</Package>
</ClMetaConsumer>

32
Samples/Automation Projects/Automation/TripleAdd/System/PEData/Meta/ChangeListProvider/Siemens.Automation.DomainModel.xml
View File

@@ -1,32 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ClMetaProvider xmlns="http://www.siemens.com/Automation/2004/04/ObjectFrame/ClMetaProvider" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:schemaLocation="http://www.siemens.com/Automation/2004/04/ObjectFrame/ClMetaProvider Automation-ObjectFrame-ChangeList-Provider-v1.0.xsd">
<Package name="Siemens.Automation.DomainModel" version="1.1.0.0">
<ProviderObject name="Siemens.Automation.DomainModel.ReferenceTagData">
<Interface name="IBlTag">
<TrackedObject name="Siemens.Automation.DomainModel.ControllerRootTagBaseData">
<TrackedRelation name="ReferencedByRefTagAsRoot">
<Property name="CompileTime">
<TrackedAttribute name="Siemens.Automation.DomainServices.CommonTypeSystem.IStructureRoot.CompileTime" />
</Property>
<Property name="IsValid">
<TrackedAttribute name="Siemens.Automation.DomainServices.CommonTypeSystem.IStructureRoot.IsValid" />
</Property>
</TrackedRelation>
</TrackedObject>
<TrackedObject name="Siemens.Automation.DomainModel.EAMTZTagData">
<TrackedRelation name="ReferencedByRefTag">
<Property name="DataTypeName">
<TrackedAttribute name="Siemens.Automation.DomainServices.CommonTypeSystem.IStructureItem.DisplayTypeName" />
</Property>
<Property name="LogicalAddress">
<TrackedAttribute name="Siemens.Automation.DomainModel.ITagAddress.LogicalAddress" />
</Property>
<Property name="Name">
<TrackedAttribute name="Siemens.Automation.ObjectFrame.ICoreAttributes.Name" />
</Property>
</TrackedRelation>
</TrackedObject>
</Interface>
</ProviderObject>
</Package>
</ClMetaProvider>

5
Samples/Automation Projects/Automation/TripleAdd/TripleAdd.ap13 → Samples/Automation Projects/Automation/TripleAdd/TripleAdd.ap18
View File

File diff suppressed because one or more lines are too long

BIN
Samples/Automation Projects/Automation/TripleAdd/Vci/Vci.db Normal file
View File

Binary file not shown.

BIN
Samples/Automation Projects/Automation/TripleAdd/XRef/XRef.db Normal file
View File

Binary file not shown.

BIN
Samples/Automation Projects/Simulation/CrossLamp.Simulation.backup/2016-10-29.024107.904/2016-10-29.024107.904.zip
View File

Binary file not shown.

BIN
Samples/Automation Projects/Simulation/CrossLamp.Simulation.backup/2016-10-29.052754.160/2016-10-29.052754.160.zip
View File

Binary file not shown.

2
Samples/Automation Projects/Simulation/CrossLamp.Simulation/AdditionalFiles/SIM/fatInt/S7_JOB.S7S
View File

@@ -1,2 +0,0 @@
PROGRAM

BIN
Samples/Automation Projects/Simulation/CrossLamp.Simulation/AdditionalFiles/SIM/fatInt/SIMATIC.S7S/OMSSTORE/00000001/0/0000000A
View File

Binary file not shown.

BIN
Samples/Automation Projects/Simulation/CrossLamp.Simulation/AdditionalFiles/SIM/fatInt/SIMATIC.S7S/OMSSTORE/00000001/0/0000000B
View File

Binary file not shown.

BIN
Samples/Automation Projects/Simulation/CrossLamp.Simulation/AdditionalFiles/SIM/fatInt/SIMATIC.S7S/OMSSTORE/00000001/0/0000000D
View File

Binary file not shown.

BIN
Samples/Automation Projects/Simulation/CrossLamp.Simulation/AdditionalFiles/SIM/fatInt/SIMATIC.S7S/OMSSTORE/00000001/0/00000027
View File

Binary file not shown.

BIN
Samples/Automation Projects/Simulation/CrossLamp.Simulation/AdditionalFiles/SIM/fatInt/SIMATIC.S7S/OMSSTORE/00000001/HIERARCHY_1
View File

Binary file not shown.

BIN
Samples/Automation Projects/Simulation/CrossLamp.Simulation/AdditionalFiles/SIM/fatInt/SIMATIC.S7S/OMSSTORE/00000002/0/00000002
View File

Binary file not shown.

BIN
Samples/Automation Projects/Simulation/CrossLamp.Simulation/AdditionalFiles/SIM/fatInt/SIMATIC.S7S/OMSSTORE/00000002/0/00000003
View File

Binary file not shown.

BIN
Samples/Automation Projects/Simulation/CrossLamp.Simulation/AdditionalFiles/SIM/fatInt/SIMATIC.S7S/OMSSTORE/00000002/0/00000011
View File

Binary file not shown.

BIN
Samples/Automation Projects/Simulation/CrossLamp.Simulation/AdditionalFiles/SIM/fatInt/SIMATIC.S7S/OMSSTORE/00000002/0/00000012
View File

Binary file not shown.

BIN
Samples/Automation Projects/Simulation/CrossLamp.Simulation/AdditionalFiles/SIM/fatInt/SIMATIC.S7S/OMSSTORE/00000002/0/00000013
View File

Binary file not shown.

BIN
Samples/Automation Projects/Simulation/CrossLamp.Simulation/AdditionalFiles/SIM/fatInt/SIMATIC.S7S/OMSSTORE/00000002/0/00000017
View File

Binary file not shown.

BIN
Samples/Automation Projects/Simulation/CrossLamp.Simulation/AdditionalFiles/SIM/fatInt/SIMATIC.S7S/OMSSTORE/00000002/0/00000019
View File

Binary file not shown.

BIN
Samples/Automation Projects/Simulation/CrossLamp.Simulation/AdditionalFiles/SIM/fatInt/SIMATIC.S7S/OMSSTORE/00000002/0/0000001B
View File

Binary file not shown.

BIN
Samples/Automation Projects/Simulation/CrossLamp.Simulation/AdditionalFiles/SIM/fatInt/SIMATIC.S7S/OMSSTORE/00000002/0/0000001D
View File

Binary file not shown.

BIN
Samples/Automation Projects/Simulation/CrossLamp.Simulation/AdditionalFiles/SIM/fatInt/SIMATIC.S7S/OMSSTORE/00000002/0/0000001F
View File

Binary file not shown.

BIN
Samples/Automation Projects/Simulation/CrossLamp.Simulation/AdditionalFiles/SIM/fatInt/SIMATIC.S7S/OMSSTORE/00000002/0/00000020
View File

Binary file not shown.

BIN
Samples/Automation Projects/Simulation/CrossLamp.Simulation/AdditionalFiles/SIM/fatInt/SIMATIC.S7S/OMSSTORE/00000002/0/00000021
View File

Binary file not shown.

BIN
Samples/Automation Projects/Simulation/CrossLamp.Simulation/AdditionalFiles/SIM/fatInt/SIMATIC.S7S/OMSSTORE/00000002/0/00000023
View File

Binary file not shown.

BIN
Samples/Automation Projects/Simulation/CrossLamp.Simulation/AdditionalFiles/SIM/fatInt/SIMATIC.S7S/OMSSTORE/00000002/0/00000046
View File

Binary file not shown.

BIN
Samples/Automation Projects/Simulation/CrossLamp.Simulation/AdditionalFiles/SIM/fatInt/SIMATIC.S7S/OMSSTORE/00000002/1/00000016
View File

Binary file not shown.

BIN
Samples/Automation Projects/Simulation/CrossLamp.Simulation/AdditionalFiles/SIM/fatInt/SIMATIC.S7S/OMSSTORE/00000002/1/00000018
View File

Binary file not shown.

BIN
Samples/Automation Projects/Simulation/CrossLamp.Simulation/AdditionalFiles/SIM/fatInt/SIMATIC.S7S/OMSSTORE/00000002/1/0000001A
View File

Binary file not shown.

BIN
Samples/Automation Projects/Simulation/CrossLamp.Simulation/AdditionalFiles/SIM/fatInt/SIMATIC.S7S/OMSSTORE/00000002/1/0000001C
View File

Binary file not shown.

BIN
Samples/Automation Projects/Simulation/CrossLamp.Simulation/AdditionalFiles/SIM/fatInt/SIMATIC.S7S/OMSSTORE/00000002/1/0000001E
View File

Binary file not shown.

BIN
Samples/Automation Projects/Simulation/CrossLamp.Simulation/AdditionalFiles/SIM/fatInt/SIMATIC.S7S/OMSSTORE/00000002/1/00000022
View File

Binary file not shown.

BIN
Samples/Automation Projects/Simulation/CrossLamp.Simulation/AdditionalFiles/SIM/fatInt/SIMATIC.S7S/OMSSTORE/00000002/HIERARCHY_1
View File

Binary file not shown.

BIN
Samples/Automation Projects/Simulation/CrossLamp.Simulation/AdditionalFiles/SIM/fatInt/SIMATIC.S7S/OMSSTORE/00000003/0/00000008
View File

Binary file not shown.

BIN
Samples/Automation Projects/Simulation/CrossLamp.Simulation/AdditionalFiles/SIM/fatInt/SIMATIC.S7S/OMSSTORE/00000003/0/0000002B
View File

Binary file not shown.

BIN
Samples/Automation Projects/Simulation/CrossLamp.Simulation/AdditionalFiles/SIM/fatInt/SIMATIC.S7S/OMSSTORE/00000003/0/0000002D
View File

Binary file not shown.

BIN
Samples/Automation Projects/Simulation/CrossLamp.Simulation/AdditionalFiles/SIM/fatInt/SIMATIC.S7S/OMSSTORE/00000003/0/0000002F
View File

Binary file not shown.

BIN
Samples/Automation Projects/Simulation/CrossLamp.Simulation/AdditionalFiles/SIM/fatInt/SIMATIC.S7S/OMSSTORE/00000003/0/00000033
View File

Binary file not shown.

BIN
Samples/Automation Projects/Simulation/CrossLamp.Simulation/AdditionalFiles/SIM/fatInt/SIMATIC.S7S/OMSSTORE/00000003/0/0000003B
View File

Binary file not shown.

BIN
Samples/Automation Projects/Simulation/CrossLamp.Simulation/AdditionalFiles/SIM/fatInt/SIMATIC.S7S/OMSSTORE/00000003/0/0000004A
View File

Binary file not shown.

BIN
Samples/Automation Projects/Simulation/CrossLamp.Simulation/AdditionalFiles/SIM/fatInt/SIMATIC.S7S/OMSSTORE/00000003/0/0000004D
View File

Binary file not shown.

BIN
Samples/Automation Projects/Simulation/CrossLamp.Simulation/AdditionalFiles/SIM/fatInt/SIMATIC.S7S/OMSSTORE/00000003/1/00000009
View File

Binary file not shown.

BIN
Samples/Automation Projects/Simulation/CrossLamp.Simulation/AdditionalFiles/SIM/fatInt/SIMATIC.S7S/OMSSTORE/00000003/1/0000002E
View File

Binary file not shown.

BIN
Samples/Automation Projects/Simulation/CrossLamp.Simulation/AdditionalFiles/SIM/fatInt/SIMATIC.S7S/OMSSTORE/00000003/1/00000030
View File

Binary file not shown.

BIN
Samples/Automation Projects/Simulation/CrossLamp.Simulation/AdditionalFiles/SIM/fatInt/SIMATIC.S7S/OMSSTORE/00000003/1/00000034
View File

Binary file not shown.

BIN
Samples/Automation Projects/Simulation/CrossLamp.Simulation/AdditionalFiles/SIM/fatInt/SIMATIC.S7S/OMSSTORE/00000003/HIERARCHY_1
View File

Binary file not shown.

BIN
Samples/Automation Projects/Simulation/CrossLamp.Simulation/AdditionalFiles/SIM/fatInt/SIMATIC.S7S/OMSSTORE/0000000C/0/00000047
View File

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More