diff options
| author | tmk <nobody@nowhere> | 2014-11-24 15:36:53 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2014-11-24 15:36:53 +0900 |
| commit | ed52ebb9870a26496b13a0565c1aaca8ded3465b (patch) | |
| tree | cddad806a3408e05bc29310254c564ee94e3e710 /common/timer.h | |
| parent | eb90ed6238426db9367e294abfaefb5de07564f5 (diff) | |
| parent | e2077cad45f1736e878e317c43bd94117c61b5e0 (diff) | |
| download | qmk_firmware-ed52ebb9870a26496b13a0565c1aaca8ded3465b.tar.gz qmk_firmware-ed52ebb9870a26496b13a0565c1aaca8ded3465b.zip | |
Merge branch 'merge_rn42'
Diffstat (limited to 'common/timer.h')
| -rw-r--r-- | common/timer.h | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/common/timer.h b/common/timer.h index 6437473ff7..fe23f87aec 100644 --- a/common/timer.h +++ b/common/timer.h @@ -20,24 +20,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include <stdint.h> -#ifndef TIMER_PRESCALER -# if F_CPU > 16000000 -# define TIMER_PRESCALER 256 -# elif F_CPU > 2000000 -# define TIMER_PRESCALER 64 -# elif F_CPU > 250000 -# define TIMER_PRESCALER 8 -# else -# define TIMER_PRESCALER 1 -# endif +#if defined(__AVR__) +#include "avr/timer_avr.h" #endif -#define TIMER_RAW_FREQ (F_CPU/TIMER_PRESCALER) -#define TIMER_RAW TCNT0 -#define TIMER_RAW_TOP (TIMER_RAW_FREQ/1000) -#if (TIMER_RAW_TOP > 255) -# error "Timer0 can't count 1ms at this clock freq. Use larger prescaler." -#endif #define TIMER_DIFF(a, b, max) ((a) >= (b) ? (a) - (b) : (max) - (b) + (a)) #define TIMER_DIFF_8(a, b) TIMER_DIFF(a, b, UINT8_MAX) |