qolsys-controller 0.0.7__py3-none-any.whl → 0.0.9__py3-none-any.whl

qolsys_controller/panel.py

@@ -818,7 +818,6 @@ class QolsysPanel(QolsysObservable):
         LOGGER.debug("Android Version: %s", self.ANDROID_VERSION)
         LOGGER.debug("Hardware Version: %s", self.HARDWARE_VERSION)
         LOGGER.debug("MAC Address: %s", self.MAC_ADDRESS)
-        LOGGER.debug("MQTT remoteClientID: %s", self._settings.mqtt_remote_client_id)
         LOGGER.debug("Unique ID: %s", self.unique_id)
         LOGGER.debug("Panel Tamper State: %s", self.PANEL_TAMPER_STATE)
         LOGGER.debug("AC Status: %s", self.AC_STATUS)

qolsys_controller/pki.py

@@ -36,7 +36,7 @@ class QolsysPKI:
         return ":".join(self.id[i:i+2] for i in range(0, len(self.id), 2))
 
     def set_id(self, pki_id: str) -> None:
-        self._id = pki_id.replace(":", "").upper()
+        self._id = pki_id.replace(":", "").lower()
         LOGGER.debug("Using PKI: %s", self.formatted_id())
         self._subkeys_directory = self._settings.pki_directory.joinpath(Path(self.id))
 

qolsys_controller/plugin_remote.py

@@ -112,6 +112,7 @@ class QolsysPluginRemote(QolsysPlugin):
 
         # Set mqtt_remote_client_id
         self.settings.mqtt_remote_client_id = "qolsys-controller-" + self._pki.formatted_id()
+        LOGGER.debug("Using MQTT remoteClientID: %s", self.settings.mqtt_remote_client_id)
 
         # Check if plugin is paired
         if self.is_paired():
@@ -207,7 +208,6 @@ class QolsysPluginRemote(QolsysPlugin):
                 self.panel.imei = response_connect.get("master_imei", "")
                 self.panel.product_type = response_connect.get("primary_product_type", "")
 
-                await self.command_pairing_request()
                 await self.command_pingevent()
                 await self.command_timesync()
                 await self.command_pair_status_request()
