From a16a5f81ddd57167eb7c8d47181fca7888c39ce4 Mon Sep 17 00:00:00 2001 From: Pritam Ghanghas Date: Sat, 26 Sep 2015 07:18:50 +0530 Subject: [PATCH] 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 --- src/SerialPortIds.h | 2 -- src/VehicleSetup/FirmwareUpgradeController.cc | 2 +- src/VehicleSetup/PX4FirmwareUpgradeThread.cc | 4 +--- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/SerialPortIds.h b/src/SerialPortIds.h index 22dc3a120..f08ed5d9e 100644 --- a/src/SerialPortIds.h +++ b/src/SerialPortIds.h @@ -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 diff --git a/src/VehicleSetup/FirmwareUpgradeController.cc b/src/VehicleSetup/FirmwareUpgradeController.cc index 3adb9db29..7085ef29c 100644 --- a/src/VehicleSetup/FirmwareUpgradeController.cc +++ b/src/VehicleSetup/FirmwareUpgradeController.cc @@ -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 diff --git a/src/VehicleSetup/PX4FirmwareUpgradeThread.cc b/src/VehicleSetup/PX4FirmwareUpgradeThread.cc index a3ad023f8..177bbf0f2 100644 --- a/src/VehicleSetup/PX4FirmwareUpgradeThread.cc +++ b/src/VehicleSetup/PX4FirmwareUpgradeThread.cc @@ -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; -- 2.22.0