Merge pull request #225 from sunspec/development

Development

Author: bobfox

json/model_704.json

@@ -573,11 +573,17 @@
                         "name": "VAR_AVAIL_PCT",
                         "value": 2
                     },
+                    {
+                        "desc": "Reactive power setting is percent of maximum apparent power.",
+                        "label": "Reactive Power As VA Max Pct",
+                        "name": "VA_MAX_PCT",
+                        "value": 3
+                    },
                     {
                         "desc": "Reactive power is in vars.",
                         "label": "Reactive Power As Vars",
                         "name": "VARS",
-                        "value": 3
+                        "value": 4
                     }
                 ],
                 "type": "enum16"
@@ -601,23 +607,11 @@
                         "name": "REACTIVE",
                         "value": 1
                     },
-                    {
-                        "desc": "IEEE 1547-2018 power priority mode.",
-                        "label": "IEEE 1547 Power Priority",
-                        "name": "IEEE_1547",
-                        "value": 2
-                    },
-                    {
-                        "desc": "Track PF setting derived from current active and reactive power settings.",
-                        "label": "PF Power Priority",
-                        "name": "PF",
-                        "value": 3
-                    },
                     {
                         "desc": "Power priority is vendor specific mode.",
                         "label": "Vendor Power Priority",
                         "name": "VENDOR",
-                        "value": 4
+                        "value": 2
                     }
                 ],
                 "type": "enum16"

json/model_705.json

@@ -104,23 +104,11 @@
                                 "name": "REACTIVE",
                                 "value": 1
                             },
-                            {
-                                "desc": "IEEE 1547-2018 power priority mode.",
-                                "label": "IEEE 1547 Power Priority",
-                                "name": "IEEE_1547",
-                                "value": 2
-                            },
-                            {
-                                "desc": "Track PF setting derived from current active and reactive power settings.",
-                                "label": "PF Power Priority",
-                                "name": "PF",
-                                "value": 3
-                            },
                             {
                                 "desc": "Power priority is vendor specific mode.",
                                 "label": "Vendor Power Priority",
                                 "name": "VENDOR",
-                                "value": 4
+                                "value": 2
                             }
                         ],
                         "type": "enum16"