From 8054843e73938fdbcccf7f7568ca816aac35e897 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 17 Dec 2013 11:32:40 +1100 Subject: [PATCH] Rover: updates for DataFlash API changes --- APMrover2/Log.pde | 4 +--- APMrover2/system.pde | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/APMrover2/Log.pde b/APMrover2/Log.pde index 5c0ff632a7..939f92bd51 100644 --- a/APMrover2/Log.pde +++ b/APMrover2/Log.pde @@ -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)); DataFlash.LogReadProcess(log_num, start_page, end_page, - sizeof(log_structure)/sizeof(log_structure[0]), - log_structure, print_mode, 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 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)); // write system identifier as well if available diff --git a/APMrover2/system.pde b/APMrover2/system.pde index f917526fd4..83d824da6f 100644 --- a/APMrover2/system.pde +++ b/APMrover2/system.pde @@ -140,7 +140,7 @@ static void init_ardupilot() mavlink_system.sysid = g.sysid_this_mav; #if LOGGING_ENABLED == ENABLED - DataFlash.Init(); // DataFlash log initialization + DataFlash.Init(log_structure, sizeof(log_structure)/sizeof(log_structure[0])); if (!DataFlash.CardInserted()) { gcs_send_text_P(SEVERITY_LOW, PSTR("No dataflash card inserted")); g.log_bitmask.set(0);