a[1] = ADCH;
if (sequence < 5) {
/* start next channel conversion */
- ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | (sequence + 1);
+ sequence++;
+ /* skip channel 2, we don't have a temp sensor on v0.2 */
+ if (sequence == 2)
+ sequence++;
+ ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | sequence;
} else {
/* record this conversion series */
ao_adc_ring[ao_adc_head].tick = ao_time();
}
static void
-ao_adc_dump(void)
+ao_adc_dump(void) __reentrant
{
- __xdata struct ao_adc packet;
+ 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 */
+/* (1 << 2) | v0.1 temperature */
(1 << 3) | /* battery voltage */
(1 << 4) | /* drogue sense */
(1 << 5)); /* main sense */