V2 management over specified MAC as BSID. (#9)

* V2 control specific lighthouse by BSID.

Author: pmswe

README.md

@@ -16,17 +16,20 @@ Virtual reality basestation power management in Rust
 Usage: lighthouse [OPTIONS] --state <STATE>
 
 Options:
-  -s, --state <STATE>  V1: [OFF|ON] [BSID] | V2: [OFF|ON|STANDBY]
-  -b, --bsid <BSID>    V1: Basestation BSID
-  -v, --verbose...     More output per occurrence
-  -q, --quiet...       Less output per occurrence
-  -h, --help           Print help information
+  -s, --state <STATE>     V1: [OFF|ON] [BSID] | V2: [OFF|ON|STANDBY] (BSID)
+  -b, --bsid <BSID>       Basestation BSID
+  -v, --verbose...        More output per occurrence
+  -q, --quiet...          Less output per occurrence
+  -h, --help              Print help information
+  -t, --timeout <SECONDS> Scan timeout
 ```
-V1 Basestations require an 8 character BSID found on the device.
+V1 Basestations require an 8 character BSID found on the device to work.
+
+V2 Basestations do not require BSID. But you can specify their MAC address as BSID to manage a specific device.
 
 ## Example
 V1: `$ lighthouse -s on -b aabbccdd`  
-V2: `$ lighthouse -s on`
+V2: `$ lighthouse -s on` or `$ lighthouse -s on -b A1:B2:C3:D4:E5:F6`  
 
 ## macOS
 Enable the Bluetooth permission for your terminal. You can do the latter by going to System Preferences → Security & Privacy → Privacy → Bluetooth, clicking the '+' button, and selecting 'Terminal' (or iTerm or whichever terminal application you use).

src/main.rs

@@ -8,7 +8,7 @@ use clap::Parser;
 use clap_verbosity_flag::Verbosity;
 use lighthouse::Error;
 use tokio::time;
-use tracing::info;
+use tracing::{info};
 use tracing_log::AsTrace;
 use uuid::Uuid;
 
@@ -17,7 +17,7 @@ const V2_UUID: &str = "00001525-1212-efde-1523-785feabcd124";
 
 #[derive(Debug, Parser)]
 struct Args {
-    /// V1: [OFF|ON] [BSID] | V2: [OFF|ON|STANDBY]
+    /// V1: [OFF|ON] [BSID] | V2: [OFF|ON|STANDBY] (BSID)
     #[arg(short, long)]
     state: String,
 
@@ -27,6 +27,9 @@ struct Args {
 
     #[clap(flatten)]
     verbose: Verbosity,
+
+    #[arg(short, long, default_value_t = 10)]
+    timeout: u64
 }
 
 #[tokio::main(flavor = "current_thread")]
@@ -52,7 +55,8 @@ async fn main() -> Result<(), Error> {
             .await
             .map_err(Error::Btle)
             .expect("Can't scan BLE adapter for connected devices...");
-        time::sleep(Duration::from_secs(10)).await;
+
+        time::sleep(Duration::from_secs(args.timeout)).await;
 
         let peripherals = adapter.peripherals().await.map_err(Error::Btle)?;
         if peripherals.is_empty() {
@@ -71,7 +75,34 @@ async fn main() -> Result<(), Error> {
             };
 
             let state = args.state.to_uppercase();
-            if let Some(bsid) = &args.bsid {
+
+            info!("Found '{}' [{}]", name, peripheral.id());
+
+            if name.starts_with("LHB-") // v2
+            {
+                if let Some(bsid) = &args.bsid
+                {
+                    if !peripheral.id().to_string().eq_ignore_ascii_case(bsid) {
+                        continue;
+                    }
+                }
+
+                let cmd = match state.as_str() {
+                    "OFF" => vec![0x00],
+                    "ON" => vec![0x01],
+                    "STANDBY" => vec![0x02],
+                    _ => {
+                        return Err(Error::Message(
+                            "V2: Unknown State {state}, Available: [OFF|ON|STANDBY]",
+                        ))
+                    }
+                };
+
+                let uuid = Uuid::parse_str(V2_UUID).map_err(Error::Uuid)?;
+
+                lighthouse::write(adapter, peripheral.id(), &cmd, uuid).await?;
+            }
+            else if let Some(bsid) = &args.bsid { // v1
                 if !name.starts_with("HTC BS")
                     || name[(name.len() - 4)..] != bsid[(bsid.len() - 4)..]
                 {
@@ -84,7 +115,7 @@ async fn main() -> Result<(), Error> {
                 let dd = u8::from_str_radix(&bsid[6..8], 16).map_err(Error::Std)?;
 
                 let cmd = match state.as_str() {
-                    "OFF" => vec![
+                    "OFF" | "STANDBY" => vec![
                         0x12, 0x02, 0x00, 0x01, dd, cc, bb, aa, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                         0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                     ],
@@ -102,26 +133,9 @@ async fn main() -> Result<(), Error> {
                 let uuid = Uuid::parse_str(V1_UUID).map_err(Error::Uuid)?;
 
                 lighthouse::write(adapter, peripheral.id(), &cmd, uuid).await?;
-            } else {
-                if !name.starts_with("LHB-") {
-                    continue;
-                }
-
-                let cmd = match state.as_str() {
-                    "OFF" => vec![0x00],
-                    "ON" => vec![0x01],
-                    "STANDBY" => vec![0x02],
-                    _ => {
-                        return Err(Error::Message(
-                            "V2: Unknown State {state}, Available: [OFF|ON|STANDBY]",
-                        ))
-                    }
-                };
-
-                let uuid = Uuid::parse_str(V2_UUID).map_err(Error::Uuid)?;
-
-                lighthouse::write(adapter, peripheral.id(), &cmd, uuid).await?;
-            };
+            }
+            else { continue; } // not supported
+            info!("{} [{}]: {}", name, peripheral.id(), state);
         }
     }
     Ok(())