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

Fix RX model preview for different rates system

10.8-maintenance
Miguel Angel Mulero Martinez 2022-02-25 12:02:30 +01:00
parent e131657d30
commit 7bf2adc0d8
2 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/js/fc.js
View File

@ -240,6 +240,7 @@ const FC = {
roll_rate_limit: 1998, roll_rate_limit: 1998,
pitch_rate_limit: 1998, pitch_rate_limit: 1998,
yaw_rate_limit: 1998, yaw_rate_limit: 1998,
rates_type: 0,
}; };
this.AUX_CONFIG = []; this.AUX_CONFIG = [];

43
src/js/tabs/receiver.js
View File

@ -7,6 +7,7 @@ TABS.receiver = {
yawDeadband: 0, yawDeadband: 0,
analyticsChanges: {}, analyticsChanges: {},
needReboot: false, needReboot: false,
ratesMultiplier: 1,
}; };
TABS.receiver.initialize = function (callback) { TABS.receiver.initialize = function (callback) {
@ -841,6 +842,16 @@ TABS.receiver.initModelPreview = function () {
this.rateCurve = new RateCurve(useOldRateCurve); this.rateCurve = new RateCurve(useOldRateCurve);
const ratesMultiplierList = [
{name: "Betaflight", value: 1},
{name: "Raceflight", value: 100},
{name: "KISS", value: 1},
{name: "Actual", value: 1000},
{name: "QuickRates", value: 1000},
];
this.ratesMultiplier = ratesMultiplierList[FC.RC_TUNING.rates_type].value;
$(window).on('resize', $.proxy(this.model.resize, this.model)); $(window).on('resize', $.proxy(this.model.resize, this.model));
}; };
@ -852,9 +863,35 @@ TABS.receiver.renderModel = function () {
if (FC.RC.channels[0] && FC.RC.channels[1] && FC.RC.channels[2]) { if (FC.RC.channels[0] && FC.RC.channels[1] && FC.RC.channels[2]) {
const delta = this.clock.getDelta(); const delta = this.clock.getDelta();
const roll = delta * this.rateCurve.rcCommandRawToDegreesPerSecond(FC.RC.channels[0], FC.RC_TUNING.roll_rate, FC.RC_TUNING.RC_RATE, FC.RC_TUNING.RC_EXPO, this.useSuperExpo, this.deadband, FC.RC_TUNING.roll_rate_limit), const roll = delta * this.rateCurve.rcCommandRawToDegreesPerSecond(
pitch = delta * this.rateCurve.rcCommandRawToDegreesPerSecond(FC.RC.channels[1], FC.RC_TUNING.pitch_rate, FC.RC_TUNING.rcPitchRate, FC.RC_TUNING.RC_PITCH_EXPO, this.useSuperExpo, this.deadband, FC.RC_TUNING.pitch_rate_limit), FC.RC.channels[0],
yaw = delta * this.rateCurve.rcCommandRawToDegreesPerSecond(FC.RC.channels[2], FC.RC_TUNING.yaw_rate, FC.RC_TUNING.rcYawRate, FC.RC_TUNING.RC_YAW_EXPO, this.useSuperExpo, this.yawDeadband, FC.RC_TUNING.yaw_rate_limit); FC.RC_TUNING.roll_rate * this.ratesMultiplier,
FC.RC_TUNING.RC_RATE * this.ratesMultiplier,
FC.RC_TUNING.RC_EXPO * this.ratesMultiplier,
this.useSuperExpo,
this.deadband,
FC.RC_TUNING.roll_rate_limit,
);
const pitch = delta * this.rateCurve.rcCommandRawToDegreesPerSecond(
FC.RC.channels[1],
FC.RC_TUNING.pitch_rate * this.ratesMultiplier,
FC.RC_TUNING.rcPitchRate * this.ratesMultiplier,
FC.RC_TUNING.RC_PITCH_EXPO * this.ratesMultiplier,
this.useSuperExpo,
this.deadband,
FC.RC_TUNING.pitch_rate_limit,
);
const yaw = delta * this.rateCurve.rcCommandRawToDegreesPerSecond(
FC.RC.channels[2],
FC.RC_TUNING.yaw_rate * this.ratesMultiplier,
FC.RC_TUNING.rcYawRate * this.ratesMultiplier,
FC.RC_TUNING.RC_YAW_EXPO * this.ratesMultiplier,
this.useSuperExpo,
this.yawDeadband,
FC.RC_TUNING.yaw_rate_limit,
);
this.model.rotateBy(-degToRad(pitch), -degToRad(yaw), -degToRad(roll)); this.model.rotateBy(-degToRad(pitch), -degToRad(yaw), -degToRad(roll));
} }