From d1f781ff9faacfc464040e77ed0daf028cd14c7e Mon Sep 17 00:00:00 2001 From: shun suzuki Date: Thu, 14 Dec 2023 15:23:07 +0900 Subject: [PATCH 1/2] fix #3 --- CHANGELOG.md | 4 ++++ autd3/src/controller/mod.rs | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 89f4b8c3..db26fae4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 19.0.2 + +- Fix [#3](https://github.com/shinolab/autd3-rs/issues/3): Cannot build with sync feature + # 19.0.1 - Update firmware to v4.1.2 diff --git a/autd3/src/controller/mod.rs b/autd3/src/controller/mod.rs index ec0d8806..1aa0b970 100644 --- a/autd3/src/controller/mod.rs +++ b/autd3/src/controller/mod.rs @@ -4,7 +4,7 @@ * Created Date: 05/10/2023 * Author: Shun Suzuki * ----- - * Last Modified: 13/12/2023 + * Last Modified: 14/12/2023 * Modified By: Shun Suzuki (suzuki@hapis.k.u-tokyo.ac.jp) * ----- * Copyright (c) 2023 Shun Suzuki. All rights reserved. @@ -311,7 +311,10 @@ impl Controller { for dev in self.geometry.iter_mut() { dev.enable = true; } - let res = self.send(Stop::new())?; + let res = self.send(( + autd3_driver::datagram::Silencer::default(), + crate::gain::Null::default(), + ))?; let res = res & self.send(Clear::new())?; self.link.close()?; Ok(res) From 1294739b232e22c3897cf6920fa8b1704758736a Mon Sep 17 00:00:00 2001 From: shun suzuki Date: Thu, 14 Dec 2023 16:11:15 +0900 Subject: [PATCH 2/2] fix #4: autd3-driver@19.0.1 doesn't follow semver --- CHANGELOG.md | 3 ++- autd3-derive/Cargo.toml | 2 +- autd3-driver/Cargo.toml | 2 +- autd3-firmware-emulator/Cargo.toml | 6 +++--- autd3-firmware-emulator/src/error.rs | 21 +++++++++++++++++++++ autd3-firmware-emulator/src/lib.rs | 2 ++ autd3-gain-holo/Cargo.toml | 6 +++--- autd3-link-simulator/Cargo.toml | 8 ++++---- autd3-link-soem/Cargo.toml | 8 ++++---- autd3-link-twincat/Cargo.toml | 6 +++--- autd3-modulation-audio-file/Cargo.toml | 6 +++--- autd3-protobuf/Cargo.toml | 4 ++-- autd3/Cargo.toml | 8 ++++---- autd3/src/lib.rs | 4 +++- examples/Cargo.toml | 2 +- 15 files changed, 57 insertions(+), 31 deletions(-) create mode 100644 autd3-firmware-emulator/src/error.rs diff --git a/CHANGELOG.md b/CHANGELOG.md index db26fae4..84ad0192 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ -# 19.0.2 +# 19.1.0 - Fix [#3](https://github.com/shinolab/autd3-rs/issues/3): Cannot build with sync feature +- Fix [#4](https://github.com/shinolab/autd3-rs/issues/4): autd3-driver@19.0.1 doesn't follow semver # 19.0.1 diff --git a/autd3-derive/Cargo.toml b/autd3-derive/Cargo.toml index 8463103b..a4c51626 100644 --- a/autd3-derive/Cargo.toml +++ b/autd3-derive/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "autd3-derive" -version = "19.0.1" +version = "19.1.0" authors = ["shun suzuki "] edition = "2021" diff --git a/autd3-driver/Cargo.toml b/autd3-driver/Cargo.toml index 43055ce1..68a5806e 100644 --- a/autd3-driver/Cargo.toml +++ b/autd3-driver/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "autd3-driver" -version = "19.0.1" +version = "19.1.0" authors = ["shun suzuki "] edition = "2021" diff --git a/autd3-firmware-emulator/Cargo.toml b/autd3-firmware-emulator/Cargo.toml index c9465f29..7f027a24 100644 --- a/autd3-firmware-emulator/Cargo.toml +++ b/autd3-firmware-emulator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "autd3-firmware-emulator" -version = "19.0.1" +version = "19.1.0" authors = ["shun suzuki "] edition = "2021" @@ -11,10 +11,10 @@ readme = "README.md" keywords = ["autd"] [dependencies] -autd3-driver = { path = "../autd3-driver", version = "19.0.1" } +autd3-driver = { path = "../autd3-driver", version = "19.1.0" } num-integer = "0.1.45" thiserror = "1.0.40" [dev-dependencies] -autd3-derive = { path = "../autd3-derive", version = "19.0.1" } +autd3-derive = { path = "../autd3-derive", version = "19.1.0" } rand = "0.8.5" diff --git a/autd3-firmware-emulator/src/error.rs b/autd3-firmware-emulator/src/error.rs new file mode 100644 index 00000000..c0651dd2 --- /dev/null +++ b/autd3-firmware-emulator/src/error.rs @@ -0,0 +1,21 @@ +/* + * File: error.rs + * Project: src + * Created Date: 14/12/2023 + * Author: Shun Suzuki + * ----- + * Last Modified: 14/12/2023 + * Modified By: Shun Suzuki (suzuki@hapis.k.u-tokyo.ac.jp) + * ----- + * Copyright (c) 2023 Shun Suzuki. All rights reserved. + * + */ + +use thiserror::Error; + +#[derive(Error, Debug)] +#[deprecated(since = "19.1.0", note = "This error is no longer used.")] +pub enum AUTDExtraError { + #[error("The size of local_trans_pos is wrong.")] + FPGALocalTransPos, +} diff --git a/autd3-firmware-emulator/src/lib.rs b/autd3-firmware-emulator/src/lib.rs index 18dc5f7f..b0001cf6 100644 --- a/autd3-firmware-emulator/src/lib.rs +++ b/autd3-firmware-emulator/src/lib.rs @@ -12,6 +12,8 @@ */ pub mod cpu; +#[allow(deprecated)] +pub mod error; pub mod fpga; pub use cpu::emulator::CPUEmulator; diff --git a/autd3-gain-holo/Cargo.toml b/autd3-gain-holo/Cargo.toml index 45a8d784..4686715c 100644 --- a/autd3-gain-holo/Cargo.toml +++ b/autd3-gain-holo/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "autd3-gain-holo" -version = "19.0.1" +version = "19.1.0" authors = ["shun suzuki "] edition = "2021" @@ -12,8 +12,8 @@ keywords = ["autd"] [dependencies] assert_approx_eq = { version = "1.1.0", optional = true } -autd3-driver = { path = "../autd3-driver", version = "19.0.1" } -autd3-derive = { path = "../autd3-derive", version = "19.0.1" } +autd3-driver = { path = "../autd3-driver", version = "19.1.0" } +autd3-derive = { path = "../autd3-derive", version = "19.1.0" } nalgebra = { version = "0.32.3", default-features = false, features = ["std"] } rand = "0.8.5" thiserror = "1.0.31" diff --git a/autd3-link-simulator/Cargo.toml b/autd3-link-simulator/Cargo.toml index 8f680fee..1e524a68 100644 --- a/autd3-link-simulator/Cargo.toml +++ b/autd3-link-simulator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "autd3-link-simulator" -version = "19.0.1" +version = "19.1.0" authors = ["shun suzuki "] edition = "2021" @@ -11,9 +11,9 @@ readme = "README.md" keywords = ["autd"] [dependencies] -autd3-protobuf = { path = "../autd3-protobuf", version = "19.0.1" } -autd3-driver = { path = "../autd3-driver", version = "19.0.1" } -autd3-derive = { path = "../autd3-derive", version = "19.0.1" } +autd3-protobuf = { path = "../autd3-protobuf", version = "19.1.0" } +autd3-driver = { path = "../autd3-driver", version = "19.1.0" } +autd3-derive = { path = "../autd3-derive", version = "19.1.0" } thiserror = "1.0.30" tonic = "0.10.0" async-trait = "0.1.74" diff --git a/autd3-link-soem/Cargo.toml b/autd3-link-soem/Cargo.toml index b7f2c83a..fd99e1f6 100644 --- a/autd3-link-soem/Cargo.toml +++ b/autd3-link-soem/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "autd3-link-soem" -version = "19.0.1" +version = "19.1.0" authors = ["shun suzuki "] edition = "2021" @@ -16,9 +16,9 @@ glob = { version = "0.3.0", optional = true } [dependencies] async-trait = "0.1.74" -autd3-driver = { path = "../autd3-driver", version = "19.0.1" } -autd3-derive = { path = "../autd3-derive", version = "19.0.1" } -autd3-protobuf = { path = "../autd3-protobuf", version = "19.0.1", optional = true } +autd3-driver = { path = "../autd3-driver", version = "19.1.0" } +autd3-derive = { path = "../autd3-derive", version = "19.1.0" } +autd3-protobuf = { path = "../autd3-protobuf", version = "19.1.0", optional = true } crossbeam-channel = { version = "0.5.4", optional = true } thiserror = { version = "1.0.30", optional = true } time = { version = "0.3.23", default-features = false, features = ["std"], optional = true } diff --git a/autd3-link-twincat/Cargo.toml b/autd3-link-twincat/Cargo.toml index 4d16899e..eee0acdc 100644 --- a/autd3-link-twincat/Cargo.toml +++ b/autd3-link-twincat/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "autd3-link-twincat" -version = "19.0.1" +version = "19.1.0" authors = ["shun suzuki "] edition = "2021" @@ -12,8 +12,8 @@ keywords = ["autd"] [dependencies] async-trait = "0.1.74" -autd3-driver = { path = "../autd3-driver", version = "19.0.1" } -autd3-derive = { path = "../autd3-derive", version = "19.0.1" } +autd3-driver = { path = "../autd3-driver", version = "19.1.0", features = ["sync"] } +autd3-derive = { path = "../autd3-derive", version = "19.1.0" } itertools = { version = "0.12.0", optional = true } libloading = { version = "0.8.0", optional = true } thiserror = "1.0.31" diff --git a/autd3-modulation-audio-file/Cargo.toml b/autd3-modulation-audio-file/Cargo.toml index c4b67790..3d80b4d7 100644 --- a/autd3-modulation-audio-file/Cargo.toml +++ b/autd3-modulation-audio-file/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "autd3-modulation-audio-file" -version = "19.0.1" +version = "19.1.0" authors = ["shun suzuki "] edition = "2021" @@ -12,8 +12,8 @@ keywords = ["autd"] [dependencies] hound = "3.5.0" -autd3-driver = { path = "../autd3-driver", version = "19.0.1" } -autd3-derive = { path = "../autd3-derive", version = "19.0.1" } +autd3-driver = { path = "../autd3-driver", version = "19.1.0" } +autd3-derive = { path = "../autd3-derive", version = "19.1.0" } wav_io = "0.1.8" thiserror = "1.0.40" diff --git a/autd3-protobuf/Cargo.toml b/autd3-protobuf/Cargo.toml index 144d1baf..14fe87fb 100644 --- a/autd3-protobuf/Cargo.toml +++ b/autd3-protobuf/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "autd3-protobuf" -version = "19.0.1" +version = "19.1.0" authors = ["shun suzuki "] edition = "2021" @@ -14,7 +14,7 @@ keywords = ["autd"] h2 = "0.4.0" prost = { version = "0.12.0" } tonic = { version = "0.10.0", default-features = false, features = ["prost", "codegen", "transport"] } -autd3-driver = { path = "../autd3-driver", version = "19.0.1" } +autd3-driver = { path = "../autd3-driver", version = "19.1.0" } thiserror = "1.0.40" [build-dependencies] diff --git a/autd3/Cargo.toml b/autd3/Cargo.toml index a62cf0ca..adf38489 100644 --- a/autd3/Cargo.toml +++ b/autd3/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "autd3" -version = "19.0.1" +version = "19.1.0" authors = ["shun suzuki "] edition = "2021" @@ -11,9 +11,9 @@ readme = "README.md" keywords = ["autd"] [dependencies] -autd3-driver = { path = "../autd3-driver", version = "19.0.1", features = ["sync"] } -autd3-derive = { path = "../autd3-derive", version = "19.0.1" } -autd3-firmware-emulator = { path = "../autd3-firmware-emulator", version = "19.0.1" } +autd3-driver = { path = "../autd3-driver", version = "19.1.0", features = ["sync"] } +autd3-derive = { path = "../autd3-derive", version = "19.1.0" } +autd3-firmware-emulator = { path = "../autd3-firmware-emulator", version = "19.1.0" } num = "0.4.0" thiserror = "1.0.31" bitvec = "1.0.1" diff --git a/autd3/src/lib.rs b/autd3/src/lib.rs index 59601b80..39808e0a 100644 --- a/autd3/src/lib.rs +++ b/autd3/src/lib.rs @@ -4,7 +4,7 @@ * Created Date: 27/04/2022 * Author: Shun Suzuki * ----- - * Last Modified: 13/12/2023 + * Last Modified: 14/12/2023 * Modified By: Shun Suzuki (suzuki@hapis.k.u-tokyo.ac.jp) * ----- * Copyright (c) 2022-2023 Shun Suzuki. All rights reserved. @@ -21,6 +21,8 @@ pub mod prelude; pub use autd3_derive as derive; pub use autd3_driver as driver; +pub use controller::Controller; + #[cfg(test)] mod tests { use autd3_driver::{defined::float, geometry::Vector3}; diff --git a/examples/Cargo.toml b/examples/Cargo.toml index d7cb5bd5..e82a6731 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "examples" -version = "19.0.1" +version = "19.1.0" authors = ["shun suzuki "] edition = "2021" license = "MIT"