@@ -490,11 +490,12 @@ class QolsysPluginRemote(QolsysPlugin):
 
         payload = {
             "eventName": eventName,
+            "pairing_request": True,
             "ipAddress": ipAddress,
             "macAddress": macAddress,
             "remoteClientID": remoteClientID,
             "softwareVersion": softwareVersion,
-            "producType": producType,
+            "productType": producType,
             "bssid": bssid,
             "dhcpInfo": json.dumps(dhcpInfo),
             "lastUpdateChecksum": lastUpdateChecksum,
@@ -689,9 +690,9 @@ class QolsysPluginRemote(QolsysPlugin):
         pairing_request = True
         ipAddress = self.settings.plugin_ip
         macAddress = self.settings.random_mac
-        remoteClientID = "QolsysController"
+        remoteClientID = self.settings.mqtt_remote_client_id
         softwareVersion = "4.4.1"
-        producType = "tab07_rk68"
+        productType = "tab07_rk68"
         bssid = ""
         lastUpdateChecksum = "2132501716"
         dealerIconsCheckSum = ""
@@ -717,7 +718,7 @@ class QolsysPluginRemote(QolsysPlugin):
             "macAddress": macAddress,
             "remoteClientID": remoteClientID,
             "softwareVersion": softwareVersion,
-            "producType": producType,
+            "producType": productType,
             "bssid": bssid,
             "dhcpInfo": json.dumps(dhcpInfo),
             "lastUpdateChecksum": lastUpdateChecksum,

qolsys_controller/settings.py

@@ -24,7 +24,7 @@ class QolsysSettings:
 
         # MQTT
         self._mqtt_timeout: int = 30
-        self._mqtt_ping: int = 15
+        self._mqtt_ping: int = 600
         self._mqtt_remote_client_id = ""
 
     @property
@@ -33,7 +33,7 @@ class QolsysSettings:
 
     @random_mac.setter
     def random_mac(self, random_mac: str) -> None:
-        self._random_mac = random_mac
+        self._random_mac = random_mac.lower()
 
     @property
     def plugin_ip(self) -> str:
@@ -90,6 +90,10 @@ class QolsysSettings:
     def mqtt_ping(self) -> int:
         return self._mqtt_ping
 
+    @mqtt_ping.setter
+    def mqtt_ping(self, ping:int) -> None:
+        self._mqtt_ping = ping
+
     @property
     def mqtt_remote_client_id(self) -> str:
         return self._mqtt_remote_client_id

{qolsys_controller-0.0.7.dist-info → qolsys_controller-0.0.9.dist-info}/METADATA

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

@@ -5,13 +5,13 @@ qolsys_controller/errors.py,sha256=Z_eVJ4XqWucdn1lu_83DPnEKEG4L3FMfjhz5iO6RuBM,1
 qolsys_controller/mdns.py,sha256=3_d-_K5Fyxc-2s0Fo1advTSpD72P369Hou1Ko0z__Ag,606
 qolsys_controller/mqtt_command_queue.py,sha256=FjSbjK3_3SXV5eQPfQ-k8HOI5Tbu2aWzAxe4uXymK64,937
 qolsys_controller/observable.py,sha256=X7uMnBHGpklPTa-RHKldXA0Rq38Cs1yOIuxl8ODeKV4,1049
-qolsys_controller/panel.py,sha256=1FSrAuhSoFfl-5-KttvCAItBm0SktYlq9ZPthYuXCvM,39456
+qolsys_controller/panel.py,sha256=2EZtnA9c_yVSL3Vtszq9SLae9ykSuKrzIxssa6LoAvk,39370
 qolsys_controller/partition.py,sha256=-Fos327y3MlSWwJCbDeQM51-K8uMHANxIJ8kN9-S5CA,8045
-qolsys_controller/pki.py,sha256=OoaNtnf-ZAjG7yg-y8eu_9yvlIrZzruxuwl6dTojhQg,8663
+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=Kc2GC7oDQI2wPrKlk1TtCpeFSK-3AkQuAzUdTYId894,37794
-qolsys_controller/settings.py,sha256=0cbp8UoIdyLYjDlnkIqrGm0ZDUkq3UlRhG2GXGx4_BM,5208
+qolsys_controller/plugin_remote.py,sha256=WwL_GJfKHIicgggbb7NsRjyObp-mkBbfE5Di-JBU2Z8,37889
+qolsys_controller/settings.py,sha256=2c8QLaEylpH2Wuol8EypYBIJhfniZXewb_54w8na2ts,5314
 qolsys_controller/state.py,sha256=eWn4KiWN75K83CVW224zekDUeIpgjh9tDfnpaOJWV3I,14360
 qolsys_controller/task_manager.py,sha256=IBFi1l9aId950wvRpvP6d4PHZhr3v1hnnt8NVulM3BI,1139
 qolsys_controller/utils_mqtt.py,sha256=2hf9_BnQbsWi8t0KBiK5MSsDgGjlbWVJi-Sd3H5VVt0,575
@@ -56,7 +56,7 @@ qolsys_controller/database/table_zwave_association_group.py,sha256=S_tWpfzzD44rJ
 qolsys_controller/database/table_zwave_history.py,sha256=4RiCzA_XFdXXVA9X48Z4eoxA_4DFKwdjkP2N6IHHOqQ,1897
 qolsys_controller/database/table_zwave_node.py,sha256=csESJCkcg8qAPn3KSL4jO9b1oymZ5wrQiXcmWR9vSc0,7302
 qolsys_controller/database/table_zwave_other.py,sha256=HJzLd4MUfNynE9jHiCzN7j1PFDncwQHeDkP5_8_s0YE,747
-qolsys_controller-0.0.7.dist-info/METADATA,sha256=BoMf9sKljaf_faBT1gVOT6Z5tQoRfjN8tOvkfpBcFpk,4174
-qolsys_controller-0.0.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qolsys_controller-0.0.7.dist-info/licenses/LICENSE,sha256=GBHv9eggdA5ablDMW1xiLzGDZ2gCIhcKGW__c2aVIOc,1069
-qolsys_controller-0.0.7.dist-info/RECORD,,
+qolsys_controller-0.0.9.dist-info/METADATA,sha256=9vHtOG_a73TykfmdsafPKk4PWgfcyxg4eAFxaoM1Ds4,4174
+qolsys_controller-0.0.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qolsys_controller-0.0.9.dist-info/licenses/LICENSE,sha256=GBHv9eggdA5ablDMW1xiLzGDZ2gCIhcKGW__c2aVIOc,1069
+qolsys_controller-0.0.9.dist-info/RECORD,,