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

Rover: handle knowledge of in_log_download in DataFlash

Browse Source
This commit is contained in:
Peter Barker 2017-06-19 10:22:21 +10:00 committed by Francisco Ferreira
parent f3a717f3c0
commit 3a85d8ed39
4 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
APMrover2/GCS_Mavlink.cpp
View File

@ -1513,23 +1513,6 @@ void GCS_MAVLINK_Rover::handleMessage(mavlink_message_t* msg)
break;
}
case MAVLINK_MSG_ID_LOG_REQUEST_DATA:
rover.in_log_download = true;
/* no break */
case MAVLINK_MSG_ID_LOG_ERASE:
/* no break */
case MAVLINK_MSG_ID_LOG_REQUEST_LIST:
if (!rover.in_mavlink_delay) {
rover.DataFlash.handle_mavlink_msg(*this, msg);
}
break;
case MAVLINK_MSG_ID_LOG_REQUEST_END:
rover.in_log_download = false;
if (!rover.in_mavlink_delay) {
rover.DataFlash.handle_mavlink_msg(*this, msg);
}
break;
case MAVLINK_MSG_ID_SERIAL_CONTROL:
handle_serial_control(msg, rover.gps);
break;

1
APMrover2/Rover.cpp
View File

@ -25,7 +25,6 @@ Rover::Rover(void) :
channel_throttle(nullptr),
channel_learn(nullptr),
DataFlash{FIRMWARE_STRING},
in_log_download(false),
modes(&g.mode1),
L1_controller(ahrs, nullptr),
nav_controller(&L1_controller),

2
APMrover2/Rover.h
View File

@ -136,8 +136,6 @@ private:
DataFlash_Class DataFlash;
bool in_log_download;
// sensor drivers
AP_GPS gps;
AP_Baro barometer;

3
APMrover2/system.cpp
View File

@ -505,9 +505,6 @@ bool Rover::should_log(uint32_t mask)
if (!DataFlash.should_log()) {
return false;
}
if (in_log_download) {
return false;
}
start_logging();
return true;
}