X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Ftelefire-v0.1%2Fao_pins.h;h=8266589e254845f6ee2ad20fd7a77aa3ec119dd2;hp=eecf783e50790e29c7b20993134d85bb7eb1380e;hb=6aa451ce81bfdfe679e3f9902043a5f0d235c745;hpb=583458772746317b98fced907ec780edff465888

diff --git a/src/telefire-v0.1/ao_pins.h b/src/telefire-v0.1/ao_pins.h
index eecf783e..8266589e 100644
--- a/src/telefire-v0.1/ao_pins.h
+++ b/src/telefire-v0.1/ao_pins.h
@@ -3,7 +3,8 @@
  *
  * 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
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,7 +19,8 @@
 #ifndef _AO_PINS_H_
 #define _AO_PINS_H_
 
-#define HAS_RADIO	1
+#define HAS_RADIO		1
+#define HAS_TELEMETRY		0
 
 #define HAS_FLIGHT		0
 #define HAS_USB			1
@@ -38,15 +40,14 @@
 #define PACKET_HAS_MASTER	0
 #define PACKET_HAS_SLAVE	0
 
-#define AO_LED_CONTINUITY(c)	(1 << (c))
-#define AO_LED_CONTINUITY_MASK	(0xf)
-#define AO_LED_RX		0x10
-#define AO_LED_TX		0x20
-#define AO_LED_ARMED		0x40
-#define AO_LED_POWER		0x80
+#define PAD_BOX			0
 
-#define AO_LED_RED		AO_LED_TX
-#define AO_LED_GREEN		AO_LED_RX
+#define AO_LED_CONTINUITY(c)	(1 << ((c) + 2))
+#define AO_LED_CONTINUITY_MASK	(0xc)
+#define AO_LED_ARMED		0x10
+#define AO_LED_RED		0x20
+#define AO_LED_AMBER		0x40
+#define AO_LED_GREEN		0x80
 
 #define LEDS_AVAILABLE		(0xff)
 #define HAS_EXTERNAL_TEMP	0
@@ -74,40 +75,62 @@
 #define AO_PCA9922_CS_PIN	4
 #define AO_PCA9922_CS		P1_4
 
-#define AO_PAD_NUM		4
+#define AO_PAD_NUM		2
 #define	AO_PAD_PORT		P1
 #define AO_PAD_DIR		P1DIR
-#define AO_PAD_PIN_0		0
-#define AO_PAD_0		P1_0
-#define AO_PAD_PIN_1		1
-#define AO_PAD_1		P1_1
-#define AO_PAD_PIN_2		2
-#define AO_PAD_2		P1_2
-#define AO_PAD_PIN_3		3
-#define AO_PAD_3		P1_3
-#define AO_PAD_ALL_PINS		((1 << AO_PAD_PIN_0) | (1 << AO_PAD_PIN_1) | (1 << AO_PAD_PIN_2) | (1 << AO_PAD_PIN_3))
-
-/* test these values with real igniters */
-#define AO_PAD_RELAY_CLOSED	3524
-#define AO_PAD_NO_IGNITER	16904
-#define AO_PAD_GOOD_IGNITER	22514
+
+#define AO_PAD_PIN_0		2
+#define AO_PAD_0		P1_2
+#define AO_PAD_ADC_0		2
+
+#define AO_PAD_PIN_1		3
+#define AO_PAD_1		P1_3
+#define AO_PAD_ADC_1		3
+
+#define AO_PAD_ALL_PINS		((1 << AO_PAD_PIN_0) | (1 << AO_PAD_PIN_1))
+#define AO_PAD_ALL_CHANNELS	((1 << 0) | (1 << 1))
+
+#define AO_SIREN_PORT		P1
+#define AO_SIREN_DIR		P1DIR
+#define AO_SIREN_PIN		0
+#define AO_SIREN		P1_0
+
+#define AO_STROBE_PORT		P1
+#define AO_STROBE_DIR		P1DIR
+#define AO_STROBE_PIN		1
+#define AO_STROBE		P1_1
+
+#define AO_ADC_REFERENCE_DV	33
+#define AO_PAD_R_V_BATT_BATT_SENSE	100
+#define AO_PAD_R_BATT_SENSE_GND		27
+
+#define AO_PAD_R_V_BATT_V_PYRO		100
+#define AO_PAD_R_V_PYRO_PYRO_SENSE	100
+#define AO_PAD_R_PYRO_SENSE_GND		27
+
+#define AO_PAD_R_V_PYRO_IGNITER		100
+#define AO_PAD_R_IGNITER_IGNITER_SENSE	100
+#define AO_PAD_R_IGNITER_SENSE_GND	27
+
+#define AO_PAD_ADC_PYRO		4
+#define AO_PAD_ADC_BATT		5
+
+#define AO_ADC_FIRST_PIN	2
 
 struct ao_adc {
-	int16_t		sense[4];
+	int16_t		sense[AO_PAD_NUM];
 	int16_t		pyro;
 	int16_t		batt;
 };
 
 #define AO_ADC_DUMP(p)							\
-	printf ("tick: %5u 0: %5d 1: %5d 2: %5d 3: %5d pyro: %5d batt %5d\n", \
+	printf ("tick: %5u 0: %5d 1: %5d pyro: %5d batt %5d\n", 	\
 		(p)->tick,						\
 		(p)->adc.sense[0],					\
 		(p)->adc.sense[1],					\
-		(p)->adc.sense[2],					\
-		(p)->adc.sense[3],					\
 		(p)->adc.pyro,						\
 		(p)->adc.batt)
 
-#define AO_ADC_PINS	((1 << 0) | (1 << 1) | (1 << 2) | (1 << 3) | (1 << 4) | (1 << 5))
+#define AO_ADC_PINS	((1 << AO_PAD_ADC_0) | (1 << AO_PAD_ADC_1) | (1 << AO_PAD_ADC_PYRO) | (1 << AO_PAD_ADC_BATT))
 
 #endif /* _AO_PINS_H_ */