altosui: Include device name in Table view

[fw/altos] / src / micropeak / ao_micropeak.c

diff --git a/src/micropeak/ao_micropeak.c b/src/micropeak/ao_micropeak.c
index 3bbc7eea59a09c348d4c4debf4e1e019db45ea4c..10f0d19206e436e08912fc69616a41c453a1ca25 100644 (file)
--- a/src/micropeak/ao_micropeak.c
+++ b/src/micropeak/ao_micropeak.c
@@ -19,20 +19,15 @@
 #include <ao_micropeak.h>
 #include <ao_ms5607.h>
 #include <ao_log_micro.h>
+#include <ao_async.h>
 
 static struct ao_ms5607_sample sample;
 static struct ao_ms5607_value  value;
 
-uint32_t       pa;
-uint32_t       pa_avg;
-uint32_t       pa_ground;
-uint32_t       pa_min;
 alt_t          ground_alt, max_alt;
 alt_t          ao_max_height;
 
-static uint32_t        pa_sum;
-
-static void
+void
 ao_pa_get(void)
 {
        ao_ms5607_sample(&sample);
@@ -48,14 +43,20 @@ ao_compute_height(void)
        ao_max_height = max_alt - ground_alt;
 }
 
+static void
+ao_pips(void)
+{
+       uint8_t i;
+       for (i = 0; i < 10; i++) {
+               ao_led_toggle(AO_LED_REPORT);
+               ao_delay(AO_MS_TO_TICKS(80));
+       }
+       ao_delay(AO_MS_TO_TICKS(200));
+}
+
 int
 main(void)
 {
-       int16_t         sample_count;
-       uint16_t        time;
-       uint32_t        pa_interval_min, pa_interval_max;
-       int32_t         pa_diff;
-
        ao_led_init(LEDS_AVAILABLE);
        ao_timer_init();
 
@@ -70,80 +71,13 @@ main(void)
        ao_log_micro_restore();
        ao_compute_height();
        ao_report_altitude();
+       ao_pips();
        ao_log_micro_dump();
        
        ao_delay(BOOST_DELAY);
-       /* Wait for motion, averaging values to get ground pressure */
-       time = ao_time();
-       ao_pa_get();
-       pa_avg = pa_ground = pa << FILTER_SHIFT;
-       sample_count = 0;
-       for (;;) {
-               time += SAMPLE_SLEEP;
-               if (sample_count == 0)
-                       ao_led_on(AO_LED_REPORT);
-               ao_delay_until(time);
-               ao_pa_get();
-               if (sample_count == 0)
-                       ao_led_off(AO_LED_REPORT);
-               pa_avg = pa_avg - (pa_avg >> FILTER_SHIFT) + pa;
-               pa_diff = pa_ground - pa_avg;
 
-               /* Check for a significant pressure change */
-               if (pa_diff > (BOOST_DETECT << FILTER_SHIFT))
-                       break;
+       ao_microflight();
 
-               if (sample_count < GROUND_AVG * 2) {
-                       if (sample_count < GROUND_AVG)
-                               pa_sum += pa;
-                       ++sample_count;
-               } else {
-                       pa_ground = pa_sum >> (GROUND_AVG_SHIFT - FILTER_SHIFT);
-                       pa_sum = 0;
-                       sample_count = 0;
-               }
-       }
-
-       pa_ground >>= FILTER_SHIFT;
-
-       /* Now sit around until the pressure is stable again and record the max */
-
-       sample_count = 0;
-       pa_min = pa_avg;
-       pa_interval_min = pa_avg;
-       pa_interval_max = pa_avg;
-       for (;;) {
-               time += SAMPLE_SLEEP;
-               ao_delay_until(time);
-               if ((sample_count & 3) == 0)
-                       ao_led_on(AO_LED_REPORT);
-               ao_pa_get();
-               if ((sample_count & 3) == 0)
-                       ao_led_off(AO_LED_REPORT);
-               if (sample_count & 1)
-                       ao_log_micro_data();
-               pa_avg = pa_avg - (pa_avg >> FILTER_SHIFT) + pa;
-               if (pa_avg < pa_min)
-                       pa_min = pa_avg;
-
-               if (sample_count == (GROUND_AVG - 1)) {
-                       pa_diff = pa_interval_max - pa_interval_min;
-
-                       /* Check to see if the pressure is now stable */
-                       if (pa_diff < (LAND_DETECT << FILTER_SHIFT))
-                               break;
-                       sample_count = 0;
-                       pa_interval_min = pa_avg;
-                       pa_interval_max = pa_avg;
-               } else {
-                       if (pa_avg < pa_interval_min)
-                               pa_interval_min = pa_avg;
-                       if (pa_avg > pa_interval_max)
-                               pa_interval_max = pa_avg;
-                       ++sample_count;
-               }
-       }
-       pa_min >>= FILTER_SHIFT;
        ao_log_micro_save();
        ao_compute_height();
        ao_report_altitude();