Skip to content

Fix firmware flasher board clearance while switching releases #4652

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
merged 1 commit into from
Oct 3, 2025
Merged

Fix firmware flasher board clearance while switching releases #4652

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 12 additions & 2 deletions src/js/tabs/firmware_flasher.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ firmware_flasher.initialize = async function (callback) {
$("a.load_remote_file").text(i18n.getMessage("firmwareFlasherButtonLoadOnline"));
}

function loadTargetList(targets) {
async function loadTargetList(targets) {
if (!targets || !ispConnected()) {
$('select[name="board"]').empty().append('<option value="0">Offline</option>');
$('select[name="firmware_version"]').empty().append('<option value="0">Offline</option>');
Expand Down Expand Up @@ -445,6 +445,7 @@ firmware_flasher.initialize = async function (callback) {
self.enableLoadRemoteFileButton(false);

const build_type = buildType_e.val();
const currentlySelectedBoard = $('select[name="board"]').val();

$('select[name="board"]')
.empty()
Expand All @@ -456,7 +457,16 @@ firmware_flasher.initialize = async function (callback) {

if (!GUI.connect_lock) {
try {
loadTargetList(await self.buildApi.loadTargets());
await loadTargetList(await self.buildApi.loadTargets());

// Restore the previously selected board if it was selected and still exists
if (
currentlySelectedBoard &&
currentlySelectedBoard !== "0" &&
$(`select[name="board"] option[value="${currentlySelectedBoard}"]`).length > 0
) {
$('select[name="board"]').val(currentlySelectedBoard).trigger("change");
}
} catch (err) {
console.error(err);
}
Expand Down