pyg90alarm 1.17.1__py3-none-any.whl → 1.19.0__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
pyg90alarm/alarm.py CHANGED
@@ -17,6 +17,7 @@
17
17
  # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18
18
  # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
19
19
  # SOFTWARE.
20
+ # pylint: disable=too-many-lines
20
21
 
21
22
  """
22
23
  Provides interface to G90 alarm panel.
@@ -120,6 +121,14 @@ if TYPE_CHECKING:
120
121
  [int, str, G90RemoteButtonStates], Coroutine[None, None, None]
121
122
  ]
122
123
  ]
124
+ DoorOpenWhenArmingCallback = Union[
125
+ Callable[[int, str], None],
126
+ Callable[[int, str], Coroutine[None, None, None]]
127
+ ]
128
+ TamperCallback = Union[
129
+ Callable[[int, str], None],
130
+ Callable[[int, str], Coroutine[None, None, None]]
131
+ ]
123
132
  # Sensor-related callbacks for `G90Sensor` class - despite that class
124
133
  # stores them, the invocation is done by the `G90Alarm` class hence these
125
134
  # are defined here
@@ -131,6 +140,14 @@ if TYPE_CHECKING:
131
140
  Callable[[], None],
132
141
  Callable[[], Coroutine[None, None, None]]
133
142
  ]
143
+ SensorDoorOpenWhenArmingCallback = Union[
144
+ Callable[[], None],
145
+ Callable[[], Coroutine[None, None, None]]
146
+ ]
147
+ SensorTamperCallback = Union[
148
+ Callable[[], None],
149
+ Callable[[], Coroutine[None, None, None]]
150
+ ]
134
151
 
135
152
 
136
153
  # pylint: disable=too-many-public-methods
@@ -161,7 +178,9 @@ class G90Alarm(G90DeviceNotifications):
161
178
  self._host: str = host
162
179
  self._port: int = port
163
180
  self._sensors: List[G90Sensor] = []
181
+ self._sensors_lock = asyncio.Lock()
164
182
  self._devices: List[G90Device] = []
183
+ self._devices_lock = asyncio.Lock()
165
184
  self._notifications: Optional[G90DeviceNotifications] = None
166
185
  self._sensor_cb: Optional[SensorCallback] = None
167
186
  self._armdisarm_cb: Optional[ArmDisarmCallback] = None
@@ -172,6 +191,10 @@ class G90Alarm(G90DeviceNotifications):
172
191
  self._remote_button_press_cb: Optional[
173
192
  RemoteButtonPressCallback
174
193
  ] = None
194
+ self._door_open_when_arming_cb: Optional[
195
+ DoorOpenWhenArmingCallback
196
+ ] = None
197
+ self._tamper_cb: Optional[TamperCallback] = None
175
198
  self._reset_occupancy_interval = reset_occupancy_interval
176
199
  self._alert_config: Optional[G90AlertConfigFlags] = None
177
200
  self._sms_alert_when_armed = False
@@ -258,20 +281,26 @@ class G90Alarm(G90DeviceNotifications):
258
281
 
259
282
  :return: List of sensors
260
283
  """
