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

AEROCORE 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-21 11:45:36 +01:00
committed by Lorenz Meier
parent f86a8c0e5e
commit 894b41e313
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/boards/aerocore/board_config.h
+6
View File
@@ -120,6 +120,12 @@
#define ADC_BATTERY_CURRENT_CHANNEL ((uint8_t)(-1)) #define ADC_BATTERY_CURRENT_CHANNEL ((uint8_t)(-1))
#define ADC_AIRSPEED_VOLTAGE_CHANNEL ((uint8_t)(-1)) #define ADC_AIRSPEED_VOLTAGE_CHANNEL ((uint8_t)(-1))
/* Define Battery 1 Voltage Divider and A per V
*/
#define BOARD_BATTERY1_V_DIV (7.8196363636f)
#define BOARD_BATTERY1_A_PER_V (15.391030303f)
/* PWM /* PWM
* *
* Eight PWM outputs are configured. * Eight PWM outputs are configured.
src/modules/sensors/parameters.cpp
+2 -4
View File
@@ -419,9 +419,7 @@ int update_parameters(const ParameterHandles &parameter_handles, Parameters &par
parameters.battery_v_div = BOARD_BATTERY1_V_DIV; parameters.battery_v_div = BOARD_BATTERY1_V_DIV;
#if defined (CONFIG_ARCH_BOARD_AEROCORE) #if defined (CONFIG_ARCH_BOARD_PX4FMU_V1)
parameters.battery_v_div = 7.8196363636f;
#elif defined (CONFIG_ARCH_BOARD_PX4FMU_V1)
parameters.battery_v_div = 5.7013919372f; parameters.battery_v_div = 5.7013919372f;
#endif #endif
param_set(parameter_handles.battery_v_div, &parameters.battery_v_div); param_set(parameter_handles.battery_v_div, &parameters.battery_v_div);
@@ -436,7 +434,7 @@ int update_parameters(const ParameterHandles &parameter_handles, Parameters &par
parameters.battery_a_per_v = BOARD_BATTERY1_A_PER_V; parameters.battery_a_per_v = BOARD_BATTERY1_A_PER_V;
#if defined (CONFIG_ARCH_BOARD_AEROCORE) || defined (CONFIG_ARCH_BOARD_PX4FMU_V1) #if defined (CONFIG_ARCH_BOARD_PX4FMU_V1)
/* current scaling for 3DR power brick */ /* current scaling for 3DR power brick */
parameters.battery_a_per_v = 15.391030303f; parameters.battery_a_per_v = 15.391030303f;
#endif #endif