ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed invalid USB controller PLL prescaler values for the ATMEGAxxU2 controllers

Browse source 
Fixed lack of support for the ATMEGA32U2 in the DFU and CDC class bootloaders

Changed incomplete Webserver project over to using the uIP timer library.
This commit is contained in:
Dean Camera 2010-01-15 02:42:54 +00:00
parent f0d6d4ef13
commit 77dda302ac
10 changed files with 81 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Projects/Incomplete/Webserver/Lib/uip/conf/clock-arch.c
View file

@ -12,7 +12,7 @@
volatile clock_time_t clock_datetime = 0;
//Overflow interrupt
ISR(TIMER0_OVF_vect)
ISR(TIMER1_COMPA_vect)
{
clock_datetime += 1;
}
@ -20,14 +20,10 @@ ISR(TIMER0_OVF_vect)
//Initialise the clock
void clock_init()
{
//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

2
Projects/Incomplete/Webserver/Lib/uip/conf/clock-arch.h
View file

@ -5,7 +5,7 @@
#include <stdint.h>
typedef uint16_t clock_time_t;
#define CLOCK_CONF_SECOND (F_CPU / 1024 / 255) //Freqency divided prescaler and counter register size
#define CLOCK_CONF_SECOND 100
void clock_init(void);
clock_time_t clock_time(void);