Merge branch 'main' of https://github.com/ryanbdclark/owlet

###Fix
* Refactoring done based on home assistant style guidelines and suggestions submitted on the core pull request version of this integration
* Added new sensors to strings json and disabled by default

CHANGELOG.md

@@ -1,6 +1,14 @@
 # Changelog
 
 <!--next-version-placeholder-->
+## 2023.08.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))

custom_components/owlet/__init__.py

@@ -79,7 +79,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     scan_interval = entry.options.get(CONF_SCAN_INTERVAL)
     coordinators = {
-        serial: OwletCoordinator(hass, sock, scan_interval)
+        serial: OwletCoordinator(hass, sock, scan_interval, entry)
         for (serial, sock) in socks.items()
     }
 

custom_components/owlet/binary_sensor.py

@@ -18,16 +18,7 @@ from .entity import OwletBaseEntity
 
 
 @dataclass
-class OwletBinarySensorEntityMixin:
+class OwletBinarySensorEntityDescription(BinarySensorEntityDescription):
-    """Owlet binary sensor element mixin"""
-
-    element: str
-
-
-@dataclass
-class OwletBinarySensorEntityDescription(
-    BinarySensorEntityDescription, OwletBinarySensorEntityMixin
-):
     """Represent the owlet binary sensor entity description."""
 
 
@@ -36,60 +27,51 @@ SENSORS: tuple[OwletBinarySensorEntityDescription, ...] = (
         key="charging",
         translation_key="charging",
         device_class=BinarySensorDeviceClass.BATTERY_CHARGING,
-        element="charging",
     ),
     OwletBinarySensorEntityDescription(
-        key="highhr",
+        key="high_heart_rate_alert",
         translation_key="high_hr_alrt",
         device_class=BinarySensorDeviceClass.SOUND,
-        element="high_heart_rate_alert",
     ),
     OwletBinarySensorEntityDescription(
-        key="lowhr",
+        key="low_heart_rate_alert",
         translation_key="low_hr_alrt",
         device_class=BinarySensorDeviceClass.SOUND,
-        element="low_heart_rate_alert",
     ),
     OwletBinarySensorEntityDescription(
-        key="higho2",
+        key="high_oxygen_alert",
         translation_key="high_ox_alrt",
         device_class=BinarySensorDeviceClass.SOUND,
-        element="high_oxygen_alert",
+        entity_registry_enabled_default=False,
     ),
     OwletBinarySensorEntityDescription(
-        key="lowo2",
+        key="low_oxygen_alert",
         translation_key="low_ox_alrt",
         device_class=BinarySensorDeviceClass.SOUND,
-        element="low_oxygen_alert",
     ),
     OwletBinarySensorEntityDescription(
-        key="lowbattery",
+        key="low_battery_alert",
         translation_key="low_batt_alrt",
         device_class=BinarySensorDeviceClass.SOUND,
-        element="low_battery_alert",
     ),
     OwletBinarySensorEntityDescription(
-        key="lostpower",
+        key="lost_power_alert",
         translation_key="lost_pwr_alrt",
         device_class=BinarySensorDeviceClass.SOUND,
-        element="lost_power_alert",
     ),
     OwletBinarySensorEntityDescription(
-        key="sockdisconnected",
+        key="sock_disconnected",
         translation_key="sock_discon_alrt",
         device_class=BinarySensorDeviceClass.SOUND,
-        element="sock_disconnected",
     ),
     OwletBinarySensorEntityDescription(
         key="sock_off",
         translation_key="sock_off",
         device_class=BinarySensorDeviceClass.POWER,
-        element="sock_off",
     ),
     OwletBinarySensorEntityDescription(
-        key="awake",
+        key="sleep_state",
         translation_key="awake",
-        element="sleep_state",
         icon="mdi:sleep",
     ),
 )
