Browse Source

shortened parameter names to max 16 bytes

sbg
Roman Bapst 10 years ago
parent
commit
f3b5b67eec
  1. 4
      ROMFS/px4fmu_common/init.d/13001_caipirinha_vtol
  2. 10
      src/modules/vtol_att_control/vtol_att_control_main.cpp
  3. 10
      src/modules/vtol_att_control/vtol_att_control_params.c

4
ROMFS/px4fmu_common/init.d/13001_caipirinha_vtol

@ -12,5 +12,5 @@ set MIXER FMU_caipirinha_vtol @@ -12,5 +12,5 @@ set MIXER FMU_caipirinha_vtol
set PWM_OUT 12
set PWM_MAX 2000
set PWM_RATE 400
param set VTOL_MOT_COUNT 2
param set VTOL_IDLE_PWM_MC 1080
param set VT_MOT_COUNT 2
param set VT_IDLE_PWM_MC 1080

10
src/modules/vtol_att_control/vtol_att_control_main.cpp

@ -238,11 +238,11 @@ VtolAttitudeControl::VtolAttitudeControl() : @@ -238,11 +238,11 @@ VtolAttitudeControl::VtolAttitudeControl() :
_params.idle_pwm_mc = PWM_LOWEST_MIN;
_params.vtol_motor_count = 0;
_params_handles.idle_pwm_mc = param_find("VTOL_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();

10
src/modules/vtol_att_control/vtol_att_control_params.c

@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
* @min 1.0
* @group VTOL Attitude Control
*/
PARAM_DEFINE_INT32(VTOL_MOT_COUNT,0);
PARAM_DEFINE_INT32(VT_MOT_COUNT,0);
/**
* Idle speed of VTOL when in multicopter mode
@ -54,7 +54,7 @@ PARAM_DEFINE_INT32(VTOL_MOT_COUNT,0); @@ -54,7 +54,7 @@ PARAM_DEFINE_INT32(VTOL_MOT_COUNT,0);
* @min 900
* @group VTOL Attitude Control
*/
PARAM_DEFINE_INT32(VTOL_IDLE_PWM_MC,900);
PARAM_DEFINE_INT32(VT_IDLE_PWM_MC,900);
/**
* Minimum airspeed in multicopter mode
@ -64,7 +64,7 @@ PARAM_DEFINE_INT32(VTOL_IDLE_PWM_MC,900); @@ -64,7 +64,7 @@ PARAM_DEFINE_INT32(VTOL_IDLE_PWM_MC,900);
* @min 0.0
* @group VTOL Attitude Control
*/
PARAM_DEFINE_FLOAT(VTOL_MC_AIRSPEED_MIN,2.0f);
PARAM_DEFINE_FLOAT(VT_MC_ARSPD_MIN,2.0f);
/**
* Maximum airspeed in multicopter mode
@ -74,7 +74,7 @@ PARAM_DEFINE_FLOAT(VTOL_MC_AIRSPEED_MIN,2.0f); @@ -74,7 +74,7 @@ PARAM_DEFINE_FLOAT(VTOL_MC_AIRSPEED_MIN,2.0f);
* @min 0.0
* @group VTOL Attitude Control
*/
PARAM_DEFINE_FLOAT(VTOL_MC_AIRSPEED_MAX,30.0f);
PARAM_DEFINE_FLOAT(VT_MC_ARSPD_MAX,30.0f);
/**
* Trim airspeed when in multicopter mode
@ -84,5 +84,5 @@ PARAM_DEFINE_FLOAT(VTOL_MC_AIRSPEED_MAX,30.0f); @@ -84,5 +84,5 @@ PARAM_DEFINE_FLOAT(VTOL_MC_AIRSPEED_MAX,30.0f);
* @min 0.0
* @group VTOL Attitude Control
*/
PARAM_DEFINE_FLOAT(VTOL_MC_AIRSPEED_TRIM,10.0f);
PARAM_DEFINE_FLOAT(VT_MC_ARSPD_TRIM,10.0f);

Loading…
Cancel
Save