Changeset 82 in flair-bin for trunk/tools

Timestamp:

Jan 8, 2019, 5:45:01 PM (6 years ago)

Author:

Sanahuja Guillaume

Message:

support for multiple ds3 in usb

Location:

trunk/tools

Files:

• scripts/dualshock3.sh (modified) (1 diff)
• scripts/dualshock3_local_usb.sh (modified) (1 diff)
• scripts/dualshock3_usb.sh (modified) (1 diff)
• x86_64/unix/dualshock3 (modified) ( previous)
• x86_64/unix/flairgcs (modified) ( previous)

trunk/tools/scripts/dualshock3.sh

@@ -3 +3 @@
 
 #on kernel >=4.13, ds3 is seen as a mouse
-/usr/bin/xinput set-prop 'Sony PLAYSTATION(R)3 Controller' 'Device Enabled' 0
+#search every ds3 connected and disable them
+for id in `xinput --list|grep 'Sony PLAYSTATION(R)3 Controller'|perl -ne 'while (m/id=(\d+)/g){print "$1\n";}'`; do
+    xinput set-prop $id 'Device Enabled' 0
+done 
 
 #This script is the only one that calls itself with sudo.

trunk/tools/scripts/dualshock3_local_usb.sh

@@ -1 +1 @@
 #! /bin/bash
-${FLAIR_ROOT}/flair-bin/tools/scripts/dualshock3_usb.sh 127.0.0.1
+${FLAIR_ROOT}/flair-bin/tools/scripts/dualshock3_usb.sh 127.0.0.1 $*

trunk/tools/scripts/dualshock3_usb.sh

@@ -3 +3 @@
 
 # $1 is the drone ip
-if [ "$#" -ne 1 ] ; then
-  echo "Usage: $0 drone_ip_address"
+if [ "$#" -gt 2 ] ; then
+  echo "Usage: $0 drone_ip_address (drone_port, default 20000)"
   exit 1
 fi
 
-$FLAIR_ROOT/flair-bin/tools/scripts/dualshock3.sh -a ${1}:20000 -c usb -t 100 -x ${FLAIR_ROOT}/flair-bin/tools/scripts/dualshock3.xml
+# use default port
+PORT=${2}
+if [ "$#" -eq 1 ] ; then
+  PORT="20000"
+fi
 
+$FLAIR_ROOT/flair-bin/tools/scripts/dualshock3.sh -a ${1}:$PORT -c usb -t 100 -x ${FLAIR_ROOT}/flair-bin/tools/scripts/dualshock3.xml
+