projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed AVRISP project not sending a full erase-and-write EEPROM command to XMEGA targe...
[pub/USBasp.git]
/
Projects
/
Webserver
/
Lib
/
uip
/
clock.c
diff --git
a/Projects/Webserver/Lib/uip/clock.c
b/Projects/Webserver/Lib/uip/clock.c
index
299a747
..
046b6e3
100644
(file)
--- a/
Projects/Webserver/Lib/uip/clock.c
+++ b/
Projects/Webserver/Lib/uip/clock.c
@@
-12,21
+12,21
@@
volatile clock_time_t clock_datetime = 0;
//Overflow interrupt
ISR(TIMER1_COMPA_vect)
//Overflow interrupt
ISR(TIMER1_COMPA_vect)
-{
\r
+{
clock_datetime += 1;
}
//Initialise the clock
clock_datetime += 1;
}
//Initialise the clock
-void clock_init()
\r
-{
\r
+void clock_init()
+{
OCR1A = ((F_CPU / 1024) / 100);
TCCR1B = ((1 << WGM12) | (1 << CS12) | (1 << CS10));
TIMSK1 = (1 << OCIE1A);
}
//Return time
OCR1A = ((F_CPU / 1024) / 100);
TCCR1B = ((1 << WGM12) | (1 << CS12) | (1 << CS10));
TIMSK1 = (1 << OCIE1A);
}
//Return time
-clock_time_t clock_time()
\r
-{
\r
+clock_time_t clock_time()
+{
clock_time_t time;
ATOMIC_BLOCK(ATOMIC_FORCEON)
clock_time_t time;
ATOMIC_BLOCK(ATOMIC_FORCEON)