Skip to content

OTA update page restyling, automatically set download URL based on info.repo #5419

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
softhack007 merged 15 commits into from
Mar 13, 2026
Merged

OTA update page restyling, automatically set download URL based on info.repo #5419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d2a3687
OTA update page restyling
softhack007 Mar 11, 2026
96571b4
fix inconsistent page title
softhack007 Mar 11, 2026
9329ac8
hide download link when repo=unknown
softhack007 Mar 11, 2026
52bbf5d
shorten long ifdef chain in json.cpp
softhack007 Mar 11, 2026
2865d0f
div --> span
softhack007 Mar 11, 2026
c750466
remove extra blank
softhack007 Mar 11, 2026
5c5a04e
help button accesibility fix
softhack007 Mar 11, 2026
52d3647
update visual improvements
softhack007 Mar 12, 2026
7ddc91e
typo
softhack007 Mar 12, 2026
97d5b13
? = Help
softhack007 Mar 12, 2026
13de989
minor restyling
softhack007 Mar 13, 2026
abde67f
prevent flickering badge
softhack007 Mar 13, 2026
c26d0cc
small fix
softhack007 Mar 13, 2026
23f8870
hide download line on fetch failure
softhack007 Mar 13, 2026
610cbc1
webView fix
softhack007 Mar 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions wled00/data/settings_sec.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" name="viewport">
<meta charset="utf-8">
<title>Misc Settings</title>
<title>Security & Update Setup</title>
<style> html { visibility: hidden; } </style> <!-- prevent white & ugly display while loading, unhidden in loadResources() -->
<script>
// load common.js with retry on error
Expand Down Expand Up @@ -45,7 +45,7 @@
<div class="helpB"><button type="button" onclick="H('features/settings/#security-settings')">?</button></div>
<button type="button" onclick="B()">Back</button><button type="submit">Save</button><hr>
</div>
<h2>Security & Update setup</h2>
<h2>Security & Update Setup</h2>
<div class="sec">
Settings PIN: <input type="password" id="PIN" name="PIN" size="4" maxlength="4" minlength="4" onkeydown="checkNum(this)" pattern="[0-9]*" inputmode="numeric" title="Please enter a 4 digit number"><br>
<div class="warn">&#9888; Unencrypted transmission. Be prudent when selecting PIN, do NOT use your banking, door, SIM, etc. pin!</div><br>
Expand Down
55 changes: 40 additions & 15 deletions wled00/data/update.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,21 @@
}
function GetV() {
// Fetch device info via JSON API instead of compiling it in
fetch('/json/info')
fetch(getURL('/json/info'))
.then(response => response.json())
.then(data => {
document.querySelector('.installed-version').textContent = `${data.brand} ${data.ver} (${data.vid})`;
document.querySelector('.release-name').textContent = data.release;
// TODO - assemble update URL
// assemble update URL and update release badge
if (data.repo && data.repo !== "unknown") {
const repoUrl = "https://github.com/" + data.repo + "/releases/latest";
const badgeUrl = "https://img.shields.io/github/release/" + data.repo + ".svg?style=flat-square";
document.querySelector('.release-repo').href = repoUrl;
document.querySelector('.release-badge').src = badgeUrl;
toggle('release-download'); // only show release download item after receiving a valid data.repo
} else {
gId('Norelease-download').classList.add("hide"); // repo invalid -> hide everything
}
// TODO - can this be done at build time?
if (data.arch == "esp8266") {
toggle('rev');
Expand All @@ -33,7 +42,7 @@
if (allowBl) {
toggle('bootupd')
if (data.bootloaderSHA256) {
gId('bootloader-hash').innerText = 'Current bootloader SHA256: ' + data.bootloaderSHA256;
gId('bootloader-hash').innerText = 'Current bootloader SHA256: \n' + data.bootloaderSHA256;
}
}
})
Expand All @@ -42,9 +51,12 @@
// Fallback to compiled-in value if API call fails
document.querySelector('.installed-version').textContent = 'Unknown';
document.querySelector('.release-name').textContent = 'Unknown';
gId('Norelease-download').classList.add("hide"); // fetch failed -> hide everything
});
}
function hideforms() {
gId('toprow').classList.add("hide"); // hide top row with "back" button
gId('backbtn').classList.add("hide"); // hide "back" button on bottom of the page
gId('bootupd').classList.add("hide");
toggle('upd');
}
Expand All @@ -54,32 +66,45 @@
</style>
</head>
<body onload="GetV();">
<h2>WLED Software Update</h2>
<div id="toprow" class="toprow">
<div class="helpB"><button type="button" aria-label="Help" title="Help" onclick="H('basics/getting-started/#software-update-procedure')">?</button></div>
<button type="button" onclick="B()">Back</button>
</div>
<br>
<form method='POST' action='./update' id='upd' enctype='multipart/form-data' onsubmit="hideforms()">
<div class="sec">
<h2>WLED Software Update</h2>
<p>
Installed version: <span class="sip installed-version">Loading...</span><br>
Release: <span class="sip release-name">Loading...</span><br>
Download the latest binary: <a href="https://github.com/wled-dev/WLED/releases" target="_blank"
<span id="Norelease-download">Latest binary: Checking...<br></span>
<span id="release-download" class="hide">
Download the latest binary: <a class="release-repo" href="https://github.com/wled/WLED/releases/latest" target="_blank" rel="noopener noreferrer"
style="vertical-align: text-bottom; display: inline-flex;">
<img src="https://img.shields.io/github/release/wled-dev/WLED.svg?style=flat-square"></a><br>
<img class="release-badge" alt="badge"></a><br> <!-- start with an empty placeholder, src will be filled after fetching /json/info -->
</span>
</p>
<input type="hidden" name="skipValidation" value="" id="sV">
<input type='file' name='update' required><br> <!--should have accept='.bin', but it prevents file upload from android app-->
<input type='checkbox' onchange="sV.value=checked?1:''" id="skipValidation">
<label for='skipValidation'>Ignore firmware validation</label><br>
<button type="submit">Update!</button><br>
<hr class="sml">
<button id="rev" type="button" onclick="cR()">Revert update</button><br>
<button type="button" onclick="B()">Back</button>
<button type="submit">Update WLED!</button><br>
<span id="rev">
<hr class="sml">
<button type="button" onclick="cR()">Revert update</button><br>
</span>
</div>
</form>
<div id="bootupd" class="hide">
<hr class="sml">
<div id="bootupd" class="hide sec">
<h2>Bootloader Update</h2>
<div id="bootloader-hash" class="sip" style="margin-bottom:8px;"></div>
<div id="bootloader-hash" class="sip" style="margin-bottom:8px;font-size:15px;white-space:pre-wrap;word-break:break-all;"></div>
<form method='POST' action='./updatebootloader' enctype='multipart/form-data' onsubmit="hideforms()">
<b>Warning:</b> Only upload verified ESP32 bootloader files!<br>
<b>Warning:</b> Only upload verified ESP32 bootloader files!<br><br>
<input type='file' name='update' required><br>
<button type="submit">Update Bootloader</button>
</form>
</div>
<div id="Noupd" class="hide"><b>Updating...</b><br>Please do not close or refresh the page :)</div>
<div id="Noupd" class="hide sec"><b>Updating...</b><br>Please do not close or refresh the page :)</div>
<p><button id="backbtn" type="button" onclick="B()">Back</button></p>
</body>
</html>
2 changes: 1 addition & 1 deletion wled00/json.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -810,7 +810,7 @@ void serializeInfo(JsonObject root)
wifi_info[F("txPower")] = (int) WiFi.getTxPower();
wifi_info[F("sleep")] = (bool) WiFi.getSleep();
#endif
#if !defined(CONFIG_IDF_TARGET_ESP32C2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32S3)
#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_IDF_TARGET_ESP32) // classic esp32 only: report "esp32" without package details
root[F("arch")] = "esp32";
#else
root[F("arch")] = ESP.getChipModel();
Expand Down
Loading