Browse Source

Plane: changes for new DataFlash API

mission-4.1.18
Andrew Tridgell 11 years ago
parent
commit
8b7fe3cf50
  1. 4
      ArduPlane/Log.pde
  2. 2
      ArduPlane/system.pde

4
ArduPlane/Log.pde

@ -560,8 +560,6 @@ static void Log_Read(uint16_t log_num, int16_t start_page, int16_t end_page) @@ -560,8 +560,6 @@ static void Log_Read(uint16_t log_num, int16_t start_page, int16_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_flight_mode,
cliSerial);
}
@ -569,7 +567,7 @@ static void Log_Read(uint16_t log_num, int16_t start_page, int16_t end_page) @@ -569,7 +567,7 @@ static void Log_Read(uint16_t log_num, int16_t start_page, int16_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

2
ArduPlane/system.pde

@ -134,7 +134,7 @@ static void init_ardupilot() @@ -134,7 +134,7 @@ static void init_ardupilot()
mavlink_system.sysid = g.sysid_this_mav;
#if LOGGING_ENABLED == ENABLED
DataFlash.Init();
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);

Loading…
Cancel
Save