X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=ao-tools%2Fao-view%2Faoview_monitor.c;h=6d57f5565212ff4fb13910134d554945a7b94cb4;hb=1de322b960005c9a16051afa1881fadb00f4bcd6;hp=8564014b31c7a9f7e4703891d526aab721f7450d;hpb=0c771d999914f9d17c723900f2987acc45fd0fbb;p=fw%2Faltos

diff --git a/ao-tools/ao-view/aoview_monitor.c b/ao-tools/ao-view/aoview_monitor.c
index 8564014b..6d57f556 100644
--- a/ao-tools/ao-view/aoview_monitor.c
+++ b/ao-tools/ao-view/aoview_monitor.c
@@ -77,24 +77,33 @@ gboolean
 aoview_monitor_parse(const char *input_line)
 {
 	char *saveptr;
-	char *words[PARSE_MAX_WORDS];
+	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;
 
 	/* 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++) {
-		words[nword] = strtok_r(line, " \t\n", &saveptr);
+		raw_words[nword] = strtok_r(line, " \t\n", &saveptr);
 		line = NULL;
-		if (words[nword] == 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)
 		return FALSE;
 	aoview_parse_string(data.callsign, sizeof (data.callsign), words[1]);
@@ -114,6 +123,15 @@ aoview_monitor_parse(const char *input_line)
 	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;
@@ -214,15 +232,26 @@ aoview_monitor_callback(gpointer user_data,
 	}
 }
 
+void
+aoview_monitor_set_channel(int channel)
+{
+	if (monitor_serial)
+		aoview_serial_printf(monitor_serial, "c r %d\n", channel);
+}
+
 gboolean
 aoview_monitor_connect(char *tty)
 {
+	int	channel;
 	aoview_monitor_disconnect();
 	monitor_serial = aoview_serial_open(tty);
 	if (!monitor_serial)
 		return FALSE;
 	aoview_table_clear();
 	aoview_state_reset();
+	channel = aoview_channel_current();
+	if (channel >= 0)
+		aoview_monitor_set_channel(channel);
 	aoview_serial_set_callback(monitor_serial,
 				   aoview_monitor_callback);
 	return TRUE;