zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #7325 from mavlink/videoReceiver 

Make sure video streaming is running before accessing it.
QGC4.4
Gus Grubba 6 years ago committed by GitHub
parent
47d1f9f98c 976d14bdc2
commit
997793a660
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 23
      src/Camera/QGCCameraControl.cc
  2. 12
      src/Vehicle/Vehicle.cc

23
src/Camera/QGCCameraControl.cc
Unescape View File

@ -364,10 +364,12 @@ QGCCameraControl::takePhoto()
_setPhotoStatus(PHOTO_CAPTURE_IN_PROGRESS); _setPhotoStatus(PHOTO_CAPTURE_IN_PROGRESS);
_captureInfoRetries = 0; _captureInfoRetries = 0;
//-- Capture local image as well //-- Capture local image as well
QString photoPath = qgcApp()->toolbox()->settingsManager()->appSettings()->savePath()->rawValue().toString() + QStringLiteral("/Photo"); if(qgcApp()->toolbox()->videoManager()->videoReceiver()) {
QDir().mkpath(photoPath); QString photoPath = qgcApp()->toolbox()->settingsManager()->appSettings()->savePath()->rawValue().toString() + QStringLiteral("/Photo");
photoPath += + "/" + QDateTime::currentDateTime().toString("yyyy-MM-dd_hh.mm.ss.zzz") + ".jpg"; QDir().mkpath(photoPath);
qgcApp()->toolbox()->videoManager()->videoReceiver()->grabImage(photoPath); photoPath += + "/" + QDateTime::currentDateTime().toString("yyyy-MM-dd_hh.mm.ss.zzz") + ".jpg";
qgcApp()->toolbox()->videoManager()->videoReceiver()->grabImage(photoPath);
}
return true; return true;
} }
} }
@ -667,6 +669,9 @@ QGCCameraControl::_mavCommandResult(int vehicleId, int component, int command, i
case MAV_CMD_REQUEST_STORAGE_INFORMATION: case MAV_CMD_REQUEST_STORAGE_INFORMATION:
_storageInfoRetries = 0; _storageInfoRetries = 0;
break; break;
case MAV_CMD_IMAGE_START_CAPTURE:
_captureStatusTimer.start(1000);
break;
} }
} else { } else {
if(noReponseFromVehicle || result == MAV_RESULT_TEMPORARILY_REJECTED || result == MAV_RESULT_FAILED) { if(noReponseFromVehicle || result == MAV_RESULT_TEMPORARILY_REJECTED || result == MAV_RESULT_FAILED) {
@ -1471,10 +1476,12 @@ QGCCameraControl::handleCaptureStatus(const mavlink_camera_capture_status_t& cap
//-- Time Lapse //-- Time Lapse
if(photoStatus() == PHOTO_CAPTURE_INTERVAL_IDLE || photoStatus() == PHOTO_CAPTURE_INTERVAL_IN_PROGRESS) { if(photoStatus() == PHOTO_CAPTURE_INTERVAL_IDLE || photoStatus() == PHOTO_CAPTURE_INTERVAL_IN_PROGRESS) {
//-- Capture local image as well //-- Capture local image as well
QString photoPath = qgcApp()->toolbox()->settingsManager()->appSettings()->savePath()->rawValue().toString() + QStringLiteral("/Photo"); if(qgcApp()->toolbox()->videoManager()->videoReceiver()) {
QDir().mkpath(photoPath); QString photoPath = qgcApp()->toolbox()->settingsManager()->appSettings()->savePath()->rawValue().toString() + QStringLiteral("/Photo");
photoPath += + "/" + QDateTime::currentDateTime().toString("yyyy-MM-dd_hh.mm.ss.zzz") + ".jpg"; QDir().mkpath(photoPath);
qgcApp()->toolbox()->videoManager()->videoReceiver()->grabImage(photoPath); photoPath += + "/" + QDateTime::currentDateTime().toString("yyyy-MM-dd_hh.mm.ss.zzz") + ".jpg";
qgcApp()->toolbox()->videoManager()->videoReceiver()->grabImage(photoPath);
}
} }
} }

12
src/Vehicle/Vehicle.cc
Unescape View File

@ -1640,9 +1640,11 @@ void Vehicle::_updateArmed(bool armed)
} else { } else {
_mapTrajectoryStop(); _mapTrajectoryStop();
// Also handle Video Streaming // Also handle Video Streaming
if(_settingsManager->videoSettings()->disableWhenDisarmed()->rawValue().toBool()) { if(qgcApp()->toolbox()->videoManager()->videoReceiver()) {
_settingsManager->videoSettings()->streamEnabled()->setRawValue(false); if(_settingsManager->videoSettings()->disableWhenDisarmed()->rawValue().toBool()) {
qgcApp()->toolbox()->videoManager()->videoReceiver()->stop(); _settingsManager->videoSettings()->streamEnabled()->setRawValue(false);
qgcApp()->toolbox()->videoManager()->videoReceiver()->stop();
}
} }
} }
} }
@ -1654,8 +1656,8 @@ void Vehicle::_handlePing(LinkInterface* link, mavlink_message_t& message)
mavlink_message_t msg; mavlink_message_t msg;
mavlink_msg_ping_decode(&message, &ping); mavlink_msg_ping_decode(&message, &ping);
mavlink_msg_ping_pack_chan(_mavlink->getSystemId(), mavlink_msg_ping_pack_chan(static_cast<uint8_t>(_mavlink->getSystemId()),
_mavlink->getComponentId(), static_cast<uint8_t>(_mavlink->getComponentId()),
priorityLink()->mavlinkChannel(), priorityLink()->mavlinkChannel(),
&msg, &msg,
ping.time_usec, ping.time_usec,

Write Preview
Loading…
Cancel
Save