X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftelemega-v0.3%2Fao_pins.h;h=a5a9eaf43d8bd8ac5dff72b6258039795bed4ece;hb=9c53ad6f8222878a26efecebd3bb1d1fe054a4b6;hp=578b1e4c001e9e7529eea24be032e2d4af7ba611;hpb=cef4e3ee95037050ae859fb2fdc0a57373764bd8;p=fw%2Faltos

diff --git a/src/telemega-v0.3/ao_pins.h b/src/telemega-v0.3/ao_pins.h
index 578b1e4c..a5a9eaf4 100644
--- a/src/telemega-v0.3/ao_pins.h
+++ b/src/telemega-v0.3/ao_pins.h
@@ -111,6 +111,7 @@
 #define HAS_GPS			1
 #define HAS_FLIGHT		1
 #define HAS_ADC			1
+#define HAS_ADC_TEMP		1
 #define HAS_LOG			1
 
 /*
@@ -120,28 +121,35 @@
 #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_PYRO(p,n)	((p)->adc.sense[n])
+#define AO_SENSE_DROGUE(p)	((p)->adc.sense[4])
+#define AO_SENSE_MAIN(p)	((p)->adc.sense[5])
 #define AO_IGNITER_CLOSED	400
 #define AO_IGNITER_OPEN		60
 
-#define AO_IGNITER_DROGUE_PORT	(&stm_gpiod)
-#define AO_IGNITER_DROGUE_PIN	6
+/* Pyro A */
+#define AO_PYRO_PORT_0	(&stm_gpiod)
+#define AO_PYRO_PIN_0	6
 
-#define AO_IGNITER_MAIN_PORT	(&stm_gpiod)
-#define AO_IGNITER_MAIN_PIN	7
+/* Pyro B */
+#define AO_PYRO_PORT_1	(&stm_gpiod)
+#define AO_PYRO_PIN_1	7
 
-#define AO_PYRO_PORT_0	(&stm_gpiob)
-#define AO_PYRO_PIN_0	5
+/* Pyro C */
+#define AO_PYRO_PORT_2	(&stm_gpiob)
+#define AO_PYRO_PIN_2	5
 
-#define AO_PYRO_PORT_1	(&stm_gpioe)
-#define AO_PYRO_PIN_1	4
+/* Pyro D */
+#define AO_PYRO_PORT_3	(&stm_gpioe)
+#define AO_PYRO_PIN_3	4
 
-#define AO_PYRO_PORT_2	(&stm_gpioe)
-#define AO_PYRO_PIN_2	6
+/* Drogue */
+#define AO_IGNITER_DROGUE_PORT	(&stm_gpioe)
+#define AO_IGNITER_DROGUE_PIN	6
 
-#define AO_PYRO_PORT_3	(&stm_gpioe)
-#define AO_PYRO_PIN_3	5
+/* Main */
+#define AO_IGNITER_MAIN_PORT	(&stm_gpioe)
+#define AO_IGNITER_MAIN_PIN	5
 
 /* Number of general purpose pyro channels available */
 #define AO_PYRO_NUM	4
@@ -162,6 +170,13 @@ struct ao_adc {
 	int16_t			temp;
 };
 
+#define AO_ADC_DUMP(p) \
+	printf("tick: %5u A: %5d B: %5d C: %5d D: %5d drogue: %5d main: %5d batt: %5d pbatt: %5d temp: %5d\n", \
+	       (p)->tick, \
+	       (p)->adc.sense[0], (p)->adc.sense[1], (p)->adc.sense[2], \
+	       (p)->adc.sense[3], (p)->adc.sense[4], (p)->adc.sense[5], \
+	       (p)->adc.v_batt, (p)->adc.v_pbatt, (p)->adc.temp)
+
 #define AO_ADC_SENSE_A		0
 #define AO_ADC_SENSE_A_PORT	(&stm_gpioa)
 #define AO_ADC_SENSE_A_PIN	0
@@ -178,13 +193,13 @@ struct ao_adc {
 #define AO_ADC_SENSE_D_PORT	(&stm_gpioa)
 #define AO_ADC_SENSE_D_PIN	3
 
-#define AO_ADC_SENSE_E		4
-#define AO_ADC_SENSE_E_PORT	(&stm_gpioa)
-#define AO_ADC_SENSE_E_PIN	4
+#define AO_ADC_SENSE_DROGUE	4
+#define AO_ADC_SENSE_DROGUE_PORT	(&stm_gpioa)
+#define AO_ADC_SENSE_DROGUE_PIN	4
 
-#define AO_ADC_SENSE_F		22
-#define AO_ADC_SENSE_F_PORT	(&stm_gpioe)
-#define AO_ADC_SENSE_F_PIN	7
+#define AO_ADC_SENSE_MAIN	22
+#define AO_ADC_SENSE_MAIN_PORT	(&stm_gpioe)
+#define AO_ADC_SENSE_MAIN_PIN	7
 
 #define AO_ADC_V_BATT		8
 #define AO_ADC_V_BATT_PORT	(&stm_gpiob)
@@ -210,10 +225,10 @@ struct ao_adc {
 #define AO_ADC_PIN2_PIN		AO_ADC_SENSE_C_PIN
 #define AO_ADC_PIN3_PORT	AO_ADC_SENSE_D_PORT
 #define AO_ADC_PIN3_PIN		AO_ADC_SENSE_D_PIN
-#define AO_ADC_PIN4_PORT	AO_ADC_SENSE_E_PORT
-#define AO_ADC_PIN4_PIN		AO_ADC_SENSE_E_PIN
-#define AO_ADC_PIN5_PORT	AO_ADC_SENSE_F_PORT
-#define AO_ADC_PIN5_PIN		AO_ADC_SENSE_F_PIN
+#define AO_ADC_PIN4_PORT	AO_ADC_SENSE_DROGUE_PORT
+#define AO_ADC_PIN4_PIN		AO_ADC_SENSE_DROGUE_PIN
+#define AO_ADC_PIN5_PORT	AO_ADC_SENSE_MAIN_PORT
+#define AO_ADC_PIN5_PIN		AO_ADC_SENSE_MAIN_PIN
 #define AO_ADC_PIN6_PORT	AO_ADC_V_BATT_PORT
 #define AO_ADC_PIN6_PIN		AO_ADC_V_BATT_PIN
 #define AO_ADC_PIN7_PORT	AO_ADC_V_PBATT_PORT
@@ -225,8 +240,8 @@ struct ao_adc {
 #define AO_ADC_SQ2		AO_ADC_SENSE_B
 #define AO_ADC_SQ3		AO_ADC_SENSE_C
 #define AO_ADC_SQ4		AO_ADC_SENSE_D
-#define AO_ADC_SQ5		AO_ADC_SENSE_E
-#define AO_ADC_SQ6		AO_ADC_SENSE_F
+#define AO_ADC_SQ5		AO_ADC_SENSE_DROGUE
+#define AO_ADC_SQ6		AO_ADC_SENSE_MAIN
 #define AO_ADC_SQ7		AO_ADC_V_BATT
 #define AO_ADC_SQ8		AO_ADC_V_PBATT
 #define AO_ADC_SQ9		AO_ADC_TEMP
@@ -294,7 +309,7 @@ struct ao_adc {
  * mpu6000
  */
 
-#define HAS_MPU6000		1	
+#define HAS_MPU6000		1
 #define AO_MPU6000_INT_PORT	(&stm_gpioe)
 #define AO_MPU6000_INT_PIN	0
 #define AO_MPU6000_SPI_BUS	AO_SPI_1_PE13_PE14_PE15