Browse Source

Merge pull request #8966 from DonLakeFlyer/VehicleInit

Fix C++ 20 compiler warning
QGC4.4
Don Gagne 5 years ago committed by GitHub
parent
commit
388a804f19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      src/Vehicle/Vehicle.cc
  2. 12
      src/Vehicle/Vehicle.h

1
src/Vehicle/Vehicle.cc

@ -3446,6 +3446,7 @@ void Vehicle::requestMessage(RequestMessageResultHandler resultHandler, void* re @@ -3446,6 +3446,7 @@ void Vehicle::requestMessage(RequestMessageResultHandler resultHandler, void* re
{
RequestMessageInfo_t* pInfo = new RequestMessageInfo_t;
*pInfo = { };
pInfo->msgId = messageId;
pInfo->compId = compId;
pInfo->resultHandler = resultHandler;

12
src/Vehicle/Vehicle.h

@ -1581,12 +1581,12 @@ private: @@ -1581,12 +1581,12 @@ private:
// requestMessage handling
typedef struct {
bool commandAckReceived = false; // We keep track of the ack/message being received since the order in which this will come in is random
bool messageReceived = false; // We only delete the allocated RequestMessageInfo_t when both happen (or the message wait times out)
int msgId = 0;
int compId = 0;
RequestMessageResultHandler resultHandler = nullptr;
void* resultHandlerData = nullptr;
bool commandAckReceived; // We keep track of the ack/message being received since the order in which this will come in is random
bool messageReceived; // We only delete the allocated RequestMessageInfo_t when both happen (or the message wait times out)
int msgId;
int compId;
RequestMessageResultHandler resultHandler;
void* resultHandlerData;
} RequestMessageInfo_t;
static void _requestMessageCmdResultHandler (void* resultHandlerData, int compId, MAV_RESULT result, bool noResponsefromVehicle);

Loading…
Cancel
Save