Add support for Smoke+CO Detector (#527)

* Add support for Smoke+CO Detector

* Clean up

Author: bachya

simplipy/device/__init__.py

@@ -26,6 +26,7 @@ class DeviceTypes(Enum):
     TEMPERATURE = 10
     CAMERA = 12
     SIREN = 13
+    SMOKE_AND_CARBON_MONOXIDE = 14
     DOORBELL = 15
     LOCK = 16
     OUTDOOR_CAMERA = 17

simplipy/device/sensor/v3.py

@@ -20,11 +20,11 @@ def trigger_instantly(self) -> bool:
         Returns:
             The "instant trigger" status.
         """
-        return cast(
-            bool,
+        return (
             self._system.sensor_data[self._serial]["setting"].get(
                 "instantTrigger", False
-            ),
+            )
+            is True
         )
 
     @property
@@ -43,11 +43,21 @@ def triggered(self) -> bool:
             DeviceTypes.SMOKE,
             DeviceTypes.TEMPERATURE,
         ):
-            return cast(
-                bool,
+            return (
+                self._system.sensor_data[self._serial]["status"].get("triggered")
+                is True
+            )
+
+        if self.type == DeviceTypes.SMOKE_AND_CARBON_MONOXIDE:
+            return (
                 self._system.sensor_data[self._serial]["status"].get(
-                    "triggered", False
-                ),
+                    "coTriggered", False
+                )
+                is True
+                or self._system.sensor_data[self._serial]["status"].get(
+                    "smokeTriggered", False
+                )
+                is True
             )
 
         return False

tests/fixtures/v3_sensors_response.json

@@ -509,6 +509,33 @@
         "lowBattery": false,
         "offline": false
       }
+    },
+    {
+      "serial": "00000000",
+      "type": 14,
+      "name": "Kitchen",
+      "setting": {},
+      "status": {
+        "coTriggered": false,
+        "malfunction": false,
+        "tamper": true,
+        "lowSensitivity": false,
+        "endOfLife": false,
+        "test": false,
+        "smokeTriggered": false,
+        "preSmokeAlarm": false
+      },
+      "timestamp": 0,
+      "rssi": -45,
+      "WDTCount": 23,
+      "nonce": 0,
+      "rebootCnt": 17,
+      "deviceGroupID": 0,
+      "flags": {
+        "offline": true,
+        "lowBattery": false,
+        "swingerShutdown": false
+      }
     }
   ],
   "lastUpdated": 1534626361,

tests/system/test_v3.py

@@ -411,6 +411,17 @@ async def test_as_dict(
                     "trigger_instantly": False,
                     "triggered": False,
                 },
+                {
+                    "name": "Kitchen",
+                    "serial": "00000000",
+                    "type": 14,
+                    "error": False,
+                    "low_battery": False,
+                    "offline": True,
+                    "settings": {},
+                    "trigger_instantly": False,
+                    "triggered": False,
+                },
             ],
             "alarm_duration": 240,
             "alarm_volume": 3,
@@ -991,7 +1002,7 @@ async def test_async_get_systems(
         system = systems[TEST_SYSTEM_ID]
         assert system.serial == TEST_SYSTEM_SERIAL_NO
         assert system.system_id == TEST_SYSTEM_ID
-        assert len(system.sensors) == 24
+        assert len(system.sensors) == 25
 
     aresponses.assert_plan_strictly_followed()
 
@@ -1728,7 +1739,7 @@ async def test_update_system_data(
 
             assert system.serial == TEST_SYSTEM_SERIAL_NO
             assert system.system_id == TEST_SYSTEM_ID
-            assert len(system.sensors) == 24
+            assert len(system.sensors) == 25
 
     aresponses.assert_plan_strictly_followed()