From 42db8824ab4060620188cb5aee97f42c74fdb7a6 Mon Sep 17 00:00:00 2001 From: Kjell Kernen Date: Thu, 3 Apr 2014 14:06:43 +0200 Subject: [PATCH] Changed Wizard defaults for servo direction slightly to reflect that elevons and ailerons move in different directions, while airbrakes and flaps move in the same direction. Mirrored wing servo installations are assumed. --- companion/src/wizarddata.cpp | 8 ++++---- companion/src/wizarddialog.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/companion/src/wizarddata.cpp b/companion/src/wizarddata.cpp index 363753dbb..7d0202e9c 100644 --- a/companion/src/wizarddata.cpp +++ b/companion/src/wizarddata.cpp @@ -65,12 +65,12 @@ void WizMix::addMix(ModelData &model, Input input, int weight, int channel, int } else if (input==FLAPS_INPUT){ // There must be some kind of constants for switches somewhere... - maxMixSwitch( model.mixData[mixIndex++], channel+1, isTaranis ? 1 :-3 , -100); //SA-UP or ELE-UP - maxMixSwitch( model.mixData[mixIndex++], channel+1, isTaranis ? 3 : 3 , 100); //SA-DOWN or ELE-DOWN + maxMixSwitch( model.mixData[mixIndex++], channel+1, isTaranis ? 1 :-3 , -1*weight); //SA-UP or ELE-UP + maxMixSwitch( model.mixData[mixIndex++], channel+1, isTaranis ? 3 : 3 , weight); //SA-DOWN or ELE-DOWN } else if (input==AIRBRAKES_INPUT){ - maxMixSwitch( model.mixData[mixIndex++], channel+1, isTaranis ? 13 :-2 , -100); //SE-UP or RUD-UP - maxMixSwitch( model.mixData[mixIndex++], channel+1, isTaranis ? 15 : 2 , 100); //SE-DOWN or RUD-DOWN + maxMixSwitch( model.mixData[mixIndex++], channel+1, isTaranis ? 13 :-2 , -1*weight); //SE-UP or RUD-UP + maxMixSwitch( model.mixData[mixIndex++], channel+1, isTaranis ? 15 : 2 , weight); //SE-DOWN or RUD-DOWN } } } diff --git a/companion/src/wizarddialog.cpp b/companion/src/wizarddialog.cpp index b9143438c..ec2a82c45 100644 --- a/companion/src/wizarddialog.cpp +++ b/companion/src/wizarddialog.cpp @@ -481,7 +481,7 @@ bool FlapsPage::validatePage() { return (bookChannel(flap1CB, FLAPS_INPUT, 100 )); } return( bookChannel(flap1CB, FLAPS_INPUT, 100 ) && - bookChannel(flap2CB, FLAPS_INPUT, 100 )); + bookChannel(flap2CB, FLAPS_INPUT, -100 )); } void FlapsPage::noFlapChannel(){ flap1CB->setEnabled(false);flap2CB->setEnabled(false);} @@ -530,7 +530,7 @@ bool AirbrakesPage::validatePage() { return (bookChannel(airbrake1CB, AIRBRAKES_INPUT, 100 )); } return( bookChannel(airbrake1CB, AIRBRAKES_INPUT, 100 ) && - bookChannel(airbrake2CB, AIRBRAKES_INPUT, 100 )); + bookChannel(airbrake2CB, AIRBRAKES_INPUT, -100 )); } void AirbrakesPage::noAirbrakeChannel(){ airbrake1CB->setEnabled(false);airbrake2CB->setEnabled(false);}