@@ -18,30 +18,30 @@ pub async fn gatt_connect(
1818 id : String ,
1919 app_handle : AppHandle ,
2020 state : State < ' _ , super :: commands:: ActiveConnection < ' _ > > ,
21- ) -> Result < bool , ( ) > {
22- let adapter = Adapter :: default ( ) . await . ok_or ( ( ) ) ?;
21+ ) -> Result < bool , String > {
22+ let adapter = Adapter :: default ( ) . await . ok_or ( "Failed to access the BT adapter" . to_string ( ) ) ?;
2323
24- adapter. wait_available ( ) . await . map_err ( |_| ( ) ) ?;
24+ adapter. wait_available ( ) . await . map_err ( |e| format ! ( "Failed to wait for the BT adapter access: {}" , e . message ( ) ) ) ?;
2525
2626 let device_id: DeviceId = serde_json:: from_str ( & id) . unwrap ( ) ;
27- let d = adapter. open_device ( & device_id) . await . map_err ( |_| ( ) ) ?;
27+ let d = adapter. open_device ( & device_id) . await . map_err ( |e| format ! ( "Failed to open the device: {}" , e . message ( ) ) ) ?;
2828
2929 if !d. is_connected ( ) . await {
30- adapter. connect_device ( & d) . await . map_err ( |_| ( ) ) ?;
30+ adapter. connect_device ( & d) . await . map_err ( |e| format ! ( "Failed to connect to the device: {}" , e . message ( ) ) ) ?;
3131 }
3232
3333 let service = d
3434 . discover_services_with_uuid ( SVC_UUID )
3535 . await
36- . map_err ( |e| ( ) ) ?
36+ . map_err ( |e| format ! ( "Failed to find the device services: {}" , e . message ( ) ) ) ?
3737 . get ( 0 )
3838 . cloned ( ) ;
3939
4040 if let Some ( s) = service {
4141 let char = s
4242 . discover_characteristics_with_uuid ( RPC_CHRC_UUID )
4343 . await
44- . map_err ( |_| ( ) ) ?
44+ . map_err ( |e| format ! ( "Failed to find the studio service characteristics: {}" , e . message ( ) ) ) ?
4545 . get ( 0 )
4646 . cloned ( ) ;
4747
@@ -95,10 +95,10 @@ pub async fn gatt_connect(
9595
9696 Ok ( true )
9797 } else {
98- Err ( ( ) )
98+ Err ( "Failed to connect: Unable to locate the required studio GATT characteristic" . to_string ( ) )
9999 }
100100 } else {
101- Err ( ( ) )
101+ Err ( "Failed to connect: Unable to locate the required studio GATT service" . to_string ( ) )
102102 }
103103}
104104
0 commit comments