Merge branch 'feature/merge_multiple_github_prs' into 'master'

Multiple Github PRs

See merge request idf/esp-idf!4146
This commit is contained in:
Ivan Grokhotkov
2019-01-24 15:14:47 +08:00
7 changed files with 21 additions and 5 deletions
+1 -1
View File
@@ -503,7 +503,7 @@ rtc_cpu_freq_t rtc_clk_cpu_freq_get()
{
rtc_cpu_freq_config_t config;
rtc_clk_cpu_freq_get_config(&config);
rtc_cpu_freq_t freq;
rtc_cpu_freq_t freq = RTC_CPU_FREQ_XTAL;
rtc_clk_cpu_freq_from_mhz_internal(config.freq_mhz, &freq);
return freq;
}