Skip to content

Commit ab6f2c9

Browse files
author
bobfox
authored
Merge pull request #186 from sunspec/development
Development
2 parents 09b35b5 + 6f332a2 commit ab6f2c9

10 files changed

Lines changed: 89 additions & 84 deletions

‎json/model_701.json‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
"name": "L",
2323
"notes": "",
2424
"static": "S",
25-
"type": "uint16"
25+
"type": "uint16",
26+
"value": 153
2627
},
2728
{
2829
"comments": [
@@ -38,19 +39,19 @@
3839
"label": "Single Phase",
3940
"name": "SINGLE_PHASE",
4041
"notes": "",
41-
"value": 1
42+
"value": 0
4243
},
4344
{
4445
"label": "Split Phase",
4546
"name": "SPLIT_PHASE",
4647
"notes": "",
47-
"value": 2
48+
"value": 1
4849
},
4950
{
5051
"label": "Three Phase",
5152
"name": "THREE_PHASE",
5253
"notes": "",
53-
"value": 3
54+
"value": 2
5455
}
5556
],
5657
"type": "enum16"
@@ -68,13 +69,13 @@
6869
"label": "Off",
6970
"name": "OFF",
7071
"notes": "",
71-
"value": 1
72+
"value": 0
7273
},
7374
{
7475
"label": "On",
7576
"name": "ON",
7677
"notes": "",
77-
"value": 2
78+
"value": 1
7879
}
7980
],
8081
"type": "enum16"
@@ -91,42 +92,42 @@
9192
{
9293
"name": "OFF",
9394
"notes": "",
94-
"value": 1
95+
"value": 0
9596
},
9697
{
9798
"name": "SLEEPING",
9899
"notes": "",
99-
"value": 2
100+
"value": 1
100101
},
101102
{
102103
"name": "STARTING",
103104
"notes": "",
104-
"value": 3
105+
"value": 2
105106
},
106107
{
107108
"name": "MPPT",
108109
"notes": "",
109-
"value": 4
110+
"value": 3
110111
},
111112
{
112113
"name": "THROTTLED",
113114
"notes": "",
114-
"value": 5
115+
"value": 4
115116
},
116117
{
117118
"name": "SHUTTING_DOWN",
118119
"notes": "",
119-
"value": 6
120+
"value": 5
120121
},
121122
{
122123
"name": "FAULT",
123124
"notes": "",
124-
"value": 7
125+
"value": 6
125126
},
126127
{
127128
"name": "STANDBY",
128129
"notes": "",
129-
"value": 8
130+
"value": 7
130131
}
131132
],
132133
"type": "enum16"
@@ -145,14 +146,14 @@
145146
"label": "Disconnected",
146147
"name": "DISCONNECTED",
147148
"notes": "",
148-
"value": 1
149+
"value": 0
149150
},
150151
{
151152
"desc": "Connected to the grid.",
152153
"label": "Connected",
153154
"name": "CONNECTED",
154155
"notes": "",
155-
"value": 2
156+
"value": 1
156157
}
157158
],
158159
"type": "enum16"
@@ -264,7 +265,7 @@
264265
},
265266
{
266267
"desc": "Manufacturer alarm, see ManAlrmInfo field for more information.",
267-
"label": "Manfacturer Alarm",
268+
"label": "Manufacturer Alarm",
268269
"name": "MANUFACTURER_ALRM",
269270
"notes": "",
270271
"value": 16

‎json/model_702.json‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
"name": "L",
2323
"notes": "",
2424
"static": "S",
25-
"type": "uint16"
25+
"type": "uint16",
26+
"value": 50
2627
},
2728
{
2829
"comments": [
@@ -203,12 +204,12 @@
203204
{
204205
"name": "CAT_A",
205206
"notes": "",
206-
"value": 1
207+
"value": 0
207208
},
208209
{
209210
"name": "CAT_B",
210211
"notes": "",
211-
"value": 2
212+
"value": 1
212213
}
213214
],
214215
"type": "enum16"
@@ -222,17 +223,17 @@
222223
{
223224
"name": "CAT_1",
224225
"notes": "",
225-
"value": 1
226+
"value": 0
226227
},
227228
{
228229
"name": "CAT_2",
229230
"notes": "",
230-
"value": 2
231+
"value": 1
231232
},
232233
{
233234
"name": "CAT_3",
234235
"notes": "",
235-
"value": 3
236+
"value": 2
236237
}
237238
],
238239
"type": "enum16"

