Merge 68da7aad98 into 99d25bfd56

custom_components/sws12500/const.py

@@ -23,12 +23,8 @@ WSLINK: Final = "wslink"
 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?"
-)
-WINDY_INVALID_KEY: Final = (
-    "Windy API KEY is invalid. Send data to Windy is now disabled. Check your API KEY and try again."
-)
+WINDY_NOT_INSERTED: Final = "Data was succefuly sent to Windy, but not inserted by Windy API. Does anyone else sent data to Windy?"
+WINDY_INVALID_KEY: Final = "Windy API KEY is invalid. Send data to Windy is now disabled. Check your API KEY and try again."
 WINDY_SUCCESS: Final = (
     "Windy successfully sent data and data was successfully inserted by Windy API"
 )
@@ -159,7 +155,6 @@ DISABLED_BY_DEFAULT: Final = [
     CH3_HUMIDITY,
     CH4_TEMP,
     CH4_HUMIDITY,
-    OUTSIDE_BATTERY,
 ]
 
 
@@ -183,7 +178,6 @@ class UnitOfDir(StrEnum):
     NNW = "nnw"
     N = "n"
 
-
 AZIMUT: list[UnitOfDir] = [
     UnitOfDir.NNE,
     UnitOfDir.NE,
@@ -203,7 +197,6 @@ AZIMUT: list[UnitOfDir] = [
     UnitOfDir.N,
 ]
 
-
 class UnitOfBat(StrEnum):
     """Battery level unit of measure."""
 
@@ -211,7 +204,6 @@ class UnitOfBat(StrEnum):
     NORMAL = "normal"
     UNKNOWN = "unknown"
 
-
 BATTERY_LEVEL: list[UnitOfBat] = [
     UnitOfBat.LOW,
     UnitOfBat.NORMAL,

custom_components/sws12500/sensors_wslink.py

@@ -27,26 +27,26 @@ from .const import (
     DAILY_RAIN,
     DEW_POINT,
     HEAT_INDEX,
-    HOURLY_RAIN,
     INDOOR_HUMIDITY,
     INDOOR_TEMP,
-    MONTHLY_RAIN,
     OUTSIDE_BATTERY,
     OUTSIDE_HUMIDITY,
     OUTSIDE_TEMP,
     RAIN,
     SOLAR_RADIATION,
     UV,
-    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 battery_level_to_icon, battery_level_to_text, wind_dir_to_text
+from .utils import battery_level_to_text, wind_dir_to_text
 
 SENSOR_TYPES_WSLINK: tuple[WeatherSensorEntityDescription, ...] = (
     WeatherSensorEntityDescription(
@@ -306,9 +306,10 @@ SENSOR_TYPES_WSLINK: tuple[WeatherSensorEntityDescription, ...] = (
     ),
     WeatherSensorEntityDescription(
         key=OUTSIDE_BATTERY,
-        translation_key=OUTSIDE_BATTERY,
-        icon=lambda data: battery_level_to_icon(battery_level_to_text(int(data))),
+        name="Outside Battery",
+        icon="mdi:battery",
         device_class=SensorDeviceClass.ENUM,
-        value_fn=lambda data: battery_level_to_text(int(data)),
+        value_fn=lambda data: battery_level_to_text(int(data)) if data is not None and str(data).isdigit() else "unknown",
+        translation_key=OUTSIDE_BATTERY,
     ),
 )

custom_components/sws12500/strings.json

@@ -131,18 +131,11 @@
           "wnw": "WNW",
           "nw": "NW",
           "nnw": "NNW"
-        },
-        "outside_battery": {
-          "name": "Outside battery level",
-          "state": {
-            "normal": "OK",
-            "low": "Low",
-            "unknown": "Unknown / drained out"
-          }
         }
       }
     }
   },
+  "outside_battery": { "name": "Outside battery level" },
   "notify": {
     "added": {
       "title": "New sensors for SWS 12500 found.",

custom_components/sws12500/translations/cs.json

@@ -136,17 +136,10 @@
           "nw": "SZ",
           "nnw": "SSZ"
         }
-      },
-      "outside_battery": {
-        "name": "Stav nabití venkovní baterie",
-        "state": {
-          "low": "Nízká",
-          "normal": "Normální",
-          "unknown": "Neznámá / zcela vybitá"
-        }
       }
     }
   },
+  "outside_battery": { "name": "Vnější úroveň nabití baterie" },
   "notify": {
     "added": {
       "title": "Nalezeny nové senzory pro SWS 12500.",

custom_components/sws12500/translations/en.json

@@ -137,14 +137,7 @@
           "nnw": "NNW"
         }
       },
-      "outside_battery": {
-        "name": "Outside battery level",
-        "state": {
-          "normal": "OK",
-          "low": "Low",
-          "unknown": "Unknown / drained out"
-        }
-      }
+      "outside_battery": { "name": "Outside battery level" }
     }
   },
   "notify": {