From: <bla...@us...> - 2009-07-27 09:21:25
|
Revision: 19710 http://personalrobots.svn.sourceforge.net/personalrobots/?rev=19710&view=rev Author: blaisegassend Date: 2009-07-27 09:21:15 +0000 (Mon, 27 Jul 2009) Log Message: ----------- Took out spewing messages. Modified Paths: -------------- pkg/trunk/stacks/joystick_drivers/ps3joy/ps3joy.py Modified: pkg/trunk/stacks/joystick_drivers/ps3joy/ps3joy.py =================================================================== --- pkg/trunk/stacks/joystick_drivers/ps3joy/ps3joy.py 2009-07-27 09:16:09 UTC (rev 19709) +++ pkg/trunk/stacks/joystick_drivers/ps3joy/ps3joy.py 2009-07-27 09:21:15 UTC (rev 19710) @@ -23,12 +23,10 @@ for name in ["/dev/input/uinput", "/dev/misc/uinput", "/dev/uinput"]: try: self.file = os.open(name, os.O_WRONLY) - print self.file break except: - print "err" + print "Error opening uinput. Are you root?" raise - continue if self.file == None: raise IOError #id = uinput.input_id() @@ -140,7 +138,7 @@ if lastvalidtime - curtime >= 5: # Disconnect if we don't hear a valid frame for 5 seconds return else: # Got a frame. - print "Got a frame at ", curtime, 1 / (curtime - lastvalidtime) + #print "Got a frame at ", curtime, 1 / (curtime - lastvalidtime) if self.step(intr): lastvalidtime = curtime finally: @@ -166,6 +164,9 @@ if idev == cdev: try: self.decoder.run(intr, ctrl) + except KeyboardInterupt: + print "CTRL+C detected. Exiting." + exit(0) except: print "Connection broken or error." traceback.print_exc() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bla...@us...> - 2009-07-27 17:42:06
|
Revision: 19720 http://personalrobots.svn.sourceforge.net/personalrobots/?rev=19720&view=rev Author: blaisegassend Date: 2009-07-27 17:41:59 +0000 (Mon, 27 Jul 2009) Log Message: ----------- Robustified a bit more... Modified Paths: -------------- pkg/trunk/stacks/joystick_drivers/ps3joy/ps3joy.py Modified: pkg/trunk/stacks/joystick_drivers/ps3joy/ps3joy.py =================================================================== --- pkg/trunk/stacks/joystick_drivers/ps3joy/ps3joy.py 2009-07-27 17:37:54 UTC (rev 19719) +++ pkg/trunk/stacks/joystick_drivers/ps3joy/ps3joy.py 2009-07-27 17:41:59 UTC (rev 19720) @@ -150,7 +150,11 @@ def prepare_socket(self, port): sock = BluetoothSocket(L2CAP) - sock.bind(("", port)) + try: + sock.bind(("", port)) + except: + print "Error binding to bluetooth socket. Are you root?" + exit (-1) sock.listen(1) return sock @@ -159,12 +163,18 @@ ctrl_sock = self.prepare_socket(L2CAP_PSM_HIDP_CTRL) while True: + print "Waiting for connection" (intr, (idev, iport)) = intr_sock.accept(); + (rd, wr, err) = select.select([ctrl_sock], [], [], 1) + if len(rd) == 0: + print "Got interrupt connection without control connection. Giving up on it." + intr.close() + continue (ctrl, (cdev, cport)) = ctrl_sock.accept(); if idev == cdev: try: self.decoder.run(intr, ctrl) - except KeyboardInterupt: + except KeyboardInterrupt: print "CTRL+C detected. Exiting." exit(0) except: @@ -176,5 +186,9 @@ intr.close() if __name__ == "__main__": + os.system("/etc/init.d/bluetooth stop") + os.system("hciconfig hci0 up") + os.system("hciconfig hci0 pscan") + os.system("modprobe uinput") cm = connection_manager(decoder()) cm.listen() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bla...@us...> - 2009-08-12 05:12:59
|
Revision: 21635 http://personalrobots.svn.sourceforge.net/personalrobots/?rev=21635&view=rev Author: blaisegassend Date: 2009-08-12 05:12:47 +0000 (Wed, 12 Aug 2009) Log Message: ----------- Applying useability changes to ps3joy: exception handling, no bluetooth detection. Modified Paths: -------------- pkg/trunk/stacks/joystick_drivers/ps3joy/ps3joy.py Modified: pkg/trunk/stacks/joystick_drivers/ps3joy/ps3joy.py =================================================================== --- pkg/trunk/stacks/joystick_drivers/ps3joy/ps3joy.py 2009-08-12 04:28:11 UTC (rev 21634) +++ pkg/trunk/stacks/joystick_drivers/ps3joy/ps3joy.py 2009-08-12 05:12:47 UTC (rev 21635) @@ -164,31 +164,45 @@ while True: print "Waiting for connection" - (intr, (idev, iport)) = intr_sock.accept(); - (rd, wr, err) = select.select([ctrl_sock], [], [], 1) - if len(rd) == 0: - print "Got interrupt connection without control connection. Giving up on it." - intr.close() - continue - (ctrl, (cdev, cport)) = ctrl_sock.accept(); - if idev == cdev: + try: + (intr, (idev, iport)) = intr_sock.accept(); try: - self.decoder.run(intr, ctrl) - except KeyboardInterrupt: - print "CTRL+C detected. Exiting." - exit(0) - except: - print "Connection broken or error." - traceback.print_exc() - else: - print "Simultaneous connection from two different devices. Ignoring both." - ctrl.close() - intr.close() + (rd, wr, err) = select.select([ctrl_sock], [], [], 1) + if len(rd) == 0: + print "Got interrupt connection without control connection. Giving up on it." + intr.close() + continue + (ctrl, (cdev, cport)) = ctrl_sock.accept(); + try: + if idev == cdev: + try: + self.decoder.run(intr, ctrl) + except: + print "Connection broken or error." + traceback.print_exc() + else: + print "Simultaneous connection from two different devices. Ignoring both." + finally: + ctrl.close() + finally: + intr.close() + except KeyboardInterrupt: + print "CTRL+C detected. Exiting." + exit(0) + except Exception, e: + print "Caught exception: %s"%str(e) if __name__ == "__main__": - os.system("/etc/init.d/bluetooth stop") - os.system("hciconfig hci0 up") - os.system("hciconfig hci0 pscan") - os.system("modprobe uinput") - cm = connection_manager(decoder()) - cm.listen() + try: + os.system("/etc/init.d/bluetooth stop > /dev/null 2>&1") + while os.system("hciconfig hci0 > /dev/null 2>&1") != 0: + print "No bluetooth device found. Will retry in 5 seconds." + time.sleep(5) + os.system("hciconfig hci0 up > /dev/null 2>&1") + os.system("hciconfig hci0 pscan > /dev/null 2>&1") + os.system("modprobe uinput > /dev/null 2>&1") + time.sleep(1) # uinput isn't ready to go right away. + cm = connection_manager(decoder()) + cm.listen() + except KeyboardInterrupt: + pass This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bla...@us...> - 2009-08-12 05:30:02
|
Revision: 21637 http://personalrobots.svn.sourceforge.net/personalrobots/?rev=21637&view=rev Author: blaisegassend Date: 2009-08-12 05:29:53 +0000 (Wed, 12 Aug 2009) Log Message: ----------- Exits if not run as root. Modified Paths: -------------- pkg/trunk/stacks/joystick_drivers/ps3joy/ps3joy.py Modified: pkg/trunk/stacks/joystick_drivers/ps3joy/ps3joy.py =================================================================== --- pkg/trunk/stacks/joystick_drivers/ps3joy/ps3joy.py 2009-08-12 05:28:51 UTC (rev 21636) +++ pkg/trunk/stacks/joystick_drivers/ps3joy/ps3joy.py 2009-08-12 05:29:53 UTC (rev 21637) @@ -194,7 +194,8 @@ if __name__ == "__main__": try: if os.getuid() != 0: - print >> sys.stderr, "ps3joy.py must be run as root." + print >> sys.stderr, "ps3joy.py must be run as root." + exit(1) os.system("/etc/init.d/bluetooth stop > /dev/null 2>&1") while os.system("hciconfig hci0 > /dev/null 2>&1") != 0: print >> sys.stderr, "No bluetooth device found. Will retry in 5 seconds." This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bla...@us...> - 2009-08-12 09:47:16
|
Revision: 21646 http://personalrobots.svn.sourceforge.net/personalrobots/?rev=21646&view=rev Author: blaisegassend Date: 2009-08-12 09:47:07 +0000 (Wed, 12 Aug 2009) Log Message: ----------- Improved usefulness of error messages, and reduced needless backtraces (on Ctrl-C, for example) Modified Paths: -------------- pkg/trunk/stacks/joystick_drivers/ps3joy/ps3joy.py Modified: pkg/trunk/stacks/joystick_drivers/ps3joy/ps3joy.py =================================================================== --- pkg/trunk/stacks/joystick_drivers/ps3joy/ps3joy.py 2009-08-12 09:43:52 UTC (rev 21645) +++ pkg/trunk/stacks/joystick_drivers/ps3joy/ps3joy.py 2009-08-12 09:47:07 UTC (rev 21646) @@ -143,6 +143,10 @@ finally: self.fullstop() +def quit(i): + os.system("/etc/init.d/bluetooth start > /dev/null 2>&1") + exit(i) + class connection_manager: def __init__(self, decoder): self.decoder = decoder @@ -153,7 +157,7 @@ sock.bind(("", port)) except: print >> sys.stderr, "Error binding to bluetooth socket." - exit (-1) + quit(-1) sock.listen(1) return sock @@ -187,7 +191,7 @@ intr.close() except KeyboardInterrupt: print "CTRL+C detected. Exiting." - exit(0) + quit(0) except Exception, e: print >> sys.stderr, "Caught exception: %s"%str(e) @@ -195,7 +199,7 @@ try: if os.getuid() != 0: print >> sys.stderr, "ps3joy.py must be run as root." - exit(1) + quit(1) os.system("/etc/init.d/bluetooth stop > /dev/null 2>&1") while os.system("hciconfig hci0 > /dev/null 2>&1") != 0: print >> sys.stderr, "No bluetooth device found. Will retry in 5 seconds." @@ -208,3 +212,5 @@ cm.listen() except KeyboardInterrupt: print "CTRL+C detected. Exiting." + quit(0) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mm...@us...> - 2009-08-18 02:05:08
|
Revision: 22094 http://personalrobots.svn.sourceforge.net/personalrobots/?rev=22094&view=rev Author: mmwise Date: 2009-08-18 02:04:59 +0000 (Tue, 18 Aug 2009) Log Message: ----------- changing print statement to be more user friendly Modified Paths: -------------- pkg/trunk/stacks/joystick_drivers/ps3joy/ps3joy.py Modified: pkg/trunk/stacks/joystick_drivers/ps3joy/ps3joy.py =================================================================== --- pkg/trunk/stacks/joystick_drivers/ps3joy/ps3joy.py 2009-08-18 01:58:40 UTC (rev 22093) +++ pkg/trunk/stacks/joystick_drivers/ps3joy/ps3joy.py 2009-08-18 02:04:59 UTC (rev 22094) @@ -130,7 +130,7 @@ (rd, wr, err) = select.select([intr], [], [], 0.1) curtime = time.time() if len(rd) + len(wr) + len(err) == 0: # Timeout - print "Activating connection." + print "Connection is Activated." ctrl.send("\x53\xf4\x42\x03\x00\x00") # Try activating the stream. if lastvalidtime - curtime >= 0.1: # Zero all outputs if we don't hear a valid frame for 0.1 to 0.2 seconds self.fullstop() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bla...@us...> - 2009-08-25 17:38:03
|
Revision: 22856 http://personalrobots.svn.sourceforge.net/personalrobots/?rev=22856&view=rev Author: blaisegassend Date: 2009-08-25 17:37:56 +0000 (Tue, 25 Aug 2009) Log Message: ----------- Fixed up exception handling for ps3joy in response to #2457. Modified Paths: -------------- pkg/trunk/stacks/joystick_drivers/ps3joy/ps3joy.py Modified: pkg/trunk/stacks/joystick_drivers/ps3joy/ps3joy.py =================================================================== --- pkg/trunk/stacks/joystick_drivers/ps3joy/ps3joy.py 2009-08-25 17:33:46 UTC (rev 22855) +++ pkg/trunk/stacks/joystick_drivers/ps3joy/ps3joy.py 2009-08-25 17:37:56 UTC (rev 22856) @@ -178,11 +178,7 @@ (ctrl, (cdev, cport)) = ctrl_sock.accept(); try: if idev == cdev: - try: - self.decoder.run(intr, ctrl) - except: - print >> sys.stderr, "Connection broken or error." - traceback.print_exc() + self.decoder.run(intr, ctrl) else: print >> sys.stderr, "Simultaneous connection from two different devices. Ignoring both." finally: @@ -193,6 +189,7 @@ print "CTRL+C detected. Exiting." quit(0) except Exception, e: + traceback.print_exc() print >> sys.stderr, "Caught exception: %s"%str(e) if __name__ == "__main__": This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bla...@us...> - 2009-09-04 19:59:31
|
Revision: 23858 http://personalrobots.svn.sourceforge.net/personalrobots/?rev=23858&view=rev Author: blaisegassend Date: 2009-09-04 19:59:22 +0000 (Fri, 04 Sep 2009) Log Message: ----------- Added an error message if bluez is not installed. Modified Paths: -------------- pkg/trunk/stacks/joystick_drivers/ps3joy/ps3joy.py Modified: pkg/trunk/stacks/joystick_drivers/ps3joy/ps3joy.py =================================================================== --- pkg/trunk/stacks/joystick_drivers/ps3joy/ps3joy.py 2009-09-04 19:56:44 UTC (rev 23857) +++ pkg/trunk/stacks/joystick_drivers/ps3joy/ps3joy.py 2009-09-04 19:59:22 UTC (rev 23858) @@ -199,7 +199,7 @@ quit(1) os.system("/etc/init.d/bluetooth stop > /dev/null 2>&1") while os.system("hciconfig hci0 > /dev/null 2>&1") != 0: - print >> sys.stderr, "No bluetooth dongle found. Will retry in 5 seconds." + print >> sys.stderr, "No bluetooth dongle found or bluez rosdep not installed. Will retry in 5 seconds." time.sleep(5) os.system("hciconfig hci0 up > /dev/null 2>&1") os.system("hciconfig hci0 pscan > /dev/null 2>&1") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |