#include "ao.h"
-volatile __xdata struct ao_adc ao_adc_ring[AO_ADC_RING];
-volatile __data uint8_t ao_adc_head;
+volatile __xdata struct ao_data ao_data_ring[AO_DATA_RING];
+volatile __data uint8_t ao_data_head;
#ifdef TELESCIENCE
const uint8_t adc_channels[AO_LOG_TELESCIENCE_NUM_ADC] = {
/* Must read ADCL first or the value there will be lost */
value = ADCL;
value |= (ADCH << 8);
- ao_adc_ring[ao_adc_head].adc[ao_adc_channel] = value;
+ ao_data_ring[ao_data_head].adc.adc[ao_adc_channel] = value;
if (++ao_adc_channel < NUM_ADC)
ao_adc_start();
else {
ADCSRA = ADCSRA_INIT;
- ao_adc_ring[ao_adc_head].tick = ao_time();
- ao_adc_head = ao_adc_ring_next(ao_adc_head);
- ao_wakeup((void *) &ao_adc_head);
+ ao_data_ring[ao_data_head].tick = ao_time();
+ ao_data_head = ao_data_ring_next(ao_data_head);
+ ao_wakeup((void *) &ao_data_head);
ao_cpu_sleep_disable = 0;
}
}
}
void
-ao_adc_get(__xdata struct ao_adc *packet)
+ao_data_get(__xdata struct ao_data *packet)
{
- uint8_t i = ao_adc_ring_prev(ao_adc_head);
- memcpy(packet, (void *) &ao_adc_ring[i], sizeof (struct ao_adc));
+ uint8_t i = ao_data_ring_prev(ao_data_head);
+ memcpy(packet, (void *) &ao_data_ring[i], sizeof (struct ao_data));
}
static void
ao_adc_dump(void) __reentrant
{
- static __xdata struct ao_adc packet;
+ static __xdata struct ao_data packet;
uint8_t i;
- ao_adc_get(&packet);
-#ifdef TELEPYRO
- printf("ADMUX: %02x\n", ADMUX);
- printf("ADCSRA: %02x\n", ADCSRA);
- printf("ADCSRB: %02x\n", ADCSRB);
- printf("DIDR0: %02x\n", DIDR0);
- printf("DIDR2: %02x\n", DIDR2);
- printf("PORTF: %02x\n", PORTF);
- printf("DDRF: %02x\n", DDRF);
- printf("PINF: %02x\n", PINF);
-#endif
+ ao_data_get(&packet);
printf("tick: %5u", packet.tick);
for (i = 0; i < NUM_ADC; i++)
- printf (" %2d: %5u", i, packet.adc[i]);
+ printf (" %2d: %5u", i, packet.adc.adc[i]);
printf("\n");
-
-
-#ifdef TELEPYRO
- ADMUX = 0x60;
- ADCSRB = 0x00;
- ADCSRA = 0xc6;
- while (ADCSRA & 0x40)
- ;
- printf ("ADCL: %02x\n", ADCL);
- printf ("ADCH: %02x\n", ADCH);
- printf ("\n");
-#endif
}
__code struct ao_cmds ao_adc_cmds[] = {
- { ao_adc_dump, "a\0Display current ADC values" },
+ { ao_adc_dump, "a\0ADC" },
{ 0, NULL },
};
void
ao_adc_init(void)
{
+ PRR0 &= ~(1 << PRADC);
DIDR0 = 0xf3;
DIDR2 = 0x3f;
ADCSRB = ADCSRB_INIT;