diff options
| author | Keith Packard <keithp@keithp.com> | 2011-07-06 15:51:52 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-07-06 15:51:52 -0700 |
| commit | 038d7b25ba833da4be458409670d3f95e8aaf17b (patch) | |
| tree | 27e3edd277eddab28555dbe8a3419b834cd0d47d | |
| parent | 3742b36a528f114c3b1873caa4f39581145b76da (diff) | |
altos: Switch ao_flight and ao_flight_nano __xdata to __pdata
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | src/ao.h | 2 | ||||
| -rw-r--r-- | src/ao_flight.c | 5 | ||||
| -rw-r--r-- | src/ao_flight_nano.c | 2 |
3 files changed, 3 insertions, 6 deletions
@@ -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 __xdata uint8_t ao_flight_force_idle; +extern __pdata uint8_t ao_flight_force_idle; /* Flight thread */ void diff --git a/src/ao_flight.c b/src/ao_flight.c index c6cbbf7c..f1b60d69 100644 --- 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; -__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 @@ -170,7 +170,6 @@ ao_flight(void) #endif ao_wakeup(DATA_TO_XDATA(&ao_flight_state)); - break; } 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)); - break; } 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)); - break; } break; #endif diff --git a/src/ao_flight_nano.c b/src/ao_flight_nano.c index 32770227..2e332b12 100644 --- 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; -__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) |