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
941ce692
Commit
941ce692
authored
May 02, 2018
by
DonLakeFlyer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Handle EKF and 4.2m correctly
parent
07fba793
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
4 deletions
+15
-4
AudioOutput.cc
src/Audio/AudioOutput.cc
+15
-4
No files found.
src/Audio/AudioOutput.cc
View file @
941ce692
...
...
@@ -73,6 +73,7 @@ QString AudioOutput::fixTextMessageForAudio(const QString& string) {
QString
match
;
QString
newNumber
;
QString
result
=
string
;
//-- Look for codified terms
if
(
result
.
contains
(
"ERR "
,
Qt
::
CaseInsensitive
))
{
result
.
replace
(
"ERR "
,
"error "
,
Qt
::
CaseInsensitive
);
...
...
@@ -118,6 +119,9 @@ QString AudioOutput::fixTextMessageForAudio(const QString& string) {
if
(
result
.
contains
(
" ADSB "
,
Qt
::
CaseInsensitive
))
{
result
.
replace
(
" ADSB "
,
" Hey Dee Ess Bee "
,
Qt
::
CaseInsensitive
);
}
if
(
result
.
contains
(
" EKF "
,
Qt
::
CaseInsensitive
))
{
result
.
replace
(
" EKF "
,
" Eee Kay Eff "
,
Qt
::
CaseInsensitive
);
}
// Convert negative numbers
QRegularExpression
re
(
QStringLiteral
(
"(-)[0-9]*
\\
.?[0-9]"
));
...
...
@@ -125,9 +129,18 @@ QString AudioOutput::fixTextMessageForAudio(const QString& string) {
while
(
reMatch
.
hasMatch
())
{
if
(
!
reMatch
.
captured
(
1
).
isNull
())
{
// There is a negative prefix
qDebug
()
<<
"negative"
<<
reMatch
.
captured
(
1
)
<<
reMatch
.
capturedStart
(
1
)
<<
reMatch
.
capturedEnd
(
1
);
result
.
replace
(
reMatch
.
capturedStart
(
1
),
reMatch
.
capturedEnd
(
1
)
-
reMatch
.
capturedStart
(
1
),
tr
(
" negative "
));
qDebug
()
<<
result
;
}
reMatch
=
re
.
match
(
result
);
}
// Convert real number with decimal point
re
.
setPattern
(
QStringLiteral
(
"([0-9]*)(
\\
.)([0-9]*)"
));
reMatch
=
re
.
match
(
result
);
while
(
reMatch
.
hasMatch
())
{
if
(
!
reMatch
.
captured
(
2
).
isNull
())
{
// There is a decimal point
result
.
replace
(
reMatch
.
capturedStart
(
2
),
reMatch
.
capturedEnd
(
2
)
-
reMatch
.
capturedStart
(
2
),
tr
(
" point"
));
}
reMatch
=
re
.
match
(
result
);
}
...
...
@@ -138,9 +151,7 @@ QString AudioOutput::fixTextMessageForAudio(const QString& string) {
while
(
reMatch
.
hasMatch
())
{
if
(
!
reMatch
.
captured
(
1
).
isNull
())
{
// There is a meter postfix
qDebug
()
<<
"meters"
<<
reMatch
.
captured
(
1
)
<<
reMatch
.
capturedStart
(
1
)
<<
reMatch
.
capturedEnd
(
1
);
result
.
replace
(
reMatch
.
capturedStart
(
1
),
reMatch
.
capturedEnd
(
1
)
-
reMatch
.
capturedStart
(
1
),
tr
(
" meters"
));
qDebug
()
<<
result
;
}
reMatch
=
re
.
match
(
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