merged master

2011-01-31 19:42:56 +01:00
parent f5cf3195a8 b33cf8b746
commit 4562ee7fe9
9 changed files with 70 additions and 67 deletions
--- a/script/console
+++ b/script/console
@ -2,4 +2,3 @@ socat -d -d READLINE /dev/tty.usbmodem26221,nonblock=1,clocal=1
 socat -d -d READLINE /dev/tty.usbserial-A9007QcR,clocal=1,nonblock=1,cread=1,cs8,ixon=1,ixoff=1

 #socat -d -d READLINE /dev/tty.FireFly-A964-SPP-1,clocal=1,nonblock=1,cread=1,cs8,ixon=1,ixoff=1
-