diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-07-08 11:06:47 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-07-08 11:06:47 +0200 |
| commit | 0d7ae9276e53a46b2b2fed41ae849ff21a6f5934 (patch) | |
| tree | f8a7bb8306926a386faaa6b4baacbfb8aaf95239 /src/drivers/ardrone_interface | |
| parent | 2d26e913921ce80e509bd79462319d09d12c2171 (diff) | |
| parent | 63f91e0e9eac66c95d682b3bb6ad5fbb054172b3 (diff) | |
| download | px4-firmware-0d7ae9276e53a46b2b2fed41ae849ff21a6f5934.tar.gz px4-firmware-0d7ae9276e53a46b2b2fed41ae849ff21a6f5934.tar.bz2 px4-firmware-0d7ae9276e53a46b2b2fed41ae849ff21a6f5934.zip | |
Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpointmessages
Conflicts:
src/modules/navigator/offboard.cpp
Diffstat (limited to 'src/drivers/ardrone_interface')
| -rw-r--r-- | src/drivers/ardrone_interface/ardrone_motor_control.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/drivers/ardrone_interface/ardrone_motor_control.c b/src/drivers/ardrone_interface/ardrone_motor_control.c index 81f634992..fc017dd58 100644 --- a/src/drivers/ardrone_interface/ardrone_motor_control.c +++ b/src/drivers/ardrone_interface/ardrone_motor_control.c @@ -382,8 +382,6 @@ void ardrone_mixing_and_output(int ardrone_write, const struct actuator_controls float output_band = 0.0f; const float startpoint_full_control = 0.25f; /**< start full control at 25% thrust */ - static bool initialized = false; - /* linearly scale the control inputs from 0 to startpoint_full_control */ if (motor_thrust < startpoint_full_control) { output_band = motor_thrust/startpoint_full_control; // linear from 0 to 1 |