updated bt scripts #2

Author: winemug

scripts/bt-expect.sh

@@ -3,7 +3,6 @@
 set timeout 120
 
 set prompt "#"
-set address [lindex $argv 0]
 
 spawn sudo bluetoothctl -a
 expect -re $prompt
@@ -34,6 +33,9 @@ expect -re $prompt
 send "pairable on\r"
 sleep 1
 
+expect -re "[NEW] Device\w(.+)\w"
+set address $expect_out(1,string)
+
 expect -re "Enter PIN code: "
 send "3434\r"
 
@@ -43,8 +45,15 @@ send "trust $address\r"
 sleep 2
 
 expect -re "trust succeeded"
-sleep 3
+sleep 1
+
+expect -re $prompt
+send "discoverable off\r"
+sleep 1
+
+expect -re $prompt
+send "pairable off\r"
+sleep 1
 
-send_user "\nShould be paired now.\r"
 send "quit\r"
 expect eof

scripts/bt-setup.sh

@@ -26,36 +26,17 @@ echo "Activating bluetooth pairing mode"
 
 sudo hciconfig hci0 sspmode 0
 
-sudo btmgmt connectable yes
-sudo btmgmt discov yes
-sudo btmgmt pairable yes
-
-sudo killall -9 bt-agent
-
-echo "Bluetooth device is now discoverable"
-echo
 echo "Open ${bold}bluetooth settings${normal} on your phone to search for and ${bold}pair${normal} with this device"
 echo "If you have already paired it on your phone, please unpair it first, then pair again"
 echo
-printf "Waiting for connection.."
-
-btdevice=
-while [[ -z "$btdevice" ]]
-do
-        printf "."
-        sleep 1
-        btdevice=`sudo bt-device -l | grep -e \(.*\)`
-done
-
-mac=`echo $btdevice | cut -d'(' -f2 | cut -d')' -f1`
 
 /usr/bin/expect -f /home/pi/omnipy/bt-expect.sh
 
-sudo btmgmt discov no
-sudo btmgmt pairable no
-
 sudo hciconfig hci0 sspmode 1
 
+btdevice=`sudo bt-device -l | grep -e \(.*\)`
+mac=`echo $btdevice | cut -d'(' -f2 | cut -d')' -f1`
+
 echo
 
 echo "${bold}Paired with $btdevice.${normal}"