diff --git a/boards/intel/aerofc-v1/aerofc_adc/aerofc_adc.cpp b/boards/intel/aerofc-v1/aerofc_adc/aerofc_adc.cpp index c43b02c5a1..4f740dfba3 100644 --- a/boards/intel/aerofc-v1/aerofc_adc/aerofc_adc.cpp +++ b/boards/intel/aerofc-v1/aerofc_adc/aerofc_adc.cpp @@ -56,6 +56,13 @@ // 10Hz #define CYCLE_TICKS_DELAY MSEC2TICK(100) + +uint32_t px4_arch_adc_dn_fullcount(void) +{ + return 1 << 12; // 12 bit ADC +} + + enum AEROFC_ADC_BUS { AEROFC_ADC_BUS_ALL = 0, AEROFC_ADC_BUS_I2C_INTERNAL, diff --git a/platforms/posix/src/px4/common/CMakeLists.txt b/platforms/posix/src/px4/common/CMakeLists.txt index 491f56bea6..79a9354940 100644 --- a/platforms/posix/src/px4/common/CMakeLists.txt +++ b/platforms/posix/src/px4/common/CMakeLists.txt @@ -49,6 +49,7 @@ if("${CONFIG_SHMEM}" STREQUAL "1") endif() add_library(px4_layer + adc.cpp px4_posix_impl.cpp px4_posix_tasks.cpp px4_sem.cpp diff --git a/platforms/posix/src/px4/common/adc.cpp b/platforms/posix/src/px4/common/adc.cpp new file mode 100644 index 0000000000..a4e162e37e --- /dev/null +++ b/platforms/posix/src/px4/common/adc.cpp @@ -0,0 +1,40 @@ +/**************************************************************************** + * + * Copyright (C) 2019 PX4 Development Team. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name PX4 nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +#include + +uint32_t px4_arch_adc_dn_fullcount(void) +{ + return 1 << 12; // 12 bit ADC +} + diff --git a/src/modules/battery_status/parameters.cpp b/src/modules/battery_status/parameters.cpp index 4b2e3a41bd..371aaaf018 100644 --- a/src/modules/battery_status/parameters.cpp +++ b/src/modules/battery_status/parameters.cpp @@ -40,6 +40,7 @@ #include "parameters.h" #include +#include namespace battery_status { @@ -67,7 +68,7 @@ int update_parameters(const ParameterHandles ¶meter_handles, Parameters &par } else if (parameters.battery_voltage_scaling < 0.0f) { /* apply scaling according to defaults if set to default */ - parameters.battery_voltage_scaling = (3.3f / 4096); + parameters.battery_voltage_scaling = (3.3f / px4_arch_adc_dn_fullcount()); param_set_no_notification(parameter_handles.battery_voltage_scaling, ¶meters.battery_voltage_scaling); } @@ -77,7 +78,7 @@ int update_parameters(const ParameterHandles ¶meter_handles, Parameters &par } else if (parameters.battery_current_scaling < 0.0f) { /* apply scaling according to defaults if set to default */ - parameters.battery_current_scaling = (3.3f / 4096); + parameters.battery_current_scaling = (3.3f / px4_arch_adc_dn_fullcount()); param_set_no_notification(parameter_handles.battery_current_scaling, ¶meters.battery_current_scaling); }