zlgcan 0.1.16__tar.gz → 0.1.17__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {zlgcan-0.1.16 → zlgcan-0.1.17}/Cargo.lock +17 -17
- {zlgcan-0.1.16 → zlgcan-0.1.17}/Cargo.toml +3 -3
- {zlgcan-0.1.16 → zlgcan-0.1.17}/PKG-INFO +4 -1
- {zlgcan-0.1.16 → zlgcan-0.1.17}/README.md +3 -0
- {zlgcan-0.1.16 → zlgcan-0.1.17}/src/lib.rs +2 -2
- {zlgcan-0.1.16 → zlgcan-0.1.17}/.editorconfig +0 -0
- {zlgcan-0.1.16 → zlgcan-0.1.17}/.github/workflows/CI.yml +0 -0
- {zlgcan-0.1.16 → zlgcan-0.1.17}/.github/workflows/label-check.yml +0 -0
- {zlgcan-0.1.16 → zlgcan-0.1.17}/.gitignore +0 -0
- {zlgcan-0.1.16 → zlgcan-0.1.17}/LICENSE.txt +0 -0
- {zlgcan-0.1.16 → zlgcan-0.1.17}/pyproject.toml +0 -0
- {zlgcan-0.1.16 → zlgcan-0.1.17}/requirements.txt +0 -0
- {zlgcan-0.1.16 → zlgcan-0.1.17}/src/wrappers/constants.rs +0 -0
- {zlgcan-0.1.16 → zlgcan-0.1.17}/src/wrappers/mod.rs +0 -0
- {zlgcan-0.1.16 → zlgcan-0.1.17}/zlgcan/__init__.py +0 -0
- {zlgcan-0.1.16 → zlgcan-0.1.17}/zlgcan/zlgcan.py +0 -0
|
@@ -129,9 +129,9 @@ dependencies = [
|
|
|
129
129
|
|
|
130
130
|
[[package]]
|
|
131
131
|
name = "once_cell"
|
|
132
|
-
version = "1.21.
|
|
132
|
+
version = "1.21.3"
|
|
133
133
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
134
|
-
checksum = "
|
|
134
|
+
checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
|
|
135
135
|
|
|
136
136
|
[[package]]
|
|
137
137
|
name = "portable-atomic"
|
|
@@ -150,9 +150,9 @@ dependencies = [
|
|
|
150
150
|
|
|
151
151
|
[[package]]
|
|
152
152
|
name = "pyo3"
|
|
153
|
-
version = "0.24.
|
|
153
|
+
version = "0.24.1"
|
|
154
154
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
155
|
-
checksum = "
|
|
155
|
+
checksum = "17da310086b068fbdcefbba30aeb3721d5bb9af8db4987d6735b2183ca567229"
|
|
156
156
|
dependencies = [
|
|
157
157
|
"cfg-if",
|
|
158
158
|
"indoc",
|
|
@@ -168,9 +168,9 @@ dependencies = [
|
|
|
168
168
|
|
|
169
169
|
[[package]]
|
|
170
170
|
name = "pyo3-build-config"
|
|
171
|
-
version = "0.24.
|
|
171
|
+
version = "0.24.1"
|
|
172
172
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
173
|
-
checksum = "
|
|
173
|
+
checksum = "e27165889bd793000a098bb966adc4300c312497ea25cf7a690a9f0ac5aa5fc1"
|
|
174
174
|
dependencies = [
|
|
175
175
|
"once_cell",
|
|
176
176
|
"target-lexicon",
|
|
@@ -178,9 +178,9 @@ dependencies = [
|
|
|
178
178
|
|
|
179
179
|
[[package]]
|
|
180
180
|
name = "pyo3-ffi"
|
|
181
|
-
version = "0.24.
|
|
181
|
+
version = "0.24.1"
|
|
182
182
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
183
|
-
checksum = "
|
|
183
|
+
checksum = "05280526e1dbf6b420062f3ef228b78c0c54ba94e157f5cb724a609d0f2faabc"
|
|
184
184
|
dependencies = [
|
|
185
185
|
"libc",
|
|
186
186
|
"pyo3-build-config",
|
|
@@ -188,9 +188,9 @@ dependencies = [
|
|
|
188
188
|
|
|
189
189
|
[[package]]
|
|
190
190
|
name = "pyo3-macros"
|
|
191
|
-
version = "0.24.
|
|
191
|
+
version = "0.24.1"
|
|
192
192
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
193
|
-
checksum = "
|
|
193
|
+
checksum = "5c3ce5686aa4d3f63359a5100c62a127c9f15e8398e5fdeb5deef1fed5cd5f44"
|
|
194
194
|
dependencies = [
|
|
195
195
|
"proc-macro2",
|
|
196
196
|
"pyo3-macros-backend",
|
|
@@ -200,9 +200,9 @@ dependencies = [
|
|
|
200
200
|
|
|
201
201
|
[[package]]
|
|
202
202
|
name = "pyo3-macros-backend"
|
|
203
|
-
version = "0.24.
|
|
203
|
+
version = "0.24.1"
|
|
204
204
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
205
|
-
checksum = "
|
|
205
|
+
checksum = "f4cf6faa0cbfb0ed08e89beb8103ae9724eb4750e3a78084ba4017cbe94f3855"
|
|
206
206
|
dependencies = [
|
|
207
207
|
"heck",
|
|
208
208
|
"proc-macro2",
|
|
@@ -222,9 +222,9 @@ dependencies = [
|
|
|
222
222
|
|
|
223
223
|
[[package]]
|
|
224
224
|
name = "rs-can"
|
|
225
|
-
version = "0.2.0
|
|
225
|
+
version = "0.2.0"
|
|
226
226
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
227
|
-
checksum = "
|
|
227
|
+
checksum = "4416620ec3f2141f73b5d0936481c9caf3aa27ba140e2a97f178b80b7f110f68"
|
|
228
228
|
dependencies = [
|
|
229
229
|
"bitflags",
|
|
230
230
|
"derive-getters",
|
|
@@ -351,9 +351,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
|
|
351
351
|
|
|
352
352
|
[[package]]
|
|
353
353
|
name = "zlgcan"
|
|
354
|
-
version = "0.2.0
|
|
354
|
+
version = "0.2.0"
|
|
355
355
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
356
|
-
checksum = "
|
|
356
|
+
checksum = "ad37441e238647c26ae9521b03bfb3abf3dbd37c74ac4f47219a624781b71f7a"
|
|
357
357
|
dependencies = [
|
|
358
358
|
"dlopen2",
|
|
359
359
|
"dotenvy",
|
|
@@ -365,7 +365,7 @@ dependencies = [
|
|
|
365
365
|
|
|
366
366
|
[[package]]
|
|
367
367
|
name = "zlgcan-driver"
|
|
368
|
-
version = "0.1.
|
|
368
|
+
version = "0.1.17"
|
|
369
369
|
dependencies = [
|
|
370
370
|
"anyhow",
|
|
371
371
|
"pyo3",
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
[package]
|
|
2
2
|
name = "zlgcan-driver"
|
|
3
|
-
version = "0.1.
|
|
3
|
+
version = "0.1.17"
|
|
4
4
|
edition = "2021"
|
|
5
5
|
|
|
6
6
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
|
@@ -13,8 +13,8 @@ pyo3 = "0.24"
|
|
|
13
13
|
#iso15765-2 = { version = "0.1.0-alpha0" }
|
|
14
14
|
#iso14229-1 = { version = "0.1.0-alpha0" }
|
|
15
15
|
#docan = { version = "0.1.0-alpha0" }
|
|
16
|
-
rs-can = { version = "0.2.0
|
|
17
|
-
zlgcan = { version = "0.2.0
|
|
16
|
+
rs-can = { version = "0.2.0" }
|
|
17
|
+
zlgcan = { version = "0.2.0" }
|
|
18
18
|
|
|
19
19
|
[dev-dependencies]
|
|
20
20
|
anyhow = "1"
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: zlgcan
|
|
3
|
-
Version: 0.1.
|
|
3
|
+
Version: 0.1.17
|
|
4
4
|
Classifier: Programming Language :: Rust
|
|
5
5
|
Classifier: Programming Language :: Python :: Implementation :: CPython
|
|
6
6
|
Classifier: Programming Language :: Python :: Implementation :: PyPy
|
|
@@ -14,6 +14,9 @@ Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
|
|
|
14
14
|
Project-URL: homepage, https://github.com/zhuyu4839/zlgcan-driver
|
|
15
15
|
Project-URL: repository, https://github.com/zhuyu4839/zlgcan-driver
|
|
16
16
|
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
|
|
17
20
|
# ZLGCAN驱动及集成到python-can(因内存模型不同，目前Windows下32位python会报内存非法访问的错误)
|
|
18
21
|
|
|
19
22
|
1. 准备
|
|
@@ -2,7 +2,7 @@ pub(crate) mod wrappers;
|
|
|
2
2
|
|
|
3
3
|
use std::sync::{Arc, Mutex};
|
|
4
4
|
use pyo3::{exceptions, prelude::*};
|
|
5
|
-
use rs_can::{CanError, CanFrame, CanType, ChannelConfig, DeviceBuilder
|
|
5
|
+
use rs_can::{CanError, CanFrame, CanType, ChannelConfig, DeviceBuilder};
|
|
6
6
|
use zlgcan_rs::{
|
|
7
7
|
can::{CanMessage, ZCanFrameType},
|
|
8
8
|
device::DeriveInfo,
|
|
@@ -29,7 +29,7 @@ fn zlgcan_init_can(
|
|
|
29
29
|
cfgs: Vec<ZCanChlCfgPy>,
|
|
30
30
|
derive_info: Option<ZDeriveInfoPy>,
|
|
31
31
|
) -> PyResult<ZCanDriverWrap> {
|
|
32
|
-
let mut builder = DeviceBuilder::new(
|
|
32
|
+
let mut builder = DeviceBuilder::new();
|
|
33
33
|
builder.add_other(DEVICE_TYPE, Box::new(dev_type))
|
|
34
34
|
.add_other(DEVICE_INDEX, Box::new(dev_idx));
|
|
35
35
|
derive_info.map(
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|