Skip to content

Commit a21c748

Browse files
dersecuredersecure
committed
Merge Niels XML updates
2 parents 4adb944 + fdf5715 commit a21c748

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+6132
-6134
lines changed

‎smdx/smdx_00001.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,56 @@
11
<sunSpecModels v="1">
22
<!-- 1: common -->
33
<model id="1" len="66" name="common">
4-
<block len="66">
4+
<block len="66" type="fixed">
55
<point id="Mn" offset="0" type="string" len="16" mandatory="true" />
66
<point id="Md" offset="16" type="string" len="16" mandatory="true" />
77
<point id="Opt" offset="32" type="string" len="8" />
88
<point id="Vr" offset="40" type="string" len="8" />
99
<point id="SN" offset="48" type="string" len="16" mandatory="true" />
10-
<point id="DA" offset="64" type="uint16" access="rw" />
11-
<point id="Pad" offset="65" type="pad" access="r" />
10+
<point id="DA" offset="64" type="uint16" len="1" access="rw" />
11+
<point id="Pad" offset="65" type="pad" len="1" />
1212
</block>
1313
</model>
1414
<strings id="1" locale="en">
1515
<model>
1616
<label>Common</label>
1717
<description>All SunSpec compliant devices must include this as the first model</description>
18-
<notes></notes>
18+
<notes/>
1919
</model>
2020
<point id="Mn">
2121
<label>Manufacturer</label>
2222
<description>Well known value registered with SunSpec for compliance</description>
23-
<notes></notes>
23+
<notes/>
2424
</point>
2525
<point id="Md">
2626
<label>Model</label>
2727
<description>Manufacturer specific value (32 chars)</description>
28-
<notes></notes>
28+
<notes/>
2929
</point>
3030
<point id="Opt">
3131
<label>Options</label>
3232
<description>Manufacturer specific value (16 chars)</description>
33-
<notes></notes>
33+
<notes/>
3434
</point>
3535
<point id="Vr">
3636
<label>Version</label>
3737
<description>Manufacturer specific value (16 chars)</description>
38-
<notes></notes>
38+
<notes/>
3939
</point>
4040
<point id="SN">
4141
<label>Serial Number</label>
4242
<description>Manufacturer specific value (32 chars)</description>
43-
<notes></notes>
43+
<notes/>
4444
</point>
4545
<point id="DA">
4646
<label>Device Address</label>
4747
<description>Modbus device address</description>
48-
<notes></notes>
48+
<notes/>
4949
</point>
5050
<point id="Pad">
51-
<label></label>
51+
<label/>
5252
<description>Force even alignment</description>
53-
<notes></notes>
53+
<notes/>
5454
</point>
5555
</strings>
5656
</sunSpecModels>

