From 158bcf692d45e10dea0cf4cf13204023dac228d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Proch=C3=A1zka?= <90197375+P-R-O-C-H-Y@users.noreply.github.com> Date: Tue, 5 Dec 2023 09:59:12 +0100 Subject: [PATCH] Add 120Mhz cpu frequency option to setCpuFrequencyMhz() (#8956) * Allow setting 120MHz cpu freq * add 120MHz to C6 frequency menu --- boards.txt | 2 ++ cores/esp32/esp32-hal-cpu.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/boards.txt b/boards.txt index 8647ee4e9..f1c442de8 100644 --- a/boards.txt +++ b/boards.txt @@ -430,6 +430,8 @@ esp32c6.menu.PartitionScheme.custom.upload.maximum_size=16777216 esp32c6.menu.CPUFreq.160=160MHz (WiFi) esp32c6.menu.CPUFreq.160.build.f_cpu=160000000L +esp32c6.menu.CPUFreq.120=120MHz (WiFi) +esp32c6.menu.CPUFreq.120.build.f_cpu=120000000L esp32c6.menu.CPUFreq.80=80MHz (WiFi) esp32c6.menu.CPUFreq.80.build.f_cpu=80000000L esp32c6.menu.CPUFreq.40=40MHz diff --git a/cores/esp32/esp32-hal-cpu.c b/cores/esp32/esp32-hal-cpu.c index e6ea4de8d..4819ce119 100644 --- a/cores/esp32/esp32-hal-cpu.c +++ b/cores/esp32/esp32-hal-cpu.c @@ -188,11 +188,11 @@ bool setCpuFrequencyMhz(uint32_t cpu_freq_mhz){ } #endif #ifndef CONFIG_IDF_TARGET_ESP32H2 - if(cpu_freq_mhz > xtal && cpu_freq_mhz != 240 && cpu_freq_mhz != 160 && cpu_freq_mhz != 80){ + if(cpu_freq_mhz > xtal && cpu_freq_mhz != 240 && cpu_freq_mhz != 160 && cpu_freq_mhz != 120 && cpu_freq_mhz != 80){ if(xtal >= RTC_XTAL_FREQ_40M){ - log_e("Bad frequency: %u MHz! Options are: 240, 160, 80, %u, %u and %u MHz", cpu_freq_mhz, xtal, xtal/2, xtal/4); + log_e("Bad frequency: %u MHz! Options are: 240, 160, 120, 80, %u, %u and %u MHz", cpu_freq_mhz, xtal, xtal/2, xtal/4); } else { - log_e("Bad frequency: %u MHz! Options are: 240, 160, 80, %u and %u MHz", cpu_freq_mhz, xtal, xtal/2); + log_e("Bad frequency: %u MHz! Options are: 240, 160, 120, 80, %u and %u MHz", cpu_freq_mhz, xtal, xtal/2); } return false; }