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

cpu/esp*: use TIMER_CHANNEL_NUMOF

Browse Source
This commit is contained in:
Benjamin Valentin 2020-06-23 19:21:54 +02:00
parent 4310098245
commit 5da1a9e577
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
boards/common/esp8266/include/periph_conf_common.h
View File

@ -193,13 +193,13 @@ static const spi_conf_t spi_config[] = {
/* software timer */ /* software timer */
#define TIMER_NUMOF (1U) /**< number of timer devices */ #define TIMER_NUMOF (1U) /**< number of timer devices */
#define TIMER_CHANNELS (10U) /**< number of channels per timer device */ #define TIMER_CHANNEL_NUMOF (10U) /**< number of channels per timer device */
#else /* MODULE_ESP_SW_TIMER */ #else /* MODULE_ESP_SW_TIMER */
/* hardware timer */ /* hardware timer */
#define TIMER_NUMOF (1U) /**< number of timer devices */ #define TIMER_NUMOF (1U) /**< number of timer devices */
#define TIMER_CHANNELS (1U) /**< number of channels per timer device */ #define TIMER_CHANNEL_NUMOF (1U) /**< number of channels per timer device */
#endif /* MODULE_ESP_SW_TIMER */ #endif /* MODULE_ESP_SW_TIMER */
/** @} */ /** @} */

8
cpu/esp32/include/periph_cpu.h
View File

@ -506,12 +506,12 @@ typedef struct {
*/ */
#ifdef MODULE_ESP_HW_COUNTER #ifdef MODULE_ESP_HW_COUNTER
/** hardware ccount/ccompare registers are used for timer implementation */ /** hardware ccount/ccompare registers are used for timer implementation */
#define TIMER_NUMOF (2) #define TIMER_NUMOF (2)
#define TIMER_CHANNELS (1) #define TIMER_CHANNEL_NUMOF (1)
#else #else
/** hardware timer modules are used for timer implementation (default) */ /** hardware timer modules are used for timer implementation (default) */
#define TIMER_NUMOF (3) #define TIMER_NUMOF (3)
#define TIMER_CHANNELS (1) #define TIMER_CHANNEL_NUMOF (1)
#endif #endif
/** Timer used for system time */ /** Timer used for system time */