Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
Firmware
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alberto Ruiz Garcia
Firmware
Commits
f4bac7e7
Commit
f4bac7e7
authored
11 years ago
by
Thomas Gubler
Browse files
Options
Downloads
Patches
Plain Diff
navigator: remove all but one [navigator] tag from mavlink audio messages
parent
4a66e285
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/modules/navigator/navigator_main.cpp
+11
-11
11 additions, 11 deletions
src/modules/navigator/navigator_main.cpp
with
11 additions
and
11 deletions
src/modules/navigator/navigator_main.cpp
+
11
−
11
View file @
f4bac7e7
...
...
@@ -865,7 +865,7 @@ Navigator::task_main()
/* notify user about state changes */
if
(
myState
!=
prevState
)
{
mavlink_log_info
(
_mavlink_fd
,
"#audio:
[
navigat
or] nav
state: %s"
,
nav_states_str
[
myState
]);
mavlink_log_info
(
_mavlink_fd
,
"#audio: navigat
ion
state: %s"
,
nav_states_str
[
myState
]);
prevState
=
myState
;
/* reset time counter on state changes */
...
...
@@ -1073,11 +1073,11 @@ Navigator::start_loiter()
/* use current altitude if above min altitude set by parameter */
if
(
_global_pos
.
alt
<
min_alt_amsl
)
{
_pos_sp_triplet
.
current
.
alt
=
min_alt_amsl
;
mavlink_log_info
(
_mavlink_fd
,
"#audio:
[navigator]
loiter %.1fm higher"
,
(
double
)(
min_alt_amsl
-
_global_pos
.
alt
));
mavlink_log_info
(
_mavlink_fd
,
"#audio: loiter %.1fm higher"
,
(
double
)(
min_alt_amsl
-
_global_pos
.
alt
));
}
else
{
_pos_sp_triplet
.
current
.
alt
=
_global_pos
.
alt
;
mavlink_log_info
(
_mavlink_fd
,
"#audio:
[navigator]
loiter at current altitude"
);
mavlink_log_info
(
_mavlink_fd
,
"#audio: loiter at current altitude"
);
}
_pos_sp_triplet
.
current
.
type
=
SETPOINT_TYPE_LOITER
;
...
...
@@ -1175,14 +1175,14 @@ Navigator::set_mission_item()
}
if
(
_do_takeoff
)
{
mavlink_log_info
(
_mavlink_fd
,
"#audio:
[navigator]
takeoff to %.1fm above home"
,
_pos_sp_triplet
.
current
.
alt
-
_home_pos
.
alt
);
mavlink_log_info
(
_mavlink_fd
,
"#audio: takeoff to %.1fm above home"
,
_pos_sp_triplet
.
current
.
alt
-
_home_pos
.
alt
);
}
else
{
if
(
onboard
)
{
mavlink_log_info
(
_mavlink_fd
,
"#audio:
[navigator]
heading to onboard WP %d"
,
index
);
mavlink_log_info
(
_mavlink_fd
,
"#audio: heading to onboard WP %d"
,
index
);
}
else
{
mavlink_log_info
(
_mavlink_fd
,
"#audio:
[navigator]
heading to offboard WP %d"
,
index
);
mavlink_log_info
(
_mavlink_fd
,
"#audio: heading to offboard WP %d"
,
index
);
}
}
...
...
@@ -1331,7 +1331,7 @@ Navigator::set_rtl_item()
_pos_sp_triplet
.
next
.
valid
=
false
;
mavlink_log_info
(
_mavlink_fd
,
"#audio:
[navigator]
RTL: climb to %.1fm above home"
,
climb_alt
-
_home_pos
.
alt
);
mavlink_log_info
(
_mavlink_fd
,
"#audio: RTL: climb to %.1fm above home"
,
climb_alt
-
_home_pos
.
alt
);
break
;
}
...
...
@@ -1357,7 +1357,7 @@ Navigator::set_rtl_item()
_pos_sp_triplet
.
next
.
valid
=
false
;
mavlink_log_info
(
_mavlink_fd
,
"#audio:
[navigator]
RTL: return at %.1fm above home"
,
_mission_item
.
altitude
-
_home_pos
.
alt
);
mavlink_log_info
(
_mavlink_fd
,
"#audio: RTL: return at %.1fm above home"
,
_mission_item
.
altitude
-
_home_pos
.
alt
);
break
;
}
...
...
@@ -1384,7 +1384,7 @@ Navigator::set_rtl_item()
_pos_sp_triplet
.
next
.
valid
=
false
;
mavlink_log_info
(
_mavlink_fd
,
"#audio:
[navigator]
RTL: descend to %.1fm above home"
,
_mission_item
.
altitude
-
_home_pos
.
alt
);
mavlink_log_info
(
_mavlink_fd
,
"#audio: RTL: descend to %.1fm above home"
,
_mission_item
.
altitude
-
_home_pos
.
alt
);
break
;
}
...
...
@@ -1516,7 +1516,7 @@ Navigator::check_mission_item_reached()
_time_first_inside_orbit
=
now
;
if
(
_mission_item
.
time_inside
>
0.01
f
)
{
mavlink_log_info
(
_mavlink_fd
,
"#audio:
[navigator]
waypoint reached, wait for %.1fs"
,
_mission_item
.
time_inside
);
mavlink_log_info
(
_mavlink_fd
,
"#audio: waypoint reached, wait for %.1fs"
,
_mission_item
.
time_inside
);
}
}
...
...
@@ -1541,7 +1541,7 @@ Navigator::on_mission_item_reached()
if
(
_do_takeoff
)
{
/* takeoff completed */
_do_takeoff
=
false
;
mavlink_log_info
(
_mavlink_fd
,
"#audio:
[navigator]
takeoff completed"
);
mavlink_log_info
(
_mavlink_fd
,
"#audio: takeoff completed"
);
}
else
{
/* advance by one mission item */
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment