Critial Bug Fix in Connector. Samples Bug Fix.
This commit is contained in:
@@ -44,7 +44,7 @@ namespace Modbus.Net.Modbus
|
|||||||
public ModbusMachine(TKey id, ModbusType connectionType, string connectionString,
|
public ModbusMachine(TKey id, ModbusType connectionType, string connectionString,
|
||||||
IEnumerable<AddressUnit<TUnitKey>> getAddresses, byte slaveAddress, byte masterAddress,
|
IEnumerable<AddressUnit<TUnitKey>> getAddresses, byte slaveAddress, byte masterAddress,
|
||||||
Endian endian = Endian.BigEndianLsb)
|
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,
|
public ModbusMachine(string id, ModbusType connectionType, string connectionString,
|
||||||
IEnumerable<AddressUnit> getAddresses, byte slaveAddress, byte masterAddress,
|
IEnumerable<AddressUnit> getAddresses, byte slaveAddress, byte masterAddress,
|
||||||
Endian endian = Endian.BigEndianLsb)
|
Endian endian = Endian.BigEndianLsb)
|
||||||
: this(id, connectionType, connectionString, getAddresses, false, slaveAddress, masterAddress, endian)
|
: this(id, connectionType, connectionString, getAddresses, true, slaveAddress, masterAddress, endian)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ namespace Modbus.Net.Siemens
|
|||||||
/// <param name="dst">PLC模块位,0到7,仅200使用,其它型号不要填写</param>
|
/// <param name="dst">PLC模块位,0到7,仅200使用,其它型号不要填写</param>
|
||||||
public SiemensMachine(TKey id, SiemensType connectionType, string connectionString, SiemensMachineModel model,
|
public SiemensMachine(TKey id, SiemensType connectionType, string connectionString, SiemensMachineModel model,
|
||||||
IEnumerable<AddressUnit<TUnitKey>> getAddresses, byte slaveAddress, byte masterAddress, byte src = 1, byte dst = 0)
|
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>
|
/// <param name="dst">PLC模块位,0到7,仅200使用,其它型号不要填写</param>
|
||||||
public SiemensMachine(string id, SiemensType connectionType, string connectionString, SiemensMachineModel model,
|
public SiemensMachine(string id, SiemensType connectionType, string connectionString, SiemensMachineModel model,
|
||||||
IEnumerable<AddressUnit> getAddresses, byte slaveAddress, byte masterAddress, byte src = 1, byte dst = 0)
|
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)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -87,20 +87,16 @@ namespace Modbus.Net
|
|||||||
/// <param name="disposing"></param>
|
/// <param name="disposing"></param>
|
||||||
protected virtual void Dispose(bool disposing)
|
protected virtual void Dispose(bool disposing)
|
||||||
{
|
{
|
||||||
if (!m_disposed)
|
if (disposing)
|
||||||
{
|
{
|
||||||
if (disposing)
|
// Release managed resources
|
||||||
{
|
}
|
||||||
// Release managed resources
|
// Release unmanaged resources
|
||||||
}
|
if (_socketClient != null)
|
||||||
// Release unmanaged resources
|
{
|
||||||
if (_socketClient != null)
|
CloseClientSocket();
|
||||||
{
|
_socketClient = null;
|
||||||
CloseClientSocket();
|
Log.Debug("Tcp client {ConnectionToken} Disposed", ConnectionToken);
|
||||||
_socketClient = null;
|
|
||||||
Log.Debug("Tcp client {ConnectionToken} Disposed", ConnectionToken);
|
|
||||||
}
|
|
||||||
m_disposed = true;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -312,9 +308,8 @@ namespace Modbus.Net
|
|||||||
{
|
{
|
||||||
if (_socketClient.Connected)
|
if (_socketClient.Connected)
|
||||||
{
|
{
|
||||||
_socketClient.GetStream().Dispose();
|
_socketClient.Close();
|
||||||
}
|
}
|
||||||
_socketClient?.Close();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
|
|||||||
@@ -28,8 +28,6 @@ namespace Modbus.Net
|
|||||||
|
|
||||||
private UdpClient _socketClient;
|
private UdpClient _socketClient;
|
||||||
|
|
||||||
private bool m_disposed;
|
|
||||||
|
|
||||||
private Task _receiveThread;
|
private Task _receiveThread;
|
||||||
private bool _taskCancel = false;
|
private bool _taskCancel = false;
|
||||||
|
|
||||||
@@ -74,20 +72,16 @@ namespace Modbus.Net
|
|||||||
/// <param name="disposing"></param>
|
/// <param name="disposing"></param>
|
||||||
protected virtual void Dispose(bool disposing)
|
protected virtual void Dispose(bool disposing)
|
||||||
{
|
{
|
||||||
if (!m_disposed)
|
if (disposing)
|
||||||
{
|
{
|
||||||
if (disposing)
|
// Release managed resources
|
||||||
{
|
}
|
||||||
// Release managed resources
|
// Release unmanaged resources
|
||||||
}
|
if (_socketClient != null)
|
||||||
// Release unmanaged resources
|
{
|
||||||
if (_socketClient != null)
|
CloseClientSocket();
|
||||||
{
|
_socketClient = null;
|
||||||
CloseClientSocket();
|
Log.Debug("Udp client {ConnectionToken} Disposed", ConnectionToken);
|
||||||
_socketClient = null;
|
|
||||||
Log.Debug("Udp client {ConnectionToken} Disposed", ConnectionToken);
|
|
||||||
}
|
|
||||||
m_disposed = true;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
File diff suppressed because one or more lines are too long
BIN
Samples/Automation Projects/Automation/CrossLamp/IM/SPL/options
Normal file
BIN
Samples/Automation Projects/Automation/CrossLamp/IM/SPL/options
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -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>
|
|
||||||
@@ -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>
|
|
||||||
@@ -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>
|
|
||||||
@@ -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
BIN
Samples/Automation Projects/Automation/CrossLamp/Vci/Vci.db
Normal file
Binary file not shown.
BIN
Samples/Automation Projects/Automation/CrossLamp/XRef/XRef.db
Normal file
BIN
Samples/Automation Projects/Automation/CrossLamp/XRef/XRef.db
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -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>
|
|
||||||
@@ -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>
|
|
||||||
@@ -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>
|
|
||||||
@@ -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>
|
|
||||||
File diff suppressed because one or more lines are too long
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Samples/Automation Projects/Automation/TripleAdd/IM/SPL/options
Normal file
BIN
Samples/Automation Projects/Automation/TripleAdd/IM/SPL/options
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -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>
|
|
||||||
@@ -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>
|
|
||||||
@@ -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>
|
|
||||||
@@ -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>
|
|
||||||
File diff suppressed because one or more lines are too long
BIN
Samples/Automation Projects/Automation/TripleAdd/Vci/Vci.db
Normal file
BIN
Samples/Automation Projects/Automation/TripleAdd/Vci/Vci.db
Normal file
Binary file not shown.
BIN
Samples/Automation Projects/Automation/TripleAdd/XRef/XRef.db
Normal file
BIN
Samples/Automation Projects/Automation/TripleAdd/XRef/XRef.db
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,2 +0,0 @@
|
|||||||
PROGRAM
|
|
||||||
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user