zlgcan 0.1.17__tar.gz → 0.2.1__tar.gz

{zlgcan-0.1.17 → zlgcan-0.2.1}/.github/workflows/CI.yml

@@ -48,8 +48,6 @@ jobs:
         platform:
           - runner: windows-latest
             target: x64
-          - runner: windows-latest
-            target: x86
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
@@ -93,8 +91,8 @@ jobs:
       - name: Publish to PyPI
         uses: PyO3/maturin-action@v1
         env:
-          MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
+          MATURIN_PYPI_TOKEN: ${{ secrets.ZLGCAN_TOKEN }}
         with:
-          token: ${{ secrets.PYPI_TOKEN }}
+          token: ${{ secrets.ZLGCAN_TOKEN }}
           command: upload
           args: --non-interactive --skip-existing wheels-*/*

zlgcan-0.2.1/CHANGELOG.md

@@ -0,0 +1,12 @@
+Version 0.2.1
+=============
+
+Features
+--------
+
+* 更改库文件配置方式
+
+Bug Fixes
+---------
+
+* 修复v0.2.0 Windows下不能接收CAN报文的Bug

{zlgcan-0.1.17 → zlgcan-0.2.1}/Cargo.lock

@@ -4,27 +4,21 @@ version = 4
 
 [[package]]
 name = "anyhow"
-version = "1.0.97"
+version = "1.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f"
+checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
 
 [[package]]
 name = "autocfg"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "bitflags"
-version = "2.9.0"
+version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
 
 [[package]]
 name = "derive-getters"
@@ -39,9 +33,9 @@ dependencies = [
 
 [[package]]
 name = "dlopen2"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1297103d2bbaea85724fcee6294c2d50b1081f9ad47d0f6f6f61eda65315a6"
+checksum = "b54f373ccf864bf587a89e880fb7610f8d73f3045f13580948ccbcaff26febff"
 dependencies = [
  "dlopen2_derive",
  "libc",
@@ -51,21 +45,15 @@ dependencies = [
 
 [[package]]
 name = "dlopen2_derive"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2b99bf03862d7f545ebc28ddd33a665b50865f4dfd84031a393823879bd4c54"
+checksum = "788160fb30de9cdd857af31c6a2675904b16ece8fc2737b2c7127ba368c9d0f4"
 dependencies = [
  "proc-macro2",
  "quote",
  "syn",
 ]
 
-[[package]]
-name = "dotenvy"
-version = "0.15.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
-
 [[package]]
 name = "equivalent"
 version = "1.0.2"
@@ -74,9 +62,9 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "hashbrown"
-version = "0.15.2"
+version = "0.15.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
 
 [[package]]
 name = "heck"
@@ -86,9 +74,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "indexmap"
-version = "2.8.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3954d50fe15b02142bf25d3b8bdadb634ec3948f103d04ffe3031bc8fe9d7058"
+checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -108,9 +96,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "libc"
-version = "0.2.171"
+version = "0.2.174"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
+checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
 
 [[package]]
 name = "log"
@@ -135,26 +123,25 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "portable-atomic"
-version = "1.11.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
+checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.94"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
+checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "pyo3"
-version = "0.24.1"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17da310086b068fbdcefbba30aeb3721d5bb9af8db4987d6735b2183ca567229"
+checksum = "8970a78afe0628a3e3430376fc5fd76b6b45c4d43360ffd6cdd40bdde72b682a"
 dependencies = [
- "cfg-if",
  "indoc",
  "libc",
  "memoffset",
@@ -168,9 +155,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.24.1"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e27165889bd793000a098bb966adc4300c312497ea25cf7a690a9f0ac5aa5fc1"
+checksum = "458eb0c55e7ece017adeba38f2248ff3ac615e53660d7c71a238d7d2a01c7598"
 dependencies = [
  "once_cell",
  "target-lexicon",
@@ -178,9 +165,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.24.1"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05280526e1dbf6b420062f3ef228b78c0c54ba94e157f5cb724a609d0f2faabc"
+checksum = "7114fe5457c61b276ab77c5055f206295b812608083644a5c5b2640c3102565c"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -188,9 +175,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.24.1"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c3ce5686aa4d3f63359a5100c62a127c9f15e8398e5fdeb5deef1fed5cd5f44"
+checksum = "a8725c0a622b374d6cb051d11a0983786448f7785336139c3c94f5aa6bef7e50"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -200,9 +187,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.24.1"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4cf6faa0cbfb0ed08e89beb8103ae9724eb4750e3a78084ba4017cbe94f3855"
+checksum = "4109984c22491085343c05b0dbc54ddc405c3cf7b4374fc533f5c3313a572ccc"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -222,17 +209,23 @@ dependencies = [
 
 [[package]]
 name = "rs-can"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4416620ec3f2141f73b5d0936481c9caf3aa27ba140e2a97f178b80b7f110f68"
+version = "0.3.0"
+source = "git+https://github.com/jesses2025smith/rust-can.git?rev=e76db38dd2e6d66f0afa9374e9a9513d984b6be2#e76db38dd2e6d66f0afa9374e9a9513d984b6be2"
 dependencies = [
  "bitflags",
  "derive-getters",
  "log",
+ "rsutil",
  "serde",
  "thiserror",
 ]
 
+[[package]]
+name = "rsutil"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2db82abc50469bbff9ce708b13b3ff27c779a8ddbbe5640017278608bf33b820"
+
 [[package]]
 name = "ryu"
 version = "1.0.20"
@@ -274,9 +267,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.100"
+version = "2.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
+checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -351,21 +344,20 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "zlgcan"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad37441e238647c26ae9521b03bfb3abf3dbd37c74ac4f47219a624781b71f7a"
+version = "0.3.0"
+source = "git+https://github.com/jesses2025smith/rust-can.git?rev=e76db38dd2e6d66f0afa9374e9a9513d984b6be2#e76db38dd2e6d66f0afa9374e9a9513d984b6be2"
 dependencies = [
  "dlopen2",
- "dotenvy",
  "log",
  "rs-can",
+ "rsutil",
  "serde",
  "serde_yaml",
 ]
 
 [[package]]
 name = "zlgcan-driver"
-version = "0.1.17"
+version = "0.2.1"
 dependencies = [
  "anyhow",
  "pyo3",

{zlgcan-0.1.17 → zlgcan-0.2.1}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "zlgcan-driver"
-version = "0.1.17"
+version = "0.2.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -9,12 +9,12 @@ name = "zlgcan_driver"
 crate-type = ["cdylib"]
 
 [dependencies]
-pyo3 = "0.24"
+pyo3 = "0.25"
 #iso15765-2 = { version = "0.1.0-alpha0" }
 #iso14229-1 = { version = "0.1.0-alpha0" }
 #docan = { version = "0.1.0-alpha0" }
-rs-can = { version = "0.2.0" }
-zlgcan = { version = "0.2.0" }
+rs-can = { git = "https://github.com/jesses2025smith/rust-can.git", package = "rs-can", rev = "e76db38dd2e6d66f0afa9374e9a9513d984b6be2" }
+zlgcan = { git = "https://github.com/jesses2025smith/rust-can.git", package = "zlgcan", rev = "e76db38dd2e6d66f0afa9374e9a9513d984b6be2" }
 
 [dev-dependencies]
 anyhow = "1"

{zlgcan-0.1.17 → zlgcan-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zlgcan
-Version: 0.1.17
+Version: 0.2.1
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
@@ -17,45 +17,31 @@ Project-URL: repository, https://github.com/zhuyu4839/zlgcan-driver
 ![PyPI Downloads](https://static.pepy.tech/badge/zlgcan)
 ![PyPI Downloads](https://static.pepy.tech/badge/zlgcan/month)
 
-# ZLGCAN驱动及集成到python-can(因内存模型不同，目前Windows下32位python会报内存非法访问的错误)
+# ZLGCAN驱动及集成到python-can(不支持32位)
 
 1. 准备
     * 确保安装相关驱动(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_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 +49,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 +62,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.1.17 → zlgcan-0.2.1}/README.md

@@ -1,45 +1,31 @@
 ![PyPI Downloads](https://static.pepy.tech/badge/zlgcan)
 ![PyPI Downloads](https://static.pepy.tech/badge/zlgcan/month)
 
-# ZLGCAN驱动及集成到python-can(因内存模型不同，目前Windows下32位python会报内存非法访问的错误)
+# ZLGCAN驱动及集成到python-can(不支持32位)
 
 1. 准备
     * 确保安装相关驱动(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_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
@@ -47,6 +33,7 @@
    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,
@@ -59,6 +46,7 @@
        # time.sleep(0.1)
        _msg = bus.recv()
        print(_msg)
+   ```
 
 4. CAN测试列表：
    * USBCAN-I-mini - ZCAN_USBCAN1, ZCAN_USBCAN2

{zlgcan-0.1.17 → zlgcan-0.2.1}/src/lib.rs

@@ -3,12 +3,7 @@ pub(crate) mod wrappers;
 use std::sync::{Arc, Mutex};
 use pyo3::{exceptions, prelude::*};
 use rs_can::{CanError, CanFrame, CanType, ChannelConfig, DeviceBuilder};
-use zlgcan_rs::{
-    can::{CanMessage, ZCanFrameType},
-    device::DeriveInfo,
-    driver::{ZCanDriver, ZDevice},
-    ACC_CODE, ACC_MASK, BRP, CHANNEL_MODE, CHANNEL_TYPE, DERIVE_INFO, DEVICE_INDEX, DEVICE_TYPE, FILTER_TYPE
-};
+use zlgcan::{*, can::*, device::*, driver::*};
 use crate::wrappers::{ZCanChlCfgPy, ZCanDriverWrap, ZCanMessagePy, ZDeriveInfoPy};
 
 #[pyfunction]
@@ -24,22 +19,31 @@ fn convert_from_python<'py>(py: Python<'py>, py_message: &Bound<'py, PyAny>) ->
 
 #[pyfunction]
 fn zlgcan_init_can(
+    libpath: String,
     dev_type: u32,
     dev_idx: u32,
     cfgs: Vec<ZCanChlCfgPy>,
     derive_info: Option<ZDeriveInfoPy>,
 ) -> PyResult<ZCanDriverWrap> {
+    let dev_type = ZCanDeviceType::try_from(dev_type)
+        .map_err(|e| exceptions::PyValueError::new_err(e.to_string()))?;
     let mut builder = DeviceBuilder::new();
-    builder.add_other(DEVICE_TYPE, Box::new(dev_type))
+    builder
+        .add_other(LIBPATH, Box::new(libpath))
+        .add_other(DEVICE_TYPE, Box::new(dev_type))
         .add_other(DEVICE_INDEX, Box::new(dev_idx));
     derive_info.map(
         |info| builder.add_other(DERIVE_INFO, Box::<DeriveInfo>::new(info.into()))
     );
 
     for (i, cfg) in cfgs.into_iter().enumerate() {
+        let chl_type = ZCanChlType::try_from(cfg.chl_type)
+            .map_err(|e| exceptions::PyValueError::new_err(e.to_string()))?;
+        let chl_mode = ZCanChlMode::try_from(cfg.chl_mode)
+            .map_err(|e| exceptions::PyValueError::new_err(e.to_string()))?;
         let mut c = ChannelConfig::new(cfg.bitrate);
-        c.add_other(CHANNEL_TYPE, Box::new(cfg.chl_type))
-            .add_other(CHANNEL_MODE, Box::new(cfg.chl_mode));
+        c.add_other(CHANNEL_TYPE, Box::new(chl_type))
+            .add_other(CHANNEL_MODE, Box::new(chl_mode));
 
         cfg.dbitrate.map(|dbitrate| c.set_data_bitrate(dbitrate));
         cfg.resistance.map(|resistance| c.set_resistance(resistance));
@@ -48,10 +52,10 @@ fn zlgcan_init_can(
         cfg.acc_mask.map(|acc_mask| c.add_other(ACC_MASK, Box::new(acc_mask)));
         cfg.brp.map(|brp| c.add_other(BRP, Box::new(brp)));
 
-        builder.add_config(i.to_string(), c);
+        builder.add_config(i as u8, c);
     }
 
-    let device: ZCanDriver = builder.build()
+    let device = builder.build::<ZDriver>()
         .map_err(|e| exceptions::PyValueError::new_err(e.to_string()))?;
 
     Ok(ZCanDriverWrap { inner: Arc::new(Mutex::new(device)) })
@@ -168,7 +172,7 @@ fn zlgcan_driver(_py: Python, m: &Bound<'_, PyModule>) -> PyResult<()> {
 #[cfg(test)]
 mod tests {
     use std::time::Instant;
-    use zlgcan_rs::{
+    use zlgcan::{
         can::{ZCanChlMode, ZCanChlType},
         device::ZCanDeviceType,
     };
@@ -192,7 +196,7 @@ mod tests {
             None,
         );
 
-        let device = zlgcan_init_can(dev_type, dev_idx, vec![cfg, ], None)?;
+        let device = zlgcan_init_can("../../RustProjects/rust-can/zlgcan/library".into(), dev_type, dev_idx, vec![cfg, ], None)?;
         let dev_info = zlgcan_device_info(&device)?;
         println!("{}", dev_info);
         std::thread::sleep(std::time::Duration::from_secs(1));
@@ -201,8 +205,8 @@ mod tests {
         let mut flag = false;
         while start.elapsed().as_secs() < 15 {
             let msgs = zlgcan_recv(&device, 0, None)?;
-            println!("{:?}", msgs);
             if !msgs.is_empty() {
+                println!("{:?}", msgs);
                 flag = true;
             }
             drop(msgs);

{zlgcan-0.1.17 → zlgcan-0.2.1}/src/wrappers/mod.rs

@@ -4,10 +4,10 @@ use constants::*;
 use std::sync::{Arc, Mutex};
 use pyo3::{exceptions, prelude::*, types::PyDict};
 use rs_can::{CanDirect, CanFrame, CanId, CanType};
-use zlgcan_rs::{
-    can::CanMessage,
+use zlgcan::{
+    can::{CanMessage, ZCanTxMode},
     device::DeriveInfo,
-    driver::ZCanDriver
+    driver::ZDriver
 };
 
 #[pyclass]
@@ -27,14 +27,14 @@ impl ZDeriveInfoPy {
 
 impl Into<DeriveInfo> for ZDeriveInfoPy {
     fn into(self) -> DeriveInfo {
-        DeriveInfo::new(self.canfd, self.channels)
+        DeriveInfo { canfd: self.canfd, channels: self.channels }
     }
 }
 
 #[pyclass]
 #[derive(Clone)]
 pub struct ZCanDriverWrap {
-    pub(crate) inner: Arc<Mutex<ZCanDriver>>,
+    pub(crate) inner: Arc<Mutex<ZDriver>>,
 }
 
 #[pyclass]
@@ -135,7 +135,7 @@ impl TryInto<CanMessage> for ZCanMessagePy {
         msg.set_timestamp(None)
             .set_direct(if self.is_rx { CanDirect::Receive } else { CanDirect::Transmit })
             .set_channel(self.channel)
-            .set_tx_mode(self.tx_mode)
+            .set_tx_mode(ZCanTxMode::try_from(self.tx_mode).map_err(|e| exceptions::PyValueError::new_err(e.to_string()))?)
             .set_can_type(if self.is_fd { CanType::CanFd } else { CanType::Can })
             .set_bitrate_switch(self.bitrate_switch)
             .set_esi(self.error_state_indicator)

{zlgcan-0.1.17 → zlgcan-0.2.1}/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,