X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=aoview%2Faoview.h;h=b4d1315968ba248284f57678501dd639c223bed8;hp=1ad9e160dd308cb478b3e5b27e8e535cbe7c974b;hb=31d5670a9144b943ce9c8cb00deb5fb659af0b1c;hpb=4ca2d910f3be689fd3c78a4f1be0555d6b1a30c1

diff --git a/aoview/aoview.h b/aoview/aoview.h
index 1ad9e160..b4d13159 100644
--- a/aoview/aoview.h
+++ b/aoview/aoview.h
@@ -35,6 +35,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <assert.h>
+#include <math.h>
 
 #include <gtk/gtk.h>
 #include <glade/glade.h>
@@ -50,7 +51,7 @@ struct usbdev {
 	int	idVendor;
 };
 
-struct aostate {
+struct aodata {
 	char	callsign[16];
 	int	serial;
 	int	rssi;
@@ -85,12 +86,69 @@ struct aostate {
 	int	v_error;	/* m */
 };
 
+struct aostate {
+	struct aodata	data;
+
+	/* derived data */
+
+	struct aodata	prev_data;
+
+	double		report_time;
+
+	gboolean	ascent;	/* going up? */
+
+	int	ground_altitude;
+	int	height;
+	double	speed;
+	double	acceleration;
+	double	battery;
+	double	temperature;
+	double	main_sense;
+	double	drogue_sense;
+	double	baro_speed;
+
+	int	max_height;
+	double	max_acceleration;
+	double	max_speed;
+
+	double	lat;
+	double	lon;
+	int	gps_valid;
+
+	double	pad_lat;
+	double	pad_lon;
+	double	pad_alt;
+	double	pad_lat_total;
+	double	pad_lon_total;
+	double	pad_alt_total;
+	int	npad;
+	int	prev_npad;
+
+	double	distance;
+	double	bearing;
+	int	gps_height;
+
+	int	speak_tick;
+	int	speak_altitude;
+};
+
+extern struct aostate aostate;
+
+/* GPS is 'stable' when we've seen at least this many samples */
+#define MIN_PAD_SAMPLES	10
+
 void
 aoview_monitor_disconnect(void);
 
 gboolean
 aoview_monitor_connect(char *tty);
 
+gboolean
+aoview_monitor_parse(const char *line);
+
+void
+aoview_monitor_reset(void);
+
 struct aoview_serial *
 aoview_serial_open(const char *tty);
 
@@ -124,7 +182,7 @@ void
 aoview_usbdev_free(struct usbdev *usbdev);
 
 void
-aoview_state_notify(struct aostate *state);
+aoview_state_notify(struct aodata *data);
 
 void
 aoview_state_new(void);
@@ -169,7 +227,7 @@ void
 aoview_table_start(void);
 
 void
-aoview_table_add_row(char *label, char *format, ...);
+aoview_table_add_row(int column, char *label, char *format, ...);
 
 void
 aoview_table_finish(void);
@@ -182,6 +240,8 @@ aoview_table_clear(void);
 
 struct aoview_file;
 
+extern char *aoview_file_dir;
+
 void
 aoview_file_finish(struct aoview_file *file);
 
@@ -227,4 +287,19 @@ void aoview_voice_close(void);
 
 void aoview_voice_speak(char *format, ...);
 
+/* aoview_label.c */
+
+void aoview_label_init(GladeXML *xml);
+
+void
+aoview_label_show(struct aostate *state);
+
+/* aoview_flite.c */
+
+FILE *
+aoview_flite_start(void);
+
+void
+aoview_flite_stop(void);
+
 #endif /* _AOVIEW_H_ */