Merge branch 'telemini' into telebt

8 files changed, 110 insertions, 34 deletions

diff --git a/altosui/Altos.java b/altosui/Altos.java
index a087f73a..6a2d9b9b 100644
--- a/altosui/Altos.java
+++ b/altosui/Altos.java
@@ -36,7 +36,7 @@ public class Altos {
 	static final int AO_LOG_GPS_ALT = 'H';
 	static final int AO_LOG_GPS_SAT = 'V';
 	static final int AO_LOG_GPS_DATE = 'Y';
-	static final int AO_LOG_HEIGHT = 'h';
+	static final int AO_LOG_PRESSURE = 'P';
 
 	/* Added for header fields in eeprom files */
 	static final int AO_LOG_CONFIG_VERSION = 1000;
diff --git a/altosui/AltosDataPoint.java b/altosui/AltosDataPoint.java
index 66313e03..5e077320 100644
--- a/altosui/AltosDataPoint.java
+++ b/altosui/AltosDataPoint.java
@@ -25,5 +25,6 @@ interface AltosDataPoint {
     double battery_voltage();
     double drogue_voltage();
     double main_voltage();
+    boolean has_accel();
 }
 
diff --git a/altosui/AltosDataPointReader.java b/altosui/AltosDataPointReader.java
index 4335421c..fa48013f 100644
--- a/altosui/AltosDataPointReader.java
+++ b/altosui/AltosDataPointReader.java
@@ -59,6 +59,7 @@ class AltosDataPointReader implements Iterable<AltosDataPoint> {
             public double battery_voltage() { return record.battery_voltage(); }
             public double drogue_voltage() { return record.drogue_voltage(); }
             public double main_voltage() { return record.main_voltage(); }
+	    public boolean has_accel() { return has_accel; }
         };
     }
 
