*/
#include "ao.h"
+#include "ao_pins.h"
volatile __xdata struct ao_adc ao_adc_ring[AO_ADC_RING];
volatile __data uint8_t ao_adc_head;
memcpy(packet, &ao_adc_ring[i], sizeof (struct ao_adc));
}
+#ifdef HAS_ADC_5V
+static void
+ao_fix_accel(void)
+{
+ uint32_t total;
+ uint8_t adc_l, adc_h;
+ uint8_t ref_l, ref_h;
+ uint8_t __xdata *p = (uint8_t __xdata *) &ao_adc_ring[ao_adc_head].accel;
+
+ ref_l = ADCL;
+ adc_l = p[0];
+ total = (uint32_t) (uint16_t) (adc_l * ref_l);
+
+ adc_h = p[1];
+ total += (uint32_t) (uint16_t) (adc_h * ref_l) << 8;
+
+ ref_h = ADCH;
+ total += (uint32_t) (uint16_t) (adc_l * ref_h) << 8;
+ total += (uint32_t) (uint16_t) (adc_h * ref_h) << 16;
+ *(uint16_t __xdata *) p = total >> 16;
+}
+#endif
+
void
-ao_adc_isr(void) interrupt 1
+ao_adc_isr(void) __interrupt 1
{
uint8_t sequence;
uint8_t __xdata *a;
sequence = (ADCCON2 & ADCCON2_SCH_MASK) >> ADCCON2_SCH_SHIFT;
+#if HAS_ADC_5V
+ if (sequence == 2) {
+ ao_fix_accel();
+ /* and launch the temp sensor next */
+ ADCCON3 = ADCCON3_EREF_1_25 | ADCCON3_EDIV_512 | ADCCON3_ECH_TEMP;
+ return;
+ }
+#endif
+#if HAS_EXTERNAL_TEMP
+ if (sequence == ADCCON3_ECH_TEMP)
+ sequence = 2;
+#endif
a = (uint8_t __xdata *) (&ao_adc_ring[ao_adc_head].accel + sequence);
a[0] = ADCL;
a[1] = ADCH;
if (sequence < 5) {
+#if !HAS_EXTERNAL_TEMP && !HAS_ADC_5V
/* start next channel conversion */
- ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | (sequence + 1);
+ /* v0.2 replaces external temp sensor with internal one */
+ if (sequence == 1)
+ ADCCON3 = ADCCON3_EREF_1_25 | ADCCON3_EDIV_512 | ADCCON3_ECH_TEMP;
+ else
+#endif
+ ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | (sequence + 1);
} else {
/* record this conversion series */
ao_adc_ring[ao_adc_head].tick = ao_time();
{
static __xdata struct ao_adc packet;
ao_adc_get(&packet);
- printf("tick: %5u accel: %4d pres: %4d temp: %4d batt: %4d drogue: %4d main: %4d\n",
- packet.tick, packet.accel >> 4, packet.pres >> 4, packet.temp >> 4,
- packet.v_batt >> 4, packet.sense_d >> 4, packet.sense_m >> 4);
+ printf("tick: %5u accel: %5d pres: %5d temp: %5d batt: %5d drogue: %5d main: %5d\n",
+ packet.tick, packet.accel, packet.pres, packet.temp,
+ packet.v_batt, packet.sense_d, packet.sense_m);
}
__code struct ao_cmds ao_adc_cmds[] = {
{
ADCCFG = ((1 << 0) | /* acceleration */
(1 << 1) | /* pressure */
- (1 << 2) | /* temperature */
+#if HAS_EXTERNAL_TEMP
+ (1 << 2) | /* v0.1 temperature */
+#endif
(1 << 3) | /* battery voltage */
(1 << 4) | /* drogue sense */
(1 << 5)); /* main sense */