diff options
| author | Bdale Garbee <bdale@gag.com> | 2019-01-02 22:23:04 -0700 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2019-01-02 22:23:04 -0700 |
| commit | b340cbf1403a5f5b181a215935f713a50da8e5e4 (patch) | |
| tree | 8c0d2afbe8168c29584e0d568b80353fdf555883 /src/kernel/ao_flight.h | |
| parent | 1da4b57545233f2f2afd350bd8aed4ef7bb0c844 (diff) | |
| parent | 95ffec073b0758801df04a77eca0bd2bc6e57e35 (diff) | |
Merge branch 'branch-1.9' into debian
Diffstat (limited to 'src/kernel/ao_flight.h')
| -rw-r--r-- | src/kernel/ao_flight.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/kernel/ao_flight.h b/src/kernel/ao_flight.h index 005c7e84..af6b0c55 100644 --- a/src/kernel/ao_flight.h +++ b/src/kernel/ao_flight.h @@ -38,21 +38,21 @@ enum ao_flight_state { ao_flight_test = 10 }; -extern __pdata enum ao_flight_state ao_flight_state; -extern __pdata uint16_t ao_boost_tick; -extern __pdata uint16_t ao_launch_tick; -extern __pdata uint16_t ao_motor_number; +extern enum ao_flight_state ao_flight_state; +extern uint16_t ao_boost_tick; +extern uint16_t ao_launch_tick; +extern uint16_t ao_motor_number; #if HAS_IMU || HAS_MMA655X #define HAS_SENSOR_ERRORS 1 #endif #if HAS_SENSOR_ERRORS -extern __xdata uint8_t ao_sensor_errors; +extern uint8_t ao_sensor_errors; #endif -extern __pdata uint16_t ao_launch_time; -extern __pdata uint8_t ao_flight_force_idle; +extern uint16_t ao_launch_time; +extern uint8_t ao_flight_force_idle; /* Flight thread */ void |