Update

TrakHound · Nov 28, 2023 · 7a547a5 · 7a547a5
1 parent 0067e0d
commit 7a547a5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 43 deletions.
diff --git a/MTConnect.NET.sln b/MTConnect.NET.sln
@@ -94,6 +94,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MTConnect.NET-Protobuf", "l
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MTConnect.NET-AgentModule-MqttAdapter", "agent\Modules\MTConnect.NET-AgentModule-MqttAdapter\MTConnect.NET-AgentModule-MqttAdapter.csproj", "{ACD5D3A4-0474-4E24-BF18-1F699CDB101F}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{8B92CDDC-1202-44D3-8858-FA4581BCFF8A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

diff --git a/adapter/MTConnect.NET-Applications-Adapter/MTConnectAdapterApplication.cs b/adapter/MTConnect.NET-Applications-Adapter/MTConnectAdapterApplication.cs
@@ -244,46 +244,6 @@ public void StartAdapter(IAdapterApplicationConfiguration configuration, bool ve
         {
             if (!_started && configuration != null)
             {
-                //// Create MTConnectAgentBroker
-                //if (configuration.EnableBuffer)
-                //{
-                //    _adapter = new ShdrIntervalQueueAdapter(configuration.DeviceKey, configuration.Port, configuration.Heartbeat, configuration.WriteInterval);
-                //}
-                //else
-                //{
-                //    _adapter = new ShdrIntervalAdapter(configuration.DeviceKey, configuration.Port, configuration.Heartbeat, configuration.WriteInterval);
-                //}
-
-                //_adapter.Timeout = configuration.Timeout;
-                //_adapter.MultilineAssets = configuration.MultilineAssets;
-                //_adapter.MultilineDevices = configuration.MultilineDevices;
-                //_adapter.FilterDuplicates = configuration.FilterDuplicates;
-                //_adapter.OutputTimestamps = configuration.OutputTimestamps;
-
-                //if (!string.IsNullOrEmpty(_adapter.DeviceKey))
-                //{
-                //    _adapterLogger.Info($"[Adapter] : Listening on TCP Port {_adapter.Port} for Device ({_adapter.DeviceKey})...");
-                //}
-                //else
-                //{
-                //    _adapterLogger.Info($"[Adapter] : Listening on TCP Port {_adapter.Port}...");
-                //}
-
-                //if (verboseLogging)
-                //{
-                //    _adapter.AgentConnected += AgentConnected;
-                //    _adapter.AgentDisconnected += AgentDisconnected;
-                //    _adapter.AgentConnectionError += AgentConnectionError;
-                //    _adapter.LineSent += LineSent;
-                //    _adapter.PingReceived += PingReceived;
-                //    _adapter.PongSent += PongSent;
-                //    _adapter.SendError += SendError;
-                //}
-
-                // Set Engine Adapter
-                //if (_engine != null) _engine.Adapter = _adapter;
-
-
                 // Initialize Agent Modules
                 _modules = new MTConnectAdapterModules(configuration);
                 _modules.ModuleLoaded += ModuleLoaded;
@@ -307,8 +267,7 @@ public void StartAdapter(IAdapterApplicationConfiguration configuration, bool ve
 
                 OnStartAdapter();
 
-                // Start Adapter
-                //_adapter.Start();
+                // Start DataSource
                 _dataSource.Configuration = configuration;
                 _dataSource.Start();
 

diff --git a/libraries/MTConnect.NET-Common/Adapters/IMTConnectAdapterModule.cs b/libraries/MTConnect.NET-Common/Adapters/IMTConnectAdapterModule.cs
@@ -1,7 +1,6 @@
 // Copyright (c) 2023 TrakHound Inc., All Rights Reserved.
 // TrakHound Inc. licenses this file to you under the MIT license.
 
-using MTConnect.Assets;
 using MTConnect.Devices;
 using MTConnect.Input;
 using MTConnect.Logging;

diff --git a/libraries/MTConnect.NET-Common/Input/MTConnectDataSource.cs b/libraries/MTConnect.NET-Common/Input/MTConnectDataSource.cs
@@ -34,6 +34,7 @@ protected virtual void OnStart() { }
         protected virtual void OnStop() { }
 
         protected virtual void OnRead() { }
+
         protected virtual Task OnReadAsync() { return Task.CompletedTask; }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -34,6 +34,7 @@ protected virtual void OnStart() { }
		protected virtual void OnStop() { }

		protected virtual void OnRead() { }

		protected virtual Task OnReadAsync() { return Task.CompletedTask; }


Expand Down