Save merged binary under build

Author: theelims

.gitignore

@@ -11,8 +11,7 @@ node_modules
 /releases
 /src/certs
 /temp
-/build/firmware
-/build/elf
+/build
 /lib/framework/WWWData.h
 *WWWData.h
 lib/framework/WWWData.h

docs/buildprocess.md

@@ -174,4 +174,4 @@ The static files for the website are build using vite. By default vite adds a un
 
 ## Merged Firmware File for Web Flasher
 
-The PIO build system calls a script `merge_bin.py` to create a merged firmware binary ready to be used with [ESP Web Tools](https://esphome.github.io/esp-web-tools/). The file is located under the PIO build folder. Typically `.pio/build/{env}/firmware_merged.bin`.
+The PIO build system calls a script `merge_bin.py` to create a merged firmware binary ready to be used with [ESP Web Tools](https://esphome.github.io/esp-web-tools/). The file is located under the PIO build folder. Typically `build/merged/{APP_NAME}_{$PIOENV}_{APP_VERSION}.bin`.

scripts/merge_bin.py

@@ -1,9 +1,23 @@
+import os
+import re
 Import("env")
 
 APP_BIN = "$BUILD_DIR/${PROGNAME}.bin"
-MERGED_BIN = "$BUILD_DIR/firmware_merged.bin"
+OUTPUT_DIR = "$PROJECT_DIR{}build{}merged{}".format(os.path.sep, os.path.sep, os.path.sep)
+
 BOARD_CONFIG = env.BoardConfig()
 
+def readFlag(flag):
+    buildFlags = env.ParseFlags(env["BUILD_FLAGS"])
+    # print(buildFlags.get("CPPDEFINES"))
+    for define in buildFlags.get("CPPDEFINES"):
+        if (define == flag or (isinstance(define, list) and define[0] == flag)):
+            # print("Found "+flag+" = "+define[1])
+            # strip quotes ("") from define[1]
+            cleanedFlag = re.sub(r'^"|"$', '', define[1])
+            return cleanedFlag
+    return None
+
 
 def merge_bin(source, target, env):
     # The list contains all extra images (bootloader, partitions, eboot) and
@@ -21,6 +35,8 @@ def merge_bin(source, target, env):
     if memory_type == "opi_opi" or memory_type == "opi_qspi":
         flash_mode = "dout"
 
+    MERGED_BIN = "{}{}_{}_{}.bin".format(OUTPUT_DIR, readFlag("APP_NAME"), env.get('PIOENV'), readFlag("APP_VERSION").replace(".", "-"))
+
     # Run esptool to merge images into a single binary
     env.Execute(
         " ".join(