Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Development #186

Merged
merged 4 commits into from
Jan 11, 2021
Merged

Development #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
75e4e30
Fixed typo mentioned in #179 (#182)
eliastheis Jan 8, 2021
0b4bf05
#185 #180 - Models 701, 702, 703, 704, 713, 715; Added model lengths
shelcrow Jan 11, 2021
aaeee09
#163 - Model 715; Update points 'DERHb', 'ControllerHb' type to uint32
shelcrow Jan 11, 2021
6f332a2
#184 - 700 Models; All enums now use 0 based indexing
shelcrow Jan 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 18 additions & 17 deletions json/model_701.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
"name": "L",
"notes": "",
"static": "S",
"type": "uint16"
"type": "uint16",
"value": 153
},
{
"comments": [
Expand All @@ -38,19 +39,19 @@
"label": "Single Phase",
"name": "SINGLE_PHASE",
"notes": "",
"value": 1
"value": 0
},
{
"label": "Split Phase",
"name": "SPLIT_PHASE",
"notes": "",
"value": 2
"value": 1
},
{
"label": "Three Phase",
"name": "THREE_PHASE",
"notes": "",
"value": 3
"value": 2
}
],
"type": "enum16"
Expand All @@ -68,13 +69,13 @@
"label": "Off",
"name": "OFF",
"notes": "",
"value": 1
"value": 0
},
{
"label": "On",
"name": "ON",
"notes": "",
"value": 2
"value": 1
}
],
"type": "enum16"
Expand All @@ -91,42 +92,42 @@
{
"name": "OFF",
"notes": "",
"value": 1
"value": 0
},
{
"name": "SLEEPING",
"notes": "",
"value": 2
"value": 1
},
{
"name": "STARTING",
"notes": "",
"value": 3
"value": 2
},
{
"name": "MPPT",
"notes": "",
"value": 4
"value": 3
},
{
"name": "THROTTLED",
"notes": "",
"value": 5
"value": 4
},
{
"name": "SHUTTING_DOWN",
"notes": "",
"value": 6
"value": 5
},
{
"name": "FAULT",
"notes": "",
"value": 7
"value": 6
},
{
"name": "STANDBY",
"notes": "",
"value": 8
"value": 7
}
],
"type": "enum16"
Expand All @@ -145,14 +146,14 @@
"label": "Disconnected",
"name": "DISCONNECTED",
"notes": "",
"value": 1
"value": 0
},
{
"desc": "Connected to the grid.",
"label": "Connected",
"name": "CONNECTED",
"notes": "",
"value": 2
"value": 1
}
],
"type": "enum16"
Expand Down Expand Up @@ -264,7 +265,7 @@
},
{
"desc": "Manufacturer alarm, see ManAlrmInfo field for more information.",
"label": "Manfacturer Alarm",
"label": "Manufacturer Alarm",
"name": "MANUFACTURER_ALRM",
"notes": "",
"value": 16
Expand Down
13 changes: 7 additions & 6 deletions json/model_702.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
"name": "L",
"notes": "",
"static": "S",
"type": "uint16"
"type": "uint16",
"value": 50
},
{
"comments": [
Expand Down Expand Up @@ -203,12 +204,12 @@
{
"name": "CAT_A",
"notes": "",
"value": 1
"value": 0
},
{
"name": "CAT_B",
"notes": "",
"value": 2
"value": 1
}
],
"type": "enum16"
Expand All @@ -222,17 +223,17 @@
{
"name": "CAT_1",
"notes": "",
"value": 1
"value": 0
},
{
"name": "CAT_2",
"notes": "",
"value": 2
"value": 1
},
{
"name": "CAT_3",
"notes": "",
"value": 3
"value": 2
}
],
"type": "enum16"
Expand Down
4 changes: 2 additions & 2 deletions json/model_703.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"notes": "",
"static": "S",
"type": "uint16",
"value": 12
"value": 17
},
{
"access": "RW",
Expand Down Expand Up @@ -121,7 +121,7 @@
"units": "Secs"
},
{
"desc": "Voltage scale factor.",
"desc": "Voltage percentage scale factor.",
"label": "Voltage Scale Factor",
"name": "V_SF",
"notes": "",
Expand Down
29 changes: 15 additions & 14 deletions json/model_704.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,8 @@
"name": "L",
"notes": "",
"static": "S",
"type": "uint16"
"type": "uint16",
"value": 65
},
{
"access": "RW",
Expand Down Expand Up @@ -460,14 +461,14 @@
"label": "Active Power As Max Percent",
"name": "W_MAX_PCT",
"notes": "",
"value": 1
"value": 0
},
{
"desc": "Active power setting is in watts.",
"label": "Active Power As Watts",
"name": "WATTS",
"notes": "",
"value": 2
"value": 1
}
],
"type": "enum16"
Expand Down Expand Up @@ -592,28 +593,28 @@
"label": "Reactive Power As Watt Max Pct",
"name": "W_MAX_PCT",
"notes": "",
"value": 1
"value": 0
},
{
"desc": "Reactive power setting is percent of maximum reactive power.",
"label": "Reactive Power As Var Max Pct",
"name": "VAR_MAX_PCT",
"notes": "",
"value": 2
"value": 1
},
{
"desc": "Reactive power setting is percent of available reactive power.",
"label": "Reactive Power As Var Avail Pct",
"name": "VAR_AVAIL_PCT",
"notes": "",
"value": 3
"value": 2
},
{
"desc": "Reactive power is in vars.",
"label": "Reactive Power As Vars",
"name": "VARS",
"notes": "",
"value": 4
"value": 3
}
],
"type": "enum16"
Expand All @@ -630,35 +631,35 @@
"label": "Active Power Priority",
"name": "ACTIVE",
"notes": "",
"value": 1
"value": 0
},
{
"desc": "Reactive power priority.",
"label": "Reactive Power Priority",
"name": "REACTIVE",
"notes": "",
"value": 2
"value": 1
},
{
"desc": "IEEE 1547-2018 power priority mode.",
"label": "IEEE 1547 Power Priority",
"name": "IEEE_1547",
"notes": "",
"value": 3
"value": 2
},
{
"desc": "Track PF setting derived from current active and reactive power settings.",
"label": "PF Power Priority",
"name": "PF",
"notes": "",
"value": 4
"value": 3
},
{
"desc": "Power priority is vendor specific mode.",
"label": "Vendor Power Priority",
"name": "VENDOR",
"notes": "",
"value": 5
"value": 4
}
],
"type": "enum16"
Expand Down Expand Up @@ -768,14 +769,14 @@
"label": "Max Current Ramp",
"name": "A_MAX",
"notes": "",
"value": 1
"value": 0
},
{
"desc": "Ramp based on percent of max active power per second.",
"label": "Max Active Power Ramp",
"name": "W_MAX",
"notes": "",
"value": 2
"value": 1
}
],
"type": "enum16"
Expand Down
18 changes: 9 additions & 9 deletions json/model_705.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,25 +68,25 @@
"label": "Percent Max Watts",
"name": "W_MAX_PCT",
"notes": "",
"value": 1
"value": 0
},
{
"label": "Percent Max Vars",
"name": "VAR_MAX_PCT",
"notes": "",
"value": 2
"value": 1
},
{
"label": "Percent Available Vars",
"name": "VAR_AVAL_PCT",
"notes": "",
"value": 3
"value": 2
},
{
"label": "Percent Max Apparent Power",
"name": "VA_MAX_PCT",
"notes": "",
"value": 4
"value": 3
}
],
"type": "enum16"
Expand All @@ -101,35 +101,35 @@
"label": "Active Power Priority",
"name": "ACTIVE",
"notes": "",
"value": 1
"value": 0
},
{
"desc": "Reactive power priority.",
"label": "Reactive Power Priority",
"name": "REACTIVE",
"notes": "",
"value": 2
"value": 1
},
{
"desc": "IEEE 1547-2018 power priority mode.",
"label": "IEEE 1547 Power Priority",
"name": "IEEE_1547",
"notes": "",
"value": 3
"value": 2
},
{
"desc": "Track PF setting derived from current active and reactive power settings.",
"label": "PF Power Priority",
"name": "PF",
"notes": "",
"value": 4
"value": 3
},
{
"desc": "Power priority is vendor specific mode.",
"label": "Vendor Power Priority",
"name": "VENDOR",
"notes": "",
"value": 5
"value": 4
}
],
"type": "enum16"
Expand Down
4 changes: 2 additions & 2 deletions json/model_706.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,12 @@
{
"name": "W_MAX_PCT",
"notes": "",
"value": 1
"value": 0
},
{
"name": "W_AVAL_PCT",
"notes": "",
"value": 2
"value": 1
}
],
"type": "enum16"
Expand Down
Loading