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.

Sign up for GitHub

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

Jump to bottom

Main dev #343

Merged
merged 205 commits into from
Oct 20, 2023
Merged

Main dev #343

merged 205 commits into from
Oct 20, 2023

Conversation

dwickelhaus
Copy link
Collaborator

Update to the readme file.
Changed the condition shdr example to -
Conditions require six (6) fields as follows:

<timestamp>|<data_item_name>|<level>|<native_code>|<native_severity>|<qualifier>|<message>
for adapters providing conditionIds - the conditionId is added to the native_code field with a ':' delimiter.
	<timestamp>|<data_item_name>|<level>|<native_code>|<condition_id:native_severity>|<qualifier>|<message>

wsobel added 30 commits July 17, 2023 19:18
@wsobel
Added build workflow
5ec98c8
@wsobel
Merge pull request #291 from mtconnect/github-actions
2176e3d 
Added build workflow
@wsobel
Added conan profile detect
fcbb1ca
@wsobel
checkpoint with successful build
5a46354
@wsobel
Merge remote-tracking branch 'origin/add-dynamic-device-creation-for-…
4d81b7e 
…agent-adapter-source' into conan2_test_package_support
@wsobel
Working tests with conan create
73f309e
@wsobel
fixed cpack destination directory and added script to get the zip file
f3e5684
@wsobel
updated workflow to use create and matrix shared
639d2fe
@wsobel
Merge pull request #292 from mtconnect/conan2_test_package_support
99ad2eb 
Conan2 test package support
@wsobel
changed shared flags to string
3e02fa5
@wsobel
added build for macos
fcac464
@wsobel
added build for macos
1dbfa19
@wsobel
fixed shared for non-matrixed build.
74379da
@wsobel
fixed shared for non-matrixed build.
225e5a9
@wsobel
Added windows runner
8b07a48
@wsobel
Added generators
61016a7
@wsobel
Added setup of msbuild to address path issues
a593cf4
@wsobel
More windows fixes
7f79adf
@wsobel
Check path for windows build
28f0845
@wsobel
Install ruby 3.1
9d6516f
@wsobel
Install ruby 3.1
919bede
@wsobel
Install ruby 3.1
748afc1
@wsobel
shared tests function
633752b
@wsobel
Fixed shared test and transitive requirements
571a431
@wsobel
Find cl.exe in path
94599e0
@wsobel
Just build mruby
f1fbd1c
@wsobel
Check path
34ea72e
@wsobel
added check for files in dir
21a3cf3
@wsobel
added check for files in dir
c1dd3b3
@wsobel
Try to find CL
57b8f4b
wsobel and others added 29 commits September 22, 2023 23:15
@wsobel
Turned on output on failure
1d48322
@wsobel
set environment variable
63a3eca
@wsobel
Fixed issues with *nix test builds and RPATH
5194855
@wsobel
do not set --disable-new-dtags for apple
e0ab73c
@wsobel
Added extra check in change observer test
7f63e1a
@wsobel
Fixed timing on async observer test
47f2e50
@wsobel
added more time for failed test
1be8f8b
@wsobel
Try another attempt to with the windows failure
4908704
@rajwork9
build fix for windows
5fc564d
@rajwork9
build fix for windows
6d1a439
@rajwork9
build fail: revert back changes due to differences in configurations …
1e78eb0 
…with other OS
@wsobel
refactored timers
88c1752
@wsobel
made changes for windows shared build
d7d9dc4
@wsobel
changed timing in period filter test for windows shared
4f8e6f6
@wsobel
changed change observer test to properly handle async small chunks
5ce4880
@wsobel
Merge pull request #327 from mtconnect/mqtt_releated_version_2
af864dd 
Mqtt releated version 2
@wsobel
Merge branch 'main' into json_configuration_file
ad259ac
@wsobel
Added string to ends with in agent config.
3fb50dd
@wsobel
Fixed ends with and fs path.
c427982
@wsobel
Merge pull request #331 from mtconnect/json_configuration_file
060ed4d
@wsobel
Version 2.2.0.7
e65463d
@wsobel
Merge branch 'main' into main-dev
ff7f878
@wsobel
Added support for conditionId in version 2.3 and native code field in…
c0db9e7 
… the format <native_code>:<condition_id>
@wsobel
default condition code to condition id when creating condition observ…
2d4e473 
…ation

added test to validate conditionId will be used for condition chaining in checkpoint
@wsobel
Merge pull request #332 from mtconnect/version-2.3-adding-condition-i…
769a93a 
…d-to-condition-observation

Version 2.3 adding condition id to condition observation
@dwickelhaus
Updated condition shdr format for the addition of condition_id to the…
cac6065 
… native_code field
@dwickelhaus
Corrected SHDR pattern conditions and the condtion_id parameter
bf04910 
	Corrected path to conan profiles for the Linux and MAC builds, the Windows paths were correct.
@dwickelhaus
Removed * from the comments under the adapter condition shdr examples.
9a8e22a
@wsobel
Merge pull request #344 from mtconnect/condition_id_shdr_readme_update
112b841 
Condition id shdr readme update
@wsobel wsobel merged commit 7d9534a into main-dev-readme-codition-update Oct 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@dwickelhaus @wsobel @ottobolyos @rwuthric @rajwork9 @shaurabhsingh