Merge pull request #1 from sunspec/master

Merge from mastter
altendky · Aug 8, 2019 · 2109a75 · 2109a75
2 parents 99dd7e5 + 641f40c
commit 2109a75
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 32 deletions.
diff --git a/smdx/Makefile b/smdx/Makefile
@@ -35,7 +35,13 @@ SMDXFILES=$(shell (ls smdx*.xml))
 
 SCHEMA=smdx.xsd
 
-all: check
+all:: manifest.xml
+
+manifest.xml: $(SMDXFILES)
+	@echo Generating manifest.xml
+	python ./manifest.py
+
+all:: check
 
 check: $(SMDXFILES)
 	@# dump stdout to /dev/null to avoid cluttering the output

diff --git a/smdx/manifest.xml b/smdx/manifest.xml
@@ -62,35 +62,35 @@
   <file md5="cea6ea862af21657ed12b7c47cc9404a" name="smdx_00213.xml" />
   <file md5="3bf01a2a6c5878a9ff7d8f2366762156" name="smdx_00214.xml" />
   <file md5="e63cf71e122324373cd22e337ad2b232" name="smdx_00220.xml" />
-  <file md5="4d662053e0e9f148b33b273e4fa011c7" name="smdx_00302.xml" />
-  <file md5="5bad0d3ea94f33287607508b1bda8df4" name="smdx_00303.xml" />
+  <file md5="48657b156c0e50ac8dc70a57900c81eb" name="smdx_00302.xml" />
+  <file md5="150f1e9901dcbafb853330c80df19982" name="smdx_00303.xml" />
   <file md5="ad9cb63e2f5cdd890bde4f8c2fa9eea8" name="smdx_00304.xml" />
   <file md5="c71ddd68b0316cbc3ea7e99b7ba7973f" name="smdx_00305.xml" />
   <file md5="fb20000cc0fc78f846702d13f6517f18" name="smdx_00306.xml" />
   <file md5="28540da696ab84503ce95d4c8185e5f0" name="smdx_00307.xml" />
   <file md5="55993cea6120e827f9e0ec6ff51bf100" name="smdx_00308.xml" />
-  <file md5="c9ac8df05bd715068452df9bd9a37cc1" name="smdx_00401.xml" />
-  <file md5="4f3fbd6706bc589f033e41d454aeefa9" name="smdx_00402.xml" />
-  <file md5="163732136f2c8a334094eedad0e9bec3" name="smdx_00403.xml" />
-  <file md5="526efe11418c59acab6c4ac78226b49d" name="smdx_00404.xml" />
+  <file md5="59a4b2b82aaafc38077e399dd6d66861" name="smdx_00401.xml" />
+  <file md5="803b1564c5465a2ec0983839e7457596" name="smdx_00402.xml" />
+  <file md5="6d2c826d61e6e4ce8239c28c2a1f22ec" name="smdx_00403.xml" />
+  <file md5="ed92c349f2c1d7721e9b1694894733f4" name="smdx_00404.xml" />
   <file md5="13aa71c72427e387f1a0a5f1d17083ed" name="smdx_00501.xml" />
   <file md5="bf87e890192264f5a1433a6929b73422" name="smdx_00502.xml" />
-  <file md5="34c56c70f2b007d07ebd960ac733476b" name="smdx_00601.xml" />
+  <file md5="9393ecf3a8ece0f259f64dbeb6fcab73" name="smdx_00601.xml" />
   <file md5="e7bf421aaf6a86ef7e995219db7a9265" name="smdx_00801.xml" />
   <file md5="9638a5c25c0a236f8b708751f801a954" name="smdx_00802.xml" />
   <file md5="28e7a012c8b0007d4812218f29c6aa8d" name="smdx_00803.xml" />
   <file md5="e7dc9512da6ad85b78b1d7be5b77c324" name="smdx_00804.xml" />
-  <file md5="3411f7d2c52dda1223dc306b5ed92df3" name="smdx_00805.xml" />
+  <file md5="d25544271b3078b8817913ca3499d63c" name="smdx_00805.xml" />
   <file md5="4ed4a12acf8c7fca5288872314951d02" name="smdx_00806.xml" />
-  <file md5="4710736c54d4dec178398a889c8d402c" name="smdx_00807.xml" />
+  <file md5="cb29f12ac516fce31cde206bdc207262" name="smdx_00807.xml" />
   <file md5="18749956780dc33c1d2050d6c0064456" name="smdx_00808.xml" />
   <file md5="20d3cc8ee07c2f2178de3d40a521356f" name="smdx_00809.xml" />
   <file md5="92f777bd774d731b8c6f9fbfef884f1c" name="smdx_63001.xml" />
