From c71937b9744e7dc2d339c41a8f8f67f183352a70 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Sat, 10 Apr 2010 15:20:38 -0600 Subject: [PATCH] change all references to 'drogue' igniter to be 'apogee' instead --- src/ao.h | 6 +++--- src/ao_adc.c | 4 ++-- src/ao_flight.c | 6 +++--- src/ao_flight_test.c | 6 +++--- src/ao_host.h | 6 +++--- src/ao_ignite.c | 16 ++++++++-------- src/ao_log.c | 2 +- src/ao_report.c | 2 +- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/ao.h b/src/ao.h index 97cb75ae..eff959b7 100644 --- a/src/ao.h +++ b/src/ao.h @@ -157,7 +157,7 @@ struct ao_adc { 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 */ }; @@ -523,7 +523,7 @@ struct ao_log_record { int16_t v_batt; } temp_volt; struct { - int16_t drogue; + int16_t apogee; int16_t main; } deploy; struct { @@ -932,7 +932,7 @@ ao_add_stdio(char (*pollchar)(void), */ enum ao_igniter { - ao_igniter_drogue = 0, + ao_igniter_apogee = 0, ao_igniter_main = 1 }; diff --git a/src/ao_adc.c b/src/ao_adc.c index 50f96848..b1252626 100644 --- a/src/ao_adc.c +++ b/src/ao_adc.c @@ -74,7 +74,7 @@ ao_adc_dump(void) __reentrant { 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); } @@ -93,7 +93,7 @@ ao_adc_init(void) (1 << 2) | /* v0.1 temperature */ #endif (1 << 3) | /* battery voltage */ - (1 << 4) | /* drogue sense */ + (1 << 4) | /* apogee sense */ (1 << 5)); /* main sense */ /* enable interrupts */ diff --git a/src/ao_flight.c b/src/ao_flight.c index 980c16be..1307e08d 100644 --- a/src/ao_flight.c +++ b/src/ao_flight.c @@ -347,7 +347,7 @@ ao_flight(void) break; case ao_flight_coast: - /* apogee detect: coast to drogue deploy: + /* apogee detect: coast to apogee drogue deploy: * * barometer: fall at least 10m * @@ -359,8 +359,8 @@ ao_flight(void) */ 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); diff --git a/src/ao_flight_test.c b/src/ao_flight_test.c index 2bf7f2b2..f5f98583 100644 --- a/src/ao_flight_test.c +++ b/src/ao_flight_test.c @@ -37,7 +37,7 @@ struct ao_adc { 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 */ }; @@ -74,14 +74,14 @@ uint8_t ao_adc_head; #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 { diff --git a/src/ao_host.h b/src/ao_host.h index fa03a910..c09ab0fe 100644 --- a/src/ao_host.h +++ b/src/ao_host.h @@ -36,7 +36,7 @@ struct ao_adc { 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 */ }; @@ -71,14 +71,14 @@ uint8_t ao_adc_head; #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 { diff --git a/src/ao_ignite.c b/src/ao_ignite.c index 4093b6a7..aec248e0 100644 --- a/src/ao_ignite.c +++ b/src/ao_ignite.c @@ -63,7 +63,7 @@ ao_igniter_status(enum ao_igniter igniter) value = (AO_IGNITER_CLOSED>>1); switch (igniter) { - case ao_igniter_drogue: + case ao_igniter_apogee: value = adc.sense_d; break; case ao_igniter_main: @@ -83,7 +83,7 @@ ao_igniter_fire(enum ao_igniter igniter) __critical { 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; @@ -106,9 +106,9 @@ ao_igniter(void) 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); @@ -132,8 +132,8 @@ ao_ignite_manual(void) 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); } } @@ -153,12 +153,12 @@ ao_ignite_print_status(enum ao_igniter igniter, __code char *name) __reentrant 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 {main|drogue} Fire igniter. is doit with D&I" }, + { 'i', ao_ignite_manual, "i {main|apogee} Fire igniter. is doit with D&I" }, { 't', ao_ignite_test, "t Test igniter continuity" }, { 0, ao_ignite_manual, NULL }, }; diff --git a/src/ao_log.c b/src/ao_log.c index 44ce90e0..cc6a462b 100644 --- a/src/ao_log.c +++ b/src/ao_log.c @@ -125,7 +125,7 @@ ao_log(void) 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); } diff --git a/src/ao_report.c b/src/ao_report.c index 3b469de6..24143fa4 100644 --- a/src/ao_report.c +++ b/src/ao_report.c @@ -106,7 +106,7 @@ ao_report_igniter_ready(enum ao_igniter igniter) 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--) { -- 2.47.2