diff options
| author | px4dev <px4@purgatory.org> | 2012-10-23 23:38:45 -0700 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2012-10-23 23:51:13 -0700 |
| commit | 2fc10320697ecaa9c4e0c52d4d047424e41e6336 (patch) | |
| tree | 4f18f494ab811e29dc55452f92a63fff9d271dda /apps/systemlib/mixer/mixer_multirotor.cpp | |
| parent | 34f99c7dca1995f8ddd9e8d61c4cbd7289f40e99 (diff) | |
| download | px4-firmware-2fc10320697ecaa9c4e0c52d4d047424e41e6336.tar.gz px4-firmware-2fc10320697ecaa9c4e0c52d4d047424e41e6336.tar.bz2 px4-firmware-2fc10320697ecaa9c4e0c52d4d047424e41e6336.zip | |
Major formatting/whitespace cleanup
Diffstat (limited to 'apps/systemlib/mixer/mixer_multirotor.cpp')
| -rw-r--r-- | apps/systemlib/mixer/mixer_multirotor.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/apps/systemlib/mixer/mixer_multirotor.cpp b/apps/systemlib/mixer/mixer_multirotor.cpp index e2576a848..0e714ed50 100644 --- a/apps/systemlib/mixer/mixer_multirotor.cpp +++ b/apps/systemlib/mixer/mixer_multirotor.cpp @@ -57,7 +57,7 @@ #define CW (-1.0f) #define CCW (1.0f) -namespace +namespace { /* @@ -167,17 +167,21 @@ MultirotorMixer::mix(float *outputs, unsigned space) pitch * _rotors[i].pitch_scale + yaw * _rotors[i].yaw_scale + thrust; + if (tmp > max) max = tmp; + outputs[i] = tmp; } /* scale values into the -1.0 - 1.0 range */ if (max > 1.0f) { fixup_scale = 2.0f / max; + } else { fixup_scale = 2.0f; } + for (unsigned i = 0; i < _rotor_count; i++) outputs[i] = -1.0f + (outputs[i] * fixup_scale); |