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

Merge branch 'upstream' of https://github.com/davibe/baseflight into davibe-upstream

Browse source
This commit is contained in:
dongie 2013-11-02 14:40:50 +09:00
commit d7b99e7938
2 changed files with 52 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/mixer.c
View file

@ -3,6 +3,7 @@
static uint8_t numberMotor = 0;
int16_t motor[MAX_MOTORS];
int16_t motor_disarmed[MAX_MOTORS];
int16_t servo[MAX_SERVOS] = { 1500, 1500, 1500, 1500, 1500, 1500, 1500, 1500 };
static motorMixer_t currentMixer[MAX_MOTORS];
@ -210,6 +211,11 @@ void mixerInit(void)
}
}
}
// set disarmed motor values
for (i = 0; i < MAX_MOTORS; i++) {
motor_disarmed[i] = feature(FEATURE_3D) ? mcfg.neutral3d : mcfg.mincommand;
}
}
void mixerLoadMix(int index)
@ -481,7 +487,8 @@ void mixTable(void)
motor[i] = mcfg.mincommand;
}
}
if (!f.ARMED)
motor[i] = feature(FEATURE_3D) ? mcfg.neutral3d : mcfg.mincommand;
if (!f.ARMED) {
motor[i] = motor_disarmed[i];
}
}
}