Added reauth flow, much better error handling on setup

### Feature * Now supports reauthentication if credentials have expired/no longer work * Better error handling when configuring integration, will notify user of incorrect credentials ### Fix * Removed Owlet specific constants, now using homeassistant generic constants * On initialisation the integration would crash when trying to update the auth token, the integration would then have to be deleted and setup again
2023-05-12 16:58:50 +01:00
32 changed files with 344 additions and 6371 deletions
--- a/.github/workflows/cron.yml
+++ b/.github/workflows/cron.yml
@@ -1,25 +0,0 @@
-name: Validate with hassfest
-
-on:
-  push:
-  pull_request:
-  schedule:
-    - cron:  '0 0 * * *'
-
-jobs:
-  hassfest:
-    name: "Hassfest validation"
-    runs-on: "ubuntu-latest"
-    steps:
-        - uses: "actions/checkout@v3"
-        - uses: "home-assistant/actions/hassfest@master"
-  hacs:
-    name: "HACS Action"
-    runs-on: "ubuntu-latest"
-    steps:
-      - name: "HACS Action"
-        uses: "hacs/action@main"
-        with:
-            category: "integration"
-        
-        
--- a/.gitignore
+++ b/.gitignore
@@ -152,4 +152,3 @@ cython_debug/
 #.idea/

 /custom_components/owlet.zip
-custom_components/owlet/owlet.zip
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,128 +1,6 @@
 # Changelog

 <!--next-version-placeholder-->
-## 2025.4.3 (2025-04-15)
-### Fix
-* Changes to how the sensors are stored to solve the issue where only one device is added, thanks [`@MarjovanLier`](https://github.com/MarjovanLier). ([`1244bff`](https://github.com/ryanbdclark/owlet/commit/1244bffcb48d7337a9d7a0da518959fe4b31a230))
-
-## 2025.4.2 (2025-04-14)
-### Fix
-* Bumping pyowletapi to 2025.4.1, should hopefully stop issue where only one device was added to HA. ([`d323cbf`](https://github.com/ryanbdclark/owlet/commit/d323cbfd11411ff34866ead492de10c109c72689))
-
-## 2025.4.1 (2025-04-11)
-### Fix
-* Changes to stop errors after refactoring pyowletapi ([`6b343a7`](https://github.com/ryanbdclark/owlet/commit/6b343a76caad3375e10c80f4d26942a1bbbb831d))
-
-## 2025.4.0 (2025-04-11)
-### Fix
-* Bumping pyowletapi to 2025.4.0 ([`268365c`](https://github.com/ryanbdclark/owlet/commit/268365ccd428418dd5707f0569ce738b54a12fdd))
-
-## 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)
-### Feature
-* Now includes French translation, thanks [`@Julien80`](https://github.com/Julien80) ([`f3c853e`](https://github.com/ryanbdclark/owlet/commit/f3c853e2d7243d766889f2d18c718819da30e4be))
-
-## 2024.6.1 (2024-06-17)
-### Fix
-* Bumping pyowletapi to 2024.6.1 to resolve setup errors ([`52710ba`](https://github.com/ryanbdclark/owlet/commit/52710ba7de53fd07195537c2a5fd2f95bc7dfd1a))
-
-## 2024.5.1 (2024-05-13)
-### Feature
-* As per HA core patterns, certain sensors will now show as unavailable when sock is charging ([`ceade24`](https://github.com/ryanbdclark/owlet/commit/ceade24851479b8c9bc60b7b8bed74a7bdb927e9))
-* Oxygen 10 minute average now only shows a figure if it is between 0 and 100 this avoids skewing by 255 values before the 10 minutes is reached, thanks @coreywillwhat ([`5e17ecd`](https://github.com/ryanbdclark/owlet/commit/5e17ecdeb2aca5bbb35f19ca5795a2c5e0f776ab))
-### Fix
-* Refactoring as per core maintainers suggestions ([`ceade24`](https://github.com/ryanbdclark/owlet/commit/ceade24851479b8c9bc60b7b8bed74a7bdb927e9))
-
-
-## 2024.3.1
-### Feature
-* Base station on added as binary sensor ([`50c55dc`](https://github.com/ryanbdclark/owlet/commit/50c55dcfd30d15027155a8f1d05340238501522d))
-
-### Fix
-* Bumping pyowletapi to 2024.3.2 ([`50c55dc`](https://github.com/ryanbdclark/owlet/commit/50c55dcfd30d15027155a8f1d05340238501522d))
-* UI config now allows you to set interval to 5 seconds, previously the minimum was 10 ([`50c55dc`](https://github.com/ryanbdclark/owlet/commit/50c55dcfd30d15027155a8f1d05340238501522d))
-
-## 2023.11.2 (2023-11-23)
-### Feature
-* Support added for V2 sock ([`50fe1a8`](https://github.com/ryanbdclark/owlet/commit/50fe1a87656b7d6413d06f06f3650fd0bfb48e02))
-* Added tests for binary sensors ([`50fe1a8`](https://github.com/ryanbdclark/owlet/commit/50fe1a87656b7d6413d06f06f3650fd0bfb48e02))
-### Fix
-* Bumping pyowletapi to 2023.11.4 to allow V2 support ([`50fe1a8`](https://github.com/ryanbdclark/owlet/commit/50fe1a87656b7d6413d06f06f3650fd0bfb48e02))
-* Refactoring ([`50fe1a8`](https://github.com/ryanbdclark/owlet/commit/50fe1a87656b7d6413d06f06f3650fd0bfb48e02))
-* Corrected spelling of sock disconnected sensor ([`50fe1a8`](https://github.com/ryanbdclark/owlet/commit/50fe1a87656b7d6413d06f06f3650fd0bfb48e02))
-
-## 2023.11.1 (2023-11-16)
-### Fix
-* Bumping pyowletapi to 2023.11.1 ([`3acf847`](https://github.com/ryanbdclark/owlet/commit/3acf8473526665382b44ef6325d708a6c62fff45))
-* Sensors and binary sensors are now only created where the sock contains that property, this stops errors where different sock versions have different properties ([`3acf847`](https://github.com/ryanbdclark/owlet/commit/3acf8473526665382b44ef6325d708a6c62fff45))
-
-## 2023.9.1 (2023-09-20)
-### Fix
-* Bumping pyowletapi to 2023.9.1 to allow for revisions ([`0a7f703`](https://github.com/ryanbdclark/owlet/commit/0a7f70310080a129c988e9607331baa2f6c691e0))
-* New revision of sock, revision 5 doesn't report all vitals as before, this would cause the integration to fail to update. Have adjusted the integration to detect the revision and ignore the vitals that are no longer reported ([`0a7f703`](https://github.com/ryanbdclark/owlet/commit/0a7f70310080a129c988e9607331baa2f6c691e0))
-
-
-## 2023.8.1 (2023-08-21)
-### Feature
-* 2 new sensors, movement and movement bucket disabled by default, thanks [`@seanford`](https://github.com/seanford) ([`575b213`](https://github.com/ryanbdclark/owlet/commit/575b213ddd732779cd7938e575fc87c8881a69b0))
-
-### Fix
-* Various refactoring tasks completed to make this integration more inline with home assistants style guidelines ([`2cd46c1`](https://github.com/ryanbdclark/owlet/commit/c45959b123a6e5f77747475f11d3d3ab67859756))
-* Added new sensors to strings jsons ([`2cd46c1`](https://github.com/ryanbdclark/owlet/commit/c45959b123a6e5f77747475f11d3d3ab67859756))
-
-## 2023.7.2 (2023-07-04)
-### Fix
-* Bumping pyowletapi version to 2023.7.2 ([`c45959b`](https://github.com/ryanbdclark/owlet/commit/c45959b123a6e5f77747475f11d3d3ab67859756))
-
-## 2023.7.1 (2023-07-03)
-### Fix
-*  Bumping pyowletapi to 2023.7.1 ([`c693fef`](https://github.com/ryanbdclark/owlet/commit/c693fefbf3dba8f35802b87d064401dadbb211b5))
-  
-## 2023.5.7 (2023-05-30)
-### Fix
-* Fixed issue with binary sensors not loading, caused by change to way the coordinators are stored ([`8d17317`](https://github.com/ryanbdclark/owlet/commit/8d173174e286b0451cbb2c0d4ae3087028d1ea23))
-
-## 2023.5.6 (2023-05-30)
-### Fix
-* In light of submitting this as a pull request to the core of HA there have been some refactoring changes to comply with HA's style requirements
-* Sensor names now moved to strings file to allow for translations
-* Coordinator now properly handles multiple devices
-* Spelling of signal strength sensor corrected
-
-### Feature
-* Tests added
-
-## 2023.5.5 (2023-05-19)
-#### Fix
-* Owlet refresh token becomes invalid after 24 hours. Meant that after 1 day the integration would stop working. Moved to pyowletapi v2023.5.28 which uses different refresh token, should no longer need reconfiguring after 24 hours ([`dc58b19`](https://github.com/ryanbdclark/owlet/commit/0141f7d01a9ac9b3e1dcc74cabb896e19bd4a821))
-
-## 2023.5.4 (2023-05-17)
-#### Fix
-* Bumping to pyowletapi 2023.5.25
-
-## 2023.5.3 (2023-05-17)
-#### Fix
-* Bumping to pyowletapi 2023.5.24
-* Reauthing now no longer re adds users' password to config entry
-
-## 2023.5.2 (2023-05-16)
-#### Feature
-* Integration now makes use of refresh token from pyowletapi to reauthenticate, user password in no longer stored by integration ([`dc710a1`](https://github.com/ryanbdclark/owlet/commit/dc710a1783a4cad9d6cf355240fe12ac779a87ef))
-* New sensors create for baby sleep state ([`9b3392b`](https://github.com/ryanbdclark/owlet/commit/9b3392bdbcd82015ed31d3a50a517e4e22905684))
- 
-## 2023.5.1 (2023-05-15)
-#### Feature
-* Changed versioning to date based
-### Fix
-* Bumping to pyowletapi 2023.5.21 to fix issue with unawaited authentication call, should resolve issue with refreshing authentication ([`228d54b`](https://github.com/ryanbdclark/owlet/commit/228d54b6414e0b9171064254246d1f36c3af8f5b))
-

 ## v1.5.0 (2023-05-12)
 ### Feature
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 # Owlet Custom Integration

 [![GitHub Release][releases-shield]][releases]
+![GitHub all releases][download-all]
+![GitHub release (latest by RyanClark123)][download-latest]
 [![GitHub Activity][commits-shield]][commits]

 [![License][license-shield]][license]
@@ -8,11 +10,13 @@
 [![hacs][hacsbadge]][hacs]
 [![Project Maintenance][maintenance-shield]][user_profile]

-A custom component for the Owlet smart sock
+A custom component for the Owlet smart sock, currently this only supports the owlet smart sock 3.
+
+If you have a smart sock 2 and would like to contribute then please do so.

 ## Installation

-1. Use [HACS](https://hacs.xyz/docs/use/download/download/), in `HACS > Integrations > Explore & Add Repositories` search for "Owlet".
+1. Use [HACS](https://hacs.xyz/docs/setup/download), in `HACS > Integrations > Explore & Add Repositories` search for "Owlet". After adding this `https://github.com/RyanClark123/owlet` as a custom repository.
 2. Restart Home Assistant.
 3. [![Add Integration][add-integration-badge]][add-integration] or in the HA UI go to "Settings" -> "Devices & Services" then click "+" and search for "Owlet Smart Sock".

@@ -30,19 +34,21 @@ This integration provides the following entities:

 ## Options

- Seconds between polling - Number of seconds between each call for data from the owlet cloud service, default is 5 seconds.
+- Seconds between polling - Number of seconds between each call for data from the owlet cloud service, default is 10 seconds.

 ---

-[commits-shield]: https://img.shields.io/github/commit-activity/w/ryanbdclark/owlet?style=for-the-badge
-[commits]: https://github.com/ryanbdclark/owlet/commits/main
+[commits-shield]: https://img.shields.io/github/commit-activity/w/RyanClark123/owlet?style=for-the-badge
+[commits]: https://github.com/RyanClark123/owlet/commits/main
 [hacs]: https://github.com/hacs/integration
 [hacsbadge]: https://img.shields.io/badge/HACS-Custom-orange.svg?style=for-the-badge
 [license]: LICENSE
-[license-shield]: https://img.shields.io/github/license/ryanbdclark/owlet.svg?style=for-the-badge
-[maintenance-shield]: https://img.shields.io/badge/maintainer-Ryan%20Clark%20%40ryanbdclark-blue.svg?style=for-the-badge
-[releases-shield]: https://img.shields.io/github/release/ryanbdclark/owlet.svg?style=for-the-badge
-[releases]: https://github.com/ryanbdclark/owlet/releases
-[user_profile]: https://github.com/ryanbdclark
+[license-shield]: https://img.shields.io/github/license/RyanClark123/owlet.svg?style=for-the-badge
+[maintenance-shield]: https://img.shields.io/badge/maintainer-Ryan%20Clark%20%40RyanClark123-blue.svg?style=for-the-badge
+[releases-shield]: https://img.shields.io/github/release/RyanClark123/owlet.svg?style=for-the-badge
+[releases]: https://github.com/RyanClark123/owlet/releases
+[user_profile]: https://github.com/RyanClark123
+[download-all]: https://img.shields.io/github/downloads/RyanClark123/Owlet/total?style=for-the-badge
+[download-latest]: https://img.shields.io/github/downloads/RyanClark123/Owlet/latest/total?style=for-the-badge
 [add-integration]: https://my.home-assistant.io/redirect/config_flow_start?domain=owlet
 [add-integration-badge]: https://my.home-assistant.io/badges/config_flow_start.svg
--- a/custom_components/owlet/init.py
+++ b/custom_components/owlet/init.py
@@ -1,36 +1,31 @@
 """The Owlet Smart Sock integration."""
-
 from __future__ import annotations

-import asyncio
 import logging

 from pyowletapi.api import OwletAPI
-from pyowletapi.exceptions import (
-    OwletAuthenticationError,
-    OwletConnectionError,
-    OwletDevicesError,
-    OwletEmailError,
-    OwletPasswordError,
-)
 from pyowletapi.sock import Sock
+from pyowletapi.exceptions import OwletConnectionError

-from homeassistant.config_entries import ConfigEntry
+from homeassistant.config_entries import ConfigEntry, ConfigEntryAuthFailed
 from homeassistant.const import (
-    CONF_API_TOKEN,
-    CONF_REGION,
-    CONF_SCAN_INTERVAL,
-    CONF_USERNAME,
    Platform,
+    CONF_REGION,
+    CONF_USERNAME,
+    CONF_PASSWORD,
+    CONF_SCAN_INTERVAL,
+    CONF_API_TOKEN,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-
-from .const import CONF_OWLET_EXPIRY, CONF_OWLET_REFRESH, DOMAIN, SUPPORTED_VERSIONS
+from .const import (
+    DOMAIN,
+    CONF_OWLET_EXPIRY,
+    SUPPORTED_VERSIONS,
+)
 from .coordinator import OwletCoordinator

-PLATFORMS: list[Platform] = [Platform.BINARY_SENSOR, Platform.SENSOR, Platform.SWITCH]
+PLATFORMS: list[Platform] = [Platform.BINARY_SENSOR, Platform.SENSOR]

 _LOGGER = logging.getLogger(__name__)

@@ -40,55 +35,39 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
    hass.data.setdefault(DOMAIN, {})

    owlet_api = OwletAPI(
-        region=entry.data[CONF_REGION],
-        token=entry.data[CONF_API_TOKEN],
-        expiry=entry.data[CONF_OWLET_EXPIRY],
-        refresh=entry.data[CONF_OWLET_REFRESH],
-        session=async_get_clientsession(hass),
+        entry.data[CONF_REGION],
+        entry.data[CONF_USERNAME],
+        entry.data[CONF_PASSWORD],
+        entry.data[CONF_API_TOKEN],
+        entry.data[CONF_OWLET_EXPIRY],
+        async_get_clientsession(hass),
    )

    try:
-        if token := await owlet_api.authenticate():
+        token = await owlet_api.authenticate()
+
+        if token:
            hass.config_entries.async_update_entry(entry, data={**entry.data, **token})

-        devices = await owlet_api.get_devices(SUPPORTED_VERSIONS)
+        socks = {
+            device["device"]["dsn"]: Sock(owlet_api, device["device"])
+            for device in await owlet_api.get_devices(SUPPORTED_VERSIONS)
+        }

-    except (OwletAuthenticationError, OwletEmailError, OwletPasswordError) as err:
+    except OwletConnectionError as err:
        _LOGGER.error("Credentials no longer valid, please setup owlet again")
        raise ConfigEntryAuthFailed(
            f"Credentials expired for {entry.data[CONF_USERNAME]}"
        ) from err

-    except OwletConnectionError as err:
-        raise ConfigEntryNotReady(
-            f"Error connecting to {entry.data[CONF_USERNAME]}"
-        ) from err
+    coordinators = [
+        OwletCoordinator(hass, sock, entry.options.get(CONF_SCAN_INTERVAL))
+        for sock in socks.values()
+    ]

-    except OwletDevicesError:
-        _LOGGER.error("No owlet devices found to set up")
-        return False
-
-    if "tokens" in devices:
-        hass.config_entries.async_update_entry(
-            entry, data={**entry.data, **devices["tokens"]}
-        )
-
-    scan_interval = entry.options.get(CONF_SCAN_INTERVAL)
-    coordinators = {
-        device["device"]["dsn"]: OwletCoordinator(
-            hass, Sock(owlet_api, device["device"]), scan_interval, entry
-        )
-        for device in devices["response"]
-    }
-
-    await asyncio.gather(
-        *(
-            coordinator.async_config_entry_first_refresh()
-            for coordinator in list(coordinators.values())
-        )
-    )
-
-    hass.data[DOMAIN][entry.entry_id] = coordinators
+    for coordinator in coordinators:
+        await coordinator.async_config_entry_first_refresh()
+        hass.data[DOMAIN][entry.entry_id] = coordinator

    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)

--- a/custom_components/owlet/binary_sensor.py
+++ b/custom_components/owlet/binary_sensor.py
@@ -1,5 +1,4 @@
 """Support for Owlet binary sensors."""
-
 from __future__ import annotations

 from dataclasses import dataclass
@@ -18,79 +17,74 @@ from .coordinator import OwletCoordinator
 from .entity import OwletBaseEntity


-@dataclass(kw_only=True)
-class OwletBinarySensorEntityDescription(BinarySensorEntityDescription):
-    """Represent the owlet binary sensor entity description."""
+@dataclass
+class OwletBinarySensorEntityMixin:
+    """Owlet binary sensor element mixin"""

-    available_during_charging: bool
+    element: str
+
+
+@dataclass
+class OwletBinarySensorEntityDescription(
+    BinarySensorEntityDescription, OwletBinarySensorEntityMixin
+):
+    """Represent the owlet binary sensor entity description."""


 SENSORS: tuple[OwletBinarySensorEntityDescription, ...] = (
    OwletBinarySensorEntityDescription(
        key="charging",
-        translation_key="charging",
+        name="Charging",
        device_class=BinarySensorDeviceClass.BATTERY_CHARGING,
-        available_during_charging=True,
+        element="charging",
    ),
    OwletBinarySensorEntityDescription(
-        key="high_heart_rate_alert",
-        translation_key="high_hr_alrt",
+        key="highhr",
+        name="High heart rate alert",
        device_class=BinarySensorDeviceClass.SOUND,
-        available_during_charging=True,
+        element="high_heart_rate_alert",
    ),
    OwletBinarySensorEntityDescription(
-        key="low_heart_rate_alert",
-        translation_key="low_hr_alrt",
+        key="lowhr",
+        name="Low Heart Rate Alert",
        device_class=BinarySensorDeviceClass.SOUND,
-        available_during_charging=True,
+        element="low_heart_rate_alert",
    ),
    OwletBinarySensorEntityDescription(
-        key="high_oxygen_alert",
-        translation_key="high_ox_alrt",
+        key="higho2",
+        name="High oxygen alert",
        device_class=BinarySensorDeviceClass.SOUND,
-        available_during_charging=True,
+        element="high_oxygen_alert",
    ),
    OwletBinarySensorEntityDescription(
-        key="low_oxygen_alert",
-        translation_key="low_ox_alrt",
+        key="lowo2",
+        name="Low oxygen alert",
        device_class=BinarySensorDeviceClass.SOUND,
-        available_during_charging=True,
+        element="low_oxygen_alert",
    ),
    OwletBinarySensorEntityDescription(
-        key="critical_oxygen_alert",
-        translation_key="crit_ox_alrt",
+        key="lowbattery",
+        name="Low Battery alert",
        device_class=BinarySensorDeviceClass.SOUND,
-        available_during_charging=True,
+        element="low_battery_alert",
    ),
    OwletBinarySensorEntityDescription(
-        key="low_battery_alert",
-        translation_key="low_batt_alrt",
+        key="lostpower",
+        name="Lost power alert",
        device_class=BinarySensorDeviceClass.SOUND,
-        available_during_charging=True,
+        element="lost_power_alert",
    ),
    OwletBinarySensorEntityDescription(
-        key="critical_battery_alert",
-        translation_key="crit_batt_alrt",
+        key="sockdisconnected",
+        name="Sock disconnected alert",
        device_class=BinarySensorDeviceClass.SOUND,
-        available_during_charging=True,
-    ),
-    OwletBinarySensorEntityDescription(
-        key="lost_power_alert",
-        translation_key="lost_pwr_alrt",
-        device_class=BinarySensorDeviceClass.SOUND,
-        available_during_charging=True,
-    ),
-    OwletBinarySensorEntityDescription(
-        key="sock_disconnected",
-        translation_key="sock_discon_alrt",
-        device_class=BinarySensorDeviceClass.SOUND,
-        available_during_charging=True,
+        element="sock_disconnected",
    ),
    OwletBinarySensorEntityDescription(
        key="sock_off",
-        translation_key="sock_off",
+        name="Sock off",
        device_class=BinarySensorDeviceClass.POWER,
-        available_during_charging=True,
+        element="sock_off",
    ),
 )

@@ -102,20 +96,11 @@ async def async_setup_entry(
 ) -> None:
    """Set up the owlet sensors from config entry."""

-    coordinators: OwletCoordinator = hass.data[DOMAIN][config_entry.entry_id].values()
+    coordinator: OwletCoordinator = hass.data[DOMAIN][config_entry.entry_id]

-    sensors = []
-    for coordinator in coordinators:
-        sensors.extend([
-            OwletBinarySensor(coordinator, sensor)
-            for sensor in SENSORS
-            if sensor.key in coordinator.sock.properties
-        ])
+    entities = [OwletBinarySensor(coordinator, sensor) for sensor in SENSORS]

-        if OwletAwakeSensor.entity_description.key in coordinator.sock.properties:
-            sensors.append(OwletAwakeSensor(coordinator))
-
-    async_add_entities(sensors)
+    async_add_entities(entities)


 class OwletBinarySensor(OwletBaseEntity, BinarySensorEntity):
@@ -124,46 +109,14 @@ class OwletBinarySensor(OwletBaseEntity, BinarySensorEntity):
    def __init__(
        self,
        coordinator: OwletCoordinator,
-        description: OwletBinarySensorEntityDescription,
+        sensor_description: OwletBinarySensorEntityDescription,
    ) -> None:
        """Initialize the binary sensor."""
        super().__init__(coordinator)
-        self.entity_description = description
-        self._attr_unique_id = f"{self.sock.serial}-{description.key}"
-
-    @property
-    def available(self) -> bool:
-        """Return if entity is available."""
-        return super().available and (
-            not self.sock.properties["charging"]
-            or self.entity_description.available_during_charging
-        )
+        self.entity_description = sensor_description
+        self._attr_unique_id = f"{self.sock.serial}-{self.entity_description.name}"

    @property
    def is_on(self) -> bool:
        """Return true if the binary sensor is on."""
-
-        return self.sock.properties[self.entity_description.key]
-
-
-class OwletAwakeSensor(OwletBinarySensor):
-    """Representation of an Owlet sleep sensor."""
-
-    entity_description = OwletBinarySensorEntityDescription(
-        key="sleep_state",
-        translation_key="awake",
-        icon="mdi:sleep",
-        available_during_charging=False,
-    )
-
-    def __init__(
-        self,
-        coordinator: OwletCoordinator,
-    ) -> None:
-        """Initialize the sensor."""
-        super().__init__(coordinator, self.entity_description)
-
-    @property
-    def is_on(self) -> bool:
-        """Return true if the binary sensor is on."""
-        return self.sock.properties[self.entity_description.key] not in [8, 15]
+        return self.sock.properties[self.entity_description.element]
--- a/custom_components/owlet/config_flow.py
+++ b/custom_components/owlet/config_flow.py
@@ -1,40 +1,46 @@
 """Config flow for Owlet Smart Sock integration."""
-
 from __future__ import annotations

-from collections.abc import Mapping
 import logging
 from typing import Any

 from pyowletapi.api import OwletAPI
+from pyowletapi.sock import Sock
 from pyowletapi.exceptions import (
-    OwletCredentialsError,
    OwletDevicesError,
    OwletEmailError,
    OwletPasswordError,
 )
+
 import voluptuous as vol

 from homeassistant import config_entries, exceptions
-from homeassistant.config_entries import ConfigEntry, ConfigFlowResult
-from homeassistant.const import (
-    CONF_PASSWORD,
-    CONF_REGION,
-    CONF_SCAN_INTERVAL,
-    CONF_USERNAME,
-)
-from homeassistant.core import callback
+from homeassistant.data_entry_flow import FlowResult
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.core import callback
+from homeassistant.const import (
+    CONF_REGION,
+    CONF_USERNAME,
+    CONF_PASSWORD,
+    CONF_SCAN_INTERVAL,
+    CONF_API_TOKEN,
+)

-from .const import DOMAIN, POLLING_INTERVAL
+from .const import (
+    DOMAIN,
+    CONF_OWLET_EXPIRY,
+    POLLING_INTERVAL,
+    SUPPORTED_VERSIONS,
+)

 _LOGGER = logging.getLogger(__name__)

 STEP_USER_DATA_SCHEMA = vol.Schema(
    {
-        vol.Required(CONF_REGION): vol.In(["europe", "world"]),
-        vol.Required(CONF_USERNAME): str,
-        vol.Required(CONF_PASSWORD): str,
+        vol.Required("region"): vol.In(["europe", "world"]),
+        vol.Required("username"): str,
+        vol.Required("password"): str,
    }
 )

@@ -43,52 +49,60 @@ class OwletConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
    """Handle a config flow for Owlet Smart Sock."""

    VERSION = 1
-    reauth_entry: ConfigEntry | None = None

    def __init__(self) -> None:
-        """Initialise config flow."""
+        self._entry: ConfigEntry
+        self._region: str
+        self._username: str
+        self._password: str
+        self._devices: dict[str, Sock]
+        self.reauth_entry: ConfigEntry | None = None

    async def async_step_user(
        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
+    ) -> FlowResult:
        """Handle the initial step."""
        errors: dict[str, str] = {}
        if user_input is not None:
+            self._region = user_input[CONF_REGION]
+            self._username = user_input[CONF_USERNAME]
+            self._password = user_input[CONF_PASSWORD]
+
            owlet_api = OwletAPI(
-                region=user_input[CONF_REGION],
-                user=user_input[CONF_USERNAME],
-                password=user_input[CONF_PASSWORD],
+                self._region,
+                self._username,
+                self._password,
                session=async_get_clientsession(self.hass),
            )

-            await self.async_set_unique_id(user_input[CONF_USERNAME].lower())
+            await self.async_set_unique_id(self._username.lower())
            self._abort_if_unique_id_configured()

            try:
                token = await owlet_api.authenticate()
-                await owlet_api.validate_authentication()
-
-            except OwletDevicesError:
-                errors["base"] = "no_devices"
-            except OwletEmailError:
-                errors[CONF_USERNAME] = "invalid_email"
-            except OwletPasswordError:
-                errors[CONF_PASSWORD] = "invalid_password"
-            except OwletCredentialsError:
-                errors["base"] = "invalid_credentials"
-            except Exception:  # pylint: disable=broad-except
-                _LOGGER.exception("Unexpected exception")
-                errors["base"] = "unknown"
-            else:
+                try:
+                    await owlet_api.get_devices(SUPPORTED_VERSIONS)
                    return self.async_create_entry(
-                    title=user_input[CONF_USERNAME],
+                        title=self._username,
                        data={
-                        CONF_REGION: user_input[CONF_REGION],
-                        CONF_USERNAME: user_input[CONF_USERNAME],
-                        **token,
+                            CONF_REGION: self._region,
+                            CONF_USERNAME: self._username,
+                            CONF_PASSWORD: self._password,
+                            CONF_API_TOKEN: token[CONF_API_TOKEN],
+                            CONF_OWLET_EXPIRY: token[CONF_OWLET_EXPIRY],
                        },
                        options={CONF_SCAN_INTERVAL: POLLING_INTERVAL},
                    )
+                except OwletDevicesError:
+                    errors["base"] = "no_devices"
+
+            except OwletEmailError:
+                errors["base"] = "invalid_email"
+            except OwletPasswordError:
+                errors["base"] = "invalid_password"
+            except Exception:  # pylint: disable=broad-except
+                _LOGGER.exception("Unexpected exception")
+                errors["base"] = "unknown"

        return self.async_show_form(
            step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors
@@ -96,23 +110,19 @@ class OwletConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):

    @staticmethod
    @callback
-    def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlowHandler:
+    def async_get_options_flow(config_entry):
        """Get the options flow for this handler."""
        return OptionsFlowHandler(config_entry)

-    async def async_step_reauth(
-        self, user_input: Mapping[str, Any]
-    ) -> ConfigFlowResult:
-        """Handle reauth."""
+    async def async_step_reauth(self, user_input=None):
+        """Handle reauth"""
        self.reauth_entry = self.hass.config_entries.async_get_entry(
            self.context["entry_id"]
        )
        return await self.async_step_reauth_confirm()

-    async def async_step_reauth_confirm(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Dialog that informs the user that reauth is required."""
+    async def async_step_reauth_confirm(self, user_input=None):
+        """Dialog that informs the user that reauth is required"""
        assert self.reauth_entry is not None
        errors: dict[str, str] = {}

@@ -125,21 +135,24 @@ class OwletConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
                session=async_get_clientsession(self.hass),
            )
            try:
-                if token := await owlet_api.authenticate():
+                token = await owlet_api.authenticate()
+                if token:
+                    user_input[CONF_API_TOKEN] = token[CONF_API_TOKEN]
+                    user_input[CONF_OWLET_EXPIRY] = token[CONF_OWLET_EXPIRY]
                self.hass.config_entries.async_update_entry(
-                        self.reauth_entry, data={**entry_data, **token}
+                    self.reauth_entry, data={**entry_data, **user_input}
                )

-                    await self.hass.config_entries.async_reload(
-                        self.reauth_entry.entry_id
-                    )
+                await self.hass.config_entries.async_reload(self.reauth_entry.entry_id)

                return self.async_abort(reason="reauth_successful")

+            except OwletEmailError:
+                errors["base"] = "invalid_email"
            except OwletPasswordError:
-                errors[CONF_PASSWORD] = "invalid_password"
+                errors["base"] = "invalid_password"
            except Exception:  # pylint: disable=broad-except
-                _LOGGER.exception("Error reauthenticating")
+                _LOGGER.exception("error reauthing")

        return self.async_show_form(
            step_id="reauth_confirm",
@@ -149,16 +162,14 @@ class OwletConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):


 class OptionsFlowHandler(config_entries.OptionsFlow):
-    """Handle a options flow for owlet."""
+    """Handle a options flow for owlet"""

-    def __init__(self, config_entry: ConfigEntry) -> None:
-        """Initialise options flow."""
+    def __init__(self, config_entry: config_entries.ConfigEntry) -> None:
+        """Initialise options flow"""
        self.config_entry = config_entry

-    async def async_step_init(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle options flow."""
+    async def async_step_init(self, user_input=None):
+        """Handle options flow"""
        if user_input is not None:
            return self.async_create_entry(title="", data=user_input)

@@ -167,7 +178,7 @@ class OptionsFlowHandler(config_entries.OptionsFlow):
                vol.Required(
                    CONF_SCAN_INTERVAL,
                    default=self.config_entry.options.get(CONF_SCAN_INTERVAL),
-                ): vol.All(vol.Coerce(int), vol.Range(min=5)),
+                ): vol.All(vol.Coerce(int), vol.Range(min=10)),
            }
        )

@@ -175,4 +186,4 @@ class OptionsFlowHandler(config_entries.OptionsFlow):


 class InvalidAuth(exceptions.HomeAssistantError):
-    """Error to indicate there is invalid auth."""
+    """Error to indiciate there is invalud auth"""
--- a/custom_components/owlet/const.py
+++ b/custom_components/owlet/const.py
@@ -3,9 +3,7 @@
 DOMAIN = "owlet"

 CONF_OWLET_EXPIRY = "expiry"
-CONF_OWLET_REFRESH = "refresh"

-SUPPORTED_VERSIONS = [2, 3]
-POLLING_INTERVAL = 5
+SUPPORTED_VERSIONS = [3]
+POLLING_INTERVAL = 10
 MANUFACTURER = "Owlet Baby Care"
-SLEEP_STATES = {0: "unknown", 1: "awake", 8: "light_sleep", 15: "deep_sleep"}
--- a/custom_components/owlet/coordinator.py
+++ b/custom_components/owlet/coordinator.py
@@ -1,23 +1,20 @@
-"""Owlet integration coordinator class."""
+"""Owlet integration."""
 from __future__ import annotations

 from datetime import timedelta
 import logging

-from pyowletapi.exceptions import (
-    OwletAuthenticationError,
-    OwletConnectionError,
-    OwletError,
-)
 from pyowletapi.sock import Sock
+from pyowletapi.exceptions import OwletError

-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_EMAIL
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryAuthFailed
+from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed

-from .const import DOMAIN
+from .const import (
+    DOMAIN,
+    MANUFACTURER,
+)

 _LOGGER = logging.getLogger(__name__)

@@ -25,9 +22,7 @@ _LOGGER = logging.getLogger(__name__)
 class OwletCoordinator(DataUpdateCoordinator):
    """Coordinator is responsible for querying the device at a specified route."""

-    def __init__(
-        self, hass: HomeAssistant, sock: Sock, interval, entry: ConfigEntry
-    ) -> None:
+    def __init__(self, hass: HomeAssistant, sock: Sock, interval: int) -> None:
        """Initialise a custom coordinator."""
        super().__init__(
            hass,
@@ -35,21 +30,24 @@ class OwletCoordinator(DataUpdateCoordinator):
            name=DOMAIN,
            update_interval=timedelta(seconds=interval),
        )
+        assert self.config_entry is not None
+        self._device_unique_id = sock.serial
+        self._model = sock.model
+        self._sw_version = sock.sw_version
+        self._hw_version = sock.version
        self.sock = sock
-        self.config_entry: ConfigEntry = entry
+        self.device_info = DeviceInfo(
+            identifiers={(DOMAIN, self._device_unique_id)},
+            name="Owlet Baby Care Sock",
+            manufacturer=MANUFACTURER,
+            model=self._model,
+            sw_version=self._sw_version,
+            hw_version=self._hw_version,
+        )

    async def _async_update_data(self) -> None:
        """Fetch the data from the device."""
        try:
-            properties = await self.sock.update_properties()
-            if "tokens" in properties:
-                self.hass.config_entries.async_update_entry(
-                    self.config_entry,
-                    data={**self.config_entry.data, **properties["tokens"]},
-                )
-        except OwletAuthenticationError as err:
-            raise ConfigEntryAuthFailed(
-                f"Authentication failed for {self.config_entry.data[CONF_EMAIL]}"
-            ) from err
-        except (OwletError, OwletConnectionError) as err:
+            await self.sock.update_properties()
+        except OwletError as err:
            raise UpdateFailed(err) from err
--- a/custom_components/owlet/entity.py
+++ b/custom_components/owlet/entity.py
@@ -1,38 +1,20 @@
 """Base class for Owlet entities."""

-from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.update_coordinator import CoordinatorEntity

-from .const import DOMAIN, MANUFACTURER
 from .coordinator import OwletCoordinator


 class OwletBaseEntity(CoordinatorEntity[OwletCoordinator], Entity):
    """Base class for Owlet Sock entities."""

-    _attr_has_entity_name = True
-
    def __init__(
        self,
        coordinator: OwletCoordinator,
    ) -> None:
        """Initialize the base entity."""
        super().__init__(coordinator)
-        self.coordinator = coordinator
        self.sock = coordinator.sock
-
-    @property
-    def device_info(self) -> DeviceInfo:
-        """Return the device info of the device."""
-        return DeviceInfo(
-            identifiers={(DOMAIN, self.sock.serial)},
-            name=f"Owlet Sock {self.sock.serial}",
-            connections={("mac", getattr(self.sock, "mac", "unknown"))},
-            suggested_area="Nursery",
-            configuration_url="https://my.owletcare.com/",
-            manufacturer="Owlet Baby Care",
-            model=getattr(self.sock, "model", None),
-            sw_version=getattr(self.sock, "sw_version", None),
-            hw_version=getattr(self.sock, "hw_version", "3r8"),
-        )
+        self._attr_device_info = coordinator.device_info
+        self._attr_has_entity_name = True
--- a/custom_components/owlet/manifest.json
+++ b/custom_components/owlet/manifest.json
@@ -2,14 +2,15 @@
  "domain": "owlet",
  "name": "Owlet Smart Sock",
  "codeowners": [
-    "@ryanbdclark"
+    "@RyanClark123"
  ],
  "config_flow": true,
-  "documentation":"https://github.com/ryanbdclark/owlet",
+  "dependencies": [],
+  "documentation": "https://www.home-assistant.io/integrations/owlet",
+  "homekit": {},
  "iot_class": "cloud_polling",
-  "issue_tracker": "https://github.com/ryanbdclark/owlet/issues",
  "requirements": [
-    "pyowletapi==2025.4.1"
+    "pyowletapi==2023.5.20"
  ],
-  "version": "2025.4.3"
+  "version":"1.5.0"
 }
--- a/custom_components/owlet/sensor.py
+++ b/custom_components/owlet/sensor.py
@@ -1,7 +1,5 @@
-"""Support for Owlet sensors."""
-
+"""Support for Android IP Webcam binary sensors."""
 from __future__ import annotations
-
 from dataclasses import dataclass

 from homeassistant.components.sensor import (
@@ -11,92 +9,90 @@ from homeassistant.components.sensor import (
    SensorStateClass,
 )
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.const import (
    PERCENTAGE,
    SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
-    UnitOfTemperature,
    UnitOfTime,
+    UnitOfTemperature,
 )
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import StateType

-from .const import DOMAIN, SLEEP_STATES
+from .const import DOMAIN
 from .coordinator import OwletCoordinator
 from .entity import OwletBaseEntity


-@dataclass(kw_only=True)
-class OwletSensorEntityDescription(SensorEntityDescription):
-    """Represent the owlet sensor entity description."""
+@dataclass
+class OwletSensorEntityDescriptionMixin:
+    """Owlet sensor description mix in"""

-    available_during_charging: bool
+    element: str
+
+
+@dataclass
+class OwletSensorEntityDescription(
+    SensorEntityDescription, OwletSensorEntityDescriptionMixin
+):
+    """Represent the owlet sensor entity description."""


 SENSORS: tuple[OwletSensorEntityDescription, ...] = (
    OwletSensorEntityDescription(
-        key="battery_percentage",
-        translation_key="batterypercent",
+        key="batterypercentage",
+        name="Battery",
        native_unit_of_measurement=PERCENTAGE,
        device_class=SensorDeviceClass.BATTERY,
        state_class=SensorStateClass.MEASUREMENT,
-        available_during_charging=True,
+        element="battery_percentage",
    ),
    OwletSensorEntityDescription(
-        key="oxygen_saturation",
-        translation_key="o2saturation",
+        key="oxygensaturation",
+        name="O2 Saturation",
        native_unit_of_measurement=PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
+        element="oxygen_saturation",
        icon="mdi:leaf",
-        available_during_charging=False,
    ),
    OwletSensorEntityDescription(
-        key="heart_rate",
-        translation_key="heartrate",
+        key="oxygensaturation10a",
+        name="O2 Saturation 10 Minute Average",
+        native_unit_of_measurement=PERCENTAGE,
+        state_class=SensorStateClass.MEASUREMENT,
+        element="oxygen_10_av",
+        icon="mdi:leaf",
+    ),
+    OwletSensorEntityDescription(
+        key="heartrate",
+        name="Heart rate",
        native_unit_of_measurement="bpm",
        state_class=SensorStateClass.MEASUREMENT,
+        element="heart_rate",
        icon="mdi:heart-pulse",
-        available_during_charging=False,
    ),
    OwletSensorEntityDescription(
-        key="battery_minutes",
-        translation_key="batterymin",
+        key="batteryminutes",
+        name="Battery Remaining",
        native_unit_of_measurement=UnitOfTime.MINUTES,
        device_class=SensorDeviceClass.DURATION,
        state_class=SensorStateClass.MEASUREMENT,
-        available_during_charging=False,
+        element="battery_minutes",
    ),
    OwletSensorEntityDescription(
-        key="signal_strength",
-        translation_key="signalstrength",
+        key="signalstrength",
+        name="Singal Strength",
        native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
        device_class=SensorDeviceClass.SIGNAL_STRENGTH,
        state_class=SensorStateClass.MEASUREMENT,
-        available_during_charging=True,
+        element="signal_strength",
    ),
    OwletSensorEntityDescription(
-        key="skin_temperature",
-        translation_key="skintemp",
+        key="skintemp",
+        name="Skin Temperature",
        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
        device_class=SensorDeviceClass.TEMPERATURE,
        state_class=SensorStateClass.MEASUREMENT,
-        available_during_charging=False,
-    ),
-    OwletSensorEntityDescription(
-        key="movement",
-        translation_key="movement",
-        state_class=SensorStateClass.MEASUREMENT,
-        icon="mdi:cursor-move",
-        entity_registry_enabled_default=False,
-        available_during_charging=False,
-    ),
-    OwletSensorEntityDescription(
-        key="movement_bucket",
-        translation_key="movementbucket",
-        state_class=SensorStateClass.MEASUREMENT,
-        icon="mdi:bucket-outline",
-        entity_registry_enabled_default=False,
-        available_during_charging=False,
+        element="skin_temperature",
    ),
 )

@@ -108,28 +104,11 @@ async def async_setup_entry(
 ) -> None:
    """Set up the owlet sensors from config entry."""

-    coordinators: list[OwletCoordinator] = list(
-        hass.data[DOMAIN][config_entry.entry_id].values()
-    )
+    coordinator: OwletCoordinator = hass.data[DOMAIN][config_entry.entry_id]

-    sensors = []
+    entities = [OwletSensor(coordinator, sensor) for sensor in SENSORS]

-    for coordinator in coordinators:
-        sensors.extend([
-            OwletSensor(coordinator, sensor)
-            for sensor in SENSORS
-            if sensor.key in coordinator.sock.properties
-        ])
-
-        if OwletSleepSensor.entity_description.key in coordinator.sock.properties:
-            sensors.append(OwletSleepSensor(coordinator))
-        if (
-            OwletOxygenAverageSensor.entity_description.key
-            in coordinator.sock.properties
-        ):
-            sensors.append(OwletOxygenAverageSensor(coordinator))
-
-    async_add_entities(sensors)
+    async_add_entities(entities)


 class OwletSensor(OwletBaseEntity, SensorEntity):
@@ -138,82 +117,28 @@ class OwletSensor(OwletBaseEntity, SensorEntity):
    def __init__(
        self,
        coordinator: OwletCoordinator,
-        description: OwletSensorEntityDescription,
+        sensor_description: OwletSensorEntityDescription,
    ) -> None:
        """Initialize the sensor."""
        super().__init__(coordinator)
-        self.entity_description: OwletSensorEntityDescription = description
-        self._attr_unique_id = f"{self.sock.serial}-{description.key}"
+        self.entity_description = sensor_description
+        self._attr_unique_id = f"{self.sock.serial}-{self.entity_description.name}"

    @property
-    def available(self) -> bool:
-        """Return if entity is available."""
-        return super().available and (
-            not self.sock.properties["charging"]
-            or self.entity_description.available_during_charging
-        )
+    def native_value(self):
+        """Return sensor value"""

-    @property
-    def native_value(self) -> StateType:
-        """Return sensor value."""
+        if (
+            self.entity_description.element
+            in [
+                "heart_rate",
+                "battery_minutes",
+                "oxygen_saturation",
+                "skin_temperature",
+                "oxygen_10_av",
+            ]
+            and self.sock.properties["charging"]
+        ):
+            return None

-        return self.sock.properties[self.entity_description.key]
-
-
-class OwletSleepSensor(OwletSensor):
-    """Representation of an Owlet sleep sensor."""
-
-    _attr_options = list(SLEEP_STATES.values())
-    entity_description = OwletSensorEntityDescription(
-        key="sleep_state",
-        translation_key="sleepstate",
-        device_class=SensorDeviceClass.ENUM,
-        available_during_charging=False,
-    )
-
-    def __init__(
-        self,
-        coordinator: OwletCoordinator,
-    ) -> None:
-        """Initialize the sensor."""
-        super().__init__(coordinator, self.entity_description)
-
-    @property
-    def native_value(self) -> StateType:
-        """Return sensor value."""
-        return SLEEP_STATES[self.sock.properties["sleep_state"]]
-
-
-class OwletOxygenAverageSensor(OwletSensor):
-    """Representation of an Owlet sleep sensor."""
-
-    entity_description = OwletSensorEntityDescription(
-        key="oxygen_10_av",
-        translation_key="o2saturation10a",
-        native_unit_of_measurement=PERCENTAGE,
-        icon="mdi:leaf",
-        available_during_charging=False,
-        state_class=SensorStateClass.MEASUREMENT,
-    )
-
-    def __init__(
-        self,
-        coordinator: OwletCoordinator,
-    ) -> None:
-        """Initialize the sensor."""
-        super().__init__(coordinator, self.entity_description)
-
-    @property
-    def available(self) -> bool:
-        """Return if entity is available."""
-        return (
-            super().available
-            and (
-                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
-            )
-        )
+        return self.sock.properties[self.entity_description.element]
--- a/custom_components/owlet/strings.json
+++ b/custom_components/owlet/strings.json
@@ -1,17 +1,18 @@
 {
  "config": {
    "step": {
-      "user": {
-        "data": {
+      "user":{
+        "title": "Enter login details",
+        "data":{
          "region": "Region",
          "username": "Email",
-          "password": "[%key:common::config_flow::data::password%]"
+          "password": "Password"
        }
      },
-      "reauth_confirm": {
+      "reauth_confirm":{
        "title": "Reauthentiaction required for Owlet",
-        "data": {
-          "password": "[%key:common::config_flow::data::password%]"
+        "data":{
+          "password": "Password"
        }
      }
    },
@@ -19,105 +20,20 @@
      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
      "invalid_email": "Entered email address is incorrect",
      "invalid_password": "Entered password is incorrect",
-      "invalid_credentials": "Entered credentials are incorrect",
-      "unknown": "Unknown error occured"
+      "unknown": "[%key:common::config_flow::error::unknown%]"
    },
    "abort": {
-      "already_configured": "Device already configured",
-      "reauth_successful": "Reauthentication successful"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
    }
  },
  "options": {
    "step": {
-      "init": {
-        "title": "Configure options for Owlet",
-        "data": {
+      "init":{
+        "title":"Configure options for Owlet",
+        "data":{
          "pollinterval": "Polling interval in seconds, min 10"
        }
      }
    }
-  },
-  "entity": {
-    "binary_sensor": {
-      "charging": {
-        "name": "Charging"
-      },
-      "high_hr_alrt": {
-        "name": "High heart rate alert"
-      },
-      "low_hr_alrt": {
-        "name": "Low heart rate alert"
-      },
-      "high_ox_alrt": {
-        "name": "High oxygen alert"
-      },
-      "low_ox_alrt": {
-        "name": "Low oxygen alert"
-      },
-      "crit_ox_alrt": {
-        "name": "Critical oxygen alert"
-      },
-      "low_batt_alrt": {
-        "name": "Low battery alert"
-      },
-      "crit_batt_alrt": {
-        "name": "Critical battery alert"
-      },
-      "lost_pwr_alrt": {
-        "name": "Lost power alert"
-      },
-      "sock_discon_alrt": {
-        "name": "Sock disconnected alert"
-      },
-      "sock_off": {
-        "name": "Sock off"
-      },
-      "awake": {
-        "name": "Awake"
-      }
-    },
-    "sensor": {
-      "batterypercent": {
-        "name": "Battery percentage"
-      },
-      "signalstrength": {
-        "name": "Signal strength"
-      },
-      "o2saturation": {
-        "name": "O2 saturation"
-      },
-      "o2saturation10a": {
-        "name": "O2 saturation 10 minute average"
-      },
-      "heartrate": {
-        "name": "Heart rate"
-      },
-      "batterymin": {
-        "name": "Battery remaining"
-      },
-      "skintemp": {
-        "name": "Skin temperature"
-      },
-      "sleepstate": {
-        "name": "Sleep state",
-        "state": {
-          "unknown": "Unknown",
-          "awake": "Awake",
-          "light_sleep": "Light sleep",
-          "deep_sleep": "Deep sleep"
-        }
-      },
-      "movement": {
-        "name": "Movement"
-      },
-      "movementbucket": {
-        "name": "Movement bucket"
-      }
-    },
-    "switch": {
-      "base_on": {
-        "name": "Base station on"
-      }
-    }
  }
 }
--- a/custom_components/owlet/switch.py
+++ b/custom_components/owlet/switch.py
@@ -1,94 +0,0 @@
-"""Support for Owlet switches."""
-
-from __future__ import annotations
-
-from collections.abc import Callable, Coroutine
-from dataclasses import dataclass
-from datetime import timedelta
-from typing import Any
-
-from pyowletapi.sock import Sock
-
-from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
-from homeassistant.config_entries import ConfigEntry
-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
-
-
-@dataclass(frozen=True, kw_only=True)
-class OwletSwitchEntityDescription(SwitchEntityDescription):
-    """Describes Owlet switch entity."""
-
-    turn_on_fn: Callable[[Sock], Callable[[bool], Coroutine[Any, Any, None]]]
-    turn_off_fn: Callable[[Sock], Callable[[bool], Coroutine[Any, Any, None]]]
-    available_during_charging: bool
-
-
-SWITCHES: tuple[OwletSwitchEntityDescription, ...] = (
-    OwletSwitchEntityDescription(
-        key="base_station_on",
-        translation_key="base_on",
-        turn_on_fn=lambda sock: (lambda state: sock.control_base_station(state)),
-        turn_off_fn=lambda sock: (lambda state: sock.control_base_station(state)),
-        available_during_charging=False,
-    ),
-)
-
-
-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.extend([OwletBaseSwitch(coordinator, switch) for switch in SWITCHES])
-    async_add_entities(switches)
-
-
-class OwletBaseSwitch(OwletBaseEntity, SwitchEntity):
-    """Defines a Owlet switch."""
-
-    entity_description: OwletSwitchEntityDescription
-
-    def __init__(
-        self,
-        coordinator: OwletCoordinator,
-        description: OwletSwitchEntityDescription,
-    ) -> None:
-        """Initialize owlet switch platform."""
-        super().__init__(coordinator)
-        self.entity_description = description
-        self._attr_unique_id = f"{self.sock.serial}-{description.key}"
-        self._attr_is_on = False
-
-    @property
-    def available(self) -> bool:
-        """Return if entity is available."""
-        return super().available and (
-            not self.sock.properties["charging"]
-            or self.entity_description.available_during_charging
-        )
-
-    @property
-    def is_on(self) -> bool:
-        """Return if switch is on or off."""
-        return self.sock.properties[self.entity_description.key]
-
-    async def async_turn_on(self, **kwargs: Any) -> None:
-        """Turn on the switch."""
-        await self.entity_description.turn_on_fn(self.sock)(True)
-
-    async def async_turn_off(self, **kwargs: Any) -> None:
-        """Turn off the switch."""
-        await self.entity_description.turn_off_fn(self.sock)(False)
--- a/custom_components/owlet/translations/en.json
+++ b/custom_components/owlet/translations/en.json
@@ -1,122 +1,38 @@
 {
  "config": {
-        "abort": {
-            "already_configured": "Device already configured",
-            "reauth_successful": "Reauthentication successful"
+    "step": {
+      "user":{
+        "title": "Enter login details",
+        "data":{
+          "region": "Region",
+          "username": "Email",
+          "password": "Password"
+        }
+      },
+      "reauth_confirm":{
+        "title": "Reauthentiaction required for Owlet",
+        "data":{
+          "password": "Password"
+        }
+      }
    },
    "error": {
-            "cannot_connect": "Failed to connect",
-            "invalid_credentials": "Entered credentials are incorrect",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
      "invalid_email": "Entered email address is incorrect",
      "invalid_password": "Entered password is incorrect",
-            "unknown": "Unknown error occured"
+      "unknown": "[%key:common::config_flow::error::unknown%]"
    },
-        "step": {
-            "reauth_confirm": {
-                "data": {
-                    "password": "Password"
-                },
-                "title": "Reauthentiaction required for Owlet"
-            },
-            "user": {
-                "data": {
-                    "password": "Password",
-                    "region": "Region",
-                    "username": "Email"
-                }
-            }
-        }
-    },
-    "entity": {
-        "binary_sensor": {
-            "awake": {
-                "name": "Awake"
-            },
-            "charging": {
-                "name": "Charging"
-            },
-            "crit_batt_alrt": {
-                "name": "Critical battery alert"
-            },
-            "crit_ox_alrt": {
-                "name": "Critical oxygen alert"
-            },
-            "high_hr_alrt": {
-                "name": "High heart rate alert"
-            },
-            "high_ox_alrt": {
-                "name": "High oxygen alert"
-            },
-            "lost_pwr_alrt": {
-                "name": "Lost power alert"
-            },
-            "low_batt_alrt": {
-                "name": "Low battery alert"
-            },
-            "low_hr_alrt": {
-                "name": "Low heart rate alert"
-            },
-            "low_ox_alrt": {
-                "name": "Low oxygen alert"
-            },
-            "sock_discon_alrt": {
-                "name": "Sock disconnected alert"
-            },
-            "sock_off": {
-                "name": "Sock off"
-            }
-        },
-        "sensor": {
-            "batterymin": {
-                "name": "Battery remaining"
-            },
-            "batterypercent": {
-                "name": "Battery percentage"
-            },
-            "heartrate": {
-                "name": "Heart rate"
-            },
-            "movement": {
-                "name": "Movement"
-            },
-            "movementbucket": {
-                "name": "Movement bucket"
-            },
-            "o2saturation": {
-                "name": "O2 saturation"
-            },
-            "o2saturation10a": {
-                "name": "O2 saturation 10 minute average"
-            },
-            "signalstrength": {
-                "name": "Signal strength"
-            },
-            "skintemp": {
-                "name": "Skin temperature"
-            },
-            "sleepstate": {
-                "name": "Sleep state",
-                "state": {
-                    "awake": "Awake",
-                    "deep_sleep": "Deep sleep",
-                    "light_sleep": "Light sleep",
-                    "unknown": "Unknown"
-                }
-            }
-        },
-        "switch": {
-            "base_on": {
-                "name": "Base station on"
-            }
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
    }
  },
  "options": {
    "step": {
-            "init": {
-                "data": {
+      "init":{
+        "title":"Configure options for Owlet",
+        "data":{
          "pollinterval": "Polling interval in seconds, min 10"
-                },
-                "title": "Configure options for Owlet"
+        }
      }
    }
  }
--- a/custom_components/owlet/translations/fr.json
+++ b/custom_components/owlet/translations/fr.json
@@ -1,123 +0,0 @@
-{
-    "config": {
-        "step": {
-            "user": {
-                "data": {
-                    "region": "Région",
-                    "username": "Email",
-                    "password": "Mot de passe"
-                }
-            },
-            "reauth_confirm": {
-                "title": "Réauthentification requise pour Owlet",
-                "data": {
-                    "password": "Mot de passe"
-                }
-            }
-        },
-        "error": {
-            "cannot_connect": "N'a pas réussi à se connecter",
-            "invalid_email": "L'adresse e-mail saisie est incorrecte",
-            "invalid_password": "Le mot de passe saisi est incorrect",
-            "invalid_credentials": "Les informations d'identification saisies sont incorrectes",
-            "unknown": "Une erreur inconnue est survenue"
-        },
-        "abort": {
-            "already_configured": "Appareil déjà configuré",
-            "reauth_successful": "Réauthentification réussie"
-        }
-    },
-    "options": {
-        "step": {
-            "init": {
-                "title": "Configurer les options pour Owlet",
-                "data": {
-                    "pollinterval": "Intervalle de sondage en secondes, minimum 10"
-                }
-            }
-        }
-    },
-    "entity": {
-        "binary_sensor": {
-            "charging": {
-                "name": "En charge"
-            },
-            "high_hr_alrt": {
-                "name": "Alerte fréquence cardiaque élevée"
-            },
-            "low_hr_alrt": {
-                "name": "Alerte fréquence cardiaque basse"
-            },
-            "high_ox_alrt": {
-                "name": "Alerte oxygène élevé"
-            },
-            "low_ox_alrt": {
-                "name": "Alerte oxygène faible"
-            },
-            "crit_ox_alrt": {
-                "name": "Alerte oxygène critique"
-            },
-            "low_batt_alrt": {
-                "name": "Alerte batterie faible"
-            },
-            "crit_batt_alrt": {
-                "name": "Alerte batterie critique"
-            },
-            "lost_pwr_alrt": {
-                "name": "Alerte perte d'alimentation"
-            },
-            "sock_discon_alrt": {
-                "name": "Alerte chaussette déconnectée"
-            },
-            "sock_off": {
-                "name": "Chaussette retirée"
-            },
-            "awake": {
-                "name": "Réveillé"
-            }
-        },
-        "sensor": {
-            "batterypercent": {
-                "name": "Pourcentage de batterie"
-            },
-            "signalstrength": {
-                "name": "Force du signal"
-            },
-            "o2saturation": {
-                "name": "Saturation O2"
-            },
-            "o2saturation10a": {
-                "name": "Moyenne de saturation O2 sur 10 minutes"
-            },
-            "heartrate": {
-                "name": "Fréquence cardiaque"
-            },
-            "batterymin": {
-                "name": "Autonomie de la batterie restante"
-            },
-            "skintemp": {
-                "name": "Température de la peau"
-            },
-            "sleepstate": {
-                "name": "État de sommeil",
-                "state": {
-                    "unknown": "Inconnu",
-                    "awake": "Réveillé",
-                    "light_sleep": "Sommeil léger",
-                    "deep_sleep": "Sommeil profond"
-                }
-            },
-            "movement": {
-                "name": "Mouvement"
-            },
-            "movementbucket": {
-                "name": "Seuil de mouvement"
-            }
-        },
-        "switch": {
-            "base_on": {
-                "name": "Station de base allumée"
-            }
-        }
-    }
-}
--- a/custom_components/owlet/translations/uk.json
+++ b/custom_components/owlet/translations/uk.json
@@ -1,123 +1,39 @@
 {
  "config": {
    "step": {
-      "user": {
-        "data": {
+      "user":{
+        "title": "Enter login details",
+        "data":{
          "region": "Region",
          "username": "Email",
          "password": "Password"
        }
      },
-      "reauth_confirm": {
+      "reauth_confirm":{
        "title": "Reauthentiaction required for Owlet",
-        "data": {
+        "data":{
          "password": "Password"
        }
      }
    },
    "error": {
-      "cannot_connect": "Failed to connect",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
      "invalid_email": "Entered email address is incorrect",
      "invalid_password": "Entered password is incorrect",
-      "invalid_credentials": "Entered credentials are incorrect",
-      "unknown": "Unknown error occured"
+      "unknown": "[%key:common::config_flow::error::unknown%]"
    },
    "abort": {
-      "already_configured": "Device already configured",
-      "reauth_successful": "Reauthentication successful"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
    }
  },
  "options": {
    "step": {
-      "init": {
-        "title": "Configure options for Owlet",
-        "data": {
+      "init":{
+        "title":"Configure options for Owlet",
+        "data":{
          "pollinterval": "Polling interval in seconds, min 10"
        }
      }
    }
-  },
-  "entity": {
-    "binary_sensor": {
-      "charging": {
-        "name": "Charging"
-      },
-      "high_hr_alrt": {
-        "name": "High heart rate alert"
-      },
-      "low_hr_alrt": {
-        "name": "Low heart rate alert"
-      },
-      "high_ox_alrt": {
-        "name": "High oxygen alert"
-      },
-      "low_ox_alrt": {
-        "name": "Low oxygen alert"
-      },
-      "crit_ox_alrt": {
-        "name": "Critical oxygen alert"
-      },
-      "low_batt_alrt": {
-        "name": "Low battery alert"
-      },
-      "crit_batt_alrt": {
-        "name": "Critical battery alert"
-      },
-      "lost_pwr_alrt": {
-        "name": "Lost power alert"
-      },
-      "sock_discon_alrt": {
-        "name": "Sock disconnected alert"
-      },
-      "sock_off": {
-        "name": "Sock off"
-      },
-      "awake": {
-        "name": "Awake"
-      }
-    },
-    "sensor": {
-      "batterypercent": {
-        "name": "Battery percentage"
-      },
-      "signalstrength": {
-        "name": "Signal strength"
-      },
-      "o2saturation": {
-        "name": "O2 saturation"
-      },
-      "o2saturation10a": {
-        "name": "O2 saturation 10 minute average"
-      },
-      "heartrate": {
-        "name": "Heart rate"
-      },
-      "batterymin": {
-        "name": "Battery remaining"
-      },
-      "skintemp": {
-        "name": "Skin temperature"
-      },
-      "sleepstate": {
-        "name": "Sleep state",
-        "state": {
-          "unknown": "Unknown",
-          "awake": "Awake",
-          "light_sleep": "Light sleep",
-          "deep_sleep": "Deep sleep"
-        }
-      },
-      "movement": {
-        "name": "Movement"
-      },
-      "movementbucket": {
-        "name": "Movement bucket"
-      }
-    },
-    "switch": {
-      "base_on": {
-        "name": "Base station on"
-      }
-    }
  }
 }
--- a/hacs.json
+++ b/hacs.json
@@ -1,7 +1,7 @@
 {
  "name": "Owlet",
  "hacs": "1.32.1",
-  "homeassistant": "2024.1",
+  "homeassistant": "2023.04.1",
  "zip_release": true,
  "filename": "owlet.zip"
 }
--- a/info.md
+++ b/info.md
@@ -1,6 +1,8 @@
 # Owlet Custom Integration

 [![GitHub Release][releases-shield]][releases]
+![GitHub all releases][download-all]
+![GitHub release (latest by RyanClark123)][download-latest]
 [![GitHub Activity][commits-shield]][commits]

 [![License][license-shield]][license]
@@ -8,7 +10,9 @@
 [![hacs][hacsbadge]][hacs]
 [![Project Maintenance][maintenance-shield]][user_profile]

-A custom component for the Owlet smart sock
+A custom component for the Owlet smart sock, currently this only supports the owlet smart sock 3.
+
+If you have a smart sock 2 and would like to contribute then please do so.

 ## Installation

@@ -17,19 +21,23 @@ A custom component for the Owlet smart sock
 3. Hard refresh browser cache.
 4. [![Add Integration][add-integration-badge]][add-integration] or in the HA UI go to "Configuration" -> "Integrations" click "+" and search for "Owlet Smart Sock".

+{% endif %}
+
 <!---->

 ---

-[commits-shield]: https://img.shields.io/github/commit-activity/w/ryanbdclark/owlet?style=for-the-badge
-[commits]: https://github.com/ryanbdclark/owlet/commits/main
+[commits-shield]: https://img.shields.io/github/commit-activity/w/RyanClark123/owlet?style=for-the-badge
+[commits]: https://github.com/RyanClark123/owlet/commits/main
 [hacs]: https://github.com/hacs/integration
 [hacsbadge]: https://img.shields.io/badge/HACS-Custom-orange.svg?style=for-the-badge
 [license]: LICENSE
-[license-shield]: https://img.shields.io/github/license/ryanbdclark/owlet.svg?style=for-the-badge
-[maintenance-shield]: https://img.shields.io/badge/maintainer-Ryan%20Clark%20%40ryanbdclark-blue.svg?style=for-the-badge
-[releases-shield]: https://img.shields.io/github/release/ryanbdclark/owlet.svg?style=for-the-badge
-[releases]: https://github.com/ryanbdclark/owlet/releases
-[user_profile]: https://github.com/ryanbdclark
+[license-shield]: https://img.shields.io/github/license/RyanClark123/owlet.svg?style=for-the-badge
+[maintenance-shield]: https://img.shields.io/badge/maintainer-Ryan%20Clark%20%40RyanClark123-blue.svg?style=for-the-badge
+[releases-shield]: https://img.shields.io/github/release/RyanClark123/owlet.svg?style=for-the-badge
+[releases]: https://github.com/RyanClark123/owlet/releases
+[user_profile]: https://github.com/RyanClark123
+[download-all]: https://img.shields.io/github/downloads/RyanClark123/Owlet/total?style=for-the-badge
+[download-latest]: https://img.shields.io/github/downloads/RyanClark123/Owlet/latest/total?style=for-the-badge
 [add-integration]: https://my.home-assistant.io/redirect/config_flow_start?domain=owlet
 [add-integration-badge]: https://my.home-assistant.io/badges/config_flow_start.svg
--- a/tests/init.py
+++ b/tests/init.py
@@ -1,60 +0,0 @@
-"""Tests for the Owlet integration."""
-from __future__ import annotations
-
-import json
-from unittest.mock import patch
-
-from homeassistant.components.owlet.const import (
-    CONF_OWLET_EXPIRY,
-    CONF_OWLET_REFRESH,
-    DOMAIN,
-    POLLING_INTERVAL,
-)
-from homeassistant.const import (
-    CONF_API_TOKEN,
-    CONF_REGION,
-    CONF_SCAN_INTERVAL,
-    CONF_USERNAME,
-)
-from homeassistant.core import HomeAssistant
-
-from tests.common import MockConfigEntry, load_fixture
-
-
-async def async_init_integration(
-    hass: HomeAssistant,
-    skip_setup: bool = False,
-    properties_fixture: str = "update_properties_charging.json",
-    devices_fixture: str = "get_devices.json",
-) -> MockConfigEntry:
-    """Set up integration entry."""
-    entry = MockConfigEntry(
-        domain=DOMAIN,
-        title="sample@gmail.com",
-        unique_id="sample@gmail.com",
-        data={
-            CONF_REGION: "europe",
-            CONF_USERNAME: "sample@gmail.com",
-            CONF_API_TOKEN: "api_token",
-            CONF_OWLET_EXPIRY: 100,
-            CONF_OWLET_REFRESH: "refresh_token",
-        },
-        options={CONF_SCAN_INTERVAL: POLLING_INTERVAL},
-    )
-
-    entry.add_to_hass(hass)
-
-    if not skip_setup:
-        with patch(
-            "homeassistant.components.owlet.OwletAPI.get_properties",
-            return_value=json.loads(load_fixture(properties_fixture, "owlet")),
-        ), patch(
-            "homeassistant.components.owlet.OwletAPI.authenticate", return_value=None
-        ), patch(
-            "homeassistant.components.owlet.OwletAPI.get_devices",
-            return_value=json.loads(load_fixture(devices_fixture, "owlet")),
-        ):
-            await hass.config_entries.async_setup(entry.entry_id)
-            await hass.async_block_till_done()
-
-    return entry
--- a/tests/const.py
+++ b/tests/const.py
@@ -1,14 +0,0 @@
-"""Constants used for Owlet tests."""
-
-AUTH_RETURN = {
-    "api_token": "api_token",
-    "expiry": 100,
-    "refresh": "refresh_token",
-}
-
-
-CONF_INPUT = {
-    "region": "europe",
-    "username": "sample@gmail.com",
-    "password": "sample",
-}
--- a/tests/fixtures/get_devices.json
+++ b/tests/fixtures/get_devices.json
@@ -1,32 +0,0 @@
-{
-  "response": [
-    {
-      "device": {
-        "product_name": "Owlet Baby Monitors",
-        "model": "AY001MTL1",
-        "dsn": "SERIAL_NUMBER",
-        "oem_model": "SS3-OBL-EU",
-        "sw_version": "bc 2.9.7-beta 05/01/19 16:15:18 ID beb2858",
-        "template_id": 48775,
-        "mac": "MAC",
-        "unique_hardware_id": "None",
-        "hwsig": "123-123-123",
-        "lan_ip": "192.0.0.1",
-        "connected_at": "2023-05-23T01:21:29Z",
-        "key": 123456,
-        "lan_enabled": false,
-        "connection_priority": [],
-        "has_properties": true,
-        "product_class": "None",
-        "connection_status": "Online",
-        "lat": "0.0",
-        "lng": "0.0",
-        "locality": "QW12",
-        "device_type": "Wifi",
-        "dealer": "None",
-        "manuf_model": "LBEE5PA1LD-222"
-      }
-    }
-  ],
-  "tokens": ""
-}
--- a/tests/fixtures/get_devices_with_tokens.json
+++ b/tests/fixtures/get_devices_with_tokens.json
@@ -1,36 +0,0 @@
-{
-  "response": [
-    {
-      "device": {
-        "product_name": "Owlet Baby Monitors",
-        "model": "AY001MTL1",
-        "dsn": "SERIAL_NUMBER",
-        "oem_model": "SS3-OBL-EU",
-        "sw_version": "bc 2.9.7-beta 05/01/19 16:15:18 ID beb2858",
-        "template_id": 48775,
-        "mac": "MAC",
-        "unique_hardware_id": "None",
-        "hwsig": "123-123-123",
-        "lan_ip": "192.0.0.1",
-        "connected_at": "2023-05-23T01:21:29Z",
-        "key": 123456,
-        "lan_enabled": false,
-        "connection_priority": [],
-        "has_properties": true,
-        "product_class": "None",
-        "connection_status": "Online",
-        "lat": "0.0",
-        "lng": "0.0",
-        "locality": "QW12",
-        "device_type": "Wifi",
-        "dealer": "None",
-        "manuf_model": "LBEE5PA1LD-222"
-      }
-    }
-  ],
-  "tokens": {
-    "api_token": "new_api_token",
-    "expiry": 200,
-    "refresh": "new_refresh_token"
-  }
-}
--- a/tests/fixtures/update_properties_asleep.json
+++ b/tests/fixtures/update_properties_asleep.json
--- a/tests/fixtures/update_properties_awake.json
+++ b/tests/fixtures/update_properties_awake.json
--- a/tests/fixtures/update_properties_charging.json
+++ b/tests/fixtures/update_properties_charging.json
--- a/tests/fixtures/update_properties_v2.json
+++ b/tests/fixtures/update_properties_v2.json
--- a/tests/test_binary_sensor.py
+++ b/tests/test_binary_sensor.py
@@ -1,188 +0,0 @@
-"""Test Owlet Sensor."""
-from __future__ import annotations
-
-from homeassistant.core import HomeAssistant
-
-from . import async_init_integration
-
-
-async def test_sensors_asleep(hass: HomeAssistant) -> None:
-    """Test sensor values."""
-    await async_init_integration(
-        hass, properties_fixture="update_properties_asleep.json"
-    )
-
-    assert len(hass.states.async_all("binary_sensor")) == 10
-
-    assert hass.states.get("binary_sensor.owlet_baby_care_sock_charging").state == "off"
-    assert (
-        hass.states.get(
-            "binary_sensor.owlet_baby_care_sock_high_heart_rate_alert"
-        ).state
-        == "off"
-    )
-    assert (
-        hass.states.get("binary_sensor.owlet_baby_care_sock_low_heart_rate_alert").state
-        == "off"
-    )
-    assert (
-        hass.states.get("binary_sensor.owlet_baby_care_sock_high_oxygen_alert").state
-        == "off"
-    )
-    assert (
-        hass.states.get("binary_sensor.owlet_baby_care_sock_low_oxygen_alert").state
-        == "off"
-    )
-    assert (
-        hass.states.get("binary_sensor.owlet_baby_care_sock_low_battery_alert").state
-        == "off"
-    )
-    assert (
-        hass.states.get("binary_sensor.owlet_baby_care_sock_lost_power_alert").state
-        == "off"
-    )
-    assert (
-        hass.states.get(
-            "binary_sensor.owlet_baby_care_sock_sock_disconnected_alert"
-        ).state
-        == "off"
-    )
-    assert hass.states.get("binary_sensor.owlet_baby_care_sock_sock_off").state == "off"
-    assert hass.states.get("binary_sensor.owlet_baby_care_sock_awake").state == "off"
-
-
-async def test_sensors_awake(hass: HomeAssistant) -> None:
-    """Test sensor values."""
-    await async_init_integration(
-        hass, properties_fixture="update_properties_awake.json"
-    )
-
-    assert len(hass.states.async_all("binary_sensor")) == 10
-
-    assert hass.states.get("binary_sensor.owlet_baby_care_sock_charging").state == "off"
-    assert (
-        hass.states.get(
-            "binary_sensor.owlet_baby_care_sock_high_heart_rate_alert"
-        ).state
-        == "on"
-    )
-    assert (
-        hass.states.get("binary_sensor.owlet_baby_care_sock_low_heart_rate_alert").state
-        == "on"
-    )
-    assert (
-        hass.states.get("binary_sensor.owlet_baby_care_sock_high_oxygen_alert").state
-        == "on"
-    )
-    assert (
-        hass.states.get("binary_sensor.owlet_baby_care_sock_low_oxygen_alert").state
-        == "on"
-    )
-    assert (
-        hass.states.get("binary_sensor.owlet_baby_care_sock_low_battery_alert").state
-        == "on"
-    )
-    assert (
-        hass.states.get("binary_sensor.owlet_baby_care_sock_lost_power_alert").state
-        == "on"
-    )
-    assert (
-        hass.states.get(
-            "binary_sensor.owlet_baby_care_sock_sock_disconnected_alert"
-        ).state
-        == "off"
-    )
-    assert hass.states.get("binary_sensor.owlet_baby_care_sock_sock_off").state == "off"
-    assert hass.states.get("binary_sensor.owlet_baby_care_sock_awake").state == "on"
-
-
-async def test_sensors_charging(hass: HomeAssistant) -> None:
-    """Test sensor values."""
-    await async_init_integration(
-        hass, properties_fixture="update_properties_charging.json"
-    )
-
-    assert len(hass.states.async_all("binary_sensor")) == 10
-
-    assert hass.states.get("binary_sensor.owlet_baby_care_sock_charging").state == "on"
-    assert (
-        hass.states.get(
-            "binary_sensor.owlet_baby_care_sock_high_heart_rate_alert"
-        ).state
-        == "off"
-    )
-    assert (
-        hass.states.get("binary_sensor.owlet_baby_care_sock_low_heart_rate_alert").state
-        == "off"
-    )
-    assert (
-        hass.states.get("binary_sensor.owlet_baby_care_sock_high_oxygen_alert").state
-        == "off"
-    )
-    assert (
-        hass.states.get("binary_sensor.owlet_baby_care_sock_low_oxygen_alert").state
-        == "off"
-    )
-    assert (
-        hass.states.get("binary_sensor.owlet_baby_care_sock_low_battery_alert").state
-        == "off"
-    )
-    assert (
-        hass.states.get("binary_sensor.owlet_baby_care_sock_lost_power_alert").state
-        == "off"
-    )
-    assert (
-        hass.states.get(
-            "binary_sensor.owlet_baby_care_sock_sock_disconnected_alert"
-        ).state
-        == "off"
-    )
-    assert hass.states.get("binary_sensor.owlet_baby_care_sock_sock_off").state == "off"
-    assert (
-        hass.states.get("binary_sensor.owlet_baby_care_sock_awake").state == "unknown"
-    )
-
-
-async def test_sensors_v2(hass: HomeAssistant) -> None:
-    """Test sensor values."""
-    await async_init_integration(hass, properties_fixture="update_properties_v2.json")
-    assert len(hass.states.async_all("binary_sensor")) == 9
-
-    assert hass.states.get("binary_sensor.owlet_baby_care_sock_charging").state == "off"
-    assert (
-        hass.states.get(
-            "binary_sensor.owlet_baby_care_sock_high_heart_rate_alert"
-        ).state
-        == "off"
-    )
-    assert (
-        hass.states.get("binary_sensor.owlet_baby_care_sock_low_heart_rate_alert").state
-        == "off"
-    )
-    assert (
-        hass.states.get("binary_sensor.owlet_baby_care_sock_low_oxygen_alert").state
-        == "off"
-    )
-    assert (
-        hass.states.get("binary_sensor.owlet_baby_care_sock_low_battery_alert").state
-        == "off"
-    )
-    assert (
-        hass.states.get(
-            "binary_sensor.owlet_baby_care_sock_critical_battery_alert"
-        ).state
-        == "off"
-    )
-    assert (
-        hass.states.get(
-            "binary_sensor.owlet_baby_care_sock_critical_oxygen_alert"
-        ).state
-        == "off"
-    )
-    assert (
-        hass.states.get(
-            "binary_sensor.owlet_baby_care_sock_sock_disconnected_alert"
-        ).state
-        == "off"
-    )
-    assert hass.states.get("binary_sensor.owlet_baby_care_sock_sock_off").state == "off"
--- a/tests/test_config_flow.py
+++ b/tests/test_config_flow.py
@@ -1,237 +0,0 @@
-"""Test Owlet config flow."""
-from __future__ import annotations
-
-from unittest.mock import patch
-
-from pyowletapi.exceptions import (
-    OwletCredentialsError,
-    OwletDevicesError,
-    OwletEmailError,
-    OwletPasswordError,
-)
-
-from homeassistant import config_entries
-from homeassistant.components.owlet.const import DOMAIN, POLLING_INTERVAL
-from homeassistant.config_entries import SOURCE_REAUTH, SOURCE_USER
-from homeassistant.const import CONF_PASSWORD, CONF_SCAN_INTERVAL
-from homeassistant.core import HomeAssistant
-from homeassistant.data_entry_flow import FlowResultType
-
-from . import async_init_integration
-from .const import AUTH_RETURN, CONF_INPUT
-
-
-async def test_form(hass: HomeAssistant) -> None:
-    """Test that the form is served with no input."""
-    # await async_init_integration(hass)
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": SOURCE_USER}
-    )
-
-    assert result["type"] == FlowResultType.FORM
-    assert result["step_id"] == "user"
-
-    with patch(
-        "homeassistant.components.owlet.config_flow.OwletAPI.authenticate",
-        return_value=AUTH_RETURN,
-    ), patch(
-        "homeassistant.components.owlet.config_flow.OwletAPI.validate_authentication"
-    ):
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            user_input=CONF_INPUT,
-        )
-        await hass.async_block_till_done()
-
-        assert result["type"] == FlowResultType.CREATE_ENTRY
-        assert result["title"] == "sample@gmail.com"
-        assert result["data"] == {
-            "region": "europe",
-            "username": "sample@gmail.com",
-            "api_token": "api_token",
-            "expiry": 100,
-            "refresh": "refresh_token",
-        }
-        assert result["options"] == {"scan_interval": POLLING_INTERVAL}
-
-
-async def test_flow_wrong_password(hass: HomeAssistant) -> None:
-    """Test incorrect login throwing error."""
-    with patch(
-        "homeassistant.components.owlet.config_flow.OwletAPI.authenticate",
-        side_effect=OwletPasswordError(),
-    ):
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN,
-            context={"source": config_entries.SOURCE_USER},
-        )
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            user_input=CONF_INPUT,
-        )
-        assert result["type"] == FlowResultType.FORM
-        assert result["errors"] == {"password": "invalid_password"}
-
-
-async def test_flow_wrong_email(hass: HomeAssistant) -> None:
-    """Test incorrect login throwing error."""
-    with patch(
-        "homeassistant.components.owlet.config_flow.OwletAPI.authenticate",
-        side_effect=OwletEmailError(),
-    ):
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN,
-            context={"source": config_entries.SOURCE_USER},
-        )
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            user_input=CONF_INPUT,
-        )
-        assert result["type"] == FlowResultType.FORM
-        assert result["errors"] == {"username": "invalid_email"}
-
-
-async def test_flow_credentials_error(hass: HomeAssistant) -> None:
-    """Test incorrect login throwing error."""
-    with patch(
-        "homeassistant.components.owlet.config_flow.OwletAPI.authenticate",
-        side_effect=OwletCredentialsError(),
-    ):
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN,
-            context={"source": config_entries.SOURCE_USER},
-        )
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            user_input=CONF_INPUT,
-        )
-        assert result["type"] == FlowResultType.FORM
-        assert result["errors"] == {"base": "invalid_credentials"}
-
-
-async def test_flow_unknown_error(hass: HomeAssistant) -> None:
-    """Test unknown error throwing error."""
-    with patch(
-        "homeassistant.components.owlet.config_flow.OwletAPI.authenticate",
-        side_effect=Exception(),
-    ):
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN,
-            context={"source": config_entries.SOURCE_USER},
-        )
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            user_input=CONF_INPUT,
-        )
-        assert result["type"] == FlowResultType.FORM
-        assert result["errors"] == {"base": "unknown"}
-
-
-async def test_flow_no_devices(hass: HomeAssistant) -> None:
-    """Test unknown error throwing error."""
-    with patch(
-        "homeassistant.components.owlet.config_flow.OwletAPI.authenticate"
-    ), patch(
-        "homeassistant.components.owlet.config_flow.OwletAPI.validate_authentication",
-        side_effect=OwletDevicesError(),
-    ):
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN,
-            context={"source": config_entries.SOURCE_USER},
-        )
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            user_input=CONF_INPUT,
-        )
-        assert result["type"] == FlowResultType.FORM
-        assert result["errors"] == {"base": "no_devices"}
-
-
-async def test_reauth_success(hass: HomeAssistant) -> None:
-    """Test reauth form."""
-
-    entry = await async_init_integration(hass, skip_setup=True)
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": SOURCE_REAUTH, "entry_id": entry.entry_id}
-    )
-
-    assert result["type"] == FlowResultType.FORM
-    assert result["step_id"] == "reauth_confirm"
-
-    with patch(
-        "homeassistant.components.owlet.config_flow.OwletAPI.authenticate",
-        return_value=AUTH_RETURN,
-    ):
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            user_input={CONF_PASSWORD: "sample"},
-        )
-        await hass.async_block_till_done()
-
-        assert result["type"] == FlowResultType.ABORT
-        assert result["reason"] == "reauth_successful"
-
-        await hass.config_entries.async_unload(entry.entry_id)
-
-
-async def test_reauth_invalid_password(hass: HomeAssistant) -> None:
-    """Test reauth with invalid password errir."""
-    entry = await async_init_integration(hass, skip_setup=True)
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": SOURCE_REAUTH, "entry_id": entry.entry_id}
-    )
-
-    with patch(
-        "homeassistant.components.owlet.config_flow.OwletAPI.authenticate",
-        side_effect=OwletPasswordError(),
-    ):
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"], user_input={CONF_PASSWORD: "sample"}
-        )
-
-        assert result["type"] == FlowResultType.FORM
-        assert result["step_id"] == "reauth_confirm"
-        assert result["errors"] == {"password": "invalid_password"}
-
-
-async def test_reauth_unknown_error(hass: HomeAssistant) -> None:
-    """Test reauthing with an unknown error."""
-
-    entry = await async_init_integration(hass, skip_setup=True)
-
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": SOURCE_REAUTH, "entry_id": entry.entry_id}
-    )
-
-    with patch(
-        "homeassistant.components.owlet.config_flow.OwletAPI.authenticate",
-        side_effect=Exception(),
-    ):
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"], user_input={CONF_PASSWORD: "sample"}
-        )
-
-        assert result["type"] == FlowResultType.FORM
-        assert result["step_id"] == "reauth_confirm"
-
-
-async def test_options_flow(hass: HomeAssistant) -> None:
-    """Test that the form is served with no input."""
-    entry = await async_init_integration(hass, skip_setup=True)
-
-    result = await hass.config_entries.options.async_init(entry.entry_id)
-
-    assert result["type"] == FlowResultType.FORM
-    assert result["step_id"] == "init"
-
-    result = await hass.config_entries.options.async_configure(
-        result["flow_id"],
-        user_input={CONF_SCAN_INTERVAL: 10},
-    )
-    await hass.async_block_till_done()
-
-    assert result["type"] == FlowResultType.CREATE_ENTRY
-    assert result["title"] == ""
-    assert result["data"] == {CONF_SCAN_INTERVAL: 10}
--- a/tests/test_coordinator.py
+++ b/tests/test_coordinator.py
@@ -1,74 +0,0 @@
-"""Test owlet coordinator."""
-from __future__ import annotations
-
-import json
-from unittest.mock import patch
-
-from pyowletapi.exceptions import OwletAuthenticationError, OwletConnectionError
-
-from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import Platform
-from homeassistant.core import HomeAssistant
-
-from . import async_init_integration
-
-from tests.common import load_fixture
-
-PLATFORMS: list[Platform] = [Platform.BINARY_SENSOR, Platform.SENSOR]
-
-
-async def test_coordinator_auth_error(hass: HomeAssistant) -> None:
-    """Test coordinator setup authentication error."""
-    entry = await async_init_integration(hass, skip_setup=True)
-
-    with patch(
-        "homeassistant.components.owlet.Sock.update_properties",
-        side_effect=OwletAuthenticationError(),
-    ), patch(
-        "homeassistant.components.owlet.OwletAPI.authenticate", return_value=None
-    ), patch(
-        "homeassistant.components.owlet.OwletAPI.get_devices",
-        return_value=json.loads(load_fixture("get_devices.json", "owlet")),
-    ):
-        await hass.config_entries.async_setup(entry.entry_id)
-        await hass.async_block_till_done()
-
-        assert entry.state == ConfigEntryState.SETUP_RETRY
-
-
-async def test_coordinator_connection_error(hass: HomeAssistant) -> None:
-    """Test coordinator setup connection error error."""
-    entry = await async_init_integration(hass, skip_setup=True)
-
-    with patch(
-        "homeassistant.components.owlet.Sock.update_properties",
-        side_effect=OwletConnectionError(),
-    ), patch(
-        "homeassistant.components.owlet.OwletAPI.authenticate", return_value=None
-    ), patch(
-        "homeassistant.components.owlet.OwletAPI.get_devices",
-        return_value=json.loads(load_fixture("get_devices.json", "owlet")),
-    ):
-        await hass.config_entries.async_setup(entry.entry_id)
-        await hass.async_block_till_done()
-
-        assert entry.state == ConfigEntryState.SETUP_RETRY
-
-
-async def test_coordinator_error(hass: HomeAssistant) -> None:
-    """Test coordinator setup generic error."""
-    entry = await async_init_integration(hass, skip_setup=True)
-
-    with patch(
-        "homeassistant.components.owlet.Sock.update_properties",
-        side_effect=Exception(),
-    ), patch(
-        "homeassistant.components.owlet.OwletAPI.authenticate", return_value=None
-    ), patch(
-        "homeassistant.components.owlet.OwletAPI.get_devices",
-        return_value=json.loads(load_fixture("get_devices.json", "owlet")),
-    ):
-        await hass.config_entries.async_setup(entry.entry_id)
-        await hass.async_block_till_done()
-
-        assert entry.state == ConfigEntryState.SETUP_RETRY
--- a/tests/test_init.py
+++ b/tests/test_init.py
@@ -1,136 +0,0 @@
-"""Test Owlet init."""
-from __future__ import annotations
-
-from unittest.mock import patch
-
-from pyowletapi.exceptions import (
-    OwletAuthenticationError,
-    OwletConnectionError,
-    OwletDevicesError,
-    OwletError,
-)
-
-from homeassistant.components.owlet.const import (
-    CONF_OWLET_EXPIRY,
-    CONF_OWLET_REFRESH,
-    DOMAIN,
-)
-from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import CONF_API_TOKEN, CONF_REGION, CONF_USERNAME, Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import device_registry as dr, entity_registry as er
-
-from . import async_init_integration
-
-PLATFORMS: list[Platform] = [Platform.BINARY_SENSOR, Platform.SENSOR]
-
-
-async def test_async_setup_entry(hass: HomeAssistant) -> None:
-    """Test setting up entry."""
-    entry = await async_init_integration(hass)
-
-    assert entry.state == ConfigEntryState.LOADED
-
-    device_registry = dr.async_get(hass)
-
-    device_entry = device_registry.async_get_or_create(
-        config_entry_id=entry.entry_id, identifiers={(DOMAIN, "SERIAL_NUMBER")}
-    )
-
-    assert device_entry.name == "Owlet Baby Care Sock"
-
-    entity_registry = er.async_get(hass)
-
-    entities = er.async_entries_for_device(entity_registry, device_entry.id)
-
-    assert len(entities) == 18
-
-    await entry.async_unload(hass)
-
-    assert entry.state == ConfigEntryState.NOT_LOADED
-
-
-async def test_async_setup_entry_new_tokens(hass: HomeAssistant) -> None:
-    """Test setting up entry and getting new tokens."""
-    entry = await async_init_integration(
-        hass, devices_fixture="get_devices_with_tokens.json"
-    )
-
-    assert entry.data == {
-        CONF_REGION: "europe",
-        CONF_USERNAME: "sample@gmail.com",
-        CONF_API_TOKEN: "new_api_token",
-        CONF_OWLET_EXPIRY: 200,
-        CONF_OWLET_REFRESH: "new_refresh_token",
-    }
-
-    assert entry.state == ConfigEntryState.LOADED
-
-    await entry.async_unload(hass)
-
-    assert entry.state == ConfigEntryState.NOT_LOADED
-
-
-async def test_async_setup_entry_auth_error(hass: HomeAssistant) -> None:
-    """Test setting up entry with auth error."""
-    entry = await async_init_integration(hass, skip_setup=True)
-
-    with patch(
-        "homeassistant.components.owlet.OwletAPI.authenticate",
-        side_effect=OwletAuthenticationError(),
-    ):
-        await hass.config_entries.async_setup(entry.entry_id)
-        await hass.async_block_till_done()
-
-        assert entry.state == ConfigEntryState.SETUP_ERROR
-
-        await entry.async_unload(hass)
-
-
-async def test_async_setup_entry_connection_error(hass: HomeAssistant) -> None:
-    """Test setting up entry with connection error."""
-    entry = await async_init_integration(hass, skip_setup=True)
-
-    with patch(
-        "homeassistant.components.owlet.OwletAPI.authenticate",
-        side_effect=OwletConnectionError(),
-    ):
-        await hass.config_entries.async_setup(entry.entry_id)
-        await hass.async_block_till_done()
-
-        assert entry.state == ConfigEntryState.SETUP_RETRY
-
-        await entry.async_unload(hass)
-
-
-async def test_async_setup_entry_devices_error(hass: HomeAssistant) -> None:
-    """Test setting up entry with device error."""
-    entry = await async_init_integration(hass, skip_setup=True)
-
-    with patch(
-        "homeassistant.components.owlet.OwletAPI.authenticate", return_value=None
-    ), patch(
-        "homeassistant.components.owlet.OwletAPI.get_devices",
-        side_effect=OwletDevicesError(),
-    ):
-        await hass.config_entries.async_setup(entry.entry_id)
-        await hass.async_block_till_done()
-
-        assert entry.state == ConfigEntryState.SETUP_ERROR
-        await entry.async_unload(hass)
-
-
-async def test_async_setup_entry_error(hass: HomeAssistant) -> None:
-    """Test setting up entry with unknown error."""
-    entry = await async_init_integration(hass, skip_setup=True)
-
-    with patch(
-        "homeassistant.components.owlet.OwletAPI.authenticate",
-        side_effect=OwletError(),
-    ):
-        await hass.config_entries.async_setup(entry.entry_id)
-        await hass.async_block_till_done()
-
-        assert entry.state == ConfigEntryState.SETUP_ERROR
-
-        await entry.async_unload(hass)
--- a/tests/test_sensor.py
+++ b/tests/test_sensor.py
@@ -1,126 +0,0 @@
-"""Test Owlet Sensor."""
-from __future__ import annotations
-
-from homeassistant.core import HomeAssistant
-
-from . import async_init_integration
-
-
-async def test_sensors_asleep(hass: HomeAssistant) -> None:
-    """Test sensor values."""
-    await async_init_integration(
-        hass, properties_fixture="update_properties_asleep.json"
-    )
-
-    assert len(hass.states.async_all("sensor")) == 8
-
-    assert (
-        hass.states.get("sensor.owlet_baby_care_sock_battery_percentage").state
-        == "50.0"
-    )
-    assert (
-        hass.states.get("sensor.owlet_baby_care_sock_battery_remaining").state
-        == "400.0"
-    )
-    assert hass.states.get("sensor.owlet_baby_care_sock_heart_rate").state == "97.0"
-    assert hass.states.get("sensor.owlet_baby_care_sock_o2_saturation").state == "99.0"
-    assert (
-        hass.states.get(
-            "sensor.owlet_baby_care_sock_o2_saturation_10_minute_average"
-        ).state
-        == "97.0"
-    )
-
-    assert (
-        hass.states.get("sensor.owlet_baby_care_sock_signal_strength").state == "30.0"
-    )
-    assert hass.states.get("sensor.owlet_baby_care_sock_skin_temperature").state == "34"
-    assert (
-        hass.states.get("sensor.owlet_baby_care_sock_sleep_state").state
-        == "light_sleep"
-    )
-
-
-async def test_sensors_awake(hass: HomeAssistant) -> None:
-    """Test sensor values."""
-    await async_init_integration(
-        hass, properties_fixture="update_properties_awake.json"
-    )
-
-    assert len(hass.states.async_all("sensor")) == 8
-
-    assert (
-        hass.states.get("sensor.owlet_baby_care_sock_battery_percentage").state
-        == "80.0"
-    )
-    assert (
-        hass.states.get("sensor.owlet_baby_care_sock_battery_remaining").state
-        == "600.0"
-    )
-    assert hass.states.get("sensor.owlet_baby_care_sock_heart_rate").state == "110.0"
-    assert hass.states.get("sensor.owlet_baby_care_sock_o2_saturation").state == "98.0"
-    assert (
-        hass.states.get(
-            "sensor.owlet_baby_care_sock_o2_saturation_10_minute_average"
-        ).state
-        == "98.0"
-    )
-    assert (
-        hass.states.get("sensor.owlet_baby_care_sock_signal_strength").state == "34.0"
-    )
-    assert hass.states.get("sensor.owlet_baby_care_sock_skin_temperature").state == "35"
-    assert hass.states.get("sensor.owlet_baby_care_sock_sleep_state").state == "awake"
-
-
-async def test_sensors_charging(hass: HomeAssistant) -> None:
-    """Test sensor values."""
-    await async_init_integration(
-        hass, properties_fixture="update_properties_charging.json"
-    )
-
-    assert len(hass.states.async_all("sensor")) == 8
-
-    assert (
-        hass.states.get("sensor.owlet_baby_care_sock_battery_percentage").state
-        == "100.0"
-    )
-    assert (
-        hass.states.get("sensor.owlet_baby_care_sock_battery_remaining").state
-        == "unknown"
-    )
-    assert hass.states.get("sensor.owlet_baby_care_sock_heart_rate").state == "unknown"
-    assert (
-        hass.states.get("sensor.owlet_baby_care_sock_o2_saturation").state == "unknown"
-    )
-    assert (
-        hass.states.get(
-            "sensor.owlet_baby_care_sock_o2_saturation_10_minute_average"
-        ).state
-        == "unknown"
-    )
-
-    assert (
-        hass.states.get("sensor.owlet_baby_care_sock_signal_strength").state == "34.0"
-    )
-    assert (
-        hass.states.get("sensor.owlet_baby_care_sock_skin_temperature").state
-        == "unknown"
-    )
-    assert hass.states.get("sensor.owlet_baby_care_sock_sleep_state").state == "unknown"
-
-
-async def test_sensors_v2(hass: HomeAssistant) -> None:
-    """Test sensor values."""
-    await async_init_integration(hass, properties_fixture="update_properties_v2.json")
-    assert len(hass.states.async_all("sensor")) == 4
-
-    assert (
-        hass.states.get("sensor.owlet_baby_care_sock_battery_percentage").state == "29"
-    )
-    assert hass.states.get("sensor.owlet_baby_care_sock_heart_rate").state == "145"
-    assert hass.states.get("sensor.owlet_baby_care_sock_o2_saturation").state == "99"
-
-    assert (
-        hass.states.get("sensor.owlet_baby_care_sock_signal_strength").state == "98.0"
-    )
-