altosui: Separate out log file choosing dialog to share with CSV generator

[fw/altos] / ao-tools / ao-view / aoview_monitor.c

diff --git a/ao-tools/ao-view/aoview_monitor.c b/ao-tools/ao-view/aoview_monitor.c
index 0f4afb0f943dfd5ca2ef988307771afb78106dc0..1f9937b25dea5b520f221b4e5bf52f2ff8c16b88 100644 (file)
--- a/ao-tools/ao-view/aoview_monitor.c
+++ b/ao-tools/ao-view/aoview_monitor.c
@@ -68,6 +68,7 @@ aoview_monitor_callback(gpointer user_data,
                                if (monitor_pos) {
                                        if (aoview_monitor_parse(monitor_line)) {
                                                aoview_log_set_serial(aostate.data.serial);
+                                               aoview_log_set_flight(aostate.data.flight);
                                                if (aoview_log_get_serial())
                                                        aoview_log_printf ("%s\n", monitor_line);
                                        }
@@ -82,8 +83,11 @@ aoview_monitor_callback(gpointer user_data,
 void
 aoview_monitor_set_channel(int channel)
 {
-       if (monitor_serial)
+       if (monitor_serial) {
+               aoview_serial_printf(monitor_serial, "m 0\n");
                aoview_serial_printf(monitor_serial, "c r %d\n", channel);
+               aoview_serial_printf(monitor_serial, "m 1\n");
+       }
 }
 
 gboolean
@@ -97,8 +101,7 @@ aoview_monitor_connect(char *tty)
        aoview_table_clear();
        aoview_state_reset();
        channel = aoview_channel_current();
-       if (channel >= 0)
-               aoview_monitor_set_channel(channel);
+       aoview_monitor_set_channel(channel);
        aoview_serial_set_callback(monitor_serial,
                                   aoview_monitor_callback);
        return TRUE;