diff options
author | tmk <nobody@nowhere> | 2014-07-30 14:37:05 +0900 |
---|---|---|
committer | tmk <nobody@nowhere> | 2014-07-30 14:37:05 +0900 |
commit | adbb86b1ec8b07e86ae7425374e95b82122e48a7 (patch) | |
tree | 0a02e89376f69ef975096af9490034725d8eb751 /common/timer.h | |
parent | 79840c678e13f9a737f80048bc3b9c9c55e3fc77 (diff) | |
parent | a9f5f201ad6b009675fdf16c4447033cc2ac0995 (diff) | |
download | firmware-adbb86b1ec8b07e86ae7425374e95b82122e48a7.tar.gz firmware-adbb86b1ec8b07e86ae7425374e95b82122e48a7.tar.bz2 firmware-adbb86b1ec8b07e86ae7425374e95b82122e48a7.zip |
Merge branch 'mbed' into dev
Diffstat (limited to 'common/timer.h')
-rw-r--r-- | common/timer.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/common/timer.h b/common/timer.h index 6437473ff..f0c5ffc98 100644 --- a/common/timer.h +++ b/common/timer.h @@ -20,25 +20,6 @@ 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 -#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) |