qolsys-controller 0.0.42__py3-none-any.whl → 0.0.44__py3-none-any.whl

qolsys_controller/database/db.py

@@ -239,7 +239,7 @@ class QolsysDB:
 
     def get_powerg(self, short_id: str) -> dict:
         try:
-            self.cursor.execute(f"SELECT * FROM {self.table_powerg_device.table} WHERE shortID = ?",short_id)
+            self.cursor.execute(f"SELECT * FROM {self.table_powerg_device.table} WHERE shortID = ?",(short_id,))
             self.db.commit()
 
             row = self.cursor.fetchone()

qolsys_controller/database/table_powerg_device.py

@@ -13,7 +13,7 @@ class QolsysTablePowerGDevice(QolsysTable):
         self._uri = "content://com.qolsys.qolsysprovider.PowerGDeviceContentProvider/powerg_device"
         self._table = "powerg_device"
         self._abort_on_error = False
-        self._implemented = False
+        self._implemented = True
 
 
         self._columns = [

qolsys_controller/panel.py

@@ -1,3 +1,4 @@
+from hmac import new
 import json
 import logging
 
@@ -512,17 +513,17 @@ class QolsysPanel(QolsysObservable):
                                     scene.update(content_values)
 
                             # Update Trouble Conditions
-                            case self.db.table_trouble_conditions:
+                            case self.db.table_trouble_conditions.uri:
                                 self.db.table_trouble_conditions.update(selection,selection_argument,content_values)
                                 # No action needed
 
                             # Update EU_EVENT:
-                            case self.db.table_eu_event:
+                            case self.db.table_eu_event.uri:
                                 self.db.table_eu_event.update(selection,selection_argument,content_values)
                                 # No action needed
 
                             # Update PowerG Device
-                            case self.db.table_powerg_device:
+                            case self.db.table_powerg_device.uri:
                                 self.db.table_powerg_device.update(selection,selection_argument,content_values)
                                 short_id = content_values.get("shortID", "")
                                 zone = self._state.zone_from_short_id(short_id)
@@ -605,10 +606,10 @@ class QolsysPanel(QolsysObservable):
                                 self.db.table_dashboard_msgs.delete(selection, selection_argument)
                                 # No action needed
 
-                            case self.db.table_eu_event:
+                            case self.db.table_eu_event.uri:
                                 self.db.table_eu_event.delete(selection,selection_argument)
 
-                            case self.db.table_powerg_device:
+                            case self.db.table_powerg_device.uri:
                                 self.db.table_powerg_device.delete(selection,selection_argument)
 
                             case _:
@@ -736,11 +737,11 @@ class QolsysPanel(QolsysObservable):
                                 # No action needed
 
                             # EU_EVENT
-                            case self.db.table_eu_event:
+                            case self.db.table_eu_event.uri:
                                 self.db.table_eu_event.insert(data=content_values)
 
                             # PowerG Device
-                            case self.db.table_powerg_device:
+                            case self.db.table_powerg_device.uri:
                                 self.db.table_powerg_device.insert(data=content_values)
 
                             case _:
@@ -834,11 +835,10 @@ class QolsysPanel(QolsysObservable):
 
         # Create sensors array
         for zone_info in zones_list:
-
             new_zone = QolsysZone(zone_info,self._settings)
 
             if new_zone.current_capability == "POWERG":
-                LOGGER.debug("Loading PowerG device info for zone %s", new_zone.id)
+                LOGGER.debug("Loading PowerG device info for zone %s", new_zone.zone_id)
                 powerg_dict = self.db.get_powerg(short_id= new_zone.shortID)
                 LOGGER.debug("PowerG device info: %s", powerg_dict)
                 if powerg_dict is not None:

qolsys_controller/state.py

@@ -378,6 +378,12 @@ class QolsysState(QolsysObservable):
             LOGGER.debug("Zone%s (%s) - latestdBm: %s", zid, name, zone.latestdBm)
             LOGGER.debug("Zone%s (%s) - averagedBm: %s", zid, name, zone.averagedBm)
 
+            if zone.is_powerg_temperature_enabled():
+                LOGGER.debug("Zone%s (%s) - powerg_temperature: %s", zid, name, zone.powerg_temperature)
+
+            if zone.is_powerg_light_enabled():
+                LOGGER.debug("Zone%s (%s) - powerg_light: %s", zid, name, zone.powerg_light)
+
         for zwave in self.zwave_devices:
             if isinstance(zwave, QolsysDimmer):
                 nid = zwave.node_id

{qolsys_controller-0.0.42.dist-info → qolsys_controller-0.0.44.dist-info}/METADATA

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

@@ -6,7 +6,7 @@ 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=5X5kPIFH2mKZh372QhO4JlFaOkTxUE3QPuOeXrcW0_8,42686
+qolsys_controller/panel.py,sha256=VBDWZzL3EU7cjWZPQ-fP8xXgUOtLpg8Mjr6xmGdwbJE,42739
 qolsys_controller/partition.py,sha256=ZRSWDqXE1aPlTvxwSbvp28OyOXgTYOUH73zOtZFHIIo,8943
 qolsys_controller/pki.py,sha256=_e0tiNF8Hypb37cHr7x8yqUZDaqbzRzP45AitTtmzk4,8663
 qolsys_controller/plugin.py,sha256=Qh0irFbuw9R2QF3jOFTJw70ceVxK1ld5_sW7VnpOrA8,819
@@ -14,7 +14,7 @@ qolsys_controller/plugin_c4.py,sha256=71o5Y7Y13GO0vWCPIsCtpqXxrplryyqt8ua5L8F4St
 qolsys_controller/plugin_remote.py,sha256=rK6VxwURBji_yoWJAkSGZXPpIBqzLB3NB0iV8Sumk5g,49627
 qolsys_controller/scene.py,sha256=b_8pzAJ08L7Nc-vouzkDxZKkcDQ239pLnvSDnN4g_oQ,1899
 qolsys_controller/settings.py,sha256=Drv2Vg84h8ZVWzOIex9xs96AZmWZkBT7cM4yvPJB4zc,6113
-qolsys_controller/state.py,sha256=cpdneyXdEnSUbZ4D71hfAGiNKSX8Dfte-kRoVSTFTDE,17358
+qolsys_controller/state.py,sha256=azsJXAbrctL76Ww57plr_Bzvd2YU5JAE8dg-KpigjpE,17658
 qolsys_controller/task_manager.py,sha256=8TT1KhNHVjMIXTQz_vdUJ3eHgsKsUdPX3SHd29MP4pI,1629
 qolsys_controller/utils_mqtt.py,sha256=2hf9_BnQbsWi8t0KBiK5MSsDgGjlbWVJi-Sd3H5VVt0,575
 qolsys_controller/zone.py,sha256=fOB4HG39zM5zu4gMgQHxnR2rowh--RQ_JAHqRdPsYiE,16259
@@ -25,7 +25,7 @@ qolsys_controller/zwave_generic.py,sha256=gadtyUfPGsIzJaGc2zT5AQoFVxR_RsoagHE7x7
 qolsys_controller/zwave_lock.py,sha256=nodvZyjVurP5Eezjam4yRoFSfgnqlDM0e0MyXUqTpsQ,4971
 qolsys_controller/zwave_outlet.py,sha256=lxGB-jth11dHPUkT7jC411GdLCGDdct4mAGu05SndCA,185
 qolsys_controller/zwave_thermostat.py,sha256=IVe6F16aTt3v7ibC0C5X77jzmZOgNWNtfElMwVC3VXU,14610
-qolsys_controller/database/db.py,sha256=EDN4T_7vcXN6nUDYWY4CJ5sYHZoeZ8BXqycaK3vcC1w,15158
+qolsys_controller/database/db.py,sha256=YsuhIeHxobe5OSXwdklwjBYpUCynEx6Zuj9SzIi0YNo,15161
 qolsys_controller/database/table.py,sha256=eIbHt1UvcNxVje2w3g_YMnQGIY85_nOtkOMxUlVtSVI,6451
 qolsys_controller/database/table_alarmedsensor.py,sha256=BZ6K9CQbcXRw0rf6WODS0NFf1wptu5CxuRtsLQrCsSQ,808
 qolsys_controller/database/table_automation.py,sha256=1qCdSIX2ALSdGxkZdMbHWT43VjqX4WgmNed4HcC7wc8,1287
@@ -44,7 +44,7 @@ qolsys_controller/database/table_nest_device.py,sha256=Kgm2dsWQoCZoeAjlQSV_ZkehA
 qolsys_controller/database/table_output_rules.py,sha256=pYs1PQ1rv3-fIDcEI0i-jKOwH1L6nLhzAT3iCk0I5L4,571
 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=apE-B5fAmUxcwawQJ4SJvGPZCKU9V9zGeAz9DQ68gBU,1227
+qolsys_controller/database/table_powerg_device.py,sha256=UvpHSMd_Q8NZdX_NzskzNr6ApZKBgopVlIA9FyZvHWM,1226
 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=6mvGEYb8WRjIOm4Rj-UnHx3hpQrVpYfttcEinHFitq8,1895
@@ -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=bbL0WOH1kY8kdyfRUj2ZuOo0TNRXzX5i6CDtj4kb6YI,2609
 qolsys_controller/database/table_zwave_other.py,sha256=VlGO5VOTRQtq7NqquH_NryswxB_pwG3KoKjvrz2xGao,915
-qolsys_controller-0.0.42.dist-info/METADATA,sha256=OOY2cKXlAE8tAQnOqxtrk4h05cpSzBBeyCHzsyxexOY,4329
-qolsys_controller-0.0.42.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qolsys_controller-0.0.42.dist-info/licenses/LICENSE,sha256=GBHv9eggdA5ablDMW1xiLzGDZ2gCIhcKGW__c2aVIOc,1069
-qolsys_controller-0.0.42.dist-info/RECORD,,
+qolsys_controller-0.0.44.dist-info/METADATA,sha256=KYxsdLtI7Z_-hfUMYmRRBLbPsSLRViyUsKqskhNRq_o,4329
+qolsys_controller-0.0.44.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qolsys_controller-0.0.44.dist-info/licenses/LICENSE,sha256=GBHv9eggdA5ablDMW1xiLzGDZ2gCIhcKGW__c2aVIOc,1069
+qolsys_controller-0.0.44.dist-info/RECORD,,