X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Ftelefireeight-v1.0%2Fao_pins.h;h=b1952278815d98dd2ecc18e92fa4e4dc7d896826;hp=15e1fa111c96f0623b0f75d3c9ba62bfe666a5a4;hb=HEAD;hpb=99642f9c4f89aa5577376a9cd118e7cff26e2762

diff --git a/src/telefireeight-v1.0/ao_pins.h b/src/telefireeight-v1.0/ao_pins.h
index 15e1fa11..4c014718 100644
--- a/src/telefireeight-v1.0/ao_pins.h
+++ b/src/telefireeight-v1.0/ao_pins.h
@@ -25,6 +25,10 @@
 #define HAS_FLIGHT		0
 #define HAS_USB			1
 #define HAS_BEEP		0
+#define BEEPER_TIMER		3
+#define BEEPER_CHANNEL		1
+#define BEEPER_PORT		(&stm_gpioc)
+#define BEEPER_PIN		6
 #define HAS_GPS			0
 #define HAS_SERIAL_1		0
 #define HAS_ADC			1
@@ -99,7 +103,6 @@
 #define AO_CC1200_SPI_CS_PIN	11
 #define AO_CC1200_SPI_BUS	AO_SPI_1_PE13_PE14_PE15
 #define AO_CC1200_SPI		stm_spi1
-#define AO_CC1200_SPI_SPEED	AO_SPI_SPEED_FAST
 
 #define AO_CC1200_INT_PORT	(&stm_gpioe)
 #define AO_CC1200_INT_PIN	(12)
@@ -107,7 +110,7 @@
 #define AO_CC1200_INT_GPIO	2
 #define AO_CC1200_INT_GPIO_IOCFG	CC1200_IOCFG2
 
-#define LED_PER_LED		1
+#define HAS_LED			1
 #define LED_TYPE		uint16_t
 
 /* Continuity leds 1-8 */
@@ -128,14 +131,8 @@
 #define LED_7_PORT		(&stm_gpioa)
 #define LED_7_PIN		10
 
-#define LED_PIN_CONTINUITY_0	0
-#define LED_PIN_CONTINUITY_1	1
-#define LED_PIN_CONTINUITY_2	2
-#define LED_PIN_CONTINUITY_3	3
-#define LED_PIN_CONTINUITY_4	4
-#define LED_PIN_CONTINUITY_5	5
-#define LED_PIN_CONTINUITY_6	6
-#define LED_PIN_CONTINUITY_7	7
+#define AO_LED_CONTINUITY(c)	((AO_LED_TYPE) (1 << (c)))
+#define AO_LED_CONTINUITY_MASK	(0xff)
 
 /* ARM */
 #define LED_8_PORT		(&stm_gpioe)
@@ -151,19 +148,10 @@
 #define LED_11_PORT		(&stm_gpioe)
 #define LED_11_PIN		6
 
-#define LED_PIN_GREEN		9
-#define LED_PIN_AMBER		10
-#define LED_PIN_RED		11
-
-#define AO_LED_CONTINUITY(c)	(1 << (c))
-#define AO_LED_CONTINUITY_MASK	(0xff)
-
-#define AO_LED_ARMED		(1 << LED_PIN_ARMED)
-#define AO_LED_GREEN		(1 << LED_PIN_GREEN)
-#define AO_LED_AMBER		(1 << LED_PIN_AMBER)
-#define AO_LED_RED		(1 << LED_PIN_RED)
-
-#define LEDS_AVAILABLE		(0xfff)
+#define AO_LED_ARMED		AO_LED_8
+#define AO_LED_GREEN		AO_LED_9
+#define AO_LED_AMBER		AO_LED_10
+#define AO_LED_RED		AO_LED_11
 
 /* Alarm A */
 #define AO_SIREN
@@ -322,7 +310,7 @@ struct ao_adc {
 };
 
 #define AO_ADC_DUMP(p)							\
-	printf ("tick: %5u "						\
+	printf ("tick: %5lu "						\
 		"0: %5d 1: %5d 2: %5d 3: %5d "				\
 		"4: %5d 5: %5d 6: %5d 7: %5d "				\
 		"pyro: %5d batt: %5d\n",				\