This commit is contained in:
luosheng
2023-07-16 08:17:03 +08:00
parent 6d655b24d1
commit 2055c10c59
127 changed files with 7414 additions and 7470 deletions

View File

@@ -1,9 +1,4 @@
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
namespace Modbus.Net namespace Modbus.Net
{ {

View File

@@ -1,10 +1,6 @@
using System; using System.Collections.Generic;
using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq;
using System.Reflection; using System.Reflection;
using System.Text;
using System.Threading.Tasks;
namespace Modbus.Net namespace Modbus.Net
{ {

View File

@@ -1,8 +1,4 @@
using System; namespace Modbus.Net
using System.Collections.Generic;
using System.Linq;
namespace Modbus.Net
{ {
#if NET462 #if NET462
#pragma warning disable 1591 #pragma warning disable 1591

View File

@@ -1,8 +1,6 @@
using Quartz; using Quartz;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;

View File

@@ -1,5 +1,4 @@
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Quartz.Logging;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;

View File

@@ -3,9 +3,9 @@ using Microsoft.AspNetCore.Mvc;
using Modbus.Net; using Modbus.Net;
using Modbus.Net.Modbus; using Modbus.Net.Modbus;
using System.Diagnostics; using System.Diagnostics;
using AddressUnit = Modbus.Net.AddressUnit<string, int, int>;
using MachineJobSchedulerCreator = Modbus.Net.MachineJobSchedulerCreator<Modbus.Net.IMachineMethodDatas, string, double>; using MachineJobSchedulerCreator = Modbus.Net.MachineJobSchedulerCreator<Modbus.Net.IMachineMethodDatas, string, double>;
using ModbusMachine = Modbus.Net.Modbus.ModbusMachine<string, string>; using ModbusMachine = Modbus.Net.Modbus.ModbusMachine<string, string>;
using AddressUnit = Modbus.Net.AddressUnit<string, int, int>;
namespace AnyType.Controllers namespace AnyType.Controllers
{ {

View File

@@ -1,5 +1,4 @@
using Quartz.Logging; using Quartz.Logging;
using System.Configuration;
namespace MachineJob namespace MachineJob
{ {

View File

@@ -24,10 +24,9 @@
using System; using System;
using System.Collections; using System.Collections;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using Technosoftware.DaAeHdaClient.Ae; using Technosoftware.DaAeHdaClient.Ae;
using Technosoftware.OpcRcw.Comn;
using Technosoftware.OpcRcw.Ae; using Technosoftware.OpcRcw.Ae;
using Technosoftware.OpcRcw.Comn;
#endregion #endregion
#pragma warning disable 0618 #pragma warning disable 0618

View File

@@ -23,11 +23,9 @@
#region Using Directives #region Using Directives
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using Technosoftware.DaAeHdaClient.Ae; using Technosoftware.DaAeHdaClient.Ae;
using Technosoftware.OpcRcw.Ae;
using Technosoftware.DaAeHdaClient.Utilities; using Technosoftware.DaAeHdaClient.Utilities;
using Technosoftware.OpcRcw.Ae;
#endregion #endregion
@@ -333,7 +331,9 @@ namespace Technosoftware.DaAeHdaClient.Com.Ae
// build results. // build results.
var filters = new TsCAeSubscriptionFilters var filters = new TsCAeSubscriptionFilters
{ {
EventTypes = pdwEventType, LowSeverity = pdwLowSeverity, HighSeverity = pdwHighSeverity EventTypes = pdwEventType,
LowSeverity = pdwLowSeverity,
HighSeverity = pdwHighSeverity
}; };

View File

@@ -22,12 +22,11 @@
#region Using Directives #region Using Directives
using System; using System;
using System.Reflection;
using System.Net;
using System.Globalization;
using System.Runtime.InteropServices;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization;
using System.Net;
using System.Reflection;
using System.Runtime.InteropServices;
using Technosoftware.DaAeHdaClient.Utilities; using Technosoftware.DaAeHdaClient.Utilities;
#endregion #endregion

View File

@@ -23,9 +23,8 @@
#region Using Directives #region Using Directives
using System; using System;
using System.Collections; using System.Collections;
using System.Runtime.InteropServices;
using System.Reflection; using System.Reflection;
using System.Runtime.InteropServices;
using Technosoftware.DaAeHdaClient.Da; using Technosoftware.DaAeHdaClient.Da;
#endregion #endregion

View File

@@ -22,16 +22,13 @@
#region Using Directives #region Using Directives
using System; using System;
using System.Threading;
using System.Collections; using System.Collections;
using System.Globalization; using System.Globalization;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Threading;
using Technosoftware.DaAeHdaClient.Da;
using Technosoftware.DaAeHdaClient.Utilities;
using Technosoftware.OpcRcw.Da;
using Technosoftware.DaAeHdaClient.Com.Utilities; using Technosoftware.DaAeHdaClient.Com.Utilities;
using Technosoftware.DaAeHdaClient.Da;
using Technosoftware.OpcRcw.Da;
#endregion #endregion

View File

@@ -23,14 +23,12 @@
using System; using System;
using System.Collections; using System.Collections;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using Technosoftware.DaAeHdaClient.Da;
using Technosoftware.DaAeHdaClient.Com.Da; using Technosoftware.DaAeHdaClient.Com.Da;
using Technosoftware.DaAeHdaClient.Utilities;
using Technosoftware.OpcRcw.Da;
using Technosoftware.OpcRcw.Comn;
using Technosoftware.DaAeHdaClient.Com.Utilities; using Technosoftware.DaAeHdaClient.Com.Utilities;
using Technosoftware.DaAeHdaClient.Da;
using Technosoftware.DaAeHdaClient.Utilities;
using Technosoftware.OpcRcw.Comn;
using Technosoftware.OpcRcw.Da;
#endregion #endregion

View File

@@ -23,13 +23,10 @@
#region Using Directives #region Using Directives
using System; using System;
using System.Collections; using System.Collections;
using Technosoftware.DaAeHdaClient.Da;
using Technosoftware.DaAeHdaClient.Com.Da; using Technosoftware.DaAeHdaClient.Com.Da;
using Technosoftware.DaAeHdaClient.Utilities;
using Technosoftware.OpcRcw.Da;
using Technosoftware.DaAeHdaClient.Com.Utilities; using Technosoftware.DaAeHdaClient.Com.Utilities;
using Technosoftware.DaAeHdaClient.Da;
using Technosoftware.OpcRcw.Da;
#endregion #endregion
namespace Technosoftware.DaAeHdaClient.Com.Da20 namespace Technosoftware.DaAeHdaClient.Com.Da20

View File

@@ -22,14 +22,9 @@
#region Using Directives #region Using Directives
using System; using System;
using System.Xml;
using System.Net;
using System.Text;
using System.Collections;
using System.Globalization;
using System.Runtime.Serialization;
using System.Runtime.InteropServices;
using System.Collections.Generic; using System.Collections.Generic;
using System.Runtime.Serialization;
using System.Text;
#endregion #endregion

View File

@@ -23,10 +23,9 @@
#region Using Directives #region Using Directives
using System; using System;
using System.Collections; using System.Collections;
using Technosoftware.DaAeHdaClient.Hda; using Technosoftware.DaAeHdaClient.Hda;
using Technosoftware.OpcRcw.Hda;
using Technosoftware.OpcRcw.Comn; using Technosoftware.OpcRcw.Comn;
using Technosoftware.OpcRcw.Hda;
#endregion #endregion
namespace Technosoftware.DaAeHdaClient.Com.Hda namespace Technosoftware.DaAeHdaClient.Com.Hda

View File

@@ -22,12 +22,11 @@
#region Using Directives #region Using Directives
using System; using System;
using System.Net;
using System.Globalization; using System.Globalization;
using System.Net;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using Technosoftware.DaAeHdaClient.Da;
using Technosoftware.DaAeHdaClient.Com.Utilities; using Technosoftware.DaAeHdaClient.Com.Utilities;
using Technosoftware.DaAeHdaClient.Da;
#endregion #endregion
#pragma warning disable 0618 #pragma warning disable 0618
@@ -859,7 +858,8 @@ namespace Technosoftware.DaAeHdaClient.Com
/// <summary> /// <summary>
/// This flag suppresses the conversion to local time done during marshalling. /// This flag suppresses the conversion to local time done during marshalling.
/// </summary> /// </summary>
public static bool PreserveUtc { public static bool PreserveUtc
{
get { lock (typeof(Interop)) { return DaAeHdaClient.ApplicationInstance.TimeAsUtc; } } get { lock (typeof(Interop)) { return DaAeHdaClient.ApplicationInstance.TimeAsUtc; } }
set { lock (typeof(Interop)) { DaAeHdaClient.ApplicationInstance.TimeAsUtc = value; } } set { lock (typeof(Interop)) { DaAeHdaClient.ApplicationInstance.TimeAsUtc = value; } }
} }

View File

@@ -23,12 +23,11 @@
#region Using Directives #region Using Directives
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Reflection;
using System.Net;
using System.Globalization; using System.Globalization;
using System.Net;
using System.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Security; using System.Security;
using Technosoftware.DaAeHdaClient.Utilities; using Technosoftware.DaAeHdaClient.Utilities;
#endregion #endregion

View File

@@ -22,14 +22,12 @@
#region Using Directives #region Using Directives
using System; using System;
using System.Net;
using System.Collections; using System.Collections;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using Technosoftware.OpcRcw.Comn;
using Technosoftware.DaAeHdaClient.Ae; using Technosoftware.DaAeHdaClient.Ae;
using Technosoftware.DaAeHdaClient.Da; using Technosoftware.DaAeHdaClient.Da;
using Technosoftware.DaAeHdaClient.Hda; using Technosoftware.DaAeHdaClient.Hda;
using Technosoftware.OpcRcw.Comn;
#endregion #endregion
namespace Technosoftware.DaAeHdaClient.Com namespace Technosoftware.DaAeHdaClient.Com

View File

@@ -1,7 +1,4 @@
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Technosoftware.DaAeHdaClient.Utilities; using Technosoftware.DaAeHdaClient.Utilities;

View File

@@ -22,10 +22,9 @@
#region Using Directives #region Using Directives
using System; using System;
using System.Net;
using System.Globalization; using System.Globalization;
using System.Net;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using Technosoftware.DaAeHdaClient.Da; using Technosoftware.DaAeHdaClient.Da;
#pragma warning disable 618 #pragma warning disable 618
#endregion #endregion

View File

@@ -23,7 +23,6 @@
#region Using Directives #region Using Directives
using System; using System;
using System.Collections;
using System.Runtime.Serialization; using System.Runtime.Serialization;
#endregion #endregion

View File

@@ -21,7 +21,6 @@
#endregion Copyright (c) 2011-2023 Technosoftware GmbH. All rights reserved #endregion Copyright (c) 2011-2023 Technosoftware GmbH. All rights reserved
#region Using Directives #region Using Directives
using System;
using Technosoftware.DaAeHdaClient.Utilities; using Technosoftware.DaAeHdaClient.Utilities;
#endregion #endregion

View File

@@ -23,9 +23,8 @@
#region Using Directives #region Using Directives
using System; using System;
using System.Collections; using System.Collections;
using System.Xml;
using System.IO; using System.IO;
using System.Xml;
using Technosoftware.DaAeHdaClient.Da; using Technosoftware.DaAeHdaClient.Da;
#endregion #endregion

View File

@@ -22,8 +22,8 @@
#region Using Directives #region Using Directives
using System; using System;
using System.Xml;
using System.Runtime.Serialization; using System.Runtime.Serialization;
using System.Xml;
#endregion #endregion
namespace Technosoftware.DaAeHdaClient.Da namespace Technosoftware.DaAeHdaClient.Da

View File

@@ -55,13 +55,13 @@ namespace Technosoftware.DaAeHdaClient.Da
/// <summary>A device failure has been detected.</summary> /// <summary>A device failure has been detected.</summary>
BadDeviceFailure = 0x0000000c, BadDeviceFailure = 0x0000000c,
/// <summary> /// <summary>
/// A sensor failure had been detected (the Limits field can provide additional /// A sensor failure had been detected (the Limits?field can provide additional
/// diagnostic information in some situations). /// diagnostic information in some situations).
/// </summary> /// </summary>
BadSensorFailure = 0x00000010, BadSensorFailure = 0x00000010,
/// <summary> /// <summary>
/// Communications have failed. However, the last known value is available. Note that /// Communications have failed. However, the last known value is available. Note that
/// the age of the value may be determined from the time stamp in the item state. /// the age?of the value may be determined from the time stamp in the item state.
/// </summary> /// </summary>
BadLastKnownValue = 0x00000014, BadLastKnownValue = 0x00000014,
/// <summary>Communications have failed. There is no last known value is available.</summary> /// <summary>Communications have failed. There is no last known value is available.</summary>
@@ -83,16 +83,16 @@ namespace Technosoftware.DaAeHdaClient.Da
Uncertain = 0x00000040, Uncertain = 0x00000040,
/// <summary> /// <summary>
/// Whatever was writing this value has stopped doing so. The returned value should /// Whatever was writing this value has stopped doing so. The returned value should
/// be regarded as stale. Note that this differs from a BAD value with sub-status /// be regarded as stale? Note that this differs from a BAD value with sub-status
/// badLastKnownValue (Last Known Value). That status is associated specifically with a /// badLastKnownValue (Last Known Value). That status is associated specifically with a
/// detectable communications error on a fetched value. This error is associated with the /// detectable communications error on a fetched?value. This error is associated with the
/// failure of some external source to put something into the value within an acceptable /// failure of some external source to put?something into the value within an acceptable
/// period of time. Note that the age of the value can be determined from the time stamp /// period of time. Note that the age?of the value can be determined from the time stamp
/// in the item state. /// in the item state.
/// </summary> /// </summary>
UncertainLastUsableValue = 0x00000044, UncertainLastUsableValue = 0x00000044,
/// <summary> /// <summary>
/// Either the value has pegged at one of the sensor limits (in which case the /// Either the value has pegged?at one of the sensor limits (in which case the
/// limit field should be set to low or high) or the sensor is otherwise known to be out of /// limit field should be set to low or high) or the sensor is otherwise known to be out of
/// calibration via some form of internal diagnostics (in which case the limit field should /// calibration via some form of internal diagnostics (in which case the limit field should
/// be none). /// be none).
@@ -100,7 +100,7 @@ namespace Technosoftware.DaAeHdaClient.Da
UncertainSensorNotAccurate = 0x00000050, UncertainSensorNotAccurate = 0x00000050,
/// <summary> /// <summary>
/// The returned value is outside the limits defined for this parameter. Note that in /// The returned value is outside the limits defined for this parameter. Note that in
/// this case (per the Field-bus Specification) the Limits field indicates which limit has /// this case (per the Field-bus Specification) the Limits?field indicates which limit has
/// been exceeded but does NOT necessarily imply that the value cannot move farther out of /// been exceeded but does NOT necessarily imply that the value cannot move farther out of
/// range. /// range.
/// </summary> /// </summary>

View File

@@ -22,8 +22,8 @@
#region Using Directives #region Using Directives
using System; using System;
using System.Runtime.Serialization;
using System.Collections.Generic; using System.Collections.Generic;
using System.Runtime.Serialization;
#endregion #endregion
namespace Technosoftware.DaAeHdaClient.Da namespace Technosoftware.DaAeHdaClient.Da

View File

@@ -210,8 +210,10 @@ namespace Technosoftware.DaAeHdaClient.Da
/// <summary> /// <summary>
/// The items belonging to the subscription. /// The items belonging to the subscription.
/// </summary> /// </summary>
public TsCDaItem[] Items { public TsCDaItem[] Items
get { {
get
{
if (daItems_ == null) return new TsCDaItem[0]; if (daItems_ == null) return new TsCDaItem[0];
var items = new TsCDaItem[daItems_.Length]; var items = new TsCDaItem[daItems_.Length];
for (var ii = 0; ii < daItems_.Length; ii++) items[ii] = (TsCDaItem)daItems_[ii].Clone(); for (var ii = 0; ii < daItems_.Length; ii++) items[ii] = (TsCDaItem)daItems_[ii].Clone();
@@ -562,7 +564,8 @@ namespace Technosoftware.DaAeHdaClient.Da
/// <summary> /// <summary>
/// An event to receive data change updates. /// An event to receive data change updates.
/// </summary> /// </summary>
public event TsCDaDataChangedEventHandler DataChangedEvent { public event TsCDaDataChangedEventHandler DataChangedEvent
{
add => Subscription.DataChangedEvent += value; add => Subscription.DataChangedEvent += value;
remove => Subscription.DataChangedEvent -= value; remove => Subscription.DataChangedEvent -= value;
} }

View File

@@ -22,8 +22,6 @@
#region Using Directives #region Using Directives
using System; using System;
using System.ComponentModel;
using System.Runtime.InteropServices;
#pragma warning disable 618 #pragma warning disable 618
#endregion #endregion

View File

@@ -22,8 +22,8 @@
#region Using Directives #region Using Directives
using System; using System;
using System.Text;
using System.Collections; using System.Collections;
using System.Text;
#endregion #endregion
namespace Technosoftware.DaAeHdaClient.Hda namespace Technosoftware.DaAeHdaClient.Hda

View File

@@ -22,8 +22,6 @@
#region Using Directives #region Using Directives
using System; using System;
using System.Linq;
using static System.String;
using System.Diagnostics; using System.Diagnostics;
using Technosoftware.DaAeHdaClient.Utilities; using Technosoftware.DaAeHdaClient.Utilities;
#endregion #endregion

View File

@@ -22,9 +22,9 @@
#region Using Directives #region Using Directives
using System; using System;
using System.Xml;
using System.Collections; using System.Collections;
using System.Text; using System.Text;
using System.Xml;
#endregion #endregion
namespace Technosoftware.DaAeHdaClient namespace Technosoftware.DaAeHdaClient

View File

@@ -22,9 +22,9 @@
#region Using Directives #region Using Directives
using System; using System;
using System.Xml;
using System.Runtime.Serialization;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Runtime.Serialization;
using System.Xml;
#endregion #endregion
namespace Technosoftware.DaAeHdaClient namespace Technosoftware.DaAeHdaClient

View File

@@ -24,8 +24,8 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.Resources;
using System.Reflection; using System.Reflection;
using System.Resources;
using System.Runtime.Serialization; using System.Runtime.Serialization;
#endregion #endregion

View File

@@ -22,8 +22,8 @@
#region Using Directives #region Using Directives
using System; using System;
using System.Text;
using System.Security.Cryptography; using System.Security.Cryptography;
using System.Text;
#endregion #endregion
namespace Technosoftware.DaAeHdaClient namespace Technosoftware.DaAeHdaClient

View File

@@ -22,9 +22,6 @@
#region Using Directives #region Using Directives
using System; using System;
using System.Text;
using System.Globalization;
using System.Diagnostics;
using System.IO; using System.IO;
// ReSharper disable UnusedMember.Global // ReSharper disable UnusedMember.Global

View File

@@ -22,10 +22,10 @@
#region Using Directives #region Using Directives
using System; using System;
using System.Text;
using System.Globalization;
using System.Diagnostics; using System.Diagnostics;
using System.Globalization;
using System.IO; using System.IO;
using System.Text;
// ReSharper disable UnusedMember.Global // ReSharper disable UnusedMember.Global
#endregion #endregion

View File

@@ -11,8 +11,6 @@
#region Using Directives #region Using Directives
using System; using System;
using System.Collections.Generic;
using System.Text;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
#endregion #endregion

View File

@@ -11,8 +11,6 @@
#region Using Directives #region Using Directives
using System; using System;
using System.Collections.Generic;
using System.Text;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
/* Unmerged change from project 'Technosoftware.OpcRcw (net472)' /* Unmerged change from project 'Technosoftware.OpcRcw (net472)'

View File

@@ -11,8 +11,6 @@
#region Using Directives #region Using Directives
using System; using System;
using System.Collections.Generic;
using System.Text;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
#endregion #endregion

View File

@@ -11,8 +11,6 @@
#region Using Directives #region Using Directives
using System; using System;
using System.Collections.Generic;
using System.Text;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
#endregion #endregion