From 867f115bee190515aa195dc3e58f1c381ea9695b Mon Sep 17 00:00:00 2001 From: tmk Date: Mon, 16 Jun 2014 11:12:45 +0900 Subject: Port timer to mbed --- common/timer.h | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'common/timer.h') diff --git a/common/timer.h b/common/timer.h index 6437473ff7..f0c5ffc98a 100644 --- a/common/timer.h +++ b/common/timer.h @@ -20,25 +20,6 @@ along with this program. If not, see . #include -#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 -#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) #define TIMER_DIFF_16(a, b) TIMER_DIFF(a, b, UINT16_MAX) -- cgit v1.2.1 From 54aee16a84eee27e816a89da5ca0dd3e9294cad9 Mon Sep 17 00:00:00 2001 From: tmk Date: Wed, 25 Jun 2014 11:23:30 +0900 Subject: Fix timer.h to include AVR specific header --- common/timer.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'common/timer.h') diff --git a/common/timer.h b/common/timer.h index f0c5ffc98a..fe23f87aec 100644 --- a/common/timer.h +++ b/common/timer.h @@ -20,6 +20,11 @@ along with this program. If not, see . #include +#if defined(__AVR__) +#include "avr/timer_avr.h" +#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) #define TIMER_DIFF_16(a, b) TIMER_DIFF(a, b, UINT16_MAX) -- cgit v1.2.1