diff options
| author | Jean Cyr <jcyr@dillobits.com> | 2013-08-11 17:19:54 -0400 |
|---|---|---|
| committer | Jean Cyr <jcyr@dillobits.com> | 2013-08-11 17:19:54 -0400 |
| commit | 1d408b80ad70bd8ea873ce7215c8a92a62461b0f (patch) | |
| tree | 2b1452cb6f71385b0c61de5630ef0f9db9c319c8 /src/modules | |
| parent | 36679fbb39a57139c03cce85d7d0fbd25383a98a (diff) | |
| download | px4-firmware-1d408b80ad70bd8ea873ce7215c8a92a62461b0f.tar.gz px4-firmware-1d408b80ad70bd8ea873ce7215c8a92a62461b0f.tar.bz2 px4-firmware-1d408b80ad70bd8ea873ce7215c8a92a62461b0f.zip | |
Support DSM bind via QGroundControl
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/sensors/sensor_params.c | 1 | ||||
| -rw-r--r-- | src/modules/sensors/sensors.cpp | 12 |
2 files changed, 1 insertions, 12 deletions
diff --git a/src/modules/sensors/sensor_params.c b/src/modules/sensors/sensor_params.c index 133cda8d6..bd431c9eb 100644 --- a/src/modules/sensors/sensor_params.c +++ b/src/modules/sensors/sensor_params.c @@ -156,6 +156,7 @@ PARAM_DEFINE_FLOAT(RC14_DZ, 0.0f); PARAM_DEFINE_INT32(RC_TYPE, 1); /** 1 = FUTABA, 2 = Spektrum, 3 = Graupner HoTT, 4 = Turnigy 9x */ PARAM_DEFINE_INT32(RC_RL1_DSM_VCC, 0); /* Relay 1 controls DSM VCC */ +PARAM_DEFINE_INT32(RC_DSM_BIND, 0); /* 0 = Idle, 1 = Start DSM2 bind, 2 = Start DSMX bind */ /* default is conversion factor for the PX4IO / PX4IOAR board, the factor for PX4FMU standalone is different */ PARAM_DEFINE_FLOAT(BAT_V_SCALING, (3.3f * 52.0f / 5.0f / 4095.0f)); diff --git a/src/modules/sensors/sensors.cpp b/src/modules/sensors/sensors.cpp index f7b41b120..42268b971 100644 --- a/src/modules/sensors/sensors.cpp +++ b/src/modules/sensors/sensors.cpp @@ -257,8 +257,6 @@ private: float battery_voltage_scaling; - int rc_rl1_DSM_VCC_control; - } _parameters; /**< local copies of interesting parameters */ struct { @@ -308,8 +306,6 @@ private: param_t battery_voltage_scaling; - param_t rc_rl1_DSM_VCC_control; - } _parameter_handles; /**< handles for interesting parameters */ @@ -544,9 +540,6 @@ Sensors::Sensors() : _parameter_handles.battery_voltage_scaling = param_find("BAT_V_SCALING"); - /* DSM VCC relay control */ - _parameter_handles.rc_rl1_DSM_VCC_control = param_find("RC_RL1_DSM_VCC"); - /* fetch initial parameter values */ parameters_update(); } @@ -738,11 +731,6 @@ Sensors::parameters_update() warnx("Failed updating voltage scaling param"); } - /* relay 1 DSM VCC control */ - if (param_get(_parameter_handles.rc_rl1_DSM_VCC_control, &(_parameters.rc_rl1_DSM_VCC_control)) != OK) { - warnx("Failed updating relay 1 DSM VCC control"); - } - return OK; } |