Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rover: Move battery logging to AP_BattMonitor

This commit is contained in:
Michael du Breuil 2018-01-16 12:16:44 -07:00 committed by Francisco Ferreira
parent 69da4041ac
commit 2e9e91b3a3
3 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
APMrover2/APMrover2.cpp
View File

@ -299,9 +299,6 @@ void Rover::update_aux(void)
*/
void Rover::one_second_loop(void)
{
if (should_log(MASK_LOG_CURRENT)) {
Log_Write_Current();
}
// send a heartbeat
gcs().send_message(MSG_HEARTBEAT);

9
APMrover2/Log.cpp
View File

@ -202,14 +202,6 @@ void Rover::Log_Write_Rangefinder()
DataFlash.WriteBlock(&pkt, sizeof(pkt));
}
void Rover::Log_Write_Current()
{
DataFlash.Log_Write_Current(battery);
// also write power status
DataFlash.Log_Write_Power();
}
struct PACKED log_Arm_Disarm {
LOG_PACKET_HEADER;
uint64_t time_us;
@ -390,7 +382,6 @@ void Rover::Log_Write_Vehicle_Startup_Messages()
// dummy functions
void Rover::Log_Write_Startup(uint8_t type) {}
void Rover::Log_Write_Current() {}
void Rover::Log_Write_Nav_Tuning() {}
void Rover::Log_Write_Performance() {}
void Rover::Log_Write_Throttle() {}

3
APMrover2/Rover.h
View File

@ -292,7 +292,7 @@ private:
aux_switch_pos aux_ch7;
// Battery Sensors
AP_BattMonitor battery;
AP_BattMonitor battery{MASK_LOG_CURRENT};
#if FRSKY_TELEM_ENABLED == ENABLED
// FrSky telemetry support
@ -513,7 +513,6 @@ private:
void Log_Write_Nav_Tuning();
void Log_Write_Attitude();
void Log_Write_Rangefinder();
void Log_Write_Current();
void Log_Arm_Disarm();
void Log_Write_RC(void);
void Log_Write_Error(uint8_t sub_system, uint8_t error_code);