Skip to content

Commit cd7767e

Browse files
author
bobfox
authored
Merge pull request #232 from sunspec/development
Development
2 parents fa600e6 + 88b8414 commit cd7767e

File tree

5 files changed

+31
-20
lines changed

5 files changed

+31
-20
lines changed

‎json/model_705.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"sf": "V_SF",
2727
"size": 1,
2828
"type": "uint16",
29-
"units": "VRefPct"
29+
"units": "VNomPct"
3030
},
3131
{
3232
"access": "RW",
@@ -121,7 +121,7 @@
121121
"sf": "V_SF",
122122
"size": 1,
123123
"type": "uint16",
124-
"units": "VRefPct"
124+
"units": "VNomPct"
125125
},
126126
{
127127
"desc": "Autonomous vref value as a percentage of nominal voltage.",
@@ -130,7 +130,7 @@
130130
"sf": "V_SF",
131131
"size": 1,
132132
"type": "uint16",
133-
"units": "VRefPct"
133+
"units": "VNomPct"
134134
},
135135
{
136136
"access": "RW",

‎json/model_706.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"sf": "V_SF",
2727
"size": 1,
2828
"type": "uint16",
29-
"units": "VRefPct"
29+
"units": "VNomPct"
3030
},
3131
{
3232
"access": "RW",

‎json/model_707.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"sf": "V_SF",
3030
"size": 1,
3131
"type": "uint16",
32-
"units": "VRefPct"
32+
"units": "VNomPct"
3333
},
3434
{
3535
"access": "RW",
@@ -76,7 +76,7 @@
7676
"sf": "V_SF",
7777
"size": 1,
7878
"type": "uint16",
79-
"units": "VRefPct"
79+
"units": "VNomPct"
8080
},
8181
{
8282
"access": "RW",
@@ -123,7 +123,7 @@
123123
"sf": "V_SF",
124124
"size": 1,
125125
"type": "uint16",
126-
"units": "VRefPct"
126+
"units": "VNomPct"
127127
},
128128
{
129129
"access": "RW",

‎json/model_708.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"sf": "V_SF",
3030
"size": 1,
3131
"type": "uint16",
32-
"units": "VRefPct"
32+
"units": "VNomPct"
3333
},
3434
{
3535
"access": "RW",
@@ -76,7 +76,7 @@
7676
"sf": "V_SF",
7777
"size": 1,
7878
"type": "uint16",
79-
"units": "VRefPct"
79+
"units": "VNomPct"
8080
},
8181
{
8282
"access": "RW",
@@ -123,7 +123,7 @@
123123
"sf": "V_SF",
124124
"size": 1,
125125
"type": "uint16",
126-
"units": "VRefPct"
126+
"units": "VNomPct"
127127
},
128128
{
129129
"access": "RW",

‎json/model_714.json‎

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -73,46 +73,53 @@
7373
"name": "DCA",
7474
"sf": "DCA_SF",
7575
"size": 1,
76-
"type": "int16"
76+
"type": "int16",
77+
"units": "A"
7778
},
7879
{
7980
"desc": "DC voltage for the port.",
8081
"label": "DC Voltage",
8182
"name": "DCV",
8283
"sf": "DCV_SF",
8384
"size": 1,
84-
"type": "uint16"
85+
"type": "uint16",
86+
"units": "V"
8587
},
8688
{
8789
"desc": "DC power for the port.",
8890
"label": "DC Power",
8991
"name": "DCW",
9092
"sf": "DCW_SF",
9193
"size": 1,
92-
"type": "int16"
94+
"type": "int16",
95+
"units": "W"
9396
},
9497
{
9598
"desc": "Total cumulative DC energy injected for the port.",
9699
"label": "DC Energy Injected",
97100
"name": "DCWhInj",
98101
"sf": "DCWH_SF",
99102
"size": 4,
100-
"type": "uint64"
103+
"type": "uint64",
104+
"units": "Wh"
101105
},
102106
{
103107
"desc": "Total cumulative DC energy absorbed for the port.",
104108
"label": "DC Energy Absorbed",
105109
"name": "DCWhAbs",
106110
"sf": "DCWH_SF",
107111
"size": 4,
108-
"type": "uint64"
112+
"type": "uint64",
113+
"units": "Wh"
109114
},
110115
{
111116
"desc": "DC port temperature.",
112117
"label": "DC Port Temperature",
113118
"name": "Tmp",
119+
"sf": "Tmp_SF",
114120
"size": 1,
115-
"type": "int16"
121+
"type": "int16",
122+
"units": "C"
116123
},
117124
{
118125
"desc": "DC port status.",
@@ -272,31 +279,35 @@
272279
"name": "DCA",
273280
"sf": "DCA_SF",
274281
"size": 1,
275-
"type": "int16"
282+
"type": "int16",
283+
"units": "A"
276284
},
277285
{
278286
"desc": "Total DC power for all ports.",
279287
"label": "DC Power",
280288
"name": "DCW",
281289
"sf": "DCW_SF",
282290
"size": 1,
283-
"type": "int16"
291+
"type": "int16",
292+
"units": "W"
284293
},
285294
{
286295
"desc": "Total cumulative DC energy injected for all ports.",
287296
"label": "DC Energy Injected",
288297
"name": "DCWhInj",
289298
"sf": "DCWH_SF",
290299
"size": 4,
291-
"type": "uint64"
300+
"type": "uint64",
301+
"units": "Wh"
292302
},
293303
{
294304
"desc": "Total cumulative DC energy absorbed for all ports.",
295305
"label": "DC Energy Absorbed",
296306
"name": "DCWhAbs",
297307
"sf": "DCWH_SF",
298308
"size": 4,
299-
"type": "uint64"
309+
"type": "uint64",
310+
"units": "Wh"
300311
},
301312
{
302313
"desc": "DC current scale factor.",

0 commit comments

Comments
 (0)