diff --git a/altosui/AltosEepromDownload.java b/altosui/AltosEepromDownload.java
index 5c704968..82f01ef5 100644
--- a/altosui/AltosEepromDownload.java
+++ b/altosui/AltosEepromDownload.java
@@ -155,15 +155,17 @@ public class AltosEepromDownload implements Runnable {
 				int	s = v ^ 0x8000;
 
 				if (Altos.ao_flight_startup <= s && s <= Altos.ao_flight_invalid) {
-					r = new AltosEepromRecord(Altos.AO_LOG_STATE, tiny_tick, s, 0);
-					if (s == Altos.ao_flight_landed)
+					state = s;
+					r = new AltosEepromRecord(Altos.AO_LOG_STATE, tiny_tick, state, 0);
+					if (state == Altos.ao_flight_landed)
 						done = true;
 					state = s;
 					any_valid = true;
 				} else {
 					if (v != 0xffff)
 						any_valid = true;
-					r = new AltosEepromRecord(Altos.AO_LOG_HEIGHT, tiny_tick, v, 0);
+
+					r = new AltosEepromRecord(Altos.AO_LOG_PRESSURE, tiny_tick, 0, v);
 
 					/*
 					 * The flight software records ascent data every 100ms, and descent
diff --git a/altosui/AltosEepromIterable.java b/altosui/AltosEepromIterable.java
index 624e1dd3..16349b88 100644
--- a/altosui/AltosEepromIterable.java
+++ b/altosui/AltosEepromIterable.java
@@ -134,8 +134,13 @@ public class AltosEepromIterable extends AltosRecordIterable {
 			eeprom.seen |= seen_sensor;
 			has_accel = true;
 			break;
-		case Altos.AO_LOG_HEIGHT:
-			state.height = (short) record.a;
+		case Altos.AO_LOG_PRESSURE:
+			state.pres = record.b;
+			state.flight_pres = state.pres;
+			if (eeprom.n_pad_samples == 0) {
+				eeprom.n_pad_samples++;
+				state.ground_pres = state.pres;
+			}
 			eeprom.seen |= seen_sensor;
 			break;
 		case Altos.AO_LOG_TEMP_VOLT:
diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java
index e98c302b..4b994b47 100644
--- a/altosui/AltosGraphUI.java
+++ b/altosui/AltosGraphUI.java
@@ -35,7 +35,7 @@ public class AltosGraphUI extends JFrame
         AltosGraphTime.Element speed =
             new AltosGraphTime.TimeSeries("Speed (m/s)", "Vertical Speed", green) { 
                 public void gotTimeData(double time, AltosDataPoint d) {
-                    if (d.state() < Altos.ao_flight_drogue) {
+		    if (d.state() < Altos.ao_flight_drogue && d.has_accel()) {
                         series.add(time, d.accel_speed());
                     } else {
                         series.add(time, d.baro_speed());
diff --git a/src/ao_log_tiny.c b/src/ao_log_tiny.c
index f0c0662a..d26e0080 100644
--- a/src/ao_log_tiny.c
+++ b/src/ao_log_tiny.c
@@ -19,8 +19,14 @@
 
 static __data uint16_t	ao_log_tiny_interval;
 
-#define AO_LOG_TINY_INTERVAL_ASCENT	AO_MS_TO_TICKS(100)
 #define AO_LOG_TINY_INTERVAL_DEFAULT	AO_MS_TO_TICKS(1000)
+#if USE_FAST_ASCENT_LOG
+#define AO_LOG_TINY_INTERVAL_ASCENT	AO_MS_TO_TICKS(100)
+#define AO_PAD_RING	8
+#else
+#define AO_LOG_TINY_INTERVAL_ASCENT	AO_LOG_TINY_INTERVAL_DEFAULT
+#define AO_PAD_RING	2
+#endif
 
 void
 ao_log_tiny_set_interval(uint16_t ticks)
@@ -28,55 +34,115 @@ ao_log_tiny_set_interval(uint16_t ticks)
 	ao_log_tiny_interval = ticks;
 }
 
-static __xdata uint16_t ao_log_tiny_data_temp;
 
 static void ao_log_tiny_data(uint16_t d)
 {
 	if (ao_log_current_pos >= ao_log_end_pos && ao_log_running)
 		ao_log_stop();
 	if (ao_log_running) {
-		ao_log_tiny_data_temp = (d);
-		ao_storage_write(ao_log_current_pos, &ao_log_tiny_data_temp, 2);
+		ao_storage_write(ao_log_current_pos, DATA_TO_XDATA(&d), 2);
 		ao_log_current_pos += 2;
 	}
 }
 
+static __xdata uint16_t ao_log_pad_ring[AO_PAD_RING];
+static __pdata uint8_t ao_log_pad_ring_pos;
+
+#define ao_pad_ring_next(n)	(((n) + 1) & (AO_PAD_RING - 1))
+
+static void ao_log_tiny_queue(uint16_t d)
+{
+	ao_log_pad_ring[ao_log_pad_ring_pos] = d;
+	ao_log_pad_ring_pos = ao_pad_ring_next(ao_log_pad_ring_pos);
+}
+
+static void ao_log_tiny_start(void)
+{
+	uint8_t		p;
+	uint16_t	d;
+
+	ao_log_tiny_data(ao_flight_number);
+	ao_log_tiny_data(ao_ground_pres);
+	p = ao_log_pad_ring_pos;
+	do {
+		d = ao_log_pad_ring[p];
+		/*
+		 * ignore unwritten slots
+		 */
+		if (d)
+			ao_log_tiny_data(d);
+		p = ao_pad_ring_next(p);
+	} while (p != ao_log_pad_ring_pos);
+}
+
 void
 ao_log(void)
 {
-	uint16_t		time;
-	int16_t			delay;
+	uint16_t		last_time;
+	uint16_t		now;
 	enum ao_flight_state	ao_log_tiny_state;
+	int32_t			sum;
+	int16_t			count;
+	uint8_t			ao_log_adc;
+	uint8_t			ao_log_started = 0;
 
 	ao_storage_setup();
 
 	ao_log_scan();
 
 	ao_log_tiny_state = ao_flight_invalid;
-	ao_log_tiny_interval = AO_LOG_TINY_INTERVAL_DEFAULT;
-	while (!ao_log_running)
-		ao_sleep(&ao_log_running);
-
-	time = ao_time();
-	ao_log_tiny_data(ao_flight_number);
+	ao_log_tiny_interval = AO_LOG_TINY_INTERVAL_ASCENT;
+	sum = 0;
+	count = 0;
+	ao_log_adc = ao_sample_adc;
+	last_time = ao_time();
 	for (;;) {
-		if (ao_flight_state != ao_log_tiny_state) {
-			ao_log_tiny_data(ao_flight_state | 0x8000);
-			ao_log_tiny_state = ao_flight_state;
-			ao_log_tiny_interval = AO_LOG_TINY_INTERVAL_DEFAULT;
-			if (ao_log_tiny_state <= ao_flight_coast)
-				ao_log_tiny_interval = AO_LOG_TINY_INTERVAL_ASCENT;
-			if (ao_log_tiny_state == ao_flight_landed)
-				ao_log_stop();
+
+		/*
+		 * Add in pending sample data
+		 */
+		ao_sleep(DATA_TO_XDATA(&ao_sample_adc));
+		while (ao_log_adc != ao_sample_adc) {
+			sum += ao_adc_ring[ao_log_adc].pres;
+			count++;
+			ao_log_adc = ao_adc_ring_next(ao_log_adc);
 		}
-		ao_log_tiny_data(ao_height);
-		time += ao_log_tiny_interval;
-		delay = time - ao_time();
-		if (delay > 0)
-			ao_delay(delay);
+		if (ao_log_running) {
+			if (!ao_log_started) {
+				ao_log_tiny_start();
+				ao_log_started = 1;
+			}
+			if (ao_flight_state != ao_log_tiny_state) {
+				ao_log_tiny_data(ao_flight_state | 0x8000);
+				ao_log_tiny_state = ao_flight_state;
+				ao_log_tiny_interval = AO_LOG_TINY_INTERVAL_DEFAULT;
+#if AO_LOG_TINY_INTERVAL_ASCENT != AO_LOG_TINY_INTERVAL_DEFAULT
+				if (ao_log_tiny_state <= ao_flight_coast)
+					ao_log_tiny_interval = AO_LOG_TINY_INTERVAL_ASCENT;
+#endif
+				if (ao_log_tiny_state == ao_flight_landed)
+					ao_log_stop();
+			}
+		}
+
 		/* Stop logging when told to */
-		while (!ao_log_running)
-			ao_sleep(&ao_log_running);
+		if (!ao_log_running && ao_log_started)
+			ao_exit();
+
+		/*
+		 * Write out the sample when finished
+		 */
+		now = ao_time();
+		if ((int16_t) (now - (last_time + ao_log_tiny_interval)) >= 0 && count) {
+			count = sum / count;
+			if (ao_log_started)
+				ao_log_tiny_data(count);
+			else
+				ao_log_tiny_queue(count);
+			sum = 0;
+			count = 0;
+			last_time = now;
+		}
 	}
 }
 
diff --git a/src/ao_pins.h b/src/ao_pins.h
index 9ee5bdb4..324d7827 100644
--- a/src/ao_pins.h
+++ b/src/ao_pins.h
@@ -112,6 +112,7 @@
 	#define IGNITE_ON_P0		1
 	#define PACKET_HAS_MASTER	0
 	#define PACKET_HAS_SLAVE	1
+	#define USE_FAST_ASCENT_LOG	1
 
 	#define AO_LED_GREEN		1
 	#define AO_LED_RED		2