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

[ARM] Custom switches delays and durations reworked. Not tested.

Browse Source
This commit is contained in:
bsongis
2013-01-27 21:58:34 +00:00
parent 0b1bdc540e
commit 4c6b4dd061
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/open9x.cpp
+10 -12
View File
@@ -711,8 +711,9 @@ volatile GETSWITCH_RECURSIVE_TYPE s_last_switch_value;
/* recursive function. stack as of today (16/03/2012) grows by 8bytes at each call, which is ok! */
#if defined(CPUARM)
uint32_t delays[NUM_CSW];
uint32_t durations[NUM_CSW];
uint32_t cswDelays[NUM_CSW];
uint32_t cswDurations[NUM_CSW];
uint8_t cswStates[NUM_CSW];
#endif
int16_t csLastValue[NUM_CSW];
@@ -862,22 +863,19 @@ bool __getSwitch(int8_t swtch)
#if defined(CPUARM)
if (cs->delay) {
if (result) {
if (delays[cs_idx] > get_tmr10ms())
if (cswDelays[cs_idx] > get_tmr10ms())
result = false;
}
else {
delays[cs_idx] = get_tmr10ms() + (cs->delay*50);
cswDelays[cs_idx] = get_tmr10ms() + (cs->delay*50);
}
}
if (cs->duration) {
if (!result) {
if (durations[cs_idx] > get_tmr10ms()) {
result = true;
if (cs->delay) delays[cs_idx] = get_tmr10ms() + (cs->delay*50);
}
}
else {
durations[cs_idx] = get_tmr10ms() + (cs->duration*50);
if (result && !cswStates[cs_idx])
cswDurations[cs_idx] = get_tmr10ms() + (cs->duration*50);
if (cswDurations[cs_idx] > get_tmr10ms()) {
result = true;
if (cs->delay) cswDelays[cs_idx] = get_tmr10ms() + (cs->delay*50);
}
}