stay compatible with 1.0.x

Author: icewind1991

cargo-espflash/src/main.rs

@@ -245,7 +245,12 @@ fn flash(
     if matches.is_present("ram") {
         flasher.load_elf_to_ram(&elf_data)?;
     } else {
-        flasher.load_elf_to_flash(&elf_data, bootloader, partition_table, image_format)?;
+        flasher.load_elf_to_flash_with_format(
+            &elf_data,
+            bootloader,
+            partition_table,
+            image_format,
+        )?;
     }
     println!("\nFlashing has completed!");
 

espflash/src/flasher.rs

@@ -439,7 +439,7 @@ impl Flasher {
     }
 
     /// Load an elf image to flash and execute it
-    pub fn load_elf_to_flash(
+    pub fn load_elf_to_flash_with_format(
         &mut self,
         elf_data: &[u8],
         bootloader: Option<Vec<u8>>,
@@ -471,6 +471,16 @@ impl Flasher {
         Ok(())
     }
 
+    /// Load an elf image to flash and execute it
+    pub fn load_elf_to_flash(
+        &mut self,
+        elf_data: &[u8],
+        bootloader: Option<Vec<u8>>,
+        partition_table: Option<PartitionTable>,
+    ) -> Result<(), Error> {
+        self.load_elf_to_flash_with_format(elf_data, bootloader, partition_table, None)
+    }
+
     pub fn change_baud(&mut self, speed: BaudRate) -> Result<(), Error> {
         self.connection
             .with_timeout(CommandType::ChangeBaud.timeout(), |connection| {

espflash/src/main.rs

@@ -105,7 +105,12 @@ fn main() -> Result<()> {
                     partition_table_path.unwrap()
                 )
             })?;
-        flasher.load_elf_to_flash(&input_bytes, bootloader, partition_table, image_format)?;
+        flasher.load_elf_to_flash_with_format(
+            &input_bytes,
+            bootloader,
+            partition_table,
+            image_format,
+        )?;
     }
 
     Ok(())