-  <file md5="d18ac80b4106d05ae4499ba09e00a47f" name="smdx_63002.xml" />
+  <file md5="6b27bd7343daa816f5b234ec2210bc3c" name="smdx_63002.xml" />
   <file md5="584d6889c51d84163cd8a621e146590a" name="smdx_64001.xml" />
   <file md5="3ad26213bc8029f82b5ef155c98d3c1c" name="smdx_64020.xml" />
   <file md5="bb5434bb8c11214ed6febe47cd502867" name="smdx_64101.xml" />
   <file md5="cba82aaf067148d81e1cdc41f81acf37" name="smdx_64110.xml" />
   <file md5="c46615d0449c1e54abd09b486b00e5b8" name="smdx_64111.xml" />
-  <file md5="492cea38f7f1c9102f6e3d5eccdf544c" name="smdx_64112.xml" />
+  <file md5="fdf80180cc46d1a386070c880ccd17e5" name="smdx_64112.xml" />
 </manifest>
diff --git a/smdx/manifest.xml.md5 b/smdx/manifest.xml.md5
@@ -1 +1 @@
-eefcb92d0814b437a51003e4521d7db2
+92cd6553deabed9175c6439aefb51ddb
diff --git a/smdx/smdx_00302.xml b/smdx/smdx_00302.xml
@@ -1,7 +1,7 @@
 <sunSpecModels v="1">
   <!-- 302: Irradiance Model -->
   <model id="302" len="5" name="irradiance">
-    <block len="5">
+    <block len="5" type="repeating">
       <point id="GHI" offset="0" type="uint16" units="W/m2" mandatory="false"/>
       <point id="POAI" offset="1" type="uint16" units="W/m2" mandatory="false"/>
       <point id="DFI" offset="2" type="uint16" units="W/m2" mandatory="false"/>

diff --git a/smdx/smdx_00401.xml b/smdx/smdx_00401.xml
@@ -139,12 +139,12 @@
       <notes></notes>
     </point>
     <point id="InEvt">
-      <label>Event</label>
+      <label>Input Event</label>
       <description>String Input Event Flags</description>
       <notes></notes>
     </point>
     <point id="InEvtVnd">
-      <label>Vendor Event</label>
+      <label>Input Event Vendor</label>
       <description>String Input Vendor Event Flags</description>
       <notes></notes>
     </point>

diff --git a/smdx/smdx_00402.xml b/smdx/smdx_00402.xml
@@ -149,12 +149,12 @@
       <notes></notes>
     </point>
     <point id="InEvt">
-      <label>Event</label>
+      <label>Input Event</label>
       <description>String Input Event Flags</description>
       <notes></notes>
     </point>
     <point id="InEvtVnd">
-      <label>Vendor Event</label>
+      <label>Input Event Vendor</label>
       <description>String Input Vendor Event Flags</description>
       <notes></notes>
     </point>

diff --git a/smdx/smdx_00403.xml b/smdx/smdx_00403.xml
@@ -141,12 +141,12 @@
       <notes></notes>
     </point>
     <point id="InEvt">
-      <label>Event</label>
+      <label>Input Event</label>
       <description>String Input Event Flags</description>
       <notes></notes>
     </point>
     <point id="InEvtVnd">
-      <label>Vendor Event</label>
+      <label>Input Event Vendor</label>
       <description>String Input Vendor Event Flags</description>
       <notes></notes>
     </point>

diff --git a/smdx/smdx_00404.xml b/smdx/smdx_00404.xml
@@ -154,12 +154,12 @@
       <notes></notes>
     </point>
     <point id="InEvt">
-      <label>Event</label>
+      <label>Input Event</label>
       <description>String Input Event Flags</description>
       <notes></notes>
     </point>
     <point id="InEvtVnd">
-      <label>Vendor Event</label>
+      <label>Input Event Vendor</label>
       <description>String Input Vendor Event Flags</description>
       <notes></notes>
     </point>

diff --git a/smdx/smdx_00601.xml b/smdx/smdx_00601.xml
@@ -33,7 +33,7 @@
     <block len="22" type="repeating" name="tracker">
       <point id="Id" offset="0" type="string" len="8"  mandatory="false" />
       <point id="ElTrgt" offset="8" type="int32" units="Degrees" sf="Dgr_SF" mandatory="false" />
-      <point id="AzTrgt" offset="10" type="int32" units="Degrees" sf="SF" mandatory="false" />
+      <point id="AzTrgt" offset="10" type="int32" units="Degrees" sf="Dgr_SF" mandatory="false" />
       <point id="ElPos" offset="12" type="int32" units="Degrees" sf="Dgr_SF" mandatory="false" />
       <point id="AzPos" offset="14" type="int32" units="Degrees" sf="Dgr_SF" mandatory="false" />
       <point id="ElCtl" offset="16" type="int32" units="Degrees" sf="Dgr_SF" access="rw" mandatory="false" />
