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
7a8d574e
Commit
7a8d574e
authored
Aug 22, 2015
by
Don Gagne
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1786 from mavlink/dronelink
Remove reference to defunct droneos service
parents
1550501f
d3d333d0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
MAVLinkSettingsWidget.cc
src/ui/MAVLinkSettingsWidget.cc
+2
-2
MAVLinkSettingsWidget.ui
src/ui/MAVLinkSettingsWidget.ui
+3
-3
No files found.
src/ui/MAVLinkSettingsWidget.cc
View file @
7a8d574e
...
@@ -48,7 +48,7 @@ MAVLinkSettingsWidget::MAVLinkSettingsWidget(MAVLinkProtocol* protocol, QWidget
...
@@ -48,7 +48,7 @@ MAVLinkSettingsWidget::MAVLinkSettingsWidget(MAVLinkProtocol* protocol, QWidget
// AUTH
// AUTH
m_ui
->
droneOSCheckBox
->
setChecked
(
protocol
->
getAuthEnabled
());
m_ui
->
droneOSCheckBox
->
setChecked
(
protocol
->
getAuthEnabled
());
QSettings
settings
;
QSettings
settings
;
m_ui
->
droneOSComboBox
->
setCurrentIndex
(
m_ui
->
droneOSComboBox
->
findText
(
settings
.
value
(
"DRONE
OS_HOST"
,
"droneos.com
:14555"
).
toString
()));
m_ui
->
droneOSComboBox
->
setCurrentIndex
(
m_ui
->
droneOSComboBox
->
findText
(
settings
.
value
(
"DRONE
LINK_HOST"
,
"dronelink.io
:14555"
).
toString
()));
m_ui
->
droneOSLineEdit
->
setText
(
protocol
->
getAuthKey
());
m_ui
->
droneOSLineEdit
->
setText
(
protocol
->
getAuthKey
());
// Initialize state
// Initialize state
...
@@ -169,7 +169,7 @@ void MAVLinkSettingsWidget::enableDroneOS(bool enable)
...
@@ -169,7 +169,7 @@ void MAVLinkSettingsWidget::enableDroneOS(bool enable)
// Set key
// Set key
protocol
->
setAuthKey
(
m_ui
->
droneOSLineEdit
->
text
().
trimmed
());
protocol
->
setAuthKey
(
m_ui
->
droneOSLineEdit
->
text
().
trimmed
());
QSettings
settings
;
QSettings
settings
;
settings
.
setValue
(
"DRONE
OS
_HOST"
,
m_ui
->
droneOSComboBox
->
currentText
());
settings
.
setValue
(
"DRONE
LINK
_HOST"
,
m_ui
->
droneOSComboBox
->
currentText
());
}
}
protocol
->
enableAuth
(
enable
);
protocol
->
enableAuth
(
enable
);
}
}
...
...
src/ui/MAVLinkSettingsWidget.ui
View file @
7a8d574e
...
@@ -146,7 +146,7 @@
...
@@ -146,7 +146,7 @@
</property>
</property>
<item>
<item>
<property
name=
"text"
>
<property
name=
"text"
>
<string>
mavlink.droneos.com
:14555
</string>
<string>
dronelink.io
:14555
</string>
</property>
</property>
</item>
</item>
<item>
<item>
...
@@ -236,7 +236,7 @@
...
@@ -236,7 +236,7 @@
<item
row=
"15"
column=
"0"
colspan=
"3"
>
<item
row=
"15"
column=
"0"
colspan=
"3"
>
<widget
class=
"QCheckBox"
name=
"droneOSCheckBox"
>
<widget
class=
"QCheckBox"
name=
"droneOSCheckBox"
>
<property
name=
"text"
>
<property
name=
"text"
>
<string>
Forward MAVLink packets of all links to
http://droneos.com
</string>
<string>
Forward MAVLink packets of all links to
the host below
</string>
</property>
</property>
</widget>
</widget>
</item>
</item>
...
@@ -280,7 +280,7 @@
...
@@ -280,7 +280,7 @@
<item
row=
"16"
column=
"1"
colspan=
"2"
>
<item
row=
"16"
column=
"1"
colspan=
"2"
>
<widget
class=
"QLineEdit"
name=
"droneOSLineEdit"
>
<widget
class=
"QLineEdit"
name=
"droneOSLineEdit"
>
<property
name=
"text"
>
<property
name=
"text"
>
<string>
Enter your
DroneOS API Token/Key
</string>
<string>
Enter your
authentication token
</string>
</property>
</property>
<property
name=
"maxLength"
>
<property
name=
"maxLength"
>
<number>
32
</number>
<number>
32
</number>
...
...
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