From 894b41e313edf2dc1634848e9717a00a6bbd4815 Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Thu, 19 Jan 2017 12:08:57 -1000 Subject: [PATCH] AEROCORE Moved magic numbers for battery V div and A per V to board_config.h --- src/drivers/boards/aerocore/board_config.h | 6 ++++++ src/modules/sensors/parameters.cpp | 6 ++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/drivers/boards/aerocore/board_config.h b/src/drivers/boards/aerocore/board_config.h index e7f630a3c2..9b0d066c97 100644 --- a/src/drivers/boards/aerocore/board_config.h +++ b/src/drivers/boards/aerocore/board_config.h @@ -120,6 +120,12 @@ #define ADC_BATTERY_CURRENT_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 * * Eight PWM outputs are configured. diff --git a/src/modules/sensors/parameters.cpp b/src/modules/sensors/parameters.cpp index d537e21992..6045d045eb 100644 --- a/src/modules/sensors/parameters.cpp +++ b/src/modules/sensors/parameters.cpp @@ -419,9 +419,7 @@ int update_parameters(const ParameterHandles ¶meter_handles, Parameters &par parameters.battery_v_div = BOARD_BATTERY1_V_DIV; -#if defined (CONFIG_ARCH_BOARD_AEROCORE) - parameters.battery_v_div = 7.8196363636f; -#elif defined (CONFIG_ARCH_BOARD_PX4FMU_V1) +#if defined (CONFIG_ARCH_BOARD_PX4FMU_V1) parameters.battery_v_div = 5.7013919372f; #endif param_set(parameter_handles.battery_v_div, ¶meters.battery_v_div); @@ -436,7 +434,7 @@ int update_parameters(const ParameterHandles ¶meter_handles, Parameters &par 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 */ parameters.battery_a_per_v = 15.391030303f; #endif