diff --git a/misc/camera/a8/a8.pro b/misc/camera/a8/a8.pro index 62c38ea..08d6706 100644 --- a/misc/camera/a8/a8.pro +++ b/misc/camera/a8/a8.pro @@ -1,4 +1,4 @@ -QT += core serialport +QT += core serialport network QT += widgets QT -= gui diff --git a/misc/camera/a8/localControl.cpp b/misc/camera/a8/localControl.cpp index ea5c8ac..8529027 100644 --- a/misc/camera/a8/localControl.cpp +++ b/misc/camera/a8/localControl.cpp @@ -1,15 +1,15 @@ -#include "localControl.hpp" +#include #include #include #include #include +#include "localControl.hpp" #include "config.hpp" #include "serialResponse.hpp" #include "utilsTargetLocation.hpp" -#include -LocalControl::LocalControl() - : QObject(nullptr) +LocalControl::LocalControl(QObject *parent) + : QObject{parent} { run(); } diff --git a/misc/camera/a8/localControl.hpp b/misc/camera/a8/localControl.hpp index e0a01e0..8daa857 100644 --- a/misc/camera/a8/localControl.hpp +++ b/misc/camera/a8/localControl.hpp @@ -7,7 +7,7 @@ class LocalControl : public QObject Q_OBJECT public: - LocalControl(); + LocalControl(QObject *parent = nullptr); private: void run(); diff --git a/misc/camera/a8/remoteControl.cpp b/misc/camera/a8/remoteControl.cpp index 979585b..ce52947 100644 --- a/misc/camera/a8/remoteControl.cpp +++ b/misc/camera/a8/remoteControl.cpp @@ -1,16 +1,17 @@ -#include "remoteControl.hpp" +#include +#include +#include #include #include #include #include #include #include +#include #include "config.hpp" #include "defines.hpp" #include "utilsTargetLocation.hpp" -#include -#include -#include +#include "remoteControl.hpp" RemoteControl::RemoteControl(QObject *parent) : QObject{parent} @@ -47,7 +48,7 @@ void RemoteControl::readPendingDatagrams() void RemoteControl::processJSON(QJsonDocument commandDoc) { mIsBusy = true; - qDebug().noquote().nospace() << "Received: " << commandDoc.toJson().toStdString(); + qDebug().noquote().nospace() << "Received: " << QString(commandDoc.toJson()); QJsonObject commandObject = commandDoc.object(); diff --git a/misc/camera/a8/remoteControl.hpp b/misc/camera/a8/remoteControl.hpp index 5ecda8e..f51bf81 100644 --- a/misc/camera/a8/remoteControl.hpp +++ b/misc/camera/a8/remoteControl.hpp @@ -1,5 +1,6 @@ #pragma once +#include #include #include #include