fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-07 07:31:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

produce 0 voltage/current if no suitable default could be set

Browse Source
This commit is contained in:
Andreas Antener
2016-06-07 22:27:08 +02:00
committed by Lorenz Meier
parent e1805dfe0c
commit 98eeb25e45
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/sensors/sensors.cpp
+4 -4
View File
@@ -912,7 +912,7 @@ Sensors::parameters_update()
if (param_get(_parameter_handles.battery_v_div, &(_parameters.battery_v_div)) != OK) { if (param_get(_parameter_handles.battery_v_div, &(_parameters.battery_v_div)) != OK) {
warnx("%s", paramerr); warnx("%s", paramerr);
_parameters.battery_v_div = 100.0f; _parameters.battery_v_div = 0.0f;
} else if (_parameters.battery_v_div < 0.0f) { } else if (_parameters.battery_v_div < 0.0f) {
/* apply scaling according to defaults if set to default */ /* apply scaling according to defaults if set to default */
@@ -926,13 +926,13 @@ Sensors::parameters_update()
_parameters.battery_v_div = 5.7013919372f; _parameters.battery_v_div = 5.7013919372f;
#else #else
/* ensure a missing default trips a low voltage lockdown */ /* ensure a missing default trips a low voltage lockdown */
_parameters.battery_v_div = 100.0f; _parameters.battery_v_div = 0.0f;
#endif #endif
} }
if (param_get(_parameter_handles.battery_a_per_v, &(_parameters.battery_a_per_v)) != OK) { if (param_get(_parameter_handles.battery_a_per_v, &(_parameters.battery_a_per_v)) != OK) {
warnx("%s", paramerr); warnx("%s", paramerr);
_parameters.battery_a_per_v = 100.0f; _parameters.battery_a_per_v = 0.0f;
} else if (_parameters.battery_a_per_v < 0.0f) { } else if (_parameters.battery_a_per_v < 0.0f) {
/* apply scaling according to defaults if set to default */ /* apply scaling according to defaults if set to default */
@@ -944,7 +944,7 @@ Sensors::parameters_update()
_parameters.battery_a_per_v = 15.391030303f; _parameters.battery_a_per_v = 15.391030303f;
#else #else
/* ensure a missing default leads to an unrealistic current value */ /* ensure a missing default leads to an unrealistic current value */
_parameters.battery_a_per_v = 100.0f; _parameters.battery_a_per_v = 0.0f;
#endif #endif
} }