X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftelefireone-v1.0%2Fao_pins.h;h=cd8eb65861d3b4b7d8bc460a3fa489524c1246fd;hb=HEAD;hp=b2f5a5ab827920451f30ea960150c13cd5941829;hpb=d0053c5e2cc7b75b642ff4727a1ef874d323db9d;p=fw%2Faltos

diff --git a/src/telefireone-v1.0/ao_pins.h b/src/telefireone-v1.0/ao_pins.h
index b2f5a5ab..0d8a206c 100644
--- a/src/telefireone-v1.0/ao_pins.h
+++ b/src/telefireone-v1.0/ao_pins.h
@@ -25,8 +25,9 @@
 
 #define HAS_FLIGHT		0
 #define HAS_USB			1
-#define HAS_BEEP		1
+#define HAS_BEEP		0
 #define BEEPER_CHANNEL		4
+#define BEEPER_TIMER		3
 #define HAS_GPS			0
 #define HAS_SERIAL_1		0
 #define HAS_ADC			1
@@ -41,6 +42,8 @@
 #define AO_DATA_RING		32
 #define HAS_FIXED_PAD_BOX	1
 
+#define AO_LOG_FORMAT		AO_LOG_FORMAT_TELEFIRETWO
+
 #define LOG_ERASE_MARK		0x55
 
 /* 8MHz High speed external crystal */
@@ -120,7 +123,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)
@@ -151,7 +153,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	(0x1 << 4)
 
 #define LEDS_AVAILABLE		(LED_PORT_0_MASK|LED_PORT_1_MASK)
@@ -190,6 +192,8 @@
 
 #define AO_ADC_FIRST_PIN	0
 
+#define AO_ADC_REFERENCE_DV	33
+
 #define AO_NUM_ADC		5
 
 #define AO_ADC_SQ1		AO_PAD_ADC_0
@@ -198,6 +202,17 @@
 #define AO_ADC_SQ4		AO_PAD_ADC_THRUST
 #define AO_ADC_SQ5		AO_PAD_ADC_PRESSURE
 
+#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
+
 #define AO_PYRO_R_PYRO_SENSE	200
 #define AO_PYRO_R_SENSE_GND	22
 
@@ -216,7 +231,7 @@ struct ao_adc {
 };
 
 #define AO_ADC_DUMP(p)							\
-	printf ("tick: %5u 0: %5d pyro: %5d batt %5d thrust %5d pressure %5d\n", \
+	printf ("tick: %5lu 0: %5d pyro: %5d batt %5d thrust %5d pressure %5d\n", \
 		(p)->tick,						\
 		(p)->adc.sense[0],					\
 		(p)->adc.pyro,						\