From 3334ce50580adfdcfe837d1268f6b7bc46b6ad8e Mon Sep 17 00:00:00 2001
From: Tomasz Duda <tomaszduda23@gmail.com>
Date: Sat, 25 Jan 2025 22:26:36 +0100
Subject: [PATCH] add support for merged image

---
 esphome/components/nrf52/__init__.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/esphome/components/nrf52/__init__.py b/esphome/components/nrf52/__init__.py
index ccffdd5064..7de306be21 100644
--- a/esphome/components/nrf52/__init__.py
+++ b/esphome/components/nrf52/__init__.py
@@ -118,6 +118,7 @@ def get_download_types(storage_json):
     UF2_PATH = "zephyr/zephyr.uf2"
     DFU_PATH = "firmware.zip"
     HEX_PATH = "zephyr/zephyr.hex"
+    HEX_MERGED_PATH = "zephyr/merged.hex"
     build_dir = Path(storage_json.firmware_bin_path).parent
     if (build_dir / UF2_PATH).is_file():
         types = [
@@ -139,7 +140,9 @@ def get_download_types(storage_json):
             {
                 "title": "HEX package",
                 "description": "For flashing via pyocd using SWD.",
-                "file": HEX_PATH,
+                "file": HEX_MERGED_PATH
+                if (build_dir / HEX_MERGED_PATH).is_file()
+                else HEX_PATH,
                 "download": f"{storage_json.name}.hex",
             },
         ]