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

Sync logging

Browse Source
This commit is contained in:
Jason Short 2011-12-16 22:02:41 -08:00
parent ed818e4ccf
commit 35f0d31b9d
2 changed files with 62 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ArduCopter/Log.pde
View File

@ -244,19 +244,19 @@ static byte get_num_logs(void)
static void start_new_log() static void start_new_log()
{ {
uint16_t last_page = find_last_page(); uint16_t last_page = find_last_page();
DataFlash.StartRead(last_page); DataFlash.StartRead(last_page);
//Serial.print("last page: "); Serial.println(last_page); //Serial.print("last page: "); Serial.println(last_page);
//Serial.print("file #: "); Serial.println(DataFlash.GetFileNumber()); //Serial.print("file #: "); Serial.println(DataFlash.GetFileNumber());
//Serial.print("file page: "); Serial.println(DataFlash.GetFilePage()); //Serial.print("file page: "); Serial.println(DataFlash.GetFilePage());
if(find_last_log() == 0 || DataFlash.GetFileNumber() == 0xFFFF) { if(find_last_log() == 0 || DataFlash.GetFileNumber() == 0xFFFF) {
DataFlash.SetFileNumber(1); DataFlash.SetFileNumber(1);
DataFlash.StartWrite(1); DataFlash.StartWrite(1);
//Serial.println("start log from 0"); //Serial.println("start log from 0");
return; return;
} }
// Check for log of length 1 page and suppress // Check for log of length 1 page and suppress
if(DataFlash.GetFilePage() <= 1) { if(DataFlash.GetFilePage() <= 1) {
DataFlash.SetFileNumber(DataFlash.GetFileNumber()); // Last log too short, reuse its number DataFlash.SetFileNumber(DataFlash.GetFileNumber()); // Last log too short, reuse its number
@ -329,7 +329,7 @@ static int find_last_log(void)
DataFlash.StartRead(last_page); DataFlash.StartRead(last_page);
return DataFlash.GetFileNumber(); return DataFlash.GetFileNumber();
} }
// This function finds the last page of the last file // This function finds the last page of the last file
static int find_last_page(void) static int find_last_page(void)
{ {
@ -1008,7 +1008,7 @@ static void Log_Read(int start_page, int end_page)
packet_count = Log_Read_Process(start_page, end_page); packet_count = Log_Read_Process(start_page, end_page);
} }
Serial.printf_P(PSTR("Number of packets read: %d\n"), packet_count); //Serial.printf_P(PSTR("Number of packets read: %d\n"), packet_count);
} }
// Read the DataFlash log memory : Packet Parser // Read the DataFlash log memory : Packet Parser

87
ArduCopter/Log_simple.pde
View File

