Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
5b5fdf5e
Unverified
Commit
5b5fdf5e
authored
Nov 02, 2020
by
Morton Lin
Committed by
GitHub
Nov 02, 2020
Browse files
fix warning C5208 on windows(stop the build process) (#9145)
(cherry picked from commit e049bc1c3c4b63eb7e7a47df4c9d187b36ef8992)
parent
a3e6e48b
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/Vehicle/Vehicle.h
View file @
5b5fdf5e
...
@@ -1133,7 +1133,7 @@ private:
...
@@ -1133,7 +1133,7 @@ private:
void
_waitForMavlinkMessageMessageReceived
(
const
mavlink_message_t
&
message
);
void
_waitForMavlinkMessageMessageReceived
(
const
mavlink_message_t
&
message
);
// requestMessage handling
// requestMessage handling
typedef
struct
{
typedef
struct
RequestMessageInfo
{
bool
commandAckReceived
;
// We keep track of the ack/message being received since the order in which this will come in is random
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)
bool
messageReceived
;
// We only delete the allocated RequestMessageInfo_t when both happen (or the message wait times out)
int
msgId
;
int
msgId
;
...
@@ -1145,7 +1145,7 @@ private:
...
@@ -1145,7 +1145,7 @@ private:
static
void
_requestMessageCmdResultHandler
(
void
*
resultHandlerData
,
int
compId
,
MAV_RESULT
result
,
MavCmdResultFailureCode_t
failureCode
);
static
void
_requestMessageCmdResultHandler
(
void
*
resultHandlerData
,
int
compId
,
MAV_RESULT
result
,
MavCmdResultFailureCode_t
failureCode
);
static
void
_requestMessageWaitForMessageResultHandler
(
void
*
resultHandlerData
,
bool
noResponsefromVehicle
,
const
mavlink_message_t
&
message
);
static
void
_requestMessageWaitForMessageResultHandler
(
void
*
resultHandlerData
,
bool
noResponsefromVehicle
,
const
mavlink_message_t
&
message
);
typedef
struct
{
typedef
struct
MavCommandListEntry
{
int
targetCompId
=
MAV_COMP_ID_AUTOPILOT1
;
int
targetCompId
=
MAV_COMP_ID_AUTOPILOT1
;
bool
useCommandInt
=
false
;
bool
useCommandInt
=
false
;
MAV_CMD
command
;
MAV_CMD
command
;
...
...
src/Vehicle/VehicleLinkManager.h
View file @
5b5fdf5e
...
@@ -77,7 +77,7 @@ private:
...
@@ -77,7 +77,7 @@ private:
LinkInterface
*
_bestActivePrimaryLink
(
void
);
LinkInterface
*
_bestActivePrimaryLink
(
void
);
void
_commRegainedOnLink
(
LinkInterface
*
link
);
void
_commRegainedOnLink
(
LinkInterface
*
link
);
typedef
struct
{
typedef
struct
LinkInfo
{
SharedLinkInterfacePtr
link
;
SharedLinkInterfacePtr
link
;
bool
commLost
=
false
;
bool
commLost
=
false
;
QElapsedTimer
heartbeatElapsedTimer
;
QElapsedTimer
heartbeatElapsedTimer
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment