zlgcan 0.2.1b0__tar.gz → 0.2.2__tar.gz

{zlgcan-0.2.1b0 → zlgcan-0.2.2}/Cargo.lock

@@ -74,9 +74,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "indexmap"
-version = "2.9.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
+checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -210,7 +210,7 @@ dependencies = [
 [[package]]
 name = "rs-can"
 version = "0.3.0"
-source = "git+https://github.com/jesses2025smith/rust-can.git?rev=e76db38dd2e6d66f0afa9374e9a9513d984b6be2#e76db38dd2e6d66f0afa9374e9a9513d984b6be2"
+source = "git+https://github.com/jesses2025smith/rust-can.git?rev=05a051f662385bcc33cd99bf195eedaa528983fe#05a051f662385bcc33cd99bf195eedaa528983fe"
 dependencies = [
  "bitflags",
  "derive-getters",
@@ -345,7 +345,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 [[package]]
 name = "zlgcan"
 version = "0.3.0"
-source = "git+https://github.com/jesses2025smith/rust-can.git?rev=e76db38dd2e6d66f0afa9374e9a9513d984b6be2#e76db38dd2e6d66f0afa9374e9a9513d984b6be2"
+source = "git+https://github.com/jesses2025smith/rust-can.git?rev=05a051f662385bcc33cd99bf195eedaa528983fe#05a051f662385bcc33cd99bf195eedaa528983fe"
 dependencies = [
  "dlopen2",
  "log",
@@ -357,7 +357,7 @@ dependencies = [
 
 [[package]]
 name = "zlgcan-driver"
-version = "0.2.1-beta"
+version = "0.2.2"
 dependencies = [
  "anyhow",
  "pyo3",

{zlgcan-0.2.1b0 → zlgcan-0.2.2}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "zlgcan-driver"
-version = "0.2.1-beta"
+version = "0.2.2"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -13,8 +13,8 @@ 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 = { 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" }
+rs-can = { git = "https://github.com/jesses2025smith/rust-can.git", rev = "05a051f662385bcc33cd99bf195eedaa528983fe", package = "rs-can" }
+zlgcan = { git = "https://github.com/jesses2025smith/rust-can.git", rev = "05a051f662385bcc33cd99bf195eedaa528983fe", package = "zlgcan" }
 
 [dev-dependencies]
 anyhow = "1"

{zlgcan-0.2.1b0 → zlgcan-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zlgcan
-Version: 0.2.1b0
+Version: 0.2.2
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy

{zlgcan-0.2.1b0 → zlgcan-0.2.2}/src/lib.rs

@@ -25,6 +25,8 @@ fn zlgcan_init_can(
     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(LIBPATH, Box::new(libpath))
@@ -35,9 +37,13 @@ fn zlgcan_init_can(
     );
 
     for (i, cfg) in cfgs.into_iter().enumerate() {
+        let fdchl_type = ZCanFdChlType::try_from(cfg.fdchl_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(FD_CHANNEL_TYPE, Box::new(fdchl_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));
@@ -165,11 +171,7 @@ fn zlgcan_driver(_py: Python, m: &Bound<'_, PyModule>) -> PyResult<()> {
 
 #[cfg(test)]
 mod tests {
-    use std::time::Instant;
-    use zlgcan::{
-        can::{ZCanChlMode, ZCanChlType},
-        device::ZCanDeviceType,
-    };
+    use zlgcan::{can::ZCanChlMode, device::ZCanDeviceType};
     use super::*;
 
     #[test]
@@ -179,35 +181,42 @@ mod tests {
         let dev_type = ZCanDeviceType::ZCAN_USBCANFD_200U as u32;
         let dev_idx = 0;
         let cfg = ZCanChlCfgPy::new(
-            ZCanChlType::CANFD_ISO as u8,
             ZCanChlMode::Normal as u8,
             500_000,
             None,
-            Some(1_000_000),
+            None,
+            Some(true),
+            None,
+            None,
+            None,
+            None,
+        );
+        let cfg2 = ZCanChlCfgPy::new(
+            ZCanChlMode::Normal as u8,
+            500_000,
+            None,
+            None,
+            Some(true),
             None,
             None,
             None,
             None,
         );
 
-        let device = zlgcan_init_can("../../RustProjects/rust-can/zlgcan/library".into(), dev_type, dev_idx, vec![cfg, ], None)?;
+        let device = zlgcan_init_can("../../RustRoverProjects/rust-can/zlgcan/library".into(), dev_type, dev_idx, vec![cfg, cfg2], None)?;
         let dev_info = zlgcan_device_info(&device)?;
         println!("{}", dev_info);
         std::thread::sleep(std::time::Duration::from_secs(1));
 
-        let start = Instant::now();
-        let mut flag = false;
-        while start.elapsed().as_secs() < 15 {
-            let msgs = zlgcan_recv(&device, 0, None)?;
-            if !msgs.is_empty() {
-                println!("{:?}", msgs);
-                flag = true;
-            }
-            drop(msgs);
-
-            if flag {
-                break;
-            }
+        let mut msg = CanMessage::new(0x7df, &vec![0x02, 0x10, 0x01]).unwrap();
+        msg.set_channel(0);
+        let ret = zlgcan_send(&device, msg.into())?;
+        println!("send: {}", ret);
+
+        std::thread::sleep(std::time::Duration::from_micros(200));
+        let msgs = zlgcan_recv(&device, 1, None)?;
+        if !msgs.is_empty() {
+            println!("{:?}", msgs);
         }
 
         zlgcan_close(&device)?;

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

@@ -38,14 +38,14 @@ pub struct ZCanDriverWrap {
 }
 
 #[pyclass]
-#[derive(Clone)]
+#[derive(Debug, Clone)]
 pub struct ZCanChlCfgPy {
-    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) fdchl_type: u8,
     pub(crate) acc_code: Option<u32>,
     pub(crate) acc_mask: Option<u32>,
     pub(crate) brp: Option<u32>,
@@ -54,25 +54,25 @@ pub struct ZCanChlCfgPy {
 #[pymethods]
 impl ZCanChlCfgPy {
     #[new]
-    #[pyo3(signature = (chl_type, chl_mode, bitrate, filter=None, dbitrate=None, resistance=None, acc_code=None, acc_mask=None, brp=None))]
+    #[pyo3(signature = (chl_mode, bitrate, filter=None, dbitrate=None, resistance=None, fdchl_type=None, acc_code=None, acc_mask=None, brp=None))]
     pub fn new(
-        chl_type: u8,
         chl_mode: u8,
         bitrate: u32,
         filter: Option<u8>,
         dbitrate: Option<u32>,
         resistance: Option<bool>,
+        fdchl_type: Option<u8>,
         acc_code: Option<u32>,
         acc_mask: Option<u32>,
         brp: Option<u32>,
     ) -> Self {
         ZCanChlCfgPy {
-            chl_type,
             chl_mode,
             bitrate,
             filter,
             dbitrate,
             resistance,
+            fdchl_type: fdchl_type.unwrap_or(0),
             acc_code,
             acc_mask,
             brp,

{zlgcan-0.2.1b0 → zlgcan-0.2.2}/zlgcan/zlgcan.py

@@ -28,10 +28,9 @@ except ModuleNotFoundError:
     }.get(_platform, not_support)
 
 
-class ZCanChlType:
-    CAN = 0
-    CANFD_ISO = 1
-    CANFD_NON_ISO = 2
+class ZCanFdChlType:
+    ISO = 0
+    NON_ISO = 1
 
 class ZCanChlMode:
     Normal = 0
@@ -169,12 +168,12 @@ class ZCanBus(can.BusABC):
                 dbitrate = cfg.get("dbitrate", None)
                 assert bitrate is not None, "bitrate is required!"
                 _cfg = ZCanChlCfgPy(
-                    chl_type=cfg.get("chl_type", ZCanChlType.CANFD_ISO if dbitrate else ZCanChlType.CAN),
-                    chl_mode=cfg.get("chl_mode", 0),
+                    chl_mode=cfg.get("chl_mode", ZCanChlMode.Normal),
                     bitrate=bitrate,
                     filter=cfg.get("filter"),
                     dbitrate=dbitrate,
                     resistance=bool(cfg.get("resistance", 1)),
+                    fdchl_type=cfg.get("fdchl_type", ZCanFdChlType.ISO),
                     acc_code=cfg.get("acc_code"),
                     acc_mask=cfg.get("acc_mask"),
                     brp=cfg.get("brp")