Skip to content

Q
qgroundcontrol
Commit d8fc28aa authored by Gus Grubba's avatar Gus Grubba
Browse files
Options

Merge branch 'master' of https://github.com/mavlink/qgroundcontrol into joystickMakeOver

parents 8bc4fc43 620f8911
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 161 additions and 4 deletions
src/AutoPilotPlugins/APM/APMPowerComponent.qml
View file @ d8fc28aa
......@@ -124,6 +124,7 @@ SetupPage {
property Fact armVoltMin: controller.getParameterFact(-1, "r.BATT_ARM_VOLT", false /* reportMissing */)
property Fact battAmpPerVolt: controller.getParameterFact(-1, "r.BATT_AMP_PERVLT", false /* reportMissing */)
property Fact battAmpOffset: controller.getParameterFact(-1, "BATT_AMP_OFFSET", false /* reportMissing */)
property Fact battCapacity: controller.getParameterFact(-1, "BATT_CAPACITY", false /* reportMissing */)
property Fact battCurrPin: controller.getParameterFact(-1, "BATT_CURR_PIN", false /* reportMissing */)
property Fact battMonitor: controller.getParameterFact(-1, "BATT_MONITOR", false /* reportMissing */)
......@@ -208,6 +209,7 @@ SetupPage {
property Fact armVoltMin: controller.getParameterFact(-1, "r.BATT2_ARM_VOLT", false /* reportMissing */)
property Fact battAmpPerVolt: controller.getParameterFact(-1, "r.BATT2_AMP_PERVLT", false /* reportMissing */)
property Fact battAmpOffset: controller.getParameterFact(-1, "BATT2_AMP_OFFSET", false /* reportMissing */)
property Fact battCapacity: controller.getParameterFact(-1, "BATT2_CAPACITY", false /* reportMissing */)
property Fact battCurrPin: controller.getParameterFact(-1, "BATT2_CURR_PIN", false /* reportMissing */)
property Fact battMonitor: controller.getParameterFact(-1, "BATT2_MONITOR", false /* reportMissing */)
......@@ -293,7 +295,8 @@ SetupPage {
if (sensorModel.get(i).voltPin == battVoltPin.value &&
sensorModel.get(i).currPin == battCurrPin.value &&
Math.abs(sensorModel.get(i).voltMult - battVoltMult.value) < 0.001 &&
Math.abs(sensorModel.get(i).ampPerVolt - battAmpPerVolt.value) < 0.0001) {
Math.abs(sensorModel.get(i).ampPerVolt - battAmpPerVolt.value) < 0.0001 &&
Math.abs(sensorModel.get(i).ampOffset - battAmpOffset.value) < 0.0001) {
sensorCombo.currentIndex = i
return
}
......@@ -312,6 +315,7 @@ SetupPage {
currPin: 3
voltMult: 10.1
ampPerVolt: 17.0
ampOffset: 0
}
ListElement {
......@@ -320,6 +324,7 @@ SetupPage {
currPin: 3
voltMult: 12.02
ampPerVolt: 39.877
ampOffset: 0
}
ListElement {
......@@ -328,6 +333,16 @@ SetupPage {
currPin: 3
voltMult: 12.02
ampPerVolt: 17.0
ampOffset: 0
}
ListElement {
text: qsTr("Blue Robotics Power Sense Module R2")
voltPin: 2
currPin: 3
voltMult: 11.000
ampPerVolt: 37.8788
ampOffset: 0.330
}
ListElement {
......@@ -390,6 +405,7 @@ SetupPage {
battCurrPin.value = sensorModel.get(index).currPin
battVoltMult.value = sensorModel.get(index).voltMult
battAmpPerVolt.value = sensorModel.get(index).ampPerVolt
battAmpOffset.value = sensorModel.get(index).ampOffset
} else {
}
......@@ -488,6 +504,27 @@ SetupPage {
text: qsTr("If the current draw reported by the vehicle is largely different than the current read externally using a current meter you can adjust the amps per volt value to correct this. Click the Calculate button for help with calculating a new value.")
visible: _showAdvanced
}
QGCLabel {
text: qsTr("Amps Offset:")
visible: _showAdvanced
}
FactTextField {
width: _fieldWidth
fact: battAmpOffset
visible: _showAdvanced
}
QGCLabel {
Layout.columnSpan: 3
Layout.fillWidth: true
font.pointSize: ScreenTools.smallFontPointSize
wrapMode: Text.WordWrap
text: qsTr("If the vehicle reports a high current read when there is little or no current going through it, adjust the Amps Offset. It should be equal to the voltage reported by the sensor when the current is zero.")
visible: _showAdvanced
}
} // GridLayout
} // Column
} // Component - powerSetupComponent
......
src/VehicleSetup/Bootloader.h
View file @ d8fc28aa
......@@ -75,7 +75,8 @@ public:
static const int boardIDASCV1 = 65; ///< ASC V1 board, as from USB PID
static const int boardIDCrazyflie2 = 12; ///< Crazyflie 2.0 board, as from USB PID
static const int boardIDOmnibusF4SD = 42; ///< Omnibus F4 SD, as from USB PID
static const int boardIDFMUK66V3 = 28; ///< FMUK66V3 board, as from USB PID
static const int boardIDFMUK66V3 = 28; ///< FMUK66V3 board, as from USB PID
static const int boardIDKakuteF7 = 123; ///< Holybro KakuteF7 board, as from USB PID
/// Simulated board id for V3 which is a V2 board which supports larger flash space
/// IMPORTANT: Make sure this id does not conflict with any newly added real board ids
......
src/VehicleSetup/FirmwareUpgradeController.cc
View file @ d8fc28aa
......@@ -298,11 +298,19 @@ void FirmwareUpgradeController::_initFirmwareHash()
{ AutoPilotStackPX4, DeveloperFirmware, DefaultVehicleFirmware, "http://px4-travis.s3.amazonaws.com/Firmware/master/crazyflie_default.px4"},
};
//////////////////////////////////// Omnibus F4 SD firmwares //////////////////////////////////////////////////
FirmwareToUrlElement_t rgOmnibusF4SDFirmwareArray[] = {
{ AutoPilotStackPX4, StableFirmware, DefaultVehicleFirmware, "http://px4-travis.s3.amazonaws.com/Firmware/stable/omnibus_f4sd_default.px4"},
{ AutoPilotStackPX4, BetaFirmware, DefaultVehicleFirmware, "http://px4-travis.s3.amazonaws.com/Firmware/beta/omnibus_f4sd_default.px4"},
{ AutoPilotStackPX4, DeveloperFirmware, DefaultVehicleFirmware, "http://px4-travis.s3.amazonaws.com/Firmware/master/omnibus_f4sd_default.px4"},
};
//////////////////////////////////// Kakute F7 firmwares //////////////////////////////////////////////////
FirmwareToUrlElement_t rgKakuteF7FirmwareArray[] = {
{ AutoPilotStackPX4, StableFirmware, DefaultVehicleFirmware, "http://px4-travis.s3.amazonaws.com/Firmware/stable/holybro_kakutef7_default.px4"},
{ AutoPilotStackPX4, BetaFirmware, DefaultVehicleFirmware, "http://px4-travis.s3.amazonaws.com/Firmware/beta/holybro_kakutef7_default.px4"},
{ AutoPilotStackPX4, DeveloperFirmware, DefaultVehicleFirmware, "http://px4-travis.s3.amazonaws.com/Firmware/master/holybro_kakutef7_default.px4"},
};
//////////////////////////////////// FMUK66V3 firmwares //////////////////////////////////////////////////
FirmwareToUrlElement_t rgFMUK66V3FirmwareArray[] = {
......@@ -392,6 +400,12 @@ void FirmwareUpgradeController::_initFirmwareHash()
_rgOmnibusF4SDFirmware.insert(FirmwareIdentifier(element.stackType, element.firmwareType, element.vehicleType), element.url);
}
size = sizeof(rgKakuteF7FirmwareArray)/sizeof(rgKakuteF7FirmwareArray[0]);
for (int i = 0; i < size; i++) {
const FirmwareToUrlElement_t& element = rgKakuteF7FirmwareArray[i];
_rgKakuteF7Firmware.insert(FirmwareIdentifier(element.stackType, element.firmwareType, element.vehicleType), element.url);
}
size = sizeof(rgFMUK66V3FirmwareArray)/sizeof(rgFMUK66V3FirmwareArray[0]);
for (int i = 0; i < size; i++) {
const FirmwareToUrlElement_t& element = rgFMUK66V3FirmwareArray[i];
......@@ -469,6 +483,9 @@ QHash<FirmwareUpgradeController::FirmwareIdentifier, QString>* FirmwareUpgradeCo
case Bootloader::boardIDOmnibusF4SD:
_rgFirmwareDynamic = _rgOmnibusF4SDFirmware;
break;
case Bootloader::boardIDKakuteF7:
_rgFirmwareDynamic = _rgKakuteF7Firmware;
break;
case Bootloader::boardIDFMUK66V3:
_rgFirmwareDynamic = _rgFMUK66V3Firmware;
break;
......
src/VehicleSetup/FirmwareUpgradeController.h
View file @ d8fc28aa
......@@ -217,6 +217,7 @@ private:
QHash<FirmwareIdentifier, QString> _rgASCV1Firmware;
QHash<FirmwareIdentifier, QString> _rgCrazyflie2Firmware;
QHash<FirmwareIdentifier, QString> _rgOmnibusF4SDFirmware;
QHash<FirmwareIdentifier, QString> _rgKakuteF7Firmware;
QHash<FirmwareIdentifier, QString> _rgFMUK66V3Firmware;
QHash<FirmwareIdentifier, QString> _rgPX4FLowFirmware;
QHash<FirmwareIdentifier, QString> _rg3DRRadioFirmware;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment