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
282aa15c
Commit
282aa15c
authored
Nov 24, 2010
by
pixhawk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed MSVC2008 compilation issues
parent
6d91ce03
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
18 additions
and
9 deletions
+18
-9
GAudioOutput.cc
src/GAudioOutput.cc
+3
-2
MG.h
src/MG.h
+1
-1
MAVLinkSimulationLink.cc
src/comm/MAVLinkSimulationLink.cc
+3
-3
UAS.cc
src/uas/UAS.cc
+1
-1
HDDisplay.cc
src/ui/HDDisplay.cc
+3
-1
HSIDisplay.cc
src/ui/HSIDisplay.cc
+1
-1
HUD.cc
src/ui/HUD.cc
+3
-0
WaypointView.cc
src/ui/WaypointView.cc
+3
-0
No files found.
src/GAudioOutput.cc
View file @
282aa15c
...
...
@@ -41,7 +41,8 @@ This file is part of the QGROUNDCONTROL project
#endif
// Speech synthesis is only supported with MSVC compiler
#if _MSC_VER
#if _MSC_VER2
// Documentation: http://msdn.microsoft.com/en-us/library/ee125082%28v=VS.85%29.aspx
#include <sapi.h>
using
System
;
using
System
.
Speech
.
Synthesis
;
...
...
@@ -111,7 +112,7 @@ bool GAudioOutput::say(QString text, int severity)
{
// Speech synthesis is only supported with MSVC compiler
#ifdef _MSC_VER
#ifdef _MSC_VER
2
SpeechSynthesizer
synth
=
new
SpeechSynthesizer
();
synth
.
SelectVoice
(
"Microsoft Anna"
);
synth
.
SpeakText
(
text
.
toStdString
().
c_str
());
...
...
src/MG.h
View file @
282aa15c
...
...
@@ -264,7 +264,7 @@ namespace MG
* @param screenDiameter The screen diameter in mm, e.g. 13.3" = 338 mm.
*/
static
void
setPixelSize
(
int
horizontalResolution
,
int
verticalResolution
,
double
screenDiameter
)
{
pixelSize
=
screenDiameter
/
sqrt
(
(
horizontalResolution
^
(
2
))
+
(
verticalResolution
^
(
2
)
));
pixelSize
=
screenDiameter
/
sqrt
(
static_cast
<
float
>
(
horizontalResolution
*
horizontalResolution
+
verticalResolution
*
verticalResolution
));
}
private:
...
...
src/comm/MAVLinkSimulationLink.cc
View file @
282aa15c
...
...
@@ -380,9 +380,9 @@ void MAVLinkSimulationLink::mainloop()
// Move X Position
x
=
x
*
0.93
f
+
0.07
f
*
(
x
+
sin
(
QGC
::
groundTimeUsecs
())
*
0.08
f
);
y
=
y
*
0.93
f
+
0.07
f
*
(
y
+
sin
(
QGC
::
groundTimeUsecs
())
*
0.5
f
);
z
=
z
*
0.93
f
+
0.07
f
*
(
z
+
sin
(
QGC
::
groundTimeUsecs
()
*
100000
)
*
0.1
f
);
x
=
x
*
0.93
f
+
0.07
f
*
(
x
+
sin
(
static_cast
<
float
>
(
QGC
::
groundTimeUsecs
())
*
0.08
f
)
);
y
=
y
*
0.93
f
+
0.07
f
*
(
y
+
sin
(
static_cast
<
float
>
(
QGC
::
groundTimeUsecs
())
*
0.5
f
)
);
z
=
z
*
0.93
f
+
0.07
f
*
(
z
+
sin
(
static_cast
<
float
>
(
QGC
::
groundTimeUsecs
()
*
0.001
f
)
)
*
0.1
f
);
x
=
5247273.0
f
;
y
=
465955.0
f
;
// x = (x > 5.0f) ? 5.0f : x;
...
...
src/uas/UAS.cc
View file @
282aa15c
...
...
@@ -729,7 +729,7 @@ quint64 UAS::getUnixTime(quint64 time)
// 60 seconds
// 1000 milliseconds
// 1000 microseconds
else
if
(
time
<
1261440000000000
LLU
)
else
if
(
time
<
1261440000000000
)
{
if
(
onboardTimeOffset
==
0
)
{
...
...
src/ui/HDDisplay.cc
View file @
282aa15c
...
...
@@ -38,7 +38,9 @@ This file is part of the PIXHAWK project
#include "HDDisplay.h"
#include "ui_HDDisplay.h"
#include "MG.h"
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
#include <QDebug>
HDDisplay
::
HDDisplay
(
QStringList
*
plotList
,
QWidget
*
parent
)
:
...
...
src/ui/HSIDisplay.cc
View file @
282aa15c
...
...
@@ -478,7 +478,7 @@ void HSIDisplay::updateSpeed(UASInterface* uas, double vx, double vy, double vz,
this
->
vx
=
vx
;
this
->
vy
=
vy
;
this
->
vz
=
vz
;
this
->
speed
=
sqrt
(
pow
(
vx
,
2.0
f
)
+
pow
(
vy
,
2.0
f
)
+
pow
(
vz
,
2.0
f
));
this
->
speed
=
sqrt
(
pow
(
vx
,
2.0
)
+
pow
(
vy
,
2.0
)
+
pow
(
vz
,
2.0
));
}
void
HSIDisplay
::
setBodySetpointCoordinateXY
(
double
x
,
double
y
)
...
...
src/ui/HUD.cc
View file @
282aa15c
...
...
@@ -31,6 +31,9 @@ This file is part of the QGROUNDCONTROL project
#include <QDebug>
#include <cmath>
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
#include <limits>
#include "UASManager.h"
...
...
src/ui/WaypointView.cc
View file @
282aa15c
...
...
@@ -35,6 +35,9 @@ This file is part of the PIXHAWK project
#include <QDebug>
#include <cmath> //M_PI
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
#include "WaypointView.h"
#include "ui_WaypointView.h"
...
...
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