Merge pull request #80 from iNavFlight/sensor-status-fix

sensor status fix
pull/81/head
Konstantin Sharlaimov 8 years ago committed by GitHub
commit f7ff9f1b8b

@ -55,7 +55,15 @@ var mspHelper = (function (gui) {
CONFIG.profile = data.getUint8(10);
gui.updateProfileChange();
gui.updateStatusBar();
/*
* Update sensor status only for older firmwares
* Newer firmwares use MSP_STATUS_EX instead
*/
if (semver.lt(CONFIG.flightControllerVersion, "1.5.0")) {
sensor_status(CONFIG.activeSensors);
}
break;
case MSPCodes.MSP_STATUS_EX:
CONFIG.cycleTime = data.getUint16(0, 1);
@ -65,7 +73,9 @@ var mspHelper = (function (gui) {
CONFIG.profile = data.getUint8(10);
CONFIG.cpuload = data.getUint16(11, 1);
if (semver.lt(CONFIG.flightControllerVersion, "1.5.0")) {
sensor_status(CONFIG.activeSensors);
}
gui.updateStatusBar();
break;
@ -79,7 +89,9 @@ var mspHelper = (function (gui) {
SENSOR_STATUS.rangeHwStatus = data.getUint8(6);
SENSOR_STATUS.speedHwStatus = data.getUint8(7);
SENSOR_STATUS.flowHwStatus = data.getUint8(8);
if (semver.gte(CONFIG.flightControllerVersion, "1.5.0")) {
sensor_status_ex(SENSOR_STATUS);
}
break;
case MSPCodes.MSP_RAW_IMU:

@ -308,6 +308,10 @@ function read_serial(info) {
}
}
/**
* Sensor handler used in INAV >= 1.5
* @param hw_status
*/
function sensor_status_ex(hw_status)
{
var statusHash = sensor_status_hash(hw_status);
@ -363,6 +367,11 @@ function sensor_status_hash(hw_status)
hw_status.flowHwStatus;
}
/**
* Legacy sensor handler used in INAV < 1.5 versions
* @param sensors_detected
* @deprecated
*/
function sensor_status(sensors_detected) {
SENSOR_STATUS.isHardwareHealthy = 1;
SENSOR_STATUS.gyroHwStatus = have_sensor(sensors_detected, 'gyro') ? 1 : 0;

Loading…
Cancel
Save