261
- if not self._sensors:
262
- sensors = self.paginated_result(
263
- G90Commands.GETSENSORLIST
264
- )
265
- async for sensor in sensors:
266
- obj = G90Sensor(
267
- *sensor.data, parent=self, subindex=0,
268
- proto_idx=sensor.proto_idx
284
+ # Use lock around the operation, to ensure no duplicated entries in the
285
+ # resulting list or redundant exchanges with panel are made when the
286
+ # method is called concurrently
287
+ async with self._sensors_lock:
288
+ if not self._sensors:
289
+ sensors = self.paginated_result(
290
+ G90Commands.GETSENSORLIST
269
291
  )
270
- self._sensors.append(obj)
292
+ async for sensor in sensors:
293
+ obj = G90Sensor(
294
+ *sensor.data, parent=self, subindex=0,
295
+ proto_idx=sensor.proto_idx
296
+ )
297
+ self._sensors.append(obj)
271
298
 
272
- _LOGGER.debug('Total number of sensors: %s', len(self._sensors))
299
+ _LOGGER.debug(
300
+ 'Total number of sensors: %s', len(self._sensors)
301
+ )
273
302
 
274
- return self._sensors
303
+ return self._sensors
275
304
 
276
305
  async def find_sensor(self, idx: int, name: str) -> Optional[G90Sensor]:
277
306
  """
@@ -316,28 +345,32 @@ class G90Alarm(G90DeviceNotifications):
316
345
 
317
346
  :return: List of devices
318
347
  """
319
- if not self._devices:
320
- devices = self.paginated_result(
321
- G90Commands.GETDEVICELIST
322
- )
323
- async for device in devices:
324
- obj = G90Device(
325
- *device.data, parent=self, subindex=0,
326
- proto_idx=device.proto_idx
348
+ # See `get_sensors` method for the rationale behind the lock usage
349
+ async with self._devices_lock:
350
+ if not self._devices:
351
+ devices = self.paginated_result(
352
+ G90Commands.GETDEVICELIST
327
353
  )
328
- self._devices.append(obj)
329
- # Multi-node devices (first node has already been added
330
- # above
331
- for node in range(1, obj.node_count):
354
+ async for device in devices:
332
355
  obj = G90Device(
333
- *device.data, parent=self,
334
- subindex=node, proto_idx=device.proto_idx
356
+ *device.data, parent=self, subindex=0,
357
+ proto_idx=device.proto_idx
335
358
  )
336
359
  self._devices.append(obj)
360
+ # Multi-node devices (first node has already been added
361
+ # above
362
+ for node in range(1, obj.node_count):
363
+ obj = G90Device(
364
+ *device.data, parent=self,
365
+ subindex=node, proto_idx=device.proto_idx
366
+ )
367
+ self._devices.append(obj)
337
368
 
338
- _LOGGER.debug('Total number of devices: %s', len(self._devices))
369
+ _LOGGER.debug(
370
+ 'Total number of devices: %s', len(self._devices)
371
+ )
339
372
 
340
- return self._devices
373
+ return self._devices
341
374
 
342
375
  @property
343
376
  async def host_info(self) -> G90HostInfo:
@@ -601,6 +634,17 @@ class G90Alarm(G90DeviceNotifications):
601
634
  await self.set_alert_config(
602
635
  await self.alert_config | G90AlertConfigFlags.SMS_PUSH
603
636
  )
637
+
638
+ # Reset the tampered and door open when arming flags on all sensors
639
+ # having those set
640
+ for sensor in await self.get_sensors():
641
+ if sensor.is_tampered:
642
+ # pylint: disable=protected-access
643
+ sensor._set_tampered(False)
644
+ if sensor.is_door_open_when_arming:
645
+ # pylint: disable=protected-access
646
+ sensor._set_door_open_when_arming(False)
647
+
604
648
  G90Callback.invoke(self._armdisarm_cb, state)
605
649
 
606
650
  @property
@@ -615,7 +659,9 @@ class G90Alarm(G90DeviceNotifications):
615
659
  def armdisarm_callback(self, value: ArmDisarmCallback) -> None:
616
660
  self._armdisarm_cb = value
617
661
 
618
- async def on_alarm(self, event_id: int, zone_name: str) -> None:
662
+ async def on_alarm(
663
+ self, event_id: int, zone_name: str, is_tampered: bool
664
+ ) -> None:
619
665
  """
620
666
  Invoked when alarm is triggered. Fires corresponding callback if set by
621
667
  the user with :attr:`.alarm_callback`.
@@ -626,16 +672,31 @@ class G90Alarm(G90DeviceNotifications):
626
672
  :param zone_name: Sensor name
627
673
  """
628
674
  sensor = await self.find_sensor(event_id, zone_name)
629
- # The callback is still delivered to the caller even if the sensor
630
- # isn't found, only `extra_data` is skipped. That is to ensure the
631
- # important callback isn't filtered
632
- extra_data = sensor.extra_data if sensor else None
633
- # Invoke the sensor activity callback to set the sensor occupancy if
634
- # sensor is known, but only if that isn't already set - it helps when
635
- # device notifications on triggerring sensor's activity aren't receveid
636
- # by a reason
637
- if sensor and not sensor.occupancy:
638
- await self.on_sensor_activity(event_id, zone_name, True)
675
+ extra_data = None
676
+ if sensor:
677
+ # The callback is still delivered to the caller even if the sensor
678
+ # isn't found, only `extra_data` is skipped. That is to ensure the
679
+ # important callback isn't filtered
680
+ extra_data = sensor.extra_data
681
+
682
+ # Invoke the sensor activity callback to set the sensor occupancy
683
+ # if sensor is known, but only if that isn't already set - it helps
684
+ # when device notifications on triggerring sensor's activity aren't
685
+ # receveid by a reason
686
+ if not sensor.occupancy:
687
+ await self.on_sensor_activity(event_id, zone_name, True)
688
+
689
+ if is_tampered:
690
+ # Set the tampered flag on the sensor
691
+ # pylint: disable=protected-access
692
+ sensor._set_tampered(True)
693
+
694
+ # Invoke per-sensor callback if provided
695
+ G90Callback.invoke(sensor.tamper_callback)
696
+
697
+ # Invoke global tamper callback if provided and the sensor is tampered
698
+ if is_tampered:
699
+ G90Callback.invoke(self._tamper_cb, event_id, zone_name)
639
700
 
640
701
  G90Callback.invoke(
641
702
  self._alarm_cb, event_id, zone_name, extra_data
@@ -706,7 +767,10 @@ class G90Alarm(G90DeviceNotifications):
706
767
 
707
768
  # Also report the event as alarm for unification, hard-coding the
708
769
  # sensor name in case of host SOS
709
- await self.on_alarm(event_id, 'Host SOS' if is_host_sos else zone_name)
770
+ await self.on_alarm(
771
+ event_id, zone_name='Host SOS' if is_host_sos else zone_name,
772
+ is_tampered=False
773
+ )
710
774
 
711
775
  if not is_host_sos:
712
776
  # Also report the remote button press for SOS - the panel will not
@@ -766,6 +830,58 @@ class G90Alarm(G90DeviceNotifications):
766
830
  ) -> None:
767
831
  self._remote_button_press_cb = value
768
832
 
833
+ async def on_door_open_when_arming(
834
+ self, event_id: int, zone_name: str
835
+ ) -> None:
836
+ """
837
+ Invoked when door is open when arming the device. Fires corresponding
838
+ callback if set by the user with
839
+ :attr:`.door_open_when_arming_callback`.
840
+
841
+ Please note the method is for internal use by the class.
842
+
843
+ :param event_id: The index of the sensor being active when the panel
844
+ is being armed.
845
+ :param zone_name: The name of the sensor
846
+ """
847
+ _LOGGER.debug('on_door_open_when_arming: %s %s', event_id, zone_name)
848
+ sensor = await self.find_sensor(event_id, zone_name)
849
+ if sensor:
850
+ # Set the low battery flag on the sensor
851
+ # pylint: disable=protected-access
852
+ sensor._set_door_open_when_arming(True)
853
+ # Invoke per-sensor callback if provided
854
+ G90Callback.invoke(sensor.door_open_when_arming_callback)
855
+
856
+ G90Callback.invoke(self._door_open_when_arming_cb, event_id, zone_name)
857
+
858
+ @property
859
+ def door_open_when_arming_callback(
860
+ self
861
+ ) -> Optional[DoorOpenWhenArmingCallback]:
862
+ """
863
+ Door open when arming callback, which is invoked when sensor reports
864
+ the condition.
865
+ """
866
+ return self._door_open_when_arming_cb
867
+
868
+ @door_open_when_arming_callback.setter
869
+ def door_open_when_arming_callback(
870
+ self, value: DoorOpenWhenArmingCallback
871
+ ) -> None:
872
+ self._door_open_when_arming_cb = value
873
+
874
+ @property
875
+ async def tamper_callback(self) -> Optional[TamperCallback]:
876
+ """
877
+ Tamper callback, which is invoked when sensor reports the condition.
878
+ """
879
+ return self._tamper_cb
880
+
881
+ @tamper_callback.setter
882
+ def tamper_callback(self, value: TamperCallback) -> None:
883
+ self._tamper_cb = value
884
+
769
885
  async def listen_device_notifications(self) -> None:
770
886
  """
771
887
  Starts internal listener for device notifications/alerts.
pyg90alarm/const.py CHANGED
@@ -201,6 +201,7 @@ class G90AlertSources(IntEnum):
201
201
  """
202
202
  DEVICE = 0
203
203
  SENSOR = 1
204
+ TAMPER = 3
204
205
  REMOTE = 10
205
206
  RFID = 11
206
207
  DOORBELL = 12
@@ -159,6 +159,16 @@ class G90DeviceNotifications(DatagramProtocol):
159
159
 
160
160
  return
161
161
 
162
+ # An open door is detected when arming
163
+ if notification.kind == G90NotificationTypes.DOOR_OPEN_WHEN_ARMING:
164
+ g90_zone_info = G90ZoneInfo(*notification.data)
165
+ _LOGGER.debug('Door open detected when arming: %s', g90_zone_info)
166
+ G90Callback.invoke(
167
+ self.on_door_open_when_arming,
168
+ g90_zone_info.idx, g90_zone_info.name
169
+ )
170
+ return
171
+
162
172
  _LOGGER.warning('Unknown notification received from %s:%s:'
163
173
  ' kind %s, data %s',
164
174
  addr[0], addr[1], notification.kind, notification.data)
@@ -259,11 +269,15 @@ class G90DeviceNotifications(DatagramProtocol):
259
269
  )
260
270
  # Regular alarm
261
271
  else:
262
- _LOGGER.debug('Alarm: %s', alert.zone_name)
272
+ is_tampered = alert.state == G90AlertStates.TAMPER
273
+ _LOGGER.debug(
274
+ 'Alarm: %s, is tampered: %s', alert.zone_name, is_tampered
275
+ )
263
276
  G90Callback.invoke(
264
277
  self.on_alarm,
265
- alert.event_id, alert.zone_name
278
+ alert.event_id, alert.zone_name, is_tampered
266
279
  )
280
+
267
281
  handled = True
268
282
 
269
283
  # Host SOS
@@ -372,6 +386,16 @@ class G90DeviceNotifications(DatagramProtocol):
372
386
  :param name: Name of the sensor.
373
387
  """
374
388
 
389
+ async def on_door_open_when_arming(
390
+ self, event_id: int, zone_name: str
391
+ ) -> None:
392
+ """
393
+ Invoked when door open is detected when panel is armed.
394
+
395
+ :param event_id: Index of the sensor.
396
+ :param zone_name: Name of the sensor that reports door open.
397
+ """
398
+
375
399
  async def on_door_open_close(
376
400
  self, event_id: int, zone_name: str, is_open: bool
377
401
  ) -> None:
@@ -391,7 +415,9 @@ class G90DeviceNotifications(DatagramProtocol):
391
415
  :param zone_name: Name of the sensor that reports low battery.
392
416
  """
393
417
 
394
- async def on_alarm(self, event_id: int, zone_name: str) -> None:
418
+ async def on_alarm(
419
+ self, event_id: int, zone_name: str, is_tampered: bool
420
+ ) -> None:
395
421
  """
396
422
  Invoked when device triggers the alarm.
397
423
 
@@ -32,7 +32,10 @@ from enum import IntEnum, IntFlag
32
32
  from ..definitions.sensors import SENSOR_DEFINITIONS, SensorDefinition
33
33
  from ..const import G90Commands
34
34
  if TYPE_CHECKING:
35
- from ..alarm import G90Alarm, SensorStateCallback, SensorLowBatteryCallback
35
+ from ..alarm import (
36
+ G90Alarm, SensorStateCallback, SensorLowBatteryCallback,
37
+ SensorDoorOpenWhenArmingCallback, SensorTamperCallback,
38
+ )
36
39
 
37
40
 
38
41
  @dataclass
@@ -101,6 +104,16 @@ class G90SensorUserFlags(IntFlag):
101
104
  ALERT_WHEN_AWAY_AND_HOME = 32
102
105
  ALERT_WHEN_AWAY = 64
103
106
  SUPPORTS_UPDATING_SUBTYPE = 512 # Only relevant for cord sensors
107
+ # Flags that can be set by the user
108
+ USER_SETTABLE = (
109
+ ENABLED
110
+ | ARM_DELAY
111
+ | DETECT_DOOR
112
+ | DOOR_CHIME
113
+ | INDEPENDENT_ZONE
114
+ | ALERT_WHEN_AWAY_AND_HOME
115
+ | ALERT_WHEN_AWAY
116
+ )
104
117
 
105
118
 
106
119
  class G90SensorProtocols(IntEnum):
@@ -157,6 +170,7 @@ class G90SensorTypes(IntEnum):
157
170
  _LOGGER = logging.getLogger(__name__)
158
171
 
159
172
 
173
+ # pylint: disable=too-many-public-methods
160
174
  class G90Sensor: # pylint:disable=too-many-instance-attributes
161
175
  """
162
176
  Interacts with sensor on G90 alarm panel.
@@ -186,6 +200,12 @@ class G90Sensor: # pylint:disable=too-many-instance-attributes
186
200
  self._state_callback: Optional[SensorStateCallback] = None
187
201
  self._low_battery_callback: Optional[SensorLowBatteryCallback] = None
188
202
  self._low_battery = False
203
+ self._tampered = False
204
+ self._door_open_when_arming_callback: Optional[
205
+ SensorDoorOpenWhenArmingCallback
206
+ ] = None
207
+ self._tamper_callback: Optional[SensorTamperCallback] = None
208
+ self._door_open_when_arming = False
189
209
  self._proto_idx = proto_idx
190
210
  self._extra_data: Any = None
191
211
 
@@ -238,6 +258,37 @@ class G90Sensor: # pylint:disable=too-many-instance-attributes
238
258
  def low_battery_callback(self, value: SensorLowBatteryCallback) -> None:
239
259
  self._low_battery_callback = value
240
260
 
261
+ @property
262
+ def door_open_when_arming_callback(
263
+ self
264
+ ) -> Optional[SensorDoorOpenWhenArmingCallback]:
265
+ """
266
+ Callback that is invoked when the sensor reports on open door
267
+ condition when arming.
268
+
269
+ :return: Sensor's door open when arming callback
270
+ """
271
+ return self._door_open_when_arming_callback
272
+
273
+ @door_open_when_arming_callback.setter
274
+ def door_open_when_arming_callback(
275
+ self, value: SensorDoorOpenWhenArmingCallback
276
+ ) -> None:
277
+ self._door_open_when_arming_callback = value
278
+
279
+ @property
280
+ def tamper_callback(self) -> Optional[SensorTamperCallback]:
281
+ """
282
+ Callback that is invoked when the sensor reports being tampered.
283
+
284
+ :return: Sensor's tamper callback
285
+ """
286
+ return self._tamper_callback
287
+
288
+ @tamper_callback.setter
289
+ def tamper_callback(self, value: SensorTamperCallback) -> None:
290
+ self._tamper_callback = value
291
+
241
292
  @property
242
293
  def occupancy(self) -> bool:
243
294
  """
@@ -365,12 +416,16 @@ class G90Sensor: # pylint:disable=too-many-instance-attributes
365
416
  def is_low_battery(self) -> bool:
366
417
  """
367
418
  Indicates if the sensor is reporting low battery.
419
+
420
+ The condition is cleared when the sensor reports activity (i.e. is no
421
+ longer low on battery as it is able to report the activity).
368
422
  """
369
423
  return self._low_battery
370
424
 
371
425
  def _set_low_battery(self, value: bool) -> None:
372
426
  """
373
427
  Sets low battery state of the sensor.
428
+
374
429
  Intentionally private, as low battery state is derived from
375
430
  notifications/alerts.
376
431
 
@@ -383,6 +438,56 @@ class G90Sensor: # pylint:disable=too-many-instance-attributes
383
438
  )
