X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftelefiretwo-v0.1%2Fao_pins.h;h=dedd0fad3ece4345d47e0c35f665518a6965e739;hb=refs%2Fheads%2Fmaster;hp=1e5c0d09bac5c943979c0341b37431e32532faa2;hpb=1dc31a46f1d1adfdeab444664e581a780d995bf7;p=fw%2Faltos

diff --git a/src/telefiretwo-v0.1/ao_pins.h b/src/telefiretwo-v0.1/ao_pins.h
index 1e5c0d09..baf051a4 100644
--- a/src/telefiretwo-v0.1/ao_pins.h
+++ b/src/telefiretwo-v0.1/ao_pins.h
@@ -110,7 +110,6 @@
 #define AO_CC1200_SPI_CS_PIN	7
 #define AO_CC1200_SPI_BUS	AO_SPI_2_PB13_PB14_PB15
 #define AO_CC1200_SPI		stm_spi2
-#define AO_CC1200_SPI_SPEED	AO_SPI_SPEED_FAST
 
 #define AO_CC1200_INT_PORT		(&stm_gpiob)
 #define AO_CC1200_INT_PIN		(11)
@@ -142,7 +141,7 @@
 #define LED_PIN_ARMED		5
 
 #define AO_LED_ARMED		(1 << LED_PIN_ARMED)
-#define AO_LED_CONTINUITY(c)	(1 << (4 - (c)))
+#define AO_LED_CONTINUITY(c)	((AO_LED_TYPE) (1 << (4 - (c))))
 #define AO_LED_CONTINUITY_MASK	(0x3 << 3)
 
 #define LEDS_AVAILABLE		(LED_PORT_0_MASK|LED_PORT_1_MASK)
@@ -191,6 +190,19 @@
 
 #define HAS_ADC_TEMP		0
 
+#define AO_ADC_REFERENCE_DV	33
+
+#define AO_PAD_R_V_BATT_BATT_SENSE	200
+#define AO_PAD_R_BATT_SENSE_GND		22
+
+#define AO_PAD_R_V_BATT_V_PYRO		200
+#define AO_PAD_R_V_PYRO_PYRO_SENSE	200
+#define AO_PAD_R_PYRO_SENSE_GND		22
+
+#undef AO_PAD_R_V_PYRO_IGNITER
+#define AO_PAD_R_IGNITER_IGNITER_SENSE	200
+#define AO_PAD_R_IGNITER_SENSE_GND	22
+
 struct ao_adc {
 	int16_t		sense[AO_PAD_NUM];
 	int16_t		pyro;
@@ -198,7 +210,7 @@ struct ao_adc {
 };
 
 #define AO_ADC_DUMP(p)							\
-	printf ("tick: %5u 0: %5d 1: %5d pyro: %5d batt %5d\n", \
+	printf ("tick: %5lu 0: %5d 1: %5d pyro: %5d batt %5d\n", \
 		(p)->tick,						\
 		(p)->adc.sense[0],					\
 		(p)->adc.sense[1],					\