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

FMUV1 Moved magic numbers for battery V div and A per V to board_config.h

Browse Source
This commit is contained in:
David Sidrane 2017-01-19 12:11:13 -10:00 committed by Lorenz Meier
parent 894b41e313
commit df6b46d0ba
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/drivers/boards/px4fmu-v1/board_config.h
View File

@ -126,6 +126,12 @@
#define ADC_BATTERY_CURRENT_CHANNEL ((uint8_t)(-1))
#define ADC_AIRSPEED_VOLTAGE_CHANNEL 11
/* Define Battery 1 Voltage Divider and A per V
*/
#define BOARD_BATTERY1_V_DIV (5.7013919372f)
#define BOARD_BATTERY1_A_PER_V (15.391030303f)
/* User GPIOs
*
* GPIO0-1 are the buffered high-power GPIOs.

9
src/modules/sensors/parameters.cpp
View File

@ -418,10 +418,6 @@ int update_parameters(const ParameterHandles &parameter_handles, Parameters &par
/* apply scaling according to defaults if set to default */
parameters.battery_v_div = BOARD_BATTERY1_V_DIV;
#if defined (CONFIG_ARCH_BOARD_PX4FMU_V1)
parameters.battery_v_div = 5.7013919372f;
#endif
param_set(parameter_handles.battery_v_div, &parameters.battery_v_div);
}
@ -433,11 +429,6 @@ int update_parameters(const ParameterHandles &parameter_handles, Parameters &par
/* apply scaling according to defaults if set to default */
parameters.battery_a_per_v = BOARD_BATTERY1_A_PER_V;
#if defined (CONFIG_ARCH_BOARD_PX4FMU_V1)
/* current scaling for 3DR power brick */
parameters.battery_a_per_v = 15.391030303f;
#endif
param_set(parameter_handles.battery_a_per_v, &parameters.battery_a_per_v);
}