X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Feasymini-v0.1%2Fao_pins.h;h=c09fb4c2c58d2e199ceeae64ebd9e96bac4f323f;hp=2307d7d2c580badeb541d65467456e9734b984af;hb=a0dd93ccf0920260b41c4003955617fd0cd1c8b4;hpb=b9bb088a36fd351809f4c378356327ffa663c974

diff --git a/src/easymini-v0.1/ao_pins.h b/src/easymini-v0.1/ao_pins.h
index 2307d7d2..c09fb4c2 100644
--- a/src/easymini-v0.1/ao_pins.h
+++ b/src/easymini-v0.1/ao_pins.h
@@ -18,6 +18,10 @@
 #define HAS_BEEP	1
 #define	HAS_LED		1
 
+#define AO_STACK_SIZE	384
+
+#define IS_FLASH_LOADER	0
+
 /* Crystal on the board */
 #define AO_LPC_CLKIN	12000000
 
@@ -36,14 +40,17 @@
 
 #define HAS_USB		1
 
-#define HAS_USB_CONNECT	1
-#define HAS_USB_VBUS	1
+#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
@@ -73,10 +80,10 @@
 #define AO_MS5607_PRIVATE_PINS	0
 #define AO_MS5607_CS_PORT	0
 #define AO_MS5607_CS_PIN	7
-#define AO_MS5607_CS_MASK	(1 << AO_MS5607_CS)
+#define AO_MS5607_CS_MASK	(1 << AO_MS5607_CS_PIN)
 #define AO_MS5607_MISO_PORT	0
 #define AO_MS5607_MISO_PIN	8
-#define AO_MS5607_MISO_MASK	(1 << AO_MS5607_MISO)
+#define AO_MS5607_MISO_MASK	(1 << AO_MS5607_MISO_PIN)
 #define AO_MS5607_SPI_INDEX	0
 
 #define HAS_ACCEL		0
@@ -88,6 +95,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 +113,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;
 };
@@ -117,13 +126,16 @@ struct ao_adc {
 #define AO_IGNITER_OPEN		60
 
 #define AO_IGNITER_DROGUE_PORT	0
-#define AO_IGNITER_DROGUE_PIN	4
+#define AO_IGNITER_DROGUE_PIN	2
 #define AO_IGNITER_SET_DROGUE(v)	ao_gpio_set(AO_IGNITER_DROGUE_PORT, AO_IGNITER_DROGUE_PIN, AO_IGNITER_DROGUE, v)
 
 #define AO_IGNITER_MAIN_PORT	0
-#define AO_IGNITER_MAIN_PIN	5
+#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)