X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao.h;h=8836a286b05fab25d5e720cad8c98f4ea37c85a2;hp=4d31f4f52dd30e65746708af477db5035a51d558;hb=6903b6464db7eb803de8bf9b897c45431f7a1d63;hpb=359681f23e2f71bc8f4975a4a76ae28c08ecab2e

diff --git a/src/ao.h b/src/ao.h
index 4d31f4f5..8836a286 100644
--- a/src/ao.h
+++ b/src/ao.h
@@ -367,10 +367,10 @@ enum ao_cmd_status {
 	ao_cmd_syntax_error = 2,
 };
 
-extern __xdata uint16_t ao_cmd_lex_i;
-extern __xdata uint32_t ao_cmd_lex_u32;
-extern __xdata char	ao_cmd_lex_c;
-extern __xdata enum ao_cmd_status ao_cmd_status;
+extern __pdata uint16_t ao_cmd_lex_i;
+extern __pdata uint32_t ao_cmd_lex_u32;
+extern __pdata char	ao_cmd_lex_c;
+extern __pdata enum ao_cmd_status ao_cmd_status;
 
 void
 ao_cmd_lex(void);
@@ -395,7 +395,7 @@ ao_match_word(__code char *word);
 
 struct ao_cmds {
 	void		(*func)(void);
-	const char	*help;
+	__code char	*help;
 };
 
 void
@@ -535,7 +535,7 @@ extern __pdata uint32_t ao_log_current_pos;
 extern __pdata uint32_t ao_log_end_pos;
 extern __pdata uint32_t ao_log_start_pos;
 extern __xdata uint8_t	ao_log_running;
-extern __xdata enum flight_state ao_log_state;
+extern __pdata enum flight_state ao_log_state;
 
 /* required functions from the underlying log system */
 
@@ -803,13 +803,13 @@ extern __data uint8_t	ao_sample_adc;		/* Ring position of last processed sample
 extern __pdata int16_t	ao_sample_accel;	/* most recent accel sensor reading */
 #endif
 
-extern __xdata int16_t	ao_ground_pres;		/* startup pressure */
-extern __xdata int16_t	ao_ground_height;	/* MSL of ao_ground_pres */
+extern __pdata int16_t	ao_ground_pres;		/* startup pressure */
+extern __pdata int16_t	ao_ground_height;	/* MSL of ao_ground_pres */
 
 #if HAS_ACCEL
-extern __xdata int16_t	ao_ground_accel;	/* startup acceleration */
-extern __xdata int16_t 	ao_accel_2g;		/* factory accel calibration */
-extern __xdata int32_t	ao_accel_scale;		/* sensor to m/s² conversion */
+extern __pdata int16_t	ao_ground_accel;	/* startup acceleration */
+extern __pdata int16_t 	ao_accel_2g;		/* factory accel calibration */
+extern __pdata int32_t	ao_accel_scale;		/* sensor to m/s² conversion */
 #endif
 
 void ao_sample_init(void);
@@ -965,80 +965,8 @@ void
 ao_spi_init(void);
 
 /*
- * ao_gps.c
- */
-
-#define AO_GPS_NUM_SAT_MASK	(0xf << 0)
-#define AO_GPS_NUM_SAT_SHIFT	(0)
-
-#define AO_GPS_VALID		(1 << 4)
-#define AO_GPS_RUNNING		(1 << 5)
-#define AO_GPS_DATE_VALID	(1 << 6)
-#define AO_GPS_COURSE_VALID	(1 << 7)
-
-extern __xdata uint16_t ao_gps_tick;
-
-struct ao_gps_data {
-	uint8_t			year;
-	uint8_t			month;
-	uint8_t			day;
-	uint8_t			hour;
-	uint8_t			minute;
-	uint8_t			second;
-	uint8_t			flags;
-	int32_t			latitude;	/* degrees * 10⁷ */
-	int32_t			longitude;	/* degrees * 10⁷ */
-	int16_t			altitude;	/* m */
-	uint16_t		ground_speed;	/* cm/s */
-	uint8_t			course;		/* degrees / 2 */
-	uint8_t			hdop;		/* * 5 */
-	int16_t			climb_rate;	/* cm/s */
-	uint16_t		h_error;	/* m */
-	uint16_t		v_error;	/* m */
-};
-
-struct ao_gps_sat_data {
-	uint8_t		svid;
-	uint8_t		c_n_1;
-};
-
-#define AO_MAX_GPS_TRACKING	12
-
-struct ao_gps_tracking_data {
-	uint8_t			channels;
-	struct ao_gps_sat_data	sats[AO_MAX_GPS_TRACKING];
-};
-
-extern __xdata uint8_t ao_gps_mutex;
-extern __xdata struct ao_gps_data ao_gps_data;
-extern __xdata struct ao_gps_tracking_data ao_gps_tracking_data;
-
-void
-ao_gps(void);
-
-void
-ao_gps_print(__xdata struct ao_gps_data *gps_data);
-
-void
-ao_gps_tracking_print(__xdata struct ao_gps_tracking_data *gps_tracking_data);
-
-void
-ao_gps_init(void);
-
-/*
- * ao_gps_report.c
- */
-
-void
-ao_gps_report(void);
-
-void
-ao_gps_report_init(void);
-
-/*
- * ao_telemetry_orig.c
+ * ao_telemetry.c
  */
-
 #define AO_MAX_CALLSIGN			8
 #define AO_MAX_VERSION			8
 #define AO_MAX_TELEMETRY		128
@@ -1090,8 +1018,9 @@ struct ao_telemetry_configuration {
 	uint16_t        flight;				/*  6 flight number */
 	uint8_t		config_major;			/*  8 Config major version */
 	uint8_t		config_minor;			/*  9 Config minor version */
-	uint16_t	main_deploy;			/* 10 Main deploy alt in meters */
-	uint32_t	flight_log_max;			/* 12 Maximum flight log size in bytes */
+	uint16_t	apogee_delay;			/* 10 Apogee deploy delay in seconds */
+	uint16_t	main_deploy;			/* 12 Main deploy alt in meters */
+	uint16_t	flight_log_max;			/* 14 Maximum flight log size in kB */
 	char		callsign[AO_MAX_CALLSIGN];	/* 16 Radio operator identity */
 	char		version[AO_MAX_VERSION];	/* 24 Software version */
 	/* 32 */
@@ -1126,12 +1055,13 @@ struct ao_telemetry_location {
 	uint8_t         vdop;		/* 24 (m * 5) */
 	uint8_t         mode;		/* 25 */
 	uint16_t	ground_speed;	/* 26 cm/s */
-	uint8_t		course;		/* 28 degrees / 2 */
-	uint8_t		unused[3];	/* 29 */
+	int16_t		climb_rate;	/* 28 cm/s */
+	uint8_t		course;		/* 30 degrees / 2 */
+	uint8_t		unused[1];	/* 31 */
 	/* 32 */
 };
 
-#define AO_TELEMETRY_SATELLITE		0x12
+#define AO_TELEMETRY_SATELLITE		0x06
 
 struct ao_telemetry_satellite_info {
 	uint8_t		svid;
@@ -1157,10 +1087,79 @@ union ao_telemetry_all {
 	struct ao_telemetry_satellite		satellite;
 };
 
-#define AO_SAT_0_SSID(s)	((s)[0] & 0x3f)
-#define AO_SAT_0_C_N_1(s)	((((s)[0] & 0xc0) >> 2) | ((s)[1] & 0x0f))
-#define AO_SAT_1_SSID(s)	((((s)[1] & 0xf0) >> 2) | ((s)[2] & 0x03))
-#define AO_SAT_1_C_N_1(s)	(((s)[2] & 0xfc) >> 2)
+/*
+ * ao_gps.c
+ */
+
+#define AO_GPS_NUM_SAT_MASK	(0xf << 0)
+#define AO_GPS_NUM_SAT_SHIFT	(0)
+
+#define AO_GPS_VALID		(1 << 4)
+#define AO_GPS_RUNNING		(1 << 5)
+#define AO_GPS_DATE_VALID	(1 << 6)
+#define AO_GPS_COURSE_VALID	(1 << 7)
+
+extern __pdata uint16_t ao_gps_tick;
+extern __xdata uint8_t ao_gps_mutex;
+extern __xdata struct ao_telemetry_location ao_gps_data;
+extern __xdata struct ao_telemetry_satellite ao_gps_tracking_data;
+
+struct ao_gps_orig {
+	uint8_t			year;
+	uint8_t			month;
+	uint8_t			day;
+	uint8_t			hour;
+	uint8_t			minute;
+	uint8_t			second;
+	uint8_t			flags;
+	int32_t			latitude;	/* degrees * 10⁷ */
+	int32_t			longitude;	/* degrees * 10⁷ */
+	int16_t			altitude;	/* m */
+	uint16_t		ground_speed;	/* cm/s */
+	uint8_t			course;		/* degrees / 2 */
+	uint8_t			hdop;		/* * 5 */
+	int16_t			climb_rate;	/* cm/s */
+	uint16_t		h_error;	/* m */
+	uint16_t		v_error;	/* m */
+};
+
+struct ao_gps_sat_orig {
+	uint8_t		svid;
+	uint8_t		c_n_1;
+};
+
+#define AO_MAX_GPS_TRACKING	12
+
+struct ao_gps_tracking_orig {
+	uint8_t			channels;
+	struct ao_gps_sat_orig	sats[AO_MAX_GPS_TRACKING];
+};
+
+void
+ao_gps(void);
+
+void
+ao_gps_print(__xdata struct ao_gps_orig *gps_data);
+
+void
+ao_gps_tracking_print(__xdata struct ao_gps_tracking_orig *gps_tracking_data);
+
+void
+ao_gps_init(void);
+
+/*
+ * ao_gps_report.c
+ */
+
+void
+ao_gps_report(void);
+
+void
+ao_gps_report_init(void);
+
+/*
+ * ao_telemetry_orig.c
+ */
 
 struct ao_telemetry_orig {
 	uint16_t		serial;
@@ -1180,9 +1179,9 @@ struct ao_telemetry_orig {
 	int16_t			accel_plus_g;
 	int16_t			accel_minus_g;
 	struct ao_adc		adc;
-	struct ao_gps_data	gps;
+	struct ao_gps_orig	gps;
 	char			callsign[AO_MAX_CALLSIGN];
-	struct ao_gps_tracking_data	gps_tracking;
+	struct ao_gps_tracking_orig	gps_tracking;
 };
 
 struct ao_telemetry_tiny {
@@ -1312,8 +1311,8 @@ struct ao_stdio {
 };
 
 extern __xdata struct ao_stdio ao_stdios[];
-extern __data int8_t ao_cur_stdio;
-extern __data int8_t ao_num_stdios;
+extern __pdata int8_t ao_cur_stdio;
+extern __pdata int8_t ao_num_stdios;
 
 void
 flush(void);