From: Keith Packard <keithp@keithp.com>
Date: Fri, 27 Aug 2010 06:37:29 +0000 (-0700)
Subject: altos: mark gps date written only after it gets into eeprom
X-Git-Tag: debian/0.6+373+gcf65c6b~14
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=68b2b66d7574dfd0bd5e3571b8ffad32ca5d2b73

altos: mark gps date written only after it gets into eeprom

Data logging doesn't start until boost detect occurs. As the GPS date
is only logged once, if that happens before logging is written to the
flash, then the GPS date will never get saved.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/src/ao.h b/src/ao.h
index d289ced1..8db22799 100644
--- a/src/ao.h
+++ b/src/ao.h
@@ -564,6 +564,7 @@ struct ao_log_record {
 			uint8_t		year;
 			uint8_t		month;
 			uint8_t		day;
+			uint8_t		extra;
 		} gps_date;
 		struct {
 			uint16_t	d0;
@@ -573,7 +574,7 @@ struct ao_log_record {
 };
 
 /* Write a record to the eeprom log */
-void
+uint8_t
 ao_log_data(__xdata struct ao_log_record *log) __reentrant;
 
 /* Flush the log */
diff --git a/src/ao_gps_report.c b/src/ao_gps_report.c
index cceb79ff..7abc93f5 100644
--- a/src/ao_gps_report.c
+++ b/src/ao_gps_report.c
@@ -51,12 +51,12 @@ ao_gps_report(void)
 		gps_log.u.gps_altitude.unused = 0xffff;
 		ao_log_data(&gps_log);
 		if (!date_reported && (gps_data.flags & AO_GPS_DATE_VALID)) {
-			date_reported = 1;
 			gps_log.type = AO_LOG_GPS_DATE;
 			gps_log.u.gps_date.year = gps_data.year;
 			gps_log.u.gps_date.month = gps_data.month;
 			gps_log.u.gps_date.day = gps_data.day;
-			ao_log_data(&gps_log);
+			gps_log.u.gps_date.extra = 0;
+			date_reported = ao_log_data(&gps_log);
 		}
 	}
 }
diff --git a/src/ao_log.c b/src/ao_log.c
index d550d408..18bdb8c8 100644
--- a/src/ao_log.c
+++ b/src/ao_log.c
@@ -33,14 +33,16 @@ ao_log_csum(__xdata uint8_t *b) __reentrant
 	return -sum;
 }
 
-void
+uint8_t
 ao_log_data(__xdata struct ao_log_record *log) __reentrant
 {
+	uint8_t wrote = 0;
 	/* set checksum */
 	log->csum = 0;
 	log->csum = ao_log_csum((__xdata uint8_t *) log);
 	ao_mutex_get(&ao_log_mutex); {
 		if (ao_log_running) {
+			wrote = 1;
 			ao_ee_write(ao_log_current_pos,
 				    (uint8_t *) log,
 				    sizeof (struct ao_log_record));
@@ -51,6 +53,7 @@ ao_log_data(__xdata struct ao_log_record *log) __reentrant
 				ao_log_running = 0;
 		}
 	} ao_mutex_put(&ao_log_mutex);
+	return wrote;
 }
 
 void