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

Rover: proximity logging uses LOG_BITMASK for rangefinder

This commit is contained in:
Randy Mackay 2018-12-10 15:25:25 +09:00
parent 12d6799aaa
commit 66a2c10203
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
APMrover2/APMrover2.cpp
View File

@ -221,12 +221,15 @@ void Rover::update_logging1(void)
if (should_log(MASK_LOG_THR)) {
Log_Write_Throttle();
DataFlash.Log_Write_Beacon(g2.beacon);
Log_Write_Proximity();
}
if (should_log(MASK_LOG_NTUN)) {
Log_Write_Nav_Tuning();
}
if (should_log(MASK_LOG_RANGEFINDER)) {
DataFlash.Log_Write_Proximity(g2.proximity);
}
}
/*

6
APMrover2/Log.cpp
View File

@ -157,11 +157,6 @@ void Rover::Log_Write_Nav_Tuning()
DataFlash.WriteBlock(&pkt, sizeof(pkt));
}
void Rover::Log_Write_Proximity()
{
DataFlash.Log_Write_Proximity(g2.proximity);
}
void Rover::Log_Write_Sail()
{
// only log sail if present
@ -392,7 +387,6 @@ void Rover::Log_Write_Depth() {}
void Rover::Log_Write_Error(uint8_t sub_system, uint8_t error_code) {}
void Rover::Log_Write_GuidedTarget(uint8_t target_type, const Vector3f& pos_target, const Vector3f& vel_target) {}
void Rover::Log_Write_Nav_Tuning() {}
void Rover::Log_Write_Proximity() {}
void Rover::Log_Write_Sail() {}
void Rover::Log_Write_Startup(uint8_t type) {}
void Rover::Log_Write_Throttle() {}

1
APMrover2/Rover.h
View File

@ -446,7 +446,6 @@ private:
void Log_Write_Error(uint8_t sub_system, uint8_t error_code);
void Log_Write_GuidedTarget(uint8_t target_type, const Vector3f& pos_target, const Vector3f& vel_target);
void Log_Write_Nav_Tuning();
void Log_Write_Proximity();
void Log_Write_Sail();
void Log_Write_Startup(uint8_t type);
void Log_Write_Steering();