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 f361aa26e7d4ef00ad0d710c477a43f70b1d76a3..10f0d19206e436e08912fc69616a41c453a1ca25 100644 (file)
--- a/src/micropeak/ao_micropeak.c
+++ b/src/micropeak/ao_micropeak.c
@@ -24,16 +24,10 @@
 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);
@@ -60,21 +54,9 @@ ao_pips(void)
        ao_delay(AO_MS_TO_TICKS(200));
 }
 
-#define NUM_PA_HIST    16
-
-#define SKIP_PA_HIST(i,j)      (((i) + (j)) & (NUM_PA_HIST - 1))
-
-static uint32_t        pa_hist[NUM_PA_HIST];
-
 int
 main(void)
 {
-       int16_t         sample_count;
-       uint16_t        time;
-       uint32_t        pa_interval_min, pa_interval_max;
-       int32_t         pa_diff;
-       uint8_t         h, i;
-
        ao_led_init(LEDS_AVAILABLE);
        ao_timer_init();
 
@@ -93,93 +75,9 @@ main(void)
        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;
-       h = 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_hist[h] = pa;
-               h = SKIP_PA_HIST(h,1);
-               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;
-
-               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;
+       ao_microflight();
 
-       /* Go back and find the first sample a decent interval above the ground */
-       pa_min = pa_ground - LAND_DETECT;
-       for (i = SKIP_PA_HIST(h,2); i != h; i = SKIP_PA_HIST(i,2)) {
-               if (pa_hist[i] < pa_min)
-                       break;
-       }
-
-       /* Log the remaining samples so we get a complete history since leaving the ground */
-       for (; i != h; i = SKIP_PA_HIST(i,2)) {
-               pa = pa_hist[i];
-               ao_log_micro_data();
-       }
-
-       /* 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();