first cut at turnon scripts for EasyTimer v2

[fw/altos] / src / kernel / ao_flight_nano.c

diff --git a/src/kernel/ao_flight_nano.c b/src/kernel/ao_flight_nano.c
index 797ea344e16c1851628f0d3a4cee077cb2c8d000..09e74901f44d6bea33fc42e215e4310cb76daf46 100644 (file)
--- a/src/kernel/ao_flight_nano.c
+++ b/src/kernel/ao_flight_nano.c
@@ -20,18 +20,18 @@
 
 /* Main flight thread. */
 
-__pdata enum ao_flight_state   ao_flight_state;        /* current flight state */
-__pdata uint16_t               ao_launch_tick;         /* time of launch detect */
+enum ao_flight_state   ao_flight_state;        /* current flight state */
+AO_TICK_TYPE           ao_launch_tick;         /* time of launch detect */
 
 /*
  * track min/max data over a long interval to detect
  * resting
  */
-__pdata uint16_t               ao_interval_end;
-__pdata alt_t                  ao_interval_min_height;
-__pdata alt_t                  ao_interval_max_height;
+AO_TICK_TYPE           ao_interval_end;
+alt_t                  ao_interval_min_height;
+alt_t                  ao_interval_max_height;
 
-__pdata uint8_t                        ao_flight_force_idle;
+uint8_t                        ao_flight_force_idle;
 
 /* Landing is detected by getting constant readings from both pressure and accelerometer
  * for a fairly long time (AO_INTERVAL_TICKS)
@@ -94,7 +94,7 @@ ao_flight_nano(void)
                        if (ao_height > ao_interval_max_height)
                                ao_interval_max_height = ao_height;
 
-                       if ((int16_t) (ao_sample_tick - ao_interval_end) >= 0) {
+                       if ((AO_TICK_SIGNED) (ao_sample_tick - ao_interval_end) >= 0) {
                                if (ao_interval_max_height - ao_interval_min_height < AO_M_TO_HEIGHT(5))
                                {
                                        ao_flight_state = ao_flight_landed;
@@ -111,7 +111,7 @@ ao_flight_nano(void)
        }
 }
 
-static __xdata struct ao_task  flight_task;
+static struct ao_task  flight_task;
 
 void
 ao_flight_nano_init(void)