From d6a150738c20154e036a53322673fa3c08191e92 Mon Sep 17 00:00:00 2001 From: Damjan Adamic Date: Sat, 17 May 2014 19:55:53 +0200 Subject: [PATCH] Cosmetics --- radio/src/mixer.cpp | 2 +- radio/src/opentx.cpp | 2 +- radio/src/opentx.h | 4 ++-- radio/src/switches.cpp | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/radio/src/mixer.cpp b/radio/src/mixer.cpp index 53cc718de..b6b2b4c46 100755 --- a/radio/src/mixer.cpp +++ b/radio/src/mixer.cpp @@ -951,7 +951,7 @@ void evalMixes(uint8_t tick10ms) fp_act[s_last_phase] = 0; fp_act[phase] = MAX_ACT; } - copyLswState(s_last_phase, phase); //push last logical switches state from old to new phase + logicalSwitchesCopyState(s_last_phase, phase); //push last logical switches state from old to new phase } s_last_phase = phase; } diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index b884d03d0..cbc7d7e08 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -2219,7 +2219,7 @@ void doMixerCalculations() s_cnt_100ms -= 10; s_cnt_1s += 1; - lswTimerTick(); + logicalSwitchesTimerTick(); if (s_cnt_1s >= 10) { // 1sec s_cnt_1s -= 10; diff --git a/radio/src/opentx.h b/radio/src/opentx.h index 604d82303..d69411a71 100644 --- a/radio/src/opentx.h +++ b/radio/src/opentx.h @@ -693,10 +693,10 @@ NOINLINE void per10ms(); getvalue_t getValue(uint8_t i); bool getSwitch(int8_t swtch); -void lswTimerTick(); +void logicalSwitchesTimerTick(); void logicalSwitchesReset(); void evalLogicalSwitches(uint8_t mode); -void copyLswState(uint8_t oldPhase, uint8_t newPhase); +void logicalSwitchesCopyState(uint8_t oldPhase, uint8_t newPhase); #if defined(PCBTARANIS) void getSwitchesPosition(bool startup); diff --git a/radio/src/switches.cpp b/radio/src/switches.cpp index cf8b9bccb..bb7dacff3 100644 --- a/radio/src/switches.cpp +++ b/radio/src/switches.cpp @@ -603,7 +603,7 @@ void checkSwitches() #endif } -void lswTimerTick() { +void logicalSwitchesTimerTick() { for (uint8_t fm=0; fm