summaryrefslogtreecommitdiff
path: root/src/ao.h
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2009-11-15 15:59:01 -0800
committerKeith Packard <keithp@keithp.com>2009-11-15 15:59:01 -0800
commit3ee279ba76c2a79d142c466f19ef758cf4c01d70 (patch)
treec6fbd4dc087d931c5566bb03da464baaa7cd7b91 /src/ao.h
parent6391c89bd5b89f5f46255b8365c658a873e5959a (diff)
Add flight number to telemetry stream.
This makes it easier to tie the telemetry and eeprom files together as they're now both labeled with serial and flight numbers, which should be unique. Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src/ao.h')
-rw-r--r--src/ao.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/ao.h b/src/ao.h
index 2df81d2a..f266ac64 100644
--- a/src/ao.h
+++ b/src/ao.h
@@ -553,11 +553,11 @@ ao_log_data(struct ao_log_record *log);
void
ao_log_flush(void);
-/* Log dumping API:
- * ao_log_dump_first() - get first log record
- * ao_log_dump_next() - get next log record
+/* We record flight numbers in the first record of
+ * the log. Tasks may wait for this to be initialized
+ * by sleeping on this variable.
*/
-extern __xdata struct ao_log_record ao_log_dump;
+extern __xdata uint16_t ao_flight_number;
/* Retrieve first log record for the current flight */
uint8_t
@@ -788,10 +788,11 @@ ao_gps_report_init(void);
*/
#define AO_MAX_CALLSIGN 8
-#define AO_TELEMETRY_VERSION 1
+#define AO_TELEMETRY_VERSION 2
struct ao_telemetry {
uint8_t addr;
+ uint16_t flight;
uint8_t flight_state;
int16_t flight_accel;
int16_t ground_accel;