Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-22 08:38:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

DataFlash: log cell voltages with correct packet type

Browse Source
This commit is contained in:
Peter Barker 2017-09-29 13:15:20 +10:00 committed by Francisco Ferreira
parent 79ba2b357f
commit 06a2e05be5
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libraries/DataFlash/DataFlash.h
View File

@ -285,7 +285,8 @@ private:
void Log_Write_Current_instance(const AP_BattMonitor &battery,
uint64_t time_us,
uint8_t battery_instance,
enum LogMessages type);
enum LogMessages type,
enum LogMessages celltype);
void backend_starting_new_log(const DataFlash_Backend *backend);

17
libraries/DataFlash/LogFile.cpp
View File

@ -1529,7 +1529,8 @@ void DataFlash_Class::Log_Write_AttitudeView(AP_AHRS_View &ahrs, const Vector3f
void DataFlash_Class::Log_Write_Current_instance(const AP_BattMonitor &battery,
const uint64_t time_us,
const uint8_t battery_instance,
const enum LogMessages type)
const enum LogMessages type,
const enum LogMessages celltype)
{
float temp;
bool has_temp = battery.get_temperature(temp, battery_instance);
@ -1549,7 +1550,7 @@ void DataFlash_Class::Log_Write_Current_instance(const AP_BattMonitor &battery,
if (battery.has_cell_voltages(battery_instance)) {
const AP_BattMonitor::cells &cells = battery.get_cell_voltages(battery_instance);
struct log_Current_Cells cell_pkt = {
LOG_PACKET_HEADER_INIT(LOG_CURRENT_CELLS_MSG),
LOG_PACKET_HEADER_INIT(celltype),
time_us : time_us,
voltage : battery.voltage(battery_instance)
};
@ -1569,11 +1570,19 @@ void DataFlash_Class::Log_Write_Current(const AP_BattMonitor &battery)
{
const uint64_t time_us = AP_HAL::micros64();
if (battery.num_instances() >= 1) {
Log_Write_Current_instance(battery, time_us, 0, LOG_CURRENT_MSG);
Log_Write_Current_instance(battery,
time_us,
0,
LOG_CURRENT_MSG,
LOG_CURRENT_CELLS_MSG);
}
if (battery.num_instances() >= 2) {
Log_Write_Current_instance(battery, time_us, 1, LOG_CURRENT2_MSG);
Log_Write_Current_instance(battery,
time_us,
1,
LOG_CURRENT2_MSG,
LOG_CURRENT_CELLS2_MSG);
}
}