diff options
| author | Keith Packard <keithp@keithp.com> | 2013-08-23 11:25:56 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-08-27 21:56:42 -0600 |
| commit | 454a41359b94e9bcf8582420abc359bbab9d8176 (patch) | |
| tree | c82d54cec8aa743b792ff530b910b23f31e42bdb | |
| parent | 6aade70be0a7669d65a8606753d21e4eef5592cd (diff) | |
altos: Rename TeleMetrum v2.0 ADC sense members
Use sense_a and sense_m instead of sense[2]
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | src/core/ao_log_metrum.c | 4 | ||||
| -rw-r--r-- | src/core/ao_telemetry.c | 4 | ||||
| -rw-r--r-- | src/telemetrum-v2.0/ao_pins.h | 13 |
3 files changed, 11 insertions, 10 deletions
diff --git a/src/core/ao_log_metrum.c b/src/core/ao_log_metrum.c index 9c17eeed..43441e7a 100644 --- a/src/core/ao_log_metrum.c +++ b/src/core/ao_log_metrum.c @@ -127,8 +127,8 @@ ao_log(void) if ((int16_t) (log.tick - next_other) >= 0) { log.type = AO_LOG_TEMP_VOLT; log.u.volt.v_batt = ao_data_ring[ao_log_data_pos].adc.v_batt; - log.u.volt.sense_a = ao_data_ring[ao_log_data_pos].adc.sense[0]; - log.u.volt.sense_m = ao_data_ring[ao_log_data_pos].adc.sense[1]; + log.u.volt.sense_a = ao_data_ring[ao_log_data_pos].adc.sense_a; + log.u.volt.sense_m = ao_data_ring[ao_log_data_pos].adc.sense_m; ao_log_metrum(&log); next_other = log.tick + AO_OTHER_INTERVAL; } diff --git a/src/core/ao_telemetry.c b/src/core/ao_telemetry.c index fb40451c..65d7d08f 100644 --- a/src/core/ao_telemetry.c +++ b/src/core/ao_telemetry.c @@ -195,8 +195,8 @@ ao_send_metrum_sensor(void) telemetry.metrum_sensor.height = ao_height; telemetry.metrum_sensor.v_batt = packet->adc.v_batt; - telemetry.metrum_sensor.sense_a = packet->adc.sense[0]; - telemetry.metrum_sensor.sense_m = packet->adc.sense[1]; + telemetry.metrum_sensor.sense_a = packet->adc.sense_a; + telemetry.metrum_sensor.sense_m = packet->adc.sense_m; ao_radio_send(&telemetry, sizeof (telemetry)); } diff --git a/src/telemetrum-v2.0/ao_pins.h b/src/telemetrum-v2.0/ao_pins.h index 36cfc7e0..c4f8c696 100644 --- a/src/telemetrum-v2.0/ao_pins.h +++ b/src/telemetrum-v2.0/ao_pins.h @@ -122,8 +122,8 @@ #define HAS_IGNITE 1 #define HAS_IGNITE_REPORT 1 -#define AO_SENSE_DROGUE(p) ((p)->adc.sense[0]) -#define AO_SENSE_MAIN(p) ((p)->adc.sense[1]) +#define AO_SENSE_DROGUE(p) ((p)->adc.sense_a) +#define AO_SENSE_MAIN(p) ((p)->adc.sense_m) #define AO_IGNITER_CLOSED 400 #define AO_IGNITER_OPEN 60 @@ -145,16 +145,17 @@ #define AO_ADC_NUM_SENSE 2 struct ao_adc { - int16_t sense[AO_ADC_NUM_SENSE]; + int16_t sense_a; + int16_t sense_m; int16_t v_batt; int16_t temp; }; #define AO_ADC_DUMP(p) \ - printf("tick: %5u drogue: %5d main: %5d batt: %5d pbatt: %5d temp: %5d\n", \ + printf("tick: %5u drogue: %5d main: %5d batt: %5d\n", \ (p)->tick, \ - (p)->adc.sense[0], (p)->adc.sense[1], \ - (p)->adc.v_batt, (p)->adc.temp) + (p)->adc.sense_a, (p)->adc.sense_m, \ + (p)->adc.v_batt); #define AO_ADC_SENSE_DROGUE 0 #define AO_ADC_SENSE_DROGUE_PORT (&stm_gpioa) |