X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fcc1111%2Fao_pins.h;h=2f0e2884826107ba51ab49166ad3789827ca7e7c;hp=0923e75de146a16dda07a1719277de53a7548a3c;hb=4d4ad34aec0c75c66162b992f1e52947e4685730;hpb=f1b14932149153a096961fff94191778f88581d9

diff --git a/src/cc1111/ao_pins.h b/src/cc1111/ao_pins.h
index 0923e75d..2f0e2884 100644
--- a/src/cc1111/ao_pins.h
+++ b/src/cc1111/ao_pins.h
@@ -41,8 +41,9 @@
 
 	#define HAS_COMPANION		1
 	#define COMPANION_CS_ON_P1	1
-	#define COMPANION_CS_MASK	0x4	/* CS1 is P1_2 */
-	#define COMPANION_CS		P1_2
+	#define AO_COMPANION_CS_PORT	P1
+	#define AO_COMPANION_CS_PIN	2
+	#define AO_COMPANION_CS		P1_2
 
 	#define AO_LED_RED		1
 	#define LEDS_AVAILABLE		(AO_LED_RED)
@@ -72,9 +73,9 @@
 	#define PACKET_HAS_SLAVE	1
 
 	#define HAS_COMPANION		1
-	#define COMPANION_CS_ON_P1	1
-	#define COMPANION_CS_MASK	0x4	/* CS1 is P1_2 */
-	#define COMPANION_CS		P1_2
+	#define AO_COMPANION_CS_PORT	P1
+	#define AO_COMPANION_CS_PIN	2
+	#define AO_COMPANION_CS		P1_2
 
 	#define AO_LED_RED		1
 	#define LEDS_AVAILABLE		(AO_LED_RED)
@@ -108,9 +109,9 @@
 	#define PACKET_HAS_SLAVE	1
 
 	#define HAS_COMPANION		1
-	#define COMPANION_CS_ON_P1	1
-	#define COMPANION_CS_MASK	0x4	/* CS1 is P1_2 */
-	#define COMPANION_CS		P1_2
+	#define AO_COMPANION_CS_PORT	P1
+	#define AO_COMPANION_CS_PIN	2
+	#define AO_COMPANION_CS		P1_2
 
 	#define AO_LED_RED		1
 	#define LEDS_AVAILABLE		(AO_LED_RED)
@@ -162,6 +163,7 @@
 	#define HAS_ADC			1
 	#define HAS_EEPROM		1
 	#define HAS_LOG			1
+	#define HAS_FORCE_FREQ		1
 	#define USE_INTERNAL_FLASH	1
 	#define HAS_DBG			0
 	#define IGNITE_ON_P2		0
@@ -527,25 +529,47 @@
 #endif /* HAS_ADC */
 
 #if IGNITE_ON_P2
+#define AO_IGNITER_PORT		P2
+#define AO_IGNITER_DROGUE_PORT	AO_IGNITER_PORT
 #define AO_IGNITER_DROGUE	P2_3
 #define AO_IGNITER_MAIN		P2_4
 #define AO_IGNITER_DIR		P2DIR
 #define AO_IGNITER_DROGUE_BIT	(1 << 3)
 #define AO_IGNITER_MAIN_BIT	(1 << 4)
+#define AO_IGNITER_DROGUE_PIN	3
+#define AO_IGNITER_MAIN_PIN	4
 #endif
 
 #if IGNITE_ON_P0
+#define AO_IGNITER_PORT		P0
 #define AO_IGNITER_DROGUE	P0_5
 #define AO_IGNITER_MAIN		P0_4
 #define AO_IGNITER_DIR		P0DIR
 #define AO_IGNITER_DROGUE_BIT	(1 << 5)
 #define AO_IGNITER_MAIN_BIT	(1 << 4)
+#define AO_IGNITER_DROGUE_PIN	5
+#define AO_IGNITER_MAIN_PIN	4
 #endif
 
+#define AO_IGNITER_DROGUE_PORT	AO_IGNITER_PORT
+#define AO_IGNITER_MAIN_PORT	AO_IGNITER_PORT
+
 /* test these values with real igniters */
 #define AO_IGNITER_OPEN		1000
 #define AO_IGNITER_CLOSED	7000
 #define AO_IGNITER_FIRE_TIME	AO_MS_TO_TICKS(50)
 #define AO_IGNITER_CHARGE_TIME	AO_MS_TO_TICKS(2000)
 
+struct ao_adc {
+	int16_t		accel;		/* accelerometer */
+	int16_t		pres;		/* pressure sensor */
+	int16_t		temp;		/* temperature sensor */
+	int16_t		v_batt;		/* battery voltage */
+	int16_t		sense_d;	/* drogue continuity sense */
+	int16_t		sense_m;	/* main continuity sense */
+#if HAS_ACCEL_REF
+	uint16_t	accel_ref;	/* acceleration reference */
+#endif
+};
+
 #endif /* _AO_PINS_H_ */