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
6be09149
Commit
6be09149
authored
May 28, 2010
by
lm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed packet drop counting / handling
parent
c7c59937
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
19 deletions
+11
-19
UAS.cc
src/uas/UAS.cc
+2
-1
UASInterface.h
src/uas/UASInterface.h
+2
-3
MainWindow.cc
src/ui/MainWindow.cc
+1
-9
UASInfoWidget.cc
src/ui/uas/UASInfoWidget.cc
+2
-2
WatchdogControl.cc
src/ui/watchdog/WatchdogControl.cc
+2
-2
WatchdogControl.h
src/ui/watchdog/WatchdogControl.h
+2
-2
No files found.
src/uas/UAS.cc
View file @
6be09149
...
...
@@ -221,7 +221,8 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
}
// COMMUNICATIONS DROP RATE
emit
dropRateChanged
(
this
->
getUASID
(),
this
->
receiveDropRate
,
this
->
sendDropRate
);
emit
dropRateChanged
(
this
->
getUASID
(),
state
.
packet_drop
);
qDebug
()
<<
__FILE__
<<
__LINE__
<<
"RCV LOSS: "
<<
state
.
packet_drop
;
// AUDIO
if
(
modechanged
&&
statechanged
)
...
...
src/uas/UASInterface.h
View file @
6be09149
...
...
@@ -233,10 +233,9 @@ signals:
* @brief Drop rate of communication link updated
*
* @param systemId id of the air system
* @param receiveDrop drop rate of packets this MAV receives (send from GCS or other MAVs)
* @param sendDrop drop rate of packets this MAV sends (received on GCS)
* @param receiveDrop drop rate of packets this MAV receives (sent from GCS or other MAVs)
*/
void
dropRateChanged
(
int
systemId
,
float
receiveDrop
,
float
sendDrop
);
void
dropRateChanged
(
int
systemId
,
float
receiveDrop
);
/** @brief Robot mode has changed */
void
modeChanged
(
int
sysId
,
QString
status
,
QString
description
);
/** @brief A command has been issued **/
...
...
src/ui/MainWindow.cc
View file @
6be09149
...
...
@@ -166,7 +166,7 @@ settings()
adjustSize
();
//
connect
(
mavlink
,
SIGNAL
(
receiveLossChanged
(
float
)),
info
,
SLOT
(
update
Receive
Loss
(
float
)));
connect
(
mavlink
,
SIGNAL
(
receiveLossChanged
(
float
)),
info
,
SLOT
(
update
Send
Loss
(
float
)));
}
MainWindow
::~
MainWindow
()
...
...
@@ -377,7 +377,6 @@ void MainWindow::clearView()
void
MainWindow
::
loadPilotView
()
{
clearView
();
GAudioOutput
::
instance
()
->
say
(
"Switched to Pilot View"
);
// HEAD UP DISPLAY
centerStack
->
setCurrentWidget
(
hud
);
...
...
@@ -402,8 +401,6 @@ void MainWindow::loadOperatorView()
{
clearView
();
GAudioOutput
::
instance
()
->
say
(
"Switched to Operator View"
);
// MAP
centerStack
->
setCurrentWidget
(
map
);
...
...
@@ -448,8 +445,6 @@ void MainWindow::loadSettingsView()
{
clearView
();
GAudioOutput
::
instance
()
->
say
(
"Switched to Settings View"
);
// LINE CHART
linechart
->
setActive
(
true
);
centerStack
->
setCurrentWidget
(
linechart
);
...
...
@@ -472,8 +467,6 @@ void MainWindow::loadEngineerView()
clearView
();
// Engineer view, used in EMAV2009
GAudioOutput
::
instance
()
->
say
(
"Switched to Engineer View"
);
// LINE CHART
linechart
->
setActive
(
true
);
centerStack
->
setCurrentWidget
(
linechart
);
...
...
@@ -516,7 +509,6 @@ void MainWindow::loadMAVLinkView()
void
MainWindow
::
loadAllView
()
{
clearView
();
GAudioOutput
::
instance
()
->
say
(
"Loaded complete view"
);
QDockWidget
*
containerPFD
=
new
QDockWidget
(
tr
(
"Primary Flight Display"
),
this
);
containerPFD
->
setWidget
(
headDown1
);
...
...
src/ui/uas/UASInfoWidget.cc
View file @
6be09149
...
...
@@ -23,7 +23,7 @@ This file is part of the PIXHAWK project
/**
* @file
* @brief
Brief Description
* @brief
Implementation of class UASInfoWidget
*
* @author Lorenz Meier <mavteam@student.ethz.ch>
*
...
...
@@ -86,7 +86,7 @@ void UASInfoWidget::addUAS(UASInterface* uas)
if
(
uas
!=
NULL
)
{
connect
(
uas
,
SIGNAL
(
batteryChanged
(
UASInterface
*
,
double
,
double
,
int
)),
this
,
SLOT
(
updateBattery
(
UASInterface
*
,
double
,
double
,
int
)));
connect
(
uas
,
SIGNAL
(
dropRateChanged
(
int
,
float
,
float
)),
this
,
SLOT
(
updateDropRate
(
int
,
floa
t
,
float
)));
connect
(
uas
,
SIGNAL
(
dropRateChanged
(
int
,
float
)),
this
,
SLOT
(
updateReceiveLoss
(
in
t
,
float
)));
connect
(
uas
,
SIGNAL
(
loadChanged
(
UASInterface
*
,
double
)),
this
,
SLOT
(
updateCPULoad
(
UASInterface
*
,
double
)));
// Set this UAS as active if it is the first one
...
...
src/ui/watchdog/WatchdogControl.cc
View file @
6be09149
...
...
@@ -14,11 +14,11 @@ WatchdogControl::WatchdogControl(QWidget *parent) :
ui
->
setupUi
(
this
);
// UI is initialized, setup layout
listLayout
=
new
QVBoxLayout
(
m_ui
->
list
Widget
);
listLayout
=
new
QVBoxLayout
(
ui
->
main
Widget
);
listLayout
->
setSpacing
(
6
);
listLayout
->
setMargin
(
0
);
listLayout
->
setAlignment
(
Qt
::
AlignTop
);
m_ui
->
list
Widget
->
setLayout
(
listLayout
);
ui
->
main
Widget
->
setLayout
(
listLayout
);
connect
(
UASManager
::
instance
(),
SIGNAL
(
UASCreated
(
UASInterface
*
)),
this
,
SLOT
(
setUAS
(
UASInterface
*
)));
}
...
...
src/ui/watchdog/WatchdogControl.h
View file @
6be09149
...
...
@@ -5,7 +5,7 @@
#include <QWidget>
#include <QTimer>
#include <Q
H
BoxLayout>
#include <Q
V
BoxLayout>
#include <map>
#include <string>
...
...
@@ -115,7 +115,7 @@ protected:
void
changeEvent
(
QEvent
*
e
);
UASInterface
*
mav
;
Q
HBoxLayout
*
mainWidge
tLayout
;
Q
VBoxLayout
*
lis
tLayout
;
private:
Ui
::
WatchdogControl
*
ui
;
...
...
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