5 files changed, 76 insertions, 16 deletions

diff --git a/ao-tools/lib/ao-editaltos.c b/ao-tools/lib/ao-editaltos.c
index a8b64098..7547c82c 100644
--- a/ao-tools/lib/ao-editaltos.c
+++ b/ao-tools/lib/ao-editaltos.c
@@ -20,12 +20,26 @@
 #include "ao-editaltos.h"
 
 struct ao_sym ao_symbols[] = {
-
-	{ 0, 0,	"ao_romconfig_version",	1 },
-	{ 0, 0,	"ao_romconfig_check",	1 },
-	{ 0, 0,	"ao_serial_number", 1 },
-	{ 0, 0,	"ao_radio_cal", 0 },
-	{ 0, 0,	"ao_usb_descriptors", 0 },
+	{
+		.name = "ao_romconfig_version",
+		.required = 1
+	},
+	{
+		.name = "ao_romconfig_check",
+		.required = 1
+	},
+	{
+		.name = "ao_serial_number",
+		.required = 1
+	},
+	{
+		.name = "ao_radio_cal",
+		.required = 0
+	},
+	{
+		.name = "ao_usb_descriptors",
+		.required = 0
+	},
 };
 
 #define NUM_SYMBOLS		5
diff --git a/ao-tools/lib/ao-hex.h b/ao-tools/lib/ao-hex.h
index 98497460..eb510ba2 100644
--- a/ao-tools/lib/ao-hex.h
+++ b/ao-tools/lib/ao-hex.h
@@ -51,7 +51,6 @@ struct ao_hex_image {
 
 struct ao_sym {
 	unsigned	addr;
-	unsigned	default_addr;
 	char		*name;
 	bool		required;
 	bool		found;
diff --git a/ao-tools/lib/cc-telemetry.h b/ao-tools/lib/cc-telemetry.h
index c28aceb8..d64c4b30 100644
--- a/ao-tools/lib/cc-telemetry.h
+++ b/ao-tools/lib/cc-telemetry.h
@@ -157,7 +157,7 @@ struct ao_telemetry_mega_sensor {
 	uint16_t	tick;		/*  2 */
 	uint8_t		type;		/*  4 */
 
-	uint8_t		pad5;		/*  5 */
+	uint8_t		orient;		/*  5 angle from vertical */
 	int16_t		accel;		/*  6 Z axis */
 
 	int32_t		pres;		/*  8 Pa * 10 */
diff --git a/ao-tools/lib/cc-usb.c b/ao-tools/lib/cc-usb.c
index d7ac138c..38dfff04 100644
--- a/ao-tools/lib/cc-usb.c
+++ b/ao-tools/lib/cc-usb.c
@@ -53,6 +53,7 @@ struct cc_usb {
 
 	struct cc_hex_read	hex_buf[CC_NUM_HEX_READ];
 	int			hex_count;
+	int			show_input;
 
 	int			remote;
 };
@@ -156,7 +157,7 @@ cc_usb_dbg(int indent, uint8_t *bytes, int len)
  */
 
 static int
-_cc_usb_sync(struct cc_usb *cc, int wait_for_input)
+_cc_usb_sync(struct cc_usb *cc, int wait_for_input, int write_timeout)
 {
 	int		ret;
 	struct pollfd	fds;
@@ -165,7 +166,7 @@ _cc_usb_sync(struct cc_usb *cc, int wait_for_input)
 	fds.fd = cc->fd;
 	for (;;) {
 		if (cc->hex_count || cc->out_count)
-			timeout = 5000;
+			timeout = write_timeout;
 		else if (wait_for_input && cc->in_pos == cc->in_count)
 			timeout = wait_for_input;
 		else
@@ -200,6 +201,10 @@ _cc_usb_sync(struct cc_usb *cc, int wait_for_input)
 				cc->in_count += ret;
 				if (cc->hex_count)
 					cc_handle_hex_read(cc);
+				if (cc->show_input && cc->in_count) {
+					write(2, cc->in_buf, cc->in_count);
+					cc->in_count = 0;
+				}
 			} else if (ret < 0)
 				perror("read");
 		}
@@ -222,7 +227,7 @@ _cc_usb_sync(struct cc_usb *cc, int wait_for_input)
 void
 cc_usb_sync(struct cc_usb *cc)
 {
-	if (_cc_usb_sync(cc, 0) < 0) {
+	if (_cc_usb_sync(cc, 0, 5000) < 0) {
 		fprintf(stderr, "USB link timeout\n");
 		exit(1);
 	}
@@ -263,7 +268,7 @@ int
 cc_usb_getchar_timeout(struct cc_usb *cc, int timeout)
 {
 	while (cc->in_pos == cc->in_count) {
-		if (_cc_usb_sync(cc, timeout) < 0) {
+		if (_cc_usb_sync(cc, timeout, 5000) < 0) {
 			fprintf(stderr, "USB link timeout\n");
 			exit(1);
 		}
@@ -395,7 +400,7 @@ cc_usb_open_remote(struct cc_usb *cc, int freq, char *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);
+			_cc_usb_sync(cc, 100, 5000);
 		} while (cc->in_count > 0);
 		cc->remote = 1;
 	}
@@ -412,19 +417,35 @@ cc_usb_close_remote(struct cc_usb *cc)
 
 static struct termios	save_termios;
 
+#include <errno.h>
+
 struct cc_usb *
 cc_usb_open(char *tty)
 {
 	struct cc_usb	*cc;
 	struct termios	termios;
+	int		i;
 
 	if (!tty)
 		tty = DEFAULT_TTY;
 	cc = calloc (sizeof (struct cc_usb), 1);
 	if (!cc)
 		return NULL;
-	cc->fd = open(tty, O_RDWR | O_NONBLOCK);
-	if (cc->fd < 0) {
+	i = 0;
+	for (;;) {
+		cc->fd = open(tty, O_RDWR | O_NONBLOCK);
+		if (cc->fd >= 0)
+			break;
+		i++;
+		if (errno == EBUSY || errno == EPERM || errno == EACCES) {
+			fprintf(stderr, "open failed, pausing");
+			perror(tty);
+			if (i < 20) {
+				sleep(3);
+				continue;
+			}
+		}
+
 		perror(tty);
 		free (cc);
 		return NULL;
@@ -438,7 +459,7 @@ cc_usb_open(char *tty)
 	cc_usb_printf(cc, "\nE 0\nm 0\n");
 	do {
 		cc->in_count = cc->in_pos = 0;
-		_cc_usb_sync(cc, 100);
+		_cc_usb_sync(cc, 100, 5000);
 	} while (cc->in_count > 0);
 	return cc;
 }
@@ -452,3 +473,26 @@ cc_usb_close(struct cc_usb *cc)
 	close (cc->fd);
 	free (cc);
 }
+
+int
+cc_usb_write(struct cc_usb *cc, void *buf, int c)
+{
+	uint8_t	*b;
+	int this_time;
+
+	b = buf;
+	cc->show_input = 1;
+	while (c > 0) {
+		this_time = c;
+		if (this_time > CC_OUT_BUF - cc->out_count)
+			this_time = CC_OUT_BUF - cc->out_count;
+		memcpy(cc->out_buf + cc->out_count, b, this_time);
+		cc->out_count += this_time;
+		c -= this_time;
+		b += this_time;
+		while (cc->out_count >= CC_OUT_BUF) {
+			_cc_usb_sync(cc, 0, -1);
+		}
+	}
+	return 1;
+}
diff --git a/ao-tools/lib/cc-usb.h b/ao-tools/lib/cc-usb.h
index f1193456..e08a956b 100644
--- a/ao-tools/lib/cc-usb.h
+++ b/ao-tools/lib/cc-usb.h
@@ -65,6 +65,9 @@ cc_usb_getline(struct cc_usb *cc, char *line, int max);
 void
 cc_usb_printf(struct cc_usb *cc, char *format, ...);
 
+int
+cc_usb_write(struct cc_usb *cc, void *buf, int c);
+
 void
 cc_usb_open_remote(struct cc_usb *cc, int freq, char *call);