From b53c25bf60e0d03cbea37192162c78de28c225f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20Jos=C3=A9=20Pereira?= <patrickelectric@gmail.com>
Date: Thu, 1 Sep 2022 18:28:57 -0300
Subject: [PATCH] src: Improve debug messages on the camera stream logic
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
---
src/Camera/QGCCameraControl.cc | 14 +++++++++-----
src/comm/LinkManager.cc | 2 ++
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/Camera/QGCCameraControl.cc b/src/Camera/QGCCameraControl.cc
index 9481c45..ba3af30 100644
--- a/src/Camera/QGCCameraControl.cc
+++ b/src/Camera/QGCCameraControl.cc
@@ -813,20 +813,24 @@ QGCCameraControl::_loadCameraDefinitionFile(QByteArray& bytes)
QString errorMsg;
QDomDocument doc;
if(!doc.setContent(bytes, false, &errorMsg, &errorLine)) {
- qCritical() << "Unable to parse camera definition file on line:" << errorLine;
- qCritical() << errorMsg;
+ qCCritical(CameraControlLog) << "Unable to parse camera definition file on line:" << errorLine;
+ qCCritical(CameraControlLog) << errorMsg;
return false;
}
//-- Load camera constants
QDomNodeList defElements = doc.elementsByTagName(kDefnition);
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;
}
//-- Load camera parameters
QDomNodeList paramElements = doc.elementsByTagName(kParameters);
- if(!paramElements.size() || !_loadSettings(paramElements)) {
- qWarning() << "Unable to load camera parameters from camera definition";
+ if(!paramElements.size()) {
+ 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;
}
//-- If this is new, cache it
diff --git a/src/comm/LinkManager.cc b/src/comm/LinkManager.cc
index 3afa3f8..672d0d1 100644
--- a/src/comm/LinkManager.cc
+++ b/src/comm/LinkManager.cc
@@ -463,6 +463,7 @@ void LinkManager::_addZeroConfAutoConnectLink(void)
if(service.type().startsWith("_mavlink._udp")) {
static QString udpName("ZeroConf UDP");
if (checkIfConnectionLinkExist(LinkConfiguration::TypeUdp, udpName)) {
+ qCDebug(LinkManagerVerboseLog) << "Connection already exist";
return;
}
@@ -478,6 +479,7 @@ void LinkManager::_addZeroConfAutoConnectLink(void)
if(service.type().startsWith("_mavlink._tcp")) {
static QString tcpName("ZeroConf TCP");
if (checkIfConnectionLinkExist(LinkConfiguration::TypeTcp, tcpName)) {
+ qCDebug(LinkManagerVerboseLog) << "Connection already exist";
return;
}