qolsys-controller 0.0.18__py3-none-any.whl → 0.0.19__py3-none-any.whl

qolsys_controller/enum_zwave.py

@@ -20,7 +20,7 @@ class ThermostatMode(Enum):
     MANUFACTURER_SPECEFIC: 0x8000
 
 
-class ThermostateFanMode(Enum):
+class ThermostatFanMode(Enum):
     AUTO_LOW: 0x0001
     LOW: 0x0002
     AUTO_HIGH: 0x0004

qolsys_controller/plugin_remote.py

@@ -9,6 +9,7 @@ import uuid
 import aiomqtt
 
 from .enum import PartitionAlarmState, PartitionSystemStatus
+from .enum_zwave import ThermostatFanMode, ThermostatMode
 from .errors import QolsysMqttError, QolsysSslError
 from .mdns import QolsysMDNS
 from .mqtt_command_queue import QolsysMqttCommandQueue
@@ -19,7 +20,6 @@ from .settings import QolsysSettings
 from .state import QolsysState
 from .task_manager import QolsysTaskManager
 from .utils_mqtt import generate_random_mac
-from .enum_zwave import ThermostateFanMode, ThermostatMode
 
 LOGGER = logging.getLogger(__name__)
 
@@ -853,15 +853,156 @@ class QolsysPluginRemote(QolsysPlugin):
 
     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: NOT IMPLEMENTED")
+        LOGGER.debug("MQTT: Sending zwave_thermostat_setpoint_set command: EXPERIMENTAL")
+        LOGGER.debug("MQTT: Sending zwave_thermostat_setpoint_set command")
+        ipcRequest = [{
+                "dataType": "int",
+                "dataValue": node_id,
+            },
+            {
+                "dataType": "int",
+                "dataValue": 0,
+            },
+            {
+                "dataType": "byteArray",
+                "dataValue": [67,1,mode,setpoint],
+            },
+            {
+                "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_thermostat_mode_set command")
 
     async def command_zwave_thermostat_mode_set(self, node_id: int, mode:ThermostatMode) -> None:
         # Command 64
-        LOGGER.debug("MQTT: Sending zwave_thermostat_mode_set command: NOT IMPLEMENTED")
+        LOGGER.debug("MQTT: Sending zwave_thermostat_mode_set command: EXPERIMENTAL")
+        LOGGER.debug("MQTT: Sending zwave_thermostat_mode_set command")
+        ipcRequest = [{
+                "dataType": "int",
+                "dataValue": node_id,
+            },
+            {
+                "dataType": "int",
+                "dataValue": 0,
+            },
+            {
+                "dataType": "byteArray",
+                "dataValue": [64,1,mode],
+            },
+            {
+                "dataType": "int",
+                "dataValue": 0,
+            },
+            {
+                "dataType": "int",
+                "dataValue": 106,
+            },
+            {
+                "dataType": "byteArray",
+                "dataValue": [0],
+            },
+        ]
 
-    async def command_zwave_thermostat_fan_mode_set(self, node_id: int, fan_mode:ThermostateFanMode) -> None:
+        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_thermostat_mode_set command")
+
+    async def command_zwave_thermostat_fan_mode_set(self, node_id: int, fan_mode:ThermostatFanMode) -> None:
         # Command 68
-        LOGGER.debug("MQTT: Sending zwave_thermostat_fan_mode_set command: NOT IMPLEMENTED")
+        LOGGER.debug("MQTT: Sending zwave_thermostat_fan_mode_set command: EXPERIMENTAL")
+        LOGGER.debug("MQTT: Sending zwave_thermostat_fan_mode_set command")
+        ipcRequest = [{
+                "dataType": "int",
+                "dataValue": node_id,
+            },
+            {
+                "dataType": "int",
+                "dataValue": 0,
+            },
+            {
+                "dataType": "byteArray",
+                "dataValue": [68,1,fan_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_thermostat_fan_mode_set command")
 
     async def command_zwave_switch_multi_level(self, node_id: int, level: int) -> None:
         LOGGER.debug("MQTT: Sending zwave_switch_multi_level command")
@@ -875,7 +1016,6 @@ class QolsysPluginRemote(QolsysPlugin):
             },
             {
                 # [38,1,level] ZWAVE MULTILEVELSWITCH SET (level 255 to set to previous state)
-                # [38,2] ZWAVE MULTILEVELSWITCH GET
                 "dataType": "byteArray",
                 "dataValue": [38,1,level],
             },

qolsys_controller/zwave_thermostat.py

@@ -1,8 +1,7 @@
 import logging
 
+from .enum_zwave import ThermostatFanMode, ThermostatMode
 from .zwave_device import QolsysZWaveDevice
-from .enum_zwave import ThermostateFanMode, ThermostatMode
-import ast
 
 LOGGER = logging.getLogger(__name__)
 
@@ -266,27 +265,27 @@ class QolsysThermostat(QolsysZWaveDevice):
         bitmask = int.from_bytes(byte_array, byteorder="little")
 
         mode_array = []
-        for mode in ThermostateFanMode:
+        for mode in ThermostatMode:
             if mode.value & bitmask:
                 mode_array.append(mode)
 
         return mode_array
 
-    def thermostat_fan_mode(self) -> ThermostateFanMode:
+    def thermostat_fan_mode(self) -> ThermostatFanMode:
         thermostat_fan_mode = int(self._thermostat_fan_mode)
         for mode in ThermostatMode:
             if thermostat_fan_mode == mode:
                 return mode
         return None
 
-    def available_thermostat_fan_mode(self) -> list[ThermostateFanMode]:
+    def available_thermostat_fan_mode(self) -> list[ThermostatFanMode]:
 
         int_list = [int(x) for x in self._thermostat_fan_mode_bitmask.split(",")]
         byte_array = bytes(int_list)
         bitmask = int.from_bytes(byte_array, byteorder="little")
 
         fan_mode_array = []
-        for mode in ThermostateFanMode:
+        for mode in ThermostatFanMode:
             if mode.value & bitmask:
                 fan_mode_array.append(mode)
 

{qolsys_controller-0.0.18.dist-info → qolsys_controller-0.0.19.dist-info}/METADATA

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

@@ -1,7 +1,7 @@
 qolsys_controller/__init__.py,sha256=TkjMFBP9VNyGLC84JQZ_tTeD8nJImkGgPMkQFGr2428,88
 qolsys_controller/controller.py,sha256=rLjMMZBJCPqrE9oY_vZRMFZAsIm5UlXyRtUao3F4Qr0,1309
 qolsys_controller/enum.py,sha256=oIOY0NE7L7b8zMp69sQghUnCG90IJU-RXbPqKP1Xx04,3294
-qolsys_controller/enum_zwave.py,sha256=DOCPvjzuXRjAs40CqS5KBFVFPT_51Sm06cfjaPYuhWE,741
+qolsys_controller/enum_zwave.py,sha256=q10YtzOXW3wfYORU1o7_WhTfb3GpC_xstjHzQAitHJ0,740
 qolsys_controller/errors.py,sha256=Z_eVJ4XqWucdn1lu_83DPnEKEG4L3FMfjhz5iO6RuBM,1176
 qolsys_controller/mdns.py,sha256=3_d-_K5Fyxc-2s0Fo1advTSpD72P369Hou1Ko0z__Ag,606
 qolsys_controller/mqtt_command_queue.py,sha256=FjSbjK3_3SXV5eQPfQ-k8HOI5Tbu2aWzAxe4uXymK64,937
@@ -11,7 +11,7 @@ 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=rgrVCcBJQNVaho-Efulb8lQlwlulQQ1M_Qyo1wAjkus,42603
+qolsys_controller/plugin_remote.py,sha256=ZDQ7_LRL096nnpx5RucJHQBF8SEbgmkT0cp234z2oaM,47305
 qolsys_controller/scene.py,sha256=inRZNpAQ0BmQoSbeCSYc4HAP97srncBj1jqZDgGEjLI,1900
 qolsys_controller/settings.py,sha256=ywtlSN4TNUi0NRDjw77lr28fcUD8qYPHNVP67dCuGiQ,5421
 qolsys_controller/state.py,sha256=VeJ5dzbxTQQ4aYkjKMAZLmrTuLOWkqSnLMJbcrFxLME,16904
@@ -24,7 +24,7 @@ qolsys_controller/zwave_garagedoor.py,sha256=xoR1I_qm4S0Ir6XvOC2Q9asq69NeJnJ4ZkV
 qolsys_controller/zwave_generic.py,sha256=gadtyUfPGsIzJaGc2zT5AQoFVxR_RsoagHE7x7knRzc,245
 qolsys_controller/zwave_lock.py,sha256=j80McYDNHFjSuaTxG6PJpYWjnQKlrAHlN3rSUUNlzL4,4979
 qolsys_controller/zwave_outlet.py,sha256=lxGB-jth11dHPUkT7jC411GdLCGDdct4mAGu05SndCA,185
-qolsys_controller/zwave_thermostat.py,sha256=5FZ0g79rUreIUSCafnU8Sex90DxaU75N3ZLMHBvanL4,14629
+qolsys_controller/zwave_thermostat.py,sha256=IVe6F16aTt3v7ibC0C5X77jzmZOgNWNtfElMwVC3VXU,14610
 qolsys_controller/database/db.py,sha256=Je1owq3HbSbd63hqx0U_fOBLLYRwMUpmtVpX74KVops,14510
 qolsys_controller/database/table.py,sha256=IBhNToCfLTum0Yu2cUcwaUGU7HvSm-oHu5lFVUgdFKQ,5871
 qolsys_controller/database/table_alarmedsensor.py,sha256=BZ6K9CQbcXRw0rf6WODS0NFf1wptu5CxuRtsLQrCsSQ,808
@@ -62,7 +62,7 @@ qolsys_controller/database/table_zwave_association_group.py,sha256=B8SHPU335a2wh
 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_other.py,sha256=RzWuWMQA3czUNRWAP8SaAk6tiTeUgGl3J97npzW6AA0,573
-qolsys_controller-0.0.18.dist-info/METADATA,sha256=_4DP5poVnjNeQk0knS6ZT2_Hma0KxN0CMptiK-e0ORI,4252
-qolsys_controller-0.0.18.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qolsys_controller-0.0.18.dist-info/licenses/LICENSE,sha256=GBHv9eggdA5ablDMW1xiLzGDZ2gCIhcKGW__c2aVIOc,1069
-qolsys_controller-0.0.18.dist-info/RECORD,,
+qolsys_controller-0.0.19.dist-info/METADATA,sha256=S1yEMC1xz-kbxtLDpz49UXD_cZO-2EkHbDQzlJ-Qf0s,4252
+qolsys_controller-0.0.19.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qolsys_controller-0.0.19.dist-info/licenses/LICENSE,sha256=GBHv9eggdA5ablDMW1xiLzGDZ2gCIhcKGW__c2aVIOc,1069
+qolsys_controller-0.0.19.dist-info/RECORD,,