Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ShdrAdapter - sending latest values for all DataItems on new Agent connection #53

Closed
MRIIOT opened this issue Dec 16, 2023 · 8 comments
Closed

Comments

@MRIIOT
Copy link

MRIIOT commented Dec 16, 2023

Should either of these methods send the latest values of all DataItems when a new Agent comes along and connects?

/// <summary>
/// Sends all Items that have changed since last sent to the Agent
/// </summary>
public void SendChanged()
{
WriteChangedDataItems();
WriteChangedMessages();
WriteChangedConditions();
WriteChangedTimeSeries();
WriteChangedDataSets();
WriteChangedTables();
WriteChangedAssets();
// Call Overridable Method
OnChangedSent();
}
/// <summary>
/// Sends all of the last sent Items, Assets, and Devices to the Agent. This can be used upon reconnection to the Agent
/// </summary>
public void SendLast(long timestamp = 0)
{
WriteLastDataItems(timestamp);
WriteLastMessages(timestamp);
WriteLastConditions(timestamp);
WriteLastTimeSeries(timestamp);
WriteLastDataSets(timestamp);
WriteLastTables(timestamp);
WriteAllAssets();
WriteAllDevices();
// Call Overridable Method
OnLastSent();
}

@PatrickRitchie
Copy link
Contributor

Yes the SendLast() method is called when an Agent is connected. It sends all DataItems.

private void ClientConnected(string clientId, TcpClient client)
{
    AddAgentClient(clientId, client);
    AgentConnected?.Invoke(this, clientId);

    SendLast(UnixDateTime.Now);
}

@MRIIOT
Copy link
Author

MRIIOT commented Dec 16, 2023

You're correct. At least from a Telnet session. Works both with ShdrAdapter.FilterDuplicates true or false.

2023-12-16T04:15:26.9643773Z|f_sim_p1_hwver|Machining center Series 0i D4F1 MODEL D 30.0
2023-12-16T04:15:26.9889871Z|f_sim_p1_axes|X Y Z S
2023-12-16T04:15:26.9890389Z|f_sim_p1_tmr_powered|48654840
2023-12-16T04:15:26.9890500Z|f_sim_p1_tmr_operating|5640180
2023-12-16T04:15:26.9890618Z|f_sim_p1_tmr_loaded|1880040
2023-12-16T04:15:26.9890700Z|f_sim_p1_ctl_mode|AUTOMATIC
2023-12-16T04:15:26.9890785Z|f_sim_p1_ctl_exec|READY
2023-12-16T04:15:26.9890864Z|f_sim_p1_tool_num|5
2023-12-16T04:15:26.9890951Z|f_sim_p1_ovr_feed|50
2023-12-16T04:15:26.9891031Z|f_sim_p1_ovr_rapid|0
2023-12-16T04:15:26.9891114Z|f_sim_p1_ovr_spindle|120
2023-12-16T04:15:26.9891194Z|f_sim_estop|ARMED
2023-12-16T04:15:26.9891273Z|f_sim_p1_tmr_cycle|420.944
2023-12-16T04:15:26.9891354Z|f_sim_p1_part_count_life|1081
2023-12-16T04:15:26.9891435Z|f_sim_p1_part_count_complete|231
2023-12-16T04:15:26.9891520Z|f_sim_p1_part_count_remain|0
2023-12-16T04:15:26.9891606Z|f_sim_p1_prg_name_selected|O1
2023-12-16T04:15:26.9891691Z|f_sim_p1_prg_cmt_selected|(ROUGH)
2023-12-16T04:15:26.9891779Z|f_sim_p1_prg_size_selected|26500
2023-12-16T04:15:26.9891859Z|f_sim_p1_prg_mod_selected|2021-05-10T08:07:00.0000000-05:00
2023-12-16T04:15:26.9891945Z|f_sim_p1_prg_name_current|O1
2023-12-16T04:15:26.9892025Z|f_sim_p1_prg_cmt_current|(ROUGH)
2023-12-16T04:15:26.9892106Z|f_sim_p1_prg_size_current|26500
2023-12-16T04:15:26.9892186Z|f_sim_p1_prg_mod_current|2021-05-10T08:07:00.0000000-05:00
2023-12-16T04:15:26.9892266Z|f_sim_availability|AVAILABLE
2023-12-16T04:15:26.9892356Z|f_sim_adapter_ip|192.168.100.4;192.168.56.1;192.168.150.237;127.0.0.1
2023-12-16T04:15:26.9892440Z|f_sim_adapter_port|7878
2023-12-16T04:15:26.9892519Z|f_sim_machine_ip|192.168.111.12
2023-12-16T04:15:26.9892602Z|f_sim_machine_port|8193
                                                    2023-12-16T04:15:43.0223649Z|f_sim_adapter_health|NORMAL||||
                                                                                                                * PONG 10000
                                                                                                                             * PONG 10000

@MRIIOT MRIIOT closed this as completed Dec 16, 2023
@MRIIOT
Copy link
Author

MRIIOT commented Dec 16, 2023

I am testing now with FilterDuplicates=true.

Docker on Linux x86 the behavior is correct and all DataItems are sent over.

But actually in Docker on ARM it behaves differently. Only the last DataItem that was updated is sent over when connecting with Telnet. All other observations are not sent.

2023-12-16T04:50:01.9328677Z|f_sim_p1_tmr_powered|48656940
                                                          * PONG 10000
                                                                       * PONG 10000

@PatrickRitchie
Copy link
Contributor

I ran across the same issue using Docker a few days ago. If it is the same issue, the Apline image doesn't include all of the CultureInfo libraries in order to save space.

This article explains the issue (although the error was slightly different):
https://andrewlock.net/dotnet-core-docker-and-cultures-solving-culture-issues-porting-a-net-core-app-from-windows-to-linux/

The solution for me was to add the following lines to the Docker file:

RUN apk add --no-cache icu-libs
ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false

The Docker file I used for building an Agent is below with the two lines added:

FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
WORKDIR /app
COPY . ./
FROM mcr.microsoft.com/dotnet/runtime:8.0.0-alpine3.18-arm64v8
RUN apk add --no-cache icu-libs
ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
WORKDIR /app
COPY --from=build-env /app .
EXPOSE 5000/tcp
EXPOSE 1883/tcp
EXPOSE 7878/tcp
ENTRYPOINT ["dotnet", "agent.dll"]
CMD ["debug"]'

I'm looking at a solution to not require this but this worked to resolve the issue for me. Let me know if you still have issues with it.

@MRIIOT
Copy link
Author

MRIIOT commented Dec 16, 2023

What issue did it fix for you?

I tried it after the last stage, but no effect. I'm also building against Debian Bullseye Slim ARM32.

RUN apt-get update && apt-get install -y --no-install-recommends libicu67
ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false

@PatrickRitchie
Copy link
Contributor

Sorry I didn't see you tagged me in the other issue. The issue I ran into was with creating an instance of a CultureInfo class when that culture info wasn't included in the Alpine image. Although I was using Docker for an Agent, the library that was causing the issue should have caused an issue on either Agent or Adapter since it was in the ShdrLine.cs class that both use.

I'm trying to see if I can get a similar issue on my end. So far it works on ARM64 but need to test on the ARM32 image you mentioned.

Are you using the ShdrAdapter class in a library? If so, you should be able to see any errors by subscribing to the SendError event.

private bool WriteLineToClient(AgentClient client, string line)
{
    if (client != null && !string.IsNullOrEmpty(line))
    {
        var lines = SplitLines(line);
        if (!lines.IsNullOrEmpty())
        {
            foreach (var singleLine in lines)
            {
                try
                {
                    // Convert string to ASCII bytes and add line terminator
                    var bytes = Encoding.ASCII.GetBytes(singleLine + "\n");

                    // Get the TcpClient Stream
                    var stream = client.TcpClient.GetStream();
                    stream.ReadTimeout = Timeout;
                    stream.WriteTimeout = Timeout;

                    // Write the line (in bytes) to the Stream
                    stream.Write(bytes, 0, bytes.Length);

                    LineSent?.Invoke(this, new AdapterEventArgs(client.Id, singleLine));
                }
                catch (Exception ex)
                {
                    SendError?.Invoke(this, new AdapterEventArgs(client.Id, ex.Message));
                    return false;
                }
            }

            return true;
        }
    }

    return false;
}

Let me know if you are available for me to login remotely to help as I might not be able to reproduce it on my end.

@MRIIOT
Copy link
Author

MRIIOT commented Dec 18, 2023

@PatrickRitchie. I am using an instance of the ShdrAdapter class. SendError is never invoked. What I have observed is that when FilterDuplicates=false, then all the data comes over the wire just fine as it's fed into ShdrAdapter. When FilterDuplicates=true, then I am seeing that SendLast only sends a single observation, the one that has changed last, not all the observations that ShdrAdapter is holding.

@MRIIOT
Copy link
Author

MRIIOT commented Dec 18, 2023

So after our discussion, it appears that ShdrQueueAdapter and FilterDuplicates=true might be fighting each other. Which makes sense to turn off FilterDuplicates when using ShdrQueueAdapter.

PatrickRitchie added a commit that referenced this issue Dec 19, 2023
- Added missing methods to ShdrAdapter
- Added ConnectionError event to ShdrAdapter class (related to #53)
PatrickRitchie added a commit that referenced this issue May 14, 2024
commit c75223e
Author: Patrick Ritchie <[email protected]>
Date:   Mon May 13 20:57:15 2024 -0400

    Updated ReadMe files for v6.4.0

commit dd1f148
Author: Patrick Ritchie <[email protected]>
Date:   Mon May 13 20:55:57 2024 -0400

    Updated accessibility of Ceen classes to be Internal

commit a980444
Author: Patrick Ritchie <[email protected]>
Date:   Wed May 1 23:23:59 2024 -0400

    Update 6.3.2

    - Updated ReadMe files
    - Added DotNet CLI template project

commit 4740f36
Author: Patrick Ritchie <[email protected]>
Date:   Wed Apr 24 10:38:01 2024 -0400

    Added Agents directory ReadMe

commit 35422e0
Author: Patrick Ritchie <[email protected]>
Date:   Wed Apr 24 00:15:45 2024 -0400

    Update v6.3.1

    - Fixed issue with duplicate Observations
    - Fixed issue with MQTT Document Server

commit 74f43b6
Author: Patrick Ritchie <[email protected]>
Date:   Tue Apr 16 22:15:16 2024 -0400

    Update v6.3.0 beta

    - Updated to set InstanceId in MTConnectHttpClient and MTConnectMqttClient
    - Updated to fix issue #59
    - Updated to fix issue using "at" with Current request
    - Fixed issue with Json DataSets and Tables when Unavailable
    - Update to add SendBuffer() method in ShdrQueueAdapter and ShdrIntervalQueueAdapter
    - Fixed issue with MQTT Device message format
    -

commit 4d39947
Author: Patrick Ritchie <[email protected]>
Date:   Sat Apr 6 18:06:56 2024 -0400

    Added ReadMe for Embedded Agent Example

commit 68fd9fc
Author: Patrick Ritchie <[email protected]>
Date:   Sat Apr 6 17:42:44 2024 -0400

    Added Screenshot

commit a091202
Author: Patrick Ritchie <[email protected]>
Date:   Sat Apr 6 17:41:44 2024 -0400

    Added Screenshot

commit fdc340b
Author: Patrick Ritchie <[email protected]>
Date:   Fri Apr 5 00:27:15 2024 -0400

    Update v6.2.2

    - Added Category, Sequence,  and InstanceId to MQTT Relay and MQTT Broker messages using the Entity topic structure.
    - Updated Condition Entity MQTT messages to be an array in order to contain multiple fault states for a single DataItem

commit 806f197
Author: Patrick Ritchie <[email protected]>
Date:   Wed Apr 3 01:46:35 2024 -0400

    Update v6.2.1

    Added **topicStructure** configuration option to Mqtt Relay and Mqtt Broker Agent modules. This is used to toggle between "Document" and "Entity" where Document is the "standard" structure (Probe, Current, Sample, & Asset) and Entity is the format used in the version 5.* Agents.

commit cf3cf27
Author: Patrick Ritchie <[email protected]>
Date:   Wed Mar 27 00:15:54 2024 -0400

    Update v6.2.0

    - Updated TLS functionality for HTTP and MQTT
    - Added 'Available' topic for MQTT Agent Device

commit 971f101
Author: Patrick Ritchie <[email protected]>
Date:   Fri Mar 15 17:37:48 2024 -0400

    Update v6.1.3

    Fixed issue with firstSequence in MTConnectObservationBuffer class

commit 0936f47
Author: Patrick Ritchie <[email protected]>
Date:   Fri Mar 15 00:34:23 2024 -0400

    Update v6.1.2

    - Added additional methods to MTConnectInputAgentModule class

commit 953766d
Author: Patrick Ritchie <[email protected]>
Date:   Mon Mar 4 12:22:45 2024 -0500

    Update v6.1.1

    - Fixed issue with older .NET framework versions
    - Updated ReadMe

commit 2db33be
Author: Patrick Ritchie <[email protected]>
Date:   Fri Mar 1 01:20:49 2024 -0500

    Updated to add a FormatError to MTConnectHttpClient

commit bf242b2
Author: Patrick Ritchie <[email protected]>
Date:   Thu Feb 29 02:59:46 2024 -0500

    Updated to add Validation for individual DataItem Types and a Validate() method to the Observation class

commit ac55619
Author: Patrick Ritchie <[email protected]>
Date:   Thu Feb 29 02:01:13 2024 -0500

    Updated to use unsigned integers for Agent InstanceId and Observation Sequence Numbers

commit 048f5f3
Author: Patrick Ritchie <[email protected]>
Date:   Sat Feb 24 21:07:00 2024 -0500

    Added Nuget Image

commit bcc05b4
Author: Patrick Ritchie <[email protected]>
Date:   Thu Feb 22 23:41:00 2024 -0500

    Updated for MTConnect v2.3

    - Rebuilt generated files using the SysML import
    - Added ConditionId property to Condition observations
    - Updated deviceType Http parameter functionality
    - Added EnableAgentDevice configuration parameter for AgentConfiguration class
    -

commit 173b89f
Author: Patrick Ritchie <[email protected]>
Date:   Fri Feb 16 01:54:35 2024 -0500

    Update 6.0.14

    - Improved Performance (better usage of Streams instead of byte arrays)
    - Improved Client Performance by caching DataItems and Components

commit f74f513
Author: Patrick Ritchie <[email protected]>
Date:   Thu Feb 8 18:12:53 2024 -0500

    Update v6.0.12

    Fixed issue with MTConnectHttpClient Start() and StartFromSequence() methods

commit 917f8a5
Author: Patrick Ritchie <[email protected]>
Date:   Fri Feb 2 02:28:08 2024 -0500

    Updated year references from 2023 to 2024

commit 280e0d8
Author: Patrick Ritchie <[email protected]>
Date:   Fri Feb 2 01:58:06 2024 -0500

    Update 6.0.11

    - Fixed issue with Conditions with same Native Code
    - Added methods to Device, Component, Composition to set IDs and Add DataItems
    - Added MTConnectInputAgentModule class to use for embedded adapters
    - Fixed issues with SHDR Adapter in Agent Device
    - Fixed various minor issues

commit eab82b0
Author: Patrick Ritchie <[email protected]>
Date:   Fri Jan 26 16:38:25 2024 -0500

    Update 6.0.10

    - Added DataSourceConfiguration for use with embedded Agents
    - Added default agent configuration file and default nlog configuration file to output in MTConnect.NET-Applications-Agents Nuget package
    - Fixed issue with Controllers component version

commit b3286fe
Author: Patrick Ritchie <[email protected]>
Date:   Tue Jan 23 15:42:34 2024 -0500

    Fixed typo in ReadMe

commit c5d832f
Merge: e444ec9 a7bc5d9
Author: Patrick Ritchie <[email protected]>
Date:   Thu Dec 28 11:47:06 2023 -0500

    Merge branch 'version-6.0' of https://github.com/TrakHound/MTConnect.NET into version-6.0

commit e444ec9
Author: Patrick Ritchie <[email protected]>
Date:   Thu Dec 28 11:46:47 2023 -0500

    Update 6.0.9

    - Fixed issue with Device MTConnectVersion and Hash output
    - Removed InstanceId property for Device (not in MTConnect Standard but was used in old MQTT protocol)

commit a7bc5d9
Author: Patrick Ritchie <[email protected]>
Date:   Thu Dec 28 10:51:33 2023 -0500

    Update README.md

commit 792092c
Author: Patrick Ritchie <[email protected]>
Date:   Wed Dec 27 01:22:43 2023 -0500

    Update v6.0.8

commit f02f59d
Author: Patrick Ritchie <[email protected]>
Date:   Tue Dec 26 23:44:46 2023 -0500

    Removed MTConnect.NET-Services from being a dependency for MTConnect.NET as it is not needed for most implementations

commit 7fd624c
Author: Patrick Ritchie <[email protected]>
Date:   Tue Dec 26 23:44:04 2023 -0500

    Updated to filter "Types::" prefix in SysML imported descriptions

commit 925bb70
Author: Patrick Ritchie <[email protected]>
Date:   Tue Dec 26 23:33:20 2023 -0500

    Clean up

commit e48bf3c
Author: Patrick Ritchie <[email protected]>
Date:   Tue Dec 26 22:46:34 2023 -0500

    Clean up

commit 96971f9
Author: Patrick Ritchie <[email protected]>
Date:   Tue Dec 26 22:22:30 2023 -0500

    Fixed issue with Adapter

commit 7c4bcfe
Author: Patrick Ritchie <[email protected]>
Date:   Tue Dec 19 00:50:30 2023 -0500

    Update v6.0.7

    - Added missing methods to ShdrAdapter
    - Added ConnectionError event to ShdrAdapter class (related to #53)

commit 08b334f
Author: Patrick Ritchie <[email protected]>
Date:   Tue Dec 19 00:00:20 2023 -0500

    Update v6.0.6

    - Fixed issue with Composition class name (error in template)
    - Fixed issue with CuttingItems in XML, JSON, and JSON-CPPAGENT

commit 62335cd
Author: Patrick Ritchie <[email protected]>
Date:   Mon Dec 18 11:22:34 2023 -0500

    Updated Adapter Logging

commit 9b68f4a
Author: Patrick Ritchie <[email protected]>
Date:   Thu Dec 14 20:17:03 2023 -0500

    Update README

commit b59eb9f
Author: Patrick Ritchie <[email protected]>
Date:   Wed Dec 13 23:05:21 2023 -0500

    Fixed issue with compatibility with .NET Framework

commit deb9e6f
Author: Patrick Ritchie <[email protected]>
Date:   Wed Dec 13 22:07:16 2023 -0500

    Update version 6.0.5 beta

commit 76e0911
Author: Patrick Ritchie <[email protected]>
Date:   Wed Dec 13 22:06:34 2023 -0500

    Fixed issue with Asset formatting

commit 74dc638
Author: Patrick Ritchie <[email protected]>
Date:   Wed Dec 13 22:06:16 2023 -0500

    Updated Logging

commit dc675d1
Author: Patrick Ritchie <[email protected]>
Date:   Wed Dec 13 22:04:15 2023 -0500

    Added support for MQTT Adapter Devices and Assets

commit aeec28a
Author: Patrick Ritchie <[email protected]>
Date:   Tue Dec 12 22:16:32 2023 -0500

    Update v6.0.4 beta

commit 2148d2e
Author: Patrick Ritchie <[email protected]>
Date:   Tue Dec 12 21:55:36 2023 -0500

    Updated for newest MQTTnet package

commit 7202e82
Author: Patrick Ritchie <[email protected]>
Date:   Tue Dec 12 20:51:08 2023 -0500

    Fixed issue with deserializing XML Assets document

commit 77cdd20
Author: Patrick Ritchie <[email protected]>
Date:   Tue Dec 12 20:50:50 2023 -0500

    Updated Default Service Name

commit 268f569
Author: Patrick Ritchie <[email protected]>
Date:   Tue Dec 12 20:50:33 2023 -0500

    Updated Logging

commit 3b97913
Author: Patrick Ritchie <[email protected]>
Date:   Tue Dec 12 20:50:22 2023 -0500

    Added GetDevice(), GetDevices(), and GetDevice(string deviceType) methods without Version parameter

commit ce447c8
Author: Patrick Ritchie <[email protected]>
Date:   Tue Dec 12 20:49:34 2023 -0500

    Added JSON doc

commit a0dc01b
Author: Patrick Ritchie <[email protected]>
Date:   Tue Dec 12 20:49:11 2023 -0500

    Clean up unused projects

commit 576e1a6
Author: Patrick Ritchie <[email protected]>
Date:   Tue Dec 12 02:16:32 2023 -0500

    Update assembly version to 6.0.3

commit 1e15168
Author: Patrick Ritchie <[email protected]>
Date:   Tue Dec 12 02:16:03 2023 -0500

    Fixed issue with .NET Framework compatiblity

commit ff7a914
Author: Patrick Ritchie <[email protected]>
Date:   Tue Dec 12 02:00:02 2023 -0500

    Updated MqttServerConfiguration

commit db237b5
Author: Patrick Ritchie <[email protected]>
Date:   Tue Dec 12 01:59:46 2023 -0500

    Added MQTT topic constants

commit 0dbe897
Author: Patrick Ritchie <[email protected]>
Date:   Tue Dec 12 01:59:24 2023 -0500

    Fixed issue with Json DataItem read

commit 45321bf
Author: Patrick Ritchie <[email protected]>
Date:   Tue Dec 12 01:59:13 2023 -0500

    Update Json Input Formatter

commit 5c1f630
Author: Patrick Ritchie <[email protected]>
Date:   Tue Dec 12 01:58:20 2023 -0500

    Update MQTT Relay configuration

commit 4484b1f
Author: Patrick Ritchie <[email protected]>
Date:   Tue Dec 12 01:57:28 2023 -0500

    Updated MQTT Adapter Agent Module

commit fd9291a
Author: Patrick Ritchie <[email protected]>
Date:   Mon Dec 11 04:18:14 2023 -0500

    Fixed issue with initial load of Agent Device observations

commit 0d43e93
Author: Patrick Ritchie <[email protected]>
Date:   Mon Dec 11 04:17:48 2023 -0500

    Fixed Issue with shutdown exception

commit 23436ef
Author: Patrick Ritchie <[email protected]>
Date:   Mon Dec 11 03:58:42 2023 -0500

    Clean up

commit eeaa9e2
Author: Patrick Ritchie <[email protected]>
Date:   Mon Dec 11 03:58:21 2023 -0500

    Added CleanSession configuration for using MQTT persistent sessions

commit e09844b
Author: Patrick Ritchie <[email protected]>
Date:   Mon Dec 11 03:56:59 2023 -0500

    Updated Logging

commit ce47711
Author: Patrick Ritchie <[email protected]>
Date:   Mon Dec 11 02:26:30 2023 -0500

    Clean up

commit d17dcd3
Author: Patrick Ritchie <[email protected]>
Date:   Mon Dec 11 02:26:06 2023 -0500

    Clean up

commit 0829904
Author: Patrick Ritchie <[email protected]>
Date:   Mon Dec 11 01:56:04 2023 -0500

    Added ability to map HTTP Accept headers to Document Format IDs in the configuration file

commit ccac9ce
Author: Patrick Ritchie <[email protected]>
Date:   Mon Dec 11 01:15:07 2023 -0500

    Optimized Table and DataSet Observation Value Keys

commit 9c10695
Author: Patrick Ritchie <[email protected]>
Date:   Sun Dec 10 03:08:08 2023 -0500

    Update MqttAdapter Agent Module

commit b20d9cc
Author: Patrick Ritchie <[email protected]>
Date:   Sun Dec 10 03:07:54 2023 -0500

    Updated HttpAdapter Agent Module

commit a719175
Author: Patrick Ritchie <[email protected]>
Date:   Sun Dec 10 03:07:40 2023 -0500

    Updated SHDR Adapter Module

commit 0ab5c12
Author: Patrick Ritchie <[email protected]>
Date:   Sun Dec 10 03:07:24 2023 -0500

    Updated MQTT Adapter module

commit 6cafed7
Author: Patrick Ritchie <[email protected]>
Date:   Sun Dec 10 03:07:11 2023 -0500

    Updated Logging

commit a874c37
Author: Patrick Ritchie <[email protected]>
Date:   Sun Dec 10 03:05:52 2023 -0500

    Added Type to AssetInput model

commit a6795b8
Author: Patrick Ritchie <[email protected]>
Date:   Sun Dec 10 03:05:37 2023 -0500

    Updated MQTT input models

commit 71ff0ad
Author: Patrick Ritchie <[email protected]>
Date:   Sun Dec 10 03:05:13 2023 -0500

    Updated Readme

commit 858a20a
Author: Patrick Ritchie <[email protected]>
Date:   Sun Dec 10 03:04:56 2023 -0500

    Optimizing Table and DataSet processing (in-progress)

commit 09b4919
Author: Patrick Ritchie <[email protected]>
Date:   Sun Dec 10 03:04:28 2023 -0500

    Added new InputFormatter to format input data

commit 0add24b
Author: Patrick Ritchie <[email protected]>
Date:   Sun Dec 10 02:50:08 2023 -0500

    Fixed issue with Normal Condition clearing based on NativeCode

commit cd61163
Author: Patrick Ritchie <[email protected]>
Date:   Sat Dec 9 03:16:47 2023 -0500

    Added Logging to MTConnectDataSource

commit 992e94f
Author: Patrick Ritchie <[email protected]>
Date:   Sat Dec 9 01:25:45 2023 -0500

    Updated client example projects

commit 5f28c96
Author: Patrick Ritchie <[email protected]>
Date:   Sat Dec 9 01:25:13 2023 -0500

    Fixed issue with regex pattern

commit d18c515
Author: Patrick Ritchie <[email protected]>
Date:   Sat Dec 9 01:24:42 2023 -0500

    Fixed issue with reading DataItem from Json cppagent format

commit 36c0111
Author: Patrick Ritchie <[email protected]>
Date:   Sat Dec 9 01:24:18 2023 -0500

    Fixed issue with reading Asset

commit 5ca6761
Author: Patrick Ritchie <[email protected]>
Date:   Sat Dec 9 01:23:50 2023 -0500

    Fixed issue with reading response with no ContentEncoding HTTP Header

commit 37b3d34
Author: Patrick Ritchie <[email protected]>
Date:   Sat Dec 9 01:23:19 2023 -0500

    Updated IMTConnectClient to not contain HTTP specific properties / methods

commit ab14ffb
Author: Patrick Ritchie <[email protected]>
Date:   Sat Dec 9 01:22:36 2023 -0500

    Fixed issue with exception during shutdown

commit dd94ced
Author: Patrick Ritchie <[email protected]>
Date:   Sat Dec 9 01:22:09 2023 -0500

    Added Processor ID

commit 2b71147
Author: Patrick Ritchie <[email protected]>
Date:   Sat Dec 9 01:21:53 2023 -0500

    Updated MQTT Client and Server

commit de75ac0
Author: Patrick Ritchie <[email protected]>
Date:   Sat Dec 9 01:21:01 2023 -0500

    Updated Logging

commit 626de8a
Author: Patrick Ritchie <[email protected]>
Date:   Fri Dec 8 01:50:06 2023 -0500

    Update ReadMe

commit 3e7480b
Author: Patrick Ritchie <[email protected]>
Date:   Fri Dec 8 01:36:38 2023 -0500

    Update ReadMe

commit 55c2b15
Author: Patrick Ritchie <[email protected]>
Date:   Fri Dec 8 01:36:15 2023 -0500

    Fixed issue with Assets

commit 7f5c233
Author: Patrick Ritchie <[email protected]>
Date:   Fri Dec 8 01:35:57 2023 -0500

    Fixed issue with requesting the Agent Device by UUID

commit 1e4f828
Author: Patrick Ritchie <[email protected]>
Date:   Fri Dec 8 01:35:35 2023 -0500

    Updated Logging

commit 2020dc3
Author: Patrick Ritchie <[email protected]>
Date:   Fri Dec 8 01:35:22 2023 -0500

    Updated EntityFormatter to use a struct response instead of just a string

commit 064c80c
Author: Patrick Ritchie <[email protected]>
Date:   Fri Dec 8 01:32:46 2023 -0500

    Updated Agent Modules

commit a156743
Author: Patrick Ritchie <[email protected]>
Date:   Thu Dec 7 20:43:31 2023 -0500

    Clean up

commit 716d172
Author: Patrick Ritchie <[email protected]>
Date:   Thu Dec 7 02:29:53 2023 -0500

    Update ReadMe

commit 3ab4be4
Author: Patrick Ritchie <[email protected]>
Date:   Thu Dec 7 02:10:07 2023 -0500

    Update ReadMe

commit ceea3b3
Author: Patrick Ritchie <[email protected]>
Date:   Thu Dec 7 01:14:02 2023 -0500

    Update ReadMe

commit 2145979
Author: Patrick Ritchie <[email protected]>
Date:   Wed Dec 6 01:43:28 2023 -0500

    Updated Project Files for Nuget Build

commit 5e57e2b
Author: Patrick Ritchie <[email protected]>
Date:   Tue Dec 5 22:40:23 2023 -0500

    Update ReadMe

commit c2f7a46
Author: Patrick Ritchie <[email protected]>
Date:   Tue Dec 5 22:37:34 2023 -0500

    Update ReadMe

commit 19efdf2
Author: Patrick Ritchie <[email protected]>
Date:   Tue Dec 5 22:11:50 2023 -0500

    Update ReadMe

commit 5327b2b
Author: Patrick Ritchie <[email protected]>
Date:   Tue Dec 5 22:09:00 2023 -0500

    Update ReadMe

commit 9dd8df7
Author: Patrick Ritchie <[email protected]>
Date:   Tue Dec 5 21:27:12 2023 -0500

    Update ReadMe

commit fad6c6d
Author: Patrick Ritchie <[email protected]>
Date:   Tue Dec 5 21:06:34 2023 -0500

    Update ReadMe

commit 84abbb5
Author: Patrick Ritchie <[email protected]>
Date:   Tue Dec 5 20:56:02 2023 -0500

    Updated MQTT Expander

commit 817dbae
Author: Patrick Ritchie <[email protected]>
Date:   Tue Dec 5 20:55:54 2023 -0500

    Updated ReadMe

commit ce9c2f0
Author: Patrick Ritchie <[email protected]>
Date:   Tue Dec 5 20:55:31 2023 -0500

    Update to Adapter application

commit 739287d
Author: Patrick Ritchie <[email protected]>
Date:   Tue Dec 5 00:31:15 2023 -0500

    Updated Python Processor module

commit 37b131e
Author: Patrick Ritchie <[email protected]>
Date:   Tue Dec 5 00:31:04 2023 -0500

    Added MTConnectAgentProcessor base class and added Log() method for processors

commit cbb53e2
Author: Patrick Ritchie <[email protected]>
Date:   Tue Dec 5 00:30:04 2023 -0500

    Update to Mqtt Broker Module

commit aa5bbcf
Author: Patrick Ritchie <[email protected]>
Date:   Tue Dec 5 00:29:47 2023 -0500

    Update to Http Client Adapter

commit 3c34de8
Author: Patrick Ritchie <[email protected]>
Date:   Mon Dec 4 20:54:54 2023 -0500

    Update ReadMe

commit 7c61a11
Author: Patrick Ritchie <[email protected]>
Date:   Mon Dec 4 20:24:43 2023 -0500

    Clean up

commit 98ce661
Author: Patrick Ritchie <[email protected]>
Date:   Mon Dec 4 20:24:28 2023 -0500

    Fixed issue with TimeSpan.Ticks

commit 117853f
Author: Patrick Ritchie <[email protected]>
Date:   Mon Dec 4 20:24:02 2023 -0500

    Moved StartAgentBeforeLoad() method to before Devices are loaded

commit 6e8f66d
Author: Patrick Ritchie <[email protected]>
Date:   Mon Dec 4 20:23:22 2023 -0500

    Fixed issue with SHDR Agent Module

commit 9ad194a
Author: Patrick Ritchie <[email protected]>
Date:   Mon Dec 4 20:23:04 2023 -0500

    Updated MQTT Broker Module

commit 1ddf8dc
Author: Patrick Ritchie <[email protected]>
Date:   Sun Dec 3 00:44:37 2023 -0500

    Added DockerFile (testing)

commit 61d91b8
Author: Patrick Ritchie <[email protected]>
Date:   Sun Dec 3 00:09:05 2023 -0500

    Updated ReadMe files

commit 10bf3de
Author: Patrick Ritchie <[email protected]>
Date:   Sat Dec 2 22:34:27 2023 -0500

    Updated ReadMe

commit 9b5fa07
Author: Patrick Ritchie <[email protected]>
Date:   Sat Dec 2 22:22:31 2023 -0500

    Updated ReadMe

commit eb4d51f
Author: Patrick Ritchie <[email protected]>
Date:   Sat Dec 2 20:41:58 2023 -0500

    Update

commit 4a7d944
Author: Patrick Ritchie <[email protected]>
Date:   Thu Nov 30 01:20:39 2023 -0500

    Update

commit 215e8e8
Author: Patrick Ritchie <[email protected]>
Date:   Wed Nov 29 00:54:52 2023 -0500

    Updated Readme

commit 2011c8d
Author: Patrick Ritchie <[email protected]>
Date:   Wed Nov 29 00:26:09 2023 -0500

    Added HTTP Client Example Project

commit 791dcec
Author: Patrick Ritchie <[email protected]>
Date:   Tue Nov 28 23:02:40 2023 -0500

    Updated repo

commit a716bec
Author: Patrick Ritchie <[email protected]>
Date:   Tue Nov 28 22:36:31 2023 -0500

    Clean up

commit d70d3ca
Author: Patrick Ritchie <[email protected]>
Date:   Tue Nov 28 22:17:19 2023 -0500

    Clean up

commit 34b647a
Author: Patrick Ritchie <[email protected]>
Date:   Tue Nov 28 22:07:38 2023 -0500

    Clean up

commit 969dedd
Author: Patrick Ritchie <[email protected]>
Date:   Tue Nov 28 21:58:21 2023 -0500

    Added ReadMe files

commit 2b8107d
Author: Patrick Ritchie <[email protected]>
Date:   Tue Nov 28 01:16:45 2023 -0500

    Updated ShdrAdapter to inherit from MTConnectAdapter base class

commit 5688123
Author: Patrick Ritchie <[email protected]>
Date:   Tue Nov 28 01:15:41 2023 -0500

    Updated to .NET 8

commit a906f5f
Author: Patrick Ritchie <[email protected]>
Date:   Tue Nov 28 01:03:54 2023 -0500

    Updated to .NET 8

commit 7a547a5
Author: Patrick Ritchie <[email protected]>
Date:   Tue Nov 28 00:44:58 2023 -0500

    Update

commit 0067e0d
Author: Patrick Ritchie <[email protected]>
Date:   Tue Nov 28 00:29:43 2023 -0500

    Update

commit 55f0c6a
Author: Patrick Ritchie <[email protected]>
Date:   Mon Nov 27 02:08:59 2023 -0500

    Reorganized Repo

commit 3eacea9
Author: Patrick Ritchie <[email protected]>
Date:   Sat Nov 25 01:49:20 2023 -0500

    Update

commit 98297d8
Author: Patrick Ritchie <[email protected]>
Date:   Fri Nov 24 02:08:01 2023 -0500

    Update

commit 2493762
Author: Patrick Ritchie <[email protected]>
Date:   Fri Nov 24 02:01:15 2023 -0500

    Update

commit 52126b7
Author: Patrick Ritchie <[email protected]>
Date:   Thu Nov 23 02:50:10 2023 -0500

    Update

commit 18a0abb
Author: Patrick Ritchie <[email protected]>
Date:   Wed Nov 8 02:36:05 2023 -0500

    Added Logging to Modules and Processors

commit 9d89411
Author: Patrick Ritchie <[email protected]>
Date:   Wed Nov 8 00:28:43 2023 -0500

    Set RestApiHelper to not build (to prevent build errors)

commit d258248
Author: Patrick Ritchie <[email protected]>
Date:   Wed Nov 8 00:21:44 2023 -0500

    Updated to fix issues with .NET Framework 4.6.1

commit 2f98efa
Author: Patrick Ritchie <[email protected]>
Date:   Tue Nov 7 22:23:37 2023 -0500

    Removed Console Project (used for debugging)

commit d9606f6
Author: Patrick Ritchie <[email protected]>
Date:   Tue Nov 7 21:52:41 2023 -0500

    Added Python Processor

commit af634c5
Author: Patrick Ritchie <[email protected]>
Date:   Tue Nov 7 02:12:19 2023 -0500

    Adding AgentProcessor

commit 1fbd4a9
Author: Patrick Ritchie <[email protected]>
Date:   Mon Nov 6 02:04:19 2023 -0500

    Added Agent Modules

commit 9a46a92
Author: Patrick Ritchie <[email protected]>
Date:   Fri Nov 3 01:42:26 2023 -0400

    Update SysML Import

commit ededffe
Author: Patrick Ritchie <[email protected]>
Date:   Thu Nov 2 01:24:05 2023 -0400

    Update SysML Import

commit a08a551
Author: Patrick Ritchie <[email protected]>
Date:   Wed Nov 1 03:00:45 2023 -0400

    Update to MQTT Client

commit c41cbbf
Author: Patrick Ritchie <[email protected]>
Date:   Tue Oct 31 22:59:25 2023 -0400

    Update SysML Import

commit 44cf3b0
Author: Patrick Ritchie <[email protected]>
Date:   Tue Oct 31 22:00:12 2023 -0400

    Update SysML Import

commit a88381f
Author: Patrick Ritchie <[email protected]>
Date:   Tue Oct 31 01:58:30 2023 -0400

    Update SysML Import

commit efa14cc
Author: Patrick Ritchie <[email protected]>
Date:   Mon Oct 30 21:48:07 2023 -0400

    Update SysML Import

commit 57ecd35
Author: Patrick Ritchie <[email protected]>
Date:   Mon Oct 30 21:18:27 2023 -0400

    Update SysML Import

commit 8d5087d
Author: Patrick Ritchie <[email protected]>
Date:   Mon Oct 30 21:16:11 2023 -0400

    Update SysML Import

commit ad43dd8
Author: Patrick Ritchie <[email protected]>
Date:   Mon Oct 30 20:08:25 2023 -0400

    Update SysML Import

commit 29025f5
Author: Patrick Ritchie <[email protected]>
Date:   Mon Oct 30 18:20:24 2023 -0400

    Update SysML Import

commit 6fdc255
Author: Patrick Ritchie <[email protected]>
Date:   Mon Oct 30 02:52:30 2023 -0400

    Update SysML Import

commit 80c8380
Author: Patrick Ritchie <[email protected]>
Date:   Mon Oct 30 02:03:36 2023 -0400

    Update SysML Import

commit 686dd7b
Author: Patrick Ritchie <[email protected]>
Date:   Mon Oct 30 01:03:33 2023 -0400

    Update SysML Import

commit b827cae
Author: Patrick Ritchie <[email protected]>
Date:   Sun Oct 29 16:01:21 2023 -0400

    Update SysML Import

commit 3273eb3
Author: Patrick Ritchie <[email protected]>
Date:   Sun Oct 29 01:19:53 2023 -0400

    Update SysML Import

commit 595b061
Author: Patrick Ritchie <[email protected]>
Date:   Sat Oct 28 20:50:31 2023 -0400

    Update SysML Import

commit 0ae6419
Author: Patrick Ritchie <[email protected]>
Date:   Sat Oct 28 20:31:22 2023 -0400

    Update SysML Import

commit f17f571
Author: Patrick Ritchie <[email protected]>
Date:   Sat Oct 28 16:07:28 2023 -0400

    Update SysML Import

commit 596ea06
Author: Patrick Ritchie <[email protected]>
Date:   Sat Oct 28 12:59:22 2023 -0400

    Update SysML Import

commit 2227fdc
Author: Patrick Ritchie <[email protected]>
Date:   Sat Oct 28 01:46:27 2023 -0400

    Update SysML Import

commit 465a487
Author: Patrick Ritchie <[email protected]>
Date:   Fri Oct 27 20:58:06 2023 -0400

    Update SysML Import

commit 0c70a68
Author: Patrick Ritchie <[email protected]>
Date:   Fri Oct 27 19:30:26 2023 -0400

    Update SysML Import

commit a2ce254
Author: Patrick Ritchie <[email protected]>
Date:   Fri Oct 27 18:44:33 2023 -0400

    Update SysML Import

commit 59ef076
Author: Patrick Ritchie <[email protected]>
Date:   Fri Oct 27 18:25:25 2023 -0400

    Update SysML Import

commit 6d18962
Author: Patrick Ritchie <[email protected]>
Date:   Thu Oct 26 00:28:39 2023 -0400

    Update SysML Import

commit 8aae465
Author: Patrick Ritchie <[email protected]>
Date:   Thu Oct 26 00:28:24 2023 -0400

    Update SysML Import

commit 22b02a3
Author: Patrick Ritchie <[email protected]>
Date:   Wed Oct 25 18:46:58 2023 -0400

    Updated SysML Import

commit 9ac0af0
Author: Patrick Ritchie <[email protected]>
Date:   Wed Oct 25 18:43:12 2023 -0400

    Updated SysML Import

commit ef7fe74
Author: Patrick Ritchie <[email protected]>
Date:   Wed Oct 25 17:52:55 2023 -0400

    Updated Devices files from SysML Import

commit e0aeba4
Author: Patrick Ritchie <[email protected]>
Date:   Wed Oct 25 01:04:31 2023 -0400

    Update to SysML templates

commit 9ce374a
Author: Patrick Ritchie <[email protected]>
Date:   Tue Oct 24 20:55:49 2023 -0400

    Added SysML Import Project

commit 4b1cb2d
Author: Patrick Ritchie <[email protected]>
Date:   Tue Oct 24 20:48:57 2023 -0400

    Added SysML project

commit 6e4c0b6
Author: Patrick Ritchie <[email protected]>
Date:   Tue Oct 24 20:46:06 2023 -0400

    Fixed some issues with merging master

commit 921fc66
Merge: 99ec227 5266009
Author: Patrick Ritchie <[email protected]>
Date:   Tue Oct 24 20:36:48 2023 -0400

    Merge branch 'master' into version-6.0

commit 99ec227
Author: Patrick Ritchie <[email protected]>
Date:   Tue Aug 1 00:58:41 2023 -0400

    Updated the new Ceen HttpServer to use the AllowPut and AllowPutFrom configuration parameters (per HttpServerConfiguration)

commit 90c3e8d
Merge: a74c55d 4b07b66
Author: Patrick Ritchie <[email protected]>
Date:   Tue Aug 1 00:10:41 2023 -0400

    Merge branch 'master' into v6-dev

commit a74c55d
Author: Patrick Ritchie <[email protected]>
Date:   Mon Jul 24 19:32:36 2023 -0400

    Update to allow Hostname as Http Server

commit 9efa1ad
Author: Patrick Ritchie <[email protected]>
Date:   Mon Jun 26 12:47:20 2023 -0400

    Update

commit b6ad9d2
Author: Patrick Ritchie <[email protected]>
Date:   Thu Jun 1 09:50:14 2023 -0400

    Code clean up

commit ffa3403
Author: Patrick Ritchie <[email protected]>
Date:   Tue May 30 10:33:50 2023 -0400

    Added MTConnect-Agent project

commit d0d9547
Author: Patrick Ritchie <[email protected]>
Date:   Tue May 30 10:32:26 2023 -0400

    Added missing DataItem types for DataItem.GetPascalCaseType()

commit 02dbbc4
Author: Patrick Ritchie <[email protected]>
Date:   Tue May 30 10:31:57 2023 -0400

    Update to allow "root" Http configuration

commit cb7a425
Author: Patrick Ritchie <[email protected]>
Date:   Sat May 20 21:04:44 2023 -0400

    Added support for SHDR PUT and Asset POST Http Requests

commit 08c26ba
Author: Patrick Ritchie <[email protected]>
Date:   Sat May 20 18:42:15 2023 -0400

    Updated Static Response Handler and Fixed issue with root DeviceKey request

commit b1010d9
Author: Patrick Ritchie <[email protected]>
Date:   Sat May 20 17:18:22 2023 -0400

    Added support for static files from the Ceen HTTP server

commit d9353c9
Merge: 6a2314e 4c20509
Author: Patrick Ritchie <[email protected]>
Date:   Sat May 20 15:43:02 2023 -0400

    Merge branch 'master' into v6-dev

commit 6a2314e
Author: Patrick Ritchie <[email protected]>
Date:   Sat May 20 12:28:08 2023 -0400

    Added EntityClient example

commit 61253d3
Author: Patrick Ritchie <[email protected]>
Date:   Sat May 20 12:27:34 2023 -0400

    Added DataItem Description, Units, etc. lookups and updated Entity Formatters to support Device, Component, Composition, and DataItem

commit 9a54aa3
Author: Patrick Ritchie <[email protected]>
Date:   Sun May 7 16:30:25 2023 -0400

    Client Updated

    - Added IMTConnectEntity interface
    - Updated MTConnectHttpClient and MTConnectMqttClient to use new IMTConnectEntityClient interface
    - Updated MTConnectMqttClient to be more fault tolerant on disconnection of MQTT broker

commit 40a18ee
Author: Patrick Ritchie <[email protected]>
Date:   Fri May 5 02:09:28 2023 -0400

    Updated to use event keyword for EventHandlers. Removed "On" prefix for events

commit dac7e1f
Author: Patrick Ritchie <[email protected]>
Date:   Sun Apr 30 01:20:50 2023 -0400

    Added Ceen.Httpd source files to repo

commit 3411a82
Merge: 1f68f34 b9a3c8b
Author: Patrick Ritchie <[email protected]>
Date:   Sat Apr 29 23:45:36 2023 -0400

    Merge branch 'master' into http-server

commit 1f68f34
Author: Patrick Ritchie <[email protected]>
Date:   Sun Apr 23 14:26:47 2023 -0400

    Updated Http Server

    - Added Ceen Httpd to replace HttpListener
    - Added MTConnect.NET-TLS project to contain code for SSL/TLS certificates
    - Updated Http Configuration file to support multiple Http servers
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants