Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump to v29.0.0-rc.16 #22

Merged
merged 3 commits into from
Jan 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
293 changes: 158 additions & 135 deletions Cargo.lock

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "autd3capi-link-soem"
version = "29.0.0-rc.13"
version = "29.0.0-rc.16"
authors = ["shun suzuki <suzuki@hapis.k.u-tokyo.ac.jp>"]
edition = "2021"
license = "MIT"
Expand All @@ -14,8 +14,8 @@ unity = ["autd3capi-driver/unity"]
dynamic_freq = ["autd3capi-driver/dynamic_freq"]

[dependencies]
autd3capi-driver = { version = "=29.0.0-rc.13" }
autd3-link-soem = { version = "=29.0.0-rc.13", features = ["async-trait", "remote"] }
autd3capi-driver = { version = "=29.0.0-rc.16" }
autd3-link-soem = { version = "=29.0.0-rc.16", features = ["remote", "blocking"] }
thread-priority = "=1.2.0"
tracing-subscriber = { version = "=0.3.19", features = ["ansi", "env-filter"], default-features = false }
tracing = { version = "=0.1.41", default-features = false }
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2022-2024 Shun Suzuki
Copyright (c) 2022-2025 Shun Suzuki

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@

# Author

Shun Suzuki, 2022-2024
Shun Suzuki, 2022-2025
104 changes: 62 additions & 42 deletions ThirdPartyNotice.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,6 @@ approx 0.5.1 (Apache-2.0)
https://github.com/brendanzab/approx
---------------------------------------------------------

async-channel 2.3.1 (Apache-2.0 OR MIT)
https://github.com/smol-rs/async-channel
---------------------------------------------------------

async-ffi 0.5.0 (MIT)
https://github.com/oxalica/async-ffi
---------------------------------------------------------

async-stream 0.3.6 (MIT)
https://github.com/tokio-rs/async-stream
---------------------------------------------------------
Expand All @@ -50,39 +42,39 @@ atomic-waker 1.1.2 (Apache-2.0 OR MIT)
https://github.com/smol-rs/atomic-waker
---------------------------------------------------------

autd3 29.0.0-rc.13 (MIT)
autd3 29.0.0-rc.16 (MIT)
https://github.com/shinolab/autd3-rs
---------------------------------------------------------

autd3-derive 29.0.0-rc.13 (MIT)
autd3-core 29.0.0-rc.16 (MIT)
https://github.com/shinolab/autd3-rs
---------------------------------------------------------

autd3-driver 29.0.0-rc.13 (MIT)
autd3-derive 29.0.0-rc.16 (MIT)
https://github.com/shinolab/autd3-rs
---------------------------------------------------------

autd3-firmware-emulator 29.0.0-rc.13 (MIT)
autd3-driver 29.0.0-rc.16 (MIT)
https://github.com/shinolab/autd3-rs
---------------------------------------------------------

autd3-gain-holo 29.0.0-rc.13 (MIT)
autd3-firmware-emulator 29.0.0-rc.16 (MIT)
https://github.com/shinolab/autd3-rs
---------------------------------------------------------

autd3-link-soem 29.0.0-rc.13 (MIT)
autd3-link-soem 29.0.0-rc.16 (MIT)
https://github.com/shinolab/autd3-link-soem
---------------------------------------------------------

autd3-protobuf 29.0.0-rc.13 (MIT)
autd3-protobuf 29.0.0-rc.16 (MIT)
https://github.com/shinolab/autd3-rs
---------------------------------------------------------

autd3capi-driver 29.0.0-rc.13 (MIT)
autd3capi-driver 29.0.0-rc.16 (MIT)
https://github.com/shinolab/autd3-capi
---------------------------------------------------------

autd3capi-link-soem 29.0.0-rc.13 (MIT)
autd3capi-link-soem 29.0.0-rc.16 (MIT)
https://github.com/shinolab/autd3-capi-link-soem
---------------------------------------------------------

Expand Down Expand Up @@ -110,7 +102,7 @@ bitfield-struct 0.10.0 (MIT)
https://github.com/wrenger/bitfield-struct-rs.git
---------------------------------------------------------

bitflags 2.6.0 (Apache-2.0 OR MIT)
bitflags 2.8.0 (Apache-2.0 OR MIT)
https://github.com/bitflags/bitflags
---------------------------------------------------------

Expand All @@ -134,8 +126,8 @@ cfg-if 1.0.0 (Apache-2.0 OR MIT)
https://github.com/alexcrichton/cfg-if
---------------------------------------------------------

concurrent-queue 2.5.0 (Apache-2.0 OR MIT)
https://github.com/smol-rs/concurrent-queue
crossbeam-channel 0.5.14 (Apache-2.0 OR MIT)
https://github.com/crossbeam-rs/crossbeam
---------------------------------------------------------

crossbeam-deque 0.8.6 (Apache-2.0 OR MIT)
Expand Down Expand Up @@ -174,14 +166,6 @@ equivalent 1.0.1 (Apache-2.0 OR MIT)
https://github.com/cuviper/equivalent
---------------------------------------------------------

event-listener 5.4.0 (Apache-2.0 OR MIT)
https://github.com/smol-rs/event-listener
---------------------------------------------------------

event-listener-strategy 0.5.3 (Apache-2.0 OR MIT)
https://github.com/smol-rs/event-listener-strategy
---------------------------------------------------------

fnv 1.0.7 (Apache-2.0 OR MIT)
https://github.com/servo/rust-fnv
---------------------------------------------------------
Expand Down Expand Up @@ -286,7 +270,7 @@ libc 0.2.169 (Apache-2.0 OR MIT)
https://github.com/rust-lang/libc
---------------------------------------------------------

log 0.4.22 (Apache-2.0 OR MIT)
log 0.4.25 (Apache-2.0 OR MIT)
https://github.com/rust-lang/log
---------------------------------------------------------

Expand Down Expand Up @@ -314,7 +298,7 @@ minimal-lexical 0.2.1 (Apache-2.0 OR MIT)
https://github.com/Alexhuszagh/minimal-lexical
---------------------------------------------------------

miniz_oxide 0.8.2 (Apache-2.0 OR MIT OR Zlib)
miniz_oxide 0.8.3 (Apache-2.0 OR MIT OR Zlib)
https://github.com/Frommi/miniz_oxide/tree/master/miniz_oxide
---------------------------------------------------------

Expand Down Expand Up @@ -414,7 +398,7 @@ ppv-lite86 0.2.20 (Apache-2.0 OR MIT)
https://github.com/cryptocorrosion/cryptocorrosion
---------------------------------------------------------

proc-macro2 1.0.92 (Apache-2.0 OR MIT)
proc-macro2 1.0.93 (Apache-2.0 OR MIT)
https://github.com/dtolnay/proc-macro2
---------------------------------------------------------

Expand Down Expand Up @@ -522,7 +506,7 @@ spin_sleep 1.3.0 (Apache-2.0)
https://github.com/alexheretic/spin-sleep
---------------------------------------------------------

syn 2.0.95 (Apache-2.0 OR MIT)
syn 2.0.96 (Apache-2.0 OR MIT)
https://github.com/dtolnay/syn
---------------------------------------------------------

Expand All @@ -534,11 +518,11 @@ ta 0.5.0 (MIT)
https://github.com/greyblake/ta-rs
---------------------------------------------------------

thiserror 2.0.9 (Apache-2.0 OR MIT)
thiserror 2.0.11 (Apache-2.0 OR MIT)
https://github.com/dtolnay/thiserror
---------------------------------------------------------

thiserror-impl 2.0.9 (Apache-2.0 OR MIT)
thiserror-impl 2.0.11 (Apache-2.0 OR MIT)
https://github.com/dtolnay/thiserror
---------------------------------------------------------

Expand All @@ -562,11 +546,11 @@ time-macros 0.2.19 (Apache-2.0 OR MIT)
https://github.com/time-rs/time
---------------------------------------------------------

tokio 1.42.0 (MIT)
tokio 1.43.0 (MIT)
https://github.com/tokio-rs/tokio
---------------------------------------------------------

tokio-macros 2.4.0 (MIT)
tokio-macros 2.5.0 (MIT)
https://github.com/tokio-rs/tokio
---------------------------------------------------------

Expand Down Expand Up @@ -658,27 +642,27 @@ winapi-x86_64-pc-windows-gnu 0.4.0 (Apache-2.0 OR MIT)
https://github.com/retep998/winapi-rs
---------------------------------------------------------

windows 0.58.0 (Apache-2.0 OR MIT)
windows 0.59.0 (Apache-2.0 OR MIT)
https://github.com/microsoft/windows-rs
---------------------------------------------------------

windows-core 0.58.0 (Apache-2.0 OR MIT)
windows-core 0.59.0 (Apache-2.0 OR MIT)
https://github.com/microsoft/windows-rs
---------------------------------------------------------

windows-implement 0.58.0 (Apache-2.0 OR MIT)
windows-implement 0.59.0 (Apache-2.0 OR MIT)
https://github.com/microsoft/windows-rs
---------------------------------------------------------

windows-interface 0.58.0 (Apache-2.0 OR MIT)
windows-interface 0.59.0 (Apache-2.0 OR MIT)
https://github.com/microsoft/windows-rs
---------------------------------------------------------

windows-result 0.2.0 (Apache-2.0 OR MIT)
windows-result 0.3.0 (Apache-2.0 OR MIT)
https://github.com/microsoft/windows-rs
---------------------------------------------------------

windows-strings 0.1.0 (Apache-2.0 OR MIT)
windows-strings 0.3.0 (Apache-2.0 OR MIT)
https://github.com/microsoft/windows-rs
---------------------------------------------------------

Expand All @@ -694,38 +678,74 @@ windows-targets 0.52.6 (Apache-2.0 OR MIT)
https://github.com/microsoft/windows-rs
---------------------------------------------------------

