Skip to content

Updates for v2.6 and 2.7 with demo device model fixes. #596

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

Merged
wsobel merged 6 commits into from
Feb 24, 2026
Merged

Updates for v2.6 and 2.7 with demo device model fixes. #596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4f0fa29
Removed instance of strstream in winsock
wsobel Feb 18, 2026
69aa175
Added update for ubuntu build
wsobel Feb 18, 2026
3be2fb5
Updated mruby to 3.4
wsobel Feb 19, 2026
7686081
upgraded demo to 2.7
wsobel Feb 20, 2026
12b2164
Added schemas for 2.6 and 2.7 and fixed some of the XML entity genera…
wsobel Feb 23, 2026
b8e38bf
Version 2.7.0.4
wsobel Feb 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ jobs:
- name: Install dependencies
shell: bash
run: |
sudo apt update
sudo apt install -y build-essential cmake gcc-11 g++-11 python3 autoconf automake

- name: Checkout Agent
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set(AGENT_VERSION_MAJOR 2)
set(AGENT_VERSION_MINOR 7)
set(AGENT_VERSION_PATCH 0)
set(AGENT_VERSION_BUILD 3)
set(AGENT_VERSION_BUILD 4)
set(AGENT_VERSION_RC "")

# This minimum version is to support Visual Studio 2019 and C++ feature checking and FetchContent
Expand Down
5 changes: 4 additions & 1 deletion agent_lib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,10 +465,13 @@ target_clangtidy_setup(agent_lib)

include(../cmake/document.cmake)
if (AGENT_WITH_DOCS AND DOXYGEN_FOUND)
message(WARNING ": Setting up to create documentation")
file(GLOB _tests ${CMAKE_CURRENT_SOURCE_DIR}/../test_package/*.hpp ${CMAKE_CURRENT_SOURCE_DIR}/../test_package/*.cpp)
doxygen_add_docs(docs README.md ${AGENT_SOURCES} ${_tests}
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/.." )
install(DIRECTORY "${PROJECT_BINARY_DIR}/Documentation/" DESTINATION "Documentation")
install(DIRECTORY "${PROJECT_BINARY_DIR}/Documentation/" DESTINATION "Documentation")
else()
message(WARNING ": Documentation will not be created")
endif()

target_sources(agent_lib PUBLIC FILE_SET headers
Expand Down
4 changes: 2 additions & 2 deletions conan/mruby/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

class MRubyConan(ConanFile):
name = "mruby"
version = "3.2.0"
version = "3.4.0"
license = "https://github.com/mruby/mruby/blob/master/LICENSE"
author = "Yukihiro “Matz” Matsumoto"
homepage = "https://mruby.org/"
Expand All @@ -37,7 +37,7 @@ class MRubyConan(ConanFile):
_ruby_version_dir = "ruby-{}.{}.0".format(_major, _minor)

def source(self):
get(self, "https://github.com/mruby/mruby/archive/refs/tags/3.2.0.zip", strip_root=True, destination=self.source_folder)
get(self, "https://github.com/mruby/mruby/archive/refs/tags/3.4.0.zip", strip_root=True, destination=self.source_folder)
get(self, "https://github.com/mattn/mruby-onig-regexp/archive/refs/heads/master.zip",
strip_root=True, destination=os.path.join(self.source_folder, 'mrbgems', 'mruby-onig-regexp'))

Expand Down
9 changes: 4 additions & 5 deletions conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

class MTConnectAgentConan(ConanFile):
name = "mtconnect_agent"
version = "2.6"
version = "2.7"
url = "https://github.com/mtconnect/cppagent.git"
license = "Apache License 2.0"
settings = "os", "compiler", "arch", "build_type"
Expand Down Expand Up @@ -93,14 +93,13 @@ def tool_requires_version(self, package, version):
buf = io.StringIO()
command = f"{package} --version"
res = self.run(command, shell=True, stdout=buf)
self.output.info(f"Command: '{command}' returned {res}")
ver = [0, 0, 0]
if res == 0:
text = buf.getvalue()
self.output.debug(f"{command} returned:\n{text}")
ver = [int(d) for d in re.search(r"\d+\.\d+\.\d+", text).group(0).split('.')]
self.output.info(f"Version of {package} is {ver}")
else:
self.output.info(f"Command: '{command}' returned {res}")

if ver < version:
ver_text = '.'.join([str(x) for x in version])
Expand All @@ -112,7 +111,7 @@ def tool_requires_version(self, package, version):
def build_requirements(self):
self.tool_requires_version("cmake", [3, 26, 4])
if self.options.with_docs:
self.tool_requires_version("doxygen", [1, 15, 0])
self.tool_requires_version("doxygen", [1, 16, 0])

def requirements(self):
self.requires("boost/1.88.0", headers=True, libs=True, transitive_headers=True, transitive_libs=True)
Expand All @@ -125,7 +124,7 @@ def requirements(self):
self.requires("bzip2/1.0.8", headers=True, libs=True, transitive_headers=True, transitive_libs=True)

if self.options.with_ruby:
self.requires("mruby/3.2.0", headers=True, libs=True, transitive_headers=True, transitive_libs=True)
self.requires("mruby/3.4.0", headers=True, libs=True, transitive_headers=True, transitive_libs=True)

self.requires("gtest/1.17.0", headers=True, libs=True, transitive_headers=True, transitive_libs=True, test=True)

Expand Down
76 changes: 21 additions & 55 deletions demo/agent/Devices.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<MTConnectDevices xmlns:mt="urn:mtconnect.org:MTConnectDevices:2.0"
<MTConnectDevices xmlns:mt="urn:mtconnect.org:MTConnectDevices:2.7"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:mtconnect.org:MTConnectDevices:2.0"
xsi:schemaLocation="urn:mtconnect.org:MTConnectDevices:2.0 https://schemas.mtconnect.org/schemas/MTConnectDevices_2.0.xsd">
xmlns="urn:mtconnect.org:MTConnectDevices:2.7"
xsi:schemaLocation="urn:mtconnect.org:MTConnectDevices:2.7 ./schemas/MTConnectDevices_2.7.xsd">
<Header deviceModelChangeTime="2022-06-17T16:33:21.188094Z" creationTime="2013-04-02T03:40:04Z"
assetBufferSize="1024" sender="localhost" assetCount="0" version="2.0" instanceId="1"
bufferSize="131072"/>
Expand Down Expand Up @@ -133,8 +133,8 @@
<Motion actuation="DIRECT" coordinateSystemIdRef="machine" id="x1motion"
type="PRISMATIC">
<Transformation>
<Rotation>0 0 0</Rotation>
<Translation>0 0 0</Translation>
<Rotation>0 0 0</Rotation>
</Transformation>
<Axis>0.5 0 0</Axis>
</Motion>
Expand Down Expand Up @@ -182,8 +182,8 @@
<Motion actuation="DIRECT" coordinateSystemIdRef="machine" id="yi1motion"
type="PRISMATIC">
<Transformation>
<Rotation>0 0 0</Rotation>
<Translation>0 0 0</Translation>
<Rotation>0 0 0</Rotation>
</Transformation>
<Axis>0 1 0</Axis>
</Motion>
Expand Down Expand Up @@ -231,8 +231,8 @@
<Motion actuation="DIRECT" coordinateSystemIdRef="machine" id="z1motion"
type="PRISMATIC">
<Transformation>
<Rotation>0 0 0</Rotation>
<Translation>0 0 0</Translation>
<Rotation>0 0 0</Rotation>
</Transformation>
<Axis>0 0 1</Axis>
</Motion>
Expand Down Expand Up @@ -280,8 +280,8 @@
<Motion actuation="DIRECT" coordinateSystemIdRef="machine" id="bmotion"
type="REVOLUTE">
<Transformation>
<Rotation>0 0 0</Rotation>
<Translation>-623.423 1027.32 -993.652</Translation>
<Rotation>0 0 0</Rotation>
</Transformation>
<Axis>0 1 0</Axis>
</Motion>
Expand Down Expand Up @@ -311,8 +311,8 @@
<Motion actuation="DIRECT" coordinateSystemIdRef="machine" id="cmotion"
type="CONTINUOUS">
<Transformation>
<Rotation>0 0 0</Rotation>
<Translation>0 0 0</Translation>
<Rotation>0 0 0</Rotation>
</Transformation>
<Axis>0 0 1</Axis>
</Motion>
Expand All @@ -335,7 +335,7 @@
</Constraints>
</DataItem>
<DataItem type="CHUCK_STATE" category="EVENT" id="LS1ChuckState" name="S1ChuckState"/>
<DataItem type="e:SURFACE_SPEED" subType="x:PATH_1" category="SAMPLE"
<DataItem type="CUTTING_SPEED" subType="x:PATH_1" category="SAMPLE"
id="LS1SurfaceSpeedA" name="S1SurfaceSpeedA" units="MILLIMETER/SECOND"/>
</DataItems>
</Rotary>
Expand All @@ -348,8 +348,8 @@
<Motion actuation="DIRECT" coordinateSystemIdRef="machine_r" id="z4motion"
type="PRISMATIC">
<Transformation>
<Rotation>0 0 0</Rotation>
<Translation>0 0 0</Translation>
<Rotation>0 0 0</Rotation>
</Transformation>
<Axis>0 0 1</Axis>
</Motion>
Expand Down Expand Up @@ -396,8 +396,8 @@
<Motion actuation="DIRECT" coordinateSystemIdRef="machine_r" id="c2motion"
type="REVOLUTE">
<Transformation>
<Rotation>0 0 0</Rotation>
<Translation>0 0 0</Translation>
<Rotation>0 0 0</Rotation>
</Transformation>
<Axis>0 0 1</Axis>
</Motion>
Expand All @@ -419,7 +419,7 @@
</Constraints>
</DataItem>
<DataItem type="CHUCK_STATE" category="EVENT" id="LS2ChuckState" name="S2ChuckState"/>
<DataItem type="e:SURFACE_SPEED" subType="x:PATH_1" category="SAMPLE"
<DataItem type="CUTTING_SPEED" subType="x:PATH_1" category="SAMPLE"
id="LS2SurfaceSpeedA" name="S2SurfaceSpeedA" units="MILLIMETER/SECOND"/>
</DataItems>
</Rotary>
Expand All @@ -430,8 +430,8 @@
<Motion actuation="DIRECT" coordinateSystemIdRef="machine" id="c3motion"
type="REVOLUTE">
<Transformation>
<Rotation>0 0 0</Rotation>
<Translation>0 0 0</Translation>
<Rotation>0 0 0</Rotation>
</Transformation>
<Axis>0 0 1</Axis>
</Motion>
Expand Down Expand Up @@ -513,38 +513,8 @@
<!--(.*)|UNAVAILABLE-->
<!-- Any combination of n:value and/or n:Infinity/n:INFINITY-->
<!-- Sample: 1:-1.123 2:Infinity 3:INFINITY 4:3.123 5:+123 ....-->
<DataItem type="e:VARIABLES" subType="x:COMMON" category="EVENT" id="Lp1CommonVariable"
name="p1CommonVariable"/>
<!--(19|20)\d\d[- /.](0[1-9]|1[012])[- /.](0[1-9]|[12][0-9]|3[01]) [0-2][0-9]:[0-5][0-9]:[0-5][0-9] .*|UNAVAILABLE-->
<!-- Sample: 2014/12/31 23:59:59 ONE-TOUCH WINDOW CLOSE:RUN DISP-->
<DataItem type="e:MACMAN" subType="x:PANEL_HISTORY" category="EVENT"
id="Lp1MacManPanelHistory" name="p1MacManPanelHistory"/>
<DataItem type="e:OUTPUT_SIGNAL" subType="x:DRY_RUN" category="EVENT"
id="Lp1MachineOperationPanelOutputDryRun" name="p1MachineOperationPanelOutputDryRun"/>
<DataItem type="e:OUTPUT_SIGNAL" subType="x:MACHINE_LOCK" category="EVENT"
id="Lp1MachineOperationPanelOutputMachineLock"
name="p1MachineOperationPanelOutputMachineLock"/>
<DataItem type="e:INPUT_OUTPUT_SIGNAL" subType="x:PLC_MONITOR_IO_1" category="EVENT"
id="LPlcMonitorIO_1" name="PlcMonitorIO_1"/>
<DataItem type="e:INPUT_OUTPUT_SIGNAL" subType="x:PLC_MONITOR_IO_2" category="EVENT"
id="LPlcMonitorIO_2" name="PlcMonitorIO_2"/>
<DataItem type="e:INPUT_OUTPUT_SIGNAL" subType="x:PLC_MONITOR_IO_3" category="EVENT"
id="LPlcMonitorIO_3" name="PlcMonitorIO_3"/>
<DataItem type="e:INPUT_OUTPUT_SIGNAL" subType="x:PLC_MONITOR_IO_4" category="EVENT"
id="LPlcMonitorIO_4" name="PlcMonitorIO_4"/>
<DataItem type="e:INPUT_OUTPUT_SIGNAL" subType="x:PLC_MONITOR_IO_5" category="EVENT"
id="LPlcMonitorIO_5" name="PlcMonitorIO_5"/>
<DataItem type="e:INPUT_OUTPUT_SIGNAL" subType="x:PLC_MONITOR_IO_6" category="EVENT"
id="LPlcMonitorIO_6" name="PlcMonitorIO_6"/>
<DataItem type="e:INPUT_OUTPUT_SIGNAL" subType="x:PLC_MONITOR_IO_7" category="EVENT"
id="LPlcMonitorIO_7" name="PlcMonitorIO_7"/>
<DataItem type="e:INPUT_OUTPUT_SIGNAL" subType="x:PLC_MONITOR_IO_8" category="EVENT"
id="LPlcMonitorIO_8" name="PlcMonitorIO_8"/>
<DataItem type="e:INPUT_OUTPUT_SIGNAL" subType="x:PLC_MONITOR_IO_9" category="EVENT"
id="LPlcMonitorIO_9" name="PlcMonitorIO_9"/>
<DataItem type="e:INPUT_OUTPUT_SIGNAL" subType="x:PLC_MONITOR_IO_10" category="EVENT"
id="LPlcMonitorIO_10" name="PlcMonitorIO_10"/>
<!-- OKUMA CUSTOM TAG - END-->
<DataItem type="VARIABLE" subType="x:COMMON" category="EVENT" id="Lp1CommonVariable"
name="p1CommonVariable" representation="DATA_SET"/>
<DataItem type="PROGRAM_HEADER" name="p1ProgramHeader" category="EVENT"
id="Lp1ProgramHeader"/>
<DataItem type="PALLET_ID" name="p1PalletID" category="EVENT" id="Lp1PalletID"/>
Expand Down Expand Up @@ -579,11 +549,11 @@
<DataItem type="TOOL_ASSET_ID" name="p1ToolAssetId" category="EVENT"
id="Lp1ToolAssetId"/>
<!-- OKUMA CUSTOM TAG - START-->
<DataItem type="e:BLOCK_NUMBER" category="EVENT" id="Lp1BlockNumber"
<DataItem type="LINE_NUMBER" category="EVENT" id="Lp1BlockNumber"
name="p1BlockNumber"/>
<DataItem type="e:PATH_FEEDRATE_PER_REV" subType="ACTUAL" name="p1Fract"
<DataItem type="PATH_FEEDRATE_PER_REVOLUTION" subType="ACTUAL" name="p1Fract"
category="SAMPLE" id="Lp1Fract"/>
<DataItem type="e:PATH_FEEDRATE_PER_REV" subType="PROGRAMMED" name="p1Frcmd"
<DataItem type="PATH_FEEDRATE_PER_REVOLUTION" subType="PROGRAMMED" name="p1Frcmd"
category="SAMPLE" id="Lp1Frcmd"/>
<!-- OKUMA CUSTOM TAG - END-->
<DataItem type="CUTTING_SPEED" subType="ACTUAL" category="SAMPLE"
Expand Down Expand Up @@ -1102,13 +1072,11 @@
<DataItem category="EVENT" id="Sovr" type="ROTARY_VELOCITY_OVERRIDE"/>
<DataItem type="PROGRAM" id="program" category="EVENT" subType="MAIN"/>
<DataItem type="PROGRAM" subType="ACTIVE" id="activeprog" category="EVENT"/>
<DataItem type="x:UNIT" id="unitNum" category="EVENT"/>
<DataItem type="x:SEQUENCE_NUMBER" id="sequenceNum" category="EVENT"/>
<DataItem type="PART_COUNT" id="PartCountAct" category="EVENT"/>
<DataItem type="PATH_FEEDRATE" id="Fact" category="SAMPLE" units="MILLIMETER/SECOND" subType="ACTUAL" coordinateSystem="WORK"/>
<DataItem type="TOOL_NUMBER" id="Tool_number" category="EVENT"/>
<DataItem type="TOOL_GROUP" id="Tool_group" category="EVENT"/>
<DataItem type="x:TOOL_SUFFIX" id="Tool_suffix" category="EVENT"/>
<DataItem type="TOOL_NUMBER" id="Tool_suffix" subType="x:SUFFIX" category="EVENT"/>
<DataItem type="EXECUTION" id="execution" category="EVENT"/>
<DataItem id="waitstate" type="WAIT_STATE" category="EVENT"/>
<DataItem type="CONTROLLER_MODE" id="mode" category="EVENT"/>
Expand Down Expand Up @@ -1140,9 +1108,7 @@
<PartOccurrence id="partocc">
<DataItems>
<DataItem id="part_uuid" type="PART_UNIQUE_ID" category="EVENT" />
<DataItem id="part_geo" type="x:PART_GEOMETRY" category="EVENT" representation="DATA_SET"/>
<DataItem id="fixture_uuid" type="x:FIXTURE_UNIQUE_ID" category="EVENT" />
<DataItem id="fixture_geo" type="x:FIXTURE_GEOMETRY" category="EVENT" representation="DATA_SET"/>
<DataItem id="fixture_uuid" type="FIXTURE_ASSET_ID" category="EVENT" />
</DataItems>
</PartOccurrence>
</Components>
Expand Down Expand Up @@ -1178,7 +1144,7 @@
<Lubrication id="lubrication" name="lubrication">
<DataItems>
<DataItem type="SYSTEM" category="CONDITION" id="lubrication_cond"/>
<DataItem id="lubelevel" type="LEVEL" category="EVENT" units="PERCENT"/>
<DataItem id="lubelevel" type="FILL_LEVEL" category="SAMPLE" units="PERCENT"/>
</DataItems>
</Lubrication>
</Components>
Expand Down
2 changes: 1 addition & 1 deletion demo/agent/agent.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Devices = Devices.xml
SchemaVersion = 2.3
SchemaVersion = 2.7
WorkerThreads = 3
MonitorConfigFiles = yes
Port = 5001
Expand Down
2 changes: 1 addition & 1 deletion demo/compose/agent/agent.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Devices = Devices.xml
SchemaVersion = 2.0
SchemaVersion = 2.7
WorkerThreads = 3
MonitorConfigFiles = yes
Port = 5000
Expand Down
2 changes: 1 addition & 1 deletion demo/compose/agent/agentmqtt.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Devices = Devices.xml
SchemaVersion = 2.0
SchemaVersion = 2.7
WorkerThreads = 3
MonitorConfigFiles = yes
Port = 5000
Expand Down
Loading