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

made Logs dump with dump 0 or -1

This commit is contained in:
Jason Short 2011-11-27 19:17:04 -08:00
parent 2e0b55d887
commit ab183e54a0
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ArduCopter/Log.pde
View File

@ -53,8 +53,8 @@ print_log_menu(void)
{ {
int log_start; int log_start;
int log_end; int log_end;
int temp; int temp;
uint16_t num_logs = get_num_logs(); uint16_t num_logs = get_num_logs();
Serial.printf_P(PSTR("logs enabled: ")); Serial.printf_P(PSTR("logs enabled: "));
@ -108,7 +108,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 = g.log_last_filenumber;
if (dump_log == -1) { if (dump_log <= 0) {
Serial.printf_P(PSTR("dumping all\n")); Serial.printf_P(PSTR("dumping all\n"));
Log_Read(1, DF_LAST_PAGE); Log_Read(1, DF_LAST_PAGE);
return(-1); return(-1);
@ -210,7 +210,7 @@ static byte get_num_logs(void)
if(g.log_last_filenumber < 1) return 0; if(g.log_last_filenumber < 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();
@ -251,7 +251,7 @@ 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);
@ -310,14 +310,14 @@ uint32_t top_hash;
DataFlash.StartRead(bottom); DataFlash.StartRead(bottom);
bottom_hash = (long)DataFlash.GetFileNumber()<<16 | DataFlash.GetFilePage(); bottom_hash = (long)DataFlash.GetFileNumber()<<16 | DataFlash.GetFilePage();
while(top-bottom > 1) while(top-bottom > 1)
{ {
look = (top+bottom)/2; look = (top+bottom)/2;
DataFlash.StartRead(look); DataFlash.StartRead(look);
look_hash = (long)DataFlash.GetFileNumber()<<16 | DataFlash.GetFilePage(); look_hash = (long)DataFlash.GetFileNumber()<<16 | DataFlash.GetFilePage();
if (look_hash >= 0xFFFF0000) look_hash = 0; if (look_hash >= 0xFFFF0000) look_hash = 0;
if(look_hash < bottom_hash) { if(look_hash < bottom_hash) {
// move down // move down
top = look; top = look;
@ -327,7 +327,7 @@ uint32_t top_hash;
bottom_hash = look_hash; bottom_hash = look_hash;
} }
} }
DataFlash.StartRead(top); DataFlash.StartRead(top);
top_hash = (long)DataFlash.GetFileNumber()<<16 | DataFlash.GetFilePage(); top_hash = (long)DataFlash.GetFileNumber()<<16 | DataFlash.GetFilePage();
if (top_hash >= 0xFFFF0000) top_hash = 0; if (top_hash >= 0xFFFF0000) top_hash = 0;
@ -367,14 +367,14 @@ uint32_t check_hash;
} }
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;
DataFlash.StartRead(look); DataFlash.StartRead(look);
look_hash = (long)DataFlash.GetFileNumber()<<16 | DataFlash.GetFilePage(); look_hash = (long)DataFlash.GetFileNumber()<<16 | DataFlash.GetFilePage();
if (look_hash >= 0xFFFF0000) look_hash = 0; if (look_hash >= 0xFFFF0000) look_hash = 0;
if(look_hash > check_hash) { if(look_hash > check_hash) {
// move down // move down
top = look; top = look;
@ -383,13 +383,13 @@ uint32_t check_hash;
bottom = look; bottom = look;
} }
} }
DataFlash.StartRead(top); DataFlash.StartRead(top);
if (DataFlash.GetFileNumber() == log_number) return top; if (DataFlash.GetFileNumber() == log_number) return top;
DataFlash.StartRead(bottom); DataFlash.StartRead(bottom);
if (DataFlash.GetFileNumber() == log_number) return bottom; if (DataFlash.GetFileNumber() == log_number) return bottom;
return -1; return -1;
} }