Merge pull request #212 from sunspec/development

Development
sunspec · Apr 17, 2021 · a540536 · a540536
2 parents 9669dde + 9032cb9
commit a540536
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/json/model_711.json b/json/model_711.json
@@ -7,8 +7,8 @@
                     "Stored control sets - Number of control sets contained in NCtl - The first set is read-only and indicates the current settings."
                 ],
                 "count": "NCtl",
-                "desc": "Stored curve sets.",
-                "label": "Stored Curves",
+                "desc": "Stored control sets.",
+                "label": "Stored Controls",
                 "name": "Ctl",
                 "points": [
                     {
@@ -162,19 +162,19 @@
                 "size": 1,
                 "symbols": [
                     {
-                        "desc": "Curve update in progress.",
+                        "desc": "Control update in progress.",
                         "label": "Update In Progress",
                         "name": "IN_PROGRESS",
                         "value": 0
                     },
                     {
-                        "desc": "Curve update completed successfully.",
+                        "desc": "Control update completed successfully.",
                         "label": "Update Complete",
                         "name": "COMPLETED",
                         "value": 1
                     },
                     {
-                        "desc": "Curve update failed.",
+                        "desc": "Control update failed.",
                         "label": "Update Failed",
                         "name": "FAILED",
                         "value": 2
@@ -183,8 +183,8 @@
                 "type": "enum16"
             },
             {
-                "desc": "Number of stored curves supported.",
-                "label": "Stored Curve Count",
+                "desc": "Number of stored controls supported.",
+                "label": "Stored Control Count",
                 "mandatory": "M",
                 "name": "NCtl",
                 "size": 1,

diff --git a/json/model_713.json b/json/model_713.json
@@ -46,6 +46,7 @@
                 "desc": "State of charge of the DER storage.",
                 "label": "State of Charge",
                 "name": "SoC",
+                "sf": "Pct_SF",
                 "size": 1,
                 "type": "uint16",
                 "units": "Pct"
@@ -54,6 +55,7 @@
                 "desc": "State of health of the DER storage.",
                 "label": "State of Health",
                 "name": "SoH",
+                "sf": "Pct_SF",
                 "size": 1,
                 "type": "uint16",
                 "units": "Pct"
@@ -90,6 +92,15 @@
                 "label": "Energy Scale Factor",
                 "name": "WH_SF",
                 "size": 1,
+                "static": "S",
+                "type": "sunssf"
+            },
+            {
+                "desc": "Scale factor for percentage.",
+                "label": "Percent Scale Factor",
+                "name": "Pct_SF",
+                "size": 1,
+                "static": "S",
                 "type": "sunssf"
             }
         ],