qolsys-controller 0.0.23__py3-none-any.whl → 0.0.25__py3-none-any.whl

qolsys_controller/database/table_dimmerlight.py

@@ -12,7 +12,7 @@ class QolsysTableDimmerLight(QolsysTable):
         super().__init__(db, cursor)
         self._uri = "content://com.qolsys.qolsysprovider.DimmerLightsContentProvider/dimmerlight"
         self._table = "dimmerlight"
-        self._abort_on_error = True
+        self._abort_on_error = False
         self._implemented = True
 
         self._columns = [

qolsys_controller/database/table_doorlock.py

@@ -12,7 +12,7 @@ class QolsysTableDoorLock(QolsysTable):
         super().__init__(db, cursor)
         self._uri = "content://com.qolsys.qolsysprovider.DoorLocksContentProvider/doorlock"
         self._table = "doorlock"
-        self._abort_on_error = True
+        self._abort_on_error = False
         self._implemented = True
 
         self._columns = [

qolsys_controller/database/table_qolsyssettings.py

@@ -12,7 +12,7 @@ class QolsysTableQolsysSettings(QolsysTable):
         super().__init__(db, cursor)
         self._uri = "content://com.qolsys.qolsysprovider.QolsysSettingsProvider/qolsyssettings"
         self._table = "qolsyssettings"
-        self._abort_on_error = True
+        self._abort_on_error = False
         self._implemented = True
 
 

qolsys_controller/database/table_sensor.py

@@ -40,6 +40,7 @@ class QolsysTableSensor(QolsysTable):
             "zone_supervised",
             "zone_two_way_voice_enabled",
             "zone_reporting_enabled",
+            "zone_feature1",
             "battery_status",
             "created_date",
             "created_by",

qolsys_controller/database/table_weather.py

@@ -12,7 +12,7 @@ class QolsysTableWeather(QolsysTable):
         super().__init__(db, cursor)
         self._uri = "content://com.qolsys.qolsysprovider.ForecastWeatherContentProvider/weather"
         self._table = "weather"
-        self._abort_on_error = True
+        self._abort_on_error = False
         self._implemented = True
 
         self._columns = [

qolsys_controller/database/table_zwave_node.py

@@ -12,7 +12,7 @@ class QolsysTableZwaveNode(QolsysTable):
         super().__init__(db, cursor)
         self._uri = "content://com.qolsys.qolsysprovider.ZwaveContentProvider/zwave_node"
         self._table = "zwave_node"
-        self._abort_on_error = True
+        self._abort_on_error = False
         self._implemented = True
 
         self._columns = [

qolsys_controller/plugin_remote.py

@@ -1,4 +1,5 @@
 import asyncio
+import base64
 import datetime
 import json
 import logging
@@ -192,7 +193,7 @@ class QolsysPluginRemote(QolsysPlugin):
 
                 await self.aiomqtt.__aenter__()
 
-                LOGGER.debug("MQTT: Client Connected")
+                LOGGER.info("MQTT: Client Connected")
 
                 # Subscribe to panel internal databse updates
                 await self.aiomqtt.subscribe("iq2meid")
@@ -200,10 +201,13 @@ class QolsysPluginRemote(QolsysPlugin):
                 # Subscribte to MQTT commands response
                 await self.aiomqtt.subscribe("response_" + self.settings.random_mac, qos=self.settings.mqtt_qos)
 
-                # Only log mastermeid traffic for debug purposes
+                # Subscribe to Z-Wave response
+                await self.aiomqtt.subscribe("ZWAVE_RESPONSE", qos=self.settings.mqtt_qos)
+
+                # Only log all traffic for debug purposes
                 if self.log_mqtt_mesages:
                     # Subscribe to MQTT commands send to panel by other devices
-                    await self.aiomqtt.subscribe("mastermeid", qos=self.settings.mqtt_qos)
+                    #await self.aiomqtt.subscribe("mastermeid", qos=self.settings.mqtt_qos)
 
                     # Subscribe to all topics
                     await self.aiomqtt.subscribe("#", qos=self.settings.mqtt_qos)
@@ -282,6 +286,14 @@ class QolsysPluginRemote(QolsysPlugin):
                     data = json.loads(message.payload.decode())
                     self.panel.parse_iq2meid_message(data)
 
+                # Panel Z-Wave response
+                if message.topic.matches("ZWAVE_RESPONSE"):
+                    data = json.loads(message.payload.decode())
+                    zwave = data.get("ZWAVE_RESPONSE","")
+                    decoded_payload = base64.b64decode(zwave.get("ZWAVE_PAYLOAD","")).hex()
+                    LOGGER.debug("Z-Wave Response: Node(%s) - Status(%s) - Payload(%s)",zwave.get("NODE_ID",""),zwave.get("ZWAVE_COMMAND_STATUS",""),decoded_payload)
+
+
         except aiomqtt.MqttError as err:
             self.connected = False
             self.connected_observer.notify()
@@ -851,6 +863,67 @@ class QolsysPluginRemote(QolsysPlugin):
 
         return True
 
+    async def command_zwave_doorlock_set(self, node_id: int, locked:bool) -> None:
+        LOGGER.debug("MQTT: Sending zwave_doorlock_set command: EXPERIMENTAL")
+        LOGGER.debug("MQTT: Sending zwave_doorlock_set command - Node(%s) - Locked(%s)",node_id,locked)
+
+        command = 68
+
+        # 0 unlocked
+        # 255 lockeck
+        lock_mode = 0
+        if locked:
+            lock_mode = 255
+
+        ipcRequest = [{
+                "dataType": "int",
+                "dataValue": node_id,
+            },
+            {
+                "dataType": "int",
+                "dataValue": 0,
+            },
+            {
+                "dataType": "byteArray",
+                "dataValue": [command,lock_mode],
+            },
+            {
+                "dataType": "int",
+                "dataValue": 0,
+            },
+            {
+                "dataType": "int",
+                "dataValue": 106,
+            },
+            {
+                "dataType": "byteArray",
+                "dataValue": [0],
+            },
+        ]
+
+        topic = "mastermeid"
+        eventName = "ipcCall"
+        ipcServiceName = "qzwaveservice"
+        ipcInterfaceName = "android.os.IQZwaveService"
+        ipcTransactionID = 47
+        requestID = str(uuid.uuid4())
+        remoteMacAddress = self.settings.random_mac
+        responseTopic = "response_" + self.settings.random_mac
+
+        payload = {
+            "eventName": eventName,
+            "ipcServiceName": ipcServiceName,
+            "ipcInterfaceName": ipcInterfaceName,
+            "ipcTransactionID": ipcTransactionID,
+            "ipcRequest": ipcRequest,
+            "requestID": requestID,
+            "responseTopic": responseTopic,
+            "remoteMacAddress": remoteMacAddress,
+        }
+
+        await self.send_command(topic, payload, requestID)
+        LOGGER.debug("MQTT: Receiving zwave_doorlock_set command")
+
     async def command_zwave_thermostat_setpoint_set(self, node_id: int, mode:ThermostatMode, setpoint:float) -> None:
         # Command 67
         LOGGER.debug("MQTT: Sending zwave_thermostat_setpoint_set command: EXPERIMENTAL")
@@ -941,14 +1014,16 @@ class QolsysPluginRemote(QolsysPlugin):
         remoteMacAddress = self.settings.random_mac
         responseTopic = "response_" + self.settings.random_mac
 
-        payload = {"eventName": eventName,
-                   "ipcServiceName": ipcServiceName,
-                   "ipcInterfaceName": ipcInterfaceName,
-                   "ipcTransactionID": ipcTransactionID,
-                   "ipcRequest": ipcRequest,
-                   "requestID": requestID,
-                   "responseTopic": responseTopic,
-                   "remoteMacAddress": remoteMacAddress}
+        payload = {
+            "eventName": eventName,
+            "ipcServiceName": ipcServiceName,
+            "ipcInterfaceName": ipcInterfaceName,
+            "ipcTransactionID": ipcTransactionID,
+            "ipcRequest": ipcRequest,
+            "requestID": requestID,
+            "responseTopic": responseTopic,
+            "remoteMacAddress": remoteMacAddress
+        }
 
         await self.send_command(topic, payload, requestID)
         LOGGER.debug("MQTT: Receiving zwave_thermostat_mode_set command")

qolsys_controller/scene.py

@@ -53,7 +53,7 @@ class QolsysScene(QolsysObservable):
         return self._color
 
     @name.setter
-    def name(self, value: str) -> None: 
+    def name(self, value: str) -> None:
         if self._name != value:
             self._name = value
             self.notify()

qolsys_controller/state.py

@@ -234,8 +234,8 @@ class QolsysState(QolsysObservable):
                             break
 
                         # zwave node_id has changed of node_type, delete and add again
-                        # self.zwave_delete(int(state_zwave.node_id))  # noqa: ERA001
-                        # self.zwave_add(db_zwave)  # noqa: ERA001
+                        # self.zwave_delete(int(state_zwave.node_id))
+                        # self.zwave_add(db_zwave)
 
         # Add new zwave device
         for db_zwave in db_zwaves:

{qolsys_controller-0.0.23.dist-info → qolsys_controller-0.0.25.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qolsys-controller
-Version: 0.0.23
+Version: 0.0.25
 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.23.dist-info → qolsys_controller-0.0.25.dist-info}/RECORD

@@ -11,10 +11,10 @@ qolsys_controller/partition.py,sha256=j8FrWvA19_MpQvXDLKl5VvkqX_rcs4GWfFGwyQ2VFw
 qolsys_controller/pki.py,sha256=_e0tiNF8Hypb37cHr7x8yqUZDaqbzRzP45AitTtmzk4,8663
 qolsys_controller/plugin.py,sha256=Qh0irFbuw9R2QF3jOFTJw70ceVxK1ld5_sW7VnpOrA8,819
 qolsys_controller/plugin_c4.py,sha256=71o5Y7Y13GO0vWCPIsCtpqXxrplryyqt8ua5L8F4StQ,382
-qolsys_controller/plugin_remote.py,sha256=ZDQ7_LRL096nnpx5RucJHQBF8SEbgmkT0cp234z2oaM,47305
-qolsys_controller/scene.py,sha256=inRZNpAQ0BmQoSbeCSYc4HAP97srncBj1jqZDgGEjLI,1900
+qolsys_controller/plugin_remote.py,sha256=mxRu08PZ0UpIqo0zgXC3VLWD44H2AIxgOHWplLlHjZY,49792
+qolsys_controller/scene.py,sha256=b_8pzAJ08L7Nc-vouzkDxZKkcDQ239pLnvSDnN4g_oQ,1899
 qolsys_controller/settings.py,sha256=ywtlSN4TNUi0NRDjw77lr28fcUD8qYPHNVP67dCuGiQ,5421
-qolsys_controller/state.py,sha256=TGqSO7aj3l1H__NMGmRBP2Q54OGjNSaYFUn4E8kKhOE,16906
+qolsys_controller/state.py,sha256=8ZkHMY_mY--G8laxjrA96eTnPiG5AcFwE_MNgU9a3AQ,16874
 qolsys_controller/task_manager.py,sha256=IBFi1l9aId950wvRpvP6d4PHZhr3v1hnnt8NVulM3BI,1139
 qolsys_controller/utils_mqtt.py,sha256=2hf9_BnQbsWi8t0KBiK5MSsDgGjlbWVJi-Sd3H5VVt0,575
 qolsys_controller/zone.py,sha256=2CPtYHbAhPqe74yKsDFrwLYHnS27HDPrAvw85IwSMGE,11366
@@ -31,8 +31,8 @@ qolsys_controller/database/table_alarmedsensor.py,sha256=BZ6K9CQbcXRw0rf6WODS0NF
 qolsys_controller/database/table_automation.py,sha256=1qCdSIX2ALSdGxkZdMbHWT43VjqX4WgmNed4HcC7wc8,1287
 qolsys_controller/database/table_country_locale.py,sha256=OkjqGhYhYaGptZGN74eJI-dkRYSv_Cpex_zCs93v1Wo,1013
 qolsys_controller/database/table_dashboard_msgs.py,sha256=uImI4hHO-34vpTqmdXGFveiW5Nyo84nbMwFb7hB3l3w,847
-qolsys_controller/database/table_dimmerlight.py,sha256=XMknGgah2h7_6SpdLMe3c8lqePOg2jo9begcy0t3BXo,926
-qolsys_controller/database/table_doorlock.py,sha256=ebeYZcgUNKuXMjm4Y9X4QpVKLoxPyfbinfuoUT77qqo,952
+qolsys_controller/database/table_dimmerlight.py,sha256=C798oSncOvr9m7E7yk7PUipzAI4DmVNZ_Rv8n1-sztk,927
+qolsys_controller/database/table_doorlock.py,sha256=VQO25EyekWtLkkp7DHRVRReAjWxSNH2-cs2wpHXMD0M,953
 qolsys_controller/database/table_eu_event.py,sha256=D9tGGTX8oNBxSijcixCykOyqSOV_WbU8VqW_KYZOUGI,557
 qolsys_controller/database/table_heat_map.py,sha256=EtqlVajcMIBBN1USWyA-we76b1LsTA1UoM33TwEQaTY,747
 qolsys_controller/database/table_history.py,sha256=-8RRZGejDnF_-cNc4DoqPJZ0bbqpGPocdENpbkcsbhQ,798
@@ -45,9 +45,9 @@ qolsys_controller/database/table_output_rules.py,sha256=pYs1PQ1rv3-fIDcEI0i-jKOw
 qolsys_controller/database/table_partition.py,sha256=u1239frG6KwnXCk3-xcACZVvzrnxsdV17f175_oL9TE,672
 qolsys_controller/database/table_pgm_outputs.py,sha256=hZyR4tpTss1kP6UCVBBbJHH5LYBMNHAHbcCoeQcCc38,568
 qolsys_controller/database/table_powerg_device.py,sha256=TpXcA9nGkMeVwUG7eo7DQr9M-kHiWLtgIM3MtyMj_Fg,576
-qolsys_controller/database/table_qolsyssettings.py,sha256=qqqCVRAb7pQYjWCYnaavShorn-Uo_YM_tUNhW6e1E6o,684
+qolsys_controller/database/table_qolsyssettings.py,sha256=ryJylcS7vthhXlzEywwLRxbkkz2gmdnadMs0FkMD2yQ,685
 qolsys_controller/database/table_scene.py,sha256=DmUuWRSRUfpXxuFh_CzgYm_GkyyNe6DKQHhgl3AFkMs,846
-qolsys_controller/database/table_sensor.py,sha256=UbGhMpbyfeuqknnesfpswL8pHlvpOpPou-h-c6JxI5E,1765
+qolsys_controller/database/table_sensor.py,sha256=vav3YumgLpF37ARDEFiwWa1ddiiioEM0Jdugx5-Awwo,1794
 qolsys_controller/database/table_shades.py,sha256=Gzbh3VH89O9jYW-4Gf0wY14Jl6eSVGT_-IerMZ4-OHo,550
 qolsys_controller/database/table_smartsocket.py,sha256=bSBkiwbtDsQzH3teDtDmLzjqsmRcsoj70jI10vh8WhY,571
 qolsys_controller/database/table_state.py,sha256=amHZB0jFm_Z_DEg-9ChSGIxkJeXC70AW8N247GB8yww,681
@@ -56,13 +56,13 @@ qolsys_controller/database/table_thermostat.py,sha256=DIM_D_sKjMWW1Ey-awT_QOgft6
 qolsys_controller/database/table_trouble_conditions.py,sha256=2qnejp13C-WV2xdAs3xDNRT1HrnhlemmNhxV4EB72AQ,792
 qolsys_controller/database/table_user.py,sha256=VFKkQznQscanuaQG3UjFrMNx0xuv8wayQF5iBdj-Sao,1106
 qolsys_controller/database/table_virtual_device.py,sha256=AksA7HiUTIsBXtqqWcu884zr-XdS1i3WXP4MsHchEqM,580
-qolsys_controller/database/table_weather.py,sha256=wA3SGpGtpu75fO9OM4zokVmOWd1Fg72dcGBUV1zcsn0,816
+qolsys_controller/database/table_weather.py,sha256=EsaFosgdVs4tj9SZP1Af000uCatiZQvboKpvgQzw5IM,817
 qolsys_controller/database/table_zigbee_device.py,sha256=weB-ijTNWs-rLbkVauIdiz1oPM23JAgFgRf4t1EjyqI,574
 qolsys_controller/database/table_zwave_association_group.py,sha256=B8SHPU335a2wh8vPC9iJ0iVuPOo6PqO0t6vJzlf7ioM,942
 qolsys_controller/database/table_zwave_history.py,sha256=iLCkRZOsQmc5TQT0-IngyNkrG78kQrEhITPChmNt1bM,942
-qolsys_controller/database/table_zwave_node.py,sha256=hAsC7Qn6riqqViAJ61cBaCs5tmD9TmIv4_KynzkJFpU,2567
+qolsys_controller/database/table_zwave_node.py,sha256=5YDHwG139qLUx9BwzCJaqovMgdCcXng0dWOTTa75kQs,2568
 qolsys_controller/database/table_zwave_other.py,sha256=RzWuWMQA3czUNRWAP8SaAk6tiTeUgGl3J97npzW6AA0,573
-qolsys_controller-0.0.23.dist-info/METADATA,sha256=wyn7c464TqGrDHNHQqe9s68fUEIz8VpUlJUOfLGGRzc,4252
-qolsys_controller-0.0.23.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qolsys_controller-0.0.23.dist-info/licenses/LICENSE,sha256=GBHv9eggdA5ablDMW1xiLzGDZ2gCIhcKGW__c2aVIOc,1069
-qolsys_controller-0.0.23.dist-info/RECORD,,
+qolsys_controller-0.0.25.dist-info/METADATA,sha256=yvDieLSgjZyFq1j-cd-CFo-seVwrALzTwce2-f_PS20,4252
+qolsys_controller-0.0.25.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qolsys_controller-0.0.25.dist-info/licenses/LICENSE,sha256=GBHv9eggdA5ablDMW1xiLzGDZ2gCIhcKGW__c2aVIOc,1069
+qolsys_controller-0.0.25.dist-info/RECORD,,