void
ao_adc_get(__xdata struct ao_adc *packet)
{
- uint8_t i = ao_adc_head;
- if (i == 0)
- i = AO_ADC_RING;
- i--;
+ uint8_t i = ao_adc_ring_prev(ao_adc_head);
memcpy(packet, &ao_adc_ring[i], sizeof (struct ao_adc));
}
} else {
/* record this conversion series */
ao_adc_ring[ao_adc_head].tick = ao_time();
- ao_adc_head++;
- if (ao_adc_head == AO_ADC_RING)
- ao_adc_head = 0;
+ ao_adc_head = ao_adc_ring_next(ao_adc_head);
ao_wakeup(ao_adc_ring);
}
}
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.sense_d >> 4, packet.sense_m >> 4);
+ packet.v_batt >> 4, packet.sense_d >> 4, packet.sense_m >> 4);
}
__code struct ao_cmds ao_adc_cmds[] = {