Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
c-astral-wrapper
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
c-astral-wrapper
Commits
e10b89af
Commit
e10b89af
authored
Jun 07, 2023
by
Léo-Paul Géneau
👾
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow classic doReposition
parent
729a9b0a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
25 additions
and
20 deletions
+25
-20
mavsdk_wrapper.cpp
mavsdk_wrapper.cpp
+25
-20
No files found.
mavsdk_wrapper.cpp
View file @
e10b89af
...
@@ -300,15 +300,16 @@ static double bearing(double lat1, double lon1, double lat2, double lon2) {
...
@@ -300,15 +300,16 @@ static double bearing(double lat1, double lon1, double lat2, double lon2) {
return
atan2
(
x
,
y
);
return
atan2
(
x
,
y
);
}
}
int
setTargetCoordinates
(
double
la
,
double
lo
,
float
a
)
{
int
setTargetCoordinates
(
double
la
,
double
lo
,
float
a
,
bool
going_through
)
{
double
b
,
laRad
=
toRad
(
la
),
loRad
=
toRad
(
lo
),
newLa
,
newLo
;
int
result
;
int
result
;
float
addedDistance
=
(
2
*
DEFAULT_RADIUS
)
/
EARTH_RADIUS
;
Telemetry
::
Position
position
=
telemetry
->
position
();
if
(
!
mavsdk_started
)
if
(
!
mavsdk_started
)
return
-
1
;
return
-
1
;
if
(
going_through
)
{
double
b
,
laRad
=
toRad
(
la
),
loRad
=
toRad
(
lo
),
newLa
,
newLo
;
float
addedDistance
=
(
2
*
DEFAULT_RADIUS
)
/
EARTH_RADIUS
;
Telemetry
::
Position
position
=
telemetry
->
position
();
b
=
bearing
(
position
.
latitude_deg
,
position
.
longitude_deg
,
la
,
lo
);
b
=
bearing
(
position
.
latitude_deg
,
position
.
longitude_deg
,
la
,
lo
);
newLa
=
asin
(
newLa
=
asin
(
sin
(
laRad
)
*
cos
(
addedDistance
)
sin
(
laRad
)
*
cos
(
addedDistance
)
...
@@ -325,6 +326,10 @@ int setTargetCoordinates(double la, double lo, float a) {
...
@@ -325,6 +326,10 @@ int setTargetCoordinates(double la, double lo, float a) {
DEFAULT_RADIUS
,
DEFAULT_RADIUS
,
0
0
);
);
}
else
{
result
=
doReposition
((
float
)
la
,
(
float
)
lo
,
DEFAULT_RADIUS
,
0
);
}
result
|=
setAltitude
(
a
);
result
|=
setAltitude
(
a
);
return
result
;
return
result
;
}
}
...
...
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