Add dynamic parameter request option to C3_GetDeviceParam

vwout · Dec 30, 2023 · e8e2458 · e8e2458
1 parent 980c14e
commit e8e2458
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 19 deletions.
diff --git a/c3/controldevice.py b/c3/controldevice.py
@@ -34,7 +34,7 @@ class ControlDeviceBase(ABC):
       Param 3: 0 (null)
     Operation 3: Enable/disable normal open state
       Param 1: Door number
-      Param 2: Enable / disable (0: disable, 1: enable'
+      Param 2: Enable / disable (0: disable, 1: enable)
       Param 3: 0 (null)
     """
 

diff --git a/c3/core.py b/c3/core.py
@@ -7,7 +7,6 @@
 from dataclasses import dataclass, field
 from typing import Dict, Optional
 
-# import consts
 from c3 import consts, controldevice, crc, rtlog, utils
 
 
@@ -182,7 +181,7 @@ def _receive(self) -> tuple[bytearray, int, int]:
                 message = self._get_message(header + payload)
 
             if len(message) != data_size:
-                raise ValueError(f"Length of received message ({len(message)}) does not match specified size ({data_size})")
+                raise ValueError(f"Length of received message ({len(message)}) doesn't match specified ({data_size})")
 
             if received_command == consts.C3_REPLY_OK:
                 pass

diff --git a/cli/C3_CancelAlarms.py b/cli/C3_CancelAlarms.py
@@ -2,8 +2,8 @@
 import argparse
 import logging
 import sys
-from c3 import C3
-from c3 import controldevice
+
+from c3 import C3, controldevice
 
 
 def main():

diff --git a/cli/C3_Discover.py b/cli/C3_Discover.py
@@ -2,6 +2,7 @@
 import argparse
 import logging
 import sys
+
 from c3 import C3
 
 

diff --git a/cli/C3_GetDeviceParam.py b/cli/C3_GetDeviceParam.py
@@ -2,6 +2,7 @@
 import argparse
 import logging
 import sys
+
 from c3 import C3
 from c3.utils import C3DateTime
 
@@ -10,6 +11,7 @@ def main():
     parser = argparse.ArgumentParser()
     parser.add_argument('host', help='C3 panel IP address or host name')
     parser.add_argument('--password', help='Password')
+    parser.add_argument('--param', nargs='+', help='Parameter name(s) to request')
     args = parser.parse_args()
 
     print("Connecting to %s" % args.host)
@@ -22,15 +24,16 @@ def main():
             print("Device:")
             print(repr(panel))
 
-            params = panel.get_device_param(["~ZKFPVersion",
-                                             "~SerialNumber",
-                                             "FirmVer",
-                                             "DeviceName",
-                                             "LockCount",
-                                             "ReaderCount",
-                                             "AuxInCount",
-                                             "AuxOutCount",
-                                             "DateTime"])
+            param_names = args.param or ["~ZKFPVersion",
+                                         "~SerialNumber",
+                                         "FirmVer",
+                                         "DeviceName",
+                                         "LockCount",
+                                         "ReaderCount",
+                                         "AuxInCount",
+                                         "AuxOutCount",
+                                         "DateTime"]
+            params = panel.get_device_param(param_names)
 
             for k in params:
                 if k == "DateTime":

diff --git a/cli/C3_GetRTLog.py b/cli/C3_GetRTLog.py
@@ -3,8 +3,8 @@
 import logging
 import sys
 import time
-from c3 import C3
-from c3 import rtlog
+
+from c3 import C3, rtlog
 
 
 def main():

diff --git a/cli/C3_OutputOperation.py b/cli/C3_OutputOperation.py
@@ -2,9 +2,8 @@
 import argparse
 import logging
 import sys
-from c3 import C3
-from c3 import consts
-from c3 import controldevice
+
+from c3 import C3, consts, controldevice
 
 
 def main():