diff options
| author | Konstantin Sharlaimov <konstantin.sharlaimov@gmail.com> | 2019-02-07 21:21:50 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-07 21:21:50 +0300 |
| commit | 9870ace818566d43fe8626f90cac48cb7b8c279e (patch) | |
| tree | 0d6c8c14bd6eff4abe1991c4352653efed372d37 /js | |
| parent | 3bdd78e6bf485f1961651a1fbcb2ce9633d9803c (diff) | |
| parent | 99699ee6f3ff38ca63040a0f19ab6785727ab7a4 (diff) | |
Merge pull request #673 from stronnag/jh_extend_bbl_denom
support extended bbl denom
Diffstat (limited to 'js')
| -rw-r--r-- | js/msp/MSPCodes.js | 5 | ||||
| -rw-r--r-- | js/msp/MSPHelper.js | 32 |
2 files changed, 28 insertions, 9 deletions
diff --git a/js/msp/MSPCodes.js b/js/msp/MSPCodes.js index 290f362f..9b7371a4 100644 --- a/js/msp/MSPCodes.js +++ b/js/msp/MSPCodes.js @@ -194,5 +194,8 @@ var MSPCodes = { MSP2_INAV_SELECT_BATTERY_PROFILE: 0x2018, - MSP2_INAV_DEBUG: 0x2019 + MSP2_INAV_DEBUG: 0x2019, + + MSP2_BLACKBOX_CONFIG: 0x201A, + MSP2_SET_BLACKBOX_CONFIG: 0x201B }; diff --git a/js/msp/MSPHelper.js b/js/msp/MSPHelper.js index 95916703..54a44646 100644 --- a/js/msp/MSPHelper.js +++ b/js/msp/MSPHelper.js @@ -1452,6 +1452,15 @@ var mspHelper = (function (gui) { case MSPCodes.MSP2_INAV_SET_MC_BRAKING: console.log('Braking config saved'); break; + case MSPCodes.MSP2_BLACKBOX_CONFIG: + BLACKBOX.supported = (data.getUint8(0) & 1) != 0; + BLACKBOX.blackboxDevice = data.getUint8(1); + BLACKBOX.blackboxRateNum = data.getUint16(2); + BLACKBOX.blackboxRateDenom = data.getUint16(4); + break; + case MSPCodes.MSP2_SET_BLACKBOX_CONFIG: + console.log("Blackbox config saved"); + break; default: console.log('Unknown code detected: ' + dataHandler.code); @@ -2155,15 +2164,22 @@ var mspHelper = (function (gui) { }; self.sendBlackboxConfiguration = function (onDataCallback) { - var message = [ - BLACKBOX.blackboxDevice & 0xFF, - BLACKBOX.blackboxRateNum & 0xFF, - BLACKBOX.blackboxRateDenom & 0xFF - ]; - + var buffer = []; + var messageId = MSPCodes.MSP_SET_BLACKBOX_CONFIG; + buffer.push(BLACKBOX.blackboxDevice & 0xFF); + if (semver.gte(CONFIG.apiVersion, "2.3.0")) { + messageId = MSPCodes.MSP2_SET_BLACKBOX_CONFIG; + buffer.push(lowByte(BLACKBOX.blackboxRateNum)); + buffer.push(highByte(BLACKBOX.blackboxRateNum)); + buffer.push(lowByte(BLACKBOX.blackboxRateDenom)); + buffer.push(highByte(BLACKBOX.blackboxRateDenom)); + } else { + buffer.push(BLACKBOX.blackboxRateNum & 0xFF); + buffer.push(BLACKBOX.blackboxRateDenom & 0xFF); + } //noinspection JSUnusedLocalSymbols - MSP.send_message(MSPCodes.MSP_SET_BLACKBOX_CONFIG, message, false, function (response) { - onDataCallback(); + MSP.send_message(messageId, buffer, false, function (response) { + onDataCallback(); }); }; |