Skip to content

Commit 327f8d4

Browse files
Make the default flashing frequency target specific (#389)
* feat: ✨ Add flash_freq to Esp32Params * feat: ✨ Add flash_freq for all targets * feat: ✨ Use the params flash_freq if no freq argment was used * test: 🧪 Fix tests * feat: ⚡️ Update default freq
1 parent f098b0e commit 327f8d4

File tree

9 files changed

+12
-1
lines changed

9 files changed

+12
-1
lines changed

espflash/src/image_format/idf_bootloader.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ impl<'a> IdfBootloaderFormat<'a> {
6161

6262
header.write_flash_config(
6363
flash_size.unwrap_or_default(),
64-
flash_freq.unwrap_or_default(),
64+
flash_freq.unwrap_or(params.flash_freq),
6565
chip,
6666
)?;
6767

@@ -303,6 +303,7 @@ pub mod tests {
303303
0x1_0000,
304304
0x3f_0000,
305305
0,
306+
FlashFrequency::_40Mhz,
306307
include_bytes!("../../resources/bootloaders/esp32-bootloader.bin"),
307308
);
308309

espflash/src/targets/esp32.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ const PARAMS: Esp32Params = Esp32Params::new(
2323
0x1_0000,
2424
0x3f_0000,
2525
0,
26+
FlashFrequency::_40Mhz,
2627
include_bytes!("../../resources/bootloaders/esp32-bootloader.bin"),
2728
);
2829

espflash/src/targets/esp32c2.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ const PARAMS: Esp32Params = Esp32Params::new(
2626
0x1_0000,
2727
0x1f_0000,
2828
12,
29+
FlashFrequency::_30Mhz,
2930
include_bytes!("../../resources/bootloaders/esp32c2-bootloader.bin"),
3031
);
3132

espflash/src/targets/esp32c3.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ const PARAMS: Esp32Params = Esp32Params::new(
2626
0x1_0000,
2727
0x3f_0000,
2828
5,
29+
FlashFrequency::_40Mhz,
2930
include_bytes!("../../resources/bootloaders/esp32c3-bootloader.bin"),
3031
);
3132

espflash/src/targets/esp32c6.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ const PARAMS: Esp32Params = Esp32Params::new(
2323
0x1_0000,
2424
0x3f_0000,
2525
13,
26+
FlashFrequency::_40Mhz,
2627
include_bytes!("../../resources/bootloaders/esp32c6-bootloader.bin"),
2728
);
2829

espflash/src/targets/esp32h2.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ const PARAMS: Esp32Params = Esp32Params::new(
2424
0x1_0000,
2525
0x3f_0000,
2626
16,
27+
FlashFrequency::_24Mhz,
2728
include_bytes!("../../resources/bootloaders/esp32h2-bootloader.bin"),
2829
);
2930

espflash/src/targets/esp32s2.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ const PARAMS: Esp32Params = Esp32Params::new(
2525
0x1_0000,
2626
0x10_0000,
2727
2,
28+
FlashFrequency::_40Mhz,
2829
include_bytes!("../../resources/bootloaders/esp32s2-bootloader.bin"),
2930
);
3031

espflash/src/targets/esp32s3.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ const PARAMS: Esp32Params = Esp32Params::new(
2323
0x1_0000,
2424
0x10_0000,
2525
9,
26+
FlashFrequency::_40Mhz,
2627
include_bytes!("../../resources/bootloaders/esp32s3-bootloader.bin"),
2728
);
2829

espflash/src/targets/mod.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ pub struct Esp32Params {
133133
pub app_addr: u32,
134134
pub app_size: u32,
135135
pub chip_id: u16,
136+
pub flash_freq: FlashFrequency,
136137
pub default_bootloader: &'static [u8],
137138
}
138139

@@ -142,6 +143,7 @@ impl Esp32Params {
142143
app_addr: u32,
143144
app_size: u32,
144145
chip_id: u16,
146+
flash_freq: FlashFrequency,
145147
bootloader: &'static [u8],
146148
) -> Self {
147149
Self {
@@ -154,6 +156,7 @@ impl Esp32Params {
154156
app_addr,
155157
app_size,
156158
chip_id,
159+
flash_freq,
157160
default_bootloader: bootloader,
158161
}
159162
}

0 commit comments

Comments
 (0)