Merge branch 'master' into fusterjj-lowpass

This commit is contained in:
Dominic Clifton 2015-02-22 15:24:11 +00:00
commit 5a15c3b271
2 changed files with 5 additions and 0 deletions

View File

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

View File

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