zlgcan 0.1.17__tar.gz → 0.2.0__tar.gz

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

@@ -93,8 +93,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.1.17 → zlgcan-0.2.0}/Cargo.lock

@@ -60,12 +60,6 @@ dependencies = [
  "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"
@@ -86,9 +80,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "indexmap"
-version = "2.8.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3954d50fe15b02142bf25d3b8bdadb634ec3948f103d04ffe3031bc8fe9d7058"
+checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -222,9 +216,9 @@ dependencies = [
 
 [[package]]
 name = "rs-can"
-version = "0.2.0"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4416620ec3f2141f73b5d0936481c9caf3aa27ba140e2a97f178b80b7f110f68"
+checksum = "7deea04551200cab94e5f3faf27be4ad02f84138db280630aa8f3b0b6bcb29ed"
 dependencies = [
  "bitflags",
  "derive-getters",
@@ -351,12 +345,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "zlgcan"
-version = "0.2.0"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad37441e238647c26ae9521b03bfb3abf3dbd37c74ac4f47219a624781b71f7a"
+checksum = "2c4aa30b676bf4cb84f707cba8a8336585d8028bdcf4daaf87ca30bfaf233589"
 dependencies = [
  "dlopen2",
- "dotenvy",
  "log",
  "rs-can",
  "serde",
@@ -365,7 +358,7 @@ dependencies = [
 
 [[package]]
 name = "zlgcan-driver"
-version = "0.1.17"
+version = "0.2.0"
 dependencies = [
  "anyhow",
  "pyo3",

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

@@ -1,6 +1,6 @@
 [package]
 name = "zlgcan-driver"
-version = "0.1.17"
+version = "0.2.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -13,8 +13,8 @@ pyo3 = "0.24"
 #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 = "0.2.2"
+zlgcan = "0.2.2"
 
 [dev-dependencies]
 anyhow = "1"

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

@@ -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.1.17 → zlgcan-0.2.0}/README.md

@@ -7,39 +7,26 @@
     * 确保安装相关驱动(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
@@ -47,6 +34,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 +47,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.0}/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_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, LIBPATH};
 use crate::wrappers::{ZCanChlCfgPy, ZCanDriverWrap, ZCanMessagePy, ZDeriveInfoPy};
 
 #[pyfunction]
@@ -24,13 +19,16 @@ 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 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()))
@@ -192,7 +190,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 +199,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.0}/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,