X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fcc1111%2Fao_pins.h;h=2b19f1f6b4bc20f986443c904e400f6f171f871a;hb=bd440afc2a6e37b74fffcf1b977e149485095316;hp=e28a7b65da256149e7a49de478bfa563644b1cd6;hpb=03dc80d15a2f8fe9d7340351226dadd8bc3cfdb9;p=fw%2Faltos

diff --git a/src/cc1111/ao_pins.h b/src/cc1111/ao_pins.h
index e28a7b65..2b19f1f6 100644
--- a/src/cc1111/ao_pins.h
+++ b/src/cc1111/ao_pins.h
@@ -18,12 +18,16 @@
 #ifndef _AO_PINS_H_
 #define _AO_PINS_H_
 
-#define HAS_RADIO	1
+#define HAS_RADIO		1
+#define DISABLE_LOG_SPACE	1
 
 #if defined(TELEMETRUM_V_1_0)
+	/* Discontinued and was never built with CC1111 chips needing this */
+	#define NEEDS_CC1111_CLOCK_HACK	0
 	#define HAS_FLIGHT		1
 	#define HAS_USB			1
 	#define HAS_BEEP		1
+	#define HAS_BEEP_CONFIG		0
 	#define HAS_GPS			1
 	#define HAS_SERIAL_1		1
 	#define HAS_ADC			1
@@ -55,9 +59,13 @@
 #endif
 
 #if defined(TELEMETRUM_V_1_1)
+	/* Discontinued and was never built with CC1111 chips needing this */
+	#define NEEDS_CC1111_CLOCK_HACK	0
 	#define HAS_FLIGHT		1
 	#define HAS_USB			1
 	#define HAS_BEEP		1
+	#define HAS_BEEP_CONFIG		0
+	#define HAS_BATTERY_REPORT	1
 	#define HAS_GPS			1
 	#define HAS_SERIAL_1		1
 	#define HAS_ADC			1
@@ -91,9 +99,13 @@
 #endif
 
 #if defined(TELEMETRUM_V_1_2)
+	/* Discontinued and was never built with CC1111 chips needing this */
+	#define NEEDS_CC1111_CLOCK_HACK	0
 	#define HAS_FLIGHT		1
 	#define HAS_USB			1
 	#define HAS_BEEP		1
+	#define HAS_BEEP_CONFIG		0
+	#define HAS_BATTERY_REPORT	1
 	#define HAS_GPS			1
 	#define HAS_SERIAL_1		1
 	#define HAS_ADC			1
@@ -155,6 +167,8 @@
 #endif
 
 #if defined(TELEMINI_V_1_0)
+	/* Discontinued and was never built with CC1111 chips needing this */
+	#define NEEDS_CC1111_CLOCK_HACK	0
 	#define HAS_FLIGHT		1
 	#define HAS_USB			0
 	#define HAS_BEEP		0
@@ -163,6 +177,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
@@ -181,6 +196,8 @@
 #endif
 
 #if defined(TELENANO_V_0_1)
+	/* Discontinued and was never built with CC1111 chips needing this */
+	#define NEEDS_CC1111_CLOCK_HACK	0
 	#define HAS_FLIGHT		1
 	#define HAS_USB			0
 	#define HAS_BEEP		0
@@ -206,9 +223,12 @@
 #endif
 
 #if defined(TELEMETRUM_V_0_1)
+	/* Discontinued and was never built with CC1111 chips needing this */
+	#define NEEDS_CC1111_CLOCK_HACK	0
 	#define HAS_FLIGHT		1
 	#define HAS_USB			1
 	#define HAS_BEEP		1
+	#define HAS_BEEP_CONFIG		0
 	#define HAS_GPS			1
 	#define HAS_SERIAL_1		1
 	#define HAS_ADC			1
@@ -236,6 +256,8 @@
 #endif
 
 #if defined(TELEDONGLE_V_0_1)
+	/* Discontinued and was never built with CC1111 chips needing this */
+	#define NEEDS_CC1111_CLOCK_HACK	0
 	#define HAS_FLIGHT		0
 	#define HAS_USB			1
 	#define HAS_BEEP		0
@@ -264,6 +286,8 @@
 #endif
 
 #if defined(TIDONGLE)
+	/* Discontinued and was never built with CC1111 chips needing this */
+	#define NEEDS_CC1111_CLOCK_HACK	0
 	#define HAS_FLIGHT		0
 	#define HAS_USB			1
 	#define HAS_BEEP		0
@@ -291,6 +315,8 @@
 #endif
 
 #if defined(TELEBT_V_0_0)
+	/* Discontinued and was never built with CC1111 chips needing this */
+	#define NEEDS_CC1111_CLOCK_HACK	0
 	#define HAS_FLIGHT		0
 	#define HAS_USB			1
 	#define HAS_BEEP		0
@@ -327,9 +353,12 @@
 #endif
 
 #if defined(TELEBT_V_0_1)
+	/* Discontinued and was never built with CC1111 chips needing this */
+	#define NEEDS_CC1111_CLOCK_HACK	0
 	#define HAS_FLIGHT		0
 	#define HAS_USB			1
 	#define HAS_BEEP		1
+	#define HAS_BEEP_CONFIG		0
 	#define HAS_SERIAL_1		1
 	#define HAS_SERIAL_1_ALT_1	1
 	#define HAS_SERIAL_1_ALT_2	0
@@ -370,6 +399,8 @@
 #endif
 
 #if defined(TELELAUNCH_V_0_1)
+	/* Discontinued and was never built with CC1111 chips needing this */
+	#define NEEDS_CC1111_CLOCK_HACK	0
 	#define HAS_FLIGHT		0
 	#define HAS_USB			1
 	#define HAS_BEEP		1
@@ -559,4 +590,33 @@
 #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
+};
+
+/*
+ * Voltage divider on ADC battery sampler
+ */
+#define AO_BATTERY_DIV_PLUS	5	/* 5k */
+#define AO_BATTERY_DIV_MINUS	10	/* 10k */
+
+/*
+ * Voltage divider on ADC igniter samplers
+ */
+#define AO_IGNITE_DIV_PLUS	100	/* 100k */
+#define AO_IGNITE_DIV_MINUS	27	/* 27k */
+
+/*
+ * ADC reference in decivolts
+ */
+#define AO_ADC_REFERENCE_DV	33
+
 #endif /* _AO_PINS_H_ */