From 327f8d40e49b8cc625f67d75aaf762c12a2c1489 Mon Sep 17 00:00:00 2001
From: Sergio Gasquez Arcos <sergio.gasquez@gmail.com>
Date: Tue, 18 Apr 2023 14:20:52 +0200
Subject: [PATCH] Make the default flashing frequency target specific (#389)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 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
---
 espflash/src/image_format/idf_bootloader.rs | 3 ++-
 espflash/src/targets/esp32.rs               | 1 +
 espflash/src/targets/esp32c2.rs             | 1 +
 espflash/src/targets/esp32c3.rs             | 1 +
 espflash/src/targets/esp32c6.rs             | 1 +
 espflash/src/targets/esp32h2.rs             | 1 +
 espflash/src/targets/esp32s2.rs             | 1 +
 espflash/src/targets/esp32s3.rs             | 1 +
 espflash/src/targets/mod.rs                 | 3 +++
 9 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/espflash/src/image_format/idf_bootloader.rs b/espflash/src/image_format/idf_bootloader.rs
index 55a7c2f..0df9be5 100644
--- a/espflash/src/image_format/idf_bootloader.rs
+++ b/espflash/src/image_format/idf_bootloader.rs
@@ -61,7 +61,7 @@ impl<'a> IdfBootloaderFormat<'a> {
 
         header.write_flash_config(
             flash_size.unwrap_or_default(),
-            flash_freq.unwrap_or_default(),
+            flash_freq.unwrap_or(params.flash_freq),
             chip,
         )?;
 
@@ -303,6 +303,7 @@ pub mod tests {
         0x1_0000,
         0x3f_0000,
         0,
+        FlashFrequency::_40Mhz,
         include_bytes!("../../resources/bootloaders/esp32-bootloader.bin"),
     );
 
diff --git a/espflash/src/targets/esp32.rs b/espflash/src/targets/esp32.rs
index 802f70c..071acb7 100644
--- a/espflash/src/targets/esp32.rs
+++ b/espflash/src/targets/esp32.rs
@@ -23,6 +23,7 @@ const PARAMS: Esp32Params = Esp32Params::new(
     0x1_0000,
     0x3f_0000,
     0,
+    FlashFrequency::_40Mhz,
     include_bytes!("../../resources/bootloaders/esp32-bootloader.bin"),
 );
 
diff --git a/espflash/src/targets/esp32c2.rs b/espflash/src/targets/esp32c2.rs
index 10057cd..6311647 100644
--- a/espflash/src/targets/esp32c2.rs
+++ b/espflash/src/targets/esp32c2.rs
@@ -26,6 +26,7 @@ const PARAMS: Esp32Params = Esp32Params::new(
     0x1_0000,
     0x1f_0000,
     12,
+    FlashFrequency::_30Mhz,
     include_bytes!("../../resources/bootloaders/esp32c2-bootloader.bin"),
 );
 
diff --git a/espflash/src/targets/esp32c3.rs b/espflash/src/targets/esp32c3.rs
index cb582bd..9908d6c 100644
--- a/espflash/src/targets/esp32c3.rs
+++ b/espflash/src/targets/esp32c3.rs
@@ -26,6 +26,7 @@ const PARAMS: Esp32Params = Esp32Params::new(
     0x1_0000,
     0x3f_0000,
     5,
+    FlashFrequency::_40Mhz,
     include_bytes!("../../resources/bootloaders/esp32c3-bootloader.bin"),
 );
 
diff --git a/espflash/src/targets/esp32c6.rs b/espflash/src/targets/esp32c6.rs
index 4e58747..6c835bc 100644
--- a/espflash/src/targets/esp32c6.rs
+++ b/espflash/src/targets/esp32c6.rs
@@ -23,6 +23,7 @@ const PARAMS: Esp32Params = Esp32Params::new(
     0x1_0000,
     0x3f_0000,
     13,
+    FlashFrequency::_40Mhz,
     include_bytes!("../../resources/bootloaders/esp32c6-bootloader.bin"),
 );
 
diff --git a/espflash/src/targets/esp32h2.rs b/espflash/src/targets/esp32h2.rs
index 4ce3d9d..e13a1f3 100644
--- a/espflash/src/targets/esp32h2.rs
+++ b/espflash/src/targets/esp32h2.rs
@@ -24,6 +24,7 @@ const PARAMS: Esp32Params = Esp32Params::new(
     0x1_0000,
     0x3f_0000,
     16,
+    FlashFrequency::_24Mhz,
     include_bytes!("../../resources/bootloaders/esp32h2-bootloader.bin"),
 );
 
diff --git a/espflash/src/targets/esp32s2.rs b/espflash/src/targets/esp32s2.rs
index 706f272..881d1db 100644
--- a/espflash/src/targets/esp32s2.rs
+++ b/espflash/src/targets/esp32s2.rs
@@ -25,6 +25,7 @@ const PARAMS: Esp32Params = Esp32Params::new(
     0x1_0000,
     0x10_0000,
     2,
+    FlashFrequency::_40Mhz,
     include_bytes!("../../resources/bootloaders/esp32s2-bootloader.bin"),
 );
 
diff --git a/espflash/src/targets/esp32s3.rs b/espflash/src/targets/esp32s3.rs
index 03245d1..75c77ff 100644
--- a/espflash/src/targets/esp32s3.rs
+++ b/espflash/src/targets/esp32s3.rs
@@ -23,6 +23,7 @@ const PARAMS: Esp32Params = Esp32Params::new(
     0x1_0000,
     0x10_0000,
     9,
+    FlashFrequency::_40Mhz,
     include_bytes!("../../resources/bootloaders/esp32s3-bootloader.bin"),
 );
 
diff --git a/espflash/src/targets/mod.rs b/espflash/src/targets/mod.rs
index 0e7ade9..8412983 100644
--- a/espflash/src/targets/mod.rs
+++ b/espflash/src/targets/mod.rs
@@ -133,6 +133,7 @@ pub struct Esp32Params {
     pub app_addr: u32,
     pub app_size: u32,
     pub chip_id: u16,
+    pub flash_freq: FlashFrequency,
     pub default_bootloader: &'static [u8],
 }
 
@@ -142,6 +143,7 @@ impl Esp32Params {
         app_addr: u32,
         app_size: u32,
         chip_id: u16,
+        flash_freq: FlashFrequency,
         bootloader: &'static [u8],
     ) -> Self {
         Self {
@@ -154,6 +156,7 @@ impl Esp32Params {
             app_addr,
             app_size,
             chip_id,
+            flash_freq,
             default_bootloader: bootloader,
         }
     }