X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fteleballoon-v1.1%2Fao_pins.h;h=2bf4d59391a7d13824768d6de7007fc521c816ee;hb=65bb93f69b2f420281b67d62a9ee3cf30874fb7c;hp=3305719a577acf5192a77cf8f4b4c8dd2ad9a0c8;hpb=040a6eb119451026e1ec7c3a6a8e76b439c632d5;p=fw%2Faltos

diff --git a/src/teleballoon-v1.1/ao_pins.h b/src/teleballoon-v1.1/ao_pins.h
index 3305719a..2bf4d593 100644
--- a/src/teleballoon-v1.1/ao_pins.h
+++ b/src/teleballoon-v1.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
@@ -28,6 +29,7 @@
 	#define HAS_FLIGHT		1
 	#define HAS_USB			1
 	#define HAS_BEEP		1
+	#define HAS_BATTERY_REPORT	1
 	#define HAS_GPS			1
 	#define HAS_SERIAL_1		1
 	#define HAS_ADC			1
@@ -43,9 +45,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)
@@ -53,7 +55,7 @@
 	#define HAS_ACCEL_REF		1
 	#define SPI_CS_ON_P1		1
 	#define SPI_CS_ON_P0		0
-	#define M25_CS_MASK		0x02	/* CS0 is P1_1 */
+	#define AO_M25_SPI_CS_MASK	0x02	/* CS0 is P1_1 */
 	#define M25_MAX_CHIPS		1
 	#define HAS_ACCEL		1
 	#define HAS_IGNITE		0
@@ -114,6 +116,8 @@
 	#define SPI_CS_DIR	P0DIR
 #endif
 
+#define AO_M25_SPI_CS_PORT	SPI_CS_PORT
+
 #ifndef IGNITE_ON_P2
 #error Please define IGNITE_ON_P2
 #endif
@@ -212,4 +216,16 @@
 #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_ */