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
8e305c77
Commit
8e305c77
authored
Dec 07, 2012
by
Lorenz Meier
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #207 from Susurrus/master
URGENT: Fix broken Windows compilation
parents
50518c19
975f6fb5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
3 deletions
+13
-3
qgroundcontrol.pri
qgroundcontrol.pri
+3
-0
QGCVehicleConfig.cc
src/ui/QGCVehicleConfig.cc
+10
-3
No files found.
qgroundcontrol.pri
View file @
8e305c77
...
...
@@ -285,6 +285,9 @@ win32-msvc2008|win32-msvc2010 {
# QWebkit is not needed on MS-Windows compilation environment
CONFIG -= webkit
# Specify the inclusion of (U)INT*_(MAX/MIN) macros within Visual Studio
DEFINES += __STDC_LIMIT_MACROS
# For release builds remove support for various Qt debugging macros.
CONFIG(release, debug|release) {
...
...
src/ui/QGCVehicleConfig.cc
View file @
8e305c77
// On Windows (for VS2010) stdint.h contains the limits normally contained in limits.h
// It also needs the __STDC_LIMIT_MACROS macro defined in order to include them (done
// in qgroundcontrol.pri).
#ifdef WIN32
#include <stdint.h>
#else
#include <limits.h>
#endif
#include <QTimer>
...
...
@@ -228,8 +235,8 @@ void QGCVehicleConfig::resetCalibrationRC()
{
for
(
unsigned
int
i
=
0
;
i
<
chanMax
;
++
i
)
{
rcMin
[
i
]
=
INT_MAX
;
rcMax
[
i
]
=
INT_MIN
;
rcMin
[
i
]
=
(
float
)
INT_MAX
;
rcMax
[
i
]
=
(
float
)
INT_MIN
;
}
}
...
...
@@ -318,7 +325,7 @@ void QGCVehicleConfig::remoteControlChannelRawChanged(int chan, float val)
if
(
chan
<
0
||
static_cast
<
unsigned
int
>
(
chan
)
>=
chanMax
||
val
<
500
||
val
>
2500
)
return
;
if
(
chan
+
1
>
chanCount
)
{
if
(
chan
+
1
>
(
int
)
chanCount
)
{
chanCount
=
chan
+
1
;
}
...
...
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