Merge branch 'master' into fusterjj-lowpass
This commit is contained in:
commit
5a15c3b271
|
@ -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
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue