From 234e581242ba1acdf56192450a13cfa1f06b6415 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20Jos=C3=A9=20Pereira?= <patrickelectric@gmail.com>
Date: Tue, 21 Apr 2020 14:40:28 -0300
Subject: [PATCH 1/5] QGCCameraControl: Remove deprecated function of QTime
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 | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/Camera/QGCCameraControl.cc b/src/Camera/QGCCameraControl.cc
index f46f974..a03ecc0 100644
--- a/src/Camera/QGCCameraControl.cc
+++ b/src/Camera/QGCCameraControl.cc
@@ -770,7 +770,7 @@ QGCCameraControl::_setVideoStatus(VideoStatus status)
emit videoStatusChanged();
if(status == VIDEO_CAPTURE_STATUS_RUNNING) {
_recordTime = 0;
- _recTime.start();
+ _recTime = QTime::currentTime();
_recTimer.start();
} else {
_recTimer.stop();
@@ -784,7 +784,7 @@ QGCCameraControl::_setVideoStatus(VideoStatus status)
void
QGCCameraControl::_recTimerHandler()
{
- _recordTime = static_cast<uint32_t>(_recTime.elapsed());
+ _recordTime = static_cast<uint32_t>(_recTime.msec());
emit recordTimeChanged();
}
@@ -1524,7 +1524,7 @@ QGCCameraControl::handleCaptureStatus(const mavlink_camera_capture_status_t& cap
//-- Do we have recording time?
if(cap.recording_time_ms) {
_recordTime = cap.recording_time_ms;
- _recTime = _recTime.addMSecs(_recTime.elapsed() - static_cast<int>(cap.recording_time_ms));
+ _recTime = _recTime.addMSecs(_recTime.msec() - static_cast<int>(cap.recording_time_ms));
emit recordTimeChanged();
}
//-- Video/Image Capture Status
From 83e7a604986cbbab39a3b83fd6fada445d6394c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20Jos=C3=A9=20Pereira?= <patrickelectric@gmail.com>
Date: Tue, 21 Apr 2020 14:40:55 -0300
Subject: [PATCH 2/5] QGCCameraManager: Move from QTime to QElapsedTimer to
avoid deprecated functions
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/QGCCameraManager.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/Camera/QGCCameraManager.h b/src/Camera/QGCCameraManager.h
index ea81685..5e51501 100644
--- a/src/Camera/QGCCameraManager.h
+++ b/src/Camera/QGCCameraManager.h
@@ -91,7 +91,7 @@ protected:
class CameraStruct : public QObject {
public:
CameraStruct(QObject* parent, uint8_t compID_);
- QTime lastHeartbeat;
+ QElapsedTimer lastHeartbeat;
bool infoReceived = false;
bool gaveUp = false;
int tryCount = 0;
@@ -105,8 +105,8 @@ protected:
QmlObjectListModel _cameras;
QStringList _cameraLabels;
int _currentCamera = 0;
- QTime _lastZoomChange;
- QTime _lastCameraChange;
+ QElapsedTimer _lastZoomChange;
+ QElapsedTimer _lastCameraChange;
QTimer _cameraTimer;
QMap<QString, CameraStruct*> _cameraInfoRequest;
};
From 4f3ed6ff1e40388018e6ec75f999dcc47a175f32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20Jos=C3=A9=20Pereira?= <patrickelectric@gmail.com>
Date: Tue, 21 Apr 2020 14:41:11 -0300
Subject: [PATCH 3/5] Joystick: Move from QTime to QElapsedTimer to avoid
deprecated functions
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/Joystick/Joystick.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Joystick/Joystick.h b/src/Joystick/Joystick.h
index 54cdca9..571d9cc 100644
--- a/src/Joystick/Joystick.h
+++ b/src/Joystick/Joystick.h
@@ -28,7 +28,7 @@ class AssignedButtonAction : public QObject {
public:
AssignedButtonAction(QObject* parent, const QString name);
QString action;
- QTime buttonTime;
+ QElapsedTimer buttonTime;
bool repeat = false;
};
@@ -299,7 +299,7 @@ protected:
static int _transmitterMode;
int _rgFunctionAxis[maxFunction] = {};
- QTime _axisTime;
+ QElapsedTimer _axisTime;
QmlObjectListModel _assignableButtonActions;
QList<AssignedButtonAction*> _buttonActionArray;
From 13edc46d89a06b9372d1ef21e8ad46323d6f21ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20Jos=C3=A9=20Pereira?= <patrickelectric@gmail.com>
Date: Tue, 21 Apr 2020 14:41:38 -0300
Subject: [PATCH 4/5] Vehicle: Move from QTime to QElapsedTimer to avoid
deprecated functions
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/Vehicle/Vehicle.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Vehicle/Vehicle.h b/src/Vehicle/Vehicle.h
index e8b0d22..886c9f8 100644
--- a/src/Vehicle/Vehicle.h
+++ b/src/Vehicle/Vehicle.h
@@ -1441,7 +1441,7 @@ private:
QTimer _mavCommandAckTimer;
int _mavCommandRetryCount;
int _capabilitiesRetryCount = 0;
- QTime _capabilitiesRetryElapsed;
+ QElapsedTimer _capabilitiesRetryElapsed;
static const int _mavCommandMaxRetryCount = 3;
static const int _mavCommandAckTimeoutMSecs = 3000;
static const int _mavCommandAckTimeoutMSecsHighLatency = 120000;
@@ -1490,7 +1490,7 @@ private:
QTimer _sendMultipleTimer;
int _nextSendMessageMultipleIndex;
- QTime _flightTimer;
+ QElapsedTimer _flightTimer;
QTimer _flightTimeUpdater;
TrajectoryPoints* _trajectoryPoints;
QmlObjectListModel _cameraTriggerPoints;
From b6945ecfc8bf1a3ea8d75ddd7ae6b949082f9939 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20Jos=C3=A9=20Pereira?= <patrickelectric@gmail.com>
Date: Tue, 21 Apr 2020 14:41:50 -0300
Subject: [PATCH 5/5] MockLink: Move from QTime to QElapsedTimer to avoid
deprecated functions
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/comm/MockLink.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/comm/MockLink.h b/src/comm/MockLink.h
index 60aa7de..34ae7db 100644
--- a/src/comm/MockLink.h
+++ b/src/comm/MockLink.h
@@ -10,6 +10,7 @@
#pragma once
+#include <QElapsedTimer>
#include <QMap>
#include <QLoggingCategory>
#include <QGeoCoordinate>
@@ -230,7 +231,7 @@ private:
uint32_t _mavCustomMode;
uint8_t _mavState;
- QTime _runningTime;
+ QElapsedTimer _runningTime;
int8_t _batteryRemaining = 100;
MAV_AUTOPILOT _firmwareType;