alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-12-07 17:08:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into driver_merge_tmp/merge_pcnt

Browse Source 
# Conflicts:
#	components/driver/include/driver/periph_ctrl.h
This commit is contained in:
Wangjialin
2016-11-23 18:15:54 +08:00
parent 7571b8c2e4 137c027274
commit 6db1482cd5
114 changed files with 8342 additions and 820 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/driver/periph_ctrl.c
View File

@@ -25,6 +25,10 @@ void periph_module_enable(periph_module_t periph)
{
portENTER_CRITICAL(&periph_spinlock);
switch(periph) {
case PERIPH_RMT_MODULE:
SET_PERI_REG_MASK(DPORT_PERIP_CLK_EN_REG, DPORT_RMT_CLK_EN);
CLEAR_PERI_REG_MASK(DPORT_PERIP_RST_EN_REG, DPORT_RMT_RST);
break;
case PERIPH_LEDC_MODULE:
SET_PERI_REG_MASK(DPORT_PERIP_CLK_EN_REG, DPORT_LEDC_CLK_EN);
CLEAR_PERI_REG_MASK(DPORT_PERIP_RST_EN_REG, DPORT_LEDC_RST);