diff --git a/Cargo.lock b/Cargo.lock index 334e49c..b26f415 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -32,7 +32,7 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5" dependencies = [ - "quote 1.0.20", + "quote 1.0.26", "syn 1.0.98", ] @@ -123,8 +123,8 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7d78656ba01f1b93024b7c3a0467f1608e4be67d725749fdcd7d2c7678fd7a2" dependencies = [ - "proc-macro2 1.0.40", - "quote 1.0.20", + "proc-macro2 1.0.55", + "quote 1.0.26", "syn 1.0.98", ] @@ -167,8 +167,8 @@ version = "0.1.56" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96cf8829f67d2eab0b2dfa42c5d0ef737e0724e4a82b01b3e292456202b19716" dependencies = [ - "proc-macro2 1.0.40", - "quote 1.0.20", + "proc-macro2 1.0.55", + "quote 1.0.26", "syn 1.0.98", ] @@ -353,7 +353,7 @@ version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c" dependencies = [ - "quote 1.0.20", + "quote 1.0.26", "syn 1.0.98", ] @@ -416,8 +416,8 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "proc-macro2 1.0.40", - "quote 1.0.20", + "proc-macro2 1.0.55", + "quote 1.0.26", "syn 1.0.98", ] @@ -537,8 +537,8 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f58dc3c5e468259f19f2d46304a6b28f1c3d034442e14b322d2b850e36f6d5ae" dependencies = [ - "proc-macro2 1.0.40", - "quote 1.0.20", + "proc-macro2 1.0.55", + "quote 1.0.26", "syn 1.0.98", ] @@ -592,8 +592,8 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" dependencies = [ - "proc-macro2 1.0.40", - "quote 1.0.20", + "proc-macro2 1.0.55", + "quote 1.0.26", "syn 1.0.98", "synstructure", ] @@ -709,7 +709,7 @@ dependencies = [ [[package]] name = "galaxy_buds_rs" version = "0.2.10" -source = "git+https://github.com/JojiiOfficial/GalaxyBuds-rs#f018b7d87fd3aa714727885161f93d02374adeb5" +source = "git+https://github.com/JojiiOfficial/GalaxyBuds-rs#5368ae9f53cc4a3ff15fc7c2fdc63032bc9c30a3" dependencies = [ "async-std", "bluetooth-serial-port-async", @@ -1119,8 +1119,8 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ - "proc-macro2 1.0.40", - "quote 1.0.20", + "proc-macro2 1.0.55", + "quote 1.0.26", "syn 1.0.98", ] @@ -1350,9 +1350,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.40" +version = "1.0.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7" +checksum = "1d0dd4be24fcdcfeaa12a432d588dc59bbad6cad3510c67e74a2b6b2fc950564" dependencies = [ "unicode-ident", ] @@ -1389,11 +1389,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.20" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" dependencies = [ - "proc-macro2 1.0.40", + "proc-macro2 1.0.55", ] [[package]] @@ -1501,22 +1501,22 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "serde" -version = "1.0.139" +version = "1.0.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0171ebb889e45aa68b44aee0859b3eede84c6f5f5c228e6f140c0b2a0a46cad6" +checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.139" +version = "1.0.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc1d3230c1de7932af58ad8ffbe1d784bd55efd5a9d84ac24f69c72d83543dfb" +checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" dependencies = [ - "proc-macro2 1.0.40", - "quote 1.0.20", - "syn 1.0.98", + "proc-macro2 1.0.55", + "quote 1.0.26", + "syn 2.0.13", ] [[package]] @@ -1536,8 +1536,8 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2ad84e47328a31223de7fed7a4f5087f2d6ddfe586cf3ca25b7a165bc0a5aed" dependencies = [ - "proc-macro2 1.0.40", - "quote 1.0.20", + "proc-macro2 1.0.55", + "quote 1.0.26", "syn 1.0.98", ] @@ -1606,8 +1606,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "339f799d8b549e3744c7ac7feb216383e4005d94bdb22561b3ab8f3b808ae9fb" dependencies = [ "heck", - "proc-macro2 1.0.40", - "quote 1.0.20", + "proc-macro2 1.0.55", + "quote 1.0.26", "syn 1.0.98", ] @@ -1650,8 +1650,19 @@ version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" dependencies = [ - "proc-macro2 1.0.40", - "quote 1.0.20", + "proc-macro2 1.0.55", + "quote 1.0.26", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" +dependencies = [ + "proc-macro2 1.0.55", + "quote 1.0.26", "unicode-ident", ] @@ -1670,8 +1681,8 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ - "proc-macro2 1.0.40", - "quote 1.0.20", + "proc-macro2 1.0.55", + "quote 1.0.26", "syn 1.0.98", "unicode-xid 0.2.3", ] @@ -1720,8 +1731,8 @@ version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" dependencies = [ - "proc-macro2 1.0.40", - "quote 1.0.20", + "proc-macro2 1.0.55", + "quote 1.0.26", "syn 1.0.98", ] @@ -1762,8 +1773,8 @@ version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2" dependencies = [ - "proc-macro2 1.0.40", - "quote 1.0.20", + "proc-macro2 1.0.55", + "quote 1.0.26", "syn 1.0.98", ] @@ -1878,8 +1889,8 @@ dependencies = [ "bumpalo", "lazy_static", "log", - "proc-macro2 1.0.40", - "quote 1.0.20", + "proc-macro2 1.0.55", + "quote 1.0.26", "syn 1.0.98", "wasm-bindgen-shared", ] @@ -1902,7 +1913,7 @@ version = "0.2.81" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c441e177922bc58f1e12c022624b6216378e5febc2f0533e41ba443d505b80aa" dependencies = [ - "quote 1.0.20", + "quote 1.0.26", "wasm-bindgen-macro-support", ] @@ -1912,8 +1923,8 @@ version = "0.2.81" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d94ac45fcf608c1f45ef53e748d35660f168490c10b23704c7779ab8f5c3048" dependencies = [ - "proc-macro2 1.0.40", - "quote 1.0.20", + "proc-macro2 1.0.55", + "quote 1.0.26", "syn 1.0.98", "wasm-bindgen-backend", "wasm-bindgen-shared", @@ -2097,8 +2108,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f8fb5186d1c87ae88cf234974c240671238b4a679158ad3b94ec465237349a6" dependencies = [ "proc-macro-crate", - "proc-macro2 1.0.40", - "quote 1.0.20", + "proc-macro2 1.0.55", + "quote 1.0.26", "regex", "syn 1.0.98", ] @@ -2135,7 +2146,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c47f3630ce926a03abf21f5a8db90c60c81ed71599b5c86ad1a54fd3c7564c5" dependencies = [ "proc-macro-crate", - "proc-macro2 1.0.40", - "quote 1.0.20", + "proc-macro2 1.0.55", + "quote 1.0.26", "syn 1.0.98", ] diff --git a/README.md b/README.md index 38e5c8e..6a23998 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [![earbuds-git](https://img.shields.io/aur/version/earbuds-git?style=flat-square&label=earbuds-git&logo=arch-linux)](https://aur.archlinux.org/packages/earbuds-git/) # LiveBudsCli -A free cli tool to control your [Galaxy buds live](https://www.samsung.com/us/mobile-audio/galaxy-buds-live), [Galaxy Buds+](https://www.samsung.com/us/mobile/audio/galaxy-buds-plus/), [Galaxy Buds Pro](https://www.samsung.com/us/mobile/audio/galaxy-buds-pro/) and [Galaxy Buds 2](https://www.samsung.com/us/mobile-audio/galaxy-buds2/) +A free cli tool to control your [Galaxy buds live](https://www.samsung.com/us/mobile-audio/galaxy-buds-live), [Galaxy Buds+](https://www.samsung.com/us/mobile/audio/galaxy-buds-plus/), [Galaxy Buds Pro](https://www.samsung.com/us/mobile/audio/galaxy-buds-pro/), [Galaxy Buds 2](https://www.samsung.com/us/mobile-audio/galaxy-buds2/) and [Galaxy Buds 2 Pro](https://www.samsung.com/us/mobile-audio/galaxy-buds2-pro/) `Note: This requires your buds to be up to date. Buds with old firmware aren't supported` diff --git a/src/daemon/bluetooth/bt_connection_listener.rs b/src/daemon/bluetooth/bt_connection_listener.rs index 1edc3a0..a203ad2 100644 --- a/src/daemon/bluetooth/bt_connection_listener.rs +++ b/src/daemon/bluetooth/bt_connection_listener.rs @@ -134,6 +134,8 @@ fn name_to_model(device_name: &str) -> Model { Model::BudsLive } else if device_name.contains("buds pro") { Model::BudsPro + } else if device_name.contains("buds 2 pro") { + Model::BudsPro2 } else if device_name.contains("buds+") { Model::BudsPlus } else if device_name.contains("buds2") { diff --git a/src/daemon/buds_info.rs b/src/daemon/buds_info.rs index 1ddeb84..b3f9884 100644 --- a/src/daemon/buds_info.rs +++ b/src/daemon/buds_info.rs @@ -130,6 +130,13 @@ impl BudsInfo { } Model::Buds => 3, Model::Buds2 => 3, + Model::BudsPro2 => { + if self.has_feature(Feature::ExtraHighAmbientVolume) { + 4 + } else { + 3 + } + } } } @@ -227,4 +234,5 @@ enum DefModel { BudsLive, BudsPro, Buds2, + BudsPro2, }