Merge branch 'dongle-mode'

Author: manio

contrib/config.toml

@@ -40,8 +40,12 @@
   # BLE advertising
   advertise = false
 
+  # Dongle mode
+  dongle_mode = false
+
   # BLE device name (how your bluetooth device is visible)
   # by default it is WirelessAADongle-CPUSERIAL
+  # for dongle mode you need to set it to: AndroidAuto-xxxxx
   btalias = ""
 
   # Auto-connect to phone and initiate connection

src/bluetooth.rs

@@ -70,6 +70,7 @@ pub async fn get_cpu_serial_number_suffix() -> Result<String> {
 
 async fn power_up_and_wait_for_connection(
     advertise: bool,
+    dongle_mode: bool,
     btalias: Option<String>,
     connect: Option<Address>,
     keepalive: bool,
@@ -133,36 +134,39 @@ async fn power_up_and_wait_for_connection(
     let mut handle_aa = session.register_profile(profile).await?;
     info!("{} 📱 AA Wireless Profile: registered", NAME);
 
-    // Headset profile
-    let profile = Profile {
-        uuid: HSP_HS_UUID,
-        name: Some("HSP HS".to_string()),
-        require_authentication: Some(false),
-        require_authorization: Some(false),
-        ..Default::default()
-    };
-    let handle_hsp = match session.register_profile(profile).await {
-        Ok(handle_hsp) => {
-            info!("{} 🎧 Headset Profile (HSP): registered", NAME);
-            Some(handle_hsp)
-        }
-        Err(e) => {
-            warn!(
-                "{} 🎧 Headset Profile (HSP) registering error: {}, ignoring",
-                NAME, e
-            );
-            None
+    let mut handle_hsp = None;
+    if dongle_mode {
+        // Headset profile
+        let profile = Profile {
+            uuid: HSP_HS_UUID,
+            name: Some("HSP HS".to_string()),
+            require_authentication: Some(false),
+            require_authorization: Some(false),
+            ..Default::default()
+        };
+        match session.register_profile(profile).await {
+            Ok(handle) => {
+                info!("{} 🎧 Headset Profile (HSP): registered", NAME);
+                handle_hsp = Some(handle);
+            }
+            Err(e) => {
+                warn!(
+                    "{} 🎧 Headset Profile (HSP) registering error: {}, ignoring",
+                    NAME, e
+                );
+            }
         }
-    };
+    }
 
     info!("{} ⏳ Waiting for phone to connect via bluetooth...", NAME);
 
     // try to connect to saved devices or provided one via command line
-    let connect_task: Option<JoinHandle<Result<()>>> = match connect {
-        Some(address) => {
+    let mut connect_task: Option<JoinHandle<Result<()>>> = None;
+    if dongle_mode {
+        if let Some(address) = connect {
             let adapter_cloned = adapter.clone();
 
-            Some(tokio::spawn(async move {
+            connect_task = Some(tokio::spawn(async move {
                 let addresses = if address == Address::any() {
                     info!("{} 🥏 Enumerating known bluetooth devices...", NAME);
                     adapter_cloned.device_addresses().await?
@@ -196,10 +200,9 @@ async fn power_up_and_wait_for_connection(
                     }
                     sleep(Duration::from_secs(1)).await;
                 }
-            }))
+            }));
         }
-        None => None,
-    };
+    }
 
     // handling connection to headset profile in own task
     let task_hsp = {
@@ -367,6 +370,7 @@ pub async fn bluetooth_stop(state: BluetoothState) -> Result<()> {
 
 pub async fn bluetooth_setup_connection(
     advertise: bool,
+    dongle_mode: bool,
     btalias: Option<String>,
     connect: Option<Address>,
     wifi_config: WifiConfig,
@@ -379,9 +383,15 @@ pub async fn bluetooth_setup_connection(
     let mut stage = 1;
     let mut started;
 
-    let (state, mut stream) =
-        power_up_and_wait_for_connection(advertise, btalias, connect, keepalive, bt_timeout)
-            .await?;
+    let (state, mut stream) = power_up_and_wait_for_connection(
+        advertise,
+        dongle_mode,
+        btalias,
+        connect,
+        keepalive,
+        bt_timeout,
+    )
+    .await?;
 
     info!("{} 📲 Sending parameters via bluetooth to phone...", NAME);
     let mut start_req = WifiStartRequest::new();

src/config.rs

@@ -105,6 +105,7 @@ fn webserver_default_bind() -> Option<String> {
 #[serde(default)]
 pub struct AppConfig {
     pub advertise: bool,
+    pub dongle_mode: bool,
     pub debug: bool,
     pub hexdump_level: HexdumpLevel,
     pub disable_console_debug: bool,
@@ -151,6 +152,7 @@ impl Default for AppConfig {
     fn default() -> Self {
         Self {
             advertise: false,
+            dongle_mode: false,
             debug: false,
             hexdump_level: HexdumpLevel::Disabled,
             disable_console_debug: false,
@@ -233,6 +235,7 @@ impl AppConfig {
         });
 
         doc["advertise"] = value(self.advertise);
+        doc["dongle_mode"] = value(self.dongle_mode);
         doc["debug"] = value(self.debug);
         doc["hexdump_level"] = value(format!("{:?}", self.hexdump_level));
         doc["disable_console_debug"] = value(self.disable_console_debug);

src/main.rs

@@ -226,6 +226,7 @@ async fn tokio_main(
             loop {
                 match bluetooth_setup_connection(
                     config.read().await.advertise,
+                    config.read().await.dongle_mode,
                     config.read().await.btalias.clone(),
                     config.read().await.connect,
                     wifi_conf.clone(),

static/index.html

@@ -167,12 +167,22 @@ <h3>🛸 aa-proxy-rs</h3>
             >
           </td>
         </tr>
+        <tr>
+          <td><label for="dongle_mode">dongle_mode</label></td>
+          <td>
+            <input type="checkbox" role="switch" id="dongle_mode" /><br /><small
+              >Dongle mode</small
+            >
+          </td>
+        </tr>
         <tr>
           <td><label for="btalias">btalias</label></td>
           <td>
             <input type="text" id="btalias" /><br /><small
               >BLE device name (how your bluetooth device is visible)<br />by
-              default it is <code>WirelessAADongle-CPUSERIAL</code></small
+              default it is <code>WirelessAADongle-CPUSERIAL</code><br />
+              for dongle mode you need to set it to:
+              <code>AndroidAuto-xxxxx</code></small
             >
           </td>
         </tr>
@@ -364,6 +374,7 @@ <h3>🛸 aa-proxy-rs</h3>
         const config = {};
         const ids = [
           "advertise",
+          "dongle_mode",
           "debug",
           "hexdump_level",
           "disable_console_debug",