projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump NUM_CMDS to 10
[fw/altos]
/
ao_adc.c
diff --git
a/ao_adc.c
b/ao_adc.c
index 39875bbda7a195bf4249c061d0b0e1979e9b044d..639c5f6c3b9281f6096c3d3b7308a4c7cacf53b5 100644
(file)
--- a/
ao_adc.c
+++ b/
ao_adc.c
@@
-35,10
+35,7
@@
ao_adc_sleep(void)
void
ao_adc_get(__xdata struct ao_adc *packet)
{
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));
}
memcpy(packet, &ao_adc_ring[i], sizeof (struct ao_adc));
}
@@
-58,9
+55,7
@@
ao_adc_isr(void) interrupt 1
} else {
/* record this conversion series */
ao_adc_ring[ao_adc_head].tick = ao_time();
} 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_wakeup(ao_adc_ring);
}
}
@@
-76,7
+71,7
@@
ao_adc_dump(void)
}
__code struct ao_cmds ao_adc_cmds[] = {
}
__code struct ao_cmds ao_adc_cmds[] = {
- { 'a', ao_adc_dump, "a Display current ADC values
\n
" },
+ { 'a', ao_adc_dump, "a Display current ADC values" },
{ 0, ao_adc_dump, NULL },
};
{ 0, ao_adc_dump, NULL },
};