dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

voltage & current scaling: use px4_arch_adc_dn_fullcount() instead of 4096 

Fixes the scaling on h7 boards (the ADC has 16 bits resolution).
This commit is contained in:
Beat Küng 2019-11-19 16:06:56 +01:00
parent b63044393e
commit 4b290c4903
4 changed files with 51 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
boards/intel/aerofc-v1/aerofc_adc/aerofc_adc.cpp
View File

@ -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,

1
platforms/posix/src/px4/common/CMakeLists.txt
View File

@ -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

40
platforms/posix/src/px4/common/adc.cpp Normal file
View File

@ -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 <drivers/drv_adc.h>
uint32_t px4_arch_adc_dn_fullcount(void)
{
return 1 << 12; // 12 bit ADC
}

5
src/modules/battery_status/parameters.cpp
View File

@ -40,6 +40,7 @@
#include "parameters.h"
#include <px4_platform_common/log.h>
#include <drivers/drv_adc.h>
namespace battery_status
{
@ -67,7 +68,7 @@ int update_parameters(const ParameterHandles &parameter_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, &parameters.battery_voltage_scaling);
}
@ -77,7 +78,7 @@ int update_parameters(const ParameterHandles &parameter_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, &parameters.battery_current_scaling);
}