Mirror/inav-configurator
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav-configurator.git synced 2025-07-24 16:55:22 +03:00
Code Wiki Activity

Merge pull request #1034 from nmaggioni/nm_mixer_fixed_value_one_to_max

Browse source 
Fix showing µs for new "MAX" mixer value
This commit is contained in:
Niccolò Maggioni 2020-07-09 11:20:16 +02:00 • committed by GitHub
commit a711632fd2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tabs/mixer.js
View file

@ -157,9 +157,9 @@ TABS.mixer.initialize = function (callback, scrollPosition) {
function updateFixedValueVisibility(row, $mixRuleInput) {
// Show the fixed value input box if "ONE" input was selected for this servo
// Show the fixed value input box if "MAX" input was selected for this servo
const $fixedValueCalcInput = row.find(".mix-rule-fixed-value");
if (FC.getServoMixInputNames()[$mixRuleInput.val()] === 'ONE') {
if (FC.getServoMixInputNames()[$mixRuleInput.val()] === 'MAX') {
$fixedValueCalcInput.show();
row.find(".mix-rule-speed").prop('disabled', true);
} else {
@ -167,12 +167,12 @@ TABS.mixer.initialize = function (callback, scrollPosition) {
row.find(".mix-rule-speed").prop('disabled', false);
}
// Show the Fixed Value column if at least one servo has the "ONE" input assigned
// Show the Fixed Value column if at least one servo has the "MAX" input assigned
const $fixedValueCol = $("#servo-mix-table").find(".mixer-fixed-value-col");
const rules = SERVO_RULES.get();
for (let servoRuleIndex in rules) {
if (rules.hasOwnProperty(servoRuleIndex)) {
if (FC.getServoMixInputNames()[rules[servoRuleIndex].getInput()] === 'ONE') {
if (FC.getServoMixInputNames()[rules[servoRuleIndex].getInput()] === 'MAX') {
$fixedValueCol.show();
return;
}