Merge branch 'develop'

shinolab · Dec 14, 2023 · 30dda2e · 30dda2e
2 parents 5a3f8f4 + 1294739
commit 30dda2e
Show file tree

Hide file tree

Showing 16 changed files with 65 additions and 32 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 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
 
 - Update firmware to v4.1.2

diff --git 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 <suzuki@hapis.k.u-tokyo.ac.jp>"]
 edition = "2021"
 

diff --git 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 <suzuki@hapis.k.u-tokyo.ac.jp>"]
 edition = "2021"
 

diff --git 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 <suzuki@hapis.k.u-tokyo.ac.jp>"]
 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
@@ -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
@@ -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
@@ -1,6 +1,6 @@
 [package]
 name = "autd3-gain-holo"
-version = "19.0.1"
+version = "19.1.0"
 authors = ["shun suzuki <suzuki@hapis.k.u-tokyo.ac.jp>"]
 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
@@ -1,6 +1,6 @@
 [package]
 name = "autd3-link-simulator"
-version = "19.0.1"
+version = "19.1.0"
 authors = ["shun suzuki <suzuki@hapis.k.u-tokyo.ac.jp>"]
 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
@@ -1,6 +1,6 @@
 [package]
 name = "autd3-link-soem"
-version = "19.0.1"
+version = "19.1.0"
 authors = ["shun suzuki <suzuki@hapis.k.u-tokyo.ac.jp>"]
 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
@@ -1,6 +1,6 @@
 [package]
 name = "autd3-link-twincat"
-version = "19.0.1"
+version = "19.1.0"
 authors = ["shun suzuki <suzuki@hapis.k.u-tokyo.ac.jp>"]
 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
@@ -1,6 +1,6 @@
 [package]
 name = "autd3-modulation-audio-file"
-version = "19.0.1"
+version = "19.1.0"
 authors = ["shun suzuki <suzuki@hapis.k.u-tokyo.ac.jp>"]
 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
@@ -1,6 +1,6 @@
 [package]
 name = "autd3-protobuf"
-version = "19.0.1"
+version = "19.1.0"
 authors = ["shun suzuki <suzuki@hapis.k.u-tokyo.ac.jp>"]
 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
@@ -1,6 +1,6 @@
 [package]
 name = "autd3"
-version = "19.0.1"
+version = "19.1.0"
 authors = ["shun suzuki <suzuki@hapis.k.u-tokyo.ac.jp>"]
 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/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<L: Link> Controller<L> {
         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)

diff --git 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
@@ -1,6 +1,6 @@
 [package]
 name = "examples"
-version = "19.0.1"
+version = "19.1.0"
 authors = ["shun suzuki <suzuki@hapis.k.u-tokyo.ac.jp>"]
 edition = "2021"
 license = "MIT"