Merge remote branch 'origin/master' into new-packet-format

[fw/altos] / ao-tools / lib / cc-usb.c

diff --git a/ao-tools/lib/cc-usb.c b/ao-tools/lib/cc-usb.c
index 9b3b831f3898e44c5f61f9bb14f70e6f770f78e6..1580c6d9ffee488f84e1910e3e1cc9ecec943938 100644 (file)
--- a/ao-tools/lib/cc-usb.c
+++ b/ao-tools/lib/cc-usb.c
@@ -375,10 +375,11 @@ cc_usb_reset(struct cc_usb *cc)
 }
 
 void
-cc_usb_open_remote(struct cc_usb *cc)
+cc_usb_open_remote(struct cc_usb *cc, int channel)
 {
        if (!cc->remote) {
-               cc_usb_printf(cc, "p\nE 0\n");
+               printf ("channel %d\n", channel);
+               cc_usb_printf(cc, "\nc r %d\np\nE 0\n", channel);
                do {
                        cc->in_count = cc->in_pos = 0;
                        _cc_usb_sync(cc, 100);
@@ -419,7 +420,7 @@ cc_usb_open(char *tty)
        save_termios = termios;
        cfmakeraw(&termios);
        tcsetattr(cc->fd, TCSAFLUSH, &termios);
-       cc_usb_printf(cc, "E 0\nm 0\n");
+       cc_usb_printf(cc, "\nE 0\nm 0\n");
        do {
                cc->in_count = cc->in_pos = 0;
                _cc_usb_sync(cc, 100);