X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fcc1111%2Fao_adc.c;h=94af5cda433ba710c16d13beafc2e884cf5d66e6;hp=f34bc04227e35996d4d48c1970d18d2cad9c9cb1;hb=1085ec5d57e0ed5d132f2bbdac1a0b6a32c0ab4a;hpb=090dc9aecdf4cfd1ac727325ae141d441c5b28aa

diff --git a/src/cc1111/ao_adc.c b/src/cc1111/ao_adc.c
index f34bc042..94af5cda 100644
--- a/src/cc1111/ao_adc.c
+++ b/src/cc1111/ao_adc.c
@@ -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
@@ -19,19 +20,26 @@
 
 volatile __xdata struct ao_data	ao_data_ring[AO_DATA_RING];
 volatile __data uint8_t		ao_data_head;
+#if (AO_DATA_ALL & ~(AO_DATA_ADC))
+volatile __data uint8_t		ao_data_present;
+#endif
+
+#ifdef TELENANO_V_0_1
+# define AO_ADC_FIRST_PIN	1
+#endif
+
+#if HAS_ACCEL_REF
+# define AO_ADC_FIRST_PIN	2
+#endif
+
+#ifndef AO_ADC_FIRST_PIN
+# define AO_ADC_FIRST_PIN	0
+#endif
 
 void
 ao_adc_poll(void)
 {
-#if HAS_ACCEL_REF
-	ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | 2;
-#else
-# ifdef TELENANO_V_0_1
-	ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | 1;
-# else
-	ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | 0;
-# endif
-#endif
+	ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | AO_ADC_FIRST_PIN;
 }
 
 void
@@ -52,11 +60,11 @@ ao_adc_isr(void) __interrupt 1
 	uint8_t	__xdata *a;
 
 	sequence = (ADCCON2 & ADCCON2_SCH_MASK) >> ADCCON2_SCH_SHIFT;
-#if IGNITE_ON_P2
+#if TELEMETRUM_V_0_1 || TELEMETRUM_V_0_2 || TELEMETRUM_V_1_0 || TELEMETRUM_V_1_1 || TELEMETRUM_V_1_2 || TELELAUNCH_V_0_1 || TELEBALLOON_V_1_1
 	/* TeleMetrum readings */
 #if HAS_ACCEL_REF
 	if (sequence == 2) {
-		a = (uint8_t __xdata *) (&ao_data_ring[ao_data_head].accel_ref);
+		a = (uint8_t __xdata *) (&ao_data_ring[ao_data_head].adc.accel_ref);
 		sequence = 0;
 	} else
 #endif
@@ -78,13 +86,14 @@ ao_adc_isr(void) __interrupt 1
 		else
 #endif
 			ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | sequence;
+		return;
 	}
 #endif
 
-#if IGNITE_ON_P0
+#if TELEMINI_V_1_0 || TELENANO_V_0_1
 	/* TeleMini readings */
 	a = (uint8_t __xdata *) (&ao_data_ring[ao_data_head].adc.pres);
-#ifdef TELEMINI_V_1_0
+#if TELEMINI_V_1_0
 	switch (sequence) {
 	case 0:
 		/* pressure */
@@ -137,18 +146,41 @@ ao_adc_isr(void) __interrupt 1
 	if (sequence) {
 		/* Start next conversion */
 		ADCCON3 = sequence;
+		return;
 	}
+#endif /* telemini || telenano */
+
+#if defined(TELEFIRE_V_0_1) || defined(TELEFIRE_V_0_2)
+	a = (uint8_t __xdata *) (&ao_data_ring[ao_data_head].adc.sense[0] + sequence - AO_ADC_FIRST_PIN);
+	a[0] = ADCL;
+	a[1] = ADCH;
+	if (sequence < 5) {
+		ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | (sequence + 1);
+		return;
+	}
+#define GOT_ADC
+#endif /* TELEFIRE_V_0_1 */
+
+#ifdef TELEBT_V_1_0
+	a = (uint8_t __xdata *) (&ao_data_ring[ao_data_head].adc.batt);
+	a[0] = ADCL;
+	a[1] = ADCH;
+#define GOT_ADC
+#endif	
+
+#ifdef FETCH_ADC
+	FETCH_ADC();
+#define GOT_ADC
 #endif
+
 #ifndef GOT_ADC
 #error No known ADC configuration set
 #endif
 
-	else {
-		/* record this conversion series */
-		ao_data_ring[ao_data_head].tick = ao_time();
-		ao_data_head = ao_data_ring_next(ao_data_head);
-		ao_wakeup(DATA_TO_XDATA(&ao_data_head));
-	}
+	/* record this conversion series */
+	ao_data_ring[ao_data_head].tick = ao_time();
+	ao_data_head = ao_data_ring_next(ao_data_head);
+	ao_wakeup(DATA_TO_XDATA(&ao_data_head));
 }
 
 static void
@@ -156,9 +188,13 @@ ao_adc_dump(void) __reentrant
 {
 	static __xdata struct ao_data	packet;
 	ao_data_get(&packet);
+#ifndef AO_ADC_DUMP
 	printf("tick: %5u accel: %5d pres: %5d temp: %5d batt: %5d drogue: %5d main: %5d\n",
 	       packet.tick, packet.adc.accel, packet.adc.pres, packet.adc.temp,
 	       packet.adc.v_batt, packet.adc.sense_d, packet.adc.sense_m);
+#else
+	AO_ADC_DUMP(&packet);
+#endif
 }
 
 __code struct ao_cmds ao_adc_cmds[] = {
@@ -169,6 +205,11 @@ __code struct ao_cmds ao_adc_cmds[] = {
 void
 ao_adc_init(void)
 {
+#ifdef AO_ADC_PINS
+	ADCCFG = AO_ADC_PINS;
+
+#else
+
 #if IGNITE_ON_P2
 	/* TeleMetrum configuration */
 	ADCCFG = ((1 << 0) |	/* acceleration */
@@ -189,6 +230,8 @@ ao_adc_init(void)
 		  (1 << 3));	/* battery voltage */
 #endif
 
+#endif /* else AO_ADC_PINS */
+
 	/* enable interrupts */
 	ADCIF = 0;
 	IEN0 |= IEN0_ADCIE;