Skip to content

Add an option in chip_config.frequenecy to configure CPU clock of ESP32. #871

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
farooqkz wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Add an option in chip_config.frequenecy to configure CPU clock of ESP32. #871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eea8f77
Add an option in chip_config.frequenecy to configure CPU clock of ESP32.
farooqkz May 31, 2026
8b39291
[rmk-{macro,config}] Proper code formatting
farooqkz Jun 1, 2026
4e5cd20
[rmk-config] Change type of chip.frequency to f64 and improve its com…
farooqkz Jun 3, 2026
8bc8876
[rmk-macro] update handling of chip.frequency per the new value type
farooqkz Jun 3, 2026
e9ead09
Merge branch 'main' into main
farooqkz Jun 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions rmk-config/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,9 @@ pub struct ChipConfig {
/// DCDC regulator 0 voltage (for nrf52840)
/// Values: "3V3" or "1V8"
pub dcdc_reg0_voltage: Option<String>,
/// Frequency of the CPU in MHz Currently supported only on
/// ESP32 and supports only 160 and 80
pub frequency: Option<f64>,
}

/// Config for lights
Expand Down
22 changes: 19 additions & 3 deletions rmk-macro/src/codegen/chip/chip_init.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,16 +226,32 @@ pub(crate) fn chip_init_default(hardware: &Hardware, peripheral_id: Option<usize
}
ChipSeries::Esp32 => {
let ble_addr = get_ble_addr(hardware, peripheral_id);
let cpu_clock = if hardware.chip.series == ChipSeries::Esp32 {
match hardware.chip_config.frequency.as_ref() {
Some(&160.0) | None => quote! { ::esp_hal::clock::CpuClock::_160MHz },
Some(&80.0) => quote! { ::esp_hal::clock::CpuClock::_80MHz },
_ => panic!(
"Currently only CPU clocks of 160MHz and 80Mhz are supported for ESP32"
),
}
} else {
quote! { ::esp_hal::clock::CpuClock::_160MHz }
};
quote! {
::esp_println::logger::init_logger_from_env();
let p = ::esp_hal::init(::esp_hal::Config::default().with_cpu_clock(::esp_hal::clock::CpuClock::max()));
let p = ::esp_hal::init(
::esp_hal::Config::default().with_cpu_clock(
#cpu_clock
)
);
::esp_alloc::heap_allocator!(size: 72 * 1024);
let timg0 = ::esp_hal::timer::timg::TimerGroup::new(p.TIMG0);
let software_interrupt = ::esp_hal::interrupt::software::SoftwareInterruptControl::new(p.SW_INTERRUPT);
::esp_rtos::start(timg0.timer0, software_interrupt.software_interrupt0);
let _trng_source = ::esp_hal::rng::TrngSource::new(p.RNG, p.ADC1);
let mut rng = ::esp_hal::rng::Trng::try_new().unwrap();
let connector = ::esp_radio::ble::controller::BleConnector::new(p.BT, Default::default()).unwrap();
let ble_config = ::esp_radio::ble::Config::default();
let connector = ::esp_radio::ble::controller::BleConnector::new(p.BT, ble_config).unwrap();
let controller: ::bt_hci::controller::ExternalController<_, 64> = ::bt_hci::controller::ExternalController::new(connector);
let ble_addr = #ble_addr;
let mut host_resources = ::rmk::HostResources::new();
Expand Down Expand Up @@ -268,7 +284,7 @@ fn override_chip_config(chip: &ChipModel, item_fn: &ItemFn) -> TokenStream2 {
let mut p = ::embassy_rp::init(config);
}),
ChipSeries::Esp32 => initialization_tokens.extend(quote! {
let p = ::esp_hal::init(::esp_hal::Config::default().with_cpu_clock(::esp_hal::clock::CpuClock::max()));
let p = ::esp_hal::init(::esp_hal::Config::default());
}),
}

Expand Down