qolsys-controller 0.0.38__tar.gz → 0.0.40__tar.gz

{qolsys_controller-0.0.38 → qolsys_controller-0.0.40}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qolsys-controller
-Version: 0.0.38
+Version: 0.0.40
 Summary: A Python module that emulates a virtual IQ Remote device, enabling full local control of a Qolsys IQ Panel
 Project-URL: Homepage, https://github.com/EHylands/QolsysController
 Project-URL: Issues, https://github.com/EHylands/QolsysController/issues

{qolsys_controller-0.0.38 → qolsys_controller-0.0.40}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "qolsys-controller"
-version = "0.0.38"
+version = "0.0.40"
 authors = [
   { name="Eric Hylands", email="" },
 ]

{qolsys_controller-0.0.38 → qolsys_controller-0.0.40}/qolsys_controller/database/table_doorlock.py

@@ -17,6 +17,7 @@ class QolsysTableDoorLock(QolsysTable):
 
         self._columns = [
             "_id",
+            "capabilities",
             "version",
             "opr",
             "partition_id",

{qolsys_controller-0.0.38 → qolsys_controller-0.0.40}/qolsys_controller/database/table_eu_event.py

@@ -13,12 +13,21 @@ class QolsysTableEuEvent(QolsysTable):
         self._uri = "content://com.qolsys.qolsysprovider.EUEventContentProvider/eu_event"
         self._table = "eu_event"
         self._abort_on_error = False
-        self._implemented = False
+        self._implemented = True
 
 
         self._columns = [
             "_id",
+            "version",
+            "opr",
+            "partition_id",
+            "history_id",
+            "device_id",
+            "device",
+            "events",
+            "time",
+            "ack",
+            "type",
         ]
 
         self._create_table()
-

qolsys_controller-0.0.40/qolsys_controller/database/table_powerg_device.py

@@ -0,0 +1,47 @@
+import logging  # noqa: INP001
+import sqlite3
+
+from .table import QolsysTable
+
+LOGGER = logging.getLogger(__name__)
+
+
+class QolsysTablePowerGDevice(QolsysTable):
+
+    def __init__(self, db: sqlite3.Connection, cursor: sqlite3.Cursor) -> None:
+        super().__init__(db, cursor)
+        self._uri = "content://com.qolsys.qolsysprovider.PowerGDeviceContentProvider/powerg_device"
+        self._table = "powerg_device"
+        self._abort_on_error = False
+        self._implemented = False
+
+
+        self._columns = [
+            "_id",
+            "avg_link_quality",
+            "battery_voltage",
+            "capabilities",
+            "dealer_code",
+            "extras",
+            "firmware_version",
+            "led",
+            "light",
+            "link_quality",
+            "link_status",
+            "longID",
+            "manufacturing_id",
+            "notification_period",
+            "opr",
+            "parent_node",
+            "partition_id",
+            "radio_id",
+            "radio_version",
+            "shortID",
+            "status_data",
+            "supported_type",
+            "temperature",
+            "version",
+            "writeable_capabilities",
+        ]
+
+        self._create_table()

{qolsys_controller-0.0.38 → qolsys_controller-0.0.40}/qolsys_controller/database/table_sensor.py

@@ -62,6 +62,7 @@ class QolsysTableSensor(QolsysTable):
             "latestdBm",
             "averagedBm",
             "serial_number",
+            "secondary_panel_mac_address",
             "extras",
             "allowspeaker",
         ]

{qolsys_controller-0.0.38 → qolsys_controller-0.0.40}/qolsys_controller/database/table_user.py

@@ -39,6 +39,7 @@ class QolsysTableUser(QolsysTable):
             "start_date",
             "tag_flag",
             "check_in_time",
+            "user_feature1",
         ]
 
         self._create_table()

{qolsys_controller-0.0.38 → qolsys_controller-0.0.40}/qolsys_controller/database/table_zwave_node.py

@@ -57,6 +57,7 @@ class QolsysTableZwaveNode(QolsysTable):
             "last_rediscover_time",
             "neighbour_info",
             "last_node_test_time",
+            "notification_capabilities",
             "endpoint",
             "endpoint_details",
             "device_wakeup_time",

{qolsys_controller-0.0.38 → qolsys_controller-0.0.40}/qolsys_controller/database/table_zwave_other.py

@@ -13,10 +13,23 @@ class QolsysTableZwaveOther(QolsysTable):
         self._uri = "content://com.qolsys.qolsysprovider.ZwaveOtherDeviceContentProvider/zwave_other"
         self._table = "zwave_other"
         self._abort_on_error = False
-        self._implemented = False
+        self._implemented = True
 
         self._columns = [
             "_id",
+            "created_date",
+            "device_name",
+            "device_params_1",
+            "device_params_2",
+            "endpoint",
+            "last_updated_date",
+            "node_id",
+            "node_type",
+            "opr",
+            "paired_status",
+            "partition_id",
+            "status",
+            "version",
         ]
 
         self._create_table()

{qolsys_controller-0.0.38 → qolsys_controller-0.0.40}/qolsys_controller/enum.py

