Skip to content

Commit ef8a362

Browse files
author
Will Sobel
committed
Support for entries.
1 parent 4687518 commit ef8a362

3 files changed

Lines changed: 49 additions & 2 deletions

File tree

‎samples/data_set.cfg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
Devices = data_set.xml
1+
Devices = data_set_variable.xml
22
AllowPut = true
33
ReconnectInterval = 1000
44
BufferSize = 17
5-
SchemaVersion = 1.3
5+
SchemaVersion = 1.5
66
MonitorConfigFiles = true
77
Pretty=true
88
# MinimumConfigReloadAge = 30

‎samples/data_set_variable.xml‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<MTConnectDevices xmlns:m="urn:mtconnect.org:MTConnectDevices:1.5" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:mtconnect.org:MTConnectDevices:1.5">
3+
<Header creationTime="2009-03-22T01:50:29+00:00" sender="localhost" instanceId="1237628993" bufferSize="100000" version="1.5"/>
4+
<Devices>
5+
<Device uuid="000" name="LinuxCNC" sampleInterval="10.0" id="d">
6+
<Description manufacturer="NIST" serialNumber=""/>
7+
<DataItems>
8+
<DataItem type="AVAILABILITY" name="avail" category="EVENT" id="avail" />
9+
</DataItems>
10+
<Components>
11+
<Axes name="Axes" id="axes">
12+
<Components>
13+
<Rotary name="C" id="c">
14+
<DataItems>
15+
<DataItem type="ROTARY_VELOCITY" category="SAMPLE" units="REVOLUTION/MINUTE" nativeUnits="REVOLUTION/MINUTE" id="c1" subType="ACTUAL" name="Sspeed">
16+
<Source>spindle_speed</Source>
17+
</DataItem>
18+
<DataItem name="Smode" type="ROTARY_MODE" category="EVENT" id="c2">
19+
<Constraints><Value>SPINDLE</Value></Constraints>
20+
</DataItem>
21+
</DataItems>
22+
</Rotary>
23+
</Components>
24+
</Axes>
25+
<Controller name="Controller" id="cont">
26+
<Components>
27+
<Path name="path" id="path1">
28+
<DataItems>
29+
<DataItem type="VARIABLE" category="EVENT" id="v1" name="vars" representation="DATA_SET"/>
30+
<DataItem type="BLOCK" discrete="true" category="EVENT" id="v3" name="vars2" />
31+
<DataItem type="CONTROLLER_MODE" category="EVENT" id="p2" name="mode"/>
32+
<DataItem type="LINE" category="EVENT" id="p3" name="line"/>
33+
<DataItem type="PROGRAM" category="EVENT" id="p4" name="program"/>
34+
</DataItems>
35+
</Path>
36+
</Components>
37+
</Controller>
38+
<Power name="power" id="power">
39+
<DataItems>
40+
<DataItem type="POWER_STATUS" category="EVENT" id="pw1" name="power"/>
41+
</DataItems>
42+
</Power>
43+
</Components>
44+
</Device>
45+
</Devices>
46+
</MTConnectDevices>

‎src/xml_printer.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -994,6 +994,7 @@ namespace mtconnect {
994994
if (dlib::get_local_hostname(sHostname))
995995
sHostname = "localhost";
996996
}
997+
addAttribute(writer, "sender", sHostname);
997998
addAttribute(writer, "instanceId", intToString(instanceId));
998999

9991000
char version[32] = {0};

0 commit comments

Comments
 (0)