diff options
| author |  Drashna Jaelre <drashna@live.com> | 2019-08-02 14:02:40 -0700 |
|---|---|---|
| committer |  skullydazed <skullydazed@users.noreply.github.com> | 2019-08-30 15:01:52 -0700 |
| commit | cf4575b94a3c65e6535a159fc71fc885aebc2620 (patch) | |
| tree | 2354f2b7a200e02246a564afefedc32357e62b8e /lib/lufa/Projects/Webserver/Lib/uip/clock.c | |
| parent | 75ee8df19e0f14ba466f41ab673dde2fe2fdae9c (diff) | |
| download | qmk_firmware-cf4575b94a3c65e6535a159fc71fc885aebc2620.tar.gz | |
Fix the LUFA lib to use a submodule instead of just files (#6245)
* Remove LUFA files
* Update descriptions for newer version of LUFA
* Create PR6245.md
* Fix CDC(Serial) type errors
* Fix missed merge conflict for AUDIO_DTYPE_CSInterface
Diffstat (limited to 'lib/lufa/Projects/Webserver/Lib/uip/clock.c')
| -rw-r--r-- | lib/lufa/Projects/Webserver/Lib/uip/clock.c | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/lib/lufa/Projects/Webserver/Lib/uip/clock.c b/lib/lufa/Projects/Webserver/Lib/uip/clock.c deleted file mode 100644 index e71f7209d..000000000 --- a/lib/lufa/Projects/Webserver/Lib/uip/clock.c +++ /dev/null @@ -1,37 +0,0 @@ -#include <stdint.h> -#include <stdlib.h> -#include <stdio.h> - -#include <LUFA/Common/Common.h> - -#include "clock.h" - -//Counted time -volatile clock_time_t clock_datetime = 0; - -//Overflow interrupt -ISR(TIMER1_COMPA_vect, ISR_BLOCK) -{ - clock_datetime += 1; -} - -//Initialise the clock -void clock_init() -{ - OCR1A = (((F_CPU / 1024) / 100) - 1); - TCCR1B = ((1 << WGM12) | (1 << CS12) | (1 << CS10)); - TIMSK1 = (1 << OCIE1A); -} - -//Return time -clock_time_t clock_time() -{ - clock_time_t time; - - GlobalInterruptDisable(); - time = clock_datetime; - GlobalInterruptEnable(); - - return time; -} - |