From c0c6a90f65cdec91b5727516da97116fda1a3dc8 Mon Sep 17 00:00:00 2001 From: Damjan Adamic Date: Sun, 22 Jun 2014 13:17:16 +0200 Subject: [PATCH 1/3] Added traces --- radio/src/opentx.cpp | 1 + radio/src/switches.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index bc6dffd4c..70c01c98f 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -1839,6 +1839,7 @@ inline void playCustomFunctionFile(CustomFnData *sd, uint8_t id) void evalFunctions() { + TRACE("func"); MASK_FUNC_TYPE newActiveFunctions = 0; MASK_CFN_TYPE newActiveFnSwitches = 0; diff --git a/radio/src/switches.cpp b/radio/src/switches.cpp index 64323b026..8943a21ab 100644 --- a/radio/src/switches.cpp +++ b/radio/src/switches.cpp @@ -472,6 +472,7 @@ bool getSwitch(int8_t swtch) */ void evalLogicalSwitches(bool isCurrentPhase) { + TRACE("eval %d %d", mixerCurrentFlightMode, isCurrentPhase); for (unsigned int idx=0; idx Date: Sun, 22 Jun 2014 13:52:59 +0200 Subject: [PATCH 2/3] Fixes #1345 --- radio/src/mixer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/radio/src/mixer.cpp b/radio/src/mixer.cpp index e72f9db4f..8643aff15 100755 --- a/radio/src/mixer.cpp +++ b/radio/src/mixer.cpp @@ -533,7 +533,7 @@ void evalFlightModeMixes(uint8_t mode, uint8_t tick10ms) { evalInputs(mode); - evalLogicalSwitches(mode==e_perout_mode_normal); + if (tick10ms) evalLogicalSwitches(mode==e_perout_mode_normal); #if defined(MODULE_ALWAYS_SEND_PULSES) checkStartupWarnings(); From b8487c90deeb5e4e5795931b81c77c6e953226f0 Mon Sep 17 00:00:00 2001 From: Damjan Adamic Date: Sun, 22 Jun 2014 13:53:46 +0200 Subject: [PATCH 3/3] Removed traces --- radio/src/opentx.cpp | 1 - radio/src/switches.cpp | 1 - 2 files changed, 2 deletions(-) diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index 70c01c98f..bc6dffd4c 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -1839,7 +1839,6 @@ inline void playCustomFunctionFile(CustomFnData *sd, uint8_t id) void evalFunctions() { - TRACE("func"); MASK_FUNC_TYPE newActiveFunctions = 0; MASK_CFN_TYPE newActiveFnSwitches = 0; diff --git a/radio/src/switches.cpp b/radio/src/switches.cpp index 8943a21ab..64323b026 100644 --- a/radio/src/switches.cpp +++ b/radio/src/switches.cpp @@ -472,7 +472,6 @@ bool getSwitch(int8_t swtch) */ void evalLogicalSwitches(bool isCurrentPhase) { - TRACE("eval %d %d", mixerCurrentFlightMode, isCurrentPhase); for (unsigned int idx=0; idx