Corrige l'OTA GitHub pour distinguer les builds headless et ecran

Author: jjtronics

.github/workflows/release.yml

@@ -39,7 +39,9 @@ jobs:
         run: pip install platformio
 
       - name: Build firmware
-        run: pio run -e soundpanel7_ota
+        run: |
+          pio run -e soundpanel7_ota
+          pio run -e soundpanel7_headless_ota
 
       - name: Generate release manifest
         env:
@@ -51,6 +53,7 @@ jobs:
             --repository "${REPOSITORY}" \
             --published-at "${{ github.event.release.published_at }}" \
             --build-dir .pio/build/soundpanel7_ota \
+            --headless-build-dir .pio/build/soundpanel7_headless_ota \
             --output .pio/build/soundpanel7_ota/release-manifest.json
 
       - name: Upload release workflow artifact
@@ -61,6 +64,9 @@ jobs:
             .pio/build/soundpanel7_ota/firmware.bin
             .pio/build/soundpanel7_ota/bootloader.bin
             .pio/build/soundpanel7_ota/partitions.bin
+            .pio/build/soundpanel7_headless_ota/firmware.bin
+            .pio/build/soundpanel7_headless_ota/bootloader.bin
+            .pio/build/soundpanel7_headless_ota/partitions.bin
             .pio/build/soundpanel7_ota/release-manifest.json
 
       - name: Attach binaries to GitHub release
@@ -71,5 +77,8 @@ jobs:
             .pio/build/soundpanel7_ota/firmware.bin#soundpanel7_ota-firmware.bin \
             .pio/build/soundpanel7_ota/bootloader.bin#soundpanel7_ota-bootloader.bin \
             .pio/build/soundpanel7_ota/partitions.bin#soundpanel7_ota-partitions.bin \
+            .pio/build/soundpanel7_headless_ota/firmware.bin#soundpanel7_headless_ota-firmware.bin \
+            .pio/build/soundpanel7_headless_ota/bootloader.bin#soundpanel7_headless_ota-bootloader.bin \
+            .pio/build/soundpanel7_headless_ota/partitions.bin#soundpanel7_headless_ota-partitions.bin \
             .pio/build/soundpanel7_ota/release-manifest.json#release-manifest.json \
             --clobber

RELEASING.md

@@ -33,6 +33,7 @@ If the current state is the one you want to publish, release:
 
 ```bash
 pio run -e soundpanel7_ota
+pio run -e soundpanel7_headless_ota
 ```
 
 4. Optionally validate the USB build too:
@@ -79,6 +80,9 @@ After a successful release build, useful firmware files are generated in:
 - `.pio/build/soundpanel7_ota/firmware.bin`
 - `.pio/build/soundpanel7_ota/bootloader.bin`
 - `.pio/build/soundpanel7_ota/partitions.bin`
+- `.pio/build/soundpanel7_headless_ota/firmware.bin`
+- `.pio/build/soundpanel7_headless_ota/bootloader.bin`
+- `.pio/build/soundpanel7_headless_ota/partitions.bin`
 - `.pio/build/soundpanel7_ota/release-manifest.json`
 
 If GitHub Actions is enabled for the repository, publishing the GitHub release will automatically build the firmware and attach these files to the release.
@@ -94,7 +98,7 @@ The release workflow also publishes `release-manifest.json`.
 Its purpose is to give the device a stable machine-readable source for:
 
 - latest version
-- OTA firmware URL
+- OTA firmware URLs per hardware profile
 - SHA-256 checksum
 - release metadata
 
@@ -108,16 +112,28 @@ Current structure:
   "published_at": "2026-03-13T12:00:00Z",
   "release_url": "https://github.com/jjtronics/SoundPanel7/releases/tag/v0.2.0",
   "ota": {
-    "name": "firmware.bin",
+    "name": "soundpanel7_ota-firmware.bin",
     "type": "firmware",
-    "url": "https://github.com/jjtronics/SoundPanel7/releases/download/v0.2.0/firmware.bin",
+    "url": "https://github.com/jjtronics/SoundPanel7/releases/download/v0.2.0/soundpanel7_ota-firmware.bin",
+    "sha256": "..."
+  },
+  "ota_screen": {
+    "name": "soundpanel7_ota-firmware.bin",
+    "type": "firmware",
+    "url": "https://github.com/jjtronics/SoundPanel7/releases/download/v0.2.0/soundpanel7_ota-firmware.bin",
+    "sha256": "..."
+  },
+  "ota_headless": {
+    "name": "soundpanel7_headless_ota-firmware.bin",
+    "type": "firmware",
+    "url": "https://github.com/jjtronics/SoundPanel7/releases/download/v0.2.0/soundpanel7_headless_ota-firmware.bin",
     "sha256": "..."
   },
   "assets": [
     {
-      "name": "firmware.bin",
+      "name": "soundpanel7_ota-firmware.bin",
       "type": "firmware",
-      "url": "https://github.com/jjtronics/SoundPanel7/releases/download/v0.2.0/firmware.bin",
+      "url": "https://github.com/jjtronics/SoundPanel7/releases/download/v0.2.0/soundpanel7_ota-firmware.bin",
       "sha256": "..."
     }
   ]
@@ -128,8 +144,8 @@ For the future update-check task, the recommended flow is:
 
 1. fetch `release-manifest.json`
 2. compare `version` with the current firmware version
-3. use `ota.url` for download
-4. verify `ota.sha256` before applying the update
+3. choose the correct OTA entry for the current hardware profile
+4. verify the matching SHA-256 before applying the update
 
 ## Suggested first release notes
 

custom_components/soundpanel7/manifest.json

@@ -8,7 +8,7 @@
   "iot_class": "local_polling",
   "issue_tracker": "https://github.com/jjtronics/SoundPanel7/issues",
   "requirements": [],
-  "version": "0.2.12",
+  "version": "0.2.13",
   "zeroconf": [
     {
       "type": "_soundpanel7._tcp.local."

include/AppConfig.h

@@ -2,7 +2,7 @@
 #pragma once
 #include <stdint.h>
 
-#define SOUNDPANEL7_VERSION "0.2.12"
+#define SOUNDPANEL7_VERSION "0.2.13"
 #define SOUNDPANEL7_BUILD_DATE __DATE__ " " __TIME__
 
 #ifndef SOUNDPANEL7_BUILD_ENV

src/ReleaseUpdateManager.cpp

@@ -57,6 +57,29 @@ String extractReleaseAssetField(const String& payload, const char* assetName, co
   const String scope = payload.substring(assetPos, nextAssetPos);
   return sp7json::parseString(scope, fieldName, def, false);
 }
+
+const char* preferredReleaseFirmwareAssetName() {
+#if SOUNDPANEL7_HAS_SCREEN
+  return "soundpanel7_ota-firmware.bin";
+#else
+  return "soundpanel7_headless_ota-firmware.bin";
+#endif
+}
+
+bool selectManifestOtaForCurrentProfile(const String& payload, String& otaUrl, String& otaSha256) {
+#if SOUNDPANEL7_HAS_SCREEN
+  otaUrl = sp7json::parseString(payload, "otaScreenUrl", "", false);
+  otaSha256 = sp7json::parseString(payload, "otaScreenSha256", "", false);
+#else
+  otaUrl = sp7json::parseString(payload, "otaHeadlessUrl", "", false);
+  otaSha256 = sp7json::parseString(payload, "otaHeadlessSha256", "", false);
+#endif
+  if (!otaUrl.isEmpty() && otaSha256.length() == 64) return true;
+
+  otaUrl = sp7json::parseString(payload, "url", "", false);
+  otaSha256 = sp7json::parseString(payload, "sha256", "", false);
+  return !otaUrl.isEmpty() && otaSha256.length() == 64;
+}
 }
 
 bool ReleaseUpdateManager::begin(NetManager* net) {
@@ -489,8 +512,14 @@ bool ReleaseUpdateManager::parseLatestReleaseApiPayload(const String& payload) {
   const String version = stripLeadingVersionPrefix(tag);
   const String publishedAt = sp7json::parseString(payload, "published_at", "", false);
   const String releaseUrl = sp7json::parseString(payload, "html_url", "", false);
-  const String otaUrl = extractReleaseAssetField(payload, "firmware.bin", "browser_download_url", "");
-  String otaSha256 = extractReleaseAssetField(payload, "firmware.bin", "digest", "");
+  const char* preferredAssetName = preferredReleaseFirmwareAssetName();
+  String otaUrl = extractReleaseAssetField(payload, preferredAssetName, "browser_download_url", "");
+  String otaSha256 = extractReleaseAssetField(payload, preferredAssetName, "digest", "");
+
+  if (otaUrl.isEmpty() || otaSha256.isEmpty()) {
+    otaUrl = extractReleaseAssetField(payload, "firmware.bin", "browser_download_url", "");
+    otaSha256 = extractReleaseAssetField(payload, "firmware.bin", "digest", "");
+  }
 
   if (version.isEmpty()) {
     setError("latest release missing tag_name");
@@ -561,8 +590,9 @@ bool ReleaseUpdateManager::parseManifest(const String& payload) {
   String version = sp7json::parseString(payload, "version", "", false);
   String publishedAt = sp7json::parseString(payload, "published_at", "", false);
   String releaseUrl = sp7json::parseString(payload, "release_url", "", false);
-  String otaUrl = sp7json::parseString(payload, "url", "", false);
-  String otaSha256 = sp7json::parseString(payload, "sha256", "", false);
+  String otaUrl;
+  String otaSha256;
+  selectManifestOtaForCurrentProfile(payload, otaUrl, otaSha256);
 
   if (version.isEmpty()) {
     setError("manifest missing version");

tools/generate_release_manifest.py

@@ -30,35 +30,58 @@ def main() -> int:
     parser.add_argument("--tag", required=True, help="Git tag, for example v0.1.5")
     parser.add_argument("--repository", required=True, help="GitHub repository, for example jjtronics/SoundPanel7")
     parser.add_argument("--published-at", required=True, help="Release publication timestamp")
-    parser.add_argument("--build-dir", required=True, help="Directory containing firmware artifacts")
+    parser.add_argument("--build-dir", required=True, help="Directory containing screen firmware artifacts")
+    parser.add_argument("--headless-build-dir", required=True, help="Directory containing headless firmware artifacts")
     parser.add_argument("--output", required=True, help="Output manifest path")
     args = parser.parse_args()
 
     build_dir = Path(args.build_dir)
+    headless_build_dir = Path(args.headless_build_dir)
     output = Path(args.output)
     version = args.tag[1:] if args.tag.startswith("v") else args.tag
 
     firmware = build_asset(
         args.repository,
         args.tag,
-        "firmware.bin",
+        "soundpanel7_ota-firmware.bin",
         "firmware",
         build_dir / "firmware.bin",
     )
+    firmware_headless = build_asset(
+        args.repository,
+        args.tag,
+        "soundpanel7_headless_ota-firmware.bin",
+        "firmware",
+        headless_build_dir / "firmware.bin",
+    )
     bootloader = build_asset(
         args.repository,
         args.tag,
-        "bootloader.bin",
+        "soundpanel7_ota-bootloader.bin",
         "bootloader",
         build_dir / "bootloader.bin",
     )
+    bootloader_headless = build_asset(
+        args.repository,
+        args.tag,
+        "soundpanel7_headless_ota-bootloader.bin",
+        "bootloader",
+        headless_build_dir / "bootloader.bin",
+    )
     partitions = build_asset(
         args.repository,
         args.tag,
-        "partitions.bin",
+        "soundpanel7_ota-partitions.bin",
         "partitions",
         build_dir / "partitions.bin",
     )
+    partitions_headless = build_asset(
+        args.repository,
+        args.tag,
+        "soundpanel7_headless_ota-partitions.bin",
+        "partitions",
+        headless_build_dir / "partitions.bin",
+    )
 
     manifest = {
         "project": "SoundPanel7",
@@ -67,7 +90,20 @@ def main() -> int:
         "published_at": args.published_at,
         "release_url": f"https://github.com/{args.repository}/releases/tag/{args.tag}",
         "ota": firmware,
-        "assets": [firmware, bootloader, partitions],
+        "ota_screen": firmware,
+        "ota_headless": firmware_headless,
+        "otaScreenUrl": firmware["url"],
+        "otaScreenSha256": firmware["sha256"],
+        "otaHeadlessUrl": firmware_headless["url"],
+        "otaHeadlessSha256": firmware_headless["sha256"],
+        "assets": [
+            firmware,
+            bootloader,
+            partitions,
+            firmware_headless,
+            bootloader_headless,
+            partitions_headless,
+        ],
     }
 
     output.write_text(json.dumps(manifest, indent=2) + "\n", encoding="utf-8")