__pdata enum ao_flight_state ao_flight_state; /* current flight state */
__pdata uint16_t ao_boost_tick; /* time of launch detect */
+__pdata uint16_t ao_motor_number; /* number of motors burned so far */
/*
* track min/max data over a long interval to detect
static __data uint16_t ao_interval_end;
static __data int16_t ao_interval_min_height;
static __data int16_t ao_interval_max_height;
+#if HAS_ACCEL
static __data int16_t ao_coast_avg_accel;
+#endif
__pdata uint8_t ao_flight_force_idle;
{
/* Set pad mode - we can fly! */
ao_flight_state = ao_flight_pad;
-#if HAS_USB && HAS_RADIO
+#if HAS_USB && HAS_RADIO && !HAS_FLIGHT_DEBUG
/* Disable the USB controller in flight mode
* to save power
*/
#else
ao_flight_state = ao_flight_coast;
#endif
+ ++ao_motor_number;
ao_wakeup(DATA_TO_XDATA(&ao_flight_state));
}
break;
ao_interval_end = ao_sample_tick + AO_INTERVAL_TICKS;
}
break;
- case ao_flight_landed:
+ default:
break;
}
}
}
-#if !HAS_RADIO
+#if HAS_FLIGHT_DEBUG
static inline int int_part(int16_t i) { return i >> 4; }
static inline int frac_part(int16_t i) { return ((i & 0xf) * 100 + 8) / 16; }
printf (" raw accel %d\n", ao_sample_accel);
#endif
printf (" ground pres %d\n", ao_ground_pres);
+ printf (" ground alt %d\n", ao_ground_height);
#if HAS_ACCEL
printf (" raw accel %d\n", ao_sample_accel);
printf (" groundaccel %d\n", ao_ground_accel);
ao_flight_init(void)
{
ao_flight_state = ao_flight_startup;
-#if !HAS_RADIO
+#if HAS_FLIGHT_DEBUG
ao_cmd_register(&ao_flight_cmds[0]);
#endif
ao_add_task(&flight_task, ao_flight, "flight");