Skip to content

Commit 94de12e

Browse files
authored
sensors: own BAT_V_DIV and BAT_A_PER_V params (#13299)
- this is currently necessary for the QGC power setup gui, but should be reverted in the future - fixes #13292
1 parent cb03612 commit 94de12e

File tree

3 files changed

+60
-25
lines changed

3 files changed

+60
-25
lines changed

src/modules/battery_status/sensor_params_battery.c

-25
Original file line numberDiff line numberDiff line change
@@ -66,31 +66,6 @@ PARAM_DEFINE_FLOAT(BAT_CNT_V_CURR, -1.0);
6666
*/
6767
PARAM_DEFINE_FLOAT(BAT_V_OFFS_CURR, 0.0);
6868

69-
/**
70-
* Battery voltage divider (V divider)
71-
*
72-
* This is the divider from battery voltage to 3.3V ADC voltage.
73-
* If using e.g. Mauch power modules the value from the datasheet
74-
* can be applied straight here. A value of -1 means to use
75-
* the board default.
76-
*
77-
* @group Battery Calibration
78-
* @decimal 8
79-
*/
80-
PARAM_DEFINE_FLOAT(BAT_V_DIV, -1.0);
81-
82-
/**
83-
* Battery current per volt (A/V)
84-
*
85-
* The voltage seen by the 3.3V ADC multiplied by this factor
86-
* will determine the battery current. A value of -1 means to use
87-
* the board default.
88-
*
89-
* @group Battery Calibration
90-
* @decimal 8
91-
*/
92-
PARAM_DEFINE_FLOAT(BAT_A_PER_V, -1.0);
93-
9469
/**
9570
* Battery monitoring source.
9671
*

src/modules/sensors/parameters.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,9 @@ void initialize_parameter_handles(ParameterHandles &parameter_handles)
159159
// We do a param_find here to force them into the list.
160160
(void)param_find("RC_CHAN_CNT");
161161

162+
(void)param_find("BAT_V_DIV");
163+
(void)param_find("BAT_A_PER_V");
164+
162165
(void)param_find("CAL_ACC0_ID");
163166
(void)param_find("CAL_GYRO0_ID");
164167

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
/****************************************************************************
2+
*
3+
* Copyright (c) 2012-2019 PX4 Development Team. All rights reserved.
4+
*
5+
* Redistribution and use in source and binary forms, with or without
6+
* modification, are permitted provided that the following conditions
7+
* are met:
8+
*
9+
* 1. Redistributions of source code must retain the above copyright
10+
* notice, this list of conditions and the following disclaimer.
11+
* 2. Redistributions in binary form must reproduce the above copyright
12+
* notice, this list of conditions and the following disclaimer in
13+
* the documentation and/or other materials provided with the
14+
* distribution.
15+
* 3. Neither the name PX4 nor the names of its contributors may be
16+
* used to endorse or promote products derived from this software
17+
* without specific prior written permission.
18+
*
19+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
20+
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
21+
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
22+
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
23+
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
24+
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
25+
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
26+
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
27+
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
28+
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
29+
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30+
* POSSIBILITY OF SUCH DAMAGE.
31+
*
32+
****************************************************************************/
33+
34+
/**
35+
* Battery voltage divider (V divider)
36+
*
37+
* This is the divider from battery voltage to 3.3V ADC voltage.
38+
* If using e.g. Mauch power modules the value from the datasheet
39+
* can be applied straight here. A value of -1 means to use
40+
* the board default.
41+
*
42+
* @group Battery Calibration
43+
* @decimal 8
44+
*/
45+
PARAM_DEFINE_FLOAT(BAT_V_DIV, -1.0);
46+
47+
/**
48+
* Battery current per volt (A/V)
49+
*
50+
* The voltage seen by the 3.3V ADC multiplied by this factor
51+
* will determine the battery current. A value of -1 means to use
52+
* the board default.
53+
*
54+
* @group Battery Calibration
55+
* @decimal 8
56+
*/
57+
PARAM_DEFINE_FLOAT(BAT_A_PER_V, -1.0);

0 commit comments

Comments
 (0)