Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
ecc7a84c
Commit
ecc7a84c
authored
Dec 16, 2019
by
DonLakeFlyer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
parent
127d942a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
27 deletions
+16
-27
QGCCommon.pri
QGCCommon.pri
+10
-21
GPSProvider.cc
src/GPS/GPSProvider.cc
+1
-1
MissionManagerTest.cc
src/MissionManager/MissionManagerTest.cc
+3
-3
Vehicle.cc
src/Vehicle/Vehicle.cc
+1
-1
MockLink.cc
src/comm/MockLink.cc
+1
-1
No files found.
QGCCommon.pri
View file @
ecc7a84c
...
...
@@ -67,6 +67,7 @@ linux {
contains(QMAKE_TARGET.arch, x86_64) {
message("Windows build")
CONFIG += WindowsBuild
CONFIG += WarningsAsErrorsOn
DEFINES += __STDC_LIMIT_MACROS
DEFINES += QGC_GST_TAISYNC_ENABLED
DEFINES += QGC_GST_MICROHARD_ENABLED
...
...
@@ -210,14 +211,6 @@ LOCATION_PLUGIN_NAME = QGeoServiceProviderFactoryQGC
# Turn off serial port warnings
DEFINES += _TTY_NOWARN_
#
# By default warnings as errors are turned off. Even so, in order for a pull request
# to be accepted you must compile cleanly with warnings as errors turned on the default
# set of OS builds. See http://www.qgroundcontrol.org/dev/contribute for more details.
# You can use the WarningsAsErrorsOn CONFIG switch to turn warnings as errors on for your
# own builds.
#
MacBuild | LinuxBuild {
QMAKE_CXXFLAGS_WARN_ON += -Wall
WarningsAsErrorsOn {
...
...
@@ -234,20 +227,17 @@ MacBuild | LinuxBuild {
}
WindowsBuild {
win32-msvc2015 {
QMAKE_CFLAGS -= -Zc:strictStrings
QMAKE_CXXFLAGS -= -Zc:strictStrings
}
QMAKE_CFLAGS -= -Zc:strictStrings
QMAKE_CFLAGS_RELEASE -= -Zc:strictStrings
QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO -= -Zc:strictStrings
QMAKE_CXXFLAGS -= -Zc:strictStrings
QMAKE_CXXFLAGS_RELEASE -= -Zc:strictStrings
QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO -= -Zc:strictStrings
QMAKE_CXXFLAGS_WARN_ON += /W3 \
/wd4996 \ # silence warnings about deprecated strcpy and whatnot
/wd4005 \ # silence warnings about macro redefinition
/wd4290
# ignore exception specifications
/wd4996 \ # silence warnings about deprecated strcpy and whatnot
, these come from the shapefile code with is external
/wd4005 \ # silence warnings about macro redefinition
, these come from the shapefile code with is external
/wd4290
\
# ignore exception specifications
/wd4267 # silence conversion from 'size_t' to 'int', possible loss of data, these come from gps drivers shared with px4
WarningsAsErrorsOn {
QMAKE_CXXFLAGS_WARN_ON += /WX
}
...
...
@@ -267,10 +257,9 @@ ReleaseBuild {
}
WindowsBuild {
*msvc* { # visual studio spec filter
# Run compilation using VS compiler using multiple threads
QMAKE_CXXFLAGS += -MP
}
# Run compilation using VS compiler using multiple threads
QMAKE_CXXFLAGS += -MP
# Enable function level linking and enhanced optimized debugging
QMAKE_CFLAGS_RELEASE += /Gy /Zo
QMAKE_CXXFLAGS_RELEASE += /Gy /Zo
...
...
src/GPS/GPSProvider.cc
View file @
ecc7a84c
...
...
@@ -179,7 +179,7 @@ void GPSProvider::publishGPSSatellite()
void
GPSProvider
::
gotRTCMData
(
uint8_t
*
data
,
size_t
len
)
{
QByteArray
message
((
char
*
)
data
,
len
);
QByteArray
message
((
char
*
)
data
,
static_cast
<
int
>
(
len
)
);
emit
RTCMDataUpdate
(
message
);
}
...
...
src/MissionManager/MissionManagerTest.cc
View file @
ecc7a84c
...
...
@@ -168,7 +168,7 @@ void MissionManagerTest::_roundTripItems(MockLinkMissionItemHandler::FailureMode
// Validate returned items
size_
t
cMissionItemsExpected
;
in
t
cMissionItemsExpected
;
if
(
shouldFail
)
{
cMissionItemsExpected
=
0
;
...
...
@@ -182,14 +182,14 @@ void MissionManagerTest::_roundTripItems(MockLinkMissionItemHandler::FailureMode
QCOMPARE
(
_missionManager
->
missionItems
().
count
(),
(
int
)
cMissionItemsExpected
);
size_
t
firstActualItem
=
0
;
in
t
firstActualItem
=
0
;
if
(
_mockLink
->
getFirmwareType
()
==
MAV_AUTOPILOT_ARDUPILOTMEGA
)
{
// First item is home position, don't validate it
firstActualItem
++
;
}
int
testCaseIndex
=
0
;
for
(
size_
t
actualItemIndex
=
firstActualItem
;
actualItemIndex
<
cMissionItemsExpected
;
actualItemIndex
++
)
{
for
(
in
t
actualItemIndex
=
firstActualItem
;
actualItemIndex
<
cMissionItemsExpected
;
actualItemIndex
++
)
{
const
TestCase_t
*
testCase
=
&
_rgTestCases
[
testCaseIndex
];
int
expectedSequenceNumber
=
testCase
->
expectedItem
.
sequenceNumber
;
...
...
src/Vehicle/Vehicle.cc
View file @
ecc7a84c
...
...
@@ -1916,7 +1916,7 @@ bool Vehicle::_containsLink(LinkInterface* link)
void
Vehicle
::
_addLink
(
LinkInterface
*
link
)
{
if
(
!
_containsLink
(
link
))
{
qCDebug
(
VehicleLog
)
<<
"_addLink:"
<<
QString
(
"%1"
).
arg
((
u
long
)
link
,
0
,
16
);
qCDebug
(
VehicleLog
)
<<
"_addLink:"
<<
QString
(
"%1"
).
arg
((
qulong
long
)
link
,
0
,
16
);
_links
+=
link
;
if
(
_links
.
count
()
<=
1
)
{
_updatePriorityLink
(
true
/* updateActive */
,
false
/* sendCommand */
);
...
...
src/comm/MockLink.cc
View file @
ecc7a84c
...
...
@@ -780,7 +780,7 @@ void MockLink::_handleParamRequestRead(const mavlink_message_t& msg)
mavlink_param_request_read_t
request
;
mavlink_msg_param_request_read_decode
(
&
msg
,
&
request
);
const
QString
paramName
(
QString
::
fromLocal8Bit
(
request
.
param_id
,
st
rnlen
(
request
.
param_id
,
MAVLINK_MSG_PARAM_REQUEST_READ_FIELD_PARAM_ID_LEN
)));
const
QString
paramName
(
QString
::
fromLocal8Bit
(
request
.
param_id
,
st
atic_cast
<
int
>
(
strnlen
(
request
.
param_id
,
MAVLINK_MSG_PARAM_REQUEST_READ_FIELD_PARAM_ID_LEN
)
)));
int
componentId
=
request
.
target_component
;
// special case for magic _HASH_CHECK value
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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