diff --git a/Cargo.lock b/Cargo.lock index eef12a2..c5a555d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -40,7 +40,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn", ] [[package]] @@ -125,12 +125,12 @@ dependencies = [ [[package]] name = "btleplug" -version = "0.10.5" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "790e133b9d27f6dbd1289e046e735cef97fb0b4c840f18db52c959521dfb8145" +checksum = "d3f2b5e6a560fbf3752784425615b8dfcbe2daf7618813dcaa73ec6df2598351" dependencies = [ "async-trait", - "bitflags 1.3.2", + "bitflags 2.4.1", "bluez-async", "cocoa", "dashmap", @@ -204,9 +204,9 @@ dependencies = [ [[package]] name = "cocoa" -version = "0.24.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" +checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" dependencies = [ "bitflags 1.3.2", "block", @@ -247,9 +247,7 @@ name = "combined-sensor-mode" version = "0.1.0" dependencies = [ "anyhow", - "btleplug", "dbus", - "futures", "lego-powered-up", "tokio", ] @@ -282,9 +280,9 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "core-graphics" -version = "0.22.3" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" +checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -388,9 +386,7 @@ name = "encoder-commands" version = "0.1.0" dependencies = [ "anyhow", - "btleplug", "dbus", - "futures", "lego-powered-up", "tokio", ] @@ -430,18 +426,30 @@ dependencies = [ [[package]] name = "foreign-types" -version = "0.3.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" dependencies = [ + "foreign-types-macros", "foreign-types-shared", ] +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "foreign-types-shared" -version = "0.1.1" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" [[package]] name = "futures" @@ -499,7 +507,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn", ] [[package]] @@ -570,9 +578,7 @@ name = "hub-commands" version = "0.1.0" dependencies = [ "anyhow", - "btleplug", "dbus", - "futures", "lego-powered-up", "tokio", ] @@ -673,7 +679,6 @@ dependencies = [ "lpu-macros", "num-derive", "num-traits", - "parking_lot", "thiserror", "tokio", "tokio-util", @@ -723,7 +728,7 @@ name = "lpu-macros" version = "0.1.0" dependencies = [ "quote", - "syn 1.0.109", + "syn", ] [[package]] @@ -731,9 +736,7 @@ name = "lpu-template" version = "0.1.0" dependencies = [ "anyhow", - "btleplug", "dbus", - "futures", "lego-powered-up", "tokio", ] @@ -779,22 +782,20 @@ name = "motor-closed-loop" version = "0.1.0" dependencies = [ "anyhow", - "btleplug", "dbus", - "futures", "lego-powered-up", "tokio", ] [[package]] name = "num-derive" -version = "0.3.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +checksum = "cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn", ] [[package]] @@ -961,9 +962,7 @@ name = "remote-control" version = "0.1.0" dependencies = [ "anyhow", - "btleplug", "dbus", - "futures", "lego-powered-up", "tokio", ] @@ -1041,7 +1040,7 @@ checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn", ] [[package]] @@ -1111,17 +1110,6 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccbca6f34534eb78dbee83f6b2c9442fea7113f43d9e80ea320f0972ae5dc08d" -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - [[package]] name = "syn" version = "2.0.48" @@ -1182,7 +1170,7 @@ checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn", ] [[package]] @@ -1209,7 +1197,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn", ] [[package]] @@ -1260,9 +1248,7 @@ name = "vision-sensor" version = "0.1.0" dependencies = [ "anyhow", - "btleplug", "dbus", - "futures", "lego-powered-up", "text_io", "tokio", @@ -1317,11 +1303,21 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.48.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ - "windows-targets 0.48.5", + "windows-core", + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.0", ] [[package]] diff --git a/examples/combined-sensor-mode/Cargo.toml b/examples/combined-sensor-mode/Cargo.toml index cdef4b0..165e232 100644 --- a/examples/combined-sensor-mode/Cargo.toml +++ b/examples/combined-sensor-mode/Cargo.toml @@ -8,14 +8,12 @@ edition = "2021" [dependencies] lego-powered-up = { path = "../../lego-powered-up" } tokio = { version = "1", features = ["rt", "rt-multi-thread", "macros"] } -btleplug = "0.10" -futures = "0.3" -#text_io = "0.1.12" + anyhow = "1.0" # needed to crosscompile on WSL -dbus = {version = "0.9.7", features = ["vendored"], optional = true} +dbus = { version = "0.9.7", features = ["vendored"], optional = true } [features] wslcross = ["dep:dbus"] diff --git a/examples/encoder-commands/Cargo.toml b/examples/encoder-commands/Cargo.toml index 3b34287..ba7fc7d 100644 --- a/examples/encoder-commands/Cargo.toml +++ b/examples/encoder-commands/Cargo.toml @@ -8,14 +8,12 @@ edition = "2021" [dependencies] lego-powered-up = { path = "../../lego-powered-up" } tokio = { version = "1", features = ["rt", "rt-multi-thread", "macros"] } -btleplug = "0.10" -futures = "0.3" -#text_io = "0.1.12" + anyhow = "1.0" # needed to crosscompile on WSL -dbus = {version = "0.9.7", features = ["vendored"], optional = true} +dbus = { version = "0.9.7", features = ["vendored"], optional = true } [features] wslcross = ["dep:dbus"] diff --git a/examples/hub-commands/Cargo.toml b/examples/hub-commands/Cargo.toml index e46e4f8..6bef4fe 100644 --- a/examples/hub-commands/Cargo.toml +++ b/examples/hub-commands/Cargo.toml @@ -6,17 +6,13 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] +anyhow = "1.0" lego-powered-up = { path = "../../lego-powered-up" } tokio = { version = "1", features = ["rt", "rt-multi-thread", "macros"] } -btleplug = "0.10" -futures = "0.3" - -#text_io = "0.1.12" -anyhow = "1.0" # needed to crosscompile on WSL -dbus = {version = "0.9.7", features = ["vendored"], optional = true} +dbus = { version = "0.9.7", features = ["vendored"], optional = true } [features] wslcross = ["dep:dbus"] diff --git a/examples/motor-closed-loop/Cargo.toml b/examples/motor-closed-loop/Cargo.toml index 3a1006a..348ffb5 100644 --- a/examples/motor-closed-loop/Cargo.toml +++ b/examples/motor-closed-loop/Cargo.toml @@ -8,15 +8,12 @@ edition = "2021" [dependencies] lego-powered-up = { path = "../../lego-powered-up" } tokio = { version = "1", features = ["rt", "rt-multi-thread", "macros"] } -btleplug = "0.10" -futures = "0.3" -#text_io = "0.1.12" anyhow = "1.0" # needed to crosscompile on WSL -dbus = {version = "0.9.7", features = ["vendored"], optional = true} +dbus = { version = "0.9.7", features = ["vendored"], optional = true } [features] wslcross = ["dep:dbus"] diff --git a/examples/remote-control/Cargo.toml b/examples/remote-control/Cargo.toml index 3e5a783..0e0d4b2 100644 --- a/examples/remote-control/Cargo.toml +++ b/examples/remote-control/Cargo.toml @@ -8,15 +8,12 @@ edition = "2021" [dependencies] lego-powered-up = { path = "../../lego-powered-up" } tokio = { version = "1", features = ["rt", "rt-multi-thread", "macros"] } -btleplug = "0.10" -futures = "0.3" -#text_io = "0.1.12" anyhow = "1.0" # needed to crosscompile on WSL -dbus = {version = "0.9.7", features = ["vendored"], optional = true} +dbus = { version = "0.9.7", features = ["vendored"], optional = true } [features] wslcross = ["dep:dbus"] diff --git a/examples/template/Cargo.toml b/examples/template/Cargo.toml index ed798e7..004313c 100644 --- a/examples/template/Cargo.toml +++ b/examples/template/Cargo.toml @@ -8,14 +8,10 @@ edition = "2021" [dependencies] lego-powered-up = { path = "../../lego-powered-up" } tokio = { version = "1", features = ["rt", "rt-multi-thread", "macros"] } -btleplug = "0.10" -futures = "0.3" - -#text_io = "0.1.12" anyhow = "1.0" # needed to crosscompile on WSL -dbus = {version = "0.9.7", features = ["vendored"], optional = true} +dbus = { version = "0.9.7", features = ["vendored"], optional = true } [features] wslcross = ["dep:dbus"] diff --git a/examples/vision-sensor/Cargo.toml b/examples/vision-sensor/Cargo.toml index 65a48ab..198ee23 100644 --- a/examples/vision-sensor/Cargo.toml +++ b/examples/vision-sensor/Cargo.toml @@ -8,16 +8,13 @@ edition = "2021" [dependencies] lego-powered-up = { path = "../../lego-powered-up" } tokio = { version = "1", features = ["rt", "rt-multi-thread", "macros"] } -btleplug = "0.10" -futures = "0.3" -#text_io = "0.1.12" anyhow = "1.0" text_io = "0.1.12" # needed to crosscompile on WSL -dbus = {version = "0.9.7", features = ["vendored"], optional = true} +dbus = { version = "0.9.7", features = ["vendored"], optional = true } [features] wslcross = ["dep:dbus"] diff --git a/lego-powered-up/Cargo.toml b/lego-powered-up/Cargo.toml index 252e3e1..c9175c0 100644 --- a/lego-powered-up/Cargo.toml +++ b/lego-powered-up/Cargo.toml @@ -14,13 +14,12 @@ readme = "../README.md" [dependencies] # std -btleplug = "0.10" +btleplug = "0.11" tokio = { version = "1", features = ["rt", "rt-multi-thread", "macros"] } tokio-util = "0.7.8" log = "0.4" -num-derive = "0.3" +num-derive = "0.4" thiserror = "1" -parking_lot = "0.12.1" # nostd async-trait = "0.1" @@ -36,4 +35,4 @@ env_logger = "0.10" [features] -syncsend = [] \ No newline at end of file +syncsend = [] diff --git a/lpu-macros/Cargo.toml b/lpu-macros/Cargo.toml index ac923db..c1c6764 100644 --- a/lpu-macros/Cargo.toml +++ b/lpu-macros/Cargo.toml @@ -13,5 +13,5 @@ proc-macro = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -syn = "1.0" -quote = "1.0" +syn = "2" +quote = "1" diff --git a/pu-util/.gitignore b/pu-util/.gitignore deleted file mode 100644 index ea8c4bf..0000000 --- a/pu-util/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/pu-util/Cargo.toml b/pu-util/Cargo.toml index 7b8be76..4fd0391 100644 --- a/pu-util/Cargo.toml +++ b/pu-util/Cargo.toml @@ -9,10 +9,15 @@ repository = "https://github.com/bricks-rs/lego-powered-up" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -anyhow = "1.0" +anyhow = "1" async-trait = "0.1" clap = { version = "3", features = ["cargo"] } env_logger = "0.10" -lego-powered-up = { path="../lego-powered-up" } +lego-powered-up = { path = "../lego-powered-up" } log = "0.4" -tokio = { version = "1", features = ["macros", "rt", "rt-multi-thread", "time"] } +tokio = { version = "1", features = [ + "macros", + "rt", + "rt-multi-thread", + "time", +] }