espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-04 13:14:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/remove_dependency_in_timergroup_caps' into 'master'

Browse Source 
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
parent 042285d938 0c6e1b9482
commit 296d095e53
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/soc/soc/esp32/include/soc/timer_group_caps.h
View File

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

6
components/soc/soc/esp32s2/include/soc/timer_group_caps.h
View File

@@ -14,8 +14,6 @@
#pragma once #pragma once
#include "soc/soc.h"
#define TIMER_GROUP_SUPPORTS_XTAL_CLOCK #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

2
tools/ci/config/target-test.yml
View File

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