384
439
  self._low_battery = value
385
440
 
441
+ @property
442
+ def is_tampered(self) -> bool:
443
+ """
444
+ Indicates if the sensor has been tampered.
445
+
446
+ The condition is cleared when panel is armed/disarmed next time.
447
+ """
448
+ return self._tampered
449
+
450
+ def _set_tampered(self, value: bool) -> None:
451
+ """
452
+ Sets tamper state of the sensor.
453
+
454
+ Intentionally private, as tamper state is derived from
455
+ notifications/alerts.
456
+
457
+ :param value: Tamper state
458
+ """
459
+ _LOGGER.debug(
460
+ "Setting tamper for sensor index=%s '%s': %s"
461
+ " (previous value: %s)",
462
+ self.index, self.name, value, self._tampered
463
+ )
464
+ self._tampered = value
465
+
466
+ @property
467
+ def is_door_open_when_arming(self) -> bool:
468
+ """
469
+ Indicates if the sensor reports on open door when arming.
470
+
471
+ The condition is cleared when panel is armed/disarmed next time.
472
+ """
473
+ return self._door_open_when_arming
474
+
475
+ def _set_door_open_when_arming(self, value: bool) -> None:
476
+ """
477
+ Sets door open state of the sensor when arming.
478
+
479
+ Intentionally private, as door open state is derived from
480
+ notifications/alerts.
481
+
482
+ :param value: Door open state
483
+ """
484
+ _LOGGER.debug(
485
+ "Setting door open when arming for sensor index=%s '%s': %s"
486
+ " (previous value: %s)",
487
+ self.index, self.name, value, self._door_open_when_arming
488
+ )
489
+ self._door_open_when_arming = value
490
+
386
491
  @property
