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
0e364ebc
Commit
0e364ebc
authored
Mar 07, 2019
by
Stefan Dunca
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WIP: Enable mavlink dev console in expert mode for mobile devices
TODO: Improve the experience
parent
339cfeb5
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
7 deletions
+18
-7
qgroundcontrol.pro
qgroundcontrol.pro
+2
-2
MavlinkConsolePage.qml
src/AnalyzeView/MavlinkConsolePage.qml
+12
-1
QGCApplication.cc
src/QGCApplication.cc
+2
-2
MainWindowInner.qml
src/ui/MainWindowInner.qml
+1
-1
MainToolBar.qml
src/ui/toolbar/MainToolBar.qml
+1
-1
No files found.
qgroundcontrol.pro
View file @
0e364ebc
...
...
@@ -626,6 +626,7 @@ HEADERS += \
src
/
uas
/
UASInterface
.
h
\
src
/
uas
/
UASMessageHandler
.
h
\
src
/
UTM
.
h
\
src
/
AnalyzeView
/
MavlinkConsoleController
.
h
\
AndroidBuild
{
...
...
@@ -661,7 +662,6 @@ HEADERS += \
!
MobileBuild
{
HEADERS
+=
\
src
/
AnalyzeView
/
GeoTagController
.
h
\
src
/
AnalyzeView
/
MavlinkConsoleController
.
h
\
src
/
GPS
/
Drivers
/
src
/
gps_helper
.
h
\
src
/
GPS
/
Drivers
/
src
/
rtcm
.
h
\
src
/
GPS
/
Drivers
/
src
/
ashtech
.
h
\
...
...
@@ -828,6 +828,7 @@ SOURCES += \
src
/
uas
/
UAS
.
cc
\
src
/
uas
/
UASMessageHandler
.
cc
\
src
/
UTM
.
cpp
\
src
/
AnalyzeView
/
MavlinkConsoleController
.
cc
\
DebugBuild
{
SOURCES
+=
\
...
...
@@ -850,7 +851,6 @@ contains(DEFINES, QGC_ENABLE_BLUETOOTH) {
!
MobileBuild
{
SOURCES
+=
\
src
/
AnalyzeView
/
GeoTagController
.
cc
\
src
/
AnalyzeView
/
MavlinkConsoleController
.
cc
\
src
/
GPS
/
Drivers
/
src
/
gps_helper
.
cpp
\
src
/
GPS
/
Drivers
/
src
/
rtcm
.
cpp
\
src
/
GPS
/
Drivers
/
src
/
ashtech
.
cpp
\
...
...
src/AnalyzeView/MavlinkConsolePage.qml
View file @
0e364ebc
...
...
@@ -90,10 +90,13 @@ AnalyzePage {
id
:
command
Layout.fillWidth
:
true
placeholderText
:
"
Enter Commands here...
"
onAccepted
:
{
function
sendCommand
()
{
conController
.
sendCommand
(
text
)
text
=
""
}
onAccepted
:
sendCommand
()
Keys.onPressed
:
{
if
(
event
.
key
==
Qt
.
Key_Up
)
{
text
=
conController
.
historyUp
(
text
);
...
...
@@ -105,6 +108,14 @@ AnalyzePage {
}
}
QGCButton
{
id
:
sendButton
text
:
qsTr
(
"
Send
"
)
visible
:
ScreenTools
.
isMobile
onClicked
:
command
.
sendCommand
()
}
QGCButton
{
id
:
followTail
text
:
qsTr
(
"
Show Latest
"
)
...
...
src/QGCApplication.cc
View file @
0e364ebc
...
...
@@ -90,6 +90,7 @@
#include "ShapeFileHelper.h"
#include "QGCFileDownload.h"
#include "FirmwareImage.h"
#include "MavlinkConsoleController.h"
#ifndef NO_SERIAL_LINK
#include "SerialLink.h"
...
...
@@ -101,7 +102,6 @@
#include "FirmwareUpgradeController.h"
#include "MainWindow.h"
#include "GeoTagController.h"
#include "MavlinkConsoleController.h"
#include "GPS/GPSManager.h"
#endif
...
...
@@ -458,8 +458,8 @@ void QGCApplication::_initCommon(void)
qmlRegisterType
<
FirmwareUpgradeController
>
(
kQGCControllers
,
1
,
0
,
"FirmwareUpgradeController"
);
#endif
qmlRegisterType
<
GeoTagController
>
(
kQGCControllers
,
1
,
0
,
"GeoTagController"
);
qmlRegisterType
<
MavlinkConsoleController
>
(
kQGCControllers
,
1
,
0
,
"MavlinkConsoleController"
);
#endif
qmlRegisterType
<
MavlinkConsoleController
>
(
kQGCControllers
,
1
,
0
,
"MavlinkConsoleController"
);
// Register Qml Singletons
qmlRegisterSingletonType
<
QGroundControlQmlGlobal
>
(
"QGroundControl"
,
1
,
0
,
"QGroundControl"
,
qgroundcontrolQmlGlobalSingletonFactory
);
...
...
src/ui/MainWindowInner.qml
View file @
0e364ebc
...
...
@@ -38,7 +38,7 @@ Item {
readonly
property
string
_settingsViewSource
:
"
AppSettings.qml
"
readonly
property
string
_setupViewSource
:
"
SetupView.qml
"
readonly
property
string
_planViewSource
:
"
PlanView.qml
"
readonly
property
string
_analyzeViewSource
:
"
AnalyzeView
.qml
"
readonly
property
string
_analyzeViewSource
:
!
ScreenTools
.
isMobile
?
"
AnalyzeView.qml
"
:
"
MavlinkConsolePage
.qml
"
onHeightChanged
:
{
//-- We only deal with the available height if within the Fly or Plan view
...
...
src/ui/toolbar/MainToolBar.qml
View file @
0e364ebc
...
...
@@ -136,7 +136,7 @@ Rectangle {
anchors.bottom
:
parent
.
bottom
exclusiveGroup
:
mainActionGroup
source
:
"
/qmlimages/Analyze.svg
"
visible
:
!
ScreenTools
.
isMobile
&&
QGroundControl
.
corePlugin
.
showAdvancedUI
visible
:
QGroundControl
.
corePlugin
.
showAdvancedUI
onClicked
:
toolBar
.
showAnalyzeView
()
}
...
...
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