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
e53b332e
Commit
e53b332e
authored
Oct 12, 2013
by
Jean Cyr
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bind support for DSMX with 8 or more channels
parent
ad3307bf
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
4 deletions
+19
-4
QGCPX4VehicleConfig.cc
src/ui/QGCPX4VehicleConfig.cc
+11
-3
QGCPX4VehicleConfig.ui
src/ui/QGCPX4VehicleConfig.ui
+8
-1
No files found.
src/ui/QGCPX4VehicleConfig.cc
View file @
e53b332e
...
...
@@ -335,7 +335,7 @@ void QGCPX4VehicleConfig::toggleCalibrationRC(bool enabled)
void
QGCPX4VehicleConfig
::
toggleSpektrumPairing
(
bool
enabled
)
{
if
(
!
ui
->
dsm2RadioButton
->
isChecked
()
&&
!
ui
->
dsmxRadioButton
)
{
if
(
!
ui
->
dsm2RadioButton
->
isChecked
()
&&
!
ui
->
dsmxRadioButton
&&
!
ui
->
dsmx8RadioButton
)
{
// Reject
QMessageBox
warnMsgBox
;
warnMsgBox
.
setText
(
tr
(
"Please select a Spektrum Protocol Version"
));
...
...
@@ -347,8 +347,16 @@ void QGCPX4VehicleConfig::toggleSpektrumPairing(bool enabled)
}
UASInterface
*
mav
=
UASManager
::
instance
()
->
getActiveUAS
();
if
(
mav
)
mav
->
pairRX
(
0
,
ui
->
dsmxRadioButton
->
isChecked
()
?
1
:
0
);
if
(
mav
)
{
int
rxSubType
;
if
(
ui
->
dsm2RadioButton
->
isChecked
())
rxSubType
=
0
;
else
if
(
ui
->
dsmxRadioButton
->
isChecked
())
rxSubType
=
1
;
else
// if (ui->dsmx8RadioButton->isChecked())
rxSubType
=
2
;
mav
->
pairRX
(
0
,
rxSubType
);
}
}
void
QGCPX4VehicleConfig
::
setTrimPositions
()
...
...
src/ui/QGCPX4VehicleConfig.ui
View file @
e53b332e
...
...
@@ -237,7 +237,14 @@
<item>
<widget
class=
"QRadioButton"
name=
"dsmxRadioButton"
>
<property
name=
"text"
>
<string>
DSMX Mode
</string>
<string>
DSMX Mode (3 to 7 channels)
</string>
</property>
</widget>
</item>
<item>
<widget
class=
"QRadioButton"
name=
"dsmx8RadioButton"
>
<property
name=
"text"
>
<string>
DSMX Mode (8 or more channels)
</string>
</property>
</widget>
</item>
...
...
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