387
492
  def enabled(self) -> bool:
388
493
  """
@@ -392,18 +497,26 @@ class G90Sensor: # pylint:disable=too-many-instance-attributes
392
497
  """
393
498
  return self.user_flag & G90SensorUserFlags.ENABLED != 0
394
499
 
395
- async def set_enabled(self, value: bool) -> None:
500
+ async def set_user_flag(self, value: G90SensorUserFlags) -> None:
396
501
  """
397
- Sets disabled/enabled state of the sensor.
502
+ Sets user flags of the sensor.
398
503
 
399
- :param value: Whether to enable or disable the sensor
504
+ :param value: User flags to set, values other than
505
+ :attr:`.G90SensorUserFlags.USER_SETTABLE` will be ignored and
506
+ preserved from existing sensor flags.
400
507
  """
508
+ if value & ~G90SensorUserFlags.USER_SETTABLE:
509
+ _LOGGER.warning(
510
+ 'User flags for sensor index=%s contain non-user settable'
511
+ ' flags, those will be ignored: %s',
512
+ self.index, repr(value & ~G90SensorUserFlags.USER_SETTABLE)
513
+ )
401
514
  # Checking private attribute directly, since `mypy` doesn't recognize
402
515
  # the check for sensor definition to be defined if done over
403
516
  # `self.supports_enable_disable` property
