5 Commits

Author SHA1 Message Date
ryanbdclark
e28b9ddf3e Update CHANGELOG.md 2024-10-09 20:55:37 +01:00
RyanClark123
f63e0a6dfe Added base station as a switch
### Feature
* Base station has now been removed from binary sensors and added as a switch
2024-10-09 20:51:05 +01:00
RyanClark123
82823be1c8 Bump pyowletapi
### Fix
* Bump pyowletapi to 2024.10.1
2024-10-09 20:03:14 +01:00
RyanClark123
14787e03c4 Correct strings for password and connection error
### Fix
* Fix strings for password and connection error in all languages
2024-10-09 16:31:45 +01:00
RyanClark123
0991eb31d9 Add state class
### Fix
* Add state class to battery minutes and O2 saturation 10 minute average
2024-10-09 15:19:28 +01:00
10 changed files with 121 additions and 38 deletions

View File

@@ -1,6 +1,14 @@
# Changelog # Changelog
<!--next-version-placeholder--> <!--next-version-placeholder-->
## 2024.10.1 (2024-10-09)
### Feature
* Base station has now been removed from binary sensors and added as a switch ([`f63e0a6`](https://github.com/ryanbdclark/owlet/commit/f63e0a6dfeab1a05ba09ef3e0087cb404ba0dac4))
### Fix
* Bump pyowletapi to 2024.10.1 ([`82823be`](https://github.com/ryanbdclark/owlet/commit/82823be1c8265d2b9431771136853febef648650))
* Fix strings for password and connection error in all languages ([`14787e0`](https://github.com/ryanbdclark/owlet/commit/14787e03c4d275f46f446921a3ee133fc7cfd1b1))
* Add state class to battery minutes and O2 saturation 10 minute average ([`0991eb3`](https://github.com/ryanbdclark/owlet/commit/0991eb31d919f3ee9f65ece793166d7ee3e33c38))
## 2024.9.1 (2024-09-26) ## 2024.9.1 (2024-09-26)
### Feature ### Feature
* Now includes French translation, thanks [`@Julien80`](https://github.com/Julien80) ([`f3c853e`](https://github.com/ryanbdclark/owlet/commit/f3c853e2d7243d766889f2d18c718819da30e4be)) * Now includes French translation, thanks [`@Julien80`](https://github.com/Julien80) ([`f3c853e`](https://github.com/ryanbdclark/owlet/commit/f3c853e2d7243d766889f2d18c718819da30e4be))

View File

@@ -30,7 +30,7 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
from .const import CONF_OWLET_EXPIRY, CONF_OWLET_REFRESH, DOMAIN, SUPPORTED_VERSIONS from .const import CONF_OWLET_EXPIRY, CONF_OWLET_REFRESH, DOMAIN, SUPPORTED_VERSIONS
from .coordinator import OwletCoordinator from .coordinator import OwletCoordinator
PLATFORMS: list[Platform] = [Platform.BINARY_SENSOR, Platform.SENSOR] PLATFORMS: list[Platform] = [Platform.BINARY_SENSOR, Platform.SENSOR, Platform.SWITCH]
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)

View File

@@ -92,12 +92,6 @@ SENSORS: tuple[OwletBinarySensorEntityDescription, ...] = (
device_class=BinarySensorDeviceClass.POWER, device_class=BinarySensorDeviceClass.POWER,
available_during_charging=True, available_during_charging=True,
), ),
OwletBinarySensorEntityDescription(
key="base_station_on",
translation_key="base_on",
device_class=BinarySensorDeviceClass.POWER,
available_during_charging=True,
),
) )
@@ -177,4 +171,8 @@ class OwletAwakeSensor(OwletBinarySensor):
@property @property
def is_on(self) -> bool: def is_on(self) -> bool:
"""Return true if the binary sensor is on.""" """Return true if the binary sensor is on."""
return False if self.sock.properties[self.entity_description.key] in [8, 15] else True return (
False
if self.sock.properties[self.entity_description.key] in [8, 15]
else True
)

View File

@@ -9,7 +9,7 @@
"iot_class": "cloud_polling", "iot_class": "cloud_polling",
"issue_tracker": "https://github.com/ryanbdclark/owlet/issues", "issue_tracker": "https://github.com/ryanbdclark/owlet/issues",
"requirements": [ "requirements": [
"pyowletapi==2024.6.1" "pyowletapi==2024.10.1"
], ],
"version": "2024.9.1" "version": "2024.10.1"
} }

View File

@@ -63,6 +63,7 @@ SENSORS: tuple[OwletSensorEntityDescription, ...] = (
translation_key="batterymin", translation_key="batterymin",
native_unit_of_measurement=UnitOfTime.MINUTES, native_unit_of_measurement=UnitOfTime.MINUTES,
device_class=SensorDeviceClass.DURATION, device_class=SensorDeviceClass.DURATION,
state_class=SensorStateClass.MEASUREMENT,
available_during_charging=False, available_during_charging=False,
), ),
OwletSensorEntityDescription( OwletSensorEntityDescription(
@@ -120,7 +121,10 @@ async def async_setup_entry(
if OwletSleepSensor.entity_description.key in coordinator.sock.properties: if OwletSleepSensor.entity_description.key in coordinator.sock.properties:
sensors.append(OwletSleepSensor(coordinator)) sensors.append(OwletSleepSensor(coordinator))
if OwletOxygenAverageSensor.entity_description.key in coordinator.sock.properties: if (
OwletOxygenAverageSensor.entity_description.key
in coordinator.sock.properties
):
sensors.append(OwletOxygenAverageSensor(coordinator)) sensors.append(OwletOxygenAverageSensor(coordinator))
async_add_entities(sensors) async_add_entities(sensors)
@@ -187,6 +191,7 @@ class OwletOxygenAverageSensor(OwletSensor):
native_unit_of_measurement=PERCENTAGE, native_unit_of_measurement=PERCENTAGE,
icon="mdi:leaf", icon="mdi:leaf",
available_during_charging=False, available_during_charging=False,
state_class=SensorStateClass.MEASUREMENT,
) )
def __init__( def __init__(
@@ -199,8 +204,14 @@ class OwletOxygenAverageSensor(OwletSensor):
@property @property
def available(self) -> bool: def available(self) -> bool:
"""Return if entity is available.""" """Return if entity is available."""
return super().available and ( return (
not self.sock.properties["charging"] super().available
or self.entity_description.available_during_charging and (
) and (self.sock.properties["oxygen_10_av"] >= 0 and self.sock.properties["oxygen_10_av"] <= 100) not self.sock.properties["charging"]
or self.entity_description.available_during_charging
)
and (
self.sock.properties["oxygen_10_av"] >= 0
and self.sock.properties["oxygen_10_av"] <= 100
)
)

View File

@@ -74,9 +74,6 @@
}, },
"awake": { "awake": {
"name": "Awake" "name": "Awake"
},
"base_on": {
"name": "Base station on"
} }
}, },
"sensor": { "sensor": {
@@ -116,6 +113,11 @@
"movementbucket": { "movementbucket": {
"name": "Movement bucket" "name": "Movement bucket"
} }
},
"switch": {
"base_on": {
"name": "Base station on"
}
} }
} }
} }

