diff --git a/json/model_1.json b/json/model_1.json index 46dd04b..eb1eb17 100644 --- a/json/model_1.json +++ b/json/model_1.json @@ -27,6 +27,7 @@ "mandatory": "M", "name": "Mn", "size": 16, + "static": "S", "type": "string" }, { @@ -35,6 +36,7 @@ "mandatory": "M", "name": "Md", "size": 16, + "static": "S", "type": "string" }, { @@ -42,6 +44,7 @@ "label": "Options", "name": "Opt", "size": 8, + "static": "S", "type": "string" }, { @@ -49,6 +52,7 @@ "label": "Version", "name": "Vr", "size": 8, + "static": "S", "type": "string" }, { @@ -57,6 +61,7 @@ "mandatory": "M", "name": "SN", "size": 16, + "static": "S", "type": "string" }, { @@ -69,6 +74,7 @@ { "desc": "Force even alignment", "name": "Pad", + "static": "S", "type": "pad" } ], diff --git a/json/model_16.json b/json/model_16.json index fac644e..4c4b7dc 100644 --- a/json/model_16.json +++ b/json/model_16.json @@ -62,7 +62,7 @@ "value": 1 } ], - "type": "enum16" + "type": "bitfield16" }, { "access": "RW", diff --git a/json/model_702.json b/json/model_702.json index 15d5a96..92bbf9e 100644 --- a/json/model_702.json +++ b/json/model_702.json @@ -34,6 +34,7 @@ "name": "WMaxRtg", "notes": "", "sf": "W_SF", + "static": "S", "type": "uint16", "units": "W" }, @@ -43,6 +44,7 @@ "name": "WOvrExtRtg", "notes": "", "sf": "W_SF", + "static": "S", "type": "uint16", "units": "W" }, @@ -52,6 +54,7 @@ "name": "WOvrExtRtgPF", "notes": "", "sf": "PF_SF", + "static": "S", "type": "uint16" }, { @@ -60,6 +63,7 @@ "name": "WUndExtRtg", "notes": "", "sf": "W_SF", + "static": "S", "type": "uint16", "units": "W" }, @@ -69,6 +73,7 @@ "name": "WUndExtRtgPF", "notes": "", "sf": "PF_SF", + "static": "S", "type": "uint16" }, { @@ -77,6 +82,7 @@ "name": "VAMaxRtg", "notes": "", "sf": "VA_SF", + "static": "S", "type": "uint16", "units": "VA" }, @@ -86,6 +92,7 @@ "name": "VarMaxInjRtg", "notes": "", "sf": "Var_SF", + "static": "S", "type": "uint16", "units": "Var" }, @@ -95,6 +102,7 @@ "name": "VarMaxAbsRtg", "notes": "", "sf": "Var_SF", + "static": "S", "type": "uint16", "units": "Var" }, @@ -104,6 +112,7 @@ "name": "WChaRteMaxRtg", "notes": "", "sf": "W_SF", + "static": "S", "type": "uint16", "units": "W" }, @@ -113,6 +122,7 @@ "name": "WDisChaRteMaxRtg", "notes": "", "sf": "W_SF", + "static": "S", "type": "uint16", "units": "W" }, @@ -122,6 +132,7 @@ "name": "VAChaRteMaxRtg", "notes": "", "sf": "VA_SF", + "static": "S", "type": "uint16", "units": "VA" }, @@ -131,6 +142,7 @@ "name": "VADisChaRteMaxRtg", "notes": "", "sf": "VA_SF", + "static": "S", "type": "uint16", "units": "VA" }, @@ -140,6 +152,7 @@ "name": "VNomRtg", "notes": "", "sf": "V_SF", + "static": "S", "type": "uint16", "units": "V" }, @@ -149,6 +162,7 @@ "name": "VMaxRtg", "notes": "", "sf": "V_SF", + "static": "S", "type": "uint16", "units": "V" }, @@ -158,6 +172,7 @@ "name": "VMinRtg", "notes": "", "sf": "V_SF", + "static": "S", "type": "uint16", "units": "V" }, @@ -167,6 +182,7 @@ "name": "AMaxRtg", "notes": "", "sf": "A_SF", + "static": "S", "type": "uint16", "units": "A" }, @@ -176,6 +192,7 @@ "name": "PFOvrExtRtg", "notes": "", "sf": "PF_SF", + "static": "S", "type": "uint16" }, { @@ -184,6 +201,7 @@ "name": "PFUndExtRtg", "notes": "", "sf": "PF_SF", + "static": "S", "type": "uint16" }, { @@ -192,6 +210,7 @@ "name": "ReactSusceptRtg", "notes": "", "sf": "S_SF", + "static": "S", "type": "uint16", "units": "S" }, @@ -200,6 +219,7 @@ "label": "Normal Operating Category", "name": "NorOpCatRtg", "notes": "", + "static": "S", "symbols": [ { "name": "CAT_A", @@ -219,6 +239,7 @@ "label": "Abnormal Operating Category", "name": "AbnOpCatRtg", "notes": "", + "static": "S", "symbols": [ { "name": "CAT_1", @@ -243,6 +264,7 @@ "label": "Supported Control Modes", "name": "CtrlModes", "notes": "", + "static": "S", "symbols": [ { "name": "MAX_W", @@ -322,6 +344,7 @@ "label": "Intentional Island Categories", "name": "IntIslandCatRtg", "notes": "", + "static": "S", "symbols": [ { "name": "UNCATEGORIZED", diff --git a/json/model_704.json b/json/model_704.json index 48e57e9..c05c09d 100644 --- a/json/model_704.json +++ b/json/model_704.json @@ -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": [ { @@ -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": [ { @@ -367,7 +367,7 @@ "label": "Limit Max Power Pct Setpoint", "name": "WMaxLimPct", "notes": "", - "sf": "WMaxLim_SF", + "sf": "WMaxLimPct_SF", "type": "uint16", "units": "Pct" }, @@ -377,7 +377,7 @@ "label": "Reversion Limit Max Power Pct", "name": "WMaxLimPctRvrt", "notes": "", - "sf": "WMaxLim_SF", + "sf": "WMaxLimPct_SF", "type": "uint16", "units": "Pct" }, @@ -385,7 +385,7 @@ "access": "RW", "desc": "Reversion limit maximum active power percent value enable.", "label": "Reversion Limit Max Power Pct Enable", - "name": "WMaxLimPctRvrtEna", + "name": "WMaxLimPctEnaRvrt", "notes": "", "symbols": [ { @@ -517,7 +517,7 @@ "access": "RW", "desc": "Reversion active power function enable.", "label": "Reversion Active Power Enable", - "name": "WSetRvrtEna", + "name": "WSetEnaRvrt", "notes": "", "symbols": [ { @@ -708,7 +708,7 @@ "access": "RW", "desc": "Reversion reactive power function enable.", "label": "Reversion Reactive Power Enable", - "name": "VarSetRvrtEna", + "name": "VarSetEnaRvrt", "notes": "", "symbols": [ { @@ -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" diff --git a/json/model_802.json b/json/model_802.json index 3a71722..dc0fd98 100644 --- a/json/model_802.json +++ b/json/model_802.json @@ -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", diff --git a/smdx/smdx_00016.xml b/smdx/smdx_00016.xml index 14e9ff5..edad0f5 100644 --- a/smdx/smdx_00016.xml +++ b/smdx/smdx_00016.xml @@ -7,7 +7,7 @@ 0 1 - + 0 1