Rover: updates for DataFlash API changes

This commit is contained in:
Andrew Tridgell 2013-12-17 11:32:40 +11:00
parent dd749c1de3
commit 8054843e73
2 changed files with 2 additions and 4 deletions

View File

@ -555,8 +555,6 @@ static void Log_Read(uint16_t log_num, uint16_t start_page, uint16_t end_page)
cliSerial->println_P(PSTR(HAL_BOARD_NAME)); cliSerial->println_P(PSTR(HAL_BOARD_NAME));
DataFlash.LogReadProcess(log_num, start_page, end_page, DataFlash.LogReadProcess(log_num, start_page, end_page,
sizeof(log_structure)/sizeof(log_structure[0]),
log_structure,
print_mode, print_mode,
cliSerial); cliSerial);
} }
@ -564,7 +562,7 @@ static void Log_Read(uint16_t log_num, uint16_t start_page, uint16_t end_page)
// start a new log // start a new log
static void start_logging() static void start_logging()
{ {
DataFlash.StartNewLog(sizeof(log_structure)/sizeof(log_structure[0]), log_structure); DataFlash.StartNewLog();
DataFlash.Log_Write_Message_P(PSTR(FIRMWARE_STRING)); DataFlash.Log_Write_Message_P(PSTR(FIRMWARE_STRING));
// write system identifier as well if available // write system identifier as well if available

View File

@ -140,7 +140,7 @@ static void init_ardupilot()
mavlink_system.sysid = g.sysid_this_mav; mavlink_system.sysid = g.sysid_this_mav;
#if LOGGING_ENABLED == ENABLED #if LOGGING_ENABLED == ENABLED
DataFlash.Init(); // DataFlash log initialization DataFlash.Init(log_structure, sizeof(log_structure)/sizeof(log_structure[0]));
if (!DataFlash.CardInserted()) { if (!DataFlash.CardInserted()) {
gcs_send_text_P(SEVERITY_LOW, PSTR("No dataflash card inserted")); gcs_send_text_P(SEVERITY_LOW, PSTR("No dataflash card inserted"));
g.log_bitmask.set(0); g.log_bitmask.set(0);