X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=aoview%2Faoview_monitor.c;h=f7f646ae817b7792487607e585f40f70244e1753;hb=e506ed4b6efb86eab50204658fcd433b987e3831;hp=0fd535f210584732f27d6254660dd41cd154cec4;hpb=5a7a63c34b778e40a61ddabd16ec1af9a2be50c3;p=fw%2Faltos

diff --git a/aoview/aoview_monitor.c b/aoview/aoview_monitor.c
index 0fd535f2..f7f646ae 100644
--- a/aoview/aoview_monitor.c
+++ b/aoview/aoview_monitor.c
@@ -31,7 +31,6 @@ aoview_monitor_disconnect(void)
 		aoview_serial_close(monitor_serial);
 		monitor_serial = NULL;
 	}
-	aoview_table_clear();
 	aoview_log_new();
 }
 
@@ -66,16 +65,15 @@ aoview_parse_pos(double *target, char *source)
 	*target = r;
 }
 
-static void
+static struct aostate	state;
+
+gboolean
 aoview_monitor_parse(char *line)
 {
 	char *saveptr;
 	char *words[64];
 	int nword;
-	struct aostate	state;
 
-	if (aoview_log_get_serial())
-		aoview_log_printf ("%s\n", line);
 	for (nword = 0; nword < 64; nword++) {
 		words[nword] = strtok_r(line, " \t\n", &saveptr);
 		line = NULL;
@@ -83,13 +81,11 @@ aoview_monitor_parse(char *line)
 			break;
 	}
 	if (nword < 36)
-		return;
+		return FALSE;
 	if (strcmp(words[0], "CALL") != 0)
-		return;
+		return FALSE;
 	aoview_parse_string(state.callsign, sizeof (state.callsign), words[1]);
 	aoview_parse_int(&state.serial, words[3]);
-	if (!aoview_log_get_serial())
-		aoview_log_set_serial(state.serial);
 
 	aoview_parse_int(&state.rssi, words[5]);
 	aoview_parse_string(state.state, sizeof (state.state), words[9]);
@@ -118,7 +114,29 @@ aoview_monitor_parse(char *line)
 		state.lat = state.lon = 0;
 		state.alt = 0;
 	}
+	if (nword >= 46) {
+		sscanf(words[40], "%lfm/s", &state.ground_speed);
+		sscanf(words[41], "%d", &state.course);
+		sscanf(words[42], "%lfm/s", &state.climb_rate);
+		sscanf(words[43], "%lf", &state.hdop);
+		sscanf(words[44], "%d", &state.h_error);
+		sscanf(words[45], "%d", &state.v_error);
+	} else {
+		state.ground_speed = 0;
+		state.course = 0;
+		state.climb_rate = 0;
+		state.hdop = 0;
+		state.h_error = 0;
+		state.v_error = 0;
+	}
 	aoview_state_notify(&state);
+	return TRUE;
+}
+
+void
+aoview_monitor_reset(void)
+{
+	memset(&state, '\0', sizeof (state));
 }
 
 static void
@@ -141,8 +159,13 @@ aoview_monitor_callback(gpointer user_data,
 				continue;
 			if (c == '\n') {
 				monitor_line[monitor_pos] = '\0';
-				if (monitor_pos)
-				aoview_monitor_parse(monitor_line);
+				if (monitor_pos) {
+					if (aoview_monitor_parse(monitor_line)) {
+						aoview_log_set_serial(state.serial);
+						if (aoview_log_get_serial())
+							aoview_log_printf ("%s\n", monitor_line);
+					}
+				}
 				monitor_pos = 0;
 			} else if (monitor_pos < MONITOR_LEN)
 				monitor_line[monitor_pos++] = c;
@@ -157,6 +180,8 @@ aoview_monitor_connect(char *tty)
 	monitor_serial = aoview_serial_open(tty);
 	if (!monitor_serial)
 		return FALSE;
+	aoview_table_clear();
+	aoview_monitor_reset();
 	aoview_serial_set_callback(monitor_serial,
 				   aoview_monitor_callback,
 				   monitor_serial,