Merge branch 'main' into solaredge-synergy-mppt

Author: WillCodeForCats

README.md

@@ -41,12 +41,12 @@ After rebooting Home Assistant, this integration can be configured through the i
 ### Documentation
 [WillCodeForCats/solaredge-modbus-multi/wiki](https://github.com/WillCodeForCats/solaredge-modbus-multi/wiki)
 
-### Recommended Update Procedure from v1.x.x
+### Recommended Update Procedure (from releases older than v2.2.0)
 1. Delete integration from Settings -> Devices & Services.
-2. Update to 2.x.x release.
+2. Update to v2.2.0 release.
 3. Add the integration under Settings -> Devices & Services.
 
-Fixing #21 causes HA to recreate entities. Updating in place will cause existing entities will be seen as duplicates and HA will suffix them with `_2`. If this happens you can either update everything to use the new names, or follow the update procedure to avoid renaming. This assumes the default entity names; custom names will have to be handled manually in any case.
+This procedure will preserve entity names. If updated in place, existing meter and battery entities will have a `_2` suffix after updating to a v2.2.x or higher release, or from a v1.x.x to a v2.x.x release. If this happens you can either update everything to use the new names, or follow the recommended update procedure to avoid renaming. This assumes the default entity names: custom names will have to be handled manually in any case.
 
 ### Upgrading from v1.1.x to v1.2.x
 Follow instructions at: [How To Upgrade from v1.1.x to v1.2.x](https://github.com/WillCodeForCats/solaredge-modbus-multi/wiki/How-To-Upgrade-from-v1.1.x-to-v1.2.x)

custom_components/solaredge_modbus_multi/manifest.json

@@ -8,5 +8,5 @@
   "codeowners": ["@WillCodeForCats"],
   "config_flow": true,
   "iot_class": "local_polling",
-  "version": "v2.2.0-pre.3"
+  "version": "v2.2.0"
 }

custom_components/solaredge_modbus_multi/strings.json

@@ -8,10 +8,7 @@
           "host": "Inverter IP Address",
           "port": "Modbus/TCP Port",
           "device_id": "Inverter Modbus Address (Device ID)",
-          "number_of_inverters": "Number of Inverters",
-          "read_meter_1": "Use Meter 1",
-          "read_meter_2": "Use Meter 2",
-          "read_meter_3": "Use Meter 3"
+          "number_of_inverters": "Number of Inverters"
         }
       }
     },

custom_components/solaredge_modbus_multi/translations/de.json

@@ -8,10 +8,7 @@
           "host": "Wechselrichter-IP-Adresse",
           "port": "Modbus/TCP-Port",
           "device_id": "Wechselrichter-Modbus-Adresse (Geräte-ID)",
-          "number_of_inverters": "Anzahl Wechselrichter",
-          "read_meter_1": "Verwenden Sie Meter 1",
-          "read_meter_2": "Verwenden Sie Meter 2",
-          "read_meter_3": "Verwenden Sie Meter 3"
+          "number_of_inverters": "Anzahl Wechselrichter"
         }
       }
     },

custom_components/solaredge_modbus_multi/translations/en.json

@@ -8,10 +8,7 @@
           "host": "Inverter IP Address",
           "port": "Modbus/TCP Port",
           "device_id": "Inverter Modbus Address (Device ID)",
-          "number_of_inverters": "Number of Inverters",
-          "read_meter_1": "Use Meter 1",
-          "read_meter_2": "Use Meter 2",
-          "read_meter_3": "Use Meter 3"
+          "number_of_inverters": "Number of Inverters"
         }
       }
     },

custom_components/solaredge_modbus_multi/translations/nb.json

@@ -7,11 +7,8 @@
           "name": "Sensorvoorvoegsel",
           "host": "IP-adres van omvormer",
           "port": "Modbus/TCP-poort",
-          "number_of_inverters": "Antall omformere koblet sammen",
           "device_id": "Inverter Modbus-adresse (enhets-ID)",
-          "read_meter_1": "Bruk måler 1",
-          "read_meter_2": "Bruk måler 2",
-          "read_meter_3": "Bruk måler 3"
+          "number_of_inverters": "Antall omformere koblet sammen"
         }
       }
     },

custom_components/solaredge_modbus_multi/translations/nl.json

@@ -7,11 +7,8 @@
           "name": "Sensor prefix",
           "host": "omvormer IP-adres",
           "port": "Modbus/TCP Port",
-          "number_of_inverters": "Aantal aangesloten omvormers",
           "device_id": "Omvormer Modbus-adres (apparaat-ID)",
-          "read_meter_1": "Gebruik meter 1",
-          "read_meter_2": "Gebruik meter 2",
-          "read_meter_3": "Gebruik meter 3"
+          "number_of_inverters": "Aantal aangesloten omvormers"
         }
       }
     },

custom_components/solaredge_modbus_multi/translations/pl.json

@@ -8,10 +8,7 @@
           "host": "Adres IP inwertera",
           "port": "Modbus/TCP Port",
           "device_id": "Adres Modbus Inwertera (Device ID)",
-          "number_of_inverters": "Ilość inwerterów",
-          "read_meter_1": "Użyj licznika 1",
-          "read_meter_2": "Użyj licznika 2",
-          "read_meter_3": "Użyj licznika 3"
+          "number_of_inverters": "Ilość inwerterów"
         }
       }
     },

info.md

@@ -9,12 +9,12 @@ Many improvements over other integrations that didn't work well with a multi-dev
 Simple single inverter setups are fully supported - multiple devices is a feature, not a requirement.
 
 {% if installed %}
-{% if version_installed.replace("v", "").replace(".","") | int < 200 %}
-### Recommended Update Procedure from v1.x.x
+{% if version_installed.replace("v", "").replace(".","") | int < 220 %}
+### Recommended Update Procedure to v2.2.0
 
 1. Delete integration from Settings -> Devices & Services.
-2. Update to 2.x.x release.
-3. Add the integration under Settings -> Devices & Services.
+2. Update to v2.2.0 release (manually or through HACS).
+3. Re-Add the integration under Settings -> Devices & Services.
 {% endif %}
 {% endif %}
 
@@ -31,4 +31,4 @@ Simple single inverter setups are fully supported - multiple devices is a featur
 * Supports status and error reporting sensors.
 * User friendly configuration through Config Flow.
 
-Requires Home Assistant 2022.2.0 and newer.
+Requires Home Assistant 2022.8.0 and newer.