X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftelefiretwo-v1.0%2Fao_pins.h;h=aa8501c04807c73e3a08c4201e1f07e496fd4838;hb=439a51ed503b74c1739cf150cdc91685653deed0;hp=469e9937b89d9214631e5393abde407b6bf734b1;hpb=9fa46346d576081f99860cad96c91bcf63233649;p=fw%2Faltos

diff --git a/src/telefiretwo-v1.0/ao_pins.h b/src/telefiretwo-v1.0/ao_pins.h
index 469e9937..aa8501c0 100644
--- a/src/telefiretwo-v1.0/ao_pins.h
+++ b/src/telefiretwo-v1.0/ao_pins.h
@@ -99,6 +99,15 @@
 
 #define FAST_TIMER_FREQ		10000	/* .1ms for debouncing */
 
+/*
+ * SPI Flash memory
+ */
+
+#define M25_MAX_CHIPS           1
+#define AO_M25_SPI_CS_PORT      (&stm_gpioa)
+#define AO_M25_SPI_CS_MASK      (1 << 15)
+#define AO_M25_SPI_BUS          AO_SPI_2_PB13_PB14_PB15
+
 /*
  * Radio is a cc1200 connected via SPI
  */
@@ -175,13 +184,18 @@
 #define AO_PAD_ADC_PYRO		2
 #define AO_PAD_ADC_BATT		8
 
+#define AO_PAD_ADC_THRUST	3
+#define AO_PAD_ADC_PRESSURE	18
+
 #define AO_ADC_FIRST_PIN	0
 
-#define AO_NUM_ADC		3
+#define AO_NUM_ADC		5
 
 #define AO_ADC_SQ1		AO_PAD_ADC_0
 #define AO_ADC_SQ2		AO_PAD_ADC_PYRO
 #define AO_ADC_SQ3		AO_PAD_ADC_BATT
+#define AO_ADC_SQ4		AO_PAD_ADC_THRUST
+#define AO_ADC_SQ5		AO_PAD_ADC_PRESSURE
 
 #define AO_PYRO_R_PYRO_SENSE	200
 #define AO_PYRO_R_SENSE_GND	22
@@ -196,17 +210,23 @@ struct ao_adc {
 	int16_t		sense[AO_PAD_NUM];
 	int16_t		pyro;
 	int16_t		batt;
+	int16_t		thrust;
+	int16_t		pressure;
 };
 
 #define AO_ADC_DUMP(p)							\
-	printf ("tick: %5u 0: %5d pyro: %5d batt %5d\n", \
+	printf ("tick: %5u 0: %5d pyro: %5d batt %5d thrust %5d pressure %5d\n", \
 		(p)->tick,						\
 		(p)->adc.sense[0],					\
 		(p)->adc.pyro,						\
-		(p)->adc.batt)
+		(p)->adc.batt,						\
+		(p)->adc.thrust,					\
+		(p)->adc.pressure)
 
 #define AO_ADC_PINS	((1 << AO_PAD_ADC_0) | \
 			 (1 << AO_PAD_ADC_PYRO) | \
-			 (1 << AO_PAD_ADC_BATT))
+			 (1 << AO_PAD_ADC_BATT) | \
+			 (1 << AO_PAD_ADC_THRUST) | \
+			 (1 << AO_PAD_ADC_PRESSURE))
 
 #endif /* _AO_PINS_H_ */