From afe406ec2dfe1a7109aecb3f025c1e8fc95314cd Mon Sep 17 00:00:00 2001 From: Daniel Date: Sun, 20 Dec 2020 16:35:44 +0000 Subject: [PATCH 1/2] Reduce trim timer delay on simulator --- radio/src/targets/simu/opentxsimulator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/radio/src/targets/simu/opentxsimulator.cpp b/radio/src/targets/simu/opentxsimulator.cpp index f7e4f80e9..180709484 100644 --- a/radio/src/targets/simu/opentxsimulator.cpp +++ b/radio/src/targets/simu/opentxsimulator.cpp @@ -222,7 +222,7 @@ void OpenTxSimulator::setTrim(unsigned int idx, int value) emit outputValueChange(OUTPUT_SRC_TRIM_VALUE, idx, 0); timer->deleteLater(); }); - timer->start(350); + timer->start(50); } } From ef1fea95f2bfd7d6709c2643df39e17deb83e195 Mon Sep 17 00:00:00 2001 From: Daniel Date: Thu, 21 Jan 2021 09:24:12 +0100 Subject: [PATCH 2/2] Remove retry timer for set trim --- radio/src/targets/simu/opentxsimulator.cpp | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/radio/src/targets/simu/opentxsimulator.cpp b/radio/src/targets/simu/opentxsimulator.cpp index 180709484..df763c8fa 100644 --- a/radio/src/targets/simu/opentxsimulator.cpp +++ b/radio/src/targets/simu/opentxsimulator.cpp @@ -213,17 +213,7 @@ void OpenTxSimulator::setTrim(unsigned int idx, int value) if (i < 4) // swap axes i = modn12x3[4 * getStickMode() + idx]; uint8_t phase = getTrimFlightMode(getFlightMode(), i); - - if (!setTrimValue(phase, i, value)) { - QTimer *timer = new QTimer(this); - timer->setSingleShot(true); - connect(timer, &QTimer::timeout, [=]() { - emit trimValueChange(idx, 0); - emit outputValueChange(OUTPUT_SRC_TRIM_VALUE, idx, 0); - timer->deleteLater(); - }); - timer->start(50); - } + setTrimValue(phase, i, value); } void OpenTxSimulator::setTrainerInput(unsigned int inputNumber, int16_t value)