X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Feasymini-v0.1%2Fao_pins.h;h=6f102dbecfb41a4b785310e3004b85489047f0e7;hb=0dd148e388944d8d265da51d62806c4a00b2c13d;hp=12d6c5db86f86f0af491bcc6aab8420b6073073d;hpb=a87a8e8067d7b2d0ff3a3274af9f1e919b5b7793;p=fw%2Faltos

diff --git a/src/easymini-v0.1/ao_pins.h b/src/easymini-v0.1/ao_pins.h
index 12d6c5db..6f102dbe 100644
--- a/src/easymini-v0.1/ao_pins.h
+++ b/src/easymini-v0.1/ao_pins.h
@@ -18,6 +18,8 @@
 #define HAS_BEEP	1
 #define	HAS_LED		1
 
+#define IS_FLASH_LOADER	0
+
 /* Crystal on the board */
 #define AO_LPC_CLKIN	12000000
 
@@ -38,12 +40,15 @@
 
 #define HAS_USB_CONNECT	0
 #define HAS_USB_VBUS	0
+#define HAS_USB_PULLUP	1
+#define AO_USB_PULLUP_PORT	0
+#define AO_USB_PULLUP_PIN	20
 
 #define PACKET_HAS_SLAVE	0
 
 /* 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
@@ -88,6 +93,8 @@
 #define HAS_APRS		0
 #define HAS_LOG			1
 #define USE_INTERNAL_FLASH	0
+#define HAS_IGNITE		1
+#define HAS_IGNITE_REPORT	1
 
 #define AO_DATA_RING		16
 
@@ -104,7 +111,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;
 };
@@ -124,6 +131,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)