Skip to content

Commit

Permalink
Merge pull request #196 from sunspec/development
Browse files Browse the repository at this point in the history 
Development
  • Loading branch information
bobfox authored Jan 21, 2021
2 parents 908c176 + 98f3a5e commit c1c980c
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 11 deletions.
6 changes: 6 additions & 0 deletions json/model_1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"mandatory": "M",
"name": "Mn",
"size": 16,
"static": "S",
"type": "string"
},
{
Expand All @@ -35,20 +36,23 @@
"mandatory": "M",
"name": "Md",
"size": 16,
"static": "S",
"type": "string"
},
{
"desc": "Manufacturer specific value (16 chars)",
"label": "Options",
"name": "Opt",
"size": 8,
"static": "S",
"type": "string"
},
{
"desc": "Manufacturer specific value (16 chars)",
"label": "Version",
"name": "Vr",
"size": 8,
"static": "S",
"type": "string"
},
{
Expand All @@ -57,6 +61,7 @@
"mandatory": "M",
"name": "SN",
"size": 16,
"static": "S",
"type": "string"
},
{
Expand All @@ -69,6 +74,7 @@
{
"desc": "Force even alignment",
"name": "Pad",
"static": "S",
"type": "pad"
}
],
Expand Down
2 changes: 1 addition & 1 deletion json/model_16.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"value": 1
}
],
"type": "enum16"
"type": "bitfield16"
},
{
"access": "RW",
Expand Down
23 changes: 23 additions & 0 deletions json/model_702.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"name": "WMaxRtg",
"notes": "",
"sf": "W_SF",
"static": "S",
"type": "uint16",
"units": "W"
},
Expand All @@ -43,6 +44,7 @@
"name": "WOvrExtRtg",
"notes": "",
"sf": "W_SF",
"static": "S",
"type": "uint16",
"units": "W"
},
Expand All @@ -52,6 +54,7 @@
"name": "WOvrExtRtgPF",
"notes": "",
"sf": "PF_SF",
"static": "S",
"type": "uint16"
},
{
Expand All @@ -60,6 +63,7 @@
"name": "WUndExtRtg",
"notes": "",
"sf": "W_SF",
"static": "S",
"type": "uint16",
"units": "W"
},
Expand All @@ -69,6 +73,7 @@
"name": "WUndExtRtgPF",
"notes": "",
"sf": "PF_SF",
"static": "S",
"type": "uint16"
},
{
Expand All @@ -77,6 +82,7 @@
"name": "VAMaxRtg",
"notes": "",
"sf": "VA_SF",
"static": "S",
"type": "uint16",
"units": "VA"
},
Expand All @@ -86,6 +92,7 @@
"name": "VarMaxInjRtg",
"notes": "",
"sf": "Var_SF",
"static": "S",
"type": "uint16",
"units": "Var"
},
Expand All @@ -95,6 +102,7 @@
"name": "VarMaxAbsRtg",
"notes": "",
"sf": "Var_SF",
"static": "S",
"type": "uint16",
"units": "Var"
},
Expand All @@ -104,6 +112,7 @@
"name": "WChaRteMaxRtg",
"notes": "",
"sf": "W_SF",
"static": "S",
"type": "uint16",
"units": "W"
},
Expand All @@ -113,6 +122,7 @@
"name": "WDisChaRteMaxRtg",
"notes": "",
"sf": "W_SF",
"static": "S",
"type": "uint16",
"units": "W"
},
Expand All @@ -122,6 +132,7 @@
"name": "VAChaRteMaxRtg",
"notes": "",
"sf": "VA_SF",
"static": "S",
"type": "uint16",
"units": "VA"
},
Expand All @@ -131,6 +142,7 @@
"name": "VADisChaRteMaxRtg",
"notes": "",
"sf": "VA_SF",
"static": "S",
"type": "uint16",
"units": "VA"
},
Expand All @@ -140,6 +152,7 @@
"name": "VNomRtg",
"notes": "",
"sf": "V_SF",
"static": "S",
"type": "uint16",
"units": "V"
},
Expand All @@ -149,6 +162,7 @@
"name": "VMaxRtg",
"notes": "",
"sf": "V_SF",
"static": "S",
"type": "uint16",
"units": "V"
},
Expand All @@ -158,6 +172,7 @@
"name": "VMinRtg",
"notes": "",
"sf": "V_SF",
"static": "S",
"type": "uint16",
"units": "V"
},
Expand All @@ -167,6 +182,7 @@
"name": "AMaxRtg",
"notes": "",
"sf": "A_SF",
"static": "S",
"type": "uint16",
"units": "A"
},
Expand All @@ -176,6 +192,7 @@
"name": "PFOvrExtRtg",
"notes": "",
"sf": "PF_SF",
"static": "S",
"type": "uint16"
},
{
Expand All @@ -184,6 +201,7 @@
"name": "PFUndExtRtg",
"notes": "",
"sf": "PF_SF",
"static": "S",
"type": "uint16"
},
{
Expand All @@ -192,6 +210,7 @@
"name": "ReactSusceptRtg",
"notes": "",
"sf": "S_SF",
"static": "S",
"type": "uint16",
"units": "S"
},
Expand All @@ -200,6 +219,7 @@
"label": "Normal Operating Category",
"name": "NorOpCatRtg",
"notes": "",
"static": "S",
"symbols": [
{
"name": "CAT_A",
Expand All @@ -219,6 +239,7 @@
"label": "Abnormal Operating Category",
"name": "AbnOpCatRtg",
"notes": "",
"static": "S",
"symbols": [
{
"name": "CAT_1",
Expand All @@ -243,6 +264,7 @@
"label": "Supported Control Modes",
"name": "CtrlModes",
"notes": "",
"static": "S",
"symbols": [
{
"name": "MAX_W",
Expand Down Expand Up @@ -322,6 +344,7 @@
"label": "Intentional Island Categories",
"name": "IntIslandCatRtg",
"notes": "",
"static": "S",
"symbols": [
{
"name": "UNCATEGORIZED",
Expand Down
16 changes: 8 additions & 8 deletions json/model_704.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@
"access": "RW",
"desc": "Power factor reversion timer when injecting active power enable.",
"label": "Power Factor Reversion Enable (W Inj)",
"name": "PFWInjRvrtEna",
"name": "PFWInjEnaRvrt",
"notes": "",
"symbols": [
{
Expand Down Expand Up @@ -297,7 +297,7 @@
"access": "RW",
"desc": "Power factor reversion timer when absorbing active power enable.",
"label": "Power Factor Reversion Enable (W Abs)",
"name": "PFWAbsRvrtEna",
"name": "PFWAbsEnaRvrt",
"notes": "",
"symbols": [
{
Expand Down Expand Up @@ -367,7 +367,7 @@
"label": "Limit Max Power Pct Setpoint",
"name": "WMaxLimPct",
"notes": "",
"sf": "WMaxLim_SF",
"sf": "WMaxLimPct_SF",
"type": "uint16",
"units": "Pct"
},
Expand All @@ -377,15 +377,15 @@
"label": "Reversion Limit Max Power Pct",
"name": "WMaxLimPctRvrt",
"notes": "",
"sf": "WMaxLim_SF",
"sf": "WMaxLimPct_SF",
"type": "uint16",
"units": "Pct"
},
{
"access": "RW",
"desc": "Reversion limit maximum active power percent value enable.",
"label": "Reversion Limit Max Power Pct Enable",
"name": "WMaxLimPctRvrtEna",
"name": "WMaxLimPctEnaRvrt",
"notes": "",
"symbols": [
{
Expand Down Expand Up @@ -517,7 +517,7 @@
"access": "RW",
"desc": "Reversion active power function enable.",
"label": "Reversion Active Power Enable",
"name": "WSetRvrtEna",
"name": "WSetEnaRvrt",
"notes": "",
"symbols": [
{
Expand Down Expand Up @@ -708,7 +708,7 @@
"access": "RW",
"desc": "Reversion reactive power function enable.",
"label": "Reversion Reactive Power Enable",
"name": "VarSetRvrtEna",
"name": "VarSetEnaRvrt",
"notes": "",
"symbols": [
{
Expand Down Expand Up @@ -828,7 +828,7 @@
{
"desc": "Limit maximum power scale factor.",
"label": "Limit Max Power Scale Factor",
"name": "WMaxLim_SF",
"name": "WMaxLimPct_SF",
"notes": "",
"static": "S",
"type": "sunssf"
Expand Down
2 changes: 1 addition & 1 deletion json/model_802.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
},
{
"access": "RW",
"desc": "Setpoint for maximum reserve for storage as a percentage of the nominal maximum storage.",
"desc": "Setpoint for minimum reserve for storage as a percentage of the nominal maximum storage.",
"label": "Min Reserve Percent",
"name": "SoCRsvMin",
"sf": "SoC_SF",
Expand Down
2 changes: 1 addition & 1 deletion smdx/smdx_00016.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<symbol id="STATIC">0</symbol>
<symbol id="DHCP">1</symbol>
</point>
<point id="Ctl" offset="5" type="enum16" mandatory="true" access="rw" >
<point id="Ctl" offset="5" type="bitfield16" mandatory="true" access="rw" >
<symbol id="ENABLE_DNS">0</symbol>
<symbol id="ENABLE_NTP">1</symbol>
</point>
Expand Down

0 comments on commit c1c980c

Please sign in to comment.