‎json/model_703.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"notes": "",
2424
"static": "S",
2525
"type": "uint16",
26-
"value": 12
26+
"value": 17
2727
},
2828
{
2929
"access": "RW",
@@ -121,7 +121,7 @@
121121
"units": "Secs"
122122
},
123123
{
124-
"desc": "Voltage scale factor.",
124+
"desc": "Voltage percentage scale factor.",
125125
"label": "Voltage Scale Factor",
126126
"name": "V_SF",
127127
"notes": "",

‎json/model_704.json‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,8 @@
195195
"name": "L",
196196
"notes": "",
197197
"static": "S",
198-
"type": "uint16"
198+
"type": "uint16",
199+
"value": 65
199200
},
200201
{
201202
"access": "RW",
@@ -460,14 +461,14 @@
460461
"label": "Active Power As Max Percent",
461462
"name": "W_MAX_PCT",
462463
"notes": "",
463-
"value": 1
464+
"value": 0
464465
},
465466
{
466467
"desc": "Active power setting is in watts.",
467468
"label": "Active Power As Watts",
468469
"name": "WATTS",
469470
"notes": "",
470-
"value": 2
471+
"value": 1
471472
}
472473
],
473474
"type": "enum16"
@@ -592,28 +593,28 @@
592593
"label": "Reactive Power As Watt Max Pct",
593594
"name": "W_MAX_PCT",
594595
"notes": "",
595-
"value": 1
596+
"value": 0
596597
},
597598
{
598599
"desc": "Reactive power setting is percent of maximum reactive power.",
599600
"label": "Reactive Power As Var Max Pct",
600601
"name": "VAR_MAX_PCT",
601602
"notes": "",
602-
"value": 2
603+
"value": 1
603604
},
604605
{
605606
"desc": "Reactive power setting is percent of available reactive power.",
606607
"label": "Reactive Power As Var Avail Pct",
607608
"name": "VAR_AVAIL_PCT",
608609
"notes": "",
609-
"value": 3
610+
"value": 2
610611
},
611612
{
612613
"desc": "Reactive power is in vars.",
613614
"label": "Reactive Power As Vars",
614615
"name": "VARS",
615616
"notes": "",
616-
"value": 4
617+
"value": 3
617618
}
618619
],
619620
"type": "enum16"
@@ -630,35 +631,35 @@
630631
"label": "Active Power Priority",
631632
"name": "ACTIVE",
632633
"notes": "",
633-
"value": 1
634+
"value": 0
634635
},
635636
{
636637
"desc": "Reactive power priority.",
637638
"label": "Reactive Power Priority",
638639
"name": "REACTIVE",
639640
"notes": "",
640-
"value": 2
641+
"value": 1
641642
},
642643
{
643644
"desc": "IEEE 1547-2018 power priority mode.",
644645
"label": "IEEE 1547 Power Priority",
645646
"name": "IEEE_1547",
646647
"notes": "",
647-
"value": 3
648+
"value": 2
648649
},
649650
{
650651
"desc": "Track PF setting derived from current active and reactive power settings.",
651652
"label": "PF Power Priority",
652653
"name": "PF",
653654
"notes": "",
654-
"value": 4
655+
"value": 3
655656
},
656657
{
657658
"desc": "Power priority is vendor specific mode.",
658659
"label": "Vendor Power Priority",
659660
"name": "VENDOR",
660661
"notes": "",
661-
"value": 5
662+
"value": 4
662663
}
663664
],
664665
"type": "enum16"
@@ -768,14 +769,14 @@
768769
"label": "Max Current Ramp",
769770
"name": "A_MAX",
770771
"notes": "",
771-
"value": 1
772+
"value": 0
772773
},
773774
{
774775
"desc": "Ramp based on percent of max active power per second.",
775776
"label": "Max Active Power Ramp",
776777
"name": "W_MAX",
777778
"notes": "",
778-
"value": 2
779+
"value": 1
779780
}
780781
],
781782
"type": "enum16"

‎json/model_705.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,25 +68,25 @@
6868
"label": "Percent Max Watts",
6969
"name": "W_MAX_PCT",
7070
"notes": "",
71-
"value": 1
71+
"value": 0
7272
},
7373
{
7474
"label": "Percent Max Vars",
7575
"name": "VAR_MAX_PCT",
7676
"notes": "",
77-
"value": 2
77+
"value": 1
7878
},
7979
{
8080
"label": "Percent Available Vars",
8181
"name": "VAR_AVAL_PCT",
8282
"notes": "",
83-
"value": 3
83+
"value": 2
8484
},
8585
{
8686
"label": "Percent Max Apparent Power",
8787
"name": "VA_MAX_PCT",
8888
"notes": "",
89-
"value": 4
89+
"value": 3
9090
}
9191
],
9292
"type": "enum16"
@@ -101,35 +101,35 @@
101101
"label": "Active Power Priority",
102102
"name": "ACTIVE",
103103
"notes": "",
104-
"value": 1
104+
"value": 0
105105
},
106106
{
107107
"desc": "Reactive power priority.",
108108
"label": "Reactive Power Priority",
109109
"name": "REACTIVE",
110110
"notes": "",
111-
"value": 2
111+
"value": 1
112112
},
113113
{
114114
"desc": "IEEE 1547-2018 power priority mode.",
115115
"label": "IEEE 1547 Power Priority",
116116
"name": "IEEE_1547",
117117
"notes": "",
118-
"value": 3
118+
"value": 2
119119
},
120120
{
121121
"desc": "Track PF setting derived from current active and reactive power settings.",
122122
"label": "PF Power Priority",
123123
"name": "PF",
124124
"notes": "",
125-
"value": 4
125+
"value": 3
126126
},
127127
{
128128
"desc": "Power priority is vendor specific mode.",
129129
"label": "Vendor Power Priority",
130130
"name": "VENDOR",
131131
"notes": "",
132-
"value": 5
132+
"value": 4
133133
}
134134
],
135135
"type": "enum16"

‎json/model_706.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,12 @@
6767
{
6868
"name": "W_MAX_PCT",
6969
"notes": "",
70-
"value": 1
70+
"value": 0
7171
},
7272
{
7373
"name": "W_AVAL_PCT",
7474
"notes": "",
75-
"value": 2
75+
"value": 1
7676
}
7777
],
7878
"type": "enum16"

0 commit comments

Comments
 (0)