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

Removed merge artefacts

Browse source
This commit is contained in:
Michael Keller 2016-09-08 09:16:28 +12:00 • committed by GitHub
parent 9d796752f8
commit edad524714
1 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
js/RateCurve.js
View file

@ -61,14 +61,11 @@ var RateCurve = function (useLegacyCurve) {
RateCurve.prototype.rcCommandRawToDegreesPerSecond = function (rcData, rate, rcRate, rcExpo, superExpoActive, deadband) {
var angleRate;
if (rate !== undefined && rcRate !== undefined && rcExpo !== undefined) {
<<<<<<< f9ea2c8ee4e9635ef6191b0d8b160dbb44128d82
if (rcRate > 2) {
rcRate = rcRate + (rcRate - 2) * 14.54;
}
var inputValue = this.rcCommand(rcData, rcRate);
=======
var inputValue = this.rcCommand(rcData, rcRate, deadband);
>>>>>>> Added deadband to curves and model calculations. Also fixed rates curve bug in pre 2.8.
var maxRc = 500 * rcRate;
var expoPower;