View File

@@ -0,0 +1,58 @@
"""Support for Owlet switches."""
from __future__ import annotations
from dataclasses import dataclass
from datetime import timedelta
from typing import Any
from homeassistant.config_entries import ConfigEntry
from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
from homeassistant.core import HomeAssistant
from homeassistant.helpers.entity_platform import AddEntitiesCallback
from .const import DOMAIN
from .coordinator import OwletCoordinator
from .entity import OwletBaseEntity
SCAN_INTERVAL = timedelta(seconds=5)
PARALLEL_UPDATES = 0
async def async_setup_entry(
hass: HomeAssistant,
config_entry: ConfigEntry,
async_add_entities: AddEntitiesCallback,
) -> None:
"""Set up Owlet switch based on a config entry."""
coordinators: OwletCoordinator = hass.data[DOMAIN][config_entry.entry_id].values()
switches = []
for coordinator in coordinators:
switches.append(OwletBaseSwitch(coordinator))
async_add_entities(switches)
class OwletBaseSwitch(OwletBaseEntity, SwitchEntity):
"""Defines a Owlet switch."""
_attr_has_entity_name = True
_attr_translation_key = "base_on"
def __init__(self, coordinator: OwletCoordinator) -> None:
"""Initialize ecobee ventilator platform."""
super().__init__(coordinator)
self._attr_unique_id = f"{self.sock.serial}-base_station_on"
self._attr_is_on = False
@property
def is_on(self):
return self.sock.properties["base_station_on"]
async def async_turn_on(self, **kwargs: Any) -> None:
"""Turn on the switch."""
await self.sock.control_base_station(True)
async def async_turn_off(self, **kwargs: Any) -> None:
"""Turn off the switch."""
await self.sock.control_base_station(False)

