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
00e02c01
Commit
00e02c01
authored
Sep 26, 2015
by
Pritam Ghanghas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix the broken 3DR radio flashing. My carelessness when I introduced APM firmware update
Also enable identification of clone 3dr radios
parent
fb48b351
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
4 deletions
+8
-4
SerialPortIds.h
src/SerialPortIds.h
+2
-0
FirmwareUpgradeController.cc
src/VehicleSetup/FirmwareUpgradeController.cc
+2
-2
FirmwareUpgradeController.h
src/VehicleSetup/FirmwareUpgradeController.h
+1
-1
PX4FirmwareUpgradeThread.cc
src/VehicleSetup/PX4FirmwareUpgradeThread.cc
+3
-1
No files found.
src/SerialPortIds.h
View file @
00e02c01
...
...
@@ -39,7 +39,9 @@ public:
static
const
int
px4FlowProductId
=
21
;
///< Product ID for PX4 Flow board
static
const
int
threeDRRadioVendorId
=
1027
;
///< Vendor ID for 3DR Radio
static
const
int
cloneThreeDRRadioVendorId
=
4292
;
///< Vendor ID found on clone 3DR Radio
static
const
int
threeDRRadioProductId
=
24597
;
///< Product ID for 3DR Radio
static
const
int
cloneThreeDRRadioProductId
=
60000
;
///< Product ID found on clone 3DR Radio
};
#endif
src/VehicleSetup/FirmwareUpgradeController.cc
View file @
00e02c01
...
...
@@ -131,7 +131,7 @@ void FirmwareUpgradeController::_foundBoard(bool firstAttempt, const QSerialPort
// Radio always flashes latest firmware, so we can start right away without
// any further user input.
_startFlashWhenBootloaderFound
=
true
;
_startFlashWhenBootloaderFoundFirmwareIdentity
=
FirmwareIdentifier
(
PX4
Radio
,
_startFlashWhenBootloaderFoundFirmwareIdentity
=
FirmwareIdentifier
(
ThreeDR
Radio
,
StableFirmware
,
DefaultVehicleFirmware
);
}
...
...
@@ -265,7 +265,7 @@ void FirmwareUpgradeController::_initFirmwareHash()
/////////////////////////////// 3dr radio firmwares ///////////////////////////////////////
FirmwareToUrlElement_t
rg3DRRadioFirmwareArray
[]
=
{
{
PX4Flow
,
StableFirmware
,
DefaultVehicleFirmware
,
"http://firmware.diydrones.com/SiK/latest
/radio~hm_trp.ihx"
}
{
ThreeDRRadio
,
StableFirmware
,
DefaultVehicleFirmware
,
"http://firmware.diydrones.com/SiK/beta
/radio~hm_trp.ihx"
}
};
// populate hashes now
...
...
src/VehicleSetup/FirmwareUpgradeController.h
View file @
00e02c01
...
...
@@ -55,7 +55,7 @@ public:
AutoPilotStackPX4
,
AutoPilotStackAPM
,
PX4Flow
,
PX4
Radio
ThreeDR
Radio
}
AutoPilotStackType_t
;
typedef
enum
{
...
...
src/VehicleSetup/PX4FirmwareUpgradeThread.cc
View file @
00e02c01
...
...
@@ -165,7 +165,9 @@ bool PX4FirmwareUpgradeThreadWorker::_findBoardFromPorts(QSerialPortInfo& portIn
}
break
;
case
SerialPortIds
:
:
threeDRRadioVendorId
:
if
(
info
.
productIdentifier
()
==
SerialPortIds
::
threeDRRadioProductId
)
{
case
SerialPortIds
:
:
cloneThreeDRRadioVendorId
:
if
(
info
.
productIdentifier
()
==
SerialPortIds
::
threeDRRadioProductId
||
info
.
productIdentifier
()
==
SerialPortIds
::
cloneThreeDRRadioProductId
)
{
qCDebug
(
FirmwareUpgradeLog
)
<<
"Found 3DR Radio"
;
type
=
FoundBoard3drRadio
;
found
=
true
;
...
...
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