diff --git a/README.md b/README.md index 0a5e664..a839791 100755 --- a/README.md +++ b/README.md @@ -113,6 +113,10 @@ The following entities will be created: - 10 minutes average wind speed - Wind Speed (Bft): - 10 minutes average wind speed in Beaufort +- Rain Storm: + - Total rainfall during an extended period of rain +- Storm Start Date: + - Start date or current rain storm - Extra Humidity 1-7: - Current humidity extra sensor 1-7 - Extra Temperature 1-7: diff --git a/custom_components/davis_vantage/binary_sensor.py b/custom_components/davis_vantage/binary_sensor.py index b1002f2..2e742b1 100755 --- a/custom_components/davis_vantage/binary_sensor.py +++ b/custom_components/davis_vantage/binary_sensor.py @@ -7,7 +7,6 @@ from homeassistant.core import HomeAssistant from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.update_coordinator import CoordinatorEntity -from homeassistant.helpers.entity import EntityCategory from .const import DEFAULT_NAME, DOMAIN from .coordinator import DavisVantageDataUpdateCoordinator diff --git a/custom_components/davis_vantage/client.py b/custom_components/davis_vantage/client.py index 1eeea97..2cd9974 100755 --- a/custom_components/davis_vantage/client.py +++ b/custom_components/davis_vantage/client.py @@ -277,6 +277,8 @@ def correct_rain_values(self, data: dict[str, Any]): data["RainYear"] *= 2 / 2.54 if data["RainRate"] is not None: data["RainRate"] *= 2 / 2.54 + if data["RainStorm"] is not None: + data["RainStorm"] *= 2 / 2.54 if "RainRateDay" in data: if data["RainRateDay"] is not None: data["RainRateDay"] *= 2 / 2.54 diff --git a/custom_components/davis_vantage/const.py b/custom_components/davis_vantage/const.py index 4ab17bd..81b7634 100755 --- a/custom_components/davis_vantage/const.py +++ b/custom_components/davis_vantage/const.py @@ -4,7 +4,7 @@ DOMAIN = "davis_vantage" MANUFACTURER = "Davis" MODEL = "Vantage Pro2/Vue" -VERSION = "1.1.5" +VERSION = "1.1.6" DEFAULT_SYNC_INTERVAL = 30 # seconds DEFAULT_NAME = NAME diff --git a/custom_components/davis_vantage/manifest.json b/custom_components/davis_vantage/manifest.json index 82d79ec..ae63bd2 100755 --- a/custom_components/davis_vantage/manifest.json +++ b/custom_components/davis_vantage/manifest.json @@ -11,7 +11,7 @@ "integration_type": "hub", "iot_class": "local_polling", "issue_tracker": "https://github.com/MarcoGos/davis_vantage/issues", - "requirements": ["PyVantagePro-MarcoGos==0.3.11"], + "requirements": ["PyVantagePro-MarcoGos==0.3.13"], "ssdp": [], "version": "1.0.0", "zeroconf": [] diff --git a/custom_components/davis_vantage/sensor.py b/custom_components/davis_vantage/sensor.py index 168272d..6ceb2d2 100755 --- a/custom_components/davis_vantage/sensor.py +++ b/custom_components/davis_vantage/sensor.py @@ -26,9 +26,7 @@ from .const import ( DEFAULT_NAME, - DOMAIN, - CONFIG_STATION_MODEL, - MODEL_VANTAGE_PRO2PLUS + DOMAIN ) from .coordinator import DavisVantageDataUpdateCoordinator @@ -422,6 +420,22 @@ entity_category=EntityCategory.DIAGNOSTIC, entity_registry_enabled_default=False ), + SensorEntityDescription( + key="RainStorm", + name="Rain Storm", + icon="mdi:water-outline", + device_class=SensorDeviceClass.PRECIPITATION, + state_class="measurement", + native_unit_of_measurement=UnitOfLength.INCHES, + suggested_display_precision=1, + entity_registry_enabled_default=False + ), + SensorEntityDescription( + key="StormStartDate", + name="Rain Storm Start Date", + icon="mdi:calendar-outline", + entity_registry_enabled_default=False + ), SensorEntityDescription( key="ExtraTemps01", name="Extra Temperature 1",