Browse Source

src: Improve debug messages on the camera stream logic

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
QGC4.4
Patrick José Pereira 3 years ago committed by Philipp Borgers
parent
commit
b53c25bf60
  1. 14
      src/Camera/QGCCameraControl.cc
  2. 2
      src/comm/LinkManager.cc

14
src/Camera/QGCCameraControl.cc

@ -813,20 +813,24 @@ QGCCameraControl::_loadCameraDefinitionFile(QByteArray& bytes)
QString errorMsg; QString errorMsg;
QDomDocument doc; QDomDocument doc;
if(!doc.setContent(bytes, false, &errorMsg, &errorLine)) { if(!doc.setContent(bytes, false, &errorMsg, &errorLine)) {
qCritical() << "Unable to parse camera definition file on line:" << errorLine; qCCritical(CameraControlLog) << "Unable to parse camera definition file on line:" << errorLine;
qCritical() << errorMsg; qCCritical(CameraControlLog) << errorMsg;
return false; return false;
} }
//-- Load camera constants //-- Load camera constants
QDomNodeList defElements = doc.elementsByTagName(kDefnition); QDomNodeList defElements = doc.elementsByTagName(kDefnition);
if(!defElements.size() || !_loadConstants(defElements)) { if(!defElements.size() || !_loadConstants(defElements)) {
qWarning() << "Unable to load camera constants from camera definition"; qCWarning(CameraControlLog) << "Unable to load camera constants from camera definition";
return false; return false;
} }
//-- Load camera parameters //-- Load camera parameters
QDomNodeList paramElements = doc.elementsByTagName(kParameters); QDomNodeList paramElements = doc.elementsByTagName(kParameters);
if(!paramElements.size() || !_loadSettings(paramElements)) { if(!paramElements.size()) {
qWarning() << "Unable to load camera parameters from camera definition"; qCDebug(CameraControlLog) << "No parameters to load from camera";
return false;
}
if(!_loadSettings(paramElements)) {
qCWarning(CameraControlLog) << "Unable to load camera parameters from camera definition";
return false; return false;
} }
//-- If this is new, cache it //-- If this is new, cache it

2
src/comm/LinkManager.cc

@ -463,6 +463,7 @@ void LinkManager::_addZeroConfAutoConnectLink(void)
if(service.type().startsWith("_mavlink._udp")) { if(service.type().startsWith("_mavlink._udp")) {
static QString udpName("ZeroConf UDP"); static QString udpName("ZeroConf UDP");
if (checkIfConnectionLinkExist(LinkConfiguration::TypeUdp, udpName)) { if (checkIfConnectionLinkExist(LinkConfiguration::TypeUdp, udpName)) {
qCDebug(LinkManagerVerboseLog) << "Connection already exist";
return; return;
} }
@ -478,6 +479,7 @@ void LinkManager::_addZeroConfAutoConnectLink(void)
if(service.type().startsWith("_mavlink._tcp")) { if(service.type().startsWith("_mavlink._tcp")) {
static QString tcpName("ZeroConf TCP"); static QString tcpName("ZeroConf TCP");
if (checkIfConnectionLinkExist(LinkConfiguration::TypeTcp, tcpName)) { if (checkIfConnectionLinkExist(LinkConfiguration::TypeTcp, tcpName)) {
qCDebug(LinkManagerVerboseLog) << "Connection already exist";
return; return;
} }

Loading…
Cancel
Save