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

Fix for intermittent bug of log #1 starting on page 2 and confusing file system

Browse Source
This commit is contained in:
Doug Weibel 2011-11-28 19:13:18 -07:00
parent b03de3095e
commit 88ab4f7d70
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ArduCopter/Log.pde
View File

@ -234,13 +234,9 @@ 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; uint16_t last_page = find_last();
if(last_page == 1) last_page = 0;
if(g.log_last_filenumber < 1) {
last_page = 0;
} else {
last_page = find_last();
}
g.log_last_filenumber.set_and_save(g.log_last_filenumber+1); g.log_last_filenumber.set_and_save(g.log_last_filenumber+1);
DataFlash.SetFileNumber(g.log_last_filenumber); DataFlash.SetFileNumber(g.log_last_filenumber);
DataFlash.StartWrite(last_page + 1); DataFlash.StartWrite(last_page + 1);

10
ArduPlane/Log.pde
View File

@ -234,13 +234,9 @@ 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; uint16_t last_page = find_last();
if(last_page == 1) last_page = 0;
if(g.log_last_filenumber < 1) {
last_page = 0;
} else {
last_page = find_last();
}
g.log_last_filenumber.set_and_save(g.log_last_filenumber+1); g.log_last_filenumber.set_and_save(g.log_last_filenumber+1);
DataFlash.SetFileNumber(g.log_last_filenumber); DataFlash.SetFileNumber(g.log_last_filenumber);
DataFlash.StartWrite(last_page + 1); DataFlash.StartWrite(last_page + 1);