diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-25 09:48:15 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-25 09:48:15 +0100 |
| commit | 25af4b266ca48b183a1ad375856396f67d6ab30f (patch) | |
| tree | 64e031ec3747ab706e5ae8ed9fd052e12ee3248b /src/modules/vtol_att_control/vtol_att_control_main.cpp | |
| parent | ad189cf7d69b8de16244b90d398e1d84ed6d0f4b (diff) | |
| parent | 9b535f6553944f3468bbec9203301623412524ad (diff) | |
| download | px4-firmware-25af4b266ca48b183a1ad375856396f67d6ab30f.tar.gz px4-firmware-25af4b266ca48b183a1ad375856396f67d6ab30f.tar.bz2 px4-firmware-25af4b266ca48b183a1ad375856396f67d6ab30f.zip | |
Merge remote-tracking branch 'upstream/master' into dev_ros
Conflicts:
.gitignore
src/lib/uavcan
Diffstat (limited to 'src/modules/vtol_att_control/vtol_att_control_main.cpp')
| -rw-r--r-- | src/modules/vtol_att_control/vtol_att_control_main.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/modules/vtol_att_control/vtol_att_control_main.cpp b/src/modules/vtol_att_control/vtol_att_control_main.cpp index 24800cce8..9a80562f3 100644 --- a/src/modules/vtol_att_control/vtol_att_control_main.cpp +++ b/src/modules/vtol_att_control/vtol_att_control_main.cpp @@ -74,11 +74,8 @@ #include <lib/geo/geo.h> #include "drivers/drv_pwm_output.h" -#include <nuttx/fs/nxffs.h> #include <nuttx/fs/ioctl.h> -#include <nuttx/mtd.h> - #include <fcntl.h> @@ -238,11 +235,11 @@ VtolAttitudeControl::VtolAttitudeControl() : _params.idle_pwm_mc = PWM_LOWEST_MIN; _params.vtol_motor_count = 0; - _params_handles.idle_pwm_mc = param_find("IDLE_PWM_MC"); - _params_handles.vtol_motor_count = param_find("VTOL_MOT_COUNT"); - _params_handles.mc_airspeed_min = param_find("VTOL_MC_AIRSPEED_MIN"); - _params_handles.mc_airspeed_max = param_find("VTOL_MC_AIRSPEED_MAX"); - _params_handles.mc_airspeed_trim = param_find("VTOL_MC_AIRSPEED_TRIM"); + _params_handles.idle_pwm_mc = param_find("VT_IDLE_PWM_MC"); + _params_handles.vtol_motor_count = param_find("VT_MOT_COUNT"); + _params_handles.mc_airspeed_min = param_find("VT_MC_ARSPD_MIN"); + _params_handles.mc_airspeed_max = param_find("VT_MC_ARSPD_MAX"); + _params_handles.mc_airspeed_trim = param_find("VT_MC_ARSPD_TRIM"); /* fetch initial parameter values */ parameters_update(); |