dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

navio_sysfs_pwm_out: removing default mixer

This commit is contained in:
mantelt 2016-11-03 08:59:58 +01:00
parent 6cbd398974
commit 32403ddb90
1 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/drivers/navio_sysfs_pwm_out/navio_sysfs_pwm_out.cpp
View File

@ -48,7 +48,6 @@
#include <drivers/drv_mixer.h>
#include <systemlib/mixer/mixer.h>
#include <systemlib/mixer/mixer_load.h>
#include <systemlib/mixer/mixer_multirotor.generated.h>
#include <systemlib/param/param.h>
#include <systemlib/pwm_limit/pwm_limit.h>
@ -156,22 +155,6 @@ int initialize_mixer(const char *mixer_filename)
PX4_ERR("Unable to load config file.");
}
PX4_WARN("Using default mixer.");
/* Mixer file loading failed, fall back to default mixer configuration for
* QUAD_X airframe. */
float roll_scale = 1;
float pitch_scale = 1;
float yaw_scale = 1;
float deadband = 0;
MultirotorMixer *mixer = new MultirotorMixer(mixer_control_callback, (uintptr_t)&_controls,
MultirotorGeometry::QUAD_X,
roll_scale, pitch_scale, yaw_scale, deadband);
_mixer_group->add_mixer(mixer);
// TODO: temporary hack to make this compile
(void)_config_index[0];
if (_mixer_group->count() <= 0) {
PX4_ERR("Mixer initialization failed");
return -1;