X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Feasymini-v0.1%2Fao_pins.h;h=e14e1eb40e9cb30fa3deae2b467f17988e642b44;hp=4102c21d196be8f3d439ce1cb3c9a4203f7465dd;hb=1676c7dbc3dcce2962be9ef9a58d37c7b48e3c0f;hpb=27e9b93f3d35890a49575b2ead1983ce3c2fc213

diff --git a/src/easymini-v0.1/ao_pins.h b/src/easymini-v0.1/ao_pins.h
index 4102c21d..e14e1eb4 100644
--- a/src/easymini-v0.1/ao_pins.h
+++ b/src/easymini-v0.1/ao_pins.h
@@ -43,7 +43,7 @@
 
 /* USART */
 
-#define HAS_SERIAL		1
+#define HAS_SERIAL		0
 #define USE_SERIAL_0_STDIN	1
 #define SERIAL_0_18_19		1
 #define SERIAL_0_14_15		0
@@ -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)