projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Integrate flite into aoview directly. Fix great circle computation.
[fw/altos]
/
aoview
/
aoview_main.c
diff --git
a/aoview/aoview_main.c
b/aoview/aoview_main.c
index a3dc95441ed2a9c261d26e49f8e202dc2cb0724f..36a82e0e1212dc3da35006dc8e42708266495c51 100644
(file)
--- a/
aoview/aoview_main.c
+++ b/
aoview/aoview_main.c
@@
-31,6
+31,8
@@
static void destroy_event(GtkWidget *widget, gpointer data)
gtk_main_quit();
}
gtk_main_quit();
}
+extern int _Xdebug;
+
int main(int argc, char **argv)
{
GladeXML *xml = NULL;
int main(int argc, char **argv)
{
GladeXML *xml = NULL;
@@
-40,12
+42,13
@@
int main(int argc, char **argv)
static struct option long_options[] = {
{ "device", 1, 0, 'd'},
static struct option long_options[] = {
{ "device", 1, 0, 'd'},
+ { "sync", 0, 0, 's'},
{ 0, 0, 0, 0 }
};
for (;;) {
int c, temp;
{ 0, 0, 0, 0 }
};
for (;;) {
int c, temp;
- c = getopt_long_only(argc, argv, "d:", long_options, &temp);
+ c = getopt_long_only(argc, argv, "
s
d:", long_options, &temp);
if (c == -1)
break;
if (c == -1)
break;
@@
-53,11
+56,15
@@
int main(int argc, char **argv)
case 'd':
device = optarg;
break;
case 'd':
device = optarg;
break;
+ case 's':
+ _Xdebug = 1;
+ break;
default:
usage();
}
}
default:
usage();
}
}
+ g_thread_init(NULL);
gtk_init(&argc, &argv);
glade_init();
gtk_init(&argc, &argv);
glade_init();
@@
-77,14
+84,26
@@
int main(int argc, char **argv)
assert(about_dialog);
gtk_about_dialog_set_version(about_dialog, AOVIEW_VERSION);
assert(about_dialog);
gtk_about_dialog_set_version(about_dialog, AOVIEW_VERSION);
+ aoview_voice_init(xml);
+
aoview_dev_dialog_init(xml);
aoview_state_init(xml);
aoview_dev_dialog_init(xml);
aoview_state_init(xml);
+ aoview_file_init(xml);
+
aoview_log_init(xml);
aoview_table_init(xml);
aoview_log_init(xml);
aoview_table_init(xml);
+ aoview_eeprom_init(xml);
+
+ aoview_replay_init(xml);
+
+ aoview_label_init(xml);
+
+ aoview_voice_speak("rocket flight monitor ready\n");
+
gtk_main();
return 0;
gtk_main();
return 0;