SunSpec Workgroup Model Updates (#251)

* adding standards list * remove duplicates * cleanup * PF clarification * schema update to include standards array * SOC clarification * DA point comment * updated curve pt comments * watt-var clarification for load points * Reference voltage values for 702 points * CLA bot update * CLA fix * switching to comments * moving comments to detail because of workbook annotations * update detail fields * updated detailed description automation script * typo * xml cleanup * remove the unsupported XML format * establishing unique names for all models * Revert "xml cleanup" This reverts commit 7ddc692. * Leaving XML data for those that still use it * merge revert for manifest.py
sunspec · Nov 15, 2024 · dde49cc · dde49cc
1 parent a2aeb77
commit dde49cc
Show file tree

Hide file tree

Showing 42 changed files with 1,561 additions and 404 deletions.
diff --git a/.clabot b/.clabot
@@ -1,3 +1,3 @@
 {
-  "contributors": ["bobfox","shelcrow"]
+  "contributors": ["bobfox","shelcrow","dersecure"]
 }
diff --git a/.gitignore b/.gitignore
@@ -16,6 +16,8 @@ local.properties
 .settings/
 .loadpath
 
+.idea/
+
 # External tool builders
 .externalToolBuilders/
 

diff --git a/json/model_1.json b/json/model_1.json
@@ -12,7 +12,10 @@
                 "size": 1,
                 "static": "S",
                 "type": "uint16",
-                "value": 1
+                "value": 1,
+                "standards": [
+                    "IEEE 1547-2018"
+                ]
             },
             {
                 "desc": "Model length",
@@ -21,7 +24,10 @@
                 "name": "L",
                 "size": 1,
                 "static": "S",
-                "type": "uint16"
+                "type": "uint16",
+                "standards": [
+                    "IEEE 1547-2018"
+                ]
             },
             {
                 "desc": "Well known value registered with SunSpec for compliance",
@@ -30,7 +36,10 @@
                 "name": "Mn",
                 "size": 16,
                 "static": "S",
-                "type": "string"
+                "type": "string",
+                "standards": [
+                    "IEEE 1547-2018"
+                ]
             },
             {
                 "desc": "Manufacturer specific value (32 chars)",
@@ -39,23 +48,30 @@
                 "name": "Md",
                 "size": 16,
                 "static": "S",
-                "type": "string"
+                "type": "string",
+                "standards": [
+                    "IEEE 1547-2018"
+                ]
             },
             {
                 "desc": "Manufacturer specific value (16 chars)",
                 "label": "Options",
                 "name": "Opt",
                 "size": 8,
                 "static": "S",
-                "type": "string"
+                "type": "string",
+                "standards": []
             },
             {
                 "desc": "Manufacturer specific value (16 chars)",
                 "label": "Version",
                 "name": "Vr",
                 "size": 8,
                 "static": "S",
-                "type": "string"
+                "type": "string",
+                "standards": [
+                    "IEEE 1547-2018"
+                ]
             },
             {
                 "desc": "Manufacturer specific value (32 chars)",
@@ -64,22 +80,28 @@
                 "name": "SN",
                 "size": 16,
                 "static": "S",
-                "type": "string"
+                "type": "string",
+                "standards": [
+                    "IEEE 1547-2018"
+                ]
             },
             {
                 "access": "RW",
                 "desc": "Modbus device address",
+                "detail": "This point is mandatory for all SunSpec RTU devices and, for those devices, they must support values from 1-247.",
                 "label": "Device Address",
                 "name": "DA",
                 "size": 1,
-                "type": "uint16"
+                "type": "uint16",
+                "standards": []
             },
             {
                 "desc": "Force even alignment",
                 "name": "Pad",
                 "size": 1,
                 "static": "S",
-                "type": "pad"
+                "type": "pad",
+                "standards": []
             }
         ],
         "type": "group"

