Try resetting the version info
This commit is contained in:
@@ -28,6 +28,28 @@ jobs:
|
|||||||
- name: Build CrossPoint
|
- name: Build CrossPoint
|
||||||
run: pio run -e gh_release
|
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
|
- name: Upload Artifacts
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
|
|||||||
@@ -35,6 +35,20 @@ jobs:
|
|||||||
CROSSPOINT_RC_HASH: ${{ env.SHORT_SHA }}
|
CROSSPOINT_RC_HASH: ${{ env.SHORT_SHA }}
|
||||||
run: pio run -e gh_release_rc
|
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
|
- name: Upload Artifacts
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
|
|||||||
+1
-1
@@ -3,7 +3,7 @@ default_envs = default
|
|||||||
extra_configs = platformio.local.ini
|
extra_configs = platformio.local.ini
|
||||||
|
|
||||||
[crosspoint]
|
[crosspoint]
|
||||||
version = 1.38
|
version = 1.36
|
||||||
|
|
||||||
[base]
|
[base]
|
||||||
platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.37/platform-espressif32.zip
|
platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.37/platform-espressif32.zip
|
||||||
|
|||||||
@@ -26,6 +26,7 @@
|
|||||||
#include "activities/Activity.h"
|
#include "activities/Activity.h"
|
||||||
#include "activities/ActivityManager.h"
|
#include "activities/ActivityManager.h"
|
||||||
#include "components/UITheme.h"
|
#include "components/UITheme.h"
|
||||||
|
#include "esp_ota_ops.h"
|
||||||
#include "fontIds.h"
|
#include "fontIds.h"
|
||||||
#include "util/ButtonNavigator.h"
|
#include "util/ButtonNavigator.h"
|
||||||
#include "util/ScreenshotUtil.h"
|
#include "util/ScreenshotUtil.h"
|
||||||
@@ -180,6 +181,7 @@ void setupDisplayAndFonts() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void setup() {
|
void setup() {
|
||||||
|
esp_ota_mark_app_valid_cancel_rollback();
|
||||||
HalSystem::begin();
|
HalSystem::begin();
|
||||||
gpio.begin();
|
gpio.begin();
|
||||||
powerManager.begin();
|
powerManager.begin();
|
||||||
|
|||||||
Reference in New Issue
Block a user