zlgcan 0.1.15__cp38-cp38-win32.whl → 0.1.16__cp38-cp38-win32.whl

zlgcan/zlgcan.py

@@ -11,8 +11,8 @@ from can.bus import LOG
 
 from typing import Optional, Union, Sequence, Deque, Tuple, List, Dict
 try:
-    from zlgcan_driver_py import ZCanChlCfgPy, ZCanMessagePy, ZDeriveInfoPy, ZCanChlCfgFactoryWrap, ZCanDriverWrap, \
-        convert_to_python, convert_from_python, set_message_mode, zlgcan_cfg_factory_can, zlgcan_open, \
+    from zlgcan_driver import ZCanChlCfgPy, ZCanMessagePy, ZDeriveInfoPy, ZCanDriverWrap, \
+        convert_to_python, convert_from_python, set_message_mode, \
         zlgcan_device_info, zlgcan_init_can, zlgcan_clear_can_buffer, zlgcan_send, zlgcan_recv, zlgcan_close
 except ModuleNotFoundError:
     import sys
@@ -20,7 +20,7 @@ except ModuleNotFoundError:
     _system_bit, _ = platform.architecture()
     _platform = sys.platform
     not_support = CanError(f"The system {_platform}'.'{_system_bit} is not supported!")
-    require_lib = CanError("Please install library `zlgcan-driver-py`!")
+    require_lib = CanError("Please install library `zlgcan-driver`!")
     raise {
         "win32": {"32bit": not_support}.get(_system_bit, require_lib),
         "darwin": not_support,
@@ -161,20 +161,12 @@ class ZCanBus(can.BusABC):
             )  # type: Deque[can.Message]               # channel, raw_msg
             self.channels = []
 
-            factory = zlgcan_cfg_factory_can()
-            self.device = zlgcan_open(device_type, device_index, derive)
-
-            self.dev_info = zlgcan_device_info(self.device)
-            if self.dev_info is not None:
-                LOG.info(f"Device: {self.dev_info} has opened")
-
             cfg_list = []
             for idx, cfg in enumerate(configs):
                 bitrate = cfg.get("bitrate", None)
                 dbitrate = cfg.get("dbitrate", None)
                 assert bitrate is not None, "bitrate is required!"
                 _cfg = ZCanChlCfgPy(
-                    dev_type=device_type,
                     chl_type=cfg.get("chl_type", ZCanChlType.CANFD_ISO if dbitrate else ZCanChlType.CAN),
                     chl_mode=cfg.get("chl_mode", 0),
                     bitrate=bitrate,
@@ -188,7 +180,11 @@ class ZCanBus(can.BusABC):
                 cfg_list.append(_cfg)
                 self.channels.append(idx)
 
-            zlgcan_init_can(self.device, factory, cfg_list)
+            self.device = zlgcan_init_can(device_type, device_index, cfg_list, derive)
+
+            self.dev_info = zlgcan_device_info(self.device)
+            if self.dev_info is not None:
+                LOG.info(f"Device: {self.dev_info} has opened")
         except Exception as e:
             self.shutdown()
             raise e

{zlgcan-0.1.15.dist-info → zlgcan-0.1.16.dist-info}/METADATA

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: zlgcan
-Version: 0.1.15
+Version: 0.1.16
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Dist: python-can
 License-File: LICENSE.txt
 Summary: Python wrapper for zlgcan driver.
-Author: Smith Jesse
+Author: Jesse Smith
 License: LGPL v3
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM

zlgcan-0.1.16.dist-info/RECORD

@@ -0,0 +1,9 @@
+zlgcan-0.1.16.dist-info/METADATA,sha256=YbJ7PRuMYbZiwjg6cn4gdnH67vJrfhyD-mRB1Z4xH7s,4136
+zlgcan-0.1.16.dist-info/WHEEL,sha256=I0oh3Vvc4dQIPlo9T2OQSgeCvmDsIw855l8Cuc55nN8,90
+zlgcan-0.1.16.dist-info/entry_points.txt,sha256=1BprfQnq7A25SfDsPk1ZbOgMv_SmYEUWc7Xz-oAf-V4,45
+zlgcan-0.1.16.dist-info/licenses/LICENSE.txt,sha256=6n0EnHcF3BOvwgLdGOGCfzSE-CEv0_p7gvxKDDY0Msk,7816
+zlgcan/__init__.py,sha256=uspwQytd3RGSaVs6LQADIa9MS_qvzySlfL2S9OhFBQA,21
+zlgcan/zlgcan.py,sha256=Tyo7ITIkJlLdLYwh74zAXe-3QXsKaT27c1NLBVXcgAo,8642
+zlgcan_driver/__init__.py,sha256=JBAj4WkBypBiHIJqXHIJTNHF4kpmhRmKqY48oDAmY3E,135
+zlgcan_driver/zlgcan_driver.cp38-win32.pyd,sha256=VH7Ob_2QsMVL_P41HbzD2VotbMcwK-wt1tfDyjkovf8,638464
+zlgcan-0.1.16.dist-info/RECORD,,

zlgcan-0.1.15.dist-info/RECORD

@@ -1,9 +0,0 @@
-zlgcan-0.1.15.dist-info/METADATA,sha256=ZIaCCDdNIJ0th39KU8BJmaDxoM-DKEzjGXz01pZXWjk,4136
-zlgcan-0.1.15.dist-info/WHEEL,sha256=I0oh3Vvc4dQIPlo9T2OQSgeCvmDsIw855l8Cuc55nN8,90
-zlgcan-0.1.15.dist-info/entry_points.txt,sha256=1BprfQnq7A25SfDsPk1ZbOgMv_SmYEUWc7Xz-oAf-V4,45
-zlgcan-0.1.15.dist-info/licenses/LICENSE.txt,sha256=6n0EnHcF3BOvwgLdGOGCfzSE-CEv0_p7gvxKDDY0Msk,7816
-zlgcan/__init__.py,sha256=uspwQytd3RGSaVs6LQADIa9MS_qvzySlfL2S9OhFBQA,21
-zlgcan/zlgcan.py,sha256=pxJS2roQ3qny-Te3dzgNjVx-e8kbWO3l3hO_WJtYa-U,8848
-zlgcan_driver/__init__.py,sha256=JBAj4WkBypBiHIJqXHIJTNHF4kpmhRmKqY48oDAmY3E,135
-zlgcan_driver/zlgcan_driver.cp38-win32.pyd,sha256=jN1gYQaoOLTzfLlkcEn14h4qL16_YTJeNLn5_0VD58E,634880
-zlgcan-0.1.15.dist-info/RECORD,,