Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -7218,7 +7218,7 @@
"message": "Blackbox logging rate"
},
"onboardLoggingDebugFields": {
"message": "Data included"
"message": "Debug Fields included"
},
"onboardLoggingDebugMode": {
"message": "Blackbox debug mode"
Expand Down
45 changes: 33 additions & 12 deletions src/js/tabs/onboard_logging.js
Original file line number Diff line number Diff line change
Expand Up @@ -114,15 +114,6 @@ onboard_logging.initialize = function (callback) {

if (FC.BLACKBOX.supported) {
$(".tab-onboard_logging a.save-settings").on("click", async function () {
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_45)) {
let fieldsMask = 0;

$(".blackboxDebugFields select option:not(:selected)").each(function () {
fieldsMask |= 1 << $(this).val();
});

FC.BLACKBOX.blackboxDisabledMask = fieldsMask;
}
FC.BLACKBOX.blackboxSampleRate = parseInt(loggingRatesSelect.val(), 10);
FC.BLACKBOX.blackboxPDenom = parseInt(loggingRatesSelect.val(), 10);
FC.BLACKBOX.blackboxDevice = parseInt(deviceSelect.val(), 10);
Expand Down Expand Up @@ -239,6 +230,38 @@ onboard_logging.initialize = function (callback) {
debugModeSelect.val(FC.PID_ADVANCED_CONFIG.debugMode).select2().sortSelect("NONE");
}

function createDebugTableRow(i, enabled) {
const row = $("<tr></tr>");
const checkboxCell = $("<td></td>");
const labelCell = $("<td></td>");

const checkbox = $(
`<input type="checkbox" class="toggle" name="blackboxDebugField${i}" value="${i}" ${enabled ? "checked" : ""}>`,
);
checkboxCell.append(checkbox);
checkboxCell.css("width", "40px");
row.append(checkboxCell);

const label = $(`<label for="blackboxDebugField${i}">${DEBUG.enableFields[i]}</label>`);
labelCell.append(label);
row.append(labelCell);

$(".blackboxDebugFieldsTable").append(row);

// Initialize the enable checkbox
checkboxCell.find("input").prop("checked", (FC.BLACKBOX.blackboxDisabledMask & (1 << i)) === 0);

// Add handler for enable/disable checkbox
checkboxCell.find("input").on("change", function () {
const checked = $(this).is(":checked");
if (checked) {
FC.BLACKBOX.blackboxDisabledMask &= ~(1 << i);
} else {
FC.BLACKBOX.blackboxDisabledMask |= 1 << i;
}
});
}

function populateDebugFields(debugFieldsSelect) {
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_45)) {
$(".blackboxDebugFields").show();
Expand All @@ -247,10 +270,8 @@ onboard_logging.initialize = function (callback) {

for (let i = 0; i < DEBUG.enableFields.length; i++) {
const enabled = (fieldsMask & (1 << i)) === 0;
debugFieldsSelect.append(new Option(DEBUG.enableFields[i], i, false, enabled));
createDebugTableRow(i, enabled);
}

debugFieldsSelect.sortSelect().multipleSelect();
} else {
$(".blackboxDebugFields").hide();
}
Expand Down
13 changes: 10 additions & 3 deletions src/tabs/onboard_logging.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,16 @@
</select>
<span class="blackboxDebugModeText" i18n="onboardLoggingDebugMode"></span>
</div>
<div class="line blackboxDebugFields">
<select name="blackboxDebugFields" multiple="multiple"></select>
<span i18n="onboardLoggingDebugFields"></span>
<div class="gui_box grey">
<div class="gui_box_titlebar">
<div class="spacer_box_title" i18n="onboardLoggingDebugFields"></div>
</div>
<table>
<th></th>
<tbody class="blackboxDebugFieldsTable" id="noline">
<!-- table generated here -->
</tbody>
</table>
</div>
<div class="line">
<a href="#" class="save-settings regular-button" i18n="blackboxButtonSave"></a>
Expand Down