Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allows AutoSyncReadInterval and AutoSyncWriteInterval to be set after Tag is initialized #386

Merged
merged 5 commits into from
Jun 22, 2024
Merged

Allows AutoSyncReadInterval and AutoSyncWriteInterval to be set after Tag is initialized #386

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3be1c94
Allows AutoSyncReadInterval and AutoSyncWriteInterval to be set after…
timyhac Jun 22, 2024
86d7a66
Fix subtle bug that occurs if SetIntAttribute fails.
timyhac Jun 22, 2024
d04d3e1
Added comments
timyhac Jun 22, 2024
1f4b3d5
And apply same treatment to ReadCacheDuration and DebugLevel
timyhac Jun 22, 2024
2bb1e59
Added more comments
timyhac Jun 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 63 additions & 19 deletions src/libplctag/NativeTagWrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,23 +117,20 @@ public int? ReadCacheMillisecondDuration
get
{
ThrowIfAlreadyDisposed();
return _readCacheMillisecondDuration;

if (!_isInitialized)
return _readCacheMillisecondDuration;

return GetIntAttribute("read_cache_ms");
}
set
{
ThrowIfAlreadyDisposed();

if (!_isInitialized)
{
_readCacheMillisecondDuration = value;
return;
}
if (_isInitialized)
SetIntAttribute("read_cache_ms", value.Value);

// Set after writing to underlying tag in case SetIntAttribute fails.
// Ensures the two have the same value.
_readCacheMillisecondDuration = value;

SetIntAttribute("read_cache_ms", value.Value);
}
}

Expand All @@ -157,15 +154,53 @@ public TimeSpan Timeout
private TimeSpan? _autoSyncReadInterval;
public TimeSpan? AutoSyncReadInterval
{
get => GetField(ref _autoSyncReadInterval);
set => SetField(ref _autoSyncReadInterval, value);
get
{
ThrowIfAlreadyDisposed();
return _autoSyncReadInterval;
}
set
{
ThrowIfAlreadyDisposed();

if (_isInitialized)
{
if (value is null)
SetIntAttribute("auto_sync_read_ms", 0); // 0 is a special value that turns off auto sync
else
SetIntAttribute("auto_sync_read_ms", (int)value.Value.TotalMilliseconds);
}

// Set after writing to underlying tag in case SetIntAttribute fails.
// Ensures the two have the same value.
_autoSyncReadInterval = value;
}
}

private TimeSpan? _autoSyncWriteInterval;
public TimeSpan? AutoSyncWriteInterval
{
get => GetField(ref _autoSyncWriteInterval);
set => SetField(ref _autoSyncWriteInterval, value);
get
{
ThrowIfAlreadyDisposed();
return _autoSyncWriteInterval;
}
set
{
ThrowIfAlreadyDisposed();

if (_isInitialized)
{
if (value is null)
SetIntAttribute("auto_sync_write_ms", 0); // 0 is a special value that turns off auto sync
else
SetIntAttribute("auto_sync_write_ms", (int)value.Value.TotalMilliseconds);
}

// Set after writing to underlying tag in case SetIntAttribute fails.
// Ensures the two have the same value.
_autoSyncWriteInterval = value;
}
}

private DebugLevel _debugLevel = DebugLevel.None;
Expand All @@ -174,17 +209,18 @@ public DebugLevel DebugLevel
get
{
ThrowIfAlreadyDisposed();

return _debugLevel;
}
set
{
ThrowIfAlreadyDisposed();

_debugLevel = value;

if (_isInitialized)
SetDebugLevel(value);

// Set after writing to underlying tag in case SetDebugLevel fails.
// Ensures the two have the same value.
_debugLevel = value;
}
}

Expand Down Expand Up @@ -700,6 +736,14 @@ string FormatPlcType(PlcType? type)
return type?.ToString().ToLowerInvariant();
}

string FormatTimeSpan(TimeSpan? timespan)
{
if(timespan.HasValue)
return ((int)timespan.Value.TotalMilliseconds).ToString();
else
return null;
}

var attributes = new Dictionary<string, string>
{
{ "protocol", Protocol?.ToString() },
Expand All @@ -712,8 +756,8 @@ string FormatPlcType(PlcType? type)
{ "read_cache_ms", ReadCacheMillisecondDuration?.ToString() },
{ "use_connected_msg", FormatNullableBoolean(UseConnectedMessaging) },
{ "allow_packing", FormatNullableBoolean(AllowPacking) },
{ "auto_sync_read_ms", AutoSyncReadInterval?.TotalMilliseconds.ToString() },
{ "auto_sync_write_ms", AutoSyncWriteInterval?.TotalMilliseconds.ToString() },
{ "auto_sync_read_ms", FormatTimeSpan(AutoSyncReadInterval) },
{ "auto_sync_write_ms", FormatTimeSpan(AutoSyncWriteInterval) },
{ "debug", DebugLevel == DebugLevel.None ? null : ((int)DebugLevel).ToString() },
{ "int16_byte_order", Int16ByteOrder },
{ "int32_byte_order", Int32ByteOrder },
Expand Down
Loading