@ -51,6 +51,7 @@ print_log_menu(void)
int log_start; int log_start;
int log_end; int log_end;
int temp; int temp;
int last_log_num = find_last_log();
uint16_t num_logs = get_num_logs(); uint16_t num_logs = get_num_logs();
@ -58,9 +59,10 @@ print_log_menu(void)
Serial.printf_P(PSTR("\nNo logs\n\n")); Serial.printf_P(PSTR("\nNo logs\n\n"));
}else{ }else{
Serial.printf_P(PSTR("\n%d logs\n"), num_logs); Serial.printf_P(PSTR("\n%d logs\n"), num_logs);
for(int i=num_logs;i>=1;i--) { for(int i=num_logs;i>=1;i--) {
int last_log_start = log_start, last_log_end = log_end; int last_log_start = log_start, last_log_end = log_end;
temp = g.log_last_filenumber-i+1; temp = last_log_num-i+1;
get_log_boundaries(temp, log_start, log_end); get_log_boundaries(temp, log_start, log_end);
Serial.printf_P(PSTR("Log %d, start %d, end %d\n"), temp, log_start, log_end); Serial.printf_P(PSTR("Log %d, start %d, end %d\n"), temp, log_start, log_end);
if (last_log_start == log_start && last_log_end == log_end) { if (last_log_start == log_start && last_log_end == log_end) {
@ -83,7 +85,7 @@ dump_log(uint8_t argc, const Menu::arg *argv)
// check that the requested log number can be read // check that the requested log number can be read
dump_log = argv[1].i; dump_log = argv[1].i;
last_log_num = g.log_last_filenumber; last_log_num = find_last_log();
if (dump_log == -2) { if (dump_log == -2) {
for(int count=1; count<=DF_LAST_PAGE; count++) { for(int count=1; count<=DF_LAST_PAGE; count++) {
@ -123,7 +125,6 @@ erase_logs(uint8_t argc, const Menu::arg *argv)
DataFlash.StartWrite(j); // We need this step to clean FileNumbers DataFlash.StartWrite(j); // We need this step to clean FileNumbers
if(j%128 == 0) Serial.printf_P(PSTR("+")); if(j%128 == 0) Serial.printf_P(PSTR("+"));
} }
g.log_last_filenumber.set_and_save(0);
Serial.printf_P(PSTR("\nLog erased.\n")); Serial.printf_P(PSTR("\nLog erased.\n"));
DataFlash.FinishWrite(); DataFlash.FinishWrite();
@ -147,13 +148,13 @@ static byte get_num_logs(void)
uint16_t last; uint16_t last;
uint16_t first; uint16_t first;
if(g.log_last_filenumber < 1) return 0; if(find_last_page() == 1) return 0;
DataFlash.StartRead(1); DataFlash.StartRead(1);
if(DataFlash.GetFileNumber() == 0XFFFF) return 0; if(DataFlash.GetFileNumber() == 0XFFFF) return 0;
lastpage = find_last(); lastpage = find_last_page();
DataFlash.StartRead(lastpage); DataFlash.StartRead(lastpage);
last = DataFlash.GetFileNumber(); last = DataFlash.GetFileNumber();
DataFlash.StartRead(lastpage + 2); DataFlash.StartRead(lastpage + 2);
@ -173,12 +174,31 @@ static byte get_num_logs(void)
// This function starts a new log file in the DataFlash // This function starts a new log file in the DataFlash
static void start_new_log() static void start_new_log()
{ {
uint16_t last_page = find_last(); uint16_t last_page = find_last_page();
if(last_page == 1) last_page = 0;
g.log_last_filenumber.set_and_save(g.log_last_filenumber+1); DataFlash.StartRead(last_page);
DataFlash.SetFileNumber(g.log_last_filenumber); //Serial.print("last page: "); Serial.println(last_page);
DataFlash.StartWrite(last_page + 1); //Serial.print("file #: "); Serial.println(DataFlash.GetFileNumber());
//Serial.print("file page: "); Serial.println(DataFlash.GetFilePage());
if(find_last_log() == 0 || DataFlash.GetFileNumber() == 0xFFFF) {
DataFlash.SetFileNumber(1);
DataFlash.StartWrite(1);
//Serial.println("start log from 0");
return;
}
// Check for log of length 1 page and suppress
if(DataFlash.GetFilePage() <= 1) {
DataFlash.SetFileNumber(DataFlash.GetFileNumber()); // Last log too short, reuse its number
DataFlash.StartWrite(last_page); // and overwrite it
//Serial.println("start log from short");
} else {
if(last_page == 0xFFFF) last_page=0;
DataFlash.SetFileNumber(DataFlash.GetFileNumber()+1);
DataFlash.StartWrite(last_page + 1);
//Serial.println("start log normal");
}
} }
// This function finds the first and last pages of a log file // This function finds the first and last pages of a log file
@ -187,16 +207,15 @@ static void get_log_boundaries(byte log_num, int & start_page, int & end_page)
{ {
int num = get_num_logs(); int num = get_num_logs();
int look; int look;
if(num == 1) if(num == 1)
{ {
DataFlash.StartRead(DF_LAST_PAGE); DataFlash.StartRead(DF_LAST_PAGE);
if(DataFlash.GetFileNumber() == 0xFFFF) if(DataFlash.GetFileNumber() == 0xFFFF)
{ {
start_page = 1; start_page = 1;
end_page = find_last_log_page((uint16_t)log_num); end_page = find_last_page_of_log((uint16_t)log_num);
} else { } else {
end_page = find_last_log_page((uint16_t)log_num); end_page = find_last_page_of_log((uint16_t)log_num);
start_page = end_page + 1; start_page = end_page + 1;
} }
@ -206,22 +225,22 @@ static void get_log_boundaries(byte log_num, int & start_page, int & end_page)
if(DataFlash.GetFileNumber() == 0xFFFF) { if(DataFlash.GetFileNumber() == 0xFFFF) {
start_page = 1; start_page = 1;
} else { } else {
start_page = find_last() + 1; start_page = find_last_page() + 1;
} }
} else { } else {
if(log_num == g.log_last_filenumber - num + 1) { if(log_num == find_last_log() - num + 1) {
start_page = find_last() + 1; start_page = find_last_page() + 1;
} else { } else {
look = log_num-1; look = log_num-1;
do { do {
start_page = find_last_log_page(look) + 1; start_page = find_last_page_of_log(look) + 1;
look--; look--;
} while (start_page <= 0); } while (start_page <= 0 && look >=1);
} }
} }
} }
if(start_page == DF_LAST_PAGE+1 || start_page == 0) start_page=1; if(start_page == DF_LAST_PAGE+1 || start_page == 0) start_page=1;
end_page = find_last_log_page((uint16_t)log_num); end_page = find_last_page_of_log((uint16_t)log_num);
if(end_page <= 0) end_page = start_page; if(end_page <= 0) end_page = start_page;
} }
@ -234,8 +253,16 @@ static bool check_wrapped(void)
return 1; return 1;
} }
// This funciton finds the last log number
static int find_last_log(void)
{
int last_page = find_last_page();
DataFlash.StartRead(last_page);
return DataFlash.GetFileNumber();
}
// This function finds the last page of the last file // This function finds the last page of the last file
static int find_last(void) static int find_last_page(void)
{ {
uint16_t look; uint16_t look;
uint16_t bottom = 1; uint16_t bottom = 1;
@ -276,13 +303,14 @@ uint32_t top_hash;
} }
// This function finds the last page of a particular log file // This function finds the last page of a particular log file
static int find_last_log_page(uint16_t log_number) static int find_last_page_of_log(uint16_t log_number)
{ {
uint16_t look;
uint16_t bottom; uint16_t look;
uint16_t top; uint16_t bottom;
uint32_t look_hash; uint16_t top;
uint32_t check_hash; uint32_t look_hash;
uint32_t check_hash;
if(check_wrapped()) if(check_wrapped())
{ {
@ -290,19 +318,18 @@ static int find_last_log_page(uint16_t log_number)
bottom = DataFlash.GetFileNumber(); bottom = DataFlash.GetFileNumber();
if (bottom > log_number) if (bottom > log_number)
{ {
bottom = find_last(); bottom = find_last_page();
top = DF_LAST_PAGE; top = DF_LAST_PAGE;
} else { } else {
bottom = 1; bottom = 1;
top = find_last(); top = find_last_page();
} }
} else { } else {
bottom = 1; bottom = 1;
top = find_last(); top = find_last_page();
} }
check_hash = (long)log_number<<16 | 0xFFFF; check_hash = (long)log_number<<16 | 0xFFFF;
while(top-bottom > 1) while(top-bottom > 1)
{ {
look = (top+bottom)/2; look = (top+bottom)/2;