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
ad1dbf03
Commit
ad1dbf03
authored
Sep 26, 2017
by
Don Gagne
Committed by
GitHub
Sep 26, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5705 from HorusAeronaves/solve_typo
Solve some typos
parents
fd2d5549
d5cd71e0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
ULogParser.cc
src/AnalyzeView/ULogParser.cc
+1
-1
JoystickSDL.cc
src/Joystick/JoystickSDL.cc
+1
-1
MissionItemTest.cc
src/MissionManager/MissionItemTest.cc
+1
-1
No files found.
src/AnalyzeView/ULogParser.cc
View file @
ad1dbf03
...
...
@@ -36,7 +36,7 @@ int ULogParser::sizeOfType(QString& typeName)
return
1
;
}
qWarning
()
<<
"Unkown type in ULog : "
<<
typeName
;
qWarning
()
<<
"Unk
n
own type in ULog : "
<<
typeName
;
return
0
;
}
...
...
src/Joystick/JoystickSDL.cc
View file @
ad1dbf03
...
...
@@ -65,7 +65,7 @@ QMap<QString, Joystick*> JoystickSDL::discover(MultiVehicleManager* _multiVehicl
qCDebug
(
JoystickLog
)
<<
"
\t
"
<<
name
<<
"axes:"
<<
axisCount
<<
"buttons:"
<<
buttonCount
<<
"hats:"
<<
hatCount
<<
"isGC:"
<<
isGameController
;
// Check for joysticks with duplicate names and differentiate the keys when nec
c
essary.
// Check for joysticks with duplicate names and differentiate the keys when necessary.
// This is required when using an Xbox 360 wireless receiver that always identifies as
// 4 individual joysticks, regardless of how many joysticks are actually connected to the
// receiver. Using GUID does not help, all of these devices present the same GUID.
...
...
src/MissionManager/MissionItemTest.cc
View file @
ad1dbf03
...
...
@@ -297,7 +297,7 @@ void MissionItemTest::_testLoadFromJsonV1(void)
QString
errorString
;
QJsonObject
jsonObject
=
_createV1Json
();
// V1 format has param 1-4 in sep
e
rate items instead of in params array
// V1 format has param 1-4 in sep
a
rate items instead of in params array
QStringList
removeKeys
;
removeKeys
<<
MissionItem
::
_jsonParam1Key
<<
MissionItem
::
_jsonParam2Key
<<
MissionItem
::
_jsonParam3Key
<<
MissionItem
::
_jsonParam4Key
;
...
...
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