piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes #1981: Edge function INSTANT bug for V1>2s (ported from master)

Browse Source
This commit is contained in:
Damjan Adamic
2015-01-09 20:21:53 +01:00
parent b878dc6736
commit a9dfcdfd68
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/modeledit/logicalswitches.cpp
+2 -2
View File
@@ -248,7 +248,7 @@ void LogicalSwitchesPanel::edited()
else { else {
model->logicalSw[i].val3 = TimToVal(cswitchOffset2[i]->value()) - model->logicalSw[i].val2; model->logicalSw[i].val3 = TimToVal(cswitchOffset2[i]->value()) - model->logicalSw[i].val2;
} }
updateTimerParam(cswitchOffset2[i], model->logicalSw[i].val2+model->logicalSw[i].val3, cswitchOffset[i]->value()-0.1); updateTimerParam(cswitchOffset2[i], model->logicalSw[i].val2+model->logicalSw[i].val3, ValToTim(TimToVal(cswitchOffset[i]->value())-1));
if (model->logicalSw[i].val3 == 0) { if (model->logicalSw[i].val3 == 0) {
cswitchOffset2[i]->setSuffix("(infinite)"); cswitchOffset2[i]->setSuffix("(infinite)");
} }
@@ -334,7 +334,7 @@ void LogicalSwitchesPanel::setSwitchWidgetVisibility(int i)
mask &= ~DELAY_ENABLED; mask &= ~DELAY_ENABLED;
populateSwitchCB(cswitchSource1[i], RawSwitch(model->logicalSw[i].val1), generalSettings, LogicalSwitchesContext); populateSwitchCB(cswitchSource1[i], RawSwitch(model->logicalSw[i].val1), generalSettings, LogicalSwitchesContext);
updateTimerParam(cswitchOffset[i], model->logicalSw[i].val2, 0.0); updateTimerParam(cswitchOffset[i], model->logicalSw[i].val2, 0.0);
updateTimerParam(cswitchOffset2[i], model->logicalSw[i].val2+model->logicalSw[i].val3, cswitchOffset[i]->value()-0.1); updateTimerParam(cswitchOffset2[i], model->logicalSw[i].val2+model->logicalSw[i].val3, ValToTim(TimToVal(cswitchOffset[i]->value())-1));
cswitchOffset2[i]->setSpecialValueText(tr("(no release)")); cswitchOffset2[i]->setSpecialValueText(tr("(no release)"));
if (model->logicalSw[i].val3 == 0) { if (model->logicalSw[i].val3 == 0) {
cswitchOffset2[i]->setSuffix(tr("(infinite)")); cswitchOffset2[i]->setSuffix(tr("(infinite)"));