altos: Switch ao_flight and ao_flight_nano __xdata to __pdata

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/src/ao.h b/src/ao.h
index 8836a286b05fab25d5e720cad8c98f4ea37c85a2..ac5615bb29b63d9a074438b3964c4abf2f67d1e7 100644 (file)
--- a/src/ao.h
+++ b/src/ao.h
@@ -707,7 +707,7 @@ enum ao_flight_state {
 extern __pdata enum ao_flight_state    ao_flight_state;
 
 extern __pdata uint16_t                        ao_launch_time;
 extern __pdata enum ao_flight_state    ao_flight_state;
 
 extern __pdata uint16_t                        ao_launch_time;

-extern __xdata uint8_t                 ao_flight_force_idle;
+extern __pdata uint8_t                 ao_flight_force_idle;

 
 /* Flight thread */
 void
 
 /* Flight thread */
 void

diff --git a/src/ao_flight.c b/src/ao_flight.c
index c6cbbf7cbaeb3e26f64bf6069e427fe864f4a561..f1b60d6978713a73012fccc7541fa8d6d9b72edf 100644 (file)
--- a/src/ao_flight.c
+++ b/src/ao_flight.c
@@ -44,7 +44,7 @@ __pdata uint16_t              ao_interval_end;
 __pdata int16_t                        ao_interval_min_height;
 __pdata int16_t                        ao_interval_max_height;
 
 __pdata int16_t                        ao_interval_min_height;
 __pdata int16_t                        ao_interval_max_height;
 

-__xdata uint8_t                        ao_flight_force_idle;
+__pdata uint8_t                        ao_flight_force_idle;

 
 /* We also have a clock, which can be used to sanity check things in
  * case of other failures
 
 /* We also have a clock, which can be used to sanity check things in
  * case of other failures


@@ -170,7 +170,6 @@ ao_flight(void)
 #endif
 
                                ao_wakeup(DATA_TO_XDATA(&ao_flight_state));
 #endif
 
                                ao_wakeup(DATA_TO_XDATA(&ao_flight_state));

-                               break;

                        }
                        break;
                case ao_flight_boost:
                        }
                        break;
                case ao_flight_boost:


@@ -194,7 +193,6 @@ ao_flight(void)
                                ao_flight_state = ao_flight_coast;
 #endif
                                ao_wakeup(DATA_TO_XDATA(&ao_flight_state));
                                ao_flight_state = ao_flight_coast;
 #endif
                                ao_wakeup(DATA_TO_XDATA(&ao_flight_state));

-                               break;

                        }
                        break;
 #if HAS_ACCEL
                        }
                        break;
 #if HAS_ACCEL


@@ -208,7 +206,6 @@ ao_flight(void)
                        {
                                ao_flight_state = ao_flight_coast;
                                ao_wakeup(DATA_TO_XDATA(&ao_flight_state));
                        {
                                ao_flight_state = ao_flight_coast;
                                ao_wakeup(DATA_TO_XDATA(&ao_flight_state));

-                               break;

                        }
                        break;
 #endif
                        }
                        break;
 #endif

diff --git a/src/ao_flight_nano.c b/src/ao_flight_nano.c
index 32770227ec46519e8c763f62f26e0cb1ed8426c6..2e332b12837e3729dae82bb1490b9ae0d4d0ecb9 100644 (file)
--- a/src/ao_flight_nano.c
+++ b/src/ao_flight_nano.c
@@ -30,7 +30,7 @@ __pdata uint16_t              ao_interval_end;
 __pdata int16_t                        ao_interval_min_height;
 __pdata int16_t                        ao_interval_max_height;
 
 __pdata int16_t                        ao_interval_min_height;
 __pdata int16_t                        ao_interval_max_height;
 

-__xdata uint8_t                        ao_flight_force_idle;
+__pdata 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)
 
 /* Landing is detected by getting constant readings from both pressure and accelerometer
  * for a fairly long time (AO_INTERVAL_TICKS)