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

Cleanup xml #242

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Cleanup xml #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d805ba
Standardize/cleanup the XML format.
nielsbasjes Dec 31, 2022
fdf5715
Fix the empty XML tags.
nielsbasjes Dec 31, 2022
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
24 changes: 12 additions & 12 deletions smdx/smdx_00001.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,56 +1,56 @@
<sunSpecModels v="1">
<!-- 1: common -->
<model id="1" len="66" name="common">
<block len="66">
<block len="66" type="fixed">
<point id="Mn" offset="0" type="string" len="16" mandatory="true" />
<point id="Md" offset="16" type="string" len="16" mandatory="true" />
<point id="Opt" offset="32" type="string" len="8" />
<point id="Vr" offset="40" type="string" len="8" />
<point id="SN" offset="48" type="string" len="16" mandatory="true" />
<point id="DA" offset="64" type="uint16" access="rw" />
<point id="Pad" offset="65" type="pad" access="r" />
<point id="DA" offset="64" type="uint16" len="1" access="rw" />
<point id="Pad" offset="65" type="pad" len="1" />
</block>
</model>
<strings id="1" locale="en">
<model>
<label>Common</label>
<description>All SunSpec compliant devices must include this as the first model</description>
<notes></notes>
<notes/>
</model>
<point id="Mn">
<label>Manufacturer</label>
<description>Well known value registered with SunSpec for compliance</description>
<notes></notes>
<notes/>
</point>
<point id="Md">
<label>Model</label>
<description>Manufacturer specific value (32 chars)</description>
<notes></notes>
<notes/>
</point>
<point id="Opt">
<label>Options</label>
<description>Manufacturer specific value (16 chars)</description>
<notes></notes>
<notes/>
</point>
<point id="Vr">
<label>Version</label>
<description>Manufacturer specific value (16 chars)</description>
<notes></notes>
<notes/>
</point>
<point id="SN">
<label>Serial Number</label>
<description>Manufacturer specific value (32 chars)</description>
<notes></notes>
<notes/>
</point>
<point id="DA">
<label>Device Address</label>
<description>Modbus device address</description>
<notes></notes>
<notes/>
</point>
<point id="Pad">
<label></label>
<label/>
<description>Force even alignment</description>
<notes></notes>
<notes/>
</point>
</strings>
</sunSpecModels>
44 changes: 22 additions & 22 deletions smdx/smdx_00002.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<sunSpecModels v="1">
<!-- 2: basic aggregator -->
<model id="2" len="14" name="aggregator">
<block len="14">
<point id="AID" offset="0" type="uint16" mandatory="true" />
<point id="N" offset="1" type="uint16" mandatory="true" />
<point id="UN" offset="2" type="uint16" mandatory="true" />
<point id="St" offset="3" type="enum16" mandatory="true">
<block len="14" type="fixed">
<point id="AID" offset="0" type="uint16" len="1" mandatory="true" />
<point id="N" offset="1" type="uint16" len="1" mandatory="true" />
<point id="UN" offset="2" type="uint16" len="1" mandatory="true" />
<point id="St" offset="3" type="enum16" len="1" mandatory="true" >
<symbol id="OFF">1</symbol>
<symbol id="ON">2</symbol>
<symbol id="FULL">3</symbol>
<symbol id="FAULT">4</symbol>
</point>
<point id="StVnd" offset="4" type="enum16" />
<point id="Evt" offset="5" type="bitfield32" mandatory="true" >
<point id="StVnd" offset="4" type="enum16" len="1" />
<point id="Evt" offset="5" type="bitfield32" len="2" mandatory="true" >
<symbol id="GROUND_FAULT">0</symbol>
<symbol id="INPUT_OVER_VOLTAGE">1</symbol>
<symbol id="RESERVED_2">2</symbol>
Expand All @@ -35,73 +35,73 @@
<symbol id="OUTPUT_UNDER_VOLTAGE">19</symbol>
<symbol id="TEST_FAILED">20</symbol>
</point>
<point id="EvtVnd" offset="7" type="bitfield32" />
<point id="Ctl" offset="9" type="enum16" >
<point id="EvtVnd" offset="7" type="bitfield32" len="2" />
<point id="Ctl" offset="9" type="enum16" len="1" >
<symbol id="NONE">0</symbol>
<symbol id="AUTOMATIC">1</symbol>
<symbol id="FORCE_OFF">2</symbol>
<symbol id="TEST">3</symbol>
<symbol id="THROTTLE">4</symbol>
</point>
<point id="CtlVnd" offset="10" type="enum32" />
<point id="CtlVl" offset="12" type="enum32" />
<point id="CtlVnd" offset="10" type="enum32" len="2" />
<point id="CtlVl" offset="12" type="enum32" len="2" />
</block>
</model>
<strings id="2" locale="en">
<model>
<label>Basic Aggregator</label>
<description>Aggregates a collection of models for a given model id</description>
<notes></notes>
<notes/>
</model>
<point id="AID">
<label>AID</label>
<description>Aggregated model id</description>
<notes></notes>
<notes/>
</point>
<point id="N">
<label>N</label>
<description>Number of aggregated models</description>
<notes></notes>
<notes/>
</point>
<point id="UN">
<label>UN</label>
<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>
<notes></notes>
<notes/>
</point>
<point id="St">
<label>Status</label>
<description>Enumerated status code</description>
<notes></notes>
<notes/>
</point>
<point id="StVnd">
<label>Vendor Status</label>
<description>Vendor specific status code</description>
<notes></notes>
<notes/>
</point>
<point id="Evt">
<label>Event Code</label>
<description>Bitmask event code</description>
<notes></notes>
<notes/>
</point>
<point id="EvtVnd">
<label>Vendor Event Code</label>
<description>Vendor specific event code</description>
<notes></notes>
<notes/>
</point>
<point id="Ctl">
<label>Control</label>
<description>Control register for all aggregated devices</description>
<notes></notes>
<notes/>
</point>
<point id="CtlVnd">
<label>Vendor Control</label>
<description>Vendor control register for all aggregated devices</description>
<notes></notes>
<notes/>
</point>
<point id="CtlVl">
<label>Control Value</label>
<description>Numerical value used as a parameter to the control</description>
<notes></notes>
<notes/>
</point>
</strings>
</sunSpecModels>
130 changes: 65 additions & 65 deletions smdx/smdx_00003.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,71 +1,71 @@
<sunSpecModels v="1">
<!-- 3: secure dataset read request model -->
<model id="3" len="59">
<block len="58">
<point id="X" offset="0" type="uint16" access="rw" mandatory="true"/>
<point id="Off1" offset="1" type="uint16" access="rw" mandatory="true" />
<point id="Off2" offset="2" type="uint16" access="rw" mandatory="true" />
<point id="Off3" offset="3" type="uint16" access="rw" mandatory="true" />
<point id="Off4" offset="4" type="uint16" access="rw" mandatory="true" />
<point id="Off5" offset="5" type="uint16" access="rw" mandatory="true" />
<point id="Off6" offset="6" type="uint16" access="rw" mandatory="true" />
<point id="Off7" offset="7" type="uint16" access="rw" mandatory="true" />
<point id="Off8" offset="8" type="uint16" access="rw" mandatory="true" />
<point id="Off9" offset="9" type="uint16" access="rw" mandatory="true" />
<point id="Off10" offset="10" type="uint16" access="rw" mandatory="true" />
<point id="Off11" offset="11" type="uint16" access="rw" mandatory="true" />
<point id="Off12" offset="12" type="uint16" access="rw" mandatory="true" />
<point id="Off13" offset="13" type="uint16" access="rw" mandatory="true" />
<point id="Off14" offset="14" type="uint16" access="rw" mandatory="true" />
<point id="Off15" offset="15" type="uint16" access="rw" mandatory="true" />
<point id="Off16" offset="16" type="uint16" access="rw" mandatory="true" />
<point id="Off17" offset="17" type="uint16" access="rw" mandatory="true" />
<point id="Off18" offset="18" type="uint16" access="rw" mandatory="true" />
<point id="Off19" offset="19" type="uint16" access="rw" mandatory="true" />
<point id="Off20" offset="20" type="uint16" access="rw" mandatory="true" />
<point id="Off21" offset="21" type="uint16" access="rw" mandatory="true" />
<point id="Off22" offset="22" type="uint16" access="rw" mandatory="true" />
<point id="Off23" offset="23" type="uint16" access="rw" mandatory="true" />
<point id="Off24" offset="24" type="uint16" access="rw" mandatory="true" />
<point id="Off25" offset="25" type="uint16" access="rw" mandatory="true" />
<point id="Off26" offset="26" type="uint16" access="rw" mandatory="true" />
<point id="Off27" offset="27" type="uint16" access="rw" mandatory="true" />
<point id="Off28" offset="28" type="uint16" access="rw" mandatory="true" />
<point id="Off29" offset="29" type="uint16" access="rw" mandatory="true" />
<point id="Off30" offset="30" type="uint16" access="rw" mandatory="true" />
<point id="Off31" offset="31" type="uint16" access="rw" mandatory="true" />
<point id="Off32" offset="32" type="uint16" access="rw" mandatory="true" />
<point id="Off33" offset="33" type="uint16" access="rw" mandatory="true" />
<point id="Off34" offset="34" type="uint16" access="rw" mandatory="true" />
<point id="Off35" offset="35" type="uint16" access="rw" mandatory="true" />
<point id="Off36" offset="36" type="uint16" access="rw" mandatory="true" />
<point id="Off37" offset="37" type="uint16" access="rw" mandatory="true" />
<point id="Off38" offset="38" type="uint16" access="rw" mandatory="true" />
<point id="Off39" offset="39" type="uint16" access="rw" mandatory="true" />
<point id="Off40" offset="40" type="uint16" access="rw" mandatory="true" />
<point id="Off41" offset="41" type="uint16" access="rw" mandatory="true" />
<point id="Off42" offset="42" type="uint16" access="rw" mandatory="true" />
<point id="Off43" offset="43" type="uint16" access="rw" mandatory="true" />
<point id="Off44" offset="44" type="uint16" access="rw" mandatory="true" />
<point id="Off45" offset="45" type="uint16" access="rw" mandatory="true" />
<point id="Off46" offset="46" type="uint16" access="rw" mandatory="true" />
<point id="Off47" offset="47" type="uint16" access="rw" mandatory="true" />
<point id="Off48" offset="48" type="uint16" access="rw" mandatory="true" />
<point id="Off49" offset="49" type="uint16" access="rw" mandatory="true" />
<point id="Off50" offset="50" type="uint16" access="rw" mandatory="true" />
<point id="Ts" offset="51" type="uint32" access="rw" mandatory="true" />
<point id="Ms" offset="53" type="uint16" access="rw" mandatory="true" />
<point id="Seq" offset="54" type="uint16" access="rw" mandatory="true" />
<point id="Role" offset="55" type="uint16" access="rw" mandatory="true" />
<point id="Alg" offset="56" type="enum16" access="r" mandatory="true">
<block len="58" type="fixed">
<point id="X" offset="0" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off1" offset="1" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off2" offset="2" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off3" offset="3" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off4" offset="4" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off5" offset="5" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off6" offset="6" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off7" offset="7" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off8" offset="8" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off9" offset="9" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off10" offset="10" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off11" offset="11" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off12" offset="12" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off13" offset="13" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off14" offset="14" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off15" offset="15" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off16" offset="16" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off17" offset="17" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off18" offset="18" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off19" offset="19" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off20" offset="20" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off21" offset="21" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off22" offset="22" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off23" offset="23" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off24" offset="24" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off25" offset="25" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off26" offset="26" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off27" offset="27" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off28" offset="28" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off29" offset="29" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off30" offset="30" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off31" offset="31" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off32" offset="32" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off33" offset="33" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off34" offset="34" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off35" offset="35" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off36" offset="36" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off37" offset="37" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off38" offset="38" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off39" offset="39" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off40" offset="40" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off41" offset="41" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off42" offset="42" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off43" offset="43" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off44" offset="44" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off45" offset="45" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off46" offset="46" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off47" offset="47" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off48" offset="48" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off49" offset="49" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Off50" offset="50" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Ts" offset="51" type="uint32" len="2" access="rw" mandatory="true" />
<point id="Ms" offset="53" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Seq" offset="54" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Role" offset="55" type="uint16" len="1" access="rw" mandatory="true" />
<point id="Alg" offset="56" type="enum16" len="1" mandatory="true" >
<symbol id="NONE">0</symbol>
<symbol id="AES-GMAC-64">1</symbol>
<symbol id="ECC-256">2</symbol>
</point>
<point id="N" offset="57" type="uint16" access="r" mandatory="true" />
<point id="N" offset="57" type="uint16" len="1" mandatory="true" />
</block>
<block type="repeating" len="1">
<point id="DS" offset="0" type="uint16" access="r" mandatory="true" />
<block len="1" type="repeating">
<point id="DS" offset="0" type="uint16" len="1" mandatory="true" />
</block>
</model>
<strings id="3" locale="en">
Expand All @@ -77,17 +77,17 @@
<point id="Off1">
<label>Offset1</label>
<description>Offset of value to read</description>
<notes></notes>
<notes/>
</point>
<point id="Ts">
<label>Timestamp</label>
<description>Timestamp value is the number of seconds since January 1, 2000</description>
<notes></notes>
<notes/>
</point>
<point id="Ms">
<label>Milliseconds</label>
<description>Millisecond counter 0-999</description>
<notes></notes>
<notes/>
</point>
<point id="Alg">
<label>Algorithm</label>
Expand All @@ -101,12 +101,12 @@
<symbol id="AES-GMAC-64">
<label>AES-GMAC-64</label>
<description>64 bit AES signature algorithm is used</description>
<notes></notes>
<notes/>
</symbol>
<symbol id="ECC-256">
<label>ECC-256</label>
<description>256 bit ECC signature algorithm is used</description>
<notes></notes>
<notes/>
</symbol>
</point>
<point id="N">
Expand Down
Loading