mirror of
https://github.com/betaflight/betaflight.git
synced 2025-07-24 00:35:39 +03:00
Merge branch 'octomixer' of https://github.com/iforce2d/cleanflight into iforce2d-octomixer
Conflicts: src/main/config/config.c
This commit is contained in:
commit
9d4dbb4871
2 changed files with 24 additions and 24 deletions
|
@ -198,14 +198,14 @@ static const motorMixer_t mixerOctoFlatP[] = {
|
|||
};
|
||||
|
||||
static const motorMixer_t mixerOctoFlatX[] = {
|
||||
{ 1.0f, 1.0f, -0.5f, 1.0f }, // MIDFRONT_L
|
||||
{ 1.0f, -0.5f, -1.0f, 1.0f }, // FRONT_R
|
||||
{ 1.0f, -1.0f, 0.5f, 1.0f }, // MIDREAR_R
|
||||
{ 1.0f, 0.5f, 1.0f, 1.0f }, // REAR_L
|
||||
{ 1.0f, 0.5f, -1.0f, -1.0f }, // FRONT_L
|
||||
{ 1.0f, -1.0f, -0.5f, -1.0f }, // MIDFRONT_R
|
||||
{ 1.0f, -0.5f, 1.0f, -1.0f }, // REAR_R
|
||||
{ 1.0f, 1.0f, 0.5f, -1.0f }, // MIDREAR_L
|
||||
{ 1.0f, 1.0f, -0.414178f, 1.0f }, // MIDFRONT_L
|
||||
{ 1.0f, -0.414178f, -1.0f, 1.0f }, // FRONT_R
|
||||
{ 1.0f, -1.0f, 0.414178f, 1.0f }, // MIDREAR_R
|
||||
{ 1.0f, 0.414178f, 1.0f, 1.0f }, // REAR_L
|
||||
{ 1.0f, 0.414178f, -1.0f, -1.0f }, // FRONT_L
|
||||
{ 1.0f, -1.0f, -0.414178f, -1.0f }, // MIDFRONT_R
|
||||
{ 1.0f, -0.414178f, 1.0f, -1.0f }, // REAR_R
|
||||
{ 1.0f, 1.0f, 0.414178f, -1.0f }, // MIDREAR_L
|
||||
};
|
||||
|
||||
static const motorMixer_t mixerVtail4[] = {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue