From 4efbc035bac1b68474d7a8e8be3f6d4ec8fbf7e6 Mon Sep 17 00:00:00 2001
From: jpirnay <jens@pirnay.com>
Date: Tue, 21 Apr 2026 21:47:30 +0200
Subject: [PATCH] Try resetting the version info

---
 .github/workflows/release.yml           | 22 ++++++++++++++++++++++
 .github/workflows/release_candidate.yml | 14 ++++++++++++++
 platformio.ini                          |  2 +-
 src/main.cpp                            |  2 ++
 4 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index aae332c1..360e9076 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -28,6 +28,28 @@ jobs:
       - name: Build CrossPoint
         run: pio run -e gh_release
 
+      - name: Patch min_chip_rev_full to 0
+        run: |
+          python3 - <<'EOF'
+          import struct, sys
+          # esp_image_header_t (8 bytes) + extended header:
+          #   offset 0: wp_pin (B)
+          #   offset 1: clk/q drv (B)
+          #   offset 2: d/cs drv (B)
+          #   offset 3: hd/wp drv (B)
+          #   offset 4: chip_id (H, 2 bytes)
+          #   offset 6: min_rev (B)
+          #   offset 7: min_rev_full (H, 2 bytes)  <-- patch target
+          MIN_REV_FULL_OFFSET = 8 + 7
+          path = ".pio/build/gh_release/firmware.bin"
+          with open(path, "r+b") as f:
+              f.seek(MIN_REV_FULL_OFFSET)
+              old = struct.unpack("<H", f.read(2))[0]
+              print(f"min_chip_rev_full: {old // 100}.{old % 100} -> 0.0")
+              f.seek(MIN_REV_FULL_OFFSET)
+              f.write(struct.pack("<H", 0))
+          EOF
+
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
         with:
diff --git a/.github/workflows/release_candidate.yml b/.github/workflows/release_candidate.yml
index ea3f10b2..7b814aea 100644
--- a/.github/workflows/release_candidate.yml
+++ b/.github/workflows/release_candidate.yml
@@ -35,6 +35,20 @@ jobs:
           CROSSPOINT_RC_HASH: ${{ env.SHORT_SHA }}
         run: pio run -e gh_release_rc
 
+      - name: Patch min_chip_rev_full to 0
+        run: |
+          python3 - <<'EOF'
+          import struct, sys
+          MIN_REV_FULL_OFFSET = 8 + 7
+          path = ".pio/build/gh_release_rc/firmware.bin"
+          with open(path, "r+b") as f:
+              f.seek(MIN_REV_FULL_OFFSET)
+              old = struct.unpack("<H", f.read(2))[0]
+              print(f"min_chip_rev_full: {old // 100}.{old % 100} -> 0.0")
+              f.seek(MIN_REV_FULL_OFFSET)
+              f.write(struct.pack("<H", 0))
+          EOF
+
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
         with:
diff --git a/platformio.ini b/platformio.ini
index c989c1cc..c8498aed 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -3,7 +3,7 @@ default_envs = default
 extra_configs = platformio.local.ini
 
 [crosspoint]
-version = 1.38
+version = 1.36
 
 [base]
 platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.37/platform-espressif32.zip
diff --git a/src/main.cpp b/src/main.cpp
index 67dd6127..be50ab2e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -26,6 +26,7 @@
 #include "activities/Activity.h"
 #include "activities/ActivityManager.h"
 #include "components/UITheme.h"
+#include "esp_ota_ops.h"
 #include "fontIds.h"
 #include "util/ButtonNavigator.h"
 #include "util/ScreenshotUtil.h"
@@ -180,6 +181,7 @@ void setupDisplayAndFonts() {
 }
 
 void setup() {
+  esp_ota_mark_app_valid_cancel_rollback();
   HalSystem::begin();
   gpio.begin();
   powerManager.begin();