pyg90alarm 1.10.1__tar.gz → 1.11.0__tar.gz

{pyg90alarm-1.10.1 → pyg90alarm-1.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyg90alarm
-Version: 1.10.1
+Version: 1.11.0
 Summary: G90 Alarm system protocol
 Home-page: https://github.com/hostcc/pyg90alarm
 Author: Ilia Sotnikov
@@ -22,10 +22,15 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: >=3.7, <4
 Description-Content-Type: text/x-rst
+License-File: LICENSE
 Provides-Extra: dev
+Requires-Dist: check-manifest; extra == "dev"
 Provides-Extra: test
+Requires-Dist: coverage; extra == "test"
+Requires-Dist: asynctest; extra == "test"
 Provides-Extra: docs
-License-File: LICENSE
+Requires-Dist: sphinx; extra == "docs"
+Requires-Dist: sphinx-rtd-theme; extra == "docs"
 
 .. image::  https://github.com/hostcc/pyg90alarm/actions/workflows/main.yml/badge.svg?branch=master
    :target: https://github.com/hostcc/pyg90alarm/tree/master

pyg90alarm-1.11.0/docs/requirements.txt

@@ -0,0 +1,10 @@
+sphinx-rtd-theme
+enum-tools[sphinx]
+pygments>=2.15.0 # not directly required, pinned by Snyk to avoid a vulnerability
+sphinx>=3.3.0 # not directly required, pinned by Snyk to avoid a vulnerability
+setuptools>=65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability
+certifi>=2023.7.22 # not directly required, pinned by Snyk to avoid a vulnerability
+requests>=2.32.0 # not directly required, pinned by Snyk to avoid a vulnerability
+jinja2>=3.1.4 # not directly required, pinned by Snyk to avoid a vulnerability
+requests>=2.31.0 # not directly required, pinned by Snyk to avoid a vulnerability
+idna>=3.7 # not directly required, pinned by Snyk to avoid a vulnerability

{pyg90alarm-1.10.1 → pyg90alarm-1.11.0}/src/pyg90alarm/definitions/sensors.py

@@ -475,6 +475,16 @@ SENSOR_DEFINITIONS = [
         rwMode=SensorRwMode.READ,
         matchMode=SensorMatchMode.ONLY20BITS
     ),
+    # Door Sensor WRDS01
+    SensorDefinition(
+        type=1,
+        subtype=3,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
     # Door Sensor
     SensorDefinition(
         type=1,
@@ -485,6 +495,96 @@ SENSOR_DEFINITIONS = [
         rwMode=SensorRwMode.READ,
         matchMode=SensorMatchMode.ONLY16BITS
     ),
+    # Glass Break Sensor BLPS
+    SensorDefinition(
+        type=2,
+        subtype=0,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
+    # Gas Detector WGD01
+    SensorDefinition(
+        type=3,
+        subtype=0,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
+    # Smoke Detector WSD02
+    SensorDefinition(
+        type=4,
+        subtype=0,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
+    # Smoke Detector WSD04
+    SensorDefinition(
+        type=4,
+        subtype=1,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
+    # Panic Button WEB01
+    SensorDefinition(
+        type=5,
+        subtype=1,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
+    # Panic Button WEB03
+    SensorDefinition(
+        type=5,
+        subtype=0,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
+    # Shock Sensor WSS01
+    SensorDefinition(
+        type=6,
+        subtype=0,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
+    # Water Detector LSTC02
+    SensorDefinition(
+        type=7,
+        subtype=1,
+        rx=0,
+        tx=0,
+        private_data='',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
+    # Water Detector LSTC01
+    SensorDefinition(
+        type=7,
+        subtype=0,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
     # PIR motion sensor WMS08
     SensorDefinition(
         type=8,
@@ -505,6 +605,66 @@ SENSOR_DEFINITIONS = [
         rwMode=SensorRwMode.READ,
         matchMode=SensorMatchMode.ONLY20BITS
     ),
+    # PIR motion sensor ODPIR
+    SensorDefinition(
+        type=8,
+        subtype=0,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
+    # PIR motion sensor N650
+    SensorDefinition(
+        type=8,
+        subtype=5,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
+    # PIR motion sensor WPD02
+    SensorDefinition(
+        type=8,
+        subtype=6,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
+    # PIR motion sensor WCMS02
+    SensorDefinition(
+        type=8,
+        subtype=8,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
+    # PIR motion sensor CWMS01
+    SensorDefinition(
+        type=8,
+        subtype=9,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
+    # PIR motion sensor WMS04
+    SensorDefinition(
+        type=8,
+        subtype=11,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
     # PIR motion sensor WMS07
     SensorDefinition(
         type=8,
@@ -515,6 +675,66 @@ SENSOR_DEFINITIONS = [
         rwMode=SensorRwMode.READ,
         matchMode=SensorMatchMode.ONLY20BITS
     ),
+    # PIR motion sensor ODPIR03
+    SensorDefinition(
+        type=8,
+        subtype=4,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
+    # PIR motion sensor WPD01
+    SensorDefinition(
+        type=8,
+        subtype=7,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
+    # PIR motion sensor PIR Ceiling
+    SensorDefinition(
+        type=8,
+        subtype=1,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
+    # Beams ABT
+    SensorDefinition(
+        type=9,
+        subtype=0,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
+    # Beams ABE
+    SensorDefinition(
+        type=9,
+        subtype=1,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
+    # Beams ABH
+    SensorDefinition(
+        type=9,
+        subtype=2,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
     # Remote RMC08
     SensorDefinition(
         type=10,
@@ -565,6 +785,16 @@ SENSOR_DEFINITIONS = [
         rwMode=SensorRwMode.READ,
         matchMode=SensorMatchMode.ONLY20BITS
     ),
+    # Door Bell WDB
+    SensorDefinition(
+        type=12,
+        subtype=1,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
     # TouchID Detector
     SensorDefinition(
         type=13,
@@ -595,7 +825,17 @@ SENSOR_DEFINITIONS = [
         rwMode=SensorRwMode.READ,
         matchMode=SensorMatchMode.ONLY16BITS
     ),
-    # Gas Detector WGD02
+    # Sub Host SS08S
+    SensorDefinition(
+        type=16,
+        subtype=0,
+        rx=0,
+        tx=0,
+        private_data='00',
+        rwMode=SensorRwMode.READ,
+        matchMode=SensorMatchMode.ALL
+    ),
+    # Gas Valve Detector WGD02
     SensorDefinition(
         type=18,
         subtype=0,

{pyg90alarm-1.10.1 → pyg90alarm-1.11.0}/src/pyg90alarm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyg90alarm
-Version: 1.10.1
+Version: 1.11.0
 Summary: G90 Alarm system protocol
 Home-page: https://github.com/hostcc/pyg90alarm
 Author: Ilia Sotnikov
@@ -22,10 +22,15 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: >=3.7, <4
 Description-Content-Type: text/x-rst
+License-File: LICENSE
 Provides-Extra: dev
+Requires-Dist: check-manifest; extra == "dev"
 Provides-Extra: test
+Requires-Dist: coverage; extra == "test"
+Requires-Dist: asynctest; extra == "test"
 Provides-Extra: docs
-License-File: LICENSE
+Requires-Dist: sphinx; extra == "docs"
+Requires-Dist: sphinx-rtd-theme; extra == "docs"
 
 .. image::  https://github.com/hostcc/pyg90alarm/actions/workflows/main.yml/badge.svg?branch=master
    :target: https://github.com/hostcc/pyg90alarm/tree/master

{pyg90alarm-1.10.1 → pyg90alarm-1.11.0}/tests/test_alarm.py

@@ -622,7 +622,7 @@ async def test_sensor_disable_externally_modified(mock_device):
 
 @pytest.mark.g90device(sent_data=[
     b'ISTART[102,'
-    b'[[1,1,1],["Water",10,0,7,0,0,33,0,0,17,1,0,""]'
+    b'[[1,1,1],["Unsupported",10,0,255,0,0,33,0,0,17,1,0,""]'
     b']]IEND\0',
     b"ISTARTIEND\0",
 ])

pyg90alarm-1.10.1/docs/requirements.txt

@@ -1,5 +0,0 @@
-sphinx-rtd-theme
-enum-tools[sphinx]
-pygments>=2.7.4 # not directly required, pinned by Snyk to avoid a vulnerability
-sphinx>=3.0.4 # not directly required, pinned by Snyk to avoid a vulnerability
-setuptools>=65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability