qolsys-controller 0.0.43__tar.gz → 0.0.45__tar.gz

{qolsys_controller-0.0.43 → qolsys_controller-0.0.45}/PKG-INFO

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

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

{qolsys_controller-0.0.43 → qolsys_controller-0.0.45}/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-0.0.43 → qolsys_controller-0.0.45}/qolsys_controller/panel.py

@@ -512,17 +512,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 +605,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 +736,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 +834,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:
@@ -922,3 +921,7 @@ class QolsysPanel(QolsysObservable):
         LOGGER.debug("Users list:")
         for user in self._users:
             LOGGER.debug("User: %s", user["id"])
+
+        LOGGER.debug("*** Plugin Information ***")
+        LOGGER.debug("Motion Delay Enabled: %s", self._settings.motion_sensor_delay)
+        LOGGER.debug("Motion Delay Value: %s", self._settings.motion_sensor_delay_sec)

{qolsys_controller-0.0.43 → qolsys_controller-0.0.45}/qolsys_controller/plugin_remote.py

@@ -403,7 +403,7 @@ class QolsysPluginRemote(QolsysPlugin):
                     await writer.drain()
 
                     # Sending CSR File to panel
-                    async with aiofiles.open(self._pki.csr_file_path, mode='rb') as f:
+                    async with aiofiles.open(self._pki.csr_file_path, mode="rb") as f:
                         content = await f.read()
                         LOGGER.debug("Sending to Panel: [CSR File Content]")
                         writer.write(content)

{qolsys_controller-0.0.43 → qolsys_controller-0.0.45}/qolsys_controller/state.py

@@ -352,7 +352,7 @@ class QolsysState(QolsysObservable):
                 self.partition_add(db_partition)
 
     def dump(self) -> None:  # noqa: PLR0915
-        LOGGER.debug("*** Information ***")
+        LOGGER.debug("*** Device Information ***")
 
         for partition in self.partitions:
             pid = partition.id
@@ -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