From 401a134658bb55a374ff51f32e97a3c596ff5193 Mon Sep 17 00:00:00 2001
From: fvanroie <cpt_jack@msn.com>
Date: Mon, 26 Aug 2024 01:21:10 +0200
Subject: [PATCH] Add minifests to build step

---
 .github/workflows/build.yaml |  2 +-
 platformio.ini               |  2 +-
 tools/esp_merge_bin.py       | 51 ++++++++++++++++++++++++++++++++++--
 3 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 64838bd1..ec5fbb22 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -101,7 +101,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.environment.out }}
-          path: build_output/firmware/*.bin
+          path: build_output/firmware/*.*n
       - name: Create release and upload firmware
         if: github.ref != 'refs/heads/master'
         run: |
diff --git a/platformio.ini b/platformio.ini
index a003dc93..90ddcee9 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -75,7 +75,7 @@ build_flags =
     -D HASP_VER_MAJ=0
     -D HASP_VER_MIN=7
     ;-D HASP_VER_REV=4
-    -D HASP_VER_REV=0-rc12
+    -D HASP_VER_REV=0-rc13
     ;-D HASP_VER_REV=4-rc1
     ${override.build_flags}
 
diff --git a/tools/esp_merge_bin.py b/tools/esp_merge_bin.py
index 4c484f78..520f6c66 100644
--- a/tools/esp_merge_bin.py
+++ b/tools/esp_merge_bin.py
@@ -1,6 +1,5 @@
 Import('env')
-import os
-import sys
+import os, sys, json
 import shutil
 import subprocess
 import pkg_resources
@@ -106,6 +105,53 @@ def copy_merge_bins(source, target, env):
     print(stdout.decode("utf-8") )
     print(stderr.decode("utf-8") )
 
+def create_manifest(source, target, env):
+    short_version = 'v' + str(HASP_VER_MAJ) + '.' + str(HASP_VER_MIN) + '.' + str(HASP_VER_REV)
+    long_version = short_version + '_' + get_firmware_commit_hash()
+    name = str(target[0]).split(os.path.sep)[2]
+    name = name.replace('_4MB', '').replace('_8MB', '').replace('_16MB', '').replace('_32MB', '')
+    flash_size = env.GetProjectOption("board_upload.flash_size")
+    board = env.BoardConfig()
+    filename = "{}_full_{}_{}.json".format(name, flash_size, long_version)
+    output_json ="{}firmware{}{}".format(OUTPUT_DIR, os.path.sep, filename)
+
+    data = {"name":"openHASP", "version": short_version, "home_assistant_domain": "openhasp", "funding_url": "https://ko-fi.com/openhasp", "new_install_prompt_erase": True, "builds": "d"}
+    builds = []
+    parts = []
+    parts.append({ "path": filename, "offset": 0 })
+
+    mcu = board.get("build.mcu", "esp32")
+    if (mcu == 'esp32'):
+        builds.append({ "chipFamily": "ESP32", "improv": False })
+    elif (mcu == 'esp32s2'):
+        builds.append({ "chipFamily": "ESP32-S2", "improv": False })
+    elif (mcu == 'esp32s3'):
+        builds.append({ "chipFamily": "ESP32-S3", "improv": False })
+    elif (mcu == 'esp32c3'):
+        builds.append({ "chipFamily": "ESP32-C3", "improv": False })
+    elif (mcu == 'esp32c6'):
+        builds.append({ "chipFamily": "ESP32-C6", "improv": False })
+    builds[0]["parts"] = parts
+    data["builds"] = builds
+    json_data = json.dumps(data, indent=4, sort_keys=False)
+    print(json_data)
+
+    # check if output directories exist and create if necessary
+    if not os.path.isdir(OUTPUT_DIR):
+        os.mkdir(OUTPUT_DIR)
+
+    for d in ['firmware', 'map']:
+        if not os.path.isdir("{}{}".format(OUTPUT_DIR, d)):
+            os.mkdir("{}{}".format(OUTPUT_DIR, d))
+
+    # check if new target files exist and remove if necessary
+    for f in [output_json]:
+        if os.path.isfile(f):
+            os.remove(f)
+
+    with open(output_json, "w") as outfile:
+        outfile.write(json_data)
+
 def copy_ota(source, target, env):
     version = 'v' + str(HASP_VER_MAJ) + '.' + str(HASP_VER_MIN) + '.' + str(HASP_VER_REV) + '_' + get_firmware_commit_hash()
     name =str(target[0]).split(os.path.sep)[2]
@@ -135,4 +181,5 @@ def copy_ota(source, target, env):
 
 env.AddPreAction("$BUILD_DIR/${PROGNAME}.bin", [get_fw_version])
 env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", [copy_merge_bins])
+env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", [create_manifest])
 env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", [copy_ota])