Browse Source

Rover: handle knowledge of in_log_download in DataFlash

master
Peter Barker 8 years ago committed by Francisco Ferreira
parent
commit
3a85d8ed39
  1. 17
      APMrover2/GCS_Mavlink.cpp
  2. 1
      APMrover2/Rover.cpp
  3. 2
      APMrover2/Rover.h
  4. 3
      APMrover2/system.cpp

17
APMrover2/GCS_Mavlink.cpp

@ -1513,23 +1513,6 @@ void GCS_MAVLINK_Rover::handleMessage(mavlink_message_t* msg) @@ -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

@ -25,7 +25,6 @@ Rover::Rover(void) : @@ -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

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

3
APMrover2/system.cpp

@ -505,9 +505,6 @@ bool Rover::should_log(uint32_t mask) @@ -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;
}

Loading…
Cancel
Save