zlgcan 0.1.17__cp38-cp38-win32.whl → 0.2.0__cp38-cp38-win32.whl

zlgcan/zlgcan.py

@@ -131,6 +131,7 @@ class ZCanBus(can.BusABC):
 
     def __init__(self,
                  channel: Union[int, Sequence[int], str] = None, *,
+                 libpath: str = "library/",
                  device_type: int,
                  device_index: int = 0,
                  derive: ZDeriveInfoPy = None,
@@ -142,6 +143,7 @@ class ZCanBus(can.BusABC):
         Constructor
 
         :param channel: Not used(from super).
+        :param libpath: The library root path.
         :param device_type: The device type that your device belongs, see `ZCANDeviceType`.
         :param device_index: The device index.
         :param derive: The deriver info for specifying the channels and canfd supported if your device is not official.
@@ -180,7 +182,7 @@ class ZCanBus(can.BusABC):
                 cfg_list.append(_cfg)
                 self.channels.append(idx)
 
-            self.device = zlgcan_init_can(device_type, device_index, cfg_list, derive)
+            self.device = zlgcan_init_can(libpath, device_type, device_index, cfg_list, derive)
 
             self.dev_info = zlgcan_device_info(self.device)
             if self.dev_info is not None:
@@ -235,7 +237,9 @@ class ZCanBus(can.BusABC):
 
 
 if __name__ == '__main__':
-    with ZCanBus(interface="zlgcan", device_type=ZCANDeviceType.ZCAN_USBCANFD_200U,
+    with ZCanBus(interface="zlgcan",
+                 libpath="../../../RustProjects/rust-can/zlgcan/library",
+                 device_type=ZCANDeviceType.ZCAN_USBCANFD_200U,
                  configs=[{'bitrate': 500000, 'dbitrate': 1_000_000, 'resistance': 1}]) as bus:
         # bus.send(can.Message(
         #     arbitration_id=0x7DF,

{zlgcan-0.1.17.dist-info → zlgcan-0.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zlgcan
-Version: 0.1.17
+Version: 0.2.0
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
@@ -23,39 +23,26 @@ Project-URL: repository, https://github.com/zhuyu4839/zlgcan-driver
     * 确保安装相关驱动(USBCAN-I/II驱动得额外安装)
     * 确保安装相[VC++运行环境](https://manual.zlg.cn/web/#/152?page_id=5332)
     * 下载[library](https://github.com/zhuyu4839/rust-can/tree/master/zlgcan/library)文件夹(里面包含[bitrate.cfg.yaml](https://github.com/zhuyu4839/rust-can/tree/master/zlgcan/library/bitrate.cfg.yaml))
-    * 在当前工程目录下(相对运行脚本)新建一个`zcan.env`文件, 中间配置`ZCAN_LIBRARY`环境变量(相对路径/绝对路径),否则使用默认(相对运行脚本)路径:
-        * 默认(相对运行脚本)路径文件夹内容示例:
+    * 库文件示例:
       ```shell
-      ├─main.py
-      ├─library
-      │  ├──linux
-      │  │  └─x86_64
-      │  └─windows
-      │     ├─x86
-      │     └─x86_64
-      └─ bitrate.cfg.yaml
-      ```
-        * (相对运行脚本)`zcan.env`文件指定`library`示例:
-      ```shell
-      ├─main.py
-      ├─zcan.env
-      └─library
-        ├─linux
-        │  └─x86_64
-        ├─windows
-        │  ├─x86
+      library
+        ├──bitrate.cfg.yaml
+        ├──linux
         │  └─x86_64
-        └─ bitrate.cfg.yaml
+        └─windows
+           ├─x86
+           └─x86_64
+      ```
+    * 在初始化can.Bus的时候指定zlgcan库路径(从0.2.0开始移除`zcan.env`配置), 默认为相对工程运行文件同级目录下`library`
+      ```python
+      libpath=r"C:\your\library\path"
       ```
-    * 以下为`zcan.env`文件内容示例
-   ```shell
-   ZCAN_LIBRARY="C:/your_library_path"
-   ```
 
-2. 安装zlgcan-driver-py(不建议使用低于0.1.10版本)
+2. 安装zlgcan(不建议使用低于0.2.0版本)
 
     ```shell
-    pip install zlgcan >= 0.1.10
+    pip install zlgcan >= 0.2.0
+    ```
 
 3. 使用:
    ```python
@@ -63,6 +50,7 @@ Project-URL: repository, https://github.com/zhuyu4839/zlgcan-driver
    from zlgcan.zlgcan import ZCanTxMode, ZCANDeviceType
    
    with can.Bus(interface="zlgcan", device_type=ZCANDeviceType.ZCAN_USBCANFD_200U,
+                libpath="library/",
                 configs=[{'bitrate': 500000, 'resistance': 1}, {'bitrate': 500000, 'resistance': 1}]) as bus:
        bus.send(can.Message(
            arbitration_id=0x123,
@@ -75,6 +63,7 @@ Project-URL: repository, https://github.com/zhuyu4839/zlgcan-driver
        # time.sleep(0.1)
        _msg = bus.recv()
        print(_msg)
+   ```
 
 4. CAN测试列表：
    * USBCAN-I-mini - ZCAN_USBCAN1, ZCAN_USBCAN2

zlgcan-0.2.0.dist-info/RECORD

@@ -0,0 +1,9 @@
+zlgcan-0.2.0.dist-info/METADATA,sha256=_qFeUR5r2G38Qs5SvkvgoMCfW8H9AXmmuiugarpNHds,3827
+zlgcan-0.2.0.dist-info/WHEEL,sha256=I0oh3Vvc4dQIPlo9T2OQSgeCvmDsIw855l8Cuc55nN8,90
+zlgcan-0.2.0.dist-info/entry_points.txt,sha256=1BprfQnq7A25SfDsPk1ZbOgMv_SmYEUWc7Xz-oAf-V4,45
+zlgcan-0.2.0.dist-info/licenses/LICENSE.txt,sha256=6n0EnHcF3BOvwgLdGOGCfzSE-CEv0_p7gvxKDDY0Msk,7816
+zlgcan/__init__.py,sha256=uspwQytd3RGSaVs6LQADIa9MS_qvzySlfL2S9OhFBQA,21
+zlgcan/zlgcan.py,sha256=mllOSEBmxG1hvpdfajCdKd-UTdgu5dgML0qSsYN4ph0,8837
+zlgcan_driver/__init__.py,sha256=JBAj4WkBypBiHIJqXHIJTNHF4kpmhRmKqY48oDAmY3E,135
+zlgcan_driver/zlgcan_driver.cp38-win32.pyd,sha256=fNz3_3p4Eanb5N31N7bl8HV1W2YFs4AdLRkM_3dXb-c,621056
+zlgcan-0.2.0.dist-info/RECORD,,

zlgcan-0.1.17.dist-info/RECORD

@@ -1,9 +0,0 @@
-zlgcan-0.1.17.dist-info/METADATA,sha256=agacrPmok9gdrKoAjJP0_pbn7fFQrCpHXdKtXjg4Oa0,4260
-zlgcan-0.1.17.dist-info/WHEEL,sha256=I0oh3Vvc4dQIPlo9T2OQSgeCvmDsIw855l8Cuc55nN8,90
-zlgcan-0.1.17.dist-info/entry_points.txt,sha256=1BprfQnq7A25SfDsPk1ZbOgMv_SmYEUWc7Xz-oAf-V4,45
-zlgcan-0.1.17.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=OGJ51CQ3v7R7EV96Ns5x3qpNEw5vFYFW7gkuM9aITYM,637952
-zlgcan-0.1.17.dist-info/RECORD,,