From a714945d2d3df9db2e3ba2af949508dc2fd58e9a Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Wed, 22 Mar 2023 14:06:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E5=90=8E=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeSettings.json | 2 +- Project_Grixis.cpp | 8 ++++---- Source/M300/PSDK_Qt/Main/VehicleController.cpp | 14 +++++++------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CMakeSettings.json b/CMakeSettings.json index 79b51f4..764617d 100644 --- a/CMakeSettings.json +++ b/CMakeSettings.json @@ -21,7 +21,7 @@ "buildCommandArgs": "", "ctestCommandArgs": "", "inheritEnvironments": [ "linux_arm" ], - "remoteMachineName": "-237651717;172.16.0.93 (username=root, port=22, authentication=Password)", + "remoteMachineName": "-276973082;172.16.0.72 (username=root, port=22, authentication=Password)", "remoteCMakeListsRoot": "/home/pi/Project_Grixis/src", "remoteBuildRoot": "/home/pi/Project_Grixis/out/build_d/${name}", "remoteInstallRoot": "/home/pi/Project_Grixis/out/install/${name}", diff --git a/Project_Grixis.cpp b/Project_Grixis.cpp index 54bb208..720ba53 100644 --- a/Project_Grixis.cpp +++ b/Project_Grixis.cpp @@ -23,12 +23,12 @@ int main() QCoreApplication Grixis(argc, NULL); - //QEventLoop qeLoop; - //QTimer::singleShot(15000, &qeLoop, SLOT(quit())); - //qeLoop.exec(); + QEventLoop qeLoop; + QTimer::singleShot(15000, &qeLoop, SLOT(quit())); + qeLoop.exec(); - //QT_LOG::ZZ_InitLogger("/home/data/Log/"); + QT_LOG::ZZ_InitLogger("/home/data/Log/"); CMainAcqThread MainCtrl; diff --git a/Source/M300/PSDK_Qt/Main/VehicleController.cpp b/Source/M300/PSDK_Qt/Main/VehicleController.cpp index 0e2f836..8c8f28a 100644 --- a/Source/M300/PSDK_Qt/Main/VehicleController.cpp +++ b/Source/M300/PSDK_Qt/Main/VehicleController.cpp @@ -430,13 +430,13 @@ int VehicleController::SetupSubscriptions() return DJI_ERROR_SYSTEM_MODULE_CODE_UNKNOWN; } - tDjiReturnCode = DjiFcSubscription_SubscribeTopic(DJI_FC_SUBSCRIPTION_TOPIC_ALTITUDE_BAROMETER, DJI_DATA_SUBSCRIPTION_TOPIC_5_HZ, NULL); - if (tDjiReturnCode != DJI_ERROR_SYSTEM_MODULE_CODE_SUCCESS) - { - - qDebug() << "Subscribe topic DJI_FC_SUBSCRIPTION_TOPIC_ALTITUDE_BAROMETER error."; - return DJI_ERROR_SYSTEM_MODULE_CODE_UNKNOWN; - } +// tDjiReturnCode = DjiFcSubscription_SubscribeTopic(DJI_FC_SUBSCRIPTION_TOPIC_ALTITUDE_BAROMETER, DJI_DATA_SUBSCRIPTION_TOPIC_5_HZ, NULL); +// if (tDjiReturnCode != DJI_ERROR_SYSTEM_MODULE_CODE_SUCCESS) +// { +// +// qDebug() << "Subscribe topic DJI_FC_SUBSCRIPTION_TOPIC_ALTITUDE_BAROMETER error."; +// return DJI_ERROR_SYSTEM_MODULE_CODE_UNKNOWN; +// } return 0;