404
517
  if not self._definition:
405
518
  _LOGGER.warning(
406
- 'Manipulating with enable/disable for sensor index=%s'
519
+ 'Manipulating with user flags for sensor index=%s'
407
520
  ' is unsupported - no sensor definition for'
408
521
  ' type=%s, subtype=%s',
409
522
  self.index,
@@ -431,7 +544,7 @@ class G90Sensor: # pylint:disable=too-many-instance-attributes
431
544
  if not sensors:
432
545
  _LOGGER.error(
433
546
  'Sensor index=%s not found when attempting to set its'
434
- ' enable/disable state',
547
+ ' user flag',
435
548
  self.index,
436
549
  )
437
550
  return
@@ -444,30 +557,30 @@ class G90Sensor: # pylint:disable=too-many-instance-attributes
444
557
  ) != self._protocol_data:
445
558
  _LOGGER.error(
446
559
  "Sensor index=%s '%s' has been changed externally,"
447
- " refusing to alter its enable/disable state",
560
+ " refusing to alter its user flag",
448
561
  self.index,
449
562
  self.name
450
563
  )
451
564
  return
452
565
 
453
- # Modify the value of the user flag setting enabled/disabled one
454
- # appropriately.
455
- user_flag = self.user_flag
456
- if value:
457
- user_flag |= G90SensorUserFlags.ENABLED
458
- else:
459
- user_flag &= ~G90SensorUserFlags.ENABLED
566
+ prev_user_flag = self.user_flag
460
567
 
