♻️ refactored bluetooth

Cargo.toml

@@ -11,9 +11,10 @@ build = "build.rs"
 
 [features]
 default = ["server", "camera", "yolo"]
-full = ["bluetooth", "camera", "detect", "hotspot", "server"]
-pi = ["bluetooth", "camera", "detect", "server"]
-bluetooth = ["base64", "bluer"]
+full = ["bt-server", "camera", "detect", "hotspot", "server"]
+pi = ["bt-server", "camera", "detect", "server"]
+bluetooth = ["base64"]
+bt-server = ["bluetooth", "bluer"]
 camera = ["nokhwa/input-native"]
 hotspot = ["wifi-rs"]
 server = ["axum", "base64", "tower", "tower-http"]

examples/bt_rfcomm_client.rs

@@ -3,10 +3,7 @@ use bluer::{
     Address,
 };
 
-use ornithology_pi::bluetooth::{
-    rfcomm_srv::{CHANNEL, MTU},
-    Message,
-};
+use ornithology_pi::bluetooth::{Message, CHANNEL, MTU};
 use std::time::Duration;
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
 use tokio::time::sleep;

src/bluetooth/mod.rs

@@ -9,6 +9,10 @@ pub mod gatt_srv;
 pub mod rfcomm_srv;
 
 pub const MANUFACTURER_ID: u16 = 0xf00d;
+pub const SERVICE_UUID: uuid::Uuid = uuid::Uuid::from_u128(0xF00DC0DE00001);
+pub const CHARACTERISTIC_UUID: uuid::Uuid = uuid::Uuid::from_u128(0xF00DC0DE00002);
+pub const CHANNEL: u8 = 7;
+pub const MTU: u16 = 8192;
 
 pub async fn setup_session(session: &bluer::Session) -> bluer::Result<()> {
     let adapter_names = session.adapter_names().await?;
@@ -35,11 +39,7 @@ pub async fn run_bluetooth(sightings: Arc<Mutex<Vec<Sighting>>>) -> bluer::Resul
     .unwrap();
     */
 
-    rfcomm_srv::run_session(&session, sightings.clone())
-        .await
-        .unwrap();
-
-    //drop(gatt_handle);
+    rfcomm_srv::run_session(&session, sightings.clone()).await?;
 
     Ok(())
 }