int16_t pres; /* pressure sensor */
int16_t temp; /* temperature sensor */
int16_t v_batt; /* battery voltage */
- int16_t sense_d; /* drogue continuity sense */
+ int16_t sense_d; /* apogee continuity sense */
int16_t sense_m; /* main continuity sense */
};
int16_t v_batt;
} temp_volt;
struct {
- int16_t drogue;
+ int16_t apogee;
int16_t main;
} deploy;
struct {
*/
enum ao_igniter {
- ao_igniter_drogue = 0,
+ ao_igniter_apogee = 0,
ao_igniter_main = 1
};
{
static __xdata struct ao_adc packet;
ao_adc_get(&packet);
- printf("tick: %5u accel: %5d pres: %5d temp: %5d batt: %5d drogue: %5d main: %5d\n",
+ printf("tick: %5u accel: %5d pres: %5d temp: %5d batt: %5d apogee: %5d main: %5d\n",
packet.tick, packet.accel, packet.pres, packet.temp,
packet.v_batt, packet.sense_d, packet.sense_m);
}
(1 << 2) | /* v0.1 temperature */
#endif
(1 << 3) | /* battery voltage */
- (1 << 4) | /* drogue sense */
+ (1 << 4) | /* apogee sense */
(1 << 5)); /* main sense */
/* enable interrupts */
break;
case ao_flight_coast:
- /* apogee detect: coast to drogue deploy:
+ /* apogee detect: coast to apogee drogue deploy:
*
* barometer: fall at least 10m
*
*/
if (ao_flight_pres > ao_min_pres + BARO_APOGEE)
{
- /* ignite the drogue charge */
- ao_ignite(ao_igniter_drogue);
+ /* ignite the apogee charge */
+ ao_ignite(ao_igniter_apogee);
/* slow down the telemetry system */
ao_telemetry_set_interval(AO_TELEMETRY_INTERVAL_RECOVER);
int16_t pres; /* pressure sensor */
int16_t temp; /* temperature sensor */
int16_t v_batt; /* battery voltage */
- int16_t sense_d; /* drogue continuity sense */
+ int16_t sense_d; /* apogee continuity sense */
int16_t sense_m; /* main continuity sense */
};
#define ao_packet_slave_start()
enum ao_igniter {
- ao_igniter_drogue = 0,
+ ao_igniter_apogee = 0,
ao_igniter_main = 1
};
void
ao_ignite(enum ao_igniter igniter)
{
- printf ("ignite %s\n", igniter == ao_igniter_drogue ? "drogue" : "main");
+ printf ("ignite %s\n", igniter == ao_igniter_apogee ? "apogee" : "main");
}
struct ao_task {
int16_t pres; /* pressure sensor */
int16_t temp; /* temperature sensor */
int16_t v_batt; /* battery voltage */
- int16_t sense_d; /* drogue continuity sense */
+ int16_t sense_d; /* apogee continuity sense */
int16_t sense_m; /* main continuity sense */
};
#define ao_telemetry_set_interval(x)
enum ao_igniter {
- ao_igniter_drogue = 0,
+ ao_igniter_apogee = 0,
ao_igniter_main = 1
};
void
ao_ignite(enum ao_igniter igniter)
{
- printf ("ignite %s\n", igniter == ao_igniter_drogue ? "drogue" : "main");
+ printf ("ignite %s\n", igniter == ao_igniter_apogee ? "apogee" : "main");
}
struct ao_task {
value = (AO_IGNITER_CLOSED>>1);
switch (igniter) {
- case ao_igniter_drogue:
+ case ao_igniter_apogee:
value = adc.sense_d;
break;
case ao_igniter_main:
{
ao_ignition[igniter].firing = 1;
switch (igniter) {
- case ao_igniter_drogue:
+ case ao_igniter_apogee:
AO_IGNITER_DROGUE = 1;
ao_delay(AO_IGNITER_FIRE_TIME);
AO_IGNITER_DROGUE = 0;
ao_config_get();
for (;;) {
ao_sleep(&ao_ignition);
- for (igniter = ao_igniter_drogue; igniter <= ao_igniter_main; igniter++) {
+ for (igniter = ao_igniter_apogee; igniter <= ao_igniter_main; igniter++) {
if (ao_ignition[igniter].request && !ao_ignition[igniter].fired) {
- if (igniter == ao_igniter_drogue && ao_config.apogee_delay)
+ if (igniter == ao_igniter_apogee && ao_config.apogee_delay)
ao_delay(AO_SEC_TO_TICKS(ao_config.apogee_delay));
ao_igniter_fire(igniter);
if(ao_match_word("main"))
ao_igniter_fire(ao_igniter_main);
} else {
- if(ao_match_word("drogue"))
- ao_igniter_fire(ao_igniter_drogue);
+ if(ao_match_word("apogee"))
+ ao_igniter_fire(ao_igniter_apogee);
}
}
void
ao_ignite_test(void)
{
- ao_ignite_print_status(ao_igniter_drogue, "drogue");
+ ao_ignite_print_status(ao_igniter_apogee, "apogee");
ao_ignite_print_status(ao_igniter_main, "main");
}
__code struct ao_cmds ao_ignite_cmds[] = {
- { 'i', ao_ignite_manual, "i <key> {main|drogue} Fire igniter. <key> is doit with D&I" },
+ { 'i', ao_ignite_manual, "i <key> {main|apogee} Fire igniter. <key> is doit with D&I" },
{ 't', ao_ignite_test, "t Test igniter continuity" },
{ 0, ao_ignite_manual, NULL },
};
ao_log_data(&log);
log.type = AO_LOG_DEPLOY;
log.tick = ao_adc_ring[ao_log_adc_pos].tick;
- log.u.deploy.drogue = ao_adc_ring[ao_log_adc_pos].sense_d;
+ log.u.deploy.apogee = ao_adc_ring[ao_log_adc_pos].sense_d;
log.u.deploy.main = ao_adc_ring[ao_log_adc_pos].sense_m;
ao_log_data(&log);
}
static void
ao_report_continuity(void) __reentrant
{
- uint8_t c = (ao_report_igniter_ready(ao_igniter_drogue) |
+ uint8_t c = (ao_report_igniter_ready(ao_igniter_apogee) |
(ao_report_igniter_ready(ao_igniter_main) << 1));
if (c) {
while (c--) {