diff --git a/json/model_101.json b/json/model_101.json
@@ -2,7 +2,7 @@
     "group": {
         "desc": "Include this model for single phase inverter monitoring",
         "label": "Inverter (Single Phase)",
-        "name": "inverter",
+        "name": "inverter_single_phase",
         "points": [
             {
                 "desc": "Model identifier",

diff --git a/json/model_102.json b/json/model_102.json
@@ -2,7 +2,7 @@
     "group": {
         "desc": "Include this model for split phase inverter monitoring",
         "label": "Inverter (Split-Phase)",
-        "name": "inverter",
+        "name": "inverter_split_phase",
         "points": [
             {
                 "desc": "Model identifier",

diff --git a/json/model_103.json b/json/model_103.json
@@ -2,7 +2,7 @@
     "group": {
         "desc": "Include this model for three phase inverter monitoring",
         "label": "Inverter (Three Phase)",
-        "name": "inverter",
+        "name": "inverter_three_phase",
         "points": [
             {
                 "desc": "Model identifier",

diff --git a/json/model_111.json b/json/model_111.json
@@ -2,7 +2,7 @@
     "group": {
         "desc": "Include this model for single phase inverter monitoring using float values",
         "label": "Inverter (Single Phase) FLOAT",
-        "name": "inverter",
+        "name": "inverter_single_phase_float",
         "points": [
             {
                 "desc": "Model identifier",

diff --git a/json/model_112.json b/json/model_112.json
@@ -2,7 +2,7 @@
     "group": {
         "desc": "Include this model for split phase inverter monitoring using float values",
         "label": "Inverter (Split Phase) FLOAT",
-        "name": "inverter",
+        "name": "inverter_split_phase_float",
         "points": [
             {
                 "desc": "Model identifier",

diff --git a/json/model_113.json b/json/model_113.json
@@ -2,7 +2,7 @@
     "group": {
         "desc": "Include this model for three phase inverter monitoring using float values",
         "label": "Inverter (Three Phase) FLOAT",
-        "name": "inverter",
+        "name": "inverter_three_phase_float",
         "points": [
             {
                 "desc": "Model identifier",

diff --git a/json/model_124.json b/json/model_124.json
@@ -2,7 +2,7 @@
     "group": {
         "desc": "Basic Storage Controls ",
         "label": "Storage",
-        "name": "storage",
+        "name": "storage_basic",
         "points": [
             {
                 "desc": "Model identifier",

diff --git a/json/model_201.json b/json/model_201.json
@@ -1,8 +1,8 @@
 {
     "group": {
         "desc": "Include this model for single phase (AN or AB) metering",
-        "label": "Meter (Single Phase)single phase (AN or AB) meter",
-        "name": "ac_meter",
+        "label": "Meter (Single Phase) single phase (AN or AB) meter",
+        "name": "ac_meter_an_or_ab",
         "points": [
             {
                 "desc": "Model identifier",

diff --git a/json/model_202.json b/json/model_202.json
@@ -1,7 +1,7 @@
 {
     "group": {
         "label": "split single phase (ABN) meter",
-        "name": "ac_meter",
+        "name": "ac_meter_abn",
         "points": [
             {
                 "desc": "Model identifier",

diff --git a/json/model_203.json b/json/model_203.json
@@ -1,7 +1,7 @@
 {
     "group": {
         "label": "wye-connect three phase (abcn) meter",
-        "name": "ac_meter",
+        "name": "ac_meter_abcn",
         "points": [
             {
                 "desc": "Model identifier",

diff --git a/json/model_204.json b/json/model_204.json
@@ -1,7 +1,7 @@
 {
     "group": {
         "label": "delta-connect three phase (abc) meter",
-        "name": "ac_meter",
+        "name": "ac_meter_abc",
         "points": [
             {
                 "desc": "Model identifier",

diff --git a/json/model_211.json b/json/model_211.json
@@ -1,7 +1,7 @@
 {
     "group": {
         "label": "single phase (AN or AB) meter",
-        "name": "ac_meter",
+        "name": "ac_meter_an_or_ab_float",
         "points": [
             {
                 "desc": "Model identifier",

diff --git a/json/model_212.json b/json/model_212.json
@@ -1,7 +1,7 @@
 {
     "group": {
         "label": "split single phase (ABN) meter",
-        "name": "ac_meter",
+        "name": "ac_meter_abn_float",
         "points": [
             {
                 "desc": "Model identifier",

diff --git a/json/model_213.json b/json/model_213.json
@@ -1,7 +1,7 @@
 {
     "group": {
         "label": "wye-connect three phase (abcn) meter",
-        "name": "ac_meter",
+        "name": "ac_meter_abcn_float",
         "points": [
             {
                 "desc": "Model identifier",

diff --git a/json/model_214.json b/json/model_214.json
@@ -1,7 +1,7 @@
 {
     "group": {
         "label": "delta-connect three phase (abc) meter",
-        "name": "ac_meter",
+        "name": "ac_meter_abc_float",
         "points": [
             {
                 "desc": "Model identifier",

diff --git a/json/model_220.json b/json/model_220.json
@@ -17,7 +17,7 @@
             }
         ],
         "label": "Secure AC Meter Selected Readings",
-        "name": "ac_meter",
+        "name": "ac_meter_secure",
         "points": [
             {
                 "desc": "Model identifier",

diff --git a/json/model_401.json b/json/model_401.json
@@ -1,6 +1,8 @@
 {
     "group": {
         "desc": "A basic string combiner",
+        "label": "String Combiner (Current)",
+        "name": "string_combiner_current",
         "groups": [
             {
                 "count": 0,
@@ -130,8 +132,6 @@
                 "type": "group"
             }
         ],
-        "label": "String Combiner (Current)",
-        "name": "string_combiner",
         "points": [
             {
                 "desc": "Model identifier",

diff --git a/json/model_402.json b/json/model_402.json
@@ -1,6 +1,8 @@
 {
     "group": {
         "desc": "An advanced string combiner",
+        "label": "String Combiner (Advanced)",
+        "name": "string_combiner_advanced",
         "groups": [
             {
                 "count": 0,
@@ -171,8 +173,6 @@
                 "type": "group"
             }
         ],
-        "label": "String Combiner (Advanced)",
-        "name": "string_combiner",
         "points": [
             {
                 "desc": "Model identifier",

diff --git a/json/model_403.json b/json/model_403.json
@@ -1,6 +1,8 @@
 {
     "group": {
         "desc": "A basic string combiner model",
+        "label": "String Combiner (Current)",
+        "name": "string_combiner_current_input",
         "groups": [
             {
                 "count": 0,
@@ -130,8 +132,6 @@
                 "type": "group"
             }
         ],
-        "label": "String Combiner (Current)",
-        "name": "string_combiner",
         "points": [
             {
                 "desc": "Model identifier",

diff --git a/json/model_404.json b/json/model_404.json
@@ -1,6 +1,8 @@
 {
     "group": {
         "desc": "An advanced string combiner including voltage and energy measurements",
+        "label": "String Combiner (Advanced)",
+        "name": "string_combiner_advanced_inputs",
         "groups": [
             {
                 "count": 0,
@@ -172,8 +174,6 @@
                 "type": "group"
             }
         ],
-        "label": "String Combiner (Advanced)",
-        "name": "string_combiner",
         "points": [
             {
                 "desc": "Model identifier",

diff --git a/json/model_501.json b/json/model_501.json
@@ -2,7 +2,7 @@
     "group": {
         "desc": "A solar module model supporting DC-DC converter",
         "label": "Solar Module",
-        "name": "solar_module",
+        "name": "solar_module_float",
         "points": [
             {
                 "desc": "Model identifier",