‎smdx/smdx_00002.xml‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<sunSpecModels v="1">
22
<!-- 2: basic aggregator -->
33
<model id="2" len="14" name="aggregator">
4-
<block len="14">
5-
<point id="AID" offset="0" type="uint16" mandatory="true" />
6-
<point id="N" offset="1" type="uint16" mandatory="true" />
7-
<point id="UN" offset="2" type="uint16" mandatory="true" />
8-
<point id="St" offset="3" type="enum16" mandatory="true">
4+
<block len="14" type="fixed">
5+
<point id="AID" offset="0" type="uint16" len="1" mandatory="true" />
6+
<point id="N" offset="1" type="uint16" len="1" mandatory="true" />
7+
<point id="UN" offset="2" type="uint16" len="1" mandatory="true" />
8+
<point id="St" offset="3" type="enum16" len="1" mandatory="true" >
99
<symbol id="OFF">1</symbol>
1010
<symbol id="ON">2</symbol>
1111
<symbol id="FULL">3</symbol>
1212
<symbol id="FAULT">4</symbol>
1313
</point>
14-
<point id="StVnd" offset="4" type="enum16" />
15-
<point id="Evt" offset="5" type="bitfield32" mandatory="true" >
14+
<point id="StVnd" offset="4" type="enum16" len="1" />
15+
<point id="Evt" offset="5" type="bitfield32" len="2" mandatory="true" >
1616
<symbol id="GROUND_FAULT">0</symbol>
1717
<symbol id="INPUT_OVER_VOLTAGE">1</symbol>
1818
<symbol id="RESERVED_2">2</symbol>
@@ -35,73 +35,73 @@
3535
<symbol id="OUTPUT_UNDER_VOLTAGE">19</symbol>
3636
<symbol id="TEST_FAILED">20</symbol>
3737
</point>
38-
<point id="EvtVnd" offset="7" type="bitfield32" />
39-
<point id="Ctl" offset="9" type="enum16" >
38+
<point id="EvtVnd" offset="7" type="bitfield32" len="2" />
39+
<point id="Ctl" offset="9" type="enum16" len="1" >
4040
<symbol id="NONE">0</symbol>
4141
<symbol id="AUTOMATIC">1</symbol>
4242
<symbol id="FORCE_OFF">2</symbol>
4343
<symbol id="TEST">3</symbol>
4444
<symbol id="THROTTLE">4</symbol>
4545
</point>
46-
<point id="CtlVnd" offset="10" type="enum32" />
47-
<point id="CtlVl" offset="12" type="enum32" />
46+
<point id="CtlVnd" offset="10" type="enum32" len="2" />
47+
<point id="CtlVl" offset="12" type="enum32" len="2" />
4848
</block>
4949
</model>
5050
<strings id="2" locale="en">
5151
<model>
5252
<label>Basic Aggregator</label>
5353
<description>Aggregates a collection of models for a given model id</description>
54-
<notes></notes>
54+
<notes/>
5555
</model>
5656
<point id="AID">
5757
<label>AID</label>
5858
<description>Aggregated model id</description>
59-
<notes></notes>
59+
<notes/>
6060
</point>
6161
<point id="N">
6262
<label>N</label>
6363
<description>Number of aggregated models</description>
64-
<notes></notes>
64+
<notes/>
6565
</point>
6666
<point id="UN">
6767
<label>UN</label>
6868
<description>Update Number. Incrementing number each time the mapping is changed. If the number is not changed from the last reading the direct access to a specific offset will result in reading the same logical model as before. Otherwise the entire model must be read to refresh the changes</description>
69-
<notes></notes>
69+
<notes/>
7070
</point>
7171
<point id="St">
7272
<label>Status</label>
7373
<description>Enumerated status code</description>
74-
<notes></notes>
74+
<notes/>
7575
</point>
7676
<point id="StVnd">
7777
<label>Vendor Status</label>
7878
<description>Vendor specific status code</description>
79-
<notes></notes>
79+
<notes/>
8080
</point>
8181
<point id="Evt">
8282
<label>Event Code</label>
8383
<description>Bitmask event code</description>
84-
<notes></notes>
84+
<notes/>
8585
</point>
8686
<point id="EvtVnd">
8787
<label>Vendor Event Code</label>
8888
<description>Vendor specific event code</description>
89-
<notes></notes>
89+
<notes/>
9090
</point>
9191
<point id="Ctl">
9292
<label>Control</label>
9393
<description>Control register for all aggregated devices</description>
94-
<notes></notes>
94+
<notes/>
9595
</point>
9696
<point id="CtlVnd">
9797
<label>Vendor Control</label>
9898
<description>Vendor control register for all aggregated devices</description>
99-
<notes></notes>
99+
<notes/>
100100
</point>
101101
<point id="CtlVl">
102102
<label>Control Value</label>
103103
<description>Numerical value used as a parameter to the control</description>
104-
<notes></notes>
104+
<notes/>
105105
</point>
106106
</strings>
107107
</sunSpecModels>

