Skip to content

Commit

Permalink
Update 6.0.14
Browse files Browse the repository at this point in the history
- Improved Performance (better usage of Streams instead of byte arrays)
- Improved Client Performance by caching DataItems and Components
  • Loading branch information
PatrickRitchie committed Feb 16, 2024
1 parent f74f513 commit 173b89f
Show file tree
Hide file tree
Showing 71 changed files with 1,094 additions and 816 deletions.
2 changes: 1 addition & 1 deletion agent/MTConnect.NET-Agent/MTConnect.NET-Agent.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
</ItemGroup>

<ItemGroup>
<None Update="agent.config.default.yaml">
<None Update="agent.config.yaml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="devices\device-mazak.xml">
Expand Down
112 changes: 0 additions & 112 deletions agent/MTConnect.NET-Agent/agent.config.default.yaml

This file was deleted.

71 changes: 71 additions & 0 deletions agent/MTConnect.NET-Agent/agent.config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
# - Device Configuration -
devices: devices

# - Processors -
processors:
- python: # - Add Python Processor
directory: processors

# - Modules -
modules:

- http-server: # - Add HTTP Server module
# hostname: localhost
port: 5000
# allowPut: true
indentOutput: true
documentFormat: xml
accept:
text/xml: xml
application/json: json
# responseCompression:
# - gzip
# - br
# files:
# - path: schemas
# location: schemas
# - path: styles
# location: styles
# - path: styles/favicon.ico
# location: favicon.ico

# - mqtt-relay: # - Add MQTT Relay module
# server: localhost
# port: 1883
# currentInterval: 5000
# sampleInterval: 500

# - shdr-adapter: # - Add SHDR Adapter module for Device = M12346 and Port = 7878
# deviceKey: M12346
# hostname: localhost
# port: 7878
# heartbeat: 1000
# reconnectInterval: 1000
# connectionTimeout: 1000

- shdr-adapter: # - Add SHDR Adapter module for Device = OKUMA-Lathe and Port = 7879
deviceKey: OKUMA-Lathe
hostname: localhost
port: 7878
heartbeat: 1000
reconnectInterval: 1000
connectionTimeout: 1000

# - mqtt-adapter: # - Add MQTT Adapter module for Device = M12346 and Topic = cnc-01
# deviceKey: M12346
# server: localhost
# port: 1883
# topic: cnc-01


# The maximum number of Observations the agent can hold in its buffer
observationBufferSize: 150000

# The maximum number of assets the agent can hold in its buffer
assetBufferSize: 1000

# Sets whether the Agent buffers are durable and retain state after restart
durable: false

# Sets the default MTConnect version to output response documents for.
defaultVersion: 2.2
Original file line number Diff line number Diff line change
Expand Up @@ -64,35 +64,41 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\libraries\MTConnect.NET-Common\MTConnect.NET-Common.csproj" />
<ProjectReference Include="..\..\libraries\MTConnect.NET-JSON-cppagent\MTConnect.NET-JSON-cppagent.csproj" />
<ProjectReference Include="..\..\libraries\MTConnect.NET-JSON\MTConnect.NET-JSON.csproj" />
<ProjectReference Include="..\..\libraries\MTConnect.NET-Services\MTConnect.NET-Services.csproj" />
<ProjectReference Include="..\..\libraries\MTConnect.NET-XML\MTConnect.NET-XML.csproj" />
<ProjectReference Include="..\Modules\MTConnect.NET-AgentModule-HttpAdapter\MTConnect.NET-AgentModule-HttpAdapter.csproj" />
<ProjectReference Include="..\Modules\MTConnect.NET-AgentModule-HttpServer\MTConnect.NET-AgentModule-HttpServer.csproj" />
<ProjectReference Include="..\Modules\MTConnect.NET-AgentModule-MqttAdapter\MTConnect.NET-AgentModule-MqttAdapter.csproj" />
<ProjectReference Include="..\Modules\MTConnect.NET-AgentModule-MqttBroker\MTConnect.NET-AgentModule-MqttBroker.csproj" />
<ProjectReference Include="..\Modules\MTConnect.NET-AgentModule-MqttRelay\MTConnect.NET-AgentModule-MqttRelay.csproj" />
<ProjectReference Include="..\Modules\MTConnect.NET-AgentModule-ShdrAdapter\MTConnect.NET-AgentModule-ShdrAdapter.csproj" />
<ProjectReference Include="..\Processors\MTConnect.NET-AgentProcessor-Python\MTConnect.NET-AgentProcessor-Python.csproj" />
<ProjectReference Include="..\..\libraries\MTConnect.NET-Common\MTConnect.NET-Common.csproj" />
<ProjectReference Include="..\..\libraries\MTConnect.NET-JSON-cppagent\MTConnect.NET-JSON-cppagent.csproj" />
<ProjectReference Include="..\..\libraries\MTConnect.NET-JSON\MTConnect.NET-JSON.csproj" />
<ProjectReference Include="..\..\libraries\MTConnect.NET-Services\MTConnect.NET-Services.csproj" />
<ProjectReference Include="..\..\libraries\MTConnect.NET-XML\MTConnect.NET-XML.csproj" />
<ProjectReference Include="..\Modules\MTConnect.NET-AgentModule-HttpAdapter\MTConnect.NET-AgentModule-HttpAdapter.csproj" />
<ProjectReference Include="..\Modules\MTConnect.NET-AgentModule-HttpServer\MTConnect.NET-AgentModule-HttpServer.csproj" />
<ProjectReference Include="..\Modules\MTConnect.NET-AgentModule-MqttAdapter\MTConnect.NET-AgentModule-MqttAdapter.csproj" />
<ProjectReference Include="..\Modules\MTConnect.NET-AgentModule-MqttBroker\MTConnect.NET-AgentModule-MqttBroker.csproj" />
<ProjectReference Include="..\Modules\MTConnect.NET-AgentModule-MqttRelay\MTConnect.NET-AgentModule-MqttRelay.csproj" />
<ProjectReference Include="..\Modules\MTConnect.NET-AgentModule-ShdrAdapter\MTConnect.NET-AgentModule-ShdrAdapter.csproj" />
<ProjectReference Include="..\Processors\MTConnect.NET-AgentProcessor-Python\MTConnect.NET-AgentProcessor-Python.csproj" />
</ItemGroup>

<ItemGroup>
<Compile Update="Service.cs" />
</ItemGroup>

<ItemGroup>
<None Include="agent.config.default.yaml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
<None Include="NLog.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
<Content Include="agent.config.default.yaml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutput>true</CopyToOutput>
<IncludeInPackage>true</IncludeInPackage>
<Pack>True</Pack>
<PackagePath>contentFiles\any\any;content</PackagePath>
<PackageCopyToOutput>true</PackageCopyToOutput>
</Content>
<Content Include="NLog.default.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutput>true</CopyToOutput>
<IncludeInPackage>true</IncludeInPackage>
<Pack>True</Pack>
<PackagePath>contentFiles\any\any;content</PackagePath>
<PackageCopyToOutput>true</PackageCopyToOutput>
</Content>
</ItemGroup>

</Project>
Loading

0 comments on commit 173b89f

Please sign in to comment.