qolsys-controller 0.0.12__tar.gz → 0.0.14__tar.gz

{qolsys_controller-0.0.12 → qolsys_controller-0.0.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qolsys-controller
-Version: 0.0.12
+Version: 0.0.14
 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.12 → qolsys_controller-0.0.14}/pyproject.toml

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

{qolsys_controller-0.0.12 → qolsys_controller-0.0.14}/qolsys_controller/database/table_sensor.py

@@ -59,6 +59,7 @@ class QolsysTableSensor(QolsysTable):
             "averagedBm",
             "serial_number",
             "extras",
+            "allowspeaker",
         ]
 
         self._create_table()
@@ -70,9 +71,9 @@ class QolsysTableSensor(QolsysTable):
                              zone_two_way_voice_enabled, zone_reporting_enabled, battery_status,created_date,created_by,
                              updated_date,updated_by,frame_count,frame_type,current_capability,shortID,diag_24hr,
                              allowdisarming,device_capability,sub_type, signal_source, powerg_manufacture_id,parent_node,
-                             latestdBm,averagedBm,serial_number,extras,ac_status)
+                             latestdBm,averagedBm,serial_number,extras,ac_status,allowspeaker)
                               VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,
-                             ?,?,?,?,?,?,?,?,?,?,?)""", (
+                             ?,?,?,?,?,?,?,?,?,?,?,?)""", (
             data.get("_id"),
             data.get("version", ""),
             data.get("opr", ""),
@@ -116,6 +117,7 @@ class QolsysTableSensor(QolsysTable):
             data.get("averagedBm", ""),
             data.get("serial_number", ""),
             data.get("extras", ""),
-            data.get("ac_status", "")))
+            data.get("ac_status", ""),
+            data.get("allowspeaker", "")))
 
         self._db.commit()

{qolsys_controller-0.0.12 → qolsys_controller-0.0.14}/qolsys_controller/partition.py

@@ -39,6 +39,7 @@ class QolsysPartition(QolsysObservable):
 
         # Other
         self._command_exit_sounds = True
+        self._command_silent_disarming = False
         self._command_arm_stay_instant = True
 
     @property
@@ -81,6 +82,14 @@ class QolsysPartition(QolsysObservable):
     def command_arm_stay_instant(self) -> bool:
         return self._command_arm_stay_instant
 
+    @property
+    def command_silent_disarming(self) -> bool:
+        return self._command_silent_disarming
+
+    @command_silent_disarming.setter
+    def command_silent_disarming(self, value: bool) -> None:
+        self._command_silent_disarming = value
+
     @system_status.setter
     def system_status(self, new_value: PartitionSystemStatus) -> None:
         if self._system_status != new_value:

{qolsys_controller-0.0.12 → qolsys_controller-0.0.14}/qolsys_controller/plugin_remote.py

@@ -188,15 +188,15 @@ class QolsysPluginRemote(QolsysPlugin):
                 await self.aiomqtt.subscribe("iq2meid")
 
                 # Subscribte to MQTT commands response
-                await self.aiomqtt.subscribe("response_" + self.settings.random_mac, qos=2)
+                await self.aiomqtt.subscribe("response_" + self.settings.random_mac, qos=0)
 
                 # Only log mastermeid 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=2)
+                    await self.aiomqtt.subscribe("mastermeid", qos=0)
 
                     # Subscribe to all topics
-                    await self.aiomqtt.subscribe("#", qos=2)
+                    #await self.aiomqtt.subscribe("#", qos=0)
 
                 # Start mqtt_listent_task and mqtt_ping_task
                 self._task_manager.cancel(self._mqtt_task_listen_label)
@@ -446,7 +446,7 @@ class QolsysPluginRemote(QolsysPlugin):
             LOGGER.error("MQTT Client not configured")
             raise QolsysMqttError
 
-        await self.aiomqtt.publish(topic=topic, payload=json.dumps(json_payload), qos=2)
+        await self.aiomqtt.publish(topic=topic, payload=json.dumps(json_payload), qos=0)
         return await self._mqtt_command_queue.wait_for_response(request_id)
 
     async def command_connect(self) -> dict:
@@ -733,7 +733,7 @@ class QolsysPluginRemote(QolsysPlugin):
         LOGGER.debug("MQTT: Receiving pairing_request command")
         return response
 
-    async def command_ui_delay(self, partition_id: str) -> None:
+    async def command_ui_delay(self, partition_id: str,silent_disarming:bool = False) -> None:
         LOGGER.debug("MQTT: Sending ui_delay command")
 
         # partition state needs to be sent for ui_delay to work
@@ -744,6 +744,7 @@ class QolsysPluginRemote(QolsysPlugin):
             "panel_status": partition.system_status,
             "userID": 0,
             "partitionID": partition_id,  # STR EXPECTED
+            "silentDisarming":silent_disarming,
             "operation_source": 1,
             "macAddress": self.settings.random_mac,
         }
@@ -774,23 +775,21 @@ class QolsysPluginRemote(QolsysPlugin):
         await self.send_command(topic, payload, requestID)
         LOGGER.debug("MQTT: Receiving ui_delay command")
 
-    async def command_disarm(self, partition_id: str, user_code: str = "", exit_sounds: bool = True) -> bool:
-        LOGGER.debug("MQTT: Sending disarm command - check_user_code:%s", self.check_user_code_on_disarm)
-
+    async def command_disarm(self, partition_id: str, user_code: str = "", silent_disarming: bool = False) -> bool:
         partition = self.state.partition(partition_id)
         if not partition:
             LOGGER.debug("MQTT: disarm command error - Unknow Partition")
             return False
 
         # Do local user code verification
-        user_id = 0
+        user_id = 1
         if self.check_user_code_on_disarm:
             user_id = self.panel.check_user(user_code)
             if user_id == -1:
                 LOGGER.debug("MQTT: disarm command error - user_code error")
                 return False
 
-        async def get_mqtt_disarm_command() -> str:
+        async def get_mqtt_disarm_command(silent_disarming:bool) -> str:
             if partition.alarm_state == PartitionAlarmState.ALARM:
                 return "disarm_from_emergency"
             if partition.system_status in {PartitionSystemStatus.ARM_AWAY_EXIT_DELAY,
@@ -800,18 +799,20 @@ class QolsysPluginRemote(QolsysPlugin):
             if partition.system_status in {PartitionSystemStatus.ARM_AWAY,
                                            PartitionSystemStatus.ARM_STAY,
                                            PartitionSystemStatus.ARM_NIGHT}:
-                await self.command_ui_delay(partition_id)
+                await self.command_ui_delay(partition_id,silent_disarming)
                 return "disarm_the_panel_from_entry_delay"
+
             return "disarm_from_openlearn_sensor"
 
-        mqtt_disarm_command = await get_mqtt_disarm_command()
+        mqtt_disarm_command = await get_mqtt_disarm_command(silent_disarming)
+        LOGGER.debug("MQTT: Sending disarm command - check_user_code:%s", self.check_user_code_on_disarm)
+
 
         disarm_command = {
             "operation_name": mqtt_disarm_command,
             "userID": user_id,
             "partitionID": int(partition_id),  # INT EXPECTED
             "operation_source": 1,
-            "disarm_exit_sounds": exit_sounds,
             "macAddress": self.settings.random_mac,
         }