Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 06:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_BattMonitor: UAVCAN switch to CURR_MULT

Browse Source
This commit is contained in:
Joshua Henderson 2022-01-24 22:10:34 -05:00 committed by Randy Mackay
parent d51e2d323e
commit 90744e08e1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/AP_BattMonitor/AP_BattMonitor_UAVCAN.cpp
View File

@ -23,12 +23,12 @@ extern const AP_HAL::HAL& hal;
const AP_Param::GroupInfo AP_BattMonitor_UAVCAN::var_info[] = {
// @Param: CUR_MULT
// @Param: CURR_MULT
// @DisplayName: Scales reported power monitor current
// @Description: Multiplier applied to all current related reports to allow for adjustment if no UAVCAN param access or current splitting applications
// @Range: .1 10
// @User: Advanced
AP_GROUPINFO("CUR_MULT", 27, AP_BattMonitor_UAVCAN, _cur_mult, 1.0),
AP_GROUPINFO("CURR_MULT", 27, AP_BattMonitor_UAVCAN, _curr_mult, 1.0),
AP_GROUPEND
};
@ -139,7 +139,7 @@ void AP_BattMonitor_UAVCAN::update_interim_state(const float voltage, const floa
WITH_SEMAPHORE(_sem_battmon);
_interim_state.voltage = voltage;
_interim_state.current_amps = _cur_mult * current;
_interim_state.current_amps = _curr_mult * current;
_soc = soc;
if (!isnanf(temperature_K) && temperature_K > 0) {

2
libraries/AP_BattMonitor/AP_BattMonitor_UAVCAN.h
View File

@ -95,7 +95,7 @@ private:
bool _has_battery_info_aux;
uint8_t _instance; // instance of this battery monitor
uavcan::Node<0> *_node; // UAVCAN node id
AP_Float _cur_mult; // scaling multiplier applied to current reports for adjustment
AP_Float _curr_mult; // scaling multiplier applied to current reports for adjustment
// MPPT variables
struct {
bool is_detected; // true if this UAVCAN device is a Packet Digital MPPT