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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qolsys-controller
-Version: 0.0.14
+Version: 0.0.16
 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.14 → qolsys_controller-0.0.16}/example.py

@@ -26,7 +26,7 @@ async def main() -> None:  # noqa: D103
 
     # Additionnal remote plugin config
     remote.plugin.check_user_code_on_disarm = False  # Check user code in user.conf file
-    remote.plugin.log_mqtt_mesages = False  # Enable for MQTT debug purposes
+    remote.plugin.log_mqtt_mesages = True  # Enable for MQTT debug purposes
     remote.plugin.auto_discover_pki = True
 
     # Configure remote plugin
@@ -52,6 +52,12 @@ async def main() -> None:  # noqa: D103
 
     LOGGER.debug("Qolsys Panel Ready for operation")
 
+    #await asyncio.sleep(5)
+
+    #await remote.plugin.stop_operation()
+
+    LOGGER.debug("Qolsys Panel - Stopped")
+
     # Change Z-Wave dimmer
     # node_id: z-wane device id
     # level: 0-99, -1 to switch from off to previous on dimmer level
@@ -64,25 +70,26 @@ async def main() -> None:  # noqa: D103
     #                                   user_code="1111")
 
     # ARM_STAY
-    await asyncio.sleep(3)
-    await remote.plugin.command_arm(partition_id="0",
-                                    arming_type="ARM-NIGHT",
-                                    user_code="1111",
-                                    exit_sounds=False,
-                                    instant_arm=False)
+    #await asyncio.sleep(3)
+    #await remote.plugin.command_arm(partition_id="0",
+    #                                arming_type="ARM-STAY",
+    #                               user_code="1111",
+    #                                exit_sounds=False,
+    #                                instant_arm=True)
 
-    # DISARM
-    await asyncio.sleep(3)
-    await remote.plugin.command_disarm(partition_id="0",
-                                       user_code="1111")
 
     # ARM_AWAY
-    # await asyncio.sleep(3)
-    # await remote.plugin.command_arm(partition_id=0,
-    #                               arming_type='ARM-AWAY',
-    #                               user_code='1111',
-    #                                exit_sounds=True,
-    #                               instant_arm=False)
+    #await asyncio.sleep(3)
+    #await remote.plugin.command_arm(partition_id='0',
+    #                               arming_type="ARM-STAY",
+    #                               user_code="1111",
+    #                                exit_sounds=False,
+    #                               instant_arm=True)
+
+    # DISARM
+    #await asyncio.sleep(10)
+    #await remote.plugin.command_disarm(partition_id="0", user_code="1111", silent_disarming=True)
+
 
     # Use an asyncio.Event to keep the program running efficiently
     stop_event = asyncio.Event()

{qolsys_controller-0.0.14 → qolsys_controller-0.0.16}/pyproject.toml

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

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

@@ -39,8 +39,8 @@ class QolsysPartition(QolsysObservable):
 
         # Other
         self._command_exit_sounds = True
-        self._command_silent_disarming = False
         self._command_arm_stay_instant = True
+        self._command_arm_stay_silent_disarming = False
 
     @property
     def id(self) -> int:
@@ -83,12 +83,8 @@ class QolsysPartition(QolsysObservable):
         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
+    def command_arm_stay_silent_disarming(self) -> bool:
+        return self._command_arm_stay_silent_disarming
 
     @system_status.setter
     def system_status(self, new_value: PartitionSystemStatus) -> None:
@@ -188,6 +184,12 @@ class QolsysPartition(QolsysObservable):
         LOGGER.debug("Partition%s (%s) - arm_stay_instant: %s", self._id, self._name, value)
         self.notify()
 
+    @command_arm_stay_silent_disarming.setter
+    def command_arm_stay_silent_disarming(self, value: bool) -> None:
+        self._command_arm_stay_silent_disarming = value
+        LOGGER.debug("Partition%s (%s) - arm_stay_silent_disarming: %s", self._id, self._name, value)
+        self.notify()
+
     def update_partition(self, data: dict) -> None:
         # Check if we are updating same partition_id
         partition_id_update = data.get("partition_id", "")

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

@@ -34,6 +34,7 @@ class QolsysPluginRemote(QolsysPlugin):
 
         # Plugin
         self.certificate_exchange_server = None
+        self._check_user_code_on_arm = False
         self._check_user_code_on_disarm = True
         self._log_mqtt_messages = False
         self._task_manager = QolsysTaskManager()
@@ -62,6 +63,14 @@ class QolsysPluginRemote(QolsysPlugin):
     def check_user_code_on_disarm(self, check_user_code_on_disarm: bool) -> None:
         self._check_user_code_on_disarm = check_user_code_on_disarm
 
+    @property
+    def check_user_code_on_arm(self) -> bool:
+        return self._check_user_code_on_arm
+
+    @check_user_code_on_arm.setter
+    def check_user_code_on_arm(self, check_user_code_on_arm: bool) -> None:
+        self._check_user_code_on_arm = check_user_code_on_arm
+
     @property
     def auto_discover_pki(self) -> bool:
         return self._auto_discover_pki
@@ -903,7 +912,7 @@ class QolsysPluginRemote(QolsysPlugin):
             LOGGER.debug("MQTT: arm command error - Unknow Partition")
             return False
 
-        if self.panel.SECURE_ARMING == "true":
+        if self.panel.SECURE_ARMING == "true" and self.check_user_code_on_arm:
             # Do local user code verification to arm if secure arming is enabled
             user_id = self.panel.check_user(user_code)
             if user_id == -1: