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
7f13132c
Commit
7f13132c
authored
Jun 28, 2013
by
Michael Carpenter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for erronious error message due to connecting a signal in the wrong order on SonarConfig
parent
4decb8d6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
BatteryMonitorConfig.cc
src/ui/configuration/BatteryMonitorConfig.cc
+3
-1
SonarConfig.cc
src/ui/configuration/SonarConfig.cc
+2
-3
No files found.
src/ui/configuration/BatteryMonitorConfig.cc
View file @
7f13132c
...
@@ -18,6 +18,8 @@ BatteryMonitorConfig::BatteryMonitorConfig(QWidget *parent) : AP2ConfigWidget(pa
...
@@ -18,6 +18,8 @@ BatteryMonitorConfig::BatteryMonitorConfig(QWidget *parent) : AP2ConfigWidget(pa
ui
.
apmVerComboBox
->
addItem
(
"1: APM2 - 2.5 non 3DR"
);
ui
.
apmVerComboBox
->
addItem
(
"1: APM2 - 2.5 non 3DR"
);
ui
.
apmVerComboBox
->
addItem
(
"2: APM2.5 - 3DR Power Module"
);
ui
.
apmVerComboBox
->
addItem
(
"2: APM2.5 - 3DR Power Module"
);
ui
.
apmVerComboBox
->
addItem
(
"3: PX4"
);
ui
.
apmVerComboBox
->
addItem
(
"3: PX4"
);
ui
.
alertOnLowCheckBox
->
setVisible
(
false
);
connect
(
ui
.
monitorComboBox
,
SIGNAL
(
currentIndexChanged
(
int
)),
this
,
SLOT
(
monitorCurrentIndexChanged
(
int
)));
connect
(
ui
.
monitorComboBox
,
SIGNAL
(
currentIndexChanged
(
int
)),
this
,
SLOT
(
monitorCurrentIndexChanged
(
int
)));
connect
(
ui
.
sensorComboBox
,
SIGNAL
(
currentIndexChanged
(
int
)),
this
,
SLOT
(
sensorCurrentIndexChanged
(
int
)));
connect
(
ui
.
sensorComboBox
,
SIGNAL
(
currentIndexChanged
(
int
)),
this
,
SLOT
(
sensorCurrentIndexChanged
(
int
)));
...
@@ -27,7 +29,7 @@ BatteryMonitorConfig::BatteryMonitorConfig(QWidget *parent) : AP2ConfigWidget(pa
...
@@ -27,7 +29,7 @@ BatteryMonitorConfig::BatteryMonitorConfig(QWidget *parent) : AP2ConfigWidget(pa
connect
(
ui
.
ampsPerVoltsLineEdit
,
SIGNAL
(
editingFinished
()),
this
,
SLOT
(
ampsPerVoltSet
()));
connect
(
ui
.
ampsPerVoltsLineEdit
,
SIGNAL
(
editingFinished
()),
this
,
SLOT
(
ampsPerVoltSet
()));
connect
(
ui
.
battCapacityLineEdit
,
SIGNAL
(
editingFinished
()),
this
,
SLOT
(
batteryCapacitySet
()));
connect
(
ui
.
battCapacityLineEdit
,
SIGNAL
(
editingFinished
()),
this
,
SLOT
(
batteryCapacitySet
()));
ui
.
alertOnLowCheckBox
->
setVisible
(
false
);
}
}
void
BatteryMonitorConfig
::
calcDividerSet
()
void
BatteryMonitorConfig
::
calcDividerSet
()
...
...
src/ui/configuration/SonarConfig.cc
View file @
7f13132c
...
@@ -4,13 +4,12 @@
...
@@ -4,13 +4,12 @@
SonarConfig
::
SonarConfig
(
QWidget
*
parent
)
:
AP2ConfigWidget
(
parent
)
SonarConfig
::
SonarConfig
(
QWidget
*
parent
)
:
AP2ConfigWidget
(
parent
)
{
{
ui
.
setupUi
(
this
);
ui
.
setupUi
(
this
);
connect
(
ui
.
enableCheckBox
,
SIGNAL
(
toggled
(
bool
)),
this
,
SLOT
(
checkBoxToggled
(
bool
)));
connect
(
ui
.
sonarTypeComboBox
,
SIGNAL
(
currentIndexChanged
(
int
)),
this
,
SLOT
(
sonarTypeChanged
(
int
)));
ui
.
sonarTypeComboBox
->
addItem
(
"XL-EZ0 / XL-EZ4"
);
ui
.
sonarTypeComboBox
->
addItem
(
"XL-EZ0 / XL-EZ4"
);
ui
.
sonarTypeComboBox
->
addItem
(
"LV-EZ0"
);
ui
.
sonarTypeComboBox
->
addItem
(
"LV-EZ0"
);
ui
.
sonarTypeComboBox
->
addItem
(
"XL-EZL0"
);
ui
.
sonarTypeComboBox
->
addItem
(
"XL-EZL0"
);
ui
.
sonarTypeComboBox
->
addItem
(
"HRLV"
);
ui
.
sonarTypeComboBox
->
addItem
(
"HRLV"
);
connect
(
ui
.
enableCheckBox
,
SIGNAL
(
toggled
(
bool
)),
this
,
SLOT
(
checkBoxToggled
(
bool
)));
connect
(
ui
.
sonarTypeComboBox
,
SIGNAL
(
currentIndexChanged
(
int
)),
this
,
SLOT
(
sonarTypeChanged
(
int
)));
}
}
SonarConfig
::~
SonarConfig
()
SonarConfig
::~
SonarConfig
()
...
...
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