diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..c6133b1 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,11 @@ +version: 2 +updates: + - package-ecosystem: "cargo" + directory: "/" + schedule: + interval: "weekly" + + - package-ecosystem: "npm" + directory: "/" + schedule: + interval: "weekly" diff --git a/Cargo.lock b/Cargo.lock index 6fd92b5..90e4f07 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,7 +4,7 @@ version = 3 [[package]] name = "SOEMAUTDServer" -version = "26.0.0" +version = "27.0.0-alpha.1" dependencies = [ "anyhow", "autd3-driver", @@ -22,7 +22,7 @@ dependencies = [ [[package]] name = "TwinCATAUTDServerLightweight" -version = "26.0.0" +version = "27.0.0-alpha.1" dependencies = [ "anyhow", "autd3-link-twincat", @@ -39,9 +39,9 @@ dependencies = [ [[package]] name = "ab_glyph" -version = "0.2.27" +version = "0.2.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c3a1cbc201cc13ed06cf875efb781f2249b3677f5c74571b67d817877f9d697" +checksum = "79faae4620f45232f599d9bc7b290f88247a0834162c4495ab2f02d60004adfb" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -237,14 +237,14 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" [[package]] name = "arrayvec" @@ -261,6 +261,12 @@ dependencies = [ "libloading 0.7.4", ] +[[package]] +name = "assert_approx_eq" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c07dab4369547dbe5114677b33fbbf724971019f3818172d59a97a61c774ffd" + [[package]] name = "async-broadcast" version = "0.7.1" @@ -287,9 +293,9 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" +checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" dependencies = [ "async-task", "concurrent-queue", @@ -367,14 +373,14 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] name = "async-signal" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" +checksum = "dfb3634b73397aa844481f814fad23bbf07fdb0eabec10f2eb95e58944b1ec32" dependencies = [ "async-io", "async-lock", @@ -407,7 +413,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -418,13 +424,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -468,13 +474,13 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autd3" -version = "26.0.0" +version = "27.0.0-alpha.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b8f29afe60d592c526d2323e5890b94acb54624981cd58593b86801c527d21d" +checksum = "f08255796466ca10d1b5e9532a7b3b795497a3e1858fdc1eb894ae220e8df79b" dependencies = [ "autd3-driver", "autd3-firmware-emulator", - "bitvec", + "bit-vec", "derivative", "derive_more", "num", @@ -485,29 +491,28 @@ dependencies = [ [[package]] name = "autd3-derive" -version = "26.0.0" +version = "27.0.0-alpha.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71446b65be3e285798d90032d9525c177d1375eb5029a56b612599929671ee5b" +checksum = "41486912b34fc4da112a96ca22d5f9a00729461bf2ab338db6b90201bcdd286e" dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] name = "autd3-driver" -version = "26.0.0" +version = "27.0.0-alpha.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "695ea3583a0102b2ef3c6fa499b59e57358809bd9e9ee1253c189481c7cfc93e" +checksum = "12a4fc3690327b0b4320e2b684f8e9b8e11b513695495bc9dda2458a0d23edc7" dependencies = [ "async-trait", "autd3-derive", + "bit-vec", "bitfield-struct", "bitflags 2.6.0", - "bitvec", "derive_more", - "is_sorted", "itertools 0.12.1", "nalgebra", "num-complex", @@ -523,9 +528,9 @@ dependencies = [ [[package]] name = "autd3-firmware-emulator" -version = "26.0.0" +version = "27.0.0-alpha.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0da4c338a2f0469504b2427a6c10f4cb4ae07e069ca48b3c887099ea02741fe" +checksum = "2ed38fd052a60e9b3279f297fe6fe76aa13c4b1129fa81387a7cb8af26351bd8" dependencies = [ "autd3-driver", "num-integer", @@ -535,13 +540,13 @@ dependencies = [ [[package]] name = "autd3-gain-holo" -version = "26.0.0" +version = "27.0.0-alpha.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54775dfe9d1b68354b4fa3b264070e21e2d092fa84e35f340727d3f4a2a4ab5c" +checksum = "bd2ed0a8ba8b36ed8df4d2e66b5354cca910dd100b29c817c5099e9aad15af20" dependencies = [ - "approx 0.5.1", + "assert_approx_eq", "autd3-driver", - "bitvec", + "bit-vec", "derive_more", "nalgebra", "rand 0.8.5", @@ -551,9 +556,9 @@ dependencies = [ [[package]] name = "autd3-link-simulator" -version = "26.0.0" +version = "27.0.0-alpha.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4a02a50063f5b0443d9f90f5c1a99e96b47ab93a0bb07314a54c2d24d881aa7" +checksum = "63ac2a924f829fd05612eea1f62b6e5ff8d0cf8555704e7116db2fbf777c9551" dependencies = [ "autd3-driver", "autd3-protobuf", @@ -563,9 +568,9 @@ dependencies = [ [[package]] name = "autd3-link-soem" -version = "26.0.0" +version = "27.0.0-alpha.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2fbde4677a95594727b598eba09e8c0f97d7cc063a16dec4a2da4931259dff4" +checksum = "f48e119c43d98beac9d381ee432fd0b6361f60a45fc19c7e703218f42f0cc32d" dependencies = [ "async-channel", "autd3-driver", @@ -586,20 +591,20 @@ dependencies = [ [[package]] name = "autd3-link-twincat" -version = "26.0.0" +version = "27.0.0-alpha.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a17599d14307a246a4da61e14bb2a0a8a4dc832e079ab66c7343b3669af609" +checksum = "054a0585a585bdaf9546b512ef5c856396dc30709f35360dc9ee32dc518e5191" dependencies = [ "autd3-driver", - "libloading 0.8.4", + "libloading 0.8.5", "thiserror", ] [[package]] name = "autd3-protobuf" -version = "26.0.0" +version = "27.0.0-alpha.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad20b598653ef405983e45640bbbaded9e91b1b2b438a002f82a27296a63e3c8" +checksum = "742c75bee578faa076f110f28c47e03b0e01d6569a6e559dcb9c1d616fb34a7e" dependencies = [ "autd3", "autd3-driver", @@ -613,11 +618,11 @@ dependencies = [ [[package]] name = "autd3-server" -version = "26.0.0" +version = "27.0.0-alpha.1" dependencies = [ "autd3-driver", "autd3-link-soem", - "libloading 0.8.4", + "libloading 0.8.5", "serde", "serde_json", "tauri", @@ -732,6 +737,12 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" +[[package]] +name = "bit-vec" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" + [[package]] name = "bit_field" version = "0.10.2" @@ -746,7 +757,7 @@ checksum = "adc0846593a56638b74e136a45610f9934c052e14761bebca6b092d5522599e3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -763,21 +774,9 @@ checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bitstream-io" -version = "2.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "415f8399438eb5e4b2f73ed3152a3448b98149dda642a957ee704e1daa5cf1d8" - -[[package]] -name = "bitvec" -version = "1.0.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] +checksum = "3dcde5f311c85b8ca30c2e4198d4326bc342c76541590106f5fa4a50946ea499" [[package]] name = "block" @@ -859,9 +858,9 @@ dependencies = [ [[package]] name = "built" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6a6c0b39c38fd754ac338b00a88066436389c0f029da5d37d1e01091d9b7c17" +checksum = "236e6289eda5a812bc6b53c3b024039382a2895fbbeef2d748b2931546d392c4" [[package]] name = "bumpalo" @@ -886,7 +885,7 @@ checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -903,9 +902,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" [[package]] name = "bytes" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" [[package]] name = "cairo-rs" @@ -970,13 +969,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.101" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac367972e516d45567c7eafc73d24e1c193dcf200a8d94e9db7b3d38b349572d" +checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f" dependencies = [ "jobserver", "libc", - "once_cell", ] [[package]] @@ -1027,6 +1025,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "cgmath" version = "0.18.0" @@ -1055,14 +1059,14 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] name = "clap" -version = "4.5.8" +version = "4.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d" +checksum = "8f6b81fb3c84f5563d509c59b5a48d935f689e993afa90fe39047f05adef9142" dependencies = [ "clap_builder", "clap_derive", @@ -1070,9 +1074,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.8" +version = "4.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708" +checksum = "5ca6706fd5224857d9ac5eb9355f6683563cc0541c7cd9d014043b57cbec78ac" dependencies = [ "anstream", "anstyle", @@ -1089,7 +1093,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -1321,7 +1325,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -1352,7 +1356,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" dependencies = [ "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -1367,9 +1371,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ "darling_core", "darling_macro", @@ -1377,27 +1381,27 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] name = "darling_macro" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -1431,7 +1435,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -1498,7 +1502,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.4", + "libloading 0.8.5", ] [[package]] @@ -1546,14 +1550,14 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "embed-resource" -version = "2.4.2" +version = "2.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6985554d0688b687c5cb73898a34fbe3ad6c24c58c238a4d91d5e840670ee9d" +checksum = "4edcacde9351c33139a41e3c97eb2334351a81a2791bebb0b243df837128f602" dependencies = [ "cc", "memchr", "rustc_version", - "toml 0.8.14", + "toml 0.8.15", "vswhom", "winreg", ] @@ -1597,7 +1601,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -1754,12 +1758,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - [[package]] name = "futf" version = "0.1.5" @@ -1823,7 +1821,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -2151,7 +2149,7 @@ dependencies = [ "base64 0.13.1", "byteorder", "gltf-json", - "image 0.25.1", + "image 0.25.2", "lazy_static", "serde_json", "urlencoding", @@ -2166,7 +2164,7 @@ dependencies = [ "inflections", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -2406,9 +2404,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "0.14.29" +version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ "bytes", "futures-channel", @@ -2519,12 +2517,12 @@ dependencies = [ [[package]] name = "image" -version = "0.25.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" +checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" dependencies = [ "bytemuck", - "byteorder", + "byteorder-lite", "color_quant", "exr", "gif", @@ -2542,12 +2540,12 @@ dependencies = [ [[package]] name = "image-webp" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d730b085583c4d789dfd07fdcf185be59501666a90c97c40162b37e4fdad272d" +checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904" dependencies = [ "byteorder-lite", - "thiserror", + "quick-error", ] [[package]] @@ -2638,15 +2636,9 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] -[[package]] -name = "is_sorted" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "357376465c37db3372ef6a00585d336ed3d0f11d4345eef77ebcb05865392b21" - [[package]] name = "is_terminal_polyfill" version = "1.70.0" @@ -2728,9 +2720,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] @@ -2815,12 +2807,12 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -2850,12 +2842,6 @@ dependencies = [ "libc", ] -[[package]] -name = "line-wrap" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e" - [[package]] name = "linux-raw-sys" version = "0.4.14" @@ -3073,6 +3059,18 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "mio" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.52.0", +] + [[package]] name = "nalgebra" version = "0.32.6" @@ -3097,7 +3095,7 @@ checksum = "254a5372af8fc138e36684761d3c0cdb758a4410e938babcff1c860ce14ddbfc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -3202,7 +3200,19 @@ checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ "bitflags 2.6.0", "cfg-if", - "cfg_aliases", + "cfg_aliases 0.1.1", + "libc", +] + +[[package]] +name = "nix" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "cfg_aliases 0.2.1", "libc", "memoffset 0.9.1", ] @@ -3299,7 +3309,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -3343,16 +3353,6 @@ dependencies = [ "libm", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi 0.3.9", - "libc", -] - [[package]] name = "num_enum" version = "0.5.11" @@ -3392,7 +3392,7 @@ dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -3462,9 +3462,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.1" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" +checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e" dependencies = [ "memchr", ] @@ -3529,9 +3529,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "owned_ttf_parser" -version = "0.21.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b41438d2fc63c46c74a2203bf5ccd82c41ba04347b2fcf5754f230b167067d5" +checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90" dependencies = [ "ttf-parser", ] @@ -3585,9 +3585,9 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.2", + "redox_syscall 0.5.3", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -3706,7 +3706,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -3753,7 +3753,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -3824,14 +3824,13 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "plist" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9d34169e64b3c7a80c8621a48adaf44e0cf62c78a9b25dd9dd35f1881a17cf9" +checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "indexmap 2.2.6", - "line-wrap", - "quick-xml", + "quick-xml 0.32.0", "serde", "time", ] @@ -3956,7 +3955,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" dependencies = [ "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -3979,7 +3978,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -4015,6 +4014,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "quick-xml" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2" +dependencies = [ + "memchr", +] + [[package]] name = "quote" version = "1.0.36" @@ -4024,12 +4032,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "radium" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" - [[package]] name = "rand" version = "0.7.3" @@ -4148,9 +4150,9 @@ dependencies = [ [[package]] name = "ravif" -version = "0.11.7" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67376f469e7e7840d0040bbf4b9b3334005bb167f814621326e4c7ab8cd6e944" +checksum = "c6ba61c28ba24c0cf8406e025cb29a742637e3f70776e61c27a8a8b72a042d12" dependencies = [ "avif-serialize", "imgref", @@ -4213,9 +4215,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ "bitflags 2.6.0", ] @@ -4301,9 +4303,9 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.40" +version = "0.8.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7439be6844e40133eda024efd85bf07f59d0dd2f59b10c00dd6cfb92cc5c741" +checksum = "ade4539f42266ded9e755c605bdddf546242b2c961b03b06a7375260788a0523" dependencies = [ "bytemuck", ] @@ -4472,29 +4474,29 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] name = "serde_json" -version = "1.0.118" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "indexmap 2.2.6", "itoa 1.0.11", @@ -4510,7 +4512,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -4524,9 +4526,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.8.1" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" +checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" dependencies = [ "base64 0.22.1", "chrono", @@ -4542,14 +4544,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.8.1" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" +checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -4685,7 +4687,7 @@ dependencies = [ [[package]] name = "simulator" -version = "26.0.0" +version = "27.0.0-alpha.1" dependencies = [ "anyhow", "autd3", @@ -4703,7 +4705,7 @@ dependencies = [ "directories", "futures-util", "gltf", - "image 0.25.1", + "image 0.25.2", "imgui", "png", "scarlet", @@ -4894,7 +4896,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -4910,9 +4912,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.68" +version = "2.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" dependencies = [ "proc-macro2", "quote", @@ -4960,7 +4962,7 @@ dependencies = [ "cfg-expr 0.15.8", "heck 0.5.0", "pkg-config", - "toml 0.8.14", + "toml 0.8.15", "version-compare 0.2.0", ] @@ -5028,12 +5030,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - [[package]] name = "tar" version = "0.4.41" @@ -5047,15 +5043,15 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.14" +version = "0.12.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" +checksum = "4873307b7c257eddcb50c9bedf158eb669578359fb28428bef438fec8e6ba7c2" [[package]] name = "tauri" -version = "1.6.8" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77567d2b3b74de4588d544147142d02297f3eaa171a25a065252141d8597a516" +checksum = "336bc661a3f3250853fa83c6e5245449ed1c26dce5dcb28bdee7efedf6278806" dependencies = [ "anyhow", "cocoa", @@ -5108,9 +5104,9 @@ dependencies = [ [[package]] name = "tauri-build" -version = "1.5.2" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab30cba12974d0f9b09794f61e72cad6da2142d3ceb81e519321bab86ce53312" +checksum = "b0c6ec7a5c3296330c7818478948b422967ce4649094696c985f61d50076d29c" dependencies = [ "anyhow", "cargo_toml", @@ -5127,9 +5123,9 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "1.4.3" +version = "1.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3a1d90db526a8cdfd54444ad3f34d8d4d58fa5c536463915942393743bd06f8" +checksum = "c1aed706708ff1200ec12de9cfbf2582b5d8ec05f6a7293911091effbd22036b" dependencies = [ "base64 0.21.7", "brotli", @@ -5153,9 +5149,9 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "1.4.4" +version = "1.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a582d75414250122e4a597b9dd7d3c910a2c77906648fc2ac9353845ff0feec" +checksum = "b88f831d2973ae4f81a706a0004e67dac87f2e4439973bbe98efbd73825d8ede" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -5167,9 +5163,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "0.14.3" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7ffddf36d450791018e63a3ddf54979b9581d9644c584a5fb5611e6b5f20b4" +checksum = "3068ed62b63dedc705558f4248c7ecbd5561f0f8050949859ea0db2326f26012" dependencies = [ "gtk", "http", @@ -5188,9 +5184,9 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "0.14.8" +version = "0.14.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1989b3b4d611f5428b3414a4abae6fa6df30c7eb8ed33250ca90a5f7e5bb3655" +checksum = "d4c3db170233096aa30330feadcd895bf9317be97e624458560a20e814db7955" dependencies = [ "cocoa", "gtk", @@ -5208,9 +5204,9 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "1.5.4" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "450b17a7102e5d46d4bdabae0d1590fd27953e704e691fc081f06c06d2253b35" +checksum = "2826db448309d382dac14d520f0c0a40839b87b57b977e59cf5f296b3ace6a93" dependencies = [ "brotli", "ctor", @@ -5252,7 +5248,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f89f5fb70d6f62381f5d9b2ba9008196150b40b75f3068eb24faeddf1c686871" dependencies = [ - "quick-xml", + "quick-xml 0.31.0", "windows 0.56.0", "windows-version", ] @@ -5288,22 +5284,22 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -5399,9 +5395,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -5414,20 +5410,19 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.38.0" +version = "1.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" +checksum = "d040ac2b29ab03b09d4129c2f5bbd012a3ac2f79d38ff506a4bf8dd34b0eac8a" dependencies = [ "backtrace", "bytes", "libc", - "mio", - "num_cpus", + "mio 1.0.1", "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -5442,13 +5437,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -5498,14 +5493,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.14" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" +checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.14", + "toml_edit 0.22.16", ] [[package]] @@ -5543,15 +5538,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.14" +version = "0.22.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" +checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788" dependencies = [ "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.13", + "winnow 0.6.15", ] [[package]] @@ -5632,7 +5627,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -5682,9 +5677,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "ttf-parser" -version = "0.21.1" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8" +checksum = "8686b91785aff82828ed725225925b33b4fde44c4bb15876e5f7c832724c420a" [[package]] name = "tynm" @@ -5771,9 +5766,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.9.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ "getrandom 0.2.15", ] @@ -5871,7 +5866,7 @@ dependencies = [ "half", "heck 0.4.1", "indexmap 2.2.6", - "libloading 0.8.4", + "libloading 0.8.5", "objc", "once_cell", "parking_lot", @@ -5910,7 +5905,7 @@ dependencies = [ "proc-macro2", "quote", "shaderc", - "syn 2.0.68", + "syn 2.0.72", "vulkano", ] @@ -5966,7 +5961,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", "wasm-bindgen-shared", ] @@ -6000,7 +5995,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6187,9 +6182,9 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wide" -version = "0.7.24" +version = "0.7.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a040b111774ab63a19ef46bbc149398ab372b4ccdcfd719e9814dbd7dfd76c8" +checksum = "901e8597c777fa042e9e245bd56c0dc4418c5db3f845b6ff94fbac732c6a0692" dependencies = [ "bytemuck", "safe_arch", @@ -6269,7 +6264,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" dependencies = [ "windows-core 0.56.0", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -6279,7 +6274,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" dependencies = [ "windows-core 0.57.0", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -6298,7 +6293,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -6310,7 +6305,7 @@ dependencies = [ "windows-implement 0.56.0", "windows-interface 0.56.0", "windows-result", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -6322,7 +6317,7 @@ dependencies = [ "windows-implement 0.57.0", "windows-interface 0.57.0", "windows-result", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -6343,7 +6338,7 @@ checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -6354,7 +6349,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -6365,7 +6360,7 @@ checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -6376,7 +6371,7 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -6391,7 +6386,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -6418,7 +6413,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -6453,18 +6448,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -6479,7 +6474,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -6496,9 +6491,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -6526,9 +6521,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -6556,15 +6551,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -6592,9 +6587,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -6622,9 +6617,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -6640,9 +6635,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -6670,9 +6665,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winit" @@ -6682,14 +6677,14 @@ checksum = "9596d90b45384f5281384ab204224876e8e8bf7d58366d9b795ad99aa9894b94" dependencies = [ "android-activity", "bitflags 1.3.2", - "cfg_aliases", + "cfg_aliases 0.1.1", "core-foundation", "core-graphics", "dispatch", "instant", "libc", "log", - "mio", + "mio 0.8.11", "ndk 0.7.0", "objc2", "once_cell", @@ -6720,9 +6715,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.13" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +checksum = "557404e450152cd6795bb558bca69e43c585055f4606e3bcae5894fc6dac9ba0" dependencies = [ "memchr", ] @@ -6775,15 +6770,6 @@ dependencies = [ "windows-implement 0.39.0", ] -[[package]] -name = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] - [[package]] name = "x11" version = "2.21.0" @@ -6818,9 +6804,9 @@ dependencies = [ [[package]] name = "xcursor" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" +checksum = "d491ee231a51ae64a5b762114c3ac2104b967aadba1de45c86ca42cf051513b7" [[package]] name = "xdg-home" @@ -6846,9 +6832,9 @@ checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" [[package]] name = "zbus" -version = "4.3.0" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23915fcb26e7a9a9dc05fd93a9870d336d6d032cd7e8cebf1c5c37666489fdd5" +checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" dependencies = [ "async-broadcast", "async-executor", @@ -6866,7 +6852,7 @@ dependencies = [ "futures-sink", "futures-util", "hex", - "nix 0.28.0", + "nix 0.29.0", "ordered-stream", "rand 0.8.5", "serde", @@ -6884,14 +6870,14 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "4.3.0" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02bcca0b586d2f8589da32347b4784ba424c4891ed86aa5b50d5e88f6b2c4f5d" +checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", "zvariant_utils", ] @@ -6908,22 +6894,22 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] [[package]] @@ -6943,18 +6929,18 @@ dependencies = [ [[package]] name = "zune-jpeg" -version = "0.4.11" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448" +checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768" dependencies = [ "zune-core", ] [[package]] name = "zvariant" -version = "4.1.1" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aa6d31a02fbfb602bfde791de7fedeb9c2c18115b3d00f3a36e489f46ffbbc7" +checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" dependencies = [ "endi", "enumflags2", @@ -6965,24 +6951,24 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "4.1.1" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642bf1b6b6d527988b3e8193d20969d53700a36eac734d21ae6639db168701c8" +checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", "zvariant_utils", ] [[package]] name = "zvariant_utils" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" +checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.72", ] diff --git a/SOEMAUTDServer/Cargo.toml b/SOEMAUTDServer/Cargo.toml index 7ed189d..c0a789d 100644 --- a/SOEMAUTDServer/Cargo.toml +++ b/SOEMAUTDServer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "SOEMAUTDServer" -version = "26.0.0" +version = "27.0.0-alpha.1" authors = ["shun suzuki "] edition = "2021" license = "MIT" @@ -13,9 +13,9 @@ keywords = ["autd"] [dependencies] clap = { version = "4.3.0", features = ["derive"] } tokio = { version = "1.34.0", features = ["macros", "rt-multi-thread"] } -autd3-protobuf = { version = "26.0.0", features = ["lightweight", "async-trait"] } -autd3-link-soem = { version = "26.0.0", features = ["async-trait"] } -autd3-driver = { version = "26.0.0", features = ["async-trait"] } +autd3-protobuf = { version = "27.0.0-alpha.1", features = ["lightweight", "async-trait"] } +autd3-link-soem = { version = "27.0.0-alpha.1", features = ["async-trait"] } +autd3-driver = { version = "27.0.0-alpha.1", features = ["async-trait"] } anyhow = "1.0.72" ctrlc = "3.3.0" tonic = "0.11.0" diff --git a/SOEMAUTDServer/ThirdPartyNotice.txt b/SOEMAUTDServer/ThirdPartyNotice.txt index d335fad..a5e2c42 100644 --- a/SOEMAUTDServer/ThirdPartyNotice.txt +++ b/SOEMAUTDServer/ThirdPartyNotice.txt @@ -6,7 +6,7 @@ The license terms for each of these components are provided later in this notice --------------------------------------------------------- -SOEMAUTDServer 26.0.0 (MIT) +SOEMAUTDServer 27.0.0-alpha.1 (MIT) https://github.com/shinolab/autd3-server --------------------------------------------------------- @@ -74,27 +74,27 @@ async-trait 0.1.80 (Apache-2.0 OR MIT) https://github.com/dtolnay/async-trait --------------------------------------------------------- -autd3 26.0.0 (MIT) +autd3 27.0.0-alpha.1 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-derive 26.0.0 (MIT) +autd3-derive 27.0.0-alpha.1 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-driver 26.0.0 (MIT) +autd3-driver 27.0.0-alpha.1 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-firmware-emulator 26.0.0 (MIT) +autd3-firmware-emulator 27.0.0-alpha.1 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-gain-holo 26.0.0 (MIT) +autd3-gain-holo 27.0.0-alpha.1 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-link-soem 26.0.0 +autd3-link-soem 27.0.0-alpha.1 https://github.com/shinolab/autd3-rs --- @@ -160,7 +160,7 @@ SOEM write to Beckhoff Automation GmbH, Eiserstrasse 5, D-33415 Verl, Germany --------------------------------------------------------- -autd3-protobuf 26.0.0 (MIT) +autd3-protobuf 27.0.0-alpha.1 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- diff --git a/SOEMAUTDServer/src/main.rs b/SOEMAUTDServer/src/main.rs index 11999ff..df8c57a 100644 --- a/SOEMAUTDServer/src/main.rs +++ b/SOEMAUTDServer/src/main.rs @@ -2,6 +2,8 @@ mod log_formatter; +use std::num::{NonZeroU64, NonZeroUsize}; + use log_formatter::LogFormatter; use autd3_driver::{ @@ -49,13 +51,13 @@ struct Arg { port: u16, /// Sync0 cycle time in units of 500us #[clap(short = 's', long = "sync0", default_value = "2")] - sync0: u64, + sync0: NonZeroU64, /// Send cycle time in units of 500us #[clap(short = 'c', long = "send", default_value = "2")] - send: u64, + send: NonZeroU64, /// Buffer size #[clap(short = 'b', long = "buffer_size", default_value = "32")] - buf_size: usize, + buf_size: NonZeroUsize, /// Timer strategy #[clap(short = 'w', long = "timer", default_value = "sleep")] timer_strategy: TimerStrategyArg, diff --git a/TwinCATAUTDServerLightweight/Cargo.toml b/TwinCATAUTDServerLightweight/Cargo.toml index 72fe8b0..1aaeb2f 100644 --- a/TwinCATAUTDServerLightweight/Cargo.toml +++ b/TwinCATAUTDServerLightweight/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "TwinCATAUTDServerLightweight" -version = "26.0.0" +version = "27.0.0-alpha.1" authors = ["shun suzuki "] edition = "2021" license = "MIT" @@ -13,8 +13,8 @@ keywords = ["autd"] [dependencies] clap = { version = "4.3.0", features = ["derive"] } tokio = { version = "1.34.0", features = ["macros", "rt-multi-thread"] } -autd3-protobuf = { version = "26.0.0", features = ["lightweight", "async-trait"] } -autd3-link-twincat = { version = "26.0.0", features = ["async-trait"] } +autd3-protobuf = { version = "27.0.0-alpha.1", features = ["lightweight", "async-trait"] } +autd3-link-twincat = { version = "27.0.0-alpha.1", features = ["async-trait"] } anyhow = "1.0.72" ctrlc = "3.3.0" tonic = "0.11.0" diff --git a/TwinCATAUTDServerLightweight/ThirdPartyNotice.txt b/TwinCATAUTDServerLightweight/ThirdPartyNotice.txt index 1275cfd..b8e9cce 100644 --- a/TwinCATAUTDServerLightweight/ThirdPartyNotice.txt +++ b/TwinCATAUTDServerLightweight/ThirdPartyNotice.txt @@ -70,27 +70,27 @@ async-trait 0.1.80 (Apache-2.0 OR MIT) https://github.com/dtolnay/async-trait --------------------------------------------------------- -autd3 26.0.0 (MIT) +autd3 27.0.0-alpha.1 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-derive 26.0.0 (MIT) +autd3-derive 27.0.0-alpha.1 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-driver 26.0.0 (MIT) +autd3-driver 27.0.0-alpha.1 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-firmware-emulator 26.0.0 (MIT) +autd3-firmware-emulator 27.0.0-alpha.1 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-gain-holo 26.0.0 (MIT) +autd3-gain-holo 27.0.0-alpha.1 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-link-twincat 26.0.0 +autd3-link-twincat 27.0.0-alpha.1 https://github.com/shinolab/autd3-rs --- @@ -142,7 +142,7 @@ SOFTWARE. --------------------------------------------------------- -autd3-protobuf 26.0.0 (MIT) +autd3-protobuf 27.0.0-alpha.1 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- diff --git a/package-lock.json b/package-lock.json index 6192951..f486245 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "autd3-server", - "version": "26.0.0", + "version": "27.0.0-alpha.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "autd3-server", - "version": "26.0.0", + "version": "27.0.0-alpha.1", "dependencies": { "@tauri-apps/api": "^1.4.0", "svelte-simple-modal": "^1.6.1", diff --git a/package.json b/package.json index 1314313..849383a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "autd3-server", "type": "module", - "version": "26.0.0", + "version": "27.0.0-alpha.1", "scripts": { "dev": "vite", "build": "vite build", diff --git a/simulator/Cargo.toml b/simulator/Cargo.toml index 46f95f5..712cca3 100644 --- a/simulator/Cargo.toml +++ b/simulator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "simulator" -version = "26.0.0" +version = "27.0.0-alpha.1" edition = "2021" authors = ["shun suzuki "] @@ -10,11 +10,11 @@ repository = "https://github.com/shinolab/autd3-server" keywords = ["autd"] [dependencies] -autd3 = { version = "26.0.0", features = ["async-trait"] } -autd3-driver = { version = "26.0.0", features = ["async-trait"] } -autd3-firmware-emulator = { version = "26.0.0", features = ["async-trait"] } -autd3-protobuf = { version = "26.0.0", features = ["lightweight"] } -autd3-link-simulator = { version = "26.0.0", features = ["async-trait"] } +autd3 = { version = "27.0.0-alpha.1", features = ["async-trait"] } +autd3-driver = { version = "27.0.0-alpha.1", features = ["async-trait"] } +autd3-firmware-emulator = { version = "27.0.0-alpha.1", features = ["async-trait"] } +autd3-protobuf = { version = "27.0.0-alpha.1", features = ["lightweight"] } +autd3-link-simulator = { version = "27.0.0-alpha.1", features = ["async-trait"] } bitflags = "2.3.1" bytemuck = { version = "1.13.1", features = ["derive", "extern_crate_std", "min_const_generics"] } camera_controllers = "0.34.0" diff --git a/simulator/ThirdPartyNotice.txt b/simulator/ThirdPartyNotice.txt index 854bbc8..5e15781 100644 --- a/simulator/ThirdPartyNotice.txt +++ b/simulator/ThirdPartyNotice.txt @@ -118,31 +118,31 @@ atomic-polyfill 1.0.3 (Apache-2.0 OR MIT) https://github.com/embassy-rs/atomic-polyfill --------------------------------------------------------- -autd3 26.0.0 (MIT) +autd3 27.0.0-alpha.1 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-derive 26.0.0 (MIT) +autd3-derive 27.0.0-alpha.1 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-driver 26.0.0 (MIT) +autd3-driver 27.0.0-alpha.1 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-firmware-emulator 26.0.0 (MIT) +autd3-firmware-emulator 27.0.0-alpha.1 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-gain-holo 26.0.0 (MIT) +autd3-gain-holo 27.0.0-alpha.1 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-link-simulator 26.0.0 (MIT) +autd3-link-simulator 27.0.0-alpha.1 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-protobuf 26.0.0 (MIT) +autd3-protobuf 27.0.0-alpha.1 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- @@ -1184,7 +1184,7 @@ simd_helpers 0.1.0 (MIT) https://github.com/lu-zero/simd_helpers --------------------------------------------------------- -simulator 26.0.0 (MIT) +simulator 27.0.0-alpha.1 (MIT) https://github.com/shinolab/autd3-server --------------------------------------------------------- diff --git a/simulator/src/simulator.rs b/simulator/src/simulator.rs index 838fd5d..1919948 100644 --- a/simulator/src/simulator.rs +++ b/simulator/src/simulator.rs @@ -18,7 +18,7 @@ use crate::{ Quaternion, Vector3, }; use autd3_driver::{ - defined::{Hz, T4010A1_AMPLITUDE}, + defined::{T4010A1_AMPLITUDE, ULTRASOUND_PERIOD_COUNT}, firmware::cpu::TxDatagram, }; use autd3_firmware_emulator::CPUEmulator; @@ -229,7 +229,9 @@ impl Simulator { .unwrap() .block_on(async { let server = LightweightServer::new(move || { - autd3_link_simulator::Simulator::builder(port) + autd3_link_simulator::Simulator::builder( + format!("127.0.0.1:{}", port).parse().unwrap(), + ) }); Server::builder() .add_service(ecat_light_server::EcatLightServer::new(server)) @@ -327,13 +329,7 @@ impl Simulator { to_gl_rot(Quaternion::new( r.w as _, r.i as _, r.j as _, r.k as _, )), - Drive::new( - 1.0, - 0.0, - 1.0, - 40000 * Hz, - self.settings.sound_speed, - ), + Drive::new(1.0, 0.0, 1.0, self.settings.sound_speed), 1.0, ); }); @@ -555,13 +551,10 @@ impl Simulator { m.into(), ) as f32 - / 512.0) + / ULTRASOUND_PERIOD_COUNT as f32) .sin(); d.phase = drives[i].phase().radian() as f32; - d.set_wave_number( - cpu.fpga().ultrasound_freq(), - self.settings.sound_speed, - ); + d.set_wave_number(self.settings.sound_speed); }); Ok(()) diff --git a/simulator/src/sound_sources.rs b/simulator/src/sound_sources.rs index 593246e..43f1d96 100644 --- a/simulator/src/sound_sources.rs +++ b/simulator/src/sound_sources.rs @@ -1,4 +1,4 @@ -use autd3_driver::defined::Freq; +use autd3::prelude::ULTRASOUND_FREQ; use crate::prelude::*; @@ -12,27 +12,21 @@ pub struct Drive { } impl Drive { - pub fn new( - amp: f32, - phase: f32, - enable: f32, - ultrasound_freq: Freq, - sound_speed: f32, - ) -> Self { + pub fn new(amp: f32, phase: f32, enable: f32, sound_speed: f32) -> Self { Self { amp, phase, enable, - wave_num: Self::to_wave_number(ultrasound_freq, sound_speed), + wave_num: Self::to_wave_number(sound_speed), } } - pub fn set_wave_number(&mut self, ultrasound_freq: Freq, sound_speed: f32) { - self.wave_num = Self::to_wave_number(ultrasound_freq, sound_speed); + pub fn set_wave_number(&mut self, sound_speed: f32) { + self.wave_num = Self::to_wave_number(sound_speed); } - fn to_wave_number(ultrasound_freq: Freq, sound_speed: f32) -> f32 { - 2.0 * PI * ultrasound_freq.hz() as f32 / sound_speed + fn to_wave_number(sound_speed: f32) -> f32 { + 2.0 * PI * ULTRASOUND_FREQ.hz() as f32 / sound_speed } } diff --git a/simulator/src/view/imgui/mod.rs b/simulator/src/view/imgui/mod.rs index ea9f672..66bca9d 100644 --- a/simulator/src/view/imgui/mod.rs +++ b/simulator/src/view/imgui/mod.rs @@ -1,9 +1,9 @@ mod components; -use autd3::derive::AUTDInternalError; +use autd3::{derive::AUTDInternalError, prelude::ULTRASOUND_FREQ}; use autd3_driver::{ + defined::ULTRASOUND_PERIOD_COUNT, ethercat::{DcSysTime, ECAT_DC_SYS_TIME_BASE}, - firmware::fpga::ULTRASOUND_PERIOD, }; use components::*; @@ -438,10 +438,9 @@ impl ImGuiViewer { sources.drives_mut().skip(body_pointer[cpu.idx()]).take(cpu.num_transducers()).for_each( |s| { s.set_wave_number( - cpu.fpga().ultrasound_freq(), settings.sound_speed, ); - }, + } ); }); update_flag.set(UpdateFlag::UPDATE_SOURCE_DRIVE, true); @@ -556,7 +555,7 @@ impl ImGuiViewer { "Frequency division: {}", cpu.fpga().modulation_freq_division(segment) )); - let sampling_freq = cpu.fpga().fpga_clk_freq().hz() as f32 + let sampling_freq = ULTRASOUND_FREQ.hz() as f32 / cpu.fpga().modulation_freq_division(segment) as f32; ui.text(format!( "Sampling Frequency: {:.3} [Hz]", @@ -564,7 +563,7 @@ impl ImGuiViewer { )); let sampling_period = 1000000.0 * cpu.fpga().modulation_freq_division(segment) as f32 - / cpu.fpga().fpga_clk_freq().hz() as f32; + /ULTRASOUND_FREQ.hz() as f32; ui.text(format!( "Sampling period: {:.3} [us]", sampling_period @@ -669,7 +668,7 @@ impl ImGuiViewer { "Frequency division: {}", cpu.fpga().stm_freq_division(segment) )); - let sampling_freq = cpu.fpga().fpga_clk_freq().hz() + let sampling_freq =ULTRASOUND_FREQ.hz() as f32 / cpu.fpga().stm_freq_division(segment) as f32; ui.text(format!( @@ -678,7 +677,7 @@ impl ImGuiViewer { )); let sampling_period = 1000000.0 * cpu.fpga().stm_freq_division(segment) as f32 - / cpu.fpga().fpga_clk_freq().hz() as f32; + / ULTRASOUND_FREQ.hz() as f32; ui.text(format!( "Sampling period: {:.3} [us]", sampling_period @@ -701,12 +700,12 @@ impl ImGuiViewer { let debug_values = cpu.fpga().debug_values(); let gpio_out = |ty, value| match ty { autd3_firmware_emulator::fpga::params::DBG_NONE => { - vec![0.0; ULTRASOUND_PERIOD as usize] + vec![0.0; ULTRASOUND_PERIOD_COUNT] } autd3_firmware_emulator::fpga::params::DBG_BASE_SIG => { [ - vec![0.0; ULTRASOUND_PERIOD as usize / 2], - vec![1.0; ULTRASOUND_PERIOD as usize / 2], + vec![0.0; ULTRASOUND_PERIOD_COUNT / 2], + vec![1.0; ULTRASOUND_PERIOD_COUNT / 2], ] .concat() } @@ -717,7 +716,7 @@ impl ImGuiViewer { } else { 0.0 }; - ULTRASOUND_PERIOD as usize + ULTRASOUND_PERIOD_COUNT ] } autd3_firmware_emulator::fpga::params::DBG_FORCE_FAN => { @@ -727,18 +726,18 @@ impl ImGuiViewer { } else { 0.0 }; - ULTRASOUND_PERIOD as usize + ULTRASOUND_PERIOD_COUNT ] } autd3_firmware_emulator::fpga::params::DBG_SYNC => { - vec![0.0; ULTRASOUND_PERIOD as usize] + vec![0.0; ULTRASOUND_PERIOD_COUNT] } autd3_firmware_emulator::fpga::params::DBG_MOD_SEGMENT => { vec![match cpu.fpga().current_mod_segment() { autd3::derive::Segment::S0 => 0.0, autd3::derive::Segment::S1 => 1.0, _ => unimplemented!(), - }; ULTRASOUND_PERIOD as usize] + }; ULTRASOUND_PERIOD_COUNT] } autd3_firmware_emulator::fpga::params::DBG_MOD_IDX => { @@ -746,14 +745,14 @@ impl ImGuiViewer { 1.0 } else { 0.0 - }; ULTRASOUND_PERIOD as usize] + }; ULTRASOUND_PERIOD_COUNT] } autd3_firmware_emulator::fpga::params::DBG_STM_SEGMENT => { vec![match cpu.fpga().current_stm_segment() { autd3::derive::Segment::S0 => 0.0, autd3::derive::Segment::S1 => 1.0, _ => unimplemented!(), - }; ULTRASOUND_PERIOD as usize] + }; ULTRASOUND_PERIOD_COUNT] } autd3_firmware_emulator::fpga::params::DBG_STM_IDX => { @@ -761,23 +760,24 @@ impl ImGuiViewer { 1.0 } else { 0.0 - }; ULTRASOUND_PERIOD as usize] + }; ULTRASOUND_PERIOD_COUNT] } autd3_firmware_emulator::fpga::params::DBG_IS_STM_MODE => { vec![if cpu.fpga().stm_cycle(cpu.fpga().current_stm_segment()) != 1 { 1.0 } else { 0.0 - }; ULTRASOUND_PERIOD as usize] + }; ULTRASOUND_PERIOD_COUNT] } autd3_firmware_emulator::fpga::params::DBG_PWM_OUT => { let d = cpu.fpga().drives(cpu.fpga().current_stm_segment(), cpu.fpga().current_stm_idx())[value as usize]; let m = cpu.fpga().modulation_at(cpu.fpga().current_mod_segment(), cpu.fpga().current_mod_idx()); let phase = d.phase().value() as u32; let pulse_width = cpu.fpga().to_pulse_width(d.intensity(), m.into()) as u32; - let rise = (ULTRASOUND_PERIOD-phase*2-pulse_width/2+ULTRASOUND_PERIOD)%ULTRASOUND_PERIOD; - let fall = (ULTRASOUND_PERIOD-phase*2+(pulse_width+1)/2+ULTRASOUND_PERIOD)%ULTRASOUND_PERIOD; - (0..ULTRASOUND_PERIOD).map(|t| + const T:u32 = ULTRASOUND_PERIOD_COUNT as u32; + let rise = (T-phase*2-pulse_width/2+T)%T; + let fall = (T-phase*2+(pulse_width+1)/2+T)%T; + (0..T).map(|t| if rise <= fall { if (rise <= t) && (t < fall) { 1.0 @@ -794,7 +794,7 @@ impl ImGuiViewer { ).collect() } autd3_firmware_emulator::fpga::params::DBG_DIRECT => { - vec![value as f32; ULTRASOUND_PERIOD as usize] + vec![value as f32; ULTRASOUND_PERIOD_COUNT] } _ => unreachable!() }; diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 1d8c207..cad22a7 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "autd3-server" -version = "26.0.0" +version = "27.0.0-alpha.1" description = "AUTD3 Server app" authors = ["shun suzuki "] edition = "2021" @@ -22,8 +22,8 @@ serde_json = "1.0" serde = { version = "1.0", features = ["derive"] } tauri = { version = "1.6.1", features = ["window-all", "shell-sidecar", "dialog-all", "notification-all", "os-all", "path-all"] } tokio = { version = "1.34.0", features = ["macros", "rt-multi-thread", "time", "process"] } -autd3-driver = { version = "26.0.0", features = ["serde"] } -autd3-link-soem = { version = "26.0.0", features = ["serde"] } +autd3-driver = { version = "27.0.0-alpha.1", features = ["serde"] } +autd3-link-soem = { version = "27.0.0-alpha.1", features = ["serde"] } [target.'cfg(windows)'.dependencies] libloading = "0.8.0" diff --git a/src-tauri/ThirdPartyNotice.txt b/src-tauri/ThirdPartyNotice.txt index dc4312e..ef1567d 100644 --- a/src-tauri/ThirdPartyNotice.txt +++ b/src-tauri/ThirdPartyNotice.txt @@ -106,27 +106,27 @@ atomic-waker 1.1.2 (Apache-2.0 OR MIT) https://github.com/smol-rs/atomic-waker --------------------------------------------------------- -autd3 26.0.0 (MIT) +autd3 27.0.0-alpha.1 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-derive 26.0.0 (MIT) +autd3-derive 27.0.0-alpha.1 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-driver 26.0.0 (MIT) +autd3-driver 27.0.0-alpha.1 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-firmware-emulator 26.0.0 (MIT) +autd3-firmware-emulator 27.0.0-alpha.1 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-gain-holo 26.0.0 (MIT) +autd3-gain-holo 27.0.0-alpha.1 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-link-soem 26.0.0 +autd3-link-soem 27.0.0-alpha.1 https://github.com/shinolab/autd3-rs --- @@ -192,11 +192,11 @@ SOEM write to Beckhoff Automation GmbH, Eiserstrasse 5, D-33415 Verl, Germany --------------------------------------------------------- -autd3-protobuf 26.0.0 (MIT) +autd3-protobuf 27.0.0-alpha.1 (MIT) https://github.com/shinolab/autd3-rs --------------------------------------------------------- -autd3-server 26.0.0 (MIT) +autd3-server 27.0.0-alpha.1 (MIT) https://github.com/shinolab/autd3-server --------------------------------------------------------- diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 132b564..c83fdd7 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -8,7 +8,7 @@ }, "package": { "productName": "AUTD3 Server", - "version": "26.0.0" + "version": "27.0.0" }, "tauri": { "allowlist": { @@ -139,7 +139,7 @@ "fullscreen": false, "height": 600, "resizable": true, - "title": "AUTD3 Server v26.0.0", + "title": "AUTD3 Server v27.0.0-alpha.1", "width": 800 } ] diff --git a/tools/license-checker/Cargo.toml b/tools/license-checker/Cargo.toml index 349ce49..b141cdf 100644 --- a/tools/license-checker/Cargo.toml +++ b/tools/license-checker/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "license-checker" -version = "26.0.0" +version = "27.0.0-alpha.1" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html