Skip to content

Enable servo tab for WING define #4635

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 2 commits into from
Sep 29, 2025
Merged

Enable servo tab for WING define #4635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f9f6fc
Enable servo tab for WING define
haslinghuis Sep 27, 2025
28f5903
Per review sonar
haslinghuis Sep 29, 2025
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
63 changes: 34 additions & 29 deletions src/js/serial_backend.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,18 @@ function connectDisconnect() {

GUI.configuration_loaded = false;

if (!isConnected) {
if (isConnected) {
// If connected, start disconnection sequence
GUI.timeout_kill_all();
GUI.interval_kill_all();
GUI.tab_switch_cleanup(() => (GUI.tab_switch_in_progress = false));

function onFinishCallback() {
finishClose(toggleStatus);
}

mspHelper?.setArmingEnabled(true, false, onFinishCallback);
} else {
// prevent connection when we do not have permission
if (selectedPort.startsWith("requestpermission")) {
return;
Expand Down Expand Up @@ -145,17 +156,6 @@ function connectDisconnect() {
{ baudRate: PortHandler.portPicker.selectedBauds },
selectedPort === "virtual" ? onOpenVirtual : undefined,
);
} else {
// If connected, start disconnection sequence
GUI.timeout_kill_all();
GUI.interval_kill_all();
GUI.tab_switch_cleanup(() => (GUI.tab_switch_in_progress = false));

function onFinishCallback() {
finishClose(toggleStatus);
}

mspHelper?.setArmingEnabled(true, false, onFinishCallback);
}

// show CLI panel on Control+I
Expand Down Expand Up @@ -395,8 +395,8 @@ function onOpenVirtual() {
// Set connection timestamp for virtual connections
connectionTimestamp = Date.now();
setTimeout(() => {
if (window.vm?.CONNECTION) {
window.vm.CONNECTION.timestamp = connectionTimestamp;
if (globalThis.vm?.CONNECTION) {
globalThis.vm.CONNECTION.timestamp = connectionTimestamp;
}
}, 100);

Expand Down Expand Up @@ -460,17 +460,17 @@ function processBoardInfo() {
}
}

function checkReportProblem(problemName, problems) {
if (bit_check(FC.CONFIG.configurationProblems, FC.CONFIGURATION_PROBLEM_FLAGS[problemName])) {
problems.push({ name: problemName, description: i18n.getMessage(`reportProblemsDialog${problemName}`) });
return true;
}
return false;
}

function checkReportProblems() {
const problemItemTemplate = $("#dialogReportProblems-listItemTemplate");

function checkReportProblem(problemName, problems) {
if (bit_check(FC.CONFIG.configurationProblems, FC.CONFIGURATION_PROBLEM_FLAGS[problemName])) {
problems.push({ name: problemName, description: i18n.getMessage(`reportProblemsDialog${problemName}`) });
return true;
}
return false;
}

MSP.send_message(MSPCodes.MSP_STATUS, false, false, function () {
let needsProblemReportingDialog = false;
const problemDialogList = $("#dialogReportProblems-list");
Expand Down Expand Up @@ -509,9 +509,9 @@ function checkReportProblems() {
}

if (needsProblemReportingDialog) {
problems.forEach((problem) => {
for (const problem of problems) {
problemItemTemplate.clone().html(problem.description).appendTo(problemDialogList);
});
}

const problemDialog = $("#dialogReportProblems")[0];
$("#dialogReportProblems-closebtn").click(function () {
Expand Down Expand Up @@ -564,8 +564,8 @@ async function processUid() {
// Update the global CONNECTION object for Vue components
// Use a small delay to ensure the Vue app is mounted
setTimeout(() => {
if (window.vm?.CONNECTION) {
window.vm.CONNECTION.timestamp = connectionTimestamp;
if (globalThis.vm?.CONNECTION) {
globalThis.vm.CONNECTION.timestamp = connectionTimestamp;
}
}, 100);

Expand Down Expand Up @@ -617,6 +617,11 @@ function finishOpen() {
GUI.allowedTabs.push(tab);
}
}

// Special case: USE_WING includes servo functionality but doesn't expose USE_SERVOS in build options
if (FC.CONFIG.buildOptions.some((opt) => opt.includes("USE_WING")) && !GUI.allowedTabs.includes("servos")) {
GUI.allowedTabs.push("servos");
}
} else {
GUI.allowedTabs = Array.from(GUI.defaultAllowedFCTabsWhenConnected);
}
Expand Down Expand Up @@ -665,7 +670,7 @@ function onConnect() {
});

if (FC.CONFIG.boardType == 0) {
if (classes.indexOf("osd-required") >= 0) {
if (classes.includes("osd-required")) {
found = false;
}
}
Expand Down Expand Up @@ -704,8 +709,8 @@ function onClosed(result) {
// Clear connection timestamp
connectionTimestamp = null;
setTimeout(() => {
if (window.vm?.CONNECTION) {
window.vm.CONNECTION.timestamp = null;
if (globalThis.vm?.CONNECTION) {
globalThis.vm.CONNECTION.timestamp = null;
}
}, 100);

Expand Down
2 changes: 1 addition & 1 deletion src/js/utils/updateTabList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export function updateTabList(features) {
$("#tabs ul.mode-connected li.tab_sensors").toggle(isExpertModeEnabled);
$("#tabs ul.mode-connected li.tab_logging").toggle(isExpertModeEnabled);
$("#tabs ul.mode-connected li.tab_servos").toggle(
isExpertModeEnabled && FC.CONFIG?.buildOptions?.includes("USE_SERVOS"),
["USE_SERVOS", "USE_WING"].some((option) => FC.CONFIG?.buildOptions?.includes(option)),
);

$("#tabs ul.mode-connected li.tab_gps").toggle(FC.CONFIG?.buildOptions?.includes("USE_GPS"));
Expand Down