Round measures to their significant bits, remove debug statements

Add clap parser to main command
Fix filter not letting beacons through after the first one
2024-04-20 12:30:41 +02:00 · 2024-04-20 12:29:55 +02:00 · 2024-04-20 12:29:01 +02:00 · 2024-04-20 12:24:29 +02:00
3 changed files with 168 additions and 14 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -17,6 +17,54 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"

+[[package]]
+name = "anstream"
+version = "0.6.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "anyhow"
 version = "1.0.82"
@ -135,6 +183,54 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

+[[package]]
+name = "clap"
+version = "4.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim 0.11.1",
+ "unicase",
+ "unicode-width",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64"
+dependencies = [
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
+
+[[package]]
+name = "colorchoice"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+
 [[package]]
 name = "cpufeatures"
 version = "0.2.12"
@ -197,7 +293,7 @@ dependencies = [
 "ident_case",
 "proc-macro2",
 "quote",
- "strsim",
+ "strsim 0.10.0",
 "syn",
 ]

@ -473,6 +569,12 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"

+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
 [[package]]
 name = "hex"
 version = "0.4.3"
@ -815,6 +917,7 @@ dependencies = [
 "anyhow",
 "bluer",
 "bluetooth-hci",
+ "clap",
 "futures",
 "tokio",
 "warp",
@ -905,6 +1008,12 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"

+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
 [[package]]
 name = "strum"
 version = "0.26.2"
@ -920,7 +1029,7 @@ version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946"
 dependencies = [
- "heck",
+ "heck 0.4.1",
 "proc-macro2",
 "quote",
 "rustversion",
@ -1054,6 +1163,18 @@ version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"

+[[package]]
+name = "unicode-width"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+
 [[package]]
 name = "uuid"
 version = "1.8.0"
--- a/Cargo.toml
+++ b/Cargo.toml
@ -9,6 +9,7 @@ edition = "2021"
 anyhow = "1.0.82"
 bluer = { version = "0.17.1", features = ["bluetoothd"] }
 bluetooth-hci = { version = "0.1.0", features = ["version-4-2", "version-5-0"] }
+clap = { version = "4.5.4", features = ["derive", "unicode"] }
 futures = "0.3.30"
 tokio = { version = "1.37.0", features = ["rt", "macros"] }
 warp = { version = "0.3.7", default-features = false, features = ["multer", "multipart"] }
--- a/src/main.rs
+++ b/src/main.rs
@ -1,8 +1,9 @@
 use std::{collections::HashMap, convert::Infallible, sync::Arc, time::{SystemTime, UNIX_EPOCH}};

-use bluer::{self, Adapter, AdapterEvent, Address};
+use bluer::{self, Adapter, AdapterEvent, Address, DiscoveryFilter, DiscoveryTransport};

-use anyhow::Result;
+use anyhow::{Result, anyhow};
+use clap::Parser;
 use futures::{Stream, StreamExt};
 use tokio;
 use warp::Filter;
@ -28,11 +29,13 @@ struct Data {

 impl Data {
    fn from_pkt(addr: Address, b: &[u8]) -> Data {
-        eprintln!("Packet {:?}", b);
+
+        let round = |v: f32| (v*100.0).round() / 100.0;
+
        Data {
            addr,
-            temperature: (u16::from_le_bytes([b[2], b[3]]) as f32) * 175.0 / 65535.0 - 45.0,
-            humidity: (u16::from_le_bytes([b[4], b[5]]) as f32) * 100.0 / 65535.0,
+            temperature: round((u16::from_le_bytes([b[2], b[3]]) as f32) * 175.0 / 65535.0 - 45.0),
+            humidity: round((u16::from_le_bytes([b[4], b[5]]) as f32) * 100.0 / 65535.0),
            co2: u16::from_le_bytes([b[6], b[7]]),
        }
    }
@ -70,11 +73,30 @@ impl DataStore {

 }

+#[derive(Debug,clap::Parser)]
+struct CLI {
+    /// Address to bind
+    #[arg(short, long, default_value = "127.0.0.1:9174")]
+    bind: String,
+
+    /// BLE HCI adapter to use
+    #[arg(short, long)]
+    interface: Option<String>,
+
+}
+
 #[tokio::main(flavor="current_thread")]
 async fn main() -> Result<()> {

+    let args = CLI::parse();
+
    let session = bluer::Session::new().await?;
-    let adapter = Arc::new(session.default_adapter().await?);
+    let adapter = match &args.interface {
+        Some(hci) => session.adapter(&*hci),
+        None => session.default_adapter().await,
+    }?;
+
+    let adapter = Arc::new(adapter);
    let store = Arc::new(Mutex::new(DataStore::default()));

    let mut stream = Box::pin(sensor_reports(adapter).await?);
@ -93,7 +115,10 @@ async fn main() -> Result<()> {
                    .and_then(|store: Arc<Mutex<DataStore>>| async move { Ok::<_,Infallible>(store.lock().await.scrape()) })
             .or(warp::path!().map(|| { warp::reply::html("<h1>Sensirion BLE exporter</h1>") }));

-    Ok(warp::serve(filter).run(([127,0,0,1],9177)).await)
+    let host = tokio::net::lookup_host(&args.bind).await?
+        .next()
+        .ok_or(anyhow!("Cannot resolve host to bind {}", &args.bind))?;
+    Ok(warp::serve(filter).run(host).await)

 }

@ -108,6 +133,13 @@ async fn extract(adapter: Arc<Adapter>, evt: AdapterEvent) -> Option<Data> {
 }

 async fn sensor_reports<'a>(adapter: Arc<Adapter>) -> Result<impl Stream<Item=Data> + 'a> {
+    let filter = DiscoveryFilter {
+        transport: DiscoveryTransport::Le,
+        duplicate_data: true,
+        ..Default::default() };
+
+    adapter.set_discovery_filter(filter).await?;
+
    Ok(adapter.discover_devices_with_changes().await?
        .filter_map(move |evt| { extract(Arc::clone(&adapter), evt) }))
 }
Author	SHA1	Message	Date
Maxime Augier	cc63f34e9e	Round measures to their significant bits, remove debug statements	2024-04-20 12:30:41 +02:00
Maxime Augier	eedf62e304	Add clap parser to main command	2024-04-20 12:29:55 +02:00
Maxime Augier	556599609a	Fix filter not letting beacons through after the first one	2024-04-20 12:29:01 +02:00
Maxime Augier	649af90de8	Add clap parser	2024-04-20 12:24:29 +02:00