zlgcan 0.2.2__tar.gz → 0.2.3b0__tar.gz

{zlgcan-0.2.2 → 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=05a051f662385bcc33cd99bf195eedaa528983fe#05a051f662385bcc33cd99bf195eedaa528983fe"
+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=05a051f662385bcc33cd99bf195eedaa528983fe#05a051f662385bcc33cd99bf195eedaa528983fe"
+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.2"
+version = "0.2.3-beta0"
 dependencies = [
  "anyhow",
  "pyo3",

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

@@ -1,6 +1,6 @@
 [package]
 name = "zlgcan-driver"
-version = "0.2.2"
+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", rev = "05a051f662385bcc33cd99bf195eedaa528983fe", package = "rs-can" }
-zlgcan = { git = "https://github.com/jesses2025smith/rust-can.git", rev = "05a051f662385bcc33cd99bf195eedaa528983fe", package = "zlgcan" }
+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.2 → zlgcan-0.2.3b0}/PKG-INFO

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

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

@@ -37,12 +37,12 @@ fn zlgcan_init_can(
     );
 
     for (i, cfg) in cfgs.into_iter().enumerate() {
-        let fdchl_type = ZCanFdChlType::try_from(cfg.fdchl_type)
+        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(FD_CHANNEL_TYPE, Box::new(fdchl_type))
+        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));
@@ -171,7 +171,10 @@ fn zlgcan_driver(_py: Python, m: &Bound<'_, PyModule>) -> PyResult<()> {
 
 #[cfg(test)]
 mod tests {
-    use zlgcan::{can::ZCanChlMode, device::ZCanDeviceType};
+    use zlgcan::{
+        can::{ZCanChlMode, ZCanChlType},
+        device::ZCanDeviceType,
+    };
     use super::*;
 
     #[test]
@@ -181,22 +184,22 @@ mod tests {
         let dev_type = ZCanDeviceType::ZCAN_USBCANFD_200U as u32;
         let dev_idx = 0;
         let cfg = ZCanChlCfgPy::new(
+            ZCanChlType::CAN as u8,
             ZCanChlMode::Normal as u8,
             500_000,
             None,
             None,
-            Some(true),
             None,
             None,
             None,
             None,
         );
         let cfg2 = ZCanChlCfgPy::new(
+            ZCanChlType::CAN as u8,
             ZCanChlMode::Normal as u8,
             500_000,
             None,
             None,
-            Some(true),
             None,
             None,
             None,

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

@@ -38,14 +38,14 @@ pub struct ZCanDriverWrap {
 }
 
 #[pyclass]
-#[derive(Debug, Clone)]
+#[derive(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_mode, bitrate, filter=None, dbitrate=None, resistance=None, fdchl_type=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(
+        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.2 → zlgcan-0.2.3b0}/zlgcan/zlgcan.py

@@ -28,9 +28,10 @@ except ModuleNotFoundError:
     }.get(_platform, not_support)
 
 
-class ZCanFdChlType:
-    ISO = 0
-    NON_ISO = 1
+class ZCanChlType:
+    CAN = 0
+    CANFD_ISO = 1
+    CANFD_NON_ISO = 2
 
 class ZCanChlMode:
     Normal = 0
@@ -168,12 +169,12 @@ class ZCanBus(can.BusABC):
                 dbitrate = cfg.get("dbitrate", None)
                 assert bitrate is not None, "bitrate is required!"
                 _cfg = ZCanChlCfgPy(
-                    chl_mode=cfg.get("chl_mode", ZCanChlMode.Normal),
+                    chl_type=cfg.get("chl_type", ZCanChlType.CANFD_ISO if dbitrate else ZCanChlType.CAN),
+                    chl_mode=cfg.get("chl_mode", 0),
                     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")