Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions simplipy/sensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,11 @@ def settings(self) -> bool:
"""Return the sensor's settings."""
return self.sensor_data['setting']

@property
def trigger_instantly(self) -> bool:
"""Return whether the sensor will trigger instantly."""
return self.sensor_data['instant']

@property
def triggered(self) -> bool:
"""Return the current sensor state."""
Expand Down Expand Up @@ -111,6 +116,11 @@ def settings(self) -> dict:
"""Return the sensor's settings."""
return self.sensor_data['setting']

@property
def trigger_instantly(self) -> bool:
"""Return whether the sensor will trigger instantly."""
return self.sensor_data['setting']['instantTrigger']

@property
def triggered(self) -> bool:
"""Return the sensor's status info."""
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/v2.py
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ def v2_settings_json():
"entryStatus": "closed"
}, {
"type": 5,
"serial": "609",
"serial": "610",
"setting": 1,
"instant": False,
"enotify": False,
Expand Down
4 changes: 3 additions & 1 deletion tests/test_sensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,11 @@ async def test_properties_v2(event_loop, v2_server):
assert keypad.triggered == 42

entry_sensor = system.sensors['609']
assert entry_sensor.data == 210
assert entry_sensor.data == 130
assert not entry_sensor.error
assert not entry_sensor.low_battery
assert entry_sensor.settings == 1
assert not entry_sensor.trigger_instantly
assert not entry_sensor.triggered


Expand All @@ -71,6 +72,7 @@ async def test_properties_v3(event_loop, v3_server):
assert not entry_sensor.low_battery
assert not entry_sensor.offline
assert not entry_sensor.settings['instantTrigger']
assert not entry_sensor.trigger_instantly
assert not entry_sensor.triggered

siren = system.sensors['236']
Expand Down
6 changes: 3 additions & 3 deletions tests/test_system.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ async def test_get_systems_v2(
assert primary_system.serial == TEST_SYSTEM_SERIAL_NO
assert primary_system.system_id == TEST_SYSTEM_ID
assert primary_system.api._access_token == TEST_ACCESS_TOKEN
assert len(primary_system.sensors) == 34
assert len(primary_system.sensors) == 35

token_api = await API.login_via_token(
TEST_REFRESH_TOKEN, websession)
Expand All @@ -125,7 +125,7 @@ async def test_get_systems_v2(
assert primary_system.serial == TEST_SYSTEM_SERIAL_NO
assert primary_system.system_id == TEST_SYSTEM_ID
assert primary_system.api._access_token == TEST_ACCESS_TOKEN
assert len(primary_system.sensors) == 34
assert len(primary_system.sensors) == 35


@pytest.mark.asyncio
Expand Down Expand Up @@ -338,7 +338,7 @@ async def test_update_system_data_v2(
assert system.serial == TEST_SYSTEM_SERIAL_NO
assert system.system_id == TEST_SYSTEM_ID
assert system.api._access_token == TEST_ACCESS_TOKEN
assert len(system.sensors) == 34
assert len(system.sensors) == 35


@pytest.mark.asyncio
Expand Down