windows-targets 0.53.0 (Apache-2.0 OR MIT)
https://github.com/microsoft/windows-rs
---------------------------------------------------------

windows_aarch64_gnullvm 0.52.6 (Apache-2.0 OR MIT)
https://github.com/microsoft/windows-rs
---------------------------------------------------------

windows_aarch64_gnullvm 0.53.0 (Apache-2.0 OR MIT)
https://github.com/microsoft/windows-rs
---------------------------------------------------------

windows_aarch64_msvc 0.52.6 (Apache-2.0 OR MIT)
https://github.com/microsoft/windows-rs
---------------------------------------------------------

windows_aarch64_msvc 0.53.0 (Apache-2.0 OR MIT)
https://github.com/microsoft/windows-rs
---------------------------------------------------------

windows_i686_gnu 0.52.6 (Apache-2.0 OR MIT)
https://github.com/microsoft/windows-rs
---------------------------------------------------------

windows_i686_gnu 0.53.0 (Apache-2.0 OR MIT)
https://github.com/microsoft/windows-rs
---------------------------------------------------------

windows_i686_gnullvm 0.52.6 (Apache-2.0 OR MIT)
https://github.com/microsoft/windows-rs
---------------------------------------------------------

windows_i686_gnullvm 0.53.0 (Apache-2.0 OR MIT)
https://github.com/microsoft/windows-rs
---------------------------------------------------------

windows_i686_msvc 0.52.6 (Apache-2.0 OR MIT)
https://github.com/microsoft/windows-rs
---------------------------------------------------------

windows_i686_msvc 0.53.0 (Apache-2.0 OR MIT)
https://github.com/microsoft/windows-rs
---------------------------------------------------------

windows_x86_64_gnu 0.52.6 (Apache-2.0 OR MIT)
https://github.com/microsoft/windows-rs
---------------------------------------------------------

windows_x86_64_gnu 0.53.0 (Apache-2.0 OR MIT)
https://github.com/microsoft/windows-rs
---------------------------------------------------------

windows_x86_64_gnullvm 0.52.6 (Apache-2.0 OR MIT)
https://github.com/microsoft/windows-rs
---------------------------------------------------------

windows_x86_64_gnullvm 0.53.0 (Apache-2.0 OR MIT)
https://github.com/microsoft/windows-rs
---------------------------------------------------------

windows_x86_64_msvc 0.52.6 (Apache-2.0 OR MIT)
https://github.com/microsoft/windows-rs
---------------------------------------------------------

windows_x86_64_msvc 0.53.0 (Apache-2.0 OR MIT)
https://github.com/microsoft/windows-rs
---------------------------------------------------------

zerocopy 0.7.35 (Apache-2.0 OR BSD-2-Clause OR MIT)
https://github.com/google/zerocopy
---------------------------------------------------------
Expand Down
6 changes: 3 additions & 3 deletions src/local.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ pub unsafe extern "C" fn AUTDLinkSOEM(
timer_strategy: TimerStrategy,
tolerance: Duration,
sync_timeout: Duration,
) -> ResultSyncLinkBuilder {
) -> ResultLinkBuilder {
let ifname = if ifname.is_null() {
""
} else {
validate_cstr!(ifname, SyncLinkBuilderPtr, ResultSyncLinkBuilder)
validate_cstr!(ifname, LinkBuilderPtr, ResultLinkBuilder)
};
let builder = SOEM::builder()
.with_ifname(ifname)
Expand Down Expand Up @@ -126,7 +126,7 @@ pub unsafe extern "C" fn AUTDLinkSOEMIsDefault(
pub unsafe extern "C" fn AUTDLinkSOEMStatusGetMsg(src: Status, dst: *mut c_char) -> u32 {
let msg = format!("{}", autd3_link_soem::Status::from(src));
if dst.is_null() {
return msg.as_bytes().len() as u32 + 1;
return msg.len() as u32 + 1;
}
let c_string = CString::new(msg).unwrap();
let c_str: &CStr = c_string.as_c_str();
Expand Down
4 changes: 2 additions & 2 deletions src/remote.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ use autd3_link_soem::remote::*;

#[no_mangle]
#[must_use]
pub unsafe extern "C" fn AUTDLinkRemoteSOEM(addr: *const c_char) -> ResultSyncLinkBuilder {
pub unsafe extern "C" fn AUTDLinkRemoteSOEM(addr: *const c_char) -> ResultLinkBuilder {
let addr = if addr.is_null() {
""
} else {
validate_cstr!(addr, SyncLinkBuilderPtr, ResultSyncLinkBuilder)
validate_cstr!(addr, LinkBuilderPtr, ResultLinkBuilder)
};
addr.parse::<SocketAddr>().map(RemoteSOEM::builder).into()
}
2 changes: 1 addition & 1 deletion tools/autd3-license-check
Submodule autd3-license-check updated 2 files
+0 −1 Cargo.toml
+1 −1 LICENSE
2 changes: 1 addition & 1 deletion tools/autd3_build_utils
1 change: 0 additions & 1 deletion tools/license-checker/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading