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
c9b53416
Commit
c9b53416
authored
Jul 15, 2014
by
Lorenz Meier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Moved audio output out of UI widget
parent
b485d7f6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
4 deletions
+2
-4
UAS.cc
src/uas/UAS.cc
+2
-2
QGCMessageView.cc
src/ui/uas/QGCMessageView.cc
+0
-2
No files found.
src/uas/UAS.cc
View file @
c9b53416
...
...
@@ -1314,11 +1314,11 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
QString
text
=
QString
(
b
);
int
severity
=
mavlink_msg_statustext_get_severity
(
&
message
);
if
(
text
.
startsWith
(
"#
audio:"
)
)
if
(
text
.
startsWith
(
"#
"
)
||
severity
>
MAV_SEVERITY_WARNING
)
{
text
.
remove
(
"#audio:"
);
emit
textMessageReceived
(
uasId
,
message
.
compid
,
severity
,
QString
(
"Audio message: "
)
+
text
);
GAudioOutput
::
instance
()
->
say
(
text
,
severity
);
GAudioOutput
::
instance
()
->
say
(
text
.
toLower
()
,
severity
);
}
else
{
...
...
src/ui/uas/QGCMessageView.cc
View file @
c9b53416
...
...
@@ -97,8 +97,6 @@ void QGCMessageView::handleTextMessage(int uasid, int compId, int severity, QStr
case
MAV_SEVERITY_ALERT
:
case
MAV_SEVERITY_CRITICAL
:
case
MAV_SEVERITY_ERROR
:
// TODO: Move this audio output to UAS.cc, as it doesn't make sense to put audio output in a message logger widget.
GAudioOutput
::
instance
()
->
say
(
text
.
toLower
());
//Use set RGB values from given color from QGC
style
=
QString
(
"color: rgb(%1, %2, %3); font-weight:bold"
).
arg
(
QGC
::
colorRed
.
red
()).
arg
(
QGC
::
colorRed
.
green
()).
arg
(
QGC
::
colorRed
.
blue
());
break
;
...
...
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