461
568
  # Re-instantiate the protocol data with modified user flags
462
569
  _data = asdict(self._protocol_data)
463
- _data['user_flag_data'] = user_flag
570
+ _data['user_flag_data'] = (
571
+ # Preserve flags that are not user-settable
572
+ self.user_flag & ~G90SensorUserFlags.USER_SETTABLE
573
+ ) | (
574
+ # Combine them with the new user-settable flags
575
+ value & G90SensorUserFlags.USER_SETTABLE
576
+ )
464
577
  self._protocol_data = self._protocol_incoming_data_kls(**_data)
465
578
 
466
579
  _LOGGER.debug(
467
- 'Sensor index=%s: %s enabled flag, resulting user_flag %s',
580
+ 'Sensor index=%s: previous user_flag %s, resulting user_flag %s',
468
581
  self._protocol_data.index,
469
- 'Setting' if value else 'Clearing',
470
- self.user_flag
582
+ repr(prev_user_flag),
583
+ repr(self.user_flag)
471
584
  )
472
585
 
473
586
  # Generate protocol data from write operation, deriving values either
@@ -494,6 +607,20 @@ class G90Sensor: # pylint:disable=too-many-instance-attributes
494
607
  G90Commands.SETSINGLESENSOR, list(astuple(outgoing_data))
495
608
  )
496
609
 
610
+ async def set_enabled(self, value: bool) -> None:
611
+ """
612
+ Sets the sensor enabled/disabled.
613
+ """
614
+
615
+ # Modify the value of the user flag setting enabled/disabled one
616
+ # appropriately.
617
+ user_flag = self.user_flag
618
+ if value:
619
+ user_flag |= G90SensorUserFlags.ENABLED
620
+ else:
621
+ user_flag &= ~G90SensorUserFlags.ENABLED
622
+ await self.set_user_flag(user_flag)
623
+
497
624
  @property
498
625
  def extra_data(self) -> Any:
499
626
  """
@@ -528,6 +655,8 @@ class G90Sensor: # pylint:disable=too-many-instance-attributes
528
655
  'supports_enable_disable': self.supports_enable_disable,
529
656
  'is_wireless': self.is_wireless,
530
657
  'is_low_battery': self.is_low_battery,
658
+ 'is_tampered': self.is_tampered,
659
+ 'is_door_open_when_arming': self.is_door_open_when_arming,
531
660
  }
532
661
 
533
662
  def __repr__(self) -> str:
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: pyg90alarm
3
- Version: 1.17.1
3
+ Version: 1.19.0
4
4
  Summary: G90 Alarm system protocol
5
5
  Home-page: https://github.com/hostcc/pyg90alarm
6
6
  Author: Ilia Sotnikov
@@ -1,10 +1,10 @@
1
1
  pyg90alarm/__init__.py,sha256=5AITRm5jZSzuQaL7PS8fZZMZb4-IuGRhSqyAdfTt0Cs,2236
2
- pyg90alarm/alarm.py,sha256=GMft1R4Yp70VeWQLHApE8yVcfsDBbzhbHj1rc_gIj8k,35947
2
+ pyg90alarm/alarm.py,sha256=dOhe2C2zsJ55VE5NJF-PE7pKRF_YOCF70ACJbDYEgF8,40196
3
3
  pyg90alarm/base_cmd.py,sha256=Bz7yoZ0RpkcjWARya664DKAPo3goD6BeaKtuW-hA804,9902
4
4
  pyg90alarm/callback.py,sha256=3JsD_JChmZD24OyjaCP-PxxuBDBX7myGYhkM4RN7bk4,3742
5
5
  pyg90alarm/config.py,sha256=2YtIgdT7clQXmYvkdn_fhIdS05CY8E1Yc90R8_tAmRI,1961
6
- pyg90alarm/const.py,sha256=0EkfCtySEPi6W0TO-j-F1y7_MVFaMOuKDY1Bx6QGDDQ,6617
7
- pyg90alarm/device_notifications.py,sha256=61oruR70snBRXNzOfj313TO7p2TmbEk-dH9AA1nkDkY,16687
6
+ pyg90alarm/const.py,sha256=uBzDUSlVO3FZxLI11bzfCm6JTI2_ciageyf43JLSehg,6632
7
+ pyg90alarm/device_notifications.py,sha256=pqkeKYORUUZUEovUKajuu8JHCtXD0ulAZIKelNfn2Eg,17602
8
8
  pyg90alarm/discovery.py,sha256=fwyBHDCKGej06OwhpbVCHYTRU9WWkeYysAFgv3FiwqI,3575
9
9
  pyg90alarm/exceptions.py,sha256=eiOcRe7D18EIPyPFDNU9DdFgbnkwPmkiLl8lGPOhBNw,1475
10
10
  pyg90alarm/history.py,sha256=5NfgB0V-7TZlMNHEjtRbOA0ZtJfQTgh2ysZIg5RM7ck,9080
@@ -19,9 +19,9 @@ pyg90alarm/definitions/__init__.py,sha256=s0NZnkW_gMH718DJbgez28z9WA231CyszUf1O_
19
19
  pyg90alarm/definitions/sensors.py,sha256=rKOu21ZpI44xk6aMh_vBjniFqnsNTc1CKwAvnv4PYLQ,19904
20
20
  pyg90alarm/entities/__init__.py,sha256=hHb6AOiC4Tz--rOWiiICMdLaZDs1Tf_xpWk_HeS_gO4,66
21
21
  pyg90alarm/entities/device.py,sha256=f_LHvKCAqTEebZ4mrRh3CpPUI7o-OvpvOfyTRCbftJs,2818
22
- pyg90alarm/entities/sensor.py,sha256=4r8ouAYTZB8ih8I4ncWdQOaifYsRxaC-ukY9jvnrRvk,16139
23
- pyg90alarm-1.17.1.dist-info/LICENSE,sha256=f884inRbeNv-O-hbwz62Ro_1J8xiHRTnJ2cCx6A0WvU,1070
24
- pyg90alarm-1.17.1.dist-info/METADATA,sha256=7lYmor4_swZNNn3P2yF7FRse5Hz4X3xpgAeNE55t0LA,7714
25
- pyg90alarm-1.17.1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
26
- pyg90alarm-1.17.1.dist-info/top_level.txt,sha256=czHiGxYMyTk5QEDTDb0EpPiKqUMRa8zI4zx58Ii409M,11
27
- pyg90alarm-1.17.1.dist-info/RECORD,,
22
+ pyg90alarm/entities/sensor.py,sha256=2FiFlH9JTw_5yprFUSHzRNfQB-TRMhcTJqa-zNVm0Ak,20324
23
+ pyg90alarm-1.19.0.dist-info/LICENSE,sha256=f884inRbeNv-O-hbwz62Ro_1J8xiHRTnJ2cCx6A0WvU,1070
24
+ pyg90alarm-1.19.0.dist-info/METADATA,sha256=kHSIfs1IrWMBkor4nWhqM3Tsn4CEZodb5NKKQ4x3COg,7714
25
+ pyg90alarm-1.19.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
26
+ pyg90alarm-1.19.0.dist-info/top_level.txt,sha256=czHiGxYMyTk5QEDTDb0EpPiKqUMRa8zI4zx58Ii409M,11
27
+ pyg90alarm-1.19.0.dist-info/RECORD,,