@@ -117,21 +99,24 @@ class OwletBinarySensor(OwletBaseEntity, BinarySensorEntity):
     def __init__(
         self,
         coordinator: OwletCoordinator,
-        sensor_description: OwletBinarySensorEntityDescription,
+        description: OwletBinarySensorEntityDescription,
     ) -> None:
         """Initialize the binary sensor."""
         super().__init__(coordinator)
-        self.entity_description = sensor_description
+        self.entity_description = description
-        self._attr_unique_id = f"{self.sock.serial}-{self.entity_description.translation_key}"
+        self._attr_unique_id = f"{self.sock.serial}-{description.key}"
 
     @property
     def is_on(self) -> bool:
         """Return true if the binary sensor is on."""
-        state = self.sock.properties[self.entity_description.element]
+        state = self.sock.properties[self.entity_description.key]
 
-        if self.entity_description.element == "sleep_state":
+        entity = self.entity_description.key
-            if self.sock.properties["charging"]:
+
+        if self.sock.properties["charging"] and entity in ["sleep_state"]:
             return None
+
+        if entity == "sleep_state":
             if state in [8, 15]:
                 state = False
             else:

custom_components/owlet/config_flow.py

@@ -34,9 +34,9 @@ _LOGGER = logging.getLogger(__name__)
 
 STEP_USER_DATA_SCHEMA = vol.Schema(
     {
-        vol.Required("region"): vol.In(["europe", "world"]),
+        vol.Required(CONF_REGION): vol.In(["europe", "world"]),
-        vol.Required("username"): str,
+        vol.Required(CONF_USERNAME): str,
-        vol.Required("password"): str,
+        vol.Required(CONF_PASSWORD): str,
     }
 )
 
