diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2013-07-14 11:32:04 +0200 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-07-14 11:32:04 +0200 |
commit | 319eb18ab54ca42cd7fedacabc3573bb402e2c23 (patch) | |
tree | b1d637d50069222837835e6491d80283d4e72100 /src/modules/sensors | |
parent | 7fe2aa27974f93810727b0a59658ed760c6ad591 (diff) | |
parent | 60ce9759d9d5a9b5f2e9fd218852fa595cc7bebd (diff) | |
download | px4-firmware-319eb18ab54ca42cd7fedacabc3573bb402e2c23.tar.gz px4-firmware-319eb18ab54ca42cd7fedacabc3573bb402e2c23.tar.bz2 px4-firmware-319eb18ab54ca42cd7fedacabc3573bb402e2c23.zip |
Merged
Diffstat (limited to 'src/modules/sensors')
-rw-r--r-- | src/modules/sensors/sensor_params.c | 1 | ||||
-rw-r--r-- | src/modules/sensors/sensors.cpp | 14 |
2 files changed, 13 insertions, 2 deletions
diff --git a/src/modules/sensors/sensor_params.c b/src/modules/sensors/sensor_params.c index 57f1de1ac..133cda8d6 100644 --- a/src/modules/sensors/sensor_params.c +++ b/src/modules/sensors/sensor_params.c @@ -155,6 +155,7 @@ PARAM_DEFINE_FLOAT(RC14_REV, 1.0f); 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 */ /* 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 29f9de883..84943b099 100644 --- a/src/modules/sensors/sensors.cpp +++ b/src/modules/sensors/sensors.cpp @@ -232,7 +232,8 @@ private: float battery_voltage_scaling; - int airspeed_offset; + int rc_rl1_DSM_VCC_control; + } _parameters; /**< local copies of interesting parameters */ struct { @@ -282,7 +283,8 @@ private: param_t battery_voltage_scaling; - param_t airspeed_offset; + param_t rc_rl1_DSM_VCC_control; + } _parameter_handles; /**< handles for interesting parameters */ @@ -519,6 +521,9 @@ 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(); } @@ -710,6 +715,11 @@ 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; } |