Merge pull request #178 from sunspec/development

Development
sunspec · Dec 14, 2020 · 09b35b5 · 09b35b5
2 parents 0bde410 + 998e3f2
commit 09b35b5
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 23 deletions.
diff --git a/json/model_701.json b/json/model_701.json
@@ -822,47 +822,47 @@
                     {
                         "name": "DYN_REACT_CURR",
                         "notes": "",
-                        "value": 7
+                        "value": 6
                     },
                     {
                         "name": "LVRT",
                         "notes": "",
-                        "value": 8
+                        "value": 7
                     },
                     {
                         "name": "HVRT",
                         "notes": "",
-                        "value": 9
+                        "value": 8
                     },
                     {
                         "name": "WATT_VAR",
                         "notes": "",
-                        "value": 10
+                        "value": 9
                     },
                     {
                         "name": "VOLT_WATT",
                         "notes": "",
-                        "value": 11
+                        "value": 10
                     },
                     {
                         "name": "SCHEDULED",
                         "notes": "",
-                        "value": 12
+                        "value": 11
                     },
                     {
                         "name": "LFRT",
                         "notes": "",
-                        "value": 13
+                        "value": 12
                     },
                     {
                         "name": "HFRT",
                         "notes": "",
-                        "value": 14
+                        "value": 13
                     },
                     {
                         "name": "DERATED",
                         "notes": "",
-                        "value": 15
+                        "value": 14
                     }
                 ],
                 "type": "bitfield32"

diff --git a/json/model_702.json b/json/model_702.json
@@ -276,42 +276,42 @@
                     {
                         "name": "DYN_REACT_CURR",
                         "notes": "",
-                        "value": 7
+                        "value": 6
                     },
                     {
                         "name": "LV_TRIP",
                         "notes": "",
-                        "value": 8
+                        "value": 7
                     },
                     {
                         "name": "HV_TRIP",
                         "notes": "",
-                        "value": 9
+                        "value": 8
                     },
                     {
                         "name": "WATT_VAR",
                         "notes": "",
-                        "value": 10
+                        "value": 9
                     },
                     {
                         "name": "VOLT_WATT",
                         "notes": "",
-                        "value": 11
+                        "value": 10
                     },
                     {
                         "name": "SCHEDULED",
                         "notes": "",
-                        "value": 12
+                        "value": 11
                     },
                     {
                         "name": "LF_TRIP",
                         "notes": "",
-                        "value": 13
+                        "value": 12
                     },
                     {
                         "name": "HF_TRIP",
                         "notes": "",
-                        "value": 14
+                        "value": 13
                     }
                 ],
                 "type": "bitfield32"

diff --git a/json/model_704.json b/json/model_704.json
@@ -789,6 +789,30 @@
                 "type": "uint16",
                 "units": "%Max/Sec"
             },
+            {
+                "access": "RW",
+                "desc": "Anti-islanding enable.",
+                "label": "Anti-Islanding Enable",
+                "name": "AntiIslEna",
+                "notes": "",
+                "symbols": [
+                    {
+                        "desc": "Anti-islanding is disabled.",
+                        "label": "Disabled",
+                        "name": "DISABLED",
+                        "notes": "",
+                        "value": 0
+                    },
+                    {
+                        "desc": "Anti-islanding is enabled.",
+                        "label": "Enabled",
+                        "name": "ENABLED",
+                        "notes": "",
+                        "value": 1
+                    }
+                ],
+                "type": "enum16"
+            },
             {
                 "comments": [
                     "Scale Factors"

diff --git a/json/model_713.json b/json/model_713.json
@@ -26,6 +26,13 @@
                 "type": "uint16",
                 "units": "WH"
             },
+            {
+                "desc": "Energy available of the DER storage (WHAvail = WHRtg * SoC * SoH)",
+                "label": "Energy Available",
+                "name": "WHAvail",
+                "type": "uint16",
+                "units": "WH"
+            },
             {
                 "desc": "State of charge of the DER storage.",
                 "label": "State of Charge",
@@ -41,11 +48,30 @@
                 "units": "Pct"
             },
             {
-                "desc": "Energy available of the DER storage (WHAvail = WHRtg * SoC * SoH)",
-                "label": "Energy Available",
-                "name": "WHAvail",
-                "type": "uint16",
-                "units": "WH"
+                "desc": "Storage status.",
+                "label": "Status",
+                "name": "Sta",
+                "symbols": [
+                    {
+                        "desc": "No warnings or errors pending.",
+                        "label": "OK",
+                        "name": "OK",
+                        "value": 1
+                    },
+                    {
+                        "desc": "One or more warnings pending.",
+                        "label": "Warning",
+                        "name": "WARNING",
+                        "value": 2
+                    },
+                    {
+                        "desc": "One or more errors pending.",
+                        "label": "Error",
+                        "name": "ERROR",
+                        "value": 3
+                    }
+                ],
+                "type": "enum16"
             },
             {
                 "desc": "Scale factor for energy capacity.",

diff --git a/json/model_714.json b/json/model_714.json
@@ -126,7 +126,7 @@
                     {
                         "desc": "DC port status.",
                         "label": "DC Port Status",
-                        "name": "DCSt",
+                        "name": "DCSta",
                         "notes": "",
                         "symbols": [
                             {