Merge branch 'bugfix/remove_dependency_in_timergroup_caps' into 'master'

remove dependency of timer_group_caps.h on soc.h

See merge request espressif/esp-idf!8116
This commit is contained in:
Michael (XIAO Xufeng) 2020-03-26 18:18:45 +08:00
commit 296d095e53
3 changed files with 4 additions and 9 deletions

View file

@ -14,7 +14,4 @@
#pragma once
#include "soc/soc.h"
//APB Frequency
#define WDT_SOURCE_CLK_FREQ_MHZ (APB_CLK_FREQ / 1000000)
#define WDT_SOURCE_CLK_FREQ_MHZ (80) // Watch Dog clock source comes from APB, which is 80MHz by default

View file

@ -14,8 +14,6 @@
#pragma once
#include "soc/soc.h"
#define TIMER_GROUP_SUPPORTS_XTAL_CLOCK
//APB Frequency
#define WDT_SOURCE_CLK_FREQ_MHZ (APB_CLK_FREQ / 1000000)
#define WDT_SOURCE_CLK_FREQ_MHZ (80) // Watch Dog clock source comes from APB, which is 80MHz by default

View file

@ -495,7 +495,7 @@ UT_034:
UT_035:
extends: .unit_test_s2_template
parallel: 30
parallel: 31
tags:
- ESP32S2_IDF
- UT_T1_1