Integrate flite into aoview directly. Fix great circle computation.

[fw/altos] / aoview / aoview_monitor.c

diff --git a/aoview/aoview_monitor.c b/aoview/aoview_monitor.c
index d01ca77160993bcd154b683f3ebb9fc1faa40530..f7f646ae817b7792487607e585f40f70244e1753 100644 (file)
--- 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,12 +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]);
-       aoview_log_set_serial(state.serial);
 
        aoview_parse_int(&state.rssi, words[5]);
        aoview_parse_string(state.state, sizeof (state.state), words[9]);
@@ -133,6 +130,13 @@ aoview_monitor_parse(char *line)
                state.v_error = 0;
        }
        aoview_state_notify(&state);
+       return TRUE;
+}
+
+void
+aoview_monitor_reset(void)
+{
+       memset(&state, '\0', sizeof (state));
 }
 
 static void
@@ -155,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;
@@ -171,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,