riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

atmega: fix periph timer configuration

Browse Source 
- correct number of timers for atmega328p from 2 to 1
- correct number of timer channels for atmega328p from 3 to 2
- adapt atmega periph timer implementation accordingly
This commit is contained in:
smlng 2018-11-27 20:22:41 +01:00 committed by Sebastian Meiling
parent 85b9be71da
commit 262a04c9cf
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
boards/common/arduino-atmega/include/periph_conf.h
View File

@ -49,7 +49,8 @@ extern "C" {
* @{ * @{
*/ */
#ifdef CPU_ATMEGA328P #ifdef CPU_ATMEGA328P
#define TIMER_NUMOF (2U) #define TIMER_NUMOF (1U)
#define TIMER_CHANNELS (2)
#define TIMER_0 MEGA_TIMER1 #define TIMER_0 MEGA_TIMER1
#define TIMER_0_MASK &TIMSK1 #define TIMER_0_MASK &TIMSK1
@ -60,6 +61,7 @@ extern "C" {
#ifdef CPU_ATMEGA2560 #ifdef CPU_ATMEGA2560
#define TIMER_NUMOF (2U) #define TIMER_NUMOF (2U)
#define TIMER_CHANNELS (3)
#define TIMER_0 MEGA_TIMER1 #define TIMER_0 MEGA_TIMER1
#define TIMER_0_MASK &TIMSK1 #define TIMER_0_MASK &TIMSK1

1
boards/jiminy-mega256rfr2/include/periph_conf.h
View File

@ -57,6 +57,7 @@ extern "C" {
* @{ * @{
*/ */
#define TIMER_NUMOF (3U) #define TIMER_NUMOF (3U)
#define TIMER_CHANNELS (3)
#define TIMER_0 MEGA_TIMER4 #define TIMER_0 MEGA_TIMER4
#define TIMER_0_MASK &TIMSK4 #define TIMER_0_MASK &TIMSK4

1
boards/mega-xplained/include/periph_conf.h
View File

@ -51,6 +51,7 @@ extern "C" {
* @{ * @{
*/ */
#define TIMER_NUMOF (2U) #define TIMER_NUMOF (2U)
#define TIMER_CHANNELS (2)
#define TIMER_0 MEGA_TIMER1 #define TIMER_0 MEGA_TIMER1
#define TIMER_0_MASK &TIMSK1 #define TIMER_0_MASK &TIMSK1

1
boards/waspmote-pro/include/periph_conf.h
View File

@ -44,6 +44,7 @@ extern "C" {
* @{ * @{
*/ */
#define TIMER_NUMOF (2U) #define TIMER_NUMOF (2U)
#define TIMER_CHANNELS (3)
#define TIMER_0 MEGA_TIMER1 #define TIMER_0 MEGA_TIMER1
#define TIMER_0_MASK &TIMSK1 #define TIMER_0_MASK &TIMSK1

9
cpu/atmega_common/periph/timer.c
View File

@ -32,11 +32,6 @@
#define ENABLE_DEBUG (0) #define ENABLE_DEBUG (0)
#include "debug.h" #include "debug.h"
/**
* @brief All timers have three channels
*/
#define CHANNELS (3)
/** /**
* @brief We have 5 possible prescaler values * @brief We have 5 possible prescaler values
*/ */
@ -137,7 +132,7 @@ int timer_init(tim_t tim, unsigned long freq, timer_cb_t cb, void *arg)
int timer_set_absolute(tim_t tim, int channel, unsigned int value) int timer_set_absolute(tim_t tim, int channel, unsigned int value)
{ {
if (channel >= CHANNELS) { if (channel >= TIMER_CHANNELS) {
return -1; return -1;
} }
@ -150,7 +145,7 @@ int timer_set_absolute(tim_t tim, int channel, unsigned int value)
int timer_clear(tim_t tim, int channel) int timer_clear(tim_t tim, int channel)
{ {
if (channel >= CHANNELS) { if (channel >= TIMER_CHANNELS) {
return -1; return -1;
} }