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

DataFlash: Minor whitespace changes/cleanup. No effect.

Browse Source
This commit is contained in:
Robert Lefebvre 2015-01-14 21:38:16 -05:00 committed by Randy Mackay
parent 37304fd5ed
commit be803f4f39
2 changed files with 38 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/DataFlash/DataFlash.h
View File

@ -557,13 +557,13 @@ Format characters in the format string for binary log messages
{ LOG_CURRENT_MSG, sizeof(log_Current), \ { LOG_CURRENT_MSG, sizeof(log_Current), \
"CURR", "Ihhhhfh","TimeMS,Throttle,Volt,Curr,Vcc,CurrTot,Volt2" },\ "CURR", "Ihhhhfh","TimeMS,Throttle,Volt,Curr,Vcc,CurrTot,Volt2" },\
{ LOG_ATTITUDE_MSG, sizeof(log_Attitude),\ { LOG_ATTITUDE_MSG, sizeof(log_Attitude),\
"ATT", "IccccCCCC", "TimeMS,DesRoll,Roll,DesPitch,Pitch,DesYaw,Yaw,ErrRP,ErrYaw" },\ "ATT", "IccccCCCC", "TimeMS,DesRoll,Roll,DesPitch,Pitch,DesYaw,Yaw,ErrRP,ErrYaw" }, \
{ LOG_COMPASS_MSG, sizeof(log_Compass), \ { LOG_COMPASS_MSG, sizeof(log_Compass), \
"MAG", "Ihhhhhhhhh", "TimeMS,MagX,MagY,MagZ,OfsX,OfsY,OfsZ,MOfsX,MOfsY,MOfsZ" },\ "MAG", "Ihhhhhhhhh", "TimeMS,MagX,MagY,MagZ,OfsX,OfsY,OfsZ,MOfsX,MOfsY,MOfsZ" }, \
{ LOG_COMPASS2_MSG, sizeof(log_Compass), \ { LOG_COMPASS2_MSG, sizeof(log_Compass), \
"MAG2","Ihhhhhhhhh", "TimeMS,MagX,MagY,MagZ,OfsX,OfsY,OfsZ,MOfsX,MOfsY,MOfsZ" },\ "MAG2","Ihhhhhhhhh", "TimeMS,MagX,MagY,MagZ,OfsX,OfsY,OfsZ,MOfsX,MOfsY,MOfsZ" }, \
{ LOG_COMPASS3_MSG, sizeof(log_Compass), \ { LOG_COMPASS3_MSG, sizeof(log_Compass), \
"MAG3","Ihhhhhhhhh", "TimeMS,MagX,MagY,MagZ,OfsX,OfsY,OfsZ,MOfsX,MOfsY,MOfsZ" },\ "MAG3","Ihhhhhhhhh", "TimeMS,MagX,MagY,MagZ,OfsX,OfsY,OfsZ,MOfsX,MOfsY,MOfsZ" }, \
{ LOG_MODE_MSG, sizeof(log_Mode), \ { LOG_MODE_MSG, sizeof(log_Mode), \
"MODE", "IMB", "TimeMS,Mode,ModeNum" } "MODE", "IMB", "TimeMS,Mode,ModeNum" }

8
libraries/DataFlash/LogFile.cpp
View File

@ -12,7 +12,6 @@
extern const AP_HAL::HAL& hal; extern const AP_HAL::HAL& hal;
void DataFlash_Class::Init(const struct LogStructure *structure, uint8_t num_types) void DataFlash_Class::Init(const struct LogStructure *structure, uint8_t num_types)
{ {
_num_types = num_types; _num_types = num_types;
@ -20,7 +19,6 @@ void DataFlash_Class::Init(const struct LogStructure *structure, uint8_t num_typ
_writes_enabled = true; _writes_enabled = true;
} }
// This function determines the number of whole or partial log files in the DataFlash // This function determines the number of whole or partial log files in the DataFlash
// Wholly overwritten files are (of course) lost. // Wholly overwritten files are (of course) lost.
uint16_t DataFlash_Block::get_num_logs(void) uint16_t DataFlash_Block::get_num_logs(void)
@ -56,7 +54,6 @@ uint16_t DataFlash_Block::get_num_logs(void)
return (last - first + 1); return (last - first + 1);
} }
// This function starts a new log file in the DataFlash // This function starts a new log file in the DataFlash
uint16_t DataFlash_Block::start_new_log(void) uint16_t DataFlash_Block::start_new_log(void)
{ {
@ -171,7 +168,6 @@ bool DataFlash_Block::check_wrapped(void)
return 1; return 1;
} }
// This funciton finds the last log number // This funciton finds the last log number
uint16_t DataFlash_Block::find_last_log(void) uint16_t DataFlash_Block::find_last_log(void)
{ {
@ -421,7 +417,6 @@ void DataFlash_Class::_print_log_entry(uint8_t msg_type,
port->println(); port->println();
} }
/* /*
print FMT specifiers for log dumps where we have wrapped in the print FMT specifiers for log dumps where we have wrapped in the
dataflash and so have no formats. This assumes the log being dumped dataflash and so have no formats. This assumes the log being dumped
@ -619,7 +614,6 @@ void DataFlash_Class::Log_Write_Format(const struct LogStructure *s)
WriteBlock(&pkt, sizeof(pkt)); WriteBlock(&pkt, sizeof(pkt));
} }
/* /*
write a parameter to the log write a parameter to the log
*/ */
@ -666,8 +660,6 @@ void DataFlash_Class::Log_Write_Parameters(void)
} }
} }
// Write an GPS packet // Write an GPS packet
void DataFlash_Class::Log_Write_GPS(const AP_GPS &gps, uint8_t i, int32_t relative_alt) void DataFlash_Class::Log_Write_GPS(const AP_GPS &gps, uint8_t i, int32_t relative_alt)
{ {