Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-06 16:49:51 +08:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

FMUV4 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:02:31 -10:00
committed by Lorenz Meier
parent e9ca626e19
commit 0baefec09f
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/boards/px4fmu-v4/board_config.h
+7
View File
@@ -166,6 +166,13 @@
#define ADC_5V_RAIL_SENSE 4
#define ADC_RC_RSSI_CHANNEL 11
/* Define Battery 1 Voltage Divider and A per V
*/
#define BOARD_BATTERY1_V_DIV (13.653333333f)
#define BOARD_BATTERY1_A_PER_V (36.367515152f)
/* User GPIOs
*
* GPIO0-5 are the PWM servo outputs.
src/modules/sensors/parameters.cpp
+2 -8
View File
@@ -419,9 +419,7 @@ int update_parameters(const ParameterHandles &parameter_handles, Parameters &par
parameters.battery_v_div = BOARD_BATTERY1_V_DIV;
#if defined (CONFIG_ARCH_BOARD_PX4FMU_V4)
parameters.battery_v_div = 13.653333333f;
#elif defined (CONFIG_ARCH_BOARD_PX4FMU_V2) || defined ( CONFIG_ARCH_BOARD_MINDPX_V2 )
#if defined (CONFIG_ARCH_BOARD_PX4FMU_V2) || defined ( CONFIG_ARCH_BOARD_MINDPX_V2 )
parameters.battery_v_div = 10.177939394f;
#elif defined (CONFIG_ARCH_BOARD_AEROCORE)
parameters.battery_v_div = 7.8196363636f;
@@ -440,11 +438,7 @@ int update_parameters(const ParameterHandles &parameter_handles, Parameters &par
parameters.battery_a_per_v = BOARD_BATTERY1_A_PER_V;
#if defined (CONFIG_ARCH_BOARD_PX4FMU_V4)
/* current scaling for ACSP4 */
parameters.battery_a_per_v = 36.367515152f;
#elif defined (CONFIG_ARCH_BOARD_PX4FMU_V2) || defined (CONFIG_ARCH_BOARD_MINDPX_V2) || defined (CONFIG_ARCH_BOARD_AEROCORE) || defined (CONFIG_ARCH_BOARD_PX4FMU_V1)
#if defined (CONFIG_ARCH_BOARD_PX4FMU_V2) || defined (CONFIG_ARCH_BOARD_MINDPX_V2) || defined (CONFIG_ARCH_BOARD_AEROCORE) || defined (CONFIG_ARCH_BOARD_PX4FMU_V1)
/* current scaling for 3DR power brick */
parameters.battery_a_per_v = 15.391030303f;
#endif