Wrong COM default settings fix.

Modbus.Net/Modbus.Net.Modbus/ModbusAsciiInTcpProtocol.cs

@@ -1,8 +1,4 @@
-using Microsoft.Extensions.Configuration;
+namespace Modbus.Net.Modbus
-using System;
-using System.IO;
-
-namespace Modbus.Net.Modbus
 {
     /// <summary>
     ///     Modbus/Ascii码协议Tcp透传

Modbus.Net/Modbus.Net.Modbus/ModbusAsciiInTcpProtocolLinker.cs

@@ -1,7 +1,4 @@
-using Microsoft.Extensions.Configuration;
+using System.Text;
-using System;
-using System.IO;
-using System.Text;
 
 namespace Modbus.Net.Modbus
 {

Modbus.Net/Modbus.Net.Modbus/ModbusAsciiInUdpProtocol.cs

@@ -1,8 +1,4 @@
-using Microsoft.Extensions.Configuration;
+namespace Modbus.Net.Modbus
-using System;
-using System.IO;
-
-namespace Modbus.Net.Modbus
 {
     /// <summary>
     ///     Modbus/Ascii码协议Udp透传

Modbus.Net/Modbus.Net.Modbus/ModbusAsciiInUdpProtocolLinker.cs

@@ -1,7 +1,4 @@
-using Microsoft.Extensions.Configuration;
+using System.Text;
-using System;
-using System.IO;
-using System.Text;
 
 namespace Modbus.Net.Modbus
 {

Modbus.Net/Modbus.Net.Modbus/ModbusAsciiProtocol.cs

@@ -1,8 +1,4 @@
-using Microsoft.Extensions.Configuration;
+namespace Modbus.Net.Modbus
-using System;
-using System.IO;
-
-namespace Modbus.Net.Modbus
 {
     /// <summary>
     ///     Modbus/Ascii码协议

Modbus.Net/Modbus.Net.Modbus/ModbusAsciiProtocolLinker.cs

@@ -1,8 +1,4 @@
-using Microsoft.Extensions.Configuration;
+using System.Collections.Generic;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.IO.Ports;
 using System.Text;
 
 namespace Modbus.Net.Modbus

Modbus.Net/Modbus.Net.Modbus/ModbusRtuInTcpProtocol.cs

@@ -1,8 +1,4 @@
-using Microsoft.Extensions.Configuration;
+namespace Modbus.Net.Modbus
-using System;
-using System.IO;
-
-namespace Modbus.Net.Modbus
 {
     /// <summary>
     ///     Modbus/Rtu协议tcp透传

Modbus.Net/Modbus.Net.Modbus/ModbusRtuInTcpProtocolLinker.cs

@@ -1,8 +1,4 @@
-using Microsoft.Extensions.Configuration;
+namespace Modbus.Net.Modbus
-using System;
-using System.IO;
-
-namespace Modbus.Net.Modbus
 {
     /// <summary>
     ///     Modbus/Rtu协议连接器Tcp透传

Modbus.Net/Modbus.Net.Modbus/ModbusRtuInUdpProtocol.cs

@@ -1,8 +1,4 @@
-using Microsoft.Extensions.Configuration;
+namespace Modbus.Net.Modbus
-using System;
-using System.IO;
-
-namespace Modbus.Net.Modbus
 {
     /// <summary>
     ///     Modbus/Rtu协议udp透传

Modbus.Net/Modbus.Net.Modbus/ModbusRtuInUdpProtocolLinker.cs

@@ -1,8 +1,4 @@
-using Microsoft.Extensions.Configuration;
+namespace Modbus.Net.Modbus
-using System;
-using System.IO;
-
-namespace Modbus.Net.Modbus
 {
     /// <summary>
     ///     Modbus/Rtu协议连接器Udp透传

Modbus.Net/Modbus.Net.Modbus/ModbusRtuProtocol.cs

@@ -1,8 +1,4 @@
-using Microsoft.Extensions.Configuration;
+namespace Modbus.Net.Modbus
-using System;
-using System.IO;
-
-namespace Modbus.Net.Modbus
 {
     /// <summary>
     ///     Modbus/Rtu协议

Modbus.Net/Modbus.Net.Modbus/ModbusRtuProtocolLinker.cs

@@ -1,8 +1,4 @@
-using Microsoft.Extensions.Configuration;
+using System.Collections.Generic;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.IO.Ports;
 
 namespace Modbus.Net.Modbus
 {

Modbus.Net/Modbus.Net.Modbus/ModbusTcpProtocol.cs

@@ -1,8 +1,4 @@
-using Microsoft.Extensions.Configuration;
+namespace Modbus.Net.Modbus
-using System;
-using System.IO;
-
-namespace Modbus.Net.Modbus
 {
     /// <summary>
     ///     Modbus/Tcp协议

Modbus.Net/Modbus.Net.Modbus/ModbusTcpProtocolLinker.cs

@@ -1,9 +1,4 @@
-using Microsoft.Extensions.Configuration;
+namespace Modbus.Net.Modbus
-using System;
-using System.Collections.Generic;
-using System.IO;
-
-namespace Modbus.Net.Modbus
 {
     /// <summary>
     ///     Modbus/Tcp协议连接器

Modbus.Net/Modbus.Net.Modbus/ModbusUdpProtocol.cs

@@ -1,8 +1,4 @@
-using Microsoft.Extensions.Configuration;
+namespace Modbus.Net.Modbus
-using System;
-using System.IO;
-
-namespace Modbus.Net.Modbus
 {
     /// <summary>
     ///     Modbus/Udp协议

Modbus.Net/Modbus.Net.Modbus/ModbusUdpProtocolLinker.cs

@@ -1,9 +1,4 @@
-using Microsoft.Extensions.Configuration;
+namespace Modbus.Net.Modbus
-using System;
-using System.Collections.Generic;
-using System.IO;
-
-namespace Modbus.Net.Modbus
 {
     /// <summary>
     ///     Modbus/Udp协议连接器

Modbus.Net/Modbus.Net.Siemens/SiemensPpiProtocol.cs

@@ -1,7 +1,4 @@
-using Microsoft.Extensions.Configuration;
+using Nito.AsyncEx;
-using Nito.AsyncEx;
-using System;
-using System.IO;
 using System.Threading.Tasks;
 
 namespace Modbus.Net.Siemens

Modbus.Net/Modbus.Net.Siemens/SiemensPpiProtocolLinker.cs

@@ -1,8 +1,4 @@
-using Microsoft.Extensions.Configuration;
+using System.Threading;
-using System;
-using System.IO;
-using System.IO.Ports;
-using System.Threading;
 using System.Threading.Tasks;
 
 

Modbus.Net/Modbus.Net.Siemens/SiemensTcpProtocol.cs

@@ -1,7 +1,4 @@
-using Microsoft.Extensions.Configuration;
+using Nito.AsyncEx;
-using Nito.AsyncEx;
-using System;
-using System.IO;
 using System.Threading.Tasks;
 
 namespace Modbus.Net.Siemens

Modbus.Net/Modbus.Net.Siemens/SiemensTcpProtocolLinker.cs

@@ -1,7 +1,5 @@
-using Microsoft.Extensions.Configuration;
+using System;
-using System;
 using System.Collections.Generic;
-using System.IO;
 
 namespace Modbus.Net.Siemens
 {

Modbus.Net/Modbus.Net.Siemens/SiemensUtility.cs

@@ -306,7 +306,8 @@ namespace Modbus.Net.Siemens
                         Wrapper.SendReceiveAsync<WriteRequestSiemensOutputStruct>(
                             Wrapper[typeof(WriteRequestSiemensProtocol)],
                             writeRequestSiemensInputStruct);
-                return new ReturnStruct<bool> {
+                return new ReturnStruct<bool>
+                {
                     Datas = writeRequestSiemensOutputStruct?.AccessResult == SiemensAccessResult.NoError,
                     IsSuccess = writeRequestSiemensOutputStruct?.AccessResult == SiemensAccessResult.NoError,
                     ErrorCode = writeRequestSiemensOutputStruct?.AccessResult == SiemensAccessResult.NoError ? 0 : (int)writeRequestSiemensOutputStruct?.AccessResult,

Modbus.Net/Modbus.Net/Configuration/ConfigurationReader.cs

@@ -1,10 +1,7 @@
 using Microsoft.Extensions.Configuration;
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Modbus.Net
 {

Modbus.Net/Modbus.Net/Controller/FifoController.cs

@@ -1,8 +1,6 @@
-using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Threading;
 

Modbus.Net/Modbus.Net/Linker/ComProtocolLinker.cs

@@ -1,6 +1,4 @@
-using Microsoft.Extensions.Configuration;
+using System;
-using System;
-using System.IO;
 using System.IO.Ports;
 
 namespace Modbus.Net

Modbus.Net/Modbus.Net/Linker/TcpProtocolLinker.cs

@@ -1,9 +1,4 @@
-using Microsoft.Extensions.Configuration;
+namespace Modbus.Net
-using System;
-using System.Configuration;
-using System.IO;
-
-namespace Modbus.Net
 {
     /// <summary>
     ///     Tcp连接对象

Modbus.Net/Modbus.Net/Linker/UdpProtocolLinker.cs

@@ -1,8 +1,4 @@
-using Microsoft.Extensions.Configuration;
+namespace Modbus.Net
-using System;
-using System.IO;
-
-namespace Modbus.Net
 {
     /// <summary>
     ///     Udp连接对象

Modbus.Net/Modbus.Net/Machine/BaseMachine.cs

@@ -213,7 +213,8 @@ namespace Modbus.Net
                     await BaseUtility.ConnectAsync();
                 //如果无法连接，终止
                 if (!BaseUtility.IsConnected) return
-                        new ReturnStruct<Dictionary<string, ReturnUnit>>() { 
+                        new ReturnStruct<Dictionary<string, ReturnUnit>>()
+                        {
                             Datas = null,
                             IsSuccess = false,
                             ErrorCode = -1,

Modbus.Net/Modbus.Net/ReturnStruct/ReturnStruct.cs

@@ -1,10 +1,4 @@
-using System;
+namespace Modbus.Net
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Modbus.Net
 {
     /// <summary>
     ///     返回引用类型

Modbus.Net/Modbus.Net/Utility/BaseUtility.cs

@@ -2,9 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Security.Policy;
 using System.Threading.Tasks;
-using System.Xml.Linq;
 
 /// <summary>
 ///     端格式

Modbus.Net/Modbus.Net/appsettings.default.json

@@ -26,8 +26,8 @@
       "FetchSleepTime": "100",
       "ConnectionTimeout": "5000",
       "BaudRate": "9600",
-      "Parity": "Parity.None",
+      "Parity": "None",
-      "StopBits": "StopBits.One",
+      "StopBits": "One",
       "DataBits": "8",
       "FullDuplex": "False",
       "Modbus": {

Samples/AnyType/appsettings.default.json

@@ -26,8 +26,8 @@
       "FetchSleepTime": "100",
       "ConnectionTimeout": "5000",
       "BaudRate": "9600",
-      "Parity": "Parity.None",
+      "Parity": "None",
-      "StopBits": "StopBits.One",
+      "StopBits": "One",
       "DataBits": "8",
       "FullDuplex": "False",
       "Modbus": {

Samples/CrossLamp/appsettings.default.json

@@ -26,8 +26,8 @@
       "FetchSleepTime": "100",
       "ConnectionTimeout": "5000",
       "BaudRate": "9600",
-      "Parity": "Parity.None",
+      "Parity": "None",
-      "StopBits": "StopBits.One",
+      "StopBits": "One",
       "DataBits": "8",
       "FullDuplex": "False",
       "Modbus": {

Samples/MachineJob/Worker.cs

@@ -46,8 +46,8 @@ namespace MachineJob.Service
 
             IMachine<string> machine = new ModbusMachine<string, string>("ModbusMachine1", ModbusType.Tcp, null, _addresses, true, 1, 2, Endian.BigEndianLsb);
             IMachine<string> machine2 = new SiemensMachine<string, string>("SiemensMachine1", SiemensType.Tcp, null, SiemensMachineModel.S7_1200, _addresses2, true, 1, 2);
-
+            IMachine<string> machine3 = new ModbusMachine<string, string>("ModbusMachine2", ModbusType.Rtu, "COM3", _addresses, true, 3, 2);
-            var machines = new List<IMachine<string>>() { machine, machine2 };
+            var machines = new List<IMachine<string>>() { machine, machine2, machine3 };
             return Task.Run(() => MultipleMachinesJobScheduler.RunScheduler(machines, async (machine, scheduler) =>
             {
                 await scheduler.From(machine.Id, machine, MachineDataType.Name).Result.Query(machine.Id + ".ConsoleQuery", QueryConsole).Result.To(machine.Id + ".To", machine).Result.Deal(machine.Id + ".Deal", OnSuccess, OnFailure).Result.Run();
@@ -67,13 +67,15 @@ namespace MachineJob.Service
 
         public Task OnFailure(string machineId, int errorCode, string errorMsg)
         {
-            _logger.LogError("Machine {0} set failure", machineId);
+            _logger.LogError("Machine {0} set failure: {1}", machineId, errorMsg);
             return Task.CompletedTask;
         }
 
-        private Dictionary<string, double> QueryConsole(DataReturnDef dataReturnDef)
+        private Dictionary<string, double>? QueryConsole(DataReturnDef dataReturnDef)
         {
             var values = dataReturnDef.ReturnValues.Datas;
+            if (dataReturnDef.ReturnValues.IsSuccess)
+            {
                 foreach (var value in values)
                 {
                     _logger.LogInformation(dataReturnDef.MachineId + " " + value.Key + " " + value.Value.DeviceValue);
@@ -113,5 +115,7 @@ namespace MachineJob.Service
 
                 return values.MapGetValuesToSetValues();
             }
+            return null;
+        }
     }
 }

Samples/MachineJob/appsettings.default.json

@@ -26,8 +26,8 @@
       "FetchSleepTime": "100",
       "ConnectionTimeout": "5000",
       "BaudRate": "9600",
-      "Parity": "Parity.None",
+      "Parity": "None",
-      "StopBits": "StopBits.One",
+      "StopBits": "One",
       "DataBits": "8",
       "FullDuplex": "False",
       "Modbus": {

Samples/TripleAdd/appsettings.default.json

@@ -26,8 +26,8 @@
       "FetchSleepTime": "100",
       "ConnectionTimeout": "5000",
       "BaudRate": "9600",
-      "Parity": "Parity.None",
+      "Parity": "None",
-      "StopBits": "StopBits.One",
+      "StopBits": "One",
       "DataBits": "8",
       "FullDuplex": "False",
       "Modbus": {