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

[stock] Sink tones on vario removed

Browse Source 
[all] Bug in custom switch timers (when using the AND switch)
This commit is contained in:
bsongis@gmail.com
2013-06-04 09:25:09 +00:00
parent 6427b8a8bb
commit cf578bbaa0
3 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/opentx.cpp
+4 -9
View File
@@ -918,6 +918,7 @@ uint8_t cswStates[NUM_CSW];
#endif
int16_t csLastValue[NUM_CSW];
#define CS_LAST_VALUE_INIT -32768
bool __getSwitch(int8_t swtch)
{
@@ -947,6 +948,7 @@ bool __getSwitch(int8_t swtch)
CustomSwData * cs = cswAddress(cs_idx);
uint8_t s = cs->andsw;
if (cs->func == CS_OFF || (s && !__getSwitch(s))) {
csLastValue[cs_idx] = CS_LAST_VALUE_INIT;
result = false;
}
else if ((s=cswFamily(cs->func)) == CS_VBOOL) {
@@ -1051,7 +1053,7 @@ bool __getSwitch(int8_t swtch)
break;
default:
{
if (csLastValue[cs_idx] == -32668)
if (csLastValue[cs_idx] == CS_LAST_VALUE_INIT)
csLastValue[cs_idx] = x;
int16_t diff = x - csLastValue[cs_idx];
if (cs->func == CS_DIFFEGREATER)
@@ -2082,7 +2084,7 @@ void resetAll()
resetTelemetry();
#endif
for (uint8_t i=0; i<NUM_CSW; i++)
csLastValue[i] = -32768;
csLastValue[i] = CS_LAST_VALUE_INIT;
#if defined(THRTRACE)
s_traceCnt = 0;
@@ -3400,13 +3402,6 @@ void doMixerCalculations()
else { // if (*lastValue > 0)
*lastValue -= 1;
}
if (cs->andsw) {
int8_t x;
x = cs->andsw;
if (!getSwitch(x) == 0) {
*lastValue = -1;
}
}
}
}
}