zlgcan 0.1.15__tar.gz → 0.1.17__tar.gz

zlgcan-0.1.17/.editorconfig

@@ -0,0 +1,7 @@
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+indent_style = space
+indent_size = 4

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

@@ -26,6 +26,17 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "derive-getters"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74ef43543e701c01ad77d3a5922755c6a1d71b22d942cb8042be4994b380caff"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "dlopen2"
 version = "0.7.0"
@@ -103,9 +114,9 @@ checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
 
 [[package]]
 name = "log"
-version = "0.4.26"
+version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e"
+checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 
 [[package]]
 name = "memoffset"
@@ -118,9 +129,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.21.1"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "portable-atomic"
@@ -139,9 +150,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3"
-version = "0.24.0"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f1c6c3591120564d64db2261bec5f910ae454f01def849b9c22835a84695e86"
+checksum = "17da310086b068fbdcefbba30aeb3721d5bb9af8db4987d6735b2183ca567229"
 dependencies = [
  "cfg-if",
  "indoc",
@@ -157,9 +168,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.24.0"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9b6c2b34cf71427ea37c7001aefbaeb85886a074795e35f161f5aecc7620a7a"
+checksum = "e27165889bd793000a098bb966adc4300c312497ea25cf7a690a9f0ac5aa5fc1"
 dependencies = [
  "once_cell",
  "target-lexicon",
@@ -167,9 +178,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.24.0"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5507651906a46432cdda02cd02dd0319f6064f1374c9147c45b978621d2c3a9c"
+checksum = "05280526e1dbf6b420062f3ef228b78c0c54ba94e157f5cb724a609d0f2faabc"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -177,9 +188,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.24.0"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0d394b5b4fd8d97d48336bb0dd2aebabad39f1d294edd6bcd2cccf2eefe6f42"
+checksum = "5c3ce5686aa4d3f63359a5100c62a127c9f15e8398e5fdeb5deef1fed5cd5f44"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -189,9 +200,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.24.0"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd72da09cfa943b1080f621f024d2ef7e2773df7badd51aa30a2be1f8caa7c8e"
+checksum = "f4cf6faa0cbfb0ed08e89beb8103ae9724eb4750e3a78084ba4017cbe94f3855"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -211,12 +222,14 @@ dependencies = [
 
 [[package]]
 name = "rs-can"
-version = "0.2.0-alpha0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bebdda141f59233f45478d791b4e1eb274b61c7f6eb35979ef8e668ba815b96f"
+checksum = "4416620ec3f2141f73b5d0936481c9caf3aa27ba140e2a97f178b80b7f110f68"
 dependencies = [
  "bitflags",
+ "derive-getters",
  "log",
+ "serde",
  "thiserror",
 ]
 
@@ -338,9 +351,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "zlgcan"
-version = "0.2.0-alpha0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cd1c98e4e87fe156a9dafb5297c02b4eadbf109edec03a3ee3c5ac3e5351511"
+checksum = "ad37441e238647c26ae9521b03bfb3abf3dbd37c74ac4f47219a624781b71f7a"
 dependencies = [
  "dlopen2",
  "dotenvy",
@@ -352,7 +365,7 @@ dependencies = [
 
 [[package]]
 name = "zlgcan-driver"
-version = "0.1.15"
+version = "0.1.17"
 dependencies = [
  "anyhow",
  "pyo3",

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

@@ -1,6 +1,6 @@
 [package]
 name = "zlgcan-driver"
-version = "0.1.15"
+version = "0.1.17"
 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-alpha0" }
-zlgcan = { version = "0.2.0-alpha0" }
+rs-can = { version = "0.2.0" }
+zlgcan = { version = "0.2.0" }
 
 [dev-dependencies]
 anyhow = "1"

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

@@ -1,19 +1,22 @@
 Metadata-Version: 2.4
 Name: zlgcan
-Version: 0.1.15
+Version: 0.1.17
 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
 Project-URL: homepage, https://github.com/zhuyu4839/zlgcan-driver
 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会报内存非法访问的错误)
 
 1. 准备

{zlgcan-0.1.15 → zlgcan-0.1.17}/README.md

@@ -1,3 +1,6 @@
+![PyPI Downloads](https://static.pepy.tech/badge/zlgcan)
+![PyPI Downloads](https://static.pepy.tech/badge/zlgcan/month)
+
 # ZLGCAN驱动及集成到python-can(因内存模型不同，目前Windows下32位python会报内存非法访问的错误)
 
 1. 准备

{zlgcan-0.1.15 → zlgcan-0.1.17}/pyproject.toml

@@ -15,7 +15,7 @@ dependencies = [
 ]
 dynamic = ["version"]
 description = "Python wrapper for zlgcan driver."
-authors = [{ name = "Smith Jesse" }]
+authors = [{ name = "Jesse Smith" }]
 license = { text = "LGPL v3" }
 
 [project.urls]

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

@@ -2,12 +2,14 @@ pub(crate) mod wrappers;
 
 use std::sync::{Arc, Mutex};
 use pyo3::{exceptions, prelude::*};
-use rs_can::{CanError, CanFrame, CanType};
+use rs_can::{CanError, CanFrame, CanType, ChannelConfig, DeviceBuilder};
 use zlgcan_rs::{
-    can::{CanChlCfgFactory, CanMessage, ZCanFrameType},
-    driver::{ZCanDriver, ZDevice}
+    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 crate::wrappers::{ZCanChlCfgFactoryWrap, ZCanChlCfgPy, ZCanDriverWrap, ZCanMessagePy, ZDeriveInfoPy};
+use crate::wrappers::{ZCanChlCfgPy, ZCanDriverWrap, ZCanMessagePy, ZDeriveInfoPy};
 
 #[pyfunction]
 fn convert_to_python<'py>(py: Python<'py>, rust_message: ZCanMessagePy) -> PyResult<Bound<'py, PyAny>> {
@@ -21,26 +23,35 @@ fn convert_from_python<'py>(py: Python<'py>, py_message: &Bound<'py, PyAny>) ->
 }
 
 #[pyfunction]
-fn zlgcan_cfg_factory_can() -> PyResult<ZCanChlCfgFactoryWrap> {
-    let factory = CanChlCfgFactory::new()
-        .map_err(|e| PyErr::new::<exceptions::PyRuntimeError, String>(e.to_string()))?;
-    Ok(ZCanChlCfgFactoryWrap { inner: Arc::new(factory) })
-}
-
-#[pyfunction]
-#[pyo3(signature = (dev_type, dev_idx, derive=None))]
-fn zlgcan_open(
+fn zlgcan_init_can(
     dev_type: u32,
     dev_idx: u32,
-    derive: Option<ZDeriveInfoPy>
+    cfgs: Vec<ZCanChlCfgPy>,
+    derive_info: Option<ZDeriveInfoPy>,
 ) -> PyResult<ZCanDriverWrap> {
-    let derive_info = match derive {
-        Some(v) => Some(v.into()),
-        None => None,
-    };
-    let mut device = ZCanDriver::new(dev_type, dev_idx, derive_info)
-        .map_err(|e| exceptions::PyValueError::new_err(e.to_string()))?;
-    device.open()
+    let mut builder = DeviceBuilder::new();
+    builder.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 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));
+
+        cfg.dbitrate.map(|dbitrate| c.set_data_bitrate(dbitrate));
+        cfg.resistance.map(|resistance| c.set_resistance(resistance));
+        cfg.filter.map(|filter| c.add_other(FILTER_TYPE, Box::new(filter)));
+        cfg.acc_code.map(|acc_code| c.add_other(ACC_CODE, Box::new(acc_code)));
+        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);
+    }
+
+    let device: ZCanDriver = builder.build()
         .map_err(|e| exceptions::PyValueError::new_err(e.to_string()))?;
 
     Ok(ZCanDriverWrap { inner: Arc::new(Mutex::new(device)) })
@@ -57,22 +68,6 @@ fn zlgcan_device_info(device: &ZCanDriverWrap) -> PyResult<String> {
     )
 }
 
-#[pyfunction]
-fn zlgcan_init_can(
-    device: &ZCanDriverWrap,
-    factory: ZCanChlCfgFactoryWrap,
-    cfg: Vec<ZCanChlCfgPy>
-) -> PyResult<()> {
-    let mut device = device.inner.lock()
-        .map_err(|e| exceptions::PyValueError::new_err(e.to_string()))?;
-    let cfg = cfg.into_iter()
-        .map(|c| c.try_convert(&factory))
-        .collect::<Result<Vec<_>, _>>()
-        .map_err(|e| e)?;
-    device.init_can_chl(cfg)
-        .map_err(|e| exceptions::PyValueError::new_err(e.to_string()))
-}
-
 #[pyfunction]
 fn zlgcan_clear_can_buffer(
     device: &ZCanDriverWrap,
@@ -148,22 +143,20 @@ fn set_message_mode(msg: &mut ZCanMessagePy, mode: u8) {
     msg.tx_mode = mode;
 }
 
+// 此方法名必须与Cargo.toml-[lib]配置下name保持一致
 #[pymodule]
-fn zlgcan_driver_py(_py: Python, m: &Bound<'_, PyModule>) -> PyResult<()> {
+fn zlgcan_driver(_py: Python, m: &Bound<'_, PyModule>) -> PyResult<()> {
     m.add_class::<ZCanChlCfgPy>()?;
     m.add_class::<ZCanMessagePy>()?;
     m.add_class::<ZDeriveInfoPy>()?;
-    m.add_class::<ZCanChlCfgFactoryWrap>()?;
     m.add_class::<ZCanDriverWrap>()?;
 
     m.add_function(wrap_pyfunction!(convert_to_python, m)?)?;
     m.add_function(wrap_pyfunction!(convert_from_python, m)?)?;
     m.add_function(wrap_pyfunction!(set_message_mode, m)?)?;
 
-    m.add_function(wrap_pyfunction!(zlgcan_cfg_factory_can, m)?)?;
-    m.add_function(wrap_pyfunction!(zlgcan_open, m)?)?;
-    m.add_function(wrap_pyfunction!(zlgcan_device_info, m)?)?;
     m.add_function(wrap_pyfunction!(zlgcan_init_can, m)?)?;
+    m.add_function(wrap_pyfunction!(zlgcan_device_info, m)?)?;
     m.add_function(wrap_pyfunction!(zlgcan_clear_can_buffer, m)?)?;
     m.add_function(wrap_pyfunction!(zlgcan_send, m)?)?;
     m.add_function(wrap_pyfunction!(zlgcan_recv, m)?)?;
@@ -185,14 +178,9 @@ mod tests {
     fn test_receive() -> anyhow::Result<()> {
         pyo3::prepare_freethreaded_python();
 
-        let cfg_fct = zlgcan_cfg_factory_can()?;
-        let device = zlgcan_open(ZCanDeviceType::ZCAN_USBCANFD_200U as u32, 0, None)?;
-
-        let dev_info = zlgcan_device_info(&device)?;
-        println!("{}", dev_info);
-
+        let dev_type = ZCanDeviceType::ZCAN_USBCANFD_200U as u32;
+        let dev_idx = 0;
         let cfg = ZCanChlCfgPy::new(
-            ZCanDeviceType::ZCAN_USBCANFD_200U as u32,
             ZCanChlType::CANFD_ISO as u8,
             ZCanChlMode::Normal as u8,
             500_000,
@@ -203,7 +191,10 @@ mod tests {
             None,
             None,
         );
-        zlgcan_init_can(&device, cfg_fct, vec![cfg, ])?;
+
+        let device = zlgcan_init_can(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));
 
         let start = Instant::now();

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

@@ -5,7 +5,7 @@ use std::sync::{Arc, Mutex};
 use pyo3::{exceptions, prelude::*, types::PyDict};
 use rs_can::{CanDirect, CanFrame, CanId, CanType};
 use zlgcan_rs::{
-    can::{CanChlCfg, CanChlCfgExt, CanChlCfgFactory, CanMessage},
+    can::CanMessage,
     device::DeriveInfo,
     driver::ZCanDriver
 };
@@ -31,12 +31,6 @@ impl Into<DeriveInfo> for ZDeriveInfoPy {
     }
 }
 
-#[pyclass]
-#[derive(Clone)]
-pub struct ZCanChlCfgFactoryWrap {
-    pub(crate) inner: Arc<CanChlCfgFactory>
-}
-
 #[pyclass]
 #[derive(Clone)]
 pub struct ZCanDriverWrap {
@@ -46,24 +40,22 @@ pub struct ZCanDriverWrap {
 #[pyclass]
 #[derive(Clone)]
 pub struct ZCanChlCfgPy {
-    dev_type: u32,
-    chl_type: u8,
-    chl_mode: u8,
-    bitrate: u32,
-    filter: Option<u8>,
-    dbitrate: Option<u32>,
-    resistance: Option<bool>,
-    acc_code: Option<u32>,
-    acc_mask: Option<u32>,
-    brp: Option<u32>,
+    pub(crate) chl_type: u8,
+    pub(crate) chl_mode: u8,
+    pub(crate) bitrate: u32,
+    pub(crate) filter: Option<u8>,
+    pub(crate) dbitrate: Option<u32>,
+    pub(crate) resistance: Option<bool>,
+    pub(crate) acc_code: Option<u32>,
+    pub(crate) acc_mask: Option<u32>,
+    pub(crate) brp: Option<u32>,
 }
 
 #[pymethods]
 impl ZCanChlCfgPy {
     #[new]
-    #[pyo3(signature = (dev_type, chl_type, chl_mode, bitrate, filter=None, dbitrate=None, resistance=None, acc_code=None, acc_mask=None, brp=None))]
+    #[pyo3(signature = (chl_type, chl_mode, bitrate, filter=None, dbitrate=None, resistance=None, acc_code=None, acc_mask=None, brp=None))]
     pub fn new(
-        dev_type: u32,
         chl_type: u8,
         chl_mode: u8,
         bitrate: u32,
@@ -75,7 +67,6 @@ impl ZCanChlCfgPy {
         brp: Option<u32>,
     ) -> Self {
         ZCanChlCfgPy {
-            dev_type,
             chl_type,
             chl_mode,
             bitrate,
@@ -89,25 +80,6 @@ impl ZCanChlCfgPy {
     }
 }
 
-impl ZCanChlCfgPy {
-    pub fn try_convert(&self, factory: &ZCanChlCfgFactoryWrap) -> PyResult<CanChlCfg> {
-        factory.inner.new_can_chl_cfg(
-            self.dev_type,
-            self.chl_type,
-            self.chl_mode,
-            self.bitrate,
-            CanChlCfgExt::new(
-                self.filter,
-                self.dbitrate,
-                self.resistance,
-                self.acc_code,
-                self.acc_mask,
-                self.brp
-            )
-        ).map_err(|e| exceptions::PyValueError::new_err(e.to_string()))
-    }
-}
-
 #[pyclass]
 #[derive(Debug, Clone)]
 pub struct ZCanMessagePy {

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