X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Ftelelco-v2.0%2Fao_pins.h;h=e06633145fe7a1dc097c5d4e4d13a3bc6d2749c5;hp=4311bac87178625eeddbbf0d30ad9a46551fecd7;hb=dbc52686c6d9808275c35e0c9c987cbbd9f7859d;hpb=42a261a56606be69b5fb90fd6017c70a1e5d72dd

diff --git a/src/telelco-v2.0/ao_pins.h b/src/telelco-v2.0/ao_pins.h
index 4311bac8..e0663314 100644
--- a/src/telelco-v2.0/ao_pins.h
+++ b/src/telelco-v2.0/ao_pins.h
@@ -50,10 +50,15 @@
 #define USE_STORAGE_CONFIG	0
 #define HAS_USB			1
 #define HAS_BEEP		1
+#define BEEPER_TIMER		3
+#define BEEPER_CHANNEL		1
+#define BEEPER_PORT		(&stm_gpioc)
+#define BEEPER_PIN		6
 #define HAS_RADIO		1
 #define HAS_RADIO_RATE		1
 #define HAS_TELEMETRY		0
 #define HAS_AES			1
+#define HAS_STATIC_TEST		0
 
 #define HAS_SPI_1		0
 #define SPI_1_PA5_PA6_PA7	0
@@ -98,13 +103,7 @@
 
 #define LOW_LEVEL_DEBUG		0
 
-#define LED_PER_LED		1
-#define LED_TYPE		uint16_t
-
-#define LED_ENABLE_BITS		((1 << STM_RCC_AHBENR_GPIOAEN) |	\
-				 (1 << STM_RCC_AHBENR_GPIOCEN) |	\
-				 (1 << STM_RCC_AHBENR_GPIODEN) |	\
-				 (1 << STM_RCC_AHBENR_GPIOEEN))
+#define HAS_LED			1
 
 /* PC7 - PC9, LED 0 - 2 */
 #define LED_0_PORT		(&stm_gpioc)
@@ -146,56 +145,23 @@
 #define LED_15_PORT		(&stm_gpioa)
 #define LED_15_PIN		5
 
-#define LED_PIN_RED		0
-#define LED_PIN_AMBER		1
-#define LED_PIN_GREEN		2
-#define LED_PIN_BOX		3
-#define LED_PIN_PAD		4
-#define LED_PIN_DRAG		5
-#define LED_PIN_CONTINUITY_7	6
-#define LED_PIN_CONTINUITY_6	7
-#define LED_PIN_CONTINUITY_5	8
-#define LED_PIN_CONTINUITY_4	9
-#define LED_PIN_CONTINUITY_3	10
-#define LED_PIN_CONTINUITY_2	11
-#define LED_PIN_CONTINUITY_1	12
-#define LED_PIN_CONTINUITY_0	13
-#define LED_PIN_REMOTE_ARM	14
-#define LED_PIN_FIRE		15
-#define AO_LED_RED		(1 << LED_PIN_RED)
-#define AO_LED_AMBER		(1 << LED_PIN_AMBER)
-#define AO_LED_GREEN		(1 << LED_PIN_GREEN)
-#define AO_LED_BOX		(1 << LED_PIN_BOX)
-#define AO_LED_PAD		(1 << LED_PIN_PAD)
-#define AO_LED_DRAG		(1 << LED_PIN_DRAG)
-#define AO_LED_CONTINUITY_7	(1 << LED_PIN_CONTINUITY_7)
-#define AO_LED_CONTINUITY_6	(1 << LED_PIN_CONTINUITY_6)
-#define AO_LED_CONTINUITY_5	(1 << LED_PIN_CONTINUITY_5)
-#define AO_LED_CONTINUITY_4	(1 << LED_PIN_CONTINUITY_4)
-#define AO_LED_CONTINUITY_3	(1 << LED_PIN_CONTINUITY_3)
-#define AO_LED_CONTINUITY_2	(1 << LED_PIN_CONTINUITY_2)
-#define AO_LED_CONTINUITY_1	(1 << LED_PIN_CONTINUITY_1)
-#define AO_LED_CONTINUITY_0	(1 << LED_PIN_CONTINUITY_0)
+#define AO_LED_RED		AO_LED_0
+#define AO_LED_AMBER		AO_LED_1
+#define AO_LED_GREEN		AO_LED_2
+#define AO_LED_BOX		AO_LED_3
+#define AO_LED_PAD		AO_LED_4
+#define AO_LED_DRAG		AO_LED_5
+#define AO_LED_CONTINUITY_7	AO_LED_6
+#define AO_LED_CONTINUITY_6	AO_LED_7
+#define AO_LED_CONTINUITY_5	AO_LED_8
+#define AO_LED_CONTINUITY_4	AO_LED_9
+#define AO_LED_CONTINUITY_3	AO_LED_10
+#define AO_LED_CONTINUITY_2	AO_LED_11
+#define AO_LED_CONTINUITY_1	AO_LED_12
+#define AO_LED_CONTINUITY_0	AO_LED_13
 #define AO_LED_CONTINUITY_NUM	8
-#define AO_LED_REMOTE_ARM	(1 << LED_PIN_REMOTE_ARM)
-#define AO_LED_FIRE		(1 << LED_PIN_FIRE)
-
-#define LEDS_AVAILABLE		(AO_LED_RED |		\
-				 AO_LED_AMBER |		\
-				 AO_LED_GREEN |		\
-				 AO_LED_BOX |		\
-				 AO_LED_PAD |		\
-				 AO_LED_DRAG |		\
-				 AO_LED_CONTINUITY_7 |	\
-				 AO_LED_CONTINUITY_6 |	\
-				 AO_LED_CONTINUITY_5 |	\
-				 AO_LED_CONTINUITY_4 |	\
-				 AO_LED_CONTINUITY_3 |	\
-				 AO_LED_CONTINUITY_2 |	\
-				 AO_LED_CONTINUITY_1 |	\
-				 AO_LED_CONTINUITY_0 |	\
-				 AO_LED_REMOTE_ARM |	\
-				 AO_LED_FIRE)
+#define AO_LED_REMOTE_ARM	AO_LED_14
+#define AO_LED_FIRE		AO_LED_15
 
 /* LCD displays */
 
@@ -364,8 +330,9 @@ struct ao_adc {
 };
 
 #define AO_ADC_DUMP(p) \
-	printf("batt: %5d\n", p.v_batt)
+	printf("batt: %5d\n", (p)->v_batt)
 
+#define HAS_ADC_SINGLE		1
 #define HAS_ADC_TEMP		0
 #define HAS_BATTERY_REPORT	1