@@ -82,14 +82,14 @@
       <symbol id="ObsEl"><label>ObsEl</label><description>Tracker ELEVATION motor is obstructed</description></symbol>
       <symbol id="ObsAz"><label>ObsAz</label><description>Tracker AZIMUTH motor is obstructed</description></symbol>
     </point>
-    <point id="GlblAlm"><label>Alarm</label><description>Global tracker alarm conditions</description><notes>Combined tracker alarm conditions.  See individual trackers for alarms</notes>
+    <point id="GlblAlm"><label>Global Alarm</label><description>Global tracker alarm conditions</description><notes>Combined tracker alarm conditions.  See individual trackers for alarms</notes>
       <symbol id="SetPoint"><label>SetPoint</label><description>One or more trackers are NOT at SetPoint</description></symbol>
       <symbol id="ObsEl"><label>ObsEl</label><description>One or more trackers ELEVATION motor is obstructed</description></symbol>
       <symbol id="ObsAz"><label>ObsAz</label><description>One or more trackers AZIMUTH motor is obstructed</description></symbol>
     </point>
     <point id="GlblElCtl"><label>Manual Elevation</label><description>Global manual override target position of elevation in degrees from horizontal.  Unimplemented for single axis azimuth tracker type</description></point>
     <point id="GlblAzCtl"><label>Manual Azimuth</label><description>Global manual override target position of azimuth in degrees from true north towards east.  Unimplemented for single axis azimuth tracker type</description></point>
-    <point id="GlblCtl"><label>Mode</label><description>Global Control register operates on all trackers. Normal operation is automatic.  Operator can override the position by setting the ElCtl, AzCtl and enabling Manual operation. Entering calibration mode will revert to automatic operation after calibration is complete.</description><notes>The global controls all trackers</notes>
+    <point id="GlblCtl"><label>Global Mode</label><description>Global Control register operates on all trackers. Normal operation is automatic.  Operator can override the position by setting the ElCtl, AzCtl and enabling Manual operation. Entering calibration mode will revert to automatic operation after calibration is complete.</description><notes>The global controls all trackers</notes>
       <symbol id="Automatic"><label>Auto</label><description>Follow programmed path</description></symbol>
       <symbol id="Manual"><label>Manual</label><description>Go to a fixed position</description></symbol>
       <symbol id="Calibrate"><label>Calibrate</label><description>Execute test mode</description></symbol>

diff --git a/smdx/smdx_00805.xml b/smdx/smdx_00805.xml
@@ -125,8 +125,8 @@
       <notes>Measurement.</notes>
     </point>
     <point id="CellTmpMinCell">
-      <label>Max Cell Temperature Cell</label>
-      <description>Cell with the maximum cell temperature.</description>
+      <label>Min Cell Temperature Cell</label>
+      <description>Cell with the minimum cell temperature.</description>
       <notes></notes>
     </point>
     <point id="CellTmpAvg">

diff --git a/smdx/smdx_00807.xml b/smdx/smdx_00807.xml
@@ -492,7 +492,7 @@
       <notes></notes>
     </point>
     <point id="EvtVnd2">
-      <label>Vendor Event Bitfield 1</label>
+      <label>Vendor Event Bitfield 2</label>
       <description>Vendor defined events.</description>
       <notes></notes>
     </point>

diff --git a/smdx/smdx_64112.xml b/smdx/smdx_64112.xml
@@ -513,22 +513,22 @@
       <notes></notes>
     </point>
     <point id="CC_Config_DataLog_Daily_AH">
-      <label>Data Log Daily</label>
+      <label>Data Log Daily (Ah)</label>
       <description></description>
       <notes></notes>
     </point>
     <point id="CC_Config_DataLog_Daily_KWH">
-      <label>Data Log Daily</label>
+      <label>Data Log Daily (kWh)</label>
       <description></description>
       <notes></notes>
     </point>
     <point id="CC_Config_DataLog_Max_Out_A">
-      <label>Data Log Daily Maximum Output</label>
+      <label>Data Log Daily Maximum Output (A)</label>
       <description></description>
       <notes></notes>
     </point>
     <point id="CC_Config_DataLog_Max_Out_W">
-      <label>Data Log Daily Maximum Output</label>
+      <label>Data Log Daily Maximum Output (W)</label>
       <description></description>
       <notes></notes>
     </point>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		eefcb92d0814b437a51003e4521d7db2
		92cd6553deabed9175c6439aefb51ddb