Skip to content

Fix backwards compatibility for sensor info #4464

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
May 6, 2025
Merged

Fix backwards compatibility for sensor info #4464

Show file tree
Hide file tree
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
80 changes: 38 additions & 42 deletions src/js/tabs/setup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,50 +304,42 @@ setup.initialize = function (callback) {
}
}

if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_46)) {
MSP.send_message(MSPCodes.MSP2_SENSOR_CONFIG_ACTIVE, false, false, function () {
addSensorInfo(
FC.SENSOR_CONFIG_ACTIVE.gyro_hardware,
sensor_gyro_e,
"gyro",
sensorTypes().gyro.elements,
);
addSensorInfo(
FC.SENSOR_CONFIG_ACTIVE.acc_hardware,
sensor_acc_e,
"acc",
sensorTypes().acc.elements,
);
addSensorInfo(
FC.SENSOR_CONFIG_ACTIVE.baro_hardware,
sensor_baro_e,
"baro",
sensorTypes().baro.elements,
);
addSensorInfo(
FC.SENSOR_CONFIG_ACTIVE.mag_hardware,
sensor_mag_e,
"mag",
sensorTypes().mag.elements,
);
MSP.send_message(MSPCodes.MSP2_SENSOR_CONFIG_ACTIVE, false, false, function () {
addSensorInfo(
FC.SENSOR_CONFIG_ACTIVE.gyro_hardware,
sensor_gyro_e,
"gyro",
sensorTypes().gyro.elements,
);
addSensorInfo(FC.SENSOR_CONFIG_ACTIVE.acc_hardware, sensor_acc_e, "acc", sensorTypes().acc.elements);
addSensorInfo(
FC.SENSOR_CONFIG_ACTIVE.baro_hardware,
sensor_baro_e,
"baro",
sensorTypes().baro.elements,
);
addSensorInfo(FC.SENSOR_CONFIG_ACTIVE.mag_hardware, sensor_mag_e, "mag", sensorTypes().mag.elements);
addSensorInfo(
FC.SENSOR_CONFIG_ACTIVE.sonar_hardware,
sensor_sonar_e,
"sonar",
sensorTypes().sonar.elements,
);

// opticalflow sensor is available since 1.47
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_47)) {
addSensorInfo(
FC.SENSOR_CONFIG_ACTIVE.sonar_hardware,
sensor_sonar_e,
"sonar",
sensorTypes().sonar.elements,
FC.SENSOR_CONFIG_ACTIVE.opticalflow_hardware,
sensor_opticalflow_e,
"opticalflow",
sensorTypes().opticalflow.elements,
);
}
});
};

// opticalflow sensor is available since 1.47
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_47)) {
addSensorInfo(
FC.SENSOR_CONFIG_ACTIVE.opticalflow_hardware,
sensor_opticalflow_e,
"opticalflow",
sensorTypes().opticalflow.elements,
);
}
});
}
const hideSensorInfo = function () {
$("#sensorInfoBox").hide();
};

// Fills in the "Build type" part of the "Firmware info" box
Expand Down Expand Up @@ -524,7 +516,11 @@ setup.initialize = function (callback) {
}

prepareDisarmFlags();
showSensorInfo();
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_46)) {
showSensorInfo();
} else {
hideSensorInfo();
}
showFirmwareInfo();
showNetworkStatus();

Expand Down
2 changes: 1 addition & 1 deletion src/tabs/setup.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@
</table>
</div>
</div>
<div class="gui_box grey">
<div class="gui_box grey" id="sensorInfoBox">
<div class="gui_box_titlebar">
<div class="spacer_box_title" i18n="initialSensorInfoHead"></div>
<div class="helpicon cf_tip" i18n_title="initialSensorInfoHeadHelp"></div>
Expand Down