X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftelefireeight-v2.0%2Fao_pins.h;h=91bfd5e6229bd96817d2b4e87c8ac474cc140c59;hb=52e9443d540aa5d3f29576a0440149b1b0f9c359;hp=c15e06bf1e4adf70167cf06315b09443f443d1c9;hpb=f29b55691c9f160898b49bf15f46a88ae00b115f;p=fw%2Faltos

diff --git a/src/telefireeight-v2.0/ao_pins.h b/src/telefireeight-v2.0/ao_pins.h
index c15e06bf..91bfd5e6 100644
--- a/src/telefireeight-v2.0/ao_pins.h
+++ b/src/telefireeight-v2.0/ao_pins.h
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2010 Keith Packard <keithp@keithp.com>
+ * Copyright © 2019 Keith Packard <keithp@keithp.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,10 +25,6 @@
 #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
@@ -37,9 +33,6 @@
 #define HAS_LOG			0
 #define HAS_PAD			1
 #define USE_INTERNAL_FLASH	1
-#define IGNITE_ON_P0		0
-#define PACKET_HAS_MASTER	0
-#define PACKET_HAS_SLAVE	0
 #define AO_DATA_RING		32
 #define USE_EEPROM_CONFIG	1
 #define USE_STORAGE_CONFIG	0
@@ -75,9 +68,6 @@
 #define SPI_1_PB3_PB4_PB5	0
 #define SPI_1_PE13_PE14_PE15	1
 #define SPI_1_GPIO		(&stm_gpioe)
-#define SPI_1_SCK		13
-#define SPI_1_MISO		14
-#define SPI_1_MOSI		15
 #define SPI_1_OSPEEDR		STM_OSPEEDR_10MHz
 
 #define HAS_SPI_2		0
@@ -88,11 +78,6 @@
 
 #define HAS_I2C_2		0
 
-#define PACKET_HAS_SLAVE	0
-#define PACKET_HAS_MASTER	0
-
-#define FAST_TIMER_FREQ		10000	/* .1ms for debouncing */
-
 /*
  * Radio is a cc1200 connected via SPI
  */
@@ -103,7 +88,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)
@@ -132,14 +116,14 @@
 #define LED_7_PORT		(&stm_gpioa)
 #define LED_7_PIN		10
 
-#define AO_LED_CONTINUITY(c)	(1 << (c))
+#define AO_LED_CONTINUITY(c)	((AO_LED_TYPE) (1 << (c)))
 #define AO_LED_CONTINUITY_MASK	(0xff)
 
 /* ARM */
 #define LED_8_PORT		(&stm_gpioe)
 #define LED_8_PIN		3
 
-#define LED_PIN_ARMED		8
+#define AO_LED_ARMED		AO_LED_8
 
 /* RF good/marginal/poor */
 #define LED_9_PORT		(&stm_gpioe)
@@ -149,7 +133,6 @@
 #define LED_11_PORT		(&stm_gpioe)
 #define LED_11_PIN		6
 
-#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
@@ -311,7 +294,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",				\