diff options
author | Jack Humbert <jack.humb@gmail.com> | 2016-06-18 20:30:24 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-18 20:30:24 +0200 |
commit | db32864ce7029d758f57729cc2f75e051a28d0a2 (patch) | |
tree | f3ac60d9c826a9ad5ef5bc4d199efaddae156ba6 /tmk_core/protocol/lufa/LUFA-git/Projects/Webserver/Lib/uip/clock.c | |
parent | 1923cffd41d9d71cd9f434092654dba05513137b (diff) | |
download | qmk_firmware-db32864ce7029d758f57729cc2f75e051a28d0a2.tar.gz qmk_firmware-db32864ce7029d758f57729cc2f75e051a28d0a2.tar.xz |
Cleans up quantum/keymap situation, removes extra lufa folders (#416)
* sorts out keycodes
* move midi around
* remove mbed
* replaces keymap with qmk/keymap_common
* fixes keymap.h
* keymap, config, quantum rearrange
* removes unneeded lufa stuff
Diffstat (limited to 'tmk_core/protocol/lufa/LUFA-git/Projects/Webserver/Lib/uip/clock.c')
-rw-r--r-- | tmk_core/protocol/lufa/LUFA-git/Projects/Webserver/Lib/uip/clock.c | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/tmk_core/protocol/lufa/LUFA-git/Projects/Webserver/Lib/uip/clock.c b/tmk_core/protocol/lufa/LUFA-git/Projects/Webserver/Lib/uip/clock.c deleted file mode 100644 index e71f7209d..000000000 --- a/tmk_core/protocol/lufa/LUFA-git/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; -} - |