azaion/autopilot
1
0
Fork 0
mirror of https://github.com/azaion/autopilot.git synced 2026-04-23 01:56:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small improvements.

Browse Source
This commit is contained in:
Nffj84
2024-07-04 11:29:39 +03:00
parent dfe3c7c561
commit 25c8f6c605
4 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
misc/camera/a8/a8.pro
+4 -4
View File
@@ -9,13 +9,13 @@ TARGET = a8
QMAKE_CXXFLAGS = -O0 -g -ggdb -fsanitize=undefined,address,bounds,float-divide-by-zero,integer-divide-by-zero,null,return,signed-integer-overflow,unreachable,shift,alignment,nonnull-attribute,returns-nonnull-attribute,enum
QMAKE_LFLAGS = -O0 -g -ggdb -fsanitize=undefined,address,bounds,float-divide-by-zero,integer-divide-by-zero,null,return,signed-integer-overflow,unreachable,shift,alignment,nonnull-attribute,returns-nonnull-attribute,enum
#QMAKE_CXX = clang++
#QMAKE_CC = clang
QMAKE_CXX = g++
QMAKE_CC = gcc
# Not nice, but for some reason QtCreator doesn't use /usr/lib/ccache/g++ from the PATH
linux-g++ {
# QMAKE_CXX = clang++
# QMAKE_CC = clang
QMAKE_CXX = g++
QMAKE_CC = gcc
}
SOURCES += \
misc/camera/a8/remoteControl.cpp
+13 -10
View File
@@ -84,9 +84,11 @@ void RemoteControl::sendResponse(void)
QJsonDocument responseDocument(mResponseObject);
std::string response = responseDocument.toJson(QJsonDocument::Compact).toStdString();
// qDebug().noquote().nospace() << "Sending responce: " << response;
write(mFifoFdOut, response.c_str(), response.size());
size_t bytesWritten = write(mFifoFdOut, response.c_str(), response.size());
if (bytesWritten < 1) {
qWarning().noquote().nospace() << "Error writing response: " << bytesWritten;
}
qDebug().noquote().nospace() << "Responded: " << response;
mIsBusy = false;
}
@@ -255,22 +257,24 @@ void RemoteControl::run()
buffer[bytesRead] = '\0';
QJsonDocument commandDoc = QJsonDocument::fromJson(buffer);
QString message = QString::fromUtf8(buffer);
// Ignore non json messages
if (commandDoc.isNull() == false) {
qDebug().noquote().nospace() << "Received: " << message;
QJsonObject commandObject = commandDoc.object();
// Ignore own messages and messages that don't have sender
if (commandObject.contains("sender") == false || commandObject["sender"] == FIFO_WHO_AM_I) {
// Ignore messages that don't have sender
if (commandObject.contains("sender") == false) {
qDebug().noquote().nospace() << "No sender info: " << message;
mIsBusy = false;
continue;
}
QString message = QString::fromUtf8(buffer);
qDebug().noquote().nospace() << "Received: " << message;
// Exit with exit message
if (commandObject.contains("extra") == true && commandObject["extra"] == "EXIT") {
qDebug().noquote().nospace() << "Exit message received: Exiting...";
exit(EXIT_SUCCESS);
}
@@ -296,8 +300,6 @@ void RemoteControl::run()
qInfo() << "target_pixel_height: " << commandObject["target_pixel_height"];
qInfo() << "target_pixel_width: " << commandObject["target_pixel_width"];
mIsBusy = true;
// Prepare responce object
mResponseObject = QJsonObject();
mResponseObject["sender"] = FIFO_WHO_AM_I;
@@ -308,6 +310,7 @@ void RemoteControl::run()
QTimer::singleShot(0, this, [this, commandObject]() mutable { turnToTarget(commandObject); });
} else {
qDebug().noquote().nospace() << "Non JSON message received: " << message;
mIsBusy = false;
}
} else {