pyg90alarm 2.5.2__py3-none-any.whl → 2.6.0__py3-none-any.whl

pyg90alarm/__init__.py

@@ -33,7 +33,8 @@ from .entities.sensor import (
 )
 from .entities.device import G90Device
 from .local.host_info import (
-    G90HostInfo, G90HostInfoWifiStatus, G90HostInfoGsmStatus
+    G90HostInfo, G90HostInfoWifiStatus, G90HostInfoGsmStatus,
+    G90HostInfoWifiSetupProgress,
 )
 from .definitions.sensors import (
     G90SensorDefinitions
@@ -81,7 +82,7 @@ __all__ = [
     'G90Device',
     # Panel information and status
     'G90HostInfo', 'G90HostInfoWifiStatus', 'G90HostInfoGsmStatus',
-    'G90HostStatus',
+    'G90HostStatus', 'G90HostInfoWifiSetupProgress',
     # Types for alerts and notifications
     'G90MessageTypes', 'G90NotificationTypes', 'G90ArmDisarmTypes',
     'G90AlertTypes', 'G90AlertSources', 'G90AlertStates',

pyg90alarm/local/host_info.py

@@ -43,10 +43,23 @@ class G90HostInfoWifiStatus(IntEnum):
     """
     POWERED_OFF = 0
     NOT_CONNECTED = 1
-    NO_SIGNAL = 2
+    SERVER_NOT_CONNECTED = 2
     OPERATIONAL = 3
 
 
+class G90HostInfoWifiSetupProgress(IntEnum):
+    """
+    Defines possible values of Wifi connection progress.
+    """
+    IDLE = 0
+    CONNECTING = 1
+    OK = 2
+    WRONG_SSID = 3
+    WRONG_PASSWORD = 4
+    CONNECTION_ERROR = 5
+    WIFI_ERROR = 6
+
+
 @dataclass
 class G90HostInfo:  # pylint: disable=too-many-instance-attributes
     """
@@ -60,11 +73,11 @@ class G90HostInfo:  # pylint: disable=too-many-instance-attributes
     wifi_hw_version: str
     gsm_status_data: int
     wifi_status_data: int
-    reserved1: int
-    reserved2: int
-    band_frequency: str
-    gsm_signal_level: int
-    wifi_signal_level: int
+    gprs_3g_active_data: int
+    wifi_setup_progress_data: int
+    battery_voltage: str  # in mV
+    gsm_signal_level: int  # percentage 0-100
+    wifi_signal_level: int  # percentage 0-100
 
     @property
     def gsm_status(self) -> G90HostInfoGsmStatus:
@@ -82,6 +95,21 @@ class G90HostInfo:  # pylint: disable=too-many-instance-attributes
         """
         return G90HostInfoWifiStatus(self.wifi_status_data)
 
+    @property
+    def wifi_setup_progress(self) -> G90HostInfoWifiSetupProgress:
+        """
+        Translates the Wifi connection progress received from the device into
+        corresponding enum.
+        """
+        return G90HostInfoWifiSetupProgress(self.wifi_setup_progress_data)
+
+    @property
+    def gprs_3g_active(self) -> bool:
+        """
+        Indicates whether GPRS/3G is enabled.
+        """
+        return bool(self.gprs_3g_active_data)
+
     def _asdict(self) -> Dict[str, Any]:
         """
         Returns the host information as dictionary.

pyg90alarm/local/net_config.py

@@ -132,8 +132,22 @@ class G90NetConfig(DataclassLoadSave):
     def apn_auth(self) -> G90APNAuth:
         """
         Returns the APN authentication method as an enum.
+
+        Some panels might send values outside of the defined enum range,
+        presumably when SIM card is absent. In such cases, returns
+        `G90APNAuth.NONE`.
+
+        No attempt is made to correct the invalid value in the underlying
+        data field, since the panel is trusted - unless the value is modified
+        and saved back to the device.
+
+        :return: APN authentication method, or G90APNAuth.NONE if the received
+         value is invalid.
         """
-        return G90APNAuth(self._apn_auth)
+        try:
+            return G90APNAuth(self._apn_auth)
+        except ValueError:
+            return G90APNAuth.NONE
 
     @apn_auth.setter
     def apn_auth(self, value: G90APNAuth) -> None:

{pyg90alarm-2.5.2.dist-info → pyg90alarm-2.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyg90alarm
-Version: 2.5.2
+Version: 2.6.0
 Summary: G90 Alarm system protocol
 Home-page: https://github.com/hostcc/pyg90alarm
 Author: Ilia Sotnikov

{pyg90alarm-2.5.2.dist-info → pyg90alarm-2.6.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pyg90alarm/__init__.py,sha256=ehUcPV8O2jBszU3hPAfI91nXjj2UXIfYjoREvL4QE2c,3719
+pyg90alarm/__init__.py,sha256=Z1Y5bwYmtY5iycIv6IDQ464o4Q-sU7fo9S3f94NGOpg,3786
 pyg90alarm/alarm.py,sha256=BDBVQ8qRa2Bx2-786uytShTw8znlFEWakxweCGvgxME,50130
 pyg90alarm/callback.py,sha256=9PVtjRs2MLn80AgiM-UJNL8ZJF4_PxcopJIpxMmB3vc,4707
 pyg90alarm/const.py,sha256=cpaMlb8rqE1EfvmUEh3Yd_29dNO0usIo_Y-esPBh8B0,8012
@@ -32,9 +32,9 @@ pyg90alarm/local/config.py,sha256=QYetAc6QLrAN8T-37D4Esifvao52w_uJ01nHciLbGME,13
 pyg90alarm/local/discovery.py,sha256=8YVIXuNe57lhas0VSRf7QXZH83pEDGNj9oehNY4Kh2U,3576
 pyg90alarm/local/history.py,sha256=sL6_Z1BNYkuUwAZUi78d4p5hhcCfsXKw29i4Qu1O60M,10811
 pyg90alarm/local/host_config.py,sha256=RSvg2UXPTCzzwDW6Iz3CyFtjxPUzSSdlxRMqGpWA61M,7445
-pyg90alarm/local/host_info.py,sha256=4lFIaFEpYd3EvgNrDJmKijTrzX9i29nFISLLlXGnkmE,2759
+pyg90alarm/local/host_info.py,sha256=gdneg2XxxMNSFfNTjXCqsBsLZgZr_wg38sudKJ24RD8,3550
 pyg90alarm/local/host_status.py,sha256=WHGtw-A0wHILqVWP4DnZhXj8DPRGyS26AV0bL1isTz4,1863
-pyg90alarm/local/net_config.py,sha256=rK4dcC_kaalLQZcUp7FSOuV0eoj1oclvY7x_6lwYY0k,5453
+pyg90alarm/local/net_config.py,sha256=Y4-SUVSukk-h5x3LK-HH3IlM72dP_46nj1H8lN9rTfo,5998
 pyg90alarm/local/notifications.py,sha256=Vs6NQJciYqDALV-WwzH6wIcTGdX_UD4XBuHWjSOpCDY,4591
 pyg90alarm/local/paginated_cmd.py,sha256=5pPVP8f4ydjgu8Yq6MwqINJAUt52fFlD17wO4AI88Pc,4467
 pyg90alarm/local/paginated_result.py,sha256=p_e8QAVznp1Q5Xi9ifjb9Bx-S3ZiAkVlPKrY6r0bYLs,5483
@@ -43,8 +43,8 @@ pyg90alarm/local/user_data_crc.py,sha256=JQBOPY3RlOgVtvR55R-rM8OuKjYW-BPXQ0W4pi6
 pyg90alarm/notifications/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyg90alarm/notifications/base.py,sha256=d3N_zNPa_jcTX4QpA78jdgMHDhmrgwqyM3HdvuO14Jk,16682
 pyg90alarm/notifications/protocol.py,sha256=TlZQ3P8-N-E2X5bzkGefz432x4lBYyIBF9VriwYn9ds,4790
-pyg90alarm-2.5.2.dist-info/licenses/LICENSE,sha256=f884inRbeNv-O-hbwz62Ro_1J8xiHRTnJ2cCx6A0WvU,1070
-pyg90alarm-2.5.2.dist-info/METADATA,sha256=p4czqnkSngTxWXKDioMg8r2RIfZmFFbDGiQiSjXTAN8,12568
-pyg90alarm-2.5.2.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
-pyg90alarm-2.5.2.dist-info/top_level.txt,sha256=czHiGxYMyTk5QEDTDb0EpPiKqUMRa8zI4zx58Ii409M,11
-pyg90alarm-2.5.2.dist-info/RECORD,,
+pyg90alarm-2.6.0.dist-info/licenses/LICENSE,sha256=f884inRbeNv-O-hbwz62Ro_1J8xiHRTnJ2cCx6A0WvU,1070
+pyg90alarm-2.6.0.dist-info/METADATA,sha256=VDotWAaE433s73_xrvXL1dpHDBG2T9o10-UuASDBvRs,12568
+pyg90alarm-2.6.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+pyg90alarm-2.6.0.dist-info/top_level.txt,sha256=czHiGxYMyTk5QEDTDb0EpPiKqUMRa8zI4zx58Ii409M,11
+pyg90alarm-2.6.0.dist-info/RECORD,,

{pyg90alarm-2.5.2.dist-info → pyg90alarm-2.6.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.10.1)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any