Browse Source

Copter: updates for DataFlash API changes

mission-4.1.18
Andrew Tridgell 11 years ago
parent
commit
edda76623f
  1. 4
      ArduCopter/Log.pde
  2. 2
      ArduCopter/system.pde

4
ArduCopter/Log.pde

@ -792,8 +792,6 @@ static void Log_Read(uint16_t log_num, uint16_t start_page, uint16_t end_page) @@ -792,8 +792,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_flight_mode,
cliSerial);
}
@ -803,7 +801,7 @@ static void start_logging() @@ -803,7 +801,7 @@ static void start_logging()
{
if (g.log_bitmask != 0 && !ap.logging_started) {
ap.logging_started = true;
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
ArduCopter/system.pde

@ -161,7 +161,7 @@ static void init_ardupilot() @@ -161,7 +161,7 @@ static void init_ardupilot()
mavlink_system.type = 2; //MAV_QUADROTOR;
#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 inserted"));
g.log_bitmask.set(0);

Loading…
Cancel
Save