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

delete deprecated BAT_* parameters

Browse Source
This commit is contained in:
Daniel Agar
2021-07-08 22:19:12 -04:00
parent 19bc1f9d02
commit c5b1fe86ca
41 changed files with 76 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/batt_smbus/batt_smbus.cpp
+6 -5
View File
@@ -54,8 +54,8 @@ BATT_SMBUS::BATT_SMBUS(const I2CSPIDriverConfig &config, SMBus *interface) :
int32_t battsource = 1;
int32_t batt_device_type = static_cast<int32_t>(SMBUS_DEVICE_TYPE::UNDEFINED);
param_set(param_find("BAT_SOURCE"), &battsource);
param_get(param_find("BAT_SMBUS_MODEL"), &batt_device_type);
param_set(param_find("BAT1_SOURCE"), &battsource);
param_get(param_find("BAT1_SMBUS_MODEL"), &batt_device_type);
//TODO: probe the device and autodetect its type
@@ -84,7 +84,7 @@ BATT_SMBUS::~BATT_SMBUS()
}
int32_t battsource = 0;
param_set(param_find("BAT_SOURCE"), &battsource);
param_set(param_find("BAT1_SOURCE"), &battsource);
}
void BATT_SMBUS::RunImpl()
@@ -359,13 +359,14 @@ int BATT_SMBUS::get_startup_info()
int ret = PX4_OK;
// Read battery threshold params on startup.
// TODO: support instances
param_get(param_find("BAT_CRIT_THR"), &_crit_thr);
param_get(param_find("BAT_LOW_THR"), &_low_thr);
param_get(param_find("BAT_EMERGEN_THR"), &_emergency_thr);
param_get(param_find("BAT_C_MULT"), &_c_mult);
param_get(param_find("BAT1_C_MULT"), &_c_mult);
int32_t cell_count_param = 0;
param_get(param_find("BAT_N_CELLS"), &cell_count_param);
param_get(param_find("BAT1_N_CELLS"), &cell_count_param);
_cell_count = math::min((uint8_t)cell_count_param, MAX_NUM_OF_CELLS);
ret |= _interface->block_read(BATT_SMBUS_MANUFACTURER_NAME, _manufacturer_name, BATT_SMBUS_MANUFACTURER_NAME_SIZE,
src/drivers/batt_smbus/parameters.c
+2 -2
View File
@@ -48,7 +48,7 @@ PARAM_DEFINE_INT32(SENS_EN_BATT, 0);
* @decimal 1
* @group Sensors
*/
PARAM_DEFINE_FLOAT(BAT_C_MULT, 1.0f);
PARAM_DEFINE_FLOAT(BAT1_C_MULT, 1.0f);
/**
* Battery device model
@@ -61,4 +61,4 @@ PARAM_DEFINE_FLOAT(BAT_C_MULT, 1.0f);
* @value 1 BQ40Z50 based
* @value 2 BQ40Z80 based
*/
PARAM_DEFINE_INT32(BAT_SMBUS_MODEL, 0);
PARAM_DEFINE_INT32(BAT1_SMBUS_MODEL, 0);