projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Enhance TemperatureDatalogger project -- add RTC capabilities so that data is logged...
[pub/USBasp.git]
/
Projects
/
Incomplete
/
Webserver
/
Lib
/
uip
/
conf
/
clock-arch.c
diff --git
a/Projects/Incomplete/Webserver/Lib/uip/conf/clock-arch.c
b/Projects/Incomplete/Webserver/Lib/uip/conf/clock-arch.c
index
c3e281e
..
8363d96
100644
(file)
--- a/
Projects/Incomplete/Webserver/Lib/uip/conf/clock-arch.c
+++ b/
Projects/Incomplete/Webserver/Lib/uip/conf/clock-arch.c
@@
-12,7
+12,7
@@
volatile clock_time_t clock_datetime = 0;
//Overflow interrupt
volatile clock_time_t clock_datetime = 0;
//Overflow interrupt
-ISR(TIMER
0_OVF
_vect)
+ISR(TIMER
1_COMPA
_vect)
{
\r
clock_datetime += 1;
}
{
\r
clock_datetime += 1;
}
@@
-20,14
+20,10
@@
ISR(TIMER0_OVF_vect)
//Initialise the clock
void clock_init()
\r
{
\r
//Initialise the clock
void clock_init()
\r
{
\r
- //Activate overflow interrupt for timer0
- TIMSK0 |= (1<<TOIE0);
-
- //Use prescaler 1024
- TCCR0B |= ((1<<CS12)|(1<<CS10));
-
- //Activate interrupts
- sei();
+ OCR1A = ((F_CPU / 1024) / 100);
+ TCCR1A = (1 << WGM12);
+ TCCR1B = ((1 << CS12) | (1 << CS10));
+ TIMSK1 = (1 << OCIE1A);
}
//Return time
}
//Return time