Merge branch 'telemini' into telebt

diff --git a/altosui/Altos.java b/altosui/Altos.java
index a087f73a2f662c6aa738e7008bb79e0d937a7972..6a2d9b9b202ff2ce0dddff09526316da14ef3616 100644 (file)
--- 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 66313e03a8a2b3fe06c50435bb5d918ed3977f6f..5e07732026aeb2562b33eabeecfe7884b172c65c 100644 (file)
--- 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 4335421c21a96922e0ef0f3bf6f3026efcdcfb3f..fa48013f3b1053a65678ee02f6535aa834cb5035 100644 (file)
--- 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 5c7049683008fc8107c0fdd0d1191130b43838e0..82f01ef52ea360dc53dc59ecda51203777c5067a 100644 (file)
--- 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 624e1dd31bb7c1645a4f3d8f098db2df6f2e0edd..16349b884ec8729e52b9ad18fe4c7373f6c8eee7 100644 (file)
--- 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 e98c302bf9af1c4863dd50cbf52390fd359d0a28..4b994b4775cafd84ddadc4a0d6cc4211cdd9ab6b 100644 (file)
--- 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 f0c0662aa4dbd6a3ba0437121d8622d57ea390d9..d26e0080ec5715c88897e4cd45402f902c6353ff 100644 (file)
--- 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 9ee5bdb44820601dab56ddb1d8060ad3780c7256..324d78273daaca46c9900446ade5299a1a5d2ed8 100644 (file)
--- 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