From 515707ba8db3dd4ba5257f41e9a44631e2a19652 Mon Sep 17 00:00:00 2001
From: Sergio Gasquez <sergio.gasquez@gmail.com>
Date: Wed, 22 Nov 2023 12:09:46 +0100
Subject: [PATCH] fix: Fix rebase errors

---
 cargo-espflash/src/main.rs   | 1 -
 espflash/src/bin/espflash.rs | 1 +
 espflash/src/flasher/mod.rs  | 1 +
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/cargo-espflash/src/main.rs b/cargo-espflash/src/main.rs
index ed2f9af5..4b56daec 100644
--- a/cargo-espflash/src/main.rs
+++ b/cargo-espflash/src/main.rs
@@ -577,7 +577,6 @@ fn save_image(args: SaveImageArgs) -> Result<()> {
         flash_data,
         args.save_image_args.merge,
         args.save_image_args.skip_padding,
-        args.save_image_args.skip_padding,
     )?;
 
     Ok(())
diff --git a/espflash/src/bin/espflash.rs b/espflash/src/bin/espflash.rs
index 76905f07..3d4d62a4 100644
--- a/espflash/src/bin/espflash.rs
+++ b/espflash/src/bin/espflash.rs
@@ -236,6 +236,7 @@ fn flash(args: FlashArgs, config: &Config) -> Result<()> {
         let flash_data = FlashData::new(
             bootloader,
             partition_table,
+            args.flash_args.partition_table_offset,
             args.flash_args.format,
             args.flash_args.target_app_partition,
             flash_settings,
diff --git a/espflash/src/flasher/mod.rs b/espflash/src/flasher/mod.rs
index c615f2f6..2621ee6e 100644
--- a/espflash/src/flasher/mod.rs
+++ b/espflash/src/flasher/mod.rs
@@ -273,6 +273,7 @@ impl FlashData {
     pub fn new(
         bootloader: Option<&Path>,
         partition_table: Option<&Path>,
+        partition_table_offset: Option<u32>,
         image_format: Option<ImageFormatKind>,
         target_app_partition: Option<String>,
         flash_settings: FlashSettings,