Merge pull request #232 from sunspec/development

Development
sunspec · Dec 9, 2021 · cd7767e · cd7767e
2 parents fa600e6 + 88b8414
commit cd7767e
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 20 deletions.
diff --git a/json/model_705.json b/json/model_705.json
@@ -26,7 +26,7 @@
                                 "sf": "V_SF",
                                 "size": 1,
                                 "type": "uint16",
-                                "units": "VRefPct"
+                                "units": "VNomPct"
                             },
                             {
                                 "access": "RW",
@@ -121,7 +121,7 @@
                         "sf": "V_SF",
                         "size": 1,
                         "type": "uint16",
-                        "units": "VRefPct"
+                        "units": "VNomPct"
                     },
                     {
                         "desc": "Autonomous vref value as a percentage of nominal voltage.",
@@ -130,7 +130,7 @@
                         "sf": "V_SF",
                         "size": 1,
                         "type": "uint16",
-                        "units": "VRefPct"
+                        "units": "VNomPct"
                     },
                     {
                         "access": "RW",

diff --git a/json/model_706.json b/json/model_706.json
@@ -26,7 +26,7 @@
                                 "sf": "V_SF",
                                 "size": 1,
                                 "type": "uint16",
-                                "units": "VRefPct"
+                                "units": "VNomPct"
                             },
                             {
                                 "access": "RW",

diff --git a/json/model_707.json b/json/model_707.json
@@ -29,7 +29,7 @@
                                         "sf": "V_SF",
                                         "size": 1,
                                         "type": "uint16",
-                                        "units": "VRefPct"
+                                        "units": "VNomPct"
                                     },
                                     {
                                         "access": "RW",
@@ -76,7 +76,7 @@
                                         "sf": "V_SF",
                                         "size": 1,
                                         "type": "uint16",
-                                        "units": "VRefPct"
+                                        "units": "VNomPct"
                                     },
                                     {
                                         "access": "RW",
@@ -123,7 +123,7 @@
                                         "sf": "V_SF",
                                         "size": 1,
                                         "type": "uint16",
-                                        "units": "VRefPct"
+                                        "units": "VNomPct"
                                     },
                                     {
                                         "access": "RW",

diff --git a/json/model_708.json b/json/model_708.json
@@ -29,7 +29,7 @@
                                         "sf": "V_SF",
                                         "size": 1,
                                         "type": "uint16",
-                                        "units": "VRefPct"
+                                        "units": "VNomPct"
                                     },
                                     {
                                         "access": "RW",
@@ -76,7 +76,7 @@
                                         "sf": "V_SF",
                                         "size": 1,
                                         "type": "uint16",
-                                        "units": "VRefPct"
+                                        "units": "VNomPct"
                                     },
                                     {
                                         "access": "RW",
@@ -123,7 +123,7 @@
                                         "sf": "V_SF",
                                         "size": 1,
                                         "type": "uint16",
-                                        "units": "VRefPct"
+                                        "units": "VNomPct"
                                     },
                                     {
                                         "access": "RW",

diff --git a/json/model_714.json b/json/model_714.json
@@ -73,46 +73,53 @@
                         "name": "DCA",
                         "sf": "DCA_SF",
                         "size": 1,
-                        "type": "int16"
+                        "type": "int16",
+                        "units": "A"
                     },
                     {
                         "desc": "DC voltage for the port.",
                         "label": "DC Voltage",
                         "name": "DCV",
                         "sf": "DCV_SF",
                         "size": 1,
-                        "type": "uint16"
+                        "type": "uint16",
+                        "units": "V"
                     },
                     {
                         "desc": "DC power for the port.",
                         "label": "DC Power",
                         "name": "DCW",
                         "sf": "DCW_SF",
                         "size": 1,
-                        "type": "int16"
+                        "type": "int16",
+                        "units": "W"
                     },
                     {
                         "desc": "Total cumulative DC energy injected for the port.",
                         "label": "DC Energy Injected",
                         "name": "DCWhInj",
                         "sf": "DCWH_SF",
                         "size": 4,
-                        "type": "uint64"
+                        "type": "uint64",
+                        "units": "Wh"
                     },
                     {
                         "desc": "Total cumulative DC energy absorbed for the port.",
                         "label": "DC Energy Absorbed",
                         "name": "DCWhAbs",
                         "sf": "DCWH_SF",
                         "size": 4,
-                        "type": "uint64"
+                        "type": "uint64",
+                        "units": "Wh"
                     },
                     {
                         "desc": "DC port temperature.",
                         "label": "DC Port Temperature",
                         "name": "Tmp",
+                        "sf": "Tmp_SF",
                         "size": 1,
-                        "type": "int16"
+                        "type": "int16",
+                        "units": "C"
                     },
                     {
                         "desc": "DC port status.",
@@ -272,31 +279,35 @@
                 "name": "DCA",
                 "sf": "DCA_SF",
                 "size": 1,
-                "type": "int16"
+                "type": "int16",
+                "units": "A"
             },
             {
                 "desc": "Total DC power for all ports.",
                 "label": "DC Power",
                 "name": "DCW",
                 "sf": "DCW_SF",
                 "size": 1,
-                "type": "int16"
+                "type": "int16",
+                "units": "W"
             },
             {
                 "desc": "Total cumulative DC energy injected for all ports.",
                 "label": "DC Energy Injected",
                 "name": "DCWhInj",
                 "sf": "DCWH_SF",
                 "size": 4,
-                "type": "uint64"
+                "type": "uint64",
+                "units": "Wh"
             },
             {
                 "desc": "Total cumulative DC energy absorbed for all ports.",
                 "label": "DC Energy Absorbed",
                 "name": "DCWhAbs",
                 "sf": "DCWH_SF",
                 "size": 4,
-                "type": "uint64"
+                "type": "uint64",
+                "units": "Wh"
             },
             {
                 "desc": "DC current scale factor.",