diff --git a/.vscode/settings.json b/.vscode/settings.json
index aede75e5e..812930dd5 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -6,6 +6,46 @@
"list": "cpp",
"xstring": "cpp",
"xutility": "cpp",
- "string": "cpp"
+ "string": "cpp",
+ "algorithm": "cpp",
+ "atomic": "cpp",
+ "bit": "cpp",
+ "cctype": "cpp",
+ "clocale": "cpp",
+ "cmath": "cpp",
+ "compare": "cpp",
+ "concepts": "cpp",
+ "cstddef": "cpp",
+ "cstdint": "cpp",
+ "cstdio": "cpp",
+ "cstdlib": "cpp",
+ "cstring": "cpp",
+ "ctime": "cpp",
+ "cwchar": "cpp",
+ "exception": "cpp",
+ "ios": "cpp",
+ "iosfwd": "cpp",
+ "istream": "cpp",
+ "iterator": "cpp",
+ "limits": "cpp",
+ "memory": "cpp",
+ "new": "cpp",
+ "ostream": "cpp",
+ "sstream": "cpp",
+ "stdexcept": "cpp",
+ "streambuf": "cpp",
+ "system_error": "cpp",
+ "tuple": "cpp",
+ "type_traits": "cpp",
+ "typeinfo": "cpp",
+ "utility": "cpp",
+ "xfacet": "cpp",
+ "xiosbase": "cpp",
+ "xlocale": "cpp",
+ "xlocinfo": "cpp",
+ "xlocnum": "cpp",
+ "xmemory": "cpp",
+ "xstddef": "cpp",
+ "xtr1common": "cpp"
}
}
\ No newline at end of file
diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/5610f1e6-ac6a-4455-9161-068629b129dc.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/5610f1e6-ac6a-4455-9161-068629b129dc.vsidx
deleted file mode 100644
index 70aef67a0..000000000
Binary files a/AgroBase/.vs/AgroBase/FileContentIndex/5610f1e6-ac6a-4455-9161-068629b129dc.vsidx and /dev/null differ
diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/5cd77bec-6767-4ade-9a7c-27dfb893465d.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/5cd77bec-6767-4ade-9a7c-27dfb893465d.vsidx
new file mode 100644
index 000000000..eefd02589
Binary files /dev/null and b/AgroBase/.vs/AgroBase/FileContentIndex/5cd77bec-6767-4ade-9a7c-27dfb893465d.vsidx differ
diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/96986ab9-1638-479c-944f-39fdba0dd485.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/96986ab9-1638-479c-944f-39fdba0dd485.vsidx
deleted file mode 100644
index 9132642b6..000000000
Binary files a/AgroBase/.vs/AgroBase/FileContentIndex/96986ab9-1638-479c-944f-39fdba0dd485.vsidx and /dev/null differ
diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/b05298d6-489e-4f7e-b853-58724b56af2d.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/b05298d6-489e-4f7e-b853-58724b56af2d.vsidx
deleted file mode 100644
index 9f02d5c56..000000000
Binary files a/AgroBase/.vs/AgroBase/FileContentIndex/b05298d6-489e-4f7e-b853-58724b56af2d.vsidx and /dev/null differ
diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/b8fc3ac0-a42b-49c8-bca8-553e4bcb338d.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/b8fc3ac0-a42b-49c8-bca8-553e4bcb338d.vsidx
deleted file mode 100644
index 972ce2aa8..000000000
Binary files a/AgroBase/.vs/AgroBase/FileContentIndex/b8fc3ac0-a42b-49c8-bca8-553e4bcb338d.vsidx and /dev/null differ
diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/c696d474-0b87-4653-b45e-d5fc1a3053dd.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/c696d474-0b87-4653-b45e-d5fc1a3053dd.vsidx
new file mode 100644
index 000000000..866a5ee7e
Binary files /dev/null and b/AgroBase/.vs/AgroBase/FileContentIndex/c696d474-0b87-4653-b45e-d5fc1a3053dd.vsidx differ
diff --git a/AgroBase/.vs/AgroBase/FileContentIndex/ee6f3cc7-5dea-4448-bc4a-07b669a08bc4.vsidx b/AgroBase/.vs/AgroBase/FileContentIndex/ee6f3cc7-5dea-4448-bc4a-07b669a08bc4.vsidx
deleted file mode 100644
index 5eaf8ee04..000000000
Binary files a/AgroBase/.vs/AgroBase/FileContentIndex/ee6f3cc7-5dea-4448-bc4a-07b669a08bc4.vsidx and /dev/null differ
diff --git a/AgroBase/.vs/AgroBase/v17/.suo b/AgroBase/.vs/AgroBase/v17/.suo
index e8f134c76..76cabbba2 100644
Binary files a/AgroBase/.vs/AgroBase/v17/.suo and b/AgroBase/.vs/AgroBase/v17/.suo differ
diff --git a/AgroBase/AgroBase/.vs/AgroBase.csproj.dtbcache.json b/AgroBase/AgroBase/.vs/AgroBase.csproj.dtbcache.json
index 836da311e..8aa03e326 100644
--- a/AgroBase/AgroBase/.vs/AgroBase.csproj.dtbcache.json
+++ b/AgroBase/AgroBase/.vs/AgroBase.csproj.dtbcache.json
@@ -1 +1 @@
-{"RootPath":"C:\\ZendionINC\\agrobot_base\\AgroBase\\AgroBase","ProjectFileName":"AgroBase.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"Forms\\Atuador\\frmAtuCalibragem.cs"},{"SourceFile":"Forms\\Atuador\\frmAtuCalibragem.Designer.cs"},{"SourceFile":"Forms\\Atuador\\frmAtuConfig.cs"},{"SourceFile":"Forms\\Atuador\\frmAtuConfig.Designer.cs"},{"SourceFile":"Forms\\Direcional\\frmDirConfig.cs"},{"SourceFile":"Forms\\Direcional\\frmDirConfig.Designer.cs"},{"SourceFile":"Forms\\Direcional\\frmDirPlot.cs"},{"SourceFile":"Forms\\Direcional\\frmDirPlot.Designer.cs"},{"SourceFile":"Forms\\frmAcompanhamento.cs"},{"SourceFile":"Forms\\frmAcompanhamento.Designer.cs"},{"SourceFile":"Forms\\Atuador\\frmAtuCamera.cs"},{"SourceFile":"Forms\\Atuador\\frmAtuCamera.Designer.cs"},{"SourceFile":"Forms\\frmGPS.cs"},{"SourceFile":"Forms\\frmGPS.Designer.cs"},{"SourceFile":"Forms\\frmKinect.cs"},{"SourceFile":"Forms\\frmKinect.Designer.cs"},{"SourceFile":"Forms\\frmLoraConfig.cs"},{"SourceFile":"Forms\\frmLoraConfig.Designer.cs"},{"SourceFile":"Forms\\frmMapa.cs"},{"SourceFile":"Forms\\frmMapa.Designer.cs"},{"SourceFile":"Forms\\frmPinout.cs"},{"SourceFile":"Forms\\frmPinout.Designer.cs"},{"SourceFile":"Forms\\frmSimulacaoMapaGPS.cs"},{"SourceFile":"Forms\\frmSimulacaoMapaGPS.Designer.cs"},{"SourceFile":"Forms\\frmWT901C.cs"},{"SourceFile":"Forms\\frmWT901C.Designer.cs"},{"SourceFile":"Forms\\IHM\\frmIHM.cs"},{"SourceFile":"Forms\\IHM\\frmIHM.Designer.cs"},{"SourceFile":"Forms\\Movimentacao\\frmMovCamera.cs"},{"SourceFile":"Forms\\Movimentacao\\frmMovCamera.Designer.cs"},{"SourceFile":"Forms\\Movimentacao\\frmMovDiagnosticos.cs"},{"SourceFile":"Forms\\Movimentacao\\frmMovDiagnosticos.Designer.cs"},{"SourceFile":"Forms\\frmInstancial.cs"},{"SourceFile":"Forms\\frmInstancial.Designer.cs"},{"SourceFile":"Forms\\frmJoystick.cs"},{"SourceFile":"Forms\\frmJoystick.Designer.cs"},{"SourceFile":"Forms\\Movimentacao\\frmMovConfig.cs"},{"SourceFile":"Forms\\Movimentacao\\frmMovConfig.Designer.cs"},{"SourceFile":"Forms\\Movimentacao\\frmMovPlot.cs"},{"SourceFile":"Forms\\Movimentacao\\frmMovPlot.Designer.cs"},{"SourceFile":"Forms\\Operacoes\\frmInicioOperacao.cs"},{"SourceFile":"Forms\\Operacoes\\frmInicioOperacao.Designer.cs"},{"SourceFile":"Forms\\Operacoes\\frmOperacaoManual.cs"},{"SourceFile":"Forms\\Operacoes\\frmOperacaoManual.Designer.cs"},{"SourceFile":"Forms\\Operacoes\\frmOperacaoMapaGPS.cs"},{"SourceFile":"Forms\\Operacoes\\frmOperacaoSeguidorLinha.Designer.cs"},{"SourceFile":"Forms\\Operacoes\\frmParametrizacaoOperacao.cs"},{"SourceFile":"Forms\\Operacoes\\frmParametrizacaoOperacao.Designer.cs"},{"SourceFile":"Forms\\Operacoes\\frmResultadosOperacao.cs"},{"SourceFile":"Forms\\Operacoes\\frmResultadosOperacao.Designer.cs"},{"SourceFile":"Forms\\Sensoriamento\\frmSenCamera.cs"},{"SourceFile":"Forms\\Sensoriamento\\frmSenCamera.Designer.cs"},{"SourceFile":"Forms\\Sensoriamento\\frmSenConfig.cs"},{"SourceFile":"Forms\\Sensoriamento\\frmSenConfig.Designer.cs"},{"SourceFile":"Forms\\Sensoriamento\\frmSonar.cs"},{"SourceFile":"Forms\\Sensoriamento\\frmSonar.Designer.cs"},{"SourceFile":"Models\\AlarmeModel.cs"},{"SourceFile":"Models\\BLD300RModel.cs"},{"SourceFile":"Models\\CameraCaminhoModel.cs"},{"SourceFile":"Models\\CameraModel.cs"},{"SourceFile":"Models\\CameraSoloModel.cs"},{"SourceFile":"Models\\GPSModel.cs"},{"SourceFile":"Models\\GraficoInterativoModel.cs"},{"SourceFile":"Models\\LoRaModel.cs"},{"SourceFile":"Models\\MapasModel.cs"},{"SourceFile":"Models\\MensagemFilaModel.cs"},{"SourceFile":"Models\\Modules\\AtuadorModel.cs"},{"SourceFile":"Models\\Modules\\DirecionalModel.cs"},{"SourceFile":"Models\\Modules\\DispositivoBaseModel.cs"},{"SourceFile":"Models\\Enuns.cs"},{"SourceFile":"Models\\GeneralJoystick.cs"},{"SourceFile":"Models\\Modules\\MovimentacaoModel.cs"},{"SourceFile":"Models\\Modules\\PinoutModel.cs"},{"SourceFile":"Models\\Modules\\SensoriamentoModel.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Connector\\Entity\\SerialPortConfig.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Connector\\Entity\\TcpClientConfig.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Connector\\Entity\\TcpServerConfig.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Connector\\Entity\\UdpConfig.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Connector\\Interface\\ConnectConfig.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Connector\\Interface\\IConnector.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Connector\\Interface\\IReceiveListener.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Connector\\Interface\\SendDataInterface.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Connector\\Modular\\Tcp\\TcpServer.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Connector\\Modular\\Tcp\\TcpServerPool.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Connector\\Modular\\Tcp\\TcpServerProxy.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Connector\\Modular\\Udp\\UdpServer.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Connector\\Modular\\Udp\\UdpServerPool.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Connector\\Modular\\Udp\\UdpServerProxy.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Connector\\Role\\SPConnector.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Connector\\Role\\TcpClientConnector.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Connector\\Role\\TcpServerConnector.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Connector\\Role\\UdpConnector.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Device\\Constant\\InnerKeys.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Device\\Context\\DeviceManager.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Device\\Context\\DeviceManagerEvents.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Device\\Context\\ReadDataSleepManager.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Device\\DeviceDataSource.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Device\\DeviceEvents.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Device\\DeviceModel.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Device\\DKey\\ByteKey.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Device\\DKey\\DataKey.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Device\\DKey\\DoubleKey.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Device\\DKey\\FloatKey.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Device\\DKey\\IntKey.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Device\\DKey\\ShortKey.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Device\\DKey\\StringKey.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Device\\Entity\\DeviceOption.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Device\\Enum\\DataType.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Device\\Interfaces\\IDeviceComponent.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Device\\Interfaces\\Impls\\RateCalculationCompo.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Device\\Utils\\DeviceModelFactory.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Processor\\Interface\\IDataProcessor.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Processor\\Interface\\Impls\\EmptyProcessor.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Resolver\\Enum\\WitSensorProtocol.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Resolver\\Interface\\Impls\\EmptyResolver.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Resolver\\Interface\\IProtocolResolver.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Example\\IAttitudeSenosrApi.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Tools\\Byte\\ByteArrayConvert.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Tools\\Cmd\\Entity\\CmdBean.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Tools\\Cmd\\Utils\\CmdUtils.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Tools\\DateTime\\DateTimeUtils.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Tools\\Device\\AutoDelayUtils.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Tools\\Device\\DataProcessorContext.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Tools\\Device\\RecordKeySwitch.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Tools\\Device\\Utils\\AsciiProtocolUtils.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Tools\\Device\\Utils\\ATCommandHelper.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Tools\\Device\\Utils\\DipSensorMagHelper.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Tools\\Device\\Utils\\Modbus16Utils.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Tools\\Device\\Utils\\MWT925Helper.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Tools\\Device\\Utils\\SerialPortUtils.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Tools\\Device\\Utils\\WitCanProtocolUtils.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Tools\\Device\\Utils\\WitProtocolUtils.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Tools\\Device\\Utils\\WitSensorHelper.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Tools\\Device\\Utils\\WT925Helper.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Tools\\Gps\\GpsUtils.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\Wt901c\\Components\\Modbus16Resolver.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\Wt901c\\Components\\WT901C485Processor.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\Wt901c\\Data\\WitSensorKey.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\Wt901c\\WT901C485.cs"},{"SourceFile":"Models\\MotorComum.cs"},{"SourceFile":"Models\\Operacoes\\OperacaoManualModel.cs"},{"SourceFile":"Models\\Operacoes\\OperacaoMapaGPSModel.cs"},{"SourceFile":"Models\\Operacoes\\OperacaoModel.cs"},{"SourceFile":"Models\\PIDModel.cs"},{"SourceFile":"Models\\PZEMModel.cs"},{"SourceFile":"Models\\SonarModel.cs"},{"SourceFile":"Models\\Variaveis.cs"},{"SourceFile":"Services\\APIService.cs"},{"SourceFile":"Services\\BLD300RService.cs"},{"SourceFile":"Services\\CameraService.cs"},{"SourceFile":"Services\\CoulombCounterService.cs"},{"SourceFile":"Services\\DispositivosService.cs"},{"SourceFile":"Forms\\frmPrincipal.cs"},{"SourceFile":"Forms\\frmPrincipal.Designer.cs"},{"SourceFile":"Program.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"Services\\DispositivosServiceFactory.cs"},{"SourceFile":"Services\\FilaService.cs"},{"SourceFile":"Services\\GPSService.cs"},{"SourceFile":"Services\\IDispositivosService.cs"},{"SourceFile":"Services\\LoRaSerializer.cs"},{"SourceFile":"Services\\LoRaService.cs"},{"SourceFile":"Services\\MapasService.cs"},{"SourceFile":"Services\\MqttService.cs"},{"SourceFile":"Services\\PythonService.cs"},{"SourceFile":"Services\\PZEMService.cs"},{"SourceFile":"Services\\SerialService.cs"},{"SourceFile":"Services\\SocketService.cs"},{"SourceFile":"Services\\WT901CService.cs"},{"SourceFile":"Properties\\Resources.Designer.cs"},{"SourceFile":"Properties\\Settings.Designer.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.7.2.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\ZendionINC\\agrobot_base\\AgroBase\\packages\\AForge.2.2.5\\lib\\AForge.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionINC\\agrobot_base\\AgroBase\\packages\\AForge.Video.DirectShow.2.2.5\\lib\\AForge.Video.DirectShow.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionINC\\agrobot_base\\AgroBase\\packages\\AForge.Video.2.2.5\\lib\\AForge.Video.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionINC\\agrobot_base\\AgroBase\\packages\\CefSharp.Common.119.4.30\\lib\\net462\\CefSharp.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionINC\\agrobot_base\\AgroBase\\packages\\CefSharp.Common.119.4.30\\lib\\net462\\CefSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionINC\\agrobot_base\\AgroBase\\packages\\CefSharp.WinForms.119.4.30\\lib\\net462\\CefSharp.WinForms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionINC\\agrobot_base\\AgroBase\\packages\\Emgu.CV.4.8.1.5350\\lib\\netstandard2.0\\Emgu.CV.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionINC\\agrobot_base\\AgroBase\\packages\\Microsoft.Bcl.AsyncInterfaces.7.0.0\\lib\\net462\\Microsoft.Bcl.AsyncInterfaces.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionINC\\agrobot_base\\AgroBase\\AgroBase\\Microsoft.DirectX.DirectInput.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionINC\\agrobot_base\\AgroBase\\AgroBase\\Microsoft.DirectX.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files\\Microsoft SDKs\\Kinect\\v1.8\\Assemblies\\Microsoft.Kinect.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionINC\\agrobot_base\\AgroBase\\packages\\MQTTnet.3.1.1\\lib\\net461\\MQTTnet.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionINC\\agrobot_base\\AgroBase\\packages\\Newtonsoft.Json.13.0.3\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionINC\\agrobot_base\\AgroBase\\packages\\OpenTK.1.1.2225.0\\lib\\net20\\OpenTK.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionINC\\agrobot_base\\AgroBase\\packages\\OpenTK.GLControl.1.1.2225.0\\lib\\net20\\OpenTK.GLControl.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionINC\\agrobot_base\\AgroBase\\packages\\SharpDX.DirectInput.4.2.0\\lib\\net45\\SharpDX.DirectInput.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionINC\\agrobot_base\\AgroBase\\packages\\SharpDX.4.2.0\\lib\\net45\\SharpDX.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionINC\\agrobot_base\\AgroBase\\packages\\System.Buffers.4.5.1\\lib\\net461\\System.Buffers.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionINC\\agrobot_base\\AgroBase\\packages\\System.CodeDom.8.0.0\\lib\\net462\\System.CodeDom.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.ComponentModel.Composition.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Deployment.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\Facades\\System.Drawing.Primitives.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Management.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionINC\\agrobot_base\\AgroBase\\packages\\System.Memory.4.5.5\\lib\\net461\\System.Memory.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Numerics.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionINC\\agrobot_base\\AgroBase\\packages\\System.Numerics.Vectors.4.5.0\\lib\\net46\\System.Numerics.Vectors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionINC\\agrobot_base\\AgroBase\\packages\\System.Runtime.CompilerServices.Unsafe.6.0.0\\lib\\net461\\System.Runtime.CompilerServices.Unsafe.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\Facades\\System.Runtime.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\Facades\\System.Runtime.InteropServices.RuntimeInformation.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionINC\\agrobot_base\\AgroBase\\packages\\System.Text.Encodings.Web.7.0.0\\lib\\net462\\System.Text.Encodings.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionINC\\agrobot_base\\AgroBase\\packages\\System.Text.Json.7.0.3\\lib\\net462\\System.Text.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionINC\\agrobot_base\\AgroBase\\packages\\System.Threading.Tasks.Extensions.4.5.4\\lib\\net461\\System.Threading.Tasks.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionINC\\agrobot_base\\AgroBase\\packages\\System.ValueTuple.4.5.0\\lib\\net47\\System.ValueTuple.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Windows.Forms.DataVisualization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Windows\\System32\\WinMetadata\\Windows.Gaming.winmd","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionINC\\agrobot_base\\AgroBase\\packages\\ZedGraph.5.1.5\\lib\\ZedGraph.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"C:\\ZendionINC\\agrobot_base\\AgroBase\\AgroBase\\bin\\Debug\\AgroBase.exe","OutputItemRelativePath":"AgroBase.exe"},{"OutputItemFullPath":"C:\\ZendionINC\\agrobot_base\\AgroBase\\AgroBase\\bin\\Debug\\AgroBase.pdb","OutputItemRelativePath":"AgroBase.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
+{"RootPath":"C:\\ZendionInc\\agrobot_base\\AgroBase\\AgroBase","ProjectFileName":"AgroBase.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"Forms\\Atuador\\frmAtuCalibragem.cs"},{"SourceFile":"Forms\\Atuador\\frmAtuCalibragem.Designer.cs"},{"SourceFile":"Forms\\Atuador\\frmAtuConfig.cs"},{"SourceFile":"Forms\\Atuador\\frmAtuConfig.Designer.cs"},{"SourceFile":"Forms\\Direcional\\frmDirConfig.cs"},{"SourceFile":"Forms\\Direcional\\frmDirConfig.Designer.cs"},{"SourceFile":"Forms\\Direcional\\frmDirPlot.cs"},{"SourceFile":"Forms\\Direcional\\frmDirPlot.Designer.cs"},{"SourceFile":"Forms\\frmAcompanhamento.cs"},{"SourceFile":"Forms\\frmAcompanhamento.Designer.cs"},{"SourceFile":"Forms\\Atuador\\frmAtuCamera.cs"},{"SourceFile":"Forms\\Atuador\\frmAtuCamera.Designer.cs"},{"SourceFile":"Forms\\frmBLD.cs"},{"SourceFile":"Forms\\frmBLD.Designer.cs"},{"SourceFile":"Forms\\frmGPS.cs"},{"SourceFile":"Forms\\frmGPS.Designer.cs"},{"SourceFile":"Forms\\frmKinect.cs"},{"SourceFile":"Forms\\frmKinect.Designer.cs"},{"SourceFile":"Forms\\frmLoraConfig.cs"},{"SourceFile":"Forms\\frmLoraConfig.Designer.cs"},{"SourceFile":"Forms\\frmMapa.cs"},{"SourceFile":"Forms\\frmMapa.Designer.cs"},{"SourceFile":"Forms\\frmMvdConfig.cs"},{"SourceFile":"Forms\\frmMvdConfig.Designer.cs"},{"SourceFile":"Forms\\frmPinout.cs"},{"SourceFile":"Forms\\frmPinout.Designer.cs"},{"SourceFile":"Forms\\frmSimulacaoMapaGPS.cs"},{"SourceFile":"Forms\\frmSimulacaoMapaGPS.Designer.cs"},{"SourceFile":"Forms\\frmWT901C.cs"},{"SourceFile":"Forms\\frmWT901C.Designer.cs"},{"SourceFile":"Forms\\IHM\\frmIHM.cs"},{"SourceFile":"Forms\\IHM\\frmIHM.Designer.cs"},{"SourceFile":"Forms\\Movimentacao\\frmMovCamera.cs"},{"SourceFile":"Forms\\Movimentacao\\frmMovCamera.Designer.cs"},{"SourceFile":"Forms\\Movimentacao\\frmMovDiagnosticos.cs"},{"SourceFile":"Forms\\Movimentacao\\frmMovDiagnosticos.Designer.cs"},{"SourceFile":"Forms\\frmInstancial.cs"},{"SourceFile":"Forms\\frmInstancial.Designer.cs"},{"SourceFile":"Forms\\frmJoystick.cs"},{"SourceFile":"Forms\\frmJoystick.Designer.cs"},{"SourceFile":"Forms\\Movimentacao\\frmMovConfig.cs"},{"SourceFile":"Forms\\Movimentacao\\frmMovConfig.Designer.cs"},{"SourceFile":"Forms\\Movimentacao\\frmMovPlot.cs"},{"SourceFile":"Forms\\Movimentacao\\frmMovPlot.Designer.cs"},{"SourceFile":"Forms\\Operacoes\\frmInicioOperacao.cs"},{"SourceFile":"Forms\\Operacoes\\frmInicioOperacao.Designer.cs"},{"SourceFile":"Forms\\Operacoes\\frmOperacaoManual.cs"},{"SourceFile":"Forms\\Operacoes\\frmOperacaoManual.Designer.cs"},{"SourceFile":"Forms\\Operacoes\\frmOperacaoMapaGPS.cs"},{"SourceFile":"Forms\\Operacoes\\frmOperacaoSeguidorLinha.Designer.cs"},{"SourceFile":"Forms\\Operacoes\\frmParametrizacaoOperacao.cs"},{"SourceFile":"Forms\\Operacoes\\frmParametrizacaoOperacao.Designer.cs"},{"SourceFile":"Forms\\Operacoes\\frmResultadosOperacao.cs"},{"SourceFile":"Forms\\Operacoes\\frmResultadosOperacao.Designer.cs"},{"SourceFile":"Forms\\Sensoriamento\\frmSenCamera.cs"},{"SourceFile":"Forms\\Sensoriamento\\frmSenCamera.Designer.cs"},{"SourceFile":"Forms\\Sensoriamento\\frmSenConfig.cs"},{"SourceFile":"Forms\\Sensoriamento\\frmSenConfig.Designer.cs"},{"SourceFile":"Forms\\Sensoriamento\\frmSonar.cs"},{"SourceFile":"Forms\\Sensoriamento\\frmSonar.Designer.cs"},{"SourceFile":"Models\\AlarmeModel.cs"},{"SourceFile":"Models\\BLD300RModel.cs"},{"SourceFile":"Models\\CameraCaminhoModel.cs"},{"SourceFile":"Models\\CameraModel.cs"},{"SourceFile":"Models\\CameraSoloModel.cs"},{"SourceFile":"Models\\GPSModel.cs"},{"SourceFile":"Models\\GraficoInterativoModel.cs"},{"SourceFile":"Models\\LoRaModel.cs"},{"SourceFile":"Models\\MapasModel.cs"},{"SourceFile":"Models\\MensagemFilaModel.cs"},{"SourceFile":"Models\\Modules\\AtuadorModel.cs"},{"SourceFile":"Models\\Modules\\DirecionalModel.cs"},{"SourceFile":"Models\\Modules\\DispositivoBaseModel.cs"},{"SourceFile":"Models\\Enuns.cs"},{"SourceFile":"Models\\GeneralJoystick.cs"},{"SourceFile":"Models\\Modules\\MovimentacaoModel.cs"},{"SourceFile":"Models\\Modules\\MovimentacaoUnificadoModel.cs"},{"SourceFile":"Models\\Modules\\PinoutModel.cs"},{"SourceFile":"Models\\Modules\\SensoriamentoModel.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Connector\\Entity\\SerialPortConfig.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Connector\\Entity\\TcpClientConfig.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Connector\\Entity\\TcpServerConfig.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Connector\\Entity\\UdpConfig.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Connector\\Interface\\ConnectConfig.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Connector\\Interface\\IConnector.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Connector\\Interface\\IReceiveListener.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Connector\\Interface\\SendDataInterface.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Connector\\Modular\\Tcp\\TcpServer.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Connector\\Modular\\Tcp\\TcpServerPool.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Connector\\Modular\\Tcp\\TcpServerProxy.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Connector\\Modular\\Udp\\UdpServer.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Connector\\Modular\\Udp\\UdpServerPool.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Connector\\Modular\\Udp\\UdpServerProxy.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Connector\\Role\\SPConnector.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Connector\\Role\\TcpClientConnector.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Connector\\Role\\TcpServerConnector.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Connector\\Role\\UdpConnector.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Device\\Constant\\InnerKeys.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Device\\Context\\DeviceManager.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Device\\Context\\DeviceManagerEvents.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Device\\Context\\ReadDataSleepManager.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Device\\DeviceDataSource.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Device\\DeviceEvents.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Device\\DeviceModel.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Device\\DKey\\ByteKey.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Device\\DKey\\DataKey.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Device\\DKey\\DoubleKey.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Device\\DKey\\FloatKey.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Device\\DKey\\IntKey.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Device\\DKey\\ShortKey.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Device\\DKey\\StringKey.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Device\\Entity\\DeviceOption.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Device\\Enum\\DataType.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Device\\Interfaces\\IDeviceComponent.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Device\\Interfaces\\Impls\\RateCalculationCompo.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Device\\Utils\\DeviceModelFactory.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Processor\\Interface\\IDataProcessor.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Processor\\Interface\\Impls\\EmptyProcessor.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Resolver\\Enum\\WitSensorProtocol.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Resolver\\Interface\\Impls\\EmptyResolver.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Device\\Resolver\\Interface\\IProtocolResolver.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Example\\IAttitudeSenosrApi.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Tools\\Byte\\ByteArrayConvert.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Tools\\Cmd\\Entity\\CmdBean.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Tools\\Cmd\\Utils\\CmdUtils.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Tools\\DateTime\\DateTimeUtils.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Tools\\Device\\AutoDelayUtils.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Tools\\Device\\DataProcessorContext.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Tools\\Device\\RecordKeySwitch.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Tools\\Device\\Utils\\AsciiProtocolUtils.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Tools\\Device\\Utils\\ATCommandHelper.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Tools\\Device\\Utils\\DipSensorMagHelper.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Tools\\Device\\Utils\\Modbus16Utils.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Tools\\Device\\Utils\\MWT925Helper.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Tools\\Device\\Utils\\SerialPortUtils.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Tools\\Device\\Utils\\WitCanProtocolUtils.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Tools\\Device\\Utils\\WitProtocolUtils.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Tools\\Device\\Utils\\WitSensorHelper.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Tools\\Device\\Utils\\WT925Helper.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\WitSdk\\Tools\\Gps\\GpsUtils.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\Wt901c\\Components\\Modbus16Resolver.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\Wt901c\\Components\\WT901C485Processor.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\Wt901c\\Data\\WitSensorKey.cs"},{"SourceFile":"Models\\Modules\\WT901C485\\Wt901c\\WT901C485.cs"},{"SourceFile":"Models\\MotorComum.cs"},{"SourceFile":"Models\\Operacoes\\OperacaoManualModel.cs"},{"SourceFile":"Models\\Operacoes\\OperacaoMapaGPSModel.cs"},{"SourceFile":"Models\\Operacoes\\OperacaoModel.cs"},{"SourceFile":"Models\\PIDModel.cs"},{"SourceFile":"Models\\PZEMModel.cs"},{"SourceFile":"Models\\SonarModel.cs"},{"SourceFile":"Models\\Variaveis.cs"},{"SourceFile":"Services\\APIService.cs"},{"SourceFile":"Services\\BLD300RService.cs"},{"SourceFile":"Services\\CameraService.cs"},{"SourceFile":"Services\\CoulombCounterService.cs"},{"SourceFile":"Services\\DispositivosService.cs"},{"SourceFile":"Forms\\frmPrincipal.cs"},{"SourceFile":"Forms\\frmPrincipal.Designer.cs"},{"SourceFile":"Program.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"Services\\DispositivosServiceFactory.cs"},{"SourceFile":"Services\\FilaService.cs"},{"SourceFile":"Services\\GPSService.cs"},{"SourceFile":"Services\\IDispositivosService.cs"},{"SourceFile":"Services\\LoRaSerializer.cs"},{"SourceFile":"Services\\LoRaService.cs"},{"SourceFile":"Services\\MapasService.cs"},{"SourceFile":"Services\\ModbusService.cs"},{"SourceFile":"Services\\MqttService.cs"},{"SourceFile":"Services\\PythonService.cs"},{"SourceFile":"Services\\PZEMService.cs"},{"SourceFile":"Services\\RS485Service.cs"},{"SourceFile":"Services\\SerialService.cs"},{"SourceFile":"Services\\SocketService.cs"},{"SourceFile":"Services\\WT901CService.cs"},{"SourceFile":"Properties\\Resources.Designer.cs"},{"SourceFile":"Properties\\Settings.Designer.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.7.2.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\ZendionInc\\agrobot_base\\AgroBase\\packages\\AForge.2.2.5\\lib\\AForge.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionInc\\agrobot_base\\AgroBase\\packages\\AForge.Video.DirectShow.2.2.5\\lib\\AForge.Video.DirectShow.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionInc\\agrobot_base\\AgroBase\\packages\\AForge.Video.2.2.5\\lib\\AForge.Video.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionInc\\agrobot_base\\AgroBase\\packages\\CefSharp.Common.119.4.30\\lib\\net462\\CefSharp.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionInc\\agrobot_base\\AgroBase\\packages\\CefSharp.Common.119.4.30\\lib\\net462\\CefSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionInc\\agrobot_base\\AgroBase\\packages\\CefSharp.WinForms.119.4.30\\lib\\net462\\CefSharp.WinForms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionInc\\agrobot_base\\AgroBase\\packages\\Emgu.CV.4.8.1.5350\\lib\\netstandard2.0\\Emgu.CV.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionInc\\agrobot_base\\AgroBase\\packages\\Microsoft.Bcl.AsyncInterfaces.7.0.0\\lib\\net462\\Microsoft.Bcl.AsyncInterfaces.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionInc\\agrobot_base\\AgroBase\\AgroBase\\Microsoft.DirectX.DirectInput.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionInc\\agrobot_base\\AgroBase\\AgroBase\\Microsoft.DirectX.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionInc\\agrobot_base\\AgroBase\\AgroBase\\bin\\Debug\\Microsoft.Kinect.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionInc\\agrobot_base\\AgroBase\\packages\\MQTTnet.3.1.1\\lib\\net461\\MQTTnet.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionInc\\agrobot_base\\AgroBase\\packages\\Newtonsoft.Json.13.0.3\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionInc\\agrobot_base\\AgroBase\\packages\\OpenTK.1.1.2225.0\\lib\\net20\\OpenTK.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionInc\\agrobot_base\\AgroBase\\packages\\OpenTK.GLControl.1.1.2225.0\\lib\\net20\\OpenTK.GLControl.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionInc\\agrobot_base\\AgroBase\\packages\\SharpDX.DirectInput.4.2.0\\lib\\net45\\SharpDX.DirectInput.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionInc\\agrobot_base\\AgroBase\\packages\\SharpDX.4.2.0\\lib\\net45\\SharpDX.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionInc\\agrobot_base\\AgroBase\\packages\\System.Buffers.4.5.1\\lib\\net461\\System.Buffers.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionInc\\agrobot_base\\AgroBase\\packages\\System.CodeDom.8.0.0\\lib\\net462\\System.CodeDom.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.ComponentModel.Composition.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Deployment.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\Facades\\System.Drawing.Primitives.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Management.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionInc\\agrobot_base\\AgroBase\\packages\\System.Memory.4.5.5\\lib\\net461\\System.Memory.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Numerics.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionInc\\agrobot_base\\AgroBase\\packages\\System.Numerics.Vectors.4.5.0\\lib\\net46\\System.Numerics.Vectors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionInc\\agrobot_base\\AgroBase\\packages\\System.Runtime.CompilerServices.Unsafe.6.0.0\\lib\\net461\\System.Runtime.CompilerServices.Unsafe.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\Facades\\System.Runtime.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\Facades\\System.Runtime.InteropServices.RuntimeInformation.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionInc\\agrobot_base\\AgroBase\\packages\\System.Text.Encodings.Web.7.0.0\\lib\\net462\\System.Text.Encodings.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionInc\\agrobot_base\\AgroBase\\packages\\System.Text.Json.7.0.3\\lib\\net462\\System.Text.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionInc\\agrobot_base\\AgroBase\\packages\\System.Threading.Tasks.Extensions.4.5.4\\lib\\net461\\System.Threading.Tasks.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionInc\\agrobot_base\\AgroBase\\packages\\System.ValueTuple.4.5.0\\lib\\net47\\System.ValueTuple.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Windows.Forms.DataVisualization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Windows\\System32\\WinMetadata\\Windows.Gaming.winmd","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\ZendionInc\\agrobot_base\\AgroBase\\packages\\ZedGraph.5.1.5\\lib\\ZedGraph.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"C:\\ZendionInc\\agrobot_base\\AgroBase\\AgroBase\\bin\\Debug\\AgroBase.exe","OutputItemRelativePath":"AgroBase.exe"},{"OutputItemFullPath":"C:\\ZendionInc\\agrobot_base\\AgroBase\\AgroBase\\bin\\Debug\\AgroBase.pdb","OutputItemRelativePath":"AgroBase.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/AgroBase/AgroBase/AgroBase.csproj b/AgroBase/AgroBase/AgroBase.csproj
index 6258f5792..842f12988 100644
--- a/AgroBase/AgroBase/AgroBase.csproj
+++ b/AgroBase/AgroBase/AgroBase.csproj
@@ -368,71 +368,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -441,6 +376,7 @@
+
diff --git a/AgroBase/AgroBase/Forms/Sensoriamento/frmSenConfig.cs b/AgroBase/AgroBase/Forms/Sensoriamento/frmSenConfig.cs
index d534ad040..73d76eb9d 100644
--- a/AgroBase/AgroBase/Forms/Sensoriamento/frmSenConfig.cs
+++ b/AgroBase/AgroBase/Forms/Sensoriamento/frmSenConfig.cs
@@ -222,7 +222,7 @@ namespace AgroBase.Forms.Sensoriamento
else
{
var Comando = PZEMService.ComandoGetParametro(PZEMService.Parametros[cmbBateriaParametro.Text]);
- PZEMService.EnviarComando(PZEMService.PortaPZEM, Comando);
+ PZEMService.EnviarComando(ModbusService._PortaModbus, Comando);
}
}
@@ -237,14 +237,14 @@ namespace AgroBase.Forms.Sensoriamento
else
{
var Comando = PZEMService.ComandoSetParametro(PZEMService.Parametros[cmbBateriaParametro.Text], Convert.ToInt32(nudBateriaValor.Value));
- PZEMService.EnviarComando(PZEMService.PortaPZEM, Comando);
+ PZEMService.EnviarComando(ModbusService._PortaModbus, Comando);
}
}
private void btnBateriaCalibrar_Click(object sender, EventArgs e)
{
var Comando = PZEMService.ComandoCalibragem();
- PZEMService.EnviarComando(PZEMService.PortaPZEM, Comando);
+ PZEMService.EnviarComando(ModbusService._PortaModbus, Comando);
}
diff --git a/AgroBase/AgroBase/Forms/frmMvdConfig.Designer.cs b/AgroBase/AgroBase/Forms/frmMvdConfig.Designer.cs
index cd4eedf0b..948ffd3ad 100644
--- a/AgroBase/AgroBase/Forms/frmMvdConfig.Designer.cs
+++ b/AgroBase/AgroBase/Forms/frmMvdConfig.Designer.cs
@@ -30,6 +30,9 @@
{
this.btnMovimentação = new System.Windows.Forms.Button();
this.btnDirecional = new System.Windows.Forms.Button();
+ this.gpbSensoriamento = new System.Windows.Forms.GroupBox();
+ this.chbRequisitarDados = new System.Windows.Forms.CheckBox();
+ this.gpbSensoriamento.SuspendLayout();
this.SuspendLayout();
//
// btnMovimentação
@@ -54,11 +57,34 @@
this.btnDirecional.UseVisualStyleBackColor = true;
this.btnDirecional.Click += new System.EventHandler(this.btnDirecional_Click);
//
+ // gpbSensoriamento
+ //
+ this.gpbSensoriamento.Controls.Add(this.chbRequisitarDados);
+ this.gpbSensoriamento.Location = new System.Drawing.Point(12, 63);
+ this.gpbSensoriamento.Name = "gpbSensoriamento";
+ this.gpbSensoriamento.Size = new System.Drawing.Size(306, 63);
+ this.gpbSensoriamento.TabIndex = 2;
+ this.gpbSensoriamento.TabStop = false;
+ this.gpbSensoriamento.Text = "Sensoriamento";
+ //
+ // chbRequisitarDados
+ //
+ this.chbRequisitarDados.AutoSize = true;
+ this.chbRequisitarDados.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.chbRequisitarDados.Location = new System.Drawing.Point(6, 26);
+ this.chbRequisitarDados.Name = "chbRequisitarDados";
+ this.chbRequisitarDados.Size = new System.Drawing.Size(236, 20);
+ this.chbRequisitarDados.TabIndex = 0;
+ this.chbRequisitarDados.Text = "Requisitar Dados Para os Módulos";
+ this.chbRequisitarDados.UseVisualStyleBackColor = true;
+ this.chbRequisitarDados.CheckedChanged += new System.EventHandler(this.chbRequisitarDados_CheckedChanged);
+ //
// frmMvdConfig
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(330, 68);
+ this.ClientSize = new System.Drawing.Size(330, 138);
+ this.Controls.Add(this.gpbSensoriamento);
this.Controls.Add(this.btnDirecional);
this.Controls.Add(this.btnMovimentação);
this.MaximizeBox = false;
@@ -66,6 +92,8 @@
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Parametrização - Movimentação";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.frmMvdConfig_FormClosing);
+ this.gpbSensoriamento.ResumeLayout(false);
+ this.gpbSensoriamento.PerformLayout();
this.ResumeLayout(false);
}
@@ -74,5 +102,7 @@
private System.Windows.Forms.Button btnMovimentação;
private System.Windows.Forms.Button btnDirecional;
+ private System.Windows.Forms.GroupBox gpbSensoriamento;
+ private System.Windows.Forms.CheckBox chbRequisitarDados;
}
}
\ No newline at end of file
diff --git a/AgroBase/AgroBase/Forms/frmMvdConfig.cs b/AgroBase/AgroBase/Forms/frmMvdConfig.cs
index d988e1868..4b369fc82 100644
--- a/AgroBase/AgroBase/Forms/frmMvdConfig.cs
+++ b/AgroBase/AgroBase/Forms/frmMvdConfig.cs
@@ -1,5 +1,6 @@
using AgroBase.Forms.Direcional;
using AgroBase.Forms.Movimentacao;
+using AgroBase.Models;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -37,6 +38,12 @@ namespace AgroBase.Forms
frm.ShowDialog();
}
-
+ private void chbRequisitarDados_CheckedChanged(object sender, EventArgs e)
+ {
+ Variaveis.OperacaoEmAndamento.DispMvd.Dados.Modulos.ForEach(m =>
+ {
+ m.RequisitarDados = chbRequisitarDados.Checked;
+ });
+ }
}
}
diff --git a/AgroBase/AgroBase/Forms/frmPrincipal.cs b/AgroBase/AgroBase/Forms/frmPrincipal.cs
index 5e26fdc60..d92e3dbc1 100644
--- a/AgroBase/AgroBase/Forms/frmPrincipal.cs
+++ b/AgroBase/AgroBase/Forms/frmPrincipal.cs
@@ -22,8 +22,6 @@ using System.Text.Json.Serialization;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
-using Wit.SDK.Modular.Sensor.Modular.DataProcessor.Constant;
-using Wit.SDK.Modular.WitSensorApi.Modular.WT901C485;
using static AgroBase.Models.Enuns;
namespace AgroBase
diff --git a/AgroBase/AgroBase/Forms/frmWT901C.cs b/AgroBase/AgroBase/Forms/frmWT901C.cs
index e3a86ea18..2f6c78353 100644
--- a/AgroBase/AgroBase/Forms/frmWT901C.cs
+++ b/AgroBase/AgroBase/Forms/frmWT901C.cs
@@ -9,9 +9,6 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
-using System.Windows.Forms.DataVisualization.Charting;
-using Wit.SDK.Modular.Sensor.Modular.DataProcessor.Constant;
-using Wit.SDK.Modular.WitSensorApi.Modular.WT901C485;
using OpenTK;
using OpenTK.Graphics.OpenGL;
using System.Drawing.Drawing2D;
@@ -28,7 +25,7 @@ namespace AgroBase.Forms
double AnguloZ = 0;
private GLControl glControl;
Timer tmrLeitura;
- WT901C485 WT901C = Variaveis.WT901C;
+ //WT901C485 WT901C = Variaveis.WT901C;
public frmWT901C()
{
@@ -222,45 +219,45 @@ namespace AgroBase.Forms
txtY.Text = AnguloY.ToString("0.00");
txtZ.Text = AnguloZ.ToString("0.00");
- gridDados.Rows[0].Cells[1].Value = WT901C.GetDeviceData(WitSensorKey.VersionNumber);
- gridDados.Rows[1].Cells[1].Value = WT901C.GetDeviceData(WitSensorKey.ChipTime).ToString().Split(' ')[0];
- gridDados.Rows[2].Cells[1].Value = WT901C.GetDeviceData(WitSensorKey.ChipTime).ToString().Split(' ')[1];
- gridDados.Rows[3].Cells[1].Value = WT901C.GetDeviceData(WitSensorKey.AccX);
- gridDados.Rows[4].Cells[1].Value = WT901C.GetDeviceData(WitSensorKey.AccY);
- gridDados.Rows[5].Cells[1].Value = WT901C.GetDeviceData(WitSensorKey.AccZ);
- gridDados.Rows[6].Cells[1].Value = WT901C.GetDeviceData(WitSensorKey.AccM);
- gridDados.Rows[7].Cells[1].Value = WT901C.GetDeviceData(WitSensorKey.AsX);
- gridDados.Rows[8].Cells[1].Value = WT901C.GetDeviceData(WitSensorKey.AsY);
- gridDados.Rows[9].Cells[1].Value = WT901C.GetDeviceData(WitSensorKey.AsZ);
- gridDados.Rows[10].Cells[1].Value = WT901C.GetDeviceData(WitSensorKey.AsM);
- gridDados.Rows[11].Cells[1].Value = WT901C.GetDeviceData(WitSensorKey.AngleX);
- gridDados.Rows[12].Cells[1].Value = WT901C.GetDeviceData(WitSensorKey.AngleY);
- gridDados.Rows[13].Cells[1].Value = WT901C.GetDeviceData(WitSensorKey.AngleZ);
- gridDados.Rows[14].Cells[1].Value = WT901C.GetDeviceData(WitSensorKey.HX);
- gridDados.Rows[15].Cells[1].Value = WT901C.GetDeviceData(WitSensorKey.HY);
- gridDados.Rows[16].Cells[1].Value = WT901C.GetDeviceData(WitSensorKey.HZ);
- gridDados.Rows[17].Cells[1].Value = WT901C.GetDeviceData(WitSensorKey.HM);
- gridDados.Rows[18].Cells[1].Value = WT901C.GetDeviceData(WitSensorKey.T);
- gridDados.Rows[19].Cells[1].Value = WT901C.GetDeviceData(WitSensorKey.P);
- gridDados.Rows[20].Cells[1].Value = WT901C.GetDeviceData(WitSensorKey.H);
+ gridDados.Rows[0].Cells[1].Value = WT901CService.DadosLeitura.Versao;
+ gridDados.Rows[1].Cells[1].Value = WT901CService.DadosLeitura.DataHora.ToString("dd/MM/yyyy");
+ gridDados.Rows[2].Cells[1].Value = WT901CService.DadosLeitura.DataHora.ToString("HH:mm:ss");
+ gridDados.Rows[3].Cells[1].Value = WT901CService.DadosLeitura.AccX;
+ gridDados.Rows[4].Cells[1].Value = WT901CService.DadosLeitura.AccY;
+ gridDados.Rows[5].Cells[1].Value = WT901CService.DadosLeitura.AccZ;
+ gridDados.Rows[6].Cells[1].Value = WT901CService.DadosLeitura.AccM;
+ gridDados.Rows[7].Cells[1].Value = WT901CService.DadosLeitura.AsX;
+ gridDados.Rows[8].Cells[1].Value = WT901CService.DadosLeitura.AsY;
+ gridDados.Rows[9].Cells[1].Value = WT901CService.DadosLeitura.AsZ;
+ gridDados.Rows[10].Cells[1].Value = WT901CService.DadosLeitura.AsM;
+ gridDados.Rows[11].Cells[1].Value = WT901CService.DadosLeitura.AngleX;
+ gridDados.Rows[12].Cells[1].Value = WT901CService.DadosLeitura.AngleY;
+ gridDados.Rows[13].Cells[1].Value = WT901CService.DadosLeitura.AngleZ;
+ gridDados.Rows[14].Cells[1].Value = WT901CService.DadosLeitura.HX;
+ gridDados.Rows[15].Cells[1].Value = WT901CService.DadosLeitura.HY;
+ gridDados.Rows[16].Cells[1].Value = WT901CService.DadosLeitura.HZ;
+ gridDados.Rows[17].Cells[1].Value = WT901CService.DadosLeitura.HM;
+ gridDados.Rows[18].Cells[1].Value = WT901CService.DadosLeitura.Temperatura;
+ gridDados.Rows[19].Cells[1].Value = WT901CService.DadosLeitura.Pressao;
+ gridDados.Rows[20].Cells[1].Value = WT901CService.DadosLeitura.Altitude;
gridDados.Rows[21].Cells[1].Value = "";
- gridDados.Rows[22].Cells[1].Value = WT901C.GetDeviceData(WitSensorKey.D0);
- gridDados.Rows[23].Cells[1].Value = WT901C.GetDeviceData(WitSensorKey.D1);
- gridDados.Rows[24].Cells[1].Value = WT901C.GetDeviceData(WitSensorKey.D2);
- gridDados.Rows[25].Cells[1].Value = WT901C.GetDeviceData(WitSensorKey.D3);
- gridDados.Rows[26].Cells[1].Value = WT901C.GetDeviceData(WitSensorKey.Q0);
- gridDados.Rows[27].Cells[1].Value = WT901C.GetDeviceData(WitSensorKey.Q1);
- gridDados.Rows[28].Cells[1].Value = WT901C.GetDeviceData(WitSensorKey.Q2);
- gridDados.Rows[29].Cells[1].Value = WT901C.GetDeviceData(WitSensorKey.Q3);
- gridDados.Rows[30].Cells[1].Value = WT901C.GetDeviceData(WitSensorKey.LonDeg);
- gridDados.Rows[31].Cells[1].Value = WT901C.GetDeviceData(WitSensorKey.LatDeg);
- gridDados.Rows[32].Cells[1].Value = WT901C.GetDeviceData(WitSensorKey.GPSHeight);
- gridDados.Rows[33].Cells[1].Value = WT901C.GetDeviceData(WitSensorKey.GPSYaw);
- gridDados.Rows[34].Cells[1].Value = WT901C.GetDeviceData(WitSensorKey.GPSV);
- gridDados.Rows[35].Cells[1].Value = WT901C.GetDeviceData(WitSensorKey.SN.ToString());
- gridDados.Rows[36].Cells[1].Value = WT901C.GetDeviceData(WitSensorKey.PDOP);
- gridDados.Rows[37].Cells[1].Value = WT901C.GetDeviceData(WitSensorKey.HDOP);
- gridDados.Rows[38].Cells[1].Value = WT901C.GetDeviceData(WitSensorKey.VDOP);
+ gridDados.Rows[22].Cells[1].Value = WT901CService.DadosLeitura.D0;
+ gridDados.Rows[23].Cells[1].Value = WT901CService.DadosLeitura.D1;
+ gridDados.Rows[24].Cells[1].Value = WT901CService.DadosLeitura.D2;
+ gridDados.Rows[25].Cells[1].Value = WT901CService.DadosLeitura.D3;
+ gridDados.Rows[26].Cells[1].Value = WT901CService.DadosLeitura.Q0;
+ gridDados.Rows[27].Cells[1].Value = WT901CService.DadosLeitura.Q1;
+ gridDados.Rows[28].Cells[1].Value = WT901CService.DadosLeitura.Q2;
+ gridDados.Rows[29].Cells[1].Value = WT901CService.DadosLeitura.Q3;
+ gridDados.Rows[30].Cells[1].Value = WT901CService.DadosLeitura.Longitude;
+ gridDados.Rows[31].Cells[1].Value = WT901CService.DadosLeitura.Latitude;
+ gridDados.Rows[32].Cells[1].Value = WT901CService.DadosLeitura.GPS_Altitude;
+ gridDados.Rows[33].Cells[1].Value = WT901CService.DadosLeitura.GPS_Orientacao;
+ gridDados.Rows[34].Cells[1].Value = WT901CService.DadosLeitura.GPS_Velcodiade;
+ gridDados.Rows[35].Cells[1].Value = WT901CService.DadosLeitura.GPS_NumeroSatelites;
+ gridDados.Rows[36].Cells[1].Value = WT901CService.DadosLeitura.PDOP;
+ gridDados.Rows[37].Cells[1].Value = WT901CService.DadosLeitura.HDOP;
+ gridDados.Rows[38].Cells[1].Value = WT901CService.DadosLeitura.VDOP;
}
diff --git a/AgroBase/AgroBase/Models/Enuns.cs b/AgroBase/AgroBase/Models/Enuns.cs
index 091af383b..3006066ab 100644
--- a/AgroBase/AgroBase/Models/Enuns.cs
+++ b/AgroBase/AgroBase/Models/Enuns.cs
@@ -58,6 +58,7 @@ namespace AgroBase.Models
Wit = 107,
Bld = 108,
Mvd = 109,
+ Mbs = 110,
}
public enum F_Code
diff --git a/AgroBase/AgroBase/Models/Modules/MovimentacaoUnificadoModel.cs b/AgroBase/AgroBase/Models/Modules/MovimentacaoUnificadoModel.cs
index 1cae011dc..9e48d477b 100644
--- a/AgroBase/AgroBase/Models/Modules/MovimentacaoUnificadoModel.cs
+++ b/AgroBase/AgroBase/Models/Modules/MovimentacaoUnificadoModel.cs
@@ -304,14 +304,14 @@ namespace AgroBase.Models.Modules
public async Task LoopRegistrador()
{
- await Task.Delay(1000);
+ await Task.Delay(_TaxaAmostragem);
if (Conectado)
{
if (UltimaDirecao != Direcao.Parado)
{
TempoEmAtividade++;
- double VelocidadeMedia = Modulos.Where(x => x.Conectado).Average(x => x.MovMotor.VelocidadeInstantanea * 1000 / 3600);
+ double VelocidadeMedia = Modulos.Where(x => x.Conectado).Average(x => x.MovMotor.VelocidadeInstantanea * _TaxaAmostragem / 3600);
DistanciaPercorridaTotal += 1 * VelocidadeMedia;
DistanciaPercorridaParcial += (UltimaDirecao == Direcao.Frente ? 1 : UltimaDirecao == Direcao.Tras ? -1 : 0) * VelocidadeMedia;
DistanciaPercorridaOperacao += 1 * VelocidadeMedia;
@@ -340,6 +340,12 @@ namespace AgroBase.Models.Modules
Variaveis.OperacaoEmAndamento.DispMvd.AdicionarMensagemFila(Modulo.Modulo_ID, Protocolo, true, false);
}
}*/
+
+ foreach (var Modulo in Modulos.Where(x => x.RequisitarDados && (x.MovMotor.Inicializado || x.DirMotor.Inicializado)))
+ {
+ string Protocolo = Modulo.ProtocoloAquisicaoDados();
+ Variaveis.OperacaoEmAndamento.DispMvd.AdicionarMensagemFila(Modulo.Modulo_ID, Protocolo, false, false);
+ }
}
await LoopRegistrador();
@@ -351,7 +357,7 @@ namespace AgroBase.Models.Modules
{
public string Modulo_ID { get; set; }
public bool Disponivel { get; set; }
-
+ public bool RequisitarDados { get; set; } = false;
public bool Conectado
{
@@ -392,6 +398,7 @@ namespace AgroBase.Models.Modules
Modulo_ID + SerialService.SplitParams +
(Conectar ? "1" : "0") + SerialService.SplitParams +
MovimentacaoUnificadaModel._TaxaAmostragem.ToString() + SerialService.SplitParams +
+ (RequisitarDados ? "1" : "0") + SerialService.SplitParams +
PinoutModel.PinoProtocolo(_pinout, Funcoes);
if (Conectar)
@@ -442,6 +449,16 @@ namespace AgroBase.Models.Modules
}
}
+ public string ProtocoloAquisicaoDados()
+ {
+ string ProtocoloMotor =
+ ((int)F_Code.Req).ToString() + SerialService.SplitMessage +
+ Modulo_ID + SerialService.SplitParams +
+ "";
+ return ProtocoloMotor;
+ }
+
+
}
public class MvdMotorBLDC
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Entity/SerialPortConfig.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Entity/SerialPortConfig.cs
deleted file mode 100644
index 6730ee2ea..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Entity/SerialPortConfig.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Wit.SDK.Modular.Sensor.Modular.Connector.Entity
-{
- ///
- /// 串口配置
- ///
- [Serializable]
- public class SerialPortConfig : IConnectConfig
- {
- ///
- /// 波特率
- ///
- public int BaudRate { get; set; } = 0;
-
- ///
- /// com口名称
- ///
- public string PortName { get; set; } = "";
-
- ///
- /// 是否启用rts
- ///
- public bool RtsEnable { get; set; } = false;
-
- ///
- /// 是否启用dtr
- ///
- public bool DTREnable { get; set; } = false;
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Entity/TcpClientConfig.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Entity/TcpClientConfig.cs
deleted file mode 100644
index 006827a86..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Entity/TcpClientConfig.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Wit.SDK.Modular.Sensor.Modular.Connector.Entity
-{
- ///
- /// tcp客户端配置
- ///
- [Serializable]
- public class TcpClientConfig : IConnectConfig
- {
- ///
- /// 通信的远程服务端ip
- ///
- public string IP { get; set; }
-
- ///
- /// 通信的远程服务端端口
- ///
- public int Port { get; set; }
-
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Entity/TcpServerConfig.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Entity/TcpServerConfig.cs
deleted file mode 100644
index 7ddbc46ef..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Entity/TcpServerConfig.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Wit.SDK.Modular.Sensor.Modular.Connector.Entity
-{
- ///
- /// tcp服务端配置
- ///
- [Serializable]
- public class TcpServerConfig : IConnectConfig
- {
- ///
- /// 监听的IP和端口号
- ///
- public IPEndPoint IPEndPoint = null;
-
- ///
- /// 远程网络地址
- ///
- public EndPoint RemoteEP = null;
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Entity/UdpConfig.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Entity/UdpConfig.cs
deleted file mode 100644
index 10a1dfe40..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Entity/UdpConfig.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Wit.SDK.Modular.Sensor.Modular.Connector.Entity
-{
-
- ///
- /// UDP配置
- ///
- [Serializable]
- public class UdpConfig : IConnectConfig
- {
- ///
- /// 本地ip和端口
- ///
- public IPEndPoint localIpPoint = null;
-
- ///
- /// 远程ip和端口
- ///
- public IPEndPoint remoteIpPoint = null;
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Interface/ConnectConfig.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Interface/ConnectConfig.cs
deleted file mode 100644
index 3adf21552..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Interface/ConnectConfig.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO.Ports;
-using System.Linq;
-using System.Net;
-using System.Text;
-
-
-namespace Wit.SDK.Modular.Sensor.Modular.Connector.Entity
-{
- ///
- /// 连接配置
- ///
- public interface IConnectConfig
- {
-
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Interface/IConnector.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Interface/IConnector.cs
deleted file mode 100644
index 75e6a8c5b..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Interface/IConnector.cs
+++ /dev/null
@@ -1,208 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using Wit;
-using Wit.SDK;
-using Wit.SDK.Modular;
-using Wit.SDK.Modular.Sensor;
-using Wit.SDK.Modular.Sensor.Device;
-using Wit.SDK.Modular.Sensor.Modular;
-using Wit.SDK.Modular.Sensor.Modular.Connector.Entity;
-using Wit.SDK.Modular.Sensor.Modular.Connector.Interface;
-
-namespace Wit.SDK.Modular.Sensor.Modular.Connector.Interface
-{
-
- ///
- /// 核心通讯模块接口
- ///
- public abstract class IConnector
- {
- ///
- /// 连接状态
- ///
- protected ConnectStatus ConnectStatus { get; set; } = ConnectStatus.Closed;
-
- ///
- /// 接收数据队列
- ///
- public ConcurrentQueue ReceiveQueue = new ConcurrentQueue();
-
- /// 发送数据锁
- ///
- public object OnSendDataLockObj = new object();
-
- ///
- /// 接收数据队列
- ///
- public Thread ReceiveThread;
-
- ///
- /// 收数据的人
- ///
- private List receiveListenerList = new List();
-
- ///
- /// 监听发送数据的人
- ///
- private List sendDataInterfaceList = new List();
-
- ///
- /// 构造
- ///
- public IConnector() {
- ReceiveThread = new Thread(HandleReceiveThread) { IsBackground = true };
- ReceiveThread.Start();
- }
-
- ///
- /// 对象销毁时
- ///
- ~IConnector()
- {
- if (ReceiveThread != null) {
- ReceiveThread.Abort();
- }
- }
-
- ///
- /// 检查配置
- ///
- public abstract void CheckConfig();
-
- ///
- /// 获得连接配置
- ///
- ///
- public abstract IConnectConfig GetConfig();
-
- ///
- /// 是否已经打开连接
- ///
- ///
- public bool IsOpen()
- {
- return ConnectStatus == ConnectStatus.Opened;
- }
-
- ///
- /// 打开连接
- ///
- ///
- public abstract void Open();
-
- ///
- /// 关闭连接
- ///
- ///
- public abstract void Close();
-
-
- ///
- /// 发送数据
- ///
- ///
- public abstract void SendData(byte[] data);
-
- ///
- /// 移除接收数据的人
- ///
- ///
-
- public void LogoutReceivedObj(DataReceivedInterface listener) {
- receiveListenerList.Remove(listener);
- }
-
- ///
- /// 添加接收数据的人
- ///
- ///
- public void RegisterReceivedObj(DataReceivedInterface listener) {
- receiveListenerList.Add(listener);
- }
-
- ///
- /// 取消发送数据监听者
- ///
- ///
- public void LogoutDataDisplayObj(SendDataInterface listener) {
- sendDataInterfaceList.Remove(listener);
- }
-
- ///
- /// 添加发送数据监听者
- ///
- ///
- public void RegisterDataDisplayObj(SendDataInterface listener) {
- sendDataInterfaceList.Add(listener);
- }
-
- ///
- /// 接收数据
- ///
- ///
- public void onReceive(byte[] data)
- {
- ReceiveQueue.Enqueue(data);
- }
-
- ///
- /// 处理接收数据线程
- ///
- private void HandleReceiveThread()
- {
- while (true) {
- Thread.Sleep(1);
- while (ReceiveQueue.Count > 0) {
- byte[] data = null;
- ReceiveQueue.TryDequeue(out data);
- for (int i = 0; i < receiveListenerList.Count; i++)
- {
- DataReceivedInterface dataReceived = receiveListenerList[i];
- dataReceived.OnDataReceived(data);
- }
- }
- }
- }
-
- ///
- /// 如果发送数据
- ///
- ///
- public void OnSendData(byte[] data)
- {
- for (int i = 0; i < sendDataInterfaceList.Count; i++)
- {
- var item = sendDataInterfaceList[i];
- // 调用线程池完成操作
- ThreadPool.QueueUserWorkItem(new WaitCallback((p) =>
- {
- lock (OnSendDataLockObj)
- {
- item.OnSendData(data);
- }
- }), null);
- }
- }
-
- }
-
- ///
- /// 连接状态
- ///
- public enum ConnectStatus
- {
- ///
- /// 打开的
- ///
- Opened = 0,
- ///
- /// 关闭的
- ///
- Closed = 1
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Interface/IReceiveListener.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Interface/IReceiveListener.cs
deleted file mode 100644
index 071d24ab9..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Interface/IReceiveListener.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Wit.SDK.Modular.Sensor.Modular.Connector.Interface
-{
- ///
- /// 接收数据监听者
- ///
- public interface DataReceivedInterface
- {
- void OnDataReceived(byte[] data);
-
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Interface/SendDataInterface.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Interface/SendDataInterface.cs
deleted file mode 100644
index 911f6dd7c..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Interface/SendDataInterface.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Wit.SDK.Modular.Sensor.Modular.Connector.Interface
-{
- ///
- /// 发送数据接口
- ///
- public interface SendDataInterface
- {
- void OnSendData(byte[] data);
-
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Modular/Tcp/TcpServer.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Modular/Tcp/TcpServer.cs
deleted file mode 100644
index c7d820262..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Modular/Tcp/TcpServer.cs
+++ /dev/null
@@ -1,412 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Net;
-using System.Net.Sockets;
-using System.Text;
-using System.Threading;
-
-
-namespace Wit.SDK.Modular.Sensor.Modular.Connector.Role
-{
-
- ///
- /// 服务端
- ///
- public class TcpServer
- {
- ///
- /// 服务端
- ///
- public Socket ServerSocket = null;
-
- ///
- /// tcp客户端字典
- ///
- public ConcurrentDictionary ClientSocketDic = new ConcurrentDictionary();
-
- ///
- /// 监听客户端连接的标志
- ///
- private bool FlagListen = false;
-
- ///
- /// 监听的IP和端口
- ///
- private IPEndPoint iPEndPoint;
-
- ///
- /// 收到数据委托
- ///
- ///
- public delegate void OnReceiveEvent(EndPoint remoteEP, byte[] data);
-
- ///
- /// 客户端数据接收事件
- ///
- public event OnReceiveEvent OnReceive;
-
- ///
- /// 构造
- ///
- ///
- public TcpServer(IPEndPoint iPEndPoint)
- {
- this.iPEndPoint = iPEndPoint;
- }
-
- ///
- /// 创建实例
- ///
- ///
- ///
- internal static TcpServer CreateInstance(IPEndPoint iPEndPoint)
- {
- TcpServer server = new TcpServer(iPEndPoint);
- return server;
- }
-
- ///
- /// 启动服务
- ///
- /// 端口号
- public void Open(IPEndPoint endPoint) {
- iPEndPoint = endPoint;
- Open();
- }
-
- ///
- /// 启动服务
- ///
- /// 端口号
- public void Open()
- {
- OpenOrClose(true);
- }
-
-
- ///
- /// 关闭服务
- ///
- public void Close()
- {
- OpenOrClose(false);
- }
-
-
- ///
- /// 打开或者关闭
- ///
- ///
- private void OpenOrClose(bool _open) {
- lock (ClientSocketDic) {
- if (_open)
- {
- ToOpen();
- }
- else {
- ToClose();
- }
- }
- }
-
- ///
- /// 打开逻辑
- ///
- ///
- private void ToOpen()
- {
- if (FlagListen) {
- return;
- }
-
- FlagListen = true;
- // 创建负责监听的套接字，注意其中的参数；
- ServerSocket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
- // 将负责监听的套接字绑定到唯一的ip和端口上；
- ServerSocket.Bind(iPEndPoint);
- // 设置监听队列的长度；
- ServerSocket.Listen(100);
- // 创建负责监听的线程；
- Thread Thread_ServerListen = new Thread(ListenConnecting);
- Thread_ServerListen.IsBackground = true;
- Thread_ServerListen.Start();
- }
-
- ///
- /// 关闭
- ///
- private void ToClose()
- {
- if (OnReceive != null)
- {
- return;
- }
-
- FlagListen = false;
-
- // 关闭服务器
- if (ServerSocket != null)
- {
- try
- {
- //ServerSocket.Shutdown(SocketShutdown.Both);
- //ServerSocket.Close();
- ServerSocket.Dispose();
- }
- catch (Exception ex)
- {
- Debug.WriteLine(ex);
- }
- }
-
-
- // 关闭每一个客户端
- List list = new List();
- foreach (var item in ClientSocketDic)
- {
- list.Add(item.Value);
- }
-
- for (int i = 0; i < list.Count; i++)
- {
- list[i].Close();
- }
- ClientSocketDic.Clear();
- }
-
- ///
- /// 监听客户端请求的方法；
- ///
- private void ListenConnecting()
- {
- while (FlagListen)
- {
- // 每100ms找一次
- Thread.Sleep(100);
-
- try
- {
- // 一旦监听到一个客户端的请求，就返回一个与该客户端通信的 套接字；
- Socket sokConnection = ServerSocket.Accept();
- // 将与客户端连接的 套接字 对象添加到集合中；
- string str_EndPoint = sokConnection.RemoteEndPoint.ToString();
- ClientSession myTcpClient = new ClientSession() {
- id = str_EndPoint,
- remoteEP = sokConnection.RemoteEndPoint,
- tcpSocket = sokConnection,
- tcpServer = this,
- };
- //创建线程接收数据
- ClientSocketDic.TryAdd(str_EndPoint, myTcpClient);
- }
- catch(Exception ex)
- {
- if (FlagListen) {
- Debug.WriteLine(ex);
- }
- break;
- }
- }
- }
-
-
- ///
- /// 发送数据给指定的客户端
- ///
- /// 客户端套接字
- /// 发送的数组
- ///
- public bool SendData(string _endPoint, byte[] _buf)
- {
- ClientSession myT = null;
- if (ClientSocketDic.TryGetValue(_endPoint, out myT))
- {
- myT.Send(_buf);
- return true;
- }
- else
- {
- return false;
- }
- }
-
-
- ///
- /// 发送数据给所有的客户端
- ///
- /// 发送的数组
- ///
- public bool AllSendData(byte[] _buf)
- {
- foreach (var item in ClientSocketDic)
- {
- ClientSession myT = item.Value;
- myT.Send(_buf);
- }
- return true;
- }
-
- ///
- /// 数据接收事件
- ///
- ///
- ///
- public void InvokeOnReceive(EndPoint remoteEP, byte[] buf)
- {
- OnReceive?.Invoke(remoteEP, buf);
- }
- }
-
- ///
- /// 会话端
- ///
- public class ClientSession
- {
- ///
- /// 服务器
- ///
- public TcpServer tcpServer;
-
- ///
- /// 客户端
- ///
- public Socket tcpSocket;//socket对象
-
- ///
- /// 数据缓存
- ///
- public List DataBuffer = new List();//数据缓存区
-
- ///
- /// 远程IP
- ///
- public EndPoint remoteEP;
-
- public string id;
-
- ///
- /// 是否启动的
- ///
- private bool Flag_Receive;
-
- public ClientSession()
- {
- Thread th = new Thread(this.ReceiveData) {
- IsBackground = true,
- };
- th.Start();
- }
-
- ///
- /// 接收数据
- ///
- public void ReceiveData()
- {
- Flag_Receive = true;
- while (Flag_Receive)
- {
- // 接收数据延时
- Thread.Sleep(10);
- try
- {
- // 定义一个2M的缓存区；
- byte[] arrMsgRec = new byte[1024 * 1024 * 2];
- // 将接受到的数据存入到输入 arrMsgRec中；
- int length = -1;
- length = tcpSocket.Receive(arrMsgRec); // 接收数据，并返回数据的长度
-
- if (length > 0)
- {
- byte[] buf = new byte[length];
- Array.Copy(arrMsgRec, buf, length);
- tcpServer.InvokeOnReceive(remoteEP, buf);
- }
- }
- catch (Exception ex)
- {
- if (Flag_Receive) {
- Debug.WriteLine(ex);
- Close();
- }
- }
- }
- }
-
- ///
- /// 发送数据
- ///
- ///
- public void Send(byte[] buf)
- {
- if (buf != null)
- {
- tcpSocket.Send(buf);
- }
- }
-
- ///
- /// 获取连接的ip
- ///
- ///
- public string GetIp()
- {
- IPEndPoint clientipe = (IPEndPoint)tcpSocket.RemoteEndPoint;
- string _ip = clientipe.Address.ToString();
- return _ip;
- }
-
- ///
- /// 关闭连接
- ///
- public void Close()
- {
- if (Flag_Receive) {
- try
- {
- Flag_Receive = false;
- tcpSocket.Shutdown(SocketShutdown.Both);
- tcpSocket.Close();
- }
- catch (Exception ex)
- {
- Debug.WriteLine(ex);
- }
-
- // 从通信线程集合中删除被中断连接的通信线程对象；
- ClientSession session = null;
- tcpServer.ClientSocketDic.TryRemove(id, out session);//删除客户端字典中该socket
- }
- }
-
- ///
- /// 提取正确数据包
- ///
- public byte[] GetBuffer(int startIndex, int size)
- {
- byte[] buf = new byte[size];
- DataBuffer.CopyTo(startIndex, buf, 0, size);
- DataBuffer.RemoveRange(0, startIndex + size);
- return buf;
- }
-
- ///
- /// 添加队列数据
- ///
- ///
- public void AddQueue(byte[] buffer)
- {
- DataBuffer.AddRange(buffer);
- }
-
- ///
- /// 清除缓存
- ///
- public void ClearQueue()
- {
- DataBuffer.Clear();
- }
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Modular/Tcp/TcpServerPool.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Modular/Tcp/TcpServerPool.cs
deleted file mode 100644
index ed940a5cd..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Modular/Tcp/TcpServerPool.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Text;
-using System.Threading.Tasks;
-using Wit.SDK.Modular.Sensor.Modular.Connector.Role;
-using Wit.SDK.Sensor.Connector.Modular.Udp;
-
-namespace Wit.SDK.Sensor.Connector.Modular.Tcp
-{
- ///
- /// Tcp服务器代理
- ///
- public class TcpServerPool
- {
- ///
- /// 字典
- ///
- public static ConcurrentDictionary Dict = new ConcurrentDictionary();
-
- ///
- /// 线程锁
- ///
- private static object lockobj = new object();
-
- ///
- /// 创建UDP服务器
- ///
- public static TcpServer GetTcpServer(IPEndPoint iPEndPoint)
- {
- lock (lockobj)
- {
- if (Dict.ContainsKey(iPEndPoint.Port))
- {
- return Dict[iPEndPoint.Port];
- }
- else
- {
- var con = TcpServer.CreateInstance(iPEndPoint);
- Dict.TryAdd(iPEndPoint.Port, con);
- return con;
- }
- }
- }
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Modular/Tcp/TcpServerProxy.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Modular/Tcp/TcpServerProxy.cs
deleted file mode 100644
index 04668e253..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Modular/Tcp/TcpServerProxy.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Text;
-using System.Threading.Tasks;
-using Wit.SDK.Sensor.Connector.Modular.Udp;
-using Wit.SDK.Udp;
-using Wit.SDK.Modular.Sensor.Modular.Connector.Role;
-using static Wit.SDK.Modular.Sensor.Modular.Connector.Role.TcpServer;
-
-namespace Wit.SDK.Sensor.Connector.Modular.Tcp
-{
- ///
- /// Tcp服务器代理
- ///
- public class TcpServerProxy
- {
- ///
- /// udp服务器
- ///
- private TcpServer tcpServer;
-
- ///
- /// 远程服务器ip
- ///
- private IPEndPoint iPEndPoint;
-
- ///
- /// 收到数据事件
- ///
- public event OnReceiveEvent OnReceive;
-
- ///
- /// 构造
- ///
- ///
- public TcpServerProxy(IPEndPoint iPEndPoint)
- {
- this.iPEndPoint = iPEndPoint;
- tcpServer = TcpServerPool.GetTcpServer(iPEndPoint);
- }
-
- ///
- /// 关闭
- ///
- public void Close()
- {
- tcpServer.OnReceive -= UdpReceive;
- tcpServer.Close();
- }
-
- ///
- /// 打开
- ///
- public void Open()
- {
- tcpServer.Open();
- tcpServer.OnReceive -= UdpReceive;
- tcpServer.OnReceive += UdpReceive;
- }
-
- ///
- /// udp收到数据
- ///
- ///
- ///
- private void UdpReceive(EndPoint remoteEP, byte[] data)
- {
- OnReceive?.Invoke(remoteEP, data);
- }
-
- ///
- /// 发送数据
- ///
- ///
- ///
- public void Send(EndPoint remoteIpPoint, byte[] data)
- {
- tcpServer.SendData(remoteIpPoint.ToString(), data);
- }
-
- ///
- /// 发送到全部
- ///
- ///
- public void AllSend(byte[] data)
- {
- tcpServer.AllSendData(data);
- }
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Modular/Udp/UdpServer.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Modular/Udp/UdpServer.cs
deleted file mode 100644
index ec8619676..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Modular/Udp/UdpServer.cs
+++ /dev/null
@@ -1,226 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Net;
-using System.Net.Sockets;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Wit.SDK.Modular.Sensor.Modular.Connector.Entity;
-using Wit.SDK.Modular.Sensor.Modular.Connector.Interface;
-
-namespace Wit.SDK.Sensor.Connector.Modular.Udp
-{
-
- ///
- /// Udp服务器
- ///
- public class UdpServer
- {
- ///
- /// UDP客户端
- ///
- private Socket newsock;
-
- //private UdpClient UdpClient { get; set; }
-
- ///
- /// 是否打开的
- ///
- public bool IsOpen { get; private set; }
-
- ///
- /// 本地ip和端口
- ///
- public IPEndPoint LocalIpPoint = null;
-
- ///
- /// 自动任务线程
- ///
- private Thread AutoTaskThread = null;
-
- ///
- /// 是否运行任务线程
- ///
- private bool AutoTaskRun = false;
-
- ///
- /// 打开设备锁
- ///
- private object openlock = new object();
-
- ///
- /// 收到数据委托
- ///
- ///
- public delegate void OnReceiveEvent(IPEndPoint remoteEP,byte[] data);
-
- ///
- /// 收到数据事件
- ///
- public event OnReceiveEvent OnReceive;
-
- ///
- /// 构造
- ///
- ///
- private UdpServer(IPEndPoint localIpPoint)
- {
- LocalIpPoint = localIpPoint;
- }
-
- ///
- /// 检查配置
- ///
- public void CheckConfig()
- {
- if (LocalIpPoint == null)
- {
- throw new Exception("未设置udp本地监听地址和端口");
- }
- }
-
- ///
- /// 关闭
- ///
- public void Close()
- {
- if (OnReceive != null) {
- return;
- }
-
- if (newsock != null)
- {
- try
- {
- newsock.Close();
- }
- catch (Exception ex) {
- Debug.WriteLine(ex);
- }
- }
-
- if (AutoTaskThread != null)
- {
- AutoTaskRun = false;
- // AutoTaskThread.Abort();
- }
-
- // 标志为关闭状态
- IsOpen = false;
- }
-
-
- ///
- /// 打开连接
- ///
- public void Open()
- {
- lock (openlock) {
- // 不重复打开
- if (IsOpen)
- {
- return;
- }
-
- CheckConfig();
-
- if (newsock != null)
- {
- try
- {
- newsock.Close();
- }
- catch (Exception ex)
- {
- Debug.WriteLine(ex);
- }
-
- }
- // 新建套接字,基于IPv和4UDP协议
- newsock = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
- // 绑定本机ip地址
- newsock.Bind(LocalIpPoint);
-
- // 读取数据线程
- AutoTaskThread = new Thread(AutoTaskMethod);
- AutoTaskRun = true;
- AutoTaskThread.IsBackground = true;
- AutoTaskThread.Start();
-
- IsOpen = true;
- }
- }
-
- ///
- /// 发送数据
- ///
- ///
- ///
- ///
- public void Send(byte[] data, IPEndPoint remoteEP)
- {
- //检查状态
- if (IsOpen == false)
- {
- throw new Exception("发送失败，未打开连接");
- }
- newsock.SendTo(data, data.Length, SocketFlags.None, remoteEP);
- }
-
- ///
- /// 自动任务线程方法
- ///
- private void AutoTaskMethod()
- {
- int length;
- //存储数据
- byte[] data = new byte[1024];
-
- while (AutoTaskRun)
- {
- // 休眠1毫秒防止cpu占用率过高
- //Thread.Sleep(1);
- try
- {
- //得到客户机IP
- IPEndPoint sender = new IPEndPoint(IPAddress.Any, 0);
- EndPoint remoteEP = (EndPoint)(sender);
-
- length = newsock.ReceiveFrom(data, ref remoteEP);
- if (length > 0)
- {
- byte[] buf = new byte[length];
- Array.Copy(data, buf, length);
- InvokeOnReceive((IPEndPoint)remoteEP, buf);
- }
- }
- catch (Exception ex)
- {
- Debug.WriteLine(ex.Message);
- Debug.WriteLine(ex.StackTrace);
- }
- }
- }
-
- ///
- /// 收到数据时
- ///
- ///
- private void InvokeOnReceive(IPEndPoint remoteEP, byte[] data)
- {
- OnReceive?.Invoke(remoteEP,data);
- }
-
- ///
- /// 创建实例
- ///
- ///
- ///
- public static UdpServer CreateInstance(IPEndPoint iPEndPoint)
- {
- return new UdpServer(iPEndPoint);
- }
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Modular/Udp/UdpServerPool.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Modular/Udp/UdpServerPool.cs
deleted file mode 100644
index 6195e0fec..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Modular/Udp/UdpServerPool.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Net.Sockets;
-using System.Text;
-using System.Threading.Tasks;
-using Wit.SDK.Modular.Sensor.Modular.Connector.Entity;
-using Wit.SDK.Modular.Sensor.Modular.Connector.Role;
-using Wit.SDK.Sensor.Connector.Modular.Udp;
-
-namespace Wit.SDK.Udp
-{
- ///
- /// UDP服务器池
- ///
- public class UdpServerPool
- {
- ///
- /// 字典
- ///
- public static ConcurrentDictionary Dict = new ConcurrentDictionary();
-
- ///
- /// 线程锁
- ///
- private static object lockobj = new object();
-
- ///
- /// 创建UDP服务器
- ///
- public static UdpServer GetUdpServer(IPEndPoint iPEndPoint)
- {
- lock (lockobj)
- {
- if (Dict.ContainsKey(iPEndPoint.Port))
- {
- return Dict[iPEndPoint.Port];
- }
- else
- {
- var con = UdpServer.CreateInstance(iPEndPoint);
- Dict.TryAdd(iPEndPoint.Port, con);
- return con;
- }
- }
- }
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Modular/Udp/UdpServerProxy.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Modular/Udp/UdpServerProxy.cs
deleted file mode 100644
index 4ec789b04..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Modular/Udp/UdpServerProxy.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Text;
-using System.Threading.Tasks;
-using Wit.SDK.Udp;
-using static Wit.SDK.Sensor.Connector.Modular.Udp.UdpServer;
-
-namespace Wit.SDK.Sensor.Connector.Modular.Udp
-{
- ///
- /// Udp服务器代理
- ///
- public class UdpServerProxy
- {
- ///
- /// udp服务器
- ///
- private UdpServer udpServer;
-
- ///
- /// 远程服务器ip
- ///
- private IPEndPoint iPEndPoint;
-
- ///
- /// 收到数据事件
- ///
- public event OnReceiveEvent OnReceive;
-
- ///
- /// 构造
- ///
- ///
- public UdpServerProxy(IPEndPoint iPEndPoint)
- {
- this.iPEndPoint = iPEndPoint;
- udpServer = UdpServerPool.GetUdpServer(iPEndPoint);
- }
-
- ///
- /// 关闭
- ///
- public void Close()
- {
- udpServer.OnReceive -= UdpReceive;
- udpServer.Close();
- }
-
- ///
- /// 打开
- ///
- public void Open()
- {
- udpServer.Open();
- udpServer.OnReceive-= UdpReceive;
- udpServer.OnReceive+= UdpReceive;
- }
-
- ///
- /// udp收到数据
- ///
- ///
- ///
- private void UdpReceive(IPEndPoint remoteEP, byte[] data)
- {
- OnReceive?.Invoke(remoteEP, data);
- }
-
- ///
- /// 发送数据
- ///
- ///
- ///
- public void Send(byte[] data, IPEndPoint remoteIpPoint)
- {
- udpServer.Send(data, remoteIpPoint);
- }
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Role/SPConnector.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Role/SPConnector.cs
deleted file mode 100644
index 1ccc2d2b4..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Role/SPConnector.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO.Ports;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Wit.SDK.Modular.Sensor.Modular.Connector.Entity;
-using Wit.SDK.Modular.Sensor.Modular.Connector.Interface;
-
-namespace Wit.SDK.Modular.Sensor.Modular.Connector.Role
-{
- ///
- /// 串口连接器
- ///
- public class SPConnector :IConnector
- {
- ///
- /// 串口
- ///
- public SerialPort SerialPort { get; set; }
-
- ///
- /// 连接配置
- ///
- public SerialPortConfig SerialPortConfig = new SerialPortConfig();
-
- ///
- /// 构造
- ///
- ///
- public SPConnector(SerialPortConfig serialPortConfig) {
- SerialPortConfig = serialPortConfig;
- }
-
-
- ///
- /// 关闭
- ///
- public override void Close()
- {
- if (SerialPort != null)
- {
- SerialPort.Close();
- }
-
- // 标志为关闭状态
- ConnectStatus = ConnectStatus.Closed;
- }
-
- ///
- /// 打开
- ///
- public override void Open()
- {
- CheckConfig();
- //检查状态
- if (ConnectStatus != ConnectStatus.Closed)
- {
- throw new Exception("打开连接失败,现在已经打开");
- }
-
- if (SerialPort == null) {
- SerialPort = new SerialPort();
- }
- // 串口号
- SerialPort.BaudRate = SerialPortConfig.BaudRate;
- // 波特率
- SerialPort.PortName = SerialPortConfig.PortName;
- // 数据位
- SerialPort.DataBits = 8;
- // 停止位
- SerialPort.StopBits = StopBits.One;
- // 校验位
- SerialPort.Parity = Parity.None;
- // 读取缓存
- SerialPort.ReadBufferSize = 10240 * 100;
- // 写出缓存
- SerialPort.WriteBufferSize = 10240 * 100;
- // DTS
- SerialPort.RtsEnable = SerialPortConfig.RtsEnable;
- // DTR
- SerialPort.DtrEnable = SerialPortConfig.DTREnable;
-
- //打开串口
- if (!SerialPort.IsOpen) {
- SerialPort.Open();
- }
-
- //取消注册
- SerialPort.DataReceived -= new SerialDataReceivedEventHandler(SerialDataReceive);
- //注册
- SerialPort.DataReceived += new SerialDataReceivedEventHandler(SerialDataReceive);
-
- ConnectStatus = ConnectStatus.Opened;
- }
-
- ///
- /// 检查配置
- ///
- public override void CheckConfig()
- {
- // 检查配置
- if (SerialPortConfig == null)
- {
- throw new Exception("未设置任何串口连接参数");
- }
-
- if (SerialPortConfig.BaudRate < 0)
- {
-
- throw new Exception("未设置连接参数,波特率不能为负数");
- }
-
- if (SerialPortConfig.PortName == null || SerialPortConfig.PortName == string.Empty)
- {
- throw new Exception("未设置连接参数,串口名称不能为空");
- }
- }
-
-
- ///
- /// 收到串口数据时
- ///
- ///
- ///
- private void SerialDataReceive(object sender, SerialDataReceivedEventArgs e)
- {
- SerialPort _SerialPort = (SerialPort)sender;
- try
- {
- int _bytesToRead = _SerialPort.BytesToRead;
- byte[] recvData = new byte[_bytesToRead];
- _SerialPort.Read(recvData, 0, _bytesToRead);
- //Debug.WriteLine(ByteArrayConvert.ByteArrayToHexString(recvData));
- onReceive(recvData);
- }
- catch (Exception ex)
- {
- Console.WriteLine(ex.Message);
- }
- }
-
- ///
- /// 发送数据
- ///
- ///
- public override void SendData(byte[] data)
- {
- // 检查状态
- if (ConnectStatus != ConnectStatus.Opened)
- {
- throw new Exception("发送失败，未打开连接");
- }
-
- if (SerialPort.IsOpen)
- {
- OnSendData(data);
- SerialPort.Write(data, 0, data.Length);
- }
- }
-
- ///
- /// 设置波特率
- ///
- ///
- public void SetBaud(int baudRate)
- {
- SerialPortConfig.BaudRate = baudRate;
- if (SerialPort != null) {
- SerialPort.BaudRate = baudRate;
- }
- }
-
- ///
- /// 获得配置
- ///
- ///
- public override IConnectConfig GetConfig()
- {
- return SerialPortConfig;
- }
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Role/TcpClientConnector.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Role/TcpClientConnector.cs
deleted file mode 100644
index 6df3ec662..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Role/TcpClientConnector.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Sockets;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Wit.SDK.Modular.Sensor.Modular.Connector.Entity;
-using Wit.SDK.Modular.Sensor.Modular.Connector.Interface;
-
-namespace Wit.SDK.Modular.Sensor.Modular.Connector.Role
-{
- ///
- /// Tcp客户端
- ///
- public class TcpClientConnector : IConnector
- {
- ///
- /// TCP通讯客户端
- ///
- private Socket TcpClient { get; set; }
-
- ///
- /// 连接配置
- ///
- public TcpClientConfig TcpClientConfig = new TcpClientConfig();
-
- ///
- /// 自动任务线程
- ///
- private Thread AutoTaskThread = null;
-
- ///
- /// 是否运行任务线程
- ///
- private bool AutoTaskRun = false;
-
- ///
- /// 构造
- ///
- ///
- public TcpClientConnector(TcpClientConfig tcpClientConfig)
- {
- TcpClientConfig = tcpClientConfig;
- }
-
- ///
- /// 检查配置
- ///
- public override void CheckConfig()
- {
- if (TcpClientConfig == null)
- {
- throw new Exception("未设置任何tcp客户端连接参数");
- }
- if (TcpClientConfig.Port < 0 || TcpClientConfig.Port > 65535)
- {
- throw new Exception("未设置连接参数,端口不能小于0不能大于65535");
- }
- if (TcpClientConfig.IP == null || TcpClientConfig.IP == string.Empty)
- {
- throw new Exception("未设置连接参数,IP不能为空");
- }
- }
-
- ///
- /// 关闭
- ///
- public override void Close()
- {
- // 标志为关闭状态
- ConnectStatus = ConnectStatus.Closed;
-
- if (TcpClient != null)
- {
- TcpClient.Close();
- }
-
- if (AutoTaskThread != null)
- {
- AutoTaskRun = false;
- AutoTaskThread.Abort();
- }
- }
-
- ///
- /// 获得配置
- ///
- ///
- public override IConnectConfig GetConfig()
- {
- return TcpClientConfig;
- }
-
-
- ///
- /// 打开
- ///
- public override void Open()
- {
- if (TcpClient == null)
- {
- TcpClient = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
- }
- TcpClient.Connect(TcpClientConfig.IP, TcpClientConfig.Port);
-
-
- // 读取数据线程
- AutoTaskThread = new Thread(AutoTaskMethod);
- AutoTaskRun = true;
- AutoTaskThread.IsBackground = true;
- AutoTaskThread.Start();
-
- ConnectStatus = ConnectStatus.Opened;
- }
-
- ///
- /// 发送数据
- ///
- ///
- public override void SendData(byte[] data)
- {
- //检查状态
- if (ConnectStatus != ConnectStatus.Opened)
- {
- throw new Exception("发送失败，未打开连接");
- return;
- }
-
- if (TcpClient != null && TcpClient.Connected)
- {
- OnSendData(data);
- TcpClient.Send(data);
- }
- }
-
-
- ///
- /// 自动任务线程方法
- ///
- private void AutoTaskMethod()
- {
- while (AutoTaskRun)
- {
- // 休眠1毫秒防止cpu占用率过高
- Thread.Sleep(1);
- byte[] data = new byte[1024];
-
- if (TcpClient.Connected)
- {
- int len = TcpClient.Receive(data);
-
- if (len > 0)
- {
- onReceive(data.Take(len).ToArray());
- }
- }
- else
- {
- ConnectStatus = ConnectStatus.Closed;
- }
-
- }
- }
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Role/TcpServerConnector.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Role/TcpServerConnector.cs
deleted file mode 100644
index 17dc1b4d7..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Role/TcpServerConnector.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Text;
-using System.Threading.Tasks;
-using Wit.SDK.Modular.Sensor.Modular.Connector.Entity;
-using Wit.SDK.Modular.Sensor.Modular.Connector.Interface;
-using Wit.SDK.Sensor.Connector.Modular.Tcp;
-
-namespace Wit.SDK.Modular.Sensor.Modular.Connector.Role
-{
- ///
- /// TCP服务器
- ///
- public class TcpServerConnector : IConnector
- {
- ///
- /// tcp服务器
- ///
- private TcpServerProxy TcpServer { get; set; }
-
- ///
- /// 连接配置
- ///
- public TcpServerConfig TcpServerConfig = new TcpServerConfig();
-
- ///
- /// 构造
- ///
- ///
- public TcpServerConnector(TcpServerConfig tcpServerConfig) {
- TcpServerConfig = tcpServerConfig;
- }
-
- ///
- /// 检查配置
- ///
- public override void CheckConfig()
- {
- if (TcpServerConfig == null)
- {
- throw new Exception("未设置任何tcp服务端连接参数");
- }
- if (TcpServerConfig.IPEndPoint == null)
- {
- throw new Exception("未设置监听地址和端口");
- }
- if (TcpServerConfig.RemoteEP == null)
- {
- throw new Exception("未设置远程端口");
- }
- }
-
- ///
- /// 关闭
- ///
- public override void Close()
- {
- if (TcpServer != null)
- {
- TcpServer.Close();
- }
- // 标志为关闭状态
- ConnectStatus = ConnectStatus.Closed;
- }
-
- ///
- /// 获得配置
- ///
- ///
- public override IConnectConfig GetConfig()
- {
- return TcpServerConfig;
- }
-
- ///
- /// 打开
- ///
- public override void Open()
- {
- // 创建包含ip和端口号的网络节点对象；
- IPEndPoint endPoint = TcpServerConfig.IPEndPoint;
-
- if (TcpServer == null)
- {
- TcpServer = new TcpServerProxy(endPoint);
- }
- TcpServer.Open();
- TcpServer.OnReceive -= AcceptData;
- TcpServer.OnReceive += AcceptData;
- ConnectStatus = ConnectStatus.Opened;
- }
-
- ///
- /// 接收数据
- ///
- ///
- private void AcceptData(EndPoint remoteEP, byte[] data)
- {
- if (remoteEP.ToString() == TcpServerConfig.RemoteEP.ToString()) {
- onReceive(data);
- }
- }
-
- ///
- /// 发送数据
- ///
- ///
- public override void SendData(byte[] data)
- {
- //检查状态
- if (ConnectStatus != ConnectStatus.Opened)
- {
- throw new Exception("发送失败，未打开连接");
- }
- OnSendData(data);
- TcpServer.Send(TcpServerConfig.RemoteEP, data);
- }
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Role/UdpConnector.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Role/UdpConnector.cs
deleted file mode 100644
index 58717bafc..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Connector/Role/UdpConnector.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Net;
-using System.Net.Sockets;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Wit.SDK.Modular.Sensor.Modular.Connector.Entity;
-using Wit.SDK.Modular.Sensor.Modular.Connector.Interface;
-using Wit.SDK.Sensor.Connector.Modular.Udp;
-using Wit.SDK.Udp;
-
-namespace Wit.SDK.Modular.Sensor.Modular.Connector.Role
-{
- ///
- /// UDP连接器
- ///
- public class UdpConnector : IConnector
- {
- ///
- /// UDP客户端
- ///
- private UdpServerProxy UdpServer { get; set; }
-
- ///
- /// 连接配置
- ///
- public UdpConfig UdpConfig = new UdpConfig();
-
- ///
- /// 构造
- ///
- ///
- public UdpConnector(UdpConfig udpConfig) {
- UdpConfig = udpConfig;
- }
-
- ///
- /// 检查配置
- ///
- public override void CheckConfig()
- {
- if (UdpConfig == null)
- {
- throw new Exception("未设置任何udp连接参数");
- }
-
- if (UdpConfig.localIpPoint == null)
- {
- throw new Exception("未设置udp本地监听地址和端口");
- }
-
- if (UdpConfig.remoteIpPoint == null)
- {
- throw new Exception("未设置udp远程监听地址和端口");
- }
- }
-
- ///
- /// 关闭
- ///
- public override void Close()
- {
- if (UdpServer != null)
- {
- UdpServer.Close();
- }
-
- //if (AutoTaskThread != null)
- //{
- // AutoTaskRun = false;
- // AutoTaskThread.Abort();
- //}
-
- // 标志为关闭状态
- ConnectStatus = ConnectStatus.Closed;
- }
-
- ///
- /// 获得配置
- ///
- ///
- public override IConnectConfig GetConfig()
- {
- return UdpConfig;
- }
-
- ///
- /// 打开连接
- ///
- public override void Open()
- {
- CheckConfig();
-
- if (UdpServer == null)
- {
- UdpServer = new UdpServerProxy(UdpConfig.localIpPoint);
- }
- else
- {
- UdpServer.Close();
- UdpServer = new UdpServerProxy(UdpConfig.localIpPoint);
- }
-
- UdpServer.Open();
- UdpServer.OnReceive -= UdpServer_OnReceive;
- UdpServer.OnReceive += UdpServer_OnReceive;
-
- ConnectStatus = ConnectStatus.Opened;
- }
-
- ///
- /// 接收udp数据
- ///
- ///
- ///
- private void UdpServer_OnReceive(IPEndPoint remoteEP, byte[] data)
- {
- if (UdpConfig.remoteIpPoint.ToString().Equals(remoteEP.ToString())) {
- onReceive(data);
- }
- }
-
- ///
- /// 发送数据
- ///
- ///
- public override void SendData(byte[] data)
- {
- //检查状态
- if (ConnectStatus != ConnectStatus.Opened)
- {
- throw new Exception("发送失败，未打开连接");
- }
-
- OnSendData(data);
- UdpServer.Send(data, UdpConfig.remoteIpPoint);
- }
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/Constant/InnerKeys.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/Constant/InnerKeys.cs
deleted file mode 100644
index 789379085..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/Constant/InnerKeys.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Wit.SDK.Sensor.Device.Constant
-{
- ///
- /// 内部的键值
- ///
- public class InnerKeys
- {
- // 串口端口
- public static string ComPort { get; } = "_ComPort";
-
- // 串口can波特率
- public static string ComBaud { get; } = "_ComBaud";
-
- // 设备地址Key值
- public static string ADDR_KEY { get; } = "ADDR";
-
- // can波特率
- public static string CanBaud { get; } = "_CanBaud";
-
- // 数据包速率
- public static string PacketRate { get; } = "_PacketRate";
-
- // 数据大小速率
- public static string DataSizeRate { get; } = "_DataSizeRate";
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/Context/DeviceManager.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/Context/DeviceManager.cs
deleted file mode 100644
index 2b640f84e..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/Context/DeviceManager.cs
+++ /dev/null
@@ -1,203 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Wit.SDK.Modular.Sensor.Device;
-using Wit.SDK.Sensor.Device.Context;
-
-namespace Wit.SDK.Modular.Sensor.DeviceManager
-{
-
- ///
- /// 设备管理器
- ///
- public class DeviceManager: DeviceManagerEvents
- {
- #region 单例设计模式
- // 实例
- private static DeviceManager instance;
- ///
- /// 获得实例
- ///
- ///
- public static DeviceManager GetInstance()
- {
- if (instance == null)
- {
- instance = new DeviceManager();
- }
- return instance;
- }
-
- ///
- /// 私有构造
- ///
- private DeviceManager()
- {
-
- }
- #endregion
-
- ///
- /// 当前设备
- ///
- public List DeviceModels
- {
- get
- {
- return DeviceDict.Values.ToList();
- }
- }
-
- ///
- /// 设备字典
- ///
- public ConcurrentDictionary DeviceDict = new ConcurrentDictionary();
-
- ///
- /// 第一个设备
- ///
- public DeviceModel FirstDeviceModel
- {
- get
- {
- if (DeviceDict.Count == 0)
- {
- return null;
- }
- return DeviceDict.ElementAt(0).Value;
- }
- }
-
- ///
- /// 用设备名称查找设备
- ///
- ///
- ///
- public DeviceModel FindDeviceById(string deviceId)
- {
- DeviceModel result;
-
- if (DeviceDict.TryGetValue(deviceId, out result)) {
- return result;
- }
- return null;
- }
-
- ///
- /// 添加设备
- ///
- public void AppendDevice(DeviceModel deviceModel) {
- if (FindDeviceById(deviceModel.DeviceId) == null) {
- DeviceDict.TryAdd(deviceModel.DeviceId, deviceModel);
- InvokeOnAppendDevice(deviceModel);
- deviceModel.OnClosed += DeviceModel_OnClosed;
- deviceModel.OnOpened += DeviceModel_OnOpened;
- }
- }
-
- ///
- /// 设备打开事件
- ///
- ///
- private void DeviceModel_OnOpened(DeviceModel deviceModel)
- {
- InvokeOnOpenDevice(deviceModel);
- }
-
- ///
- /// 设备关闭事件
- ///
- ///
- private void DeviceModel_OnClosed(DeviceModel deviceModel)
- {
- InvokeOnCloseDevice(deviceModel);
- }
-
- ///
- /// 添加一批设备
- ///
- ///
- public void AppendDevice(List deviceModels)
- {
- for (int i = 0; i < deviceModels.Count; i++)
- {
- AppendDevice(deviceModels[i]);
- }
- }
-
- ///
- /// 移除设备
- ///
- public void RemoveDevice(DeviceModel deviceModel) {
- CloseDevice(deviceModel.DeviceId);
- if (ContainsDevice(deviceModel)) {
- DeviceModel de;
- DeviceDict.TryRemove(deviceModel.DeviceId,out de);
- InvokeOnRemoveDevice(deviceModel);
- }
- }
-
- ///
- /// 关闭设备
- ///
- public void CloseDevice(string deviceId)
- {
- DeviceModel deviceModel = FindDeviceById(deviceId);
- if (deviceModel != null) {
- CloseDevice(deviceModel);
- }
- }
-
- ///
- /// 关闭设备
- ///
- ///
- public void CloseDevice(DeviceModel deviceModel)
- {
- deviceModel.CloseDevice();
- }
-
- ///
- /// 清除所有设备
- ///
- public void ClearDevice()
- {
- List copyList = new List ();
-
- // 关闭所有设备
- for (int i = 0; i < DeviceDict.Count; i++)
- {
- copyList.Add(DeviceDict.ElementAt(i).Value);
- }
-
- for (int i = 0; i < copyList.Count; i++)
- {
- DeviceModel deviceModel = copyList[i];
- RemoveDevice(deviceModel);
- }
- }
-
- ///
- /// 是否存在某个设备
- ///
- ///
- ///
- public bool ContainsDevice(DeviceModel deviceModel)
- {
- return FindDeviceById(deviceModel.DeviceId)!= null;
- }
-
- ///
- /// 打开设备
- ///
- ///
- public void OpenDevice(DeviceModel deviceModel)
- {
- AppendDevice(deviceModel);
- deviceModel.OpenDevice();
- }
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/Context/DeviceManagerEvents.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/Context/DeviceManagerEvents.cs
deleted file mode 100644
index 853d8ba22..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/Context/DeviceManagerEvents.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Wit.SDK.Device.Sensor.Device.Utils;
-using Wit.SDK.Modular.Sensor.Device;
-
-namespace Wit.SDK.Sensor.Device.Context
-{
- ///
- /// 设备管理器事件
- ///
- public abstract class DeviceManagerEvents: ReadDataSleepManager
- {
- ///
- /// 关闭设备
- ///
- ///
- public delegate void CloseDeviceEvent(DeviceModel deviceModel);
- public event CloseDeviceEvent OnCloseDevice;
- public void InvokeOnCloseDevice(DeviceModel deviceModel) {
- new Thread(() =>
- {
- OnCloseDevice?.Invoke(deviceModel);
- })
- { IsBackground = true }.Start();
- }
- ///
- /// 打开设备
- ///
- ///
- public delegate void OpenDeviceEvent(DeviceModel deviceModel);
- public event OpenDeviceEvent OnOpenDevice;
- public void InvokeOnOpenDevice(DeviceModel deviceModel)
- {
- new Thread(() =>
- {
- OnOpenDevice?.Invoke(deviceModel);
- })
- { IsBackground = true }.Start();
- }
-
-
- ///
- /// 移除设备
- ///
- ///
- public delegate void RemoveDeviceEvent(DeviceModel deviceModel);
- public event RemoveDeviceEvent OnRemoveDevice;
- public void InvokeOnRemoveDevice(DeviceModel deviceModel)
- {
- new Thread(() =>
- {
- OnRemoveDevice?.Invoke(deviceModel);
- })
- { IsBackground = true }.Start();
- }
-
- ///
- /// 添加设备
- ///
- ///
- public delegate void AppendDeviceEvent(DeviceModel deviceModel);
- public event AppendDeviceEvent OnAppendDevice;
- public void InvokeOnAppendDevice(DeviceModel deviceModel)
- {
- new Thread(() =>
- {
- OnAppendDevice?.Invoke(deviceModel);
- })
- { IsBackground = true }.Start();
- }
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/Context/ReadDataSleepManager.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/Context/ReadDataSleepManager.cs
deleted file mode 100644
index e0ef94a22..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/Context/ReadDataSleepManager.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Wit.SDK.Sensor.Device.Interfaces;
-
-namespace Wit.SDK.Device.Sensor.Device.Utils
-{
- ///
- /// 读取数据休眠事件
- ///
- public interface IReadSleepEvent {
- void OnSleep();
- }
-
- ///
- /// 读取数据休眠管理器
- ///
- public class ReadDataSleepManager
- {
- private static List sleeps = new List();
-
- ///
- /// 添加设备组件
- ///
- public static void AddReadSleepEvent(IReadSleepEvent e)
- {
- if (sleeps.Contains(e))
- {
- return;
- }
- sleeps.Add(e);
- }
-
- ///
- /// 移除设备组件
- ///
- public static void RemoveReadSleepEvent(IReadSleepEvent e)
- {
- sleeps.Remove(e);
- }
-
- ///
- /// 调用休眠事件
- ///
- public static void InvokeOnSleep()
- {
- for (int i = 0; i < sleeps.Count; i++)
- {
- try
- {
- sleeps[i].OnSleep();
- }
- catch (Exception e)
- {
- Debug.WriteLine(e);
- }
- }
- }
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/DKey/ByteKey.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/DKey/ByteKey.cs
deleted file mode 100644
index eed396d1a..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/DKey/ByteKey.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Wit.SDK.Device.Device.Device.DKey
-{
- public class ByteKey : DataKey
- {
- public ByteKey(string key) : base(key)
- {
- }
-
- public ByteKey(string key, string name, string unit) : base(key, name, unit)
- {
- }
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/DKey/DataKey.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/DKey/DataKey.cs
deleted file mode 100644
index ce3d52feb..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/DKey/DataKey.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Wit.SDK.Device.Device.Device.DKey
-{
- ///
- /// 数据键值
- ///
- public class DataKey
- {
- public string Key { get; set; } = "";
-
- public string Name { get; set; } = "";
-
- public string Unit { get; set; } = "";
-
- public DataKey(string key) {
- this.Key = key;
- }
-
- public DataKey(string key,string name,string unit)
- {
- this.Key = key;
- this.Name = name;
- this.Unit = unit;
- }
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/DKey/DoubleKey.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/DKey/DoubleKey.cs
deleted file mode 100644
index e7a83de1b..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/DKey/DoubleKey.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Wit.SDK.Device.Device.Device.DKey
-{
- public class DoubleKey : DataKey
- {
- public DoubleKey(string key) : base(key)
- {
- }
-
- public DoubleKey(string key, string name, string unit) : base(key, name, unit)
- {
- }
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/DKey/FloatKey.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/DKey/FloatKey.cs
deleted file mode 100644
index a5993cf89..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/DKey/FloatKey.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Wit.SDK.Device.Device.Device.DKey
-{
- public class FloatKey : DataKey
- {
- public FloatKey(string key) : base(key)
- {
- }
-
- public FloatKey(string key, string name, string unit) : base(key, name, unit)
- {
- }
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/DKey/IntKey.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/DKey/IntKey.cs
deleted file mode 100644
index 1b6df2907..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/DKey/IntKey.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Wit.SDK.Device.Device.Device.DKey
-{
- public class IntKey : DataKey
- {
- public IntKey(string key) : base(key)
- {
- }
-
- public IntKey(string key, string name, string unit) : base(key, name, unit)
- {
- }
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/DKey/ShortKey.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/DKey/ShortKey.cs
deleted file mode 100644
index 15cdfa2d5..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/DKey/ShortKey.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Wit.SDK.Device.Device.Device.DKey
-{
- public class ShortKey : DataKey
- {
- public ShortKey(string key) : base(key)
- {
- }
-
- public ShortKey(string key, string name, string unit) : base(key, name, unit)
- {
- }
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/DKey/StringKey.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/DKey/StringKey.cs
deleted file mode 100644
index 75969e700..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/DKey/StringKey.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Wit.SDK.Device.Device.Device.DKey
-{
- public class StringKey : DataKey
- {
- public StringKey(string key) : base(key)
- {
- }
-
- public StringKey(string key, string name, string unit) : base(key, name, unit)
- {
- }
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/DeviceDataSource.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/DeviceDataSource.cs
deleted file mode 100644
index 72a67a7ad..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/DeviceDataSource.cs
+++ /dev/null
@@ -1,369 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Wit.SDK.Device.Device.Device.DKey;
-using Wit.SDK.Modular.Sensor.Modular.DataProcessor.Interface;
-using Wit.SDK.Sensor.Device;
-using Wit.SDK.Sensor.Device.Constant;
-
-namespace Wit.SDK.Modular.Sensor.Device
-{
-
- ///
- /// 设备数据源操作
- ///
- public class DeviceDataSource : DeviceEvents
- {
- ///
- /// 传感器数据
- ///
- public Dictionary DeviceData { get; } = new Dictionary();
-
- ///
- /// 设备的历史数据
- ///
- public Dictionary> HistoryDeviceData { get; } = new Dictionary>();
-
-
- #region 数据源操作
-
- ///
- /// 删除一个key
- ///
- public bool RemoveKey(string key)
- {
- return DeviceData.Remove(key);
- }
-
- ///
- /// 删除所有设备的key，上位机的保留key不会清除
- ///
- public bool ClearDeviceKey()
- {
- for (int i = 0; i < DeviceData.Count; i++)
- {
- KeyValuePair keyvalue = DeviceData.ElementAt(i);
-
- //如果不是保留的key值那么都清除
- if (!InnerKeys.ADDR_KEY.Equals(keyvalue.Key))
- {
- DeviceData.Remove(keyvalue.Key);
- i--;
- }
- }
- return true;
- }
-
- ///
- /// 获取设备数据
- ///
- /// 需要的数据
- /// 数据的值,如果没有就返回null
- public string GetDeviceData(string key)
- {
- if (DeviceData.ContainsKey(key))
- {
- return DeviceData[key].ToString();
- }
- else
- {
- return null;
- }
- }
-
- ///
- /// 获取设备历史数据
- ///
- /// 历史第几个数据
- /// 数据key
- /// 返回数据，如果没有数据就返回null
- public string GetHistoryDeviceData(int i, string key)
- {
- if (i < 0)
- {
- return null;
- }
-
- if (HistoryDeviceData.ContainsKey(key))
- {
- int position = HistoryDeviceData[key].Count - 1 - i;
-
- if (position >= 0)
- {
- return HistoryDeviceData[key][position];
- }
- else
- {
- return null;
- }
- }
- else
- {
- return null;
- }
-
- }
-
- ///
- /// 设置数据
- ///
- ///
- ///
- public void SetDeviceData(string key, string value)
- {
- Put(key, value);
- }
-
- ///
- /// 设置设备地址
- ///
- ///
- public void SetAddr(string addr) {
-
- SetDeviceData(InnerKeys.ADDR_KEY, addr);
- }
-
- ///
- /// 获得地址
- ///
- ///
- public string GetAddr()
- {
- return GetDeviceData(InnerKeys.ADDR_KEY);
- }
-
- #endregion
-
- ///
- /// 添加数据
- ///
- ///
- ///
- public void Put(string key, object value)
- {
- // 当前数据
- DeviceData[key] = value;
- if (this is DeviceModel)
- {
- // Key刷新通知
- InvokeOnKeyUpdate((DeviceModel)this, key, value);
- }
-
- //// 保存到历史数据
- //if (HistoryDeviceData.ContainsKey(key))
- //{
- // HistoryDeviceData[key].Add(value);
- // if (HistoryDeviceData[key].Count > 200)
- // {
- // HistoryDeviceData[key].RemoveAt(0);
- // }
- //}
- //else
- //{
- // HistoryDeviceData[key] = new List() { value };
- //}
- }
-
- ///
- /// 设置数据
- ///
- ///
- ///
- public void SetDeviceData(ByteKey key, byte value) {
- Put(key.Key, value);
- }
-
- ///
- /// 获得数据
- ///
- ///
- ///
- public byte? GetDeviceData(ByteKey dataKey) {
- string key = dataKey.Key;
- if (DeviceData.ContainsKey(key))
- {
- object o = DeviceData[key];
- if (o is byte) {
- return (byte)o;
- }
- return null;
- }
- else
- {
- return null;
- }
- }
-
-
- ///
- /// 设置数据
- ///
- ///
- ///
- public void SetDeviceData(DoubleKey key, double value)
- {
- Put(key.Key, value);
- }
-
- ///
- /// 获得数据
- ///
- ///
- ///
- public double? GetDeviceData(DoubleKey dataKey)
- {
- string key = dataKey.Key;
- if (DeviceData.ContainsKey(key))
- {
- object o = DeviceData[key];
- if (o is double)
- {
- return (double)o;
- }
- return null;
- }
- else
- {
- return null;
- }
- }
-
-
- ///
- /// 设置数据
- ///
- ///
- ///
- public void SetDeviceData(FloatKey key, float value)
- {
- Put(key.Key, value);
- }
-
- ///
- /// 获得数据
- ///
- ///
- ///
- public float? GetDeviceData(FloatKey dataKey)
- {
- string key = dataKey.Key;
- if (DeviceData.ContainsKey(key))
- {
- object o = DeviceData[key];
- if (o is float)
- {
- return (float)o;
- }
- return null;
- }
- else
- {
- return null;
- }
- }
-
- ///
- /// 设置数据
- ///
- ///
- ///
- public void SetDeviceData(IntKey key, int value)
- {
- Put(key.Key, value);
- }
-
- ///
- /// 获得数据
- ///
- ///
- ///
- public int? GetDeviceData(IntKey dataKey)
- {
- string key = dataKey.Key;
- if (DeviceData.ContainsKey(key))
- {
- object o = DeviceData[key];
- if (o is int)
- {
- return (int)o;
- }
- return null;
- }
- else
- {
- return null;
- }
- }
-
-
- ///
- /// 设置数据
- ///
- ///
- ///
- public void SetDeviceData(ShortKey key, short value)
- {
- Put(key.Key, value);
- }
-
- ///
- /// 获得数据
- ///
- ///
- ///
- public short? GetDeviceData(ShortKey dataKey)
- {
- string key = dataKey.Key;
- if (DeviceData.ContainsKey(key))
- {
- object o = DeviceData[key];
- if (o is short)
- {
- return (short)o;
- }
- return null;
- }
- else
- {
- return null;
- }
- }
-
-
- ///
- /// 设置数据
- ///
- ///
- ///
- public void SetDeviceData(StringKey key, string value)
- {
- Put(key.Key, value);
- }
-
- ///
- /// 获得数据
- ///
- ///
- ///
- public string GetDeviceData(StringKey dataKey)
- {
- string key = dataKey.Key;
- if (DeviceData.ContainsKey(key))
- {
- object o = DeviceData[key];
- if (o is string)
- {
- return (string)o;
- }
- return null;
- }
- else
- {
- return null;
- }
- }
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/DeviceEvents.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/DeviceEvents.cs
deleted file mode 100644
index c67600b7f..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/DeviceEvents.cs
+++ /dev/null
@@ -1,271 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows.Input;
-using System.Windows.Markup;
-using Wit.SDK.Modular.Sensor.Device;
-using Wit.SDK.Modular.Sensor.Modular.DataProcessor.Interface;
-using Wit.SDK.Sensor.Device.Interfaces;
-
-namespace Wit.SDK.Sensor.Device
-{
- ///
- /// 设备事件
- ///
- public abstract class DeviceEvents
- {
- ///
- /// 设备组件列表
- ///
- private List DeviceComponents = new List();
-
- ///
- /// 监听的key值改变事件
- ///
- ///
- public delegate void OnListenKeyUpdateHandler(DeviceModel deviceModel);
-
- public event OnListenKeyUpdateHandler OnListenKeyUpdate;
-
- ///
- /// 收到数据事件
- ///
- ///
- public delegate void OnReceiveDataHandler(DeviceModel deviceModel, byte[] data);
-
- public event OnReceiveDataHandler OnReceiveData;
-
- ///
- /// 读取数据事件
- ///
- public delegate void OnReadDataEvent(DeviceModel deviceModel, byte[] sendData, int delay = -1);
-
- public event OnReadDataEvent OnReadData;
-
- ///
- /// 发送数据事件
- ///
- public delegate void OnSendDataEvent(DeviceModel deviceModel, byte[] data);
-
- public event OnSendDataEvent OnSendData;
-
- ///
- /// key刷新事件
- ///
- ///
- public delegate void OnKeyUpdateHandler(DeviceModel deviceModel, string key, object value);
-
- ///
- /// key刷新事件
- ///
- public event OnKeyUpdateHandler OnKeyUpdate;
-
- ///
- /// 打开后事件
- ///
- ///
- public delegate void OpenedEvent(DeviceModel deviceModel);
-
- public event OpenedEvent OnOpened;
-
- ///
- /// 关闭后事件
- ///
- ///
- public delegate void ClosedEvent(DeviceModel deviceModel);
-
- public event ClosedEvent OnClosed;
-
-
- ///
- /// 添加设备组件
- ///
- public void AddComponent(IDeviceComponent compo) {
- if (DeviceComponents.Contains(compo)) {
- return;
- }
- DeviceComponents.Add(compo);
- }
-
- ///
- /// 移除设备组件
- ///
- public void RemoveComponent(IDeviceComponent compo)
- {
- DeviceComponents.Remove(compo);
- compo.OnRemove();
- }
-
- ///
- /// 调用关闭设备事件
- ///
- ///
- public void InvokeOnClosed(DeviceModel deviceModel)
- {
- new Thread(() =>
- {
- for (int i = 0; i < DeviceComponents.Count; i++)
- {
- try
- {
- var compo = DeviceComponents[i];
- compo.OnClose(deviceModel);
- }
- catch (Exception ex) {
- Debug.WriteLine(ex);
- }
- }
-
- OnClosed?.Invoke(deviceModel);
- })
- { IsBackground = true }.Start();
- }
-
- ///
- /// 调用键值更新事件
- ///
- ///
- ///
- ///
- public void InvokeOnKeyUpdate(DeviceModel deviceModel,string key,object value) {
-
- for (int i = 0; i < DeviceComponents.Count; i++)
- {
- try
- {
- var compo = DeviceComponents[i];
- compo.OnKeyUpdate(deviceModel,key,value);
- }
- catch (Exception ex)
- {
- Debug.WriteLine(ex);
- }
- }
-
- OnKeyUpdate?.Invoke(deviceModel,key,value);
- }
-
- ///
- /// 调用监听键值更新事件
- ///
- ///
- public void InvokeOnListenKeyUpdate(DeviceModel deviceModel)
- {
-
- for (int i = 0; i < DeviceComponents.Count; i++)
- {
- try
- {
- var compo = DeviceComponents[i];
- compo.OnUpdate(deviceModel);
- }
- catch (Exception ex)
- {
- Debug.WriteLine(ex);
- }
- }
- OnListenKeyUpdate?.Invoke(deviceModel);
- }
-
- ///
- /// 调用收到数据事件
- ///
- ///
- ///
- public void InvokeOnReceiveData(DeviceModel deviceModel, byte[] data)
- {
- for (int i = 0; i < DeviceComponents.Count; i++)
- {
- try
- {
- var compo = DeviceComponents[i];
- compo.OnReceiveData(deviceModel,data);
- }
- catch (Exception ex)
- {
- Debug.WriteLine(ex);
- }
- }
- OnReceiveData?.Invoke(deviceModel,data);
- }
-
-
- ///
- /// 调用读取数据事件
- ///
- ///
- ///
- ///
- public void InvokeOnReadData(DeviceModel deviceModel, byte[] data, int delay)
- {
- for (int i = 0; i < DeviceComponents.Count; i++)
- {
- try
- {
- var compo = DeviceComponents[i];
- compo.OnReadData(deviceModel, data, delay);
- }
- catch (Exception ex)
- {
- Debug.WriteLine(ex);
- }
- }
- OnReadData?.Invoke(deviceModel, data, delay);
- }
-
- ///
- /// 调用发送设备事件
- ///
- ///
- ///
- public void InvokeOnSendData(DeviceModel deviceModel, byte[] data)
- {
- new Thread(() =>
- {
- for (int i = 0; i < DeviceComponents.Count; i++)
- {
- try
- {
- var compo = DeviceComponents[i];
- compo.OnSend(deviceModel, data);
- }
- catch (Exception ex)
- {
- Debug.WriteLine(ex);
- }
- }
- OnSendData?.Invoke(deviceModel, data);
- })
- { IsBackground = true }.Start();
- }
-
- ///
- /// 调用打开设备事件
- ///
- ///
- public void InvokeOnOpened(DeviceModel deviceModel) {
-
- new Thread(() =>
- {
- for (int i = 0; i < DeviceComponents.Count; i++)
- {
- try
- {
- var compo = DeviceComponents[i];
- compo.OnOpen(deviceModel);
- }
- catch (Exception ex)
- {
- Debug.WriteLine(ex);
- }
- }
- OnOpened?.Invoke(deviceModel);
- })
- { IsBackground = true }.Start();
- }
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/DeviceModel.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/DeviceModel.cs
deleted file mode 100644
index e46ca7ac1..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/DeviceModel.cs
+++ /dev/null
@@ -1,413 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Threading;
-using Wit.SDK.Device.Sensor.Device.Utils;
-using Wit.SDK.Modular.Sensor.Device.Entity;
-using Wit.SDK.Modular.Sensor.Modular.Connector.Interface;
-using Wit.SDK.Modular.Sensor.Modular.Connector.Role;
-using Wit.SDK.Modular.Sensor.Modular.DataProcessor.Interface;
-using Wit.SDK.Modular.Sensor.Modular.ProtocolResolver.Interface;
-using Wit.SDK.Sensor.Device.Interfaces;
-namespace Wit.SDK.Modular.Sensor.Device
-{
- ///
- /// 基础设备
- ///
- public class DeviceModel : DeviceDataSource, DataReceivedInterface
- {
-
- ///
- /// 设备ID，设备的唯一名称
- ///
- public string DeviceId { get; set; }
-
- ///
- /// 设备名称
- ///
- public string DeviceName { get; set; }
-
- ///
- /// 是否是回放的设备
- ///
- public bool IsPlaybackDevice { get; set; }
-
- ///
- /// 连接对象
- ///
- public IConnector Connector { get; set; }
-
- ///
- /// 监听Key值
- ///
- public string ListenerKey { get; set; } = "";
-
- ///
- /// 构造方法
- ///
- public DeviceModel(string deviceId,string deviceName,IProtocolResolver protocolResolver, IDataProcessor dataProcessor, string listenerKey)
- {
- ListenerKey = listenerKey == null ? "": listenerKey;
- DeviceName = deviceName;
- DeviceId = deviceId;
-
- // 设备配置
- DeviceOption = new DeviceOption()
- {
- ListenerKey = ListenerKey,
- DataProcessorType = dataProcessor != null? dataProcessor.GetType(): null,
- ProtocolResolverType = protocolResolver != null? protocolResolver.GetType(): null,
- };
-
- // 注册计数据速率组件
- RateCalculationCompo rateCalculationCompo = new RateCalculationCompo();
- AddComponent(rateCalculationCompo);
- // 注册数据处理器
- AddComponent(dataProcessor);
- // 注册协议解析器
- AddComponent(protocolResolver);
-
- this.OnKeyUpdate += DeviceModel_OnKeyUpdate;
-
- }
-
- ///
- /// 键值更新时
- ///
- ///
- ///
- ///
- private void DeviceModel_OnKeyUpdate(DeviceModel deviceModel, string key, object value)
- {
- // 触发实时数据更新
- if (ListenerKey.Equals(key) || string.IsNullOrEmpty(ListenerKey))
- {
- // 键值改变事件
- InvokeOnListenKeyUpdate(this);
- }
- }
-
-
- #region 打开和关闭设备的操作
-
- ///
- /// 是否打开
- ///
- private bool _IsOpen { get; set; } = false;
-
- ///
- /// 是否打开
- ///
- public bool IsOpen { get { return _IsOpen; } }
-
- ///
- /// 是否正在关闭
- ///
- public bool Closing { get; set; }
-
- ///
- /// 设备配置
- ///
- public DeviceOption DeviceOption { get; private set; }
-
- ///
- /// 打开设备
- ///
- public void OpenDevice()
- {
- //如果是回放的设备就直接标为打开,不用做其它事情
- if (IsPlaybackDevice)
- {
- // 标记为已经打开
- _IsOpen = true;
- InvokeOnOpened(this);
- return;
- }
-
- if (Connector != null) {
- //注销接收数据
- Connector.LogoutReceivedObj(this);
- //注册接收数据
- Connector.RegisterReceivedObj(this);
- //如果核心连接没有打开就打开连接
- if (Connector.IsOpen() == false) Connector.Open();
- _IsOpen = true;
- InvokeOnOpened(this);
- return;
- }
- else
- {
- _IsOpen = false;
- throw new Exception("打开设备错误,没有coreConnenct对象");
- }
- }
-
- ///
- /// 重新打开
- ///
- ///
- public void ReOpen()
- {
- CloseDevice();
- OpenDevice();
- }
-
- ///
- /// 关闭设备
- ///
- public void CloseDevice()
- {
- Closing = true;
- if (Connector != null)
- {
- //注销接收数据
- Connector.LogoutReceivedObj(this);
- //关闭连接
- Connector.Close();
-
- }
-
- if (_IsOpen) {
- // 关闭事件
- InvokeOnClosed(this);
- }
- _IsOpen = false;
- Closing = false;
- }
-
- ///
- /// 设置串口波特率
- ///
- ///
- public void SetSerialPortBaud(int baudRate)
- {
- if (Connector is SPConnector) {
- SPConnector sP = Connector as SPConnector;
- sP.SetBaud(baudRate);
- }
- }
-
- #endregion
-
- #region 发送数据和接收数据
-
- ///
- /// 发送数据锁
- ///
- private readonly object SendLock = new object();
-
- ///
- /// 接收数据锁
- ///
- private readonly object ReceiveLock = new object();
-
- ///
- /// 是否接收返回数据
- ///
- private bool BolWaitReturn;
-
- ///
- /// 返回的数据
- ///
- private List ReturnDataBuffer = new List();
-
- ///
- /// 发送数据，不等待返回
- ///
- ///
- ///
- public bool SendData(byte[] data) {
- byte[] outData = new byte[0];
- return SendData(data, out outData, false);
- }
-
- ///
- /// 发送数据，并等待返回
- ///
- /// 发送的数据
- /// 返回的数据
- /// 是否等待返回
- /// 等待时间
- /// 等待次数
- ///
- public bool SendData(byte[] data, out byte[] returnData, bool isWaitReturn = false, int waitTime = 100, int repetition = 1) {
-
- // 发送数据锁
- lock (SendLock)
- {
- byte[] rtnData = new byte[0];
- bool success = false;
- // 标记线程释是否结束
- bool newThreadRuning = true;
- // 开启线程池发送数据
- ThreadPool.QueueUserWorkItem(new WaitCallback((p) =>
- {
- try
- {
- success = SendDataTh(data, out rtnData, isWaitReturn, waitTime, repetition);
- }
- catch (Exception ex) {
- Debug.WriteLine(ex.Message);
- Debug.WriteLine(ex.StackTrace);
- }
- // 标记线程结束
- newThreadRuning = false;
- }), null);
-
- // 线程没有结束就一直等
- while (newThreadRuning) {
- Thread.Sleep(1);
- // 防止ui线程卡住
- ReadDataSleepManager.InvokeOnSleep();
- }
- returnData = rtnData;
- return success;
- }
- }
-
- ///
- /// 发送数据，可以有返回值
- ///
- /// 发送的数据
- /// 返回的数据
- /// 是否等待返回
- /// 等待时间
- /// 等待次数
- ///
- private bool SendDataTh(byte[] data, out byte[] returnData, bool isWaitReturn = false, int waitTime = 100, int repetition = 1)
- {
- // 如果正在关闭就不发送
- if (Closing ||
- Connector == null ||
- Connector.IsOpen() == false
- )
- {
- returnData = new byte[0];
- return false;
- }
- try
- {
- ReturnDataBuffer.Clear();
- BolWaitReturn = isWaitReturn;
- returnData = new byte[0];
- int count = 0;
- if (BolWaitReturn)
- {
- while (count < repetition && BolWaitReturn)
- {
- count++;
- // 发送数据
- Connector.SendData(data);
- // 发送数据事件
- InvokeOnSendData(this, data);
- Thread.Sleep(waitTime);
- returnData = ReturnDataBuffer.ToArray();
- if (returnData != null && returnData.Length > 0)
- {
- break;
- }
- }
- }
- else
- {
- InvokeOnSendData(this, data);
- // 发送数据
- Connector.SendData(data);
- }
- BolWaitReturn = false;
- return true;
- }
- catch
- {
- returnData = new byte[0];
- BolWaitReturn = false;
- return false;
- }
- }
-
- ///
- /// 使用数据解析器发送数据
- ///
- public bool ReadData(byte[] data, int delay = -1)
- {
- if (this.IsPlaybackDevice)
- {
- return false;
- }
-
- try
- {
- // 发送数据
- InvokeOnReadData(this, data, delay);
- return true;
- }
- catch (Exception e) {
- Debug.WriteLine("发送数据出错：" + e.Message);
- Debug.WriteLine(e.StackTrace);
- return false;
- }
- }
-
- ///
- /// 异步发送数据
- ///
- ///
- ///
- public void AsyncReadData(byte[] data, Action callback, int delay = -1)
- {
- if (this.IsPlaybackDevice) { return; }
-
- try
- {
- ThreadPool.QueueUserWorkItem(new WaitCallback((p) =>
- {
- // 发送数据
- InvokeOnReadData(this, data, delay);
- // 调用回调方法
- callback.Invoke();
- }), null);
- }
- catch (Exception e)
- {
- Debug.WriteLine("发送数据出错：" + e.Message);
- Debug.WriteLine(e.StackTrace);
- }
- }
-
- ///
- /// 收到数据
- ///
- ///
- public void OnDataReceived(byte[] data) {
- // 如果正在关闭就不接收数据
- if (Closing)
- {
- return;
- }
-
-
- //如果需要返回
- if (BolWaitReturn)
- {
- try
- {
- ReturnDataBuffer.AddRange(data);
- }
- catch (Exception e)
- {
- Debug.WriteLine(e.Message);
- }
- }
-
-
- // 线程锁
- lock (ReceiveLock)
- {
- // 触发原始数据事件
- InvokeOnReceiveData(this, data);
- }
- }
-
- #endregion
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/Entity/DeviceOption.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/Entity/DeviceOption.cs
deleted file mode 100644
index d707863b8..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/Entity/DeviceOption.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Wit.SDK.Modular.Sensor.Modular.DataProcessor.Interface;
-using Wit.SDK.Modular.Sensor.Modular.ProtocolResolver.Interface;
-
-namespace Wit.SDK.Modular.Sensor.Device.Entity
-{
- ///
- /// 设备配置
- ///
- [Serializable]
- public class DeviceOption
- {
- ///
- /// 协议解析器类型
- ///
- public Type ProtocolResolverType { get; set; } = null;
-
- ///
- /// 数据解析器类型
- ///
- public Type DataProcessorType { get; set; } = null;
-
- ///
- /// 数据
- ///
- public string ListenerKey { get; set; } = null;
-
- ///
- /// 数据
- ///
- public List ListenerKeyList { get; set; } = null;
-
- ///
- /// 默认的设备数据
- ///
- public Dictionary DefaultData = new Dictionary();
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/Enum/DataType.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/Enum/DataType.cs
deleted file mode 100644
index d70ff41f1..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/Enum/DataType.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Wit.SDK.Sensor.Device.Enum
-{
-
- ///
- /// 数据类型
- ///
- public enum DataType
- {
- ///
- /// 浮点型
- ///
- Double,
- ///
- /// 整型
- ///
- Int,
- ///
- /// 字符串型
- ///
- String,
- ///
- /// 日期时间
- ///
- DateTime
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/Interfaces/IDeviceComponent.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/Interfaces/IDeviceComponent.cs
deleted file mode 100644
index b82e7cb75..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/Interfaces/IDeviceComponent.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Wit.SDK.Modular.Sensor.Device;
-
-namespace Wit.SDK.Sensor.Device.Interfaces
-{
- ///
- /// 设备组件接口
- ///
- public interface IDeviceComponent
- {
- ///
- /// 设备打开时
- ///
- ///
- void OnOpen(DeviceModel deviceModel);
-
- ///
- /// 设备关闭时
- ///
- ///
- void OnClose(DeviceModel deviceModel);
-
- ///
- /// 被从设备中移除时
- ///
- void OnRemove();
-
- ///
- /// 收到数据时
- ///
- ///
- ///
- void OnReceiveData(DeviceModel deviceModel, byte[] data);
-
- ///
- /// 键值更新时
- ///
- ///
- ///
- ///
- void OnKeyUpdate(DeviceModel deviceModel,string key, object value);
-
- ///
- /// 监听键值更新时
- ///
- ///
- void OnUpdate(DeviceModel deviceModel);
-
- ///
- /// 读取数据时
- ///
- void OnReadData(DeviceModel deviceModel, byte[] sendData, int delay = -1);
-
- ///
- /// 发送数据时
- ///
- ///
- ///
- void OnSend(DeviceModel deviceModel, byte[] data);
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/Interfaces/Impls/RateCalculationCompo.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/Interfaces/Impls/RateCalculationCompo.cs
deleted file mode 100644
index 348b17cb3..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/Interfaces/Impls/RateCalculationCompo.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Wit.SDK.Modular.Sensor.Device;
-using Wit.SDK.Sensor.Device.Constant;
-
-namespace Wit.SDK.Sensor.Device.Interfaces
-{
- ///
- /// 速率计算组件
- ///
- public class RateCalculationCompo : IDeviceComponent
- {
-
- ///
- /// 数据大小速率
- ///
- private int DataSizeRate = 0;
-
- ///
- /// 数据包速率
- ///
- private int PacketRate = 0;
-
- ///
- /// 设备模型
- ///
- private DeviceModel deviceModel;
-
- ///
- /// 是否在运行
- ///
- private bool IsRun = true;
-
- ///
- /// 线程
- ///
- private Thread thread;
-
- ///
- /// 设备打开时
- ///
- ///
- public void OnOpen(DeviceModel deviceModel)
- {
- this.deviceModel = deviceModel;
- IsRun = true;
- thread = new Thread(MyThread) { IsBackground = true };
- thread.Start();
- }
-
- ///
- /// 线程
- ///
- private void MyThread()
- {
- while (IsRun) {
- PacketRate = 0;
- DataSizeRate = 0;
- Thread.Sleep(1000);
- deviceModel.SetDeviceData(InnerKeys.PacketRate,PacketRate.ToString());
- deviceModel.SetDeviceData(InnerKeys.DataSizeRate,DataSizeRate.ToString());
- }
- }
-
- ///
- /// 设备关闭时
- ///
- ///
- public void OnClose(DeviceModel deviceModel)
- {
- IsRun = false;
- try
- {
- if (thread != null) {
- thread.Abort();
- }
- }
- catch (Exception ex) {
- Debug.WriteLine(ex);
- }
- }
-
- public void OnKeyUpdate(DeviceModel deviceModel, string key, object value)
- {
- }
-
- public void OnUpdate(DeviceModel deviceModel)
- {
- PacketRate++;
- }
-
- public void OnReceiveData(DeviceModel deviceModel, byte[] data)
- {
- DataSizeRate += data.Length;
- }
-
- public void OnReadData(DeviceModel deviceModel, byte[] sendData, int delay = -1)
- {
- }
-
- public void OnSend(DeviceModel deviceModel, byte[] data)
- {
-
- }
-
- public void OnRemove()
- {
- }
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/Utils/DeviceModelFactory.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/Utils/DeviceModelFactory.cs
deleted file mode 100644
index 0d1a8ae85..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Device/Utils/DeviceModelFactory.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-using System;
-using Wit.SDK.Modular.Sensor.Device.Entity;
-using Wit.SDK.Modular.Sensor.Modular.DataProcessor.Interface;
-using Wit.SDK.Modular.Sensor.Modular.ProtocolResolver.Interface;
-
-namespace Wit.SDK.Modular.Sensor.Device.Utils
-{
- ///
- /// 设备模型工厂
- ///
- public class DeviceModelFactory
- {
-
- ///
- /// 随机设备id
- ///
- ///
- public static string RandomDeviceId()
- {
- return Guid.NewGuid().ToString();
- }
-
- ///
- /// 从配置创建设备模型
- ///
- /// 设备配置
- ///
- public static DeviceModel CreateDeviceModel(string deviceId, string deviceName, DeviceOption deviceOption)
- {
-
- if (string.IsNullOrEmpty(deviceId))
- {
- throw new Exception("无法创建设备,设备没有id");
- }
-
- IProtocolResolver protocolResolver = null;
- IDataProcessor dataProcessor = null;
-
- try
- {
- if (deviceOption.ProtocolResolverType != null)
- protocolResolver = (IProtocolResolver)deviceOption.ProtocolResolverType.Assembly.CreateInstance(deviceOption.ProtocolResolverType.FullName);
- }
- catch (Exception ex)
- {
- throw new Exception("无法创建协议解析器", ex);
- }
-
- try
- {
- if (deviceOption.DataProcessorType != null)
- dataProcessor = (IDataProcessor)deviceOption.DataProcessorType.Assembly.CreateInstance(deviceOption.DataProcessorType.FullName);
- }
- catch (Exception ex)
- {
- throw new Exception("无法创建数据处理器", ex);
- }
-
- DeviceModel deviceModel = new DeviceModel(
- deviceId,
- deviceName,
- protocolResolver,
- dataProcessor,
- deviceOption.ListenerKey
- );
- return deviceModel;
- }
-
-
- ///
- /// 从配置创建设备模型
- ///
- /// 设备配置
- ///
- public static DeviceModel CreateDeviceModel(DeviceOption deviceOption)
- {
- return CreateDeviceModel(RandomDeviceId(), "Unknown", deviceOption);
- }
-
- ///
- /// 创建设备模型
- ///
- /// 设备名称
- /// 解析解析器
- /// 数据解析器
- /// 监听key
- ///
- public static DeviceModel CreateDeviceModel(string deviceId, string deviceName, IProtocolResolver protocolResolver, IDataProcessor dataProcessor, string dataUpdateListener)
- {
- DeviceModel deviceModel = new DeviceModel(
- deviceId,
- deviceName,
- protocolResolver,
- dataProcessor,
- dataUpdateListener
- );
- return deviceModel;
- }
-
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Processor/Interface/IDataProcessor.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Processor/Interface/IDataProcessor.cs
deleted file mode 100644
index 9094ee61a..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Processor/Interface/IDataProcessor.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Wit.SDK.Modular.Sensor.Device;
-using Wit.SDK.Sensor.Device.Interfaces;
-
-namespace Wit.SDK.Modular.Sensor.Modular.DataProcessor.Interface
-{
- ///
- /// 数据处理器接口
- ///
- public abstract class IDataProcessor : IDeviceComponent
- {
- ///
- /// 打开设备时
- ///
- public abstract void OnOpen(DeviceModel deviceModel);
-
- ///
- /// 关闭传感器时
- ///
- public abstract void OnClose(DeviceModel deviceModel);
-
- ///
- /// 设备实时数据更新时
- ///
- public abstract void OnUpdate(DeviceModel deviceModel);
-
- public void OnRemove()
- {
- }
-
- public void OnReceiveData(DeviceModel deviceModel, byte[] data)
- {
- }
-
- public void OnKeyUpdate(DeviceModel deviceModel, string key, object value)
- {
- }
-
- public void OnReadData(DeviceModel deviceModel, byte[] sendData, int delay = -1)
- {
- }
-
- public void OnSend(DeviceModel deviceModel, byte[] data)
- {
- }
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Processor/Interface/Impls/EmptyProcessor.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Processor/Interface/Impls/EmptyProcessor.cs
deleted file mode 100644
index 72d6533ce..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Processor/Interface/Impls/EmptyProcessor.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Wit.SDK.Modular.Sensor.Device;
-using Wit.SDK.Modular.Sensor.Modular.DataProcessor.Interface;
-
-namespace Wit.SDK.Modular.Sensor.Modular.DataProcessor.Roles
-{
-
- ///
- /// 空的数据处理器
- ///
- public class EmptyProcessor : IDataProcessor
- {
- public override void OnClose(DeviceModel deviceModel)
- {
- }
-
- public override void OnOpen(DeviceModel deviceModel)
- {
- }
-
- public override void OnUpdate(DeviceModel baseDeviceModel)
- {
- }
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Resolver/Enum/WitSensorProtocol.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Resolver/Enum/WitSensorProtocol.cs
deleted file mode 100644
index 43c357679..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Resolver/Enum/WitSensorProtocol.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Wit.SDK.Modular.Sensor.Modular.ProtocolResolver.Enum
-{
-
-
- ///
- /// 维特智能传感器协议枚举
- ///
- public enum WitSensorProtocol
- {
- ///
- /// 维特协议
- ///
- WitProtocol = 0,
- ///
- /// 维特智能Can协议
- ///
- WitCanProtocol = 1,
- ///
- /// 维特智能蓝牙5.0协议
- ///
- WitBle5Protocol = 2,
- ///
- /// Modbus16协议
- ///
- Modbus16Protocol = 3,
- ///
- /// 维特JY61协议
- ///
- WitJY61Protocol = 4
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Resolver/Interface/IProtocolResolver.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Resolver/Interface/IProtocolResolver.cs
deleted file mode 100644
index 7c3852807..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Resolver/Interface/IProtocolResolver.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Wit.SDK.Modular.Sensor.Device;
-using Wit.SDK.Sensor.Device.Interfaces;
-
-namespace Wit.SDK.Modular.Sensor.Modular.ProtocolResolver.Interface
-{
-
- ///
- /// 协议解析器接口
- ///
- public abstract class IProtocolResolver : IDeviceComponent
- {
-
- ///
- /// 读取数据时
- ///
- public abstract void OnReadData(DeviceModel deviceModel, byte[] sendData, int delay = -1);
-
- ///
- /// 收到数据时
- ///
- ///
- public abstract void OnReceiveData(DeviceModel deviceModel, byte[] data);
-
- public void OnClose(DeviceModel deviceModel)
- {
- }
-
- public void OnKeyUpdate(DeviceModel deviceModel, string key, object value)
- {
- }
-
- public void OnOpen(DeviceModel deviceModel)
- {
- }
-
- public void OnRemove()
- {
- }
-
- public void OnSend(DeviceModel deviceModel, byte[] data)
- {
- }
-
- public void OnUpdate(DeviceModel deviceModel)
- {
- }
- }
-
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Resolver/Interface/Impls/EmptyResolver.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Resolver/Interface/Impls/EmptyResolver.cs
deleted file mode 100644
index ef7f13a66..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Device/Resolver/Interface/Impls/EmptyResolver.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Wit.SDK.Modular.Sensor.Device;
-using Wit.SDK.Modular.Sensor.Modular.ProtocolResolver.Interface;
-
-namespace Wit.SDK.Modular.Sensor.Modular.ProtocolResolver.Roles
-{
- public class EmptyResolver : IProtocolResolver
- {
- ///
- ///
- ///
- ///
- ///
- public override void OnReceiveData(DeviceModel deviceModel, byte[] data)
- {
-
- }
-
- ///
- /// 发送数据
- ///
- ///
- ///
- public override void OnReadData(DeviceModel deviceModel, byte[] sendData, int delay = -1)
- {
- }
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Example/IAttitudeSenosrApi.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Example/IAttitudeSenosrApi.cs
deleted file mode 100644
index 0e2b0a3a7..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Example/IAttitudeSenosrApi.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-using Wit.SDK.Modular.Sensor.Device;
-
-namespace Wit.SDK.Modular.WitSensorApi.Interface
-{
-
- ///
- /// 姿态传感器Api
- ///
- public interface IAttitudeSensorApi
- {
- ///
- /// 打开设备
- ///
- void Open();
-
- ///
- /// 是否打开了设备
- ///
- ///
- bool IsOpen();
-
- ///
- /// 关闭设备
- ///
- void Close();
-
- ///
- /// 发送数据
- ///
- /// 需要发送出去的数据
- /// 传感器返回的数据
- /// 是否需要传感器返回数据
- /// 等待传感器返回数据时间，单位ms，默认100ms
- /// 重复发送次数
- void SendData(byte[] data, out byte[] returnData, bool isWaitReturn = false, int waitTime = 100, int repetition = 1);
-
- ///
- /// 发送带协议的数据，使用默认等待时长
- ///
- /// 数据
- void SendProtocolData(byte[] data);
-
- ///
- /// 发送带协议的数据,并且指定等待时长
- ///
- /// 数据
- /// 等待时间
- void SendProtocolData(byte[] data, int waitTime);
-
- ///
- /// 解锁寄存器
- ///
- void UnlockReg();
-
- ///
- /// 保存寄存器
- ///
- void SaveReg();
-
- ///
- /// 加计校准
- ///
- void AppliedCalibration();
-
- ///
- /// 开始磁场校准
- ///
- void StartFieldCalibration();
-
- ///
- /// 结束磁场校准
- ///
- void EndFieldCalibration();
-
- ///
- /// 设置回传速率
- ///
- ///
- void SetReturnRate(byte rate);
-
- ///
- /// 获得设备名称
- ///
- ///
- string GetDeviceName();
-
- ///
- /// 获得数据
- ///
- /// 数据键值
- ///
- string GetDeviceData(string key);
-
- ///
- /// 传感器数据更新时
- ///
- ///
- void DeviceModel_OnListenKeyUpdate(DeviceModel deviceModel);
-
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Byte/ByteArrayConvert.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Byte/ByteArrayConvert.cs
deleted file mode 100644
index 696281bad..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Byte/ByteArrayConvert.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-using System;
-using System.Text;
-
-namespace Wit.SDK.Utils
-{
-
- ///
- /// 字节数组转换工具类
- ///
- public class ByteArrayConvert
- {
-
- ///
- /// byte数组转string
- ///
- ///
- ///
- public static string ByteArrayToString(byte[] data)
- {
- return Encoding.Default.GetString(data);
- }
-
- ///
- /// string转 byte数组
- ///
- ///
- ///
- public static byte[] StringToByteArray(string data)
- {
- return Encoding.Default.GetBytes(data);
- }
-
- ///
- /// byte数组转16进制字符串
- ///
- ///
- ///
- public static string ByteArrayToHexString(byte[] data)
- {
- if (data == null) { return ""; }
-
- StringBuilder builder = new StringBuilder();
- for (int i = 0; i < data.Length; i++)
- {
- builder.Append(string.Format("{0:X2} ", data[i]));
- }
- return builder.ToString().Trim();
- }
-
- ///
- /// 16进制字符串转byte数组
- ///
- ///
- ///
- public static byte[] HexStringToByteArray(string data)
- {
- string[] chars = data.Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
- byte[] returnBytes = new byte[chars.Length];
- //逐个字符变为16进制字节数据
- for (int i = 0; i < chars.Length; i++)
- {
- returnBytes[i] = Convert.ToByte(chars[i], 16);
- }
- return returnBytes;
- }
-
- ///
- /// byte数组转10进制字符串
- ///
- ///
- ///
- public static string ByteArrayToDecString(byte[] data)
- {
-
- StringBuilder builder = new StringBuilder();
- for (int i = 0; i < data.Length; i++)
- {
- builder.Append(data[i] + " ");
- }
- return builder.ToString().Trim();
- }
-
- ///
- /// 10进制字符串转byte数组
- ///
- ///
- ///
- public static byte[] DecStringToByteArray(string data)
- {
-
- string[] chars = data.Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
- byte[] returnBytes = new byte[chars.Length];
- //逐个字符变为10进制字节数据
- for (int i = 0; i < chars.Length; i++)
- {
- returnBytes[i] = Convert.ToByte(chars[i], 10);
- }
- return returnBytes;
- }
-
- ///
- /// byte数组转八进制字符串
- ///
- ///
- ///
- public static string ByteArrayToOtcString(byte[] data)
- {
-
- StringBuilder builder = new StringBuilder();
- for (int i = 0; i < data.Length; i++)
- {
- builder.Append(Convert.ToString(data[i], 8) + " ");
- }
- return builder.ToString().Trim();
- }
-
- ///
- /// 八进制字符串转byte数组
- ///
- ///
- ///
- public static byte[] OtcStringToByteArray(string data)
- {
-
- string[] chars = data.Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
- byte[] returnBytes = new byte[chars.Length];
- //逐个字符变为8进制字节数据
- for (int i = 0; i < chars.Length; i++)
- {
- returnBytes[i] = Convert.ToByte(chars[i], 8);
- }
- return returnBytes;
- }
-
- ///
- /// 二进制字符串转byte数组
- ///
- ///
- ///
- public static byte[] BinStringToByteArray(string data)
- {
-
- string[] chars = data.Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
- byte[] returnBytes = new byte[chars.Length];
- //逐个字符变为2进制字节数据
- for (int i = 0; i < chars.Length; i++)
- {
- returnBytes[i] = Convert.ToByte(chars[i], 2);
- }
- return returnBytes;
- }
-
- ///
- /// byte数组转二进制字符串
- ///
- ///
- ///
- public static string ByteArrayToBinString(byte[] data)
- {
- StringBuilder builder = new StringBuilder();
- for (int i = 0; i < data.Length; i++)
- {
- builder.Append(Convert.ToString(data[i], 2) + " ");
- }
- return builder.ToString().Trim();
- }
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Cmd/Entity/CmdBean.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Cmd/Entity/CmdBean.cs
deleted file mode 100644
index 3d9f460b4..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Cmd/Entity/CmdBean.cs
+++ /dev/null
@@ -1,200 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Serialization;
-using Wit;
-using Wit.SDK;
-using Wit.SDK.Modular;
-using Wit.SDK.Modular.Sensor;
-using Wit.SDK.Modular.Sensor.Device.Entity;
-
-namespace Wit.SDK.Modular.Sensor.Device.Entity
-{
- public class CmdBean
- {
-
-
- [XmlIgnore]
- private string _sendData = "";
-
- ///
- /// 命令
- ///
- public string sendData
- {
- get
- {
- return _sendData;
- }
- set
- {
- _sendData = value;
- //if (!value.Equals(_sendData))
- //{
- // _sendData = value;
-
- // NotifyPropertyChange(nameof(sendData));
- //}
- }
- }
-
-
- private int _valueLength = 0;
-
- public int valueLength
- {
- get
- {
- return _valueLength;
- }
- set
- {
- _valueLength = value;
- //NotifyPropertyChange(nameof(valueLength));
- }
- }
-
-
- [XmlIgnore]
- private bool _sendHex = false;
-
- ///
- /// 是否十六进制处理
- ///
- public bool sendHex
- {
- get
- {
- return _sendHex;
- }
- set
- {
- if (!value.Equals(_sendHex))
- {
- _sendHex = value;
-
- //NotifyPropertyChange(nameof(sendHex));
- }
- }
- }
-
- [XmlIgnore]
- private bool _sendNewLine = false;
-
- ///
- /// 是否添加换行
- ///
- public bool sendNewLine
- {
- get
- {
- return _sendNewLine;
- }
- set
- {
-
- _sendNewLine = value;
-
- //NotifyPropertyChange(nameof(sendNewLine));
-
- }
- }
-
-
- [XmlIgnore]
- private string _sendParseValue = "";
- public string sendParseValue
- {
-
- get
- {
- return _sendParseValue;
- }
- set
- {
- if (!value.Equals(_sendParseValue))
- _sendParseValue = value;
- }
-
- }
-
- [XmlIgnore]
- private int _delay = 100;
-
- ///
- /// 延时时间
- ///
- public int delay
- {
- get
- {
- return _delay;
- }
- set
- {
- if (!value.Equals(_delay))
- {
- _delay = value;
-
- //NotifyPropertyChange(nameof(delay));
- }
- }
- }
-
- [XmlIgnore]
- private string _statsText = "";
-
- public string statsText
- {
- get
- {
- return _statsText;
- }
- set
- {
- _statsText = value;
- //NotifyPropertyChange(nameof(statsText));
- }
- }
-
-
- ///
- /// new Property("", "发送数据完成后对上位机进行调整的指令\r\n" +
- // "SetBaud:deviceName:Baud //设置设备波特率\r\n" +
- // "SetBaud:modeName //更改上位机模式\r\n" +
- // "SearchDevice //让上位机开始搜索\r\n" +
- // "SetModbusDeviceId:deviceName:ModbusId:isHex//设置设备ModbusID", "发送数据");
- ///
- [XmlIgnore]
- private string _sendEndCmd = "";
-
-
- public string sendEndCmd
- {
- get
- {
- return _sendEndCmd;
- }
- set
- {
- _sendEndCmd = value;
- }
-
- }
-
-
- [XmlIgnore]
- private int _sort = 0;
-
- public int sort
- {
- get => _sort;
- set
- {
- _sort = value;
- }
- }
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Cmd/Utils/CmdUtils.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Cmd/Utils/CmdUtils.cs
deleted file mode 100644
index 2dcd4d00f..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Cmd/Utils/CmdUtils.cs
+++ /dev/null
@@ -1,179 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using Wit.SDK.Modular.Sensor.Device.Entity;
-using Wit.SDK.Utils;
-
-namespace Wit.SDK.Modular.Sensor.Utils
-{
-
- ///
- /// 脚本解释器
- ///
- public class CmdUtils
- {
-
- ///
- /// 构建指令
- ///
- ///
- public static string GenerationCmd(string cmd, Dictionary dataResource, string value, string deviceName, string text, int valueLength = 0)
- {
- return Encoding.Default.GetString(GenerationCmd(cmd, false, false, dataResource, value, deviceName, text, valueLength));
- }
-
- ///
- /// 生成要发送的byte数组
- ///
- ///
- ///
- public static byte[] GenerationCmd(CmdBean cmdBean, Dictionary dataResource) {
- return GenerationCmd(cmdBean.sendData, cmdBean.sendHex, cmdBean.sendNewLine, dataResource);
- }
-
- ///
- /// 生成要发送的byte数组
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- public static byte[] GenerationCmd(string cmd, bool sendHex, bool sendNewLine, Dictionary dataResource, string value = null, string deviceName = null, string text = null, int valueLegnth = 0)
- {
-
- try
- {
- if (sendHex && !string.IsNullOrEmpty(value))
- {
- value = int.Parse(value).ToString("X") + "";
-
- if (valueLegnth != 0 && value.Length < valueLegnth)
- {
- int t = valueLegnth - value.Length;
- value = value.PadLeft(valueLegnth, '0');
- }
-
- if (value.Length > 2)
- {
- value = value.Substring(0, 2) + " " + value.Substring(2);
- }
- }
-
-
- if (value != null)
- //替换值到命令里
- cmd = cmd.Replace("${VAL}", value);
-
-
- if (deviceName != null)
- //替换值到命令里
- cmd = cmd.Replace("${DEVICE_NAME}", deviceName);
-
- if (text != null)
- //替换值到命令里
- cmd = cmd.Replace("${TEXT}", text);
-
-
- if (sendHex)
- {
- //替换变量到命令里
- cmd = cmdParse(cmd, dataResource, true);
-
- }
- else
- {
- cmd = cmdParse(cmd, dataResource, false);
- }
-
-
- //要发送的数据
- byte[] data = new byte[0];
-
- //如果发送回车换行
- if (sendNewLine)
- {
- cmd = cmd + "\r\n";
- }
-
- //检查是不是要加crc校验，如果要就先把占位符换出来
- bool isCrc16 = false;
- if (cmd.Contains("${CRC16}"))
- {
- isCrc16 = true;
- cmd = cmd.Replace("${CRC16}", "");
- }
-
- //去除前面和后面的空格
- cmd = cmd.Trim(' ');
-
- //如果是16进制发送
- if (sendHex)
- {
- data = ByteArrayConvert.HexStringToByteArray(cmd);
- }
- else
- {
- data = ByteArrayConvert.StringToByteArray(cmd);
- }
-
- //如果加crc16校验
- if (isCrc16)
- {
- byte[] crc16 = Modbus16Utils.GetCrc16(data);
- List l = data.ToList();
- l.AddRange(crc16);
- data = l.ToArray();
- }
- return data;
- }
- catch (Exception ex)
- {
- return Encoding.Default.GetBytes(ex.Message);
- }
- }
-
-
-
- ///
- /// 将变量代入到命令里
- ///
- ///
- ///
- public static string cmdParse(string cmd, Dictionary dataResource, bool ishex)
- {
-
- string[] keyArr = dataResource.Keys.ToArray();
-
- for (int i = 0; i < keyArr.Length; i++)
- {
-
- string key = keyArr[i];
- string value = dataResource[key]!=null ? dataResource[key].ToString(): "";
-
- //变量名称
- string vname = "${" + key + "}";
-
- //如果命令里包含变量就把值代入进去
- if (cmd.Contains(vname))
- {
- if (ishex)
- {
- cmd = cmd.Replace(vname, int.Parse(value).ToString("X"));
- }
- else
- {
- cmd = cmd.Replace(vname, value);
- }
-
- }
-
- }
-
- return cmd;
- }
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/DateTime/DateTimeUtils.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/DateTime/DateTimeUtils.cs
deleted file mode 100644
index 1470a30a7..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/DateTime/DateTimeUtils.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Wit.SDK.Utils
-{
- ///
- /// 日期工具类
- ///
- public class DateTimeUtils
- {
- ///
- /// 获取时间戳
- ///
- ///
- public static long GetTimeStamp()
- {
- TimeSpan ts = DateTime.Now - new DateTime(1970, 1, 1, 0, 0, 0, 0);
- return Convert.ToInt64(ts.TotalMilliseconds);
- }
-
- ///
- /// 日期格式化
- ///
- ///
- ///
- ///
- public static string Format(DateTime dateTime, string format) {
- return dateTime.ToString(format);
- }
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Device/AutoDelayUtils.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Device/AutoDelayUtils.cs
deleted file mode 100644
index cb7ff89ff..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Device/AutoDelayUtils.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Wit.SDK.Modular.Sensor.Device;
-using Wit.SDK.Modular.Sensor.Modular.Connector.Role;
-using Wit.SDK.Modular.Sensor.Utils;
-
-namespace Wit.SDK.Modular.Sensor.Modular.Resolver.Utils
-{
- ///
- /// 自动延时工具类
- ///
- public class AutoDelayUtils
- {
- ///
- /// 获得延迟
- ///
- ///
- ///
- ///
- public static int GetAutoDelay(int delay, DeviceModel deviceModel)
- {
- if (delay == -1)
- {
- if (deviceModel.Connector is SPConnector)
- {
- var spc = deviceModel.Connector as SPConnector;
- delay = SerialPortUtils.GetBaudAutoDelay(spc.SerialPortConfig.BaudRate);
- }
- else
- {
- delay = 100;
- }
- }
- return delay;
- }
-
- ///
- /// 获得延迟
- ///
- ///
- ///
- ///
- public static int GetModbusAutoDelay(int delay, DeviceModel deviceModel)
- {
- if (delay == -1)
- {
- if (deviceModel.Connector is SPConnector)
- {
- var spc = deviceModel.Connector as SPConnector;
- delay = SerialPortUtils.GetModbusAutoDelay(spc.SerialPortConfig.BaudRate);
- }
- else
- {
- delay = 100;
- }
- }
- return delay;
- }
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Device/DataProcessorContext.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Device/DataProcessorContext.cs
deleted file mode 100644
index 4cd952b4c..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Device/DataProcessorContext.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Wit.SDK.Modular.Sensor.Device.Entity;
-
-namespace Wit.SDK.Modular.Sensor.Modular.DataProcessor.Context
-{
- ///
- /// 数据处理器上下文
- ///
- public class DataProcessorContext
- {
- ///
- /// 自动读取间隔
- ///
- private static int _AutoReadInterval = DefaultAutoReadInterval;
-
- ///
- /// 自动读取间隔
- ///
- public static int AutoReadInterval {
- get { return (_AutoReadInterval > 0) ? _AutoReadInterval : 10; }
- set { _AutoReadInterval = value; }
- }
-
- public static int DefaultAutoReadInterval
- {
- get { return 200; }
- }
-
- ///
- /// 暂停自动读取
- ///
- public static bool AutoReadPause = false;
-
- ///
- /// 读取的命令
- ///
- public static List ReadCmdList = new List();
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Device/RecordKeySwitch.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Device/RecordKeySwitch.cs
deleted file mode 100644
index 920609ead..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Device/RecordKeySwitch.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Wit.SDK.Modular.Sensor.Device;
-using Wit.SDK.Utils;
-
-namespace Wit.SDK.Modular.Sensor.Modular.DataProcessor.Utils
-{
-
- ///
- /// 记录key值切换器
- /// 功能：自动匹配记录的key
- ///
- public class RecordKeySwitch
- {
- ///
- /// 记录触发器列表
- ///
- public List recordTriggerList = new List {};
-
- ///
- /// 字典 string:key值 long：刷新时间
- ///
- private Dictionary keyUpdateTimeDict = new Dictionary();
-
- ///
- /// 是否启用切换触发器线程
- ///
- public bool BolSwitchRecrodThEnable = false;
-
- ///
- /// 上次更新时间
- ///
- public long LastUpdateTs = 0;
-
- ///
- /// 基础设备
- ///
- public DeviceModel DeviceModel { get; private set; }
-
- ///
- /// 初始化 启动
- ///
- ///
- public void Open(DeviceModel deviceModel, List keyList)
- {
- // 设备
- this.DeviceModel = deviceModel;
- // 记录触发器列表
- this.recordTriggerList = keyList;
-
- DeviceModel.OnKeyUpdate -= DeviceModel_OnKeyUpdate;
- DeviceModel.OnKeyUpdate += DeviceModel_OnKeyUpdate;
- DeviceModel.OnListenKeyUpdate -= DeviceModel_OnListenKeyUpdate;
- DeviceModel.OnListenKeyUpdate += DeviceModel_OnListenKeyUpdate;
-
- // 创建线程
- Thread th = new Thread(SwitchKeyTh) { IsBackground = true };
- BolSwitchRecrodThEnable = true;
- th.Start();
- }
-
- ///
- /// 切换刷新用的key值
- ///
- private void SwitchKeyTh()
- {
- // 数据刷新有问题就启动线程
- while (BolSwitchRecrodThEnable) {
-
- Thread.Sleep(3000);
- // 实时时间
- var ts = DateTimeUtils.GetTimeStamp();
- if (ts - LastUpdateTs > 3000)
- {
- SwitchListenerKey();
- }
- }
- }
-
- ///
- /// 切换监听的key
- ///
- private void SwitchListenerKey()
- {
- if (recordTriggerList.Count == 0)
- {
- return;
- }
-
- // 最后切换的key值
- string keyLast = recordTriggerList[0];
- double min = 0;
- for (int i = 0; i < recordTriggerList.Count; i++)
- {
- string item = recordTriggerList[i];
- if (keyUpdateTimeDict.ContainsKey(item))
- {
- double tsVal = keyUpdateTimeDict[item];
- if (tsVal > min)
- {
- min = tsVal;
- keyLast = item;
- }
- }
- }
- // 切换监听的key值 让数据刷新继续下去
- DeviceModel.ListenerKey = keyLast;
- }
-
- ///
- /// 判断自动更新数据有无问题
- ///
- ///
- private void DeviceModel_OnListenKeyUpdate(DeviceModel deviceModel)
- {
- LastUpdateTs = DateTimeUtils.GetTimeStamp();
- }
-
- ///
- /// 记录key值刷新时对应的时间
- ///
- ///
- ///
- ///
- private void DeviceModel_OnKeyUpdate(DeviceModel deviceModel, string key, object value)
- {
- // 如果是可切换的key就赋值给字典
- if (recordTriggerList.Contains(key))
- {
- // 记录数据更新时间戳
- keyUpdateTimeDict[key] = DateTimeUtils.GetTimeStamp();
- }
- }
-
- ///
- /// 关闭所有线程
- ///
- public void Close() {
- // 关线程
- BolSwitchRecrodThEnable = false;
-
- if (DeviceModel != null && DeviceModel.IsOpen)
- {
- // 取消事件委托
- DeviceModel.OnKeyUpdate -= DeviceModel_OnKeyUpdate;
- DeviceModel.OnListenKeyUpdate -= DeviceModel_OnListenKeyUpdate;
- }
-
- }
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Device/Utils/ATCommandHelper.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Device/Utils/ATCommandHelper.cs
deleted file mode 100644
index 234b1e962..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Device/Utils/ATCommandHelper.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Wit.SDK.Modular.Sensor.Device;
-
-namespace Wit.SDK.Modular.Sensor.Utils
-{
-
- ///
- /// AT指令帮助类
- ///
- public class ATCommandHelper
- {
- ///
- /// 发送读取的命令，并且查找返回结果
- ///
- ///
- ///
- ///
- public static string SendReadCommandAndFindLine(DeviceModel deviceModel, string sendData, string[] condition, int repeat = 3)
- {
- string result = null;
- int i = 0;
- // 如果没有结果就重复指定次数
- while (++i <= repeat)
- {
- string data = SendReadCommand(deviceModel, sendData);
-
- for (int j = 0; j < condition.Length; j++)
- {
- result = FindLine(data, condition[j]);
- if (!string.IsNullOrEmpty(result))
- {
- return result;
- }
- }
-
- }
- return null;
- }
-
- ///
- /// 发送读取的命令
- ///
- ///
- ///
- public static string SendReadCommand(DeviceModel deviceModel, string sendData)
- {
- byte[] returnData;
- deviceModel.SendData(Encoding.Default.GetBytes(sendData), out returnData, true, 900, 2);
- string result = Encoding.Default.GetString(returnData);
- return result;
- }
-
- ///
- /// 查找返回结果
- ///
- ///
- ///
- ///
- public static string FindLine(string data, string condition)
- {
- string[] rows = data.Split('\r', '\n');
-
- for (int i = 0; i < rows.Length; i++)
- {
- if (rows[i].Contains(condition))
- {
- return rows[i];
- }
- }
- return null;
- }
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Device/Utils/AsciiProtocolUtils.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Device/Utils/AsciiProtocolUtils.cs
deleted file mode 100644
index e5d2409e5..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Device/Utils/AsciiProtocolUtils.cs
+++ /dev/null
@@ -1,179 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using System.Xml.Serialization;
-using Wit;
-using Wit.SDK;
-using Wit.SDK.Modular.Sensor.Utils;
-using Wit.SDK.Utils;
-
-namespace Wit.SDK.Modular.Sensor.Utils
-{
-
- ///
- /// ASCII协议解析
- ///
- public class AsciiProtocolUtils
- {
- ///
- /// 通过AsciiKeyPattern解析字符串，解析后返回key的字典和值
- ///
- /// 输入的待解析字符串
- /// 输入前必须先解析好key和pattern
- ///
- public static Dictionary ResolvesAsciiByAsciiKeyPatterns(string input, List asciiKeyPatterns)
- {
-
-
- Dictionary dic = new Dictionary();
-
- foreach (var asciiKeyPattern in asciiKeyPatterns)
- {
- dic = ResolvesAsciiByAsciiKeyPattern(input, asciiKeyPattern);
- if (dic.Keys.Count > 0)
- {
- break;
- }
- }
-
- return dic;
- }
-
- ///
- /// 通过AsciiKeyPattern解析字符串，解析后返回key的字典和值
- ///
- ///
- /// 输入的待解析字符串
- /// 输入前必须先解析好key和pattern
- ///
- public static Dictionary ResolvesAsciiByAsciiKeyPattern(string input, AsciiKeyPattern asciiKeyPattern)
- {
- Dictionary dic = new Dictionary();
- string matchs = @asciiKeyPattern.pattern + "\r\n";
- //string matchs = @asciiKeyPattern.pattern;
- input = input + "\r\n";
- MatchCollection mc = Regex.Matches(input, matchs);
-
- if (mc.Count > 0)
- {
- GroupCollection groupCollection = mc[0].Groups;
-
- for (int i = 0; i < asciiKeyPattern.keys.Length && i + 1 < groupCollection.Count; i++)
- {
-
- dic[asciiKeyPattern.keys[i]] = groupCollection[i + 1].Value;
- }
- }
-
- return dic;
- }
-
-
- ///
- /// 得到带key的表达式得到它的key和正则表达式
- ///
- ///
- /// 返回解析是否成功
- public static bool GetAsciiKeyPatternKeyAndPattern(AsciiKeyPattern asciiKeyPattern)
- {
-
- //得到key
- List list = new List();
-
- MatchCollection mc = Regex.Matches(asciiKeyPattern.keyPattern, @"\${(.*?)}");
-
- foreach (Match m in mc)
- list.Add(m.Groups[1].Value);
-
- asciiKeyPattern.keys = list.ToArray();
-
- //得到正则表达式
- asciiKeyPattern.pattern = Regex.Replace(asciiKeyPattern.keyPattern, @"\${(.*?)}", "(.*?)");
-
- return true;
- }
- }
-
-
- ///
- /// Ascii协议解析表达式
- ///
- public class AsciiKeyPattern
- {
- public AsciiKeyPattern(string keyPattern)
- {
- this.keyPattern = keyPattern;
- }
-
- public AsciiKeyPattern()
- {
- }
-
- [XmlIgnore]
- private int _sort = 0;
-
- public int sort
- {
-
- get => _sort;
- set
- {
- _sort = value;
- }
- }
-
-
- [XmlIgnore]
- private string _keyPattern = "";
-
- public string keyPattern
- {
-
- get => _keyPattern;
- set
- {
- _keyPattern = value;
-
- if (value != null)
- {
- AsciiProtocolUtils.GetAsciiKeyPatternKeyAndPattern(this);
- }
-
- }
- }
- [XmlIgnore]
- public string[] _keys = new string[0];
-
-
- public string[] keys
- {
-
- get => _keys;
- set
- {
- _keys = value;
- }
- }
-
- [XmlIgnore]
- public string _pattern = "";
-
- public string pattern
- {
-
- get => _pattern;
- set
- {
- _pattern = value;
- }
- }
-
- }
-
-
-
-
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Device/Utils/DipSensorMagHelper.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Device/Utils/DipSensorMagHelper.cs
deleted file mode 100644
index adc7739fe..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Device/Utils/DipSensorMagHelper.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Wit.SDK.Modular.Sensor.Utils
-{
-
- ///
- /// 倾角传感器磁场帮助类
- ///
- public class DipSensorMagHelper
- {
-
- ///
- /// 磁场转换标准单位uT(微特)
- ///
- public static double GetMagToUt(short reg72, double regMag)
- {
- double dRet = regMag;
- switch (reg72)
- {
- case 2:
- dRet = dRet * 0.15;
- break;
- case 3:
- dRet = dRet * 13 / 1000.0;
- break;
- case 4:
- dRet = dRet * 0.058;
- break;
- case 5:
- dRet = dRet * 0.098;
- break;
- case 6:
- dRet = dRet / 120;
- break;
- case 7:
- dRet = dRet * 20 / 1000.0;
- break;
- }
- return Math.Round(dRet, 3);
- }
-
- ///
- /// 标准单位uT(微特)转换磁场数据
- ///
- public static double GetUtToMag(short reg72, double reguTMag)
- {
- double dRet = reguTMag;
- switch (reg72)
- {
- case 2:
- dRet = dRet / 0.15;
- break;
- case 3:
- dRet = dRet * 1000.0 / 13.0 ;
- break;
- case 4:
- dRet = dRet / 0.058;
- break;
- case 5:
- dRet = dRet / 0.098;
- break;
- case 6:
- dRet = dRet * 120;
- break;
- case 7:
- dRet = dRet * 1000.0 / 20.0 ;
- break;
- }
- return dRet;
- }
-
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Device/Utils/MWT925Helper.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Device/Utils/MWT925Helper.cs
deleted file mode 100644
index 8694ffc6e..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Device/Utils/MWT925Helper.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-
-namespace Wit.SDK.Modular.Sensor.Utils
-{
- ///
- /// 9轴倾角传感器帮助类
- ///
- public class MWT925Helper
- {
- ///
- /// 解锁命令
- ///
- ///
- public static byte[] Unlock(byte addr)
- {
- return Modbus16Utils.GetWrite(addr, 0x69, 0xB588);
- }
-
- ///
- /// 加计校准
- ///
- ///
- public static byte[] AccelerationCalibration(byte addr)
- {
- return Modbus16Utils.GetWrite(addr, 0x01, 0x01);
- }
-
- ///
- /// 开始磁场校准
- ///
- ///
- public static byte[] BeginFieldCalibration(byte addr)
- {
- return Modbus16Utils.GetWrite(addr, 0x01, 0x07);
- }
-
- ///
- /// 结束磁场校准
- ///
- ///
- public static byte[] EndFieldCalibration(byte addr)
- {
- return Modbus16Utils.GetWrite(addr, 0x01, 0x00);
- }
-
- ///
- /// 波特率调整
- ///
- ///
- public static byte[] SetBaudRate(byte addr, ushort value)
- {
- return Modbus16Utils.GetWrite(addr, 0x04, value);
- }
-
- ///
- /// 设置输出内容
- ///
- ///
- ///
- public static byte[] SetBackContent(byte addr, ushort value)
- {
- return Modbus16Utils.GetWrite(addr, 0x02, value);
- }
-
- // 带宽调整
-
- // 量程调整
-
- // 滤波参数
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Device/Utils/Modbus16Utils.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Device/Utils/Modbus16Utils.cs
deleted file mode 100644
index 170ba11b0..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Device/Utils/Modbus16Utils.cs
+++ /dev/null
@@ -1,263 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Wit.SDK.Modular.Sensor.Utils
-{
- ///
- /// Modbus16工具类
- ///
- public class Modbus16Utils
- {
-
- ///
- /// 获得CRC16_Modbus效验,低位在前,高位在后
- ///
- /// 要进行计算的字节数组
- /// 计算后的数组
- public static byte[] GetCrc16(byte[] bytes)
- {
- byte crcRegister_H = 0xFF, crcRegister_L = 0xFF;// 预置一个值为 0xFFFF 的 16 位寄存器
-
- byte polynomialCode_H = 0xA0, polynomialCode_L = 0x01;// 多项式码 0xA001
-
- for (int i = 0; i < bytes.Length; i++)
- {
- crcRegister_L = (byte)(crcRegister_L ^ bytes[i]);
-
- for (int j = 0; j < 8; j++)
- {
- byte tempCRC_H = crcRegister_H;
- byte tempCRC_L = crcRegister_L;
-
- crcRegister_H = (byte)(crcRegister_H >> 1);
- crcRegister_L = (byte)(crcRegister_L >> 1);
- // 高位右移前最后 1 位应该是低位右移后的第 1 位：如果高位最后一位为 1 则低位右移后前面补 1
- if ((tempCRC_H & 0x01) == 0x01)
- {
- crcRegister_L = (byte)(crcRegister_L | 0x80);
- }
-
- if ((tempCRC_L & 0x01) == 0x01)
- {
- crcRegister_H = (byte)(crcRegister_H ^ polynomialCode_H);
- crcRegister_L = (byte)(crcRegister_L ^ polynomialCode_L);
- }
- }
- }
-
- return new byte[] { crcRegister_L, crcRegister_H };
-
- }
-
-
-
- ///
- /// 获得CRC16_Modbus效验,低位在前,高位在后
- ///
- /// 要进行计算的字节数组
- /// 长度
- /// 计算后的数组
- public static byte[] GetCrc16(byte[] byteData, int length)
- {
- byte[] CRC = new byte[2];
-
- ushort wCrc = 0xFFFF;
- for (int i = 0; i < length; i++)
- {
- wCrc ^= Convert.ToUInt16(byteData[i]);
- for (int j = 0; j < 8; j++)
- {
- if ((wCrc & 0x0001) == 1)
- {
- wCrc >>= 1;
- wCrc ^= 0xA001;//异或多项式
- }
- else
- {
- wCrc >>= 1;
- }
- }
- }
-
- CRC[1] = (byte)((wCrc & 0xFF00) >> 8);//高位在后
- CRC[0] = (byte)(wCrc & 0x00FF); //低位在前
- return CRC;
-
- }
-
- ///
- /// 获得写入的modbus指令
- ///
- ///
- ///
- ///
- ///
- /// 成功返回0
- public static int GetWrite(byte addr, int reg, int value, out byte[] resultBytes)
- {
- byte[] reghl = GetHL(reg);
- byte[] valuehl = GetHL(value);
- resultBytes = new byte[] { addr, 0x06, reghl[0], reghl[1], valuehl[0], valuehl[1] };
- resultBytes = resultBytes.Concat(GetCrc16(resultBytes)).ToArray();
- return 0;
- }
-
- ///
- /// 写入的modbus指令
- ///
- ///
- ///
- ///
- ///
- public static byte[] GetWrite(byte addr, int reg, int value)
- {
- byte[] resultBytes = null;
- GetWrite(addr, reg, value, out resultBytes);
- return resultBytes;
- }
-
-
- ///
- /// 读取的modbus指令
- ///
- ///
- ///
- ///
- ///
- /// 成功返回0
- public static int GetRead(byte addr, int reg, int count, out byte[] resultBytes)
- {
- byte[] reghl = GetHL(reg);
- byte[] counthl = GetHL(count);
- resultBytes = new byte[] { addr, 0x03, reghl[0], reghl[1], counthl[0], counthl[1] };
- resultBytes = resultBytes.Concat(GetCrc16(resultBytes)).ToArray();
- return 0;
- }
-
- ///
- /// 读取的modbus指令
- ///
- ///
- ///
- ///
- ///
- public static byte[] GetRead(byte addr, int reg, int count)
- {
- byte[] resultBytes = null;
- GetRead(addr,reg,count, out resultBytes);
- return resultBytes;
- }
-
-
- ///
- /// 获得高低位,高位在前
- ///
- ///
- ///
- public static byte[] GetHL(int value)
- {
- return new byte[] { (byte)(value >> 8), (byte)(value << 8 >> 8) };
- }
-
- ///
- /// 获得高低位,低位在前
- ///
- ///
- ///
- public static byte[] GetLH(int value)
- {
- return new byte[] { (byte)(value << 8 >> 8), (byte)(value >> 8) };
- }
-
-
- ///
- /// 检查校验位
- ///
- ///
- ///
- public static bool CheckModbusCrc16(byte[] data)
- {
-
- if (data == null)
- {
-
- return false;
- }
- if (data.Length < 3)
- {
-
- return false;
- }
-
- byte[] v = GetCrc16(data, data.Length - 2);
-
-
- if (v.Length < 2)
- {
- return false;
- }
-
- if (v[0] != data[data.Length - 2])
- {
- return false;
- }
-
- if (v[1] != data[data.Length - 1])
- {
- return false;
- }
-
- return true;
- }
-
-
-
- ///
- /// 查询返回的字节里有没有发送的命令的回传
- ///
- ///
- ///
- ///
- /// 查找成功返回true，查找失败返回false
- public static bool FindModbus(byte[] sendByte, byte[] returnByte, out byte[] modbus)
- {
-
- int height = sendByte[4];
- int low = sendByte[5];
-
- // 得到长度
- int len = 5 + (height << 8 | low) * 2;
-
- // 如果没有返回结果，或者返回结果根本不够长
- if (returnByte == null || returnByte.Length < len)
- {
- modbus = new byte[0];
- return false;
- }
-
- // 遍历返回结果查找
- for (int i = 0; i <= returnByte.Length - len; i++)
- {
-
- byte rAddr = returnByte[i];
- byte mark = 0x03;
-
- byte[] cCrc = GetCrc16(returnByte.Skip(i).Take(len - 2).ToArray());
- byte rCrcH = returnByte[i + len - 2];
- byte rCrcL = returnByte[i + len - 1];
- // 如果全部通过
- if (sendByte[0] == rAddr && mark == sendByte[1] && rCrcH == cCrc[0] && rCrcL == cCrc[1])
- {
- modbus = returnByte.Skip(i).Take(len).ToArray();
- return true;
- }
- }
-
- modbus = new byte[0];
- return false;
- }
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Device/Utils/SerialPortUtils.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Device/Utils/SerialPortUtils.cs
deleted file mode 100644
index 6f20e5d91..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Device/Utils/SerialPortUtils.cs
+++ /dev/null
@@ -1,165 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO.Ports;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Wit.SDK.Modular.Sensor.Utils
-{
-
- ///
- /// 串口开发工具类
- ///
- public class SerialPortUtils
- {
-
- ///
- /// 获取串口名称
- ///
- ///
- public static string[] GetPortNames()
- {
- return SerialPort.GetPortNames();
- }
-
- ///
- /// 获得波特率自动适配延迟
- ///
- ///
- public static int GetBaudAutoDelay(int baud)
- {
- if (baud == 0)
- {
- return 80;
- }else if (baud <= 1200)
- {
- return 1000;
- }
- else if (baud > 1200 && baud <= 2400)
- {
- return 500;
- }
- else if (baud > 2400 && baud <= 4800)
- {
- return 400;
- }
- else if (baud > 4800 && baud <= 7200)
- {
- return 250;
- }
- else if (baud > 7200 && baud <= 14400)
- {
- return 200;
- }
- else if (baud > 14400 && baud <= 19200)
- {
- return 200;
- }
- else if (baud > 19200 && baud <= 38400)
- {
- return 200;
- }
- else if (baud > 38400 && baud <= 56000)
- {
- return 200;
- }
- else if (baud > 56000 && baud <= 115200)
- {
- return 200;
- }
- else if (baud > 115200 && baud <= 230400)
- {
- return 200;
- }
- else if (baud > 230400 && baud <= 460800)
- {
- return 100;
- }
- else if (baud > 460800 && baud <= 921600)
- {
- return 100;
- }
- else if (baud > 921600)
- {
- return 100;
- }
- else
- {
- return 100;
- }
- }
-
-
- ///
- /// 获得Modbus自动适配延迟
- ///
- ///
- public static int GetModbusAutoDelay(int baud)
- {
- if (baud == 0)
- {
- return 80;
- }
- else if (baud <= 1200)
- {
- return 500;
- }
- else if (baud > 1200 && baud <= 2400)
- {
- return 300;
- }
- else if (baud > 2400 && baud <= 4800)
- {
- return 200;
- }
- else if (baud > 4800 && baud <= 7200)
- {
- return 150;
- }
- else if (baud > 7200 && baud <= 14400)
- {
- return 80;
- }
- else if (baud > 14400 && baud <= 19200)
- {
- return 70;
- }
- else if (baud > 19200 && baud <= 38400)
- {
- return 60;
- }
- else if (baud > 38400 && baud <= 56000)
- {
- return 60;
- }
- else if (baud > 56000 && baud <= 115200)
- {
- return 60;
- }
- else if (baud > 115200 && baud <= 230400)
- {
- return 60;
- }
- else if (baud > 230400 && baud <= 460800)
- {
- return 60;
- }
- else if (baud > 460800 && baud <= 921600)
- {
- return 60;
- }
- else if (baud > 921600)
- {
- return 60;
- }
- else
- {
- return 60;
- }
- }
-
-
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Device/Utils/WT925Helper.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Device/Utils/WT925Helper.cs
deleted file mode 100644
index 703c9ffce..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Device/Utils/WT925Helper.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-
-namespace Wit.SDK.Modular.Sensor.Utils
-{
- ///
- /// 9轴倾角传感器帮助类
- ///
- public class WT925Helper
- {
- ///
- /// 解锁命令
- ///
- ///
- public static byte[] Unlock()
- {
-
- return WitProtocolUtils.GetWrite(0x69, 0xB588);
- }
-
- ///
- /// 加计校准
- ///
- ///
- public static byte[] AccelerationCalibration()
- {
- return WitProtocolUtils.GetWrite(0x01, 0x01);
- }
-
- ///
- /// 开始磁场校准
- ///
- ///
- public static byte[] BeginFieldCalibration()
- {
- return WitProtocolUtils.GetWrite(0x01, 0x07);
- }
-
- ///
- /// 结束磁场校准
- ///
- ///
- public static byte[] EndFieldCalibration()
- {
- return WitProtocolUtils.GetWrite(0x01, 0x00);
- }
-
- ///
- /// 波特率调整
- ///
- ///
- public static byte[] SetBaudRate(ushort value)
- {
- return WitProtocolUtils.GetWrite(0x04, value);
- }
-
- ///
- /// 设置输出内容
- ///
- ///
- ///
- public static byte[] SetBackContent(ushort value)
- {
- return WitProtocolUtils.GetWrite(0x02, value);
- }
-
- // 带宽调整
-
- // 量程调整
-
- // 滤波参数
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Device/Utils/WitCanProtocolUtils.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Device/Utils/WitCanProtocolUtils.cs
deleted file mode 100644
index 42fcfd631..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Device/Utils/WitCanProtocolUtils.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Wit.SDK.Utils;
-
-namespace Wit.SDK.Modular.Sensor.Utils
-{
- ///
- /// 维特CAN传感器协议工具类（需要使用TTL-CAN）
- ///
- public class WitCanProtocolUtils
- {
- ///
- /// 获得帧ID
- ///
- /// 帧ID(10进制)
- /// 帧格式 0=标准 1=扩展
- /// 帧类型 0=数据 ; 1=远程
- public static int GetFrameId(int id, int frameFormat, int frmaeType)
- {
- int frameId = frameFormat == 1 ? id << 3 | 0x04 : id <<= 21;
- if (frmaeType == 1) { frameId |= 0x02; }
-
- return frameId;
- }
-
-
- #region 获得读写命令
-
- ///
- /// 获得标准数据桢写命令
- ///
- ///
- ///
- ///
- ///
- public static byte[] GetStandWrite(int canId, byte reg, short value)
- {
- // 返回结果
- List byteList = new List();
- // 数据
- byte[] dataFrame = new byte[] { 0xff, 0xaa, reg, (byte)(value), (byte)(value >> 8) };
-
- // AT（2byte）
- byteList.AddRange(Encoding.Default.GetBytes("AT"));
- // 帧ID（4byte）
- int frameId = GetFrameId(canId, 0, 0);
- byteList.AddRange(BitConverter.GetBytes(frameId));
- // 数据长度（2byte）
- byteList.AddRange(new byte[] { (byte)(dataFrame.Length >> 8), (byte)(dataFrame.Length) });
- // 帧数据
- byteList.AddRange(dataFrame);
- // 回车换行（2byte）
- byteList.AddRange(Encoding.Default.GetBytes("\r\n"));
- return byteList.ToArray();
- }
-
-
-
- ///
- /// 获得标准数据桢读命令
- ///
- ///
- ///
- ///
- ///
- public static byte[] GetStandRead(int canId, byte reg)
- {
- // 返回结果
- List byteList = new List();
- // 数据
- byte[] dataFrame = new byte[] { 0xff, 0xaa, 0x27, reg, 00 };
-
- // AT（2byte）
- byteList.AddRange(Encoding.Default.GetBytes("AT"));
- // 帧ID（4byte）
- int frameId = GetFrameId(canId, 0, 0);
- byteList.AddRange(BitConverter.GetBytes(frameId));
- // 数据长度（2byte）
- byteList.AddRange(new byte[] { (byte)(dataFrame.Length >> 8),(byte)(dataFrame.Length) });
- // 帧数据
- byteList.AddRange(dataFrame);
- // 回车换行（2byte）
- byteList.AddRange(Encoding.Default.GetBytes("\r\n"));
- return byteList.ToArray();
- }
-
- #endregion
-
-
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Device/Utils/WitProtocolUtils.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Device/Utils/WitProtocolUtils.cs
deleted file mode 100644
index 34c290c4b..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Device/Utils/WitProtocolUtils.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Wit.SDK.Utils;
-
-namespace Wit.SDK.Modular.Sensor.Utils
-{
- ///
- /// 维特协议工具类
- ///
- public class WitProtocolUtils
- {
- #region SUM和校验
- ///
- /// 获取SUM和校验结果
- ///
- ///
- ///
- public static byte ToSUM(byte[] data)
- {
- int sum = 0;
- for (int i = 0; i < data.Length; i++)
- {
- sum = sum + data[i];
- }
- //实际上num 这里已经是结果了，如果只是取int 可以直接返回了
- return (byte)sum;
- }
-
-
- ///
- /// 校验数据包和校验
- ///
- ///
- ///
- public static bool CheckSUM(byte[] dataPack)
- {
- if (dataPack == null || dataPack.Length < 2)
- {
- return false;
- }
-
- int sum = 0;
- for (int i = 0; i < dataPack.Length - 1; i++)
- {
- sum = sum + dataPack[i];
- }
- //实际上num 这里已经是结果了，如果只是取int 可以直接返回了
- byte check = (byte)sum;
-
-
- //如果最后一个字节等于校验和就是通过
- if (dataPack[dataPack.Length - 1] == check)
- {
- return true;
- }
-
- return false;
- }
-
- ///
- /// 校验数据包和校验
- ///
- /// 一包16进制字符串数据
- ///
- public static bool CheckPackSUM(string hexPackData)
- {
- byte[] packData = ByteArrayConvert.HexStringToByteArray(hexPackData);
- return CheckSUM(packData);
- }
-
- #endregion
-
- ///
- /// 获得读取的命令
- /// 功能：传入寄存器获得,读取寄存器的命令
- ///
- /// 寄存器
- ///
- public static byte[] GetRead(int reg)
- {
- return new byte[] { 0xff,0xaa,0x27,(byte)reg, 0x00};
- }
-
-
- ///
- /// 获得写入的命令
- /// 功能：传入寄存器和值,得到写入寄存器的命令
- ///
- /// 寄存器
- /// 值
- ///
- public static byte[] GetWrite(int reg, ushort value)
- {
- byte[] vs = new byte[] { 0xff, 0xaa, (byte)reg, (byte)value, (byte)(value >> 8) };
- return new byte[] { 0xff, 0xaa, (byte)reg, (byte)value, (byte)(value>>8) };
- }
-
- ///
- /// 查找返回的数据
- /// 功能:从传感器返回的数据里找到第一包55 5F开头的数据包
- ///
- /// 设备返回的数据
- /// 成功返回55 5f数据包,失败返回null
- public static byte[] FindReturnData(byte[] returnData)
- {
- byte[] tempArr = new byte[0];
-
- for (int i = 0; i < returnData.Length; i++)
- {
- tempArr = returnData.Skip(i).Take(11).ToArray(); ;
-
- if (tempArr.Length == 11 && tempArr[0] == 0x55 && tempArr[1] == 0x5F && CheckSUM(tempArr))
- {
- return tempArr;
-
- }
- }
- return null;
- }
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Device/Utils/WitSensorHelper.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Device/Utils/WitSensorHelper.cs
deleted file mode 100644
index c2ae3a99f..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Device/Utils/WitSensorHelper.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Wit.SDK.Modular.Sensor.Device;
-using Wit.SDK.Modular.Sensor.Modular.ProtocolResolver.Enum;
-
-namespace Wit.SDK.Modular.Sensor.Utils
-{
-
- ///
- /// 维特智能传感器帮助类
- ///
- public class WitSensorHelper
- {
- ///
- /// 读寄存器
- ///
- ///
- public static void ReadReg(DeviceModel device, WitSensorProtocol sensorPotocol, int reg)
- {
- byte[] sendBytes = new byte[0];
- if (sensorPotocol == WitSensorProtocol.Modbus16Protocol)
- {
- sendBytes = Modbus16Utils.GetRead(byte.Parse(device.GetAddr()), reg, 4);
- }
- else
- {
- sendBytes = new byte[] { 0xff, 0xaa, 0x27, (byte)reg, 0 };
- }
-
- device.ReadData(sendBytes);
- }
-
- ///
- /// 写寄存器
- ///
- ///
- public static void WriteReg(DeviceModel device, WitSensorProtocol sensorPotocol, int reg, ushort value)
- {
- byte[] sendBytes = new byte[8];
- if (sensorPotocol == WitSensorProtocol.Modbus16Protocol)
- {
- sendBytes = Modbus16Utils.GetWrite(byte.Parse(device.GetAddr()), reg, value);
- }
- else
- {
- sendBytes = WitProtocolUtils.GetWrite(reg, value);
- }
-
- device.ReadData(sendBytes, 20);
- }
-
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Gps/GpsUtils.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Gps/GpsUtils.cs
deleted file mode 100644
index 6fb49bf16..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/WitSdk/Tools/Gps/GpsUtils.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-///
-/// GPS工具类
-///
-namespace Wit.SDK.Utils
-{
- public class GpsUtils
- {
- ///
- /// 经纬度度分秒转换为度 选定保留小数
- ///
- public static double DmsToD(double value, int digits)
- {
- //度
- double Degree = Math.Floor(value / 100);
- //分
- double points = (value / 100 - Degree) * 100;
- Degree = Degree + points / 60;
-
- return Math.Round(Degree, digits);
- }
-
- ///
- /// 经纬度度分秒转换为度
- ///
- public static double DmsToD(double value)
- {
- return DmsToD(value,7);
- }
-
- ///
- ///经纬度 度转换为度分
- ///
- public static double DToDms(double value)
- {
- //度
- double Degree = Math.Floor(value);
- //分
- double points = (value - Degree) * 60.0;
- Degree = Degree * 100 + points;
-
- return Math.Round(Degree, 7);
- }
-
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/Wt901c/Components/Modbus16Resolver.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/Wt901c/Components/Modbus16Resolver.cs
deleted file mode 100644
index 1ba410192..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/Wt901c/Components/Modbus16Resolver.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Linq;
-using Wit.SDK.Device.Device.Device.DKey;
-using Wit.SDK.Modular.Sensor.Device;
-using Wit.SDK.Modular.Sensor.Modular.ProtocolResolver.Interface;
-using Wit.SDK.Modular.Sensor.Modular.Resolver.Utils;
-using Wit.SDK.Modular.Sensor.Utils;
-using Wit.SDK.Utils;
-
-namespace Wit.SDK.Modular.Sensor.Modular.ProtocolResolver.Roles
-{
- ///
- /// Resolvedor de Protocolo ModbusCRC16
- ///
- public class Modbus16Resolver : IProtocolResolver
- {
- ///
- /// Analisa os dados retornados ativamente
- ///
- ///
- ///
- public override void OnReceiveData(DeviceModel baseDevice, byte[] data)
- {
-
- }
-
- ///
- /// Envia dados
- ///
- ///
- ///
- public override void OnReadData(DeviceModel deviceModel, byte[] sendData, int delay = -1)
- {
- try
- {
- delay = AutoDelayUtils.GetModbusAutoDelay(delay, deviceModel);
-
- byte[] returnData;
-
- // Envia dados
- deviceModel.SendData(sendData, out returnData, true, delay);
-
- // Se os dados retornados estiverem corretos
- byte[] modbusBytes;
- if (sendData != null && returnData != null && returnData.Length >= 7
- && Modbus16Utils.FindModbus(sendData, returnData, out modbusBytes))
- {
- int readReg = sendData[2] << 8 | sendData[3];
- byte[] regData = modbusBytes.Skip(3).Take(modbusBytes.Length - 5).ToArray();
-
- for (int j = 0; regData != null &&
- j < regData.Length - 1; j += 2)
- {
- string key = string.Format("{0:X2}", readReg++);
- short value = (short)(regData[j] << 8 | regData[j + 1]);
- deviceModel.SetDeviceData(new ShortKey(key), value);
- }
- }
- else
- {
- if (returnData != null && returnData.Length > 0)
- {
- Debug.WriteLine("Erro na verificação dos dados");
- Debug.WriteLine(ByteArrayConvert.ByteArrayToHexString(returnData));
- }
- }
- }
- catch (Exception ex)
- {
- Console.WriteLine("Erro: " + ex.Message);
- }
- }
- }
-}
\ No newline at end of file
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/Wt901c/Components/WT901C485Processor.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/Wt901c/Components/WT901C485Processor.cs
deleted file mode 100644
index 6c85e886d..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/Wt901c/Components/WT901C485Processor.cs
+++ /dev/null
@@ -1,427 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using Wit.SDK.Device.Device.Device.DKey;
-using Wit.SDK.Modular.Sensor.Device;
-using Wit.SDK.Modular.Sensor.Device.Entity;
-using Wit.SDK.Modular.Sensor.Modular.DataProcessor.Constant;
-using Wit.SDK.Modular.Sensor.Modular.DataProcessor.Context;
-using Wit.SDK.Modular.Sensor.Modular.DataProcessor.Interface;
-using Wit.SDK.Modular.Sensor.Modular.DataProcessor.Utils;
-using Wit.SDK.Modular.Sensor.Utils;
-using Wit.SDK.Utils;
-
-namespace Wit.SDK.Modular.Sensor.Modular.DataProcessor.Role
-{
- ///
- /// WT901C485数据处理器
- ///
- public class WT901C485Processor : IDataProcessor
- {
- ///
- /// 设备模型
- ///
- public DeviceModel DeviceModel { get; private set; }
-
- ///
- /// 控制读取数据线程是否运行
- ///
- bool ReadDataThreadRuning = false;
-
- ///
- /// 记录key值切换器
- ///
- private RecordKeySwitch RecordKeySwitch = new RecordKeySwitch();
-
- ///
- /// 数据刷新的key值
- ///
- List UpdateKeys = new List() {};
-
- ///
- /// 当传感器打开时
- ///
- ///
- public override void OnOpen(DeviceModel deviceModel)
- {
- for (int i = 0x30; i < 0x30 + 0x30; i++)
- {
- UpdateKeys.Add(string.Format("{0:X2}", i));
- }
- // 传入刷新数据的key值
- RecordKeySwitch.Open(deviceModel, UpdateKeys);
-
- this.DeviceModel = deviceModel;
- Thread thread = new Thread(ReadDataThread) { IsBackground = true };
- ReadDataThreadRuning = true;
- thread.Start();
- }
-
- ///
- /// 自动读取线程
- ///
- private void ReadDataThread()
- {
-
- while (ReadDataThreadRuning) {
-
- try
- {
- // 暂停读取
- while (DataProcessorContext.AutoReadPause) { Thread.Sleep(1000); }
-
- //// 发送读取命令
- //DeviceModel.SendProtocolData(
- // Modbus16Utils.GetRead(byte.Parse(DeviceModel.GetDeviceData("ADDR")), 0x30, 0x30),
- // DataProcessorContext.AutoReadInterval);
-
- for (int i = 0; i < DataProcessorContext.ReadCmdList.Count; i++)
- {
- CmdBean cmdBean = DataProcessorContext.ReadCmdList[i];
- byte[] cmd = CmdUtils.GenerationCmd(cmdBean.sendData, cmdBean.sendHex, cmdBean.sendNewLine, DeviceModel.DeviceData);
- // 发送读取命令
- DeviceModel.ReadData(cmd, DataProcessorContext.AutoReadInterval);
- }
-
- // 读取版本号寄存器
- ReadVersionNumberReg(DeviceModel);
- // 读取磁场类型寄存器
- ReadMagType(DeviceModel);
- // 读取序列号寄存器
- ReadSerialNumberReg(DeviceModel);
- }
- catch (Exception e)
- {
- Debug.WriteLine("自动读取失败：" + e.Message);
- }
- }
- // throw new NotImplementedException();
- }
-
- ///
- /// 读取版本号寄存器
- ///
- ///
- private void ReadVersionNumberReg(DeviceModel deviceModel)
- {
- // 读版本号
- if (deviceModel.GetDeviceData("2E") == null)
- {
- // 读版本号
- deviceModel.ReadData(Modbus16Utils.GetRead(byte.Parse(deviceModel.GetDeviceData("ADDR")), 0x2e, 2));
- Thread.Sleep(20);
- }
- }
-
- ///
- /// 读取序列号寄存器
- ///
- ///
- private void ReadSerialNumberReg(DeviceModel deviceModel)
- {
- // 读序列号
- if (deviceModel.GetDeviceData("7F") == null && deviceModel.GetDeviceData("82") == null)
- {
- // 读序列号
- deviceModel.ReadData(Modbus16Utils.GetRead(byte.Parse(deviceModel.GetDeviceData("ADDR")), 0x7F, 3));
- deviceModel.ReadData(Modbus16Utils.GetRead(byte.Parse(deviceModel.GetDeviceData("ADDR")), 0x7F + 3, 3));
- }
- }
-
- ///
- /// 当传感器关闭时
- ///
- public override void OnClose(DeviceModel deviceModel)
- {
- ReadDataThreadRuning = false;
- }
-
- ///
- /// 当触发数据更新时
- ///
- ///
- public override void OnUpdate(DeviceModel deviceModel)
- {
- // 版本号
- var reg2e = deviceModel.GetDeviceData("2E");// 版本号
- var reg2f = deviceModel.GetDeviceData("2F");// 版本号
-
- // 如果有版本号
- if (string.IsNullOrEmpty(reg2e) == false &&
- string.IsNullOrEmpty(reg2f) == false)
- {
- var reg2eValue = (ushort)short.Parse(reg2e);
- var vbytes = BitConverter.GetBytes((ushort)short.Parse(reg2e)).Concat(BitConverter.GetBytes((ushort)short.Parse(reg2f))).ToArray();
- UInt32 tempVerSion = BitConverter.ToUInt32(vbytes, 0);
- string sbinary = Convert.ToString(tempVerSion, 2);
- sbinary = ("").PadLeft((32 - sbinary.Length), '0') + sbinary;
- if (sbinary.StartsWith("1"))//新版本号
- {
- string tempNewVS = Convert.ToUInt32(sbinary.Substring(4 - 3, 14 + 3), 2).ToString();
- tempNewVS += "." + Convert.ToUInt32(sbinary.Substring(18, 6), 2);
- tempNewVS += "." + Convert.ToUInt32(sbinary.Substring(24), 2);
- deviceModel.SetDeviceData(WitSensorKey.VersionNumber, tempNewVS);
- }
- else
- {
- deviceModel.SetDeviceData(WitSensorKey.VersionNumber, reg2eValue.ToString());
- }
- }
-
- // 序列号
- var reg7f = deviceModel.GetDeviceData("7F");// 序列号
- var reg80 = deviceModel.GetDeviceData("80");// 序列号
- var reg81 = deviceModel.GetDeviceData("81");// 序列号
- var reg82 = deviceModel.GetDeviceData("82");// 序列号
- var reg83 = deviceModel.GetDeviceData("83");// 序列号
- var reg84 = deviceModel.GetDeviceData("84");// 序列号
- if (string.IsNullOrEmpty(reg7f) == false &&
- string.IsNullOrEmpty(reg80) == false &&
- string.IsNullOrEmpty(reg81) == false &&
- string.IsNullOrEmpty(reg82) == false &&
- string.IsNullOrEmpty(reg83) == false &&
- string.IsNullOrEmpty(reg84) == false)
- {
- var sbytes = BitConverter.GetBytes(short.Parse(reg7f))
- .Concat(BitConverter.GetBytes(short.Parse(reg80)))
- .Concat(BitConverter.GetBytes(short.Parse(reg81)))
- .Concat(BitConverter.GetBytes(short.Parse(reg82)))
- .Concat(BitConverter.GetBytes(short.Parse(reg83)))
- .Concat(BitConverter.GetBytes(short.Parse(reg84)))
- .ToArray();
- string sn = Encoding.Default.GetString(sbytes);
- deviceModel.SetDeviceData(WitSensorKey.SerialNumber, sn);
- }
-
-
- // 30代表传感器回传的30寄存器数据,其它的同理
- var reg30 = deviceModel.GetDeviceData("30");// 年月
- var reg31 = deviceModel.GetDeviceData("31");// 日时
- var reg32 = deviceModel.GetDeviceData("32");// 分秒
- var reg33 = deviceModel.GetDeviceData("33");// 毫秒
- // 如果回传了时间数据包就解算时间
- if (!string.IsNullOrEmpty(reg30) &&
- !string.IsNullOrEmpty(reg31) &&
- !string.IsNullOrEmpty(reg32) &&
- !string.IsNullOrEmpty(reg33)
- )
- {
- // 解算数据,并且保存到设备数据里
- var yy = 2000 + (byte)int.Parse(reg30);
- var MM = (byte)(int.Parse(reg30) >> 8);
- var dd = (byte)int.Parse(reg31);
- var hh = (byte)(int.Parse(reg31) >> 8);
- var mm = (byte)int.Parse(reg32);
- var ss = (byte)(int.Parse(reg32) >> 8);
- var ms = int.Parse(reg33).ToString("000");
-
-
- deviceModel.SetDeviceData(WitSensorKey.ChipTime, $"{yy}-{MM}-{dd} {hh}:{mm}:{ss}.{ms}");
- }
-
-
- var reg34 = deviceModel.GetDeviceData("34");// 加速度X
- var reg35 = deviceModel.GetDeviceData("35");// 加速度X
- var reg36 = deviceModel.GetDeviceData("36");// 加速度X
- // 如果回传了加速度数据包
- if (!string.IsNullOrEmpty(reg34) &&
- !string.IsNullOrEmpty(reg35) &&
- !string.IsNullOrEmpty(reg36)
- )
- {
- // 解算数据,并且保存到设备数据里
- deviceModel.SetDeviceData(WitSensorKey.AccX, Math.Round(double.Parse(reg34) / 32768.0 * 16,3));
- deviceModel.SetDeviceData(WitSensorKey.AccY, Math.Round(double.Parse(reg35) / 32768.0 * 16,3));
- deviceModel.SetDeviceData(WitSensorKey.AccZ, Math.Round(double.Parse(reg36) / 32768.0 * 16,3));
- }
-
- var reg37 = deviceModel.GetDeviceData("37");// 角速度X
- var reg38 = deviceModel.GetDeviceData("38");// 角速度Y
- var reg39 = deviceModel.GetDeviceData("39");// 角速度Z
- // 如果回传了角速度数据包
- if (!string.IsNullOrEmpty(reg37) &&
- !string.IsNullOrEmpty(reg38) &&
- !string.IsNullOrEmpty(reg39)
- )
- {
- // 解算数据,并且保存到设备数据里
- deviceModel.SetDeviceData(WitSensorKey.AsX, Math.Round(double.Parse(reg37) / 32768.0 * 2000,3));
- deviceModel.SetDeviceData(WitSensorKey.AsY, Math.Round(double.Parse(reg38) / 32768.0 * 2000,3));
- deviceModel.SetDeviceData(WitSensorKey.AsZ, Math.Round(double.Parse(reg39) / 32768.0 * 2000,3));
- }
-
- var reg3D = deviceModel.GetDeviceData("3D");// 角度X
- var reg3E = deviceModel.GetDeviceData("3E");// 角度Y
- var reg3F = deviceModel.GetDeviceData("3F");// 角度Z
- // 如果回传了角度数据包
- if (!string.IsNullOrEmpty(reg3D) &&
- !string.IsNullOrEmpty(reg3E) &&
- !string.IsNullOrEmpty(reg3F)
- )
- {
- // 解算数据,并且保存到设备数据里
- deviceModel.SetDeviceData(WitSensorKey.AngleX, Math.Round(double.Parse(reg3D) / 32768.0 * 180,3));
- deviceModel.SetDeviceData(WitSensorKey.AngleY, Math.Round(double.Parse(reg3E) / 32768.0 * 180,3));
- deviceModel.SetDeviceData(WitSensorKey.AngleZ, Math.Round(double.Parse(reg3F) / 32768.0 * 180,3));
- }
-
- var reg3A = deviceModel.GetDeviceData("3A");// 磁场X
- var reg3B = deviceModel.GetDeviceData("3B");// 磁场Y
- var reg3C = deviceModel.GetDeviceData("3C");// 磁场Z
- var magType = deviceModel.GetDeviceData("72");// 磁场类型
-
- // 如果回传了磁场数据包
- if (!string.IsNullOrEmpty(reg3A) &&
- !string.IsNullOrEmpty(reg3B) &&
- !string.IsNullOrEmpty(reg3C) &&
- !string.IsNullOrEmpty(magType)
- )
- {
- short type = short.Parse(magType);
- // 解算数据,并且保存到设备数据里
- deviceModel.SetDeviceData(WitSensorKey.HX, DipSensorMagHelper.GetMagToUt(type, double.Parse(reg3A)));
- deviceModel.SetDeviceData(WitSensorKey.HY, DipSensorMagHelper.GetMagToUt(type, double.Parse(reg3B)));
- deviceModel.SetDeviceData(WitSensorKey.HZ, DipSensorMagHelper.GetMagToUt(type, double.Parse(reg3C)));
- deviceModel.SetDeviceData(WitSensorKey.HM, Math.Round(Math.Sqrt(Math.Pow(DipSensorMagHelper.GetMagToUt(type, double.Parse(reg3A)), 2) +
- Math.Pow(DipSensorMagHelper.GetMagToUt(type, double.Parse(reg3B)), 2) +
- Math.Pow(DipSensorMagHelper.GetMagToUt(type, double.Parse(reg3C)), 2)), 2));
- }
-
- var reg40 = deviceModel.GetDeviceData("40");// 温度
- // 如果回传了温度数据包
- if (!string.IsNullOrEmpty(reg40))
- {
- deviceModel.SetDeviceData(WitSensorKey.T, Math.Round(double.Parse(reg40) / 100.0, 2));
- }
-
- var reg41 = deviceModel.GetDeviceData(new ShortKey("41"));// 端口0
- var reg42 = deviceModel.GetDeviceData(new ShortKey("42"));// 端口1
- var reg43 = deviceModel.GetDeviceData(new ShortKey("43"));// 端口2
- var reg44 = deviceModel.GetDeviceData(new ShortKey("44"));// 端口3
- // 如果回传了端口状态数据包
- if (reg41 != null &&
- reg42 != null &&
- reg43 != null &&
- reg44 != null
- )
- {
- deviceModel.SetDeviceData(WitSensorKey.D0, (short)reg41);
- deviceModel.SetDeviceData(WitSensorKey.D1, (short)reg42);
- deviceModel.SetDeviceData(WitSensorKey.D2, (short)reg43);
- deviceModel.SetDeviceData(WitSensorKey.D3, (short)reg44);
- }
-
- var reg45 = deviceModel.GetDeviceData("45");// 气压低位
- var reg46 = deviceModel.GetDeviceData("46");// 气压高位
- var reg47 = deviceModel.GetDeviceData("47");// 高度低位
- var reg48 = deviceModel.GetDeviceData("48");// 高度高位
- // 如果回传了气压高度数据包
- if (!string.IsNullOrEmpty(reg45) &&
- !string.IsNullOrEmpty(reg46) &&
- !string.IsNullOrEmpty(reg47) &&
- !string.IsNullOrEmpty(reg48)
- ) {
-
- var pbytes = BitConverter.GetBytes(short.Parse(reg45)).Concat(BitConverter.GetBytes(short.Parse(reg46))).ToArray();
- var hbytes = BitConverter.GetBytes(short.Parse(reg47)).Concat(BitConverter.GetBytes(short.Parse(reg48))).ToArray();
- deviceModel.SetDeviceData(WitSensorKey.P, BitConverter.ToInt32(pbytes, 0));
- deviceModel.SetDeviceData(WitSensorKey.H, (BitConverter.ToInt32(hbytes, 0) / 100.0));
- }
-
-
- var reg49 = deviceModel.GetDeviceData("49");// 经度低位
- var reg4A = deviceModel.GetDeviceData("4A");// 经度高位
- var reg4B = deviceModel.GetDeviceData("4B");// 纬度低位
- var reg4C = deviceModel.GetDeviceData("4C");// 纬度高位
- // 如果有经纬度输出
- if (!string.IsNullOrEmpty(reg49) &&
- !string.IsNullOrEmpty(reg4A) &&
- !string.IsNullOrEmpty(reg4B) &&
- !string.IsNullOrEmpty(reg48)
- )
- {
- var lonbytes = BitConverter.GetBytes(short.Parse(reg49)).Concat(BitConverter.GetBytes(short.Parse(reg4A))).ToArray();
- var lon = BitConverter.ToInt32(lonbytes, 0);
- var latbytes = BitConverter.GetBytes(short.Parse(reg4B)).Concat(BitConverter.GetBytes(short.Parse(reg4C))).ToArray();
- var lat = BitConverter.ToInt32(latbytes, 0);
-
- double lon_D = GpsUtils.DmsToD((double)lon / 100000.0);
- deviceModel.SetDeviceData(WitSensorKey.Lon, $"{lon_D}°");
- deviceModel.SetDeviceData(WitSensorKey.LonDeg, Math.Round(lon_D,6));
- double lat_D = GpsUtils.DmsToD((double)lat / 100000.0);
- deviceModel.SetDeviceData(WitSensorKey.Lat, $"{lat_D}°");
- deviceModel.SetDeviceData(WitSensorKey.LatDeg, Math.Round(lat_D,6));
- }
-
- var reg4D = deviceModel.GetDeviceData("4D");// GPS高度
- var reg4E = deviceModel.GetDeviceData("4E");// GPS航向
- var reg4F = deviceModel.GetDeviceData("4F");// 地速低位
- var reg50 = deviceModel.GetDeviceData("50");// 地速高位
- // 如果有地速包输出
- if (!string.IsNullOrEmpty(reg4D) &&
- !string.IsNullOrEmpty(reg4E) &&
- !string.IsNullOrEmpty(reg4F) &&
- !string.IsNullOrEmpty(reg50)
- ) {
- var svbytes = BitConverter.GetBytes(short.Parse(reg4F)).Concat(BitConverter.GetBytes(short.Parse(reg50))).ToArray();
-
- deviceModel.SetDeviceData(WitSensorKey.GPSHeight, Math.Round(short.Parse(reg4D)/ 10.0,3));
- byte[] temp = BitConverter.GetBytes(short.Parse(reg4E)); // 航向解算不要负数
- uint reg4EValue = BitConverter.ToUInt16(temp, 0);
- deviceModel.SetDeviceData(WitSensorKey.GPSYaw, Math.Round(reg4EValue / 100.0,3));
- deviceModel.SetDeviceData(WitSensorKey.GPSV, Math.Round(BitConverter.ToInt32(svbytes, 0) / 1e3,3));
- }
-
- var reg51 = deviceModel.GetDeviceData("51");// 四元数0
- var reg52 = deviceModel.GetDeviceData("52");// 四元数1
- var reg53 = deviceModel.GetDeviceData("53");// 四元数2
- var reg54 = deviceModel.GetDeviceData("54");// 四元数3
- // 如果有四元数输出
- if (!string.IsNullOrEmpty(reg51) &&
- !string.IsNullOrEmpty(reg52) &&
- !string.IsNullOrEmpty(reg53) &&
- !string.IsNullOrEmpty(reg54)
- )
- {
- deviceModel.SetDeviceData(WitSensorKey.Q0, Math.Round(short.Parse(reg51) / 32768.0,3));
- deviceModel.SetDeviceData(WitSensorKey.Q1, Math.Round(short.Parse(reg52) / 32768.0,3));
- deviceModel.SetDeviceData(WitSensorKey.Q2, Math.Round(short.Parse(reg53) / 32768.0,3));
- deviceModel.SetDeviceData(WitSensorKey.Q3, Math.Round(short.Parse(reg54) / 32768.0,3));
- }
-
- var reg55 = deviceModel.GetDeviceData("55");// 卫星数
- var reg56 = deviceModel.GetDeviceData("56");// 位置精度
- var reg57 = deviceModel.GetDeviceData("57");// 位置精度
- var reg58 = deviceModel.GetDeviceData("58");// 位置精度
-
- // 如果有位置精度输出
- if (!string.IsNullOrEmpty(reg55) &&
- !string.IsNullOrEmpty(reg56) &&
- !string.IsNullOrEmpty(reg57) &&
- !string.IsNullOrEmpty(reg58)
- )
- {
- deviceModel.SetDeviceData(WitSensorKey.SN, short.Parse(reg55));
- deviceModel.SetDeviceData(WitSensorKey.PDOP, Math.Round(short.Parse(reg56) / 100.0,3));
- deviceModel.SetDeviceData(WitSensorKey.HDOP, Math.Round(short.Parse(reg57) / 100.0,3));
- deviceModel.SetDeviceData(WitSensorKey.VDOP, Math.Round(short.Parse(reg58) / 100.0,3));
- }
- }
-
- ///
- /// 读取磁场类型寄存器
- ///
- private void ReadMagType(DeviceModel deviceModel) {
- // 读版本号
- if (deviceModel.GetDeviceData("72") == null)
- {
- // 读取72磁场类型寄存器,后面解析磁场的时候要用到（读三次避免读不上）
- deviceModel.ReadData(Modbus16Utils.GetRead(byte.Parse(deviceModel.GetDeviceData("ADDR")), 0x72, 1));
- Thread.Sleep(20);
- }
- }
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/Wt901c/Data/WitSensorKey.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/Wt901c/Data/WitSensorKey.cs
deleted file mode 100644
index df5a884e8..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/Wt901c/Data/WitSensorKey.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Wit.SDK.Device.Device.Device.DKey;
-
-namespace Wit.SDK.Modular.Sensor.Modular.DataProcessor.Constant
-{
- ///
- /// Constantes padrão de chave do sensor de inclinação
- ///
- public static class WitSensorKey
- {
- // Tempo do chip
- public static StringKey ChipTime { get; } = new StringKey("ChipTime");
-
- // Aceleração X
- public static DoubleKey AccX { get; } = new DoubleKey("AccX");
-
- // Aceleração Y
- public static DoubleKey AccY { get; } = new DoubleKey("AccY");
-
- // Aceleração Z
- public static DoubleKey AccZ { get; } = new DoubleKey("AccZ");
-
- // Soma vetorial da aceleração
- public static DoubleKey AccM { get; } = new DoubleKey("AccM");
-
- // Velocidade angular X
- public static DoubleKey AsX { get; } = new DoubleKey("AsX");
-
- // Velocidade angular Y
- public static DoubleKey AsY { get; } = new DoubleKey("AsY");
-
- // Velocidade angular Z
- public static DoubleKey AsZ { get; } = new DoubleKey("AsZ");
-
- // Soma vetorial da velocidade angular Z
- public static DoubleKey AsM { get; } = new DoubleKey("AsM");
-
- // Ângulo X
- public static DoubleKey AngleX { get; } = new DoubleKey("AngleX");
-
- // Ângulo Y
- public static DoubleKey AngleY { get; } = new DoubleKey("AngleY");
-
- // Ângulo Z
- public static DoubleKey AngleZ { get; } = new DoubleKey("AngleZ");
-
- // Campo magnético X
- public static DoubleKey HX { get; } = new DoubleKey("HX");
-
- // Campo magnético Y
- public static DoubleKey HY { get; } = new DoubleKey("HY");
-
- // Campo magnético Z
- public static DoubleKey HZ { get; } = new DoubleKey("HZ");
-
- // Soma vetorial do campo magnético
- public static DoubleKey HM { get; } = new DoubleKey("HM");
-
- // Temperatura
- public static DoubleKey T { get; } = new DoubleKey("T");
-
- // Porta de expansão 1
- public static ShortKey D0 { get; } = new ShortKey("D0");
-
- // Porta de expansão 2
- public static ShortKey D1 { get; } = new ShortKey("D1");
-
- // Porta de expansão 3
- public static ShortKey D2 { get; } = new ShortKey("D2");
-
- // Porta de expansão 4
- public static ShortKey D3 { get; } = new ShortKey("D3");
-
- // Pressão
- public static DoubleKey P { get; } = new DoubleKey("P");
-
- // Altura
- public static DoubleKey H { get; } = new DoubleKey("H");
-
- // Longitude
- public static StringKey Lon { get; } = new StringKey("Lon");
-
- // Representação em graus da longitude
- public static DoubleKey LonDeg { get; } = new DoubleKey("LonDeg");
-
- // Latitude
- public static StringKey Lat { get; } = new StringKey("Lat");
-
- // Representação em graus da latitude
- public static DoubleKey LatDeg { get; } = new DoubleKey("LatDeg");
-
- ///
- /// Status do GPS
- ///
- public static DoubleKey GPSStatus { get; } = new DoubleKey("GPSStatus");
-
- // Altura do GPS
- public static DoubleKey GPSHeight { get; } = new DoubleKey("GPSHeight");
-
- // Direção do GPS
- public static DoubleKey GPSYaw { get; } = new DoubleKey("GPSYaw");
-
- // Velocidade do GPS
- public static DoubleKey GPSV { get; } = new DoubleKey("GPSV");
-
- // Quaternio 0
- public static DoubleKey Q0 { get; } = new DoubleKey("Q0");
-
- // Quaternio 1
- public static DoubleKey Q1 { get; } = new DoubleKey("Q1");
-
- // Quaternio 2
- public static DoubleKey Q2 { get; } = new DoubleKey("Q2");
-
- // Quaternio 3
- public static DoubleKey Q3 { get; } = new DoubleKey("Q3");
-
- // Número de satélites
- public static IntKey SN { get; } = new IntKey("SN");
-
- // Precisão da localização
- public static DoubleKey PDOP { get; } = new DoubleKey("PDOP");
-
- // Precisão da localização horizontal
- public static DoubleKey HDOP { get; } = new DoubleKey("HDOP");
-
- // Precisão da localização vertical
- public static DoubleKey VDOP { get; } = new DoubleKey("VDOP");
-
- // Número da versão
- public static StringKey VersionNumber { get; } = new StringKey("VersionNumber");
-
- // Número de série
- public static StringKey SerialNumber { get; } = new StringKey("SerialNumber");
-
- // Percentual de energia
- public static DoubleKey PowerPercent { get; } = new DoubleKey("PowerPercent");
- }
-}
diff --git a/AgroBase/AgroBase/Models/Modules/WT901C485/Wt901c/WT901C485.cs b/AgroBase/AgroBase/Models/Modules/WT901C485/Wt901c/WT901C485.cs
deleted file mode 100644
index 1d0b1eb48..000000000
--- a/AgroBase/AgroBase/Models/Modules/WT901C485/Wt901c/WT901C485.cs
+++ /dev/null
@@ -1,337 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using Wit.SDK.Device.Device.Device.DKey;
-using Wit.SDK.Modular.Sensor.Device;
-using Wit.SDK.Modular.Sensor.Device.Entity;
-using Wit.SDK.Modular.Sensor.Modular.Connector.Entity;
-using Wit.SDK.Modular.Sensor.Modular.Connector.Interface;
-using Wit.SDK.Modular.Sensor.Modular.Connector.Role;
-using Wit.SDK.Modular.Sensor.Modular.DataProcessor.Context;
-using Wit.SDK.Modular.Sensor.Modular.DataProcessor.Role;
-using Wit.SDK.Modular.Sensor.Modular.ProtocolResolver.Roles;
-using Wit.SDK.Modular.Sensor.Utils;
-using Wit.SDK.Modular.WitSensorApi.Interface;
-
-namespace Wit.SDK.Modular.WitSensorApi.Modular.WT901C485
-{
- ///
- /// WT901C485连接类
- ///
- public class WT901C485 : IAttitudeSensorApi
- {
- ///
- /// 设备模型
- ///
- private DeviceModel DeviceModel;
-
- ///
- /// 连接器
- ///
- private SPConnector connector = new SPConnector(new SerialPortConfig());
-
- ///
- /// 记录数据委托
- ///
- public delegate void OnRecordHandler(WT901C485 BWT901BLE);
-
- ///
- /// 记录数据事件
- ///
- public event OnRecordHandler OnRecord;
-
- ///
- /// 构造方法
- ///
- ///
- ///
- public WT901C485()
- {
- // 创建一个连接WT901C485的设备模型
- DeviceModel deviceModel = new DeviceModel($"", $"",
- new Modbus16Resolver(),
- new WT901C485Processor(),
- "34");
- deviceModel.Connector = connector;
- DeviceModel = deviceModel;
-
- // 自动读取命令
- DataProcessorContext.ReadCmdList = new List()
- {
- new CmdBean(){
- sendData = "${ADDR} 03 00 30 00 30 ${CRC16}",
- sendHex = true
- }
- };
- }
-
- ///
- /// 指定串口号
- ///
- ///
- public void SetPortName(string portName)
- {
- connector.SerialPortConfig.PortName = portName;
- DeviceModel.DeviceName = $"{portName}";
- }
-
- ///
- /// 指定波特率
- ///
- ///
- public void SetBaudrate(int baudRate)
- {
- connector.SerialPortConfig.BaudRate = baudRate;
- }
-
- ///
- /// 打开设备
- ///
- public void Open()
- {
- DeviceModel.OpenDevice();
- DeviceModel.OnListenKeyUpdate += DeviceModel_OnListenKeyUpdate;
- }
-
- ///
- /// 是否打开的
- ///
- public bool IsOpen()
- {
- return DeviceModel.IsOpen;
- }
-
- /**
- * 关闭连接
- *
- * @author huangyajun
- * @date 2022/6/28 20:51
- */
- public void Close()
- {
- DeviceModel.CloseDevice();
- }
-
- ///
- /// 发送数据
- ///
- /// 需要发送出去的数据
- /// 传感器返回的数据
- /// 是否需要传感器返回数据
- /// 等待传感器返回数据时间，单位ms，默认100ms
- /// 重复发送次数
- public void SendData(byte[] data, out byte[] returnData, bool isWaitReturn = false, int waitTime = 100, int repetition = 1)
- {
- DeviceModel.SendData(data, out returnData, isWaitReturn, waitTime, repetition);
- }
-
- ///
- /// 发送带协议的数据，使用默认等待时长
- ///
- /// 数据
- public void SendProtocolData(byte[] data)
- {
- DeviceModel.ReadData(data);
- }
-
- ///
- /// 发送带协议的数据,并且指定等待时长
- ///
- /// 数据
- /// 等待时间
- public void SendProtocolData(byte[] data, int waitTime)
- {
- DeviceModel.ReadData(data, waitTime);
- }
-
- ///
- /// 发送读取寄存器的命令
- ///
- ///
- ///
- public void SendReadReg(byte reg, int waitTime)
- {
- var read03Bytes = Modbus16Utils.GetRead(byte.Parse(DeviceModel.GetDeviceData("ADDR")), reg, 0x1);
- DeviceModel.ReadData(read03Bytes);
- }
-
- ///
- /// 解锁寄存器
- ///
- public void UnlockReg()
- {
- byte addr = GetModbusId();
- byte[] setting = Modbus16Utils.GetWrite(addr, 0x69, 0xB588);
- SendProtocolData(setting);
- }
-
- ///
- /// 保存寄存器
- ///
- public void SaveReg()
- {
- byte addr = GetModbusId();
- byte[] setting = Modbus16Utils.GetWrite(addr, 0x00, 0x0000);
- SendProtocolData(setting);
- }
-
- ///
- /// 加计校准
- ///
- public void AppliedCalibration()
- {
- byte addr = GetModbusId();
- byte[] setting = Modbus16Utils.GetWrite(addr, 0x01, 0x01);
- SendProtocolData(setting);
- }
-
- ///
- /// 开始磁场校准
- ///
- public void StartFieldCalibration()
- {
- byte addr = GetModbusId();
- byte[] setting = Modbus16Utils.GetWrite(addr, 0x01, 0x07);
- SendProtocolData(setting);
- }
-
- ///
- /// 结束磁场校准
- ///
- public void EndFieldCalibration()
- {
- byte addr = GetModbusId();
- byte[] setting = Modbus16Utils.GetWrite(addr, 0x01, 0x00);
- SendProtocolData(setting);
- }
-
- ///
- /// 设置带宽
- ///
- ///
- public void SetBandWidth(byte band)
- {
- byte addr = GetModbusId();
- byte[] setting = Modbus16Utils.GetWrite(addr, 0x1F, band);
- SendProtocolData(setting);
- }
-
- ///
- /// 指定ModbusId
- ///
- ///
- public void SetModbusId(byte modbusId)
- {
- if (DeviceModel.IsOpen)
- {
- try
- {
- byte addr = GetModbusId();
- byte[] setting = Modbus16Utils.GetWrite(addr, 0x1A, modbusId);
- SendProtocolData(setting);
- }
- catch (Exception)
- {
- //Debug.WriteLine(e.Message);
- //Debug.WriteLine(e.StackTrace);
- }
- }
-
- // 更改上位机地址
- DeviceModel.SetAddr(modbusId.ToString());
- }
-
- ///
- /// 获得设备地址
- ///
- ///
- public byte GetModbusId()
- {
-
- byte addr = 0;
-
- try
- {
- addr = byte.Parse(DeviceModel.GetAddr());
- }
- catch (Exception e)
- {
- Debug.WriteLine(e.Message);
- Debug.WriteLine(e.StackTrace);
- }
-
- return addr;
- }
-
- ///
- /// 获得设备名称
- ///
- ///
- public string GetDeviceName()
- {
- return DeviceModel.DeviceName;
- }
-
-
- ///
- /// 获得数据
- ///
- /// 数据键值
- ///
- public string GetDeviceData(string key)
- {
- return DeviceModel.GetDeviceData(key);
- }
-
- ///
- /// 获得数据
- ///
- /// 数据键值
- ///
- public short? GetDeviceData(ShortKey key)
- {
- return DeviceModel.GetDeviceData(key);
- }
-
- ///
- /// 获得数据
- ///
- /// 数据键值
- ///
- public string GetDeviceData(StringKey key)
- {
- return DeviceModel.GetDeviceData(key);
- }
-
- ///
- /// 获得数据
- ///
- /// 数据键值
- ///
- public double? GetDeviceData(DoubleKey key)
- {
- return DeviceModel.GetDeviceData(key);
- }
-
- ///
- /// 传感器数据更新时
- ///
- ///
- public void DeviceModel_OnListenKeyUpdate(DeviceModel deviceModel)
- {
- OnRecord?.Invoke(this);
- }
-
- ///
- /// 无设置回传速率
- ///
- ///
- public void SetReturnRate(byte rate)
- {
- // 无设置回传速率
- }
- }
-}
diff --git a/AgroBase/AgroBase/Models/Variaveis.cs b/AgroBase/AgroBase/Models/Variaveis.cs
index f16bc1cdf..90e16f19c 100644
--- a/AgroBase/AgroBase/Models/Variaveis.cs
+++ b/AgroBase/AgroBase/Models/Variaveis.cs
@@ -11,7 +11,6 @@ using System.Threading.Tasks;
using System.Windows.Forms;
using static AgroBase.Models.Enuns;
using System.Drawing.Drawing2D;
-using Wit.SDK.Modular.WitSensorApi.Modular.WT901C485;
namespace AgroBase.Models
{
@@ -26,6 +25,7 @@ namespace AgroBase.Models
public static OperacaoModel OperacaoEmAndamento { get; set; } = new OperacaoModel(ModoOperacao.Manual);
public static MqttService MqttService { get; set; } = new MqttService("localhost", 1883);
public static List DispositivosConexaoInicial = new List() { T_Code.Mvd, T_Code.Atu, T_Code.Sen };
+ public static List DispositivosModbus = new List() { T_Code.Pzm, T_Code.Wit };
public static SensorSinaleiroComportamentoModel ComportamentoPorStatus(StatusOperacao? _status = null)
{
if (_status == null)
@@ -104,7 +104,6 @@ namespace AgroBase.Models
return comportamento;
}
public static LoRaService ConexaoLoRa = new LoRaService();
- public static WT901C485 WT901C = new WT901C485();
}
diff --git a/AgroBase/AgroBase/Models/WT901CModel.cs b/AgroBase/AgroBase/Models/WT901CModel.cs
new file mode 100644
index 000000000..c5901e8cb
--- /dev/null
+++ b/AgroBase/AgroBase/Models/WT901CModel.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AgroBase.Models
+{
+ public class WT901CModel
+ {
+ public string Versao { get; set; }
+ public DateTime DataHora { get; set; }
+ public double AccX { get; set; }
+ public double AccY { get; set; }
+ public double AccZ { get; set; }
+ public double AccM { get; set; }
+ public double AsX { get; set; }
+ public double AsY { get; set; }
+ public double AsZ { get; set; }
+ public double AsM { get; set; }
+ public double AngleX { get; set; }
+ public double AngleY { get; set; }
+ public double AngleZ { get; set; }
+ public double HX { get; set; }
+ public double HY { get; set; }
+ public double HZ { get; set; }
+ public double HM { get; set; }
+ public double Temperatura { get; set; }
+ public double Pressao { get; set; }
+ public double Altitude { get; set; }
+ public short D0 { get; set; }
+ public short D1 { get; set; }
+ public short D2 { get; set; }
+ public short D3 { get; set; }
+ public double Q0 { get; set; }
+ public double Q1 { get; set; }
+ public double Q2 { get; set; }
+ public double Q3 { get; set; }
+ public double Latitude { get; set; }
+ public double Longitude { get; set; }
+ public double GPS_Altitude { get; set; }
+ public double GPS_Orientacao { get; set; }
+ public double GPS_Velcodiade { get; set; }
+ public double GPS_NumeroSatelites { get; set; }
+ public double PDOP { get; set; }
+ public double HDOP { get; set; }
+ public double VDOP { get; set; }
+ }
+}
diff --git a/AgroBase/AgroBase/Services/DispositivosService.cs b/AgroBase/AgroBase/Services/DispositivosService.cs
index 6da346ab6..535b4b4d5 100644
--- a/AgroBase/AgroBase/Services/DispositivosService.cs
+++ b/AgroBase/AgroBase/Services/DispositivosService.cs
@@ -828,7 +828,7 @@ namespace AgroBase.Comum
{
if (ProtocoloConfiguracao.Key != "" && ProtocoloConfiguracao.Value.Any())
{
- ProtocoloConfiguracao.Value.ForEach(x => AdicionarMensagemFila(ProtocoloConfiguracao.Key, x, true, false));
+ ProtocoloConfiguracao.Value.ForEach(x => AdicionarMensagemFila(ProtocoloConfiguracao.Key, x, true, true));
}
}
}
@@ -843,7 +843,7 @@ namespace AgroBase.Comum
{
if (ProtocoloConfiguracao.Key != "" && ProtocoloConfiguracao.Value.Any())
{
- ProtocoloConfiguracao.Value.ForEach(x => AdicionarMensagemFila(ProtocoloConfiguracao.Key, x, true, false));
+ ProtocoloConfiguracao.Value.ForEach(x => AdicionarMensagemFila(ProtocoloConfiguracao.Key, x, true, true));
}
}
}
diff --git a/AgroBase/AgroBase/Services/ModbusService.cs b/AgroBase/AgroBase/Services/ModbusService.cs
index 27c2bc51b..74c0a7172 100644
--- a/AgroBase/AgroBase/Services/ModbusService.cs
+++ b/AgroBase/AgroBase/Services/ModbusService.cs
@@ -1,14 +1,60 @@
using System;
using System.Collections.Generic;
+using System.IO.Ports;
using System.Linq;
-using System.Text;
using System.Threading.Tasks;
-using static Emgu.CV.ML.KNearest;
namespace AgroBase.Services
{
public class ModbusService
{
+ public static readonly object _lock = new object();
+
+ public static bool Verificando { get; set; } = false;
+ public static bool EnvioLiberado { get; set; } = true;
+
+ public static SerialPort _PortaModbus;
+ public static bool Iniciado
+ {
+ get
+ {
+ if (_PortaModbus != null && !_PortaModbus.IsOpen)
+ {
+ try
+ {
+ _PortaModbus.Open();
+ }
+ catch
+ {
+ _PortaModbus = null;
+ }
+ }
+ return _PortaModbus != null && _PortaModbus.IsOpen;
+ }
+ }
+
+
+ public static async Task EnviarComando(byte[] Comando)
+ {
+ while (!EnvioLiberado || Verificando)
+ {
+ await Task.Delay(100);
+ }
+
+ EnvioLiberado = false;
+
+ if (Iniciado)
+ {
+ _PortaModbus.Write(Comando, 0, Comando.Length);
+
+ await Task.Delay(200);
+ }
+
+ EnvioLiberado = true;
+ }
+
+
+
public static byte[] Crc16(byte[] data)
{
ushort crc = 0xFFFF;
@@ -125,6 +171,78 @@ namespace AgroBase.Services
return command.ToArray();
}
+ public static bool FindModbus(byte[] sendByte, byte[] returnByte, out byte[] modbus)
+ {
+
+ int height = sendByte[4];
+ int low = sendByte[5];
+
+ // 得到长度
+ int len = 5 + (height << 8 | low) * 2;
+
+ // 如果没有返回结果，或者返回结果根本不够长
+ if (returnByte == null || returnByte.Length < len)
+ {
+ modbus = new byte[0];
+ return false;
+ }
+
+ // 遍历返回结果查找
+ for (int i = 0; i <= returnByte.Length - len; i++)
+ {
+
+ byte rAddr = returnByte[i];
+ byte mark = 0x03;
+
+ byte[] cCrc = GetCrc16(returnByte.Skip(i).Take(len - 2).ToArray());
+ byte rCrcH = returnByte[i + len - 2];
+ byte rCrcL = returnByte[i + len - 1];
+ // 如果全部通过
+ if (sendByte[0] == rAddr && mark == sendByte[1] && rCrcH == cCrc[0] && rCrcL == cCrc[1])
+ {
+ modbus = returnByte.Skip(i).Take(len).ToArray();
+ return true;
+ }
+ }
+
+ modbus = new byte[0];
+ return false;
+ }
+
+ private static byte[] GetCrc16(byte[] bytes)
+ {
+ byte crcRegister_H = 0xFF, crcRegister_L = 0xFF;// 预置一个值为 0xFFFF 的 16 位寄存器
+
+ byte polynomialCode_H = 0xA0, polynomialCode_L = 0x01;// 多项式码 0xA001
+
+ for (int i = 0; i < bytes.Length; i++)
+ {
+ crcRegister_L = (byte)(crcRegister_L ^ bytes[i]);
+
+ for (int j = 0; j < 8; j++)
+ {
+ byte tempCRC_H = crcRegister_H;
+ byte tempCRC_L = crcRegister_L;
+
+ crcRegister_H = (byte)(crcRegister_H >> 1);
+ crcRegister_L = (byte)(crcRegister_L >> 1);
+ // 高位右移前最后 1 位应该是低位右移后的第 1 位：如果高位最后一位为 1 则低位右移后前面补 1
+ if ((tempCRC_H & 0x01) == 0x01)
+ {
+ crcRegister_L = (byte)(crcRegister_L | 0x80);
+ }
+
+ if ((tempCRC_L & 0x01) == 0x01)
+ {
+ crcRegister_H = (byte)(crcRegister_H ^ polynomialCode_H);
+ crcRegister_L = (byte)(crcRegister_L ^ polynomialCode_L);
+ }
+ }
+ }
+
+ return new byte[] { crcRegister_L, crcRegister_H };
+
+ }
}
diff --git a/AgroBase/AgroBase/Services/PZEMService.cs b/AgroBase/AgroBase/Services/PZEMService.cs
index 40a5cac09..ee2a09580 100644
--- a/AgroBase/AgroBase/Services/PZEMService.cs
+++ b/AgroBase/AgroBase/Services/PZEMService.cs
@@ -18,32 +18,16 @@ namespace AgroBase.Services
{
public class PZEMService
{
- public static SerialPort PortaPZEM = null;
- public static bool Iniciado
- {
- get
- {
- if (PortaPZEM != null && !PortaPZEM.IsOpen)
- {
- try
- {
- PortaPZEM.Open();
- }
- catch
- {
- PortaPZEM = null;
- }
- }
- return PortaPZEM != null && PortaPZEM.IsOpen;
- }
- }
+ public static bool Iniciado { get; set; }
+ public static int TaxaAmostragem { get; set; } = 1000;
+ private static byte slaveAddress = 0x01;
public static PZEMModel UltimaLeitura = new PZEMModel();
public static PZEMModel PenultimaLeitura = new PZEMModel();
public static double TensaoMinima { get; set; } = 30;
public static double TensaoMaxima { get; set; } = 42;
- private static byte slaveAddress = 0x01;
+
public static Dictionary CodigosFuncoes = new Dictionary()
{
{ "LeituraParametro", 0x03 },
@@ -72,36 +56,43 @@ namespace AgroBase.Services
EnviarComando(porta, comando);
await Task.Delay(1000);
var resposta = SerialService.VerificarRespostaPortasDesconhecidas(porta);
- if (resposta.Length > 3 && resposta[1] == CodigosFuncoes["LeituraParametro"] && DecifrarRespostaAquisicao(resposta) != null)
+
+ Iniciado = DecifrarRespostaAquisicao(resposta) != null;
+
+ if (resposta.Length > 3 && resposta[1] == CodigosFuncoes["LeituraParametro"] && Iniciado)
{
AtualizarPortaCOM(porta);
return Iniciado;
}
- porta.Close();
+ if (!ModbusService.Iniciado)
+ {
+ porta.Close();
+ }
+
return false;
}
public static void AtualizarPortaCOM(SerialPort Porta)
{
- if (PortaPZEM == null)
+ if (ModbusService._PortaModbus == null || !ModbusService.Iniciado)
{
- PortaPZEM = new SerialPort();
- }
- else if (Iniciado)
- {
- PortaPZEM.Close();
+ lock (ModbusService._lock)
+ {
+ ModbusService._PortaModbus = new SerialPort();
+ ModbusService._PortaModbus.BaudRate = Porta.BaudRate;
+ ModbusService._PortaModbus.PortName = Porta.PortName;
+ }
}
- PortaPZEM.BaudRate = Porta.BaudRate;
- PortaPZEM.PortName = Porta.PortName;
- PortaPZEM.DataReceived -= PortaPZEM_DataReceived;
- PortaPZEM.DataReceived += PortaPZEM_DataReceived;
-
- Porta.Close();
+ if (ModbusService._PortaModbus != null && !ModbusService._PortaModbus.IsOpen)
+ {
+ Porta.Close();
+ }
if (Iniciado)
{
+ bool i = ModbusService.Iniciado;
DefinirDispositivo();
ContadorCarga = new CoulombCounterService(VariaveisEquipamento.BateriaMax);
ReceberDados().ConfigureAwait(false);
@@ -115,7 +106,7 @@ namespace AgroBase.Services
{
SerialService.DispositivosMapeados.Add(new SerialService.DispositivoDetalhesModel()
{
- PortaCOM = PortaPZEM.PortName,
+ PortaCOM = ModbusService._PortaModbus.PortName,
Dispositivo = T_Code.Pzm,
Erro = !Iniciado,
Versao = 17
@@ -139,39 +130,35 @@ namespace AgroBase.Services
}
}
- public static void PortaPZEM_DataReceived(object sender, SerialDataReceivedEventArgs e)
- {
- if (PortaPZEM.IsOpen)
- {
- PenultimaLeitura = new PZEMModel()
- {
- AlarmeTensaoMax = UltimaLeitura.AlarmeTensaoMax,
- AlarmeTensaoMin = UltimaLeitura.AlarmeTensaoMin,
- Corrente = UltimaLeitura.Corrente,
- DataHora = UltimaLeitura.DataHora,
- Energia = UltimaLeitura.Energia,
- Potencia = UltimaLeitura.Potencia,
- Tensao = UltimaLeitura.Tensao
- };
-
- int bytesToRead = PortaPZEM.BytesToRead;
- byte[] buffer = new byte[bytesToRead];
- PortaPZEM.Read(buffer, 0, bytesToRead);
- DecifrarRespostaAquisicao(buffer);
-
- ContadorCarga.AtualizarConsumo();
-
- double percent = FuncoesMatematicas.Map(UltimaLeitura.Tensao, TensaoMinima, TensaoMaxima, 0, 100);
- Variaveis.OperacaoEmAndamento.Sensoriamento.PorcentagemBateria = percent;
- frmInstancial.frmAcompanhamento.AtualizarSensores("Bateria: " + UltimaLeitura.Tensao.ToString("0.00") + " V - " + UltimaLeitura.Corrente.ToString("0.00") + " A - " + UltimaLeitura.Potencia.ToString("0.00") + " W");
- Variaveis.OperacaoEmAndamento.Sensoriamento.BateriaConsumida = ContadorCarga.PercentualConsumido;
- }
- }
-
private static async Task ReceberDados()
{
- EnviarComando(PortaPZEM, ComandoAquisicaoDados());
- await Task.Delay(1000);
+ PenultimaLeitura = new PZEMModel()
+ {
+ AlarmeTensaoMax = UltimaLeitura.AlarmeTensaoMax,
+ AlarmeTensaoMin = UltimaLeitura.AlarmeTensaoMin,
+ Corrente = UltimaLeitura.Corrente,
+ DataHora = UltimaLeitura.DataHora,
+ Energia = UltimaLeitura.Energia,
+ Potencia = UltimaLeitura.Potencia,
+ Tensao = UltimaLeitura.Tensao
+ };
+
+ await ModbusService.EnviarComando(ComandoAquisicaoDados());
+
+ byte[] resposta = SerialService.VerificarRespostaPortasDesconhecidas(ModbusService._PortaModbus);
+
+ Iniciado = DecifrarRespostaAquisicao(resposta) != null;
+
+ ContadorCarga.AtualizarConsumo();
+
+ double percent = FuncoesMatematicas.Map(UltimaLeitura.Tensao, TensaoMinima, TensaoMaxima, 0, 100);
+ Variaveis.OperacaoEmAndamento.Sensoriamento.PorcentagemBateria = percent;
+ frmInstancial.frmAcompanhamento.AtualizarSensores("Bateria: " + UltimaLeitura.Tensao.ToString("0.00") + " V - " + UltimaLeitura.Corrente.ToString("0.00") + " A - " + UltimaLeitura.Potencia.ToString("0.00") + " W");
+ Variaveis.OperacaoEmAndamento.Sensoriamento.BateriaConsumida = ContadorCarga.PercentualConsumido;
+
+
+
+ await Task.Delay(TaxaAmostragem);
return await ReceberDados();
}
diff --git a/AgroBase/AgroBase/Services/SerialService.cs b/AgroBase/AgroBase/Services/SerialService.cs
index b28e98350..c804869d5 100644
--- a/AgroBase/AgroBase/Services/SerialService.cs
+++ b/AgroBase/AgroBase/Services/SerialService.cs
@@ -110,6 +110,12 @@ namespace AgroBase.Services
AtualizarDispositivos();
}
+ // Se algum dispositivo no barramento RS485 para Modbus já foi identificado
+ if (ModbusService.Iniciado && DispositivosMapeados.Where(x => Variaveis.DispositivosModbus.Contains(x.Dispositivo)).Count() != Variaveis.DispositivosModbus.Count())
+ {
+ await ProcuraDispositivoModbus(ModbusService._PortaModbus, false);
+ }
+
VarreduraEmAndamento = false;
}
@@ -232,14 +238,12 @@ namespace AgroBase.Services
// Método para tentar identificar dispositivos que não respondem ao comando de verificação padrão
try
{
- if (!PZEMService.Iniciado)
+ bool DispModbus = await ProcuraDispositivoModbus(porta, true);
+ if (DispModbus)
{
- bool Encontrado = await PZEMService.VerificaPortaPZEM(porta);
- if (Encontrado)
- {
- return Encontrado;
- }
+ return true;
}
+
if (!LoRaService.Iniciado)
{
bool Encontrado = await LoRaService.VerificaPortaLoRa(porta);
@@ -256,14 +260,7 @@ namespace AgroBase.Services
return Encontrado;
}
}
- if (false && !WT901CService.Iniciado)
- {
- bool Encontrado = await WT901CService.VerificaPortaWT901C(porta);
- if (Encontrado)
- {
- return Encontrado;
- }
- }
+
if (TentativasPortas.TryGetValue(porta.PortName, out int tentativas))
@@ -291,13 +288,46 @@ namespace AgroBase.Services
return false;
}
+ private static async Task ProcuraDispositivoModbus(SerialPort porta, bool PararAoEncontrar)
+ {
+ ModbusService.Verificando = true;
+
+ bool Encontrado = false;
+ if (!PZEMService.Iniciado)
+ {
+ Encontrado = await PZEMService.VerificaPortaPZEM(porta);
+ if (Encontrado && PararAoEncontrar)
+ {
+ return Encontrado;
+ }
+ }
+ if (!WT901CService.Iniciado)
+ {
+ Encontrado = await WT901CService.VerificaPortaWT901C(porta);
+ if (Encontrado && PararAoEncontrar)
+ {
+ return Encontrado;
+ }
+ }
+
+ ModbusService.Verificando = false;
+ return Encontrado;
+ }
+
public static byte[] VerificarRespostaPortasDesconhecidas(SerialPort Porta)
{
- int bytesToRead = Porta.BytesToRead;
- byte[] buffer = new byte[bytesToRead];
- Porta.Read(buffer, 0, bytesToRead);
- //Porta.DiscardInBuffer();
- return buffer;
+ if (Porta.IsOpen)
+ {
+ int bytesToRead = Porta.BytesToRead;
+ byte[] buffer = new byte[bytesToRead];
+ Porta.Read(buffer, 0, bytesToRead);
+ //Porta.DiscardInBuffer();
+ return buffer;
+ }
+ else
+ {
+ return new byte[] { };
+ }
}
public static byte[] LerDadosDaPortaSerial(SerialPort porta, int tamanhoEsperado)
diff --git a/AgroBase/AgroBase/Services/WT901CService.cs b/AgroBase/AgroBase/Services/WT901CService.cs
index 3193926b0..261cd11d8 100644
--- a/AgroBase/AgroBase/Services/WT901CService.cs
+++ b/AgroBase/AgroBase/Services/WT901CService.cs
@@ -7,82 +7,103 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using static AgroBase.Models.Enuns;
-using System.Windows.Forms;
-using Wit.SDK.Modular.Sensor.Modular.DataProcessor.Constant;
-using Wit.SDK.Modular.WitSensorApi.Modular.WT901C485;
namespace AgroBase.Services
{
public class WT901CService
{
- public static SerialPort PortaWT901C = null;
- public static bool Iniciado
- {
- get
- {
- if (Variaveis.WT901C.IsOpen())
- {
- return true;
- }
- else if (PortaWT901C == null)
- {
- return false;
- }
-
- try
- {
- Variaveis.WT901C.SetPortName(PortaWT901C.PortName);
- Variaveis.WT901C.SetBaudrate(PortaWT901C.BaudRate);
- Variaveis.WT901C.SetModbusId(slaveAddress);
- Variaveis.WT901C.Open();
- Variaveis.WT901C.OnRecord += WT901C485_OnRecord;
- }
- catch (Exception ex)
- {
- return false;
- }
-
- return Variaveis.WT901C.IsOpen();
- }
- }
+ //public static SerialPort PortaWT901C = null;
+ public static bool Iniciado { get; set; }
+ public static int TaxaAmostragem { get; set; } = 1000;
public static byte slaveAddress = 0x50;
+ private static Dictionary DadosSensor { get; } = new Dictionary();
+ public static WT901CModel DadosLeitura { get; set; } = new WT901CModel();
+ private static byte[] ComandoAquisicao = new byte[8] { slaveAddress, 0x03, 0x00, 0x30, 0x00, 0x30, 0x48, 0x50 };
public static async Task VerificaPortaWT901C(SerialPort porta)
{
porta.BaudRate = 9600;
- AtualizarPortaCOM(porta);
-
- return Iniciado;
+ var comando = ModbusService.ComandoGetParametro(slaveAddress, new ModbusParametrosModel() { FuncaoGet = 0x03, N_Registros = 2, Registro = 0x2e });
+
+ EnviarComando(porta, comando);
+ await Task.Delay(1000);
+ var resposta = SerialService.VerificarRespostaPortasDesconhecidas(porta);
+
+ Iniciado = DecifrarRespostaAquisicao(comando, resposta);
+
+ if (resposta.Length > 3 && resposta[1] == 0x03 && Iniciado)
+ {
+ AtualizarPortaCOM(porta);
+ return Iniciado;
+ }
+
+ if (!ModbusService.Iniciado)
+ {
+ porta.Close();
+ }
+
+ return false;
}
public static void AtualizarPortaCOM(SerialPort Porta)
{
- if (PortaWT901C == null)
+ if (ModbusService._PortaModbus == null || !ModbusService.Iniciado)
{
- PortaWT901C = new SerialPort();
+ lock (ModbusService._lock)
+ {
+ ModbusService._PortaModbus = new SerialPort();
+ ModbusService._PortaModbus.BaudRate = Porta.BaudRate;
+ ModbusService._PortaModbus.PortName = Porta.PortName;
+ }
}
- PortaWT901C.BaudRate = Porta.BaudRate;
- PortaWT901C.PortName = Porta.PortName;
-
- Porta.Close();
+ if (ModbusService._PortaModbus != null && !ModbusService._PortaModbus.IsOpen)
+ {
+ Porta.Close();
+ }
if (Iniciado)
{
+ bool i = ModbusService.Iniciado;
DefinirDispositivo();
+ ReceberDados().ConfigureAwait(false);
+ }
+ }
+
+ private static async Task ReceberDados()
+ {
+ await ModbusService.EnviarComando(ComandoAquisicao);
+
+ byte[] resposta = SerialService.VerificarRespostaPortasDesconhecidas(ModbusService._PortaModbus);
+
+ Iniciado = DecifrarRespostaAquisicao(ComandoAquisicao, resposta);
+
+ if (Iniciado)
+ {
+ PreencherDadosLeitura();
+
+ Variaveis.OperacaoEmAndamento.Sensoriamento.InclinacaoX = DadosLeitura.AngleX;
+ Variaveis.OperacaoEmAndamento.Sensoriamento.InclinacaoY = DadosLeitura.AngleY;
+ Variaveis.OperacaoEmAndamento.Sensoriamento.InclinacaoZ = DadosLeitura.AngleZ;
+ Variaveis.OperacaoEmAndamento.Sensoriamento.AnguloCarroBussola = DadosLeitura.HM;
}
+
+ await Task.Delay(TaxaAmostragem);
+
+ return await ReceberDados();
}
+
private static void DefinirDispositivo()
{
if (Iniciado)
{
SerialService.DispositivosMapeados.Add(new SerialService.DispositivoDetalhesModel()
{
- PortaCOM = PortaWT901C.PortName,
+ PortaCOM = ModbusService._PortaModbus.PortName,
Dispositivo = T_Code.Wit,
Erro = !Iniciado,
Versao = 1
@@ -90,22 +111,356 @@ namespace AgroBase.Services
}
}
- private static void WT901C485_OnRecord(WT901C485 WT901C485)
+ public static void EnviarComando(SerialPort _Porta, byte[] Comando)
{
- double magX = WT901C485.GetDeviceData(WitSensorKey.HX) ?? 0;
- double magY = WT901C485.GetDeviceData(WitSensorKey.HY) ?? 0;
- double magZ = WT901C485.GetDeviceData(WitSensorKey.HZ) ?? 0;
- double acX = WT901C485.GetDeviceData(WitSensorKey.AccX) ?? 0;
- double acY = WT901C485.GetDeviceData(WitSensorKey.AccY) ?? 0;
- double acZ = WT901C485.GetDeviceData(WitSensorKey.AccZ) ?? 0;
- double OrientacaoMagnetica = GPSService.CalcularOrientacaoMagneticaCompensada(magX, magY, magZ, acX, acY, acZ);
- Variaveis.OperacaoEmAndamento.Sensoriamento.AnguloCarroBussola = OrientacaoMagnetica;
- Variaveis.OperacaoEmAndamento.Sensoriamento.InclinacaoX = WT901C485.GetDeviceData(WitSensorKey.AngleX) ?? 0;
- Variaveis.OperacaoEmAndamento.Sensoriamento.InclinacaoY = WT901C485.GetDeviceData(WitSensorKey.AngleY) ?? 0;
- Variaveis.OperacaoEmAndamento.Sensoriamento.InclinacaoZ = WT901C485.GetDeviceData(WitSensorKey.AngleZ) ?? 0;
- Variaveis.OperacaoEmAndamento.Sensoriamento.Temperatura = WT901C485.GetDeviceData(WitSensorKey.T) ?? 0;
- Variaveis.OperacaoEmAndamento.Sensoriamento.Pressao = WT901C485.GetDeviceData(WitSensorKey.P) ?? 0;
- Variaveis.OperacaoEmAndamento.Sensoriamento.Altitude = WT901C485.GetDeviceData(WitSensorKey.H) ?? 0;
+ if (_Porta != null)
+ {
+ if (!_Porta.IsOpen)
+ {
+ _Porta.Open();
+ }
+ if (_Porta.IsOpen)
+ {
+ _Porta.Write(Comando, 0, Comando.Length);
+ }
+ }
+ }
+
+ private static bool DecifrarRespostaAquisicao(byte[] comando, byte[] resposta)
+ {
+ byte[] modbusBytes;
+ if (comando != null && resposta != null && resposta.Length >= 7 && ModbusService.FindModbus(comando, resposta, out modbusBytes))
+ {
+ int readReg = comando[2] << 8 | comando[3];
+ byte[] regData = modbusBytes.Skip(3).Take(modbusBytes.Length - 5).ToArray();
+
+ for (int j = 0; regData != null && j < regData.Length - 1; j += 2)
+ {
+ string key = string.Format("{0:X2}", readReg++);
+ short value = (short)(regData[j] <<