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

Rover: move starting of new logs into DataFlash

Browse Source
This commit is contained in:
Peter Barker 2017-06-30 22:30:45 +10:00 committed by Francisco Ferreira
parent c9c1f3ea29
commit 9173c7caaf
3 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
APMrover2/Log.cpp
View File

@ -531,14 +531,6 @@ void Rover::Log_Write_Vehicle_Startup_Messages()
gps.Write_DataFlash_Log_Startup_messages(); gps.Write_DataFlash_Log_Startup_messages();
} }
// start a new log
void Rover::start_logging()
{
DataFlash.EnableWrites(false);
DataFlash.StartUnstartedLogging();
DataFlash.EnableWrites(true);
}
#else // LOGGING_ENABLED #else // LOGGING_ENABLED
// dummy functions // dummy functions
@ -550,7 +542,6 @@ int8_t Rover::process_logs(uint8_t argc, const Menu::arg *argv) { return 0; }
void Rover::Log_Write_Control_Tuning() {} void Rover::Log_Write_Control_Tuning() {}
void Rover::Log_Write_Rangefinder() {} void Rover::Log_Write_Rangefinder() {}
void Rover::Log_Write_Attitude() {} void Rover::Log_Write_Attitude() {}
void Rover::start_logging() {}
void Rover::Log_Write_RC(void) {} void Rover::Log_Write_RC(void) {}
void Rover::Log_Write_GuidedTarget(uint8_t target_type, const Vector3f& pos_target, const Vector3f& vel_target) {} void Rover::Log_Write_GuidedTarget(uint8_t target_type, const Vector3f& pos_target, const Vector3f& vel_target) {}
void Rover::Log_Write_Home_And_Origin() {} void Rover::Log_Write_Home_And_Origin() {}

1
APMrover2/Rover.h
View File

@ -477,7 +477,6 @@ private:
void Log_Write_WheelEncoder(); void Log_Write_WheelEncoder();
void Log_Read(uint16_t log_num, uint16_t start_page, uint16_t end_page); void Log_Read(uint16_t log_num, uint16_t start_page, uint16_t end_page);
void log_init(void); void log_init(void);
void start_logging();
void Log_Arm_Disarm(); void Log_Arm_Disarm();
void load_parameters(void); void load_parameters(void);

6
APMrover2/system.cpp
View File

@ -499,11 +499,7 @@ uint8_t Rover::check_digital_pin(uint8_t pin)
*/ */
bool Rover::should_log(uint32_t mask) bool Rover::should_log(uint32_t mask)
{ {
if (!DataFlash.should_log(mask)) { return DataFlash.should_log(mask);
return false;
}
start_logging();
return true;
} }
/* /*