Share telemetry parsing code in cc library.

ao-view had a private copy of the telemetry parsing code which
included the ability to parse the newer version of that file. Those
changes have been moved to the library version and the private copy removed.

Signed-off-by: Keith Packard <keithp@keithp.com>

1 files changed, 3 insertions, 156 deletions

diff --git a/ao-tools/ao-view/aoview_monitor.c b/ao-tools/ao-view/aoview_monitor.c
index 6d57f556..0f4afb0f 100644
--- a/ao-tools/ao-view/aoview_monitor.c
+++ b/ao-tools/ao-view/aoview_monitor.c
@@ -34,167 +34,14 @@ aoview_monitor_disconnect(void)
 	aoview_log_new();
 }
 
-static void
-aoview_parse_string(char *target, int len, char *source)
-{
-	strncpy(target, source, len-1);
-	target[len-1] = '\0';
-}
-
-static void
-aoview_parse_int(int *target, char *source)
-{
-	*target = strtol(source, NULL, 0);
-}
-
-static void
-aoview_parse_hex(int *target, char *source)
-{
-	*target = strtol(source, NULL, 16);
-}
-
-static void
-aoview_parse_pos(double *target, char *source)
-{
-	int	deg;
-	double	min;
-	char	dir;
-	double	r;
-
-	if (sscanf(source, "%d°%lf'%c", &deg, &min, &dir) != 3) {
-		*target = 0;
-		return;
-	}
-	r = deg + min / 60.0;
-	if (dir == 'S' || dir == 'W')
-		r = -r;
-	*target = r;
-}
-
-#define PARSE_MAX_WORDS	256
-
 gboolean
 aoview_monitor_parse(const char *input_line)
 {
-	char *saveptr;
-	char *raw_words[PARSE_MAX_WORDS];
-	char **words;
-	int version = 0;
-	int nword;
-	char line_buf[8192], *line;
-	struct aodata	data;
-	int	tracking_pos;
-	int channel;
+	struct cc_telem	telem;
 
-	/* avoid smashing our input parameter */
-	strncpy (line_buf, input_line, sizeof (line_buf)-1);
-	line_buf[sizeof(line_buf) - 1] = '\0';
-	line = line_buf;
-	for (nword = 0; nword < PARSE_MAX_WORDS; nword++) {
-		raw_words[nword] = strtok_r(line, " \t\n", &saveptr);
-		line = NULL;
-		if (raw_words[nword] == NULL)
-			break;
-	}
-	if (nword < 36)
-		return FALSE;
-	words = raw_words;
-	if (strcmp(words[0], "VERSION") == 0) {
-		aoview_parse_int(&version, words[1]);
-		words += 2;
-		nword -= 2;
-	}
-	if (strcmp(words[0], "CALL") != 0)
+	if (!cc_telem_parse(input_line, &telem))
 		return FALSE;
-	aoview_parse_string(data.callsign, sizeof (data.callsign), words[1]);
-	aoview_parse_int(&data.serial, words[3]);
-
-	aoview_parse_int(&data.rssi, words[5]);
-	aoview_parse_string(data.state, sizeof (data.state), words[9]);
-	aoview_parse_int(&data.tick, words[10]);
-	aoview_parse_int(&data.accel, words[12]);
-	aoview_parse_int(&data.pres, words[14]);
-	aoview_parse_int(&data.temp, words[16]);
-	aoview_parse_int(&data.batt, words[18]);
-	aoview_parse_int(&data.drogue, words[20]);
-	aoview_parse_int(&data.main, words[22]);
-	aoview_parse_int(&data.flight_accel, words[24]);
-	aoview_parse_int(&data.ground_accel, words[26]);
-	aoview_parse_int(&data.flight_vel, words[28]);
-	aoview_parse_int(&data.flight_pres, words[30]);
-	aoview_parse_int(&data.ground_pres, words[32]);
-	if (version >= 1) {
-		aoview_parse_int(&data.accel_plus_g, words[34]);
-		aoview_parse_int(&data.accel_minus_g, words[36]);
-		words += 4;
-		nword -= 4;
-	} else {
-		data.accel_plus_g = data.ground_accel;
-		data.accel_minus_g = data.ground_accel + 530;
-	}
-	aoview_parse_int(&data.gps.nsat, words[34]);
-	if (strcmp (words[36], "unlocked") == 0) {
-		data.gps.gps_connected = 1;
-		data.gps.gps_locked = 0;
-		data.gps.gps_time.hour = data.gps.gps_time.minute = data.gps.gps_time.second = 0;
-		data.gps.lat = data.gps.lon = 0;
-		data.gps.alt = 0;
-		tracking_pos = 37;
-	} else if (nword >= 40) {
-		data.gps.gps_locked = 1;
-		data.gps.gps_connected = 1;
-		sscanf(words[36], "%d:%d:%d", &data.gps.gps_time.hour, &data.gps.gps_time.minute, &data.gps.gps_time.second);
-		aoview_parse_pos(&data.gps.lat, words[37]);
-		aoview_parse_pos(&data.gps.lon, words[38]);
-		sscanf(words[39], "%dm", &data.gps.alt);
-		tracking_pos = 46;
-	} else {
-		data.gps.gps_connected = 0;
-		data.gps.gps_locked = 0;
-		data.gps.gps_time.hour = data.gps.gps_time.minute = data.gps.gps_time.second = 0;
-		data.gps.lat = data.gps.lon = 0;
-		data.gps.alt = 0;
-		tracking_pos = -1;
-	}
-	if (nword >= 46) {
-		data.gps.gps_extended = 1;
-		sscanf(words[40], "%lfm/s", &data.gps.ground_speed);
-		sscanf(words[41], "%d", &data.gps.course);
-		sscanf(words[42], "%lfm/s", &data.gps.climb_rate);
-		sscanf(words[43], "%lf", &data.gps.hdop);
-		sscanf(words[44], "%d", &data.gps.h_error);
-		sscanf(words[45], "%d", &data.gps.v_error);
-	} else {
-		data.gps.gps_extended = 0;
-		data.gps.ground_speed = 0;
-		data.gps.course = 0;
-		data.gps.climb_rate = 0;
-		data.gps.hdop = 0;
-		data.gps.h_error = 0;
-		data.gps.v_error = 0;
-	}
-	if (tracking_pos >= 0 && nword >= tracking_pos + 2 && strcmp(words[tracking_pos], "SAT") == 0) {
-		int	c, n, pos;
-		aoview_parse_int(&n, words[tracking_pos + 1]);
-		pos = tracking_pos + 2;
-		if (nword >= pos + n * 3) {
-			data.gps_tracking.channels = n;
-			for (c = 0; c < n; c++) {
-				aoview_parse_int(&data.gps_tracking.sats[c].svid,
-						 words[pos + 0]);
-				aoview_parse_hex(&data.gps_tracking.sats[c].state,
-						 words[pos + 1]);
-				aoview_parse_int(&data.gps_tracking.sats[c].c_n0,
-						 words[pos + 2]);
-				pos += 3;
-			}
-		} else {
-			data.gps_tracking.channels = 0;
-		}
-	} else {
-		data.gps_tracking.channels = 0;
-	}
-	aoview_state_notify(&data);
+	aoview_state_notify(&telem);
 	return TRUE;
 }