#define ACCEL_VEL_MACH VEL_MPS_TO_COUNT(200)
#define ACCEL_VEL_APOGEE VEL_MPS_TO_COUNT(2)
#define ACCEL_VEL_MAIN VEL_MPS_TO_COUNT(100)
+#define ACCEL_VEL_BOOST VEL_MPS_TO_COUNT(5)
/*
* Barometer calibration
ao_raw_pres = ao_adc_ring[ao_flight_adc].pres;
ao_flight_tick = ao_adc_ring[ao_flight_adc].tick;
+ ao_flight_accel -= ao_flight_accel >> 4;
+ ao_flight_accel += ao_raw_accel >> 4;
+ ao_flight_pres -= ao_flight_pres >> 4;
+ ao_flight_pres += ao_raw_pres >> 4;
/* Update velocity
*
* The accelerometer is mounted so that
ao_flight_adc = ao_adc_ring_next(ao_flight_adc);
}
- ao_flight_accel -= ao_flight_accel >> 4;
- ao_flight_accel += ao_raw_accel >> 4;
- ao_flight_pres -= ao_flight_pres >> 4;
- ao_flight_pres += ao_raw_pres >> 4;
if (ao_flight_pres < ao_min_pres)
ao_min_pres = ao_flight_pres;
/* pad to boost:
*
- * accelerometer: > 2g
+ * accelerometer: > 2g AND velocity > 5m/s
* OR
* barometer: > 20m vertical motion
*
* the barometer, but we use both to make sure this
* transition is detected
*/
- if (ao_flight_accel < ao_ground_accel - ACCEL_BOOST ||
+ if ((ao_flight_accel < ao_ground_accel - ACCEL_BOOST &&
+ ao_flight_vel > ACCEL_VEL_BOOST) ||
ao_flight_pres < ao_ground_pres - BARO_LAUNCH)
{
ao_flight_state = ao_flight_boost;
* over in that case and the integrated velocity
* measurement should suffice to find apogee
*/
- if (abs(ao_flight_vel) > ao_min_vel + ACCEL_VEL_APOGEE ||
+ if (/* abs(ao_flight_vel) > ao_min_vel + ACCEL_VEL_APOGEE || */
ao_flight_pres > ao_min_pres + BARO_APOGEE)
{
/* ignite the drogue charge */
/* drogue to main deploy:
*
- * accelerometer: abs(velocity) > 100m/s (in case the drogue failed)
- * OR
* barometer: reach main deploy altitude
+ *
+ * Would like to use the accelerometer for this test, but
+ * the orientation of the flight computer is unknown after
+ * drogue deploy, so we ignore it. Could also detect
+ * high descent rate using the pressure sensor to
+ * recognize drogue deploy failure and eject the main
+ * at that point. Perhaps also use the drogue sense lines
+ * to notice continutity?
*/
- if (ao_flight_vel < -ACCEL_VEL_MAIN ||
- ao_flight_vel > ACCEL_VEL_MAIN ||
- ao_flight_pres >= ao_main_pres)
+ if (ao_flight_pres >= ao_main_pres)
{
ao_ignite(ao_igniter_main);
ao_flight_state = ao_flight_main;
/* drogue/main to land:
*
- * accelerometer: value stable and velocity less than 10m/s
- * OR
+ * accelerometer: value stable
+ * AND
* barometer: altitude stable and within 1000m of the launch altitude
*/
ao_interval_cur_min_accel = ao_interval_cur_max_accel = ao_flight_accel;
}
- if ((abs(ao_flight_vel) < ACCEL_VEL_LAND &&
- (uint16_t) (ao_interval_max_accel - ao_interval_min_accel) < (uint16_t) ACCEL_INT_LAND) ||
- (ao_flight_pres > ao_ground_pres - BARO_LAND &&
- (uint16_t) (ao_interval_max_pres - ao_interval_min_pres) < (uint16_t) BARO_INT_LAND))
+ if ((uint16_t) (ao_interval_max_accel - ao_interval_min_accel) < (uint16_t) ACCEL_INT_LAND &&
+ ao_flight_pres > ao_ground_pres - BARO_LAND &&
+ (uint16_t) (ao_interval_max_pres - ao_interval_min_pres) < (uint16_t) BARO_INT_LAND)
{
ao_flight_state = ao_flight_landed;