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
d4616625
Commit
d4616625
authored
Nov 02, 2011
by
oberion
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Intermediate step
parent
79d78668
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
7 deletions
+8
-7
SerialLink.cc
src/comm/SerialLink.cc
+2
-2
QGCMAVLinkUASFactory.cc
src/uas/QGCMAVLinkUASFactory.cc
+2
-0
UASManager.cc
src/uas/UASManager.cc
+0
-2
MainWindow.cc
src/ui/MainWindow.cc
+2
-1
SenseSoar.xml
thirdParty/mavlink/message_definitions/SenseSoar.xml
+2
-2
No files found.
src/comm/SerialLink.cc
View file @
d4616625
...
...
@@ -340,7 +340,7 @@ QVector<QString>* SerialLink::getCurrentPorts()
QextPortInfo
portInfo
=
ports
.
at
(
i
);
QString
portString
=
QString
(
portInfo
.
portName
.
toLocal8Bit
().
constData
())
+
" - "
+
QString
(
ports
.
at
(
i
).
friendName
.
toLocal8Bit
().
constData
()).
split
(
"("
).
first
();
// Prepend newly found port to the list
ports
.
append
(
portString
);
this
->
ports
->
append
(
portString
);
}
//printf("port name: %s\n", ports.at(i).portName.toLocal8Bit().constData());
...
...
@@ -349,7 +349,7 @@ QVector<QString>* SerialLink::getCurrentPorts()
//printf("enumerator name: %s\n", ports.at(i).enumName.toLocal8Bit().constData());
//printf("===================================\n\n");
#endif
return
ports
;
return
this
->
ports
;
}
void
SerialLink
::
loadSettings
()
...
...
src/uas/QGCMAVLinkUASFactory.cc
View file @
d4616625
...
...
@@ -72,6 +72,7 @@ UASInterface* QGCMAVLinkUASFactory::createUAS(MAVLinkProtocol* mavlink, LinkInte
uas
=
mav
;
}
break
;
#ifdef QGC_USE_SENSESOAR_MESSAGES
case
MAV_AUTOPILOT_SENSESOAR
:
{
senseSoarMAV
*
mav
=
new
senseSoarMAV
(
mavlink
,
sysid
);
...
...
@@ -80,6 +81,7 @@ UASInterface* QGCMAVLinkUASFactory::createUAS(MAVLinkProtocol* mavlink, LinkInte
uas
=
mav
;
break
;
}
#endif
default:
{
UAS
*
mav
=
new
UAS
(
mavlink
,
sysid
);
...
...
src/uas/UASManager.cc
View file @
d4616625
...
...
@@ -248,8 +248,6 @@ UASManager::~UASManager()
foreach
(
UASInterface
*
mav
,
systems
)
{
delete
mav
;
}
this
->
quit
();
this
->
wait
();
}
void
UASManager
::
addUAS
(
UASInterface
*
uas
)
...
...
src/ui/MainWindow.cc
View file @
d4616625
...
...
@@ -1499,7 +1499,7 @@ QList<QAction*> MainWindow::listLinkMenuActions(void)
{
return
ui
.
menuNetwork
->
actions
();
}
/*
void MainWindow::buildSenseSoarWidgets()
{
if (!linechartWidget)
...
...
@@ -1603,3 +1603,4 @@ void MainWindow::arrangeSenseSoarCenterStack()
void MainWindow::connectSenseSoarActions()
{
}
*/
\ No newline at end of file
thirdParty/mavlink/message_definitions/SenseSoar.xml
View file @
d4616625
...
...
@@ -13,8 +13,8 @@
<message
id=
"170"
name=
"OBS_POSITION"
>
Position estimate of the observer in global frame
<field
type=
"int32_t"
name=
"lon"
>
Longitude expressed in 1E7
</field>
<field
type=
"int32_t"
name=
"lat"
>
Latitude expressed in 1E7
</field>
<field
type=
"int32_t"
name=
"alt"
>
Altitude expressed in milimeters
</field>
<field
type=
"int32_t"
name=
"lat"
>
Latitude expressed in 1E7
</field>
<field
type=
"int32_t"
name=
"alt"
>
Altitude expressed in milimeters
</field>
</message>
<message
id=
"172"
name=
"OBS_VELOCITY"
>
velocity estimate of the observer in NED inertial frame
...
...
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