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
fdedaa4e
Commit
fdedaa4e
authored
Sep 16, 2011
by
oberion
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Corrected Bug with a few UAS.h signals which where defined twice.
parent
c4d9885e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
11 deletions
+9
-11
UAS.h
src/uas/UAS.h
+3
-3
CommConfigurationWindow.cc
src/ui/CommConfigurationWindow.cc
+6
-8
No files found.
src/uas/UAS.h
View file @
fdedaa4e
...
...
@@ -388,16 +388,16 @@ public slots:
signals:
/** @brief The main/battery voltage has changed/was updated */
void
voltageChanged
(
int
uasId
,
double
voltage
);
//void voltageChanged(int uasId, double voltage); // Defined in UASInterface already
/** @brief An actuator value has changed */
void
actuatorChanged
(
UASInterface
*
,
int
actId
,
double
value
);
//void actuatorChanged(UASInterface*, int actId, double value); // Defined in UASInterface already
/** @brief An actuator value has changed */
void
actuatorChanged
(
UASInterface
*
uas
,
QString
actuatorName
,
double
min
,
double
max
,
double
value
);
void
motorChanged
(
UASInterface
*
uas
,
QString
motorName
,
double
min
,
double
max
,
double
value
);
/** @brief The system load (MCU/CPU usage) changed */
void
loadChanged
(
UASInterface
*
uas
,
double
load
);
/** @brief Propagate a heartbeat received from the system */
void
heartbeat
(
UASInterface
*
uas
);
//void heartbeat(UASInterface* uas); // Defined in UASInterface already
void
imageStarted
(
quint64
timestamp
);
/** @brief A new camera image has arrived */
void
imageReady
(
UASInterface
*
uas
);
...
...
src/ui/CommConfigurationWindow.cc
View file @
fdedaa4e
...
...
@@ -232,13 +232,6 @@ void CommConfigurationWindow::setLinkType(int linktype)
break
;
}
#endif // XBEELINK
case
0
:
{
SerialLink
*
serial
=
new
SerialLink
();
tmpLink
=
serial
;
MainWindow
::
instance
()
->
addLink
(
tmpLink
);
break
;
}
/* case 1:
{
UDPLink *udp = new UDPLink();
...
...
@@ -258,7 +251,12 @@ void CommConfigurationWindow::setLinkType(int linktype)
#endif // OPAL_RT
default:
{
MainWindow
::
instance
()
->
addLink
();
}
case
0
:
{
SerialLink
*
serial
=
new
SerialLink
();
tmpLink
=
serial
;
MainWindow
::
instance
()
->
addLink
(
tmpLink
);
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