Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-19 14:25:14 +03:00
Code Issues Wiki Activity

Fixes for merge from cleanflight.

Browse source
This commit is contained in:
mikeller 2017-05-04 22:10:26 +12:00 • committed by Michael Keller
parent 457700f052
commit b729ffaf68
4 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
js/backup_restore.js
View file

@ -533,7 +533,7 @@ function configuration_restore(callback) {
configuration.MOTOR_3D_CONFIG = { configuration.MOTOR_3D_CONFIG = {
deadband3d_low: 1406, deadband3d_low: 1406,
deadband3d_high: 1514, deadband3d_high: 1514,
neutral: 1460, neutral: 1460,
deadband3d_throttle: 50 deadband3d_throttle: 50
}; };
} }
@ -568,9 +568,9 @@ function configuration_restore(callback) {
configuration.RX_CONFIG = { configuration.RX_CONFIG = {
serialrx_provider: 0, serialrx_provider: 0,
spektrum_sat_bind: 0, spektrum_sat_bind: 0,
stick_center: 1500, stick_center: 1500,
stick_min: 1100, stick_min: 1100,
stick_max: 1900, stick_max: 1900,
rx_min_usec: 885, rx_min_usec: 885,
rx_max_usec: 2115 rx_max_usec: 2115
}; };

1
js/serial_backend.js
View file

@ -293,6 +293,7 @@ function onConnect() {
$('#tabs ul.mode-connected').show(); $('#tabs ul.mode-connected').show();
MSP.send_message(MSPCodes.MSP_FEATURE_CONFIG, false, false);
if (semver.gte(CONFIG.apiVersion, "1.33.0")) { if (semver.gte(CONFIG.apiVersion, "1.33.0")) {
MSP.send_message(MSPCodes.MSP_BATTERY_CONFIG, false, false); MSP.send_message(MSPCodes.MSP_BATTERY_CONFIG, false, false);
} }

2
main.js
View file

@ -470,13 +470,11 @@ function updateTabList(features) {
} else { } else {
$('#tabs ul.mode-connected li.tab_transponder').hide(); $('#tabs ul.mode-connected li.tab_transponder').hide();
} }
/* FIXME this approach doesn't work for OSD SLAVE boards as they don't have an 'OSD' feature.
if (features.isEnabled('OSD')) { if (features.isEnabled('OSD')) {
$('#tabs ul.mode-connected li.tab_osd').show(); $('#tabs ul.mode-connected li.tab_osd').show();
} else { } else {
$('#tabs ul.mode-connected li.tab_osd').hide(); $('#tabs ul.mode-connected li.tab_osd').hide();
} }
*/
} }
function zeroPad(value, width) { function zeroPad(value, width) {

2
tabs/receiver.js
View file

@ -367,7 +367,7 @@ TABS.receiver.initialize = function (callback) {
} }
// Remove old data from array // Remove old data from array
while (RX_plot_data[0].length > 300) { while (RX_plot_data.length > 300) {
for (var i = 0; i < RX_plot_data.length; i++) { for (var i = 0; i < RX_plot_data.length; i++) {
RX_plot_data[i].shift(); RX_plot_data[i].shift();
} }