@@ -45,15 +45,10 @@ 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
@@ -61,18 +56,14 @@ class OwletConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
         """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=self._region,
+                region=user_input[CONF_REGION],
-                user=self._username,
+                user=user_input[CONF_USERNAME],
-                password=self._password,
+                password=user_input[CONF_PASSWORD],
                 session=async_get_clientsession(self.hass),
             )
 
-            await self.async_set_unique_id(self._username.lower())
+            await self.async_set_unique_id(user_input[CONF_USERNAME].lower())
             self._abort_if_unique_id_configured()
 
             try:
@@ -82,9 +73,9 @@ class OwletConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
             except OwletDevicesError:
                 errors["base"] = "no_devices"
             except OwletEmailError:
-                errors["base"] = "invalid_email"
+                errors[CONF_USERNAME] = "invalid_email"
             except OwletPasswordError:
-                errors["base"] = "invalid_password"
+                errors[CONF_PASSWORD] = "invalid_password"
             except OwletCredentialsError:
                 errors["base"] = "invalid_credentials"
             except Exception:  # pylint: disable=broad-except
@@ -92,10 +83,10 @@ class OwletConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
                 errors["base"] = "unknown"
             else:
                 return self.async_create_entry(
-                    title=self._username,
+                    title=user_input[CONF_USERNAME],
                     data={
-                        CONF_REGION: self._region,
+                        CONF_REGION: user_input[CONF_REGION],
-                        CONF_USERNAME: self._username,
+                        CONF_USERNAME: user_input[CONF_PASSWORD],
                         CONF_API_TOKEN: token[CONF_API_TOKEN],
                         CONF_OWLET_EXPIRY: token[CONF_OWLET_EXPIRY],
                         CONF_OWLET_REFRESH: token[CONF_OWLET_REFRESH],
@@ -147,7 +138,7 @@ class OwletConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
                 return self.async_abort(reason="reauth_successful")
 
             except OwletPasswordError:
-                errors["base"] = "invalid_password"
+                errors[CONF_PASSWORD] = "invalid_password"
             except Exception:  # pylint: disable=broad-except
                 _LOGGER.exception("Error reauthenticating")
 

custom_components/owlet/coordinator.py

@@ -15,10 +15,9 @@ 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, MANUFACTURER
+from .const import DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -26,7 +25,9 @@ _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) -> None:
+    def __init__(
+        self, hass: HomeAssistant, sock: Sock, interval, entry: ConfigEntry
+    ) -> None:
         """Initialise a custom coordinator."""
         super().__init__(
             hass,
@@ -34,17 +35,8 @@ class OwletCoordinator(DataUpdateCoordinator):
             name=DOMAIN,
             update_interval=timedelta(seconds=interval),
         )
-        assert self.config_entry is not None
-        self.config_entry: ConfigEntry
         self.sock = sock
-        self.device_info = DeviceInfo(
+        self.config_entry = entry
-            identifiers={(DOMAIN, sock.serial)},
-            name="Owlet Baby Care Sock",
-            manufacturer=MANUFACTURER,
-            model=sock.model,
-            sw_version=sock.sw_version,
-            hw_version=sock.version,
-        )
 
     async def _async_update_data(self) -> None:
         """Fetch the data from the device."""

custom_components/owlet/entity.py

@@ -2,13 +2,17 @@
 
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
+from homeassistant.helpers.entity import DeviceInfo
 
 from .coordinator import OwletCoordinator
+from .const import DOMAIN, MANUFACTURER
 
 
 class OwletBaseEntity(CoordinatorEntity[OwletCoordinator], Entity):
     """Base class for Owlet Sock entities."""
 
+    _attr_has_entity_name = True
+
     def __init__(
         self,
         coordinator: OwletCoordinator,
@@ -16,5 +20,15 @@ class OwletBaseEntity(CoordinatorEntity[OwletCoordinator], Entity):
         """Initialize the base entity."""
         super().__init__(coordinator)
         self.sock = coordinator.sock
-        self._attr_device_info = coordinator.device_info
+
-        self._attr_has_entity_name = True
+    @property
+    def device_info(self) -> DeviceInfo:
+        """Return the device info of the device"""
+        return DeviceInfo(
+            identifiers={(DOMAIN, self.sock.serial)},
+            name="Owlet Baby Care Sock",
+            manufacturer=MANUFACTURER,
+            model=self.sock.model,
+            sw_version=self.sock.sw_version,
+            hw_version=self.sock.version,
+        )

custom_components/owlet/manifest.json

@@ -7,5 +7,5 @@
   "iot_class": "cloud_polling",
   "issue_tracker": "https://github.com/ryanbdclark/owlet/issues",
   "requirements": ["pyowletapi==2023.7.2"],
-  "version":"2023.7.2"
+  "version":"2023.8.1"
 }

custom_components/owlet/sensor.py

@@ -26,75 +26,78 @@ from .entity import OwletBaseEntity
 
 
 @dataclass
-class OwletSensorEntityDescriptionMixin:
+class OwletSensorEntityDescription(SensorEntityDescription):
-    """Owlet sensor description mix in."""
-
-    element: str
-
-
-@dataclass
-class OwletSensorEntityDescription(
-    SensorEntityDescription, OwletSensorEntityDescriptionMixin
-):
     """Represent the owlet sensor entity description."""
 
 
 SENSORS: tuple[OwletSensorEntityDescription, ...] = (
     OwletSensorEntityDescription(
-        key="batterypercentage",
+        key="battery_percentage",
         translation_key="batterypercent",
         native_unit_of_measurement=PERCENTAGE,
         device_class=SensorDeviceClass.BATTERY,
         state_class=SensorStateClass.MEASUREMENT,
-        element="battery_percentage",
     ),
     OwletSensorEntityDescription(
-        key="oxygensaturation",
+        key="oxygen_saturation",
         translation_key="o2saturation",
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
-        element="oxygen_saturation",
         icon="mdi:leaf",
     ),
     OwletSensorEntityDescription(
-        key="oxygensaturation10a",
+        key="oxygen_10_av",
         translation_key="o2saturation10a",
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
-        element="oxygen_10_av",
         icon="mdi:leaf",
     ),
     OwletSensorEntityDescription(
-        key="heartrate",
+        key="heart_rate",
         translation_key="heartrate",
         native_unit_of_measurement="bpm",
         state_class=SensorStateClass.MEASUREMENT,
-        element="heart_rate",
         icon="mdi:heart-pulse",
     ),
     OwletSensorEntityDescription(
-        key="batteryminutes",
+        key="battery_minutes",
         translation_key="batterymin",
         native_unit_of_measurement=UnitOfTime.MINUTES,
         device_class=SensorDeviceClass.DURATION,
         state_class=SensorStateClass.MEASUREMENT,
-        element="battery_minutes",
     ),
     OwletSensorEntityDescription(
-        key="signalstrength",
+        key="signal_strength",
         translation_key="signalstrength",
         native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
         device_class=SensorDeviceClass.SIGNAL_STRENGTH,
         state_class=SensorStateClass.MEASUREMENT,
-        element="signal_strength",
     ),
     OwletSensorEntityDescription(
-        key="skintemp",
+        key="skin_temperature",
         translation_key="skintemp",
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         device_class=SensorDeviceClass.TEMPERATURE,
         state_class=SensorStateClass.MEASUREMENT,
-        element="skin_temperature",
+    ),
+    OwletSensorEntityDescription(
+        key="sleep_state",
+        translation_key="sleepstate",
+        device_class=SensorDeviceClass.ENUM,
+    ),
+    OwletSensorEntityDescription(
+        key="movement",
+        translation_key="movement",
+        state_class=SensorStateClass.MEASUREMENT,
+        icon="mdi:cursor-move",
+        entity_registry_enabled_default=False,
+    ),
+    OwletSensorEntityDescription(
+        key="movement_bucket",
+        translation_key="movementbucket",
+        state_class=SensorStateClass.MEASUREMENT,
+        icon="mdi:bucket-outline",
+        entity_registry_enabled_default=False,
     ),
 )
 
@@ -116,10 +119,6 @@ async def async_setup_entry(
         for sensor in SENSORS
     )
 
-    async_add_entities(
-        OwletSleepStateSensor(coordinator) for coordinator in coordinators
-    )
-
 
 class OwletSensor(OwletBaseEntity, SensorEntity):
     """Representation of an Owlet sensor."""
@@ -127,60 +126,39 @@ class OwletSensor(OwletBaseEntity, SensorEntity):
     def __init__(
         self,
         coordinator: OwletCoordinator,
-        sensor_description: OwletSensorEntityDescription,
+        description: OwletSensorEntityDescription,
     ) -> None:
         """Initialize the sensor."""
         super().__init__(coordinator)
-        self.entity_description: OwletSensorEntityDescription = sensor_description
+        self.entity_description: OwletSensorEntityDescription = description
-        self._attr_unique_id = (
+        self._attr_unique_id = f"{self.sock.serial}-{description.key}"
-            f"{self.sock.serial}-{self.entity_description.translation_key}"
-        )
 
     @property
     def native_value(self) -> StateType:
         """Return sensor value."""
 
         if (
-            self.entity_description.element
+            self.entity_description.key
             in [
                 "heart_rate",
                 "battery_minutes",
                 "oxygen_saturation",
                 "skin_temperature",
                 "oxygen_10_av",
+                "sleep_state",
             ]
             and self.sock.properties["charging"]
         ):
             return None
 
-        properties = self.sock.properties
+        if self.entity_description.key == "sleep_state":
-
-        return properties[self.entity_description.element]
-
-
-class OwletSleepStateSensor(OwletBaseEntity, SensorEntity):
-    """Representation of an Owlet sleep state sensor."""
-
-    def __init__(
-        self,
-        coordinator: OwletCoordinator,
-    ) -> None:
-        """Initialize the sensor."""
-        super().__init__(coordinator)
-        self._attr_unique_id = f"{self.sock.serial}-sleepstate"
-        self._attr_icon = "mdi:sleep"
-        self._attr_device_class = SensorDeviceClass.ENUM
-        self._attr_translation_key = "sleepstate"
-
-    @property
-    def native_value(self) -> str:
-        """Return sensor value."""
-        if self.sock.properties["charging"]:
-            return "unknown"
-
             return SLEEP_STATES[self.sock.properties["sleep_state"]]
 
+        return self.sock.properties[self.entity_description.key]
+
     @property
     def options(self) -> list[str]:
         """Set options for sleep state."""
+        if self.entity_description.key != "sleep_state":
+            return None
         return list(SLEEP_STATES.values())

custom_components/owlet/strings.json

@@ -2,7 +2,6 @@
   "config": {
     "step": {
       "user": {
-        "title": "Enter login details",
         "data": {
           "region": "Region",
           "username": "Email",
@@ -44,28 +43,28 @@
         "name": "Charging"
       },
       "high_hr_alrt": {
-        "name": "High Heart Rate Alert"
+        "name": "High heart rate alert"
       },
       "low_hr_alrt": {
-        "name":"Low Heart Rate Alert"
+        "name": "Low heart rate alert"
       },
       "high_ox_alrt": {
-        "name":"High Oxygen Alert"
+        "name": "High oxygen alert"
       },
       "low_ox_alrt": {
-        "name":"Low Oxygen Alert"
+        "name": "Low oxygen alert"
       },
       "low_batt_alrt": {
-        "name": "Low Battery Alert"
+        "name": "Low battery alert"
       },
       "lost_pwr_alrt": {
-        "name": "Lost Power Alert"
+        "name": "Lost power alert"
       },
       "sock_discon_alrt": {
-        "name": "Sock Diconnected Alert"
+        "name": "Sock diconnected alert"
       },
       "sock_off": {
-        "name":"Sock Off"
+        "name": "Sock off"
       },
       "awake": {
         "name": "Awake"
@@ -73,34 +72,40 @@
     },
     "sensor": {
       "batterypercent": {
-        "name": "Battery Percentage"
+        "name": "Battery percentage"
-      },
-      "o2saturation": {
-        "name": "O2 Saturation"
-      },
-      "o2saturation10a": {
-        "name": "O2 Saturation 10 Minute Average"
-      },
-      "heartrate": {
-        "name": "Heart Rate"
-      },
-      "batterymin": {
-        "name": "Battery Remaining"
       },
       "signalstrength": {
-        "name": "Signal Strength"
+        "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"
+        "name": "Skin temperature"
       },
       "sleepstate": {
-        "name": "Sleep State",
+        "name": "Sleep state",
         "state": {
           "unknown": "Unknown",
           "awake": "Awake",
-          "light_sleep": "Light Sleep",
+          "light_sleep": "Light sleep",
-          "deep_sleep": "Deep Sleep"
+          "deep_sleep": "Deep sleep"
-        }
+        }
+      },
+      "movement": {
+        "name": "Movement"
+      },
+      "movementbucket": {
+        "name": "Movement bucket"
       }
     }
   }

custom_components/owlet/translations/en.json

@@ -2,7 +2,6 @@
   "config": {
     "step": {
       "user": {
-        "title": "Enter login details",
         "data": {
           "region": "Region",
           "username": "Email",
@@ -44,28 +43,28 @@
         "name": "Charging"
       },
       "high_hr_alrt": {
-        "name": "High Heart Rate Alert"
+        "name": "High heart rate alert"
       },
       "low_hr_alrt": {
-        "name":"Low Heart Rate Alert"
+        "name": "Low heart rate alert"
       },
       "high_ox_alrt": {
-        "name":"High Oxygen Alert"
+        "name": "High oxygen alert"
       },
       "low_ox_alrt": {
-        "name":"Low Oxygen Alert"
+        "name": "Low oxygen alert"
       },
       "low_batt_alrt": {
-        "name": "Low Battery Alert"
+        "name": "Low battery alert"
       },
       "lost_pwr_alrt": {
-        "name": "Lost Power Alert"
+        "name": "Lost power alert"
       },
       "sock_discon_alrt": {
-        "name": "Sock Diconnected Alert"
+        "name": "Sock diconnected alert"
       },
       "sock_off": {
-        "name":"Sock Off"
+        "name": "Sock off"
       },
       "awake": {
         "name": "Awake"
@@ -73,34 +72,40 @@
     },
     "sensor": {
       "batterypercent": {
-        "name": "Battery Percentage"
+        "name": "Battery percentage"
-      },
-      "o2saturation": {
-        "name": "O2 Saturation"
-      },
-      "o2saturation10a": {
-        "name": "O2 Saturation 10 Minute Average"
-      },
-      "heartrate": {
-        "name": "Heart Rate"
-      },
-      "batterymin": {
-        "name": "Battery Remaining"
       },
       "signalstrength": {
-        "name": "Signal Strength"
+        "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"
+        "name": "Skin temperature"
       },
       "sleepstate": {
-        "name": "Sleep State",
+        "name": "Sleep state",
         "state": {
           "unknown": "Unknown",
           "awake": "Awake",
-          "light_sleep": "Light Sleep",
+          "light_sleep": "Light sleep",
-          "deep_sleep": "Deep Sleep"
+          "deep_sleep": "Deep sleep"
-        }
+        }
+      },
+      "movement": {
+        "name": "Movement"
+      },
+      "movementbucket": {
+        "name": "Movement bucket"
       }
     }
   }

custom_components/owlet/translations/uk.json

@@ -2,7 +2,6 @@
   "config": {
     "step": {
       "user": {
-        "title": "Enter login details",
         "data": {
           "region": "Region",
           "username": "Email",
@@ -44,28 +43,28 @@
         "name": "Charging"
       },
       "high_hr_alrt": {
-        "name": "High Heart Rate Alert"
+        "name": "High heart rate alert"
       },
       "low_hr_alrt": {
-        "name":"Low Heart Rate Alert"
+        "name": "Low heart rate alert"
       },
       "high_ox_alrt": {
-        "name":"High Oxygen Alert"
+        "name": "High oxygen alert"
       },
       "low_ox_alrt": {
-        "name":"Low Oxygen Alert"
+        "name": "Low oxygen alert"
       },
       "low_batt_alrt": {
-        "name": "Low Battery Alert"
+        "name": "Low battery alert"
       },
       "lost_pwr_alrt": {
-        "name": "Lost Power Alert"
+        "name": "Lost power alert"
       },
       "sock_discon_alrt": {
-        "name": "Sock Diconnected Alert"
+        "name": "Sock diconnected alert"
       },
       "sock_off": {
-        "name":"Sock Off"
+        "name": "Sock off"
       },
       "awake": {
         "name": "Awake"
@@ -73,34 +72,40 @@
     },
     "sensor": {
       "batterypercent": {
-        "name": "Battery Percentage"
+        "name": "Battery percentage"
-      },
-      "o2saturation": {
-        "name": "O2 Saturation"
-      },
-      "o2saturation10a": {
-        "name": "O2 Saturation 10 Minute Average"
-      },
-      "heartrate": {
-        "name": "Heart Rate"
-      },
-      "batterymin": {
-        "name": "Battery Remaining"
       },
       "signalstrength": {
-        "name": "Signal Strength"
+        "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"
+        "name": "Skin temperature"
       },
       "sleepstate": {
-        "name": "Sleep State",
+        "name": "Sleep state",
         "state": {
           "unknown": "Unknown",
           "awake": "Awake",
-          "light_sleep": "Light Sleep",
+          "light_sleep": "Light sleep",
-          "deep_sleep": "Deep Sleep"
+          "deep_sleep": "Deep sleep"
-        }
+        }
+      },
+      "movement": {
+        "name": "Movement"
+      },
+      "movementbucket": {
+        "name": "Movement bucket"
       }
     }
   }