View File

@@ -5,18 +5,18 @@
"data": { "data": {
"region": "Region", "region": "Region",
"username": "Email", "username": "Email",
"password": "[%key:common::config_flow::data::password%]" "password": "Password"
} }
}, },
"reauth_confirm": { "reauth_confirm": {
"title": "Reauthentiaction required for Owlet", "title": "Reauthentiaction required for Owlet",
"data": { "data": {
"password": "[%key:common::config_flow::data::password%]" "password": "Password"
} }
} }
}, },
"error": { "error": {
"cannot_connect": "[%key:common::config_flow::error::cannot_connect%]", "cannot_connect": "Failed to connect",
"invalid_email": "Entered email address is incorrect", "invalid_email": "Entered email address is incorrect",
"invalid_password": "Entered password is incorrect", "invalid_password": "Entered password is incorrect",
"invalid_credentials": "Entered credentials are incorrect", "invalid_credentials": "Entered credentials are incorrect",
@@ -74,9 +74,6 @@
}, },
"awake": { "awake": {
"name": "Awake" "name": "Awake"
},
"base_on": {
"name": "Base station on"
} }
}, },
"sensor": { "sensor": {
@@ -116,6 +113,11 @@
"movementbucket": { "movementbucket": {
"name": "Movement bucket" "name": "Movement bucket"
} }
},
"switch": {
"base_on": {
"name": "Base station on"
}
} }
} }
} }

View File

@@ -5,18 +5,18 @@
"data": { "data": {
"region": "Région", "region": "Région",
"username": "Email", "username": "Email",
"password": "[%key:common::config_flow::data::password%]" "password": "Mot de passe"
} }
}, },
"reauth_confirm": { "reauth_confirm": {
"title": "Réauthentification requise pour Owlet", "title": "Réauthentification requise pour Owlet",
"data": { "data": {
"password": "[%key:common::config_flow::data::password%]" "password": "Mot de passe"
} }
} }
}, },
"error": { "error": {
"cannot_connect": "[%key:common::config_flow::error::cannot_connect%]", "cannot_connect": "N'a pas réussi à se connecter",
"invalid_email": "L'adresse e-mail saisie est incorrecte", "invalid_email": "L'adresse e-mail saisie est incorrecte",
"invalid_password": "Le mot de passe saisi est incorrect", "invalid_password": "Le mot de passe saisi est incorrect",
"invalid_credentials": "Les informations d'identification saisies sont incorrectes", "invalid_credentials": "Les informations d'identification saisies sont incorrectes",
@@ -74,9 +74,6 @@
}, },
"awake": { "awake": {
"name": "Réveillé" "name": "Réveillé"
},
"base_on": {
"name": "Station de base allumée"
} }
}, },
"sensor": { "sensor": {
@@ -116,6 +113,11 @@
"movementbucket": { "movementbucket": {
"name": "Seuil de mouvement" "name": "Seuil de mouvement"
} }
},
"switch": {
"base_on": {
"name": "Station de base allumée"
}
} }
} }
} }

View File

@@ -5,18 +5,18 @@
"data": { "data": {
"region": "Region", "region": "Region",
"username": "Email", "username": "Email",
"password": "[%key:common::config_flow::data::password%]" "password": "Password"
} }
}, },
"reauth_confirm": { "reauth_confirm": {
"title": "Reauthentiaction required for Owlet", "title": "Reauthentiaction required for Owlet",
"data": { "data": {
"password": "[%key:common::config_flow::data::password%]" "password": "Password"
} }
} }
}, },
"error": { "error": {
"cannot_connect": "[%key:common::config_flow::error::cannot_connect%]", "cannot_connect": "Failed to connect",
"invalid_email": "Entered email address is incorrect", "invalid_email": "Entered email address is incorrect",
"invalid_password": "Entered password is incorrect", "invalid_password": "Entered password is incorrect",
"invalid_credentials": "Entered credentials are incorrect", "invalid_credentials": "Entered credentials are incorrect",
@@ -74,9 +74,6 @@
}, },
"awake": { "awake": {
"name": "Awake" "name": "Awake"
},
"base_on": {
"name": "Base station on"
} }
}, },
"sensor": { "sensor": {
@@ -116,6 +113,11 @@
"movementbucket": { "movementbucket": {
"name": "Movement bucket" "name": "Movement bucket"
} }
},
"switch": {
"base_on": {
"name": "Base station on"
}
} }
} }
} }