Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-16 12:55:19 +03:00
Code Issues Wiki Activity

More strict stick commands

Browse source
This commit is contained in:
jflyper 2017-04-07 12:40:51 +09:00
parent 602b656b01
commit f15d5dd12c
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/main/cms/cms.c
View file

@ -556,7 +556,6 @@ STATIC_UNIT_TESTED long cmsMenuBack(displayPort_t *pDisplay)
currentCtx = menuStack[--menuStackIdx];
cmsMenuCountPage(pDisplay);
cmsPageSelect(pDisplay, currentCtx.page);
cmsPageDebug();
@ -911,19 +910,19 @@ void cmsUpdate(uint32_t currentTimeUs)
if (IS_MID(THROTTLE) && IS_LO(YAW) && IS_HI(PITCH) && !ARMING_FLAG(ARMED)) {
key = KEY_MENU;
}
else if (IS_HI(PITCH)) {
else if (IS_MID(THROTTLE) && IS_MID(YAW) && IS_MID(ROLL) && IS_HI(PITCH)) {
key = KEY_UP;
}
else if (IS_LO(PITCH)) {
else if (IS_MID(THROTTLE) && IS_MID(YAW) && IS_MID(ROLL) && IS_LO(PITCH)) {
key = KEY_DOWN;
}
else if (IS_LO(ROLL)) {
else if (IS_MID(THROTTLE) && IS_MID(YAW) && IS_LO(ROLL) && IS_MID(PITCH)) {
key = KEY_LEFT;
}
else if (IS_HI(ROLL)) {
else if (IS_MID(THROTTLE) && IS_MID(YAW) && IS_HI(ROLL) && IS_MID(PITCH)) {
key = KEY_RIGHT;
}
else if (IS_HI(YAW) || IS_LO(YAW))
else if ((IS_HI(YAW) || IS_LO(YAW)) && IS_MID(THROTTLE) && IS_MID(ROLL) && IS_MID(PITCH))
{
key = KEY_ESC;
}

4
src/main/target/OMNIBUSF4/target.h
View file

@ -161,8 +161,8 @@
#define USE_ESCSERIAL
#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1
#define USE_I2C
#define I2C_DEVICE (I2CDEV_2)
//#define USE_I2C
//#define I2C_DEVICE (I2CDEV_2)
#define USE_SPI
#define USE_SPI_DEVICE_1