rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fusterjj-lowpass

This commit is contained in:
Dominic Clifton 2015-02-22 15:24:11 +00:00
parent df2f0e850f f88bbf4676
commit 5a15c3b271
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/io/rc_controls.c
View File

@ -250,6 +250,7 @@ void processRcStickPositions(rxConfig_t *rxConfig, throttleStatus_e throttleStat
return; return;
} }
#ifdef DISPLAY
if (rcSticks == THR_LO + YAW_CE + PIT_HI + ROL_LO) { if (rcSticks == THR_LO + YAW_CE + PIT_HI + ROL_LO) {
displayDisablePageCycling(); displayDisablePageCycling();
} }
@ -257,6 +258,7 @@ void processRcStickPositions(rxConfig_t *rxConfig, throttleStatus_e throttleStat
if (rcSticks == THR_LO + YAW_CE + PIT_HI + ROL_HI) { if (rcSticks == THR_LO + YAW_CE + PIT_HI + ROL_HI) {
displayEnablePageCycling(); displayEnablePageCycling();
} }
#endif
} }

3
src/test/unit/rc_controls_unittest.cc
View File

@ -705,6 +705,9 @@ void mwArm(void) {}
void feature(uint32_t) {} void feature(uint32_t) {}
void sensors(uint32_t) {} void sensors(uint32_t) {}
void mwDisarm(void) {} void mwDisarm(void) {}
void displayDisablePageCycling() {}
void displayEnablePageCycling() {}
uint8_t getCurrentControlRateProfile(void) { uint8_t getCurrentControlRateProfile(void) {
return 0; return 0;
} }