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
177f6583
Commit
177f6583
authored
Mar 23, 2016
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update to SiK radio naming
parent
368501b3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
FirmwareUpgradeController.cc
src/VehicleSetup/FirmwareUpgradeController.cc
+2
-2
PX4FirmwareUpgradeThread.cc
src/VehicleSetup/PX4FirmwareUpgradeThread.cc
+1
-1
LinkManager.cc
src/comm/LinkManager.cc
+2
-2
No files found.
src/VehicleSetup/FirmwareUpgradeController.cc
View file @
177f6583
...
...
@@ -147,7 +147,7 @@ void FirmwareUpgradeController::_foundBoard(bool firstAttempt, const QSerialPort
_foundBoardTypeName
=
"PX4 Flow"
;
_startFlashWhenBootloaderFound
=
false
;
break
;
case
QGCSerialPortInfo
:
:
BoardType
3dr
Radio
:
case
QGCSerialPortInfo
:
:
BoardType
Sik
Radio
:
_foundBoardTypeName
=
"SiK Radio"
;
if
(
!
firstAttempt
)
{
// Radio always flashes latest firmware, so we can start right away without
...
...
@@ -413,7 +413,7 @@ QHash<FirmwareUpgradeController::FirmwareIdentifier, QString>* FirmwareUpgradeCo
case
QGCSerialPortInfo
:
:
BoardTypePX4Flow
:
boardId
=
Bootloader
::
boardIDPX4Flow
;
break
;
case
QGCSerialPortInfo
:
:
BoardType
3dr
Radio
:
case
QGCSerialPortInfo
:
:
BoardType
Sik
Radio
:
boardId
=
Bootloader
::
boardID3DRRadio
;
break
;
case
QGCSerialPortInfo
:
:
BoardTypeUnknown
:
...
...
src/VehicleSetup/PX4FirmwareUpgradeThread.cc
View file @
177f6583
...
...
@@ -106,7 +106,7 @@ void PX4FirmwareUpgradeThreadWorker::_findBoardOnce(void)
_foundBoardPortInfo
=
portInfo
;
emit
foundBoard
(
_findBoardFirstAttempt
,
portInfo
,
boardType
);
if
(
!
_findBoardFirstAttempt
)
{
if
(
boardType
==
QGCSerialPortInfo
::
BoardType
3dr
Radio
)
{
if
(
boardType
==
QGCSerialPortInfo
::
BoardType
Sik
Radio
)
{
_3drRadioForceBootloader
(
portInfo
);
return
;
}
else
{
...
...
src/comm/LinkManager.cc
View file @
177f6583
...
...
@@ -536,7 +536,7 @@ void LinkManager::_updateAutoConnectLinks(void)
pSerialConfig
=
new
SerialConfiguration
(
QString
(
"PX4Flow on %1"
).
arg
(
portInfo
.
portName
().
trimmed
()));
}
break
;
case
QGCSerialPortInfo
:
:
BoardType
3dr
Radio
:
case
QGCSerialPortInfo
:
:
BoardType
Sik
Radio
:
if
(
_autoconnect3DRRadio
)
{
pSerialConfig
=
new
SerialConfiguration
(
QString
(
"SiK Radio on %1"
).
arg
(
portInfo
.
portName
().
trimmed
()));
}
...
...
@@ -548,7 +548,7 @@ void LinkManager::_updateAutoConnectLinks(void)
if
(
pSerialConfig
)
{
qCDebug
(
LinkManagerLog
)
<<
"New auto-connect port added: "
<<
pSerialConfig
->
name
()
<<
portInfo
.
systemLocation
();
pSerialConfig
->
setBaud
(
boardType
==
QGCSerialPortInfo
::
BoardType
3dr
Radio
?
57600
:
115200
);
pSerialConfig
->
setBaud
(
boardType
==
QGCSerialPortInfo
::
BoardType
Sik
Radio
?
57600
:
115200
);
pSerialConfig
->
setDynamic
(
true
);
pSerialConfig
->
setPortName
(
portInfo
.
systemLocation
());
_autoconnectConfigurations
.
append
(
pSerialConfig
);
...
...
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