‎smdx/smdx_00003.xml‎

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,71 @@
11
<sunSpecModels v="1">
22
<!-- 3: secure dataset read request model -->
33
<model id="3" len="59">
4-
<block len="58">
5-
<point id="X" offset="0" type="uint16" access="rw" mandatory="true"/>
6-
<point id="Off1" offset="1" type="uint16" access="rw" mandatory="true" />
7-
<point id="Off2" offset="2" type="uint16" access="rw" mandatory="true" />
8-
<point id="Off3" offset="3" type="uint16" access="rw" mandatory="true" />
9-
<point id="Off4" offset="4" type="uint16" access="rw" mandatory="true" />
10-
<point id="Off5" offset="5" type="uint16" access="rw" mandatory="true" />
11-
<point id="Off6" offset="6" type="uint16" access="rw" mandatory="true" />
12-
<point id="Off7" offset="7" type="uint16" access="rw" mandatory="true" />
13-
<point id="Off8" offset="8" type="uint16" access="rw" mandatory="true" />
14-
<point id="Off9" offset="9" type="uint16" access="rw" mandatory="true" />
15-
<point id="Off10" offset="10" type="uint16" access="rw" mandatory="true" />
16-
<point id="Off11" offset="11" type="uint16" access="rw" mandatory="true" />
17-
<point id="Off12" offset="12" type="uint16" access="rw" mandatory="true" />
18-
<point id="Off13" offset="13" type="uint16" access="rw" mandatory="true" />
19-
<point id="Off14" offset="14" type="uint16" access="rw" mandatory="true" />
20-
<point id="Off15" offset="15" type="uint16" access="rw" mandatory="true" />
21-
<point id="Off16" offset="16" type="uint16" access="rw" mandatory="true" />
22-
<point id="Off17" offset="17" type="uint16" access="rw" mandatory="true" />
23-
<point id="Off18" offset="18" type="uint16" access="rw" mandatory="true" />
24-
<point id="Off19" offset="19" type="uint16" access="rw" mandatory="true" />
25-
<point id="Off20" offset="20" type="uint16" access="rw" mandatory="true" />
26-
<point id="Off21" offset="21" type="uint16" access="rw" mandatory="true" />
27-
<point id="Off22" offset="22" type="uint16" access="rw" mandatory="true" />
28-
<point id="Off23" offset="23" type="uint16" access="rw" mandatory="true" />
29-
<point id="Off24" offset="24" type="uint16" access="rw" mandatory="true" />
30-
<point id="Off25" offset="25" type="uint16" access="rw" mandatory="true" />
31-
<point id="Off26" offset="26" type="uint16" access="rw" mandatory="true" />
32-
<point id="Off27" offset="27" type="uint16" access="rw" mandatory="true" />
33-
<point id="Off28" offset="28" type="uint16" access="rw" mandatory="true" />
34-
<point id="Off29" offset="29" type="uint16" access="rw" mandatory="true" />
35-
<point id="Off30" offset="30" type="uint16" access="rw" mandatory="true" />
36-
<point id="Off31" offset="31" type="uint16" access="rw" mandatory="true" />
37-
<point id="Off32" offset="32" type="uint16" access="rw" mandatory="true" />
38-
<point id="Off33" offset="33" type="uint16" access="rw" mandatory="true" />
39-
<point id="Off34" offset="34" type="uint16" access="rw" mandatory="true" />
40-
<point id="Off35" offset="35" type="uint16" access="rw" mandatory="true" />
41-
<point id="Off36" offset="36" type="uint16" access="rw" mandatory="true" />
42-
<point id="Off37" offset="37" type="uint16" access="rw" mandatory="true" />
43-
<point id="Off38" offset="38" type="uint16" access="rw" mandatory="true" />
44-
<point id="Off39" offset="39" type="uint16" access="rw" mandatory="true" />
45-
<point id="Off40" offset="40" type="uint16" access="rw" mandatory="true" />
46-
<point id="Off41" offset="41" type="uint16" access="rw" mandatory="true" />
47-
<point id="Off42" offset="42" type="uint16" access="rw" mandatory="true" />
48-
<point id="Off43" offset="43" type="uint16" access="rw" mandatory="true" />
49-
<point id="Off44" offset="44" type="uint16" access="rw" mandatory="true" />
50-
<point id="Off45" offset="45" type="uint16" access="rw" mandatory="true" />
51-
<point id="Off46" offset="46" type="uint16" access="rw" mandatory="true" />
52-
<point id="Off47" offset="47" type="uint16" access="rw" mandatory="true" />
53-
<point id="Off48" offset="48" type="uint16" access="rw" mandatory="true" />
54-
<point id="Off49" offset="49" type="uint16" access="rw" mandatory="true" />
55-
<point id="Off50" offset="50" type="uint16" access="rw" mandatory="true" />
56-
<point id="Ts" offset="51" type="uint32" access="rw" mandatory="true" />
57-
<point id="Ms" offset="53" type="uint16" access="rw" mandatory="true" />
58-
<point id="Seq" offset="54" type="uint16" access="rw" mandatory="true" />
59-
<point id="Role" offset="55" type="uint16" access="rw" mandatory="true" />
60-
<point id="Alg" offset="56" type="enum16" access="r" mandatory="true">
4+
<block len="58" type="fixed">
5+
<point id="X" offset="0" type="uint16" len="1" access="rw" mandatory="true" />
6+
<point id="Off1" offset="1" type="uint16" len="1" access="rw" mandatory="true" />
7+
<point id="Off2" offset="2" type="uint16" len="1" access="rw" mandatory="true" />
8+
<point id="Off3" offset="3" type="uint16" len="1" access="rw" mandatory="true" />
9+
<point id="Off4" offset="4" type="uint16" len="1" access="rw" mandatory="true" />
10+
<point id="Off5" offset="5" type="uint16" len="1" access="rw" mandatory="true" />
11+
<point id="Off6" offset="6" type="uint16" len="1" access="rw" mandatory="true" />
12+
<point id="Off7" offset="7" type="uint16" len="1" access="rw" mandatory="true" />
13+
<point id="Off8" offset="8" type="uint16" len="1" access="rw" mandatory="true" />
14+
<point id="Off9" offset="9" type="uint16" len="1" access="rw" mandatory="true" />
15+
<point id="Off10" offset="10" type="uint16" len="1" access="rw" mandatory="true" />
16+
<point id="Off11" offset="11" type="uint16" len="1" access="rw" mandatory="true" />
17+
<point id="Off12" offset="12" type="uint16" len="1" access="rw" mandatory="true" />
18+
<point id="Off13" offset="13" type="uint16" len="1" access="rw" mandatory="true" />
19+
<point id="Off14" offset="14" type="uint16" len="1" access="rw" mandatory="true" />
20+
<point id="Off15" offset="15" type="uint16" len="1" access="rw" mandatory="true" />
21+
<point id="Off16" offset="16" type="uint16" len="1" access="rw" mandatory="true" />
22+
<point id="Off17" offset="17" type="uint16" len="1" access="rw" mandatory="true" />
23+
<point id="Off18" offset="18" type="uint16" len="1" access="rw" mandatory="true" />
24+
<point id="Off19" offset="19" type="uint16" len="1" access="rw" mandatory="true" />
25+
<point id="Off20" offset="20" type="uint16" len="1" access="rw" mandatory="true" />
26+
<point id="Off21" offset="21" type="uint16" len="1" access="rw" mandatory="true" />
27+
<point id="Off22" offset="22" type="uint16" len="1" access="rw" mandatory="true" />
28+
<point id="Off23" offset="23" type="uint16" len="1" access="rw" mandatory="true" />
29+
<point id="Off24" offset="24" type="uint16" len="1" access="rw" mandatory="true" />
30+
<point id="Off25" offset="25" type="uint16" len="1" access="rw" mandatory="true" />
31+
<point id="Off26" offset="26" type="uint16" len="1" access="rw" mandatory="true" />
32+
<point id="Off27" offset="27" type="uint16" len="1" access="rw" mandatory="true" />
33+
<point id="Off28" offset="28" type="uint16" len="1" access="rw" mandatory="true" />
34+
<point id="Off29" offset="29" type="uint16" len="1" access="rw" mandatory="true" />
35+
<point id="Off30" offset="30" type="uint16" len="1" access="rw" mandatory="true" />
36+
<point id="Off31" offset="31" type="uint16" len="1" access="rw" mandatory="true" />
37+
<point id="Off32" offset="32" type="uint16" len="1" access="rw" mandatory="true" />
38+
<point id="Off33" offset="33" type="uint16" len="1" access="rw" mandatory="true" />
39+
<point id="Off34" offset="34" type="uint16" len="1" access="rw" mandatory="true" />
40+
<point id="Off35" offset="35" type="uint16" len="1" access="rw" mandatory="true" />
41+
<point id="Off36" offset="36" type="uint16" len="1" access="rw" mandatory="true" />
42+
<point id="Off37" offset="37" type="uint16" len="1" access="rw" mandatory="true" />
43+
<point id="Off38" offset="38" type="uint16" len="1" access="rw" mandatory="true" />
44+
<point id="Off39" offset="39" type="uint16" len="1" access="rw" mandatory="true" />
45+
<point id="Off40" offset="40" type="uint16" len="1" access="rw" mandatory="true" />
46+
<point id="Off41" offset="41" type="uint16" len="1" access="rw" mandatory="true" />
47+
<point id="Off42" offset="42" type="uint16" len="1" access="rw" mandatory="true" />
48+
<point id="Off43" offset="43" type="uint16" len="1" access="rw" mandatory="true" />
49+
<point id="Off44" offset="44" type="uint16" len="1" access="rw" mandatory="true" />
50+
<point id="Off45" offset="45" type="uint16" len="1" access="rw" mandatory="true" />
51+
<point id="Off46" offset="46" type="uint16" len="1" access="rw" mandatory="true" />
52+
<point id="Off47" offset="47" type="uint16" len="1" access="rw" mandatory="true" />
53+
<point id="Off48" offset="48" type="uint16" len="1" access="rw" mandatory="true" />
54+
<point id="Off49" offset="49" type="uint16" len="1" access="rw" mandatory="true" />
55+
<point id="Off50" offset="50" type="uint16" len="1" access="rw" mandatory="true" />
56+
<point id="Ts" offset="51" type="uint32" len="2" access="rw" mandatory="true" />
57+
<point id="Ms" offset="53" type="uint16" len="1" access="rw" mandatory="true" />
58+
<point id="Seq" offset="54" type="uint16" len="1" access="rw" mandatory="true" />
59+
<point id="Role" offset="55" type="uint16" len="1" access="rw" mandatory="true" />
60+
<point id="Alg" offset="56" type="enum16" len="1" mandatory="true" >
6161
<symbol id="NONE">0</symbol>
6262
<symbol id="AES-GMAC-64">1</symbol>
6363
<symbol id="ECC-256">2</symbol>
6464
</point>
65-
<point id="N" offset="57" type="uint16" access="r" mandatory="true" />
65+
<point id="N" offset="57" type="uint16" len="1" mandatory="true" />
6666
</block>
67-
<block type="repeating" len="1">
68-
<point id="DS" offset="0" type="uint16" access="r" mandatory="true" />
67+
<block len="1" type="repeating">
68+
<point id="DS" offset="0" type="uint16" len="1" mandatory="true" />
6969
</block>
7070
</model>
7171
<strings id="3" locale="en">
@@ -77,17 +77,17 @@
7777
<point id="Off1">
7878
<label>Offset1</label>
7979
<description>Offset of value to read</description>
80-
<notes></notes>
80+
<notes/>
8181
</point>
8282
<point id="Ts">
8383
<label>Timestamp</label>
8484
<description>Timestamp value is the number of seconds since January 1, 2000</description>
85-
<notes></notes>
85+
<notes/>
8686
</point>
8787
<point id="Ms">
8888
<label>Milliseconds</label>
8989
<description>Millisecond counter 0-999</description>
90-
<notes></notes>
90+
<notes/>
9191
</point>
9292
<point id="Alg">
9393
<label>Algorithm</label>
@@ -101,12 +101,12 @@
101101
<symbol id="AES-GMAC-64">
102102
<label>AES-GMAC-64</label>
103103
<description>64 bit AES signature algorithm is used</description>
104-
<notes></notes>
104+
<notes/>
105105
</symbol>
106106
<symbol id="ECC-256">
107107
<label>ECC-256</label>
108108
<description>256 bit ECC signature algorithm is used</description>
109-
<notes></notes>
109+
<notes/>
110110
</symbol>
111111
</point>
112112
<point id="N">

0 commit comments

Comments
 (0)