Mirror/inav-configurator
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav-configurator.git synced 2025-07-15 20:35:19 +03:00
Code Wiki Activity

sensor status fix

Browse source
This commit is contained in:
Pawel Spychalski (DzikuVx) 2016-12-17 10:27:39 +01:00
parent b8567252af
commit 5c26f60e8b
2 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
js/msp/MSPHelper.js
View file

@ -55,7 +55,15 @@ var mspHelper = (function (gui) {
CONFIG.profile = data.getUint8(10); CONFIG.profile = data.getUint8(10);
gui.updateProfileChange(); gui.updateProfileChange();
gui.updateStatusBar(); 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); sensor_status(CONFIG.activeSensors);
}
break; break;
case MSPCodes.MSP_STATUS_EX: case MSPCodes.MSP_STATUS_EX:
CONFIG.cycleTime = data.getUint16(0, 1); CONFIG.cycleTime = data.getUint16(0, 1);
@ -65,7 +73,9 @@ var mspHelper = (function (gui) {
CONFIG.profile = data.getUint8(10); CONFIG.profile = data.getUint8(10);
CONFIG.cpuload = data.getUint16(11, 1); CONFIG.cpuload = data.getUint16(11, 1);
if (semver.lt(CONFIG.flightControllerVersion, "1.5.0")) {
sensor_status(CONFIG.activeSensors); sensor_status(CONFIG.activeSensors);
}
gui.updateStatusBar(); gui.updateStatusBar();
break; break;
@ -79,7 +89,9 @@ var mspHelper = (function (gui) {
SENSOR_STATUS.rangeHwStatus = data.getUint8(6); SENSOR_STATUS.rangeHwStatus = data.getUint8(6);
SENSOR_STATUS.speedHwStatus = data.getUint8(7); SENSOR_STATUS.speedHwStatus = data.getUint8(7);
SENSOR_STATUS.flowHwStatus = data.getUint8(8); SENSOR_STATUS.flowHwStatus = data.getUint8(8);
if (semver.gte(CONFIG.flightControllerVersion, "1.5.0")) {
sensor_status_ex(SENSOR_STATUS); sensor_status_ex(SENSOR_STATUS);
}
break; break;
case MSPCodes.MSP_RAW_IMU: case MSPCodes.MSP_RAW_IMU:

9
js/serial_backend.js
View file

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