Changeset 598

Timestamp:

06/05/09 14:09:02 (4 years ago)

Author:

balle

Message:

- fix btconnect (handle already used devices better, fix awk script and regexes)
- fix path in transfermotorcontroltonxt.sh

Location:

branches/livecd/LiveTools

Files:

• btconnect (modified) (2 diffs)
• transfermotorcontroltonxt.sh (modified) (1 diff)

branches/livecd/LiveTools/btconnect

@@ -35 +35 @@
 fi
 
+# if device name is given, check if it's already used
+
+if [ $# = 2 ]; then
+        (( DEVICE=$2 ))
+        if [ -e /dev/rfcomm$DEVICE -o -e /dev/bluetooth/rfcomm$DEVICE ]; then
+                echo "rfcomm$DEVICE is already in use!"
+                exit 3
+        fi
+fi
+
 # if hardware address is given, we're all set. otherwise, perform a scan
 
-if [[ $1 =~ '^([[:digit:]a-fA-F]{2}:){5}[[:digit:]a-fA-F]{2}$' ]]; then
+if [[ $1 =~ ^([0-9a-fA-F]{2}:){5}[0-9a-fA-F]{2}$ ]]; then
         MAC=$1
 else
-        $NAME="$( echo $1 )"
+        NAME=$1
         echo -n "Scanning for '$NAME' ... " >&2
-        MAC=$( hcitool scan | awk -F '[[:space:]]+' '$2 ~ /([[:digit:]a-fA-F]{2}:){5}[[:digit:]a-fA-F]{2}/ && $3 == "'"$NAME"'" && $NF == 3 / { print( $2 ) }' )
+        MAC=$( hcitool scan | awk '$1 ~ /^([0-9a-fA-F]+:)+[0-9a-fA-F]+$/ && $2 == "'"$NAME"'" { print $1 }' )
         if [ -z $MAC ]; then
                 echo "not found." >&2
                 exit 1
         fi
-        if [[ $MAC =~ ' ' ]]; then
+        if [[ $MAC == *\ * ]]; then
                 echo "found multiple devices:" >&2
                 echo >&2
@@ -60 +70 @@
 fi
 
-if [ $# = 2 ]; then
-        DEVICE=$(( $2 ))
-else
-        DEVICE=0
-        INUSE=$( rfcomm | cut -f 1 )
-        while [[ $INUSE =~ "rfcomm$DEVICE:" ]]; do
+# if device is not given, find first unused device
+
+if [ -z $DEVICE ]; then
+        (( DEVICE=0 ))
+        while [ -e /dev/rfcomm$DEVICE -o -e /dev/bluetooth/rfcomm$DEVICE ]; do
                 (( DEVICE++ ))
         done

branches/livecd/LiveTools/transfermotorcontroltonxt.sh

@@ -11 +11 @@
 read
 
-nbc -d -S=usb /opt/mindstorms/matlab/MotorControl/MotorControl.nxc
+nbc -d -S=usb /opt/mindstorms/MotorControl/MotorControl.nxc