summaryrefslogtreecommitdiff
path: root/src/easymini-v0.1/ao_pins.h
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2013-05-19 23:07:54 -0700
committerKeith Packard <keithp@keithp.com>2013-05-19 23:07:54 -0700
commit57b4d82dee10b142b820aa306028a288a85214f6 (patch)
tree9150c9a89e622e63aa9164d11c3127652bd553a4 /src/easymini-v0.1/ao_pins.h
parent27e9b93f3d35890a49575b2ead1983ce3c2fc213 (diff)
Add Mini logging format. Use in EasyMinilpc
This is a 16-byte record that includes all of the sensor data in each sensor record, along with records for flight state changes. Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src/easymini-v0.1/ao_pins.h')
-rw-r--r--src/easymini-v0.1/ao_pins.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/easymini-v0.1/ao_pins.h b/src/easymini-v0.1/ao_pins.h
index 4102c21d..d4fbe7a1 100644
--- a/src/easymini-v0.1/ao_pins.h
+++ b/src/easymini-v0.1/ao_pins.h
@@ -106,7 +106,7 @@
#define AO_ADC_2 1
struct ao_adc {
- int16_t sense_d;
+ int16_t sense_a;
int16_t sense_m;
int16_t v_batt;
};
@@ -126,6 +126,9 @@ struct ao_adc {
#define AO_IGNITER_MAIN_PIN 3
#define AO_IGNITER_SET_MAIN(v) ao_gpio_set(AO_IGNITER_MAIN_PORT, AO_IGNITER_MAIN_PIN, AO_IGNITER_MAIN, v)
+#define AO_SENSE_DROGUE(p) ((p)->adc.sense_a)
+#define AO_SENSE_MAIN(p) ((p)->adc.sense_m)
+
#define AO_ADC_DUMP(p) \
- printf("tick: %5u drogue: %5d main: %5d batt: %5d\n", \
- (p)->tick, (p)->adc.sense_d, (p)->adc.sense_m, (p)->adc.v_batt)
+ printf("tick: %5u apogee: %5d main: %5d batt: %5d\n", \
+ (p)->tick, (p)->adc.sense_a, (p)->adc.sense_m, (p)->adc.v_batt)