X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Flib%2Fcc-usb.c;h=d7ac138c6e1210b87c6bae203d76569c23812e26;hp=53a507412bbb9189077671bb8b2e05969ef40d82;hb=106d212ff5920c39d95751ef6249dc141970412c;hpb=843ee489aac34ad6d81f55f1c85fb9eecc42d86b

diff --git a/ao-tools/lib/cc-usb.c b/ao-tools/lib/cc-usb.c
index 53a50741..d7ac138c 100644
--- a/ao-tools/lib/cc-usb.c
+++ b/ao-tools/lib/cc-usb.c
@@ -123,9 +123,10 @@ cc_handle_hex_read(struct cc_usb *cc)
 static void
 cc_usb_dbg(int indent, uint8_t *bytes, int len)
 {
-	int	eol = 1;
+	static int	eol = 1;
 	int	i;
 	uint8_t	c;
+	ccdbg_debug(CC_DEBUG_BITBANG, "<<<%d bytes>>>", len);
 	while (len--) {
 		c = *bytes++;
 		if (eol) {
@@ -135,12 +136,17 @@ cc_usb_dbg(int indent, uint8_t *bytes, int len)
 		}
 		switch (c) {
 		case '\r':
-			ccdbg_debug(CC_DEBUG_BITBANG, "^M");
+			ccdbg_debug(CC_DEBUG_BITBANG, "\\r");
 			break;
 		case '\n':
 			eol = 1;
+			ccdbg_debug(CC_DEBUG_BITBANG, "\\n\n");
+			break;
 		default:
-			ccdbg_debug(CC_DEBUG_BITBANG, "%c", c);
+			if (c < ' ' || c > '~')
+				ccdbg_debug(CC_DEBUG_BITBANG, "\\%02x", c);
+			else
+				ccdbg_debug(CC_DEBUG_BITBANG, "%c", c);
 		}
 	}
 }
@@ -254,10 +260,10 @@ cc_usb_printf(struct cc_usb *cc, char *format, ...)
 }
 
 int
-cc_usb_getchar(struct cc_usb *cc)
+cc_usb_getchar_timeout(struct cc_usb *cc, int timeout)
 {
 	while (cc->in_pos == cc->in_count) {
-		if (_cc_usb_sync(cc, 5000) < 0) {
+		if (_cc_usb_sync(cc, timeout) < 0) {
 			fprintf(stderr, "USB link timeout\n");
 			exit(1);
 		}
@@ -265,6 +271,12 @@ cc_usb_getchar(struct cc_usb *cc)
 	return cc->in_buf[cc->in_pos++];
 }
 
+int
+cc_usb_getchar(struct cc_usb *cc)
+{
+	return cc_usb_getchar_timeout(cc, 5000);
+}
+
 void
 cc_usb_getline(struct cc_usb *cc, char *line, int max)
 {
@@ -375,10 +387,12 @@ 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 freq, char *call)
 {
 	if (!cc->remote) {
-		cc_usb_printf(cc, "\np\nE 0\n");
+		fprintf (stderr, "freq %dkHz\n", freq);
+		fprintf (stderr, "call %s\n", call);
+		cc_usb_printf(cc, "\nc F %d\nc c %s\np\nE 0\n", freq, call);
 		do {
 			cc->in_count = cc->in_pos = 0;
 			_cc_usb_sync(cc, 100);
@@ -418,6 +432,8 @@ cc_usb_open(char *tty)
 	tcgetattr(cc->fd, &termios);
 	save_termios = termios;
 	cfmakeraw(&termios);
+	cfsetospeed(&termios, B9600);
+	cfsetispeed(&termios, B9600);
 	tcsetattr(cc->fd, TCSAFLUSH, &termios);
 	cc_usb_printf(cc, "\nE 0\nm 0\n");
 	do {