qi-hardware/antorcha
1
0
Fork 0
mirror of git://projects.qi-hardware.com/antorcha.git synced 2024-11-01 11:28:26 +02:00
Code

fw/accel.c: keep track of uptime and return it with uptime() (untested)

Browse Source
This commit is contained in:
Werner Almesberger 2012-06-21 08:55:43 -03:00
parent 3b7c3017fc
commit 7045109090
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fw/sweep.c
View File

@ -24,6 +24,7 @@
volatile bool sweeping = 0; volatile bool sweeping = 0;
static volatile uint32_t t_up; /* uptime, in timer ticks (wraps in 4295 s) */
static volatile uint32_t t_sw; /* cumulative number of timer ticks in sweep */ static volatile uint32_t t_sw; /* cumulative number of timer ticks in sweep */
static uint16_t wait_periods; /* number of periods to wait before image */ static uint16_t wait_periods; /* number of periods to wait before image */
@ -38,9 +39,13 @@ static bool forward;
ISR(TIMER1_OVF_vect) ISR(TIMER1_OVF_vect)
{ {
/* update the sweep time */ uint16_t t;
t_sw += ICR1; /* update the time counters */
t = ICR1;
t_sw += t;
t_up += t;
/* if at the end of the image, only update the time */ /* if at the end of the image, only update the time */
@ -79,6 +84,23 @@ ISR(TIMER1_OVF_vect)
} }
uint32_t uptime(void)
{
uint32_t a, b;
uint16_t d;
do {
cli();
a = t_up;
d = ICR1;
b = t_up;
sei();
}
while (a != b);
return a+d;
}
void sweep_image(const struct sweep *sweep) void sweep_image(const struct sweep *sweep)
{ {
TCCR1B = 0; /* stop the timer */ TCCR1B = 0; /* stop the timer */

2
fw/sweep.h
View File

@ -29,7 +29,7 @@ struct sweep {
extern volatile bool sweeping; extern volatile bool sweeping;
uint32_t uptime(void);
void sweep_image(const struct sweep *sweep); void sweep_image(const struct sweep *sweep);
void sweep_init(void); void sweep_init(void);