diff --git a/IoTGateway/iotgateway.db b/IoTGateway/iotgateway.db index ce9da74..ee2c33f 100644 Binary files a/IoTGateway/iotgateway.db and b/IoTGateway/iotgateway.db differ diff --git a/Plugins/Drivers/DriverModbusMaster/ModbusMaster.cs b/Plugins/Drivers/DriverModbusMaster/ModbusMaster.cs index fe11cc7..8867ce6 100644 --- a/Plugins/Drivers/DriverModbusMaster/ModbusMaster.cs +++ b/Plugins/Drivers/DriverModbusMaster/ModbusMaster.cs @@ -524,7 +524,7 @@ namespace DriverModbusMaster } catch (Exception ex) { - rpcResponse.Description = $"写入失败:{Method},{Ioarg}"; + rpcResponse.Description = $"写入失败,[Method]:{Method},[Ioarg]:{Ioarg},[ex]:{ex}"; } return rpcResponse; } diff --git a/Plugins/Drivers/DriverSiemensS7/SiemensS7.cs b/Plugins/Drivers/DriverSiemensS7/SiemensS7.cs index c9d9ebd..288cf8b 100644 --- a/Plugins/Drivers/DriverSiemensS7/SiemensS7.cs +++ b/Plugins/Drivers/DriverSiemensS7/SiemensS7.cs @@ -148,7 +148,10 @@ namespace DriverSiemensS7 int startAdr = int.Parse(ioarg.Address.Trim().Split(',')[1]); int count = int.Parse(ioarg.Address.Trim().Split(',')[2]); var buffers = plc.ReadBytes(DataType.DataBlock, db, startAdr, count); - ret.Value = Encoding.ASCII.GetString(buffers); + var str = Encoding.ASCII.GetString(buffers); + if (str.Contains('\0')) + str = str.Split('\0')[0]; + ret.Value = str; } catch (Exception ex) { @@ -226,7 +229,81 @@ namespace DriverSiemensS7 public async Task WriteAsync(string RequestId, string Method, DriverAddressIoArgModel Ioarg) { - RpcResponse rpcResponse = new() { IsSuccess = false, Description = "设备驱动内未实现写入功能" }; + RpcResponse rpcResponse = new() { IsSuccess = false }; + try + { + if (!IsConnected) + rpcResponse.Description = "设备连接已断开"; + else + { + object toWrite = null; + switch (Ioarg.ValueType) + { + case DataTypeEnum.Bit: + case DataTypeEnum.Bool: + toWrite = Ioarg.Value.ToString().ToLower() == "true" || Ioarg.Value.ToString().ToLower() == "1"; + break; + case DataTypeEnum.UByte: + toWrite = byte.Parse(Ioarg.Value.ToString()); + break; + case DataTypeEnum.Byte: + toWrite = sbyte.Parse(Ioarg.Value.ToString()); + break; + case DataTypeEnum.Uint16: + toWrite = ushort.Parse(Ioarg.Value.ToString()); + break; + case DataTypeEnum.Int16: + toWrite = short.Parse(Ioarg.Value.ToString()); + break; + case DataTypeEnum.Uint32: + toWrite = uint.Parse(Ioarg.Value.ToString()); + break; + case DataTypeEnum.Int32: + toWrite = int.Parse(Ioarg.Value.ToString()); + break; + case DataTypeEnum.Float: + toWrite = float.Parse(Ioarg.Value.ToString()); + break; + case DataTypeEnum.AsciiString: + toWrite = Encoding.ASCII.GetBytes(Ioarg.Value.ToString()); + break; + default: + rpcResponse.Description = $"类型{DataTypeEnum.Float}不支持写入"; + break; + } + if (toWrite == null) + return rpcResponse; + + //通用方法 + if (Method == nameof(Read)) + { + plc.Write(Ioarg.Address, toWrite); + + rpcResponse.IsSuccess = true; + return rpcResponse; + } + //字符串 + else if (Method == nameof(ReadString)) + { + int db = int.Parse(Ioarg.Address.Trim().Split(',')[0]); + int startAdr = int.Parse(Ioarg.Address.Trim().Split(',')[1]); + int count = int.Parse(Ioarg.Address.Trim().Split(',')[2]); + //防止写入到其他地址 进行截断 + if (((byte[])toWrite).Length > count) + toWrite = ((byte[])toWrite).Take(count); + plc.Write(DataType.DataBlock, db, startAdr, toWrite); + + rpcResponse.IsSuccess = true; + return rpcResponse; + } + else + rpcResponse.Description = $"不支持写入:{Method}"; + } + } + catch (Exception ex) + { + rpcResponse.Description = $"写入失败,[Method]:{Method},[Ioarg]:{Ioarg},[ex]:{ex}"; + } return rpcResponse; } } diff --git a/Quickstarts.ReferenceServer.Config.xml b/Quickstarts.ReferenceServer.Config.xml deleted file mode 100644 index 3e8153c..0000000 --- a/Quickstarts.ReferenceServer.Config.xml +++ /dev/null @@ -1,300 +0,0 @@ - - - Quickstart Reference Server - urn:localhost:UA:Quickstarts:ReferenceServer - uri:opcfoundation.org:Quickstarts:ReferenceServer - Server_0 - - - - - - Directory - %LocalApplicationData%/OPC Foundation/pki/own - CN=Quickstart Reference Server, C=US, S=Arizona, O=OPC Foundation, DC=localhost - - - - - Directory - %LocalApplicationData%/OPC Foundation/pki/issuer - - - - - Directory - %LocalApplicationData%/OPC Foundation/pki/trusted - - - - - Directory - %LocalApplicationData%/OPC Foundation/pki/rejected - - - - false - - - false - true - 2048 - false - true - - - - Directory - %LocalApplicationData%/OPC Foundation/pki/issuerUser - - - - - Directory - %LocalApplicationData%/OPC Foundation/pki/trustedUser - - - - - - 600000 - 1048576 - 1048576 - 65535 - 4194304 - 65535 - 300000 - 3600000 - - - - https://localhost:62540/Quickstarts/ReferenceServer - opc.tcp://localhost:62541/Quickstarts/ReferenceServer - - - - - - SignAndEncrypt_3 - http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256 - - - None_1 - http://opcfoundation.org/UA/SecurityPolicy#None - - - Sign_2 - - - - SignAndEncrypt_3 - - - - - - 5 - 100 - 2000 - - - - - - Anonymous_0 - http://opcfoundation.org/UA/SecurityPolicy#None - - - - - UserName_1 - - http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256 - - - - - Certificate_2 - - http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256 - - - true - 100 - 10000 - 3600000 - 10 - 10 - 100 - 600000 - 100 - 3600000 - 50 - 3600000 - 100 - 100 - 1000 - 1000 - - - 5 - 5 - 20 - - - 100 - 100 - 4 - - - 500 - 250 - 2 - - - 1000 - 500 - 20 - - - - - opc.tcp://localhost:4840 - - opc.tcp://localhost:4840 - DiscoveryServer_3 - - opc.tcp://localhost:4840 - - - SignAndEncrypt_3 - - - - - 0 - Quickstarts.ReferenceServer.nodes.xml - 10000 - 20 - 100 - 10000 - - - - http://opcfoundation.org/UA-Profile/Server/StandardUA2017 - http://opcfoundation.org/UA-Profile/Server/DataAccess - http://opcfoundation.org/UA-Profile/Server/Methods - http://opcfoundation.org/UA-Profile/Server/ReverseConnect - - 5 - - DA - - - PFX - PEM - - 0 - false - - - - 1000 - 1000 - 250 - 2500 - 1000 - 1000 - - - - - - - - - - UInt32 - 100 - UInt32 - - - Double - 100 - Double - - - - - - - - %LocalApplicationData%/OPC Foundation/Logs/Quickstarts.ReferenceServer.log.txt - true - - - - - - - - - - - - - - - diff --git a/auto-build-arm.sh b/auto-build-arm.sh new file mode 100644 index 0000000..55b116e --- /dev/null +++ b/auto-build-arm.sh @@ -0,0 +1,15 @@ +#!/bin/bash +echo start +docker build -t iotgateway . +docker stop iotgateway +docker rm iotgateway +docker run -d --restart always --name iotgateway -p 518:518 -p 1888:1888 -p 62541:62541 -p 503:503 iotgateway +docker cp 3d iotgateway:app/wwwroot/ +docker cp drivers iotgateway:app/ +docker cp IoTGateway/iotgateway.db iotgateway:app/ +docker cp IoTGateway/Quickstarts.ReferenceServer.Config.xml iotgateway:app/ +docker restart iotgateway +docker commit iotgateway registry.cn-hangzhou.aliyuncs.com/wanghaidong/iotgateway:arm +docker push registry.cn-hangzhou.aliyuncs.com/wanghaidong/iotgateway:arm +docker tag registry.cn-hangzhou.aliyuncs.com/wanghaidong/iotgateway:arm 15261671110/iotgateway:arm +docker push 15261671110/iotgateway:arm \ No newline at end of file diff --git a/auto-build.sh b/auto-build.sh new file mode 100644 index 0000000..df5a9f6 --- /dev/null +++ b/auto-build.sh @@ -0,0 +1,15 @@ +#!/bin/bash +echo start +docker build -t iotgateway . +docker stop iotgateway +docker rm iotgateway +docker run -d --restart always --name iotgateway -p 518:518 -p 1888:1888 -p 62541:62541 -p 503:503 iotgateway +docker cp 3d iotgateway:app/wwwroot/ +docker cp drivers iotgateway:app/ +docker cp IoTGateway/iotgateway.db iotgateway:app/ +docker cp IoTGateway/Quickstarts.ReferenceServer.Config.xml iotgateway:app/ +docker restart iotgateway +docker commit iotgateway registry.cn-hangzhou.aliyuncs.com/wanghaidong/iotgateway +docker push registry.cn-hangzhou.aliyuncs.com/wanghaidong/iotgateway +docker tag registry.cn-hangzhou.aliyuncs.com/wanghaidong/iotgateway 15261671110/iotgateway +docker push 15261671110/iotgateway \ No newline at end of file diff --git a/drivers/DriverModbusMaster/net6.0/DriverModbusMaster.deps.json b/drivers/DriverModbusMaster/net6.0/DriverModbusMaster.deps.json new file mode 100644 index 0000000..6325d43 --- /dev/null +++ b/drivers/DriverModbusMaster/net6.0/DriverModbusMaster.deps.json @@ -0,0 +1,183 @@ +{ + "runtimeTarget": { + "name": ".NETCoreApp,Version=v6.0", + "signature": "" + }, + "compilationOptions": {}, + "targets": { + ".NETCoreApp,Version=v6.0": { + "DriverModbusMaster/1.0.0": { + "dependencies": { + "PluginInterface": "1.0.0", + "System.IO.Ports": "6.0.0" + }, + "runtime": { + "DriverModbusMaster.dll": {} + } + }, + "Newtonsoft.Json/13.0.1": { + "runtime": { + "lib/netstandard2.0/Newtonsoft.Json.dll": { + "assemblyVersion": "13.0.0.0", + "fileVersion": "13.0.1.25517" + } + } + }, + "runtime.linux-arm.runtime.native.System.IO.Ports/6.0.0": { + "runtimeTargets": { + "runtimes/linux-arm/native/libSystem.IO.Ports.Native.so": { + "rid": "linux-arm", + "assetType": "native", + "fileVersion": "0.0.0.0" + } + } + }, + "runtime.linux-arm64.runtime.native.System.IO.Ports/6.0.0": { + "runtimeTargets": { + "runtimes/linux-arm64/native/libSystem.IO.Ports.Native.so": { + "rid": "linux-arm64", + "assetType": "native", + "fileVersion": "0.0.0.0" + } + } + }, + "runtime.linux-x64.runtime.native.System.IO.Ports/6.0.0": { + "runtimeTargets": { + "runtimes/linux-x64/native/libSystem.IO.Ports.Native.so": { + "rid": "linux-x64", + "assetType": "native", + "fileVersion": "0.0.0.0" + } + } + }, + "runtime.native.System.IO.Ports/6.0.0": { + "dependencies": { + "runtime.linux-arm.runtime.native.System.IO.Ports": "6.0.0", + "runtime.linux-arm64.runtime.native.System.IO.Ports": "6.0.0", + "runtime.linux-x64.runtime.native.System.IO.Ports": "6.0.0", + "runtime.osx-arm64.runtime.native.System.IO.Ports": "6.0.0", + "runtime.osx-x64.runtime.native.System.IO.Ports": "6.0.0" + } + }, + "runtime.osx-arm64.runtime.native.System.IO.Ports/6.0.0": { + "runtimeTargets": { + "runtimes/osx-arm64/native/libSystem.IO.Ports.Native.dylib": { + "rid": "osx-arm64", + "assetType": "native", + "fileVersion": "0.0.0.0" + } + } + }, + "runtime.osx-x64.runtime.native.System.IO.Ports/6.0.0": { + "runtimeTargets": { + "runtimes/osx-x64/native/libSystem.IO.Ports.Native.dylib": { + "rid": "osx-x64", + "assetType": "native", + "fileVersion": "0.0.0.0" + } + } + }, + "System.IO.Ports/6.0.0": { + "dependencies": { + "runtime.native.System.IO.Ports": "6.0.0" + }, + "runtime": { + "lib/net6.0/System.IO.Ports.dll": { + "assemblyVersion": "6.0.0.0", + "fileVersion": "6.0.21.52210" + } + }, + "runtimeTargets": { + "runtimes/unix/lib/net6.0/System.IO.Ports.dll": { + "rid": "unix", + "assetType": "runtime", + "assemblyVersion": "6.0.0.0", + "fileVersion": "6.0.21.52210" + }, + "runtimes/win/lib/net6.0/System.IO.Ports.dll": { + "rid": "win", + "assetType": "runtime", + "assemblyVersion": "6.0.0.0", + "fileVersion": "6.0.21.52210" + } + } + }, + "PluginInterface/1.0.0": { + "dependencies": { + "Newtonsoft.Json": "13.0.1" + }, + "runtime": { + "PluginInterface.dll": {} + } + } + } + }, + "libraries": { + "DriverModbusMaster/1.0.0": { + "type": "project", + "serviceable": false, + "sha512": "" + }, + "Newtonsoft.Json/13.0.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==", + "path": "newtonsoft.json/13.0.1", + "hashPath": "newtonsoft.json.13.0.1.nupkg.sha512" + }, + "runtime.linux-arm.runtime.native.System.IO.Ports/6.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-75q52H7CSpgIoIDwXb9o833EvBZIXJ0mdPhz1E6jSisEXUBlSCPalC29cj3EXsjpuDwr0dj1LRXZepIQH/oL4Q==", + "path": "runtime.linux-arm.runtime.native.system.io.ports/6.0.0", + "hashPath": "runtime.linux-arm.runtime.native.system.io.ports.6.0.0.nupkg.sha512" + }, + "runtime.linux-arm64.runtime.native.System.IO.Ports/6.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-xn2bMThmXr3CsvOYmS8ex2Yz1xo+kcnhVg2iVhS9PlmqjZPAkrEo/I40wjrBZH/tU4kvH0s1AE8opAvQ3KIS8g==", + "path": "runtime.linux-arm64.runtime.native.system.io.ports/6.0.0", + "hashPath": "runtime.linux-arm64.runtime.native.system.io.ports.6.0.0.nupkg.sha512" + }, + "runtime.linux-x64.runtime.native.System.IO.Ports/6.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-16nbNXwv0sC+gLGIuecri0skjuh6R1maIJggsaNP7MQBcbVcEfWFUOkEnsnvoLEjy0XerfibuRptfQ8AmdIcWA==", + "path": "runtime.linux-x64.runtime.native.system.io.ports/6.0.0", + "hashPath": "runtime.linux-x64.runtime.native.system.io.ports.6.0.0.nupkg.sha512" + }, + "runtime.native.System.IO.Ports/6.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-KaaXlpOcuZjMdmyF5wzzx3b+PRKIzt6A5Ax9dKenPDQbVJAFpev+casD0BIig1pBcbs3zx7CqWemzUJKAeHdSQ==", + "path": "runtime.native.system.io.ports/6.0.0", + "hashPath": "runtime.native.system.io.ports.6.0.0.nupkg.sha512" + }, + "runtime.osx-arm64.runtime.native.System.IO.Ports/6.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-fXG12NodG1QrCdoaeSQ1gVnk/koi4WYY4jZtarMkZeQMyReBm1nZlSRoPnUjLr2ZR36TiMjpcGnQfxymieUe7w==", + "path": "runtime.osx-arm64.runtime.native.system.io.ports/6.0.0", + "hashPath": "runtime.osx-arm64.runtime.native.system.io.ports.6.0.0.nupkg.sha512" + }, + "runtime.osx-x64.runtime.native.System.IO.Ports/6.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-/As+zPY49+dSUXkh+fTUbyPhqrdGN//evLxo4Vue88pfh1BHZgF7q4kMblTkxYvwR6Vi03zSYxysSFktO8/SDQ==", + "path": "runtime.osx-x64.runtime.native.system.io.ports/6.0.0", + "hashPath": "runtime.osx-x64.runtime.native.system.io.ports.6.0.0.nupkg.sha512" + }, + "System.IO.Ports/6.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-dRyGI7fUESar5ZLIpiBOaaNLW7YyOBGftjj5Of+xcduC/Rjl7RjhEnWDvvNBmHuF3d0tdXoqdVI/yrVA8f00XA==", + "path": "system.io.ports/6.0.0", + "hashPath": "system.io.ports.6.0.0.nupkg.sha512" + }, + "PluginInterface/1.0.0": { + "type": "project", + "serviceable": false, + "sha512": "" + } + } +} \ No newline at end of file diff --git a/drivers/DriverModbusMaster/net6.0/DriverModbusMaster.dll b/drivers/DriverModbusMaster/net6.0/DriverModbusMaster.dll new file mode 100644 index 0000000..78b613b Binary files /dev/null and b/drivers/DriverModbusMaster/net6.0/DriverModbusMaster.dll differ diff --git a/drivers/DriverModbusMaster/net6.0/DriverModbusMaster.pdb b/drivers/DriverModbusMaster/net6.0/DriverModbusMaster.pdb new file mode 100644 index 0000000..3fa7d09 Binary files /dev/null and b/drivers/DriverModbusMaster/net6.0/DriverModbusMaster.pdb differ diff --git a/drivers/DriverModbusMaster/net6.0/PluginInterface.dll b/drivers/DriverModbusMaster/net6.0/PluginInterface.dll new file mode 100644 index 0000000..0889469 Binary files /dev/null and b/drivers/DriverModbusMaster/net6.0/PluginInterface.dll differ diff --git a/drivers/DriverModbusMaster/net6.0/PluginInterface.pdb b/drivers/DriverModbusMaster/net6.0/PluginInterface.pdb new file mode 100644 index 0000000..b68877d Binary files /dev/null and b/drivers/DriverModbusMaster/net6.0/PluginInterface.pdb differ diff --git a/drivers/DriverModbusMaster/net6.0/ref/DriverModbusMaster.dll b/drivers/DriverModbusMaster/net6.0/ref/DriverModbusMaster.dll new file mode 100644 index 0000000..e0c3da4 Binary files /dev/null and b/drivers/DriverModbusMaster/net6.0/ref/DriverModbusMaster.dll differ diff --git a/drivers/net6.0/DriverAllenBradley.dll b/drivers/net6.0/DriverAllenBradley.dll index 5cb0bee..f84e746 100644 Binary files a/drivers/net6.0/DriverAllenBradley.dll and b/drivers/net6.0/DriverAllenBradley.dll differ diff --git a/drivers/net6.0/DriverAllenBradley.pdb b/drivers/net6.0/DriverAllenBradley.pdb index d80c410..612e7a7 100644 Binary files a/drivers/net6.0/DriverAllenBradley.pdb and b/drivers/net6.0/DriverAllenBradley.pdb differ diff --git a/drivers/net6.0/DriverFanuc.dll b/drivers/net6.0/DriverFanuc.dll index 75831e8..3c2edcb 100644 Binary files a/drivers/net6.0/DriverFanuc.dll and b/drivers/net6.0/DriverFanuc.dll differ diff --git a/drivers/net6.0/DriverFanuc.pdb b/drivers/net6.0/DriverFanuc.pdb index d7d9cd9..e44e990 100644 Binary files a/drivers/net6.0/DriverFanuc.pdb and b/drivers/net6.0/DriverFanuc.pdb differ diff --git a/drivers/net6.0/DriverFanucHsl.dll b/drivers/net6.0/DriverFanucHsl.dll index 95c9d77..251d64c 100644 Binary files a/drivers/net6.0/DriverFanucHsl.dll and b/drivers/net6.0/DriverFanucHsl.dll differ diff --git a/drivers/net6.0/DriverFanucHsl.pdb b/drivers/net6.0/DriverFanucHsl.pdb index a0dd914..d66c23a 100644 Binary files a/drivers/net6.0/DriverFanucHsl.pdb and b/drivers/net6.0/DriverFanucHsl.pdb differ diff --git a/drivers/net6.0/DriverMTConnect.dll b/drivers/net6.0/DriverMTConnect.dll index bae5d0e..c26969b 100644 Binary files a/drivers/net6.0/DriverMTConnect.dll and b/drivers/net6.0/DriverMTConnect.dll differ diff --git a/drivers/net6.0/DriverMTConnect.pdb b/drivers/net6.0/DriverMTConnect.pdb index cc9df59..500aa0b 100644 Binary files a/drivers/net6.0/DriverMTConnect.pdb and b/drivers/net6.0/DriverMTConnect.pdb differ diff --git a/drivers/net6.0/DriverMitsubishi.dll b/drivers/net6.0/DriverMitsubishi.dll index a719058..7906151 100644 Binary files a/drivers/net6.0/DriverMitsubishi.dll and b/drivers/net6.0/DriverMitsubishi.dll differ diff --git a/drivers/net6.0/DriverMitsubishi.pdb b/drivers/net6.0/DriverMitsubishi.pdb index 323460d..9b495a9 100644 Binary files a/drivers/net6.0/DriverMitsubishi.pdb and b/drivers/net6.0/DriverMitsubishi.pdb differ diff --git a/drivers/net6.0/DriverModbusMaster.dll b/drivers/net6.0/DriverModbusMaster.dll index 09f0c68..556afda 100644 Binary files a/drivers/net6.0/DriverModbusMaster.dll and b/drivers/net6.0/DriverModbusMaster.dll differ diff --git a/drivers/net6.0/DriverModbusMaster.pdb b/drivers/net6.0/DriverModbusMaster.pdb index c2be550..2b802d9 100644 Binary files a/drivers/net6.0/DriverModbusMaster.pdb and b/drivers/net6.0/DriverModbusMaster.pdb differ diff --git a/drivers/net6.0/DriverOPCDaClient.deps.json b/drivers/net6.0/DriverOPCDaClient.deps.json new file mode 100644 index 0000000..ad980a6 --- /dev/null +++ b/drivers/net6.0/DriverOPCDaClient.deps.json @@ -0,0 +1,68 @@ +{ + "runtimeTarget": { + "name": ".NETCoreApp,Version=v6.0", + "signature": "" + }, + "compilationOptions": {}, + "targets": { + ".NETCoreApp,Version=v6.0": { + "DriverOPCDaClient/1.0.0": { + "dependencies": { + "PluginInterface": "1.0.0", + "Interop.OPCAutomation": "1.0.0.0" + }, + "runtime": { + "DriverOPCDaClient.dll": {} + } + }, + "Newtonsoft.Json/13.0.1": { + "runtime": { + "lib/netstandard2.0/Newtonsoft.Json.dll": { + "assemblyVersion": "13.0.0.0", + "fileVersion": "13.0.1.25517" + } + } + }, + "PluginInterface/1.0.0": { + "dependencies": { + "Newtonsoft.Json": "13.0.1" + }, + "runtime": { + "PluginInterface.dll": {} + } + }, + "Interop.OPCAutomation/1.0.0.0": { + "runtime": { + "Interop.OPCAutomation.dll": { + "assemblyVersion": "1.0.0.0", + "fileVersion": "1.0.0.0" + } + } + } + } + }, + "libraries": { + "DriverOPCDaClient/1.0.0": { + "type": "project", + "serviceable": false, + "sha512": "" + }, + "Newtonsoft.Json/13.0.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==", + "path": "newtonsoft.json/13.0.1", + "hashPath": "newtonsoft.json.13.0.1.nupkg.sha512" + }, + "PluginInterface/1.0.0": { + "type": "project", + "serviceable": false, + "sha512": "" + }, + "Interop.OPCAutomation/1.0.0.0": { + "type": "reference", + "serviceable": false, + "sha512": "" + } + } +} \ No newline at end of file diff --git a/drivers/net6.0/DriverOPCDaClient.dll b/drivers/net6.0/DriverOPCDaClient.dll new file mode 100644 index 0000000..c315f46 Binary files /dev/null and b/drivers/net6.0/DriverOPCDaClient.dll differ diff --git a/drivers/net6.0/DriverOPCDaClient.pdb b/drivers/net6.0/DriverOPCDaClient.pdb new file mode 100644 index 0000000..6a7d09e Binary files /dev/null and b/drivers/net6.0/DriverOPCDaClient.pdb differ diff --git a/drivers/net6.0/DriverOPCUaClient.dll b/drivers/net6.0/DriverOPCUaClient.dll index 60cb36e..12b9aa7 100644 Binary files a/drivers/net6.0/DriverOPCUaClient.dll and b/drivers/net6.0/DriverOPCUaClient.dll differ diff --git a/drivers/net6.0/DriverOPCUaClient.pdb b/drivers/net6.0/DriverOPCUaClient.pdb index b09bc6e..53cdbd1 100644 Binary files a/drivers/net6.0/DriverOPCUaClient.pdb and b/drivers/net6.0/DriverOPCUaClient.pdb differ diff --git a/drivers/net6.0/DriverOmronFins.dll b/drivers/net6.0/DriverOmronFins.dll index 54c9ae8..8e69f54 100644 Binary files a/drivers/net6.0/DriverOmronFins.dll and b/drivers/net6.0/DriverOmronFins.dll differ diff --git a/drivers/net6.0/DriverOmronFins.pdb b/drivers/net6.0/DriverOmronFins.pdb index 247da65..87a2907 100644 Binary files a/drivers/net6.0/DriverOmronFins.pdb and b/drivers/net6.0/DriverOmronFins.pdb differ diff --git a/drivers/net6.0/DriverSiemensS7.dll b/drivers/net6.0/DriverSiemensS7.dll index 6983787..8846d50 100644 Binary files a/drivers/net6.0/DriverSiemensS7.dll and b/drivers/net6.0/DriverSiemensS7.dll differ diff --git a/drivers/net6.0/DriverSiemensS7.pdb b/drivers/net6.0/DriverSiemensS7.pdb index 17e85f1..cfee423 100644 Binary files a/drivers/net6.0/DriverSiemensS7.pdb and b/drivers/net6.0/DriverSiemensS7.pdb differ diff --git a/drivers/net6.0/DriverSimTcpClient.dll b/drivers/net6.0/DriverSimTcpClient.dll index eaef7a4..051fac3 100644 Binary files a/drivers/net6.0/DriverSimTcpClient.dll and b/drivers/net6.0/DriverSimTcpClient.dll differ diff --git a/drivers/net6.0/DriverSimTcpClient.pdb b/drivers/net6.0/DriverSimTcpClient.pdb index 6d97bb2..8f5e3ea 100644 Binary files a/drivers/net6.0/DriverSimTcpClient.pdb and b/drivers/net6.0/DriverSimTcpClient.pdb differ diff --git a/drivers/net6.0/Interop.OPCAutomation.dll b/drivers/net6.0/Interop.OPCAutomation.dll new file mode 100644 index 0000000..b47e0dc Binary files /dev/null and b/drivers/net6.0/Interop.OPCAutomation.dll differ diff --git a/drivers/net6.0/PluginInterface.dll b/drivers/net6.0/PluginInterface.dll index 88b51dd..0889469 100644 Binary files a/drivers/net6.0/PluginInterface.dll and b/drivers/net6.0/PluginInterface.dll differ diff --git a/drivers/net6.0/PluginInterface.pdb b/drivers/net6.0/PluginInterface.pdb index 47a6b2e..b68877d 100644 Binary files a/drivers/net6.0/PluginInterface.pdb and b/drivers/net6.0/PluginInterface.pdb differ diff --git a/drivers/net6.0/System.IO.Ports.dll b/drivers/net6.0/System.IO.Ports.dll index 6e8d9a7..e2af6d1 100644 Binary files a/drivers/net6.0/System.IO.Ports.dll and b/drivers/net6.0/System.IO.Ports.dll differ diff --git a/drivers/net6.0/ref/DriverAllenBradley.dll b/drivers/net6.0/ref/DriverAllenBradley.dll new file mode 100644 index 0000000..45e9a39 Binary files /dev/null and b/drivers/net6.0/ref/DriverAllenBradley.dll differ diff --git a/drivers/net6.0/ref/DriverFanuc.dll b/drivers/net6.0/ref/DriverFanuc.dll new file mode 100644 index 0000000..54e6ae9 Binary files /dev/null and b/drivers/net6.0/ref/DriverFanuc.dll differ diff --git a/drivers/net6.0/ref/DriverFanucHsl.dll b/drivers/net6.0/ref/DriverFanucHsl.dll new file mode 100644 index 0000000..8fac7e6 Binary files /dev/null and b/drivers/net6.0/ref/DriverFanucHsl.dll differ diff --git a/drivers/net6.0/ref/DriverMTConnect.dll b/drivers/net6.0/ref/DriverMTConnect.dll new file mode 100644 index 0000000..fc4ae42 Binary files /dev/null and b/drivers/net6.0/ref/DriverMTConnect.dll differ diff --git a/drivers/net6.0/ref/DriverMitsubishi.dll b/drivers/net6.0/ref/DriverMitsubishi.dll new file mode 100644 index 0000000..4082315 Binary files /dev/null and b/drivers/net6.0/ref/DriverMitsubishi.dll differ diff --git a/drivers/net6.0/ref/DriverModbusMaster.dll b/drivers/net6.0/ref/DriverModbusMaster.dll new file mode 100644 index 0000000..521e302 Binary files /dev/null and b/drivers/net6.0/ref/DriverModbusMaster.dll differ diff --git a/drivers/net6.0/ref/DriverOPCDaClient.dll b/drivers/net6.0/ref/DriverOPCDaClient.dll new file mode 100644 index 0000000..094ccd1 Binary files /dev/null and b/drivers/net6.0/ref/DriverOPCDaClient.dll differ diff --git a/drivers/net6.0/ref/DriverOPCUaClient.dll b/drivers/net6.0/ref/DriverOPCUaClient.dll new file mode 100644 index 0000000..cd86f74 Binary files /dev/null and b/drivers/net6.0/ref/DriverOPCUaClient.dll differ diff --git a/drivers/net6.0/ref/DriverOmronFins.dll b/drivers/net6.0/ref/DriverOmronFins.dll new file mode 100644 index 0000000..39e372b Binary files /dev/null and b/drivers/net6.0/ref/DriverOmronFins.dll differ diff --git a/drivers/net6.0/ref/DriverSiemensS7.dll b/drivers/net6.0/ref/DriverSiemensS7.dll new file mode 100644 index 0000000..6b6b272 Binary files /dev/null and b/drivers/net6.0/ref/DriverSiemensS7.dll differ diff --git a/drivers/net6.0/ref/DriverSimTcpClient.dll b/drivers/net6.0/ref/DriverSimTcpClient.dll new file mode 100644 index 0000000..db489b0 Binary files /dev/null and b/drivers/net6.0/ref/DriverSimTcpClient.dll differ diff --git a/drivers/net6.0/runtimes/linux-arm/native/System.IO.Ports.Native.so b/drivers/net6.0/runtimes/linux-arm/native/System.IO.Ports.Native.so index 926a0af..ebe7e5c 100644 Binary files a/drivers/net6.0/runtimes/linux-arm/native/System.IO.Ports.Native.so and b/drivers/net6.0/runtimes/linux-arm/native/System.IO.Ports.Native.so differ diff --git a/drivers/net6.0/runtimes/linux-arm64/native/System.IO.Ports.Native.so b/drivers/net6.0/runtimes/linux-arm64/native/System.IO.Ports.Native.so index 5b6888d..266e5d2 100644 Binary files a/drivers/net6.0/runtimes/linux-arm64/native/System.IO.Ports.Native.so and b/drivers/net6.0/runtimes/linux-arm64/native/System.IO.Ports.Native.so differ diff --git a/drivers/net6.0/runtimes/linux-x64/native/System.IO.Ports.Native.so b/drivers/net6.0/runtimes/linux-x64/native/System.IO.Ports.Native.so index b609400..8af62f2 100644 Binary files a/drivers/net6.0/runtimes/linux-x64/native/System.IO.Ports.Native.so and b/drivers/net6.0/runtimes/linux-x64/native/System.IO.Ports.Native.so differ diff --git a/drivers/net6.0/runtimes/linux/lib/netstandard2.0/System.IO.Ports.dll b/drivers/net6.0/runtimes/linux/lib/netstandard2.0/System.IO.Ports.dll index 1cf099b..69712b6 100644 Binary files a/drivers/net6.0/runtimes/linux/lib/netstandard2.0/System.IO.Ports.dll and b/drivers/net6.0/runtimes/linux/lib/netstandard2.0/System.IO.Ports.dll differ diff --git a/drivers/net6.0/runtimes/osx-x64/native/System.IO.Ports.Native.dylib b/drivers/net6.0/runtimes/osx-x64/native/System.IO.Ports.Native.dylib index b7adfd5..b4500b6 100644 Binary files a/drivers/net6.0/runtimes/osx-x64/native/System.IO.Ports.Native.dylib and b/drivers/net6.0/runtimes/osx-x64/native/System.IO.Ports.Native.dylib differ diff --git a/drivers/net6.0/runtimes/osx/lib/netstandard2.0/System.IO.Ports.dll b/drivers/net6.0/runtimes/osx/lib/netstandard2.0/System.IO.Ports.dll index f2c4a5c..20cf4c4 100644 Binary files a/drivers/net6.0/runtimes/osx/lib/netstandard2.0/System.IO.Ports.dll and b/drivers/net6.0/runtimes/osx/lib/netstandard2.0/System.IO.Ports.dll differ diff --git a/drivers/net6.0/runtimes/win/lib/netstandard2.0/System.IO.Ports.dll b/drivers/net6.0/runtimes/win/lib/netstandard2.0/System.IO.Ports.dll index 6f162e2..3e1d69b 100644 Binary files a/drivers/net6.0/runtimes/win/lib/netstandard2.0/System.IO.Ports.dll and b/drivers/net6.0/runtimes/win/lib/netstandard2.0/System.IO.Ports.dll differ diff --git a/iotgateway.db b/iotgateway.db deleted file mode 100644 index ce9da74..0000000 Binary files a/iotgateway.db and /dev/null differ