Browse Source

removed clone ids again for the fear of corrupting some other cp21xx device by mistake

also moved back to flashing stable firmware for 3dr radio
QGC4.4
Pritam Ghanghas 10 years ago
parent
commit
a16a5f81dd
  1. 2
      src/SerialPortIds.h
  2. 2
      src/VehicleSetup/FirmwareUpgradeController.cc
  3. 4
      src/VehicleSetup/PX4FirmwareUpgradeThread.cc

2
src/SerialPortIds.h

@ -39,9 +39,7 @@ public: @@ -39,9 +39,7 @@ 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

2
src/VehicleSetup/FirmwareUpgradeController.cc

@ -265,7 +265,7 @@ void FirmwareUpgradeController::_initFirmwareHash() @@ -265,7 +265,7 @@ void FirmwareUpgradeController::_initFirmwareHash()
/////////////////////////////// 3dr radio firmwares ///////////////////////////////////////
FirmwareToUrlElement_t rg3DRRadioFirmwareArray[] = {
{ ThreeDRRadio, StableFirmware, DefaultVehicleFirmware, "http://firmware.diydrones.com/SiK/beta/radio~hm_trp.ihx"}
{ ThreeDRRadio, StableFirmware, DefaultVehicleFirmware, "http://firmware.diydrones.com/SiK/stable/radio~hm_trp.ihx"}
};
// populate hashes now

4
src/VehicleSetup/PX4FirmwareUpgradeThread.cc

@ -165,9 +165,7 @@ bool PX4FirmwareUpgradeThreadWorker::_findBoardFromPorts(QSerialPortInfo& portIn @@ -165,9 +165,7 @@ bool PX4FirmwareUpgradeThreadWorker::_findBoardFromPorts(QSerialPortInfo& portIn
}
break;
case SerialPortIds::threeDRRadioVendorId:
case SerialPortIds::cloneThreeDRRadioVendorId:
if (info.productIdentifier() == SerialPortIds::threeDRRadioProductId ||
info.productIdentifier() == SerialPortIds::cloneThreeDRRadioProductId) {
if (info.productIdentifier() == SerialPortIds::threeDRRadioProductId) {
qCDebug(FirmwareUpgradeLog) << "Found 3DR Radio";
type = FoundBoard3drRadio;
found = true;

Loading…
Cancel
Save