@@ -47,6 +47,7 @@ class ZoneStatus(StrEnum):
 
 class ZoneSensorType(StrEnum):
     DOOR_WINDOW = "Door_Window"
+    DOORBELL = "Doorbell"
     MOTION = "Motion"
     GLASS_BREAK = "GlassBreak"
     KEY_FOB = "KeyFob"
@@ -62,7 +63,6 @@ class ZoneSensorType(StrEnum):
     SHOCK = "Shock"
     FREEZE = "Freeze"
     TILT = "Tilt"
-    DOORBELL = "Doorbell"
     SMOKE_M = "Smoke_M"
     # DOOR_WINDOW_M = "" #TBD
     # OCCUPANCY = ""  #TBD
@@ -73,22 +73,26 @@ class ZoneSensorType(StrEnum):
     BLUETOOTH = "Bluetooth"
     TAKEOVER_MODULE = "TakeoverModule"
     TRANSLATOR = "Translator"
+    TAMPER = "Tamper Sensor"
 
 
 class ZoneSensorGroup(StrEnum):
+    CO = "co"
     FIXED_INTRUSION = "fixedintrusion"
-    MOBILE_INTRUSION = "mobileintrusion"
     FIXED_SILENT = "fixedsilentkey"
+    MOBILE_INTRUSION = "mobileintrusion"
     MOBILE_SILENT = "mobilesilentkey"
     FIXED_AUXILIARY = "fixedmedical"
     FIXED_SILENT_AUXILIARY = "fixedsilentmedical"
+    LOCAL_SAFETY_SENSOR = "localsafety"
     MOBILE_AUXILIARY = "mobilemedical"
     MOBILE_SILENT_AUXILIARY = "mobilesilentmedical"
     SAFETY_MOTION = "safetymotion"
     GLASS_BREAK = "glassbreak"
     GLASS_BREAK_AWAY_ONLY = "glassbreakawayonly"
     SMOKE_HEAT = "smoke_heat"
-    CO = "co"
+    TAMPER_ZONE = "tamperzone"
+    SHOCK = "shock"
 
 
     # ENTRY_EXIT_NORMAL_DELAY = "" #TBD
@@ -96,7 +100,6 @@ class ZoneSensorGroup(StrEnum):
     # INSTANT_PERIMETER_DW = "" #TBD
     # INSTRANT_INTERIOR_DOOR = "" #TBD
     # AWAY_INSTANT_FOLLOWER_DELAY = "" #TBD
-    # LOCAL_SAFETY_SENSOR = "" #TBD
     # REPORTING_SAFETY_SENSOR = "" #TBD
     # DELAYED_REPORTING_SAFETY_SENSOR = "" #TBD
     # AWAY_INSTANT_MOTION = "" #TBD

{qolsys_controller-0.0.38 → qolsys_controller-0.0.40}/qolsys_controller/panel.py

@@ -516,6 +516,12 @@ class QolsysPanel(QolsysObservable):
                                 self.db.table_trouble_conditions.update(selection,selection_argument,content_values)
                                 # No action needed
 
+                            # Update EU_EVENT:
+                            case self.db.table_eu_event:
+                                self.db.table_eu_event.update(selection,selection_argument,content_values)
+                                # No action needed
+
+
 
                             case _:
                                 LOGGER.debug("iq2meid updating unknow uri:%s", uri)
@@ -592,6 +598,9 @@ class QolsysPanel(QolsysObservable):
                                 self.db.table_dashboard_msgs.delete(selection, selection_argument)
                                 # No action needed
 
+                            case self.db.table_eu_event:
+                                self.db.table_eu_event.delete(selection,selection_argument)
+
                             case _:
                                 LOGGER.debug("iq2meid deleting unknown uri:%s", uri)
                                 LOGGER.debug(data)
@@ -716,6 +725,10 @@ class QolsysPanel(QolsysObservable):
                                 self.db.table_dashboard_msgs.insert(data=content_values)
                                 # No action needed
 
+                            # EU_EVENT
+                            case self.db.table_eu_event:
+                                self.db.table_eu_event.insert(data=content_values)
+
                             case _:
                                 LOGGER.debug("iq2meid inserting unknow uri:%s", uri)
                                 LOGGER.debug(data)

qolsys_controller-0.0.38/qolsys_controller/database/table_powerg_device.py

@@ -1,23 +0,0 @@
-import logging  # noqa: INP001
-import sqlite3
-
-from .table import QolsysTable
-
-LOGGER = logging.getLogger(__name__)
-
-
-class QolsysTablePowerGDevice(QolsysTable):
-
-    def __init__(self, db: sqlite3.Connection, cursor: sqlite3.Cursor) -> None:
-        super().__init__(db, cursor)
-        self._uri = "content://com.qolsys.qolsysprovider.PowerGDeviceContentProvider/powerg_device"
-        self._table = "powerg_device"
-        self._abort_on_error = False
-        self._implemented = False
-
-
-        self._columns = [
-            "_id",
-        ]
-
-        self._create_table()