zlgcan 0.2.1b1__tar.gz → 0.2.3b0__tar.gz

{zlgcan-0.2.1b1 → zlgcan-0.2.3b0}/Cargo.lock

@@ -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?branch=py#b47be22c135553b723146de65d7bf6f44da26403"
 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?branch=py#b47be22c135553b723146de65d7bf6f44da26403"
 dependencies = [
  "dlopen2",
  "log",
@@ -357,7 +357,7 @@ dependencies = [
 
 [[package]]
 name = "zlgcan-driver"
-version = "0.2.1-beta1"
+version = "0.2.3-beta0"
 dependencies = [
  "anyhow",
  "pyo3",

{zlgcan-0.2.1b1 → zlgcan-0.2.3b0}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "zlgcan-driver"
-version = "0.2.1-beta1"
+version = "0.2.3-beta0"
 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", package = "rs-can", branch = "py" }
+zlgcan = { git = "https://github.com/jesses2025smith/rust-can.git", package = "zlgcan", branch = "py" }
 
 [dev-dependencies]
 anyhow = "1"

{zlgcan-0.2.1b1 → zlgcan-0.2.3b0}/PKG-INFO

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

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

@@ -37,9 +37,13 @@ fn zlgcan_init_can(
     );
 
     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));
@@ -167,7 +171,6 @@ fn zlgcan_driver(_py: Python, m: &Bound<'_, PyModule>) -> PyResult<()> {
 
 #[cfg(test)]
 mod tests {
-    use std::time::Instant;
     use zlgcan::{
         can::{ZCanChlMode, ZCanChlType},
         device::ZCanDeviceType,
@@ -181,35 +184,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,
+            ZCanChlType::CAN as u8,
             ZCanChlMode::Normal as u8,
             500_000,
             None,
-            Some(1_000_000),
+            None,
+            None,
+            None,
+            None,
+            None,
+        );
+        let cfg2 = ZCanChlCfgPy::new(
+            ZCanChlType::CAN as u8,
+            ZCanChlMode::Normal as u8,
+            500_000,
+            None,
+            None,
             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)?;