mirror of
https://github.com/iNavFlight/inav-configurator.git
synced 2025-07-15 20:35:19 +03:00
Merge pull request #401 from shellixyz/msp_decode_output_mapping
Add MSP2_INAV_OUTPUT_MAPPING decoding
This commit is contained in:
commit
64a0f91411
3 changed files with 29 additions and 2 deletions
15
js/fc.js
15
js/fc.js
|
@ -52,7 +52,8 @@ var CONFIG,
|
||||||
FW_CONFIG,
|
FW_CONFIG,
|
||||||
DEBUG_TRACE,
|
DEBUG_TRACE,
|
||||||
MIXER_CONFIG,
|
MIXER_CONFIG,
|
||||||
BATTERY_CONFIG;
|
BATTERY_CONFIG,
|
||||||
|
OUTPUT_MAPPING;
|
||||||
|
|
||||||
var FC = {
|
var FC = {
|
||||||
MAX_SERVO_RATE: 125,
|
MAX_SERVO_RATE: 125,
|
||||||
|
@ -490,6 +491,18 @@ var FC = {
|
||||||
};
|
};
|
||||||
|
|
||||||
RXFAIL_CONFIG = [];
|
RXFAIL_CONFIG = [];
|
||||||
|
|
||||||
|
OUTPUT_MAPPING = [];
|
||||||
|
},
|
||||||
|
getOutputUsages: function() {
|
||||||
|
return {
|
||||||
|
'ANY': (0),
|
||||||
|
'MC_MOTOR': (1<<2),
|
||||||
|
'MC_SERVO': (1<<3),
|
||||||
|
'FW_MOTOR': (1<<5),
|
||||||
|
'FW_SERVO': (1<<6),
|
||||||
|
'LED': (1<<24)
|
||||||
|
};
|
||||||
},
|
},
|
||||||
getFeatures: function () {
|
getFeatures: function () {
|
||||||
var features = [
|
var features = [
|
||||||
|
|
|
@ -169,6 +169,7 @@ var MSPCodes = {
|
||||||
MSPV2_INAV_RATE_PROFILE: 0x2007,
|
MSPV2_INAV_RATE_PROFILE: 0x2007,
|
||||||
MSPV2_INAV_SET_RATE_PROFILE: 0x2008,
|
MSPV2_INAV_SET_RATE_PROFILE: 0x2008,
|
||||||
MSPV2_INAV_AIR_SPEED: 0x2009,
|
MSPV2_INAV_AIR_SPEED: 0x2009,
|
||||||
|
MSPV2_INAV_OUTPUT_MAPPING: 0x200A,
|
||||||
|
|
||||||
MSP2_INAV_MIXER: 0x2010,
|
MSP2_INAV_MIXER: 0x2010,
|
||||||
MSP2_INAV_SET_MIXER: 0x2011,
|
MSP2_INAV_SET_MIXER: 0x2011,
|
||||||
|
|
|
@ -1332,7 +1332,11 @@ var mspHelper = (function (gui) {
|
||||||
case MSPCodes.MSP2_INAV_OSD_SET_PREFERENCES:
|
case MSPCodes.MSP2_INAV_OSD_SET_PREFERENCES:
|
||||||
console.log('OSD preferences saved');
|
console.log('OSD preferences saved');
|
||||||
break;
|
break;
|
||||||
|
case MSPCodes.MSPV2_INAV_OUTPUT_MAPPING:
|
||||||
|
OUTPUT_MAPPING = [];
|
||||||
|
for (i = 0; i < data.byteLength; ++i)
|
||||||
|
OUTPUT_MAPPING.push(data.getUint8(i));
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
console.log('Unknown code detected: ' + dataHandler.code);
|
console.log('Unknown code detected: ' + dataHandler.code);
|
||||||
} else {
|
} else {
|
||||||
|
@ -2520,6 +2524,15 @@ var mspHelper = (function (gui) {
|
||||||
MSP.send_message(MSPCodes.MSPV2_INAV_MISC, false, false, callback);
|
MSP.send_message(MSPCodes.MSPV2_INAV_MISC, false, false, callback);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
self.loadOutputMapping = function (callback) {
|
||||||
|
if (semver.gte(CONFIG.flightControllerVersion, '1.9.1'))
|
||||||
|
MSP.send_message(MSPCodes.MSPV2_INAV_OUTPUT_MAPPING, false, false, callback);
|
||||||
|
else {
|
||||||
|
OUTPUT_MAPPING = [];
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
self.loadBatteryConfig = function (callback) {
|
self.loadBatteryConfig = function (callback) {
|
||||||
MSP.send_message(MSPCodes.MSPV2_BATTERY_CONFIG, false, false, callback);
|
MSP.send_message(MSPCodes.MSPV2_BATTERY_CONFIG, false, false, callback);
|
||||||
};
|
};
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue