projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'uniarch/master' into multiarch
[fw/altos]
/
src
/
avr
/
ao_adc_avr.c
diff --git
a/src/avr/ao_adc_avr.c
b/src/avr/ao_adc_avr.c
index a47703e576df875286dc4707b515666b4bcf2277..8c0cade01db2ff4ce9b97955e88195be77314613 100644
(file)
--- a/
src/avr/ao_adc_avr.c
+++ b/
src/avr/ao_adc_avr.c
@@
-125,6
+125,7
@@
ao_adc_dump(void) __reentrant
static __xdata struct ao_adc packet;
uint8_t i;
ao_adc_get(&packet);
static __xdata struct ao_adc 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("ADMUX: %02x\n", ADMUX);
printf("ADCSRA: %02x\n", ADCSRA);
printf("ADCSRB: %02x\n", ADCSRB);
@@
-133,11
+134,13
@@
ao_adc_dump(void) __reentrant
printf("PORTF: %02x\n", PORTF);
printf("DDRF: %02x\n", DDRF);
printf("PINF: %02x\n", PINF);
printf("PORTF: %02x\n", PORTF);
printf("DDRF: %02x\n", DDRF);
printf("PINF: %02x\n", PINF);
+#endif
printf("tick: %5u", packet.tick);
for (i = 0; i < NUM_ADC; i++)
printf (" %2d: %5u", i, packet.adc[i]);
printf("tick: %5u", packet.tick);
for (i = 0; i < NUM_ADC; i++)
printf (" %2d: %5u", i, packet.adc[i]);
+#ifdef TELEPYRO
ADMUX = 0x60;
ADCSRB = 0x00;
ADCSRA = 0xc6;
ADMUX = 0x60;
ADCSRB = 0x00;
ADCSRA = 0xc6;
@@
-146,6
+149,7
@@
ao_adc_dump(void) __reentrant
printf ("ADCL: %02x\n", ADCL);
printf ("ADCH: %02x\n", ADCH);
printf ("\n");
printf ("ADCL: %02x\n", ADCL);
printf ("ADCH: %02x\n", ADCH);
printf ("\n");
+#endif
}
__code struct ao_cmds ao_adc_cmds[] = {
}
__code struct ao_cmds ao_adc_cmds[] = {