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
6507190a
Commit
6507190a
authored
Nov 01, 2014
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use org/appname from QApplication for Settings
parent
ef726502
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
SerialLink.cc
src/comm/SerialLink.cc
+2
-2
terminalconsole.cpp
src/ui/configuration/terminalconsole.cpp
+2
-2
No files found.
src/comm/SerialLink.cc
View file @
6507190a
...
...
@@ -139,7 +139,7 @@ bool SerialLink::isBootloader()
void
SerialLink
::
loadSettings
()
{
// Load defaults from settings
QSettings
settings
(
QGC
::
ORG_NAME
,
QGC
::
APPNAME
)
;
QSettings
settings
;
settings
.
sync
();
if
(
settings
.
contains
(
"SERIALLINK_COMM_PORT"
))
{
...
...
@@ -157,7 +157,7 @@ void SerialLink::loadSettings()
void
SerialLink
::
writeSettings
()
{
// Store settings
QSettings
settings
(
QGC
::
ORG_NAME
,
QGC
::
APPNAME
)
;
QSettings
settings
;
settings
.
setValue
(
"SERIALLINK_COMM_PORT"
,
getPortName
());
settings
.
setValue
(
"SERIALLINK_COMM_BAUD"
,
getBaudRateType
());
settings
.
setValue
(
"SERIALLINK_COMM_PARITY"
,
getParityType
());
...
...
src/ui/configuration/terminalconsole.cpp
View file @
6507190a
...
...
@@ -266,7 +266,7 @@ void TerminalConsole::setLink(int index)
void
TerminalConsole
::
loadSettings
()
{
// Load defaults from settings
QSettings
settings
(
QGC
::
ORG_NAME
,
QGC
::
APPNAME
)
;
QSettings
settings
;
settings
.
sync
();
if
(
settings
.
contains
(
"TERMINALCONSOLE_COMM_PORT"
))
{
...
...
@@ -288,7 +288,7 @@ void TerminalConsole::loadSettings()
void
TerminalConsole
::
writeSettings
()
{
// Store settings
QSettings
settings
(
QGC
::
ORG_NAME
,
QGC
::
APPNAME
)
;
QSettings
settings
;
settings
.
setValue
(
"TERMINALCONSOLE_COMM_PORT"
,
m_settings
.
name
);
settings
.
setValue
(
"TERMINALCONSOLE_COMM_BAUD"
,
m_settings
.
baudRate
);
settings
.
setValue
(
"TERMINALCONSOLE_COMM_PARITY"
,
m_settings
.
parity
);
...
...
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