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

Drop MSP_STATUS and MSP_STATUS_EX

Browse source
This commit is contained in:
Pawel Spychalski (DzikuVx) 2022-02-24 11:27:39 +01:00
parent 4426176c4b
commit 473adae418
5 changed files with 26 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

2
js/msp/MSPCodes.js
View file

@ -107,7 +107,7 @@ var MSPCodes = {
MSP_RC_DEADBAND: 125, MSP_RC_DEADBAND: 125,
MSP_SENSOR_ALIGNMENT: 126, MSP_SENSOR_ALIGNMENT: 126,
MSP_LED_STRIP_MODECOLOR:127, MSP_LED_STRIP_MODECOLOR:127,
MSP_STATUS_EX: 150, MSP_STATUS_EX: 150, // Deprecated, do not use.
MSP_SENSOR_STATUS: 151, MSP_SENSOR_STATUS: 151,
MSP_SET_RAW_RC: 200, MSP_SET_RAW_RC: 200,

53
js/msp/MSPHelper.js
View file

@ -68,27 +68,6 @@ var mspHelper = (function (gui) {
colorCount, colorCount,
color; color;
if (!dataHandler.unsupported || dataHandler.unsupported) switch (dataHandler.code) { if (!dataHandler.unsupported || dataHandler.unsupported) switch (dataHandler.code) {
case MSPCodes.MSP_STATUS:
console.log('Using deprecated msp command: MSP_STATUS');
CONFIG.cycleTime = data.getUint16(0, true);
CONFIG.i2cError = data.getUint16(2, true);
CONFIG.activeSensors = data.getUint16(4, true);
CONFIG.mode = data.getUint32(6, true);
CONFIG.profile = data.getUint8(10);
gui.updateProfileChange();
gui.updateStatusBar();
break;
case MSPCodes.MSP_STATUS_EX:
CONFIG.cycleTime = data.getUint16(0, true);
CONFIG.i2cError = data.getUint16(2, true);
CONFIG.activeSensors = data.getUint16(4, true);
CONFIG.profile = data.getUint8(10);
CONFIG.cpuload = data.getUint16(11, true);
CONFIG.armingFlags = data.getUint16(13, true);
gui.updateStatusBar();
gui.updateProfileChange();
break;
case MSPCodes.MSPV2_INAV_STATUS: case MSPCodes.MSPV2_INAV_STATUS:
CONFIG.cycleTime = data.getUint16(offset, true); CONFIG.cycleTime = data.getUint16(offset, true);
offset += 2; offset += 2;
@ -1520,7 +1499,7 @@ var mspHelper = (function (gui) {
// fire callback // fire callback
if (callback) { if (callback) {
callback({'command': dataHandler.code, 'data': data, 'length': dataHandler.message_length_expected}); callback({ 'command': dataHandler.code, 'data': data, 'length': dataHandler.message_length_expected });
} }
break; break;
} }
@ -2742,10 +2721,6 @@ var mspHelper = (function (gui) {
MSP.send_message(MSPCodes.MSP_PIDNAMES, false, false, callback); MSP.send_message(MSPCodes.MSP_PIDNAMES, false, false, callback);
}; };
self.loadStatus = function (callback) {
MSP.send_message(MSPCodes.MSP_STATUS, false, false, callback);
};
self.loadFeatures = function (callback) { self.loadFeatures = function (callback) {
MSP.send_message(MSPCodes.MSP_FEATURE, false, false, callback); MSP.send_message(MSPCodes.MSP_FEATURE, false, false, callback);
}; };
@ -2991,7 +2966,7 @@ var mspHelper = (function (gui) {
function nextSafehome() { function nextSafehome() {
safehomeId++; safehomeId++;
if (safehomeId < SAFEHOMES.getMaxSafehomeCount()-1) { if (safehomeId < SAFEHOMES.getMaxSafehomeCount() - 1) {
MSP.send_message(MSPCodes.MSP2_INAV_SAFEHOME, [safehomeId], false, nextSafehome); MSP.send_message(MSPCodes.MSP2_INAV_SAFEHOME, [safehomeId], false, nextSafehome);
} }
else { else {
@ -3006,7 +2981,7 @@ var mspHelper = (function (gui) {
function nextSendSafehome() { function nextSendSafehome() {
safehomeId++; safehomeId++;
if (safehomeId < SAFEHOMES.getMaxSafehomeCount()-1) { if (safehomeId < SAFEHOMES.getMaxSafehomeCount() - 1) {
MSP.send_message(MSPCodes.MSP2_INAV_SET_SAFEHOME, SAFEHOMES.extractBuffer(safehomeId), false, nextSendSafehome); MSP.send_message(MSPCodes.MSP2_INAV_SET_SAFEHOME, SAFEHOMES.extractBuffer(safehomeId), false, nextSendSafehome);
} }
else { else {
@ -3065,7 +3040,7 @@ var mspHelper = (function (gui) {
for (var ii = setting.min; ii <= setting.max; ii++) { for (var ii = setting.min; ii <= setting.max; ii++) {
values.push(result.data.readString()); values.push(result.data.readString());
} }
setting.table = {values: values}; setting.table = { values: values };
} }
SETTINGS[name] = setting; SETTINGS[name] = setting;
return setting; return setting;
@ -3120,7 +3095,7 @@ var mspHelper = (function (gui) {
default: default:
throw "Unknown setting type " + setting.type; throw "Unknown setting type " + setting.type;
} }
return {setting: setting, value: value}; return { setting: setting, value: value };
}); });
}); });
}; };
@ -3209,8 +3184,8 @@ var mspHelper = (function (gui) {
MSP.send_message(MSPCodes.MSP_MOTOR, false, false, callback); MSP.send_message(MSPCodes.MSP_MOTOR, false, false, callback);
}; };
self.getCraftName = function(callback) { self.getCraftName = function (callback) {
MSP.send_message(MSPCodes.MSP_NAME, false, false, function(resp) { MSP.send_message(MSPCodes.MSP_NAME, false, false, function (resp) {
var name = resp.data.readString(); var name = resp.data.readString();
if (callback) { if (callback) {
callback(name); callback(name);
@ -3218,7 +3193,7 @@ var mspHelper = (function (gui) {
}); });
}; };
self.setCraftName = function(name, callback) { self.setCraftName = function (name, callback) {
var data = []; var data = [];
name = name || ""; name = name || "";
for (var ii = 0; ii < name.length; ii++) { for (var ii = 0; ii < name.length; ii++) {
@ -3239,26 +3214,26 @@ var mspHelper = (function (gui) {
MSP.send_message(MSPCodes.MSP_VTX_CONFIG, false, false, callback); MSP.send_message(MSPCodes.MSP_VTX_CONFIG, false, false, callback);
}; };
self.saveVTXConfig = function(callback) { self.saveVTXConfig = function (callback) {
MSP.send_message(MSPCodes.MSP_SET_VTX_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_VTX_CONFIG), false, callback); MSP.send_message(MSPCodes.MSP_SET_VTX_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_VTX_CONFIG), false, callback);
}; };
self.loadBrakingConfig = function(callback) { self.loadBrakingConfig = function (callback) {
MSP.send_message(MSPCodes.MSP2_INAV_MC_BRAKING, false, false, callback); MSP.send_message(MSPCodes.MSP2_INAV_MC_BRAKING, false, false, callback);
} }
self.saveBrakingConfig = function(callback) { self.saveBrakingConfig = function (callback) {
MSP.send_message(MSPCodes.MSP2_INAV_SET_MC_BRAKING, mspHelper.crunch(MSPCodes.MSP2_INAV_SET_MC_BRAKING), false, callback); MSP.send_message(MSPCodes.MSP2_INAV_SET_MC_BRAKING, mspHelper.crunch(MSPCodes.MSP2_INAV_SET_MC_BRAKING), false, callback);
}; };
self.loadParameterGroups = function(callback) { self.loadParameterGroups = function (callback) {
MSP.send_message(MSPCodes.MSP2_COMMON_PG_LIST, false, false, function (resp) { MSP.send_message(MSPCodes.MSP2_COMMON_PG_LIST, false, false, function (resp) {
var groups = []; var groups = [];
while (resp.data.offset < resp.data.byteLength) { while (resp.data.offset < resp.data.byteLength) {
var id = resp.data.readU16(); var id = resp.data.readU16();
var start = resp.data.readU16(); var start = resp.data.readU16();
var end = resp.data.readU16(); var end = resp.data.readU16();
groups.push({id: id, start: start, end: end}); groups.push({ id: id, start: start, end: end });
} }
if (callback) { if (callback) {
callback(groups); callback(groups);
@ -3266,7 +3241,7 @@ var mspHelper = (function (gui) {
}); });
}; };
self.loadBrakingConfig = function(callback) { self.loadBrakingConfig = function (callback) {
MSP.send_message(MSPCodes.MSP2_INAV_MC_BRAKING, false, false, callback); MSP.send_message(MSPCodes.MSP2_INAV_MC_BRAKING, false, false, callback);
} }

2
js/serial_backend.js
View file

@ -62,7 +62,7 @@ $(document).ready(function () {
} else { } else {
helper.timeout.add('waiting_for_bootup', function waiting_for_bootup() { helper.timeout.add('waiting_for_bootup', function waiting_for_bootup() {
MSP.send_message(MSPCodes.MSP_STATUS, false, false, function () { MSP.send_message(MSPCodes.MSPV2_INAV_STATUS, false, false, function () {
//noinspection JSUnresolvedVariable //noinspection JSUnresolvedVariable
GUI.log(chrome.i18n.getMessage('deviceReady')); GUI.log(chrome.i18n.getMessage('deviceReady'));
//noinspection JSValidateTypes //noinspection JSValidateTypes

25
js/tasks.js
View file

@ -1,25 +0,0 @@
'use strict';
var helper = helper || {};
helper.task = (function () {
var publicScope = {},
privateScope = {};
privateScope.getStatusPullInterval = function () {
//TODO use serial connection speed to determine update interval
return 250;
};
publicScope.statusPullStart = function () {
helper.interval.add('status_pull', function () {
MSP.send_message(MSPCodes.MSP_STATUS, false, false, function () {
MSP.send_message(MSPCodes.MSP_SENSOR_STATUS);
});
}, privateScope.getStatusPullInterval(), true);
};
return publicScope;
})();

2
tabs/calibration.js
View file

@ -53,7 +53,7 @@ TABS.calibration.initialize = function (callback) {
googleAnalytics.sendAppView('Calibration'); googleAnalytics.sendAppView('Calibration');
} }
loadChainer.setChain([ loadChainer.setChain([
mspHelper.loadStatus, mspHelper.queryFcStatus,
mspHelper.loadSensorConfig, mspHelper.loadSensorConfig,
mspHelper.loadCalibrationData mspHelper.loadCalibrationData
]); ]);