X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=aoview%2Faoview.h;h=4ed0ffaba51804005c83fd05a42ba7419c06f137;hp=7807b2facb74580de34caf70d970892a6e00e0f5;hb=1e5e98bd8f5ea0bc15592de454e3629383462371;hpb=e506ed4b6efb86eab50204658fcd433b987e3831

diff --git a/aoview/aoview.h b/aoview/aoview.h
index 7807b2fa..4ed0ffab 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;
@@ -68,7 +69,8 @@ struct aostate {
 	int	flight_pres;
 	int	ground_pres;
 	int	nsat;
-	int	locked;
+	int	gps_locked;
+	int	gps_connected;
 	struct {
 		int hour;
 		int minute;
@@ -83,9 +85,17 @@ struct aostate {
 	double	hdop;		/* unitless? */
 	int	h_error;	/* m */
 	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;
@@ -96,11 +106,16 @@ struct aostate {
 	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;
@@ -108,12 +123,18 @@ struct aostate {
 	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
 
@@ -124,7 +145,7 @@ gboolean
 aoview_monitor_connect(char *tty);
 
 gboolean
-aoview_monitor_parse(char *line);
+aoview_monitor_parse(const char *line);
 
 void
 aoview_monitor_reset(void);
@@ -139,9 +160,7 @@ typedef void (*aoview_serial_callback)(gpointer user_data, struct aoview_serial
 
 void
 aoview_serial_set_callback(struct aoview_serial *serial,
-			   aoview_serial_callback func,
-			   gpointer data,
-			   GDestroyNotify notify);
+			   aoview_serial_callback func);
 
 void
 aoview_serial_printf(struct aoview_serial *serial, char *format, ...);
@@ -162,7 +181,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);
@@ -207,7 +226,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);