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
da15b657
Commit
da15b657
authored
Mar 02, 2011
by
Mariano Lizarraga
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added Line Chart and Google Earth to Slugs build process. Added HIL naming of mode Test3
parent
bf89851b
Changes
9
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
2773 additions
and
2751 deletions
+2773
-2751
UDPLink.cc
src/comm/UDPLink.cc
+1
-1
SlugsMAV.h
src/uas/SlugsMAV.h
+2
-2
UAS.cc
src/uas/UAS.cc
+6
-0
MainWindow.cc
src/ui/MainWindow.cc
+13
-0
SlugsDataSensorView.ui
src/ui/SlugsDataSensorView.ui
+2741
-2741
SlugsPIDControl.cpp
src/ui/SlugsPIDControl.cpp
+3
-3
SlugsPIDControl.h
src/ui/SlugsPIDControl.h
+1
-1
Linecharts.cc
src/ui/linechart/Linecharts.cc
+1
-2
UASControlWidget.cc
src/ui/uas/UASControlWidget.cc
+5
-1
No files found.
src/comm/UDPLink.cc
View file @
da15b657
...
...
@@ -123,7 +123,7 @@ void UDPLink::writeBytes(const char* data, qint64 size)
unsigned
char
v
=
data
[
i
];
qDebug
(
"%02x "
,
v
);
}
qDebug
(
"
\n
"
)
;
qDebug
(
)
<<
"Sent to "
<<
currentHost
.
toString
()
<<
":"
<<
currentPort
;
socket
->
writeDatagram
(
data
,
size
,
currentHost
,
currentPort
);
}
...
...
src/uas/SlugsMAV.h
View file @
da15b657
...
...
@@ -99,13 +99,13 @@ protected:
mavlink_diagnostic_t
mlDiagnosticData
;
mavlink_pilot_console_t
mlPilotConsoleData
;
mavlink_filtered_data_t
mlFilteredData
;
mavlink_boot_t
mlBoot
;
mavlink_boot_t
mlBoot
;
mavlink_gps_date_time_t
mlGpsDateTime
;
mavlink_mid_lvl_cmds_t
mlMidLevelCommands
;
mavlink_set_mode_t
mlApMode
;
mavlink_pwm_commands_t
mlPwmCommands
;
mavlink_pid_values_t
mlPidValues
;
mavlink_pid_t
mlSinglePid
;
mavlink_pid_t
mlSinglePid
;
mavlink_slugs_navigation_t
mlNavigation
;
mavlink_data_log_t
mlDataLog
;
...
...
src/uas/UAS.cc
View file @
da15b657
...
...
@@ -300,9 +300,15 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
case
(
uint8_t
)
MAV_MODE_TEST2
:
mode
=
"TEST2 MODE"
;
break
;
#ifdef MAVLINK_ENABLED_SLUGS
case
(
uint8_t
)
MAV_MODE_TEST3
:
mode
=
"HIL MODE"
;
break
;
#else
case
(
uint8_t
)
MAV_MODE_TEST3
:
mode
=
"TEST3 MODE"
;
break
;
#endif
case
(
uint8_t
)
MAV_MODE_RC_TRAINING
:
mode
=
"RC TRAINING MODE"
;
break
;
...
...
src/ui/MainWindow.cc
View file @
da15b657
...
...
@@ -592,6 +592,15 @@ void MainWindow::buildSlugsWidgets()
addToToolsMenu
(
rcViewDockWidget
,
tr
(
"Radio Control"
),
SLOT
(
showToolWidget
(
bool
)),
MENU_RC_VIEW
,
Qt
::
BottomDockWidgetArea
);
}
#if (defined _MSC_VER) | (defined Q_OS_MAC)
if
(
!
gEarthWidget
)
{
gEarthWidget
=
new
QGCGoogleEarthView
(
this
);
addToCentralWidgetsMenu
(
gEarthWidget
,
tr
(
"Google Earth"
),
SLOT
(
showCentralWidget
()),
CENTRAL_GOOGLE_EARTH
);
}
#endif
if
(
!
slugsDataWidget
)
{
// Dialog widgets
...
...
@@ -1115,6 +1124,10 @@ void MainWindow::arrangeSlugsCenterStack()
if
(
linechartWidget
&&
(
centerStack
->
indexOf
(
linechartWidget
)
==
-
1
))
centerStack
->
addWidget
(
linechartWidget
);
if
(
hudWidget
&&
(
centerStack
->
indexOf
(
hudWidget
)
==
-
1
))
centerStack
->
addWidget
(
hudWidget
);
#if (defined _MSC_VER) | (defined Q_OS_MAC)
if
(
gEarthWidget
&&
(
centerStack
->
indexOf
(
gEarthWidget
)
==
-
1
))
centerStack
->
addWidget
(
gEarthWidget
);
#endif
}
void
MainWindow
::
loadSettings
()
...
...
src/ui/SlugsDataSensorView.ui
View file @
da15b657
This diff is collapsed.
Click to expand it.
src/ui/SlugsPIDControl.cpp
View file @
da15b657
...
...
@@ -23,7 +23,7 @@ SlugsPIDControl::SlugsPIDControl(QWidget *parent) :
setGreenColorStyle
();
refreshTimerGet
=
new
QTimer
(
this
);
refreshTimerGet
->
setInterval
(
200
);
//100); //
10
Hz
refreshTimerGet
->
setInterval
(
200
);
//100); //
5
Hz
connect
(
refreshTimerGet
,
SIGNAL
(
timeout
()),
this
,
SLOT
(
slugsGetGeneral
()));
...
...
@@ -51,7 +51,7 @@ void SlugsPIDControl::activeUasSet(UASInterface* uas)
if
(
slugsMav
)
{
connect
(
slugsMav
,
SIGNAL
(
slugsActionAck
(
int
,
const
mavlink_action_ack_t
&
)),
this
,
SLOT
(
rec
ibeMensaj
e
(
int
,
mavlink_action_ack_t
)));
connect
(
slugsMav
,
SIGNAL
(
slugsActionAck
(
int
,
const
mavlink_action_ack_t
&
)),
this
,
SLOT
(
rec
eiveMessag
e
(
int
,
mavlink_action_ack_t
)));
connect
(
slugsMav
,
SIGNAL
(
slugsPidValues
(
int
,
mavlink_pid_t
)),
this
,
SLOT
(
receivePidValues
(
int
,
mavlink_pid_t
))
);
connect
(
ui
->
setGeneral_pushButton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
slugsTimerStartSet
()));
...
...
@@ -504,7 +504,7 @@ void SlugsPIDControl::get_Pitch2dT_PID()
#ifdef MAVLINK_ENABLED_SLUGS
void
SlugsPIDControl
::
rec
ibeMensaj
e
(
int
systemId
,
const
mavlink_action_ack_t
&
action
)
void
SlugsPIDControl
::
rec
eiveMessag
e
(
int
systemId
,
const
mavlink_action_ack_t
&
action
)
{
Q_UNUSED
(
systemId
);
ui
->
recepcion_label
->
setText
(
QString
::
number
(
action
.
action
)
+
":"
+
QString
::
number
(
action
.
result
));
...
...
src/ui/SlugsPIDControl.h
View file @
da15b657
...
...
@@ -257,7 +257,7 @@ public slots:
// void createMessagePID();
#ifdef MAVLINK_ENABLED_SLUGS
void
rec
ibeMensaj
e
(
int
systemId
,
const
mavlink_action_ack_t
&
action
);
void
rec
eiveMessag
e
(
int
systemId
,
const
mavlink_action_ack_t
&
action
);
void
receivePidValues
(
int
systemId
,
const
mavlink_pid_t
&
pidValues
);
#endif // MAVLINK_ENABLED_SLUG
...
...
src/ui/linechart/Linecharts.cc
View file @
da15b657
...
...
@@ -95,14 +95,13 @@ void Linecharts::addSystem(UASInterface* uas)
LinechartWidget
*
widget
=
new
LinechartWidget
(
uas
->
getUASID
(),
this
);
addWidget
(
widget
);
plots
.
insert
(
uas
->
getUASID
(),
widget
);
#ifndef MAVLINK_ENABLED_SLUGS
// Values without unit
//connect(uas, SIGNAL(valueChanged(int,QString,double,quint64)), widget, SLOT(appendData(int,QString,double,quint64)));
// Values with unit as double
connect
(
uas
,
SIGNAL
(
valueChanged
(
int
,
QString
,
QString
,
double
,
quint64
)),
widget
,
SLOT
(
appendData
(
int
,
QString
,
QString
,
double
,
quint64
)));
// Values with unit as integer
connect
(
uas
,
SIGNAL
(
valueChanged
(
int
,
QString
,
QString
,
int
,
quint64
)),
widget
,
SLOT
(
appendData
(
int
,
QString
,
QString
,
int
,
quint64
)));
#endif
connect
(
widget
,
SIGNAL
(
logfileWritten
(
QString
)),
this
,
SIGNAL
(
logfileWritten
(
QString
)));
// Set system active if this is the only system
if
(
active
)
...
...
src/ui/uas/UASControlWidget.cc
View file @
da15b657
...
...
@@ -49,7 +49,11 @@ This file is part of the PIXHAWK project
#define CONTROL_MODE_AUTO "MODE AUTO"
#define CONTROL_MODE_TEST1 "MODE TEST1"
#define CONTROL_MODE_TEST2 "MODE TEST2"
#define CONTROL_MODE_TEST3 "MODE TEST3"
#ifdef MAVLINK_ENABLED_SLUGS
#define CONTROL_MODE_TEST3 "MODE HIL"
#else
#define CONTROL_MODE_TEST3 "MODE TEST3"
#endif
#define CONTROL_MODE_READY "MODE TEST3"
#define CONTROL_MODE_RC_TRAINING "RC SIMULATION"
...
...
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