Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-16 21:05:30 +03:00
Code Issues Wiki Activity

Merge branch 'cleanflight/development' into NewPIDFunctions

Browse source 
# Conflicts:
#	_locales/en/messages.json
#	js/backup_restore.js
#	js/data_storage.js
#	js/msp.js
#	tabs/configuration.html
This commit is contained in:
skaman82 2015-12-15 01:43:24 +01:00
commit 2d6feb0e6a
25 changed files with 1425 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

23
js/data_storage.js
View file

@ -179,9 +179,32 @@ var DATAFLASH = {
usedSize: 0
};
<<<<<<< HEAD
var RC_controls = {
deadband: 0,
yaw_deadband: 0,
alt_hold_deadband: 0,
alt_hold_fast_change: 0
};
=======
var RX_CONFIG = {
serialrx_provider: 0,
maxcheck: 0,
midrc: 0,
mincheck: 0,
spektrum_sat_bind: 0,
rx_min_usec: 0,
rx_max_usec: 0
};
var FAILSAFE_CONFIG = {
failsafe_delay: 0,
failsafe_off_delay: 0,
failsafe_throttle: 0,
failsafe_kill_switch: 0,
failsafe_throttle_low_delay: 0,
failsafe_procedure: 0
};
var RXFAIL_CONFIG = [];
>>>>>>> cleanflight/development