sundowndev
/
betaflight-configurator
mirror of https://github.com/sundowndev/betaflight-configurator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into links-in-welcome-tab

10.3.x-maintenance
Rodrigo Pérez 2016-08-08 15:47:44 -04:00
parent f4220ff2d1 a3c3c8a367
commit 103605d59e
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/msp.js
View File

@ -1629,6 +1629,10 @@ MSP.crunch = function (code) {
buffer.push(RC_deadband.deadband); buffer.push(RC_deadband.deadband);
buffer.push(RC_deadband.yaw_deadband); buffer.push(RC_deadband.yaw_deadband);
buffer.push(RC_deadband.alt_hold_deadband); buffer.push(RC_deadband.alt_hold_deadband);
if (semver.gte(CONFIG.apiVersion, "1.17.0")) {
buffer.push(lowByte(_3D.deadband3d_throttle));
buffer.push(highByte(_3D.deadband3d_throttle));
}
break; break;
case MSP_codes.MSP_SET_SENSOR_ALIGNMENT: case MSP_codes.MSP_SET_SENSOR_ALIGNMENT:

2
tabs/logging.js
View File

@ -230,7 +230,7 @@ TABS.logging.initialize = function (callback) {
function prepare_file() { function prepare_file() {
// create or load the file // create or load the file
chrome.fileSystem.chooseEntry({type: 'saveFile', suggestedName: 'cleanflight_data_log', accepts: [{extensions: ['csv']}]}, function(entry) { chrome.fileSystem.chooseEntry({type: 'saveFile', suggestedName: 'betaflight_data_log', accepts: [{extensions: ['csv']}]}, function(entry) {
if (!entry) { if (!entry) {
console.log('No file selected'); console.log('No file selected');
return; return;