Add shared hass.data keys/constants for cleaner integration state storage (local)

.github/workflows/publish-assets.yml

@@ -1,21 +0,0 @@
-name: Build & Attach ZIP asset
-on:
-  release:
-    types: [published]
-
-jobs:
-  build-zip:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Create ZIP
-        run: |
-          mkdir -p dist
-          cd custom_components/sws12500
-          zip -r ../../dist/weather-station.zip . -x "*/__pycache__/*"
-
-      - name: Upload ZIP to release
-        uses: softprops/action-gh-release@v2
-        with:
-          files: dist/weather-station.zip

CODEOWNERS

@@ -1 +0,0 @@
-* @schizza

README.md

@@ -1,44 +1,31 @@
-![GitHub Downloads](https://img.shields.io/github/downloads/schizza/SWS-12500-custom-component/total?label=downloads%20%28all%20releases%29)
-![Latest release downloads](https://img.shields.io/github/downloads/schizza/SWS-12500-custom-component/latest/total?label=downloads%20%28latest%29)
+# Integrates your Sencor SWS 12500 or 16600, GARNI, BRESSER weather stations seamlessly into Home Assistant
 
-# Integrates your Sencor SWS 12500, SWS16600, SWS 10500, GARNI, BRESSER weather stations seamlessly into Home Assistant
+This integration will listen for data from your station and passes them to respective sensors. It also provides the ability to push data to Windy API.
 
-This integration will listen for data from your station and passes them to respective sensors. It also provides the ability to push data to `Windy API` or `Pocasi Meteo`.
-
-### In the next major release, I there will be support for Ecowitt stations as well
-
----
-
-### In the next major release, I plan to rename the integration, as its current name no longer reflects its original purpose. The integration was initially developed primarily for the SWS12500 station, but it already supports other weather stations as well (e.g., Bresser, Garni, and others). Support for Ecowitt stations will also be added in the future, so the current name has become misleading. This information will be provided via an update, and I’m also planning to offer a full data migration from the existing integration to the new one, so will not lose any of historical data.
-
-- The transition date hasn’t been set yet, but it’s currently expected to happen within the next ~2–3 months. At the moment, I’m working on a full refactor and general code cleanup. Looking further ahead, the goal is to have the integration fully incorporated into Home Assistant as a native component—meaning it won’t need to be installed via HACS, but will become part of the official Home Assistant distribution.
-
-- I’m also looking for someone who owns an Ecowitt weather station and would be willing to help with testing the integration for these devices.
-
----
+_This custom component replaces [old integration via Node-RED and proxy server](https://github.com/schizza/WeatherStation-SWS12500)._
 
 ## Warning - WSLink APP (applies also for SWS 12500 with firmware >3.0)
 
-For stations that are using WSLink app to setup station and WSLink API for resending data (also SWS 12500 manufactured in 2024 and later). You will need to install [WSLink SSL proxy addon](https://github.com/schizza/wslink-addon) to your Home Assistant if you are not running your Home Assistant instance in SSL mode or you do not have SSL proxy for your Home Assistant.
+For stations that are using WSLink app to setup station and WSLink API for resending data (SWS 12500 manufactured in 2024 and later). You will need to install [WSLink SSL proxy addon](https://github.com/schizza/wslink-addon) to your Home Assistant if you are not running your Home Assistant instance in SSL mode or you do not have SSL proxy for your Home Assistant.
 
 ## Requirements
 
 - Weather station that supports sending data to custom server in their API [(list of supported stations.)](#list-of-supported-stations)
 - Configure station to send data directly to Home Assistant.
 - If you want to push data to Windy, you have to create an account at [Windy](https://stations.windy.com).
-- If you want to resend data to `Pocasi Meteo`, you have to create accout at [Pocasi Meteo](https://pocasimeteo.cz)
 
-## Example of supported stations
+## List of supported stations
 
 - [Sencor SWS 12500 Weather Station](https://www.sencor.cz/profesionalni-meteorologicka-stanice/sws-12500)
 - [Sencor SWS 16600 WiFi SH](https://www.sencor.cz/meteorologicka-stanice/sws-16600)
-- SWS 10500 (newer releases are also supported with [WSLink SSL proxy addon](https://github.com/schizza/wslink-addon))
 - Bresser stations that support custom server upload. [for example, this is known to work](https://www.bresser.com/p/bresser-wi-fi-clearview-weather-station-with-7-in-1-sensor-7002586)
 - Garni stations with WSLink support or custom server support.
 
 ## Installation
 
-### For stations that send data through WSLink API
+### If your SWS12500 station's firmware is 1.0 or your station is configured as described in this README and you still can not see any data incoming to Home Assistant please [read here](https://github.com/schizza/SWS-12500-custom-component/issues/17) and [here](firmware_bug.md)
+
+### For stations that send through WSLink API
 
 Make sure you have your Home Assistant cofigured in SSL mode or use [WSLink SSL proxy addon](https://github.com/schizza/wslink-addon) to bypass SSL configuration of whole Home Assistant.
 
@@ -96,13 +83,6 @@ If you change `API ID` or `API KEY` in the station, you have to reconfigure inte
 
 As soon as the integration is added into Home Assistant it will listen for incoming data from the station and starts to fill sensors as soon as data will first arrive.
 
-## Upgrading from PWS to WSLink
-
-If you upgrade your station, that was previously sending data in PWS protocol, to station with WSLink protocol, you have to remove the integration a reinstall it. WSLink protocol is using metric scale instead of imperial used in PWS protocol.
-So, deleteing integration and reinstalling will make sure, that sensors will be avare of change of the measurement scale. 
-
-- as sensors unique IDs are the same, you will not loose any of historical data
-
 ## Resending data to Windy API
 
 - First of all you need to create account at [Windy stations](https://stations.windy.com).
@@ -119,16 +99,6 @@ So, deleteing integration and reinstalling will make sure, that sensors will be
 
 - You are done.
 
-## Resending data to Pocasi Meteo
-- If you are willing to use [Pocasi Meteo Application](https://pocasimeteo.cz) you can enable resending your data to their servers
-- You must have account at Pocasi Meteo, where you will recieve `ID` and `KEY`, which are needed to connect to server
-- In `Settings` -> `Devices & services` find SWS12500 and click `Configure`.
-- In dialog box choose `Pocasi Meteo configuration`.
-- Fill in `ID` and `KEY` you were provided at `Pocasi Meteo`.
-- Tick `Enable` checkbox.
-
-- You are done.
-
 ## WSLink notes
 
 While your station is using WSLink you have to have Home Assistant in SSL mode or behind SSL proxy server.

custom_components/sws12500/__init__.py

@@ -2,7 +2,7 @@
 
 import logging
 
-import aiohttp.web
+import aiohttp
 from aiohttp.web_exceptions import HTTPUnauthorized
 
 from homeassistant.config_entries import ConfigEntry
@@ -17,13 +17,11 @@ from .const import (
     DEFAULT_URL,
     DEV_DBG,
     DOMAIN,
-    POCASI_CZ_ENABLED,
     SENSORS_TO_LOAD,
     WINDY_ENABLED,
     WSLINK,
     WSLINK_URL,
 )
-from .pocasti_cz import PocasiPush
 from .routes import Routes, unregistred
 from .utils import (
     anonymize,
@@ -52,18 +50,13 @@ class WeatherDataUpdateCoordinator(DataUpdateCoordinator):
         """Init global updater."""
         self.hass = hass
         self.config = config
-        self.config_entry = config
         self.windy = WindyPush(hass, config)
-        self.pocasi: PocasiPush = PocasiPush(hass, config)
         super().__init__(hass, _LOGGER, name=DOMAIN)
 
-    async def recieved_data(self, webdata: aiohttp.web.Request):
+    async def recieved_data(self, webdata):
         """Handle incoming data query."""
         _wslink = self.config_entry.options.get(WSLINK)
-        get_data = webdata.query
-        post_data = await webdata.post()
-
-        data = dict(get_data) | dict(post_data)
+        data = webdata.query
 
         response = None
 
@@ -90,10 +83,7 @@ class WeatherDataUpdateCoordinator(DataUpdateCoordinator):
             raise HTTPUnauthorized
 
         if self.config_entry.options.get(WINDY_ENABLED):
-            _ = await self.windy.push_data_to_windy(data, _wslink)
-
-        if self.config.options.get(POCASI_CZ_ENABLED):
-            await self.pocasi.push_data_to_server(data, "WSLINK" if _wslink else "WU")
+            response = await self.windy.push_data_to_windy(data)
 
         remaped_items = (
             remap_wslink_items(data)
@@ -144,11 +134,11 @@ def register_path(
 
     hass_data = hass.data.setdefault(DOMAIN, {})
     debug = config.options.get(DEV_DBG)
-    _wslink = config.options.get(WSLINK, False)
+    _wslink = config.options.get(WSLINK)
 
-    routes: Routes = hass_data.get("routes", Routes())
+    routes: Routes = hass_data.get("routes") if "routes" in hass_data else None
 
-    if not routes.routes:
+    if routes is None:
         routes = Routes()
         _LOGGER.info("Routes not found, creating new routes")
 
@@ -172,14 +162,6 @@ def register_path(
             if debug:
                 _LOGGER.debug("WSLink route: %s", wslink_route)
 
-            wslink_post_route = hass.http.app.router.add_post(
-                WSLINK_URL,
-                coordinator.recieved_data if _wslink else unregistred,
-                name="weather_wslink_post_route_url",
-            )
-            if debug:
-                _LOGGER.debug("WSLink route: %s", wslink_post_route)
-
             routes.add_route(
                 DEFAULT_URL,
                 default_route,
@@ -190,10 +172,6 @@ def register_path(
                 WSLINK_URL, wslink_route, coordinator.recieved_data, _wslink
             )
 
-            routes.add_route(
-                WSLINK_URL, wslink_post_route, coordinator.recieved_data, _wslink
-            )
-
             hass_data["routes"] = routes
 
         except RuntimeError as Ex:  # pylint: disable=(broad-except)

custom_components/sws12500/config_flow.py

@@ -1,12 +1,15 @@
 """Config flow for Sencor SWS 12500 Weather Station integration."""
 
+import logging
 from typing import Any
 
 import voluptuous as vol
 
-from homeassistant.config_entries import ConfigFlow, ConfigFlowResult, OptionsFlow
+from homeassistant.config_entries import ConfigFlow, OptionsFlow
+from homeassistant.const import UnitOfPrecipitationDepth, UnitOfVolumetricFlux
 from homeassistant.core import callback
 from homeassistant.exceptions import HomeAssistantError
+import homeassistant.helpers.entity_registry as er
 
 from .const import (
     API_ID,
@@ -14,19 +17,18 @@ from .const import (
     DEV_DBG,
     DOMAIN,
     INVALID_CREDENTIALS,
-    POCASI_CZ_API_ID,
-    POCASI_CZ_API_KEY,
-    POCASI_CZ_ENABLED,
-    POCASI_CZ_LOGGER_ENABLED,
-    POCASI_CZ_SEND_INTERVAL,
-    POCASI_CZ_SEND_MINIMUM,
+    MIG_FROM,
+    MIG_TO,
+    SENSOR_TO_MIGRATE,
     SENSORS_TO_LOAD,
+    WINDY_API_KEY,
     WINDY_ENABLED,
     WINDY_LOGGER_ENABLED,
-    WINDY_STATION_ID,
-    WINDY_STATION_PW,
     WSLINK,
 )
+from .utils import long_term_units_in_statistics_meta, migrate_data
+
+_LOGGER = logging.getLogger(__name__)
 
 
 class CannotConnect(HomeAssistantError):
@@ -40,10 +42,9 @@ class InvalidAuth(HomeAssistantError):
 class ConfigOptionsFlowHandler(OptionsFlow):
     """Handle WeatherStation ConfigFlow."""
 
-    def __init__(self, config_entry) -> None:
+    def __init__(self) -> None:
         """Initialize flow."""
         super().__init__()
-        self.config_entry = config_entry
 
         self.windy_data: dict[str, Any] = {}
         self.windy_data_schema = {}
@@ -51,18 +52,26 @@ class ConfigOptionsFlowHandler(OptionsFlow):
         self.user_data_schema = {}
         self.sensors: dict[str, Any] = {}
         self.migrate_schema = {}
-        self.pocasi_cz: dict[str, Any] = {}
-        self.pocasi_cz_schema = {}
+        self.migrate_sensor_select = {}
+        self.migrate_unit_selection = {}
+        self.count = 0
+        self.selected_sensor = ""
+
+        self.unit_values = [unit.value for unit in UnitOfVolumetricFlux]
+        self.unit_values.extend([unit.value for unit in UnitOfPrecipitationDepth])
+
+        @property
+        def config_entry(self):
+            return self.hass.config_entries.async_get_entry(self.handler)
 
     async def _get_entry_data(self):
         """Get entry data."""
-        entry_data = {**self.config_entry.data, **self.config_entry.options}
 
-        self.user_data = {
-            API_ID: entry_data.get(API_ID),
-            API_KEY: entry_data.get(API_KEY),
-            WSLINK: entry_data.get(WSLINK, False),
-            DEV_DBG: entry_data.get(DEV_DBG, False),
+        self.user_data: dict[str, Any] = {
+            API_ID: self.config_entry.options.get(API_ID),
+            API_KEY: self.config_entry.options.get(API_KEY),
+            WSLINK: self.config_entry.options.get(WSLINK, False),
+            DEV_DBG: self.config_entry.options.get(DEV_DBG, False),
         }
 
         self.user_data_schema = {
@@ -72,27 +81,23 @@ class ConfigOptionsFlowHandler(OptionsFlow):
             vol.Optional(DEV_DBG, default=self.user_data.get(DEV_DBG, False)): bool,
         }
 
-        self.sensors = {
-            SENSORS_TO_LOAD: (
-                entry_data.get(SENSORS_TO_LOAD)
-                if isinstance(entry_data.get(SENSORS_TO_LOAD), list)
-                else []
-            )
+        self.sensors: dict[str, Any] = {
+            SENSORS_TO_LOAD: self.config_entry.options.get(SENSORS_TO_LOAD)
+            if isinstance(self.config_entry.options.get(SENSORS_TO_LOAD), list)
+            else []
         }
 
-        self.windy_data = {
-            WINDY_STATION_ID: entry_data.get(WINDY_STATION_ID),
-            WINDY_STATION_PW: entry_data.get(WINDY_STATION_PW),
-            WINDY_ENABLED: entry_data.get(WINDY_ENABLED, False),
-            WINDY_LOGGER_ENABLED: entry_data.get(WINDY_LOGGER_ENABLED, False),
+        self.windy_data: dict[str, Any] = {
+            WINDY_API_KEY: self.config_entry.options.get(WINDY_API_KEY),
+            WINDY_ENABLED: self.config_entry.options.get(WINDY_ENABLED, False),
+            WINDY_LOGGER_ENABLED: self.config_entry.options.get(
+                WINDY_LOGGER_ENABLED, False
+            ),
         }
 
         self.windy_data_schema = {
             vol.Optional(
-                WINDY_STATION_ID, default=self.windy_data.get(WINDY_STATION_ID, "")
-            ): str,
-            vol.Optional(
-                WINDY_STATION_PW, default=self.windy_data.get(WINDY_STATION_PW, "")
+                WINDY_API_KEY, default=self.windy_data.get(WINDY_API_KEY, "")
             ): str,
             vol.Optional(WINDY_ENABLED, default=self.windy_data[WINDY_ENABLED]): bool
             or False,
@@ -102,38 +107,39 @@ class ConfigOptionsFlowHandler(OptionsFlow):
             ): bool or False,
         }
 
-        self.pocasi_cz = {
-            POCASI_CZ_API_ID: entry_data.get(POCASI_CZ_API_ID, ""),
-            POCASI_CZ_API_KEY: entry_data.get(POCASI_CZ_API_KEY, ""),
-            POCASI_CZ_ENABLED: entry_data.get(POCASI_CZ_ENABLED, False),
-            POCASI_CZ_LOGGER_ENABLED: entry_data.get(POCASI_CZ_LOGGER_ENABLED, False),
-            POCASI_CZ_SEND_INTERVAL: entry_data.get(POCASI_CZ_SEND_INTERVAL, 30),
+        self.migrate_sensor_select = {
+            vol.Required(SENSOR_TO_MIGRATE): vol.In(
+                await self.load_sensors_to_migrate() or {}
+            ),
         }
 
-        self.pocasi_cz_schema = {
-            vol.Required(
-                POCASI_CZ_API_ID, default=self.pocasi_cz.get(POCASI_CZ_API_ID)
-            ): str,
-            vol.Required(
-                POCASI_CZ_API_KEY, default=self.pocasi_cz.get(POCASI_CZ_API_KEY)
-            ): str,
-            vol.Required(
-                POCASI_CZ_SEND_INTERVAL,
-                default=self.pocasi_cz.get(POCASI_CZ_SEND_INTERVAL),
-            ): int,
-            vol.Optional(
-                POCASI_CZ_ENABLED, default=self.pocasi_cz.get(POCASI_CZ_ENABLED)
-            ): bool,
-            vol.Optional(
-                POCASI_CZ_LOGGER_ENABLED,
-                default=self.pocasi_cz.get(POCASI_CZ_LOGGER_ENABLED),
-            ): bool,
+        self.migrate_unit_selection = {
+            vol.Required(MIG_FROM): vol.In(self.unit_values),
+            vol.Required(MIG_TO): vol.In(self.unit_values),
+            vol.Optional("trigger_action", default=False): bool,
+        }
+        # "mm/d", "mm/h", "mm", "in/d", "in/h", "in"
+
+    async def load_sensors_to_migrate(self) -> dict[str, Any]:
+        """Load sensors to migrate."""
+
+        sensor_statistics = await long_term_units_in_statistics_meta(self.hass)
+
+        entity_registry = er.async_get(self.hass)
+        sensors = entity_registry.entities.get_entries_for_config_entry_id(
+            self.config_entry.entry_id
+        )
+
+        return {
+            sensor.entity_id: f"{sensor.name or sensor.original_name} (current settings: {sensor.unit_of_measurement}, longterm stats unit: {sensor_statistics.get(sensor.entity_id)})"
+            for sensor in sensors
+            if sensor.unique_id in {"rain", "daily_rain"}
         }
 
     async def async_step_init(self, user_input=None):
         """Manage the options - show menu first."""
         return self.async_show_menu(
-            step_id="init", menu_options=["basic", "windy", "pocasi"]
+            step_id="init", menu_options=["basic", "windy", "migration"]
         )
 
     async def async_step_basic(self, user_input=None):
@@ -162,9 +168,6 @@ class ConfigOptionsFlowHandler(OptionsFlow):
             # retain sensors
             user_input.update(self.sensors)
 
-            # retain pocasi data
-            user_input.update(self.pocasi_cz)
-
             return self.async_create_entry(title=DOMAIN, data=user_input)
 
         self.user_data = user_input
@@ -189,19 +192,13 @@ class ConfigOptionsFlowHandler(OptionsFlow):
                 errors=errors,
             )
 
-        station_id = (user_input.get(WINDY_STATION_ID) or "").strip()
-        station_pw = (user_input.get(WINDY_STATION_PW) or "").strip()
-        if user_input.get(WINDY_ENABLED):
-            if not station_id:
-                errors[WINDY_STATION_ID] = "windy_id_required"
-            if not station_pw:
-                errors[WINDY_STATION_PW] = "windy_pw_required"
-            if errors:
-                return self.async_show_form(
-                    step_id="windy",
-                    data_schema=vol.Schema(self.windy_data_schema),
-                    errors=errors,
-                )
+        if (user_input[WINDY_ENABLED] is True) and (user_input[WINDY_API_KEY] == ""):
+            errors[WINDY_API_KEY] = "windy_key_required"
+            return self.async_show_form(
+                step_id="windy",
+                data_schema=vol.Schema(self.windy_data_schema),
+                errors=errors,
+            )
 
         # retain user_data
         user_input.update(self.user_data)
@@ -209,54 +206,155 @@ class ConfigOptionsFlowHandler(OptionsFlow):
         # retain senors
         user_input.update(self.sensors)
 
-        # retain pocasi cz
-
-        user_input.update(self.pocasi_cz)
-
         return self.async_create_entry(title=DOMAIN, data=user_input)
 
-    async def async_step_pocasi(self, user_input: Any = None) -> ConfigFlowResult:
-        """Handle the pocasi step."""
+    async def async_step_migration(self, user_input=None):
+        """Migrate sensors."""
 
         errors = {}
 
+        data_schema = vol.Schema(self.migrate_sensor_select)
+        data_schema.schema.update()
+
         await self._get_entry_data()
 
         if user_input is None:
             return self.async_show_form(
-                step_id="pocasi",
-                data_schema=vol.Schema(self.pocasi_cz_schema),
+                step_id="migration",
+                data_schema=vol.Schema(self.migrate_sensor_select),
                 errors=errors,
+                description_placeholders={
+                    "migration_status": "-",
+                    "migration_count": "-",
+                },
             )
 
-        if user_input.get(POCASI_CZ_SEND_INTERVAL, 0) < POCASI_CZ_SEND_MINIMUM:
-            errors[POCASI_CZ_SEND_INTERVAL] = "pocasi_send_minimum"
+        self.selected_sensor = user_input.get(SENSOR_TO_MIGRATE)
 
-        if user_input.get(POCASI_CZ_ENABLED):
-            if user_input.get(POCASI_CZ_API_ID) == "":
-                errors[POCASI_CZ_API_ID] = "pocasi_id_required"
-            if user_input.get(POCASI_CZ_API_KEY) == "":
-                errors[POCASI_CZ_API_KEY] = "pocasi_key_required"
+        return await self.async_step_migration_units()
 
-        if len(errors) > 0:
+    async def async_step_migration_units(self, user_input=None):
+        """Migrate unit step."""
+
+        registry = er.async_get(self.hass)
+        sensor_entry = registry.async_get(self.selected_sensor)
+        sensor_stats = await long_term_units_in_statistics_meta(self.hass)
+
+        default_unit = sensor_entry.unit_of_measurement if sensor_entry else None
+
+        if default_unit not in self.unit_values:
+            default_unit = self.unit_values[0]
+
+        data_schema = vol.Schema({
+            vol.Required(MIG_FROM, default=default_unit): vol.In(self.unit_values),
+            vol.Required(MIG_TO): vol.In(self.unit_values),
+            vol.Optional("trigger_action", default=False): bool,
+        })
+
+        if user_input is None:
             return self.async_show_form(
-                step_id="pocasi",
-                data_schema=vol.Schema(self.pocasi_cz_schema),
-                errors=errors,
+                step_id="migration_units",
+                data_schema=data_schema,
+                errors={},
+                description_placeholders={
+                    "migration_sensor": sensor_entry.original_name,
+                    "migration_stats": sensor_stats.get(self.selected_sensor),
+                },
             )
-        # retain user data
+
+        if user_input.get("trigger_action"):
+            self.count = await migrate_data(
+                self.hass,
+                self.selected_sensor,
+                user_input.get(MIG_FROM),
+                user_input.get(MIG_TO),
+            )
+
+            registry.async_update_entity(self.selected_sensor,
+                unit_of_measurement=user_input.get(MIG_TO),
+            )
+
+            state = self.hass.states.get(self.selected_sensor)
+            if state:
+                _LOGGER.info("State attributes before update: %s", state.attributes)
+                attributes = dict(state.attributes)
+                attributes["unit_of_measurement"] = user_input.get(MIG_TO)
+                self.hass.states.async_set(self.selected_sensor, state.state, attributes)
+                _LOGGER.info("State attributes after update: %s", attributes)
+
+                options = {**self.config_entry.options, "reload_sensor": self.selected_sensor}
+                self.hass.config_entries.async_update_entry(self.config_entry, options=options)
+
+            await self.hass.config_entries.async_reload(self.config_entry.entry_id)
+
+            await self.hass.async_block_till_done()
+
+            _LOGGER.info("Migration complete for sensor %s: %s row updated, new measurement unit: %s, ",
+                         self.selected_sensor,
+                         self.count,
+                         user_input.get(MIG_TO),
+                        )
+
+            await self._get_entry_data()
+            sensor_entry = er.async_get(self.hass).async_get(self.selected_sensor)
+            sensor_stat = await self.load_sensors_to_migrate()
+
+            return self.async_show_form(
+                step_id="migration_complete",
+                data_schema=vol.Schema({}),
+                errors={},
+                description_placeholders={
+                    "migration_sensor": sensor_entry.unit_of_measurement,
+                    "migration_stats": sensor_stat.get(self.selected_sensor),
+                    "migration_count": self.count,
+                },
+            )
+
+        # retain windy data
+        user_input.update(self.windy_data)
+
+        # retain user_data
         user_input.update(self.user_data)
 
         # retain senors
         user_input.update(self.sensors)
 
-        # retain windy
+        return self.async_create_entry(title=DOMAIN, data=user_input)
+
+    async def async_step_migration_complete(self, user_input=None):
+        """Migration complete."""
+
+        errors = {}
+
+        await self._get_entry_data()
+        sensor_entry = er.async_get(self.hass).async_get(self.selected_sensor)
+        sensor_stat = await self.load_sensors_to_migrate()
+
+        if user_input is None:
+            return self.async_show_form(
+                step_id="migration_complete",
+                data_schema=vol.Schema({}),
+                errors=errors,
+                description_placeholders={
+                    "migration_sensor": sensor_entry.unit_of_measurement,
+                    "migration_stats": sensor_stat.get(self.selected_sensor),
+                    "migration_count": self.count,
+                },
+            )
+
+        # retain windy data
         user_input.update(self.windy_data)
 
+        # retain user_data
+        user_input.update(self.user_data)
+
+        # retain senors
+        user_input.update(self.sensors)
+
         return self.async_create_entry(title=DOMAIN, data=user_input)
 
 
-class ConfigFlowHandler(ConfigFlow, domain=DOMAIN):
+class ConfigFlow(ConfigFlow, domain=DOMAIN):
     """Handle a config flow for Sencor SWS 12500 Weather Station."""
 
     data_schema = {
@@ -302,4 +400,4 @@ class ConfigFlowHandler(ConfigFlow, domain=DOMAIN):
     @callback
     def async_get_options_flow(config_entry) -> ConfigOptionsFlowHandler:
         """Get the options flow for this handler."""
-        return ConfigOptionsFlowHandler(config_entry)
+        return ConfigOptionsFlowHandler()

custom_components/sws12500/const.py

@@ -6,12 +6,9 @@ from typing import Final
 DOMAIN = "sws12500"
 DEFAULT_URL = "/weatherstation/updateweatherstation.php"
 WSLINK_URL = "/data/upload.php"
-WINDY_URL = "https://stations.windy.com/api/v2/observation/update"
+WINDY_URL = "https://stations.windy.com/pws/update/"
 DATABASE_PATH = "/config/home-assistant_v2.db"
 
-POCASI_CZ_URL: Final = "http://ms.pocasimeteo.cz"
-POCASI_CZ_SEND_MINIMUM: Final = 12  # minimal time to resend data
-
 ICON = "mdi:weather"
 
 API_KEY = "API_KEY"
@@ -23,21 +20,7 @@ SENSOR_TO_MIGRATE: Final = "sensor_to_migrate"
 DEV_DBG: Final = "dev_debug_checkbox"
 WSLINK: Final = "wslink"
 
-POCASI_CZ_API_KEY = "POCASI_CZ_API_KEY"
-POCASI_CZ_API_ID = "POCASI_CZ_API_ID"
-POCASI_CZ_SEND_INTERVAL = "POCASI_SEND_INTERVAL"
-POCASI_CZ_ENABLED = "pocasi_enabled_chcekbox"
-POCASI_CZ_LOGGER_ENABLED = "pocasi_logger_checkbox"
-POCASI_INVALID_KEY: Final = (
-    "Pocasi Meteo refused to accept data. Invalid ID/Key combination?"
-)
-POCASI_CZ_SUCCESS: Final = "Successfully sent data to Pocasi Meteo"
-POCASI_CZ_UNEXPECTED: Final = (
-    "Pocasti Meteo responded unexpectedly 3 times in row. Resendig is now disabled!"
-)
-
-WINDY_STATION_ID = "WINDY_STATION_ID"
-WINDY_STATION_PW = "WINDY_STATION_PWD"
+WINDY_API_KEY = "WINDY_API_KEY"
 WINDY_ENABLED: Final = "windy_enabled_checkbox"
 WINDY_LOGGER_ENABLED: Final = "windy_logger_checkbox"
 WINDY_NOT_INSERTED: Final = "Data was succefuly sent to Windy, but not inserted by Windy API. Does anyone else sent data to Windy?"
@@ -72,15 +55,6 @@ PURGE_DATA: Final = [
     "indoortempf",
     "indoorhumidity",
     "dailyrainin",
-    "wspw",
-    "wsid",
-]
-
-PURGE_DATA_POCAS: Final = [
-    "ID",
-    "PASSWORD",
-    "action",
-    "rtfreq",
 ]
 
 
@@ -89,7 +63,6 @@ OUTSIDE_TEMP: Final = "outside_temp"
 DEW_POINT: Final = "dew_point"
 OUTSIDE_HUMIDITY: Final = "outside_humidity"
 OUTSIDE_CONNECTION: Final = "outside_connection"
-OUTSIDE_BATTERY: Final = "outside_battery"
 WIND_SPEED: Final = "wind_speed"
 WIND_GUST: Final = "wind_gust"
 WIND_DIR: Final = "wind_dir"
@@ -103,12 +76,10 @@ DAILY_RAIN: Final = "daily_rain"
 SOLAR_RADIATION: Final = "solar_radiation"
 INDOOR_TEMP: Final = "indoor_temp"
 INDOOR_HUMIDITY: Final = "indoor_humidity"
-INDOOR_BATTERY: Final = "indoor_battery"
 UV: Final = "uv"
 CH2_TEMP: Final = "ch2_temp"
 CH2_HUMIDITY: Final = "ch2_humidity"
 CH2_CONNECTION: Final = "ch2_connection"
-CH2_BATTERY: Final = "ch2_battery"
 CH3_TEMP: Final = "ch3_temp"
 CH3_HUMIDITY: Final = "ch3_humidity"
 CH3_CONNECTION: Final = "ch3_connection"
@@ -117,10 +88,9 @@ CH4_HUMIDITY: Final = "ch4_humidity"
 CH4_CONNECTION: Final = "ch4_connection"
 HEAT_INDEX: Final = "heat_index"
 CHILL_INDEX: Final = "chill_index"
-WBGT_TEMP: Final = "wbgt_temp"
 
 
-REMAP_ITEMS: dict[str, str] = {
+REMAP_ITEMS: dict = {
     "baromin": BARO_PRESSURE,
     "tempf": OUTSIDE_TEMP,
     "dewptf": DEW_POINT,
@@ -142,7 +112,7 @@ REMAP_ITEMS: dict[str, str] = {
     "soilmoisture3": CH4_HUMIDITY,
 }
 
-REMAP_WSLINK_ITEMS: dict[str, str] = {
+REMAP_WSLINK_ITEMS: dict = {
     "intem": INDOOR_TEMP,
     "inhum": INDOOR_HUMIDITY,
     "t1tem": OUTSIDE_TEMP,
@@ -167,12 +137,6 @@ REMAP_WSLINK_ITEMS: dict[str, str] = {
     "t1rainwy": WEEKLY_RAIN,
     "t1rainmth": MONTHLY_RAIN,
     "t1rainyr": YEARLY_RAIN,
-    "t234c2tem": CH3_TEMP,
-    "t234c2hum": CH3_HUMIDITY,
-    "t1bat": OUTSIDE_BATTERY,
-    "inbat": INDOOR_BATTERY,
-    "t234c1bat": CH2_BATTERY,
-    "t1wbgt": WBGT_TEMP,
 }
 
 # TODO: Add more sensors
@@ -185,19 +149,10 @@ REMAP_WSLINK_ITEMS: dict[str, str] = {
 DISABLED_BY_DEFAULT: Final = [
     CH2_TEMP,
     CH2_HUMIDITY,
-    CH2_BATTERY,
     CH3_TEMP,
     CH3_HUMIDITY,
     CH4_TEMP,
     CH4_HUMIDITY,
-    OUTSIDE_BATTERY,
-    WBGT_TEMP,
-]
-
-BATTERY_LIST = [
-    OUTSIDE_BATTERY,
-    INDOOR_BATTERY,
-    CH2_BATTERY,
 ]
 
 
@@ -240,18 +195,3 @@ AZIMUT: list[UnitOfDir] = [
     UnitOfDir.NNW,
     UnitOfDir.N,
 ]
-
-
-class UnitOfBat(StrEnum):
-    """Battery level unit of measure."""
-
-    LOW = "low"
-    NORMAL = "normal"
-    UNKNOWN = "unknown"
-
-
-BATTERY_LEVEL: list[UnitOfBat] = [
-    UnitOfBat.LOW,
-    UnitOfBat.NORMAL,
-    UnitOfBat.UNKNOWN,
-]

custom_components/sws12500/manifest.json

@@ -1,19 +1,15 @@
 {
   "domain": "sws12500",
   "name": "Sencor SWS 12500 Weather Station",
-  "codeowners": [
-    "@schizza"
-  ],
+  "codeowners": ["@schizza"],
   "config_flow": true,
-  "dependencies": [
-    "http"
-  ],
+  "dependencies": ["http"],
   "documentation": "https://github.com/schizza/SWS-12500-custom-component",
   "homekit": {},
   "iot_class": "local_push",
   "issue_tracker": "https://github.com/schizza/SWS-12500-custom-component/issues",
   "requirements": [],
   "ssdp": [],
-  "version": "1.8.3",
+  "version": "1.6.2",
   "zeroconf": []
 }

custom_components/sws12500/pocasti_cz.py

@@ -1,143 +0,0 @@
-"""Pocasi CZ resend functions."""
-
-from datetime import datetime, timedelta
-import logging
-from typing import Any, Literal
-
-from aiohttp import ClientError
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
-
-from .const import (
-    DEFAULT_URL,
-    POCASI_CZ_API_ID,
-    POCASI_CZ_API_KEY,
-    POCASI_CZ_ENABLED,
-    POCASI_CZ_LOGGER_ENABLED,
-    POCASI_CZ_SEND_INTERVAL,
-    POCASI_CZ_SUCCESS,
-    POCASI_CZ_UNEXPECTED,
-    POCASI_CZ_URL,
-    POCASI_INVALID_KEY,
-    WSLINK_URL,
-)
-from .utils import update_options
-
-_LOGGER = logging.getLogger(__name__)
-
-
-class PocasiNotInserted(Exception):
-    """NotInserted state."""
-
-
-class PocasiSuccess(Exception):
-    """WindySucces state."""
-
-
-class PocasiApiKeyError(Exception):
-    """Windy API Key error."""
-
-
-class PocasiPush:
-    """Push data to Windy."""
-
-    def __init__(self, hass: HomeAssistant, config: ConfigEntry) -> None:
-        """Init."""
-        self.hass = hass
-        self.config = config
-        self._interval = int(self.config.options.get(POCASI_CZ_SEND_INTERVAL, 30))
-
-        self.last_update = datetime.now()
-        self.next_update = datetime.now() + timedelta(seconds=self._interval)
-
-        self.log = self.config.options.get(POCASI_CZ_LOGGER_ENABLED)
-        self.invalid_response_count = 0
-
-    def verify_response(
-        self,
-        response: str,
-    ) -> PocasiNotInserted | PocasiSuccess | PocasiApiKeyError | None:
-        """Verify answer form server."""
-
-        if self.log:
-            _LOGGER.debug("Pocasi CZ responded: %s", response)
-
-        # Server does not provide any responses.
-        # This is placeholder if future state is changed
-
-        return None
-
-    async def push_data_to_server(
-        self, data: dict[str, Any], mode: Literal["WU", "WSLINK"]
-    ):
-        """Pushes weather data to server."""
-
-        _data = data.copy()
-        _api_id = self.config.options.get(POCASI_CZ_API_ID)
-        _api_key = self.config.options.get(POCASI_CZ_API_KEY)
-
-        if self.log:
-            _LOGGER.info(
-                "Pocasi CZ last update = %s, next update at: %s",
-                str(self.last_update),
-                str(self.next_update),
-            )
-
-        if self.next_update > datetime.now():
-            _LOGGER.debug(
-                "Triggered update interval limit of %s seconds. Next possilbe update is set to: %s",
-                self._interval,
-                self.next_update,
-            )
-            return False
-
-        request_url: str = ""
-        if mode == "WSLINK":
-            _data["wsid"] = _api_id
-            _data["wspw"] = _api_key
-            request_url = f"{POCASI_CZ_URL}{WSLINK_URL}"
-
-        if mode == "WU":
-            _data["ID"] = _api_id
-            _data["PASSWORD"] = _api_key
-            request_url = f"{POCASI_CZ_URL}{DEFAULT_URL}"
-
-        session = async_get_clientsession(self.hass, verify_ssl=False)
-        _LOGGER.debug(
-            "Payload for Pocasi Meteo server: [mode=%s] [request_url=%s] = %s",
-            mode,
-            request_url,
-            _data,
-        )
-        try:
-            async with session.get(request_url, params=_data) as resp:
-                status = await resp.text()
-                try:
-                    self.verify_response(status)
-
-                except PocasiApiKeyError:
-                    # log despite of settings
-                    _LOGGER.critical(POCASI_INVALID_KEY)
-                    await update_options(
-                        self.hass, self.config, POCASI_CZ_ENABLED, False
-                    )
-                except PocasiSuccess:
-                    if self.log:
-                        _LOGGER.info(POCASI_CZ_SUCCESS)
-
-        except ClientError as ex:
-            _LOGGER.critical("Invalid response from Pocasi Meteo: %s", str(ex))
-            self.invalid_response_count += 1
-            if self.invalid_response_count > 3:
-                _LOGGER.critical(POCASI_CZ_UNEXPECTED)
-                await update_options(self.hass, self.config, POCASI_CZ_ENABLED, False)
-
-        self.last_update = datetime.now()
-        self.next_update = datetime.now() + timedelta(seconds=self._interval)
-
-        if self.log:
-            _LOGGER.info("Next update: %s", str(self.next_update))
-
-        return None

custom_components/sws12500/routes.py

@@ -1,6 +1,5 @@
 """Store routes info."""
 
-from collections.abc import Callable
 from dataclasses import dataclass
 from logging import getLogger
 
@@ -15,7 +14,7 @@ class Route:
 
     url_path: str
     route: AbstractRoute
-    handler: Callable
+    handler: callable
     enabled: bool = False
 
     def __str__(self):
@@ -30,11 +29,11 @@ class Routes:
         """Initialize routes."""
         self.routes = {}
 
-    def switch_route(self, coordinator: Callable, url_path: str):
+    def switch_route(self, coordinator: callable, url_path: str):
         """Switch route."""
 
-        for route in self.routes.values():
-            if route.url_path == url_path:
+        for url, route in self.routes.items():
+            if url == url_path:
                 _LOGGER.info("New coordinator to route: %s", route.url_path)
                 route.enabled = True
                 route.handler = coordinator
@@ -48,24 +47,22 @@ class Routes:
         self,
         url_path: str,
         route: AbstractRoute,
-        handler: Callable,
+        handler: callable,
         enabled: bool = False,
     ):
         """Add route."""
-        key = f"{route.method}:{url_path}"
-        self.routes[key] = Route(url_path, route, handler, enabled)
+        self.routes[url_path] = Route(url_path, route, handler, enabled)
 
-    def get_route(self, url_path: str) -> Route | None:
+    def get_route(self, url_path: str) -> Route:
         """Get route."""
-        for route in self.routes.values():
-            if route.url_path == url_path:
-                return route
-        return None
+        return self.routes.get(url_path)
 
     def get_enabled(self) -> str:
         """Get enabled routes."""
-        enabled_routes = {route.url_path for route in self.routes.values() if route.enabled}
-        return ", ".join(sorted(enabled_routes)) if enabled_routes else "None"
+        enabled_routes = [
+            route.url_path for route in self.routes.values() if route.enabled
+        ]
+        return "".join(enabled_routes) if enabled_routes else "None"
 
     def __str__(self):
         """Return string representation."""

custom_components/sws12500/sensor.py

@@ -2,7 +2,7 @@
 
 import logging
 
-from homeassistant.components.sensor import SensorEntity
+from homeassistant.components.sensor import RestoreSensor, SensorEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceEntryType
@@ -12,7 +12,6 @@ from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from . import WeatherDataUpdateCoordinator
 from .const import (
-    BATTERY_LIST,
     CHILL_INDEX,
     DOMAIN,
     HEAT_INDEX,
@@ -23,12 +22,11 @@ from .const import (
     WIND_DIR,
     WIND_SPEED,
     WSLINK,
-    UnitOfBat,
 )
 from .sensors_common import WeatherSensorEntityDescription
 from .sensors_weather import SENSOR_TYPES_WEATHER_API
 from .sensors_wslink import SENSOR_TYPES_WSLINK
-from .utils import battery_level_to_icon, battery_level_to_text, chill_index, heat_index
+from .utils import chill_index, heat_index
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -44,12 +42,12 @@ async def async_setup_entry(
 
     sensors_to_load: list = []
     sensors: list = []
-    _wslink = config_entry.options.get(WSLINK)
+    _wslink = config_entry.data.get(WSLINK)
 
     SENSOR_TYPES = SENSOR_TYPES_WSLINK if _wslink else SENSOR_TYPES_WEATHER_API
 
     # Check if we have some sensors to load.
-    if sensors_to_load := config_entry.options.get(SENSORS_TO_LOAD, []):
+    if sensors_to_load := config_entry.options.get(SENSORS_TO_LOAD):
         if WIND_DIR in sensors_to_load:
             sensors_to_load.append(WIND_AZIMUT)
         if (OUTSIDE_HUMIDITY in sensors_to_load) and (OUTSIDE_TEMP in sensors_to_load):
@@ -65,9 +63,9 @@ async def async_setup_entry(
         async_add_entities(sensors)
 
 
-class WeatherSensor(  # pyright: ignore[reportIncompatibleVariableOverride]
-    CoordinatorEntity[WeatherDataUpdateCoordinator], SensorEntity
-):  # pyright: ignore[reportIncompatibleVariableOverride]
+class WeatherSensor(
+    CoordinatorEntity[WeatherDataUpdateCoordinator], RestoreSensor, SensorEntity
+):
     """Implementation of Weather Sensor entity."""
 
     _attr_has_entity_name = True
@@ -94,6 +92,12 @@ class WeatherSensor(  # pyright: ignore[reportIncompatibleVariableOverride]
 
         self.coordinator.async_add_listener(self._handle_coordinator_update)
 
+        # prev_state_data = await self.async_get_last_sensor_data()
+        # prev_state = await self.async_get_last_state()
+        # if not prev_state:
+        #     return
+        # self._data = prev_state_data.native_value
+
     @callback
     def _handle_coordinator_update(self) -> None:
         """Handle updated data from the coordinator."""
@@ -104,31 +108,29 @@ class WeatherSensor(  # pyright: ignore[reportIncompatibleVariableOverride]
         self.async_write_ha_state()
 
     @property
-    def native_value(self):  # pyright: ignore[reportIncompatibleVariableOverride]
+    def native_value(self) -> str | int | float | None:
         """Return value of entity."""
 
         _wslink = self.coordinator.config.options.get(WSLINK)
 
         if self.coordinator.data and (WIND_AZIMUT in self.entity_description.key):
-            return self.entity_description.value_fn(self.coordinator.data.get(WIND_DIR))  # pyright: ignore[ reportAttributeAccessIssue]
+            return self.entity_description.value_fn(self.coordinator.data.get(WIND_DIR))
 
         if (
             self.coordinator.data
             and (HEAT_INDEX in self.entity_description.key)
             and not _wslink
         ):
-            return self.entity_description.value_fn(heat_index(self.coordinator.data))  # pyright: ignore[ reportAttributeAccessIssue]
+            return self.entity_description.value_fn(heat_index(self.coordinator.data))
 
         if (
             self.coordinator.data
             and (CHILL_INDEX in self.entity_description.key)
             and not _wslink
         ):
-            return self.entity_description.value_fn(chill_index(self.coordinator.data))  # pyright: ignore[ reportAttributeAccessIssue]
+            return self.entity_description.value_fn(chill_index(self.coordinator.data))
 
-        return (
-            None if self._data == "" else self.entity_description.value_fn(self._data)  # pyright: ignore[ reportAttributeAccessIssue]
-        )
+        return None if self._data == "" else self.entity_description.value_fn(self._data)
 
     @property
     def suggested_entity_id(self) -> str:
@@ -136,20 +138,7 @@ class WeatherSensor(  # pyright: ignore[reportIncompatibleVariableOverride]
         return generate_entity_id("sensor.{}", self.entity_description.key)
 
     @property
-    def icon(self) -> str | None:  # pyright: ignore[reportIncompatibleVariableOverride]
-        """Return the dynamic icon for battery representation."""
-
-        if self.entity_description.key in BATTERY_LIST:
-            if self.native_value:
-                battery_level = battery_level_to_text(self.native_value)
-                return battery_level_to_icon(battery_level)
-
-            return battery_level_to_icon(UnitOfBat.UNKNOWN)
-
-        return self.entity_description.icon
-
-    @property
-    def device_info(self) -> DeviceInfo:  # pyright: ignore[reportIncompatibleVariableOverride]
+    def device_info(self) -> DeviceInfo:
         """Device info."""
         return DeviceInfo(
             connections=set(),

custom_components/sws12500/sensors_weather.py

@@ -122,8 +122,7 @@ SENSOR_TYPES_WEATHER_API: tuple[WeatherSensorEntityDescription, ...] = (
     WeatherSensorEntityDescription(
         key=WIND_DIR,
         native_unit_of_measurement=DEGREE,
-        state_class=SensorStateClass.MEASUREMENT_ANGLE,
-        device_class=SensorDeviceClass.WIND_DIRECTION,
+        state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=None,
         icon="mdi:sign-direction",
         translation_key=WIND_DIR,

custom_components/sws12500/sensors_wslink.py

@@ -17,34 +17,32 @@ from homeassistant.const import (
 
 from .const import (
     BARO_PRESSURE,
-    CH2_BATTERY,
     CH2_HUMIDITY,
     CH2_TEMP,
     CH3_HUMIDITY,
     CH3_TEMP,
+    CH4_HUMIDITY,
+    CH4_TEMP,
     CHILL_INDEX,
     DAILY_RAIN,
     DEW_POINT,
     HEAT_INDEX,
-    HOURLY_RAIN,
-    INDOOR_BATTERY,
     INDOOR_HUMIDITY,
     INDOOR_TEMP,
-    MONTHLY_RAIN,
-    OUTSIDE_BATTERY,
     OUTSIDE_HUMIDITY,
     OUTSIDE_TEMP,
     RAIN,
     SOLAR_RADIATION,
     UV,
-    WBGT_TEMP,
-    WEEKLY_RAIN,
     WIND_AZIMUT,
     WIND_DIR,
     WIND_GUST,
     WIND_SPEED,
-    YEARLY_RAIN,
     UnitOfDir,
+    MONTHLY_RAIN,
+    YEARLY_RAIN,
+    HOURLY_RAIN,
+    WEEKLY_RAIN,
 )
 from .sensors_common import WeatherSensorEntityDescription
 from .utils import wind_dir_to_text
@@ -128,8 +126,7 @@ SENSOR_TYPES_WSLINK: tuple[WeatherSensorEntityDescription, ...] = (
     WeatherSensorEntityDescription(
         key=WIND_DIR,
         native_unit_of_measurement=DEGREE,
-        state_class=SensorStateClass.MEASUREMENT_ANGLE,
-        device_class=SensorDeviceClass.WIND_DIRECTION,
+        state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=None,
         icon="mdi:sign-direction",
         translation_key=WIND_DIR,
@@ -146,8 +143,8 @@ SENSOR_TYPES_WSLINK: tuple[WeatherSensorEntityDescription, ...] = (
     WeatherSensorEntityDescription(
         key=RAIN,
         native_unit_of_measurement=UnitOfVolumetricFlux.MILLIMETERS_PER_HOUR,
-        device_class=SensorDeviceClass.PRECIPITATION_INTENSITY,
-        state_class=SensorStateClass.MEASUREMENT,
+        device_class=SensorDeviceClass.PRECIPITATION,
+        state_class=SensorStateClass.TOTAL,
         suggested_unit_of_measurement=UnitOfVolumetricFlux.MILLIMETERS_PER_HOUR,
         suggested_display_precision=2,
         icon="mdi:weather-pouring",
@@ -246,25 +243,25 @@ SENSOR_TYPES_WSLINK: tuple[WeatherSensorEntityDescription, ...] = (
         translation_key=CH2_HUMIDITY,
         value_fn=lambda data: cast("int", data),
     ),
-    WeatherSensorEntityDescription(
-        key=CH3_TEMP,
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        state_class=SensorStateClass.MEASUREMENT,
-        device_class=SensorDeviceClass.TEMPERATURE,
-        suggested_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        icon="mdi:weather-sunny",
-        translation_key=CH3_TEMP,
-        value_fn=lambda data: cast("float", data),
-    ),
-    WeatherSensorEntityDescription(
-        key=CH3_HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
-        state_class=SensorStateClass.MEASUREMENT,
-        device_class=SensorDeviceClass.HUMIDITY,
-        icon="mdi:weather-sunny",
-        translation_key=CH3_HUMIDITY,
-        value_fn=lambda data: cast("int", data),
-    ),
+    # WeatherSensorEntityDescription(
+    #     key=CH3_TEMP,
+    #     native_unit_of_measurement=UnitOfTemperature.FAHRENHEIT,
+    #     state_class=SensorStateClass.MEASUREMENT,
+    #     device_class=SensorDeviceClass.TEMPERATURE,
+    #     suggested_unit_of_measurement=UnitOfTemperature.CELSIUS,
+    #     icon="mdi:weather-sunny",
+    #     translation_key=CH3_TEMP,
+    #     value_fn=lambda data: cast(float, data),
+    # ),
+    # WeatherSensorEntityDescription(
+    #     key=CH3_HUMIDITY,
+    #     native_unit_of_measurement=PERCENTAGE,
+    #     state_class=SensorStateClass.MEASUREMENT,
+    #     device_class=SensorDeviceClass.HUMIDITY,
+    #     icon="mdi:weather-sunny",
+    #     translation_key=CH3_HUMIDITY,
+    #     value_fn=lambda data: cast(int, data),
+    # ),
     # WeatherSensorEntityDescription(
     #     key=CH4_TEMP,
     #     native_unit_of_measurement=UnitOfTemperature.FAHRENHEIT,
@@ -306,35 +303,4 @@ SENSOR_TYPES_WSLINK: tuple[WeatherSensorEntityDescription, ...] = (
         translation_key=CHILL_INDEX,
         value_fn=lambda data: cast("int", data),
     ),
-    WeatherSensorEntityDescription(
-        key=OUTSIDE_BATTERY,
-        translation_key=OUTSIDE_BATTERY,
-        icon="mdi:battery-unknown",
-        device_class=SensorDeviceClass.ENUM,
-        value_fn=lambda data: (data),
-    ),
-    WeatherSensorEntityDescription(
-        key=CH2_BATTERY,
-        translation_key=CH2_BATTERY,
-        icon="mdi:battery-unknown",
-        device_class=SensorDeviceClass.ENUM,
-        value_fn=lambda data: (data),
-    ),
-    WeatherSensorEntityDescription(
-        key=INDOOR_BATTERY,
-        translation_key=INDOOR_BATTERY,
-        icon="mdi:battery-unknown",
-        device_class=SensorDeviceClass.ENUM,
-        value_fn=lambda data: (data),
-    ),
-    WeatherSensorEntityDescription(
-        key=WBGT_TEMP,
-        translation_key=WBGT_TEMP,
-        icon="mdi:thermometer",
-        state_class=SensorStateClass.MEASUREMENT,
-        device_class=SensorDeviceClass.TEMPERATURE,
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        suggested_display_precision=2,
-        value_fn=lambda data: cast("int", data),
-    ),
 )

custom_components/sws12500/strings.json

@@ -5,6 +5,7 @@
       "valid_credentials_key": "Provide valid API KEY.",
       "valid_credentials_match": "API ID and API KEY should not be the same."
     },
+
     "step": {
       "user": {
         "description": "Provide API ID and API KEY so the Weather Station can access HomeAssistant",
@@ -24,6 +25,7 @@
       }
     }
   },
+
   "options": {
     "error": {
       "valid_credentials_api": "Provide valid API ID.",
@@ -31,6 +33,7 @@
       "valid_credentials_match": "API ID and API KEY should not be the same.",
       "windy_key_required": "Windy API key is required if you want to enable this function."
     },
+
     "step": {
       "init": {
         "title": "Configure SWS12500 Integration",
@@ -40,6 +43,7 @@
           "windy": "Windy configuration"
         }
       },
+
       "basic": {
         "description": "Provide API ID and API KEY so the Weather Station can access HomeAssistant",
         "title": "Configure credentials",
@@ -56,6 +60,7 @@
           "WSLINK": "Enable WSLink API if the station is set to send data via WSLink."
         }
       },
+
       "windy": {
         "description": "Resend weather data to your Windy stations.",
         "title": "Configure Windy",
@@ -69,24 +74,6 @@
           "windy_logger_checkbox": "Enable only if you want to send debuging data to the developer."
         }
       },
-      "pocasi": {
-        "description": "Resend data to Pocasi Meteo CZ",
-        "title": "Configure Pocasi Meteo CZ",
-        "data": {
-          "POCASI_CZ_API_ID": "ID from your Pocasi Meteo APP",
-          "POCASI_CZ_API_KEY": "Key from your Pocasi Meteo APP",
-          "POCASI_CZ_SEND_INTERVAL": "Resend interval in seconds",
-          "pocasi_enabled_checkbox": "Enable resending data to Pocasi Meteo",
-          "pocasi_logger_checkbox": "Log data and responses"
-        },
-        "data_description": {
-          "POCASI_CZ_API_ID": "You can obtain your ID in Pocasi Meteo App",
-          "POCASI_CZ_API_KEY": "You can obtain your KEY in Pocasi Meteo App",
-          "POCASI_CZ_SEND_INTERVAL": "Resend interval in seconds (minimum 12s, default 30s)",
-          "pocasi_enabled_checkbox": "Enables resending data to Pocasi Meteo",
-          "pocasi_logger_checkbox": "Enable only if you want to send debbug data to the developer"
-        }
-      },
       "migration": {
         "title": "Statistic migration.",
         "description": "For the correct functioning of long-term statistics, it is necessary to migrate the sensor unit in the long-term statistics. The original unit of long-term statistics for daily precipitation was in mm/d, however, the station only sends data in mm without time differentiation.\n\n The sensor to be migrated is for daily precipitation. If the correct value is already in the list for the daily precipitation sensor (mm), then the migration is already complete.\n\n Migration result for the sensor: {migration_status}, a total of {migration_count} rows converted.",
@@ -101,71 +88,30 @@
       }
     }
   },
+
   "entity": {
     "sensor": {
-      "indoor_temp": {
-        "name": "Indoor temperature"
-      },
-      "indoor_humidity": {
-        "name": "Indoor humidity"
-      },
-      "outside_temp": {
-        "name": "Outside Temperature"
-      },
-      "outside_humidity": {
-        "name": "Outside humidity"
-      },
-      "uv": {
-        "name": "UV index"
-      },
-      "baro_pressure": {
-        "name": "Barometric pressure"
-      },
-      "dew_point": {
-        "name": "Dew point"
-      },
-      "wind_speed": {
-        "name": "Wind speed"
-      },
-      "wind_dir": {
-        "name": "Wind direction"
-      },
-      "wind_gust": {
-        "name": "Wind gust"
-      },
-      "rain": {
-        "name": "Rain"
-      },
-      "daily_rain": {
-        "name": "Daily precipitation"
-      },
-      "solar_radiation": {
-        "name": "Solar irradiance"
-      },
-      "ch2_temp": {
-        "name": "Channel 2 temperature"
-      },
-      "ch2_humidity": {
-        "name": "Channel 2 humidity"
-      },
-      "ch3_temp": {
-        "name": "Channel 3 temperature"
-      },
-      "ch3_humidity": {
-        "name": "Channel 3 humidity"
-      },
-      "ch4_temp": {
-        "name": "Channel 4 temperature"
-      },
-      "ch4_humidity": {
-        "name": "Channel 4 humidity"
-      },
-      "heat_index": {
-        "name": "Apparent temperature"
-      },
-      "chill_index": {
-        "name": "Wind chill"
-      },
+      "indoor_temp": { "name": "Indoor temperature" },
+      "indoor_humidity": { "name": "Indoor humidity" },
+      "outside_temp": { "name": "Outside Temperature" },
+      "outside_humidity": { "name": "Outside humidity" },
+      "uv": { "name": "UV index" },
+      "baro_pressure": { "name": "Barometric pressure" },
+      "dew_point": { "name": "Dew point" },
+      "wind_speed": { "name": "Wind speed" },
+      "wind_dir": { "name": "Wind direction" },
+      "wind_gust": { "name": "Wind gust" },
+      "rain": { "name": "Rain" },
+      "daily_rain": { "name": "Daily precipitation" },
+      "solar_radiation": { "name": "Solar irradiance" },
+      "ch2_temp": { "name": "Channel 2 temperature" },
+      "ch2_humidity": { "name": "Channel 2 humidity" },
+      "ch3_temp": { "name": "Channel 3 temperature" },
+      "ch3_humidity": { "name": "Channel 3 humidity" },
+      "ch4_temp": { "name": "Channel 4 temperature" },
+      "ch4_humidity": { "name": "Channel 4 humidity" },
+      "heat_index": { "name": "Apparent temperature" },
+      "chill_index": { "name": "Wind chill" },
       "wind_azimut": {
         "name": "Bearing",
         "state": {
@@ -185,14 +131,6 @@
           "wnw": "WNW",
           "nw": "NW",
           "nnw": "NNW"
-        },
-        "outside_battery": {
-          "name": "Outside battery level",
-          "state": {
-            "normal": "OK",
-            "low": "Low",
-            "unknown": "Unknown / drained out"
-          }
         }
       }
     }

custom_components/sws12500/translations/cs.json

@@ -24,17 +24,15 @@
       }
     }
   },
+
   "options": {
     "error": {
       "valid_credentials_api": "Vyplňte platné API ID",
       "valid_credentials_key": "Vyplňte platný API KEY",
       "valid_credentials_match": "API ID a API KEY nesmějí být stejné!",
-      "windy_id_required": "Je vyžadováno Windy ID, pokud chcete aktivovat přeposílání dat na Windy",
-      "windy_pw_required": "Je vyžadován Windy KEY, pokud chcete aktivovat přeposílání dat na Windy",
-      "pocasi_id_required": "Je vyžadován Počasí ID, pokud chcete aktivovat přeposílání dat na Počasí Meteo CZ",
-      "pocasi_key_required": "Klíč k účtu Počasí Meteo je povinný.",
-      "pocasi_send_minimum": "Minimální interval pro přeposílání je 12 sekund."
+      "windy_key_required": "Je vyžadován Windy API key, pokud chcete aktivovat přeposílání dat na Windy"
     },
+
     "step": {
       "init": {
         "title": "Nastavení integrace SWS12500",
@@ -42,10 +40,10 @@
         "menu_options": {
           "basic": "Základní - přístupové údaje (přihlášení)",
           "windy": "Nastavení pro přeposílání dat na Windy",
-          "pocasi": "Nastavení pro přeposlání dat na Počasí Meteo CZ",
           "migration": "Migrace statistiky senzoru"
         }
       },
+
       "basic": {
         "description": "Zadejte API ID a API KEY, aby meteostanice mohla komunikovat s HomeAssistantem",
         "title": "Nastavení přihlášení",
@@ -62,39 +60,20 @@
           "wslink": "WSLink API zapněte, pokud je stanice nastavena na zasílání dat přes WSLink."
         }
       },
+
       "windy": {
         "description": "Přeposílání dat z metostanice na Windy",
         "title": "Konfigurace Windy",
         "data": {
-          "WINDY_STATION_ID": "ID stanice, získaný z Windy",
-          "WINDY_STATION_PWD": "Heslo stanice, získané z Windy",
+          "WINDY_API_KEY": "Klíč API KEY získaný z Windy",
           "windy_enabled_checkbox": "Povolit přeposílání dat na Windy",
           "windy_logger_checkbox": "Logovat data a odpovědi z Windy"
         },
         "data_description": {
-          "WINDY_STATION_ID": "ID stanice získaný z https://stations.windy.com/station",
-          "WINDY_STATION_PWD": "Heslo stanice získané z https://stations.windy.com/station",
+          "WINDY_API_KEY": "Klíč API KEY získaný z https://https://api.windy.com/keys",
           "windy_logger_checkbox": "Zapnout pouze v případě, že chcete poslat ladící informace vývojáři."
         }
       },
-      "pocasi": {
-        "description": "Přeposílání dat do aplikace Počasí Meteo",
-        "title": "Konfigurace Počasí Meteo",
-        "data": {
-          "POCASI_CZ_API_ID": "ID účtu na Počasí Meteo",
-          "POCASI_CZ_API_KEY": "Klíč (Key) k účtu Počasí Meteo",
-          "POCASI_CZ_SEND_INTERVAL": "Interval v sekundách",
-          "pocasi_enabled_chcekbox": "Povolit přeposílání dat na server Počasí Meteo",
-          "pocasi_logger_checkbox": "Logovat data a odpovědi z Počasí Meteo"
-        },
-        "data_description": {
-          "POCASI_API_ID": "ID získáte ve své aplikaci Počasí Meteo",
-          "POCASI_API_KEY": "Klíč (Key) získáte ve své aplikaci Počasí Meteo",
-          "POCASI_SEND_INTERVAL": "Interval v jakém se mají data na server přeposílat (minimum 12s, defaultně 30s)",
-          "pocasi_enabled_checkbox": "Zapne přeposílání data na server Počasí Meteo",
-          "pocasi_logger_checkbox": "Zapnout pouze v případě, že chcete zaslat ladící informace vývojáři."
-        }
-      },
       "migration": {
         "title": "Migrace statistiky senzoru.",
         "description": "Pro správnou funkci dlouhodobé statistiky je nutné provést migraci jednotky senzoru v dlouhodobé statistice. Původní jednotka dlouhodobé statistiky pro denní úhrn srážek byla v mm/d, nicméně stanice zasílá pouze data v mm bez časového rozlišení.\n\n Senzor, který má být migrován je pro denní úhrn srážek. Pokud je v seznamu již správná hodnota u senzoru pro denní úhrn (mm), pak je již migrace hotová.\n\n Výsledek migrace pro senzor: {migration_status}, přepvedeno celkem {migration_count} řádků.",
@@ -109,86 +88,34 @@
       }
     }
   },
+
   "entity": {
     "sensor": {
-      "indoor_temp": {
-        "name": "Vnitřní teplota"
-      },
-      "indoor_humidity": {
-        "name": "Vnitřní vlhkost vzduchu"
-      },
-      "outside_temp": {
-        "name": "Venkovní teplota"
-      },
-      "outside_humidity": {
-        "name": "Venkovní vlhkost vzduchu"
-      },
-      "uv": {
-        "name": "UV index"
-      },
-      "baro_pressure": {
-        "name": "Tlak vzduchu"
-      },
-      "dew_point": {
-        "name": "Rosný bod"
-      },
-      "wind_speed": {
-        "name": "Rychlost větru"
-      },
-      "wind_dir": {
-        "name": "Směr větru"
-      },
-      "wind_gust": {
-        "name": "Poryvy větru"
-      },
-      "rain": {
-        "name": "Srážky"
-      },
-      "daily_rain": {
-        "name": "Denní úhrn srážek"
-      },
-      "solar_radiation": {
-        "name": "Sluneční osvit"
-      },
-      "ch2_temp": {
-        "name": "Teplota senzoru 2"
-      },
-      "ch2_humidity": {
-        "name": "Vlhkost sensoru 2"
-      },
-      "ch3_temp": {
-        "name": "Teplota senzoru 3"
-      },
-      "ch3_humidity": {
-        "name": "Vlhkost sensoru 3"
-      },
-      "ch4_temp": {
-        "name": "Teplota senzoru 4"
-      },
-      "ch4_humidity": {
-        "name": "Vlhkost sensoru 4"
-      },
-      "heat_index": {
-        "name": "Tepelný index"
-      },
-      "chill_index": {
-        "name": "Pocitová teplota"
-      },
-      "hourly_rain": {
-        "name": "Hodinový úhrn srážek"
-      },
-      "weekly_rain": {
-        "name": "Týdenní úhrn srážek"
-      },
-      "monthly_rain": {
-        "name": "Měsíční úhrn srážek"
-      },
-      "yearly_rain": {
-        "name": "Roční úhrn srážek"
-      },
-      "wbgt_temp": {
-        "name": "WBGT index"
-      },
+      "indoor_temp": { "name": "Vnitřní teplota" },
+      "indoor_humidity": { "name": "Vnitřní vlhkost vzduchu" },
+      "outside_temp": { "name": "Venkovní teplota" },
+      "outside_humidity": { "name": "Venkovní vlhkost vzduchu" },
+      "uv": { "name": "UV index" },
+      "baro_pressure": { "name": "Tlak vzduchu" },
+      "dew_point": { "name": "Rosný bod" },
+      "wind_speed": { "name": "Rychlost větru" },
+      "wind_dir": { "name": "Směr větru" },
+      "wind_gust": { "name": "Poryvy větru" },
+      "rain": { "name": "Srážky" },
+      "daily_rain": { "name": "Denní úhrn srážek" },
+      "solar_radiation": { "name": "Sluneční osvit" },
+      "ch2_temp": { "name": "Teplota senzoru 2" },
+      "ch2_humidity": { "name": "Vlhkost sensoru 2" },
+      "ch3_temp": { "name": "Teplota senzoru 3" },
+      "ch3_humidity": { "name": "Vlhkost sensoru 3" },
+      "ch4_temp": { "name": "Teplota senzoru 4" },
+      "ch4_humidity": { "name": "Vlhkost sensoru 4" },
+      "heat_index": { "name": "Tepelný index" },
+      "chill_index": { "name": "Pocitová teplota" },
+      "hourly_rain": { "name": "Hodinový úhrn srážek" },
+      "weekly_rain": { "name": "Týdenní úhrn srážek" },
+      "monthly_rain": { "name": "Měsíční úhrn srážek" },
+      "yearly_rain": { "name": "Roční úhrn srážek" },
       "wind_azimut": {
         "name": "Azimut",
         "state": {
@@ -209,30 +136,6 @@
           "nw": "SZ",
           "nnw": "SSZ"
         }
-      },
-      "outside_battery": {
-        "name": "Stav nabití venkovní baterie",
-        "state": {
-          "low": "Nízká",
-          "normal": "Normální",
-          "unknown": "Neznámá / zcela vybitá"
-        }
-      },
-      "indoor_battery": {
-        "name": "Stav nabití baterie kozole",
-        "state": {
-          "low": "Nízká",
-          "normal": "Normální",
-          "unknown": "Neznámá / zcela vybitá"
-        }
-      },
-      "ch2_battery": {
-        "name": "Stav nabití baterie kanálu 2",
-        "state": {
-          "low": "Nízká",
-          "normal": "Normální",
-          "unknown": "Neznámá / zcela vybitá"
-        }
       }
     }
   },

custom_components/sws12500/translations/en.json

@@ -5,6 +5,7 @@
       "valid_credentials_key": "Provide valid API KEY.",
       "valid_credentials_match": "API ID and API KEY should not be the same."
     },
+
     "step": {
       "user": {
         "description": "Provide API ID and API KEY so the Weather Station can access HomeAssistant",
@@ -24,14 +25,15 @@
       }
     }
   },
+
   "options": {
     "error": {
       "valid_credentials_api": "Provide valid API ID.",
       "valid_credentials_key": "Provide valid API KEY.",
       "valid_credentials_match": "API ID and API KEY should not be the same.",
-      "windy_id_required": "Windy API key is required if you want to enable this function.",
-      "windy_pw_required": "Windy API password is required if you want to enable this function."
+      "windy_key_required": "Windy API key is required if you want to enable this function."
     },
+
     "step": {
       "init": {
         "title": "Configure SWS12500 Integration",
@@ -41,6 +43,7 @@
           "windy": "Windy configuration"
         }
       },
+
       "basic": {
         "description": "Provide API ID and API KEY so the Weather Station can access HomeAssistant",
         "title": "Configure credentials",
@@ -57,39 +60,20 @@
           "WSLINK": "Enable WSLink API if the station is set to send data via WSLink."
         }
       },
+
       "windy": {
         "description": "Resend weather data to your Windy stations.",
         "title": "Configure Windy",
         "data": {
-          "WINDY_STATION_ID": "Station ID obtained form Windy",
-          "WINDY_STATION_PWD": "Station password obtained from Windy",
+          "WINDY_API_KEY": "API KEY provided by Windy",
           "windy_enabled_checkbox": "Enable resending data to Windy",
           "windy_logger_checkbox": "Log Windy data and responses"
         },
         "data_description": {
-          "WINDY_STATION_ID": "Windy station ID obtained from https://stations.windy.com/stations",
-          "WINDY_STATION_PWD": "Windy station password obtained from https://stations.windy.com/stations",
+          "WINDY_API_KEY": "Windy API KEY obtained from https://https://api.windy.com/keys",
           "windy_logger_checkbox": "Enable only if you want to send debuging data to the developer."
         }
       },
-      "pocasi": {
-        "description": "Resend data to Pocasi Meteo CZ",
-        "title": "Configure Pocasi Meteo CZ",
-        "data": {
-          "POCASI_CZ_API_ID": "ID from your Pocasi Meteo APP",
-          "POCASI_CZ_API_KEY": "Key from your Pocasi Meteo APP",
-          "POCASI_CZ_SEND_INTERVAL": "Resend interval in seconds",
-          "pocasi_enabled_checkbox": "Enable resending data to Pocasi Meteo",
-          "pocasi_logger_checkbox": "Log data and responses"
-        },
-        "data_description": {
-          "POCASI_CZ_API_ID": "You can obtain your ID in Pocasi Meteo App",
-          "POCASI_CZ_API_KEY": "You can obtain your KEY in Pocasi Meteo App",
-          "POCASI_CZ_SEND_INTERVAL": "Resend interval in seconds (minimum 12s, default 30s)",
-          "pocasi_enabled_checkbox": "Enables resending data to Pocasi Meteo",
-          "pocasi_logger_checkbox": "Enable only if you want to send debbug data to the developer"
-        }
-      },
       "migration": {
         "title": "Statistic migration.",
         "description": "For the correct functioning of long-term statistics, it is necessary to migrate the sensor unit in the long-term statistics. The original unit of long-term statistics for daily precipitation was in mm/d, however, the station only sends data in mm without time differentiation.\n\n The sensor to be migrated is for daily precipitation. If the correct value is already in the list for the daily precipitation sensor (mm), then the migration is already complete.\n\n Migration result for the sensor: {migration_status}, a total of {migration_count} rows converted.",
@@ -104,86 +88,34 @@
       }
     }
   },
+
   "entity": {
     "sensor": {
-      "indoor_temp": {
-        "name": "Indoor temperature"
-      },
-      "indoor_humidity": {
-        "name": "Indoor humidity"
-      },
-      "outside_temp": {
-        "name": "Outside Temperature"
-      },
-      "outside_humidity": {
-        "name": "Outside humidity"
-      },
-      "uv": {
-        "name": "UV index"
-      },
-      "baro_pressure": {
-        "name": "Barometric pressure"
-      },
-      "dew_point": {
-        "name": "Dew point"
-      },
-      "wind_speed": {
-        "name": "Wind speed"
-      },
-      "wind_dir": {
-        "name": "Wind direction"
-      },
-      "wind_gust": {
-        "name": "Wind gust"
-      },
-      "rain": {
-        "name": "Rain"
-      },
-      "daily_rain": {
-        "name": "Daily precipitation"
-      },
-      "solar_radiation": {
-        "name": "Solar irradiance"
-      },
-      "ch2_temp": {
-        "name": "Channel 2 temperature"
-      },
-      "ch2_humidity": {
-        "name": "Channel 2 humidity"
-      },
-      "ch3_temp": {
-        "name": "Channel 3 temperature"
-      },
-      "ch3_humidity": {
-        "name": "Channel 3 humidity"
-      },
-      "ch4_temp": {
-        "name": "Channel 4 temperature"
-      },
-      "ch4_humidity": {
-        "name": "Channel 4 humidity"
-      },
-      "heat_index": {
-        "name": "Apparent temperature"
-      },
-      "chill_index": {
-        "name": "Wind chill"
-      },
-      "hourly_rain": {
-        "name": "Hourly precipitation"
-      },
-      "weekly_rain": {
-        "name": "Weekly precipitation"
-      },
-      "monthly_rain": {
-        "name": "Monthly precipitation"
-      },
-      "yearly_rain": {
-        "name": "Yearly precipitation"
-      },
-      "wbgt_index": {
-        "name": "WBGT index"
-      },
+      "indoor_temp": { "name": "Indoor temperature" },
+      "indoor_humidity": { "name": "Indoor humidity" },
+      "outside_temp": { "name": "Outside Temperature" },
+      "outside_humidity": { "name": "Outside humidity" },
+      "uv": { "name": "UV index" },
+      "baro_pressure": { "name": "Barometric pressure" },
+      "dew_point": { "name": "Dew point" },
+      "wind_speed": { "name": "Wind speed" },
+      "wind_dir": { "name": "Wind direction" },
+      "wind_gust": { "name": "Wind gust" },
+      "rain": { "name": "Rain" },
+      "daily_rain": { "name": "Daily precipitation" },
+      "solar_radiation": { "name": "Solar irradiance" },
+      "ch2_temp": { "name": "Channel 2 temperature" },
+      "ch2_humidity": { "name": "Channel 2 humidity" },
+      "ch3_temp": { "name": "Channel 3 temperature" },
+      "ch3_humidity": { "name": "Channel 3 humidity" },
+      "ch4_temp": { "name": "Channel 4 temperature" },
+      "ch4_humidity": { "name": "Channel 4 humidity" },
+      "heat_index": { "name": "Apparent temperature" },
+      "chill_index": { "name": "Wind chill" },
+      "hourly_rain": { "name": "Hourly precipitation" },
+      "weekly_rain": { "name": "Weekly precipitation" },
+      "monthly_rain": { "name": "Monthly precipitation" },
+      "yearly_rain": { "name": "Yearly precipitation" },
       "wind_azimut": {
         "name": "Bearing",
         "state": {
@@ -204,30 +136,6 @@
           "nw": "NW",
           "nnw": "NNW"
         }
-      },
-      "outside_battery": {
-        "name": "Outside battery level",
-        "state": {
-          "normal": "OK",
-          "low": "Low",
-          "unknown": "Unknown / drained out"
-        }
-      },
-      "ch2_battery": {
-        "name": "Channel 2 battery level",
-        "state": {
-          "normal": "OK",
-          "low": "Low",
-          "unknown": "Unknown / drained out"
-        }
-      },
-      "indoor_battery": {
-        "name": "Console battery level",
-        "state": {
-          "normal": "OK",
-          "low": "Low",
-          "unknown": "Unknown / drained out"
-        }
       }
     }
   },

custom_components/sws12500/utils.py

@@ -10,6 +10,11 @@ import numpy as np
 
 from homeassistant.components import persistent_notification
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    UnitOfPrecipitationDepth,
+    UnitOfTemperature,
+    UnitOfVolumetricFlux,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.translation import async_get_translations
 
@@ -23,7 +28,6 @@ from .const import (
     REMAP_WSLINK_ITEMS,
     SENSORS_TO_LOAD,
     WIND_SPEED,
-    UnitOfBat,
     UnitOfDir,
 )
 
@@ -49,7 +53,7 @@ async def translations(
     )
     if localize_key in _translations:
         return _translations[localize_key]
-    return ""
+    return None
 
 
 async def translated_notification(
@@ -61,7 +65,7 @@ async def translated_notification(
     *,
     key: str = "message",
     category: str = "notify",
-):
+) -> str:
     """Translate notification."""
 
     localize_key = f"component.{translation_domain}.{category}.{translation_key}.{key}"
@@ -92,7 +96,7 @@ async def translated_notification(
 
 async def update_options(
     hass: HomeAssistant, entry: ConfigEntry, update_key, update_value
-) -> bool:
+) -> None:
     """Update config.options entry."""
     conf = {**entry.options}
     conf[update_key] = update_value
@@ -147,7 +151,7 @@ def check_disabled(
     Returns list of found sensors or None
     """
 
-    log: bool = config_entry.options.get(DEV_DBG, False)
+    log: bool = config_entry.options.get(DEV_DBG)
     entityFound: bool = False
     _loaded_sensors = loaded_sensors(config_entry)
     missing_sensors: list = []
@@ -177,37 +181,6 @@ def wind_dir_to_text(deg: float) -> UnitOfDir | None:
     return None
 
 
-def battery_level_to_text(battery: int) -> UnitOfBat:
-    """Return battery level in text representation.
-
-    Returns UnitOfBat
-    """
-
-    level_map: dict[int, UnitOfBat] = {
-        0: UnitOfBat.LOW,
-        1: UnitOfBat.NORMAL,
-    }
-
-    if battery is None:
-        return UnitOfBat.UNKNOWN
-
-    return level_map.get(int(battery), UnitOfBat.UNKNOWN)
-
-
-def battery_level_to_icon(battery: UnitOfBat) -> str:
-    """Return battery level in icon representation.
-
-    Returns str
-    """
-
-    icons = {
-        UnitOfBat.LOW: "mdi:battery-low",
-        UnitOfBat.NORMAL: "mdi:battery",
-    }
-
-    return icons.get(battery, "mdi:battery-unknown")
-
-
 def fahrenheit_to_celsius(fahrenheit: float) -> float:
     """Convert Fahrenheit to Celsius."""
     return (fahrenheit - 32) * 5.0 / 9.0
@@ -218,22 +191,15 @@ def celsius_to_fahrenheit(celsius: float) -> float:
     return celsius * 9.0 / 5.0 + 32
 
 
-def heat_index(data: Any, convert: bool = False) -> float | None:
+def heat_index(data: Any, convert: bool = False) -> UnitOfTemperature:
     """Calculate heat index from temperature.
 
     data: dict with temperature and humidity
     convert: bool, convert recieved data from Celsius to Fahrenheit
     """
 
-    temp = data.get(OUTSIDE_TEMP, None)
-    rh = data.get(OUTSIDE_HUMIDITY, None)
-
-    if not temp or not rh:
-        return None
-
-    temp = float(temp)
-    rh = float(rh)
-
+    temp = float(data[OUTSIDE_TEMP])
+    rh = float(data[OUTSIDE_HUMIDITY])
     adjustment = None
 
     if convert:
@@ -263,21 +229,15 @@ def heat_index(data: Any, convert: bool = False) -> float | None:
     return simple
 
 
-def chill_index(data: Any, convert: bool = False) -> float | None:
+def chill_index(data: Any, convert: bool = False) -> UnitOfTemperature:
     """Calculate wind chill index from temperature and wind speed.
 
     data: dict with temperature and wind speed
     convert: bool, convert recieved data from Celsius to Fahrenheit
     """
 
-    temp = data.get(OUTSIDE_TEMP, None)
-    wind = data.get(WIND_SPEED, None)
-
-    if not temp or not wind:
-        return None
-
-    temp = float(temp)
-    wind = float(wind)
+    temp = float(data[OUTSIDE_TEMP])
+    wind = float(data[WIND_SPEED])
 
     if convert:
         temp = celsius_to_fahrenheit(temp)
@@ -298,7 +258,7 @@ def chill_index(data: Any, convert: bool = False) -> float | None:
 
 def long_term_units_in_statistics_meta():
     """Get units in long term statitstics."""
-    sensor_units = []
+
     if not Path(DATABASE_PATH).exists():
         _LOGGER.error("Database file not found: %s", DATABASE_PATH)
         return False
@@ -307,12 +267,10 @@ def long_term_units_in_statistics_meta():
     db = conn.cursor()
 
     try:
-        db.execute(
-            """
+        db.execute("""
             SELECT statistic_id, unit_of_measurement from statistics_meta
             WHERE statistic_id LIKE 'sensor.weather_station_sws%'
-         """
-        )
+         """)
         rows = db.fetchall()
         sensor_units = {
             statistic_id: f"{statistic_id} ({unit})" for statistic_id, unit in rows
@@ -326,10 +284,10 @@ def long_term_units_in_statistics_meta():
     return sensor_units
 
 
-async def migrate_data(hass: HomeAssistant, sensor_id: str | None = None) -> int | bool:
+async def migrate_data(hass: HomeAssistant, sensor_id: str | None = None) -> bool:
     """Migrate data from mm/d to mm."""
-
-    _LOGGER.debug("Sensor %s is required for data migration", sensor_id)
+    
+    _LOGGER.debug("Sensor %s is required for data migration", sensor_id) 
     updated_rows = 0
 
     if not Path(DATABASE_PATH).exists():

custom_components/sws12500/windy_func.py

@@ -3,21 +3,17 @@
 from datetime import datetime, timedelta
 import logging
 
-from aiohttp.client_exceptions import ClientError
-
-from homeassistant.components import persistent_notification
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from .const import (
     PURGE_DATA,
+    WINDY_API_KEY,
     WINDY_ENABLED,
     WINDY_INVALID_KEY,
     WINDY_LOGGER_ENABLED,
     WINDY_NOT_INSERTED,
-    WINDY_STATION_ID,
-    WINDY_STATION_PW,
     WINDY_SUCCESS,
     WINDY_UNEXPECTED,
     WINDY_URL,
@@ -89,7 +85,7 @@ class WindyPush:
 
         return None
 
-    async def push_data_to_windy(self, data, wslink: bool = False):
+    async def push_data_to_windy(self, data):
         """Pushes weather data do Windy stations.
 
         Interval is 5 minutes, otherwise Windy would not accepts data.
@@ -110,68 +106,24 @@ class WindyPush:
         if self.next_update > datetime.now():
             return False
 
-        purged_data = data.copy()
+        purged_data = dict(data)
 
         for purge in PURGE_DATA:
             if purge in purged_data:
                 purged_data.pop(purge)
 
-        if wslink:
-            # WSLink -> Windy params
-            if "t1ws" in purged_data:
-                purged_data["wind"] = purged_data.pop("t1ws")
-            if "t1wgust" in purged_data:
-                purged_data["gust"] = purged_data.pop("t1wgust")
-            if "t1wdir" in purged_data:
-                purged_data["winddir"] = purged_data.pop("t1wdir")
-            if "t1hum" in purged_data:
-                purged_data["humidity"] = purged_data.pop("t1hum")
-            if "t1dew" in purged_data:
-                purged_data["dewpoint"] = purged_data.pop("t1dew")
-            if "t1tem" in purged_data:
-                purged_data["temp"] = purged_data.pop("t1tem")
-            if "rbar" in purged_data:
-                purged_data["mbar"] = purged_data.pop("rbar")
-            if "t1rainhr" in purged_data:
-                purged_data["precip"] = purged_data.pop("t1rainhr")
-            if "t1uvi" in purged_data:
-                purged_data["uv"] = purged_data.pop("t1uvi")
-            if "t1solrad" in purged_data:
-                purged_data["solarradiation"] = purged_data.pop("t1solrad")
+        if "dewptf" in purged_data:
+            dewpoint = round(((float(purged_data.pop("dewptf")) - 32) / 1.8), 1)
+            purged_data["dewpoint"] = str(dewpoint)
 
-        windy_station_id = (self.config.options.get(WINDY_STATION_ID) or "").strip()
-        windy_station_pw = (self.config.options.get(WINDY_STATION_PW) or "").strip()
-
-        # Both values are required. Options can sometimes be None, so normalize to
-        # empty string and strip whitespace before validating.
-        if not windy_station_id or not windy_station_pw:
-            _LOGGER.error(
-                "Windy ID or PASSWORD is not set correctly. Please reconfigure your WINDY resend credentials. Disabling WINDY resend for now!"
-            )
-
-            persistent_notification.async_create(
-                self.hass,
-                "Your Windy credentials are not set correctly. Disabling Windy resending for now. Update Windy options and enable reseding.",
-                "Windy resending disabled.",
-            )
-
-            await update_options(self.hass, self.config, WINDY_ENABLED, False)
-            return False
-
-        request_url = f"{WINDY_URL}"
-
-        purged_data["id"] = windy_station_id
-        purged_data["time"] = "now"
-
-        headers = {"Authorization": f"Bearer {windy_station_pw}"}
+        windy_api_key = self.config.options.get(WINDY_API_KEY)
+        request_url = f"{WINDY_URL}{windy_api_key}"
 
         if self.log:
             _LOGGER.info("Dataset for windy: %s", purged_data)
         session = async_get_clientsession(self.hass, verify_ssl=False)
         try:
-            async with session.get(
-                request_url, params=purged_data, headers=headers
-            ) as resp:
+            async with session.get(request_url, params=purged_data) as resp:
                 status = await resp.text()
                 try:
                     self.verify_windy_response(status)
@@ -186,20 +138,20 @@ class WindyPush:
                     _LOGGER.critical(WINDY_INVALID_KEY)
                     text_for_test = WINDY_INVALID_KEY
 
-                    await update_options(self.hass, self.config, WINDY_ENABLED, False)
+                    update_options(self.hass, self.config, WINDY_ENABLED, False)
 
                 except WindySuccess:
                     if self.log:
                         _LOGGER.info(WINDY_SUCCESS)
                     text_for_test = WINDY_SUCCESS
 
-        except ClientError as ex:
+        except session.ClientError as ex:
             _LOGGER.critical("Invalid response from Windy: %s", str(ex))
             self.invalid_response_count += 1
             if self.invalid_response_count > 3:
                 _LOGGER.critical(WINDY_UNEXPECTED)
                 text_for_test = WINDY_UNEXPECTED
-                await update_options(self.hass, self.config, WINDY_ENABLED, False)
+                update_options(self.hass, self.config, WINDY_ENABLED, False)
 
         self.last_update = datetime.now()
         self.next_update = self.last_update + timed(minutes=5)

dev/custom_components/sws12500/data.py

@@ -0,0 +1,17 @@
+"""Shared keys and helpers for storing integration runtime state in hass.data.
+
+This integration uses `hass.data[DOMAIN][entry_id]` as a per-entry dictionary.
+Keeping keys in one place prevents subtle bugs where different modules store
+different value types under the same key.
+"""
+
+from __future__ import annotations
+
+from typing import Final
+
+
+# Per-entry dict keys stored under hass.data[DOMAIN][entry_id]
+ENTRY_COORDINATOR: Final[str] = "coordinator"
+ENTRY_ADD_ENTITIES: Final[str] = "async_add_entities"
+ENTRY_DESCRIPTIONS: Final[str] = "sensor_descriptions"
+ENTRY_LAST_OPTIONS: Final[str] = "last_options"

hacs.json

@@ -1,6 +1,4 @@
 {
   "name": "Sencor SWS 12500 Weather station",
-  "filename": "weather-station.zip",
-  "render_readme": true,
-  "zip_release": true
+  "render_readme": true
 }