Show new errors from the MotionMount (#137006)

homeassistant/components/motionmount/sensor.py

@@ -1,6 +1,9 @@
 """Support for MotionMount sensors."""
 
+from typing import Final
+
 import motionmount
+from motionmount import MotionMountSystemError
 
 from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
 from homeassistant.core import HomeAssistant
@@ -9,6 +12,14 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from . import MotionMountConfigEntry
 from .entity import MotionMountEntity
 
+ERROR_MESSAGES: Final = {
+    MotionMountSystemError.MotorError: "motor",
+    MotionMountSystemError.ObstructionDetected: "obstruction",
+    MotionMountSystemError.TVWidthConstraintError: "tv_width_constraint",
+    MotionMountSystemError.HDMICECError: "hdmi_cec",
+    MotionMountSystemError.InternalError: "internal",
+}
+
 
 async def async_setup_entry(
     hass: HomeAssistant,
@@ -25,7 +36,14 @@ class MotionMountErrorStatusSensor(MotionMountEntity, SensorEntity):
     """The error status sensor of a MotionMount."""
 
     _attr_device_class = SensorDeviceClass.ENUM
-    _attr_options = ["none", "motor", "internal"]
+    _attr_options = [
+        "none",
+        "motor",
+        "hdmi_cec",
+        "obstruction",
+        "tv_width_constraint",
+        "internal",
+    ]
     _attr_translation_key = "motionmount_error_status"
 
     def __init__(
@@ -38,13 +56,10 @@ class MotionMountErrorStatusSensor(MotionMountEntity, SensorEntity):
     @property
     def native_value(self) -> str:
         """Return error status."""
-        errors = self.mm.error_status or 0
+        status = self.mm.system_status
 
-        if errors & (1 << 31):
+        for error, message in ERROR_MESSAGES.items():
-            # Only when but 31 is set are there any errors active at this moment
+            if error in status:
-            if errors & (1 << 10):
+                return message
-                return "motor"
-
-            return "internal"
 
         return "none"

homeassistant/components/motionmount/strings.json

@@ -72,6 +72,9 @@
         "state": {
           "none": "None",
           "motor": "Motor",
+          "hdmi_cec": "HDMI CEC",
+          "obstruction": "Obstruction",
+          "tv_width_constraint": "TV width constraint",
           "internal": "Internal"
         }
       }

tests/components/motionmount/test_sensor.py

@@ -0,0 +1,48 @@
+"""Tests for the MotionMount Sensor platform."""
+
+from unittest.mock import patch
+
+from motionmount import MotionMountSystemError
+import pytest
+
+from homeassistant.core import HomeAssistant
+
+from . import ZEROCONF_NAME
+
+from tests.common import MockConfigEntry
+
+MAC = bytes.fromhex("c4dd57f8a55f")
+
+
+@pytest.mark.parametrize(
+    ("system_status", "state"),
+    [
+        (None, "none"),
+        (MotionMountSystemError.MotorError, "motor"),
+        (MotionMountSystemError.ObstructionDetected, "obstruction"),
+        (MotionMountSystemError.TVWidthConstraintError, "tv_width_constraint"),
+        (MotionMountSystemError.HDMICECError, "hdmi_cec"),
+        (MotionMountSystemError.InternalError, "internal"),
+    ],
+)
+async def test_error_status_sensor_states(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    system_status: MotionMountSystemError,
+    state: str,
+) -> None:
+    """Tests the state attributes."""
+    with patch(
+        "homeassistant.components.motionmount.motionmount.MotionMount",
+        autospec=True,
+    ) as motionmount_mock:
+        motionmount_mock.return_value.name = ZEROCONF_NAME
+        motionmount_mock.return_value.mac = MAC
+        motionmount_mock.return_value.is_authenticated = True
+        motionmount_mock.return_value.system_status = [system_status]
+
+        mock_config_entry.add_to_hass(hass)
+
+        assert await hass.config_entries.async_setup(mock_config_entry.entry_id)
+
+        assert hass.states.get("sensor.my_motionmount_error_status").state == state